Packman Build Service PMBS

aMule.changes Changed

aMule.spec Changed

@@ -1,16 +1,11 @@
-# norootforbuild
-
 Name:		aMule
 Summary:	another eMule file-sharing program
-Version:	2.2.6
+Version:	2.3.1
 Release:	1
 License:	GPL
 Group:		Productivity/Networking/Other
 URL:		http://www.amule.org
-Source0:	http://downloads.sourceforge.net/amule/aMule-%{version}.tar.bz2
-Patch0:		aMule-CVS-wx_utils.h.patch
-Patch1:		amule-2.2.6-gcc45.patch
-Patch2:     aMule-fix_ambiguous_char2unicode_to_wxstring.patch
+Source0:	http://downloads.sourceforge.net/project/amule/aMule/%{version}/aMule-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build
 BuildRequires:	gcc-c++ gd-devel libpng-devel fdupes
 BuildRequires:  libupnp-devel libcryptopp-devel libGeoIP-devel update-desktop-files
@@ -37,11 +32,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%if %suse_version >= 1130
-%patch1 -p1
-%endif
-%patch2
 
 %build
 %configure \
@@ -58,9 +48,12 @@
   --enable-wxcas \
   --enable-alc \
   --enable-alcc \
-  --enable-geoip
+  --enable-geoip \
+  --enable-xas \
+  --disable-silent-rules \
+  --with-denoise-level=0
 
-%__make %{?_smp_flags} V=1 VERBOSE=1 SILENT=0
+make %{?_smp_mflags}
 
 %install
 %makeinstall docdir=%{_defaultdocdir}/aMule
@@ -83,7 +76,7 @@
 
 %files -f amule.lang
 %defattr(-,root,root)
-%doc docs/AUTHORS docs/Changelog docs/ED2K-Links.HOWTO docs/README docs/license.txt
+%doc docs/AUTHORS docs/Changelog docs/README docs/license.txt
 %doc %{_mandir}/*/*
 %{_bindir}/*
 %{_libdir}/xchat/plugins/xas.pl
@@ -100,8 +93,8 @@
 %dir %{_datadir}/locale/ko_KR
 %dir %{_datadir}/locale/ko_KR/LC_MESSAGES
 %endif
-%dir %{_datadir}/man/eu
-%dir %{_datadir}/man/hu
+%dir %{_mandir}/tr
+%dir %{_mandir}/hu
 
 
 %changelog

aMule-CVS-wx_utils.h.patch Deleted

aMule-fix_ambiguous_char2unicode_to_wxstring.patch Deleted

@@ -1,38 +0,0 @@
---- src/ClientCreditsList.cpp.orig	2011-03-11 01:10:49.000000000 +0100
-+++ src/ClientCreditsList.cpp	2011-03-11 01:12:23.000000000 +0100
-@@ -280,7 +280,7 @@
- 	} catch(const CryptoPP::Exception& e) {
- 		AddDebugLogLineM(true, logCredits,
- 			wxString(wxT("Failed to create new RSA keypair: ")) +
--			char2unicode(e.what()));
-+			wxString(char2unicode(e.what())));
- 		wxASSERT(false);
-  		return false;
-  	}
-@@ -331,7 +331,7 @@
- 		
- 		AddDebugLogLineM(true, logCredits,
- 			wxString(wxT("Error while initializing encryption keys: ")) +
--			char2unicode(e.what()));
-+			wxString(char2unicode(e.what())));
-  	}
- }
- 
-@@ -375,7 +375,7 @@
- 		
- 		return asink.TotalPutLength();			
- 	} catch (const CryptoPP::Exception& e) {
--		AddDebugLogLineM(true, logCredits, wxString(wxT("Error while creating signature: ")) + char2unicode(e.what()));
-+		AddDebugLogLineM(true, logCredits, wxString(wxT("Error while creating signature: ")) + wxString(char2unicode(e.what())));
- 		wxASSERT(false);
- 		
- 		return 0;
-@@ -436,7 +436,7 @@
- 		
-  		bResult = pubkey.VerifyMessage(abyBuffer, m_nMyPublicKeyLen+4+nChIpSize, pachSignature, nInputSize);
- 	} catch (const CryptoPP::Exception& e) {
--		AddDebugLogLineM(true, logCredits, wxString(wxT("Error while verifying identity: ")) + char2unicode(e.what()));
-+		AddDebugLogLineM(true, logCredits, wxString(wxT("Error while verifying identity: ")) + wxString(char2unicode(e.what())));
-  		bResult = false;
-  	}
-

amule-2.2.6-gcc45.patch Deleted

aMule-2.2.6.tar.bz2/MSVC Solution Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/README - MSVC.txt Deleted

@@ -1,70 +0,0 @@
-How to build aMule with Visual Studio
-See also http://www.amule.org/wiki/index.php/HowTo_compile_with_Visual_Studio
-
-This solution for Microsoft's Visual Studio 2008 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 
-with some generated files. 
-
-The solution expects to find the following items:
-
-* wxWidgets ( http://www.wxwidgets.org ) at a specific location: ..\..\wxWidgets\ from the solution directory.
-* crypto++ ( http://www.cryptopp.com/ ) at a specific location: ..\..\cryptopp\ from the solution directory.
-
-
-This means you must create a folder where you will compile aMule, and it must have this structure:
-
-- <Root folder> - Your main folder. You can name it whatever you want.
- | 
- | - wxWidgets ( wxWidgets sources, no intermediate subfolder )
- |
- | - cryptopp ( Crypto++ sources, no intermediate subfolder )
- |
- | - <amule-sources> ( aMule sources, no intermediate subfolder, can have any name )
-
-
-I hope this is simple enough to get you started. 
-
-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
-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. 
-
-There are three solutions:
-1) aMule-MSVC.sln
-   includes everything and is organized in folders. It only works with the commercial edition of MSVC.
-2) aMule-MSVCE-ExtLibs.sln
-   includes only wxWidgets and Crypto++ and builds a single library libext.lib from them. You must first build this solution before building
-2) aMule-MSVCE.sln
-   which includes aMule, aMule tools and aMule's internal libs
-
-To build aMule with GeoIP see libs\libGeoIP\readme.txt . 
-Without it you get an error building libGeoIP when you build the full solution.
-Just ignore it or unload the libGeoIP project.
-
-
-If aMule fails to compile, here are some guidelines/patches to the most common problems:
-
-[*] If Scanner.cpp fails to compile, apply this change around line 1545:
-
--        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-+        b->yy_is_interactive = 0;
-
-if necessary.
-
-[*] The file muuli_wdr.cpp can also fail if it hasn't been patched for MSVC in the current code. The most common problem comes 
-from this kind of lines:
-
-        _("For a film you can say its length, its story, language ...\n"
-          "and if it's a fake, you can tell that to other users of aMule."),
-
-Notice the opening and closing parentheses are on a different line, and the quotes opened again. While this is ok for gcc, Visual
-Studio won't allow it. Change this lines to be a single-line quoted text. In the above example, the result will be:
-
-	_("For a film you can say its length, its story, language ...\nand if it's a fake, you can tell that to other users of aMule."),
-
-And that should be it. Feel free to ask in the aMule forum at forum.amule.org, "Compilation problems" section if you have further
-doubts.

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests/FileDataIO Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests/FileDataIO/FileDataIO.vcproj Deleted

@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="FileDataIO"
-	ProjectGUID="{C27E39F5-BA92-4245-A537-7B7852508900}"
-	RootNamespace="FileDataIO"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\unittests&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;MULEUNIT;USE_WX_EXTENSIONS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="2"
-				IgnoreAllDefaultLibraries="false"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\unittests&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;MULEUNIT;USE_WX_EXTENSIONS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\src\CFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unittests\tests\FileDataIOTest.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\MemFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\SafeFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\Tag.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests/FormatTest Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests/FormatTest/FormatTest.vcproj Deleted

@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="Format"
-	ProjectGUID="{269AD4B7-8245-4476-9179-E4659F6E217F}"
-	RootNamespace="FormatTest"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\unittests&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;MULEUNIT;USE_WX_EXTENSIONS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\unittests&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;MULEUNIT;USE_WX_EXTENSIONS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\unittests\tests\FormatTest.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests/NetworkFunctions Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests/NetworkFunctions/NetworkFunctions.vcproj Deleted

@@ -1,205 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="NetworkFunctions"
-	ProjectGUID="{6B452F4F-43C9-408E-BDF3-C70FCA9F257D}"
-	RootNamespace="NetworkFunctions"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\unittests&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;MULEUNIT;USE_WX_EXTENSIONS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\unittests&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;MULEUNIT;USE_WX_EXTENSIONS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\src\NetworkFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unittests\tests\NetworkFunctionsTest.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests/RangeMap Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests/RangeMap/RangeMap.vcproj Deleted

@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="RangeMap"
-	ProjectGUID="{9A19C692-FFBD-467C-B8A8-63166F421940}"
-	RootNamespace="RangeMap"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\unittests&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;MULEUNIT;USE_WX_EXTENSIONS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\unittests&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;MULEUNIT;USE_WX_EXTENSIONS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\unittests\tests\RangeMapTest.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests/StringFunctions Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests/StringFunctions/StringFunctions.vcproj Deleted

@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="StringFunctions"
-	ProjectGUID="{5A024799-C5ED-41CF-BF0C-914A11799234}"
-	RootNamespace="StringFunctions"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\unittests&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;MULEUNIT;USE_WX_EXTENSIONS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\unittests&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;MULEUNIT;USE_WX_EXTENSIONS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\unittests\tests\StringFunctionsTest.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests/libmuleunittest Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/UnitTests/libmuleunittest/libmuleunittest.vcproj Deleted

@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libmuleunittest"
-	ProjectGUID="{5FE132E5-83CB-4880-B2D9-CA828E008786}"
-	RootNamespace="libmuleunittest"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\libs&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;MULEUNIT"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;MULEUNIT"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\unittests\muleunit\main.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unittests\muleunit\test.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unittests\muleunit\testcase.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unittests\muleunit\testregistry.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\unittests\muleunit\test.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unittests\muleunit\testcase.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\unittests\muleunit\testregistry.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/aLinkCreator Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/aLinkCreator/aLinkCreator.vcproj Deleted

@@ -1,257 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="aLinkCreator"
-	ProjectGUID="{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}"
-	RootNamespace="aLinkCreator"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;"
-				PreprocessorDefinitions="_DEBUG"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Link Creator\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="3"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;"
-				PreprocessorDefinitions="NDEBUG"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Link Creator\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\src\alc.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\src\alcframe.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\src\alcpix.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\src\ed2khash.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\src\md4.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\src\alc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\src\alcc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\src\alcframe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\src\alcpix.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\src\bithelp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\src\ed2khash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\src\md4.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\src\utils\aLinkCreator\alc.rc"
-				>
-			</File>
-			<File
-				RelativePath="..\version.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/aMule Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/aMule-MSVCE-ExtLibs.sln Deleted

@@ -1,168 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "buildlibext", "libs\libext\buildlibext.vcproj", "{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C4590207-2D76-445F-833D-D59BB14D2C51} = {C4590207-2D76-445F-833D-D59BB14D2C51}
-		{4740520C-ADF1-464D-97C5-85FCFEECF76D} = {4740520C-ADF1-464D-97C5-85FCFEECF76D}
-		{C963A510-37EB-4D71-85B9-2380FCD4B3D3} = {C963A510-37EB-4D71-85B9-2380FCD4B3D3}
-		{99A6CD35-A635-4E39-93FF-F9A359E356D2} = {99A6CD35-A635-4E39-93FF-F9A359E356D2}
-		{6B245136-054C-4400-BF21-D30B05C231CD} = {6B245136-054C-4400-BF21-D30B05C231CD}
-		{AE383B44-EE53-4353-9BF0-2F3767D6CE51} = {AE383B44-EE53-4353-9BF0-2F3767D6CE51}
-		{B535BE44-FCCC-4911-862F-A7ED6CC6B597} = {B535BE44-FCCC-4911-862F-A7ED6CC6B597}
-		{4F88C347-8C7A-47C1-84C8-D4E154A33D30} = {4F88C347-8C7A-47C1-84C8-D4E154A33D30}
-		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935} = {3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}
-		{BA59346E-5EB2-4D25-94A7-132D9C953A05} = {BA59346E-5EB2-4D25-94A7-132D9C953A05}
-		{46B97E73-8E57-42C1-A46E-AF0495D625DD} = {46B97E73-8E57-42C1-A46E-AF0495D625DD}
-		{8E917A7A-CC97-45C8-80A1-2EBD30936D23} = {8E917A7A-CC97-45C8-80A1-2EBD30936D23}
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
-		{A960D0AD-C20E-4FD6-B477-6509232C7D94} = {A960D0AD-C20E-4FD6-B477-6509232C7D94}
-		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6} = {456E58BD-84CA-4190-A88B-0A9B30DFD6D6}
-		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1} = {83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}
-		{FE8C58CE-6828-4125-8563-28F929D307C2} = {FE8C58CE-6828-4125-8563-28F929D307C2}
-		{474A0ED2-5969-47F0-B37F-7BC05C44F99B} = {474A0ED2-5969-47F0-B37F-7BC05C44F99B}
-		{8CF291F4-6284-4118-98A7-9D2146C6D5EA} = {8CF291F4-6284-4118-98A7-9D2146C6D5EA}
-		{4C6519FA-63B7-4631-B087-A17A368DBCD9} = {4C6519FA-63B7-4631-B087-A17A368DBCD9}
-		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C} = {64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\..\cryptopp\cryptlib.vcproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "..\..\wxWidgets\build\msw\wx_wxregex.vcproj", "{A960D0AD-C20E-4FD6-B477-6509232C7D94}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "..\..\wxWidgets\build\msw\wx_wxzlib.vcproj", "{99A6CD35-A635-4E39-93FF-F9A359E356D2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "..\..\wxWidgets\build\msw\wx_wxpng.vcproj", "{4F88C347-8C7A-47C1-84C8-D4E154A33D30}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "..\..\wxWidgets\build\msw\wx_wxjpeg.vcproj", "{4C6519FA-63B7-4631-B087-A17A368DBCD9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "..\..\wxWidgets\build\msw\wx_wxtiff.vcproj", "{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "..\..\wxWidgets\build\msw\wx_wxexpat.vcproj", "{474A0ED2-5969-47F0-B37F-7BC05C44F99B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\..\wxWidgets\build\msw\wx_base.vcproj", "{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\..\wxWidgets\build\msw\wx_net.vcproj", "{C963A510-37EB-4D71-85B9-2380FCD4B3D3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\wxWidgets\build\msw\wx_core.vcproj", "{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "..\..\wxWidgets\build\msw\wx_adv.vcproj", "{FE8C58CE-6828-4125-8563-28F929D307C2}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "..\..\wxWidgets\build\msw\wx_media.vcproj", "{6B245136-054C-4400-BF21-D30B05C231CD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbc", "..\..\wxWidgets\build\msw\wx_odbc.vcproj", "{B535BE44-FCCC-4911-862F-A7ED6CC6B597}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbgrid", "..\..\wxWidgets\build\msw\wx_dbgrid.vcproj", "{C4590207-2D76-445F-833D-D59BB14D2C51}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "..\..\wxWidgets\build\msw\wx_html.vcproj", "{8E917A7A-CC97-45C8-80A1-2EBD30936D23}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "..\..\wxWidgets\build\msw\wx_qa.vcproj", "{AE383B44-EE53-4353-9BF0-2F3767D6CE51}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "..\..\wxWidgets\build\msw\wx_xml.vcproj", "{46B97E73-8E57-42C1-A46E-AF0495D625DD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "..\..\wxWidgets\build\msw\wx_xrc.vcproj", "{BA59346E-5EB2-4D25-94A7-132D9C953A05}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\..\wxWidgets\build\msw\wx_aui.vcproj", "{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "..\..\wxWidgets\build\msw\wx_richtext.vcproj", "{4740520C-ADF1-464D-97C5-85FCFEECF76D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "..\..\wxWidgets\build\msw\wx_gl.vcproj", "{8CF291F4-6284-4118-98A7-9D2146C6D5EA}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Release|Win32 = Release|Win32
-		Debug|Win32 = Debug|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.ActiveCfg = Release|Win32
-		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32
-		{A960D0AD-C20E-4FD6-B477-6509232C7D94}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{A960D0AD-C20E-4FD6-B477-6509232C7D94}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{A960D0AD-C20E-4FD6-B477-6509232C7D94}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{A960D0AD-C20E-4FD6-B477-6509232C7D94}.Release|Win32.Build.0 = Unicode Release|Win32
-		{99A6CD35-A635-4E39-93FF-F9A359E356D2}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{99A6CD35-A635-4E39-93FF-F9A359E356D2}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{99A6CD35-A635-4E39-93FF-F9A359E356D2}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{99A6CD35-A635-4E39-93FF-F9A359E356D2}.Release|Win32.Build.0 = Unicode Release|Win32
-		{4F88C347-8C7A-47C1-84C8-D4E154A33D30}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{4F88C347-8C7A-47C1-84C8-D4E154A33D30}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{4F88C347-8C7A-47C1-84C8-D4E154A33D30}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{4F88C347-8C7A-47C1-84C8-D4E154A33D30}.Release|Win32.Build.0 = Unicode Release|Win32
-		{4C6519FA-63B7-4631-B087-A17A368DBCD9}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{4C6519FA-63B7-4631-B087-A17A368DBCD9}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{4C6519FA-63B7-4631-B087-A17A368DBCD9}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{4C6519FA-63B7-4631-B087-A17A368DBCD9}.Release|Win32.Build.0 = Unicode Release|Win32
-		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}.Release|Win32.Build.0 = Unicode Release|Win32
-		{474A0ED2-5969-47F0-B37F-7BC05C44F99B}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{474A0ED2-5969-47F0-B37F-7BC05C44F99B}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{474A0ED2-5969-47F0-B37F-7BC05C44F99B}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{474A0ED2-5969-47F0-B37F-7BC05C44F99B}.Release|Win32.Build.0 = Unicode Release|Win32
-		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}.Release|Win32.Build.0 = Unicode Release|Win32
-		{C963A510-37EB-4D71-85B9-2380FCD4B3D3}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{C963A510-37EB-4D71-85B9-2380FCD4B3D3}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{C963A510-37EB-4D71-85B9-2380FCD4B3D3}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{C963A510-37EB-4D71-85B9-2380FCD4B3D3}.Release|Win32.Build.0 = Unicode Release|Win32
-		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}.Release|Win32.Build.0 = Unicode Release|Win32
-		{FE8C58CE-6828-4125-8563-28F929D307C2}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{FE8C58CE-6828-4125-8563-28F929D307C2}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{FE8C58CE-6828-4125-8563-28F929D307C2}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{FE8C58CE-6828-4125-8563-28F929D307C2}.Release|Win32.Build.0 = Unicode Release|Win32
-		{6B245136-054C-4400-BF21-D30B05C231CD}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{6B245136-054C-4400-BF21-D30B05C231CD}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{6B245136-054C-4400-BF21-D30B05C231CD}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{6B245136-054C-4400-BF21-D30B05C231CD}.Release|Win32.Build.0 = Unicode Release|Win32
-		{B535BE44-FCCC-4911-862F-A7ED6CC6B597}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{B535BE44-FCCC-4911-862F-A7ED6CC6B597}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{B535BE44-FCCC-4911-862F-A7ED6CC6B597}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{B535BE44-FCCC-4911-862F-A7ED6CC6B597}.Release|Win32.Build.0 = Unicode Release|Win32
-		{C4590207-2D76-445F-833D-D59BB14D2C51}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{C4590207-2D76-445F-833D-D59BB14D2C51}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{C4590207-2D76-445F-833D-D59BB14D2C51}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{C4590207-2D76-445F-833D-D59BB14D2C51}.Release|Win32.Build.0 = Unicode Release|Win32
-		{8E917A7A-CC97-45C8-80A1-2EBD30936D23}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{8E917A7A-CC97-45C8-80A1-2EBD30936D23}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{8E917A7A-CC97-45C8-80A1-2EBD30936D23}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{8E917A7A-CC97-45C8-80A1-2EBD30936D23}.Release|Win32.Build.0 = Unicode Release|Win32
-		{AE383B44-EE53-4353-9BF0-2F3767D6CE51}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{AE383B44-EE53-4353-9BF0-2F3767D6CE51}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{AE383B44-EE53-4353-9BF0-2F3767D6CE51}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{AE383B44-EE53-4353-9BF0-2F3767D6CE51}.Release|Win32.Build.0 = Unicode Release|Win32
-		{46B97E73-8E57-42C1-A46E-AF0495D625DD}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{46B97E73-8E57-42C1-A46E-AF0495D625DD}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{46B97E73-8E57-42C1-A46E-AF0495D625DD}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{46B97E73-8E57-42C1-A46E-AF0495D625DD}.Release|Win32.Build.0 = Unicode Release|Win32
-		{BA59346E-5EB2-4D25-94A7-132D9C953A05}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{BA59346E-5EB2-4D25-94A7-132D9C953A05}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{BA59346E-5EB2-4D25-94A7-132D9C953A05}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{BA59346E-5EB2-4D25-94A7-132D9C953A05}.Release|Win32.Build.0 = Unicode Release|Win32
-		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}.Release|Win32.Build.0 = Unicode Release|Win32
-		{4740520C-ADF1-464D-97C5-85FCFEECF76D}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{4740520C-ADF1-464D-97C5-85FCFEECF76D}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{4740520C-ADF1-464D-97C5-85FCFEECF76D}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{4740520C-ADF1-464D-97C5-85FCFEECF76D}.Release|Win32.Build.0 = Unicode Release|Win32
-		{8CF291F4-6284-4118-98A7-9D2146C6D5EA}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{8CF291F4-6284-4118-98A7-9D2146C6D5EA}.Debug|Win32.Build.0 = Unicode Debug|Win32
-		{8CF291F4-6284-4118-98A7-9D2146C6D5EA}.Release|Win32.ActiveCfg = Unicode Release|Win32
-		{8CF291F4-6284-4118-98A7-9D2146C6D5EA}.Release|Win32.Build.0 = Unicode Release|Win32
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.Build.0 = Debug|Win32
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.ActiveCfg = Release|Win32
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

aMule-2.2.6.tar.bz2/MSVC Solution/aMule-MSVCE.sln Deleted

@@ -1,111 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMule", "aMule\aMule.vcproj", "{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DBADF72E-2572-403F-B0D6-AC8C9B3ECCFE} = {DBADF72E-2572-403F-B0D6-AC8C9B3ECCFE}
-		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
-		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF} = {16C7A051-9097-41A5-BA26-FEC1EA1F16EF}
-		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1} = {5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmuleec", "libs\libmuleec\libmuleec.vcproj", "{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmulecommon", "libs\libmulecommon\libmulecommon.vcproj", "{293E6133-239A-4ED4-838E-9182B07C6B35}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libkad", "libs\libkad\libkad.vcproj", "{DBADF72E-2572-403F-B0D6-AC8C9B3ECCFE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmuleexternalwxlistctrl", "libs\libmuleexternalwxlistctrl\libmuleexternalwxlistctrl.vcproj", "{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aLinkCreator", "aLinkCreator\aLinkCreator.vcproj", "{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMuleCMD", "aMuleCMD\aMuleCMD.vcproj", "{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}"
-	ProjectSection(ProjectDependencies) = postProject
-		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
-		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1} = {5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMuleGUI", "aMuleGUI\aMuleGUI.vcproj", "{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DBADF72E-2572-403F-B0D6-AC8C9B3ECCFE} = {DBADF72E-2572-403F-B0D6-AC8C9B3ECCFE}
-		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
-		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF} = {16C7A051-9097-41A5-BA26-FEC1EA1F16EF}
-		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1} = {5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ed2k", "ed2k\ed2k.vcproj", "{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libext", "libs\libext\libext.vcproj", "{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileview", "fileview\fileview.vcproj", "{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Debug|Win32.Build.0 = Debug|Win32
-		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Release|Win32.ActiveCfg = Release|Win32
-		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Release|Win32.Build.0 = Release|Win32
-		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Debug|Win32.Build.0 = Debug|Win32
-		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Release|Win32.ActiveCfg = Release|Win32
-		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Release|Win32.Build.0 = Release|Win32
-		{293E6133-239A-4ED4-838E-9182B07C6B35}.Debug|Win32.ActiveCfg = Debug|Win32
-		{293E6133-239A-4ED4-838E-9182B07C6B35}.Debug|Win32.Build.0 = Debug|Win32
-		{293E6133-239A-4ED4-838E-9182B07C6B35}.Release|Win32.ActiveCfg = Release|Win32
-		{293E6133-239A-4ED4-838E-9182B07C6B35}.Release|Win32.Build.0 = Release|Win32
-		{DBADF72E-2572-403F-B0D6-AC8C9B3ECCFE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DBADF72E-2572-403F-B0D6-AC8C9B3ECCFE}.Debug|Win32.Build.0 = Debug|Win32
-		{DBADF72E-2572-403F-B0D6-AC8C9B3ECCFE}.Release|Win32.ActiveCfg = Release|Win32
-		{DBADF72E-2572-403F-B0D6-AC8C9B3ECCFE}.Release|Win32.Build.0 = Release|Win32
-		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Debug|Win32.ActiveCfg = Debug|Win32
-		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Debug|Win32.Build.0 = Debug|Win32
-		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Release|Win32.ActiveCfg = Release|Win32
-		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Release|Win32.Build.0 = Release|Win32
-		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Debug|Win32.Build.0 = Debug|Win32
-		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Release|Win32.ActiveCfg = Release|Win32
-		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Release|Win32.Build.0 = Release|Win32
-		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Debug|Win32.Build.0 = Debug|Win32
-		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Release|Win32.ActiveCfg = Release|Win32
-		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Release|Win32.Build.0 = Release|Win32
-		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Debug|Win32.Build.0 = Debug|Win32
-		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Release|Win32.ActiveCfg = Release|Win32
-		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Release|Win32.Build.0 = Release|Win32
-		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Debug|Win32.Build.0 = Debug|Win32
-		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Release|Win32.ActiveCfg = Release|Win32
-		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Release|Win32.Build.0 = Release|Win32
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.Build.0 = Debug|Win32
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.ActiveCfg = Release|Win32
-		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.Build.0 = Release|Win32
-		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Debug|Win32.Build.0 = Debug|Win32
-		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Release|Win32.ActiveCfg = Release|Win32
-		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

aMule-2.2.6.tar.bz2/MSVC Solution/aMule/aMule.vcproj Deleted

@@ -1,1132 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="aMule"
-	ProjectGUID="{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}"
-	RootNamespace="aMule"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\src\zlib&quot;;"
-				PreprocessorDefinitions="__DEBUG__;_DEBUG;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;ENABLE_NLS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;All-Platform P2P Client Based on eMule\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="3"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\src\zlib&quot;;"
-				PreprocessorDefinitions="USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;ENABLE_NLS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;All-Platform P2P Client Based on eMule\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\src\AddFriend.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\amule-gui.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\amule.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\amuleDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\AsyncDNS.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\BarShader.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\BaseClient.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CatDialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ChatSelector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ChatWnd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientCredits.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientCreditsList.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientDetailDialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientList.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientTCPSocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientUDPSocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ColorFrameCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CommentDialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CommentDialogLst.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DataToText.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DeadSourceList.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DirectoryTreeCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DownloadClient.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DownloadListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DownloadQueue.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ECSpecialCoreTags.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ECSpecialMuleTags.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ED2KLink.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\EditServerListDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\EMSocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\EncryptedDatagramSocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\EncryptedStreamSocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ExternalConn.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FileDetailDialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FileDetailListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Friend.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FriendList.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FriendListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\GetTickCount.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\GuiEvents.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\HTTPDownload.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\IPFilter.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\KadDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\KnownFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\KnownFileList.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ListenSocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Logger.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MagnetURI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MemFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleCollection.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleGifCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleNotebook.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleTextCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleTrayIcon.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleUDPSocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\muuli_wdr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\NetworkFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OScopeCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OtherFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Packet.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Parser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PartFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PartFileConvert.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PartFileConvertDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PlatformSpecific.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Preferences.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PrefsUnifiedDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Proxy.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RandomFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RC4Encrypt.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RLE.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SafeFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Scanner.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchList.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Server.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerConnect.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerList.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerSocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerUDPSocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerWnd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SHA.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SHAHashSet.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SharedFileList.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SharedFilesCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SharedFilesWnd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\StateMachine.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Statistics.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\StatisticsDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\StatTree.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Tag.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TerminationProcess.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TerminationProcessAmuleweb.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ThreadScheduler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ThreadTasks.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Timer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TransferWnd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UploadBandwidthThrottler.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UploadClient.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UploadQueue.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UserEvents.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\src\AddFriend.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\amule.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\amuleDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\amuleIPV4Address.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ArchSpecific.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\AsyncDNS.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\BarShader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CatDialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ChatSelector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ChatWnd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientCredits.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientCreditsList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientDetailDialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientTCPSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientUDPSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Color.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ColorFrameCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CommentDialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CommentDialogLst.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Constants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CryptoPP_Inc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DataToText.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DeadSourceList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DirectoryTreeCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DownloadListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DownloadQueue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ED2KLink.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\EditServerListDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\EMSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\EncryptedDatagramSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\EncryptedStreamSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ExternalConn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ExternalConnector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FileDetailDialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FileDetailListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FileLock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Friend.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FriendList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FriendListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\GetTickCount.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\GuiEvents.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\HTTPDownload.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\inetdownload.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\InternalEvents.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\IP2Country.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\IPFilter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\KadDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\KnownFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\KnownFileList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ListenSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Logger.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MagnetURI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MD4Hash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MemFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleCollection.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleGifCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleNotebook.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleTextCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleThread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleTrayIcon.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleUDPSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\muuli_wdr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\NetworkFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Observable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ObservableQueue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OScopeCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OtherFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OtherStructs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Packet.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PartFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PartFileConvert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PartFileConvertDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PlatformSpecific.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Preferences.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PrefsUnifiedDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Proxy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RandomFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RangeMap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RC4Encrypt.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RLE.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SafeFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Scanner.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ScopedPtr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchExpr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Server.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerConnect.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerUDPSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerWnd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SHA.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SHAHashSet.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SharedFileList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SharedFilesCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SharedFilesWnd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\StateMachine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Statistics.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\StatisticsDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\StatTree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Tag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TerminationProcess.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ThreadScheduler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ThreadTasks.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ThrottledSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Timer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TransferWnd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\updownclient.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UploadBandwidthThrottler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UploadQueue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UPnP.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UPnPCompatibility.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UserEvents.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\..\amule.rc"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						PreprocessorDefinitions="_UNICODE;UNICODE;MSVC"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\version.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/aMuleCMD Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/aMuleCMD/aMuleCMD.vcproj Deleted

@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="aMuleCMD"
-	ProjectGUID="{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}"
-	RootNamespace="aMuleCMD"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\src\zlib&quot;"
-				PreprocessorDefinitions="_DEBUG;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;EC_REMOTE;ECSOCKET_USE_EVENTS=0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Text Client\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="3"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\src\zlib&quot;"
-				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;EC_REMOTE;ECSOCKET_USE_EVENTS=0"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Text Client\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\src\ExternalConnector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\NetworkFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OtherFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TextClient.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\src\ExternalConnector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\NetworkFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OtherFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TextClient.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\version.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/aMuleGUI Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/aMuleGUI/aMuleGUI.vcproj Deleted

@@ -1,878 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="aMuleGUI"
-	ProjectGUID="{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}"
-	RootNamespace="aMuleGUI"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\src\zlib&quot;"
-				PreprocessorDefinitions="_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;CLIENT_GUI;EC_REMOTE;ENABLE_NLS"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Remote GUI (Experimental)\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="3"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\src\zlib&quot;;"
-				PreprocessorDefinitions="USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;CLIENT_GUI;EC_REMOTE;ENABLE_NLS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Remote GUI (Experimental)\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\src\AddFriend.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\amule-gui.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\amule-remote-gui.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\amuleDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\BarShader.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CatDialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ChatSelector.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ChatWnd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientCredits.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientDetailDialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ColorFrameCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CommentDialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CommentDialogLst.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DataToText.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DirectoryTreeCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DownloadListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ECSpecialMuleTags.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ED2KLink.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\EditServerListDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FileDetailDialog.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FileDetailListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FriendListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\GetTickCount.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\GuiEvents.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\KadDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\KnownFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Logger.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MagnetURI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MemFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleCollection.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleGifCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleNotebook.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleTextCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleTrayIcon.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\muuli_wdr.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\NetworkFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OScopeCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OtherFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Packet.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PartFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PartFileConvertDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Preferences.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PrefsUnifiedDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Proxy.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RandomFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RLE.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SafeFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Server.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerListCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerWnd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SHA.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SHAHashSet.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SharedFilesCtrl.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SharedFilesWnd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Statistics.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\StatisticsDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\StatTree.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Tag.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TerminationProcess.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TerminationProcessAmuleweb.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Timer.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TransferWnd.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UserEvents.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\src\AddFriend.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\amule-remote-gui.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\amule.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\amuleDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ArchSpecific.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\BarShader.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CatDialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ChatSelector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ChatWnd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientCreditsList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientDetailDialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ClientListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Color.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ColorFrameCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CommentDialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CommentDialogLst.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Constants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\CryptoPP_Inc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DataToText.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DirectoryTreeCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DownloadListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\DownloadQueue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ED2KLink.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\EditServerListDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ExternalConn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ExternalConnector.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FileDetailDialog.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FileDetailListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FileLock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Friend.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FriendList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\FriendListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\GetTickCount.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\GuiEvents.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\InternalEvents.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\IP2Country.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\KadDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\KnownFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\KnownFileList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ListenSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Logger.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MagnetURI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MD4Hash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MemFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleCollection.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleGifCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleNotebook.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleTextCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleThread.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleTrayIcon.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\muuli_wdr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Observable.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ObservableQueue.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OScopeCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OtherFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OtherStructs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PartFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PartFileConvert.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PartFileConvertDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Preferences.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\PrefsUnifiedDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Proxy.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RandomFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RangeMap.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RC4Encrypt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\RLE.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SafeFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Scanner.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ScopedPtr.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchFile.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SearchListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Server.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerListCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ServerWnd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SHA.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SHAHashSet.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SharedFileList.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SharedFilesCtrl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SharedFilesWnd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\StateMachine.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\StatisticsDlg.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\StatTree.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TerminationProcess.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ThreadScheduler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\ThreadTasks.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Timer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\TransferWnd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Types.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\updownclient.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UploadBandwidthThrottler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UPnP.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UPnPCompatibility.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\UserEvents.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			>
-			<File
-				RelativePath="..\..\amule.rc"
-				>
-			</File>
-			<File
-				RelativePath="..\version.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/ed2k Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/ed2k/ed2k.vcproj Deleted

@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="ed2k"
-	ProjectGUID="{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}"
-	RootNamespace="ed2k"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="_DEBUG;USE_STD_STRING;_SCL_SECURE_NO_WARNINGS"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;ED2K Links Handler\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="shlwapi.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="3"
-				AdditionalIncludeDirectories=""
-				PreprocessorDefinitions="USE_STD_STRING;_SCL_SECURE_NO_WARNINGS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;ED2K Links Handler\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="shlwapi.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\src\ED2KLinkParser.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MagnetURI.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleCollection.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\src\FileLock.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MagnetURI.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\MuleCollection.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\version.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/fileview Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/fileview/fileview.vcproj Deleted

@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="fileview"
-	ProjectGUID="{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}"
-	RootNamespace="fileview"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="_DEBUG;_SCL_SECURE_NO_WARNINGS;wxUSE_GUI=0;USE_WX_EXTENSIONS;MULEUNIT"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="shlwapi.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="3"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="_SCL_SECURE_NO_WARNINGS;wxUSE_GUI=0;USE_WX_EXTENSIONS;MULEUNIT"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="shlwapi.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\src\CFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\fileview\FileView.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\fileview\KadFiles.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\OtherFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\fileview\Print.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\SafeFile.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\Tag.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\kademlia\utils\UInt128.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\src\utils\fileview\eD2kFiles.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\fileview\KadFiles.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\utils\fileview\Print.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/libs Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/libs/libext Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/libs/libext/buildlibext.vcproj Deleted

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="buildlibext"
-	ProjectGUID="{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}"
-	RootNamespace="MSVCExpressExtLibs"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description="Joining libraries"
-				CommandLine="lib /out:&quot;$(OutDir)\libext.lib&quot; /libpath:..\..\..\..\wxWidgets\lib\vc_lib wxbase28ud.lib wxbase28ud_net.lib&#x0D;&#x0A;"
-				Outputs="&quot;$(OutDir)\libext.lib&quot;"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="join external libs"
-				CommandLine="if not exist ..\..\$(ConfigurationName) mkdir ..\..\$(ConfigurationName)&#x0D;&#x0A;lib /out:..\..\$(ConfigurationName)\libext.lib &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_media.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxjpegd.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_adv.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxregexud.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_richtext.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxzlibd.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxbase28ud.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_qa.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxbase28ud_xml.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxbase28ud_odbc.lib&quot; &quot;..\..\..\..\cryptopp\win32\output\debug\cryptlib.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxtiffd.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxbase28ud_net.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_core.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_gl.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxpngd.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_dbgrid.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_xrc.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxexpatd.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_html.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_aui.lib&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="10"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description=""
-				CommandLine=""
-				Outputs=""
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="join external libs"
-				CommandLine="if not exist ..\..\$(ConfigurationName) mkdir ..\..\$(ConfigurationName)&#x0D;&#x0A;lib /out:..\..\$(ConfigurationName)\libext.lib &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_media.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxjpeg.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_adv.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxregexu.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_richtext.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxzlib.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_qa.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u_xml.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u_odbc.lib&quot; &quot;..\..\..\..\cryptopp\win32\output\release\cryptlib.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxtiff.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u_net.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_core.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_gl.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxpng.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_dbgrid.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_xrc.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxexpat.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_html.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_aui.lib&quot;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/libs/libext/libext.vcproj Deleted

@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="libext"
-	ProjectGUID="{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}"
-	RootNamespace="MSVCExpressExtLibs"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description="Joining libraries"
-				CommandLine="lib /out:&quot;$(OutDir)\libext.lib&quot; /libpath:..\..\..\..\wxWidgets\lib\vc_lib wxbase28ud.lib wxbase28ud_net.lib&#x0D;&#x0A;"
-				Outputs="&quot;$(OutDir)\libext.lib&quot;"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\libext.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="lib /out:..\..\$(ConfigurationName)\libext.lib &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_media.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxjpeg.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_adv.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxregexu.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_richtext.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxzlib.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_qa.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u_xml.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u_odbc.lib&quot; &quot;..\..\..\..\cryptopp\win32\output\release\cryptlib.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxtiff.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u_net.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_core.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_gl.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxpng.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_dbgrid.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_xrc.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxexpat.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_html.lib&quot; &quot;..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_aui.lib&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				Description=""
-				CommandLine=""
-				Outputs=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				LinkLibraryDependencies="true"
-				OutputFile="$(OutDir)\libext.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine=""
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/libs/libkad Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/libs/libkad/libkad.vcproj Deleted

@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libkad"
-	ProjectGUID="{DBADF72E-2572-403F-B0D6-AC8C9B3ECCFE}"
-	RootNamespace="libkad"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="3"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\src\kademlia\routing\Contact.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Entry.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Indexed.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Kademlia.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\net\KademliaUDPListener.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\net\PacketTracking.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Prefs.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\routing\RoutingBin.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\routing\RoutingZone.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Search.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\SearchManager.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\UDPFirewallTester.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\utils\UInt128.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\src\kademlia\routing\Contact.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Defines.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Entry.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Error.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Indexed.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\utils\KadClientSearcher.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Kademlia.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\net\KademliaUDPListener.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\utils\KadUDPKey.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\utils\LittleEndian.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\routing\Maps.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\net\PacketTracking.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Prefs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\routing\RoutingBin.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\routing\RoutingZone.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Search.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\SearchManager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\Tag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\kademlia\UDPFirewallTester.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\kademlia\utils\UInt128.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/libs/libmulecommon Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/libs/libmulecommon/libmulecommon.vcproj Deleted

@@ -1,225 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libmulecommon"
-	ProjectGUID="{293E6133-239A-4ED4-838E-9182B07C6B35}"
-	RootNamespace="libmulecommon"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="3"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\src\libs\common\FileFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\common\Format.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\common\MD5Sum.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\common\MuleDebug.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\common\Path.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\common\StringFunctions.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\common\TextFile.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\src\libs\common\FileFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\common\Format.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\common\MD5Sum.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\common\MuleDebug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\common\Path.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\common\StringFunctions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\common\TextFile.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/libs/libmuleec Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/libs/libmuleec/libmuleec.vcproj Deleted

@@ -1,229 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libmuleec"
-	ProjectGUID="{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}"
-	RootNamespace="libmuleec"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\src\zlib&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src\include&quot;"
-				PreprocessorDefinitions="_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="3"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\src\zlib\&quot;"
-				PreprocessorDefinitions="_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECMuleSocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECPacket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECSocket.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECSpecialTags.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECTag.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\RemoteConnect.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECCodes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECFileConfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECMuleSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECPacket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECSocket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECSpecialTags.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECTag.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\ECTagTypes.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\libs\ec\cpp\RemoteConnect.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/libs/libmuleexternalwxlistctrl Deleted

aMule-2.2.6.tar.bz2/MSVC Solution/libs/libmuleexternalwxlistctrl/libmuleexternalwxlistctrl.vcproj Deleted

@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libmuleexternalwxlistctrl"
-	ProjectGUID="{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}"
-	RootNamespace="libmuleexternalwxlistctrl"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswud&quot;"
-				PreprocessorDefinitions="_DEBUG;__DEBUG__;_LIB;_CRT_SECURE_NO_WARNINGS"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/MP"
-				Optimization="3"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)\..\src\libs&quot;;&quot;$(SolutionDir)\..\src\include&quot;;&quot;$(SolutionDir)\..\..\&quot;"
-				PreprocessorDefinitions="_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\..\src\extern\wxWidgets\listctrl.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\..\..\src\extern\wxWidgets\listctrl.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

aMule-2.2.6.tar.bz2/MSVC Solution/version.rc Deleted

@@ -1,51 +0,0 @@
-#include <winver.h>
-#include "../src/include/common/ClientVersion.h"
-
-#ifdef __PRERELEASE__
-#define VER_PRERELEASE	VS_FF_PRERELEASE
-#undef VER_RELEASE
-#define VER_RELEASE	0
-#define VER_PRODUCTVERSION_STR	"@PACKAGE_VERSION@ @SVNDATE@"
-#else
-#define VER_PRERELEASE	0
-#ifndef VER_RELEASE
-#define VER_RELEASE	1
-#endif
-#define VER_PRODUCTVERSION_STR	VERSION
-#endif
-
-#ifdef __DEBUG__
-#define VER_DEBUG	VS_FF_DEBUG
-#else
-#define VER_DEBUG	0
-#endif
-
-VS_VERSION_INFO VERSIONINFO
-	FILEVERSION	VERSION_MJR, VERSION_MIN, VERSION_UPDATE, VER_RELEASE
-	PRODUCTVERSION	VERSION_MJR, VERSION_MIN, VERSION_UPDATE, VER_RELEASE
-	FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
-	FILEFLAGS	VER_DEBUG | VER_PRERELEASE
-	FILEOS		VOS__WINDOWS32
-	FILETYPE	VFT_APP
-	FILESUBTYPE	0x0L
-BEGIN
-	BLOCK "StringFileInfo"
-	BEGIN
-		BLOCK "040904b0"
-		BEGIN
-			VALUE	"Comments",			"http://www.amule.org/"
-			VALUE	"FileDescription",	VER_FILEDESCRIPTION_STR
-			VALUE	"FileVersion",		VER_PRODUCTVERSION_STR
-			VALUE	"InternalName",		VER_INTERNALNAME_STR
-			VALUE	"OriginalFilename",	VER_ORIGINALFILENAME_STR
-			VALUE	"ProductName",		"aMule"
-			VALUE	"ProductVersion",	VER_PRODUCTVERSION_STR
-			VALUE	"LegalCopyright",	"aMule Team ( admin@amule.org )"
-			VALUE	"CompanyName",		"http://www.amule.org/"
-		END
-	END
-	BLOCK "VarFileInfo"
-	BEGIN
-		VALUE	"Translation", 0x0409, 1200
-	END
-END

aMule-2.2.6.tar.bz2/compile Deleted

@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# 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, 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 Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

aMule-2.2.6.tar.bz2/debian/amule-alc-dbg.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-alc.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-alcc-dbg.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-alcc.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-cas-dbg.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-cas.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-cmd-dbg.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-cmd.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-common.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-daemon-dbg.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-daemon.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-dbg.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-ed2k-dbg.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-ed2k.docs Deleted

aMule-2.2.6.tar.bz2/debian/amule-ed2k.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-ed2k.preinst Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-ar.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-bg.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-ca.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-da.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-de.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-en-gb.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-es.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-et-ee.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-eu.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-fi.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-fr.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-gl.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-hr.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-hu.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-it-ch.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-it.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-ko-kr.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-lt.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-nl.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-nn.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-pl.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-pt-br.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-pt-pt.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-ru.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-sl.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-sv.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-tr.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-zh-cn.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-i18n-zh-tw.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-remote-gui-dbg.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-remote-gui.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-skin-gnome.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-skin-kde4.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-skin-tango.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-skin-xfce.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-theme-chicane.dirs Deleted

aMule-2.2.6.tar.bz2/debian/amule-theme-chicane.install Deleted

aMule-2.2.6.tar.bz2/debian/amule-theme-chicane.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-theme-default.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-theme-php-default.dirs Deleted

aMule-2.2.6.tar.bz2/debian/amule-theme-php-default.install Deleted

aMule-2.2.6.tar.bz2/debian/amule-theme-php-default.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-utils-gui.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-utils.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-wxcas-dbg.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-wxcas.override Deleted

aMule-2.2.6.tar.bz2/debian/amule-xas.override Deleted

aMule-2.2.6.tar.bz2/debian/amule.README.Debian Deleted

@@ -1,39 +0,0 @@
-amule for Debian
-----------------
-
-STANDING AMULE ?
-----------------
-With some Window Manager, aMule runs, but the GUI seems to be buggy.
-So, It's not a problem from the package, you just have to uncheck
-the option : " Use Tray Icon" in your aMule preferences.
-
-
-AMULE AND XMULE PACKAGE
------------------
-Before the 1.2.X version, the package of amule was in conflicts with
-the xmule package. The bug comes from the /usr/bin/ed2k, which was
-used by the both packages.
-
-I wrote a wrapper, which see if amule or xmule is running and
-invoke the right binary. So, the binary ed2k from amule was
-renamed as ed2k.amule and this from xmule was renamed ed2k.xmule.
-According to Debian, I use a diversion to rename this file :-)
-
-
-
-CONFFILES IN YOUR HOME
------------------
-aMule is a fork of xMule, it uses the same files (~/.aMule/).
-
-
-
-TOO HIGH CPU USAGE
-------------------
-If you have a high CPU usage with amule (you can see that when you 
-run 'top'), you need maybe to compile a new kernel. See this topic :
-http://www.amule.org/wiki/index.php/AMule_makes_everything_slow
-http://xmule.org/forums/index.php?showtopic=1030
-
-
- -- Julien Delange <julien@gunnm.org>, Sat, 27 Sep 2003 00:11:07 +0200
- -- Modified by Vollstrecker <amule@vollstreckernet.de>, Mon, 29 Mar 2005 00:44:12 +0200

aMule-2.2.6.tar.bz2/debian/amule.override Deleted

aMule-2.2.6.tar.bz2/debian/amuleweb-dbg.override Deleted

aMule-2.2.6.tar.bz2/debian/amuleweb.override Deleted

aMule-2.2.6.tar.bz2/docs/ED2K-Links.HOWTO Deleted

@@ -1,155 +0,0 @@
-
-
-          --------------------------------------------------
-          How to ED2K Links from your web browser with aMule
-          --------------------------------------------------
-
-
- Previous notes
-----------------
-
-  This text file is old and discontinued.
-  This howto is now online in our wiki so please visit it
-  instead of this document.
-
-  http://www.amule.org/wiki/index.php/Ed2k_links_handling
-
-  You can safely stop reading this document now ;)
-
-
- Konqueror
------------
-
-  1. /usr/kde/3.1/share/services
-  You can find it by file names ended with .protocol
-  Somethign like `find /usr -name "*.protocol"` or `find /opt -name "*.protocol"`
-  or even put / to path if you want.
-
-  2. If the first was successful, create a file named something like e2k.protocol in
-  the mentioned directory:
-
-  [Protocol]
-  exec=/usr/local/bin/ed2k "%u"
-  protocol=ed2k
-  input=none
-  output=none
-  helper=true
-  listing=false
-  reading=false
-  writing=false
-  makedir=false
-  deleting=false
-
-  3. Reload konqueror
-
-  (Credits: gfdsa)
-
-
- Opera
--------
-
-  * Opera 6.11
-
-    First of all: Opera 6.11 doesn't pass complete URL to external programs - only URL
-    without protocol. don't know wheather this behaviour has changed in later releases.
-
-    Create amule_submit.sh with this content:
-
-    #!/bin/sh
-    /usr/local/bin/ed2k "ed2k://$1";
-
-    Now edit (as root) /etc/opera6rc or as non-root ~/.opera/opera6.ini:
-
-    [Trusted Applications]
-    ed2k=/usr/local/bin/amule_submit.sh
-
-    [User Prefs]
-    TrustedExternalURLProtocols=ed2k
-
-    (Credits: thermoman ( Marcel Meckel ) )
-
-  * Opera 7.1 (slightly different from Opera 6)
-
-    Edit either /etc/opera6rc or ~/.opera/opera6.ini and add the following:
-
-    In [User Prefs]
-    TrustedExternalURLProtocols=ed2k
-
-    In [Trusted Applications]
-    ed2k=/path/to/ed2k ed2k://%u 
-
-    (Credits: ender)
-
-
- Mozilla 1.3+ / FireFox 0.6+
------------------------------
-
-  1. Go to http://mozex.mozdev.org/installation.html and click the
-  install link. This will automatically install Mozex plugin for
-  your browser.
-
-  2. Restart your browser.
-
-  3a. Firefox:  Go to Tools->Preferences->Extensions->Mozex->Options
-  and add 'ed2k %r' in the ED2K box.
-
-  3b. Mozilla: Go to Edit->Preferences->Mozex and add 'ed2k %r' in
-  the ED2K box.
-
- Mozilla before v1.3 / Firefox before v0.6
--------------------------------------------
-
-  1) Go to http://protozilla.mozdev.org/download.html
-  Choose the version fitting your mozilla-version and click
-  on "install". It will auto-install protozilla.
-  Now close mozilla completely.
-
-  Notes:
-  - You must have write permission to the mozilla-installation-directory
-    for this. If you've installed mozilla to /usr , you'll have to be
-    root probably.
-  - The downloadable precompiled version of protozilla apparently does
-    _not_ work with debian mozilla packages. It _does_ work together
-    with the precompiled version of 1.2.1 available at mozilla.org for
-    example (or you can build both mozilla and protozilla yourself)
-
-  2) This step is only necessary if you had to start mozilla as root in
-  step 1). If you did step 1) with the same user as you normally use,
-  you can skip it
-
-  As root do:
-  cp -r /root/.mozilla/PROFILENAME/RANDOM.slt/protozilla/
-  /home/USERNAME/.mozilla/PROFILENAME2/RANDOM.slt/"
-
-  Copy protozilla-configuration from root's home to user's home.
-
-  cd /home/USERNAME/.mozilla/PROFILENAME/RANDOM.slt/
-  chown -R YOURUSER.YOURGROUP protozilla"
-
-  cd to user's mozilla config-dir and change file-ownership parameters.
-
-  Note:
-  USERNAME: name of your normal, non-root user
-  PROFILENAME: name of the profile you'll want to use
-  RANDOM: random alphanumeric string, autogenerated by mozilla
-  YOURUSER, YOURGROUP: user and group of your normal user
-
-  3) Setup a protocol-handler for ed2k-links:
-
-  cd to ~/.mozilla/PROFILENAME/RANDOM.slt/protozilla/protocol
-
-  Create a file called "ed2k.cmd" with the following content:
-
-  ed2k ed2k:$URI_DATA
-
-  Do this with your favorite text-editor, the file doesn't have to be executable
-
-  Now restart mozilla, and everything should work.
-
-  (Credits: R. Pokorny aka rpokorny )
-
-
- Other browsers / More help
-----------------------------
-
-  Please visit http://www.amule.org/wiki/index.php/Ed2k_links_handling

aMule-2.2.6.tar.bz2/docs/amule-win32.HOWTO.txt Deleted

aMule-2.2.6.tar.bz2/docs/man/amule.eu.1 Deleted

@@ -1,45 +0,0 @@
-.TH AMULE 1 "2005 Martxoa" "aMule 2.0.0b" "aMule"
-.SH IZENA
-amule \- Plataforma orotarako eMule p2p bezeroa
-.SH SYNOPSIS
-.B amule
-.RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-i ]
-.RB [ \-geometry " " \fI<geom> ]
-.RB [ \-d ]
-.RB [ \-o ]
-.RB [ \-r ]
-.SH AZALPENA
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Bertsio zenbakia bistaratzen du.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Argibide hauek bistaratzen ditu.
-.TP
-\fB-i\fR, \fB\-\-enable\-stdin\fR
-Ez irteera estandarra ezgaitu.
-.TP
-\fB\-geometry\fR \fI<geom>\fR
-Aplikazioaren geometria ezarri.
-\fI<geom>\fR-ek X11 aplikazioen formatu estanda berdina erabiltzen du:	[\fB=\fR][\fI<width>\fR{\fBxX\fR}\fI<height>\fR][{\fB+-\fR}\fI<xoffset>\fR{\fB+-\fR}\fI<yoffset>\fR]
-.TP
-\fB\-d\fR, \fB\-\-disable\-fatal\fR
-Ez kudeatu salbuespen konponezinak.
-.TP
-\fB\-o\fR, \fB\-\-log\-stdout\fR
-Erregistro mezuak irteera estandarrean inprimatu.
-.TP
-\fB\-r\fR, \fB\-\-reset\-config\fR
-Konfigurazioan balio lehenetsian berrezarri.
-\
-.SH FITXATEGIAK
-~/.aMule/*
-.SH ZORRIEN BERRI EMATEN
-Mesedez zorrien berri emateko gure foroa (\fIhttp://forum.amule.org/\fR), edo gure zorri kudeatzailea (\fIhttp://bugs.amule.org/\fR) erabili.
-Mesedez ez eman zorrien berri epostaz, ez gure eposta zerrendan ez taldeko partaideei.
-.SH COPYRIGHT
-aMule eta inguruneko lanabes guztiak GNU Lizentzia Publiko Orokorraz banatzen dira.
-.SH IKUSI ERE
-\fBalc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)

aMule-2.2.6.tar.bz2/docs/man/amulecmd.eu.1 Deleted

@@ -1,116 +0,0 @@
-.TH AMULECMD 1 "2005 Martxoa" "aMuleCmd 2.0.0b" "aMule lanabesak"
-.SH IZENA
-amulecmd \- aMule kontrolatzeko testuan oinarrituriko programa
-.SH LABURPENA
-.B amulecmd
-.RB [ \-h " " \fI<ost> ]
-.RB [ \-p " " \fI<ataka> ]
-.RB [ \-P " " \fI<pasahitza> ]
-.RB [ \-f " " \fI<bidea> ]
-.RB [ \-q ]
-.RB [ \-v ]
-.RB [ \-l " " \fI<hizkuntza> ]
-.RB [ \-w ]
-.RB [ \-c " " \fI<komandoa> ]
-.PP
-.B amulecmd
-.RB [ \-f " " \fI<bidea> ]
-.B \-\-create-config-from=\fI<bidea>
-.PP
-.B amulecmd
-.RB [ \-\-help ]
-.RB [ \-\-version ]
-.SH DESCRIPTION
-\fBamulecmd\fR aMule kontrolatzeko testuan oinarrituriko programa bat da.
-Programa abiarazten duzunean argibide erabilgarriak jaso ditzazkezu.
-.TP
-\fB\-h\fR, \fB\-\-host\fR=\fI<ostalaria>\fR
-aMule abiarazirik dagoen ostalaria (lehenetsia: \fIlocalhost\fR). \fI<host>\fR IP helbide edo DNS izen bat izan behar 
-da.
-.TP
-\fB\-p\fR, \fB\-\-port\fR=\fI<ataka>\fR
-aMule-ren kanpo konexioetarako ataka, Hobespenak->Urruneko Kontrolak atalean ezarririk dagoen bezala (lehenetsia: 
-\fI4712\fR)
-.TP
-\fB\-P\fR, \fB\-\-password\fR=\fI<pasahitza>\fR
-Kanpo Konexioetarako pasahitza
-.TP
-\fB\-f\fR, \fB\-\-config\-file\fR=\fI<bidea>\fR
-emandako konfigurazio fitxategia erabili. Lehenetsiriko konfigurazio fitxategia \fI~/.aMule/remote.conf\fR da
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-ez irteerarik inprimatu irteera estandarrean. Ez da erabilgarria \fBamulecmd\fR erabiltzean.
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-luzea izan \- arazpen mezuak ere ikusi
-.TP
-\fB\-l\fR, \fB\-\-locale\fR=\fI<hizkuntza>\fR
-Programa lokalak ezartzen ditu (hizkuntza).
-\fOHARRAK\fr atala irakurri \fI<hizkuntza>\fR parametroaz gehiago jakiteko.
-.TP
-\fB\-w\fR, \fB\-\-write\-config\fR
-komando lerroko aukerak konfigurazio fitxategian gorde eta irten
-.TP
-\fB\-c\fR, \fB\-\-command\fR=\fI<komandoa>\fR
-\fI<komadoa>\fR amulecmd-ren barnean egin bazen bezala abiarazi eta irten
-.TP
-\fB\-\-create\-config\-from\fR=\fI<bidea>\fR
-konfigurazio fitxategia \fI<bidea>\fR oinarriturik egin, zein aMule konfigurazio fitxategiaren bidea izan behar da eta irten
-.TP
-\fB\-\-help\fR
-erabilera laguntza argibideak bistarazi eta irten
-.TP
-\fB\-\-version\fR
-programa bertsio argibideak bistarazi eta irten
-.SH OHARRAK
-.SS Bideak
-\fI<bidea>\fR balio duten aukera guztietan, \fI<bidea>\fR-ek ez badu direktorio zatirik (Adib. fitxategi izen 
-arrunta), aMule konfigurazio direktorioan (\fI~/.aMule\fR) dagoela pentsatuko da.
-.SS Hizkuntzak
-\fB\-l\fR aukeraren \fI<hizkuntza>\fR parametroa hurrengo formatukoa da: 
-\fIhizkuntza\fR[\fB_\fIHIZKUNTZA\fR][\fB.\fIkodeketa\fR][\fB@\fIaldagaia\fR]
-non \fIhizkuntzalang\fR hizkuntza nagusia, \fIHIZKUNTZA\fR azpihizkuntz/kokapena, \fIkodeketak\fR karkatere jokoa 
-diren eta \fIaldagaia\fR-k erabiltzaileari kategoria hizkuntza aldagaiak erabiltzeko aukera ematen du".
-.PP
-Adibdiez, hurrengo kateak egokiak dira:
-.br
-eu
-.br
-eu_FR
-.br
-eu_ES.iso88591
-.br
-de_DE@euro
-.br
-de_DE.iso88591@euro
-.PP
-Kontutan izan gohiko kate guztiak hizkuntz definizio zuzenak direla nahi ez \fIkodeketak\fR eta \fIaldagaia\fR 
-erabili.
-.PP
-Goiko formatuaz gain, hizkuntzaren Ingelesezko izen osoaz ere ezarri dezakezu - beraz \fB\-l german\fR egokia da eta 
-\fB-l de_DE\fR erabiltzearen berdina da.
-.PP
-Ez denean konfigurazio fitxategian edo komando lerroan lokalik ezartzen sistemaren lehenetsia erabiliko da.
-.SH FITXATEGIAK
-~/.aMule/remote.conf
-.SH ADIBIDEA
-Normalean amulecmd lehen aldian horrela abiarazi behar da:
-.PP
-\fBamulecmd\fR \fB\-h\fR \fIostalaria\fR \fB\-p\fR \fIECataka\fR \fB\-P\fR \fIECpasahitza\fR \fB\-w\fR
-.PP
-edo
-.PP
-\fBamulecmd\fR \fB\-\-create-config-from\fR=\fI/home/username/.aMule/amule.conf\fR
-.PP
-Honek ezarpenak \fI$HOME/.aMule/remote.conf\fR-en gordeko ditu, eta hemendik aurrera hau eginaz aski izango da:
-.PP
-.B amulecmd
-.PP
-Noski ez duzu adibide hau jarraitu beharrik.
-.SH ZORRIEN BERRI EMATEN
-Mesedez zorrien berri emateko gure foroa (\fIhttp://forum.amule.org/\fR), edo gure zorri kudeatzailea (\fIhttp://bugs.amule.org/\fR) erabili.
-Mesedez ez eman zorrien berri epostaz, ez gure eposta zerrendan ez taldeko partaideei.
-.SH COPYRIGHT
-aMule eta inguruneko lanabes guztiak GNU Lizentzia Publiko Orokorraz banatzen dira.
-.SH IKUSI ERE
-\fBamule\fR(1), \fBamuleweb\fR(1)

aMule-2.2.6.tar.bz2/docs/man/amuled.eu.1 Deleted

@@ -1,46 +0,0 @@
-.TH AMULED 1 "2005" "aMule Deabrua 2.0.0b" "aMule Lanabesa"
-.SH NAME
-amuled \- Plataforma orotarako eMule p2p bezeroa \- deabru bertsioa
-.SH LABURPENA
-.B amuled
-.RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-i ]
-.RB [ \-f ]
-.RB [ \-c " " \fI<dir> ]
-.RB [ \-d ]
-.RB [ \-o ]
-.RB [ \-r ]
-
-.SH AZALPENA
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Bertsio zenbakia bistaratzen du.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Azlapen hau bistaratzen du.
-.TP
-\fB-i\fR, \fB\-\-enable\-stdin\fR
-Ez sarrera estandarra ezgaitu.
-.TP
-\fB\-f\fR, \fB\-\-full\-daemon\fR
-Atzeko planoan ireki
-.TP
-\fB\-c\fR, \fB\-\-config\-dir\fR=\fI<dir>\fR
-Konfigurazioa home\-etik beharrean <dir>-etik irakurri.
-.TP
-\fB\-d\fR, \fB\-\-disable\-fatal\fR
-Ez kudeatu salbuespen konponezinak.
-.TP
-\fB-o\fR, \fB\-\-log\-stdout\fR
-Erregistro mezuak irteera estandarrean inprimatu
-.SH FITXATEGIAK
-~/.aMule/*
-.SH ZORRIEN BERRI EMATEN
-Mesedez zorrien berri emateko gure foroa (\fIhttp://forum.amule.org/\fR), edo gure zorri kudeatzailea
-(\fIhttp://bugs.amule.org/\fR) erabili.
-Mesedez ez eman zorrien berri epostaz, ez gure eposta zerrendan ez taldeko partaideei.
-.SH COPYRIGHT
-aMule eta inguruneko lanabes guztiak GNU Lizentzia Publiko Orokorraz banatzen dira.
-.SH IKUSI ERE
-\fBalcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)

aMule-2.2.6.tar.bz2/docs/man/amuleweb.eu.1 Deleted

@@ -1,186 +0,0 @@
-.TH AMULEWEB 1 "2005 Martxoa" "aMule web zerbitzarua v2.0.0" "aMule lanabesak"
-.SH IZENA
-amuleweb \- aMule web zerbitzaria
-.SH LABURPENA
-.B amuleweb
-.RB [ \-h " " \fI<ostalaria> ]
-.RB [ \-p " " \fI<ataka> ]
-.RB [ \-P " " \fI<pasahitza> ]
-.RB [ \-f " " \fI<bidea> ]
-.RB [ \-q ]
-.RB [ \-v ]
-.RB [ \-l " " \fI<hizkuntza> ]
-.RB [ \-w ]
-.RB [ \-t " " \fI<izena> ]
-.RB [ \-s " " \fI<ataka> ]
-.RB [ \-z ]
-.RB [ \-Z ]
-.RB [ \-A " " \fI<pasahitza> ]
-.RB [ \-G " " \fI<pasahitza> ]
-.RB [ \-a ]
-.RB [ \-d ]
-.RB [ \-L ]
-.RB [ \-N ]
-.PP
-.B amuleweb
-.RB [ \-f " " \fI<bidea> ]
-.B \-\-create-config-from=\fI<bidea>
-.PP
-.B amuleweb
-.RB [ \-\-help ]
-.RB [ \-\-version ]
-.PP
-.B amuleweb \-\-amule\-config\-file=\fI<bidea>
-.PP
-.B amuleweb \-\-no\-php
-.SH AZALPENA
-\fBamuleweb\fR-ek web nabigatzaile baten bidezko zure sarrera kudetzaen du.
-amuleweb \fBamule\fR(1)\-ekin batera edo beranduago edozein momentutan abiarazi dezakezu.
-Aukerak komando lerro edo konfigurazio fitxategiaren bidez ezarri daitezke.
-Komando lerro aukerak konfigurazio fitxategiarenen aurretik erabiltzen dira.
-.TP
-\fB\-h\fR, \fB\-\-host\fR=\fI<ostalaria>\fR
-Amule abiarazirik dagoen ostalaria (lehenetsia: \fIlocalhost\fR).
-\fI<ostalaria>\fR IP helbide edo DNS izen bat izan behar da.
-.TP
-\fB\-p\fR, \fB\-\-port\fR=\fI<ataka>\fR
-aMule-ren kanpo konexioetarako ataka, Hobespenak->Urruneko Kontrolak atalean ezarririk dagoen bezala (lehenetsia: \fI4712\fR)
-.TP
-\fB\-P\fR, \fB\-\-password\fR=\fI<pasahitza>\fR
-Kanpo Konexioetarako pasahitza
-.TP
-\fB\-f\fR, \fB\-\-config\-file\fR=\fI<bidea>\fR
-emandako konfigurazio fitxategia erabili. 
-Lehenetsiriko konfigurazio fitxategia \fI~/.aMule/remote.conf\fR da.
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-ez irteerarik inprimatu irteera estandarrean.
-\fB\-q\fR erabili dezakezu web zerbitzaria deabru bezala erabiltzeko, adib '\fBamuleweb \-q &\fR'
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-luzea izan \- arazpen mezuak ere ikusi
-.TP
-\fB\-l\fR, \fB\-\-locale\fR=\fI<hizkuntza>\fR
-Programaren lokalak ezartzen ditu (hizkuntza).
-\fROHARRAK\fr atala irakurri \fI<hizkuntza>\fR parametroaz gehiago jakiteko.
-.TP
-\fB\-w\fR, \fB\-\-write\-config\fR
-komando lerroko aukerak konfigurazio fitxategian gorde eta irten
-.TP
-\fB\-\-create\-config\-from\fR=\fI<bidea>\fR
-konfigurazio fitxategia \fI<bidea>\fR oinarriturik egin, zein aMule konfigurazio fitxategiaren bidea izan behar da eta irten
-.TP
-\fB\-t\fR, \fB\-\-template\fR=\fI<izena>\fR
-\fI<izena>\fR izeneko txantiloia kargarzen du. Ikusi:
-.B GAI ONARPENA
-.TP
-\fB\-s\fR, \fB\-\-server\-port\fR=\fI<ataka>\fR
-Web zerbitzariaren HTTP ataka. Nabigatzailean irekitzeko erabiliko den ataka (lehenetsia: \fI4711\fR)
-.TP
-\fB\-z\fR, \fB\-\-enable\-gzip\fR
-HTTP trafikoan sare zabalera aurrezteko gzip konpresioa gaitu
-.TP
-\fB\-Z\fR, \fB\-\-disable\-gzip\fR
-gzip konpresioa erabiltzea ezgaitu (lehenespena)
-.TP
-\fB\-A\fR, \fB\-\-admin\-pass\fR=\fI<pasahitza>\fR
-web zerbitzariaren sarrera osorako pasahitza
-.TP
-\fB\-G\fR, \fB\-\-guest\-pass\fR=\fI<pasahitza>\fR
-web zerbitzariaren gonbidatu pasahitza
-.TP
-\fB\-a\fR, \fB\-\-allow\-guest\fR
-Gonbidatu sarrera onartu
-.TP
-\fB\-d\fR, \fB\-\-deny\-guest\fR
-Gonbidatu sarrera ezgaitu (lehenespena)
-.TP
-\fB\-L\fR, \fB\-\-load\-settings\fR
-Webzerbitzari ezarpenak urruneko aMuletik/aMulen kargatu/gorde.
-Honek amuleweb-ek komando lerroko eta konfigurazio fitxategiko ezarpenak alde batetara uztea eta aMule-tik kargatzea 
-eragiten du. Hobespenak gordetzerakoan konfigurazio fitxategian beharrean aMule-n gordeko dira.
-(Noski. honek ezarpen hauetarako bakarrik funtzionatzen du, aMule-ren Hobespenak->Urruneko Kontrolean ezarri daitezke)
-.TP
-\fB\-N\fR, \fB\-\-no\-script\-cache\fR
-PHP orriak eskaera bakoitzean birkonpilatu
-.TP
-\fB\-\-amule\-config\-file\fR=\fI<bidea>\fR
-aMule konfigurazio fitxategiaren bidea.
-.B EZ ZUZENEAN ERABILI
-aMule-k aukera hau amuleweb aMulerekin batera abiaraztean erabiltzen du.
-Aukera honek komando lerroko eta konfigruazio fitxategiko ezarpenak alde batetara uztea eragiten du, hobespenak
-emandako konfigurazio fitxategitik irakurriko dira, eta \fB\-q \-L\fR aukerak ere adierazten ditu.
-.TP
-\fB\-\-help\fR
-Erabilera laguntza argibideak bisatarazi eta irten
-.TP
-\fB\-\-version\fR
-Programa bertsio argibideak bistarazi eta irten
-.SH OHARRAK
-.SS Bideak
-Fitxategi bat bide absolutua eman gabe ezarri ezkero ((Adib. fitxategi izen arrunta, \fB\-\-path\fR=\fIremote.conf\fR 
-bezalakoa), orduan fitxategi hori aMule konfigurazio direktorioan (\fI~/.aMule\fR) bilatuko da.
-.SS Hizkuntzak
-\fB\-l\fR aukeraren \fI<hizkuntza>\fR parametroa hurrengo formatukoa da: 
-\fIhizkuntza\fR[\fB_\fIHIZKUNTZA\fR][\fB.\fIkodeketa\fR][\fB@\fIaldagaia\fR] non \fIhizkuntza\fR hizkuntza nagusia, \fIHIZKUNTZA\fR azpihizkuntz/kokapena, \fIkodeketak\fR karkatere jokoa diren eta \fIaldagaia\fR-k erabiltzaileari kategoria hizkuntza aldagaiak erabiltzeko aukera ematen du"
-.PP
-Adibdiez, hurrengo kateak egokiak dira:
-.br
-eu
-.br
-eu_FR
-.br
-eu_ES.iso88591
-.br
-de_DE@euro
-.br
-de_DE.iso88591@euro
-.PP
-Kontutan izan goiko kate guztiak hizkuntz definizio zuzenak direla nahi ez \fIkodeketak\fR eta \fIaldagaia\fR
-erabili.
-.PP
-Goiko formatuaz gain, hizkuntzaren Ingelesezko izen osoaz ere ezarri dezakezu - beraz \fB\-l german\fR egokia da eta
-\fB-l de_DE\fR erabiltzearen berdina da.
-.PP
-Ez denean konfigurazio fitxategian edo komando lerroan lokalik ezartzen sistemaren lehenetsia erabiliko da.
-.SH GAI ONARPENA
-\fBamuleweb\fR informazio gai ezberdinetan erakusteko gai da.
-Gai hauek txantiloi deitzen dira, amuleweb-ek txantiloi bat kargatzeko \fB\-t\fR komando lerroaren bidez.
-Txantiloiak bi kokapenetan bilatzen dira: lehenik \fI~/.aMule/webserver/\fR-ean eta gero 
-\fI$(pkgdatadir)/webserver/\fR-en 
-(\fI$(pkgdatadir)\fR arkitekturatik independiente diren datuen instalazio kokapena da, normalena /usr/share/amule 
-antzeko zerbait). 
-Txantiloi bakoitza bere izen berdineko azpikarpeta batetan egon behar da, eta azpikarpeta honek gaiak behar dituen 
-fitxategi guztiak eduki behar ditu.
-Erabiltzen ari den txantiloi izena aMule.tmpl izan behar da.
-.PP
-Adibidez, lehenetsiriko txantiloia ('default' izekoa) webserver/default/\-en dago eta direktorio honek aMule.tmpl etairudi fitxategi anitz ditu.
-.SH FITXATEGIAK
-~/.aMule/remote.conf
-.br
-~/.aMule/webserver/
-.br
-\fI$(pkgdatadir)\fR/webserver/
-.SH ADIBIDEA
-Normalean amuleweb lehenengoz horrela abiarazi behar da:
-.PP
-\fBamuleweb\fR \fB\-h\fR \fIostalaria\fR \fB\-p\fR \fIECataka\fR \fB\-P\fR \fIECpasahitza\fR \fB\-s\fR \fIHTTPataka\fR \fB\-A\fR \fIAdminPasahitza\fR \fB\-w\fR
-.PP
-edo
-.PP
-\fBamuleweb\fR \fB\-\-create-config-from\fR=\fI/home/username/.aMule/amule.conf\fR
-.PP
-Honek ezarpenak \fI$HOME/.aMule/remote.conf\fR-en gordeko ditu eta gero hau egin beharko duzu:
-.PP
-.B amuleweb
-.PP
-Noski lehenengo adibidean bainon aukera gehiago edo gutxiago erabili ditzazkezu edo 
-aukerarik gabe abiarazi.
-.SH ZORRIEN BERRI EMATEN
-Mesedez zorrien berri emateko gure foroa (\fIhttp://forum.amule.org/\fR), edo gure zorri 
-kudeatzai$Mesedez ez eman zorrien berri epostaz, ez gure eposta zerrendan ez taldeko 
-partaideei.
-.SH COPYRIGHT
-aMule eta inguruneko lanabes guztiak GNU Lizentzia Publiko Orokorraz banatzen dira.
-.SH IKUSI ERE
-\fBamule\fR(1), \fBamulecmd\fR(1)

aMule-2.2.6.tar.bz2/docs/man/ed2k.eu.1 Deleted

@@ -1,36 +0,0 @@
-.TH ED2K "1" "March 2005" "aMule ED2k link parser v1.1.0" "aMule utilities"
-.SH IZENA
-ed2k \- aMule ED2k lotura analizatzailea
-.SH LABURPENA
-.B ed2k
-.I <ED2k_lotura>
-.PP
-.B ed2k
-.RB [ \-\-help ]
-.RB [ \-\-config\-dir, \-c ]
-.RB [ \-\-version ]
-.SH DESCRIPTION
-aMule ED2k lotura analizatzailea 1.1.0b.
-Emandako \fI<ED2k_link>\fR lotur aMulera bidali, adib. berau ~/.aMule/ED2KLinks fixtategian idatzi, zein aMulek segunduro begiratzen duen lotura berrien bila.
-\fBed2k\fR-ek fitxategi, zerbitzari eta zerbitzari zerrenda loturak onartzen ditu.
-.SS "Erabilera:"
-.TP
-\fB\-\-help\fR
-Laguntza hau bistarazi.
-.TP
-\fB\-c\fR, \fB\-\-config\-dir\fR=\fI<dir>\fR 
-Amuleren konfigurazio fitxategia ezartzen du, bertan \fBed2k\fR abiarazten duen erabiltzaileak idazteko eskubidea izan behar du.
-.TP
-\fB\-\-version\fR
-Bertsio argibideak bistarazi.
-.SH FITXATEGIAK
-~/.aMule/ED2KLinks
-.SH ZORRIEN BERRI EMATEN
-Mesedez zorrien berri emateko gure foroa (\fIhttp://forum.amule.org/\fR), edo gure zorri kudeatzailea 
-(\fIhttp://bugs.amule.$
-Mesedez ez eman zorrien berri epostaz, ez gure eposta zerrendan ez taldeko partaideei.
-.SH COPYRIGHT
-aMule eta inguruneko lanabes guztiak GNU Lizentzia Publiko Orokorraz banatzen dira.
-.SH IKUSI ERE
-.SH SEE ALSO
-\fBamule\fR(1)

aMule-2.2.6.tar.bz2/docs/man/manpages-de.po Deleted

@@ -1,1726 +0,0 @@
-# translation of manpages-de.po to
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) 2007 Free Software Foundation, Inc.
-#
-# Werner Mahr <werner@vollstreckernet.de>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: manpages-de\n"
-"POT-Creation-Date: 2007-08-22 18:10+0200\n"
-"PO-Revision-Date: 2007-08-23 13:11+0200\n"
-"Last-Translator: Werner Mahr <werner@vollstreckernet.de>\n"
-"Language-Team:  <de@li.org>\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"
-
-# type: TH
-#: amule.1:1
-#, no-wrap
-msgid "AMULE"
-msgstr "AMULE"
-
-# type: TH
-#: amule.1:1 amuled.1:1 amulecmd.1:1 amulegui.1:1 amuleweb.1:1 ed2k.1:1 ../../src/utils/cas/docs/cas.1:1 ../../src/utils/cas/docs/cas.1:6 ../../src/utils/wxCas/docs/wxcas.1:1 ../../src/utils/xas/docs/xas.1:1
-#, no-wrap
-msgid "January 2007"
-msgstr "Januar 2007"
-
-# type: TH
-#: amule.1:1
-#, no-wrap
-msgid "aMule v2.2.0"
-msgstr "aMule v2.2.0"
-
-# type: TH
-#: amule.1:1
-#, no-wrap
-msgid "aMule"
-msgstr "aMule"
-
-# type: SH
-#: amule.1:2 amuled.1:2 amulecmd.1:2 amulegui.1:2 amuleweb.1:2 ed2k.1:2 ../../src/utils/cas/docs/cas.1:2 ../../src/utils/wxCas/docs/wxcas.1:2 ../../src/utils/xas/docs/xas.1:2
-#, no-wrap
-msgid "NAME"
-msgstr "NAME"
-
-# type: Plain text
-#: amule.1:4
-msgid "amule - the all-platform eMule p2p client"
-msgstr "amule - der alle-Plattformen eMule p2p Client"
-
-# type: SH
-#: amule.1:4 amuled.1:4 amulecmd.1:4 amulegui.1:4 amuleweb.1:4 ed2k.1:4 ../../src/utils/cas/docs/cas.1:4 ../../src/utils/wxCas/docs/wxcas.1:4 ../../src/utils/xas/docs/xas.1:4
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr "SYNTAX"
-
-# type: Plain text
-#: amule.1:13
-msgid ""
-"B<amule> [B<-v>] [B<-h>] [B<-i>] [B<-geometry> I<E<lt>geomE<gt>>] [B<-d>] "
-"[B<-o>] [B<-r>]"
-msgstr ""
-"B<amule> [B<-v>] [B<-h>] [B<-i>] [B<-geometry> I<E<lt>geomE<gt>>] [B<-d>] "
-"[B<-o>] [B<-r>]"
-
-# type: SH
-#: amule.1:13 amuled.1:15 amulecmd.1:24 amulegui.1:6 amuleweb.1:36 ed2k.1:12 ../../src/utils/cas/docs/cas.1:7 ../../src/utils/wxCas/docs/wxcas.1:6 ../../src/utils/xas/docs/xas.1:6
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr "BESCHREIBUNG"
-
-# type: TP
-#: amule.1:14 amuled.1:16
-#, no-wrap
-msgid "B<-v>, B<--version>"
-msgstr "B<-v>, B<--version>"
-
-# type: Plain text
-#: amule.1:17 amuled.1:19 amulecmd.1:65 amuleweb.1:118 ed2k.1:26
-msgid "Displays the current version number."
-msgstr "Zeigt die derzeitige Versionsnummer an."
-
-# type: TP
-#: amule.1:17 amuled.1:19 ../../src/utils/cas/docs/cas.1:28
-#, no-wrap
-msgid "B<-h>, B<--help>"
-msgstr "B<-h>, B<--help>"
-
-# type: Plain text
-#: amule.1:20 amuled.1:22 amulecmd.1:62 amuleweb.1:115 ed2k.1:20 ../../src/utils/cas/docs/cas.1:31
-msgid "Prints a short usage description."
-msgstr "Gibt eine kurze Beschreibung aus."
-
-# type: TP
-#: amule.1:20 amuled.1:22
-#, no-wrap
-msgid "B<-i>, B<--enable-stdin>"
-msgstr "B<-i>, B<--enable-stdin>"
-
-# type: Plain text
-#: amule.1:23 amuled.1:25
-msgid "Does not disable stdin."
-msgstr "Schaltet stdin nicht ab."
-
-# type: TP
-#: amule.1:23
-#, no-wrap
-msgid "B<-geometry> I<E<lt>geomE<gt>>"
-msgstr "B<-geometry> I<E<lt>geomE<gt>>"
-
-# type: Plain text
-#: amule.1:27
-msgid ""
-"Sets the geometry of the app.  I<E<lt>geomE<gt>> uses the same format as "
-"standard X11 "
-"apps:\t[B<=>][I<E<lt>widthE<gt>>{B<xX>}I<E<lt>heightE<gt>>][{B<+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>]"
-msgstr "Gibt die Geometrie des Programms an.  I<E<lt>geomE<gt>> benutzt das selbe Format wie Standard X11 Anwendungen\t[B<=>][I<E<lt>BreiteE<gt>>{B<xX>}I<E<lt>HöheE<gt>>][{B<+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>]"
-
-# type: TP
-#: amule.1:27 amuled.1:31
-#, no-wrap
-msgid "B<-d>, B<--disable-fatal>"
-msgstr "B<-d>, B<--disable-fatal>"
-
-# type: Plain text
-#: amule.1:30 amuled.1:34
-msgid "Does not handle fatal exception."
-msgstr "Fehlerbehandlung für fatale Fehler abschalten."
-
-# type: TP
-#: amule.1:30 amuled.1:34
-#, no-wrap
-msgid "B<-o>, B<--log-stdout>"
-msgstr "B<-o>, B<--log-stdout>"
-
-# type: Plain text
-#: amule.1:33 amuled.1:37
-msgid "Print log messages to stdout."
-msgstr "Gibt Log-Meldungen auf der Standardausgabe aus."
-
-# type: TP
-#: amule.1:33
-#, no-wrap
-msgid "B<-r>, B<--reset-config>"
-msgstr "B<-r>, B<--reset-config>"
-
-# type: Plain text
-#: amule.1:36
-msgid "Resets config to default values."
-msgstr "Setzt die Konfiguration auf die Standardwerte zurück."
-
-# type: SH
-#: amule.1:36 amuled.1:37 amulecmd.1:238 amuleweb.1:157 ed2k.1:26 ../../src/utils/cas/docs/cas.1:33
-#, no-wrap
-msgid "FILES"
-msgstr "DATEIEN"
-
-# type: Plain text
-#: amule.1:39 amuled.1:39
-msgid "~/.aMule/*"
-msgstr "~/.aMule/*"
-
-# type: SH
-#: amule.1:39 amuled.1:39 amulecmd.1:254 amulegui.1:13 amuleweb.1:177 ed2k.1:28 ../../src/utils/cas/docs/cas.1:41 ../../src/utils/wxCas/docs/wxcas.1:17 ../../src/utils/xas/docs/xas.1:16
-#, no-wrap
-msgid "REPORTING BUGS"
-msgstr "FEHLER MELDEN"
-
-# type: Plain text
-#: amule.1:42 amuled.1:42 amulecmd.1:257 amulegui.1:16 amuleweb.1:180 ed2k.1:31 ../../src/utils/cas/docs/cas.1:44 ../../src/utils/wxCas/docs/wxcas.1:20 ../../src/utils/xas/docs/xas.1:19
-msgid ""
-"Please report bugs either on our forum (I<http://forum.amule.org/>), or in "
-"our bugtracker (I<http://bugs.amule.org/>).  Please do not report bugs in "
-"e-mail, neither to our mailing list nor directly to any team member."
-msgstr "Bitte meldet Fehler entweder in unserem Forum (I<http://forum.amule.org/>), oder in unseren Bugtracker (I<http://bugs.amule.org/>). Bitte meldet uns keine Fehler per E-Mail, noch auf unsere Mailingliste oder direkt an unsere Teammitglieder."
-
-# type: SH
-#: amule.1:42 amuled.1:42 amulecmd.1:257 amulegui.1:16 amuleweb.1:180 ed2k.1:31 ../../src/utils/cas/docs/cas.1:44 ../../src/utils/wxCas/docs/wxcas.1:20 ../../src/utils/xas/docs/xas.1:19
-#, no-wrap
-msgid "COPYRIGHT"
-msgstr "COPYRIGHT"
-
-# type: Plain text
-#: amule.1:44 amuled.1:44 amulecmd.1:259 amulegui.1:18 amuleweb.1:182 ed2k.1:33 ../../src/utils/cas/docs/cas.1:46 ../../src/utils/wxCas/docs/wxcas.1:22 ../../src/utils/xas/docs/xas.1:21
-msgid ""
-"aMule and all of its related utilities are distributed under the GNU General "
-"Public License."
-msgstr "aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU General Public License"
-
-# type: SH
-#: amule.1:44 amuled.1:44 amulecmd.1:259 amulegui.1:18 amuleweb.1:182 ed2k.1:33 ../../src/utils/cas/docs/cas.1:46 ../../src/utils/wxCas/docs/wxcas.1:22 ../../src/utils/xas/docs/xas.1:21
-#, no-wrap
-msgid "SEE ALSO"
-msgstr "SIEHE AUCH"
-
-# type: Plain text
-#: amuled.1:1
-msgid ""
-"B<alc>(1), B<alcc>(1), B<amuled>(1), B<amulecmd>(1), B<amulegui>(1), "
-"B<amuleweb>(1), B<cas>(1), B<ed2k>(1), B<wxcas>(1), B<xas>(1)"
-msgstr ""
-"B<alc>(1), B<alcc>(1), B<amuled>(1), B<amulecmd>(1), B<amulegui>(1), "
-"B<amuleweb>(1), B<cas>(1), B<ed2k>(1), B<wxcas>(1), B<xas>(1)"
-
-# type: TH
-#: amuled.1:1
-#, no-wrap
-msgid "AMULED"
-msgstr "AMULED"
-
-# type: TH
-#: amuled.1:1
-#, no-wrap
-msgid "aMule Daemon v2.2.0"
-msgstr "aMule Daemon v2.2.0"
-
-# type: TH
-#: amuled.1:1
-#, no-wrap
-msgid "aMule Daemon"
-msgstr "aMule Daemon"
-
-# type: Plain text
-#: amuled.1:4
-msgid "amuled - the all-platform eMule p2p client - daemonized version"
-msgstr "amuled - Der alle-Plattformen eMule p2p Client - dämonisierte Version"
-
-# type: Plain text
-#: amuled.1:14
-msgid ""
-"B<amuled> [B<-v>] [B<-h>] [B<-i>] [B<-f>] [B<-c> I<E<lt>dirE<gt>>] [B<-d>] "
-"[B<-o>] [B<-r>]"
-msgstr ""
-"B<amuled> [B<-v>] [B<-h>] [B<-i>] [B<-f>] [B<-c> I<E<lt>PfadE<gt>>] [B<-d>] "
-"[B<-o>] [B<-r>]"
-
-# type: TP
-#: amuled.1:25
-#, no-wrap
-msgid "B<-f>, B<--full-daemon>"
-msgstr "B<-f>, B<--full-daemon>"
-
-# type: Plain text
-#: amuled.1:28
-msgid "Fork to Background"
-msgstr "Im Hintergrund ausführen"
-
-# type: TP
-#: amuled.1:28
-#, no-wrap
-msgid "B<-c>, B<--config-dir>=I<E<lt>dirE<gt>>"
-msgstr "B<-c>, B<--config-dir>=I<E<lt>PfadE<gt>>"
-
-# type: Plain text
-#: amuled.1:31
-msgid "Read config from E<lt>dirE<gt> instead of home."
-msgstr "Liest die Konfiguration E<lt>PfadE<gt> anstelle des Home."
-
-# type: Plain text
-#: amulecmd.1:1
-msgid ""
-"B<alcc>(1), B<amule>(1), B<amulecmd>(1), B<amulegui>(1), B<amuleweb>(1), "
-"B<cas>(1), B<ed2k>(1)"
-msgstr ""
-"B<alcc>(1), B<amule>(1), B<amulecmd>(1), B<amulegui>(1), B<amuleweb>(1), "
-"B<cas>(1), B<ed2k>(1)"
-
-# type: TH
-#: amulecmd.1:1
-#, no-wrap
-msgid "AMULECMD"
-msgstr "AMULECMD"
-
-# type: TH
-#: amulecmd.1:1
-#, no-wrap
-msgid "aMuleCmd v2.2.0"
-msgstr "aMuleCmd v2.2.0"
-
-# type: TH
-#: amulecmd.1:1 amuleweb.1:1 ed2k.1:1 ../../src/utils/cas/docs/cas.1:1 ../../src/utils/cas/docs/cas.1:6 ../../src/utils/wxCas/docs/wxcas.1:1 ../../src/utils/xas/docs/xas.1:1
-#, no-wrap
-msgid "aMule utilities"
-msgstr "aMule Hilfsprogramme"
-
-# type: Plain text
-#: amulecmd.1:4
-msgid "amulecmd - Console-based program to control aMule"
-msgstr "amulecmd - Konsolenbasiertes Programm um aMule zu steuern"
-
-# type: Plain text
-#: amulecmd.1:15
-msgid ""
-"B<amulecmd> [B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
-"I<E<lt>passwdE<gt>>] [B<-f> I<E<lt>pathE<gt>>] [B<-q>] [B<-v>] [B<-l> "
-"I<E<lt>langE<gt>>] [B<-w>] [B<-c> I<E<lt>commandE<gt>>]"
-msgstr ""
-"B<amulecmd> [B<-h> I<E<lt>HostE<gt>>] [B<-p> I<E<lt>PortE<gt>>] [B<-P> "
-"I<E<lt>PasswortE<gt>>] [B<-f> I<E<lt>PfadE<gt>>] [B<-q>] [B<-v>] [B<-l> "
-"I<E<lt>SpracheE<gt>>] [B<-w>] [B<-c> I<E<lt>BefehlE<gt>>]"
-
-# type: Plain text
-#: amulecmd.1:18
-msgid "B<amulecmd> B<--create-config-from=>I<E<lt>pathE<gt>>"
-msgstr "B<amulecmd> B<--create-config-from=>I<E<lt>PfadE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:21
-msgid "B<amulecmd> [B<--help>]"
-msgstr "B<amulecmd> [B<--help>]"
-
-# type: Plain text
-#: amulecmd.1:24
-msgid "B<amulecmd> [B<--version>]"
-msgstr "B<amulecmd> [B<--version>]"
-
-# type: Plain text
-#: amulecmd.1:26
-msgid "B<amulecmd> is a console-based client to control aMule."
-msgstr "B<amulecmd> ist ein Konsolenbasierter Client um aMule zu steuern."
-
-# type: TP
-#: amulecmd.1:26 amuleweb.1:41
-#, no-wrap
-msgid "B<-h>, B<--host>=I<E<lt>hostE<gt>>"
-msgstr "B<-h>, B<--host>=I<E<lt>HostE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:30
-msgid ""
-"host where aMule is running (default: I<localhost>).  I<E<lt>hostE<gt>> "
-"might be an IP address or a DNS name"
-msgstr ""
-"Host auf dem aMule läuft (standard: I<localhost>).  I<E<lt>HostE<gt>> "
-"kann eine IP Adresse oder ein DNS Name sein"
-
-# type: TP
-#: amulecmd.1:30 amuleweb.1:45
-#, no-wrap
-msgid "B<-p>, B<--port>=I<E<lt>portE<gt>>"
-msgstr "B<-p>, B<--port>=I<E<lt>PortE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:33 amuleweb.1:48
-msgid ""
-"aMule's port for External Connections, as set in Preferences-E<gt>Remote "
-"Controls (default: I<4712>)"
-msgstr "aMule's Port für Externe Verbindungen, wie in den Optionen unter-E<gt>Fernsteuerung (Standard: I<4712>) eingestellt."
-
-# type: TP
-#: amulecmd.1:33 amuleweb.1:48
-#, no-wrap
-msgid "B<-P>, B<--password>=I<E<lt>passwdE<gt>>"
-msgstr "B<-P>, B<--password>=I<E<lt>PasswortE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:36 amuleweb.1:51
-msgid "External Connections password"
-msgstr "Passwort für Externe Verbindungen."
-
-# type: TP
-#: amulecmd.1:36 amuleweb.1:51
-#, no-wrap
-msgid "B<-f>, B<--config-file>=I<E<lt>pathE<gt>>"
-msgstr "B<-f>, B<--config-file>=I<E<lt>PfadE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:40
-msgid ""
-"use the given configuration file.  Default configuration file is "
-"I<~/.aMule/remote.conf>"
-msgstr ""
-"Benutzt die angegebene Konfigurationsdatei. Die Standardkonfigurationsdatei ist "
-"I<~/.aMule/remote.conf>"
-
-# type: TP
-#: amulecmd.1:40 amuleweb.1:55
-#, no-wrap
-msgid "B<-q>, B<--quiet>"
-msgstr "B<-q>, B<--quiet>"
-
-# type: Plain text
-#: amulecmd.1:43
-msgid ""
-"do not print any output to stdout. This seems to be a very much useless "
-"option with B<amulecmd>."
-msgstr "Gebe nichts auf stdout aus. Dies scheint eine sehr nutzlose Options in B<amulecmd>."
-
-# type: TP
-#: amulecmd.1:43 amuleweb.1:59
-#, no-wrap
-msgid "B<-v>, B<--verbose>"
-msgstr "B<-v>, B<--verbose>"
-
-# type: Plain text
-#: amulecmd.1:46
-msgid "be verbose - show also debug messages"
-msgstr "Sei gesprächig - zeigt auch debugging Meldungen an."
-
-# type: TP
-#: amulecmd.1:46 amuleweb.1:62
-#, no-wrap
-msgid "B<-l>, B<--locale>=I<E<lt>langE<gt>>"
-msgstr "B<-l>, B<--locale>=I<E<lt>SpracheE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:50 amuleweb.1:66
-msgid ""
-"Sets program locale (language).  See section B<LANGUAGES> for the "
-"description of the I<E<lt>langE<gt>> parameter."
-msgstr "Setzt die Locale (Sprache) des Programms. Siehe Abschnitt B<SPRACHEN> für die Beschreibung des I<E<lt>SpracheE<gt>> Parameter."
-
-# type: TP
-#: amulecmd.1:50 amuleweb.1:66
-#, no-wrap
-msgid "B<-w>, B<--write-config>"
-msgstr "B<-w>, B<--write-config>"
-
-# type: Plain text
-#: amulecmd.1:53
-msgid "write command line options to config file and exit"
-msgstr "Schreibe die Kommandozeilenoptionen in die Konfigurationsdatei und beende dich wieder."
-
-# type: TP
-#: amulecmd.1:53
-#, no-wrap
-msgid "B<-c>, B<--command>=I<E<lt>commandE<gt>>"
-msgstr "B<-c>, B<--command>=I<E<lt>BefehlE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:56
-msgid ""
-"execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and "
-"exit."
-msgstr "Führe I<E<lt>BefehlE<gt>> aus, als wäre es auf amulecmd's Eingabeaufforderung eingegeben worden, und beende dich."
-
-# type: TP
-#: amulecmd.1:56 amuleweb.1:69
-#, no-wrap
-msgid "B<--create-config-from>=I<E<lt>pathE<gt>>"
-msgstr "B<--create-config-from>=I<E<lt>PfadE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:59
-msgid ""
-"create config file based upon I<E<lt>pathE<gt>>, which must point to a valid "
-"aMule config file, and then exit"
-msgstr "Erstelle Konfigurationsdatei basierend auf I<E<lt>PfadE<gt>>, welcher auf eine gültige aMule-Konfigurationsdatei verweisen muss, und beende dich."
-
-# type: TP
-#: amulecmd.1:59 amuleweb.1:112 ed2k.1:17
-#, no-wrap
-msgid "B<--help>"
-msgstr "B<--help>"
-
-# type: TP
-#: amulecmd.1:62 amuleweb.1:115 ed2k.1:23
-#, no-wrap
-msgid "B<--version>"
-msgstr "B<--version>"
-
-# type: SH
-#: amulecmd.1:65
-#, no-wrap
-msgid "COMMANDS"
-msgstr "BEFEHLE"
-
-# type: Plain text
-#: amulecmd.1:67
-msgid "All commands are case insensitive"
-msgstr "Alle Befehle können groß oder klein geschrieben werden."
-
-# type: SS
-#: amulecmd.1:67
-#, no-wrap
-msgid "AddR< E<lt>ed2k-linkE<gt>>"
-msgstr "AddR< E<lt>ed2k-LinkE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:69
-msgid "Adds an ed2k-linkto the core."
-msgstr "Fügt einen ed2k-Link zur Downloadliste hinzu."
-
-# type: Plain text
-#: amulecmd.1:71
-msgid "The ed2k link to be added can be:"
-msgstr "Der ed2k-Link darf enthalten:"
-
-# type: Plain text
-#: amulecmd.1:73
-msgid "*) a file link (ed2k://|file|...), it will be added to the download queue,"
-msgstr "*) einen Link zu einer Datei (ed2k://|file|...), diese wird den Downloads hinzugefügt,"
-
-# type: Plain text
-#: amulecmd.1:75
-msgid "*) a server link (ed2k://|server|...), it will be added to the server list,"
-msgstr "*) einen Link zu einem Server (ed2k://|server|...), dieser wird der Serverliste hinzugefügt,"
-
-# type: Plain text
-#: amulecmd.1:77
-msgid ""
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the server list."
-msgstr "*) oder einen Serverlisten-Link, in diesem Fall werden alle Server dieser Liste der Serverliste hinzugefügt."
-
-# type: Plain text
-#: amulecmd.1:79 amulecmd.1:104 amulecmd.1:176
-msgid "This command must have an argument."
-msgstr "Dieser Befehl muss ein Argument übergeben bekommen."
-
-# type: SS
-#: amulecmd.1:79
-#, no-wrap
-msgid "CancelR< E<lt>hashE<gt>>"
-msgstr "CancelR< E<lt>HashE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:81
-msgid "Cancels the download specified by hash. To get the hash use I<show>."
-msgstr "Bricht den mit seinem Hash spezifizierten Download ab. Benutze I<show> um den Hash zu erfahren."
-
-# type: SS
-#: amulecmd.1:81
-#, no-wrap
-msgid "ConnectR< (kad|ed2kE<lt>ip|nameE<gt>)>"
-msgstr "ConnectR< (kad|ed2kE<lt>IP|NameE<gt>)>"
-
-# type: Plain text
-#: amulecmd.1:83
-msgid "Connect to the network."
-msgstr "Verbindung zu einem Netzwerk aufbauen."
-
-# type: Plain text
-#: amulecmd.1:85
-msgid "This will connect to all networks that are enabled in Preferences."
-msgstr "Die Verbindung wird zu allen Netzwerken aufgebaut, die in den Einstellungen aktiviert wurden."
-
-# type: Plain text
-#: amulecmd.1:90
-msgid ""
-"When giving ed2k as parameter, it connects only to ed2k-network to servers "
-"in your serverlist. You may also optionally specify a server address in "
-"IP:Port form, to connect to that server only. The IP must be a dotted "
-"decimal IPv4 address, or a resolvable DNS name."
-msgstr "Wenn ed2k als Parameter übergeben wird, wird eine Verbindung zu Servern aus der Serverliste aufgebaut. Man kann optional einen Server in der Form IP:Port angeben, um nur zu diesem Server eine Verbindung aufzubauen. Die IP muss entweder eine IPv4-Adresse, oder ein auflösbarer DNS-Name sein."
-
-# type: Plain text
-#: amulecmd.1:92
-msgid "When giving kad, it connects to Kad only."
-msgstr "Wenn kad angegeben wird, wird ausschließlich eine kad-Verbindung aufgebaut."
-
-# type: SS
-#: amulecmd.1:92
-#, no-wrap
-msgid "DisconnectR< (ed2k|kad)>"
-msgstr "DisconnectR< (ed2k|kad)>"
-
-# type: Plain text
-#: amulecmd.1:96
-msgid ""
-"Disconnect from all networks you are cionnected to, or just disconnect from "
-"the specified network."
-msgstr "Trennt die Verbindung zu allen Netzwerken mit denen du verbunden bist, oder nur zu dem, welches angegeben wurde."
-
-# type: SS
-#: amulecmd.1:96
-#, no-wrap
-msgid "DownloadR< num>"
-msgstr "DownloadR< Nummer>"
-
-# type: Plain text
-#: amulecmd.1:98
-msgid "Start downloading a file"
-msgstr "Startet den Download einer Datei"
-
-# type: Plain text
-#: amulecmd.1:102
-msgid ""
-"The number of a file from the last search has to be given.  Example: "
-"'download 12' will start to download the file with the number 12 of the "
-"previous search."
-msgstr ""
-"Die Nummer einer Datei aus der letzten Suche muss angegeben werden.  Beispiel: "
-"'download 12' startet den Download der Datei, die bei der letzten Suche die Nummer 12 hatte."
-
-# type: SS
-#: amulecmd.1:104
-#, no-wrap
-msgid "Exit"
-msgstr "Exit"
-
-# type: Plain text
-#: amulecmd.1:106
-msgid "Disconnect from amule/amuled and quit amulecmd."
-msgstr "Verbindung zu amule/amuled trennen und amulecmd beenden."
-
-# type: SS
-#: amulecmd.1:106
-#, no-wrap
-msgid "GetR< value>"
-msgstr "GetR< Wert>"
-
-# type: Plain text
-#: amulecmd.1:108
-msgid "Get and display a preference value."
-msgstr "Liest eine Option und zeigt sie an."
-
-# type: Plain text
-#: amulecmd.1:110 amulecmd.1:134 amulecmd.1:166
-msgid "This command is incomplete, aviable values are listed below."
-msgstr "Dieser Befehl ist unvollständig, mögliche Werte sind nachfolgend aufgeführt."
-
-# type: Plain text
-#: amulecmd.1:112 amulecmd.1:136 amulecmd.1:168
-msgid "Available values to get:"
-msgstr "Verfügbare Werte:"
-
-# type: Plain text
-#: amulecmd.1:114
-msgid "BwLimits\tGet bandwidth limits."
-msgstr "BwLimits\tBandbreitenbeschränkungen."
-
-# type: Plain text
-#: amulecmd.1:116
-msgid "IPFilter\tGet IPFilter preferences."
-msgstr "IPFilter\tIP-Filter Einstellungen."
-
-# type: SS
-#: amulecmd.1:116
-#, no-wrap
-msgid "HelpR< E<lt>commandE<gt>>"
-msgstr "HelpR< E<lt>BefehlE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:120
-msgid ""
-"Get a short help.  If called without parameter, it shows a list of aviable "
-"commands.  If called with E<lt>commandE<gt>, it shows a short description of "
-"the given command."
-msgstr "Kurze Hilfe anzeigen. Zeigt eine kurze Übersicht der verfügbaren Befehle, wenn ohne Parameter aufgerufen.  Wenn mit E<lt>BefehlE<gt> aufgerufen, wird eine kurze Hilfe zu dem Befehl angezeigt."
-
-# type: SS
-#: amulecmd.1:120
-#, no-wrap
-msgid "PauseR< E<lt>hashE<gt>>"
-msgstr "PauseR< E<lt>HashE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:122
-msgid "Pauses the download specified by hash. To get the hash use I<show>."
-msgstr "Pausiert den mit seinem Hash spezifizierten Download. Benutze I<show> um den Hash zu erfahren."
-
-# type: SS
-#: amulecmd.1:122
-#, no-wrap
-msgid "Progress"
-msgstr "Progress"
-
-# type: Plain text
-#: amulecmd.1:124
-msgid "Shows the progress of an ongiong search."
-msgstr "Zeigt den Fortschritt einer laufenden Suche an."
-
-# type: Plain text
-#: amulecmd.1:126
-msgid "This Command can't have an argument."
-msgstr "Dieser Befehl kann keine Argumente übernehmen."
-
-# type: SS
-#: amulecmd.1:126
-#, no-wrap
-msgid "Quit"
-msgstr "Quit"
-
-# type: Plain text
-#: amulecmd.1:128
-msgid "Exists the App."
-msgstr "Beendet das Programm."
-
-# type: Plain text
-#: amulecmd.1:130 amulecmd.1:144 amulecmd.1:148 amulecmd.1:194
-msgid "This command can't have an argument."
-msgstr "Dieser Befehl kann keine Argumente übernehmen."
-
-# type: SS
-#: amulecmd.1:130
-#, no-wrap
-msgid "Reload"
-msgstr "Reload"
-
-# type: Plain text
-#: amulecmd.1:132
-msgid "Reloads a given object."
-msgstr "Aktualisiert das angegebene Objekt."
-
-# type: Plain text
-#: amulecmd.1:138
-msgid "BwLimits\tReload bandwidth limits."
-msgstr "BwLimits\tAktualisiert die Bandbreitenbeschränkungen."
-
-# type: Plain text
-#: amulecmd.1:140
-msgid "IPFilter\tReload IPFilter preferences."
-msgstr "IPFilter\tAktualisiert die IP-Filter Einstellungen."
-
-# type: SS
-#: amulecmd.1:140
-#, no-wrap
-msgid "Reset"
-msgstr "Reset"
-
-# type: Plain text
-#: amulecmd.1:142
-msgid "Reset the log."
-msgstr "Setzt das Log zurück."
-
-# type: SS
-#: amulecmd.1:144
-#, no-wrap
-msgid "Results"
-msgstr "Results"
-
-# type: Plain text
-#: amulecmd.1:146
-msgid "Shows you the results of the last search."
-msgstr "Zeigt die Resultate der letzten Suche an."
-
-# type: SS
-#: amulecmd.1:148
-#, no-wrap
-msgid "ResumeR< E<lt>hashE<gt>>"
-msgstr "ResumeR< E<lt>HashE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:150
-msgid "Resumes the download specified by hash. To get the hash use I<show>."
-msgstr "Setzt den mit seinem Hash spezifizierten Download fort. Benutze I<show> um den Hash zu erfahren."
-
-# type: SS
-#: amulecmd.1:150
-#, no-wrap
-msgid "SearchR< global|kad|local file>"
-msgstr "SearchR< global|kad|local Datei>"
-
-# type: Plain text
-#: amulecmd.1:154
-msgid ""
-"Makes a search for the given file. A searchtype and a file to search is "
-"mandatory to do this.  I<Example> 'search kad amule' performs a kad search "
-"for amule."
-msgstr "Startet die Suche nach Datei. Die Art der Suche und ein Dateiname sind notwendig. I<Beispiel> 'search kad amule' Sucht nach amule im kad-Netzwerk."
-
-# type: Plain text
-#: amulecmd.1:156
-msgid "Aviable searchtypes:"
-msgstr "Verfügbare Suchtypen:"
-
-# type: Plain text
-#: amulecmd.1:158
-msgid "global\tperforms a global search"
-msgstr "global\tstartet eine globale Suche"
-
-# type: Plain text
-#: amulecmd.1:160
-msgid "kad\tperforms a search on kad network"
-msgstr "kad\tstartet eine Suche im kad-Netzwerk"
-
-# type: Plain text
-#: amulecmd.1:162
-msgid "local\tperforms a local search"
-msgstr "local\tstartet eine lokale Suche"
-
-# type: SS
-#: amulecmd.1:162
-#, no-wrap
-msgid "SetR< E<lt>valueE<gt>>"
-msgstr "SetR< E<lt>WertE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:164
-msgid "Sets a given preferences value."
-msgstr "Setzt die angegebene Option."
-
-# type: Plain text
-#: amulecmd.1:170
-msgid "BwLimits\tSet bandwidth limits."
-msgstr "BwLimits\tSetzt die Bandbreitenbeschränkung."
-
-# type: Plain text
-#: amulecmd.1:172
-msgid "IPFilter\tSet IPFilter preferences."
-msgstr "IPFilter\tSetzt die IP-Filter Einstellungen."
-
-# type: SS
-#: amulecmd.1:172
-#, no-wrap
-msgid "ShowR< DL|Log|Servers|UL>"
-msgstr "ShowR< DL|Log|Servers|UL>"
-
-# type: Plain text
-#: amulecmd.1:174
-msgid "Shows upload/download queue, server list or shared files list."
-msgstr "Zeigt upload/download Warteschlange, Serverliste oder die Liste der freigegebenen Dateien an."
-
-# type: Plain text
-#: amulecmd.1:178
-msgid "This command is incomplete, you must use one of the extensions below."
-msgstr "Dieser Befehl ist unvollständig, Benutze nur die folgenden Parameter."
-
-# type: Plain text
-#: amulecmd.1:180
-msgid "Available extensions:"
-msgstr "Verfügbare Parameter:"
-
-# type: Plain text
-#: amulecmd.1:182
-msgid "DL\t\tShow download queue."
-msgstr "DL\t\tZeigt die Downloadwarteschlange an."
-
-# type: Plain text
-#: amulecmd.1:184
-msgid "Log\t\tShow log."
-msgstr "Log\t\tZeigt das Log an."
-
-# type: Plain text
-#: amulecmd.1:186
-msgid "Servers\tShow servers list."
-msgstr "Servers\tZeigt die Serverliste an."
-
-# type: Plain text
-#: amulecmd.1:188
-msgid "UL\t\tShow upload queue."
-msgstr "UL\t\tZeigt die Uploadwarteschlange an."
-
-# type: SS
-#: amulecmd.1:188
-#, no-wrap
-msgid "Shutdown"
-msgstr "Shutdown"
-
-# type: Plain text
-#: amulecmd.1:192
-msgid ""
-"Shutdown the remote running core (amule/amuled).  This will also shut down "
-"the text client, since it is unusable without a running core."
-msgstr "Beendet das Programm (amule/amuled) zu dem du verbunden bist. Dies beendet auch den Textclient, da er ohne Verbindung nicht zu gebrauchen ist."
-
-# type: SS
-#: amulecmd.1:194
-#, no-wrap
-msgid "StatisticsR< E<lt>numE<gt>>"
-msgstr "StatisticsR< E<lt>NummerE<gt>>"
-
-# type: Plain text
-#: amulecmd.1:196
-msgid "Show statistics tree."
-msgstr "Zeigt die Statistiken an."
-
-# type: Plain text
-#: amulecmd.1:200
-msgid ""
-"The optional number in the range of 0-255 can be passed as argument to this "
-"command, which tells how many entries of the client version subtree should "
-"be shown. Passing 0, or omitting it means 'unlimited'."
-msgstr "Die optionale Nummer die übergeben werden kann muss im Bereich von 0-255 liegen, und gibt an, wieviele Einträge im Unterpunkt Version angezeigt werden sollen. 0 oder weglassen bedeutet unbegrenzt."
-
-# type: Plain text
-#: amulecmd.1:203
-msgid ""
-"I<Example:> 'statistics 5' will show only the top 5 versions for each client "
-"type."
-msgstr "I<Beispiel:> 'statistics 5' zeigt die höchsten 5 der einzelnen Clientversionen an."
-
-# type: SS
-#: amulecmd.1:203
-#, no-wrap
-msgid "Status"
-msgstr "Status"
-
-# type: Plain text
-#: amulecmd.1:205
-msgid "Show connection status, current up/download speeds, etc."
-msgstr "Zeigt den Verbindungsstatus, aktuelle Up/Downloadgeschindigkeiten, etc. an."
-
-# type: SH
-#: amulecmd.1:206 amuleweb.1:118
-#, no-wrap
-msgid "NOTES"
-msgstr "ANMERKUNGEN"
-
-# type: SS
-#: amulecmd.1:207 amuleweb.1:119
-#, no-wrap
-msgid "Paths"
-msgstr "Pfade"
-
-# type: Plain text
-#: amulecmd.1:211
-msgid ""
-"For all options which take a I<E<lt>pathE<gt>> value, if the I<path> "
-"contains no directory part (i.e. just a plain filename), then it is "
-"considered to be under the aMule configuration directory, I<~/.aMule>."
-msgstr "Für alle Optionen die ein I<E<lt>PfadE<gt>> Argument erwarten, wenn der I<Pfad> kein Verzeichnis enthält(z.B. nur einen Dateinamen), dann wird angenommen, diese Datei liegt um aMule-Konfigurationsverzeichnis, I<~/.aMule>."
-
-# type: SS
-#: amulecmd.1:211 amuleweb.1:121
-#, no-wrap
-msgid "LANGUAGES"
-msgstr "SPRACHEN"
-
-# type: Plain text
-#: amulecmd.1:217 amuleweb.1:127
-msgid ""
-"The I<E<lt>langE<gt>> parameter for the B<-l> option has the following form: "
-"I<lang>[B<_>I<LANG>][B<.>I<encoding>][B<@>I<modifier>] where I<lang> is the "
-"primary language, I<LANG> is a sublanguage/territory, I<encoding> is the "
-"character set to use and I<modifier> \"allows the user to select a specific "
-"instance of localization data within a single category\"."
-msgstr ""
-"Der I<E<lt>SpracheE<gt>> Parameter für die B<-l> Option hat folgende Form: "
-"I<sprache>[B<_>I<SPRACHE>][B<.>I<KODIERUNG>][B<@>I<zusatz>] wobei I<sprache> die primäre Sprache, I<SPRACHE> die Regionalsprache, I<KODIERUNG> die Zeichentabelle ist, und I<zusatz> \"erlaubt es dem Nutzer eine bestimmte Auswahl innerhalb einer einzigen Kategorie auszuwählen\"."
-
-# type: Plain text
-#: amulecmd.1:219 amuleweb.1:129
-msgid "For example, the following strings are valid:"
-msgstr "Zum Besispiel sind die folgenden Zeichenketten gültig:"
-
-# type: Plain text
-#: amulecmd.1:221 amuleweb.1:131
-msgid "de"
-msgstr "de"
-
-# type: Plain text
-#: amulecmd.1:223 amuleweb.1:133
-msgid "de_DE"
-msgstr "de_DE"
-
-# type: Plain text
-#: amulecmd.1:225 amuleweb.1:135
-msgid "de_DE.iso88591"
-msgstr "de_DE.iso88591"
-
-# type: Plain text
-#: amulecmd.1:227 amuleweb.1:137
-msgid "de_DE@euro"
-msgstr "de_DE@euro"
-
-# type: Plain text
-#: amulecmd.1:229 amuleweb.1:139
-msgid "de_DE.iso88591@euro"
-msgstr "de_DE.iso88591@euro"
-
-# type: Plain text
-#: amulecmd.1:232 amuleweb.1:142
-msgid ""
-"Though all the above strings are accepted as valid language definitions, "
-"I<encoding> and I<modifier> are yet unused."
-msgstr "Alle oben genannten Zeicheketten werden als gültige Sprachdefinitionen akzeptiert, I<KODIERUNG> und I<zusatz> werden zur Zeit nicht genutzt."
-
-# type: Plain text
-#: amulecmd.1:235 amuleweb.1:145
-msgid ""
-"In addition to the format above, you can also specify full language names in "
-"English - so B<-l german> is also valid and is equal to B<-l de_DE>."
-msgstr "Zusätzlich zu den obigen Formaten, kann man komplette englishe Sprachbezeichnungen angeben - B<-l german> ist ebenfalls gültig und entspricht B<-l de_DE>."
-
-# type: Plain text
-#: amulecmd.1:238 amuleweb.1:148
-msgid ""
-"When no locale is defined, either on command-line or in config file, system "
-"default language will be used."
-msgstr "Wenn keine Sprache definiert wurde, weder in der Kommandozeile noch in der Konfigurationsdatei, wird die Standardsprache des Systems verwendet."
-
-# type: Plain text
-#: amulecmd.1:240 amuleweb.1:159
-msgid "~/.aMule/remote.conf"
-msgstr "~/.aMule/remote.conf"
-
-# type: SH
-#: amulecmd.1:240 amuleweb.1:163
-#, no-wrap
-msgid "EXAMPLE"
-msgstr "BEISPIEL"
-
-# type: Plain text
-#: amulecmd.1:242
-msgid "Typically amulecmd will be first run as:"
-msgstr "Typischerweise startet man amulecmd als erstes mit:"
-
-# type: Plain text
-#: amulecmd.1:244
-msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
-msgstr "B<amulecmd> B<-h> I<hostname> B<-p> I<EC-Port> B<-P> I<EC-Passwort> B<-w>"
-
-# type: Plain text
-#: amulecmd.1:246 amuleweb.1:169
-msgid "or"
-msgstr "oder"
-
-# type: Plain text
-#: amulecmd.1:248
-msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
-msgstr "B<amulecmd> B<--create-config-from>=I</home/Benutzer/.aMule/amule.conf>"
-
-# type: Plain text
-#: amulecmd.1:250 amuleweb.1:173
-msgid ""
-"These will save settings to I<$HOME/.aMule/remote.conf>, and later you only "
-"need to type:"
-msgstr "Dies speichert die Einstellungen in I<$HOME/.aMule/remote.conf>, und tippst du nur noch:"
-
-# type: Plain text
-#: amulecmd.1:252
-msgid "B<amulecmd>"
-msgstr "B<amulecmd>"
-
-# type: Plain text
-#: amulecmd.1:254
-msgid "Of course, you don't have to follow this example."
-msgstr "Natürlich brauchst du dich nicht unbedingt an dieses Beispiel halten."
-
-# type: Plain text
-#: amulegui.1:1
-msgid "B<amule>(1), B<amuleweb>(1)"
-msgstr "B<amule>(1), B<amuleweb>(1)"
-
-# type: TH
-#: amulegui.1:1
-#, no-wrap
-msgid "AMULEGUI"
-msgstr "AMULEGUI"
-
-# type: TH
-#: amulegui.1:1
-#, no-wrap
-msgid "aMuleGUI v2.2.0"
-msgstr "aMuleGUI v2.2.0"
-
-# type: TH
-#: amulegui.1:1
-#, no-wrap
-msgid "aMuleGUI"
-msgstr "aMuleGUI"
-
-# type: Plain text
-#: amulegui.1:4
-msgid "amulegui - aMule control program with GUI"
-msgstr "amulegui - aMule Steuerungsprogram mit GUI"
-
-# type: Plain text
-#: amulegui.1:6
-msgid "B<amulegui>"
-msgstr "B<amulegui>"
-
-# type: Plain text
-#: amulegui.1:11
-msgid ""
-"B<amulegui> is a client program, and can be connected on amule or amuled via "
-"EC. You can manage your amule program with it. It provides the almost same "
-"functionality as amule, even if the core works on another computer."
-msgstr "B<amulegui> ist ein Program das über EC mit amule/amuled Verbindung aufnehmen kann. Du kannst deinen amle damit steuern. Es besitzt so ziemlich dieselben Funktionen wie amule, auch wenn dieser auf einem anderen Computer läuft."
-
-# type: Plain text
-#: amulegui.1:13 ../../src/utils/wxCas/docs/wxcas.1:13
-msgid "This program doesn't take any arguments."
-msgstr "Dieses Programm hat keine Parameter"
-
-# type: Plain text
-#: amulegui.1:20
-msgid ""
-"B<alc>(1), B<alcc>(1), B<amuled>(1), B<amulecmd>(1), B<amuleweb>(1), "
-"B<cas>(1), B<ed2k>(1), B<wxcas>(1), B<xas>(1)"
-msgstr ""
-"B<alc>(1), B<alcc>(1), B<amuled>(1), B<amulecmd>(1), B<amuleweb>(1), "
-"B<cas>(1), B<ed2k>(1), B<wxcas>(1), B<xas>(1)"
-
-# type: SH
-#: amulegui.1:20 ../../src/utils/cas/docs/cas.1:39 ../../src/utils/wxCas/docs/wxcas.1:15 ../../src/utils/xas/docs/xas.1:14
-#, no-wrap
-msgid "AUTHOR"
-msgstr "VERFASSER"
-
-# type: Plain text
-#: amulegui.1:23
-msgid ""
-"This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm "
-"DOT orgE<gt> This manpage was rewritten by Vollstrecker for aMule "
-"E<lt>amule@vollstreckernet.deE<gt>"
-msgstr ""
-"Diese Seite wurde geschrieben von Julien Delange für Debian E<lt>julien AT gunnm "
-"DOT orgE<gt> Diese Seite wurde überarbeit und übersetzt von Vollstrecker für aMule "
-"E<lt>amule@vollstreckernet.deE<gt>"
-
-# type: TH
-#: amuleweb.1:1
-#, no-wrap
-msgid "AMULEWEB"
-msgstr "AMULEWEB"
-
-# type: TH
-#: amuleweb.1:1
-#, no-wrap
-msgid "aMule webserver v2.2.0"
-msgstr "aMule Webserver v2.2.0"
-
-# type: Plain text
-#: amuleweb.1:4
-msgid "amuleweb - aMule web server"
-msgstr "amuleweb - aMule Webserver"
-
-# type: Plain text
-#: amuleweb.1:24
-msgid ""
-"B<amuleweb> [B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
-"I<E<lt>passE<gt>>] [B<-f> I<E<lt>pathE<gt>>] [B<-q>] [B<-v>] [B<-l> "
-"I<E<lt>langE<gt>>] [B<-w>] [B<-t> I<E<lt>nameE<gt>>] [B<-s> "
-"I<E<lt>portE<gt>>] [B<-z>] [B<-Z>] [B<-A> I<E<lt>passE<gt>>] [B<-G> "
-"I<E<lt>passE<gt>>] [B<-a>] [B<-d>] [B<-L>] [B<-N>]"
-msgstr ""
-"B<amuleweb> [B<-h> I<E<lt>HostE<gt>>] [B<-p> I<E<lt>PortE<gt>>] [B<-P> "
-"I<E<lt>PasswortE<gt>>] [B<-f> I<E<lt>PfadE<gt>>] [B<-q>] [B<-v>] [B<-l> "
-"I<E<lt>SpracheE<gt>>] [B<-w>] [B<-t> I<E<lt>NameE<gt>>] [B<-s> "
-"I<E<lt>PortE<gt>>] [B<-z>] [B<-Z>] [B<-A> I<E<lt>PasswortE<gt>>] [B<-G> "
-"I<E<lt>PasswortE<gt>>] [B<-a>] [B<-d>] [B<-L>] [B<-N>]"
-
-# type: Plain text
-#: amuleweb.1:28
-msgid ""
-"B<amuleweb> [B<-f> I<E<lt>pathE<gt>>] "
-"B<--create-config-from=>I<E<lt>pathE<gt>>"
-msgstr ""
-"B<amuleweb> [B<-f> I<E<lt>PfadE<gt>>] "
-"B<--create-config-from=>I<E<lt>PfadE<gt>>"
-
-# type: Plain text
-#: amuleweb.1:32
-msgid "B<amuleweb> [B<--help>] [B<--version>]"
-msgstr "B<amuleweb> [B<--help>] [B<--version>]"
-
-# type: Plain text
-#: amuleweb.1:34
-msgid "B<amuleweb --amule-config-file=>I<E<lt>pathE<gt>>"
-msgstr "B<amuleweb --amule-config-file=>I<E<lt>PfadE<gt>>"
-
-# type: Plain text
-#: amuleweb.1:36
-msgid "B<amuleweb --no-php>"
-msgstr "B<amuleweb --no-php>"
-
-# type: Plain text
-#: amuleweb.1:41
-msgid ""
-"B<amuleweb> manages your access to amule through a webbrowser.  You can "
-"start amuleweb together with B<amule>(1), or separately, any time later.  "
-"Options can be specified via command-line or via config-file.  Command-line "
-"options take precedence over config-file options."
-msgstr ""
-"B<amuleweb> ermöglicht dir den Zugriff auf amule(d) per Webbrowser. Man kann amuleweb zusammen mit B<amule>(1) starten lassen, oder ihn separat später starten. "
-"Optionen können auf der Kommandozeile oder in der Konfigurationsdatei angegeben werden. Kommandozeilenoptionen überschreiben die Werte aus der Konfigurationsdatei."
-
-# type: Plain text
-#: amuleweb.1:45
-msgid ""
-"Host where aMule is running (default: I<localhost>).  I<E<lt>hostE<gt>> "
-"might be an IP address or a DNS name"
-msgstr ""
-"Der Rechner auf dem aMule läuft (Standard: I<localhost>).  I<E<lt>HostE<gt>> "
-"kann eine IP-Adresse oder ein DNS-Name sein."
-
-# type: Plain text
-#: amuleweb.1:55
-msgid ""
-"Use the given configuration file.  Default configuration file is "
-"I<~/.aMule/remote.conf>"
-msgstr ""
-"Benutzt die angegebene Konfigurationsdatei. Die Standardkonfigurationsdatei ist "
-"I<~/.aMule/remote.conf>"
-
-# type: Plain text
-#: amuleweb.1:59
-msgid ""
-"Do not print any output to stdout.  You may want to use B<-q> to daemonize "
-"the webserver, i.e. running as 'B<amuleweb -q &>'"
-msgstr "Gebe keine Ausgaben auf der Standardausgabe aus. Du könntest B<-q> benutzen um den Webserver als Dämon laufen zu lassen, z.B. durch Aufruf von 'B<amuleweb -q &>'"
-
-# type: Plain text
-#: amuleweb.1:62
-msgid "Be verbose - show also debug messages"
-msgstr "Sei gesprächig - Gebe auch Debuggingausgaben aus"
-
-# type: Plain text
-#: amuleweb.1:69
-msgid "Write command line options to config file and exit"
-msgstr "Schreibe die Kommandozeilenoptionen in die Konfigurationsdatei und kehre zur Shell zurück."
-
-# type: Plain text
-#: amuleweb.1:72
-msgid ""
-"Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid "
-"aMule config file, and then exit"
-msgstr "Erstellt eine Konfigurationsdatei basierend auf I<E<lt>PfadE<gt>>, welche auf eine gültige Amulekonfigurationsdatei verweisen muss, und kehre zur Shell zurück."
-
-# type: TP
-#: amuleweb.1:72
-#, no-wrap
-msgid "B<-t>, B<--template>=I<E<lt>nameE<gt>>"
-msgstr "B<-t>, B<--template>=I<E<lt>NameE<gt>>"
-
-# type: Plain text
-#: amuleweb.1:76
-msgid ""
-"Loads the template named I<E<lt>nameE<gt>>. See also the section B<SKIN "
-"SUPPORT>"
-msgstr ""
-"Lädt die mit I<E<lt>NameE<gt>> spezifizierte Vorlage. Siehe auch Abschnitt B<SKIN "
-"UNTERSTÜTZUNG>"
-
-# type: TP
-#: amuleweb.1:76
-#, no-wrap
-msgid "B<-s>, B<--server-port>=I<E<lt>portE<gt>>"
-msgstr "B<-s>, B<--server-port>=I<E<lt>PortE<gt>>"
-
-# type: Plain text
-#: amuleweb.1:79
-msgid ""
-"Webserver's HTTP port. This is the port you can point your browser to "
-"(default: I<4711>)"
-msgstr "HTTP Port des Webservers. Der Port der mit dem Browser erreichbar sein soll (Standard: I<4711>)"
-
-# type: TP
-#: amuleweb.1:79
-#, no-wrap
-msgid "B<-z>, B<--enable-gzip>"
-msgstr "B<-z>, B<--enable-gzip>"
-
-# type: Plain text
-#: amuleweb.1:82
-msgid "Enable using gzip compression in HTTP traffic to save bandwidth"
-msgstr "Benutzt gzip Kompression für den HTTP Verkehr um Bandbreite zu sparen"
-
-# type: TP
-#: amuleweb.1:82
-#, no-wrap
-msgid "B<-Z>, B<--disable-gzip>"
-msgstr "B<-Z>, B<--disable-gzip>"
-
-# type: Plain text
-#: amuleweb.1:85
-msgid "Disable using gzip compression (this is the default)"
-msgstr "Schalten die gzip Kompression ab (Standard)"
-
-# type: TP
-#: amuleweb.1:85
-#, no-wrap
-msgid "B<-A>, B<--admin-pass>=I<E<lt>passwdE<gt>>"
-msgstr "B<-A>, B<--admin-pass>=I<E<lt>PasswortE<gt>>"
-
-# type: Plain text
-#: amuleweb.1:88
-msgid "Full access password for webserver"
-msgstr "Passwort für vollen Zugriff auf den Webserver"
-
-# type: TP
-#: amuleweb.1:88
-#, no-wrap
-msgid "B<-G>, B<--guest-pass>=I<E<lt>passwdE<gt>>"
-msgstr "B<-G>, B<--guest-pass>=I<E<lt>PasswortE<gt>>"
-
-# type: Plain text
-#: amuleweb.1:91
-msgid "Guest password for webserver"
-msgstr "Gäste Passwort für den Webserver"
-
-# type: TP
-#: amuleweb.1:91
-#, no-wrap
-msgid "B<-a>, B<--allow-guest>"
-msgstr "B<-a>, B<--allow-guest>"
-
-# type: Plain text
-#: amuleweb.1:94
-msgid "Allow guest access"
-msgstr "Erlaubt den Zugriff als Gast"
-
-# type: TP
-#: amuleweb.1:94
-#, no-wrap
-msgid "B<-d>, B<--deny-guest>"
-msgstr "B<-d>, B<--deny-guest>"
-
-# type: Plain text
-#: amuleweb.1:97
-msgid "Deny guest access (default)"
-msgstr "Verbietet den Zugriff als Gast (Standard)"
-
-# type: TP
-#: amuleweb.1:97
-#, no-wrap
-msgid "B<-L>, B<--load-settings>"
-msgstr "B<-L>, B<--load-settings>"
-
-# type: Plain text
-#: amuleweb.1:103
-msgid ""
-"Load/save webserver settings from/to remote aMule.  This causes amuleweb to "
-"ignore command-line and config-file settings, and load them from aMule.  "
-"When saving preferences none will be written to the config file, but to "
-"aMule.  (Of course, this works only for those settings, that can be set in "
-"aMule's Preferences-E<gt>Remote Controls)"
-msgstr "Lade/Speichere Einstellungen vom/zum entfernen aMule. Dies bringt amuleweb dazu, die Kommandozeilen- und Konfigurationsdateieinstellungen zu ignorieren, und von aMule zu beziehen. Beim Speichern werden keine Einstellungen in die Konfigurationsdatei geschrieben, sondern zu aMule gesendet. (das funktioniert nur für Einstellungen in aMule's Einstellungen-E<gt>Fernsteuerung Dialog)"
-
-# type: TP
-#: amuleweb.1:103
-#, no-wrap
-msgid "B<-N>, B<--no-script-cache>"
-msgstr "B<-N>, B<--no-script-cache>"
-
-# type: Plain text
-#: amuleweb.1:106
-msgid "Recompile PHP pages on each request"
-msgstr "Erstellt die PHP-Seiten bei jedem Aufruf neu"
-
-# type: TP
-#: amuleweb.1:106
-#, no-wrap
-msgid "B<--amule-config-file>=I<E<lt>pathE<gt>>"
-msgstr "B<--amule-config-file>=I<E<lt>PfadE<gt>>"
-
-# type: Plain text
-#: amuleweb.1:112
-msgid ""
-"aMule config file path.  B<DO NOT USE DIRECTLY!> aMule uses this option when "
-"starting amuleweb at aMule startup.  This option causes all other "
-"command-line and config-file settings to be ignored, preferences to be read "
-"from the given config file, and also implies the B<-q -L> options."
-msgstr "Pfad zur aMule Konfigurationsdatei. B<NICHT DIREKT BENUTZEN!> aMule benutzt dies zum starten von amuleweb wenn aMule startet. Diese Option sorgt dafür, das alle anderen Paramter ignoriert werden, und nur aus der angegeben Datei gelesen werden, und impliziert auch die B<-q -L> Optionen."
-
-# type: Plain text
-#: amuleweb.1:121
-msgid ""
-"If you specify a file without giving an absolute path (i.e. just a plain "
-"filename, such as B<--path>=I<remote.conf>), then this file is searched "
-"within the aMule configuration directory, I<~/.aMule>."
-msgstr ""
-"If you specify a file without giving an absolute path (i.e. just a plain "
-"filename, such as B<--path>=I<remote.conf>), then this file is searched "
-"within the aMule configuration directory, I<~/.aMule>."
-
-# type: SH
-#: amuleweb.1:148
-#, no-wrap
-msgid "SKIN SUPPORT"
-msgstr "SKIN UNTERSTÜTZUNG"
-
-# type: Plain text
-#: amuleweb.1:155
-msgid ""
-"B<amuleweb> is capable of displaying information in different skins.  These "
-"skins are called templates, and you can make amuleweb load a specific "
-"template via the B<-t> command line option.  Templates are searched in two "
-"places: first in I<~/.aMule/webserver/> and then in "
-"I<$(pkgdatadir)/webserver/> (I<$(pkgdatadir)> is the install location of "
-"architecture independent data, most likely something like "
-"/usr/share/amule).  Each template must be in a subdirectory of the template "
-"name, and this directory must contain all files the template needs.  The "
-"actual template filename must be aMule.tmpl."
-msgstr ""
-"B<amuleweb> ist in der Lage Information in Verschiedenen Skins darzustellen. Diese "
-"Skins werden Templates genannt. du kannst aMule mit der B<-t> Kommandozeilenoption dazu veranlassen, ein bestimmtest Template zu laden. Templates werden an zwei Stellen gesucht: Zuerstt in I<~/.aMule/webserver/> dann in "
-"I<$(pkgdatadir)/webserver/> (I<$(pkgdatadir)> ist der Installationsordner architekturunabhängiger Dateien, meistens /usr/share/amule). Jedes Template muss in einem Unterverzeichnis des Templatenamens liegen, und dieses Verzeichnis muss alle Dateien enthalten die das Template benötigt. Die Templatedatei heißt aMule.tmpl"
-
-# type: Plain text
-#: amuleweb.1:157
-msgid ""
-"For example, the default template (named 'default') is in "
-"webserver/default/, and this directory contains aMule.tmpl amongst a lot of "
-"image files."
-msgstr ""
-"Zum Beispiel, das Standardtemplate (Name: 'default') liegt in "
-"webserver/default/. Das Verzeichnis enthält aMule.tmpl und viele Bilddateien."
-
-# type: Plain text
-#: amuleweb.1:161
-msgid "~/.aMule/webserver/"
-msgstr "~/.aMule/webserver/"
-
-# type: Plain text
-#: amuleweb.1:163
-msgid "I<$(pkgdatadir)>/webserver/"
-msgstr "I<$(pkgdatadir)>/webserver/"
-
-# type: Plain text
-#: amuleweb.1:165
-msgid "Typically amuleweb will be first run as:"
-msgstr "Typischerweise wird amuleweb als erstes folgendermaßen gestartet:"
-
-# type: Plain text
-#: amuleweb.1:167
-msgid ""
-"B<amuleweb> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-s> "
-"I<HTTPport> B<-A> I<AdminPassword> B<-w>"
-msgstr ""
-"B<amuleweb> B<-h> I<hostname> B<-p> I<EC-Port> B<-P> I<EC-Passwort> B<-s> "
-"I<HTTP-Port> B<-A> I<Admin-Passwort> B<-w>"
-
-# type: Plain text
-#: amuleweb.1:171
-msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
-msgstr "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
-
-# type: Plain text
-#: amuleweb.1:175
-msgid "B<amuleweb>"
-msgstr "B<amuleweb>"
-
-# type: Plain text
-#: amuleweb.1:177
-msgid ""
-"Of course, you may specify any more or less options on the first example "
-"line, and you may also totally omit it."
-msgstr "Natürlich kann man zusätzliche Optionen angeben und einzelne auch beim ersten Start weglassen, oder es komplett anders machen."
-
-# type: Plain text
-#: ed2k.1:1
-msgid "B<amule>(1), B<amulecmd>(1)"
-msgstr "B<amule>(1), B<amulecmd>(1)"
-
-# type: TH
-#: ed2k.1:1
-#, no-wrap
-msgid "ED2K"
-msgstr "ED2K"
-
-# type: TH
-#: ed2k.1:1
-#, no-wrap
-msgid "aMule ED2k link parser v1.2.0"
-msgstr "aMule ED2k link parser v1.2.0"
-
-# type: Plain text
-#: ed2k.1:4
-msgid "ed2k - aMule ED2k link parser"
-msgstr "ed2k - aMule ED2k link parser"
-
-# type: Plain text
-#: ed2k.1:7
-msgid "B<ed2k> I<E<lt>ED2k_linkE<gt>>"
-msgstr "B<ed2k> I<E<lt>ED2k-LinkE<gt>>"
-
-# type: Plain text
-#: ed2k.1:12
-msgid "B<ed2k> [B<--help>] [B<--config-dir,>-cB<]> [B<--version>]"
-msgstr "B<ed2k> [B<--help>] [B<--config-dir,>-cB<]> [B<--version>]"
-
-# type: Plain text
-#: ed2k.1:16
-msgid ""
-"aMule ED2k link parser v1.1.0.  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.  B<ed2k> accepts file, server and "
-"serverlist links."
-msgstr ""
-"aMule ED2k link parser v1.1.0. Sendet den übergebenen I<E<lt>ED2k-LinkE<gt>> an "
-"aMule, z.B. schreibt ihn in die Datei ~/.aMule/ED2KLinks, welche von aMule auf neue Links überprüft wird.  B<ed2k> akzeptiert Datei-, Server- und "
-"Serverlistenlinks."
-
-# type: SS
-#: ed2k.1:16
-#, no-wrap
-msgid "Usage:"
-msgstr "Nutzung:"
-
-# type: TP
-#: ed2k.1:20
-#, no-wrap
-msgid "B<-c>, B<--config-dir>=I<E<lt>dirE<gt>> "
-msgstr "B<-c>, B<--config-dir>=I<E<lt>PfadE<gt>> "
-
-# type: Plain text
-#: ed2k.1:23
-msgid ""
-"Specifies the aMule configuration directory. This must be writeable by the "
-"user running B<ed2k>."
-msgstr "Gibt das aMule Konfigurationsverzeichnis an. Dieses muss durch den Nutzer der B<ed2k> aufruft Beschreibbar sein."
-
-# type: Plain text
-#: ed2k.1:28
-msgid "~/.aMule/ED2KLinks"
-msgstr "~/.aMule/ED2KLinks"
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:1 ../../src/utils/xas/docs/xas.1:22
-msgid "B<amule>(1)"
-msgstr "B<amule>(1)"
-
-# type: TH
-#: ../../src/utils/cas/docs/cas.1:1 ../../src/utils/cas/docs/cas.1:6
-#, no-wrap
-msgid "CAS"
-msgstr "CAS"
-
-# type: TH
-#: ../../src/utils/cas/docs/cas.1:1
-#, no-wrap
-msgid "cas v0.8"
-msgstr "cas v0.8"
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:4
-msgid "cas - c aMule statistics"
-msgstr "cas - c aMule statistics"
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:6
-msgid "B<cas>"
-msgstr "B<cas>"
-
-# type: TH
-#: ../../src/utils/cas/docs/cas.1:6
-#, no-wrap
-msgid "aMule ED2k links calculator"
-msgstr "aMule ED2k links Ersteller"
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:13
-#, no-wrap
-msgid ""
-"    ___    _ _   ___    c aMule statistics\n"
-"  /'___) /'_` )/',__)   by Pedro de Oliveira\n"
-" ( (___ ( (_| |\\e\\__, \\e   E<lt>falso@rdk.homeip.netE<gt>\n"
-" `\\e____)`\\e__,_)(____/   Version 0.5\n"
-msgstr ""
-"    ___    _ _   ___    c aMule statistics\n"
-"  /'___) /'_` )/',__)   von Pedro de Oliveira\n"
-" ( (___ ( (_| |\\e\\__, \\e   E<lt>falso@rdk.homeip.netE<gt>\n"
-" `\\e____)`\\e__,_)(____/   Version 0.5\n"
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:16
-msgid ""
-"B<cas> is a program for displaying the contents of your aMule online "
-"signature file to console (in a human readable form)."
-msgstr "B<cas> ist ein Program das den Inhalt deiner aMule Onlinesignaturedatei in menschenlesbarer Form auf der Konsole ausgibt."
-
-# type: SS
-#: ../../src/utils/cas/docs/cas.1:16
-#, no-wrap
-msgid "OPTIONS:"
-msgstr "OPTIONEN:"
-
-# type: TP
-#: ../../src/utils/cas/docs/cas.1:17
-#, no-wrap
-msgid "B<-o>, B<--picture>, B<-P>"
-msgstr "B<-o>, B<--picture>, B<-P>"
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:21
-msgid ""
-"Writes the online signature picture.  You can optionally append "
-"I<\\=\\E<lt>PATH\\E<gt>> to this option, to specify where the picture should "
-"be written"
-msgstr ""
-"Erstellt ein Bild deiner Onlinesignatur. Optional kannst du "
-"I<\\=\\E<lt>Pfad\\E<gt>> dieser Option übergeben, um anzugeben wohin das Bild geschrieben werden soll."
-
-# type: TP
-#: ../../src/utils/cas/docs/cas.1:21
-#, no-wrap
-msgid "B<-p>, B<--html>, B<-H>"
-msgstr "B<-p>, B<--html>, B<-H>"
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:25
-msgid ""
-"HTML page with stats and picture.  You can optionally append "
-"I<\\=\\E<lt>PATH\\E<gt>> to this option, to specify where the page should be "
-"written"
-msgstr ""
-"HTML Seite mit Statistik und Bild. Optional kannst du "
-"I<\\=\\E<lt>Pfad\\E<gt>> dieser Option übergeben, um anzugeben wohin die Seite geschrieben werden soll."
-
-# type: TP
-#: ../../src/utils/cas/docs/cas.1:25
-#, no-wrap
-msgid "B<-c>, B<--config-dir>"
-msgstr "B<-c>, B<--config-dir>"
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:28
-msgid "Specifies a config-dir different from home"
-msgstr "Gibt ein Konfigurationsverzeichnis abweichend des Home an"
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:33
-msgid "Without any options, prints online signature data to stdout."
-msgstr "Ohne Optionen wird die Onlinesignatur nach stdout geschrieben."
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:35
-msgid "~/.aMule/casrc"
-msgstr "~/.aMule/casrc"
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:37
-msgid "stat.png"
-msgstr "stat.png"
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:39
-msgid "tmp.html"
-msgstr "tmp.html"
-
-# type: Plain text
-#: ../../src/utils/cas/docs/cas.1:41
-msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
-msgstr "B<cas> wurde geschrieben von Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
-
-# type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1:1
-msgid "B<amule>(1), B<wxcas>(1)"
-msgstr "B<amule>(1), B<wxcas>(1)"
-
-# type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1:1
-#, no-wrap
-msgid "WXCAS"
-msgstr "WXCAS"
-
-# type: TH
-#: ../../src/utils/wxCas/docs/wxcas.1:1
-#, no-wrap
-msgid "wxCas"
-msgstr "wxCas"
-
-# type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1:4
-msgid "wxcas - wx c aMule statistics"
-msgstr "wxcas - wx c aMule statistics"
-
-# type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1:6
-msgid "B<wxcas>"
-msgstr "B<wxcas>"
-
-# type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1:11
-msgid ""
-"B<wxcas> is a program for displaying the contents of your online signature "
-"file in a nice wx Window on your Desktop.  Based on Pedro de Oliveira's "
-"B<cas>(1)."
-msgstr ""
-"B<wxcas> ist ein Program das den Inhalt deiner aMule Onlinesignaturedatei in menschenlesbarer Form in einem wx-Fenster auf deinem Desktop ausgibt. Basierend auf Pedro de Oliveira's "
-"B<cas>(1)."
-
-# type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1:15
-msgid ""
-"The full documentation of wxcas can be downloaded from "
-"I<http://download.berlios.de/amule/wxcas_user_manual.pdf>."
-msgstr ""
-"Die komplette Dokumentation zu wxcas kannst du herunter laden von:  "
-"I<http://download.berlios.de/amule/wxcas_user_manual.pdf>."
-
-# type: Plain text
-#: ../../src/utils/wxCas/docs/wxcas.1:17
-msgid "B<wxcas> was written by ThePolish E<lt>thepolish@vipmail.ruE<gt>"
-msgstr "B<wxcas> wurde geschrieben von ThePolish E<lt>thepolish@vipmail.ruE<gt>"
-
-# type: Plain text
-#: ../../src/utils/xas/docs/xas.1:1
-msgid "B<amule>(1), B<cas>(1)"
-msgstr "B<amule>(1), B<cas>(1)"
-
-# type: TH
-#: ../../src/utils/xas/docs/xas.1:1
-#, no-wrap
-msgid "XAS"
-msgstr "XAS"
-
-# type: TH
-#: ../../src/utils/xas/docs/xas.1:1
-#, no-wrap
-msgid "xas v1.9"
-msgstr "xas v1.9"
-
-# type: Plain text
-#: ../../src/utils/xas/docs/xas.1:4
-msgid "xas - X-Chat aMule Statistics"
-msgstr "xas - X-Chat aMule Statistics"
-
-# type: Plain text
-#: ../../src/utils/xas/docs/xas.1:6
-msgid "B<none>"
-msgstr "B<Keine>"
-
-# type: Plain text
-#: ../../src/utils/xas/docs/xas.1:12
-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."
-msgstr ""
-"B<xas> ist ein Plugin f<FC>r XChat. Wie man es l<E4>dt ist dessen Doku zu entnehmen."
-"Nach dem Laden tippe einfach /xas, und es werden Statistiken <FC>ber dein"
-"aMule an den Channel in dem du dich befindest gesendet. Diese werden"
-"aus deiner Online-Signatur-Datei gelesen."
-"Damit das funktioniert, muss in aMule die Option \"Online Signatur\" angeschaltet sein!"
-
-# type: Plain text
-#: ../../src/utils/xas/docs/xas.1:14
-msgid ""
-"To enable it on every startup of xchat you can just run the script in "
-"/usr/bin/autstart-xas."
-msgstr "Um es bei jedem Start von xchat zu aktivieren kannst du das Script /usr/bin/autostart-xas verwenden."
-
-# type: Plain text
-#: ../../src/utils/xas/docs/xas.1:16
-msgid "B<xas> was originally written by niet"
-msgstr "B<xas> wurde im Original geschrieben von niet"
-

aMule-2.2.6.tar.bz2/docs/man/manpages.pot Deleted

@@ -1,1611 +0,0 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-08-23 18:27+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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING"
-
-# type: TH
-#: docs/man/amule.1:1
-#, no-wrap
-msgid "AMULE"
-msgstr ""
-
-# type: TH
-#: docs/man/amule.1:1 docs/man/amuled.1:1 docs/man/amulecmd.1:1 docs/man/amulegui.1:1 docs/man/amuleweb.1:1 docs/man/ed2k.1:1 src/utils/cas/docs/cas.1:1 src/utils/cas/docs/cas.1:6 src/utils/wxCas/docs/wxcas.1:1 src/utils/xas/docs/xas.1:1
-#, no-wrap
-msgid "January 2007"
-msgstr ""
-
-# type: TH
-#: docs/man/amule.1:1
-#, no-wrap
-msgid "aMule v2.2.0"
-msgstr ""
-
-# type: TH
-#: docs/man/amule.1:1
-#, no-wrap
-msgid "aMule"
-msgstr ""
-
-# type: SH
-#: docs/man/amule.1:2 docs/man/amuled.1:2 docs/man/amulecmd.1:2 docs/man/amulegui.1:2 docs/man/amuleweb.1:2 docs/man/ed2k.1:2 src/utils/cas/docs/cas.1:2 src/utils/wxCas/docs/wxcas.1:2 src/utils/xas/docs/xas.1:2
-#, no-wrap
-msgid "NAME"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amule.1:4
-msgid "amule - the all-platform eMule p2p client"
-msgstr ""
-
-# type: SH
-#: docs/man/amule.1:4 docs/man/amuled.1:4 docs/man/amulecmd.1:4 docs/man/amulegui.1:4 docs/man/amuleweb.1:4 docs/man/ed2k.1:4 src/utils/cas/docs/cas.1:4 src/utils/wxCas/docs/wxcas.1:4 src/utils/xas/docs/xas.1:4
-#, no-wrap
-msgid "SYNOPSIS"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amule.1:13
-msgid ""
-"B<amule> [B<-v>] [B<-h>] [B<-i>] [B<-geometry> I<E<lt>geomE<gt>>] [B<-d>] "
-"[B<-o>] [B<-r>]"
-msgstr ""
-
-# type: SH
-#: docs/man/amule.1:13 docs/man/amuled.1:15 docs/man/amulecmd.1:24 docs/man/amulegui.1:6 docs/man/amuleweb.1:36 docs/man/ed2k.1:12 src/utils/cas/docs/cas.1:7 src/utils/wxCas/docs/wxcas.1:6 src/utils/xas/docs/xas.1:6
-#, no-wrap
-msgid "DESCRIPTION"
-msgstr ""
-
-# type: TP
-#: docs/man/amule.1:14 docs/man/amuled.1:16
-#, no-wrap
-msgid "B<-v>, B<--version>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amule.1:17 docs/man/amuled.1:19 docs/man/amulecmd.1:65 docs/man/amuleweb.1:118 docs/man/ed2k.1:26
-msgid "Displays the current version number."
-msgstr ""
-
-# type: TP
-#: docs/man/amule.1:17 docs/man/amuled.1:19 src/utils/cas/docs/cas.1:28
-#, no-wrap
-msgid "B<-h>, B<--help>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amule.1:20 docs/man/amuled.1:22 docs/man/amulecmd.1:62 docs/man/amuleweb.1:115 docs/man/ed2k.1:20 src/utils/cas/docs/cas.1:31
-msgid "Prints a short usage description."
-msgstr ""
-
-# type: TP
-#: docs/man/amule.1:20 docs/man/amuled.1:22
-#, no-wrap
-msgid "B<-i>, B<--enable-stdin>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amule.1:23 docs/man/amuled.1:25
-msgid "Does not disable stdin."
-msgstr ""
-
-# type: TP
-#: docs/man/amule.1:23
-#, no-wrap
-msgid "B<-geometry> I<E<lt>geomE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amule.1:27
-msgid ""
-"Sets the geometry of the app.  I<E<lt>geomE<gt>> uses the same format as "
-"standard X11 "
-"apps:\t[B<=>][I<E<lt>widthE<gt>>{B<xX>}I<E<lt>heightE<gt>>][{B<+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>]"
-msgstr ""
-
-# type: TP
-#: docs/man/amule.1:27 docs/man/amuled.1:31
-#, no-wrap
-msgid "B<-d>, B<--disable-fatal>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amule.1:30 docs/man/amuled.1:34
-msgid "Does not handle fatal exception."
-msgstr ""
-
-# type: TP
-#: docs/man/amule.1:30 docs/man/amuled.1:34
-#, no-wrap
-msgid "B<-o>, B<--log-stdout>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amule.1:33 docs/man/amuled.1:37
-msgid "Print log messages to stdout."
-msgstr ""
-
-# type: TP
-#: docs/man/amule.1:33
-#, no-wrap
-msgid "B<-r>, B<--reset-config>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amule.1:36
-msgid "Resets config to default values."
-msgstr ""
-
-# type: SH
-#: docs/man/amule.1:36 docs/man/amuled.1:37 docs/man/amulecmd.1:238 docs/man/amuleweb.1:159 docs/man/ed2k.1:26 src/utils/cas/docs/cas.1:33
-#, no-wrap
-msgid "FILES"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amule.1:39 docs/man/amuled.1:39
-msgid "~/.aMule/*"
-msgstr ""
-
-# type: SH
-#: docs/man/amule.1:39 docs/man/amuled.1:39 docs/man/amulecmd.1:254 docs/man/amulegui.1:13 docs/man/amuleweb.1:179 docs/man/ed2k.1:28 src/utils/cas/docs/cas.1:41 src/utils/wxCas/docs/wxcas.1:17 src/utils/xas/docs/xas.1:16
-#, no-wrap
-msgid "REPORTING BUGS"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amule.1:42 docs/man/amuled.1:42 docs/man/amulecmd.1:257 docs/man/amulegui.1:16 docs/man/amuleweb.1:182 docs/man/ed2k.1:31 src/utils/cas/docs/cas.1:44 src/utils/wxCas/docs/wxcas.1:20 src/utils/xas/docs/xas.1:19
-msgid ""
-"Please report bugs either on our forum (I<http://forum.amule.org/>), or in "
-"our bugtracker (I<http://bugs.amule.org/>).  Please do not report bugs in "
-"e-mail, neither to our mailing list nor directly to any team member."
-msgstr ""
-
-# type: SH
-#: docs/man/amule.1:42 docs/man/amuled.1:42 docs/man/amulecmd.1:257 docs/man/amulegui.1:16 docs/man/amuleweb.1:182 docs/man/ed2k.1:31 src/utils/cas/docs/cas.1:44 src/utils/wxCas/docs/wxcas.1:20 src/utils/xas/docs/xas.1:19
-#, no-wrap
-msgid "COPYRIGHT"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amule.1:44 docs/man/amuled.1:44 docs/man/amulecmd.1:259 docs/man/amulegui.1:18 docs/man/amuleweb.1:184 docs/man/ed2k.1:33 src/utils/cas/docs/cas.1:46 src/utils/wxCas/docs/wxcas.1:22 src/utils/xas/docs/xas.1:21
-msgid ""
-"aMule and all of its related utilities are distributed under the GNU General "
-"Public License."
-msgstr ""
-
-# type: SH
-#: docs/man/amule.1:44 docs/man/amuled.1:44 docs/man/amulecmd.1:259 docs/man/amulegui.1:18 docs/man/amuleweb.1:184 docs/man/ed2k.1:33 src/utils/cas/docs/cas.1:46 src/utils/wxCas/docs/wxcas.1:22 src/utils/xas/docs/xas.1:21
-#, no-wrap
-msgid "SEE ALSO"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuled.1:1
-msgid ""
-"B<alc>(1), B<alcc>(1), B<amuled>(1), B<amulecmd>(1), B<amulegui>(1), "
-"B<amuleweb>(1), B<cas>(1), B<ed2k>(1), B<wxcas>(1), B<xas>(1)"
-msgstr ""
-
-# type: TH
-#: docs/man/amuled.1:1
-#, no-wrap
-msgid "AMULED"
-msgstr ""
-
-# type: TH
-#: docs/man/amuled.1:1
-#, no-wrap
-msgid "aMule Daemon v2.2.0"
-msgstr ""
-
-# type: TH
-#: docs/man/amuled.1:1
-#, no-wrap
-msgid "aMule Daemon"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuled.1:4
-msgid "amuled - the all-platform eMule p2p client - daemonized version"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuled.1:14
-msgid ""
-"B<amuled> [B<-v>] [B<-h>] [B<-i>] [B<-f>] [B<-c> I<E<lt>dirE<gt>>] [B<-d>] "
-"[B<-o>] [B<-r>]"
-msgstr ""
-
-# type: TP
-#: docs/man/amuled.1:25
-#, no-wrap
-msgid "B<-f>, B<--full-daemon>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuled.1:28
-msgid "Fork to Background"
-msgstr ""
-
-# type: TP
-#: docs/man/amuled.1:28
-#, no-wrap
-msgid "B<-c>, B<--config-dir>=I<E<lt>dirE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuled.1:31
-msgid "Read config from E<lt>dirE<gt> instead of home."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:1
-msgid ""
-"B<alcc>(1), B<amule>(1), B<amulecmd>(1), B<amulegui>(1), B<amuleweb>(1), "
-"B<cas>(1), B<ed2k>(1)"
-msgstr ""
-
-# type: TH
-#: docs/man/amulecmd.1:1
-#, no-wrap
-msgid "AMULECMD"
-msgstr ""
-
-# type: TH
-#: docs/man/amulecmd.1:1
-#, no-wrap
-msgid "aMuleCmd v2.2.0"
-msgstr ""
-
-# type: TH
-#: docs/man/amulecmd.1:1 docs/man/amuleweb.1:1 docs/man/ed2k.1:1 src/utils/cas/docs/cas.1:1 src/utils/cas/docs/cas.1:6 src/utils/wxCas/docs/wxcas.1:1 src/utils/xas/docs/xas.1:1
-#, no-wrap
-msgid "aMule utilities"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:4
-msgid "amulecmd - Console-based program to control aMule"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:15
-msgid ""
-"B<amulecmd> [B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
-"I<E<lt>passwdE<gt>>] [B<-f> I<E<lt>pathE<gt>>] [B<-q>] [B<-v>] [B<-l> "
-"I<E<lt>langE<gt>>] [B<-w>] [B<-c> I<E<lt>commandE<gt>>]"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:18
-msgid "B<amulecmd> B<--create-config-from=>I<E<lt>pathE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:21
-msgid "B<amulecmd> [B<--help>]"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:24
-msgid "B<amulecmd> [B<--version>]"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:26
-msgid "B<amulecmd> is a console-based client to control aMule."
-msgstr ""
-
-# type: TP
-#: docs/man/amulecmd.1:26 docs/man/amuleweb.1:41
-#, no-wrap
-msgid "B<-h>, B<--host>=I<E<lt>hostE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:30 docs/man/amuleweb.1:45
-msgid ""
-"Host where aMule is running (default: I<localhost>).  I<E<lt>hostE<gt>> "
-"might be an IP address or a DNS name"
-msgstr ""
-
-# type: TP
-#: docs/man/amulecmd.1:30 docs/man/amuleweb.1:45
-#, no-wrap
-msgid "B<-p>, B<--port>=I<E<lt>portE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:33 docs/man/amuleweb.1:48
-msgid ""
-"aMule's port for External Connections, as set in Preferences-E<gt>Remote "
-"Controls (default: I<4712>)"
-msgstr ""
-
-# type: TP
-#: docs/man/amulecmd.1:33 docs/man/amuleweb.1:48
-#, no-wrap
-msgid "B<-P>, B<--password>=I<E<lt>passwdE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:36 docs/man/amuleweb.1:51
-msgid "External Connections password"
-msgstr ""
-
-# type: TP
-#: docs/man/amulecmd.1:36 docs/man/amuleweb.1:51
-#, no-wrap
-msgid "B<-f>, B<--config-file>=I<E<lt>pathE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:40 docs/man/amuleweb.1:55
-msgid ""
-"Use the given configuration file.  Default configuration file is "
-"I<~/.aMule/remote.conf>"
-msgstr ""
-
-# type: TP
-#: docs/man/amulecmd.1:40 docs/man/amuleweb.1:55
-#, no-wrap
-msgid "B<-q>, B<--quiet>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:43
-msgid ""
-"Ddo not print any output to stdout. This seems to be a very much useless "
-"option with B<amulecmd>."
-msgstr ""
-
-# type: TP
-#: docs/man/amulecmd.1:43 docs/man/amuleweb.1:59
-#, no-wrap
-msgid "B<-v>, B<--verbose>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:46 docs/man/amuleweb.1:62
-msgid "Be verbose - show also debug messages"
-msgstr ""
-
-# type: TP
-#: docs/man/amulecmd.1:46 docs/man/amuleweb.1:62
-#, no-wrap
-msgid "B<-l>, B<--locale>=I<E<lt>langE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:50 docs/man/amuleweb.1:66
-msgid ""
-"Sets program locale (language).  See section B<LANGUAGES> for the "
-"description of the I<E<lt>langE<gt>> parameter."
-msgstr ""
-
-# type: TP
-#: docs/man/amulecmd.1:50 docs/man/amuleweb.1:66
-#, no-wrap
-msgid "B<-w>, B<--write-config>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:53 docs/man/amuleweb.1:69
-msgid "Write command line options to config file and exit"
-msgstr ""
-
-# type: TP
-#: docs/man/amulecmd.1:53
-#, no-wrap
-msgid "B<-c>, B<--command>=I<E<lt>commandE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:56
-msgid ""
-"Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and "
-"exit."
-msgstr ""
-
-# type: TP
-#: docs/man/amulecmd.1:56 docs/man/amuleweb.1:69
-#, no-wrap
-msgid "B<--create-config-from>=I<E<lt>pathE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:59 docs/man/amuleweb.1:72
-msgid ""
-"Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid "
-"aMule config file, and then exit"
-msgstr ""
-
-# type: TP
-#: docs/man/amulecmd.1:59 docs/man/amuleweb.1:112 docs/man/ed2k.1:17
-#, no-wrap
-msgid "B<--help>"
-msgstr ""
-
-# type: TP
-#: docs/man/amulecmd.1:62 docs/man/amuleweb.1:115 docs/man/ed2k.1:23
-#, no-wrap
-msgid "B<--version>"
-msgstr ""
-
-# type: SH
-#: docs/man/amulecmd.1:65
-#, no-wrap
-msgid "COMMANDS"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:67
-msgid "All commands are case insensitive"
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:67
-#, no-wrap
-msgid "AddR< E<lt>ed2k-linkE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:69
-msgid "Adds an ed2k-linkto the core."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:71
-msgid "The ed2k link to be added can be:"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:73
-msgid "*) a file link (ed2k://|file|...), it will be added to the download queue,"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:75
-msgid "*) a server link (ed2k://|server|...), it will be added to the server list,"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:77
-msgid ""
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the server list."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:79 docs/man/amulecmd.1:104 docs/man/amulecmd.1:176
-msgid "This command must have an argument."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:79
-#, no-wrap
-msgid "CancelR< E<lt>hashE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:81
-msgid "Cancels the download specified by hash. To get the hash use I<show>."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:81
-#, no-wrap
-msgid "ConnectR< (kad|ed2kE<lt>ip|nameE<gt>)>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:83
-msgid "Connect to the network."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:85
-msgid "This will connect to all networks that are enabled in Preferences."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:90
-msgid ""
-"When giving ed2k as parameter, it connects only to ed2k-network to servers "
-"in your serverlist. You may also optionally specify a server address in "
-"IP:Port form, to connect to that server only. The IP must be a dotted "
-"decimal IPv4 address, or a resolvable DNS name."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:92
-msgid "When giving kad, it connects to Kad only."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:92
-#, no-wrap
-msgid "DisconnectR< (ed2k|kad)>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:96
-msgid ""
-"Disconnect from all networks you are cionnected to, or just disconnect from "
-"the specified network."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:96
-#, no-wrap
-msgid "DownloadR< num>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:98
-msgid "Start downloading a file"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:102
-msgid ""
-"The number of a file from the last search has to be given.  Example: "
-"'download 12' will start to download the file with the number 12 of the "
-"previous search."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:104
-#, no-wrap
-msgid "Exit"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:106
-msgid "Disconnect from amule/amuled and quit amulecmd."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:106
-#, no-wrap
-msgid "GetR< value>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:108
-msgid "Get and display a preference value."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:110 docs/man/amulecmd.1:134 docs/man/amulecmd.1:166
-msgid "This command is incomplete, aviable values are listed below."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:112 docs/man/amulecmd.1:136 docs/man/amulecmd.1:168
-msgid "Available values to get:"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:114
-msgid "BwLimits\tGet bandwidth limits."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:116
-msgid "IPFilter\tGet IPFilter preferences."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:116
-#, no-wrap
-msgid "HelpR< E<lt>commandE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:120
-msgid ""
-"Get a short help.  If called without parameter, it shows a list of aviable "
-"commands.  If called with E<lt>commandE<gt>, it shows a short description of "
-"the given command."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:120
-#, no-wrap
-msgid "PauseR< E<lt>hashE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:122
-msgid "Pauses the download specified by hash. To get the hash use I<show>."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:122
-#, no-wrap
-msgid "Progress"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:124
-msgid "Shows the progress of an ongiong search."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:126 docs/man/amulecmd.1:130 docs/man/amulecmd.1:144 docs/man/amulecmd.1:148 docs/man/amulecmd.1:194
-msgid "This command can't have an argument."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:126
-#, no-wrap
-msgid "Quit"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:128
-msgid "Exits the App."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:130
-#, no-wrap
-msgid "Reload"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:132
-msgid "Reloads a given object."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:138
-msgid "BwLimits\tReload bandwidth limits."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:140
-msgid "IPFilter\tReload IPFilter preferences."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:140
-#, no-wrap
-msgid "Reset"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:142
-msgid "Reset the log."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:144
-#, no-wrap
-msgid "Results"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:146
-msgid "Shows you the results of the last search."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:148
-#, no-wrap
-msgid "ResumeR< E<lt>hashE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:150
-msgid "Resumes the download specified by hash. To get the hash use I<show>."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:150
-#, no-wrap
-msgid "SearchR< global|kad|local file>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:154
-msgid ""
-"Makes a search for the given file. A searchtype and a file to search is "
-"mandatory to do this.  I<Example> 'search kad amule' performs a kad search "
-"for amule."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:156
-msgid "Aviable searchtypes:"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:158
-msgid "global\tperforms a global search"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:160
-msgid "kad\tperforms a search on kad network"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:162
-msgid "local\tperforms a local search"
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:162
-#, no-wrap
-msgid "SetR< E<lt>valueE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:164
-msgid "Sets a given preferences value."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:170
-msgid "BwLimits\tSet bandwidth limits."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:172
-msgid "IPFilter\tSet IPFilter preferences."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:172
-#, no-wrap
-msgid "ShowR< DL|Log|Servers|UL>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:174
-msgid "Shows upload/download queue, server list or shared files list."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:178
-msgid "This command is incomplete, you must use one of the extensions below."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:180
-msgid "Available extensions:"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:182
-msgid "DL\t\tShow download queue."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:184
-msgid "Log\t\tShow log."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:186
-msgid "Servers\tShow servers list."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:188
-msgid "UL\t\tShow upload queue."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:188
-#, no-wrap
-msgid "Shutdown"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:192
-msgid ""
-"Shutdown the remote running core (amule/amuled).  This will also shut down "
-"the text client, since it is unusable without a running core."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:194
-#, no-wrap
-msgid "StatisticsR< E<lt>numE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:196
-msgid "Show statistics tree."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:200
-msgid ""
-"The optional number in the range of 0-255 can be passed as argument to this "
-"command, which tells how many entries of the client version subtree should "
-"be shown. Passing 0, or omitting it means 'unlimited'."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:203
-msgid ""
-"I<Example:> 'statistics 5' will show only the top 5 versions for each client "
-"type."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:203
-#, no-wrap
-msgid "Status"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:205
-msgid "Show connection status, current up/download speeds, etc."
-msgstr ""
-
-# type: SH
-#: docs/man/amulecmd.1:206 docs/man/amuleweb.1:118
-#, no-wrap
-msgid "NOTES"
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:207 docs/man/amuleweb.1:119
-#, no-wrap
-msgid "Paths"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:211 docs/man/amuleweb.1:123
-msgid ""
-"For all options which take a I<E<lt>pathE<gt>> value, if the I<path> "
-"contains no directory part (i.e. just a plain filename), then it is "
-"considered to be under the aMule configuration directory, I<~/.aMule>."
-msgstr ""
-
-# type: SS
-#: docs/man/amulecmd.1:211 docs/man/amuleweb.1:123
-#, no-wrap
-msgid "LANGUAGES"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:217 docs/man/amuleweb.1:129
-msgid ""
-"The I<E<lt>langE<gt>> parameter for the B<-l> option has the following form: "
-"I<lang>[B<_>I<LANG>][B<.>I<encoding>][B<@>I<modifier>] where I<lang> is the "
-"primary language, I<LANG> is a sublanguage/territory, I<encoding> is the "
-"character set to use and I<modifier> \"allows the user to select a specific "
-"instance of localization data within a single category\"."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:219 docs/man/amuleweb.1:131
-msgid "For example, the following strings are valid:"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:221 docs/man/amuleweb.1:133
-msgid "de"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:223 docs/man/amuleweb.1:135
-msgid "de_DE"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:225 docs/man/amuleweb.1:137
-msgid "de_DE.iso88591"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:227 docs/man/amuleweb.1:139
-msgid "de_DE@euro"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:229 docs/man/amuleweb.1:141
-msgid "de_DE.iso88591@euro"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:232 docs/man/amuleweb.1:144
-msgid ""
-"Though all the above strings are accepted as valid language definitions, "
-"I<encoding> and I<modifier> are yet unused."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:235 docs/man/amuleweb.1:147
-msgid ""
-"In addition to the format above, you can also specify full language names in "
-"English - so B<-l german> is also valid and is equal to B<-l de_DE>."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:238 docs/man/amuleweb.1:150
-msgid ""
-"When no locale is defined, either on command-line or in config file, system "
-"default language will be used."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:240 docs/man/amuleweb.1:161
-msgid "~/.aMule/remote.conf"
-msgstr ""
-
-# type: SH
-#: docs/man/amulecmd.1:240 docs/man/amuleweb.1:165
-#, no-wrap
-msgid "EXAMPLE"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:242
-msgid "Typically amulecmd will be first run as:"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:244
-msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:246 docs/man/amuleweb.1:171
-msgid "or"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:248
-msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:250 docs/man/amuleweb.1:175
-msgid ""
-"These will save settings to I<$HOME/.aMule/remote.conf>, and later you only "
-"need to type:"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:252
-msgid "B<amulecmd>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulecmd.1:254
-msgid "Of course, you don't have to follow this example."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulegui.1:1
-msgid "B<amule>(1), B<amuleweb>(1)"
-msgstr ""
-
-# type: TH
-#: docs/man/amulegui.1:1
-#, no-wrap
-msgid "AMULEGUI"
-msgstr ""
-
-# type: TH
-#: docs/man/amulegui.1:1
-#, no-wrap
-msgid "aMuleGUI v2.2.0"
-msgstr ""
-
-# type: TH
-#: docs/man/amulegui.1:1
-#, no-wrap
-msgid "aMuleGUI"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulegui.1:4
-msgid "amulegui - aMule control program with GUI"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulegui.1:6
-msgid "B<amulegui>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulegui.1:11
-msgid ""
-"B<amulegui> is a client program, and can be connected on amule or amuled via "
-"EC. You can manage your amule program with it. It provides the almost same "
-"functionality as amule, even if the core works on another computer."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulegui.1:13 src/utils/wxCas/docs/wxcas.1:13
-msgid "This program doesn't take any arguments."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulegui.1:20
-msgid ""
-"B<alc>(1), B<alcc>(1), B<amuled>(1), B<amulecmd>(1), B<amuleweb>(1), "
-"B<cas>(1), B<ed2k>(1), B<wxcas>(1), B<xas>(1)"
-msgstr ""
-
-# type: SH
-#: docs/man/amulegui.1:20 src/utils/cas/docs/cas.1:39 src/utils/wxCas/docs/wxcas.1:15 src/utils/xas/docs/xas.1:14
-#, no-wrap
-msgid "AUTHOR"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amulegui.1:23
-msgid ""
-"This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm "
-"DOT orgE<gt> This manpage was rewritten by Vollstrecker for aMule "
-"E<lt>amule@vollstreckernet.deE<gt>"
-msgstr ""
-
-# type: TH
-#: docs/man/amuleweb.1:1
-#, no-wrap
-msgid "AMULEWEB"
-msgstr ""
-
-# type: TH
-#: docs/man/amuleweb.1:1
-#, no-wrap
-msgid "aMule webserver v2.2.0"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:4
-msgid "amuleweb - aMule web server"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:24
-msgid ""
-"B<amuleweb> [B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
-"I<E<lt>passE<gt>>] [B<-f> I<E<lt>pathE<gt>>] [B<-q>] [B<-v>] [B<-l> "
-"I<E<lt>langE<gt>>] [B<-w>] [B<-t> I<E<lt>nameE<gt>>] [B<-s> "
-"I<E<lt>portE<gt>>] [B<-z>] [B<-Z>] [B<-A> I<E<lt>passE<gt>>] [B<-G> "
-"I<E<lt>passE<gt>>] [B<-a>] [B<-d>] [B<-L>] [B<-N>]"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:28
-msgid ""
-"B<amuleweb> [B<-f> I<E<lt>pathE<gt>>] "
-"B<--create-config-from=>I<E<lt>pathE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:32
-msgid "B<amuleweb> [B<--help>] [B<--version>]"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:34
-msgid "B<amuleweb --amule-config-file=>I<E<lt>pathE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:36
-msgid "B<amuleweb --no-php>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:41
-msgid ""
-"B<amuleweb> manages your access to amule through a webbrowser.  You can "
-"start amuleweb together with B<amule>(1), or separately, any time later.  "
-"Options can be specified via command-line or via config-file.  Command-line "
-"options take precedence over config-file options."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:59
-msgid ""
-"Do not print any output to stdout.  You may want to use B<-q> to daemonize "
-"the webserver, i.e. running as 'B<amuleweb -q &>'"
-msgstr ""
-
-# type: TP
-#: docs/man/amuleweb.1:72
-#, no-wrap
-msgid "B<-t>, B<--template>=I<E<lt>nameE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:76
-msgid ""
-"Loads the template named I<E<lt>nameE<gt>>. See also the section B<SKIN "
-"SUPPORT>"
-msgstr ""
-
-# type: TP
-#: docs/man/amuleweb.1:76
-#, no-wrap
-msgid "B<-s>, B<--server-port>=I<E<lt>portE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:79
-msgid ""
-"Webserver's HTTP port. This is the port you can point your browser to "
-"(default: I<4711>)"
-msgstr ""
-
-# type: TP
-#: docs/man/amuleweb.1:79
-#, no-wrap
-msgid "B<-z>, B<--enable-gzip>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:82
-msgid "Enable using gzip compression in HTTP traffic to save bandwidth"
-msgstr ""
-
-# type: TP
-#: docs/man/amuleweb.1:82
-#, no-wrap
-msgid "B<-Z>, B<--disable-gzip>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:85
-msgid "Disable using gzip compression (this is the default)"
-msgstr ""
-
-# type: TP
-#: docs/man/amuleweb.1:85
-#, no-wrap
-msgid "B<-A>, B<--admin-pass>=I<E<lt>passwdE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:88
-msgid "Full access password for webserver"
-msgstr ""
-
-# type: TP
-#: docs/man/amuleweb.1:88
-#, no-wrap
-msgid "B<-G>, B<--guest-pass>=I<E<lt>passwdE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:91
-msgid "Guest password for webserver"
-msgstr ""
-
-# type: TP
-#: docs/man/amuleweb.1:91
-#, no-wrap
-msgid "B<-a>, B<--allow-guest>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:94
-msgid "Allow guest access"
-msgstr ""
-
-# type: TP
-#: docs/man/amuleweb.1:94
-#, no-wrap
-msgid "B<-d>, B<--deny-guest>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:97
-msgid "Deny guest access (default)"
-msgstr ""
-
-# type: TP
-#: docs/man/amuleweb.1:97
-#, no-wrap
-msgid "B<-L>, B<--load-settings>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:103
-msgid ""
-"Load/save webserver settings from/to remote aMule.  This causes amuleweb to "
-"ignore command-line and config-file settings, and load them from aMule.  "
-"When saving preferences none will be written to the config file, but to "
-"aMule.  (Of course, this works only for those settings, that can be set in "
-"aMule's Preferences-E<gt>Remote Controls)"
-msgstr ""
-
-# type: TP
-#: docs/man/amuleweb.1:103
-#, no-wrap
-msgid "B<-N>, B<--no-script-cache>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:106
-msgid "Recompile PHP pages on each request"
-msgstr ""
-
-# type: TP
-#: docs/man/amuleweb.1:106
-#, no-wrap
-msgid "B<--amule-config-file>=I<E<lt>pathE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:112
-msgid ""
-"aMule config file path.  B<DO NOT USE DIRECTLY!> aMule uses this option when "
-"starting amuleweb at aMule startup.  This option causes all other "
-"command-line and config-file settings to be ignored, preferences to be read "
-"from the given config file, and also implies the B<-q -L> options."
-msgstr ""
-
-# type: SH
-#: docs/man/amuleweb.1:150
-#, no-wrap
-msgid "SKIN SUPPORT"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:157
-msgid ""
-"B<amuleweb> is capable of displaying information in different skins.  These "
-"skins are called templates, and you can make amuleweb load a specific "
-"template via the B<-t> command line option.  Templates are searched in two "
-"places: first in I<~/.aMule/webserver/> and then in "
-"I<$(pkgdatadir)/webserver/> (I<$(pkgdatadir)> is the install location of "
-"architecture independent data, most likely something like "
-"/usr/share/amule).  Each template must be in a subdirectory of the template "
-"name, and this directory must contain all files the template needs.  The "
-"actual template filename must be aMule.tmpl."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:159
-msgid ""
-"For example, the default template (named 'default') is in "
-"webserver/default/, and this directory contains aMule.tmpl amongst a lot of "
-"image files."
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:163
-msgid "~/.aMule/webserver/"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:165
-msgid "I<$(pkgdatadir)>/webserver/"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:167
-msgid "Typically amuleweb will be first run as:"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:169
-msgid ""
-"B<amuleweb> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-s> "
-"I<HTTPport> B<-A> I<AdminPassword> B<-w>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:173
-msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:177
-msgid "B<amuleweb>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/amuleweb.1:179
-msgid ""
-"Of course, you may specify any more or less options on the first example "
-"line, and you may also totally omit it."
-msgstr ""
-
-# type: Plain text
-#: docs/man/ed2k.1:1
-msgid "B<amule>(1), B<amulecmd>(1)"
-msgstr ""
-
-# type: TH
-#: docs/man/ed2k.1:1
-#, no-wrap
-msgid "ED2K"
-msgstr ""
-
-# type: TH
-#: docs/man/ed2k.1:1
-#, no-wrap
-msgid "aMule ED2k link parser v1.2.0"
-msgstr ""
-
-# type: Plain text
-#: docs/man/ed2k.1:4
-msgid "ed2k - aMule ED2k link parser"
-msgstr ""
-
-# type: Plain text
-#: docs/man/ed2k.1:7
-msgid "B<ed2k> I<E<lt>ED2k_linkE<gt>>"
-msgstr ""
-
-# type: Plain text
-#: docs/man/ed2k.1:12
-msgid "B<ed2k> [B<--help>] [B<--config-dir,>-cB<]> [B<--version>]"
-msgstr ""
-
-# type: Plain text
-#: docs/man/ed2k.1:16
-msgid ""
-"aMule ED2k link parser v1.1.0.  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.  B<ed2k> accepts file, server and "
-"serverlist links."
-msgstr ""
-
-# type: SS
-#: docs/man/ed2k.1:16
-#, no-wrap
-msgid "Usage:"
-msgstr ""
-
-# type: TP
-#: docs/man/ed2k.1:20
-#, no-wrap
-msgid "B<-c>, B<--config-dir>=I<E<lt>dirE<gt>> "
-msgstr ""
-
-# type: Plain text
-#: docs/man/ed2k.1:23
-msgid ""
-"Specifies the aMule configuration directory. This must be writeable by the "
-"user running B<ed2k>."
-msgstr ""
-
-# type: Plain text
-#: docs/man/ed2k.1:28
-msgid "~/.aMule/ED2KLinks"
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:1 src/utils/xas/docs/xas.1:22
-msgid "B<amule>(1)"
-msgstr ""
-
-# type: TH
-#: src/utils/cas/docs/cas.1:1 src/utils/cas/docs/cas.1:6
-#, no-wrap
-msgid "CAS"
-msgstr ""
-
-# type: TH
-#: src/utils/cas/docs/cas.1:1
-#, no-wrap
-msgid "cas v0.8"
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:4
-msgid "cas - c aMule statistics"
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:6
-msgid "B<cas>"
-msgstr ""
-
-# type: TH
-#: src/utils/cas/docs/cas.1:6
-#, no-wrap
-msgid "aMule ED2k links calculator"
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:13
-#, no-wrap
-msgid ""
-"    ___    _ _   ___    c aMule statistics\n"
-"  /'___) /'_` )/',__)   by Pedro de Oliveira\n"
-" ( (___ ( (_| |\\e\\__, \\e   E<lt>falso@rdk.homeip.netE<gt>\n"
-" `\\e____)`\\e__,_)(____/   Version 0.5\n"
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:16
-msgid ""
-"B<cas> is a program for displaying the contents of your aMule online "
-"signature file to console (in a human readable form)."
-msgstr ""
-
-# type: SS
-#: src/utils/cas/docs/cas.1:16
-#, no-wrap
-msgid "OPTIONS:"
-msgstr ""
-
-# type: TP
-#: src/utils/cas/docs/cas.1:17
-#, no-wrap
-msgid "B<-o>, B<--picture>, B<-P>"
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:21
-msgid ""
-"Writes the online signature picture.  You can optionally append "
-"I<\\=\\E<lt>PATH\\E<gt>> to this option, to specify where the picture should "
-"be written"
-msgstr ""
-
-# type: TP
-#: src/utils/cas/docs/cas.1:21
-#, no-wrap
-msgid "B<-p>, B<--html>, B<-H>"
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:25
-msgid ""
-"HTML page with stats and picture.  You can optionally append "
-"I<\\=\\E<lt>PATH\\E<gt>> to this option, to specify where the page should be "
-"written"
-msgstr ""
-
-# type: TP
-#: src/utils/cas/docs/cas.1:25
-#, no-wrap
-msgid "B<-c>, B<--config-dir>"
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:28
-msgid "Specifies a config-dir different from home"
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:33
-msgid "Without any options, prints online signature data to stdout."
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:35
-msgid "~/.aMule/casrc"
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:37
-msgid "stat.png"
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:39
-msgid "tmp.html"
-msgstr ""
-
-# type: Plain text
-#: src/utils/cas/docs/cas.1:41
-msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
-msgstr ""
-
-# type: Plain text
-#: src/utils/wxCas/docs/wxcas.1:1
-msgid "B<amule>(1), B<wxcas>(1)"
-msgstr ""
-
-# type: TH
-#: src/utils/wxCas/docs/wxcas.1:1
-#, no-wrap
-msgid "WXCAS"
-msgstr ""
-
-# type: TH
-#: src/utils/wxCas/docs/wxcas.1:1
-#, no-wrap
-msgid "wxCas"
-msgstr ""
-
-# type: Plain text
-#: src/utils/wxCas/docs/wxcas.1:4
-msgid "wxcas - wx c aMule statistics"
-msgstr ""
-
-# type: Plain text
-#: src/utils/wxCas/docs/wxcas.1:6
-msgid "B<wxcas>"
-msgstr ""
-
-# type: Plain text
-#: src/utils/wxCas/docs/wxcas.1:11
-msgid ""
-"B<wxcas> is a program for displaying the contents of your online signature "
-"file in a nice wx Window on your Desktop.  Based on Pedro de Oliveira's "
-"B<cas>(1)."
-msgstr ""
-
-# type: Plain text
-#: src/utils/wxCas/docs/wxcas.1:15
-msgid ""
-"The full documentation of wxcas can be downloaded from "
-"I<http://download.berlios.de/amule/wxcas_user_manual.pdf>."
-msgstr ""
-
-# type: Plain text
-#: src/utils/wxCas/docs/wxcas.1:17
-msgid "B<wxcas> was written by ThePolish E<lt>thepolish@vipmail.ruE<gt>"
-msgstr ""
-
-# type: Plain text
-#: src/utils/xas/docs/xas.1:1
-msgid "B<amule>(1), B<cas>(1)"
-msgstr ""
-
-# type: TH
-#: src/utils/xas/docs/xas.1:1
-#, no-wrap
-msgid "XAS"
-msgstr ""
-
-# type: TH
-#: src/utils/xas/docs/xas.1:1
-#, no-wrap
-msgid "xas v1.9"
-msgstr ""
-
-# type: Plain text
-#: src/utils/xas/docs/xas.1:4
-msgid "xas - X-Chat aMule Statistics"
-msgstr ""
-
-# type: Plain text
-#: src/utils/xas/docs/xas.1:6
-msgid "B<none>"
-msgstr ""
-
-# type: Plain text
-#: src/utils/xas/docs/xas.1:12
-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."
-msgstr ""
-
-# type: Plain text
-#: src/utils/xas/docs/xas.1:14
-msgid ""
-"To enable it on every startup of xchat you can just run the script in "
-"/usr/bin/autstart-xas."
-msgstr ""
-
-# type: Plain text
-#: src/utils/xas/docs/xas.1:16
-msgid "B<xas> was originally written by niet"
-msgstr ""

aMule-2.2.6.tar.bz2/docs/socks4.protocol Deleted

@@ -1,152 +0,0 @@
-	SOCKS: A protocol for TCP proxy across firewalls
-
-			Ying-Da Lee
-		Principal Member Technical Staff
-		  NEC Systems Laboratory, CSTC
-			ylee@syl.dl.nec.com
-
-SOCKS was originally developed by David Koblas and subsequently modified
-and extended by me to its current running version -- version 4. It is a
-protocol that relays TCP sessions at a firewall host to allow application
-users transparent access across the firewall. Because the protocol is
-independent of application protocols, it can be (and has been) used for
-many different services, such as telnet, ftp, finger, whois, gopher, WWW,
-etc. Access control can be applied at the beginning of each TCP session;
-thereafter the server simply relays the data between the client and the
-application server, incurring minimum processing overhead. Since SOCKS
-never has to know anything about the application protocol, it should also
-be easy for it to accommodate applications which use encryption to protect
-their traffic from nosey snoopers.
-
-Two operations are defined: CONNECT and BIND.
-
-1) CONNECT
-
-The client connects to the SOCKS server and sends a CONNECT request when
-it wants to establish a connection to an application server. The client
-includes in the request packet the IP address and the port number of the
-destination host, and userid, in the following format.
-
-		+----+----+----+----+----+----+----+----+----+----+....+----+
-		| VN | CD | DSTPORT |      DSTIP        | USERID       |NULL|
-		+----+----+----+----+----+----+----+----+----+----+....+----+
- # of bytes:	   1    1      2              4           variable       1
-
-VN is the SOCKS protocol version number and should be 4. CD is the
-SOCKS command code and should be 1 for CONNECT request. NULL is a byte
-of all zero bits.
-
-The SOCKS server checks to see whether such a request should be granted
-based on any combination of source IP address, destination IP address,
-destination port number, the userid, and information it may obtain by
-consulting IDENT, cf. RFC 1413.  If the request is granted, the SOCKS
-server makes a connection to the specified port of the destination host.
-A reply packet is sent to the client when this connection is established,
-or when the request is rejected or the operation fails. 
-
-		+----+----+----+----+----+----+----+----+
-		| VN | CD | DSTPORT |      DSTIP        |
-		+----+----+----+----+----+----+----+----+
- # of bytes:	   1    1      2              4
-
-VN is the version of the reply code and should be 0. CD is the result
-code with one of the following values:
-
-	90: request granted
-	91: request rejected or failed
-	92: request rejected becasue SOCKS server cannot connect to
-	    identd on the client
-	93: request rejected because the client program and identd
-	    report different user-ids
-
-The remaining fields are ignored.
-
-The SOCKS server closes its connection immediately after notifying
-the client of a failed or rejected request. For a successful request,
-the SOCKS server gets ready to relay traffic on both directions. This
-enables the client to do I/O on its connection as if it were directly
-connected to the application server.
-
-
-2) BIND
-
-The client connects to the SOCKS server and sends a BIND request when
-it wants to prepare for an inbound connection from an application server.
-This should only happen after a primary connection to the application
-server has been established with a CONNECT.  Typically, this is part of
-the sequence of actions:
-
--bind(): obtain a socket
--getsockname(): get the IP address and port number of the socket
--listen(): ready to accept call from the application server
--use the primary connection to inform the application server of
- the IP address and the port number that it should connect to.
--accept(): accept a connection from the application server
-
-The purpose of SOCKS BIND operation is to support such a sequence
-but using a socket on the SOCKS server rather than on the client.
-
-The client includes in the request packet the IP address of the
-application server, the destination port used in the primary connection,
-and the userid.
-
-		+----+----+----+----+----+----+----+----+----+----+....+----+
-		| VN | CD | DSTPORT |      DSTIP        | USERID       |NULL|
-		+----+----+----+----+----+----+----+----+----+----+....+----+
- # of bytes:	   1    1      2              4           variable       1
-
-VN is again 4 for the SOCKS protocol version number. CD must be 2 to
-indicate BIND request.
-
-The SOCKS server uses the client information to decide whether the
-request is to be granted. The reply it sends back to the client has
-the same format as the reply for CONNECT request, i.e.,
-
-		+----+----+----+----+----+----+----+----+
-		| VN | CD | DSTPORT |      DSTIP        |
-		+----+----+----+----+----+----+----+----+
- # of bytes:	   1    1      2              4
-
-VN is the version of the reply code and should be 0. CD is the result
-code with one of the following values:
-
-	90: request granted
-	91: request rejected or failed
-	92: request rejected becasue SOCKS server cannot connect to
-	    identd on the client
-	93: request rejected because the client program and identd
-	    report different user-ids.
-
-However, for a granted request (CD is 90), the DSTPORT and DSTIP fields
-are meaningful.  In that case, the SOCKS server obtains a socket to wait
-for an incoming connection and sends the port number and the IP address
-of that socket to the client in DSTPORT and DSTIP, respectively. If the
-DSTIP in the reply is 0 (the value of constant INADDR_ANY), then the
-client should replace it by the IP address of the SOCKS server to which
-the cleint is connected. (This happens if the SOCKS server is not a
-multi-homed host.)  In the typical scenario, these two numbers are
-made available to the application client prgram via the result of the
-subsequent getsockname() call.  The application protocol must provide a
-way for these two pieces of information to be sent from the client to
-the application server so that it can initiate the connection, which
-connects it to the SOCKS server rather than directly to the application
-client as it normally would.
-
-The SOCKS server sends a second reply packet to the client when the
-anticipated connection from the application server is established.
-The SOCKS server checks the IP address of the originating host against
-the value of DSTIP specified in the client's BIND request.  If a mismatch
-is found, the CD field in the second reply is set to 91 and the SOCKS
-server closes both connections.  If the two match, CD in the second
-reply is set to 90 and the SOCKS server gets ready to relay the traffic
-on its two connections. From then on the client does I/O on its connection
-to the SOCKS server as if it were directly connected to the application
-server.
-
-
-
-For both CONNECT and BIND operations, the server sets a time limit
-(2 minutes in current CSTC implementation) for the establishment of its
-connection with the application server. If the connection is still not
-establiched when the time limit expires, the server closes its connection
-to the client and gives up.

aMule-2.2.6.tar.bz2/src/ClientListCtrl.cpp Deleted

@@ -1,1140 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
-//
-// 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
-//
-
-#include "ClientListCtrl.h"
-
-#include <protocol/ed2k/ClientSoftware.h>
-#include <common/MenuIDs.h>
-
-#include "amule.h"
-#include "amuleDlg.h"
-#include "BarShader.h"		// Needed for CBarShader
-#include "ChatWnd.h"
-#include "ClientDetailDialog.h"
-#include "ClientList.h"
-#include "Color.h"
-#include "DataToText.h"
-#ifdef ENABLE_IP2COUNTRY
-	#include "IP2Country.h"	// Needed for IP2Country
-#endif
-#include "KnownFile.h"
-#include "Preferences.h"
-#include "updownclient.h"
-#include "UploadQueue.h"
-#include "TransferWnd.h"	// Needed for UpdateBottomPaneTitle
-
-#include <wx/menu.h>
-#include <wx/textdlg.h>
-#include <wx/dc.h>
-#include <wx/settings.h>
-
-////////////////////////////////////////////////////////////
-// Sorter functions.
-
-int CompareVersions(const CUpDownClient* client1, const CUpDownClient* client2)
-{
-	if (client1->GetClientSoft() != client2->GetClientSoft()) {
-		return client1->GetSoftStr().Cmp(client2->GetSoftStr());
-	}
-
-	if (client1->GetVersion() != client2->GetVersion()) {
-		return CmpAny(client1->GetVersion(), client2->GetVersion());
-	}
-
-	return client1->GetClientModString().Cmp(client2->GetClientModString());
-}
-
-
-////////////////////////////////////////////////////////////
-// CClientListCtrl
-
-
-BEGIN_EVENT_TABLE( CClientListCtrl, CMuleListCtrl )
-	EVT_RIGHT_DOWN(CClientListCtrl::OnRightClick)
-	EVT_LIST_ITEM_MIDDLE_CLICK(-1, CClientListCtrl::OnMiddleClick)
-
-	EVT_MENU( MP_DETAIL,             CClientListCtrl::OnShowDetails	)
-	EVT_MENU( MP_ADDFRIEND,          CClientListCtrl::OnAddFriend	)
-	EVT_MENU( MP_SHOWLIST,           CClientListCtrl::OnViewFiles	)
-	EVT_MENU( MP_SENDMESSAGE,        CClientListCtrl::OnSendMessage	)
-	EVT_MENU( MP_UNBAN,              CClientListCtrl::OnUnbanClient	)
-	EVT_MENU_RANGE( MP_SWITCHCTRL_0, MP_SWITCHCTRL_9, CClientListCtrl::OnChangeView	)
-END_EVENT_TABLE()
-
-
-#define m_imagelist theApp->amuledlg->m_imagelist
-
-
-/**
- * This struct is used to keep track of the different view-types.
- *
- * Each view has a number of attributes, namely a title and serveral functions 
- * which are used by the CClientListCtrl class. This struct is used to store these
- * for easier access.
- *
- * Please note that none of the values are required, however for a fully functional
- * view, it is nescesarry to specificy all of them.
- */
-struct ClientListView
-{
-	//! The name of the view, this is used to load and save column-preferences.
-	wxString	m_title;
-	
-	//! Pointer to the initialization function.
-	void		(*m_init)(CClientListCtrl*);
-
-	//! Pointer to the drawing function 
-	void		(*m_draw)(CUpDownClient*, int, wxDC*, const wxRect&);
-	
-	//! Pointer to the sorting function.
-	MuleListCtrlCompare	m_sort;
-};
-
-
-//! This is the list of currently usable views, in the same order as the ViewType enum.
-ClientListView g_listViews[] = 
-{
-	//! None: This view does nothing at all.
-	{
-		wxEmptyString,
-		NULL,
-		NULL,
-		NULL,
-	},
-
-	//! Uploading: The clients currently being uploaded to.
-	{
-		wxT("Uploads"),
-		CUploadingView::Initialize,
-		CUploadingView::DrawCell,
-		CUploadingView::SortProc,
-	},
-
-	//! Queued: The clients currently queued for uploading.
-	{
-		wxT("Queue"),
-		CQueuedView::Initialize,
-		CQueuedView::DrawCell,
-		CQueuedView::SortProc,
-	},
-
-	//! Clients The complete list of all known clients.
-	{
-		wxT("Clients"),
-		CClientsView::Initialize,
-		CClientsView::DrawCell,
-		CClientsView::SortProc,
-	}
-};
-
-
-
-CClientListCtrl::CClientListCtrl( wxWindow *parent, wxWindowID winid, const wxPoint &pos, const wxSize &size, long style, const wxValidator& validator, const wxString& name )
-:
-CMuleListCtrl( parent, winid, pos, size, style | wxLC_OWNERDRAW, validator, name )
-{
-	m_viewType = vtNone;
-	
-	m_menu = NULL;
-	
-	wxColour col = SYSCOLOR( wxSYS_COLOUR_HIGHLIGHT );
-	m_hilightBrush = new wxBrush( BLEND( col, 125), wxSOLID );
-
-	col = SYSCOLOR( wxSYS_COLOUR_BTNSHADOW );
-	m_hilightUnfocusBrush = new wxBrush( BLEND( col, 125), wxSOLID );
-
-
-	// We show the uploading-list initially
-	SetListView( vtUploading );
-}
-
-
-CClientListCtrl::~CClientListCtrl()
-{
-	delete m_hilightBrush;
-	delete m_hilightUnfocusBrush;
-}
-
-
-ViewType CClientListCtrl::GetListView()
-{
-	return m_viewType;
-}
-
-
-void CClientListCtrl::SetListView( ViewType newView )
-{
-	if ( m_viewType != newView ) {
-		if (m_viewType != vtNone) {
-			SaveSettings();
-			ClearAll();
-		}
-		
-		m_viewType = newView;
-
-		const ClientListView& view = g_listViews[ (int)newView ];
-		
-		// Initialize the selected view
-		if ( view.m_init ) {
-			view.m_init( this );
-		}
-	
-		SetTableName( view.m_title );	
-		SetSortFunc( view.m_sort );
-
-		if (newView != vtNone) {
-			LoadSettings();
-		}
-
-		if (theApp->amuledlg) {
-			theApp->amuledlg->m_transferwnd->UpdateBottomPaneTitle(newView);
-		}
-	}
-}
-
-
-void CClientListCtrl::ToggleView()
-{
-	// Disallow toggling if the list is disabled
-	if ( m_viewType == vtNone ) {
-		return;
-	}
-	
-	unsigned int view = (int)m_viewType + 1;
-	
-	if ( view < itemsof(g_listViews) ) {
-		SetListView( (ViewType)(view) );
-	} else {
-		SetListView( (ViewType)(1) );
-	}
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CClientListCtrl::OnRightClick(wxMouseEvent& event)
-{
-	long index = CheckSelection(event);
-	
-	if ( m_menu == NULL ) {
-		
-		bool banned = false;
-		bool validIP = false;
-		bool isfriend = false;
-		bool hasdisabledsharedfiles = false;
-
-		// Check if the client is banned
-		if ( index > -1 ) {
-			CUpDownClient *client = reinterpret_cast<CUpDownClient *>(GetItemData( index ));
-
-			banned = client->IsBanned();
-			validIP = (client->GetIP() != 0);
-			isfriend = client->IsFriend();
-			hasdisabledsharedfiles = client->HasDisabledSharedFiles();
-		}
-				
-		m_menu = new wxMenu(_("Clients"));
-		m_menu->Append( MP_DETAIL,      _("Show &Details") );
-		m_menu->Append( MP_ADDFRIEND,   isfriend ? _("Remove from friends") : _("Add to Friends") );
-		m_menu->Append( MP_SHOWLIST,    _("View Files") );
-		m_menu->Append( MP_SENDMESSAGE, _("Send message") );
-		m_menu->Append( MP_UNBAN,       _("Unban") );
-		
-		m_menu->AppendSeparator();
-	
-		wxMenu* view = new wxMenu();
-		view->Append( MP_SWITCHCTRL_0 + 1, _("Show Uploads") );
-		view->Append( MP_SWITCHCTRL_0 + 2, _("Show Queue") );
-		view->Append( MP_SWITCHCTRL_0 + 3, _("Show Clients") );
-	
-		view->Enable( MP_SWITCHCTRL_0 + (int)m_viewType, false );
-		
-		m_menu->Append( 0, _("Select View"), view );
-		
-		m_menu->Enable( MP_DETAIL,      index > -1 );
-		m_menu->Enable( MP_SHOWLIST,    index > -1 );
-				
-		m_menu->Enable( MP_UNBAN,       banned );		
-		m_menu->Enable( MP_SHOWLIST,    !hasdisabledsharedfiles );		
-		m_menu->Enable( MP_ADDFRIEND,   validIP );
-		m_menu->Enable( MP_SENDMESSAGE, validIP );
-
-		PopupMenu( m_menu, event.GetPosition() );
-		
-		delete m_menu;
-		
-		m_menu = NULL;
-	}
-}
-
-
-void CClientListCtrl::OnMiddleClick(wxListEvent& event)
-{
-	long index = CheckSelection(event);
-
-	if (index > -1) {
-		CUpDownClient *client = reinterpret_cast<CUpDownClient *>(GetItemData( index ));
-
-		CClientDetailDialog dialog(this, client);
-		
-		dialog.ShowModal();
-	}
-}
-
-
-void CClientListCtrl::OnChangeView( wxCommandEvent& event )
-{
-	int view = event.GetId() - MP_SWITCHCTRL_0;
-
-	SetListView( (ViewType)view );
-}
-
-	
-void CClientListCtrl::OnAddFriend( wxCommandEvent& WXUNUSED(event) )
-{
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	
-	while ( index != -1 ) {
-		CUpDownClient *client = reinterpret_cast<CUpDownClient *>(GetItemData( index ));
-		if (client->IsFriend()) {
-			theApp->amuledlg->m_chatwnd->RemoveFriend(client->GetUserHash(), client->GetIP(), client->GetUserPort());
-		} else {
-			theApp->amuledlg->m_chatwnd->AddFriend( client );
-		}
-		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	}
-}
-
-
-void CClientListCtrl::OnShowDetails( wxCommandEvent& WXUNUSED(event) )
-{
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	
-	if ( index > -1 ) {
-		CUpDownClient *client = reinterpret_cast<CUpDownClient *>(GetItemData( index ));
-		CClientDetailDialog dialog(this, client);
-		dialog.ShowModal();
-	}
-}
-
-
-void CClientListCtrl::OnViewFiles( wxCommandEvent& WXUNUSED(event) )
-{
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	
-	if ( index > -1 ) {
-		CUpDownClient *client = reinterpret_cast<CUpDownClient *>(GetItemData( index ));
-		client->RequestSharedFileList();
-	}
-}
-
-
-void CClientListCtrl::OnSendMessage( wxCommandEvent& WXUNUSED(event) )
-{
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	
-	if ( index > -1 ) {
-		CUpDownClient *client = reinterpret_cast<CUpDownClient *>(GetItemData( index ));
-
-		// These values are cached, since calling wxGetTextFromUser will
-		// start an event-loop, in which the client may be deleted.
-		wxString userName = client->GetUserName();
-		uint64 userID = GUI_ID(client->GetIP(),client->GetUserPort());
-
-		wxString message = ::wxGetTextFromUser( _("Send message to user"), _("Message to send:") );
-		
-		if (!message.IsEmpty()) {
-			theApp->amuledlg->m_chatwnd->SendMessage(message, userName, userID);
-		}
-	}
-}
-
-		
-void CClientListCtrl::OnUnbanClient( wxCommandEvent& WXUNUSED(event) )
-{
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	
-	if ( index > -1 ) {
-		CUpDownClient *client = reinterpret_cast<CUpDownClient *>(GetItemData( index ));
-		if ( client->IsBanned() ) {
-			client->UnBan();
-		}		
-	}
-}
-
-
-void CClientListCtrl::InsertClient( CUpDownClient* client, ViewType view )
-{
-	wxCHECK_RET(client, wxT("Attempted to add NULL client pointer."));
-	
-	if ( ( m_viewType != view ) || ( view == vtNone ) ) {
-		return;
-	}
-	
-	long index = InsertItem( GetItemCount(), wxEmptyString );
-	SetItemPtrData( index, reinterpret_cast<wxUIntPtr>(client) );
-
-	wxListItem myitem;
-	myitem.SetId( index );
-	myitem.SetBackgroundColour( SYSCOLOR(wxSYS_COLOUR_LISTBOX) );
-	
-	SetItem(myitem);
-
-	RefreshItem( index );
-}
-
-
-void CClientListCtrl::RemoveClient( CUpDownClient* client, ViewType view )
-{
-	wxCHECK_RET(client, wxT("Attempted to remove NULL client pointer."));
-
-	if ( ( m_viewType != view ) || ( view == vtNone ) ) {
-		return;
-	}
-	
-	long index = FindItem( -1, reinterpret_cast<wxUIntPtr>(client) );
-	
-	if ( index > -1 ) {
-		DeleteItem( index );
-	}
-}
-
-
-void CClientListCtrl::UpdateClient( CUpDownClient* client, ViewType view )
-{
-	wxCHECK_RET(client, wxT("Attempted to update NULL client pointer."));
-
-	if ( ( m_viewType != view ) || ( view == vtNone ) ) {
-		return;
-	}
-	
-	if ( theApp->amuledlg->IsDialogVisible( CamuleDlg::DT_TRANSFER_WND ) ) {
-		// Visible lines, default to all because not all platforms support the GetVisibleLines function
-		long first = 0, last = GetItemCount();
-		long result = FindItem( -1, reinterpret_cast<wxUIntPtr>(client) );
-		if ( result > -1 ) {
-#ifndef __WXMSW__
-			GetVisibleLines( &first, &last );
-#endif
-			if ( result >= first && result <= last) {
-				RefreshItem(result);
-			}
-		}
-	}
-}
-
-
-void CClientListCtrl::OnDrawItem( int item, wxDC* dc, const wxRect& rect, const wxRect& rectHL, bool highlighted )
-{
-	// Don't do any drawing if we not being watched.
-	if ( !theApp->amuledlg || !theApp->amuledlg->IsDialogVisible( CamuleDlg::DT_TRANSFER_WND ) ) {
-		return;
-	}
-	
-	if ( highlighted ) {
-		if ( GetFocus() ) {
-			dc->SetBackground(*m_hilightBrush);
-			dc->SetTextForeground( SYSCOLOR(wxSYS_COLOUR_HIGHLIGHTTEXT) );
-		} else {
-			dc->SetBackground(*m_hilightUnfocusBrush);
-			dc->SetTextForeground( SYSCOLOR(wxSYS_COLOUR_HIGHLIGHTTEXT));
-		}
-	
-		wxColour colour = GetFocus() ? m_hilightBrush->GetColour() : m_hilightUnfocusBrush->GetColour();
-		dc->SetPen( wxPen( BLEND(colour, 65), 1, wxSOLID) );
-	} else {
-		dc->SetBackground( wxBrush( SYSCOLOR(wxSYS_COLOUR_LISTBOX), wxSOLID ) );
-		dc->SetTextForeground( SYSCOLOR(wxSYS_COLOUR_WINDOWTEXT) );
-		dc->SetPen(*wxTRANSPARENT_PEN);
-	}
-	
-	dc->SetBrush(dc->GetBackground());
-	dc->DrawRectangle(rectHL);
-	dc->SetPen(*wxTRANSPARENT_PEN);
-	
-	CUpDownClient* client = reinterpret_cast<CUpDownClient *>(GetItemData(item));
-	wxRect cur_rect = rect;
-	cur_rect.x += 4;
-
-	const ClientListView& view = g_listViews[ (int)m_viewType ];
-
-	if ( view.m_draw ) {
-		for ( int i = 0; i < GetColumnCount(); i++ ) {
-			int width = GetColumnWidth( i );
-			if ( width ) {
-				cur_rect.width = width - 8;
-		
-				wxDCClipper clipper( *dc, cur_rect );
-		
-				view.m_draw( client, i, dc, cur_rect );
-			}
-			cur_rect.x += width;
-		}
-	}
-}
-
-
-wxString CClientListCtrl::GetTTSText(unsigned item) const
-{
-	CUpDownClient *client = reinterpret_cast<CUpDownClient *>(GetItemData( item ));
-
-	return client->GetUserName();
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CUploadingView::Initialize( CClientListCtrl* list )
-{
-	list->InsertColumn( 0,	_("Username"),        wxLIST_FORMAT_LEFT, 150 );
-	list->InsertColumn( 1,	_("File"),            wxLIST_FORMAT_LEFT, 275 );
-	list->InsertColumn( 2,	_("Client Software"), wxLIST_FORMAT_LEFT, 100 );
-	list->InsertColumn( 3,	_("Speed"),           wxLIST_FORMAT_LEFT,  60 );
-	list->InsertColumn( 4,	_("Transferred"),     wxLIST_FORMAT_LEFT,  65 );
-	list->InsertColumn( 5,	_("Waited"),          wxLIST_FORMAT_LEFT,  60 );
-	list->InsertColumn( 6,	_("Upload Time"),     wxLIST_FORMAT_LEFT,  60 );
-	list->InsertColumn( 7,	_("Status"),          wxLIST_FORMAT_LEFT, 110 );
-	list->InsertColumn( 8,	_("Obtained Parts"),  wxLIST_FORMAT_LEFT, 100 );
-	list->InsertColumn( 9,	_("Upload/Download"), wxLIST_FORMAT_LEFT, 100 );
-	list->InsertColumn( 10,	_("Remote Status"),   wxLIST_FORMAT_LEFT, 100 );			
-
-	// Insert any existing items on the list
-	const CClientPtrList& uploading = theApp->uploadqueue->GetUploadingList();
-	CClientPtrList::const_iterator it = uploading.begin();
-	for (; it != uploading.end(); ++it) {
-		list->InsertClient( *it, list->GetListView() );		
-	}
-}
-
-
-void CUploadingView::DrawCell( CUpDownClient* client, int column, wxDC* dc, const wxRect& rect )
-{
-	wxString buffer;	
-	
-	switch ( column ) {
-	case 0: {
-		uint8 clientImage;
-
-		if ( client->IsFriend() ) {
-			clientImage = Client_Friend_Smiley;
-		} else {
-			switch (client->GetClientSoft()) {
-			case SO_AMULE:
-				clientImage = Client_aMule_Smiley;
-				break;
-			case SO_MLDONKEY:
-			case SO_NEW_MLDONKEY:
-			case SO_NEW2_MLDONKEY:
-				clientImage = Client_mlDonkey_Smiley;
-				break;
-			case SO_EDONKEY:
-			case SO_EDONKEYHYBRID:
-				// Maybe we would like to make different icons?
-				clientImage = Client_eDonkeyHybrid_Smiley;
-				break;
-			case SO_EMULE:
-				clientImage = Client_eMule_Smiley;
-				break;
-			case SO_LPHANT:
-				clientImage = Client_lphant_Smiley;
-				break;
-			case SO_SHAREAZA:
-			case SO_NEW_SHAREAZA:
-			case SO_NEW2_SHAREAZA:
-				clientImage = Client_Shareaza_Smiley;
-				break;
-			case SO_LXMULE:
-				clientImage = Client_xMule_Smiley;
-				break;
-			default:
-				// cDonkey, Compat Unk
-				// No icon for those yet. Using the eMule one + '?'
-				clientImage = Client_Unknown;
-				break;
-			}
-		}
-
-		m_imagelist.Draw(clientImage, *dc, rect.x, rect.y + 1,
-			wxIMAGELIST_DRAW_TRANSPARENT);
-
-		if (client->GetScoreRatio() > 1) {
-			// Has credits, draw the gold star
-			m_imagelist.Draw(Client_CreditsYellow_Smiley, *dc, rect.x, rect.y + 1,
-				wxIMAGELIST_DRAW_TRANSPARENT );
-		} else if (client->ExtProtocolAvailable()) {
-			// Ext protocol -> Draw the '+'
-			m_imagelist.Draw(Client_ExtendedProtocol_Smiley, *dc, rect.x, rect.y + 1,
-				wxIMAGELIST_DRAW_TRANSPARENT );
-		}
-
-		if (client->IsIdentified()) {
-			// the 'v'
-			m_imagelist.Draw(Client_SecIdent_Smiley, *dc, rect.x, rect.y + 1,
-				wxIMAGELIST_DRAW_TRANSPARENT);					
-		} else if (client->IsBadGuy()) {
-			// the 'X'
-			m_imagelist.Draw(Client_BadGuy_Smiley, *dc, rect.x, rect.y + 1,
-				wxIMAGELIST_DRAW_TRANSPARENT);					
-		}
-		
-		if (client->HasObfuscatedConnectionBeenEstablished()) {
-			// the "¿" except it's a key
-			m_imagelist.Draw(Client_Encryption_Smiley, *dc, rect.x, rect.y + 1,
-				wxIMAGELIST_DRAW_TRANSPARENT);					
-		}
-
-		wxString userName;
-#ifdef ENABLE_IP2COUNTRY
-		// Draw the flag
-		const CountryData& countrydata =
-			theApp->amuledlg->m_IP2Country->GetCountryData(client->GetFullIP());
-		dc->DrawBitmap(countrydata.Flag, rect.x + 20, rect.y + 5,
-			wxIMAGELIST_DRAW_TRANSPARENT);
-			
-		userName << countrydata.Name;
-		userName << wxT(" - ");
-#endif // ENABLE_IP2COUNTRY
-		userName << client->GetUserName();
-		dc->DrawText(userName, rect.x + 40, rect.y + 3);
-		
-		return;
-	}
-
-	case 1:
-		if ( client->GetUploadFile() ) {
-			buffer = client->GetUploadFile()->GetFileName().GetPrintable();
-		} else {
-			buffer = _("N/A");
-		}
-		break;
-
-	case 2:
-		buffer = client->GetClientVerString();
-		break;
-	
-	case 3:
-		buffer = wxString::Format( wxT("%.1f"), client->GetUploadDatarate() / 1024.0f );
-	
-		buffer += wxT(" ");
-		buffer += _("kB/s");
-		break;
-		
-	case 4:
-		buffer = CastItoXBytes(client->GetSessionUp());
-		break;
-	
-	case 5:
-		buffer = CastSecondsToHM((client->GetWaitTime())/1000);
-		break;
-	
-	case 6:
-		buffer = CastSecondsToHM((client->GetUpStartTimeDelay())/1000);
-		break;
-	
-	case 7:
-		switch ( client->GetUploadState() ) {
-		case US_CONNECTING:
-			buffer = _("Connecting");
-			break;
-			
-		case US_WAITCALLBACK:
-			buffer = _("Connecting via server");
-			break;
-			
-		case US_UPLOADING:
-			buffer = wxT("<-- ");
-			buffer.Append(_("Transferring"));
-			
-			if (client->GetDownloadState() == DS_DOWNLOADING) {
-				buffer.Append(wxT(" -->"));
-			}
-			break;
-			
-		case US_ONUPLOADQUEUE:
-			buffer = _("On Queue");
-			break;
-			
-		default:
-			buffer = _("Unknown");
-		}
-		break;
-		
-	case 8:
-		if ( client->GetUpPartCount() ) {
-			CUploadingView::DrawStatusBar( client, dc, rect );
-		}
-		return;
-	
-	case 9:
-		buffer = CastItoXBytes( client->GetUploadedTotal() ) +
-			wxT(" / ") + CastItoXBytes(client->GetDownloadedTotal());
-		break;
- 
-	case 10: 
-		if ( client->GetDownloadState() == DS_ONQUEUE ) { 
-			if ( client->IsRemoteQueueFull() ) { 
-				buffer = _("Queue Full"); 
-			} else { 
-				if (client->GetRemoteQueueRank()) { 
-					buffer = wxString::Format(_("QR: %u"), client->GetRemoteQueueRank()); 
-				} else { 
-					buffer = _("Unknown"); 
-				} 
-			} 
-		} else if ( client->GetDownloadState() == DS_DOWNLOADING ) {
-			buffer += wxString::Format( wxT("%.1f"), client->GetKBpsDown() ); 
-			buffer += wxT(" ");
-			buffer += _("kB/s");
-		} else { 
-			buffer = _("Unknown"); 
-		} 
-		break;
-	}
-
-	dc->DrawText( buffer, rect.x, rect.y + 3 );
-}
-
-
-int CUploadingView::SortProc(wxUIntPtr item1, wxUIntPtr item2, long sortData)
-{
-	CUpDownClient* client1 = (CUpDownClient*)item1;
-	CUpDownClient* client2 = (CUpDownClient*)item2;
-
-	// Sorting ascending or decending
-	int mode = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1;
-	
-	switch (sortData & CMuleListCtrl::COLUMN_MASK) {
-	// Sort by username
-	case 0:	return mode * client1->GetUserName().CmpNoCase( client2->GetUserName() );
-
-	
-	// Sort by requested file
-	case 1: {
-		const CKnownFile* file1 = client1->GetUploadFile();
-		const CKnownFile* file2 = client2->GetUploadFile();
-
-		if ( file1 && file2  ) {
-			return mode * CmpAny(file1->GetFileName(), file2->GetFileName());
-		} 
-		
-		return mode * CmpAny( file1, file2 );
-	}
-	
-	// Sort by client software
-	case 2: return mode * CompareVersions(client1, client2);
-	
-	// Sort by speed
-	case 3: return mode * CmpAny( client1->GetUploadDatarate(), client2->GetUploadDatarate() );
-	
-	// Sort by transferred
-	case 4: return mode * CmpAny( client1->GetSessionUp(), client2->GetSessionUp() );
-	
-	// Sort by wait-time
-	case 5: return mode * CmpAny( client1->GetWaitTime(), client2->GetWaitTime() );
-	
-	// Sort by upload time
-	case 6: return mode * CmpAny( client1->GetUpStartTimeDelay(), client2->GetUpStartTimeDelay() );
-	
-	// Sort by state
-	case 7: return mode * CmpAny( client1->GetUploadState(), client2->GetUploadState() );
-	
-	// Sort by partcount
-	case 8: return mode * CmpAny( client1->GetUpPartCount(), client2->GetUpPartCount() );
-	
-	// Sort by U/D ratio
-	case 9: return mode * CmpAny( client2->GetDownloadedTotal(), client1->GetDownloadedTotal() );
-	
-	// Sort by remote rank
-	case 10: return mode * CmpAny( client2->GetRemoteQueueRank(), client1->GetRemoteQueueRank() );
-
-	default:
-		return 0;
-	}
-}
-
-
-void CUploadingView::DrawStatusBar( CUpDownClient* client, wxDC* dc, const wxRect& rect1 )
-{
-	wxRect rect = rect1;
-	rect.y		+= 1;
-	rect.height	-= 2;
-
-	wxPen   old_pen   = dc->GetPen();
-	wxBrush old_brush = dc->GetBrush();
-	bool bFlat = thePrefs::UseFlatBar();
-
-	wxRect barRect = rect;
-	if (!bFlat) { // round bar has a black border, the bar itself is 1 pixel less on each border
-		barRect.x ++;
-		barRect.y ++;
-		barRect.height -= 2;
-		barRect.width -= 2;
-	}
-	static CBarShader s_StatusBar(16);
-
-	uint32 crUnavailable	= ( bFlat ? RGB( 224, 224, 224 ) : RGB( 240, 240, 240 ) );
-	uint32 crAvailable		= ( bFlat ? RGB(   0,   0,   0 ) : RGB( 104, 104, 104 ) );
-
-	uint32 partCount = client->GetUpPartCount();
-
-	// Seems the partfile in the client object is not necessarily valid when bar is drawn for the first time.
-	// Keep it simple and make all parts same size.
-	s_StatusBar.SetFileSize(partCount * PARTSIZE);
-	s_StatusBar.SetHeight(barRect.height);
-	s_StatusBar.SetWidth(barRect.width);
-	s_StatusBar.Set3dDepth( thePrefs::Get3DDepth() );
-
-	uint64 uEnd = 0;
-	for ( uint64 i = 0; i < partCount; i++ ) {
-		uint64 uStart = PARTSIZE * i;
-		uEnd = uStart + PARTSIZE - 1;
-
-		uint32 color = client->IsUpPartAvailable(i) ? crAvailable : crUnavailable;
-		s_StatusBar.FillRange(uStart, uEnd, color);
-	}
-	// fill the rest (if partStatus is empty)
-	s_StatusBar.FillRange(uEnd + 1, partCount * PARTSIZE - 1, crUnavailable);
-	s_StatusBar.Draw(dc, barRect.x, barRect.y, bFlat);
-
-	if (!bFlat) {
-		// Draw black border
-		dc->SetPen( *wxBLACK_PEN );
-		dc->SetBrush( *wxTRANSPARENT_BRUSH );
-		dc->DrawRectangle(rect);
-	}
-
-	dc->SetPen( old_pen );
-	dc->SetBrush( old_brush );
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CQueuedView::Initialize( CClientListCtrl* list )
-{
-	list->InsertColumn( 0,	_("Username"),        wxLIST_FORMAT_LEFT, 150 );
-	list->InsertColumn( 1,	_("File"),            wxLIST_FORMAT_LEFT, 275 );
-	list->InsertColumn( 2,	_("Client Software"), wxLIST_FORMAT_LEFT, 100 );
-	list->InsertColumn( 3,	_("File Priority"),   wxLIST_FORMAT_LEFT, 110 );
-	list->InsertColumn( 4,	_("Rating"),          wxLIST_FORMAT_LEFT,  60 );
-	list->InsertColumn( 5,	_("Score"),           wxLIST_FORMAT_LEFT,  60 );
-	list->InsertColumn( 6,	_("Asked"),           wxLIST_FORMAT_LEFT,  60 );
-	list->InsertColumn( 7,	_("Last Seen"),       wxLIST_FORMAT_LEFT, 110 );
-	list->InsertColumn( 8,	_("Entered Queue"),   wxLIST_FORMAT_LEFT, 110 );
-	list->InsertColumn( 9,	_("Banned"),          wxLIST_FORMAT_LEFT,  60 );
-	list->InsertColumn( 10,	_("Obtained Parts"),  wxLIST_FORMAT_LEFT, 100 );
-
-	// Insert any existing items on the list
-	// Insert any existing items on the list
-	const CClientPtrList& uploading = theApp->uploadqueue->GetWaitingList();
-	CClientPtrList::const_iterator it = uploading.begin();
-	for (; it != uploading.end(); ++it) {
-		list->InsertClient( *it, list->GetListView() );		
-	}
-}
-
-
-void CQueuedView::DrawCell( CUpDownClient* client, int column, wxDC* dc, const wxRect& rect )
-{
-	wxString buffer;
-
-	switch ( column ) {
-	// These 3 are the same for both lists
-	case 0:
-	case 1:
-	case 2:
-		CUploadingView::DrawCell( client, column, dc, rect );
-		return;
-
-	case 3:
-		if ( client->GetUploadFile() ) {
-			buffer = PriorityToStr( client->GetUploadFile()->GetUpPriority(), false );
-		} else {
-			buffer = _("Unknown");
-		}
-
-		break;
-		
-	case 4:
-		buffer = wxString::Format( wxT("%.1f"), (float)client->GetScore(false,false,true) );
-		break;
-	
-	case 5:
-		if ( client->HasLowID() ) {
-			buffer = wxString::Format( wxT("%i %s"), client->GetScore(false), _("LowID") );
-		} else {
-			buffer = wxString::Format(wxT("%i"),client->GetScore(false));
-		}
-		break;
-		
-	case 6:
-		buffer = wxString::Format( wxT("%i"), client->GetAskedCount() );
-		break;
-		
-#ifndef CLIENT_GUI
-	case 7:
-		buffer = CastSecondsToHM((::GetTickCount() - client->GetLastUpRequest())/1000);
-		break;
-	
-	case 8:
-		buffer = CastSecondsToHM((::GetTickCount() - client->GetWaitStartTime())/1000);
-		break;
-#else
-	case 7:
-		buffer = CastSecondsToHM(client->GetLastUpRequest()/1000);
-		break;
-	
-	case 8:
-		buffer = CastSecondsToHM(client->GetWaitStartTime()/1000);
-		break;
-#endif
-	case 9:
-		if ( client->IsBanned() ) {
-			buffer = _("Yes");
-		} else {
-			buffer = _("No");
-		}
-		
-		break;
-		
-	case 10:
-		if ( client->GetUpPartCount() ) {
-			CUploadingView::DrawStatusBar( client, dc, rect );
-		}
-		
-		return;
-	}
-			
-	dc->DrawText( buffer, rect.x, rect.y + 3 );
-}
-
-
-int CQueuedView::SortProc(wxUIntPtr item1, wxUIntPtr item2, long sortData)
-{
-	CUpDownClient* client1 = (CUpDownClient*)item1;
-	CUpDownClient* client2 = (CUpDownClient*)item2;
-
-	// Ascending or decending?
-	int mode = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1;
-
-	switch (sortData & CMuleListCtrl::COLUMN_MASK) {
-	// Sort by username
-	case 0: return mode * client1->GetUserName().CmpNoCase( client2->GetUserName() );
-	
-	// Sort by filename
-	case 1: {
-		const CKnownFile* file1 = client1->GetUploadFile();
-		const CKnownFile* file2 = client2->GetUploadFile();
-
-		if ( file1 && file2 ) {
-			return mode * CmpAny(file1->GetFileName(), file2->GetFileName());
-		}
-
-		// Place files with filenames on top
-		return -mode * CmpAny( file1, file2 );
-	}
-	
-	// Sort by client software
-	case 2:	return mode * CompareVersions(client1, client2);
-	
-	// Sort by file upload-priority
-	case 3: {
-		const CKnownFile* file1 = client1->GetUploadFile();
-		const CKnownFile* file2 = client2->GetUploadFile();
-
-		if ( file1 && file2  ) {
-			int8 prioA = file1->GetUpPriority();
-			int8 prioB = file2->GetUpPriority();
-
-			// Work-around for PR_VERYLOW which has value 4. See KnownFile.h for that stupidity ...
-			return mode * CmpAny( ( prioA != PR_VERYLOW ? prioA : -1 ), ( prioB != PR_VERYLOW ? prioB : -1 ) );
-		} 
-		
-		// Place files with priorities on top
-		return -mode * CmpAny( file1, file2 );
-	}
-	
-	// Sort by rating
-	case 4: return mode * CmpAny( client1->GetScore(false,false,true), client2->GetScore(false,false,true) );
-
-	// Sort by score
-	case 5: return mode * CmpAny( client1->GetScore(false), client2->GetScore(false) );
-	
-	// Sort by Asked count
-	case 6:	return mode * CmpAny( client1->GetAskedCount(), client2->GetAskedCount() );
-	
-	// Sort by Last seen
-	case 7: return mode * CmpAny( client1->GetLastUpRequest(), client2->GetLastUpRequest() );
-	
-	// Sort by entered time
-	case 8: return mode * CmpAny( client1->GetWaitStartTime(), client2->GetWaitStartTime() );
-
-	// Sort by banned
-	case 9: return mode * CmpAny( client1->IsBanned(), client2->IsBanned() );
-
-	default: return 0;
-	}
-}
-
-
-/////////////////////////////////////////////////////////////////////////////////////////////
-void CClientsView::Initialize( CClientListCtrl* list )
-{
-	list->InsertColumn( 0, _("Username"),          wxLIST_FORMAT_LEFT, 150 );
-	list->InsertColumn( 1, _("Upload Status"),     wxLIST_FORMAT_LEFT, 150 );
-	list->InsertColumn( 2, _("Transferred Up"),    wxLIST_FORMAT_LEFT, 150 );
-	list->InsertColumn( 3, _("Download Status"),   wxLIST_FORMAT_LEFT, 150 );
-	list->InsertColumn( 4, _("Transferred Down"),  wxLIST_FORMAT_LEFT, 150 );
-	list->InsertColumn( 5, _("Client Software"),   wxLIST_FORMAT_LEFT, 150 );
-	list->InsertColumn( 6, _("Connected"),         wxLIST_FORMAT_LEFT, 150 );
-	list->InsertColumn( 7, _("Userhash"),          wxLIST_FORMAT_LEFT, 150 );
-	list->InsertColumn( 8, _("Encrypted"),         wxLIST_FORMAT_LEFT, 100 );			
-	list->InsertColumn( 9, _("Hide shared files"), wxLIST_FORMAT_LEFT, 100 );			
-
-	const CClientList::IDMap& clist = theApp->clientlist->GetClientList();
-	CClientList::IDMap::const_iterator it = clist.begin();
-	
-	for ( ; it != clist.end(); ++it ) {
-		list->InsertClient( it->second, list->GetListView() );
-	}
-}
-
-
-void CClientsView::DrawCell( CUpDownClient* client, int column, wxDC* dc, const wxRect& rect )
-{
-	wxString buffer;
-	
-	switch ( column ) {
-		case 0:
-		CUploadingView::DrawCell( client, column, dc, rect );
-		return;
-	
-	case 1:
-		CUploadingView::DrawCell( client, 7, dc, rect );
-		return;
-	
-	case 2:
-		buffer = CastItoXBytes( client->GetUploadedTotal() );
-		
-		break;
-		
-	case 3:
-		buffer = DownloadStateToStr( client->GetDownloadState(),
-					     client->IsRemoteQueueFull() );
-		break;
-
-	case 4:
-		buffer = CastItoXBytes( client->GetDownloadedTotal() );
-		break;
-		
-	case 5:
-		buffer = client->GetClientVerString();
-		break;
-		
-	case 6:
-		if ( client->IsConnected() ) {
-			buffer = _("Yes");
-		} else {
-			buffer = _("No");
-		}
-		
-		break;
-		
-	case 7:
-		buffer = client->GetUserHash().Encode();
-		break;
-
-	case 8:
-		buffer = client->HasObfuscatedConnectionBeenEstablished() ?
-			_("Yes") : _("No");
-		break;		
-
-	case 9:
-		buffer = client->GetUserName().IsEmpty() ?
-			wxT("?") :
-			(client->HasDisabledSharedFiles() ? _("Yes") : _("No"));
-		break;		
-	}
-
-	dc->DrawText( buffer, rect.x, rect.y + 3 );
-}
-
-
-int CClientsView::SortProc(wxUIntPtr item1, wxUIntPtr item2, long sortData)
-{
-	CUpDownClient* client1 = (CUpDownClient*)item1;
-	CUpDownClient* client2 = (CUpDownClient*)item2;
-
-	// Ascending or decending?
-	int mode = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1;
-
-	switch (sortData & CMuleListCtrl::COLUMN_MASK) {
-	// Sort by Username
-	case 0: return mode * client1->GetUserName().CmpNoCase( client2->GetUserName() );
-	
-	// Sort by Uploading-state
-	case 1: return mode * CmpAny( client1->GetUploadState(), client2->GetUploadState() );
-	
-	// Sort by data-uploaded
-	case 2:			
-		return mode * CmpAny( client1->GetUploadedTotal(), client2->GetUploadedTotal() );
-	
-	// Sort by Downloading-state
-	case 3:
-		if( client1->GetDownloadState() == client2->GetDownloadState() ){
-			if( client1->IsRemoteQueueFull() && client2->IsRemoteQueueFull() ) {
-				return mode *  0;
-			} else if( client1->IsRemoteQueueFull() ) {
-				return mode *  1;
-			} else if( client2->IsRemoteQueueFull() ) {
-				return mode * -1;
-			} else {
-				return mode *  0;
-			}
-		}
-		return mode * CmpAny( client1->GetDownloadState(), client2->GetDownloadState() );
-	
-	// Sort by data downloaded
-	case 4:
-		return mode * CmpAny( client1->GetDownloadedTotal(), client2->GetDownloadedTotal() );
-	
-	// Sort by client-software
-	case 5: return mode * CompareVersions(client1, client2);
-	
-	// Sort by connection
-	case 6: return mode * CmpAny( client1->IsConnected(), client2->IsConnected() );
-
-	// Sort by user-hash
-	case 7: return mode * CmpAny( client1->GetUserHash(), client2->GetUserHash() );
-	
-	// Sort by Obfuscation state
-	case 8: return mode * CmpAny( client2->HasObfuscatedConnectionBeenEstablished(), client1->HasObfuscatedConnectionBeenEstablished() );
-		
-	// Sort by Shared Files DISabled
-	case 9: return mode * CmpAny( client2->HasDisabledSharedFiles(), client1->HasDisabledSharedFiles() );
-
-	default:
-		return 0;
-	}
-
-}
-// File_checked_for_headers

aMule-2.2.6.tar.bz2/src/ClientListCtrl.h Deleted

@@ -1,303 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
-//
-// 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 CLIENTLISTCTRL_H
-#define CLIENTLISTCTRL_H
-
-#include "MuleListCtrl.h"		// Needed for CMuleListCtrl
-#include "Constants.h"			// Needed for ViewType
-
-
-class CUpDownClient;
-
-
-/**
- * This class represents a number of ways of displaying clients, currently
- * supporting 3 different "ViewTypes". In other words, this class superseeds
- * the 3 widgets that were used to display clients beforehand:
- *  - CUploadListCtrl
- *  - CQueueListCtrl
- *  - CClientListCtrl
- *
- * This is done in an modular fashion, which means that adding new views is a 
- * rather trivial task. This approch has the advantage that only one widget exists
- * and thus only one actual list is maintained at a time, even though the number
- * of calls to the list wont decrease. This however can be trivially fixed if needed.
- */
-class CClientListCtrl : public CMuleListCtrl
-{
-public:
-	/**
-	 * Constructor.
-	 *
-	 * @see CMuleListCtrl::CMuleListCtrl
-	 */
- 	CClientListCtrl(
-	            wxWindow *parent,
-                wxWindowID winid = -1,
-                const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize,
-                long style = wxLC_ICON,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = wxT("clientlistctrl") );
-		
-	/**
-	 * Destructor.
-	 */	 
-	~CClientListCtrl();
-
-
-	/**
-	 * Returns the current view-type. 
-	 * 
-	 * @return The viewtype set by the user or the default value.
-	 */
-	ViewType GetListView();
-
-	/**
-	 * Sets another view-type.
-	 *
-	 * @param newView A view-mode different from the current view-type.
-	 *
-	 * Calling this function resets the list and re-initializes it to display
-	 * clients acording to the specifications of that view-mode. If you wish
-	 * to susspend the list, then use vtNone as the argument.
-	 */
-	void	SetListView( ViewType newView );
-
-	
-	/**
-	 * Adds a new client to the list.
-	 *
-	 * @param client The client to be added.
-	 * @param view The view where the client should be displayed.
-	 *
-	 * This function adds the specified client to the list, provided that the 
-	 * view parameter matches the currently selected view-mode.
-	 */
-	void	InsertClient( CUpDownClient* client, ViewType view );
-	
-	/**
-	 * Removes a client from the list.
-	 *
-	 * @param client The client to be removed.
-	 * @param view The view where the client is being displayed.
-	 *
-	 * This function removes the specified client from the list, provided that 
-	 * the view parameter matches the currently selected view-mode.
-	 */
-	void	RemoveClient( CUpDownClient* client, ViewType view );
-
-	/**
-	 * Updates a client on the list.
-	 *
-	 * @param client The client to be updated.
-	 * @param view The view where the client is being displayed.
-	 *
-	 * This function updates (redraws) the specified client on the list, provided
-	 * that the view parameter matches the currently selected view-mode. Clients
-	 * that are outside the currently visible range will also be ignored.
-	 */
-	void	UpdateClient( CUpDownClient* client, ViewType view );
-
-
-	/**
-	 * This function toggles between the different view-types.
-	 *
-	 * Calling this function makes the list switch to the next view-type
-	 * available, provided that the current view-type isn't vtNone. The
-	 * sequence is as specified in the ViewType enum, with the exception
-	 * that vtNone will be skipped.
-	 */
-	void	ToggleView();
-
-	
-private:
-	/**
-	 * Custom cell-drawing function.
-	 */
-	virtual void OnDrawItem(int item, wxDC* dc, const wxRect& rc, const wxRect& rectHL, bool hl);
-	
-	/**
-	 * @see CMuleListCtrl::GetTTSText
-	 */
-	virtual wxString GetTTSText(unsigned item) const;
-	
-	
-	/**
-	 * Event-handler for displaying a menu at right-clicks.
-	 */
-	void	OnRightClick( wxMouseEvent& event );
-	
-	/**
-	 * Event-handler for displaying the client-details dialog upon middle-clicks.
-	 */
-	void	OnMiddleClick( wxListEvent& event );
-	
-	/**
-	 * Event-handler for switching between the different view-types.
-	 */
-	void	OnChangeView( wxCommandEvent& event );
-	
-	/**
-	 * Event-handler for adding a client on the list to the list of friends.
-	 */
-	void	OnAddFriend( wxCommandEvent& event );
-	
-	/**
-	 * Event-handler for showing details about a client.
-	 */
-	void	OnShowDetails( wxCommandEvent& event );
-	
-	/**
-	 * Event-handler for requesting the sharedfiles-list of a client.
-	 */
-	void	OnViewFiles( wxCommandEvent& event );
-	
-	/**
-	 * Event-handler for sending a message to a specific client.
-	 */
-	void	OnSendMessage( wxCommandEvent& event );
-	
-	/**
-	 * Event-handler for un-banning a client.
-	 */
-	void	OnUnbanClient( wxCommandEvent& event );
-	
-
-	//! The current view-type. The default value is vtUploading.
-	ViewType	m_viewType;
-	
-	//! A pointer to the displayed menu, used to ensure that only one menu is displayed at a time.
-	wxMenu*		m_menu;
-
-	//! A pointer to one of the two most used brushes, cached for performance reasons.
-	wxBrush*	m_hilightBrush;
-	
-	//! A pointer to one of the two most used brushes, cached for performance reasons.
-	wxBrush*	m_hilightUnfocusBrush;
-	
-
-	DECLARE_EVENT_TABLE()
-};
-
-
-
-/**
- * This is the default view for the list, representing a list of clients recieving files.
- *
- * This struct contains the functions needed to realize the uploading-view. It contains
- * the functions used by the CClientListCtrl to prepare, sort and draw the list when the
- * Uploading-view is enabled.
- */
-struct CUploadingView
-{
-	/**
-	 * Initializes the view.
-	 *
-	 * @param list The list which wants to make use of the view.
-	 *
-	 * This function is called when the CClientListCtrl changes to this view-type,
-	 * and it is responsible for setting the initial columns and contents. By the 
-	 * time this function is called, the list will already be completly empty.
-	 */
-	static void Initialize( CClientListCtrl* list );
-
-	/**
-	 * Draws a specific cell.
-	 *
-	 * @param client The client used as a reference.
-	 * @param column The column to be drawn.
-	 * @param dc The device-context to draw onto.
-	 * @param rect The rectangle to draw in.
-	 *
-	 * This function is used to draw the contents of each row, and is called for
-	 * every visible column. 
-	 */
-	static void DrawCell( CUpDownClient* client, int column, wxDC* dc, const wxRect& rect );
-	
-	/**
-	 * This is the sorter-function used by the listctrl to sort the contents.
-	 *
-	 * @see wxListCtrl::SortItems
-	 */
-	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, long sortData);
-	
-	/**
-	 * Helperfunction which draws a simple bar-span over the clients requested file.
-	 */
-	static void DrawStatusBar( CUpDownClient* client, wxDC* dc, const wxRect &rect );
-};
-
-
-/**
- * This struct contains the functions needed to realize the Queued-clients view.
- *
- * @see CUploadingView
- */
-struct CQueuedView
-{
-	/**
-	 * @see CUploadingView::Initialize
-	 */
-	static void Initialize( CClientListCtrl* list );
-
-	/**
-	 * @see CUploadingView::DrawCell
-	 */
-	static void DrawCell( CUpDownClient* client, int column, wxDC* dc, const wxRect& rect );
-
-	/**
-	 * @see CUploadingView::SortProc
-	 */
-	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, long sortData);
-};
-
-
-/**
- * This struct contains the functions needed to realize the Clients view.
- *
- * @see CUploadingView
- */
-struct CClientsView
-{
-	/**
-	 * @see CUploadingView::Initialize
-	 */
-	static void Initialize( CClientListCtrl* list );
-
-	/**
-	 * @see CUploadingView::DrawCell
-	 */
-	static void DrawCell( CUpDownClient* client, int column, wxDC* dc, const wxRect& rect );
-
-	/**
-	 * @see CUploadingView::SortProc
-	 */
-	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, long sortData);
-};
-
-#endif
-// File_checked_for_headers

aMule-2.2.6.tar.bz2/src/Color.h Deleted

@@ -1,113 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2004-2009 Carlo Wood <carlo@alinoe.com>
-//
-// 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 COLOR_H
-#define COLOR_H
-
-#if !defined(__WXPM__) && !defined(__WXMSW__)  // Otherwise already defined in wx/defs.h.
-#include <inttypes.h>	// Do_not_auto_remove (old gcc)
-typedef uint32_t COLORREF;
-#else
-#include "Types.h"	// Do_not_auto_remove (Needed for windows compilation)
-typedef unsigned long COLORREF;
-#endif
-
-
-inline int G_BLEND(int a, int percentage)
-{
-	int result = a * percentage / 100;
-	return (result > 255) ? 255 : result;
-}
-
-
-#if !defined(__WXMSW__)
-inline COLORREF RGB(int a, int b, int c)
-{
-	COLORREF result;
-	result = (c & 0xff) << 16;
-	result |= (b & 0xff) << 8;
-	result |= (a & 0xff);
-	return result;
-}
-
-
-inline int GetBValue(COLORREF rgb)
-{
-	return (rgb >> 16) & 0xff;
-}
-
-
-inline int GetGValue(COLORREF rgb)
-{
-	return (rgb >> 8) & 0xff;
-}
-
-
-inline int GetRValue(COLORREF rgb)
-{
-	return rgb & 0xff;
-}
-
-#endif
-
-
-inline COLORREF DarkenColour(COLORREF rgb, int level) 
-{	
-	return RGB(GetRValue(rgb) / level, GetGValue(rgb) / level, GetBValue(rgb) / level);
-}
-
-
-#if wxUSE_GUI
-
-#include <wx/colour.h>		// Needed for wxColour
-
-inline wxColour BLEND( wxColour colour, int percentage )
-{
-	int red   = G_BLEND( colour.Red(),   percentage );
-	int green = G_BLEND( colour.Green(), percentage );
-	int blue  = G_BLEND( colour.Blue(),  percentage );
-
-	return wxColour( red, green, blue );
-}
-
-
-inline wxColour WxColourFromCr(COLORREF cr)
-{
-	return wxColour(GetRValue(cr),GetGValue(cr),GetBValue(cr));
-}
-
-
-inline COLORREF CrFromWxColour(wxColour col)
-{
-	return RGB(col.Red(), col.Green(), col.Blue());
-}
-
-#endif /* wxUSE_GUI */
-
-#define SYSCOLOR(x) (wxSystemSettings::GetColour(x))
-
-
-#endif
-// File_checked_for_headers

aMule-2.2.6.tar.bz2/src/UPnPCompatibility.cpp Deleted

@@ -1,49 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2006-2009 Marcelo Roberto Jimenez ( phoenix@amule.org )
-// Copyright (c) 2006-2009 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
-//
-
-
-#include "UPnPCompatibility.h"
-
-
-void CLogger::AddLogLine(
-	const wxString &file,
-	int line,
-	bool critical,
-	const std::ostringstream &msg)
-{
-	AddLogLine(file, line, critical, char2unicode(msg.str().c_str()));
-}
-
-
-void CLogger::AddLogLine(
-	const wxString &file,
-	int line,
-	bool critical,
-	DebugType type,
-	const std::ostringstream &msg)
-{
-	AddLogLine(file, line, critical, type, char2unicode(msg.str().c_str()));
-}
-

aMule-2.2.6.tar.bz2/src/libs/ec/c# Deleted

aMule-2.2.6.tar.bz2/src/libs/ec/c#/ECCodes.cs Deleted

@@ -1,370 +0,0 @@
-// 
-//  This file is part of the aMule Project.
-// 
-//  Copyright (c) 2004-2009 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
-
-// Purpose:
-// EC codes and type definition.
-
-namespace amule.net
-{
-public enum ProtocolVersion {
-	EC_CURRENT_PROTOCOL_VERSION = 0x0200
-};
-public enum ECFlags {
-	EC_FLAG_ZLIB	 = 0x00000001,
-	EC_FLAG_UTF8_NUMBERS = 0x00000002,
-	EC_FLAG_HAS_ID	 = 0x00000004,
-	EC_FLAG_ACCEPTS	 = 0x00000010,
-
-};
-public enum ECOpCodes {
-	EC_OP_NOOP                          = 0x01,
-	EC_OP_AUTH_REQ                      = 0x02,
-	EC_OP_AUTH_FAIL                     = 0x03,
-	EC_OP_AUTH_OK                       = 0x04,
-	EC_OP_FAILED                        = 0x05,
-	EC_OP_STRINGS                       = 0x06,
-	EC_OP_MISC_DATA                     = 0x07,
-	EC_OP_SHUTDOWN                      = 0x08,
-	EC_OP_ADD_LINK                      = 0x09,
-	EC_OP_STAT_REQ                      = 0x0A,
-	EC_OP_GET_CONNSTATE                 = 0x0B,
-	EC_OP_STATS                         = 0x0C,
-	EC_OP_GET_DLOAD_QUEUE               = 0x0D,
-	EC_OP_GET_ULOAD_QUEUE               = 0x0E,
-	EC_OP_GET_WAIT_QUEUE                = 0x0F,
-	EC_OP_GET_SHARED_FILES              = 0x10,
-	EC_OP_SHARED_SET_PRIO               = 0x11,
-	EC_OP_PARTFILE_REMOVE_NO_NEEDED     = 0x12,
-	EC_OP_PARTFILE_REMOVE_FULL_QUEUE    = 0x13,
-	EC_OP_PARTFILE_REMOVE_HIGH_QUEUE    = 0x14,
-	EC_OP_PARTFILE_CLEANUP_SOURCES      = 0x15,
-	EC_OP_PARTFILE_SWAP_A4AF_THIS       = 0x16,
-	EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO  = 0x17,
-	EC_OP_PARTFILE_SWAP_A4AF_OTHERS     = 0x18,
-	EC_OP_PARTFILE_PAUSE                = 0x19,
-	EC_OP_PARTFILE_RESUME               = 0x1A,
-	EC_OP_PARTFILE_STOP                 = 0x1B,
-	EC_OP_PARTFILE_PRIO_SET             = 0x1C,
-	EC_OP_PARTFILE_DELETE               = 0x1D,
-	EC_OP_PARTFILE_SET_CAT              = 0x1E,
-	EC_OP_DLOAD_QUEUE                   = 0x1F,
-	EC_OP_ULOAD_QUEUE                   = 0x20,
-	EC_OP_WAIT_QUEUE                    = 0x21,
-	EC_OP_SHARED_FILES                  = 0x22,
-	EC_OP_SHAREDFILES_RELOAD            = 0x23,
-	EC_OP_SHAREDFILES_ADD_DIRECTORY     = 0x24,
-	EC_OP_RENAME_FILE                   = 0x25,
-	EC_OP_SEARCH_START                  = 0x26,
-	EC_OP_SEARCH_STOP                   = 0x27,
-	EC_OP_SEARCH_RESULTS                = 0x28,
-	EC_OP_SEARCH_PROGRESS               = 0x29,
-	EC_OP_DOWNLOAD_SEARCH_RESULT        = 0x2A,
-	EC_OP_IPFILTER_RELOAD               = 0x2B,
-	EC_OP_GET_SERVER_LIST               = 0x2C,
-	EC_OP_SERVER_LIST                   = 0x2D,
-	EC_OP_SERVER_DISCONNECT             = 0x2E,
-	EC_OP_SERVER_CONNECT                = 0x2F,
-	EC_OP_SERVER_REMOVE                 = 0x30,
-	EC_OP_SERVER_ADD                    = 0x31,
-	EC_OP_SERVER_UPDATE_FROM_URL        = 0x32,
-	EC_OP_ADDLOGLINE                    = 0x33,
-	EC_OP_ADDDEBUGLOGLINE               = 0x34,
-	EC_OP_GET_LOG                       = 0x35,
-	EC_OP_GET_DEBUGLOG                  = 0x36,
-	EC_OP_GET_SERVERINFO                = 0x37,
-	EC_OP_LOG                           = 0x38,
-	EC_OP_DEBUGLOG                      = 0x39,
-	EC_OP_SERVERINFO                    = 0x3A,
-	EC_OP_RESET_LOG                     = 0x3B,
-	EC_OP_RESET_DEBUGLOG                = 0x3C,
-	EC_OP_CLEAR_SERVERINFO              = 0x3D,
-	EC_OP_GET_LAST_LOG_ENTRY            = 0x3E,
-	EC_OP_GET_PREFERENCES               = 0x3F,
-	EC_OP_SET_PREFERENCES               = 0x40,
-	EC_OP_CREATE_CATEGORY               = 0x41,
-	EC_OP_UPDATE_CATEGORY               = 0x42,
-	EC_OP_DELETE_CATEGORY               = 0x43,
-	EC_OP_GET_STATSGRAPHS               = 0x44,
-	EC_OP_STATSGRAPHS                   = 0x45,
-	EC_OP_GET_STATSTREE                 = 0x46,
-	EC_OP_STATSTREE                     = 0x47,
-	EC_OP_KAD_START                     = 0x48,
-	EC_OP_KAD_STOP                      = 0x49,
-	EC_OP_CONNECT                       = 0x4A,
-	EC_OP_DISCONNECT                    = 0x4B,
-	EC_OP_GET_DLOAD_QUEUE_DETAIL        = 0x4C,
-	EC_OP_KAD_UPDATE_FROM_URL           = 0x4D,
-	EC_OP_KAD_BOOTSTRAP_FROM_IP         = 0x4E
-};
-public enum ECTagNames {
-	EC_TAG_STRING                             = 0x0000,
-	EC_TAG_PASSWD_HASH                        = 0x0001,
-	EC_TAG_PROTOCOL_VERSION                   = 0x0002,
-	EC_TAG_VERSION_ID                         = 0x0003,
-	EC_TAG_DETAIL_LEVEL                       = 0x0004,
-	EC_TAG_CONNSTATE                          = 0x0005,
-	EC_TAG_ED2K_ID                            = 0x0006,
-	EC_TAG_LOG_TO_STATUS                      = 0x0007,
-	EC_TAG_BOOTSTRAP_IP                       = 0x0008,
-	EC_TAG_BOOTSTRAP_PORT                     = 0x0009,
-	EC_TAG_CLIENT_ID                          = 0x000A,
-	EC_TAG_CLIENT_NAME                        = 0x0100,
-		EC_TAG_CLIENT_VERSION                     = 0x0101,
-		EC_TAG_CLIENT_MOD                         = 0x0102,
-	EC_TAG_STATS_UL_SPEED                     = 0x0200,
-		EC_TAG_STATS_DL_SPEED                     = 0x0201,
-		EC_TAG_STATS_UL_SPEED_LIMIT               = 0x0202,
-		EC_TAG_STATS_DL_SPEED_LIMIT               = 0x0203,
-		EC_TAG_STATS_UP_OVERHEAD                  = 0x0204,
-		EC_TAG_STATS_DOWN_OVERHEAD                = 0x0205,
-		EC_TAG_STATS_TOTAL_SRC_COUNT              = 0x0206,
-		EC_TAG_STATS_BANNED_COUNT                 = 0x0207,
-		EC_TAG_STATS_UL_QUEUE_LEN                 = 0x0208,
-		EC_TAG_STATS_ED2K_USERS                   = 0x0209,
-		EC_TAG_STATS_KAD_USERS                    = 0x020A,
-		EC_TAG_STATS_ED2K_FILES                   = 0x020B,
-		EC_TAG_STATS_KAD_FILES                    = 0x020C,
-	EC_TAG_PARTFILE                           = 0x0300,
-		EC_TAG_PARTFILE_NAME                      = 0x0301,
-		EC_TAG_PARTFILE_PARTMETID                 = 0x0302,
-		EC_TAG_PARTFILE_SIZE_FULL                 = 0x0303,
-		EC_TAG_PARTFILE_SIZE_XFER                 = 0x0304,
-		EC_TAG_PARTFILE_SIZE_XFER_UP              = 0x0305,
-		EC_TAG_PARTFILE_SIZE_DONE                 = 0x0306,
-		EC_TAG_PARTFILE_SPEED                     = 0x0307,
-		EC_TAG_PARTFILE_STATUS                    = 0x0308,
-		EC_TAG_PARTFILE_PRIO                      = 0x0309,
-		EC_TAG_PARTFILE_SOURCE_COUNT              = 0x030A,
-		EC_TAG_PARTFILE_SOURCE_COUNT_A4AF         = 0x030B,
-		EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT  = 0x030C,
-		EC_TAG_PARTFILE_SOURCE_COUNT_XFER         = 0x030D,
-		EC_TAG_PARTFILE_ED2K_LINK                 = 0x030E,
-		EC_TAG_PARTFILE_CAT                       = 0x030F,
-		EC_TAG_PARTFILE_LAST_RECV                 = 0x0310,
-		EC_TAG_PARTFILE_LAST_SEEN_COMP            = 0x0311,
-		EC_TAG_PARTFILE_PART_STATUS               = 0x0312,
-		EC_TAG_PARTFILE_GAP_STATUS                = 0x0313,
-		EC_TAG_PARTFILE_REQ_STATUS                = 0x0314,
-		EC_TAG_PARTFILE_SOURCE_NAMES              = 0x0315,
-		EC_TAG_PARTFILE_COMMENTS                  = 0x0316,
-	EC_TAG_KNOWNFILE                          = 0x0400,
-		EC_TAG_KNOWNFILE_XFERRED                  = 0x0401,
-		EC_TAG_KNOWNFILE_XFERRED_ALL              = 0x0402,
-		EC_TAG_KNOWNFILE_REQ_COUNT                = 0x0403,
-		EC_TAG_KNOWNFILE_REQ_COUNT_ALL            = 0x0404,
-		EC_TAG_KNOWNFILE_ACCEPT_COUNT             = 0x0405,
-		EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL         = 0x0406,
-		EC_TAG_KNOWNFILE_AICH_MASTERHASH          = 0x0407,
-	EC_TAG_SERVER                             = 0x0500,
-		EC_TAG_SERVER_NAME                        = 0x0501,
-		EC_TAG_SERVER_DESC                        = 0x0502,
-		EC_TAG_SERVER_ADDRESS                     = 0x0503,
-		EC_TAG_SERVER_PING                        = 0x0504,
-		EC_TAG_SERVER_USERS                       = 0x0505,
-		EC_TAG_SERVER_USERS_MAX                   = 0x0506,
-		EC_TAG_SERVER_FILES		          = 0x0507,
-		EC_TAG_SERVER_PRIO	                  = 0x0508,
-		EC_TAG_SERVER_FAILED                      = 0x0509,
-		EC_TAG_SERVER_STATIC                      = 0x050A,
-		EC_TAG_SERVER_VERSION                     = 0x050B,
-	EC_TAG_CLIENT                             = 0x0600,
-		EC_TAG_CLIENT_SOFTWARE                    = 0x0601,
-		EC_TAG_CLIENT_SCORE                       = 0x0602,
-		EC_TAG_CLIENT_HASH                        = 0x0603,
-		EC_TAG_CLIENT_FRIEND                      = 0x0604,
-		EC_TAG_CLIENT_WAIT_TIME                   = 0x0605,
-		EC_TAG_CLIENT_XFER_TIME                   = 0x0606,
-		EC_TAG_CLIENT_QUEUE_TIME                  = 0x0607,
-		EC_TAG_CLIENT_LAST_TIME                   = 0x0608,
-		EC_TAG_CLIENT_UPLOAD_SESSION              = 0x0609,
-		EC_TAG_CLIENT_UPLOAD_TOTAL                = 0x060A,
-		EC_TAG_CLIENT_DOWNLOAD_TOTAL              = 0x060B,
-		EC_TAG_CLIENT_STATE                       = 0x060C,
-		EC_TAG_CLIENT_UP_SPEED                    = 0x060D,
-		EC_TAG_CLIENT_DOWN_SPEED                  = 0x060E,
-		EC_TAG_CLIENT_FROM                        = 0x060F,
-		EC_TAG_CLIENT_USER_IP                     = 0x0610,
-		EC_TAG_CLIENT_USER_PORT                   = 0x0611,
-		EC_TAG_CLIENT_SERVER_IP                   = 0x0612,
-		EC_TAG_CLIENT_SERVER_PORT                 = 0x0613,
-		EC_TAG_CLIENT_SERVER_NAME                 = 0x0614,
-		EC_TAG_CLIENT_SOFT_VER_STR                = 0x0615,
-		EC_TAG_CLIENT_WAITING_POSITION            = 0x0616,
-	EC_TAG_SEARCHFILE                         = 0x0700,
-		EC_TAG_SEARCH_TYPE                        = 0x0701,
-		EC_TAG_SEARCH_NAME                        = 0x0702,
-		EC_TAG_SEARCH_MIN_SIZE                    = 0x0703,
-		EC_TAG_SEARCH_MAX_SIZE                    = 0x0704,
-		EC_TAG_SEARCH_FILE_TYPE                   = 0x0705,
-		EC_TAG_SEARCH_EXTENSION                   = 0x0706,
-		EC_TAG_SEARCH_AVAILABILITY                = 0x0707,
-		EC_TAG_SEARCH_STATUS                      = 0x0708,
-	EC_TAG_SELECT_PREFS                       = 0x1000,
-		EC_TAG_PREFS_CATEGORIES                   = 0x1100,
-			EC_TAG_CATEGORY                           = 0x1101,
-			EC_TAG_CATEGORY_TITLE                     = 0x1102,
-			EC_TAG_CATEGORY_PATH                      = 0x1103,
-			EC_TAG_CATEGORY_COMMENT                   = 0x1104,
-			EC_TAG_CATEGORY_COLOR                     = 0x1105,
-			EC_TAG_CATEGORY_PRIO                      = 0x1106,
-		EC_TAG_PREFS_GENERAL                      = 0x1200,
-			EC_TAG_USER_NICK                          = 0x1201,
-			EC_TAG_USER_HASH                          = 0x1202,
-			EC_TAG_USER_HOST                          = 0x1203,
-		EC_TAG_PREFS_CONNECTIONS                  = 0x1300,
-			EC_TAG_CONN_DL_CAP                        = 0x1301,
-			EC_TAG_CONN_UL_CAP	                  = 0x1302,
-			EC_TAG_CONN_MAX_DL	                  = 0x1303,
-			EC_TAG_CONN_MAX_UL	                  = 0x1304,
-			EC_TAG_CONN_SLOT_ALLOCATION               = 0x1305,
-			EC_TAG_CONN_TCP_PORT                      = 0x1306,
-			EC_TAG_CONN_UDP_PORT	                  = 0x1307,
-			EC_TAG_CONN_UDP_DISABLE                   = 0x1308,
-			EC_TAG_CONN_MAX_FILE_SOURCES              = 0x1309,
-			EC_TAG_CONN_MAX_CONN	                  = 0x130A,
-			EC_TAG_CONN_AUTOCONNECT                   = 0x130B,
-			EC_TAG_CONN_RECONNECT	                  = 0x130C,
-			EC_TAG_NETWORK_ED2K		          = 0x130D,
-			EC_TAG_NETWORK_KADEMLIA                   = 0x130E,
-		EC_TAG_PREFS_MESSAGEFILTER                = 0x1400,
-			EC_TAG_MSGFILTER_ENABLED                  = 0x1401,
-			EC_TAG_MSGFILTER_ALL                      = 0x1402,
-			EC_TAG_MSGFILTER_FRIENDS                  = 0x1403,
-			EC_TAG_MSGFILTER_SECURE                   = 0x1404,
-			EC_TAG_MSGFILTER_BY_KEYWORD               = 0x1405,
-			EC_TAG_MSGFILTER_KEYWORDS                 = 0x1406,
-		EC_TAG_PREFS_REMOTECTRL                   = 0x1500,
-			EC_TAG_WEBSERVER_AUTORUN                  = 0x1501,
-			EC_TAG_WEBSERVER_PORT                     = 0x1502,
-			EC_TAG_WEBSERVER_GUEST                    = 0x1503,
-			EC_TAG_WEBSERVER_USEGZIP                  = 0x1504,
-			EC_TAG_WEBSERVER_REFRESH                  = 0x1505,
-			EC_TAG_WEBSERVER_TEMPLATE                 = 0x1506,
-		EC_TAG_PREFS_ONLINESIG                    = 0x1600,
-			EC_TAG_ONLINESIG_ENABLED                  = 0x1601,
-		EC_TAG_PREFS_SERVERS                      = 0x1700,
-			EC_TAG_SERVERS_REMOVE_DEAD                = 0x1701,
-			EC_TAG_SERVERS_DEAD_SERVER_RETRIES        = 0x1702,
-			EC_TAG_SERVERS_AUTO_UPDATE                = 0x1703,
-			EC_TAG_SERVERS_URL_LIST                   = 0x1704,
-			EC_TAG_SERVERS_ADD_FROM_SERVER            = 0x1705,
-			EC_TAG_SERVERS_ADD_FROM_CLIENT            = 0x1706,
-			EC_TAG_SERVERS_USE_SCORE_SYSTEM           = 0x1707,
-			EC_TAG_SERVERS_SMART_ID_CHECK             = 0x1708,
-			EC_TAG_SERVERS_SAFE_SERVER_CONNECT        = 0x1709,
-			EC_TAG_SERVERS_AUTOCONN_STATIC_ONLY       = 0x170A,
-			EC_TAG_SERVERS_MANUAL_HIGH_PRIO           = 0x170B,
-			EC_TAG_SERVERS_UPDATE_URL                 = 0x170C,
-		EC_TAG_PREFS_FILES                        = 0x1800,
-			EC_TAG_FILES_ICH_ENABLED                  = 0x1801,
-			EC_TAG_FILES_AICH_TRUST                   = 0x1802,
-			EC_TAG_FILES_NEW_PAUSED                   = 0x1803,
-			EC_TAG_FILES_NEW_AUTO_DL_PRIO             = 0x1804,
-			EC_TAG_FILES_PREVIEW_PRIO                 = 0x1805,
-			EC_TAG_FILES_NEW_AUTO_UL_PRIO             = 0x1806,
-			EC_TAG_FILES_UL_FULL_CHUNKS               = 0x1807,
-			EC_TAG_FILES_START_NEXT_PAUSED            = 0x1808,
-			EC_TAG_FILES_RESUME_SAME_CAT              = 0x1809,
-			EC_TAG_FILES_SAVE_SOURCES                 = 0x180A,
-			EC_TAG_FILES_EXTRACT_METADATA             = 0x180B,
-			EC_TAG_FILES_ALLOC_FULL_SIZE              = 0x180C,
-			EC_TAG_FILES_CHECK_FREE_SPACE             = 0x180D,
-			EC_TAG_FILES_MIN_FREE_SPACE	          = 0x180E,
-		EC_TAG_PREFS_SRCDROP                      = 0x1900,
-			EC_TAG_SRCDROP_NONEEDED                   = 0x1901,
-			EC_TAG_SRCDROP_DROP_FQS                   = 0x1902,
-			EC_TAG_SRCDROP_DROP_HQRS                  = 0x1903,
-			EC_TAG_SRCDROP_HQRS_VALUE                 = 0x1904,
-			EC_TAG_SRCDROP_AUTODROP_TIMER             = 0x1905,
-		EC_TAG_PREFS_DIRECTORIES                  = 0x1A00,
-		EC_TAG_PREFS_STATISTICS                   = 0x1B00,
-			EC_TAG_STATSGRAPH_WIDTH                   = 0x1B01,
-			EC_TAG_STATSGRAPH_SCALE                   = 0x1B02,
-			EC_TAG_STATSGRAPH_LAST                    = 0x1B03,
-			EC_TAG_STATSGRAPH_DATA                    = 0x1B04,
-			EC_TAG_STATTREE_CAPPING                   = 0x1B05,
-			EC_TAG_STATTREE_NODE                      = 0x1B06,
-			EC_TAG_STAT_NODE_VALUE                    = 0x1B07,
-			EC_TAG_STAT_VALUE_TYPE                    = 0x1B08,
-			EC_TAG_STATTREE_NODEID                    = 0x1B09,
-		EC_TAG_PREFS_SECURITY                     = 0x1C00,
-			EC_TAG_SECURITY_CAN_SEE_SHARES            = 0x1C01,
-			EC_TAG_IPFILTER_CLIENTS                   = 0x1C02,
-			EC_TAG_IPFILTER_SERVERS                   = 0x1C03,
-			EC_TAG_IPFILTER_AUTO_UPDATE               = 0x1C04,
-			EC_TAG_IPFILTER_UPDATE_URL                = 0x1C05,
-			EC_TAG_IPFILTER_LEVEL                     = 0x1C06,
-			EC_TAG_IPFILTER_FILTER_LAN                = 0x1C07,
-			EC_TAG_SECURITY_USE_SECIDENT              = 0x1C08,
-			EC_TAG_SECURITY_OBFUSCATION_SUPPORTED     = 0x1C09,
-			EC_TAG_SECURITY_OBFUSCATION_REQUESTED     = 0x1C0A,
-			EC_TAG_SECURITY_OBFUSCATION_REQUIRED      = 0x1C0B,
-		EC_TAG_PREFS_CORETWEAKS                   = 0x1D00,
-			EC_TAG_CORETW_MAX_CONN_PER_FIVE           = 0x1D01,
-			EC_TAG_CORETW_VERBOSE                     = 0x1D02,
-			EC_TAG_CORETW_FILEBUFFER                  = 0x1D03,
-			EC_TAG_CORETW_UL_QUEUE                    = 0x1D04,
-			EC_TAG_CORETW_SRV_KEEPALIVE_TIMEOUT       = 0x1D05,
-		EC_TAG_PREFS_KADEMLIA                     = 0x1E00,
-			EC_TAG_KADEMLIA_UPDATE_URL                = 0x1E01
-};
-public enum EC_DETAIL_LEVEL {
-	EC_DETAIL_CMD           = 0x00,
-	EC_DETAIL_WEB           = 0x01,
-	EC_DETAIL_FULL          = 0x02,
-	EC_DETAIL_UPDATE        = 0x03,
-	EC_DETAIL_INC_UPDATE    = 0x04
-};
-public enum EC_SEARCH_TYPE {
-	EC_SEARCH_LOCAL         = 0x00,
-	EC_SEARCH_GLOBAL        = 0x01,
-	EC_SEARCH_KAD           = 0x02,
-	EC_SEARCH_WEB           = 0x03
-};
-public enum EC_STATTREE_NODE_VALUE_TYPE {
-	EC_VALUE_INTEGER        = 0x00,
-	EC_VALUE_ISTRING        = 0x01,
-	EC_VALUE_BYTES          = 0x02,
-	EC_VALUE_ISHORT         = 0x03,
-	EC_VALUE_TIME           = 0x04,
-	EC_VALUE_SPEED          = 0x05,
-	EC_VALUE_STRING         = 0x06,
-	EC_VALUE_DOUBLE         = 0x07
-};
-public enum EcPrefs {
-	EC_PREFS_CATEGORIES     = 0x00000001,
-	EC_PREFS_GENERAL        = 0x00000002,
-	EC_PREFS_CONNECTIONS    = 0x00000004,
-	EC_PREFS_MESSAGEFILTER  = 0x00000008,
-	EC_PREFS_REMOTECONTROLS = 0x00000010,
-	EC_PREFS_ONLINESIG      = 0x00000020,
-	EC_PREFS_SERVERS        = 0x00000040,
-	EC_PREFS_FILES          = 0x00000080,
-	EC_PREFS_SRCDROP        = 0x00000100,
-	EC_PREFS_DIRECTORIES    = 0x00000200,
-	EC_PREFS_STATISTICS     = 0x00000400,
-	EC_PREFS_SECURITY       = 0x00000800,
-	EC_PREFS_CORETWEAKS     = 0x00001000,
-	EC_PREFS_KADEMLIA       = 0x00002000
-};
-}

aMule-2.2.6.tar.bz2/src/libs/ec/c#/ECTagTypes.cs Deleted

@@ -1,41 +0,0 @@
-// 
-//  This file is part of the aMule Project.
-// 
-//  Copyright (c) 2004-2009 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
-
-// Purpose:
-// EC tag types for use on the ec library.
-
-namespace amule.net
-{
-public enum ECTagTypes {
-	EC_TAGTYPE_UNKNOWN = 0,
-	EC_TAGTYPE_CUSTOM = 1,
-	EC_TAGTYPE_UINT8 = 2,
-	EC_TAGTYPE_UINT16 = 3,
-	EC_TAGTYPE_UINT32 = 4,
-	EC_TAGTYPE_UINT64 = 5,
-	EC_TAGTYPE_STRING = 6,
-	EC_TAGTYPE_DOUBLE = 7,
-	EC_TAGTYPE_IPV4 = 8,
-	EC_TAGTYPE_HASH16 = 9
-};
-}

aMule-2.2.6.tar.bz2/src/libs/ec/c#/amuleRemote.cs Deleted

@@ -1,299 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003-2009 lfroen ( lfroen@gmail.com / 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
-//
-using System;
-using System.IO;
-using System.Security;
-using System.Security.Permissions;
-using System.Threading;
-using System.Collections.Generic;
-using System.Text;
-using System.Net;
-using System.Net.Sockets;
-
-namespace amule.net
-{
-
-    // Define the state object for the callback. 
-    // Use hostName to correlate calls with the proper result.
-    public class ResolveState {
-        IPHostEntry resolvedIPs;
-
-        public string errorMsg;
-
-        public IPHostEntry IPs
-        {
-            get { return resolvedIPs; }
-            set { resolvedIPs = value; }
-        }
-    }
-
-    public class ConnectState {
-        public Socket sock;
-        public string errorMsg;
-
-        public ConnectState(Socket s)
-        {
-            sock = s;
-        }
-    }
-
-    public abstract class amuleECHandler {
-        public amuleECHandler()
-        {
-        }
-
-        public abstract void HandlePacket(ecProto.ecPacket packet);
-    }
-
-    class amuleLogicHandler : amuleECHandler {
-        amuleRemote m_owner;
-        bool m_auth_result = false;
-
-        public amuleLogicHandler(amuleRemote o)
-        {
-            m_owner = o;
-        }
-
-        public override void HandlePacket(ecProto.ecPacket packet)
-        {
-            if ( packet.Opcode() == ECOpCodes.EC_OP_AUTH_OK ) {
-                Console.WriteLine("amuleLogicHandler : Authenticated OK");
-                m_auth_result = true;
-                m_owner.m_packet_op_Done.Set();
-            } else {
-                Console.WriteLine("amuleLogicHandler : Authentication failed. Core reply was {0}", packet.Opcode());
-            }
-        }
-
-        public bool AuthResult()
-        {
-            return m_auth_result;
-        }
-    }
-
-    class amuleRemote {
-        amuleECHandler m_handler = null;
-
-        public ManualResetEvent m_packet_op_Done = new ManualResetEvent(false);
-
-        // Record the IPs in the state object for later use.
-        static void GetHostEntryCallback(IAsyncResult ar)
-        {
-            ResolveState ioContext = (ResolveState)ar.AsyncState;
-            try {
-                ioContext.IPs = Dns.EndGetHostEntry(ar);
-            } catch (SocketException e) {
-                ioContext.errorMsg = e.Message;
-            }
-        }
-
-        Socket m_s;
-
-        static void ConnectCallback(IAsyncResult ar)
-        {
-            // Retrieve the socket from the state object.
-            ConnectState state = (ConnectState)ar.AsyncState;
-            try {
-                // Complete the connection.
-                state.sock.EndConnect(ar);
-
-                Console.WriteLine("Socket connected to {0}",
-                    state.sock.RemoteEndPoint.ToString());
-
-            } catch (Exception e) {
-                state.errorMsg = e.Message;
-            }
-        }
-
-        byte[] m_rx_buffer = new byte[32 * 1024];
-        MemoryStream m_rx_mem_stream = null;
-        int m_rx_byte_count = 0;
-        int m_rx_remaining_count = 0;
-
-        byte[] m_tx_buffer = new byte[32 * 1024];
-        MemoryStream m_tx_mem_stream = null;
-
-        //LinkedList<byte[]> m_tx_queue;
-        BinaryReader m_sock_reader = null;
-        BinaryWriter m_sock_writer = null;
-
-        static void RxCallback(IAsyncResult ar)
-        {
-            amuleRemote o = (amuleRemote)ar.AsyncState;
-            Console.WriteLine("RxCallback signalled, calling EndReceive");
-            int bytesRead = o.m_s.EndReceive(ar);
-            if ( bytesRead == 0 ) {
-                // remote side closed connection. 
-                // indicate error to caller
-                o.m_rx_byte_count = -1;
-                return;
-            }
-            o.m_rx_remaining_count -= bytesRead;
-            Console.WriteLine("RxCallback: got {0} bytes, waiting for {1}",
-                bytesRead, o.m_rx_remaining_count);
-            // are we still waiting for flags and size?
-            if (o.m_rx_byte_count < 8) {
-                if ((o.m_rx_byte_count + bytesRead) >= 8) {
-                    // got flags and packet size - may proceed.
-                    Int32 flags = o.m_sock_reader.ReadInt32();
-                    Int32 val32 = o.m_sock_reader.ReadInt32();
-
-                    o.m_rx_remaining_count = (int)IPAddress.NetworkToHostOrder(val32) - (bytesRead - 8);
-                    Console.WriteLine("RxCallback: expecting packet size={0}", o.m_rx_remaining_count);
-                    if ( o.m_rx_buffer.Length <= (o.m_rx_remaining_count+o.m_rx_byte_count) ) {
-                        byte [] new_buffer = new byte[o.m_rx_remaining_count + o.m_rx_buffer.Length + 1];
-                        o.m_rx_buffer.CopyTo(new_buffer, 0);
-                        o.m_rx_buffer = new_buffer;
-                        //
-                        // update stream reader with new buffer
-                        //
-                        o.m_rx_mem_stream = new MemoryStream(o.m_rx_buffer);
-                        o.m_sock_reader = new BinaryReader(o.m_rx_mem_stream);
-                    }
-                }
-            } else {
-                if ( o.m_rx_remaining_count == 0 ) {
-                    //
-                    // Packet received - call handler
-                    //
-                    if ( o.m_handler != null ) {
-                        o.m_rx_mem_stream.Seek(0, SeekOrigin.Begin);
-                        Console.WriteLine("Packet received - call handler");
-                        ecProto.ecPacket p = new ecProto.ecPacket(o.m_sock_reader);
-                        //m_packet_op_Done.Set();
-                        o.m_handler.HandlePacket(p);
-                        Console.WriteLine("Handler done");
-                    }
-                    Console.WriteLine("Signalling event");
-                    //m_packet_op_Done.Set();
-                    //
-                    // Keep waiting for more packets
-                    //
-                    o.StartReceive();
-                    return;                
-                }
-            }
-            o.m_rx_byte_count += bytesRead;
-
-            // not just yet - keep waiting
-            o.m_s.BeginReceive(o.m_rx_buffer, o.m_rx_byte_count, o.m_rx_remaining_count,
-                SocketFlags.None, new AsyncCallback(RxCallback), o);
-        }
-
-        static void TxCallback(IAsyncResult ar)
-        {
-            amuleRemote o = (amuleRemote)ar.AsyncState;
-            Console.WriteLine("TxCallback signalled, calling EndWrite");
-            o.m_s.EndSend(ar);
-        }
-
-        public IAsyncResult SendPacket(ecProto.ecPacket packet)
-        {
-            m_tx_mem_stream.Seek(0, SeekOrigin.Begin);
-            packet.Write(m_sock_writer);
-
-            return m_s.BeginSend(m_tx_buffer, 0, packet.PacketSize(),
-                SocketFlags.None, new AsyncCallback(TxCallback), this);
-        }
-
-        public void StartReceive()
-        {
-            // reply packet is supposed to have at least 8 bytes
-            m_rx_remaining_count = 8;
-            m_rx_byte_count = 0;
-            m_rx_mem_stream.Seek(0, SeekOrigin.Begin);
-            m_s.BeginReceive(m_rx_buffer, 0, 8, SocketFlags.None, new AsyncCallback(RxCallback), this);
-        }
-
-        [DnsPermission(SecurityAction.Demand, Unrestricted = true)]
-        public bool ConnectToCore(string host, int port, string pass, ref string error)
-        {
-            try {
-                IAsyncResult async_result;
-
-                ResolveState resolveContext = new ResolveState();
-                async_result = Dns.BeginGetHostEntry(host,
-                    new AsyncCallback(GetHostEntryCallback), resolveContext);
-
-                async_result.AsyncWaitHandle.WaitOne();
-                if ( resolveContext.IPs == null ) {
-                    error = resolveContext.errorMsg;
-                    return false;
-                }
-                Console.WriteLine("Resolved: '{0}' -> '{1}", host,resolveContext.IPs.AddressList[0]);
-                Console.WriteLine("Connecting to {0}:{1}", resolveContext.IPs.AddressList[0], port);
-                IPEndPoint remoteEP = new IPEndPoint(resolveContext.IPs.AddressList[0], port);
-                m_s = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-
-                ConnectState connectContext = new ConnectState(m_s);
-                async_result = m_s.BeginConnect(remoteEP, new AsyncCallback(ConnectCallback), connectContext);
-                if ( !async_result.AsyncWaitHandle.WaitOne(10000, true) ) {
-                    error = "Timeout during connection. Possible firewall";
-                    return false;
-                }
-
-                if ( connectContext.errorMsg != null) {
-                    error = connectContext.errorMsg;
-                    return false;
-                }
-
-                m_tx_mem_stream = new MemoryStream(m_tx_buffer);
-                m_sock_writer = new BinaryWriter(m_tx_mem_stream);
-                m_rx_mem_stream = new MemoryStream(m_rx_buffer);
-                m_sock_reader = new BinaryReader(m_rx_mem_stream);
-
-                ecProto.ecLoginPacket p = new ecProto.ecLoginPacket("amule.net", "0.0.1", pass);
-                async_result = SendPacket(p);
-
-                if (!async_result.AsyncWaitHandle.WaitOne()) {
-                    // Was unable to send login request for 1sec. Line must be really slow
-                    return false;
-                }
-
-                m_handler = new amuleLogicHandler(this);
-                StartReceive();
-                Console.WriteLine("Waiting for auth done");
-                // FIXME: must be able to cancel this read.
-                m_packet_op_Done.WaitOne();
-                if ( m_rx_byte_count == -1 ) {
-                    // remote side terminated connection
-                    Console.WriteLine("Connection terminated on remote side");
-                }
-                Console.WriteLine("Connect done");
-                bool result = ((amuleLogicHandler)m_handler).AuthResult();
-                m_handler = null;
-                return result;
-            } catch (Exception e) {
-                error = e.Message;
-                return false;
-            }
-        }
-
-        public void SetECHandler(amuleECHandler h)
-        {
-            m_handler = h;
-        }
-    }
-}

aMule-2.2.6.tar.bz2/src/libs/ec/c#/ecProto.cs Deleted

@@ -1,669 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003-2009 lfroen ( lfroen@gmail.com / 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
-//
-
-using System;
-using System.IO;
-using System.Security.Cryptography;
-using System.Collections.Generic;
-using System.Text;
-
-namespace amule.net
-{
-    public enum EcTagTypes {
-        EC_TAGTYPE_UNKNOWN = 0,
-        EC_TAGTYPE_CUSTOM = 1,
-        EC_TAGTYPE_UINT8 = 2,
-        EC_TAGTYPE_UINT16 = 3,
-        EC_TAGTYPE_UINT32 = 4,
-        EC_TAGTYPE_UINT64 = 5,
-        EC_TAGTYPE_STRING = 6,
-        EC_TAGTYPE_DOUBLE = 7,
-        EC_TAGTYPE_IPV4 = 8,
-        EC_TAGTYPE_HASH16 = 9
-    };
-
-    public class ecProto {
-
-        public class ecTag {
-            protected int m_size;
-            protected EcTagTypes m_type;
-            protected ECTagNames m_name;
-            protected LinkedList<ecTag> m_subtags;
-
-            public ecTag(ECTagNames n, EcTagTypes t)
-            {
-                m_name = n;
-                m_type = t;
-                m_subtags = new LinkedList<ecTag>();
-            }
-            public ecTag(ECTagNames n, EcTagTypes t, LinkedList<ecTag> subtags)
-            {
-                m_name = n;
-                m_type = t;
-                m_subtags = subtags; ;
-            }
-
-            public ecTag()
-            {
-                m_subtags = new LinkedList<ecTag>();
-            }
-
-            public int SubtagCount()
-            {
-                return m_subtags.Count;
-            }
-
-            protected void WriteSubtags(BinaryWriter wr)
-            {
-                Int16 count16 = (Int16)m_subtags.Count;
-                if (count16 != 0) {
-                    wr.Write(System.Net.IPAddress.HostToNetworkOrder(count16));
-                    foreach (ecTag t in m_subtags)
-                    {
-                        t.Write(wr);
-                    }
-                }
-            }
-
-            public ECTagNames Name()
-            {
-                return m_name;
-            }
-
-            public virtual void Write(BinaryWriter wr)
-            {
-                Int16 name16 = (Int16)(m_name);
-                name16 <<= 1;
-                byte type8 = (byte)m_type;
-                Int32 size32 = (Int32)Size();
-                if (m_subtags.Count != 0) {
-                    name16 |= 1;
-                }
-                wr.Write(System.Net.IPAddress.HostToNetworkOrder(name16));
-                wr.Write(type8);
-                wr.Write(System.Net.IPAddress.HostToNetworkOrder(size32));
-
-                WriteSubtags(wr);
-                //
-                // here derived class will put actual data
-                //
-            }
-
-            protected int Size()
-            {
-                int total_size = m_size;
-                foreach (ecTag t in m_subtags) {
-                    total_size += t.Size();
-                    // name + type + size for each tag
-                    total_size += (2 + 1 + 4);
-                    if (t.HaveSubtags()) {
-                        total_size += 2;
-                    }
-                }
-                return total_size;
-            }
-
-            public LinkedList<ecTag>.Enumerator GetTagIterator()
-            {
-                return m_subtags.GetEnumerator();
-            }
-
-            public void AddSubtag(ecTag t)
-            {
-                m_subtags.AddLast(t);
-            }
-
-            bool HaveSubtags()
-            {
-                return (m_subtags.Count != 0);
-            }
-
-            public ecTag SubTag(ECTagNames name)
-            {
-                foreach (ecTag t in m_subtags) {
-                    if (t.m_name == name) {
-                        return t;
-                    }
-                }
-                return null;
-            }
-        }
-
-        public class ecTagInt : ecTag {
-            protected Int64 m_val;
-            public ecTagInt(ECTagNames n, byte v)
-                : base(n, EcTagTypes.EC_TAGTYPE_UINT8)
-            {
-                m_val = v;
-                m_size = 1;
-            }
-
-            public ecTagInt(ECTagNames n, Int16 v)
-                : base(n, EcTagTypes.EC_TAGTYPE_UINT16)
-            {
-                m_val = v;
-                m_size = 2;
-            }
-
-            public ecTagInt(ECTagNames n, Int32 v)
-                : base(n, EcTagTypes.EC_TAGTYPE_UINT32)
-            {
-                m_val = v;
-                m_size = 4;
-            }
-
-            public ecTagInt(ECTagNames n, Int64 v)
-                : base(n, EcTagTypes.EC_TAGTYPE_UINT64)
-            {
-                m_val = v;
-                m_size = 8;
-            }
-
-            public ecTagInt(ECTagNames n, Int32 tag_size, BinaryReader br, LinkedList<ecTag> subtags)
-                : base(n, EcTagTypes.EC_TAGTYPE_UINT8, subtags)
-            {
-                m_size = tag_size;
-                UInt64 raw_val;
-                Int32 hi, lo, v32;
-                Int16 v16;
-                switch ( m_size ) {
-                    case 8:
-                        m_type = EcTagTypes.EC_TAGTYPE_UINT64;
-                        lo = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt32());
-                        hi = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt32());
-                        raw_val = ((UInt64)hi) << 32 | (UInt32)lo;
-                        break;
-                    case 4:
-                        m_type = EcTagTypes.EC_TAGTYPE_UINT32;
-                        v32 = (System.Net.IPAddress.NetworkToHostOrder(br.ReadInt32()));
-                        raw_val = (UInt32)v32;
-                        break;
-                    case 2:
-                        m_type = EcTagTypes.EC_TAGTYPE_UINT16;
-                        v16 = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt16());
-                        raw_val = (UInt16)v16;
-                        break;
-                    case 1:
-                        m_type = EcTagTypes.EC_TAGTYPE_UINT8;
-                        raw_val = (UInt64)br.ReadByte();
-                        break;
-                    default:
-                        throw new Exception("Unexpected size of data in integer tag");
-                }
-                m_val = (Int64)raw_val;
-                if ( m_val < 0 ) {
-                    throw new Exception("WTF - typecasting is broken?!");
-                }
-            }
-
-            public int ValueInt()
-            {
-                return (int)m_val;
-            }
-
-            public Int64 Value64()
-            {
-                return m_val;
-            }
-            
-            public override void Write(BinaryWriter wr)
-            {
-                base.Write(wr);
-                
-                switch ( m_size ) {
-                    case 8:
-                        Int32 val32 = (Int32)(m_val >> 32);
-                        wr.Write(System.Net.IPAddress.HostToNetworkOrder(val32));
-
-                        val32 = (Int32)(m_val & 0xffffffff);
-                        wr.Write(System.Net.IPAddress.HostToNetworkOrder(val32));
-                        break;
-                    case 4:
-                        val32 = (Int32)(m_val & 0xffffffff);
-                        wr.Write(System.Net.IPAddress.HostToNetworkOrder(val32));
-                        break;
-                    case 2:
-                        Int16 val16 = (Int16)(m_val & 0xffff);
-                        wr.Write(System.Net.IPAddress.HostToNetworkOrder(val16));
-                        break;
-                    case 1:
-                        wr.Write((byte)(m_val & 0xff));
-                        break;
-                }
-
-            }
-        }
-
-        public class ecMD5 : IComparable<ecMD5>, IEquatable<ecMD5> {
-            Int64 m_lo, m_hi;
-            public ecMD5(Int64 lo, Int64 hi)
-            {
-                m_hi = hi;
-                m_lo = lo;
-            }
-
-            //
-            // actual byte order doesn't matter, but conversion must be consistant
-            //
-            public ecMD5(byte [] v)
-            {
-                m_lo = ((Int64)v[0] << 0) | ((Int64)v[1] << 8) | ((Int64)v[2] << 16) | ((Int64)v[3] << 24) |
-                    ((Int64)v[4] << 32) | ((Int64)v[5] << 40) | ((Int64)v[6] << 48) | ((Int64)v[7] << 56);
-                m_hi = ((Int64)v[8] << 0) | ((Int64)v[9] << 8) | ((Int64)v[10] << 16) | ((Int64)v[11] << 24) |
-                    ((Int64)v[12] << 32) | ((Int64)v[13] << 40) | ((Int64)v[14] << 48) | ((Int64)v[15] << 56);
-            }
-
-            public byte [] ByteValue()
-            {
-                byte[] v = {
-                    (byte)(m_lo >> 0), (byte)(m_lo >> 8), (byte)(m_lo >> 16), (byte)(m_lo >> 24),
-                    (byte)(m_lo >> 32), (byte)(m_lo >> 40), (byte)(m_lo >> 48), (byte)(m_lo >> 56),
-                    (byte)(m_hi >> 0), (byte)(m_hi >> 8), (byte)(m_hi >> 16), (byte)(m_hi >> 24),
-                    (byte)(m_hi >> 32), (byte)(m_hi >> 40), (byte)(m_hi >> 48), (byte)(m_hi >> 56),
-                };
-                return v;
-            }
-
-            public override int GetHashCode()
-            {
-                return (int)m_lo ^ (int)m_hi;
-            }
-
-            public bool Equals(ecMD5 i)
-            {
-                return (m_hi == i.m_hi) && (m_lo == i.m_lo);
-            }
-
-            public int CompareTo(ecMD5 i)
-            {
-                Int64 r = ((m_hi == i.m_hi) ? (m_lo - i.m_lo) : (m_hi - i.m_hi));
-                return r > 0 ? 1 : (r < 0 ? -1 : 0);
-            }
-        }
-
-        public class ecTagMD5 : ecTag {
-            byte[] m_val;
-
-            public ecTagMD5(ECTagNames n, ecMD5 value)
-                : base(n, EcTagTypes.EC_TAGTYPE_HASH16)
-            {
-                m_val = value.ByteValue();
-                m_size = 16;
-            }
-
-            public ecTagMD5(ECTagNames n, string s, bool string_is_hash)
-                : base(n, EcTagTypes.EC_TAGTYPE_HASH16)
-            {
-                if ( string_is_hash ) {
-                    // in this case hash is passed as hex string
-                    if ( s.Length != 16*2 ) {
-                        throw new Exception("md5 hash of proto version have incorrect length");
-                    }
-                    //byte[] hash_str = s.ToCharArray();
-                    for (int i = 0; i < 16; i++) {
-                        string v = s.Substring(i * 2, 2);
-                        
-                    }
-                    m_val = new byte[16];
-                } else {
-                    MD5CryptoServiceProvider p = new MD5CryptoServiceProvider();
-                    byte[] bs = System.Text.Encoding.UTF8.GetBytes(s);
-                    m_val = p.ComputeHash(bs);
-                }
-                m_size = 16;
-            }
-
-            public ecTagMD5(ECTagNames name, byte[] hash_data)
-                : base(name, EcTagTypes.EC_TAGTYPE_HASH16)
-            {
-                m_val = hash_data;
-                m_size = 16;
-            }
-
-            public ecTagMD5(ECTagNames name, BinaryReader br, LinkedList<ecTag> subtags)
-                : base(name, EcTagTypes.EC_TAGTYPE_HASH16, subtags)
-            {
-                m_size = 16;
-                m_val = br.ReadBytes(16);
-            }
-
-            public override void Write(BinaryWriter wr)
-            {
-                base.Write(wr);
-                wr.Write(m_val);
-            }
-
-            public ecMD5 ValueMD5()
-            {
-                return new ecMD5(m_val);
-            }
-        }
-
-        public class ecTagIPv4 : ecTag {
-            Int32 m_addr;
-            Int16 m_port;
-            public ecTagIPv4(ECTagNames name, BinaryReader br, LinkedList<ecTag> subtags)
-                : base(name, EcTagTypes.EC_TAGTYPE_IPV4, subtags)
-            {
-                m_size = 4+2;
-                m_addr = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt32());
-                m_port = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt16());
-            }
-        }
-
-        public class ecTagCustom : ecTag {
-            byte[] m_val;
-            public ecTagCustom(ECTagNames n, Int32 tag_size, BinaryReader br, LinkedList<ecTag> subtags)
-                : base(n, EcTagTypes.EC_TAGTYPE_CUSTOM, subtags)
-            {
-                m_val= br.ReadBytes(tag_size);
-                m_size = tag_size;
-            }
-            public byte [] Value()
-            {
-            	return m_val;
-            }
-
-        }
-
-        public class ecTagString : ecTag {
-            byte[] m_val;
-            public ecTagString(ECTagNames n, string s)
-                : base(n, EcTagTypes.EC_TAGTYPE_STRING)
-            {
-                m_val = System.Text.Encoding.UTF8.GetBytes(s);
-                m_size = m_val.GetLength(0) + 1;
-            }
-
-            public ecTagString(ECTagNames n, Int32 tag_size, BinaryReader br, LinkedList<ecTag> subtags)
-                : base(n, EcTagTypes.EC_TAGTYPE_STRING, subtags)
-            {
-                byte[] buf = br.ReadBytes(tag_size-1);
-                // discard trailing '0'
-                br.ReadBytes(1);
-
-                m_size = tag_size;
-                m_val = buf;
-            }
-
-            public override void Write(BinaryWriter wr)
-            {
-                base.Write(wr);
-                wr.Write(m_val);
-                byte zero_byte = 0;
-                wr.Write(zero_byte);
-            }
-            public string StringValue()
-            {
-                Encoding u8 = Encoding.UTF8;
-                string s = u8.GetString(m_val);
-                return s;
-            }
-        }
-
-        public class ecPacket : ecTag {
-            // since I have no zlib here, effectively disable compression
-            const int MaxUncompressedPacket = 0x6666;
-
-            private ECOpCodes m_opcode;
-            protected Int32 m_flags;
-
-            //
-            // Parsing ctor
-            //
-            ecTag ReadTag(BinaryReader br)
-            {
-                ecTag t = null;
-                Int16 tag_name16 = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt16());
-                bool have_subtags = ((tag_name16 & 1) != 0);
-                ECTagNames tag_name = (ECTagNames)(tag_name16 >> 1);
-
-                byte tag_type8 = br.ReadByte();
-                Int32 tag_size32 = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt32());
-                LinkedList<ecTag> subtags = null;
-                if ( have_subtags ) {
-                    subtags = ReadSubtags(br);
-                }
-                EcTagTypes tag_type = (EcTagTypes)tag_type8;
-                switch (tag_type) {
-                    case EcTagTypes.EC_TAGTYPE_UNKNOWN:
-                        break;
-                    case EcTagTypes.EC_TAGTYPE_CUSTOM:
-                        t = new ecTagCustom(tag_name, tag_size32, br, subtags);
-                        break;
-
-                    case EcTagTypes.EC_TAGTYPE_UINT8:
-                        t = new ecTagInt(tag_name, 1, br, subtags);
-                        break;
-                    case EcTagTypes.EC_TAGTYPE_UINT16:
-                        t = new ecTagInt(tag_name, 2, br, subtags);
-                        break;
-                    case EcTagTypes.EC_TAGTYPE_UINT32:
-                        t = new ecTagInt(tag_name, 4, br, subtags);
-                        break;
-                    case EcTagTypes.EC_TAGTYPE_UINT64:
-                        t = new ecTagInt(tag_name, 8, br, subtags);
-                        break;
-
-                    case EcTagTypes.EC_TAGTYPE_STRING:
-                        t = new ecTagString(tag_name, tag_size32, br, subtags);
-                        break;
-                    case EcTagTypes.EC_TAGTYPE_DOUBLE:
-                        break;
-                    case EcTagTypes.EC_TAGTYPE_IPV4:
-                        t = new ecTagIPv4(tag_name, br, subtags);
-                        break;
-                    case EcTagTypes.EC_TAGTYPE_HASH16:
-                        t = new ecTagMD5(tag_name, br, subtags);
-                        break;
-                    default:
-                        break;
-                }
-                if ( t == null ) {
-                    throw new Exception("Unexpected tag type");
-                }
-                return t;
-            }
-
-            LinkedList<ecTag> ReadSubtags(BinaryReader br)
-            {
-                Int16 count16 = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt16());
-                LinkedList<ecTag> taglist = new LinkedList<ecTag>();
-                for (int i = 0; i < count16;i++) {
-                    ecTag st = ReadTag(br);
-                    taglist.AddLast(st);
-                }
-                return taglist;
-            }
-
-            public ecPacket()
-            {
-                m_flags = 0x20;
-            }
-
-            public ecPacket(BinaryReader br)
-            {
-                m_flags = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt32());
-                Int32 packet_size = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt32());
-                m_opcode = (ECOpCodes)br.ReadByte();
-
-                Int16 tags_count = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt16());
-
-                if ( tags_count != 0 ) {
-                    for (int i = 0; i < tags_count; i++) {
-                        ecTag t = ReadTag(br);
-                        AddSubtag(t);
-                    }
-                }
-            }
-
-            //
-            // Default ctor - for tx packets
-            public ecPacket(ECOpCodes cmd)
-            {
-                m_flags = 0x20;
-                m_opcode = cmd;
-            }
-            
-            public ecPacket(ECOpCodes cmd, EC_DETAIL_LEVEL detail_level)
-            {
-                m_flags = 0x20;
-                m_opcode = cmd;
-                if ( detail_level != EC_DETAIL_LEVEL.EC_DETAIL_FULL ) {
-                    AddSubtag(new ecTagInt(ECTagNames.EC_TAG_DETAIL_LEVEL, (Int64)detail_level));
-                }
-            }
-
-            //
-            // Size of data for TX, not of payload
-            //
-            public int PacketSize()
-            {
-                int packet_size = Size();
-                if ((m_flags & (UInt32)ECFlags.EC_FLAG_ACCEPTS) != 0) {
-                    packet_size += 4;
-                }
-                // 1 (command) + 2 (tag count) + 4 (flags) + 4 (total size)
-                return packet_size + 1 + 2 + 4 + 4;
-            }
-
-            public ECOpCodes Opcode()
-            {
-                return m_opcode;
-            }
-
-            public override void Write(BinaryWriter wr)
-            {
-                // 1 (command) + 2 (tag count)
-                int packet_size = Size() + 1 + 2;
-                if ( packet_size > MaxUncompressedPacket ) {
-                    m_flags |= (Int32)ECFlags.EC_FLAG_ZLIB;
-                }
-
-                if ((m_flags & (UInt32)ECFlags.EC_FLAG_ZLIB) != 0) {
-                    throw new NotImplementedException("no zlib compression yet");
-                }
-
-
-                wr.Write(System.Net.IPAddress.HostToNetworkOrder((Int32)(m_flags)));
-                if ((m_flags & (UInt32)ECFlags.EC_FLAG_ACCEPTS) != 0) {
-                    wr.Write(System.Net.IPAddress.HostToNetworkOrder((Int32)(m_flags)));
-                }
-
-                wr.Write(System.Net.IPAddress.HostToNetworkOrder((Int32)(packet_size)));
-                wr.Write((byte)m_opcode);
-                if ( m_subtags.Count != 0 ) {
-                    WriteSubtags(wr);
-                } else {
-                    wr.Write((Int16)(0));
-                }
-            }
-            
-        }
-
-        //
-        // Specific - purpose tags
-        //
-
-        public class ecLoginPacket : ecPacket {
-            public ecLoginPacket(string client_name, string version, string pass)
-                : base(ECOpCodes.EC_OP_AUTH_REQ)
-            {
-                m_flags |= 0x20 | (Int32)ECFlags.EC_FLAG_ACCEPTS;
-
-                AddSubtag(new ecTagString(ECTagNames.EC_TAG_CLIENT_NAME, client_name));
-                AddSubtag(new ecTagString(ECTagNames.EC_TAG_CLIENT_VERSION, version));
-                AddSubtag(new ecTagInt(ECTagNames.EC_TAG_PROTOCOL_VERSION,
-                    (Int64)ProtocolVersion.EC_CURRENT_PROTOCOL_VERSION));
-
-                AddSubtag(new ecTagMD5(ECTagNames.EC_TAG_PASSWD_HASH, pass, false));
-
-                // discussion is ongoing
-                //AddSubtag(new ecTagMD5(ECTagNames.EC_TAG_VERSION_ID, EC_VERSION_ID, true));
-            }
-        }
-
-        public class ecDownloadsInfoReq : ecPacket {
-            public ecDownloadsInfoReq() : base(ECOpCodes.EC_OP_GET_DLOAD_QUEUE)
-            {
-            }
-        }
-
-        //
-        // Class exists only for parsing purpose
-        //
-        public class ecConnStateTag {
-            ecTagInt m_tag;
-            Int32 m_tag_val;
-            public ecConnStateTag(ecTagInt tag)
-            {
-                m_tag = tag;
-                //m_tag_val = (Int32)tag.Value64();
-                m_tag_val = 0xfff;
-            }
-
-            //public static explicit operator ecConnStateTag(ecTagInt t)
-            //{
-            //    return new ecConnStateTag(t.ValueInt64());
-            //}
-
-            public bool IsConnected()
-            {
-                return IsConnectedED2K() || IsConnectedKademlia();
-            }
-
-            public bool IsConnectedED2K()
-            {
-                return (m_tag_val & 0x01) != 0; 
-            }
-
-            public bool IsConnectingED2K()
-            {
-                return (m_tag_val & 0x02) != 0; 
-            }
-
-            public bool IsConnectedKademlia()
-            {
-                return (m_tag_val & 0x04) != 0; 
-            }
-
-            public bool IsKadFirewalled()
-            {
-                return (m_tag_val & 0x08) != 0; 
-            }
-
-            public bool IsKadRunning()
-            {
-                return (m_tag_val & 0x10) != 0; 
-            }
-
-            public ecProto.ecTag Server()
-            {
-                return m_tag.SubTag(ECTagNames.EC_TAG_SERVER);
-            }
-        }
-
-    }
-}

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/catalonia.xpm Deleted

@@ -1,154 +0,0 @@
-/* XPM */
-static const char *catalonia[] = {
-/* columns rows colors chars-per-pixel */
-"16 11 137 2",
-"   c #E71802",
-".  c #E61B06",
-"X  c #E61B0B",
-"o  c #F1380B",
-"O  c #F13A0E",
-"+  c #EF2511",
-"@  c #F23E13",
-"#  c #F23B14",
-"$  c #F43E20",
-"%  c #F34019",
-"&  c #F34319",
-"*  c #F0441B",
-"=  c #F4451F",
-"-  c #F4471E",
-";  c #E55918",
-":  c #E65A19",
-">  c #E75B1A",
-",  c #E85C1B",
-"<  c #F54325",
-"1  c #F34823",
-"2  c #F54C23",
-"3  c #F54924",
-"4  c #F6482B",
-"5  c #F64E2A",
-"6  c #F4492C",
-"7  c #F65029",
-"8  c #F6532C",
-"9  c #F7532F",
-"0  c #F7542E",
-"q  c #F74D30",
-"w  c #F85236",
-"e  c #F75831",
-"r  c #F65C37",
-"t  c #F85934",
-"y  c #F85835",
-"u  c #F85C37",
-"i  c #F9563C",
-"p  c #F95C3A",
-"a  c #F95E3A",
-"s  c #F9613D",
-"d  c #FA623F",
-"f  c #FA5B41",
-"g  c #FB5F46",
-"h  c #F76043",
-"j  c #FA6642",
-"k  c #FB6A47",
-"l  c #FA634D",
-"z  c #FC6E4C",
-"x  c #FD7151",
-"c  c #FD7554",
-"v  c #FE7859",
-"b  c #FE7B5C",
-"n  c #D0A409",
-"m  c #D1A50A",
-"M  c #D3A70C",
-"N  c #D6AA0F",
-"B  c #D7AB10",
-"V  c #D9AD12",
-"C  c #DBAF14",
-"Z  c #DDB116",
-"A  c #DEB217",
-"S  c #E0B419",
-"D  c #E3B71C",
-"F  c #E5B91E",
-"G  c #E8BC21",
-"H  c #EBBF24",
-"J  c #E4EC10",
-"K  c #E6ED15",
-"L  c #E3EB18",
-"P  c #E7EE1A",
-"I  c #E5EB1C",
-"U  c #E6EC1F",
-"Y  c #E8EF1F",
-"T  c #F3E41A",
-"R  c #F4E61F",
-"E  c #ECC025",
-"W  c #EEC227",
-"Q  c #EFC328",
-"!  c #F0C429",
-"~  c #F1C52A",
-"^  c #F3C72C",
-"/  c #F4C82D",
-"(  c #F5C92E",
-")  c #F6CA2F",
-"_  c #F7CB30",
-"`  c #F8CC31",
-"'  c #F9CD32",
-"]  c #FACE33",
-"[  c #FBCF34",
-"{  c #FCD035",
-"}  c #E6ED22",
-"|  c #E8EE27",
-" . c #E9EE2B",
-".. c #F5E725",
-"X. c #F3E628",
-"o. c #F6E92B",
-"O. c #EAF025",
-"+. c #EAF126",
-"@. c #EBF12B",
-"#. c #EBF22C",
-"$. c #F7EA30",
-"%. c #F8EB36",
-"&. c #F9EC3B",
-"*. c #EAF030",
-"=. c #EBF133",
-"-. c #ECF230",
-";. c #EDF332",
-":. c #EBF135",
-">. c #EEF335",
-",. c #EEF437",
-"<. c #ECF23A",
-"1. c #EFF43B",
-"2. c #ECF33E",
-"3. c #EDF33F",
-"4. c #EFF53D",
-"5. c #FAEE40",
-"6. c #EEF443",
-"7. c #EEF445",
-"8. c #EFF548",
-"9. c #EFF549",
-"0. c #F0F540",
-"q. c #F0F642",
-"w. c #F1F747",
-"e. c #F0F64D",
-"r. c #F2F74C",
-"t. c #F0F64E",
-"y. c #F1F652",
-"u. c #F2F756",
-"i. c #F3F851",
-"p. c #F3F955",
-"a. c #F3F85B",
-"s. c #F4F860",
-"d. c #F5F963",
-"f. c #F5FA67",
-"g. c #F6FA6A",
-"h. c #F6FB6D",
-"j. c #F6FB6F",
-/* pixels */
-"{ { { { { ] ` _ ) ^ Q Q E H G F ",
-"] j.j.j.g.f.d.a.a.u.y.r.9.6.2.D ",
-", b b b b x x z k j s p e 8 r + ",
-") p.p.p.p.i.r.w.6.4.,.-.#.+.=.Z ",
-"> l l l l l g f i w q 4 < $ 6 X ",
-") &.5.5.5.5.5.&.%.$.o...R T X.B ",
-"> h h h h h p y 9 5 2 1 % # 1 . ",
-"~ 6.4.0.0.1.>.-.@.| U P K J U M ",
-"> h j s p t 0 7 2 - % @ O o %   ",
-"W t.9.9.7.2.<.,.#. .| } U I L n ",
-"E E E G F D A A C V V N M m n n "
-};

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/cs.xpm Deleted

@@ -1,155 +0,0 @@
-/* XPM */
-static const char *cs[] = {
-/* columns rows colors chars-per-pixel */
-"16 11 138 2",
-"   c #000043",
-".  c #00004D",
-"X  c #00005D",
-"o  c #000061",
-"O  c #000063",
-"+  c #000067",
-"@  c #00006D",
-"#  c #000071",
-"$  c #000075",
-"%  c #000079",
-"&  c #00007B",
-"*  c #00007D",
-"=  c #DD0000",
-"-  c #DF0000",
-";  c #E10000",
-":  c #E30000",
-">  c #E50000",
-",  c #E70000",
-"<  c #E90000",
-"1  c #EB0000",
-"2  c #ED0000",
-"3  c #EF0000",
-"4  c #F10000",
-"5  c #F30000",
-"6  c #F50000",
-"7  c #F70000",
-"8  c #F90000",
-"9  c #F10B0B",
-"0  c #F10F0E",
-"q  c #F21313",
-"w  c #F31919",
-"e  c #F41E1E",
-"r  c #F52323",
-"t  c #F62929",
-"y  c #F22C2C",
-"u  c #F22F2F",
-"i  c #F72E2E",
-"p  c #FB2929",
-"a  c #F23232",
-"s  c #F33535",
-"d  c #F83434",
-"f  c #F43939",
-"g  c #F53D3D",
-"h  c #F93A3A",
-"j  c #FA3F3F",
-"k  c #F64242",
-"l  c #F74646",
-"z  c #FA4444",
-"x  c #F74B4B",
-"c  c #F85050",
-"v  c #F95455",
-"b  c #F95858",
-"n  c #FA5D5D",
-"m  c #F26363",
-"M  c #F26666",
-"N  c #FB6162",
-"B  c #FC6666",
-"V  c #F36A6A",
-"C  c #F46E6E",
-"Z  c #F57171",
-"A  c #F37777",
-"S  c #F67575",
-"D  c #F77879",
-"F  c #F87C7C",
-"G  c #000081",
-"H  c #000083",
-"J  c #000085",
-"K  c #000087",
-"L  c #000089",
-"P  c #000091",
-"I  c #2C2CA1",
-"U  c #3131A4",
-"Y  c #3737A7",
-"T  c #3535AF",
-"R  c #3D3CAA",
-"E  c #4242AD",
-"W  c #4949AE",
-"Q  c #4747B0",
-"!  c #4C4CB2",
-"~  c #4E4EB4",
-"^  c #5151B4",
-"/  c #5353B7",
-"(  c #5454B7",
-")  c #5857B9",
-"_  c #5959B8",
-"`  c #5C5CBA",
-"'  c #5C5CBB",
-"]  c #5F5FBB",
-"[  c #6160BE",
-"{  c #6A6ABE",
-"}  c #6565C0",
-"|  c #6969C2",
-" . c #6E6EC0",
-".. c #6D6DC3",
-"X. c #7272C2",
-"o. c #7070C5",
-"O. c #7676C4",
-"+. c #7474C7",
-"@. c #7A7AC6",
-"#. c #7F7FC6",
-"$. c #7777C8",
-"%. c #7979C9",
-"&. c #7B7BC8",
-"*. c #7B7BCA",
-"=. c #7D7DC9",
-"-. c #F98080",
-";. c #FA8484",
-":. c #FB8888",
-">. c #FB8B8B",
-",. c #FCA0A0",
-"<. c #8181CA",
-"1. c #8585CC",
-"2. c #8888CE",
-"3. c #8B8BCF",
-"4. c #8E8FD1",
-"5. c #9090D2",
-"6. c #A4A4DA",
-"7. c #E3C7C7",
-"8. c #E5C9C9",
-"9. c #E7CDCD",
-"0. c #FDE7E7",
-"q. c #FDE9E9",
-"w. c gray95",
-"e. c #F3F3F3",
-"r. c #F4F4F4",
-"t. c #F4F5F5",
-"y. c gray96",
-"u. c #F6F6F6",
-"i. c gray97",
-"p. c #F8F8F8",
-"a. c #F9F9F9",
-"s. c gray98",
-"d. c #FBFBFB",
-"f. c #FBFCFB",
-"g. c gray99",
-"h. c #FDFCFD",
-"j. c #FDFDFD",
-"k. c #FEFEFE",
-/* pixels */
-"P L L L L G G * & $ # @ + O X O ",
-"J *.*.*.O.+.o...| } [ ' ) / ~ . ",
-"G *.] ` ` / ^ ! Q E R Y U I W   ",
-"T 6.4.4.3.1.1.<.=.@.O.X.{ { #.& ",
-"q.k.k.k.g.g.d.p.d.i.i.i.i.y.y.9.",
-"q.k.f.k.g.d.d.d.i.i.y.i.y.e.y.8.",
-"0.k.d.d.d.d.p.p.i.i.i.w.w.w.y.7.",
-"p ,.>.:.;.-.F D S C C V M m A - ",
-"8 B z j h d i t r e w q 0 9 u - ",
-"8 N n b v c x l k g f s a u y = ",
-"6 4 4 2 2 2 < < > > : : - = = = "
-};

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/england.xpm Deleted

@@ -1,123 +0,0 @@
-/* XPM */
-static const char *england[] = {
-/* columns rows colors chars-per-pixel */
-"16 11 106 2",
-"   c #8D0000",
-".  c #910000",
-"X  c #970000",
-"o  c #9D0000",
-"O  c #A70000",
-"+  c #B90000",
-"@  c #BB0000",
-"#  c #BF0000",
-"$  c #CA2222",
-"%  c #CB2828",
-"&  c #CD2A2A",
-"*  c #CD2C2C",
-"=  c #CF3030",
-"-  c #CF3232",
-";  c #C93F3F",
-":  c #D13636",
-">  c #D13737",
-",  c #D33B3B",
-"<  c #D33C3C",
-"1  c #D14242",
-"2  c #D54242",
-"3  c #D34747",
-"4  c #D64747",
-"5  c #D74748",
-"6  c #D54C4C",
-"7  c #D84C4C",
-"8  c #D84D4D",
-"9  c #D15555",
-"0  c #DA5151",
-"q  c #DA5252",
-"w  c #DB5556",
-"e  c #DC5A5A",
-"r  c #D87070",
-"t  c #D97373",
-"y  c #DB7777",
-"u  c #DD7A7A",
-"i  c #DE7A7A",
-"p  c #E06E6E",
-"a  c #E27272",
-"s  c #E27777",
-"d  c #DD8181",
-"f  c #DD8484",
-"g  c #DE8585",
-"h  c #E28686",
-"j  c #E08888",
-"k  c #E28B8B",
-"l  c #E38B8B",
-"z  c #E48D8D",
-"x  c #E19393",
-"c  c #E69090",
-"v  c #E69493",
-"b  c #E79595",
-"n  c #E89696",
-"m  c #E99C9C",
-"M  c #E99F9F",
-"N  c #D1BFBF",
-"B  c #EAA1A1",
-"V  c #ECA4A4",
-"C  c #EDA9A9",
-"Z  c #EFB4B4",
-"A  c #CBCBCB",
-"S  c #CFCDCD",
-"D  c gray81",
-"F  c #D7CBCB",
-"G  c gray82",
-"H  c #D7D7D7",
-"J  c gray85",
-"K  c #DDDDDD",
-"L  c #DFDFDF",
-"P  c #E9DBDB",
-"I  c #E1E1E1",
-"U  c gray89",
-"Y  c gray90",
-"T  c #E7E7E7",
-"R  c #EDE5E5",
-"E  c #E9E9E9",
-"W  c gray92",
-"Q  c gray93",
-"!  c #F2EBEB",
-"~  c #F3EDED",
-"^  c #F4EEEE",
-"/  c #EFEFF1",
-"(  c #F1F1F1",
-")  c gray95",
-"_  c #F2F2F3",
-"`  c #F3F3F3",
-"'  c #F6F1F1",
-"]  c #F7F1F1",
-"[  c #F4F4F4",
-"{  c gray96",
-"}  c #F6F6F6",
-"|  c gray97",
-" . c #F9F2F2",
-".. c #F8F3F3",
-"X. c #FAF5F5",
-"o. c #FBF5F5",
-"O. c #FBF6F6",
-"+. c #F8F8F8",
-"@. c #F9F9F9",
-"#. c gray98",
-"$. c #FBFBFB",
-"%. c #FCF8F8",
-"&. c gray99",
-"*. c #FDFDFD",
-"=. c #FEFEFE",
-"-. c gray100",
-/* pixels */
-"( ( ( ( Q / R @ @ P E T Y U I L ",
-"( -.-.-.-.-.&.a p o.$.$.+.+.} K ",
-"Q -.-.-.-.&.O.q 8 ..$.+.} } | J ",
-"( -.$.-.&.-.o.6 4 ..o.} } } } H ",
-"9 Z V B M M b 4 2 z z j g d x O ",
-"# s e w 8 6 4 2 < - - % % $ 1   ",
-"1 C b v c z h , > u u y t t g o ",
-"W &.&.$.$.$.' : - ^ } [ ( ( ( D ",
-"W $.$.$.@.@.' = & ! ( ( ( ( [ A ",
-"E $.@.@.@.@.' 6 3 ~ } ( [ ( ( A ",
-"T Y U I L K F X . N G D D A A A "
-};

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/europeanunion.xpm Deleted

@@ -1,153 +0,0 @@
-/* XPM */
-static const char *europeanunion[] = {
-/* columns rows colors chars-per-pixel */
-"16 11 136 2",
-"   c #333A66",
-".  c #333B67",
-"X  c #343B67",
-"o  c #343B68",
-"O  c #343C69",
-"+  c #353C6B",
-"@  c #353C6C",
-"#  c #353D6C",
-"$  c #363D6C",
-"%  c #363E6D",
-"&  c #373E6E",
-"*  c #383F6F",
-"=  c #394071",
-"-  c #394172",
-";  c #3A4173",
-":  c #3A4274",
-">  c #3B4275",
-",  c #3C4377",
-"<  c #3D4477",
-"1  c #3D4478",
-"2  c #3E4579",
-"3  c #3E457A",
-"4  c #3F467B",
-"5  c #41487F",
-"6  c #DBBC3F",
-"7  c #E2CD70",
-"8  c #E3CE74",
-"9  c #E4D078",
-"0  c #E4D07A",
-"q  c #3F4A86",
-"w  c #3F4B87",
-"e  c #424982",
-"r  c #444B85",
-"t  c #454C86",
-"y  c #404B89",
-"u  c #414C8A",
-"i  c #464D8A",
-"p  c #474D8A",
-"a  c #424D8D",
-"s  c #424E8E",
-"d  c #434E8E",
-"f  c #424E8F",
-"g  c #474F8D",
-"h  c #484F8D",
-"j  c #434F90",
-"k  c #444F91",
-"l  c #445091",
-"z  c #445191",
-"x  c #455293",
-"c  c #465396",
-"v  c #465397",
-"b  c #4A5190",
-"n  c #4B5293",
-"m  c #4C5394",
-"M  c #4D5495",
-"N  c #4E5596",
-"B  c #465398",
-"V  c #475399",
-"C  c #475499",
-"Z  c #49559B",
-"A  c #4F5598",
-"S  c #4F5599",
-"D  c #4F5699",
-"F  c #49559C",
-"G  c #49559D",
-"H  c #49569D",
-"J  c #50569B",
-"K  c #757788",
-"L  c #75788B",
-"P  c #75798B",
-"I  c #797C92",
-"U  c #7A7D95",
-"Y  c #4956A0",
-"T  c #4957A0",
-"R  c #4957A1",
-"E  c #4A56A1",
-"W  c #4B57A1",
-"Q  c #4B5AA0",
-"!  c #4B5AA1",
-"~  c #4B59A3",
-"^  c #4B5BA2",
-"/  c #4B5AA3",
-"(  c #4C5BA2",
-")  c #4C5BA3",
-"_  c #4C5BA5",
-"`  c #4D5BA6",
-"'  c #4D5BA7",
-"]  c #4E5DA5",
-"[  c #4C5CA7",
-"{  c #4D5CA7",
-"}  c #4E5EA6",
-"|  c #4D5CA8",
-" . c #4D5DA8",
-".. c #4D5CA9",
-"X. c #4E5DAA",
-"o. c #4E5DAB",
-"O. c #4F5FAC",
-"+. c #505FAF",
-"@. c #4F60A8",
-"#. c #5161AA",
-"$. c #5362AD",
-"%. c #5060AF",
-"&. c #5364AC",
-"*. c #5364AD",
-"=. c #5364AF",
-"-. c #5161B0",
-";. c #5262B2",
-":. c #5262B3",
-">. c #5666B1",
-",. c #5667B1",
-"<. c #5363B4",
-"1. c #5464B5",
-"2. c #5464B7",
-"3. c #5769B2",
-"4. c #5768B5",
-"5. c #5969B4",
-"6. c #596BB5",
-"7. c #5464B8",
-"8. c #5564BA",
-"9. c #5666BB",
-"0. c #5767BC",
-"q. c #5767BE",
-"w. c #5B6DB9",
-"e. c #5C6FB9",
-"r. c #5E71BC",
-"t. c #5E72BD",
-"y. c #6175C0",
-"u. c #6175C5",
-"i. c #6377C4",
-"p. c #6378C4",
-"a. c #647AC6",
-"s. c #657BC9",
-"d. c #677CCB",
-"f. c #677DCB",
-"g. c #7D809A",
-"h. c #7F84A1",
-/* pixels */
-"D J D M m b h p t e 5 4 < : = % ",
-"D u.s.s.a.p.y.r.r.3.1.*.@.} c * ",
-"M f.q.q.8.1.%.g.9 U H c l d ^ % ",
-"n d.8.8.1.<.0 o.[ H 0 c j d ( % ",
-"b a.8.1.1.h.%.o._ W H L j d ^ % ",
-"h p.1.-.-.0 o.o.~ H B 6 j d ^ + ",
-"p y.%.-.-.U o._ W G B K j w ^ + ",
-"r t.o.o.o.[ 8 W H B 8 j d q W . ",
-"e w._ _ } ( H I 7 K z d u q H % ",
-"e $.6.3.3.3.1.%.&.+.@.( ^ W z . ",
-"5 2 4 4 < 4 , , : : * % % X X . "
-};

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/fam.xpm Deleted

@@ -1,176 +0,0 @@
-/* XPM */
-static const char *fam[] = {
-/* columns rows colors chars-per-pixel */
-"16 11 159 2",
-"   c #E30000",
-".  c #E50000",
-"X  c #E70000",
-"o  c #E90000",
-"O  c #EB0000",
-"+  c #ED0000",
-"@  c #F70011",
-"#  c #F90017",
-"$  c #FB001F",
-"%  c #FD0025",
-"&  c #FD0029",
-"*  c #FD002F",
-"=  c #F32267",
-"-  c #F4276B",
-";  c #F4286B",
-":  c #F52C6E",
-">  c #F52D6F",
-",  c #F72E6F",
-"<  c #F63172",
-"1  c #F63273",
-"2  c #F63373",
-"3  c #F73777",
-"4  c #F83473",
-"5  c #F73877",
-"6  c #F93B77",
-"7  c #F73978",
-"8  c #F83C7A",
-"9  c #F83D7B",
-"0  c #F83E7B",
-"q  c #F83F7C",
-"w  c #F4417C",
-"e  c #F5457F",
-"r  c #FA407C",
-"t  c #F9427E",
-"y  c #F9437F",
-"u  c #53C900",
-"i  c #63D100",
-"p  c #67D300",
-"a  c #69D300",
-"s  c #69D500",
-"d  c #69D700",
-"f  c #6DD700",
-"g  c #71D900",
-"h  c #75DB00",
-"j  c #7FE100",
-"k  c #8FE500",
-"l  c #95EB00",
-"z  c #99EF00",
-"x  c #9DEF00",
-"c  c #A1ED00",
-"v  c #A1F100",
-"b  c #A3F300",
-"n  c #BFF14B",
-"m  c #C1F14E",
-"M  c #C1F24F",
-"N  c #C2F251",
-"B  c #C3F252",
-"V  c #C3F253",
-"C  c #C5F356",
-"Z  c #C6F356",
-"A  c #C6F357",
-"S  c #C7F45A",
-"D  c #C8F45A",
-"F  c #C8F45C",
-"G  c #C9F55E",
-"H  c #CAF55F",
-"J  c #C8F263",
-"K  c #CAF560",
-"L  c #CBF663",
-"P  c #C8F265",
-"I  c #CCF664",
-"U  c #CCF665",
-"Y  c #C9F268",
-"T  c #C9F368",
-"R  c #CAF36A",
-"E  c #CBF46B",
-"W  c #CDF768",
-"Q  c #CEF769",
-"!  c #CDF56F",
-"~  c #CFF86E",
-"^  c #CFF573",
-"/  c #D1F676",
-"(  c #D3F77A",
-")  c #D4F77E",
-"_  c #F94480",
-"`  c #FB4680",
-"'  c #F64982",
-"]  c #F74B82",
-"[  c #F74E85",
-"{  c #FA4883",
-"}  c #FA4983",
-"|  c #FA4984",
-" . c #FC4B84",
-".. c #FB4D87",
-"X. c #FB4E87",
-"o. c #FB4F88",
-"O. c #FD5188",
-"+. c #FC538A",
-"@. c #FC538B",
-"#. c #F8568C",
-"$. c #FD588E",
-"%. c #FD5C91",
-"&. c #FB6798",
-"*. c #FC6B9B",
-"=. c #FC6F9E",
-"-. c #FD74A0",
-";. c #FD77A3",
-":. c #FE7AA5",
-">. c #00A7EF",
-",. c #00ABE9",
-"<. c #00A9F1",
-"1. c #00ADF3",
-"2. c #00B1F5",
-"3. c #00B3F7",
-"4. c #00B5F9",
-"5. c #00B9FB",
-"6. c #00BBFD",
-"7. c #00BFFD",
-"8. c #00C5F3",
-"9. c #00C1FD",
-"0. c #00C3FF",
-"q. c #3BD8F9",
-"w. c #46D7FA",
-"e. c #41DAFA",
-"r. c #47DCFB",
-"t. c #4CD8FA",
-"y. c #4CD9FB",
-"u. c #4CDDFC",
-"i. c #51D9FB",
-"p. c #51DAFB",
-"a. c #55DDF9",
-"s. c #56DBFC",
-"d. c #52DFFD",
-"f. c #56DCFC",
-"g. c #5FDCF9",
-"h. c #5BDCFD",
-"j. c #5BDDFD",
-"k. c #5FDDFE",
-"l. c #5EDEFE",
-"z. c #64DDFA",
-"x. c #63DFFE",
-"c. c #68DEFB",
-"v. c #6DDFFC",
-"b. c #56E0FD",
-"n. c #5BE2FE",
-"m. c #63E0FE",
-"M. c #66E0FE",
-"N. c #71E1FC",
-"B. c #75E2FD",
-"V. c #78E2FE",
-"C. c #7BE4FE",
-"Z. c #7FE5FE",
-"A. c #7FE6FE",
-"S. c #79E8FE",
-"D. c #D6F881",
-"F. c #D8F985",
-"G. c #D8FA89",
-"H. c #80E6FF",
-"J. c #81E6FF",
-/* pixels */
-"0.0.0.0.8.* & % $ # @ b c v x z ",
-"0.J.J.A.S.:.;.-.=.*.&.G.F.D.) l ",
-"0.A.M.m.n.%.+.+.+.| _ ! Q U ( k ",
-"0.A.x.l.f.$. .X.` ` q W U K / j ",
-"0.C.l.j.d.+.` { t q 7 K H H ^ h ",
-"6.C.j.f.u...t t q 7 2 H D A ! g ",
-"6.B.s.i.r.` 6 9 5 2 > S A N E f ",
-"5.N.i.t.e.t 2 7 2 > ; A N N P s ",
-"4.N.t.w.q.8 > 2 : - = N n n P p ",
-"3.z.z.g.f.#.' [ ' e w R R P P s ",
-"3.1.<.>.,.+ O O X X   d a p i u "
-};

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/scotland.xpm Deleted

@@ -1,160 +0,0 @@
-/* XPM */
-static const char *scotland[] = {
-/* columns rows colors chars-per-pixel */
-"16 11 143 2",
-"   c #000061",
-".  c #000065",
-"X  c #000075",
-"o  c #000077",
-"O  c #000081",
-"+  c #000083",
-"@  c #000085",
-"#  c #000087",
-"$  c #000189",
-"%  c #000589",
-"&  c #00078B",
-"*  c #00058F",
-"=  c #000D8F",
-"-  c #000091",
-";  c #000D93",
-":  c #001393",
-">  c #00159D",
-",  c #001F9B",
-"<  c #00239F",
-"1  c #002FA9",
-"2  c #002FAB",
-"3  c #0055A5",
-"4  c #0045B1",
-"5  c #0047B1",
-"6  c #0049B3",
-"7  c #004BB3",
-"8  c #004FB5",
-"9  c #0051B7",
-"0  c #0053B7",
-"q  c #0055B9",
-"w  c #0057B9",
-"e  c #005BBD",
-"r  c #005DBD",
-"t  c #005FBF",
-"y  c #1957B4",
-"u  c #1058B2",
-"i  c #1E5DB7",
-"p  c #254CB0",
-"a  c #0061AD",
-"s  c #1470BF",
-"d  c #2560B9",
-"f  c #266CBE",
-"g  c #2E6ABE",
-"h  c #3375BF",
-"j  c #3970BF",
-"k  c #1D7DC3",
-"l  c #1A7DC4",
-"z  c #2077C1",
-"x  c #2375C2",
-"c  c #2A72C1",
-"v  c #2F76C3",
-"b  c #2A78C3",
-"n  c #2978C4",
-"m  c #4B6BC0",
-"M  c #4277C4",
-"N  c #427FCA",
-"B  c #497DC8",
-"V  c #1F80C6",
-"C  c #2583C3",
-"Z  c #3D8DC5",
-"A  c #358AC9",
-"S  c #368EC9",
-"D  c #3B8ECB",
-"F  c #3D8ECC",
-"G  c #3F93CD",
-"H  c #4480C7",
-"J  c #4783CB",
-"K  c #4983CA",
-"L  c #468ACE",
-"P  c #478FCF",
-"I  c #5081C8",
-"U  c #5182CA",
-"Y  c #5483CC",
-"T  c #4793CB",
-"R  c #4294CE",
-"E  c #4697D0",
-"W  c #4C92D1",
-"Q  c #4B96D1",
-"!  c #4F96D4",
-"~  c #4F9ED6",
-"^  c #4B9BD9",
-"/  c #5C92D2",
-"(  c #559ED2",
-")  c #559FD3",
-"_  c #549ED5",
-"`  c #589CD6",
-"'  c #5C9FD6",
-"]  c #618FD0",
-"[  c #6A9ED6",
-"{  c #749DD7",
-"}  c #53A1D8",
-"|  c #67A8D7",
-" . c #65A8D9",
-".. c #68AAD8",
-"X. c #69ACDD",
-"o. c #6DAEDD",
-"O. c #79A5DB",
-"+. c #70AEDD",
-"@. c #6FB0DE",
-"#. c #72B1DD",
-"$. c #72B0DF",
-"%. c #77B0DF",
-"&. c #79B3DF",
-"*. c #76B4E0",
-"=. c #7DB9E3",
-"-. c #80B6D9",
-";. c #83BCE2",
-":. c #8EBFE2",
-">. c #91C0E1",
-",. c #92C3E6",
-"<. c #9DC9E8",
-"1. c #AFCDE4",
-"2. c #D2D4D4",
-"3. c gray83",
-"4. c #DDDDDD",
-"5. c #C5DBEB",
-"6. c #C4DDF0",
-"7. c #D5E7F4",
-"8. c gray88",
-"9. c #E2E2E2",
-"0. c #E6F0F5",
-"q. c #E8F0F3",
-"w. c #ECF1F2",
-"e. c #ECF3F6",
-"r. c #EEF5F7",
-"t. c #EAF3F8",
-"y. c #F1F1F1",
-"u. c gray95",
-"i. c #F3F3F3",
-"p. c #F4F4F4",
-"a. c gray96",
-"s. c #F6F6F6",
-"d. c gray97",
-"f. c #F4F8F9",
-"g. c #F5FBFC",
-"h. c #F8F8F8",
-"j. c #F9F9F9",
-"k. c gray98",
-"l. c #FBFBFB",
-"z. c gray99",
-"x. c #FDFDFD",
-"c. c #FEFEFE",
-"v. c gray100",
-/* pixels */
-"9.9.^ 2 6 r q 0 6 5 4 < - k 4.2.",
-"=.v.v.g.+.{ +.+.o. .] ' r.h.d.Z ",
-"1 ,.v.v.v.<.U W P M :.h.j.d.| o ",
-"r O./ 7.l.v.t.K N 0.h.d.5.f N ; ",
-"e *._ Y ;.x.l.j.j.d.d.| d f G & ",
-"w $.} ~ m L j.j.f.d.n p k l G % ",
-"0 @.! B +.l.j.j.j.d.d.( y s S o ",
-"8 [ K 6.l.j.e.v f q.p.i.1.u h @ ",
-"> &.j.j.j.>.g n x i -.i.i.y.T   ",
-") v.j.f._ I Q Q R G j A q.u.u.a ",
-"9.8.C @ * , : = & @ $ o   3 3.3."
-};

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/wales.xpm Deleted

@@ -1,179 +0,0 @@
-/* XPM */
-static const char *wales[] = {
-/* columns rows colors chars-per-pixel */
-"16 11 162 2",
-"   c #002500",
-".  c #002F00",
-"X  c #003100",
-"o  c #003300",
-"O  c #003500",
-"+  c #003700",
-"@  c #003900",
-"#  c #003F00",
-"$  c #004100",
-"%  c #004700",
-"&  c #004D00",
-"*  c #005100",
-"=  c #005700",
-"-  c #005D00",
-";  c #006100",
-":  c #006700",
-">  c #006D00",
-",  c #006F00",
-"<  c #007500",
-"1  c #007900",
-"2  c #037F00",
-"3  c #7B711F",
-"4  c #F41F1F",
-"5  c #CD2725",
-"6  c #CC2C25",
-"7  c #C3382B",
-"8  c #C63B2A",
-"9  c #CD3737",
-"0  c #DB3736",
-"q  c #D93C37",
-"w  c #DA3C36",
-"e  c #D13C3D",
-"r  c #D13F3C",
-"t  c #EC242C",
-"y  c #F62A3B",
-"u  c #A3411B",
-"i  c #BE412F",
-"p  c #9E6B39",
-"a  c #B3663E",
-"s  c #C54E38",
-"d  c #D5413B",
-"f  c #D2443C",
-"g  c #DD3F42",
-"h  c #E53D44",
-"j  c #F43A4A",
-"k  c #9E7440",
-"l  c #B56948",
-"z  c #BA6A49",
-"x  c #CE4142",
-"c  c #C04B4B",
-"v  c #CF4A49",
-"b  c #D54242",
-"n  c #DB4740",
-"m  c #D84840",
-"M  c #DA5145",
-"N  c #D1544B",
-"B  c #D5554A",
-"V  c #DF574D",
-"C  c #D5594E",
-"Z  c #C95B51",
-"A  c #D25151",
-"S  c #D25551",
-"D  c #DE5454",
-"F  c #E34146",
-"G  c #E74B4F",
-"H  c #E3504F",
-"J  c #E05D58",
-"K  c #D1665E",
-"L  c #D86559",
-"P  c #C7755D",
-"I  c #ED5864",
-"U  c #DB7474",
-"Y  c #D97972",
-"T  c #E26D65",
-"R  c #F3626D",
-"E  c #098300",
-"W  c #3CA118",
-"Q  c #3FA521",
-"!  c #459F1C",
-"~  c #41A21C",
-"^  c #568E22",
-"/  c #4A9C20",
-"(  c #738C2E",
-")  c #7F8D3A",
-"_  c #7A9537",
-"`  c #46A727",
-"'  c #59AB32",
-"]  c #5CA939",
-"[  c #5FA938",
-"{  c #4ABD3F",
-"}  c #61AB37",
-"|  c #60A93A",
-" . c #65AE3D",
-".. c #7A9541",
-"X. c #68AE43",
-"o. c #6FB24B",
-"O. c #76B851",
-"+. c #7AB957",
-"@. c #7BBB57",
-"#. c #7EBB5C",
-"$. c #7FBE5C",
-"%. c #948747",
-"&. c #9E8F4D",
-"*. c #E1827B",
-"=. c #89C269",
-"-. c #8CC36D",
-";. c #8FC671",
-":. c #93C875",
-">. c #95C97A",
-",. c #A2B794",
-"<. c #E68682",
-"1. c #E28E86",
-"2. c #F4849A",
-"3. c #E99991",
-"4. c #E3A6A1",
-"5. c #EBB3AD",
-"6. c #E9B3AF",
-"7. c #E3BBB7",
-"8. c #E7BBB7",
-"9. c #EDB8B4",
-"0. c #E7BCBB",
-"q. c #AED19E",
-"w. c #CDCDCD",
-"e. c gray81",
-"r. c gray82",
-"t. c #D5D5D5",
-"y. c #D7D7D7",
-"u. c #D7DBD9",
-"i. c gray85",
-"p. c gray86",
-"a. c gray87",
-"s. c #EEC4C1",
-"d. c #E8CAC8",
-"f. c #EACCC8",
-"g. c #EBCCC9",
-"h. c #EED0CB",
-"j. c #EDDDDC",
-"k. c #EEDFDD",
-"l. c #F2D9D8",
-"z. c #DEEEDD",
-"x. c #EFE0DE",
-"c. c #E1F2DC",
-"v. c gray88",
-"b. c #E1E1E1",
-"n. c #E3E0E0",
-"m. c gray89",
-"M. c #E5E5E7",
-"N. c #E7E7E7",
-"B. c #E7F6E7",
-"V. c #EEF6F6",
-"C. c gray96",
-"Z. c #F7F6F6",
-"A. c gray97",
-"S. c #FAF8F7",
-"D. c #F8F8F8",
-"F. c #FCFCFB",
-"G. c gray99",
-"H. c #FDFDFD",
-"J. c #FDFEFE",
-"K. c #FEFEFE",
-"L. c #FEFFFE",
-"P. c gray100",
-/* pixels */
-"N.N.N.N.N.M.j.b.m.b.b.a.u.u.u.y.",
-"N.L.L.l.3.U d.J.J.1.6.s.x.A.C.y.",
-"N.L.8.4.K D 9.L.N b e 9 C.L g.r.",
-"N.F.7.L.d.A S.6.x C 0 j.0.7 k.e.",
-"N.L.J L.<.c h.*.f 0 Y V.6 2.C.e.",
-"q.c.R B.N S n d M q n T H %.z.,.",
-"E >.$.v G V h h f s t 4 ^ Q X.+ ",
-"2 :.+.&.z j a ) y ( ` 3 5 ! ' + ",
-"1 ;.O.{ p _  .| i 7 / ~ u W [ X ",
-"< -.-.I P #.+.Z l o...g p ] [   ",
-", , : ; ; - * & % $ $ @ + X . . "
-};

aMule-2.2.6.tar.bz2/src/remote-gui.net Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/AboutBox.Designer.cs Deleted

@@ -1,186 +0,0 @@
-namespace amule.net {
-    partial class AboutBox {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        protected override void Dispose(bool disposing)
-        {
-            if ( disposing && (components != null) ) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutBox));
-            this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
-            this.logoPictureBox = new System.Windows.Forms.PictureBox();
-            this.labelProductName = new System.Windows.Forms.Label();
-            this.labelVersion = new System.Windows.Forms.Label();
-            this.labelCopyright = new System.Windows.Forms.Label();
-            this.labelCompanyName = new System.Windows.Forms.Label();
-            this.okButton = new System.Windows.Forms.Button();
-            this.textBoxDescription = new System.Windows.Forms.TextBox();
-            this.tableLayoutPanel.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // tableLayoutPanel
-            // 
-            this.tableLayoutPanel.AutoSize = true;
-            this.tableLayoutPanel.ColumnCount = 2;
-            this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33F));
-            this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 67F));
-            this.tableLayoutPanel.Controls.Add(this.logoPictureBox, 0, 0);
-            this.tableLayoutPanel.Controls.Add(this.labelProductName, 1, 0);
-            this.tableLayoutPanel.Controls.Add(this.labelVersion, 1, 1);
-            this.tableLayoutPanel.Controls.Add(this.labelCopyright, 1, 2);
-            this.tableLayoutPanel.Controls.Add(this.labelCompanyName, 1, 3);
-            this.tableLayoutPanel.Controls.Add(this.textBoxDescription, 1, 4);
-            this.tableLayoutPanel.Controls.Add(this.okButton, 1, 5);
-            this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel.Location = new System.Drawing.Point(9, 9);
-            this.tableLayoutPanel.Name = "tableLayoutPanel";
-            this.tableLayoutPanel.RowCount = 6;
-            this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
-            this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
-            this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
-            this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
-            this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 10F));
-            this.tableLayoutPanel.Size = new System.Drawing.Size(461, 265);
-            this.tableLayoutPanel.TabIndex = 0;
-            // 
-            // logoPictureBox
-            // 
-            this.logoPictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.logoPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("logoPictureBox.Image")));
-            this.logoPictureBox.Location = new System.Drawing.Point(3, 3);
-            this.logoPictureBox.Name = "logoPictureBox";
-            this.tableLayoutPanel.SetRowSpan(this.logoPictureBox, 6);
-            this.logoPictureBox.Size = new System.Drawing.Size(146, 259);
-            this.logoPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.logoPictureBox.TabIndex = 12;
-            this.logoPictureBox.TabStop = false;
-            // 
-            // labelProductName
-            // 
-            this.labelProductName.AutoSize = true;
-            this.labelProductName.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelProductName.Location = new System.Drawing.Point(158, 0);
-            this.labelProductName.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
-            this.labelProductName.MaximumSize = new System.Drawing.Size(0, 17);
-            this.labelProductName.Name = "labelProductName";
-            this.labelProductName.Size = new System.Drawing.Size(300, 17);
-            this.labelProductName.TabIndex = 19;
-            this.labelProductName.Text = "aMule remote control";
-            this.labelProductName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // labelVersion
-            // 
-            this.labelVersion.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelVersion.Location = new System.Drawing.Point(158, 26);
-            this.labelVersion.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
-            this.labelVersion.MaximumSize = new System.Drawing.Size(0, 17);
-            this.labelVersion.Name = "labelVersion";
-            this.labelVersion.Size = new System.Drawing.Size(300, 17);
-            this.labelVersion.TabIndex = 0;
-            this.labelVersion.Text = "Version 0.0.1";
-            this.labelVersion.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // labelCopyright
-            // 
-            this.labelCopyright.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelCopyright.Location = new System.Drawing.Point(158, 52);
-            this.labelCopyright.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
-            this.labelCopyright.MaximumSize = new System.Drawing.Size(0, 17);
-            this.labelCopyright.Name = "labelCopyright";
-            this.labelCopyright.Size = new System.Drawing.Size(300, 17);
-            this.labelCopyright.TabIndex = 21;
-            this.labelCopyright.Text = "Copyright (c) 2007-2009 aMule Team";
-            this.labelCopyright.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // labelCompanyName
-            // 
-            this.labelCompanyName.AutoSize = true;
-            this.labelCompanyName.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelCompanyName.Location = new System.Drawing.Point(158, 78);
-            this.labelCompanyName.Margin = new System.Windows.Forms.Padding(6, 0, 3, 0);
-            this.labelCompanyName.MaximumSize = new System.Drawing.Size(0, 17);
-            this.labelCompanyName.Name = "labelCompanyName";
-            this.labelCompanyName.Size = new System.Drawing.Size(300, 17);
-            this.labelCompanyName.TabIndex = 22;
-            this.labelCompanyName.Text = "Copyright (c) 2007-2009 Froenchenko Lenid l(froen@gmail.com)";
-            this.labelCompanyName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // okButton
-            // 
-            this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.okButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.okButton.Location = new System.Drawing.Point(383, 239);
-            this.okButton.Name = "okButton";
-            this.okButton.Size = new System.Drawing.Size(75, 23);
-            this.okButton.TabIndex = 24;
-            this.okButton.Text = "&OK";
-            // 
-            // textBoxDescription
-            // 
-            this.textBoxDescription.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.textBoxDescription.Location = new System.Drawing.Point(158, 107);
-            this.textBoxDescription.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
-            this.textBoxDescription.Multiline = true;
-            this.textBoxDescription.Name = "textBoxDescription";
-            this.textBoxDescription.ReadOnly = true;
-            this.textBoxDescription.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxDescription.Size = new System.Drawing.Size(300, 126);
-            this.textBoxDescription.TabIndex = 23;
-            this.textBoxDescription.TabStop = false;
-            this.textBoxDescription.Text = "Description";
-            // 
-            // AboutBox
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(479, 283);
-            this.Controls.Add(this.tableLayoutPanel);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "AboutBox";
-            this.Padding = new System.Windows.Forms.Padding(9);
-            this.ShowIcon = false;
-            this.ShowInTaskbar = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.Text = "About amule.net";
-            this.tableLayoutPanel.ResumeLayout(false);
-            this.tableLayoutPanel.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.logoPictureBox)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
-        private System.Windows.Forms.PictureBox logoPictureBox;
-        private System.Windows.Forms.Label labelProductName;
-        private System.Windows.Forms.Label labelVersion;
-        private System.Windows.Forms.Label labelCopyright;
-        private System.Windows.Forms.Label labelCompanyName;
-        private System.Windows.Forms.Button okButton;
-        private System.Windows.Forms.TextBox textBoxDescription;
-    }
-}

aMule-2.2.6.tar.bz2/src/remote-gui.net/AboutBox.cs Deleted

@@ -1,112 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Windows.Forms;
-using System.Reflection;
-
-namespace amule.net {
-    partial class AboutBox : Form {
-        public AboutBox()
-        {
-            InitializeComponent();
-
-            //  Initialize the AboutBox to display the product information from the assembly information.
-            //  Change assembly information settings for your application through either:
-            //  - Project->Properties->Application->Assembly Information
-            //  - AssemblyInfo.cs
-            this.Text = String.Format("About {0}", AssemblyTitle);
-            this.labelProductName.Text = AssemblyProduct;
-            this.labelVersion.Text = String.Format("Version {0}", AssemblyVersion);
-            this.labelCopyright.Text = AssemblyCopyright;
-            this.labelCompanyName.Text = AssemblyCompany;
-            this.textBoxDescription.Text = AssemblyDescription;
-        }
-
-        #region Assembly Attribute Accessors
-
-        public string AssemblyTitle
-        {
-            get
-            {
-                // Get all Title attributes on this assembly
-                object[] attributes = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyTitleAttribute), false);
-                // If there is at least one Title attribute
-                if ( attributes.Length > 0 ) {
-                    // Select the first one
-                    AssemblyTitleAttribute titleAttribute = (AssemblyTitleAttribute)attributes[0];
-                    // If it is not an empty string, return it
-                    if ( titleAttribute.Title != "" )
-                        return titleAttribute.Title;
-                }
-                // If there was no Title attribute, or if the Title attribute was the empty string, return the .exe name
-                return System.IO.Path.GetFileNameWithoutExtension(Assembly.GetExecutingAssembly().CodeBase);
-            }
-        }
-
-        public string AssemblyVersion
-        {
-            get
-            {
-                return Assembly.GetExecutingAssembly().GetName().Version.ToString();
-            }
-        }
-
-        public string AssemblyDescription
-        {
-            get
-            {
-                // Get all Description attributes on this assembly
-                object[] attributes = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyDescriptionAttribute), false);
-                // If there aren't any Description attributes, return an empty string
-                if ( attributes.Length == 0 )
-                    return "";
-                // If there is a Description attribute, return its value
-                return ((AssemblyDescriptionAttribute)attributes[0]).Description;
-            }
-        }
-
-        public string AssemblyProduct
-        {
-            get
-            {
-                // Get all Product attributes on this assembly
-                object[] attributes = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyProductAttribute), false);
-                // If there aren't any Product attributes, return an empty string
-                if ( attributes.Length == 0 )
-                    return "";
-                // If there is a Product attribute, return its value
-                return ((AssemblyProductAttribute)attributes[0]).Product;
-            }
-        }
-
-        public string AssemblyCopyright
-        {
-            get
-            {
-                // Get all Copyright attributes on this assembly
-                object[] attributes = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false);
-                // If there aren't any Copyright attributes, return an empty string
-                if ( attributes.Length == 0 )
-                    return "";
-                // If there is a Copyright attribute, return its value
-                return ((AssemblyCopyrightAttribute)attributes[0]).Copyright;
-            }
-        }
-
-        public string AssemblyCompany
-        {
-            get
-            {
-                // Get all Company attributes on this assembly
-                object[] attributes = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyCompanyAttribute), false);
-                // If there aren't any Company attributes, return an empty string
-                if ( attributes.Length == 0 )
-                    return "";
-                // If there is a Company attribute, return its value
-                return ((AssemblyCompanyAttribute)attributes[0]).Company;
-            }
-        }
-        #endregion
-    }
-}

aMule-2.2.6.tar.bz2/src/remote-gui.net/AboutBox.resx Deleted

@@ -1,610 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="logoPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAHgAAAEGCAIAAAAhWcaAAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAcQNJREFUeF7tfQdc
-        lFfa/ez/K/tlExUVmN7ovQ1D74Kg2BWs2CvYEVEEG0VALHTpAip2xd57jzHGmF5MsokxdbPV/XY13//c
-        9xleX2YAMTGJZnfy/PiNiATOnDn3POXe+xtZpew3v/mNCP/9v9/85j9+g4+i/xDhyf/7z//HnvzXb0T/
-        yf7InuOvfiNij/8TiR6KRN+L/u/h/7EnDwTPv2fP2Sf/T/T9599///r3D28/nDFsRp8+fezt7f8f98D/
-        zuiBb8l+hl/3A0DLK+WKKoWyWqmsUapqVeqNanW9WrNJo23SardptTu1VnusrA9YWx+2tj5qbXPCxuYU
-        Fydt8Nz6GPd5/G2ztdUuK6vtVlZbray2WFk1WllttLKqs9LkalSjVXJ3eW5u7htvvPHnP//5r3/96/37
-        9//3f//3H//4xz//+c8HDx48fPjwe+7xf7/ehwgoy6sMQKtqVAzoWrWmTqOp12gbtNpGrdVmDrhtVlY7
-        raz3Wlvvs7Y+aG19xJpBzEcL1ta7ra12tMJaW6vV1mjV2WrlcKXMSVZSUvLJJ5/8C8LNgCY6M5RrWlCu
-        02g3alnUa60aOHpusmKIN7UgvodDHEQ+xIGOANZ4AfDJvdZ4SYS8ZlhXa7VVWvVStXKQUmYl27x58x//
-        +Md/KbhFQFlRbQAaXFbXMTo/QrneyooPHnEQHPpAHOcRB8oIQE9YQ0bwBS0aYsC6Uqut0KrmqxSRiqSk
-        pBMnTvBw//3vf/91i4lIUalQVilV1RydazjR2GgA+hHERnAbIQ5d3sWpSjOHMgVhjb/CmwDvho1WBqwr
-        tNoNWm2JVjVFJfeRr1q16t133xXCDeE20u5fh26LFGUKRQXDmqFcq0Fo67QsNmrbBtqU4CQp4PgOK2i0
-        AXGADugh2bQ8GmFdrtWWaTWZGuUwpcxW1tTU9Ic//AFw/+Uvf/nb3/4Gdv/61kmRYo1CuV6pKlWpylXq
-        SrWmWqOpYVgzzyAMIakfS3BICiEOYeGXR7we9QJel2m1pRy156oUYYrFixffuHEDcP/pT39qz5Y819QW
-        KXIVijyFMk+pWqNSF6o1pRpNuUYLMa1ibgH+rFOIQ0xMFRz2A5ICoKEhvBVpaI11iVZbrNXkaZQjmSdp
-        bGz85ptvvvvuO4JbKNzPuwUUKbIVyhylapVKladSr1YjNGs12vWMa0xMgTgMA2xDbec4bgQ3RAPSAROC
-        ANb88lhnxb4t9Bq8xv+oSKsp1KjmqRThiiVLlty+ffvbb7/llcR0kXweqS1SZCqUWUpVjgpYq3PV6jy1
-        Jl+jKeACiBdyb3AB4p3iuBBukm/ATSFIZ1phXajVrNeoc9TKOKXMTrZ79+6vv/66TSV5TqktUq5QqjJV
-        qiwVcgr8nppVGuRyDGsebkK8iGMfONh5gpvCDUYT1rwVEfAapMb/SLNGo0pUyf3lq1ev/uyzz6Ak5Emw
-        SD7X1OaAXqlSZ6pZZKk1ORoWBHceB/fqFoKv0QALI0l5DMGNtJvYTcFjXdOiIRDr9Qas1UvUiliFVCa9
-        dOnSV199ZUrt5y5xFwFlHmhNlsYQ2QK4TQm+joMbBG9R8CeDm/Id0hDe9pFe81hz2oUiicxRtm3bti++
-        +OJ5pzYD+hGdeaDpCcHdHsGhJ8VPoidG7AbKIDVhTbYPLxuwxsIIXuPdQ1hDRvzk69evv3fvnpDapl77
-        GV8hRYqpClU6w/oRnY3gxh87hru1fD+e3aicUPEEKFOYYr3uEdbqRWpFFDPab7311pdffskbEr4E+FzI
-        iCggIEBqJ5UHyxXDFKqZqo7gFuqJkXzz7O6MmAipTaVBfDTFGgsjmZ8CDRYP5WClVCk9f/48qA1DAq9t
-        tEI+425E1NDQUFRUlJKSMmLECD8/P7mnXBmrVE1WaZa26LURwTtgN2k30mvAjSUO1tso32kvpQTKFJTO
-        8BoiwNog2fayffv2ff7558+djIi2b9++c+fOXdwD7rWgoGD69OlRUVFyN7myjxKlH82KthA3hbuFfcyZ
-        kPXujBEkC0hKgsATI702wnoy6yEggYTzwwpJMkIp+zNeihLt37//wIEDBw8ePHToEJ7gAco0NzeD5jNn
-        zmSIe8lRRFbNMlEVXklMrfcaY9/dKWoT4o/FeiYr+5WVlX366aeQEXIjqEaZSvYztTyKUBQ+efLkKe6B
-        J8ePHz927NiRI0cId4AOjk+cOFGmkSlCFaqxJpLSgXCTkoDaXNnkMUk8L9yENZVVSUOQNLaYEIMVmaeS
-        B8rXrFmDZk3Hkv3sYC26zD2uXLmCj8gOLly4cO7cuTNnzgB3vAY86DCzqEIMGDCAEXyYUr1A4FKMXKAw
-        q/wB1CYxwccOsVYvVOOFz87O/vjjj4WSLUwgn6nlUfTaa6/dunULH2/evPnqq6++8sor169fv3r1KnAH
-        6FjlATqYDsSPHj0Kmq9bt27s2LEyZ5myvxIVzlYJTnuOW0ht0/qUUQGWqE3BY13Kqk6teL1ao05TKyIU
-        K1as+Oijj+7evQvnxyeQvMt+drAWocHxXsvj7bfffvPNN9GrBvTAHQXil19+GaCD6UD87NmzoDm0BYhX
-        V1djzZTZy5hFmcPBDV53RrV5Q9JBvbs9rJHI8EsungDrdDW6YkuXLr1z5w6/PPIlVn55fBZa7KLftzyg
-        d3gb4if+8MMPgfw777zDgw6mg+bXrl0DzXnEwXGs/rNmzWJw91Oq56kfYd0etcmQtFSmOlohQXOCG0+I
-        1/hX4LUQaxRh8jXqDJbOZGRk4Cen5ZG3IsLs8RfHWgSThDcdbCme4KeE3oEaAJ9A/+CDDwA6Mf3111/n
-        ESeOQ1Wg45s2bUKnVeYiUw5Rqhe3lKWMsOZrgbyMtGn+2uzjcNxnyymwLtFqkDTyvOaxjlQsW7YMFMFP
-        zlsRah08I7wWQdeQZcEh4SOewy0BdEDPgw6mQwSJ5oQ4hIUQxxJ68eJFLJ6QlNra2smTJ8u95aoxnJII
-        jbZRWYrSSOQ1cCOPlWyCnpvFeYQ1b645oBmvoSERiszMTDBDiDVs3zOCtQgvO/9AUguBMwKdmE40FyIO
-        KccSCh2HpBDBT58+XVxcHB8fj0aJaoaqI6x5N9KmZLfHa+rLcE10VrkmXvNYY20MVeTl5QFr3vaRxX4W
-        sBbRD4EHyup4DtsPhwTo8fPxoEP1UF4gmhPipCpYSIWSAoKTnqxcuZIJ9yAlysqstE0ZjUmBm7VvqNb6
-        WJdNpOZnFvBuQJGPN9c81ilqeYC8sLDw/ffff9awFqH0RQ+MweHRJuhgOtGcEOc5TjoOSUFdDY0+GBXS
-        E/hCpPUzZsxAo4SVTdrHGotbq+Wx49a7EGtKZHixJvOer4HjlOvlVVVVHWBNnu9nzmVEtBzTAz8BHm2C
-        TjQXIg4pB8FhYIng+MWg4KQnPNww3TJrmXKgEhraHq+fAOuWl4EpO/QdkyG8CWkhNcN6hgqFmq1btxph
-        LVwbf36sRUYvrBB0nulCmgNxXlWweBLB4VVgraDg0BMjuFFFgQVUBHKq3Y6GPDHWEGtK0GH4eBPCY52n
-        UU1UocN7+PBhHmsqifyCWBsDLcTdlOY84pByIcHxa5CCG8FNYgL3jYIJmlKqESqDWJs2JGH7hBa7PQ0R
-        kpo3fPzC2CIg6Hbi/4X6NXTsGcG6I6B50NtEnBZPnuCk4KQnQrih3fCCyDBRLUHuruijYF6bB1rY/O0M
-        1oIXwDDMBxOCTiMtjAJS43+hHKCcO3culmve8+EnpLyRGup8a+Zn0OtOAW2KOOm4EcHJpeCX4dlN2o2l
-        EskOqihwgampqTAGqiSO2tSmEWLNr41GPkRo+EyxhgnhF0Ye61yNeoVa0UuRlZVlijVfe/rZsH4yoAlx
-        IcF5rwKOkJ4Q3CQm0G5aKskI0jqJ8qbMTaYap2JAt4c19NeoQcNjLVQVEmujhZFePHxnYL1AjeI1TAhe
-        bORceKthRaHaE2FNWw5+hgT9hwAtJLjQqJAZ5+GGmABu/GJwJjCC+D2xTkJJkOOgf8bcSJzyEdBCXqMk
-        Qv5aOIfWDqlZxkiVED6LEZCabeyYppI5yNDfwP+dak9U54OD4vsyP4MJ+VFAGxGc1xOCm8wJORPKdGBL
-        YLqJ2ugqjB8/HrVWvMENAiKYjTLkMlyObpiyNEoXOyPWHKkZ1lgYpVJoF2GNFx5rCXhAfRkqhvzUWD8F
-        oNuDm18qeeGGkiBhA7VRGgS1kdfMnj1b0VvBEkgjsaYcHeLL1Z4Y1qZ5ecdiTd+QMtJVGizC6enpWCog
-        Yni98ZPg5Rcavp9arJ8a0DzcJCb8Ugm4SbhJSYyoDf+HgQ3URtSpJlij9kSdMH56uAOsTZ01CUgLqfH9
-        5b7yyspKvMB4V0HKhEW+n8GEPGWghXCbKgkYBCXB25anNt7LYBm6JIoghSpZ1cZwJbCG/rZH6pYaiKEM
-        wjtrcnutSa2aqsLuApTRkb7y5poMn9HC+FO4vZ8EaKEz4eEmJcESBGqTasMDkCHBb45diMz2zeew5scq
-        ARYMHxZGXqz5bkBbJsTgrKnkRGUQntRcvUU5VIk0Fb4e64TQhPwMC+NPBbSRcJOS8Iskr9pkSGiFRPbI
-        ilDAGkALRlgNE8PV3DiOsPPSHtbk9ig1JwFpUWr1crUiRAF/idWYNyH8wkiFzJ9IrH9aoNtUEl61hTKC
-        5A1Wl2ENXkNDhKQmseYFRNhRNMVa2B/gBYSUmiM1pibh9jC4gvYF1mSjhZEX66de3vs5gBYqCU9tkhFK
-        bSAjlNeAZfn5+YpgBQYbW/VhKWMkZ82T2khGhGUQ6g/w6aKA1GhHYFwCnWWkTrQwUuXaSKyfutv7mYBu
-        k9qU2pCMIK+B0QbWYBmmNZgPQWWVLzfD7VGXAAICQPnZD+re8u0uozoqantUb+JXRY7U6mVqrL1r165F
-        6kTZOVaLnzqL+VmBJmrzJW8IolBG8KtSUoPlERMEimgFGybmsebdHjkQfn6sTax5AUG9SbgqUgsih0sX
-        bWQYyIK/FGYx5Kx/CgH5uYFuT0Yoh8S6xC+PycnJKL8JSW0oW1dyqyI/HUljTSa8NjgQvjnAr4oc0ExA
-        +ivnz5+PsiJlMbyzFrq9pyggvwDQRjJCboR3fuSy8WuDa9OmTcOZCK1I3ZIuGkhNA6hCsTZKFyHrqIEI
-        V8UWUrMUxkteU1OD1JycNdYJKjn9FG7vFwPaSEaEzo9cNrBGqxe1J7RLDFgDL6yKcCC0KgJffti3Lawf
-        FazJVpuQGntkRo8ejeYAnDU8D5Wc8Er/FALySwJtKtlUisLvyWMNHyZzl7GpM37rI+3koFWRDrfged2m
-        gMBWC1dFWL0W9cBmdNhq5EoQELi9n1RAfmGgO4M15vzkQXKDCeFJTbYaukGbM4yw5gWEXxWFuSJ5aih1
-        tobl5RqWl8PtGQkIPxDyVFKYXx5ofnkUJutGvMYIErYdMlIDaH53KU9qfseRcGE0stVYFXmrJyR1tgb2
-        BoUtoYBgQeZre8LmwI+pgTwTQJtaEdg+IdZQT0yJQFJp47Rh9wZPauHurvYcCHUGeKsnJPUsFcZ9MIhi
-        5EAohXlaBetnBeiOsYYPwdAwjj9QzVYxoGlJ5KrVTKlpyyICMtIxqakAQolii3pgUhDTsHPmzMEcIRwI
-        1ZtoVUT9i59QoI7XDyb1MwS0Kdb82kj+ur6+nmXnyGLQL8eSyCflEGja/Ny+WBvmQIxITZOYWRrMHGO0
-        Hic9YRic6k1UA0F5gGz1j+/CPFtAt4c1mAWswTLMQaPUyYBGRs63BSAXRtueeQERrooogJS3DDeZknqg
-        MjExEU2fjlfFH0zqZw5o07URvEYGgTwCOTrKQMxZJ6kMQHOlaqYeEA06T4s/psIE61akJk8tUA91MiM1
-        Rusx7sPbatNV8Qfnis8i0EZYU95IOToyNwzVwe3h/W7Y+M8viXQqCLCmcxNMV0Wa+gWpTZWa27SKjB+k
-        RpZEqyJf2KNcka9W/zBSP6NAm+aNhDWcAJJGtFlV8SoGdMvOUcOSKDx7RYi10OpRUk6JIu/zOKCZUjvI
-        tmzZgkEfKuyZ5oo/uF/+7AItxJrqIVRTxQIFbwBE8GZnQHM7B1iZCchyJ5UZzl5p04EQqYWeGvaDy1xo
-        exn2PmGKDHsYMF0vzBWFBZAfZj+eaaCNsKaaKrDGwoh0EXuEHm09p9IHAY3zm/jz9tpTaiqfUkeRlJoD
-        GscO4KDJPXv2mFo9vgDyw0j9rAPNY02tGeHCiNoeysqM0ZBpjCSg0AHvwZ12yLDmD8oywtqU1AKggTXG
-        9dLS0mDbyerxBZAfSernAGgjrHmxxqwTmrlgJe2nM3gPOlaSP2yvPaXGP6HqB+/zWtQDWxRwCDP2sMLq
-        GeUvP4bUzwfQhDUVQ3ixRjkC1FMlqOjEISbTSAuhHnR+Jx0iSYejtklqlPRQOTFZEkFqvH5oXT5dUj9P
-        QFMPjBpgqIQgi4HnlXvIkSsaJsdIpun4ZToclU7rbFOpN7ROXlpkmin1CNXIkSOfLqmfG6DbE2t0ctGF
-        eQQ0J9OG81GBNU/q1qVqw7Av+TwT9UAPHskLdk4SqU3txw/w1M8T0EKsKYuBaGK9QrFJvVJtmEQgoOmw
-        ZQQEpD1SY34MyQtfO229JCr7Mp8HUsN+8J6aTxSF1Y9OlpmeM6B5sRYKCPRUGa80AM3l4uwIWqC8nxOQ
-        DkgNcRcuiUL1mMYmfXG8AHlqPlGkpiL1BJ7I5z2XQPPTqnB7SBfx1sY7HV6YOTxKW7Ae0hH5wLo9UpPP
-        w5JIWSIVTlu8B1sSfdlpkth9TYkiNRWNSnqdT16eP6CNBIRSGCg12gKGdi0BjQOs6ZB23PJApDapfjCl
-        xpLIlz5aA40y4bhx49DlouoH6lnUKUdti+rU1HzpZJnpuQTaVEBQ24T90K7lrn4g40FA0y0PROo2fR5a
-        t3yWSOl4y6lo2ISLdiI6L9jjDntDozaoU/PzY9R86SSpn2OgeQGhFIZ56ikqQ2GaHB7drgGs93Gkxmtg
-        SmosiSh98OohAJpliYHsxAScBQNSU52ab74YJS+PXRKfV6BNSY2TQzCJypZE3koD6KPcHSZ4AlKjfMod
-        QSac1aONRoatzlShFsg0aoSjRo3C5BhOEjDNyJ9oSXy+gTZaFXFgiCpFZQz0cY7XUGpUP0yTF1oSeUPd
-        2uSxwqlGhqMBTX2esMvVGfV4joE2XRXR9EOblc5gZ9IBdT7GrkKyBtYHudth2lsSST0oc2mtHkjHoR5Y
-        EuHz+CWRpk+fSD2eb6CBNZ+XY2nC749GF7yaodxBQOOqqVM2TEPgqWlJbFM9KHOhqqnglFB4D+ysxv59
-        4ZJIE5HoQnS+8/LcA01zwHyxCexD+c1wZwakGUDjWq8z3LVeB7gl0bTLRerBZy5GMj2TZS7YD4olkVq3
-        1HkxyhIfqx7PPdDCVRGkBu8wZG69jbt9hwf6HMOaKTWWxDbVA96DMpc21cNTjoNHkCWi9MFniW0a6g68
-        x68EaCGpUXjD9OIjoE/b2JznAqSGz2tPPZC5UNXURKZxGC6OacXhipQlokcuNNS8enScufwagDYiNY6v
-        RZGaJd+4MA3ScdrG9ryt/Xl7RupDLephtLMc6lHJHRbZlkzjfIB+/fqhz8Aban6aiUb0qMbUsXqwo34e
-        a7af/S8QKjXe3ShTMOOBVAVAn7GxO2/ndMEJcDNP3Z56GJk8gZvGyLpMy7rjP0Y9fiVAE6mprwh+IcuA
-        S2OifJwBDTq7XnQF1mB3R+rBm7zW6yEVmHJyckg9aMLmSdVDBGV59gnbmZ+QSE3lU6xd2CdAJtrmnA0g
-        9rjk4X7RnZGa1ENo8gSncrYr0/2U6AWTeph6D34+rwP1YED/OtSDPDX5PJQmMA7JLm6FieaA9rzk6X3Z
-        2/mCs0E92qx7VAlkunXaoprAOrbYfiBUDxTzTDOX9sBk5979aoCmBi5NJfTt2xclUGgF/AZ0Ayj7XfED
-        3GxJRDrenskT5uKCtEWdopaqpDgWijIXTK2js4MtkZS5UCuAr5q2+f4TUUW1M+/NZ/9rhEsiinlAh1ZC
-        t4tuvld8g64GAWvoNUvHjUwerx5CmW59iwSumcAOaqgHqldQD9NWAFVN21MIUQd/9+wja/oT8qQG+5A9
-        QzeALATa/6p/2MthoddCATrUgw00mcg0OzUIbprSFpP1EIM18+bNw1n81AowrZp2bPIY0L8y9aAlEe9r
-        tAJsDjOB9rrkBTr3ut4r8nokqM28xx5rVp42OaeJuWkUPdpKW1RxKtygApnmq6ZooWHi1DRFbFOKRU/U
-        j3kuOM4viUOGDLEtt4VA6y/rweU+1/v0e6UfnjDvgRSxTZmGm6at+ib5IcbPwsLCMJbHmzz0XIxkmu/Y
-        mgIleqJ+zHMBNK8emO61WWRDugE6D7gxYMirQ6KvRwN6ZvIg08KGCy/TtB6ijNfaeOBcRKyHuB6XN3k0
-        MCbs2HYg0+z86I6Xy+cCXOEPyRtqgKIdoYXfgG4AX6A8/LXhg24MgnowmW7PTXewHrqx69F+mEyLOlkT
-        eb7gJvWAMVD5qwAr5KLvK33jbsYl3EoA1vgjZJoNjD12PWxtPODNYWaEMk3zHiTTwj6AqUyL+JoIfrJf
-        maHGG1kql/ru9o14OQK6MfrW6Em3J417fRzEGp6P9QG4m9CM+wBYD1HGI+PRGmi0b9At27t3Ly/TnXfT
-        Ijpn71e2JPIyjeaIvkQPZIfdHDbh9oTENxOnvzl96KtDmclDHwDrocm5hWgCMONBhWlBaYkNP45WDR48
-        GDeKkZumaTHTokebqYmImoy/viWR1GP58uVeaV6g86hbo6a9OW3+2/MRY18fy2T6cDvrIZoAMB7k8IyA
-        nq4KCQnB7W1ouPBumm+4CJE0TVtEP2zu5tmXbCrm4RBUt3FuoPP418fPfmv24ncXp72XBlKHvxyOehPr
-        i3dgPEwcHu6NcnV13bFjB2Sab9di2AOHBfHnT7SXtoh+2NzNcwE0EjG0rh16O4DOU96YkvJOyor3V2R+
-        kJn8djIMNbJzlh+2CTS1tUwcHho3aP7iLJX20hZ+PTTNAUWoPwmPAun8MNkzjjWZPBR9tG7acTfHzXxz
-        Jric+2FuwZ2CjPcy4ECwHrZtPHA3Bjk8U6BRmHZjt84ZrYfY54KjxvhBU1rwjJyFqM1hsl9HmYlkGteO
-        JhxPAIvB5fUfrS/9uDT3Tu7E2xNZ2gLjYeTwKG3hKx6tcxbadYGDtbAe4u4CmqqhJgBfxiO7bLoeivjD
-        yH7MTphnk90k04MGDUrYlpD+Xjq4XPn7ytrPaks+Lpn15izk5SwRN3J4BDSGxPjSkpGVjlBgQB3roTA/
-        5Cd66eQJ2g9gRFYR706Ei+avQ0DI5OEswZFlI3M+zCn7pGzT3U3b722v+6wu7d00pC0sEW/T4cFKtwM0
-        WWmMmArzQ+GkB2/hjIGmRZM6BeSpf8AGjWeW0QAa7/S47Lh1H60Dvrvu7Trw5YEd93YAdyTlaMG0a6Xb
-        y1nilMOHDyfjQd0WzIl1xniI+BP2nu7xFM8I9KBVSUnJwAUDK35fsfXzrYe/Onzym5MHvzxY+FHh4FcH
-        M4eH0lIHOYtJcohBBoweYOyRNx40UkNtLd5WmBafRXREp/DUt18TqQE0Skt9J/et/6x+35f7Tn97+vJ3
-        l/Gx5tMaZOSs4tEm0LXcIG9bWTjmzXr16gWgYTz4tlZnCtPsztmf4niKZ4TRkGnU6SPiIyAXx78+DpQp
-        wO7Jtyej/8JyFpOD1jE0zYZp2gQ6SYUr69G+ERamaSdzxw5PhD7YT3po0y+LOIBGIzWwTyDk4uIfLvJA
-        g90wHuhysWJpW0CzmUdk4SbSoZ6r9vLywpkhvMOjIbE2G7VCKy1Sqdzw+gg3Pf+aVkX8qrAE3kHeJBp8
-        QKlT30nF9AFLDk2vDkDzsD2gF6pdXFwIaGGj9rGlJZGr63SUuPCyGB3aROXTZ62qB+Ae+zBqAiCVcPVy
-        FaKM52D38veXY6SGTae3CTT6LFRXau2jcXWznZ0dgG7TSguHpo1yFlFQUKODQxxuVjI6uPonOgtViALe
-        OlhGMPuDsTZMJuLSWNwWglcdKQYWHH9/f3d3d3t7e41Go1QqZdwDT/BHfBJ/hS+IiIgYOHAg/glO7oeN
-        Q/sDF+Ci3AMrhd8ZKyEe+L/YOdpd+sMlYQBrpOMY82BZeFuXYbDNFm0BrVmq0Wq1WGDbrOHxzo3vafG/
-        L4De5OdXaGPTCyk87cUVnvr2tI6NxPeBB4IlwvWZOEw4Li4OMLk5OfYODUoYMmD+5HE5C+ZsyFq6rajg
-        aF355R2Ntw/tunP64L3LJ//4yvn7r1/9x5vXH779CgJP8Ed8En+FL7jd3HS5ofxoce62zEUbkqdnTx41
-        L67fmMjg3t4ebnbWSL7xP8LEbY+ePfI25TVcaDjxyYmL31xk8e3FNR+u0V/UM0bzJ4kJdgK0C/QKjUql
-        AtDt5SxGxdJWQANrnW65Wu2FoiK1DExPvufvlOrk4oZWJN4i4BcOUIPDt7HSRoUETRsVvypl7ua1ueea
-        agHTP958+ft3bvzYuH3p+1dOPbx08OHpnQ+PbX64v+bhzpKHm1f/vXr5B7mzz6aMbZwwYG6A0/hgt1AX
-        rUohjhgUMW7BuKUblqY0p+hP6bXbufMnEEZXcGHzYZuMztTI5XIAbVosBUFpG0CbySEYvZmLTR4e8xQK
-        Wwh8myffd+aEPbyYGJcCZ6dMmWKt1faLjFgwZUJl9vIzm2s/u3DsxwLawUvy1svf3zz3/bVjD883Pzy+
-        9eHB2oe7GNYPalc+qEh7UJx8d1H8/VXj72eO/nDBgKMTwksG6mcFO0Y4y83Ev+0S2aXnqJ7ShVJVsYqu
-        dGYb6Gqt2C5PsneZXAiUGgoGrTNNDoVbEPmqtJDRTUFBWwhuF5fJuL8K8078NSWPPfkeSxPc4YYNGzBs
-        6exgP3JAP3B2X2Xxh6cO/oTImoL+9vXvb138/vqJhxcPMGofrn+4p/zh1rUP6nMeVC29u2zc/TXTOKxH
-        3V867G9LBv4tNfZP8yOujnOtitXM9RNH2He1sPzvLmFdzMeayzJkOA0LPlqdp1ZnqzUrW7AmxFGS5oCm
-        5JCfeQQ72yz/PwI6OHhrUNAjrB0dR2FFavPke+E1JVgq8f/Azhz8X/tHRiyfk7i3fP1HZw7/rOAawf3m
-        te9fO9+C9Q6GdXPFwx1FDzfl381Nul82//66xPt5k+5nj7m/LP5v6YP/lNL73hzfuzM8705xvTvJ6XK8
-        bWmUYqrOXG/14n+a/Uf3vt3FE8XKJezONBYrWTDQVzLpgCTCE1MWThtb2gOat9IiAC3Aeou/f5W9/WAc
-        88uffE8rKRVRQXB8d7TcHexsxw0bVLpiybXdm39JcAlrQAw6v3oWKH9/5cjDC/sNen2g9mHzhgfbCz9f
-        l3K/Jv3+hpT7hbPvF0xl1F458i/pA+8lh9yd5XN3Oof1RMdPJjjcGe/w/lj7plj1Qj/LSNuu3Xv+d7eQ
-        bpajLZWLlLgshyG+VI3FEAc+Amg+C8emWqNyh2lDC0BvE2DNqO3nV2JnF4v7q1CUotMMgTXakVjW7Gxt
-        xg8bUpm97PWDux68xZzAT44yFkzG05MGBM/ueXh6x8MTWx8e28Li6KaHRxsfHmlg/EUc2vjwYN1Dhm/V
-        w70bHu4qfbij+J9Na+6tT7m/cfn9qsX3y5PvF81mMpI74S8rR3yRFnUXWM/2vztDd3eKG3jNsB7n8G6C
-        /dtj7N8cZbc7VrPYTxxl07V79/82CzcTjxfDR8Nf4jharIfIWfi5Ayp3dFBXEqGra4J1k4/PWhubKJzJ
-        jj4CblMXi8WDo6NWL06G8frra5f/fht+6+V/tliup4D1q2fZOgbUgE5TwYO6TLaIlSQ/WDvrwerpD3In
-        P8ie8CBz7IOVCQ9WjGaxfBT3ZMyDzIQHWeMe5ExgX5M39UFBIvsn6+c8KJrH/nnpwgfli/5RmnovawqD
-        uHT+/eK59wtn3V834/7qKX/JSfhiWb/PFwPrMIZ1kv7uNI+7k5w/neAIXr+XYP/WKLvbI+1ujbB9dbjt
-        5hjVHG8Lf+1L//nSf1haWq5atQq7dOHwKDmkdI8vd9AhE0YFPFFY2P42sXZzy7K01Fur1bPGjd66Pv/T
-        c0e/uHzy25fP/OnVC3+7deV/fwTWzIqBdI25D0pTHuROebBsxD8XDfzn3N7/nBXxv4mhf5ke8sdpwd9M
-        DfpqatC9KUH3JgfenRT42aTATycF/n4iCzzBHxGfTw7E3345JejrqUF/mBaMf/XXGSF/Twz5Z1LoP2dH
-        sG+4IBbf+f7CQV8kRd5fFnd/xYj7WWPu5yTczxmL+EvWyHvLYj9Pi/48NfJucujdOQF3Z/owrKe4fDbR
-        8aOxDh+MMWD92gjbG8NtX463vRZnWxQmG2PT01NhiWIp3uJ8+Z8f8MC7n59LF7ZoRRERxzisdxOvAwO3
-        eHvXubiUuziXujhlaJSBq1PnvXVkN1wEsP7yyqk/XD/755sXeaxJQDrWEMbW7YWMX1njOEwjAQdwAUbA
-        6+OJAXfGB7w/zv/dsf5vj/V/c6z/Gwn+txP8X0/wuzXG77UxfjfbCnwef4uvQeCL8a8Q+OfvjfP/YLz/
-        nQkB+Lb45nglPh/v+0Gc03fT/f6a6P+3pKC/zQn/W3LU3xb2/VNqn88Xht5dEMYYPT/k7twgxmtgzSTb
-        7e4Ep0/GMazfHW1PvAbWAPrKEJsrsbbHBriuDLDpaycLDw9PSUnBukXlf3J4lLPwDS1aDwH0SQ7rA4GB
-        O3S6OgeHYne3Ch/vmiC/BoTeM8taHZKfMvfto3vunD702XmG9XfXzz0Ga6B/bPODmmUPciYyZGeG/3l6
-        CMEKCIApAQqAhFC+Otrvxwf/qtDLgNfs5nCvKwMc3hzr/e54/QcT9B9P9Lk72ffLKX5fT9PfneIE/jIW
-        Q6MhHRR4znjNsP79WMc7CQ7AGnptwHqozbX+dreGe96M97gR71ka7pDgprKRWi5YsADlaagH5vDoKHWs
-        h8JzlwD06dDQoz4+u11cNuo8N/rp64P9N7VEY7B/o94zx1Ybnj1v5jtH93505tDdC8e+unqasEY2TBpC
-        vH5wZjeT1+wJeM/+IzEUb2e864XI4jfnGfrjMe3kd7gy1P1Mf/vro7wQN0brbo7RvZ6ge2Os9xtjPV4Z
-        Y3trjN2bY+zfG2sPXYZiYD28O9mFoTzZ7e5El7vjnT4bx7B+fzSTkddH2r06zPbVQQ5vDPd8nWHt+epw
-        r1fiPRuinWforD3UMpSM0BpHmQX5Id2aw9/FIPLzO+TpsdNXvyckcH9Y0N7QwB3B/puNsPbV5dtZRWck
-        TXn3WDOw/vzicSHWf99T8fd1s/938eB/zAwDuJBOgIu38FucCPDgdhKXp/5lFwe5nhngeG2kF8XLo1gA
-        9CujXE8Ptz4XZ30x3ubKcJvrI21vjrJ7A1qRYP/hOAfoxqfjHIEygnj9wWj7tyEjcXa3Bzu9M9LrzRFe
-        r4/wwtvlRjyw9ro+XLc91m2ur63eSgHtxvLIV+Xo5i2Rn8+BsOBjvcKOR4QeDQ85FB7cHBq4MyRgS2u4
-        N/npC+1tBiRPTHi1eSth/WVjwbdZk7+b1+eP04IYuOMBrh8Dd+wvD67w1To/wPncIGceaP7JhREux+Ot
-        jg21OjHU6uRQqzPDrM9zoF8bYXt9hO2tkbZvjLKDaABfoIz4cAzD+p14+3fjXO6M9npvlO7tUbrbI3S3
-        Rni9Olz3ynDdy8O9rw333tnfY66fvY+1EudpwfNBrOFAQG1Rr7BTXJzsFXYiIvRYeMjh8OB9YUG7QwKa
-        jLAO8K10shs+pW/EmdlxH86I+ni8/7vjfN9I8Hl9tM/N0b43mcL63mDhh3jqxPzB3/BsP8cLQ1xMgT43
-        3PnYMKtjQ1piqNVxDvHTQ63PDrO+MNTmSpwNnAa8HRQDugHQWcTZ3xnu+kmC7s4Y3fujvYH1W6N0r4/U
-        3RzhfWOEN8N6hP7KCP22fh4zfe3ctYri4mIkIpARHmjC+iSwjgg9Eh4MGQHW2zisOSXxawjWVQd7bHBR
-        DZN16VnTy/F8nO5CnPfFeO9Lw70vj9BfG+lzbaTv9VG+r7B4hrA+1df+4jA3U6DPDndqBTSP+BCr40Os
-        Tg62OjXY+uxg6wuwGcNs4DeAONbD20Ps7gx3+zRB9/sE748T9B+O8X5vjPfbo73fGKW/NUp/Y6T+5RH6
-        qyP0l4frL43Qb+zjPlFnZ6uSw3QLgeapDRk5Eh5ykJPsnSG+DcFeVcHuZUFupYFupQGupS6aCXIzzQp/
-        qyODvU4O052J051ncON/AKx9TLEmjvPBvRIs8JUvj2RxdaTvlRE+l0f4XBzO4jwiXo84F68/G6c/Iwj8
-        EYHP0xfgK/H1l7h/i++AVxrfDd+25Wdgb6/j0TaX4z2ujvRCCOE+M9yhbaAHWx0dxOLYIKvjgxjip4WI
-        D7B5O97tzmjdR2O8P0nQf5zgfSdB/0GC/t0xPm+N5t7co3yuj9RfYz+Snn6XwkjXoW7WAPo0Jx30USgj
-        R8P994Z5bwn13BjkXhXgVh7gWubvWkrhbjNXbe6Z5K48MNDz+BDd6WG6c/Fgt/7KcIY1Ufv6KL9XRvsJ
-        McXnAQf97wHW6Tj9iTjvY8O8Dw/VHRis28/FvsFewmge5GUURl9A/wr//NAQ3dGh7LudjPPGa4OXgb1s
-        8boDUVYXh3teGuF5eYTnFS4I9JPx9keHCqSjhdFHCeiBhgDcPOJnBluf62uFMXashO+M8oJ03Bnj/VGC
-        /qOxPh+O9Xl/rO/bCb63x/i+NtoHvzVwwMt/gSMNfk0CunWEnuoVcKiXT3OE984w3fYQz81BHhsD3asD
-        3Db4uZb7uZZxUertsMJG0iveTlId6XR0iO4UqB3vfSFefwlwM51iFLs8whd0I1hPxemFmAIvQnBvS+wZ
-        6LWbi12dCPpK/BME/x3oG9IrQejv7efWFGF1ZKj7sWHuJ+Pcz8R7nBvucXEEw/14nM2RIdojg7VHh1hR
-        kF4bAS1EHAQ/Ea29OsTtRpzHa/Geb4wE3N7vj/H+MMHnzljfO+N8Pxjn926C31sJvrfG+N5gWPsS1vj1
-        WwMNiP0P9/LZF6FvDvcGnfeEee8K0e0I9moK8mwI9Kjzd6v0bw23o2qErKt8hb81ZOTEUC/AfWoowhsf
-        jw9lVD04xGvfIF0z98sTrAQooblzgOeOAZ7bBbGtvyfFVpPg/wpPhP8E3wGBb0Xfk14AQn9rtFNDhNWu
-        ga6IPQPdmge7HRzifnSo+4k49+YhVvsGaQ4M0h4arD08WID4YKsjAkbzQLMn/a2OR1tfHup+daj7y3Es
-        YXlthNcbI73fGe39XoLPh+N8Pxzn9+E4ZKdwX36vj2HuAFIGrEG1Fo02hhgoI5pDdXtDdbtDvHaEeG0P
-        8twU6FEf4F4jgJsR3M16jtpcN9FZ3hDjuneAx66BHrA47NfGc/bL4wnCaycHKwFkwLGf59anGNzLw78A
-        BH19L7uNkbbbBrhuH8hiB4c4YsdA54b+qi2xqu391Lv6q5sHavYN1BwcxCE+SHtkIMKKohXQ/axOxNhe
-        GuIOrK8M87g2zON6vOdNOLyR3m+O0r+bAPVgQH843h/Z7zssjWD1A6gosOaAJqHQ7+VYzCIUoWNAU/Bw
-        c9RuBLUfwe0GrMu9nXJtZP0tXuqxUK9t6OPaGOu2ua/75lj3LbHum/t5NPXzYB9jPZv6sXia4Hbw3bg3
-        RGWIVV1v+839XZoQA1wRWznQN/W3r+6rrIlR1sYo6/ooN/VVbY1liO8doNk3QHNwgPbQAO0RCiHisVan
-        +tgxoBnWHleGelyN83w53uvGCN1rI/W3R+nfGuP77li/98f5od7yPuwvV2lAMgysRb18m3sxiKESLAhi
-        PhjKLRGi2xOi2xXMqN0U6NEQ4F7n51bj51bl61rp41qBcNYmKXp6xNlJ80MdqqJda2LcNsa4NfRxb+zr
-        vqmvx+ZYjy2xBrh/Hqzxohb6yOtiHBtiXRr7uWzq5wLEt3Cg18XabIhRVvRWVkYrq6JbI95XvStWvaef
-        Zl8/zcH+2sNCuPtYnY51aAX0MM+rcV4vI2EZ4X2TOTyfN8ZgSfR7lwmIgdfAGoUXUbj3rjDv3YhQoKyj
-        aIV1C9D7Qr0RzYA7WLczyGtbgOcWf48GP8DtXuvrVu0LxN2qdE4F1rLBFi9JprmpKnu7Vke71sW41ce4
-        NzK4GdaIn43ajTGuJQEqoCwMQryyr7Y0WlEWpSjvrdzQ24B4NRCPVtT0Vm6MVqIAvb2PGoX/5n6aA/0N
-        BD8crT3T3+niEHdOPTygHleHeV6L87oWz9LCV0bqXx2ph+WA8Xgzwe/tsX5gNOCGhgBrUahue6j3Tggx
-        F62wDtHtRTxiNFD23hesQ+wN8tod6Lkj0HObv8dmP/dGX7eNvm6A2xCuNgvVlkGRavNUH2tQuzYa1HZv
-        k9o/qZLURTqWh2iNgKY/lkari3srSiIV6BMieMQreyuqohTVXNRGKRujVU0xql191XtiGcEPRGnODnC+
-        MNgNQF8a6nF5mOcVDuiX43XXh3tfH6G/Mcrn1VEsT4bruD3Gj4OblSoRomCvLSHwcLodobpdPNacSjCU
-        DeHdDHCDdfgIlPcHGaI50Gt3gOeOAAb3Fj/3TX7uDb5u9RzoG31caxzUU2TdXQbbSDID7Wqi3UypDSXZ
-        HOtZHOWWFeacEuAwTW8/ysNmgItVLweNv63K00rlpFbYKOVquUyBHrBUisAT/BGfxF/hC/Bl+GL8E/xD
-        /HN8E3yrkii3LZx2V4XZVobbmAJdH+tcHK0silQU9WJRHPkI8XJwPFJREamojFRUI6IUNVHK+mjllhjV
-        jhj1nnD1qQEu5wa5XRhiwPpKHJMOMJqAfmWkz42RPjAbwPq10b5UpwWdUQISYWWDnQj22gZrAaxD4DEY
-        yoZg5NXtCfJiwT1vDtLtA9DB3gcQHOIM7kCvnRzcTRzBgXgjhbdzka1ipKSbdoSDLC/EAdReHea80N9h
-        ks5ugIs20FbloFI4OztjaikmJgZTRRMnTsRw16JFi9A/w7HvGBHBIANua6qrq8NwDx5o1uEyicrKSoyX
-        Yw42KysLnWJsKsEkCcZ0cLxPYGAghhAdVYogO3WoovsYN+XCQNuCXg5CuGv62hf1VvBAE9wIEJxFL3lZ
-        L3l5L8WGXgzuqha463opt4ZrD/dzOTHA9cwgt/OD3S8SqQE0V1HigYaDfnUUwxqWgy+Li+CLA9xr4SWC
-        PbdioQvR7eSw3h1swHc3oRzIRRDDGsFjfTDYG0GI7w302tVCcCAOBd/McPfY4uaQp5IO6fI7qaKnmaWF
-        OTaf4iSNqVOnoteOOTRs2wN2GzduBIiAEp18PFAcwAPjE+iB0gNzhaYPtKLxMP18eXl5cnKyhcQCc0k+
-        4T4WEnN3rSTGSTlRp80ItlsfZdUm0AzuCEVxhBxYl0TIyyJawx2maAiz2tnHaV+s85H+ricHuZ1lWHte
-        jvO6Gq8D1gD6+kgfRmoOaPAahTBgTc0gEXI8+LMA92p45CDPLaB2kNeOIK9dUGEKjrAGoNvB+lCwN4IQ
-        J4Lv8vXY7u2+1dOtyc21yd19u5fXThcXbAsZZWFhN3ToUOwcrqioqKqqAsRgKyBGA59HFsABPkyoYBoI
-        D/RAMVGIB7rO9MAQeJsP/gvwxajB+/fyz67PRmTVZc3JmTN69ujecb09AjwU8hf1Ni8Nde0+39eysIXO
-        Bl5HKIrC5YhiLgB3aQvcFSGKhnCbbTGOO2Kcd/d1PtDP9dhAt9ODPc4zrHVXh7PSHQN6FAOaYc0BTVgj
-        CGgEsupKf/daf49NAZ5bsdAFee0EXlwQ1o/gbuE1ZIQ05FCI/jAi2Puwv+6Q3nO/p3uzp2ezTrdfrz/g
-        53cwIOCQvz+LgIDDXl4bbG0nisUumALFwSUgMlhM/AW+ABewEpSYmkAvDt1PPDDsgH4zHujK0wN9fqMH
-        /1f0lTihNG5q3Oqtq1c3rc7fkp+3OQ9zjrmNuasaVmlSNWZDzV4MePF/bP7HRvFCpH3Xad7m+WEyjtEM
-        ZRZhLAhrA7sDFQ297JqiHZFtbu/jtLOvy95+LocHup0c7HF2qNeleO8rwJqRGksiAxoVY2FpV+TrUuzr
-        WuLrUuqDcC33davxd28M8NgCzYUOtId1C7UZ1kHeB/y8Dvh4HfLyPKzTnfD1PR0QcCY4+GxQ0GlEYODJ
-        wMDjiIAA9hERFHTCx2eTg8MchSIgMjISJ0JBPQAxcRb4EqxowWEOCPNQeGASF9O9aOzjgV4RHjhR0ehB
-        n6evwRf7+vqmrEkp3FO4fvf6dbvWrdu5bu2OtQXbC+bWz5XlysSpYvFcsXi2uOeInl0jur7g/IJK9j8R
-        dl2neZkXhD4C+hHcQNxP3hDpsKm34+Zop60xwNoZWO+OdT0wwP3YYM8zQ71QMb4ynJWLoR6M11xpHs9h
-        BFETF/m4FOudi31cSvSGKOMc8UbIaztYP6K2v9devcceT/e9XgDa5yiH74Xg4EshIZe5uBQcfDE4+Hxw
-        8LngYPwVC0IfT0JCzgQGHnZ3z7KyGmxhocJFHHTYGXgKZAlWQInD9TFzhS3dOJgLQ4HYqYouET2w+4Z/
-        8J/EF+DLsH56+XuVHypHlB0sKz1QiijZX1LcXDy0dqg0VypNk0oWSCTzuZgrYYiP6tk1tOsLdi/YSl/o
-        Z2+W7GNJKBsiRF4eqK6PcmiIIqydt8Y4b+vrsjPWdXc/t+b+HkcGe6K8g3IxKtGokV4f5QNDcn6gy9He
-        1qdiHS8MchfpnYsQ3s7FCD1AZ3CX6l0qYIrhH2AkADdMhZDaAV67fTx2e7nvdnPdBX3w8zsSGHgiMPAU
-        ByLQPA+IQ0KuhGLLJIurXDDcEaGhF1riYmgo4lJY2BVf33onp3kqVQgRnC6pAl6EJgau0MzHEDAeGJ/A
-        hhGMBmJgxeiBT+KBv8XXwLcMmzSs7kxd3em62lO1NSdrqk9WV5+orjxWGVATIM+XY5JRtlgmXSSVpkql
-        KVJJMgf3DLHlRMsesT1e0r3Upft/+ahfGufWIz9EBqwLA+Ubgq3qIh02Rjo29HZsjHbaEuO8tY/L9ljX
-        nf3c9vR3R5Hn4GDPE0N1UJITA5yP9rE/GmN7pr/zxSEwf74IAF3ozQJYs2jBGnCX+bgi36sXUtvfc5e3
-        xy4Pt12QYOivvz9YfAxBmsCpBOAGWxnWwDcMZ82FvRIefoP7iLiOwCfDcYyDICIiXunV60Z4+BW9foOj
-        4wyl0h9GDasZ5BuoAT403zDchsEJjLliPzAeGOLGA+19/kGfwV4SPLBnIL04velq05YrW7Zc3rL58ubG
-        i40YRK86W2VfZ69Yo5CvlMuXyuUZclk6Q1y2SCZNlkoSJeLJYsx9iceKLUZYmIWaveDwgq3shcGO3dO9
-        xJWhNrW9HDZGOdZHMaAbo50Z1n1dd8S67ezvDiVpirLfFG7dFKZtjnY41t/9/FDvS3E+V+J9rsb7MKBt
-        FcO8nddzYQr3I2r7uDfp3La6uW7T6Zp9fbG+AWIKBjRhDfHlgikD5AJYh4VdBbIREa9GRLwWEXGrVy8+
-        XouMvBkZiY+PIirqVlTU6717v9mr13U/v1onp8kaTTBOQEtKSoJrxuQ1htswGosH5lRwNhceGJjHFhWj
-        BwRdF6ADvrtf273r5q6dN3fufHXnjhs7tl3ftvDkQnWDWrlWqVilUGQpFJkKxQqFfDlH8FSZdKZUmiiV
-        TJZIJkrEEwyI9+jb4yWXl2Qv/vcwB1mmvw2yTWDd0JsBDWpv7GVXG25TFaypCdY0hNtu7e20K9Zz3wCv
-        o4N0p4Z4nxumvxjnc5nDWtT9f16wksZ4OqxqC24m3F7OZe7Olc5OtZ6e23x9m/39mYsICDjCBQM6MJBn
-        NEh9Ijj4ZHDwKU6Fz0EcoAyEda9er0dGvhEV9VZU1NsUvXtTvMUFnrwTHf1uTAzivZiYDyIjryECAzd5
-        ei61sxuhVHrGxsZCWOALId/oeGKiEGNBeGDOHoNY9BEP3FGWMCvhwDsH9r+zf9/b+1i8tW/vG3v33t47
-        6OggVb1KWaRUrlYq85XKPKVylVKZo1SsVMjT5LJ5MtlMmXS6VDpVKp3CIT5JIpkgsYyyRFaFoSRrcc9B
-        ttIMb9WGYG1ZgKrET7khSFMTZtsQ6dTUx2NbH4/tsZ47Yz139/Pc28/r0EDvE4O9zw7VX4jzAbVFWUF2
-        fa0sVRYBrjapLVgb2O3pVOTqWORgX+TqWqnT1ev1W319d/r5AWuIBsM6MPAohzLRmWf0yZCQU1ycDgk5
-        GxZ2Pjz8UkTENYgD+AvCEqDR0e8DTUSfPh9ycYeLj7j4uE+fT3r3vt279xsxMW/FxLzTp8970dE3Q0K2
-        +/hku7pOsLYOlkhkMHDQYqSOWD8hLJgPwgOTK0gR8xrzjn549Oido/h45IMjiEPvHTr47kHvQ97qjWpV
-        qUpVqFKtU6nWqhjiq5WKHIV8iVy+QC6fK5fPkgNuWaJMNl0mmSKxmGDRzbMbdmIh4XzxxRe7d+8p7fJi
-        fyvLlb5Wdb2c6qNcGqNdG6PdtsS4M6z7eu4wYO21p7/uwADv44O9zwDrYXpRYbjzmjDH4fYyqZmjo2Yq
-        Ye3ltN7VYZ2D/ToXlzJPzypM43GxUa/f7Ou7zc9vj7///oCAg4GBwPpYUBCCoRwcTHQ2AB0aihmo02Fh
-        hPXFiIgr0ISoqFeBYHT02zEx73PIftK37+/79v20b9+7sbF3+/VDfN6v3z0Eod+378f9+n3cv//HAwf+
-        fvDg38fFfTpixKejRn02dOjF2NimiIhVfn7T3dxira3d9Xo9Bg8HDBjghSzr9u6D7x089MGhIx8eYXAj
-        PjqadytPc1ADoNXlanWJWlWkUhYqFesUstUyaZbUcpGlxTyLnjN7dp/Wvdvkbi+Nf+nFhBd/N/p3L45+
-        6X/kv/Pw8O/TZ/jIkYnTp6ePHTs3LKyfg1Q8xkVTGAoNcd0U47Ypxn1LH/etfT2B9XbA3c9rd3+G9b4B
-        uqODvCEjotJeLoURDOupbirLLlIb+TBXh7WO9mtdXIo9PDbodOBylU5Xg2iBu8HHZ6uf305//2YO68NB
-        QUeDg49zAYgpThHKBHR4OOJcePiFiIhLkZFXo6Je6d37tejoNyERQLNv3084iO/17/9l//5fDxjw9cCB
-        Xw8ahI+fDRp0d8iQz4cO/Twu7t7w4fdGjvxizJgvxo37YsKELyZP/nLGjC9nzfpq/vyvUlO/Sku7t2DB
-        zVmzjvj4jBiXPHnfOweb3zmw9619e95s3nV7987Xd+64tSPqYNRL1S+9uPrFF3NefDGTxUsrX+qyskuX
-        ZV26LurWdW7XrrPMzBJ7dE/s2WOmhXmSpUWSRDxTZjFc2r27eVJSRmLisqSk5bNmZc6dmz1/fu7kyQsj
-        Ivrr1fIkL9v6aAb05j7A2gNYb4313B7rBax3cXA399cdHugtquztUhbJsF4b5jTaRfXb//xPS8tejo4r
-        vbwqEC1AM6y9vWv1+jq9Hryu9/Fp9PPb5u+/OzBwf1DQ4eDgoyEhx0NCToSGngwNBcqnwsIA8RkKDuiz
-        ERHnIiLOR0Rc7NXrclTUNcAdHf1aTMybkIXY2DuxsZ9yWDOIhwz5Ji7um/j4L4YP/2LUKID7ZULCl+PH
-        fzVp0tdTpnw9Y8bXSUlfz579TXLyN4sWfZOR8c2KFd+uWvWHgoI/5Od/IldZlx2qOfHp+RO/P3fi03Mn
-        Pzt38u65U1x4ndartmmV1VplhVZZzkJRqlGUaOTr1PJstWypSpamlC1USlOU0gVK6XwFQjJPYREpCQqK
-        Abhz5uTMm5ezYMHqhQsLFi1au2RJ8bJlZSjYhIT0jbZTLwtw3NzHA8GwjvVC8Fhvi/Fs6uUlQm0eWOeG
-        Og1z1drIxBC4/v37S6V6e/s5Xl6VFCC1tzfCgLWPz0Yfn3pfX2C9JSBgZ2Bgc3DwwZCQI8AaQIeFEcqn
-        w8MBsRBlAH2uV6/zXFyMjLzcwu6bMTFv9Onzbt++d/r1+7R//y8GDvwGWMfHfzV69FcJCd9MmPDN5Mnf
-        Tp36bVLSt3Pnfpec/F1q6ndpad8tW/bHrKw/5uX9ae3aP5WU/Lmy8i9z5mwZMCbu1N0Lpz6/cPrehTP3
-        Lp794uJZfLx3ceVbOepjVqrNLUAD6w0c1iUaxTqNPEstX66Spatki1WyRSpZqopHvKeHOC5u6oIFeSkp
-        q1NT1y5eXJieXrJsWXlmZlVOzsa8vMaCgi0TJiTbymQJ7jblka5b+no0QUBivTZFe9ZHeG4M86wL9agP
-        dRehTDzfzz7YRgnviZIjrgzAFiDszerZU21lNdzDYz1HagPWen2NXl/r41MHrDmgEZv8/bHdCOPVGLI+
-        HBqKCeAT4eGnwsMZ0BERIDIFQ5kHOjLyAhcM7qioK717v9y7942YmNf79Hm7b98PYmM/6d//cwjIsGHf
-        jBz57dixf5g8+Q/Tpn03e/Yfk5P/uGjRH9PT/7hixZ9WrfrTmjV/Li7+S0XFX2pr/7ply99iYqZl1uSd
-        /eLS2S8vnfvq8nkuzuH5l5cGXBui3melarRS1Vqpqrio1CIYqdcQ0Gr5kpZIMyAunarsKRODzosWrU9L
-        K8rIAIvLV6yozsmpy8/ftGbN1vXrdxYV7Sktbc7Orhk2bFKItTrZ27E23KM6hEVViHt1sFttCMJVNNrD
-        2kYhw04sXECwdu1aeKO8vDxsHcCCHh0drVCEOjkt9Pau5BhdpddXA2sfn1pf3zqkc35+Df7+AHpzQMAW
-        jFcHB+8NCTkQiimn8OPh4Ri7Ph0RQViDyBRE50fRgji0G4hf7d37enT0q4R4bOwH/fr9HgQfNAjs/jYh
-        gcGdlPTdvHkMa9A5O5sBXVr6l6qqvzY0/DU7+2xgVMSh908wlL80oExY7/v8oPM5d/VOK1U9B3Q1Fwxr
-        K2WpVpGvUWSpFSvU8gwu0rngQJcMUISGxi5ZUgQWL11atnx5ZXZ2bW5uQ0FBU2HhzpKSZlieysojWVmH
-        Z8w4MGTIAU/PTPOXJIOstPm+zpVBrlXBhqgB0Dh8GiX20tJSJAXYkI1aOxDHA5UHfH7ChAmWljY2NqO9
-        vAr1egBd5eMDoGt8fWv9/Db6+dX7+zOsOaAR2Gu0IySkOTT0YFjY0fDwExERp3r1OtOr11ku2oUb0Lfm
-        OEO8heNvgeP9+oHj9yApcXGM4FOmfDdz5ncLFjBqA+61a/9cVvaXwYPT5+Sknrl36UxrRgPoWbfnqY9Z
-        q5qsVHVWqhouOKyZWBdpFasAtEaxQqNYSvEIcUu9bPToWRyLKzIzQeSN+fmNa9ZsKyjYnZ6+b/r0g3Fx
-        h2NioJmHoZ/+/jvw/gZQKtVwvUQ+39WuMsilKtilMph9FKFbgQeyABhSPFAyx6OMewB9PNDsgGdSqUJd
-        XFJ8fKp9fYEyCz+/OmAdEFAfENAQEACssSUUG0OBNfbTEdwHwsOPcjsKTOE2prYJzaEql6AqLTSHjt8W
-        0Pwe0RygT53KJGXKlFccPfT1F3ee/OzSqbuXTn1+6TSP+JeXAy+FqputVJtMgMaSuE6ryOWAXq5RLBPE
-        Uo1shspCLsW6l55ekZxcPWNG7ZgxdYMHN8bEbAsN3QUXEBCwJyAAT2DA4As2A2UoKvemr7C1naXoJh5l
-        qwXKFCIUuvCgNgdq8PQRZWL+I30SO+UlEitb23idLh/5McLfv44LhnVgYENgYGNg4GbwugXrbSEhO0JD
-        92LTRlgYExMO8dMt1O4IaB50Ac0fgd7C9Df79mV2pV+/zyAvrq7ZCfNmHv7o0pGPLh39+NLRTy4d+/2l
-        459eOvHppZVvrJYfsZFuspJWa2WVWlkFCzk+lmtkRRrpKo00SyNdrpFmqCXpLMRL1JZpaovFarMouZ3d
-        wJCQ4oCAUhRhdDoKJqEQT2CKJYpk09/fEPgMFBV/i7e+i8tKqTSmt0qVo3dkQBOg1EZC9Z36RsIGB3oc
-        KBbjgYYIenoqlY+z83Q/vyp//9qAAKDMB4Mbh1JgWzlH7S20fTE4eDt2IoWF7QsPP4zNMq3hbkO1TXW8
-        TdxbNB2r6CuhoYfVNi4lBxoOfnj+4IcXDrG4aIg7F0NPDejRpO1RoelRrOlRqOlRpOlZyKLHGk33HI1Z
-        htosTW2WojZboO6WrBKE8gVbsZXVNDe3bDe3HC7yPDxWe3mt9/Yu9fau4MQTQAPibQEB2wMCdnAfEU2g
-        tq8vsg2YtA1q9WhvsSzFzU4EiNGjQ3cODQ7qbqCvgdI7dTGo+o6PeOCPqBdjwUQvytq6t4dHakBAHRcb
-        AwOBMgWjNoe1QUla4CaCN4Pg4eFHIiJ+CMHbW0sdHOYPT5x88IOzBz84Z4gPzx3kovB2rXy/Q/dalVmJ
-        ymy9ymydymwti25rlN1ylV2XKbqmKbouVHSdTyHn46U46W9/a+7ktMTZOd3FZamr6wp39xwPj3xPz3Xe
-        3uV6faWv70Z//ybgC+kICtoTFLQXXoB7Ar+7HX/FsRtpR5WtbaKVmVjEQ4zuEZpGQBPVL7QqUHHHA0Vh
-        VNxRTafSOz6DKhr+Fvtq5XIre/shOt1KgjswEHC3hziEu0mA+C4O8YOcgrMF80klRYg4fk+VtXNhcy0H
-        tHHEnI4z26o026AwK1SYrVeYrVOYrWXRbbW8W5a8a5qsa6qs6wJZ1/nG8TtfsUzW18lpcQvQmW5uqzw9
-        C3S6IkgwpxubAgO3cb52H9IILpM4wHnc/cHBe+DBOGoj26jGO8DRcb4ImkAsBmfR10BTA4Ci3I6N5Ci0
-        46wlqrLjI0rD+CPK8KjH4wUA5RcuXKhUOmOfvl6f28JuHnQjgpOe8HBDUsBxJikCxJ9YxIG4nd2cUbOm
-        tolyzVvb1QeczTYqzUo5oFtQNluj6JYr77aMA3phGyh3mSL9rdTc2nqak1Oas3OGi8tyV9csd3fQGbpR
-        BpLC1+KosMBAbDreFxICiJFAHOHiMAc02A1eY7M3pLxcp1vn5ZUnQo8OgoDuEXgK2gJi4AtYsV0f9XUU
-        0VFZRyEYDzzBZ/B54A7QCXEoODy4SuXu5DRGr88LCIBwUzwR4jsFqsLrOHxh2+6bZzRoZePiWXa4sU2g
-        B59N6L5dZVapMCsyoXO2vOsSjs4pbQD9Ym+JuXmQk9MiSAd0w8VlBejMCXQhZBdrHdZAQd5wGF4WEHNx
-        ICQEAgLVRipX7eeHL4agF+p0a0QgJrQCmgB9QMcIrSBACXxx5CDK6lT2xQP7FPEcJXaU2wlxVCZBcBAf
-        /xCraGJiokrl4eg4xtt7lQDuxyMuVBWsnKGhewQ0N5Jy48XT2nrqpEVz2kR549s7tQddzeqVZmVt0Xl5
-        u3SGjPyPnYVaPapFN5a5upJurNHpijl1RuoAMdwJC0sulsN3D+0+RgGd87vQFphgiAwcC4AuEEEu0KAj
-        IgM7QIwWBiAGuCii49wIqvPSA1sVUWgH4oAbHOfhBrshJpjN4OB2cXCAC1zRGm4DzVtLeXsrJxOW1qBj
-        /RQynaU/eBd7BYfUX9zVLp13tEPnHHnXdFnXRW3T+aXBUjMzL6KzszPoDN3IdnfP45ZBoMb8BvIGZGdc
-        ggaZRgWCFn/QHJ9vxLsZlszPDy9JuY9PCYDW69eJoMiACVKAjhyoCgQJYsCKQ3qx1RYndWCzHB54gk2K
-        2OgM9PEF4DixG308iAleJ7xa+G5YXTGjhVOD7O0HeHgsbAtuIeimUm5kV8gjQtAhL3DlpOkMd6Vy2PzV
-        S9tEufLNJqbObdI5T95tRQudk9vQjRc8LeXygRyd01xcYDkA9EpYDk/PfJ1urbc3FsNSIAgcIQ6cu6Uc
-        gn4R/BHCUu3vj7+tQLRgXSTCex+KDLDAUCgDGkLAERADVuyOw2ZE7GmmB3Yl4o+EOODGAeD4YvwTdPDw
-        PsDrBNmB+EC4ofXwMChR4Q5Aa+twHK3n67uufcSZvAgcC35uY6a3XkUZ7o6OyVHDBu175+SBD87wcfCD
-        M1ycjTk9rPt2ZbeKttS5YzqPlPy2W08YMvgE/C8cHVOcnFKdnRe7uqa7uy/z8MjR6VaDoRAEDmusijX+
-        /jWCXw3PWXBY428Z3L6+G3x9y0QgIxQAckEHoIDIoC3t98Secdpeiwee0IOHG1+GvhGJCaQGmk5KgjcH
-        CTcUCQssqlToOUG+cbqep2dah3C3Ky8t3txgz/F7yjW2OZvWH/jgtGmsfq1Uvs/OrE7erUzWbb2s21pD
-        dC2Qdc2VdV0h65Im7ZIq7ZIs7TKfQtJlniF+52cuFofa2U23s0u0t5+JKR/A7ey80NV1iZvbcg+PLPgH
-        b+81Pj7AuoTDugLkBawcvrwR4LE2UBtYs4O6oQDQAUBGR/qAyHSGI38yGN0mjwdd6oq/whfgKDt8MbiP
-        14ZXErwt8ObAdAAZQQg3wY0kHnqCyVsrqxBn5wne3tmdQLxN98JyIo1mxNj50w98cKrNCD4ebbZF1q1C
-        2q1I2m2dtNtaabc1LLqulnbNknZZIumySNJlwSNweZRfGiv+rUV3fHNb26nA2t4eWM92dJzr7LzA1XWx
-        m9tSd3f0Q1ZhZdPr13NAb+CAJpSFQOMnN6a2CCiDktABkgvauEwQA1n+PhE6qJJOzSeswXdSEug4ryS0
-        TvLCbQQ3TCQqghhKQrJjYxPp4jLVxKLwpGj3ibNzil9kRMPlnQfeP2UaC64tNd+rMquVdSuRdlsvRFnS
-        dZWk63JJl8XiLgvFXeaLu8wzjhcCe1pY+NvYTLK1nUxYOzgkcUCnuLgwoMFonQ6MXtuiHgDalM7Cn9xA
-        bZ0uWwSU6cw1Xi5MUebPFCOshdRuU0lIuI3gpvQSCRHcJHJ9tBdw1zEQt7aOAMdxwmFnOI7f0EKqzqhY
-        1SbK+KTrYV+zTdJu5dJuha3pnCfpminpkibukirusqANlF8ab/lbiZlKNdTGZqKNDYCeBkY7OMzCCJWL
-        C6QDGr3C05M0GnQuhuxydEbNx0g3HgGNXwq/GlYp/JoiXpSN5IIo3OYVmEZwg9q8kuAF412gEG6ICWk3
-        lko4E+TxsJWooiAvBeI4XBSqotH4Qcfd3ef5+KxpD3S8r0fPndIeysPPT+i+S2ZWzYmGkM75HJ2XdUjn
-        oJ7m5n7W1kB5oq3tFE46QOc50A0Xl0UcnTO9vHIh0BydSTd4Oj/SDfzw+BXwi+DXwS+F6XocUYNaP7sr
-        SyjKQrno4HRMI6zpkmgoCb4VucA24aalEs6EjCCyJMg3CI7sH2UsdBtwjihGBhQKG0i5o+NID4/5Pj4F
-        POggV3Cf6PZEY/2tCtV+B7MGabey1nQukHbNlXRd2YJym3Qea0TnqRydZ3J0TsFK6O6+nKNzPhyxXs/T
-        2QA0fkj8qPiB8WPjh+/duzfKnJgB52vOqNyJsKYJD0rp/O3VvGoLlaQDuPkcB5knDCV8N1ZL0hMiOBSc
-        CoRw4mhd4mhIuEO5XKXR+MKS29kNV9vYZTesaY/OgcejzLZKu1WarIGgc7akS4a4yyJxl5Q2RANi/YI/
-        1DlAQGfoBug828kpmaNzBkfnVd7ehmXQ2zvf3X2hs/Mke/v++PHwQ2I8E+9LOFq0SoSVZyRxVBw13NBp
-        tPR18qRXfFmbcJNwG7EbppuWShhB8t1UMyGCkz+BggsRR6kLlXE01ebMmePk5JS4IrH5nebmd/fve/fg
-        vvcO73/v6P73ju1//8SB909OvJTUfY/crEbarZQTDZgNg9OQMDrza2ByG0C/OMrit+ZmGk18izpjGZxB
-        dKZl0MVlnqPjNEfHBBubQVptuFLpLpOpgoKCsEEEd4+gA4VKPV/TJ2QJXNoRQsV9drnvD0ZZuEi2t07y
-        cMN0w9uQEYTv5ldLnuC8ggsRh6qA48jsR88aferzU4gTn5049vtjRz46cujOoQMfHNj33r7Cm0WafVZd
-        Npp1KTXrsq5HlzU9u64x71pggeiSa9El07LLEssuqZZdUixbOw38kcX/6MzMzfVqNdp1fVWqKKUSa1eg
-        TKaXSt0lEjtLSyV6pjqdDpzFLAYmLqEJoK1wUwi/74bfbkPg8rsXwBh2Lzgdz9bm0td5aneS3ZTBU5pD
-        JSoiONw3FBy5JSQFiPMch6pg61X00OhtL28788WZM/dYnL53+lF8fjrqYpS0WWpZb2m+wbxnSc8ehT3M
-        1pmZrTXrmt+1S3aXlzJeejH1xd8t+N3v5v7ud7Nbx5zfvTDwhf966b9w/re1tTXeNJ6enjh1GvOMWCpg
-        iiBfmAbAQYt4V6FzjT4q7bvhd4RQNV+46Ybft0D7Qmi0Hsu+iET5x6PcMbt5Z0K+m9IcwA09QWmFEEey
-        Y4o49M470LtkX8nZL84iGNZ8cKBPvTlVcVwh3y6XbZTJqmWySpmsQibbIJOWSaXFUmmBVJIlkayQSJZK
-        JOksxOniR5Em7qnviZ132CIGTGfMmIHVGDKFHV3AF2dQwRFh+AKrNE7sQQsbnVVADP6SJhBnhchSc4oH
-        l3aE0L4F0dNFuQO4yZnACPIFE75ERYjzksIjjp/Sxt4mszrz3Ffnzn3J4uyXZ1lwoCPWvrvW6bSTYrdC
-        3iiX18rlVfJHQJdKpeukkhwJA3q5AWXCmg+LIRbQBOgspAkQo7COsWC4MezLw0H2QBn1A6AMoQCR8ZIT
-        xLTdBnV8PIiz1PYDbYEsHvymENoOQpsWGNBPpA9P9MVGSyWfVdJqCcNDJSoQHArOSwohDu0GBMn5yee/
-        Ps/iq/MMbgoO9MOfHw68GKg8oFQ0KRR1CkWNAkDLK+XyCrmsXCYrkrEx0WypFM3oZVJphnFIZkl6OveE
-        7GILKVgMiHFIILYZYK8YGnWwPfyOUhAZSxz1VAlcIIvFg9/FRJuXQFtq+MFKEbh8iwpphOiJgPthX8zD
-        bZRV8gSnBZMkhUd8yZIl09OmX/jmAouvWRgQ50BHDH55sPqYWrVDpWxQKmuVimqFokqhqFTIN8jlpXL5
-        WrksRybDAdfLZbKlMulSqSFaEMd4OW2ZgVDggbYc/o+40AFLAkSZJzKGA+hEf0AMfEFbUgMsHli0+S1M
-        wr02sFIwVPxeEGz4wHv05wC6PT0Rlk1IUnjEwSZM7WO62XD3wTcXDYi3gJ50O8nqjJV6t1q1WaWqU6lq
-        VcpqpbJKqaxUKsoVikKFPE8uz5Fjr4psmYzF0lYhGS8xV5lDLkBhyDH8LxQZRg2zcNjMi3UPs0TQCnSO
-        0KujnjXhC84SYbFi0xYm1HOwhgNZ0JZ22WClIXBpCwhWILxHf1agCfE2Cc4XqoA4fsm4yXF7X9976dtL
-        CNwwYQi6cOKbiznv57icc9Hs06ib1NiTQkCrqlkAaGWJUrlGqchVKLINW1Tky+TCwNYgsa8YxVuoBPAF
-        iwExzgPEq4sLRmAtMFEEraDD5QExNBfkBb6kBgSrcPMS31lFtZnfWQNw4axgZ7ECQRV/AaDbJDifXuI3
-        HDhmIMzco2tTOLh50Os/rfe97Ks9qNVs12gauQn+WrW6hoWqUqUqV6nWq9jmlBylMlOJvUAslrcKyUAJ
-        5jcBLpY74AsWA2LSClgLpMuQY7oKixrWuAQK+AJcLBsgLLEVrpRgJc4iFyNksaoDWQIXzgp2Fms+VPGX
-        BNoUcahhvxH9Nl3YdPkPlxFGt9Tgj7hYrNe1XlbHrbQ7tZotOJpco9mo0dSyUFer1RVqdbFatVqlylUp
-        s5XKFW2EfIpcbCuGYkCIYSogFOTe8DaCQabjt2HRqJUKiCG4IC/wRTES4PJSQFuVaIcSYEUuxiOLlQbg
-        YtWhLiDWfKjiMwE0IQ4excbHNpxrIJSNgkAfdGOQ9Slrqz1W2iattlGrrddqN2q1dVqGdaVGXapWrVGp
-        8lWqVSpVlkq10jhwOYI0UIorNoEvHhAK1NUw1AmtICLzt/ZCKIjFaBsBX9JZkgIeU9qbRLAKkcVKQ+BS
-        /48aVc8K0EixwOWG8w1Gl1oJ4R5za4z1WWurfVbaba1QZrfiVWs05RpcQqherVbnsms91JmtQpXJQJcP
-        lOOqeowm40EQQytAZBhk/i5ImgmgsQtIBA0EkBTwsFLPmm9bt4ks3wXEmo/HMwE0ftVBCYOYYgguaDN6
-        PvWNqbhg2nq/NbsYDzfy0n3e3HVAWtxNj3uPizS4KJZdnpJjjDKBrpyklFpLYZChxQQxEZncG13WC0WG
-        naDrleAZwGLwl6QW4JIOEFuFhCXOGiHLV5Ao9/7lgcavHT8lHttaO0B5zltzHC84Wh/kUMZ1vHTHNI9y
-        pZZdBNTOdbx0KZB6gVrmI8PwMSDGMDidaoOFl64X41GGY4NLo0usoL901TfwpZI91ZOFmFLnmjhLbVW6
-        CY0vbDy6h+WH5SBP5V/hF8CKNHbO2OY3mjtAGTfUszu8ceMxLhAzRblKq8XF9Dh0ha62yja+GI+AlkfL
-        sTEHEFPJgmZo6aJNpCEwcMiV+Qs0aSAAQkG3HRPEPKAdw9pepv2LMRrLCzKFxIzEYx8d6wDlRe8uMkYZ
-        okFcxr1W1Vp2K/1aJhptXkxPKCvjlVKplI5nosIQncNCt2wCZSR4dEcvz2WgTK1quhNBWEmmPOBJa0S/
-        DNBY0B1cHFLXpHYAMf4KKLtddLM+LOCyKcq4hZdEw+RWekJZNUUlc5DBLPMVZEKZv5BQqMvCa++e7r2Z
-        vwDQcKn+4f659bkdo2xQDKCMux2bOF1uWQANXC7nruDtWJrnqeV6OeoY/BFZUAxCGYk1qkKoBMEs89cb
-        w8DxV07T4ia8S+XHCObPCjTegFiL+o/qX3mksmOUsfo9UozWKOPuQaYYG7TawsctgBlqRYQCtWYeZVr9
-        6IY8lN9Qu4BfRrECNQrhhd104URnbhbsPPQ/H9DIrFDnnZQyae+tvR2jPO2NacxjCFc/3swBZc7Msct3
-        icsm18Lydw8q+7Fb6fl9UKjD0fV4VIcjaTa6QZruqnm6okEvxs8ENOoGOn9dRkkGsruOUU64lYBbpJmT
-        4z3GD0JZFa+SKqXIrYXSDJtBtx+jPI/EBEWiNi8UfLqi8TMBDclDsot8ZMOhDR1DfOKbE4NfHYxL0Q1Z
-        CTm59lBu857Slns0VWNVMjvDAgigycwJpRnVZKR/dMcuakPI/R57RWbnVaLNr/xpGY23J9zFnMw5OJSk
-        Y5Qb7zZGXo+0OW1jvU+QlbR4DKbLQsXo0DKrpqnkrnKUQIULoJE0wzUb3RqNksVPJBoGRm8oXfFTRG52
-        8tDBvcP7h+Y0ZJ387HjHsex2uvspV9k+sXSzWFJnKam0lFRYSsotJWUsxCUW4kIL8VoL8SoLy5XmlsvN
-        LZeaWy4xt0xrI8wn9uju1DUyMiBh9MCxYwaOGzt4wrghkycOmzIpfsa0EbOSxsydPT5l/qRFC6dlLElc
-        sXR2Tub8/FULCvJT169JK1qfXlKYUVq0tKx4WXnJ8qcLy0/CaJQO3HRu87LnPZbIoDkMBi5Ctz5ibb3b
-        2mqrSR2DshJ+9euQy2qYOX85+iY8l/kFEBkgSTNcM6SZbpunSVq6Q+xpXczdnsKIhK9bRdlKisryzJbI
-        qtqAyEZUVyByqitzaipXIWqrcg1RnVfHIn9jTX56WlJ0dPDAhP7rd609dfeEcXx+4pQgDn66v//lWOVx
-        uWynVNYokdVJZFUSWaVEViGRbWAhLRNLi8XSdWJpnliSJZasFEuWiyUZYkm6WEqR8SgksyzNfXr2iek1
-        d87UeXOnzZ83IyU5KXXhrCVpc5dmLMhcsSg3J31NwcriotyK8jV1NUWbN23YvrV6z676/c1bDh/cfuzo
-        rhPH95w+2Xzm9IFzZw5cOHfowrnDF88fuXjhyKULRy9dPHb50vEriMsnrl4+ee3KqWtXT7189fTL185c
-        f/nsKy+fe+X6uRuvnH/1lQuv3rh488bF11699NrNy7duXrn12pXXb119/da1p8Zo1G3RrYgcGJlVm4VG
-        aseKjL8t/bgUJ9+1Icp8tYjPsPmspH0np16kVoQrMFrImzksgHyeTbkJFkDMsvKuGQUNFD+NpPlppSem
-        vH4KjF6dt3jUiP6u3s4zVyRuv7G1DSLz1G6h85QbkxxO2smaJbImiXSjRFrTQmSey6ViaZFYulYsybWU
-        ZFkauJzOuEwhZLRknqV5YM+IiOC5s6fMnQ06T0+en7hwQVLaojnpS5JXLFuYk52Wn7e8cH1WWUl+deW6
-        ho2lTZsrdu2o27u74eD+piOHth/n6Xxq/9kzB86fPfhsMRqVARQ5PXw8Zi6fufXa1seyGF+w9fOtA24M
-        sDlvw5wycmsTUWYGA1xG5RM1OaoW0UXogivQhc/Vi9WKXoqEhAQUjHjLTGYOSwWfAZLNoKuhhQUNvmzU
-        yXnlH2zyfiCjczKTRw7vZ+9iO37+2MpjGzpisUCpZ91Mcj3tLN8vlW2VSOvF0hqxtFIirZBIOUVmUS6R
-        loilhWLparEkm+PyCkvJMkueyEaMlsxlXA4PC5g9a/Kc2VOhzkyaFyQuSoU0z1uWkZKVuTgvd+m6NStL
-        inIrNxTUQpoby7cxad64b++mQwe2Hj28A3Q+eXzPqVPNZ07tgzqfO3vwmWA0SjDoH/sE+cxeOXvLpS2d
-        YTG+BjYZRLY9b4vE2uAuNrfOR/iyJwwGVfE7rHyyWn4K02VMJROXhYkJVTNoUoBKoEKb8VPnJm0nLJ10
-        HUXrMhKnjw4P8/Pv5Ts7a2bjpfpTd4+3hIm7aO03JrwyjinyPk6RDUQWSyvE0g1iKSiMgMGAKMNgrBVL
-        c2EwIMqWkuWWkqXgMsUjdTY8T7Q01/eIjAyZPXMy0Xn+3OkLkmcsTJkJaV4Gm7EydVV2+prVKwrXZ28o
-        y6+pWt9YX9K0uXLndibNB/ZtPnJo29HD208cY3SG2Th9qvns6f2/JKPhOtGWt7W3RcMpf1P+yd+f7CSL
-        8WWrPlzFrMXZ1oosTKxRwheK8roWUW6/V8JKzDNV8MuY/xR6DJpAJC6jZkQNQPzwKIFSnk1b/IQ2g6qg
-        nd/k8IMFmhWV2mP0soyZSK78fT38wn2mp08pP1J68u5xYXTM6JL3iqIvRqmOKWS7JbItsBZiaTUUuYXI
-        jMssJLxTNhZlnsvGjBaPs+jp0j02NnJm0iTQmbMZUxfMn56aMnPxotkZ6fNXLIfNWLI6f+n6tbAZeVWV
-        a+s3FsM179hWvXvnxv3Nmzmnse3YkZ2g86kTe06d2At1PnN638/KaJQNYSQgfAERAdMWTSveW3z23tnO
-        UxhfuevertG3RrPOyDFr6+aWwgX1rQWtawOR0fEra6ksI+vLa7dRYmiXjGV1DMwkGnEZHsOIy1TOB5dR
-        aCbLTNtVhd2pn4fLj2od2ZnzUAeI7Rvm5mrvG+o9bl5C3uZV+99pNhQoWhOZJ7Upo7d93DTq2gjIMfMV
-        2yTSRrG0ViytEhCZYzEjcqmlpMRSsl4sKWjtLh6JchuMthxg3kNlFh/Xf2bSxFkzJ0Ga586Zkjxv+sKU
-        RMblJfNWLk/Jzlycn7d03drM0uJVlVwGuKmhbFtT1c4ddc17IM1IArfCOB87suPk8d2I0yf3smzwZ2A0
-        NsJ5+HrETYpLK0zbeGbjY+vFbbJ77xd7J92epLussznJFTlRSoZBFvqKlnzvUVO1vKV4/zinzAxGhhpV
-        fNSX0foT1jEo9yO/TAOfNCpnxGXTTuvPyWUDo1GUaH5rT0fVtQ4ZXfF++ZArgxxO2Mn2S2TbxYzFda1Z
-        3CLHBiIXg8iWkgJLsdAmZxjxt9UfxTMszf17BAbop0waxXF54pxZk+cxLk9buCBxcSq4PHfFMuJyxlpY
-        5uKcivKC2ur1jSwDrIQ0t7hmRmc4jeNHeXWG3/i5GP1E+iv84oI7BZiEY509aDGKyB2yuJUiUxeqE0Sm
-        Hja6q3zfjzbqoPWHphS1Syj3w9gnHTzSJpf5ytxT3Bn1pA5E9NhisZHZ2PHRtmmvTPE56y0/KpXuFku3
-        iKX1ltJaS6bFZI0pWuSYERlyDCKvs5SsBpEtxJkW4hWWYuR7HRIZ9tkCoqwxGzQwOmnG+KTE8QYuz52S
-        PH86ShmLU2cxLi9Nyc5q4XJRzoay1bXVqGaUbNm8YXtT1a6dTJoP7t986ACchoHOYDTUmfMbzySj8+7k
-        DX11qMclD5tTzBezBG8bNzoER8FbY4EWG+QYnREqXNAABqxFh7ULwwQXsr5oBaZeeFGmm5747TqoL2Ns
-        ATU5dLJpyIg/eER4JMazwGWDRj+W0flv5Q7DxcGnXGRHJIzCTWJJvSX6INIqS2mFpXQDF+WI1iwmX1Fo
-        KVljKcmzZCxeCSJbiJdZiDMsxEssERKEIfFr9cRytHlPt+4RYQHTpiYkzRhn4PLsSfPAZYPHmJWRPo/p
-        ctai/NwMrpSRXVEOLq+tryvewgrNVbt21DbvbtjfvAl0PnyQjDMzG/DOXDb4bDD6zLdnVt9ZDTvsf8Wf
-        VdqOClTYlMKtWfxIjuErULXAVBw/F9DOMBFfjWPuYrBSZivDoDjvlIWijMEXMhjUxkZ9mT9zi06DotzP
-        dJrrSSe4nlSCH/v1rTS69L3i6TemRpwPtT9hKzvcwt8GS0mtpaS6pZW3gevmMQpzUdbyBIwu4+S4iJPj
-        fF6OLcTLLcRLwWJhtMFoy/HmPb17BAR4j00YNmN6QuL0sTOZLk+YM3vy/DlTFyQj90tasnj20vR5K1cs
-        XJW9eHUecr8VJUWrKjasrmG6DC7DMleCy3t31+/b23CA0RlOo+noYVbWOH4UhTrmN34ZRpd9Ujb3rbnw
-        D75XfNkA8nFrpr97uYwOXrhN/oLC7bEYtbeSljoyZXooJbcz4dmKyEOVmJDDcUBEZOE2YMr6+IMQ6axJ
-        MhiYMKJZcTpzy/R4l6e+L/ixzG23Zyg7LJbuEUthgdGBJvJWCcjbwl9isSG45jTjMp6UWhi0eC2nxQZT
-        0cLidCMi8398xGjLBPOeuu5+vl6jRw6ePm0MuAxdnpk0fs6siVziNy1lwYzFqTOXpM1ZvjQ5c+XCVTlp
-        BfnLCtdxud+G/NoqA5e3bqnYuZ1Z5uY9aANuOrBv0+EDTVweuJXU+RdmdBvMpYqEaXDDsnywPgg5ChQr
-        YI1JizvNYiooI9+T2cjopj1TItO5qej4wSnTHjQ6CBGz4uhhYyKfihg0yGx65tZPuin4SaktkoCzbdLW
-        hMI0ZcGVKSwkRRaSdRaSAjZrwRwFAkJMjqJdFgvYnWZpMbhnD0ez4CCfcQnDGJGnjeFEedxsiPIsZjAW
-        zJ+WujAxbREzGCuXL8jOhMFIX1uwvGh9ZlkJ2iXMLzfWF29phC6jAQguo9BMBQ20TrYgjjA6Q50NfuOX
-        ZnSb5DVVYeqAEIVhJ3gh5h1F+209o3Yfkj1FiALnNGAzpZG14O/p5ImM8gV/bip/ECJEuTMnmz0p6X7S
-        rxe1El9iMTG3JdigULGFuIibFVptIc4xF2dyAVNMdqIzFOYsh+Vk854h3buLu8VEh06dMmra1NHgciJE
-        OXHcrMTxs2dOnDdncvL8qakpMxalzkyHKC9LzlqxMJeJcgZnMJD45VZXFtTVol1CHqNiJ6sy13BchjQz
-        OpNxZt75GWW0qQTTZEUFy+vYMDKvwjQs2wk78chXzOPk2F6GPX7Yd8bLsfA8dlgLOiycTrIWHgAsPDe1
-        Y1F+pnRZ+BYRteJvqaWBvDTrlm9hucrcMtOcTbytMBcvNxcvMxdnmIvTzcVp5q19cXvuwsIy0dy8d4/u
-        Vt0CA71HjhwwdTKIPGr61NEzpo9J4pwyRHnunEnJ86YsTJ6+aGFSetrs5UvhlBesyl6Un7dkbcEyTpRz
-        KpjBQOJXuKmhuGlz+fat8BhI/2ogzc170DdBEth4YF8jV9Zg3vnZYzSJL09eWAjoL/Xu+NIE2eHH5XVG
-        WoxJOOUApcxZhjNzsLuPWCy8nJo/ZATJHgbjcEIDv72dTrLmiUzlC6NzU5/KaVA/qS63YrR4nYUY5iHP
-        wjKHYy5HXjaxSUObGeaW6YahTcZiYbTK9Fox2mJiz57h3buru/n7ecUN6ztl0oipk0dOmzJqBog8LSFx
-        BucuZk2YByLPn7pwwfRFqSDyrGUZczOXp+Rkpebnpq0pWFq4bmVpcVZFWW5V5eqNNej7FW5uQBubcXnH
-        tiroMknzvj1IAuvBZU6dmUA/o4w2MJfMAy++IO/j0rk2R4dUk1WYG5JZyXAAKXrnbbIYdWT0RIR3N/AX
-        C9D2a9rhzh9NKyQybakUdq+fWVE2eq+IGG155raQt83R4w4YbTnb3HxAj+7u3RwcrCPC/MeMHDR50nCe
-        yFDkRCjyjLGzZ46bM3vivLmTFoDIKTPSQOQls5dlcIqctTAvJ23t6qXr1y0vKcoqL82pgihXr9lYC7Nc
-        tKWxdOuW8u1N4DJKGQabwei8t37/XqgzzMazz+gfxFyezhivV/ZlQoxrnnDsE09hOrCMv+GFDtQiFtOt
-        AuiJ0GkjGCOioxroHAHyyGQt+NoFT2S0SJ6d8sUT6buoTfI+ltEWU3v27NO9u2u3bt26BAV6DxvaZ9L4
-        +MkT4idPHDFl8ohpU0bCWsyYNjpxxphZSePmzBo/b/ak+XOnLFwwbdHCGUsWJ2UsYdYia0XyqmxekZcX
-        F2aWl6J8kVdTVVBXs7YRotxY0rSJuIypjMpd25k079lFrhk1DczPPUeMbmdKs00JhpHAbidFoEKmYefI
-        4igiYWpHFKZ7oCDE8MX8PUX8PTp0szpqb5hTFsoxqha0yZ0/R0B4JPvzS2Se9Z1itMXEHoy/7t3MLLt6
-        eTpHRwWPGTVw4vi4iRPiJk2IY3I8eThYPGMaY3FSYsKspLGzZ42fO3vi/LmTU5KnpKZMX7KIM8gZc1cu
-        n5+dmZKbvWh13pJ1azIK1yHfA5FzKjesqq5YXVe9pmHj+s0NRVs2FYPL25qIyxXg8q4dVXsYnVFrRvyK
-        GK1OVavGqZR9lHJPOXp3dA4ynckJ/SUJ5o+SpTMjicL8yXB0chnm7FE+RiuEtBiFNzIVqL1h3z3JMfkK
-        tEXoKIE297k/kSA+g1/citEWST3Nh3fvGWEG8TUTd3VysgkM0PXvFzF+7JAJ44ZOHD904oRhkybGTWmh
-        8PSpjMUQ4pkzwGJOi+dMTJ43KSV56qKF09NSEzl3PHvl8nlZK5Hppa7OXbxmdfq6NUuL168oLc6sKAOR
-        c2sqV9fVrKmv40SZ4/LWzdDlsu1N5eDyTtB5R9Vu5jSqn29Gwzao4pj5ZcxVSR97DjJ/LCfPX8rroMLo
-        SROF6XA4OryMvw0KrRA6+cmIxXQJCX9DhtGBDc8gN3/YjySytVZ7ejiFhuj79wtPGDVwPLcxz0Be8HcC
-        +BsPCZ46efj0qSOmc14iCRROTIApxp69eXMmcBRmjmJxKuco0mcuXzoHLM5mLF64OndRQX4aJ8fLS4tW
-        lpdkbSjDHi9Yi3yOyOsaN8IpF25phFkuAZe3NTEub99aDi7v3A6nAeP8q2A06md0ayR/wjR/fSR/Wq/w
-        HGQ69pRO5qTDDenkSFJhnsK8EMMXo1JBh2uRNeav0hG6Y35O+XnJ9J6U16KJE4ZOmjAMe0snM/GNnzqJ
-        kXfaFJCX09/p4O9ojr9j58waN2/O+OR5ExfMIy8xLS11evriRFAYQrxi2dyslfNzshbk5izMz11csDpt
-        XUFG0bplJUWQ45UbSjF3AV+RV1sFRS6or2WivKl+/SaIcmNR02ZwmdGZuLxjK5zGhl8bo5GzQW07fw4y
-        HXuKiU3iL2psdP4emni8CmO+gg405C/covO1yFHwV+n86lncqno3Y9rIxOmIUTNxunsSErmEObPGzp09
-        bh7pL6tLTF64APydmrZo+pLFM9KXJC1Ln7Vi6ZxM5iXm5WQlrwKFV6UW5IHCS9avzShav7S4cHlpCViM
-        2hvkGNts2b7auurVIHJD3dqGjevA5c2NnC4zj1GydUvpNhYGdf51Mhpu94nOQUaNGEUJHPJE50eSBJOR
-        4I/gEx4VKRTiX6uj6Ixei+bPhW2YsGD+xJTkSakLJi9aOGXxwhbypiUuTZ+1fOmsFctmZy6fmw3+ZoK/
-        KXmrmJdYw1Q4bf2a9MJ18MXLSgpXlBGLyxmLq9l+cShy3sYaVJMLGurWwF1sqmdc3tSwnuNyURPSP1Ln
-        fwVGP+k5yMKjeukISTo/kr+TT6jC/8oUNq5HL12SuCwjaXnGzBVLZ61chiwO4suRF+KbvSA3OyU/d+Hq
-        vNQ1+YvWrl7MqfAS7DksXr+0tGh5WTF88coNZVmV5YgcdvZBRW4NTj2AItfk19fCXTAuI4jLmxsQqMmR
-        Ov+LMfpJz0EW6q/QRfAdvH8pL9EZdTbMR+OomLyc5LxVC3AQy+rchQV58A+pHHmhv0yCib/FhcvKikHh
-        FeXsxBqc6YEDPcBi7hwPw/EdhlM7DFyuM3C5cSOKGLDM//KMplt7O38OstGxp8IDTzv/8v4LfqVoHaNt
-        WuHaJYiidenF6zOKuXOFuGAsxulCTIhL6ViarMoNWZwWG86hYUfRCE6gYR6jFn65oP7fjDY6geZJz0H+
-        xUfnn9N3g6ikcCmCKMyRlwU2iLecr0SHKzFf0Zkzlf7N6HbPVGrveOlfaxXtl3pDiHgKC1j8w08J+zej
-        f/JTwn4ppjwv/98feKZSe+fe/ZvR/2b0L0z9fzP65zrd4Bd+of9l/vf/ZvS/Gf3rIvu/Gf1vRv+6GP3/
-        AZ+4Ui+mkTlKAAAAAElFTkSuQmCC
-</value>
-  </data>
-</root>
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/remote-gui.net/AddLinkDialog.Designer.cs Deleted

@@ -1,81 +0,0 @@
-namespace amule.net {
-    partial class AddLinkDialog {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if ( disposing && (components != null) ) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.buttonOK = new System.Windows.Forms.Button();
-            this.textBoxLink = new System.Windows.Forms.TextBox();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // buttonOK
-            // 
-            this.buttonOK.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.buttonOK.Location = new System.Drawing.Point(223, 69);
-            this.buttonOK.Name = "buttonOK";
-            this.buttonOK.Size = new System.Drawing.Size(75, 23);
-            this.buttonOK.TabIndex = 0;
-            this.buttonOK.Text = "O&K";
-            this.buttonOK.UseVisualStyleBackColor = true;
-            // 
-            // textBoxLink
-            // 
-            this.textBoxLink.Location = new System.Drawing.Point(12, 28);
-            this.textBoxLink.Name = "textBoxLink";
-            this.textBoxLink.Size = new System.Drawing.Size(612, 20);
-            this.textBoxLink.TabIndex = 1;
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.buttonCancel.Location = new System.Drawing.Point(321, 69);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(75, 23);
-            this.buttonCancel.TabIndex = 2;
-            this.buttonCancel.Text = "&Cancel";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            // 
-            // AddLinkDialog
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(636, 118);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.textBoxLink);
-            this.Controls.Add(this.buttonOK);
-            this.Name = "AddLinkDialog";
-            this.Text = "Add ed2k link";
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button buttonOK;
-        private System.Windows.Forms.Button buttonCancel;
-        public System.Windows.Forms.TextBox textBoxLink;
-    }
-}
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/remote-gui.net/AddLinkDialog.cs Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/AddLinkDialog.resx Deleted

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/remote-gui.net/ConnectDlg.Designer.cs Deleted

@@ -1,154 +0,0 @@
-namespace amule.net
-{
-    partial class ConnectDlg
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.buttonConnect = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.label1 = new System.Windows.Forms.Label();
-            this.amuleHost = new System.Windows.Forms.TextBox();
-            this.amulePwd = new System.Windows.Forms.TextBox();
-            this.label2 = new System.Windows.Forms.Label();
-            this.amulePort = new System.Windows.Forms.TextBox();
-            this.label3 = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // buttonConnect
-            // 
-            this.buttonConnect.DialogResult = System.Windows.Forms.DialogResult.OK;
-            this.buttonConnect.Location = new System.Drawing.Point(66, 190);
-            this.buttonConnect.Name = "buttonConnect";
-            this.buttonConnect.Size = new System.Drawing.Size(128, 50);
-            this.buttonConnect.TabIndex = 0;
-            this.buttonConnect.Text = "&Connect";
-            this.buttonConnect.UseVisualStyleBackColor = true;
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.buttonCancel.Location = new System.Drawing.Point(238, 190);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(128, 50);
-            this.buttonCancel.TabIndex = 1;
-            this.buttonCancel.Text = "Cancel";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            // 
-            // label1
-            // 
-            this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(60, 46);
-            this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(59, 13);
-            this.label1.TabIndex = 2;
-            this.label1.Text = "aMule host";
-            // 
-            // amuleHost
-            // 
-            this.amuleHost.Location = new System.Drawing.Point(139, 43);
-            this.amuleHost.Name = "amuleHost";
-            this.amuleHost.Size = new System.Drawing.Size(112, 20);
-            this.amuleHost.TabIndex = 3;
-            this.amuleHost.Text = "leox";
-            // 
-            // amulePwd
-            // 
-            this.amulePwd.Location = new System.Drawing.Point(139, 106);
-            this.amulePwd.Name = "amulePwd";
-            this.amulePwd.PasswordChar = '*';
-            this.amulePwd.Size = new System.Drawing.Size(112, 20);
-            this.amulePwd.TabIndex = 5;
-            this.amulePwd.Text = "123456";
-            // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(60, 109);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(53, 13);
-            this.label2.TabIndex = 4;
-            this.label2.Text = "Password";
-            // 
-            // amulePort
-            // 
-            this.amulePort.Location = new System.Drawing.Point(296, 43);
-            this.amulePort.MaxLength = 5;
-            this.amulePort.Name = "amulePort";
-            this.amulePort.Size = new System.Drawing.Size(66, 20);
-            this.amulePort.TabIndex = 7;
-            this.amulePort.Text = "4712";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(265, 46);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(25, 13);
-            this.label3.TabIndex = 6;
-            this.label3.Text = "port";
-            // 
-            // ConnectDlg
-            // 
-            this.AcceptButton = this.buttonConnect;
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.CancelButton = this.buttonCancel;
-            this.ClientSize = new System.Drawing.Size(432, 272);
-            this.ControlBox = false;
-            this.Controls.Add(this.amulePort);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.amulePwd);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.amuleHost);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonConnect);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-            this.Name = "ConnectDlg";
-            this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
-            this.Text = "Connect to aMule core";
-            this.Load += new System.EventHandler(this.ConnectDlg_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button buttonConnect;
-        private System.Windows.Forms.Button buttonCancel;
-        private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.TextBox amuleHost;
-        private System.Windows.Forms.TextBox amulePwd;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.TextBox amulePort;
-        private System.Windows.Forms.Label label3;
-
-    }
-}
-

aMule-2.2.6.tar.bz2/src/remote-gui.net/ConnectDlg.cs Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/ConnectDlg.resx Deleted

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="$this.Locked" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-</root>
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/remote-gui.net/DownloadControl.cs Deleted

@@ -1,597 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003-2009 lfroen ( lfroen@gmail.com / 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
-//
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using System.Configuration;
-
-namespace amule.net {
-
-    [SettingsGroupNameAttribute("XferControl")]
-    public class amuleXferControlSettings : ApplicationSettingsBase {
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("true")]
-        public bool FilenameVisible
-        {
-            get { return (bool)this["FilenameVisible"]; }
-            set { this["FilenameVisible"] = value; }
-        }
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("200")]
-        public int FilenameWidth
-        {
-            get { return (int)this["FilenameWidth"]; }
-            set { this["FilenameWidth"] = value; }
-        }
-
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("true")]
-        public bool StatusVisible
-        {
-            get { return (bool)this["StatusVisible"]; }
-            set { this["StatusVisible"] = value; }
-        }
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("100")]
-        public int StatusWidth
-        {
-            get { return (int)this["StatusWidth"]; }
-            set { this["StatusWidth"] = value; }
-        }
-
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("true")]
-        public bool SizeVisible
-        {
-            get { return (bool)this["SizeVisible"]; }
-            set { this["StatusVisible"] = value; }
-        }
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("100")]
-        public int SizeWidth
-        {
-            get { return (int)this["SizeWidth"]; }
-            set { this["StatusWidth"] = value; }
-        }
-
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("true")]
-        public bool SpeedVisible
-        {
-            get { return (bool)this["SpeedVisible"]; }
-            set { this["SpeedVisible"] = value; }
-        }
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("100")]
-        public int SpeedWidth
-        {
-            get { return (int)this["SpeedWidth"]; }
-            set { this["SpeedWidth"] = value; }
-        }
-
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("true")]
-        public bool CompletedVisible
-        {
-            get { return (bool)this["CompletedVisible"]; }
-            set { this["CompletedVisible"] = value; }
-        }
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("100")]
-        public int CompletedWidth
-        {
-            get { return (int)this["CompletedWidth"]; }
-            set { this["CompletedWidth"] = value; }
-        }
-
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("true")]
-        public bool SourcesVisible
-        {
-            get { return (bool)this["SourcesVisible"]; }
-            set { this["SourcesVisible"] = value; }
-        }
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("100")]
-        public int SourcesWidth
-        {
-            get { return (int)this["SourcesWidth"]; }
-            set { this["SourcesWidth"] = value; }
-        }
-    }
-
-    public delegate void DownloadStatusListEventHandler();
-
-    public class amuleDownloadStatusList : amuleListView, IContainerUI {
-        DownloadQueueContainer m_item_container;
-        amuleXferControlSettings m_settings = new amuleXferControlSettings();
-
-        enum DOWNLOAD_CTRL_COL_ID {
-            COL_FILENAME_ID = 0,
-            COL_STATUS_ID,
-            COL_SIZE_ID,
-            COL_COMPLETED_ID,
-            COL_SPEED_ID,
-            COL_SOURCES_ID,
-
-            COL_LAST_ID,
-        };
-
-        private ContextMenuStrip m_ctx_menu = new ContextMenuStrip();
-
-        public event DownloadStatusListEventHandler OnCancelItem, OnPauseItem, OnResumeItem;
-
-        void UpdateColumnIndexes()
-        {
-            int i = 0;
-            m_column_index[(int)DOWNLOAD_CTRL_COL_ID.COL_FILENAME_ID] = i;
-            if ( m_settings.FilenameVisible ) i++;
-            m_column_index[(int)DOWNLOAD_CTRL_COL_ID.COL_STATUS_ID] = i;
-            if ( m_settings.StatusVisible ) i++;
-            m_column_index[(int)DOWNLOAD_CTRL_COL_ID.COL_SIZE_ID] = i;
-            if ( m_settings.SizeVisible ) i++;
-            m_column_index[(int)DOWNLOAD_CTRL_COL_ID.COL_COMPLETED_ID] = i;
-            if ( m_settings.CompletedVisible ) i++;
-            m_column_index[(int)DOWNLOAD_CTRL_COL_ID.COL_SPEED_ID] = i;
-            if ( m_settings.SpeedVisible ) i++;
-            m_column_index[(int)DOWNLOAD_CTRL_COL_ID.COL_SOURCES_ID] = i;
-            if ( m_settings.SourcesVisible ) i++;
-        }
-
-        void SaveSettigs()
-        {
-            if ( m_settings.FilenameVisible ) {
-                m_settings.FilenameWidth =
-                    Columns[m_column_index[(int)DOWNLOAD_CTRL_COL_ID.COL_FILENAME_ID]].Width;
-            }
-            if ( m_settings.StatusVisible ) {
-                m_settings.StatusWidth =
-                    Columns[(int)DOWNLOAD_CTRL_COL_ID.COL_STATUS_ID].Width;
-            }
-            m_settings.Save();
-        }
-
-        public amuleDownloadStatusList()
-        {
-            OwnerDraw = true;
-
-            DrawColumnHeader +=
-                new DrawListViewColumnHeaderEventHandler(amuleDownloadStatusList_DrawColumnHeader);
-
-            DrawSubItem += new DrawListViewSubItemEventHandler(amuleDownloadStatusList_DrawSubItem);
-            DownloadQueueItem.InitDraw3DModifiers(FontHeight + 1);
-
-            MouseClick += new MouseEventHandler(amuleDownloadStatusList_MouseClickHandler);
-            ColumnClick += new ColumnClickEventHandler(amuleDownloadStatusList_ColumtClickHandler);
-
-            m_ctx_menu.Opening += new System.ComponentModel.CancelEventHandler(cms_Opening);
-            m_ctx_menu.Items.Add(new ToolStripLabel("Downloads"));
-            m_ctx_menu.Items.Add(new ToolStripSeparator());
-
-            ToolStripButton it_pause = new ToolStripButton("Pause");
-            it_pause.Click += new EventHandler(it_pause_Click);
-            m_ctx_menu.Items.Add(it_pause);
-            ContextMenuStrip = m_ctx_menu;
-
-            ToolStripButton it_resume = new ToolStripButton("Resume");
-            it_resume.Click += new EventHandler(it_resume_Click);
-            m_ctx_menu.Items.Add(it_resume);
-
-            ToolStripButton it_cancel = new ToolStripButton("Cancel");
-            it_cancel.Click += new EventHandler(it_cancel_Click);
-            m_ctx_menu.Items.Add(it_cancel);
-
-            m_ctx_menu.Items.Add(new ToolStripSeparator());
-            //
-            // Init columns
-            //
-            m_column_index = new int[(int)DOWNLOAD_CTRL_COL_ID.COL_LAST_ID];
-            UpdateColumnIndexes();
-            // File name
-            if ( m_settings.FilenameVisible ) {
-                CreateColumtAt("File name", m_settings.FilenameWidth,
-                    (int)DOWNLOAD_CTRL_COL_ID.COL_FILENAME_ID);
-            }
-            AppendItemToCtxMenu(m_ctx_menu, "File name", DOWNLOAD_CTRL_COL_ID.COL_FILENAME_ID,
-                m_settings.FilenameVisible, new EventHandler(column_Click));
-            // Status
-            if ( m_settings.StatusVisible ) {
-                CreateColumtAt("Status", m_settings.StatusWidth,
-                    (int)DOWNLOAD_CTRL_COL_ID.COL_STATUS_ID);
-            }
-            AppendItemToCtxMenu(m_ctx_menu, "Status", DOWNLOAD_CTRL_COL_ID.COL_STATUS_ID,
-                m_settings.StatusVisible, new EventHandler(column_Click));
-            // Size
-            if ( m_settings.SizeVisible ) {
-                CreateColumtAt("Size", m_settings.SizeWidth,
-                    (int)DOWNLOAD_CTRL_COL_ID.COL_SIZE_ID);
-            }
-            AppendItemToCtxMenu(m_ctx_menu, "Size", DOWNLOAD_CTRL_COL_ID.COL_SIZE_ID,
-                m_settings.SizeVisible, new EventHandler(column_Click));
-            // Completed size
-            if ( m_settings.CompletedVisible ) {
-                CreateColumtAt("Completed", m_settings.CompletedWidth,
-                    (int)DOWNLOAD_CTRL_COL_ID.COL_COMPLETED_ID);
-            }
-            AppendItemToCtxMenu(m_ctx_menu, "Completed", DOWNLOAD_CTRL_COL_ID.COL_COMPLETED_ID,
-                m_settings.CompletedVisible, new EventHandler(column_Click));
-            // Speed
-            if ( m_settings.SpeedVisible ) {
-                CreateColumtAt("Speed", m_settings.SpeedWidth,
-                    (int)DOWNLOAD_CTRL_COL_ID.COL_SPEED_ID);
-            }
-            AppendItemToCtxMenu(m_ctx_menu, "Speed", DOWNLOAD_CTRL_COL_ID.COL_SPEED_ID,
-                m_settings.SpeedVisible, new EventHandler(column_Click));
-            // Sources
-            if ( m_settings.SourcesVisible ) {
-                CreateColumtAt("Sources", m_settings.SourcesWidth,
-                    m_column_index[(int)DOWNLOAD_CTRL_COL_ID.COL_SOURCES_ID]);
-            }
-            AppendItemToCtxMenu(m_ctx_menu, "Sources", DOWNLOAD_CTRL_COL_ID.COL_SOURCES_ID,
-                m_settings.SizeVisible, new EventHandler(column_Click));
-
-            ContextMenuStrip = m_ctx_menu;
-        }
-
-        //
-        // Click on column visibility checkbox in context menu
-        //
-        void column_Click(object sender, EventArgs e)
-        {
-            ToolStripMenuItem col = sender as ToolStripMenuItem;
-            DOWNLOAD_CTRL_COL_ID col_id = (DOWNLOAD_CTRL_COL_ID)col.Tag;
-            bool status = !col.Checked;
-            col.Checked = status;
-            if ( !status ) {
-                RemoveColumnAt((int)col_id);
-            }
-            switch ( col_id ) {
-                case DOWNLOAD_CTRL_COL_ID.COL_FILENAME_ID:
-                    m_settings.FilenameVisible = status;
-                    UpdateColumnIndexes();
-                    if ( status ) {
-                        CreateColumtAt("File name", m_settings.FilenameWidth, (int)col_id);
-                    }
-                    break;
-                case DOWNLOAD_CTRL_COL_ID.COL_STATUS_ID:
-                    m_settings.StatusVisible = status;
-                    UpdateColumnIndexes();
-                    if ( status ) {
-                        CreateColumtAt("Status", m_settings.StatusWidth, (int)col_id);
-                    }
-                    break;
-                case DOWNLOAD_CTRL_COL_ID.COL_SIZE_ID:
-                    m_settings.SizeVisible = status;
-                    UpdateColumnIndexes();
-                    if ( status ) {
-                        CreateColumtAt("Size", m_settings.SizeWidth, (int)col_id);
-                    }
-                    break;
-                case DOWNLOAD_CTRL_COL_ID.COL_COMPLETED_ID:
-                    m_settings.CompletedVisible = status;
-                    UpdateColumnIndexes();
-                    if ( status ) {
-                        CreateColumtAt("Completed", m_settings.CompletedWidth, (int)col_id);
-                    }
-                    break;
-                case DOWNLOAD_CTRL_COL_ID.COL_SPEED_ID:
-                    m_settings.SpeedVisible = status;
-                    UpdateColumnIndexes();
-                    if ( status ) {
-                        CreateColumtAt("Speed", m_settings.SpeedWidth, (int)col_id);
-                    }
-                    break;
-                case DOWNLOAD_CTRL_COL_ID.COL_SOURCES_ID:
-                    m_settings.SourcesVisible = status;
-                    UpdateColumnIndexes();
-                    if ( status ) {
-                        CreateColumtAt("Sources", m_settings.SourcesWidth, (int)col_id);
-                    }
-                    break;
-                default:
-                    break;
-            }
-            Items.Clear();
-            foreach ( DownloadQueueItem i in m_item_container.Items ) {
-                DoInsertItem(i);
-            }
-        }
-
-        //
-        // "Cancel" command in context menu
-        //
-        void it_cancel_Click(object sender, EventArgs e)
-        {
-            OnCancelItem();
-        }
-
-        //
-        // "Resume" command in context menu
-        //
-        void it_resume_Click(object sender, EventArgs e)
-        {
-            OnResumeItem();
-        }
-
-        //
-        // "Pause" command in context menu
-        //
-        void it_pause_Click(object sender, EventArgs e)
-        {
-            OnPauseItem();
-        }
-
-        public void SelectedItemsToCommand(ecProto.ecPacket cmd)
-        {
-            foreach ( ListViewItem i in SelectedItems ) {
-                DownloadQueueItem it = i.Tag as DownloadQueueItem;
-                ecProto.ecTagMD5 tag = new ecProto.ecTagMD5(ECTagNames.EC_TAG_PARTFILE, it.ID);
-                cmd.AddSubtag(tag);
-            }
-        }
-
-        //
-        // Context menu - on opening. Can support dynamic menu creation
-        //
-        void cms_Opening(object sender, System.ComponentModel.CancelEventArgs e)
-        {
-            
-            e.Cancel = false;
-        }
-
-        protected override void OnHandleDestroyed(EventArgs e)
-        {
-            SaveSettigs();
-            base.OnHandleDestroyed(e);
-        }
-        public DownloadQueueContainer ItemContainer
-        {
-            get { return m_item_container; }
-            set
-            {
-                m_item_container = value;
-                m_item_container.NewItemStatusLineLength = Columns[1].Width;
-            }
-        }
-
-        override protected void OnColumnWidthChanged(ColumnWidthChangedEventArgs e)
-        {
-            int status_index = m_column_index[(int)DOWNLOAD_CTRL_COL_ID.COL_STATUS_ID];
-            if ( (e.ColumnIndex == status_index) && m_settings.StatusVisible) {
-                int new_size = Columns[status_index].Width + 1;
-                m_item_container.NewItemStatusLineLength = new_size;
-
-                foreach ( ListViewItem i in Items ) {
-                    DownloadQueueItem it = i.Tag as DownloadQueueItem;
-                    it.AllocColorLine(new_size);
-                    it.DrawLine();
-                }
-            }
-        }
-
-        void amuleDownloadStatusList_MouseClickHandler(object o, MouseEventArgs e)
-        {
-            if ( e.Button == MouseButtons.Right ) {
-                
-            }
-        }
-
-        void amuleDownloadStatusList_ColumtClickHandler(object o, ColumnClickEventArgs e)
-        {
-        }
-
-        unsafe void DrawStatusBar(DownloadQueueItem it, Graphics g, Rectangle posR)
-        {
-            //
-            // Bitmap is created as 32bpp (rgb+alpha)
-            //
-            Bitmap status_bmp = new Bitmap(posR.Width, posR.Height,
-                System.Drawing.Imaging.PixelFormat.Format32bppArgb);
-
-            System.Drawing.Imaging.BitmapData bmd = status_bmp.LockBits(
-                new Rectangle(0, 0, status_bmp.Width, status_bmp.Height),
-                System.Drawing.Imaging.ImageLockMode.ReadWrite,
-                System.Drawing.Imaging.PixelFormat.Format32bppArgb);
-
-            RGB[] item_color_line = it.ColorLine;
-            byte[] modifiers = DownloadQueueItem.Get_3D_Modifiers();
-
-            for ( int y = 0; y < bmd.Height; y++ ) {
-                byte* row = (byte*)bmd.Scan0 + (y * bmd.Stride);
-
-                for ( int x = 0; x < bmd.Width; x++ ) {
-                    UInt32* pixel_ptr = (UInt32*)(row + x * 4);
-                    //row[x * 3 + 2] = 255;
-                    //*pixel_ptr = 0xff0000; //RED
-                    //*pixel_ptr = 0x00ff00; //GREEN
-                    //*pixel_ptr = 0x1f0000ff; // BLUE
-                    //*pixel_ptr = item_color_line[x] | (x << 24);
-                    item_color_line[x].WriteToBuffWithModifier(pixel_ptr, modifiers[y]);
-                }
-
-            }
-
-            status_bmp.UnlockBits(bmd);
-
-            g.DrawImage(status_bmp, posR);
-            status_bmp.Dispose();
-        }
-
-        void amuleDownloadStatusList_DrawSubItem(object sender, DrawListViewSubItemEventArgs e)
-        {
-            if ( (e.ColumnIndex == m_column_index[(int)DOWNLOAD_CTRL_COL_ID.COL_STATUS_ID])
-                && m_settings.StatusVisible ) {
-                // status is colored bar
-                Rectangle r = e.Bounds;
-                DownloadQueueItem it = e.Item.Tag as DownloadQueueItem;
-                DrawStatusBar(it, e.Graphics, r);
-                e.DrawDefault = false;
-            }
-            else {
-                e.DrawBackground();
-            }
-            e.DrawText();
-            if ( e.Item.Selected ) {
-                e.DrawFocusRectangle(e.Bounds);
-            }
-        }
-
-        void amuleDownloadStatusList_DrawColumnHeader(object sender, DrawListViewColumnHeaderEventArgs e)
-        {
-            e.DrawBackground();
-            e.DrawText();
-        }
-
-        ///
-        // interface to core
-        ///
-        void DoInsertItem(DownloadQueueItem i)
-        {
-            string first_col_txt;
-            if ( m_settings.FilenameVisible ) {
-                first_col_txt = i.Name;
-            } else if ( m_settings.StatusVisible ) {
-                first_col_txt = i.PercentDone;
-            } else if ( m_settings.SizeVisible ) {
-                first_col_txt = i.Size;
-            } else if ( m_settings.CompletedVisible ) {
-                first_col_txt = i.SizeDone;
-            } else if ( m_settings.SpeedVisible ) {
-                first_col_txt = i.Speed;
-            } else if ( m_settings.SourcesVisible ) {
-                first_col_txt = i.Sources;
-            } else {
-                first_col_txt = "all columns hidden";
-            }
-
-            ListViewItem it = new ListViewItem(first_col_txt);
-
-            if ( m_settings.StatusVisible ) {
-                it.SubItems.Add(new ListViewItem.ListViewSubItem(it, i.PercentDone));
-            }
-            if ( m_settings.SizeVisible ) {
-                it.SubItems.Add(new ListViewItem.ListViewSubItem(it, i.Size));
-            }
-            if ( m_settings.CompletedVisible ) {
-                it.SubItems.Add(new ListViewItem.ListViewSubItem(it, i.SizeDone));
-            }
-            if ( m_settings.SpeedVisible ) {
-                it.SubItems.Add(new ListViewItem.ListViewSubItem(it, i.Speed));
-            }
-            if ( m_settings.SourcesVisible ) {
-                it.SubItems.Add(new ListViewItem.ListViewSubItem(it, i.Sources));
-            }
-
-            if ( m_settings.StatusVisible ) {
-                it.SubItems[m_column_index[(int)DOWNLOAD_CTRL_COL_ID.COL_STATUS_ID]].ForeColor = Color.White;
-                Columns[(int)DOWNLOAD_CTRL_COL_ID.COL_STATUS_ID].TextAlign = HorizontalAlignment.Center;
-
-            }
-            it.Tag = i;
-
-            Items.Add(it);
-
-            i.UiItem = it;
-        }
-
-        void DoUpdateItem(DownloadQueueItem i)
-        {
-            ListViewItem it = i.UiItem as ListViewItem;
-            int idx = m_column_index[(int)DOWNLOAD_CTRL_COL_ID.COL_STATUS_ID];
-            if ( it.SubItems[idx].Text != i.PercentDone ) {
-                it.SubItems[idx].Text = i.PercentDone;
-            }
-            idx = (int)DOWNLOAD_CTRL_COL_ID.COL_COMPLETED_ID;
-            if ( it.SubItems[idx].Text != i.SizeDone ) {
-                it.SubItems[idx].Text = i.SizeDone;
-            }
-            idx = (int)DOWNLOAD_CTRL_COL_ID.COL_SPEED_ID;
-            if ( it.SubItems[idx].Text != i.Speed ) {
-                it.SubItems[idx].Text = i.Speed;
-            }
-            //Items
-        }
-
-        #region IContainerUI Members
-
-        delegate void UpdateCallback();
-
-        public void MyEndUpdate()
-        {
-            if ( InvokeRequired ) {
-                UpdateCallback d = new UpdateCallback(EndUpdate);
-                Invoke(d);
-            }
-            else {
-                EndUpdate();
-            }
-        }
-
-        public void MyBeginUpdate()
-        {
-            if ( InvokeRequired ) {
-                UpdateCallback d = new UpdateCallback(BeginUpdate);
-                Invoke(d);
-            }
-            else {
-                BeginUpdate();
-            }
-        }
-
-        delegate void ItemCallback(DownloadQueueItem i);
-
-        public void InsertItem(object i)
-        {
-            DownloadQueueItem it = i as DownloadQueueItem;
-            if ( InvokeRequired ) {
-                ItemCallback d = new ItemCallback(DoInsertItem);
-                Invoke(d, it);
-            }
-            else {
-                DoInsertItem(it);
-            }
-        }
-
-        public void UpdateItem(object i)
-        {
-            DownloadQueueItem it = i as DownloadQueueItem;
-            if ( InvokeRequired ) {
-                ItemCallback d = new ItemCallback(DoUpdateItem);
-                Invoke(d, it);
-            }
-            else {
-                DoUpdateItem(it);
-            }
-        }
-
-        #endregion
-    }
-
-}

aMule-2.2.6.tar.bz2/src/remote-gui.net/ECCodes.cs Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/ECTagTypes.cs Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/MainWindow.Designer.cs Deleted

@@ -1,222 +0,0 @@
-namespace amule.net
-{
-    partial class MainWindow
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.panelStatus = new System.Windows.Forms.Panel();
-            this.textLinktatus = new System.Windows.Forms.TextBox();
-            this.panelToolbar = new System.Windows.Forms.Panel();
-            this.buttonAbout = new System.Windows.Forms.Button();
-            this.buttonPrefs = new System.Windows.Forms.Button();
-            this.buttonAddLink = new System.Windows.Forms.Button();
-            this.buttonShared = new System.Windows.Forms.Button();
-            this.buttonNetwork = new System.Windows.Forms.Button();
-            this.buttonSearch = new System.Windows.Forms.Button();
-            this.buttonXfer = new System.Windows.Forms.Button();
-            this.panelMain = new System.Windows.Forms.Panel();
-            this.textBoxDownSpeed = new System.Windows.Forms.TextBox();
-            this.textBoxUpSpeed = new System.Windows.Forms.TextBox();
-            this.panelStatus.SuspendLayout();
-            this.panelToolbar.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // panelStatus
-            // 
-            this.panelStatus.Controls.Add(this.textBoxUpSpeed);
-            this.panelStatus.Controls.Add(this.textBoxDownSpeed);
-            this.panelStatus.Controls.Add(this.textLinktatus);
-            this.panelStatus.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panelStatus.Location = new System.Drawing.Point(0, 362);
-            this.panelStatus.Name = "panelStatus";
-            this.panelStatus.Size = new System.Drawing.Size(678, 24);
-            this.panelStatus.TabIndex = 0;
-            // 
-            // textLinktatus
-            // 
-            this.textLinktatus.Dock = System.Windows.Forms.DockStyle.Left;
-            this.textLinktatus.Location = new System.Drawing.Point(0, 0);
-            this.textLinktatus.Name = "textLinktatus";
-            this.textLinktatus.ReadOnly = true;
-            this.textLinktatus.Size = new System.Drawing.Size(362, 20);
-            this.textLinktatus.TabIndex = 0;
-            // 
-            // panelToolbar
-            // 
-            this.panelToolbar.Controls.Add(this.buttonAbout);
-            this.panelToolbar.Controls.Add(this.buttonPrefs);
-            this.panelToolbar.Controls.Add(this.buttonAddLink);
-            this.panelToolbar.Controls.Add(this.buttonShared);
-            this.panelToolbar.Controls.Add(this.buttonNetwork);
-            this.panelToolbar.Controls.Add(this.buttonSearch);
-            this.panelToolbar.Controls.Add(this.buttonXfer);
-            this.panelToolbar.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panelToolbar.Location = new System.Drawing.Point(0, 0);
-            this.panelToolbar.Name = "panelToolbar";
-            this.panelToolbar.Size = new System.Drawing.Size(678, 45);
-            this.panelToolbar.TabIndex = 1;
-            // 
-            // buttonAbout
-            // 
-            this.buttonAbout.Dock = System.Windows.Forms.DockStyle.Left;
-            this.buttonAbout.Image = global::amule.net.Properties.Resources.Toolbar_About;
-            this.buttonAbout.Location = new System.Drawing.Point(270, 0);
-            this.buttonAbout.Name = "buttonAbout";
-            this.buttonAbout.Size = new System.Drawing.Size(45, 45);
-            this.buttonAbout.TabIndex = 6;
-            this.buttonAbout.UseVisualStyleBackColor = true;
-            this.buttonAbout.Click += new System.EventHandler(this.buttonAbout_Click);
-            // 
-            // buttonPrefs
-            // 
-            this.buttonPrefs.Dock = System.Windows.Forms.DockStyle.Left;
-            this.buttonPrefs.Image = global::amule.net.Properties.Resources.Toolbar_Prefs;
-            this.buttonPrefs.Location = new System.Drawing.Point(225, 0);
-            this.buttonPrefs.Name = "buttonPrefs";
-            this.buttonPrefs.Size = new System.Drawing.Size(45, 45);
-            this.buttonPrefs.TabIndex = 5;
-            this.buttonPrefs.UseVisualStyleBackColor = true;
-            this.buttonPrefs.Click += new System.EventHandler(this.buttonPrefs_Click);
-            // 
-            // buttonAddLink
-            // 
-            this.buttonAddLink.Dock = System.Windows.Forms.DockStyle.Left;
-            this.buttonAddLink.Image = global::amule.net.Properties.Resources.Toolbar_Import;
-            this.buttonAddLink.Location = new System.Drawing.Point(180, 0);
-            this.buttonAddLink.Name = "buttonAddLink";
-            this.buttonAddLink.Size = new System.Drawing.Size(45, 45);
-            this.buttonAddLink.TabIndex = 4;
-            this.buttonAddLink.UseVisualStyleBackColor = true;
-            this.buttonAddLink.Click += new System.EventHandler(this.buttonAddLink_Click);
-            // 
-            // buttonShared
-            // 
-            this.buttonShared.Dock = System.Windows.Forms.DockStyle.Left;
-            this.buttonShared.Image = global::amule.net.Properties.Resources.Toolbar_Shared;
-            this.buttonShared.Location = new System.Drawing.Point(135, 0);
-            this.buttonShared.Name = "buttonShared";
-            this.buttonShared.Size = new System.Drawing.Size(45, 45);
-            this.buttonShared.TabIndex = 3;
-            this.buttonShared.UseVisualStyleBackColor = true;
-            this.buttonShared.Click += new System.EventHandler(this.buttonShared_Click);
-            // 
-            // buttonNetwork
-            // 
-            this.buttonNetwork.Dock = System.Windows.Forms.DockStyle.Left;
-            this.buttonNetwork.Image = global::amule.net.Properties.Resources.Toolbar_Network;
-            this.buttonNetwork.Location = new System.Drawing.Point(90, 0);
-            this.buttonNetwork.Name = "buttonNetwork";
-            this.buttonNetwork.Size = new System.Drawing.Size(45, 45);
-            this.buttonNetwork.TabIndex = 2;
-            this.buttonNetwork.UseVisualStyleBackColor = true;
-            this.buttonNetwork.Click += new System.EventHandler(this.buttonNetwork_Click);
-            // 
-            // buttonSearch
-            // 
-            this.buttonSearch.Dock = System.Windows.Forms.DockStyle.Left;
-            this.buttonSearch.Image = global::amule.net.Properties.Resources.Toolbar_Search;
-            this.buttonSearch.Location = new System.Drawing.Point(45, 0);
-            this.buttonSearch.Name = "buttonSearch";
-            this.buttonSearch.Size = new System.Drawing.Size(45, 45);
-            this.buttonSearch.TabIndex = 1;
-            this.buttonSearch.UseVisualStyleBackColor = true;
-            this.buttonSearch.Click += new System.EventHandler(this.buttonSearch_Click);
-            // 
-            // buttonXfer
-            // 
-            this.buttonXfer.Dock = System.Windows.Forms.DockStyle.Left;
-            this.buttonXfer.Image = global::amule.net.Properties.Resources.Toolbar_Transfers;
-            this.buttonXfer.Location = new System.Drawing.Point(0, 0);
-            this.buttonXfer.Name = "buttonXfer";
-            this.buttonXfer.Size = new System.Drawing.Size(45, 45);
-            this.buttonXfer.TabIndex = 0;
-            this.buttonXfer.UseVisualStyleBackColor = true;
-            this.buttonXfer.Click += new System.EventHandler(this.buttonXfer_Click);
-            // 
-            // panelMain
-            // 
-            this.panelMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panelMain.Location = new System.Drawing.Point(0, 45);
-            this.panelMain.Name = "panelMain";
-            this.panelMain.Size = new System.Drawing.Size(678, 317);
-            this.panelMain.TabIndex = 2;
-            // 
-            // textBoxDownSpeed
-            // 
-            this.textBoxDownSpeed.Dock = System.Windows.Forms.DockStyle.Left;
-            this.textBoxDownSpeed.Location = new System.Drawing.Point(362, 0);
-            this.textBoxDownSpeed.Name = "textBoxDownSpeed";
-            this.textBoxDownSpeed.ReadOnly = true;
-            this.textBoxDownSpeed.Size = new System.Drawing.Size(90, 20);
-            this.textBoxDownSpeed.TabIndex = 1;
-            // 
-            // textBoxUpSpeed
-            // 
-            this.textBoxUpSpeed.Dock = System.Windows.Forms.DockStyle.Left;
-            this.textBoxUpSpeed.Location = new System.Drawing.Point(452, 0);
-            this.textBoxUpSpeed.Name = "textBoxUpSpeed";
-            this.textBoxUpSpeed.ReadOnly = true;
-            this.textBoxUpSpeed.Size = new System.Drawing.Size(90, 20);
-            this.textBoxUpSpeed.TabIndex = 2;
-            // 
-            // MainWindow
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(678, 386);
-            this.Controls.Add(this.panelMain);
-            this.Controls.Add(this.panelToolbar);
-            this.Controls.Add(this.panelStatus);
-            this.Name = "MainWindow";
-            this.Text = "aMule remote control";
-            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainWindow_FormClosed);
-            this.Load += new System.EventHandler(this.MainWindow_Load);
-            this.panelStatus.ResumeLayout(false);
-            this.panelStatus.PerformLayout();
-            this.panelToolbar.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel panelStatus;
-        private System.Windows.Forms.Panel panelToolbar;
-        private System.Windows.Forms.Panel panelMain;
-        private System.Windows.Forms.Button buttonXfer;
-        private System.Windows.Forms.Button buttonSearch;
-        private System.Windows.Forms.TextBox textLinktatus;
-        private System.Windows.Forms.Button buttonNetwork;
-        private System.Windows.Forms.Button buttonShared;
-        private System.Windows.Forms.Button buttonAddLink;
-        private System.Windows.Forms.Button buttonPrefs;
-        private System.Windows.Forms.Button buttonAbout;
-        private System.Windows.Forms.TextBox textBoxUpSpeed;
-        private System.Windows.Forms.TextBox textBoxDownSpeed;
-
-    }
-}
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/remote-gui.net/MainWindow.cs Deleted

@@ -1,509 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003-2009 lfroen ( lfroen@gmail.com / 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
-//
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Text;
-using System.Windows.Forms;
-using System.Configuration;
-
-namespace amule.net
-{
-    public partial class MainWindow : Form
-    {
-        amuleRemote m_amuleRemote = new amuleRemote();
-        Timer m_updateTimer = null;
-
-        DownloadQueueContainer m_dload_info;
-        SharedFileListContainer m_shared_info;
-
-        amuleDownloadStatusList m_download_status_ctrl;
-        amuleSharedFilesList m_shared_list_ctrl;
-
-        amuleSearchControl m_search_ctrl;
-        amuleSettings m_settings = new amuleSettings();
-
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-
-        enum UpdateRequestState { Stats, MainInfo };
-        UpdateRequestState m_req_state;
-
-        ecProto.ecPacket GetFullInfoRequest()
-        {
-            ecProto.ecPacket req = null;
-            Control current_ctrl = panelMain.Controls[0];
-            if (current_ctrl == m_download_status_ctrl) {
-                req = m_dload_info.ReQuery();
-            } else if (current_ctrl == m_shared_list_ctrl) {
-                req = m_shared_info.ReQuery();
-            }
-
-            if ( req == null ) {
-                throw new Exception("unhandled GUI state");
-            }
-            return req;
-        }
-
-        private static void UpdateTimerProc(Object myObject,
-                                            EventArgs myEventArgs)
-        {
-            MainWindow w = (MainWindow)((Timer)myObject).Tag;
-
-            // TODO: for testing 1 request is enough
-            w.m_updateTimer.Stop();
-
-            ecProto.ecPacket req = null;
-            switch(w.m_req_state) {
-                case UpdateRequestState.Stats:
-                    req = new ecProto.ecPacket(ECOpCodes.EC_OP_STAT_REQ);
-                    w.m_req_state = UpdateRequestState.MainInfo;
-                    break;
-                case UpdateRequestState.MainInfo:
-                    req = w.GetFullInfoRequest();
-                    w.m_req_state = UpdateRequestState.Stats;
-                    break;
-            }
-            w.m_amuleRemote.SendPacket(req);
-        }
-
-        private void MainWindow_Load(object sender, EventArgs e)
-        {
-            //
-            // First, attempt to connect to remote core
-            //
-            ConnectDlg connectDlg = new ConnectDlg();
-            string errorMsg = null;
-            bool connect_ok = false;
-            string amuleHost = "", amulePort = "";
-            while ( !connect_ok ) {
-                if (connectDlg.ShowDialog() == DialogResult.OK) {
-                    amuleHost = connectDlg.Host();
-                    amulePort = connectDlg.Port();
-                    string pass = connectDlg.Pass();
-                    int amulePort_int = 0;
-                    try {
-                        amulePort_int = Convert.ToInt16(amulePort, 10);
-                    }catch(Exception) {
-                        MessageBox.Show("Invalid port number", "Error",
-                            MessageBoxButtons.OK, MessageBoxIcon.Error);
-                        continue;
-                    }
-                    connect_ok = m_amuleRemote.ConnectToCore(amuleHost, amulePort_int, pass, ref errorMsg);
-                    if (!connect_ok) {
-                        Console.WriteLine("Connect failed '{0}'", errorMsg);
-                        MessageBox.Show(errorMsg, "Connection to aMule core failed",
-                            MessageBoxButtons.OK, MessageBoxIcon.Stop);
-                    }
-                } else {
-                    Application.Exit();
-                    return;
-                }
-            }
-
-            textLinktatus.Text = "aMule core on [" + amuleHost + ":" + amulePort + "]";
-            Text = "aMule remote control [" + amuleHost + ":" + amulePort + "]";
-            Size = m_settings.MainWindowSize;
-
-            m_amuleRemote.SetECHandler(new amuleMainECHanler(this));
-
-            //
-            // Connection OK at this point
-            //
-            m_download_status_ctrl = new amuleDownloadStatusList();
-            m_dload_info = new DownloadQueueContainer(m_download_status_ctrl);
-            m_download_status_ctrl.ItemContainer = m_dload_info;
-
-            m_download_status_ctrl.OnCancelItem +=
-                new DownloadStatusListEventHandler(m_download_status_ctrl_OnCancelItem);
-            m_download_status_ctrl.OnPauseItem +=
-                new DownloadStatusListEventHandler(m_download_status_ctrl_OnPauseItem);
-            m_download_status_ctrl.OnResumeItem +=
-                new DownloadStatusListEventHandler(m_download_status_ctrl_OnResumeItem);
-
-            m_shared_list_ctrl = new amuleSharedFilesList();
-            m_shared_info = new SharedFileListContainer(m_shared_list_ctrl);
-
-            m_search_ctrl = new amuleSearchControl();
-
-            m_updateTimer = new Timer();
-            m_updateTimer.Tag = this;
-            m_updateTimer.Tick += new EventHandler(UpdateTimerProc);
-            m_updateTimer.Interval = 1000;
-            m_updateTimer.Start();
-
-            // default - download list view
-            panelMain.Controls.Add(m_download_status_ctrl);
-
-            // for testing set needed state!
-            m_req_state = UpdateRequestState.MainInfo;
-        }
-
-        void m_download_status_ctrl_OnResumeItem()
-        {
-            ecProto.ecPacket cmd = new ecProto.ecPacket(ECOpCodes.EC_OP_PARTFILE_RESUME);
-            m_download_status_ctrl.SelectedItemsToCommand(cmd);
-            m_amuleRemote.SendPacket(cmd);
-        }
-
-        void m_download_status_ctrl_OnPauseItem()
-        {
-            ecProto.ecPacket cmd = new ecProto.ecPacket(ECOpCodes.EC_OP_PARTFILE_PAUSE);
-            m_download_status_ctrl.SelectedItemsToCommand(cmd);
-            m_amuleRemote.SendPacket(cmd);
-        }
-
-        void m_download_status_ctrl_OnCancelItem()
-        {
-            string msg = "Following files will be cancelled:\n";
-            foreach ( ListViewItem i in m_download_status_ctrl.SelectedItems ) {
-                msg += i.Text + "\n";
-            }
-            if ( MessageBox.Show(msg, "Cancel files", MessageBoxButtons.OKCancel,
-                MessageBoxIcon.Question) == DialogResult.OK ) {
-                ecProto.ecPacket cmd = new ecProto.ecPacket(ECOpCodes.EC_OP_PARTFILE_DELETE);
-                m_download_status_ctrl.SelectedItemsToCommand(cmd);
-                m_amuleRemote.SendPacket(cmd);
-            }
-        }
-
-        //
-        // Process reply for "stats"
-        //
-        delegate void StatsReplyCallback(ecProto.ecPacket packet);
-        public void StatsReplyInvoke(ecProto.ecPacket packet)
-        {
-            if ( InvokeRequired ) {
-                StatsReplyCallback d = new StatsReplyCallback(StatsReply);
-                Invoke(d, packet);
-            } else {
-                StatsReply(packet);
-            }
-        }
-
-        void StatsReply(ecProto.ecPacket packet)
-        {
-            ecProto.ecTag t = null;
-            t = packet.SubTag(ECTagNames.EC_TAG_STATS_DL_SPEED);
-            int dl_speed = ((ecProto.ecTagInt)t).ValueInt();
-
-            t = packet.SubTag(ECTagNames.EC_TAG_STATS_UL_SPEED);
-            int ul_speed = ((ecProto.ecTagInt)t).ValueInt();
-            //string server = ((ecProto.ecTagString)t).ToString();
-
-            ecProto.ecConnStateTag connState =
-                new ecProto.ecConnStateTag((ecProto.ecTagInt)packet.SubTag(ECTagNames.EC_TAG_CONNSTATE));
-
-            textBoxDownSpeed.Text = "Down:" + ValueToPrefix(dl_speed) + "/s";
-            textBoxUpSpeed.Text = "Up:" + ValueToPrefix(ul_speed) + "/s";
-            if ( connState.IsConnected() ) {
-                if (connState.IsConnectedED2K()) {
-                    textLinktatus.Text = "ED2K: connected";
-                    //ecProto.ecTagString server_name = (ecProto.ecTagString)server.SubTag(ECTagNames.EC_TAG_SERVER_NAME);
-                    //toolStripStatusServer.Text = server_name.StringValue();
-                } else {
-                    //toolStripStatusServer.Text = "";
-                    if (connState.IsConnectingED2K() ) {
-                        textLinktatus.Text = "ED2K: connecting ...";
-                    } else {
-                        textLinktatus.Text = "ED2K: disconnected";
-                    }
-                }
-                if (connState.IsConnectedKademlia()) {
-                    //textLinktatus.Text = "KAD: connected";
-                }
-                
-            }
-        }
-
-        public void DloadQueueReply(ecProto.ecPacket packet)
-        {
-            ecProto.ecPacket reply = m_dload_info.HandlePacket(packet);
-            if ( reply != null ) {
-                m_amuleRemote.SendPacket(reply);
-            }
-        }
-
-        public void SharedFilesReply(ecProto.ecPacket packet)
-        {
-            ecProto.ecPacket reply = m_shared_info.HandlePacket(packet);
-            if (reply != null) {
-                m_amuleRemote.SendPacket(reply);
-            }
-        }
-
-        private void buttonXfer_Click(object sender, EventArgs e)
-        {
-            if ( panelMain.Controls[0] != m_download_status_ctrl ) {
-                panelMain.Controls.Clear();
-                panelMain.Controls.Add(m_download_status_ctrl);
-            }
-        }
-
-        private void buttonNetwork_Click(object sender, EventArgs e)
-        {
-            UpdateTimerProc(m_updateTimer, null);
-        }
-
-        private void buttonSearch_Click(object sender, EventArgs e)
-        {
-            if ( panelMain.Controls[0] != m_search_ctrl ) {
-                panelMain.Controls.Clear();
-                panelMain.Controls.Add(m_search_ctrl);
-            }
-        }
-
-        private void buttonShared_Click(object sender, EventArgs e)
-        {
-            if ( panelMain.Controls[0] != m_shared_list_ctrl ) {
-                panelMain.Controls.Clear();
-                panelMain.Controls.Add(m_shared_list_ctrl);
-            }
-
-        }
-
-        private void buttonAddLink_Click(object sender, EventArgs e)
-        {
-            AddLinkDialog dlg = new AddLinkDialog();
-            if ( dlg.ShowDialog() == DialogResult.OK ) {
-                string link = dlg.textBoxLink.Text;
-                ecProto.ecPacket cmd = new ecProto.ecPacket(ECOpCodes.EC_OP_ADD_LINK);
-                ecProto.ecTagString linktag = new ecProto.ecTagString(ECTagNames.EC_TAG_STRING, link);
-                cmd.AddSubtag(linktag);
-                m_amuleRemote.SendPacket(cmd);
-            }
-        }
-
-        private void buttonPrefs_Click(object sender, EventArgs e)
-        {
-
-        }
-
-        private void buttonAbout_Click(object sender, EventArgs e)
-        {
-            AboutBox dlg = new AboutBox();
-            dlg.ShowDialog();
-        }
-
-        private void MainWindow_FormClosed(object sender, FormClosedEventArgs e)
-        {
-            m_settings.MainWindowSize = Size;
-
-            m_settings.Save();
-        }
-
-        public string ValueToPrefix(Int64 value)
-        {
-            if ( value < 1024 ) {
-                return string.Format("{0} bytes", value);
-            } else if ( value < 1048576 ) {
-                return string.Format("{0:f} Kb", ((float)value) / 1024);
-            } else if ( value < 1073741824 ) {
-                return string.Format("{0:f} Mb", ((float)value) / 1048576);
-            } else {
-                return string.Format("{0:f} Gb", ((float)value) / 1073741824);
-            }
-        }
-
-    }
-
-    [SettingsGroupNameAttribute("Application")]
-    public class amuleSettings : ApplicationSettingsBase {
-
-        [UserScopedSettingAttribute()]
-        public string Host
-        {
-            get { return (string)this["Host"]; }
-            set { this["Host"] = value; }
-        }
-
-        [UserScopedSettingAttribute()]
-        public string Password
-        {
-            get { return (string)this["Password"]; }
-            set { this["Password"] = value; }
-        }
-
-        [UserScopedSetting()]
-        [DefaultSettingValueAttribute("500, 400")]
-        public Size MainWindowSize
-        {
-            get { return (Size)this["MainWindowSize"]; }
-            set { this["MainWindowSize"] = value; }
-        }
-
-    }
-
-    public class amuleMainECHanler : amuleECHandler {
-        MainWindow m_owner = null;
-        public amuleMainECHanler(MainWindow o)
-        {
-            m_owner = o;
-        }
-
-        public override void HandlePacket(ecProto.ecPacket packet)
-        {
-            ECOpCodes op = packet.Opcode();
-            switch(op) {
-                case ECOpCodes.EC_OP_STATS:
-                    m_owner.StatsReplyInvoke(packet);
-                    break;
-                case ECOpCodes.EC_OP_DLOAD_QUEUE:
-                    m_owner.DloadQueueReply(packet);
-                    break;
-                case ECOpCodes.EC_OP_SHARED_FILES:
-                    m_owner.SharedFilesReply(packet);
-                    break;
-                case ECOpCodes.EC_OP_NOOP:
-                    break;
-                default:
-                    throw new Exception("Unhandled EC reply");
-            }
-        }
-    }
-
-    public class amuleListView : ListView {
-        protected int[] m_column_index;
-
-        public amuleListView()
-        {
-            Dock = DockStyle.Fill;
-            View = View.Details;
-            DoubleBuffered = true;
-            FullRowSelect = true;
-            MultiSelect = true;
-        }
-        
-        public void LoadColumns(string [] columns, int [] width)
-        {
-            int i = 0;
-            foreach (string c in columns) {
-                if ( width[i] == 0 ) {
-                    continue;
-                }
-                ColumnHeader h = new ColumnHeader();
-                h.Text = c;
-                h.Width = width[i++];
-                Columns.Add(h);
-            }
-        }
-
-        public void CreateColumtAt(string name, int width, int index)
-        {
-            ColumnHeader h = new ColumnHeader();
-            h.Text = name;
-            h.Width = width;
-            h.Tag = index;
-            Columns.Insert(m_column_index[index], h);
-        }
-        public void RemoveColumnAt(int index)
-        {
-            Columns.RemoveAt(m_column_index[index]);
-        }
-
-        public void AppendItemToCtxMenu(ContextMenuStrip menu, string text,
-            object tag, bool check_state, EventHandler target)
-        {
-            ToolStripMenuItem it = new ToolStripMenuItem(text);
-            it.Click += target;
-            it.CheckState = check_state ? CheckState.Checked : CheckState.Unchecked;
-            it.Tag = tag;
-            menu.Items.Add(it);
-        }
-    }
-
-    public class amuleSharedFilesList : amuleListView, IContainerUI {
-        public amuleSharedFilesList()
-        {
-            string[] columns = { "File name", "Size" };
-            int[] width = { 300, 100, 100, 100 };
-            LoadColumns(columns, width);
-        }
-
-        #region IContainerUI Members
-
-        delegate void UpdateCallback();
-        void IContainerUI.MyEndUpdate()
-        {
-            if (InvokeRequired) {
-                UpdateCallback d = new UpdateCallback(EndUpdate);
-                Invoke(d);
-            } else {
-                EndUpdate();
-            }
-        }
-
-        void IContainerUI.MyBeginUpdate()
-        {
-            if (InvokeRequired) {
-                UpdateCallback d = new UpdateCallback(BeginUpdate);
-                Invoke(d);
-            } else {
-                BeginUpdate();
-            }
-        }
-
-        delegate void ItemCallback(SharedFileItem i);
-
-        void IContainerUI.InsertItem(object i)
-        {
-            SharedFileItem it = i as SharedFileItem;
-            if (InvokeRequired) {
-                ItemCallback d = new ItemCallback(DoInsertItem);
-                Invoke(d, it);
-            } else {
-                DoInsertItem(it);
-            }
-        }
-
-        void IContainerUI.UpdateItem(object i)
-        {
-            throw new Exception("The method or operation is not implemented.");
-        }
-
-        void DoInsertItem(SharedFileItem i)
-        {
-            ListViewItem it = new ListViewItem(i.Name);
-
-            it.SubItems.Add(new ListViewItem.ListViewSubItem(it, i.Size));
-
-            Items.Add(it);
-
-            i.UiItem = it;
-        }
-
-        void DoUpdateItem(SharedFileItem i)
-        {
-            ListViewItem it = i.UiItem as ListViewItem;
-            //Items
-        }
-
-        #endregion
-    }
-}
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/remote-gui.net/MainWindow.resx Deleted

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/remote-gui.net/Program.cs Deleted

@@ -1,44 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003-2009 lfroen ( lfroen@gmail.com / 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
-//
-using System;
-using System.Collections.Generic;
-using System.Windows.Forms;
-
-namespace amule.net
-{
-    static class Program
-    {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new MainWindow());
-        }
-    }
-}
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/remote-gui.net/Properties Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/Properties/AssemblyInfo.cs Deleted

@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("amule-remote.net")]
-[assembly: AssemblyDescription("aMule remote control")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("remote-gui.net")]
-[assembly: AssemblyCopyright("Copyright ©  2007-2009 aMule Team")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("717566ab-386c-42db-a3cf-bb2b5cd0939d")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.0.1.0")]
-[assembly: AssemblyFileVersion("0.0.1.0")]

aMule-2.2.6.tar.bz2/src/remote-gui.net/Properties/Resources.Designer.cs Deleted

@@ -1,126 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.832
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace amule.net.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("amule.net.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        internal static System.Drawing.Bitmap Toolbar_About {
-            get {
-                object obj = ResourceManager.GetObject("Toolbar_About", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        internal static System.Drawing.Bitmap Toolbar_Disconnect {
-            get {
-                object obj = ResourceManager.GetObject("Toolbar_Disconnect", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        internal static System.Drawing.Bitmap Toolbar_Import {
-            get {
-                object obj = ResourceManager.GetObject("Toolbar_Import", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        internal static System.Drawing.Bitmap Toolbar_Network {
-            get {
-                object obj = ResourceManager.GetObject("Toolbar_Network", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        internal static System.Drawing.Bitmap Toolbar_Prefs {
-            get {
-                object obj = ResourceManager.GetObject("Toolbar_Prefs", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        internal static System.Drawing.Bitmap Toolbar_Search {
-            get {
-                object obj = ResourceManager.GetObject("Toolbar_Search", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        internal static System.Drawing.Bitmap Toolbar_Shared {
-            get {
-                object obj = ResourceManager.GetObject("Toolbar_Shared", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        internal static System.Drawing.Bitmap Toolbar_Stats {
-            get {
-                object obj = ResourceManager.GetObject("Toolbar_Stats", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        internal static System.Drawing.Bitmap Toolbar_Transfers {
-            get {
-                object obj = ResourceManager.GetObject("Toolbar_Transfers", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-    }
-}

aMule-2.2.6.tar.bz2/src/remote-gui.net/Properties/Resources.resx Deleted

@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="Toolbar_About" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Toolbar_About.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Toolbar_Disconnect" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Toolbar_Disconnect.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Toolbar_Import" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Toolbar_Import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Toolbar_Network" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Toolbar_Network.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Toolbar_Prefs" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Toolbar_Prefs.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Toolbar_Search" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Toolbar_Search.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Toolbar_Shared" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Toolbar_Shared.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Toolbar_Stats" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Toolbar_Stats.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Toolbar_Transfers" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\Toolbar_Transfers.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-</root>
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/remote-gui.net/Properties/Settings.Designer.cs Deleted

@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.832
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace amule.net.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "8.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}

aMule-2.2.6.tar.bz2/src/remote-gui.net/Properties/Settings.settings Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/SearchControl.Designer.cs Deleted

@@ -1,106 +0,0 @@
-namespace amule.net {
-    partial class amuleSearchControl {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if ( disposing && (components != null) ) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.textBoxSearch = new System.Windows.Forms.TextBox();
-            this.buttonStartSearch = new System.Windows.Forms.Button();
-            this.comboBoxType = new System.Windows.Forms.ComboBox();
-            this.tableLayoutPanel1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // tableLayoutPanel1
-            // 
-            this.tableLayoutPanel1.AutoSize = true;
-            this.tableLayoutPanel1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.tableLayoutPanel1.ColumnCount = 3;
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 44.69027F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 94F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 55.30973F));
-            this.tableLayoutPanel1.Controls.Add(this.textBoxSearch, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.buttonStartSearch, 2, 0);
-            this.tableLayoutPanel1.Controls.Add(this.comboBoxType, 1, 0);
-            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
-            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
-            this.tableLayoutPanel1.RowCount = 3;
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 12.77533F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 87.22467F));
-            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(452, 248);
-            this.tableLayoutPanel1.TabIndex = 0;
-            // 
-            // textBoxSearch
-            // 
-            this.textBoxSearch.Location = new System.Drawing.Point(3, 3);
-            this.textBoxSearch.Name = "textBoxSearch";
-            this.textBoxSearch.Size = new System.Drawing.Size(153, 20);
-            this.textBoxSearch.TabIndex = 2;
-            // 
-            // buttonStartSearch
-            // 
-            this.buttonStartSearch.Location = new System.Drawing.Point(256, 3);
-            this.buttonStartSearch.Name = "buttonStartSearch";
-            this.buttonStartSearch.Size = new System.Drawing.Size(60, 20);
-            this.buttonStartSearch.TabIndex = 3;
-            this.buttonStartSearch.Text = "Search";
-            this.buttonStartSearch.UseVisualStyleBackColor = true;
-            // 
-            // comboBoxType
-            // 
-            this.comboBoxType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxType.FormattingEnabled = true;
-            this.comboBoxType.Items.AddRange(new object[] {
-            "Local",
-            "Global",
-            "Kad"});
-            this.comboBoxType.Location = new System.Drawing.Point(162, 3);
-            this.comboBoxType.Name = "comboBoxType";
-            this.comboBoxType.Size = new System.Drawing.Size(70, 21);
-            this.comboBoxType.TabIndex = 4;
-            // 
-            // amuleSearchControl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.tableLayoutPanel1);
-            this.Name = "amuleSearchControl";
-            this.Size = new System.Drawing.Size(452, 248);
-            this.tableLayoutPanel1.ResumeLayout(false);
-            this.tableLayoutPanel1.PerformLayout();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private System.Windows.Forms.TextBox textBoxSearch;
-        private System.Windows.Forms.Button buttonStartSearch;
-        private System.Windows.Forms.ComboBox comboBoxType;
-    }
-}

aMule-2.2.6.tar.bz2/src/remote-gui.net/SearchControl.cs Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/SearchControl.resx Deleted

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/remote-gui.net/amuleData.cs Deleted

@@ -1,723 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003-2009 lfroen ( lfroen@gmail.com / 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
-//
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Security.Cryptography;
-
-namespace amule.net
-{
-    public class FileGap : IComparable {
-        public Int64 m_start, m_end;
-
-        public int CompareTo(object obj)
-        {
-            if ( obj is FileGap ) {
-                FileGap temp = (FileGap)obj;
-                return m_start.CompareTo(temp.m_start);
-            }
-            throw new ArgumentException("object is not a FileGap");
-        }
-    }
-
-    public class RGB {
-        public byte m_R, m_G, m_B;
-
-        unsafe public void WriteToBuffAlpha(UInt32* ptr)
-        {
-            UInt32 val = (UInt32)((m_R << 16) | (m_G << 8) | m_B);
-            val |= 0xff000000;
-            *ptr = val;
-        }
-
-        unsafe public void WriteToBuffWithModifier(UInt32* ptr, byte modif)
-        {
-            byte R = (m_R > modif) ? (byte)(m_R - modif) : (byte)0;
-            byte G = (m_G > modif) ? (byte)(m_G - modif) : (byte)0;
-            byte B = (m_B > modif) ? (byte)(m_B - modif) : (byte)0;
-            UInt32 val = (UInt32)((R << 16) | (G << 8) | B);
-            val |= 0xff000000;
-            *ptr = val;
-        }
-
-        public Int32 Color
-        {
-            get { return (Int32)((m_R << 16) | (m_G << 8) | m_B); }
-            set 
-            {
-                m_R = (byte)(value >> 16);
-                m_G = (byte)((value >> 8) & 0xff);
-                m_B = (byte)(value & 0xff);
-            }
-        }
-
-    }
-
-    public class FileColoredGap : FileGap {
-        public Int32 m_color;
-
-    }
-
-    public class GapBuffer {
-        public FileGap[] m_buffer;
-
-        public GapBuffer(byte[] raw_buffer, int size)
-        {
-            BinaryReader br = new BinaryReader(new MemoryStream(raw_buffer));
-            int bufsize = size / (2 * sizeof(Int64));
-            m_buffer = new FileGap[bufsize];
-            for ( int i = 0; i < bufsize; i++ ) {
-                m_buffer[i] = new FileGap();
-                m_buffer[i].m_start = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt64());
-                m_buffer[i].m_end = System.Net.IPAddress.NetworkToHostOrder(br.ReadInt64());
-            }
-            System.Array.Sort(m_buffer);
-        }
-    }
-
-    public class ColoredGapBuffer {
-        public FileColoredGap[] m_buffer;
-
-        public ColoredGapBuffer(int size)
-        {
-            m_buffer = new FileColoredGap[size];
-            for ( int i = 0; i < size; i++ ) {
-                m_buffer[i] = new FileColoredGap();
-            }
-            m_buffer[0].m_start = 0;
-            m_buffer[0].m_end = 0;
-            m_buffer[0].m_color = 0;
-        }
-    }
-
-    ///
-    /// RLE implementation. I need only decoder part
-    ///
-    public class RLE_Data {
-        bool m_use_diff;
-        int m_len;
-        byte[] m_enc_buff;
-        byte[] m_buff;
-
-        public RLE_Data(int len, bool use_diff)
-        {
-            m_len = len;
-            m_use_diff = use_diff;
-            // in worst case 2-byte sequence encoded as 3. So, data can grow at 1/3
-            m_enc_buff = new byte[m_len*4/3 + 1];
-            m_buff = new byte[m_len];
-        }
-
-        public byte[] Buffer
-        {
-            get { return m_buff; }
-        }
-
-        public int Length
-        {
-            get { return m_len; }
-        }
-
-        public void Realloc(int size)
-        {
-	        if ( size == m_len ) {
-		        return;
-	        }
-
-            if ( (size > m_len) && (size > m_buff.Length) ) {
-                m_buff = new byte[size];
-                m_enc_buff = new byte[size * 4 / 3 + 1];
-            }
-            m_len = size;
-        }
-
-        public void Decode(byte [] buff, int start_offset)
-        {
-            int len = buff.Length;
-
-            int i = start_offset, j = 0;
-            while ( j != m_len ) {
-                if ( i < (len -1) ) {
-                    if (buff[i+1] == buff[i]) {
-                        // this is sequence
-                        //memset(m_enc_buff + j, buff[i], buff[i + 2]);
-                        for(int k = 0; k < buff[i + 2]; k++) {
-                            m_enc_buff[j + k] = buff[i];
-                        }
-                        j += buff[i + 2];
-                        i += 3;
-                    } else {
-                        // this is single byte
-                        m_enc_buff[j++] = buff[i++];
-                    }
-                } else {
-                    // only 1 byte left in encoded data - it can't be sequence
-                    m_enc_buff[j++] = buff[i++];
-                    // if there's no more data, but buffer end is not reached,
-                    // it must be error in some point
-                    if ( j != m_len ) {
-                        Console.WriteLine("RLE_Data: decoding error. {0} bytes decoded to {1} instead of {2}",
-                            len, j, m_len);
-                        throw new Exception("RLE_Data: decoding error");
-                    }
-                }
-            }
-            if ( m_use_diff ) {
-                for (int k = 0; k < m_len; k++) {
-                    m_buff[k] ^= m_enc_buff[k];
-                }
-            }
-        }
-    }
-
-    public class PartFileEncoderData {
-        public RLE_Data m_part_status;
-        public RLE_Data m_gap_status;
-
-        public PartFileEncoderData(int partcount, int gapcount)
-        {
-            m_part_status = new RLE_Data(partcount+1, true);
-            m_gap_status = new RLE_Data(gapcount*sizeof(Int64)+1, true);
-        }
-
-        public void Decode(byte [] gapdata, byte [] partdata)
-        {
-            m_part_status.Decode(partdata, 0);
-
-            // in a first dword - real size
-            //uint32 gapsize = ENDIAN_NTOHL(RawPeekUInt32(gapdata));
-            //gapdata += sizeof(uint32);
-            //m_gap_status.Realloc(gapsize * 2 * sizeof(uint64));
-            Int32 gapsize = System.Net.IPAddress.NetworkToHostOrder(
-                (Int32)gapdata[0] | ((Int32)gapdata[1] << 8) |
-                ((Int32)gapdata[2] << 16) | ((Int32)gapdata[3] << 24));
-
-            m_gap_status.Realloc(gapsize*2*sizeof(Int64));
-            m_gap_status.Decode(gapdata, 4);
-        }
-    }
-
-    //
-    // I: ID for this kind of tag
-    class amuleTag2ItemConnector<I> {
-        virtual public I ID(ecProto.ecTag tag)
-        {
-            return default(I);
-        }
-
-        virtual public ecProto.ecTag CreateTag(I value)
-        {
-            return null;
-        }
-    }
-
-    public interface IContainerUI {
-        void MyEndUpdate();
-        void MyBeginUpdate();
-
-        void InsertItem(object i);
-        void UpdateItem(object i);
-    }
-
-    //
-    // T: item in container
-    abstract public class amuleGenericContainer<T> {
-        private enum REQ_STATE { IDLE, REQ_SENT, FULL_REQ_SENT };
-        REQ_STATE m_state = REQ_STATE.IDLE;
-
-        LinkedList<T> m_items = new LinkedList<T>();
-        Dictionary<ecProto.ecMD5, T> m_items_hash = new Dictionary<ecProto.ecMD5, T>(32);
-
-        ECOpCodes m_req_cmd;
-
-        ECTagNames m_item_tagname;
-
-        bool m_inc_tags = true;
-
-        protected IContainerUI m_owner;
-
-        public amuleGenericContainer(ECOpCodes req_cmd, ECTagNames item_tagname, IContainerUI owner)
-        {
-            m_owner = owner;
-            m_req_cmd = req_cmd;
-            m_item_tagname = item_tagname;
-        }
-
-        protected virtual bool Phase1Done()
-        {
-            return true;
-        }
-
-        public LinkedList<T> Items
-        {
-            get { return m_items; }
-        }
-
-        protected virtual ecProto.ecTag CreateItemTag(ecProto.ecMD5 id)
-        {
-            return null;
-        }
-
-        public ecProto.ecPacket ReQuery()
-        {
-            // can not issue new query until previous one is replied
-            if ( m_state != REQ_STATE.IDLE ) {
-                return null;
-            }
-
-            ecProto.ecPacket request = new ecProto.ecPacket(m_req_cmd,
-                m_inc_tags ? EC_DETAIL_LEVEL.EC_DETAIL_INC_UPDATE : EC_DETAIL_LEVEL.EC_DETAIL_UPDATE);
-            m_state = REQ_STATE.REQ_SENT;
-
-            return request;
-        }
-
-        void ProcessUpdate(ecProto.ecPacket packet, ecProto.ecPacket full_req)
-        {
-            m_owner.MyBeginUpdate();
-            LinkedList<ecProto.ecTag>.Enumerator i = packet.GetTagIterator();
-            while (i.MoveNext())
-            {
-                ecProto.ecTag t = i.Current;
-                // sometimes reply contains additional tags
-                if ( t.Name() != m_item_tagname ) {
-                    continue;
-                }
-                ecProto.ecMD5 item_id = ((ecProto.ecTagMD5)t).ValueMD5();
-                if ( m_items_hash.ContainsKey(item_id) ) {
-                    T item = m_items_hash[item_id];
-                    ProcessItemUpdate(item, t);
-
-                    if ( m_owner != null ) {
-                        m_owner.UpdateItem(item);
-                    }
-                } else {
-                    if ( m_inc_tags ) {
-                        T item = CreateItem(t);
-                        m_items.AddLast(item);
-                        m_items_hash[item_id] = item;
-
-                        if (m_owner != null) {
-                            m_owner.InsertItem(item);
-                        }
-
-                    } else {
-                        full_req.AddSubtag(CreateItemTag(item_id));
-                    }
-                }
-                //
-                // now process item deletion
-                //
-                // TODO
-            }
-            m_owner.MyEndUpdate();
-        }
-
-        //
-        // derived class must provide
-        //
-        abstract protected void ProcessItemUpdate(T item, ecProto.ecTag tag);
-
-        abstract protected T CreateItem(ecProto.ecTag tag);
-
-        public ecProto.ecPacket HandlePacket(ecProto.ecPacket p)
-        {
-            ecProto.ecPacket reply = null;
-            switch (m_state) {
-                case REQ_STATE.IDLE:
-                    throw new Exception("Should not get packet in IDLE state");
-                case REQ_STATE.REQ_SENT:
-                    m_state = REQ_STATE.IDLE;
-                    if ( !Phase1Done() ) {
-                        break;
-                    }
-                    ecProto.ecPacket full_request = new ecProto.ecPacket(m_req_cmd);
-                    ProcessUpdate(p, full_request);
-
-                    // // Phase 3: request full info about files we don't have yet
-                    if ( !m_inc_tags && (full_request.SubtagCount() != 0)) {
-                        reply = full_request;
-                        m_state = REQ_STATE.FULL_REQ_SENT;
-                    }
-                    
-                    break;
-                case REQ_STATE.FULL_REQ_SENT:
-                    m_state = REQ_STATE.IDLE;
-                    break;
-            }
-            return reply;
-        }
-    }
-
-    public class amuleFileItem {
-        protected ecProto.ecMD5 m_id;
-
-        protected string m_filename;
-        protected Int64 m_filesize;
-
-        protected const Int32 FILE_PARTSIZE = 9728000;
-        object m_ui_item;
-
-        public amuleFileItem(ecProto.ecMD5 id, string name, Int64 size)
-        {
-            m_id = id;
-            m_filename = name;
-            m_filesize = size;
-        }
-
-        public ecProto.ecMD5 ID
-        {
-            get { return m_id; }
-        }
-
-        public string ValueToPrefix(Int64 value)
-        {
-            if (value < 1024)
-            {
-                return string.Format("{0} bytes", value);
-            }
-            else if (value < 1048576)
-            {
-                return string.Format("{0:f} Kb", ((float)value) / 1024);
-            }
-            else if (value < 1073741824)
-            {
-                return string.Format("{0:f} Mb", ((float)value) / 1048576);
-            }
-            else
-            {
-                return string.Format("{0:f} Gb", ((float)value) / 1073741824);
-            }
-        }
-
-        public string Name
-        {
-            get { return m_filename; }
-        }
-	
-        public string Size
-        {
-            get { return ValueToPrefix(m_filesize); }
-        }
-        public object UiItem
-        {
-            get { return m_ui_item; }
-            set { m_ui_item = value; }
-        }
-    }
-
-    public class DownloadQueueItem : amuleFileItem {
-        Int64 m_size_xfered, m_size_done;
-        Int32 m_speed;
-
-        Int32 m_src_count, m_non_current_src_count, m_xfer_src_count, m_a4af_src_count;
-
-        PartFileEncoderData m_decoder;
-
-        //
-        // Used for colored status
-        //
-        ColoredGapBuffer m_color_gap_buff;
-        GapBuffer m_req_parts;
-
-        //
-        // Format24BppRgb or similar
-        //
-        RGB[] m_color_line;
-
-        public static byte[] m_modifiers;
-
-        public RGB [] ColorLine
-        {
-            get { return m_color_line; }
-        }
-	
-        public static byte[] Get_3D_Modifiers()
-        {
-            return m_modifiers;
-        }
-
-        public DownloadQueueItem(ecProto.ecMD5 id, string name, Int64 size, PartFileEncoderData encoder)
-            : base(id, name, size)
-        {
-            m_decoder = encoder;
-            m_color_gap_buff = new ColoredGapBuffer((Int32)(size / FILE_PARTSIZE) + 1 + 1);
-        }
-
-        public static void InitDraw3DModifiers(int height)
-        {
-            if ( m_modifiers != null && m_modifiers.Length == height ) {
-                return;
-            }
-            m_modifiers = new byte[height];
-            for ( int i = 0; i < height; i++ ) {
-                double curr_mod = 30 * (1 + System.Math.Cos((2*System.Math.PI)*(height-(((double)i)/height))));
-                m_modifiers[i] = (byte)System.Math.Floor(curr_mod);
-            }
-        }
-
-        public void AllocColorLine(int size)
-        {
-            m_color_line = new RGB[size];
-            for ( int i = 0; i < m_color_line.Length; i++ ) {
-                m_color_line[i] = new RGB();
-            }
-        }
-
-        public void UpdateItem(ecProto.ecTag tag)
-        {
-            ecProto.ecTagInt itag = (ecProto.ecTagInt)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_SIZE_DONE);
-            if ( itag != null ) {
-                m_size_done = itag.Value64();
-            }
-            itag = (ecProto.ecTagInt)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_SIZE_XFER);
-            if ( itag != null ) {
-                m_size_xfered = itag.Value64();
-            }
-
-            itag = (ecProto.ecTagInt)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_SPEED);
-            if ( itag != null ) {
-                m_speed = (Int32)itag.Value64();
-            }
-
-            itag = (ecProto.ecTagInt)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_SOURCE_COUNT);
-            if ( itag != null ) {
-                m_src_count = (Int32)itag.Value64();
-            }
-
-            itag = (ecProto.ecTagInt)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_SOURCE_COUNT_A4AF);
-            if ( itag != null ) {
-                m_a4af_src_count = (Int32)itag.Value64();
-            }
-
-            itag = (ecProto.ecTagInt)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT);
-            if ( itag != null ) {
-                m_non_current_src_count = (Int32)itag.Value64();
-            }
-
-            itag = (ecProto.ecTagInt)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_SOURCE_COUNT_XFER);
-            if ( itag != null ) {
-                m_xfer_src_count = (Int32)itag.Value64();
-            }
-
-            ecProto.ecTagCustom gapstat = (ecProto.ecTagCustom)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_GAP_STATUS);
-            ecProto.ecTagCustom partstat = (ecProto.ecTagCustom)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_PART_STATUS);
-            m_decoder.Decode(gapstat.Value(), partstat.Value());
-
-            ecProto.ecTagCustom reqstat = (ecProto.ecTagCustom)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_REQ_STATUS);
-            BinaryReader br = new BinaryReader(new MemoryStream(reqstat.Value()));
-
-            m_req_parts = new GapBuffer(reqstat.Value(), reqstat.Value().Length);
-            DrawLine();
-        }
-
-        public void DrawLine()
-        {
-            GapBuffer status_gaps = new GapBuffer(m_decoder.m_gap_status.Buffer, m_decoder.m_gap_status.Length);
-            byte[] part_info = m_decoder.m_part_status.Buffer;
-
-            int colored_gaps_size = 0;
-            for ( int j = 0; j < status_gaps.m_buffer.Length; j++ ) {
-                Int64 gap_start = status_gaps.m_buffer[j].m_start;
-                Int64 gap_end = status_gaps.m_buffer[j].m_end;
-                Int64 start = gap_start / FILE_PARTSIZE;
-                Int64 end = (gap_end / FILE_PARTSIZE) + 1;
-
-                //
-                // Order is RGB
-                //
-                Int32 color = 0xff0000;
-                for ( Int64 i = start; i < end; i++ ) {
-                    if ( part_info[i] != 0 ) {
-                        int blue = 210 - (22 * (part_info[i] - 1));
-                        if ( blue < 0 ) { blue = 0; }
-                        color = (blue << 8) | 255;
-                    }
-                    Int64 fill_gap_begin = ((i == start) ? gap_start : FILE_PARTSIZE * i);
-                    Int64 fill_gap_end = ((i == (end - 1)) ? gap_end : FILE_PARTSIZE * (i + 1));
-
-                    if ( (m_color_gap_buff.m_buffer[colored_gaps_size].m_end == fill_gap_begin) &&
-                        (m_color_gap_buff.m_buffer[colored_gaps_size].m_color == color) ) {
-                        m_color_gap_buff.m_buffer[colored_gaps_size].m_end = fill_gap_end;
-                    } else {
-                        colored_gaps_size++;
-                        m_color_gap_buff.m_buffer[colored_gaps_size].m_start = fill_gap_begin;
-                        m_color_gap_buff.m_buffer[colored_gaps_size].m_end = fill_gap_end;
-                        m_color_gap_buff.m_buffer[colored_gaps_size].m_color = color;
-                    }
-                }
-            }
-            //
-            // Now actual drawing
-            //
-            int width = m_color_line.Length;
-            for ( int i = 0; i < width; i++ ) {
-                m_color_line[i].Color = 0x7f7f7f;
-            }
-            if ( m_filesize < width ) {
-                //
-                // if file is that small, draw it in single step
-                //
-                if ( m_req_parts.m_buffer.Length != 0 ) {
-                    for ( int i = 0; i < width; i++ ) {
-                        // yellow
-                        m_color_line[i].Color = 0xffd000;
-                    }
-                } else if ( m_color_gap_buff.m_buffer.Length != 0 ) {
-                    for ( int i = 0; i < width; i++ ) {
-                        m_color_line[i].Color = m_color_gap_buff.m_buffer[i].m_color;
-                    }
-                }
-            } else {
-                Int32 factor = (Int32)(m_filesize / width);
-                for ( int i = 1; i <= colored_gaps_size; i++ ) {
-                    Int32 start = (Int32)(m_color_gap_buff.m_buffer[i].m_start / factor);
-                    Int32 end = (Int32)(m_color_gap_buff.m_buffer[i].m_end / factor);
-                    for ( Int32 j = start; j < end; j++ ) {
-                        m_color_line[j].Color = m_color_gap_buff.m_buffer[i].m_color;
-                    }
-                }
-                foreach ( FileGap g in m_req_parts.m_buffer ) {
-                    Int32 start = (Int32)(g.m_start / factor);
-                    Int32 end = (Int32)(g.m_end / factor);
-                    for ( Int32 j = start; j < end; j++ ) {
-                        m_color_line[j].Color = 0xffd000;
-                    }
-                }
-            }
-        }
-
-        public string SizeDone
-        {
-            get { return ValueToPrefix(m_size_done); }
-        }
-        public string Speed
-        {
-            get { return (m_speed == 0) ? "" : (ValueToPrefix(m_speed) + "/s"); }
-        }
-        public string PercentDone
-        {
-            get { return String.Format("{0} %", m_size_done * 100 / m_filesize); }
-        }
-        public string Sources
-        {
-            get 
-            {
-                string result;
-                if (m_non_current_src_count != 0) {
-                    result = String.Format("{0} / {1}",
-                        m_src_count - m_non_current_src_count, m_src_count);
-                } else {
-                    result = String.Format("{0}", m_src_count);
-                }
-                if (m_a4af_src_count != 0) {
-                    result += String.Format(" +{0}", m_a4af_src_count);
-                }
-                if ( m_xfer_src_count != 0 ) {
-                    result += String.Format(" ({0})", m_xfer_src_count);
-                }
-                return result; 
-            }
-        }
-    }
-
-    public class DownloadQueueContainer : amuleGenericContainer<DownloadQueueItem> {
-        Dictionary<ecProto.ecMD5, PartFileEncoderData> m_enc_map;
-
-        private int m_new_item_status_length;
-
-        public int NewItemStatusLineLength
-        {
-            get { return m_new_item_status_length; }
-            set { m_new_item_status_length = value; }
-        }
-
-        public DownloadQueueContainer(IContainerUI owner)
-            : base(ECOpCodes.EC_OP_GET_DLOAD_QUEUE, ECTagNames.EC_TAG_PARTFILE, owner)
-        {
-            m_enc_map = new Dictionary<ecProto.ecMD5, PartFileEncoderData>();
-        }
-
-        override protected void ProcessItemUpdate(DownloadQueueItem item, ecProto.ecTag tag)
-        {
-            item.UpdateItem(tag);
-
-            ecProto.ecMD5 id = ((ecProto.ecTagMD5)tag).ValueMD5();
-            if ( !m_enc_map.ContainsKey(id) ) {
-                throw new Exception("No RLE decoder for download queue item");
-            }
-        }
-
-        override protected DownloadQueueItem CreateItem(ecProto.ecTag tag)
-        {
-            ecProto.ecMD5 id = ((ecProto.ecTagMD5)tag).ValueMD5();
-            string filename = ((ecProto.ecTagString)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_NAME)).StringValue();
-            Int64 filesize = (Int64)((ecProto.ecTagInt)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_SIZE_FULL)).Value64();
-
-            PartFileEncoderData e = new PartFileEncoderData((int)(filesize / 9728000), 10);
-            m_enc_map[id] = e;
-
-            DownloadQueueItem i = new DownloadQueueItem(id, filename, filesize, e);
-
-            i.AllocColorLine(m_new_item_status_length);
-
-            i.UpdateItem(tag);
-
-            return i;
-        }
-    }
-
-    public class SharedFileItem : amuleFileItem {
-        public SharedFileItem(ecProto.ecMD5 id, string name, Int64 size)
-            : base(id, name, size)
-        {
-        }
-    }
-
-    class SharedFileListContainer : amuleGenericContainer<SharedFileItem>
-    {
-        public SharedFileListContainer(IContainerUI owner)
-            : base(ECOpCodes.EC_OP_GET_SHARED_FILES, ECTagNames.EC_TAG_KNOWNFILE, owner)
-        {
-        }
-
-        override protected void ProcessItemUpdate(SharedFileItem item, ecProto.ecTag tag)
-        {
-        }
-
-        override protected SharedFileItem CreateItem(ecProto.ecTag tag)
-        {
-            ecProto.ecMD5 id = ((ecProto.ecTagMD5)tag).ValueMD5();
-            string filename = ((ecProto.ecTagString)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_NAME)).StringValue();
-            Int64 filesize = (Int64)((ecProto.ecTagInt)tag.SubTag(ECTagNames.EC_TAG_PARTFILE_SIZE_FULL)).Value64();
-            SharedFileItem i = new SharedFileItem(id, filename, filesize);
-
-            //i.UpdateItem(tag);
-
-            return i;
-        }
-    }
-
-}
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/remote-gui.net/amuleRemote.cs Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/bin Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/bin/Release Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/ecProto.cs Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/images Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/images/Toolbar_About.png Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/images/Toolbar_Disconnect.png Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/images/Toolbar_Import.png Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/images/Toolbar_Network.png Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/images/Toolbar_Prefs.png Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/images/Toolbar_Search.png Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/images/Toolbar_Shared.png Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/images/Toolbar_Stats.png Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/images/Toolbar_Transfers.png Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/obj Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/obj/Release Deleted

aMule-2.2.6.tar.bz2/src/remote-gui.net/remote-gui.net.csproj Deleted

@@ -1,140 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DA4C427D-607A-4AB8-9C12-1B60AB283471}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>amule.net</RootNamespace>
-    <AssemblyName>amule-remote.net</AssemblyName>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AboutBox.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="AboutBox.Designer.cs">
-      <DependentUpon>AboutBox.cs</DependentUpon>
-    </Compile>
-    <Compile Include="AddLinkDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="AddLinkDialog.Designer.cs">
-      <DependentUpon>AddLinkDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="amuleData.cs" />
-    <Compile Include="amuleRemote.cs" />
-    <Compile Include="ConnectDlg.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="ConnectDlg.Designer.cs">
-      <DependentUpon>ConnectDlg.cs</DependentUpon>
-    </Compile>
-    <Compile Include="DownloadControl.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ECCodes.cs" />
-    <Compile Include="ecProto.cs" />
-    <Compile Include="ECTagTypes.cs" />
-    <Compile Include="MainWindow.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MainWindow.Designer.cs">
-      <DependentUpon>MainWindow.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="AboutBox.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>AboutBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="AddLinkDialog.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>AddLinkDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="ConnectDlg.resx">
-      <DependentUpon>ConnectDlg.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="MainWindow.resx">
-      <DependentUpon>MainWindow.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="SearchControl.resx">
-      <SubType>Designer</SubType>
-      <DependentUpon>SearchControl.cs</DependentUpon>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <Compile Include="SearchControl.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SearchControl.Designer.cs">
-      <DependentUpon>SearchControl.cs</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="images\Toolbar_About.png" />
-    <Content Include="images\Toolbar_Disconnect.png" />
-    <Content Include="images\Toolbar_Import.png" />
-    <Content Include="images\Toolbar_Network.png" />
-    <Content Include="images\Toolbar_Prefs.png" />
-    <Content Include="images\Toolbar_Search.png" />
-    <Content Include="images\Toolbar_Shared.png" />
-    <Content Include="images\Toolbar_Stats.png" />
-    <Content Include="images\Toolbar_Transfers.png" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  
-</Project>
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/remote-gui.net/remote-gui.net.sln Deleted

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/alc.eu.1 Deleted

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/alcc.eu.1 Deleted

@@ -1,32 +0,0 @@
-.TH ALCC "1" "2005 Martxoa" "aMule ED2k lotura sortzailea" "aMule lanabesak"
-.SH IZENA
-alcc \- testuan oinarrituriko aMule ED2k lotura sortzailea
-.SH LABURPENA
-.B alcc
-.RB [ \-p ]
-.RB [ \-v ]
-.I <sarrerafitxategi_zerrenda>
-.PP
-.B alcc
-.RB [ \-h ]
-.SH AZALPENA
-\fI<inputfiles_list>\fR-en emandako sarrera fitxategi guztien ED2K loturak kalkulatu (fixtategi bat edo gehiago izan 
-daitezke).
-.SS "Erabilera:"
-.TP
-\fB\-h, \-\-help\fR
-Laguntza hau inprimatu.
-.TP
-\fB\-v, \-\-verbose\fR
-Luze izan: kalkulu pausuak inprimatu.
-.TP
-\fB\-p, \-\-parthashes\fR
-Kalkulatutako ED2k loturei zati egiaztapenak gehitu edo kalkulatu.
-ZORRIEN BERRI EMATEN
-Mesedez zorrien berri emateko gure foroa (\fIhttp://forum.amule.org/\fR), edo gure zorri kudeatzailea
-(\fIhttp://bugs.amule.org/\fR) erabili.
-Mesedez ez eman zorrien berri epostaz, ez gure eposta zerrendan ez taldeko partaideei.
-.SH COPYRIGHT
-aMule eta inguruneko lanabes guztiak GNU Lizentzia Publiko Orokorraz banatzen dira.
-.SH IKUSI ERE
-\fBalc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)

aMule-2.2.6.tar.bz2/src/utils/cas/docs/cas.eu.1 Deleted

@@ -1,48 +0,0 @@
-.TH CAS 1 "2005 Martxoa" "cas v0.5" "aMule lanabesak"
-.SH IZENA
-cas \- c aMule statistikak
-.SH LABURPENA
-.B cas
-.RI [ AUKERAK ]
-.SH AZALPENA
-.PP
-    ___    _ _   ___    c aMule statistics
-  /'___) /'_` )/',__)   by Pedro de Oliveira
- ( (___ ( (_| |\\\__, \\   <falso@rdk.homeip.net>
- `\\____)`\\__,_)(____/   Version 0.5
-.P
-\fBcas\fR zure aMule lineako sinadura fitxategiarne edukiak
-(gizakiak irakurtzeko moduan) bistaratzeko programa.
-.SS AUKERAK:
-.TP
-\fB\-o\fR, \fB\-\-picture\fR, \fB\-P\fR
-Lineako sinadura irudia idatzi.
-Aukeran \fI\=\<BIDEA\>\fR gehitu diezaiokezu aukera honi, irudia non gordeko den ezartzeko
-.TP
-\fB\-p\fR, \fB\-\-html\fR, \fB\-H\fR
-Estatistika eta irudiarekin HTML orrialdea.
-Aukeran \fI\=\<BIDEA\>\fR gehitu diezaiokezu aukera honi, orria non gordeko den ezartzeko
-.TP
-\fB\-c\fR, \fB\-\-config\-dir\fR
-home-etik ezberdina den konfigurazio direktorio bat ezarri
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Erabilera azalpen labur bat inprimatu.
-.P
-Aukerarik gabe lineako sinadura datuak irteera estandarrean inprimatuko dira.
-.SH FITXATEGIAK
-~/.aMule/casrc
-.br
-stat.png
-.br
-tmp.html
-.SH EGILEA
-\fBcas\fR Pedro de Oliveira-k <falso@rdk.homeip.net> idatzia izan da.
-.SH ZORRIEN BERRI EMATEN
-Mesedez zorrien berri emateko gure foroa (\fIhttp://forum.amule.org/\fR), edo gure zorri kudeatzailea
-(\fIhttp://bugs.amule.org/\fR) erabili.
-Mesedez ez eman zorrien berri epostaz, ez gure eposta zerrendan ez taldeko partaideei.
-.SH COPYRIGHT
-aMule eta inguruneko lanabes guztiak GNU Lizentzia Publiko Orokorraz banatzen dira.
-.SH IKUSI ERE
-\fBamule\fR(1), \fBwxcas\fR(1)

aMule-2.2.6.tar.bz2/src/utils/scripts/mac_packager Deleted

@@ -1,96 +0,0 @@
-#!/bin/sh
-##################################################
-#             aMule.app bundle creator.          #
-##################################################
-
-## This file is part of the aMule Project
-##
-## Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-## Copyright (c) 2003-2009 aMule Project     ( http://www.amule-project.net )
-##
-## 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
-
-
-echo ""
-echo -n "Step 1: Cleaning bundle... "
-rm aMule.app/Contents/Frameworks/libwx_* aMule.app/Contents/MacOS/* 1> /dev/null 2> /dev/null
-rm -r aMule.app/Contents/Resources/webserver 1> /dev/null 2> /dev/null
-rm -r aMule.app/Contents/SharedSupport 1> /dev/null 2> /dev/null
-echo "Done"
-echo ""
-echo -n "Step 2: Copying aMule to app bundle... " 
-cp src/amule aMule.app/Contents/MacOS/
-cp src/webserver/src/amuleweb aMule.app/Contents/MacOS/
-cp src/ed2k aMule.app/Contents/MacOS/
-cp src/amulecmd aMule.app/Contents/MacOS/
-cp -R src/webserver aMule.app/Contents/Resources
-find aMule.app/Contents/Resources/webserver $ -name .svn -o -name "Makefile*" -o -name src $ -print0 | xargs -0 rm -rf
-echo "Done"
-echo ""
-echo -n "Step 3: Installing translations to app bundle... "
-orig_dir=`pwd`
-cd po
-make install datadir=$orig_dir/aMule.app/Contents/SharedSupport 1> /dev/null 2> /dev/null
-cd $orig_dir
-echo "Done"
-echo ""
-echo "Step 4: Copying libs to Framework"
-echo "    wxWidgets..."
-# wxWidgets libs to frameworks
-for i in $( otool -L	aMule.app/Contents/MacOS/amule \
-						aMule.app/Contents/MacOS/amuleweb \
-						aMule.app/Contents/MacOS/ed2k \
-						aMule.app/Contents/MacOS/amulecmd \
-			| sort -u | grep libwx_ | cut -d " " -f 1 ); do 
-	cp $i aMule.app/Contents/Frameworks; 
-done
-echo "Libs copy done."
-echo ""
-echo "Step 5: Update libs info"
-#then install_name_tool on them to fix the path on the shared lib
-cd aMule.app/Contents/
-for i in $( ls Frameworks | grep -v CVS); do
-	echo "    Updating $i"
-	#update library id
-	install_name_tool -id @executable_path/../Frameworks/$i Frameworks/$i
-	#update library links
-	for j in $( otool -L Frameworks/$i | grep libwx_ | cut -d " " -f 1 ); do
-	        install_name_tool -change \
-                $j @executable_path/../Frameworks/`echo $j | rev | cut -d "/" -f 1 | rev` \
-		Frameworks/$i 1> /dev/null 2> /dev/null
-
-	done
-	echo "    Updating aMule lib info for $i"
-	#update amule executable
-	install_name_tool -change \
-		`otool -L MacOS/amule | grep $i | cut -d " " -f 1` \
-		@executable_path/../Frameworks/$i MacOS/amule 1> /dev/null 2> /dev/null
-	install_name_tool -change \
-		`otool -L MacOS/amuleweb | grep $i | cut -d " " -f 1` \
-		@executable_path/../Frameworks/$i MacOS/amuleweb 1> /dev/null 2> /dev/null
-	install_name_tool -change \
-		`otool -L MacOS/ed2k | grep $i | cut -d " " -f 1` \
-		@executable_path/../Frameworks/$i MacOS/ed2k 1> /dev/null 2> /dev/null
-	install_name_tool -change \
-		`otool -L MacOS/amulecmd | grep $i | cut -d " " -f 1` \
-		@executable_path/../Frameworks/$i MacOS/amulecmd 1> /dev/null 2> /dev/null
-done
-echo "Libs info updated, aMule.app is ready to package."
-echo ""
-cd ../..
-echo -n "Creating aMule.zip... "
-zip -9 -r aMule.zip aMule.app/ -j docs/README.Mac.txt docs/COPYING > /dev/null
-echo "Done"
-echo ""

aMule-2.2.6.tar.bz2/src/utils/scripts/translate-manpages Deleted

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-if [ -z ${1} ] ; then
-
-	echo "You have to specify a language to translate into (i.e. de)."
-	exit 0
-
-fi
-
-if [ ! -e docs/man/manpages-${1}.po ] ; then
-
-	echo "The specified translation catalog doesn\`t exist"
-	echo "Make sure, that the .po-file is in docs/man"
-	exit 0
-
-fi
-
-bin=`which po4a-translate` || { echo "You don't have po4a installed"; exit 0; }
-
-${bin} -f man -m docs/man/amule.1 -p docs/man/manpages-${1}.po -l docs/man/amule.${1}.1 -L UTF8
-${bin} -f man -m docs/man/amuled.1 -p docs/man/manpages-${1}.po -l docs/man/amuled.${1}.1 -L UTF8
-${bin} -f man -m docs/man/amulecmd.1 -p docs/man/manpages-${1}.po -l docs/man/amulecmd.${1}.1 -L UTF8
-${bin} -f man -m docs/man/amulegui.1 -p docs/man/manpages-${1}.po -l docs/man/amulegui.${1}.1 -L UTF8
-${bin} -f man -m docs/man/amuleweb.1 -p docs/man/manpages-${1}.po -l docs/man/amuleweb.${1}.1 -L UTF8
-${bin} -f man -m docs/man/ed2k.1 -p docs/man/manpages-${1}.po -l docs/man/ed2k.${1}.1 -L UTF8
-${bin} -f man -m src/utils/wxCas/docs/wxcas.1 -p docs/man/manpages-${1}.po -l src/utils/wxCas/docs/wxcas.${1}.1 -L UTF8
-${bin} -f man -m src/utils/cas/docs/cas.1 -p docs/man/manpages-${1}.po -l src/utils/cas/docs/cas.${1}.1 -L UTF8
-${bin} -f man -m src/utils/xas/docs/xas.1 -p docs/man/manpages-${1}.po -l src/utils/xas/docs/xas.${1}.1 -L UTF8

aMule-2.2.6.tar.bz2/src/utils/wxCas/docs/wxcas.eu.1 Deleted

aMule-2.2.6.tar.bz2/src/utils/xas/docs/xas.eu.1 Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/Makefile.am Deleted

@@ -1,69 +0,0 @@
-dist_webserver_DATA = \
-	aMule.tmpl \
-	add_server.gif \
-	arrow_down.gif \
-	arrow_down_logout.gif \
-	arrow_right.gif \
-	arrow_up.gif \
-	back.gif \
-	black.gif \
-	blank1x1.gif \
-	blue1.gif \
-	blue2.gif \
-	blue3.gif \
-	blue4.gif \
-	blue5.gif \
-	blue6.gif \
-	cp_download.gif \
-	cp_kad.gif \
-	cp_search.gif \
-	cp_servers.gif \
-	cp_settings.gif \
-	cp_shared.gif \
-	cp_stats.gif \
-	emule.gif \
-	green.gif \
-	greenpercent.gif \
-	l_cancel.gif \
-	l_connect.gif \
-	l_down.gif \
-	l_ed2klink.gif \
-	l_info.gif \
-	l_pause.gif \
-	l_resume.gif \
-	l_up.gif \
-	log.gif \
-	login_bottom.gif \
-	login_downmain.gif \
-	login_lefttop.gif \
-	login_righttop.gif \
-	login_top.gif \
-	login_topdown.gif \
-	login_topseperator.gif \
-	logo.jpg \
-	main_bg.gif \
-	main_top_bg.gif \
-	main_topbar.gif \
-	main_topbardarker.gif \
-	main_topbarseperator.gif \
-	red.gif \
-	transparent.gif \
-	yellow.gif \
-	phpamule.png \
-	tree-leaf.gif \
-	tree-open.gif \
-	tree-closed.gif \
-	favicon.ico \
-	downloads.php \
-	preferences.php \
-	search.php \
-	servers.php \
-	shared.php \
-	stat_graphs.php \
-	stat_tree.php \
-	login.php \
-	index.php
-
-webserverdir = $(pkgdatadir)/webserver/chicane
-
-MAINTAINERCLEANFILES = Makefile.in

aMule-2.2.6.tar.bz2/src/webserver/chicane/Makefile.in Deleted

@@ -1,553 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/webserver/chicane
-DIST_COMMON = $(dist_webserver_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \
-	$(top_srcdir)/m4/build-tools.m4 $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/cryptopp.m4 $(top_srcdir)/m4/fallocate.m4 \
-	$(top_srcdir)/m4/gdlib.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
-	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
-	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(webserverdir)"
-dist_webserverDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_webserver_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
-ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
-ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
-ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
-AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
-AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
-AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BFD_CPPFLAGS = @BFD_CPPFLAGS@
-BFD_LIBS = @BFD_LIBS@
-BUILD_CC = @BUILD_CC@
-BUILD_CFLAGS = @BUILD_CFLAGS@
-BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
-BUILD_EXEEXT = @BUILD_EXEEXT@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BUILD_LDFLAGS = @BUILD_LDFLAGS@
-CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
-CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
-CRYPTOPP_LDFLAGS = @CRYPTOPP_LDFLAGS@
-CRYPTOPP_LIBS = @CRYPTOPP_LIBS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
-ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
-EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
-EXEEXT = @EXEEXT@
-GDLIB_CFLAGS = @GDLIB_CFLAGS@
-GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
-GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
-GDLIB_LIBS = @GDLIB_LIBS@
-GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
-GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
-GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
-GEOIP_LIBS = @GEOIP_LIBS@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-INCINTL = @INCINTL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
-LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@
-LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@
-LIBPNG_LIBS = @LIBPNG_LIBS@
-LIBS = @LIBS@
-LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@
-LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@
-LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@
-LIBUPNP_LIBS = @LIBUPNP_LIBS@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
-MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-MULECFLAGS = @MULECFLAGS@
-MULECPPFLAGS = @MULECPPFLAGS@
-MULECXXFLAGS = @MULECXXFLAGS@
-MULELDFLAGS = @MULELDFLAGS@
-MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-POW_LIB = @POW_LIB@
-RANLIB = @RANLIB@
-RC = @RC@
-RCFLAGS = @RCFLAGS@
-READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
-RESOLV_LIB = @RESOLV_LIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
-WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
-WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
-WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
-WX_CFLAGS = @WX_CFLAGS@
-WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
-WX_CONFIG_PATH = @WX_CONFIG_PATH@
-WX_CPPFLAGS = @WX_CPPFLAGS@
-WX_CXXFLAGS = @WX_CXXFLAGS@
-WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
-WX_DEBUG = @WX_DEBUG@
-WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
-WX_PORT = @WX_PORT@
-WX_RESCOMP = @WX_RESCOMP@
-WX_SHARED = @WX_SHARED@
-WX_UNICODE = @WX_UNICODE@
-WX_VERSION_FULL = @WX_VERSION_FULL@
-WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
-WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
-XGETTEXT = @XGETTEXT@
-YACC = @YACC@
-ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
-ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-docdir = @docdir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-dist_webserver_DATA = \
-	aMule.tmpl \
-	add_server.gif \
-	arrow_down.gif \
-	arrow_down_logout.gif \
-	arrow_right.gif \
-	arrow_up.gif \
-	back.gif \
-	black.gif \
-	blank1x1.gif \
-	blue1.gif \
-	blue2.gif \
-	blue3.gif \
-	blue4.gif \
-	blue5.gif \
-	blue6.gif \
-	cp_download.gif \
-	cp_kad.gif \
-	cp_search.gif \
-	cp_servers.gif \
-	cp_settings.gif \
-	cp_shared.gif \
-	cp_stats.gif \
-	emule.gif \
-	green.gif \
-	greenpercent.gif \
-	l_cancel.gif \
-	l_connect.gif \
-	l_down.gif \
-	l_ed2klink.gif \
-	l_info.gif \
-	l_pause.gif \
-	l_resume.gif \
-	l_up.gif \
-	log.gif \
-	login_bottom.gif \
-	login_downmain.gif \
-	login_lefttop.gif \
-	login_righttop.gif \
-	login_top.gif \
-	login_topdown.gif \
-	login_topseperator.gif \
-	logo.jpg \
-	main_bg.gif \
-	main_top_bg.gif \
-	main_topbar.gif \
-	main_topbardarker.gif \
-	main_topbarseperator.gif \
-	red.gif \
-	transparent.gif \
-	yellow.gif \
-	phpamule.png \
-	tree-leaf.gif \
-	tree-open.gif \
-	tree-closed.gif \
-	favicon.ico \
-	downloads.php \
-	preferences.php \
-	search.php \
-	servers.php \
-	shared.php \
-	stat_graphs.php \
-	stat_tree.php \
-	login.php \
-	index.php
-
-webserverdir = $(pkgdatadir)/webserver/chicane
-MAINTAINERCLEANFILES = Makefile.in
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/webserver/chicane/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/webserver/chicane/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-dist_webserverDATA: $(dist_webserver_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(webserverdir)" || $(mkdir_p) "$(DESTDIR)$(webserverdir)"
-	@list='$(dist_webserver_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_webserverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(webserverdir)/$$f'"; \
-	  $(dist_webserverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(webserverdir)/$$f"; \
-	done
-
-uninstall-dist_webserverDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_webserver_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(webserverdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(webserverdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(webserverdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dist_webserverDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_webserverDATA uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-dist_webserverDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_webserverDATA uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

aMule-2.2.6.tar.bz2/src/webserver/chicane/aMule.tmpl Deleted

@@ -1,1102 +0,0 @@
-<--TMPL_VERSION-->
-4
-<--TMPL_VERSION_END-->
-
-<--TMPL_CATARROW-->
-<img src="arrow_right.gif" align="absmiddle">
-<--TMPL_CATARROW_END-->
-
-<--TMPL_HEADER-->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=[CharSet]">
-    <META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-    <title>
-      [aMuleAppName] [version] - [WebControl]
-    </title>
-    [HeaderMeta]
-    [StyleSheet]
-  </head>
-  <body background="main_bg.gif" text=white link="#1F76A5" vlink="#1F76A5" alink="#1F76A5" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-    <table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
-      <tr>
-       <td class="tabs_three" background="main_top_bg.gif" align="left" colspan="4">
-
-        <table border="0" cellpadding="4" cellspacing="0" width="100%">
-        <tr>
-          <td class="tabs_three" align="center" width="100">
-            &nbsp;
-            <font face="Tahoma" style="font-size:13pt;" color="#000000"><a href="http://www.amule.org" target="_blank">
-              <img src="emule.gif" alt="aMule | [WebControl]">
-            </a>
-          </td>
-          <td class="tabs_three" align="center" width="30">
-            &nbsp;
-          </td>
-          <td align="center" class="tabs_three" width="95">
-            <a href="#" onClick="self.location.href='?ses=[Session]&amp;w=server'">
-              <img src="cp_servers.gif"><br />
-              [Server]
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="#" onClick="self.location.href='?ses=[Session]&amp;w=transfer'">
-              <img src="cp_download.gif"><br />
-              [Transfer]
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="#" onClick="self.location.href='?ses=[Session]&amp;w=search'">
-              <img src="cp_search.gif"><br />
-              [Search]
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="#" onClick="self.location.href='?ses=[Session]&amp;w=shared'">
-              <img src="cp_shared.gif"><br />
-              [Shared]
-            </a>
-          <td align="center" class="tabs_three" width="110">
-            <a href="#" onClick="self.location.href='?ses=[Session]&amp;w=stats'">
-              <img src="cp_stats.gif"><br />
-              [Stats]
-            </a>
-            <font color="#000000">|</font>
-            <a href="#" onClick="self.location.href='?ses=[Session]&amp;w=graphs'">
-              [Graphs]
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="95">
-            <a href="#" onClick="self.location.href='?ses=[Session]&amp;w=options'">
-              <img src="cp_settings.gif"><br />
-              [Options]
-            </a>
-          </td>
-          <td class="tabs_three" align="center">
-            &nbsp;
-          </td>
-          <td align="left" class="tabs_three" width="95">
-            <img src="log.gif" align="absmiddle"> <a href="#" onClick="self.location.href='?ses=[Session]&amp;w=sinfo'">[ServerInfo]</a><br />
-            <img src="log.gif" align="absmiddle"> <a href="#" onClick="self.location.href='?ses=[Session]&amp;w=log#end'">[Log]</a>
-          </td>
-        </tr>
-        </table>
-
-       </td>
-      </tr>
-      <tr>
-       <td background="main_topbar.gif" height="49" class="tabs_four">
-         &nbsp;&nbsp;[Connected]&nbsp;<br />
-         &nbsp;&nbsp;[Speed]&nbsp;
-         <font color="#FFE471">
-           <script language="javascript">
-             var d = new Date();
-             s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-             document.write(s);
-           </script>
-         </font>
-       </td>
-       <td background="main_topbar.gif" align="center" valign="middle" class="tabs_four">
-        <a href="?ses=[Session]&amp;w=download">
-          <img src="arrow_right.gif" align="absmiddle">
-          &nbsp; ed2k:// [Download]
-        </a>
-       </td>
-       <td background="main_topbar.gif" align="right">
-       
-        <table border="0" cellpadding="0" cellspacing="0" width="8" height="100%">
-           <tr>
-             <td height="49" background="main_topbarseperator.gif">
-               &nbsp;
-             </td>
-           </tr>
-         </table>
-         
-       </td>
-       <td background="main_topbardarker.gif" align="center" valign="middle" class="tabs_five">
-         <a href="?ses=[Session]&amp;w=logout">
-           <img src="arrow_down_logout.gif" align="absmiddle">
-           &nbsp; Logout
-         </a>
-       </td>
-      </tr>
-    </table>
-<--TMPL_HEADER_END-->
-<--TMPL_HEADER_META_REFRESH-->
-<meta http-equiv=refresh content="[RefreshVal]; url=?ses=[Session]&amp;w=[wCommand]">
-<--TMPL_HEADER_META_REFRESH_END-->
-<--TMPL_HEADER_STYLESHEET-->
-<style type="text/css">
-  img {
-    border : 0px;
-  }
-
-  a, a:link, a:visited {
-    color : white;
-    text-decoration: none;
-  }
-
-  a:hover {
-    color: #FFC412;
-    text-decoration: none;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-header, .up-header-left, .up-line, .up-line-left,
-  .server-header, .server-header-left, .server-line, .server-line-left,
-  .shared-header, .shared-header-left, .shared-line, .shared-line-changed,
-  .shared-line-left, .shared-line-left-changed,
-  .header, .smallheader, .commontext,
-  .upqueue-header, .upqueue-line, .upqueue-line-left,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .tabs {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1F76A5;
-  }
-
-  .tabs_too {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #0075B3;
-  }
-
-  .tabs_three {
-    font-family : Tahoma;
-    font-size : 10pt;
-  }
-
-  .tabs_four {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #21719B;
-  }
-
-  .tabs_five {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1D6083;
-  }
-
-  .down-header, .down-line, .down-line-good, .up-header, .up-line,
-  .server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-  .upqueue-header, .upqueue-line,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    text-align : center;
-  }
-
-  .down-header-left, .down-line-left, .down-line-good-left,
-  .server-header-left, .server-line-left, .shared-header-left,
-  .up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left {
-
-    text-align : left;
-  }
-
-  .down-line-right, .down-line-good-right, .down-header-right {
-    text-align : right;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .up-header, .up-header-left, .server-header, .server-header-left,
-  .shared-header, .shared-header-left, .upqueue-header,
-  .websearch-header, .addserver-header {
-
-    background-color : #1D6083;
-  }
-
-  .header {
-    background-color : #0046AC;
-  }
-
-  .smallheader {
-    background-color : #003399;
-    color : #FFFFFF;
-  }
-
-  .commontext {
-    background-color : #FFFFFF;
-    color : #000000;
-  }
-
-  .commontext_too {
-    color : #FFFFFF;
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-line, .up-line-left, .server-line, .server-line-left,
-  .shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-  .upqueue-line, .upqueue-line-left,
-  .websearch-line, .addserver-line {
-
-    background-color : #1F76A5;
-  }
-
-  .down-line-good, .down-line-good-left, .down-line-good-right,
-  .shared-line-changed, .shared-line-left-changed {
-
-    color : #F0F000;
-  }
-
-  .percent_table {
-    border:0px solid #000000;
-    border-collapse: collapse;
-  }
-
-  .message {
-    font-family : Tahoma;
-    font-size : 8pt;
-    font-weight: bold;
-    color: #FFFFFF;
-    background-color: #1D6083;
-  }
-
-  .dinput {
-    border-width: 1px;
-    border-color: black;
-  }
-</style>
-<--TMPL_HEADER_STYLESHEET_END-->
-<--TMPL_FOOTER-->
-</body>
-</html>
-<--TMPL_FOOTER_END-->
-<--TMPL_SERVER_LIST-->
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="95%">
-<tr>
-  <td align=center valign=top>
-[AddServerBox]<p>&nbsp;</p>
-[ConnectedServerData]
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=6 style="background-color: #000000"><b>[ServerList]</b></td>
-</tr>
-<tr>
- <td valign=middle class="server-header-left"><a href="?ses=[Session]&amp;w=server&amp;sort=name[SortName]"><b>[Servername]</b></a></td>
- <td valign=middle class="server-header"><a href="?ses=[Session]&amp;w=server&amp;sort=description[SortDescription]"><b>[Description]</b></a></td>
- <td valign=middle class="server-header"><a href="?ses=[Session]&amp;w=server&amp;sort=ip[SortIP]"><b>[Address]</b></a></td>
- <td valign=middle class="server-header"><a href="?ses=[Session]&amp;w=server&amp;sort=users[SortUsers]"><b>[Users]</b></a></td>
- <td valign=middle class="server-header"><a href="?ses=[Session]&amp;w=server&amp;sort=files[SortFiles]"><b>[Files]</b></a></td>
- <td valign=middle class="server-header"><b>[Actions]</b></td>
-</tr>
-[ServersList]
-</table>
- </td>
-</tr>
-</table>
-</font>
-<--TMPL_SERVER_LIST_END-->
-<--TMPL_SERVER_LINE-->
-<tr>
- <td valign=middle class="server-line-left">[1]</td>
- <td valign=middle class="server-line">[2]</td>
- <td valign=middle class="server-line">[3]</td>
- <td valign=middle class="server-line">[4]</td>
- <td valign=middle class="server-line">[5]</td>
- <td valign=middle class="server-line"><acronym title="[Connect]"><a href="[6]" style="text-decoration: none"><img src="l_connect.gif" alt="[Connect]"></a></acronym>
-<acronym title="[RemoveServer]"><a href="[LinkRemove]" onclick="return confirm('[ConfirmRemove]')"><img src="l_cancel.gif" alt="[RemoveServer]"></a></acronym>
-</td>
-</tr>
-<--TMPL_SERVER_LINE_END-->
-<--TMPL_TRANSFER_IMAGES-->
-<font face=Tahoma style="font-size:8pt;">
-</font>
-&nbsp;
-<--TMPL_TRANSFER_IMAGES_END-->
-<--PROGRESSBARWIDTH-->
-200
-<--PROGRESSBARWIDTH_END-->
-<--PROGRESSBARIMGS-->
-<img src="[PROGRESSGIFNAME]" height=12 width=[PROGRESSGIFINTERNAL]>
-<--PROGRESSBARIMGS_END-->
-<--PROGRESSBARPERCENTIMG-->
-<img src="[PROGRESSGIFNAME]" height=4 width=[PROGRESSGIFINTERNAL]>
-<--PROGRESSBARPERCENTIMG_END-->
-<--TMPL_TRANSFER_LIST-->
-<table border=0 align=center cellpadding=4 cellspacing=0 width="95%">
-<tr>
- <td align=center valign=middle>
-[DownloadHeader]
-[DownloadFileList]
-[DownloadFooter]
-&nbsp;
-[UploadHeader]
-[UploadFileList]
-[UploadFooter]
-&nbsp;
-[UploadQueue]
-</td>
-</tr>
-</table>
-<--TMPL_TRANSFER_LIST_END-->
-<--TMPL_TRANSFER_DOWN_HEADER-->
-
-<script type="text/javascript">
-
-</script>
-
-<font face=Tahoma style="font-size:8pt;">
-<table border=0 align=center cellpadding=3 cellspacing=0 width="100%" bgcolor="#99CCFF">
-<tr>
- <td class="smallheader" style="background-color: #000000" colspan="8"><img src="arrow_down.gif"> <b>[DownloadList]</b></td>
- <td align="right" class="smallheader" style="background-color: #000000">[CATBOX]</td>
-</tr>
-<tr>
- <td valign=middle class="down-header-left"><a href="?ses=[Session]&amp;w=transfer&amp;sort=name[SortName][CatSel]"><b>[Filename]</b></a></td>
- <td valign=middle class="down-header"><a href="?ses=[Session]&amp;w=transfer&amp;sort=size[SortSize][CatSel]"><b>[Size]</b></a></td>
- <td valign=middle class="down-header"><a href="?ses=[Session]&amp;w=transfer&amp;sort=completed[SortCompleted][CatSel]"><b>[Completed]</b></a></td>
- <td valign=middle class="down-header"><a href="?ses=[Session]&amp;w=transfer&amp;sort=transferred[SortTransferred][CatSel]"><b>[Transferred]</b></a></td>
- <td valign=middle class="down-header"><a href="?ses=[Session]&amp;w=transfer&amp;sort=progress[SortProgress][CatSel]"><b>[Progress]</b></a></td>
- <td valign=middle class="down-header"><a href="?ses=[Session]&amp;w=transfer&amp;sort=speed[SortSpeed][CatSel]"><b>[Speed]</b></a></td>
- <td valign=middle class="down-header"><b>[Sources]</b></td>
- <td valign=middle class="down-header"><b>[Prio]</b></td>
- <td valign=middle class="down-header"><b>[Actions]</b></td>
-</tr>
-<--TMPL_TRANSFER_DOWN_HEADER_END-->
-<--TMPL_TRANSFER_DOWN_FOOTER-->
-<tr>
- <td valign=middle class="down-header-left"><b>[TotalDown]</b></td>
- <td valign=middle class="down-header-right"><b>[TotalDownSize]</b></td>
- <td valign=middle class="down-header-right"><b>[TotalDownCompleted]</b></td>
- <td valign=middle class="down-header-right"><b>[TotalDownTransferred]</b></td>
- <td valign=middle class="down-header">&nbsp;</td>
- <td valign=middle class="down-header-right"><b>[TotalDownSpeed]</b></td>
- <td valign=middle class="down-header">&nbsp;</td>
- <td valign=middle class="down-header">&nbsp;</td>
- <td valign=middle class="down-header">[ClearCompletedButton]</td>
-</tr>
-</table>
-<--TMPL_TRANSFER_DOWN_FOOTER_END-->
-<--TMPL_TRANSFER_DOWN_LINE-->
-<tr>
- <td valign=top class="down-line-left"><acronym title="[FileInfo]">[ShortFileName]</acronym></td>
- <td valign=top class="down-line-right">[2]</td>
- <td valign=top class="down-line-right">[3]</td>
- <td valign=top class="down-line-right">[4]</td>
- <td valign=middle class="down-line">
- <table width=[PROGRESSBARWIDTHVAL] height=11 border=1 class="percent_table" cellpadding=0 cellspacing=0 bordercolor="#000000"><tr><td>
- [DownloadBar]</td></tr></table></td>
- <td valign=top class="down-line-right">[5]</td>
- <td valign=top class="down-line">[6]</td>
- <td valign=top class="down-line">[PrioVal]</td>
- <td valign=top class="down-line">[7]</td>
-</tr>
-<--TMPL_TRANSFER_DOWN_LINE_END-->
-<--TMPL_TRANSFER_DOWN_LINE_GOOD--> 
-<tr>
-<td valign=top class="down-line-good-left"><acronym title="[FileInfo]">[ShortFileName]</acronym></td>
-<td valign=top class="down-line-good-right">[2]</td>
-<td valign=top class="down-line-good-right">[3]</td>
-<td valign=top class="down-line-good-right">[4]</td>
-<td valign=middle class="down-line-good">
-<table width=[PROGRESSBARWIDTHVAL] height=11 border=1 class="percent_table" cellpadding=0 cellspacing=
-0 bordercolor="#000000"><tr><td>
-[DownloadBar]</td></tr></table></td>
-<td valign=top class="down-line-good-right">[5]</td>
-<td valign=top class="down-line-good">[6]</td>
-<td valign=top class="down-line-good">[PrioVal]</td>
-<td valign=top class="down-line-good">[7]</td>
-</tr>
-<--TMPL_TRANSFER_DOWN_LINE_GOOD_END-->
-<--TMPL_TRANSFER_UP_HEADER-->
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=4 style="background-color: #000000"><img src="arrow_up.gif"> <b>[UploadList]</b></td>
-</tr>
-<tr>
- <td class="up-header-left"><b>[User]</b></td>
- <td class="up-header"><b>[Filename]</b></td>
- <td class="up-header"><b>[Transferred]</b></td>
- <td class="up-header"><b>[Speed]</b></td>
-</tr>
-<--TMPL_TRANSFER_UP_HEADER_END-->
-<--TMPL_TRANSFER_UP_FOOTER-->
-<tr>
- <td class="up-header-left"><b>[TotalUp]</b></td>
- <td class="up-header"></td>
- <td class="up-header"><b>[TotalUpTransferred]</b></td>
- <td class="up-header"><b>[TotalUpSpeed]</b></td>
-</tr>
-</table>
-<--TMPL_TRANSFER_UP_FOOTER_END-->
-<--TMPL_TRANSFER_UP_LINE-->
-<tr>
- <td valign=top class="up-line-left"><acronym title="[FileInfo]">[1]</acronym></td>
- <td valign=top class="up-line-left"><acronym title="[FileInfo]">[2]</acronym></td>
- <td valign=top class="up-line">[3]</td>
- <td valign=top class="up-line">[4]</td>
-</tr>
-<--TMPL_TRANSFER_UP_LINE_END-->
-<--TMPL_TRANSFER_UP_QUEUE_SHOW-->
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=4 style="background-color: #000000"><b>[UploadQueueList]</b></td>
-</tr>
-<tr>
- <td class="upqueue-header"><b>[UserNameTitle]</b></td>
- <td class="upqueue-header"><b>[FileNameTitle]</b></td>
- <td class="upqueue-header"><b>[ScoreTitle]</b></td>
- <td class="upqueue-header"><b>[BannedTitle]</b></td>
-</tr>
-[QueueList]
-</table>
-<p align=center>
-<form><input type="button" name="queue" value="[HideQueue]" onClick="self.location.href='/?ses=[Session]&amp;w=transfer&amp;showuploadqueue=false[CatSel]'"></form>
-&nbsp;
-</p>
-<--TMPL_TRANSFER_UP_QUEUE_SHOW_END-->
-<--TMPL_TRANSFER_UP_QUEUE_LINE-->
-<tr>
- <td valign=top class="upqueue-line-left">[UserName]</td>
- <td valign=top class="upqueue-line">[FileName]</td>
- <td valign=top class="upqueue-line">[Score]</td>
- <td valign=top class="upqueue-line">[Banned]</td>
-</tr>
-<--TMPL_TRANSFER_UP_QUEUE_LINE_END-->
-<--TMPL_TRANSFER_UP_QUEUE_HIDE-->
-<p align=center>
-<form><input type="button" name="queue" value="[ShowQueue]" onClick="self.location.href='/?ses=[Session]&amp;w=transfer&amp;showuploadqueue=true[CatSel]'"></form>
-&nbsp;
-</p>
-</font>
-<--TMPL_TRANSFER_UP_QUEUE_HIDE_END-->
-<--TMPL_TRANSFER_BAD_LINK-->
-<div class="message">[InvalidLink]<br>[Link]</div>
-<--TMPL_TRANSFER_BAD_LINK_END-->
-<--TMPL_TRANSFER_DOWN_CLEARBUTTON-->
-<form><input type="button" name="ClCompl" value="[CLEARCOMPLETED]" onClick="self.location.href='/?ses=[Session]&amp;w=transfer&amp;ClCompl=yes&amp;[CatSel]'"></form>
-<--TMPL_TRANSFER_DOWN_CLEARBUTTON_END-->
-<--TMPL_DOWNLOAD_LINK-->
-&nbsp;
-<table align=center border=0 cellpadding=4 cellspacing=0 width="80%">
-<tr>
-<td align=center class="shared-header">
-<p><font face=Tahoma style="font-size:10pt;"><b>[Download]</b></font></p>
-</td>
-</tr>
-<tr>
- <td align=center valign=top class=tabs>
-  <form action="/" method="GET">
-   <font face=Tahoma style="font-size:10pt;">&nbsp;<br>[Ed2klink]<br><br>
-   <input type="hidden" name=ses value="[Session]">
-   <input type="hidden" name="w" value="transfer">
-   <textarea name="c" cols="94" rows="7" class=dinput></textarea>
-   <br><br><input type=submit value="[Start]"></font>[CATBOX]
-  </form><br>
- </td>
-</tr>
-</table>
-<--TMPL_DOWNLOAD_LINK_END-->
-<--TMPL_SHARED_LIST-->
-<font face=Tahoma style="font-size:8pt;">
-<table align=center border=0 cellpadding=4 cellspacing=0 width="95%">
-<tr>
-<td valign=middle class="shared-header-left"><a href="?ses=[Session]&amp;w=shared&amp;sort=name[SortName]"><b>File Name</b></a></td>
-<td valign=middle class="shared-header">
-	<a href="?ses=[Session]&amp;w=shared&amp;sort=transferred[SortTransferred]"><b>Transferred Data</b></a>&nbsp
-	<a href="?ses=[Session]&amp;w=shared&amp;sort=alltimetransferred[SortAllTimeTransferred]">(Total)
-</td>
-<td valign=middle class="shared-header">
-	<a href="?ses=[Session]&amp;w=shared&amp;sort=requests[SortRequests]"><b>Requests</b></a>&nbsp
-	<a href="?ses=[Session]&amp;w=shared&amp;sort=alltimerequests[SortAllTimeRequests]"><b>(Total)</b></a>&nbsp
-</td>
-<td valign=middle class="shared-header">
-	<a href="?ses=[Session]&amp;w=shared&amp;sort=accepts[SortAccepts]"><b>Accepted Requests</b></a>&nbsp
-	<a href="?ses=[Session]&amp;w=shared&amp;sort=alltimeaccepts[SortAllTimeAccepts]"><b>(Total)</b></a>
-</td>
-<td valign=middle class="shared-header"><a href="?ses=[Session]&amp;w=shared&amp;sort=size[SortSize]"><b>Size</b></a></td>
-<td valign=middle class="shared-header"><a href="?ses=[Session]&amp;w=shared&amp;sort=priority[SortPriority]"><b>Priority</b></a></td>
-<td valign=middle width="10%" class="shared-header"><b>ED2K Link(s)</b></td>
-</tr>
-<p align=center><div class="message">[Message]</div></p><br>
-[SharedFileList]
-</table>
-<p align="center">
-<form><input type="button" name="queue" value="[Reload]" onClick="self.location.href='/?ses=[Session]&amp;w=shared&amp;reload=true'"></form>
-&nbsp;
-</p>
-<--TMPL_SHARED_LIST_END-->
-<--TMPL_SHARED_LINE-->
-<tr>
- <td valign=top class="shared-line-left"><acronym title="[FileName]
- Hash: [FileHash]">[ShortFileName]</acronym></td>
- <td valign=top class="shared-line">[FileTransferred]([FileAllTimeTransferred])</td>
- <td valign=top class="shared-line">[FileRequests]([FileAllTimeRequests])</td>
- <td valign=top class="shared-line">[FileAccepts]([FileAllTimeAccepts])</td>
- <td valign=top class="shared-line">[FileSize]</td>
- <td valign=top class="shared-line">[Priority]</td>
- <td valign=top class="shared-line">
-<acronym title="ED2K Link(s)"><a href="[FileLink]"><img src="l_ed2klink.gif" alt="ED2K Link(s)"></a></acronym>
-<acronym title="Increase Priority"><a href="?ses=[Session]&amp;w=shared&[PriorityUpLink]"><img src="l_up.gif" alt="[PriorityUp]"></a></acronym>
-<acronym title="Decrease Priority"><a href="?ses=[Session]&amp;w=shared&[PriorityDownLink]"><img src="l_down.gif" alt="[PriorityDown]"></a></acronym>
-</td>
-</tr>
-<--TMPL_SHARED_LINE_END-->
-<--TMPL_SHARED_LINE_CHANGED-->
-<tr>
- <td valign=top class="shared-line-left-changed"><acronym title="[FileName]
- Hash: [FileHash]">[ShortFileName]</acronym></td>
- <td valign=top class="shared-line-changed">[FileTransferred]([FileAllTimeTransferred])</td>
- <td valign=top class="shared-line-changed">[FileRequests]([FileAllTimeRequests])</td>
- <td valign=top class="shared-line-changed">[FileAccepts]([FileAllTimeAccepts])</td>
- <td valign=top class="shared-line-changed">[FileSize]</td>
- <td valign=top class="shared-line-changed">[Priority]</td>
- <td valign=top class="shared-line-changed">
-<acronym title="ED2K Link(s)"><a href="[FileLink]"><img src="l_ed2klink.gif" alt=""ED2K Link(s)></a></acronym>
-<acronym title="Increase Priority"><a href="?ses=[Session]&amp;w=shared&[PriorityUpLink]"><img src="l_up.gif" alt="[PriorityUp]"></a></acronym>
-<acronym title="Decrease Priority"><a href="?ses=[Session]&amp;w=shared&[PriorityDownLink]"><img src="l_down.gif" alt="[PriorityDown]"></a></acronym>
-</td>
-</tr>
-</font>
-<--TMPL_SHARED_LINE_CHANGED_END-->
-<--TMPL_GRAPHS-->
-<SCRIPT language=JavaScript>
-   function traceGraph(SpeedString,GraphColor,MaxSpeed) {
-         document.write('<table cellspacing=0 border=0 cellpadding=0 width="[GraphWidth]px"><tr><td valign="bottom" height="[GraphHeight]px" width="100%"></td>');
-         var speed = SpeedString.split(",");
-         if(MaxSpeed==0) MaxSpeed = 1; //No divide by 0 !
-         for(i=0;i<speed.length;i++) {
-                 speed[i]=new Number(speed[i])
-                 if (speed[i]>MaxSpeed) speed[i]=MaxSpeed;
-                 size=Math.round(speed[i]*[GraphHeight]/MaxSpeed);
-                 document.write('<td valign="bottom"><table height="'+ size +'px" width="1px" border=0 cellpadding=0 cellspacing=0><td bgcolor="' + GraphColor + '" height="100%" width="100%"></td></table></td>');
-   	 }
-    	 document.write('</tr></table>');
-}
-</SCRIPT>
-&nbsp;
-<table border=0 align=center cellpadding=0 cellspacing=0>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td style="border-width:1px; border-color:#2cd500; border-style:solid; background-position: bottom left;" valign="bottom" height="[GraphHeight]px" background="back.gif">
-<SCRIPT language=JavaScript>
-	var dlstring="[GraphDownload]";
-	traceGraph(dlstring,"#2cd500",[MaxDownload]*1024);
-</SCRIPT>
-</td></tr></table>
-</td></tr>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td align=center><font color=black><font face=Tahoma style="font-size:8pt;">[TxtDownload]: Max [MaxDownload] [KByteSec], [TxtTime]: [ScaleTime]</font><br>&nbsp;</td></tr></table>
-</td></tr>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td style="border-width:1px; border-color:#f5000a; border-style:solid; background-position: bottom left;" valign="bottom" height="[GraphHeight]px" background="back.gif">
-<SCRIPT language=JavaScript>
-	var ulstring="[GraphUpload]";
-	traceGraph(ulstring,"#f5000a",[MaxUpload]*1024);
-</SCRIPT>
-</td></tr></table>
-</td></tr>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td align=center><font color=black><font face=Tahoma style="font-size:8pt;">[TxtUpload]: Max [MaxUpload] [KByteSec], [TxtTime]: [ScaleTime]</font><br>&nbsp;</td></tr></table>
-</td></tr>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td style="border-width:1px; border-color:#0013f5; border-style:solid; background-position: bottom left;" valign="bottom" height="[GraphHeight]px" background="back.gif">
-<SCRIPT language=JavaScript>
-	var connstring="[GraphConnections]";
-	traceGraph(connstring,"#0013f5",[MaxConnections]);
-</SCRIPT>
-</td></tr></table>
-</td></tr>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td align=center><font color=black><font face=Tahoma style="font-size:8pt;">[TxtConnections]: Max [MaxConnections], [TxtTime]: [ScaleTime]</font></td></tr></table>
-</td></tr>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td>
-<br>
-<form action="/" method="GET">
-<input type="hidden" name=ses value="[Session]">
-<input type="hidden" name=w value=graphs>
-<input type="hidden" name=refetch value=yes>
-<input type=submit value="[Refetch]" class="ibutton">
-</form>
-</td></tr></table>
-</td></tr>
-</table>
-<--TMPL_GRAPHS_END-->
-<--TMPL_LOG-->
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="80%">
-<tr>
-<td align=left valign=middle class="commontext">
-<font color="#000000" face="Lucida Console"><pre>[Log]</pre></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=middle>
-<form action="/" method="GET">
-<input type="hidden" name=ses value="[Session]">
-<input type="hidden" name=w value=log>
-<input type="hidden" name=clear value=yes>
-<input type=submit value="[Clear]" class="ibutton"></form>
-</td>
-</tr>
-</table>
-<--TMPL_LOG_END-->
-<--TMPL_SERVERINFO-->
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="80%">
-<tr>
-<td align=left valign=middle class="commontext">
-<font color="#000000" face="Lucida Console"><pre>[ServerInfo]</pre></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=middle>
-<form action="/" method="GET">
-<input type="hidden" name=ses value="[Session]">
-<input type="hidden" name=w value=sinfo>
-<input type="hidden" name=clear value=yes>
-<input type=submit value="[Clear]"></form>
-</td>
-</tr>
-</table>
-<--TMPL_SERVERINFO_END-->
-<--TMPL_DEBUGLOG-->
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="80%">
-<tr>
-<td align=left valign=middle class="commontext">
-<font color="#000000" face="Lucida Console"><pre>[DebugLog]</pre></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=middle>
-<form action="/" method="GET">
-<input type="hidden" name=ses value="[Session]">
-<input type="hidden" name=w value=debuglog>
-<input type="hidden" name=clear value=yes>
-<input type=submit value="[Clear]"></form>
-</td>
-</tr>
-</table>
-<--TMPL_DEBUGLOG_END-->
-<--TMPL_STATS-->
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="80%">
-<tr>
-<td align=left valign=middle class="commontext">
-<font color="#000000" face="Lucida Console"><pre>[STATSDATA]</pre></font>
-</td>
-</tr>
-</table>
-&nbsp;
-<--TMPL_STATS_END-->
-<--TMPL_PREFERENCES-->
-<form action="/" method="GET">
-<input type="hidden" name=ses value="[Session]">
-<input type="hidden" name=w value=options>
-<input type="hidden" name=saveprefs value="true">
-<table border=0 align=center cellpadding=4 cellspacing=0 width="90%">
-<tr><td><font face=Tahoma style="font-size:10pt;" color=black>[WebControl]</font></td></tr>
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[UseGzipForm]</b></font><input type="checkbox" name=gzip [UseGzipVal]>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;[UseGzipComment]
-</font>
-<br>
-</td></tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[ShowUploadQueueForm]</b></font><input type="checkbox" name=showuploadqueue [ShowUploadQueueVal]>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;[ShowUploadQueueComment]<br>
-</font>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[RefreshTimeForm]</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;[RefreshTimeComment] <input type="text" name=refresh size="5" class=dinput value="[RefreshVal]"><br>
-</font>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[GraphSettings]</b></font>
-</td>
-</tr>
-<tr><td align=left valign=top bgcolor="#3399FF">
-<table border=0>
-<tr><td><font face=Tahoma style="font-size:8pt;">[GraphWidthText]</font></td>
-<td><input type="text" name=gwidth size="5" class=dinput value="[GraphWidth]"></td>
-<td><font face=Tahoma style="font-size:8pt;">[pixels]</font></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">[GraphHeightText]</font></td>
-<td><input type="text" name=gheight size="5" class=dinput value="[GraphHeight]"></td>
-<td><font face=Tahoma style="font-size:8pt;">[pixels]</font></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">[GraphScaleText]</font></td>
-<td><input type="text" name=gscale size="5" class=dinput value="[GraphScale]"></td>
-<td><font face=Tahoma style="font-size:8pt;">[seconds]</font></td></tr>
-</table>
-</td></tr>
-
-<tr><td><br><font face=Tahoma style="font-size:10pt;" color=black>[aMuleAppName]</font></td></tr>
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[SpeedForm]</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;[MaxDown]: <input type="text" name=maxdown size="5" class=dinput value="[MaxDownVal]"> [KBS]
-&nbsp;&nbsp;[MaxUp]: <input type="text" name=maxup size="5" class=dinput value="[MaxUpVal]"> [KBS]
-</font>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[SpeedCapForm]</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;[MaxCapDown]: <input type="text" name=maxcapdown size="5" class=dinput value="[MaxCapDownVal]"> [KBS]
-&nbsp;&nbsp;[MaxCapUp]: <input type="text" name=maxcapup size="5" class=dinput value="[MaxCapUpVal]"> [KBS]
-</font>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[LimitForm]</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<table border=0>
-<tr><td><font face=Tahoma style="font-size:8pt;">[MaxSources]</font></td><td><input type="text" name=maxsources size="5" class=dinput value="[MaxSourcesVal]"></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">[MaxConnections]</font></td><td><input type="text" name=maxconnections size="5" class=dinput value="[MaxConnectionsVal]"></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">[MaxConnectionsPer5]</font></td><td><input type="text" name=maxconnectionsperfive size="5" class=dinput value="[MaxConnectionsPer5Val]"></td></tr>
-</table>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[FileSettings]</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<table border=0>
-<tr><td><font face=Tahoma style="font-size:8pt;">[TryFullChunks]</font></td><td><input type="checkbox" name="fullchunks" [FullChunksVal]></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">[FirstAndLast]</font></td><td><input type="checkbox" name="firstandlast" [FirstAndLastVal]></td></tr>
-</table>
-</td>
-</tr>
-
-<tr>
-<td align=center><br><input type=submit value="[Apply]"></td>
-</tr>
-
-</table>
-</form>
-&nbsp;
-<--TMPL_PREFERENCES_END-->
-<--TMPL_LOGIN-->
-<html>
-  <meta http-equiv="content-type" content="text/html; charset=[CharSet]">
-  <head>
-    <title>
-      aMule [version] - CTemplate 0.44b - [WebControl]
-    </title>
-  </head>
-  <body background="main_bg.gif" text=white link=white vlink=white alink=white onload="javascript:document.login.p.focus();">
-    <table align=center border=0 cellpadding=4 cellspacing=0 width="100%" height="100%">
-      <tr>
-        <td align=center valign=middle>
-
-          <table align=center border=0 cellpadding=0 cellspacing=0 width="407">
-            <tr>
-              <td style="height: 12px" background="login_top.gif" height="12">
-              </td>
-            </tr>
-            <tr>
-              <td height="250">
-
-                <table align=center border=0 cellpadding=0 cellspacing=0 width="100%" height="100%">
-                  <tr>
-                    <td width="4" background="login_lefttop.gif">
-                      <img src="blank1x1.gif" alt="" border="0" />
-                    </td>
-                    <td background="login_topdown.gif" align="center">
-
-                      <table align=center border=0 cellpadding=0 cellspacing=0 width="100%" height="100%">
-                        <tr>
-                          <td align="center">
-                            <a href="http://www.amule.org" target="_blank"><img src="logo.jpg" border="0"></a>
-                          </td>
-                        </tr>
-                        <tr>
-                          <td align="center" height="50">
-                            <font face=Tahoma style="font-size:10pt;"><b>[WebControl]</b> | [Login]</font>
-                          </td>
-                        </tr>
-                      </table>
-    
-                    </td>
-                    <td width="5" background="login_righttop.gif">
-                      <img src="blank1x1.gif" alt="" border="0" />
-                    </td>
-                  </tr>
-                </table>
-                
-              </td>
-            </tr>
-            <tr>
-              <td style="height: 3px" background="login_topseperator.gif" height="3">
-              </td>
-            </tr>
-            <tr>
-              <td height="130">
-
-                <table align=center border=0 cellpadding=0 cellspacing=0 width="100%" height="100%">
-                  <tr>
-                    <td width="4" background="login_lefttop.gif">
-                      <img src="blank1x1.gif" alt="" border="0" />
-                    </td>
-                    <td background="login_downmain.gif" align="center">
-                      <form action="" method="POST" name="login">
-                        <font face=Tahoma style="font-size:10pt;">
-                          &nbsp;<br />
-                          [EnterPassword]<br /><br />
-                          <input type="password" name=p maxlength=12 size=37 style="border-width: 1px; border-color: black; border-style:none;" value="">
-                          <input type="hidden" name=w value="password">
-                          <br /><br /><input type=submit value="[LoginNow]"><br />
-                        </font>
-                    </td>
-                    <td width="5" background="login_righttop.gif">
-                      <img src="blank1x1.gif" alt="" border="0" />
-                    </td>
-                  </tr>
-                </table>
-                
-              </td>
-            </tr>
-            <tr>
-              <td style="height: 12px" background="login_bottom.gif" height="12">
-              </td>
-            </tr>
-          </table>
-
-        </td>
-      </tr>
-    </table>
-    </form>
-  </body>
-</html>
-<--TMPL_LOGIN_END-->
-<--TMPL_CONNECTED_SERVER-->
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=5 style="background-color: #000000"><b>[ConnectedServer]</b></td>
-</tr>
-<tr>
- <td valign=middle class="server-header"><b>[Status]</b></td>
- <td valign=middle class="server-header"><b>[Servername]</b></td>
- <td valign=middle class="server-header"><b>[Usercount]</b></td>
- <td valign=middle class="server-line"><a href="[URL_Disconnect]">[Disconnect]</a></td>
- <td valign=middle class="server-header"><a href="[URL_ServerOptions]">[ServerOptions]</a></td>
-</tr>
-<tr>
- <td valign=middle class="server-line">[1]</td>
- <td valign=middle class="server-line">[2]</td>
- <td valign=middle class="server-line">[3]</td>
- <td valign=middle class="server-header"><a href="[URL_Connect]">[Connect]</a></td>
- <td valign=middle class="server-line"></td>
-</tr>
-</table>
-&nbsp;
-<--TMPL_CONNECTED_SERVER_END-->
-<--TMPL_ADDSERVERBOX-->
-<div class="message">[Message]</div>
-<table border=0 align=center cellpadding=4 cellspacing=0 width="40%">
-<tr>
-<td valign=middle class="addserver-header"><img src="add_server.gif"> <b>[AddServer]</b></td>
-</tr>
-<tr>
- <td valign=middle class="addserver-line">
-<form action="" method="GET">
-  [IP] <input name="serveraddr" type="text" size="15">
-  [Port] <input name="serverport" type="text" size="6"><br>
-  [Name] <input name="servername" type="text" size="30"><br>
-  <input type="hidden" name=ses value="[Session]">
-  <input type="hidden" name=w value="server">
-  <input type="hidden" name=c value="options">
-  <input name="addserver" type="hidden" value="true"><br>
-  <input type="submit" value="[Add]">
-</form>
- </td>
-</tr>
-<tr>
-<td valign=middle class="addserver-header"><img src="add_server.gif"> <b>[UpdateServerMetFromURL]</b></td>
-</tr>
-<tr>
- <td valign=middle class="addserver-line">
-<form action="" method="GET">
-  [URL] <input name="servermeturl" type="text" size="30"><br>
-  <input type="hidden" name=ses value="[Session]">
-  <input type="hidden" name=w value="server">
-  <input type="hidden" name=c value="options">
-  <input name="updateservermetfromurl" type="hidden" value="true"><br>
-  <input type="submit" value="[Apply]">
-</form>
- </td>
-</tr>
-</table>
-<--TMPL_ADDSERVERBOX_END-->
-<--TMPL_WEBSEARCH-->
-<form action="" method="GET">
-<table border=0 align=center cellpadding=4 cellspacing=0 width="40%">
-<tr>
-<td valign=middle class="websearch-header"><b>[WebSearch]</b></td>
-</tr>
-<tr>
- <td valign=middle class="websearch-line">
-  [Name] <input name="tosearch" type="text" size="15">
-  <br><br>
-  [Type] <select name="media">
-  <option value="Any">[Any]</option>
-  <option value="Archives">[Archives]</option>
-  <option value="Audio">[Audio]</option>
-  <option value="CD-Images">[CD-Images]</option>
-  <option value="Pictures">[Pictures]</option>
-  <option value="Programs">[Programs]</option>
-  <option value="Texts">[Texts]</option>
-  <option value="Videos">[Videos]</option>
-  </select>
-  <br><br>
-  <input type="hidden" name=ses value="[Session]">
-  <input type="hidden" name=w value="websearch">
-  <input type="submit" value="[Search]">
-  <br>
-  &nbsp;
- </td>
-</tr>
-</table>
-</form>
-<--TMPL_WEBSEARCH_END-->
-<--TMPL_SEARCH-->
-<p align=center><div class="message">[Message]</div></p><br>
-<table border=0 align=center cellpadding=4 cellspacing=0 width="85%">
-<tr>
-<td valign=middle class="websearch-header"><b><font face=Tahoma style="font-size:10pt;">[Result]</font></b>&nbsp;&nbsp;(<a align="right" href="javascript:self.location.href='?ses=[Session]&amp;w=search'"><font face=Tahoma style="font-size:8pt;">[RefetchResults]</font></a>)</td>
-</tr>
-<tr>
-<td valign=middle class="websearch-line">
-<form action="" method="GET">
-<table border=0 align=center cellpadding=4 cellspacing=0>
-<input type="hidden" name=ses value="[Session]">
-<input type="hidden" name=w value="search">
-[RESULTLIST]
-</table>
-<input type="submit" value="[Download]">
-[CATBOX]
-</form>
-<br>
-&nbsp;
-</table>
-<br>
-<form action="" method="GET">
-<table border=0 align=center cellpadding=4 cellspacing=0 width="250">
-<tr>
-<td valign=middle class="websearch-header"><b><font face=Tahoma style="font-size:10pt;">[Search]</font></b></td>
-</tr>
-<tr>
- <td valign=middle class="websearch-line">
-  <table>
-  <tr><td class=tabs width=150>[Name]</td><td><input name="tosearch" type="text" size="40"></td></tr>
-  <tr><td class=tabs>[Type]</td><td><select name="type">
-  <option value="Any">[Any]</option>
-  <option value="Archives">[Archives]</option>
-  <option value="Audio">[Audio]</option>
-  <option value="CD-Images">[CD-Images]</option>
-  <option value="Pictures">[Pictures]</option>
-  <option value="Programs">[Programs]</option>
-  <option value="Texts">[Texts]</option>
-  <option value="Videos">[Videos]</option>
-  </select>
-  </td></tr>
-  <tr><td class=tabs>[SizeMin]</td><td><input name="min" type="text" size="10"></td></tr>
-  <tr><td class=tabs>[SizeMax]</td><td><input name="max" type="text" size="10"></td></tr>
-  <tr><td class=tabs>[Availabl]</td><td><input name="avail" type="text" size="10"></td></tr>
-  <tr><td class=tabs>[Extention]</td><td><input name="ext" type="text" size="10"></td></tr>
-
-  <tr><td class=tabs>[METHOD]</td><td><input value="server" type="radio" name="method" checked>[USESSERVER]</td></tr>
-  <tr><td class=tabs></td><td><input value="global" type="radio" name="method">[Global]</td></tr>
-
-  </table>
-  <br>
-  <input type="hidden" name=ses value="[Session]">
-  <input type="hidden" name=w value="search">
-  <input type="submit" value="[Search]">
-  <br>
-  &nbsp;
-</td>
-</tr>
-</table>
-<p align="center"><input type="button" name="ed2klink" value="ed2k:// [Download]" onClick="self.location.href='?ses=[Session]&amp;w=download'"></p>
-<p align="center"><input type="button" name="queue" value="[WebSearch]" onClick="self.location.href='?ses=[Session]&amp;w=websearch'"></p>
-</form>
-<br>
-<--TMPL_SEARCH_END-->
-<--TMPL_SEARCH_RESULT_HEADER-->
-<tr>
-<td class="websearch-line"><b><font face=Tahoma style="font-size:8pt;"><a href="?ses=[Session]&amp;w=search&amp;sort=name[SortName]">[Filename]</a></font></b></td>
-<td class="websearch-line" width=50><b><font face=Tahoma style="font-size:8pt;"><a href="?ses=[Session]&amp;w=search&amp;sort=size[SortSize]">[Filesize]</a></font></b></td>
-<td class="websearch-line"><b><font face=Tahoma style="font-size:8pt;"><a href="?ses=[Session]&amp;w=search&amp;sort=sources[SortSources]">[Sources]</a></b></td>
-<td class="websearch-line" width=100><b><font face=Tahoma style="font-size:8pt;">[Download]</font></b></td>
-</tr>
-<--TMPL_SEARCH_RESULT_HEADER_END-->
-<--TMPL_SEARCH_RESULT_LINE-->
-<tr><td align="left"><font face=Tahoma style="font-size:8pt;">[FILENAME]</font></td><td class="websearch-line"><font face=Tahoma style="font-size:8pt;">[FILESIZE]</font></td><td class="websearch-line"><font face=Tahoma style="font-size:8pt;">[SOURCECOUNT]</font></td><td class="websearch-line"><input type="checkbox" name="downloads" value="[FILEHASH]"></td></tr>
-<--TMPL_SEARCH_RESULT_LINE_END-->

aMule-2.2.6.tar.bz2/src/webserver/chicane/add_server.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/arrow_down.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/arrow_down_logout.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/arrow_right.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/arrow_up.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/back.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/black.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/blank1x1.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/blue1.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/blue2.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/blue3.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/blue4.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/blue5.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/blue6.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/cp_download.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/cp_kad.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/cp_search.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/cp_servers.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/cp_settings.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/cp_shared.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/cp_stats.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/downloads.php Deleted

@@ -1,562 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-	<meta http-equiv="pragmas" content="no-cache">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"],
-			'; url=downloads.php', '">';
-	}
-?>
-<style type="text/css">
-  img {
-    border : 0px;
-  }
-
-  a, a:link, a:visited {
-    color : white;
-    text-decoration: none;
-  }
-
-  a:hover {
-    color: #FFC412;
-    text-decoration: none;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-header, .up-header-left, .up-line, .up-line-left,
-  .server-header, .server-header-left, .server-line, .server-line-left,
-  .shared-header, .shared-header-left, .shared-line, .shared-line-changed,
-  .shared-line-left, .shared-line-left-changed,
-  .header, .smallheader, .commontext,
-  .upqueue-header, .upqueue-line, .upqueue-line-left,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .tabs {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1F76A5;
-  }
-
-  .tabs_too {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #0075B3;
-  }
-
-  .tabs_three {
-    font-family : Tahoma;
-    font-size : 10pt;
-  }
-
-  .tabs_four {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #21719B;
-  }
-
-  .tabs_five {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1D6083;
-  }
-
-  .down-header, .down-line, .down-line-good, .up-header, .up-line,
-  .server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-  .upqueue-header, .upqueue-line,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    text-align : center;
-  }
-
-  .down-header-left, .down-line-left, .down-line-good-left,
-  .server-header-left, .server-line-left, .shared-header-left,
-  .up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left {
-
-    text-align : left;
-  }
-
-  .down-line-right, .down-line-good-right, .down-header-right {
-    text-align : right;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .up-header, .up-header-left, .server-header, .server-header-left,
-  .shared-header, .shared-header-left, .upqueue-header,
-  .websearch-header, .addserver-header {
-
-    background-color : #1D6083;
-  }
-
-  .header {
-    background-color : #0046AC;
-  }
-
-  .smallheader {
-    background-color : #003399;
-    color : #FFFFFF;
-  }
-
-  .commontext {
-    background-color : #FFFFFF;
-    color : #000000;
-  }
-
-  .commontext_too {
-    color : #FFFFFF;
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-line, .up-line-left, .server-line, .server-line-left,
-  .shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-  .upqueue-line, .upqueue-line-left,
-  .websearch-line, .addserver-line {
-
-    background-color : #1F76A5;
-  }
-
-  .down-line-good, .down-line-good-left, .down-line-good-right,
-  .shared-line-changed, .shared-line-left-changed {
-
-    color : #F0F000;
-  }
-
-  .percent_table {
-    border:0px solid #000000;
-    border-collapse: collapse;
-  }
-
-  .message {
-    font-family : Tahoma;
-    font-size : 8pt;
-    font-weight: bold;
-    color: #FFFFFF;
-    background-color: #1D6083;
-  }
-
-  .dinput {
-    border-width: 1px;
-    border-color: black;
-  }
-
-</style>
-  </head>
-  <body background="main_bg.gif" text=white link="#1F76A5" vlink="#1F76A5" alink="#1F76A5" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-    <table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
-      <tr>
-       <td class="tabs_three" background="main_top_bg.gif" align="left" colspan="4">
-
-        <table border="0" cellpadding="4" cellspacing="0" width="100%">
-        <tr>
-          <td class="tabs_three" align="center" width="100">
-
-            &nbsp;
-            <font face="Tahoma" style="font-size:13pt;" color="#000000"><a href="http://www.amule.org" target="_blank">
-              <img src="emule.gif" alt="aMule | Web Control Panel">
-            </a>
-          </td>
-          <td class="tabs_three" align="center" width="30">
-            &nbsp;
-          </td>
-          <td align="center" class="tabs_three" width="95">
-
-            <a href="servers.php">
-              <img src="cp_servers.gif"><br />
-              Server list
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="downloads.php">
-              <img src="cp_download.gif"><br />
-              Transfer
-            </a>
-
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="search.php">
-              <img src="cp_search.gif"><br />
-              Search
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="shared.php">
-
-              <img src="cp_shared.gif"><br />
-              Shared Files
-            </a>
-          <td align="center" class="tabs_three" width="110">
-            <a href="stat_tree.php">
-              <img src="cp_stats.gif"><br />
-              Statistics
-            </a>
-            <font color="#000000">|</font>
-
-            <a href="stat_graphs.php">
-              Graphs
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="95">
-            <a href="preferences.php">
-              <img src="cp_settings.gif"><br />
-              Preferences
-            </a>
-          </td>
-
-          <td class="tabs_three" align="center">
-            &nbsp;
-          </td>
-          <td align="left" class="tabs_three" width="95">
-            <img src="log.gif" align="absmiddle"> <a href="index.php?serverinfo=1">Serverinfo</a><br />
-            <img src="log.gif" align="absmiddle"> <a href="index.php?log=1">Log</a>
-          </td>
-
-        </tr>
-        </table>
-
-       </td>
-      </tr>
-      <tr>
-       <td background="main_topbar.gif" height="49" class="tabs_four">
-         &nbsp;&nbsp;<b>Connection:</b>
-   <?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["id"] == 0 ) {
-			echo "Not connected";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "Connecting ...";
-		} else {
-			echo "Connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
-         <font color="#FFE471">
-           <script language="javascript">
-             var d = new Date();
-             s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-             document.write(s);
-           </script>
-         </font>
-       </td>
-       <td background="main_topbar.gif" align="center" valign="middle" class="tabs_four">
-
-        <a href="index.php?links=1">
-          <img src="arrow_right.gif" align="absmiddle">
-          &nbsp; ed2k:// ED2K Link(s)
-        </a>
-       </td>
-       <td background="main_topbar.gif" align="right">
-       
-        <table border="0" cellpadding="0" cellspacing="0" width="8" height="100%">
-           <tr>
-             <td height="49" background="main_topbarseperator.gif">
-
-               &nbsp;
-             </td>
-           </tr>
-         </table>
-         
-       </td>
-       <td background="main_topbardarker.gif" align="center" valign="middle" class="tabs_five">
-         <a href="login.php">
-           <img src="arrow_down_logout.gif" align="absmiddle">
-           &nbsp; Logout
-         </a>
-
-       </td>
-      </tr>
-    </table><font face=Tahoma style="font-size:8pt;">
-</font>
-&nbsp;<table border=0 align=center cellpadding=4 cellspacing=0 width="95%">
-<tr>
- <td align=center valign=middle>
-
-<script type="text/javascript">
-
-function GotoCat(cat) {
-	window.location.href="downloads.php?cmd=filter&status="+cat;
-}
-
-</script>
-
-<font face=Tahoma style="font-size:8pt;">
-<table border=0 align=center cellpadding=3 cellspacing=0 width="100%" bgcolor="#99CCFF">
-
-<tr>
- <td class="smallheader" style="background-color: #000000" colspan="8"><img src="arrow_down.gif">
- <b>Downloads
- <?php
- 	$downloads = amule_load_vars("downloads");
- 	echo '&nbsp;(', count($downloads), ')';
- ?>
- </b></td>
- <td align="right" class="smallheader" style="background-color: #000000">
- <form>
- 	<select name="cat" size="1" onchange=GotoCat(this.form.cat.options[this.form.cat.selectedIndex].value)>
-	<?php
-    	$all_status = array("All", "Waiting", "Paused", "Downloading");
-    	
-		if ( $HTTP_GET_VARS["cmd"] == "filter") {
-			$_SESSION["filter_status"] = $HTTP_GET_VARS["status"];
-		}
-    	if ( $_SESSION["filter_status"] == '') $_SESSION["filter_status"] = 'All';
-    	foreach ($all_status as $s) {
-    		echo (($s == $_SESSION["filter_status"]) ? '<option selected>' : '<option>'), $s, '</option>';
-    	}
-	?>
- 	</select>
- </form>
- </td>
-</tr>
-<tr>
- <td valign=middle class="down-header-left"><a href="downloads.php?sort=name"><b>File Name</b></a></td>
-
- <td valign=middle class="down-header"><a href="downloads.php?sort=size"><b>Size</b></a></td>
- <td valign=middle class="down-header"><a href="downloads.php?sort=size_done"><b>Complete</b></a></td>
- <td valign=middle class="down-header"><a href="downloads.php?sort=size_xfer"><b>Transferred</b></a></td>
- <td valign=middle class="down-header"><a href="downloads.php?sort=progress"><b>Progress</b></a></td>
- <td valign=middle class="down-header"><a href="downloads.php?sort=speed"><b>Speed</b></a></td>
- <td valign=middle class="down-header"><b>Sources</b></td>
- <td valign=middle class="down-header"><a href="downloads.php?sort=prio"><b>Priority</b></a></td>
- <td valign=middle class="down-header"><b>Actions</b></td>
-</tr>
-
-<?php
-	function CastToXBytes($size)
-	{
-		if ( $size < 1024 ) {
-			$result = $size . " byte";
-		} elseif ( $size < 1048576 ) {
-			$result = ($size / 1024.0) . "KB";
-		} elseif ( $size < 1073741824 ) {
-			$result = ($size / 1048576.0) . "MB";
-		} else {
-			$result = ($size / 1073741824.0) . "GB";
-		}
-		return $result;
-	}
-	function PrioString($file)
-	{
-		$prionames = array(0 => "Low", 1 => "Normal", 2 => "High",
-			3 => "Very high", 4 => "Very low", 5=> "Auto", 6 => "Powershare");
-		$result = $prionames[$file->prio];
-		if ( $file->prio_auto == 1) {
-			$result = $result . "(auto)";
-		}
-		return $result;
-	}
-	function StatusString($file)
-	{
-		if ( $file->status == 7 ) {
-			return "Paused";
-		} elseif ( $file->src_count_xfer > 0 ) {
-			return "Downloading";
-		} else {
-			return "Waiting";
-		}
-	}
-
-	//
-	// declare it here, before any function reffered it in "global"
-	//
-	$sort_order;$sort_reverse;
-
-	function my_cmp($a, $b)
-	{
-		global $sort_order, $sort_reverse;
-		
-		switch ( $sort_order) {
-			case "size": $result = $a->size > $b->size; break;
-			case "size_done": $result = $a->size_done > $b->size_done; break;
-			case "size_xfer": $result = $a->size_xfer > $b->size_xfer; break;
-			case "progress": $result = (((float)$a->size_done)/((float)$a->size)) > (((float)$b->size_done)/((float)$b->size)); break;
-			case "name": $result = $a->name > $b->name; break;
-			case "speed": $result = $a->speed > $b->speed; break;
-			case "scrcount": $result = $a->src_count > $b->src_count; break;
-			case "status": $result = StatusString($a) > StatusString($b); break;
-			case "prio": $result = PrioString($a) > PrioString($b); break;
-		}
-
-		if ( $sort_reverse ) {
-			$result = !$result;
-		}
-		//var_dump($sort_reverse);
-		return $result;
-	}
-
-	if ( ($HTTP_GET_VARS["cmd"] != "") && ($_SESSION["guest_login"] == 0) ) {
-		$name = $HTTP_GET_VARS['file'];
-		if ( strlen($name) == 32 ) {
-			amule_do_download_cmd($name, $HTTP_GET_VARS["cmd"]);
-		}
-	}
-	
-	$downloads = amule_load_vars("downloads");
-
-	$sort_order = $HTTP_GET_VARS["sort"];
-
-	if ( $sort_order == "" ) {
-		$sort_order = $_SESSION["download_sort"];
-	}
-	$reverse_sort_key = "download_sort_reverse" . $sort_order;
-	if ( $_SESSION[$reverse_sort_key] == "" ) {
-		$_SESSION[$reverse_sort_key] = 0;
-	} else {
-		if ( $HTTP_GET_VARS["sort"] != '') {
-			$_SESSION[$reverse_sort_key] = !$_SESSION[$reverse_sort_key];
-		}
-	}
-
-	//var_dump($_SESSION);
-	$sort_reverse = $_SESSION[$reverse_sort_key];
-	
-	if ( $sort_order != "" ) {
-		$_SESSION["download_sort"] = $sort_order;
-		usort(&$downloads, "my_cmp");
-	}
-
-	foreach ($downloads as $file) {
-		$status = StatusString($file);
-		if ( ($_SESSION['filter_status'] == 'All') || ($_SESSION['filter_status'] == $status) ) {
-			echo '<tr>';
-			$mark = $file->speed > 0 ? 1 : 0;
-			echo '<td valign=top class="', $mark ? 'down-line-good-left':'down-line-left',
-				'"><acronym title="', $file->name, '">', $file->short_name, '</acronym></td>';
-			echo '<td valign=top class="', $mark ? 'down-line-good-right':'down-line-right','">',
-				CastToXBytes($file->size), '</td>';
-			echo '<td valign=top class="', $mark ? 'down-line-good-right':'down-line-right','">',
-				CastToXBytes($file->size_done), '</td>';
-			echo '<td valign=top class="', $mark ? 'down-line-good-right':'down-line-right','">',
-				CastToXBytes($file->size_xfer), '</td>';
-			
-			echo '<td valign=middle class="', $mark ? 'down-line-right">':'down-line">';
-			echo '<table width=200 height=11 border=1 class="percent_table" cellpadding=0 cellspacing=0 bordercolor="#000000">';
-			echo '<tr><td><img src="greenpercent.gif" height=4 width=', (($file->size_done * 1.0)/$file->size)*200 + 1, '><br>';
-			echo $file->progress, '</td></tr></table></td>';
-	
-			echo '<td valign=middle class="', $mark ? 'down-line-good-right">':'down-line-right">',
-				$file->speed ? (CastToXBytes($file->speed) . '/s') : '-', '</td>';
-	
-			// source count
-			echo '<td valign=middle class="', $mark ? 'down-line-good-right">':'down-line-right">';
-			if ( $file->src_count_not_curr != 0 ) {
-				echo $file->src_count - $file->src_count_not_curr, "&nbsp;/&nbsp;";
-			}
-			echo $file->src_count, "&nbsp;(", $file->src_count_xfer, ")";
-			if ( $file->src_count_a4af != 0 ) {
-				echo "+", $file->src_count_a4af;
-			}
-			echo '</td>';
-	
-			echo '<td valign=middle class="', $mark ? 'down-line-good-right">':'down-line-right">',
-					PrioString($file), '</td>';
-	
-			echo '<td valign=top class="down-line"><acronym title="', $status, '">';
-			echo '<img src="l_info.gif" alt="', $status, '"></acronym>';
-	
-			// commands
-			echo '<acronym title="ED2K Link(s)"><a href="', $file->link, '"><img src="l_ed2klink.gif" alt="ED2K Link(s)"></a></acronym>';
-			if ( $_SESSION["guest_login"] == 0 ) {
-				if ( $file->status == 7 ) {
-					echo '<acronym title="Resume"><a href="?cmd=resume&file=', $file->hash, '"><img src="l_resume.gif" alt="Resume"></a></acronym>';
-				} else {
-					echo '<acronym title="Pause"><a href="?cmd=pause&file=', $file->hash, '"><img src="l_pause.gif" alt="Pause"></a></acronym>';
-				}
-				echo '<acronym title="Cancel"><a href="?cmd=cancel&file=', $file->hash,
-					"\" onclick=\"return confirm('Are you sure that you want to cancel and delete this file?')\" ",
-					'><img src="l_cancel.gif" alt="Cancel"></a></acronym>';
-				echo '<acronym title="Increase priority"><a href="?cmd=prioup&file=', $file->hash, '"><img src="l_up.gif" alt="Increase priority"></a></acronym>';
-				echo '<acronym title="Decrease priority"><a href="?cmd=priodown&file=', $file->hash, '"><img src="l_down.gif" alt="Decrease priority"></a></acronym>';
-			}
-	
-			echo '</td></tr>', "\n";
-		}
-	}
-?>
-
-</table>
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=4 style="background-color: #000000"><img src="arrow_up.gif">
- <b>Uploads
-  <?php
- 	$uploads = amule_load_vars("uploads");
- 	echo '&nbsp;(', count($uploads), ')';
- ?>
- </b></td>
-</tr>
-<tr>
- <td class="up-header-left"><b>Username</b></td>
- <td class="up-header"><b>File Name</b></td>
- <td class="up-header"><b>Transferred</b></td>
- <td class="up-header"><b>Speed</b></td>
-</tr>
-<tr>
-
- <?php
- 	function CastToXBytes($size)
-	{
-		if ( $size < 1024 ) {
-			$result = $size . " bytes";
-		} elseif ( $size < 1048576 ) {
-			$result = ($size / 1024.0) . "KB";
-		} elseif ( $size < 1073741824 ) {
-			$result = ($size / 1048576.0) . "MB";
-		} else {
-			$result = ($size / 1073741824.0) . "GB";
-		}
-		return $result;
-	}
- 	$uploads = amule_load_vars("uploads");
- 	foreach ($uploads as $file) {
- 		echo '<tr>';
- 		echo '<td valign=top class="up-line-left"><acronym title="', $file->user_name, '">', $file->user_name, '</acronym></td>';
- 		echo '<td valign=top class="up-line-left"><acronym title="', $file->name, '">', $file->short_name, '</acronym></td>';
- 		echo '<td valign=top class="up-line">', CastToXBytes($file->xfer_up), "&nbsp;/&nbsp;", CastToXBytes($file->xfer_down), '</td>';
- 		echo '<td valign=top class="up-line">', ($file->xfer_speed > 0) ? (CastToXBytes($file->xfer_speed) . "/s") : "-", '</td>';
- 		echo '</tr>';
-		echo "\n";
- 	}
- ?>
-
-</table>
-&nbsp;
-<p align=center>
-
-
-&nbsp;
-</p>
-</font>
-</td>
-</tr>
-</table></body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/chicane/emule.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/favicon.ico Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/green.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/greenpercent.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/index.php Deleted

@@ -1,372 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-    <title>
-      aMule CVS - Web Control Panel
-    </title>
-    
-    <style type="text/css">
-  img {
-    border : 0px;
-  }
-
-  a, a:link, a:visited {
-    color : white;
-    text-decoration: none;
-  }
-
-  a:hover {
-    color: #FFC412;
-    text-decoration: none;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-header, .up-header-left, .up-line, .up-line-left,
-  .server-header, .server-header-left, .server-line, .server-line-left,
-  .shared-header, .shared-header-left, .shared-line, .shared-line-changed,
-  .shared-line-left, .shared-line-left-changed,
-  .header, .smallheader, .commontext,
-  .upqueue-header, .upqueue-line, .upqueue-line-left,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .tabs {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1F76A5;
-  }
-
-  .tabs_too {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #0075B3;
-  }
-
-  .tabs_three {
-    font-family : Tahoma;
-    font-size : 10pt;
-  }
-
-  .tabs_four {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #21719B;
-  }
-
-  .tabs_five {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1D6083;
-  }
-
-  .down-header, .down-line, .down-line-good, .up-header, .up-line,
-  .server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-  .upqueue-header, .upqueue-line,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    text-align : center;
-  }
-
-  .down-header-left, .down-line-left, .down-line-good-left,
-  .server-header-left, .server-line-left, .shared-header-left,
-  .up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left {
-
-    text-align : left;
-  }
-
-  .down-line-right, .down-line-good-right, .down-header-right {
-    text-align : right;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .up-header, .up-header-left, .server-header, .server-header-left,
-  .shared-header, .shared-header-left, .upqueue-header,
-  .websearch-header, .addserver-header {
-
-    background-color : #1D6083;
-  }
-
-  .header {
-    background-color : #0046AC;
-  }
-
-  .smallheader {
-    background-color : #003399;
-    color : #FFFFFF;
-  }
-
-  .commontext {
-    background-color : #FFFFFF;
-    color : #000000;
-  }
-
-  .commontext_too {
-    color : #FFFFFF;
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-line, .up-line-left, .server-line, .server-line-left,
-  .shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-  .upqueue-line, .upqueue-line-left,
-  .websearch-line, .addserver-line {
-
-    background-color : #1F76A5;
-  }
-
-  .down-line-good, .down-line-good-left, .down-line-good-right,
-  .shared-line-changed, .shared-line-left-changed {
-
-    color : #F0F000;
-  }
-
-  .percent_table {
-    border:0px solid #000000;
-    border-collapse: collapse;
-  }
-
-  .message {
-    font-family : Tahoma;
-    font-size : 8pt;
-    font-weight: bold;
-    color: #FFFFFF;
-    background-color: #1D6083;
-  }
-
-  .dinput {
-    border-width: 1px;
-    border-color: black;
-  }
-</style>
-
-  </head>
-  <body background="main_bg.gif" text=white link="#1F76A5" vlink="#1F76A5" alink="#1F76A5" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-    <table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
-      <tr>
-       <td class="tabs_three" background="main_top_bg.gif" align="left" colspan="4">
-
-        <table border="0" cellpadding="4" cellspacing="0" width="100%">
-        <tr>
-          <td class="tabs_three" align="center" width="100">
-
-            &nbsp;
-            <font face="Tahoma" style="font-size:13pt;" color="#000000"><a href="http://www.amule.org" target="_blank">
-              <img src="emule.gif" alt="aMule | Web Control Panel">
-            </a>
-          </td>
-          <td class="tabs_three" align="center" width="30">
-            &nbsp;
-          </td>
-          <td align="center" class="tabs_three" width="95">
-
-            <a href="servers.php">
-              <img src="cp_servers.gif"><br />
-              Server list
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="downloads.php">
-              <img src="cp_download.gif"><br />
-              Transfer
-            </a>
-
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="search.php">
-              <img src="cp_search.gif"><br />
-              Search
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="shared.php">
-
-              <img src="cp_shared.gif"><br />
-              Shared Files
-            </a>
-          <td align="center" class="tabs_three" width="110">
-            <a href="stat_tree.php">
-              <img src="cp_stats.gif"><br />
-              Statistics
-            </a>
-            <font color="#000000">|</font>
-
-            <a href="stat_graphs.php">
-              Graphs
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="95">
-            <a href="preferences.php">
-              <img src="cp_settings.gif"><br />
-              Preferences
-            </a>
-          </td>
-
-          <td class="tabs_three" align="center">
-            &nbsp;
-          </td>
-          <td align="left" class="tabs_three" width="95">
-            <img src="log.gif" align="absmiddle"> <a href="index.php?serverinfo=1">Serverinfo</a><br />
-            <img src="log.gif" align="absmiddle"> <a href="index.php?log=1">Log</a>
-          </td>
-
-        </tr>
-        </table>
-
-       </td>
-      </tr>
-      <tr>
-       <td background="main_topbar.gif" height="49" class="tabs_four">
-         &nbsp;&nbsp;<b>Connection:</b> 
- 	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["id"] == 0 ) {
-			echo "Not connected";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "Connecting ...";
-		} else {
-			echo "Connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
-         <font color="#FFE471">
-           <script language="javascript">
-             var d = new Date();
-             s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-             document.write(s);
-           </script>
-         </font>
-       </td>
-       <td background="main_topbar.gif" align="center" valign="middle" class="tabs_four">
-
-        <a href="index.php?links=1">
-          <img src="arrow_right.gif" align="absmiddle">
-          &nbsp; ed2k:// ED2K Link(s)
-        </a>
-       </td>
-       <td background="main_topbar.gif" align="right">
-       
-        <table border="0" cellpadding="0" cellspacing="0" width="8" height="100%">
-           <tr>
-             <td height="49" background="main_topbarseperator.gif">
-
-               &nbsp;
-             </td>
-           </tr>
-         </table>
-         
-       </td>
-       <td background="main_topbardarker.gif" align="center" valign="middle" class="tabs_five">
-         <a href="login.php">
-           <img src="arrow_down_logout.gif" align="absmiddle">
-           &nbsp; Logout
-         </a>
-
-       </td>
-      </tr>
-    </table>
-&nbsp;
-
-<?php
-	function cat2idx($cat)
-	{
-            	$cats = amule_get_categories();
-            	$result = 0;
-            	foreach($cats as $i => $c) {
-            		if ( $cat == $c) $result = $i;
-            	}
-        		return $result;
-	}
-	
-	if (($HTTP_GET_VARS['cmd'] == 'download' ) && ($_SESSION["guest_login"] == 0)) {
-		$link = $HTTP_GET_VARS['ed2klink'];
-		$target_cat_idx = cat2idx($HTTP_GET_VARS['cat']);
-    	if ( strlen($link) > 0 ) {
-    		amule_do_ed2k_download_cmd($link, $target_cat_idx);
-    	}
-	}
-	
-	if ( $HTTP_GET_VARS['links'] == 1) {
-		echo '
-	<table align=center border=0 cellpadding=4 cellspacing=0 width="80%">
-	<tr>
-	<td align=center class="shared-header">
-	<p><font face=Tahoma style="font-size:10pt;"><b>Download Selected</b></font></p>
-	</td>
-	</tr>
-	<tr>
-	 <td align=center valign=top class=tabs>
-	  <form action="/" method="GET">
-	   <input type="hidden" name="cmd" value="download">
-	   <font face=Tahoma style="font-size:10pt;">&nbsp;<br>ED2K Link(s)<br><br>
-	   <textarea name="ed2klink" cols="94" rows="7" class=dinput></textarea>
-	   <br><br>
-	   <input type=submit value="Start"></font><img src="arrow_right.gif" align="absmiddle">
-	   <select name="cat" size="1">';
-
-    	$cats = amule_get_categories();
-    	foreach($cats as $c) {
-    		echo "<option>", $c, "</option>";
-    	}
-	   	
-	   	echo '
-	   </select>
-	  </form><br>
-	 </td>
-	</tr>
-	</table>';
-	} elseif ( $HTTP_GET_VARS['serverinfo'] == 1 ) {
-		$strinfo = amule_get_serverinfo($HTTP_GET_VARS['rst']);
-		echo '<table border=0 align=center cellpadding=4 cellspacing=0 width="80%">
-				<tr><td align=left valign=middle class="commontext">
-				<font color="#000000" face="Lucida Console"><pre>';
-		echo $strinfo;
-		echo '</pre></font></td></tr><tr><td align=left valign=middle>
-				<form action="index.php" method="GET">
-				<input type="hidden" name=rst value=1>
-				<input type="hidden" name=serverinfo value=1>
-				<input type=submit value="Reset"></form>
-				</td></tr></table>';
-	} elseif ( $HTTP_GET_VARS['log'] == 1) {
-		$strinfo = amule_get_log($HTTP_GET_VARS['rst']);
-		echo '<table border=0 align=center cellpadding=4 cellspacing=0 width="80%">
-				<tr><td align=left valign=middle class="commontext">
-				<font color="#000000" face="Lucida Console"><pre>';
-		echo $strinfo;
-		echo '</pre></font></td></tr><tr><td align=left valign=middle>
-				<form action="index.php" method="GET">
-				<input type="hidden" name=rst value=1>
-				<input type="hidden" name=log value=1>
-				<input type=submit value="Reset"></form>
-				</td></tr></table>';
-	}
-?>
-
-  </body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/chicane/l_cancel.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/l_connect.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/l_down.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/l_ed2klink.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/l_info.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/l_pause.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/l_resume.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/l_up.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/log.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/login.php Deleted

@@ -1,103 +0,0 @@
-<html>
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-  <head>
-    <title>
-      aMule CVS - CTemplate 0.44b - Web Control Panel
-    </title>
-  </head>
-  <body background="main_bg.gif" text=white link=white vlink=white alink=white onload="javascript:document.login.pass.focus();">
-    <table align=center border=0 cellpadding=4 cellspacing=0 width="100%" height="100%">
-
-      <tr>
-        <td align=center valign=middle>
-
-          <table align=center border=0 cellpadding=0 cellspacing=0 width="407">
-            <tr>
-              <td style="height: 12px" background="login_top.gif" height="12">
-              </td>
-            </tr>
-            <tr>
-
-              <td height="250">
-
-                <table align=center border=0 cellpadding=0 cellspacing=0 width="100%" height="100%">
-                  <tr>
-                    <td width="4" background="login_lefttop.gif">
-                      <img src="blank1x1.gif" alt="" border="0" />
-                    </td>
-                    <td background="login_topdown.gif" align="center">
-
-                      <table align=center border=0 cellpadding=0 cellspacing=0 width="100%" height="100%">
-
-                        <tr>
-                          <td align="center">
-                            <a href="http://www.amule.org" target="_blank"><img src="phpamule.png" border="0"></a>
-                          </td>
-                        </tr>
-                        <tr>
-                          <td align="center" height="50">
-                            <font face=Tahoma style="font-size:10pt;"><b>Web Control Panel</b> | Login</font>
-
-                          </td>
-                        </tr>
-                      </table>
-    
-                    </td>
-                    <td width="5" background="login_righttop.gif">
-                      <img src="blank1x1.gif" alt="" border="0" />
-                    </td>
-                  </tr>
-                </table>
-
-                
-              </td>
-            </tr>
-            <tr>
-              <td style="height: 3px" background="login_topseperator.gif" height="3">
-              </td>
-            </tr>
-            <tr>
-              <td height="130">
-
-                <table align=center border=0 cellpadding=0 cellspacing=0 width="100%" height="100%">
-                  <tr>
-                    <td width="4" background="login_lefttop.gif">
-                      <img src="blank1x1.gif" alt="" border="0" />
-                    </td>
-                    <td background="login_downmain.gif" align="center">
-                      <form action="" method="POST" name="login">
-                        <font face=Tahoma style="font-size:10pt;">
-                          &nbsp;<br />
-
-                          Enter your password here<br /><br />
-                          <input type="password" name="pass" maxlength=12 size=37 style="border-width: 1px; border-color: black; border-style:none;" value="">
-                          <br /><br /><input type=submit value="Login Now"><br />
-                        </font>
-                      </form>
-<?php
-	if ($_SESSION["login_error"] != "") {
-		echo "<br /><font color=blue size=+1>";
-		echo $_SESSION["login_error"];
-		echo "</font>";
-	}
-?>
-                    </td>
-                    <td width="5" background="login_righttop.gif">
-                      <img src="blank1x1.gif" alt="" border="0" />
-
-                    </td>
-                  </tr>
-                </table>
-                
-              </td>
-            </tr>
-            <tr>
-              <td style="height: 12px" background="login_bottom.gif" height="12">
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/chicane/login_bottom.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/login_downmain.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/login_lefttop.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/login_righttop.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/login_top.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/login_topdown.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/login_topseperator.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/logo.jpg Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/main_bg.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/main_top_bg.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/main_topbar.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/main_topbardarker.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/main_topbarseperator.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/phpamule.png Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/preferences.php Deleted

@@ -1,485 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <meta http-equiv="pragmas" content="no-cache">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-?>
-    
-    <style type="text/css">
-  img {
-    border : 0px;
-  }
-
-  a, a:link, a:visited {
-    color : white;
-    text-decoration: none;
-  }
-
-  a:hover {
-    color: #FFC412;
-    text-decoration: none;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-header, .up-header-left, .up-line, .up-line-left,
-  .server-header, .server-header-left, .server-line, .server-line-left,
-  .shared-header, .shared-header-left, .shared-line, .shared-line-changed,
-  .shared-line-left, .shared-line-left-changed,
-  .header, .smallheader, .commontext,
-  .upqueue-header, .upqueue-line, .upqueue-line-left,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .tabs {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1F76A5;
-  }
-
-  .tabs_too {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #0075B3;
-  }
-
-  .tabs_three {
-    font-family : Tahoma;
-    font-size : 10pt;
-  }
-
-  .tabs_four {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #21719B;
-  }
-
-  .tabs_five {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1D6083;
-  }
-
-  .down-header, .down-line, .down-line-good, .up-header, .up-line,
-  .server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-  .upqueue-header, .upqueue-line,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    text-align : center;
-  }
-
-  .down-header-left, .down-line-left, .down-line-good-left,
-  .server-header-left, .server-line-left, .shared-header-left,
-  .up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left {
-
-    text-align : left;
-  }
-
-  .down-line-right, .down-line-good-right, .down-header-right {
-    text-align : right;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .up-header, .up-header-left, .server-header, .server-header-left,
-  .shared-header, .shared-header-left, .upqueue-header,
-  .websearch-header, .addserver-header {
-
-    background-color : #1D6083;
-  }
-
-  .header {
-    background-color : #0046AC;
-  }
-
-  .smallheader {
-    background-color : #003399;
-    color : #FFFFFF;
-  }
-
-  .commontext {
-    background-color : #FFFFFF;
-    color : #000000;
-  }
-
-  .commontext_too {
-    color : #FFFFFF;
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-line, .up-line-left, .server-line, .server-line-left,
-  .shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-  .upqueue-line, .upqueue-line-left,
-  .websearch-line, .addserver-line {
-
-    background-color : #1F76A5;
-  }
-
-  .down-line-good, .down-line-good-left, .down-line-good-right,
-  .shared-line-changed, .shared-line-left-changed {
-
-    color : #F0F000;
-  }
-
-  .percent_table {
-    border:0px solid #000000;
-    border-collapse: collapse;
-  }
-
-  .message {
-    font-family : Tahoma;
-    font-size : 8pt;
-    font-weight: bold;
-    color: #FFFFFF;
-    background-color: #1D6083;
-  }
-
-  .dinput {
-    border-width: 1px;
-    border-color: black;
-  }
-</style>
-
-<script language="JavaScript" type="text/JavaScript">
-
-var initvals = new Object;
-
-<?php
-	// apply new options before proceeding
-	//var_dump($HTTP_GET_VARS);
-	if ( ($HTTP_GET_VARS["cmd"] == "apply") && ($_SESSION["guest_login"] == 0) ) {
-		$file_opts = array(
-			"upload_full_chunks", "first_last_chunks_prio"
-		);
-		$conn_opts = array("max_line_up_cap","max_up_limit",
-			"max_line_down_cap","max_down_limit", 
-			"max_file_src","max_conn_total");
-		$webserver_opts = array("use_gzip", "autorefresh_time");
-		
-		$all_opts;
-		foreach ($conn_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["connection"][$i] = $curr_value;
-		}
-		foreach ($file_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["files"][$i] = $curr_value;
-		}
-		foreach ($webserver_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["webserver"][$i] = $curr_value;
-		}
-		//var_dump($all_opts);
-		amule_set_options($all_opts);
-	}
-
-	$opts = amule_get_options();
-	//var_dump($opts);
-	$opt_groups = array("connection", "files", "webserver", "coretweaks");
-	//var_dump($opt_groups);
-	foreach ($opt_groups as $group) {
-		$curr_opts = $opts[$group];
-		//var_dump($curr_opts);
-		foreach ($curr_opts as $opt_name => $opt_val) {
-			echo 'initvals["', $opt_name, '"] = "', $opt_val, '";', "\n";
-		}
-	}
-?>
-
-function init_data()
-{
-	var frm = document.forms.mainform
-	
-	var str_param_names = new Array(
-		"max_line_down_cap", "max_line_up_cap",
-		"max_up_limit", "max_down_limit", "max_file_src",
-		"max_conn_total",
-		"autorefresh_time"
-		)
-	for(i = 0; i < str_param_names.length; i++) {
-		frm[str_param_names[i]].value = initvals[str_param_names[i]];
-	}
-	var check_param_names = new Array(
-		"use_gzip", "upload_full_chunks", "first_last_chunks_prio"
-		)
-	for(i = 0; i < check_param_names.length; i++) {
-		frm[check_param_names[i]].checked = initvals[check_param_names[i]] == "1" ? true : false;
-	}
-	
-}
-
-</script>
-
-  </head>
-  <body onload="init_data();" background="main_bg.gif" text=white link="#1F76A5" vlink="#1F76A5" alink="#1F76A5" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-    <table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
-      <tr>
-       <td class="tabs_three" background="main_top_bg.gif" align="left" colspan="4">
-
-        <table border="0" cellpadding="4" cellspacing="0" width="100%">
-        <tr>
-          <td class="tabs_three" align="center" width="100">
-
-            &nbsp;
-            <font face="Tahoma" style="font-size:13pt;" color="#000000"><a href="http://www.amule.org" target="_blank">
-              <img src="emule.gif" alt="aMule | Web Control Panel">
-            </a>
-          </td>
-          <td class="tabs_three" align="center" width="30">
-            &nbsp;
-          </td>
-          <td align="center" class="tabs_three" width="95">
-
-            <a href="servers.php">
-              <img src="cp_servers.gif"><br />
-              Server list
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="downloads.php">
-              <img src="cp_download.gif"><br />
-              Transfer
-            </a>
-
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="search.php">
-              <img src="cp_search.gif"><br />
-              Search
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="shared.php">
-
-              <img src="cp_shared.gif"><br />
-              Shared Files
-            </a>
-          <td align="center" class="tabs_three" width="110">
-            <a href="stat_tree.php">
-              <img src="cp_stats.gif"><br />
-              Statistics
-            </a>
-            <font color="#000000">|</font>
-
-            <a href="stat_graphs.php">
-              Graphs
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="95">
-            <a href="preferences.php">
-              <img src="cp_settings.gif"><br />
-              Preferences
-            </a>
-          </td>
-
-          <td class="tabs_three" align="center">
-            &nbsp;
-          </td>
-          <td align="left" class="tabs_three" width="95">
-            <img src="log.gif" align="absmiddle"> <a href="index.php?serverinfo=1">Serverinfo</a><br />
-            <img src="log.gif" align="absmiddle"> <a href="index.php?log=1">Log</a>
-          </td>
-
-        </tr>
-        </table>
-
-       </td>
-      </tr>
-      <tr>
-       <td background="main_topbar.gif" height="49" class="tabs_four">
-         &nbsp;&nbsp;<b>Connection:</b> 
- 	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["id"] == 0 ) {
-			echo "Not connected";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "Connecting ...";
-		} else {
-			echo "Connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
-         <font color="#FFE471">
-           <script language="javascript">
-             var d = new Date();
-             s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-             document.write(s);
-           </script>
-         </font>
-       </td>
-       <td background="main_topbar.gif" align="center" valign="middle" class="tabs_four">
-
-        <a href="index.php?links=1">
-          <img src="arrow_right.gif" align="absmiddle">
-          &nbsp; ed2k:// ED2K Link(s)
-        </a>
-       </td>
-       <td background="main_topbar.gif" align="right">
-       
-        <table border="0" cellpadding="0" cellspacing="0" width="8" height="100%">
-           <tr>
-             <td height="49" background="main_topbarseperator.gif">
-
-               &nbsp;
-             </td>
-           </tr>
-         </table>
-         
-       </td>
-       <td background="main_topbardarker.gif" align="center" valign="middle" class="tabs_five">
-         <a href="login.php">
-           <img src="arrow_down_logout.gif" align="absmiddle">
-           &nbsp; Logout
-         </a>
-
-       </td>
-      </tr>
-    </table>
-&nbsp;
-
-<form name="mainform" action="preferences.php" method="post">
-
-<input type="hidden" name="cmd" value="apply">
-<table border=0 align=center cellpadding=4 cellspacing=0 width="90%">
-<tr><td><font face=Tahoma style="font-size:10pt;" color=black>Web Control Panel</font></td></tr>
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>Gzip Compression</b></font>
-<input type="checkbox" name="use_gzip" id="use_gzip">
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;Save traffic, especially in graphs.
-</font>
-
-<br>
-</td></tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>Refresh-Time of Pages</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;Time in seconds (zero=disabled): <input type="text" name="autorefresh_time" id="autorefresh_time" size="5" class=dinput><br>
-</font>
-</td>
-</tr>
-
-
-<tr><td><br><font face=Tahoma style="font-size:10pt;" color=black>aMule</font></td></tr>
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>Speed Limits</b></font>
-</td>
-</tr>
-<tr>
-
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;Download: <input type="text" name="max_down_limit" id="max_down_limit" size="5" class=dinput> kB/s
-&nbsp;&nbsp;Upload: <input type="text" name="max_up_limit" id="max_up_limit" size="5" class=dinput> kB/s
-</font>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>Bandwidth Limits</b></font>
-</td>
-
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;Download: <input type="text" name="max_line_down_cap" id="max_line_down_cap" size="5" class=dinput> kB/s
-&nbsp;&nbsp;Upload: <input type="text" name="max_line_up_cap" id="max_line_up_cap" size="5" class=dinput> kB/s
-</font>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>Connection Limits</b></font>
-
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<table border=0>
-<tr><td><font face=Tahoma style="font-size:8pt;">Max Sources Per File:</font></td><td>
-<input type="text" name="max_file_src" id="max_file_src" size="5" class=dinput value="300"></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">Max. Connections:</font></td><td>
-<input type="text" name="max_conn_total" id="max_conn_total" size="5" class=dinput value="499"></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">Max. new connections / 5secs:</font></td><td>
-<input type="text" name="max_conn_5sec" id="max_conn_5sec" size="5" class=dinput value="20"></td></tr>
-</table>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-
-<font face=Tahoma style="font-size:8pt;"><b>File Settings</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<table border=0>
-<tr><td><font face=Tahoma style="font-size:8pt;">Try to transfer full chunks to all uploads</font></td><td>
-<input type="checkbox" name="upload_full_chunks" id="upload_full_chunks"></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">Try to download first and last chunks first</font></td><td>
-<input type="checkbox" name="first_last_chunks_prio" id="first_last_chunks_prio"></td></tr>
-</table>
-</td>
-</tr>
-
-<tr>
-<td align=center><br><input type=submit value="Apply"></td>
-
-</tr>
-
-</table>
-</form>
-
-  </body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/chicane/red.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/search.php Deleted

@@ -1,486 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <meta http-equiv="pragmas" content="no-cache">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-?>
-    
-    <style type="text/css">
-  img {
-    border : 0px;
-  }
-
-  a, a:link, a:visited {
-    color : white;
-    text-decoration: none;
-  }
-
-  a:hover {
-    color: #FFC412;
-    text-decoration: none;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-header, .up-header-left, .up-line, .up-line-left,
-  .server-header, .server-header-left, .server-line, .server-line-left,
-  .shared-header, .shared-header-left, .shared-line, .shared-line-changed,
-  .shared-line-left, .shared-line-left-changed,
-  .header, .smallheader, .commontext,
-  .upqueue-header, .upqueue-line, .upqueue-line-left,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .tabs {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1F76A5;
-  }
-
-  .tabs_too {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #0075B3;
-  }
-
-  .tabs_three {
-    font-family : Tahoma;
-    font-size : 10pt;
-  }
-
-  .tabs_four {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #21719B;
-  }
-
-  .tabs_five {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1D6083;
-  }
-
-  .down-header, .down-line, .down-line-good, .up-header, .up-line,
-  .server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-  .upqueue-header, .upqueue-line,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    text-align : center;
-  }
-
-  .down-header-left, .down-line-left, .down-line-good-left,
-  .server-header-left, .server-line-left, .shared-header-left,
-  .up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left {
-
-    text-align : left;
-  }
-
-  .down-line-right, .down-line-good-right, .down-header-right {
-    text-align : right;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .up-header, .up-header-left, .server-header, .server-header-left,
-  .shared-header, .shared-header-left, .upqueue-header,
-  .websearch-header, .addserver-header {
-
-    background-color : #1D6083;
-  }
-
-  .header {
-    background-color : #0046AC;
-  }
-
-  .smallheader {
-    background-color : #003399;
-    color : #FFFFFF;
-  }
-
-  .commontext {
-    background-color : #FFFFFF;
-    color : #000000;
-  }
-
-  .commontext_too {
-    color : #FFFFFF;
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-line, .up-line-left, .server-line, .server-line-left,
-  .shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-  .upqueue-line, .upqueue-line-left,
-  .websearch-line, .addserver-line {
-
-    background-color : #1F76A5;
-  }
-
-  .down-line-good, .down-line-good-left, .down-line-good-right,
-  .shared-line-changed, .shared-line-left-changed {
-
-    color : #F0F000;
-  }
-
-  .percent_table {
-    border:0px solid #000000;
-    border-collapse: collapse;
-  }
-
-  .message {
-    font-family : Tahoma;
-    font-size : 8pt;
-    font-weight: bold;
-    color: #FFFFFF;
-    background-color: #1D6083;
-  }
-
-  .dinput {
-    border-width: 1px;
-    border-color: black;
-  }
-</style>
-
-  </head>
-  <body background="main_bg.gif" text=white link="#1F76A5" vlink="#1F76A5" alink="#1F76A5" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-    <table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
-      <tr>
-       <td class="tabs_three" background="main_top_bg.gif" align="left" colspan="4">
-
-        <table border="0" cellpadding="4" cellspacing="0" width="100%">
-        <tr>
-          <td class="tabs_three" align="center" width="100">
-
-            &nbsp;
-            <font face="Tahoma" style="font-size:13pt;" color="#000000"><a href="http://www.amule.org" target="_blank">
-              <img src="emule.gif" alt="aMule | Web Control Panel">
-            </a>
-          </td>
-          <td class="tabs_three" align="center" width="30">
-            &nbsp;
-          </td>
-          <td align="center" class="tabs_three" width="95">
-
-            <a href="servers.php">
-              <img src="cp_servers.gif"><br />
-              Server list
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="downloads.php">
-              <img src="cp_download.gif"><br />
-              Transfer
-            </a>
-
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="search.php">
-              <img src="cp_search.gif"><br />
-              Search
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="shared.php">
-
-              <img src="cp_shared.gif"><br />
-              Shared Files
-            </a>
-          <td align="center" class="tabs_three" width="110">
-            <a href="stat_tree.php">
-              <img src="cp_stats.gif"><br />
-              Statistics
-            </a>
-            <font color="#000000">|</font>
-
-            <a href="stat_graphs.php">
-              Graphs
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="95">
-            <a href="preferences.php">
-              <img src="cp_settings.gif"><br />
-              Preferences
-            </a>
-          </td>
-
-          <td class="tabs_three" align="center">
-            &nbsp;
-          </td>
-          <td align="left" class="tabs_three" width="95">
-            <img src="log.gif" align="absmiddle"> <a href="index.php?serverinfo=1">Serverinfo</a><br />
-            <img src="log.gif" align="absmiddle"> <a href="index.php?log=1">Log</a>
-          </td>
-
-        </tr>
-        </table>
-
-       </td>
-      </tr>
-      <tr>
-       <td background="main_topbar.gif" height="49" class="tabs_four">
-         &nbsp;&nbsp;<b>Connection:</b> 
- 	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["id"] == 0 ) {
-			echo "Not connected";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "Connecting ...";
-		} else {
-			echo "Connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
-         <font color="#FFE471">
-           <script language="javascript">
-             var d = new Date();
-             s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-             document.write(s);
-           </script>
-         </font>
-       </td>
-       <td background="main_topbar.gif" align="center" valign="middle" class="tabs_four">
-
-        <a href="index.php?links=1">
-          <img src="arrow_right.gif" align="absmiddle">
-          &nbsp; ed2k:// ED2K Link(s)
-        </a>
-       </td>
-       <td background="main_topbar.gif" align="right">
-       
-        <table border="0" cellpadding="0" cellspacing="0" width="8" height="100%">
-           <tr>
-             <td height="49" background="main_topbarseperator.gif">
-
-               &nbsp;
-             </td>
-           </tr>
-         </table>
-         
-       </td>
-       <td background="main_topbardarker.gif" align="center" valign="middle" class="tabs_five">
-         <a href="login.php">
-           <img src="arrow_down_logout.gif" align="absmiddle">
-           &nbsp; Logout
-         </a>
-
-       </td>
-      </tr>
-    </table>
-&nbsp;
-<p align=center><div class="message"></div></p><br>
-
-<table border=0 align=center cellpadding=4 cellspacing=0 width="85%">
-<tr>
-<td valign=middle class="websearch-header"><b><font face=Tahoma style="font-size:10pt;">Search Results</font></b>&nbsp;&nbsp;(<a align="right" href="javascript:self.location.href='search.php'"><font face=Tahoma style="font-size:8pt;">Refetch Results</font></a>)</td>
-</tr>
-
-<tr>
-<td valign=middle class="websearch-line">
-
-<form action="" method="GET">
-<table border=0 align=center cellpadding=4 cellspacing=0>
-<input type="hidden" name=cmd value="download">
-<tr>
-<td class="websearch-line"><b><font face=Tahoma style="font-size:8pt;"><a href="search.php?sort=name">File Name</a></font></b></td>
-<td class="websearch-line" width=50><b><font face=Tahoma style="font-size:8pt;"><a href="search.php?sort=size">Size</a></font></b></td>
-<td class="websearch-line"><b><font face=Tahoma style="font-size:8pt;"><a href="search.php?sort=sources">Sources</a></b></td>
-<td class="websearch-line" width=100><b><font face=Tahoma style="font-size:8pt;">Download</font></b></td>
-</tr>
-<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-		function cat2idx($cat)
-		{
-                	$cats = amule_get_categories();
-                	$result = 0;
-                	foreach($cats as $i => $c) {
-                		if ( $cat == $c) $result = $i;
-                	}
-            		return $result;
-		}
-
-		//
-		// declare it here, before any function reffered it in "global"
-		//
-		$sort_order;$sort_reverse;
-
-		function my_cmp($a, $b)
-		{
-			global $sort_order, $sort_reverse;
-			
-			switch ( $sort_order) {
-				case "size": $result = $a->size > $b->size; break;
-				case "name": $result = $a->name > $b->name; break;
-				case "sources": $result = $a->sources > $b->sources; break;
-			}
-
-			if ( $sort_reverse ) {
-				$result = !$result;
-			}
-
-			return $result;
-		}
-
-		if ($_SESSION["guest_login"] == 0) {
-			if ( $HTTP_GET_VARS["cmd"] == "search") {
-
-				$search_type = -1;
-				switch($HTTP_GET_VARS["method"]) {
-					case "server": $search_type = 0; break;
-					case "global": $search_type = 1; break;
-					case "kad": $search_type = 2; break;
-				}
-	
-				$min_size = $HTTP_GET_VARS["min"] == "" ? 0 : $HTTP_GET_VARS["min"];
-				$max_size = $HTTP_GET_VARS["max"] == "" ? 0 : $HTTP_GET_VARS["max"];
-	
-				$min_size *= 1024*1024;
-				$max_size *= 1024*1024;
-				
-				amule_do_search_start_cmd($HTTP_GET_VARS["tosearch"],
-					$HTTP_GET_VARS["ext"], $HTTP_GET_VARS["type"],
-					$search_type, $HTTP_GET_VARS["avail"], $min_size, $max_size);
-			} elseif ( $HTTP_GET_VARS["cmd"] == "download") {
-				foreach ( $HTTP_GET_VARS as $name => $val) {
-					// this is file checkboxes
-					if ( (strlen($name) == 32) and ($val == "on") ) {
-						$cat = $HTTP_GET_VARS["cat"];
-						$cat_idx = cat2idx($cat);
-						amule_do_search_download_cmd($name, $cat_idx);
-					}
-				}
-			} else {
-				// wrong command come
-				//var_dump($HTTP_GET_VARS);
-			}
-		}
-		
-		$search = amule_load_vars("searchresult");
-
-		$sort_order = $HTTP_GET_VARS["sort"];
-
-		if ( $sort_order == "" ) {
-			$sort_order = $_SESSION["search_sort"];
-		} else {
-			if ( $_SESSION["search_sort_reverse"] == "" ) {
-				$_SESSION["search_sort_reverse"] = 0;
-			} else {
-				$_SESSION["search_sort_reverse"] = !$_SESSION["search_sort_reverse"];
-			}
-		}
-
-		$sort_reverse = $_SESSION["search_sort_reverse"];
-		if ( $sort_order != "" ) {
-			$_SESSION["search_sort"] = $sort_order;
-			usort(&$search, "my_cmp");
-		}
-
-		foreach ($search as $file) {
-			echo '<tr><td align="left"><font face=Tahoma style="font-size:8pt;">', $file->name,
-				'</font></td><td class="websearch-line"><font face=Tahoma style="font-size:8pt;">', CastToXBytes($file->size),
-				'</font></td><td class="websearch-line"><font face=Tahoma style="font-size:8pt;">', $file->sources,
-				'</font></td><td class="websearch-line"><input type="checkbox" name="', $file->hash,
-				'"></td></tr>';
-				
-		}
-?>
-
-</table>
-
-<input type="submit" value="Download">
-<img src="arrow_right.gif" align="absmiddle">
-	<form>
-	<select name="cat" size="1">
-        <?php
-        	$cats = amule_get_categories();
-        	foreach($cats as $c) {
-        		echo "<option>", $c, "</option>";
-        	}
-        ?>
-	</select>
-	</form>
-	
-</form>
-<br>
-<br>
-&nbsp;
-</table>
-<br>
-
-<form action="" method="GET">
-<table border=0 align=center cellpadding=4 cellspacing=0 width="250">
-<tr>
-<td valign=middle class="websearch-header"><b><font face=Tahoma style="font-size:10pt;">Search</font></b></td>
-</tr>
-<tr>
- <td valign=middle class="websearch-line">
-  <table>
-  <tr><td class=tabs width=150>Name</td><td><input name="tosearch" type="text" size="40"></td></tr>
-  <tr><td class=tabs>Type</td>
-  <td>
-  <select name="type">
-  	<option value=""></option>
-  	<option value="Archives">Archive</option>
-	<option value="Audio">Audio</option>
-  	<option value="CD-Images">CD-Images</option>
-  	<option value="Pictures">Pictures</option>
-  	<option value="Programs">Programs</option>
-  	<option value="Texts">Texts</option>
-  	<option value="Videos">Video</option>
-  </select>
-  </td></tr>
-  <tr><td class=tabs>Min Size (MB)</td><td><input name="min" type="text" size="10"></td></tr>
-  <tr><td class=tabs>Max Size (MB)</td><td><input name="max" type="text" size="10"></td></tr>
-  <tr><td class=tabs>Min Availability</td><td><input name="avail" type="text" size="10"></td></tr>
-  <tr><td class=tabs>Extension</td><td><input name="ext" type="text" size="10"></td></tr>
-  <tr><td class=tabs>Method</td><td><input value="server" type="radio" name="method" checked>Server</td></tr>
-  <tr><td class=tabs></td><td><input value="global" type="radio" name="method">Global Search</td></tr>
-  <tr><td class=tabs></td><td><input value="kad" type="radio" name="method">Kad Search</td></tr>
-  </table>
-  <br>
-  <input type="hidden" name=cmd value="search">
-  <input type="submit" value="Search">
-  <br>
-  &nbsp;
-</td>
-</tr>
-</table>
-
-  </body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/chicane/servers.php Deleted

@@ -1,424 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-?>
-    
-    <style type="text/css">
-  img {
-    border : 0px;
-  }
-
-  a, a:link, a:visited {
-    color : white;
-    text-decoration: none;
-  }
-
-  a:hover {
-    color: #FFC412;
-    text-decoration: none;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-header, .up-header-left, .up-line, .up-line-left,
-  .server-header, .server-header-left, .server-line, .server-line-left,
-  .shared-header, .shared-header-left, .shared-line, .shared-line-changed,
-  .shared-line-left, .shared-line-left-changed,
-  .header, .smallheader, .commontext,
-  .upqueue-header, .upqueue-line, .upqueue-line-left,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .tabs {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1F76A5;
-  }
-
-  .tabs_too {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #0075B3;
-  }
-
-  .tabs_three {
-    font-family : Tahoma;
-    font-size : 10pt;
-  }
-
-  .tabs_four {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #21719B;
-  }
-
-  .tabs_five {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1D6083;
-  }
-
-  .down-header, .down-line, .down-line-good, .up-header, .up-line,
-  .server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-  .upqueue-header, .upqueue-line,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    text-align : center;
-  }
-
-  .down-header-left, .down-line-left, .down-line-good-left,
-  .server-header-left, .server-line-left, .shared-header-left,
-  .up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left {
-
-    text-align : left;
-  }
-
-  .down-line-right, .down-line-good-right, .down-header-right {
-    text-align : right;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .up-header, .up-header-left, .server-header, .server-header-left,
-  .shared-header, .shared-header-left, .upqueue-header,
-  .websearch-header, .addserver-header {
-
-    background-color : #1D6083;
-  }
-
-  .header {
-    background-color : #0046AC;
-  }
-
-  .smallheader {
-    background-color : #003399;
-    color : #FFFFFF;
-  }
-
-  .commontext {
-    background-color : #FFFFFF;
-    color : #000000;
-  }
-
-  .commontext_too {
-    color : #FFFFFF;
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-line, .up-line-left, .server-line, .server-line-left,
-  .shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-  .upqueue-line, .upqueue-line-left,
-  .websearch-line, .addserver-line {
-
-    background-color : #1F76A5;
-  }
-
-  .down-line-good, .down-line-good-left, .down-line-good-right,
-  .shared-line-changed, .shared-line-left-changed {
-
-    color : #F0F000;
-  }
-
-  .percent_table {
-    border:0px solid #000000;
-    border-collapse: collapse;
-  }
-
-  .message {
-    font-family : Tahoma;
-    font-size : 8pt;
-    font-weight: bold;
-    color: #FFFFFF;
-    background-color: #1D6083;
-  }
-
-  .dinput {
-    border-width: 1px;
-    border-color: black;
-  }
-</style>
-
-  </head>
-  <body background="main_bg.gif" text=white link="#1F76A5" vlink="#1F76A5" alink="#1F76A5" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-    <table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
-      <tr>
-       <td class="tabs_three" background="main_top_bg.gif" align="left" colspan="4">
-
-        <table border="0" cellpadding="4" cellspacing="0" width="100%">
-        <tr>
-          <td class="tabs_three" align="center" width="100">
-
-            &nbsp;
-            <font face="Tahoma" style="font-size:13pt;" color="#000000"><a href="http://www.amule.org" target="_blank">
-              <img src="emule.gif" alt="aMule | Web Control Panel">
-            </a>
-          </td>
-          <td class="tabs_three" align="center" width="30">
-            &nbsp;
-          </td>
-          <td align="center" class="tabs_three" width="95">
-
-            <a href="servers.php">
-              <img src="cp_servers.gif"><br />
-              Server list
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="downloads.php">
-              <img src="cp_download.gif"><br />
-              Transfer
-            </a>
-
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="search.php">
-              <img src="cp_search.gif"><br />
-              Search
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="shared.php">
-
-              <img src="cp_shared.gif"><br />
-              Shared Files
-            </a>
-          <td align="center" class="tabs_three" width="110">
-            <a href="stat_tree.php">
-              <img src="cp_stats.gif"><br />
-              Statistics
-            </a>
-            <font color="#000000">|</font>
-
-            <a href="stat_graphs.php">
-              Graphs
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="95">
-            <a href="preferences.php">
-              <img src="cp_settings.gif"><br />
-              Preferences
-            </a>
-          </td>
-
-          <td class="tabs_three" align="center">
-            &nbsp;
-          </td>
-          <td align="left" class="tabs_three" width="95">
-            <img src="log.gif" align="absmiddle"> <a href="index.php?serverinfo=1">Serverinfo</a><br />
-            <img src="log.gif" align="absmiddle"> <a href="index.php?log=1">Log</a>
-          </td>
-
-        </tr>
-        </table>
-
-       </td>
-      </tr>
-      <tr>
-       <td background="main_topbar.gif" height="49" class="tabs_four">
-         &nbsp;&nbsp;<b>Connection:</b> 
- 	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["id"] == 0 ) {
-			echo "Not connected";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "Connecting ...";
-		} else {
-			echo "Connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
-         <font color="#FFE471">
-           <script language="javascript">
-             var d = new Date();
-             s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-             document.write(s);
-           </script>
-         </font>
-       </td>
-       <td background="main_topbar.gif" align="center" valign="middle" class="tabs_four">
-
-        <a href="index.php?links=1">
-          <img src="arrow_right.gif" align="absmiddle">
-          &nbsp; ed2k:// ED2K Link(s)
-        </a>
-       </td>
-       <td background="main_topbar.gif" align="right">
-       
-        <table border="0" cellpadding="0" cellspacing="0" width="8" height="100%">
-           <tr>
-             <td height="49" background="main_topbarseperator.gif">
-
-               &nbsp;
-             </td>
-           </tr>
-         </table>
-         
-       </td>
-       <td background="main_topbardarker.gif" align="center" valign="middle" class="tabs_five">
-         <a href="login.php">
-           <img src="arrow_down_logout.gif" align="absmiddle">
-           &nbsp; Logout
-         </a>
-
-       </td>
-      </tr>
-    </table>
-&nbsp;
-
-<font face=Tahoma style="font-size:8pt;">&nbsp;
-
-<table border=0 align=center cellpadding=4 cellspacing=0 width="95%">
-<tr>
-  <td align=center valign=top>
-
-<?php
-	$add_server_form = '
-<div class="message"></div>
-<table border=0 align=center cellpadding=4 cellspacing=0 width="60%" display="None">
-<tr>
-<td valign=middle class="addserver-header"><img src="add_server.gif"> <b>Add new server</b></td>
-</tr>
-<tr>
- <td valign=middle class="addserver-line">
-<form action="servers.php" method="GET">
-  IP or Address <input name="ip" type="text" size="15">
-  Port <input name="port" type="text" size="6">
-  Name <input name="name" type="text" size="30"><br>
-  <input name="cmd" type="hidden" value="add"><br>
-  <input type="submit" value="Add to list">
-</form>
- </td>
-</tr>
-<tr>
-<td valign=middle class="addserver-header"><img src="add_server.gif"> <b>Update server.met from URL</b></td>
-</tr>
-<tr>
- <td valign=middle class="addserver-line">
-<form action="servers.php" method="GET">
-  URL <input name="servermeturl" type="text" size="60"><br>
-  <input type="hidden" name=w value="server">
-  <input type="hidden" name=c value="options">
-  <input name="updateservermetfromurl" type="hidden" value="true"><br>
-  <input type="submit" value="Apply">
-</form>
- </td>
-</tr>
-</table>
-';
-	if ( ($_SESSION["guest_login"] == 0) && $HTTP_GET_VARS["showctrl"] ) {
-		echo $add_server_form;
-	}
-?>
-
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=5 style="background-color: #000000"><b>Server</b></td>
-</tr>
-<tr>
- <td valign=middle class="server-header"><b>Status</b></td>
- <td valign=middle class="server-header"><b>Server name</b></td>
- <td valign=middle class="server-header"><b>users</b></td>
- <td valign=middle class="server-line"><a href="servers.php?cmd=disconnect&amp;ip=0&amp;port=0">Disconnect</a></td>
- <td valign=middle class="server-header"><a href="servers.php?showctrl=1">Server Preferences</a></td>
-</tr>
-<tr>
-<?php
-		echo '<td valign=middle class="server-line">';
-		$stats = amule_get_stats();
-		if ( $stats["id"] == 0 ) {
-			echo "Not connected";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "Connecting ...";
-		} else {
-			echo "Connected with ", (($stats["id"] < 16777216) ? "low ID" : "high ID");
-		}
-		echo '</td><td valign=middle class="server-line">', $stats["serv_name"], '</td>';
-		echo '<td valign=middle class="server-line">', $stats["serv_users"], '</td>';
-		
-?>
- <td valign=middle class="server-header"><a href="servers.php?cmd=connect&amp;ip=0&amp;port=0">Connect to any server</a></td>
- <td valign=middle class="server-line"></td>
-</tr>
-</table>
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=6 style="background-color: #000000"><b>Server list</b></td>
-</tr>
-<tr>
- <td valign=middle class="server-header-left"><a href="servers.php?sort=name"><b>Server name</b></a></td>
- <td valign=middle class="server-header"><a href="servers.php?sort=description"><b>Description</b></a></td>
- <td valign=middle class="server-header"><a href="servers.php?sort=ip"><b>IP</b></a></td>
- <td valign=middle class="server-header"><a href="servers.php?sort=users"><b>users</b></a></td>
- <td valign=middle class="server-header"><a href="servers.php?sort=files"><b>files</b></a></td>
- <td valign=middle class="server-header"><b>Actions</b></td>
-</tr>
-
-<?php
-	if ( ($HTTP_GET_VARS["cmd"] != "") && ($_SESSION["guest_login"] == 0) ) {
-		var_dump($HTTP_GET_VARS);
-		if ( $HTTP_GET_VARS["cmd"] == "add" ) {
-			amule_do_add_server_cmd($HTTP_GET_VARS["ip"], $HTTP_GET_VARS["port"], $HTTP_GET_VARS["name"]);
-		} else {
-			amule_do_server_cmd($HTTP_GET_VARS["ip"], $HTTP_GET_VARS["port"], $HTTP_GET_VARS["cmd"]);
-		}
-	}
-	
-	$servers = amule_load_vars("servers");
-
-	foreach ($servers as $srv) {
-		echo "<tr>";
-		echo '<td valign=middle class="server-line-left">', $srv->name, '</td>';
-		echo '<td valign=middle class="server-line">', $srv->desc, '</td>';
-		echo '<td valign=middle class="server-line">', $srv->addr, '</td>';
-		echo '<td valign=middle class="server-line">', $srv->users, '(', $srv->maxusers, ')', '</td>';
-		echo '<td valign=middle class="server-line">', $srv->files, '</td>';
-		if ( $_SESSION["guest_login"] == 0 ) {
-			echo '<td valign=middle class="server-line"><acronym title="Connect">',
-			'<a href="servers.php?cmd=connect&ip=', $srv->ip, '&port=', $srv->port,
-			'" style="text-decoration: none"><img src="l_connect.gif" alt="Connect"></a></acronym>',
-			'<acronym title="Remove selected server"><a href="servers.php?cmd=remove&ip=',
-			$srv->ip, '&port=', $srv->port,
-			"\" onclick=\"return confirm('Are you sure to remove this server from list?')\">",
-			'<img src="l_cancel.gif" alt="Remove selected server"></a></acronym>';
-		}
-		echo "</tr>\n";
-	}
-?>
-</table>
- </td>
-</tr>
-</table>
-</font>
-
- </body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/chicane/shared.php Deleted

@@ -1,434 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-?>
-    
-    <style type="text/css">
-  img {
-    border : 0px;
-  }
-
-  a, a:link, a:visited {
-    color : white;
-    text-decoration: none;
-  }
-
-  a:hover {
-    color: #FFC412;
-    text-decoration: none;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-header, .up-header-left, .up-line, .up-line-left,
-  .server-header, .server-header-left, .server-line, .server-line-left,
-  .shared-header, .shared-header-left, .shared-line, .shared-line-changed,
-  .shared-line-left, .shared-line-left-changed,
-  .header, .smallheader, .commontext,
-  .upqueue-header, .upqueue-line, .upqueue-line-left,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .tabs {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1F76A5;
-  }
-
-  .tabs_too {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #0075B3;
-  }
-
-  .tabs_three {
-    font-family : Tahoma;
-    font-size : 10pt;
-  }
-
-  .tabs_four {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #21719B;
-  }
-
-  .tabs_five {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1D6083;
-  }
-
-  .down-header, .down-line, .down-line-good, .up-header, .up-line,
-  .server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-  .upqueue-header, .upqueue-line,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    text-align : center;
-  }
-
-  .down-header-left, .down-line-left, .down-line-good-left,
-  .server-header-left, .server-line-left, .shared-header-left,
-  .up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left {
-
-    text-align : left;
-  }
-
-  .down-line-right, .down-line-good-right, .down-header-right {
-    text-align : right;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .up-header, .up-header-left, .server-header, .server-header-left,
-  .shared-header, .shared-header-left, .upqueue-header,
-  .websearch-header, .addserver-header {
-
-    background-color : #1D6083;
-  }
-
-  .header {
-    background-color : #0046AC;
-  }
-
-  .smallheader {
-    background-color : #003399;
-    color : #FFFFFF;
-  }
-
-  .commontext {
-    background-color : #FFFFFF;
-    color : #000000;
-  }
-
-  .commontext_too {
-    color : #FFFFFF;
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-line, .up-line-left, .server-line, .server-line-left,
-  .shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-  .upqueue-line, .upqueue-line-left,
-  .websearch-line, .addserver-line {
-
-    background-color : #1F76A5;
-  }
-
-  .down-line-good, .down-line-good-left, .down-line-good-right,
-  .shared-line-changed, .shared-line-left-changed {
-
-    color : #F0F000;
-  }
-
-  .percent_table {
-    border:0px solid #000000;
-    border-collapse: collapse;
-  }
-
-  .message {
-    font-family : Tahoma;
-    font-size : 8pt;
-    font-weight: bold;
-    color: #FFFFFF;
-    background-color: #1D6083;
-  }
-
-  .dinput {
-    border-width: 1px;
-    border-color: black;
-  }
-</style>
-
-  </head>
-  <body background="main_bg.gif" text=white link="#1F76A5" vlink="#1F76A5" alink="#1F76A5" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-    <table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
-      <tr>
-       <td class="tabs_three" background="main_top_bg.gif" align="left" colspan="4">
-
-        <table border="0" cellpadding="4" cellspacing="0" width="100%">
-        <tr>
-          <td class="tabs_three" align="center" width="100">
-
-            &nbsp;
-            <font face="Tahoma" style="font-size:13pt;" color="#000000"><a href="http://www.amule.org" target="_blank">
-              <img src="emule.gif" alt="aMule | Web Control Panel">
-            </a>
-          </td>
-          <td class="tabs_three" align="center" width="30">
-            &nbsp;
-          </td>
-          <td align="center" class="tabs_three" width="95">
-
-            <a href="servers.php">
-              <img src="cp_servers.gif"><br />
-              Server list
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="downloads.php">
-              <img src="cp_download.gif"><br />
-              Transfer
-            </a>
-
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="search.php">
-              <img src="cp_search.gif"><br />
-              Search
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="shared.php">
-
-              <img src="cp_shared.gif"><br />
-              Shared Files
-            </a>
-          <td align="center" class="tabs_three" width="110">
-            <a href="stat_tree.php">
-              <img src="cp_stats.gif"><br />
-              Statistics
-            </a>
-            <font color="#000000">|</font>
-
-            <a href="stat_graphs.php">
-              Graphs
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="95">
-            <a href="preferences.php">
-              <img src="cp_settings.gif"><br />
-              Preferences
-            </a>
-          </td>
-
-          <td class="tabs_three" align="center">
-            &nbsp;
-          </td>
-          <td align="left" class="tabs_three" width="95">
-            <img src="log.gif" align="absmiddle"> <a href="index.php?serverinfo=1">Serverinfo</a><br />
-            <img src="log.gif" align="absmiddle"> <a href="index.php?log=1">Log</a>
-          </td>
-
-        </tr>
-        </table>
-
-       </td>
-      </tr>
-      <tr>
-       <td background="main_topbar.gif" height="49" class="tabs_four">
-         &nbsp;&nbsp;<b>Connection:</b> 
- 	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["id"] == 0 ) {
-			echo "Not connected";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "Connecting ...";
-		} else {
-			echo "Connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
-         <font color="#FFE471">
-           <script language="javascript">
-             var d = new Date();
-             s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-             document.write(s);
-           </script>
-         </font>
-       </td>
-       <td background="main_topbar.gif" align="center" valign="middle" class="tabs_four">
-
-        <a href="index.php?links=1">
-          <img src="arrow_right.gif" align="absmiddle">
-          &nbsp; ed2k:// ED2K Link(s)
-        </a>
-       </td>
-       <td background="main_topbar.gif" align="right">
-       
-        <table border="0" cellpadding="0" cellspacing="0" width="8" height="100%">
-           <tr>
-             <td height="49" background="main_topbarseperator.gif">
-
-               &nbsp;
-             </td>
-           </tr>
-         </table>
-         
-       </td>
-       <td background="main_topbardarker.gif" align="center" valign="middle" class="tabs_five">
-         <a href="login.php">
-           <img src="arrow_down_logout.gif" align="absmiddle">
-           &nbsp; Logout
-         </a>
-
-       </td>
-      </tr>
-    </table>
-
-<font face=Tahoma style="font-size:8pt;">
-
-<table align=center border=0 cellpadding=4 cellspacing=0 width="95%">
-<tr>
-<td valign=middle class="shared-header-left"><a href="?sort=name"><b>File Name</b></a></td>
-<td valign=middle class="shared-header">
-	<a href="?sort=transferred"><b>Transferred Data</b></a>&nbsp
-	<a href="?sort=alltimetransferred">(Total)
-</td>
-<td valign=middle class="shared-header">
-	<a href="?sort=requests"><b>Requests</b></a>&nbsp
-	<a href="?sort=alltimerequests"><b>(Total)</b></a>&nbsp
-
-</td>
-<td valign=middle class="shared-header">
-	<a href="?sort=accepts"><b>Accepted Requests</b></a>&nbsp
-	<a href="?sort=alltimeaccepts"><b>(Total)</b></a>
-</td>
-<td valign=middle class="shared-header"><a href="?sort=size"><b>Size</b></a></td>
-<td valign=middle class="shared-header"><a href="?sort=priority"><b>Priority</b></a></td>
-<td valign=middle width="10%" class="shared-header"><b>ED2K Link(s)</b></td>
-</tr>
-<p align=center><div class="message"></div></p><br>
-	  <?php
-
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-		function PrioString($file)
-		{
-			$prionames = array(0 => "Low", 1 => "Normal", 2 => "High",
-				3 => "Very high", 4 => "Very low", 5=> "Auto", 6 => "Powershare");
-			$result = $prionames[$file->prio];
-			if ( $file->prio_auto == 1) {
-				$result = $result . "(auto)";
-			}
-			return $result;
-		}
-
-		//
-		// declare it here, before any function reffered it in "global"
-		//
-		$sort_order;$sort_reverse;
-
-		function my_cmp($a, $b)
-		{
-			global $sort_order, $sort_reverse;
-			
-			switch ( $sort_order) {
-				case "size": $result = $a->size > $b->size; break;
-				case "name": $result = $a->name > $b->name; break;
-				case "xfer": $result = $a->xfer > $b->xfer; break;
-				case "allxfer": $result = $a->xfer_all > $b->xfer_all; break;
-				case "acc": $result = $a->accept > $b->accept; break;
-				case "allacc": $result = $a->accept_all > $b->accept_all; break;
-				case "req": $result = $a->req > $b->req; break;
-				case "req_all": $result = $a->req_all > $b->req_all; break;
-				case "prio": $result = PrioString($a) > PrioString($b); break;
-			}
-
-			if ( $sort_reverse ) {
-				$result = !$result;
-			}
-			return $result;
-		}
-
-		if (($HTTP_GET_VARS["cmd"] != "") && ($_SESSION["guest_login"] == 0)) {
-			if ($HTTP_GET_VARS["cmd"] == "reload") {
-				amule_do_reload_shared_cmd();
-			} else {
-				amule_do_shared_cmd($HTTP_GET_VARS["file"], $HTTP_GET_VARS["cmd"]);
-			}
-		}
-		
-		$shared = amule_load_vars("shared");
-
-		$sort_order = $HTTP_GET_VARS["sort"];
-
-		if ( $sort_order == "" ) {
-			$sort_order = $_SESSION["shared_sort"];
-		} else {
-			if ( $_SESSION["sort_reverse"] == "" ) {
-				$_SESSION["sort_reverse"] = 0;
-			} else {
-				$_SESSION["sort_reverse"] = !$_SESSION["sort_reverse"];
-			}
-		}
-
-		$sort_reverse = $_SESSION["sort_reverse"];
-		if ( $sort_order != "" ) {
-			$_SESSION["shared_sort"] = $sort_order;
-			usort(&$shared, "my_cmp");
-		}
-
-		foreach ($shared as $file) {
-			echo '<tr>';
-			echo '<td valign=top class="shared-line-left"><acronym title="', $file->name, '">',
-				$file->name, '</acronym></td>';
-			echo '<td valign=top class="shared-line">', CastToXBytes($file->xfer),
-				'(', CastToXBytes($file->xfer_all),')</td>';
-				
-			echo '<td valign=top class="shared-line">' , $file->req, '(', $file->req_all,')</td>';
-			echo '<td valign=top class="shared-line">' , $file->accept, '(', $file->accept_all,')</td>';
-			echo '<td valign=top class="shared-line">', CastToXBytes($file->size), '</td>';
-			echo '<td valign=top class="shared-line">', PrioString($file), '</td>';
-			echo '<td valign=top class="shared-line"><acronym title="ED2K Link(s)"><a href="',
-				$file->link, '"><img src="l_ed2klink.gif" alt="ED2K Link(s)"></a></acronym>';
-
-			if ( $_SESSION["guest_login"] == 0 ) {
-				echo '<acronym title="Increase Priority"><a href="shared.php?cmd=prioup&file=', $file->hash,
-					'"><img src="l_up.gif" alt="Increase Priority"></a></acronym>';
-				echo '<acronym title="Decrease Priority"><a href="shared.php?cmd=priodown&file=', $file->hash,
-					'"><img src="l_down.gif" alt="Decrease Priority"></a></acronym>';
-			}
-		}
-		echo '</td>', "\n";
-		echo '</tr>', "\n";
-
-		?>
-</table>
-<p align="center">
-
-&nbsp;
-
-<form>
-	<input type="button" name="queue" value="Reload List" onClick="self.location.href='shared.php?cmd=reload'">
-</form></p>
-
-  </body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/chicane/stat_graphs.php Deleted

@@ -1,329 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-?>
-    
-    <style type="text/css">
-  img {
-    border : 0px;
-  }
-
-  a, a:link, a:visited {
-    color : white;
-    text-decoration: none;
-  }
-
-  a:hover {
-    color: #FFC412;
-    text-decoration: none;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-header, .up-header-left, .up-line, .up-line-left,
-  .server-header, .server-header-left, .server-line, .server-line-left,
-  .shared-header, .shared-header-left, .shared-line, .shared-line-changed,
-  .shared-line-left, .shared-line-left-changed,
-  .header, .smallheader, .commontext,
-  .upqueue-header, .upqueue-line, .upqueue-line-left,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .tabs {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1F76A5;
-  }
-
-  .tabs_too {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #0075B3;
-  }
-
-  .tabs_three {
-    font-family : Tahoma;
-    font-size : 10pt;
-  }
-
-  .tabs_four {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #21719B;
-  }
-
-  .tabs_five {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1D6083;
-  }
-
-  .down-header, .down-line, .down-line-good, .up-header, .up-line,
-  .server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-  .upqueue-header, .upqueue-line,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    text-align : center;
-  }
-
-  .down-header-left, .down-line-left, .down-line-good-left,
-  .server-header-left, .server-line-left, .shared-header-left,
-  .up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left {
-
-    text-align : left;
-  }
-
-  .down-line-right, .down-line-good-right, .down-header-right {
-    text-align : right;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .up-header, .up-header-left, .server-header, .server-header-left,
-  .shared-header, .shared-header-left, .upqueue-header,
-  .websearch-header, .addserver-header {
-
-    background-color : #1D6083;
-  }
-
-  .header {
-    background-color : #0046AC;
-  }
-
-  .smallheader {
-    background-color : #003399;
-    color : #FFFFFF;
-  }
-
-  .commontext {
-    background-color : #FFFFFF;
-    color : #000000;
-  }
-
-  .commontext_too {
-    color : #FFFFFF;
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-line, .up-line-left, .server-line, .server-line-left,
-  .shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-  .upqueue-line, .upqueue-line-left,
-  .websearch-line, .addserver-line {
-
-    background-color : #1F76A5;
-  }
-
-  .down-line-good, .down-line-good-left, .down-line-good-right,
-  .shared-line-changed, .shared-line-left-changed {
-
-    color : #F0F000;
-  }
-
-  .percent_table {
-    border:0px solid #000000;
-    border-collapse: collapse;
-  }
-
-  .message {
-    font-family : Tahoma;
-    font-size : 8pt;
-    font-weight: bold;
-    color: #FFFFFF;
-    background-color: #1D6083;
-  }
-
-  .dinput {
-    border-width: 1px;
-    border-color: black;
-  }
-</style>
-
-  </head>
-  <body background="main_bg.gif" text=white link="#1F76A5" vlink="#1F76A5" alink="#1F76A5" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-    <table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
-      <tr>
-       <td class="tabs_three" background="main_top_bg.gif" align="left" colspan="4">
-
-        <table border="0" cellpadding="4" cellspacing="0" width="100%">
-        <tr>
-          <td class="tabs_three" align="center" width="100">
-
-            &nbsp;
-            <font face="Tahoma" style="font-size:13pt;" color="#000000"><a href="http://www.amule.org" target="_blank">
-              <img src="emule.gif" alt="aMule | Web Control Panel">
-            </a>
-          </td>
-          <td class="tabs_three" align="center" width="30">
-            &nbsp;
-          </td>
-          <td align="center" class="tabs_three" width="95">
-
-            <a href="servers.php">
-              <img src="cp_servers.gif"><br />
-              Server list
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="downloads.php">
-              <img src="cp_download.gif"><br />
-              Transfer
-            </a>
-
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="search.php">
-              <img src="cp_search.gif"><br />
-              Search
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="shared.php">
-
-              <img src="cp_shared.gif"><br />
-              Shared Files
-            </a>
-          <td align="center" class="tabs_three" width="110">
-            <a href="stat_tree.php">
-              <img src="cp_stats.gif"><br />
-              Statistics
-            </a>
-            <font color="#000000">|</font>
-
-            <a href="stat_graphs.php">
-              Graphs
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="95">
-            <a href="preferences.php">
-              <img src="cp_settings.gif"><br />
-              Preferences
-            </a>
-          </td>
-
-          <td class="tabs_three" align="center">
-            &nbsp;
-          </td>
-          <td align="left" class="tabs_three" width="95">
-            <img src="log.gif" align="absmiddle"> <a href="index.php?serverinfo=1">Serverinfo</a><br />
-            <img src="log.gif" align="absmiddle"> <a href="index.php?log=1">Log</a>
-          </td>
-
-        </tr>
-        </table>
-
-       </td>
-      </tr>
-      <tr>
-       <td background="main_topbar.gif" height="49" class="tabs_four">
-         &nbsp;&nbsp;<b>Connection:</b> 
- 	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["id"] == 0 ) {
-			echo "Not connected";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "Connecting ...";
-		} else {
-			echo "Connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
-         <font color="#FFE471">
-           <script language="javascript">
-             var d = new Date();
-             s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-             document.write(s);
-           </script>
-         </font>
-       </td>
-       <td background="main_topbar.gif" align="center" valign="middle" class="tabs_four">
-
-        <a href="index.php?links=1">
-          <img src="arrow_right.gif" align="absmiddle">
-          &nbsp; ed2k:// ED2K Link(s)
-        </a>
-       </td>
-       <td background="main_topbar.gif" align="right">
-       
-        <table border="0" cellpadding="0" cellspacing="0" width="8" height="100%">
-           <tr>
-             <td height="49" background="main_topbarseperator.gif">
-
-               &nbsp;
-             </td>
-           </tr>
-         </table>
-         
-       </td>
-       <td background="main_topbardarker.gif" align="center" valign="middle" class="tabs_five">
-         <a href="login.php">
-           <img src="arrow_down_logout.gif" align="absmiddle">
-           &nbsp; Logout
-         </a>
-
-       </td>
-      </tr>
-    </table>
-&nbsp;
-
-<?php
-	// reload graphs data
-	amule_load_vars("stats_graph");
-?>
-
-<table border=0 align=center cellpadding=4 cellspacing=0>
-<tr>
-<td class="websearch-line"><img src="amule_stats_download.png" width="500" height="200" border="0" alt="" title="" /></td>
-</tr>
-<tr>
-<td width="600" class="websearch-line"><b><font face=Tahoma style="font-size:8pt;">Download speed</font></b></td>
-</tr>
-</table>
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0>
-<tr>
-<td class="websearch-line"><img src="amule_stats_upload.png" width="500" height="200" border="0" alt="" title="" /></td>
-</tr>
-<tr>
-<td width="600" class="websearch-line"><b><font face=Tahoma style="font-size:8pt;">Upload speed</font></b></td>
-</tr>
-</table>
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0>
-<tr>
-<td class="websearch-line"><img src="amule_stats_conncount.png" width="500" height="200" border="0" alt="" title="" /></td>
-</tr>
-<tr>
-<td width="600" class="websearch-line"><b><font face=Tahoma style="font-size:8pt;">Number of connections</font></b></td>
-</tr>
-</table>
-
-  </body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/chicane/stat_tree.php Deleted

@@ -1,384 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-  <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-    <META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-?>
-    
-    <style type="text/css">
-  img {
-    border : 0px;
-  }
-
-  a, a:link, a:visited {
-    color : white;
-    text-decoration: none;
-  }
-
-  a:hover {
-    color: #FFC412;
-    text-decoration: none;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-header, .up-header-left, .up-line, .up-line-left,
-  .server-header, .server-header-left, .server-line, .server-line-left,
-  .shared-header, .shared-header-left, .shared-line, .shared-line-changed,
-  .shared-line-left, .shared-line-left-changed,
-  .header, .smallheader, .commontext,
-  .upqueue-header, .upqueue-line, .upqueue-line-left,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .tabs {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1F76A5;
-  }
-
-  .tabs_too {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #0075B3;
-  }
-
-  .tabs_three {
-    font-family : Tahoma;
-    font-size : 10pt;
-  }
-
-  .tabs_four {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #21719B;
-  }
-
-  .tabs_five {
-    font-family : Tahoma;
-    font-size : 10pt;
-    background-color : #1D6083;
-  }
-
-  .down-header, .down-line, .down-line-good, .up-header, .up-line,
-  .server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-  .upqueue-header, .upqueue-line,
-  .websearch-header, .websearch-line, .addserver-header, .addserver-line {
-
-    text-align : center;
-  }
-
-  .down-header-left, .down-line-left, .down-line-good-left,
-  .server-header-left, .server-line-left, .shared-header-left,
-  .up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left {
-
-    text-align : left;
-  }
-
-  .down-line-right, .down-line-good-right, .down-header-right {
-    text-align : right;
-  }
-
-  .down-header, .down-header-left, .down-header-right,
-  .up-header, .up-header-left, .server-header, .server-header-left,
-  .shared-header, .shared-header-left, .upqueue-header,
-  .websearch-header, .addserver-header {
-
-    background-color : #1D6083;
-  }
-
-  .header {
-    background-color : #0046AC;
-  }
-
-  .smallheader {
-    background-color : #003399;
-    color : #FFFFFF;
-  }
-
-  .commontext {
-    background-color : #FFFFFF;
-    color : #000000;
-  }
-
-  .commontext_too {
-    color : #FFFFFF;
-    font-family : Tahoma;
-    font-size : 8pt;
-  }
-
-  .down-line, .down-line-good, .down-line-left, .down-line-good-left,
-  .down-line-right, .down-line-good-right,
-  .up-line, .up-line-left, .server-line, .server-line-left,
-  .shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-  .upqueue-line, .upqueue-line-left,
-  .websearch-line, .addserver-line {
-
-    background-color : #1F76A5;
-  }
-
-  .down-line-good, .down-line-good-left, .down-line-good-right,
-  .shared-line-changed, .shared-line-left-changed {
-
-    color : #F0F000;
-  }
-
-  .percent_table {
-    border:0px solid #000000;
-    border-collapse: collapse;
-  }
-
-  .message {
-    font-family : Tahoma;
-    font-size : 8pt;
-    font-weight: bold;
-    color: #FFFFFF;
-    background-color: #1D6083;
-  }
-
-  .dinput {
-    border-width: 1px;
-    border-color: black;
-  }
-
-.trigger {
-	cursor: pointer;
-	cursor: hand;
-	font-family: Tahoma;
-	font-size: small;
-    color: #000000;
-}
-
-.branch {
-	display: block;
-	margin-left: 16px;
-	font-family: Tahoma;
-	font-size: small;
-    color: #000000;
-}
-</style>
-
-<script language="JavaScript" type="text/JavaScript">
-var openImg = new Image();
-openImg.src = "tree-open.gif";
-var closedImg = new Image();
-closedImg.src = "tree-closed.gif";
-
-function showBranch(branch){
-	var objBranch = document.getElementById(branch).style;
-	if(objBranch.display=="block")
-		objBranch.display="none";
-	else
-		objBranch.display="block";
-}
-
-function swapFolder(img){
-	objImg = document.getElementById(img);
-	if(objImg.src.indexOf('tree-closed.gif')>-1)
-		objImg.src = openImg.src;
-	else
-		objImg.src = closedImg.src;
-}
-
-</script>
-
-  </head>
-  <body background="main_bg.gif" text=white link="#1F76A5" vlink="#1F76A5" alink="#1F76A5" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-    <table border="0" width="100%" align="center" cellpadding="0" cellspacing="0">
-      <tr>
-       <td class="tabs_three" background="main_top_bg.gif" align="left" colspan="4">
-
-        <table border="0" cellpadding="4" cellspacing="0" width="100%">
-        <tr>
-          <td class="tabs_three" align="center" width="100">
-
-            &nbsp;
-            <font face="Tahoma" style="font-size:13pt;" color="#000000"><a href="http://www.amule.org" target="_blank">
-              <img src="emule.gif" alt="aMule | Web Control Panel">
-            </a>
-          </td>
-          <td class="tabs_three" align="center" width="30">
-            &nbsp;
-          </td>
-          <td align="center" class="tabs_three" width="95">
-
-            <a href="servers.php">
-              <img src="cp_servers.gif"><br />
-              Server list
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="downloads.php">
-              <img src="cp_download.gif"><br />
-              Transfer
-            </a>
-
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="search.php">
-              <img src="cp_search.gif"><br />
-              Search
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="96">
-            <a href="shared.php">
-
-              <img src="cp_shared.gif"><br />
-              Shared Files
-            </a>
-          <td align="center" class="tabs_three" width="110">
-            <a href="stat_tree.php">
-              <img src="cp_stats.gif"><br />
-              Statistics
-            </a>
-            <font color="#000000">|</font>
-
-            <a href="stat_graphs.php">
-              Graphs
-            </a>
-          </td>
-          <td align="center" class="tabs_three" width="95">
-            <a href="preferences.php">
-              <img src="cp_settings.gif"><br />
-              Preferences
-            </a>
-          </td>
-
-          <td class="tabs_three" align="center">
-            &nbsp;
-          </td>
-          <td align="left" class="tabs_three" width="95">
-            <img src="log.gif" align="absmiddle"> <a href="index.php?serverinfo=1">Serverinfo</a><br />
-            <img src="log.gif" align="absmiddle"> <a href="index.php?log=1">Log</a>
-          </td>
-
-        </tr>
-        </table>
-
-       </td>
-      </tr>
-      <tr>
-       <td background="main_topbar.gif" height="49" class="tabs_four">
-         &nbsp;&nbsp;<b>Connection:</b> 
- 	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["id"] == 0 ) {
-			echo "Not connected";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "Connecting ...";
-		} else {
-			echo "Connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
-         <font color="#FFE471">
-           <script language="javascript">
-             var d = new Date();
-             s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-             document.write(s);
-           </script>
-         </font>
-       </td>
-       <td background="main_topbar.gif" align="center" valign="middle" class="tabs_four">
-
-        <a href="index.php?links=1">
-          <img src="arrow_right.gif" align="absmiddle">
-          &nbsp; ed2k:// ED2K Link(s)
-        </a>
-       </td>
-       <td background="main_topbar.gif" align="right">
-       
-        <table border="0" cellpadding="0" cellspacing="0" width="8" height="100%">
-           <tr>
-             <td height="49" background="main_topbarseperator.gif">
-
-               &nbsp;
-             </td>
-           </tr>
-         </table>
-         
-       </td>
-       <td background="main_topbardarker.gif" align="center" valign="middle" class="tabs_five">
-         <a href="login.php">
-           <img src="arrow_down_logout.gif" align="absmiddle">
-           &nbsp; Logout
-         </a>
-
-       </td>
-      </tr>
-    </table>
-&nbsp;
-
-<?php
-
-function print_ident($i)
-{
-	while($i != 0) {
-		echo "\t";
-		$i--;
-	}
-}
-
-function print_item($it, $ident)
-{
-	print_ident($ident);
-	echo "<img src=\"tree-leaf.gif\">", $it, "<br>\n";
-}
-
-function print_folder($key, &$arr, $ident)
-{
-	print_ident($ident);
-	echo "<span class=\"trigger\" onClick=\"showBranch('br_",
-		$key, "');swapFolder('fl_", $key, "')\">\n";
-	print_ident($ident+1);
-	echo "<img src=\"tree-closed.gif\" border=\"0\" id=\"fl_", $key, "\">\n";
-	print_ident($ident+1);
-	echo $key, "<br>\n";
-	print_ident($ident);
-	echo "</span>\n";
-	print_ident($ident);
-	echo "<span class=\"branch\" id=\"br_", $key, "\">\n";
-
-	foreach ($arr as $k => $v) {
-		if ( count(&$v) ) {
-			print_folder($k, $v, $ident+1);
-		} else {
-			print_item($k, $ident+1);
-		}
-	}
-
-	print_ident($ident);
-	echo "</span>\n";
-}
-
-	$stattree = amule_load_vars("stats_tree");
-
-	print_folder("Statistics", $stattree, 1);
-?>
-
-  </body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/chicane/transparent.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/tree-closed.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/tree-leaf.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/tree-open.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/chicane/yellow.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/aMule.tmpl Deleted

@@ -1,984 +0,0 @@
-<--TMPL_VERSION-->
-4
-<--TMPL_VERSION_END-->
-
-<--TMPL_CATARROW-->
-<img src="arrow_right.gif" align="absmiddle">
-<--TMPL_CATARROW_END-->
-
-<--TMPL_HEADER-->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=[CharSet]">
-<META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-<title>[aMuleAppName] [version] - [WebControl]</title>
-[HeaderMeta]
-[StyleSheet]
-</head>
-<body bgcolor="#FBDE9C" text=white link="#3399FF" vlink="#3399FF" alink="#3399FF" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-<table border=0 width="100%" align=center cellpadding=4 cellspacing=0>
-<tr>
- <td class="tabs" align="left" colspan="2">
-  <table border="0" cellpadding="4" cellspacing="0">
-  <tr>
-	<td class="tabs" align="center">
-		&nbsp;<a href="http://www.amule.org" target="_blank"><img src="emule.gif"></a>
-		<font face="Tahoma" style="font-size:13pt;" color="#000000">[aMuleAppName]<br>[WebControl]</font>
-	</td>
-	<td class="tabs" align="center" width="30">	&nbsp;	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="#" onClick="self.location.href='?ses=[Session]&amp;w=server'; return false;">
-  			<img src="cp_servers.gif"><br>
-  			[Server]
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="#" onClick="self.location.href='?ses=[Session]&amp;w=transfer'; return false;">
-  			<img src="cp_download.gif"><br>
-  			[Transfer]
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="#" onClick="self.location.href='?ses=[Session]&amp;w=search'; return false;">
-  			<img src="cp_search.gif"><br>
-  			[Search]
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="#" onClick="self.location.href='?ses=[Session]&amp;w=shared'; return false;">
-  			<img src="cp_shared.gif"><br>
-  			[Shared]
-  		</a>
-  	<td align="center" class="tabs" width="110">
-		<a href="#" onClick="self.location.href='?ses=[Session]&amp;w=stats'; return false;">
-			<img src="cp_stats.gif"><br>
-  			[Stats]</a>
-  		<font color="#000000">|</font>
-  		<a href="#" onClick="self.location.href='?ses=[Session]&amp;w=graphs'; return false;">[Graphs]</a>
-  	</td>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="#" onClick="self.location.href='?ses=[Session]&amp;w=options'; return false;">
-  			<img src="cp_settings.gif"><br>
-  			[Options]
-  		</a>
-  	</td>
-  	<td class="tabs" align="center" width="30">&nbsp;</td>
-  	<td align="left" class="tabs" width="95">
-  		<img src="log.gif"> <a href="#" onClick="self.location.href='?ses=[Session]&amp;w=sinfo'; return false;">[ServerInfo]</a><br>
-  		<img src="log.gif"> <a href="#" onClick="self.location.href='?ses=[Session]&amp;w=log#end'; return false;">[Log]</a>
-  	</td>
-  </tr>
-  </table>
- </td>
-</tr>
-<tr>
-<td style="background-color: #000000; height: 1px" colspan="2">
-</td>
-</tr>
-<tr>
- <td class="tabs">
-  &nbsp;&nbsp;[Connected]&nbsp;<br>
-  &nbsp;&nbsp;[Speed]&nbsp; 
-  <font color=black>
-	<script language="javascript">
-	var d = new Date();
-	s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-	document.write(s);
-</script>
-  </font>
- </td>
- <td align=right class=tabs>
-  <form><input type="button" name="queue" value="[Logout]" onClick="self.location.href='?ses=[Session]&amp;w=logout'"></form>
- </td>
-</tr>
-</table>
-<--TMPL_HEADER_END-->
-<--TMPL_HEADER_META_REFRESH-->
-<meta http-equiv=refresh content="[RefreshVal]; url=?ses=[Session]&amp;w=[wCommand]">
-<--TMPL_HEADER_META_REFRESH_END-->
-<--TMPL_HEADER_STYLESHEET-->
-<style type="text/css">
-img
-{
-border : 0px;
-}
-a, a:active, a:link, a:visited
-{
-color: white;
-}
-.down-header, .down-header-left, .down-header-right,
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-header, .up-header-left, .up-line, .up-line-left,
-.server-header, .server-header-left, .server-line, .server-line-left,
-.shared-header, .shared-header-left, .shared-line, .shared-line-changed, 
-.shared-line-left, .shared-line-left-changed,
-.header, .smallheader, .commontext,
-.upqueue-header, .upqueue-line, .upqueue-line-left,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-font-family : Tahoma;
-font-size : 8pt;
-}
-.tabs
-{
-font-family : Tahoma;
-font-size : 10pt;
-background-color : #3399FF;
-}
-.down-header, .down-line, .down-line-good, .up-header, .up-line,
-.server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-.upqueue-header, .upqueue-line,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-text-align : center;
-}
-.down-header-left, .down-line-left, .down-line-good-left,
-.server-header-left, .server-line-left, .shared-header-left,
-.up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left
-{
-text-align : left;
-}
-.down-line-right, .down-line-good-right, .down-header-right
-{
-text-align : right;
-}
-.down-header, .down-header-left, .down-header-right,
-.up-header, .up-header-left, .server-header, .server-header-left,
-.shared-header, .shared-header-left, .upqueue-header,
-.websearch-header, .addserver-header
-{
-background-color : #0066CC;
-}
-.header
-{
-background-color : #0046AC;
-}
-.smallheader
-{
-background-color : #003399;
-color : #FFFFFF;
-}
-.commontext
-{
-background-color : #FFFFFF;
-color : #000000;
-}
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-line, .up-line-left, .server-line, .server-line-left,
-.shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-.upqueue-line, .upqueue-line-left,
-.websearch-line, .addserver-line
-{
-background-color : #3399FF;
-}
-.down-line-good, .down-line-good-left, .down-line-good-right, .shared-line-changed, .shared-line-left-changed
-{
-color : #F0F000;
-}
-.percent_table
-{
-border:0px solid #000000;
-border-collapse: collapse;
-}
-.message
-{
-font-size: 10pt;
-font-weight: bold;
-color: #FF0000;
-}
-.dinput
-{
-border-width: 1px;
-border-color: black;
-}
-</style>
-<--TMPL_HEADER_STYLESHEET_END-->
-<--TMPL_FOOTER-->
-</body>
-</html>
-<--TMPL_FOOTER_END-->
-<--TMPL_SERVER_LIST-->
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="95%">
-<tr>
-  <td align=center valign=top>
-[AddServerBox]<p>&nbsp;</p>
-[ConnectedServerData]
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=6 style="background-color: #000000"><b>[ServerList]</b></td>
-</tr>
-<tr>
- <td valign=middle class="server-header-left"><a href="?ses=[Session]&amp;w=server&amp;sort=name[SortName]"><b>[Servername]</b></a></td>
- <td valign=middle class="server-header"><a href="?ses=[Session]&amp;w=server&amp;sort=description[SortDescription]"><b>[Description]</b></a></td>
- <td valign=middle class="server-header"><a href="?ses=[Session]&amp;w=server&amp;sort=ip[SortIP]"><b>[Address]</b></a></td>
- <td valign=middle class="server-header"><a href="?ses=[Session]&amp;w=server&amp;sort=users[SortUsers]"><b>[Users]</b></a></td>
- <td valign=middle class="server-header"><a href="?ses=[Session]&amp;w=server&amp;sort=files[SortFiles]"><b>[Files]</b></a></td>
- <td valign=middle class="server-header"><b>[Actions]</b></td>
-</tr>
-[ServersList]
-</table>
- </td>
-</tr>
-</table>
-</font>
-<--TMPL_SERVER_LIST_END-->
-<--TMPL_SERVER_LINE-->
-<tr>
- <td valign=middle class="server-line-left">[1]</td>
- <td valign=middle class="server-line">[2]</td>
- <td valign=middle class="server-line">[3]</td>
- <td valign=middle class="server-line">[4]</td>
- <td valign=middle class="server-line">[5]</td>
- <td valign=middle class="server-line"><acronym title="[Connect]"><a href="[6]" style="text-decoration: none"><img src="l_connect.gif" alt="[Connect]"></a></acronym>
-<acronym title="[RemoveServer]"><a href="[LinkRemove]" onclick="return confirm('[ConfirmRemove]')"><img src="l_cancel.gif" alt="[RemoveServer]"></a></acronym>
-</td>
-</tr>
-<--TMPL_SERVER_LINE_END-->
-<--TMPL_TRANSFER_IMAGES-->
-<font face=Tahoma style="font-size:8pt;">
-</font>
-&nbsp;
-<--TMPL_TRANSFER_IMAGES_END-->
-<--PROGRESSBARWIDTH-->
-200
-<--PROGRESSBARWIDTH_END-->
-<--PROGRESSBARIMGS-->
-<img src="[PROGRESSGIFNAME]" height=12 width=[PROGRESSGIFINTERNAL]>
-<--PROGRESSBARIMGS_END-->
-<--PROGRESSBARPERCENTIMG-->
-<img src="[PROGRESSGIFNAME]" height=4 width=[PROGRESSGIFINTERNAL]>
-<--PROGRESSBARPERCENTIMG_END-->
-<--TMPL_TRANSFER_LIST-->
-<table border=0 align=center cellpadding=4 cellspacing=0 width="95%">
-<tr>
- <td align=center valign=middle>
-[DownloadHeader]
-[DownloadFileList]
-[DownloadFooter]
-&nbsp;
-[UploadHeader]
-[UploadFileList]
-[UploadFooter]
-&nbsp;
-[UploadQueue]
-</td>
-</tr>
-</table>
-<--TMPL_TRANSFER_LIST_END-->
-<--TMPL_TRANSFER_DOWN_HEADER-->
-
-<script type="text/javascript">
-
-</script>
-
-<font face=Tahoma style="font-size:8pt;">
-<table border=0 align=center cellpadding=3 cellspacing=0 width="100%" bgcolor="#99CCFF">
-<tr>
- <td class="smallheader" style="background-color: #000000" colspan="8"><img src="arrow_down.gif"> <b>[DownloadList]</b></td>
- <td align="right" class="smallheader" style="background-color: #000000">[CATBOX]</td>
-</tr>
-<tr>
- <td valign=middle class="down-header-left"><a href="?ses=[Session]&amp;w=transfer&amp;sort=name[SortName][CatSel]"><b>[Filename]</b></a></td>
- <td valign=middle class="down-header"><a href="?ses=[Session]&amp;w=transfer&amp;sort=size[SortSize][CatSel]"><b>[Size]</b></a></td>
- <td valign=middle class="down-header"><a href="?ses=[Session]&amp;w=transfer&amp;sort=completed[SortCompleted][CatSel]"><b>[Completed]</b></a></td>
- <td valign=middle class="down-header"><a href="?ses=[Session]&amp;w=transfer&amp;sort=transferred[SortTransferred][CatSel]"><b>[Transferred]</b></a></td>
- <td valign=middle class="down-header"><a href="?ses=[Session]&amp;w=transfer&amp;sort=progress[SortProgress][CatSel]"><b>[Progress]</b></a></td>
- <td valign=middle class="down-header"><a href="?ses=[Session]&amp;w=transfer&amp;sort=speed[SortSpeed][CatSel]"><b>[Speed]</b></a></td>
- <td valign=middle class="down-header"><b>[Sources]</b></td>
- <td valign=middle class="down-header"><b>[Prio]</b></td>
- <td valign=middle class="down-header"><b>[Actions]</b></td>
-</tr>
-<--TMPL_TRANSFER_DOWN_HEADER_END-->
-<--TMPL_TRANSFER_DOWN_FOOTER-->
-<tr>
- <td valign=middle class="down-header-left"><b>[TotalDown]</b></td>
- <td valign=middle class="down-header-right"><b>[TotalDownSize]</b></td>
- <td valign=middle class="down-header-right"><b>[TotalDownCompleted]</b></td>
- <td valign=middle class="down-header-right"><b>[TotalDownTransferred]</b></td>
- <td valign=middle class="down-header">&nbsp;</td>
- <td valign=middle class="down-header-right"><b>[TotalDownSpeed]</b></td>
- <td valign=middle class="down-header">&nbsp;</td>
- <td valign=middle class="down-header">&nbsp;</td>
- <td valign=middle class="down-header">[ClearCompletedButton]</td>
-</tr>
-</table>
-<--TMPL_TRANSFER_DOWN_FOOTER_END-->
-<--TMPL_TRANSFER_DOWN_LINE-->
-<tr>
- <td valign=top class="down-line-left"><acronym title="[FileInfo]">[ShortFileName]</acronym></td>
- <td valign=top class="down-line-right">[2]</td>
- <td valign=top class="down-line-right">[3]</td>
- <td valign=top class="down-line-right">[4]</td>
- <td valign=middle class="down-line">
- <table width=[PROGRESSBARWIDTHVAL] height=11 border=1 class="percent_table" cellpadding=0 cellspacing=0 bordercolor="#000000"><tr><td>
- [DownloadBar]</td></tr></table></td>
- <td valign=top class="down-line-right">[5]</td>
- <td valign=top class="down-line">[6]</td>
- <td valign=top class="down-line">[PrioVal]</td>
- <td valign=top class="down-line">[7]</td>
-</tr>
-<--TMPL_TRANSFER_DOWN_LINE_END-->
-<--TMPL_TRANSFER_DOWN_LINE_GOOD--> 
-<tr>
-<td valign=top class="down-line-left"><acronym title="[FileInfo]">[ShortFileName]</acronym></td>
-<td valign=top class="down-line-right">[2]</td>
-<td valign=top class="down-line-right">[3]</td>
-<td valign=top class="down-line-right">[4]</td>
-<td valign=middle class="down-line">
-<table width=[PROGRESSBARWIDTHVAL] height=11 border=1 class="percent_table" cellpadding=0 cellspacing=
-0 bordercolor="#000000"><tr><td>
-[DownloadBar]</td></tr></table></td>
-<td valign=top class="down-line-right">[5]</td>
-<td valign=top class="down-line">[6]</td>
-<td valign=top class="down-line">[PrioVal]</td>
-<td valign=top class="down-line">[7]</td>
-</tr>
-<--TMPL_TRANSFER_DOWN_LINE_GOOD_END-->
-<--TMPL_TRANSFER_UP_HEADER-->
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=4 style="background-color: #000000"><img src="arrow_up.gif"> <b>[UploadList]</b></td>
-</tr>
-<tr>
- <td class="up-header-left"><b>[User]</b></td>
- <td class="up-header"><b>[Filename]</b></td>
- <td class="up-header"><b>[Transferred]</b></td>
- <td class="up-header"><b>[Speed]</b></td>
-</tr>
-<--TMPL_TRANSFER_UP_HEADER_END-->
-<--TMPL_TRANSFER_UP_FOOTER-->
-<tr>
- <td class="up-header-left"><b>[TotalUp]</b></td>
- <td class="up-header"></td>
- <td class="up-header"><b>[TotalUpTransferred]</b></td>
- <td class="up-header"><b>[TotalUpSpeed]</b></td>
-</tr>
-</table>
-<--TMPL_TRANSFER_UP_FOOTER_END-->
-<--TMPL_TRANSFER_UP_LINE-->
-<tr>
- <td valign=top class="up-line-left"><acronym title="[FileInfo]">[1]</acronym></td>
- <td valign=top class="up-line-left"><acronym title="[FileInfo]">[2]</acronym></td>
- <td valign=top class="up-line">[3]</td>
- <td valign=top class="up-line">[4]</td>
-</tr>
-<--TMPL_TRANSFER_UP_LINE_END-->
-<--TMPL_TRANSFER_UP_QUEUE_SHOW-->
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=4 style="background-color: #000000"><b>[UploadQueueList]</b></td>
-</tr>
-<tr>
- <td class="upqueue-header"><b>[UserNameTitle]</b></td>
- <td class="upqueue-header"><b>[FileNameTitle]</b></td>
- <td class="upqueue-header"><b>[ScoreTitle]</b></td>
- <td class="upqueue-header"><b>[BannedTitle]</b></td>
-</tr>
-[QueueList]
-</table>
-<p align=center>
-<form><input type="button" name="queue" value="[HideQueue]" onClick="self.location.href='/?ses=[Session]&amp;w=transfer&amp;showuploadqueue=false[CatSel]'"></form>
-&nbsp;
-</p>
-<--TMPL_TRANSFER_UP_QUEUE_SHOW_END-->
-<--TMPL_TRANSFER_UP_QUEUE_LINE-->
-<tr>
- <td valign=top class="upqueue-line-left">[UserName]</td>
- <td valign=top class="upqueue-line">[FileName]</td>
- <td valign=top class="upqueue-line">[Score]</td>
- <td valign=top class="upqueue-line">[Banned]</td>
-</tr>
-<--TMPL_TRANSFER_UP_QUEUE_LINE_END-->
-<--TMPL_TRANSFER_UP_QUEUE_HIDE-->
-<p align=center>
-<form><input type="button" name="queue" value="[ShowQueue]" onClick="self.location.href='/?ses=[Session]&amp;w=transfer&amp;showuploadqueue=true[CatSel]'"></form>
-&nbsp;
-</p>
-</font>
-<--TMPL_TRANSFER_UP_QUEUE_HIDE_END-->
-<--TMPL_TRANSFER_BAD_LINK-->
-<div class="message">[InvalidLink]<br>[Link]</div>
-<--TMPL_TRANSFER_BAD_LINK_END-->
-<--TMPL_TRANSFER_DOWN_CLEARBUTTON-->
-<form><input type="button" name="ClCompl" value="[CLEARCOMPLETED]" onClick="self.location.href='/?ses=[Session]&amp;w=transfer&amp;ClCompl=yes&amp;[CatSel]'"></form>
-<--TMPL_TRANSFER_DOWN_CLEARBUTTON_END-->
-<--TMPL_DOWNLOAD_LINK-->
-&nbsp;
-<table align=center border=0 cellpadding=4 cellspacing=0 width="80%">
-<tr>
-<td align=center class="shared-header">
-<p><font face=Tahoma style="font-size:10pt;"><b>[Download]</b></font></p>
-</td>
-</tr>
-<tr>
- <td align=center valign=top class=tabs>
-  <form action="/" method="GET">
-   <font face=Tahoma style="font-size:10pt;">&nbsp;<br>[Ed2klink]<br><br>
-   <input type="hidden" name=ses value="[Session]">
-   <input type="hidden" name="w" value="transfer">
-   <textarea name="c" cols="94" rows="7" class=dinput></textarea>
-   <br><br><input type=submit value="[Start]"></font>[CATBOX]
-  </form><br>
- </td>
-</tr>
-</table>
-<--TMPL_DOWNLOAD_LINK_END-->
-<--TMPL_SHARED_LIST-->
-<font face=Tahoma style="font-size:8pt;">
-<table align=center border=0 cellpadding=4 cellspacing=0 width="95%">
-<tr>
-<td valign=middle class="shared-header-left"><a href="?ses=[Session]&amp;w=shared&amp;sort=name[SortName]"><b>File Name</b></a></td>
-<td valign=middle class="shared-header">
-	<a href="?ses=[Session]&amp;w=shared&amp;sort=transferred[SortTransferred]"><b>Transferred Data</b></a>&nbsp
-	<a href="?ses=[Session]&amp;w=shared&amp;sort=alltimetransferred[SortAllTimeTransferred]">(Total)
-</td>
-<td valign=middle class="shared-header">
-	<a href="?ses=[Session]&amp;w=shared&amp;sort=requests[SortRequests]"><b>Requests</b></a>&nbsp
-	<a href="?ses=[Session]&amp;w=shared&amp;sort=alltimerequests[SortAllTimeRequests]"><b>(Total)</b></a>&nbsp
-</td>
-<td valign=middle class="shared-header">
-	<a href="?ses=[Session]&amp;w=shared&amp;sort=accepts[SortAccepts]"><b>Accepted Requests</b></a>&nbsp
-	<a href="?ses=[Session]&amp;w=shared&amp;sort=alltimeaccepts[SortAllTimeAccepts]"><b>(Total)</b></a>
-</td>
-<td valign=middle class="shared-header"><a href="?ses=[Session]&amp;w=shared&amp;sort=size[SortSize]"><b>Size</b></a></td>
-<td valign=middle class="shared-header"><a href="?ses=[Session]&amp;w=shared&amp;sort=priority[SortPriority]"><b>Priority</b></a></td>
-<td valign=middle width="10%" class="shared-header"><b>ED2K Link(s)</b></td>
-</tr>
-<p align=center><div class="message">[Message]</div></p><br>
-[SharedFileList]
-</table>
-<p align="center">
-<form><input type="button" name="queue" value="[Reload]" onClick="self.location.href='/?ses=[Session]&amp;w=shared&amp;reload=true'"></form>
-&nbsp;
-</p>
-<--TMPL_SHARED_LIST_END-->
-<--TMPL_SHARED_LINE-->
-<tr>
- <td valign=top class="shared-line-left"><acronym title="[FileName]
-Hash: [FileHash]">[ShortFileName]</acronym></td>
- <td valign=top class="shared-line">[FileTransferred]([FileAllTimeTransferred])</td>
- <td valign=top class="shared-line">[FileRequests]([FileAllTimeRequests])</td>
- <td valign=top class="shared-line">[FileAccepts]([FileAllTimeAccepts])</td>
- <td valign=top class="shared-line">[FileSize]</td>
- <td valign=top class="shared-line">[Priority]</td>
- <td valign=top class="shared-line">
-<acronym title="ED2K Link(s)"><a href="[FileLink]"><img src="l_ed2klink.gif" alt="ED2K Link(s)"></a></acronym>
-<acronym title="Increase Priority"><a href="?ses=[Session]&amp;w=shared&[PriorityUpLink]"><img src="l_up.gif" alt="[PriorityUp]"></a></acronym>
-<acronym title="Decrease Priority"><a href="?ses=[Session]&amp;w=shared&[PriorityDownLink]"><img src="l_down.gif" alt="[PriorityDown]"></a></acronym>
-</td>
-</tr>
-<--TMPL_SHARED_LINE_END-->
-<--TMPL_SHARED_LINE_CHANGED-->
-<tr>
- <td valign=top class="shared-line-left-changed"><acronym title="[FileName]
-Hash: [FileHash]">[ShortFileName]</acronym></td>
- <td valign=top class="shared-line-changed">[FileTransferred]([FileAllTimeTransferred])</td>
- <td valign=top class="shared-line-changed">[FileRequests]([FileAllTimeRequests])</td>
- <td valign=top class="shared-line-changed">[FileAccepts]([FileAllTimeAccepts])</td>
- <td valign=top class="shared-line-changed">[FileSize]</td>
- <td valign=top class="shared-line-changed">[Priority]</td>
- <td valign=top class="shared-line-changed">
-<acronym title="ED2K Link(s)"><a href="[FileLink]"><img src="l_ed2klink.gif" alt=""ED2K Link(s)></a></acronym>
-<acronym title="Increase Priority"><a href="?ses=[Session]&amp;w=shared&[PriorityUpLink]"><img src="l_up.gif" alt="[PriorityUp]"></a></acronym>
-<acronym title="Decrease Priority"><a href="?ses=[Session]&amp;w=shared&[PriorityDownLink]"><img src="l_down.gif" alt="[PriorityDown]"></a></acronym>
-</td>
-</tr>
-</font>
-<--TMPL_SHARED_LINE_CHANGED_END-->
-<--TMPL_GRAPHS-->
-<SCRIPT language=JavaScript>
-   function traceGraph(SpeedString,GraphColor,MaxSpeed) {
-         document.write('<table cellspacing=0 border=0 cellpadding=0 width="[GraphWidth]px"><tr><td valign="bottom" height="[GraphHeight]px" width="100%"></td>');
-         var speed = SpeedString.split(",");
-         if(MaxSpeed==0) MaxSpeed = 1; //No divide by 0 !
-         for(i=0;i<speed.length;i++) {
-                 speed[i]=new Number(speed[i])
-                 if (speed[i]>MaxSpeed) speed[i]=MaxSpeed;
-                 size=Math.round(speed[i]*[GraphHeight]/MaxSpeed);
-                 document.write('<td valign="bottom"><table height="'+ size +'px" width="1px" border=0 cellpadding=0 cellspacing=0><td bgcolor="' + GraphColor + '" height="100%" width="100%"></td></table></td>');
-   	 }
-    	 document.write('</tr></table>');
-}
-</SCRIPT>
-&nbsp;
-<table border=0 align=center cellpadding=0 cellspacing=0>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td style="border-width:1px; border-color:green; border-style:solid; background-position: bottom left;" valign="bottom" height="[GraphHeight]px" background="back.gif">
-<SCRIPT language=JavaScript>
-	var dlstring="[GraphDownload]";
-	traceGraph(dlstring,"green",[MaxDownload]*1024);
-</SCRIPT>
-</td></tr></table>
-</td></tr>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td align=center><font color=black><font face=Tahoma style="font-size:8pt;">[TxtDownload]: Max [MaxDownload] [KByteSec], [TxtTime]: [ScaleTime]</font><br>&nbsp;</td></tr></table>
-</td></tr>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td style="border-width:1px; border-color:red; border-style:solid; background-position: bottom left;" valign="bottom" height="[GraphHeight]px" background="back.gif">
-<SCRIPT language=JavaScript>
-	var ulstring="[GraphUpload]";
-	traceGraph(ulstring,"red",[MaxUpload]*1024);
-</SCRIPT>
-</td></tr></table>
-</td></tr>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td align=center><font color=black><font face=Tahoma style="font-size:8pt;">[TxtUpload]: Max [MaxUpload] [KByteSec], [TxtTime]: [ScaleTime]</font><br>&nbsp;</td></tr></table>
-</td></tr>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td style="border-width:1px; border-color:blue; border-style:solid; background-position: bottom left;" valign="bottom" height="[GraphHeight]px" background="back.gif">
-<SCRIPT language=JavaScript>
-	var connstring="[GraphConnections]";
-	traceGraph(connstring,"blue",[MaxConnections]);
-</SCRIPT>
-</td></tr></table>
-</td></tr>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td align=center><font color=black><font face=Tahoma style="font-size:8pt;">[TxtConnections]: Max [MaxConnections], [TxtTime]: [ScaleTime]</font></td></tr></table>
-</td></tr>
-<tr><td>
-<table border=0 align=center cellpadding=0 cellspacing=0><tr><td>
-<br>
-<form action="/" method="GET">
-<input type="hidden" name=ses value="[Session]">
-<input type="hidden" name=w value=graphs>
-<input type="hidden" name=refetch value=yes>
-<input type=submit value="[Refetch]" class="ibutton">
-</form>
-</td></tr></table>
-</td></tr>
-</table>
-<--TMPL_GRAPHS_END-->
-<--TMPL_LOG-->
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="80%">
-<tr>
-<td align=left valign=middle class="commontext">
-<font color="#000000" face="Lucida Console"><pre>[Log]</pre></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=middle>
-<form action="/" method="GET">
-<input type="hidden" name=ses value="[Session]">
-<input type="hidden" name=w value=log>
-<input type="hidden" name=clear value=yes>
-<input type=submit value="[Clear]" class="ibutton"></form>
-</td>
-</tr>
-</table>
-<--TMPL_LOG_END-->
-<--TMPL_SERVERINFO-->
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="80%">
-<tr>
-<td align=left valign=middle class="commontext">
-<font color="#000000" face="Lucida Console"><pre>[ServerInfo]</pre></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=middle>
-<form action="/" method="GET">
-<input type="hidden" name=ses value="[Session]">
-<input type="hidden" name=w value=sinfo>
-<input type="hidden" name=clear value=yes>
-<input type=submit value="[Clear]"></form>
-</td>
-</tr>
-</table>
-<--TMPL_SERVERINFO_END-->
-<--TMPL_DEBUGLOG-->
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="80%">
-<tr>
-<td align=left valign=middle class="commontext">
-<font color="#000000" face="Lucida Console"><pre>[DebugLog]</pre></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=middle>
-<form action="/" method="GET">
-<input type="hidden" name=ses value="[Session]">
-<input type="hidden" name=w value=debuglog>
-<input type="hidden" name=clear value=yes>
-<input type=submit value="[Clear]"></form>
-</td>
-</tr>
-</table>
-<--TMPL_DEBUGLOG_END-->
-<--TMPL_STATS-->
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="80%">
-<tr>
-<td align=left valign=middle class="commontext">
-<font color="#000000" face="Lucida Console"><pre>[STATSDATA]</pre></font>
-</td>
-</tr>
-</table>
-&nbsp;
-<--TMPL_STATS_END-->
-<--TMPL_PREFERENCES-->
-<form action="/" method="GET">
-<input type="hidden" name=ses value="[Session]">
-<input type="hidden" name=w value=options>
-<input type="hidden" name=saveprefs value="true">
-<table border=0 align=center cellpadding=4 cellspacing=0 width="90%">
-<tr><td><font face=Tahoma style="font-size:10pt;" color=black>[WebControl]</font></td></tr>
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[UseGzipForm]</b></font><input type="checkbox" name=gzip [UseGzipVal]>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;[UseGzipComment]
-</font>
-<br>
-</td></tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[ShowUploadQueueForm]</b></font><input type="checkbox" name=showuploadqueue [ShowUploadQueueVal]>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;[ShowUploadQueueComment]<br>
-</font>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[RefreshTimeForm]</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;[RefreshTimeComment] <input type="text" name=refresh size="5" class=dinput value="[RefreshVal]"><br>
-</font>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[GraphSettings]</b></font>
-</td>
-</tr>
-<tr><td align=left valign=top bgcolor="#3399FF">
-<table border=0>
-<tr><td><font face=Tahoma style="font-size:8pt;">[GraphWidthText]</font></td>
-<td><input type="text" name=gwidth size="5" class=dinput value="[GraphWidth]"></td>
-<td><font face=Tahoma style="font-size:8pt;">[pixels]</font></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">[GraphHeightText]</font></td>
-<td><input type="text" name=gheight size="5" class=dinput value="[GraphHeight]"></td>
-<td><font face=Tahoma style="font-size:8pt;">[pixels]</font></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">[GraphScaleText]</font></td>
-<td><input type="text" name=gscale size="5" class=dinput value="[GraphScale]"></td>
-<td><font face=Tahoma style="font-size:8pt;">[seconds]</font></td></tr>
-</table>
-</td></tr>
-
-<tr><td><br><font face=Tahoma style="font-size:10pt;" color=black>[aMuleAppName]</font></td></tr>
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[SpeedForm]</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;[MaxDown]: <input type="text" name=maxdown size="5" class=dinput value="[MaxDownVal]"> [KBS]
-&nbsp;&nbsp;[MaxUp]: <input type="text" name=maxup size="5" class=dinput value="[MaxUpVal]"> [KBS]
-</font>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[SpeedCapForm]</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;[MaxCapDown]: <input type="text" name=maxcapdown size="5" class=dinput value="[MaxCapDownVal]"> [KBS]
-&nbsp;&nbsp;[MaxCapUp]: <input type="text" name=maxcapup size="5" class=dinput value="[MaxCapUpVal]"> [KBS]
-</font>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[LimitForm]</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<table border=0>
-<tr><td><font face=Tahoma style="font-size:8pt;">[MaxSources]</font></td><td><input type="text" name=maxsources size="5" class=dinput value="[MaxSourcesVal]"></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">[MaxConnections]</font></td><td><input type="text" name=maxconnections size="5" class=dinput value="[MaxConnectionsVal]"></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">[MaxConnectionsPer5]</font></td><td><input type="text" name=maxconnectionsperfive size="5" class=dinput value="[MaxConnectionsPer5Val]"></td></tr>
-</table>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>[FileSettings]</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<table border=0>
-<tr><td><font face=Tahoma style="font-size:8pt;">[TryFullChunks]</font></td><td><input type="checkbox" name="fullchunks" [FullChunksVal]></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">[FirstAndLast]</font></td><td><input type="checkbox" name="firstandlast" [FirstAndLastVal]></td></tr>
-</table>
-</td>
-</tr>
-
-<tr>
-<td align=center><br><input type=submit value="[Apply]"></td>
-</tr>
-
-</table>
-</form>
-&nbsp;
-<--TMPL_PREFERENCES_END-->
-<--TMPL_LOGIN-->
-<html>
-<meta http-equiv="content-type" content="text/html; charset=[CharSet]">
-<head>
-<title>[aMuleAppName] [version] - [WebControl]</title>
-<style type="text/css">
-.ibutton
-{
-cursor:hand;
-position:relative;
-top:5;
-font-weight: bold;
-font-family: Tahoma, Verdana, Arial;
-font-size: 11px;
-}
-</style>
-</head>
-<body bgcolor="#CCCCCC" text=white link=white vlink=white alink=white onload="javascript:document.login.p.focus();">
-<table align=center border=0 cellpadding=4 cellspacing=0 width="100%" height="100%">
-<tr><td align=center valign=middle>
-<table align=center border=0 cellpadding=4 cellspacing=0>
-<tr>
-<td align=center bgcolor="#0066CC">
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://www.amule.org" target="_blank"><img src="logo.jpg"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<p><font face=Tahoma style="font-size:10pt;"><b>[WebControl]</b><br>[Login]</font></p>
-</td>
-</tr>
-<tr>
-<td align=center valign=top bgcolor="#3399FF">
-<form action="" method="POST" name="login">
-<font face=Tahoma style="font-size:10pt;">&nbsp;<br>[EnterPassword]<br><br>
-<input type="password" name=p size=37 style="border-width: 1px; border-color: black; border-style:none;" value="">
-<input type="hidden" name=w value="password">
-<br><br><input type=submit value="[LoginNow]"></font>
-</form>
-</font><br>
-</td>
-</tr>
-</table>
-</td>
-</tr>
-</table>
-</body>
-</html>
-<--TMPL_LOGIN_END-->
-<--TMPL_CONNECTED_SERVER-->
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=5 style="background-color: #000000"><b>[ConnectedServer]</b></td>
-</tr>
-<tr>
- <td valign=middle class="server-header"><b>[Status]</b></td>
- <td valign=middle class="server-header"><b>[Servername]</b></td>
- <td valign=middle class="server-header"><b>[Usercount]</b></td>
- <td valign=middle class="server-line"><a href="[URL_Disconnect]">[Disconnect]</a></td>
- <td valign=middle class="server-header"><a href="[URL_ServerOptions]">[ServerOptions]</a></td>
-</tr>
-<tr>
- <td valign=middle class="server-line">[1]</td>
- <td valign=middle class="server-line">[2]</td>
- <td valign=middle class="server-line">[3]</td>
- <td valign=middle class="server-header"><a href="[URL_Connect]">[Connect]</a></td>
- <td valign=middle class="server-line"></td>
-</tr>
-</table>
-&nbsp;
-<--TMPL_CONNECTED_SERVER_END-->
-<--TMPL_ADDSERVERBOX-->
-<div class="message">[Message]</div>
-<table border=0 align=center cellpadding=4 cellspacing=0 width="40%">
-<tr>
-<td valign=middle class="addserver-header"><img src="add_server.gif"> <b>[AddServer]</b></td>
-</tr>
-<tr>
- <td valign=middle class="addserver-line">
-<form action="" method="GET">
-  [IP] <input name="serveraddr" type="text" size="15">
-  [Port] <input name="serverport" type="text" size="6"><br>
-  [Name] <input name="servername" type="text" size="30"><br>
-  <input type="hidden" name=ses value="[Session]">
-  <input type="hidden" name=w value="server">
-  <input type="hidden" name=c value="options">
-  <input name="addserver" type="hidden" value="true"><br>
-  <input type="submit" value="[Add]">
-</form>
- </td>
-</tr>
-<tr>
-<td valign=middle class="addserver-header"><img src="add_server.gif"> <b>[UpdateServerMetFromURL]</b></td>
-</tr>
-<tr>
- <td valign=middle class="addserver-line">
-<form action="" method="GET">
-  [URL] <input name="servermeturl" type="text" size="30"><br>
-  <input type="hidden" name=ses value="[Session]">
-  <input type="hidden" name=w value="server">
-  <input type="hidden" name=c value="options">
-  <input name="updateservermetfromurl" type="hidden" value="true"><br>
-  <input type="submit" value="[Apply]">
-</form>
- </td>
-</tr>
-</table>
-<--TMPL_ADDSERVERBOX_END-->
-<--TMPL_WEBSEARCH-->
-<form action="" method="GET">
-<table border=0 align=center cellpadding=4 cellspacing=0 width="40%">
-<tr>
-<td valign=middle class="websearch-header"><b>[WebSearch]</b></td>
-</tr>
-<tr>
- <td valign=middle class="websearch-line">
-  [Name] <input name="tosearch" type="text" size="15">
-  <br><br>
-  [Type] <select name="media">
-  <option value="Any">[Any]</option>
-  <option value="Archives">[Archives]</option>
-  <option value="Audio">[Audio]</option>
-  <option value="CD-Images">[CD-Images]</option>
-  <option value="Pictures">[Pictures]</option>
-  <option value="Programs">[Programs]</option>
-  <option value="Texts">[Texts]</option>
-  <option value="Videos">[Videos]</option>
-  </select>
-  <br><br>
-  <input type="hidden" name=ses value="[Session]">
-  <input type="hidden" name=w value="websearch">
-  <input type="submit" value="[Search]">
-  <br>
-  &nbsp;
- </td>
-</tr>
-</table>
-</form>
-<--TMPL_WEBSEARCH_END-->
-<--TMPL_SEARCH-->
-<p align=center><div class="message">[Message]</div></p><br>
-<table border=0 align=center cellpadding=4 cellspacing=0 width="85%">
-<tr>
-<td valign=middle class="websearch-header"><b><font face=Tahoma style="font-size:10pt;">[Result]</font></b>&nbsp;&nbsp;(<a align="right" href="javascript:self.location.href='?ses=[Session]&amp;w=search'"><font face=Tahoma style="font-size:8pt;">[RefetchResults]</font></a>)</td>
-</tr>
-<tr>
-<td valign=middle class="websearch-line">
-<form action="" method="GET">
-<table border=0 align=center cellpadding=4 cellspacing=0>
-<input type="hidden" name=ses value="[Session]">
-<input type="hidden" name=w value="search">
-[RESULTLIST]
-</table>
-<input type="submit" value="[Download]">
-[CATBOX]
-</form>
-<br>
-&nbsp;
-</table>
-<br>
-<form action="" method="GET">
-<table border=0 align=center cellpadding=4 cellspacing=0 width="250">
-<tr>
-<td valign=middle class="websearch-header"><b><font face=Tahoma style="font-size:10pt;">[Search]</font></b></td>
-</tr>
-<tr>
- <td valign=middle class="websearch-line">
-  <table>
-  <tr><td class=tabs width=150>[Name]</td><td><input name="tosearch" type="text" size="40"></td></tr>
-  <tr><td class=tabs>[Type]</td><td><select name="type">
-  <option value="Any">[Any]</option>
-  <option value="Archives">[Archives]</option>
-  <option value="Audio">[Audio]</option>
-  <option value="CD-Images">[CD-Images]</option>
-  <option value="Pictures">[Pictures]</option>
-  <option value="Programs">[Programs]</option>
-  <option value="Texts">[Texts]</option>
-  <option value="Videos">[Videos]</option>
-  </select>
-  </td></tr>
-  <tr><td class=tabs>[SizeMin]</td><td><input name="min" type="text" size="10"></td></tr>
-  <tr><td class=tabs>[SizeMax]</td><td><input name="max" type="text" size="10"></td></tr>
-  <tr><td class=tabs>[Availabl]</td><td><input name="avail" type="text" size="10"></td></tr>
-  <tr><td class=tabs>[Extention]</td><td><input name="ext" type="text" size="10"></td></tr>
-
-  <tr><td class=tabs>[METHOD]</td><td><input value="server" type="radio" name="method" checked>[USESSERVER]</td></tr>
-  <tr><td class=tabs></td><td><input value="global" type="radio" name="method">[Global]</td></tr>
-
-  </table>
-  <br>
-  <input type="hidden" name=ses value="[Session]">
-  <input type="hidden" name=w value="search">
-  <input type="submit" value="[Search]">
-  <br>
-  &nbsp;
-</td>
-</tr>
-</table>
-<p align="center"><input type="button" name="ed2klink" value="ed2k:// [Download]" onClick="self.location.href='?ses=[Session]&amp;w=download'"></p>
-<p align="center"><input type="button" name="queue" value="[WebSearch]" onClick="self.location.href='?ses=[Session]&amp;w=websearch'"></p>
-</form>
-<br>
-<--TMPL_SEARCH_END-->
-<--TMPL_SEARCH_RESULT_HEADER-->
-<tr>
-<td class="websearch-line"><b><font face=Tahoma style="font-size:8pt;"><a href="?ses=[Session]&amp;w=search&amp;sort=name[SortName]">[Filename]</a></font></b></td>
-<td class="websearch-line" width=50><b><font face=Tahoma style="font-size:8pt;"><a href="?ses=[Session]&amp;w=search&amp;sort=size[SortSize]">[Filesize]</a></font></b></td>
-<td class="websearch-line"><b><font face=Tahoma style="font-size:8pt;"><a href="?ses=[Session]&amp;w=search&amp;sort=sources[SortSources]">[Sources]</a></b></td>
-<td class="websearch-line" width=100><b><font face=Tahoma style="font-size:8pt;">[Download]</font></b></td>
-</tr>
-<--TMPL_SEARCH_RESULT_HEADER_END-->
-<--TMPL_SEARCH_RESULT_LINE-->
-<tr><td align="left"><font face=Tahoma style="font-size:8pt;">[FILENAME]</font></td><td class="websearch-line"><font face=Tahoma style="font-size:8pt;">[FILESIZE]</font></td><td class="websearch-line"><font face=Tahoma style="font-size:8pt;">[SOURCECOUNT]</font></td><td class="websearch-line"><input type="checkbox" name="downloads" value="[FILEHASH]"></td></tr>
-<--TMPL_SEARCH_RESULT_LINE_END-->

aMule-2.2.6.tar.bz2/src/webserver/default/add_server.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/arrow_down.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/arrow_right.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/arrow_up.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/back.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/cp_download.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/cp_kad.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/cp_search.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/cp_servers.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/cp_settings.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/cp_shared.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/cp_stats.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/downloads.php Deleted

@@ -1,486 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<meta http-equiv="pragmas" content="no-cache">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-	
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"],
-			'; url=downloads.php', '">';
-	}
-?>
-<style type="text/css">
-img
-{
-border : 0px;
-}
-a, a:active, a:link, a:visited
-{
-color: white;
-}
-.down-header, .down-header-left, .down-header-right,
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-header, .up-header-left, .up-line, .up-line-left,
-.server-header, .server-header-left, .server-line, .server-line-left,
-.shared-header, .shared-header-left, .shared-line, .shared-line-changed, 
-.shared-line-left, .shared-line-left-changed,
-.header, .smallheader, .commontext,
-.upqueue-header, .upqueue-line, .upqueue-line-left,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-font-family : Tahoma;
-font-size : 8pt;
-}
-.tabs
-{
-font-family : Tahoma;
-font-size : 10pt;
-background-color : #3399FF;
-}
-.down-header, .down-line, .down-line-good, .up-header, .up-line,
-.server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-.upqueue-header, .upqueue-line,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-text-align : center;
-}
-.down-header-left, .down-line-left, .down-line-good-left,
-.server-header-left, .server-line-left, .shared-header-left,
-.up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left
-{
-text-align : left;
-}
-.down-line-right, .down-line-good-right, .down-header-right
-{
-text-align : right;
-}
-.down-header, .down-header-left, .down-header-right,
-.up-header, .up-header-left, .server-header, .server-header-left,
-.shared-header, .shared-header-left, .upqueue-header,
-.websearch-header, .addserver-header
-{
-background-color : #0066CC;
-}
-.header
-{
-background-color : #0046AC;
-}
-.smallheader
-{
-background-color : #003399;
-color : #FFFFFF;
-}
-.commontext
-{
-background-color : #FFFFFF;
-color : #000000;
-}
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-line, .up-line-left, .server-line, .server-line-left,
-.shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-.upqueue-line, .upqueue-line-left,
-.websearch-line, .addserver-line
-{
-background-color : #3399FF;
-}
-.down-line-good, .down-line-good-left, .down-line-good-right, .shared-line-changed, .shared-line-left-changed
-{
-color : #F0F000;
-}
-.percent_table
-{
-border:0px solid #000000;
-border-collapse: collapse;
-}
-.message
-{
-font-size: 10pt;
-font-weight: bold;
-color: #FF0000;
-}
-.dinput
-{
-border-width: 1px;
-border-color: black;
-}
-</style>
-</head>
-<body bgcolor="#FBDE9C" text=white link="#3399FF" vlink="#3399FF" alink="#3399FF" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-<table border=0 width="100%" align=center cellpadding=4 cellspacing=0>
-<tr>
- <td class="tabs" align="left" colspan="2">
-
-  <table border="0" cellpadding="4" cellspacing="0">
-  <tr>
-	<td class="tabs" align="center">
-		&nbsp;<a href="http://www.amule.org" target="_blank"><img src="emule.gif"></a>
-		<font face="Tahoma" style="font-size:13pt;" color="#000000">aMule<br>Web Control Panel</font>
-	</td>
-	<td class="tabs" align="center" width="30">&nbsp;		</td>
-
-  	<td align="center" class="tabs" width="95">
-  		<a href="servers.php">
-  			<img src="cp_servers.gif"><br>
-  			Server list
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="downloads.php">
-  			<img src="cp_download.gif"><br>
-  			Transfer
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="search.php">
-  			<img src="cp_search.gif"><br>
-  			Search
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="shared.php">
-  			<img src="cp_shared.gif"><br>
-  			Shared Files
-  		</a>
-  	<td align="center" class="tabs" width="110">
-		<a href="stat_tree.php">
-			<img src="cp_stats.gif"><br>
-  			Statistics</a>
-  		<font color="#000000">|</font>
-
-  		<a href="stat_graphs.php">Graphs</a>
-  	</td>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="preferences.php">
-  			<img src="cp_settings.gif"><br>
-  			Preferences
-  		</a>
-  	</td>
-
-  	<td class="tabs" align="center" width="30">&nbsp;</td>
-  	<td align="left" class="tabs" width="95">
-  		<img src="log.gif"> <a href="index.php?serverinfo=1">Serverinfo</a><br>
-  		<img src="log.gif"> <a href="index.php?log=1">Log</a>
-  	</td>
-  </tr>
-  </table>
-
- </td>
-</tr>
-<tr>
-<td style="background-color: #000000; height: 1px" colspan="2">
-</td>
-</tr>
-<tr>
- <td class="tabs">
- 	&nbsp;&nbsp;<b>Connection:</b>
- 	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["kad_connected"] == 1 ) {
-			echo "Connected";
-				if ( $stats["kad_firewalled"] == 1 ) {
-					echo " to KAD (firewalled), ";
-				} else {
-					echo " to KAD, ";
-				}
-		} else {
-			echo "Not connected to KAD, ";
-		}
-		if ( $stats["id"] == 0 ) {
-			echo "not connected to ED2K";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "connecting to ED2k";
-		} else {
-			echo "connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
- 
-  <font color=black>
-
-	<script language="javascript">
-	var d = new Date();
-	s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-	document.write(s);
-</script>
-  </font>
- </td>
- <td align=right class=tabs>
-  <form>
-  <input type="button" value="ed2k://Download" onClick='self.location.href="index.php?links=1"'>
-  <input type="button" value="Logout" onClick='self.location.href="login.php"'>
-  </form>
- </td>
-</tr>
-</table><font face=Tahoma style="font-size:8pt;">
-</font>
-&nbsp;<table border=0 align=center cellpadding=4 cellspacing=0 width="95%">
-
-<tr>
- <td align=center valign=middle>
-
-<script type="text/javascript">
-function GotoCat(cat) {
-	window.location.href="downloads.php?cmd=filter&status="+cat;
-}
-</script><font face=Tahoma style="font-size:8pt;">
-<table border=0 align=center cellpadding=3 cellspacing=0 width="100%" bgcolor="#99CCFF">
-<tr>
- <td class="smallheader" style="background-color: #000000" colspan="8"><img src="arrow_down.gif">
- <b>Downloads
- <?php
- 	$downloads = amule_load_vars("downloads");
- 	echo '&nbsp;(', count($downloads), ')';
- ?>
- </b></td>
- <td align="right" class="smallheader" style="background-color: #000000">
- <form>
- 	<select name="cat" size="1"onchange=GotoCat(this.form.cat.options[this.form.cat.selectedIndex].value)>
-	<?php
-    	$all_status = array("All", "Waiting", "Paused", "Downloading");
-    	
-		if ( $HTTP_GET_VARS["cmd"] == "filter") {
-			$_SESSION["filter_status"] = $HTTP_GET_VARS["status"];
-		}
-    	if ( $_SESSION["filter_status"] == '') $_SESSION["filter_status"] = 'All';
-    	foreach ($all_status as $s) {
-    		echo (($s == $_SESSION["filter_status"]) ? '<option selected>' : '<option>'), $s, '</option>';
-    	}
-	?>
- 	</select>
- </form>
- </td>
-
-</tr>
-<tr>
- <td valign=middle class="down-header-left"><a href="?sort=name"><b>File Name</b></a></td>
- <td valign=middle class="down-header"><a href="?sort=size"><b>Size</b></a></td>
- <td valign=middle class="down-header"><a href="?sort=size_done"><b>Complete</b></a></td>
- <td valign=middle class="down-header"><a href="?sort=size_xfer"><b>Transferred</b></a></td>
- <td valign=middle class="down-header"><a href="?sort=progress"><b>Progress</b></a></td>
-
- <td valign=middle class="down-header">&nbsp;&nbsp;<a href="?sort=speed"><b>Speed</b></a>&nbsp;&nbsp;&nbsp;&nbsp;</td>
- <td valign=middle class="down-header"><b>Sources</b></td>
- <td valign=middle class="down-header"><a href="?sort=prio"><b>Priority</b></a></td>
- <td valign=middle class="down-header"><b>Actions</b></td>
-</tr>
-
-<?php
-	function CastToXBytes($size)
-	{
-		if ( $size < 1024 ) {
-			$result = $size . " bytes";
-		} elseif ( $size < 1048576 ) {
-			$result = ($size / 1024.0) . "KB";
-		} elseif ( $size < 1073741824 ) {
-			$result = ($size / 1048576.0) . "MB";
-		} else {
-			$result = ($size / 1073741824.0) . "GB";
-		}
-		return $result;
-	}
-	function PrioString($file)
-	{
-		$prionames = array(0 => "Low", 1 => "Normal", 2 => "High",
-			3 => "Very high", 4 => "Very low", 5=> "Auto", 6 => "Powershare");
-		$result = $prionames[$file->prio];
-		if ( $file->prio_auto == 1) {
-			$result = $result . "(auto)";
-		}
-		return $result;
-	}
-	function StatusString($file)
-	{
-		if ( $file->status == 7 ) {
-			return "Paused";
-		} elseif ( $file->src_count_xfer > 0 ) {
-			return "Downloading";
-		} else {
-			return "Waiting";
-		}
-	}
-
-	//
-	// declare it here, before any function reffered it in "global"
-	//
-	$sort_order;$sort_reverse;
-
-	function my_cmp($a, $b)
-	{
-		global $sort_order, $sort_reverse;
-		
-		switch ( $sort_order) {
-			case "size": $result = $a->size > $b->size; break;
-			case "size_done": $result = $a->size_done > $b->size_done; break;
-			case "size_xfer": $result = $a->size_xfer > $b->size_xfer; break;
-			case "progress": $result = (((float)$a->size_done)/((float)$a->size)) > (((float)$b->size_done)/((float)$b->size)); break;
-			case "name": $result = $a->name > $b->name; break;
-			case "speed": $result = $a->speed > $b->speed; break;
-			case "scrcount": $result = $a->src_count > $b->src_count; break;
-			case "status": $result = StatusString($a) > StatusString($b); break;
-			case "prio": $result = PrioString($a) > PrioString($b); break;
-		}
-
-		if ( $sort_reverse ) {
-			$result = !$result;
-		}
-		//var_dump($sort_reverse);
-		return $result;
-	}
-
-	if ( ($HTTP_GET_VARS["cmd"] != "") && ($_SESSION["guest_login"] == 0) ) {
-		$name = $HTTP_GET_VARS['file'];
-		if ( strlen($name) == 32 ) {
-			amule_do_download_cmd($name, $HTTP_GET_VARS["cmd"]);
-		}
-	}
-	
-	$downloads = amule_load_vars("downloads");
-
-	$sort_order = $HTTP_GET_VARS["sort"];
-
-	if ( $sort_order == "" ) {
-		$sort_order = $_SESSION["download_sort"];
-	}
-	$reverse_sort_key = "download_sort_reverse" . $sort_order;
-	if ( $_SESSION[$reverse_sort_key] == "" ) {
-		$_SESSION[$reverse_sort_key] = 0;
-	} else {
-		if ( $HTTP_GET_VARS["sort"] != '') {
-			$_SESSION[$reverse_sort_key] = !$_SESSION[$reverse_sort_key];
-		}
-	}
-
-	//var_dump($_SESSION);
-	$sort_reverse = $_SESSION[$reverse_sort_key];
-	
-	if ( $sort_order != "" ) {
-		$_SESSION["download_sort"] = $sort_order;
-		usort(&$downloads, "my_cmp");
-	}
-
-	foreach ($downloads as $file) {
-		echo '<td valign=top class="down-line-left"><acronym title="', $file->name, '">', $file->short_name, '</acronym></td>';
-		echo '<td valign=top class="down-line-right">', CastToXBytes($file->size), '</td>';
-		echo '<td valign=top class="down-line-right">', CastToXBytes($file->size_done), '</td>';
-		echo '<td valign=top class="down-line-right">', CastToXBytes($file->size_xfer), '</td>';
-		
-		echo '<td valign=middle class="down-line">';
-		echo '<table width=200 height=11 border=1 class="percent_table" cellpadding=0 cellspacing=0 bordercolor="#000000">';
-		echo '<tr><td><img src="greenpercent.gif" height=4 width=', (($file->size_done * 1.0)/$file->size)*200 + 1, '><br>';
-		echo $file->progress, '</td></tr></table></td>';
-		
-		echo '<td valign=top class="down-line-right">', CastToXBytes($file->speed), '</td>';
-		
-		// source count
-		echo '<td valign=top class="down-line">';
-		if ( $file->src_count_not_curr != 0 ) {
-			echo $file->src_count - $file->src_count_not_curr, "&nbsp;/&nbsp;";
-		}
-		echo $file->src_count, "&nbsp;(", $file->src_count_xfer, ")";
-		if ( $file->src_count_a4af != 0 ) {
-			echo "+", $file->src_count_a4af;
-		}
-		echo '</td>';
-
-		echo '<td valign=top class="down-line">', PrioString($file), '</td>';
-
-		$status = StatusString($file);
-		echo '<td valign=top class="down-line"><acronym title="', $status, '">';
-		echo '<img src="l_info.gif" alt="', $status, '"></acronym>';
-		
-		// commands
-		echo '<acronym title="ED2K Link(s)"><a href="', $file->link, '"><img src="l_ed2klink.gif" alt="ED2K Link(s)"></a></acronym>';
-		if ( $_SESSION["guest_login"] == 0 ) {
-			if ( $file->status == 7 ) {
-				echo '<acronym title="Resume"><a href="?cmd=resume&file=', $file->hash, '"><img src="l_resume.gif" alt="Resume"></a></acronym>';
-			} else {
-				echo '<acronym title="Pause"><a href="?cmd=pause&file=', $file->hash, '"><img src="l_pause.gif" alt="Pause"></a></acronym>';
-			}
-			echo '<acronym title="Cancel"><a href="?cmd=cancel&file=', $file->hash,
-				"\" onclick=\"return confirm('Are you sure that you want to cancel and delete this file?')\" ",
-				'><img src="l_cancel.gif" alt="Cancel"></a></acronym>';
-			echo '<acronym title="Increase priority"><a href="?cmd=prioup&file=', $file->hash, '"><img src="l_up.gif" alt="Increase priority"></a></acronym>';
-			echo '<acronym title="Decrease priority"><a href="?cmd=priodown&file=', $file->hash, '"><img src="l_down.gif" alt="Decrease priority"></a></acronym>';
-		}
-		echo '</td></tr>';
-		echo "\n";
-	}
-?>
-<tr>
-</tr>
-</table>
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
-
- <td class="smallheader" colspan=4 style="background-color: #000000"><img src="arrow_up.gif">
- <b>Uploads
- <?php
- 	$uploads = amule_load_vars("uploads");
- 	echo '&nbsp;(', count($uploads), ')';
- ?>
- </b></td>
-
-</tr>
-<tr>
- <td class="up-header-left"><b>Username</b></td>
- <td class="up-header"><b>File Name</b></td>
- <td class="up-header"><b>Transferred</b></td>
- <td class="up-header"><b>Speed</b></td>
-</tr>
- <?php
- 	function CastToXBytes($size)
-	{
-		if ( $size < 1024 ) {
-			$result = $size . " bytes";
-		} elseif ( $size < 1048576 ) {
-			$result = ($size / 1024.0) . "KB";
-		} elseif ( $size < 1073741824 ) {
-			$result = ($size / 1048576.0) . "MB";
-		} else {
-			$result = ($size / 1073741824.0) . "GB";
-		}
-		return $result;
-	}
- 	$uploads = amule_load_vars("uploads");
- 	foreach ($uploads as $file) {
- 		echo '<tr>';
- 		echo '<td valign=top class="up-line-left"><acronym title="', $file->user_name, '">', $file->user_name, '</acronym></td>';
- 		echo '<td valign=top class="up-line-left"><acronym title="', $file->name, '">', $file->short_name, '</acronym></td>';
- 		echo '<td valign=top class="up-line">', CastToXBytes($file->xfer_up), "&nbsp;/&nbsp;", CastToXBytes($file->xfer_down), '</td>';
- 		echo '<td valign=top class="up-line">', ($file->xfer_speed > 0) ? (CastToXBytes($file->xfer_speed) . "/s") : "-", '</td>';
- 		echo '</tr>';
-		echo "\n";
- 	}
- ?>
-</table>
-&nbsp;
-<p align=center>&nbsp;
-  </p>
-</font>
-</td>
-</tr>
-</table></body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/default/emule.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/green.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/greenpercent.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/index.php Deleted

@@ -1,302 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-<title>aMule CVS - Web Control Panel</title>
-
-<style type="text/css">
-img
-{
-border : 0px;
-}
-a, a:active, a:link, a:visited
-{
-color: white;
-}
-.down-header, .down-header-left, .down-header-right,
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-header, .up-header-left, .up-line, .up-line-left,
-.server-header, .server-header-left, .server-line, .server-line-left,
-.shared-header, .shared-header-left, .shared-line, .shared-line-changed, 
-.shared-line-left, .shared-line-left-changed,
-.header, .smallheader, .commontext,
-.upqueue-header, .upqueue-line, .upqueue-line-left,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-font-family : Tahoma;
-font-size : 8pt;
-}
-.tabs
-{
-font-family : Tahoma;
-font-size : 10pt;
-background-color : #3399FF;
-}
-.down-header, .down-line, .down-line-good, .up-header, .up-line,
-.server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-.upqueue-header, .upqueue-line,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-text-align : center;
-}
-.down-header-left, .down-line-left, .down-line-good-left,
-.server-header-left, .server-line-left, .shared-header-left,
-.up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left
-{
-text-align : left;
-}
-.down-line-right, .down-line-good-right, .down-header-right
-{
-text-align : right;
-}
-.down-header, .down-header-left, .down-header-right,
-.up-header, .up-header-left, .server-header, .server-header-left,
-.shared-header, .shared-header-left, .upqueue-header,
-.websearch-header, .addserver-header
-{
-background-color : #0066CC;
-}
-.header
-{
-background-color : #0046AC;
-}
-.smallheader
-{
-background-color : #003399;
-color : #FFFFFF;
-}
-.commontext
-{
-background-color : #FFFFFF;
-color : #000000;
-}
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-line, .up-line-left, .server-line, .server-line-left,
-.shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-.upqueue-line, .upqueue-line-left,
-.websearch-line, .addserver-line
-{
-background-color : #3399FF;
-}
-.down-line-good, .down-line-good-left, .down-line-good-right, .shared-line-changed, .shared-line-left-changed
-{
-color : #F0F000;
-}
-.percent_table
-{
-border:0px solid #000000;
-border-collapse: collapse;
-}
-.message
-{
-font-size: 10pt;
-font-weight: bold;
-color: #FF0000;
-}
-.dinput
-{
-border-width: 1px;
-border-color: black;
-}
-</style>
-</head>
-<body bgcolor="#FBDE9C" text=white link="#3399FF" vlink="#3399FF" alink="#3399FF" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-<table border=0 width="100%" align=center cellpadding=4 cellspacing=0>
-<tr>
- <td class="tabs" align="left" colspan="2">
-
-  <table border="0" cellpadding="4" cellspacing="0">
-  <tr>
-	<td class="tabs" align="center">
-		&nbsp;<a href="http://www.amule.org" target="_blank"><img src="emule.gif"></a>
-		<font face="Tahoma" style="font-size:13pt;" color="#000000">aMule<br>Web Control Panel</font>
-	</td>
-	<td class="tabs" align="center" width="30">&nbsp;		</td>
-
-  	<td align="center" class="tabs" width="95">
-  		<a href="servers.php">
-  			<img src="cp_servers.gif"><br>
-  			Server list
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="downloads.php">
-  			<img src="cp_download.gif"><br>
-
-  			Transfer
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="search.php">
-  			<img src="cp_search.gif"><br>
-  			Search
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-
-  		<a href="shared.php">
-  			<img src="cp_shared.gif"><br>
-  			Shared Files
-  		</a>
-  	<td align="center" class="tabs" width="110">
-		<a href="stat_tree.php">
-			<img src="cp_stats.gif"><br>
-  			Statistics</a>
-  		<font color="#000000">|</font>
-
-  		<a href="stat_graphs.php">Graphs</a>
-  	</td>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="preferences.php">
-  			<img src="cp_settings.gif"><br>
-  			Preferences
-  		</a>
-  	</td>
-
-  	<td class="tabs" align="center" width="30">&nbsp;</td>
-  	<td align="left" class="tabs" width="95">
-  		<img src="log.gif"> <a href="index.php?serverinfo=1">Serverinfo</a><br>
-  		<img src="log.gif"> <a href="index.php?log=1">Log</a>
-  	</td>
-  </tr>
-  </table>
-
- </td>
-</tr>
-<tr>
-<td style="background-color: #000000; height: 1px" colspan="2">
-</td>
-</tr>
-<tr>
- <td class="tabs">
- 	&nbsp;&nbsp;<b>Connection:</b> 
-	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["id"] == 0 ) {
-			echo "Not connected";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "Connecting ...";
-		} else {
-			echo "Connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
- 
-  <font color=black>
-
-	<script type="text/javascript" language="javascript">
-	var d = new Date();
-	s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-	document.write(s);
-</script>
-  </font>
- </td>
- <td align=left class=tabs>
-  <form>
-  <input type="button" value="ed2k://Download" onClick='self.location.href="index.php?links=1"'>
-  <input type="button" value="Logout" onClick='self.location.href="login.php"'>
-  </form>
- </td>
-</tr>
-</table>
-
-&nbsp;
-
-<?php
-	function cat2idx($cat)
-	{
-            	$cats = amule_get_categories();
-            	$result = 0;
-            	foreach($cats as $i => $c) {
-            		if ( $cat == $c) $result = $i;
-            	}
-        		return $result;
-	}
-	
-	if (($HTTP_GET_VARS['cmd'] == 'download' ) && ($_SESSION["guest_login"] == 0)) {
-		$link = $HTTP_GET_VARS['ed2klink'];
-		$target_cat_idx = cat2idx($HTTP_GET_VARS['cat']);
-    	if ( strlen($link) > 0 ) {
-    		amule_do_ed2k_download_cmd($link, $target_cat_idx);
-    	}
-	}
-	
-	if ( $HTTP_GET_VARS['links'] == 1) {
-		echo '
-	<table align=center border=0 cellpadding=4 cellspacing=0 width="80%">
-	<tr>
-	<td align=center class="shared-header">
-	<p><font face=Tahoma style="font-size:10pt;"><b>Download Selected</b></font></p>
-	</td>
-	</tr>
-	<tr>
-	 <td align=center valign=top class=tabs>
-	  <form action="/" method="GET">
-	   <input type="hidden" name="cmd" value="download">
-	   <font face=Tahoma style="font-size:10pt;">&nbsp;<br>ED2K Link(s)<br><br>
-	   <textarea name="ed2klink" cols="94" rows="7" class=dinput></textarea>
-	   <br><br>
-	   <input type=submit value="Start"></font><img src="arrow_right.gif" align="absmiddle">
-	   <select name="cat" size="1">';
-
-    	$cats = amule_get_categories();
-    	foreach($cats as $c) {
-    		echo "<option>", $c, "</option>";
-    	}
-	   	
-	   	echo '
-	   </select>
-	  </form><br>
-	 </td>
-	</tr>
-	</table>';
-	} elseif ( $HTTP_GET_VARS['serverinfo'] == 1 ) {
-		$strinfo = amule_get_serverinfo($HTTP_GET_VARS['rst']);
-		echo '<table border=0 align=center cellpadding=4 cellspacing=0 width="80%">
-				<tr><td align=left valign=middle class="commontext">
-				<font color="#000000" face="Lucida Console"><pre>';
-		echo $strinfo;
-		echo '</pre></font></td></tr><tr><td align=left valign=middle>
-				<form action="index.php" method="GET">
-				<input type="hidden" name=rst value=1>
-				<input type="hidden" name=serverinfo value=1>
-				<input type=submit value="Reset"></form>
-				</td></tr></table>';
-	} elseif ( $HTTP_GET_VARS['log'] == 1) {
-		$strinfo = amule_get_log($HTTP_GET_VARS['rst']);
-		echo '<table border=0 align=center cellpadding=4 cellspacing=0 width="80%">
-				<tr><td align=left valign=middle class="commontext">
-				<font color="#000000" face="Lucida Console"><pre>';
-		echo $strinfo;
-		echo '</pre></font></td></tr><tr><td align=left valign=middle>
-				<form action="index.php" method="GET">
-				<input type="hidden" name=rst value=1>
-				<input type="hidden" name=log value=1>
-				<input type=submit value="Reset"></form>
-				</td></tr></table>';
-	}
-?>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/default/l_cancel.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/l_connect.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/l_down.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/l_ed2klink.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/l_info.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/l_pause.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/l_resume.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/l_up.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/log.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/logo.jpg Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/phpamule.png Deleted

aMule-2.2.6.tar.bz2/src/webserver/default/preferences.php Deleted

@@ -1,427 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-<title>aMule CVS - Web Control Panel</title>
-
-<style type="text/css">
-img
-{
-border : 0px;
-}
-a, a:active, a:link, a:visited
-{
-color: white;
-}
-.down-header, .down-header-left, .down-header-right,
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-header, .up-header-left, .up-line, .up-line-left,
-.server-header, .server-header-left, .server-line, .server-line-left,
-.shared-header, .shared-header-left, .shared-line, .shared-line-changed, 
-.shared-line-left, .shared-line-left-changed,
-.header, .smallheader, .commontext,
-.upqueue-header, .upqueue-line, .upqueue-line-left,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-font-family : Tahoma;
-font-size : 8pt;
-}
-.tabs
-{
-font-family : Tahoma;
-font-size : 10pt;
-background-color : #3399FF;
-}
-.down-header, .down-line, .down-line-good, .up-header, .up-line,
-.server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-.upqueue-header, .upqueue-line,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-text-align : center;
-}
-.down-header-left, .down-line-left, .down-line-good-left,
-.server-header-left, .server-line-left, .shared-header-left,
-.up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left
-{
-text-align : left;
-}
-.down-line-right, .down-line-good-right, .down-header-right
-{
-text-align : right;
-}
-.down-header, .down-header-left, .down-header-right,
-.up-header, .up-header-left, .server-header, .server-header-left,
-.shared-header, .shared-header-left, .upqueue-header,
-.websearch-header, .addserver-header
-{
-background-color : #0066CC;
-}
-.header
-{
-background-color : #0046AC;
-}
-.smallheader
-{
-background-color : #003399;
-color : #FFFFFF;
-}
-.commontext
-{
-background-color : #FFFFFF;
-color : #000000;
-}
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-line, .up-line-left, .server-line, .server-line-left,
-.shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-.upqueue-line, .upqueue-line-left,
-.websearch-line, .addserver-line
-{
-background-color : #3399FF;
-}
-.down-line-good, .down-line-good-left, .down-line-good-right, .shared-line-changed, .shared-line-left-changed
-{
-color : #F0F000;
-}
-.percent_table
-{
-border:0px solid #000000;
-border-collapse: collapse;
-}
-.message
-{
-font-size: 10pt;
-font-weight: bold;
-color: #FF0000;
-}
-.dinput
-{
-border-width: 1px;
-border-color: black;
-}
-</style>
-</head>
-
-<script language="JavaScript" type="text/JavaScript">
-
-var initvals = new Object;
-
-<?php
-	// apply new options before proceeding
-	//var_dump($HTTP_GET_VARS);
-	if ( ($HTTP_GET_VARS["cmd"] == "apply") && ($_SESSION["guest_login"] == 0) ) {
-		$file_opts = array(
-			"upload_full_chunks", "first_last_chunks_prio"
-		);
-		$conn_opts = array("max_line_up_cap","max_up_limit",
-			"max_line_down_cap","max_down_limit", 
-			"max_file_src","max_conn_total");
-		$webserver_opts = array("use_gzip", "autorefresh_time");
-		
-		$all_opts;
-		foreach ($conn_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["connection"][$i] = $curr_value;
-		}
-		foreach ($file_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["files"][$i] = $curr_value;
-		}
-		foreach ($webserver_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["webserver"][$i] = $curr_value;
-		}
-		//var_dump($all_opts);
-		amule_set_options($all_opts);
-	}
-
-	$opts = amule_get_options();
-	//var_dump($opts);
-	$opt_groups = array("connection", "files", "webserver", "coretweaks");
-	//var_dump($opt_groups);
-	foreach ($opt_groups as $group) {
-		$curr_opts = $opts[$group];
-		//var_dump($curr_opts);
-		foreach ($curr_opts as $opt_name => $opt_val) {
-			echo 'initvals["', $opt_name, '"] = "', $opt_val, '";', "\n";
-		}
-	}
-?>
-
-function init_data()
-{
-	var frm = document.forms.mainform
-	
-	var str_param_names = new Array(
-		"max_line_down_cap", "max_line_up_cap",
-		"max_up_limit", "max_down_limit", "max_file_src",
-		"max_conn_total",
-		"autorefresh_time"
-		)
-	for(i = 0; i < str_param_names.length; i++) {
-		frm[str_param_names[i]].value = initvals[str_param_names[i]];
-	}
-	var check_param_names = new Array(
-		"use_gzip", "upload_full_chunks", "first_last_chunks_prio"
-		)
-	for(i = 0; i < check_param_names.length; i++) {
-		frm[check_param_names[i]].checked = initvals[check_param_names[i]] == "1" ? true : false;
-	}
-	
-}
-
-</script>
-
-<body onload="init_data();" bgcolor="#FBDE9C" text=white link="#3399FF" vlink="#3399FF" alink="#3399FF" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-<table border=0 width="100%" align=center cellpadding=4 cellspacing=0>
-<tr>
- <td class="tabs" align="left" colspan="2">
-
-  <table border="0" cellpadding="4" cellspacing="0">
-  <tr>
-	<td class="tabs" align="center">
-		&nbsp;<a href="http://www.amule.org" target="_blank"><img src="emule.gif"></a>
-		<font face="Tahoma" style="font-size:13pt;" color="#000000">aMule<br>Web Control Panel</font>
-	</td>
-	<td class="tabs" align="center" width="30">&nbsp;		</td>
-
-  	<td align="center" class="tabs" width="95">
-  		<a href="servers.php">
-  			<img src="cp_servers.gif"><br>
-  			Server list
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="downloads.php">
-  			<img src="cp_download.gif"><br>
-
-  			Transfer
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="search.php">
-  			<img src="cp_search.gif"><br>
-  			Search
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-
-  		<a href="shared.php">
-  			<img src="cp_shared.gif"><br>
-  			Shared Files
-  		</a>
-  	<td align="center" class="tabs" width="110">
-		<a href="stat_tree.php">
-			<img src="cp_stats.gif"><br>
-  			Statistics</a>
-  		<font color="#000000">|</font>
-
-  		<a href="stat_graphs.php">Graphs</a>
-  	</td>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="preferences.php">
-  			<img src="cp_settings.gif"><br>
-  			Preferences
-  		</a>
-  	</td>
-
-  	<td class="tabs" align="center" width="30">&nbsp;</td>
-  	<td align="left" class="tabs" width="95">
-  		<img src="log.gif"> <a href="index.php?serverinfo=1">Serverinfo</a><br>
-  		<img src="log.gif"> <a href="index.php?log=1">Log</a>
-  	</td>
-  </tr>
-  </table>
-
- </td>
-</tr>
-<tr>
-<td style="background-color: #000000; height: 1px" colspan="2">
-</td>
-</tr>
-<tr>
- <td class="tabs">
- 	&nbsp;&nbsp;<b>Connection:</b> 
-	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["kad_connected"] == 1 ) {
-			echo "Connected";
-				if ( $stats["kad_firewalled"] == 1 ) {
-					echo " to KAD (firewalled), ";
-				} else {
-					echo " to KAD, ";
-				}
-		} else {
-			echo "Not connected to KAD, ";
-		}
-		if ( $stats["id"] == 0 ) {
-			echo "not connected to ED2K";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "connecting to ED2k";
-		} else {
-			echo "connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
- 
-  <font color=black>
-
-	<script type="text/javascript" language="javascript">
-	var d = new Date();
-	s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-	document.write(s);
-</script>
-  </font>
- </td>
- <td align=right class=tabs>
-  <form>
-  <input type="button" value="ed2k://Download" onClick='self.location.href="index.php?links=1"'>
-  <input type="button" value="Logout" onClick='self.location.href="login.php"'>
-  </form>
- </td>
-</tr>
-</table>
-
-&nbsp;
-
-<form name="mainform" action="preferences.php" method="post">
-
-<input type="hidden" name="cmd" value="apply">
-<table border=0 align=center cellpadding=4 cellspacing=0 width="90%">
-<tr><td><font face=Tahoma style="font-size:10pt;" color=black>Web Control Panel</font></td></tr>
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>Gzip Compression</b></font>
-<input type="checkbox" name="use_gzip" id="use_gzip">
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;Save traffic, especially in graphs.
-</font>
-
-<br>
-</td></tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>Refresh-Time of Pages</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;Time in seconds (zero=disabled): <input type="text" name="autorefresh_time" id="autorefresh_time" size="5" class=dinput><br>
-</font>
-</td>
-</tr>
-
-
-<tr><td><br><font face=Tahoma style="font-size:10pt;" color=black>aMule</font></td></tr>
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>Speed Limits</b></font>
-</td>
-</tr>
-<tr>
-
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;Download: <input type="text" name="max_down_limit" id="max_down_limit" size="5" class=dinput> kB/s
-&nbsp;&nbsp;Upload: <input type="text" name="max_up_limit" id="max_up_limit" size="5" class=dinput> kB/s
-</font>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>Bandwidth Limits</b></font>
-</td>
-
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<font face=Tahoma style="font-size:8pt;">
-&nbsp;&nbsp;&nbsp;&nbsp;Download: <input type="text" name="max_line_down_cap" id="max_line_down_cap" size="5" class=dinput> kB/s
-&nbsp;&nbsp;Upload: <input type="text" name="max_line_up_cap" id="max_line_up_cap" size="5" class=dinput> kB/s
-</font>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-<font face=Tahoma style="font-size:8pt;"><b>Connection Limits</b></font>
-
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<table border=0>
-<tr><td><font face=Tahoma style="font-size:8pt;">Max Sources Per File:</font></td><td>
-<input type="text" name="max_file_src" id="max_file_src" size="5" class=dinput value="300"></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">Max. Connections:</font></td><td>
-<input type="text" name="max_conn_total" id="max_conn_total" size="5" class=dinput value="499"></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">Max. new connections / 5secs:</font></td><td>
-<input type="text" name="max_conn_5sec" id="max_conn_5sec" size="5" class=dinput value="20"></td></tr>
-</table>
-</td>
-</tr>
-
-<tr>
-<td align=left valign=middle bgcolor="#0066CC">
-
-<font face=Tahoma style="font-size:8pt;"><b>File Settings</b></font>
-</td>
-</tr>
-<tr>
-<td align=left valign=top bgcolor="#3399FF">
-<table border=0>
-<tr><td><font face=Tahoma style="font-size:8pt;">Try to transfer full chunks to all uploads</font></td><td>
-<input type="checkbox" name="upload_full_chunks" id="upload_full_chunks"></td></tr>
-<tr><td><font face=Tahoma style="font-size:8pt;">Try to download first and last chunks first</font></td><td>
-<input type="checkbox" name="first_last_chunks_prio" id="first_last_chunks_prio"></td></tr>
-</table>
-</td>
-</tr>
-
-<tr>
-<td align=center><br><input type=submit value="Apply"></td>
-
-</tr>
-
-</table>
-</form>
-
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/default/search.php Deleted

@@ -1,430 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-?>
-<style type="text/css">
-img
-{
-border : 0px;
-}
-a, a:active, a:link, a:visited
-{
-color: white;
-}
-.down-header, .down-header-left, .down-header-right,
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-header, .up-header-left, .up-line, .up-line-left,
-.server-header, .server-header-left, .server-line, .server-line-left,
-.shared-header, .shared-header-left, .shared-line, .shared-line-changed, 
-.shared-line-left, .shared-line-left-changed,
-.header, .smallheader, .commontext,
-.upqueue-header, .upqueue-line, .upqueue-line-left,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-font-family : Tahoma;
-font-size : 8pt;
-}
-.tabs
-{
-font-family : Tahoma;
-font-size : 10pt;
-background-color : #3399FF;
-}
-.down-header, .down-line, .down-line-good, .up-header, .up-line,
-.server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-.upqueue-header, .upqueue-line,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-text-align : center;
-}
-.down-header-left, .down-line-left, .down-line-good-left,
-.server-header-left, .server-line-left, .shared-header-left,
-.up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left
-{
-text-align : left;
-}
-.down-line-right, .down-line-good-right, .down-header-right
-{
-text-align : right;
-}
-.down-header, .down-header-left, .down-header-right,
-.up-header, .up-header-left, .server-header, .server-header-left,
-.shared-header, .shared-header-left, .upqueue-header,
-.websearch-header, .addserver-header
-{
-background-color : #0066CC;
-}
-.header
-{
-background-color : #0046AC;
-}
-.smallheader
-{
-background-color : #003399;
-color : #FFFFFF;
-}
-.commontext
-{
-background-color : #FFFFFF;
-color : #000000;
-}
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-line, .up-line-left, .server-line, .server-line-left,
-.shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-.upqueue-line, .upqueue-line-left,
-.websearch-line, .addserver-line
-{
-background-color : #3399FF;
-}
-.down-line-good, .down-line-good-left, .down-line-good-right, .shared-line-changed, .shared-line-left-changed
-{
-color : #F0F000;
-}
-.percent_table
-{
-border:0px solid #000000;
-border-collapse: collapse;
-}
-.message
-{
-font-size: 10pt;
-font-weight: bold;
-color: #FF0000;
-}
-.dinput
-{
-border-width: 1px;
-border-color: black;
-}
-</style>
-</head>
-<body bgcolor="#FBDE9C" text=white link="#3399FF" vlink="#3399FF" alink="#3399FF" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-<table border=0 width="100%" align=center cellpadding=4 cellspacing=0>
-<tr>
- <td class="tabs" align="left" colspan="2">
-
-  <table border="0" cellpadding="4" cellspacing="0">
-  <tr>
-	<td class="tabs" align="center">
-		&nbsp;<a href="http://www.amule.org" target="_blank"><img src="emule.gif"></a>
-		<font face="Tahoma" style="font-size:13pt;" color="#000000">aMule<br>Web Control Panel</font>
-	</td>
-	<td class="tabs" align="center" width="30">&nbsp;		</td>
-
-  	<td align="center" class="tabs" width="95">
-  		<a href="servers.php">
-  			<img src="cp_servers.gif"><br>
-  			Server list
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="downloads.php">
-  			<img src="cp_download.gif"><br>
-
-  			Transfer
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="search.php">
-  			<img src="cp_search.gif"><br>
-  			Search
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-
-  		<a href="shared.php">
-  			<img src="cp_shared.gif"><br>
-  			Shared Files
-  		</a>
-  	<td align="center" class="tabs" width="110">
-		<a href="stat_tree.php">
-			<img src="cp_stats.gif"><br>
-  			Statistics</a>
-  		<font color="#000000">|</font>
-
-  		<a href="stat_graphs.php">Graphs</a>
-  	</td>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="preferences.php">
-  			<img src="cp_settings.gif"><br>
-  			Preferences
-  		</a>
-  	</td>
-
-  	<td class="tabs" align="center" width="30">&nbsp;</td>
-  	<td align="left" class="tabs" width="95">
-  		<img src="log.gif"> <a href="index.php?serverinfo=1">Serverinfo</a><br>
-  		<img src="log.gif"> <a href="index.php?log=1">Log</a>
-  	</td>
-  </tr>
-  </table>
-
- </td>
-</tr>
-<tr>
-<td style="background-color: #000000; height: 1px" colspan="2">
-</td>
-</tr>
-<tr>
- <td class="tabs">
- 	&nbsp;&nbsp;<b>Connection:</b> 
-	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["kad_connected"] == 1 ) {
-			echo "Connected";
-				if ( $stats["kad_firewalled"] == 1 ) {
-					echo " to KAD (firewalled), ";
-				} else {
-					echo " to KAD, ";
-				}
-		} else {
-			echo "Not connected to KAD, ";
-		}
-		if ( $stats["id"] == 0 ) {
-			echo "not connected to ED2K";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "connecting to ED2k";
-		} else {
-			echo "connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
- 
-  <font color=black>
-
-	<script type="text/javascript" language="javascript">
-	var d = new Date();
-	s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-	document.write(s);
-</script>
-  </font>
- </td>
- <td align=right class=tabs>
-  <form>
-  <input type="button" value="ed2k://Download" onClick='self.location.href="index.php?links=1"'>
-  <input type="button" value="Logout" onClick='self.location.href="login.php"'>
-  </form>
- </td>
-</tr>
-</table>
-
-&nbsp;
-<p align=center><div class="message"></div></p><br>
-
-<table border=0 align=center cellpadding=4 cellspacing=0 width="85%">
-<tr>
-<td valign=middle class="websearch-header"><b><font face=Tahoma style="font-size:10pt;">Search Results</font></b>&nbsp;&nbsp;(<a align="right" href="javascript:self.location.href='search.php'"><font face=Tahoma style="font-size:8pt;">Refetch Results</font></a>)</td>
-</tr>
-
-<tr>
-<td valign=middle class="websearch-line">
-
-<form action="" method="GET">
-<table border=0 align=center cellpadding=4 cellspacing=0>
-<input type="hidden" name=cmd value="download">
-<tr>
-<td class="websearch-line"><b><font face=Tahoma style="font-size:8pt;"><a href="search.php?sort=name">File Name</a></font></b></td>
-<td class="websearch-line" width=50><b><font face=Tahoma style="font-size:8pt;"><a href="search.php?sort=size">Size</a></font></b></td>
-<td class="websearch-line"><b><font face=Tahoma style="font-size:8pt;"><a href="search.php?sort=sources">Sources</a></b></td>
-<td class="websearch-line" width=100><b><font face=Tahoma style="font-size:8pt;">Download</font></b></td>
-</tr>
-
-<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-		function cat2idx($cat)
-		{
-                	$cats = amule_get_categories();
-                	$result = 0;
-                	foreach($cats as $i => $c) {
-                		if ( $cat == $c) $result = $i;
-                	}
-            		return $result;
-		}
-
-		//
-		// declare it here, before any function reffered it in "global"
-		//
-		$sort_order;$sort_reverse;
-
-		function my_cmp($a, $b)
-		{
-			global $sort_order, $sort_reverse;
-			
-			switch ( $sort_order) {
-				case "size": $result = $a->size > $b->size; break;
-				case "name": $result = $a->name > $b->name; break;
-				case "sources": $result = $a->sources > $b->sources; break;
-			}
-
-			if ( $sort_reverse ) {
-				$result = !$result;
-			}
-
-			return $result;
-		}
-
-		if ($_SESSION["guest_login"] == 0) {
-			if ( $HTTP_GET_VARS["cmd"] == "search") {
-
-				$search_type = -1;
-				switch($HTTP_GET_VARS["method"]) {
-					case "server": $search_type = 0; break;
-					case "global": $search_type = 1; break;
-					case "kad": $search_type = 2; break;
-				}
-	
-				$min_size = $HTTP_GET_VARS["min"] == "" ? 0 : $HTTP_GET_VARS["min"];
-				$max_size = $HTTP_GET_VARS["max"] == "" ? 0 : $HTTP_GET_VARS["max"];
-	
-				$min_size *= 1024*1024;
-				$max_size *= 1024*1024;
-				
-				amule_do_search_start_cmd($HTTP_GET_VARS["tosearch"],
-					$HTTP_GET_VARS["ext"], $HTTP_GET_VARS["type"],
-					$search_type, $HTTP_GET_VARS["avail"], $min_size, $max_size);
-			} elseif ( $HTTP_GET_VARS["cmd"] == "download") {
-				foreach ( $HTTP_GET_VARS as $name => $val) {
-					// this is file checkboxes
-					if ( (strlen($name) == 32) and ($val == "on") ) {
-						$cat = $HTTP_GET_VARS["cat"];
-						$cat_idx = cat2idx($cat);
-						amule_do_search_download_cmd($name, $cat_idx);
-					}
-				}
-			} else {
-				// wrong command come
-				//var_dump($HTTP_GET_VARS);
-			}
-		}
-		
-		$search = amule_load_vars("searchresult");
-
-		$sort_order = $HTTP_GET_VARS["sort"];
-
-		if ( $sort_order == "" ) {
-			$sort_order = $_SESSION["search_sort"];
-		} else {
-			if ( $_SESSION["search_sort_reverse"] == "" ) {
-				$_SESSION["search_sort_reverse"] = 0;
-			} else {
-				$_SESSION["search_sort_reverse"] = !$_SESSION["search_sort_reverse"];
-			}
-		}
-
-		$sort_reverse = $_SESSION["search_sort_reverse"];
-		if ( $sort_order != "" ) {
-			$_SESSION["search_sort"] = $sort_order;
-			usort(&$search, "my_cmp");
-		}
-
-		foreach ($search as $file) {
-			echo '<tr><td align="left"><font face=Tahoma style="font-size:8pt;">', $file->name,
-				'</font></td><td class="websearch-line"><font face=Tahoma style="font-size:8pt;">', CastToXBytes($file->size),
-				'</font></td><td class="websearch-line"><font face=Tahoma style="font-size:8pt;">', $file->sources,
-				'</font></td><td class="websearch-line"><input type="checkbox" name="', $file->hash,
-				'"></td></tr>';
-				
-		}
-?>
-
-</table>
-
-<input type="submit" value="Download">
-<img src="arrow_right.gif" align="absmiddle">
-	<form>
-	<select name="cat" size="1">
-        <?php
-        	$cats = amule_get_categories();
-        	foreach($cats as $c) {
-        		echo "<option>", $c, "</option>";
-        	}
-        ?>
-	</select>
-	</form>
-	
-</form>
-<br>
-<br>
-&nbsp;
-</table>
-<br>
-
-<form action="" method="GET">
-<table border=0 align=center cellpadding=4 cellspacing=0 width="250">
-<tr>
-<td valign=middle class="websearch-header"><b><font face=Tahoma style="font-size:10pt;">Search</font></b></td>
-</tr>
-<tr>
- <td valign=middle class="websearch-line">
-  <table>
-  <tr><td class=tabs width=150>Name</td><td><input name="tosearch" type="text" size="40"></td></tr>
-  <tr><td class=tabs>Type</td>
-  <td>
-  <select name="type">
-  	<option value=""></option>
-  	<option value="Archives">Archive</option>
-	<option value="Audio">Audio</option>
-  	<option value="CD-Images">CD-Images</option>
-  	<option value="Pictures">Pictures</option>
-  	<option value="Programs">Programs</option>
-  	<option value="Texts">Texts</option>
-  	<option value="Videos">Video</option>
-  </select>
-  </td></tr>
-  <tr><td class=tabs>Min Size (MB)</td><td><input name="min" type="text" size="10"></td></tr>
-  <tr><td class=tabs>Max Size (MB)</td><td><input name="max" type="text" size="10"></td></tr>
-  <tr><td class=tabs>Min Availability</td><td><input name="avail" type="text" size="10"></td></tr>
-  <tr><td class=tabs>Extension</td><td><input name="ext" type="text" size="10"></td></tr>
-  <tr><td class=tabs>Method</td><td><input value="server" type="radio" name="method" checked>Server</td></tr>
-  <tr><td class=tabs></td><td><input value="global" type="radio" name="method">Global Search</td></tr>
-  <tr><td class=tabs></td><td><input value="kad" type="radio" name="method">Kad Search</td></tr>
-  </table>
-  <br>
-  <input type="hidden" name=cmd value="search">
-  <input type="submit" value="Search">
-  <br>
-  &nbsp;
-</td>
-</tr>
-</table>
-
-
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/default/servers.php Deleted

@@ -1,364 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"],
-			'; url=servers.php', '">';
-	}
-?>
-<style type="text/css">
-img
-{
-border : 0px;
-}
-a, a:active, a:link, a:visited
-{
-color: white;
-}
-.down-header, .down-header-left, .down-header-right,
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-header, .up-header-left, .up-line, .up-line-left,
-.server-header, .server-header-left, .server-line, .server-line-left,
-.shared-header, .shared-header-left, .shared-line, .shared-line-changed, 
-.shared-line-left, .shared-line-left-changed,
-.header, .smallheader, .commontext,
-.upqueue-header, .upqueue-line, .upqueue-line-left,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-font-family : Tahoma;
-font-size : 8pt;
-}
-.tabs
-{
-font-family : Tahoma;
-font-size : 10pt;
-background-color : #3399FF;
-}
-.down-header, .down-line, .down-line-good, .up-header, .up-line,
-.server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-.upqueue-header, .upqueue-line,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-text-align : center;
-}
-.down-header-left, .down-line-left, .down-line-good-left,
-.server-header-left, .server-line-left, .shared-header-left,
-.up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left
-{
-text-align : left;
-}
-.down-line-right, .down-line-good-right, .down-header-right
-{
-text-align : right;
-}
-.down-header, .down-header-left, .down-header-right,
-.up-header, .up-header-left, .server-header, .server-header-left,
-.shared-header, .shared-header-left, .upqueue-header,
-.websearch-header, .addserver-header
-{
-background-color : #0066CC;
-}
-.header
-{
-background-color : #0046AC;
-}
-.smallheader
-{
-background-color : #003399;
-color : #FFFFFF;
-}
-.commontext
-{
-background-color : #FFFFFF;
-color : #000000;
-}
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-line, .up-line-left, .server-line, .server-line-left,
-.shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-.upqueue-line, .upqueue-line-left,
-.websearch-line, .addserver-line
-{
-background-color : #3399FF;
-}
-.down-line-good, .down-line-good-left, .down-line-good-right, .shared-line-changed, .shared-line-left-changed
-{
-color : #F0F000;
-}
-.percent_table
-{
-border:0px solid #000000;
-border-collapse: collapse;
-}
-.message
-{
-font-size: 10pt;
-font-weight: bold;
-color: #FF0000;
-}
-.dinput
-{
-border-width: 1px;
-border-color: black;
-}
-</style>
-</head>
-<body bgcolor="#FBDE9C" text=white link="#3399FF" vlink="#3399FF" alink="#3399FF" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-<table border=0 width="100%" align=center cellpadding=4 cellspacing=0>
-<tr>
- <td class="tabs" align="left" colspan="2">
-
-  <table border="0" cellpadding="4" cellspacing="0">
-  <tr>
-	<td class="tabs" align="center">
-		&nbsp;<a href="http://www.amule.org" target="_blank"><img src="emule.gif"></a>
-		<font face="Tahoma" style="font-size:13pt;" color="#000000">aMule<br>Web Control Panel</font>
-	</td>
-	<td class="tabs" align="center" width="30">&nbsp;		</td>
-
-  	<td align="center" class="tabs" width="95">
-  		<a href="servers.php">
-  			<img src="cp_servers.gif"><br>
-  			Server list
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="downloads.php">
-  			<img src="cp_download.gif"><br>
-
-  			Transfer
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="search.php">
-  			<img src="cp_search.gif"><br>
-  			Search
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-
-  		<a href="shared.php">
-  			<img src="cp_shared.gif"><br>
-  			Shared Files
-  		</a>
-  	<td align="center" class="tabs" width="110">
-		<a href="stat_tree.php">
-			<img src="cp_stats.gif"><br>
-  			Statistics</a>
-  		<font color="#000000">|</font>
-
-  		<a href="stat_graphs.php">Graphs</a>
-  	</td>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="preferences.php">
-  			<img src="cp_settings.gif"><br>
-  			Preferences
-  		</a>
-  	</td>
-
-  	<td class="tabs" align="center" width="30">&nbsp;</td>
-  	<td align="left" class="tabs" width="95">
-  		<img src="log.gif"> <a href="index.php?serverinfo=1">Serverinfo</a><br>
-  		<img src="log.gif"> <a href="index.php?log=1">Log</a>
-  	</td>
-  </tr>
-  </table>
-
- </td>
-</tr>
-<tr>
-<td style="background-color: #000000; height: 1px" colspan="2">
-</td>
-</tr>
-<tr>
- <td class="tabs">
- 	&nbsp;&nbsp;<b>Connection:</b>
- 	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["kad_connected"] == 1 ) {
-			echo "Connected";
-				if ( $stats["kad_firewalled"] == 1 ) {
-					echo " to KAD (firewalled), ";
-				} else {
-					echo " to KAD, ";
-				}
-		} else {
-			echo "Not connected to KAD, ";
-		}
-		if ( $stats["id"] == 0 ) {
-			echo "not connected to ED2K";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "connecting to ED2k";
-		} else {
-			echo "connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
-  <font color=black>
-
-	<script language="javascript">
-	var d = new Date();
-	s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-	document.write(s);
-</script>
-  </font>
- </td>
- <td align=right class=tabs>
-  <form>
-  <input type="button" value="ed2k://Download" onClick='self.location.href="index.php?links=1"'>
-  <input type="button" value="Logout" onClick='self.location.href="login.php"'>
-  </form>
- </td>
-</tr>
-</table>
-<font face=Tahoma style="font-size:8pt;">&nbsp;
-
-<table border=0 align=center cellpadding=4 cellspacing=0 width="95%">
-<tr>
-  <td align=center valign=top>
-
-<?php
-	$add_server_form = '
-<div class="message"></div>
-<table border=0 align=center cellpadding=4 cellspacing=0 width="60%" display="None">
-<tr>
-<td valign=middle class="addserver-header"><img src="add_server.gif"> <b>Add new server</b></td>
-</tr>
-<tr>
- <td valign=middle class="addserver-line">
-<form action="servers.php" method="GET">
-  IP or Address <input name="ip" type="text" size="15">
-  Port <input name="port" type="text" size="6">
-  Name <input name="name" type="text" size="30"><br>
-  <input name="cmd" type="hidden" value="add"><br>
-  <input type="submit" value="Add to list">
-</form>
- </td>
-</tr>
-<tr>
-<td valign=middle class="addserver-header"><img src="add_server.gif"> <b>Update server.met from URL</b></td>
-</tr>
-<tr>
- <td valign=middle class="addserver-line">
-<form action="servers.php" method="GET">
-  URL <input name="servermeturl" type="text" size="60"><br>
-  <input type="hidden" name=w value="server">
-  <input type="hidden" name=c value="options">
-  <input name="updateservermetfromurl" type="hidden" value="true"><br>
-  <input type="submit" value="Apply">
-</form>
- </td>
-</tr>
-</table>
-';
-	if ( ($_SESSION["guest_login"] == 0) && $HTTP_GET_VARS["showctrl"] ) {
-		echo $add_server_form;
-	}
-?>
-
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=5 style="background-color: #000000"><b>Server</b></td>
-</tr>
-<tr>
- <td valign=middle class="server-header"><b>Status</b></td>
- <td valign=middle class="server-header"><b>Server name</b></td>
- <td valign=middle class="server-header"><b>users</b></td>
- <td valign=middle class="server-line"><a href="servers.php?cmd=disconnect&amp;ip=0&amp;port=0">Disconnect</a></td>
- <td valign=middle class="server-header"><a href="servers.php?showctrl=1">Server Preferences</a></td>
-</tr>
-<tr>
-<?php
-		echo '<td valign=middle class="server-line">';
-		$stats = amule_get_stats();
-		if ( $stats["id"] == 0 ) {
-			echo "Not connected";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "Connecting ...";
-		} else {
-			echo "Connected with ", (($stats["id"] < 16777216) ? "low ID" : "high ID");
-		}
-		echo '</td><td valign=middle class="server-line">', $stats["serv_name"], '</td>';
-		echo '<td valign=middle class="server-line">', $stats["serv_users"], '</td>';
-		
-?>
- <td valign=middle class="server-header"><a href="servers.php?cmd=connect&amp;ip=0&amp;port=0">Connect to any server</a></td>
- <td valign=middle class="server-line"></td>
-</tr>
-</table>
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0 width="100%">
-<tr>
- <td class="smallheader" colspan=6 style="background-color: #000000"><b>Server list</b></td>
-</tr>
-<tr>
- <td valign=middle class="server-header-left"><a href="servers.php?sort=name"><b>Server name</b></a></td>
- <td valign=middle class="server-header"><a href="servers.php?sort=description"><b>Description</b></a></td>
- <td valign=middle class="server-header"><a href="servers.php?sort=ip"><b>IP</b></a></td>
- <td valign=middle class="server-header"><a href="servers.php?sort=users"><b>users</b></a></td>
- <td valign=middle class="server-header"><a href="servers.php?sort=files"><b>files</b></a></td>
- <td valign=middle class="server-header"><b>Actions</b></td>
-</tr>
-
-<?php
-	if ( ($HTTP_GET_VARS["cmd"] != "") && ($_SESSION["guest_login"] == 0) ) {
-		var_dump($HTTP_GET_VARS);
-		if ( $HTTP_GET_VARS["cmd"] == "add" ) {
-			amule_do_add_server_cmd($HTTP_GET_VARS["ip"], $HTTP_GET_VARS["port"], $HTTP_GET_VARS["name"]);
-		} else {
-			amule_do_server_cmd($HTTP_GET_VARS["ip"], $HTTP_GET_VARS["port"], $HTTP_GET_VARS["cmd"]);
-		}
-	}
-	
-	$servers = amule_load_vars("servers");
-
-	foreach ($servers as $srv) {
-		echo "<tr>";
-		echo '<td valign=middle class="server-line-left">', $srv->name, '</td>';
-		echo '<td valign=middle class="server-line">', $srv->desc, '</td>';
-		echo '<td valign=middle class="server-line">', $srv->addr, '</td>';
-		echo '<td valign=middle class="server-line">', $srv->users, '(', $srv->maxusers, ')', '</td>';
-		echo '<td valign=middle class="server-line">', $srv->files, '</td>';
-		if ( $_SESSION["guest_login"] == 0 ) {
-			echo '<td valign=middle class="server-line"><acronym title="Connect">',
-			'<a href="servers.php?cmd=connect&ip=', $srv->ip, '&port=', $srv->port,
-			'" style="text-decoration: none"><img src="l_connect.gif" alt="Connect"></a></acronym>',
-			'<acronym title="Remove selected server"><a href="servers.php?cmd=remove&ip=',
-			$srv->ip, '&port=', $srv->port,
-			"\" onclick=\"return confirm('Are you sure to remove this server from list?')\">",
-			'<img src="l_cancel.gif" alt="Remove selected server"></a></acronym>';
-		}
-		echo "</tr>";
-	}
-?>
-</table>
- </td>
-</tr>
-</table>
-</font></body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/default/shared.php Deleted

@@ -1,375 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<meta http-equiv="pragmas" content="no-cache">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"],
-			'; url=shared.php', '">';
-	}
-?>
-<style type="text/css">
-img
-{
-border : 0px;
-}
-a, a:active, a:link, a:visited
-{
-color: white;
-}
-.down-header, .down-header-left, .down-header-right,
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-header, .up-header-left, .up-line, .up-line-left,
-.server-header, .server-header-left, .server-line, .server-line-left,
-.shared-header, .shared-header-left, .shared-line, .shared-line-changed, 
-.shared-line-left, .shared-line-left-changed,
-.header, .smallheader, .commontext,
-.upqueue-header, .upqueue-line, .upqueue-line-left,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-font-family : Tahoma;
-font-size : 8pt;
-}
-.tabs
-{
-font-family : Tahoma;
-font-size : 10pt;
-background-color : #3399FF;
-}
-.down-header, .down-line, .down-line-good, .up-header, .up-line,
-.server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-.upqueue-header, .upqueue-line,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-text-align : center;
-}
-.down-header-left, .down-line-left, .down-line-good-left,
-.server-header-left, .server-line-left, .shared-header-left,
-.up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left
-{
-text-align : left;
-}
-.down-line-right, .down-line-good-right, .down-header-right
-{
-text-align : right;
-}
-.down-header, .down-header-left, .down-header-right,
-.up-header, .up-header-left, .server-header, .server-header-left,
-.shared-header, .shared-header-left, .upqueue-header,
-.websearch-header, .addserver-header
-{
-background-color : #0066CC;
-}
-.header
-{
-background-color : #0046AC;
-}
-.smallheader
-{
-background-color : #003399;
-color : #FFFFFF;
-}
-.commontext
-{
-background-color : #FFFFFF;
-color : #000000;
-}
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-line, .up-line-left, .server-line, .server-line-left,
-.shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-.upqueue-line, .upqueue-line-left,
-.websearch-line, .addserver-line
-{
-background-color : #3399FF;
-}
-.down-line-good, .down-line-good-left, .down-line-good-right, .shared-line-changed, .shared-line-left-changed
-{
-color : #F0F000;
-}
-.percent_table
-{
-border:0px solid #000000;
-border-collapse: collapse;
-}
-.message
-{
-font-size: 10pt;
-font-weight: bold;
-color: #FF0000;
-}
-.dinput
-{
-border-width: 1px;
-border-color: black;
-}
-</style>
-</head>
-<body bgcolor="#FBDE9C" text=white link="#3399FF" vlink="#3399FF" alink="#3399FF" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-<table border=0 width="100%" align=center cellpadding=4 cellspacing=0>
-<tr>
- <td class="tabs" align="left" colspan="2">
-
-  <table border="0" cellpadding="4" cellspacing="0">
-  <tr>
-	<td class="tabs" align="center">
-		&nbsp;<a href="http://www.amule.org" target="_blank"><img src="emule.gif"></a>
-		<font face="Tahoma" style="font-size:13pt;" color="#000000">aMule<br>Web Control Panel</font>
-	</td>
-	<td class="tabs" align="center" width="30">	&nbsp;	</td>
-
-  	<td align="center" class="tabs" width="95">
-  		<a href="servers.php">
-  			<img src="cp_servers.gif"><br>
-  			Server list
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="downloads.php">
-  			<img src="cp_download.gif"><br>
-
-  			Transfer
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="search.php">
-  			<img src="cp_search.gif"><br>
-  			Search
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-
-  		<a href="shared.php">
-  			<img src="cp_shared.gif"><br>
-  			Shared Files
-  		</a>
-  	<td align="center" class="tabs" width="110">
-		<a href="stat_tree.php">
-			<img src="cp_stats.gif"><br>
-  			Statistics</a>
-  		<font color="#000000">|</font>
-
-  		<a href="stat_graphs.php">Graphs</a>
-  	</td>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="preferences.php">
-  			<img src="cp_settings.gif"><br>
-  			Preferences
-  		</a>
-  	</td>
-
-  	<td class="tabs" align="center" width="30">&nbsp;</td>
-  	<td align="left" class="tabs" width="95">
-  		<img src="log.gif"> <a href="index.php?serverinfo=1">Serverinfo</a><br>
-  		<img src="log.gif"> <a href="index.php?log=1">Log</a>
-  	</td>
-  </tr>
-  </table>
-
- </td>
-</tr>
-<tr>
-<td style="background-color: #000000; height: 1px" colspan="2">
-</td>
-</tr>
-<tr>
- <td class="tabs">
- 	&nbsp;&nbsp;<b>Connection:</b>
- 	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["kad_connected"] == 1 ) {
-			echo "Connected";
-				if ( $stats["kad_firewalled"] == 1 ) {
-					echo " to KAD (firewalled), ";
-				} else {
-					echo " to KAD, ";
-				}
-		} else {
-			echo "Not connected to KAD, ";
-		}
-		if ( $stats["id"] == 0 ) {
-			echo "not connected to ED2K";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "connecting to ED2k";
-		} else {
-			echo "connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
-  <font color=black>
-
-	<script language="javascript">
-	var d = new Date();
-	s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-	document.write(s);
-</script>
-  </font>
- </td>
- <td align=right class=tabs>
-  <form>
-  <input type="button" value="ed2k://Download" onClick='self.location.href="index.php?links=1"'>
-  <input type="button" value="Logout" onClick='self.location.href="login.php"'>
-  </form>
- </td>
-</tr>
-</table><font face=Tahoma style="font-size:8pt;">
-<table align=center border=0 cellpadding=4 cellspacing=0 width="95%">
-<tr>
-
-<td valign=middle class="shared-header-left"><a href="shared.php?sort=name"><b>File Name</b></a></td>
-<td valign=middle class="shared-header">
-	<a href="shared.php?sort=xfer"><b>Transferred Data</b></a>&nbsp
-	<a href="shared.php?sort=allxfer">(Total)
-</td>
-<td valign=middle class="shared-header">
-	<a href="shared.php?sort=req"><b>Requests</b></a>&nbsp
-	<a href="shared.php?sort=allreq"><b>(Total)</b></a>&nbsp
-</td>
-
-<td valign=middle class="shared-header">
-	<a href="shared.php?sort=acc"><b>Accepted Requests</b></a>&nbsp
-	<a href="shared.php?sort=allacc"><b>(Total)</b></a>
-</td>
-<td valign=middle class="shared-header"><a href="shared.php?sort=size"><b>Size</b></a></td>
-<td valign=middle class="shared-header"><a href="shared.php?sort=priority"><b>Priority</b></a></td>
-<td valign=middle width="10%" class="shared-header"><b>ED2K Link(s)</b></td>
-</tr>
-<p align=center><div class="message"></div></p><br>
-
-	  <?php
-
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-		function PrioString($file)
-		{
-			$prionames = array(0 => "Low", 1 => "Normal", 2 => "High",
-				3 => "Very high", 4 => "Very low", 5=> "Auto", 6 => "Powershare");
-			$result = $prionames[$file->prio];
-			if ( $file->prio_auto == 1) {
-				$result = $result . "(auto)";
-			}
-			return $result;
-		}
-
-		//
-		// declare it here, before any function reffered it in "global"
-		//
-		$sort_order;$sort_reverse;
-
-		function my_cmp($a, $b)
-		{
-			global $sort_order, $sort_reverse;
-			
-			switch ( $sort_order) {
-				case "size": $result = $a->size > $b->size; break;
-				case "name": $result = $a->name > $b->name; break;
-				case "xfer": $result = $a->xfer > $b->xfer; break;
-				case "allxfer": $result = $a->xfer_all > $b->xfer_all; break;
-				case "acc": $result = $a->accept > $b->accept; break;
-				case "allacc": $result = $a->accept_all > $b->accept_all; break;
-				case "req": $result = $a->req > $b->req; break;
-				case "req_all": $result = $a->req_all > $b->req_all; break;
-				case "prio": $result = PrioString($a) > PrioString($b); break;
-			}
-
-			if ( $sort_reverse ) {
-				$result = !$result;
-			}
-			return $result;
-		}
-
-		if (($HTTP_GET_VARS["cmd"] != "") && ($_SESSION["guest_login"] == 0)) {
-			if ($HTTP_GET_VARS["cmd"] == "reload") {
-				amule_do_reload_shared_cmd();
-			} else {
-				amule_do_shared_cmd($HTTP_GET_VARS["file"], $HTTP_GET_VARS["cmd"]);
-			}
-		}
-		
-		$shared = amule_load_vars("shared");
-
-		$sort_order = $HTTP_GET_VARS["sort"];
-
-		if ( $sort_order == "" ) {
-			$sort_order = $_SESSION["shared_sort"];
-		} else {
-			if ( $_SESSION["sort_reverse"] == "" ) {
-				$_SESSION["sort_reverse"] = 0;
-			} else {
-				$_SESSION["sort_reverse"] = !$_SESSION["sort_reverse"];
-			}
-		}
-
-		$sort_reverse = $_SESSION["sort_reverse"];
-		if ( $sort_order != "" ) {
-			$_SESSION["shared_sort"] = $sort_order;
-			usort(&$shared, "my_cmp");
-		}
-
-		foreach ($shared as $file) {
-			echo '<tr>';
-			echo '<td valign=top class="shared-line-left"><acronym title="', $file->name, '">',
-				$file->name, '</acronym></td>';
-			echo '<td valign=top class="shared-line">', CastToXBytes($file->xfer),
-				'(', CastToXBytes($file->xfer_all),')</td>';
-				
-			echo '<td valign=top class="shared-line">' , $file->req, '(', $file->req_all,')</td>';
-			echo '<td valign=top class="shared-line">' , $file->accept, '(', $file->accept_all,')</td>';
-			echo '<td valign=top class="shared-line">', CastToXBytes($file->size), '</td>';
-			echo '<td valign=top class="shared-line">', PrioString($file), '</td>';
-			echo '<td valign=top class="shared-line"><acronym title="ED2K Link(s)"><a href="',
-				$file->link, '"><img src="l_ed2klink.gif" alt="ED2K Link(s)"></a></acronym>';
-
-			if ( $_SESSION["guest_login"] == 0 ) {
-				echo '<acronym title="Increase Priority"><a href="shared.php?cmd=prioup&file=', $file->hash,
-					'"><img src="l_up.gif" alt="Increase Priority"></a></acronym>';
-				echo '<acronym title="Decrease Priority"><a href="shared.php?cmd=priodown&file=', $file->hash,
-					'"><img src="l_down.gif" alt="Decrease Priority"></a></acronym>';
-			}
-		}
-		echo '</td>', "\n";
-		echo '</tr>', "\n";
-
-		?>
-
-</table>
-
-<p align="center">
-<form><input type="button" name="queue" value="Reload List" onClick="self.location.href='shared.php?cmd=reload'"></form>
-&nbsp;
-
-</p></body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/default/stat_graphs.php Deleted

@@ -1,271 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-?>
-<style type="text/css">
-img
-{
-border : 0px;
-}
-a, a:active, a:link, a:visited
-{
-color: white;
-}
-.down-header, .down-header-left, .down-header-right,
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-header, .up-header-left, .up-line, .up-line-left,
-.server-header, .server-header-left, .server-line, .server-line-left,
-.shared-header, .shared-header-left, .shared-line, .shared-line-changed, 
-.shared-line-left, .shared-line-left-changed,
-.header, .smallheader, .commontext,
-.upqueue-header, .upqueue-line, .upqueue-line-left,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-font-family : Tahoma;
-font-size : 8pt;
-}
-.tabs
-{
-font-family : Tahoma;
-font-size : 10pt;
-background-color : #3399FF;
-}
-.down-header, .down-line, .down-line-good, .up-header, .up-line,
-.server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-.upqueue-header, .upqueue-line,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-text-align : center;
-}
-.down-header-left, .down-line-left, .down-line-good-left,
-.server-header-left, .server-line-left, .shared-header-left,
-.up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left
-{
-text-align : left;
-}
-.down-line-right, .down-line-good-right, .down-header-right
-{
-text-align : right;
-}
-.down-header, .down-header-left, .down-header-right,
-.up-header, .up-header-left, .server-header, .server-header-left,
-.shared-header, .shared-header-left, .upqueue-header,
-.websearch-header, .addserver-header
-{
-background-color : #0066CC;
-}
-.header
-{
-background-color : #0046AC;
-}
-.smallheader
-{
-background-color : #003399;
-color : #FFFFFF;
-}
-.commontext
-{
-background-color : #FFFFFF;
-color : #000000;
-}
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-line, .up-line-left, .server-line, .server-line-left,
-.shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-.upqueue-line, .upqueue-line-left,
-.websearch-line, .addserver-line
-{
-background-color : #3399FF;
-}
-.down-line-good, .down-line-good-left, .down-line-good-right, .shared-line-changed, .shared-line-left-changed
-{
-color : #F0F000;
-}
-.percent_table
-{
-border:0px solid #000000;
-border-collapse: collapse;
-}
-.message
-{
-font-size: 10pt;
-font-weight: bold;
-color: #FF0000;
-}
-.dinput
-{
-border-width: 1px;
-border-color: black;
-}
-</style>
-</head>
-<body bgcolor="#FBDE9C" text=white link="#3399FF" vlink="#3399FF" alink="#3399FF" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-<table border=0 width="100%" align=center cellpadding=4 cellspacing=0>
-<tr>
- <td class="tabs" align="left" colspan="2">
-
-  <table border="0" cellpadding="4" cellspacing="0">
-  <tr>
-	<td class="tabs" align="center">
-		&nbsp;<a href="http://www.amule.org" target="_blank"><img src="emule.gif"></a>
-		<font face="Tahoma" style="font-size:13pt;" color="#000000">aMule<br>Web Control Panel</font>
-	</td>
-	<td class="tabs" align="center" width="30">&nbsp;		</td>
-
-  	<td align="center" class="tabs" width="95">
-  		<a href="servers.php">
-  			<img src="cp_servers.gif"><br>
-  			Server list
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="downloads.php">
-  			<img src="cp_download.gif"><br>
-
-  			Transfer
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="search.php">
-  			<img src="cp_search.gif"><br>
-  			Search
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-
-  		<a href="shared.php">
-  			<img src="cp_shared.gif"><br>
-  			Shared Files
-  		</a>
-  	<td align="center" class="tabs" width="110">
-		<a href="stat_tree.php">
-			<img src="cp_stats.gif"><br>
-  			Statistics</a>
-  		<font color="#000000">|</font>
-
-  		<a href="stat_graphs.php">Graphs</a>
-  	</td>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="preferences.php">
-  			<img src="cp_settings.gif"><br>
-  			Preferences
-  		</a>
-  	</td>
-
-  	<td class="tabs" align="center" width="30">&nbsp;</td>
-  	<td align="left" class="tabs" width="95">
-  		<img src="log.gif"> <a href="index.php?serverinfo=1">Serverinfo</a><br>
-  		<img src="log.gif"> <a href="index.php?log=1">Log</a>
-  	</td>
-  </tr>
-  </table>
-
- </td>
-</tr>
-<tr>
-<td style="background-color: #000000; height: 1px" colspan="2">
-</td>
-</tr>
-<tr>
- <td class="tabs">
- 	&nbsp;&nbsp;<b>Connection:</b> 
-	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["kad_connected"] == 1 ) {
-			echo "Connected";
-				if ( $stats["kad_firewalled"] == 1 ) {
-					echo " to KAD (firewalled), ";
-				} else {
-					echo " to KAD, ";
-				}
-		} else {
-			echo "Not connected to KAD, ";
-		}
-		if ( $stats["id"] == 0 ) {
-			echo "not connected to ED2K";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "connecting to ED2k";
-		} else {
-			echo "connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
- 
-  <font color=black>
-
-	<script type="text/javascript" language="javascript">
-	var d = new Date();
-	s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-	document.write(s);
-</script>
-  </font>
- </td>
- <td align=left class=tabs>
-  <form>
-  <input type="button" value="ed2k://Download" onClick='self.location.href="index.php?links=1"'>
-  <input type="button" value="Logout" onClick='self.location.href="login.php"'>
-  </form>
- </td>
-</tr>
-</table>
-
-&nbsp;
-
-<?php
-	// reload graphs data
-	amule_load_vars("stats_graph");
-?>
-
-<table border=0 align=center cellpadding=4 cellspacing=0>
-<tr>
-<td class="websearch-line"><img src="amule_stats_download.png" width="500" height="200" border="0" alt="" title="" /></td>
-</tr>
-<tr>
-<td width="600" class="websearch-line"><b><font face=Tahoma style="font-size:8pt;">Download speed</font></b></td>
-</tr>
-</table>
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0>
-<tr>
-<td class="websearch-line"><img src="amule_stats_upload.png" width="500" height="200" border="0" alt="" title="" /></td>
-</tr>
-<tr>
-<td width="600" class="websearch-line"><b><font face=Tahoma style="font-size:8pt;">Upload speed</font></b></td>
-</tr>
-</table>
-&nbsp;
-<table border=0 align=center cellpadding=4 cellspacing=0>
-<tr>
-<td class="websearch-line"><img src="amule_stats_conncount.png" width="500" height="200" border="0" alt="" title="" /></td>
-</tr>
-<tr>
-<td width="600" class="websearch-line"><b><font face=Tahoma style="font-size:8pt;">Number of connections</font></b></td>
-</tr>
-</table>
-
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/default/stat_tree.php Deleted

@@ -1,328 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=UTF-8">
-<META HTTP-EQUIV="PRAGMAS" CONTENT="NO-CACHE">
-<?php
-	echo "<title>aMule " , amule_get_version(), " - Web Control Panel</title>";
-?>
-
-<style type="text/css">
-img
-{
-border : 0px;
-}
-a, a:active, a:link, a:visited
-{
-color: white;
-}
-.down-header, .down-header-left, .down-header-right,
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-header, .up-header-left, .up-line, .up-line-left,
-.server-header, .server-header-left, .server-line, .server-line-left,
-.shared-header, .shared-header-left, .shared-line, .shared-line-changed, 
-.shared-line-left, .shared-line-left-changed,
-.header, .smallheader, .commontext,
-.upqueue-header, .upqueue-line, .upqueue-line-left,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-font-family : Tahoma;
-font-size : 8pt;
-}
-.tabs
-{
-font-family : Tahoma;
-font-size : 10pt;
-background-color : #3399FF;
-}
-.down-header, .down-line, .down-line-good, .up-header, .up-line,
-.server-header, .server-line, .shared-header, .shared-line, .shared-line-changed,
-.upqueue-header, .upqueue-line,
-.websearch-header, .websearch-line, .addserver-header, .addserver-line
-{
-text-align : center;
-}
-.down-header-left, .down-line-left, .down-line-good-left,
-.server-header-left, .server-line-left, .shared-header-left,
-.up-header-left, .up-line-left, .shared-line-left, .shared-line-left-changed, .upqueue-line-left
-{
-text-align : left;
-}
-.down-line-right, .down-line-good-right, .down-header-right
-{
-text-align : right;
-}
-.down-header, .down-header-left, .down-header-right,
-.up-header, .up-header-left, .server-header, .server-header-left,
-.shared-header, .shared-header-left, .upqueue-header,
-.websearch-header, .addserver-header
-{
-background-color : #0066CC;
-}
-.header
-{
-background-color : #0046AC;
-}
-.smallheader
-{
-background-color : #003399;
-color : #FFFFFF;
-}
-.commontext
-{
-background-color : #FFFFFF;
-color : #000000;
-}
-.down-line, .down-line-good, .down-line-left, .down-line-good-left,
-.down-line-right, .down-line-good-right,
-.up-line, .up-line-left, .server-line, .server-line-left,
-.shared-line, .shared-line-changed, .shared-line-left, .shared-line-left-changed,
-.upqueue-line, .upqueue-line-left,
-.websearch-line, .addserver-line
-{
-background-color : #3399FF;
-}
-.down-line-good, .down-line-good-left, .down-line-good-right, .shared-line-changed, .shared-line-left-changed
-{
-color : #F0F000;
-}
-.percent_table
-{
-border:0px solid #000000;
-border-collapse: collapse;
-}
-.message
-{
-font-size: 10pt;
-font-weight: bold;
-color: #FF0000;
-}
-.dinput
-{
-border-width: 1px;
-border-color: black;
-}
-
-.trigger {
-	cursor: pointer;
-	cursor: hand;
-	font-family: Tahoma;
-	font-size: small;
-    color: #000000;
-}
-
-.branch {
-	display: block;
-	margin-left: 16px;
-	font-family: Tahoma;
-	font-size: small;
-    color: #000000;
-}
-
-</style>
-
-<script language="JavaScript" type="text/JavaScript">
-var openImg = new Image();
-openImg.src = "tree-open.gif";
-var closedImg = new Image();
-closedImg.src = "tree-closed.gif";
-
-function showBranch(branch){
-	var objBranch = document.getElementById(branch).style;
-	if(objBranch.display=="block")
-		objBranch.display="none";
-	else
-		objBranch.display="block";
-}
-
-function swapFolder(img){
-	objImg = document.getElementById(img);
-	if(objImg.src.indexOf('tree-closed.gif')>-1)
-		objImg.src = openImg.src;
-	else
-		objImg.src = closedImg.src;
-}
-
-</script>
-
-</head>
-<body bgcolor="#FBDE9C" text=white link="#3399FF" vlink="#3399FF" alink="#3399FF" marginwidth=0 marginheight=0 topmargin=0 leftmargin=0 style="margin:0px">
-<table border=0 width="100%" align=center cellpadding=4 cellspacing=0>
-<tr>
- <td class="tabs" align="left" colspan="2">
-
-  <table border="0" cellpadding="4" cellspacing="0">
-  <tr>
-	<td class="tabs" align="center">
-		&nbsp;<a href="http://www.amule.org" target="_blank"><img src="emule.gif"></a>
-		<font face="Tahoma" style="font-size:13pt;" color="#000000">aMule<br>Web Control Panel</font>
-	</td>
-	<td class="tabs" align="center" width="30">&nbsp;		</td>
-
-  	<td align="center" class="tabs" width="95">
-  		<a href="servers.php">
-  			<img src="cp_servers.gif"><br>
-  			Server list
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="downloads.php">
-  			<img src="cp_download.gif"><br>
-
-  			Transfer
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="search.php">
-  			<img src="cp_search.gif"><br>
-  			Search
-  		</a>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-
-  		<a href="shared.php">
-  			<img src="cp_shared.gif"><br>
-  			Shared Files
-  		</a>
-  	<td align="center" class="tabs" width="110">
-		<a href="stat_tree.php">
-			<img src="cp_stats.gif"><br>
-  			Statistics</a>
-  		<font color="#000000">|</font>
-
-  		<a href="stat_graphs.php">Graphs</a>
-  	</td>
-  	</td>
-  	<td align="center" class="tabs" width="95">
-  		<a href="preferences.php">
-  			<img src="cp_settings.gif"><br>
-  			Preferences
-  		</a>
-  	</td>
-
-  	<td class="tabs" align="center" width="30">&nbsp;</td>
-  	<td align="left" class="tabs" width="95">
-  		<img src="log.gif"> <a href="index.php?serverinfo=1">Serverinfo</a><br>
-  		<img src="log.gif"> <a href="index.php?log=1">Log</a>
-  	</td>
-  </tr>
-  </table>
-
- </td>
-</tr>
-<tr>
-<td style="background-color: #000000; height: 1px" colspan="2">
-</td>
-</tr>
-<tr>
- <td class="tabs">
- 	&nbsp;&nbsp;<b>Connection:</b> 
-	<?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		$stats = amule_get_stats();
-		if ( $stats["kad_connected"] == 1 ) {
-			echo "Connected";
-				if ( $stats["kad_firewalled"] == 1 ) {
-					echo " to KAD (firewalled), ";
-				} else {
-					echo " to KAD, ";
-				}
-		} else {
-			echo "Not connected to KAD, ";
-		}
-		if ( $stats["id"] == 0 ) {
-			echo "not connected to ED2K";
-		} elseif ( $stats["id"] == 0xffffffff ) {
-			echo "connecting to ED2k";
-		} else {
-			echo "connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-				$stats["serv_name"], "  ", $stats["serv_addr"];
-		}
-		echo '<br>&nbsp;&nbsp;<b>Speed:</b> Up: ', CastToXBytes($stats["speed_up"]), 'ps',
-			' | Down: ', CastToXBytes($stats["speed_down"]), 'ps',
-			'<small> (Limits: ', CastToXBytes($stats["speed_limit_up"]), 'ps/',
-			CastToXBytes($stats["speed_limit_down"]), 'ps)</small>&nbsp;';
-	?>
- 
-  <font color=black>
-
-	<script type="text/javascript" language="javascript">
-	var d = new Date();
-	s = "[ " + d.getDate() + "/" + (d.getMonth() + 1) + "/" + d.getFullYear() + " " + d.getHours() + ":" + (d.getMinutes() < 10 ? "0" : "") + d.getMinutes() + ":" + (d.getSeconds() < 10 ? "0" : "") + d.getSeconds() + " ]";
-	document.write(s);
-</script>
-  </font>
- </td>
- <td align=left class=tabs>
-  <form>
-  <input type="button" value="ed2k://Download" onClick='self.location.href="index.php?links=1"'>
-  <input type="button" value="Logout" onClick='self.location.href="login.php"'>
-  </form>
- </td>
-</tr>
-</table>
-
-&nbsp;
-<?php
-
-function print_ident($i)
-{
-	while($i != 0) {
-		echo "\t";
-		$i--;
-	}
-}
-
-function print_item($it, $ident)
-{
-	print_ident($ident);
-	echo "<img src=\"tree-leaf.gif\">", $it, "<br>\n";
-}
-
-function print_folder($key, &$arr, $ident)
-{
-	print_ident($ident);
-	echo "<span class=\"trigger\" onClick=\"showBranch('br_",
-		$key, "');swapFolder('fl_", $key, "')\">\n";
-	print_ident($ident+1);
-	echo "<img src=\"tree-closed.gif\" border=\"0\" id=\"fl_", $key, "\">\n";
-	print_ident($ident+1);
-	echo $key, "<br>\n";
-	print_ident($ident);
-	echo "</span>\n";
-	print_ident($ident);
-	echo "<span class=\"branch\" id=\"br_", $key, "\">\n";
-
-	foreach ($arr as $k => $v) {
-		if ( count(&$v) ) {
-			print_folder($k, $v, $ident+1);
-		} else {
-			print_item($k, $ident+1);
-		}
-	}
-
-	print_ident($ident);
-	echo "</span>\n";
-}
-
-	$stattree = amule_load_vars("stats_tree");
-
-	print_folder("Statistics", $stattree, 1);
-?>
-
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/default/transparent.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/Makefile.am Deleted

@@ -1,74 +0,0 @@
-dist_webserver_DATA = \
-	amuleweb-main-dload.php \
-	amuleweb-main-kad.php \
-	amuleweb-main-log.php \
-	amuleweb-main-prefs.php \
-	amuleweb-main-search.php \
-	amuleweb-main-servers.php \
-	amuleweb-main-shared.php \
-	amuleweb-main-stats.php \
-	black.gif \
-	blank1x1.gif \
-	blue1.gif \
-	blue2.gif \
-	blue3.gif \
-	blue4.gif \
-	blue5.gif \
-	blue6.gif \
-	cancel.gif \
-	close.png \
-	col.png \
-	connect.gif \
-	down.png \
-	edkserv_0.png \
-	edkserv_1.png \
-	favicon.ico \
-	filter.png \
-	fond.gif \
-	fond_haut.png \
-	footer.php \
-	index.html \
-	kitty.gif \
-	loginfond.gif \
-	loginfond_haut.png \
-	loginlogo.jpg \
-	loginlogo.png \
-	login.php \
-	logo.png \
-	log.php \
-	maquette.dwt \
-	ok.png \
-	pause.png \
-	play.png \
-	red.gif \
-	refresh.png \
-	search_0.png \
-	search_1.png \
-	shared_0.png \
-	shared_1.png \
-	sheserv_0.png \
-	sheserv_1.png \
-	stats_0.png \
-	stats_1.png \
-	stats.php \
-	stats_tree.php \
-	style.css \
-	tab_bottom_left.png \
-	tab_bottom.png \
-	tab_bottom_right.png \
-	tab_left.png \
-	tab_right.png \
-	tab_top_left.png \
-	tab_top.png \
-	tab_top_right.png \
-	transf_0.png \
-	transf_1.png \
-	tree-closed.gif \
-	tree-leaf.gif \
-	tree-open.gif \
-	up.png \
-	yellow.gif
-
-webserverdir = $(pkgdatadir)/webserver/litoral
-
-MAINTAINERCLEANFILES = Makefile.in

aMule-2.2.6.tar.bz2/src/webserver/litoral/Makefile.in Deleted

@@ -1,558 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/webserver/litoral
-DIST_COMMON = $(dist_webserver_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \
-	$(top_srcdir)/m4/build-tools.m4 $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/cryptopp.m4 $(top_srcdir)/m4/fallocate.m4 \
-	$(top_srcdir)/m4/gdlib.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
-	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
-	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(webserverdir)"
-dist_webserverDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_webserver_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
-ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
-ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
-ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
-AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
-AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
-AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BFD_CPPFLAGS = @BFD_CPPFLAGS@
-BFD_LIBS = @BFD_LIBS@
-BUILD_CC = @BUILD_CC@
-BUILD_CFLAGS = @BUILD_CFLAGS@
-BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
-BUILD_EXEEXT = @BUILD_EXEEXT@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BUILD_LDFLAGS = @BUILD_LDFLAGS@
-CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
-CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
-CRYPTOPP_LDFLAGS = @CRYPTOPP_LDFLAGS@
-CRYPTOPP_LIBS = @CRYPTOPP_LIBS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
-ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
-EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
-EXEEXT = @EXEEXT@
-GDLIB_CFLAGS = @GDLIB_CFLAGS@
-GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
-GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
-GDLIB_LIBS = @GDLIB_LIBS@
-GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
-GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
-GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
-GEOIP_LIBS = @GEOIP_LIBS@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-INCINTL = @INCINTL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
-LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@
-LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@
-LIBPNG_LIBS = @LIBPNG_LIBS@
-LIBS = @LIBS@
-LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@
-LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@
-LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@
-LIBUPNP_LIBS = @LIBUPNP_LIBS@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
-MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-MULECFLAGS = @MULECFLAGS@
-MULECPPFLAGS = @MULECPPFLAGS@
-MULECXXFLAGS = @MULECXXFLAGS@
-MULELDFLAGS = @MULELDFLAGS@
-MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-POW_LIB = @POW_LIB@
-RANLIB = @RANLIB@
-RC = @RC@
-RCFLAGS = @RCFLAGS@
-READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
-RESOLV_LIB = @RESOLV_LIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
-WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
-WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
-WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
-WX_CFLAGS = @WX_CFLAGS@
-WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
-WX_CONFIG_PATH = @WX_CONFIG_PATH@
-WX_CPPFLAGS = @WX_CPPFLAGS@
-WX_CXXFLAGS = @WX_CXXFLAGS@
-WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
-WX_DEBUG = @WX_DEBUG@
-WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
-WX_PORT = @WX_PORT@
-WX_RESCOMP = @WX_RESCOMP@
-WX_SHARED = @WX_SHARED@
-WX_UNICODE = @WX_UNICODE@
-WX_VERSION_FULL = @WX_VERSION_FULL@
-WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
-WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
-XGETTEXT = @XGETTEXT@
-YACC = @YACC@
-ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
-ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-docdir = @docdir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-dist_webserver_DATA = \
-	amuleweb-main-dload.php \
-	amuleweb-main-kad.php \
-	amuleweb-main-log.php \
-	amuleweb-main-prefs.php \
-	amuleweb-main-search.php \
-	amuleweb-main-servers.php \
-	amuleweb-main-shared.php \
-	amuleweb-main-stats.php \
-	black.gif \
-	blank1x1.gif \
-	blue1.gif \
-	blue2.gif \
-	blue3.gif \
-	blue4.gif \
-	blue5.gif \
-	blue6.gif \
-	cancel.gif \
-	close.png \
-	col.png \
-	connect.gif \
-	down.png \
-	edkserv_0.png \
-	edkserv_1.png \
-	favicon.ico \
-	filter.png \
-	fond.gif \
-	fond_haut.png \
-	footer.php \
-	index.html \
-	kitty.gif \
-	loginfond.gif \
-	loginfond_haut.png \
-	loginlogo.jpg \
-	loginlogo.png \
-	login.php \
-	logo.png \
-	log.php \
-	maquette.dwt \
-	ok.png \
-	pause.png \
-	play.png \
-	red.gif \
-	refresh.png \
-	search_0.png \
-	search_1.png \
-	shared_0.png \
-	shared_1.png \
-	sheserv_0.png \
-	sheserv_1.png \
-	stats_0.png \
-	stats_1.png \
-	stats.php \
-	stats_tree.php \
-	style.css \
-	tab_bottom_left.png \
-	tab_bottom.png \
-	tab_bottom_right.png \
-	tab_left.png \
-	tab_right.png \
-	tab_top_left.png \
-	tab_top.png \
-	tab_top_right.png \
-	transf_0.png \
-	transf_1.png \
-	tree-closed.gif \
-	tree-leaf.gif \
-	tree-open.gif \
-	up.png \
-	yellow.gif
-
-webserverdir = $(pkgdatadir)/webserver/litoral
-MAINTAINERCLEANFILES = Makefile.in
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/webserver/litoral/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/webserver/litoral/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-dist_webserverDATA: $(dist_webserver_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(webserverdir)" || $(mkdir_p) "$(DESTDIR)$(webserverdir)"
-	@list='$(dist_webserver_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_webserverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(webserverdir)/$$f'"; \
-	  $(dist_webserverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(webserverdir)/$$f"; \
-	done
-
-uninstall-dist_webserverDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_webserver_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(webserverdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(webserverdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(webserverdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dist_webserverDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_webserverDATA uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-dist_webserverDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_webserverDATA uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

aMule-2.2.6.tar.bz2/src/webserver/litoral/amuleweb-main-dload.php Deleted

@@ -1,518 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>aMule control panel</title>
-<?php
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
-	}
-?><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<script language="JavaScript" type="text/JavaScript">
-
-</script>
-
-<link href="style.css" rel="stylesheet" type="text/css">
-<style type="text/css">
-
-</style>
-</head><script language="JavaScript" type="text/JavaScript">
-function formCommandSubmit(command)
-{
-	if ( command == "cancel" ) {
-		var res = confirm("Delete selected files ?")
-		if ( res == false ) {
-			return;
-		}
-	}
-	if ( command != "filter" ) {
-		<?php
-			if ($_SESSION["guest_login"] != 0) {
-					echo 'alert("You logged in as guest - commands are disabled");';
-					echo "return;";
-			}
-		?>
-	}
-	var frm=document.forms.mainform
-	frm.command.value=command
-	frm.submit()
-}
-
-</script>
-<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png')">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr valign="top"> 
-    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
-    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
-          <td><img src="images/col.png"></td>
-          <td width="10"></td>
-          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br>
-            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a>
-            </td>
-          <td width="10"></td>
-        </tr>
-      </table></td>
-  </tr>
-  <tr align="center" valign="top"> 
-    <td colspan="2"><form action="amuleweb-main-dload.php" method="post" name="mainform">
-        <table width="100%" border="0" cellpadding="0" cellspacing="0">
-          <tr>
-      <td align="center"><table border="0" cellpadding="0" cellspacing="0">
-          <tr> 
-            <td><input type="hidden" name="command"></td>
-            <td><a href="javascript:formCommandSubmit('pause');" onClick="MM_nbGroup('down','group1','pause','',1)" onMouseOver="MM_nbGroup('over','pause','','',1)" onMouseOut="MM_nbGroup('out')"><img name="pause" src="images/pause.png" alt="pause" border="0" onLoad=""></a></td>
-            <td><a href="javascript:formCommandSubmit('resume');" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img img name="resume" src="images/play.png" alt="resume" border="0" onLoad=""></a></td>
-        		<td><a href="javascript:formCommandSubmit('prioup');" onClick="MM_nbGroup('down','group1','up','',1)" onMouseOver="MM_nbGroup('over','up','','',1)" onMouseOut="MM_nbGroup('out')"><img img name="prioup" src="images/up.png" alt="prioup" border="0" onLoad=""></a></td>
-        		<td><a href="javascript:formCommandSubmit('priodown');" onClick="MM_nbGroup('down','group1','down','',1)" onMouseOver="MM_nbGroup('over','down','','',1)" onMouseOut="MM_nbGroup('out')"><img img name="priodown" src="images/down.png" alt="priodown" border="0" onLoad=""></a></td>
-        		<td><a href="javascript:formCommandSubmit('cancel');" onClick="MM_nbGroup('down','group1','cancel','',1)" onMouseOver="MM_nbGroup('over','delete','','',1)" onMouseOut="MM_nbGroup('out')"><img img name="cancel" src="images/close.png" alt="cancel" border="0" onLoad=""></a></td>
-      <td><table border="0" cellpadding="0" cellspacing="0">
-                <tr> 
-                  <td> 
-                    <?php
-        	$all_status = array("all", "Waiting", "Paused", "Downloading");	
- 			if ( $HTTP_GET_VARS["command"] == "filter") {
- 				$_SESSION["filter_status"] = $HTTP_GET_VARS["status"];
- 				$_SESSION["filter_cat"] = $HTTP_GET_VARS["category"];
- 			}
-        	if ( $_SESSION["filter_status"] == '') $_SESSION["filter_status"] = 'all';
-        	if ( $_SESSION["filter_cat"] == '') $_SESSION["filter_cat"] = 'all';
-
-        	echo '<select name="status"> ';
-        	foreach ($all_status as $s) {
-        		echo (($s == $_SESSION["filter_status"]) ? '<option selected>' : '<option>'), $s, '</option>';
-        	}
-        	echo '</select>';
-        	//var_dump($_SESSION["filter_cat"]);
-        	echo '<select name="category" id="category">';
-			$cats = amule_get_categories();
-			foreach($cats as $c) {
-				echo (($c == $_SESSION["filter_cat"]) ? '<option selected>' : '<option>'), $c, '</option>';
-			}
-			echo '</select>';
-        ?>
-                  </td>
-                  			<td><a href="javascript:formCommandSubmit('filter');" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/filter.png" border="0" alt="Apply" name="resume" border="0" onload=""></a></td>
-                  <td>&nbsp;</td>
-                  <td>&nbsp;</td>
-                  <td> 
-                    <?php
-		 	if ($_SESSION["guest_login"] != 0) {
-				echo "<b>&nbsp;You logged in as guest - commands are disabled</b>";
-			}
-		 ?>
-                  </td>
-                </tr>
-              </table></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr> 
-      <td height="10" align="center"> </td>
-    </tr>
-    <tr> 
-      <td colspan="2"><table width="100%" border="0" cellspacing="0" cellpadding="0"> <caption>
-          DOWNLOAD 
-          </caption>
-  <tr>
-    <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
-    <td background="images/tab_top.png">&nbsp;</td>
-    <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
-  </tr>
-  <tr>
-    <td width="24" background="images/tab_left.png">&nbsp;</td>
-    <td bgcolor="#FFFFFF"><table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
-                     
-          <tr> 
-                  <th>&nbsp;</th>
-                  <th><a href="amuleweb-main-dload.php?sort=name">File name</a></th>
-                  <th><a href="amuleweb-main-dload.php?sort=size">Size</a></th>
-                  <th><a href="amuleweb-main-dload.php?sort=size_done">Completed</a></th>
-                  <th><a href="amuleweb-main-dload.php?sort=speed">Download speed</a></th>
-                  <th><a href="amuleweb-main-dload.php?sort=progress">Progress</a></th>
-                  <th><a href="amuleweb-main-dload.php?sort=srccount">Sources</a></th>
-                  <th><a href="amuleweb-main-dload.php?sort=status">Status</a></th>
-                  <th><a href="amuleweb-main-dload.php?sort=prio">Priority</a></th>
-          </tr><tr><td colspan="9" height="1" bgcolor="#000000"></td></tr>
-          <?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " b";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . " kb";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . " mb";
-			} else {
-				$result = ($size / 1073741824.0) . " gb";
-			}
-			return $result;
-		}
-
-		function StatusString($file)
-		{
-			if ( $file->status == 7 ) {
-				return "Paused";
-			} elseif ( $file->src_count_xfer > 0 ) {
-				return "Downloading";
-			} else {
-				return "Waiting";
-			}
-		}
-
-		function PrioString($file)
-		{
-			$prionames = array(0 => "Low", 1 => "Normal", 2 => "High",
-				3 => "Very high", 4 => "Very low", 5=> "Auto", 6 => "Release");
-			$result = $prionames[$file->prio];
-			if ( $file->prio_auto == 1) {
-				$result = $result . "(auto)";
-			}
-			return $result;
-		}
-		
-		//
-		// declare it here, before any function reffered it in "global"
-		//
-		$sort_order;$sort_reverse;
-
-		function my_cmp($a, $b)
-		{
-			global $sort_order, $sort_reverse;
-			
-			switch ( $sort_order) {
-				case "size": $result = $a->size > $b->size; break;
-				case "size_done": $result = $a->size_done > $b->size_done; break;
-				case "progress": $result = (((float)$a->size_done)/((float)$a->size)) > (((float)$b->size_done)/((float)$b->size)); break;
-				case "name": $result = $a->name > $b->name; break;
-				case "speed": $result = $a->speed > $b->speed; break;
-				case "scrcount": $result = $a->src_count > $b->src_count; break;
-				case "status": $result = StatusString($a) > StatusString($b); break;
-				case "prio": $result = PrioString($a) > PrioString($b); break;
-			}
-
-			if ( $sort_reverse ) {
-				$result = !$result;
-			}
-			//var_dump($sort_reverse);
-			return $result;
-		}
-
-		//
-		// perform command b20efore processing content
-
-		if ( ($HTTP_GET_VARS["command"] != "") && ($_SESSION["guest_login"] == 0) ) {
-			foreach ( $HTTP_GET_VARS as $name => $val) {
-				// this is file checkboxes
-				if ( (strlen($name) == 32) and ($val == "on") ) {
-					//var_dump($name);
-					amule_do_download_cmd($name, $HTTP_GET_VARS["command"]);
-				}
-			}
-			//
-			// check "filter-by-status" settings
-			//
-			if ( $HTTP_GET_VARS["command"] == "filter") {
-				//var_dump($_SESSION);
-				$_SESSION["filter_status"] = $HTTP_GET_VARS["status"];
-				$_SESSION["filter_cat"] = $HTTP_GET_VARS["category"];
-			}
-		}
-		if ( $_SESSION["filter_status"] == "") $_SESSION["filter_status"] = "all";
-		if ( $_SESSION["filter_cat"] == "") $_SESSION["filter_cat"] = "all";
-		
-		$downloads = amule_load_vars("downloads");
-
-		$sort_order = $HTTP_GET_VARS["sort"];
-
-		if ( $sort_order == "" ) {
-			$sort_order = $_SESSION["download_sort"];
-		} else {
-			if ( $_SESSION["download_sort_reverse"] == "" ) {
-				$_SESSION["download_sort_reverse"] = 0;
-			} else {
-				if ( $HTTP_GET_VARS["sort"] != '') {
-					$_SESSION["download_sort_reverse"] = !$_SESSION["download_sort_reverse"];
-				}
-			}
-		}
-		//var_dump($_SESSION);
-		$sort_reverse = $_SESSION["download_sort_reverse"];
-		if ( $sort_order != "" ) {
-			$_SESSION["download_sort"] = $sort_order;
-			usort(&$downloads, "my_cmp");
-		}
-
-		//
-		// Prepare categories index array
-		$cats = amule_get_categories();
-		foreach($cats as $i => $c) {
-			$cat_idx[$c] = $i;
-		}
-
-		foreach ($downloads as $file) {
-			$filter_status_result = ($_SESSION["filter_status"] == "all") or
-				($_SESSION["filter_status"] == StatusString($file));
-				
-			$filter_cat_result = ($_SESSION["filter_cat"] == "all") or
-				($cat_idx[ $_SESSION["filter_cat"] ] == $file->category);
-
-			if ( $filter_status_result and $filter_cat_result) {
-				print "<tr>";
-	
-				echo "<td class='texte' height='22'>", '<input type="checkbox" name="', $file->hash, '" >', "</td>";
-	
-				echo "<td class='texte' height='22'>", $file->short_name, "</td>";
-				
-				echo "<td class='texte' height='22' align='center'>", CastToXBytes($file->size), "</td>";
-
-				echo "<td class='texte' height='22' align='center'>", CastToXBytes($file->size_done), "&nbsp;(",
-					((float)$file->size_done*100)/((float)$file->size), "%)</td>";
-
-				echo "<td class='texte' height='22' align='center'>", ($file->speed > 0) ? (CastToXBytes($file->speed) . "/s") : "-", "</td>";
-
-				echo "<td class='texte' height='22' align='center' align='center'>", $file->progress, "</td>";
-	
-				echo "<td class='texte' height='22' align='center'>";
-				if ( $file->src_count_not_curr != 0 ) {
-					echo $file->src_count - $file->src_count_not_curr, " / ";
-				}
-				echo $file->src_count, " ( ", $file->src_count_xfer, " ) ";
-				if ( $file->src_count_a4af != 0 ) {
-					echo "+ ", $file->src_count_a4af;
-				}
-				echo "</td>";
-	
-				echo "<td class='texte' height='22' align='center'>", StatusString($file), "</td>";
-				
-				echo "<td class='texte' height='22' align='center'>", PrioString($file), "</td>";
-				
-				print "</tr><tr><td colspan='9' height='1' bgcolor='#c0c0c0'></td></tr>";
-			}
-		}
-	  ?>
-        </table></td>
-    <td width="24" background="images/tab_right.png">&nbsp;</td>
-  </tr>
-  <tr>
-    <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
-    <td background="images/tab_bottom.png">&nbsp;</td>
-    <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
-  </tr>
-</table></td>
-    </tr>
-  </table>
-</form>
-      <table width="100%" border="0" cellspacing="0" cellpadding="0"><caption>
-        UPLOAD 
-        </caption>
-        <tr> 
-          <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
-          <td background="images/tab_top.png">&nbsp;</td>
-          <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
-        </tr>
-        <tr> 
-          <td width="24" background="images/tab_left.png">&nbsp;</td>
-          <td bgcolor="#FFFFFF"><table width="100%" border="0" align="center" cellpadding="0" cellspacing="0" class="doad-table">
-              
-        <tr> 
-                <td>&nbsp;</td>
-                <th>File Name</th>
-                <th>Username</th>
-                <th>Up</th>
-                <th>Down</th>
-                <th>&nbsp;</th>
-                <th>&nbsp;</th>
-                <th>Speed</th>
-                <td>&nbsp;</td>
-        </tr><tr><td colspan="9" height="1" bgcolor="#000000"></td></tr>
-        <?php
-			function CastToXBytes($size)
-			{
-				if ( $size < 1024 ) {
-					$result = $size . " b";
-				} elseif ( $size < 1048576 ) {
-					$result = ($size / 1024.0) . " kb";
-				} elseif ( $size < 1073741824 ) {
-					$result = ($size / 1048576.0) . " mb";
-				} else {
-					$result = ($size / 1073741824.0) . " gb";
-				}
-				return $result;
-			}
-			$uploads = amule_load_vars("uploads");
-			foreach ($uploads as $file) {
-				echo "<tr>";
-	
-				echo "<td class='texte' height='22' align='center'>", "</td>";
-				
-				echo "<td class='texte' height='22'>", $file->short_name, "</td>";
-
-				echo "<td class='texte' height='22' align='center'>", $file->user_name, "</td>";
-	
-				echo "<td class='texte' height='22' align='center'>", CastToXBytes($file->xfer_up), "</td>";
-				echo "<td class='texte' height='22' align='center'>", CastToXBytes($file->xfer_down), "</td>";
-				echo "<td class='texte' height='22' align='center'>", "</td>";
-				echo "<td class='texte' height='22' align='center'>", "</td>";
-				echo "<td class='texte' height='22' align='center'>", ($file->xfer_speed > 0) ? (CastToXBytes($file->xfer_speed) . "/s") : "-", "</td>";
-				echo "<td class='texte' height='22' align='center'>", "</td>";
-				echo "</tr><tr><td colspan='9' height='1' bgcolor='#c0c0c0'></td></tr>";
-			}
-		?>
-      </table></td>
-          <td width="24" background="images/tab_right.png">&nbsp;</td>
-        </tr>
-        <tr> 
-          <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
-          <td background="images/tab_bottom.png">&nbsp;</td>
-          <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
-        </tr>
-      </table>
-      
-    </td>
-  </tr>
-  <tr valign="bottom"> 
-    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
-        <tr align="center" valign="middle"> 
-          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">ed2klink</iframe> 
-          </td>
-          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
-          </td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/amuleweb-main-kad.php Deleted

@@ -1,214 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>aMule control panel</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<?php
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
-	}
-
-	amule_load_vars("stats_graph");
-?>
-<script language="JavaScript" type="text/JavaScript">
-
-</script>
-<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
-
-</style>
-</head><script language="JavaScript" type="text/JavaScript">
-function formCommandSubmit(command)
-{
-	if ( command == "cancel" ) {
-		var res = confirm("Delete selected files ?")
-		if ( res == false ) {
-			return;
-		}
-	}
-	if ( command != "filter" ) {
-		<?php
-			if ($_SESSION["guest_login"] != 0) {
-					echo 'alert("You logged in as guest - commands are disabled");';
-					echo "return;";
-			}
-		?>
-	}
-	var frm=document.forms.mainform
-	frm.command.value=command
-	frm.submit()
-}
-
-</script>
-<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png')">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr valign="top"> 
-    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
-    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
-          <td><img src="images/col.png"></td>
-          <td width="10"></td>
-          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
-            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
-          <td width="10"></td>
-        </tr>
-      </table></td>
-  </tr>
-  <tr align="center" valign="top"> 
-    <td colspan="2"><form name="mainform" action="amuleweb-main-kad.php" method="post">
-        <table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <caption>
-          KADEMLIA 
-          </caption>
-          <tr> 
-            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
-            <td background="images/tab_top.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
-          </tr>
-          <tr> 
-            <td width="24" background="images/tab_left.png">&nbsp;</td>
-            <td bgcolor="#FFFFFF"><table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
-                
-                <tr valign="top"> 
-                  <td height="200"><img src="amule_stats_kad.png" width="500" height="200" border="0" alt="" title="" /></td>
-                  <td valign="top"> <table  border="0" align="center" cellpadding="0" cellspacing="6" class="kadnewnode">
-                      <tr> 
-                        <th colspan="2">Bootstrap from node</th>
-                      </tr>
-                      <tr> 
-                        <td align="right">IP :</td><td align="left"><input name="ip3" type="text" id="ip32" size="3" maxlength="3"> 
-                          &nbsp; <input name="ip2" type="text" id="ip23" size="3" maxlength="3"> 
-                          &nbsp; <input name="ip1" type="text" id="ip13" size="3" maxlength="3"> 
-                          &nbsp; <input name="ip0" type="text" id="ip03" size="3" maxlength="3"></td>
-                      </tr>
-                      <tr> 
-                        <td align="right">Port :</td><td align="left"><input name="port" type="text" id="port3" size="4" maxlength="5"> 
-                          &nbsp; <input type="submit" name="Submit" value="Connect"></td>
-                      </tr>
-                    </table></td>
-                </tr>
-                <tr valign="top"> 
-                  <td height="20" width="500" align="center">Number of nodes</td>
-                  <td></td>
-                </tr>
-              </table></td>
-            <td width="24" background="images/tab_right.png">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
-            <td background="images/tab_bottom.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
-          </tr>
-        </table>
-        </form></td>
-  </tr>
-  <tr valign="bottom"> 
-    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
-        <tr align="center" valign="middle"> 
-          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
-          </td>
-          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
-          </td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/amuleweb-main-log.php Deleted

@@ -1,270 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>aMule control panel</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<script language="JavaScript" type="text/JavaScript">
-
-</script>
-<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
-
-</style>
-</head><script language="JavaScript" type="text/JavaScript">
-function formCommandSubmit(command)
-{
-	var frm=document.forms.mainform
-	frm.command.value=command
-	frm.submit()
-}
-
-var initvals = new Object;
-
-<?php
-	// apply new options before proceeding
-	//var_dump($HTTP_GET_VARS);
-	if ( ($HTTP_GET_VARS["Submit"] == "Apply") && ($_SESSION["guest_login"] == 0) ) {
-		$file_opts = array("check_free_space", "extract_metadata", 
-			"ich_en","aich_trust", "preview_prio","save_sources", "resume_same_cat",
-			"min_free_space", "new_files_paused", "alloc_full", "alloc_full_chunks",
-			"new_files_auto_dl_prio", "new_files_auto_ul_prio"
-		);
-		$conn_opts = array("max_line_up_cap","max_up_limit",
-			"max_line_down_cap","max_down_limit", "slot_alloc", 
-			"tcp_port","udp_dis","max_file_src","max_conn_total","autoconn_en");
-		$webserver_opts = array("use_gzip", "autorefresh_time");
-		
-		$all_opts;
-		foreach ($conn_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["connection"][$i] = $curr_value;
-		}
-		foreach ($file_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["files"][$i] = $curr_value;
-		}
-		foreach ($webserver_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["webserver"][$i] = $curr_value;
-		}
-		//var_dump($all_opts);
-		amule_set_options($all_opts);
-	}
-	$opts = amule_get_options();
-	//var_dump($opts);
-	$opt_groups = array("connection", "files", "webserver");
-	//var_dump($opt_groups);
-	foreach ($opt_groups as $group) {
-		$curr_opts = $opts[$group];
-		//var_dump($curr_opts);
-		foreach ($curr_opts as $opt_name => $opt_val) {
-			echo 'initvals["', $opt_name, '"] = "', $opt_val, '";';
-		}
-	}
-?>
-
-
-function init_data()
-{
-	var frm = document.forms.mainform
-
-	var str_param_names = new Array(
-		"max_line_down_cap", "max_line_up_cap",
-		"max_up_limit", "max_down_limit", "max_file_src",
-		"slot_alloc", "max_conn_total",
-		"tcp_port", "udp_port",
-		"min_free_space",
-		"autorefresh_time"
-		)
-	for(i = 0; i < str_param_names.length; i++) {
-		frm[str_param_names[i]].value = initvals[str_param_names[i]];
-	}
-	var check_param_names = new Array(
-		"autoconn_en", "reconn_en", "udp_dis", "new_files_paused",
-		"aich_trust", "alloc_full", "alloc_full_chunks",
-		"check_free_space", "extract_metadata", "ich_en",
-		"new_files_auto_dl_prio", "new_files_auto_ul_prio",
-		"use_gzip"
-		)
-	for(i = 0; i < check_param_names.length; i++) {
-		frm[check_param_names[i]].checked = initvals[check_param_names[i]] == "1" ? true : false;
-	}
-}
-
-</script>
-<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png');init_data();">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr valign="top"> 
-    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
-    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
-          <td><img src="images/col.png"></td>
-          <td width="10"></td>
-          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
-            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
-          <td width="10"></td>
-        </tr>
-      </table></td>
-  </tr>
-  <tr align="center" valign="top"> 
-    <td colspan="2">        <table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <caption>
-          AMULE LOG 
-          </caption>
-          <tr> 
-            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
-            <td background="images/tab_top.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
-          </tr>
-          <tr> 
-            <td width="24" background="images/tab_left.png">&nbsp;</td>
-            <td bgcolor="#FFFFFF">
-
-            <table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
-                
-                <tr valign="top"> 
-                  <td>
-		<h1 style="display:inline;">aMule log</h1>
-		<a href="log.php?rstlog=1" target="logframe" onclick="return confirm('Do you really want to reset aMule log?')">(Reset log)</a><br>
-	<iframe width="100%" height="400" name="logframe" src="log.php"></iframe>
-                  </td>
-                  </tr><tr>
-                  <td>
-		<h1 style="display:inline;">Serverinfo</h1>
-		<a href="log.php?rstsrv=1" target="srvframe" onclick="return confirm('Do you really want to reset Serverinfo?')">(Reset Serverinfo)</a>
-<iframe width="100%" height="200" name="srvframe" src="log.php?show=srv"></iframe>
-                  </td>
-                  </tr>
-                </tr>
-              </table>
-              </td>
-            <td width="24" background="images/tab_right.png">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
-            <td background="images/tab_bottom.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
-          </tr>
-        </table>
-</td>
-  </tr>
-  <tr valign="bottom"> 
-    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
-        <tr align="center" valign="middle"> 
-          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
-          </td>
-          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
-          </td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/amuleweb-main-prefs.php Deleted

@@ -1,464 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>aMule control panel</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<script language="JavaScript" type="text/JavaScript">
-
-</script>
-<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
-
-</style>
-</head><script language="JavaScript" type="text/JavaScript">
-function formCommandSubmit(command)
-{
-	var frm=document.forms.mainform
-	frm.command.value=command
-	frm.submit()
-}
-
-var initvals = new Object;
-
-<?php
-	// apply new options before proceeding
-	//var_dump($HTTP_GET_VARS);
-	if ( ($HTTP_GET_VARS["Submit"] == "Apply") && ($_SESSION["guest_login"] == 0) ) {
-		$file_opts = array("check_free_space", "extract_metadata", 
-			"ich_en","aich_trust", "preview_prio","save_sources", "resume_same_cat",
-			"min_free_space", "new_files_paused", "alloc_full", "alloc_full_chunks",
-			"new_files_auto_dl_prio", "new_files_auto_ul_prio"
-		);
-		$conn_opts = array("max_line_up_cap","max_up_limit",
-			"max_line_down_cap","max_down_limit", "slot_alloc", 
-			"tcp_port","udp_dis","max_file_src","max_conn_total","autoconn_en");
-		$webserver_opts = array("use_gzip", "autorefresh_time");
-		
-		$all_opts;
-		foreach ($conn_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["connection"][$i] = $curr_value;
-		}
-		foreach ($file_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["files"][$i] = $curr_value;
-		}
-		foreach ($webserver_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["webserver"][$i] = $curr_value;
-		}
-		//var_dump($all_opts);
-		amule_set_options($all_opts);
-	}
-	$opts = amule_get_options();
-	//var_dump($opts);
-	$opt_groups = array("connection", "files", "webserver");
-	//var_dump($opt_groups);
-	foreach ($opt_groups as $group) {
-		$curr_opts = $opts[$group];
-		//var_dump($curr_opts);
-		foreach ($curr_opts as $opt_name => $opt_val) {
-			echo 'initvals["', $opt_name, '"] = "', $opt_val, '";';
-		}
-	}
-?>
-
-
-function init_data()
-{
-	var frm = document.forms.mainform
-
-	var str_param_names = new Array(
-		"max_line_down_cap", "max_line_up_cap",
-		"max_up_limit", "max_down_limit", "max_file_src",
-		"slot_alloc", "max_conn_total",
-		"tcp_port", "udp_port",
-		"min_free_space",
-		"autorefresh_time"
-		)
-	for(i = 0; i < str_param_names.length; i++) {
-		frm[str_param_names[i]].value = initvals[str_param_names[i]];
-	}
-	var check_param_names = new Array(
-		"autoconn_en", "reconn_en", "udp_dis", "new_files_paused",
-		"aich_trust", "alloc_full", "alloc_full_chunks",
-		"check_free_space", "extract_metadata", "ich_en",
-		"new_files_auto_dl_prio", "new_files_auto_ul_prio",
-		"use_gzip"
-		)
-	for(i = 0; i < check_param_names.length; i++) {
-		frm[check_param_names[i]].checked = initvals[check_param_names[i]] == "1" ? true : false;
-	}
-}
-
-</script>
-<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png');init_data();">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr valign="top"> 
-    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
-    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
-          <td><img src="images/col.png"></td>
-          <td width="10"></td>
-          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
-            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
-          <td width="10"></td>
-        </tr>
-      </table></td>
-  </tr>
-  <tr align="center" valign="top"> 
-    <td colspan="2">
-        <table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <caption>PREFERENCES</caption>
-          <tr> 
-            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
-            <td background="images/tab_top.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
-          </tr>
-          <tr> 
-            <td width="24" background="images/tab_left.png">&nbsp;</td>
-            
-      <td bgcolor="#FFFFFF"><form name="mainform" action="amuleweb-main-prefs.php" method="post">
-              <table border="0" align="center" cellpadding="0" cellspacing="6">
-               
-    <tr align="center" valign="top"> 
-      <td> 
-        <table width="350" border="0" align="center" cellpadding="0" cellspacing="0" >
-          <tr> 
-            <td width="22">&nbsp;</td>
-            <th>Webserver</th>
-            <td width="63">&nbsp;</td>
-          </tr>
-            <td width="22" height="25">&nbsp;</td>
-            <td height="25">Page refresh interval </td>
-            <td width="63" height="25">
-<input name="autorefresh_time" type="text" id="autorefresh_time7" size="4"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">
-<input name="use_gzip" type="checkbox" id="use_gzip5"></td>
-            <td height="25"> Use gzip compression </td>
-            <td width="63" height="25">&nbsp;</td>
-          </tr>
-        </table></td>
-      <td width="50%"> 
-        <table width="350" border="0" align="center" cellpadding="0" cellspacing="0" >
-          <tr> 
-            <td width="22">&nbsp;</td>
-            <th>Line capacity (for statistics only)</th>
-            <td width="63">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">&nbsp;</td>
-            <td height="25">Max download rate </td>
-            <td width="63" height="25">
-<input name="max_line_down_cap" type="text" id="max_line_down_cap6" size="4"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">&nbsp;</td>
-            <td height="25">Max upload rate </td>
-            <td width="63" height="25">
-<input name="max_line_up_cap" type="text" id="max_line_up_cap7" size="4"></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr align="center" valign="top"> 
-      <td> 
-        <table width="350" border="0" align="center" cellpadding="0" cellspacing="0" >
-          <tr> 
-            <td width="22" height="19">&nbsp;</td>
-            <th>Bandwidth limits</th>
-            <td width="63">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">&nbsp;</td>
-            <td height="25">Max download rate </td>
-            <td width="63" height="25">
-<input name="max_down_limit" type="text" id="max_down_limit6" size="4"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">&nbsp;</td>
-            <td height="25">Max upload rate </td>
-            <td width="63" height="25">
-<input name="max_up_limit" type="text" id="max_up_limit6" size="4"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">&nbsp;</td>
-            <td height="25">Slot allocation </td>
-            <td width="63" height="25">
-<input name="slot_alloc" type="text" id="slot_alloc6" size="4"></td>
-          </tr>
-        </table></td>
-      <td width="50%" rowspan="3"> 
-        <table width="350" border="0" align="center" cellpadding="0" cellspacing="0" >
-          <tr> 
-            <td width="22">&nbsp;</td>
-            <th> File settings </th>
-            <td width="63">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">&nbsp;</td>
-            <td height="25">&nbsp; </td>
-            <td width="63" height="25"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25"> 
-              <input name="check_free_space" type="checkbox" id="check_free_space5"></td>
-            <td height="25"> Check free space =&gt; Minimum free space (Mb) </td>
-            <td width="63" height="25"> 
-              <input name="min_free_space" type="text" id="min_free_space4" size="4"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25"> 
-              <input name="new_files_auto_dl_prio" type="checkbox" id="new_files_auto_dl_prio4"></td>
-            <td height="25"> Added download files have auto priority</td>
-            <td width="63" height="25"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25"> 
-              <input name="new_files_auto_ul_prio" type="checkbox" id="new_files_auto_ul_prio4"></td>
-            <td height="25"> New shared files have auto priority</td>
-            <td width="63" height="25"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25"> 
-              <input name="ich_en" type="checkbox" id="ich_en5"></td>
-            <td height="25"> I.C.H. active</td>
-            <td width="63" height="25"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25"> 
-              <input name="aich_trust" type="checkbox" id="aich_trust4"></td>
-            <td height="25"> AICH trusts every hash (not recommended)</td>
-            <td width="63" height="25"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25"> 
-              <input name="alloc_full_chunks" type="checkbox" id="alloc_full_chunks4"></td>
-            <td height="25"> Alloc full chunks of .part files</td>
-            <td width="63" height="25"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25"> 
-              <input name="alloc_full" type="checkbox" id="alloc_full4"></td>
-            <td height="25"> Alloc full disk space for .part files</td>
-            <td width="63" height="25"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25"> 
-              <input name="new_files_paused" type="checkbox" id="new_files_paused4"></td>
-            <td height="25"> Add files to download queue in pause mode</td>
-            <td width="63" height="25"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25"> 
-              <input name="extract_metadata" type="checkbox" id="extract_metadata4"></td>
-            <td height="25"> Extract metadata tags </td>
-            <td width="63" height="25"></td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr align="center" valign="top"> 
-      <td> 
-        <table width="350" border="0" align="center" cellpadding="0" cellspacing="0" >
-          <tr> 
-            <td width="22">&nbsp;</td>
-            <th>Connection settings</th>
-            <td width="63">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">&nbsp;</td>
-            <td height="25">Max total connections (total) </td>
-            <td width="63" height="25">
-<input name="max_conn_total" type="text" id="max_conn_total8" size="4"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">&nbsp;</td>
-            <td height="25">Max sources per file </td>
-            <td width="63" height="25">
-<input name="max_file_src" type="text" id="max_file_src7" size="4"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">
-<input name="autoconn_en" type="checkbox" id="autoconn_en6"></td>
-            <td height="25"> Autoconnect at startup </td>
-            <td width="63" height="25">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">
-<input name="reconn_en" type="checkbox" id="reconn_en6"></td>
-            <td height="25"> Reconnect when connection lost </td>
-            <td width="63" height="25">&nbsp;</td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr align="center" valign="top"> 
-      <td> 
-        <table width="350" border="0" align="center" cellpadding="0" cellspacing="0" >
-          <tr> 
-            <td width="22">&nbsp;</td>
-            <th>Network settings</th>
-            <td width="63">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">&nbsp;</td>
-            <td height="25">TCP port </td>
-            <td width="63" height="25">
-<input name="tcp_port" type="text" id="tcp_port6" size="4"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">&nbsp;</td>
-            <td height="25">UDP port </td>
-            <td width="63" height="25">
-<input name="udp_port" type="text" id="udp_port6" size="4"></td>
-          </tr>
-          <tr> 
-            <td width="22" height="25">
-<input name="udp_dis" type="checkbox" id="udp_dis5"></td>
-            <td height="25"> Disable UDP connections </td>
-            <td width="63" height="25">&nbsp;</td>
-          </tr>
-        </table></td>
-    </tr>
-    <tr align="center"> 
-      <td colspan="2"> 
-        <?php
-			if ($_SESSION["guest_login"] == 0) {
-				echo '<input type="submit" name="Submit" value="Apply">';
-			} else {
-				echo "<b>&nbsp;You can not change options - logged in as guest</b>";
-			}
-		?>
-        <input name="command" type="hidden" id="command"> </td>
-    </tr>
-  </table>
-  </form></td>
-            <td width="24" background="images/tab_right.png">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
-            <td background="images/tab_bottom.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
-          </tr>
-        </table></td>
-  </tr>
-  <tr valign="bottom"> 
-    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
-        <tr align="center" valign="middle"> 
-          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
-          </td>
-          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
-          </td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/amuleweb-main-search.php Deleted

@@ -1,358 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>aMule control panel</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<script language="JavaScript" type="text/JavaScript">
-
-</script>
-<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
-
-</style>
-</head><script language="JavaScript" type="text/JavaScript">
-function formCommandSubmit(command)
-{
-	<?php
-		if ($_SESSION["guest_login"] != 0) {
-				echo 'alert("You logged in as guest - commands are disabled");';
-				echo "return;";
-		}
-	?>
-	var frm=document.forms.mainform
-	frm.command.value=command
-	frm.submit()
-}
-
-</script>
-<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png');">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr valign="top"> 
-    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
-    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
-          <td><img src="images/col.png"></td>
-          <td width="10"></td>
-          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
-            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
-          <td width="10"></td>
-        </tr>
-      </table></td>
-  </tr>
-  <tr align="center" valign="top"> 
-    <td colspan="2">
-        <table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <caption>
-        SEARCH
-        </caption>
-          <tr> 
-            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
-            <td background="images/tab_top.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
-          </tr>
-          <tr> 
-            <td width="24" background="images/tab_left.png">&nbsp;</td>
-            
-      <td bgcolor="#FFFFFF"><form name="mainform" action="amuleweb-main-search.php" method="post">
-              <table width="100%" border="0" align="center" cellpadding="4" cellspacing="0">
-                <tr align="center"> 
-                  <td align="center">
-<input type="hidden" name="command" value=""> 
-                    <input name="searchval" type="text" id="searchval4" size="60"> 
-                    <input name="Search" type="submit" id="Search4" value="Search" onClick="javascript:formCommandSubmit('search');"></td>
-                  <td align="right">Availability :</td>
-                  <td align="left"> 
-                    <input name="avail" type="text" id="avail13" size="6"></td>
-                  <td align="left">Min Size : </td>
-                  <td align="left">
-<input name="minsize" type="text" id="minsize2" size="5"> 
-                    <select name="minsizeu" id="select8">
-                      <option>Byte</option>
-                      <option>KByte</option>
-                      <option selected>MByte</option>
-                      <option>GByte</option>
-                    </select></td>
-                </tr>
-                <tr> 
-                  <td align="center"><a href="amuleweb-main-search.php">Click here to update the search results</a> </td>
-                  <td align="right">Search type :</td>
-                  <td> 
-                    <select name="searchtype" id="select">
-                      <option selected>Local</option>
-                      <option>Global</option>
-                      <option>Kad</option>
-                    </select></td>
-                  <td>Max Size : </td>
-                  <td>
-<input name="maxsize" type="text" id="maxsize4" size="5"> 
-                    <select name="maxsizeu" id="select10">
-                      <option>Byte</option>
-                      <option>KByte</option>
-                      <option selected>MByte</option>
-                      <option>GByte</option>
-                    </select></td>
-                </tr>
-              </table>
-              <table width="100%"  border="0" align="center" cellpadding="0" cellspacing="0">
-                  <th>&nbsp;</th>
-                  <th><a href="amuleweb-main-search.php?sort=name">File Name</a></th>
-                  <th><a href="amuleweb-main-search.php?sort=size">Size</a></th>
-                  <th><a href="amuleweb-main-search.php?sort=sources">Sources</a></th>
-    </tr><tr><td colspan="9" height="1" bgcolor="#000000"></td></tr>
-    <?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " b";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "kb";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "mb";
-			} else {
-				$result = ($size / 1073741824.0) . "gb";
-			}
-			return $result;
-		}
-
-		//
-		// declare it here, before any function reffered it in "global"
-		//
-		$sort_order;$sort_reverse;
-
-		function my_cmp($a, $b)
-		{
-			global $sort_order, $sort_reverse;
-			
-			switch ( $sort_order) {
-				case "size": $result = $a->size > $b->size; break;
-				case "name": $result = $a->name > $b->name; break;
-				case "sources": $result = $a->sources > $b->sources; break;
-			}
-
-			if ( $sort_reverse ) {
-				$result = !$result;
-			}
-
-			return $result;
-		}
-
-		function str2mult($str)
-		{
-			$result = 1;
-			switch($str) {
-				case "Byte":	$result = 1; break;
-				case "KByte":	$result = 1024; break;		
-				case "MByte":	$result = 1012*1024; break;
-				case "GByte":	$result = 1012*1024*1024; break;
-			}
-			return $result;
-		}
-
-		function cat2idx($cat)
-		{
-                	$cats = amule_get_categories();
-                	$result = 0;
-                	foreach($cats as $i => $c) {
-                		if ( $cat == $c) $result = $i;
-                	}
-            		return $result;
-		}
-
-		if ($_SESSION["guest_login"] == 0) {
-			if ( $HTTP_GET_VARS["command"] == "search") {
-				$search_type = -1;
-				switch($HTTP_GET_VARS["searchtype"]) {
-					case "Local": $search_type = 0; break;
-					case "Global": $search_type = 1; break;
-					case "Kad": $search_type = 2; break;
-				}
-				$min_size = $HTTP_GET_VARS["minsize"] == "" ? 0 : $HTTP_GET_VARS["minsize"];
-				$max_size = $HTTP_GET_VARS["maxsize"] == "" ? 0 : $HTTP_GET_VARS["maxsize"];
-	
-				$min_size *= str2mult($HTTP_GET_VARS["minsizeu"]);
-				$max_size *= str2mult($HTTP_GET_VARS["maxsizeu"]);
-				
-				amule_do_search_start_cmd($HTTP_GET_VARS["searchval"],
-					//$HTTP_GET_VARS["ext"], $HTTP_GET_VARS["filetype"],
-					"", "",
-					$search_type, $HTTP_GET_VARS["avail"], $min_size, $max_size);
-			} elseif ( $HTTP_GET_VARS["command"] == "download") {
-				foreach ( $HTTP_GET_VARS as $name => $val) {
-					// this is file checkboxes
-					if ( (strlen($name) == 32) and ($val == "on") ) {
-						$cat = $HTTP_GET_VARS["targetcat"];
-						$cat_idx = cat2idx($cat);
-						amule_do_search_download_cmd($name, $cat_idx);
-					}
-				}
-			} else {
-			}
-		}		
-		$search = amule_load_vars("searchresult");
-
-		$sort_order = $HTTP_GET_VARS["sort"];
-
-		if ( $sort_order == "" ) {
-			$sort_order = $_SESSION["search_sort"];
-		} else {
-			if ( $_SESSION["search_sort_reverse"] == "" ) {
-				$_SESSION["search_sort_reverse"] = 0;
-			} else {
-				$_SESSION["search_sort_reverse"] = !$_SESSION["search_sort_reverse"];
-			}
-		}
-
-		$sort_reverse = $_SESSION["search_sort_reverse"];
-		if ( $sort_order != "" ) {
-			$_SESSION["search_sort"] = $sort_order;
-			usort(&$search, "my_cmp");
-		}
-
-		foreach ($search as $file) {
-			print "<tr>";
-
-			echo "<td class='texte'>", '<input type="checkbox" name="', $file->hash, '" >', "</td>";
-
-			echo "<td class='texte'>", $file->short_name, "</td>";
-			
-			echo "<td class='texte' align='center'>", CastToXBytes($file->size), "</td>";
-
-			echo "<td class='texte' align='center'>", $file->sources, "</td>";
-
-			print "</tr></tr><tr><td colspan='9' height='1' bgcolor='#c0c0c0'></td></tr>";
-		}
-
-	  ?>
-    <tr align="right"> 
-      <td colspan="4" scope="col">
-        <input name="Download" type="submit" id="Download6" value="Download" onClick="javascript:formCommandSubmit('download');" >
-        <select name="targetcat" id="select32">
-          <?php
-                	$cats = amule_get_categories();
-                	foreach($cats as $c) {
-                		echo "<option>", $c, "</option>";
-                	}
-                ?>
-        </select></td>
-  </table>
-</form></td>
-            <td width="24" background="images/tab_right.png">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
-            <td background="images/tab_bottom.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
-          </tr>
-        </table></td>
-  </tr>
-  <tr valign="bottom"> 
-    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
-        <tr align="center" valign="middle"> 
-          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
-          </td>
-          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
-          </td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/amuleweb-main-servers.php Deleted

@@ -1,251 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>aMule control panel</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<script language="JavaScript" type="text/JavaScript">
-
-</script>
-<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
-
-</style>
-</head>
-<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png');">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr valign="top"> 
-    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
-    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
-          <td><img src="images/col.png"></td>
-          <td width="10"></td>
-          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
-            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
-          <td width="10"></td>
-        </tr>
-      </table></td>
-  </tr>
-  <tr align="center" valign="top"> 
-    <td colspan="2">
-        <table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <caption>
-        SERVERS 
-        </caption>
-          <tr> 
-            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
-            <td background="images/tab_top.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
-          </tr>
-          <tr> 
-            <td width="24" background="images/tab_left.png">&nbsp;</td>
-            
-      <td bgcolor="#FFFFFF"><table width="100%"  border="0" align="center" cellpadding="0" cellspacing="0">
-              <tr> 
-                <th width="3%"></th>
-                <th width="20%" ><a href="amuleweb-main-servers.php?sort=name">Server Name</a></th>
-                <th width="35%" ><a href="amuleweb-main-servers.php?sort=desc">Description</a></th>
-                <th width="17%">Address</th>
-                <th width="5%"><a href="amuleweb-main-servers.php?sort=users">Users</a></th>
-                <th width="10%"><a href="amuleweb-main-servers.php?sort=maxusers">maximal Users</a></th>
-                <th width="5%"><a href="amuleweb-main-servers.php?sort=files">Files</a></th>
-		</tr><tr><td colspan="9" height="1" bgcolor="#000000"></td></tr>
-              <?php
-
-
-		//
-		// declare it here, before any function reffered it in "global"
-		//
-		$sort_order;$sort_reverse;
-
-		function my_cmp($a, $b)
-		{
-			global $sort_order, $sort_reverse;
-			switch ( $sort_order) {
-				case "name": $result = $a->name > $b->name; break;
-				case "desc": $result = $a->desc > $b->desc; break;
-				case "users": $result = $a->users > $b->users; break;
-				case "max_users": $result = $a->maxusers > $b->maxusers; break;
-				case "files":$result = $a->files > $b->files; break;
-			}
-
-			if ( $sort_reverse ) {
-				$result = !$result;
-			}
-			return $result;
-		}
-
-		$servers = amule_load_vars("servers");
-
-		$sort_order = $HTTP_GET_VARS["sort"];
-
-		//
-		// perform command before processing content
-		//
-		if ( ($HTTP_GET_VARS["cmd"] != "") and ($HTTP_GET_VARS["ip"] != "") and ($HTTP_GET_VARS["port"] != "")) {
-			if ($_SESSION["guest_login"] == 0) {
-				amule_do_server_cmd($HTTP_GET_VARS["ip"], $HTTP_GET_VARS["port"], $HTTP_GET_VARS["cmd"]);
-			}
-		}
-		
-		if ( $sort_order == "" ) {
-			$sort_order = $_SESSION["servers_sort"];
-		} else {
-			if ( $_SESSION["sort_reverse"] == "" ) {
-				$_SESSION["sort_reverse"] = 0;
-			} else {
-				$_SESSION["sort_reverse"] = !$_SESSION["sort_reverse"];
-			}
-		}
-
-		$sort_reverse = $_SESSION["sort_reverse"];
-		if ( $sort_order != "" ) {
-			$_SESSION["servers_sort"] = $sort_order;
-			usort(&$servers, "my_cmp");
-		}
-		foreach ($servers as $srv) {
-			echo "<tr>";
-			
-			if ($_SESSION["guest_login"] != 0) {
-				echo "<td class='texte' align='center'></td>";
-			} else {
-				echo "<td class='texte' align='center'>",
-					'<a href="amuleweb-main-servers.php?cmd=connect&ip=', $srv->ip,
-					'&port=', $srv->port, '">',
-					'<img src="images/connect.gif" width="16" height="16" border="0">','</a>',
-					'<a href="amuleweb-main-servers.php?cmd=remove&ip=', $srv->ip,
-					'&port=', $srv->port, '">',
-					'<img src="images/cancel.gif" width="16" height="16" border="0">','</a>',
-					"</td>";
-			}
-
-			echo "<td class='texte'>", $srv->name, "</td>";
-			echo "<td class='texte'>", $srv->desc, "</td>";
-			echo "<td class='texte' align='center'>", $srv->addr, "</td>";
-			echo "<td class='texte' align='center'>", $srv->users, "</td>";
-			echo "<td class='texte' align='center'>", $srv->maxusers, "</td>";
-			echo "<td class='texte' align='center'>", $srv->files, "</td>";
-
-			echo "</tr><tr><td colspan='9' height='1' bgcolor='#c0c0c0'></td></tr>";
-		}
-	  ?>
-            </table></td>
-            <td width="24" background="images/tab_right.png">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
-            <td background="images/tab_bottom.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
-          </tr>
-        </table></td>
-  </tr>
-  <tr valign="bottom"> 
-    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
-        <tr align="center" valign="middle"> 
-          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
-          </td>
-          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
-          </td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/amuleweb-main-shared.php Deleted

@@ -1,367 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>aMule control panel</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-
-<script language="JavaScript" type="text/JavaScript">
-
-</script>
-<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
-
-</style>
-</head><script language="JavaScript" type="text/JavaScript">
-function formCommandSubmit(command)
-{
-	<?php
-		if ($_SESSION["guest_login"] != 0) {
-				echo 'alert("You logged in as guest - commands are disabled");';
-				echo "return;";
-		}
-	?>
-	var frm=document.forms.mainform
-	frm.command.value=command
-	frm.submit()
-}
-
-</script>
-<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png');">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr valign="top"> 
-    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
-    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
-          <td><img src="images/col.png"></td>
-          <td width="10"></td>
-          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
-            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
-          <td width="10"></td>
-        </tr>
-      </table></td>
-  </tr>
-  <tr align="center" valign="top"> 
-    <td colspan="2"><form name="mainform" action="amuleweb-main-shared.php" method="post">
-              <table border="0" align="center" cellpadding="0" cellspacing="0">
-                <tr>
-                  <td><input type="hidden" name="command"></td>
-                  
-            <td><a href="javascript:formCommandSubmit('reload');" onClick="MM_nbGroup('down','group1','reload','',1)" onMouseOver="MM_nbGroup('over','reload','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/refresh.png" alt="Ricarica Files Condivisi" name="reload" border="0" onload=""></a></td>
-				  <td><a href="javascript:formCommandSubmit('prioup');" onClick="MM_nbGroup('down','group1','up','',1)" onMouseOver="MM_nbGroup('over','up','','',1)" onMouseOut="MM_nbGroup('out')"><img name="up" src="images/up.png" border="0" alt="Alza Priorità" onLoad=""></a></td>
-                  
-            <td><a href="javascript:formCommandSubmit('priodown');" onClick="MM_nbGroup('down','group1','down','',1)" onMouseOver="MM_nbGroup('over','down','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/down.png" alt="Abbassa Priorità" name="down" border="0" onload=""></a></td>
-                  <td><select name="select">
-                      <option selected>Select prio</option>
-                      <option>Low</option>
-                      <option>Normal</option>
-                      <option>High</option>
-                    </select> </td>
-                  
-            <td><a href="javascript:formCommandSubmit('setprio');" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/ok.png" alt="Imposta Priorità" name="resume" border="0" onload=""></a></td>
-              
-                  <td> 
-                    <?php
-		 	if ($_SESSION["guest_login"] != 0) {
-				echo "<b>&nbsp;You logged in as guest - commands are disabled</b>";
-			}
-		 ?>
-                  </td>
-                </tr>
-              </table>
-        <table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <caption>
-        SHARED FILES 
-        </caption>
-          <tr> 
-            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
-            <td background="images/tab_top.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
-          </tr>
-          <tr> 
-            <td width="24" background="images/tab_left.png">&nbsp;</td>
-            
-          <td bgcolor="#FFFFFF">
-              <table width="100%"  border="0" align="center" cellpadding="0" cellspacing="0">
-                <tr> 
-                  <th></th>
-                  <th><a href="amuleweb-main-shared.php?sort=name">File Name</a></th>
-                  <th><a href="amuleweb-main-shared.php?sort=xfer">Transferred</a> 
-                    (<a href="amuleweb-main-shared.php">Total</a>)</th>
-                  <th><a href="amuleweb-main-shared.php?sort=req">Requested</a> 
-                    (<a href="amuleweb-main-shared.php">Total</a>)</th>
-                  <th><a href="amuleweb-main-shared.php?sort=acc">Accepted requests</a> 
-                    (<a href="amuleweb-main-shared.php">Total</a>)</th>
-                  <th><a href="amuleweb-main-shared.php?sort=size">Size</a></th>
-                  <th><a href="amuleweb-main-shared.php?sort=prio">Priority</a></th>
-                </tr><tr><td colspan="9" height="1" bgcolor="#000000"></td></tr>
-                <?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		function StatusString($file)
-		{
-			if ( $file->status == 7 ) {
-				return "Paused";
-			} elseif ( $file->src_count_xfer > 0 ) {
-				return "Downloading";
-			} else {
-				return "Waiting";
-			}
-		}
-
-		function PrioString($file)
-		{
-			$prionames = array(0 => "Low", 1 => "Normal", 2 => "High",
-				3 => "Very high", 4 => "Very low", 5=> "Auto", 6 => "Release");
-			$result = $prionames[$file->prio];
-			if ( $file->prio_auto == 1) {
-				$result = $result . "(auto)";
-			}
-			return $result;
-		}
-
-		//
-		// declare it here, before any function reffered it in "global"
-		//
-		$sort_order;$sort_reverse;
-
-		function my_cmp($a, $b)
-		{
-			global $sort_order, $sort_reverse;
-			
-			switch ( $sort_order) {
-				case "size": $result = $a->size > $b->size; break;
-				case "name": $result = $a->name > $b->name; break;
-				case "xfer": $result = $a->xfer > $b->xfer; break;
-				case "acc": $result = $a->accept > $b->accept; break;
-				case "req": $result = $a->req > $b->req; break;
-				case "prio": $result = PrioString($a) > PrioString($b); break;
-			}
-
-			if ( $sort_reverse ) {
-				$result = !$result;
-			}
-			//var_dump($sort_reverse);
-			return $result;
-		}
-
-		//
-		// perform command before processing content
-		//
-		//var_dump($HTTP_GET_VARS);
-		if (($HTTP_GET_VARS["command"] != "") && ($_SESSION["guest_login"] == 0)) {
-			//amule_do_download_cmd($HTTP_GET_VARS["command"]);
-			foreach ( $HTTP_GET_VARS as $name => $val) {
-				// this is file checkboxes
-				if ( (strlen($name) == 32) and ($val == "on") ) {
-					//var_dump($name);var_dump($val);
-					amule_do_shared_cmd($name, $HTTP_GET_VARS["command"]);
-				}
-			}
-			if ($HTTP_GET_VARS["command"] == "reload") {
-				amule_do_reload_shared_cmd();
-			}
-		}
-		$shared = amule_load_vars("shared");
-
-		$sort_order = $HTTP_GET_VARS["sort"];
-
-		if ( $sort_order == "" ) {
-			$sort_order = $_SESSION["shared_sort"];
-		} else {
-			if ( $_SESSION["sort_reverse"] == "" ) {
-				$_SESSION["sort_reverse"] = 0;
-			} else {
-				$_SESSION["sort_reverse"] = !$_SESSION["sort_reverse"];
-			}
-		}
-		//var_dump($_SESSION);
-		$sort_reverse = $_SESSION["sort_reverse"];
-		if ( $sort_order != "" ) {
-			$_SESSION["shared_sort"] = $sort_order;
-			usort(&$shared, "my_cmp");
-		}
-
-		foreach ($shared as $file) {
-			print "<tr>";
-
-			echo "<td class='texte'>", '<input type="checkbox" name="', $file->hash, '" >', "</td>";
-
-			echo "<td class='texte'>", $file->short_name, "</td>";
-			echo "<td class='texte' align='center'>", CastToXBytes($file->xfer), "</td>";
-
-			echo "<td class='texte' align='center'>", $file->req, "</td>";
-			echo "<td class='texte' align='center'>", $file->accept, "</td>";
-			
-			echo "<td class='texte' align='center'>", CastToXBytes($file->size), "</td>";
-
-			echo "<td class='texte' align='center'>", PrioString($file), "</td>";;
-
-			print "</tr><tr><td colspan='9' height='1' bgcolor='#c0c0c0'></td></tr>";
-		}
-	  ?>
-              </table></td>
-            <td width="24" background="images/tab_right.png">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
-            <td background="images/tab_bottom.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
-          </tr>
-        </table></form></td>
-  </tr>
-  <tr valign="bottom"> 
-    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
-        <tr align="center" valign="middle"> 
-          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
-          </td>
-          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
-          </td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/amuleweb-main-stats.php Deleted

@@ -1,215 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>aMule control panel</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<?php
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
-	}
-
-	amule_load_vars("stats_graph");
-
-?>
-<script language="JavaScript" type="text/JavaScript">
-
-</script>
-<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
-
-</style>
-</head><script language="JavaScript" type="text/JavaScript">
-var openImg = new Image();
-openImg.src = "tree-open.gif";
-var closedImg = new Image();
-closedImg.src = "tree-closed.gif";
-
-function showBranch(branch){
-	var objBranch = document.getElementById(branch).style;
-	if(objBranch.display=="block")
-		objBranch.display="none";
-	else
-		objBranch.display="block";
-}
-
-function swapFolder(img){
-	objImg = document.getElementById(img);
-	if(objImg.src.indexOf('tree-closed.gif')>-1)
-		objImg.src = openImg.src;
-	else
-		objImg.src = closedImg.src;
-}
-
-</script>
-<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png');">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr valign="top"> 
-    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
-    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
-          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
-          <td><img src="images/col.png"></td>
-          <td width="10"></td>
-          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
-            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
-          <td width="10"></td>
-        </tr>
-      </table></td>
-  </tr>
-  <tr align="center" valign="top"> 
-    <td colspan="2">
-        <table width="100%" border="0" cellspacing="0" cellpadding="0">
-          <caption>
-        STATISTICS 
-        </caption>
-          <tr> 
-            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
-            <td background="images/tab_top.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
-          </tr>
-          <tr> 
-            <td width="24" background="images/tab_left.png">&nbsp;</td>
-            
-          <td bgcolor="#FFFFFF"><table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
-              <tr valign="top"> 
-                <td rowspan="7">
-<iframe name="stats" src="stats_tree.php" width="100%" height="630" frameborder="0">liste</iframe></td>
-                <td width="500" align="right"><img src="amule_stats_download.png" width="500" height="200" border="0"></td>
-              </tr>
-              <tr valign="top"> 
-                <td width="500" height="15"> 
-                  <div align="center">Download-Speed</div></td>
-              </tr>
-              <tr valign="top"> 
-                <td width="500" align="right"><img src="amule_stats_upload.png" width="500" height="200" border="0" alt="" title="" /></td>
-              </tr>
-              <tr valign="top"> 
-                <td width="500" height="15"> 
-                  <div align="center">Upload-Speed</div></td>
-               </tr>
-              <tr valign="top"> 
-                <td width="500" align="right"><img src="amule_stats_conncount.png" width="500" height="200" border="0" alt="" title="" /></td>
-              </tr>
-              <tr valign="top"> 
-                <td width="500" height="15"> 
-                  <div align="center">Connections</div></td>
-              </tr>
-            </table></td>
-            <td width="24" background="images/tab_right.png">&nbsp;</td>
-          </tr>
-          <tr> 
-            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
-            <td background="images/tab_bottom.png">&nbsp;</td>
-            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
-          </tr>
-        </table></td>
-  </tr>
-  <tr valign="bottom"> 
-    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
-        <tr align="center" valign="middle"> 
-          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
-          </td>
-          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
-          </td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/black.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/blue1.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/blue2.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/blue3.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/blue4.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/blue5.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/blue6.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/favicon.ico Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/fond.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/footer.php Deleted

@@ -1,120 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule-frame-bottom</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
-
-</style>
-</head>
-<script language="JavaScript" type="text/JavaScript">
-
-function refreshFrames()
-{
-	location = "amuleweb-main-dload.php"
-	location.reload();
-}
-
-</script>
-
-<body>
-
-<table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
-  <tr>
-    <td width="50%" align="center" valign="bottom"> 
-      <form name="formlink" method="post" action="footer.php">
-        <input name="ed2klink" type="text" id="ed2klink" size="50">
-        <select name="selectcat" id="selectcat">
-        <?php
-			$cats = amule_get_categories();
-			if ( $HTTP_GET_VARS["Submit"] != "" ) {
-				$link = $HTTP_GET_VARS["ed2klink"];
-				$target_cat = $HTTP_GET_VARS["selectcat"];
-				$target_cat_idx = 0;
-            	foreach($cats as $i => $c) {
-            		if ( $target_cat == $c) $target_cat_idx = $i;
-            	}
-            	if ( strlen($link) > 0 ) {
-            		amule_do_ed2k_download_cmd($link, $target_cat_idx);
-            	}
-			}
-			foreach($cats as $c) {
-				echo  '<option>', $c, '</option>';
-			}
-        ?>
-        </select>
-        <input type="submit" name="Submit" value="Download link" onClick="refreshFrames()">
-      </form></td>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/kitty.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/log.php Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/login.php Deleted

@@ -1,122 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title>aMule control panel</title><script language="JavaScript" type="text/javascript">
-
-function breakout_of_frame()
-{
-  // see http://www.thesitewizard.com/archive/framebreak.shtml
-  // for an explanation of this script and how to use it on your
-  // own website
-  if (top.location != location) {
-    top.location.href = document.location.href ;
-  }
-}
-
-function login_init()
-{
-	breakout_of_frame();
-	document.login.pass.focus();
-}
-
-</script>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
-
-</style>
-</head>
-
-<body  onload="login_init();" background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" valign="middle">
-<table width="100%" height="180" border="0" cellpadding="0" cellspacing="0" valign="middle">
-  <tr>
-    <td align="center" valign="middle"> 
-      <table width="70%" height="90%" border="0" align="center" cellpadding="0" cellspacing="1" bgcolor="#000000">
-        <tr> 
-          <td><table width="100%" height="100%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
-              <tr valign="top"> 
-               <th width="366" height="180"><img src="images/loginlogo.jpg" width="366" height="180" border="0"></a></th>
-                <th width="100% "height="180" align="right" valign="middle" background="images/loginfond_haut.png"> 
-                  <form action="" method="post" name="login">
-                    Enter password : 
-                    <input name="pass" size="20" value="" type="password">
-                    &nbsp; 
-                    <input name="submit" type="submit" value="Submit">
-                    &nbsp;&nbsp; </form></th>
-              </tr>
-            </table></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/maquette.dwt Deleted

@@ -1,78 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-
-<title>aMule control panel</title>
- 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<script language="JavaScript" type="text/JavaScript">
-
-</script>
-<link href="../style.css" rel="stylesheet" type="text/css">
-
-</head>
-
-<body background="../images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('../images/transf_1.png','../images/shared_1.png','../images/search_1.png','../images/edkserv_1.png','../images/sheserv_1.png','../images/stats_1.png')">
-<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
-  <tr valign="top"> 
-    <td width="143" height="64"><img src="../images/logo.png" width="143" height="64"></td>
-    <td height="64" align="right" background="../images/fond_haut.png"> 
-      <table border="0" cellspacing="0" cellpadding="0">
-        <tr> 
-          <td><a href="../amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','../images/transf_1.png',1)"><img src="../images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
-          <td><a href="../amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','../images/shared_1.png',1)"><img src="../images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
-          <td><a href="../amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','../images/search_1.png',1)"><img src="../images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
-          <td><a href="../amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','../images/edkserv_1.png',1)"><img src="../images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
-          <td><a href="../amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','../images/sheserv_1.png',1)"><img src="../images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
-          <td><a href="../amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','../images/stats_1.png',1)"><img src="../images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
-          <td><img src="../images/col.png"></td>
-          <td width="100"></td>
-          <td width="100" align="right" class="texteinv"><a href="../login.html">logout</a><br>
-            <a href="../amuleweb-main-prefs.php">configuration</a></td>
-          <td width="10"></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr align="center" valign="top"> 
-    <td colspan="2"></td>
-  </tr>
-  <tr valign="bottom"> 
-    <td height="25" colspan="2"> 
-      <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
-        <tr align="center" valign="middle"> 
-          <td width="50%"> 
-            <iframe name="stats" src="footer.php" height="35" width="600" scrolling="no" frameborder="0">edklink</iframe>
-      </td>
-          <td width="50%"> 
-            <iframe name="stats" src="stats.php" height="35" width="600" scrolling="no" frameborder="0">connection</iframe>
-      </td>
-        </tr>
-      </table></td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/red.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/stats.php Deleted

@@ -1,118 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule control page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="pragmas" content="no-cache">
-<?php
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
-	}
-?>
-<style type="text/css">
-
-</style>
-</head>
-<table width="100%" height="30" border="0" align="center" cellpadding="0" cellspacing="0">
-  <tr valign="top"> 
-    <td width="65%"><strong>Ed2k : </strong> 
-      <?php
-    	$stats = amule_get_stats();
-    	if ( $stats["id"] == 0 ) {
-    		echo "Not connected";
-    	} elseif ( $stats["id"] == 0xffffffff ) {
-    		echo "Connecting ...";
-    	} else {
-    		echo "Connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-    			$stats["serv_name"], "  ", $stats["serv_addr"];
-    	}
-    ?>
-    </td>
-    <td><strong>Kad :</strong> 
-      <?php
-    	$stats = amule_get_stats();
-    	if ( $stats["kad_connected"] == 1 ) {
-    		echo "Connected";
-			if ( $stats["kad_firewalled"] == 1 ) {
-				echo "(Firewalled)";
-			} else {
-				echo "(OK)";
-			}
-    	} else {
-    		echo "Disconnected";
-    	}
-    ?>
-    </td>
-  </tr>
-</table>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/stats_tree.php Deleted

@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule preferences page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf8">
-<meta http-equiv="pragmas" content="no-cache">
-<?php
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
-	}
-?>
-<style type="text/css">
-.trigger{
-	cursor: pointer;
-	cursor: hand;
-	font-family: Tahoma;
-	font-size: small;
-}
-.branch{
-	display: block;
-	margin-left: 16px;
-	font-family: Tahoma;
-	font-size: small;
-}
-
-</style>
-</head>
-<script language="JavaScript" type="text/JavaScript">
-var openImg = new Image();
-openImg.src = "tree-open.gif";
-var closedImg = new Image();
-closedImg.src = "tree-closed.gif";
-
-function showBranch(branch){
-	var objBranch = document.getElementById(branch).style;
-	if(objBranch.display!="none")
-		objBranch.display="none";
-	else
-		objBranch.display="block";
-}
-
-function swapFolder(img){
-	objImg = document.getElementById(img);
-	if(objImg.src.indexOf('tree-closed.gif')>-1)
-		objImg.src = openImg.src;
-	else
-		objImg.src = closedImg.src;
-}
-
-</script>
-<body onLoad="showBranch('br_Stats');swapFolder('fl_Stats')">
-<?php
-
-function print_ident($i)
-{
-	while($i != 0) {
-		echo "\t";
-		$i--;
-	}
-}
-
-function print_item($it, $ident)
-{
-	print_ident($ident);
-	echo "<img src=\"tree-leaf.gif\">", $it, "<br>\n";
-}
-
-function print_folder($key, &$arr, $ident)
-{
-	print_ident($ident);
-	echo "<span class=\"trigger\" onClick=\"showBranch('br_",
-		$key, "');swapFolder('fl_", $key, "')\">\n";
-	print_ident($ident+1);
-	echo "<img src=\"tree-open.gif\" border=\"0\" id=\"fl_", $key, "\">\n";
-	print_ident($ident+1);
-	echo $key, "<br>\n";
-	print_ident($ident);
-	echo "</span>\n";
-	print_ident($ident);
-	echo "<span class=\"branch\" id=\"br_", $key, "\">\n";
-
-	foreach ($arr as $k => $v) {
-		if ( count(&$v) ) {
-			print_folder($k, $v, $ident+1);
-		} else {
-			print_item($k, $ident+1);
-		}
-	}
-
-	print_ident($ident);
-	echo "</span>\n";
-}
-
-	$stattree = amule_load_vars("stats_tree");
-
-	foreach ($stattree as $k => $v) {
-		if ( count(&$v) ) {
-			print_folder($k, $v, $ident+1);
-		} else {
-			print_item($k, $ident+1);
-		}
-	}
-?>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/litoral/tree-closed.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/tree-leaf.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/tree-open.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/litoral/yellow.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/Makefile.am Deleted

@@ -1,51 +0,0 @@
-dist_webserver_DATA = \
-	amuleweb-main-dload.php \
-	amuleweb-main-search.php \
-	amuleweb-main-servers.php \
-	amuleweb-main-shared.php \
-	amuleweb-main-stats.php \
-	amuleweb-main-prefs.php \
-	amuleweb-main-kad.php \
-	stats.php \
-	stats_tree.php \
-	top.html \
-	footer.php \
-	login.php \
-	tree-open.gif \
-	tree-closed.gif \
-	tree-leaf.gif \
-	toolbutton-reload.jpeg \
-	toolbutton-search.jpeg \
-	toolbutton-search-pressed.jpeg \
-	toolbutton-servers.jpeg \
-	toolbutton-servers-pressed.jpeg \
-	toolbutton-settings.jpeg \
-	toolbutton-settings-pressed.jpeg \
-	toolbutton-shared.jpeg \
-	toolbutton-shared-pressed.jpeg \
-	toolbutton-download.jpeg \
-	toolbutton-download-pressed.jpeg \
-	toolbutton-kad.jpeg \
-	toolbutton-kad-pressed.jpeg \
-	toolbutton-stats.jpeg \
-	toolbutton-stats-pressed.jpeg \
-	toolbutton-connect.jpeg \
-	toolbutton-logout.jpeg \
-	toolbutton-logout-pressed.jpeg \
-	toolbutton-filter.jpeg \
-	connect.gif \
-	cancel.gif \
-	arrow-r.png \
-	up.jpeg \
-	down.jpeg \
-	pause.jpeg \
-	resume.jpeg \
-	apply.jpeg \
-	delete.jpeg \
-	phpamule.png \
-	favicon.ico \
-	index.html
-
-webserverdir = $(pkgdatadir)/webserver/php-default
-
-MAINTAINERCLEANFILES = Makefile.in

aMule-2.2.6.tar.bz2/src/webserver/php-default/Makefile.in Deleted

@@ -1,535 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/webserver/php-default
-DIST_COMMON = $(dist_webserver_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \
-	$(top_srcdir)/m4/build-tools.m4 $(top_srcdir)/m4/codeset.m4 \
-	$(top_srcdir)/m4/cryptopp.m4 $(top_srcdir)/m4/fallocate.m4 \
-	$(top_srcdir)/m4/gdlib.m4 $(top_srcdir)/m4/gettext.m4 \
-	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
-	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
-	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
-	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
-	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
-	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
-	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
-	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
-	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
-	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.in
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(webserverdir)"
-dist_webserverDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_webserver_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
-ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
-ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
-ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
-AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
-AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
-AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BFD_CPPFLAGS = @BFD_CPPFLAGS@
-BFD_LIBS = @BFD_LIBS@
-BUILD_CC = @BUILD_CC@
-BUILD_CFLAGS = @BUILD_CFLAGS@
-BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
-BUILD_EXEEXT = @BUILD_EXEEXT@
-BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
-BUILD_LDFLAGS = @BUILD_LDFLAGS@
-CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
-CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
-CRYPTOPP_LDFLAGS = @CRYPTOPP_LDFLAGS@
-CRYPTOPP_LIBS = @CRYPTOPP_LIBS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
-ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
-EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
-EXEEXT = @EXEEXT@
-GDLIB_CFLAGS = @GDLIB_CFLAGS@
-GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
-GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
-GDLIB_LIBS = @GDLIB_LIBS@
-GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
-GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
-GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
-GEOIP_LIBS = @GEOIP_LIBS@
-GLIBC21 = @GLIBC21@
-GMSGFMT = @GMSGFMT@
-INCINTL = @INCINTL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLBISON = @INTLBISON@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LEX = @LEX@
-LEXLIB = @LEXLIB@
-LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
-LIBICONV = @LIBICONV@
-LIBINTL = @LIBINTL@
-LIBOBJS = @LIBOBJS@
-LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
-LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@
-LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@
-LIBPNG_LIBS = @LIBPNG_LIBS@
-LIBS = @LIBS@
-LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@
-LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@
-LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@
-LIBUPNP_LIBS = @LIBUPNP_LIBS@
-LTLIBICONV = @LTLIBICONV@
-LTLIBINTL = @LTLIBINTL@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
-MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
-MSGFMT = @MSGFMT@
-MSGMERGE = @MSGMERGE@
-MULECFLAGS = @MULECFLAGS@
-MULECPPFLAGS = @MULECPPFLAGS@
-MULECXXFLAGS = @MULECXXFLAGS@
-MULELDFLAGS = @MULELDFLAGS@
-MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POSUB = @POSUB@
-POW_LIB = @POW_LIB@
-RANLIB = @RANLIB@
-RC = @RC@
-RCFLAGS = @RCFLAGS@
-READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
-RESOLV_LIB = @RESOLV_LIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
-WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
-WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
-WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
-WX_CFLAGS = @WX_CFLAGS@
-WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
-WX_CONFIG_PATH = @WX_CONFIG_PATH@
-WX_CPPFLAGS = @WX_CPPFLAGS@
-WX_CXXFLAGS = @WX_CXXFLAGS@
-WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
-WX_DEBUG = @WX_DEBUG@
-WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
-WX_PORT = @WX_PORT@
-WX_RESCOMP = @WX_RESCOMP@
-WX_SHARED = @WX_SHARED@
-WX_UNICODE = @WX_UNICODE@
-WX_VERSION_FULL = @WX_VERSION_FULL@
-WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
-WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
-XGETTEXT = @XGETTEXT@
-YACC = @YACC@
-ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
-ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-docdir = @docdir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-dist_webserver_DATA = \
-	amuleweb-main-dload.php \
-	amuleweb-main-search.php \
-	amuleweb-main-servers.php \
-	amuleweb-main-shared.php \
-	amuleweb-main-stats.php \
-	amuleweb-main-prefs.php \
-	amuleweb-main-kad.php \
-	stats.php \
-	stats_tree.php \
-	top.html \
-	footer.php \
-	login.php \
-	tree-open.gif \
-	tree-closed.gif \
-	tree-leaf.gif \
-	toolbutton-reload.jpeg \
-	toolbutton-search.jpeg \
-	toolbutton-search-pressed.jpeg \
-	toolbutton-servers.jpeg \
-	toolbutton-servers-pressed.jpeg \
-	toolbutton-settings.jpeg \
-	toolbutton-settings-pressed.jpeg \
-	toolbutton-shared.jpeg \
-	toolbutton-shared-pressed.jpeg \
-	toolbutton-download.jpeg \
-	toolbutton-download-pressed.jpeg \
-	toolbutton-kad.jpeg \
-	toolbutton-kad-pressed.jpeg \
-	toolbutton-stats.jpeg \
-	toolbutton-stats-pressed.jpeg \
-	toolbutton-connect.jpeg \
-	toolbutton-logout.jpeg \
-	toolbutton-logout-pressed.jpeg \
-	toolbutton-filter.jpeg \
-	connect.gif \
-	cancel.gif \
-	arrow-r.png \
-	up.jpeg \
-	down.jpeg \
-	pause.jpeg \
-	resume.jpeg \
-	apply.jpeg \
-	delete.jpeg \
-	phpamule.png \
-	favicon.ico \
-	index.html
-
-webserverdir = $(pkgdatadir)/webserver/php-default
-MAINTAINERCLEANFILES = Makefile.in
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/webserver/php-default/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/webserver/php-default/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-dist_webserverDATA: $(dist_webserver_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(webserverdir)" || $(mkdir_p) "$(DESTDIR)$(webserverdir)"
-	@list='$(dist_webserver_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_webserverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(webserverdir)/$$f'"; \
-	  $(dist_webserverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(webserverdir)/$$f"; \
-	done
-
-uninstall-dist_webserverDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_webserver_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(webserverdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(webserverdir)/$$f"; \
-	done
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(webserverdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-dist_webserverDATA
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-dist_webserverDATA uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-dist_webserverDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_webserverDATA uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

aMule-2.2.6.tar.bz2/src/webserver/php-default/amuleweb-main-dload.php Deleted

@@ -1,403 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule download page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf8">
-<meta http-equiv="pragmas" content="no-cache">
-<?php
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
-	}
-?>
-<style type="text/css">
-
-</style>
-<script language="JavaScript" type="text/JavaScript">
-
-</script>
-</head>
-<script language="JavaScript" type="text/JavaScript">
-function formCommandSubmit(command)
-{
-	if ( command == "cancel" ) {
-		var res = confirm("Delete selected files ?")
-		if ( res == false ) {
-			return;
-		}
-	}
-	if ( command != "filter" ) {
-		<?php
-			if ($_SESSION["guest_login"] != 0) {
-					echo 'alert("You logged in as guest - commands are disabled");';
-					echo "return;";
-			}
-		?>
-	}
-	var frm=document.forms.mainform
-	frm.command.value=command
-	frm.submit()
-}
-
-</script>
-
-<body>
-<form action="amuleweb-main-dload.php" method="post" name="mainform" class="doad-table">
-<table width="100%"  border="1" bgcolor="#0099CC">
-  <tr>
-    <td width="118" height="20"><input type="hidden" name="command"></td>
-    <td width="251"><table border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <td><a href="javascript:formCommandSubmit('pause');" target="mainFrame" onClick="MM_nbGroup('down','group1','pause','',1)" onMouseOver="MM_nbGroup('over','pause','','',1)" onMouseOut="MM_nbGroup('out')"><img name="pause" src="pause.jpeg" border="0" alt="" onLoad=""></a></td>
-        <td><a href="javascript:formCommandSubmit('resume');" target="mainFrame" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img name="resume" src="resume.jpeg" border="0" alt="" onLoad=""></a></td>
-        <td><a href="javascript:formCommandSubmit('prioup');" target="mainFrame" onClick="MM_nbGroup('down','group1','up','',1)" onMouseOver="MM_nbGroup('over','up','','',1)" onMouseOut="MM_nbGroup('out')"><img name="up" src="up.jpeg" border="0" alt="" onLoad=""></a></td>
-        <td><a href="javascript:formCommandSubmit('priodown');" target="mainFrame" onClick="MM_nbGroup('down','group1','down','',1)" onMouseOver="MM_nbGroup('over','down','','',1)" onMouseOut="MM_nbGroup('out')"><img src="down.jpeg" alt="" name="down" width="50" height="20" border="0" onload=""></a></td>
-        <td><a href="javascript:formCommandSubmit('cancel');" target="mainFrame" onClick="MM_nbGroup('down','group1','cancel','',1)" onMouseOver="MM_nbGroup('over','delete','','',1)" onMouseOut="MM_nbGroup('out')"><img src="delete.jpeg" alt="" name="delete" width="50" height="20" border="0" onload=""></a></td>
-      </tr>
-    </table></td>
-    <td width="532"><table border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <td>
-        <?php
-        	$all_status = array("all", "Waiting", "Paused", "Downloading");
-        	
- 			if ( $HTTP_GET_VARS["command"] == "filter") {
- 				$_SESSION["filter_status"] = $HTTP_GET_VARS["status"];
- 				$_SESSION["filter_cat"] = $HTTP_GET_VARS["category"];
- 			}
-        	if ( $_SESSION["filter_status"] == '') $_SESSION["filter_status"] = 'all';
-        	if ( $_SESSION["filter_cat"] == '') $_SESSION["filter_cat"] = 'all';
-
-        	echo '<select name="status"> ';
-        	foreach ($all_status as $s) {
-        		echo (($s == $_SESSION["filter_status"]) ? '<option selected>' : '<option>'), $s, '</option>';
-        	}
-        	echo '</select>';
-        	//var_dump($_SESSION["filter_cat"]);
-        	echo '<select name="category" id="category">';
-			$cats = amule_get_categories();
-			foreach($cats as $c) {
-				echo (($c == $_SESSION["filter_cat"]) ? '<option selected>' : '<option>'), $c, '</option>';
-			}
-			echo '</select>';
-        ?>
-        </td>
-        <td><a href="javascript:formCommandSubmit('filter');" target="mainFrame" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img src="toolbutton-filter.jpeg" alt="Apply" name="resume" width="50" height="20" border="0" onload=""></a></td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>
-		<?php
-		 	if ($_SESSION["guest_login"] != 0) {
-				echo "<b>&nbsp;You logged in as guest - commands are disabled</b>";
-			}
-		 ?>
-		</td>
-      </tr>
-    </table>
-	</td>
-  </tr>
-  <tr>
-    <td colspan="3"><table width="100%"  border="0" cellpadding="2" cellspacing="2">
-      <tr>
-        <th width="26" scope="col">&nbsp;</th>
-        <th width="271" scope="col"><div align="left"><a href="amuleweb-main-dload.php?sort=name" target="mainFrame">Filename</a></div></th>
-        <th width="236" scope="col"><div align="left">
-          <div align="left"><a href="amuleweb-main-dload.php?sort=progress">Progress</a></div></th>
-        <th width="95" scope="col"><div align="left">
-          <div align="left"><a href="amuleweb-main-dload.php?sort=size" target="mainFrame">Size</a></div></th>
-        <th width="106" nowrap scope="col"><div align="left"><a href="amuleweb-main-dload.php?sort=size_done" target="mainFrame">Completed</a></div></th>
-        <th width="106" nowrap scope="col"><div align="left"><a href="amuleweb-main-dload.php?sort=srccount" target="mainFrame">Sources</a></div></th>
-        <th width="52" scope="col"><div align="left"><a href="amuleweb-main-dload.php?sort=status" target="mainFrame">Status</a></div></th>
-        <th width="60" nowrap scope="col"><div align="left"><a href="amuleweb-main-dload.php?sort=speed" target="mainFrame">Speed</a></div></th>
-        <th width="40" nowrap scope="col"><div align="left"><a href="amuleweb-main-dload.php?sort=prio" target="mainFrame">Priority</a></div></th>
-        </tr>
-      <tr>
-        <td scope="col">&nbsp;</td>
-        <td scope="col">&nbsp;</td>
-        <td scope="col">&nbsp;</td>
-        <td scope="col">&nbsp;</td>
-        <td scope="col">&nbsp;</td>
-        <td scope="col">&nbsp;</td>
-        <td nowrap scope="col">&nbsp;</td>
-        <td scope="col">&nbsp;</td>
-        <td scope="col">&nbsp;</td>
-        </tr>
-	  
-	  <?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		function StatusString($file)
-		{
-			if ( $file->status == 7 ) {
-				return "Paused";
-			} elseif ( $file->src_count_xfer > 0 ) {
-				return "Downloading";
-			} else {
-				return "Waiting";
-			}
-		}
-
-		function PrioString($file)
-		{
-			$prionames = array(0 => "Low", 1 => "Normal", 2 => "High",
-				3 => "Very high", 4 => "Very low", 5=> "Auto", 6 => "Powershare");
-			$result = $prionames[$file->prio];
-			if ( $file->prio_auto == 1) {
-				$result = $result . "(auto)";
-			}
-			return $result;
-		}
-		
-		//
-		// declare it here, before any function reffered it in "global"
-		//
-		$sort_order;$sort_reverse;
-
-		function my_cmp($a, $b)
-		{
-			global $sort_order, $sort_reverse;
-			
-			switch ( $sort_order) {
-				case "size": $result = $a->size > $b->size; break;
-				case "size_done": $result = $a->size_done > $b->size_done; break;
-				case "progress": $result = (((float)$a->size_done)/((float)$a->size)) > (((float)$b->size_done)/((float)$b->size)); break;
-				case "name": $result = $a->name > $b->name; break;
-				case "speed": $result = $a->speed > $b->speed; break;
-				case "scrcount": $result = $a->src_count > $b->src_count; break;
-				case "status": $result = StatusString($a) > StatusString($b); break;
-				case "prio": $result = PrioString($a) > PrioString($b); break;
-			}
-
-			if ( $sort_reverse ) {
-				$result = !$result;
-			}
-			//var_dump($sort_reverse);
-			return $result;
-		}
-
-		//
-		// perform command before processing content
-
-		if ( ($HTTP_GET_VARS["command"] != "") && ($_SESSION["guest_login"] == 0) ) {
-			foreach ( $HTTP_GET_VARS as $name => $val) {
-				// this is file checkboxes
-				if ( (strlen($name) == 32) and ($val == "on") ) {
-					//var_dump($name);
-					amule_do_download_cmd($name, $HTTP_GET_VARS["command"]);
-				}
-			}
-			//
-			// check "filter-by-status" settings
-			//
-			if ( $HTTP_GET_VARS["command"] == "filter") {
-				//var_dump($_SESSION);
-				$_SESSION["filter_status"] = $HTTP_GET_VARS["status"];
-				$_SESSION["filter_cat"] = $HTTP_GET_VARS["category"];
-			}
-		}
-		if ( $_SESSION["filter_status"] == "") $_SESSION["filter_status"] = "all";
-		if ( $_SESSION["filter_cat"] == "") $_SESSION["filter_cat"] = "all";
-		
-		$downloads = amule_load_vars("downloads");
-
-		$sort_order = $HTTP_GET_VARS["sort"];
-
-		if ( $sort_order == "" ) {
-			$sort_order = $_SESSION["download_sort"];
-		} else {
-			if ( $_SESSION["download_sort_reverse"] == "" ) {
-				$_SESSION["download_sort_reverse"] = 0;
-			} else {
-				if ( $HTTP_GET_VARS["sort"] != '') {
-					$_SESSION["download_sort_reverse"] = !$_SESSION["download_sort_reverse"];
-				}
-			}
-		}
-		//var_dump($_SESSION);
-		$sort_reverse = $_SESSION["download_sort_reverse"];
-		if ( $sort_order != "" ) {
-			$_SESSION["download_sort"] = $sort_order;
-			usort(&$downloads, "my_cmp");
-		}
-
-		//
-		// Prepare categories index array
-		$cats = amule_get_categories();
-		foreach($cats as $i => $c) {
-			$cat_idx[$c] = $i;
-		}
-
-		foreach ($downloads as $file) {
-			$filter_status_result = ($_SESSION["filter_status"] == "all") or
-				($_SESSION["filter_status"] == StatusString($file));
-				
-			$filter_cat_result = ($_SESSION["filter_cat"] == "all") or
-				($cat_idx[ $_SESSION["filter_cat"] ] == $file->category);
-
-			if ( $filter_status_result and $filter_cat_result) {
-				print "<tr>";
-	
-				echo "<td>", '<input type="checkbox" name="', $file->hash, '" >', "</td>";
-	
-				echo "<td nowrap>", $file->short_name, "</td>";
-	
-				echo "<td>", $file->progress, "</td>";
-				
-				echo "<td>", CastToXBytes($file->size), "</td>";
-				
-				echo "<td>", CastToXBytes($file->size_done), "&nbsp;(",
-					((float)$file->size_done*100)/((float)$file->size), "%)</td>";
-	
-				echo "<td>";
-				if ( $file->src_count_not_curr != 0 ) {
-					echo $file->src_count - $file->src_count_not_curr, " / ";
-				}
-				echo $file->src_count, " ( ", $file->src_count_xfer, " ) ";
-				if ( $file->src_count_a4af != 0 ) {
-					echo "+ ", $file->src_count_a4af;
-				}
-				echo "</td>";
-	
-				echo "<td>", StatusString($file), "</td>";
-				
-				echo "<td>", ($file->speed > 0) ? (CastToXBytes($file->speed) . "/s") : "-", "</td>";
-				
-				echo "<td>", PrioString($file), "</td>";
-				
-				print "</tr>";
-			}
-		}
-	  ?>
-    </table></td>
-  </tr>
-</table>
-</form>
-<table width="100%" border="1" cellpadding="0" cellspacing="0">
-  <tr>
-    <td height="67" valign="top">
-	<table width="100%"  border="0" cellpadding="0" cellspacing="0" bgcolor="#0099CC" class="doad-table">
-	  <tr>
-		<th width="30" scope="col"><div align="left"></div></th>
-		<th width="300" scope="col"><div align="left">File name </div></th>
-		<th width="100" scope="col"><div align="left">User name </div></th>
-		<th width="120" scope="col"><div align="left">Transferred Up </div></th>
-		<th width="120" scope="col"><div align="left">Transferred Down </div></th>
-		<th width="120" scope="col"><div align="left">Speed</div></th>
-		<th width="110" scope="col"><div align="left"></div></th>
-	  </tr>
-	  <tr>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-		<td>&nbsp;</td>
-	  </tr>
-		<?php
-			function CastToXBytes($size)
-			{
-				if ( $size < 1024 ) {
-					$result = $size . " bytes";
-				} elseif ( $size < 1048576 ) {
-					$result = ($size / 1024.0) . "KB";
-				} elseif ( $size < 1073741824 ) {
-					$result = ($size / 1048576.0) . "MB";
-				} else {
-					$result = ($size / 1073741824.0) . "GB";
-				}
-				return $result;
-			}
-			$uploads = amule_load_vars("uploads");
-			foreach ($uploads as $file) {
-				echo "<tr>";
-	
-				echo "<td nowrap>", "</td>";
-				
-				echo "<td nowrap>", $file->short_name, "</td>";
-
-				echo "<td nowrap>", $file->user_name, "</td>";
-	
-				echo "<td>", CastToXBytes($file->xfer_up), "</td>";
-				echo "<td>", CastToXBytes($file->xfer_down), "</td>";
-				echo "<td>", ($file->xfer_speed > 0) ? (CastToXBytes($file->xfer_speed) . "/s") : "-", "</td>";
-				echo "</tr>";
-			}
-		?>
-	</table>	</td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/php-default/amuleweb-main-kad.php Deleted

@@ -1,142 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>amule Kad page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf8">
-<meta http-equiv="pragmas" content="no-cache">
-<?php
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
-	}
-
-	amule_load_vars("stats_graph");
-?>
-<style type="text/css">
-
-</style>
-</head>
-
-<body>
-<form name="mainform" action="amuleweb-main-kad.php" method="post">
-  <table width="868" border="0" cellpadding="0" cellspacing="0">
-    
-    <tr>
-      <td width="29" height="16"></td>
-      <td width="500"></td>
-      <td colspan="2"></td>
-    </tr>
-    <tr valign="top">
-      <td height="20">&nbsp;</td>
-      <td>&nbsp;</td>
-      <td colspan="2"><div align="center"></div></td>
-    </tr>
-    <tr valign="top">
-      <td height="35">&nbsp;</td>
-      <td>&nbsp;</td>
-      <td colspan="2">&nbsp;</td>
-    </tr>
-    <tr valign="top">
-      <td height="200">&nbsp;</td>
-      <td><img src="amule_stats_kad.png" width="500" height="200" border="0" alt="" title="" /></td>
-      <td width="18">&nbsp;</td>
-      <td width="321"><table width="100%"  border="0" cellpadding="0" cellspacing="0" class="kadnewnode">
-        <tr>
-          <th colspan="8" scope="col">Bootstrap from node </th>
-          </tr>
-        <tr>
-          <td width="7%">&nbsp;</td>
-          <td width="11%">IP</td>
-          <td width="8%">&nbsp;</td>
-          <td width="12%"><input name="ip3" type="text" id="ip3" size="4" maxlength="3"></td>
-          <td width="12%"><input name="ip2" type="text" id="ip2" size="4" maxlength="3"></td>
-          <td width="12%"><input name="ip1" type="text" id="ip1" size="4" maxlength="3"></td>
-          <td width="12%"><input name="ip0" type="text" id="ip0" size="4" maxlength="3"></td>
-          <td width="26%">&nbsp;</td>
-        </tr>
-        <tr>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td colspan="3">&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td>&nbsp;</td>
-          <td>Port</td>
-          <td>&nbsp;</td>
-          <td><input name="port" type="text" id="port" size="4" maxlength="5"></td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td>&nbsp;</td>
-          <td colspan="2"><input type="submit" name="Submit" value="Connect"></td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </tr>
-      </table></td>
-    </tr>
-    <tr valign="top">
-      <td height="20">&nbsp;</td>
-      <td><div align="center">Number of nodes </div></td>
-      <td colspan="2"><div align="center"></div></td>
-    </tr>
-    <tr valign="top">
-      <td height="35">&nbsp;</td>
-      <td>&nbsp;</td>
-      <td colspan="2">&nbsp;</td>
-    </tr>
-    <tr valign="top">
-      <td height="24">&nbsp;</td>
-      <td>&nbsp;</td>
-      <td colspan="2">&nbsp;</td>
-    </tr>
-    <tr valign="top">
-      <td height="35">&nbsp;</td>
-      <td>&nbsp;</td>
-      <td colspan="2">&nbsp;</td>
-    </tr>
-  </table>
-</form>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/php-default/amuleweb-main-prefs.php Deleted

@@ -1,314 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule preferences page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf8">
-<style type="text/css">
-
-</style>
-</head>
-<script language="JavaScript" type="text/JavaScript">
-function formCommandSubmit(command)
-{
-	var frm=document.forms.mainform
-	frm.command.value=command
-	frm.submit()
-}
-
-var initvals = new Object;
-
-<?php
-	// apply new options before proceeding
-	//var_dump($HTTP_GET_VARS);
-	if ( ($HTTP_GET_VARS["Submit"] == "Apply") && ($_SESSION["guest_login"] == 0) ) {
-		$file_opts = array("check_free_space", "extract_metadata", 
-			"ich_en","aich_trust", "preview_prio","save_sources", "resume_same_cat",
-			"min_free_space", "new_files_paused", "alloc_full", "alloc_full_chunks",
-			"new_files_auto_dl_prio", "new_files_auto_ul_prio"
-		);
-		$conn_opts = array("max_line_up_cap","max_up_limit",
-			"max_line_down_cap","max_down_limit", "slot_alloc", 
-			"tcp_port","udp_dis","max_file_src","max_conn_total","autoconn_en");
-		$webserver_opts = array("use_gzip", "autorefresh_time");
-		
-		$all_opts;
-		foreach ($conn_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["connection"][$i] = $curr_value;
-		}
-		foreach ($file_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["files"][$i] = $curr_value;
-		}
-		foreach ($webserver_opts as $i) {
-			$curr_value = $HTTP_GET_VARS[$i];
-			if ( $curr_value == "on") $curr_value = 1;
-			if ( $curr_value == "") $curr_value = 0;
-			
-			$all_opts["webserver"][$i] = $curr_value;
-		}
-		//var_dump($all_opts);
-		amule_set_options($all_opts);
-	}
-	$opts = amule_get_options();
-	//var_dump($opts);
-	$opt_groups = array("connection", "files", "webserver");
-	//var_dump($opt_groups);
-	foreach ($opt_groups as $group) {
-		$curr_opts = $opts[$group];
-		//var_dump($curr_opts);
-		foreach ($curr_opts as $opt_name => $opt_val) {
-			echo 'initvals["', $opt_name, '"] = "', $opt_val, '";';
-		}
-	}
-?>
-
-
-function init_data()
-{
-	var frm = document.forms.mainform
-
-	var str_param_names = new Array(
-		"max_line_down_cap", "max_line_up_cap",
-		"max_up_limit", "max_down_limit", "max_file_src",
-		"slot_alloc", "max_conn_total",
-		"tcp_port", "udp_port",
-		"min_free_space",
-		"autorefresh_time"
-		)
-	for(i = 0; i < str_param_names.length; i++) {
-		frm[str_param_names[i]].value = initvals[str_param_names[i]];
-	}
-	var check_param_names = new Array(
-		"autoconn_en", "reconn_en", "udp_dis", "new_files_paused",
-		"aich_trust", "alloc_full", "alloc_full_chunks",
-		"check_free_space", "extract_metadata", "ich_en",
-		"new_files_auto_dl_prio", "new_files_auto_ul_prio",
-		"use_gzip"
-		)
-	for(i = 0; i < check_param_names.length; i++) {
-		frm[check_param_names[i]].checked = initvals[check_param_names[i]] == "1" ? true : false;
-	}
-}
-
-</script>
-
-<body onload="init_data();" >
-<form name="mainform" action="amuleweb-main-prefs.php" method="post">
-<table width="800" border="0" cellpadding="0" cellspacing="0">
-  
-  <tr>
-    <td width="52" height="40">&nbsp;</td>
-    <td width="696">&nbsp;</td>
-    <td width="52">&nbsp;</td>
-  </tr>
-  <tr valign="top">
-    <td height="86">&nbsp;</td>
-    <td><table width="100%" bgcolor="#66CC00" >
-        <tr>
-          <td colspan="4"><strong>Webserver</strong></td>
-        </tr>
-        <tr>
-          <td>Page refresh interval </td>
-          <td><input name="autorefresh_time" type="text" id="autorefresh_time" size="4"></td>
-          <td width="28%">&nbsp;</td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td width="25%"><input name="use_gzip" type="checkbox" id="use_gzip">
-            Use gzip compression </td>
-          <td width="11%">&nbsp;</td>
-          <td>&nbsp;</td>
-          <td width="36%">&nbsp;</td>
-        </tr>
-    </table></td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr valign="top">
-    <td height="62">&nbsp;</td>
-    <td><table width="100%" bgcolor="#66CC00" >
-        <tr>
-          <td colspan="5"><strong>Line capacity (for statistics only) </strong></td>
-        </tr>
-        <tr>
-          <td width="18%">Max download rate </td>
-          <td width="11%"><input name="max_line_down_cap" type="text" id="max_line_down_cap" size="4"></td>
-          <td width="16%">Max upload rate </td>
-          <td width="19%"><input name="max_line_up_cap" type="text" id="max_line_up_cap" size="4"></td>
-          <td width="36%">&nbsp;</td>
-        </tr>
-    </table></td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr valign="top">
-    <td height="62">&nbsp;</td>
-    <td><table width="100%" bgcolor="#66CC00" >
-            <tr>
-              <td colspan="5"><strong>Bandwidth limits</strong></td>
-            </tr>
-            <tr>
-              <td width="18%">Max download rate
-              </td>
-              <td width="11%"><input name="max_down_limit" type="text" id="max_down_limit" size="4"></td>
-              <td width="16%">Max upload rate                  </td>
-              <td width="19%"><input name="max_up_limit" type="text" id="max_up_limit" size="4"></td>
-              <td width="36%">Slot allocation
-                <input name="slot_alloc" type="text" id="slot_alloc" size="4"></td>
-      </tr>
-    </table></td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr valign="top">
-    <td height="106">&nbsp;</td>
-    <td><table width="100%" bgcolor="#66CC00" >
-        <tr>
-          <td colspan="5"><strong>Connection settings </strong></td>
-        </tr>
-        <tr>
-          <td width="30%">Max total connections (total) </td>
-          <td width="11%"><input name="max_conn_total" type="text" id="max_conn_total" size="4"></td>
-          <td width="20%">Max sources per file </td>
-          <td width="18%"><input name="max_file_src" type="text" id="max_file_src" size="4"></td>
-          <td width="21%">&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2"><input name="autoconn_en" type="checkbox" id="autoconn_en">
-            Autoconnect at startup </td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <td colspan="2"><input name="reconn_en" type="checkbox" id="reconn_en">
-            Reconnect when connection lost            </td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-          <td>&nbsp;</td>
-        </tr>
-    </table></td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr valign="top">
-    <td height="62">&nbsp;</td>
-    <td><table width="100%" bgcolor="#66CC00" >
-      <tr>
-        <td colspan="5"><strong>Network settings </strong></td>
-      </tr>
-      <tr>
-        <td width="13%">TCP port </td>
-        <td width="23%"><input name="tcp_port" type="text" id="tcp_port" size="4"></td>
-        <td width="12%">UDP port </td>
-        <td width="17%"><input name="udp_port" type="text" id="udp_port" size="4"></td>
-        <td width="35%"><input name="udp_dis" type="checkbox" id="udp_dis">
-          Disable UDP connections          </td>
-      </tr>
-    </table></td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr valign="top">
-    <td height="108">&nbsp;</td>
-    <td><table width="100%" bgcolor="#66CC00" >
-      <tr>
-        <td colspan="4"><strong>File settings </strong></td>
-      </tr>
-      <tr>
-        <td width="27%">Minimum free space (Mb)</td>
-        <td width="15%"><input name="min_free_space" type="text" id="min_free_space" size="4"></td>
-        <td width="3%">&nbsp;</td>
-        <td width="51%"><input name="check_free_space" type="checkbox" id="check_free_space">
-          Check free space          </td>
-      </tr>
-      <tr>
-        <td colspan="2"><input name="new_files_auto_dl_prio" type="checkbox" id="new_files_auto_dl_prio">
-    Added download files have auto priority</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan="2"><input name="new_files_auto_ul_prio" type="checkbox" id="new_files_auto_ul_prio">
-          New shared files have auto priority</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan="2"><input name="ich_en" type="checkbox" id="ich_en">
-          I.C.H. active</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan="2"><input name="aich_trust" type="checkbox" id="aich_trust">
-          AICH trusts every hash (not recommended)</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan="2"><input name="alloc_full_chunks" type="checkbox" id="alloc_full_chunks">
-          Alloc full chunks of .part files</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan="2"><input name="alloc_full" type="checkbox" id="alloc_full">
-          Alloc full disk space for .part files</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan="2"><input name="new_files_paused" type="checkbox" id="new_files_paused">
-          Add files to download queue in pause mode</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-      </tr>
-      <tr>
-        <td colspan="2"><input name="extract_metadata" type="checkbox" id="extract_metadata">
-          Extract metadata tags</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-      </tr>
-    </table></td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr valign="top">
-    <td height="28">&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr valign="top">
-    <td height="28">&nbsp;</td>
-    <td align="center">
-		<?php
-			if ($_SESSION["guest_login"] == 0) {
-				echo '<input type="submit" name="Submit" value="Apply">';
-			} else {
-				echo "<b>&nbsp;You can not change options - logged in as guest</b>";
-			}
-		?>
-    	<input name="command" type="hidden" id="command">
-	</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr valign="top">
-    <td height="108">&nbsp;</td>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-</form>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/php-default/amuleweb-main-search.php Deleted

@@ -1,231 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule download page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf8">
-<style type="text/css">
-
-</style>
-</head>
-<script language="JavaScript" type="text/JavaScript">
-function formCommandSubmit(command)
-{
-	<?php
-		if ($_SESSION["guest_login"] != 0) {
-				echo 'alert("You logged in as guest - commands are disabled");';
-				echo "return;";
-		}
-	?>
-	var frm=document.forms.mainform
-	frm.command.value=command
-	frm.submit()
-}
-
-</script>
-
-<body>
-<form name="mainform" action="amuleweb-main-search.php" method="post">
-<table width="100%"  border="0" bgcolor="#0099CC">
-  <tr>
-    <td width="100%"><table width="100%"  border="0" cellpadding="2" cellspacing="2">
-      <tr>
-        <td colspan="5" scope="col"><table width="100%"  border="1" align="left" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="625" bgcolor="#0099CC">
-              <input type="hidden" name="command" value="">
-              <input name="searchval" type="text" id="searchval" size="75">
-              <input name="Search" type="submit" id="Search" value="Search" onClick="javascript:formCommandSubmit('search');">
-              <div align="left">
-              </div></td>
-            <td width="278" bgcolor="#0099CC">
-            <input name="Download" type="submit" id="Download" value="Download" onClick="javascript:formCommandSubmit('download');" >
-            <img src="arrow-r.png" width="42" height="23">              <select name="targetcat" id="targetcat">
-                <?php
-                	$cats = amule_get_categories();
-                	foreach($cats as $c) {
-                		echo "<option>", $c, "</option>";
-                	}
-                ?>
-              </select></td>
-          </tr>
-          <tr>
-            <td bgcolor="#0099CC"><div align="left">
-              <label>Min size</label>
-            &nbsp;
-                <input name="minsize" type="text" id="minsize" size="5">
-                <select name="minsizeu" id="minsizeu">
-                    <option>Byte</option>
-                    <option>KByte</option>
-                    <option selected>MByte</option>
-                    <option>GByte</option>
-                </select>              
-                <label>Max size</label>
-&nbsp;
-    <input name="maxsize" type="text" id="maxsize" size="5">
-    <select name="maxsizeu" id="maxsizeu">
-          <option>Byte</option>
-          <option>KByte</option>
-          <option selected>MByte</option>
-          <option>GByte</option>
-    </select>  
-    <label>Availability</label>
-    <input name="avail" type="text" id="avail" size="6">
-    <label>Search type </label>
-    <select name="searchtype" id="searchtype">
-      <option selected>Local</option>
-      <option>Global</option>
-      <option>Kad</option>
-    </select>
-            </div></td>
-            <td bgcolor="#0099CC"><a href="amuleweb-main-search.php" target="mainFrame">Click here to reload search results</a></td>
-          </tr>
-        </table></td>
-        </tr>
-      <tr>
-        <th width="22" scope="col">&nbsp;</th>
-        <th width="349" nowrap scope="col"><div align="left"><a href="amuleweb-main-search.php?sort=name" target="mainFrame">Filename</a></div></th>
-        <th width="99" nowrap scope="col"><div align="left"><a href="amuleweb-main-search.php?sort=size" target="mainFrame">Size</a></div></th>
-        <th width="96" nowrap scope="col"><div align="left"><a href="amuleweb-main-search.php?sort=sources" target="mainFrame">Sources</a></th>
-        <th width="222" nowrap scope="col">&nbsp;</th>
-        </tr>
-
-	  <?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		//
-		// declare it here, before any function reffered it in "global"
-		//
-		$sort_order;$sort_reverse;
-
-		function my_cmp($a, $b)
-		{
-			global $sort_order, $sort_reverse;
-			
-			switch ( $sort_order) {
-				case "size": $result = $a->size > $b->size; break;
-				case "name": $result = $a->name > $b->name; break;
-				case "sources": $result = $a->sources > $b->sources; break;
-			}
-
-			if ( $sort_reverse ) {
-				$result = !$result;
-			}
-
-			return $result;
-		}
-
-		function str2mult($str)
-		{
-			$result = 1;
-			switch($str) {
-				case "Byte":	$result = 1; break;
-				case "KByte":	$result = 1024; break;		
-				case "MByte":	$result = 1012*1024; break;
-				case "GByte":	$result = 1012*1024*1024; break;
-			}
-			return $result;
-		}
-
-		function cat2idx($cat)
-		{
-                	$cats = amule_get_categories();
-                	$result = 0;
-                	foreach($cats as $i => $c) {
-                		if ( $cat == $c) $result = $i;
-                	}
-            		return $result;
-		}
-
-		if ($_SESSION["guest_login"] == 0) {
-			if ( $HTTP_GET_VARS["command"] == "search") {
-				$search_type = -1;
-				switch($HTTP_GET_VARS["searchtype"]) {
-					case "Local": $search_type = 0; break;
-					case "Global": $search_type = 1; break;
-					case "Kad": $search_type = 2; break;
-				}
-				$min_size = $HTTP_GET_VARS["minsize"] == "" ? 0 : $HTTP_GET_VARS["minsize"];
-				$max_size = $HTTP_GET_VARS["maxsize"] == "" ? 0 : $HTTP_GET_VARS["maxsize"];
-	
-				$min_size *= str2mult($HTTP_GET_VARS["minsizeu"]);
-				$max_size *= str2mult($HTTP_GET_VARS["maxsizeu"]);
-				
-				amule_do_search_start_cmd($HTTP_GET_VARS["searchval"],
-					//$HTTP_GET_VARS["ext"], $HTTP_GET_VARS["filetype"],
-					"", "",
-					$search_type, $HTTP_GET_VARS["avail"], $min_size, $max_size);
-			} elseif ( $HTTP_GET_VARS["command"] == "download") {
-				foreach ( $HTTP_GET_VARS as $name => $val) {
-					// this is file checkboxes
-					if ( (strlen($name) == 32) and ($val == "on") ) {
-						$cat = $HTTP_GET_VARS["targetcat"];
-						$cat_idx = cat2idx($cat);
-						amule_do_search_download_cmd($name, $cat_idx);
-					}
-				}
-			} else {
-			}
-		}		
-		$search = amule_load_vars("searchresult");
-
-		$sort_order = $HTTP_GET_VARS["sort"];
-
-		if ( $sort_order == "" ) {
-			$sort_order = $_SESSION["search_sort"];
-		} else {
-			if ( $_SESSION["search_sort_reverse"] == "" ) {
-				$_SESSION["search_sort_reverse"] = 0;
-			} else {
-				$_SESSION["search_sort_reverse"] = !$_SESSION["search_sort_reverse"];
-			}
-		}
-
-		$sort_reverse = $_SESSION["search_sort_reverse"];
-		if ( $sort_order != "" ) {
-			$_SESSION["search_sort"] = $sort_order;
-			usort(&$search, "my_cmp");
-		}
-
-		foreach ($search as $file) {
-			print "<tr>";
-
-			echo "<td>", '<input type="checkbox" name="', $file->hash, '" >', "</td>";
-
-			echo "<td nowrap>", $file->short_name, "</td>";
-			
-			echo "<td>", CastToXBytes($file->size), "</td>";
-
-			echo "<td>", $file->sources, "</td>";
-
-			print "</tr>";
-		}
-
-	  ?>
-
-    </table></td>
-  </tr>
-</table>
-</form>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/php-default/amuleweb-main-servers.php Deleted

@@ -1,123 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule download page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-
-</style></head>
-
-<body>
-<table width="100%"  border="1" bgcolor="#0099CC">
-  <tr>
-    <td height="20">&nbsp;</td>
-  </tr>
-  <tr>
-    <td><table width="100%"  border="0" align="left" cellspacing="1">
-      <tr>
-        <th width="33" scope="col"></th>
-        <th width="172" ><div align="left"><a href="amuleweb-main-servers.php?sort=name" target="mainFrame">Name</a></div></th>
-        <th width="227" ><div align="left">
-          <div align="left"><a href="amuleweb-main-servers.php?sort=desc" target="mainFrame">Description</a></div></th>
-        <th width="149" scope="col"><div align="left">
-          <div align="left">Address</div></th>
-        <th width="77" scope="col"><div align="left"><a href="amuleweb-main-servers.php?sort=users" target="mainFrame">Users</a></div></th>
-        <th width="80" scope="col"><div align="left"><a href="amuleweb-main-servers.php?sort=maxusers" target="mainFrame">Max Users</a> </div></th>
-        <th width="37" scope="col"><div align="left"><a href="amuleweb-main-servers.php?sort=files" target="mainFrame">Files</a></div></th>
-        </tr>
-	  
-	  <?php
-
-
-		//
-		// declare it here, before any function reffered it in "global"
-		//
-		$sort_order;$sort_reverse;
-
-		function my_cmp($a, $b)
-		{
-			global $sort_order, $sort_reverse;
-			switch ( $sort_order) {
-				case "name": $result = $a->name > $b->name; break;
-				case "desc": $result = $a->desc > $b->desc; break;
-				case "users": $result = $a->users > $b->users; break;
-				case "max_users": $result = $a->maxusers > $b->maxusers; break;
-				case "files":$result = $a->files > $b->files; break;
-			}
-
-			if ( $sort_reverse ) {
-				$result = !$result;
-			}
-			return $result;
-		}
-
-		$servers = amule_load_vars("servers");
-
-		$sort_order = $HTTP_GET_VARS["sort"];
-
-		//
-		// perform command before processing content
-		//
-		if ( ($HTTP_GET_VARS["cmd"] != "") and ($HTTP_GET_VARS["ip"] != "") and ($HTTP_GET_VARS["port"] != "")) {
-			if ($_SESSION["guest_login"] == 0) {
-				amule_do_server_cmd($HTTP_GET_VARS["ip"], $HTTP_GET_VARS["port"], $HTTP_GET_VARS["cmd"]);
-			}
-		}
-		
-		if ( $sort_order == "" ) {
-			$sort_order = $_SESSION["servers_sort"];
-		} else {
-			if ( $_SESSION["sort_reverse"] == "" ) {
-				$_SESSION["sort_reverse"] = 0;
-			} else {
-				$_SESSION["sort_reverse"] = !$_SESSION["sort_reverse"];
-			}
-		}
-
-		$sort_reverse = $_SESSION["sort_reverse"];
-		if ( $sort_order != "" ) {
-			$_SESSION["servers_sort"] = $sort_order;
-			usort(&$servers, "my_cmp");
-		}
-		foreach ($servers as $srv) {
-			echo "<tr>";
-			
-			if ($_SESSION["guest_login"] != 0) {
-				echo "<td></td>";
-			} else {
-				echo "<td>",
-					'<a href="amuleweb-main-servers.php?cmd=connect&ip=', $srv->ip,
-					'&port=', $srv->port, '" target="mainFrame">',
-					'<img src="connect.gif" width="16" height="16" border="0">','</a>',
-					'<a href="amuleweb-main-servers.php?cmd=remove&ip=', $srv->ip,
-					'&port=', $srv->port, '" target="mainFrame">',
-					'<img src="cancel.gif" width="16" height="16" border="0">','</a>',
-					"</td>";
-			}
-
-			echo "<td>", $srv->name, "</td>";
-			echo "<td>", $srv->desc, "</td>";
-			echo "<td>", $srv->addr, "</td>";
-			echo "<td>", $srv->users, "</td>";
-			echo "<td>", $srv->maxusers, "</td>";
-			echo "<td>", $srv->files, "</td>";
-
-			echo "</tr>";
-		}
-	  ?>
-    </table></td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/php-default/amuleweb-main-shared.php Deleted

@@ -1,260 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule download page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf8">
-<style type="text/css">
-
-</style>
-<script language="JavaScript" type="text/JavaScript">
-
-</script>
-</head>
-<script language="JavaScript" type="text/JavaScript">
-function formCommandSubmit(command)
-{
-	<?php
-		if ($_SESSION["guest_login"] != 0) {
-				echo 'alert("You logged in as guest - commands are disabled");';
-				echo "return;";
-		}
-	?>
-	var frm=document.forms.mainform
-	frm.command.value=command
-	frm.submit()
-}
-
-</script>
-
-<body>
-<form name="mainform" action="amuleweb-main-shared.php" method="post">
-<table width="100%"  border="1" bgcolor="#0099CC">
-  <tr>
-    <td width="118" height="20"><input type="hidden" name="command"></td>
-    <td width="200"><table border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <td><a href="javascript:formCommandSubmit('reload');" target="mainFrame" onClick="MM_nbGroup('down','group1','reload','',1)" onMouseOver="MM_nbGroup('over','reload','','',1)" onMouseOut="MM_nbGroup('out')"><img src="toolbutton-reload.jpeg" alt="Reload" name="reload" width="50" height="20" border="0" onload=""></a></td>
-        <td>&nbsp;</td>
-        <td><a href="javascript:formCommandSubmit('prioup');" target="mainFrame" onClick="MM_nbGroup('down','group1','up','',1)" onMouseOver="MM_nbGroup('over','up','','',1)" onMouseOut="MM_nbGroup('out')"><img name="up" src="up.jpeg" border="0" alt="Prio Up" onLoad=""></a></td>
-        <td><a href="javascript:formCommandSubmit('priodown');" target="mainFrame" onClick="MM_nbGroup('down','group1','down','',1)" onMouseOver="MM_nbGroup('over','down','','',1)" onMouseOut="MM_nbGroup('out')"><img src="down.jpeg" alt="Prio Down" name="down" width="50" height="20" border="0" onload=""></a></td>
-        <td>&nbsp;</td>
-      </tr>
-    </table></td>
-    <td width="583"><table border="0" cellpadding="0" cellspacing="0">
-      <tr>
-        <td><select name="select">
-          <option selected>Select prio</option>
-          <option>Low</option>
-          <option>Normal</option>
-          <option>High</option>
-        </select>
-</td>
-        <td><a href="javascript:formCommandSubmit('setprio');" target="mainFrame" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img src="apply.jpeg" alt="Set Priority" name="resume" width="50" height="20" border="0" onload=""></a></td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>
-		<?php
-		 	if ($_SESSION["guest_login"] != 0) {
-				echo "<b>&nbsp;You logged in as guest - commands are disabled</b>";
-			}
-		 ?>
-		</td>
-      </tr>
-    </table></td>
-  </tr>
-  <tr>
-    <td colspan="3"><table width="100%"  border="0" cellpadding="2" cellspacing="2">
-      <tr>
-        <th width="20" scope="col">&nbsp;</th>
-        <th width="300" nowrap scope="col"><div align="left"><a href="amuleweb-main-shared.php?sort=name" target="mainFrame">Filename</a></div></th>
-        <th width="120" nowrap scope="col"><div align="left">
-          <div align="left"><a href="amuleweb-main-shared.php?sort=xfer" target="mainFrame">Transfer</a> (<a href="amuleweb-main-shared.php">Total</a>) </div></th>
-        <th width="120" nowrap scope="col"><div align="left">
-          <div align="left"><a href="amuleweb-main-shared.php?sort=req" target="mainFrame">Requests</a> (<a href="amuleweb-main-shared.php">Total</a>)</div></th>
-        <th width="120" nowrap scope="col"><div align="left"><a href="amuleweb-main-shared.php?sort=acc" target="mainFrame">Accepted</a> (<a href="amuleweb-main-shared.php">Total</a>)</div></th>
-        <th width="86" nowrap scope="col"><div align="left"><a href="amuleweb-main-shared.php?sort=size" target="mainFrame">Size</a></div></th>
-        <th width="83" nowrap scope="col"><div align="left"><a href="amuleweb-main-shared.php?sort=prio" target="mainFrame">Prio</a></div></th>
-        <th width="14" nowrap scope="col">&nbsp;</th>
-        </tr>
-
-	  
-	  <?php
-		function CastToXBytes($size)
-		{
-			if ( $size < 1024 ) {
-				$result = $size . " bytes";
-			} elseif ( $size < 1048576 ) {
-				$result = ($size / 1024.0) . "KB";
-			} elseif ( $size < 1073741824 ) {
-				$result = ($size / 1048576.0) . "MB";
-			} else {
-				$result = ($size / 1073741824.0) . "GB";
-			}
-			return $result;
-		}
-
-		function StatusString($file)
-		{
-			if ( $file->status == 7 ) {
-				return "Paused";
-			} elseif ( $file->src_count_xfer > 0 ) {
-				return "Downloading";
-			} else {
-				return "Waiting";
-			}
-		}
-
-		function PrioString($file)
-		{
-			$prionames = array(0 => "Low", 1 => "Normal", 2 => "High",
-				3 => "Very high", 4 => "Very low", 5=> "Auto", 6 => "Powershare");
-			$result = $prionames[$file->prio];
-			if ( $file->prio_auto == 1) {
-				$result = $result . "(auto)";
-			}
-			return $result;
-		}
-
-		//
-		// declare it here, before any function reffered it in "global"
-		//
-		$sort_order;$sort_reverse;
-
-		function my_cmp($a, $b)
-		{
-			global $sort_order, $sort_reverse;
-			
-			switch ( $sort_order) {
-				case "size": $result = $a->size > $b->size; break;
-				case "name": $result = $a->name > $b->name; break;
-				case "xfer": $result = $a->xfer > $b->xfer; break;
-				case "acc": $result = $a->accept > $b->accept; break;
-				case "req": $result = $a->req > $b->req; break;
-				case "prio": $result = PrioString($a) > PrioString($b); break;
-			}
-
-			if ( $sort_reverse ) {
-				$result = !$result;
-			}
-			//var_dump($sort_reverse);
-			return $result;
-		}
-
-		//
-		// perform command before processing content
-		//
-		//var_dump($HTTP_GET_VARS);
-		if (($HTTP_GET_VARS["command"] != "") && ($_SESSION["guest_login"] == 0)) {
-			//amule_do_download_cmd($HTTP_GET_VARS["command"]);
-			foreach ( $HTTP_GET_VARS as $name => $val) {
-				// this is file checkboxes
-				if ( (strlen($name) == 32) and ($val == "on") ) {
-					//var_dump($name);var_dump($val);
-					amule_do_shared_cmd($name, $HTTP_GET_VARS["command"]);
-				}
-			}
-			if ($HTTP_GET_VARS["command"] == "reload") {
-				amule_do_reload_shared_cmd();
-			}
-		}
-		$shared = amule_load_vars("shared");
-
-		$sort_order = $HTTP_GET_VARS["sort"];
-
-		if ( $sort_order == "" ) {
-			$sort_order = $_SESSION["shared_sort"];
-		} else {
-			if ( $_SESSION["sort_reverse"] == "" ) {
-				$_SESSION["sort_reverse"] = 0;
-			} else {
-				$_SESSION["sort_reverse"] = !$_SESSION["sort_reverse"];
-			}
-		}
-		//var_dump($_SESSION);
-		$sort_reverse = $_SESSION["sort_reverse"];
-		if ( $sort_order != "" ) {
-			$_SESSION["shared_sort"] = $sort_order;
-			usort(&$shared, "my_cmp");
-		}
-
-		foreach ($shared as $file) {
-			print "<tr>";
-
-			echo "<td>", '<input type="checkbox" name="', $file->hash, '" >', "</td>";
-
-			echo "<td nowrap>", $file->short_name, "</td>";
-			echo "<td>", CastToXBytes($file->xfer), "</td>";
-
-			echo "<td>", $file->req, "</td>";
-			echo "<td>", $file->accept, "</td>";
-			
-			echo "<td>", CastToXBytes($file->size), "</td>";
-
-			echo "<td>", PrioString($file), "</td>";
-
-			print "</tr>";
-		}
-	  ?>
-    </table></td>
-  </tr>
-</table>
-</form>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/php-default/amuleweb-main-stats.php Deleted

@@ -1,113 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule Kad page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf8">
-<meta http-equiv="pragmas" content="no-cache">
-<?php
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
-	}
-
-	amule_load_vars("stats_graph");
-
-?>
-<style type="text/css">
-
-</style>
-</head>
-<script language="JavaScript" type="text/JavaScript">
-var openImg = new Image();
-openImg.src = "tree-open.gif";
-var closedImg = new Image();
-closedImg.src = "tree-closed.gif";
-
-function showBranch(branch){
-	var objBranch = document.getElementById(branch).style;
-	if(objBranch.display=="block")
-		objBranch.display="none";
-	else
-		objBranch.display="block";
-}
-
-function swapFolder(img){
-	objImg = document.getElementById(img);
-	if(objImg.src.indexOf('tree-closed.gif')>-1)
-		objImg.src = openImg.src;
-	else
-		objImg.src = closedImg.src;
-}
-
-</script>
-<body>
-<table width="904" border="0" cellpadding="0" cellspacing="0">
-  
-  <tr>
-    <td width="11">&nbsp;</td>
-    <td width="379">&nbsp;</td>
-    <td width="10" height="10">&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr valign="top">
-    <td>&nbsp;</td>
-    <td rowspan="7"><iframe name="stats" src="stats_tree.php" width="400" height="700" frameborder="1"></iframe></td>
-    <td height="58">&nbsp;</td>
-    <td><img src="amule_stats_download.png" width="500" height="200" border="0" alt="" title="" /></td>
-  </tr>
-  <tr valign="top">
-    <td>&nbsp;</td>
-    <td height="20">&nbsp;</td>
-    <td><div align="center">Download speed </div></td>
-    </tr>
-  <tr valign="top">
-    <td>&nbsp;</td>
-    <td height="35">&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr valign="top">
-    <td>&nbsp;</td>
-    <td height="58">&nbsp;</td>
-    <td><img src="amule_stats_upload.png" width="500" height="200" border="0" alt="" title="" /></td>
-  </tr>
-  <tr valign="top">
-    <td>&nbsp;</td>
-    <td height="20"><div align="center"></div></td>
-    <td><div align="center">Upload speed</div></td>
-    </tr>
-  <tr valign="top">
-    <td>&nbsp;</td>
-    <td height="35">&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr valign="top">
-    <td>&nbsp;</td>
-    <td height="58">&nbsp;</td>
-    <td><img src="amule_stats_conncount.png" width="500" height="200" border="0" alt="" title="" /></td>
-  </tr>
-  <tr valign="top">
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td height="20"><div align="center"></div></td>
-    <td><div align="center">Number of connections </div></td>
-    </tr>
-  <tr valign="top">
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-    <td height="35">&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/php-default/apply.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/arrow-r.png Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/cancel.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/connect.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/delete.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/down.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/favicon.ico Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/footer.php Deleted

@@ -1,65 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule-frame-bottom</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-
-</style></head>
-<script language="JavaScript" type="text/JavaScript">
-
-function refreshFrames()
-{
-	top.frames["mainFrame"].location = "amuleweb-main-dload.php"
-	top.frames.mainFrame.location.reload();
-}
-
-</script>
-
-<body>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-  
-  <tr>
-    <td width="70" height="41">&nbsp;</td>
-    <td width="100%" valign="top"><form name="formlink" method="post" action="footer.php">
-        <input type="submit" name="Submit" value="Download link" onclick="refreshFrames()">
-        <input name="ed2klink" type="text" id="ed2klink" size="100">
-        <img src="arrow-r.png" width="42" height="23">
-        <select name="selectcat" id="selectcat">
-        <?php
-			$cats = amule_get_categories();
-			if ( $HTTP_GET_VARS["Submit"] != "" ) {
-				$link = $HTTP_GET_VARS["ed2klink"];
-				$target_cat = $HTTP_GET_VARS["selectcat"];
-				$target_cat_idx = 0;
-            	foreach($cats as $i => $c) {
-            		if ( $target_cat == $c) $target_cat_idx = $i;
-            	}
-            	if ( strlen($link) > 0 ) {
-            		amule_do_ed2k_download_cmd($link, $target_cat_idx);
-            	}
-			}
-			foreach($cats as $c) {
-				echo  '<option>', $c, '</option>';
-			}
-        ?>
-        </select>
-        </form></td>
-    <td width="29">&nbsp;</td>
-  </tr>
-  <tr>
-    <td height="1"></td>
-    <td></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td></td>
-  </tr>
-</table>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/php-default/index.html Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/login.php Deleted

@@ -1,67 +0,0 @@
-<html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>aMule CVS - Web Control Panel</title>
-
-<script language="JavaScript" type="text/javascript">
-
-function breakout_of_frame()
-{
-  // see http://www.thesitewizard.com/archive/framebreak.shtml
-  // for an explanation of this script and how to use it on your
-  // own website
-  if (top.location != location) {
-    top.location.href = document.location.href ;
-  }
-}
-
-function login_init()
-{
-	breakout_of_frame();
-	document.login.pass.focus();
-}
-
-</script>
-
-<style type="text/css">
-.ibutton
-{
-cursor:hand;
-position:relative;
-top:5;
-font-weight: bold;
-font-family: Tahoma, Verdana, Arial;
-font-size: 11px;
-}
-</style></head>
-
-<body onload="login_init();" alink="white" bgcolor="#cccccc" link="white" text="white" vlink="white">
-<table align="center" border="0" cellpadding="4" cellspacing="0" height="100%" width="100%">
-<tbody><tr><td align="center" valign="middle">
-<table align="center" border="0" cellpadding="4" cellspacing="0">
-<tbody><tr>
-<td align="center" bgcolor="#0066cc">
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://www.amule.org/" target="_blank"><img src="phpamule.png"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<p><font style="font-size: 10pt;" face="Tahoma"><b>Web Control Panel</b><br>Login</font></p>
-</td>
-</tr>
-<tr>
-<td align="center" bgcolor="#3399ff" valign="top">
-<form action="" method="post" name="login">
-<font style="font-size: 10pt;" face="Tahoma">&nbsp;<br>Enter your password here<br><br>
-<input name="pass" size="37" style="border: 1px none black;" value="" type="password">
-<br><br><input value="Login Now" type="submit"></font>
-</form>
-<br>
-<?php
-	if ($_SESSION["login_error"] != "") {
-		echo "<font color=blue size=+2>";
-		echo $_SESSION["login_error"];
-		echo "</font>";
-	}
-?>
-</td>
-</tr>
-</tbody></table>
-</td>
-</tr>
-</tbody></table>
-</body></html>

aMule-2.2.6.tar.bz2/src/webserver/php-default/pause.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/phpamule.png Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/resume.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/stats.php Deleted

@@ -1,88 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule control page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<meta http-equiv="pragmas" content="no-cache">
-<?php
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
-	}
-?>
-<style type="text/css">
-
-</style>
-</head>
-<table width="800" border="0" cellpadding="0" cellspacing="0">
-  
-  <tr>
-    <td width="21" height="9"></td>
-    <td width="22"></td>
-    <td width="152"></td>
-    <td width="16"></td>
-    <td width="530"></td>
-    <td width="59"></td>
-  </tr>
-  <tr>
-    <td height="20">&nbsp;</td>
-    <td valign="top"><img src="connect.gif" width="16" height="16"></td>
-    <td valign="top"><strong>Connection status : </strong></td>
-    <td>&nbsp;</td>
-    <td valign="top">
-      <?php
-    	$stats = amule_get_stats();
-    	if ( $stats["id"] == 0 ) {
-    		echo "Not connected";
-    	} elseif ( $stats["id"] == 0xffffffff ) {
-    		echo "Connecting ...";
-    	} else {
-    		echo "Connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
-    			$stats["serv_name"], "  ", $stats["serv_addr"];
-    	}
-    ?>
-    </td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td height="20">&nbsp;</td>
-    <td valign="top">&nbsp;</td>
-    <td valign="top"><strong>Kad status : </strong></td>
-    <td>&nbsp;</td>
-    <td valign="top">
-      <?php
-    	$stats = amule_get_stats();
-    	if ( $stats["kad_connected"] == 1 ) {
-    		echo "Connected";
-			if ( $stats["kad_firewalled"] == 1 ) {
-				echo "(Firewalled)";
-			} else {
-				echo "(OK)";
-			}
-    	} else {
-    		echo "Disconnected";
-    	}
-    ?>
-    </td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td height="15"></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-    <td></td>
-  </tr>
-</table>
-
-
-</html>
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/webserver/php-default/stats_tree.php Deleted

@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule preferences page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf8">
-<meta http-equiv="pragmas" content="no-cache">
-<?php
-	if ( $_SESSION["auto_refresh"] > 0 ) {
-		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
-	}
-?>
-<style type="text/css">
-.trigger{
-	cursor: pointer;
-	cursor: hand;
-	font-family: Tahoma;
-	font-size: small;
-}
-.branch{
-	display: block;
-	margin-left: 16px;
-	font-family: Tahoma;
-	font-size: small;
-}
-
-</style>
-</head>
-<script language="JavaScript" type="text/JavaScript">
-var openImg = new Image();
-openImg.src = "tree-open.gif";
-var closedImg = new Image();
-closedImg.src = "tree-closed.gif";
-
-function showBranch(branch){
-	var objBranch = document.getElementById(branch).style;
-	if(objBranch.display=="block")
-		objBranch.display="none";
-	else
-		objBranch.display="block";
-}
-
-function swapFolder(img){
-	objImg = document.getElementById(img);
-	if(objImg.src.indexOf('tree-closed.gif')>-1)
-		objImg.src = openImg.src;
-	else
-		objImg.src = closedImg.src;
-}
-
-</script>
-<body onLoad="showBranch('br_Stats');swapFolder('fl_Stats')">
-<?php
-
-function print_ident($i)
-{
-	while($i != 0) {
-		echo "\t";
-		$i--;
-	}
-}
-
-function print_item($it, $ident)
-{
-	print_ident($ident);
-	echo "<img src=\"tree-leaf.gif\">", $it, "<br>\n";
-}
-
-function print_folder($key, &$arr, $ident)
-{
-	print_ident($ident);
-	echo "<span class=\"trigger\" onClick=\"showBranch('br_",
-		$key, "');swapFolder('fl_", $key, "')\">\n";
-	print_ident($ident+1);
-	echo "<img src=\"tree-closed.gif\" border=\"0\" id=\"fl_", $key, "\">\n";
-	print_ident($ident+1);
-	echo $key, "<br>\n";
-	print_ident($ident);
-	echo "</span>\n";
-	print_ident($ident);
-	echo "<span class=\"branch\" id=\"br_", $key, "\">\n";
-
-	foreach ($arr as $k => $v) {
-		if ( count(&$v) ) {
-			print_folder($k, $v, $ident+1);
-		} else {
-			print_item($k, $ident+1);
-		}
-	}
-
-	print_ident($ident);
-	echo "</span>\n";
-}
-
-	$stattree = amule_load_vars("stats_tree");
-
-	foreach ($stattree as $k => $v) {
-		if ( count(&$v) ) {
-			print_folder($k, $v, $ident+1);
-		} else {
-			print_item($k, $ident+1);
-		}
-	}
-?>
-</body>
-</html>

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-connect.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-download-pressed.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-download.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-filter.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-kad-pressed.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-kad.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-logout-pressed.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-logout.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-reload.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-search-pressed.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-search.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-servers-pressed.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-servers.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-settings-pressed.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-settings.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-shared-pressed.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-shared.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-stats-pressed.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/toolbutton-stats.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/top.html Deleted

@@ -1,99 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>amule control page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<style type="text/css">
-
-</style>
-<script language="JavaScript" type="text/JavaScript">
-
-</script>
-</head>
-
-<body onLoad="MM_preloadImages('toolbutton-download-pressed.jpeg','toolbutton-servers-pressed.jpeg','toolbutton-search-pressed.jpeg','toolbutton-shared-pressed.jpeg','toolbutton-stats-pressed.jpeg','toolbutton-settings-pressed.jpeg','toolbutton-kad-pressed.jpeg','toolbutton-logout-pressed.jpeg')">
-<table width="100%" height="70" border="0" cellpadding="0" cellspacing="0" bordercolor="#111111" bgcolor="#6699CC" style="border-collapse: collapse">
-  
-  <tr>
-    <td width="171" height="50"></td>
-    <td width="787" valign="top"><table border="0" cellpadding="0" cellspacing="0">
-        
-        <tr>
-          <td width="100" height="50" valign="top"><a href="amuleweb-main-dload.php" target="mainFrame" onClick="MM_nbGroup('down','group1','download','',1)" onMouseOver="MM_nbGroup('over','download','toolbutton-download-pressed.jpeg','',1)" onMouseOut="MM_nbGroup('out')"><img src="toolbutton-download.jpeg" alt="Download list" name="download" border="0" onload=""></a></td>
-          <td><a href="amuleweb-main-search.php" target="mainFrame" onClick="MM_nbGroup('down','group1','search','',1)" onMouseOver="MM_nbGroup('over','search','toolbutton-search-pressed.jpeg','',1)" onMouseOut="MM_nbGroup('out')"><img name="search" src="toolbutton-search.jpeg" border="0" alt="" onload=""></a></td>
-          <td><a href="amuleweb-main-servers.php" target="mainFrame" onClick="MM_nbGroup('down','group1','servers','',1)" onMouseOver="MM_nbGroup('over','servers','toolbutton-servers-pressed.jpeg','',1)" onMouseOut="MM_nbGroup('out')"><img src="toolbutton-servers.jpeg" alt="Server list" name="servers" border="0" onload=""></a></td>
-          <td><a href="amuleweb-main-shared.php" target="mainFrame" onClick="MM_nbGroup('down','group1','shared','',1)" onMouseOver="MM_nbGroup('over','shared','toolbutton-shared-pressed.jpeg','',1)" onMouseOut="MM_nbGroup('out')"><img name="shared" src="toolbutton-shared.jpeg" border="0" alt="" onLoad=""></a></td>
-          <td><a href="amuleweb-main-stats.php" target="mainFrame" onClick="MM_nbGroup('down','group1','stats','',1)" onMouseOver="MM_nbGroup('over','stats','toolbutton-stats-pressed.jpeg','',1)" onMouseOut="MM_nbGroup('out')"><img name="stats" src="toolbutton-stats.jpeg" border="0" alt="" onLoad=""></a></td>
-          <td><a href="amuleweb-main-kad.php" target="mainFrame" onClick="MM_nbGroup('down','group1','kad','',1)" onMouseOver="MM_nbGroup('over','kad','toolbutton-kad-pressed.jpeg','',1)" onMouseOut="MM_nbGroup('out')"><img name="kad" src="toolbutton-kad.jpeg" border="0" alt="" onLoad=""></a></td>
-          <td><a href="amuleweb-main-prefs.php" target="mainFrame" onClick="MM_nbGroup('down','group1','settings','',1)" onMouseOver="MM_nbGroup('over','settings','toolbutton-settings-pressed.jpeg','',1)" onMouseOut="MM_nbGroup('out')"><img name="settings" src="toolbutton-settings.jpeg" border="0" alt="" onLoad=""></a></td>
-          <td><a href="login.php" target="_top" onClick="MM_nbGroup('down','group1','logout','',1)" onMouseOver="MM_nbGroup('over','logout','toolbutton-logout-pressed.jpeg','',1)" onMouseOut="MM_nbGroup('out')"><img name="logout" src="toolbutton-logout.jpeg" border="0" alt="" onLoad=""></a></td>
-        </tr>
-    </table></td>
-    <td width="11"></td>
-  </tr>
-  <tr>
-    <td height="5"></td>
-    <td height="50"><iframe name="stats" src="stats.php" height="50" width="100%" scrolling="no" frameborder="0"></iframe></td>
-    <td></td>
-  </tr>
-</table>
-</body>
-</html>
\ No newline at end of file

aMule-2.2.6.tar.bz2/src/webserver/php-default/tree-closed.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/tree-leaf.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/tree-open.gif Deleted

aMule-2.2.6.tar.bz2/src/webserver/php-default/up.jpeg Deleted

aMule-2.2.6.tar.bz2/src/webserver/src/UPnPCompatibility.cpp Deleted

@@ -1,61 +0,0 @@
-//
-// This file is part of the aMule Project.
-//
-// Copyright (c) 2007-2009 Marcelo Roberto Jimenez ( phoenix@amule.org )
-// Copyright (c) 2007-2009 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
-//
-
-
-#include "UPnPCompatibility.h"
-
-
-bool CLogger::IsEnabled(DebugType /*type*/)
-{
-	return true;
-}
-
-
-void CLogger::AddLogLine(
-	const wxString &file,
-	int line,
-	bool critical,
-	const std::ostringstream &msg)
-{
-	AddLogLine(file, line, critical, static_cast<DebugType>(0), msg);
-}
-
-
-void CLogger::AddLogLine(
-	const wxString &file,
-	int line,
-	bool critical,
-	DebugType /*type*/,
-	const std::ostringstream &msg)
-{
-	std::string s;
-	if (critical) {
-		s = "Critical message: ";
-	}
-	printf("%s(%d): %s%s\n",
-		(const char *)unicode2char(file),
-		line, s.c_str(), msg.str().c_str());
-}
-

aMule-2.2.6.tar.bz2/Compilation.flags.in -> aMule-2.3.1.tar.bz2/Compilation.flags.in Changed

@@ -53,6 +53,10 @@
 CFLAGS = @CFLAGS@
 COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
 COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
+COMPILE_LIB_COMMON_FALSE = @COMPILE_LIB_COMMON_FALSE@
+COMPILE_LIB_COMMON_TRUE = @COMPILE_LIB_COMMON_TRUE@
+COMPILE_LIB_EC_FALSE = @COMPILE_LIB_EC_FALSE@
+COMPILE_LIB_EC_TRUE = @COMPILE_LIB_EC_TRUE@
 COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
 COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
@@ -66,6 +70,7 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -75,11 +80,9 @@
 ED2K_MANPAGES = @ED2K_MANPAGES@
 ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
+FILEVIEW_FALSE = @FILEVIEW_FALSE@
+FILEVIEW_TRUE = @FILEVIEW_TRUE@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
@@ -96,12 +99,22 @@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
+INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KBUILDSYCOCA = @KBUILDSYCOCA@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -150,13 +163,20 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PLASMAMULE_FALSE = @PLASMAMULE_FALSE@
+PLASMAMULE_TRUE = @PLASMAMULE_TRUE@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -164,11 +184,13 @@
 SVNDATE = @SVNDATE@
 SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
 SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
+UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
+USER_INSTALL_HOOK = @USER_INSTALL_HOOK@
 VERSION = @VERSION@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
 WEB_TRUE = @WEB_TRUE@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
@@ -183,7 +205,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -191,7 +212,6 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XAS_FALSE = @XAS_FALSE@
 XAS_TRUE = @XAS_TRUE@
 XGETTEXT = @XGETTEXT@

aMule-2.2.6.tar.bz2/Makefile.am -> aMule-2.3.1.tar.bz2/Makefile.am Changed

aMule-2.2.6.tar.bz2/Makefile.in -> aMule-2.3.1.tar.bz2/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +15,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -46,7 +44,7 @@
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in $(srcdir)/version.rc.in \
 	$(top_srcdir)/automake/dist-hook.am $(top_srcdir)/configure \
-	$(top_srcdir)/intl/Makefile.in ABOUT-NLS compile config.guess \
+	$(top_srcdir)/intl/Makefile.in ABOUT-NLS config.guess \
 	config.rpath config.sub depcomp install-sh missing \
 	mkinstalldirs
 subdir = .
@@ -58,11 +56,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -70,30 +70,56 @@
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = intl/Makefile Compilation.flags version.rc
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 am__dist_icon_DATA_DIST = amule.xpm amulegui.xpm
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(icondir)" "$(DESTDIR)$(utildir)"
-dist_iconDATA_INSTALL = $(INSTALL_DATA)
 am__dist_util_DATA_DIST = amule.desktop amulegui.desktop
-dist_utilDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_icon_DATA) $(dist_util_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = intl po docs src unittests
@@ -101,32 +127,48 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
+  { test ! -d "$(distdir)" \
+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr "$(distdir)"; }; }
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -141,17 +183,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -163,44 +199,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -222,13 +258,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -236,44 +269,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -282,7 +311,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -290,25 +318,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -320,29 +342,40 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = $(am__append_1) docs src unittests
 EXTRA_DIST = amule.rc amule.ico amule.png convert.ico \
 	README.Debian-Packages  aMule.spec \
@@ -361,6 +394,7 @@
 	--enable-amule-gui \
 	--enable-cas \
 	--enable-wxcas \
+	--enable-plasmamule \
 	--enable-alc \
 	--enable-alcc
 
@@ -388,15 +422,15 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
 		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -412,21 +446,22 @@
 	$(SHELL) ./config.status --recheck
 
 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
 
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
 $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f stamp-h1
 	touch $@
 
@@ -438,41 +473,46 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 version.rc: $(top_builddir)/config.status $(srcdir)/version.rc.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-uninstall-info-am:
 install-dist_iconDATA: $(dist_icon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
-	@list='$(dist_icon_DATA)'; for p in $$list; do \
+	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
+	@list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
-	  $(dist_iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
 	done
 
 uninstall-dist_iconDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_icon_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(icondir)/$$f"; \
-	done
+	@list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(icondir)" && rm -f $$files
 install-dist_utilDATA: $(dist_util_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(utildir)" || $(mkdir_p) "$(DESTDIR)$(utildir)"
-	@list='$(dist_util_DATA)'; for p in $$list; do \
+	test -z "$(utildir)" || $(MKDIR_P) "$(DESTDIR)$(utildir)"
+	@list='$(dist_util_DATA)'; test -n "$(utildir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_utilDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(utildir)/$$f'"; \
-	  $(dist_utilDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(utildir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(utildir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(utildir)" || exit $$?; \
 	done
 
 uninstall-dist_utilDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_util_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(utildir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(utildir)/$$f"; \
-	done
+	@list='$(dist_util_DATA)'; test -n "$(utildir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(utildir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(utildir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -481,7 +521,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -498,16 +538,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -533,16 +572,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -550,14 +589,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -569,84 +608,103 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/automake $(distdir)/intl $(distdir)/m4 $(distdir)/po $(distdir)/src/utils/xas
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -654,11 +712,13 @@
 	$(MAKE) $(AM_MAKEFLAGS) \
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  dist-hook
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
@@ -667,6 +727,14 @@
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -690,13 +758,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
@@ -704,9 +776,11 @@
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
 	    --with-included-gettext \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
@@ -729,13 +803,15 @@
 	  && rm -rf "$$dc_destdir" \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist \
 	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
+	@$(am__cd) '$(distuninstallcheck_dir)' \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
@@ -758,7 +834,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(icondir)" "$(DESTDIR)$(utildir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -780,6 +856,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -800,18 +877,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-dist_iconDATA install-dist_utilDATA
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -832,27 +929,27 @@
 
 ps-am:
 
-uninstall-am: uninstall-dist_iconDATA uninstall-dist_utilDATA \
-	uninstall-info-am
+uninstall-am: uninstall-dist_iconDATA uninstall-dist_utilDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+	ctags-recursive install-am install-strip tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-recursive ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-hdr distclean-recursive \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am am--refresh check check-am clean clean-generic \
+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+	dist-hook dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
+	distcheck distclean distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
 	install-data install-data-am install-dist_iconDATA \
-	install-dist_utilDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-dist_iconDATA \
-	uninstall-dist_utilDATA uninstall-info-am
+	install-dist_utilDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-dist_iconDATA uninstall-dist_utilDATA
 
 
 # Avoid everything getting built when doing "make check"
@@ -869,6 +966,7 @@
 			fi ; \
 		done ; \
 	done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/README.Debian-Packages -> aMule-2.3.1.tar.bz2/README.Debian-Packages Changed

@@ -2,8 +2,9 @@
 dpkg-buildpackage -us -uc -b -rfakeroot
 to build them all, or you can invoke debian/rules directly with the target you want to be build. If you run
 debian/rules without a target, or with the target help, this help will be printed. Other possible targets
-are listed below, you can combine them as you need. amule-common, the packages with the themes for the
-webserver and i18n-en-gb are build everytime.
+are listed below, you can combine them as you need. amule-common, the packages with the skins and
+i18n-en-gb are build everytime. The Theme for the webserver get build when you build the
+webserver.
 
 amule			Builds the normal GUI-Version of aMule
 ed2k			Builds the ed2k-client of aMule
@@ -15,6 +16,8 @@
 alcc			Builds the ed2k-link-creation utility of aMule
 alc			Builds the graphical version of alcc
 amulecmd		Builds the commandline-client for controlling aMule
+xas			Enables the creation of the xas package
+plasmamule		Enables creation of plasma specific parts
 amule-dbg		Creates the debugging symbols for the amule binary
 ed2k-dbg		Creates the debugging symbols for the ed2k binary
 cas-dbg			Creates the debugging symbols for the cas binary
@@ -25,6 +28,7 @@
 alcc-dbg		Creates the debugging symbols for the alcc binary
 alc-dbg			Creates the debugging symbols for the alc binary
 amulecmd-dbg		Creates the debugging symbols for the amulecmd binary
+plasmamule-dbg		Creates the debugging symbols for the plasmamule stuff
 amule-utils		Creates the Metapackage for the commandline utilities and all these utils
 			* alcc
 			* amulecmd
@@ -33,15 +37,18 @@
 			* alc
 			* remotegui
 			* wxcas
-i18n-<lang>		Builds the coresponding i18n-packge. Lang has to be one of ar, bg, ca, da,
-			de, es, et-ee, eu, fi, fr, gl, hr, hu, it, it-ch, ko-kr, lt, nl,
-			nn, pl, pt-br, pt-pt, ru, sl, sv, tr, zh-cn or zh-tw
+i18n-<lang>		Builds the coresponding i18n-packge. Lang has to be one of ar, ast, bg, ca, cs,
+			da, de, el, es, et-ee, eu, fi, fr, gl, he, hr, hu, it, it-ch, ja, ko-kr, lt, nl,
+			nn, pl, pt-br, pt-pt, ro, ru, sl, sq, sv, tr, uk, zh-cn or zh-tw
 			If no i18n-package is given, all will be build.
 			If you just want en_GB, use i18n-en-only
 
 If one of the -dbg targets is choosen, the corresponding binary will be built, too. In this case,
-debugging is enabled, profiling and optimising are disabled. Is no -dbg target choosen, debugging
-is disabled, profiling and optimising are enabled.
+debugging is enabled, optimising is disabled. Is no -dbg target choosen, debugging is disabled, 
+optimising is enabled.
+
+If you choose to just build a few packages, you have to explicit activate ed2k or xas if 
+you want to get the pkg's
 
 The targets can be given in any order and combination

aMule-2.2.6.tar.bz2/aMule.app/Contents/Info.plist -> aMule-2.3.1.tar.bz2/aMule.app/Contents/Info.plist Changed

@@ -9,23 +9,23 @@
 	<key>CFBundleName</key>
 	<string>amule</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.2.6, Copyright 2003-2009 aMule Project (http://www.amule.org)</string>
+	<string>2.3.1, Copyright 2003-2011 aMule Project (http://www.amule.org)</string>
 	<key>CFBundleIconFile</key>
 	<string>amule</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.amule.aMule</string>
 	<key>CFBundleInfoDictionaryVersion</key>
-	<string>2.2.6</string>
+	<string>2.3.1</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.6</string>
+	<string>2.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>aMul</string>
 	<key>CFBundleVersion</key>
-	<string>2.2.6</string>
+	<string>2.3.1</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright 2003-2009 aMule Project (http://www.amule.org)</string>
+	<string>Copyright 2003-2011 aMule Project (http://www.amule.org)</string>
 	<key>NSMainNibFile</key>
 	<string>NSMainNibFile</string>
 	<key>NSPrincipalClass</key>

aMule-2.3.1.tar.bz2/aMule.app/Contents/SharedSupport Added

aMule-2.3.1.tar.bz2/aMule.app/Contents/SharedSupport/locale Added

aMule-2.2.6.tar.bz2/aMule.spec -> aMule-2.3.1.tar.bz2/aMule.spec Changed

aMule-2.2.6.tar.bz2/acinclude.m4 -> aMule-2.3.1.tar.bz2/acinclude.m4 Changed

@@ -1,7 +1,7 @@
 #							-*- Autoconf -*-
 # This file is part of the aMule Project.
 #
-# Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+# 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
@@ -16,17 +16,20 @@
 # 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
 #
 
-dnl ---------------------------------------------------------------------------
-dnl Helper functions
-dnl ---------------------------------------------------------------------------
 m4_pattern_forbid(MULE_)dnl Check for unexpanded *MULE_* macros
 m4_pattern_allow(AMULE_)dnl Allow the *AMULE_* names
+m4_pattern_forbid(__mule_)dnl Check for unexpanded internal macros
+
+
+# -------------------- #
+# Common useful macros #
+# -------------------- #
 
 dnl MULE_APPEND(VARNAME, VALUE)
 AC_DEFUN([MULE_APPEND], [$1="$$1 $2"])
@@ -50,20 +53,188 @@
 dnl MULE_RESTORE(VAR)
 AC_DEFUN([MULE_RESTORE], [$1="$mule_backup_$1"])
 
-dnl Helper macro for MULE_IF
+
+# ------------------- #
+# Issuing diagnostics #
+# ------------------- #
+
+# -----------------------------------------------------------------------------
+# __mule_print_final_warning(section, condition, message)
+# -----------------------------------------------------------------------------
+m4_define([__mule_print_final_warning],
+[m4_divert_push($1)dnl
+if test [$2]; then
+cat <<_MULEEOT
+
+m4_pushdef([__mule_Prefix1], [* ])dnl
+m4_pushdef([__mule_Prefix], [  ])dnl
+m4_foreach([__mule_Line], m4_quote(m4_split([$3], [
+])), [m4_text_wrap(m4_defn([__mule_Line]), __mule_Prefix, __mule_Prefix1)
+m4_define([__mule_Prefix1], __mule_Prefix)dnl
+])[]dnl
+m4_popdef([__mule_Prefix])dnl
+m4_popdef([__mule_Prefix1])dnl
+_MULEEOT
+fi
+m4_divert_pop()])
+
+dnl ---------------------------------------------------------------------------
+dnl MULE_WARNING(MESSAGE)
+dnl
+dnl Works like AC_MSG_WARN(), but the warning will be reproduced at the end of
+dnl the configure run. An empty line is prepended at the final output and a
+dnl newline is appended for free.
+dnl ---------------------------------------------------------------------------
+m4_ifndef([_MULE_WARNINGS],[
+m4_define([_m4_divert(_MULE_WARNINGS)], m4_incr(_m4_divert([BODY])))])
+m4_define([_MULE_WARNCOUNT], [0])
+
+m4_divert_push(_MULE_WARNINGS)dnl
+if test ${_mule_has_warnings:-no} = yes; then
+echo ""
+echo ""
+echo " *** Warnings during configuration ***"
+fi
+m4_divert_pop()dnl
+
+m4_define([MULE_WARNING],
+[AC_MSG_WARN(
+m4_pushdef([__mule_Prefix], [        ])dnl
+m4_foreach([__mule_Line], m4_quote(m4_split([$1], [
+])), [
+m4_text_wrap(m4_defn([__mule_Line]), __mule_Prefix)])[]dnl
+m4_popdef([__mule_Prefix])dnl
+)
+_mule_warning_[]_MULE_WARNCOUNT[]=yes
+_mule_has_warnings=yes
+__mule_print_final_warning([_MULE_WARNINGS], [${_mule_warning_]_MULE_WARNCOUNT[:-no} = yes], [$1])dnl
+m4_define([_MULE_WARNCOUNT], incr(_MULE_WARNCOUNT))])
+
+dnl ---------------------------------------------------------------------------
+dnl MULE_DEPRECATED(OLDFLAG [, NEWFLAG])
+dnl
+dnl Marks OLDFLAG as deprecated and produces an appropriate warning. If NEWFLAG
+dnl is specified and is unset the value of OLDFLAG is assigned to NEWFLAG (i.e.
+dnl if the user specified both OLDFLAG and NEWFLAG, NEWFLAG takes precedence;
+dnl if only OLDFLAG is specified it will be redirected to NEWFLAG).
+dnl
+dnl There should be no AC_ARG_* for the deprecated flag, and if the old flag is
+dnl deprecated in favour of a new one, MULE_DEPRECATED *MUST* precede the
+dnl AC_ARG_* definition of the new flag (otherwise redirection may not work).
+dnl ---------------------------------------------------------------------------
+m4_define([_MULE_DEPRECATIONWARNINGS], [incr(_MULE_WARNINGS)])
+m4_define([__mule_display_option_name], [m4_if(m4_substr([$1], 0, 1), [-],, [--])m4_bpatsubst([$1], [_], [-])])
+m4_define([__mule_ac_option_name], [m4_bpatsubst(m4_bpatsubst(m4_bpatsubst(m4_bpatsubst([$1], [^-+], []), [-], [_]), [^disable], [enable]), [^without], [with])])
+
+m4_define([MULE_DEPRECATED],
+[if test "${__mule_ac_option_name([$1])+set}" = "set"; then
+  _mule_has_warnings=yes
+m4_ifvaln([$2], [  if test "${__mule_ac_option_name([$2]):-unset}" = "unset"; then
+    __mule_ac_option_name([$2])=$__mule_ac_option_name([$1])
+  fi])fi
+__mule_print_final_warning([_MULE_DEPRECATIONWARNINGS], ["${]__mule_ac_option_name([$1])[+set}" = set], __mule_display_option_name([$1])[ is now deprecated and ]m4_ifval([$2], [might be removed in the future without further notice. Please use ]__mule_display_option_name([$2])[ instead.], [not supported anymore.]))])
+
+
+# ----------------- #
+# Argument handling #
+# ----------------- #
+m4_define([__mule_arg_default], [__mule_arg_[]m4_translit([$1], [-], [_])[]_default])
+m4_define([__mule_arg_value], [${enable_[]m4_translit([$1], [-], [_])[]:-[]__mule_arg_default([$1])[]}])
+
+dnl ---------------------------------------------------------------------------
+dnl MULE_ARG_ENABLE(FEATURE, DEFAULT-VALUE, HELP-STRING [, AUTOMAKE-CONDITIONAL])
+dnl
+dnl Wrapper around AC_ARG_ENABLE() that supports automatically setting up a
+dnl conditional variable for automake, remembering default value for
+dnl conditionals and supplying the help string based on the default value (i.e.
+dnl it produce "--enable-FEATURE   HELP-STRING" if the default is no, and
+dnl "--disable-FEATURE    HELP-STRING" if the default is yes. The default value
+dnl *MUST* be either `yes' or `no'.
+dnl ---------------------------------------------------------------------------
+m4_define([MULE_ARG_ENABLE],
+[m4_if([$2], [yes],, [m4_if([$2], [no],, [m4_fatal([Default value must be either `yes' or `no'!])])])dnl
+m4_define(__mule_arg_default([$1]), [$2])dnl
+AC_ARG_ENABLE([$1], [AS_HELP_STRING(m4_if([$2], [yes], [--disable-$1], [--enable-$1]), [$3])])
+m4_ifvaln([$4], [AM_CONDITIONAL([$4], [test ]__mule_arg_value([$1])[ = yes])])])
+
+dnl ---------------------------------------------------------------------------
+dnl MULE_IS_ENABLED(FEATURE)
+dnl
+dnl Used in shell conditionals, tests whether the named feature is enabled or
+dnl not, considering also the default value. FEATURE *must* have been set up
+dnl using MULE_ARG_ENABLE().
+dnl ---------------------------------------------------------------------------
+m4_define([MULE_IS_ENABLED],
+[m4_ifdef(__mule_arg_default([$1]), __mule_arg_value([$1])[ = yes], [m4_fatal([Unknown feature `$1'!])])])
+
+m4_define([MULE_IS_ENABLED_ANY], [__mule_if_multi([$1], [-o])])
+m4_define([MULE_IS_ENABLED_ALL], [__mule_if_multi([$1], [-a])])
+
+dnl ---------------------------------------------------------------------------
+dnl MULE_ENABLEVAR(FEATURE)
+dnl
+dnl Expands to the name of the shell variable holding the enabled/disabled
+dnl status of FEATURE. FEATRUE *must* have been set up using MULE_ARG_ENABLE().
+dnl ---------------------------------------------------------------------------
+m4_define([MULE_ENABLEVAR],
+[m4_ifdef(__mule_arg_default([$1]), [enable_[]m4_translit([$1], [-], [_])], [m4_fatal([Unknown feature `$1'!])])])
+
+dnl ---------------------------------------------------------------------------
+dnl MULE_STATUSOF(FEATURE)
+dnl
+dnl Expands to the value of the shell variable holding the status of FEATURE,
+dnl considering default values. FEATURE *must* have been set up using
+dnl MULE_ARG_ENABLE().
+dnl ---------------------------------------------------------------------------
+m4_define([MULE_STATUSOF],
+[m4_ifdef(__mule_arg_default([$1]), __mule_arg_value([$1]), [m4_fatal([Unknown feature `$1'!])])])
+
+
+# ---------------------- #
+# Conditional processing #
+# ---------------------- #
+m4_define([__mule_if_multi],
+[m4_define([__mule_if_logic], [])dnl
+m4_foreach([__mule_condition], [$1], [__mule_if_logic MULE_IS_ENABLED(__mule_condition) ][m4_define([__mule_if_logic], [$2])])dnl
+m4_undefine([__mule_if_logic])])
+
+dnl ---------------------------------------------------------------------------
+dnl MULE_IF_ENABLED(FEATURE, [ACTION-IF-ENABLED], [ACTION-IF-DISABLED])
+dnl
+dnl Basically a wrapper around AS_IF(), the test being if FEATURE is enabled.
+dnl FEATURE must have been set up by MULE_ARG_ENABLE().
+dnl ---------------------------------------------------------------------------
+m4_define([MULE_IF_ENABLED],
+[AS_IF([test MULE_IS_ENABLED([$1])], [$2], [$3])])
+
+m4_define([MULE_IF_ENABLED_ALL],
+[AS_IF([test]__mule_if_multi([$1], [-a]), [$2], [$3])])
+
+m4_define([MULE_IF_ENABLED_ANY],
+[AS_IF([test]__mule_if_multi([$1], [-o]), [$2], [$3])])
+
+dnl ---------------------------------------------------------------------------
+dnl MULE_IF(CONDITION, [IF-TRUE] [, ELIF-CONDITION, [IF-TRUE]]... [, ELSE-BRANCH])
+dnl
+dnl Works like AS_IF(), but allows elif-branches too.
+dnl ---------------------------------------------------------------------------
 m4_define([__mule_if_helper],
 [m4_if( [$#], 0,,
 	[$#], 1, [m4_ifvaln([$1], [m4_n([else])  $1])],
 	[m4_n([elif $1; then])  m4_ifvaln([$2], [$2], :)])dnl
 m4_if(m4_eval([$# > 2]), 1, [$0(m4_shiftn(2, $@))])])
 
-dnl MULE_IF(CONDITION, [IF-TRUE] [, ELIF-CONDITION, [IF-TRUE]]... [, ELSE-BRANCH])
 m4_define([MULE_IF],
 [m4_if( [$#], 0,,
 	[$#], 1,,
 	[m4_n([if $1; then])  m4_ifval([$2],[$2], :)
 m4_if(m4_eval([$# > 2]), 1, [__mule_if_helper(m4_shiftn(2, $@))])m4_n([fi])])])
 
+
+# ----------------------- #
+# Other high-level macros #
+# ----------------------- #
+
 dnl ---------------------------------------------------------------------------
 dnl MULE_CHECK_SYSTEM
 dnl
@@ -83,7 +254,6 @@
 	openbsd*) 
 		SYS=openbsd
 		LIBS="$LIBS -L/usr/local/lib"
-		X11LIBS="-lX11 -L/usr/X11R6/lib"
 		MULECPPFLAGS="-D__OPENBSD__"
 		;;
 	*cygwin* | *mingw32*)
@@ -93,7 +263,6 @@
 	solaris*)
 		SYS=solaris
 		RESOLV_LIB="-lresolv -lnsl"
-		X11LIBS="-lX11"
 		LIBS="$LIBS -lrt"
 		;;
 	*netbsd*)
@@ -128,7 +297,6 @@
 	])
 
 AC_SUBST([RESOLV_LIB])dnl
-AC_SUBST([X11LIBS])dnl
 AC_SUBST([MULECPPFLAGS])dnl
 AC_SUBST([MULECFLAGS])dnl
 AC_SUBST([MULECXXFLAGS])dnl
@@ -137,76 +305,35 @@
 ])
 
 dnl ---------------------------------------------------------------------------
-dnl _MULE_CHECK_DEBUG_FLAG
+dnl MULE_COMPILATION_FLAGS
+dnl
+dnl Checks type of compilation requested by user, and sets various flags
+dnl accordingly.
 dnl ---------------------------------------------------------------------------
-AC_DEFUN([_MULE_CHECK_DEBUG_FLAG],
+AC_DEFUN([MULE_COMPILATION_FLAGS],
 [AC_REQUIRE([MULE_CHECK_GLIBCXX])dnl
 
-	AC_ARG_ENABLE(
-		[debug],
-		[AS_HELP_STRING([--disable-debug], [disable additional debugging output])],
-		[USE_DEBUG=${enableval:-yes}], [USE_DEBUG=yes])
+	MULE_ARG_ENABLE([debug],	[yes],	[disable additional debugging output])
+	MULE_ARG_ENABLE([profile],	[no],	[enable code profiling])
+	MULE_ARG_ENABLE([optimize],	[no],	[enable code optimization])
 
-	AS_IF([test $USE_DEBUG = yes],
+	MULE_IF_ENABLED([debug],
 	[
 		MULE_ADDFLAG([CPP], [-D__DEBUG__])
 		MULE_ADDCCXXFLAG([-g])
-		AS_IF([test ${GLIBCXX:-no} = yes],	[MULE_ADDFLAG([CPP], [-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC])])
 		AS_IF([test ${GCC:-no} = yes],		[MULE_ADDCCXXFLAG([-W -Wall -Wshadow -Wundef -ggdb -fno-inline -fmessage-length=0])])
 		AS_IF([test ${SYS:-unknown} = win32],	[MULE_ADDFLAG([RC], [-D__DEBUG__])])
 	], [
 		AS_IF([test ${GCC:-no} = yes], [MULE_ADDCCXXFLAG([-W -Wall -Wshadow -Wundef])])
 	])
-])
 
-dnl ---------------------------------------------------------------------------
-dnl _MULE_CHECK_PROFILE_FLAG
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([_MULE_CHECK_PROFILE_FLAG],
-[
-	AC_ARG_ENABLE(
-		[profile],
-		[AS_HELP_STRING([--enable-profile], [enable code profiling])],
-		[USE_PROFILE=${enableval:-no}], [USE_PROFILE=no])
-
-	AS_IF([test $USE_PROFILE = yes],
+	MULE_IF_ENABLED([profile],
 	[
 		MULE_ADDCCXXFLAG([-pg])
 		MULE_ADDFLAG([LD], [-pg])
 	])
-])
-
-dnl ---------------------------------------------------------------------------
-dnl _MULE_CHECK_OPTIMIZE_FLAG
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([_MULE_CHECK_OPTIMIZE_FLAG],
-[
-	AC_ARG_ENABLE(
-		[optimize],
-		[AS_HELP_STRING([--enable-optimize], [enable code optimization])],
-		[USE_OPTIMIZE=${enableval:-no}], [USE_OPTIMIZE=no])
 
-	AS_IF([test $USE_OPTIMIZE = yes], [MULE_ADDCCXXFLAG([-O2])])
-])
-
-dnl ---------------------------------------------------------------------------
-dnl MULE_COMPILATION_FLAGS
-dnl
-dnl Checks type of compilation requested by user, and sets various flags
-dnl accordingly.
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([MULE_COMPILATION_FLAGS],
-[
-	_MULE_CHECK_DEBUG_FLAG
-	_MULE_CHECK_OPTIMIZE_FLAG
-	_MULE_CHECK_PROFILE_FLAG
-
-	AC_MSG_CHECKING([if the applications should be statically linked])
-	AC_ARG_ENABLE(
-		[static],
-		[AS_HELP_STRING([--enable-static], [produce a statically linked executable])],
-		[AS_IF([test ${enableval:-no} = yes], [MULE_ADDFLAG([LD], [-static])])])
-	AC_MSG_RESULT(${enableval:-no})
+	MULE_IF_ENABLED([optimize],	[MULE_ADDCCXXFLAG([-O2])])
 
 	MULE_ADDFLAG([CPP], [-DUSE_WX_EXTENSIONS])
 ])
@@ -251,7 +378,8 @@
 	AC_PREPROC_IFELSE([
 		AC_LANG_SOURCE([[
 			#include <wx/wx.h>
-			#if !HAVE_LARGEFILE_SUPPORT && !defined(_LARGE_FILES) && !defined(__WXMSW__)
+			#include <wx/filefn.h>
+			#ifndef wxHAS_LARGE_FILES
 				#error No LargeFile support!
 			#endif
 		]])
@@ -277,30 +405,26 @@
 dnl --------------------------------------------------------------------------
 AC_DEFUN([MULE_CHECK_CCACHE],
 [
-	AC_ARG_ENABLE([ccache],
-		[AS_HELP_STRING([--enable-ccache], [enable ccache support for fast recompilation])])
+	MULE_ARG_ENABLE([ccache], [no], [enable ccache support for fast recompilation])
 
 	AC_ARG_WITH([ccache-prefix],
 		[AS_HELP_STRING([--with-ccache-prefix=PREFIX], [prefix where ccache is installed])])
 
 	AC_MSG_CHECKING([whether ccache support should be added])
-	AC_MSG_RESULT([${enable_ccache:-no}])
+	AC_MSG_RESULT([MULE_STATUSOF([ccache])])
 
-	AS_IF([test ${enable_ccache:-no} = yes], [
+	MULE_IF_ENABLED([ccache], [
 		AC_MSG_CHECKING([for ccache presence])
 		AS_IF([test -z "$with_ccache_prefix"], [
 			ccache_full=`which ccache`
 			with_ccache_prefix=`dirname ${ccache_full}`
 		])
 		AS_IF([$with_ccache_prefix/ccache -V >/dev/null 2>&1], [
-			AC_MSG_RESULT([yes])
 			CC="$with_ccache_prefix/ccache $CC"
 			CXX="$with_ccache_prefix/ccache $CXX"
 			BUILD_CC="$with_ccache_prefix/ccache $BUILD_CC"
-		], [
-			enable_ccache=no
-			AC_MSG_RESULT([no])
-		])
+		], [MULE_ENABLEVAR([ccache])=no])
+		AC_MSG_RESULT([MULE_STATUSOF([ccache])])
 	])
 ])
 
@@ -314,7 +438,7 @@
 
 	AC_MSG_CHECKING([for bfd])
 	result=no
-	for bfd_ldadd in "" "${LIBINTL}"; do
+	for bfd_ldadd in "" "${LIBINTL}" "-ldl" "-ldl ${LIBINTL}"; do
 		MULE_BACKUP([LIBS])
 		MULE_BACKUP([LDFLAGS])
 		MULE_PREPEND([LIBS], [-lbfd -liberty ${bfd_ldadd} ${ZLIB_LIBS}])
@@ -341,10 +465,7 @@
 	AC_MSG_RESULT([$result])
 
 	AS_IF([test $result = no],
-		[AC_MSG_WARN([
-	bfd.h not found or unusable, please install binutils development
-	package if you are a developer or want to help testing aMule])
-	])])
+		[MULE_WARNING([bfd.h not found or unusable, please install binutils development package if you are a developer or want to help testing aMule])])
 
 AC_SUBST([BFD_CPPFLAGS])dnl
 AC_SUBST([BFD_LIBS])dnl
@@ -393,53 +514,14 @@
 		AC_MSG_ERROR([Exception handling does not work. Broken compiler?])
 	], [
 		AC_MSG_RESULT([undeterminable])
-		AC_MSG_WARN([
-	Cross-compilation detected, so exception handling cannot be tested.
-	Note that broken exception handling in your compiler may lead to
-	unexpected crashes.])
+		MULE_WARNING(
+			[Cross-compilation detected, so exception handling cannot be tested.
+			Note that broken exception handling in your compiler may lead to unexpected crashes.])
 	])
 ])
 
 
 dnl ---------------------------------------------------------------------------
-dnl MULE_CHECK_REGEX([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl
-dnl This function will test the existance of a POSIX compliant regex library.
-dnl ---------------------------------------------------------------------------
-AC_DEFUN([MULE_CHECK_REGEX],
-[
-	AC_CHECK_HEADERS([sys/types.h])
-	AC_MSG_CHECKING([for a POSIX compliant regex library])
-	regex_found=no
-	for REGEX_LIBS in '' -lgnurx -lregex; do
-		MULE_BACKUP([LIBS])
-		MULE_PREPEND([LIBS], [$REGEX_LIBS])
-		AC_LINK_IFELSE([
-			AC_LANG_PROGRAM([[
-				#ifdef HAVE_SYS_TYPES_H
-				#	include <sys/types.h>
-				#endif
-				#include <regex.h>
-			]], [[
-				regex_t preg;
-				regcomp(&preg, "", REG_EXTENDED);
-				regmatch_t *pmatch;
-				regexec(&preg, "", 0, pmatch, 0);
-				regfree(&preg);
-			]])
-		], [
-			MULE_RESTORE([LIBS])
-			regex_found=yes
-			break;
-		], [MULE_RESTORE([LIBS])])
-	done
-	AC_MSG_RESULT([$regex_found])
-	ifelse([$1$2],,, [AS_IF([test $regex_found = yes], [$1], [$2])])
-AC_SUBST([REGEX_LIBS])dnl
-])
-
-
-dnl ---------------------------------------------------------------------------
 dnl MULE_CHECK_CXXABI
 dnl
 dnl This function will test the header <cxxabi.h> and abi::__cxa_demangle()
@@ -491,6 +573,51 @@
 	])
 ])
 
+dnl ---------------------------------------------------------------------------
+dnl MULE_CHECK_MMAP
+dnl
+dnl Checks for mmap() and makes use of it when found.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([MULE_CHECK_MMAP],
+[
+	MULE_ARG_ENABLE([mmap], [no], [enable using mapped memory if supported])
+
+	MULE_IF_ENABLED([mmap], [
+		AC_CHECK_HEADERS([sys/mman.h])
+		AC_FUNC_MMAP
+		AC_CHECK_FUNCS([munmap sysconf])
+		AS_IF([test $ac_cv_func_sysconf = yes], [
+			AC_MSG_CHECKING([for pagesize constant for sysconf])
+			AC_LINK_IFELSE([
+				AC_LANG_PROGRAM([[
+					#include <unistd.h>
+				]], [[
+					return sysconf(_SC_PAGESIZE);
+				]])
+			], [
+				AC_MSG_RESULT([_SC_PAGESIZE])
+				AC_DEFINE([HAVE__SC_PAGESIZE], [1], [Define to 1 if you have the _SC_PAGESIZE constant in <unistd.h>])
+			], [
+				AC_LINK_IFELSE([
+					AC_LANG_PROGRAM([[
+						#include <unistd.h>
+					]], [[
+						return sysconf(_SC_PAGE_SIZE);
+					]])
+				], [
+					AC_MSG_RESULT([_SC_PAGE_SIZE])
+					AC_DEFINE([HAVE__SC_PAGE_SIZE], [1], [Define to 1 if you have the _SC_PAGE_SIZE constant in <unistd.h>, but not _SC_PAGESIZE])
+				], [
+					AC_MSG_RESULT([none])
+				])
+			])
+		])
+	], [
+		# fake the result of the test for munmap() for the gettext macros
+		ac_cv_func_munmap=no
+	])
+])
+
 
 dnl ---------------------------------------------------------------------------
 dnl MULE_DENOISER

aMule-2.2.6.tar.bz2/aclocal.m4 -> aMule-2.3.1.tar.bz2/aclocal.m4 Changed

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,15 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
+You have another version of autoconf.  It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -21,14 +29,31 @@
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.11'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.11.1], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
+m4_ifndef([AC_AUTOCONF_VERSION],
+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -85,14 +110,14 @@
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
+# serial 9
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -101,8 +126,11 @@
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+m4_define([_AM_COND_VALUE_$1], [$2])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -116,15 +144,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 10
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -152,6 +179,7 @@
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -180,6 +208,16 @@
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n ['s/^#*$[a-zA-Z0-9]*$)$/\1/p'] < ./depcomp`
   fi
+  am__universal=false
+  m4_case([$1], [CC],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac],
+    [CXX],
+    [case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac])
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -197,7 +235,17 @@
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -207,18 +255,23 @@
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
     none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -269,61 +322,74 @@
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 3
+#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
+[{
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`AS_DIRNAME("$mf")`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`AS_DIRNAME(["$file"])`
+      AS_MKDIR_P([$dirpart/$fdir])
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
+    done
   done
-done
+}
 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
 
 
@@ -342,14 +408,14 @@
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
+# serial 16
 
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
@@ -366,16 +432,20 @@
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.62])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -395,6 +465,9 @@
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -410,8 +483,8 @@
 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
 AM_MISSING_PROG(AUTOHEADER, autoheader)
 AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
@@ -419,20 +492,37 @@
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES(CC)],
+		  [define([AC_PROG_CC],
+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES(CXX)],
+		  [define([AC_PROG_CXX],
+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+		  [_AM_DEPENDENCIES(OBJC)],
+		  [define([AC_PROG_OBJC],
+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_CONFIG_COMMANDS_PRE(dnl
+[m4_provide_if([_AM_COMPILER_EXEEXT],
+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
 ])
 
+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+dnl mangled by Autoconf and run in a shell conditional statement.
+m4_define([_AC_COMPILER_EXEEXT],
+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
 
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
@@ -443,18 +533,19 @@
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
 [# Compute $1's index in $config_headers.
+_am_arg=$1
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $1 | $1:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -465,7 +556,14 @@
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -492,27 +590,38 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
+# AM_MAINTAINER_MODE([DEFAULT-MODE])
+# ----------------------------------
+# Control maintainer-specific portions of Makefiles.
+# Default is to disable them, unless `enable' is passed literally.
+# For symmetry, `disable' may be passed as well.  Anyway, the user
+# can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode  enable make rules and dependencies not useful
+[m4_case(m4_default([$1], [disable]),
+       [enable], [m4_define([am_maintainer_other], [disable])],
+       [disable], [m4_define([am_maintainer_other], [enable])],
+       [m4_define([am_maintainer_other], [enable])
+        m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
+AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+  dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+  AC_ARG_ENABLE([maintainer-mode],
+[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
+      [USE_MAINTAINER_MODE=$enableval],
+      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
+  AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
+  AC_SUBST([MAINT])dnl
 ]
 )
 
@@ -520,13 +629,13 @@
 
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # AM_MAKE_INCLUDE()
 # -----------------
@@ -535,7 +644,7 @@
 [am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
@@ -545,24 +654,24 @@
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
 # Now try BSD make style include.
 if test "$am__include" = "#"; then
    echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 AC_SUBST([am__include])
 AC_SUBST([am__quote])
@@ -572,14 +681,14 @@
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 6
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -595,7 +704,15 @@
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+AC_REQUIRE_AUX_FILE([missing])dnl
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
@@ -605,7 +722,7 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -613,70 +730,33 @@
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -693,7 +773,7 @@
 # ----------------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
 
 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
 # -------------------------------------------
@@ -703,14 +783,14 @@
 
 # Check to make sure that the build environment is sane.    -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_SANITY_CHECK
 # ---------------
@@ -719,16 +799,29 @@
 # Just in case
 sleep 1
 echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[[\\\"\#\$\&\'\`$am_lf]]*)
+    AC_MSG_ERROR([unsafe absolute working directory name]);;
+esac
+case $srcdir in
+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+esac
+
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
    if test "$[*]" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$[*]" != "X $srcdir/configure conftest.file" \
@@ -753,6 +846,33 @@
 fi
 AC_MSG_RESULT(yes)])
 
+# Copyright (C) 2009  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 1
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# (`yes' being less verbose, `no' or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules],
+[  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')])
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
 # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -778,9 +898,28 @@
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 2
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
+# AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Public sister of _AM_SUBST_NOTMAKE.
+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
@@ -890,6 +1029,8 @@
 m4_include([m4/inttypes-pri.m4])
 m4_include([m4/inttypes.m4])
 m4_include([m4/inttypes_h.m4])
+m4_include([m4/isc-posix.m4])
+m4_include([m4/kde.m4])
 m4_include([m4/lcmessage.m4])
 m4_include([m4/lib-ld.m4])
 m4_include([m4/lib-link.m4])
@@ -898,7 +1039,9 @@
 m4_include([m4/libupnp.m4])
 m4_include([m4/nls.m4])
 m4_include([m4/pkg.m4])
+m4_include([m4/plasmamule.m4])
 m4_include([m4/progtest.m4])
+m4_include([m4/qt.m4])
 m4_include([m4/readline.m4])
 m4_include([m4/stdint_h.m4])
 m4_include([m4/uintmax_t.m4])

aMule-2.2.6.tar.bz2/amule.desktop -> aMule-2.3.1.tar.bz2/amule.desktop Changed

aMule-2.2.6.tar.bz2/amule.rc -> aMule-2.3.1.tar.bz2/amule.rc Changed

aMule-2.2.6.tar.bz2/amule_build_install.sh -> aMule-2.3.1.tar.bz2/amule_build_install.sh Changed

aMule-2.2.6.tar.bz2/amulegui.desktop -> aMule-2.3.1.tar.bz2/amulegui.desktop Changed

aMule-2.2.6.tar.bz2/autogen.sh -> aMule-2.3.1.tar.bz2/autogen.sh Changed

@@ -1,10 +1,11 @@
 #!/bin/sh
-# Helps bootstrapping 'aMule' when checked out from CVS.
+# Helps bootstrapping 'aMule' when checked out from the source control system.
 # Requires GNU autoconf, GNU automake and GNU which.
 
-export WANT_AUTOMAKE="1.7"
-(autoconf --version) >/dev/null 2>/dev/null || (echo "You need GNU autoconf to install from CVS (ftp://ftp.gnu.org/gnu/autoconf/)"; exit 1) || exit 1
-(automake --version) >/dev/null 2>/dev/null || (echo "You need GNU automake 1.7 to install from CVS (ftp://ftp.gnu.org/gnu/automake/)"; exit 1) || exit 1
+WANT_AUTOMAKE="1.7"
+export WANT_AUTOMAKE
+(autoconf --version) >/dev/null 2>/dev/null || (echo "You need GNU autoconf to install from sources (ftp://ftp.gnu.org/gnu/autoconf/)"; exit 1) || exit 1
+(automake --version) >/dev/null 2>/dev/null || (echo "You need GNU automake 1.7 to install from sources (ftp://ftp.gnu.org/gnu/automake/)"; exit 1) || exit 1
 
 # Do sanity checks.
 # Directory check.
@@ -43,11 +44,18 @@
         echo autopoint honors dataroot variable, not patching.
     else 
 	echo autopoint does not honor dataroot variable, patching.
-        sed -e 's/^datadir *=$.*$/datarootdir = @datarootdir@\
-datadir = @datadir@/g' po/Makefile.in.in > po/Makefile.in.in.tmp && mv -f po/Makefile.in.in.tmp po/Makefile.in.in
-        sed -e 's/^datadir *=$.*$/datarootdir = @datarootdir@\
-datadir = @datadir@/g' intl/Makefile.in > intl/Makefile.in.tmp && mv -f intl/Makefile.in.tmp intl/Makefile.in
+        sed -e '/^datadir *=/a\
+datarootdir = @datarootdir@' po/Makefile.in.in > po/Makefile.in.in.tmp && mv -f po/Makefile.in.in.tmp po/Makefile.in.in
+        sed -e '/^datadir *=/a\
+datarootdir = @datarootdir@' intl/Makefile.in > intl/Makefile.in.tmp && mv -f intl/Makefile.in.tmp intl/Makefile.in
     fi
+UNAME=`uname`
+if [ x$UNAME = x"Darwin" ]; then
+    echo Not patching po/Makefile.in.in - sed is too old.
+else
+    sed -e '/^clean:/a\
+	rm -f *.gmo' po/Makefile.in.in > po/Makefile.in.in.tmp && mv -f po/Makefile.in.in.tmp po/Makefile.in.in
+fi
 #    if [ -f Makefile -a -x config.status ]; then
 #        CONFIG_FILES=intl/Makefile CONFIG_HEADERS= /bin/sh ./config.status
 #    fi
@@ -67,10 +75,10 @@
 autoconf
 
 echo "Creating pixmaps Makefile.am"
-pushd $(pwd) > /dev/null
+OLDPWD="`pwd`"
 cd src/pixmaps/flags_xpm
 ./makeflags.sh
-popd > /dev/null
+cd "$OLDPWD"
 
 echo "Running automake --foreign -a -c -f"
 automake --foreign -a -c -f

aMule-2.2.6.tar.bz2/config.guess -> aMule-2.3.1.tar.bz2/config.guess Changed

@@ -1,9 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   Free Software Foundation, Inc.
 
-timestamp='2005-07-08'
+timestamp='2009-11-20'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -26,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -55,8 +56,8 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -106,7 +107,7 @@
 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -160,6 +161,7 @@
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
@@ -168,7 +170,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -206,8 +208,11 @@
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
     macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
     *:MirBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -319,14 +324,33 @@
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -527,7 +551,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[45])
+    *:AIX:*:[456])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -635,7 +659,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -764,12 +788,19 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	case ${UNAME_MACHINE} in
+	    pc98)
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
-    i*:MINGW*:*)
+    *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
@@ -779,12 +810,24 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit ;;
+    *:Interix*:*)
+    	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -794,7 +837,7 @@
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
-    amd64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 	echo x86_64-unknown-cygwin
 	exit ;;
     p*:CYGWIN*:*)
@@ -814,7 +857,31 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	exit ;;
     arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	else
+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
@@ -826,6 +893,17 @@
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -835,63 +913,33 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips64
-	#undef mips64el
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+    or32:Linux:*:*)
+	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
 	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
@@ -901,8 +949,11 @@
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -916,68 +967,15 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-gnu
+	exit ;;
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
+    xtensa*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1006,7 +1004,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1050,8 +1048,11 @@
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1089,6 +1090,16 @@
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1101,7 +1112,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1164,6 +1175,9 @@
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1173,6 +1187,15 @@
     SX-6:SUPER-UX:*:*)
 	echo sx6-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1182,7 +1205,16 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1261,6 +1293,12 @@
     i*86:skyos:*:*)
 	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
 	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1421,9 +1459,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be

aMule-2.2.6.tar.bz2/config.h.in -> aMule-2.3.1.tar.bz2/config.h.in Changed

@@ -53,6 +53,9 @@
 /* Define to 1 if you have the `endpwent' function. */
 #undef HAVE_ENDPWENT
 
+/* Define to 1 if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
+
 /* Define to 1 if you have the <execinfo.h> header which declares backtrace()
    */
 #undef HAVE_EXECINFO
@@ -256,6 +259,12 @@
 /* Define to 1 if you have the `setrlimit' function. */
 #undef HAVE_SETRLIMIT
 
+/* Define to 1 if you have the `sigaction' function. */
+#undef HAVE_SIGACTION
+
+/* Define to 1 if you have the <signal.h> header file. */
+#undef HAVE_SIGNAL_H
+
 /* Define to 1 if you have the `socket' function. */
 #undef HAVE_SOCKET
 
@@ -324,6 +333,9 @@
 /* Define to 1 if you have the `strtoul' function. */
 #undef HAVE_STRTOUL
 
+/* Define to 1 if you have the `sysconf' function. */
+#undef HAVE_SYSCONF
+
 /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
    */
 #undef HAVE_SYS_DIR_H
@@ -334,6 +346,9 @@
 /* Define to 1 if you have the <sys/ioctl.h> header file. */
 #undef HAVE_SYS_IOCTL_H
 
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
+
 /* Define to 1 if you have the <sys/mntent.h> header file. */
 #undef HAVE_SYS_MNTENT_H
 
@@ -404,6 +419,13 @@
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
+/* Define to 1 if you have the _SC_PAGESIZE constant in <unistd.h> */
+#undef HAVE__SC_PAGESIZE
+
+/* Define to 1 if you have the _SC_PAGE_SIZE constant in <unistd.h>, but not
+   _SC_PAGESIZE */
+#undef HAVE__SC_PAGE_SIZE
+
 /* Define to 1 if you have the `__argz_count' function. */
 #undef HAVE___ARGZ_COUNT
 
@@ -438,15 +460,15 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
 /* Define if <inttypes.h> exists and defines unusable PRI* macros. */
 #undef PRI_MACROS_BROKEN
 
-/* Define to 1 if the C compiler supports function prototypes. */
-#undef PROTOTYPES
-
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE
 
@@ -459,14 +481,9 @@
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
 
-/* Define to 1 if the `setvbuf' function takes the buffering type as its
-   second argument and the buffer pointer as the third, as on System V before
-   release 3. */
-#undef SETVBUF_REVERSED
-
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
+   automatically deduced at runtime.
 	STACK_DIRECTION > 0 => grows toward higher addresses
 	STACK_DIRECTION < 0 => grows toward lower addresses
 	STACK_DIRECTION = 0 => direction of growth unknown */
@@ -497,9 +514,6 @@
    `char[]'. */
 #undef YYTEXT_POINTER
 
-/* Define like PROTOTYPES; this can be used by system headers. */
-#undef __PROTOTYPES
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
@@ -518,7 +532,7 @@
 /* Define to `int' if <sys/types.h> does not define. */
 #undef mode_t
 
-/* Define to `long' if <sys/types.h> does not define. */
+/* Define to `long int' if <sys/types.h> does not define. */
 #undef off_t
 
 /* Define to `int' if <sys/types.h> does not define. */
@@ -527,7 +541,7 @@
 /* Define to rpl_realloc if the replacement function should be used. */
 #undef realloc
 
-/* Define to `unsigned' if <sys/types.h> does not define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
 /* Define to `int' if <sys/types.h> doesn't define. */

aMule-2.2.6.tar.bz2/config.sub -> aMule-2.3.1.tar.bz2/config.sub Changed

aMule-2.2.6.tar.bz2/configure -> aMule-2.3.1.tar.bz2/configure Changed

@@ -1,83 +1,418 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for aMule 2.2.6.
+# Generated by GNU Autoconf 2.65 for aMule 2.3.1.
 #
 # Report bugs to <admin@amule.org>.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\$.*\$"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\$.*\$$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
+      esac;
+      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
 fi
 
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  # We cannot yet assume a decent shell, so we have to provide a
+	# neutralization value for shells without unset; and this also
+	# works around shells that cannot unset nonexistent variables.
+	BASH_ENV=/dev/null
+	ENV=/dev/null
+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_unset $as_var
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and admin@amule.org
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
   fi
-done
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
 
-# Required to use basename.
-if expr a : '$a$' >/dev/null 2>&1; then
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X$//$[^/]' \| \
+	 X"$as_dir" : 'X$//$$' \| \
+	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '$a$' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*$...$'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; }
-  	  /^X\/$\/\/$$/{ s//\1/; q; }
-  	  /^X\/$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
+	 X"$0" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/$[^/][^/]*$\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
-# PATH needs CR, and LINENO needs CR and PATH.
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -85,146 +420,107 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
 
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
     sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
       N
-      s,$,-,
-      : loop
-      s,^$['$as_cr_digits']*$$.*$[$]LINENO$[^'$as_cr_alnum'_]$,\1\2\1\3,
+      :loop
+      s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/
       t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
+      s/-\n.*//
     ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '$a$' >/dev/null 2>&1; then
-  as_expr=expr
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
 else
-  as_expr=false
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
   fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -233,90 +529,418 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-exec 6>&1
-
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_files=
 ac_config_libobj_dir=.
+LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
 
 # Identity of this package.
 PACKAGE_NAME='aMule'
 PACKAGE_TARNAME='amule'
-PACKAGE_VERSION='2.2.6'
-PACKAGE_STRING='aMule 2.2.6'
+PACKAGE_VERSION='2.3.1'
+PACKAGE_STRING='aMule 2.3.1'
 PACKAGE_BUGREPORT='admin@amule.org'
+PACKAGE_URL=''
 
 ac_unique_file="src/amule.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='GEOIP_CPPFLAGS GEOIP_LDFLAGS GEOIP_LIBS BFD_CPPFLAGS BFD_LIBS SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os RESOLV_LIB X11LIBS MULECPPFLAGS MULECFLAGS MULECXXFLAGS MULELDFLAGS MULERCFLAGS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP BUILD_CC ac_ct_BUILD_CC EXEEXT BUILD_EXEEXT BUILD_CPPFLAGS BUILD_CFLAGS BUILD_LDFLAGS EGREP LEX LEXLIB LEX_OUTPUT_ROOT RANLIB ac_ct_RANLIB YACC AR ac_ct_AR LD ac_ct_LD ZLIB_CPPFLAGS ZLIB_LDFLAGS ZLIB_LIBS GDLIB_CONFIG_PATH GDLIB_CFLAGS GDLIB_LDFLAGS GDLIB_LIBS CAS_DEFS REGEX_LIBS LIBPNG_CONFIG_PATH LIBPNG_CFLAGS LIBPNG_LDFLAGS LIBPNG_LIBS AMULEWEB_DEFS WX_CONFIG_PATH WX_CPPFLAGS WX_CFLAGS WX_CXXFLAGS WX_CFLAGS_ONLY WX_CXXFLAGS_ONLY WX_LIBS WX_LIBS_STATIC WX_VERSION_FULL WX_RESCOMP WX_VERSION_MAJOR WX_VERSION_MINOR WX_UNICODE WX_DEBUG WX_SHARED WX_PORT WXBASE_LIBS WXBASE_CPPFLAGS RC RCFLAGS ac_ct_RC PKG_CONFIG ac_pt_PKG_CONFIG LIBUPNP_CPPFLAGS LIBUPNP_CFLAGS LIBUPNP_LDFLAGS LIBUPNP_LIBS CRYPTOPP_CPPFLAGS CRYPTOPP_LDFLAGS CRYPTOPP_LIBS ALLOCA LIBOBJS POW_LIB MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE GLIBC21 LIBICONV LTLIBICONV INTLBISON USE_NLS BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT INTLOBJS DATADIRNAME INSTOBJEXT GENCAT INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB AMULE_DAEMON_MANPAGES AMULECMD_MANPAGES WEB_MANPAGES AMULE_GUI_MANPAGES CAS_MANPAGES WXCAS_MANPAGES ED2K_MANPAGES ALC_MANPAGES ALCC_MANPAGES MONOLITHIC_MANPAGES INCINTL docdir SVNDATE WEB_TRUE WEB_FALSE ED2K_TRUE ED2K_FALSE CAS_TRUE CAS_FALSE WXCAS_TRUE WXCAS_FALSE ALC_TRUE ALC_FALSE ALCC_TRUE ALCC_FALSE AMULE_GUI_TRUE AMULE_GUI_FALSE AMULE_DAEMON_TRUE AMULE_DAEMON_FALSE COMPILE_CMD_TRUE COMPILE_CMD_FALSE MONOLITHIC_TRUE MONOLITHIC_FALSE ENABLE_UPNP_TRUE ENABLE_UPNP_FALSE ENABLE_IP2COUNTRY_TRUE ENABLE_IP2COUNTRY_FALSE SYS_WIN32_TRUE SYS_WIN32_FALSE NEED_RC_TRUE NEED_RC_FALSE NEED_CORESERVICES_TRUE NEED_CORESERVICES_FALSE COMPILE_NLS_TRUE COMPILE_NLS_FALSE GENERATE_FLEX_HEADER_TRUE GENERATE_FLEX_HEADER_FALSE INSTALL_SKINS_TRUE INSTALL_SKINS_FALSE READLINE_LIBS LTLIBOBJS'
+ac_header_list=
+ac_subst_vars='am__EXEEXT_FALSE
+am__EXEEXT_TRUE
+LTLIBOBJS
+READLINE_LIBS
+COMPILE_LIB_EC_FALSE
+COMPILE_LIB_EC_TRUE
+COMPILE_LIB_COMMON_FALSE
+COMPILE_LIB_COMMON_TRUE
+PLASMAMULE_FALSE
+PLASMAMULE_TRUE
+INSTALL_SKINS_FALSE
+INSTALL_SKINS_TRUE
+GENERATE_FLEX_HEADER_FALSE
+GENERATE_FLEX_HEADER_TRUE
+COMPILE_NLS_FALSE
+COMPILE_NLS_TRUE
+NEED_CORESERVICES_FALSE
+NEED_CORESERVICES_TRUE
+NEED_RC_FALSE
+NEED_RC_TRUE
+SYS_WIN32_FALSE
+SYS_WIN32_TRUE
+DEBUGFLAG
+KDE_MIME_PATH
+KDE_ICON_PATH
+KDE_MODULE_PATH
+KDE_SERVICE_PATH
+KDE_APPLNK_PATH
+KDE_HEADER_DIR
+KDE4_CONFIG
+QT_GUI_LIBS
+QT_GUI_CXXFLAGS
+QT_CORE_LIBS
+QT_CORE_CXXFLAGS
+QT_DBUS_LDFLAGS
+QT_MOC
+SVNDATE
+BFD_LIBS
+BFD_CPPFLAGS
+INCINTL
+MONOLITHIC_MANPAGES
+ALCC_MANPAGES
+ALC_MANPAGES
+ED2K_MANPAGES
+WXCAS_MANPAGES
+CAS_MANPAGES
+AMULE_GUI_MANPAGES
+WEBSERVER_MANPAGES
+AMULECMD_MANPAGES
+AMULE_DAEMON_MANPAGES
+POSUB
+LTLIBINTL
+LIBINTL
+INTLLIBS
+INTL_LIBTOOL_SUFFIX_PREFIX
+GENCAT
+INSTOBJEXT
+DATADIRNAME
+INTLOBJS
+CATOBJEXT
+USE_INCLUDED_LIBINTL
+BUILD_INCLUDED_LIBINTL
+USE_NLS
+INTLBISON
+LTLIBICONV
+LIBICONV
+GLIBC21
+MSGMERGE
+XGETTEXT
+GMSGFMT
+MSGFMT
+MKINSTALLDIRS
+POW_LIB
+LIBOBJS
+ALLOCA
+CRYPTOPP_LIBS
+CRYPTOPP_LDFLAGS
+CRYPTOPP_CPPFLAGS
+LIBUPNP_LIBS
+LIBUPNP_LDFLAGS
+LIBUPNP_CFLAGS
+LIBUPNP_CPPFLAGS
+PKG_CONFIG
+RCFLAGS
+RC
+WXBASE_CPPFLAGS
+WXBASE_LIBS
+WX_PORT
+WX_SHARED
+WX_DEBUG
+WX_UNICODE
+WX_VERSION_MINOR
+WX_VERSION_MAJOR
+WX_RESCOMP
+WX_VERSION_FULL
+WX_LIBS
+WX_CXXFLAGS_ONLY
+WX_CFLAGS_ONLY
+WX_CXXFLAGS
+WX_CFLAGS
+WX_CPPFLAGS
+WX_CONFIG_PATH
+AMULEWEB_DEFS
+LIBPNG_LIBS
+LIBPNG_LDFLAGS
+LIBPNG_CFLAGS
+LIBPNG_CONFIG_PATH
+CAS_DEFS
+GDLIB_LIBS
+GDLIB_LDFLAGS
+GDLIB_CFLAGS
+GDLIB_CONFIG_PATH
+ZLIB_LIBS
+ZLIB_LDFLAGS
+ZLIB_CPPFLAGS
+FILEVIEW_FALSE
+FILEVIEW_TRUE
+XAS_FALSE
+XAS_TRUE
+ALCC_FALSE
+ALCC_TRUE
+ALC_FALSE
+ALC_TRUE
+ED2K_FALSE
+ED2K_TRUE
+WXCAS_FALSE
+WXCAS_TRUE
+CAS_FALSE
+CAS_TRUE
+AMULE_GUI_FALSE
+AMULE_GUI_TRUE
+WEB_FALSE
+WEB_TRUE
+COMPILE_CMD_FALSE
+COMPILE_CMD_TRUE
+AMULE_DAEMON_FALSE
+AMULE_DAEMON_TRUE
+MONOLITHIC_FALSE
+MONOLITHIC_TRUE
+LD
+AR
+YFLAGS
+YACC
+RANLIB
+LEXLIB
+LEX_OUTPUT_ROOT
+LEX
+EGREP
+GREP
+BUILD_LDFLAGS
+BUILD_CFLAGS
+BUILD_CPPFLAGS
+BUILD_EXEEXT
+ac_ct_BUILD_CC
+BUILD_CC
+CPP
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+ac_ct_CC
+CFLAGS
+CC
+CXXCPP
+am__fastdepCXX_FALSE
+am__fastdepCXX_TRUE
+CXXDEPMODE
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__quote
+am__include
+DEPDIR
+OBJEXT
+EXEEXT
+ac_ct_CXX
+CPPFLAGS
+LDFLAGS
+CXXFLAGS
+CXX
+MULERCFLAGS
+MULELDFLAGS
+MULECXXFLAGS
+MULECFLAGS
+MULECPPFLAGS
+RESOLV_LIB
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+am__untar
+am__tar
+AMTAR
+am__leading_dot
+SET_MAKE
+AWK
+mkdir_p
+MKDIR_P
+INSTALL_STRIP_PROGRAM
+STRIP
+install_sh
+MAKEINFO
+AUTOHEADER
+AUTOMAKE
+AUTOCONF
+ACLOCAL
+VERSION
+PACKAGE
+CYGPATH_W
+am__isrc
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL
+GEOIP_LIBS
+GEOIP_LDFLAGS
+GEOIP_CPPFLAGS'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_silent_rules
+enable_maintainer_mode
+enable_dependency_tracking
+enable_monolithic
+enable_amule_daemon
+enable_amulecmd
+enable_webserver
+enable_amule_gui
+enable_cas
+enable_wxcas
+enable_ed2k
+enable_alc
+enable_alcc
+enable_xas
+enable_fileview
+enable_plasmamule
+enable_static
+with_kde4_config
+enable_kde_in_home
+with_moc
+with_gnu_malloc
+with_zlib
+with_gdlib_prefix
+with_gdlib_config
+with_libpng_prefix
+with_libpng_config
+enable_geoip
+with_geoip_headers
+with_geoip_lib
+with_geoip_static
+with_wxdir
+with_wx_config
+with_wx_prefix
+with_wx_exec_prefix
+with_toolkit
+with_wxshared
+with_wxdebug
+with_wxversion
+enable_upnp
+with_libupnp_prefix
+with_crypto_prefix
+enable_mmap
+with_language
+with_gnu_ld
+enable_rpath
+with_libiconv_prefix
+enable_nls
+with_included_gettext
+with_libintl_prefix
+enable_debug
+enable_profile
+enable_optimize
+with_denoise_level
+enable_ccache
+with_ccache_prefix
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CXX
+CXXFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CCC
+CXXCPP
+CC
+CFLAGS
+CPP
+YACC
+YFLAGS
+RC
+RCFLAGS
+PKG_CONFIG'
+
 
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
@@ -339,34 +963,48 @@
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
 
 ac_prev=
+ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
+    eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=$.*$'`
+  case $ac_option in
+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;;
+  *)	ac_optarg=yes ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
@@ -388,33 +1026,59 @@
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-$.*$'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-$[^=]*$'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
     esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -441,6 +1105,12 @@
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
 
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
@@ -465,13 +1135,16 @@
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
 
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
@@ -536,6 +1209,16 @@
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
 
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
@@ -586,26 +1269,36 @@
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-$[^=]*$'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-$[^=]*$'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
     esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-$.*$'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
@@ -625,26 +1318,25 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
     ;;
 
@@ -653,31 +1345,36 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "missing argument to $ac_option"
 fi
 
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
-done
+fi
 
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
 do
-  eval ac_val=$`echo $ac_var`
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
   case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
+    */ )
+      ac_val=`expr "X$ac_val" : 'X$.*[^/]$' \| "X$ac_val" : 'X$.*$'`
+      eval $ac_var=\$ac_val;;
   esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -691,7 +1388,7 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
     If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
@@ -704,98 +1401,72 @@
 test "$silent" = yes && exec 6>/dev/null
 
 
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error "pwd does not report name of working directory"
+
+
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X$//$[^/]' \| \
-	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
-  	  /^X$\/\/$$/{ s//\1/; q; }
-  	  /^X$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X$//$[^/]' \| \
+	 X"$as_myself" : 'X$//$$' \| \
+	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%$[^\\/]$[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_RC_set=${RC+set}
-ac_env_RC_value=$RC
-ac_cv_env_RC_set=${RC+set}
-ac_cv_env_RC_value=$RC
-ac_env_RCFLAGS_set=${RCFLAGS+set}
-ac_env_RCFLAGS_value=$RCFLAGS
-ac_cv_env_RCFLAGS_set=${RCFLAGS+set}
-ac_cv_env_RCFLAGS_value=$RCFLAGS
-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X$.*[^/]$' \| "X$srcdir" : 'X$.*$'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
 
 #
 # Report the --help message.
@@ -804,7 +1475,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures aMule 2.2.6 to adapt to many kinds of systems.
+\`configure' configures aMule 2.3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -824,14 +1495,11 @@
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
-_ACEOF
-
-  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -841,18 +1509,25 @@
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/amule]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
@@ -862,10 +1537,6 @@
   --program-suffix=SUFFIX            append SUFFIX to installed program names
   --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
 
-X features:
-  --x-includes=DIR    X include files are in DIR
-  --x-libraries=DIR   X library files are in DIR
-
 System types:
   --build=BUILD     configure for building on BUILD [guessed]
   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
@@ -874,13 +1545,16 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of aMule 2.2.6:";;
+     short | recursive ) echo "Configuration of aMule 2.3.1:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-silent-rules          less verbose build output (undo: `make V=1')
+  --disable-silent-rules         verbose build output (undo: `make V=0')
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
   --disable-dependency-tracking  speeds up one-time build
@@ -889,25 +1563,32 @@
   --enable-amule-daemon   compile aMule daemon version
   --enable-amulecmd       compile aMule command line client
   --enable-webserver      compile aMule WebServer
-  --enable-amule-gui      compile aMule remote GUI (EXPERIMENTAL)
+  --enable-amule-gui      compile aMule remote GUI
   --enable-cas            compile C aMule Statistics
   --enable-wxcas          compile aMule GUI Statistics
   --disable-ed2k          don't compile aMule ed2k links handler
   --enable-alc            compile aMuleLinkCreator GUI version
   --enable-alcc           compile aMuleLinkCreator for console
-  --disable-upnp          do not compile UPnP code
+  --enable-xas            install xas XChat2 plugin
+  --enable-fileview       compile aMule file viewer for console (EXPERIMENTAL)
+  --enable-plasmamule     compile aMule plasma applet and engine
+  --enable-static         produce a statically linked executable
+  --enable-kde-in-home    install KDE related stuff in your home dir
   --enable-geoip          compile with GeoIP IP2Country library
+  --disable-upnp          do not compile UPnP code
+  --enable-mmap           enable using mapped memory if supported
   --disable-rpath         do not hardcode runtime library paths
   --disable-nls           do not use Native Language Support
   --disable-debug         disable additional debugging output
-  --enable-optimize       enable code optimization
   --enable-profile        enable code profiling
-  --enable-static         produce a statically linked executable
+  --enable-optimize       enable code optimization
   --enable-ccache         enable ccache support for fast recompilation
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-kde4-config=PATH kde4-config script to use
+  --with-moc=PATH         Search in PATH for Qt's meta object compiler
   --without-gnu-malloc    Don't assume that we use GNU libc compatible
                           malloc/realloc when cross-compiling
   --with-zlib=PREFIX      use zlib in PREFIX
@@ -940,7 +1621,6 @@
                           UPnP library location
   --with-crypto-prefix=PREFIX
                           prefix where crypto++ is installed
-  --with-x                use the X Window System
   --with-language=<langs> Specify a comma-separated list of languages you want
                           to have installed. See po/LINGUAS for available
                           languages
@@ -965,12 +1645,18 @@
   CXXFLAGS    C++ compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
   CXXCPP      C++ preprocessor
   CC          C compiler command
   CFLAGS      C compiler flags
   CPP         C preprocessor
+  YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+              the first program found out of: `bison -y', `byacc', `yacc'.
+  YFLAGS      The list of arguments that will be passed by default to $YACC.
+              This script will default YFLAGS to the empty string to avoid a
+              default value of `-d' given by some make applications.
   RC          Resource Compiler
   RCFLAGS     Resource Compiler Flags
   PKG_CONFIG  path to pkg-config utility
@@ -980,120 +1666,701 @@
 
 Report bugs to <admin@amule.org>.
 _ACEOF
+ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-aMule configure 2.2.6
-generated by GNU Autoconf 2.59
+aMule configure 2.3.1
+generated by GNU Autoconf 2.65
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
-  exit 0
+  exit
 fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_cxx_try_compile LINENO
+# ----------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
+# ac_fn_cxx_try_cpp LINENO
+# ------------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_cpp
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( cat <<\_ASBOX
+## ------------------------------ ##
+## Report this to admin@amule.org ##
+## ------------------------------ ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_cxx_try_run LINENO
+# ------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_cxx_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_run
+
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_cxx_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_type
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR
+# ------------------------------------
+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
+$as_echo_n "checking whether $2 is declared... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $2
+  (void) $2;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_decl
+cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by aMule $as_me 2.2.6, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+It was created by aMule $as_me 2.3.1, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
+exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
@@ -1112,7 +2379,7 @@
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
@@ -1124,8 +2391,9 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
 
 } >&5
 
@@ -1147,7 +2415,6 @@
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
@@ -1158,13 +2425,13 @@
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1180,21 +2447,19 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
@@ -1207,20 +2472,35 @@
 _ASBOX
     echo
     # The following way of writing the cache mishandles newlines in values,
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
   (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
       sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='"'"'\\2'"'"'/p"
-      ;;
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\''\\2'\''/p"
+      ;; #(
     *)
-      sed -n \
-	"s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-}
+    esac |
+    sort
+)
     echo
 
     cat <<\_ASBOX
@@ -1231,22 +2511,28 @@
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
       cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
+## ------------------- ##
+## File substitutions. ##
+## ------------------- ##
 _ASBOX
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1258,26 +2544,26 @@
 ## ----------- ##
 _ASBOX
       echo
-      sed "/^$/d" confdefs.h | sort
+      cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-     ' 0
+' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
@@ -1285,112 +2571,131 @@
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  ac_site_file1=$CONFIG_SITE
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
+as_fn_append ac_header_list " stdlib.h"
+as_fn_append ac_header_list " unistd.h"
+as_fn_append ac_header_list " sys/param.h"
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_$[a-zA-Z_0-9]*$_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -1399,56 +2704,30 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+am__api_version='1.11'
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-am__api_version="1.9"
 ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -1463,22 +2742,23 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+# Reject install programs that cannot install multiple files.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${ac_cv_path_install+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1486,7 +2766,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -1496,30 +2776,43 @@
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    rm -rf conftest.one conftest.two conftest.dir
+	    echo one > conftest.one
+	    echo two > conftest.two
+	    mkdir conftest.dir
+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	      test -s conftest.one && test -s conftest.two &&
+	      test -s conftest.dir/conftest.one &&
+	      test -s conftest.dir/conftest.two
+	    then
+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
-done
 
+  done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -1529,21 +2822,34 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
 echo timestamp > conftest.file
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name.  Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+  *[\\\"\#\$\&\'\`$am_lf]*)
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+esac
+
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
    if test "$*" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
+      set X `ls -t "$srcdir/configure" conftest.file`
    fi
    rm -f conftest.file
    if test "$*" != "X $srcdir/configure conftest.file" \
@@ -1553,11 +2859,8 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
    fi
 
    test "$2" = conftest.file
@@ -1566,81 +2869,206 @@
    # Ok.
    :
 else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
 fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
+  program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 test "$program_suffix" != NONE &&
-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
 # By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 # expand $ac_aux_dir to an absolute path
 am_aux_dir=`cd $ac_aux_dir && pwd`
 
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+if test x"${MISSING+set}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+  *)
+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
+  esac
+fi
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
+if test x"${install_sh}" != xset; then
+  case $am_aux_dir in
+  *\ * | *\	*)
+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+  *)
+    install_sh="\${SHELL} $am_aux_dir/install-sh"
+  esac
+fi
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
   done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=":"
   else
-    mkdir_p='$(install_sh) -d'
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if test "${ac_cv_path_mkdir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	     'mkdir (GNU coreutils) '* | \
+	     'mkdir (coreutils) '* | \
+	     'mkdir (fileutils) '4.1*)
+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	       break 3;;
+	   esac
+	 done
+       done
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for MKDIR_P within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the value is a relative name.
+    MKDIR_P="$ac_install_sh -d"
   fi
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+  [\\/$]* | ?:[\\/]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
 
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -1650,55 +3078,59 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$AWK" && break
 done
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
 rm -f conftest.make
 fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -1711,12 +3143,14 @@
 fi
 rmdir .tst 2>/dev/null
 
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  am__isrc=' -I$(srcdir)'
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+  fi
 fi
 
 # test whether we have cygpath
@@ -1731,7 +3165,7 @@
 
 # Define the identity of the package.
  PACKAGE='amule'
- VERSION='2.2.6'
+ VERSION='2.3.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -1759,96 +3193,6 @@
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  STRIP=$ac_ct_STRIP
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.
@@ -1861,24 +3205,37 @@
 
 
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in
+yes) AM_DEFAULT_VERBOSITY=0;;
+no)  AM_DEFAULT_VERBOSITY=1;;
+*)   AM_DEFAULT_VERBOSITY=1;;
+esac
+AM_BACKSLASH='\'
+
+
+
 
 
-          ac_config_headers="$ac_config_headers config.h"
+ac_config_headers="$ac_config_headers config.h"
 
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then :
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 else
   USE_MAINTAINER_MODE=no
-fi;
-  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-
+fi
 
-if test $USE_MAINTAINER_MODE = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+$as_echo "$USE_MAINTAINER_MODE" >&6; }
+   if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
   MAINTAINER_MODE_FALSE='#'
 else
@@ -1891,57 +3248,74 @@
 
 
 # Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if test "${ac_cv_build+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+esac
 build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if test "${ac_cv_host+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+esac
 host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'`
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
 
@@ -1955,7 +3329,6 @@
 	openbsd*)
 		SYS=openbsd
 		LIBS="$LIBS -L/usr/local/lib"
-		X11LIBS="-lX11 -L/usr/X11R6/lib"
 		MULECPPFLAGS="-D__OPENBSD__"
 		;;
 	*cygwin* | *mingw32*)
@@ -1965,7 +3338,6 @@
 	solaris*)
 		SYS=solaris
 		RESOLV_LIB="-lresolv -lnsl"
-		X11LIBS="-lX11"
 		LIBS="$LIBS -lrt"
 		;;
 	*netbsd*)
@@ -1986,47 +3358,49 @@
 	esac
 
 	# -lpthread is needed by Debian but FreeBSD < 5 doesn't support it
-	if test ${SYS:-unknown} != win32; then
+	if test ${SYS:-unknown} != win32; then :
 
-		echo "$as_me:$LINENO: checking if this is a FreeBSD 4 or earlier system" >&5
-echo $ECHO_N "checking if this is a FreeBSD 4 or earlier system... $ECHO_C" >&6
-		if test x"`uname -s`" = xFreeBSD && test 0`uname -r | cut -c 1` -lt 5; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if this is a FreeBSD 4 or earlier system" >&5
+$as_echo_n "checking if this is a FreeBSD 4 or earlier system... " >&6; }
+		if test x"`uname -s`" = xFreeBSD && test 0`uname -r | cut -c 1` -lt 5; then :
 
 			MULELDFLAGS="$MULELDFLAGS -pthread"
-			echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
 
 			MULELDFLAGS="$MULELDFLAGS -lpthread"
-			echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
 
-
 fi
 
 
 
-
 mule_backup_CFLAGS="$CFLAGS"
 mule_backup_CXXFLAGS="$CXXFLAGS"
 mule_backup_BUILD_CFLAGS="$BUILD_CFLAGS"
-ac_ext=cc
+ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+if test -z "$CXX"; then
+  if test -n "$CCC"; then
+    CXX=$CCC
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -2036,39 +3410,41 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     test -n "$CXX" && break
   done
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -2078,59 +3454,72 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$ac_ct_CXX" && break
 done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
 
-  CXX=$ac_ct_CXX
+  if test "x$ac_ct_CXX" = x; then
+    CXX="g++"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CXX=$ac_ct_CXX
+  fi
 fi
 
-
+  fi
+fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2142,112 +3531,109 @@
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C++ compiler default output file name" >&5
-echo $ECHO_N "checking for C++ compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
 else
-  echo "$as_me: failed program was:" >&5
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C++ compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "C++ compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5
+$as_echo_n "checking for C++ compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
 
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C++ compiler works" >&5
-echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C++ compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -2255,38 +3641,90 @@
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
-	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C++ compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if test "${ac_cv_objext+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2298,45 +3736,46 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2350,55 +3789,34 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GXX=yes
+else
+  GXX=
+fi
 ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if test "${ac_cv_prog_cxx_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+   ac_cxx_werror_flag=yes
+   ac_cv_prog_cxx_g=no
+   CXXFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -2409,160 +3827,64 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CXXFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
+
 int
 main ()
 {
-exit (42);
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+	 CXXFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_declaration
+
 int
 main ()
 {
-exit (42);
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  ac_cv_prog_cxx_g=yes
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS=$ac_save_CXXFLAGS
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
 fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2570,60 +3892,58 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 DEPDIR="${am__leading_dot}deps"
 
-          ac_config_commands="$ac_config_commands depfiles"
+ac_config_commands="$ac_config_commands depfiles"
 
 
 am_make=${MAKE-make}
 cat > confinc << 'END'
 am__doit:
-	@echo done
+	@echo this is the am__doit target
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+$as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
+# Ignore all kinds of additional output from `make'.
+case `$am_make -s -f confmf 2> /dev/null` in #(
+*the\ am__doit\ target*)
+  am__include=include
+  am__quote=
+  _am_result=GNU
+  ;;
+esac
 # Now try BSD make style include.
 if test "$am__include" = "#"; then
    echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
+   case `$am_make -s -f confmf 2> /dev/null` in #(
+   *the\ am__doit\ target*)
+     am__include=.include
+     am__quote="\""
+     _am_result=BSD
+     ;;
+   esac
 fi
 
 
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval="$enable_dependency_tracking"
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
 
-fi;
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
 fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
+ if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
   AMDEP_FALSE='#'
 else
@@ -2633,13 +3953,12 @@
 
 
 
-
 depcc="$CXX"  am_compiler_list=
 
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -2664,6 +3983,11 @@
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
   fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -2681,7 +4005,17 @@
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -2691,18 +4025,23 @@
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
     none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -2726,13 +4065,11 @@
 fi
 
 fi
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
 CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
   am__fastdepCXX_TRUE=
@@ -2743,16 +4080,16 @@
 fi
 
 
-ac_ext=cc
+ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
     for CXXCPP in "$CXX -E" "/lib/cpp"
@@ -2766,11 +4103,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -2779,68 +4112,24 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -2850,7 +4139,7 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -2862,8 +4151,8 @@
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
@@ -2873,11 +4162,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -2886,68 +4171,24 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -2957,14 +4198,13 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -2981,10 +4221,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2994,35 +4234,37 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3032,39 +4274,50 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3074,77 +4327,37 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
 
+  fi
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3155,18 +4368,19 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -3184,24 +4398,25 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -3211,39 +4426,41 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -3253,71 +4470,83 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3331,55 +4560,34 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if test "${ac_cv_prog_cc_g+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3390,39 +4598,49 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
 
-ac_cv_prog_cc_g=no
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
@@ -3438,18 +4656,14 @@
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -3477,12 +4691,17 @@
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
+   as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
+   that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -3497,205 +4716,37 @@
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
 fi
 
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3704,10 +4755,10 @@
 
 depcc="$CC"   am_compiler_list=
 
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
   # We make a subdir and do the tests there.  Otherwise we can end up
@@ -3732,6 +4783,11 @@
   if test "$am_compiler_list" = ""; then
      am_compiler_list=`sed -n 's/^#*$[a-zA-Z0-9]*$)$/\1/p' < ./depcomp`
   fi
+  am__universal=false
+  case " $depcc " in #(
+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
+     esac
+
   for depmode in $am_compiler_list; do
     # Setup a source with many dependencies, because some compilers
     # like to wrap large dependency lists on column 80 (with \), and
@@ -3749,7 +4805,17 @@
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs
+    am__obj=sub/conftest.${OBJEXT-o}
+    am__minus_obj="-o $am__obj"
     case $depmode in
+    gcc)
+      # This depmode causes a compiler race in universal mode.
+      test "$am__universal" = false || continue
+      ;;
     nosideeffect)
       # after this tag, mechanisms are not by side-effect, so they'll
       # only be used when explicitly requested
@@ -3759,18 +4825,23 @@
 	break
       fi
       ;;
+    msvisualcpp | msvcmsys)
+      # This compiler won't grok `-c -o', but also, the minuso test has
+      # not run yet.  These depmodes are late enough in the game, and
+      # so weak that their functioning should not be impacted.
+      am__obj=conftest.${OBJEXT-o}
+      am__minus_obj=
+      ;;
     none) break ;;
     esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
     if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+       source=sub/conftest.c object=$am__obj \
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       # icc doesn't choke on unknown options, it will just issue warnings
       # or remarks (even with -Werror).  So we grep stderr for any message
@@ -3794,13 +4865,11 @@
 fi
 
 fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
-
-
-if
+ if
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
   am__fastdepCC_TRUE=
@@ -3816,15 +4885,15 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if test "${ac_cv_prog_CPP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3838,11 +4907,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3851,68 +4916,24 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -3922,7 +4943,7 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -3934,8 +4955,8 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3945,11 +4966,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -3958,68 +4975,24 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
 rm -f conftest.err conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
@@ -4029,14 +5002,13 @@
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -4045,10 +5017,10 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-if test "$cross_compiling" = yes; then
-  ac_build_prefix=
+ac_build_prefix=
 test -n "$build_alias" && ac_build_prefix=$build_alias-
 
+if test "$cross_compiling" = yes; then :
 
 # Even if we're cross-compiling, we want a compiler here
 # that is not a cross-compiler.
@@ -4063,10 +5035,10 @@
 if test -n "$ac_build_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_build_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_BUILD_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_BUILD_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$BUILD_CC"; then
   ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test.
@@ -4076,35 +5048,37 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_BUILD_CC="${ac_build_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:$LINENO: result: $BUILD_CC" >&5
-echo "${ECHO_T}$BUILD_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+$as_echo "$BUILD_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_BUILD_CC"; then
   ac_ct_BUILD_CC=$BUILD_CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_BUILD_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_BUILD_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_BUILD_CC"; then
   ac_cv_prog_ac_ct_BUILD_CC="$ac_ct_BUILD_CC" # Let the user override the test.
@@ -4114,27 +5088,38 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_BUILD_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_BUILD_CC=$ac_cv_prog_ac_ct_BUILD_CC
 if test -n "$ac_ct_BUILD_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_BUILD_CC" >&5
-echo "${ECHO_T}$ac_ct_BUILD_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_BUILD_CC" >&5
+$as_echo "$ac_ct_BUILD_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  BUILD_CC=$ac_ct_BUILD_CC
+  if test "x$ac_ct_BUILD_CC" = x; then
+    BUILD_CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    BUILD_CC=$ac_ct_BUILD_CC
+  fi
 else
   BUILD_CC="$ac_cv_prog_BUILD_CC"
 fi
@@ -4143,10 +5128,10 @@
   if test -n "$ac_build_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_build_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_BUILD_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_BUILD_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$BUILD_CC"; then
   ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test.
@@ -4156,35 +5141,37 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_BUILD_CC="${ac_build_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:$LINENO: result: $BUILD_CC" >&5
-echo "${ECHO_T}$BUILD_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+$as_echo "$BUILD_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_BUILD_CC"; then
   ac_ct_BUILD_CC=$BUILD_CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_BUILD_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_BUILD_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_BUILD_CC"; then
   ac_cv_prog_ac_ct_BUILD_CC="$ac_ct_BUILD_CC" # Let the user override the test.
@@ -4194,27 +5181,38 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_BUILD_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_BUILD_CC=$ac_cv_prog_ac_ct_BUILD_CC
 if test -n "$ac_ct_BUILD_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_BUILD_CC" >&5
-echo "${ECHO_T}$ac_ct_BUILD_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_BUILD_CC" >&5
+$as_echo "$ac_ct_BUILD_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  BUILD_CC=$ac_ct_BUILD_CC
+  if test "x$ac_ct_BUILD_CC" = x; then
+    BUILD_CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    BUILD_CC=$ac_ct_BUILD_CC
+  fi
 else
   BUILD_CC="$ac_cv_prog_BUILD_CC"
 fi
@@ -4223,10 +5221,10 @@
 if test -z "$BUILD_CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_BUILD_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_BUILD_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$BUILD_CC"; then
   ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test.
@@ -4237,18 +5235,19 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_BUILD_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
@@ -4266,13 +5265,14 @@
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:$LINENO: result: $BUILD_CC" >&5
-echo "${ECHO_T}$BUILD_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+$as_echo "$BUILD_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$BUILD_CC"; then
   if test -n "$ac_build_prefix"; then
@@ -4280,10 +5280,10 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_build_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_BUILD_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_BUILD_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$BUILD_CC"; then
   ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test.
@@ -4293,26 +5293,28 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_BUILD_CC="$ac_build_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:$LINENO: result: $BUILD_CC" >&5
-echo "${ECHO_T}$BUILD_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+$as_echo "$BUILD_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
     test -n "$BUILD_CC" && break
   done
 fi
@@ -4322,10 +5324,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_BUILD_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_BUILD_CC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_BUILD_CC"; then
   ac_cv_prog_ac_ct_BUILD_CC="$ac_ct_BUILD_CC" # Let the user override the test.
@@ -4335,66 +5337,73 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_BUILD_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_BUILD_CC=$ac_cv_prog_ac_ct_BUILD_CC
 if test -n "$ac_ct_BUILD_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_BUILD_CC" >&5
-echo "${ECHO_T}$ac_ct_BUILD_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_BUILD_CC" >&5
+$as_echo "$ac_ct_BUILD_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$ac_ct_BUILD_CC" && break
 done
 
-  BUILD_CC=$ac_ct_BUILD_CC
+  if test "x$ac_ct_BUILD_CC" = x; then
+    BUILD_CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    BUILD_CC=$ac_ct_BUILD_CC
+  fi
 fi
 
 fi
 
 
-test -z "$BUILD_CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+test -z "$BUILD_CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
 echo "$as_me:$LINENO:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compiler --version </dev/null >&5\""; } >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compiler -v </dev/null >&5\""; } >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compiler -V </dev/null >&5\""; } >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4406,112 +5415,109 @@
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_build_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	ac_cv_build_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_build_exeext
+	if test "${ac_cv_build_exeext+set}" = set && test "$ac_cv_build_exeext" != no;
+	then :; else
+	   ac_cv_build_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
+test "$ac_cv_build_exeext" = no && ac_cv_build_exeext=
+
 else
-  echo "$as_me: failed program was:" >&5
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_build_exeext=$ac_cv_build_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
 
-rm -f a.out a.exe conftest$ac_cv_build_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_build_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -4519,28 +5525,84 @@
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_build_exeext=`expr "$ac_file" : '[^.]*$\..*$'`
-	  export ac_cv_build_exeext
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_build_exeext
-echo "$as_me:$LINENO: result: $ac_cv_build_exeext" >&5
-echo "${ECHO_T}$ac_cv_build_exeext" >&6
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_build_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build_exeext" >&5
+$as_echo "$ac_cv_build_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 BUILD_EXEEXT=$ac_cv_build_exeext
 ac_build_exeext=$BUILD_EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_build_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_build_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
 
 
 # Restore configuration environment
@@ -4555,7 +5617,6 @@
 else
   BUILD_CC="$CC" ; BUILD_EXEEXT=$EXEEXT
 fi
-
 CFLAGS="$mule_backup_CFLAGS"
 CXXFLAGS="$mule_backup_CXXFLAGS"
 BUILD_CFLAGS="$mule_backup_BUILD_CFLAGS"
@@ -4563,10 +5624,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
@@ -4576,70 +5637,189 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$AWK" && break
 done
 
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if test "${ac_cv_path_GREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
     fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if test "${ac_cv_path_EGREP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
 # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
 rm -f conftest.make
 fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
@@ -4648,10 +5828,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_LEX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LEX+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$LEX"; then
   ac_cv_prog_LEX="$LEX" # Let the user override the test.
@@ -4661,349 +5841,154 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LEX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  echo "$as_me:$LINENO: result: $LEX" >&5
-echo "${ECHO_T}$LEX" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
+$as_echo "$LEX" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$LEX" && break
 done
 test -n "$LEX" || LEX=":"
 
-if test -z "$LEXLIB"
-then
-  echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
-echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
-if test "${ac_cv_lib_fl_yywrap+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
+if test "x$LEX" != "x:"; then
+  cat >conftest.l <<_ACEOF
+%%
+a { ECHO; }
+b { REJECT; }
+c { yymore (); }
+d { yyless (1); }
+e { yyless (input () != 0); }
+f { unput (yytext[0]); }
+. { BEGIN INITIAL; }
+%%
+#ifdef YYTEXT_POINTER
+extern char *yytext;
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char yywrap ();
 int
-main ()
+main (void)
 {
-yywrap ();
-  ;
-  return 0;
+  return ! yylex () + ! yywrap ();
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_fl_yywrap=yes
+{ { ac_try="$LEX conftest.l"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$LEX conftest.l") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
+$as_echo_n "checking lex output file root... " >&6; }
+if test "${ac_cv_prog_lex_root+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_fl_yywrap=no
+if test -f lex.yy.c; then
+  ac_cv_prog_lex_root=lex.yy
+elif test -f lexyy.c; then
+  ac_cv_prog_lex_root=lexyy
+else
+  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
-echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
-if test $ac_cv_lib_fl_yywrap = yes; then
-  LEXLIB="-lfl"
-else
-  echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
-echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
-if test "${ac_cv_lib_l_yywrap+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ll  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
+$as_echo "$ac_cv_prog_lex_root" >&6; }
+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char yywrap ();
-int
-main ()
-{
-yywrap ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_l_yywrap=yes
+if test -z "${LEXLIB+set}"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
+$as_echo_n "checking lex library... " >&6; }
+if test "${ac_cv_lib_lex+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_l_yywrap=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
-echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
-if test $ac_cv_lib_l_yywrap = yes; then
-  LEXLIB="-ll"
+    ac_save_LIBS=$LIBS
+    ac_cv_lib_lex='none needed'
+    for ac_lib in '' -lfl -ll; do
+      LIBS="$ac_lib $ac_save_LIBS"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+`cat $LEX_OUTPUT_ROOT.c`
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lex=$ac_lib
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+      test "$ac_cv_lib_lex" != 'none needed' && break
+    done
+    LIBS=$ac_save_LIBS
 
 fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
+$as_echo "$ac_cv_lib_lex" >&6; }
+  test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
 fi
 
-if test "x$LEX" != "x:"; then
-  echo "$as_me:$LINENO: checking lex output file root" >&5
-echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
-if test "${ac_cv_prog_lex_root+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # The minimal lex program is just a single line: %%.  But some broken lexes
-# (Solaris, I think it was) want two %% lines, so accommodate them.
-cat >conftest.l <<_ACEOF
-%%
-%%
-_ACEOF
-{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
-  (eval $LEX conftest.l) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-if test -f lex.yy.c; then
-  ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
-  ac_cv_prog_lex_root=lexyy
-else
-  { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
-rm -f conftest.l
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
-echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
+$as_echo_n "checking whether yytext is a pointer... " >&6; }
+if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
+# default is implementation-dependent.  Figure out which it is, since
 # not all implementations provide the %pointer and %array declarations.
 ac_cv_prog_lex_yytext_pointer=no
-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
 ac_save_LIBS=$LIBS
-LIBS="$LIBS $LEXLIB"
-cat >conftest.$ac_ext <<_ACEOF
+LIBS="$LEXLIB $ac_save_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#define YYTEXT_POINTER 1
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_prog_lex_yytext_pointer=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_save_LIBS
-rm -f "${LEX_OUTPUT_ROOT}.c"
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
+$as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define YYTEXT_POINTER 1
-_ACEOF
-
-fi
+$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
 
 fi
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
+rm -f conftest.l $LEX_OUTPUT_ROOT.c
 
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL=$ac_install_sh
-  fi
 fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -5013,35 +5998,37 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -5051,28 +6038,38 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  RANLIB=$ac_ct_RANLIB
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
@@ -5081,10 +6078,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_YACC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_YACC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -5094,26 +6091,28 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_YACC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:$LINENO: result: $YACC" >&5
-echo "${ECHO_T}$YACC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$YACC" && break
 done
 test -n "$YACC" || YACC="yacc"
@@ -5122,10 +6121,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -5135,35 +6134,37 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -5173,27 +6174,38 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  RANLIB=$ac_ct_RANLIB
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
@@ -5201,10 +6213,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
@@ -5214,35 +6226,37 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_STRIP"; then
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
@@ -5252,27 +6266,38 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  STRIP=$ac_ct_STRIP
+  if test "x$ac_ct_STRIP" = x; then
+    STRIP=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    STRIP=$ac_ct_STRIP
+  fi
 else
   STRIP="$ac_cv_prog_STRIP"
 fi
@@ -5280,10 +6305,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
@@ -5293,35 +6318,37 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
@@ -5331,27 +6358,38 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  AR=$ac_ct_AR
+  if test "x$ac_ct_AR" = x; then
+    AR=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
 else
   AR="$ac_cv_prog_AR"
 fi
@@ -5359,10 +6397,10 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ld; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$LD"; then
   ac_cv_prog_LD="$LD" # Let the user override the test.
@@ -5372,35 +6410,37 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LD="${ac_tool_prefix}ld"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 LD=$ac_cv_prog_LD
 if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_LD"; then
   ac_ct_LD=$LD
   # Extract the first word of "ld", so it can be a program name with args.
 set dummy ld; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LD"; then
   ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test.
@@ -5410,138 +6450,267 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_LD="ld"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_LD=$ac_cv_prog_ac_ct_LD
 if test -n "$ac_ct_LD"; then
-  echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
-echo "${ECHO_T}$ac_ct_LD" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LD" >&5
+$as_echo "$ac_ct_LD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  LD=$ac_ct_LD
+  if test "x$ac_ct_LD" = x; then
+    LD=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    LD=$ac_ct_LD
+  fi
 else
   LD="$ac_cv_prog_LD"
 fi
 
 
-# Check whether --enable-monolithic or --disable-monolithic was given.
-if test "${enable_monolithic+set}" = set; then
-  enableval="$enable_monolithic"
-  MONOLITHIC=$enableval
+# Check whether --enable-monolithic was given.
+if test "${enable_monolithic+set}" = set; then :
+  enableval=$enable_monolithic;
+fi
+
+ if test ${enable_monolithic:-yes} = yes; then
+  MONOLITHIC_TRUE=
+  MONOLITHIC_FALSE='#'
 else
-  MONOLITHIC=yes
-fi;
+  MONOLITHIC_TRUE='#'
+  MONOLITHIC_FALSE=
+fi
+
 
-# Check whether --enable-amule-daemon or --disable-amule-daemon was given.
-if test "${enable_amule_daemon+set}" = set; then
-  enableval="$enable_amule_daemon"
-  AMULE_DAEMON=$enableval
+# Check whether --enable-amule-daemon was given.
+if test "${enable_amule_daemon+set}" = set; then :
+  enableval=$enable_amule_daemon;
+fi
+
+ if test ${enable_amule_daemon:-no} = yes; then
+  AMULE_DAEMON_TRUE=
+  AMULE_DAEMON_FALSE='#'
 else
-  AMULE_DAEMON=no
-fi;
+  AMULE_DAEMON_TRUE='#'
+  AMULE_DAEMON_FALSE=
+fi
+
+
+# Check whether --enable-amulecmd was given.
+if test "${enable_amulecmd+set}" = set; then :
+  enableval=$enable_amulecmd;
+fi
 
-# Check whether --enable-amulecmd or --disable-amulecmd was given.
-if test "${enable_amulecmd+set}" = set; then
-  enableval="$enable_amulecmd"
-  AMULECMD=$enableval
+ if test ${enable_amulecmd:-no} = yes; then
+  COMPILE_CMD_TRUE=
+  COMPILE_CMD_FALSE='#'
 else
-  AMULECMD=no
-fi;
+  COMPILE_CMD_TRUE='#'
+  COMPILE_CMD_FALSE=
+fi
+
+
+# Check whether --enable-webserver was given.
+if test "${enable_webserver+set}" = set; then :
+  enableval=$enable_webserver;
+fi
 
-# Check whether --enable-webserver or --disable-webserver was given.
-if test "${enable_webserver+set}" = set; then
-  enableval="$enable_webserver"
-  WEB=$enableval
+ if test ${enable_webserver:-no} = yes; then
+  WEB_TRUE=
+  WEB_FALSE='#'
 else
-  WEB=no
-fi;
+  WEB_TRUE='#'
+  WEB_FALSE=
+fi
+
 
-# Check whether --enable-amule-gui or --disable-amule-gui was given.
-if test "${enable_amule_gui+set}" = set; then
-  enableval="$enable_amule_gui"
-  AMULE_GUI=$enableval
+# Check whether --enable-amule-gui was given.
+if test "${enable_amule_gui+set}" = set; then :
+  enableval=$enable_amule_gui;
+fi
+
+ if test ${enable_amule_gui:-no} = yes; then
+  AMULE_GUI_TRUE=
+  AMULE_GUI_FALSE='#'
 else
-  AMULE_GUI=no
-fi;
+  AMULE_GUI_TRUE='#'
+  AMULE_GUI_FALSE=
+fi
+
+
+# Check whether --enable-cas was given.
+if test "${enable_cas+set}" = set; then :
+  enableval=$enable_cas;
+fi
 
-# Check whether --enable-cas or --disable-cas was given.
-if test "${enable_cas+set}" = set; then
-  enableval="$enable_cas"
-  CAS=$enableval
+ if test ${enable_cas:-no} = yes; then
+  CAS_TRUE=
+  CAS_FALSE='#'
 else
-  CAS=no
-fi;
+  CAS_TRUE='#'
+  CAS_FALSE=
+fi
 
-# Check whether --enable-wxcas or --disable-wxcas was given.
-if test "${enable_wxcas+set}" = set; then
-  enableval="$enable_wxcas"
-  WXCAS=$enableval
+
+# Check whether --enable-wxcas was given.
+if test "${enable_wxcas+set}" = set; then :
+  enableval=$enable_wxcas;
+fi
+
+ if test ${enable_wxcas:-no} = yes; then
+  WXCAS_TRUE=
+  WXCAS_FALSE='#'
 else
-  WXCAS=no
-fi;
+  WXCAS_TRUE='#'
+  WXCAS_FALSE=
+fi
+
 
-# Check whether --enable-ed2k or --disable-ed2k was given.
-if test "${enable_ed2k+set}" = set; then
-  enableval="$enable_ed2k"
-  ED2K=$enableval
+# Check whether --enable-ed2k was given.
+if test "${enable_ed2k+set}" = set; then :
+  enableval=$enable_ed2k;
+fi
+
+ if test ${enable_ed2k:-yes} = yes; then
+  ED2K_TRUE=
+  ED2K_FALSE='#'
 else
-  ED2K=yes
-fi;
+  ED2K_TRUE='#'
+  ED2K_FALSE=
+fi
+
+
+# Check whether --enable-alc was given.
+if test "${enable_alc+set}" = set; then :
+  enableval=$enable_alc;
+fi
 
-# Check whether --enable-alc or --disable-alc was given.
-if test "${enable_alc+set}" = set; then
-  enableval="$enable_alc"
-  ALC=$enableval
+ if test ${enable_alc:-no} = yes; then
+  ALC_TRUE=
+  ALC_FALSE='#'
 else
-  ALC=no
-fi;
+  ALC_TRUE='#'
+  ALC_FALSE=
+fi
+
+
+# Check whether --enable-alcc was given.
+if test "${enable_alcc+set}" = set; then :
+  enableval=$enable_alcc;
+fi
 
-# Check whether --enable-alcc or --disable-alcc was given.
-if test "${enable_alcc+set}" = set; then
-  enableval="$enable_alcc"
-  ALCC=$enableval
+ if test ${enable_alcc:-no} = yes; then
+  ALCC_TRUE=
+  ALCC_FALSE='#'
 else
-  ALCC=no
-fi;
+  ALCC_TRUE='#'
+  ALCC_FALSE=
+fi
+
 
-# Check whether --enable-monolithic or --disable-monolithic was given.
-if test "${enable_monolithic+set}" = set; then
-  enableval="$enable_monolithic"
-  MONOLITHIC=$enableval
+# Check whether --enable-xas was given.
+if test "${enable_xas+set}" = set; then :
+  enableval=$enable_xas;
+fi
+
+ if test ${enable_xas:-no} = yes; then
+  XAS_TRUE=
+  XAS_FALSE='#'
 else
-  MONOLITHIC=yes
-fi;
+  XAS_TRUE='#'
+  XAS_FALSE=
+fi
+
 
-# Check whether --enable-upnp or --disable-upnp was given.
-if test "${enable_upnp+set}" = set; then
-  enableval="$enable_upnp"
-  ENABLE_UPNP=$enableval
+# Check whether --enable-fileview was given.
+if test "${enable_fileview+set}" = set; then :
+  enableval=$enable_fileview;
+fi
+
+ if test ${enable_fileview:-no} = yes; then
+  FILEVIEW_TRUE=
+  FILEVIEW_FALSE='#'
 else
-  ENABLE_UPNP=yes
-fi;
+  FILEVIEW_TRUE='#'
+  FILEVIEW_FALSE=
+fi
+
+
+# Check whether --enable-plasmamule was given.
+if test "${enable_plasmamule+set}" = set; then :
+  enableval=$enable_plasmamule;
+fi
+
+
+
+# Run all the tests with static linkage if we want a statically linked binary
+# Check whether --enable-static was given.
+if test "${enable_static+set}" = set; then :
+  enableval=$enable_static;
+fi
+
+
+if test ${enable_static:-no} = yes; then :
+  LDFLAGS="$LDFLAGS -static"
+fi
+
+
+
+# Check whether --with-kde4-config was given.
+if test "${with_kde4_config+set}" = set; then :
+  withval=$with_kde4_config; KDE4_CONFIG=$withval
+else
+  KDE4_CONFIG=""
+fi
+
+	# Check whether --enable-kde-in-home was given.
+if test "${enable_kde_in_home+set}" = set; then :
+  enableval=$enable_kde_in_home; KDE_IN_HOME=$enableval
+else
+  KDE_IN_HOME=no
+fi
+
+
+
+
+# Check whether --with-moc was given.
+if test "${with_moc+set}" = set; then :
+  withval=$with_moc; QT_MOC=$withval
+else
+  QT_MOC=""
+fi
+
+
 
 # Default is yes, because they're most likely compatible.
 # However, this is only used when cross-compiling.
 
-# Check whether --with-gnu-malloc or --without-gnu-malloc was given.
-if test "${with_gnu_malloc+set}" = set; then
-  withval="$with_gnu_malloc"
-  gnumalloc=$withval
+# Check whether --with-gnu-malloc was given.
+if test "${with_gnu_malloc+set}" = set; then :
+  withval=$with_gnu_malloc; gnumalloc=$withval
 else
   gnumalloc=yes
-fi;
+fi
+
 
 
 # Checking for libs before all other stuff to break
@@ -5549,19 +6718,18 @@
 # to avoid losing too much time
 
 # Check for zlib
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes -o ${enable_amulecmd:-no} = yes -o ${enable_webserver:-no} = yes -o ${enable_amule_gui:-no} = yes ; then :
 
 
-# Check whether --with-zlib or --without-zlib was given.
-if test "${with_zlib+set}" = set; then
-  withval="$with_zlib"
+# Check whether --with-zlib was given.
+if test "${with_zlib+set}" = set; then :
+  withval=$with_zlib;
+fi
 
-fi;
 
 	case "${with_zlib:-yes}" in
 	no)
-		{ { echo "$as_me:$LINENO: error: zlib >= 1.1.4 is required for aMule" >&5
-echo "$as_me: error: zlib >= 1.1.4 is required for aMule" >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "zlib >= 1.1.4 is required for aMule" "$LINENO" 5
 		;;
 	yes | sys)
 		;;
@@ -5572,7 +6740,7 @@
 	mule_backup_CPPFLAGS="$CPPFLAGS"
 	mule_backup_LDFLAGS="$LDFLAGS"
 	mule_backup_LIBS="$LIBS"
-	if test -n "$zlib_prefix"; then
+	if test -n "$zlib_prefix"; then :
 
 		ZLIB_CPPFLAGS="-I$zlib_prefix/include"
 		ZLIB_LDFLAGS="-L$zlib_prefix/lib"
@@ -5585,24 +6753,19 @@
 		ZLIB_LDFLAGS=
 
 fi
-
 	ZLIB_LIBS="-lz"
 	LIBS="$ZLIB_LIBS $LIBS"
 
-	echo "$as_me:$LINENO: checking for zlib >= 1.1.4" >&5
-echo $ECHO_N "checking for zlib >= 1.1.4... $ECHO_C" >&6
-	if test "$cross_compiling" = yes; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.1.4" >&5
+$as_echo_n "checking for zlib >= 1.1.4... " >&6; }
+	if test "$cross_compiling" = yes; then :
 
 		result=no
 		z_version=
-		cat >conftest.$ac_ext <<_ACEOF
-
-			/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 				#include <zlib.h>
 				#include <stdio.h>
 
@@ -5618,28 +6781,7 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 			ZLIB_VERSION=`grep -a '^ZLIB_VERSION_START.*ZLIB_VERSION_END$' conftest$ac_exeext | sed 's/^ZLIB_VERSION_START$.*$ZLIB_VERSION_END$/\1/'`
 			cross_zver_max="`echo $ZLIB_VERSION | cut -d. -f1`"
@@ -5661,30 +6803,21 @@
 
 fi
 
-			if test ${result:-no} = yes; then
+			if test ${result:-no} = yes; then :
   z_version=" (version $ZLIB_VERSION)"
 fi
 
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:$LINENO: result: $result$z_version" >&5
-echo "${ECHO_T}$result$z_version" >&6
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result$z_version" >&5
+$as_echo "$result$z_version" >&6; }
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-
-		/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 			#include <zlib.h>
 			#include <stdio.h>
 
@@ -5712,27 +6845,16 @@
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
 
-		if test -f conftestval; then
+		if test -f conftestval; then :
   result=`cat conftestval`
 else
   result=no
 fi
+		if test ${result:-no} = yes; then :
 
-		if test ${result:-no} = yes; then
-
-			if test -f conftestver; then
+			if test -f conftestver; then :
 
 				ZLIB_VERSION=`cat conftestver`
 				z_version=" (version $ZLIB_VERSION)"
@@ -5741,59 +6863,45 @@
   z_version=
 fi
 
-
 fi
-
-		echo "$as_me:$LINENO: result: $result$z_version" >&5
-echo "${ECHO_T}$result$z_version" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result$z_version" >&5
+$as_echo "$result$z_version" >&6; }
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
 		result=no
-		echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+
 	CPPFLAGS="$mule_backup_CPPFLAGS"
 	LDFLAGS="$mule_backup_LDFLAGS"
 	LIBS="$mule_backup_LIBS"
 
-	if test ${result:-no} = no; then
+	if test ${result:-no} = no; then :
 
 		ZLIB_CPPFLAGS=
 		ZLIB_LDFLAGS=
 		ZLIB_LIBS=
-		{ { echo "$as_me:$LINENO: error: zlib >= 1.1.4 is required for aMule" >&5
-echo "$as_me: error: zlib >= 1.1.4 is required for aMule" >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error "zlib >= 1.1.4 is required for aMule" "$LINENO" 5
 
 fi
 
 
+fi
 
 
-if test x$CAS = xyes; then
-
-	# Check for gd
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5808,51 +6916,23 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -5862,18 +6942,14 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -5883,16 +6959,13 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -5912,109 +6985,40 @@
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -6022,54 +7026,54 @@
 done
 
 
+if test ${enable_cas:-no} = yes; then :
 
+	# Check for gd
 
-# Check whether --with-gdlib-prefix or --without-gdlib-prefix was given.
-if test "${with_gdlib_prefix+set}" = set; then
-  withval="$with_gdlib_prefix"
 
-fi;
+# Check whether --with-gdlib-prefix was given.
+if test "${with_gdlib_prefix+set}" = set; then :
+  withval=$with_gdlib_prefix;
+fi
 
-# Check whether --with-gdlib-config or --without-gdlib-config was given.
-if test "${with_gdlib_config+set}" = set; then
-  withval="$with_gdlib_config"
 
-fi;
+# Check whether --with-gdlib-config was given.
+if test "${with_gdlib_config+set}" = set; then :
+  withval=$with_gdlib_config;
+fi
+
 
 	GDLIB_VERSION=
 
 	# do we have gdlib-config name: it can be gdlib-config or gd-config or ...
-	if test x${GDLIB_CONFIG_NAME+set} != xset; then
+	if test x${GDLIB_CONFIG_NAME+set} != xset; then :
   GDLIB_CONFIG_NAME=gdlib-config
 fi
-
-	if test -n "$with_gdlib_config"; then
+	if test -n "$with_gdlib_config"; then :
   GDLIB_CONFIG_NAME="$with_gdlib_config"
 fi
 
-
 	# deal with optional prefix
-	if test -n "$with_gdlib_prefix"; then
+	if test -n "$with_gdlib_prefix"; then :
   GDLIB_LOOKUP_PATH="$with_gdlib_prefix/bin"
 fi
 
-
 	# don't search the PATH if GDLIB_CONFIG_NAME is absolute filename
-	if test -x "$GDLIB_CONFIG_NAME"; then
+	if test -x "$GDLIB_CONFIG_NAME"; then :
 
-		echo "$as_me:$LINENO: checking for gdlib-config" >&5
-echo $ECHO_N "checking for gdlib-config... $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdlib-config" >&5
+$as_echo_n "checking for gdlib-config... " >&6; }
 		GDLIB_CONFIG_PATH="$GDLIB_CONFIG_NAME"
-		echo "$as_me:$LINENO: result: $GDLIB_CONFIG_PATH" >&5
-echo "${ECHO_T}$GDLIB_CONFIG_PATH" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDLIB_CONFIG_PATH" >&5
+$as_echo "$GDLIB_CONFIG_PATH" >&6; }
 
 else
   # Extract the first word of "$GDLIB_CONFIG_NAME", so it can be a program name with args.
 set dummy $GDLIB_CONFIG_NAME; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_GDLIB_CONFIG_PATH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GDLIB_CONFIG_PATH+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $GDLIB_CONFIG_PATH in
   [\\/]* | ?:[\\/]*)
@@ -6082,36 +7086,36 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GDLIB_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GDLIB_CONFIG_PATH" && ac_cv_path_GDLIB_CONFIG_PATH="no"
   ;;
 esac
 fi
 GDLIB_CONFIG_PATH=$ac_cv_path_GDLIB_CONFIG_PATH
-
 if test -n "$GDLIB_CONFIG_PATH"; then
-  echo "$as_me:$LINENO: result: $GDLIB_CONFIG_PATH" >&5
-echo "${ECHO_T}$GDLIB_CONFIG_PATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDLIB_CONFIG_PATH" >&5
+$as_echo "$GDLIB_CONFIG_PATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-fi
 
+fi
 
-	if test ${GDLIB_CONFIG_PATH:-no} != no; then
+	if test ${GDLIB_CONFIG_PATH:-no} != no; then :
 
-		echo "$as_me:$LINENO: checking for gdlib version >= 2.0.0" >&5
-echo $ECHO_N "checking for gdlib version >= 2.0.0... $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdlib version >= 2.0.0" >&5
+$as_echo_n "checking for gdlib version >= 2.0.0... " >&6; }
 		GDLIB_CONFIG_WITH_ARGS="$GDLIB_CONFIG_PATH $gdlib_config_args"
 
 		GDLIB_VERSION=`$GDLIB_CONFIG_WITH_ARGS --version`
@@ -6137,182 +7141,43 @@
 fi
 
 
-		if test -z "$gdlib_ver_ok"; then
+		if test -z "$gdlib_ver_ok"; then :
 
-			if test -z "$GDLIB_VERSION"; then
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+			if test -z "$GDLIB_VERSION"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 else
 
-				echo "$as_me:$LINENO: result: no (version $GDLIB_VERSION is not new enough)" >&5
-echo "${ECHO_T}no (version $GDLIB_VERSION is not new enough)" >&6
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $GDLIB_VERSION is not new enough)" >&5
+$as_echo "no (version $GDLIB_VERSION is not new enough)" >&6; }
 				GDLIB_VERSION=
 
 fi
 
-
 else
 
-		echo "$as_me:$LINENO: result: yes (version $GDLIB_VERSION)" >&5
-echo "${ECHO_T}yes (version $GDLIB_VERSION)" >&6
-                       GDLIB_CFLAGS="`$GDLIB_CONFIG_WITH_ARGS --cflags`"
-                       GDLIB_LDFLAGS="`$GDLIB_CONFIG_WITH_ARGS --ldflags`"
-                       GDLIB_LIBS="`$GDLIB_CONFIG_WITH_ARGS --libs`"
-                       mule_backup_CFLAGS="$CFLAGS"
-                       CFLAGS="$CFLAGS $GDLIB_CFLAGS"
-                       if test "${ac_cv_header_gd_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for gd.h" >&5
-echo $ECHO_N "checking for gd.h... $ECHO_C" >&6
-if test "${ac_cv_header_gd_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_gd_h" >&5
-echo "${ECHO_T}$ac_cv_header_gd_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking gd.h usability" >&5
-echo $ECHO_N "checking gd.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <gd.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $GDLIB_VERSION)" >&5
+$as_echo "yes (version $GDLIB_VERSION)" >&6; }
+			GDLIB_CFLAGS="`$GDLIB_CONFIG_WITH_ARGS --cflags`"
+			GDLIB_LDFLAGS="`$GDLIB_CONFIG_WITH_ARGS --ldflags`"
+			GDLIB_LIBS="`$GDLIB_CONFIG_WITH_ARGS --libs`"
+			mule_backup_CFLAGS="$CFLAGS"
+			CFLAGS="$CFLAGS $GDLIB_CFLAGS"
+			ac_fn_c_check_header_mongrel "$LINENO" "gd.h" "ac_cv_header_gd_h" "$ac_includes_default"
+if test "x$ac_cv_header_gd_h" = x""yes; then :
 
-# Is the header present?
-echo "$as_me:$LINENO: checking gd.h presence" >&5
-echo $ECHO_N "checking gd.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <gd.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: gd.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: gd.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gd.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: gd.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: gd.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: gd.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gd.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: gd.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gd.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: gd.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gd.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: gd.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gd.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: gd.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: gd.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: gd.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for gd.h" >&5
-echo $ECHO_N "checking for gd.h... $ECHO_C" >&6
-if test "${ac_cv_header_gd_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_gd_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_gd_h" >&5
-echo "${ECHO_T}$ac_cv_header_gd_h" >&6
-
-fi
-if test $ac_cv_header_gd_h = yes; then
-  :
 else
   GDLIB_VERSION=
 fi
 
 
-                       CFLAGS="$mule_backup_CFLAGS"
+			CFLAGS="$mule_backup_CFLAGS"
 
 fi
 
-
 fi
 
-
-	if test -n "$GDLIB_VERSION"; then
+	if test -n "$GDLIB_VERSION"; then :
 
 		CAS_DEFS="-D__GD__"
 		GDLIB_LIBS="-lgd $GDLIB_LIBS"
@@ -6323,321 +7188,82 @@
 
 
 
+	if test -z "$CAS_DEFS"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: 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." >&5
+$as_echo "$as_me: 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." >&2;}
+_mule_warning_0=yes
+_mule_has_warnings=yes
 
-	if test -z "$CAS_DEFS"; then
-
-		{ echo "$as_me:$LINENO: 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." >&5
-echo "$as_me: 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." >&2;}
-
-fi
-
-
-else
-  GDLIB_VERSION="not_needed"
-fi
-
-
-
-if test x$WEB = xyes; then
-
-
-for ac_header in sys/types.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
 
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
+if test ${enable_webserver:-no} = yes; then :
+
+
+# Check whether --with-libpng-prefix was given.
+if test "${with_libpng_prefix+set}" = set; then :
+  withval=$with_libpng_prefix;
 fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
+# Check whether --with-libpng-config was given.
+if test "${with_libpng_config+set}" = set; then :
+  withval=$with_libpng_config;
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-	echo "$as_me:$LINENO: checking for a POSIX compliant regex library" >&5
-echo $ECHO_N "checking for a POSIX compliant regex library... $ECHO_C" >&6
-	regex_found=no
-	for REGEX_LIBS in '' -lgnurx -lregex; do
-		mule_backup_LIBS="$LIBS"
-		LIBS="$REGEX_LIBS $LIBS"
-		cat >conftest.$ac_ext <<_ACEOF
-
-			/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-				#ifdef HAVE_SYS_TYPES_H
-				#	include <sys/types.h>
-				#endif
-				#include <regex.h>
-
-int
-main ()
-{
-
-				regex_t preg;
-				regcomp(&preg, "", REG_EXTENDED);
-				regmatch_t *pmatch;
-				regexec(&preg, "", 0, pmatch, 0);
-				regfree(&preg);
-
-  ;
-  return 0;
-}
-
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-			LIBS="$mule_backup_LIBS"
-			regex_found=yes
-			break;
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-LIBS="$mule_backup_LIBS"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-	done
-	echo "$as_me:$LINENO: result: $regex_found" >&5
-echo "${ECHO_T}$regex_found" >&6
-	if test $regex_found = yes; then
-  :
-else
-  WEB=disabled
-fi
-
-
-fi
-
-if test x$WEB = xyes; then
-
-
-# Check whether --with-libpng-prefix or --without-libpng-prefix was given.
-if test "${with_libpng_prefix+set}" = set; then
-  withval="$with_libpng_prefix"
-
-fi;
-
-# Check whether --with-libpng-config or --without-libpng-config was given.
-if test "${with_libpng_config+set}" = set; then
-  withval="$with_libpng_config"
-
-fi;
 
 	LIBPNG_VERSION=
 
 	# do we have libpng-config name: it can be libpng-config or libpng12-config or ...
-	if test x${LIBPNG_CONFIG_NAME+set} != xset; then
+	if test x${LIBPNG_CONFIG_NAME+set} != xset; then :
   LIBPNG_CONFIG_NAME=libpng-config
 fi
-
-	if test -n "$with_libpng_config"; then
+	if test -n "$with_libpng_config"; then :
   LIBPNG_CONFIG_NAME="$with_libpng_config"
 fi
 
-
 	# deal with optional prefix
-	if test -n "$with_libpng_prefix"; then
+	if test -n "$with_libpng_prefix"; then :
   LIBPNG_LOOKUP_PATH="$with_libpng_prefix/bin"
 fi
 
-
 	# don't search the PATH if LIBPNG_CONFIG_NAME is absolute filename
-	if test -x "$LIBPNG_CONFIG_NAME"; then
+	if test -x "$LIBPNG_CONFIG_NAME"; then :
 
-		echo "$as_me:$LINENO: checking for libpng-config" >&5
-echo $ECHO_N "checking for libpng-config... $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng-config" >&5
+$as_echo_n "checking for libpng-config... " >&6; }
 		LIBPNG_CONFIG_PATH="$LIBPNG_CONFIG_NAME"
-		echo "$as_me:$LINENO: result: $LIBPNG_CONFIG_PATH" >&5
-echo "${ECHO_T}$LIBPNG_CONFIG_PATH" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBPNG_CONFIG_PATH" >&5
+$as_echo "$LIBPNG_CONFIG_PATH" >&6; }
 
 else
   # Extract the first word of "$LIBPNG_CONFIG_NAME", so it can be a program name with args.
 set dummy $LIBPNG_CONFIG_NAME; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_LIBPNG_CONFIG_PATH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_LIBPNG_CONFIG_PATH+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $LIBPNG_CONFIG_PATH in
   [\\/]* | ?:[\\/]*)
@@ -6650,36 +7276,36 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_LIBPNG_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_LIBPNG_CONFIG_PATH" && ac_cv_path_LIBPNG_CONFIG_PATH="no"
   ;;
 esac
 fi
 LIBPNG_CONFIG_PATH=$ac_cv_path_LIBPNG_CONFIG_PATH
-
 if test -n "$LIBPNG_CONFIG_PATH"; then
-  echo "$as_me:$LINENO: result: $LIBPNG_CONFIG_PATH" >&5
-echo "${ECHO_T}$LIBPNG_CONFIG_PATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBPNG_CONFIG_PATH" >&5
+$as_echo "$LIBPNG_CONFIG_PATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-fi
 
+fi
 
-	if test ${LIBPNG_CONFIG_PATH:-no} != no; then
+	if test ${LIBPNG_CONFIG_PATH:-no} != no; then :
 
-		echo "$as_me:$LINENO: checking for libpng version >= 1.2.0" >&5
-echo $ECHO_N "checking for libpng version >= 1.2.0... $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng version >= 1.2.0" >&5
+$as_echo_n "checking for libpng version >= 1.2.0... " >&6; }
 
 		LIBPNG_CONFIG_WITH_ARGS="$LIBPNG_CONFIG_PATH $libpng_config_args"
 
@@ -6706,537 +7332,174 @@
 fi
 
 
-		if test -z "$libpng_ver_ok"; then
+		if test -z "$libpng_ver_ok"; then :
 
-			if test -z "$LIBPNG_VERSION"; then
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+			if test -z "$LIBPNG_VERSION"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 else
 
-				echo "$as_me:$LINENO: result: no (version $LIBPNG_VERSION is not new enough)" >&5
-echo "${ECHO_T}no (version $LIBPNG_VERSION is not new enough)" >&6
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $LIBPNG_VERSION is not new enough)" >&5
+$as_echo "no (version $LIBPNG_VERSION is not new enough)" >&6; }
 				LIBPNG_VERSION=
 
 fi
 
-
 else
 
 			LIBPNG_LIBS=`$LIBPNG_CONFIG_WITH_ARGS --libs`
 			LIBPNG_LDFLAGS=`$LIBPNG_CONFIG_WITH_ARGS --ldflags | sed -e "s/ *${LIBPNG_LIBS}$//"`
 			LIBPNG_CFLAGS=`$LIBPNG_CONFIG_WITH_ARGS --cflags`
-			echo "$as_me:$LINENO: result: yes (version $LIBPNG_VERSION)" >&5
-echo "${ECHO_T}yes (version $LIBPNG_VERSION)" >&6
-
-fi
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $LIBPNG_VERSION)" >&5
+$as_echo "yes (version $LIBPNG_VERSION)" >&6; }
 
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libpng is usable" >&5
+$as_echo_n "checking if libpng is usable... " >&6; }
 
-else
+			SAVED_CFLAGS=$CFLAGS
+			SAVED_LDFLAGS=$LDFLAGS
+			SAVED_LIBS=$LIBS
 
-		# Try hard to find a usable libpng
-		# Some RedHat RPMs miss libpng-config, so test for
-		# the usability with default options.
-		echo "$as_me:$LINENO: checking for libpng >= 1.2.0" >&5
-echo $ECHO_N "checking for libpng >= 1.2.0... $ECHO_C" >&6
-		mule_backup_LIBS="$LIBS"
-		LIBS="-lpng -lz -lm $LIBS"
-		if test "$cross_compiling" = yes; then
+			CFLAGS+=" $LIBPNG_CFLAGS"
+			LDFLAGS+=" $LIBPNG_LDFLAGS"
+			LIBS+=" $LIBPNG_LIBS"
 
-			echo "$as_me:$LINENO: result: cross-compilation detected, checking only the header" >&5
-echo "${ECHO_T}cross-compilation detected, checking only the header" >&6
-			if test "${ac_cv_header_png_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for png.h" >&5
-echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-if test "${ac_cv_header_png_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking png.h usability" >&5
-echo $ECHO_N "checking png.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
-#include <png.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
 
-# Is the header present?
-echo "$as_me:$LINENO: checking png.h presence" >&5
-echo $ECHO_N "checking png.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <png.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: png.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: png.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: png.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: png.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for png.h" >&5
-echo $ECHO_N "checking for png.h... $ECHO_C" >&6
-if test "${ac_cv_header_png_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_png_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5
-echo "${ECHO_T}$ac_cv_header_png_h" >&6
-
-fi
-if test $ac_cv_header_png_h = yes; then
-
-				LIBPNG_VERSION="detected"
-				LIBPNG_LIBS="-lpng -lz -lm"
-
-fi
-
-
-
-else
-  cat >conftest.$ac_ext <<_ACEOF
-
-			/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-				#include <png.h>
-				#include <stdio.h>
-
-				/* Check linking to png library */
-				void dummy() {
-					png_check_sig(NULL, 0);
-				}
+					#include <png.h>
+					#include <stdio.h>
 
 int
 main ()
 {
-				/* png.h defines PNG_LIBPNG_VER=xyyzz */
-				FILE *f=fopen("conftestval", "w");
-				if (!f) exit(1);
-				fprintf(f, "%s", (PNG_LIBPNG_VER >= 1 * 10000 + 2 * 100 + 0) ? "yes" : "no");
-				fclose(f);
-				f=fopen("conftestver", "w");
-				if (!f) exit(0);
-				fprintf(f, "%s", PNG_LIBPNG_VER_STRING);
-				fclose(f);
-				exit(0);
+
+					png_uint_32 libpng_vn = png_access_version_number();
+					printf("\nlibpng version %i\n\n", libpng_vn);
 
   ;
   return 0;
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-			if test -f conftestval; then
-  result=`cat conftestval`
-else
-  result=no
-fi
-
-			if test ${result:-no} = yes; then
-
-				if test -f conftestver; then
+if ac_fn_c_try_link "$LINENO"; then :
 
-					LIBPNG_VERSION=`cat conftestver`
-					lib_version=" (version $LIBPNG_VERSION)"
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
 
-					lib_version=
-					LIBPNG_VERSION="detected"
-
-fi
-
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no (failed to compile and link test program)" >&5
+$as_echo "no (failed to compile and link test program)" >&6; }
+				LIBPNG_LIBS=
+				LIBPNG_LDFLAGS=
+				LIBPNG_CFLAGS=
+				LIBPNG_VERSION=
 
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
-			echo "$as_me:$LINENO: result: $result$lib_version" >&5
-echo "${ECHO_T}$result$lib_version" >&6
-			LIBPNG_LIBS="-lpng -lz -lm"
+			CFLAGS=$SAVED_CFLAGS
+			LDFLAGS=$SAVED_LDFLAGS
+			LIBS=$SAVED_LIBS
 
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-
-			result=no
-			echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6
-
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
-		LIBS="$mule_backup_LIBS"
 
 fi
 
-
-	if test -n "$LIBPNG_VERSION"; then
+	if test -n "$LIBPNG_VERSION"; then :
   AMULEWEB_DEFS="-DWITH_LIBPNG"
 else
-  { echo "$as_me:$LINENO: WARNING: libpng-devel >= 1.2.0 is needed for amuleweb" >&5
-echo "$as_me: WARNING: libpng-devel >= 1.2.0 is needed for amuleweb" >&2;}
-fi
 
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+        libpng >= 1.2.0 not found.
+        amuleweb will be compiled but file download progress bar images will
+        NOT be generated." >&5
+$as_echo "$as_me: WARNING:
+        libpng >= 1.2.0 not found.
+        amuleweb will be compiled but file download progress bar images will
+        NOT be generated." >&2;}
+_mule_warning_1=yes
+_mule_has_warnings=yes
 
 
-
-else
-  LIBPNG_VERSION="not_needed"
 fi
 
 
 
-# Check for perl File::Copy
-echo "$as_me:$LINENO: checking for File::Copy" >&5
-echo $ECHO_N "checking for File::Copy... $ECHO_C" >&6
-if perl -e "require File::Copy" 2>/dev/null; then
-  echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
-else
-  { { echo "$as_me:$LINENO: error: File::Copy perl module is required" >&5
-echo "$as_me: error: File::Copy perl module is required" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
 
-
-# Check if we need the GUI
-echo "$as_me:$LINENO: checking whether we need the GUI" >&5
-echo $ECHO_N "checking whether we need the GUI... $ECHO_C" >&6
-if test x$MONOLITHIC = xyes; then
-  need_gui=yes
 fi
 
-if test x$WXCAS = xyes; then
-  need_gui=yes
-fi
-
-if test x$ALC = xyes; then
-  need_gui=yes
-fi
-
-if test x$AMULE_GUI = xyes; then
-  need_gui=yes
-fi
+# Check for perl File::Copy
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for File::Copy" >&5
+$as_echo_n "checking for File::Copy... " >&6; }
+if perl -e "require File::Copy" 2>/dev/null; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: 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." >&5
+$as_echo "$as_me: 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." >&2;}
+_mule_warning_2=yes
+_mule_has_warnings=yes
 
-if test x${need_gui:+set} != xset; then
-  need_gui=no
 fi
 
-echo "$as_me:$LINENO: result: $need_gui" >&5
-echo "${ECHO_T}$need_gui" >&6
-
 # Check if we need to install skins
-if test x$MONOLITHIC = xyes; then
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_gui:-no} = yes ; then :
   INSTALL_SKINS=yes
-fi
-
-if test x$AMULE_GUI = xyes; then
-  INSTALL_SKINS=yes
-fi
-
-if test x${INSTALL_SKINS:+set} != xset; then
+else
   INSTALL_SKINS=no
 fi
 
-
 # Check for GeoIP (required for IP2Country capability)
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_gui:-no} = yes ; then :
 
-	# Check whether --enable-geoip or --disable-geoip was given.
-if test "${enable_geoip+set}" = set; then
-  enableval="$enable_geoip"
-  ENABLE_IP2COUNTRY=$enableval
-else
-  ENABLE_IP2COUNTRY=no
-fi;
+	# Check whether --enable-geoip was given.
+if test "${enable_geoip+set}" = set; then :
+  enableval=$enable_geoip;
+fi
 
-	if test ${ENABLE_IP2COUNTRY:-no} = yes; then
 
 
-# Check whether --with-geoip-headers or --without-geoip-headers was given.
-if test "${with_geoip_headers+set}" = set; then
-  withval="$with_geoip_headers"
-  GEOIP_CPPFLAGS="-I$withval"
-fi;
+	if test ${enable_geoip:-no} = yes; then :
 
-# Check whether --with-geoip-lib or --without-geoip-lib was given.
-if test "${with_geoip_lib+set}" = set; then
-  withval="$with_geoip_lib"
-  GEOIP_LDFLAGS="-L$withval"
-fi;
 
-		mule_backup_CPPFLAGS="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $GEOIP_CPPFLAGS"
-		mule_backup_LDFLAGS="$LDFLAGS"
-		LDFLAGS="$LDFLAGS $GEOIP_LDFLAGS"
-
-		if test "${ac_cv_header_GeoIP_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for GeoIP.h" >&5
-echo $ECHO_N "checking for GeoIP.h... $ECHO_C" >&6
-if test "${ac_cv_header_GeoIP_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --with-geoip-headers was given.
+if test "${with_geoip_headers+set}" = set; then :
+  withval=$with_geoip_headers; GEOIP_CPPFLAGS="-I$withval"
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_GeoIP_h" >&5
-echo "${ECHO_T}$ac_cv_header_GeoIP_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking GeoIP.h usability" >&5
-echo $ECHO_N "checking GeoIP.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <GeoIP.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
 
-# Is the header present?
-echo "$as_me:$LINENO: checking GeoIP.h presence" >&5
-echo $ECHO_N "checking GeoIP.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <GeoIP.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
+# Check whether --with-geoip-lib was given.
+if test "${with_geoip_lib+set}" = set; then :
+  withval=$with_geoip_lib; GEOIP_LDFLAGS="-L$withval"
 fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: GeoIP.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: GeoIP.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GeoIP.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: GeoIP.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: GeoIP.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: GeoIP.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GeoIP.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: GeoIP.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GeoIP.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: GeoIP.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GeoIP.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: GeoIP.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GeoIP.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: GeoIP.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: GeoIP.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: GeoIP.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for GeoIP.h" >&5
-echo $ECHO_N "checking for GeoIP.h... $ECHO_C" >&6
-if test "${ac_cv_header_GeoIP_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_GeoIP_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_GeoIP_h" >&5
-echo "${ECHO_T}$ac_cv_header_GeoIP_h" >&6
+		mule_backup_CPPFLAGS="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $GEOIP_CPPFLAGS"
+		mule_backup_LDFLAGS="$LDFLAGS"
+		LDFLAGS="$LDFLAGS $GEOIP_LDFLAGS"
 
-fi
-if test $ac_cv_header_GeoIP_h = yes; then
+		ac_fn_c_check_header_mongrel "$LINENO" "GeoIP.h" "ac_cv_header_GeoIP_h" "$ac_includes_default"
+if test "x$ac_cv_header_GeoIP_h" = x""yes; then :
 
-			if test x$SYS = xwin32; then
+			if test x$SYS = xwin32; then :
 
-				echo "$as_me:$LINENO: checking for WinSock library needed by GeoIP" >&5
-echo $ECHO_N "checking for WinSock library needed by GeoIP... $ECHO_C" >&6
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WinSock library needed by GeoIP" >&5
+$as_echo_n "checking for WinSock library needed by GeoIP... " >&6; }
 				# Actually, we might not need any if GeoIP is linked as a .dll
 				# - but that's even harder to check for
-				cat >conftest.$ac_ext <<_ACEOF
-
-					/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 						#include <GeoIP.h>
 						#ifdef _WINSOCK2_H
 							I do know it's not the best approach, but at least works with MinGW stock headers.
@@ -7252,139 +7515,78 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
 
 					GEOIP_WINSOCK_LIB="-lwsock32"
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
 					GEOIP_WINSOCK_LIB="-lws2_32"
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-				echo "$as_me:$LINENO: result: $GEOIP_WINSOCK_LIB" >&5
-echo "${ECHO_T}$GEOIP_WINSOCK_LIB" >&6
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GEOIP_WINSOCK_LIB" >&5
+$as_echo "$GEOIP_WINSOCK_LIB" >&6; }
 
 fi
-
-			echo "$as_me:$LINENO: checking for GeoIP_open in -lGeoIP" >&5
-echo $ECHO_N "checking for GeoIP_open in -lGeoIP... $ECHO_C" >&6
-if test "${ac_cv_lib_GeoIP_GeoIP_open+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GeoIP_open in -lGeoIP" >&5
+$as_echo_n "checking for GeoIP_open in -lGeoIP... " >&6; }
+if test "${ac_cv_lib_GeoIP_GeoIP_open+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lGeoIP ${GEOIP_WINSOCK_LIB:-} $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char GeoIP_open ();
 int
 main ()
 {
-GeoIP_open ();
+return GeoIP_open ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_GeoIP_GeoIP_open=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_GeoIP_GeoIP_open=no
+  ac_cv_lib_GeoIP_GeoIP_open=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_GeoIP_GeoIP_open" >&5
-echo "${ECHO_T}$ac_cv_lib_GeoIP_GeoIP_open" >&6
-if test $ac_cv_lib_GeoIP_GeoIP_open = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GeoIP_GeoIP_open" >&5
+$as_echo "$ac_cv_lib_GeoIP_GeoIP_open" >&6; }
+if test "x$ac_cv_lib_GeoIP_GeoIP_open" = x""yes; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define SUPPORT_GEOIP 1
-_ACEOF
+$as_echo "#define SUPPORT_GEOIP 1" >>confdefs.h
 
 				GEOIP_LIBS="-lGeoIP"
-				if test x$SYS = xwin32; then
+				if test x$SYS = xwin32; then :
   GEOIP_LIBS="$GEOIP_LIBS $GEOIP_WINSOCK_LIB"
 fi
-
 				GEOIP_CPPFLAGS="$GEOIP_CPPFLAGS -DENABLE_IP2COUNTRY=1"
 
-# Check whether --with-geoip-static or --without-geoip-static was given.
-if test "${with_geoip_static+set}" = set; then
-  withval="$with_geoip_static"
-
-					if test "$withval" != "no" -a ${enable_static:-no} = no; then
+# Check whether --with-geoip-static was given.
+if test "${with_geoip_static+set}" = set; then :
+  withval=$with_geoip_static;
+					if test "$withval" != "no" -a ${enable_static:-no} = no; then :
 
 						mule_backup_LIBS="$LIBS"
 						LIBS="-Wl,-Bstatic $GEOIP_LIBS -Wl,-Bdynamic $LIBS"
-						cat >conftest.$ac_ext <<_ACEOF
-
-							/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+						cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 								#include <GeoIP.h>
 
 int
@@ -7398,63 +7600,60 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 							GEOIP_LIBS="-Wl,-Bstatic $GEOIP_LIBS -Wl,-Bdynamic"
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
+							{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+        Cannot link GeoIP statically, because your linker ($LD) does not
+        support it." >&5
+$as_echo "$as_me: WARNING:
+        Cannot link GeoIP statically, because your linker ($LD) does not
+        support it." >&2;}
+_mule_warning_3=yes
+_mule_has_warnings=yes
 
-							{ echo "$as_me:$LINENO: WARNING: Cannot link GeoIP statically, because your linker ($LD) does not support it." >&5
-echo "$as_me: WARNING: Cannot link GeoIP statically, because your linker ($LD) does not support it." >&2;}
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 						LIBS="$mule_backup_LIBS"
 
 fi
 
+fi
 
-fi;
 
 else
 
-				ENABLE_IP2COUNTRY=disabled
-				{ echo "$as_me:$LINENO: WARNING: GeoIP support has been disabled because the GeoIP libraries were not found" >&5
-echo "$as_me: WARNING: GeoIP support has been disabled because the GeoIP libraries were not found" >&2;}
+				enable_geoip=disabled
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+        GeoIP support has been disabled because the GeoIP libraries were not
+        found" >&5
+$as_echo "$as_me: WARNING:
+        GeoIP support has been disabled because the GeoIP libraries were not
+        found" >&2;}
+_mule_warning_4=yes
+_mule_has_warnings=yes
+
 
 fi
 
 
 else
 
-			ENABLE_IP2COUNTRY=disabled
-			{ echo "$as_me:$LINENO: WARNING: GeoIP support has been disabled because the GeoIP header files were not found" >&5
-echo "$as_me: WARNING: GeoIP support has been disabled because the GeoIP header files were not found" >&2;}
+			enable_geoip=disabled
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+        GeoIP support has been disabled because the GeoIP header files were
+        not found" >&5
+$as_echo "$as_me: WARNING:
+        GeoIP support has been disabled because the GeoIP header files were
+        not found" >&2;}
+_mule_warning_5=yes
+_mule_has_warnings=yes
+
 
 fi
 
@@ -7465,39 +7664,39 @@
 
 fi
 
-
+fi
 
 # Check for wx
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes -o ${enable_amule_gui:-no} = yes -o ${enable_amulecmd:-no} = yes -o ${enable_webserver:-no} = yes -o ${enable_alc:-no} = yes -o ${enable_alcc:-no} = yes -o ${enable_wxcas:-no} = yes -o ${enable_fileview:-no} = yes ; then :
 
 
-# Check whether --with-wxdir or --without-wxdir was given.
-if test "${with_wxdir+set}" = set; then
-  withval="$with_wxdir"
-   wx_config_name="$withval/wx-config"
+# Check whether --with-wxdir was given.
+if test "${with_wxdir+set}" = set; then :
+  withval=$with_wxdir;  wx_config_name="$withval/wx-config"
                   wx_config_args="--inplace"
-fi;
+fi
 
-# Check whether --with-wx-config or --without-wx-config was given.
-if test "${with_wx_config+set}" = set; then
-  withval="$with_wx_config"
-  wx_config_name="$withval"
-fi;
 
-# Check whether --with-wx-prefix or --without-wx-prefix was given.
-if test "${with_wx_prefix+set}" = set; then
-  withval="$with_wx_prefix"
-  wx_config_prefix="$withval"
+# Check whether --with-wx-config was given.
+if test "${with_wx_config+set}" = set; then :
+  withval=$with_wx_config; wx_config_name="$withval"
+fi
+
+
+# Check whether --with-wx-prefix was given.
+if test "${with_wx_prefix+set}" = set; then :
+  withval=$with_wx_prefix; wx_config_prefix="$withval"
 else
   wx_config_prefix=""
-fi;
+fi
 
-# Check whether --with-wx-exec-prefix or --without-wx-exec-prefix was given.
-if test "${with_wx_exec_prefix+set}" = set; then
-  withval="$with_wx_exec_prefix"
-  wx_config_exec_prefix="$withval"
+
+# Check whether --with-wx-exec-prefix was given.
+if test "${with_wx_exec_prefix+set}" = set; then :
+  withval=$with_wx_exec_prefix; wx_config_exec_prefix="$withval"
 else
   wx_config_exec_prefix=""
-fi;
+fi
 
 
 
@@ -7510,19 +7709,20 @@
 
 
 
-# Check whether --with-toolkit or --without-toolkit was given.
-if test "${with_toolkit+set}" = set; then
-  withval="$with_toolkit"
 
+# Check whether --with-toolkit was given.
+if test "${with_toolkit+set}" = set; then :
+  withval=$with_toolkit;
 else
   withval="auto"
-fi;
+fi
+
 
-                                echo "$as_me:$LINENO: checking for the --with-toolkit option" >&5
-echo $ECHO_N "checking for the --with-toolkit option... $ECHO_C" >&6
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the --with-toolkit option" >&5
+$as_echo_n "checking for the --with-toolkit option... " >&6; }
                 if test "$withval" = "auto" ; then
-                    echo "$as_me:$LINENO: result: will be automatically detected" >&5
-echo "${ECHO_T}will be automatically detected" >&6
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: will be automatically detected" >&5
+$as_echo "will be automatically detected" >&6; }
                     TOOLKIT="auto"
                 else
                     TOOLKIT="$withval"
@@ -7531,111 +7731,100 @@
                             "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
                             "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
                             "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" -a \
-                            "$TOOLKIT" != "base" ; then
-                        { { echo "$as_me:$LINENO: error:
-    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb, base)
-                        " >&5
-echo "$as_me: error:
-    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb, base)
-                        " >&2;}
-   { (exit 1); exit 1; }; }
+                            "$TOOLKIT" != "base" -a "$TOOLKIT" != "cocoa" -a \
+                            "$TOOLKIT" != "osx_cocoa"; then
+                        as_fn_error "
+    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb, base, cocoa, osx_cocoa)
+                        " "$LINENO" 5
                     fi
 
-                    echo "$as_me:$LINENO: result: $TOOLKIT" >&5
-echo "${ECHO_T}$TOOLKIT" >&6
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOOLKIT" >&5
+$as_echo "$TOOLKIT" >&6; }
                 fi
 
 
 
 
 
-# Check whether --with-wxshared or --without-wxshared was given.
-if test "${with_wxshared+set}" = set; then
-  withval="$with_wxshared"
-
+# Check whether --with-wxshared was given.
+if test "${with_wxshared+set}" = set; then :
+  withval=$with_wxshared;
 else
   withval="auto"
-fi;
+fi
+
 
-                        echo "$as_me:$LINENO: checking for the --with-wxshared option" >&5
-echo $ECHO_N "checking for the --with-wxshared option... $ECHO_C" >&6
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the --with-wxshared option" >&5
+$as_echo_n "checking for the --with-wxshared option... " >&6; }
             if test "$withval" = "yes" ; then
-                echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
                 WX_SHARED=1
 
                                     elif test "1" = "1" -a "$withval" = "no" ; then
-                echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
                 WX_SHARED=0
             elif test "$withval" = "auto" ; then
-                echo "$as_me:$LINENO: result: will be automatically detected" >&5
-echo "${ECHO_T}will be automatically detected" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: will be automatically detected" >&5
+$as_echo "will be automatically detected" >&6; }
                 WX_SHARED="auto"
             else
-                { { echo "$as_me:$LINENO: error:
-    Unrecognized option value (allowed values: yes, auto)
-                " >&5
-echo "$as_me: error:
+                as_fn_error "
     Unrecognized option value (allowed values: yes, auto)
-                " >&2;}
-   { (exit 1); exit 1; }; }
+                " "$LINENO" 5
             fi
 
 
 
 
 
-# Check whether --with-wxdebug or --without-wxdebug was given.
-if test "${with_wxdebug+set}" = set; then
-  withval="$with_wxdebug"
-
+# Check whether --with-wxdebug was given.
+if test "${with_wxdebug+set}" = set; then :
+  withval=$with_wxdebug;
 else
   withval="auto"
-fi;
+fi
 
-                        echo "$as_me:$LINENO: checking for the --with-wxdebug option" >&5
-echo $ECHO_N "checking for the --with-wxdebug option... $ECHO_C" >&6
+
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the --with-wxdebug option" >&5
+$as_echo_n "checking for the --with-wxdebug option... " >&6; }
             if test "$withval" = "yes" ; then
-                echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
                 WX_DEBUG=1
 
                                     elif test "1" = "1" -a "$withval" = "no" ; then
-                echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
                 WX_DEBUG=0
             elif test "$withval" = "auto" ; then
-                echo "$as_me:$LINENO: result: will be automatically detected" >&5
-echo "${ECHO_T}will be automatically detected" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: will be automatically detected" >&5
+$as_echo "will be automatically detected" >&6; }
                 WX_DEBUG="auto"
             else
-                { { echo "$as_me:$LINENO: error:
-    Unrecognized option value (allowed values: yes, auto)
-                " >&5
-echo "$as_me: error:
+                as_fn_error "
     Unrecognized option value (allowed values: yes, auto)
-                " >&2;}
-   { (exit 1); exit 1; }; }
+                " "$LINENO" 5
             fi
 
 
 
 
 
-# Check whether --with-wxversion or --without-wxversion was given.
-if test "${with_wxversion+set}" = set; then
-  withval="$with_wxversion"
-
+# Check whether --with-wxversion was given.
+if test "${with_wxversion+set}" = set; then :
+  withval=$with_wxversion;
 else
   withval="auto"
-fi;
+fi
 
-                                echo "$as_me:$LINENO: checking for the --with-wxversion option" >&5
-echo $ECHO_N "checking for the --with-wxversion option... $ECHO_C" >&6
+
+                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the --with-wxversion option" >&5
+$as_echo_n "checking for the --with-wxversion option... " >&6; }
                 if test "$withval" = "auto" ; then
-                    echo "$as_me:$LINENO: result: will be automatically detected" >&5
-echo "${ECHO_T}will be automatically detected" >&6
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: will be automatically detected" >&5
+$as_echo "will be automatically detected" >&6; }
                     WX_VERSION="auto"
                 else
 
@@ -7646,18 +7835,14 @@
 
                                         if test "${#wx_requested_major_version}" != "1" -o \
                             "${#wx_requested_minor_version}" != "1" ; then
-                        { { echo "$as_me:$LINENO: error:
-    Unrecognized option value (allowed values: auto, 2.6, 2.7, 2.8, 2.9)
-                        " >&5
-echo "$as_me: error:
-    Unrecognized option value (allowed values: auto, 2.6, 2.7, 2.8, 2.9)
-                        " >&2;}
-   { (exit 1); exit 1; }; }
+                        as_fn_error "
+    Unrecognized option value (allowed values: auto, 2.8, 2.9)
+                        " "$LINENO" 5
                     fi
 
                     WX_VERSION="$wx_requested_major_version"".""$wx_requested_minor_version"
-                    echo "$as_me:$LINENO: result: $WX_VERSION" >&5
-echo "${ECHO_T}$WX_VERSION" >&6
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_VERSION" >&5
+$as_echo "$WX_VERSION" >&6; }
                 fi
 
 
@@ -7669,14 +7854,15 @@
             echo "[dbg] VERSION: $VERSION, WX_VERSION: $WX_VERSION"
         fi
 
-# Force using a static wxWidgets library if the executable is to be linked statically.
-if test ${enable_static:-no} = yes; then
+	# Force using a static wxWidgets library if the executable is to be linked statically.
+	if test ${enable_static:-no} = yes; then :
   WX_SHARED=0
 fi
-
-# Force using a unicode build of the library
-WX_UNICODE=1
-DEBUG=$WX_DEBUG
+	# Force using a unicode build of the library
+	if test ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes -o ${enable_amule_gui:-no} = yes -o ${enable_amulecmd:-no} = yes -o ${enable_webserver:-no} = yes -o ${enable_fileview:-no} = yes ; then :
+  WX_UNICODE=1
+fi
+	DEBUG=$WX_DEBUG
 
         if test "$WX_SHARED" = "1" ; then
             WXCONFIG_FLAGS="--static=no "
@@ -7732,18 +7918,18 @@
   fi
 
     if test -x "$WX_CONFIG_NAME" ; then
-     echo "$as_me:$LINENO: checking for wx-config" >&5
-echo $ECHO_N "checking for wx-config... $ECHO_C" >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wx-config" >&5
+$as_echo_n "checking for wx-config... " >&6; }
      WX_CONFIG_PATH="$WX_CONFIG_NAME"
-     echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5
-echo "${ECHO_T}$WX_CONFIG_PATH" >&6
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5
+$as_echo "$WX_CONFIG_PATH" >&6; }
   else
      # Extract the first word of "$WX_CONFIG_NAME", so it can be a program name with args.
 set dummy $WX_CONFIG_NAME; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $WX_CONFIG_PATH in
   [\\/]* | ?:[\\/]*)
@@ -7756,41 +7942,42 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_WX_CONFIG_PATH" && ac_cv_path_WX_CONFIG_PATH="no"
   ;;
 esac
 fi
 WX_CONFIG_PATH=$ac_cv_path_WX_CONFIG_PATH
-
 if test -n "$WX_CONFIG_PATH"; then
-  echo "$as_me:$LINENO: result: $WX_CONFIG_PATH" >&5
-echo "${ECHO_T}$WX_CONFIG_PATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_CONFIG_PATH" >&5
+$as_echo "$WX_CONFIG_PATH" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   fi
 
   if test "$WX_CONFIG_PATH" != "no" ; then
     WX_VERSION_FULL=""
 
-    min_wx_version=2.8.0
+    min_wx_version=2.8.12
     if test -z "$WXCONFIG_FLAGS" ; then
-      echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version" >&5
-echo $ECHO_N "checking for wxWidgets version >= $min_wx_version... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version" >&5
+$as_echo_n "checking for wxWidgets version >= $min_wx_version... " >&6; }
     else
-      echo "$as_me:$LINENO: checking for wxWidgets version >= $min_wx_version ($WXCONFIG_FLAGS)" >&5
-echo $ECHO_N "checking for wxWidgets version >= $min_wx_version ($WXCONFIG_FLAGS)... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets version >= $min_wx_version ($WXCONFIG_FLAGS)" >&5
+$as_echo_n "checking for wxWidgets version >= $min_wx_version ($WXCONFIG_FLAGS)... " >&6; }
     fi
 
     WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $WXCONFIG_FLAGS "
@@ -7833,87 +8020,35 @@
 
     if test -n "$wx_ver_ok"; then
 
-      echo "$as_me:$LINENO: result: yes (version $WX_VERSION_FULL)" >&5
-echo "${ECHO_T}yes (version $WX_VERSION_FULL)" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION_FULL)" >&5
+$as_echo "yes (version $WX_VERSION_FULL)" >&6; }
       WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
 
-                              echo "$as_me:$LINENO: checking for wxWidgets static library" >&5
-echo $ECHO_N "checking for wxWidgets static library... $ECHO_C" >&6
-      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
-      if test "x$WX_LIBS_STATIC" = "x"; then
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-      else
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-      fi
-
-            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
-
-            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
-                  WX_RESCOMP=
-      else
-         WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
-      fi
-
-      if test "x$wx_has_cppflags" = x ; then
-                  WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
-         WX_CPPFLAGS=$WX_CFLAGS
-         WX_CXXFLAGS=$WX_CFLAGS
+      WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
 
-         WX_CFLAGS_ONLY=$WX_CFLAGS
-         WX_CXXFLAGS_ONLY=$WX_CFLAGS
-      else
-                  WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
-         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
-         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --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=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
-         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
-      fi
+      WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
+      WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
 
       wxWin=1
 
     else
 
        if test "x$WX_VERSION_FULL" = x; then
-                    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
        else
-          echo "$as_me:$LINENO: result: no (version $WX_VERSION_FULL is not new enough)" >&5
-echo "${ECHO_T}no (version $WX_VERSION_FULL is not new enough)" >&6
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (version $WX_VERSION_FULL is not new enough)" >&5
+$as_echo "no (version $WX_VERSION_FULL is not new enough)" >&6; }
        fi
 
        WX_CFLAGS=""
        WX_CPPFLAGS=""
        WX_CXXFLAGS=""
        WX_LIBS=""
-       WX_LIBS_STATIC=""
        WX_RESCOMP=""
 
        if test ! -z "$WXCONFIG_FLAGS"; then
@@ -7938,11 +8073,9 @@
     If you still get this error, then check that 'wx-config' is
     in path, 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.0 or above."
+    or equivalent variable and wxWidgets version is 2.8.12 or above."
 
-       { { echo "$as_me:$LINENO: error: $wx_error_message" >&5
-echo "$as_me: error: $wx_error_message" >&2;}
-   { (exit 1); exit 1; }; }
+       as_fn_error "$wx_error_message" "$LINENO" 5
 
     fi
   else
@@ -7951,7 +8084,6 @@
     WX_CPPFLAGS=""
     WX_CXXFLAGS=""
     WX_LIBS=""
-    WX_LIBS_STATIC=""
     WX_RESCOMP=""
 
     :
@@ -7967,47 +8099,31 @@
 
 
 
-
       WX_VERSION_MAJOR="$wx_config_major_version"
   WX_VERSION_MINOR="$wx_config_minor_version"
 
 
 
-if test "$wxWin" != 1; then
-	{ { echo "$as_me:$LINENO: 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.0 or above.
-	" >&5
-echo "$as_me: error:
+	if test "$wxWin" != 1; then :
+  as_fn_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.0 or above.
-	" >&2;}
-   { (exit 1); exit 1; }; }
+		equivalent variable and wxWidgets version is 2.8.12 or above.
+		" "$LINENO" 5
+
 fi
+	if test "${WX_VERSION_FULL}" = "2.9.0"; then :
+  as_fn_error "
+		This version of wxWidgets is known to not work with aMule.
+		Please upgrade to a newer version.
+		" "$LINENO" 5
 
-        WX_VERSION="$WX_VERSION_MAJOR""$WX_VERSION_MINOR"
-        if test $WX_VERSION -lt 26 ; then
+fi
 
-            { { echo "$as_me:$LINENO: error:
-    Cannot detect the wxWidgets configuration for the selected wxWidgets build
-    since its version is $WX_VERSION_FULL < 2.6.0; please install a newer
-    version of wxWidgets.
-                         " >&5
-echo "$as_me: error:
-    Cannot detect the wxWidgets configuration for the selected wxWidgets build
-    since its version is $WX_VERSION_FULL < 2.6.0; please install a newer
-    version of wxWidgets.
-                         " >&2;}
-   { (exit 1); exit 1; }; }
-        fi
+        WX_VERSION="$WX_VERSION_MAJOR""$WX_VERSION_MINOR"
 
                         WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config)
 
@@ -8028,20 +8144,20 @@
 
         if test "$UNICODE" = "auto" ; then
 
-                                    echo "$as_me:$LINENO: checking if wxWidgets was built with UNICODE enabled" >&5
-echo $ECHO_N "checking if wxWidgets was built with UNICODE enabled... $ECHO_C" >&6
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if wxWidgets was built with UNICODE enabled" >&5
+$as_echo_n "checking if wxWidgets was built with UNICODE enabled... " >&6; }
 
                                                             WX_UNICODE=$(expr "$WX_SELECTEDCONFIG" : ".*unicode.*")
 
             if test "$WX_UNICODE" != "0"; then
                 WX_UNICODE=1
-                echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
                 :
             else
                 WX_UNICODE=0
-                echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
                 :
             fi
         else
@@ -8052,20 +8168,20 @@
 
         if test "$DEBUG" = "auto" ; then
 
-                                    echo "$as_me:$LINENO: checking if wxWidgets was built in DEBUG mode" >&5
-echo $ECHO_N "checking if wxWidgets was built in DEBUG mode... $ECHO_C" >&6
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if wxWidgets was built in DEBUG mode" >&5
+$as_echo_n "checking if wxWidgets was built in DEBUG mode... " >&6; }
 
                                                             WX_DEBUG=$(expr "$WX_SELECTEDCONFIG" : ".*debug.*")
 
             if test "$WX_DEBUG" != "0"; then
                 WX_DEBUG=1
-                echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
                 :
             else
                 WX_DEBUG=0
-                echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
                 :
             fi
         else
@@ -8076,20 +8192,20 @@
 
         if test "$STATIC" = "auto" ; then
 
-                                    echo "$as_me:$LINENO: checking if wxWidgets was built in STATIC mode" >&5
-echo $ECHO_N "checking if wxWidgets was built in STATIC mode... $ECHO_C" >&6
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if wxWidgets was built in STATIC mode" >&5
+$as_echo_n "checking if wxWidgets was built in STATIC mode... " >&6; }
 
                                                             WX_STATIC=$(expr "$WX_SELECTEDCONFIG" : ".*static.*")
 
             if test "$WX_STATIC" != "0"; then
                 WX_STATIC=1
-                echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
                 :
             else
                 WX_STATIC=0
-                echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
                 :
             fi
         else
@@ -8110,8 +8226,8 @@
 
                 if test "$TOOLKIT" = "auto" ; then
 
-                                    echo "$as_me:$LINENO: checking which wxWidgets toolkit was selected" >&5
-echo $ECHO_N "checking which wxWidgets toolkit was selected... $ECHO_C" >&6
+                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking which wxWidgets toolkit was selected" >&5
+$as_echo_n "checking which wxWidgets toolkit was selected... " >&6; }
 
             WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
             WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
@@ -8122,6 +8238,8 @@
             WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*")
             WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*")
             WX_BASEPORT=$(expr "$WX_SELECTEDCONFIG" : ".*base.*")
+            WX_COCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*cocoa.*")
+            WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
 
             WX_PORT="unknown"
             if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
@@ -8133,25 +8251,22 @@
             if test "$WX_MGLPORT" != "0"; then WX_PORT="mgl"; fi
             if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi
             if test "$WX_BASEPORT" != "0"; then WX_PORT="base"; fi
+            if test "$WX_COCOAPORT" != "0"; then WX_PORT="cocoa"; fi
+            if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
 
 
             if test "$WX_PORT" = "unknown" ; then
-                { { echo "$as_me:$LINENO: error:
+                as_fn_error "
         Cannot detect the currently installed wxWidgets port !
         Please check your 'wx-config --cxxflags'...
-                            " >&5
-echo "$as_me: error:
-        Cannot detect the currently installed wxWidgets port !
-        Please check your 'wx-config --cxxflags'...
-                            " >&2;}
-   { (exit 1); exit 1; }; }
+                            " "$LINENO" 5
             fi
 
-            echo "$as_me:$LINENO: result: $WX_PORT" >&5
-echo "${ECHO_T}$WX_PORT" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WX_PORT" >&5
+$as_echo "$WX_PORT" >&6; }
         else
 
-                        if test -z "$TOOLKIT" ; then
+                        if test -n "$TOOLKIT" ; then
                 WX_PORT=$TOOLKIT
             else
                                 WX_PORT=$PORT
@@ -8170,23 +8285,14 @@
         fi
 
                                                         if test "$WX_SHARED" = "0" -a "$SHARED" = "1"; then
-            { { echo "$as_me:$LINENO: error:
+            as_fn_error "
     Cannot build shared library against a static build of wxWidgets !
     This error happens because the wxWidgets build which was selected
     has been detected as static while you asked to build $PACKAGE_NAME
     as shared library and this is not possible.
     Use the '--disable-shared' option to build $PACKAGE_NAME
     as static library or '--with-wxshared' to use wxWidgets as shared library.
-                         " >&5
-echo "$as_me: error:
-    Cannot build shared library against a static build of wxWidgets !
-    This error happens because the wxWidgets build which was selected
-    has been detected as static while you asked to build $PACKAGE_NAME
-    as shared library and this is not possible.
-    Use the '--disable-shared' option to build $PACKAGE_NAME
-    as static library or '--with-wxshared' to use wxWidgets as shared library.
-                         " >&2;}
-   { (exit 1); exit 1; }; }
+                         " "$LINENO" 5
         fi
 
                         if test "$DEBUG" = "auto"; then
@@ -8209,39 +8315,34 @@
         fi
 
 
+	# 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"
 
-# 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 }'`
 
+fi
 
-if test ${need_gui} = yes -a "${WX_PORT}" = base; then
-  { { echo "$as_me:$LINENO: error:
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_gui:-no} = yes -o ${enable_wxcas:-no} = yes -o ${enable_alc:-no} = yes ; then :
+  if test "${WX_PORT}" = base; then :
+  as_fn_error "
 		The selected components need a wxWidgets library with GUI,
 		but your installation is base-only.  Please install a GUI
 		enabled version of wxWidgets and then retry.
-	" >&5
-echo "$as_me: error:
-		The selected components need a wxWidgets library with GUI,
-		but your installation is base-only.  Please install a GUI
-		enabled version of wxWidgets and then retry.
-	" >&2;}
-   { (exit 1); exit 1; }; }
+	" "$LINENO" 5
 
 fi
+fi
 
-
-if test ${SYS:-unknown} = win32; then
-
-	if test -n "$ac_tool_prefix"; then
+if test ${SYS:-unknown} = win32; then :
+  if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_RC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RC"; then
   ac_cv_prog_RC="$RC" # Let the user override the test.
@@ -8251,35 +8352,37 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RC="${ac_tool_prefix}windres"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 RC=$ac_cv_prog_RC
 if test -n "$RC"; then
-  echo "$as_me:$LINENO: result: $RC" >&5
-echo "${ECHO_T}$RC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
+$as_echo "$RC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_prog_RC"; then
   ac_ct_RC=$RC
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_ac_ct_RC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RC"; then
   ac_cv_prog_ac_ct_RC="$ac_ct_RC" # Let the user override the test.
@@ -8289,51 +8392,67 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RC="windres"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_RC" && ac_cv_prog_ac_ct_RC=":"
 fi
 fi
 ac_ct_RC=$ac_cv_prog_ac_ct_RC
 if test -n "$ac_ct_RC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RC" >&5
-echo "${ECHO_T}$ac_ct_RC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
+$as_echo "$ac_ct_RC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  RC=$ac_ct_RC
+  if test "x$ac_ct_RC" = x; then
+    RC=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RC=$ac_ct_RC
+  fi
 else
   RC="$ac_cv_prog_RC"
 fi
 
-	MULERCFLAGS=`$WX_CONFIG_WITH_ARGS --cflags | $AWK '{ for (i = 1; i <= NF; i++) if (index($i, "-I") != 1 && index($i, "-D") != 1) $i = ""; print }'`
-
 fi
 
 
-
 # Check for libupnp
-if test "${ENABLE_UPNP:-yes}" = yes; then
+# Check whether --enable-upnp was given.
+if test "${enable_upnp+set}" = set; then :
+  enableval=$enable_upnp;
+fi
 
 
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes ; then :
+
+else
+  enable_upnp=no
+fi
+
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -8345,37 +8464,38 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
 fi
 if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
@@ -8387,29 +8507,39 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   ;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  PKG_CONFIG=$ac_pt_PKG_CONFIG
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
 else
   PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
 fi
@@ -8417,34 +8547,40 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 
 fi
+if test ${enable_upnp:-yes} = yes; then :
 
 
-# Check whether --with-libupnp-prefix or --without-libupnp-prefix was given.
-if test "${with_libupnp_prefix+set}" = set; then
-  withval="$with_libupnp_prefix"
-  export PKG_CONFIG_PATH=$withval/lib/pkgconfig
-fi;
 
-	if test $cross_compiling = no; then
-  		echo "$as_me:$LINENO: checking for libupnp version >= 1.6.6" >&5
-echo $ECHO_N "checking for libupnp version >= 1.6.6... $ECHO_C" >&6
-		if test -n "$PKG_CONFIG"; then
-  			if $PKG_CONFIG libupnp --exists; then
-  				LIBUPNP_VERSION=`$PKG_CONFIG libupnp --modversion`
-				if $PKG_CONFIG libupnp --atleast-version=1.6.6; then
-  					result=yes
+# Check whether --with-libupnp-prefix was given.
+if test "${with_libupnp_prefix+set}" = set; then :
+  withval=$with_libupnp_prefix; export PKG_CONFIG_PATH=$withval/lib/pkgconfig
+fi
+
+
+	if test $cross_compiling = no; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libupnp version >= 1.6.6" >&5
+$as_echo_n "checking for libupnp version >= 1.6.6... " >&6; }
+		if test -n "$PKG_CONFIG"; then :
+
+			if $PKG_CONFIG libupnp --exists; then :
+
+				LIBUPNP_VERSION=`$PKG_CONFIG libupnp --modversion`
+				if $PKG_CONFIG libupnp --atleast-version=1.6.6; then :
+
+					result=yes
 					resultstr=" (version $LIBUPNP_VERSION)"
 					LIBUPNP_CPPFLAGS=`$PKG_CONFIG libupnp --cflags-only-I`
 					LIBUPNP_CFLAGS=`$PKG_CONFIG libupnp --cflags-only-other`
@@ -8453,56 +8589,66 @@
 					LIBUPNP_LIBS="$LIBUPNP_LIBS `$PKG_CONFIG libupnp --libs-only-l`"
 
 else
-  					result=no
+
+					result=no
 					resultstr=" (version $LIBUPNP_VERSION is not new enough)"
 
 fi
 
 else
-  				result=no
+
+				result=no
 				resultstr=" (try to use --with-libupnp-prefix=PREFIX)"
 
 fi
 
 else
-  			result=no
+
+			result=no
 			resultstr=" (pkg-config not found)"
 
 fi
-		echo "$as_me:$LINENO: result: $result$resultstr" >&5
-echo "${ECHO_T}$result$resultstr" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result$resultstr" >&5
+$as_echo "$result$resultstr" >&6; }
 		libupnp_error="libupnp >= 1.6.6 not found$resultstr"
 
 else
-  		result=no
+
+		result=no
 		libupnp_error="cross compiling"
 
 fi
 
-	if test ${result:-no} = yes; then
+	if test ${result:-no} = yes; then :
   LIBUPNP_CPPFLAGS="$LIBUPNP_CPPFLAGS -DENABLE_UPNP=1"
 else
-  ENABLE_UPNP=disabled
+  enable_upnp=disabled
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+        UPnP code has been disabled because ${libupnp_error}." >&5
+$as_echo "$as_me: WARNING:
+        UPnP code has been disabled because ${libupnp_error}." >&2;}
+_mule_warning_6=yes
+_mule_has_warnings=yes
 
-fi
 
+fi
 
 
 
 fi
 
-
 # Check for Crypto++
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes -o ${enable_amule_gui:-no} = yes -o ${enable_fileview:-no} = yes ; then :
 
 
-# Check whether --with-crypto-prefix or --without-crypto-prefix was given.
-if test "${with_crypto_prefix+set}" = set; then
-  withval="$with_crypto_prefix"
+# Check whether --with-crypto-prefix was given.
+if test "${with_crypto_prefix+set}" = set; then :
+  withval=$with_crypto_prefix;
+fi
 
-fi;
 
-	echo "$as_me:$LINENO: checking for crypto++ version >= 5.1" >&5
-echo $ECHO_N "checking for crypto++ version >= 5.1... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypto++ version >= 5.1" >&5
+$as_echo_n "checking for crypto++ version >= 5.1... " >&6; }
 
 	cryptopp_file_with_version="cryptlib.h"
 
@@ -8512,33 +8658,34 @@
 	CRYPTOPP_INCLUDE_PREFIX="unknown"
 	cryptopp_libdir="unknown"
 
-	if test -n "$with_crypto_prefix"; then
+	if test -n "$with_crypto_prefix"; then :
 
+		CRYPTOPP_PREFIX="$with_crypto_prefix"
 		# Find the Cryptopp header in the user-provided location
-		if test -f $with_crypto_prefix/$cryptopp_file_with_version; then
+		if test -f $CRYPTOPP_PREFIX/$cryptopp_file_with_version; then
 
 			CRYPTOPP_STYLE="sources"
 			CRYPTOPP_LIB_NAME="cryptopp"
 			cryptopp_includedir=
-			CRYPTOPP_INCLUDE_PREFIX="$with_crypto_prefix"
+			CRYPTOPP_INCLUDE_PREFIX="$CRYPTOPP_PREFIX"
 			cryptopp_libdir=
 
-elif test -f $with_crypto_prefix/include/cryptopp/$cryptopp_file_with_version; then
+elif test -f $CRYPTOPP_PREFIX/include/cryptopp/$cryptopp_file_with_version; then
 
 			CRYPTOPP_STYLE="installed"
 			CRYPTOPP_LIB_NAME="cryptopp"
-			cryptopp_includedir="$with_crypto_prefix/include"
+			cryptopp_includedir="$CRYPTOPP_PREFIX/include"
 			CRYPTOPP_INCLUDE_PREFIX="$CRYPTOPP_LIB_NAME"
-			cryptopp_libdir="$with_crypto_prefix/lib"
+			cryptopp_libdir="$CRYPTOPP_PREFIX/lib"
 
-elif test -f $with_crypto_prefix/include/crypto++/$cryptopp_file_with_version; then
+elif test -f $CRYPTOPP_PREFIX/include/crypto++/$cryptopp_file_with_version; then
 
 			# Debian uses libcrypto++5.1 - it's not my fault, please soda patch the package
 			CRYPTOPP_STYLE="gentoo_debian"
 			CRYPTOPP_LIB_NAME="crypto++"
-			cryptopp_includedir="$with_crypto_prefix/include"
+			cryptopp_includedir="$CRYPTOPP_PREFIX/include"
 			CRYPTOPP_INCLUDE_PREFIX="$CRYPTOPP_LIB_NAME"
-			cryptopp_libdir="$with_crypto_prefix/lib"
+			cryptopp_libdir="$CRYPTOPP_PREFIX/lib"
 
 fi
 
@@ -8581,8 +8728,7 @@
 
 fi
 
-
-	if test $CRYPTOPP_STYLE = "unknown"; then
+	if test $CRYPTOPP_STYLE = "unknown"; then :
   result=no; resultstr=""
 else
 
@@ -8592,17 +8738,16 @@
 		CRYPTOPP_VERSION_NUMBER=`echo $CRYPTOPP_VERSION_STRING | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 		minvers=`echo 5.1 | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
 
-		if test -n "$CRYPTOPP_VERSION_NUMBER" && test "$CRYPTOPP_VERSION_NUMBER" -ge $minvers; then
+		if test -n "$CRYPTOPP_VERSION_NUMBER" && test "$CRYPTOPP_VERSION_NUMBER" -ge $minvers; then :
 
 			result=yes
 			resultstr=" (version $CRYPTOPP_VERSION_STRING, $CRYPTOPP_STYLE)"
-			if test -n "$cryptopp_includedir"; then
+			if test -n "$cryptopp_includedir"; then :
   CRYPTOPP_CPPFLAGS="-I$cryptopp_includedir"
 else
   CRYPTOPP_CPPFLAGS=
 fi
-
-			if test -n "$cryptopp_libdir"; then
+			if test -n "$cryptopp_libdir"; then :
 
 				CRYPTOPP_LDFLAGS="-L$cryptopp_libdir"
 				CRYPTOPP_LIBS="-l$CRYPTOPP_LIB_NAME"
@@ -8614,8 +8759,6 @@
 
 fi
 
-
-
 			cat >>confdefs.h <<_ACEOF
 #define CRYPTOPP_INCLUDE_PREFIX $CRYPTOPP_INCLUDE_PREFIX
 _ACEOF
@@ -8628,59 +8771,47 @@
 
 fi
 
-
 fi
 
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result$resultstr" >&5
+$as_echo "$result$resultstr" >&6; }
 
-	echo "$as_me:$LINENO: result: $result$resultstr" >&5
-echo "${ECHO_T}$result$resultstr" >&6
-
-	if test ${result:-no} = yes; then
+	if test ${result:-no} = yes; then :
 
 	# Check for CryptoPP >= 5.5
-	if test $CRYPTOPP_VERSION_NUMBER -ge "5005000"; then
+	if test $CRYPTOPP_VERSION_NUMBER -ge "5005000"; then :
   CRYPTOPP_CPPFLAGS="$CRYPTOPP_CPPFLAGS -D__WEAK_CRYPTO__"
 fi
 
-
 else
 
-	{ { echo "$as_me:$LINENO: error:
-	Could not find crypto++ header file \"$cryptopp_file_with_version\".
-	Please try again with --with-crypto-prefix=/my_crypto_prefix
-	(replace /my_crypto_prefix with a valid path to your crypto++
-	installation directory)." >&5
-echo "$as_me: error:
+	as_fn_error "
 	Could not find crypto++ header file \"$cryptopp_file_with_version\".
 	Please try again with --with-crypto-prefix=/my_crypto_prefix
 	(replace /my_crypto_prefix with a valid path to your crypto++
-	installation directory)." >&2;}
-   { (exit 1); exit 1; }; }
+	installation directory)." "$LINENO" 5
 
 fi
 
 
+fi
+
 
 
-ac_ext=cc
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes -o ${enable_amule_gui:-no} = yes -o ${enable_amulecmd:-no} = yes -o ${enable_webserver:-no} = yes -o ${enable_ed2k:-yes} = yes -o ${enable_alc:-no} = yes -o ${enable_alcc:-no} = yes -o ${enable_wxcas:-no} = yes -o ${enable_fileview:-no} = yes ; then :
+  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-
-
-	echo "$as_me:$LINENO: checking if we're using the GNU C++ library" >&5
-echo $ECHO_N "checking if we're using the GNU C++ library... $ECHO_C" >&6
-	cat >conftest.$ac_ext <<_ACEOF
-
-		/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're using the GNU C++ library" >&5
+$as_echo_n "checking if we're using the GNU C++ library... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 			#include <string>
 			#ifndef __GLIBCXX__
 			#error Non-GNU C++ library found.
@@ -8688,127 +8819,80 @@
 
 
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   GLIBCXX=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   GLIBCXX=no
 fi
 rm -f conftest.err conftest.$ac_ext
-	echo "$as_me:$LINENO: result: $GLIBCXX" >&5
-echo "${ECHO_T}$GLIBCXX" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIBCXX" >&5
+$as_echo "$GLIBCXX" >&6; }
 
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes -o ${enable_alc:-no} = yes -o ${enable_alcc:-no} = yes ; then :
 
 		mule_backup_CPPFLAGS="$CPPFLAGS"
 	CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
 
-	echo "$as_me:$LINENO: checking that wxWidgets has support for large files" >&5
-echo $ECHO_N "checking that wxWidgets has support for large files... $ECHO_C" >&6
-	cat >conftest.$ac_ext <<_ACEOF
-
-		/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that wxWidgets has support for large files" >&5
+$as_echo_n "checking that wxWidgets has support for large files... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 			#include <wx/wx.h>
-			#if !HAVE_LARGEFILE_SUPPORT && !defined(_LARGE_FILES) && !defined(__WXMSW__)
+			#include <wx/filefn.h>
+			#ifndef wxHAS_LARGE_FILES
 				#error No LargeFile support!
 			#endif
 
 
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-		{ { echo "$as_me:$LINENO: error:
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		as_fn_error "
 	Support for large files in wxWidgets is required by aMule.
 	To continue you must recompile wxWidgets with support for
-	large files enabled." >&5
-echo "$as_me: error:
-	Support for large files in wxWidgets is required by aMule.
-	To continue you must recompile wxWidgets with support for
-	large files enabled." >&2;}
-   { (exit 1); exit 1; }; }
+	large files enabled." "$LINENO" 5
 
 fi
 rm -f conftest.err conftest.$ac_ext
 
 		CPPFLAGS="$mule_backup_CPPFLAGS"
 
+fi
 
 # Check if the compiler is broken, wrt. exceptions.
 
-	echo "$as_me:$LINENO: checking for exception-handling" >&5
-echo $ECHO_N "checking for exception-handling... $ECHO_C" >&6
-	if test "$cross_compiling" = yes; then
-
-		echo "$as_me:$LINENO: result: undeterminable" >&5
-echo "${ECHO_T}undeterminable" >&6
-		{ echo "$as_me:$LINENO: WARNING:
-	Cross-compilation detected, so exception handling cannot be tested.
-	Note that broken exception handling in your compiler may lead to
-	unexpected crashes." >&5
-echo "$as_me: WARNING:
-	Cross-compilation detected, so exception handling cannot be tested.
-	Note that broken exception handling in your compiler may lead to
-	unexpected crashes." >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for exception-handling" >&5
+$as_echo_n "checking for exception-handling... " >&6; }
+	if test "$cross_compiling" = yes; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: undeterminable" >&5
+$as_echo "undeterminable" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+        Cross-compilation detected, so exception handling cannot be tested.
+        Note that broken exception handling in your compiler may lead to
+        unexpected crashes." >&5
+$as_echo "$as_me: WARNING:
+        Cross-compilation detected, so exception handling cannot be tested.
+        Note that broken exception handling in your compiler may lead to
+        unexpected crashes." >&2;}
+_mule_warning_7=yes
+_mule_has_warnings=yes
 
-else
-  cat >conftest.$ac_ext <<_ACEOF
 
-		/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 int
 main ()
 {
@@ -8825,50 +8909,31 @@
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_cxx_try_run "$LINENO"; then :
 
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
 
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-		{ { echo "$as_me:$LINENO: error: Exception handling does not work. Broken compiler?" >&5
-echo "$as_me: error: Exception handling does not work. Broken compiler?" >&2;}
-   { (exit 1); exit 1; }; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		as_fn_error "Exception handling does not work. Broken compiler?" "$LINENO" 5
 
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
 
-	echo "$as_me:$LINENO: checking for <cxxabi.h> and __cxa_demangle()" >&5
-echo $ECHO_N "checking for <cxxabi.h> and __cxa_demangle()... $ECHO_C" >&6
-	cat >conftest.$ac_ext <<_ACEOF
 
-		/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for <cxxabi.h> and __cxa_demangle()" >&5
+$as_echo_n "checking for <cxxabi.h> and __cxa_demangle()... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 			#include <cxxabi.h>
 
 int
@@ -8884,49 +8949,22 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_cxx_try_link "$LINENO"; then :
 
 
+		$as_echo "#define HAVE_CXXABI 1" >>confdefs.h
 
-		cat >>confdefs.h <<\_ACEOF
-#define HAVE_CXXABI 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -8935,33 +8973,32 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+fi
+
 # Ok, we have all needed libs, now checking for other stuff
-if test "$LEX" = "flex"; then
+if test "$LEX" = "flex"; then :
 
-	echo "$as_me:$LINENO: checking for extended flex capabilities" >&5
-echo $ECHO_N "checking for extended flex capabilities... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for extended flex capabilities" >&5
+$as_echo_n "checking for extended flex capabilities... " >&6; }
 
 	extended_flex=`flex --help | grep header-file`
-	if test -n "$extended_flex"; then
+	if test -n "$extended_flex"; then :
   HAVE_FLEX_EXTENDED=yes
 else
   HAVE_FLEX_EXTENDED=no
 fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_FLEX_EXTENDED" >&5
+$as_echo "$HAVE_FLEX_EXTENDED" >&6; }
 
-	echo "$as_me:$LINENO: result: $HAVE_FLEX_EXTENDED" >&5
-echo "${ECHO_T}$HAVE_FLEX_EXTENDED" >&6
-
-	if test $HAVE_FLEX_EXTENDED = no; then
-  { echo "$as_me:$LINENO: Your flex version doesn't support --header-file flag. This is not critical, but an upgrade is recommended" >&5
-echo "$as_me: Your flex version doesn't support --header-file flag. This is not critical, but an upgrade is recommended" >&6;}
+	if test $HAVE_FLEX_EXTENDED = no; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Your flex version doesn't support --header-file flag. This is not critical, but an upgrade is recommended" >&5
+$as_echo "$as_me: Your flex version doesn't support --header-file flag. This is not critical, but an upgrade is recommended" >&6;}
 fi
 
-
 else
   HAVE_FLEX_EXTENDED=no
 fi
 
-
 # Flush standard test results for speeding cache
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -8981,352 +9018,105 @@
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
   (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"
-      ;;
+      ;; #(
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-} |
+    esac |
+    sort
+) |
   sed '
+     /^ac_cv_env_/b end
      t clear
-     : clear
+     :clear
      s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/
      t end
-     /^ac_cv_env/!s/^$[^=]*$=$.*$$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+     s/^$[^=]*$=$.*$$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    echo "not updating unwritable cache $cache_file"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
 
 # Checks for header files.
-echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
-
-
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
-  withval="$with_x"
-
-fi;
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
-  # The user explicitly disabled X.
-  have_x=disabled
-else
-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    # Both variables are already set.
-    have_x=yes
-  else
-    if test "${ac_cv_have_x+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-rm -fr conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-  cat >Imakefile <<'_ACEOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
-_ACEOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-	 test -f $ac_im_libdir/libX11.$ac_extension; then
-	ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case $ac_im_incroot in
-	/usr/include) ;;
-	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
-	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -fr conftest.dir
-fi
-
-# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-
-/usr/include/X11
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
-
-/usr/local/X11/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-
-/usr/local/include/X11
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
-
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-
-/usr/include
-/usr/local/include
-/usr/unsupported/include
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
-
-/usr/openwin/include
-/usr/openwin/share/include'
-
-if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
-  # First, try using that file with no special directory specified.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <X11/Intrinsic.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
-    ac_x_includes=$ac_dir
-    break
-  fi
-done
-fi
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = no
-
-if test "$ac_x_libraries" = no; then
-  # Check for the libraries.
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS=$LIBS
-  LIBS="-lXt $LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <X11/Intrinsic.h>
-int
-main ()
-{
-XtMalloc (0)
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
-do
-  # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/libXt.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = no
-
-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
-  # Didn't find X anywhere.  Cache the known absence of X.
-  ac_cv_have_x="have_x=no"
-else
-  # Record where we found X for the cache.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
-fi
-
-  fi
-  eval "$ac_cv_have_x"
-fi # $with_x != no
-
-if test "$have_x" != yes; then
-  echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
-fi
-
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if test "${ac_cv_working_alloca_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
 main ()
 {
 char *p = (char *) alloca (2 * sizeof (int));
+			  if (p) return 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_working_alloca_h=no
+  ac_cv_working_alloca_h=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+$as_echo "$ac_cv_working_alloca_h" >&6; }
 if test $ac_cv_working_alloca_h = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if test "${ac_cv_func_alloca_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -9335,7 +9125,7 @@
 #  include <malloc.h>
 #  define alloca _alloca
 # else
-#  if HAVE_ALLOCA_H
+#  ifdef HAVE_ALLOCA_H
 #   include <alloca.h>
 #  else
 #   ifdef _AIX
@@ -9353,50 +9143,25 @@
 main ()
 {
 char *p = (char *) alloca (1);
+				    if (p) return 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_alloca_works=no
+  ac_cv_func_alloca_works=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+$as_echo "$ac_cv_func_alloca_works" >&6; }
 
 if test $ac_cv_func_alloca_works = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -9404,25 +9169,19 @@
 # contain a buggy version.  If you still want to use their alloca,
 # use ar to extract alloca.o from them instead of compiling alloca.c.
 
-ALLOCA=alloca.$ac_objext
+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
 
 
-echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6
-if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+if test "${ac_cv_os_cray+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if defined(CRAY) && ! defined(CRAY2)
+#if defined CRAY && ! defined CRAY2
 webecray
 #else
 wenotbecray
@@ -9430,7 +9189,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
+  $EGREP "webecray" >/dev/null 2>&1; then :
   ac_cv_os_cray=yes
 else
   ac_cv_os_cray=no
@@ -9438,102 +9197,14 @@
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+$as_echo "$ac_cv_os_cray" >&6; }
 if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define CRAY_STACKSEG_END $ac_func
@@ -9545,20 +9216,17 @@
   done
 fi
 
-echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+$as_echo_n "checking stack direction for C alloca... " >&6; }
+if test "${ac_cv_c_stack_direction+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+$ac_includes_default
 int
 find_stack_direction ()
 {
@@ -9576,35 +9244,21 @@
 int
 main ()
 {
-  exit (find_stack_direction () < 0);
+  return find_stack_direction () < 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
+  ac_cv_c_stack_direction=-1
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+$as_echo "$ac_cv_c_stack_direction" >&6; }
 cat >>confdefs.h <<_ACEOF
 #define STACK_DIRECTION $ac_cv_c_stack_direction
 _ACEOF
@@ -9612,24 +9266,15 @@
 
 fi
 
-
-
-
-
-
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -9643,42 +9288,20 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
+  eval "$as_ac_Header=no"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+eval ac_res=\$$as_ac_Header
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
 _ACEOF
 
 ac_header_dirent=$ac_hdr; break
@@ -9687,271 +9310,127 @@
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if test "${ac_cv_search_opendir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-ac_cv_search_opendir=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char opendir ();
 int
 main ()
 {
-opendir ();
+return opendir ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="none required"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_opendir" = no; then
-  for ac_lib in dir; do
+for ac_lib in '' dir; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_opendir+set}" = set; then :
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char opendir ();
-int
-main ()
-{
-opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="-l$ac_lib"
-break
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
+  ac_cv_search_opendir=no
 fi
+rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6
-if test "$ac_cv_search_opendir" != no; then
-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 else
-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
+$as_echo_n "checking for library containing opendir... " >&6; }
+if test "${ac_cv_search_opendir+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
-ac_cv_search_opendir=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char opendir ();
 int
 main ()
 {
-opendir ();
+return opendir ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="none required"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_opendir" = no; then
-  for ac_lib in x; do
+for ac_lib in '' x; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_opendir=$ac_res
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_opendir+set}" = set; then :
+  break
+fi
+done
+if test "${ac_cv_search_opendir+set}" = set; then :
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char opendir ();
-int
-main ()
-{
-opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_opendir="-l$ac_lib"
-break
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
+  ac_cv_search_opendir=no
 fi
+rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6
-if test "$ac_cv_search_opendir" != no; then
-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
+$as_echo "$ac_cv_search_opendir" >&6; }
+ac_res=$ac_cv_search_opendir
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
 fi
 
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if test "${ac_cv_header_stdc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -9966,51 +9445,23 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -10020,18 +9471,14 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -10041,16 +9488,13 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
@@ -10070,240 +9514,54 @@
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
+else
+  ac_cv_header_stdc=no
 fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
 
 fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_header in argz.h arpa/inet.h fcntl.h inttypes.h langinfo.h libintl.h limits.h locale.h malloc.h mntent.h netdb.h netinet/in.h stddef.h  nl_types.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/ioctl.h sys/mntent.h sys/mnttab.h sys/mount.h sys/param.h sys/resource.h sys/select.h sys/socket.h sys/statvfs.h sys/time.h sys/timeb.h sys/types.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
 
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
 fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+for ac_header in argz.h arpa/inet.h fcntl.h inttypes.h langinfo.h libintl.h limits.h locale.h malloc.h mntent.h netdb.h netinet/in.h stddef.h  nl_types.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/ioctl.h sys/mntent.h sys/mnttab.h sys/mount.h sys/param.h sys/resource.h sys/select.h sys/socket.h sys/statvfs.h sys/time.h sys/timeb.h sys/types.h unistd.h errno.h signal.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6
-if test "${ac_cv_header_sys_wait_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+if test "${ac_cv_header_sys_wait_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/wait.h>
 #ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
 #endif
 #ifndef WIFEXITED
 # define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
@@ -10319,79 +9577,49 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_sys_wait_h=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_sys_wait_h=no
+  ac_cv_header_sys_wait_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+$as_echo "$ac_cv_header_sys_wait_h" >&6; }
 if test $ac_cv_header_sys_wait_h = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_WAIT_H 1
-_ACEOF
+$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
 
 fi
 
 
 # Checks for typedefs, structures, and compiler characteristics.
-echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
-echo $ECHO_N "checking for stdbool.h that conforms to C99... $ECHO_C" >&6
-if test "${ac_cv_header_stdbool_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+if test "${ac_cv_header_stdbool_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdbool.h>
 #ifndef bool
-# error bool is not defined
+ "error: bool is not defined"
 #endif
 #ifndef false
-# error false is not defined
+ "error: false is not defined"
 #endif
 #if false
-# error false is not 0
+ "error: false is not 0"
 #endif
 #ifndef true
-# error true is not defined
+ "error: true is not defined"
 #endif
 #if true != 1
-# error true is not 1
+ "error: true is not 1"
 #endif
 #ifndef __bool_true_false_are_defined
-# error __bool_true_false_are_defined is not defined
+ "error: __bool_true_false_are_defined is not defined"
 #endif
 
 	struct s { _Bool s: 1; _Bool t; } s;
@@ -10399,111 +9627,69 @@
 	char a[true == 1 ? 1 : -1];
 	char b[false == 0 ? 1 : -1];
 	char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-	char d[(bool) -0.5 == true ? 1 : -1];
+	char d[(bool) 0.5 == true ? 1 : -1];
 	bool e = &s;
-	char f[(_Bool) -0.0 == false ? 1 : -1];
+	char f[(_Bool) 0.0 == false ? 1 : -1];
 	char g[true];
 	char h[sizeof (_Bool)];
 	char i[sizeof s.t];
+	enum { j = false, k = true, l = false * true, m = true * 256 };
+	/* The following fails for
+	   HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
+	_Bool n[m];
+	char o[sizeof n == m * sizeof n[0] ? 1 : -1];
+	char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
+#	if defined __xlc__ || defined __GNUC__
+	 /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
+	    reported by James Lemley on 2005-10-05; see
+	    http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+	    This test is not quite right, since xlc is allowed to
+	    reject this program, as the initializer for xlcbug is
+	    not one of the forms that C requires support for.
+	    However, doing the test right would require a runtime
+	    test, and that would make cross-compilation harder.
+	    Let us hope that IBM fixes the xlc bug, and also adds
+	    support for this kind of constant expression.  In the
+	    meantime, this test will reject xlc, which is OK, since
+	    our stdbool.h substitute should suffice.  We also test
+	    this with GCC, where it should work, to detect more
+	    quickly whether someone messes up the test in the
+	    future.  */
+	 char digs[] = "0123456789";
+	 int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
+#	endif
+	/* Catch a bug in an HP-UX C compiler.  See
+	   http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+	   http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+	 */
+	_Bool q = true;
+	_Bool *pq = &q;
 
 int
 main ()
 {
- return !a + !b + !c + !d + !e + !f + !g + !h + !i;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdbool_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_header_stdbool_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdbool_h" >&6
-echo "$as_me:$LINENO: checking for _Bool" >&5
-echo $ECHO_N "checking for _Bool... $ECHO_C" >&6
-if test "${ac_cv_type__Bool+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((_Bool *) 0)
-  return 0;
-if (sizeof (_Bool))
-  return 0;
+	*pq |= q;
+	*pq |= ! q;
+	/* Refer to every declared value, to avoid compiler optimizations.  */
+	return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
+		+ !m + !n + !o + !p + !q + !pq);
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type__Bool=yes
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdbool_h=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type__Bool=no
+  ac_cv_header_stdbool_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
-echo "${ECHO_T}$ac_cv_type__Bool" >&6
-if test $ac_cv_type__Bool = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+$as_echo "$ac_cv_header_stdbool_h" >&6; }
+ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
+if test "x$ac_cv_type__Bool" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE__BOOL 1
@@ -10514,22 +9700,16 @@
 
 if test $ac_cv_header_stdbool_h = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STDBOOL_H 1
-_ACEOF
+$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
 
 fi
 
-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+if test "${ac_cv_c_const+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -10539,10 +9719,10 @@
 #ifndef __cplusplus
   /* Ultrix mips cc rejects this.  */
   typedef int charset[2];
-  const charset x;
+  const charset cs;
   /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *ccp;
-  char **p;
+  char const *const *pcpcc;
+  char **ppc;
   /* NEC SVR4.0.2 mips cc rejects this.  */
   struct point {int x, y;};
   static struct point const zero = {0,0};
@@ -10551,16 +9731,17 @@
      an arm of an if-expression whose if-part is not a constant
      expression */
   const char *g = "string";
-  ccp = &g + (g ? g-g : 0);
+  pcpcc = &g + (g ? g-g : 0);
   /* HPUX 7.0 cc rejects these. */
-  ++ccp;
-  p = (char**) ccp;
-  ccp = (char const *const *) p;
+  ++pcpcc;
+  ppc = (char**) pcpcc;
+  pcpcc = (char const *const *) ppc;
   { /* SCO 3.2v4 cc rejects this.  */
     char *t;
     char const *s = 0 ? (char *) 0 : (char const *) 0;
 
     *t++ = 0;
+    if (s) return 0;
   }
   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
     int x[] = {25, 17};
@@ -10579,66 +9760,38 @@
   }
   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
     const int foo = 10;
+    if (!foo) return 0;
   }
+  return !cs[0] && !zero.x;
 #endif
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_const=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_const=no
+  ac_cv_c_const=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
+$as_echo "#define const /**/" >>confdefs.h
 
 fi
 
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if test "${ac_cv_c_inline+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
@@ -10647,41 +9800,16 @@
 #endif
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
 done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -10698,64 +9826,9 @@
     ;;
 esac
 
-echo "$as_me:$LINENO: checking for mode_t" >&5
-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
-if test "${ac_cv_type_mode_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((mode_t *) 0)
-  return 0;
-if (sizeof (mode_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_mode_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = x""yes; then :
 
-ac_cv_type_mode_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-echo "${ECHO_T}$ac_cv_type_mode_t" >&6
-if test $ac_cv_type_mode_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -10764,148 +9837,34 @@
 
 fi
 
-echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6
-if test "${ac_cv_type_off_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((off_t *) 0)
-  return 0;
-if (sizeof (off_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_off_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
+if test "x$ac_cv_type_off_t" = x""yes; then :
 
-ac_cv_type_off_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6
-if test $ac_cv_type_off_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define off_t long
+#define off_t long int
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
-  return 0;
-if (sizeof (size_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = x""yes; then :
 
-ac_cv_type_size_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-if test $ac_cv_type_size_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
+#define size_t unsigned int
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if test "${ac_cv_header_time+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/time.h>
@@ -10920,57 +9879,27 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_time=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_time=no
+  ac_cv_header_time=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
 if test $ac_cv_header_time = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
 fi
 
-echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
-if test "${ac_cv_struct_tm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if test "${ac_cv_struct_tm+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <time.h>
@@ -10978,68 +9907,40 @@
 int
 main ()
 {
-struct tm *tp; tp->tm_sec;
+struct tm tm;
+				     int *p = &tm.tm_sec;
+				     return !p;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_struct_tm=time.h
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_struct_tm=sys/time.h
+  ac_cv_struct_tm=sys/time.h
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-echo "${ECHO_T}$ac_cv_struct_tm" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TM_IN_SYS_TIME 1
-_ACEOF
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
 
 fi
 
-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if test "${ac_cv_type_uid_t+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
+  $EGREP "uid_t" >/dev/null 2>&1; then :
   ac_cv_type_uid_t=yes
 else
   ac_cv_type_uid_t=no
@@ -11047,31 +9948,23 @@
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
 if test $ac_cv_type_uid_t = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
+$as_echo "#define uid_t int" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
+$as_echo "#define gid_t int" >>confdefs.h
 
 fi
 
-echo "$as_me:$LINENO: checking for working volatile" >&5
-echo $ECHO_N "checking for working volatile... $ECHO_C" >&6
-if test "${ac_cv_c_volatile+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
+$as_echo_n "checking for working volatile... " >&6; }
+if test "${ac_cv_c_volatile+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -11079,109 +9972,29 @@
 {
 
 volatile int x;
-int * volatile y;
+int * volatile y = (int *) 0;
+return !x && !y;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_volatile=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_volatile=no
+  ac_cv_c_volatile=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
-echo "${ECHO_T}$ac_cv_c_volatile" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
+$as_echo "$ac_cv_c_volatile" >&6; }
 if test $ac_cv_c_volatile = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define volatile
-_ACEOF
+$as_echo "#define volatile /**/" >>confdefs.h
 
 fi
 
-echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
-echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6
-if test "${ac_cv_type_ptrdiff_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((ptrdiff_t *) 0)
-  return 0;
-if (sizeof (ptrdiff_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_ptrdiff_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_ptrdiff_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
-echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6
-if test $ac_cv_type_ptrdiff_t = yes; then
+ac_fn_c_check_type "$LINENO" "ptrdiff_t" "ac_cv_type_ptrdiff_t" "$ac_includes_default"
+if test "x$ac_cv_type_ptrdiff_t" = x""yes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_PTRDIFF_T 1
@@ -11192,19 +10005,15 @@
 
 
 # Checks for library functions.
-echo "$as_me:$LINENO: checking whether closedir returns void" >&5
-echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6
-if test "${ac_cv_func_closedir_void+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
+$as_echo_n "checking whether closedir returns void... " >&6; }
+if test "${ac_cv_func_closedir_void+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_closedir_void=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 #include <$ac_header_dirent>
@@ -11215,62 +10024,43 @@
 int
 main ()
 {
-exit (closedir (opendir (".")) != 0);
+return closedir (opendir (".")) != 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_closedir_void=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_closedir_void=yes
+  ac_cv_func_closedir_void=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5
-echo "${ECHO_T}$ac_cv_func_closedir_void" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_closedir_void" >&5
+$as_echo "$ac_cv_func_closedir_void" >&6; }
 if test $ac_cv_func_closedir_void = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define CLOSEDIR_VOID 1
-_ACEOF
+$as_echo "#define CLOSEDIR_VOID 1" >>confdefs.h
 
 fi
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
-echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
-if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
+$as_echo_n "checking whether $CC needs -traditional... " >&6; }
+if test "${ac_cv_prog_gcc_traditional+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
     ac_pattern="Autoconf.*'x'"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sgtty.h>
 Autoconf TIOCGETP
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
   ac_cv_prog_gcc_traditional=yes
 else
   ac_cv_prog_gcc_traditional=no
@@ -11279,88 +10069,29 @@
 
 
   if test $ac_cv_prog_gcc_traditional = no; then
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <termio.h>
 Autoconf TCGETA
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
+  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
   ac_cv_prog_gcc_traditional=yes
 fi
 rm -f conftest*
 
   fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
-echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
+$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
-echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-if test "${ac_cv_type_pid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((pid_t *) 0)
-  return 0;
-if (sizeof (pid_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_pid_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = x""yes; then :
 
-ac_cv_type_pid_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-if test $ac_cv_type_pid_t = yes; then
-  :
 else
 
 cat >>confdefs.h <<_ACEOF
@@ -11369,308 +10100,66 @@
 
 fi
 
-
-
-for ac_header in unistd.h vfork.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
+for ac_header in vfork.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
+if test "x$ac_cv_header_vfork_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_VFORK_H 1
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+done
 
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+for ac_func in fork vfork
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
-
 done
 
-
-
-for ac_func in fork vfork
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "x$ac_cv_func_fork" = xyes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
+$as_echo_n "checking for working fork... " >&6; }
+if test "${ac_cv_func_fork_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_fork_works=cross
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
+$ac_includes_default
 int
 main ()
 {
-return f != $ac_func;
+
+	  /* By Ruediger Kuhlmann. */
+	  return fork () < 0;
+
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:$LINENO: checking for working fork" >&5
-echo $ECHO_N "checking for working fork... $ECHO_C" >&6
-if test "${ac_cv_func_fork_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_fork_works=cross
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* By Ruediger Kuhlmann. */
-      #include <sys/types.h>
-      #if HAVE_UNISTD_H
-      # include <unistd.h>
-      #endif
-      /* Some systems only have a dummy stub for fork() */
-      int main ()
-      {
-	if (fork() < 0)
-	  exit (1);
-	exit (0);
-      }
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_fork_works=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_fork_works=no
+  ac_cv_func_fork_works=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
-echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
+$as_echo "$ac_cv_func_fork_works" >&6; }
 
 else
   ac_cv_func_fork_works=$ac_cv_func_fork
@@ -11685,35 +10174,25 @@
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
-echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
 fi
 ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
-  echo "$as_me:$LINENO: checking for working vfork" >&5
-echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
-if test "${ac_cv_func_vfork_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
+$as_echo_n "checking for working vfork... " >&6; }
+if test "${ac_cv_func_vfork_works+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_vfork_works=cross
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Thanks to Paul Eggert for this test.  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+$ac_includes_default
 #include <sys/wait.h>
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-#if HAVE_VFORK_H
+#ifdef HAVE_VFORK_H
 # include <vfork.h>
 #endif
 /* On some sparc systems, changes by the child to local and incoming
@@ -11784,7 +10263,7 @@
 
     while (wait(&status) != child)
       ;
-    exit(
+    return (
 	 /* Was there some problem with vforking?  */
 	 child < 0
 
@@ -11800,509 +10279,206 @@
   }
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_vfork_works=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_vfork_works=no
+  ac_cv_func_vfork_works=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
-echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
+$as_echo "$ac_cv_func_vfork_works" >&6; }
 
 fi;
 if test "x$ac_cv_func_fork_works" = xcross; then
   ac_cv_func_vfork_works=$ac_cv_func_vfork
-  { echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
-echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
+$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
 fi
 
 if test "x$ac_cv_func_vfork_works" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WORKING_VFORK 1
-_ACEOF
+$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
 
 else
 
-cat >>confdefs.h <<\_ACEOF
-#define vfork fork
-_ACEOF
+$as_echo "#define vfork fork" >>confdefs.h
 
 fi
 if test "x$ac_cv_func_fork_works" = xyes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WORKING_FORK 1
-_ACEOF
+$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
 
 fi
 
-if test x$SYS != xwin32; then
-
-	# getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware.
-echo "$as_me:$LINENO: checking for getmntent in -lsun" >&5
-echo $ECHO_N "checking for getmntent in -lsun... $ECHO_C" >&6
-if test "${ac_cv_lib_sun_getmntent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsun  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  rm -f conftest.sym conftest.file
+echo >conftest.file
+if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char getmntent ();
+$ac_includes_default
 int
 main ()
 {
-getmntent ();
+struct stat sbuf;
+     /* Linux will dereference the symlink and fail, as required by POSIX.
+	That is better in the sense that it means we will not
+	have to compile and use the lstat wrapper.  */
+     return lstat ("conftest.sym/", &sbuf) == 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_sun_getmntent=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_lstat_dereferences_slashed_symlink=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_sun_getmntent=no
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_sun_getmntent" >&5
-echo "${ECHO_T}$ac_cv_lib_sun_getmntent" >&6
-if test $ac_cv_lib_sun_getmntent = yes; then
-  LIBS="-lsun $LIBS"
-else
-  echo "$as_me:$LINENO: checking for getmntent in -lseq" >&5
-echo $ECHO_N "checking for getmntent in -lseq... $ECHO_C" >&6
-if test "${ac_cv_lib_seq_getmntent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lseq  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char getmntent ();
-int
-main ()
-{
-getmntent ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_seq_getmntent=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_seq_getmntent=no
+  # If the `ln -s' command failed, then we probably don't even
+  # have an lstat function.
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+rm -f conftest.sym conftest.file
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_seq_getmntent" >&5
-echo "${ECHO_T}$ac_cv_lib_seq_getmntent" >&6
-if test $ac_cv_lib_seq_getmntent = yes; then
-  LIBS="-lseq $LIBS"
-else
-  echo "$as_me:$LINENO: checking for getmntent in -lgen" >&5
-echo $ECHO_N "checking for getmntent in -lgen... $ECHO_C" >&6
-if test "${ac_cv_lib_gen_getmntent+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgen  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char getmntent ();
-int
-main ()
-{
-getmntent ();
-  ;
-  return 0;
-}
+test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
+
+cat >>confdefs.h <<_ACEOF
+#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_gen_getmntent=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_gen_getmntent=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getmntent" >&5
-echo "${ECHO_T}$ac_cv_lib_gen_getmntent" >&6
-if test $ac_cv_lib_gen_getmntent = yes; then
-  LIBS="-lgen $LIBS"
-fi
 
-fi
+if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
+  case " $LIBOBJS " in
+  *" lstat.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
+ ;;
+esac
 
 fi
 
+if test x$SYS != xwin32; then :
 
-for ac_func in getmntent
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	# getmntent is in the standard C library on UNICOS, in -lsun on Irix 4,
+# -lseq on Dynix/PTX, -lgen on Unixware.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getmntent" >&5
+$as_echo_n "checking for library containing getmntent... " >&6; }
+if test "${ac_cv_search_getmntent+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
    builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
 #ifdef __cplusplus
-}
+extern "C"
 #endif
-
+char getmntent ();
 int
 main ()
 {
-return f != $ac_func;
+return getmntent ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+for ac_lib in '' sun seq gen; do
+  if test -z "$ac_lib"; then
+    ac_res="none required"
+  else
+    ac_res=-l$ac_lib
+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+  fi
+  if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_search_getmntent=$ac_res
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_getmntent+set}" = set; then :
+  break
 fi
 done
+if test "${ac_cv_search_getmntent+set}" = set; then :
 
-
-	echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
-echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6
-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  rm -f conftest.sym conftest.file
-echo >conftest.file
-if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_lstat_dereferences_slashed_symlink=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-struct stat sbuf;
-     /* Linux will dereference the symlink and fail.
-	That is better in the sense that it means we will not
-	have to compile and use the lstat wrapper.  */
-     exit (lstat ("conftest.sym/", &sbuf) ? 0 : 1);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_lstat_dereferences_slashed_symlink=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_lstat_dereferences_slashed_symlink=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-else
-  # If the `ln -s' command failed, then we probably don't even
-  # have an lstat function.
-  ac_cv_func_lstat_dereferences_slashed_symlink=no
+  ac_cv_search_getmntent=no
 fi
-rm -f conftest.sym conftest.file
-
+rm conftest.$ac_ext
+LIBS=$ac_func_search_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
-echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_getmntent" >&5
+$as_echo "$ac_cv_search_getmntent" >&6; }
+ac_res=$ac_cv_search_getmntent
+if test "$ac_res" != no; then :
+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  ac_cv_func_getmntent=yes
 
-test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
-
-cat >>confdefs.h <<_ACEOF
-#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
-_ACEOF
-
-
-if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
-  case $LIBOBJS in
-    "lstat.$ac_objext"   | \
-  *" lstat.$ac_objext"   | \
-    "lstat.$ac_objext "* | \
-  *" lstat.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS lstat.$ac_objext" ;;
-esac
+$as_echo "#define HAVE_GETMNTENT 1" >>confdefs.h
 
+else
+  ac_cv_func_getmntent=no
 fi
 
-echo "$as_me:$LINENO: checking whether lstat accepts an empty string" >&5
-echo $ECHO_N "checking whether lstat accepts an empty string... $ECHO_C" >&6
-if test "${ac_cv_func_lstat_empty_string_bug+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat accepts an empty string" >&5
+$as_echo_n "checking whether lstat accepts an empty string... " >&6; }
+if test "${ac_cv_func_lstat_empty_string_bug+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_lstat_empty_string_bug=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 struct stat sbuf;
-  exit (lstat ("", &sbuf) ? 1 : 0);
+  return lstat ("", &sbuf) == 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_lstat_empty_string_bug=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_lstat_empty_string_bug=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_lstat_empty_string_bug=no
+  ac_cv_func_lstat_empty_string_bug=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_lstat_empty_string_bug" >&5
-echo "${ECHO_T}$ac_cv_func_lstat_empty_string_bug" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_empty_string_bug" >&5
+$as_echo "$ac_cv_func_lstat_empty_string_bug" >&6; }
 if test $ac_cv_func_lstat_empty_string_bug = yes; then
-  case $LIBOBJS in
-    "lstat.$ac_objext"   | \
-  *" lstat.$ac_objext"   | \
-    "lstat.$ac_objext "* | \
+  case " $LIBOBJS " in
   *" lstat.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS lstat.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
+ ;;
 esac
 
 
@@ -12312,58 +10488,41 @@
 
 fi
 
-	echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
-echo $ECHO_N "checking whether lstat dereferences a symlink specified with a trailing slash... $ECHO_C" >&6
-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
+$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
+if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   rm -f conftest.sym conftest.file
 echo >conftest.file
 if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_lstat_dereferences_slashed_symlink=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 struct stat sbuf;
-     /* Linux will dereference the symlink and fail.
+     /* Linux will dereference the symlink and fail, as required by POSIX.
 	That is better in the sense that it means we will not
 	have to compile and use the lstat wrapper.  */
-     exit (lstat ("conftest.sym/", &sbuf) ? 0 : 1);
+     return lstat ("conftest.sym/", &sbuf) == 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_lstat_dereferences_slashed_symlink=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_lstat_dereferences_slashed_symlink=no
+  ac_cv_func_lstat_dereferences_slashed_symlink=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 else
   # If the `ln -s' command failed, then we probably don't even
   # have an lstat function.
@@ -12372,8 +10531,8 @@
 rm -f conftest.sym conftest.file
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
-echo "${ECHO_T}$ac_cv_func_lstat_dereferences_slashed_symlink" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
+$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
 
 test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
 
@@ -12382,33 +10541,26 @@
 _ACEOF
 
 
-if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
-  case $LIBOBJS in
-    "lstat.$ac_objext"   | \
-  *" lstat.$ac_objext"   | \
-    "lstat.$ac_objext "* | \
+if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
+  case " $LIBOBJS " in
   *" lstat.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS lstat.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
+ ;;
 esac
 
 fi
 
 
 fi
-
-echo "$as_me:$LINENO: checking for working memcmp" >&5
-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
-if test "${ac_cv_func_memcmp_working+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
+$as_echo_n "checking for working memcmp... " >&6; }
+if test "${ac_cv_func_memcmp_working+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_memcmp_working=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -12416,9 +10568,9 @@
 {
 
   /* Some versions of memcmp are not 8-bit clean.  */
-  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
+  char c0 = '\100', c1 = '\200', c2 = '\201';
   if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-    exit (1);
+    return 1;
 
   /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
      or more and with at least one buffer not starting on a 4-byte boundary.
@@ -12434,647 +10586,63 @@
 	strcpy (a, "--------01111111");
 	strcpy (b, "--------10000000");
 	if (memcmp (a, b, 16) >= 0)
-	  exit (1);
+	  return 1;
       }
-    exit (0);
+    return 0;
   }
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_memcmp_working=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_memcmp_working=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
-test $ac_cv_func_memcmp_working = no && case $LIBOBJS in
-    "memcmp.$ac_objext"   | \
-  *" memcmp.$ac_objext"   | \
-    "memcmp.$ac_objext "* | \
-  *" memcmp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;;
-esac
-
-
-
-
-for ac_header in stdlib.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
+  ac_cv_func_memcmp_working=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
+$as_echo "$ac_cv_func_memcmp_working" >&6; }
+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
+  *" memcmp.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
+ ;;
 esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_func in getpagesize
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-echo "$as_me:$LINENO: checking for working mmap" >&5
-echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-/* malloc might have been renamed as rpl_malloc. */
-#undef malloc
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-	mmap private not fixed
-	mmap private fixed at somewhere currently unmapped
-	mmap private fixed at somewhere already mapped
-	mmap shared not fixed
-	mmap shared fixed at somewhere currently unmapped
-	mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the file system buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propagated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-
-#include <fcntl.h>
-#include <sys/mman.h>
-
-#if !STDC_HEADERS && !HAVE_STDLIB_H
-char *malloc ();
-#endif
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#if !HAVE_GETPAGESIZE
-/* Assume that all systems that can run configure have sys/param.h.  */
-# if !HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  if HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192	/* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-int
-main ()
-{
-  char *data, *data2, *data3;
-  int i, pagesize;
-  int fd;
-
-  pagesize = getpagesize ();
-
-  /* First, make a file with some known garbage in it. */
-  data = (char *) malloc (pagesize);
-  if (!data)
-    exit (1);
-  for (i = 0; i < pagesize; ++i)
-    *(data + i) = rand ();
-  umask (0);
-  fd = creat ("conftest.mmap", 0600);
-  if (fd < 0)
-    exit (1);
-  if (write (fd, data, pagesize) != pagesize)
-    exit (1);
-  close (fd);
-
-  /* Next, try to mmap the file at a fixed address which already has
-     something else allocated at it.  If we can, also make sure that
-     we see the same garbage.  */
-  fd = open ("conftest.mmap", O_RDWR);
-  if (fd < 0)
-    exit (1);
-  data2 = (char *) malloc (2 * pagesize);
-  if (!data2)
-    exit (1);
-  data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1);
-  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
-		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
-    exit (1);
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data2 + i))
-      exit (1);
-
-  /* Finally, make sure that changes to the mapped area do not
-     percolate back to the file as seen by read().  (This is a bug on
-     some variants of i386 svr4.0.)  */
-  for (i = 0; i < pagesize; ++i)
-    *(data2 + i) = *(data2 + i) + 1;
-  data3 = (char *) malloc (pagesize);
-  if (!data3)
-    exit (1);
-  if (read (fd, data3, pagesize) != pagesize)
-    exit (1);
-  for (i = 0; i < pagesize; ++i)
-    if (*(data + i) != *(data3 + i))
-      exit (1);
-  close (fd);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_mmap_fixed_mapped=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5
-echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MMAP 1
-_ACEOF
-
-fi
-rm -f conftest.mmap
-
 
 
 for ac_header in sys/select.h sys/socket.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-echo "$as_me:$LINENO: checking types of arguments for select" >&5
-echo $ECHO_N "checking types of arguments for select... $ECHO_C" >&6
-if test "${ac_cv_func_select_args+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5
+$as_echo_n "checking types of arguments for select... " >&6; }
+if test "${ac_cv_func_select_args+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   for ac_arg234 in 'fd_set *' 'int *' 'void *'; do
- for ac_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do
+ for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do
   for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
-#if HAVE_SYS_SELECT_H
+#ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif
-#if HAVE_SYS_SOCKET_H
+#ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
 
@@ -13088,35 +10656,10 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
  done
 done
@@ -13124,8 +10667,8 @@
 : ${ac_cv_func_select_args='int,int *,struct timeval *'}
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_select_args" >&5
-echo "${ECHO_T}$ac_cv_func_select_args" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5
+$as_echo "$ac_cv_func_select_args" >&6; }
 ac_save_IFS=$IFS; IFS=','
 set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'`
 IFS=$ac_save_IFS
@@ -13147,313 +10690,83 @@
 
 rm -f conftest*
 
-echo "$as_me:$LINENO: checking for function prototypes" >&5
-echo $ECHO_N "checking for function prototypes... $ECHO_C" >&6
-if test "$ac_cv_prog_cc_stdc" != no; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define PROTOTYPES 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define __PROTOTYPES 1
-_ACEOF
-
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-echo "$as_me:$LINENO: checking whether setvbuf arguments are reversed" >&5
-echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
-if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${ac_cv_func_setvbuf_reversed+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_func_setvbuf_reversed=no
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-#	  if PROTOTYPES
-	   int (setvbuf) (FILE *, int, char *, size_t);
-#	  endif
-int
-main ()
-{
-char buf; return setvbuf (stdout, _IOLBF, &buf, 1);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-#	     if PROTOTYPES
-	      int (setvbuf) (FILE *, int, char *, size_t);
-#	     endif
-int
-main ()
-{
-char buf; return setvbuf (stdout, &buf, _IOLBF, 1);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  # It compiles and links either way, so it must not be declared
-	 # with a prototype and most likely this is a K&R C compiler.
-	 # Try running it.
-	 if test "$cross_compiling" = yes; then
-  : # Assume setvbuf is not reversed when cross-compiling.
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-/* This call has the arguments reversed.
-		   A reversed system may check and see that the address of buf
-		   is not _IOLBF, _IONBF, or _IOFBF, and return nonzero.  */
-		char buf;
-		if (setvbuf (stdout, _IOLBF, &buf, 1) != 0)
-		  exit (1);
-		putchar ('\r');
-		exit (0); /* Non-reversed systems SEGV here.  */
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_setvbuf_reversed=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-rm -f core *.core
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-	ac_cv_func_setvbuf_reversed=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_setvbuf_reversed" >&5
-echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
-if test $ac_cv_func_setvbuf_reversed = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define SETVBUF_REVERSED 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
+if test "${ac_cv_type_signal+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <signal.h>
-#ifdef signal
-# undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
-#endif
 
 int
 main ()
 {
-int i;
+return *(signal (0, 0)) (0) == 1;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_signal=void
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_type_signal=int
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_signal=int
+  ac_cv_type_signal=void
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define RETSIGTYPE $ac_cv_type_signal
 _ACEOF
 
 
-echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5
-echo $ECHO_N "checking whether stat accepts an empty string... $ECHO_C" >&6
-if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
+$as_echo_n "checking whether stat accepts an empty string... " >&6; }
+if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_stat_empty_string_bug=yes
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 struct stat sbuf;
-  exit (stat ("", &sbuf) ? 1 : 0);
+  return stat ("", &sbuf) == 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_stat_empty_string_bug=yes
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_stat_empty_string_bug=no
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_stat_empty_string_bug=no
+  ac_cv_func_stat_empty_string_bug=yes
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5
-echo "${ECHO_T}$ac_cv_func_stat_empty_string_bug" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5
+$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; }
 if test $ac_cv_func_stat_empty_string_bug = yes; then
-  case $LIBOBJS in
-    "stat.$ac_objext"   | \
-  *" stat.$ac_objext"   | \
-    "stat.$ac_objext "* | \
+  case " $LIBOBJS " in
   *" stat.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS stat.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS stat.$ac_objext"
+ ;;
 esac
 
 
@@ -13463,175 +10776,54 @@
 
 fi
 
-
 for ac_func in strftime
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
+if test "x$ac_cv_func_strftime" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_STRFTIME 1
 _ACEOF
 
 else
   # strftime is in -lintl on SCO UNIX.
-echo "$as_me:$LINENO: checking for strftime in -lintl" >&5
-echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6
-if test "${ac_cv_lib_intl_strftime+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
+$as_echo_n "checking for strftime in -lintl... " >&6; }
+if test "${ac_cv_lib_intl_strftime+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char strftime ();
 int
 main ()
 {
-strftime ();
+return strftime ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_strftime=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_intl_strftime=no
+  ac_cv_lib_intl_strftime=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
-echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6
-if test $ac_cv_lib_intl_strftime = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRFTIME 1
-_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
+$as_echo "$ac_cv_lib_intl_strftime" >&6; }
+if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
+  $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
 
 LIBS="-lintl $LIBS"
 fi
@@ -13639,22 +10831,21 @@
 fi
 done
 
-echo "$as_me:$LINENO: checking for working strtod" >&5
-echo $ECHO_N "checking for working strtod... $ECHO_C" >&6
-if test "${ac_cv_func_strtod+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
+$as_echo_n "checking for working strtod... " >&6; }
+if test "${ac_cv_func_strtod+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_strtod=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+$ac_includes_default
+#ifndef strtod
 double strtod ();
+#endif
 int
 main()
 {
@@ -13665,7 +10856,7 @@
     double value;
     value = strtod (string, &term);
     if (value != 69 || term != (string + 4))
-      exit (1);
+      return 1;
   }
 
   {
@@ -13675,407 +10866,96 @@
     char *term;
     strtod (string, &term);
     if (term != string && *(term - 1) == 0)
-      exit (1);
+      return 1;
   }
-  exit (0);
+  return 0;
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_strtod=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_strtod=no
+  ac_cv_func_strtod=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5
-echo "${ECHO_T}$ac_cv_func_strtod" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
+$as_echo "$ac_cv_func_strtod" >&6; }
 if test $ac_cv_func_strtod = no; then
-  case $LIBOBJS in
-    "strtod.$ac_objext"   | \
-  *" strtod.$ac_objext"   | \
-    "strtod.$ac_objext "* | \
+  case " $LIBOBJS " in
   *" strtod.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS strtod.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS strtod.$ac_objext"
+ ;;
 esac
 
-echo "$as_me:$LINENO: checking for pow" >&5
-echo $ECHO_N "checking for pow... $ECHO_C" >&6
-if test "${ac_cv_func_pow+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define pow to an innocuous variant, in case <limits.h> declares pow.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define pow innocuous_pow
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char pow (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
+if test "x$ac_cv_func_pow" = x""yes; then :
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef pow
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pow ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_pow) || defined (__stub___pow)
-choke me
-#else
-char (*f) () = pow;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != pow;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_pow=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_pow=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_pow" >&5
-echo "${ECHO_T}$ac_cv_func_pow" >&6
 
 if test $ac_cv_func_pow = no; then
-  echo "$as_me:$LINENO: checking for pow in -lm" >&5
-echo $ECHO_N "checking for pow in -lm... $ECHO_C" >&6
-if test "${ac_cv_lib_m_pow+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
+$as_echo_n "checking for pow in -lm... " >&6; }
+if test "${ac_cv_lib_m_pow+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char pow ();
 int
 main ()
 {
-pow ();
+return pow ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_m_pow=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_m_pow=no
+  ac_cv_lib_m_pow=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
-echo "${ECHO_T}$ac_cv_lib_m_pow" >&6
-if test $ac_cv_lib_m_pow = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
+$as_echo "$ac_cv_lib_m_pow" >&6; }
+if test "x$ac_cv_lib_m_pow" = x""yes; then :
   POW_LIB=-lm
 else
-  { echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5
-echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
+$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
 fi
 
 fi
 
 fi
 
-
 for ac_func in vprintf
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
+if test "x$ac_cv_func_vprintf" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-echo "$as_me:$LINENO: checking for _doprnt" >&5
-echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
-if test "${ac_cv_func__doprnt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+#define HAVE_VPRINTF 1
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define _doprnt innocuous__doprnt
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
+if test "x$ac_cv_func__doprnt" = x""yes; then :
 
-#undef _doprnt
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char _doprnt ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub__doprnt) || defined (__stub____doprnt)
-choke me
-#else
-char (*f) () = _doprnt;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != _doprnt;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func__doprnt=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func__doprnt=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-echo "${ECHO_T}$ac_cv_func__doprnt" >&6
-if test $ac_cv_func__doprnt = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DOPRNT 1
-_ACEOF
+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
 
 fi
 
@@ -14083,186 +10963,46 @@
 done
 
 
-if test $cross_compiling = yes -a $gnumalloc = yes; then
+if test $cross_compiling = yes -a $gnumalloc = yes; then :
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+        configure cannot check whether malloc() and realloc() are GNU libc
+        compatible. You have to be ABSOLUTELY sure that they are, otherwise
+        run configure with the --without-gnu-malloc switch." >&5
+$as_echo "$as_me: WARNING:
+        configure cannot check whether malloc() and realloc() are GNU libc
+        compatible. You have to be ABSOLUTELY sure that they are, otherwise
+        run configure with the --without-gnu-malloc switch." >&2;}
+_mule_warning_8=yes
+_mule_has_warnings=yes
 
-	{ echo "$as_me:$LINENO: WARNING:
-    configure cannot check whether malloc() and realloc() are GNU libc
-    compatible. You have to be ABSOLUTELY sure that they are, otherwise
-    run configure with the --without-gnu-malloc switch." >&5
-echo "$as_me: WARNING:
-    configure cannot check whether malloc() and realloc() are GNU libc
-    compatible. You have to be ABSOLUTELY sure that they are, otherwise
-    run configure with the --without-gnu-malloc switch." >&2;}
 	ac_cv_func_malloc_0_nonnull=yes
 	ac_cv_func_realloc_0_nonnull=yes
 
 fi
-
-
 for ac_header in stdlib.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDLIB_H 1
 _ACEOF
 
 fi
 
 done
 
-echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
-echo $ECHO_N "checking for GNU libc compatible malloc... $ECHO_C" >&6
-if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_malloc_0_nonnull=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if STDC_HEADERS || HAVE_STDLIB_H
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
 # include <stdlib.h>
 #else
 char *malloc ();
@@ -14271,229 +11011,65 @@
 int
 main ()
 {
-exit (malloc (0) ? 0 : 1);
+return ! malloc (0);
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_malloc_0_nonnull=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_malloc_0_nonnull=no
+  ac_cv_func_malloc_0_nonnull=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
-echo "${ECHO_T}$ac_cv_func_malloc_0_nonnull" >&6
-if test $ac_cv_func_malloc_0_nonnull = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+if test $ac_cv_func_malloc_0_nonnull = yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_MALLOC 1
-_ACEOF
+$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
 
 else
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_MALLOC 0
-_ACEOF
+  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
 
-   case $LIBOBJS in
-    "malloc.$ac_objext"   | \
-  *" malloc.$ac_objext"   | \
-    "malloc.$ac_objext "* | \
+   case " $LIBOBJS " in
   *" malloc.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS malloc.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
+ ;;
 esac
 
 
-cat >>confdefs.h <<\_ACEOF
-#define malloc rpl_malloc
-_ACEOF
+$as_echo "#define malloc rpl_malloc" >>confdefs.h
 
 fi
 
 
-
-
 for ac_header in stdlib.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_STDLIB_H 1
 _ACEOF
 
 fi
 
 done
 
-echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5
-echo $ECHO_N "checking for GNU libc compatible realloc... $ECHO_C" >&6
-if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
+$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
+if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   ac_cv_func_realloc_0_nonnull=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#if STDC_HEADERS || HAVE_STDLIB_H
+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
 # include <stdlib.h>
 #else
 char *realloc ();
@@ -14502,74 +11078,90 @@
 int
 main ()
 {
-exit (realloc (0, 0) ? 0 : 1);
+return ! realloc (0, 0);
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_realloc_0_nonnull=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_func_realloc_0_nonnull=no
+  ac_cv_func_realloc_0_nonnull=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5
-echo "${ECHO_T}$ac_cv_func_realloc_0_nonnull" >&6
-if test $ac_cv_func_realloc_0_nonnull = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
+$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
+if test $ac_cv_func_realloc_0_nonnull = yes; then :
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_REALLOC 1
-_ACEOF
+$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
 
 else
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_REALLOC 0
-_ACEOF
+  $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
 
-   case $LIBOBJS in
-    "realloc.$ac_objext"   | \
-  *" realloc.$ac_objext"   | \
-    "realloc.$ac_objext "* | \
+   case " $LIBOBJS " in
   *" realloc.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS realloc.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
+ ;;
 esac
 
 
-cat >>confdefs.h <<\_ACEOF
-#define realloc rpl_realloc
-_ACEOF
+$as_echo "#define realloc rpl_realloc" >>confdefs.h
 
 fi
 
 
+for ac_func in __argz_count __argz_next __argz_stringify endpwent floor ftruncate getcwd gethostbyaddr gethostbyname gethostname getpass gettimeofday inet_ntoa localeconv memmove mempcpy memset nl_langinfo pow select setlocale socket sqrt stpcpy strcasecmp strchr strcspn strdup strerror strncasecmp strstr strtoul sigaction
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
+fi
+done
 
+#-------------------------------------------------------------------------------
+# End of autoscan stuff
+#-------------------------------------------------------------------------------
 
+for ac_func in mkdir getrlimit setrlimit getopt_long
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
+fi
+done
 
 
 
 
 
+  for ac_header in $ac_header_list
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
+fi
 
+done
 
 
 
@@ -14577,422 +11169,332 @@
 
 
 
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes ; then :
 
+	# Check whether --enable-mmap was given.
+if test "${enable_mmap+set}" = set; then :
+  enableval=$enable_mmap;
+fi
 
 
 
+	if test ${enable_mmap:-no} = yes; then :
 
+		for ac_header in sys/mman.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_mman_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_MMAN_H 1
+_ACEOF
 
+fi
 
+done
 
 
+for ac_func in getpagesize
+do :
+  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETPAGESIZE 1
+_ACEOF
 
+fi
+done
 
-
-
-
-
-
-for ac_func in __argz_count __argz_next __argz_stringify endpwent floor ftruncate getcwd gethostbyaddr gethostbyname gethostname getpass gettimeofday inet_ntoa localeconv memmove mempcpy memset munmap nl_langinfo pow select setlocale socket sqrt stpcpy strcasecmp strchr strcspn strdup strerror strncasecmp strstr strtoul
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
+$as_echo_n "checking for working mmap... " >&6; }
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  if test "$cross_compiling" = yes; then :
+  ac_cv_func_mmap_fixed_mapped=no
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
+$ac_includes_default
+/* malloc might have been renamed as rpl_malloc. */
+#undef malloc
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+/* Thanks to Mike Haertel and Jim Avera for this test.
+   Here is a matrix of mmap possibilities:
+	mmap private not fixed
+	mmap private fixed at somewhere currently unmapped
+	mmap private fixed at somewhere already mapped
+	mmap shared not fixed
+	mmap shared fixed at somewhere currently unmapped
+	mmap shared fixed at somewhere already mapped
+   For private mappings, we should verify that changes cannot be read()
+   back from the file, nor mmap's back from the file at a different
+   address.  (There have been systems where private was not correctly
+   implemented like the infamous i386 svr4.0, and systems where the
+   VM page cache was not coherent with the file system buffer cache
+   like early versions of FreeBSD and possibly contemporary NetBSD.)
+   For shared mappings, we should conversely verify that changes get
+   propagated back to all the places they're supposed to be.
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+   Grep wants private fixed already mapped.
+   The main things grep needs to know about mmap are:
+   * does it exist and is it safe to write into the mmap'd area
+   * how to use it (BSD variants)  */
 
-#undef $ac_func
+#include <fcntl.h>
+#include <sys/mman.h>
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+char *malloc ();
 #endif
 
+/* This mess was copied from the GNU getpagesize.h.  */
+#ifndef HAVE_GETPAGESIZE
+# ifdef _SC_PAGESIZE
+#  define getpagesize() sysconf(_SC_PAGESIZE)
+# else /* no _SC_PAGESIZE */
+#  ifdef HAVE_SYS_PARAM_H
+#   include <sys/param.h>
+#   ifdef EXEC_PAGESIZE
+#    define getpagesize() EXEC_PAGESIZE
+#   else /* no EXEC_PAGESIZE */
+#    ifdef NBPG
+#     define getpagesize() NBPG * CLSIZE
+#     ifndef CLSIZE
+#      define CLSIZE 1
+#     endif /* no CLSIZE */
+#    else /* no NBPG */
+#     ifdef NBPC
+#      define getpagesize() NBPC
+#     else /* no NBPC */
+#      ifdef PAGESIZE
+#       define getpagesize() PAGESIZE
+#      endif /* PAGESIZE */
+#     endif /* no NBPC */
+#    endif /* no NBPG */
+#   endif /* no EXEC_PAGESIZE */
+#  else /* no HAVE_SYS_PARAM_H */
+#   define getpagesize() 8192	/* punt totally */
+#  endif /* no HAVE_SYS_PARAM_H */
+# endif /* no _SC_PAGESIZE */
+
+#endif /* no HAVE_GETPAGESIZE */
+
 int
 main ()
 {
-return f != $ac_func;
-  ;
+  char *data, *data2, *data3;
+  int i, pagesize;
+  int fd, fd2;
+
+  pagesize = getpagesize ();
+
+  /* First, make a file with some known garbage in it. */
+  data = (char *) malloc (pagesize);
+  if (!data)
+    return 1;
+  for (i = 0; i < pagesize; ++i)
+    *(data + i) = rand ();
+  umask (0);
+  fd = creat ("conftest.mmap", 0600);
+  if (fd < 0)
+    return 2;
+  if (write (fd, data, pagesize) != pagesize)
+    return 3;
+  close (fd);
+
+  /* Next, check that the tail of a page is zero-filled.  File must have
+     non-zero length, otherwise we risk SIGBUS for entire page.  */
+  fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600);
+  if (fd2 < 0)
+    return 4;
+  data2 = "";
+  if (write (fd2, data2, 1) != 1)
+    return 5;
+  data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L);
+  if (data2 == MAP_FAILED)
+    return 6;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data2 + i))
+      return 7;
+  close (fd2);
+  if (munmap (data2, pagesize))
+    return 8;
+
+  /* Next, try to mmap the file at a fixed address which already has
+     something else allocated at it.  If we can, also make sure that
+     we see the same garbage.  */
+  fd = open ("conftest.mmap", O_RDWR);
+  if (fd < 0)
+    return 9;
+  if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE,
+		     MAP_PRIVATE | MAP_FIXED, fd, 0L))
+    return 10;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data2 + i))
+      return 11;
+
+  /* Finally, make sure that changes to the mapped area do not
+     percolate back to the file as seen by read().  (This is a bug on
+     some variants of i386 svr4.0.)  */
+  for (i = 0; i < pagesize; ++i)
+    *(data2 + i) = *(data2 + i) + 1;
+  data3 = (char *) malloc (pagesize);
+  if (!data3)
+    return 12;
+  if (read (fd, data3, pagesize) != pagesize)
+    return 13;
+  for (i = 0; i < pagesize; ++i)
+    if (*(data + i) != *(data3 + i))
+      return 14;
+  close (fd);
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_func_mmap_fixed_mapped=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
+  ac_cv_func_mmap_fixed_mapped=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
 
 fi
-done
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5
+$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; }
+if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
-#-------------------------------------------------------------------------------
-# End of autoscan stuff
-#-------------------------------------------------------------------------------
+$as_echo "#define HAVE_MMAP 1" >>confdefs.h
 
+fi
+rm -f conftest.mmap conftest.txt
 
+		for ac_func in munmap sysconf
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
+fi
+done
 
+		if test $ac_cv_func_sysconf = yes; then :
 
-for ac_func in mkdir getrlimit setrlimit getopt_long
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pagesize constant for sysconf" >&5
+$as_echo_n "checking for pagesize constant for sysconf... " >&6; }
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
 
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
+					#include <unistd.h>
 
 int
 main ()
 {
-return f != $ac_func;
+
+					return sysconf(_SC_PAGESIZE);
+
   ;
   return 0;
 }
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
 
-fi
-done
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: _SC_PAGESIZE" >&5
+$as_echo "_SC_PAGESIZE" >&6; }
+
+$as_echo "#define HAVE__SC_PAGESIZE 1" >>confdefs.h
 
 
-mule_backup_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600"
-echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5
-echo $ECHO_N "checking whether strerror_r is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl_strerror_r+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+
+
+						#include <unistd.h>
+
 int
 main ()
 {
-#ifndef strerror_r
-  char *p = (char *) strerror_r;
-#endif
+
+						return sysconf(_SC_PAGE_SIZE);
 
   ;
   return 0;
 }
+
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl_strerror_r=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_link "$LINENO"; then :
 
-ac_cv_have_decl_strerror_r=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5
-echo "${ECHO_T}$ac_cv_have_decl_strerror_r" >&6
-if test $ac_cv_have_decl_strerror_r = yes; then
+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: _SC_PAGE_SIZE" >&5
+$as_echo "_SC_PAGE_SIZE" >&6; }
 
-cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRERROR_R 1
-_ACEOF
+$as_echo "#define HAVE__SC_PAGE_SIZE 1" >>confdefs.h
 
 
 else
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DECL_STRERROR_R 0
-_ACEOF
 
+					{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 
 fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
+fi
 
-for ac_func in strerror_r
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
+		# fake the result of the test for munmap() for the gettext macros
+		ac_cv_func_munmap=no
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
+fi
 
-#undef $ac_func
+fi
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
+mule_backup_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600"
+ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strerror_r" = x""yes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
 
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRERROR_R $ac_have_decl
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+for ac_func in strerror_r
+do :
+  ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
+if test "x$ac_cv_func_strerror_r" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_STRERROR_R 1
 _ACEOF
 
 fi
 done
 
-echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5
-echo $ECHO_N "checking whether strerror_r returns char *... $ECHO_C" >&6
-if test "${ac_cv_func_strerror_r_char_p+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
+$as_echo_n "checking whether strerror_r returns char *... " >&6; }
+if test "${ac_cv_func_strerror_r_char_p+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
     ac_cv_func_strerror_r_char_p=no
     if test $ac_cv_have_decl_strerror_r = yes; then
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -15002,40 +11504,16 @@
 	  char buf[100];
 	  char x = *strerror_r (0, buf, sizeof buf);
 	  char *p = strerror_r (0, buf, sizeof buf);
+	  return !p || x;
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_strerror_r_char_p=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     else
       # strerror_r is not declared.  Choose between
       # systems that have relatively inaccessible declarations for the
@@ -15043,14 +11521,10 @@
       # former has a strerror_r that returns char*, while the latter
       # has a strerror_r that returns `int'.
       # This test should segfault on the DEC system.
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 	extern char *strerror_r ();
@@ -15059,60 +11533,42 @@
 {
 char buf[100];
 	  char x = *strerror_r (0, buf, sizeof buf);
-	  exit (!isalpha (x));
+	  return ! isalpha (x);
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_strerror_r_char_p=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
+
     fi
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_func_strerror_r_char_p" >&5
-echo "${ECHO_T}$ac_cv_func_strerror_r_char_p" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
+$as_echo "$ac_cv_func_strerror_r_char_p" >&6; }
 if test $ac_cv_func_strerror_r_char_p = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STRERROR_R_CHAR_P 1
-_ACEOF
+$as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h
 
 fi
 
 CPPFLAGS="$mule_backup_CPPFLAGS"
 
 # Look for a way to preallocate disk space for files.
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes ; then :
 
-	echo "$as_me:$LINENO: checking for fallocate" >&5
-echo $ECHO_N "checking for fallocate... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fallocate" >&5
+$as_echo_n "checking for fallocate... " >&6; }
 	mule_backup_CPPFLAGS="$CPPFLAGS"
 	CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
-	cat >conftest.$ac_ext <<_ACEOF
-
-		/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 			#define _GNU_SOURCE
 			#ifdef HAVE_FCNTL_H
 			#  include <fcntl.h>
@@ -15130,62 +11586,31 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 
+		$as_echo "#define HAVE_FALLOCATE 1" >>confdefs.h
 
-		cat >>confdefs.h <<\_ACEOF
-#define HAVE_FALLOCATE 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	CPPFLAGS="$mule_backup_CPPFLAGS"
 
 
-	echo "$as_me:$LINENO: checking for SYS_fallocate" >&5
-echo $ECHO_N "checking for SYS_fallocate... $ECHO_C" >&6
-	cat >conftest.$ac_ext <<_ACEOF
-
-		/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYS_fallocate" >&5
+$as_echo_n "checking for SYS_fallocate... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 			#include <sys/syscall.h>
 			#include <sys/types.h>
 			#include <unistd.h>
@@ -15201,60 +11626,29 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 
+		$as_echo "#define HAVE_SYS_FALLOCATE 1" >>confdefs.h
 
-		cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_FALLOCATE 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
-	echo "$as_me:$LINENO: checking for posix_fallocate" >&5
-echo $ECHO_N "checking for posix_fallocate... $ECHO_C" >&6
-	cat >conftest.$ac_ext <<_ACEOF
-
-		/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for posix_fallocate" >&5
+$as_echo_n "checking for posix_fallocate... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 			#define _XOPEN_SOURCE 600
 			#include <stdlib.h>
 			#ifdef HAVE_FCNTL_H
@@ -15272,50 +11666,24 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 
+		$as_echo "#define HAVE_POSIX_FALLOCATE 1" >>confdefs.h
 
-		cat >>confdefs.h <<\_ACEOF
-#define HAVE_POSIX_FALLOCATE 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
+fi
 
 # Checking Native Language Support
 
@@ -15334,10 +11702,10 @@
 
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_MSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGFMT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
   /*)
@@ -15362,19 +11730,19 @@
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:$LINENO: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+$as_echo "$MSGFMT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_GMSGFMT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
   [\\/]* | ?:[\\/]*)
@@ -15386,36 +11754,37 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
   ;;
 esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
-
 if test -n "$GMSGFMT"; then
-  echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+$as_echo "$GMSGFMT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
+
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_XGETTEXT+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
   /*)
@@ -15440,21 +11809,21 @@
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+$as_echo "$XGETTEXT" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
     rm -f messages.po
 
     # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_MSGMERGE+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   case "$MSGMERGE" in
   /*)
@@ -15478,11 +11847,11 @@
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
-  echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-echo "${ECHO_T}$MSGMERGE" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+$as_echo "$MSGMERGE" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -15492,8 +11861,8 @@
       : ;
     else
       GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
-      echo "$as_me:$LINENO: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found $GMSGFMT program is not GNU msgfmt; ignore it" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $GMSGFMT program is not GNU msgfmt; ignore it" >&5
+$as_echo "found $GMSGFMT program is not GNU msgfmt; ignore it" >&6; }
       GMSGFMT=":"
     fi
   fi
@@ -15503,153 +11872,66 @@
        (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
       : ;
     else
-      echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
       XGETTEXT=":"
     fi
         rm -f messages.po
   fi
 
-            ac_config_commands="$ac_config_commands default-1"
+  ac_config_commands="$ac_config_commands default-1"
 
 
-echo "$as_me:$LINENO: checking for library containing strerror" >&5
-echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
-if test "${ac_cv_search_strerror+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-ac_cv_search_strerror=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char strerror ();
-int
-main ()
-{
-strerror ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="none required"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lcposix" >&5
+$as_echo_n "checking for strerror in -lcposix... " >&6; }
+if test "${ac_cv_lib_cposix_strerror+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_strerror" = no; then
-  for ac_lib in cposix; do
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcposix  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char strerror ();
 int
 main ()
 {
-strerror ();
+return strerror ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_search_strerror="-l$ac_lib"
-break
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_cposix_strerror=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  ac_cv_lib_cposix_strerror=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-  done
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
-LIBS=$ac_func_search_save_LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cposix_strerror" >&5
+$as_echo "$ac_cv_lib_cposix_strerror" >&6; }
+if test "x$ac_cv_lib_cposix_strerror" = x""yes; then :
+  LIBS="$LIBS -lcposix"
 fi
-echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-echo "${ECHO_T}$ac_cv_search_strerror" >&6
-if test "$ac_cv_search_strerror" != no; then
-  test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS"
 
-fi
 
 
-    echo "$as_me:$LINENO: checking whether we are using the GNU C Library 2.1 or newer" >&5
-echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
-if test "${ac_cv_gnu_library_2_1+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C Library 2.1 or newer" >&5
+$as_echo_n "checking whether we are using the GNU C Library 2.1 or newer... " >&6; }
+if test "${ac_cv_gnu_library_2_1+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <features.h>
@@ -15661,7 +11943,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "Lucky GNU user" >/dev/null 2>&1; then
+  $EGREP "Lucky GNU user" >/dev/null 2>&1; then :
   ac_cv_gnu_library_2_1=yes
 else
   ac_cv_gnu_library_2_1=no
@@ -15671,21 +11953,21 @@
 
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_gnu_library_2_1" >&5
-echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gnu_library_2_1" >&5
+$as_echo "$ac_cv_gnu_library_2_1" >&6; }
 
     GLIBC21="$ac_cv_gnu_library_2_1"
 
 
 
 
-  echo "$as_me:$LINENO: checking whether integer division by zero raises SIGFPE" >&5
-echo $ECHO_N "checking whether integer division by zero raises SIGFPE... $ECHO_C" >&6
-if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether integer division by zero raises SIGFPE" >&5
+$as_echo_n "checking whether integer division by zero raises SIGFPE... " >&6; }
+if test "${gt_cv_int_divbyzero_sigfpe+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-      if test "$cross_compiling" = yes; then
+      if test "$cross_compiling" = yes; then :
 
           # Guess based on the CPU.
           case "$host_cpu" in
@@ -15696,11 +11978,7 @@
           esac
 
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -15740,32 +12018,19 @@
 }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   gt_cv_int_divbyzero_sigfpe=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-gt_cv_int_divbyzero_sigfpe=no
+  gt_cv_int_divbyzero_sigfpe=no
 fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
+
 fi
-echo "$as_me:$LINENO: result: $gt_cv_int_divbyzero_sigfpe" >&5
-echo "${ECHO_T}$gt_cv_int_divbyzero_sigfpe" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_int_divbyzero_sigfpe" >&5
+$as_echo "$gt_cv_int_divbyzero_sigfpe" >&6; }
   case "$gt_cv_int_divbyzero_sigfpe" in
     *yes) value=1;;
     *) value=0;;
@@ -15777,16 +12042,12 @@
 
 
 
-  echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
-if test "${jm_ac_cv_header_inttypes_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
+$as_echo_n "checking for inttypes.h... " >&6; }
+if test "${jm_ac_cv_header_inttypes_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <inttypes.h>
@@ -15798,39 +12059,15 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   jm_ac_cv_header_inttypes_h=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-jm_ac_cv_header_inttypes_h=no
+  jm_ac_cv_header_inttypes_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $jm_ac_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$jm_ac_cv_header_inttypes_h" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $jm_ac_cv_header_inttypes_h" >&5
+$as_echo "$jm_ac_cv_header_inttypes_h" >&6; }
   if test $jm_ac_cv_header_inttypes_h = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -15840,16 +12077,12 @@
   fi
 
 
-  echo "$as_me:$LINENO: checking for stdint.h" >&5
-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
-if test "${jm_ac_cv_header_stdint_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdint.h" >&5
+$as_echo_n "checking for stdint.h... " >&6; }
+if test "${jm_ac_cv_header_stdint_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <stdint.h>
@@ -15861,39 +12094,15 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   jm_ac_cv_header_stdint_h=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-jm_ac_cv_header_stdint_h=no
+  jm_ac_cv_header_stdint_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $jm_ac_cv_header_stdint_h" >&5
-echo "${ECHO_T}$jm_ac_cv_header_stdint_h" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $jm_ac_cv_header_stdint_h" >&5
+$as_echo "$jm_ac_cv_header_stdint_h" >&6; }
   if test $jm_ac_cv_header_stdint_h = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -15903,16 +12112,12 @@
   fi
 
 
-  echo "$as_me:$LINENO: checking for unsigned long long" >&5
-echo $ECHO_N "checking for unsigned long long... $ECHO_C" >&6
-if test "${ac_cv_type_unsigned_long_long+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long" >&5
+$as_echo_n "checking for unsigned long long... " >&6; }
+if test "${ac_cv_type_unsigned_long_long+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 unsigned long long ull = 1; int i = 63;
 int
@@ -15924,45 +12129,19 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_type_unsigned_long_long=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_unsigned_long_long=no
+  ac_cv_type_unsigned_long_long=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long" >&5
-echo "${ECHO_T}$ac_cv_type_unsigned_long_long" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long" >&5
+$as_echo "$ac_cv_type_unsigned_long_long" >&6; }
   if test $ac_cv_type_unsigned_long_long = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UNSIGNED_LONG_LONG 1
-_ACEOF
+$as_echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>confdefs.h
 
   fi
 
@@ -15982,17 +12161,13 @@
   fi
 
 
-  echo "$as_me:$LINENO: checking for inttypes.h" >&5
-echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
-if test "${gt_cv_header_inttypes_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inttypes.h" >&5
+$as_echo_n "checking for inttypes.h... " >&6; }
+if test "${gt_cv_header_inttypes_h+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <inttypes.h>
@@ -16004,40 +12179,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   gt_cv_header_inttypes_h=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_header_inttypes_h=no
+  gt_cv_header_inttypes_h=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $gt_cv_header_inttypes_h" >&5
-echo "${ECHO_T}$gt_cv_header_inttypes_h" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_header_inttypes_h" >&5
+$as_echo "$gt_cv_header_inttypes_h" >&6; }
   if test $gt_cv_header_inttypes_h = yes; then
 
 cat >>confdefs.h <<_ACEOF
@@ -16049,17 +12200,13 @@
 
 
   if test $gt_cv_header_inttypes_h = yes; then
-    echo "$as_me:$LINENO: checking whether the inttypes.h PRIxNN macros are broken" >&5
-echo $ECHO_N "checking whether the inttypes.h PRIxNN macros are broken... $ECHO_C" >&6
-if test "${gt_cv_inttypes_pri_broken+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the inttypes.h PRIxNN macros are broken" >&5
+$as_echo_n "checking whether the inttypes.h PRIxNN macros are broken... " >&6; }
+if test "${gt_cv_inttypes_pri_broken+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <inttypes.h>
 #ifdef PRId32
@@ -16074,40 +12221,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   gt_cv_inttypes_pri_broken=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_inttypes_pri_broken=yes
+  gt_cv_inttypes_pri_broken=yes
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $gt_cv_inttypes_pri_broken" >&5
-echo "${ECHO_T}$gt_cv_inttypes_pri_broken" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_inttypes_pri_broken" >&5
+$as_echo "$gt_cv_inttypes_pri_broken" >&6; }
   fi
   if test "$gt_cv_inttypes_pri_broken" = yes; then
 
@@ -16134,18 +12257,18 @@
   prefix="$acl_save_prefix"
 
 
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
-fi;
+fi
+
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by GCC" >&5
-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -16174,14 +12297,14 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${acl_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+if test "${acl_cv_path_LD+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
@@ -16207,19 +12330,17 @@
 
 LD="$acl_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${acl_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if test "${acl_cv_prog_gnu_ld+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
@@ -16228,16 +12349,16 @@
   acl_cv_prog_gnu_ld=no
 fi
 fi
-echo "$as_me:$LINENO: result: $acl_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$acl_cv_prog_gnu_ld" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
-                                                echo "$as_me:$LINENO: checking for shared library run path origin" >&5
-echo $ECHO_N "checking for shared library run path origin... $ECHO_C" >&6
-if test "${acl_cv_rpath+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+                                                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if test "${acl_cv_rpath+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
@@ -16247,8 +12368,8 @@
     acl_cv_rpath=done
 
 fi
-echo "$as_me:$LINENO: result: $acl_cv_rpath" >&5
-echo "${ECHO_T}$acl_cv_rpath" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
   wl="$acl_cv_wl"
   libext="$acl_cv_libext"
   shlibext="$acl_cv_shlibext"
@@ -16258,13 +12379,13 @@
   hardcode_minus_L="$acl_cv_hardcode_minus_L"
   sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec"
   sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec"
-    # Check whether --enable-rpath or --disable-rpath was given.
-if test "${enable_rpath+set}" = set; then
-  enableval="$enable_rpath"
-  :
+    # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then :
+  enableval=$enable_rpath; :
 else
   enable_rpath=yes
-fi;
+fi
+
 
 
 
@@ -16286,10 +12407,9 @@
   prefix="$acl_save_prefix"
 
 
-# Check whether --with-libiconv-prefix or --without-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then
-  withval="$with_libiconv_prefix"
-
+# Check whether --with-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then :
+  withval=$with_libiconv_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
@@ -16312,7 +12432,8 @@
       fi
     fi
 
-fi;
+fi
+
       LIBICONV=
   LTLIBICONV=
   INCICONV=
@@ -16651,285 +12772,31 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+  for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-for ac_func in feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
+  for ac_func in feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
 geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
 strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -16966,19 +12833,15 @@
   done
 
 
-  echo "$as_me:$LINENO: checking for iconv" >&5
-echo $ECHO_N "checking for iconv... $ECHO_C" >&6
-if test "${am_cv_func_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if test "${am_cv_func_iconv+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <iconv.h>
@@ -16992,44 +12855,15 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_func_iconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     if test "$am_cv_func_iconv" != yes; then
       am_save_LIBS="$LIBS"
       LIBS="$LIBS $LIBICONV"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <iconv.h>
@@ -17043,55 +12877,28 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
       LIBS="$am_save_LIBS"
     fi
 
 fi
-echo "$as_me:$LINENO: result: $am_cv_func_iconv" >&5
-echo "${ECHO_T}$am_cv_func_iconv" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
   if test "$am_cv_func_iconv" = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ICONV 1
-_ACEOF
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
 
   fi
   if test "$am_cv_lib_iconv" = yes; then
-    echo "$as_me:$LINENO: checking how to link with libiconv" >&5
-echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6
-    echo "$as_me:$LINENO: result: $LIBICONV" >&5
-echo "${ECHO_T}$LIBICONV" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
   else
             CPPFLAGS="$am_save_CPPFLAGS"
     LIBICONV=
@@ -17101,17 +12908,13 @@
 
 
   if test "$am_cv_func_iconv" = yes; then
-    echo "$as_me:$LINENO: checking for iconv declaration" >&5
-echo $ECHO_N "checking for iconv declaration... $ECHO_C" >&6
-    if test "${am_cv_proto_iconv+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv declaration" >&5
+$as_echo_n "checking for iconv declaration... " >&6; }
+    if test "${am_cv_proto_iconv+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -17134,44 +12937,20 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   am_cv_proto_iconv_arg1=""
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_proto_iconv_arg1="const"
+  am_cv_proto_iconv_arg1="const"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"
 fi
 
     am_cv_proto_iconv=`echo "$am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
-    echo "$as_me:$LINENO: result: ${ac_t:-
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${ac_t:-
          }$am_cv_proto_iconv" >&5
-echo "${ECHO_T}${ac_t:-
-         }$am_cv_proto_iconv" >&6
+$as_echo "${ac_t:-
+         }$am_cv_proto_iconv" >&6; }
 
 cat >>confdefs.h <<_ACEOF
 #define ICONV_CONST $am_cv_proto_iconv_arg1
@@ -17180,16 +12959,12 @@
   fi
 
 
-  echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
-if test "${am_cv_langinfo_codeset+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
+$as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
+if test "${am_cv_langinfo_codeset+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <langinfo.h>
 int
@@ -17200,61 +12975,31 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_langinfo_codeset=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_langinfo_codeset=no
+  am_cv_langinfo_codeset=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $am_cv_langinfo_codeset" >&5
-echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_langinfo_codeset" >&5
+$as_echo "$am_cv_langinfo_codeset" >&6; }
   if test $am_cv_langinfo_codeset = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LANGINFO_CODESET 1
-_ACEOF
+$as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
   fi
 
   if test $ac_cv_header_locale_h = yes; then
 
-  echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
-echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+$as_echo_n "checking for LC_MESSAGES... " >&6; }
+if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
 int
@@ -17265,45 +13010,19 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_val_LC_MESSAGES=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-am_cv_val_LC_MESSAGES=no
+  am_cv_val_LC_MESSAGES=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
-echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
+$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
   if test $am_cv_val_LC_MESSAGES = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
 
   fi
 
@@ -17313,10 +13032,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_INTLBISON+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_INTLBISON+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$INTLBISON"; then
   ac_cv_prog_INTLBISON="$INTLBISON" # Let the user override the test.
@@ -17326,34 +13045,36 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_INTLBISON="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:$LINENO: result: $INTLBISON" >&5
-echo "${ECHO_T}$INTLBISON" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLBISON" >&5
+$as_echo "$INTLBISON" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
+
   test -n "$INTLBISON" && break
 done
 
   if test -z "$INTLBISON"; then
     ac_verc_fail=yes
   else
-        echo "$as_me:$LINENO: checking version of bison" >&5
-echo $ECHO_N "checking version of bison... $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of bison" >&5
+$as_echo_n "checking version of bison... " >&6; }
     ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* $[0-9]*\.[0-9.]*$.*$/\1/p'`
     case $ac_prog_version in
       '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -17361,8 +13082,8 @@
          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
     esac
-    echo "$as_me:$LINENO: result: $ac_prog_version" >&5
-echo "${ECHO_T}$ac_prog_version" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5
+$as_echo "$ac_prog_version" >&6; }
   fi
   if test $ac_verc_fail = yes; then
     INTLBISON=:
@@ -17370,16 +13091,13 @@
 
 
 
-# Check whether --with-language or --without-language was given.
-if test "${with_language+set}" = set; then
-  withval="$with_language"
-  if test "$withval" = "all"; then
-  LINGUAS='%UNSET%'
-else
+# Check whether --with-language was given.
+if test "${with_language+set}" = set; then :
+  withval=$with_language; if test "$withval" != "all"; then :
   LINGUAS="`echo $withval | sed -e 's/,/ /g'`"
 fi
+fi
 
-fi;
 
 
 
@@ -17395,17 +13113,17 @@
 
 
 
-  echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
-    # Check whether --enable-nls or --disable-nls was given.
-if test "${enable_nls+set}" = set; then
-  enableval="$enable_nls"
-  USE_NLS=$enableval
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+$as_echo_n "checking whether NLS is requested... " >&6; }
+    # Check whether --enable-nls was given.
+if test "${enable_nls+set}" = set; then :
+  enableval=$enable_nls; USE_NLS=$enableval
 else
   USE_NLS=yes
-fi;
-  echo "$as_me:$LINENO: result: $USE_NLS" >&5
-echo "${ECHO_T}$USE_NLS" >&6
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+$as_echo "$USE_NLS" >&6; }
 
 
 
@@ -17419,18 +13137,18 @@
     if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
 
-      echo "$as_me:$LINENO: checking whether included gettext is requested" >&5
-echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether included gettext is requested" >&5
+$as_echo_n "checking whether included gettext is requested... " >&6; }
 
-# Check whether --with-included-gettext or --without-included-gettext was given.
-if test "${with_included_gettext+set}" = set; then
-  withval="$with_included_gettext"
-  nls_cv_force_use_gnu_gettext=$withval
+# Check whether --with-included-gettext was given.
+if test "${with_included_gettext+set}" = set; then :
+  withval=$with_included_gettext; nls_cv_force_use_gnu_gettext=$withval
 else
   nls_cv_force_use_gnu_gettext=no
-fi;
-      echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5
-echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
+fi
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $nls_cv_force_use_gnu_gettext" >&5
+$as_echo "$nls_cv_force_use_gnu_gettext" >&6; }
 
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
@@ -17440,16 +13158,12 @@
 
 
 
-        echo "$as_me:$LINENO: checking for GNU gettext in libc" >&5
-echo $ECHO_N "checking for GNU gettext in libc... $ECHO_C" >&6
-if test "${gt_cv_func_gnugettext2_libc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+$as_echo_n "checking for GNU gettext in libc... " >&6; }
+if test "${gt_cv_func_gnugettext2_libc+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -17463,40 +13177,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_func_gnugettext2_libc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_func_gnugettext2_libc=no
+  gt_cv_func_gnugettext2_libc=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libc" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext2_libc" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext2_libc" >&5
+$as_echo "$gt_cv_func_gnugettext2_libc" >&6; }
 
         if test "$gt_cv_func_gnugettext2_libc" != "yes"; then
 
@@ -17516,10 +13206,9 @@
   prefix="$acl_save_prefix"
 
 
-# Check whether --with-libintl-prefix or --without-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then
-  withval="$with_libintl_prefix"
-
+# Check whether --with-libintl-prefix was given.
+if test "${with_libintl_prefix+set}" = set; then :
+  withval=$with_libintl_prefix;
     if test "X$withval" = "Xno"; then
       use_additional=no
     else
@@ -17542,7 +13231,8 @@
       fi
     fi
 
-fi;
+fi
+
       LIBINTL=
   LTLIBINTL=
   INCINTL=
@@ -17878,20 +13568,16 @@
     done
   fi
 
-          echo "$as_me:$LINENO: checking for GNU gettext in libintl" >&5
-echo $ECHO_N "checking for GNU gettext in libintl... $ECHO_C" >&6
-if test "${gt_cv_func_gnugettext2_libintl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+$as_echo_n "checking for GNU gettext in libintl... " >&6; }
+if test "${gt_cv_func_gnugettext2_libintl+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
   gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
-                        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+                        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -17909,44 +13595,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_func_gnugettext2_libintl=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-gt_cv_func_gnugettext2_libintl=no
+  gt_cv_func_gnugettext2_libintl=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
                         if test "$gt_cv_func_gnugettext2_libintl" != yes && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
-              cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+              cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <libintl.h>
 extern int _nl_msg_cat_cntr;
@@ -17964,45 +13622,20 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                 gt_cv_func_gnugettext2_libintl=yes
 
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"
 fi
-echo "$as_me:$LINENO: result: $gt_cv_func_gnugettext2_libintl" >&5
-echo "${ECHO_T}$gt_cv_func_gnugettext2_libintl" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext2_libintl" >&5
+$as_echo "$gt_cv_func_gnugettext2_libintl" >&6; }
         fi
 
                                         if test "$gt_cv_func_gnugettext2_libc" = "yes" \
@@ -18039,9 +13672,7 @@
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
 
     else
       USE_NLS=no
@@ -18052,10 +13683,10 @@
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
       if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then
-        echo "$as_me:$LINENO: checking how to link with libintl" >&5
-echo $ECHO_N "checking how to link with libintl... $ECHO_C" >&6
-        echo "$as_me:$LINENO: result: $LIBINTL" >&5
-echo "${ECHO_T}$LIBINTL" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+$as_echo_n "checking how to link with libintl... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+$as_echo "$LIBINTL" >&6; }
 
   for element in $INCINTL; do
     haveit=
@@ -18082,14 +13713,10 @@
       fi
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DCGETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
     fi
 
@@ -18129,56 +13756,58 @@
 
 
 
-	if test $USE_INCLUDED_LIBINTL = yes; then
+	if test $USE_INCLUDED_LIBINTL = yes; then :
   INCINTL=-I\${top_builddir}/intl
 fi
 
+	if test x$USE_NLS = xyes; then :
 
-	if test x$USE_NLS = xyes; then
-
-	echo "$as_me:$LINENO: checking for autopoint" >&5
-echo $ECHO_N "checking for autopoint... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autopoint" >&5
+$as_echo_n "checking for autopoint... " >&6; }
 	autopoint_version=`autopoint --version | head -n 1 | sed -e 's/.*[^0-9.]$[0-9]\{1,\}\(\.[0-9]\{1,\}$\{1,2\}\)[^0-9.]*/\1/'`
-	if test -n "$autopoint_version"; then
+	if test -n "$autopoint_version"; then :
 
-		echo "$as_me:$LINENO: result: yes ($autopoint_version)" >&5
-echo "${ECHO_T}yes ($autopoint_version)" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($autopoint_version)" >&5
+$as_echo "yes ($autopoint_version)" >&6; }
 
 
 else
 
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 		USE_NLS=no
 
 fi
 
-
 fi
+	if test x$USE_NLS = xno -a x${enable_nls:-yes} = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+        You need to install GNU gettext/gettext-tools to compile aMule with
+        i18n support." >&5
+$as_echo "$as_me: WARNING:
+        You need to install GNU gettext/gettext-tools to compile aMule with
+        i18n support." >&2;}
+_mule_warning_9=yes
+_mule_has_warnings=yes
 
-	if test x$USE_NLS = xno -a x${enable_nls:-yes} = xyes; then
-  { echo "$as_me:$LINENO: WARNING: You need to install GNU gettext/gettext-tools to compile aMule with i18n support." >&5
-echo "$as_me: WARNING: You need to install GNU gettext/gettext-tools to compile aMule with i18n support." >&2;}
 fi
 
+	if test ${USE_NLS:-no} = yes; then :
 
-	if test ${USE_NLS:-no} = yes; then
-
-		echo "$as_me:$LINENO: checking for requested languages" >&5
-echo $ECHO_N "checking for requested languages... $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for requested languages" >&5
+$as_echo_n "checking for requested languages... " >&6; }
 		Generate_Langs=`echo $LINGUAS | $AWK 'OFS="\\\\|" { for (i = 1; i <= NF; ++i) $i = "\\\\." $i; print }'`
 
-	if test "$AMULE_DAEMON" = "yes"; then
+	if test ${enable_amule_daemon:-no} = yes; then :
 
-		if test -z "$LINGUAS"; then
+		if test -z "$LINGUAS"; then :
   AMULE_DAEMON_MANPAGES=`ls -1 ${srcdir}/docs/man/amuled.* | sed -e 's:.*/::g'`
 else
 
-			AMULE_DAEMON_MANPAGES=`ls -1 ${srcdir}/docs/man/amuled.* | sed -e 's:.*/::g' | grep $Generate_Langs `
+			AMULE_DAEMON_MANPAGES=`ls -1 ${srcdir}/docs/man/amuled.* | sed -e 's:.*/::g' | grep $Generate_Langs`
 			AMULE_DAEMON_MANPAGES="`basename docs/man/amuled.1` $AMULE_DAEMON_MANPAGES"
 
 fi
-
 		AMULE_DAEMON_MANPAGES=`echo $AMULE_DAEMON_MANPAGES | tr -d '\n'`
 
 else
@@ -18187,18 +13816,16 @@
 
 
 
+	if test ${enable_amulecmd:-no} = yes; then :
 
-	if test "$AMULECMD" = "yes"; then
-
-		if test -z "$LINGUAS"; then
+		if test -z "$LINGUAS"; then :
   AMULECMD_MANPAGES=`ls -1 ${srcdir}/docs/man/amulecmd.* | sed -e 's:.*/::g'`
 else
 
-			AMULECMD_MANPAGES=`ls -1 ${srcdir}/docs/man/amulecmd.* | sed -e 's:.*/::g' | grep $Generate_Langs `
+			AMULECMD_MANPAGES=`ls -1 ${srcdir}/docs/man/amulecmd.* | sed -e 's:.*/::g' | grep $Generate_Langs`
 			AMULECMD_MANPAGES="`basename docs/man/amulecmd.1` $AMULECMD_MANPAGES"
 
 fi
-
 		AMULECMD_MANPAGES=`echo $AMULECMD_MANPAGES | tr -d '\n'`
 
 else
@@ -18207,38 +13834,34 @@
 
 
 
+	if test ${enable_webserver:-no} = yes; then :
 
-	if test "$WEB" = "yes"; then
-
-		if test -z "$LINGUAS"; then
-  WEB_MANPAGES=`ls -1 ${srcdir}/docs/man/amuleweb.* | sed -e 's:.*/::g'`
+		if test -z "$LINGUAS"; then :
+  WEBSERVER_MANPAGES=`ls -1 ${srcdir}/docs/man/amuleweb.* | sed -e 's:.*/::g'`
 else
 
-			WEB_MANPAGES=`ls -1 ${srcdir}/docs/man/amuleweb.* | sed -e 's:.*/::g' | grep $Generate_Langs `
-			WEB_MANPAGES="`basename docs/man/amuleweb.1` $WEB_MANPAGES"
+			WEBSERVER_MANPAGES=`ls -1 ${srcdir}/docs/man/amuleweb.* | sed -e 's:.*/::g' | grep $Generate_Langs`
+			WEBSERVER_MANPAGES="`basename docs/man/amuleweb.1` $WEBSERVER_MANPAGES"
 
 fi
-
-		WEB_MANPAGES=`echo $WEB_MANPAGES | tr -d '\n'`
+		WEBSERVER_MANPAGES=`echo $WEBSERVER_MANPAGES | tr -d '\n'`
 
 else
-  WEB_MANPAGES=
+  WEBSERVER_MANPAGES=
 fi
 
 
 
+	if test ${enable_amule_gui:-no} = yes; then :
 
-	if test "$AMULE_GUI" = "yes"; then
-
-		if test -z "$LINGUAS"; then
+		if test -z "$LINGUAS"; then :
   AMULE_GUI_MANPAGES=`ls -1 ${srcdir}/docs/man/amulegui.* | sed -e 's:.*/::g'`
 else
 
-			AMULE_GUI_MANPAGES=`ls -1 ${srcdir}/docs/man/amulegui.* | sed -e 's:.*/::g' | grep $Generate_Langs `
+			AMULE_GUI_MANPAGES=`ls -1 ${srcdir}/docs/man/amulegui.* | sed -e 's:.*/::g' | grep $Generate_Langs`
 			AMULE_GUI_MANPAGES="`basename docs/man/amulegui.1` $AMULE_GUI_MANPAGES"
 
 fi
-
 		AMULE_GUI_MANPAGES=`echo $AMULE_GUI_MANPAGES | tr -d '\n'`
 
 else
@@ -18247,18 +13870,16 @@
 
 
 
+	if test ${enable_cas:-no} = yes; then :
 
-	if test "$CAS" = "yes"; then
-
-		if test -z "$LINGUAS"; then
+		if test -z "$LINGUAS"; then :
   CAS_MANPAGES=`ls -1 ${srcdir}/src/utils/cas/docs/cas.* | sed -e 's:.*/::g'`
 else
 
-			CAS_MANPAGES=`ls -1 ${srcdir}/src/utils/cas/docs/cas.* | sed -e 's:.*/::g' | grep $Generate_Langs `
+			CAS_MANPAGES=`ls -1 ${srcdir}/src/utils/cas/docs/cas.* | sed -e 's:.*/::g' | grep $Generate_Langs`
 			CAS_MANPAGES="`basename src/utils/cas/docs/cas.1` $CAS_MANPAGES"
 
 fi
-
 		CAS_MANPAGES=`echo $CAS_MANPAGES | tr -d '\n'`
 
 else
@@ -18267,18 +13888,16 @@
 
 
 
+	if test ${enable_wxcas:-no} = yes; then :
 
-	if test "$WXCAS" = "yes"; then
-
-		if test -z "$LINGUAS"; then
+		if test -z "$LINGUAS"; then :
   WXCAS_MANPAGES=`ls -1 ${srcdir}/src/utils/wxCas/docs/wxcas.* | sed -e 's:.*/::g'`
 else
 
-			WXCAS_MANPAGES=`ls -1 ${srcdir}/src/utils/wxCas/docs/wxcas.* | sed -e 's:.*/::g' | grep $Generate_Langs `
+			WXCAS_MANPAGES=`ls -1 ${srcdir}/src/utils/wxCas/docs/wxcas.* | sed -e 's:.*/::g' | grep $Generate_Langs`
 			WXCAS_MANPAGES="`basename src/utils/wxCas/docs/wxcas.1` $WXCAS_MANPAGES"
 
 fi
-
 		WXCAS_MANPAGES=`echo $WXCAS_MANPAGES | tr -d '\n'`
 
 else
@@ -18287,18 +13906,16 @@
 
 
 
+	if test ${enable_ed2k:-yes} = yes; then :
 
-	if test "$ED2K" = "yes"; then
-
-		if test -z "$LINGUAS"; then
+		if test -z "$LINGUAS"; then :
   ED2K_MANPAGES=`ls -1 ${srcdir}/docs/man/ed2k.* | sed -e 's:.*/::g'`
 else
 
-			ED2K_MANPAGES=`ls -1 ${srcdir}/docs/man/ed2k.* | sed -e 's:.*/::g' | grep $Generate_Langs `
+			ED2K_MANPAGES=`ls -1 ${srcdir}/docs/man/ed2k.* | sed -e 's:.*/::g' | grep $Generate_Langs`
 			ED2K_MANPAGES="`basename docs/man/ed2k.1` $ED2K_MANPAGES"
 
 fi
-
 		ED2K_MANPAGES=`echo $ED2K_MANPAGES | tr -d '\n'`
 
 else
@@ -18307,18 +13924,16 @@
 
 
 
+	if test ${enable_alc:-no} = yes; then :
 
-	if test "$ALC" = "yes"; then
-
-		if test -z "$LINGUAS"; then
+		if test -z "$LINGUAS"; then :
   ALC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alc.* | sed -e 's:.*/::g'`
 else
 
-			ALC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alc.* | sed -e 's:.*/::g' | grep $Generate_Langs `
+			ALC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alc.* | sed -e 's:.*/::g' | grep $Generate_Langs`
 			ALC_MANPAGES="`basename src/utils/aLinkCreator/docs/alc.1` $ALC_MANPAGES"
 
 fi
-
 		ALC_MANPAGES=`echo $ALC_MANPAGES | tr -d '\n'`
 
 else
@@ -18327,18 +13942,16 @@
 
 
 
+	if test ${enable_alcc:-no} = yes; then :
 
-	if test "$ALCC" = "yes"; then
-
-		if test -z "$LINGUAS"; then
+		if test -z "$LINGUAS"; then :
   ALCC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alcc.* | sed -e 's:.*/::g'`
 else
 
-			ALCC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alcc.* | sed -e 's:.*/::g' | grep $Generate_Langs `
+			ALCC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alcc.* | sed -e 's:.*/::g' | grep $Generate_Langs`
 			ALCC_MANPAGES="`basename src/utils/aLinkCreator/docs/alcc.1` $ALCC_MANPAGES"
 
 fi
-
 		ALCC_MANPAGES=`echo $ALCC_MANPAGES | tr -d '\n'`
 
 else
@@ -18347,18 +13960,16 @@
 
 
 
+	if test ${enable_monolithic:-yes} = yes; then :
 
-	if test "$MONOLITHIC" = "yes"; then
-
-		if test -z "$LINGUAS"; then
+		if test -z "$LINGUAS"; then :
   MONOLITHIC_MANPAGES=`ls -1 ${srcdir}/docs/man/amule.* | sed -e 's:.*/::g'`
 else
 
-			MONOLITHIC_MANPAGES=`ls -1 ${srcdir}/docs/man/amule.* | sed -e 's:.*/::g' | grep $Generate_Langs `
+			MONOLITHIC_MANPAGES=`ls -1 ${srcdir}/docs/man/amule.* | sed -e 's:.*/::g' | grep $Generate_Langs`
 			MONOLITHIC_MANPAGES="`basename docs/man/amule.1` $MONOLITHIC_MANPAGES"
 
 fi
-
 		MONOLITHIC_MANPAGES=`echo $MONOLITHIC_MANPAGES | tr -d '\n'`
 
 else
@@ -18366,33 +13977,27 @@
 fi
 
 
-
-		echo "$as_me:$LINENO: result: ${LINGUAS:-all}" >&5
-echo "${ECHO_T}${LINGUAS:-all}" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${LINGUAS:-all}" >&5
+$as_echo "${LINGUAS:-all}" >&6; }
 
 fi
 
 
 
-
 # Check for bfd.h (to have proper backtraces without using wxExecute)
 
-	echo "$as_me:$LINENO: checking for bfd" >&5
-echo $ECHO_N "checking for bfd... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd" >&5
+$as_echo_n "checking for bfd... " >&6; }
 	result=no
-	for bfd_ldadd in "" "${LIBINTL}"; do
+	for bfd_ldadd in "" "${LIBINTL}" "-ldl" "-ldl ${LIBINTL}"; do
 		mule_backup_LIBS="$LIBS"
 		mule_backup_LDFLAGS="$LDFLAGS"
 		LIBS="-lbfd -liberty ${bfd_ldadd} ${ZLIB_LIBS} $LIBS"
 		LDFLAGS="$LDFLAGS ${ZLIB_LDFLAGS}"
-		cat >conftest.$ac_ext <<_ACEOF
-
-			/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 				#include <ansidecl.h>
 				#include <bfd.h>
 
@@ -18407,28 +14012,7 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 			result=yes
 			BFD_CPPFLAGS="-DHAVE_BFD"
@@ -18437,41 +14021,36 @@
 			LDFLAGS="$mule_backup_LDFLAGS"
 			break
 
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 		LIBS="$mule_backup_LIBS"
 		LDFLAGS="$mule_backup_LDFLAGS"
 	done
 
-	echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
-	if test $result = no; then
-  { echo "$as_me:$LINENO: WARNING:
-	bfd.h not found or unusable, please install binutils development
-	package if you are a developer or want to help testing aMule" >&5
-echo "$as_me: WARNING:
-	bfd.h not found or unusable, please install binutils development
-	package if you are a developer or want to help testing aMule" >&2;}
+	if test $result = no; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+        bfd.h not found or unusable, please install binutils development
+        package if you are a developer or want to help testing aMule" >&5
+$as_echo "$as_me: WARNING:
+        bfd.h not found or unusable, please install binutils development
+        package if you are a developer or want to help testing aMule" >&2;}
+_mule_warning_10=yes
+_mule_has_warnings=yes
 
 fi
 
 
-	echo "$as_me:$LINENO: checking for <execinfo.h> and backtrace()" >&5
-echo $ECHO_N "checking for <execinfo.h> and backtrace()... $ECHO_C" >&6
-	cat >conftest.$ac_ext <<_ACEOF
 
-		/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for <execinfo.h> and backtrace()" >&5
+$as_echo_n "checking for <execinfo.h> and backtrace()... " >&6; }
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+
 			#include <execinfo.h>
 
 int
@@ -18487,49 +14066,22 @@
 }
 
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 
+		$as_echo "#define HAVE_EXECINFO 1" >>confdefs.h
 
-		cat >>confdefs.h <<\_ACEOF
-#define HAVE_EXECINFO 1
-_ACEOF
-
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 
 # Flush standard test results for speeding cache
@@ -18551,39 +14103,59 @@
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
   (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"
-      ;;
+      ;; #(
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-} |
+    esac |
+    sort
+) |
   sed '
+     /^ac_cv_env_/b end
      t clear
-     : clear
+     :clear
      s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/
      t end
-     /^ac_cv_env/!s/^$[^=]*$=$.*$$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+     s/^$[^=]*$=$.*$$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    echo "not updating unwritable cache $cache_file"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -18591,78 +14163,54 @@
 # Other tests
 # aMule options
 
+	# Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then :
+  enableval=$enable_debug;
+fi
+
+
+	# Check whether --enable-profile was given.
+if test "${enable_profile+set}" = set; then :
+  enableval=$enable_profile;
+fi
+
+
+	# Check whether --enable-optimize was given.
+if test "${enable_optimize+set}" = set; then :
+  enableval=$enable_optimize;
+fi
 
-	# Check whether --enable-debug or --disable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval="$enable_debug"
-  USE_DEBUG=${enableval:-yes}
-else
-  USE_DEBUG=yes
-fi;
 
-	if test $USE_DEBUG = yes; then
+
+	if test ${enable_debug:-yes} = yes; then :
 
 		MULECPPFLAGS="$MULECPPFLAGS -D__DEBUG__"
 
 	MULECFLAGS="$MULECFLAGS -g"
 	MULECXXFLAGS="$MULECXXFLAGS -g"
 
-		if test ${GLIBCXX:-no} = yes; then
-  MULECPPFLAGS="$MULECPPFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC"
-fi
-
-		if test ${GCC:-no} = yes; then
+		if test ${GCC:-no} = yes; then :
 
 	MULECFLAGS="$MULECFLAGS -W -Wall -Wshadow -Wundef -ggdb -fno-inline -fmessage-length=0"
 	MULECXXFLAGS="$MULECXXFLAGS -W -Wall -Wshadow -Wundef -ggdb -fno-inline -fmessage-length=0"
 
 fi
-
-		if test ${SYS:-unknown} = win32; then
+		if test ${SYS:-unknown} = win32; then :
   MULERCFLAGS="$MULERCFLAGS -D__DEBUG__"
 fi
 
-
 else
 
-		if test ${GCC:-no} = yes; then
+		if test ${GCC:-no} = yes; then :
 
 	MULECFLAGS="$MULECFLAGS -W -Wall -Wshadow -Wundef"
 	MULECXXFLAGS="$MULECXXFLAGS -W -Wall -Wshadow -Wundef"
 
 fi
 
-
-fi
-
-
-
-	# Check whether --enable-optimize or --disable-optimize was given.
-if test "${enable_optimize+set}" = set; then
-  enableval="$enable_optimize"
-  USE_OPTIMIZE=${enableval:-no}
-else
-  USE_OPTIMIZE=no
-fi;
-
-	if test $USE_OPTIMIZE = yes; then
-
-	MULECFLAGS="$MULECFLAGS -O2"
-	MULECXXFLAGS="$MULECXXFLAGS -O2"
-
 fi
 
-
-
-	# Check whether --enable-profile or --disable-profile was given.
-if test "${enable_profile+set}" = set; then
-  enableval="$enable_profile"
-  USE_PROFILE=${enableval:-no}
-else
-  USE_PROFILE=no
-fi;
-
-	if test $USE_PROFILE = yes; then
+	if test ${enable_profile:-no} = yes; then :
 
 
 	MULECFLAGS="$MULECFLAGS -pg"
@@ -18672,47 +14220,38 @@
 
 fi
 
+	if test ${enable_optimize:-no} = yes; then :
 
+	MULECFLAGS="$MULECFLAGS -O2"
+	MULECXXFLAGS="$MULECXXFLAGS -O2"
 
-	echo "$as_me:$LINENO: checking if the applications should be statically linked" >&5
-echo $ECHO_N "checking if the applications should be statically linked... $ECHO_C" >&6
-	# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  if test ${enableval:-no} = yes; then
-  MULELDFLAGS="$MULELDFLAGS -static"
 fi
 
-fi;
-	echo "$as_me:$LINENO: result: ${enableval:-no}" >&5
-echo "${ECHO_T}${enableval:-no}" >&6
-
 	MULECPPFLAGS="$MULECPPFLAGS -DUSE_WX_EXTENSIONS"
 
 
 # autoconf >= 2.60 already defines ${docdir}, but we always need it.
-echo "$as_me:$LINENO: checking for docdir" >&5
-echo $ECHO_N "checking for docdir... $ECHO_C" >&6
-if test -z "$docdir"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for docdir" >&5
+$as_echo_n "checking for docdir... " >&6; }
+if test -z "$docdir"; then :
   docdir="${datadir}/doc/${PACKAGE_NAME}-${PACKAGE_VERSION}"
 fi
-
-echo "$as_me:$LINENO: result: $docdir" >&5
-echo "${ECHO_T}$docdir" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $docdir" >&5
+$as_echo "$docdir" >&6; }
 
 # Try to set the SVN checkout-date
-echo "$as_me:$LINENO: checking for SVNDATE" >&5
-echo $ECHO_N "checking for SVNDATE... $ECHO_C" >&6
-if test -f "$srcdir/SVNDATE" # SVNDATE for tarballs
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVNDATE" >&5
+$as_echo_n "checking for SVNDATE... " >&6; }
+if test -f "$srcdir/.svn-revision" # SVNDATE for tarballs
 then
-	svndate=`cat $srcdir/SVNDATE`
+	svndate="rev. `cat $srcdir/.svn-revision`"
 elif test -d $srcdir/.svn # SVNDATE for svn
 then
 	svndate="rev. `svnversion $srcdir | sed -e 's/[0-9][0-9]*:$.*$/\1/' -e 's/$[0-9][0-9]*$.*/\1/'`"
 fi
-echo "$as_me:$LINENO: result: ${svndate:-None required}" >&5
-echo "${ECHO_T}${svndate:-None required}" >&6
-if test -n "$svndate"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${svndate:-None required}" >&5
+$as_echo "${svndate:-None required}" >&6; }
+if test -n "$svndate"; then :
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18722,166 +14261,486 @@
 	    MULERCFLAGS="$MULERCFLAGS -D__PRERELEASE__"
 
 fi
-
 SVNDATE=$svndate
 
 
 
-# Check whether --with-denoise-level or --without-denoise-level was given.
-if test "${with_denoise_level+set}" = set; then
-  withval="$with_denoise_level"
+# Check whether --with-denoise-level was given.
+if test "${with_denoise_level+set}" = set; then :
+  withval=$with_denoise_level;
+fi
 
-fi;
 
-	echo "$as_me:$LINENO: checking denoising level" >&5
-echo $ECHO_N "checking denoising level... $ECHO_C" >&6
-	if test ${with_denoise_level:-5} = yes; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking denoising level" >&5
+$as_echo_n "checking denoising level... " >&6; }
+	if test ${with_denoise_level:-5} = yes; then :
   with_denoise_level=5
 fi
-
-	if test ${with_denoise_level:-5} = no; then
+	if test ${with_denoise_level:-5} = no; then :
   with_denoise_level=0
 fi
-
-	if test ${with_denoise_level:-5} -gt 4; then
-  if test "${svndate:+set}" = "set"; then
+	if test ${with_denoise_level:-5} -gt 4; then :
+  if test "${svndate:+set}" = "set"; then :
   with_denoise_level=0
 else
   with_denoise_level=4
 fi
+fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_denoise_level" >&5
+$as_echo "$with_denoise_level" >&6; }
+
+	ac_config_commands="$ac_config_commands denoiser"
+
+
+
+if test ${enable_plasmamule:-no} = yes; then :
+
+
+	if test -z ${QT_MOC}; then :
+
+		for ac_prog in moc-qt4 moc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_QT_MOC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $QT_MOC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_QT_MOC="$QT_MOC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_QT_MOC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+QT_MOC=$ac_cv_path_QT_MOC
+if test -n "$QT_MOC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_MOC" >&5
+$as_echo "$QT_MOC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$QT_MOC" && break
+done
+
+		if test -z ${QT_MOC}; then :
+
+			echo moc not found
+			exit 1
 
 fi
 
-	echo "$as_me:$LINENO: result: $with_denoise_level" >&5
-echo "${ECHO_T}$with_denoise_level" >&6
+else
 
-	          ac_config_commands="$ac_config_commands denoiser"
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for moc" >&5
+$as_echo_n "checking for moc... " >&6; }
+		if test -x ${QT_MOC}; then :
 
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${QT_MOC}" >&5
+$as_echo "${QT_MOC}" >&6; }
 
 
+else
 
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
+$as_echo "\"not found\"" >&6; }
+			QT_MOC="not found"
+			exit 1
+
+fi
+
+fi
+
+
+	if test "${QT_MOC}" != "not found"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for moc version >= 4" >&5
+$as_echo_n "checking for moc version >= 4... " >&6; }
+		QT_MOC_VERSION=`${QT_MOC} -v 2>&1 | sed -e 's/^.* (/(/'`
+		if test `echo ${QT_MOC_VERSION} | sed -e 's/^.* //' -e 's/\..*$//'` = 4; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${QT_MOC_VERSION}" >&5
+$as_echo "found ${QT_MOC_VERSION}" >&6; }
 
-if test x$WEB = xyes; then
-  WEB_TRUE=
-  WEB_FALSE='#'
 else
-  WEB_TRUE='#'
-  WEB_FALSE=
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ${QT_MOC_VERSION} is too old" >&5
+$as_echo "not found ${QT_MOC_VERSION} is too old" >&6; }
+			QT_MOC="not found"
+			exit 1
+
 fi
 
+fi
 
+	if test "${QT_MOC}" = "not found"; then :
+  enable_plasmamule=disabled
+fi
+
+	if test ${enable_plasmamule:-no} = yes; then :
+
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt" >&5
+$as_echo_n "checking for qt... " >&6; }
+	if test `${PKG_CONFIG} QtCore` --exists && `${PKG_CONFIG} QtGui --exists`; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt core cflags" >&5
+$as_echo_n "checking for qt core cflags... " >&6; }
+		QT_CORE_CXXFLAGS=`${PKG_CONFIG} --cflags QtCore`
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_CORE_CFLAGS" >&5
+$as_echo "$QT_CORE_CFLAGS" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt core libs" >&5
+$as_echo_n "checking for qt core libs... " >&6; }
+		QT_CORE_LIBS=`${PKG_CONFIG} --libs QtCore`
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_CORE_LIBS" >&5
+$as_echo "$QT_CORE_LIBS" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt gui cflags" >&5
+$as_echo_n "checking for qt gui cflags... " >&6; }
+		QT_GUI_CXXFLAGS=`${PKG_CONFIG} --cflags QtGui`
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_GUI_CFLAGS" >&5
+$as_echo "$QT_GUI_CFLAGS" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt gui libs" >&5
+$as_echo_n "checking for qt gui libs... " >&6; }
+		QT_GUI_LIBS=`${PKG_CONFIG} --libs QtGui`
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_GUI_LIBS" >&5
+$as_echo "$QT_GUI_LIBS" >&6; }
 
-if test x$ED2K = xyes; then
-  ED2K_TRUE=
-  ED2K_FALSE='#'
 else
-  ED2K_TRUE='#'
-  ED2K_FALSE=
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+		exit 1
+
 fi
 
+	if test `${PKG_CONFIG} QtDBus --modversion | sed -e 's/\.//g'` -ge 470 ; then :
 
+		QT_DBUS_LDFLAGS="-lQtDBus"
 
-if test x$CAS = xyes; then
-  CAS_TRUE=
-  CAS_FALSE='#'
+
+fi
+
+
+
+
+
+
+		if test -z "${QT_CORE_CXXFLAGS}"; then :
+  enable_plasmamule=disabled
+fi
+
+fi
+
+	if test ${enable_plasmamule:-no} = yes; then :
+
+
+	if test -z ${KDE4_CONFIG}; then :
+
+		# Extract the first word of "kde4-config", so it can be a program name with args.
+set dummy kde4-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_KDE4_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  CAS_TRUE='#'
-  CAS_FALSE=
+  case $KDE4_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_KDE4_CONFIG="$KDE4_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_KDE4_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+KDE4_CONFIG=$ac_cv_path_KDE4_CONFIG
+if test -n "$KDE4_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KDE4_CONFIG" >&5
+$as_echo "$KDE4_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
-if test x$WXCAS = xyes; then
-  WXCAS_TRUE=
-  WXCAS_FALSE='#'
 else
-  WXCAS_TRUE='#'
-  WXCAS_FALSE=
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4-config" >&5
+$as_echo_n "checking for kde4-config... " >&6; }
+		if test ! -x KDE4_CONFIG; then :
+
+			KDE4_CONFIG="not found"
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+			exit 1
+
 fi
 
+fi
 
+	if  test "${KDE4_CONFIG}" != "not found"; then :
+
+		KDE_CONF_VER=`${KDE4_CONFIG} --version | grep KDE | sed -e 's/^.*: //' -e 's/ (.*$//'`
+		if test `echo ${KDE_CONF_VER} | sed -e 's/\..*$//'` = 4; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${KDE4_CONFIG} with version ${KDE_CONF_VER}" >&5
+$as_echo "found ${KDE4_CONFIG} with version ${KDE_CONF_VER}" >&6; }
 
-if test x$ALC = xyes; then
-  ALC_TRUE=
-  ALC_FALSE='#'
 else
-  ALC_TRUE='#'
-  ALC_FALSE=
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: at least version 4 required" >&5
+$as_echo "at least version 4 required" >&6; }
+			exit 1
+
 fi
 
+else
 
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+		exit 1
+
+fi
+
+
+		if test "${KDE4_CONFIG}" = "not found"; then :
+  enable_plasmamule=disabled
+fi
+
+fi
+
+	if test ${enable_plasmamule:-no} = yes; then :
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 headers" >&5
+$as_echo_n "checking for kde4 headers... " >&6; }
+	KDE_HEADER_DIR=`${KDE4_CONFIG} --path include`
+
+	if test -f ${KDE_HEADER_DIR}kdirwatch.h; then :
+
+		if test -f ${KDE_HEADER_DIR}plasma/dataengine.h; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_HEADER_DIR}" >&5
+$as_echo "${KDE_HEADER_DIR}" >&6; }
 
-if test x$ALCC = xyes; then
-  ALCC_TRUE=
-  ALCC_FALSE='#'
 else
-  ALCC_TRUE='#'
-  ALCC_FALSE=
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: dataengine.h not found" >&5
+$as_echo "dataengine.h not found" >&6; }
+			exit 1
+
 fi
 
+else
 
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: kdirwatch.h not found" >&5
+$as_echo "kdirwatch.h not found" >&6; }
+		exit 1
+
+fi
+
+
+		if test -z ${KDE_HEADER_DIR}; then :
+  enable_plasmamule=disabled
+fi
+
+fi
+
+	if test ${enable_plasmamule:-no} = yes; then :
+
+		if test -e `$BUILD_CC -print-file-name=libplasma.so` &&
+			test -e `$BUILD_CC -print-file-name=libkdecore.so`; then :
+
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 applinks Path" >&5
+$as_echo_n "checking for kde4 applinks Path... " >&6; }
+	if test `echo ${prefix} | grep home | wc -l` == 1; then :
+
+		KDE_IN_HOME="yes"
+
+fi
+	if test ${KDE_IN_HOME} = "yes"; then :
+
+		KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
 
-if test x$AMULE_GUI = xyes; then
-  AMULE_GUI_TRUE=
-  AMULE_GUI_FALSE='#'
 else
-  AMULE_GUI_TRUE='#'
-  AMULE_GUI_FALSE=
+
+		if test -n ${prefix}; then :
+
+			KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | grep ${prefix} | head -1`
+			if test -n ${KDE_APPLNK_PATH}; then :
+
+				KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | grep -vE '(/home|/root)' | head -1`
+
 fi
 
+else
 
+			KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | grep -vE '(/home|/root)' | head -1`
+
+fi
+
+fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_APPLNK_PATH}" >&5
+$as_echo "${KDE_APPLNK_PATH}" >&6; }
+
+
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 services Path" >&5
+$as_echo_n "checking for kde4 services Path... " >&6; }
+	if test `echo ${prefix} | grep home | wc -l` == 1; then :
+
+		KDE_IN_HOME="yes"
+
+fi
+	if test ${KDE_IN_HOME} = "yes"; then :
+
+		KDE_SERVICE_PATH=`${KDE4_CONFIG} --path services | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
 
-if test x$AMULE_DAEMON = xyes; then
-  AMULE_DAEMON_TRUE=
-  AMULE_DAEMON_FALSE='#'
 else
-  AMULE_DAEMON_TRUE='#'
-  AMULE_DAEMON_FALSE=
+
+		KDE_SERVICE_PATH=`${KDE4_CONFIG} --path services | tr ":" "\n" | grep /usr | head -1`
+
 fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_SERVICE_PATH}" >&5
+$as_echo "${KDE_SERVICE_PATH}" >&6; }
 
 
 
-if test x$AMULECMD = xyes; then
-  COMPILE_CMD_TRUE=
-  COMPILE_CMD_FALSE='#'
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 plugins Path" >&5
+$as_echo_n "checking for kde4 plugins Path... " >&6; }
+	if test `echo ${prefix} | grep home | wc -l` == 1; then :
+
+		KDE_IN_HOME="yes"
+
+fi
+	if test ${KDE_IN_HOME} = "yes"; then :
+
+		KDE_MODULE_PATH=`${KDE4_CONFIG} --path module | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
+
 else
-  COMPILE_CMD_TRUE='#'
-  COMPILE_CMD_FALSE=
+
+		KDE_MODULE_PATH=`${KDE4_CONFIG} --path module | tr ":" "\n" | grep /usr | head -1`
+
 fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_MODULE_PATH}" >&5
+$as_echo "${KDE_MODULE_PATH}" >&6; }
 
 
 
-if test x$MONOLITHIC = xyes; then
-  MONOLITHIC_TRUE=
-  MONOLITHIC_FALSE='#'
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 icons Path" >&5
+$as_echo_n "checking for kde4 icons Path... " >&6; }
+	if test `echo ${prefix} | grep home | wc -l` == 1; then :
+
+		KDE_IN_HOME="yes"
+
+fi
+	if test ${KDE_IN_HOME} = "yes"; then :
+
+		KDE_ICON_PATH=`${KDE4_CONFIG} --path icon | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
+
 else
-  MONOLITHIC_TRUE='#'
-  MONOLITHIC_FALSE=
+
+		KDE_ICON_PATH=`${KDE4_CONFIG} --path icon | tr ":" "\n" | grep /usr | head -1`
+
 fi
+	KDE_ICON_PATH=${KDE_ICON_PATH}hicolor/scalable/mimetypes/
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_ICON_PATH}" >&5
+$as_echo "${KDE_ICON_PATH}" >&6; }
 
 
 
-if test x$ENABLE_UPNP = xyes; then
-  ENABLE_UPNP_TRUE=
-  ENABLE_UPNP_FALSE='#'
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for location for mime-type installation" >&5
+$as_echo_n "checking for location for mime-type installation... " >&6; }
+	if test `echo ${prefix} | grep home | wc -l` == 1; then :
+
+		KDE_IN_HOME="yes"
+
+fi
+	if test ${KDE_IN_HOME} = "yes"; then :
+
+		KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
+
 else
-  ENABLE_UPNP_TRUE='#'
-  ENABLE_UPNP_FALSE=
+
+		if test -n ${prefix}; then :
+
+			KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | grep ${prefix} | head -1`
+			if test -n ${KDE_MIME_PATH}; then :
+
+				KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | $EGREP -v '(/home|/root)' | head -1`
+
 fi
 
+else
+
+			KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | $EGREP -v '(/home|/root)' | head -1`
+
+fi
+
+fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_MIME_PATH}" >&5
+$as_echo "${KDE_MIME_PATH}" >&6; }
+
 
 
-if test x$ENABLE_IP2COUNTRY = xyes; then
-  ENABLE_IP2COUNTRY_TRUE=
-  ENABLE_IP2COUNTRY_FALSE='#'
 else
-  ENABLE_IP2COUNTRY_TRUE='#'
-  ENABLE_IP2COUNTRY_FALSE=
+  enable_plasmamule=disabled
+fi
+
 fi
 
+	if test ${enable_debug:-yes} = yes; then :
+
+		DEBUGFLAG="-D__DEBUG__"
+
 
+fi
+
+fi
 
-if test x$SYS = xwin32; then
+ if test x$SYS = xwin32; then
   SYS_WIN32_TRUE=
   SYS_WIN32_FALSE='#'
 else
@@ -18889,9 +14748,7 @@
   SYS_WIN32_FALSE=
 fi
 
-
-
-if test x$SYS = xwin32 -a "$RC" != ":"; then
+ if test x$SYS = xwin32 -a "$RC" != ":"; then
   NEED_RC_TRUE=
   NEED_RC_FALSE='#'
 else
@@ -18899,9 +14756,7 @@
   NEED_RC_FALSE=
 fi
 
-
-
-if test x$SYS = xdarwin; then
+ if test x$SYS = xdarwin; then
   NEED_CORESERVICES_TRUE=
   NEED_CORESERVICES_FALSE='#'
 else
@@ -18909,9 +14764,7 @@
   NEED_CORESERVICES_FALSE=
 fi
 
-
-
-if test x$USE_NLS = xyes; then
+ if test x$USE_NLS = xyes; then
   COMPILE_NLS_TRUE=
   COMPILE_NLS_FALSE='#'
 else
@@ -18919,9 +14772,7 @@
   COMPILE_NLS_FALSE=
 fi
 
-
-
-if test x$HAVE_FLEX_EXTENDED = xyes; then
+ if test x$HAVE_FLEX_EXTENDED = xyes; then
   GENERATE_FLEX_HEADER_TRUE=
   GENERATE_FLEX_HEADER_FALSE='#'
 else
@@ -18929,9 +14780,7 @@
   GENERATE_FLEX_HEADER_FALSE=
 fi
 
-
-
-if test x$INSTALL_SKINS = xyes; then
+ if test x$INSTALL_SKINS = xyes; then
   INSTALL_SKINS_TRUE=
   INSTALL_SKINS_FALSE='#'
 else
@@ -18939,14 +14788,39 @@
   INSTALL_SKINS_FALSE=
 fi
 
+ if test ${enable_plasmamule:-no} = yes; then
+  PLASMAMULE_TRUE=
+  PLASMAMULE_FALSE='#'
+else
+  PLASMAMULE_TRUE='#'
+  PLASMAMULE_FALSE=
+fi
+
+
+ if test  ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes -o ${enable_amulecmd:-no} = yes -o ${enable_webserver:-no} = yes -o ${enable_amule_gui:-no} = yes -o ${enable_fileview:-no} = yes ; then
+  COMPILE_LIB_COMMON_TRUE=
+  COMPILE_LIB_COMMON_FALSE='#'
+else
+  COMPILE_LIB_COMMON_TRUE='#'
+  COMPILE_LIB_COMMON_FALSE=
+fi
+
+ if test  ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes -o ${enable_amulecmd:-no} = yes -o ${enable_webserver:-no} = yes -o ${enable_amule_gui:-no} = yes ; then
+  COMPILE_LIB_EC_TRUE=
+  COMPILE_LIB_EC_FALSE='#'
+else
+  COMPILE_LIB_EC_TRUE='#'
+  COMPILE_LIB_EC_FALSE=
+fi
+
 
 # Check for readline library
-if test x$AMULECMD = xyes -o x$WEB = xyes; then
+if test ${enable_amulecmd:-no} = yes -o ${enable_webserver:-no} = yes ; then :
 
-  echo "$as_me:$LINENO: checking for a readline compatible library" >&5
-echo $ECHO_N "checking for a readline compatible library... $ECHO_C" >&6
-if test "${vl_cv_lib_readline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a readline compatible library" >&5
+$as_echo_n "checking for a readline compatible library... " >&6; }
+if test "${vl_cv_lib_readline+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
 
     ORIG_LIBS="$LIBS"
@@ -18958,58 +14832,29 @@
           TRY_LIB="-l$readline_lib -l$termcap_lib"
         fi
         LIBS="$ORIG_LIBS $TRY_LIB"
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char readline ();
 int
 main ()
 {
-readline ();
+return readline ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   vl_cv_lib_readline="$TRY_LIB"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
         if test -n "$vl_cv_lib_readline"; then
           break
         fi
@@ -19027,455 +14872,588 @@
     fi
 
 fi
-echo "$as_me:$LINENO: result: $vl_cv_lib_readline" >&5
-echo "${ECHO_T}$vl_cv_lib_readline" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vl_cv_lib_readline" >&5
+$as_echo "$vl_cv_lib_readline" >&6; }
 
   if test "$vl_cv_lib_readline" != "no"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LIBREADLINE 1
+$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
+
+    for ac_header in readline.h readline/readline.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
+fi
 
+done
 
-for ac_header in readline.h readline/readline.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readline supports history" >&5
+$as_echo_n "checking whether readline supports history... " >&6; }
+if test "${vl_cv_lib_readline_history+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+      vl_cv_lib_readline_history="no"
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char add_history ();
+int
+main ()
+{
+return add_history ();
+  ;
+  return 0;
+}
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_link "$LINENO"; then :
+  vl_cv_lib_readline_history="yes"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
-ac_header_compiler=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vl_cv_lib_readline_history" >&5
+$as_echo "$vl_cv_lib_readline_history" >&6; }
+    if test "$vl_cv_lib_readline_history" = "yes"; then
 
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
+$as_echo "#define HAVE_READLINE_HISTORY 1" >>confdefs.h
+
+      for ac_header in history.h readline/history.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
+
+fi
+
+done
+
+    fi
   fi
+
+  LIBS="$ORIG_LIBS"
+
+fi
+
+if test ${PLASMAMULE:-no} = yes; then :
+
+
+	if test -z ${QT_MOC}; then :
+
+		for ac_prog in moc-qt4 moc
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_QT_MOC+set}" = set; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_cpp_err=yes
+  case $QT_MOC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_QT_MOC="$QT_MOC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_QT_MOC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
 fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
+QT_MOC=$ac_cv_path_QT_MOC
+if test -n "$QT_MOC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_MOC" >&5
+$as_echo "$QT_MOC" >&6; }
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$QT_MOC" && break
+done
+
+		if test -z ${QT_MOC}; then :
+
+			echo moc not found
+			exit 1
 
-  ac_header_preproc=no
 fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for moc" >&5
+$as_echo_n "checking for moc... " >&6; }
+		if test -x ${QT_MOC}; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${QT_MOC}" >&5
+$as_echo "${QT_MOC}" >&6; }
+
+
+else
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
+$as_echo "\"not found\"" >&6; }
+			QT_MOC="not found"
+			exit 1
+
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+
+
+	if test "${QT_MOC}" != "not found"; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for moc version >= 4" >&5
+$as_echo_n "checking for moc version >= 4... " >&6; }
+		QT_MOC_VERSION=`${QT_MOC} -v 2>&1 | sed -e 's/^.* (/(/'`
+		if test `echo ${QT_MOC_VERSION} | sed -e 's/^.* //' -e 's/\..*$//'` = 4; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${QT_MOC_VERSION}" >&5
+$as_echo "found ${QT_MOC_VERSION}" >&6; }
+
+else
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ${QT_MOC_VERSION} is too old" >&5
+$as_echo "not found ${QT_MOC_VERSION} is too old" >&6; }
+			QT_MOC="not found"
+			exit 1
+
+fi
+
+fi
+
+	if test "${QT_MOC}" = "not found"; then :
+  enable_plasmamule=disabled
+fi
+
+	if test ${enable_plasmamule:-no} = yes; then :
+
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt" >&5
+$as_echo_n "checking for qt... " >&6; }
+	if test `${PKG_CONFIG} QtCore` --exists && `${PKG_CONFIG} QtGui --exists`; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt core cflags" >&5
+$as_echo_n "checking for qt core cflags... " >&6; }
+		QT_CORE_CXXFLAGS=`${PKG_CONFIG} --cflags QtCore`
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_CORE_CFLAGS" >&5
+$as_echo "$QT_CORE_CFLAGS" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt core libs" >&5
+$as_echo_n "checking for qt core libs... " >&6; }
+		QT_CORE_LIBS=`${PKG_CONFIG} --libs QtCore`
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_CORE_LIBS" >&5
+$as_echo "$QT_CORE_LIBS" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt gui cflags" >&5
+$as_echo_n "checking for qt gui cflags... " >&6; }
+		QT_GUI_CXXFLAGS=`${PKG_CONFIG} --cflags QtGui`
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_GUI_CFLAGS" >&5
+$as_echo "$QT_GUI_CFLAGS" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt gui libs" >&5
+$as_echo_n "checking for qt gui libs... " >&6; }
+		QT_GUI_LIBS=`${PKG_CONFIG} --libs QtGui`
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_GUI_LIBS" >&5
+$as_echo "$QT_GUI_LIBS" >&6; }
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+		exit 1
+
+fi
+
+	if test `${PKG_CONFIG} QtDBus --modversion | sed -e 's/\.//g'` -ge 470 ; then :
+
+		QT_DBUS_LDFLAGS="-lQtDBus"
+
+
+fi
+
+
+
+
+
+
+		if test -z "${QT_CORE_CXXFLAGS}"; then :
+  enable_plasmamule=disabled
+fi
 
 fi
 
+	if test ${enable_plasmamule:-no} = yes; then :
+
+
+	if test -z ${KDE4_CONFIG}; then :
+
+		# Extract the first word of "kde4-config", so it can be a program name with args.
+set dummy kde4-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_KDE4_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $KDE4_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_KDE4_CONFIG="$KDE4_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_KDE4_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
 done
+  done
+IFS=$as_save_IFS
 
-    echo "$as_me:$LINENO: checking whether readline supports history" >&5
-echo $ECHO_N "checking whether readline supports history... $ECHO_C" >&6
-if test "${vl_cv_lib_readline_history+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  ;;
+esac
+fi
+KDE4_CONFIG=$ac_cv_path_KDE4_CONFIG
+if test -n "$KDE4_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KDE4_CONFIG" >&5
+$as_echo "$KDE4_CONFIG" >&6; }
 else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
 
-      vl_cv_lib_readline_history="no"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char add_history ();
-int
-main ()
-{
-add_history ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  vl_cv_lib_readline_history="yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4-config" >&5
+$as_echo_n "checking for kde4-config... " >&6; }
+		if test ! -x KDE4_CONFIG; then :
+
+			KDE4_CONFIG="not found"
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+			exit 1
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $vl_cv_lib_readline_history" >&5
-echo "${ECHO_T}$vl_cv_lib_readline_history" >&6
-    if test "$vl_cv_lib_readline_history" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_READLINE_HISTORY 1
-_ACEOF
+	if  test "${KDE4_CONFIG}" != "not found"; then :
 
+		KDE_CONF_VER=`${KDE4_CONFIG} --version | grep KDE | sed -e 's/^.*: //' -e 's/ (.*$//'`
+		if test `echo ${KDE_CONF_VER} | sed -e 's/\..*$//'` = 4; then :
 
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${KDE4_CONFIG} with version ${KDE_CONF_VER}" >&5
+$as_echo "found ${KDE4_CONFIG} with version ${KDE_CONF_VER}" >&6; }
+
+else
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: at least version 4 required" >&5
+$as_echo "at least version 4 required" >&6; }
+			exit 1
 
-for ac_header in history.h readline/history.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+
 else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+		exit 1
+
+fi
+
+
+		if test "${KDE4_CONFIG}" = "not found"; then :
+  enable_plasmamule=disabled
+fi
+
+fi
+
+	if test ${enable_plasmamule:-no} = yes; then :
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 headers" >&5
+$as_echo_n "checking for kde4 headers... " >&6; }
+	KDE_HEADER_DIR=`${KDE4_CONFIG} --path include`
+
+	if test -f ${KDE_HEADER_DIR}kdirwatch.h; then :
+
+		if test -f ${KDE_HEADER_DIR}plasma/dataengine.h; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_HEADER_DIR}" >&5
+$as_echo "${KDE_HEADER_DIR}" >&6; }
+
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_header_compiler=no
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: dataengine.h not found" >&5
+$as_echo "dataengine.h not found" >&6; }
+			exit 1
+
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
 
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
 else
-  ac_cpp_err=yes
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: kdirwatch.h not found" >&5
+$as_echo "kdirwatch.h not found" >&6; }
+		exit 1
+
 fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
+
+
+		if test -z ${KDE_HEADER_DIR}; then :
+  enable_plasmamule=disabled
+fi
+
+fi
+
+	if test ${enable_plasmamule:-no} = yes; then :
+
+		if test -e `$BUILD_CC -print-file-name=libplasma.so` &&
+			test -e `$BUILD_CC -print-file-name=libkdecore.so`; then :
+
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 applinks Path" >&5
+$as_echo_n "checking for kde4 applinks Path... " >&6; }
+	if test `echo ${prefix} | grep home | wc -l` == 1; then :
+
+		KDE_IN_HOME="yes"
+
+fi
+	if test ${KDE_IN_HOME} = "yes"; then :
+
+		KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
+
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
 
-  ac_header_preproc=no
+		if test -n ${prefix}; then :
+
+			KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | grep ${prefix} | head -1`
+			if test -n ${KDE_APPLNK_PATH}; then :
+
+				KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | grep -vE '(/home|/root)' | head -1`
+
 fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
 
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to admin@amule.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  eval "$as_ac_Header=\$ac_header_preproc"
+
+			KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | grep -vE '(/home|/root)' | head -1`
+
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 
 fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_APPLNK_PATH}" >&5
+$as_echo "${KDE_APPLNK_PATH}" >&6; }
+
+
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 services Path" >&5
+$as_echo_n "checking for kde4 services Path... " >&6; }
+	if test `echo ${prefix} | grep home | wc -l` == 1; then :
+
+		KDE_IN_HOME="yes"
 
 fi
+	if test ${KDE_IN_HOME} = "yes"; then :
 
-done
+		KDE_SERVICE_PATH=`${KDE4_CONFIG} --path services | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
 
-    fi
-  fi
+else
 
-  LIBS="$ORIG_LIBS"
+		KDE_SERVICE_PATH=`${KDE4_CONFIG} --path services | tr ":" "\n" | grep /usr | head -1`
 
 fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_SERVICE_PATH}" >&5
+$as_echo "${KDE_SERVICE_PATH}" >&6; }
 
-# DO NOT MOVE UP... THERE'S A REASON TO BE HERE!!
 
 
-	# Check whether --enable-ccache or --disable-ccache was given.
-if test "${enable_ccache+set}" = set; then
-  enableval="$enable_ccache"
 
-fi;
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 plugins Path" >&5
+$as_echo_n "checking for kde4 plugins Path... " >&6; }
+	if test `echo ${prefix} | grep home | wc -l` == 1; then :
 
+		KDE_IN_HOME="yes"
 
-# Check whether --with-ccache-prefix or --without-ccache-prefix was given.
-if test "${with_ccache_prefix+set}" = set; then
-  withval="$with_ccache_prefix"
+fi
+	if test ${KDE_IN_HOME} = "yes"; then :
 
-fi;
+		KDE_MODULE_PATH=`${KDE4_CONFIG} --path module | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
 
-	echo "$as_me:$LINENO: checking whether ccache support should be added" >&5
-echo $ECHO_N "checking whether ccache support should be added... $ECHO_C" >&6
-	echo "$as_me:$LINENO: result: ${enable_ccache:-no}" >&5
-echo "${ECHO_T}${enable_ccache:-no}" >&6
-
-	if test ${enable_ccache:-no} = yes; then
-
-		echo "$as_me:$LINENO: checking for ccache presence" >&5
-echo $ECHO_N "checking for ccache presence... $ECHO_C" >&6
-		if test -z "$with_ccache_prefix"; then
+else
 
-			ccache_full=`which ccache`
-			with_ccache_prefix=`dirname ${ccache_full}`
+		KDE_MODULE_PATH=`${KDE4_CONFIG} --path module | tr ":" "\n" | grep /usr | head -1`
 
 fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_MODULE_PATH}" >&5
+$as_echo "${KDE_MODULE_PATH}" >&6; }
 
-		if $with_ccache_prefix/ccache -V >/dev/null 2>&1; then
 
-			echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-			CC="$with_ccache_prefix/ccache $CC"
-			CXX="$with_ccache_prefix/ccache $CXX"
-			BUILD_CC="$with_ccache_prefix/ccache $BUILD_CC"
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 icons Path" >&5
+$as_echo_n "checking for kde4 icons Path... " >&6; }
+	if test `echo ${prefix} | grep home | wc -l` == 1; then :
+
+		KDE_IN_HOME="yes"
+
+fi
+	if test ${KDE_IN_HOME} = "yes"; then :
+
+		KDE_ICON_PATH=`${KDE4_CONFIG} --path icon | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
+
+else
+
+		KDE_ICON_PATH=`${KDE4_CONFIG} --path icon | tr ":" "\n" | grep /usr | head -1`
+
+fi
+	KDE_ICON_PATH=${KDE_ICON_PATH}hicolor/scalable/mimetypes/
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_ICON_PATH}" >&5
+$as_echo "${KDE_ICON_PATH}" >&6; }
+
+
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for location for mime-type installation" >&5
+$as_echo_n "checking for location for mime-type installation... " >&6; }
+	if test `echo ${prefix} | grep home | wc -l` == 1; then :
+
+		KDE_IN_HOME="yes"
+
+fi
+	if test ${KDE_IN_HOME} = "yes"; then :
+
+		KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
 
 else
 
-			enable_ccache=no
-			echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+		if test -n ${prefix}; then :
+
+			KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | grep ${prefix} | head -1`
+			if test -n ${KDE_MIME_PATH}; then :
+
+				KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | $EGREP -v '(/home|/root)' | head -1`
+
+fi
+
+else
+
+			KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | $EGREP -v '(/home|/root)' | head -1`
+
+fi
+
+fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_MIME_PATH}" >&5
+$as_echo "${KDE_MIME_PATH}" >&6; }
+
+
+
+else
+  enable_plasmamule=disabled
+fi
+
+fi
+
+	if test ${enable_debug:-yes} = yes; then :
+
+		DEBUGFLAG="-D__DEBUG__"
+
 
 fi
 
+fi
+
+# DO NOT MOVE UP... THERE'S A REASON TO BE HERE!!
 
+
+	# Check whether --enable-ccache was given.
+if test "${enable_ccache+set}" = set; then :
+  enableval=$enable_ccache;
 fi
 
 
 
-                                                                                                                                                                                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile docs/Makefile docs/man/Makefile intl/Makefile src/Makefile src/pixmaps/Makefile src/pixmaps/flags_xpm/Makefile src/libs/Makefile src/libs/ec/Makefile src/libs/ec/cpp/Makefile src/libs/common/Makefile src/utils/Makefile src/utils/aLinkCreator/Makefile src/utils/aLinkCreator/docs/Makefile src/utils/aLinkCreator/src/Makefile src/utils/cas/Makefile src/utils/cas/docs/Makefile src/utils/fileview/Makefile src/utils/wxCas/Makefile src/utils/wxCas/docs/Makefile src/utils/wxCas/src/Makefile src/utils/xas/Makefile src/utils/xas/autostart-xas src/utils/xas/docs/Makefile src/skins/Makefile src/webserver/Makefile src/webserver/src/Makefile src/webserver/default/Makefile src/webserver/php-default/Makefile src/webserver/chicane/Makefile src/webserver/litoral/Makefile unittests/Makefile unittests/muleunit/Makefile unittests/tests/Makefile"
 
-                    ac_config_files="$ac_config_files po/Makefile.in Compilation.flags"
+# Check whether --with-ccache-prefix was given.
+if test "${with_ccache_prefix+set}" = set; then :
+  withval=$with_ccache_prefix;
+fi
+
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ccache support should be added" >&5
+$as_echo_n "checking whether ccache support should be added... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_ccache:-no}" >&5
+$as_echo "${enable_ccache:-no}" >&6; }
+
+	if test ${enable_ccache:-no} = yes; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ccache presence" >&5
+$as_echo_n "checking for ccache presence... " >&6; }
+		if test -z "$with_ccache_prefix"; then :
+
+			ccache_full=`which ccache`
+			with_ccache_prefix=`dirname ${ccache_full}`
+
+fi
+		if $with_ccache_prefix/ccache -V >/dev/null 2>&1; then :
 
-if test x$SYS = xwin32; then
-            ac_config_files="$ac_config_files version.rc"
+			CC="$with_ccache_prefix/ccache $CC"
+			CXX="$with_ccache_prefix/ccache $CXX"
+			BUILD_CC="$with_ccache_prefix/ccache $BUILD_CC"
+
+else
+  enable_ccache=no
+fi
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_ccache:-no}" >&5
+$as_echo "${enable_ccache:-no}" >&6; }
 
 fi
 
+
+ac_config_files="$ac_config_files Makefile docs/Makefile docs/man/Makefile intl/Makefile src/Makefile src/pixmaps/Makefile src/pixmaps/flags_xpm/Makefile src/libs/Makefile src/libs/ec/Makefile src/libs/ec/cpp/Makefile src/libs/common/Makefile src/utils/Makefile src/utils/aLinkCreator/Makefile src/utils/aLinkCreator/docs/Makefile src/utils/aLinkCreator/src/Makefile src/utils/cas/Makefile src/utils/cas/docs/Makefile src/utils/fileview/Makefile src/utils/plasmamule/Makefile src/utils/wxCas/Makefile src/utils/wxCas/docs/Makefile src/utils/wxCas/src/Makefile src/utils/xas/Makefile src/utils/xas/autostart-xas src/utils/xas/docs/Makefile src/skins/Makefile src/webserver/Makefile src/webserver/src/Makefile src/webserver/default/Makefile unittests/Makefile unittests/muleunit/Makefile unittests/tests/Makefile"
+
+ac_config_files="$ac_config_files po/Makefile.in Compilation.flags"
+
+if test x$SYS = xwin32; then :
+  ac_config_files="$ac_config_files version.rc"
+
+fi
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -19494,39 +15472,59 @@
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
   (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p"
-      ;;
+      ;; #(
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-} |
+    esac |
+    sort
+) |
   sed '
+     /^ac_cv_env_/b end
      t clear
-     : clear
+     :clear
      s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/
      t end
-     /^ac_cv_env/!s/^$[^=]*$=$.*$$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+     s/^$[^=]*$=$.*$$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    test "x$cache_file" != "x/dev/null" &&
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    echo "not updating unwritable cache $cache_file"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -19535,199 +15533,141 @@
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^$[^=]*=[	 ]*$:*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
 DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
 LTLIBOBJS=$ac_ltlibobjs
 
 
+ if test -n "$EXEEXT"; then
+  am__EXEEXT_TRUE=
+  am__EXEEXT_FALSE='#'
+else
+  am__EXEEXT_TRUE='#'
+  am__EXEEXT_FALSE=
+fi
+
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${MONOLITHIC_TRUE}" && test -z "${MONOLITHIC_FALSE}"; then
+  as_fn_error "conditional \"MONOLITHIC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${AMULE_DAEMON_TRUE}" && test -z "${AMULE_DAEMON_FALSE}"; then
+  as_fn_error "conditional \"AMULE_DAEMON\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COMPILE_CMD_TRUE}" && test -z "${COMPILE_CMD_FALSE}"; then
+  as_fn_error "conditional \"COMPILE_CMD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WEB_TRUE}" && test -z "${WEB_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"WEB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"WEB\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"WEB\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${ED2K_TRUE}" && test -z "${ED2K_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"ED2K\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ED2K\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+if test -z "${AMULE_GUI_TRUE}" && test -z "${AMULE_GUI_FALSE}"; then
+  as_fn_error "conditional \"AMULE_GUI\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${CAS_TRUE}" && test -z "${CAS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"CAS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"CAS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"CAS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${WXCAS_TRUE}" && test -z "${WXCAS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"WXCAS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"WXCAS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"WXCAS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${ED2K_TRUE}" && test -z "${ED2K_FALSE}"; then
+  as_fn_error "conditional \"ED2K\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ALC_TRUE}" && test -z "${ALC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"ALC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ALC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"ALC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ALCC_TRUE}" && test -z "${ALCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"ALCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ALCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"ALCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${AMULE_GUI_TRUE}" && test -z "${AMULE_GUI_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMULE_GUI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMULE_GUI\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${AMULE_DAEMON_TRUE}" && test -z "${AMULE_DAEMON_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMULE_DAEMON\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMULE_DAEMON\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${COMPILE_CMD_TRUE}" && test -z "${COMPILE_CMD_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"COMPILE_CMD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"COMPILE_CMD\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${MONOLITHIC_TRUE}" && test -z "${MONOLITHIC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MONOLITHIC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MONOLITHIC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${ENABLE_UPNP_TRUE}" && test -z "${ENABLE_UPNP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_UPNP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ENABLE_UPNP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${ENABLE_IP2COUNTRY_TRUE}" && test -z "${ENABLE_IP2COUNTRY_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_IP2COUNTRY\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ENABLE_IP2COUNTRY\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+if test -z "${XAS_TRUE}" && test -z "${XAS_FALSE}"; then
+  as_fn_error "conditional \"XAS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${FILEVIEW_TRUE}" && test -z "${FILEVIEW_FALSE}"; then
+  as_fn_error "conditional \"FILEVIEW\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${SYS_WIN32_TRUE}" && test -z "${SYS_WIN32_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"SYS_WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"SYS_WIN32\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"SYS_WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${NEED_RC_TRUE}" && test -z "${NEED_RC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"NEED_RC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"NEED_RC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"NEED_RC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${NEED_CORESERVICES_TRUE}" && test -z "${NEED_CORESERVICES_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"NEED_CORESERVICES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"NEED_CORESERVICES\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"NEED_CORESERVICES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${COMPILE_NLS_TRUE}" && test -z "${COMPILE_NLS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"COMPILE_NLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"COMPILE_NLS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"COMPILE_NLS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GENERATE_FLEX_HEADER_TRUE}" && test -z "${GENERATE_FLEX_HEADER_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"GENERATE_FLEX_HEADER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"GENERATE_FLEX_HEADER\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"GENERATE_FLEX_HEADER\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${INSTALL_SKINS_TRUE}" && test -z "${INSTALL_SKINS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_SKINS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"INSTALL_SKINS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"INSTALL_SKINS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${PLASMAMULE_TRUE}" && test -z "${PLASMAMULE_FALSE}"; then
+  as_fn_error "conditional \"PLASMAMULE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COMPILE_LIB_COMMON_TRUE}" && test -z "${COMPILE_LIB_COMMON_FALSE}"; then
+  as_fn_error "conditional \"COMPILE_LIB_COMMON\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COMPILE_LIB_EC_TRUE}" && test -z "${COMPILE_LIB_EC_FALSE}"; then
+  as_fn_error "conditional \"COMPILE_LIB_EC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -19737,81 +15677,252 @@
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-DUALCASE=1; export DUALCASE # for MKS sh
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\$.*\$"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\$.*\$$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
+      esac;
+      expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
 fi
 
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
-# Required to use basename.
-if expr a : '$a$' >/dev/null 2>&1; then
+
+if expr a : '$a$' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*$...$'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
-	 X"$0" : 'X$/$$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/$[^/][^/]*$\/*$/{ s//\1/; q; }
-  	  /^X\/$\/\/$$/{ s//\1/; q; }
-  	  /^X\/$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+	 X"$0" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/$[^/][^/]*$\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
-
-# PATH needs CR, and LINENO needs CR and PATH.
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
@@ -19819,148 +15930,123 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^$['$as_cr_digits']*$$.*$[$]LINENO$[^'$as_cr_alnum'_]$,\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '$a$' >/dev/null 2>&1; then
-  as_expr=expr
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
 else
-  as_expr=false
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
 fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -p'
   fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
 else
   as_ln_s='cp -p'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X$//$[^/]' \| \
+	 X"$as_dir" : 'X$//$$' \| \
+	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+if test -x / >/dev/null 2>&1; then
+  as_test_x='test -x'
+else
+  if ls -dL / >/dev/null 2>&1; then
+    as_ls_L_option=L
+  else
+    as_ls_L_option=
+  fi
+  as_test_x='
+    eval sh -c '\''
+      if test -d "$1"; then
+	test -d "$1/.";
+      else
+	case $1 in #(
+	-*)set "./$1";;
+	esac;
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+	???[sx]*):;;*)false;;esac;fi
+    '\'' sh
+  '
+fi
+as_executable_p=$as_test_x
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -19969,31 +16055,20 @@
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by aMule $as_me 2.2.6, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+# values after options handling.
+ac_log="
+This file was extended by aMule $as_me 2.3.1, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -20001,45 +16076,47 @@
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
 _ACEOF
 
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
 
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
 
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
 
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+config_commands="$ac_config_commands"
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+_ACEOF
 
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
@@ -20050,84 +16127,86 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
+Report bugs to <admin@amule.org>."
 
-cat >>$CONFIG_STATUS <<_ACEOF
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-aMule config.status 2.2.6
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+aMule config.status 2.3.1
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
+AWK='$AWK'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
   --*=*)
-    ac_option=`expr "x$1" : 'x$[^=]*$='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=$.*$'`
+    ac_option=`expr "X$1" : 'X$[^=]*$='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'`
     ac_shift=:
     ;;
-  -*)
+  *)
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
   esac
 
   case $ac_option in
   # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1" ;;
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
 
   esac
   shift
@@ -20141,19 +16220,32 @@
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
 fi
 
 _ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
 
-cat >>$CONFIG_STATUS <<_ACEOF
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 #
-# INIT-COMMANDS section.
+# INIT-COMMANDS
 #
-
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 # Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
@@ -20166,60 +16258,57 @@
 
 _ACEOF
 
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
-
-cat >>$CONFIG_STATUS <<\_ACEOF
+# Handling of arguments.
 for ac_config_target in $ac_config_targets
 do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
-  "docs/man/Makefile" ) CONFIG_FILES="$CONFIG_FILES docs/man/Makefile" ;;
-  "intl/Makefile" ) CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
-  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
-  "src/pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/pixmaps/Makefile" ;;
-  "src/pixmaps/flags_xpm/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/pixmaps/flags_xpm/Makefile" ;;
-  "src/libs/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libs/Makefile" ;;
-  "src/libs/ec/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libs/ec/Makefile" ;;
-  "src/libs/ec/cpp/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libs/ec/cpp/Makefile" ;;
-  "src/libs/common/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/libs/common/Makefile" ;;
-  "src/utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;;
-  "src/utils/aLinkCreator/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/aLinkCreator/Makefile" ;;
-  "src/utils/aLinkCreator/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/aLinkCreator/docs/Makefile" ;;
-  "src/utils/aLinkCreator/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/aLinkCreator/src/Makefile" ;;
-  "src/utils/cas/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/cas/Makefile" ;;
-  "src/utils/cas/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/cas/docs/Makefile" ;;
-  "src/utils/fileview/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/fileview/Makefile" ;;
-  "src/utils/wxCas/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/wxCas/Makefile" ;;
-  "src/utils/wxCas/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/wxCas/docs/Makefile" ;;
-  "src/utils/wxCas/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/wxCas/src/Makefile" ;;
-  "src/utils/xas/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/xas/Makefile" ;;
-  "src/utils/xas/autostart-xas" ) CONFIG_FILES="$CONFIG_FILES src/utils/xas/autostart-xas" ;;
-  "src/utils/xas/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/utils/xas/docs/Makefile" ;;
-  "src/skins/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/skins/Makefile" ;;
-  "src/webserver/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/webserver/Makefile" ;;
-  "src/webserver/src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/webserver/src/Makefile" ;;
-  "src/webserver/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/webserver/default/Makefile" ;;
-  "src/webserver/php-default/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/webserver/php-default/Makefile" ;;
-  "src/webserver/chicane/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/webserver/chicane/Makefile" ;;
-  "src/webserver/litoral/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/webserver/litoral/Makefile" ;;
-  "unittests/Makefile" ) CONFIG_FILES="$CONFIG_FILES unittests/Makefile" ;;
-  "unittests/muleunit/Makefile" ) CONFIG_FILES="$CONFIG_FILES unittests/muleunit/Makefile" ;;
-  "unittests/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES unittests/tests/Makefile" ;;
-  "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-  "Compilation.flags" ) CONFIG_FILES="$CONFIG_FILES Compilation.flags" ;;
-  "version.rc" ) CONFIG_FILES="$CONFIG_FILES version.rc" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-  "denoiser" ) CONFIG_COMMANDS="$CONFIG_COMMANDS denoiser" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+    "denoiser") CONFIG_COMMANDS="$CONFIG_COMMANDS denoiser" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
+    "docs/man/Makefile") CONFIG_FILES="$CONFIG_FILES docs/man/Makefile" ;;
+    "intl/Makefile") CONFIG_FILES="$CONFIG_FILES intl/Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES src/pixmaps/Makefile" ;;
+    "src/pixmaps/flags_xpm/Makefile") CONFIG_FILES="$CONFIG_FILES src/pixmaps/flags_xpm/Makefile" ;;
+    "src/libs/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/Makefile" ;;
+    "src/libs/ec/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/ec/Makefile" ;;
+    "src/libs/ec/cpp/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/ec/cpp/Makefile" ;;
+    "src/libs/common/Makefile") CONFIG_FILES="$CONFIG_FILES src/libs/common/Makefile" ;;
+    "src/utils/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/Makefile" ;;
+    "src/utils/aLinkCreator/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/aLinkCreator/Makefile" ;;
+    "src/utils/aLinkCreator/docs/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/aLinkCreator/docs/Makefile" ;;
+    "src/utils/aLinkCreator/src/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/aLinkCreator/src/Makefile" ;;
+    "src/utils/cas/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/cas/Makefile" ;;
+    "src/utils/cas/docs/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/cas/docs/Makefile" ;;
+    "src/utils/fileview/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/fileview/Makefile" ;;
+    "src/utils/plasmamule/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/plasmamule/Makefile" ;;
+    "src/utils/wxCas/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/wxCas/Makefile" ;;
+    "src/utils/wxCas/docs/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/wxCas/docs/Makefile" ;;
+    "src/utils/wxCas/src/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/wxCas/src/Makefile" ;;
+    "src/utils/xas/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/xas/Makefile" ;;
+    "src/utils/xas/autostart-xas") CONFIG_FILES="$CONFIG_FILES src/utils/xas/autostart-xas" ;;
+    "src/utils/xas/docs/Makefile") CONFIG_FILES="$CONFIG_FILES src/utils/xas/docs/Makefile" ;;
+    "src/skins/Makefile") CONFIG_FILES="$CONFIG_FILES src/skins/Makefile" ;;
+    "src/webserver/Makefile") CONFIG_FILES="$CONFIG_FILES src/webserver/Makefile" ;;
+    "src/webserver/src/Makefile") CONFIG_FILES="$CONFIG_FILES src/webserver/src/Makefile" ;;
+    "src/webserver/default/Makefile") CONFIG_FILES="$CONFIG_FILES src/webserver/default/Makefile" ;;
+    "unittests/Makefile") CONFIG_FILES="$CONFIG_FILES unittests/Makefile" ;;
+    "unittests/muleunit/Makefile") CONFIG_FILES="$CONFIG_FILES unittests/muleunit/Makefile" ;;
+    "unittests/tests/Makefile") CONFIG_FILES="$CONFIG_FILES unittests/tests/Makefile" ;;
+    "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+    "Compilation.flags") CONFIG_FILES="$CONFIG_FILES Compilation.flags" ;;
+    "version.rc") CONFIG_FILES="$CONFIG_FILES version.rc" ;;
+
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
+
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
@@ -20231,964 +16320,669 @@
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  tmp=
+  trap 'exit_status=$?
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
 }
-
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
   test -n "$tmp" && test -d "$tmp"
 }  ||
 {
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
 {
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/$.\{148\}$..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/$.\{148\}$..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = "&#x7;"
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
 }
 
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
-cat >>$CONFIG_STATUS <<_ACEOF
+# VPATH may cause trouble with some makes, so we remove $(srcdir),
+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+s/:*\$(srcdir):*/:/
+s/:*\${srcdir}:*/:/
+s/:*@srcdir@:*/:/
+s/^$[^=]*=[	 ]*$:*/\1/
+s/:*$//
+s/^[^=]*=[	 ]*$//
+}'
+fi
 
-#
-# CONFIG_FILES section.
-#
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
 
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@GEOIP_CPPFLAGS@,$GEOIP_CPPFLAGS,;t t
-s,@GEOIP_LDFLAGS@,$GEOIP_LDFLAGS,;t t
-s,@GEOIP_LIBS@,$GEOIP_LIBS,;t t
-s,@BFD_CPPFLAGS@,$BFD_CPPFLAGS,;t t
-s,@BFD_LIBS@,$BFD_LIBS,;t t
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@am__tar@,$am__tar,;t t
-s,@am__untar@,$am__untar,;t t
-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@RESOLV_LIB@,$RESOLV_LIB,;t t
-s,@X11LIBS@,$X11LIBS,;t t
-s,@MULECPPFLAGS@,$MULECPPFLAGS,;t t
-s,@MULECFLAGS@,$MULECFLAGS,;t t
-s,@MULECXXFLAGS@,$MULECXXFLAGS,;t t
-s,@MULELDFLAGS@,$MULELDFLAGS,;t t
-s,@MULERCFLAGS@,$MULERCFLAGS,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@DEPDIR@,$DEPDIR,;t t
-s,@am__include@,$am__include,;t t
-s,@am__quote@,$am__quote,;t t
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@CPP@,$CPP,;t t
-s,@BUILD_CC@,$BUILD_CC,;t t
-s,@ac_ct_BUILD_CC@,$ac_ct_BUILD_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t
-s,@BUILD_CPPFLAGS@,$BUILD_CPPFLAGS,;t t
-s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
-s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t
-s,@EGREP@,$EGREP,;t t
-s,@LEX@,$LEX,;t t
-s,@LEXLIB@,$LEXLIB,;t t
-s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@YACC@,$YACC,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@LD@,$LD,;t t
-s,@ac_ct_LD@,$ac_ct_LD,;t t
-s,@ZLIB_CPPFLAGS@,$ZLIB_CPPFLAGS,;t t
-s,@ZLIB_LDFLAGS@,$ZLIB_LDFLAGS,;t t
-s,@ZLIB_LIBS@,$ZLIB_LIBS,;t t
-s,@GDLIB_CONFIG_PATH@,$GDLIB_CONFIG_PATH,;t t
-s,@GDLIB_CFLAGS@,$GDLIB_CFLAGS,;t t
-s,@GDLIB_LDFLAGS@,$GDLIB_LDFLAGS,;t t
-s,@GDLIB_LIBS@,$GDLIB_LIBS,;t t
-s,@CAS_DEFS@,$CAS_DEFS,;t t
-s,@REGEX_LIBS@,$REGEX_LIBS,;t t
-s,@LIBPNG_CONFIG_PATH@,$LIBPNG_CONFIG_PATH,;t t
-s,@LIBPNG_CFLAGS@,$LIBPNG_CFLAGS,;t t
-s,@LIBPNG_LDFLAGS@,$LIBPNG_LDFLAGS,;t t
-s,@LIBPNG_LIBS@,$LIBPNG_LIBS,;t t
-s,@AMULEWEB_DEFS@,$AMULEWEB_DEFS,;t t
-s,@WX_CONFIG_PATH@,$WX_CONFIG_PATH,;t t
-s,@WX_CPPFLAGS@,$WX_CPPFLAGS,;t t
-s,@WX_CFLAGS@,$WX_CFLAGS,;t t
-s,@WX_CXXFLAGS@,$WX_CXXFLAGS,;t t
-s,@WX_CFLAGS_ONLY@,$WX_CFLAGS_ONLY,;t t
-s,@WX_CXXFLAGS_ONLY@,$WX_CXXFLAGS_ONLY,;t t
-s,@WX_LIBS@,$WX_LIBS,;t t
-s,@WX_LIBS_STATIC@,$WX_LIBS_STATIC,;t t
-s,@WX_VERSION_FULL@,$WX_VERSION_FULL,;t t
-s,@WX_RESCOMP@,$WX_RESCOMP,;t t
-s,@WX_VERSION_MAJOR@,$WX_VERSION_MAJOR,;t t
-s,@WX_VERSION_MINOR@,$WX_VERSION_MINOR,;t t
-s,@WX_UNICODE@,$WX_UNICODE,;t t
-s,@WX_DEBUG@,$WX_DEBUG,;t t
-s,@WX_SHARED@,$WX_SHARED,;t t
-s,@WX_PORT@,$WX_PORT,;t t
-s,@WXBASE_LIBS@,$WXBASE_LIBS,;t t
-s,@WXBASE_CPPFLAGS@,$WXBASE_CPPFLAGS,;t t
-s,@RC@,$RC,;t t
-s,@RCFLAGS@,$RCFLAGS,;t t
-s,@ac_ct_RC@,$ac_ct_RC,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
-s,@LIBUPNP_CPPFLAGS@,$LIBUPNP_CPPFLAGS,;t t
-s,@LIBUPNP_CFLAGS@,$LIBUPNP_CFLAGS,;t t
-s,@LIBUPNP_LDFLAGS@,$LIBUPNP_LDFLAGS,;t t
-s,@LIBUPNP_LIBS@,$LIBUPNP_LIBS,;t t
-s,@CRYPTOPP_CPPFLAGS@,$CRYPTOPP_CPPFLAGS,;t t
-s,@CRYPTOPP_LDFLAGS@,$CRYPTOPP_LDFLAGS,;t t
-s,@CRYPTOPP_LIBS@,$CRYPTOPP_LIBS,;t t
-s,@ALLOCA@,$ALLOCA,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@POW_LIB@,$POW_LIB,;t t
-s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t
-s,@MSGFMT@,$MSGFMT,;t t
-s,@GMSGFMT@,$GMSGFMT,;t t
-s,@XGETTEXT@,$XGETTEXT,;t t
-s,@MSGMERGE@,$MSGMERGE,;t t
-s,@GLIBC21@,$GLIBC21,;t t
-s,@LIBICONV@,$LIBICONV,;t t
-s,@LTLIBICONV@,$LTLIBICONV,;t t
-s,@INTLBISON@,$INTLBISON,;t t
-s,@USE_NLS@,$USE_NLS,;t t
-s,@BUILD_INCLUDED_LIBINTL@,$BUILD_INCLUDED_LIBINTL,;t t
-s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t
-s,@CATOBJEXT@,$CATOBJEXT,;t t
-s,@INTLOBJS@,$INTLOBJS,;t t
-s,@DATADIRNAME@,$DATADIRNAME,;t t
-s,@INSTOBJEXT@,$INSTOBJEXT,;t t
-s,@GENCAT@,$GENCAT,;t t
-s,@INTL_LIBTOOL_SUFFIX_PREFIX@,$INTL_LIBTOOL_SUFFIX_PREFIX,;t t
-s,@INTLLIBS@,$INTLLIBS,;t t
-s,@LIBINTL@,$LIBINTL,;t t
-s,@LTLIBINTL@,$LTLIBINTL,;t t
-s,@POSUB@,$POSUB,;t t
-s,@AMULE_DAEMON_MANPAGES@,$AMULE_DAEMON_MANPAGES,;t t
-s,@AMULECMD_MANPAGES@,$AMULECMD_MANPAGES,;t t
-s,@WEB_MANPAGES@,$WEB_MANPAGES,;t t
-s,@AMULE_GUI_MANPAGES@,$AMULE_GUI_MANPAGES,;t t
-s,@CAS_MANPAGES@,$CAS_MANPAGES,;t t
-s,@WXCAS_MANPAGES@,$WXCAS_MANPAGES,;t t
-s,@ED2K_MANPAGES@,$ED2K_MANPAGES,;t t
-s,@ALC_MANPAGES@,$ALC_MANPAGES,;t t
-s,@ALCC_MANPAGES@,$ALCC_MANPAGES,;t t
-s,@MONOLITHIC_MANPAGES@,$MONOLITHIC_MANPAGES,;t t
-s,@INCINTL@,$INCINTL,;t t
-s,@docdir@,$docdir,;t t
-s,@SVNDATE@,$SVNDATE,;t t
-s,@WEB_TRUE@,$WEB_TRUE,;t t
-s,@WEB_FALSE@,$WEB_FALSE,;t t
-s,@ED2K_TRUE@,$ED2K_TRUE,;t t
-s,@ED2K_FALSE@,$ED2K_FALSE,;t t
-s,@CAS_TRUE@,$CAS_TRUE,;t t
-s,@CAS_FALSE@,$CAS_FALSE,;t t
-s,@WXCAS_TRUE@,$WXCAS_TRUE,;t t
-s,@WXCAS_FALSE@,$WXCAS_FALSE,;t t
-s,@ALC_TRUE@,$ALC_TRUE,;t t
-s,@ALC_FALSE@,$ALC_FALSE,;t t
-s,@ALCC_TRUE@,$ALCC_TRUE,;t t
-s,@ALCC_FALSE@,$ALCC_FALSE,;t t
-s,@AMULE_GUI_TRUE@,$AMULE_GUI_TRUE,;t t
-s,@AMULE_GUI_FALSE@,$AMULE_GUI_FALSE,;t t
-s,@AMULE_DAEMON_TRUE@,$AMULE_DAEMON_TRUE,;t t
-s,@AMULE_DAEMON_FALSE@,$AMULE_DAEMON_FALSE,;t t
-s,@COMPILE_CMD_TRUE@,$COMPILE_CMD_TRUE,;t t
-s,@COMPILE_CMD_FALSE@,$COMPILE_CMD_FALSE,;t t
-s,@MONOLITHIC_TRUE@,$MONOLITHIC_TRUE,;t t
-s,@MONOLITHIC_FALSE@,$MONOLITHIC_FALSE,;t t
-s,@ENABLE_UPNP_TRUE@,$ENABLE_UPNP_TRUE,;t t
-s,@ENABLE_UPNP_FALSE@,$ENABLE_UPNP_FALSE,;t t
-s,@ENABLE_IP2COUNTRY_TRUE@,$ENABLE_IP2COUNTRY_TRUE,;t t
-s,@ENABLE_IP2COUNTRY_FALSE@,$ENABLE_IP2COUNTRY_FALSE,;t t
-s,@SYS_WIN32_TRUE@,$SYS_WIN32_TRUE,;t t
-s,@SYS_WIN32_FALSE@,$SYS_WIN32_FALSE,;t t
-s,@NEED_RC_TRUE@,$NEED_RC_TRUE,;t t
-s,@NEED_RC_FALSE@,$NEED_RC_FALSE,;t t
-s,@NEED_CORESERVICES_TRUE@,$NEED_CORESERVICES_TRUE,;t t
-s,@NEED_CORESERVICES_FALSE@,$NEED_CORESERVICES_FALSE,;t t
-s,@COMPILE_NLS_TRUE@,$COMPILE_NLS_TRUE,;t t
-s,@COMPILE_NLS_FALSE@,$COMPILE_NLS_FALSE,;t t
-s,@GENERATE_FLEX_HEADER_TRUE@,$GENERATE_FLEX_HEADER_TRUE,;t t
-s,@GENERATE_FLEX_HEADER_FALSE@,$GENERATE_FLEX_HEADER_FALSE,;t t
-s,@INSTALL_SKINS_TRUE@,$INSTALL_SKINS_TRUE,;t t
-s,@INSTALL_SKINS_FALSE@,$INSTALL_SKINS_FALSE,;t t
-s,@READLINE_LIBS@,$READLINE_LIBS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_t"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
-fi # test -n "$CONFIG_FILES"
+done
 
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ $'"$ac_word_re"'$$([^()]*)$[	 ]*$.*$/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ $'"$ac_word_re"'$[	 ]*$.*$/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ $'"$ac_word_re"'$$([^()]*)$[	 ]*$.*$/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ $'"$ac_word_re"'$[	 ]*$.*$/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = "&#x7;"
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
 
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+    case $ac_tag in
+    *:-:* | *:-) cat >"$tmp/stdin" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
 $as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X$//$[^/]' \| \
 	 X"$ac_file" : 'X$//$$' \| \
-	 X"$ac_file" : 'X$/$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
-  	  /^X$\/\/$$/{ s//\1/; q; }
-  	  /^X$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X$//$[^/]' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
-  	  /^X$\/\/$$/{ s//\1/; q; }
-  	  /^X$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
+	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
 esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
 
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
 
   case $INSTALL in
   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
   esac
+  ac_MKDIR_P=$MKDIR_P
+  case $MKDIR_P in
+  [\\/$]* | ?:[\\/]* ) ;;
+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+  esac
+_ACEOF
 
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined." >&2;}
 
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^$[	 ]*$#$[	 ]*define[	 ][	 ]*$'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^$[	 ]*$#$[	 ]*$undef$[	 ][	 ]*$'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+  rm -f "$tmp/stdin"
   case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*$[^	 (][^	 (]*$$([^)]*)$[	 ]*$.*$$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*$[^	 ][^	 ]*$[	 ]*$.*$$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
   if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+    } >"$tmp/config.h" \
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X$//$[^/]' \| \
-	 X"$ac_file" : 'X$//$$' \| \
-	 X"$ac_file" : 'X$/$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
-  	  /^X$\/\/$$/{ s//\1/; q; }
-  	  /^X$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X$//$[^/]' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
-  	  /^X$\/\/$$/{ s//\1/; q; }
-  	  /^X$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
+      rm -f "$ac_file"
+      mv "$tmp/config.h" "$ac_file" \
+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
     fi
   else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
-# Compute $ac_file's index in $config_headers.
+# Compute "$ac_file"'s index in $config_headers.
+_am_arg="$ac_file"
 _am_stamp_count=1
 for _am_header in $config_headers :; do
   case $_am_header in
-    $ac_file | $ac_file:* )
+    $_am_arg | $_am_arg:* )
       break ;;
     * )
       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   esac
 done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X$//$[^/]' \| \
-	 X$ac_file : 'X$//$$' \| \
-	 X$ac_file : 'X$/$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
-  	  /^X$\/\/$$/{ s//\1/; q; }
-  	  /^X$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X$//$[^/]' \| \
-	 X"$ac_dest" : 'X$//$$' \| \
-	 X"$ac_dest" : 'X$/$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
-  	  /^X$\/\/$$/{ s//\1/; q; }
-  	  /^X$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X$//$[^/]' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
-  	  /^X$\/\/$$/{ s//\1/; q; }
-  	  /^X$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
+$as_expr X"$_am_arg" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	 X"$_am_arg" : 'X$//$[^/]' \| \
+	 X"$_am_arg" : 'X$//$$' \| \
+	 X"$_am_arg" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$_am_arg" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
 
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
 
 
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
+  case $ac_file$ac_mode in
+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # are listed without --file.  Let's play safe and only enable the eval
+  # if we detect the quoting.
+  case $CONFIG_FILES in
+  *\'*) eval set x "$CONFIG_FILES" ;;
+  *)   set x $CONFIG_FILES ;;
+  esac
+  shift
+  for mf
+  do
+    # Strip MF so we end up with the name of the file.
+    mf=`echo "$mf" | sed -e 's/:.*$//'`
+    # Check whether this is an Automake generated Makefile or not.
+    # We used to match only the files named `Makefile.in', but
+    # some people rename them; so instead we look at the file content.
+    # Grep'ing the first line is not enough: some people post-process
+    # each Makefile.in and add a new line on top of each file to say so.
+    # Grep'ing the whole file is not good either: AIX grep has a line
+    # limit of 2048, but all sed's we know have understand at least 4000.
+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+      dirpart=`$as_dirname -- "$mf" ||
 $as_expr X"$mf" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
 	 X"$mf" : 'X$//$[^/]' \| \
 	 X"$mf" : 'X$//$$' \| \
-	 X"$mf" : 'X$/$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
-  	  /^X$\/\/$$/{ s//\1/; q; }
-  	  /^X$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
+	 X"$mf" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$mf" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+    else
+      continue
+    fi
+    # Extract the definition of DEPDIR, am__include, and am__quote
+    # from the Makefile without running `make'.
+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+    test -z "$DEPDIR" && continue
+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
+    test -z "am__include" && continue
+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+    # When using ansi2knr, U may be empty or an underscore; expand it
+    U=`sed -n 's/^U = //p' < "$mf"`
+    # Find all dependency output files, they are included files with
+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
+    # simplest approach to changing $(DEPDIR) to its actual value in the
+    # expansion.
+    for file in `sed -n "
+      s/^$am__include $am__quote$.*(DEPDIR).*$$am__quote"'$/\1/p' <"$mf" | \
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+      # Make sure the directory exists.
+      test -f "$dirpart/$file" && continue
+      fdir=`$as_dirname -- "$file" ||
 $as_expr X"$file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
 	 X"$file" : 'X$//$[^/]' \| \
 	 X"$file" : 'X$//$$' \| \
-	 X"$file" : 'X$/$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
-  	  /^X$\/\/$$/{ s//\1/; q; }
-  	  /^X$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X$//$[^/]' \| \
-	 X"$as_dir" : 'X$//$$' \| \
-	 X"$as_dir" : 'X$/$' \| \
-	 .     : '$.$' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X$\/\/$[^/].*/{ s//\1/; q; }
-  	  /^X$\/\/$$/{ s//\1/; q; }
-  	  /^X$\/$.*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+	 X"$file" : 'X$/$' \| . 2>/dev/null ||
+$as_echo X"$file" |
+    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/\/$$/{
+	    s//\1/
+	    q
+	  }
+	  /^X$\/$.*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+      # echo "creating $dirpart/$file"
+      echo '# dummy' > "$dirpart/$file"
     done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
   done
-done
+}
  ;;
-    default-1 )
+    "default-1":C)
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
       case "$ac_file" in
@@ -21284,7 +17078,7 @@
         ;;
       esac
     done ;;
-    denoiser ) if test $denoiserlevel -gt 0; then
+    "denoiser":C) if test $denoiserlevel -gt 0; then
 		if test ! -d src/utils/scripts; then mkdir -p src/utils/scripts; fi
 		sed -e "1{x;s/.*/1/;x;};/^[ 	]*\$/d;/^#if /{/level.*$denoiserlevel/{x;s/^/1/;x;b0;};x;s/^/0/;x;:0;d;};/^#else/{x;/^1/{s/1/0/;b1;};s/0/1/;:1;x;d;};/^#endif/{x;s/.//;x;d;};/^[ 	]*#/d;x;/^1/{x;b;};x;d" \
 			$srcdir/src/utils/scripts/denoiser.rules > src/utils/scripts/denoiser.sed
@@ -21294,17 +17088,18 @@
 			fi
 		done
 	fi ;;
+
   esac
-done
-_ACEOF
+done # for ac_tag
 
-cat >>$CONFIG_STATUS <<\_ACEOF
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
+test $ac_write_fail = 0 ||
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -21324,142 +17119,219 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit $?
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
 
+if test -n "$svndate"; then :
+  SVN_REVISION=" ($svndate)"
+else
+  SVN_REVISION=
+fi
 
 echo
 echo
 echo "  Configure script has finished system check."
 echo
-echo "  Configured aMule ${PACKAGE_VERSION} for '${host}'."
+echo "  Configured aMule ${PACKAGE_VERSION}${SVN_REVISION} for '${host}'."
 echo
 echo "  aMule enabled options:"
 echo
 echo "  **** aMule Core ****"
 echo "  Prefix where aMule should be installed?                    ${prefix:-none}"
 echo "  Should aMule be compiled with i18n support?                ${USE_NLS:-no}"
-echo "  Should aMule be compiled in debug mode?                    ${USE_DEBUG:-no}"
-echo "  Should aMule be compiled with profiling?                   ${USE_PROFILE:-no}"
-echo "  Should aMule be compiled with optimizations?               ${USE_OPTIMIZE:-no}"
-echo "  Should aMule be compiled with UPnP support?                ${ENABLE_UPNP:-yes}"
-echo "  Should aMule be compiled with IP2country support?          ${ENABLE_IP2COUNTRY:-no}"
-echo "  Should aMule monolithic application be built?              ${MONOLITHIC:-yes}"
-echo "  Should aMule daemon version be built?                      ${AMULE_DAEMON:-no}"
-echo "  Should aMule remote gui be built? (EXPERIMENTAL)           ${AMULE_GUI:-no}"
+echo "  Should aMule be compiled in debug mode?                    ${enable_debug:-yes}"
+echo "  Should aMule be compiled with profiling?                   ${enable_profile:-no}"
+echo "  Should aMule be compiled with optimizations?               ${enable_optimize:-no}"
+echo "  Should aMule be compiled with UPnP support?                ${enable_upnp:-yes}"
+echo "  Should aMule be compiled with IP2country support?          ${enable_geoip:-no}"
+echo "  Should aMule monolithic application be built?              ${enable_monolithic:-yes}"
+echo "  Should aMule daemon version be built?                      ${enable_amule_daemon:-no}"
+echo "  Should aMule remote gui be built?                          ${enable_amule_gui:-no}"
 echo "  Crypto++ library/headers style?                            ${CRYPTOPP_STYLE:-not found}"
 
 echo
 echo "  **** aMule TextClient ****"
-echo "  Should aMule Command Line Client be built?                 ${AMULECMD:-no}"
+echo "  Should aMule Command Line Client be built?                 ${enable_amulecmd:-no}"
 echo
 echo "  **** aMule WebServer ****"
-echo "  Should aMule WebServer be built?                           ${WEB:-no}"
+echo "  Should aMule WebServer be built?                           ${enable_webserver:-no}"
 echo
 echo "  **** aMule ED2K Links Handler ****"
-echo "  Should aMule ED2K Links Handler be built?                  ${ED2K:-yes}"
+echo "  Should aMule ED2K Links Handler be built?                  ${enable_ed2k:-yes}"
 echo
 echo "  **** aMuleLinkCreator ****"
-echo "  Should aMuleLinkCreator GUI version (alc) be built?        ${ALC:-no}"
-echo "  Should aMuleLinkCreator for console (alcc) be built?       ${ALCC:-no}"
+echo "  Should aMuleLinkCreator GUI version (alc) be built?        ${enable_alc:-no}"
+echo "  Should aMuleLinkCreator for console (alcc) be built?       ${enable_alcc:-no}"
 echo
 echo "  **** aMule Statistics ****"
-echo "  Should C aMule Statistics (CAS) be built?                  ${CAS:-no}"
-echo "  Should aMule GUI Statistics (wxCas) be built?              ${WXCAS:-no}"
+echo "  Should C aMule Statistics (CAS) be built?                  ${enable_cas:-no}"
+echo "  Should aMule GUI Statistics (wxCas) be built?              ${enable_wxcas:-no}"
+echo "  Should xas XChat2 plugin be installed?                     ${enable_xas:-no}"
+echo "  Should plasmaMule plasma-applet be build?                  ${enable_plasmamule:-no}"
 
 echo
 echo "  **** General Libraries and Tools ****"
 echo "  Should ccache support be enabled?                          ${enable_ccache:-no}"
 echo "  Libraries aMule will use to build:"
-wxinfo="$WX_PORT"
-if test $WX_DEBUG -eq 1; then
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes -o ${enable_amule_gui:-no} = yes -o ${enable_amulecmd:-no} = yes -o ${enable_webserver:-no} = yes -o ${enable_alc:-no} = yes -o ${enable_alcc:-no} = yes -o ${enable_wxcas:-no} = yes -o ${enable_fileview:-no} = yes ; then :
+
+	wxinfo="$WX_PORT"
+	if test $WX_DEBUG -eq 1; then :
   wxinfo="$wxinfo,debug"
 fi
-
-if test $WX_SHARED -eq 1; then
+	if test $WX_SHARED -eq 1; then :
   wxinfo="$wxinfo,shared"
 else
   wxinfo="$wxinfo,static"
 fi
-
-echo "                                       wxWidgets             ${WX_VERSION_FULL} ($wxinfo)"
-echo "                                       crypto++              ${CRYPTOPP_VERSION_STRING} (${CRYPTOPP_STYLE}, in ${CRYPTOPP_PREFIX})"
-if test -n "$with_libupnp_prefix"; then
-  libupnp_place=" (in $with_libupnp_prefix)"
-fi
-
-if test x${ENABLE_UPNP} = xyes; then
-  echo "                                       libupnp               ${LIBUPNP_VERSION:-Not detected}${libupnp_place:-}"
+	echo "                             wxWidgets             ${WX_VERSION_FULL} ($wxinfo)"
 
 fi
-if test x${WEB:-no} != xno; then
-if test $regex_found = no; then
-  regex_found="Not detected"
-else
-  if test -z "$REGEX_LIB"; then
-  regex_found=system
-else
-  regex_found="standalone (in $REGEX_LIB)"
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes -o ${enable_amule_gui:-no} = yes -o ${enable_fileview:-no} = yes ; then :
+  echo "                             crypto++              ${CRYPTOPP_VERSION_STRING} (${CRYPTOPP_STYLE}, in ${CRYPTOPP_PREFIX})"
 fi
+if test ${enable_upnp:-yes} = yes; then :
 
+	if test -n "$with_libupnp_prefix"; then :
+  libupnp_place=" (in $with_libupnp_prefix)"
 fi
+	echo "                             libupnp               ${LIBUPNP_VERSION:-Not detected}${libupnp_place:-}"
 
-echo "                                       regex                 $regex_found"
 fi
 if test ${enable_nls:-yes} = yes; then
-if test x$USE_NLS = xno; then
+if test x$USE_NLS = xno; then :
   libintl_found="Not detected"
 else
-  if test x$USE_INCLUDED_LIBINTL = xyes; then
+  if test x$USE_INCLUDED_LIBINTL = xyes; then :
   libintl_found="included"
 else
   libintl_found="system"
 fi
-
 fi
-
-echo "                                       libintl               $libintl_found"
+echo "                             libintl               $libintl_found"
 fi
-if test -z "${with_geoip_headers:-}${with_geoip_lib:-}"; then
+if test ${enable_geoip:-no} = yes; then :
+  if test -z "${with_geoip_headers:-}${with_geoip_lib:-}"; then :
   geoip_style=system
 else
   geoip_style=user
 fi
-
-if test ${ENABLE_IP2COUNTRY:-no} = yes; then
-  echo "                                       libGeoIP              ${geoip_style}"
+	if test ${enable_monolithic:-yes} = yes -o ${enable_amule_gui:-no} = yes ; then :
+  echo "                             libGeoIP              ${geoip_style}"
 fi
-
-if test x$LIBPNG_VERSION != xnot_needed; then
-echo "                                       libpng                ${LIBPNG_VERSION:-Not detected}"
 fi
-if test x$GDLIB_VERSION != xnot_needed; then
-echo "                                       libgd                 ${GDLIB_VERSION:-Not detected}"
+if test ${enable_webserver:-no} = yes; then :
+  echo "                             libpng                ${LIBPNG_VERSION:-Not detected}"
 fi
-echo "                                       zlib                  ${ZLIB_VERSION:-Not detected}"
-if test x$WEB = xdisabled; then
-echo ""
-echo ""
-echo "WARNING! amuleweb has been disabled because configure could not find"
-echo "a POSIX compliant regex library."
-echo ""
+if test ${enable_cas:-no} = yes; then :
+  echo "                             libgd                 ${GDLIB_VERSION:-Not detected}"
 fi
-if test -z "$LIBPNG_VERSION"; then
-echo ""
-echo ""
-echo "WARNING! libpng >= 1.2.0 not found."
-echo "amuleweb will be compiled but file download progress bar images will NOT be generated."
-echo ""
+if test ${enable_monolithic:-yes} = yes -o ${enable_amule_daemon:-no} = yes -o ${enable_amulecmd:-no} = yes -o ${enable_webserver:-no} = yes -o ${enable_amule_gui:-no} = yes ; then :
+  echo "                             zlib                  ${ZLIB_VERSION:-Not detected}"
 fi
-if test x$ENABLE_UPNP = xdisabled; then
-echo ""
-echo ""
-echo "WARNING! UPnP code has been disabled because ${libupnp_error}."
-echo ""
+if test ${enable_plasmamule:-no} = yes; then :
+  echo "                             qt-moc                ${QT_MOC} ${QT_MOC_VERSION}"
+echo "                             qt-core-libs          ${QT_CORE_LIBS}"
+echo "                             qt-gui-libs           ${QT_GUI_LIBS}"
+echo "                             kde4-config           ${KDE4_CONFIG} (${KDE_CONF_VER})"
+echo "                             kde-headers           ${KDE_HEADER_DIR}"
+echo "                             kde-services-path     ${KDE_SERVICE_PATH}"
+echo "                             kde-module-path       ${KDE_MODULE_PATH}"
+echo "                             kde-icon-path         ${KDE_ICON_PATH}"
+echo "                             kde-mime-path         ${KDE_MIME_PATH}"
+echo "                             kde-applinks-path     ${KDE_APPLNK_PATH}"
+
 fi
-if test x$ENABLE_IP2COUNTRY = xdisabled; then
+if test ${_mule_has_warnings:-no} = yes; then
 echo ""
 echo ""
-echo "WARNING! GeoIP IP2Country support has been disabled!"
-echo ""
+echo " *** Warnings during configuration ***"
+fi
+if test ${_mule_warning_0:-no} = yes; then
+cat <<_MULEEOT
+
+* 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.
+_MULEEOT
+fi
+if test ${_mule_warning_1:-no} = yes; then
+cat <<_MULEEOT
+
+* libpng >= 1.2.0 not found.
+  amuleweb will be compiled but file download progress bar images will NOT be
+  generated.
+_MULEEOT
+fi
+if test ${_mule_warning_2:-no} = yes; then
+cat <<_MULEEOT
+
+* File::Copy perl module is required by the mldonkey_importer script.
+  If you want to use this script please install File::Copy from CPAN.
+_MULEEOT
+fi
+if test ${_mule_warning_3:-no} = yes; then
+cat <<_MULEEOT
+
+* Cannot link GeoIP statically, because your linker ($LD) does not support it.
+_MULEEOT
+fi
+if test ${_mule_warning_4:-no} = yes; then
+cat <<_MULEEOT
+
+* GeoIP support has been disabled because the GeoIP libraries were not found
+_MULEEOT
+fi
+if test ${_mule_warning_5:-no} = yes; then
+cat <<_MULEEOT
+
+* GeoIP support has been disabled because the GeoIP header files were not
+  found
+_MULEEOT
+fi
+if test ${_mule_warning_6:-no} = yes; then
+cat <<_MULEEOT
+
+* UPnP code has been disabled because ${libupnp_error}.
+_MULEEOT
+fi
+if test ${_mule_warning_7:-no} = yes; then
+cat <<_MULEEOT
+
+* Cross-compilation detected, so exception handling cannot be tested.
+  Note that broken exception handling in your compiler may lead to unexpected
+  crashes.
+_MULEEOT
+fi
+if test ${_mule_warning_8:-no} = yes; then
+cat <<_MULEEOT
+
+* configure cannot check whether malloc() and realloc() are GNU libc
+  compatible. You have to be ABSOLUTELY sure that they are, otherwise run
+  configure with the --without-gnu-malloc switch.
+_MULEEOT
+fi
+if test ${_mule_warning_9:-no} = yes; then
+cat <<_MULEEOT
+
+* You need to install GNU gettext/gettext-tools to compile aMule with i18n
+  support.
+_MULEEOT
+fi
+if test ${_mule_warning_10:-no} = yes; then
+cat <<_MULEEOT
+
+* bfd.h not found or unusable, please install binutils development package if
+  you are a developer or want to help testing aMule
+_MULEEOT
 fi

aMule-2.2.6.tar.bz2/configure.in -> aMule-2.3.1.tar.bz2/configure.in Changed

@@ -3,7 +3,7 @@
 #
 # This file is part of the aMule Project.
 #
-# Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+# 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
@@ -24,8 +24,11 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 #
 
-AC_INIT([aMule], [2.2.6], [admin@amule.org])
+AC_INIT([aMule], [2.3.1], [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])
@@ -62,92 +65,27 @@
 AC_CHECK_TOOL(AR, ar)
 AC_CHECK_TOOL(LD, ld)
 
-dnl
-dnl Add args to configure
-dnl
-AC_ARG_ENABLE(
-	[monolithic],
-	[AS_HELP_STRING(
-		[--disable-monolithic],
-		[disable building of the monolithic aMule app])],
-	[MONOLITHIC=$enableval], [MONOLITHIC=yes])
-
-AC_ARG_ENABLE(
-	[amule-daemon],
-	[AS_HELP_STRING(
-		[--enable-amule-daemon],
-		[compile aMule daemon version])],
-	[AMULE_DAEMON=$enableval], [AMULE_DAEMON=no])
-
-AC_ARG_ENABLE(
-	[amulecmd],
-	[AS_HELP_STRING(
-		[--enable-amulecmd],
-		[compile aMule command line client])],
-	[AMULECMD=$enableval], [AMULECMD=no])
-
-AC_ARG_ENABLE(
-	[webserver],
-	[AS_HELP_STRING(
-		[--enable-webserver],
-		[compile aMule WebServer])],
-	[WEB=$enableval], [WEB=no])
-
-AC_ARG_ENABLE(
-	[amule-gui],
-	[AS_HELP_STRING(
-		[--enable-amule-gui],
-		[compile aMule remote GUI (EXPERIMENTAL)])],
-	[AMULE_GUI=$enableval], [AMULE_GUI=no])
-
-AC_ARG_ENABLE(
-	[cas],
-	[AS_HELP_STRING(
-		[--enable-cas],
-		[compile C aMule Statistics])],
-	[CAS=$enableval], [CAS=no])
-
-AC_ARG_ENABLE(
-	[wxcas],
-	[AS_HELP_STRING(
-		[--enable-wxcas],
-		[compile aMule GUI Statistics])],
-	[WXCAS=$enableval], [WXCAS=no])
-
-AC_ARG_ENABLE(
-	[ed2k],
-	[AS_HELP_STRING(
-		[--disable-ed2k],
-		[don't compile aMule ed2k links handler])],
-	[ED2K=$enableval], [ED2K=yes])
-
-AC_ARG_ENABLE(
-	[alc],
-	[AS_HELP_STRING(
-		[--enable-alc],
-		[compile aMuleLinkCreator GUI version])],
-	[ALC=$enableval], [ALC=no])
-	      
-AC_ARG_ENABLE(
-	[alcc],
-	[AS_HELP_STRING(
-		[--enable-alcc],
-		[compile aMuleLinkCreator for console])],
-	[ALCC=$enableval], [ALCC=no])
-
-AC_ARG_ENABLE(
-	[monolithic],
-	[AS_HELP_STRING(
-		[--disable-monolithic],
-		[disable building of the monolithic aMule app])],
-	[MONOLITHIC=$enableval], [MONOLITHIC=yes])
-
-AC_ARG_ENABLE(
-	[upnp],
-	[AS_HELP_STRING(
-		[--disable-upnp],
-		[do not compile UPnP code])],
-	[ENABLE_UPNP=$enableval], [ENABLE_UPNP=yes])
+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.
@@ -163,118 +101,117 @@
 # to avoid losing too much time
 
 # Check for zlib
-MULE_CHECK_ZLIB([1.1.4],, [AC_MSG_ERROR([zlib >= 1.1.4 is required for aMule])])
+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])])])
 
-AS_IF([test x$CAS = xyes], [
+MULE_IF_ENABLED([cas], [
 	# Check for gd
 	MULE_CHECK_GDLIB([2.0.0], [
 		CAS_DEFS="-D__GD__"
 		MULE_PREPEND([GDLIB_LIBS], [-lgd])
 	], [CAS_DEFS=])
-	AS_IF([test -z "$CAS_DEFS"], [
-		AC_MSG_WARN([
-	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.])
-	])
-], [GDLIB_VERSION="not_needed"])
+	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
 
-
-AS_IF([test x$WEB = xyes], [MULE_CHECK_REGEX(, [WEB=disabled])])
-AS_IF([test x$WEB = xyes], 
-	[MULE_CHECK_LIBPNG([1.2.0], [AMULEWEB_DEFS="-DWITH_LIBPNG"], [AC_MSG_WARN([libpng-devel >= 1.2.0 is needed for amuleweb])])], 
-	[LIBPNG_VERSION="not_needed"])
+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])], [AC_MSG_ERROR([File::Copy perl module is required])])
-
-
-# Check if we need the GUI
-AC_MSG_CHECKING([whether we need the GUI])
-AS_IF([test x$MONOLITHIC = xyes], [need_gui=yes])
-AS_IF([test x$WXCAS = xyes], [need_gui=yes])
-AS_IF([test x$ALC = xyes], [need_gui=yes])
-AS_IF([test x$AMULE_GUI = xyes], [need_gui=yes])
-AS_IF([test x${need_gui:+set} != xset], [need_gui=no])
-AC_MSG_RESULT($need_gui)
+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 if we need to install skins
-AS_IF([test x$MONOLITHIC = xyes], [INSTALL_SKINS=yes])
-AS_IF([test x$AMULE_GUI = xyes], [INSTALL_SKINS=yes])
-AS_IF([test x${INSTALL_SKINS:+set} != xset], [INSTALL_SKINS=no])
+MULE_IF_ENABLED_ANY([monolithic, amule-gui], [INSTALL_SKINS=yes], [INSTALL_SKINS=no])
 
 # Check for GeoIP (required for IP2Country capability)
-MULE_CHECK_GEOIP
+MULE_IF_ENABLED_ANY([monolithic, amule-gui], [MULE_CHECK_GEOIP])
 
 # Check for wx
-WX_CONFIG_OPTIONS
-WX_STANDARD_OPTIONS([toolkit,wxshared,wxdebug,wxversion])
-# Force using a static wxWidgets library if the executable is to be linked statically.
-AS_IF([test ${enable_static:-no} = yes], [WX_SHARED=0])
-# Force using a unicode build of the library
-WX_UNICODE=1
-DEBUG=$WX_DEBUG
-WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
-WX_CONFIG_CHECK([2.8.0], [wxWin=1],,, [$WXCONFIG_FLAGS])
-if test "$wxWin" != 1; then
-	AC_MSG_ERROR([
+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.0 or above.
-	])
-fi
-WX_DETECT_STANDARD_OPTION_VALUES
+		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"
-AC_SUBST([WXBASE_LIBS])
-AC_SUBST([WXBASE_CPPFLAGS])
+	# 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"
 
-AS_IF([test ${need_gui} = yes -a "${WX_PORT}" = base],
+	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
+AC_SUBST([WXBASE_CPPFLAGS])dnl
+
+MULE_IF_ENABLED_ANY([monolithic, amule-gui, wxcas, alc],
+[AS_IF([test "${WX_PORT}" = base],
 	[AC_MSG_ERROR([
 		The selected components need a wxWidgets library with GUI,
 		but your installation is base-only.  Please install a GUI
 		enabled version of wxWidgets and then retry.
 	])]
-)
+)])
 
-dnl Get flags for windres
+dnl Resource compiler for W32
 AC_ARG_VAR([RC], [Resource Compiler])dnl
 AC_ARG_VAR([RCFLAGS], [Resource Compiler Flags])dnl
-AS_IF([test ${SYS:-unknown} = win32],
-[
-	AC_CHECK_TOOL([RC], [windres], [:])
-	MULERCFLAGS=`$WX_CONFIG_WITH_ARGS --cflags | $AWK ['{ for (i = 1; i <= NF; i++) if (index($i, "-I") != 1 && index($i, "-D") != 1) $i = ""; print }']`
-])
+AS_IF([test ${SYS:-unknown} = win32], [AC_CHECK_TOOL([RC], [windres], [:])])
 
 
 # Check for libupnp
-AS_IF([test "${ENABLE_UPNP:-yes}" = yes], [
+MULE_ARG_ENABLE([upnp], [yes], [do not compile UPnP code])
+MULE_IF_ENABLED_ANY([monolithic, amule-daemon],, [MULE_ENABLEVAR([upnp])=no])
+MULE_IF_ENABLED([upnp], [
 	LIBUPNP_CHECK(
 		[1.6.6],
 		[MULE_APPEND([LIBUPNP_CPPFLAGS], [-DENABLE_UPNP=1])],
-		[ENABLE_UPNP=disabled]
+		[MULE_ENABLEVAR([upnp])=disabled
+		MULE_WARNING([UPnP code has been disabled because ${libupnp_error}.])]
 	)
 ])dnl
 
 
 # Check for Crypto++
-MULE_CHECK_CRYPTOPP([5.1], [
+MULE_IF_ENABLED_ANY([monolithic, amule-daemon, amule-gui, fileview],
+[MULE_CHECK_CRYPTOPP([5.1], [
 	# Check for CryptoPP >= 5.5
 	AS_IF([test $CRYPTOPP_VERSION_NUMBER -ge "5005000"], [MULE_APPEND([CRYPTOPP_CPPFLAGS], [-D__WEAK_CRYPTO__])])
 ], [
@@ -283,18 +220,20 @@
 	Please try again with --with-crypto-prefix=/my_crypto_prefix
 	(replace /my_crypto_prefix with a valid path to your crypto++
 	installation directory).])
-])
+])])
 
 dnl Checks requiring C++
-AC_LANG_PUSH([C++])
+MULE_IF_ENABLED_ANY([monolithic, amule-daemon, amule-gui, amulecmd, webserver, ed2k, alc, alcc, wxcas, fileview],
+[AC_LANG_PUSH([C++])
 MULE_CHECK_GLIBCXX
-MULE_CHECK_WX_SUPPORTS_LARGEFILE
+MULE_IF_ENABLED_ANY([monolithic, amule-daemon, alc, alcc], [MULE_CHECK_WX_SUPPORTS_LARGEFILE])
 
 # Check if the compiler is broken, wrt. exceptions.
 MULE_CHECK_EXCEPTIONS
 
 MULE_CHECK_CXXABI
 AC_LANG_POP([C++])
+])
 
 # Ok, we have all needed libs, now checking for other stuff
 AS_IF([test "$LEX" = "flex"], [MULE_CHECK_FLEX_EXTENDED], [HAVE_FLEX_EXTENDED=no])
@@ -306,11 +245,10 @@
 dnl Start of autoscan stuff
 dnl -------------------------------------------------------------------------------
 # Checks for header files.
-AC_PATH_X
 AC_FUNC_ALLOCA
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_CHECK_HEADERS([argz.h arpa/inet.h fcntl.h inttypes.h langinfo.h libintl.h limits.h locale.h malloc.h mntent.h netdb.h netinet/in.h stddef.h  nl_types.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/ioctl.h sys/mntent.h sys/mnttab.h sys/mount.h sys/param.h sys/resource.h sys/select.h sys/socket.h sys/statvfs.h sys/time.h sys/timeb.h sys/types.h unistd.h])
+AC_CHECK_HEADERS([argz.h arpa/inet.h fcntl.h inttypes.h langinfo.h libintl.h limits.h locale.h malloc.h mntent.h netdb.h netinet/in.h stddef.h  nl_types.h stdint.h stdio_ext.h stdlib.h string.h strings.h sys/ioctl.h sys/mntent.h sys/mnttab.h sys/mount.h sys/param.h sys/resource.h sys/select.h sys/socket.h sys/statvfs.h sys/time.h sys/timeb.h sys/types.h unistd.h errno.h signal.h])
 AC_HEADER_SYS_WAIT
 
 # Checks for typedefs, structures, and compiler characteristics.
@@ -336,7 +274,6 @@
 	AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK
 ])
 AC_FUNC_MEMCMP
-AC_FUNC_MMAP
 AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_SETVBUF_REVERSED
 AC_TYPE_SIGNAL
@@ -353,16 +290,13 @@
 dnl AC_FUNC_SETVBUF_REVERSED
 dnl Anyways, do we actually USE them?
 AS_IF([test $cross_compiling = yes -a $gnumalloc = yes], [
-	AC_MSG_WARN([
-    configure cannot check whether malloc() and realloc() are GNU libc
-    compatible. You have to be ABSOLUTELY sure that they are, otherwise
-    run configure with the --without-gnu-malloc switch.])
+	MULE_WARNING([configure cannot check whether malloc() and realloc() are GNU libc compatible. You have to be ABSOLUTELY sure that they are, otherwise run configure with the --without-gnu-malloc switch.])
 	ac_cv_func_malloc_0_nonnull=yes
 	ac_cv_func_realloc_0_nonnull=yes
 ])
 AC_FUNC_MALLOC
 AC_FUNC_REALLOC
-AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify endpwent floor ftruncate getcwd gethostbyaddr gethostbyname gethostname getpass gettimeofday inet_ntoa localeconv memmove mempcpy memset munmap nl_langinfo pow select setlocale socket sqrt stpcpy strcasecmp strchr strcspn strdup strerror strncasecmp strstr strtoul])
+AC_CHECK_FUNCS([__argz_count __argz_next __argz_stringify endpwent floor ftruncate getcwd gethostbyaddr gethostbyname gethostname getpass gettimeofday inet_ntoa localeconv memmove mempcpy memset nl_langinfo pow select setlocale socket sqrt stpcpy strcasecmp strchr strcspn strdup strerror strncasecmp strstr strtoul sigaction])
 #-------------------------------------------------------------------------------
 # End of autoscan stuff
 #-------------------------------------------------------------------------------
@@ -372,13 +306,16 @@
 dnl
 AC_CHECK_FUNCS([mkdir getrlimit setrlimit getopt_long])
 
+dnl This must be *before* MULE_CHECK_NLS
+MULE_IF_ENABLED_ANY([monolithic, amule-daemon], [MULE_CHECK_MMAP])
+
 MULE_BACKUP([CPPFLAGS])
 MULE_APPEND([CPPFLAGS], [-D_XOPEN_SOURCE=600])
 AC_FUNC_STRERROR_R
 MULE_RESTORE([CPPFLAGS])
 
 # Look for a way to preallocate disk space for files.
-MULE_CHECK_FALLOCATE
+MULE_IF_ENABLED_ANY([monolithic, amule-daemon], [MULE_CHECK_FALLOCATE])
 
 # Checking Native Language Support
 dnl Sets gettext version.
@@ -405,9 +342,9 @@
 
 # Try to set the SVN checkout-date
 AC_MSG_CHECKING([for SVNDATE])
-if test -f "$srcdir/SVNDATE" # SVNDATE for tarballs
+if test -f "$srcdir/.svn-revision" # SVNDATE for tarballs
 then
-	svndate=`cat $srcdir/SVNDATE`
+	svndate="rev. `cat $srcdir/.svn-revision`"
 elif test -d $srcdir/.svn # SVNDATE for svn
 then
 	svndate="rev. `svnversion $srcdir | sed -e 's/[[0-9]][[0-9]]*:$.*$/\1/' -e 's/$[[0-9]][[0-9]]*$.*/\1/'`"
@@ -422,29 +359,24 @@
 dnl Set up the denoiser
 MULE_DENOISER
 
-AM_CONDITIONAL(WEB, test x$WEB = xyes)
-AM_CONDITIONAL(ED2K, test x$ED2K = xyes)
-AM_CONDITIONAL(CAS, test x$CAS = xyes)
-AM_CONDITIONAL(WXCAS, test x$WXCAS = xyes)
-AM_CONDITIONAL(ALC, test x$ALC = xyes)
-AM_CONDITIONAL(ALCC, test x$ALCC = xyes)
-AM_CONDITIONAL(AMULE_GUI, test x$AMULE_GUI = xyes)
-AM_CONDITIONAL(AMULE_DAEMON, test x$AMULE_DAEMON = xyes)
-AM_CONDITIONAL(COMPILE_CMD, test x$AMULECMD = xyes)
-AM_CONDITIONAL(MONOLITHIC, test x$MONOLITHIC = xyes)
-AM_CONDITIONAL(ENABLE_UPNP, test x$ENABLE_UPNP = xyes)
-AM_CONDITIONAL(ENABLE_IP2COUNTRY, test x$ENABLE_IP2COUNTRY = xyes)
+MULE_IF_ENABLED([plasmamule], [PLASMAMULE_CHECKS])
+
 AM_CONDITIONAL(SYS_WIN32, test x$SYS = xwin32)
 AM_CONDITIONAL(NEED_RC, test x$SYS = xwin32 -a "$RC" != ":")
 AM_CONDITIONAL(NEED_CORESERVICES, test x$SYS = xdarwin)
 AM_CONDITIONAL(COMPILE_NLS, test x$USE_NLS = xyes)
 AM_CONDITIONAL(GENERATE_FLEX_HEADER, test x$HAVE_FLEX_EXTENDED = xyes)
 AM_CONDITIONAL(INSTALL_SKINS, test x$INSTALL_SKINS = xyes)
+AM_CONDITIONAL(PLASMAMULE, test MULE_IS_ENABLED([plasmamule]))
+
+AM_CONDITIONAL([COMPILE_LIB_COMMON],	[test MULE_IS_ENABLED_ANY([monolithic, amule-daemon, amulecmd, webserver, amule-gui, fileview])])
+AM_CONDITIONAL([COMPILE_LIB_EC],	[test MULE_IS_ENABLED_ANY([monolithic, amule-daemon, amulecmd, webserver, amule-gui])])
 
 # Check for readline library
-if test x$AMULECMD = xyes -o x$WEB = xyes; then
-	VL_LIB_READLINE
-fi
+MULE_IF_ENABLED_ANY([amulecmd, webserver], [VL_LIB_READLINE])
+
+AS_IF([test ${PLASMAMULE:-no} = yes],
+[PLASMAMULE_CHECKS])
 
 # DO NOT MOVE UP... THERE'S A REASON TO BE HERE!!
 
@@ -471,6 +403,7 @@
 		 src/utils/cas/Makefile
 		 src/utils/cas/docs/Makefile
 		 src/utils/fileview/Makefile
+		 src/utils/plasmamule/Makefile
 		 src/utils/wxCas/Makefile
 		 src/utils/wxCas/docs/Makefile
 		 src/utils/wxCas/src/Makefile
@@ -481,9 +414,6 @@
 		 src/webserver/Makefile
 		 src/webserver/src/Makefile
 		 src/webserver/default/Makefile
-		 src/webserver/php-default/Makefile
-		 src/webserver/chicane/Makefile
-		 src/webserver/litoral/Makefile
 		 unittests/Makefile
 		 unittests/muleunit/Makefile
 		 unittests/tests/Makefile])
@@ -495,106 +425,92 @@
 AS_IF([test x$SYS = xwin32], [AC_CONFIG_FILES([version.rc])])
 AC_OUTPUT
 
+AS_IF([test -n "$svndate"], [SVN_REVISION=" ($svndate)"], [SVN_REVISION=])
+
 echo
 echo
 echo "  Configure script has finished system check."
 echo
-echo "  Configured aMule ${PACKAGE_VERSION} for '${host}'."
+echo "  Configured aMule ${PACKAGE_VERSION}${SVN_REVISION} for '${host}'."
 echo
 echo "  aMule enabled options:"
 echo 
 echo "  **** aMule Core ****" 
 echo "  Prefix where aMule should be installed?                    ${prefix:-none}"
 echo "  Should aMule be compiled with i18n support?                ${USE_NLS:-no}"
-echo "  Should aMule be compiled in debug mode?                    ${USE_DEBUG:-no}"
-echo "  Should aMule be compiled with profiling?                   ${USE_PROFILE:-no}"
-echo "  Should aMule be compiled with optimizations?               ${USE_OPTIMIZE:-no}"
-echo "  Should aMule be compiled with UPnP support?                ${ENABLE_UPNP:-yes}"
-echo "  Should aMule be compiled with IP2country support?          ${ENABLE_IP2COUNTRY:-no}"
-echo "  Should aMule monolithic application be built?              ${MONOLITHIC:-yes}"
-echo "  Should aMule daemon version be built?                      ${AMULE_DAEMON:-no}"
-echo "  Should aMule remote gui be built? (EXPERIMENTAL)           ${AMULE_GUI:-no}"
+echo "  Should aMule be compiled in debug mode?                    MULE_STATUSOF([debug])"
+echo "  Should aMule be compiled with profiling?                   MULE_STATUSOF([profile])"
+echo "  Should aMule be compiled with optimizations?               MULE_STATUSOF([optimize])"
+echo "  Should aMule be compiled with UPnP support?                MULE_STATUSOF([upnp])"
+echo "  Should aMule be compiled with IP2country support?          MULE_STATUSOF([geoip])"
+echo "  Should aMule monolithic application be built?              MULE_STATUSOF([monolithic])"
+echo "  Should aMule daemon version be built?                      MULE_STATUSOF([amule-daemon])"
+echo "  Should aMule remote gui be built?                          MULE_STATUSOF([amule-gui])"
 echo "  Crypto++ library/headers style?                            ${CRYPTOPP_STYLE:-not found}"
 
 echo
 echo "  **** aMule TextClient ****"
-echo "  Should aMule Command Line Client be built?                 ${AMULECMD:-no}"
+echo "  Should aMule Command Line Client be built?                 MULE_STATUSOF([amulecmd])"
 echo
 echo "  **** aMule WebServer ****"
-echo "  Should aMule WebServer be built?                           ${WEB:-no}"
+echo "  Should aMule WebServer be built?                           MULE_STATUSOF([webserver])"
 echo
 echo "  **** aMule ED2K Links Handler ****"
-echo "  Should aMule ED2K Links Handler be built?                  ${ED2K:-yes}"
+echo "  Should aMule ED2K Links Handler be built?                  MULE_STATUSOF([ed2k])"
 echo
 echo "  **** aMuleLinkCreator ****"
-echo "  Should aMuleLinkCreator GUI version (alc) be built?        ${ALC:-no}"
-echo "  Should aMuleLinkCreator for console (alcc) be built?       ${ALCC:-no}"
+echo "  Should aMuleLinkCreator GUI version (alc) be built?        MULE_STATUSOF([alc])"
+echo "  Should aMuleLinkCreator for console (alcc) be built?       MULE_STATUSOF([alcc])"
 echo
 echo "  **** aMule Statistics ****"
-echo "  Should C aMule Statistics (CAS) be built?                  ${CAS:-no}"
-echo "  Should aMule GUI Statistics (wxCas) be built?              ${WXCAS:-no}"
+echo "  Should C aMule Statistics (CAS) be built?                  MULE_STATUSOF([cas])"
+echo "  Should aMule GUI Statistics (wxCas) be built?              MULE_STATUSOF([wxcas])"
+echo "  Should xas XChat2 plugin be installed?                     MULE_STATUSOF([xas])"
+echo "  Should plasmaMule plasma-applet be build?                  MULE_STATUSOF([plasmamule])"
 
 echo
 echo "  **** General Libraries and Tools ****"
-echo "  Should ccache support be enabled?                          ${enable_ccache:-no}"
+echo "  Should ccache support be enabled?                          MULE_STATUSOF([ccache])"
 echo "  Libraries aMule will use to build:"
-wxinfo="$WX_PORT"
-AS_IF([test $WX_DEBUG -eq 1], [wxinfo="$wxinfo,debug"])
-AS_IF([test $WX_SHARED -eq 1], [wxinfo="$wxinfo,shared"], [wxinfo="$wxinfo,static"])
-echo "                                       wxWidgets             ${WX_VERSION_FULL} ($wxinfo)"
-echo "                                       crypto++              ${CRYPTOPP_VERSION_STRING} (${CRYPTOPP_STYLE}, in ${CRYPTOPP_PREFIX})"
-AS_IF([test -n "$with_libupnp_prefix"], [libupnp_place=" (in $with_libupnp_prefix)"])
-AS_IF([test x${ENABLE_UPNP} = xyes], [dnl
-echo "                                       libupnp               ${LIBUPNP_VERSION:-Not detected}${libupnp_place:-}"
-])dnl
-if test x${WEB:-no} != xno; then
-AS_IF([test $regex_found = no], 
-	[regex_found="Not detected"],
-	[AS_IF([test -z "$REGEX_LIB"], 
-		[regex_found=system], 
-		[regex_found="standalone (in $REGEX_LIB)"])])
-echo "                                       regex                 $regex_found"
-fi
+MULE_IF_ENABLED_ANY([monolithic, amule-daemon, amule-gui, amulecmd, webserver, alc, alcc, wxcas, fileview], [
+	wxinfo="$WX_PORT"
+	AS_IF([test $WX_DEBUG -eq 1], [wxinfo="$wxinfo,debug"])
+	AS_IF([test $WX_SHARED -eq 1], [wxinfo="$wxinfo,shared"], [wxinfo="$wxinfo,static"])
+	echo "                             wxWidgets             ${WX_VERSION_FULL} ($wxinfo)"
+])
+MULE_IF_ENABLED_ANY([monolithic, amule-daemon, amule-gui, fileview],
+	[echo "                             crypto++              ${CRYPTOPP_VERSION_STRING} (${CRYPTOPP_STYLE}, in ${CRYPTOPP_PREFIX})"])
+MULE_IF_ENABLED([upnp], [
+	AS_IF([test -n "$with_libupnp_prefix"], [libupnp_place=" (in $with_libupnp_prefix)"])
+	echo "                             libupnp               ${LIBUPNP_VERSION:-Not detected}${libupnp_place:-}"
+])
 if test ${enable_nls:-yes} = yes; then
 AS_IF([test x$USE_NLS = xno],
 	[libintl_found="Not detected"],
 	[AS_IF([test x$USE_INCLUDED_LIBINTL = xyes], 
 		[libintl_found="included"], 
 		[libintl_found="system"])])
-echo "                                       libintl               $libintl_found"
-fi
-AS_IF([test -z "${with_geoip_headers:-}${with_geoip_lib:-}"], [geoip_style=system], [geoip_style=user])
-AS_IF([test ${ENABLE_IP2COUNTRY:-no} = yes], [echo "                                       libGeoIP              ${geoip_style}"])
-if test x$LIBPNG_VERSION != xnot_needed; then
-echo "                                       libpng                ${LIBPNG_VERSION:-Not detected}"
-fi
-if test x$GDLIB_VERSION != xnot_needed; then
-echo "                                       libgd                 ${GDLIB_VERSION:-Not detected}"
-fi
-echo "                                       zlib                  ${ZLIB_VERSION:-Not detected}"
-if test x$WEB = xdisabled; then
-echo ""
-echo ""
-echo "WARNING! amuleweb has been disabled because configure could not find"
-echo "a POSIX compliant regex library."
-echo ""
-fi
-if test -z "$LIBPNG_VERSION"; then
-echo ""
-echo ""
-echo "WARNING! libpng >= 1.2.0 not found."
-echo "amuleweb will be compiled but file download progress bar images will NOT be generated."
-echo ""
-fi
-if test x$ENABLE_UPNP = xdisabled; then
-echo ""
-echo ""
-echo "WARNING! UPnP code has been disabled because ${libupnp_error}."
-echo ""
-fi
-if test x$ENABLE_IP2COUNTRY = xdisabled; then
-echo ""
-echo ""
-echo "WARNING! GeoIP IP2Country support has been disabled!"
-echo ""
+echo "                             libintl               $libintl_found"
 fi
+MULE_IF_ENABLED([geoip],
+	[AS_IF([test -z "${with_geoip_headers:-}${with_geoip_lib:-}"], [geoip_style=system], [geoip_style=user])
+	MULE_IF_ENABLED_ANY([monolithic, amule-gui], 
+		[echo "                             libGeoIP              ${geoip_style}"])])
+MULE_IF_ENABLED([webserver],
+	[echo "                             libpng                ${LIBPNG_VERSION:-Not detected}"])
+MULE_IF_ENABLED([cas],
+	[echo "                             libgd                 ${GDLIB_VERSION:-Not detected}"])
+MULE_IF_ENABLED_ANY([monolithic, amule-daemon, amulecmd, webserver, amule-gui],
+	[echo "                             zlib                  ${ZLIB_VERSION:-Not detected}"])
+MULE_IF_ENABLED([plasmamule],
+[echo "                             qt-moc                ${QT_MOC} ${QT_MOC_VERSION}"
+echo "                             qt-core-libs          ${QT_CORE_LIBS}"
+echo "                             qt-gui-libs           ${QT_GUI_LIBS}"
+echo "                             kde4-config           ${KDE4_CONFIG} (${KDE_CONF_VER})"
+echo "                             kde-headers           ${KDE_HEADER_DIR}"
+echo "                             kde-services-path     ${KDE_SERVICE_PATH}"
+echo "                             kde-module-path       ${KDE_MODULE_PATH}"
+echo "                             kde-icon-path         ${KDE_ICON_PATH}"
+echo "                             kde-mime-path         ${KDE_MIME_PATH}"
+echo "                             kde-applinks-path     ${KDE_APPLNK_PATH}"
+])

aMule-2.2.6.tar.bz2/debian/amule-alc-dbg.dirs -> aMule-2.3.1.tar.bz2/debian/amule-alc-dbg.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-alc.dirs -> aMule-2.3.1.tar.bz2/debian/amule-alc.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-alc.install -> aMule-2.3.1.tar.bz2/debian/amule-alc.install Changed

aMule-2.2.6.tar.bz2/debian/amule-alc.manpages -> aMule-2.3.1.tar.bz2/debian/amule-alc.manpages Changed

aMule-2.2.6.tar.bz2/debian/amule-alc.menu -> aMule-2.3.1.tar.bz2/debian/amule-alc.menu Changed

aMule-2.2.6.tar.bz2/debian/amule-alcc-dbg.dirs -> aMule-2.3.1.tar.bz2/debian/amule-alcc-dbg.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-alcc.dirs -> aMule-2.3.1.tar.bz2/debian/amule-alcc.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-alcc.install -> aMule-2.3.1.tar.bz2/debian/amule-alcc.install Changed

aMule-2.2.6.tar.bz2/debian/amule-alcc.manpages -> aMule-2.3.1.tar.bz2/debian/amule-alcc.manpages Changed

aMule-2.2.6.tar.bz2/debian/amule-cas-dbg.dirs -> aMule-2.3.1.tar.bz2/debian/amule-cas-dbg.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-cas.dirs -> aMule-2.3.1.tar.bz2/debian/amule-cas.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-cas.manpages -> aMule-2.3.1.tar.bz2/debian/amule-cas.manpages Changed

aMule-2.2.6.tar.bz2/debian/amule-cmd-dbg.dirs -> aMule-2.3.1.tar.bz2/debian/amule-cmd-dbg.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-cmd.dirs -> aMule-2.3.1.tar.bz2/debian/amule-cmd.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-cmd.manpages -> aMule-2.3.1.tar.bz2/debian/amule-cmd.manpages Changed

aMule-2.2.6.tar.bz2/debian/amule-common.dirs -> aMule-2.3.1.tar.bz2/debian/amule-common.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-common.docs -> aMule-2.3.1.tar.bz2/debian/amule-common.docs Changed

aMule-2.2.6.tar.bz2/debian/amule-common.install -> aMule-2.3.1.tar.bz2/debian/amule-common.install Changed

aMule-2.2.6.tar.bz2/debian/amule-daemon-dbg.dirs -> aMule-2.3.1.tar.bz2/debian/amule-daemon-dbg.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-daemon.dirs -> aMule-2.3.1.tar.bz2/debian/amule-daemon.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-daemon.install -> aMule-2.3.1.tar.bz2/debian/amule-daemon.install Changed

aMule-2.2.6.tar.bz2/debian/amule-daemon.manpages -> aMule-2.3.1.tar.bz2/debian/amule-daemon.manpages Changed

aMule-2.2.6.tar.bz2/debian/amule-dbg.dirs -> aMule-2.3.1.tar.bz2/debian/amule-dbg.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-ed2k-dbg.dirs -> aMule-2.3.1.tar.bz2/debian/amule-ed2k-dbg.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-ed2k.dirs -> aMule-2.3.1.tar.bz2/debian/amule-ed2k.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-ed2k.manpages -> aMule-2.3.1.tar.bz2/debian/amule-ed2k.manpages Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-ar.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-ar.dirs Changed

aMule-2.3.1.tar.bz2/debian/amule-i18n-ast.install Added

aMule-2.2.6.tar.bz2/debian/amule-i18n-bg.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-bg.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-ca.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-ca.dirs Changed

aMule-2.3.1.tar.bz2/debian/amule-i18n-cs.dirs Added

aMule-2.3.1.tar.bz2/debian/amule-i18n-cs.install Added

aMule-2.2.6.tar.bz2/debian/amule-i18n-da.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-da.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-de.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-de.dirs Changed

aMule-2.3.1.tar.bz2/debian/amule-i18n-el.dirs Added

aMule-2.3.1.tar.bz2/debian/amule-i18n-el.install Added

aMule-2.2.6.tar.bz2/debian/amule-i18n-en-gb.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-en-gb.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-es.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-es.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-et-ee.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-et-ee.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-eu.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-eu.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-fi.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-fi.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-fr.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-fr.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-gl.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-gl.dirs Changed

aMule-2.3.1.tar.bz2/debian/amule-i18n-he.install Added

aMule-2.2.6.tar.bz2/debian/amule-i18n-hr.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-hr.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-hu.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-hu.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-it-ch.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-it-ch.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-it.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-it.dirs Changed

aMule-2.3.1.tar.bz2/debian/amule-i18n-ja.dirs Added

aMule-2.3.1.tar.bz2/debian/amule-i18n-ja.install Added

aMule-2.2.6.tar.bz2/debian/amule-i18n-ko-kr.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-ko-kr.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-lt.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-lt.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-nl.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-nl.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-nn.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-nn.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-pl.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-pl.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-pt-br.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-pt-br.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-pt-pt.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-pt-pt.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-ru.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-ru.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-sl.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-sl.dirs Changed

aMule-2.3.1.tar.bz2/debian/amule-i18n-sq.dirs Added

aMule-2.3.1.tar.bz2/debian/amule-i18n-sq.install Added

aMule-2.2.6.tar.bz2/debian/amule-i18n-sv.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-sv.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-tr.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-tr.dirs Changed

aMule-2.3.1.tar.bz2/debian/amule-i18n-uk.dirs Added

aMule-2.2.6.tar.bz2/debian/amule-i18n-zh-cn.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-zh-cn.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-zh-cn.install -> aMule-2.3.1.tar.bz2/debian/amule-i18n-zh-cn.install Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-zh-tw.dirs -> aMule-2.3.1.tar.bz2/debian/amule-i18n-zh-tw.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-i18n-zh-tw.install -> aMule-2.3.1.tar.bz2/debian/amule-i18n-zh-tw.install Changed

aMule-2.3.1.tar.bz2/debian/amule-plasmamule.dirs Added

aMule-2.3.1.tar.bz2/debian/amule-plasmamule.install Added

aMule-2.3.1.tar.bz2/debian/amule-plasmamule.lintian-overrides Added

aMule-2.2.6.tar.bz2/debian/amule-remote-gui-dbg.dirs -> aMule-2.3.1.tar.bz2/debian/amule-remote-gui-dbg.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-remote-gui.dirs -> aMule-2.3.1.tar.bz2/debian/amule-remote-gui.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-remote-gui.install -> aMule-2.3.1.tar.bz2/debian/amule-remote-gui.install Changed

aMule-2.2.6.tar.bz2/debian/amule-remote-gui.manpages -> aMule-2.3.1.tar.bz2/debian/amule-remote-gui.manpages Changed

aMule-2.2.6.tar.bz2/debian/amule-remote-gui.menu -> aMule-2.3.1.tar.bz2/debian/amule-remote-gui.menu Changed

aMule-2.2.6.tar.bz2/debian/amule-skin-gnome.dirs -> aMule-2.3.1.tar.bz2/debian/amule-skin-gnome.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-skin-gnome.install -> aMule-2.3.1.tar.bz2/debian/amule-skin-gnome.install Changed

aMule-2.2.6.tar.bz2/debian/amule-skin-kde4.dirs -> aMule-2.3.1.tar.bz2/debian/amule-skin-kde4.dirs Changed

aMule-2.3.1.tar.bz2/debian/amule-skin-mac-gray.install Added

aMule-2.3.1.tar.bz2/debian/amule-skin-priscilla.dirs Added

aMule-2.3.1.tar.bz2/debian/amule-skin-priscilla.install Added

aMule-2.2.6.tar.bz2/debian/amule-skin-tango.dirs -> aMule-2.3.1.tar.bz2/debian/amule-skin-tango.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-skin-xfce.dirs -> aMule-2.3.1.tar.bz2/debian/amule-skin-xfce.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-theme-default.dirs -> aMule-2.3.1.tar.bz2/debian/amule-theme-default.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-wxcas-dbg.dirs -> aMule-2.3.1.tar.bz2/debian/amule-wxcas-dbg.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-wxcas.dirs -> aMule-2.3.1.tar.bz2/debian/amule-wxcas.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-wxcas.manpages -> aMule-2.3.1.tar.bz2/debian/amule-wxcas.manpages Changed

aMule-2.2.6.tar.bz2/debian/amule-wxcas.menu -> aMule-2.3.1.tar.bz2/debian/amule-wxcas.menu Changed

aMule-2.2.6.tar.bz2/debian/amule-xas.dirs -> aMule-2.3.1.tar.bz2/debian/amule-xas.dirs Changed

aMule-2.2.6.tar.bz2/debian/amule-xas.install -> aMule-2.3.1.tar.bz2/debian/amule-xas.install Changed

aMule-2.2.6.tar.bz2/debian/amule-xas.links -> aMule-2.3.1.tar.bz2/debian/amule-xas.links Changed

aMule-2.3.1.tar.bz2/debian/amule-xas.lintian-overrides Added

aMule-2.2.6.tar.bz2/debian/amule-xas.manpages -> aMule-2.3.1.tar.bz2/debian/amule-xas.manpages Changed

aMule-2.2.6.tar.bz2/debian/amule.dirs -> aMule-2.3.1.tar.bz2/debian/amule.dirs Changed

aMule-2.3.1.tar.bz2/debian/amule.lintian-overrides Added

aMule-2.2.6.tar.bz2/debian/amule.manpages -> aMule-2.3.1.tar.bz2/debian/amule.manpages Changed

aMule-2.2.6.tar.bz2/debian/amule.menu -> aMule-2.3.1.tar.bz2/debian/amule.menu Changed

aMule-2.2.6.tar.bz2/debian/amuleweb-dbg.dirs -> aMule-2.3.1.tar.bz2/debian/amuleweb-dbg.dirs Changed

aMule-2.2.6.tar.bz2/debian/amuleweb.dirs -> aMule-2.3.1.tar.bz2/debian/amuleweb.dirs Changed

aMule-2.2.6.tar.bz2/debian/amuleweb.manpages -> aMule-2.3.1.tar.bz2/debian/amuleweb.manpages Changed

aMule-2.2.6.tar.bz2/debian/changelog -> aMule-2.3.1.tar.bz2/debian/changelog Changed

@@ -1,9 +1,351 @@
+amule (2.3.1) testing; urgency=low
+
+  * New Upstream Release
+
+ -- Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>  Fri, 11 Nov 2011 11:11:11 +0200
+
+amule (2.3.0~rc2+svn-10603) testing; urgency=low
+
+  * Removed amule-ed2k.docs
+  * Switched to debhelper 8
+  * Resorted all files alphabetically
+  * Switched to 3.0 (quilt) source-format
+  * Updated build-deps to dh-8 and wx 2.8.12 minimum
+
+ -- Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>  Thu, 01 Sep 2011 15:34:28 +0200
+
+amule (2.3.0~rc2+svn-10600) testing; urgency=low
+
+  * New upstream release candidate
+  * Removed amule-i18n-ro package
+  * Synced manpages to upstream
+
+ -- Dévai Tamás (gonosztopi) <gonosztopi@amule.org>  Sun, 14 Aug 2011 20:56:11 +0000
+
+amule (2.2.6+svn-10406) testing; urgency=low
+
+  * Bumped Standards Version to 3.9.1
+  * Explicitly refer to source format 1.0
+  * debian/control
+    + Corrected spelling-error in description of amule-common
+    + Removed ${shlibs:Depends} in debian/control from:
+      - amule-common
+      - amule-dbg
+      - amule-ed2k-dbg
+      - amule-cas-dbg
+      - amule-wxcas-dbg
+      - amuleweb-dbg
+      - amule-remote-gui-dbg
+      - amule-daemon-dbg
+      - amule-alc-dbg
+      - amule-alcc-dbg
+      - amule-cmd-dbg
+      - amule-utils
+    + Removed ${perl:Depends} in debian/control from amule-ed2k
+    + Explicitly mark amule-utils and amule-utils-gui as meta-package
+    + Added autoconf to Build-Deps
+    + Added Homepage field
+  * Added amule-i18n-ro package
+  * Added amule-plasmamule and amule-plasmamule-dbg packages
+  * debian/rules
+    + Added dh_installmime call for amule-plasmamule
+  * Readded
+    + amule-i18n-ast
+    + amule-i18n-cs
+    + amule-i18n-el
+    + amule-i18n-he
+    + amule-i18n-ja
+    + amule-i18n-sq
+    + amule-i18n-uk
+    + amule.lintian-overrides
+    + amule-skin-mac-gray
+    + amule-skin-priscilla
+    + amule-xas.lintian-overrides
+  * Removed amule.README.Debian
+
+ -- Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>  Wed, 15 Dec 2010 06:25:28 +0100
+
+amule (2.2.6+svn-9854) testing; urgency=low
+
+  * Changed Naming Convention to represent the revision
+  * debian/control
+    - Versioned Build-Dep on libwxgtk2.8-dev to use minimum 2.8.8
+    - Bumped Standardsversion to 3.8.3
+    - Moved i18n-packages to Section localisation
+    - Set right Conflicts/Replaces for
+      + amule-wxcas
+      + amule-alc
+      + amule-remote-gui
+      + amule-ed2k
+      + amulecmd
+      + Added ${misc:Depends} to packages deps
+      + Bumped versioned build-dep of debhelper to >= 7
+      + Moved -dbg packages to section debug
+  * debian/amule-common.install
+    - Changed old aMule-CVS dir for docs to amule
+  * debian/rules
+    - Changed --with-ccache to --enable-ccache
+    - Re-enabled install of xas
+    - Removed the if's to install lintian overrides, use dh_lintian instead
+    - Added DEB_BUILD_OPTIONS_PARALLEL=3 for parallel building
+  * debian/clean
+    - removed compile
+  * Removed amule-ed2k.preinst
+  * Added Package
+    - amule-i18n-ast
+    - amule-i18n-cs
+    - amule-i18n-el
+    - amule-i18n-he
+    - amule-i18n-ja
+    - amule-i18n-sq
+    - amule-i18n-uk
+    - amule-skin-mac-gray
+    - amule-skin-priscilla
+  * Moved amule.override to amule.lintian-overrides
+  * Moved amule-xas.override to amule-xas.lintian-overrides
+
+ -- Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>  Thu, 05 Nov 2009 11:51:28 +0200
+
+amule (2.2.6) testing; urgency=low
+
+  * New Upstream Release
+
+ -- Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>  Thu, 17 Sep 2009 12:34:32 +0100
+
+amule (2.2.5) testing; urgency=low
+
+  * New Upstream Release
+
+ -- Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>  Sun, 17 May 2009 11:51:31 +0200
+
+amule (2.2.4) testing; urgency=low
+
+  * New Upstream Release
+
+ -- Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>  Fri, 10 Apr 2009 13:27:01 +0100
+
 amule (2.2.3) testing; urgency=low
 
   * New Upstream release
 
  -- Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>  Sun, 28 Dec 2008  16:00:00 +0100
 
+amule (2.2.2+SVN20080930) testing; urgency=low
+
+  * debian/rules
+    + clean target now uses dh_autoclean
+    + clean target now uses dh_prep
+    + Removed stamp-files from clean target
+    + Moved the stripping of -dbg packages to separate define
+    + Removed dh_clean from build target
+    + Removed dh_installdirs from clean target
+    + Use dh_auto_install
+    + Added xas to normal-packages
+    + Use dh_auto-build
+    + Use dh_auto_configure and remove the now unneeded params and vars
+    + Removed dh_clean and dh_installdirs from install target
+    + Removed the unnueeded pkg var
+    + Made the commands use $@
+    + Put language-packages into one generic target
+    + Removed the trap for clean
+    + Removed the setting of gcc-vars, dpkg-buildpackage does this by itself
+    + Moved all -stage1 and -stage2 targets into generic ones
+    + Let the mapping targets use $@
+    + Added check for existing .ovveride file before installing it
+    + Moved package amule-theme-default from general to webserver
+  * debian/compat
+    Use debhelper 7 features
+  * debian/control
+    + Adjusted description of amule-theme-default
+    + Changed Maintainer to satisfy lintian
+    + Added Replaces for older amule-utils for amule-ed2k
+    + Added Replaces for older amule-utils for amule-alcc
+    + Added Replaces for older amule-utils for amule-cas
+    + Added Replaces for older amule-utils for amule-amulecmd
+    + Added Replaces for older amule-utils-gui for amule-wxcas
+    + Added Replaces for older amule-utils-gui for amule-alc
+    + Added Replaces for older amule-utils-gui for amule-remotegui
+  * Added debian/clean
+  * Removed maintainer warning from override files
+  * Deleted now empty file
+    + amule-alcc-dbg.override
+    + amule-alcc.override
+    + amule-alc-dbg.override
+    + amule-alc.override
+    + amule-cas-dbg.override
+    + amule-cas.override
+    + amule-cmd-dbg.override
+    + amule-cmd.override
+    + amule-common.override
+    + amule-daemon-dbg.override
+    + amule-daemon.override
+    + amule-dbg.override
+    + amule-ed2k-dbg.override
+    + amule-ed2k.override
+    + amule-i18n-ar.override
+    + amule-i18n-bg.override
+    + amule-i18n-ca.override
+    + amule-i18n-da.override
+    + amule-i18n-de.override
+    + amule-i18n-en-gb.override
+    + amule-i18n-es.override
+    + amule-i18n-et-ee.override
+    + amule-i18n-eu.override
+    + amule-i18n-fi.override
+    + amule-i18n-fr.override
+    + amule-i18n-gl.override
+    + amule-i18n-hr.override
+    + amule-i18n-hu.override
+    + amule-i18n-it-ch.override
+    + amule-i18n-it.override
+    + amule-i18n-ko-kr.override
+    + amule-i18n-lt.override
+    + amule-i18n-nl.override
+    + amule-i18n-nn.override
+    + amule-i18n-pl.override
+    + amule-i18n-pt-br.override
+    + amule-i18n-pt-pt.override
+    + amule-i18n-ru.override
+    + amule-i18n-sl.override
+    + amule-i18n-sv.override
+    + amule-i18n-tr.override
+    + amule-i18n-zh-cn.override
+    + amule-i18n-zh-tw.override
+    + amule-remote-gui-dbg.override
+    + amule-remote-gui.override
+    + amule-skin-gnome.override
+    + amule-skin-kde4.override
+    + amule-skin-tango.override
+    + amule-skin-xfce.override
+    + amule-theme-default.override
+    + amule-utils-gui.override
+    + amule-utils.override
+    + amuleweb-dbg.override
+    + amuleweb.override
+    + amule-wxcas-dbg.override
+    + amule-wxcas.override
+  * Removed ovveride dir from
+    + amule-alcc-dbg.dirs
+    + amule-alcc.dirs
+    + amule-alc-dbg.dirs
+    + amule-alc.dirs
+    + amule-cas-dbg.dirs
+    + amule-cas.dirs
+    + amule-cmd-dbg.dirs
+    + amule-cmd.dirs
+    + amule-common.dirs
+    + amule-daemon-dbg.dirs
+    + amule-daemon.dirs
+    + amule-dbg.dirs
+    + amule-ed2k-dbg.dirs
+    + amule-ed2k.dirs
+    + amule-i18n-ar.dirs
+    + amule-i18n-bg.dirs
+    + amule-i18n-ca.dirs
+    + amule-i18n-da.dirs
+    + amule-i18n-de.dirs
+    + amule-i18n-en-gb.dirs
+    + amule-i18n-es.dirs
+    + amule-i18n-et-ee.dirs
+    + amule-i18n-eu.dirs
+    + amule-i18n-fi.dirs
+    + amule-i18n-fr.dirs
+    + amule-i18n-gl.dirs
+    + amule-i18n-hr.dirs
+    + amule-i18n-hu.dirs
+    + amule-i18n-it-ch.dirs
+    + amule-i18n-it.dirs
+    + amule-i18n-ko-kr.dirs
+    + amule-i18n-lt.dirs
+    + amule-i18n-nl.dirs
+    + amule-i18n-nn.dirs
+    + amule-i18n-pl.dirs
+    + amule-i18n-pt-br.dirs
+    + amule-i18n-pt-pt.dirs
+    + amule-i18n-ru.dirs
+    + amule-i18n-sl.dirs
+    + amule-i18n-sv.dirs
+    + amule-i18n-tr.dirs
+    + amule-i18n-zh-cn.dirs
+    + amule-i18n-zh-tw.dirs
+    + amule-remote-gui-dbg.dirs
+    + amule-remote-gui.dirs
+    + amule-skin-gnome.dirs
+    + amule-skin-kde4.dirs
+    + amule-skin-tango.dirs
+    + amule-skin-xfce.dirs
+    + amule-theme-default.dirs
+    + amuleweb-dbg.dirs
+    + amuleweb.dirs
+    + amule-wxcas-dbg.dirs
+    + amule-wxcas.dirs
+  * Removed Package amule-theme-php-default
+  * Removed Package amule-theme-chicane
+
+ -- Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>  Tue, 30 Sep 2008  11:46:01 +0100
+
+amule (2.2.2+SVN20080812) testing; urgency=low
+
+  * Corrected Copyright file
+
+ -- Vollstrecker <amule@vollstreckernet.de>  Tue, 12 Aug 2008  14:41:01 +0100
+
+amule (2.2.2) testing; urgency=low
+
+  * New Upstream Release
+
+ -- Vollstrecker <amule@vollstreckernet.de>  Fri, 08 Aug 2008 16:21:02 +0100
+
+amule (2.2.1+CVS20080802) testing; urgency=low
+
+  * debian/control
+     Moved -dbg packages to section extra
+     Let -dbg packages depend on their binary ones
+     Corrected Spelling of Gnome -> GNOME
+  * debian/rules
+     Add target to call autogen.sh when svn checkout is used
+  * Adjusted menu-section for wxcas
+  * Adjusted menu-section for amule-remote-gui
+  * Adjusted menu-section for alc
+  * Adjusted menu-section for amule
+  * Fixed amule-common: empty-directory usr/share/pixmaps/
+  * Fixed amule-common: empty-directory usr/share/doc/aMule-CVS/
+  * Fixed amule-cas: empty-directory usr/share/pixmap/
+  * Fixed amule-alc-dbg: empty-directory usr/share/applications/
+  * Fixed amule-xas: empty-directory usr/share/doc/xchat-common/scripts-perl/
+
+ -- Vollstrecker <amule@vollstreckernet.de>  Sat, 02 Aug 2008  18:15:01 +0200
+
+amule (2.2.1+SVN20080717) testing; urgency=low
+
+  * debian/control
+      Adjusted Build-Deps to use libupnp-dev >> 1.6.6
+      Bumped Standards-Version to 3.8.0.1
+
+ -- Vollstrecker <amule@vollstreckernet.de>  Sun, 17 Jun 2008  15:29:01 +0200
+
+amule (2.1.3+SVN20080614) testing; urgency=low
+
+  * Renamed Packages to SVN instead of CVS
+
+ -- Vollstrecker <amule@vollstreckernet.de>  Sat, 14 Jun 2008  15:51:02 +0100
+
+amule (2.2.1) testing; urgency=low
+
+  * New Upstream Stable Release
+
+ -- Vollstrecker <amule@vollstreckernet.de>  Fri, 12 Jun 2008  19:32:02 +0100
+
+amule (2.1.3+CVS20080609) testing; urgency=low
+
+  * Added dh_clean to clean-target
+  * Made separate build of xas package possible
+  * Removed --enable-systray from configure options
+  * Removed --enable-utf8-systray from configure options
+  * Removed --disable-embedded-crypto from configure options
+
+ -- Vollstrecker <amule@vollstreckernet.de>  Mon, 09 Jun 2008  15:29:01 +0200
+
 amule (2.1.3+CVS20080121) testing; urgency=low
 
   * Added binutils-dev to Build-Deps
@@ -218,7 +560,7 @@
   * Moved amule.xpm back to amule-common
   * Fixed typo in description of amule-dbg
   * Removed Version from dep to amule-i18n
-    Thanks to jere for reposting all three
+    Thanks to jere for reporting all three
 
  -- Vollstrecker <amule@vollstreckernet.de>  Sat, 13 May 2006  15:44:40 +0100

aMule-2.3.1.tar.bz2/debian/clean Added

@@ -0,0 +1,85 @@
+alc
+alcc
+alcc-dbg
+alc-dbg
+amule
+amule-alcc-dbg
+amule-alcc-stage1
+amule-alcc-stage2
+amule-alc-dbg
+amule-alc-stage1
+amule-alc-stage2
+amule-cas-dbg
+amule-cas-stage1
+amule-cas-stage2
+amulecmd
+amule-cmd-dbg
+amulecmd-dbg
+amule-cmd-stage1
+amule-cmd-stage2
+amule-common
+amule-daemon-dbg
+amule-daemon-stage1
+amule-daemon-stage2
+amule-dbg
+amule-ed2k-dbg
+amule-ed2k-stage1
+amule-ed2k-stage2
+amule-remote-gui-dbg
+amule-remote-gui-stage1
+amule-remote-gui-stage2
+amule-stage1
+amule-stage2
+amule-theme-default-stage1
+amule-theme-default-stage2
+amule-utils
+amule-utils-gui
+amuleweb-dbg
+amuleweb-stage1
+amuleweb-stage2
+amule-wxcas-dbg
+amule-wxcas-stage1
+amule-wxcas-stage2
+build-stamp 
+cas
+cas-dbg
+daemon
+daemon-dbg
+ed2k
+ed2k-dbg
+i18n-ar
+i18n-bg
+i18n-ca
+i18n-da
+i18n-de
+i18n-en-gb
+i18n-es
+i18n-et-ee
+i18n-eu
+i18n-fi
+i18n-fr
+i18n-gl
+i18n-hr
+i18n-hu
+i18n-it
+i18n-it-ch
+i18n-ko-kr
+i18n-lt
+i18n-nl
+i18n-nn
+i18n-pl
+i18n-pt-br
+i18n-pt-pt
+i18n-ru
+i18n-sl
+i18n-sv
+i18n-tr
+i18n-zh-cn
+i18n-zh-tw
+remotegui
+remotegui-dbg
+webserver
+webserver-dbg
+wxcas
+wxcas-dbg
+xas

aMule-2.2.6.tar.bz2/debian/compat -> aMule-2.3.1.tar.bz2/debian/compat Changed

aMule-2.2.6.tar.bz2/debian/control -> aMule-2.3.1.tar.bz2/debian/control Changed

@@ -1,13 +1,14 @@
 Source: amule
 Section: net
 Priority: optional
-Maintainer: Vollstrecker <amule@vollstreckernet.de>
-Build-Depends: debhelper (>= 5.0.0), libglib2.0-dev, libgtk2.0-dev, zlib1g-dev, libwxgtk2.8-dev, libgd2-xpm-dev, bison, flex, libcrypto++-dev, libreadline5-dev, libgeoip-dev, libupnp-dev, binutils-dev
-Standards-Version: 3.7.2.2
+Maintainer: Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>
+Build-Depends: debhelper (>= 8), libglib2.0-dev, libgtk2.0-dev, zlib1g-dev, libwxgtk2.8-dev (>= 2.8.12), libgd2-xpm-dev, bison, flex, libcrypto++-dev, libreadline5-dev, libgeoip-dev, libupnp-dev (>> 1.6.6), binutils-dev, autoconf, libqt4-dev, kdelibs5-dev, gettext
+Standards-Version: 3.9.1
+Homepage: http://www.amule.org
 
 Package: amule
 Architecture: any
-Depends: ${shlibs:Depends}, amule-common (= ${binary:Version}), amule-i18n-en-gb (= ${binary:Version}) | amule-i18n
+Depends: ${shlibs:Depends}, amule-common (= ${binary:Version}), amule-i18n-en-gb (= ${binary:Version}) | amule-i18n, ${misc:Depends}
 Recommends: amule-utils, amule-cas, amule-wxcas
 Suggests: amule-xas, amule-ed2k
 Description: aNOTHER eMule P2P Client
@@ -18,10 +19,10 @@
 
 Package: amule-utils
 Architecture: any
-Depends: ${shlibs:Depends}, amule-common (= ${binary:Version}), amule-alcc (= ${binary:Version}), amule-cmd (= ${binary:Version}), amule-cas (= ${binary:Version})
+Depends: amule-common (= ${binary:Version}), amule-alcc (= ${binary:Version}), amule-cmd (= ${binary:Version}), amule-cas (= ${binary:Version}), ${misc:Depends}
 Recommends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version})
 Description: utilities for amule
- amule-utils is a set of tools to control amule.
+ amule-utils is a meta-package for a set of tools to control amule.
  .
  alcc lets you created ed2k-links and hashes from the commandline
  cas is a remplacement software for astats. It produces statistic from amule. 
@@ -29,12 +30,13 @@
 
 Package: amule-utils-gui
 Architecture: any
-Depends: ${shlibs:Depends}, amule-common (= ${binary:Version}), amule-alc (= ${binary:Version}), amule-remote-gui (= ${binary:Version}), amule-wxcas (= ${binary:Version})
+Depends: amule-common (= ${binary:Version}), amule-alc (= ${binary:Version}), amule-remote-gui (= ${binary:Version}), amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Recommends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version})
 Description: utilities for amule
  amule-utils-gui is a set of tools to control amule.
  .
- This package depends on useful programs using GUI to control aMule.
+ This is a meta-package that depends on useful programs using GUI to control
+ aMule.
  .
  alc is a software to created ed2k-links and hashes
  amule trough a terminal.
@@ -43,66 +45,55 @@
 
 Package: amule-ed2k
 Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version})
-Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}), xmule (<= 1.10.0b-1)
+Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}), xmule (<= 1.10.0b-1), amule-utils (<< ${binary:Version})
+Replaces: amule-utils (<< ${binary:Version})
 Description: amule ed2k link-handler
  ed2k let you use ed2k Links with your amule-app
 
 Package: amule-cas
 Architecture: any
-Depends: ${shlibs:Depends}, amule (= ${binary:Version}) | amule-daemon (= ${binary:Version})
-Conflicts: amule-utils (<< ${binary:Version}), amule-common (<< ${binary:Version})
+Depends: ${shlibs:Depends}, amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}), ${misc:Depends}
+Conflicts: amule-utils (<< ${binary:Version})
+Replaces: amule-utils (<< ${binary:Version})
 Description: reporting module for amule
  cas reports statistics about amule on the console
 
 Package: amule-wxcas
 Architecture: any
-Depends: ${shlibs:Depends}, amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}), amule-i18n-en-gb (= ${binary:Version}) | amule-i18n
-Conflicts: amule-utils (<< ${binary:Version})
+Depends: ${shlibs:Depends}, amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}), amule-i18n-en-gb (= ${binary:Version}) | amule-i18n, ${misc:Depends}
+Conflicts: amule-utils-gui (<< ${binary:Version})
+Replaces: amule-utils-gui (<< ${binary:Version})
 Description: reporting module for amule (graphical)
  wxcas reports statistics about amule on your desktop, using wxlib
 
 Package: amule-xas
 Architecture: any
-Depends: ${perl:Depends}, amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}), xchat | xchat-text
+Depends: ${perl:Depends}, amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}), xchat | xchat-text, ${misc:Depends}
 Description: amule statistics for xchat
  xas reports statistics about amule to IRC-Channels using XChat
 
 Package: amule-common
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}
 Description: common files for amule
- this packages contains common files for amule. atm only the
+ this package contains common files for amule. atm only the
  icon for the menu
 
 Package: amule-theme-default
 Architecture: any
 Provides: amule-web-templates
-Depends: ${shlibs:Depends}, amuleweb (= ${binary:Version})
+Depends: amuleweb (= ${binary:Version}), ${misc:Depends}
 Conflicts: amule-common (<< ${binary:Version}), amule (<< ${binary:Version})
 Description: the default template for the webserver
  this package contains the default template for amulewebserver
-
-Package: amule-theme-php-default
-Architecture: any
-Provides: amule-web-templates
-Depends: ${shlibs:Depends}, amuleweb (= ${binary:Version})
-Conflicts: amule-common (<< ${binary:Version})
-Description: the default template for the webserver
- this package contains the default php template for amulewebserver
-
-Package: amule-theme-chicane
-Architecture: any
-Provides: amule-web-templates
-Depends: ${shlibs:Depends}, amuleweb (= ${binary:Version})
-Conflicts: amule-common (<< ${binary:Version}), amule (<< ${binary:Version})
-Description: a new template set for the webserver
- this package contains a new theme for amulewebserver
+ atm the litoral theme is the default one, and the only one
+ included in aMule
 
 Package: amuleweb
 Architecture: any
-Depends: ${shlibs:Depends}, amule-web-templates, amule-i18n-en-gb (= ${binary:Version}) | amule-i18n
+Depends: ${shlibs:Depends}, amule-web-templates, amule-i18n-en-gb (= ${binary:Version}) | amule-i18n, ${misc:Depends}
 Recommends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version})
 Conflicts: amule (<< ${binary:Version}), amule-daemon (<< ${binary:Version})
 Description: the webserver for amule
@@ -111,7 +102,9 @@
 
 Package: amule-remote-gui
 Architecture: any
-Depends: ${shlibs:Depends}, amule-i18n-en-gb (= ${binary:Version}) | amule-i18n
+Depends: ${shlibs:Depends}, amule-i18n-en-gb (= ${binary:Version}) | amule-i18n, ${misc:Depends}
+Replaces: amule-utils-gui (<< ${binary:Version})
+Conflicts: amule-utils-gui (<< ${binary:Version})
 Description: the remote gui for amule
  this is the remote GUI for amule. You can use it on every machine to execute
  commands on the main prog. You need a running amule or amuled on at least one
@@ -119,7 +112,7 @@
 
 Package: amule-daemon
 Architecture: any
-Depends: ${shlibs:Depends}, amule-i18n-en-gb (= ${binary:Version}) | amule-i18n
+Depends: ${shlibs:Depends}, amule-i18n-en-gb (= ${binary:Version}) | amule-i18n, ${misc:Depends}
 Replaces: amuled (<< ${binary:Version})
 Conflicts: amule-daemon (<< ${binary:Version})
 Description: the amule daemon
@@ -128,337 +121,484 @@
 
 Package: amule-alc
 Architecture: any
-Depends: ${shlibs:Depends}, amule-i18n-en-gb (= ${binary:Version}) | amule-i18n
-Conflicts: amule-utils (<< ${binary:Version})
+Depends: ${shlibs:Depends}, amule-i18n-en-gb (= ${binary:Version}) | amule-i18n, ${misc:Depends}
+Conflicts: amule-utils-gui (<< ${binary:Version})
+Replaces: amule-utils-gui (<< ${binary:Version})
 Description: the amule-link-creator
  amule-link-creator lets you create ed2k-links and hashes for a given file.
 
 Package: amule-alcc
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: amule-utils (<< ${binary:Version})
+Replaces: amule-utils (<< ${binary:Version})
 Description: the amule-link-creator (commandline-version)
  amule-link-creator lets you create ed2k-links and hashes for a given file
  from the commandline.
 
 Package: amule-cmd
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: amule-utils (<< ${binary:Version})
+Replaces: amule-utils (<< ${binary:Version})
 Description: the amule-commandline-client
  amulecmd gives you control over a running amule-daemon or amule from
  commandline.
 
 Package: amule-i18n-ar
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Arabic (ar) internationalized (i18n) files for amule
  This package contains the Arabic internationalized files for amule.
 
+Package: amule-i18n-ast
+Section: localization
+Architecture: any
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
+Provides: amule-i18n
+Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) 
+Description: Asturian (ast) internationalized (i18n) files for amule
+ This package contains the Asturian internationalized files for amule.
+
 Package: amule-i18n-bg
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Bulgarian (bg) internationalized (i18n) files for amule
  This package contains the Bulgarian internationalized files for amule.
 
 Package: amule-i18n-ca
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) 
 Description: Catalan (ca) internationalized (i18n) files for amule
  This package contains the Catalan internationalized files for amule.
 
+Package: amule-i18n-cs
+Section: localization
+Architecture: any
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
+Provides: amule-i18n
+Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) 
+Description: Czech (cs) internationalized (i18n) files for amule
+ This package contains the Czech internationalized files for amule.
+
 Package: amule-i18n-da
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Danish (da) internationalized (i18n) files for amule
  This package contains the Danish internationalized files for amule.
 
 Package: amule-i18n-de
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: German (de) internationalized (i18n) files for amule
  This package contains the German internationalized files for amule.
 
+Package: amule-i18n-el
+Section: localization
+Architecture: any
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
+Provides: amule-i18n
+Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) 
+Description: Greek (el) internationalized (i18n) files for amule
+ This package contains the Greek internationalized files for amule.
+
 Package: amule-i18n-en-gb
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: English (en_GB) internationalized (i18n) files for amule
  This package contains the British-English internationalized files for amule.
 
 Package: amule-i18n-es
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Spanish (es) internationalized (i18n) files for amule
  This package contains the Spanish internationalized files for amule.
 
 Package: amule-i18n-et-ee
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Estonian (et_EE) internationalized (i18n) files for amule
  This package contains the Estonian internationalized files for amule.
 
 Package: amule-i18n-eu
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Basque (eu) internationalized (i18n) files for amule
  This package contains the Basque internationalized files for amule.
 
 Package: amule-i18n-fi
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Finnish (fi) internationalized (i18n) files for amule
  This package contains the Finnish internationalized files for amule.
 
 Package: amule-i18n-fr
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: French (fr) internationalized (i18n) files for amule
  This package contains the French internationalized files for amule.
 
 Package: amule-i18n-gl
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Gallegan (gl) internationalized (i18n) files for amule
  This package contains the Gallegan internationalized files for amule.
 
+Package: amule-i18n-he
+Section: localization
+Architecture: any
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
+Provides: amule-i18n
+Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) 
+Description: Hebrew (he) internationalized (i18n) files for amule
+ This package contains the Hebrew internationalized files for amule.
+
 Package: amule-i18n-hr
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Croatian (hr) internationalized (i18n) files for amule
  This package contains the Croatian internationalized files for amule.
 
 Package: amule-i18n-hu
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Hungarian (hu) internationalized (i18n) files for amule
  This package contains the Hungarian internationalized files for amule.
 
 Package: amule-i18n-it-ch
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Italian (it_CH) internationalized (i18n) files for amule
  This package contains the Italian internationalized files for amule.
 
 Package: amule-i18n-it
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Italian (it) internationalized (i18n) files for amule
  This package contains the Italian internationalized files for amule.
 
+Package: amule-i18n-ja
+Section: localization
+Architecture: any
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
+Provides: amule-i18n
+Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) 
+Description: Japanese (ja) internationalized (i18n) files for amule
+ This package contains the Japanese internationalized files for amule.
+
 Package: amule-i18n-ko-kr
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Korean (ko_KR) internationalized (i18n) files for amule
  This package contains the Korean internationalized files for amule.
 
 Package: amule-i18n-lt
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Lithunian (lt) internationalized (i18n) files for amule
  This package contains the Lithunian internationalized files for amule.
 
 Package: amule-i18n-nn
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Norwegian (Nyorsk) (nn) internationalized (i18n) files for amule
  This package contains the Norwegian (Nyorsk) internationalized files for amule.
 
 Package: amule-i18n-nl
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Dutch (nl) internationalized (i18n) files for amule
  This package contains the Dutch internationalized files for amule.
 
 Package: amule-i18n-pl
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Polish (pl) internationalized (i18n) files for amule
  This package contains the Polish internationalized files for amule.
 
 Package: amule-i18n-pt-br
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Portuguese (pt_BR) internationalized (i18n) files for amule
  This package contains the Portuguese internationalized files for amule.
 
 Package: amule-i18n-pt-pt
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Portuguese (pt_PT) internationalized (i18n) files for amule
  This package contains the Portuguese internationalized files for amule.
 
 Package: amule-i18n-ru
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Russian (ru) internationalized (i18n) files for amule
  This package contains the Russian internationalized files for amule.
 
 Package: amule-i18n-sl
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Slovenian (sl) internationalized (i18n) files for amule
  This package contains the Slovenian internationalized files for amule.
 
+Package: amule-i18n-sq
+Section: localization
+Architecture: any
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
+Provides: amule-i18n
+Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) 
+Description: Albanian (sq) internationalized (i18n) files for amule
+ This package contains the Albanian internationalized files for amule.
+
 Package: amule-i18n-sv
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Swedish (sv) internationalized (i18n) files for amule
  This package contains the Swedish internationalized files for amule.
 
 Package: amule-i18n-tr
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Turkish (tr) internationalized (i18n) files for amule
  This package contains the Turkish internationalized files for amule.
 
+Package: amule-i18n-uk
+Section: localization
+Architecture: any
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
+Provides: amule-i18n
+Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version}) 
+Description: Ukrainian (uk) internationalized (i18n) files for amule
+ This package contains the Catalan internationalized files for amule.
+
 Package: amule-i18n-zh-cn
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Chinese (zh_CN) internationalized (i18n) files for amule
  This package contains the Chinese internationalized files for amule.
 
 Package: amule-i18n-zh-tw
+Section: localization
 Architecture: any
-Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version})
+Depends: amule (= ${binary:Version}) | amule-daemon (= ${binary:Version}) | amuleweb (= ${binary:Version}) | amule-alc (= ${binary:Version}) | amule-remote-gui (= ${binary:Version}) | amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Provides: amule-i18n
 Conflicts: amule (<< ${binary:Version}), amule-common (<< ${binary:Version})
 Description: Chinese (zh_TW) internationalized (i18n) files for amule
  This package contains the Chinese internationalized files for amule.
 
 Package: amule-dbg
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}
+Section: debug
+Depends: amule (= ${binary:Version}), ${misc:Depends}
 Description: aNOTHER eMule P2P Client debugging symbols
  this package contains the debugging symbols for the amule binary
 
 Package: amule-ed2k-dbg
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}
+Section: debug
+Depends: amule-ed2k (= ${binary:Version}), ${misc:Depends}
 Description: amule ed2k link-handler debugging symbols
  The debugging symbols for the ed2k binary
 
 Package: amule-cas-dbg
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}
+Section: debug
+Depends: amule-cas (= ${binary:Version}), ${misc:Depends}
 Description: reporting module for amule debugging symbols
  the debugging symbols for the cas binary
 
 Package: amule-wxcas-dbg
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}
+Section: debug
+Depends: amule-wxcas (= ${binary:Version}), ${misc:Depends}
 Description: reporting module for amule (graphical) debugging symbols
  the debugging symbols for the wxcas binary
 
 Package: amuleweb-dbg
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}
+Section: debug
+Depends: amuleweb (= ${binary:Version}), ${misc:Depends}
 Description: the webserver for amule debugging symbols
  the debugging symbols for the amuleweb binary
 
 Package: amule-remote-gui-dbg
+Priority: extra
 Architecture: any
+Section: debug
+Depends: amule-remote-gui (= ${binary:Version}), ${misc:Depends}
 Description: the remote gui for amule debugging symbols
  the debugging symbols for the amulegui binary
 
 Package: amule-daemon-dbg
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}
+Section: debug
+Depends: amule-daemon (= ${binary:Version}), ${misc:Depends}
 Description: the amule daemon debugging symbols
  the debugging symbols for the amuled binary
 
 Package: amule-alc-dbg
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}
+Section: debug
+Depends: amule-alc (= ${binary:Version}), ${misc:Depends}
 Description: the amule-link-creator debugging symbols
  the debugging symbols for the alc binary
 
 Package: amule-alcc-dbg
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}
+Section: debug
+Depends: amule-alcc (= ${binary:Version}), ${misc:Depends}
 Description: the amule-link-creator (commandline-version) debugging symbols
  the debugging symbols for the alcc binary
 
 Package: amule-cmd-dbg
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}
+Section: debug
+Depends: amule-cmd (= ${binary:Version}), ${misc:Depends}
 Description: the amule-commandline-client-dbg
  the debugging symbols for the amulecmd binary
 
+Package: amule-plasmamule
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: kde plasmoid to control amule
+ plasmoid to control the amule application and helper apps and mimetype
+ for handling emulecollections
+
+Package: amule-plasmamule-dbg
+Priority: extra
+Architecture: any
+Section: debug
+Depends: amule-plasmamule (= ${binary:Version}), ${misc:Depends}
+Description: kde plasmoid to control amule debugging symbols
+ the debugging symbols for the stuff in amule-plasmamule
+
 Package: amule-skin-gnome
 Architecture: any
-Depends: amule (= ${binary:Version})
+Depends: amule (= ${binary:Version}), ${misc:Depends}
 Provides: amule-skin
 Conflicts: amule (<< ${binary:Version})
-Description: Gnome Skin files for amule
- This package contains the Gnome Skin files for amule.
+Description: GNOME Skin files for amule
+ This package contains the GNOME Skin files for amule.
 
 Package: amule-skin-kde4
 Architecture: any
-Depends: amule (= ${binary:Version})
+Depends: amule (= ${binary:Version}), ${misc:Depends}
 Provides: amule-skin
 Conflicts: amule (<< ${binary:Version})
 Description: KDE4 Skin files for amule
  This package contains the KDE4 Skin files for amule.
 
+Package: amule-skin-mac-gray
+Architecture: any
+Depends: amule (= ${binary:Version}), ${misc:Depends}
+Provides: amule-skin
+Conflicts: amule (<< ${binary:Version})
+Description: Mac Gray Skin files for amule
+ This package contains the Mac Gray Skin files for amule.
+ 
+Package: amule-skin-priscilla
+Architecture: any
+Depends: amule (= ${binary:Version}), ${misc:Depends}
+Provides: amule-skin
+Conflicts: amule (<< ${binary:Version})
+Description: Priscilla Skin files for amule
+ This package contains the Priscilla Skin files for amule.
+
 Package: amule-skin-tango
 Architecture: any
-Depends: amule (= ${binary:Version})
+Depends: amule (= ${binary:Version}), ${misc:Depends}
 Provides: amule-skin
 Conflicts: amule (<< ${binary:Version})
 Description: Tango Skin files for amule
@@ -466,7 +606,7 @@
 
 Package: amule-skin-xfce
 Architecture: any
-Depends: amule (= ${binary:Version})
+Depends: amule (= ${binary:Version}), ${misc:Depends}
 Provides: amule-skin
 Conflicts: amule (<< ${binary:Version})
 Description: Xfce Skin files for amule

aMule-2.2.6.tar.bz2/debian/copyright -> aMule-2.3.1.tar.bz2/debian/copyright Changed

@@ -3,12 +3,1710 @@
 
 It was downloaded from http://www.amule.org
 
-Upstream Author: Kry <kry@amule.org>
+Upstream Author: aMule Team ( admin@amule.org )
 
-Copyright: 
+Copyright (c) 1984-2008 Free Software Foundation, Inc.
+	src/Parser.cpp
+	src/Parser.hpp
+	src/webserver/src/php_parser.h
 
-   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; version 2 dated June, 1991.
+Copyright (c) 1989, 1991-2008 Free Software Foundation, Inc.
+	docs/COPYING
 
-   See /usr/share/common-licenses/GPL.
+Copyright (c) 1991-2008, RSA Data Security, Inc
+	src/libs/common/MD5Sum.h
+
+Copyright (c) 1995-2008 Free Software Foundation, Inc.
+	m4/gettext.m4
+	m4/isc-posix.m4
+	m4/lcmessage.m4
+	m4/readline.m4
+
+Copyright (c) 1996-2008 Free Software Foundation, Inc.
+	m4/lib-ld.m4
+	m4/progtest.m4
+
+Copyright (c) 1997-2008 Free Software Foundation, Inc.
+	m4/inttypes_h.m4
+	m4/inttypes.m4
+	m4/inttypes-pri.m4
+	m4/stdint_h.m4
+	m4/uintmax_t.m4
+
+Copyright (c) 1998 Robert Roebling
+	src/extern/wxWidgets/listctrl.cpp
+
+Copyright (c) 1998 Robert Roebling and Julian Smart
+	src/extern/wxWidgets/listctrl.h
+
+Copyright (c) 1998-2008 Vadim Zeitlin ( zeitlin@dptmaths.ens-cachan.fr )
+	src/CFile.cpp
+	src/CFile.h
+
+Copyright (c) 1999-2008 Free Software Foundation, Inc.
+	src/utils/aLinkCreator/src/bithelp.h
+
+Copyright (c) 2000-2008 Free Software Foundation, Inc.
+	m4/codeset.m4
+	m4/glibc21.m4
+	m4/iconv.m4
+
+Copyright (C) 2001-2008 Arthur de Jong
+	src/utils/cas/cas.c
+
+Copyright (c) 2001-2008 Free Software Foundation, Inc.
+	m4/lib-link.m4
+	m4/lib-prefix.m4
+
+Copyright (c) 2002-2008 Dr Brian Gladman ( brg@gladman.me.uk )
+	src/SHA.cpp
+	src/SHA.h
+
+Copyright (c) 2002-2008 Drager
+	src/EditServerListDlg.cpp
+	src/EditServerListDlg.h
+
+Copyright (c) 2002-2008 Free Software Foundation, Inc.
+	m4/intdiv0.m4
+
+Copyright (c) 2002-2008 Matthias Gaertner
+	src/OtherFunctions.cpp
+
+Copyright (c) 2002-2008 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+	src/AddFriend.cpp
+	src/AddFriend.h
+	src/amule.cpp
+	src/amuleDlg.cpp
+	src/amuleDlg.h
+	src/amule.h
+	src/ArchSpecific.h
+	src/AsyncDNS.cpp
+	src/AsyncDNS.h
+	src/BarShader.cpp
+	src/BarShader.h
+	src/BaseClient.cpp
+	src/ChatSelector.cpp
+	src/ChatSelector.h
+	src/ChatWnd.cpp
+	src/ChatWnd.h
+	src/ClientCredits.cpp
+	src/ClientCredits.h
+	src/ClientCreditsList.cpp
+	src/ClientCreditsList.h
+	src/ClientDetailDialog.cpp
+	src/ClientDetailDialog.h
+	src/ClientList.cpp
+	src/ClientListCtrl.cpp
+	src/ClientListCtrl.h
+	src/ClientList.h
+	src/ClientTCPSocket.cpp
+	src/ClientTCPSocket.h
+	src/ClientUDPSocket.cpp
+	src/ClientUDPSocket.h
+	src/ColorFrameCtrl.cpp
+	src/ColorFrameCtrl.h
+	src/CommentDialog.cpp
+	src/CommentDialog.h
+	src/CommentDialogLst.cpp
+	src/CommentDialogLst.h
+	src/DeadSourceList.cpp
+	src/DeadSourceList.h
+	src/DirectoryTreeCtrl.cpp
+	src/DownloadClient.cpp
+	src/DownloadListCtrl.cpp
+	src/DownloadListCtrl.h
+	src/DownloadQueue.cpp
+	src/DownloadQueue.h
+	src/ED2KLink.cpp
+	src/ED2KLink.h
+	src/EMSocket.cpp
+	src/EMSocket.h
+	src/EncryptedDatagramSocket.cpp
+	src/EncryptedDatagramSocket.h
+	src/EncryptedStreamSocket.cpp
+	src/EncryptedStreamSocket.h
+	src/FileDetailDialog.cpp
+	src/FileDetailDialog.h
+	src/FileDetailListCtrl.cpp
+	src/FileDetailListCtrl.h
+	src/Friend.cpp
+	src/Friend.h
+	src/FriendList.cpp
+	src/FriendListCtrl.cpp
+	src/FriendListCtrl.h
+	src/FriendList.h
+	src/include/common/ClientVersion.h
+	src/include/common/Constants.h
+	src/include/common/DataFileVersion.h
+	src/include/common/EventIDs.h
+	src/include/common/Macros.h
+	src/include/common/MenuIDs.h
+	src/include/protocol/ed2k/Client2Client/TCP.h
+	src/include/protocol/ed2k/Client2Client/UDP.h
+	src/include/protocol/ed2k/Client2Server/TCP.h
+	src/include/protocol/ed2k/Client2Server/UDP.h
+	src/include/protocol/ed2k/ClientSoftware.h
+	src/include/protocol/ed2k/Constants.h
+	src/include/protocol/kad2/Client2Client/TCP.h
+	src/include/protocol/kad2/Client2Client/UDP.h
+	src/include/protocol/kad2/Constants.h
+	src/include/protocol/kad/Client2Client/UDP.h
+	src/include/protocol/kad/Constants.h
+	src/include/protocol/Protocols.h
+	src/include/tags/ClientTags.h
+	src/include/tags/FileTags.h
+	src/include/tags/ServerTags.h
+	src/include/tags/TagTypes.h
+	src/IPFilter.cpp
+	src/IPFilter.h
+	src/kademlia/kademlia/UDPFirewallTester.cpp
+	src/kademlia/kademlia/UDPFirewallTester.h
+	src/kademlia/net/PacketTracking.cpp
+	src/kademlia/net/PacketTracking.h
+	src/kademlia/utils/KadClientSearcher.h
+	src/kademlia/utils/KadUDPKey.h
+	src/KnownFile.cpp
+	src/KnownFile.h
+	src/KnownFileList.cpp
+	src/KnownFileList.h
+	src/libs/common/FileFunctions.cpp
+	src/libs/common/FileFunctions.h
+	src/ListenSocket.cpp
+	src/ListenSocket.h
+	src/MemFile.cpp
+	src/MemFile.h
+	src/MuleListCtrl.cpp
+	src/MuleListCtrl.h
+	src/NetworkFunctions.cpp
+	src/NetworkFunctions.h
+	src/OScopeCtrl.cpp
+	src/OScopeCtrl.h
+	src/OtherFunctions.cpp
+	src/OtherFunctions.h
+	src/OtherStructs.h
+	src/Packet.cpp
+	src/Packet.h
+	src/PartFileConvert.cpp
+	src/PartFileConvert.h
+	src/PartFile.cpp
+	src/PartFile.h
+	src/Preferences.cpp
+	src/Preferences.h
+	src/RC4Encrypt.cpp
+	src/RC4Encrypt.h
+	src/SafeFile.cpp
+	src/SafeFile.h
+	src/SearchDlg.cpp
+	src/SearchDlg.h
+	src/SearchExpr.h
+	src/SearchFile.cpp
+	src/SearchFile.h
+	src/SearchList.cpp
+	src/SearchListCtrl.cpp
+	src/SearchListCtrl.h
+	src/SearchList.h
+	src/ServerConnect.cpp
+	src/ServerConnect.h
+	src/Server.cpp
+	src/Server.h
+	src/ServerList.cpp
+	src/ServerListCtrl.cpp
+	src/ServerListCtrl.h
+	src/ServerList.h
+	src/ServerSocket.cpp
+	src/ServerSocket.h
+	src/ServerUDPSocket.cpp
+	src/ServerUDPSocket.h
+	src/ServerWnd.cpp
+	src/ServerWnd.h
+	src/SHAHashSet.cpp
+	src/SHAHashSet.h
+	src/SharedFileList.cpp
+	src/SharedFileList.h
+	src/SharedFilesCtrl.cpp
+	src/SharedFilesCtrl.h
+	src/SharedFilesWnd.cpp
+	src/SharedFilesWnd.h
+	src/Statistics.cpp
+	src/StatisticsDlg.cpp
+	src/StatisticsDlg.h
+	src/Statistics.h
+	src/Tag.cpp
+	src/Tag.h
+	src/ThreadTasks.cpp
+	src/ThreadTasks.h
+	src/ThrottledSocket.h
+	src/TransferWnd.cpp
+	src/TransferWnd.h
+	src/Types.h
+	src/updownclient.h
+	src/UploadBandwidthThrottler.cpp
+	src/UploadBandwidthThrottler.h
+	src/UploadClient.cpp
+	src/UploadQueue.cpp
+	src/UploadQueue.h
+	src/webserver/src/WebServer.cpp
+	src/webserver/src/WebServer.h
+	src/webserver/src/WebSocket.cpp
+	src/webserver/src/WebSocket.h
+
+Copyright (c) 2002-2008 Michael Buesch
+	src/utils/aLinkCreator/src/md4.cpp
+	src/utils/aLinkCreator/src/md4.h
+
+Copyright (c) 2002-2008 Patrizio Bassi ( hetfield@amule.org )
+	src/HTTPDownload.h
+
+Copyright (c) 2002-2008  Petar Maymounkov ( petar@post.harvard.edu )
+	src/amuleDlg.cpp
+	src/kademlia/routing/Contact.cpp
+	src/kademlia/routing/RoutingBin.cpp
+	src/kademlia/routing/RoutingZone.cpp
+
+Copyright (c) 2002-2008 quekky
+	src/CatDialog.h
+
+Copyright (c) 2002-2008 Robert Rostek ( tecxx@rrs.at )
+	src/DirectoryTreeCtrl.h
+
+Copyright (c) 2002-2008 Timo Kujala ( tiku@users.sourceforge.net )
+	src/GetTickCount.cpp
+	src/GetTickCount.h
+	src/HTTPDownload.cpp
+	src/HTTPDownload.h
+
+Copyright (c) 2003-2008 Alo Sarv ( madcat_@users.sourceforge.net )
+	src/ED2KLinkParser.cpp
+	src/GetTickCount.cpp
+	src/GetTickCount.h
+
+Copyright (c) 2003-2008 aMule Team ( admin@amule.org / http://www.amule.org )
+	acinclude.m4
+	configure.in
+	m4/build-tools.m4
+	m4/cryptopp.m4
+	m4/fallocate.m4
+	m4/gdlib.m4
+	m4/libpng.m4
+	m4/libupnp.m4
+	m4/nls.m4
+	m4/readline.m4
+	m4/zlib.m4
+	po/amule.pot
+	po/ar.po
+	po/bg.po
+	po/ca.po
+	po/cs.po
+	po/da.po
+	po/de.po
+	po/el.po
+	po/en_GB.po
+	po/es.po
+	po/et_EE.po
+	po/eu.po
+	po/fa.po
+	po/fi.po
+	po/fr.po
+	po/gl.po
+	po/he.po
+	po/hr.po
+	po/hu.po
+	po/it_CH.po
+	po/it.po
+	po/ja.po
+	po/ko_KR.po
+	po/lt.po
+	po/nl.po
+	po/nn.po
+	po/pl.po
+	po/pt_BR.po
+	po/pt_PT.po
+	po/ru.po
+	po/sl.po
+	po/sq.po
+	po/sv.po
+	po/tr.po
+	po/zh_CN.po
+	po/zh_TW.po
+	src/AddFriend.cpp
+	src/AddFriend.h
+	src/amule.cpp
+	src/amuled.cpp
+	src/amuleDlg.cpp
+	src/amuleDlg.h
+	src/amule.h
+	src/ArchSpecific.h
+	src/AsyncDNS.cpp
+	src/AsyncDNS.h
+	src/BarShader.cpp
+	src/BarShader.h
+	src/BaseClient.cpp
+	src/CatDialog.cpp
+	src/CatDialog.h
+	src/CFile.cpp
+	src/CFile.h
+	src/ChatSelector.cpp
+	src/ChatSelector.h
+	src/ChatWnd.cpp
+	src/ChatWnd.h
+	src/ClientCredits.cpp
+	src/ClientCredits.h
+	src/ClientCreditsList.cpp
+	src/ClientCreditsList.h
+	src/ClientDetailDialog.cpp
+	src/ClientDetailDialog.h
+	src/ClientList.cpp
+	src/ClientListCtrl.cpp
+	src/ClientListCtrl.h
+	src/ClientList.h
+	src/ClientTCPSocket.cpp
+	src/ClientTCPSocket.h
+	src/ClientUDPSocket.cpp
+	src/ClientUDPSocket.h
+	src/ColorFrameCtrl.cpp
+	src/ColorFrameCtrl.h
+	src/CommentDialog.cpp
+	src/CommentDialog.h
+	src/CommentDialogLst.cpp
+	src/CommentDialogLst.h
+	src/DataToText.cpp
+	src/DataToText.h
+	src/DirectoryTreeCtrl.cpp
+	src/DirectoryTreeCtrl.h
+	src/DownloadClient.cpp
+	src/DownloadListCtrl.cpp
+	src/DownloadListCtrl.h
+	src/DownloadQueue.cpp
+	src/DownloadQueue.h
+	src/ECSpecialCoreTags.cpp
+	src/ECSpecialMuleTags.cpp
+	src/ED2KLink.cpp
+	src/ED2KLink.h
+	src/ED2KLinkParser.cpp
+	src/EditServerListDlg.cpp
+	src/EditServerListDlg.h
+	src/EMSocket.cpp
+	src/EMSocket.h
+	src/EncryptedDatagramSocket.cpp
+	src/EncryptedDatagramSocket.h
+	src/EncryptedStreamSocket.cpp
+	src/EncryptedStreamSocket.h
+	src/ExternalConn.cpp
+	src/ExternalConn.h
+	src/FileDetailDialog.cpp
+	src/FileDetailDialog.h
+	src/FileDetailListCtrl.cpp
+	src/FileDetailListCtrl.h
+	src/Friend.cpp
+	src/Friend.h
+	src/FriendList.cpp
+	src/FriendListCtrl.cpp
+	src/FriendListCtrl.h
+	src/FriendList.h
+	src/GetTickCount.cpp
+	src/GetTickCount.h
+	src/HTTPDownload.cpp
+	src/HTTPDownload.h
+	src/include/common/ClientVersion.h
+	src/include/common/Constants.h
+	src/include/common/DataFileVersion.h
+	src/include/common/EventIDs.h
+	src/include/common/Macros.h
+	src/include/common/MenuIDs.h
+	src/include/protocol/ed2k/Client2Client/TCP.h
+	src/include/protocol/ed2k/Client2Client/UDP.h
+	src/include/protocol/ed2k/Client2Server/TCP.h
+	src/include/protocol/ed2k/Client2Server/UDP.h
+	src/include/protocol/ed2k/ClientSoftware.h
+	src/include/protocol/ed2k/Constants.h
+	src/include/protocol/kad2/Client2Client/TCP.h
+	src/include/protocol/kad2/Client2Client/UDP.h
+	src/include/protocol/kad2/Constants.h
+	src/include/protocol/kad/Client2Client/UDP.h
+	src/include/protocol/kad/Constants.h
+	src/include/protocol/Protocols.h
+	src/include/tags/ClientTags.h
+	src/include/tags/FileTags.h
+	src/include/tags/ServerTags.h
+	src/include/tags/TagTypes.h
+	src/inetdownload.h
+	src/InternalEvents.h
+	src/IPFilter.cpp
+	src/IPFilter.h
+	src/KadDlg.cpp
+	src/KadDlg.h
+	src/kademlia/net/KademliaUDPListener.cpp
+	src/kademlia/routing/Contact.cpp
+	src/kademlia/routing/RoutingBin.cpp
+	src/kademlia/routing/RoutingZone.cpp
+	src/KnownFile.cpp
+	src/KnownFile.h
+	src/KnownFileList.cpp
+	src/KnownFileList.h
+	src/libs/common/FileFunctions.cpp
+	src/libs/common/FileFunctions.h
+	src/libs/common/MD5Sum.cpp
+	src/libs/common/MD5Sum.h
+	src/libs/common/StringFunctions.cpp
+	src/libs/common/StringFunctions.h
+	src/libs/ec/c#/amuleRemote.cs
+	src/libs/ec/c#/ecProto.cs
+	src/libs/ec/cpp/ECSpecialTags.cpp
+	src/libs/ec/cpp/gen_ECVersion
+	src/libs/ec/file_generator.pl
+	src/ListenSocket.cpp
+	src/ListenSocket.h
+	src/MagnetURI.cpp
+	src/MagnetURI.h
+	src/MD4Hash.h
+	src/MemFile.cpp
+	src/MemFile.h
+	src/MuleColour.cpp
+	src/MuleColour.h
+	src/MuleListCtrl.cpp
+	src/MuleListCtrl.h
+	src/MuleTrayIcon.cpp
+	src/MuleTrayIcon.h
+	src/NetworkFunctions.cpp
+	src/NetworkFunctions.h
+	src/OScopeCtrl.cpp
+	src/OScopeCtrl.h
+	src/OtherFunctions.cpp
+	src/OtherFunctions.h
+	src/OtherStructs.h
+	src/Packet.cpp
+	src/Packet.h
+	src/PartFileConvert.cpp
+	src/PartFileConvert.h
+	src/PartFile.cpp
+	src/PartFile.h
+	src/Preferences.cpp
+	src/Preferences.h
+	src/RandomFunctions.cpp
+	src/RandomFunctions.h
+	src/RC4Encrypt.cpp
+	src/RC4Encrypt.h
+	src/remote-gui.net/amuleData.cs
+	src/remote-gui.net/amuleRemote.cs
+	src/remote-gui.net/DownloadControl.cs
+	src/remote-gui.net/ecProto.cs
+	src/remote-gui.net/MainWindow.cs
+	src/remote-gui.net/Program.cs
+	src/RLE.cpp
+	src/RLE.h
+	src/SafeFile.cpp
+	src/SafeFile.h
+	src/SearchDlg.cpp
+	src/SearchDlg.h
+	src/SearchExpr.h
+	src/SearchFile.cpp
+	src/SearchFile.h
+	src/SearchList.cpp
+	src/SearchListCtrl.cpp
+	src/SearchListCtrl.h
+	src/SearchList.h
+	src/ServerConnect.cpp
+	src/ServerConnect.h
+	src/Server.cpp
+	src/Server.h
+	src/ServerList.cpp
+	src/ServerListCtrl.cpp
+	src/ServerListCtrl.h
+	src/ServerList.h
+	src/ServerSocket.cpp
+	src/ServerSocket.h
+	src/ServerUDPSocket.cpp
+	src/ServerUDPSocket.h
+	src/ServerWnd.cpp
+	src/ServerWnd.h
+	src/SHA.cpp
+	src/SHAHashSet.cpp
+	src/SHAHashSet.h
+	src/SHA.h
+	src/SharedFilesWnd.cpp
+	src/SharedFileList.cpp
+	src/SharedFileList.h
+	src/SharedFilesCtrl.cpp
+	src/SharedFilesCtrl.h
+	src/SharedFilesWnd.h
+	src/Statistics.cpp
+	src/StatisticsDlg.cpp
+	src/StatisticsDlg.h
+	src/Statistics.h
+	src/StatTree.cpp
+	src/StatTree.h
+	src/Tag.cpp
+	src/Tag.h
+	src/TextClient.cpp
+	src/TextClient.h
+	src/ThreadTasks.cpp
+	src/ThreadTasks.h
+	src/Timer.cpp
+	src/Timer.h
+	src/TransferWnd.cpp
+	src/TransferWnd.h
+	src/Types.h
+	src/updownclient.h
+	src/UploadClient.cpp
+	src/UploadQueue.cpp
+	src/UploadQueue.h
+	src/utils/mkFileSum.c
+	src/utils/scripts/denoiser.rules
+	src/utils/scripts/id2ip
+	src/utils/scripts/kadnodescreate.pl
+	src/utils/scripts/linkcvs
+	src/utils/scripts/logfilter
+	src/utils/scripts/mac_packager
+	src/utils/scripts/mldonkey_importer.pl
+	src/utils/scripts/sanity
+	src/utils/scripts/version_bumper
+	src/utils/scripts/wikify_latest_changelog
+	src/utils/xas/autostart-xas.in
+	src/webserver/src/php_amule_lib.cpp
+	src/webserver/src/php_amule_lib_standalone.cpp
+	src/webserver/src/php_core_lib.cpp
+	src/webserver/src/php_core_lib.h
+	src/webserver/src/php_lexer.c
+	src/webserver/src/php_lexer.l
+	src/webserver/src/php_parser.c
+	src/webserver/src/php_parser.y
+	src/webserver/src/php_syntree.cpp
+	src/webserver/src/php_syntree.h
+	src/webserver/src/UPnPCompatibility.cpp
+	src/webserver/src/WebInterface.cpp
+	src/webserver/src/WebInterface.h
+	src/webserver/src/WebServer.cpp
+	src/webserver/src/WebServer.h
+	src/webserver/src/WebSocket.cpp
+	src/webserver/src/WebSocket.h
+
+Copyright (c) 2003-2008 Angel Vidal ( kry@amule.org )
+	src/ECSpecialCoreTags.cpp
+	src/ECSpecialMuleTags.cpp
+	src/ExternalConn.cpp
+	src/ExternalConn.h
+	src/libs/ec/cpp/ECSpecialTags.cpp
+	src/TextClient.cpp
+	src/TextClient.h
+	src/webserver/src/WebInterface.cpp
+	src/webserver/src/WebServer.cpp
+	src/webserver/src/WebServer.h
+
+Copyright (c) 2003-2008 Barry Dunne (http://www.emule-project.net)
+	src/kademlia/kademlia/Defines.h
+	src/kademlia/kademlia/Entry.cpp
+	src/kademlia/kademlia/Entry.h
+	src/kademlia/kademlia/Error.h
+	src/kademlia/kademlia/Indexed.cpp
+	src/kademlia/kademlia/Indexed.h
+	src/kademlia/kademlia/Kademlia.cpp
+	src/kademlia/kademlia/Kademlia.h
+	src/kademlia/kademlia/Prefs.cpp
+	src/kademlia/kademlia/Prefs.h
+	src/kademlia/kademlia/Search.cpp
+	src/kademlia/kademlia/Search.h
+	src/kademlia/kademlia/SearchManager.cpp
+	src/kademlia/kademlia/SearchManager.h
+	src/kademlia/net/KademliaUDPListener.cpp
+	src/kademlia/net/KademliaUDPListener.h
+	src/kademlia/routing/Contact.cpp
+	src/kademlia/routing/Contact.h
+	src/kademlia/routing/Maps.h
+	src/kademlia/routing/RoutingBin.cpp
+	src/kademlia/routing/RoutingBin.h
+	src/kademlia/routing/RoutingZone.cpp
+	src/kademlia/routing/RoutingZone.h
+	src/kademlia/utils/UInt128.cpp
+	src/kademlia/utils/UInt128.h
+
+Copyright (c) 2003-2008 Froenchenko Leonid ( lfroen@gmail.com / http://www.amule.org )
+	src/libs/ec/c#/amuleRemote.cs
+	src/libs/ec/c#/ecProto.cs
+	src/remote-gui.net/amuleData.cs
+	src/remote-gui.net/amuleRemote.cs
+	src/remote-gui.net/DownloadControl.cs
+	src/remote-gui.net/ecProto.cs
+	src/remote-gui.net/MainWindow.cs
+	src/remote-gui.net/Program.cs
+
+Copyright (c) 2003-2008 Robert Rostek ( tecxx@rrs.at )
+	src/DirectoryTreeCtrl.cpp 
+
+Copyright (c) 2004-2008 Alo Sarv ( madcat_@users.sourceforge.net )
+	src/utils/aLinkCreator/src/md4.cpp
+	src/utils/aLinkCreator/src/md4.h
+
+Copyright (c) 2004-2008 aMule Team ( admin@amule.org / http://www.amule.org )
+	src/amule-gui.cpp
+	src/amuleIPV4Address.h
+	src/CryptoPP_Inc.h
+	src/ExternalConnector.cpp
+	src/ExternalConnector.h
+	src/GuiEvents.h
+	src/kademlia/kademlia/Defines.h
+	src/kademlia/kademlia/Entry.cpp
+	src/kademlia/kademlia/Entry.h
+	src/kademlia/kademlia/Error.h
+	src/kademlia/kademlia/Indexed.cpp
+	src/kademlia/kademlia/Indexed.h
+	src/kademlia/kademlia/Kademlia.cpp
+	src/kademlia/kademlia/Kademlia.h
+	src/kademlia/kademlia/Prefs.cpp
+	src/kademlia/kademlia/Prefs.h
+	src/kademlia/kademlia/Search.cpp
+	src/kademlia/kademlia/Search.h
+	src/kademlia/kademlia/SearchManager.cpp
+	src/kademlia/kademlia/SearchManager.h
+	src/kademlia/net/KademliaUDPListener.h
+	src/kademlia/routing/Contact.h
+	src/kademlia/routing/Maps.h
+	src/kademlia/routing/RoutingBin.h
+	src/kademlia/routing/RoutingZone.h
+	src/kademlia/utils/UInt128.cpp
+	src/kademlia/utils/UInt128.h
+	src/libs/ec/abstracts/License.abstract
+	src/libs/ec/c#/ECCodes.cs
+	src/libs/ec/c#/ECTagTypes.cs
+	src/libs/ec/cpp/ECCodes.h
+	src/libs/ec/cpp/ECFileConfig.h
+	src/libs/ec/cpp/ECMuleSocket.cpp
+	src/libs/ec/cpp/ECMuleSocket.h
+	src/libs/ec/cpp/ECPacket.cpp
+	src/libs/ec/cpp/ECPacket.h
+	src/libs/ec/cpp/ECSocket.cpp
+	src/libs/ec/cpp/ECSocket.h
+	src/libs/ec/cpp/ECSpecialTags.h
+	src/libs/ec/cpp/ECTag.cpp
+	src/libs/ec/cpp/ECTag.h
+	src/libs/ec/cpp/ECTagTypes.h
+	src/libs/ec/cpp/RemoteConnect.cpp
+	src/libs/ec/cpp/RemoteConnect.h
+	src/libs/ec/java/ECCodes.java
+	src/libs/ec/java/ECTagTypes.java
+	src/MuleGifCtrl.cpp
+	src/MuleGifCtrl.h
+	src/MuleNotebook.cpp
+	src/MuleNotebook.h
+	src/MuleTextCtrl.cpp
+	src/MuleTextCtrl.h
+	src/PrefsUnifiedDlg.cpp
+	src/PrefsUnifiedDlg.h
+	src/Proxy.cpp
+	src/Proxy.h
+	src/RangeMap.h
+	src/remote-gui.net/ECCodes.cs
+	src/remote-gui.net/ECTagTypes.cs
+	src/utils/fileview/KadFiles.cpp
+	src/utils/fileview/KadFiles.h
+	src/utils/fileview/Print.h
+
+Copyright (c) 2004-2008 Angel Vidal ( kry@amule.org )
+	src/AsyncDNS.cpp
+	src/AsyncDNS.h
+	src/GuiEvents.h
+	src/KadDlg.cpp
+	src/KadDlg.h
+	src/kademlia/kademlia/Defines.h
+	src/kademlia/kademlia/Entry.h
+	src/kademlia/kademlia/Error.h
+	src/kademlia/kademlia/Indexed.cpp
+	src/kademlia/kademlia/Indexed.h
+	src/kademlia/kademlia/Kademlia.cpp
+	src/kademlia/kademlia/Kademlia.h
+	src/kademlia/kademlia/Prefs.cpp
+	src/kademlia/kademlia/Prefs.h
+	src/kademlia/kademlia/Search.cpp
+	src/kademlia/kademlia/Search.h
+	src/kademlia/kademlia/SearchManager.cpp
+	src/kademlia/kademlia/SearchManager.h
+	src/kademlia/net/KademliaUDPListener.cpp
+	src/kademlia/net/KademliaUDPListener.h
+	src/kademlia/routing/Contact.cpp
+	src/kademlia/routing/Contact.h
+	src/kademlia/routing/Maps.h
+	src/kademlia/routing/RoutingBin.cpp
+	src/kademlia/routing/RoutingBin.h
+	src/kademlia/routing/RoutingZone.cpp
+	src/kademlia/routing/RoutingZone.h
+	src/kademlia/utils/UInt128.cpp
+	src/kademlia/utils/UInt128.h
+	src/libs/common/StringFunctions.cpp
+	src/libs/common/StringFunctions.h
+	src/libs/ec/cpp/ECMuleSocket.cpp
+	src/libs/ec/cpp/ECMuleSocket.h
+	src/libs/ec/cpp/ECSocket.cpp
+	src/libs/ec/cpp/ECSocket.h
+	src/libs/ec/cpp/RemoteConnect.cpp
+	src/libs/ec/cpp/RemoteConnect.h
+	src/libs/ec/file_generator.pl
+	src/MuleNotebook.cpp
+	src/MuleNotebook.h
+	src/MuleTrayIcon.cpp
+	src/MuleTrayIcon.h
+	src/NetworkFunctions.cpp
+	src/NetworkFunctions.h
+	src/SHA.cpp
+	src/SHAHashSet.cpp
+	src/SHAHashSet.h
+	src/SHA.h
+	src/utils/scripts/kadnodescreate.pl
+	src/utils/scripts/mac_packager
+	src/utils/scripts/mldonkey_importer.pl
+	src/utils/scripts/version_bumper
+	src/utils/scripts/wikify_latest_changelog
+	src/webserver/src/WebInterface.h
+
+Copyright (c) 2004-2008 Barthelemy Dagenais ( barthelemy@prologique.com )
+	unittests/muleunit/main.cpp
+	unittests/muleunit/testcase.cpp
+	unittests/muleunit/testcase.h
+	unittests/muleunit/test.cpp
+	unittests/muleunit/test.h
+	unittests/muleunit/testregistry.cpp
+	unittests/muleunit/testregistry.h
+
+Copyright (c) 2004-2008 Carlo Wood ( carlo@alinoe.com )
+	src/amuleIPV4Address.h
+
+Copyright (c) 2004-2008 Froenchenko Leonid ( lfroen@gmail.com / http://www.amule.org )
+	src/GuiEvents.h
+
+Copyright (c) 2004-2008 Jacobo Vilella (Jacobo221)
+	src/utils/scripts/id2ip
+	src/utils/scripts/linkcvs
+
+Copyright (c) 2004-2008 Marcelo Roberto Jimenez ( phoenix@amule.org )
+	amule_build_install.sh
+	src/IP2Country.cpp
+	src/IP2Country.h
+	src/Proxy.cpp
+	src/Proxy.h
+	src/StateMachine.cpp
+	src/StateMachine.h
+	src/TerminationProcessAmuleweb.cpp
+	src/TerminationProcessAmuleweb.h
+	src/TerminationProcess.cpp
+	src/TerminationProcess.h
+	src/UPnPBase.cpp
+	src/UPnPBase.h
+	src/UPnPCompatibility.cpp
+	src/UPnPCompatibility.h
+	src/utils/aLinkCreator/src/alcframe.cpp
+	src/utils/aLinkCreator/src/alcframe.h
+	src/utils/aLinkCreator/src/ed2khash.cpp
+	src/utils/aLinkCreator/src/ed2khash.h
+	src/utils/aLinkCreator/src/md4.cpp
+	src/utils/aLinkCreator/src/md4.h
+	src/webserver/src/UPnPCompatibility.cpp
+
+Copyright (c) 2004-2008 Matt Britt ( uberpenguin@hotpop.com )
+	src/utils/amps/README
+
+Copyright (c) 2004-2008 Mikkel Schubert ( xaignar@users.sourceforge.net )
+	src/RangeMap.h
+
+Copyright (c) 2003-2008 Patrizio Bassi ( hetfield@amule.org )
+	src/MuleTrayIcon.cpp
+
+Copyright (c) 2004-2008 Pedro de Oliveira ( falso@rdk.homeip-net )
+	src/utils/cas/cas.c
+	src/utils/cas/configfile.c
+	src/utils/cas/configfile.h
+	src/utils/cas/functions.c
+	src/utils/cas/functions.h
+	src/utils/cas/graphics.c
+	src/utils/cas/graphics.h
+	src/utils/cas/html.c
+	src/utils/cas/html.h
+	src/utils/cas/version.h
+
+Copyright (c) 2004-2008 shakraw ( shakraw@users.sourceforge.net )
+	src/webserver/src/WebInterface.cpp
+	src/webserver/src/WebInterface.h
+	src/webserver/src/WebSocket.cpp
+	src/webserver/src/WebSocket.h
+
+Copyright (c) 2004-2008 ThePolish ( thepolish@vipmail.ru )
+	src/utils/aLinkCreator/src/alcc.cpp
+	src/utils/aLinkCreator/src/alcc.h
+	src/utils/aLinkCreator/src/alc.cpp
+	src/utils/aLinkCreator/src/alcframe.cpp
+	src/utils/aLinkCreator/src/alcframe.cpp
+	src/utils/aLinkCreator/src/alcframe.h
+	src/utils/aLinkCreator/src/alc.h
+	src/utils/aLinkCreator/src/alcpix.cpp
+	src/utils/aLinkCreator/src/alcpix.h
+	src/utils/aLinkCreator/src/ed2khash.cpp
+	src/utils/aLinkCreator/src/ed2khash.h
+	src/utils/aLinkCreator/src/md4.cpp
+	src/utils/aLinkCreator/src/md4.h
+	src/utils/wxCas/src/linuxmon.cpp
+	src/utils/wxCas/src/linuxmon.h
+	src/utils/wxCas/src/onlinesig.cpp
+	src/utils/wxCas/src/onlinesig.h
+	src/utils/wxCas/src/wxcas.cpp
+	src/utils/wxCas/src/wxcascte.cpp
+	src/utils/wxCas/src/wxcascte.h
+	src/utils/wxCas/src/wxcasframe.cpp
+	src/utils/wxCas/src/wxcasframe.cpp
+	src/utils/wxCas/src/wxcasframe.h
+	src/utils/wxCas/src/wxcas.h
+	src/utils/wxCas/src/wxcaspix.cpp
+	src/utils/wxCas/src/wxcaspix.h
+	src/utils/wxCas/src/wxcasprefs.cpp
+	src/utils/wxCas/src/wxcasprefs.h
+	src/utils/wxCas/src/wxcasprint.cpp
+	src/utils/wxCas/src/wxcasprint.h
+
+Copyright (c) 2004-2008 Scott James Remnant ( scott@netsplit.com ).
+	m4/pkg.m4
+
+Copyright (c) 2004-2008 xmb ( http://xmb.ath.cx )
+	src/utils/scripts/id2ip
+
+Copyright (c) 2005-2008 aMule Team ( admin@amule.org / http://www.amule.org )
+	src/amule-remote-gui.cpp
+	src/amule-remote-gui.h
+	src/DeadSourceList.cpp
+	src/DeadSourceList.h
+	src/libs/common/Format.cpp
+	src/libs/common/Format.h
+	src/libs/common/MuleDebug.cpp
+	src/libs/common/MuleDebug.h
+	src/Logger.cpp
+	src/Logger.h
+	src/MuleUDPSocket.cpp
+	src/MuleUDPSocket.h
+	src/Observable.h
+	src/ObservableQueue.h
+	src/StateMachine.cpp
+	src/StateMachine.h
+	src/ThrottledSocket.h
+	src/UploadBandwidthThrottler.cpp
+	src/UploadBandwidthThrottler.h
+	unittests/muleunit/main.cpp
+	unittests/muleunit/testcase.cpp
+	unittests/muleunit/testcase.h
+	unittests/muleunit/test.cpp
+	unittests/muleunit/test.h
+	unittests/muleunit/testregistry.cpp
+	unittests/muleunit/testregistry.h
+
+Copyright (c) 2005-2008 Dévai Tamás ( gonosztopi@amule.org )
+	src/Statistics.cpp
+	src/Statistics.h
+	src/StatTree.h
+	src/StatTree.cpp
+
+Copyright (c) 2005-2008 Froenchenko Leonid ( lfroen@gmail.com / http://www.amule.org )
+	src/webserver/src/php_amule_lib.cpp )
+	src/webserver/src/php_amule_lib_standalone.cpp
+	src/webserver/src/php_core_lib.cpp
+	src/webserver/src/php_core_lib.h
+	src/webserver/src/php_lexer.c
+	src/webserver/src/php_lexer.l
+	src/webserver/src/php_parser.c
+	src/webserver/src/php_parser.y
+	src/webserver/src/php_syntree.cpp
+	src/webserver/src/php_syntree.h
+
+Copyright (c) 2005-2008 Marcelo Roberto Jimenez ( phoenix@amule.org )
+	src/OtherFunctions.cpp
+
+Copyright (c) 2005-2008 Mikkel Schubert ( xaignar@users.sourceforge.net )
+	src/libs/common/MuleDebug.cpp
+	src/libs/common/MuleDebug.h
+	src/Observable.h
+	src/ObservableQueue.h
+
+Copyright (c) 2006-2008 aMule Team ( admin@amule.org / http://www.amule.org )
+	src/Constants.h
+	src/FileLock.h
+	src/IP2Country.cpp
+	src/IP2Country.h
+	src/libs/common/TextFile.cpp
+	src/libs/common/TextFile.h
+	src/ScopedPtr.h
+	src/TerminationProcess.cpp
+	src/TerminationProcess.h
+	src/ThreadScheduler.h
+	src/UPnPBase.cpp
+	src/UPnPBase.h
+	src/UPnPCompatibility.cpp
+	src/UPnPCompatibility.h
+	src/UserEvents.cpp
+	src/UserEvents.h
+
+Copyright (c) 2006-2008 Dévai Tamás ( gonosztopi@amule.org )
+	src/utils/scripts/denoiser.rules
+
+Copyright (c) 2006-2008 Mikkel Schubert ( xaignar@users.sourceforge.net )
+	src/FileLock.h
+	src/ScopedPtr.h
+	src/ThreadScheduler.cpp
+	src/ThreadScheduler.h
+	src/ThreadTasks.cpp
+	src/ThreadTasks.h
+
+Copyright (c) 2006-2008 Werner Mahr (Vollstrecker) ( amule@vollstreckernet.de )
+	src/utils/xas/autostart-xas.in
+	debian/*
+	README.Debian-Packages
+
+Copyright (c) 2007-2008 aMule Team ( admin@amule.org / http://www.amule.org )
+	src/remote-gui.net/AboutBox.Designer.cs
+
+Copyright (c) 2007-2008 Dévai Tamás ( gonosztopi@amule.org )
+	src/MagnetURI.cpp
+	src/MagnetURI.h
+
+Copyright (c) 2007-2008 Johannes Krampf ( wuischke@amule.org )
+	src/MuleCollection.cpp
+	src/MuleCollection.h
+
+Copyright (c) 2008 aMule Team ( admin@amule.org / http://www.amule.org )
+	src/kademlia/kademlia/UDPFirewallTester.cpp
+	src/kademlia/kademlia/UDPFirewallTester.h
+	src/kademlia/net/PacketTracking.cpp
+	src/kademlia/net/PacketTracking.h
+	src/kademlia/utils/KadClientSearcher.h
+	src/kademlia/utils/KadUDPKey.h
+	src/libs/common/Path.cpp
+	src/libs/common/Path.h
+	src/MuleThread.h
+	src/PlatformSpecific.cpp
+	src/PlatformSpecific.h
+	src/TerminationProcessAmuleweb.cpp
+	src/TerminationProcessAmuleweb.h
+	src/utils/fileview/FileView.cpp
+	src/utils/fileview/Print.cpp
+	unittests/tests/CUInt128Test.cpp
+
+Copyright (c) 2008 Dévai Tamás ( gonosztopi@amule.org )
+	src/kademlia/kademlia/Entry.cpp
+	src/kademlia/kademlia/UDPFirewallTester.cpp
+	src/kademlia/kademlia/UDPFirewallTester.h
+	src/kademlia/net/PacketTracking.cpp
+	src/kademlia/net/PacketTracking.h
+	src/kademlia/utils/KadClientSearcher.h
+	src/kademlia/utils/KadUDPKey.h
+	src/kademlia/utils/UInt128.cpp
+	src/kademlia/utils/UInt128.h
+	src/utils/fileview/FileView.cpp
+	src/utils/fileview/KadFiles.cpp
+	src/utils/fileview/KadFiles.h
+	src/utils/fileview/Print.cpp
+	src/utils/fileview/Print.h
+	unittests/tests/CUInt128Test.cpp
+
+Copyright (c) created by Ornis
+	src/CatDialog.cpp
+
+Copyright (c) Venkatesha Murthy G.
+	src/RandomFunctions.cpp
+	src/OtherFunctions.cpp
+
+No Information aviable for
+ 	aMule.app/Contents/Frameworks/libixml.2.dylib
+ 	aMule.app/Contents/Frameworks/libthreadutil.2.dylib
+ 	aMule.app/Contents/Frameworks/libupnp.3.dylib
+ 	aMule.app/Contents/Info.plist
+ 	aMule.app/Contents/MacOS/ed2kHelperScript.app/Contents/Info.plist
+ 	aMule.app/Contents/MacOS/ed2kHelperScript.app/Contents/MacOS/applet
+ 	aMule.app/Contents/MacOS/ed2kHelperScript.app/Contents/PkgInfo
+ 	aMule.app/Contents/MacOS/ed2kHelperScript.app/Contents/Resources/applet.rsrc
+ 	aMule.app/Contents/PkgInfo
+ 	aMule.app/Contents/Resources/amule.icns
+ 	aMule.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib
+ 	aMule.app/Contents/Resources/English.lproj/MainMenu.nib/info.nib
+ 	aMule.app/Contents/Resources/English.lproj/MainMenu.nib/objects.nib
+ 	aMule.app/Icon
+ 	aMule-CVS.spec
+ 	amule.desktop
+ 	amulegui.desktop
+ 	amulegui.xpm
+ 	amule.ico
+ 	amule.png
+ 	amule.rc
+ 	aMule.spec
+ 	amule.xpm
+ 	autogen.sh
+ 	automake/dist-hook.am
+ 	automake/manpages.am
+ 	Compilation.flags.in
+ 	convert.ico
+ 	docs/ABOUT-NLS
+ 	docs/amulesig.txt
+ 	docs/amule-win32.HOWTO.txt
+ 	docs/AUTHORS
+ 	docs/Changelog
+ 	docs/Doxyfile
+ 	docs/EC_Protocol.txt
+ 	docs/ED2K-Links.HOWTO
+ 	docs/INSTALL
+ 	docs/Makefile.am
+ 	docs/man/amule.1
+ 	docs/man/amulecmd.1
+ 	docs/man/amulecmd.de.1
+ 	docs/man/amulecmd.es.1
+ 	docs/man/amulecmd.eu.1
+ 	docs/man/amulecmd.fr.1
+ 	docs/man/amulecmd.hu.1
+ 	docs/man/amuled.1
+ 	docs/man/amuled.de.1
+ 	docs/man/amule.de.1
+ 	docs/man/amuled.es.1
+ 	docs/man/amuled.eu.1
+ 	docs/man/amuled.fr.1
+ 	docs/man/amuled.hu.1
+ 	docs/man/amule.es.1
+ 	docs/man/amule.eu.1
+ 	docs/man/amule.fr.1
+ 	docs/man/amulegui.1
+ 	docs/man/amulegui.de.1
+ 	docs/man/amule.hu.1
+ 	docs/man/amuleweb.1
+ 	docs/man/amuleweb.de.1
+ 	docs/man/amuleweb.es.1
+ 	docs/man/amuleweb.eu.1
+ 	docs/man/amuleweb.fr.1
+ 	docs/man/amuleweb.hu.1
+ 	docs/man/ed2k.1
+ 	docs/man/ed2k.de.1
+ 	docs/man/ed2k.es.1
+ 	docs/man/ed2k.eu.1
+ 	docs/man/ed2k.fr.1
+ 	docs/man/ed2k.hu.1
+ 	docs/man/Makefile.am
+ 	docs/man/manpages-de.po
+ 	docs/man/manpages.pot
+ 	docs/README
+ 	docs/README.Mac.txt
+ 	docs/README.Windows.txt
+ 	docs/Releases.dia
+ 	docs/socks4.protocol
+ 	docs/TODO
+ 	m4/fallocate.m4
+ 	m4/wxwin.m4
+ 	Makefile.am
+ 	MSVC Solution/aMule-MSVC.sln
+ 	MSVC Solution/README - MSVC.txt
+ 	po/boldquot.sed
+ 	po/en@boldquot.header
+ 	po/en@quot.header
+ 	po/insert-header.sin
+ 	po/l10n.xsl
+ 	po/LINGUAS
+ 	po/Makevars
+ 	po/POTFILES.in
+ 	po/quot.sed
+ 	po/remove-potcdate.sin
+ 	po/Rules-quot
+ 	src/amuled.cpp
+ 	src/amule-gui.cpp
+ 	src/amule-remote-gui.cpp
+ 	src/aMule.xpm
+ 	src/DataToText.cpp
+ 	src/DirectoryTreeCtrl.cpp 
+ 	src/ExternalConnector.cpp
+ 	src/extern/wxWidgets/listctrl.cpp
+ 	src/libs/common/Format.cpp
+ 	src/libs/common/Makefile.am
+ 	src/libs/common/MD5Sum.cpp
+ 	src/libs/common/Path.cpp
+ 	src/libs/common/TextFile.cpp
+ 	src/libs/ec/abstracts/ECCodes.abstract
+ 	src/libs/ec/abstracts/ECTagTypes.abstract
+ 	src/libs/ec/cpp/ECCodes.h
+ 	src/libs/ec/cpp/ECFileConfig.h
+ 	src/libs/ec/cpp/ECPacket.cpp
+ 	src/libs/ec/cpp/ECPacket.h
+ 	src/libs/ec/cpp/ECSpecialTags.h
+ 	src/libs/ec/cpp/ECTag.cpp
+ 	src/libs/ec/cpp/ECTag.h
+ 	src/libs/ec/cpp/ECTagTypes.h
+ 	src/libs/ec/cpp/gen_ECVersion
+ 	src/libs/ec/Makefile.am
+ 	src/libs/Makefile.am
+ 	src/Logger.cpp
+ 	src/Makefile.am
+ 	src/MuleCollection.cpp
+ 	src/MuleColour.cpp
+ 	src/MuleGifCtrl.cpp
+ 	src/MuleTextCtrl.cpp
+ 	src/MuleUDPSocket.cpp
+ 	src/muuli.wdr
+ 	src/muuli_wdr.h
+ 	src/Parser.cpp
+ 	src/Parser.y
+ 	src/pixmaps/chat.ico.xpm
+ 	src/pixmaps/flags_xpm/ad.xpm
+ 	src/pixmaps/flags_xpm/ae.xpm
+ 	src/pixmaps/flags_xpm/af.xpm
+ 	src/pixmaps/flags_xpm/ag.xpm
+ 	src/pixmaps/flags_xpm/ai.xpm
+ 	src/pixmaps/flags_xpm/al.xpm
+ 	src/pixmaps/flags_xpm/am.xpm
+ 	src/pixmaps/flags_xpm/an.xpm
+ 	src/pixmaps/flags_xpm/ao.xpm
+ 	src/pixmaps/flags_xpm/ar.xpm
+ 	src/pixmaps/flags_xpm/as.xpm
+ 	src/pixmaps/flags_xpm/at.xpm
+ 	src/pixmaps/flags_xpm/au.xpm
+ 	src/pixmaps/flags_xpm/aw.xpm
+ 	src/pixmaps/flags_xpm/ax.xpm
+ 	src/pixmaps/flags_xpm/az.xpm
+ 	src/pixmaps/flags_xpm/ba.xpm
+ 	src/pixmaps/flags_xpm/bb.xpm
+ 	src/pixmaps/flags_xpm/bd.xpm
+ 	src/pixmaps/flags_xpm/be.xpm
+ 	src/pixmaps/flags_xpm/bf.xpm
+ 	src/pixmaps/flags_xpm/bg.xpm
+ 	src/pixmaps/flags_xpm/bh.xpm
+ 	src/pixmaps/flags_xpm/bi.xpm
+ 	src/pixmaps/flags_xpm/bj.xpm
+ 	src/pixmaps/flags_xpm/bm.xpm
+ 	src/pixmaps/flags_xpm/bn.xpm
+ 	src/pixmaps/flags_xpm/bo.xpm
+ 	src/pixmaps/flags_xpm/br.xpm
+ 	src/pixmaps/flags_xpm/bs.xpm
+ 	src/pixmaps/flags_xpm/bt.xpm
+ 	src/pixmaps/flags_xpm/bv.xpm
+ 	src/pixmaps/flags_xpm/bw.xpm
+ 	src/pixmaps/flags_xpm/by.xpm
+ 	src/pixmaps/flags_xpm/bz.xpm
+ 	src/pixmaps/flags_xpm/cc.xpm
+ 	src/pixmaps/flags_xpm/cd.xpm
+ 	src/pixmaps/flags_xpm/cf.xpm
+ 	src/pixmaps/flags_xpm/cg.xpm
+ 	src/pixmaps/flags_xpm/ch.xpm
+ 	src/pixmaps/flags_xpm/ci.xpm
+ 	src/pixmaps/flags_xpm/ck.xpm
+ 	src/pixmaps/flags_xpm/cl.xpm
+ 	src/pixmaps/flags_xpm/cm.xpm
+ 	src/pixmaps/flags_xpm/cn.xpm
+ 	src/pixmaps/flags_xpm/co.xpm
+ 	src/pixmaps/flags_xpm/cr.xpm
+ 	src/pixmaps/flags_xpm/cs.xpm
+ 	src/pixmaps/flags_xpm/cu.xpm
+ 	src/pixmaps/flags_xpm/cv.xpm
+ 	src/pixmaps/flags_xpm/cx.xpm
+ 	src/pixmaps/flags_xpm/cy.xpm
+ 	src/pixmaps/flags_xpm/cz.xpm
+ 	src/pixmaps/flags_xpm/de.xpm
+ 	src/pixmaps/flags_xpm/dj.xpm
+ 	src/pixmaps/flags_xpm/dk.xpm
+ 	src/pixmaps/flags_xpm/dm.xpm
+ 	src/pixmaps/flags_xpm/do.xpm
+ 	src/pixmaps/flags_xpm/dz.xpm
+ 	src/pixmaps/flags_xpm/ec.xpm
+ 	src/pixmaps/flags_xpm/ee.xpm
+ 	src/pixmaps/flags_xpm/eg.xpm
+ 	src/pixmaps/flags_xpm/eh.xpm
+ 	src/pixmaps/flags_xpm/england.xpm
+ 	src/pixmaps/flags_xpm/er.xpm
+ 	src/pixmaps/flags_xpm/es.xpm
+ 	src/pixmaps/flags_xpm/et.xpm
+ 	src/pixmaps/flags_xpm/europeanunion.xpm
+ 	src/pixmaps/flags_xpm/fam.xpm
+ 	src/pixmaps/flags_xpm/fi.xpm
+ 	src/pixmaps/flags_xpm/fj.xpm
+ 	src/pixmaps/flags_xpm/fk.xpm
+ 	src/pixmaps/flags_xpm/fm.xpm
+ 	src/pixmaps/flags_xpm/fo.xpm
+ 	src/pixmaps/flags_xpm/fr.xpm
+ 	src/pixmaps/flags_xpm/ga.xpm
+ 	src/pixmaps/flags_xpm/gb.xpm
+ 	src/pixmaps/flags_xpm/gd.xpm
+ 	src/pixmaps/flags_xpm/ge.xpm
+ 	src/pixmaps/flags_xpm/gf.xpm
+ 	src/pixmaps/flags_xpm/gh.xpm
+ 	src/pixmaps/flags_xpm/gi.xpm
+ 	src/pixmaps/flags_xpm/gl.xpm
+ 	src/pixmaps/flags_xpm/gm.xpm
+ 	src/pixmaps/flags_xpm/gn.xpm
+ 	src/pixmaps/flags_xpm/gp.xpm
+ 	src/pixmaps/flags_xpm/gq.xpm
+ 	src/pixmaps/flags_xpm/gr.xpm
+ 	src/pixmaps/flags_xpm/gs.xpm
+ 	src/pixmaps/flags_xpm/gt.xpm
+ 	src/pixmaps/flags_xpm/gu.xpm
+ 	src/pixmaps/flags_xpm/gw.xpm
+ 	src/pixmaps/flags_xpm/gy.xpm
+ 	src/pixmaps/flags_xpm/hk.xpm
+ 	src/pixmaps/flags_xpm/hm.xpm
+ 	src/pixmaps/flags_xpm/hn.xpm
+ 	src/pixmaps/flags_xpm/hr.xpm
+ 	src/pixmaps/flags_xpm/ht.xpm
+ 	src/pixmaps/flags_xpm/hu.xpm
+ 	src/pixmaps/flags_xpm/id.xpm
+ 	src/pixmaps/flags_xpm/ie.xpm
+ 	src/pixmaps/flags_xpm/il.xpm
+ 	src/pixmaps/flags_xpm/in.xpm
+ 	src/pixmaps/flags_xpm/io.xpm
+ 	src/pixmaps/flags_xpm/iq.xpm
+ 	src/pixmaps/flags_xpm/ir.xpm
+ 	src/pixmaps/flags_xpm/is.xpm
+ 	src/pixmaps/flags_xpm/it.xpm
+ 	src/pixmaps/flags_xpm/jm.xpm
+ 	src/pixmaps/flags_xpm/jo.xpm
+ 	src/pixmaps/flags_xpm/jp.xpm
+ 	src/pixmaps/flags_xpm/ke.xpm
+ 	src/pixmaps/flags_xpm/kg.xpm
+ 	src/pixmaps/flags_xpm/kh.xpm
+ 	src/pixmaps/flags_xpm/ki.xpm
+ 	src/pixmaps/flags_xpm/km.xpm
+ 	src/pixmaps/flags_xpm/kn.xpm
+ 	src/pixmaps/flags_xpm/kp.xpm
+ 	src/pixmaps/flags_xpm/kr.xpm
+ 	src/pixmaps/flags_xpm/kw.xpm
+ 	src/pixmaps/flags_xpm/ky.xpm
+ 	src/pixmaps/flags_xpm/kz.xpm
+ 	src/pixmaps/flags_xpm/la.xpm
+ 	src/pixmaps/flags_xpm/lb.xpm
+ 	src/pixmaps/flags_xpm/lc.xpm
+ 	src/pixmaps/flags_xpm/li.xpm
+ 	src/pixmaps/flags_xpm/lk.xpm
+ 	src/pixmaps/flags_xpm/lr.xpm
+ 	src/pixmaps/flags_xpm/ls.xpm
+ 	src/pixmaps/flags_xpm/lt.xpm
+ 	src/pixmaps/flags_xpm/lu.xpm
+ 	src/pixmaps/flags_xpm/lv.xpm
+ 	src/pixmaps/flags_xpm/ly.xpm
+ 	src/pixmaps/flags_xpm/makeflags.sh
+ 	src/pixmaps/flags_xpm/ma.xpm
+ 	src/pixmaps/flags_xpm/mc.xpm
+ 	src/pixmaps/flags_xpm/md.xpm
+ 	src/pixmaps/flags_xpm/me.xpm
+ 	src/pixmaps/flags_xpm/mg.xpm
+ 	src/pixmaps/flags_xpm/mh.xpm
+ 	src/pixmaps/flags_xpm/mk.xpm
+ 	src/pixmaps/flags_xpm/ml.xpm
+ 	src/pixmaps/flags_xpm/mm.xpm
+ 	src/pixmaps/flags_xpm/mn.xpm
+ 	src/pixmaps/flags_xpm/mo.xpm
+ 	src/pixmaps/flags_xpm/mp.xpm
+ 	src/pixmaps/flags_xpm/mq.xpm
+ 	src/pixmaps/flags_xpm/mr.xpm
+ 	src/pixmaps/flags_xpm/ms.xpm
+ 	src/pixmaps/flags_xpm/mt.xpm
+ 	src/pixmaps/flags_xpm/mu.xpm
+ 	src/pixmaps/flags_xpm/mv.xpm
+ 	src/pixmaps/flags_xpm/mw.xpm
+ 	src/pixmaps/flags_xpm/mx.xpm
+ 	src/pixmaps/flags_xpm/my.xpm
+ 	src/pixmaps/flags_xpm/mz.xpm
+ 	src/pixmaps/flags_xpm/na.xpm
+ 	src/pixmaps/flags_xpm/nc.xpm
+ 	src/pixmaps/flags_xpm/ne.xpm
+ 	src/pixmaps/flags_xpm/nf.xpm
+ 	src/pixmaps/flags_xpm/ng.xpm
+ 	src/pixmaps/flags_xpm/ni.xpm
+ 	src/pixmaps/flags_xpm/nl.xpm
+ 	src/pixmaps/flags_xpm/no.xpm
+ 	src/pixmaps/flags_xpm/np.xpm
+ 	src/pixmaps/flags_xpm/nr.xpm
+ 	src/pixmaps/flags_xpm/nu.xpm
+ 	src/pixmaps/flags_xpm/nz.xpm
+ 	src/pixmaps/flags_xpm/om.xpm
+ 	src/pixmaps/flags_xpm/pa.xpm
+ 	src/pixmaps/flags_xpm/pe.xpm
+ 	src/pixmaps/flags_xpm/pf.xpm
+ 	src/pixmaps/flags_xpm/pg.xpm
+ 	src/pixmaps/flags_xpm/ph.xpm
+ 	src/pixmaps/flags_xpm/pk.xpm
+ 	src/pixmaps/flags_xpm/pl.xpm
+ 	src/pixmaps/flags_xpm/pm.xpm
+ 	src/pixmaps/flags_xpm/pn.xpm
+ 	src/pixmaps/flags_xpm/pr.xpm
+ 	src/pixmaps/flags_xpm/ps.xpm
+ 	src/pixmaps/flags_xpm/pt.xpm
+ 	src/pixmaps/flags_xpm/pw.xpm
+ 	src/pixmaps/flags_xpm/py.xpm
+ 	src/pixmaps/flags_xpm/qa.xpm
+ 	src/pixmaps/flags_xpm/re.xpm
+ 	src/pixmaps/flags_xpm/ro.xpm
+ 	src/pixmaps/flags_xpm/rs.xpm
+ 	src/pixmaps/flags_xpm/ru.xpm
+ 	src/pixmaps/flags_xpm/rw.xpm
+ 	src/pixmaps/flags_xpm/sa.xpm
+ 	src/pixmaps/flags_xpm/sb.xpm
+ 	src/pixmaps/flags_xpm/scotland.xpm
+ 	src/pixmaps/flags_xpm/sc.xpm
+ 	src/pixmaps/flags_xpm/sd.xpm
+ 	src/pixmaps/flags_xpm/se.xpm
+ 	src/pixmaps/flags_xpm/sg.xpm
+ 	src/pixmaps/flags_xpm/sh.xpm
+ 	src/pixmaps/flags_xpm/si.xpm
+ 	src/pixmaps/flags_xpm/sj.xpm
+ 	src/pixmaps/flags_xpm/sk.xpm
+ 	src/pixmaps/flags_xpm/sl.xpm
+ 	src/pixmaps/flags_xpm/sm.xpm
+ 	src/pixmaps/flags_xpm/sn.xpm
+ 	src/pixmaps/flags_xpm/so.xpm
+ 	src/pixmaps/flags_xpm/sr.xpm
+ 	src/pixmaps/flags_xpm/st.xpm
+ 	src/pixmaps/flags_xpm/sv.xpm
+ 	src/pixmaps/flags_xpm/sy.xpm
+ 	src/pixmaps/flags_xpm/sz.xpm
+ 	src/pixmaps/flags_xpm/tc.xpm
+ 	src/pixmaps/flags_xpm/td.xpm
+ 	src/pixmaps/flags_xpm/tf.xpm
+ 	src/pixmaps/flags_xpm/tg.xpm
+ 	src/pixmaps/flags_xpm/th.xpm
+ 	src/pixmaps/flags_xpm/tj.xpm
+ 	src/pixmaps/flags_xpm/tk.xpm
+ 	src/pixmaps/flags_xpm/tl.xpm
+ 	src/pixmaps/flags_xpm/tm.xpm
+ 	src/pixmaps/flags_xpm/tn.xpm
+ 	src/pixmaps/flags_xpm/to.xpm
+ 	src/pixmaps/flags_xpm/tr.xpm
+ 	src/pixmaps/flags_xpm/tt.xpm
+ 	src/pixmaps/flags_xpm/tv.xpm
+ 	src/pixmaps/flags_xpm/tw.xpm
+ 	src/pixmaps/flags_xpm/tz.xpm
+ 	src/pixmaps/flags_xpm/ua.xpm
+ 	src/pixmaps/flags_xpm/ug.xpm
+ 	src/pixmaps/flags_xpm/um.xpm
+ 	src/pixmaps/flags_xpm/unknown.xpm
+ 	src/pixmaps/flags_xpm/us.xpm
+ 	src/pixmaps/flags_xpm/uy.xpm
+ 	src/pixmaps/flags_xpm/uz.xpm
+ 	src/pixmaps/flags_xpm/va.xpm
+ 	src/pixmaps/flags_xpm/vc.xpm
+ 	src/pixmaps/flags_xpm/ve.xpm
+ 	src/pixmaps/flags_xpm/vg.xpm
+ 	src/pixmaps/flags_xpm/vi.xpm
+ 	src/pixmaps/flags_xpm/vn.xpm
+ 	src/pixmaps/flags_xpm/vu.xpm
+ 	src/pixmaps/flags_xpm/wales.xpm
+ 	src/pixmaps/flags_xpm/wf.xpm
+ 	src/pixmaps/flags_xpm/ws.xpm
+ 	src/pixmaps/flags_xpm/ye.xpm
+ 	src/pixmaps/flags_xpm/yt.xpm
+ 	src/pixmaps/flags_xpm/za.xpm
+ 	src/pixmaps/flags_xpm/zm.xpm
+ 	src/pixmaps/flags_xpm/zw.xpm
+ 	src/pixmaps/Makefile.am
+ 	src/pixmaps/mule_TrayIcon_big.ico.xpm
+ 	src/pixmaps/mule_TrayIcon.ico.xpm
+ 	src/pixmaps/mule_Tr_grey_big.ico.xpm
+ 	src/pixmaps/mule_Tr_grey.ico.xpm
+ 	src/pixmaps/mule_Tr_yellow_big.ico.xpm
+ 	src/pixmaps/mule_Tr_yellow.ico.xpm
+ 	src/pixmaps/sort_dnx2.xpm
+ 	src/pixmaps/sort_dn.xpm
+ 	src/pixmaps/sort_upx2.xpm
+ 	src/pixmaps/sort_up.xpm
+ 	src/PlatformSpecific.cpp
+ 	src/PrefsUnifiedDlg.cpp
+ 	src/remote-gui.net/AboutBox.cs
+ 	src/remote-gui.net/AboutBox.resx
+ 	src/remote-gui.net/AddLinkDialog.cs
+ 	src/remote-gui.net/AddLinkDialog.Designer.cs
+ 	src/remote-gui.net/AddLinkDialog.resx
+ 	src/remote-gui.net/ConnectDlg.cs
+ 	src/remote-gui.net/ConnectDlg.Designer.cs
+ 	src/remote-gui.net/ConnectDlg.resx
+ 	src/remote-gui.net/ECCodes.cs
+ 	src/remote-gui.net/ECTagTypes.cs
+ 	src/remote-gui.net/images/Toolbar_About.png
+ 	src/remote-gui.net/images/Toolbar_Disconnect.png
+ 	src/remote-gui.net/images/Toolbar_Import.png
+ 	src/remote-gui.net/images/Toolbar_Network.png
+ 	src/remote-gui.net/images/Toolbar_Prefs.png
+ 	src/remote-gui.net/images/Toolbar_Search.png
+ 	src/remote-gui.net/images/Toolbar_Shared.png
+ 	src/remote-gui.net/images/Toolbar_Stats.png
+ 	src/remote-gui.net/images/Toolbar_Transfers.png
+ 	src/remote-gui.net/MainWindow.Designer.cs
+ 	src/remote-gui.net/MainWindow.resx
+ 	src/remote-gui.net/Properties/AssemblyInfo.cs
+ 	src/remote-gui.net/Properties/Resources.Designer.cs
+ 	src/remote-gui.net/Properties/Resources.resx
+ 	src/remote-gui.net/Properties/Settings.Designer.cs
+ 	src/remote-gui.net/Properties/Settings.settings
+ 	src/remote-gui.net/remote-gui.net.csproj
+ 	src/remote-gui.net/remote-gui.net.sln
+ 	src/remote-gui.net/SearchControl.cs
+ 	src/remote-gui.net/SearchControl.Designer.cs
+ 	src/remote-gui.net/SearchControl.resx
+ 	src/RLE.cpp
+ 	src/skins/gnome.zip
+ 	src/skins/kde4.zip
+ 	src/skins/Mac_Gray.zip
+ 	src/skins/Makefile.am
+ 	src/skins/priscilla.zip
+ 	src/skins/tango.zip
+ 	src/skins/xfce.zip
+ 	src/ThreadScheduler.cpp
+ 	src/Timer.cpp
+ 	src/UserEvents.cpp
+ 	src/utils/aLinkCreator/alc.desktop
+ 	src/utils/aLinkCreator/alc.ico
+ 	src/utils/aLinkCreator/alc.rc
+ 	src/utils/aLinkCreator/alc.xpm
+ 	src/utils/aLinkCreator/docs/alc.1
+ 	src/utils/aLinkCreator/docs/alcc.1
+ 	src/utils/aLinkCreator/docs/alcc.de.1
+ 	src/utils/aLinkCreator/docs/alcc.es.1
+ 	src/utils/aLinkCreator/docs/alcc.eu.1
+ 	src/utils/aLinkCreator/docs/alcc.fr.1
+ 	src/utils/aLinkCreator/docs/alcc.hu.1
+ 	src/utils/aLinkCreator/docs/alc.de.1
+ 	src/utils/aLinkCreator/docs/alc.es.1
+ 	src/utils/aLinkCreator/docs/alc.eu.1
+ 	src/utils/aLinkCreator/docs/alc.hu.1
+ 	src/utils/aLinkCreator/docs/Makefile.am
+ 	src/utils/aLinkCreator/Makefile.am
+ 	src/utils/aLinkCreator/src/alcc.cpp
+ 	src/utils/aLinkCreator/src/alc.cpp
+ 	src/utils/aLinkCreator/src/alcpix.cpp
+ 	src/utils/aLinkCreator/src/alcpix.h
+ 	src/utils/aLinkCreator/src/Makefile.am
+ 	src/utils/amps/CHANGELOG
+ 	src/utils/amps/images/baseimage_old.png
+ 	src/utils/amps/images/baseimage.png
+ 	src/utils/amps/images/baseimage.xcf.bz2
+ 	src/utils/amps/images/clock.png
+ 	src/utils/amps/images/conn_highid_kad_fw.png
+ 	src/utils/amps/images/conn_highid_kad_off.png
+ 	src/utils/amps/images/conn_highid_kad_on.png
+ 	src/utils/amps/images/conn_lowid_kad_fw.png
+ 	src/utils/amps/images/conn_lowid_kad_off.png
+ 	src/utils/amps/images/conn_lowid_kad_on.png
+ 	src/utils/amps/images/files.png
+ 	src/utils/amps/images/noconn_kad_fw.png
+ 	src/utils/amps/images/noconn_kad_off.png
+ 	src/utils/amps/images/noconn_kad_on.png
+ 	src/utils/amps/images/queue.png
+ 	src/utils/amps/images/running.png
+ 	src/utils/amps/images/rx0tx0.png
+ 	src/utils/amps/images/rx0tx1.png
+ 	src/utils/amps/images/rx1tx0.png
+ 	src/utils/amps/images/rx1tx1.png
+ 	src/utils/amps/images/serverbox.png
+ 	src/utils/amps/index.php
+ 	src/utils/amps/langs/de.inc
+ 	src/utils/amps/langs/en.inc
+ 	src/utils/amps/langs/es.inc
+ 	src/utils/amps/langs/eu.inc
+ 	src/utils/amps/langs/fi.inc
+ 	src/utils/amps/langs/fr.inc
+ 	src/utils/amps/langs/hu.inc
+ 	src/utils/amps/langs/it.inc
+ 	src/utils/amps/langs/nl.inc
+ 	src/utils/amps/langs/pl.inc
+ 	src/utils/amps/langs/pt_BR.inc
+ 	src/utils/amps/langs/pt.inc
+ 	src/utils/amps/SETTINGS
+ 	src/utils/amps/style.css
+ 	src/utils/amps/TODO
+ 	src/utils/cas/configfile.c
+ 	src/utils/cas/configfile.h
+ 	src/utils/cas/functions.c
+ 	src/utils/cas/functions.h
+ 	src/utils/cas/graphics.c
+ 	src/utils/cas/graphics.h
+ 	src/utils/cas/html.c
+ 	src/utils/cas/html.h
+ 	src/utils/cas/version.h
+ 	src/utils/fileview/Makefile.am
+ 	src/utils/Makefile.am
+ 	src/utils/scripts/make_store
+ 	src/utils/scripts/stats.pl
+ 	src/utils/scripts/translate-manpages
+ 	src/utils/wxCas/docs/Makefile.am
+ 	src/utils/wxCas/Makefile.am
+ 	src/utils/wxCas/src/linuxmon.cpp
+ 	src/utils/wxCas/src/Makefile.am
+ 	src/utils/wxCas/src/onlinesig.cpp
+ 	src/utils/wxCas/src/wxcas.cpp
+ 	src/utils/wxCas/src/wxcascte.cpp
+ 	src/utils/wxCas/src/wxcascte.h
+ 	src/utils/wxCas/src/wxcasframe.h
+ 	src/utils/wxCas/src/wxcas.h
+ 	src/utils/wxCas/src/wxcaspix.cpp
+ 	src/utils/wxCas/src/wxcaspix.h
+ 	src/utils/wxCas/src/wxcasprefs.cpp
+ 	src/utils/wxCas/src/wxcasprefs.h
+ 	src/utils/wxCas/src/wxcasprint.cpp
+ 	src/utils/wxCas/src/wxcasprint.h
+ 	src/utils/xas/docs/Makefile.am
+ 	src/utils/xas/docs/xas.1
+ 	src/utils/xas/docs/xas.de.1
+ 	src/utils/xas/docs/xas.es.1
+ 	src/utils/xas/docs/xas.eu.1
+ 	src/utils/xas/docs/xas.hu.1
+ 	src/utils/xas/Makefile.am
+ 	src/utils/xas/xas.pl
+ 	src/webserver/default/add_server.gif
+ 	src/webserver/default/aMule.tmpl
+ 	src/webserver/default/arrow_down.gif
+ 	src/webserver/default/arrow_right.gif
+ 	src/webserver/default/arrow_up.gif
+ 	src/webserver/default/back.gif
+ 	src/webserver/default/black.gif
+ 	src/webserver/default/blue1.gif
+ 	src/webserver/default/blue2.gif
+ 	src/webserver/default/blue3.gif
+ 	src/webserver/default/blue4.gif
+ 	src/webserver/default/blue5.gif
+ 	src/webserver/default/blue6.gif
+ 	src/webserver/default/downloads.php
+ 	src/webserver/default/emule.gif
+ 	src/webserver/default/favicon.ico
+ 	src/webserver/default/green.gif
+ 	src/webserver/default/greenpercent.gif
+ 	src/webserver/default/index.php
+ 	src/webserver/default/l_connect.gif
+ 	src/webserver/default/l_down.gif
+ 	src/webserver/default/l_ed2klink.gif
+ 	src/webserver/default/l_info.gif
+ 	src/webserver/default/log.gif
+ 	src/webserver/default/login.php
+ 	src/webserver/default/logo.jpg
+ 	src/webserver/default/l_pause.gif
+ 	src/webserver/default/l_resume.gif
+ 	src/webserver/default/l_up.gif
+ 	src/webserver/default/Makefile.am
+ 	src/webserver/default/phpamule.png
+ 	src/webserver/default/preferences.php
+ 	src/webserver/default/red.gif
+ 	src/webserver/default/search.php
+ 	src/webserver/default/servers.php
+ 	src/webserver/default/shared.php
+ 	src/webserver/default/stat_graphs.php
+ 	src/webserver/default/stat_tree.php
+ 	src/webserver/default/transparent.gif
+ 	src/webserver/default/tree-closed.gif
+ 	src/webserver/default/tree-leaf.gif
+ 	src/webserver/default/tree-open.gif
+ 	src/webserver/default/yellow.gif
+ 	src/webserver/litoral/amuleweb-main-dload.php
+ 	src/webserver/litoral/amuleweb-main-kad.php
+ 	src/webserver/litoral/amuleweb-main-log.php
+ 	src/webserver/litoral/amuleweb-main-prefs.php
+ 	src/webserver/litoral/amuleweb-main-search.php
+ 	src/webserver/litoral/amuleweb-main-servers.php
+ 	src/webserver/litoral/amuleweb-main-shared.php
+ 	src/webserver/litoral/amuleweb-main-stats.php
+ 	src/webserver/litoral/black.gif
+ 	src/webserver/litoral/blank1x1.gif
+ 	src/webserver/litoral/blue1.gif
+ 	src/webserver/litoral/blue2.gif
+ 	src/webserver/litoral/blue3.gif
+ 	src/webserver/litoral/blue4.gif
+ 	src/webserver/litoral/blue5.gif
+ 	src/webserver/litoral/blue6.gif
+ 	src/webserver/litoral/close.png
+ 	src/webserver/litoral/col.png
+ 	src/webserver/litoral/connect.gif
+ 	src/webserver/litoral/down.png
+ 	src/webserver/litoral/edkserv_0.png
+ 	src/webserver/litoral/edkserv_1.png
+ 	src/webserver/litoral/favicon.ico
+ 	src/webserver/litoral/filter.png
+ 	src/webserver/litoral/fond.gif
+ 	src/webserver/litoral/fond_haut.png
+ 	src/webserver/litoral/footer.php
+ 	src/webserver/litoral/index.html
+ 	src/webserver/litoral/kitty.gif
+ 	src/webserver/litoral/loginfond.gif
+ 	src/webserver/litoral/loginfond_haut.png
+ 	src/webserver/litoral/loginlogo.jpg
+ 	src/webserver/litoral/loginlogo.png
+ 	src/webserver/litoral/login.php
+ 	src/webserver/litoral/logo.png
+ 	src/webserver/litoral/log.php
+ 	src/webserver/litoral/Makefile.am
+ 	src/webserver/litoral/maquette.dwt
+ 	src/webserver/litoral/ok.png
+ 	src/webserver/litoral/pause.png
+ 	src/webserver/litoral/play.png
+ 	src/webserver/litoral/red.gif
+ 	src/webserver/litoral/refresh.png
+ 	src/webserver/litoral/search_0.png
+ 	src/webserver/litoral/search_1.png
+ 	src/webserver/litoral/shared_0.png
+ 	src/webserver/litoral/shared_1.png
+ 	src/webserver/litoral/sheserv_0.png
+ 	src/webserver/litoral/sheserv_1.png
+ 	src/webserver/litoral/stats_0.png
+ 	src/webserver/litoral/stats_1.png
+ 	src/webserver/litoral/stats.php
+ 	src/webserver/litoral/stats_tree.php
+ 	src/webserver/litoral/style.css
+ 	src/webserver/litoral/tab_bottom_left.png
+ 	src/webserver/litoral/tab_bottom.png
+ 	src/webserver/litoral/tab_bottom_right.png
+ 	src/webserver/litoral/tab_left.png
+ 	src/webserver/litoral/tab_right.png
+ 	src/webserver/litoral/tab_top_left.png
+ 	src/webserver/litoral/tab_top.png
+ 	src/webserver/litoral/tab_top_right.png
+ 	src/webserver/litoral/transf_0.png
+ 	src/webserver/litoral/transf_1.png
+ 	src/webserver/litoral/tree-closed.gif
+ 	src/webserver/litoral/tree-leaf.gif
+ 	src/webserver/litoral/tree-open.gif
+ 	src/webserver/litoral/up.png
+ 	src/webserver/litoral/yellow.gif
+ 	src/webserver/Makefile.am
+ 	src/webserver/php-default/amuleweb-main-dload.php
+ 	src/webserver/php-default/amuleweb-main-kad.php
+ 	src/webserver/php-default/amuleweb-main-prefs.php
+ 	src/webserver/php-default/amuleweb-main-search.php
+ 	src/webserver/php-default/amuleweb-main-servers.php
+ 	src/webserver/php-default/amuleweb-main-shared.php
+ 	src/webserver/php-default/amuleweb-main-stats.php
+ 	src/webserver/php-default/apply.jpeg
+ 	src/webserver/php-default/arrow-r.png
+ 	src/webserver/php-default/connect.gif
+ 	src/webserver/php-default/delete.jpeg
+ 	src/webserver/php-default/down.jpeg
+ 	src/webserver/php-default/favicon.ico
+ 	src/webserver/php-default/footer.php
+ 	src/webserver/php-default/index.html
+ 	src/webserver/php-default/login.php
+ 	src/webserver/php-default/Makefile.am
+ 	src/webserver/php-default/pause.jpeg
+ 	src/webserver/php-default/phpamule.png
+ 	src/webserver/php-default/resume.jpeg
+ 	src/webserver/php-default/stats.php
+ 	src/webserver/php-default/stats_tree.php
+ 	src/webserver/php-default/toolbutton-connect.jpeg
+ 	src/webserver/php-default/toolbutton-download.jpeg
+ 	src/webserver/php-default/toolbutton-download-pressed.jpeg
+ 	src/webserver/php-default/toolbutton-filter.jpeg
+ 	src/webserver/php-default/toolbutton-kad.jpeg
+ 	src/webserver/php-default/toolbutton-kad-pressed.jpeg
+ 	src/webserver/php-default/toolbutton-logout.jpeg
+ 	src/webserver/php-default/toolbutton-logout-pressed.jpeg
+ 	src/webserver/php-default/toolbutton-reload.jpeg
+ 	src/webserver/php-default/toolbutton-search.jpeg
+ 	src/webserver/php-default/toolbutton-search-pressed.jpeg
+ 	src/webserver/php-default/toolbutton-servers.jpeg
+ 	src/webserver/php-default/toolbutton-servers-pressed.jpeg
+ 	src/webserver/php-default/toolbutton-settings.jpeg
+ 	src/webserver/php-default/toolbutton-settings-pressed.jpeg
+ 	src/webserver/php-default/toolbutton-shared.jpeg
+ 	src/webserver/php-default/toolbutton-shared-pressed.jpeg
+ 	src/webserver/php-default/toolbutton-stats.jpeg
+ 	src/webserver/php-default/toolbutton-stats-pressed.jpeg
+ 	src/webserver/php-default/top.html
+ 	src/webserver/php-default/tree-closed.gif
+ 	src/webserver/php-default/tree-leaf.gif
+ 	src/webserver/php-default/tree-open.gif
+ 	src/webserver/php-default/up.jpeg
+ 	src/webserver/src/Makefile.am
+ 	src/webserver/src/missing-template.html
+ 	src/webserver/src/php_amule_lib.cpp
+ 	src/webserver/src/php_amule_lib.cpp )
+ 	unittests/Makefile.am
+ 	unittests/muleunit/Makefile.am
+ 	unittests/README
+ 	unittests/tests/Makefile.am
+ 	unittests/tests/TextFileTest_dos.txt
+ 	unittests/tests/TextFileTest_unix.txt
+ 	version.rc.in

aMule-2.2.6.tar.bz2/debian/rules -> aMule-2.3.1.tar.bz2/debian/rules Changed

@@ -4,31 +4,20 @@
 
 # Uncomment this to turn on verbose mode.
 export DH_VERBOSE=1
-
+export DEB_BUILD_OPTIONS_PARALLEL=3
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
 
 #Here are the packages that can't be compiled separate now
 general_pkgs = "amule-common"\
 	"amule-skin-gnome"\
 	"amule-skin-kde4"\
+	"amule-skin-mac-gray"\
+	"amule-skin-priscilla"\
 	"amule-skin-tango"\
-	"amule-skin-xfce"\
-	"amule-theme-default"\
-	"amule-theme-php-default"\
-	"amule-theme-chicane"\
-	"amule-xas"
+	"amule-skin-xfce"
 
 # First, get the targets from commandline
 flags = ${MAKECMDGOALS}
@@ -37,20 +26,9 @@
 
 ifeq ("binary", "$(findstring binary, $(flags))")
 
+	PLASMAMULE = --enable-plasmamule
 	WXCAS = --enable-wxcas
-	CAS = --enable-cas
-	WEBSERVER = --enable-webserver
-	REMOTEGUI = --enable-amule-gui
-	DAEMON = --enable-amule-daemon
-	ALCC = --enable-alcc
-	ALC = --enable-alc
-	AMULECMD = --enable-amulecmd
-	DEBUGGING = --enable-debug --disable-optimize --disable-profile
-	LANGFLAG = --with-language=all
-
-else ifeq ("clean", "$(findstring clean, $(flags))")
-
-	WXCAS = --enable-wxcas
+	XAS = --enable-xas
 	CAS = --enable-cas
 	WEBSERVER = --enable-webserver
 	REMOTEGUI = --enable-amule-gui
@@ -63,7 +41,9 @@
 
 else ifeq ("build", "$(findstring build, $(flags))")
 
+	PLASMAMULE = --enable-plasmamule
 	WXCAS = --enable-wxcas
+	XAS = --enable-xas
 	CAS = --enable-cas
 	WEBSERVER = --enable-webserver
 	REMOTEGUI = --enable-amule-gui
@@ -78,12 +58,16 @@
 	#Now we have to check what packages are build to configure only them
 
 	#We have to filter the right targets (wo_ means without)
-	wo_wxcas = $(subst wxcas, , ${flags})
-	wo_alcc = $(subst alcc, , ${flags})
-	wo_amule_utils_gui = $(subst amule-utils-gui, ,${flags})
-	wo_all_other_amules = $(subst amulecmd, ,$(subst amule-utils-gui, ,$(subst amule-utils, ,${flags})))
+	wo_wxcas = $(subst wxcas,, ${flags})
+	wo_alcc = $(subst alcc,, ${flags})
+	wo_amule_utils_gui = $(subst amule-utils-gui,,${flags})
+	wo_all_other_amules = $(subst amulecmd,,$(subst amule-utils-gui,,$(subst amule-utils,,${flags})))
 	LANGUAGE := en_GB
 
+	ifeq ("plasmamule", "$(findstring plasmamule, $(flags))")
+		PLASMAMULE = --enable-plasmamule
+	endif
+
 	ifeq ("wxcas", "$(findstring wxcas, $(flags))")
 		WXCAS = --enable-wxcas
 	endif
@@ -124,6 +108,10 @@
 		ED2K = --disable-ed2k
 	endif
 
+	ifeq ("xas", "$(findstring xas, $(flags))")
+		XAS = --enable-xas
+	endif
+
 	#Now find out if a Metapackage should be build
 	ifeq ("amule-utils-gui", "$(findstring amule-utils-gui, $(flags))")
 		ALC = --enable-alc
@@ -144,6 +132,10 @@
 			LANGUAGE := $(LANGUAGE),ar
 		endif
 
+		ifeq ("i18n-ast", "$(findstring i18n-ast, $(flags))")
+			LANGUAGE := $(LANGUAGE),ast
+		endif
+
 		ifeq ("i18n-bg", "$(findstring i18n-bg, $(flags))")
 			LANGUAGE := $(LANGUAGE),bg
 		endif
@@ -152,6 +144,10 @@
 			LANGUAGE := $(LANGUAGE),ca
 		endif
 
+		ifeq ("i18n-cs", "$(findstring i18n-cs, $(flags))")
+			LANGUAGE := $(LANGUAGE),cs
+		endif
+
 		ifeq ("i18n-da", "$(findstring i18n-da, $(flags))")
 			LANGUAGE := $(LANGUAGE),da
 		endif
@@ -160,6 +156,10 @@
 			LANGUAGE := $(LANGUAGE),de
 		endif
 
+		ifeq ("i18n-el", "$(findstring i18n-el, $(flags))")
+			LANGUAGE := $(LANGUAGE),el
+		endif
+
 		ifeq ("i18n-es", "$(findstring i18n-es, $(flags))")
 			LANGUAGE := $(LANGUAGE),es
 		endif
@@ -184,6 +184,10 @@
 			LANGUAGE := $(LANGUAGE),gl
 		endif
 
+		ifeq ("i18n-he", "$(findstring i18n-he, $(flags))")
+			LANGUAGE := $(LANGUAGE),he
+		endif
+
 		ifeq ("i18n-hr", "$(findstring i18n-hr, $(flags))")
 			LANGUAGE := $(LANGUAGE),hr
 		endif
@@ -200,6 +204,10 @@
 			LANGUAGE := $(LANGUAGE),it_CH
 		endif
 
+		ifeq ("i18n-ja", "$(findstring i18n-ja, $(flags))")
+			LANGUAGE := $(LANGUAGE),ja
+		endif
+
 		ifeq ("i18n-ko-kr", "$(findstring i18n-ko-kr, $(flags))")
 			LANGUAGE := $(LANGUAGE),ko_KR
 		endif
@@ -236,6 +244,10 @@
 			LANGUAGE := $(LANGUAGE),sl
 		endif
 
+		ifeq ("i18n-sq", "$(findstring i18n-sq, $(flags))")
+			LANGUAGE := $(LANGUAGE),sq
+		endif
+
 		ifeq ("i18n-sv", "$(findstring i18n-sv, $(flags))")
 			LANGUAGE := $(LANGUAGE),sv
 		endif
@@ -244,6 +256,10 @@
 			LANGUAGE := $(LANGUAGE),tr
 		endif
 
+		ifeq ("i18n-uk", "$(findstring i18n-uk, $(flags))")
+			LANGUAGE := $(LANGUAGE),uk
+		endif
+
 		ifeq ("i18n-zh-cn", "$(findstring i18n-zh-cn, $(flags))")
 			LANGUAGE := $(LANGUAGE),zh_CN
 		endif
@@ -271,47 +287,46 @@
 #Before we start, I want to introduce two sequences for building the packages
 #I define two, so I can put the commands for the *-dbg packages between them
 define stage1
-	dh_testdir -p${pkg}
-	dh_testroot -p${pkg}
-	dh_installdirs -p${pkg}
-	dh_installchangelogs docs/Changelog -p${pkg}
-	dh_installdocs -p${pkg}
-	dh_install -Xlicense.txt -p${pkg}
-	dh_installmenu -p${pkg}
-	dh_installdebconf -p${pkg}
-	dh_installman -p${pkg}
-	dh_link -p${pkg}
-	install -D --mode=644 debian/${pkg}.override debian/${pkg}/usr/share/lintian/overrides/${pkg}
+	dh_testdir -p$(subst -stage1,,$@)
+	dh_testroot -p$(subst -stage1,,$@)
+	dh_installdirs -p$(subst -stage1,,$@)
+	dh_installchangelogs docs/Changelog -p$(subst -stage1,,$@)
+	dh_installdocs -p$(subst -stage1,,$@)
+	dh_install -Xlicense.txt -p$(subst -stage1,,$@)
+	dh_installmenu -p$(subst -stage1,,$@)
+	dh_installdebconf -p$(subst -stage1,,$@)
+	dh_installman -p$(subst -stage1,,$@)
+	dh_installmime -p$(subst -stage1,,$@)
+	dh_link -p$(subst -stage1,,$@)
+	dh_lintian -p$(subst -stage1,,$@)
 	touch $@
 endef
 
+define strip-stage
+	dh_strip -p$(subst -dbg,,$@) --dbg-package=$@
+endef
+
 define stage2
-	dh_compress -X.pl -p${pkg}
-	dh_perl -p${pkg}
-	dh_makeshlibs -p${pkg}
-	dh_installdeb -p${pkg}
-	dh_shlibdeps -p${pkg}
-	dh_gencontrol -p${pkg}
-	dh_md5sums -p${pkg}
-	dh_fixperms -p${pkg}
-	dh_builddeb -p${pkg}
+	dh_compress -X.pl -p$(subst -stage2,,$@)
+	dh_perl -p$(subst -stage2,,$@)
+	dh_makeshlibs -p$(subst -stage2,,$@)
+	dh_installdeb -p$(subst -stage2,,$@)
+	dh_shlibdeps -p$(subst -stage2,,$@)
+	dh_gencontrol -p$(subst -stage2,,$@)
+	dh_md5sums -p$(subst -stage2,,$@)
+	dh_fixperms -p$(subst -stage2,,$@)
+	dh_builddeb -p$(subst -stage2,,$@)
 	touch $@
 endef
 
 #Now we configure this whole thing
 config.status: configure
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure\
-		--host=$(DEB_HOST_GNU_TYPE)\
-		--build=$(DEB_BUILD_GNU_TYPE)\
-		--prefix=/usr\
-		--mandir=\$${prefix}/share/man\
-		--infodir=\$${prefix}/share/info\
-		--enable-systray\
-		--with-ccache\
-		--enable-utf8-systray\
+	CFLAGS="$(CFLAGS)" dh_auto_configure -- --host=$(DEB_HOST_GNU_TYPE)\
+		LDFLAGS="-Wl,--as-needed ${LDFLAGS}"\
+		--enable-ccache\
 		--enable-geoip\
-		--disable-embedded-crypto\
+		${PLASMAMULE}\
 		${AMULECMD}\
 		${DEBUGGING}\
 		${WEBSERVER}\
@@ -323,108 +338,16 @@
 		${DAEMON}\
 		${AMULE}\
 		${ED2K}\
-		$(LANGFLAG)
-
+		$(LANGFLAG)\
+		$(XAS)
 
 #And here is the well known clean target
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f alc
-	rm -f alc-dbg
-	rm -f alcc
-	rm -f alcc-dbg
-	rm -f amule
-	rm -f amule-alc-dbg
-	rm -f amule-alc-stage1
-	rm -f amule-alc-stage2
-	rm -f amule-alcc-dbg
-	rm -f amule-alcc-stage1
-	rm -f amule-alcc-stage2
-	rm -f amule-cas-dbg
-	rm -f amule-cas-stage1
-	rm -f amule-cas-stage2
-	rm -f amule-cmd-dbg
-	rm -f amule-cmd-stage1
-	rm -f amule-cmd-stage2
-	rm -f amule-common
-	rm -f amule-daemon-dbg
-	rm -f amule-daemon-stage1
-	rm -f amule-daemon-stage2
-	rm -f amule-dbg
-	rm -f amule-ed2k-dbg
-	rm -f amule-ed2k-stage1
-	rm -f amule-ed2k-stage2
-	rm -f amule-remote-gui-dbg
-	rm -f amule-remote-gui-stage1
-	rm -f amule-remote-gui-stage2
-	rm -f amule-stage1
-	rm -f amule-stage2
-	rm -f amule-utils
-	rm -f amule-utils-gui
-	rm -f amule-wxcas-dbg
-	rm -f amule-wxcas-stage1
-	rm -f amule-wxcas-stage2
-	rm -f amulecmd
-	rm -f amulecmd-dbg
-	rm -f amuleweb-stage1
-	rm -f amuleweb-stage2
-	rm -f amuleweb-dbg
-	rm -f build-stamp 
-	rm -f cas
-	rm -f cas-dbg
-	rm -f compile
-	rm -f daemon
-	rm -f daemon-dbg
-	rm -f ed2k
-	rm -f ed2k-dbg
-	rm -f i18n-ar
-	rm -f i18n-bg
-	rm -f i18n-ca
-	rm -f i18n-da
-	rm -f i18n-de
-	rm -f i18n-en-gb
-	rm -f i18n-es
-	rm -f i18n-et-ee
-	rm -f i18n-eu
-	rm -f i18n-fi
-	rm -f i18n-fr
-	rm -f i18n-gl
-	rm -f i18n-hr
-	rm -f i18n-hu
-	rm -f i18n-it
-	rm -f i18n-it-ch
-	rm -f i18n-ko-kr
-	rm -f i18n-lt
-	rm -f i18n-nl
-	rm -f i18n-nn
-	rm -f i18n-pl
-	rm -f i18n-pt-br
-	rm -f i18n-pt-pt
-	rm -f i18n-ru
-	rm -f i18n-sl
-	rm -f i18n-sv
-	rm -f i18n-tr
-	rm -f i18n-zh-cn
-	rm -f i18n-zh-tw
-	rm -f remotegui
-	rm -f remotegui-dbg
-	rm -f webserver
-	rm -f webserver-dbg
-	rm -f wxcas
-	rm -f wxcas-dbg
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-	
-	rm -f debian/files
-	dh_clean -k
+	dh_clean
+	dh_auto_clean
+	dh_prep
 
 #Some generic targets to check the build process
 build: build-stamp
@@ -432,8 +355,7 @@
 build-stamp:  config.status
 	dh_testdir
 
-	# Add here commands to compile the package.
-	$(MAKE)
+	dh_auto_build
 
 	touch build-stamp
 
@@ -441,10 +363,8 @@
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -a -k 
-	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	dh_auto_install
 
 #Now first build the packages that are compiled and installed on every build
 amule-common: install
@@ -460,7 +380,7 @@
 		dh_installdebconf -p$$pkg; \
 		dh_installman -p$$pkg; \
 		dh_link -p$$pkg; \
-		install -D --mode=644 debian/$$pkg.override debian/$$pkg/usr/share/lintian/overrides/$$pkg; \
+		dh_lintian -p$$pkg; \
 		dh_compress -X.pl -p$$pkg; \
 		dh_perl -p$$pkg; \
 		dh_makeshlibs -p$$pkg; \
@@ -473,370 +393,120 @@
 	done
 	touch amule-common
 
-amule-stage1: pkg=amule
-amule-stage1: amule-common
+%-stage1: amule-common
 	${stage1}
 
-amule-stage2: pkg=amule
-amule-stage2: amule-stage1
+%-stage2: %-stage1
 	${stage2}
 
-amule-ed2k-stage1: pkg=amule-ed2k
-amule-ed2k-stage1: amule-common
+amule-%-dbg: amule-%-stage1
 	${stage1}
-
-amule-ed2k-stage2: pkg=amule-ed2k
-amule-ed2k-stage2: amule-ed2k-stage1
+	$(strip-stage)
 	${stage2}
 
-amule-cas-stage1: pkg=amule-cas
-amule-cas-stage1: amule-common
-	${stage1}
-
-amule-cas-stage2: pkg=amule-cas
-amule-cas-stage2: amule-cas-stage1
-	${stage2}
-
-amule-wxcas-stage1: pkg=amule-wxcas
-amule-wxcas-stage1: amule-common
-	${stage1}
-
-amule-wxcas-stage2: pkg=amule-wxcas
-amule-wxcas-stage2: amule-wxcas-stage1
-	${stage2}
-
-amuleweb-stage1: pkg=amuleweb
-amuleweb-stage1: amule-common
-	${stage1}
-
-amuleweb-stage2: pkg=amuleweb
-amuleweb-stage2: amuleweb-stage1
-	${stage2}
-
-amule-remote-gui-stage1: pkg=amule-remote-gui
-amule-remote-gui-stage1: amule-common
-	${stage1}
-
-amule-remote-gui-stage2: pkg=amule-remote-gui
-amule-remote-gui-stage2: amule-remote-gui-stage1
-	${stage2}
-
-amule-daemon-stage1: pkg=amule-daemon
-amule-daemon-stage1: amule-common
-	${stage1}
-
-amule-daemon-stage2: pkg=amule-daemon
-amule-daemon-stage2: amule-daemon-stage1
-	${stage2}
-
-amule-alc-stage1: pkg=amule-alc
-amule-alc-stage1: amule-common
-	${stage1}
-
-amule-alc-stage2: pkg=amule-alc
-amule-alc-stage2: amule-alc-stage1
-	${stage2}
-
-amule-alcc-stage1: pkg=amule-alcc
-amule-alcc-stage1: amule-common
-	${stage1}
-
-amule-alcc-stage2: pkg=amule-alcc
-amule-alcc-stage2: amule-alcc-stage1
-	${stage2}
-
-amule-cmd-stage1: pkg=amule-cmd
-amule-cmd-stage1: amule-common
-	${stage1}
-
-amule-cmd-stage2: pkg=amule-cmd
-amule-cmd-stage2: amule-alcc-stage1
-	${stage2}
-
-
-amule-ed2k-dbg: pkg=amule-ed2k-dbg
-amule-ed2k-dbg: amule-ed2k-stage1
-	${stage1}
-	dh_strip -pamule-ed2k --dbg-package=amule-ed2k-dbg
-	${stage2}
-
-amule-cas-dbg: pkg=amule-cas-dbg
-amule-cas-dbg: amule-cas-stage1
-	${stage1}
-	dh_strip -pamule-cas --dbg-package=amule-cas-dbg
-	${stage2}
-
-amule-wxcas-dbg: pkg=amule-wxcas-dbg
-amule-wxcas-dbg: amule-wxcas-stage1
+amule-dbg: amule-stage1
 	${stage1}
-	dh_strip -pamule-wxcas --dbg-package=amule-wxcas-dbg
+	$(strip-stage)
 	${stage2}
 
-amuleweb-dbg: pkg=amuleweb-dbg
 amuleweb-dbg: amuleweb-stage1
 	${stage1}
-	dh_strip -pamuleweb --dbg-package=amuleweb-dbg
-	${stage2}
-
-amule-remote-gui-dbg: pkg=amule-remote-gui-dbg
-amule-remote-gui-dbg: amule-remote-gui-stage1
-	${stage1}
-	dh_strip -pamule-remote-gui --dbg-package=amule-remote-gui-dbg
-	${stage2}
-
-amule-daemon-dbg: pkg=amule-daemon-dbg
-amule-daemon-dbg: amule-daemon-stage1
-	${stage1}
-	dh_strip -pamule-daemon --dbg-package=amule-daemon-dbg
-	${stage2}
-
-amule-alc-dbg: pkg=amule-alc-dbg
-amule-alc-dbg: amule-alc-stage1
-	${stage1}
-	dh_strip -pamule-alc --dbg-package=amule-alc-dbg
-	${stage2}
-
-amule-alcc-dbg: pkg=amule-alcc-dbg
-amule-alcc-dbg: amule-alcc-stage1
-	${stage1}
-	dh_strip -pamule-alcc --dbg-package=amule-alcc-dbg
-	${stage2}
-
-amule-cmd-dbg: pkg=amule-cmd-dbg
-amule-cmd-dbg: amule-cmd-stage1
-	${stage1}
-	dh_strip -pamule-cmd --dbg-package=amule-cmd-dbg
+	$(strip-stage)
 	${stage2}
 
 #Now just the targets to map the Commandline Name to the package names
 amule: amule-stage2
-	touch amule
+	touch @
 
 ed2k: amule-ed2k-stage2
-	touch ed2k
+	touch @
 
 cas: amule-cas-stage2
-	touch cas
+	touch @
 
 wxcas: amule-wxcas-stage2
-	touch wxcas
+	touch @
 
-webserver: amuleweb-stage2
-	touch webserver
+webserver: amuleweb-stage2 amule-theme-default-stage2
+	touch @
 
 remotegui: amule-remote-gui-stage2
-	touch remotegui
+	touch @
 
 daemon: amule-daemon-stage2
-	touch daemon
+	touch @
 
 alc: amule-alc-stage2
-	touch alc
+	touch @
 
 alcc: amule-alcc-stage2
-	touch alcc
+	touch @
 
 amulecmd: amule-cmd-stage2
-	touch amulecmd
+	touch @
+
+xas: amule-xas-stage2
+	touch @
 
 ed2k-dbg: amule-ed2k-dbg
-	touch ed2k-dbg
+	touch @
 
 cas-dbg: amule-cas-dbg
-	touch cas-dbg
+	touch @
 
 wxcas-dbg: amule-wxcas-dbg
-	touch wxcas-dbg
+	touch @
 
 webserver-dbg: amuleweb-dbg
-	touch webserver-dbg
+	touch @
 
 remotegui-dbg: amule-remote-gui-dbg
-	touch remotegui-dbg
+	touch @
 
 daemon-dbg: amule-daemon-dbg
-	touch daemon-dbg
+	touch @
 
 alc-dbg: amule-alc-dbg
-	touch alc-dbg
+	touch @
 
 alcc-dbg: amule-alcc-dbg
-	touch alcc-dbg
+	touch @
 
 amulecmd-dbg: amule-cmd-dbg
-	touch amulecmd-dbg
-
-amule-dbg: pkg=amule-dbg
-amule-dbg: amule-stage1
-	${stage1}
-	dh_strip -pamule --dbg-package=amule-dbg
-	${stage2}
-
-#Her come the Targets for the langauge packages
-i18n-ar: pkg=amule-i18n-ar
-i18n-ar: amule-common
-	${stage1}
-	${stage2}
-
-i18n-bg: pkg=amule-i18n-bg
-i18n-bg: amule-common
-	${stage1}
-	${stage2}
-
-i18n-ca: pkg=amule-i18n-ca
-i18n-ca: amule-common
-	${stage1}
-	${stage2}
-
-i18n-da: pkg=amule-i18n-da
-i18n-da: amule-common
-	${stage1}
-	${stage2}
-
-i18n-de: pkg=amule-i18n-de
-i18n-de: amule-common
-	${stage1}
-	${stage2}
-
-i18n-en-gb: pkg=amule-i18n-en-gb
-i18n-en-gb: amule-common
-	${stage1}
-	${stage2}
-
-i18n-es: pkg=amule-i18n-es
-i18n-es: amule-common
-	${stage1}
-	${stage2}
-
-i18n-et-ee: pkg=amule-i18n-et-ee
-i18n-et-ee: amule-common
-	${stage1}
-	${stage2}
-
-i18n-eu: pkg=amule-i18n-eu
-i18n-eu: amule-common
-	${stage1}
-	${stage2}
-
-i18n-fi: pkg=amule-i18n-fi
-i18n-fi: amule-common
-	${stage1}
-	${stage2}
-
-i18n-fr: pkg=amule-i18n-fr
-i18n-fr: amule-common
-	${stage1}
-	${stage2}
-
-i18n-gl: pkg=amule-i18n-gl
-i18n-gl: amule-common
-	${stage1}
-	${stage2}
-
-i18n-hr: pkg=amule-i18n-hr
-i18n-hr: amule-common
-	${stage1}
-	${stage2}
-
-i18n-hu: pkg=amule-i18n-hu
-i18n-hu: amule-common
-	${stage1}
-	${stage2}
-
-i18n-it-ch: pkg=amule-i18n-it-ch
-i18n-it-ch: amule-common
-	${stage1}
-	${stage2}
-
-i18n-it: pkg=amule-i18n-it
-i18n-it: amule-common
-	${stage1}
-	${stage2}
-
-i18n-ko-kr: pkg=amule-i18n-ko-kr
-i18n-ko-kr: amule-common
-	${stage1}
-	${stage2}
-
-i18n-lt: pkg=amule-i18n-lt
-i18n-lt: amule-common
-	${stage1}
-	${stage2}
-
-i18n-nn: pkg=amule-i18n-nn
-i18n-nn: amule-common
-	${stage1}
-	${stage2}
-
-i18n-nl: pkg=amule-i18n-nl
-i18n-nl: amule-common
-	${stage1}
-	${stage2}
-
-i18n-pl: pkg=amule-i18n-pl
-i18n-pl: amule-common
-	${stage1}
-	${stage2}
-
-i18n-pt-br: pkg=amule-i18n-pt-br
-i18n-pt-br: amule-common
-	${stage1}
-	${stage2}
+	touch @
 
-i18n-pt-pt: pkg=amule-i18n-pt-pt
-i18n-pt-pt: amule-common
-	${stage1}
-	${stage2}
+plasmamule: amule-plasmamule-stage2
+	touch @
 
-i18n-ru: pkg=amule-i18n-ru
-i18n-ru: amule-common
-	${stage1}
-	${stage2}
+plasmamule-dbg: amule-plasmamule-dbg
+	touch @
 
-i18n-sl: pkg=amule-i18n-sl
-i18n-sl: amule-common
-	${stage1}
-	${stage2}
+#Here come the Targets for the langauge packages
+i18n-%: amule-i18n-% ;  
 
-i18n-sv: pkg=amule-i18n-sv
-i18n-sv: amule-common
-	${stage1}
-	${stage2}
-
-i18n-tr: pkg=amule-i18n-tr
-i18n-tr: amule-common
-	${stage1}
-	${stage2}
-
-i18n-zh-cn: pkg=amule-i18n-zh-cn
-i18n-zh-cn: amule-common
-	${stage1}
-	${stage2}
-
-i18n-zh-tw: pkg=amule-i18n-zh-tw
-i18n-zh-tw: amule-common
+amule-i18n-%: amule-common
 	${stage1}
 	${stage2}
 
 #They are just metapackages
-amule-utils: pkg=amule-utils
 amule-utils: alcc amulecmd cas
 	${stage1}
 	${stage2}
 
-amule-utils-gui: pkg=amule-utils-gui
 amule-utils-gui: alc remotegui wxcas
 	${stage1}
 	${stage2}
 
-#These Two are empty (Space after Semicolon)
-debug-packages: amule-dbg ed2k-dbg cas-dbg wxcas-dbg webserver-dbg remotegui-dbg daemon-dbg alc-dbg alcc-dbg amulecmd-dbg ; 
-normal-packages: amule-utils amule-utils-gui amule ed2k webserver daemon ; 
-
-language-packages: i18n-ar i18n-bg i18n-ca i18n-da i18n-de i18n-en-gb i18n-es i18n-et-ee i18n-eu i18n-fi i18n-fr i18n-gl i18n-hr i18n-hu i18n-it-ch i18n-it i18n-ko-kr i18n-lt i18n-nn i18n-nl i18n-pl i18n-pt-br i18n-pt-pt i18n-ru i18n-sl i18n-sv i18n-tr i18n-zh-cn i18n-zh-tw ; 
-
+#These are empty (Space after Semicolon)
+debug-packages: amule-dbg ed2k-dbg cas-dbg wxcas-dbg webserver-dbg remotegui-dbg daemon-dbg alc-dbg alcc-dbg amulecmd-dbg plasmamule-dbg; 
+normal-packages: amule-utils amule-utils-gui amule ed2k webserver daemon xas plasmamule ; 
+language-packages: i18n-ar i18n-ast i18n-bg i18n-ca i18n-cs i18n-da i18n-de i18n-el i18n-en-gb i18n-es i18n-et-ee i18n-eu i18n-fi i18n-fr i18n-gl i18n-he i18n-hr i18n-hu i18n-it-ch i18n-it i18n-ja i18n-ko-kr i18n-lt i18n-nn i18n-nl i18n-pl i18n-pt-br i18n-pt-pt i18n-ru i18n-sl i18n-sq i18n-sv i18n-tr i18n-uk i18n-zh-cn i18n-zh-tw ;
 i18n-en-only: ; 
 
+#If we build from a svn checkout, we need to generate configure
+configure:
+	./autogen.sh
+
 #Now the targets for dpkg-buildpackage
 binary-indep: build install
 
@@ -848,4 +518,4 @@
 	cat README.Debian-Packages
 
 .DEFAULT_GOAL = help
-.PHONY: build clean binary-indep binary-arch binary install debug-packages normal-packages amule-utils-gui amule-utils i18n-only language-packages
+.PHONY: build clean binary-indep binary-arch binary install debug-packages normal-packages i18n-only language-packages

aMule-2.3.1.tar.bz2/debian/source Added

aMule-2.3.1.tar.bz2/debian/source/format Added

aMule-2.2.6.tar.bz2/depcomp -> aMule-2.3.1.tar.bz2/depcomp Changed

@@ -1,9 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2005-07-09.11
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,9 +17,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -86,12 +85,34 @@
    depmode=dashmstdout
 fi
 
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+   # This is just like msvisualcpp but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u="sed s,\\\\\\\\,/,g"
+   depmode=msvisualcpp
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
   stat=$?
   if test $stat -eq 0; then :
   else
@@ -178,14 +199,14 @@
 ' < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
     tr '
-' ' ' >> $depfile
-    echo >> $depfile
+' ' ' >> "$depfile"
+    echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
     tr ' ' '
 ' < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
+   >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -201,34 +222,39 @@
   # current directory.  Also, the AIX compiler puts `$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/$.*$\..*$/\1/'`
-  tmpdepfile="$stripped.u"
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
     "$@" -Wc,-M
   else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
     "$@" -M
   fi
   stat=$?
 
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
   if test $stat -eq 0; then :
   else
-    rm -f "$tmpdepfile"
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
 
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
   if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
     # Each line is of the form `foo.o: dependent.h'.
     # Do two passes, one to just change these to
     # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: $.*$$,\1:," < "$tmpdepfile" >> "$depfile"
+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    # That's a tab and a space in the [].
+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -276,6 +302,51 @@
   rm -f "$tmpdepfile"
   ;;
 
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  test "x$dir" = "x$object" && dir=
+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add `dependent.h:' lines.
+    sed -ne '2,${
+	       s/^ *//
+	       s/ \\*$//
+	       s/$/:/
+	       p
+	     }' "$tmpdepfile" >> "$depfile"
+  else
+    echo "#dummy" > "$depfile"
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -288,13 +359,13 @@
 
    if test "$libtool" = yes; then
       # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
+      # static library.  This mechanism is used in libtool 1.4 series to
       # handle both shared and static libraries in a single compilation.
       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
       #
       # With libtool 1.5 this exception was removed, and libtool now
       # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
+      # compilations output dependencies in $dir.libs/$base.o.d and
       # in $dir$base.o.d.  We have to check for both files, because
       # one of the two compilations can be disabled.  We should prefer
       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
@@ -345,7 +416,7 @@
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -396,32 +467,39 @@
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
-  cleared=no
-  for arg in "$@"; do
+  cleared=no eat=no
+  for arg
+  do
     case $cleared in
     no)
       set ""; shift
       cleared=yes ;;
     esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;
     # Strip any option that makedepend may not understand.  Remove
     # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
     -*|$object)
       ;;
     *)
       set fnord "$@" "$arg"; shift ;;
     esac
   done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
@@ -441,7 +519,7 @@
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
@@ -479,13 +557,27 @@
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
+  # always write the preprocessed file to stdout.
   "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
   IFS=" "
   for arg
   do
     case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
 	set fnord "$@"
 	shift
@@ -498,16 +590,23 @@
 	;;
     esac
   done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::	\1 \\:p' >> "$depfile"
   echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^$.*$$/ s::\1\::p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 none)
   exec "$@"
   ;;
@@ -526,5 +625,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

aMule-2.2.6.tar.bz2/docs/AUTHORS -> aMule-2.3.1.tar.bz2/docs/AUTHORS Changed

@@ -5,17 +5,9 @@
 | Maintainer(s):                                                                   |
 |    Marcelo Jimenez    aka Phoenix           <phoenix@amule.org>                  |
 |    Dévai Tamás        aka GonoszTopi        <gonosztopi@amule.org>               |
+|    Angel Vidal Veiga  aka Kry               <kry@amule.org>                      |
 |                                                                                  |
 | Developer(s):                                                                    |
-|    Ariano Bertacca    aka bootstrap         <ariano@hirnriss.net>                |
-|    Ken Thomases       aka ken               <ken@codeweavers.com>                |
-|    Leonid Froenchenko aka lfroen            <lfroen@gmail.com>                   |
-|    Patrizio Bassi     aka Hetfield          <hetfield@amule.org>                 |
-|    Pedro De Oliveira  aka falso             <falso@rdk.homeip.net>               |
-|    Stefan Baldus      aka stefanero         <stefanero@amule.org>                |
-|    Tobias Ottmar      aka Citroklar         <citroklar@gmx.net>                  |
-|    Emi Rodriguez      aka MalaPraxis        <badpraxis@googlemail.com>           |
-|    Mikkel Schubert    aka Xaignar           <xaignar@amule.org>                  |
 |    Johannes Krampf    aka wuischke          <wuischke@amule.org>                 |
 |    Martin Brieg       aka Stu Redman        <sturedman@amule.org>                |
 |                                                                                  |
@@ -26,6 +18,15 @@
 |    Matt Britt         aka uberpenguin       <uberpenguin@hotpop.com>             |
 |                                                                                  |
 | Former developer(s):                                                             |
+|    Mikkel Schubert    aka Xaignar           <xaignar@amule.org>                  |
+|    Patrizio Bassi     aka Hetfield          <hetfield@amule.org>                 |
+|    Pedro De Oliveira  aka falso             <falso@rdk.homeip.net>               |
+|    Stefan Baldus      aka stefanero         <stefanero@amule.org>                |
+|    Tobias Ottmar      aka Citroklar         <citroklar@gmx.net>                  |
+|    Emi Rodriguez      aka MalaPraxis        <badpraxis@googlemail.com>           |
+|    Ariano Bertacca    aka bootstrap         <ariano@hirnriss.net>                |
+|    Ken Thomases       aka ken               <ken@codeweavers.com>                |
+|    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>          |

aMule-2.2.6.tar.bz2/docs/Changelog -> aMule-2.3.1.tar.bz2/docs/Changelog Changed

@@ -1,3 +1,298 @@
+Version 2.4.0 - The river knows.
+----------
+201?-??-??
+
+--------------------------------------------------------------------------------
+
+Version 2.3.1 - The "unobvious evil date" version.
+----------
+2011-11-11
+
+	btkaos:
+		* Show if a client shares its file list in client view
+
+	freddy77:
+		* Various optimizations of memory usage
+		* Access files for reading/writing via mapped memory
+		  (with custom exception handling)
+		* Fix download of files > 1GB on ucLibc
+		* Fix autogen.sh under Ubuntu
+		* Fixed TCP obfuscation negotiation
+
+	Gnucco:
+		* Add option to ed2k link parser to display links in
+		  emulecollection
+		* Added test case for the CTag class
+
+	GonoszTopi:
+		* Various fixes to new colour code
+		* Allow user to select display of transfer rates
+		* Extendable list-control settings save/load code
+		* Drop assumption that last search keyword is a filename
+		  extension if length == 3
+		* Instead of counting unicode characters in a Kad search now we
+		  use the UTF-8 byte count to determine whether the keyword is
+		  allowed or not
+		* Use actual page size in mmap calls instead of a randomly
+		  selected number
+		* Fix custom Crypto++ path not shown by configure
+		* Make <IMG> tags in aMuleWeb HTML 4.01 conforming
+		* Fix HTTP proxy authentication
+		* Use -static for the tests too, when a static binary is
+		  requested to prevent configure succeed where compilation
+		  would fail
+		* Configure now checks only for the tools and libraries needed
+		  for the selected components
+		* Fix aMuleGUI looking for undefined switches
+		* Fix the "blinking" in aMuleGUI's status line
+		* Better reporting of Kad tag reading/parsing errors
+		* Fix the unittests
+		* Some code reorganization
+		* Features/fixes ported from eMule:
+			- Implement an alternate method to estimate the real
+			  user count in the Kad network, which is not based on
+			  our local routing table (0.49b)
+			- Add double quote to word-boundary characters (0.50a)
+			- Drop support for Kad 1.0 (0.50a)
+			- Try to find the closest node alive (0.50a)
+			- Fix a bug in Kad which would not enforce the search
+			  tolerance in certain cases (0.50a)
+			- Change Kad to work better in small LANs (0.50a)
+		* Remove the unimplemented "Create backup for preview" option
+		* Add variables to preview command like in user event commands
+		* Disable 'Show all comments' in the file's context menu if
+		  there are no comments/ratings available
+		* Enable renaming (completed) shared files
+		* Proper handling of %-escaped UTF-8 sequences in ed2k:// URIs
+		* Drop support for nodes.dat version 0
+		* Fix issue #1621: 'ed2k links containing unicode characters will
+		  cause the filename to be truncated'
+		* Fix issue #1634: Change charset to UTF-8 in amuleweb template
+		* Fix installation with denoiser enabled
+		* Add support for automake's --enable-silent-rules feature
+		  (original idea by Gerd78)
+		* Improved CFormat and enabled reordering of arguments for
+		  translators
+		* Several fixes and improvements for the sanity checker script
+		* Fix bfd detection
+		* Add year bumper script
+		* Move statistics from config to statistics.dat
+		* New preference setting to show application version on the title
+		* Fix man page installation for several languages
+
+	Greek:
+		* Part number is now an extra column in the download list
+		* Improvements to preferences dialogs
+		* Redesign skin selection
+
+	Grunt:
+		* Sort downloads by time remaining now has shortest time on top and unknown on bottom
+
+	jolz:
+		* Fixed file locking between ed2k and aMule on Windows
+
+	Kry:
+		* Reworked user interface, separating download and upload views
+		* Fix list double-buffering causing artifacts on refresh and when
+		  showing a context menu.
+		* Fix indexes after removing GUI items
+		* Fixes to Windows build
+		* Allow compilation with wxCocoa
+		* Replace Color.h by new class implementation MuleColour
+		* Lower class overhead and use two-level cache for pens/brushes
+		* Added aMuleCMD project for MSVC.
+		* Fixed UnitTests and aMuleCMD in MSVC to use _CONSOLE subsystem.
+		* Preferences changes
+		* Fixed problem with uploading to lowid clients (szsuj)
+		* Sorting lists (automatically or by user interaction) doesn't clear selection anymore
+		* Fix client version display for MLdonkeys
+		* Added Xcode project for MacOSX build
+		* Fixed the centering of icons and text
+		* Enable vertical toolbar orientation on WIN32 too
+		* Option to resume next file alphabetically, keeping in mind categories and priority
+		* Fixed crash when column gets removed
+		* Show remote filename in source list
+		* Fixed crash in upload thread on shutdown
+		* Dynamic adjustment of threshold for rarity of download files
+		* Option to prevent the computer from sleeping while downloading in MSW and MacOSX >= 10.5
+		* Mac fixes
+		* Fixed "out of memory" crashes caused by wxWidgets - so wxWidgets 2.8.12 is required now!
+		* Show warning dialog if "Change language" is selected and no languages are installed
+		* Added backtrace support for MacOSX
+		* Add locale support in the mac bundle with updated scripts 
+		  (translations are now supported on MacOSX builds)
+
+	lfroen:
+		* php prefix for lex/yacc
+
+	LittleAbacus:
+		* Search results can now be sorted by "knownness" state.
+
+	marcell:
+		* Fixed issue #892: Show data sizes >= 1.0 GB with three digits.
+		* Fixed search 'Stop' button not stopping Kad searches.
+		* Check Kademlia search results against original criteria.
+		* Allow Kademlia searches with repetitive keywords.
+		* Allow adding current chat partner to friend list from tab's context menu.
+		* Allow not downloading files via HTTP if the requested file is not newer.
+		* Removed white boxes around file rating icons
+		* Implemented public shared directory names only containing actually shared subfolders.
+
+	morph:
+		* Patch to uniform and fix minor errors on man pages
+
+	myth:
+		* Feedback from shared files - add number of clients on queue.
+		* New stats server
+
+	Phoenix:
+		* Fixed assertion when trying to preview files smaller than
+		256 K.
+
+	Skolnick:
+		* Fixed autogen.sh for Bourne Shell
+
+	Stu Redman:
+		* Sort source list on opening and add file name to A4AF files
+		* MSVC: optional GeoIP support
+		* Faster progress bars with less overhead (without pens/brushes)
+		* Show log messages in remote gui
+		* More info in the Kad tab
+		* Improved gaplist performance
+		* Ported chat captchas (receive and send) 
+		  and "Advanced Chat Spam Filter" from eMule
+		* Allow download of multiple search results if search list 
+		  is sorted by status (thanks to DarkNRG)
+		* Fixed CFile::SetLength for large files
+		* Reduce file handle usage by closing part files after idle time
+		* Speed up selection of shared directories with many subdirectories,
+		  fixed red marking of folders with shared subdirectories
+		* Ban clients that uploaded bad data (based on CorruptionBlackBox from eMule)
+		* Support wxWidgets 2.9
+		* amuled for Windows (with wx 2.9)
+		* Friends get recognized in the friend list control even if their IP has changed
+		* Don't kick friend upload, don't kick release prio uploads (unless they take more
+		  than half of the slots), and don't kick anybody else unless necessary (with GonoszTopi)
+		* Fixed crash in remote gui when aMule exits
+		* Added more media file types from eMule
+		* Allow the user to cancel the app if Temp/Incoming is not found
+		* Show downloads as shares in remote gui
+		* MANY fixes/implementations for amulegui
+		* amuleweb for Windows (with wx 2.9)
+		* Show connected friends in blue in the friend list
+		* Show total upload/download ratio in statistic tree
+		* Fixed category administration in remote gui
+		* Implement directory preferences in remote gui
+		* MSVC build for alcc, wxCas
+		* Fixed errors and crashes on parsing ED2K links with '/' in them
+		* Configure option --enable-fileview
+		* Bypass amulegui connection dialog with switch -s / --skip
+		* Fixed Core Timer
+		* Allow passing of ED2K links by command line to aMule, aMuled and aMulegui, making ed2k program obsolete
+		* Don't ignore current category in amulegui when pasting a link
+		* EC tools (amulegui, amulecmd, amuleweb) can use a local config dir now
+		* Fixed crash in file system detection in Solaris
+		* Fix: window size/position didn't get saved on some systems
+		* More command line options for aMulegui
+		* Allow webserver autostart on Windows
+		* Fixed crash in "Out of space" user event handler
+		* ALCC prints links to stdout now instead of stderr
+		* Fixed memory exhaustion on high speed uploads
+		  Thanks to RRM for endless patience!
+		* Fix: Language English was not recognized and so reverted to "System default" at any change
+		* Fixed printf output (unicode2char()) on consoles incapable of UTF8
+		* Keep a list of all canceled files (canceled.met) and show them in magenta in the search list
+		* Update status/color of search results on events from outside the search window
+		  (like download started from EC) and in amulegui
+		* Enable update of IP filter list through aMulegui and aMulecmd
+		* Enable setting of "Check for new version on startup" through aMulegui
+		* Fixed crash in CClientList::ProcessDirectCallbackList that had been around for ages (hopefully)
+		* Fixed size of large files in aMuleweb's search results
+		* Show completed downloads in aMulegui
+		* Fixed international file names on Windows
+		* Fixed hangup of EC connection in aMulegui
+		* Fixed category deletion in aMuled
+		* Fixed several crash bugs in Webserver
+		* Improved memory usage, load time and speed of IP filter
+		* Load IP filter in the background on startup
+		* Show when a Kad search is finished in aMulegui (remove '!')
+		* Fixed "pause/cancel/resume all" in aMulecmd
+		* EC ZLIB compression can now be turned off in remote.conf with EC/ZLIB=0
+		* Terminate HTTP downloads on exit
+		* Projects for Visual Studio 2010
+		* Fixed crash in http download
+		* Speed boost for reload of shared files with large list of known files
+		* Resolve MSVC compilation problem with separate strings in GUI
+		* Fixed splitter bars in download and share view
+		* Allowed creation of ED2K source links in KAD-only mode
+		* Make friendlist in chat window resizable
+		* Removed lag (caused by language pref) when opening preferences dialog
+		* "Swap all A4AF to this (auto)" doesn't block sources with no needed parts any more
+		* Don't lock up in an infinite loop if all servers are not resolvable or blocked by IP filter
+		* Clients now always get uploaded a full chunk (removed setting)
+		* Tell the user that changes of EC settings require a restart
+		* Deleted and readded download now get shared
+		* Speed improvement for upload queue, and clients never have same rank anymore
+		* Fixed ed2k links where '|' has been replaced with '%7C'
+		* Fixed multi line stdin redirected as batch into amulecmd
+		* Allow enable/disable of IP2Country through GUI
+		* "Clear completed" button now only clears downloads in current category
+		* Completed downloads can be seen and cleared in amulegui
+		* Bold lines in log window now for Windows too
+		* Allow setting of friend slot from client list control
+		* Fixed saving of splitter bar positions
+		* Get rid of "clearlooks_style_draw_box_gap" messages in console
+		* Fixed several crash bugs caused by deleted client objects
+		* Fix a small memory leak in Kademlia code
+		* Fix occasionally sending junk at end of packets
+		* Fix child items in search result getting inserted in wrong positions
+		* Shared files don't lose all information when they get renamed
+		* Fixed crash bug with sources which are incompatible with our encryption setting
+		* Allow passing of links > 256 chars to amulecmd
+		* Prevent flicker when sorting already sorted lists
+		* Prevent creation of more than 99 categories, since that's the limit
+		* Fixed saving of sort orders
+		* Allow switching through files in file detail dialog
+		* Improve performance when many small files are hashed
+		* Fix: if a file had more than two copies shared it was hashed on every startup
+		* Show directory in search list for "view shared files" searches
+		* Safe writing of known.met and nodes.dat (don't overwrite existing until write is finished)
+		* Show directory in search list for "view shared files" searches
+
+	Vollstrecker:
+		* Unify copyright lines
+		* Fixed clean and distclean targets for make
+		* Various Updates in debian/ see debian/changelog
+		* Added crash handling in command-line tools
+		* Fix for autoconf-2.64.
+		* Make amulecmd help command work without connection
+		* New translation concept for manpages
+		* KDE Plasma applet to show stats
+		* Fix warnings with latest autoconf (2.67)
+
+	woutermense:
+		* Fix 'break/continue [n]' PHP implementation
+		* Allow multiple download links in webserver
+
+	Wuischke:
+		* Simplify browser selection
+		* Use DoIconize() for dclick on tray icon, too
+		* Fix minimizing from tray icon
+		* Add option to show chat messages in log
+		* Add option to specify amuleweb binary location
+		* Make EC authentication procedure more secure
+		* Add support for categories to ed2k
+		* Backup config file on shutdown
+
+	Special Thanks To:
+		* Greek for his contributions to aMule's user interface.
+		* btkaos for his important work finding the source of bugs.
+		* myth for seeing when everyone else was blind and uncovering
+		  the grandfather of all fuck-ups
+		* mirko.g for being so committed to compile aMule on Snow Leopard.
+
+--------------------------------------------------------------------------------
+
 Version 2.2.6 - The "we don't have holidays" version.
 ----------
 2009-09-16
@@ -99,7 +394,7 @@
 	iz0bbz:
 		* Fixed static linking with GeoIP on MinGW/MSYS.
 		* Fixed detecting GeoIP library when building for MinGW.
-		* Compilation fix with GeoIP-1.4.6.
+		* Compilation fix for GeoIP-1.4.6.
 
 	Stu Redman:
 		* Fix crash on global search on Windows

aMule-2.2.6.tar.bz2/docs/Doxyfile -> aMule-2.3.1.tar.bz2/docs/Doxyfile Changed

@@ -23,7 +23,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.2.6
+PROJECT_NUMBER         = 2.3.1
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
@@ -393,7 +393,7 @@
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = src/muuli_wdr.h src/muuli_wdr.cpp src/CryptoPP.h src/CryptoPP.cpp src/utils
+EXCLUDE                = src/muuli_wdr.h src/muuli_wdr.cpp src/utils
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
 # that are symbolic links (a Unix filesystem feature) are excluded from the input.
@@ -863,13 +863,13 @@
 # compilation will be performed. Macro expansion can be done in a controlled 
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
-MACRO_EXPANSION        = NO
+MACRO_EXPANSION        = YES
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
 # then the macro expansion is limited to the macros specified with the 
 # PREDEFINED and EXPAND_AS_PREDEFINED tags.
 
-EXPAND_ONLY_PREDEF     = NO
+EXPAND_ONLY_PREDEF     = YES
 
 # If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
 # in the INCLUDE_PATH (see below) will be search if a #include is found.
@@ -895,7 +895,7 @@
 # or name=definition (no spaces). If the definition and the = are 
 # omitted =1 is assumed.
 
-PREDEFINED             = 
+PREDEFINED             = WXUNUSED(x)=x
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
 # this tag can be used to specify a list of macro names that should be expanded.

aMule-2.2.6.tar.bz2/docs/Makefile.am -> aMule-2.3.1.tar.bz2/docs/Makefile.am Changed

aMule-2.2.6.tar.bz2/docs/Makefile.in -> aMule-2.3.1.tar.bz2/docs/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +15,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -47,11 +45,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -61,46 +61,89 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(docdir)"
-dist_docDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_doc_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -115,17 +158,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -137,44 +174,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -196,13 +233,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -210,44 +244,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -256,7 +286,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -264,25 +293,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -294,42 +317,50 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = man
 dist_doc_DATA = \
 	ABOUT-NLS \
 	amulesig.txt \
-	amule-win32.HOWTO.txt \
 	Changelog \
-	ED2K-Links.HOWTO \
 	INSTALL \
 	license.txt \
 	README \
 	TODO \
-	EC_Protocol.txt \
-	socks4.protocol
+	EC_Protocol.txt 
 
 EXTRA_DIST = \
 	Doxyfile \
@@ -345,14 +376,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  docs/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  docs/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign docs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -370,24 +401,27 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 install-dist_docDATA: $(dist_doc_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
-	@list='$(dist_doc_DATA)'; for p in $$list; do \
+	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
+	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
-	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
 	done
 
 uninstall-dist_docDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_doc_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
-	done
+	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(docdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -396,7 +430,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -413,16 +447,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -448,16 +481,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -465,14 +498,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -484,81 +517,101 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -569,7 +622,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(docdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -591,6 +644,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -610,18 +664,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-dist_docDATA
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -640,22 +714,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-dist_docDATA uninstall-info-am
+uninstall-am: uninstall-dist_docDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
 	install-am install-data install-data-am install-dist_docDATA \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-html install-html-am install-info install-info-am \
+	install-man install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
 	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-	uninstall-dist_docDATA uninstall-info-am
+	uninstall-dist_docDATA
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.2.6.tar.bz2/docs/README -> aMule-2.3.1.tar.bz2/docs/README Changed

@@ -7,10 +7,10 @@
 
  About
 -------
-  aMule is a multiplatform ed2k client, fork of the eMule client, using the
+  aMule is a multi-platform ed2k client, fork of the eMule client, using the
   wxWidgets class library. It was originally forked from the xMule project,
-  which in turn was forked from the lMule project. This is turn was the first
-  fork of eMule to run nativly on Linux and other Unix-like systems.
+  which in turn was forked from the lMule project. This in turn was the first
+  fork of eMule to run natively on GNU/Linux and other Unix-like systems.
 
 
  Installation
@@ -25,9 +25,9 @@
   - Enter a nickname or leave as the default value.
 
   - Enter the "Download Capacity" and "Upload Capacity" according to your
-    internet connection. All values in aMule are kiloBytes (kB), but your
-    Internet Service Provider's numbers are most likely kiloBits (kb). 
-    
+    Internet connection. All values in aMule are kiloBytes (kB), but your
+    Internet Service Provider's numbers are most likely kiloBits (kb).
+
     8 kiloBits make up 1 kiloByte, so if your Internet Connection is 768kb
     Downstream and 128kb Upstream (i.e. German Telekom DSL), your correct
     values are:
@@ -40,13 +40,13 @@
     know them to determine the following down/upload limits:
 
   - Enter "Download Limit" and "Upload Limit"  (IMPORTANT!)
-    
+
     Download Limit:
         Leave this at 0, which stands for "no limit". However, if aMule uses
         too much bandwidth and causes problems with other applications using
-        your internet connection, it would be a good idea to limit this to
-        aproximetly 80% of your downstream capacity.
- 
+        your Internet connection, it would be a good idea to limit this to
+        approximately 80% of your downstream capacity.
+
     Upload Limit:
         It is recommended that you set this limit to around 80% of your actual
         upstream capacity, in order to avoid degrading the performance of your
@@ -59,7 +59,7 @@
          >= 10      |    No limit
           < 10      |    Upload Limit * 4
           <  4      |    Upload Limit * 3
-          
+
 
     NOTE: 56k Modem users: aMule only accepts integral values for these
           settings, you can't enter 1.6 or whatever your sweet-spot setting
@@ -69,15 +69,15 @@
     As a general rule, set it to 500 - 2000.
 
   - "Maximum Sources per File":
-    This depends on how many files you tend to download at a time, if you 
+    This depends on how many files you tend to download at a time, if you
     tend to download few files, high values are acceptable, otherwise go
     for lower values so that all files will be able to get sources.
 
   - Choose the directories you want to share with other users:
     DO NOT SHARE YOUR COMPLETE HARDDISK!
-    
-    It is suggested that you either use the "Incoming" folder or a seperate
-    folder for the files you wish to share, to avoid inadvertedly sharing
+
+    It is suggested that you either use the "Incoming" folder or a separate
+    folder for the files you wish to share, to avoid inadvertently sharing
     private files.
 
     If you share more than 200 files, you should consider that some servers
@@ -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://www.amule.org/wiki/index.php/Getting_Started
+      http://wiki.amule.org/index.php/Getting_Started
 
     Don't forget to connect to a server, or you probably won't download too much.
 
@@ -100,10 +100,10 @@
   * NEVER run aMule as root.
   * If you are behind a firewall or router, be sure that the ports have been
     opened. The default ports are 4662 (TCP). 4665 (UDP) and 4672 (UDP). If
-    these are blocked, you will receive a "LowID" which results in fewer 
-    availble sources for the files you are downloading.
-  * Obtain an appropriate server.met: e.g., if you are a dialup, using
-    a large server list is not appropiate.
+    these are blocked, you will receive a "LowID" which results in fewer
+    available sources for the files you are downloading.
+  * Obtain an appropriate server.met: e.g., if you are a dial-up, using
+    a large server list is not appropriate.
   * Set your temp and shared directories in Preferences->Directories
     * To recursively select a certain directory, right-click over it.
     * You should *NOT* share
@@ -114,10 +114,10 @@
         private SSH keys, credit card numbers :) are *not* shared. So generally
         do not share your entire home directory, although you might want to
         share some files or directories in it.
-  * Remember that you get certain download priveledges with those clients
+  * Remember that you get certain download privileges with those clients
     (aMule, eMule, etc users) to whom you upload files, in the form of reduced
     queue waits.
-  * Please note that compilation with optimizations is supported. However, if 
+  * Please note that compilation with optimizations is supported. However, if
     you pull a Gentoo, we will probably just tell you to recompile aMule and/or
     your system with sane compiler-flags before we will attempt to address the
     problem.
@@ -125,7 +125,7 @@
 
  Obtaining your first server list
 ----------------------------------
-  Use one of the following links in the "Update server.met from URL" box in 
+  Use one of the following links in the "Update server.met from URL" box in
   the Server tab. They are apparently updated every 20 minutes.
 
   * The current top 50 servers (these fill up fast):
@@ -134,7 +134,7 @@
       http://ocbmaurice.dyndns.org/pl/slist.pl/server.met?download/server-good.met
   * The biggest list (about 300 servers) maintained by the site. Only if you
     have a very decent connection:
-      http://ocbmaurice.dyndns.org/pl/slist.pl/server.met?download/server-max.met 
+      http://ocbmaurice.dyndns.org/pl/slist.pl/server.met?download/server-max.met
   * Should maurice be down for some reasons, use this server.met instead:
       http://www.srv1000.com/azz/server.met
 
@@ -144,12 +144,12 @@
  Tranfers icons
 ----------------
   To find descriptions of the various icons found inside aMule, take a look at
-  http://www.amule.org/wiki/index.php/Getting_Started#Icons_and_What_They_Signify
+  http://wiki.amule.org/index.php/Getting_Started#Icons_and_What_They_Signify
 
 
  License
 ---------
-  aMule -- like eMule -- is released under the GNU General Public License. 
+  aMule -- like eMule -- is released under the GNU General Public License.
   See the "COPYING" file for details.
 
 
@@ -166,7 +166,7 @@
   the server name you are connected to. If they're green, your ID is high. If
   they're yellow, your ID is low.
 
-  
+
   -- What does high and low ID mean anyway? --
 
   When your ID is high (green arrows), everything is fine.
@@ -177,21 +177,21 @@
 
   NOTE: you can also get a low ID when the server you connected to is too busy
   to answer properly, or simply badly configured. When you are sure your
-  settings are ok and you SHOULD have a high ID, connect to another server.
+  settings are OK and you SHOULD have a high ID, connect to another server.
+
 
-  
   -- I'd like to search for specific file types, what filter stands for which files? --
 
-  File Type Extensions found
+  File Type Extensions found (this list is far from being complete)
   --------------------------------------------------------------------
-  Audio         .mp3 .mp2 .mpc .wav .ogg .aac .mp4 .ape .au .wma
-  Video         .avi .mpg .mpeg .ram .rm .vob .divx .mov .ogg .vivo
+  Audio         .mp3 .mp2 .mpc .wav .ogg .flac .aac .ape .au .wma
+  Video         .avi .mpg .mpeg .ram .rm .vob .divx .mov .ogv .webm .vivo
   Program       .exe .com
-  Archive       .zip .rar .ace .tar.gz .tar.bz2 .Z .arj
+  Archive       .zip .rar .ace .tar.gz .tar.bz2 .Z .arj .cbz .cbr
   CDImage       .bin .cue .iso .nrg .ccd .sub .img
   Picture       .jpg .jpeg .bmp .gif .tif .png
 
-  
+
   -- What are all those fancy colors in the download progress bar about? --
 
   Each download in the the transfers window has a coloured bar to show current
@@ -215,7 +215,7 @@
   Learning how the progress bar works will greatly help your understanding
   of the eD2k network.
 
-  
+
   -- Where can I get more information? --
 
   Here are some links that might be of your interest:
@@ -228,7 +228,7 @@
 
   * eMule documents
       http://www.emule-project.net/home/perl/help.cgi
- 
+
 
  Want to help?
 ---------------
@@ -237,10 +237,10 @@
   project in the form of new features, bug fixes, feature requests, etc.
 
   If you are not a programmer you can still contribute by providing good bug
-  reports  when you come accross a problem with aMule. A good bug report gives
+  reports when you come across a problem with aMule. A good bug report gives
   the aMule Team information enough to reproduce the bug (so we can see it in
-  action) and fix it. If possible, try to isolate under which the bug occurs 
-  (eg. does it happen on some specific window, with some specific files, some
+  action) and fix it. If possible, try to isolate under which the bug occurs
+  (e.g. does it happen on some specific window, with some specific files, some
   specific conditions etc.) and provide as much detail as you can in your
   report.
 
@@ -256,12 +256,12 @@
       http://www.amule.org
 
   aMule related links
-      http://www.amule.org/wiki/index.php/FAQ_ed2k
-      http://www.amule.org/wiki/index.php/aMule
-      http://www.amule.org/wiki/index.php/FAQ_aMule
-      http://www.amule.org/wiki/index.php/FAQ_utils
-      http://www.amule.org/wiki/index.php/Getting_Started
-      http://www.amule.org/wiki/index.php/aMule_problems
+      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
 
   wxWidgets toolkit homepage
       http://www.wxwidgets.org
@@ -281,4 +281,4 @@
   illegal activities.
 
 
--- Last modified Sun May 1 13:05:02 CEST 2005 --
+-- Last modified Thu Sep 29 05:22:45 CEST 2011 --

aMule-2.2.6.tar.bz2/docs/README.Mac.txt -> aMule-2.3.1.tar.bz2/docs/README.Mac.txt Changed

@@ -8,11 +8,11 @@
 
 Documentation and help resources:
 ---------------------------------
-The heart of aMule's documentation is the aMule Wiki, which you can find at http://www.amule.org/wiki/index.php/Main_Page. We suggest that you start with the Getting Started Guide (http://www.amule.org/wiki/index.php/Getting_Started) and the aMule FAQ (http://www.amule.org/wiki/index.php/FAQ_aMule). These pages should give you a good idea of how to setup and use aMule.
+The heart of aMule's documentation is the aMule Wiki, which you can find at http://wiki.amule.org/index.php/Main_Page. We suggest that you start with the Getting Started Guide (http://wiki.amule.org/index.php/Getting_Started) and the aMule FAQ (http://wiki.amule.org/index.php/FAQ_aMule). These pages should give you a good idea of how to setup and use aMule.
 
 If you run into any problems you can drop by at the aMule forum (http://forum.amule.org). A lot of questions have already been answered there, so it is always a good idea to start by searching the forum for your particular problem. If you don't find an answer to your problem you can post your problem on the forum and we will do our best to help you out.
 
-The forum and particularly the Mac subsection of the forum (http://forum.amule.org/index.php?board=49) are also good places to look for usage tips and to learn about recent aMule developments (especially look at the sticky threads).
+The forum and particularly the Mac subsection of the forum (http://forum.amule.org/index.php?board=49.0) are also good places to look for usage tips and to learn about recent aMule developments (especially look at the sticky threads).
 
 
 Right-clicking & pop-up menus on the Mac:
@@ -42,7 +42,7 @@
 
 Setting up aMule's video preview feature:
 -----------------------------------------
-You can use a video player like VLC or Mplayer to preview incomplete downloads of video files. To set up aMule properly for this, go to Preferences -> Directories. Under "Video Player", you have to enter "/usr/bin/open -a" together with the path of your video player program.
+You can use a video player like VLC or Mplayer to preview incomplete downloads of video files. To set up aMule properly for this, go to Preferences -> General. Under "Video Player", you have to enter "/usr/bin/open -a" together with the path of your video player program.
 
 For example:
 /usr/bin/open -a "/Applications/VLC.app"

aMule-2.2.6.tar.bz2/docs/Releases.dia -> aMule-2.3.1.tar.bz2/docs/Releases.dia Changed

aMule-2.2.6.tar.bz2/docs/TODO -> aMule-2.3.1.tar.bz2/docs/TODO Changed

aMule-2.2.6.tar.bz2/docs/amulesig.txt -> aMule-2.3.1.tar.bz2/docs/amulesig.txt Changed

aMule-2.2.6.tar.bz2/docs/man/Makefile.am -> aMule-2.3.1.tar.bz2/docs/man/Makefile.am Changed

@@ -1,6 +1,6 @@
 SELECTED_MANPAGES = \
 	$(AMULECMD_MANPAGES) \
-	$(WEB_MANPAGES) \
+	$(WEBSERVER_MANPAGES) \
 	$(AMULE_GUI_MANPAGES) \
 	$(MONOLITHIC_MANPAGES) \
 	$(AMULE_DAEMON_MANPAGES) \
@@ -9,16 +9,18 @@
 EXTRA_DIST = \
 	amule.1 amuled.1 amulecmd.1 amulegui.1 amuleweb.1 ed2k.1 \
 	amule.de.1 amuled.de.1 amulecmd.de.1 amulegui.de.1 amuleweb.de.1 ed2k.de.1 \
-	amule.es.1 amuled.es.1 amulecmd.es.1 amuleweb.es.1 ed2k.es.1 \
-	amule.eu.1 amuled.eu.1 amulecmd.eu.1 amuleweb.eu.1 ed2k.eu.1 \
-	amule.fr.1 amuled.fr.1 amulecmd.fr.1 amuleweb.fr.1 ed2k.fr.1 \
-	amule.hu.1 amuled.hu.1 amulecmd.hu.1 amuleweb.hu.1 ed2k.hu.1 \
-	amule.it.1 amuled.it.1 amulecmd.it.1 amulegui.it.1 amuleweb.it.1 ed2k.it.1
+	amule.es.1 amuled.es.1 amulecmd.es.1 amulegui.es.1 amuleweb.es.1 ed2k.es.1 \
+	amule.fr.1 amuled.fr.1 amulecmd.fr.1 amulegui.fr.1 amuleweb.fr.1 ed2k.fr.1 \
+	amule.hu.1 amuled.hu.1 amulecmd.hu.1 amulegui.hu.1 amuleweb.hu.1 ed2k.hu.1 \
+	amule.it.1 amuled.it.1 amulecmd.it.1 amulegui.it.1 amuleweb.it.1 ed2k.it.1 \
+	amule.ru.1 amuled.ru.1 amulecmd.ru.1 amulegui.ru.1 amuleweb.ru.1 ed2k.ru.1 \
+	amule.tr.1 amuled.tr.1 amulecmd.tr.1 amulegui.tr.1 amuleweb.tr.1 ed2k.tr.1
 
-EXTRA_DIST += \
-	manpages.pot \
-	manpages-de.po
+EXTRA_DIST += po4a.config
 
+EXTRA__DIST__SUBDIRS = po
+
+include $(top_srcdir)/automake/dist-hook.am
 include $(top_srcdir)/automake/manpages.am
 
 MAINTAINERCLEANFILES = Makefile.in

aMule-2.2.6.tar.bz2/docs/man/Makefile.in -> aMule-2.3.1.tar.bz2/docs/man/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -36,6 +34,7 @@
 build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/automake/dist-hook.am \
 	$(top_srcdir)/automake/manpages.am
 subdir = docs/man
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -46,11 +45,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -60,28 +61,26 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -96,17 +95,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -118,44 +111,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -177,13 +170,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -191,44 +181,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -237,7 +223,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -245,25 +230,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -275,32 +254,43 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SELECTED_MANPAGES = \
 	$(AMULECMD_MANPAGES) \
-	$(WEB_MANPAGES) \
+	$(WEBSERVER_MANPAGES) \
 	$(AMULE_GUI_MANPAGES) \
 	$(MONOLITHIC_MANPAGES) \
 	$(AMULE_DAEMON_MANPAGES) \
@@ -309,28 +299,31 @@
 EXTRA_DIST = amule.1 amuled.1 amulecmd.1 amulegui.1 amuleweb.1 ed2k.1 \
 	amule.de.1 amuled.de.1 amulecmd.de.1 amulegui.de.1 \
 	amuleweb.de.1 ed2k.de.1 amule.es.1 amuled.es.1 amulecmd.es.1 \
-	amuleweb.es.1 ed2k.es.1 amule.eu.1 amuled.eu.1 amulecmd.eu.1 \
-	amuleweb.eu.1 ed2k.eu.1 amule.fr.1 amuled.fr.1 amulecmd.fr.1 \
-	amuleweb.fr.1 ed2k.fr.1 amule.hu.1 amuled.hu.1 amulecmd.hu.1 \
-	amuleweb.hu.1 ed2k.hu.1 amule.it.1 amuled.it.1 amulecmd.it.1 \
-	amulegui.it.1 amuleweb.it.1 ed2k.it.1 manpages.pot \
-	manpages-de.po
+	amulegui.es.1 amuleweb.es.1 ed2k.es.1 amule.fr.1 amuled.fr.1 \
+	amulecmd.fr.1 amulegui.fr.1 amuleweb.fr.1 ed2k.fr.1 amule.hu.1 \
+	amuled.hu.1 amulecmd.hu.1 amulegui.hu.1 amuleweb.hu.1 \
+	ed2k.hu.1 amule.it.1 amuled.it.1 amulecmd.it.1 amulegui.it.1 \
+	amuleweb.it.1 ed2k.it.1 amule.ru.1 amuled.ru.1 amulecmd.ru.1 \
+	amulegui.ru.1 amuleweb.ru.1 ed2k.ru.1 amule.tr.1 amuled.tr.1 \
+	amulecmd.tr.1 amulegui.tr.1 amuleweb.tr.1 ed2k.tr.1 \
+	po4a.config
+EXTRA__DIST__SUBDIRS = po
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/automake/manpages.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/automake/dist-hook.am $(top_srcdir)/automake/manpages.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  docs/man/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  docs/man/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/man/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign docs/man/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -348,7 +341,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -357,33 +350,38 @@
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../automake
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 check-am: all-am
 check: check-am
 all-am: Makefile
@@ -408,6 +406,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -427,6 +426,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -434,13 +435,30 @@
 install-data-am:
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
+install-dvi-am:
 
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -459,20 +477,34 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am \
-	install-data-hook install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+.MAKE: install-am install-data-am install-strip uninstall-am
+
+.PHONY: all all-am check check-am clean clean-generic dist-hook \
+	distclean distclean-generic distdir dvi dvi-am html html-am \
+	info info-am install install-am install-data install-data-am \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-hook \
-	uninstall-info-am
-
+	pdf-am ps ps-am uninstall uninstall-am uninstall-hook
+
+dist-hook:
+	test -z "$(EXTRA__DIST__SUBDIRS)" || \
+	for d in $(EXTRA__DIST__SUBDIRS) ; do \
+		mkdir $(distdir)/$$d ; \
+		for f in `find $(srcdir)/$$d -name '.svn' -prune -o -printf "%P\n"` ; do \
+			if test -d $(srcdir)/$$d/$$f ; then \
+				mkdir $(distdir)/$$d/$$f ; \
+			else \
+				cp -p $(srcdir)/$$d/$$f $(distdir)/$$d/$$f ; \
+			fi ; \
+		done ; \
+	done
 install-data-hook:
 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
 	for file in $(SELECTED_MANPAGES); do \
@@ -510,6 +542,7 @@
 			rm -f $(DESTDIR)$(mandir)/$$locale/man1/$$inst ; \
 		fi; \
 	done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/docs/man/amule.1 -> aMule-2.3.1.tar.bz2/docs/man/amule.1 Changed

@@ -1,39 +1,77 @@
-.TH AMULE 1 "September 2009" "aMule v2.2.6" "aMule"
+.TH AMULE 1 "November 2011" "aMule v2.3.1" "aMule"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NAME
 amule \- the all\-platform eMule p2p client
 .SH SYNOPSIS
-.B amule
-.RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-i ]
+.B_untranslated amule
+.RB [ \-c " " \fI<path> ]
 .RB [ \-geometry " " \fI<geom> ]
-.RB [ \-d ]
-.RB [ \-o ]
-.RB [ \-r ]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+.RB [ \-w " " \fI<path> ]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+.RB [ \-t " " \fI<num> ]
+.RI [ eD2k-link ]
+
+.B_untranslated amule
+.RB_untranslated [ \-v ]
+
+.B_untranslated amule
+.RB_untranslated [ \-h ]
+
 .SH DESCRIPTION
 .TP
-\fB\-v\fR, \fB\-\-version\fR
-Displays the current version number.
+\fB[ \-c\fR \fI<path>\fR, \fB\-\-config\-dir\fR=\fI<path>\fR \fB]\fR
+Read config from \fI<path>\fR instead of home
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-Prints a short usage description.
+\fB[ \-geometry \fI<geom>\fR \fB]\fR
+Sets the geometry of the app. \fI<geom>\fR uses the same format as standard X11 apps:	[\fB=\fR][\fI<width>\fR{\fBxX\fR}\fI<height>\fR][{\fB+-\fR}\fI<xoffset>\fR{\fB+-\fR}\fI<yoffset>\fR]
 .TP
-\fB-i\fR, \fB\-\-enable\-stdin\fR
-Does not disable stdin.
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Prints log messages to stdout.
 .TP
-\fB\-geometry\fR \fI<geom>\fR
-Sets the geometry of the app.
-\fI<geom>\fR uses the same format as standard X11 apps:	[\fB=\fR][\fI<width>\fR{\fBxX\fR}\fI<height>\fR][{\fB+-\fR}\fI<xoffset>\fR{\fB+-\fR}\fI<yoffset>\fR]
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Resets config to default values.
+.TP
+\fB[ \-w\fR \fI<path>\fR, \fB\-\-use\-amuleweb\fR=\fI<path>\fR \fB]\fR
+Specify location of amuleweb binary to \fI<path>\fR.
 .TP
-\fB\-d\fR, \fB\-\-disable\-fatal\fR
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
 Does not handle fatal exception.
 .TP
-\fB\-o\fR, \fB\-\-log\-stdout\fR
-Prints log messages to stdout.
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+Does not disable stdin.
 .TP
-\fB\-r\fR, \fB\-\-reset\-config\fR
-Resets config to default values.
-\
+\fB[ \-t\fR, \fB\-\-category\fR=\fI<num>\fR \fB]\fR
+Set category for passed eD2k links to \fI<num>\fR
+.TP
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Displays the current version number.
+.TP
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Prints a short usage description.
+.TP
+\fB[ eD2k-link ]\fR
+Adds an eD2k-link to the core.
+.PP
+The eD2k link to be added can be:
+.RS 3
+.IP \(bu 2
+a file link (ed2k://|file|...), it will be added to the download queue;
+.IP \(bu 2
+a server link (ed2k://|server|...), it will be added to the server list;
+.IP \(bu 2
+a serverlist link, in which case all servers in the list will be added to the server list;
+.IP \(bu 2
+a magnet link.
+.RE
+.SH NOTES
+.SS Paths
+For all options which take a \fI<path>\fR value, if the \fIpath\fR contains no
+directory part (i.e. just a plain filename), then it is considered to be under
+the aMule configuration directory, \fI~/.aMule\fR.
 .SH FILES
 ~/.aMule/*
 .SH REPORTING BUGS
@@ -42,4 +80,6 @@
 .SH COPYRIGHT
 aMule and all of its related utilities are distributed under the GNU General Public License.
 .SH SEE ALSO
-\fBalc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH AUTHOR
+This manpage was written by Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amule.de.1 -> aMule-2.3.1.tar.bz2/docs/man/amule.de.1 Changed

@@ -3,46 +3,98 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH AMULE 1 "Januar 2007" "aMule v2.2.0" aMule
+.TH AMULE 1 "November 2011" "aMule v2.3.1" aMule
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NAME
 amule \- der alle\-Plattformen eMule p2p Client
 .SH SYNTAX
-\fBamule\fP [\fB\-v\fP] [\fB\-h\fP] [\fB\-i\fP] [\fB\-geometry\fP \fI<geom>\fP] [\fB\-d\fP]
-[\fB\-o\fP] [\fB\-r\fP]
+.B_untranslated amule
+[\fB\-c\fP \fI<Pfad>\fP] [\fB\-geometry\fP \fI<geom>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<Pfad>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<num>\fP] [\fIeD2k\-link\fP]
+
+.B_untranslated amule
+.RB_untranslated [ \-v ]
+
+.B_untranslated amule
+.RB_untranslated [ \-h ]
+
 .SH BESCHREIBUNG
 .TP 
-\fB\-v\fP, \fB\-\-version\fP
-Zeigt die derzeitige Versionsnummer an.
+\fB[ \-c\fP \fI<Pfad>\fP, \fB\-\-config\-dir\fP=\fI<Pfad>\fP \fB]\fP
+Liest die Konfiguration <Pfad> anstelle des Home.
 .TP 
-\fB\-h\fP, \fB\-\-help\fP
-Gibt eine kurze Beschreibung aus.
+\fB[ \-geometry \fP\fI<geom>\fP \fB]\fP
+Gibt die Größe des Programmfensters an. \fI<geom>\fP hat das selbe
+Format wie Standard X11
+Anwendungen:	[\fB=\fP][\fI<Breite>\fP{\fBxX\fP}\fI<Höhe>\fP][{\fB+\-\fP}\fI<xOffset>\fP{\fB+\-\fP}\fI<yOffset>\fP]
 .TP 
-\fB\-i\fP, \fB\-\-enable\-stdin\fP
-Schaltet stdin nicht ab.
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Schreibt Log\-Meldungen auf die Standardausgabe.
 .TP 
-\fB\-geometry\fP \fI<geom>\fP
-Gibt die Geometrie des Programms an.  \fI<geom>\fP benutzt das selbe
-Format wie Standard X11
-Anwendungen	[\fB=\fP][\fI<Breite>\fP{\fBxX\fP}\fI<Höhe>\fP][{\fB+\-\fP}\fI<xoffset>\fP{\fB+\-\fP}\fI<yoffset>\fP]
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Setzt die Konfiguration auf die Standardwerte zurück.
+.TP 
+\fB[ \-w\fP \fI<Pfad>\fP, \fB\-\-use\-amuleweb\fP=\fI<Pfad>\fP \fB]\fP
+Setzt den Ort der ausführbaren Datei von amuleweb auf \fI<Pfad>\fP.
 .TP 
-\fB\-d\fP, \fB\-\-disable\-fatal\fP
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
 Fehlerbehandlung für fatale Fehler abschalten.
 .TP 
-\fB\-o\fP, \fB\-\-log\-stdout\fP
-Gibt Log\-Meldungen auf der Standardausgabe aus.
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+Schaltet die Standardeingabe nicht ab.
 .TP 
-\fB\-r\fP, \fB\-\-reset\-config\fP
-Setzt die Konfiguration auf die Standardwerte zurück.
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<Num>\fP \fB]\fP
+Setzt die Kategorie für den übergebenen eD2k Verweis \fI<Num>\fP
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Zeigt die derzeitige Versionsnummer an.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Gibt eine kurze Nutzungsbeschreibung aus.
+.TP 
+\fB[ eD2k\-link ]\fP
+Fügt einen eD2k\-Verweis zur Downloadliste hinzu.
+.PP
+Der eD2k\-Verweis darf enthalten:
+.RS 3
+.IP \(bu 2
+ein Link zu einer Datei (ed2k://|file|...), dieser wird Downloadliste
+hinzugefügt;
+.IP \(bu 2
+ein Link zu einem Server (ed2k://|server|...), dieser wird der Serverliste
+hinzugefügt;
+.IP \(bu 2
+ein Serverlisten\-Verweis, in diesem Fall werden alle Server dieser Liste der
+Serverliste hinzugefügt;
+.IP \(bu 2
+ein Magnet Verweis.
+.RE
+.SH ANMERKUNGEN
+.SS Pfade
+Für alle Optionen die ein \fI<Pfad>\fP Argument erwarten, wenn der
+\fIPfad\fP kein Verzeichnis enthält(z.B. nur einen Dateinamen), dann wird
+angenommen, diese Datei liegt um aMule\-Konfigurationsverzeichnis,
+\fI~/.aMule\fP.
 .SH DATEIEN
 ~/.aMule/*
 .SH "FEHLER MELDEN"
 Bitte meldet Fehler entweder in unserem Forum (\fIhttp://forum.amule.org/\fP),
 oder in unseren Bugtracker (\fIhttp://bugs.amule.org/\fP). Bitte meldet uns
-keine Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
+weder Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
 Teammitglieder.
 .SH COPYRIGHT
 aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU
 General Public License
 .SH "SIEHE AUCH"
-\fBalc\fP(1), \fBalcc\fP(1), \fBamuled\fP(1), \fBamulecmd\fP(1), \fBamulegui\fP(1),
-\fBamuleweb\fP(1), \fBcas\fP(1), \fBed2k\fP(1), \fBwxcas\fP(1), \fBxas\fP(1)
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH VERFASSER
+Diese manpage wurde geschrieben von Vollstrecker
+<amule@vollstreckernet.de>
+
+Diese manpage wurde übersetzt von Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amule.es.1 -> aMule-2.3.1.tar.bz2/docs/man/amule.es.1 Changed

@@ -1,40 +1,97 @@
-.TH AMULE 1 "Marzo 2005" "aMule v2.0.0" "aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULE 1 "November 2011" "aMule v2.3.1" aMule
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOMBRE
-amule \- Cliente P2P clon de eMule multi-plataforma.
+amule \-cliente p2p multiplataforma basado en eMule
 .SH SINOPSIS
-.B amule
-.RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-i ]
-.RB [ \-geometry " " \fI<geom> ]
-.RB [ \-d ]
-.RB [ \-o ]
-.SH DESCRIPCIÓN
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Muestra la versión del programa.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Muestra esta información.
-.TP
-\fB-i\fR, \fB\-\-enable\-stdin\fR
-Deja activa la entrada estándar.
-.TP
-\fB\-geometry\fR \fI<geom>\fR
-Establece el tamaño de la aplicación.
-\fI<geom>\fR usa el mismo formato que las aplicaciones X11 estándar:	[\fB=\fR][\fI<anchura>\fR{\fBxX\fR}\fI<altura>\fR][{\fB+-\fR}\fI<posx>\fR{\fB+-\fR}\fI<posy>\fR]
-.TP
-\fB\-d\fR, \fB\-\-disable\-fatal\fR
-Ignora las señales de "Fatal exception".
-.TP
-\fB-o\fR, \fB\-\-log\-stdout\fR
-Muestra en consola las lineas de log.
+.B_untranslated amule
+[\fB\-c\fP \fI<path>\fP] [\fB\-geometry\fP \fI<geom>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<path>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<num>\fP] [\fIeD2k\-link\fP]
+
+.B_untranslated amule
+.RB_untranslated [ \-v ]
+
+.B_untranslated amule
+.RB_untranslated [ \-h ]
+
+.SH DESCRIPCIÃN
+.TP 
+\fB[ \-c\fP \fI<path>\fP, \fB\-\-config\-dir\fP=\fI<path>\fP \fB]\fP
+Leer configuraciÃ³n desde \fI<path>\fP en lugar de home
+.TP 
+\fB[ \-geometry \fP\fI<geom>\fP \fB]\fP
+Fija la geometrÃa de la aplicaciÃ³n. \fI<geom>\fP usa el mismo formato
+estÃ¡ndar de las aplicaciones
+X11:	[\fB=\fP][\fI<width>\fP{\fBxX\fP}\fI<height>\fP][{\fB+\-\fP}\fI<xoffset>\fP{\fB+\-\fP}\fI<yoffset>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Imprime mensajes de registro en la salida estÃ¡ndar
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Reiniciar configuracion a valores por defecto
+.TP 
+\fB[ \-w\fP \fI<path>\fP, \fB\-\-use\-amuleweb\fP=\fI<path>\fP \fB]\fP
+Especifica ubicacion del binario amuleweb en \fI<path>\fP.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
+No maneja excepciÃ³n grave
+.TP 
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+No deshabilitar entrada estÃ¡ndar
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<num>\fP \fB]\fP
+Fijar categorÃa para enlace eD2k pasado a \fI<num>\fP
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Mostrar el nÃºmero de la versiÃ³n actual.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Imprime una breve descripciÃ³n de uso.
+.TP 
+\fB[ eD2k\-link ]\fP
+AÃ±adir un enlace eD2k al nÃºcleo.
+.PP
+El enlace eD2k para ser aÃ±adido puede ser:
+.RS 3
+.IP \(bu 2
+un enlace de archivo (ed2k://|archivo|...), serÃ¡ aÃ±Ã¡dido a la cola de
+descarga.
+.IP \(bu 2
+un enlace de servidor (ed2k://|servidor|...), serÃ¡ aÃ±Ã¡dido a la cola de
+servidores.
+.IP \(bu 2
+un enlace de lista de servidores, en cuyo caso todos los servidores de la
+lista serÃ¡n aÃ±adidos a la lista de servidores.
+.IP \(bu 2
+un enlace magnet.
+.RE
+.SH NOTAS
+.SS Rutas
+Todas las opciones que tengan \fI<path>\fP como valor, si \fIpath\fP
+contiene un directorio sin part (p.e. solo un archivo normal), entones se
+tomarÃ¡ el directorio de la configuraciÃ³n, \fI~/.aMule\fP.
 .SH ARCHIVOS
 ~/.aMule/*
-.SH BUGS
-Si descubre bugs, por favor comuníquelos en (\fIhttp://forum.amule.org/\fR), o en nuestro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Por favor, no comunique bugs por e-mail, ni a nuestro maillist ni directamente a ningún miembro del equipo de aMule.
+.SH "INFORMANDO ERRORES"
+Por favor informa de fallos ya sea en nuestro foro
+(\fIhttp://forum.amule.org/\fP), o en nuestro bugtracker
+(\fIhttp://bugs.amule.org/\fP). Por favor no informe de fallos por correo, ni
+en nuestras listas, ni directamente al correo de algun miembro del equipo.
 .SH COPYRIGHT
-aMule, y todas las utilidades que con el vienen, se distribuyen bajo la licencia GPL.
-.SH VER
-\fBalc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+aMule y todas las demÃ¡s utilidades relacionadas son distribuidas bajo la GNU
+General Public License.
+.SH "VEASE TAMBIEN"
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH AUTOR
+Esta pÃ¡gina de manualfue escrita por Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amule.fr.1 -> aMule-2.3.1.tar.bz2/docs/man/amule.fr.1 Changed

@@ -1,42 +1,98 @@
-.TH AMULE 1 "Mars 2005" "aMule v2.0.0" "aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULE 1 "Novembre 2011" "aMule v2.3.1" aMule
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOM
-amule, le client p2p eMule \-multi\- platforme
+amule \- le client P2P eMule multiplateforme
 .SH SYNOPSIS
-.B amule
-.RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-i ]
-.RB [ \-geometry " " \fI<geom> ]
-.RB [ \-d ]
-.RB [ \-o ]
+.B_untranslated amule
+[\fB\-c\fP \fI<chemin>\fP] [\fB\-geometry\fP \fI<gÃ©om>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<chemin>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<num>\fP] [\fIlien eD2k\fP]
+
+.B_untranslated amule
+.RB_untranslated [ \-v ]
+
+.B_untranslated amule
+.RB_untranslated [ \-h ]
+
 .SH DESCRIPTION
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Afficher les informations sur la version courante.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Afficher l'aide d'utilisation.
-.TP
-\fB-i\fR, \fB\-\-enable\-stdin\fR
-Ne pas désactiver stdin.
-.TP
-\fB\-geometry\fR \fI<geom>\fR
-Fixer la géometrie de l'application.
-\fI<geom>\fR utilise le meme format que les applications X11 standards:	[\fB=\fR][\fI<largeur>\fR{\fBxX\fR}\fI<hauteur>\fR][{\fB+-\fR}\fI<xoffset>\fR{\fB+-\fR}\fI<yoffset>\fR]
-.TP
-\fB\-d\fR, \fB\-\-disable\-fatal\fR
+.TP 
+\fB[ \-c\fP \fI<chemin>\fP, \fB\-\-config\-dir\fP=\fI<chemin>\fP \fB]\fP
+Utiliser le fichier de config \fI<chemin>\fP Ã  la place de celui par
+dÃ©faut
+.TP 
+\fB[ \-geometry \fP\fI<gÃ©om>\fP \fB]\fP
+Fixer la gÃ©ometrie de l'application. \fI<gÃ©om>\fP utilise le meme
+format que les applications X11 standards
+:	[\fB=\fP][\fI<largeur>\fP{\fBxX\fP}\fI<hauteur>\fP][{\fB+\-\fP}\fI<xoffset>\fP{\fB+\-\fP}\fI<yoffset>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Afficher les messages du journal sur stdout.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+RÃ©initialiser la configuration par dÃ©faut.
+.TP 
+\fB[ \-w\fP \fI<chemin>\fP, \fB\-\-use\-amuleweb\fP=\fI<chemin>\fP \fB]\fP
+PrÃ©ciser l'emplacement du binaire d'amuleweb \fI<chemin>\fP.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
 Ne pas prendre en charge une exception fatale.
-.TP
-\fB-o\fR, \fB\-\-log\-stdout\fR
-Afficher les messages de log sur stdout.
+.TP 
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+Ne pas dÃ©sactiver stdin.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<num>\fP \fB]\fP
+DÃ©finir la catÃ©gorie pour les liens eD2k passÃ© Ã   \fI<num>\fP
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Affiche le numÃ©ro de la version actuelle.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Afficher une court description d'utilisation.
+.TP 
+\fB[ lien eD2k ]\fP
+Ajoute un lien eD2k au noyau.
+.PP
+Le lien eD2k Ã  ajouter peut Ãªtre :
+.RS 3
+.IP \(bu 2
+un lien fichier (ed2k://|fichier|â¦), il sera ajoutÃ© Ã  la file de
+tÃ©lÃ©chargement;
+.IP \(bu 2
+un lien serveur (ed2k://|serveur|â¦), il sera ajoutÃ© Ã  la liste des serveurs;
+.IP \(bu 2
+un lien de liste de serveurs, dans ce cas tous les serveurs dans la liste
+seront ajoutÃ©s Ã  la liste des serveurs;
+.IP \(bu 2
+un lien magnÃ©tique.
+.RE
+.SH NOTES
+.SS Chemins
+Pour toutes les options prenant en paramÃ¨tre un \fI<chemin>\fP, si le
+\fIchemin\fP ne contient pas de rÃ©pertoire (i.e. juste un nom de fichier),
+alors il sera considÃ©rÃ© comme Ã©tant dans le rÃ©pertoire de configuration
+d'aMule, \fI~/.aMule\fP.
 .SH FICHIERS
 ~/.aMule/*
-.SH SIGNALEMENT DES BUGS
-Reportez les bugs sur notre forum (\fIhttp://forum.amule.org/\fR), ou dans notre bugtracker (\fIhttp://bugs.amule.org/\fR).
-N'utilisez ni un e-mail, ni notre liste de diffusion ni ne reportez directement un bug à un membre de notre equipe.
+.SH "RAPPORTER DES BOGUES"
+Veuillez rapporter les bogues sur notre forum (\fIhttp://forum.amule.org/\fP),
+ou sur notre bugtracker (\fIhttp://bugs.amule.org/\fP).  Veuillez ne pas
+rapporter les bogues par e\-mail, sur notre liste de diffusion ou directement
+Ã  n'importe quel membre  de l'Ã©quipe.
 .SH COPYRIGHT
-aMule et tous les utilitaires associés sont distribués sous licence GNU General Public License.
-.SH VOIR AUSSI
-\fBalc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
-.SH TRADUCTION
-ThePolish, 2005
+aMule et tout ses outils sont distribuÃ©s sous la licence GNU General Public
+License.
+.SH "VOIR AUSSI"
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH AUTEUR
+Cette manpage a Ã©tÃ© Ã©crite par Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amule.hu.1 -> aMule-2.3.1.tar.bz2/docs/man/amule.hu.1 Changed

@@ -1,42 +1,99 @@
-.TH AMULE 1 "2005 március" "aMule v2.0.0" "aMule"
-.SH NÉV
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULE 1 "2011. november" "aMule v2.3.1" aMule
+.als B_untranslated B
+.als RB_untranslated RB
+.SH NÃV
 amule \- a "minden\-platform" eMule p2p kliens
-.SH ÁTTEKINTÉS
-.B amule
-.RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-i ]
-.RB [ \-geometry " " \fI<geom> ]
-.RB [ \-d ]
-.RB [ \-o ]
-.SH LEÍRÁS
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Megjeleníti a verzió információt.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Ezt a súgót jeleníti meg.
-.TP
-\fB-i\fR, \fB\-\-enable\-stdin\fR
-Nem zárja le a szabvány bemenetet (stdin).
-.TP
-\fB\-geometry\fR \fI<geom>\fR
-Beállítja az alkalmazás geometriáját.
-A \fI<geom>\fR paraméte ugyanazt a formátumot használja, mint a többi X11 alkalmazás: [\fB=\fR][\fI<szélesség>\fR{\fBxX\fR}\fI<magasság>\fR][{\fB+-\fR}\fI<xpozíció>\fR{\fB+-\fR}\fI<ypozíció>\fR]
-.TP
-\fB\-d\fR, \fB\-\-disable\-fatal\fR
-Nem kezeli a végzetes kivételeket.
-.TP
-\fB-o\fR, \fB\-\-log\-stdout\fR
-A szabvány kimenetre írja a napló üzeneteket.
-.SH FÁJLOK
+.SH ÃTTEKINTÃS
+.B_untranslated amule
+[\fB\-c\fP \fI<Ãºtvonal>\fP] [\fB\-geometry\fP \fI<geom>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<fÃ¡jl>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<szÃ¡m>\fP] [\fIeD2k\-hivatkozÃ¡s\fP]
+
+.B_untranslated amule
+.RB_untranslated [ \-v ]
+
+.B_untranslated amule
+.RB_untranslated [ \-h ]
+
+.SH LEÃRÃS
+.TP 
+\fB[ \-c\fP \fI<Ãºtvonal>\fP, \fB\-\-config\-dir\fP=\fI<Ãºtvonal>\fP \fB]\fP
+A beÃ¡llÃtÃ¡sokat az \fI<Ãºtvonal>\fP\-bÃ³l olvassa az alapÃ©rtelmezett
+helyett.
+.TP 
+\fB[ \-geometry \fP\fI<geom>\fP \fB]\fP
+BeÃ¡llÃtja az alkalmazÃ¡s geometriÃ¡jÃ¡t. A \fI<geom>\fP paramÃ©ter ugyanazt
+a formÃ¡tumot hasznÃ¡lja, mint a tÃ¶bbi X11
+alkalmazÃ¡s:	[\fB=\fP][\fI<szÃ©lessÃ©g>\fP{\fBxX\fP}\fI<magassÃ¡g>\fP][{\fB+\-\fP}\fI<xpozÃciÃ³>\fP{\fB+\-\fP}\fI<ypozÃciÃ³>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+A naplÃ³ bejegyzÃ©seket a szabvÃ¡ny kimenetre Ãrja.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+BeÃ¡llÃtÃ¡sok visszaÃ¡llÃtÃ¡sa az alapÃ©rtelmezett Ã©rtÃ©kekre.
+.TP 
+\fB[ \-w\fP \fI<fÃ¡jl>\fP, \fB\-\-use\-amuleweb\fP=\fI<fÃ¡jl>\fP \fB]\fP
+Az amuleweb programnak \fI<fÃ¡jl>\fP\-t fogja hasznÃ¡lni.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
+Nem kezeli a vÃ©gzetes kivÃ©teleket.
+.TP 
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+Nem zÃ¡rja le a szabvÃ¡ny bemenetet.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<szÃ¡m>\fP \fB]\fP
+A megadott eD2k hivatkozÃ¡st a \fI<szÃ¡m>\fP\-adik kategÃ³riÃ¡ba tÃ¶lti.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+MegjelenÃti a verziÃ³szÃ¡mot.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Egy rÃ¶vid hasznÃ¡lati leÃrÃ¡st jelenÃt meg.
+.TP 
+\fB[ eD2k\-hivatkozÃ¡s ]\fP
+eD2k hivatkozÃ¡s letÃ¶ltÃ©se.
+.PP
+Az eD2k hivatkozÃ¡s a kÃ¶vetkezÅ lehet:
+.RS 3
+.IP \(bu 2
+egy fÃ¡jl hivatkozÃ¡s (ed2k://|file|...), ez a letÃ¶ltÃ©si sorhoz lesz
+hozzÃ¡adva;
+.IP \(bu 2
+egy kiszolgÃ¡lÃ³ hivatkozÃ¡s (ed2k://|server|...), ez a kiszolgÃ¡lÃ³\-listÃ¡hoz
+lesz hozzÃ¡adva;
+.IP \(bu 2
+egy kiszolgÃ¡lÃ³\-lista hivatkozÃ¡s, mely esetben a listÃ¡ban szereplÅ Ã¶sszes
+kiszolgÃ¡lÃ³ a kiszolgÃ¡lÃ³\-listÃ¡hoz adÃ³dik;
+.IP \(bu 2
+egy magnet hivatkozÃ¡s.
+.RE
+.SH MEGJEGYZÃSEK
+.SS "ElÃ©rÃ©si utak"
+Minden olyan opciÃ³nÃ¡l amely \fI<fÃ¡jl>\fP paramÃ©tert kÃ©r, ha a megadott
+\fIfÃ¡jl\fP nem tartalmaz kÃ¶nyvtÃ¡r komponenst (vagyis tisztÃ¡n csak egy fÃ¡jlnÃ©v),
+akkor azt az aMule konfigurÃ¡ciÃ³s kÃ¶nyvtÃ¡rÃ¡ban (\fI~/.aMule\fP) fogja keresni.
+.SH FÃJLOK
 ~/.aMule/*
-.SH HIBÁK JELENTÉSE
-A hibákat kérjük vagy a fórumon (\fIhttp://forum.amule.org/\fR), vagy a hibakövetõben (\fIhttp://bugs.amule.org/\fR) jelentsék.
-Hibákról kérjük ne írjanak levelet (e-mail-t) se a levelzési listára, se közvetlenül valamelyik fejlesztõnek.
+.SH "HIBÃK JELENTÃSE"
+A hibÃ¡kat kÃ©rjÃ¼k vagy a fÃ³rumon (\fIhttp://forum.amule.org/\fP), vagy a
+hibakÃ¶vetÅben (\fIhttp://bugs.amule.org/\fP) jelentsÃ©k. HibÃ¡krÃ³l kÃ©rjÃ¼k ne
+Ãrjanak levelet (e\-mail\-t) se a levelezÃ©si listÃ¡ra, se kÃ¶zvetlenÃ¼l
+valamelyik fejlesztÅnek.
 .SH COPYRIGHT
-Az aMule és az összes hozzá tartozó segédprogram a GNU General Public Licence védelme alatt áll.
-.SH LÁSD MÉG
-\fBalc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
-.SH MAGYAR FORDÍTÁS
-Dévai Tamás <gonosztopi@amule.org>
+Az aMule Ã©s az Ã¶sszes hozzÃ¡ tartozÃ³ segÃ©dprogram a GNU General Public
+License vÃ©delme alatt Ã¡ll.
+.SH "LÃSD MÃG"
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH SZERZÅ
+Ezt a kÃ©zikÃ¶nyv lapot Vollstrecker <amule@vollstreckernet.de> Ãrta.
+.SH MAGYAR FORDÃTÃS
+DÃ©vai TamÃ¡s <gonosztopi@amule.org>

aMule-2.2.6.tar.bz2/docs/man/amule.it.1 -> aMule-2.3.1.tar.bz2/docs/man/amule.it.1 Changed

@@ -1,45 +1,101 @@
-.TH AMULE 1 "Settembre 2009" "aMule v2.2.6" "aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULE 1 "Novembre 2011" "aMule v2.3.1" aMule
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOME
-amule \- the all\-platform eMule p2p client
+amule \- il client p2p multipiattaforma basato su eMule
 .SH SINTASSI
-.B amule
-.RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-i ]
-.RB [ \-geometry " " \fI<geom> ]
-.RB [ \-d ]
-.RB [ \-o ]
-.RB [ \-r ]
+.B_untranslated amule
+[\fB\-c\fP \fI<percorso>\fP] [\fB\-geometry\fP \fI<geometria>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<percorso>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<numero>\fP] [\fIcollegamento\-eD2k\fP]
+
+.B_untranslated amule
+.RB_untranslated [ \-v ]
+
+.B_untranslated amule
+.RB_untranslated [ \-h ]
+
 .SH DESCRIZIONE
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Mostra il numero di versione attuale.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Stampa una breve descrizione di utilizzo.
-.TP
-\fB-i\fR, \fB\-\-enable\-stdin\fR
-Non disabilita stdin.
-.TP
-\fB\-geometry\fR \fI<geom>\fR
-Imposta la geometria dell'applicazione.
-\fI<geom>\fR uses the same format as standard X11 apps:	[\fB=\fR][\fI<width>\fR{\fBxX\fR}\fI<height>\fR][{\fB+-\fR}\fI<xoffset>\fR{\fB+-\fR}\fI<yoffset>\fR]
-.TP
-\fB\-d\fR, \fB\-\-disable\-fatal\fR
+.TP 
+\fB[ \-c\fP \fI<percorso>\fP, \fB\-\-config\-dir\fP=\fI<percorso>\fP \fB]\fP
+Legge la configurazione dal \fI<percorso>\fP invece che dalla directory
+dell'utente.
+.TP 
+\fB[ \-geometry \fP\fI<geometria>\fP \fB]\fP
+Imposta la geometria della applicazione. \fI<geometria>\fP usa lo
+stesso formato delle applicazioni X11 standard:
+	[\fB=\fP][\fI<larghezza>\fP{\fBxX\fP}\fI<altezza>\fP][{\fB+\-\fP}\fI<spostamentox>\fP{\fB+\-\fP}\fI<spostamentoy>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Scrive i messaggi di log nello stdout.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Reimposta la configurazione ai valori di default.
+.TP 
+\fB[ \-w\fP \fI<percorso>\fP, \fB\-\-use\-amuleweb\fP=\fI<percorso>\fP \fB]\fP
+Specifica la posizione dell'eseguibile di amuleweb in \fI<percorso>\fP.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
 Non gestisce le eccezioni fatali.
-.TP
-\fB\-o\fR, \fB\-\-log\-stdout\fR
-Stampa messaggi di log in stdout.
-.TP
-\fB\-r\fR, \fB\-\-reset\-config\fR
-Reimposta la configurazione ai valori predefiniti.
-\
+.TP 
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+Non disabilita lo stdin.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<numero>\fP \fB]\fP
+Imposta la categoria per i collegamenti eD2k ricevuti a \fI<numero>\fP
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Visualizza il numero di versione corrente.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Visualizza una breve descrizione dell'utilizzo.
+.TP 
+\fB[ collegamento\-eD2k ]\fP
+Aggiunge un collegamento eD2k.
+.PP
+Il collegamento eD2k da aggiungere può essere:
+.RS 3
+.IP \(bu 2
+un collegamento a un file (ed2k://|file|...), sarà aggiunto alla coda di
+download;
+.IP \(bu 2
+un collegamento a un server (ed2k://|server|...), sarà aggiunto alla lista
+dei server;
+.IP \(bu 2
+un collegamento a una lista di server, nel cui caso tutti i server inclusi
+nella lista verranno aggiunti alla lista dei server;
+.IP \(bu 2
+un collegamento magnet.
+.RE
+.SH NOTE
+.SS Percorsi
+Per tutte le opzioni che accettano un \fI<percorso>\fP, se il
+\fIpercorso\fP non contiene una directory (ossia è solo un nome di file),
+allora si assume che esso sia presente nella directory di configurazione di
+aMule, \fI~/.aMule\fP.
 .SH FILE
 ~/.aMule/*
-.SH SEGNALARE BUG
-Per piacere segnala bug sia sul nostro forum (\fIhttp://forum.amule.org/\fR), sia nel nostro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Per paicere non segnalare bug tramite e-mail, nè tramite la nostra mailing list e neppure direttamente a qualsiasi membro della squadra.
+.SH "SEGNALARE I BUG"
+Per favore segnalare i bug nel nostro forum (\fIhttp://forum.amule.org/\fP) o
+nel nostro bugtracker (\fIhttp://bugs.amule.org/\fP). Per favore non segnalare
+i bug via posta elettronica, né nella nostra mailing list né direttamente a
+qualunque membro del gruppo.
 .SH COPYRIGHT
-aMule e tutte le sue utilità relative sono distribuite sotto la GNU General Public License.
-.SH CONSULTA ANCHE
-\fBalc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+aMule e tutti i programmi di utilità correlati sono distribuiti in accordo
+alla GNU General Public License.
+.SH "VEDI ANCHE"
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH AUTORE
+Questa pagina del manuale è stata scritta da Vollstrecker
+<amule@vollstreckernet.de>
+.SH TRADUZIONE ITALIANA
+Stefano Corti <iz0bbz@libero.it>

aMule-2.3.1.tar.bz2/docs/man/amule.ru.1 Added

@@ -0,0 +1,96 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULE 1 "November 2011" "aMule v2.3.1" aMule
+.als B_untranslated B
+.als RB_untranslated RB
+.SH ИМЯ
+amule \- мультиплатформенный p2p клиент eMule
+.SH ОБЗОР
+.B_untranslated amule
+[\fB\-c\fP \fI<путь>\fP] [\fB\-geometry\fP \fI<геометрия>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<путь>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<номер>\fP] [\fIeD2k\-ссылка\fP]
+
+.B_untranslated amule
+.RB_untranslated [ \-v ]
+
+.B_untranslated amule
+.RB_untranslated [ \-h ]
+
+.SH ОПИСАНИЕ
+.TP 
+\fB[ \-c\fP \fI<путь>\fP, \fB\-\-config\-dir\fP=\fI<путь>\fP \fB]\fP
+Прочитать конфигурацию из места, указанного в \fI<пути>\fP, вместо
+домашнего каталога
+.TP 
+\fB[ \-geometry \fP\fI<геометрия>\fP \fB]\fP
+Указать геометрию окна. \fI<Геометрия>\fP использует стандартный формат
+X11:	[\fB=\fP][\fI<ширина>\fP{\fBxX\fP}\fI<высота>\fP][{\fB+\-\fP}\fI<смещениеX>\fP{\fB+\-\fP}\fI<смещениеY>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Печатает сообщения лога в стандартный вывод.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Сбрасывает конфигурацию в изначальную.
+.TP 
+\fB[ \-w\fP \fI<путь>\fP, \fB\-\-use\-amuleweb\fP=\fI<путь>\fP \fB]\fP
+Указать \fI<путь>\fP к исполняемому файлу amuleweb.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
+Не обрабатывать фатальные исключительные ситуации.
+.TP 
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+Не отключать стандартный ввод.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<номер>\fP \fB]\fP
+Указать \fI<номер>\fP категории для eD2k ссылок.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Выводит информацию о версии.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Выводит короткую помощь по использованию.
+.TP 
+\fB[ eD2k\-ссылка ]\fP
+Передает eD2k\-ссылку в ядро.
+.PP
+Добавляемая eD2k\-ссылка может быть:
+.RS 3
+.IP \(bu 2
+файловая ссылка (ed2k://|file|...), она будет добавлена в очередь закачки;
+.IP \(bu 2
+серверная ссылка (ed2k://|server|...), она будет добавлена в список
+серверов;
+.IP \(bu 2
+ссылка на список серверов, тогда все сервера из списка будут добавлены в
+список серверов;
+.IP \(bu 2
+magnet\-ссылка.
+.RE
+.SH ЗАМЕЧАНИЯ
+.SS Пути
+Для всех опций, в которых указывается \fI<путь>\fP, если \fIпуть\fP не
+содержит каталога (т.е. только имя самого файла), то предполагается, что
+файл находится в каталоге конфигурации, \fI~/.aMule\fP.
+.SH ФАЙЛЫ
+~/.aMule/*
+.SH "СООБЩЕНИЕ ОБ ОШИБКАХ"
+Пожалуйста, сообщайте об ошибках либо на нашем форуме
+(\fIhttp://forum.amule.org/\fP), либо в багтрекере
+(\fIhttp://bugs.amule.org/\fP). Пожалуйста, не сообщайте об ошбках по
+электронной почте, по нашим спискам рассылки, или напрямую участникам.
+.SH "АВТОРСКИЕ ПРАВА"
+aMule и все прилагающиеся инструменты распространаются под Открытым
+Лицензионным Соглашением GNU (GNU GPL).
+.SH "СМ. ТАКЖЕ"
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH АВТОРЫ
+Автор страницы помощи: Vollstrecker <amule@vollstreckernet.de>,
+перевод: Radist Morse <radist.morse@gmail.com>

aMule-2.3.1.tar.bz2/docs/man/amule.tr.1 Added

@@ -0,0 +1,96 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULE 1 "Kasım 2011" "aMule v2.3.1" aMule
+.als B_untranslated B
+.als RB_untranslated RB
+.SH İSİM
+amule \- her platformda çalışan eMule p2p istemcisi
+.SH KULLANIM
+.B_untranslated amule
+[\fB\-c\fP \fI<yol>\fP] [\fB\-geometry\fP \fI<geom>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<yol>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<sayı>\fP] [\fIeD2k\-bağlantısı\fP]
+
+.B_untranslated amule
+.RB_untranslated [ \-v ]
+
+.B_untranslated amule
+.RB_untranslated [ \-h ]
+
+.SH AÇIKLAMA
+.TP 
+\fB[ \-c\fP \fI<yol>\fP, \fB\-\-config\-dir\fP=\fI<yol>\fP \fB]\fP
+Yapılandırmayı home yerine \fI<yol>\fPdan oku
+.TP 
+\fB[ \-geometry \fP\fI<geom>\fP \fB]\fP
+Uygulamanın geometrisini düzenler. \fI<geom>\fP standart X11
+uygulamaları ile aynı biçimi
+kullanır:	[\fB=\fP][\fI<genişlik>\fP{\fBxX\fP}\fI<yükseklik>\fP][{\fB+\-\fP}\fI<xoffset>\fP{\fB+\-\fP}\fI<yoffset>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Log mesajlarını standart çıktıya gönderir.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Yapılandırmayı varsayılan değerlere sıfırlar.
+.TP 
+\fB[ \-w\fP \fI<yol>\fP, \fB\-\-use\-amuleweb\fP=\fI<yol>\fP \fB]\fP
+amuleweb çalıştırılabilir dosyasının konumunu \fI<yol>\fP olarak
+belirler.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
+Kritik istisnaları ele almaz.
+.TP 
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+standart girdiyi devre dışı bırakmaz.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<sayı>\fP \fB]\fP
+\fI<sayı>\fPya gönderilen eD2k bağlantılarının kategorilerini belirler.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Geçerli sürüm numarasını görüntüler.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Kısa bir kullanım açıklaması görüntüler.
+.TP 
+\fB[ eD2k\-bağlantısı ]\fP
+Çekirdeğe bir eD2k bağlantısı ekler.
+.PP
+Eklenecek eD2k bağlantısı şunlardan biri olabilir:
+.RS 3
+.IP \(bu 2
+bir dosya bağlantısı (ed2k://|file|...) ki indirmeler kuyruğuna eklenir;
+.IP \(bu 2
+bir sunucu bağlantısı (ed2k://|server|...) ki sunucu listesine eklenir;
+.IP \(bu 2
+bir sunucu listesi bağlantısı, bu durumda listedeki tüm sunucular sunucu
+listesine eklenir;
+.IP \(bu 2
+bir magnet bağlantısı.
+.RE
+.SH NOTLAR
+.SS Yollar
+\fI<yol>\fP değeri alan  tüm seçenekler için eğer \fIyol\fP hiçbir dizin
+içermiyorsa (yani sadece bir dosya ismiyse) aMule yapılandırma dizini
+(\fI~/.aMule\fP) varsayılır.
+.SH DOSYALAR
+~/.aMule/*
+.SH GERİBİLDİRİM
+Hataları bildirmek için forumumuzu (\fIhttp://forum.amule.org/\fP) ya da hata
+takipçimizi (\fIhttp://bugs.amule.org/\fP) kullanınız. Hataları bildirmek için
+e\-mail ve e\-mail listemizi kullanmamanızı ve geliştiricilerden birine
+doğrudan bildirmemenizi rica ederiz.
+.SH "TELİF HAKKI"
+aMule ve ilgili tüm yardımcı araçları GNU Genel Kamu Lisansı çerçevesinde
+dağıtılmaktadır.
+.SH "İLGİLİ BELGELER"
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH YAZAN
+Bu kılavuz sayfası Vollstrecker <amule@vollstreckernet.de>
+tarafından yazılmıştır.

aMule-2.2.6.tar.bz2/docs/man/amulecmd.1 -> aMule-2.3.1.tar.bz2/docs/man/amulecmd.1 Changed

@@ -1,238 +1,240 @@
-.TH AMULECMD 1 "September 2009" "aMuleCmd v2.2.6" "aMule utilities"
+.TH AMULECMD 1 "November 2011" "aMuleCmd v2.3.1" "aMule utilities"
+.als B_untranslated B
+.als RB_untranslated RB
+.als SS_untranslated SS
 .SH NAME
 amulecmd \- Console-based program to control aMule
 .SH SYNOPSIS
-.B amulecmd
+.B_untranslated amulecmd
 .RB [ \-h " " \fI<host> ]
 .RB [ \-p " " \fI<port> ]
-.RB [ \-P " " \fI<passwd> ]
+.RB [ \-P " " \fI<password> ]
 .RB [ \-f " " \fI<path> ]
-.RB [ \-q ]
-.RB [ \-v ]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
 .RB [ \-l " " \fI<lang> ]
-.RB [ \-w ]
-.RB [ \-c " " \fI<command> ]
-.PP
-.B amulecmd
-.B \-\-create-config-from=\fI<path>
-.PP
-.B amulecmd
-.RB [ \-\-help ]
-.PP
-.B amulecmd
-.RB [ \-\-version ]
+.RB { " " [ \-w ] " " | " " [ \-c " " \fI<command> ] " " }
+
+.B_untranslated amulecmd
+.RB [ \-\-create\-config\-from = \fI<path> ]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-help ]
 .SH DESCRIPTION
-\fBamulecmd\fR is a console-based client to control aMule.
+.B amulecmd
+is a console-based client to control aMule.
 .TP
-\fB\-h\fR, \fB\-\-host\fR=\fI<host>\fR
+\fB[ \-h\fR \fI<host>\fR, \fB\-\-host\fR=\fI<host>\fR \fB]\fR
 Host where aMule is running (default: \fIlocalhost\fR).
 \fI<host>\fR might be an IP address or a DNS name
 .TP
-\fB\-p\fR, \fB\-\-port\fR=\fI<port>\fR
+\fB[ \-p\fR \fI<port>\fR, \fB\-\-port\fR=\fI<port>\fR \fB]\fR
 aMule's port for External Connections, as set in Preferences->Remote Controls (default: \fI4712\fR)
 .TP
-\fB\-P\fR, \fB\-\-password\fR=\fI<passwd>\fR
-External Connections password
+\fB[ \-P\fR \fI<password>\fR, \fB\-\-password\fR=\fI<password>\fR \fB]\fR
+External Connections password.
 .TP
-\fB\-f\fR, \fB\-\-config\-file\fR=\fI<path>\fR
+\fB[ \-f\fR \fI<path>\fR, \fB\-\-config\-file\fR=\fI<path>\fR \fB]\fR
 Use the given configuration file.
 Default configuration file is \fI~/.aMule/remote.conf\fR
 .TP
-\fB\-q\fR, \fB\-\-quiet\fR
-Do not print any output to stdout. This seems to be a very much useless option with \fBamulecmd\fR.
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Do not print any output to stdout.
 .TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Be verbose \- show also debug messages
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Be verbose \-
+show also debug messages.
 .TP
-\fB\-l\fR, \fB\-\-locale\fR=\fI<lang>\fR
+\fB[ \-l\fR \fI<lang>\fR, \fB\-\-locale\fR=\fI<lang>\fR \fB]\fR
 Sets program locale (language).
-See section \fBLANGUAGES\fR for the description of the \fI<lang>\fR parameter.
+See the \fBNOTES\fR section for the description of the \fI<lang>\fR parameter.
 .TP
-\fB\-w\fR, \fB\-\-write\-config\fR
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
 Write command line options to config file and exit
 .TP
-\fB\-c\fR, \fB\-\-command\fR=\fI<command>\fR
+\fB[ \-c\fR \fI<command>\fR, \fB\-\-command\fR=\fI<command>\fR \fB]\fR
 Execute \fI<command>\fR as if it was entered at amulecmd's prompt and exit.
 .TP
-\fB\-\-create\-config\-from\fR=\fI<path>\fR
-Create config file based upon \fI<path>\fR, which must point to a valid aMule config file, and then exit
-.TP
-\fB\-\-help\fR
-Prints a short usage description.
+\fB[ \-\-create\-config\-from\fR=\fI<path>\fR \fB]\fR
+Create config file based upon \fI<path>\fR, which must point to a valid aMule config file, and then exit.
 .TP
-\fB\-\-version\fR
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
 Displays the current version number.
+.TP
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Prints a short usage description.
 .SH COMMANDS
 All commands are case insensitive.
-.SS \fBAdd\fR <ed2k-link>
-Adds an ed2k-link to the core.
+.SS Add \fI<eD2k-link>\fP | \fI<magnet-link>\fP
+Adds an eD2k-link or a magnet-link to the core.
 
-The ed2k link to be added can be:
-.br
-*) a file link (ed2k://|file|...), it will be added to the download queue;
-.br
-*) a server link (ed2k://|server|...), it will be added to the server list;
-.br
-*) or a serverlist link, in which case all servers in the list will be added to the server list.
+The eD2k link to be added can be:
+.RS 3
+.IP \(bu 2
+a file link (ed2k://|file|...), it will be added to the download queue;
+.IP \(bu 2
+a server link (ed2k://|server|...), it will be added to the server list;
+.IP \(bu 2
+a serverlist link, in which case all servers in the list will be added to the server list.
+.RE
 
-This command must have an argument.
-.SS \fBCancel\fR <hash>
-Cancels the download specified by hash. To get the hash use \fIshow\fR.
-.SS \fBConnect\fR (kad|ed2k<ip|name>)
+The magnet link must contain the eD2k hash and file length.
+.SS Cancel \fI<hash>\fP | \fI<number>\fP
+Cancels the download specified by \fI<hash>\fR or \fI<number>\fR. To get the value use \fBshow\fR.
+.SS Connect [ \fIkad\fP | \fIed2k\fP | \fI<ip|name>\fP ]
 Connect to the network.
 
 This will connect to all networks that are enabled in Preferences.
 
-When giving ed2k as parameter, it connects only to ed2k-network to servers in your
-serverlist. You may also optionally specify a server address in IP:Port form, to
-connect to that server only. The IP must be a dotted decimal IPv4 address, or a
-resolvable DNS name.
-
-When giving kad, it connects to Kad only.
-.SS \fBDisconnect\fR (ed2k|kad)
-
+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.
+.SS_untranslated Disconnect [ \fIed2k\fP | \fIkad\fP ]
 Disconnect from all networks you are connected to, or just disconnect from the
 specified network.
-.SS \fBDownload\fR num
+.SS Download \fI<number>\fP
 Start downloading a file.
 
-The number of a file from the last search has to be given.
-Example: 'download 12' will start to download the file with the number 12 of the
+The \fI<number>\fR of a file from the last search has to be given.
+Example: `download 12' will start to download the file with the number 12 of the
 previous search.
-
-This command must have an argument.
-.SS \fBExit\fR
+.SS_untranslated Exit
 Disconnect from amule/amuled and quit amulecmd.
-.SS \fBGet\fR value
+.SS Get \fI<what>\fP
 Get and display a preference value.
 
-This command is incomplete, available values are listed below.
-
-Available values to get:
-.br
-BwLimits	Get bandwidth limits.
-.br
-IPFilter	Get IPFilter preferences.
-.SS \fBHelp\fR <command>
-Get a short help.
+Available values for \fI<what>\fR:
+.RS
+.IP BwLimits 10
+Get bandwidth limits.
+.IP IPFilter 10
+Get IPFilter preferences.
+.RE
+.SS Help [ \fI<command>\fP ]
+Prints a short usage description.
 If called without parameter, it shows a list of available commands.
-If called with <command>, it shows a short description of the given command.
-.SS \fBPause\fR <hash>
-Pauses the download specified by hash. To get the hash use \fIshow\fR.
-.SS \fBProgress\fR
-Shows the progress of an on\-going search.
+If called with \fI<command>\fR, it shows a short description of the given command.
+.SS Pause \fI<hash>\fP | \fI<number>\fP
+Pauses the download specified by \fI<hash>\fR or \fI<number>\fR. To get the value use \fBshow\fR.
+.SS Priority \fI<priority>\fP \fI<hash>\fP | \fI<number>\fP
+Set priority of a download specified by \fI<hash>\fR or \fI<number>\fR.
 
-This command can't have an argument.
-.SS \fBQuit\fR
-Exits the App.
-
-This command can't have an argument.
-.SS \fBReload\fR
+Available values for \fI<priority>\fR:
+.RS
+.IP Auto 10
+Automatic priority.
+.IP High 10
+High priority.
+.IP Low 10
+Low priority.
+.IP Normal 10
+Normal priority.
+.RE
+.SS_untranslated Progress
+Shows the progress of an on\-going search.
+.SS_untranslated Quit
+A synonim of the \fBexit\fR command.
+.SS Reload \fI<what>\fP
 Reloads a given object.
 
-This command is incomplete, available values are listed below.
-
-Available values to get:
-.br
-BwLimits	Reload bandwidth limits.
-.br
-IPFilter	Reload IPFilter preferences.
-.SS \fBReset\fR
+Available values for \fI<what>\fR:
+.RS
+.IP Shared 10
+Reload shared files list.
+.IP IPFilter 10
+Reload IP filter tables.
+.RE
+.SS_untranslated Reset
 Reset the log.
-
-This command can't have an argument.
-.SS Results\fR
+.SS_untranslated Results
 Shows you the results of the last search.
+.SS Resume \fI<hash>\fP | \fI<number>\fP
+Resumes the download specified by \fI<hash>\fR or \fI<number>\fR. To get the value use \fBshow\fR.
+.SS Search \fI<type>\fP \fI<keyword>\fR
+Makes a search for the given \fI<keyword>\fR. A search type and a keyword to search is mandatory to do this.
+Example: `search kad amule' performs a kad search for `amule'.
 
-This command can't have an argument.
-.SS \fBResume\fR <hash>
-Resumes the download specified by hash. To get the hash use \fIshow\fR.
-.SS \fBSearch\fR global|kad|local file
-Makes a search for the given file. A searchtype and a file to search is mandatory
-to do this.
-\fIExample\fR 'search kad amule' performs a kad search for amule.
-
-Available searchtypes:
-.br
-global	performs a global search
-.br
-kad	performs a search on kad network
-.br
-local	performs a local search
-.SS \fBSet\fR <value>
+Available search types:
+.RS
+.IP Global 10
+Performs a global search.
+.IP Kad 10
+Performs a search on the Kademlia network.
+.IP Local 10
+Performs a local search.
+.RE
+.SS Set \fI<what>\fR
 Sets a given preferences value.
 
-This command is incomplete, available values are listed below.
-
-Available values to get:
-.br
-BwLimits	Set bandwidth limits.
-.br
-IPFilter	Set IPFilter preferences.
-.SS \fBShow\fR DL|Log|Servers|UL
+Available values for \fI<what>\fR:
+.RS
+.IP BwLimits 10
+Set bandwidth limits.
+.IP IPFilter 10
+Set IPFilter preferences.
+.RE
+.SS Show \fI<what>\fR
 Shows upload/download queue, servers list or shared files list.
 
-This command must have an argument.
-
-This command is incomplete, you must use one of the extensions below.
-
-Available extensions:
-.br
-DL		Show download queue.
-.br
-Log		Show log.
-.br
-Servers	Show servers list.
-.br
-UL		Show upload queue.
-.SS \fBShutdown\fR
+Available values for \fI<what>\fR:
+.RS
+.IP DL 10
+Show download queue.
+.IP Log 10
+Show log.
+.IP Servers 10
+Show servers list.
+.IP UL 10
+Show upload queue.
+.RE
+.SS_untranslated Shutdown
 Shutdown the remote running core (amule/amuled).
-This will also shut down the text client, since it is unusable without a running
-core.
-
-This command can't have an argument.
-.SS \fBStatistics\fR <num>
+This will also shut down the text client, since it is unusable without a running core.
+.SS Statistics [ \fI<number>\fP ]
 Show statistics tree.
 
-The optional number in the range of 0-255 can be passed as argument to this
+The optional \fI<number>\fR in the range of 0-255 can be passed as argument to this
 command, which tells how many entries of the client version subtree should be
-shown. Passing 0, or omitting it means 'unlimited'.
+shown. Passing 0, or omitting it means `unlimited'.
 
-\fIExample:\fR 'statistics 5' will show only the top 5 versions for each client
+Example: `statistics 5' will show only the top 5 versions for each client
 type.
-.SS \fBStatus\fR
+.SS_untranslated Status
 Show connection status, current up/download speeds, etc.
-.PP
 .SH NOTES
 .SS Paths
 For all options which take a \fI<path>\fR value, if the \fIpath\fR contains no
 directory part (i.e. just a plain filename), then it is considered to be under
 the aMule configuration directory, \fI~/.aMule\fR.
-.SS LANGUAGES
+.SS Languages
 The \fI<lang>\fR parameter for the \fB\-l\fR option has the following form: \fIlang\fR[\fB_\fILANG\fR][\fB.\fIencoding\fR][\fB@\fImodifier\fR]
 where \fIlang\fR is the primary language, \fILANG\fR is a sublanguage/territory,
 \fIencoding\fR is the character set to use and \fImodifier\fR
-"allows the user to select a specific instance of localization data within a
-single category".
-.PP
+allows the user to select a specific instance of localization data within a
+single category.
+
 For example, the following strings are valid:
+.RS
+.RB_untranslated de
 .br
-de
-.br
-de_DE
+.RB_untranslated de_DE
 .br
-de_DE.iso88591
+.RB_untranslated de_DE.iso88591
 .br
-de_DE@euro
+.RB_untranslated de_DE@euro
 .br
-de_DE.iso88591@euro
-.PP
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
 Though all the above strings are accepted as valid language definitions,
 \fIencoding\fR and \fImodifier\fR are yet unused.
-.PP
+
 In addition to the format above, you can also specify full language names in
-English - so \fB\-l german\fR is also valid and is equal to \fB-l de_DE\fR.
-.PP
+English - so \fB\-l german\fR is also valid and is equal to \fB\-l de_DE\fR.
+
 When no locale is defined, either on command-line or in config file, system
 default language will be used.
 .SH FILES
@@ -247,9 +249,9 @@
 \fBamulecmd\fR \fB\-\-create-config-from\fR=\fI/home/username/.aMule/amule.conf\fR
 .PP
 These will save settings to \fI$HOME/.aMule/remote.conf\fR, and later you only need to type:
-.PP
-.B amulecmd
-.PP
+
+.B_untranslated amulecmd
+
 Of course, you don't have to follow this example.
 .SH REPORTING BUGS
 Please report bugs either on our forum (\fIhttp://forum.amule.org/\fR), or in our bugtracker (\fIhttp://bugs.amule.org/\fR).
@@ -257,4 +259,6 @@
 .SH COPYRIGHT
 aMule and all of its related utilities are distributed under the GNU General Public License.
 .SH SEE ALSO
-\fBamule\fR(1), \fBamuleweb\fR(1)
+.B_untranslated amule\fR(1), \fBamuled\fR(1)
+.SH AUTHOR
+This manpage was written by Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amulecmd.de.1 -> aMule-2.3.1.tar.bz2/docs/man/amulecmd.de.1 Changed

@@ -3,244 +3,259 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH AMULECMD 1 "Januar 2007" "aMuleCmd v2.2.0" "aMule Hilfsprogramme"
+.TH AMULECMD 1 "November 2011" "aMuleCmd v2.3.1" "aMule Hilfsprogramme"
+.als B_untranslated B
+.als RB_untranslated RB
+.als SS_untranslated SS
 .SH NAME
 amulecmd \- Konsolenbasiertes Programm um aMule zu steuern
 .SH SYNTAX
-\fBamulecmd\fP [\fB\-h\fP \fI<Host>\fP] [\fB\-p\fP \fI<Port>\fP] [\fB\-P\fP
-\fI<Passwort>\fP] [\fB\-f\fP \fI<Pfad>\fP] [\fB\-q\fP] [\fB\-v\fP] [\fB\-l\fP
-\fI<Sprache>\fP] [\fB\-w\fP] [\fB\-c\fP \fI<Befehl>\fP]
-.PP
-\fBamulecmd\fP \fB\-\-create\-config\-from=\fP\fI<Pfad>\fP
-.PP
-\fBamulecmd\fP [\fB\-\-help\fP]
-.PP
-\fBamulecmd\fP [\fB\-\-version\fP]
+.B_untranslated amulecmd
+[\fB\-h\fP \fI<Host>\fP] [\fB\-p\fP \fI<Port>\fP] [\fB\-P\fP
+\fI<Passwort>\fP] [\fB\-f\fP \fI<Pfad>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<Sprache>\fP] {\fB \fP[\fB\-w\fP]\fB \fP|\fB \fP[\fB\-c\fP
+\fI<Befehl>\fP]\fB \fP}
+
+.B_untranslated amulecmd
+[\fB\-\-create\-config\-from\fP=\fI<Pfad>\fP]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-help ]
 .SH BESCHREIBUNG
-\fBamulecmd\fP ist ein Konsolenbasierter Client um aMule zu steuern.
+\fBamulecmd\fP ist ein Konsolenprogramm zur Steuerung von aMule.
 .TP 
-\fB\-h\fP, \fB\-\-host\fP=\fI<Host>\fP
-Host auf dem aMule läuft (standard: \fIlocalhost\fP).  \fI<Host>\fP kann
-eine IP Adresse oder ein DNS Name sein
+\fB[ \-h\fP \fI<Host>\fP, \fB\-\-host\fP=\fI<Host>\fP \fB]\fP
+Der Rechner auf dem aMule läuft (Standard: \fIlocalhost\fP).  \fI<Host>\fP
+kann eine IP\-Adresse oder ein DNS\-Name sein.
 .TP 
-\fB\-p\fP, \fB\-\-port\fP=\fI<Port>\fP
+\fB[ \-p\fP \fI<Port>\fP, \fB\-\-port\fP=\fI<Port>\fP \fB]\fP
 aMule's Port für Externe Verbindungen, wie in den Optionen
 unter\->Fernsteuerung (Standard: \fI4712\fP) eingestellt.
 .TP 
-\fB\-P\fP, \fB\-\-password\fP=\fI<Passwort>\fP
+\fB[ \-P\fP \fI<Passwort>\fP, \fB\-\-password\fP=\fI<Passwort>\fP \fB]\fP
 Passwort für Externe Verbindungen.
 .TP 
-\fB\-f\fP, \fB\-\-config\-file\fP=\fI<Pfad>\fP
+\fB[ \-f\fP \fI<Pfad>\fP, \fB\-\-config\-file\fP=\fI<Pfad>\fP \fB]\fP
 Benutzt die angegebene Konfigurationsdatei. Die Standardkonfigurationsdatei
 ist \fI~/.aMule/remote.conf\fP
 .TP 
-\fB\-q\fP, \fB\-\-quiet\fP
-Gebe nichts auf stdout aus. Dies scheint eine sehr nutzlose Options in
-\fBamulecmd\fP.
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Keine Ausgabe auf stdout ausgeben.
 .TP 
-\fB\-v\fP, \fB\-\-verbose\fP
-Sei gesprächig \- zeigt auch debugging Meldungen an.
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Sei gesprächig \- Gebe auch Debuggingausgaben aus
 .TP 
-\fB\-l\fP, \fB\-\-locale\fP=\fI<Sprache>\fP
-Setzt die Locale (Sprache) des Programms. Siehe Abschnitt \fBSPRACHEN\fP für
-die Beschreibung des \fI<Sprache>\fP Parameter.
+\fB[ \-l\fP \fI<Sprache>\fP, \fB\-\-locale\fP=\fI<Sprache>\fP \fB]\fP
+Setzt die Lokale (Sprache) des Programms.  Siehe Abschnitt \fBANMERKUNGEN\fP
+für die Beschreibung des \fI<Sprache>\fP Parameters.
 .TP 
-\fB\-w\fP, \fB\-\-write\-config\fP
-Schreibe die Kommandozeilenoptionen in die Konfigurationsdatei und beende
-dich wieder.
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+Schreibe die Kommandozeilenoptionen in die Konfigurationsdatei und kehre zur
+Shell zurück.
 .TP 
-\fB\-c\fP, \fB\-\-command\fP=\fI<Befehl>\fP
+\fB[ \-c\fP \fI<Befehl>\fP, \fB\-\-command\fP=\fI<Befehl>\fP \fB]\fP
 Führe \fI<Befehl>\fP aus, als wäre es auf amulecmd's
 Eingabeaufforderung eingegeben worden, und beende dich.
 .TP 
-\fB\-\-create\-config\-from\fP=\fI<Pfad>\fP
-Erstelle Konfigurationsdatei basierend auf \fI<Pfad>\fP, welcher auf
-eine gültige aMule\-Konfigurationsdatei verweisen muss, und beende dich.
-.TP 
-\fB\-\-help\fP
-Gibt eine kurze Beschreibung aus.
+\fB[ \-\-create\-config\-from\fP=\fI<Pfad>\fP \fB]\fP
+Konfigurationsdatei basierend auf \fI<Pfad>\fP, welche auf eine gültige
+aMule Konfigurationsdatei verweisen muss, erstellen und danach beenden.
 .TP 
-\fB\-\-version\fP
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
 Zeigt die derzeitige Versionsnummer an.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Gibt eine kurze Nutzungsbeschreibung aus.
 .SH BEFEHLE
 Alle Befehle können groß oder klein geschrieben werden.
-.SS "Add\fR <ed2k\-Link>\fP"
-Fügt einen ed2k\-Link zur Downloadliste hinzu.
+.SS "Add \fI<eD2k\-Verweis>\fP | \fI<Magnet\-Verweis>\fP"
+Fügt einen eD2k\- oder Magnetverweis dem Kern hinzu.
 
-Der ed2k\-Link darf enthalten:
-.br
-*) einen Link zu einer Datei (ed2k://|file|...), diese wird den Downloads
-hinzugefügt,
-.br
-*) einen Link zu einem Server (ed2k://|server|...), dieser wird der
-Serverliste hinzugefügt,
-.br
-*) oder einen Serverlisten\-Link, in diesem Fall werden alle Server dieser
-Liste der Serverliste hinzugefügt.
+Der eD2k\-Verweis darf enthalten:
+.RS 3
+.IP \(bu 2
+ein Link zu einer Datei (ed2k://|file|...), dieser wird Downloadliste
+hinzugefügt;
+.IP \(bu 2
+ein Link zu einem Server (ed2k://|server|...), dieser wird der Serverliste
+hinzugefügt;
+.IP \(bu 2
+eine Serverlisten\-Verweis, in diesem Fall werden alle Server dieser Liste
+der Serverliste hinzugefügt.
+.RE
 
-Dieser Befehl muss ein Argument übergeben bekommen.
-.SS "Cancel\fR <Hash>\fP"
-Bricht den mit seinem Hash spezifizierten Download ab. Benutze \fIshow\fP um
-den Hash zu erfahren.
-.SS "Connect\fR (kad|ed2k<IP|Name>)\fP"
+Der Magnet Verweis muss die eD2k Prüfsumme und die Dateigröße enthalten.
+.SS "Cancel \fI<Pfrüfsumme>\fP | \fI<Nummer>\fP"
+Bricht den Download, der mit \fI<Prüfsumme>\fP oder \fI<Nummer>\fP
+angegeben wurde, ab. Benutze \fBshow\fP um den Wert zu erfahren.
+.SS "Connect [ \fIkad\fP | \fIed2k\fP | \fI<IP|Name>\fP ]"
 Verbindung zu einem Netzwerk aufbauen.
 
 Die Verbindung wird zu allen Netzwerken aufgebaut, die in den Einstellungen
 aktiviert wurden.
 
-Wenn ed2k als Parameter übergeben wird, wird eine Verbindung zu Servern aus
-der Serverliste aufgebaut. Man kann optional einen Server in der Form
-IP:Port angeben, um nur zu diesem Server eine Verbindung aufzubauen. Die IP
-muss entweder eine IPv4\-Adresse, oder ein auflösbarer DNS\-Name sein.
-
-Wenn kad angegeben wird, wird ausschließlich eine kad\-Verbindung aufgebaut.
-.SS "Disconnect\fR (ed2k|kad)\fP"
-
+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.
+.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.
-.SS "Download\fR Nummer\fP"
+.SS "Download \fI<Nummer>\fP"
 Startet den Download einer Datei
 
-Die Nummer einer Datei aus der letzten Suche muss angegeben werden. 
-Beispiel: 'download 12' startet den Download der Datei, die bei der letzten
-Suche die Nummer 12 hatte.
-
-Dieser Befehl muss ein Argument übergeben bekommen.
-.SS Exit
+Die \fI<Nummer>\fP einer Datei aus der letzten Suche muss angegeben
+werden.  Beispiel: 'download 12' startet den Download der Datei, die in der
+letzten Suche die Nummer 12 hatte.
+.SS_untranslated Exit
 Verbindung zu amule/amuled trennen und amulecmd beenden.
-.SS "Get\fR Wert\fP"
+.SS "Get \fI<Wert>\fP"
 Liest eine Option und zeigt sie an.
 
-Dieser Befehl ist unvollständig, mögliche Werte sind nachfolgend aufgeführt.
+Verfügbare Werte für \fI<Was>\fP:
+.RS
+.IP BwLimits 10
+Bandbreitenbeschränkungen abfragen.
+.IP IPFilter 10
+IPFilter Einstellungen abfragen.
+.RE
+.SS "Help [ \fI<Befehl>\fP ]"
+Gibt eine kurze Nutzungsübersicht aus.  Wenn ohne Parameter aufgerufen,
+zeigt es eine Liste der verfügbaren Befehle an.  Wenn mit
+\fI<Befehl>\fPaufgerufen, zeigt es eine Kurzbeschreibung diese Befehls
+an.
+.SS "Pause \fI<Prüfsumme>\fP | \fI<Nummer>\fP"
+Pausiert den Download der mit \fI<Prüfsumme>\fP oder
+\fI<Numner>\fP angegeben wurde. Benutze \fBshow\fP um den Wert zu
+erfahren.
+.SS "Priority  \fI<Priorität>\fP \fI<Prüfsummer>\fP | \fI<Nummer>\fP"
+Setzt die Priorität für den Download der mit \fI<Prüfsumme>\fP oder
+\fI<Nummer>\fP angegeben wurde.
 
-Verfügbare Werte:
-.br
-BwLimits	Bandbreitenbeschränkungen.
-.br
-IPFilter	IP\-Filter Einstellungen.
-.SS "Help\fR <Befehl>\fP"
-Kurze Hilfe anzeigen. Zeigt eine kurze Übersicht der verfügbaren Befehle,
-wenn ohne Parameter aufgerufen.  Wenn mit <Befehl> aufgerufen, wird
-eine kurze Hilfe zu dem Befehl angezeigt.
-.SS "Pause\fR <Hash>\fP"
-Pausiert den mit seinem Hash spezifizierten Download. Benutze \fIshow\fP um den
-Hash zu erfahren.
-.SS Progress
+Verfügbare Werte für \fI<Priorität>\fP:
+.RS
+.IP Auto 10
+Automatische Priorität.
+.IP High 10
+Hohe Priorität.
+.IP Low 10
+Niedrige Priorität.
+.IP Normal 10
+Normale Priorität.
+.RE
+.SS_untranslated Progress
 Zeigt den Fortschritt einer laufenden Suche an.
-
-Dieser Befehl kann keine Argumente übernehmen.
-.SS Quit
-Beendet das Programm.
-
-Dieser Befehl kann keine Argumente übernehmen.
-.SS Reload
+.SS_untranslated Quit
+Synonim für den \fBexit\fP Befehl.
+.SS "Reload \fI<Was>\fP"
 Aktualisiert das angegebene Objekt.
 
-Dieser Befehl ist unvollständig, mögliche Werte sind nachfolgend aufgeführt.
-
-Verfügbare Werte:
-.br
-BwLimits	Aktualisiert die Bandbreitenbeschränkungen.
-.br
-IPFilter	Aktualisiert die IP\-Filter Einstellungen.
-.SS Reset
+Verfügbare Werte für \fI<Was>\fP:
+.RS
+.IP Shared 10
+Liste der freigegebenen Dateien neu laden.
+.IP IPFilter 10
+IP Filter Tabellen neu laden.
+.RE
+.SS_untranslated Reset
 Setzt das Log zurück.
-
-Dieser Befehl kann keine Argumente übernehmen.
-.SS Results
+.SS_untranslated Results
 Zeigt die Resultate der letzten Suche an.
-
-Dieser Befehl kann keine Argumente übernehmen.
-.SS "Resume\fR <Hash>\fP"
-Setzt den mit seinem Hash spezifizierten Download fort. Benutze \fIshow\fP um
-den Hash zu erfahren.
-.SS "Search\fR global|kad|local Datei\fP"
-Startet die Suche nach Datei. Die Art der Suche und ein Dateiname sind
-notwendig. \fIBeispiel\fP 'search kad amule' Sucht nach amule im kad\-Netzwerk.
+.SS "Resume \fI<Prüfsumme>\fP | \fI<Nummer>\fP"
+Setzt den Download der mit \fI<Prüfsumme>\fP oder \fI<Nummer>\fP
+angegeben wurde fort. Nutze \fBshow\fP, um den Wert zu erfahren.
+.SS "Search \fI<Typ>\fP \fI<Schlüsselwort>\fP"
+Startet eine Suche nach dem angegebenenI \fI<Schlüsselwort>\fP. Ein
+Suchtyp und ein Schlüsselwort müssen angegeben werden. Beispiel: 'search kad
+amule' startet eine kad\-Suche nach 'amule'.
 
 Verfügbare Suchtypen:
-.br
-global	startet eine globale Suche
-.br
-kad	startet eine Suche im kad\-Netzwerk
-.br
-local	startet eine lokale Suche
-.SS "Set\fR <Wert>\fP"
+.RS
+.IP Global 10
+Führt eine globale Suche durch.
+.IP Kad 10
+Führt eine Suche im Kad\-Netzwerk durch.
+.IP Local 10
+Führt eine lokale Suche durch.
+.RE
+.SS "Set \fI<Was>\fP"
 Setzt die angegebene Option.
 
-Dieser Befehl ist unvollständig, mögliche Werte sind nachfolgend aufgeführt.
-
-Verfügbare Werte:
-.br
-BwLimits	Setzt die Bandbreitenbeschränkung.
-.br
-IPFilter	Setzt die IP\-Filter Einstellungen.
-.SS "Show\fR DL|Log|Servers|UL\fP"
+Verfügbare Werte für \fI<Was>\fP:
+.RS
+.IP BwLimits 10
+Setzt die Bandbreitenbeschränkungen.
+.IP IPFilter 10
+IPFilter Einstellungen setzen.
+.RE
+.SS "Show \fI<Was>\fP"
 Zeigt upload/download Warteschlange, Serverliste oder die Liste der
 freigegebenen Dateien an.
 
-Dieser Befehl muss ein Argument übergeben bekommen.
-
-Dieser Befehl ist unvollständig, Benutze nur die folgenden Parameter.
-
-Verfügbare Parameter:
-.br
-DL		Zeigt die Downloadwarteschlange an.
-.br
-Log		Zeigt das Log an.
-.br
-Servers	Zeigt die Serverliste an.
-.br
-UL		Zeigt die Uploadwarteschlange an.
-.SS Shutdown
+Verfügbare Werte für \fI<Was>\fP:
+.RS
+.IP DL 10
+Downloadwarteschlange anzeigen.
+.IP Log 10
+Log anzeigen.
+.IP Servers 10
+Serverliste anzeigen.
+.IP UL 10
+Uploadwarteschlange anzeigen.
+.RE
+.SS_untranslated Shutdown
 Beendet das Programm (amule/amuled) zu dem du verbunden bist. Dies beendet
 auch den Textclient, da er ohne Verbindung nicht zu gebrauchen ist.
-
-Dieser Befehl kann keine Argumente übernehmen.
-.SS "Statistics\fR <Nummer>\fP"
+.SS "Statistics [ \fI<Nummer>\fP ]"
 Zeigt die Statistiken an.
 
-Die optionale Nummer die übergeben werden kann muss im Bereich von 0\-255
-liegen, und gibt an, wieviele Einträge im Unterpunkt Version angezeigt
-werden sollen. 0 oder weglassen bedeutet unbegrenzt.
+Die optionale \fI<Nummer>\fP im Bereich von 0\-255 kann als Argument
+diesem Befehel übergeben werden. Sie gibt an, wie viele Einträge der
+Clientversionsliste angezeigt werden sollen. Der Wert 0, oder keine Angabe
+bedeutet 'unbegrenzt'.
 
-\fIBeispiel:\fP 'statistics 5' zeigt die höchsten 5 der einzelnen
-Clientversionen an.
-.SS Status
+Beispiel: 'statistics 5' zeigt nur die oberen 5 Versionen der einzelnen
+Clienttypen an.
+.SS_untranslated Status
 Zeigt den Verbindungsstatus, aktuelle Up/Downloadgeschindigkeiten, etc. an.
-.PP
 .SH ANMERKUNGEN
 .SS Pfade
 Für alle Optionen die ein \fI<Pfad>\fP Argument erwarten, wenn der
 \fIPfad\fP kein Verzeichnis enthält(z.B. nur einen Dateinamen), dann wird
 angenommen, diese Datei liegt um aMule\-Konfigurationsverzeichnis,
 \fI~/.aMule\fP.
-.SS SPRACHEN
-Der \fI<Sprache>\fP Parameter für die \fB\-l\fP Option hat folgende Form:
-\fIsprache\fP[\fB_\fP\fISPRACHE\fP][\fB.\fP\fIKODIERUNG\fP][\fB@\fP\fIzusatz\fP] wobei \fIsprache\fP
-die primäre Sprache, \fISPRACHE\fP die Regionalsprache, \fIKODIERUNG\fP die
-Zeichentabelle ist, und \fIzusatz\fP "erlaubt es dem Nutzer eine bestimmte
-Auswahl innerhalb einer einzigen Kategorie auszuwählen".
-.PP
+.SS Sprachen
+Der \fI<Sprache>\fP Parameter der \fB\-l\fP Option hat folgende Form:
+\fIsprache\fP[\fB_\fP\fISPRACHE\fP][\fB.\fP\fIkodierung\fP][\fB@\fP\fImodifikation\fP] wobei
+\fIsprache\fP die eigentliche Sprache, \fISPRACHE\fP das Gebiet, \fIkodierung\fP den
+zu nutzenden Zeichensatz und \fImodifikation\fP eine bestimmte Untergruppe in
+diesem darstellt.
+
 Zum Besispiel sind die folgenden Zeichenketten gültig:
+.RS
+.RB_untranslated de
 .br
-de
+.RB_untranslated de_DE
 .br
-de_DE
+.RB_untranslated de_DE.iso88591
 .br
-de_DE.iso88591
+.RB_untranslated de_DE@euro
 .br
-de_DE@euro
-.br
-de_DE.iso88591@euro
-.PP
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
 Alle oben genannten Zeicheketten werden als gültige Sprachdefinitionen
 akzeptiert, \fIKODIERUNG\fP und \fIzusatz\fP werden zur Zeit nicht genutzt.
-.PP
-Zusätzlich zu den obigen Formaten, kann man komplette englishe
+
+Zusätzlich zu den obigen Formaten, kann man komplette englische
 Sprachbezeichnungen angeben \- \fB\-l german\fP ist ebenfalls gültig und
 entspricht \fB\-l de_DE\fP.
-.PP
+
 Wenn keine Sprache definiert wurde, weder in der Kommandozeile noch in der
 Konfigurationsdatei, wird die Standardsprache des Systems verwendet.
 .SH DATEIEN
@@ -254,19 +269,24 @@
 .PP
 \fBamulecmd\fP \fB\-\-create\-config\-from\fP=\fI/home/Benutzer/.aMule/amule.conf\fP
 .PP
-Dies speichert die Einstellungen in \fI$HOME/.aMule/remote.conf\fP, und tippst
-du nur noch:
-.PP
-\fBamulecmd\fP
-.PP
+Dies speichert die Einstellungen in \fI$HOME/.aMule/remote.conf\fP, und später
+tippst du nur noch:
+
+.B_untranslated amulecmd
+
 Natürlich brauchst du dich nicht unbedingt an dieses Beispiel halten.
 .SH "FEHLER MELDEN"
 Bitte meldet Fehler entweder in unserem Forum (\fIhttp://forum.amule.org/\fP),
 oder in unseren Bugtracker (\fIhttp://bugs.amule.org/\fP). Bitte meldet uns
-keine Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
+weder Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
 Teammitglieder.
 .SH COPYRIGHT
 aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU
 General Public License
 .SH "SIEHE AUCH"
-\fBamule\fP(1), \fBamuleweb\fP(1)
+.B_untranslated amule\fR(1), \fBamuled\fR(1)
+.SH VERFASSER
+Diese manpage wurde geschrieben von Vollstrecker
+<amule@vollstreckernet.de>
+
+Diese manpage wurde übersetzt von Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amulecmd.es.1 -> aMule-2.3.1.tar.bz2/docs/man/amulecmd.es.1 Changed

@@ -1,89 +1,283 @@
-.TH AMULECMD 1 "Marzo 2005" "aMuleCmd v2.0.0" "Utilidades de aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULECMD 1 "November 2011" "aMuleCmd v2.3.1" "aMule utilidades"
+.als B_untranslated B
+.als RB_untranslated RB
+.als SS_untranslated SS
 .SH NOMBRE
-amulecmd \- Control de aMule en modo consola basado en texto.
+amulecmd \- Programa basado en consola para controlar aMule
 .SH SINOPSIS
-.B amulecmd
-.RB [ \-h " " \fI<host> ]
-.RB [ \-p " " \fI<puerto> ]
-.RB [ \-P " " \fI<contraseña> ]
-.RB [ \-f " " \fI<localización> ]
-.RB [ \-l " " \fI<lenguaje> ]
-.RB [ \-q ]
-.RB [ \-v ]
-.RB [ \-w ]
-.RB [ \-c " " \fI<comando> ]
-.PP
-.B amulecmd
-.RB [ \-f " " \fI<localización> ]
-.B \-\-create-config-from=\fI<localización>
-.PP
-.B amulecmd
-.RB [ \-\-help ]
-.RB [ \-\-version ]
-.SH DESCRIPCIÓN
-\fBamulecmd\fR es un programa basado en texto para controlar aMule.
-Puede obtener información útil al ejecutar el programa.
-.TP
-\fB\-h\fR, \fB\-\-host\fR=\fI<host>\fR
-Host donde aMule está siendo ejecutado (por defecto: \fIlocalhost\fR). \fI<host>\fR puede ser una IP o una dirección DNS.
-.TP
-\fB\-p\fR, \fB\-\-port\fR=\fI<puerto>\fR
-El puerto donde aMule acepta conexiones de External Connections. Puede consultarlo en Preferenciass->Controles Remotos (por defecto: \fI4712\fR)
-.TP
-\fB\-P\fR, \fB\-\-password\fR=\fI<contraseña>\fR
-Contraseña para External Connections.
-.TP
-\fB\-f\fR, \fB\-\-config\-file\fR=\fI<localización>\fR
-Usar el archivo de configuracion indicado. Por defecto, \fI~/.aMule/remote.conf\fR
-.TP
-\fB\-l\fR, \fB\-\-locale\fR=\fI<lang>\fR
-Establece el lenguaje del programa.
-Ver la sección \fBNOTAS\fR para la descripción del parámetro \fI<lenguaje>\fR.
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-No mostrar nada por consola. Carece de utilidad cuando se emplea \fBamulecmd\fR.
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Mostrar información adicional \- mostrar información de depuración.
-.TP
-\fB\-w\fR, \fB\-\-write\-config\fR
-Crear el archivo de configuración y salir.
-.TP
-\fB\-c\fR, \fB\-\-command\fR=\fI<comando>\fR
-Ejecutar el comando \fI<comando>\fR y salir.
-.TP
-\fB\-\-create\-config\-from\fR=\fI<localización>\fR
-Crear el archivo de configuraciñon basándose en \fI<localización>\fR y salir. \fI<localización>\fR debe ser un archivo de configuración de aMule válido.
-.TP
-\fB\-\-help\fR
-Mostrar la ayuda y salir.
-.TP
-\fB\-\-version\fR
-Mostrar la versión del programa y salir.
+.B_untranslated amulecmd
+[\fB\-h\fP \fI<host>\fP] [\fB\-p\fP \fI<port>\fP] [\fB\-P\fP
+\fI<password>\fP] [\fB\-f\fP \fI<path>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<lang>\fP] {\fB \fP[\fB\-w\fP]\fB \fP|\fB \fP[\fB\-c\fP
+\fI<command>\fP]\fB \fP}
+
+.B_untranslated amulecmd
+[\fB\-\-create\-config\-from\fP=\fI<path>\fP]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-help ]
+.SH DESCRIPCIÃN
+\fBamulecmd\fP es un cliente basado en consola para controlar aMule.
+.TP 
+\fB[ \-h\fP \fI<host>\fP, \fB\-\-host\fP=\fI<host>\fP \fB]\fP
+Host donde se estÃ¡ ejecutando aMule. (por defecto: \fIlocalhost\fP).
+\fI<host>\fP debe ser o una direcciÃ³n IP o un nombre DNS
+.TP 
+\fB[ \-p\fP \fI<port>\fP, \fB\-\-port\fP=\fI<port>\fP \fB]\fP
+Puerto de conexiÃ³n externa de aMule, puesto en Opciones\->Controles
+Remotos (por defecto: 4712)
+.TP 
+\fB[ \-P\fP \fI<password>\fP, \fB\-\-password\fP=\fI<password>\fP \fB]\fP
+ContraseÃ±a de conexiones externas
+.TP 
+\fB[ \-f\fP \fI<path>\fP, \fB\-\-config\-file\fP=\fI<path>\fP \fB]\fP
+Usar la configuraciÃ³n dada por el archivo. El archivo de configuraciÃ³n por
+defecto es \fI~/.aMule/remote.conf\fP
+.TP 
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+No mostrar nada por la salida estÃ¡ndar
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Modo Extendido \- muestra tambiÃ©n los mensajes de depuraciÃ³n.
+.TP 
+\fB[ \-l\fP \fI<lang>\fP, \fB\-\-locale\fP=\fI<lang>\fP \fB]\fP
+Selecciona el idioma del programa. Ver la secciÃ³n \fBNOTAS\fP para la
+descripciÃ³n del parÃ¡metro del \fI<lang>\fP.
+.TP 
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+Escribe opciones de la lÃnea de comando al archivo de configuraciÃ³n y
+termina.
+.TP 
+\fB[ \-c\fP \fI<command>\fP, \fB\-\-command\fP=\fI<command>\fP \fB]\fP
+Ejecuta \fI<comando>\fP y sal como si este fuera introducido en
+amulecmd.
+.TP 
+\fB[ \-\-create\-config\-from\fP=\fI<path>\fP \fB]\fP
+Crear archivo de configuraciÃ³n basado en \fI<path>\fP, el cual debe
+apuntar a un archivo de configuraciÃ³n vÃ¡lido, y entonces termina.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Mostrar el nÃºmero de la versiÃ³n actual.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Imprime una breve descripciÃ³n de uso.
+.SH COMANDOS
+Todos los comandos ignoran las mayÃºsculas.
+.SS "AÃ±adir \fI<eD2k\-link>\fP | \fI<magnet\-link>\fP"
+AÃ±adir un enlace eD2k o un enlace magnet al nÃºcleo.
+
+El enlace eD2k para ser aÃ±adido puede ser:
+.RS 3
+.IP \(bu 2
+un enlace de archivo (ed2k://|archivo|...), serÃ¡ aÃ±Ã¡dido a la cola de
+descarga.
+.IP \(bu 2
+un enlace de servidor (ed2k://|servidor|...), serÃ¡ aÃ±Ã¡dido a la cola de
+servidores.
+.IP \(bu 2
+un enlace con una lista de servidores, se aÃ±adirÃ¡n todos los servidores a la
+lista.
+.RE
+
+El enlace magnet debe contener un hash eD2k y la longitud del archivo.
+.SS "Cancelar \fI<hash>\fP | \fI<number>\fP"
+Cancels the download specified by \fI<hash>\fP or
+\fI<number>\fP. To get the value use \fBshow\fP.
+.SS "Conectar [ \fIkad\fP | \fIed2k\fP | \fI<ip|name>\fP ]"
+Conectar a la red.
+
+Esto conectarÃ¡ a todas las redes que estÃ©n habilitadas en las preferencias.
+
+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.
+.SS_untranslated Disconnect [ \fIed2k\fP | \fIkad\fP ]
+Desconectar de todas las redes a las que estÃ¡s conectado, o solamente
+desconecta de la red especificada.
+.SS "Descarga \fI<number>\fP"
+Comenzar a descargar un archivo.
+
+The \fI<number>\fP of a file from the last search has to be given.
+Example: `download 12' will start to download the file with the number 12 of
+the previous search.
+.SS_untranslated Exit
+Desconectar de amule/amuled y salir de amulecmd.
+.SS "Obtener \fI<what>\fP"
+Obtener y mostrar un valor de opciones.
+
+Valores disponibles para \fI<what>\fP:
+.RS
+.IP BwLimits 10
+Obtener limites de ancho de banda.
+.IP IPFilter 10
+Obtener opciones del filtro IP.
+.RE
+.SS "Ayuda [ \fI<command>\fP ]"
+Prints a short usage description.  If called without parameter, it shows a
+list of available commands.  If called with \fI<command>\fP, it shows a
+short description of the given command.
+.SS "Pausa \fI<hash>\fP | \fI<number>\fP"
+Pauses the download specified by \fI<hash>\fP or
+\fI<number>\fP. To get the value use \fBshow\fP.
+.SS "Priority \fI<priority>\fP \fI<hash>\fP | \fI<number>\fP"
+Fijar la prioridad de una descarga especificada por \fI<hash>\fP o
+\fI<number>\fP.
+
+Valores disponibles para \fI<priority>\fP:
+.RS
+.IP Auto 10
+Prioridad automÃ¡tica.
+.IP High 10
+Prioridad alta.
+.IP Low 10
+Prioridad baja.
+.IP Normal 10
+Prioridad normal.
+.RE
+.SS_untranslated Progress
+Shows the progress of an on\-going search.
+.SS_untranslated Quit
+Un sinÃ³nimo del comando \fBexit\fP.
+.SS "Recargar \fI<what>\fP"
+Recargar un objeto dado.
+
+Valores disponibles para \fI<what>\fP:
+.RS
+.IP Shared 10
+Recargar lista de archivos compartidos.
+.IP IPFilter 10
+Recargar tablas de filtros IP.
+.RE
+.SS_untranslated Reset
+Reiniciar el registro.
+.SS_untranslated Results
+Shows you the results of the last search.
+.SS "Resume \fI<hash>\fP | \fI<number>\fP"
+Resumes the download specified by \fI<hash>\fP or
+\fI<number>\fP. To get the value use \fBshow\fP.
+.SS "Search \fI<type>\fP \fI<keyword>\fP"
+Makes a search for the given \fI<keyword>\fP. A search type and a
+keyword to search is mandatory to do this.  Example: `search kad amule'
+performs a kad search for `amule'.
+
+Tipos de bÃºsquedas disponibles:
+.RS
+.IP Global 10
+Realiza una bÃºsqueda global.
+.IP Kad 10
+Realiza una bÃºsqueda en la red Kademlia.
+.IP Local 10
+Realiza una bÃºsqueda local.
+.RE
+.SS "Fija \fI<what>\fP"
+Asigna un valor dado de opciÃ³n.
+
+Valores disponibles para \fI<what>\fP:
+.RS
+.IP BwLimits 10
+Asignar limites de ancho de banda.
+.IP IPFilter 10
+Fija las opciones del FiltroIP
+.RE
+.SS "Mostrar \fI<what>\fP"
+Shows upload/download queue, servers list or shared files list.
+
+Valores disponibles para \fI<what>\fP:
+.RS
+.IP DL 10
+Mostrar cola de descarga.
+.IP Log 10
+Mostrar registro.
+.IP Servers 10
+Mostrar lista de servidores.
+.IP UL 10
+Mostrar cola de subida.
+.RE
+.SS_untranslated Shutdown
+Shutdown the remote running core (amule/amuled).  This will also shut down
+the text client, since it is unusable without a running core.
+.SS "EstadÃsticas [ \fI<number>\fP ]"
+Mostrar Ã¡rbol de estadÃsticas.
+
+The optional \fI<number>\fP in the range of 0\-255 can be passed as
+argument to this command, which tells how many entries of the client version
+subtree should be shown. Passing 0, or omitting it means `unlimited'.
+
+Example: `statistics 5' will show only the top 5 versions for each client
+type.
+.SS_untranslated Status
+Show connection status, current up/download speeds, etc.
 .SH NOTAS
-.SS Localizadores
-Para todas las opciones que reuieran un parámetro \fI<localización>\fR, si la \fIlocalización\fR no contiene el nombre de ningun directorio (por ejemplo, si es simplemente el nombre de un archivo), entonces se tomará como directorio contenedor de ese archivo el directorio de configuración de aMule, \fI~/.aMule\fR.
+.SS Rutas
+Todas las opciones que tengan \fI<path>\fP como valor, si \fIpath\fP
+contiene un directorio sin part (p.e. solo un archivo normal), entones se
+tomarÃ¡ el directorio de la configuraciÃ³n, \fI~/.aMule\fP.
 .SS Lenguajes
+The \fI<lang>\fP parameter for the \fB\-l\fP option has the following form:
+\fIlang\fP[\fB_\fP\fILANG\fP][\fB.\fP\fIencoding\fP][\fB@\fP\fImodifier\fP] where \fIlang\fP is the
+primary language, \fILANG\fP is a sublanguage/territory, \fIencoding\fP is the
+character set to use and \fImodifier\fP allows the user to select a specific
+instance of localization data within a single category.
+
+Por ejemplo, las siguientes cadenas son vÃ¡lidas:
+.RS
+.RB_untranslated de
+.br
+.RB_untranslated de_DE
+.br
+.RB_untranslated de_DE.iso88591
+.br
+.RB_untranslated de_DE@euro
+.br
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
+Though all the above strings are accepted as valid language definitions,
+\fIencoding\fP and \fImodifier\fP are yet unused.
+
+In addition to the format above, you can also specify full language names in
+English \- so \fB\-l german\fP is also valid and is equal to \fB\-l de_DE\fP.
+
+When no locale is defined, either on command\-line or in config file, system
+default language will be used.
 .SH ARCHIVOS
 ~/.aMule/remote.conf
 .SH EJEMPLO
-Normalmente, amulecmd se ejecutará por primera vez de la siguiente manera:
+Normalmente amulecmd se ejecutara primero como::
 .PP
-\fBamulecmd\fR \fB\-h\fR \fIhostname\fR \fB\-p\fR \fIECport\fR \fB\-P\fR \fIECpassword\fR \fB\-w\fR
+\fBamulecmd\fP \fB\-h\fP \fIhostname\fP \fB\-p\fP \fIECport\fP \fB\-P\fP \fIECpassword\fP \fB\-w\fP
 .PP
 o
 .PP
-\fBamulecmd\fR \fB\-\-create-config-from\fR=\fI/home/username/.aMule/amule.conf\fR
-.PP
-Esto guardará la configuración en \fI$HOME/.aMule/remote.conf\fR, de manera que en las sucesivas ejecuciones bastará con hacer:
-.PP
-.B amulecmd
+\fBamulecmd\fP \fB\-\-create\-config\-from\fP=\fI/home/usuario/.aMule/amule.conf\fP
 .PP
-Por supuesto, no es necesario seguir este ejemplo.
-.SH BUGS
-Si descubre bugs, por favor comuníquelos en (\fIhttp://forum.amule.org/\fR), o en nuestro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Por favor, no comunique bugs por e-mail, ni a nuestro maillist ni directamente a ningún miembro del equipo de aMule.
+Esto guardarÃ¡ las opciones en \fI$HOME/.aMule/remote.conf\fP, y despuÃ©s sÃ³lo
+tiene que escribir:
+
+.B_untranslated amulecmd
+
+Of course, you don't have to follow this example.
+.SH "INFORMANDO ERRORES"
+Por favor informa de fallos ya sea en nuestro foro
+(\fIhttp://forum.amule.org/\fP), o en nuestro bugtracker
+(\fIhttp://bugs.amule.org/\fP). Por favor no informe de fallos por correo, ni
+en nuestras listas, ni directamente al correo de algun miembro del equipo.
 .SH COPYRIGHT
-aMule, y todas las utilidades que con el vienen, se distribuyen bajo la licencia GPL.
-.SH VER
-\fBamule\fR(1), \fBamuleweb\fR(1)
+aMule y todas las demÃ¡s utilidades relacionadas son distribuidas bajo la GNU
+General Public License.
+.SH "VEASE TAMBIEN"
+.B_untranslated amule\fR(1), \fBamuled\fR(1)
+.SH AUTOR
+Esta pÃ¡gina de manualfue escrita por Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amulecmd.fr.1 -> aMule-2.3.1.tar.bz2/docs/man/amulecmd.fr.1 Changed

@@ -1,84 +1,291 @@
-.TH AMULECMD 1 "Mars 2005" "aMuleCmd v2.0.0" "Outil pour aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULECMD 1 "Novembre 2011" "aMuleCmd v2.3.1" "Outils d'aMule"
+.als B_untranslated B
+.als RB_untranslated RB
+.als SS_untranslated SS
 .SH NOM
-amulecmd \- programme de contrôle d'aMule en mode texte
+amulecmd \- Programme de contrÃ´le d'aMule en mode texte
 .SH SYNOPSIS
-.B amulecmd
-.RB [ \-h " " \fI<hôte> ]
-.RB [ \-p " " \fI<port> ]
-.RB [ \-P " " \fI<motdepasse> ]
-.RB [ \-f " " \fI<chemin> ]
-.RB [ \-q ]
-.RB [ \-v ]
-.RB [ \-w ]
-.RB [ \-c " " \fI<commande> ]
-.PP
-.B amulecmd
-.RB [ \-f " " \fI<chemin> ]
-.B \-\-create-config-from=\fI<chemin>
-.PP
-.B amulecmd
-.RB [ \-\-help ]
-.RB [ \-\-version ]
+.B_untranslated amulecmd
+[\fB\-h\fP \fI<hÃ´te>\fP] [\fB\-p\fP \fI<port>\fP] [\fB\-P\fP
+\fI<motdepasse>\fP] [\fB\-f\fP \fI<chemin>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<lang>\fP] {\fB \fP[\fB\-w\fP]\fB \fP|\fB \fP[\fB\-c\fP
+\fI<commande>\fP]\fB \fP}
+
+.B_untranslated amulecmd
+[\fB\-\-create\-config\-from\fP=\fI<chemin>\fP]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-help ]
 .SH DESCRIPTION
-\fBamulecmd\fR est un client en mode texte pour contrôler aMule.
-Une aide utile peut être obtenue au lancement du programme.
-.TP
-\fB\-h\fR, \fB\-\-host\fR=\fI<hôte>\fR
-Hôte où aMule tourne (défaut: \fIlocalhost\fR). \fI<hôte>\fR peut être une adresse IP ou un nom DNS.
-.TP
-\fB\-p\fR, \fB\-\-port\fR=\fI<port>\fR
-Port d'aMule pour les Connexions Externes, tel que défini dans Preferences->Contrôles à Distance (défaut: \fI4712\fR).
-.TP
-\fB\-P\fR, \fB\-\-password\fR=\fI<motdepasse>\fR
-Mot de passe pour les Connexions Externes.
-.TP
-\fB\-f\fR, \fB\-\-config\-file\fR=\fI<chemin>\fR
-Utiliser le fichier de configuration désigné. Le fichier de configuration par défaut est \fI~/.aMule/remote.conf\fR.
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-N'afficher aucune sortie sur stdout. Ceci est une option complètement inutile avec \fBamulecmd\fR.
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Mode bavard \- affiche aussi les messages de debugage.
-.TP
-\fB\-w\fR, \fB\-\-write\-config\fR
-Ecrire les options de la ligne de commande dans le fichier de configuration et quitter.
-.TP
-\fB\-c\fR, \fB\-\-command\fR=\fI<commande>\fR
-Executer la \fI<commande>\fR comme si elle avait été entrée au prompt d'amumecmd et quitter (non disponible dans la version graphique).
-.TP
-\fB\-\-create\-config\-from\fR=\fI<chemin>\fR
-Créer un fichier de configuration basé sur \fI<chemin>\fR, qui doit pointer sur un fichier de configration d'aMule valide, et quitter ensuite.
-.TP
-\fB\-\-help\fR
-Afficher l'aide d'utilisation et quitter.
-.TP
-\fB\-\-version\fR
-Afficher les informations sur la version courante et quitter.
-.SH NOTE
-Pour toutes les options prenant en paramètre un \fI<chemin>\fR, si le \fIchemin\fR ne contient pas de répertoire (i.e. juste un nom de fichier), alors il sera considéré comme étant dans le répertoire de configuration d'aMule, \fI~/.aMule\fR.
+\fBamulecmd\fP est un client en mode texte pour contrÃ´ler aMule.
+.TP 
+\fB[ \-h\fP \fI<hÃ´te>\fP, \fB\-\-host\fP=\fI<hÃ´te>\fP \fB]\fP
+HÃ´te oÃ¹ aMule fonctionne (par dÃ©faut : \fIlocalhost\fP). \fI<hÃ´te>\fP
+peut Ãªtre une adresse IP ou un nom DNS.
+.TP 
+\fB[ \-p\fP \fI<port>\fP, \fB\-\-port\fP=\fI<port>\fP \fB]\fP
+Port d'aMule pour les Connexions Externes, tel que dÃ©fini dans
+PrÃ©fÃ©rences\->ContrÃ´les Ã  Distance (dÃ©faut: \fI4712\fP)
+.TP 
+\fB[ \-P\fP \fI<motdepasse>\fP, \fB\-\-password\fP=\fI<motdepasse>\fP \fB]\fP
+Mot de passe des connexions externes.
+.TP 
+\fB[ \-f\fP \fI<chemin>\fP, \fB\-\-config\-file\fP=\fI<chemin>\fP \fB]\fP
+Utiliser le fichier de configuration dÃ©signÃ©. Le fichier de configuration
+par dÃ©faut est \fI~/.aMule/remote.conf\fP
+.TP 
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Ne pas afficher de sortie sur stdout.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Mode bavard \- affiche aussi les messages de deboguage.
+.TP 
+\fB[ \-l\fP \fI<lang>\fP, \fB\-\-locale\fP=\fI<lang>\fP \fB]\fP
+DÃ©finir les paramÃ¨tres rÃ©gionaux (langage). Voir la section \fBNOTES\fP pour la
+description du paramÃ¨tre \fI<lang>\fP.
+.TP 
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+Ãcrire les options de la ligne de commande dans le fichier de configuration
+et quitter
+.TP 
+\fB[ \-c\fP \fI<commande>\fP, \fB\-\-command\fP=\fI<commande>\fP \fB]\fP
+Ãxecuter la \fI<commande>\fP comme si elle avait Ã©tÃ© entrÃ©e dans
+l'invite de commande d'amulecmd et quitter.
+.TP 
+\fB[ \-\-create\-config\-from\fP=\fI<chemin>\fP \fB]\fP
+CrÃ©er un fichier de configuration basÃ© sur \fI<chemin>\fP, qui doit
+pointer sur un fichier de configration d'aMule valide, et quitter ensuite.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Affiche le numÃ©ro de la version actuelle.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Afficher une court description d'utilisation.
+.SH COMMANDES
+Toutes les commandes sont insensibles Ã  la casse.
+.SS "Add \fI<lien eD2k>\fP | \fI<lien magnÃ©tique>\fP"
+Ajoute un lien eD2k ou magnÃ©tique au noyau.
+
+Le lien eD2k Ã  ajouter peut Ãªtre :
+.RS 3
+.IP \(bu 2
+un lien fichier (ed2k://|fichier|â¦), il sera ajoutÃ© Ã  la file de
+tÃ©lÃ©chargement;
+.IP \(bu 2
+un lien serveur (ed2k://|serveur|â¦), il sera ajoutÃ© Ã  la liste des serveurs;
+.IP \(bu 2
+un lien de liste de serveurs, dans ce cas tous les serveurs dans la liste
+seront ajoutÃ©s Ã  la liste des serveurs.
+.RE
+
+Le lien magnÃ©tique doit contenir le hachage eD2k et la longueur du fichier.
+.SS "Cancel \fI<hachage>\fP | \fI<numÃ©ro>\fP"
+Annule le tÃ©lÃ©chargement spÃ©cifiÃ© par  le \fI<hachage>\fP ou le
+\fI<numÃ©ro>\fP. Pour obtenir la valeur utilisÃ©e \fBshow\fP.
+.SS "Connect [ \fIkad\fP | \fIed2k\fP | \fI<ip|nom>\fP ]"
+Se connecter au rÃ©seau.
+
+Cela connectera Ã  tous les rÃ©seaux qui sont activÃ©s dans les prÃ©fÃ©rences.
+
+Avec le paramÃ¨tre optionnel, vous pouvez spÃ©cifier le rÃ©seau pour se
+connecter. Donner une adresse de serveur sous la forme IP:Port (oÃ¹ IP est
+soit une adresse dÃ©cimale IPv4 ou un nom DNS rÃ©solvable) aMule se connectera
+Ã  ce serveur uniquement.
+.SS_untranslated Disconnect [ \fIed2k\fP | \fIkad\fP ]
+DÃ©connecte de tous les rÃ©seaux dont vous Ãªtes connectÃ©, ou juste dÃ©connecte
+d'un rÃ©seau spÃ©cifiÃ©.
+.SS "Download \fI<nombre>\fP"
+Commence Ã  tÃ©lÃ©charger un fichier.
+
+Le \fI<numÃ©ro>\fP d'un fichier Ã  partir de la derniÃ¨re recherche doit
+Ãªtre donnÃ©.  Exemple : `download 12' va commencer Ã  tÃ©lÃ©charger le fichier
+avec le numÃ©ro 12 de la recherche prÃ©cÃ©dente.
+.SS_untranslated Exit
+DÃ©connecte d'amule/amuled et quitter amulecmd.
+.SS "Get \fI<quoi>\fP"
+Obtient et affiche une valeur de prÃ©fÃ©rence.
+
+Valeurs disponibles pour \fI<quoi>\fP:
+.RS
+.IP BwLimits 10
+Obtenir les limites de bande passante.
+.IP IPFilter 10
+Obtenir les prÃ©fÃ©rences de filtrage IP.
+.RE
+.SS "Help [ \fI<commande>\fP ]"
+Affiche une courte description d'utilisation. S'il est appelÃ© sans
+paramÃ¨tre, il affiche une liste des commandes disponibles. Lorsqu'il est
+appelÃ© avec la \fI<commande>\fP, il affiche une courte description de
+la commande donnÃ©e.
+.SS "Pause \fI<hachage>\fP | \fI<numÃ©ro>\fP"
+Interrompt le tÃ©lÃ©chargement spÃ©cifiÃ© par le \fI<hachage>\fP ou le
+\fI<numÃ©ro>\fP. Pour obtenir la valeur d'utilisÃ©e \fBshow\fP.
+.SS "Priority \fI<prioritÃ©>\fP \fI<hachage>\fP | \fI<numÃ©ro>\fP"
+DÃ©finit la prioritÃ© d'un tÃ©lÃ©chargement spÃ©cifiÃ© par le \fI<hachage>\fP
+ou le \fI<numÃ©ro>\fP.
+
+Valeurs disponibles pour la \fI<prioritÃ©>\fP :
+.RS
+.IP Auto 10
+PrioritÃ© automatique.
+.IP High 10
+PrioritÃ© haute.
+.IP Low 10
+PrioritÃ© basse.
+.IP Normal 10
+PrioritÃ© normal.
+.RE
+.SS_untranslated Progress
+Affiche la progression d'une recherche en cours.
+.SS_untranslated Quit
+Un synonyme de la commande \fBquitter\fP
+.SS "Reload \fI<quoi>\fP"
+Recharge un objet donnÃ©.
+
+Valeurs disponibles pour \fI<quoi>\fP:
+.RS
+.IP Shared 10
+Recharger la liste des fichiers partagÃ©s.
+.IP IPFilter 10
+Recharger les tables IP filter
+.RE
+.SS_untranslated Reset
+RÃ©initialiser le journal.
+.SS_untranslated Results
+Montre les rÃ©sultats de la derniÃ¨re recherche.
+.SS "Resume \fI<hachage>\fP | \fI<numÃ©ro>\fP"
+Reprise du tÃ©lÃ©chargement spÃ©cifiÃ© par le \fI<hachage>\fP ou le
+\fI<numÃ©ro>\fP. Pour obtenir la valeur utilisÃ©e \fBshow\fP.
+.SS "Search \fI<type>\fP \fI<mot clÃ©>\fP"
+Fait une recherche du \fI<mot clÃ©>\fP donnÃ©. Un type de recherche et
+d'un mot clÃ© de recherche sont obligatoires pour le faire. Exemple: `search
+kad amule' effectue une recherche kad pour `amule'.
+
+Types de recherche disponibles :
+.RS
+.IP Global 10
+Effectuer une recherche globale.
+.IP Kad 10
+Effectuer une recherche sur le rÃ©seau Kademlia.
+.IP Local 10
+Effectue une recherche locale.
+.RE
+.SS "Set \fI<quoi>\fP"
+DÃ©finit une valeur compte tenu des prÃ©fÃ©rences.
+
+Valeurs disponibles pour \fI<quoi>\fP:
+.RS
+.IP BwLimits 10
+DÃ©finir les limites de bande passante.
+.IP IPFilter 10
+DÃ©finir les prÃ©fÃ©rences de filtrage d'IP.
+.RE
+.SS "Show \fI<quoi>\fP"
+Montrer la file d'attente des envois/rÃ©ceptions, la liste des serveurs ou la
+liste des fichiers partagÃ©s.
+
+Valeurs disponibles pour \fI<quoi>\fP:
+.RS
+.IP DL 10
+Montrer la file d'attente des rÃ©ceptions.
+.IP Log 10
+Afficher le journal.
+.IP Servers 10
+Afficher la liste des serveurs.
+.IP UL 10
+Montrer la file d'attente des envois.
+.RE
+.SS_untranslated Shutdown
+ArrÃªt du noyau distant exÃ©cutant (amule/amuled). Cela arrÃªtera aussi le
+client en mode texte, car il est inutilisable sans un noyau en cours
+d'exÃ©cution.
+.SS "Statistics [ \fI<numÃ©ro>\fP ]"
+Afficher l'arbre des statistiques.
+
+L'option \fI<numÃ©ro>\fP dans l'interval 255 peut Ãªtre passÃ© comme
+argument Ã  cette commande, ce qui indique le nombre d'entrÃ©es de la
+sous\-arborescence du client qui doit Ãªtre indiquÃ©. Indiquer 0, ou en
+l'omettant, cela signifie 'illimitÃ©'.
+
+Exemple: `statistics 5' affichera seulement le top 5 des versions pour
+chaque type de client.
+.SS_untranslated Status
+Affiche l'Ã©tat de la connexion, et la vitesse actuelle d'Ã©mission/rÃ©ception,
+etc.
+.SH NOTES
+.SS Chemins
+Pour toutes les options prenant en paramÃ¨tre un \fI<chemin>\fP, si le
+\fIchemin\fP ne contient pas de rÃ©pertoire (i.e. juste un nom de fichier),
+alors il sera considÃ©rÃ© comme Ã©tant dans le rÃ©pertoire de configuration
+d'aMule, \fI~/.aMule\fP.
+.SS Langages
+Le paramÃ¨tre \fI<lang>\fP pour \fB\-l\fP l'option a la forme suivante :
+\fIlang\fP[\fB_\fP\fILANG\fP][\fB.\fP\fIencoding\fP][\fB@\fP\fImodifier\fP] oÃ¹ \fIlang\fP est la
+langue principale, \fILANG\fP est is a dialecte, \fIencoding\fP est le caractÃ¨re
+dÃ©fini Ã  utiliser et \fImodifier\fP permet Ã  l'utilisateur de sÃ©lectionner une
+instance spÃ©cifique des donnÃ©es de localisation dans une seule catÃ©gorie.
+
+Par exemple, les chaÃ®nes de caractÃ¨res suivantes sont valables :
+.RS
+.RB_untranslated de
+.br
+.RB_untranslated de_DE
+.br
+.RB_untranslated de_DE.iso88591
+.br
+.RB_untranslated de_DE@euro
+.br
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
+Bien que toutes les chaÃ®nes ci\-dessus sont acceptÃ©es comme des dÃ©finitions
+de langue valide,  \fIencoding\fP et \fImodifier\fP ne sont pas encore utilisÃ©.
+
+En plus du format ci\-dessus, vous pouvez Ã©galement spÃ©cifier des noms entier
+de langue en anglais \- so \fB\-l german\fP est Ã©galement valide et Ã©quivaut Ã 
+\fB\-l de_DE\fP.
+
+En l'absence de paramÃ¨tres linguistiques dÃ©finie, soit sur ââla ligne de
+commande ou dans le fichier de configuration, la langue utilisÃ© par dÃ©faut
+sera celle du systÃ¨me d'exploitation.
 .SH FICHIERS
 ~/.aMule/remote.conf
 .SH EXEMPLE
-Typiquement amulecmd sera lancé la première fois de la façon suivante:
+Typiquement amulecmd sera lancÃ© la premiÃ¨re ainsi :
 .PP
-\fBamulecmd\fR \fB\-h\fR \fIhostname\fR \fB\-p\fR \fIECport\fR \fB\-P\fR \fIECpassword\fR \fB\-w\fR
+\fBamulecmd\fP \fB\-h\fP \fInom de l'hÃ´te\fP \fB\-p\fP \fIport EC\fP \fB\-P\fP \fImot de passe EC\fP
+\fB\-w\fP
 .PP
 ou
 .PP
-\fBamulecmd\fR \fB\-\-create-config-from\fR=\fI/home/username/.aMule/amule.conf\fR
-.PP
-Cela sauvegardera les options dans \fI$HOME/.aMule/remote.conf\fR, et les fois suivantes, vous n'aurez à taper que:
-.PP
-.B amulecmd
+\fBamulecmd\fP \fB\-\-create\-config\-from\fP=\fI/home/username/.aMule/amule.conf\fP
 .PP
-Bien sûr, rien ne vous oblige à suivre cet exemple.
-.SH SIGNALEMENT DES BUGS
-Reportez les bugs sur notre forum (\fIhttp://forum.amule.org/\fR), ou dans notre bugtracker (\fIhttp://bugs.amule.org/\fR).
-N'utilisez ni un e-mail, ni notre liste de diffusion ni ne reportez directement un bug à un membre de notre equipe.
+Cela sauvegardera les options dans \fI$HOME/.aMule/remote.conf\fP, et il
+suffira de taper plus tard :
+
+.B_untranslated amulecmd
+
+Bien sÃ»r, vous n'avez pas Ã  suivre cet exemple.
+.SH "RAPPORTER DES BOGUES"
+Veuillez rapporter les bogues sur notre forum (\fIhttp://forum.amule.org/\fP),
+ou sur notre bugtracker (\fIhttp://bugs.amule.org/\fP).  Veuillez ne pas
+rapporter les bogues par e\-mail, sur notre liste de diffusion ou directement
+Ã  n'importe quel membre  de l'Ã©quipe.
 .SH COPYRIGHT
-aMule et tous les utilitaires associés sont distribués sous licence GNU General Public License.
-.SH VOIR AUSSI
-\fBamule\fR(1), \fBamuleweb\fR(1)
-.SH TRADUCTION
-ThePolish, 2005
+aMule et tout ses outils sont distribuÃ©s sous la licence GNU General Public
+License.
+.SH "VOIR AUSSI"
+.B_untranslated amule\fR(1), \fBamuled\fR(1)
+.SH AUTEUR
+Cette manpage a Ã©tÃ© Ã©crite par Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amulecmd.hu.1 -> aMule-2.3.1.tar.bz2/docs/man/amulecmd.hu.1 Changed

@@ -1,114 +1,288 @@
-.TH AMULECMD 1 "2005 március" "aMuleCmd v2.0.0" "aMule segédprogramok"
-.SH NÉV
-amulecmd \- Szöveges program, az aMule "távvezérléséhez"
-.SH ÁTTEKINTÉS
-.B amulecmd
-.RB [ \-h " " \fI<gép> ]
-.RB [ \-p " " \fI<port> ]
-.RB [ \-P " " \fI<jelszó> ]
-.RB [ \-f " " \fI<fájl> ]
-.RB [ \-l " " \fI<nyelv> ]
-.RB [ \-q ]
-.RB [ \-v ]
-.RB [ \-w ]
-.RB [ \-c " " \fI<parancs> ]
-.PP
-.B amulecmd
-.RB [ \-f " " \fI<fájl> ]
-.B \-\-create-config-from=\fI<fájl>
-.PP
-.B amulecmd
-.RB [ \-\-help ]
-.RB [ \-\-version ]
-.SH LEÍRÁS
-Az \fBamulecmd\fR egy szöveges program, az aMule vezérlésre.
-Hasznos súgó érhetõ el a program indítása után a 'help' paranccsal.
-.SH OPCIÓK
-.TP
-\fB\-h\fR, \fB\-\-host\fR=\fI<gép>\fR
-A gép, ahol az aMule fut (alapértelmezés: \fIlocalhost\fR).
-A \fI<gép>\fR lehet egy IP cím vagy DNS név.
-.TP
-\fB\-p\fR, \fB\-\-port\fR=\fI<port>\fR
-Az aMule távoli elérés portja (alapértelmezés: \fI4712\fR).
-.TP
-\fB\-P\fR, \fB\-\-password\fR=\fI<jelszó>\fR
-A távoli elérés jelszava.
-.TP
-\fB\-f\fR, \fB\-\-config\-file\fR=\fI<fájl>\fR
-A megadott konfigurációs fájlt használja.
-Az alapértelmezés a \fI~/.aMule/remote.conf\fR
-.TP
-\fB\-l\fR, \fB\-\-locale\fR=\fI<nyelv>\fR
-Beállítja a program nyelvét.
-Lásd a \fBMEGJEGYZÉSEK\fR fejezetet a \fI<nyelv>\fR paraméter bõvebb leírásához.
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-Csendes mód, semmit nem ír ki a szabvány kimenetre.
-Az \fBamulecmd\fR-t tekintve ez eléggé felesleges opció :-)
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Bõbeszédû mód, a hibakeresési üzeneteket is megjeleníti.
-.TP
-\fB\-w\fR, \fB\-\-write\-config\fR
-A parancssori paramétereket kiírja a konfigurációs fájlba és kilép.
-.TP
-\fB\-c\fR, \fB\-\-command\fR=\fI<parancs>\fR
-Végrehajtja a megadott parancsot, úgy, mintha azt a saját parancssorába írtuk volna be, majd kilép.
-.TP
-\fB\-\-create\-config\-from\fR=\fI<fájl>\fR
-Konfigurációs fájl készítése a \fI<fájl>\fR alapján, amely az aMule érvényes konfigurációs fájlja kell legyen, majd utána kilép.
-.TP
-\fB\-\-help\fR
-Megjeleníti a súgót és kilép.
-.TP
-\fB\-\-version\fR
-Megjeleníti a program verzióját, majd kilép.
-.SH MEGJEGYZÉSEK
-.SS Elérési utak
-Minden olyan opciónál, amely \fI<fájl>\fR paramétert kér, ha a megadott \fIfájl\fR nem tartalmaz könyvtár komponenst (vagyis tisztán csak egy fájlnév), akkor azt az aMule konfigurációs könyvtárában (\fI~/.aMule\fR) fogja keresni.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULECMD 1 "2011. november" "aMuleCmd v2.3.1" "aMule segÃ©dprogramok"
+.als B_untranslated B
+.als RB_untranslated RB
+.als SS_untranslated SS
+.SH NÃV
+amulecmd \- SzÃ¶veges program az aMule "tÃ¡vvezÃ©rlÃ©sÃ©hez"
+.SH ÃTTEKINTÃS
+.B_untranslated amulecmd
+[\fB\-h\fP \fI<gÃ©p>\fP] [\fB\-p\fP \fI<port>\fP] [\fB\-P\fP
+\fI<jelszÃ³>\fP] [\fB\-f\fP \fI<fÃ¡jl>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<nyelv>\fP] {\fB \fP[\fB\-w\fP]\fB \fP|\fB \fP[\fB\-c\fP
+\fI<parancs>\fP]\fB \fP}
+
+.B_untranslated amulecmd
+[\fB\-\-create\-config\-from\fP=\fI<fÃ¡jl>\fP]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-help ]
+.SH LEÃRÃS
+Az amulecmd egy szÃ¶veges program az aMule vezÃ©rlÃ©sÃ©re.
+.TP 
+\fB[ \-h\fP \fI<gÃ©p>\fP, \fB\-\-host\fP=\fI<gÃ©p>\fP \fB]\fP
+A gÃ©p, amelyen az aMule fut (alapÃ©rtelmezÃ©s: \fIlocalhost\fP). A
+\fI<gÃ©p>\fP lehet egy IP cÃm vagy egy DNS nÃ©v.
+.TP 
+\fB[ \-p\fP \fI<port>\fP, \fB\-\-port\fP=\fI<port>\fP \fB]\fP
+Az aMule tÃ¡voli elÃ©rÃ©s portja, amint az a BeÃ¡llÃtÃ¡sok\->TÃ¡voli ElÃ©rÃ©s
+panelen beÃ¡llÃthatÃ³ (alapÃ©rtelemzÃ©s: \fI4712\fP).
+.TP 
+\fB[ \-P\fP \fI<jelszÃ³>\fP, \fB\-\-password\fP=\fI<jelszÃ³>\fP \fB]\fP
+A tÃ¡voli elÃ©rÃ©s jelszava.
+.TP 
+\fB[ \-f\fP \fI<fÃ¡jl>\fP, \fB\-\-config\-file\fP=\fI<fÃ¡jl>\fP \fB]\fP
+A megadott konfigurÃ¡ciÃ³s fÃ¡jl hasznÃ¡lata. Az alapÃ©rtelmezett konfigurÃ¡ciÃ³s
+fÃ¡jl: \fI~/.aMule/remote.conf\fP
+.TP 
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Ne Ãrjon semmit a szabvÃ¡ny kimenetre.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+BÅbeszÃ©dÅ± mÃ³d \- a hibakeresÃ©si Ã¼zenetek megjelenÃtÃ©se.
+.TP 
+\fB[ \-l\fP \fI<nyelv>\fP, \fB\-\-locale\fP=\fI<nyelv>\fP \fB]\fP
+BeÃ¡llÃtja a program nyelvÃ©t. LÃ¡sd a \fBMEGJEGYZÃSEK\fP fejezetet a
+\fI<nyelv>\fP paramÃ©ter bÅvebb leÃrÃ¡sÃ¡hoz.
+.TP 
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+A parancssori paramÃ©tereket beÃrja a konfigurÃ¡ciÃ³s fÃ¡jlba Ã©s kilÃ©p.
+.TP 
+\fB[ \-c\fP \fI<parancs>\fP, \fB\-\-command\fP=\fI<parancs>\fP \fB]\fP
+VÃ©grehajtja a megadott parancsot, mintha azt a sajÃ¡t parancssorÃ¡ba Ãrtuk
+volna be, majd kilÃ©p.
+.TP 
+\fB[ \-\-create\-config\-from\fP=\fI<fÃ¡jl>\fP \fB]\fP
+KonfigurÃ¡ciÃ³s fÃ¡jl kÃ©szÃtÃ©se a \fI<fÃ¡jl>\fP alapjÃ¡n, amely az aMule
+Ã©rvÃ©nyes konfigurÃ¡ciÃ³s fÃ¡jlja kell legyen, majd utÃ¡na kilÃ©p.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+MegjelenÃti a verziÃ³szÃ¡mot.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Egy rÃ¶vid hasznÃ¡lati leÃrÃ¡st jelenÃt meg.
+.SH PARANCSOK
+Minden parancs Ã©rzÃ©ketlen a kis/nagy betÅ±kre.
+.SS "Add \fI<eD2k\-hivatkozÃ¡s>\fP | \fI<magnet\-hivatkozÃ¡s>\fP"
+Egy eD2k vagy magnet hivatkozÃ¡st ad a letÃ¶ltÃ©shez.
+
+Az eD2k hivatkozÃ¡s a kÃ¶vetkezÅ lehet:
+.RS 3
+.IP \(bu 2
+egy fÃ¡jl hivatkozÃ¡s (ed2k://|file|...), ez a letÃ¶ltÃ©si sorhoz lesz
+hozzÃ¡adva;
+.IP \(bu 2
+egy kiszolgÃ¡lÃ³ hivatkozÃ¡s (ed2k://|server|...), ez a kiszolgÃ¡lÃ³\-listÃ¡hoz
+lesz hozzÃ¡adva;
+.IP \(bu 2
+egy kiszolgÃ¡lÃ³\-lista hivatkozÃ¡s, mely esetben a listÃ¡ban szereplÅ Ã¶sszes
+kiszolgÃ¡lÃ³ a kiszolgÃ¡lÃ³\-listÃ¡hoz adÃ³dik.
+.RE
+
+A magnet hivatkozÃ¡snak tartalmaznia kell az eD2k hash\-t Ã©s a fÃ¡jl hosszÃ¡t.
+.SS "Cancel \fI<hash>\fP | \fI<szÃ¡m>\fP"
+MegszakÃtja a \fI<hash>\fP vagy \fI<szÃ¡m>\fP Ã¡ltal azonosÃtott
+letÃ¶ltÃ©st. Az Ã©rtÃ©kek megszerzÃ©sÃ©hez hasznÃ¡ld a \fBshow\fP parancsot.
+.SS "Connect [ \fIkad\fP | \fIed2k\fP | \fI<ip|nÃ©v>\fP ]"
+KapcsolÃ³dik a hÃ¡lÃ³zathoz.
+
+A BeÃ¡llÃtÃ¡sokban engedÃ©lyezett Ã¶sszes hÃ¡lÃ³zathoz kapcsolÃ³dik.
+
+Az opcionÃ¡lis paramÃ©terrel megadhatÃ³, melyik hÃ¡lÃ³zathoz csatlakozzon. Egy
+kiszolgÃ¡lÃ³ cÃmÃ©nek IP:Port formÃ¡ban tÃ¶rtÃ©nÅ megadÃ¡sÃ¡val (ahol az IP vagy egy
+pontozott decimÃ¡lis cÃm, vagy egy feloldhatÃ³ DNS nÃ©v) az aMule a megadott
+kiszolgÃ¡lÃ³hoz fog csatlakozni.
+.SS_untranslated Disconnect [ \fIed2k\fP | \fIkad\fP ]
+LevÃ¡lasztÃ¡s minden csatlakoztatott hÃ¡lÃ³zatrÃ³l, vagy csak a megadott
+hÃ¡lÃ³zatrÃ³l.
+.SS "Download \fI<szÃ¡m>\fP"
+LetÃ¶lt egy fÃ¡jlt.
+
+Meg kell adni egy fÃ¡jl szÃ¡mÃ¡t a legutÃ³bbi keresÃ©sbÅl. PÃ©ldÃ¡ul: a
+\(Bqdownload 12\(rq parancs az elÅzÅ keresÃ©s eredmÃ©nyei kÃ¶zÃ¼l a 12\-es
+sorszÃ¡mÃº fÃ¡jlt fogja letÃ¶lteni.
+.SS_untranslated Exit
+LevÃ¡lasztÃ¡s az amule(d)\-rÅl Ã©s kilÃ©pÃ©s az amulecmd\-bÅl.
+.SS "Get \fI<mit>\fP"
+Megmutat egy beÃ¡llÃtÃ¡s Ã©rtÃ©ket.
+
+A \fI<mit>\fP lehetsÃ©ges Ã©rtÃ©kei:
+.RS
+.IP BwLimits 10
+SÃ¡vszÃ©lessÃ©g hatÃ¡rok.
+.IP IPFilter 10
+IP\-szÅ±rÅ beÃ¡llÃtÃ¡sok.
+.RE
+.SS "Help [ \fI<parancs>\fP ]"
+Egy rÃ¶vid hasznÃ¡lati leÃrÃ¡st jelenÃt meg. Ha paramÃ©ter nÃ©lkÃ¼l hÃvjuk meg,
+kilistÃ¡zza az elÃ©rhetÅ parancsokat. Ha egy \fI<parancs>\fP\-ot is
+megadunk, rÃ¶vid leÃrÃ¡st ad az adott parancsrÃ³l.
+.SS "Pause \fI<hash>\fP | \fI<szÃ¡m>\fP"
+MegÃ¡llÃtja a \fI<hash>\fP vagy \fI<szÃ¡m>\fP Ã¡ltal azonosÃtott
+letÃ¶ltÃ©st. Az Ã©rtÃ©kek megszerzÃ©sÃ©hez hasznÃ¡ld a \fBshow\fP parancsot.
+.SS "Priority \fI<prioritÃ¡s>\fP \fI<hash>\fP | \fI<szÃ¡m>\fP"
+BeÃ¡llÃtja a \fI<hash>\fP vagy \fI<szÃ¡m>\fP Ã¡ltal azonosÃtott
+letÃ¶ltÃ©s prioritÃ¡sÃ¡t.
+
+A \fI<prioritÃ¡s>\fP lehetsÃ©ges Ã©rtÃ©kei:
+.RS
+.IP Auto 10
+Automatikus prioritÃ¡s.
+.IP High 10
+Magas prioritÃ¡s.
+.IP Low 10
+Alacsony prioritÃ¡s.
+.IP Normal 10
+NormÃ¡l prioritÃ¡s.
+.RE
+.SS_untranslated Progress
+Egy folymatban lÃ©vÅ keresÃ©s Ã¡llapotÃ¡t jelenÃti meg.
+.SS_untranslated Quit
+Az \fBexit\fP parancs szinonÃmÃ¡ja.
+.SS "Reload \fI<mit>\fP"
+A megadott objektum ÃºjratÃ¶ltÃ©se.
+
+A \fI<mit>\fP lehetsÃ©ges Ã©rtÃ©kei:
+.RS
+.IP Shared 10
+A megosztott fÃ¡jlok listÃ¡jt tÃ¶lti Ãºjra.
+.IP IPFilter 10
+Az IP szÅ±rÅ ÃºjratÃ¶ltÃ©se.
+.RE
+.SS_untranslated Reset
+NaplÃ³ ÃºjrakezdÃ©se.
+.SS_untranslated Results
+Az utolsÃ³ keresÃ©s eredmÃ©nyeinek megjelenÃtÃ©se.
+.SS "Resume \fI<hash>\fP | \fI<szÃ¡m>\fP"
+Folytatja a \fI<hash>\fP vagy \fI<szÃ¡m>\fP Ã¡ltal azonosÃtott
+letÃ¶ltÃ©st. Az Ã©rtÃ©kek megszerzÃ©sÃ©hez hasznÃ¡ld a \fBshow\fP parancsot.
+.SS "Search \fI<tÃpus>\fP \fI<kulcsszÃ³>\fP"
+ElindÃt egy keresÃ©st a megadott \fI<kulcsszÃ³>\fP\-ra. KÃ¶telezÅ megadni a
+keresÃ©s tÃpusÃ¡t Ã©s a kulcsszÃ³t. PÃ©lda: a \(Bqsearch kad amule\(rq parancs
+egy Kademlia keresÃ©st indÃt az \(Bqamule\(rq kulcsszÃ³ra.
+
+ElÃ©rhetÅ keresÃ©s tÃpusok:
+.RS
+.IP Global 10
+GlobÃ¡lis keresÃ©st hajt vÃ©gre.
+.IP Kad 10
+A Kademlia hÃ¡lÃ³zaton keres.
+.IP Local 10
+LokÃ¡lis keresÃ©s.
+.RE
+.SS "Set \fI<mit>\fP"
+Egy beÃ¡llÃtÃ¡s Ã©rtÃ©k megvÃ¡ltoztatÃ¡sa.
+
+A \fI<mit>\fP lehetsÃ©ges Ã©rtÃ©kei:
+.RS
+.IP BwLimits 10
+SÃ¡vszÃ©lessÃ©g hatÃ¡rok beÃ¡llÃtÃ¡sa.
+.IP IPFilter 10
+IP\-szÅ±rÅ beÃ¡llÃtÃ¡sainak mÃ³dosÃtÃ¡sa.
+.RE
+.SS "Show \fI<mit>\fP"
+Megmutatja a fel\- Ã©s letÃ¶ltÃ©si sort, a kiszolgÃ¡lÃ³\- Ã©s megosztott fÃ¡jlok
+listÃ¡jÃ¡t.
+
+A \fI<mit>\fP lehetsÃ©ges Ã©rtÃ©kei:
+.RS
+.IP DL 10
+LetÃ¶ltÃ©si lista megjelenÃtÃ©se.
+.IP Log 10
+NaplÃ³ megjelenÃtÃ©se.
+.IP Servers 10
+KiszolgÃ¡lÃ³k listÃ¡jÃ¡nak megjelenÃtÃ©se.
+.IP UL 10
+FeltÃ¶ltÃ©si lista megjelenÃtÃ©se.
+.RE
+.SS_untranslated Shutdown
+LeÃ¡llÃtja a tÃ¡voli magot (amule/amuled). Ez egyszersmind a szÃ¶veges klienst
+is leÃ¡llÃtja, mivel az nemigen hasznÃ¡lhatÃ³ futÃ³ mag nÃ©lkÃ¼l.
+.SS "Statistics [ \fI<szÃ¡m>\fP ]"
+A statisztika fa megjelenÃtÃ©se.
+
+LehetsÃ©ges megadni egy szÃ¡mot a 0\-255 tartomÃ¡nyban, amely megadja az
+Ã¼gyfÃ©l\-verziÃ³k al\-fÃ¡k maximÃ¡lis nagysÃ¡gÃ¡t. Nulla megadÃ¡sa vagy a szÃ¡m teljes
+elhagyÃ¡sa nem korlÃ¡toz.
+
+PÃ©lda: a \(Bqstatistics 5\(rq parancs csak az 5 leggyakoribb Ã¼gyfÃ©l
+vÃ¡ltozatot mutatja minden Ã¼gyfÃ©l tÃpusra.
+.SS_untranslated Status
+MegjelenÃti a kapcsolat Ã¡llapotÃ¡t, pillanatnyi fel\-/letÃ¶ltÃ©si sebessÃ©get,
+stb.
+.SH MEGJEGYZÃSEK
+.SS "ElÃ©rÃ©si utak"
+Minden olyan opciÃ³nÃ¡l amely \fI<fÃ¡jl>\fP paramÃ©tert kÃ©r, ha a megadott
+\fIfÃ¡jl\fP nem tartalmaz kÃ¶nyvtÃ¡r komponenst (vagyis tisztÃ¡n csak egy fÃ¡jlnÃ©v),
+akkor azt az aMule konfigurÃ¡ciÃ³s kÃ¶nyvtÃ¡rÃ¡ban (\fI~/.aMule\fP) fogja keresni.
 .SS Nyelvek
-A \fB\-l\fR opció \fI<nyelv>\fR paramétere a következõ módon adható meg: \fInyelv\fR[\fB_\fITERÜLET\fR][\fB.\fIkódolás\fR][\fB@\fImódosító\fR], ahol \fInyelv\fR az elsõdleges nyelv, \fITERÜLET\fR egy nyelvváltozat/terület kódja, \fIkódolás\fR a karakter készlet kódja és a \fImódosító\fR "lehetõvé teszi, hogy a felhasználó kiválasszon egy meghatározott esetet a helyi jellemzõk adataiból egyetlen kategórián belül".
-.PP
-Például, a következõ értékek mind érvényesek:
+A \fB\-l\fP opciÃ³ \fI<nyelv>\fP paramÃ©tere a kÃ¶vetkezÅkÃ©ppen adhatÃ³ meg:
+\fInyelv\fP[\fB_\fP\fITERÃLET\fP][\fB.\fP\fIkÃ³dolÃ¡s\fP][\fB@\fP\fImÃ³dosÃtÃ³\fP], ahol \fInyelv\fP az
+elsÅdleges nyelv, \fITERÃLET\fP egy nyelvvÃ¡ltozat/terÃ¼let kÃ³dja, \fIkÃ³dolÃ¡s\fP a
+karakterkÃ©szlet kÃ³dja Ã©s a \fImÃ³dosÃtÃ³\fP \(BqlehetÅvÃ© teszi, hogy a
+felhasznÃ¡lÃ³ kivÃ¡lasszon egy meghatÃ¡rozott esetet a helyi jellemzÅk adataibÃ³l
+egyetlen kategÃ³riÃ¡n belÃ¼l\(rq.
+
+PÃ©ldÃ¡ul a kÃ¶vetkezÅ Ã©rtÃ©kek mind Ã©rvÃ©nyesek:
+.RS
+.RB_untranslated de
 .br
-fr
+.RB_untranslated de_DE
 .br
-fr_FR
+.RB_untranslated de_DE.iso88591
 .br
-de_DE.iso88591
+.RB_untranslated de_DE@euro
 .br
-de_DE@euro
-.br
-de_DE.iso88591@euro
-.PP
-Habár a fenieket mind elfogadja a program, mint érvényes nyelvmeghatározást, a \fIkódolás\fR és \fImódosító\fR még nem használt.
-.PP
-Ráadaásként a fenti formátumhoz, megadható akár egy nyelv teljes angol megnevezése is, így például \fB\-l german\fR szintén érvényes, és egyenértékû a \fB-l de_DE\fR megadással.
-.PP
-Ha sem a parancssorban, sem a konfigurációs fájlban nincsen megadva a nyelv, akkor a rendszer alapértelmezett nyelvét fogja használni.
-.SH FÁJLOK
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
+HabÃ¡r a fentieket mind elfogadja a program, mint Ã©rvÃ©nyes
+nyelvmeghatÃ¡rozÃ¡st, a \fIkÃ³dolÃ¡s\fP Ã©s \fImÃ³dosÃtÃ³\fP mÃ©g nem hasznÃ¡lt.
+
+RÃ¡adÃ¡skÃ©nt a fenti formÃ¡tumhoz, megadhatÃ³ akÃ¡r egy nyelv teljes angol
+megnevezÃ©se is, Ãgy pÃ©ldÃ¡ul a \fB\-l german\fP szintÃ©n Ã©rvÃ©nyes Ã©s egyenÃ©rtÃ©kÅ± a
+\fB\-l de_DE\fP megadÃ¡ssal.
+
+Ha sem a konfigurÃ¡ciÃ³s fÃ¡jlban, sem a parancssorban nincs megadva a nyelv,
+akkor a rendszer alapÃ©rtelmezett nyelvÃ©t fogja hasznÃ¡lni.
+.SH FÃJLOK
 ~/.aMule/remote.conf
-.SH PÉLDA
-Tipikusan az \fBamulecmd\fR elsõ indításakor létrehozunk egy konfigurációs fájlt, vagy az
-.PP
-\fBamulecmd\fR \fB\-h\fR \fIgépnév\fR \fB\-p\fR \fIport\fR \fB\-P\fR \fIjelszó\fR \fB\-w\fR
-.PP
-paranccsal, vagy, ha nem akarjuk a parancssorban megadni a jelszót, akkor pl. az
+.SH PÃLDA
+Tipikusan az amulecmd\-t elÅszÃ¶r a kÃ¶vetkezÅkÃ©ppen indÃtjuk:
 .PP
-\fBamulecmd\fR \fB\-\-create-config-from\fR=\fI/home/felhasználónév/.aMule/amule.conf\fR
+\fBamulecmd\fP \fB\-h\fP \fIgÃ©pnÃ©v\fP \fB\-p\fP \fIEC\-port\fP \fB\-P\fP \fIEC\-jelszÃ³\fP \fB\-w\fP
 .PP
-paranccsal. Természetesen a fenti elérési út a helyi viszonyoknak megfelelõen változhat. A beállítások tehát elmentõdnek a \fI$HOME/.aMule/remote.conf\fR fájlba, és ezek után már elég az
+vagy
 .PP
-.B amulecmd
+\fBamulecmd\fP
+\fB\-\-create\-config\-from\fP=\fI/home/felhasznÃ¡lÃ³nÃ©v/.aMule/amule.conf\fP
 .PP
-parancsot beírni.
-.SH HIBÁK JELENTÉSE
-A hibákat kérjük vagy a fórumon (\fIhttp://forum.amule.org/\fR), vagy a hibakövetõben (\fIhttp://bugs.amule.org/\fR) jelentsék.
-Hibákról kérjük ne írjanak levelet (e-mail-t) se a levelzési listára, se közvetlenül valamelyik fejlesztõnek.
+Ez elmenti a beÃ¡llÃtÃ¡sokat a \fI$HOME/.aMule/remote.conf\fP fÃ¡jlba, hogy kÃ©sÅbb
+mÃ¡r csak ezt kelljen Ãrni:
+
+.B_untranslated amulecmd
+
+TermÃ©szetesen nem kÃ¶telezÅ ezt a pÃ©ldÃ¡t kÃ¶vetni.
+.SH "HIBÃK JELENTÃSE"
+A hibÃ¡kat kÃ©rjÃ¼k vagy a fÃ³rumon (\fIhttp://forum.amule.org/\fP), vagy a
+hibakÃ¶vetÅben (\fIhttp://bugs.amule.org/\fP) jelentsÃ©k. HibÃ¡krÃ³l kÃ©rjÃ¼k ne
+Ãrjanak levelet (e\-mail\-t) se a levelezÃ©si listÃ¡ra, se kÃ¶zvetlenÃ¼l
+valamelyik fejlesztÅnek.
 .SH COPYRIGHT
-Az aMule és az összes hozzá tartozó segédprogram a GNU General Public Licence védelme alatt áll.
-.SH LÁSD MÉG
-\fBamule\fR(1), \fBamuleweb\fR(1)
-.SH MAGYAR FORDÍTÁS
-Dévai Tamás <gonosztopi@amule.org>
+Az aMule Ã©s az Ã¶sszes hozzÃ¡ tartozÃ³ segÃ©dprogram a GNU General Public
+License vÃ©delme alatt Ã¡ll.
+.SH "LÃSD MÃG"
+.B_untranslated amule\fR(1), \fBamuled\fR(1)
+.SH SZERZÅ
+Ezt a kÃ©zikÃ¶nyv lapot Vollstrecker <amule@vollstreckernet.de> Ãrta.
+.SH MAGYAR FORDÃTÃS
+DÃ©vai TamÃ¡s <gonosztopi@amule.org>

aMule-2.2.6.tar.bz2/docs/man/amulecmd.it.1 -> aMule-2.3.1.tar.bz2/docs/man/amulecmd.it.1 Changed

@@ -1,260 +1,291 @@
-.TH AMULECMD 1 "Settembre 2009" "aMuleCmd v2.2.6" "aMule utilities"
-.SH NAME
-amulecmd \- Programma basato su console per controllare aMule
-.SH SYNOPSIS
-.B amulecmd
-.RB [ \-h " " \fI<host> ]
-.RB [ \-p " " \fI<port> ]
-.RB [ \-P " " \fI<passwd> ]
-.RB [ \-f " " \fI<path> ]
-.RB [ \-q ]
-.RB [ \-v ]
-.RB [ \-l " " \fI<lang> ]
-.RB [ \-w ]
-.RB [ \-c " " \fI<command> ]
-.PP
-.B amulecmd
-.B \-\-create-config-from=\fI<path>
-.PP
-.B amulecmd
-.RB [ \-\-help ]
-.PP
-.B amulecmd
-.RB [ \-\-version ]
-.SH DESCRIZIONE
-\fBamulecmd\fR è un client basato su console per controllare aMule.
-.TP
-\fB\-h\fR, \fB\-\-host\fR=\fI<host>\fR
-Host in cui aMule è in esecuzione (predefinito: \fIlocalhost\fR).
-\fI<host>\fR potrebbe essere un indirizzo IP o un nome DNS
-.TP
-\fB\-p\fR, \fB\-\-port\fR=\fI<port>\fR
-Porta di aMule per connessioni esterne, come impostato in Preferenze->Controlli remoti (predefinito: \fI4712\fR)
-.TP
-\fB\-P\fR, \fB\-\-password\fR=\fI<passwd>\fR
-Password di connessioni esterne
-.TP
-\fB\-f\fR, \fB\-\-config\-file\fR=\fI<path>\fR
-Utilizza il file di configurazione dato.
-Il file di configurazione predefinito è \fI~/.aMule/remote.conf\fR
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-Non mostrare alcun output in stdout. Ciò sembra un'opzione molto inutile con \fBamulecmd\fR.
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Sii prolisso \- mostra anche messaggi di debug
-.TP
-\fB\-l\fR, \fB\-\-locale\fR=\fI<lang>\fR
-Imposta il locale del programma (linguaggio).
-Consulta la sezione \fBLANGUAGES\fR per la descrizione del parametro \fI<lang>\fR.
-.TP
-\fB\-w\fR, \fB\-\-write\-config\fR
-Scrivi le opzioni della linea di comando nel file di configurazione ed esci
-.TP
-\fB\-c\fR, \fB\-\-command\fR=\fI<command>\fR
-Esegui \fI<command>\fR come se fosse stato inserito nel prompt di amulecmd ed esci.
-.TP
-\fB\-\-create\-config\-from\fR=\fI<path>\fR
-Crea un file di configurazione basato su \fI<path>\fR, che deve puntare su un file di configurazione di aMule valido, e poi esce
-.TP
-\fB\-\-help\fR
-Mostra una breve descrizione di utilizzo.
-.TP
-\fB\-\-version\fR
-Mostra il numero di versione corrente.
-.SH COMMANDS
-Tutti i comandi non dipendono dal caps lock.
-.SS \fBAdd\fR <ed2k-link>
-Aggiunge un collegamento ed2k al nucleo.
-
-Il collegamento ed2k da aggiungere può essere:
-.br
-*) un collegamento file (ed2k://|file|...), sarà aggiunto alla coda degli scaricamenti;
-.br
-*) un collegamento server (ed2k://|server|...), sarà aggiunto all'elenco dei server;
-.br
-*) oppure un collegamento di un elenco di server, nel cui caso tutti i server nell'elenco saranno aggiunti all'elenco dei server.
-
-Questo comando deve avere un argomento.
-.SS \fBCancel\fR <hash>
-Annulla lo scaricamento specificato dall'hash. Per ottenere l'hash utilizza \fIshow\fR.
-.SS \fBConnect\fR (kad|ed2k<ip|name>)
-Connettiti alla rete.
-
-This will connect to all networks that are enabled in Preferences.
-
-When giving ed2k as parameter, it connects only to ed2k-network to servers in your
-serverlist. You may also optionally specify a server address in IP:Port form, to
-connect to that server only. The IP must be a dotted decimal IPv4 address, or a
-resolvable DNS name.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULECMD 1 "Novembre 2011" "aMuleCmd v2.3.1" "Utilità di aMule"
+.als B_untranslated B
+.als RB_untranslated RB
+.als SS_untranslated SS
+.SH NOME
+amulecmd \- programma in console per controllare aMule
+.SH SINTASSI
+.B_untranslated amulecmd
+[\fB\-h\fP \fI<host>\fP] [\fB\-p\fP \fI<porta>\fP] [\fB\-P\fP
+\fI<password>\fP] [\fB\-f\fP \fI<percorso>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<linguaggio>\fP] {\fB \fP[\fB\-w\fP]\fB \fP|\fB \fP[\fB\-c\fP
+\fI<comando>\fP]\fB \fP}
 
-When giving kad, it connects to Kad only.
-.SS \fBDisconnect\fR (ed2k|kad)
+.B_untranslated amulecmd
+[\fB\-\-create\-config\-from\fP=\fI<percorso>\fP]
 
-Disconnettiti da tutte le reti a cui sei conesso, o semplicemente disconnettiti dalla
-rete specificata.
-.SS \fBDownload\fR num
-Avvia lo scaricamento di un file.
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-version ]
 
-The number of a file from the last search has to be given.
-Example: 'download 12' will start to download the file with the number 12 of the
-previous search.
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-help ]
+.SH DESCRIZIONE
+\fBamulecmd\fP è un client in console per controllare aMule.
+.TP 
+\fB[ \-h\fP \fI<host>\fP, \fB\-\-host\fP=\fI<host>\fP \fB]\fP
+Computer dove è in esecuzione aMule (default:
+\fIlocalhost\fP). \fI<host>\fP può essere un indirizzo IP o un nome DNS.
+.TP 
+\fB[ \-p\fP \fI<porta>\fP, \fB\-\-port\fP=\fI<porta>\fP \fB]\fP
+Porta di aMule per le connessioni esterne, come impostata nelle
+preferenze\->controllo remoto (default: \fI4712\fP)
+.TP 
+\fB[ \-P\fP \fI<password>\fP, \fB\-\-password\fP=\fI<password>\fP \fB]\fP
+Password delle connessioni esterne.
+.TP 
+\fB[ \-f\fP \fI<percorso>\fP, \fB\-\-config\-file\fP=\fI<percorso>\fP \fB]\fP
+Usa il file di configurazione fornito. Il file di configurazione di default
+è \fI~/.aMule/remote.conf\fP
+.TP 
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Non scrivere nulla nello stdout.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Mostra anche i messaggi di debug.
+.TP 
+\fB[ \-l\fP \fI<linguaggio>\fP, \fB\-\-locale\fP=\fI<linguaggio>\fP \fB]\fP
+Imposta il linguaggio del programma. Vedi anche la sezione delle \fBNOTE\fP per
+la descrizione del parametro \fI<linguaggio>\fP .
+.TP 
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+Scrive le opzioni della riga di comando nel file di configurazione ed esce.
+.TP 
+\fB[ \-c\fP \fI<comando>\fP, \fB\-\-command\fP=\fI<comando>\fP \fB]\fP
+Esegue il \fI<comando>\fP come se fosse stato immesso nel prompt di
+amulecmd ed esce.
+.TP 
+\fB[ \-\-create\-config\-from\fP=\fI<percorso>\fP \fB]\fP
+Crea un file di configurazione basandosi sul \fI<percorso>\fP, che deve
+puntare ad un file di configurazione di aMule valido, e quindi esce.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Visualizza il numero di versione corrente.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Visualizza una breve descrizione dell'utilizzo.
+.SH COMANDI
+Tutti i comandi non distinguono tra maiuscolo e minuscolo.
+.SS "Add \fI<collegamento\-eD2k>\fP | \fI<collegamento\-magnet>\fP"
+Aggiunge un collegamento eD2k o un collegamento magnet.
 
-Questo comando deve avere un argomento.
-.SS \fBExit\fR
-Disconnect from amule/amuled and quit amulecmd.
-.SS \fBGet\fR value
-Ottieni e mostra un valore di preferenza.
+Il collegamento eD2k da aggiungere può essere:
+.RS 3
+.IP \(bu 2
+un collegamento a un file (ed2k://|file|...), sarà aggiunto alla coda di
+download;
+.IP \(bu 2
+un collegamento a un server (ed2k://|server|...), sarà aggiunto alla lista
+dei server;
+.IP \(bu 2
+un collegamento ad una lista di server, nel cui caso tutti i server
+contenuti nella lista saranno aggiunti alla lista dei server correnti.
+.RE
 
-Questo comando è incompleto, valori disponibili sono elencati qua sotto.
+Il collegamento magnet deve contenere l'hash eD2k e la lunghezza del file.
+.SS "Cancel \fI<hash>\fP | \fI<numero>\fP"
+Cancella il download specificato da \fI<hash>\fP o
+\fI<numero>\fP. Per ottenere il valore utilizzare \fBshow\fP.
+.SS "Connect [ \fIkad\fP | \fIed2k\fP | \fI<ip|nome>\fP ]"
+Connessione alla rete.
 
-Valori disponibili per ottenere:
-.br
-BwLimits	Ottieni i limiti della larghezza della banda.
-.br
-IPFilter	Ottieni le preferenze IPFilter.
-.SS \fBHelp\fR <command>
-Ottieni un breve aiuto.
-If called without parameter, it shows a list of available commands.
-If called with <command>, it shows a short description of the given command.
-.SS \fBPause\fR <hash>
-Pauses the download specified by hash. To get the hash use \fIshow\fR.
-.SS \fBProgress\fR
-Shows the progress of an on\-going search.
+Questo avvierà la connessione a tutte le reti abilitate nelle preferenze.
 
-Questo comando non può avere un argomento.
-.SS \fBQuit\fR
-Esce dall'applicazione.
+Con il parametro opzionale si può specificare a che rete
+connettersi. Fornendo un indirizzo di server nella forma IP:Porta (dove IP è
+un indirizzo IPv4 in forma decimale puntata o un nome DNS risolvibile) aMule
+si connetterà solo a quel server.
+.SS_untranslated Disconnect [ \fIed2k\fP | \fIkad\fP ]
+Disconnette da tutte le reti attualmente connesse, o disconnette solo dalla
+rete specificata.
+.SS "Download \fI<numero>\fP"
+Inizia il download di un file.
 
-Questo comando non può avere un argomento.
-.SS \fBReload\fR
-Ricarica un oggetto dato.
+Deve essere fornito il \fI<numero>\fP di un file dall'ultima
+ricerca.Esempio: `download 12' inizierà il download del file numero 12 della
+ricerca precedente.
+.SS_untranslated Exit
+Disconnette da amule/amuled ed esce da amulecmd.
+.SS "Get \fI<oggetto>\fP"
+Legge e visualizza un valore delle preferenze.
 
-Questo comando è incompleto, valori disponibili sono elencati qua sotto.
+I valori disponibili per l'\fI<oggetto>\fP sono:
+.RS
+.IP BwLimits 10
+Legge i limiti di banda.
+.IP IPFilter 10
+Legge le preferenze del filtro IP.
+.RE
+.SS "Help [ \fI<comando>\fP ]"
+Visualizza una breve descrizione dell'uso. Se chiamato senza parametro,
+mostra una lista dei comandi disponibili. Se chiamato con il parametro
+\fI<command>\fP, mostra una breve descrizione del comando dato
+.SS "Pause \fI<hash>\fP | \fI<numero>\fP"
+Mette in pausa il download specificato da \fI<hash>\fP o
+\fI<numero>\fP. Per ottenere il valore utilizzare \fBshow\fP.
+.SS "Priority \fI<priorità>\fP \fI<hash>\fP | \fI<numero>\fP"
+Imposta la priorità di un download specificato da \fI<hash>\fP o
+\fI<numero>\fP.
 
-Valori disponibili da ottenere:
-.br
-BwLimits	Reload bandwidth limits.
-.br
-IPFilter	Reload IPFilter preferences.
-.SS \fBReset\fR
-Reset the log.
-
-Questo comando non può avere un argomento.
-.SS Results\fR
-Shows you the results of the last search.
+I valori disponibili per \fI<priorità>\fP sono:
+.RS
+.IP Auto 10
+Priorità automatica.
+.IP High 10
+Priorità alta.
+.IP Low 10
+Priorità bassa.
+.IP Normal 10
+Priorità normale.
+.RE
+.SS_untranslated Progress
+Mostra i progressi di una ricerca in corso.
+.SS_untranslated Quit
+Un sinonimo del comando \fBexit\fP.
+.SS "Reload \fI<oggetto>\fP"
+Ricarica un dato oggetto
 
-Questo comando non può avere un argomento.
-.SS \fBResume\fR <hash>
-Resumes the download specified by hash. To get the hash use \fIshow\fR.
-.SS \fBSearch\fR global|kad|local file
-Makes a search for the given file. A searchtype and a file to search is mandatory
-to do this.
-\fIExample\fR 'search kad amule' performs a kad search for amule.
+I valori disponibili per l'\fI<oggetto>\fP sono:
+.RS
+.IP Shared 10
+Ricarica la lista dei file condivisi.
+.IP IPFilter 10
+Ricarica la tabella dei filtri IP.
+.RE
+.SS_untranslated Reset
+Cancella il log.
+.SS_untranslated Results
+Mostra i risultati dell'ultima ricerca.
+.SS "Resume \fI<hash>\fP | \fI<numero>\fP"
+Riprende il download specificato da \fI<hash>\fP o
+\fI<numero>\fP. Per ottenere il valore utilizzare \fBshow\fP.
+.SS "Search \fI<tipo>\fP \fI<parola\-chiave>\fP"
+Esegue una ricerca per la data \fI<parola\-chiave>\fP. Il tipo della
+ricerca e una parola chiave da cercare sono obbligatori. Esempio: `search
+kad amule' esegue una ricerca sulla rete kad per `amule'.
 
-Available searchtypes:
-.br
-global	performs a global search
-.br
-kad	performs a search on kad network
-.br
-local	performs a local search
-.SS \fBSet\fR <value>
-Imposta un valore di preferenze dato.
+Tipi di ricerca disponibili:
+.RS
+.IP Global 10
+Esegue una ricerca globale.
+.IP Kad 10
+Esegue una ricerca sulla rete Kademlia.
+.IP Local 10
+Esegue una ricerca locale.
+.RE
+.SS "Set \fI<oggetto>\fP"
+Imposta un dato valore di preferenza.
 
-This command is incomplete, available values are listed below.
+I valori disponibili per l'\fI<oggetto>\fP sono:
+.RS
+.IP BwLimits 10
+Imposta i limiti di banda.
+.IP IPFilter 10
+Imposta le preferenze del filtro IP.
+.RE
+.SS "Show \fI<oggetto>\fP"
+Mostra la coda di upload/download, la lista dei server o la lista dei file
+condivisi.
 
-Available values to get:
-.br
-BwLimits	Set bandwidth limits.
-.br
-IPFilter	Set IPFilter preferences.
-.SS \fBShow\fR DL|Log|Servers|UL
-Shows upload/download queue, servers list or shared files list.
+I valori disponibili per l'\fI<oggetto>\fP sono:
+.RS
+.IP DL 10
+Mostra la coda di download.
+.IP Log 10
+Mostra il log.
+.IP Servers 10
+Mostra la lista dei server.
+.IP UL 10
+Mostra la coda di upload.
+.RE
+.SS_untranslated Shutdown
+Chiude il motore remoto in esecuzione (amule/amuled). Questo chiuderà anche
+il cliente in formato testo, siccome è inutile senza un motore in
+esecuzione.
+.SS "Statistics [ \fI<numero>\fP ]"
+Mostra l'albero delle statistiche.
 
-Questo comando deve avere un argomento.
+Il \fI<numero>\fP opzionale, nell'intervallo 0\-255, può essere passato
+come argomento a questo comando per indicare quante righe del ramo delle
+versioni dei client devono essere mostrate. Indicando 0, o omettendo il
+parametro significa `illimitato'.
 
-This command is incomplete, you must use one of the extensions below.
+Esempio: `statistics 5' mostrerà solo le prime 5 versioni per ogni tipo di
+client.
+.SS_untranslated Status
+Mostra lo stato della connessione, le velocità correnti di up/download, ecc.
+.SH NOTE
+.SS Percorsi
+Per tutte le opzioni che accettano un \fI<percorso>\fP, se il
+\fIpercorso\fP non contiene una directory (ossia è solo un nome di file),
+allora si assume che esso sia presente nella directory di configurazione di
+aMule, \fI~/.aMule\fP.
+.SS Linguaggi
+Il parametro \fI<linguaggio>\fP per l'opzione \fB\-l\fP ha la forma
+seguente:
+\fIlinguaggio\fP[\fB_\fP\fILINGUAGGIO\fP][\fB.\fP\fIcodifica\fP][\fB@\fP\fImodificatore\fP] dove
+\fIlinguaggio\fP è il linguaggio primario, \fILINGUAGGIO\fP è il
+sottotipo/territorio, \fIcodifica\fP è l'insieme di caratteri usato e
+\fImodificatore\fP consente all'utente di selezionare una specifica istanza dei
+dati di localizzazione all'interno di una singola categoria.
 
-Estensioni disponibili:
+Per esempio, le stringhe seguenti sono valide:
+.RS
+.RB_untranslated de
 .br
-DL		Mostra coda scaricamenti.
+.RB_untranslated de_DE
 .br
-Log		Mostra registro.
+.RB_untranslated de_DE.iso88591
 .br
-Servers	Mostra elenco server.
+.RB_untranslated de_DE@euro
 .br
-UL		Mostra coda caricamenti.
-.SS \fBShutdown\fR
-Shutdown the remote running core (amule/amuled).
-This will also shut down the text client, since it is unusable without a running
-core.
+.RB_untranslated de_DE.iso88591@euro
+.RE
 
-This command can't have an argument.
-.SS \fBStatistics\fR <num>
-Show statistics tree.
+Sebbene tutte le stringhe sopra elencate sono accettate come definizioni di
+linguaggio valide, \fIcodifica\fP e \fImodificatore\fP sono ancora inutilizzati.
 
-The optional number in the range of 0-255 can be passed as argument to this
-command, which tells how many entries of the client version subtree should be
-shown. Passing 0, or omitting it means 'unlimited'.
+In aggiunta al formato di cui sopra, si può anche specificare il nome
+completo del linguaggio in inglese, e quindi \fB\-l german\fP è valido ed
+equivalente a \fB\-l de_DE\fP.
 
-\fIExample:\fR 'statistics 5' will show only the top 5 versions for each client
-type.
-.SS \fBStatus\fR
-Show connection status, current up/download speeds, etc.
-.PP
-.SH NOTE
-.SS Percorsi
-For all options which take a \fI<path>\fR value, if the \fIpath\fR contains no
-directory part (i.e. just a plain filename), then it is considered to be under
-the aMule configuration directory, \fI~/.aMule\fR.
-.SS LANGUAGES
-The \fI<lang>\fR parameter for the \fB\-l\fR option has the following form: \fIlang\fR[\fB_\fILANG\fR][\fB.\fIencoding\fR][\fB@\fImodifier\fR]
-where \fIlang\fR is the primary language, \fILANG\fR is a sublanguage/territory,
-\fIencoding\fR is the character set to use and \fImodifier\fR
-"allows the user to select a specific instance of localization data within a
-single category".
-.PP
-Per esempio, le stringhe seguenti sono valide:
-.br
-de
-.br
-de_DE
-.br
-de_DE.iso88591
-.br
-de_DE@euro
-.br
-de_DE.iso88591@euro
-.PP
-Though all the above strings are accepted as valid language definitions,
-\fIencoding\fR and \fImodifier\fR are yet unused.
-.PP
-In addition to the format above, you can also specify full language names in
-English - so \fB\-l german\fR is also valid and is equal to \fB-l de_DE\fR.
-.PP
-When no locale is defined, either on command-line or in config file, system
-default language will be used.
+Quando nessun linguaggio è definito in riga di comando o nel file di
+configurazione, verrà usato il linguaggio di default del sistema.
 .SH FILE
 ~/.aMule/remote.conf
 .SH ESEMPIO
-Di norma amulecmd sarà eseguito inizialmente come:
-.PP
-\fBamulecmd\fR \fB\-h\fR \fIhostname\fR \fB\-p\fR \fIECport\fR \fB\-P\fR \fIECpassword\fR \fB\-w\fR
-.PP
-or
+Di norma amulecmd sarà inizialmente eseguito come:
 .PP
-\fBamulecmd\fR \fB\-\-create-config-from\fR=\fI/home/username/.aMule/amule.conf\fR
+\fBamulecmd\fP \fB\-h\fP \fInomehost\fP \fB\-p\fP \fIportaEC\fP \fB\-P\fP \fIpasswordEC\fP \fB\-w\fP
 .PP
-These will save settings to \fI$HOME/.aMule/remote.conf\fR, and later you only need to type:
+o
 .PP
-.B amulecmd
+\fBamulecmd\fP \fB\-\-create\-config\-from\fP=\fI/home/username/.aMule/amule.conf\fP
 .PP
-Ovviamente, non devi seguire questo esempio.
-.SH SEGNALARE BUG
-Please report bugs either on our forum (\fIhttp://forum.amule.org/\fR), or in our bugtracker (\fIhttp://bugs.amule.org/\fR).
-Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member.
+In questo modo la configurazione verrà salvata in
+\fI$HOME/.aMule/remote.conf\fP, e le volte successive si dovrà solo digitare:
+
+.B_untranslated amulecmd
+
+Ma non è necessario seguire questo esempio.
+.SH "SEGNALARE I BUG"
+Per favore segnalare i bug nel nostro forum (\fIhttp://forum.amule.org/\fP) o
+nel nostro bugtracker (\fIhttp://bugs.amule.org/\fP). Per favore non segnalare
+i bug via posta elettronica, né nella nostra mailing list né direttamente a
+qualunque membro del gruppo.
 .SH COPYRIGHT
-aMule and all of its related utilities are distributed under the GNU General Public License.
-.SH SEE ALSO
-\fBamule\fR(1), \fBamuleweb\fR(1)
+aMule e tutti i programmi di utilità correlati sono distribuiti in accordo
+alla GNU General Public License.
+.SH "VEDI ANCHE"
+.B_untranslated amule\fR(1), \fBamuled\fR(1)
+.SH AUTORE
+Questa pagina del manuale è stata scritta da Vollstrecker
+<amule@vollstreckernet.de>
+.SH TRADUZIONE ITALIANA
+Stefano Corti <iz0bbz@libero.it>

aMule-2.3.1.tar.bz2/docs/man/amulecmd.ru.1 Added

@@ -0,0 +1,283 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULECMD 1 "November 2011" "aMuleCmd v2.3.1" "утилиты aMule"
+.als B_untranslated B
+.als RB_untranslated RB
+.als SS_untranslated SS
+.SH ИМЯ
+amulecmd \- консольная программа для управления aMule
+.SH ОБЗОР
+.B_untranslated amulecmd
+[\fB\-h\fP \fI<хост>\fP] [\fB\-p\fP \fI<порт>\fP] [\fB\-P\fP
+\fI<пароль>\fP] [\fB\-f\fP \fI<путь>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<язык>\fP] {\fB \fP[\fB\-w\fP]\fB \fP|\fB \fP[\fB\-c\fP
+\fI<команда>\fP]\fB \fP}
+
+.B_untranslated amulecmd
+[\fB\-\-create\-config\-from\fP=\fI<путь>\fP]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-help ]
+.SH ОПИСАНИЕ
+\fBamulecmd\fP консольный клиент для управления программой aMule.
+.TP 
+\fB[ \-h\fP \fI<хост>\fP, \fB\-\-host\fP=\fI<хост>\fP \fB]\fP
+Адрес компьютера на котором работает aMule (по умолчанию:
+\fIlocalhost\fP). \fI<Хост>\fP может быть IP\-адресом или DNS\-именем.
+.TP 
+\fB[ \-p\fP \fI<порт>\fP, \fB\-\-port\fP=\fI<порт>\fP \fB]\fP
+Порт, который использует aMule для внешних соединений. Указывается в
+Настройках\->Удаленное управление (по умолчанию: \fI4712\fP)
+.TP 
+\fB[ \-P\fP \fI<пароль>\fP, \fB\-\-password\fP=\fI<пароль>\fP \fB]\fP
+Пароль для внешних соединений.
+.TP 
+\fB[ \-f\fP \fI<путь>\fP, \fB\-\-config\-file\fP=\fI<путь>\fP \fB]\fP
+Использовать указанный файл конфигурации. По умолчанию используется
+\fI~/.aMule/remote.conf\fP
+.TP 
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Не печетать ничего в стандартный вывод.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Выводить также отладочную информацию.
+.TP 
+\fB[ \-l\fP \fI<язык>\fP, \fB\-\-locale\fP=\fI<язык>\fP \fB]\fP
+Задать локаль (язык). См. секцию \fBЗАМЕЧАНИЯ\fP для дополнительной информации
+по параметру \fI<язык>\fP.
+.TP 
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+Записать параметр командной строки в файл конфигурации и выйти
+.TP 
+\fB[ \-c\fP \fI<команда>\fP, \fB\-\-command\fP=\fI<команда>\fP \fB]\fP
+Выполнить \fI<команду>\fP как если бы она была введена в консоль
+amulecmd и выйти.
+.TP 
+\fB[ \-\-create\-config\-from\fP=\fI<путь>\fP \fB]\fP
+Создать файл конфигурации на основе файла указанного в \fI<пути>\fP и
+выйти. Указанный файл должен быть валидным файлом конфигурации aMule.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Выводит информацию о версии.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Выводит короткую помощь по использованию.
+.SH КОМАНДЫ
+Все команды чувствительны к регистру.
+.SS "Add \fI<eD2k\-ссылка>\fP | \fI<magnet\-ссылка>\fP"
+Добавляет eD2k\-ссылку или magnet\-ссылку в ядро.
+
+Добавляемая eD2k\-ссылка может быть:
+.RS 3
+.IP \(bu 2
+файловая ссылка (ed2k://|file|...), она будет добавлена в очередь закачки;
+.IP \(bu 2
+серверная ссылка (ed2k://|server|...), она будет добавлена в список
+серверов;
+.IP \(bu 2
+ссылка на список серверов, в этом случае все серверы из списка будут
+добавлены в список серверов.
+.RE
+
+Magnet\-ссылка должна содержать eD2k\-хэш и размер файла.
+.SS "Cancel \fI<хэш>\fP | \fI<номер>\fP"
+Отменяет закачку указанную по \fI<хэшу>\fP или
+\fI<номеру>\fP. Чтобы определить значения, воспользуйтесь командой
+\fBshow\fP.
+.SS "Connect [ \fIkad\fP | \fIed2k\fP | \fI<ip|имя>\fP ]"
+Подключиться к сети.
+
+Это подсоединит ко всем сетям, включенным в настройках.
+
+С помощью дополнительного параметра можно указать сеть к которой будет
+произведено подключение. При указании адреса сервера в виде IP:Порт (где IP
+может быть либо цифровым представлением IPv4 либо DNS\-именем) aMule
+подключится только к этому серверу.
+.SS_untranslated Disconnect [ \fIed2k\fP | \fIkad\fP ]
+Отсоединяет от всех сетей, или только от указанной сети.
+.SS "Download \fI<номер>\fP"
+Начать закачку файла.
+
+Должен быть указан \fI<номер>\fP файла в последнем поиске.  Пример:
+`download 12' поставит на закачку файл, который был под номером 12 в
+последнем поиске.
+.SS_untranslated Exit
+Отключится от amule/amuled и выйти из amulecmd.
+.SS "Get \fI<параметр>\fP"
+Вывести параметр настроек.
+
+Возможные значения поля \fI<параметр>\fP:
+.RS
+.IP BwLimits 10
+Вывести ограничения канала.
+.IP IPFilter 10
+Вывести настройки IPFilter.
+.RE
+.SS "Help [ \fI<команда>\fP ]"
+Вывести короткую справку. Если вызвана без параметров, выводит список
+возможных команд. Если вызвана с параметром \fI<команда>\fP, показывает
+справку по данной команде.
+.SS "Pause \fI<хэш>\fP | \fI<номер>\fP"
+Ставит на паузу закачку указанную по \fI<хэшу>\fP или
+\fI<номеру>\fP. Чтобы определить значения, воспользуйтесь командой
+\fBshow\fP.
+.SS "Priority \fI<приоритет>\fP \fI<хэш>\fP | \fI<номер>\fP"
+Указывает приоритет закачки указанной по \fI<хэшу>\fP или
+\fI<номеру>\fP
+
+Возможные значения \fI<приоритета>\fP:
+.RS
+.IP Auto 10
+Автоматический приоритет.
+.IP High 10
+Высокий приоритет.
+.IP Low 10
+Низкий приоритет.
+.IP Normal 10
+Нормальный приоритет.
+.RE
+.SS_untranslated Progress
+Показывает состояние работающего поиска.
+.SS_untranslated Quit
+То же что и \fBexit\fP.
+.SS "Reload \fI<объект>\fP"
+Обновляет указанный объект.
+
+Возможные значения поля \fI<параметр>\fP:
+.RS
+.IP Shared 10
+Обновляет список публикуемых файлов.
+.IP IPFilter 10
+Обновляет таблицы IP фильтра.
+.RE
+.SS_untranslated Reset
+Обнуляет лог.
+.SS_untranslated Results
+Выводит результат последнего поиска.
+.SS "Resume \fI<хэш>\fP | \fI<номер>\fP"
+Возобновляет закачку указанную по \fI<хэшу>\fP или
+\fI<номеру>\fP. Чтобы определить значения, воспользуйтесь командой
+\fBshow\fP.
+.SS "Search \fI<тип>\fP \fI<слово>\fP"
+Производит поиск по указанному \fI<слову>\fP. Указание типа и слова
+обязательны. Пример: `search kad amule' производит поиск по kad по слову
+`amule'.
+
+Возможные типы поиска:
+.RS
+.IP Global 10
+Глобальный поиск.
+.IP Kad 10
+Поиск по сети kademlia.
+.IP Local 10
+Локальный поиск.
+.RE
+.SS "Set \fI<параметр>\fP"
+Задает указанный параметр.
+
+Возможные значения поля \fI<параметр>\fP:
+.RS
+.IP BwLimits 10
+Задает ограничения канала.
+.IP IPFilter 10
+Задает параметры IPFilter.
+.RE
+.SS "Show \fI<элемент>\fP"
+Выводит очередь закачки/отдачи, список серверов или опубликованные файлы.
+
+Возможные значения поля \fI<параметр>\fP:
+.RS
+.IP DL 10
+Выводит очередь закачки.
+.IP Log 10
+Выводит лог.
+.IP Servers 10
+Выводит список серверов.
+.IP UL 10
+Выводит список отдачи.
+.RE
+.SS_untranslated Shutdown
+Завершает работу ядра (amule/amuled). Так же завершает работу amulecmd,
+т.к. он бесполезен без работающего ядра.
+.SS "Statistics [ \fI<число>\fP ]"
+Выводит дерево статистики.
+
+Параметр \fI<число>\fP может быть в промежутке 0\-255, и будет
+показывать сколько элементов показывать в под\-дереве `версия
+клиента'. Указание 0 или пропуск означает `неограниченно'.
+
+Пример: `statistics 5' покажет только 5 наиболее популярных версий для
+каждого типа клиента.
+.SS_untranslated Status
+Вывести статус соединения, скорости, итд.
+.SH ЗАМЕЧАНИЯ
+.SS Пути
+Для всех опций, в которых указывается \fI<путь>\fP, если \fIпуть\fP не
+содержит каталога (т.е. только имя самого файла), то предполагается, что
+файл находится в каталоге конфигурации, \fI~/.aMule\fP.
+.SS Языки
+Параметр \fI<язык>\fP для опции \fB\-l\fP имеет следующую форму:
+\fIязык\fP[\fB_\fP\fIЯЗЫК\fP][\fB.\fP\fIкодировка\fP][\fB@\fP\fIмодификатор\fP], где \fIязык\fP
+является основным языком, \fIЯЗЫК\fP \- диалект/территория, \fIкодировка\fP \-
+используемая кодировка символов и \fIмодификатор\fP позволяет пользователю
+использовать определенный вариант локализации в данной категории.
+
+К примеру, все следующие строчки являются приемлемыми:
+.RS
+.RB_untranslated de
+.br
+.RB_untranslated de_DE
+.br
+.RB_untranslated de_DE.iso88591
+.br
+.RB_untranslated de_DE@euro
+.br
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
+Хотя все приведенный строки будут приняты, поля \fIкодировка\fP и
+\fIмодификатор\fP пока не используются.
+
+К дополнению к приведенному формату, можно просто указать английское имя
+языка. Так, \fB\-l russian\fP тоже приемлемо и равносильно \fB\-l ru_RU\fP.
+
+Когда язык не указан ни в качестве опции ни в файле конфигурации,
+используется системный.
+.SH ФАЙЛЫ
+~/.aMule/remote.conf
+.SH ПРИМЕРЫ
+Как правило, в первый раз amulecmd запускается так:
+.PP
+\fBamulecmd\fP \fB\-h\fP \fIимя_хоста\fP \fB\-p\fP \fIEC_порт\fP \fB\-P\fP \fIEC_пароль\fP \fB\-w\fP
+.PP
+или
+.PP
+\fBamulecmd\fP \fB\-\-create\-config\-from\fP=\fI/home/username/.aMule/amule.conf\fP
+.PP
+Это сохранит параметры в \fI$HOME/.aMule/remote.conf\fP, и в дальнейшем надо
+будет только набрать:
+
+.B_untranslated amulecmd
+
+Конечно, вы не обязаны следовать этим рекомендациям.
+.SH "СООБЩЕНИЕ ОБ ОШИБКАХ"
+Пожалуйста, сообщайте об ошибках либо на нашем форуме
+(\fIhttp://forum.amule.org/\fP), либо в багтрекере
+(\fIhttp://bugs.amule.org/\fP). Пожалуйста, не сообщайте об ошбках по
+электронной почте, по нашим спискам рассылки, или напрямую участникам.
+.SH "АВТОРСКИЕ ПРАВА"
+aMule и все прилагающиеся инструменты распространаются под Открытым
+Лицензионным Соглашением GNU (GNU GPL).
+.SH "СМ. ТАКЖЕ"
+.B_untranslated amule\fR(1), \fBamuled\fR(1)
+.SH АВТОРЫ
+Автор страницы помощи: Vollstrecker <amule@vollstreckernet.de>,
+перевод: Radist Morse <radist.morse@gmail.com>

aMule-2.3.1.tar.bz2/docs/man/amulecmd.tr.1 Added

@@ -0,0 +1,281 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULECMD 1 "Kasım 2011" "aMuleCmd v2.3.1" "aMule yardımcı araçları"
+.als B_untranslated B
+.als RB_untranslated RB
+.als SS_untranslated SS
+.SH İSİM
+amulecmd \- aMule'ü yönetmek için konsol temelli bir program
+.SH KULLANIM
+.B_untranslated amulecmd
+[\fB\-h\fP \fI<sunucu>\fP] [\fB\-p\fP \fI<port>\fP] [\fB\-P\fP
+\fI<şifre>\fP] [\fB\-f\fP \fI<yol>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<dil>\fP] {\fB \fP[\fB\-w\fP]\fB \fP|\fB \fP[\fB\-c\fP \fI<komut>\fP]\fB
+\fP}
+
+.B_untranslated amulecmd
+[\fB\-\-create\-config\-from\fP=\fI<yol>\fP]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amulecmd
+.RB_untranslated [ \-\-help ]
+.SH AÇIKLAMA
+\fBamulecmd\fP aMule'ü yönetmek için konsol temelli bir programdır.
+.TP 
+\fB[ \-h\fP \fI<sunucu>\fP, \fB\-\-host\fP=\fI<sunucu>\fP \fB]\fP
+aMule'ün çalıştığı sunucu ya da bilgisayar (varsayılan:
+\fIlocalhost\fP). \fI<sunucu>\fP bir IP adresi ya da DNS ismi olabilir
+.TP 
+\fB[ \-p\fP \fI<port>\fP, \fB\-\-port\fP=\fI<port>\fP \fB]\fP
+aMule'ün dışarıya bağlandığında kullandığı port, Ayarlar\->Uzak
+Denetimler seçeneğinde belirlenir (varsayılan: \fI4712\fP)
+.TP 
+\fB[ \-P\fP \fI<şifre>\fP, \fB\-\-password\fP=\fI<şifre>\fP \fB]\fP
+Dışarıdan yapılan bağlantılar için şifre.
+.TP 
+\fB[ \-f\fP \fI<yol>\fP, \fB\-\-config\-file\fP=\fI<yol>\fP \fB]\fP
+Belirtilen yapılandırma dosyasını kullanır. Varsayılan yapılandırma dosyası
+şudur: \fI~/.aMule/remote.conf\fP
+.TP 
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Standart çıktıya hiçbir veri yazdırmaz.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Geveze olur \- debug mesajlarını da gösterir.
+.TP 
+\fB[ \-l\fP \fI<dil>\fP, \fB\-\-locale\fP=\fI<dil>\fP \fB]\fP
+Programın kullandığı dili belirler. \fI<dil>\fP parametresinin
+tanımlaması için \fBNOTLAR\fP bölümüne bakınız.
+.TP 
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+Komut satırı seçeneklerini yapılandırma dosyasına yazıp çıkar
+.TP 
+\fB[ \-c\fP \fI<komut>\fP, \fB\-\-command\fP=\fI<komut>\fP \fB]\fP
+\fI<komut>\fPu amulecmd'ın komut istemine girilmiş gibi çalıştırır ve
+çıkar.
+.TP 
+\fB[ \-\-create\-config\-from\fP=\fI<yol>\fP \fB]\fP
+\fI<yol>\fPa dayalı yapılandırma dosyası yaratır ve çıkar. Yolun
+geçerli bir aMule dosyasına işaret etmesi gerekir.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Geçerli sürüm numarasını görüntüler.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Kısa bir kullanım açıklaması görüntüler.
+.SH KOMUTLAR
+Tüm komutlar harf büyüklüğüne duyarsızdır.
+.SS "Add \fI<eD2k\-bağlantısı>\fP | \fI<magnet\-bağlantısı>\fP"
+Çekirdeğe bir eD2k ya da magnet bağlantısı ekler.
+
+Eklenecek eD2k bağlantısı şunlardan biri olabilir:
+.RS 3
+.IP \(bu 2
+bir dosya bağlantısı (ed2k://|file|...) ki indirmeler kuyruğuna eklenir;
+.IP \(bu 2
+bir sunucu bağlantısı (ed2k://|server|...) ki sunucu listesine eklenir;
+.IP \(bu 2
+bir sunucu listesi bağlantısı, bu durumda listedeki tüm sunucular sunucu
+listesine eklenir.
+.RE
+
+Magnet bağlantısı eD2k hash değerini ve dosya boyutunu içermelidir.
+.SS "Cancel \fI<hash>\fP | \fI<sayı>\fP"
+\fI<hash>\fP ya da \fI<sayı>\fP tarafından belirtilen indirmeyi
+iptal eder. Değerleri öğrenmek için \fBshow\fP komutunu kullanınız.
+.SS "Connect [ \fIkad\fP | \fIed2k\fP | \fI<ip|isim>\fP ]"
+Ağa bağlanır.
+
+Ayarlarda ekinleştirilmiş tüm ağlara bağlanır.
+
+Ek bir parametreyle hangi ağa bağlanmak istediğinizi
+belirtebilirsiniz. IP:port şeklinde (IP ya noktalarla ayrılmış ondalık bir
+IPv4 adresi ya da çözümlenebilen bir DNS ismi olmalıdır) bir sunucu adresi
+verirseniz aMule sadece bu sunucuya bağlanacaktır.
+.SS_untranslated Disconnect [ \fIed2k\fP | \fIkad\fP ]
+Ya çevrimiçi olan tüm ağlarla bağlantıyı keser, ya da sadece belirtilen ağ
+ile.
+.SS "Download \fI<sayı>\fP"
+Bir dosyayı indirmeye başlar.
+
+Bir dosyanın son aramadan \fI<sayı>\fP değeri girilmesi
+gerekir. Örneğin `download 12' son aramadaki 12 numaralı dosyayı indirmeye
+başlar.
+.SS_untranslated Exit
+amule/amuled ile bağlantıyı keser ve amulecmd kapanır.
+.SS "Get \fI<değer>\fP"
+Bir ayar değerini görüntüler.
+
+\fI<değer>\fP ile kullanılabilecek değerler:
+.RS
+.IP BwLimits 10
+Bant genişliği değerlerini görüntüler.
+.IP IPFilter 10
+IPFilter ayarlarını görüntüler.
+.RE
+.SS "Help [ \fI<komut>\fP ]"
+Kısa bir kullanım açıklaması görüntüler. Bir parametre ile kullanılırsa
+mevcut komutların listesini verir. \fI<komut>\fP ile kullanılırsa
+belirtilen komutun kısa bir açıklamasını görüntüler.
+.SS "Pause \fI<hash>\fP | \fI<sayı>\fP"
+\fI<hash>\fP ya da \fI<sayı>\fP değerleri ile belirtilen indirmeyi
+duraklatır. Bu değerleri elde etmek için \fBshow\fP komutunu kullanabilirsiniz.
+.SS "Priority \fI<öncelik>\fP \fI<hash>\fP | \fI<sayı>\fP"
+\fI<hash>\fP ya da \fI<sayı>\fP ile belirtilen bir indirmenin
+önceliğini ayarlar.
+
+\fI<öncelik>\fP için kullanılabilecek değerler:
+.RS
+.IP Auto 10
+Otomatik öncelik.
+.IP High 10
+Yüksek öncelik.
+.IP Low 10
+Düşük öncelik.
+.IP Normal 10
+Normal öncelik.
+.RE
+.SS_untranslated Progress
+Sürmekte olan bir aramanın ilerlemesini gösterir.
+.SS_untranslated Quit
+\fBexit\fP komutu ile eş anlamlıdır.
+.SS "Reload \fI<değer>\fP"
+Belirtilen değeri yeniden yükler.
+
+\fI<değer>\fP ile kullanılabilecek değerler:
+.RS
+.IP Shared 10
+Paylaşılan dosyalar listesini yeniden yükler.
+.IP IPFilter 10
+IP filtre tablolarını yeniden yükler.
+.RE
+.SS_untranslated Reset
+Günlüğü sıfırlar.
+.SS_untranslated Results
+Son aramanın sonuçlarını gösterir.
+.SS "Resume \fI<hash>\fP | \fI<sayı>\fP"
+\fI<hash>\fP ya da \fI<sayı>\fP ile belirtilen indirmeye kaldığı
+yerden devam eder. Değeri öğrenmek için \fBshow\fP komutunu kullanabilirsiniz.
+.SS "Search \fI<tür>\fP \fI<anahtarkelime>\fP"
+Girilen \fI<anahtarkelime>\fP için bir arama yapar. Bir arama türü ve
+bir anahtar kelime kullanmanız mecburidir. Örneğin `search kad amule' kad
+ağında `amule' sözcüğü ile arama yapar.
+
+Kullanılabilecek arama türleri:
+.RS
+.IP Global 10
+Genel arama yapar.
+.IP Kad 10
+Kad ağında arama yapar.
+.IP Local 10
+Sunucuda arama yapar.
+.RE
+.SS "Set \fI<değer>\fP"
+Belirtilen değeri ayarlara girer.
+
+\fI<değer>\fP ile kullanılabilecek değerler:
+.RS
+.IP BwLimits 10
+Bant genişliği değerlerini ayarlar.
+.IP IPFilter 10
+IPFilter tercihlerini ayarlar.
+.RE
+.SS "Show \fI<değer>\fP"
+İndirme/aktarma kuyruğunu, sunucu listesini ya da paylaşılan dosya listesini
+gösterir.
+
+\fI<değer>\fP ile kullanılabilecek değerler:
+.RS
+.IP DL 10
+İndirme kuyruğunu gösterir.
+.IP Log 10
+Günlüğü (log) gösterir.
+.IP Servers 10
+Sunucu listesini gösterir.
+.IP UL 10
+Aktarma (gönderilen dosyalar) kuyruğunu gösterir.
+.RE
+.SS_untranslated Shutdown
+Uzakta çalışmakta olan çekirdeği (amule/amuled) kapatır. Bu metin temelli
+istemciyi de kapatacaktır çünkü çekirdek olmadan işleyemez.
+.SS "İstatistikler [ \fI<sayı>\fP ] "
+İstatistikler ağacını gösterir.
+
+0\-255 arası \fI<sayı>\fP isteğe bağlı argüman olarak komuta
+aktarılabilir, bu kaç tane istemci sürümü alt ağacının gösterileceğini
+belirtir. 0 kullanımı ya da hiçbir argüman kullanılmaması `sınırsız'
+anlamına gelir.
+
+Örneğin `statistics 5' her istemcinin en çok kullanılan 5 sürümünü gösterir.
+.SS_untranslated Status
+Bağlantı durumunu, sürmekte olan indirmeleri ve aktarmaları vs. gösterir.
+.SH NOTLAR
+.SS Yollar
+\fI<yol>\fP değeri alan  tüm seçenekler için eğer \fIyol\fP hiçbir dizin
+içermiyorsa (yani sadece bir dosya ismiyse) aMule yapılandırma dizini
+(\fI~/.aMule\fP) varsayılır.
+.SS Diller
+\fB\-l\fP seçeneği için \fI<dil>\fP parametresi şu biçimde kullanılmalıdır:
+\fIdil\fP[\fB_\fP\fIDİL\fP][\fB.\fP\fIkodlama\fP][\fB@\fP\fIniteleyici\fP] ki burada \fIdil\fP
+birinci dil, \fIDİL\fP lehçe/bölge, \fIkodlama\fP karakter setidir ve
+\fIniteleyici\fP kullanıcıya belli bir kategori içinde belli yerelleştirme
+verileri kullanma olanağı sağlar.
+
+Örnek olarak, aşağıdaki dizeler geçerlidir:
+.RS
+.RB_untranslated de
+.br
+.RB_untranslated de_DE
+.br
+.RB_untranslated de_DE.iso88591
+.br
+.RB_untranslated de_DE@euro
+.br
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
+Yukarıdaki tüm dizeler geçerlidir ancak \fIkodlama\fP ve \fIniteleyici\fP henüz
+kullanılmamaktadır.
+
+Yukarıdakilere ek olarak dil isimlerini İngilizce olarak belirtebilirsiniz \-
+yani \fB\-l german\fP ile \fB\-l de_DE\fP eşdeğerdir ve ikisi de geçerlidir.
+
+Ne komut satırında ne de yapılandırma dosyasında hiçbir dil belirtilmediği
+zaman sistemin varsayılan dili kullanılacaktır.
+.SH DOSYALAR
+~/.aMule/remote.conf
+.SH ÖRNEK
+Tipik olarak amulecmd ilk defada şu şekilde başlayacaktır:
+.PP
+\fBamulecmd\fP \fB\-h\fP \fIbilgisayaradı\fP \fB\-p\fP \fIDBport\fP \fB\-P\fP \fIDBşifre\fP \fB\-w\fP
+.PP
+ya da
+.PP
+\fBamulecmd\fP \fB\-\-create\-config\-from\fP=\fI/home/kullanıcıadı/.aMule/amule.conf\fP
+.PP
+Ayarları \fI$HOME/.aMule/remote.conf\fP dosyasına kayıt eder ve daha sonra
+sadece şunu girmeniz yeterli olacaktır:
+
+.B_untranslated amulecmd
+
+Tabii ki bu örneğe harfiyen uymanız zorunlu değildir.
+.SH GERİBİLDİRİM
+Hataları bildirmek için forumumuzu (\fIhttp://forum.amule.org/\fP) ya da hata
+takipçimizi (\fIhttp://bugs.amule.org/\fP) kullanınız. Hataları bildirmek için
+e\-mail ve e\-mail listemizi kullanmamanızı ve geliştiricilerden birine
+doğrudan bildirmemenizi rica ederiz.
+.SH "TELİF HAKKI"
+aMule ve ilgili tüm yardımcı araçları GNU Genel Kamu Lisansı çerçevesinde
+dağıtılmaktadır.
+.SH "İLGİLİ BELGELER"
+.B_untranslated amule\fR(1), \fBamuled\fR(1)
+.SH YAZAN
+Bu kılavuz sayfası Vollstrecker <amule@vollstreckernet.de>
+tarafından yazılmıştır.

aMule-2.2.6.tar.bz2/docs/man/amuled.1 -> aMule-2.3.1.tar.bz2/docs/man/amuled.1 Changed

@@ -1,46 +1,80 @@
-.TH AMULED 1 "September 2009" "aMule Daemon v2.2.6" "aMule Daemon"
+.TH AMULED 1 "November 2011" "aMule Daemon v2.3.1" "aMule Daemon"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NAME
 amuled \- the all\-platform eMule p2p client \- daemonized version
 .SH SYNOPSIS
-.B amuled
-.RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-i ]
-.RB [ \-f ]
-.RB [ \-c " " \fI<dir> ]
-.RB [ \-e ]
-.RB [ \-d ]
-.RB [ \-o ]
-.RB [ \-r ]
+.B_untranslated amuled
+.RB [ \-c " " \fI<path> ]
+.RB_untranslated [ \-f ]
+.RB [ \-p " " \fI<path> ]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+.RB [ \-w " " \fI<path> ]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+.RB [ \-t " " \fI<num> ]
+.RI [ eD2k-link ]
 
+.B_untranslated amuled
+.RB_untranslated [ \-v ]
+
+.B_untranslated amuled
+.RB_untranslated [ \-h ]
 .SH DESCRIPTION
 .TP
-\fB\-v\fR, \fB\-\-version\fR
-Displays the current version number.
+\fB[ \-c\fR \fI<path>\fR, \fB\-\-config\-dir\fR=\fI<path>\fR \fB]\fR
+Read config from \fI<path>\fR instead of home
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-Prints a short usage description.
+.B_untranslated [ \-f\fR, \fB\-\-full\-daemon ]\fR
+Forks to background.
 .TP
-\fB-i\fR, \fB\-\-enable\-stdin\fR
-Does not disable stdin.
+\fB[ \-p\fR \fI<path>\fR, \fB\-\-pid\-file\fR=\fI<path>\fR \fB]\fR
+After fork, create a pid-file in the \fI<path>\fR.
+\fI<path>\fR has to contain the filename.
 .TP
-\fB\-f\fR, \fB\-\-full\-daemon\fR
-Forks to background.
+.B_untranslated [ \-e\fR, \fB\-\-ec\-config ]\fR
+Configure EC (External Connections).
+.TP
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Prints log messages to stdout.
 .TP
-\fB\-c\fR, \fB\-\-config\-dir\fR=\fI<dir>\fR
-Reads config from <dir> instead of home.
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Resets config to default values.
 .TP
-\fB\-e\fR, \fB\-\-ec\-config\fR
-Configures EC (External Connections).
+\fB[ \-w\fR \fI<path>\fR, \fB\-\-use\-amuleweb\fR=\fI<path>\fR \fB]\fR
+Specify location of amuleweb binary to \fI<path>\fR.
 .TP
-\fB\-d\fR, \fB\-\-disable\-fatal\fR
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
 Does not handle fatal exception.
 .TP
-\fB-o\fR, \fB\-\-log\-stdout\fR
-Prints log messages to stdout.
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+Does not disable stdin.
 .TP
-\fB-r\fR, \fB\-\-reset\-config\fR
-Resets config to default values.
+\fB[ \-t\fR, \fB\-\-category\fR=\fI<num>\fR \fB]\fR
+Set category for passed eD2k links to \fI<num>\fR
+.TP
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Displays the current version number.
+.TP
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Prints a short usage description.
+.TP
+\fB[ eD2k-link ]\fR
+Adds an eD2k-link to the core.
+.PP
+The eD2k link to be added can be:
+.RS 3
+.IP \(bu 2
+a file link (ed2k://|file|...), it will be added to the download queue;
+.IP \(bu 2
+a server link (ed2k://|server|...), it will be added to the server list;
+.IP \(bu 2
+a serverlist link, in which case all servers in the list will be added to the server list;
+.IP \(bu 2
+a magnet link.
+.RE
 .SH FILES
 ~/.aMule/*
 .SH REPORTING BUGS
@@ -49,4 +83,6 @@
 .SH COPYRIGHT
 aMule and all of its related utilities are distributed under the GNU General Public License.
 .SH SEE ALSO
-\fBalcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
+.B_untranslated alcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
+.SH AUTHOR
+This manpage was written by Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amuled.de.1 -> aMule-2.3.1.tar.bz2/docs/man/amuled.de.1 Changed

@@ -3,45 +3,99 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH AMULED 1 "Januar 2007" "aMule Daemon v2.2.0" "aMule Daemon"
+.TH AMULED 1 "November 2011" "aMule Daemon v2.3.1" "aMule Dämon"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NAME
 amuled \- Der alle\-Plattformen eMule p2p Client \- dämonisierte Version
 .SH SYNTAX
-\fBamuled\fP [\fB\-v\fP] [\fB\-h\fP] [\fB\-i\fP] [\fB\-f\fP] [\fB\-c\fP \fI<Pfad>\fP] [\fB\-d\fP]
-[\fB\-o\fP] [\fB\-r\fP]
+.B_untranslated amuled
+[\fB\-c\fP \fI<Pfad>\fP]
+.RB_untranslated [ \-f ]
+[\fB\-p\fP \fI<Pfad>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<Pfad>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<num>\fP] [\fIeD2k\-link\fP]
 
+.B_untranslated amuled
+.RB_untranslated [ \-v ]
+
+.B_untranslated amuled
+.RB_untranslated [ \-h ]
 .SH BESCHREIBUNG
 .TP 
-\fB\-v\fP, \fB\-\-version\fP
-Zeigt die derzeitige Versionsnummer an.
+\fB[ \-c\fP \fI<Pfad>\fP, \fB\-\-config\-dir\fP=\fI<Pfad>\fP \fB]\fP
+Liest die Konfiguration <Pfad> anstelle des Home.
 .TP 
-\fB\-h\fP, \fB\-\-help\fP
-Gibt eine kurze Beschreibung aus.
+.B_untranslated [ \-f\fR, \fB\-\-full\-daemon ]\fR
+Im Hintergrund ausführen
 .TP 
-\fB\-i\fP, \fB\-\-enable\-stdin\fP
-Schaltet stdin nicht ab.
+\fB[ \-p\fP \fI<Pfad>\fP, \fB\-\-pid\-file\fP=\fI<Pfad>\fP \fB]\fP
+Erstelle eine Pid\-Datei in \fI<Pfad>\fP.  \fI<Pfad>\fP muss einen
+Dateinamen enthalten.
 .TP 
-\fB\-f\fP, \fB\-\-full\-daemon\fP
-Im Hintergrund ausführen
+.B_untranslated [ \-e\fR, \fB\-\-ec\-config ]\fR
+Konfiguration für EC (Externe Verbindungen).
 .TP 
-\fB\-c\fP, \fB\-\-config\-dir\fP=\fI<Pfad>\fP
-Liest die Konfiguration <Pfad> anstelle des Home.
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Schreibt Log\-Meldungen auf die Standardausgabe.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Setzt die Konfiguration auf die Standardwerte zurück.
 .TP 
-\fB\-d\fP, \fB\-\-disable\-fatal\fP
+\fB[ \-w\fP \fI<Pfad>\fP, \fB\-\-use\-amuleweb\fP=\fI<Pfad>\fP \fB]\fP
+Setzt den Ort der ausführbaren Datei von amuleweb auf \fI<Pfad>\fP.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
 Fehlerbehandlung für fatale Fehler abschalten.
 .TP 
-\fB\-o\fP, \fB\-\-log\-stdout\fP
-Gibt Log\-Meldungen auf der Standardausgabe aus.
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+Schaltet die Standardeingabe nicht ab.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<Num>\fP \fB]\fP
+Setzt die Kategorie für den übergebenen eD2k Verweis \fI<Num>\fP
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Zeigt die derzeitige Versionsnummer an.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Gibt eine kurze Nutzungsbeschreibung aus.
+.TP 
+\fB[ eD2k\-link ]\fP
+Fügt einen eD2k\-Verweis zur Downloadliste hinzu.
+.PP
+Der eD2k\-Verweis darf enthalten:
+.RS 3
+.IP \(bu 2
+ein Link zu einer Datei (ed2k://|file|...), dieser wird Downloadliste
+hinzugefügt;
+.IP \(bu 2
+ein Link zu einem Server (ed2k://|server|...), dieser wird der Serverliste
+hinzugefügt;
+.IP \(bu 2
+ein Serverlisten\-Verweis, in diesem Fall werden alle Server dieser Liste der
+Serverliste hinzugefügt;
+.IP \(bu 2
+ein Magnet Verweis.
+.RE
 .SH DATEIEN
 ~/.aMule/*
 .SH "FEHLER MELDEN"
 Bitte meldet Fehler entweder in unserem Forum (\fIhttp://forum.amule.org/\fP),
 oder in unseren Bugtracker (\fIhttp://bugs.amule.org/\fP). Bitte meldet uns
-keine Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
+weder Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
 Teammitglieder.
 .SH COPYRIGHT
 aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU
 General Public License
 .SH "SIEHE AUCH"
-\fBalcc\fP(1), \fBamule\fP(1), \fBamulecmd\fP(1), \fBamulegui\fP(1), \fBamuleweb\fP(1),
-\fBcas\fP(1), \fBed2k\fP(1)
+.B_untranslated alcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
+.SH VERFASSER
+Diese manpage wurde geschrieben von Vollstrecker
+<amule@vollstreckernet.de>
+
+Diese manpage wurde übersetzt von Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amuled.es.1 -> aMule-2.3.1.tar.bz2/docs/man/amuled.es.1 Changed

@@ -1,35 +1,99 @@
-.TH AMULED 1 "Marzo 2005" "aMule Daemon v2.0.0" "Demonio aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULED 1 "November 2011" "aMule Daemon v2.3.1" "Demonio aMule"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOMBRE
-amuled \- Cliente P2P clon de eMule multi-plataforma \- versión demonio
+amuled \- the all\-platform eMule p2p client \- daemonized version
 .SH SINOPSIS
-.B amuled
-.RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-i ]
-.RB [ \-d ]
-.RB [ \-o ]
-.SH DESCRIPCIÓN
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Muestra la versión del programa.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Muestra esta información.
-.TP
-\fB-i\fR, \fB\-\-enable\-stdin\fR
-Deja activa la entrada estándar.
-.TP
-\fB\-d\fR, \fB\-\-disable\-fatal\fR
-Ignpra las señales "Fatal exception".
-.TP
-\fB-o\fR, \fB\-\-log\-stdout\fR
-Muestra los mensajes de log en la consola.
-.SH ARHIVOS
+.B_untranslated amuled
+[\fB\-c\fP \fI<path>\fP]
+.RB_untranslated [ \-f ]
+[\fB\-p\fP \fI<path>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<path>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<num>\fP] [\fIeD2k\-link\fP]
+
+.B_untranslated amuled
+.RB_untranslated [ \-v ]
+
+.B_untranslated amuled
+.RB_untranslated [ \-h ]
+.SH DESCRIPCIÃN
+.TP 
+\fB[ \-c\fP \fI<path>\fP, \fB\-\-config\-dir\fP=\fI<path>\fP \fB]\fP
+Leer configuraciÃ³n desde \fI<path>\fP en lugar de home
+.TP 
+.B_untranslated [ \-f\fR, \fB\-\-full\-daemon ]\fR
+Enviar a segundo plano.
+.TP 
+\fB[ \-p\fP \fI<path>\fP, \fB\-\-pid\-file\fP=\fI<path>\fP \fB]\fP
+After fork, create a pid\-file in the \fI<path>\fP.  \fI<path>\fP
+has to contain the filename.
+.TP 
+.B_untranslated [ \-e\fR, \fB\-\-ec\-config ]\fR
+Configure EC (External Connections).
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Imprime mensajes de registro en la salida estÃ¡ndar
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Reiniciar configuracion a valores por defecto
+.TP 
+\fB[ \-w\fP \fI<path>\fP, \fB\-\-use\-amuleweb\fP=\fI<path>\fP \fB]\fP
+Especifica ubicacion del binario amuleweb en \fI<path>\fP.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
+No maneja excepciÃ³n grave
+.TP 
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+No deshabilitar entrada estÃ¡ndar
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<num>\fP \fB]\fP
+Fijar categorÃa para enlace eD2k pasado a \fI<num>\fP
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Mostrar el nÃºmero de la versiÃ³n actual.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Imprime una breve descripciÃ³n de uso.
+.TP 
+\fB[ eD2k\-link ]\fP
+AÃ±adir un enlace eD2k al nÃºcleo.
+.PP
+El enlace eD2k para ser aÃ±adido puede ser:
+.RS 3
+.IP \(bu 2
+un enlace de archivo (ed2k://|archivo|...), serÃ¡ aÃ±Ã¡dido a la cola de
+descarga.
+.IP \(bu 2
+un enlace de servidor (ed2k://|servidor|...), serÃ¡ aÃ±Ã¡dido a la cola de
+servidores.
+.IP \(bu 2
+un enlace de lista de servidores, en cuyo caso todos los servidores de la
+lista serÃ¡n aÃ±adidos a la lista de servidores.
+.IP \(bu 2
+un enlace magnet.
+.RE
+.SH ARCHIVOS
 ~/.aMule/*
-.SH BUGS
-Si descubre bugs, por favor comuníquelos en (\fIhttp://forum.amule.org/\fR), o en nuestro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Por favor, no comunique bugs por e-mail, ni a nuestro maillist ni directamente a ningún miembro del equipo de aMule.
+.SH "INFORMANDO ERRORES"
+Por favor informa de fallos ya sea en nuestro foro
+(\fIhttp://forum.amule.org/\fP), o en nuestro bugtracker
+(\fIhttp://bugs.amule.org/\fP). Por favor no informe de fallos por correo, ni
+en nuestras listas, ni directamente al correo de algun miembro del equipo.
 .SH COPYRIGHT
-aMule, y todas las utilidades que con el vienen, se distribuyen bajo la licencia GPL.
-.SH VER
-\fBalcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
+aMule y todas las demÃ¡s utilidades relacionadas son distribuidas bajo la GNU
+General Public License.
+.SH "VEASE TAMBIEN"
+.B_untranslated alcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
+.SH AUTOR
+Esta pÃ¡gina de manualfue escrita por Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amuled.fr.1 -> aMule-2.3.1.tar.bz2/docs/man/amuled.fr.1 Changed

@@ -1,37 +1,99 @@
-.TH AMULED 1 "Mars 2005" "aMule Daemon v2.0.0" "aMule Daemon"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULED 1 "Novembre 2011" "aMule Daemon v2.3.1" "aMule Daemon"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOM
-amuled, le client p2p eMule \-multi\- platforme \- version daemon
+amuled \- le client P2P eMule multiplateforme \- version daemonisÃ©e
 .SH SYNOPSIS
-.B amuled
-.RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-i ]
-.RB [ \-d ]
-.RB [ \-o ]
+.B_untranslated amuled
+[\fB\-c\fP \fI<chemin>\fP]
+.RB_untranslated [ \-f ]
+[\fB\-p\fP \fI<chemin>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<chemin>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<num>\fP] [\fIlien eD2k\fP]
+
+.B_untranslated amuled
+.RB_untranslated [ \-v ]
+
+.B_untranslated amuled
+.RB_untranslated [ \-h ]
 .SH DESCRIPTION
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Afficher les informations sur la version courante.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Afficher l'aide d'utilisation.
-.TP
-\fB-i\fR, \fB\-\-enable\-stdin\fR
-Ne pas désactiver stdin.
-.TP
-\fB\-d\fR, \fB\-\-disable\-fatal\fR
+.TP 
+\fB[ \-c\fP \fI<chemin>\fP, \fB\-\-config\-dir\fP=\fI<chemin>\fP \fB]\fP
+Utiliser le fichier de config \fI<chemin>\fP Ã  la place de celui par
+dÃ©faut
+.TP 
+.B_untranslated [ \-f\fR, \fB\-\-full\-daemon ]\fR
+Embranchements en arriÃ¨re plan.
+.TP 
+\fB[ \-p\fP \fI<chemin>\fP, \fB\-\-pid\-file\fP=\fI<chemin>\fP \fB]\fP
+AprÃ¨s l'embranchement, crÃ©er un fichier pid dans le
+\fI<rÃ©pertoire>\fP.  \fI<rÃ©pertoire>\fP doit contenir le fichier.
+.TP 
+.B_untranslated [ \-e\fR, \fB\-\-ec\-config ]\fR
+Configurer les EC (Connexions Externes).
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Afficher les messages du journal sur stdout.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+RÃ©initialiser la configuration par dÃ©faut.
+.TP 
+\fB[ \-w\fP \fI<chemin>\fP, \fB\-\-use\-amuleweb\fP=\fI<chemin>\fP \fB]\fP
+PrÃ©ciser l'emplacement du binaire d'amuleweb \fI<chemin>\fP.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
 Ne pas prendre en charge une exception fatale.
-.TP
-\fB-o\fR, \fB\-\-log\-stdout\fR
-Afficher les messages de log sur stdout.
+.TP 
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+Ne pas dÃ©sactiver stdin.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<num>\fP \fB]\fP
+DÃ©finir la catÃ©gorie pour les liens eD2k passÃ© Ã   \fI<num>\fP
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Affiche le numÃ©ro de la version actuelle.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Afficher une court description d'utilisation.
+.TP 
+\fB[ lien eD2k ]\fP
+Ajoute un lien eD2k au noyau.
+.PP
+Le lien eD2k Ã  ajouter peut Ãªtre :
+.RS 3
+.IP \(bu 2
+un lien fichier (ed2k://|fichier|â¦), il sera ajoutÃ© Ã  la file de
+tÃ©lÃ©chargement;
+.IP \(bu 2
+un lien serveur (ed2k://|serveur|â¦), il sera ajoutÃ© Ã  la liste des serveurs;
+.IP \(bu 2
+un lien de liste de serveurs, dans ce cas tous les serveurs dans la liste
+seront ajoutÃ©s Ã  la liste des serveurs;
+.IP \(bu 2
+un lien magnÃ©tique.
+.RE
 .SH FICHIERS
 ~/.aMule/*
-.SH SIGNALEMENT DES BUGS
-Reportez les bugs sur notre forum (\fIhttp://forum.amule.org/\fR), ou dans notre bugtracker (\fIhttp://bugs.amule.org/\fR).
-N'utilisez ni un e-mail, ni notre liste de diffusion ni ne reportez directement un bug à un membre de notre equipe.
+.SH "RAPPORTER DES BOGUES"
+Veuillez rapporter les bogues sur notre forum (\fIhttp://forum.amule.org/\fP),
+ou sur notre bugtracker (\fIhttp://bugs.amule.org/\fP).  Veuillez ne pas
+rapporter les bogues par e\-mail, sur notre liste de diffusion ou directement
+Ã  n'importe quel membre  de l'Ã©quipe.
 .SH COPYRIGHT
-aMule et tous les utilitaires associés sont distribués sous licence GNU General Public License.
-.SH VOIR AUSSI
-\fBalcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
-.SH TRADUCTION
-ThePolish, 2005
+aMule et tout ses outils sont distribuÃ©s sous la licence GNU General Public
+License.
+.SH "VOIR AUSSI"
+.B_untranslated alcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
+.SH AUTEUR
+Cette manpage a Ã©tÃ© Ã©crite par Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amuled.hu.1 -> aMule-2.3.1.tar.bz2/docs/man/amuled.hu.1 Changed

@@ -1,37 +1,100 @@
-.TH AMULED 1 "2005 március" "aMule Daemon v2.0.0" "aMule Daemon"
-.SH NÉV
-amuled \- a "minden\-platform" eMule p2p kliens \- démonizált változat
-.SH ÁTEKINTÉS
-.B amuled
-.RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-i ]
-.RB [ \-d ]
-.RB [ \-o ]
-.SH LEÍRÁS
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Megjeleníti a verzió információt.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Ezt a súgót jeleníti meg.
-.TP
-\fB-i\fR, \fB\-\-enable\-stdin\fR
-Nem zárja le a szabvány bemenetet (stdin).
-.TP
-\fB\-d\fR, \fB\-\-disable\-fatal\fR
-Nem kezeli a végzetes kivételeket.
-.TP
-\fB-o\fR, \fB\-\-log\-stdout\fR
-A szabvány kimenetre írja a napló üzeneteket.
-.SH FÁJLOK
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULED 1 "2011. november" "aMule Daemon v2.3.1" "aMule Daemon"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH NÃV
+amule \- a "minden\-platform" eMule p2p kliens \- dÃ©mon vÃ¡ltozat
+.SH ÃTTEKINTÃS
+.B_untranslated amuled
+[\fB\-c\fP \fI<Ãºtvonal>\fP]
+.RB_untranslated [ \-f ]
+[\fB\-p\fP \fI<fÃ¡jl>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<fÃ¡jl>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<szÃ¡m>\fP] [\fIeD2k\-hivatkozÃ¡s\fP]
+
+.B_untranslated amuled
+.RB_untranslated [ \-v ]
+
+.B_untranslated amuled
+.RB_untranslated [ \-h ]
+.SH LEÃRÃS
+.TP 
+\fB[ \-c\fP \fI<Ãºtvonal>\fP, \fB\-\-config\-dir\fP=\fI<Ãºtvonal>\fP \fB]\fP
+A beÃ¡llÃtÃ¡sokat az \fI<Ãºtvonal>\fP\-bÃ³l olvassa az alapÃ©rtelmezett
+helyett.
+.TP 
+.B_untranslated [ \-f\fR, \fB\-\-full\-daemon ]\fR
+HÃ¡ttÃ©rbe vonul.
+.TP 
+\fB[ \-p\fP \fI<fÃ¡jl>\fP, \fB\-\-pid\-file\fP=\fI<fÃ¡jl>\fP \fB]\fP
+A hÃ¡ttÃ©rbe vonulÃ¡s utÃ¡n hozzon lÃ©tre egy pid\-fÃ¡jlt.
+.TP 
+.B_untranslated [ \-e\fR, \fB\-\-ec\-config ]\fR
+A tÃ¡voli elÃ©rÃ©s beÃ¡llÃtÃ¡sa.
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+A naplÃ³ bejegyzÃ©seket a szabvÃ¡ny kimenetre Ãrja.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+BeÃ¡llÃtÃ¡sok visszaÃ¡llÃtÃ¡sa az alapÃ©rtelmezett Ã©rtÃ©kekre.
+.TP 
+\fB[ \-w\fP \fI<fÃ¡jl>\fP, \fB\-\-use\-amuleweb\fP=\fI<fÃ¡jl>\fP \fB]\fP
+Az amuleweb programnak \fI<fÃ¡jl>\fP\-t fogja hasznÃ¡lni.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
+Nem kezeli a vÃ©gzetes kivÃ©teleket.
+.TP 
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+Nem zÃ¡rja le a szabvÃ¡ny bemenetet.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<szÃ¡m>\fP \fB]\fP
+A megadott eD2k hivatkozÃ¡st a \fI<szÃ¡m>\fP\-adik kategÃ³riÃ¡ba tÃ¶lti.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+MegjelenÃti a verziÃ³szÃ¡mot.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Egy rÃ¶vid hasznÃ¡lati leÃrÃ¡st jelenÃt meg.
+.TP 
+\fB[ eD2k\-hivatkozÃ¡s ]\fP
+eD2k hivatkozÃ¡s letÃ¶ltÃ©se.
+.PP
+Az eD2k hivatkozÃ¡s a kÃ¶vetkezÅ lehet:
+.RS 3
+.IP \(bu 2
+egy fÃ¡jl hivatkozÃ¡s (ed2k://|file|...), ez a letÃ¶ltÃ©si sorhoz lesz
+hozzÃ¡adva;
+.IP \(bu 2
+egy kiszolgÃ¡lÃ³ hivatkozÃ¡s (ed2k://|server|...), ez a kiszolgÃ¡lÃ³\-listÃ¡hoz
+lesz hozzÃ¡adva;
+.IP \(bu 2
+egy kiszolgÃ¡lÃ³\-lista hivatkozÃ¡s, mely esetben a listÃ¡ban szereplÅ Ã¶sszes
+kiszolgÃ¡lÃ³ a kiszolgÃ¡lÃ³\-listÃ¡hoz adÃ³dik;
+.IP \(bu 2
+egy magnet hivatkozÃ¡s.
+.RE
+.SH FÃJLOK
 ~/.aMule/*
-.SH HIBÁK JELENTÉSE
-A hibákat kérjük vagy a fórumon (\fIhttp://forum.amule.org/\fR), vagy a hibakövetõben (\fIhttp://bugs.amule.org/\fR) jelentsék.
-Hibákról kérjük ne írjanak levelet (e-mail-t) se a levelzési listára, se közvetlenül valamelyik fejlesztõnek.
+.SH "HIBÃK JELENTÃSE"
+A hibÃ¡kat kÃ©rjÃ¼k vagy a fÃ³rumon (\fIhttp://forum.amule.org/\fP), vagy a
+hibakÃ¶vetÅben (\fIhttp://bugs.amule.org/\fP) jelentsÃ©k. HibÃ¡krÃ³l kÃ©rjÃ¼k ne
+Ãrjanak levelet (e\-mail\-t) se a levelezÃ©si listÃ¡ra, se kÃ¶zvetlenÃ¼l
+valamelyik fejlesztÅnek.
 .SH COPYRIGHT
-Az aMule és az összes hozzá tartozó segédprogram a GNU General Public Licence védelme alatt áll.
-.SH LÁSD MÉG
-\fBalcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
-.SH MAGYAR FORDÍTÁS
-Dévai Tamás <gonosztopi@amule.org>
+Az aMule Ã©s az Ã¶sszes hozzÃ¡ tartozÃ³ segÃ©dprogram a GNU General Public
+License vÃ©delme alatt Ã¡ll.
+.SH "LÃSD MÃG"
+.B_untranslated alcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
+.SH SZERZÅ
+Ezt a kÃ©zikÃ¶nyv lapot Vollstrecker <amule@vollstreckernet.de> Ãrta.
+.SH MAGYAR FORDÃTÃS
+DÃ©vai TamÃ¡s <gonosztopi@amule.org>

aMule-2.2.6.tar.bz2/docs/man/amuled.it.1 -> aMule-2.3.1.tar.bz2/docs/man/amuled.it.1 Changed

@@ -1,52 +1,103 @@
-.TH AMULED 1 "Settembre 2009" "aMule Daemon v2.2.6" "aMule Daemon"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULED 1 "Novembre 2011" "aMule Daemon v2.3.1" "aMule Daemon"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOME
-amuled \- il client p2p all\-platform eMule \- versione daemon
-.SH SYNOPSIS
-.B amuled
-.RB [ \-v ]
-.RB [ \-h ]
-.RB [ \-i ]
-.RB [ \-f ]
-.RB [ \-c " " \fI<dir> ]
-.RB [ \-e ]
-.RB [ \-d ]
-.RB [ \-o ]
-.RB [ \-r ]
+amuled \- il client p2p multipiattaforma basato su eMule \- versione demone
+.SH SINTASSI
+.B_untranslated amuled
+[\fB\-c\fP \fI<percorso>\fP]
+.RB_untranslated [ \-f ]
+[\fB\-p\fP \fI<percorso>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<percorso>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<numero>\fP] [\fIcollegamento\-eD2k\fP]
 
+.B_untranslated amuled
+.RB_untranslated [ \-v ]
+
+.B_untranslated amuled
+.RB_untranslated [ \-h ]
 .SH DESCRIZIONE
-.TP
-\fB\-v\fR, \fB\-\-version\fR
-Mostra il numero di versione corrente.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Mostra una breve descrizione di utilizzo.
-.TP
-\fB-i\fR, \fB\-\-enable\-stdin\fR
-Non disabilita stdin.
-.TP
-\fB\-f\fR, \fB\-\-full\-daemon\fR
-Biforca nello sfondo.
-.TP
-\fB\-c\fR, \fB\-\-config\-dir\fR=\fI<dir>\fR
-Legge la configurazione da <dir> invece che dalla cartella home.
-.TP
-\fB\-e\fR, \fB\-\-ec\-config\fR
-Configura EC (Connessioni Esterne).
-.TP
-\fB\-d\fR, \fB\-\-disable\-fatal\fR
+.TP 
+\fB[ \-c\fP \fI<percorso>\fP, \fB\-\-config\-dir\fP=\fI<percorso>\fP \fB]\fP
+Legge la configurazione dal \fI<percorso>\fP invece che dalla directory
+dell'utente.
+.TP 
+.B_untranslated [ \-f\fR, \fB\-\-full\-daemon ]\fR
+Continua l'esecuzione in background.
+.TP 
+\fB[ \-p\fP \fI<percorso>\fP, \fB\-\-pid\-file\fP=\fI<percorso>\fP \fB]\fP
+Dopo il passaggio in background, crea un file di pid in
+\fI<percorso>\fP. \fI<percorso>\fP deve includere il nome del
+file.
+.TP 
+.B_untranslated [ \-e\fR, \fB\-\-ec\-config ]\fR
+Configura le connessioni esterne (EC).
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Scrive i messaggi di log nello stdout.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Reimposta la configurazione ai valori di default.
+.TP 
+\fB[ \-w\fP \fI<percorso>\fP, \fB\-\-use\-amuleweb\fP=\fI<percorso>\fP \fB]\fP
+Specifica la posizione dell'eseguibile di amuleweb in \fI<percorso>\fP.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
 Non gestisce le eccezioni fatali.
-.TP
-\fB-o\fR, \fB\-\-log\-stdout\fR
-Mostra messaggi di registro in stdout.
-.TP
-\fB-r\fR, \fB\-\-reset\-config\fR
-Reimposta la configurazione con i valori predefiniti.
+.TP 
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+Non disabilita lo stdin.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<numero>\fP \fB]\fP
+Imposta la categoria per i collegamenti eD2k ricevuti a \fI<numero>\fP
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Visualizza il numero di versione corrente.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Visualizza una breve descrizione dell'utilizzo.
+.TP 
+\fB[ collegamento\-eD2k ]\fP
+Aggiunge un collegamento eD2k.
+.PP
+Il collegamento eD2k da aggiungere può essere:
+.RS 3
+.IP \(bu 2
+un collegamento a un file (ed2k://|file|...), sarà aggiunto alla coda di
+download;
+.IP \(bu 2
+un collegamento a un server (ed2k://|server|...), sarà aggiunto alla lista
+dei server;
+.IP \(bu 2
+un collegamento a una lista di server, nel cui caso tutti i server inclusi
+nella lista verranno aggiunti alla lista dei server;
+.IP \(bu 2
+un collegamento magnet.
+.RE
 .SH FILE
 ~/.aMule/*
-.SH SEGNALARE BUG
-Per piacere segnala bug nel nostro forum (\fIhttp://forum.amule.org/\fR), oppure nel nostro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Per piacere non segnalare bug tramite e-mail, tramite la nostra mailing list e neppure direttamente ad alcun membro della squadra.
+.SH "SEGNALARE I BUG"
+Per favore segnalare i bug nel nostro forum (\fIhttp://forum.amule.org/\fP) o
+nel nostro bugtracker (\fIhttp://bugs.amule.org/\fP). Per favore non segnalare
+i bug via posta elettronica, né nella nostra mailing list né direttamente a
+qualunque membro del gruppo.
 .SH COPYRIGHT
-aMule e tutte le sue utilità relative sono distribuite sotto la GNU General Public License.
-.SH CONSULTA ANCHE
-\fBalcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
+aMule e tutti i programmi di utilità correlati sono distribuiti in accordo
+alla GNU General Public License.
+.SH "VEDI ANCHE"
+.B_untranslated alcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
+.SH AUTORE
+Questa pagina del manuale è stata scritta da Vollstrecker
+<amule@vollstreckernet.de>
+.SH TRADUZIONE ITALIANA
+Stefano Corti <iz0bbz@libero.it>

aMule-2.3.1.tar.bz2/docs/man/amuled.ru.1 Added

@@ -0,0 +1,99 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULED 1 "November 2011" "aMule Daemon v2.3.1" "Демон aMule"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH ИМЯ
+amuled \- мультиплатформенный p2p клиент eMule \- демонизированная версия
+.SH ОБЗОР
+.B_untranslated amuled
+[\fB\-c\fP \fI<путь>\fP]
+.RB_untranslated [ \-f ]
+[\fB\-p\fP \fI<путь>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<путь>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<номер>\fP] [\fIeD2k\-ссылка\fP]
+
+.B_untranslated amuled
+.RB_untranslated [ \-v ]
+
+.B_untranslated amuled
+.RB_untranslated [ \-h ]
+.SH ОПИСАНИЕ
+.TP 
+\fB[ \-c\fP \fI<путь>\fP, \fB\-\-config\-dir\fP=\fI<путь>\fP \fB]\fP
+Прочитать конфигурацию из места, указанного в \fI<пути>\fP, вместо
+домашнего каталога
+.TP 
+.B_untranslated [ \-f\fR, \fB\-\-full\-daemon ]\fR
+Уйти в фоновый режим
+.TP 
+\fB[ \-p\fP \fI<путь>\fP, \fB\-\-pid\-file\fP=\fI<путь>\fP \fB]\fP
+После запуска создать pid\-файл по указанному
+\fI<пути>\fP. \fI<Путь>\fP должен указывать на файл.
+.TP 
+.B_untranslated [ \-e\fR, \fB\-\-ec\-config ]\fR
+Сконфигурировать EC (внешние соединения).
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Печатает сообщения лога в стандартный вывод.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Сбрасывает конфигурацию в изначальную.
+.TP 
+\fB[ \-w\fP \fI<путь>\fP, \fB\-\-use\-amuleweb\fP=\fI<путь>\fP \fB]\fP
+Указать \fI<путь>\fP к исполняемому файлу amuleweb.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
+Не обрабатывать фатальные исключительные ситуации.
+.TP 
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+Не отключать стандартный ввод.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<номер>\fP \fB]\fP
+Указать \fI<номер>\fP категории для eD2k ссылок.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Выводит информацию о версии.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Выводит короткую помощь по использованию.
+.TP 
+\fB[ eD2k\-ссылка ]\fP
+Передает eD2k\-ссылку в ядро.
+.PP
+Добавляемая eD2k\-ссылка может быть:
+.RS 3
+.IP \(bu 2
+файловая ссылка (ed2k://|file|...), она будет добавлена в очередь закачки;
+.IP \(bu 2
+серверная ссылка (ed2k://|server|...), она будет добавлена в список
+серверов;
+.IP \(bu 2
+ссылка на список серверов, тогда все сервера из списка будут добавлены в
+список серверов;
+.IP \(bu 2
+magnet\-ссылка.
+.RE
+.SH ФАЙЛЫ
+~/.aMule/*
+.SH "СООБЩЕНИЕ ОБ ОШИБКАХ"
+Пожалуйста, сообщайте об ошибках либо на нашем форуме
+(\fIhttp://forum.amule.org/\fP), либо в багтрекере
+(\fIhttp://bugs.amule.org/\fP). Пожалуйста, не сообщайте об ошбках по
+электронной почте, по нашим спискам рассылки, или напрямую участникам.
+.SH "АВТОРСКИЕ ПРАВА"
+aMule и все прилагающиеся инструменты распространаются под Открытым
+Лицензионным Соглашением GNU (GNU GPL).
+.SH "СМ. ТАКЖЕ"
+.B_untranslated alcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
+.SH АВТОРЫ
+Автор страницы помощи: Vollstrecker <amule@vollstreckernet.de>,
+перевод: Radist Morse <radist.morse@gmail.com>

aMule-2.3.1.tar.bz2/docs/man/amuled.tr.1 Added

@@ -0,0 +1,98 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULED 1 "Kasım 2011" "aMule Daemon v2.3.1" "aMule Daemon"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH İSİM
+amuled \- her platformda çalışan eMule p2p istemcisi \- daemon sürümü
+.SH KULLANIM
+.B_untranslated amuled
+[\fB\-c\fP \fI<yol>\fP]
+.RB_untranslated [ \-f ]
+[\fB\-p\fP \fI<yol>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+[\fB\-w\fP \fI<yol>\fP]
+.RB_untranslated [ \-d ]
+.RB_untranslated [ \-i ]
+[\fB\-t\fP \fI<sayı>\fP] [\fIeD2k\-bağlantısı\fP]
+
+.B_untranslated amuled
+.RB_untranslated [ \-v ]
+
+.B_untranslated amuled
+.RB_untranslated [ \-h ]
+.SH AÇIKLAMA
+.TP 
+\fB[ \-c\fP \fI<yol>\fP, \fB\-\-config\-dir\fP=\fI<yol>\fP \fB]\fP
+Yapılandırmayı home yerine \fI<yol>\fPdan oku
+.TP 
+.B_untranslated [ \-f\fR, \fB\-\-full\-daemon ]\fR
+Kendisini arkaplana çatallar.
+.TP 
+\fB[ \-p\fP \fI<yol>\fP, \fB\-\-pid\-file\fP=\fI<yol>\fP \fB]\fP
+Çatallamadan sonra \fI<yol>\fP konumunda bir pid\-file dosyası
+yaratır. \fI<yol>\fPun dosya ismini içermesi gerekir.
+.TP 
+.B_untranslated [ \-e\fR, \fB\-\-ec\-config ]\fR
+DB (Dış Bağlantılar) Kurulumu
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Log mesajlarını standart çıktıya gönderir.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Yapılandırmayı varsayılan değerlere sıfırlar.
+.TP 
+\fB[ \-w\fP \fI<yol>\fP, \fB\-\-use\-amuleweb\fP=\fI<yol>\fP \fB]\fP
+amuleweb çalıştırılabilir dosyasının konumunu \fI<yol>\fP olarak
+belirler.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-disable\-fatal ]\fR
+Kritik istisnaları ele almaz.
+.TP 
+.B_untranslated [ \-i\fR, \fB\-\-enable\-stdin ]\fR
+standart girdiyi devre dışı bırakmaz.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<sayı>\fP \fB]\fP
+\fI<sayı>\fPya gönderilen eD2k bağlantılarının kategorilerini belirler.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Geçerli sürüm numarasını görüntüler.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Kısa bir kullanım açıklaması görüntüler.
+.TP 
+\fB[ eD2k\-bağlantısı ]\fP
+Çekirdeğe bir eD2k bağlantısı ekler.
+.PP
+Eklenecek eD2k bağlantısı şunlardan biri olabilir:
+.RS 3
+.IP \(bu 2
+bir dosya bağlantısı (ed2k://|file|...) ki indirmeler kuyruğuna eklenir;
+.IP \(bu 2
+bir sunucu bağlantısı (ed2k://|server|...) ki sunucu listesine eklenir;
+.IP \(bu 2
+bir sunucu listesi bağlantısı, bu durumda listedeki tüm sunucular sunucu
+listesine eklenir;
+.IP \(bu 2
+bir magnet bağlantısı.
+.RE
+.SH DOSYALAR
+~/.aMule/*
+.SH GERİBİLDİRİM
+Hataları bildirmek için forumumuzu (\fIhttp://forum.amule.org/\fP) ya da hata
+takipçimizi (\fIhttp://bugs.amule.org/\fP) kullanınız. Hataları bildirmek için
+e\-mail ve e\-mail listemizi kullanmamanızı ve geliştiricilerden birine
+doğrudan bildirmemenizi rica ederiz.
+.SH "TELİF HAKKI"
+aMule ve ilgili tüm yardımcı araçları GNU Genel Kamu Lisansı çerçevesinde
+dağıtılmaktadır.
+.SH "İLGİLİ BELGELER"
+.B_untranslated alcc\fR(1), \fBamule\fR(1), \fBamulecmd\fR(1), \fBamulegui\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1)
+.SH YAZAN
+Bu kılavuz sayfası Vollstrecker <amule@vollstreckernet.de>
+tarafından yazılmıştır.

aMule-2.2.6.tar.bz2/docs/man/amulegui.1 -> aMule-2.3.1.tar.bz2/docs/man/amulegui.1 Changed

@@ -1,31 +1,58 @@
-.TH AMULEGUI 1 "September 2009" "aMuleGUI v2.2.6" "aMuleGUI"
-.SH NAME
+.TH AMULEGUI 1 "November 2011" "aMuleGUI v2.3.1" "aMuleGUI"
+.als B_untranslated B
+.als RB_untranslated RB
+.als unstranslated " "
 amulegui \- aMule control program with GUI
 .SH SYNOPSIS
-.B amulegui
-.RB [ \-h ]
-.RB [ \-\-verbose ]
+.B_untranslated amulegui
+.RB [ \-c " " \fI<path> ]
+.RB [ \-geometry " " \fI<geom> ]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+.RB_untranslated [ \-s ]
+.RB [ \-t " " \fI<num> ]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-v ]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-h ]
 .SH "DESCRIPTION"
 .B amulegui
 is a client program, and can be connected to amule or amuled via EC. You
-can manage your amule program with it. It provides almost the same functionalities
-as amule, even if the core works on another computer.
+can manage your amule program with it. It provides almost the same functionalities as amule, even if the core works on another computer.
+.TP
+\fB[ \-c\fR \fI<path>\fR, \fB\-\-config\-dir\fR=\fI<path>\fR \fB]\fR
+Read config from \fI<path>\fR instead of home
+.TP
+\fB[ \-geometry \fI<geom>\fR \fB]\fR
+Sets the geometry of the app. \fI<geom>\fR uses the same format as standard X11 apps:	[\fB=\fR][\fI<width>\fR{\fBxX\fR}\fI<height>\fR][{\fB+-\fR}\fI<xoffset>\fR{\fB+-\fR}\fI<yoffset>\fR]
+.TP
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Prints log messages to stdout.
 .TP
-\fB\-h\fR, \fB\-\-help\fR
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Resets config to default values.
+.TP
+.B_untranslated [ \-s\fR, \fB\-\-skip ]\fR
+Skip connection dialog.
+.TP
+\fB[ \-t\fR, \fB\-\-category\fR=\fI<num>\fR \fB]\fR
+Set category for passed eD2k links to \fI<num>\fR
+.TP
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
 Prints a short usage description.
 .TP
-\fB\-\-verbose\fR
-Be verbose.
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Displays the current version number.
 .SH REPORTING BUGS
 Please report bugs either on our forum (\fIhttp://forum.amule.org/\fR), or in our bugtracker (\fIhttp://bugs.amule.org/\fR).
 Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member.
 .SH COPYRIGHT
 aMule and all of its related utilities are distributed under the GNU General Public License.
 .SH SEE ALSO
-\fBalc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
 .SH AUTHOR
 This manpage was written by Julien Delange for Debian <julien AT gunnm DOT org>
-This manpage was rewritten by Vollstrecker for aMule <amule@vollstreckernet.de>
-
-
 
+This manpage was rewritten by Vollstrecker <amule@vollstreckernet.de>
\ No newline at end of file

aMule-2.2.6.tar.bz2/docs/man/amulegui.de.1 -> aMule-2.3.1.tar.bz2/docs/man/amulegui.de.1 Changed

@@ -3,33 +3,70 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH AMULEGUI 1 "Januar 2007" "aMuleGUI v2.2.0" aMuleGUI
-.SH NAME
-amulegui \- aMule Steuerungsprogram mit GUI
+.TH AMULEGUI 1 "November 2011" "aMuleGUI v2.3.1" aMuleGUI
+.als B_untranslated B
+.als RB_untranslated RB
+.als unstranslated " "
+amulegui \- aMule Steuerungsprogramm mit GUI
 .SH SYNTAX
-\fBamulegui\fP
-.SH BESCHREIBUNG
-\fBamulegui\fP ist ein Program das über EC mit amule/amuled Verbindung
-aufnehmen kann. Du kannst deinen amle damit steuern. Es besitzt so ziemlich
-dieselben Funktionen wie amule, auch wenn dieser auf einem anderen Computer
-läuft.
+.B_untranslated amulegui
+[\fB\-c\fP \fI<Pfad>\fP] [\fB\-geometry\fP \fI<geom>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+.RB_untranslated [ \-s ]
+[\fB\-t\fP \fI<Num>\fP]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-v ]
 
-Dieses Programm hat keine Parameter
+.B_untranslated amulegui
+.RB_untranslated [ \-h ]
+.SH BESCHREIBUNG
+\fBamulegui\fP ist ein Clientprogramm, das mit aMule oder amuled über EC
+verbunden werden kann. Du kannst aMule mit diesem Programm steuernt. Es
+besitzt annähernd die selbe Funktionalität wie aMule, auch wenn der Kern auf
+einem anderen Computer läuft.
+.TP 
+\fB[ \-c\fP \fI<Pfad>\fP, \fB\-\-config\-dir\fP=\fI<Pfad>\fP \fB]\fP
+Liest die Konfiguration <Pfad> anstelle des Home.
+.TP 
+\fB[ \-geometry \fP\fI<geom>\fP \fB]\fP
+Gibt die Größe des Programmfensters an. \fI<geom>\fP hat das selbe
+Format wie Standard X11
+Anwendungen:	[\fB=\fP][\fI<Breite>\fP{\fBxX\fP}\fI<Höhe>\fP][{\fB+\-\fP}\fI<xOffset>\fP{\fB+\-\fP}\fI<yOffset>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Schreibt Log\-Meldungen auf die Standardausgabe.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Setzt die Konfiguration auf die Standardwerte zurück.
+.TP 
+.B_untranslated [ \-s\fR, \fB\-\-skip ]\fR
+Überspringe den Verbindungsdialog.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<Num>\fP \fB]\fP
+Setzt die Kategorie für den übergebenen eD2k Verweis \fI<Num>\fP
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Gibt eine kurze Nutzungsbeschreibung aus.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Zeigt die derzeitige Versionsnummer an.
 .SH "FEHLER MELDEN"
 Bitte meldet Fehler entweder in unserem Forum (\fIhttp://forum.amule.org/\fP),
 oder in unseren Bugtracker (\fIhttp://bugs.amule.org/\fP). Bitte meldet uns
-keine Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
+weder Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
 Teammitglieder.
 .SH COPYRIGHT
 aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU
 General Public License
 .SH "SIEHE AUCH"
-\fBalc\fP(1), \fBalcc\fP(1), \fBamuled\fP(1), \fBamulecmd\fP(1), \fBamuleweb\fP(1),
-\fBcas\fP(1), \fBed2k\fP(1), \fBwxcas\fP(1), \fBxas\fP(1)
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
 .SH VERFASSER
-Diese Seite wurde geschrieben von Julien Delange für Debian <julien AT
-gunnm DOT org> Diese Seite wurde überarbeit und übersetzt von
-Vollstrecker für aMule <amule@vollstreckernet.de>
-
+Diese manpage wurde geschrieben von Julien Delange for Debian <julien AT
+gunnm DOT org>
 
+Diese manpage wurde überarbeitet von Vollstrecker
+<amule@vollstreckernet.de>
 
+Diese manpage wurde übersetzt von Vollstrecker <amule@vollstreckernet.de>

aMule-2.3.1.tar.bz2/docs/man/amulegui.es.1 Added

@@ -0,0 +1,69 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULEGUI 1 "November 2011" "aMuleGUI v2.3.1" aMuleGUI
+.als B_untranslated B
+.als RB_untranslated RB
+.als unstranslated " "
+amulegui \- Programa para controlar aMule con Interfaz Gráfica
+.SH SINOPSIS
+.B_untranslated amulegui
+[\fB\-c\fP \fI<path>\fP] [\fB\-geometry\fP \fI<geom>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+.RB_untranslated [ \-s ]
+[\fB\-t\fP \fI<num>\fP]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-v ]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-h ]
+.SH DESCRIPCIÓN
+\fBamulegui\fP is a client program, and can be connected to amule or amuled via
+EC. You can manage your amule program with it. It provides almost the same
+functionalities as amule, even if the core works on another computer.
+.TP 
+\fB[ \-c\fP \fI<path>\fP, \fB\-\-config\-dir\fP=\fI<path>\fP \fB]\fP
+Leer configuración desde \fI<path>\fP en lugar de home
+.TP 
+\fB[ \-geometry \fP\fI<geom>\fP \fB]\fP
+Fija la geometría de la aplicación. \fI<geom>\fP usa el mismo formato
+estándar de las aplicaciones
+X11:	[\fB=\fP][\fI<width>\fP{\fBxX\fP}\fI<height>\fP][{\fB+\-\fP}\fI<xoffset>\fP{\fB+\-\fP}\fI<yoffset>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Imprime mensajes de registro en la salida estándar
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Reiniciar configuracion a valores por defecto
+.TP 
+.B_untranslated [ \-s\fR, \fB\-\-skip ]\fR
+Saltar diálogo de conexión
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<num>\fP \fB]\fP
+Fijar categoría para enlace eD2k pasado a \fI<num>\fP
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Imprime una breve descripción de uso.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Mostrar el número de la versión actual.
+.SH "INFORMANDO ERRORES"
+Por favor informa de fallos ya sea en nuestro foro
+(\fIhttp://forum.amule.org/\fP), o en nuestro bugtracker
+(\fIhttp://bugs.amule.org/\fP). Por favor no informe de fallos por correo, ni
+en nuestras listas, ni directamente al correo de algun miembro del equipo.
+.SH COPYRIGHT
+aMule y todas las demás utilidades relacionadas son distribuidas bajo la GNU
+General Public License.
+.SH "VEASE TAMBIEN"
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH AUTOR
+This manpage was written by Julien Delange for Debian <julien AT gunnm
+DOT org>
+
+This manpage was rewritten by Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.3.1.tar.bz2/docs/man/amulegui.fr.1 Added

@@ -0,0 +1,71 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULEGUI 1 "Novembre 2011" "aMuleGUI v2.3.1" aMuleGUI
+.als B_untranslated B
+.als RB_untranslated RB
+.als unstranslated " "
+amulegui \- programme de contrôle d'aMule avec Interface Graphique
+.SH SYNOPSIS
+.B_untranslated amulegui
+[\fB\-c\fP \fI<chemin>\fP] [\fB\-geometry\fP \fI<géom>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+.RB_untranslated [ \-s ]
+[\fB\-t\fP \fI<num>\fP]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-v ]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-h ]
+.SH DESCRIPTION
+\fBamulegui\fP est un programme client, et peut être connecté à amule ou amuled
+via EC. Vous pouvez gérer votre programme amule avec lui. Il fournit presque
+les mêmes fonctionnalités que amule, même si le noyau fonctionne sur un
+autre ordinateur.
+.TP 
+\fB[ \-c\fP \fI<chemin>\fP, \fB\-\-config\-dir\fP=\fI<chemin>\fP \fB]\fP
+Utiliser le fichier de config \fI<chemin>\fP à la place de celui par
+défaut
+.TP 
+\fB[ \-geometry \fP\fI<géom>\fP \fB]\fP
+Fixer la géometrie de l'application. \fI<géom>\fP utilise le meme
+format que les applications X11 standards
+:	[\fB=\fP][\fI<largeur>\fP{\fBxX\fP}\fI<hauteur>\fP][{\fB+\-\fP}\fI<xoffset>\fP{\fB+\-\fP}\fI<yoffset>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Afficher les messages du journal sur stdout.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Réinitialiser la configuration par défaut.
+.TP 
+.B_untranslated [ \-s\fR, \fB\-\-skip ]\fR
+Sauter la boîte de dialogue de connexion.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<num>\fP \fB]\fP
+Définir la catégorie pour les liens eD2k passé à  \fI<num>\fP
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Afficher une court description d'utilisation.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Affiche le numéro de la version actuelle.
+.SH "RAPPORTER DES BOGUES"
+Veuillez rapporter les bogues sur notre forum (\fIhttp://forum.amule.org/\fP),
+ou sur notre bugtracker (\fIhttp://bugs.amule.org/\fP).  Veuillez ne pas
+rapporter les bogues par e\-mail, sur notre liste de diffusion ou directement
+à n'importe quel membre  de l'équipe.
+.SH COPYRIGHT
+aMule et tout ses outils sont distribués sous la licence GNU General Public
+License.
+.SH "VOIR AUSSI"
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH AUTEUR
+Cette page de manuel a été rédigé par Julien Delange pour Debian <julien
+AT gunnm DOT org>
+
+Cette page de manuel a été réécrit par Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.3.1.tar.bz2/docs/man/amulegui.hu.1 Added

@@ -0,0 +1,72 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULEGUI 1 "2011. november" "aMuleGUI v2.3.1" aMuleGUI
+.als B_untranslated B
+.als RB_untranslated RB
+.als unstranslated " "
+amulegui \- aMule vezérlő program grafikus felülettel
+.SH ÁTTEKINTÉS
+.B_untranslated amulegui
+[\fB\-c\fP \fI<útvonal>\fP] [\fB\-geometry\fP \fI<geom>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+.RB_untranslated [ \-s ]
+[\fB\-t\fP \fI<szám>\fP]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-v ]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-h ]
+.SH LEÍRÁS
+Az \fBamulegui\fP egy ügyfél program, távoli elérés segítségével kapcsolódik az
+amule(d)\-hez. Majdnem a teljes funkcionalitást biztosítja, még ha a mag egy
+távoli gépen fut is.
+.TP 
+\fB[ \-c\fP \fI<útvonal>\fP, \fB\-\-config\-dir\fP=\fI<útvonal>\fP \fB]\fP
+A beállításokat az \fI<útvonal>\fP\-ból olvassa az alapértelmezett
+helyett.
+.TP 
+\fB[ \-geometry \fP\fI<geom>\fP \fB]\fP
+Beállítja az alkalmazás geometriáját. A \fI<geom>\fP paraméter ugyanazt
+a formátumot használja, mint a többi X11
+alkalmazás:	[\fB=\fP][\fI<szélesség>\fP{\fBxX\fP}\fI<magasság>\fP][{\fB+\-\fP}\fI<xpozíció>\fP{\fB+\-\fP}\fI<ypozíció>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+A napló bejegyzéseket a szabvány kimenetre írja.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Beállítások visszaállítása az alapértelmezett értékekre.
+.TP 
+.B_untranslated [ \-s\fR, \fB\-\-skip ]\fR
+A kapcsolódási párbeszéd átugrása.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<szám>\fP \fB]\fP
+A megadott eD2k hivatkozást a \fI<szám>\fP\-adik kategóriába tölti.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Egy rövid használati leírást jelenít meg.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Megjeleníti a verziószámot.
+.SH "HIBÁK JELENTÉSE"
+A hibákat kérjük vagy a fórumon (\fIhttp://forum.amule.org/\fP), vagy a
+hibakövetőben (\fIhttp://bugs.amule.org/\fP) jelentsék. Hibákról kérjük ne
+írjanak levelet (e\-mail\-t) se a levelezési listára, se közvetlenül
+valamelyik fejlesztőnek.
+.SH COPYRIGHT
+Az aMule és az összes hozzá tartozó segédprogram a GNU General Public
+License védelme alatt áll.
+.SH "LÁSD MÉG"
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH SZERZŐ
+Ezt a kézikönyv oldalt Julien Delange <julien AT gunnm DOT org> írta
+a Debian számára.
+
+Ezt a kézikönyv oldalt Vollstrecker <amule@vollstreckernet.de>
+újraírta.
+.SH MAGYAR FORDÍTÁS
+Dévai Tamás <gonosztopi@amule.org>

aMule-2.2.6.tar.bz2/docs/man/amulegui.it.1 -> aMule-2.3.1.tar.bz2/docs/man/amulegui.it.1 Changed

@@ -1,31 +1,72 @@
-.TH AMULEGUI 1 "Settembre 2009" "aMuleGUI v2.2.6" "aMuleGUI"
-.SH NAME
-amulegui \- Programma di controllo di aMule con GUI
-.SH SINOPSI
-.B amulegui
-.RB [ \-h ]
-.RB [ \-\-verbose ]
-.SH "DESCRIZIONE"
-.B amulegui
-è un programma client, e può essere connesso ad amule o amuled tramite EC. Puoi
-gestire il tuo programma amule con esso. Fornisce quasi le stesse funzioni
-di amule, anche se il nucleo lavora su un altro computer.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Mostra una breve descrizione di utilizzo.
-.TP
-\fB\-\-verbose\fR
-Sii prolisso.
-.SH SEGNALARE BUG
-Per piacere segnala bug nel nostro forum (\fIhttp://forum.amule.org/\fR), o nel nostro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Per piacere non segnalare bug tramite e-mail, tramite la nostra mailing list e neppure direttamente a un qualsiasi membro della squadra.
-.SH COPYRIGHT
-aMule e tutte le sue utilità correlate sono distribuite sotto la GNU General Public License.
-.SH CONSULTA ANCHE
-\fBalc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
-.SH AUTORE
-Questa pagina di manuale è stata scritta da Julien Delange per Debian <julien AT gunnm DOT org>
-Questa pagina di manuale è stata riscritta da Vollstrecker per aMule <amule@vollstreckernet.de>
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULEGUI 1 "Novembre 2011" "aMuleGUI v2.3.1" aMuleGUI
+.als B_untranslated B
+.als RB_untranslated RB
+.als unstranslated " "
+amulegui \- programma in interfaccia grafica per controllare aMule
+.SH SINTASSI
+.B_untranslated amulegui
+[\fB\-c\fP \fI<percorso>\fP] [\fB\-geometry\fP \fI<geometria>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+.RB_untranslated [ \-s ]
+[\fB\-t\fP \fI<numero>\fP]
 
+.B_untranslated amulegui
+.RB_untranslated [ \-v ]
 
+.B_untranslated amulegui
+.RB_untranslated [ \-h ]
+.SH DESCRIZIONE
+\fBamulegui\fP è un programma client, e può connettersi tramite EC ad amule o
+amuled. Con esso si può gestire amule. Fornisce circa le stesse funzionalità
+di amule, anche se il motore lavora su un'altro computer.
+.TP 
+\fB[ \-c\fP \fI<percorso>\fP, \fB\-\-config\-dir\fP=\fI<percorso>\fP \fB]\fP
+Legge la configurazione dal \fI<percorso>\fP invece che dalla directory
+dell'utente.
+.TP 
+\fB[ \-geometry \fP\fI<geometria>\fP \fB]\fP
+Imposta la geometria della applicazione. \fI<geometria>\fP usa lo
+stesso formato delle applicazioni X11 standard:
+	[\fB=\fP][\fI<larghezza>\fP{\fBxX\fP}\fI<altezza>\fP][{\fB+\-\fP}\fI<spostamentox>\fP{\fB+\-\fP}\fI<spostamentoy>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Scrive i messaggi di log nello stdout.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Reimposta la configurazione ai valori di default.
+.TP 
+.B_untranslated [ \-s\fR, \fB\-\-skip ]\fR
+Salta la finestra di connessione.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<numero>\fP \fB]\fP
+Imposta la categoria per i collegamenti eD2k ricevuti a \fI<numero>\fP
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Visualizza una breve descrizione dell'utilizzo.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Visualizza il numero di versione corrente.
+.SH "SEGNALARE I BUG"
+Per favore segnalare i bug nel nostro forum (\fIhttp://forum.amule.org/\fP) o
+nel nostro bugtracker (\fIhttp://bugs.amule.org/\fP). Per favore non segnalare
+i bug via posta elettronica, né nella nostra mailing list né direttamente a
+qualunque membro del gruppo.
+.SH COPYRIGHT
+aMule e tutti i programmi di utilità correlati sono distribuiti in accordo
+alla GNU General Public License.
+.SH "VEDI ANCHE"
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH AUTORE
+Questa pagina di manuale è stata scritta da Julien Delange per Debian
+<julien AT gunnm DOT org>
 
+Questa pagina di manuale è stata riscritta da Vollstrecker
+<amule@vollstreckernet.de>
+.SH TRADUZIONE ITALIANA
+Stefano Corti <iz0bbz@libero.it>

aMule-2.3.1.tar.bz2/docs/man/amulegui.ru.1 Added

@@ -0,0 +1,70 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULEGUI 1 "November 2011" "aMuleGUI v2.3.1" aMuleGUI
+.als B_untranslated B
+.als RB_untranslated RB
+.als unstranslated " "
+amulegui \- программа управления aMule с GUI
+.SH ОБЗОР
+.B_untranslated amulegui
+[\fB\-c\fP \fI<путь>\fP] [\fB\-geometry\fP \fI<геометрия>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+.RB_untranslated [ \-s ]
+[\fB\-t\fP \fI<номер>\fP]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-v ]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-h ]
+.SH ОПИСАНИЕ
+Программа \fBamulegui\fP позволяет управлять ядром (amule/amuled) по протоколу
+EC. Программа предоставляет функциональность почти идентичную amule,
+несмотря на то что ядро может работать на другом компьютере.
+.TP 
+\fB[ \-c\fP \fI<путь>\fP, \fB\-\-config\-dir\fP=\fI<путь>\fP \fB]\fP
+Прочитать конфигурацию из места, указанного в \fI<пути>\fP, вместо
+домашнего каталога
+.TP 
+\fB[ \-geometry \fP\fI<геометрия>\fP \fB]\fP
+Указать геометрию окна. \fI<Геометрия>\fP использует стандартный формат
+X11:	[\fB=\fP][\fI<ширина>\fP{\fBxX\fP}\fI<высота>\fP][{\fB+\-\fP}\fI<смещениеX>\fP{\fB+\-\fP}\fI<смещениеY>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Печатает сообщения лога в стандартный вывод.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Сбрасывает конфигурацию в изначальную.
+.TP 
+.B_untranslated [ \-s\fR, \fB\-\-skip ]\fR
+Пропустить диалог соединения.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<номер>\fP \fB]\fP
+Указать \fI<номер>\fP категории для eD2k ссылок.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Выводит короткую помощь по использованию.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Выводит информацию о версии.
+.SH "СООБЩЕНИЕ ОБ ОШИБКАХ"
+Пожалуйста, сообщайте об ошибках либо на нашем форуме
+(\fIhttp://forum.amule.org/\fP), либо в багтрекере
+(\fIhttp://bugs.amule.org/\fP). Пожалуйста, не сообщайте об ошбках по
+электронной почте, по нашим спискам рассылки, или напрямую участникам.
+.SH "АВТОРСКИЕ ПРАВА"
+aMule и все прилагающиеся инструменты распространаются под Открытым
+Лицензионным Соглашением GNU (GNU GPL).
+.SH "СМ. ТАКЖЕ"
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH АВТОРЫ
+Автор страницы помощи (для Debian): Julien Delange <julien AT gunnm DOT
+org>
+
+Переработка страницы помощи: Vollstrecker
+<amule@vollstreckernet.de>, перевод: Radist Morse
+<radist.morse@gmail.com>

aMule-2.3.1.tar.bz2/docs/man/amulegui.tr.1 Added

@@ -0,0 +1,70 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULEGUI 1 "Kasım 2011" "aMuleGUI v2.3.1" aMuleGUI
+.als B_untranslated B
+.als RB_untranslated RB
+.als unstranslated " "
+amulegui \- Grafik arayüzlü aMule yönetme programı
+.SH KULLANIM
+.B_untranslated amulegui
+[\fB\-c\fP \fI<yol>\fP] [\fB\-geometry\fP \fI<geom>\fP]
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-r ]
+.RB_untranslated [ \-s ]
+[\fB\-t\fP \fI<sayı>\fP]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-v ]
+
+.B_untranslated amulegui
+.RB_untranslated [ \-h ]
+.SH AÇIKLAMA
+\fBamulegui\fP istemci bir programdır ve amule ya da amuled'e DB yoluyla
+bağlanabilir. aMule'ü bu şekilde yönetebilirsiniz. Çekirdeğin başka bir
+bilgisayarda çalışmasına rağmen amule'ün neredeyse tüm işlevlerine erişim
+sağlar.
+.TP 
+\fB[ \-c\fP \fI<yol>\fP, \fB\-\-config\-dir\fP=\fI<yol>\fP \fB]\fP
+Yapılandırmayı home yerine \fI<yol>\fPdan oku
+.TP 
+\fB[ \-geometry \fP\fI<geom>\fP \fB]\fP
+Uygulamanın geometrisini düzenler. \fI<geom>\fP standart X11
+uygulamaları ile aynı biçimi
+kullanır:	[\fB=\fP][\fI<genişlik>\fP{\fBxX\fP}\fI<yükseklik>\fP][{\fB+\-\fP}\fI<xoffset>\fP{\fB+\-\fP}\fI<yoffset>\fP]
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-log\-stdout ]\fR
+Log mesajlarını standart çıktıya gönderir.
+.TP 
+.B_untranslated [ \-r\fR, \fB\-\-reset\-config ]\fR
+Yapılandırmayı varsayılan değerlere sıfırlar.
+.TP 
+.B_untranslated [ \-s\fR, \fB\-\-skip ]\fR
+Bağlantı diyaloğunu geç.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<sayı>\fP \fB]\fP
+\fI<sayı>\fPya gönderilen eD2k bağlantılarının kategorilerini belirler.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Kısa bir kullanım açıklaması görüntüler.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Geçerli sürüm numarasını görüntüler.
+.SH GERİBİLDİRİM
+Hataları bildirmek için forumumuzu (\fIhttp://forum.amule.org/\fP) ya da hata
+takipçimizi (\fIhttp://bugs.amule.org/\fP) kullanınız. Hataları bildirmek için
+e\-mail ve e\-mail listemizi kullanmamanızı ve geliştiricilerden birine
+doğrudan bildirmemenizi rica ederiz.
+.SH "TELİF HAKKI"
+aMule ve ilgili tüm yardımcı araçları GNU Genel Kamu Lisansı çerçevesinde
+dağıtılmaktadır.
+.SH "İLGİLİ BELGELER"
+.B_untranslated alc\fR(1), \fBalcc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH YAZAN
+Bu man sayfası Debian için Julien Delange <julien AT gunnm DOT org>
+tarafından yazılmıştır.
+
+Bu kılavuz sayfası Vollstrecker <amule@vollstreckernet.de>
+tarafından yeniden yazılmıştır

aMule-2.2.6.tar.bz2/docs/man/amuleweb.1 -> aMule-2.3.1.tar.bz2/docs/man/amuleweb.1 Changed

@@ -1,169 +1,173 @@
-.TH AMULEWEB 1 "September 2009" "aMule webserver v2.2.6" "aMule utilities"
+.TH AMULEWEB 1 "November 2011" "aMule webserver v2.3.1" "aMule utilities"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NAME
 amuleweb \- aMule web server
 .SH SYNOPSIS
-.B amuleweb
+.B_untranslated amuleweb
 .RB [ \-h " " \fI<host> ]
 .RB [ \-p " " \fI<port> ]
-.RB [ \-P " " \fI<passwd> ]
+.RB [ \-P " " \fI<password> ]
 .RB [ \-f " " \fI<path> ]
-.RB [ \-q ]
-.RB [ \-v ]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
 .RB [ \-l " " \fI<lang> ]
-.RB [ \-w ]
+.RB_untranslated [ \-w ]
 .RB [ \-t " " \fI<name> ]
 .RB [ \-s " " \fI<port> ]
-.RB [ \-u ]
-.RB [ \-U ]
-.RB [ \-z ]
-.RB [ \-Z ]
-.RB [ \-A " " \fI<pass> ]
-.RB [ \-G " " \fI<pass> ]
-.RB [ \-a ]
-.RB [ \-d ]
-.RB [ \-L ]
-.RB [ \-N ]
-.PP
-.B amuleweb
-.RB [ \-f " " \fI<path> ]
-.B \-\-create-config-from=\fI<path>
-.PP
-.B amuleweb
-.RB [ \-\-help ]
-.RB [ \-\-version ]
-.PP
-.B amuleweb \-\-amule\-config\-file=\fI<path>
-.PP
-.B amuleweb \-\-no\-php
+.RB_untranslated [ \-u ]
+.RB [ \-U " " \fI<port> ]
+.RB_untranslated [ \-z ]
+.RB_untranslated [ \-Z ]
+.RB [ \-A " " \fI<password> ]
+.RB [ \-G " " \fI<password> ]
+.RB_untranslated [ \-a " " | " " \-d ]
+.RB_untranslated [ \-L ]
+.RB_untranslated [ \-\-no\-php ]
+.RB_untranslated [ \-N ]
+
+.B_untranslated amuleweb
+.RB [ \-\-create-config-from = \fI<path> ]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-help ]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amuleweb
+.RB [ \-\-amule\-config\-file = \fI<path> ]
+
 .SH DESCRIPTION
 \fBamuleweb\fR manages your access to amule through a web browser.
 You can start amuleweb together with \fBamule\fR(1), or separately, any time later.
 Options can be specified via command-line or via config-file.
 Command-line options take precedence over config-file options.
 .TP
-\fB\-h\fR, \fB\-\-host\fR=\fI<host>\fR
+\fB[ \-h\fR \fI<host>\fR, \fB\-\-host\fR=\fI<host>\fR \fB]\fR
 Host where aMule is running (default: \fIlocalhost\fR).
-\fI<host>\fR might be an IP address or a DNS name.
+\fI<host>\fR might be an IP address or a DNS name
 .TP
-\fB\-p\fR, \fB\-\-port\fR=\fI<port>\fR
-aMule's port for External Connections, as set in Preferences->Remote Controls (default: \fI4712\fR).
+\fB[ \-p\fR \fI<port>\fR, \fB\-\-port\fR=\fI<port>\fR \fB]\fR
+aMule's port for External Connections, as set in Preferences->Remote Controls (default: \fI4712\fR)
 .TP
-\fB\-P\fR, \fB\-\-password\fR=\fI<passwd>\fR.
+\fB[ \-P\fR \fI<password>\fR, \fB\-\-password\fR=\fI<password>\fR \fB]\fR
 External Connections password.
 .TP
-\fB\-f\fR, \fB\-\-config\-file\fR=\fI<path>\fR
-Uses the given configuration file.
-Default configuration file is \fI~/.aMule/remote.conf\fR .
+\fB[ \-f\fR \fI<path>\fR, \fB\-\-config\-file\fR=\fI<path>\fR \fB]\fR
+Use the given configuration file.
+Default configuration file is \fI~/.aMule/remote.conf\fR
 .TP
-\fB\-q\fR, \fB\-\-quiet\fR
-Does not print any output to stdout.
-You may want to use \fB\-q\fR to daemonize the webserver, i.e. running as '\fBamuleweb \-q &\fR'.
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Do not print any output to stdout.
 .TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Be verbose \- show also debug messages.
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Be verbose \-
+show also debug messages.
 .TP
-\fB\-l\fR, \fB\-\-locale\fR=\fI<lang>\fR
+\fB[ \-l\fR \fI<lang>\fR, \fB\-\-locale\fR=\fI<lang>\fR \fB]\fR
 Sets program locale (language).
-See section \fBLANGUAGES\fR for the description of the \fI<lang>\fR parameter.
-.TP
-\fB\-w\fR, \fB\-\-write\-config\fR
-Writes command line options to config file and exit.
+See the \fBNOTES\fR section for the description of the \fI<lang>\fR parameter.
 .TP
-\fB\-\-create\-config\-from\fR=\fI<path>\fR
-Creates config file based upon \fI<path>\fR, which must point to a valid aMule config file, and then exit.
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+Write command line options to config file and exit
 .TP
-\fB\-t\fR, \fB\-\-template\fR=\fI<name>\fR
-Loads the template named \fI<name>\fR. See also the section
-.B SKIN SUPPORT.
+\fB[ \-t\fR \fI<name>\fR, \fB\-\-template\fR=\fI<name>\fR \fB]\fR
+Loads the template named \fI<name>\fR. See the \fBSKIN SUPPORT\fR section for details.
 .TP
-\fB\-s\fR, \fB\-\-server\-port\fR=\fI<port>\fR
-Webserver's HTTP port. This is the port you can point your browser to (default: \fI4711\fR).
+\fB[ \-s\fR \fI<port>\fR, \fB\-\-server\-port\fR=\fI<port>\fR \fB]\fR
+Webserver's HTTP port. This is the port you must point your browser to (default: \fI4711\fR).
 .TP
-\fB\-z\fR, \fB\-\-enable\-upnp\fR
-Enables use of UPnP port forwarding on web server port.
+.B_untranslated [ \-u ]\fR
+.br
+Enable UPnP.
 .TP
-\fB\-U\fR, \fB\-\-upnp\-port\fR
+\fB[ \-U\fR \fI<port>\fR, \fB\-\-upnp\-port\fR \fI<port>\fR \fB]\fR
 UPnP port.
 .TP
-\fB\-z\fR, \fB\-\-enable\-gzip\fR
+.B_untranslated [ \-z\fR, \fB\-\-enable\-gzip ]\fR
 Enables using gzip compression in HTTP traffic to save bandwidth.
 .TP
-\fB\-Z\fR, \fB\-\-disable\-gzip\fR
+.B_untranslated [ \-Z\fR, \fB\-\-disable\-gzip ]\fR
 Disables using gzip compression (this is the default).
 .TP
-\fB\-A\fR, \fB\-\-admin\-pass\fR=\fI<passwd>\fR
+\fB[ \-A\fR \fI<passwd>\fR, \fB\-\-admin\-pass\fR=\fI<passwd>\fR \fB]\fR
 Full access password for webserver.
 .TP
-\fB\-G\fR, \fB\-\-guest\-pass\fR=\fI<passwd>\fR
+\fB[ \-G\fR \fI<passwd>\fR, \fB\-\-guest\-pass\fR=\fI<passwd>\fR \fB]\fR
 Guest password for webserver.
 .TP
-\fB\-a\fR, \fB\-\-allow\-guest\fR
+.B_untranslated [ \-a\fR, \fB\-\-allow\-guest ]\fR
 Allows guest access.
 .TP
-\fB\-d\fR, \fB\-\-deny\-guest\fR
+.B_untranslated [ \-d\fR, \fB\-\-deny\-guest ]\fR
 Denies guest access (default).
 .TP
-\fB\-L\fR, \fB\-\-load\-settings\fR
+.B_untranslated [ \-L\fR, \fB\-\-load\-settings ]\fR
 Load/save webserver settings from/to remote aMule.
 This causes amuleweb to ignore command-line and config-file settings, and load them from aMule.
 When saving preferences none will be written to the config file, but to aMule.
 (Of course, this works only for those settings that can be set in aMule's Preferences->Remote Controls.)
 .TP
-\fB\-N\fR, \fB\-\-no\-script\-cache\fR
+.B_untranslated [ \-\-no\-php ]\fR
+Disable PHP interpreter (deprecated)
+.TP
+.B_untranslated [ \-N\fR, \fB\-\-no\-script\-cache ]\fR
 Recompiles PHP pages on each request.
 .TP
-\fB\-\-amule\-config\-file\fR=\fI<path>\fR
-aMule config file path.
-.B DO NOT USE DIRECTLY!
-aMule uses this option when starting amuleweb at aMule startup.
-This option causes all other command-line and config-file settings to be ignored, preferences to be read from the given config file, and also implies the \fB\-q \-L\fR options.
+\fB[ \-\-create\-config\-from\fR=\fI<path>\fR \fB]\fR
+Create config file based upon \fI<path>\fR, which must point to a valid aMule config file, and then exit.
 .TP
-\fB\-\-help\fR
+.B_untranslated [ \-\-help ]\fR
 Prints a short usage description.
 .TP
-\fB\-\-version\fR
+.B_untranslated [ \-\-version ]\fR
 Displays the current version number.
+.TP
+\fB[ \-\-amule\-config\-file\fR=\fI<path>\fR \fB]\fR
+aMule config file path.
+.B DO NOT USE DIRECTLY!
+aMule uses this option when starting amuleweb at aMule startup.
+This option causes all other command-line and config-file settings to be ignored, preferences to be read from the given config file, and also implies the \fB\-q \-L\fR options.
 .SH NOTES
 .SS Paths
 For all options which take a \fI<path>\fR value, if the \fIpath\fR contains no
 directory part (i.e. just a plain filename), then it is considered to be under
 the aMule configuration directory, \fI~/.aMule\fR.
-.SS LANGUAGES
+.SS Languages
 The \fI<lang>\fR parameter for the \fB\-l\fR option has the following form: \fIlang\fR[\fB_\fILANG\fR][\fB.\fIencoding\fR][\fB@\fImodifier\fR]
 where \fIlang\fR is the primary language, \fILANG\fR is a sublanguage/territory,
 \fIencoding\fR is the character set to use and \fImodifier\fR
-"allows the user to select a specific instance of localization data within a
-single category".
-.PP
+allows the user to select a specific instance of localization data within a
+single category.
+
 For example, the following strings are valid:
+.RS
+.RB_untranslated de
 .br
-de
+.RB_untranslated de_DE
 .br
-de_DE
+.RB_untranslated de_DE.iso88591
 .br
-de_DE.iso88591
+.RB_untranslated de_DE@euro
 .br
-de_DE@euro
-.br
-de_DE.iso88591@euro
-.PP
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
 Though all the above strings are accepted as valid language definitions,
 \fIencoding\fR and \fImodifier\fR are yet unused.
-.PP
+
 In addition to the format above, you can also specify full language names in
-English - so \fB\-l german\fR is also valid and is equal to \fB-l de_DE\fR.
-.PP
+English - so \fB\-l german\fR is also valid and is equal to \fB\-l de_DE\fR.
+
 When no locale is defined, either on command-line or in config file, system
 default language will be used.
 .SH SKIN SUPPORT
 \fBamuleweb\fR is capable of displaying information in different skins.
 These skins are called templates, and you can make amuleweb load a specific template via the \fB\-t\fR command line option.
-Templates are searched in two places: first in \fI~/.aMule/webserver/\fR and then in \fI$(pkgdatadir)/webserver/\fR 
-(\fI$(pkgdatadir)\fR is the install location of architecture independent data, most likely something like /usr/share/amule).
-Each template must be in a subdirectory of the template name, and this directory must contain all files the template needs.
-The actual template filename must be aMule.tmpl.
+Templates are searched in two places: first in \fI~/.aMule/webserver/\fR and then in \fI/usr/share/amule/webserver/\fR if you installed with \-\-prefix=/usr.
 .PP
-For example, the default template (named 'default') is in webserver/default/, and this directory contains aMule.tmpl amongst a lot of image files.
+Each template must be in a subdirectory of the template name, and this directory must contain all files the template needs.
 .SH FILES
 ~/.aMule/remote.conf
 .br
@@ -181,7 +185,7 @@
 .PP
 These will save settings to \fI$HOME/.aMule/remote.conf\fR, and later you only need to type:
 .PP
-.B amuleweb
+.B_untranslated amuleweb
 .PP
 Of course, you may specify any more or less options on the first example line, and you may also totally omit it.
 .SH REPORTING BUGS
@@ -190,4 +194,6 @@
 .SH COPYRIGHT
 aMule and all of its related utilities are distributed under the GNU General Public License.
 .SH SEE ALSO
-\fBamule\fR(1), \fBamulecmd\fR(1)
+.B_untranslated amule\fR(1), \fBamulecmd\fR(1)
+.SH AUTHOR
+This manpage was written by Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amuleweb.de.1 -> aMule-2.3.1.tar.bz2/docs/man/amuleweb.de.1 Changed

@@ -3,24 +3,42 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH AMULEWEB 1 "Januar 2007" "aMule Webserver v2.2.0" "aMule Hilfsprogramme"
+.TH AMULEWEB 1 "November 2011" "aMule webserver v2.3.1" "aMule Hilfsprogramme"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NAME
 amuleweb \- aMule Webserver
 .SH SYNTAX
-\fBamuleweb\fP [\fB\-h\fP \fI<Host>\fP] [\fB\-p\fP \fI<Port>\fP] [\fB\-P\fP
-\fI<Passwort>\fP] [\fB\-f\fP \fI<Pfad>\fP] [\fB\-q\fP] [\fB\-v\fP] [\fB\-l\fP
-\fI<Sprache>\fP] [\fB\-w\fP] [\fB\-t\fP \fI<Name>\fP] [\fB\-s\fP
-\fI<Port>\fP] [\fB\-z\fP] [\fB\-Z\fP] [\fB\-A\fP \fI<Passwort>\fP] [\fB\-G\fP
-\fI<Passwort>\fP] [\fB\-a\fP] [\fB\-d\fP] [\fB\-L\fP] [\fB\-N\fP]
-.PP
-\fBamuleweb\fP [\fB\-f\fP \fI<Pfad>\fP]
-\fB\-\-create\-config\-from=\fP\fI<Pfad>\fP
-.PP
-\fBamuleweb\fP [\fB\-\-help\fP] [\fB\-\-version\fP]
-.PP
-\fBamuleweb \-\-amule\-config\-file=\fP\fI<Pfad>\fP
-.PP
-\fBamuleweb \-\-no\-php\fP
+.B_untranslated amuleweb
+[\fB\-h\fP \fI<Host>\fP] [\fB\-p\fP \fI<Port>\fP] [\fB\-P\fP
+\fI<Passwort>\fP] [\fB\-f\fP \fI<Pfad>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<Sprache>\fP]
+.RB_untranslated [ \-w ]
+[\fB\-t\fP \fI<Name>\fP] [\fB\-s\fP \fI<Port>\fP]
+.RB_untranslated [ \-u ]
+[\fB\-U\fP \fI<Port>\fP]
+.RB_untranslated [ \-z ]
+.RB_untranslated [ \-Z ]
+[\fB\-A\fP \fI<Passwort>\fP] [\fB\-G\fP \fI<Passwort>\fP]
+.RB_untranslated [ \-a " " | " " \-d ]
+.RB_untranslated [ \-L ]
+.RB_untranslated [ \-\-no\-php ]
+.RB_untranslated [ \-N ]
+
+.B_untranslated amuleweb
+[\fB\-\-create\-config\-from\fP=\fI<Pfad>\fP]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-help ]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amuleweb
+[\fB\-\-amule\-config\-file\fP=\fI<Pfad>\fP]
+
 .SH BESCHREIBUNG
 \fBamuleweb\fP ermöglicht dir den Zugriff auf amule(d) per Webbrowser. Man kann
 amuleweb zusammen mit \fBamule\fP(1) starten lassen, oder ihn separat später
@@ -28,69 +46,69 @@
 Konfigurationsdatei angegeben werden. Kommandozeilenoptionen überschreiben
 die Werte aus der Konfigurationsdatei.
 .TP 
-\fB\-h\fP, \fB\-\-host\fP=\fI<Host>\fP
+\fB[ \-h\fP \fI<Host>\fP, \fB\-\-host\fP=\fI<Host>\fP \fB]\fP
 Der Rechner auf dem aMule läuft (Standard: \fIlocalhost\fP).  \fI<Host>\fP
 kann eine IP\-Adresse oder ein DNS\-Name sein.
 .TP 
-\fB\-p\fP, \fB\-\-port\fP=\fI<Port>\fP
+\fB[ \-p\fP \fI<Port>\fP, \fB\-\-port\fP=\fI<Port>\fP \fB]\fP
 aMule's Port für Externe Verbindungen, wie in den Optionen
 unter\->Fernsteuerung (Standard: \fI4712\fP) eingestellt.
 .TP 
-\fB\-P\fP, \fB\-\-password\fP=\fI<Passwort>\fP
+\fB[ \-P\fP \fI<Passwort>\fP, \fB\-\-password\fP=\fI<Passwort>\fP \fB]\fP
 Passwort für Externe Verbindungen.
 .TP 
-\fB\-f\fP, \fB\-\-config\-file\fP=\fI<Pfad>\fP
+\fB[ \-f\fP \fI<Pfad>\fP, \fB\-\-config\-file\fP=\fI<Pfad>\fP \fB]\fP
 Benutzt die angegebene Konfigurationsdatei. Die Standardkonfigurationsdatei
 ist \fI~/.aMule/remote.conf\fP
 .TP 
-\fB\-q\fP, \fB\-\-quiet\fP
-Gebe keine Ausgaben auf der Standardausgabe aus. Du könntest \fB\-q\fP benutzen
-um den Webserver als Dämon laufen zu lassen, z.B. durch Aufruf von
-\&'\fBamuleweb \-q &\fP'
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Keine Ausgabe auf stdout ausgeben.
 .TP 
-\fB\-v\fP, \fB\-\-verbose\fP
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
 Sei gesprächig \- Gebe auch Debuggingausgaben aus
 .TP 
-\fB\-l\fP, \fB\-\-locale\fP=\fI<Sprache>\fP
-Setzt die Locale (Sprache) des Programms. Siehe Abschnitt \fBSPRACHEN\fP für
-die Beschreibung des \fI<Sprache>\fP Parameter.
+\fB[ \-l\fP \fI<Sprache>\fP, \fB\-\-locale\fP=\fI<Sprache>\fP \fB]\fP
+Setzt die Lokale (Sprache) des Programms.  Siehe Abschnitt \fBANMERKUNGEN\fP
+für die Beschreibung des \fI<Sprache>\fP Parameters.
 .TP 
-\fB\-w\fP, \fB\-\-write\-config\fP
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
 Schreibe die Kommandozeilenoptionen in die Konfigurationsdatei und kehre zur
 Shell zurück.
 .TP 
-\fB\-\-create\-config\-from\fP=\fI<Pfad>\fP
-Erstellt eine Konfigurationsdatei basierend auf \fI<Pfad>\fP, welche
-auf eine gültige Amulekonfigurationsdatei verweisen muss, und kehre zur
-Shell zurück.
+\fB[ \-t\fP \fI<Name>\fP, \fB\-\-template\fP=\fI<Name>\fP \fB]\fP
+Loads the template named \fI<name>\fP. See the \fBSKIN SUPPORT\fP section
+for details.
 .TP 
-\fB\-t\fP, \fB\-\-template\fP=\fI<Name>\fP
-Lädt die mit \fI<Name>\fP spezifizierte Vorlage. Siehe auch Abschnitt
-\fBSKIN UNTERSTÜTZUNG\fP
+\fB[ \-s\fP \fI<Port>\fP, \fB\-\-server\-port\fP=\fI<Port>\fP \fB]\fP
+Webserver's HTTP port. This is the port you must point your browser to
+(default: \fI4711\fP).
 .TP 
-\fB\-s\fP, \fB\-\-server\-port\fP=\fI<Port>\fP
-HTTP Port des Webservers. Der Port der mit dem Browser erreichbar sein soll
-(Standard: \fI4711\fP)
+.B_untranslated [ \-u ]\fR
+.br
+Aktiviere UPnP.
+.TP 
+\fB[ \-U\fP \fI<Port>\fP, \fB\-\-upnp\-port\fP \fI<Port>\fP \fB]\fP
+UPnP Port.
 .TP 
-\fB\-z\fP, \fB\-\-enable\-gzip\fP
+.B_untranslated [ \-z\fR, \fB\-\-enable\-gzip ]\fR
 Benutzt gzip Kompression für den HTTP Verkehr um Bandbreite zu sparen
 .TP 
-\fB\-Z\fP, \fB\-\-disable\-gzip\fP
+.B_untranslated [ \-Z\fR, \fB\-\-disable\-gzip ]\fR
 Schalten die gzip Kompression ab (Standard)
 .TP 
-\fB\-A\fP, \fB\-\-admin\-pass\fP=\fI<Passwort>\fP
+\fB[ \-A\fP \fI<Passwort>\fP, \fB\-\-admin\-pass\fP=\fI<Passwort>\fP \fB]\fP
 Passwort für vollen Zugriff auf den Webserver
 .TP 
-\fB\-G\fP, \fB\-\-guest\-pass\fP=\fI<Passwort>\fP
+\fB[ \-G\fP \fI<Passwort>\fP, \fB\-\-guest\-pass\fP=\fI<Passwort>\fP \fB]\fP
 Gäste Passwort für den Webserver
 .TP 
-\fB\-a\fP, \fB\-\-allow\-guest\fP
+.B_untranslated [ \-a\fR, \fB\-\-allow\-guest ]\fR
 Erlaubt den Zugriff als Gast
 .TP 
-\fB\-d\fP, \fB\-\-deny\-guest\fP
+.B_untranslated [ \-d\fR, \fB\-\-deny\-guest ]\fR
 Verbietet den Zugriff als Gast (Standard)
 .TP 
-\fB\-L\fP, \fB\-\-load\-settings\fP
+.B_untranslated [ \-L\fR, \fB\-\-load\-settings ]\fR
 Lade/Speichere Einstellungen vom/zum entfernen aMule. Dies bringt amuleweb
 dazu, die Kommandozeilen\- und Konfigurationsdateieinstellungen zu
 ignorieren, und von aMule zu beziehen. Beim Speichern werden keine
@@ -98,67 +116,72 @@
 gesendet. (das funktioniert nur für Einstellungen in aMule's
 Einstellungen\->Fernsteuerung Dialog)
 .TP 
-\fB\-N\fP, \fB\-\-no\-script\-cache\fP
+.B_untranslated [ \-\-no\-php ]\fR
+Deaktiviert den PHP Interpreter (veraltet)
+.TP 
+.B_untranslated [ \-N\fR, \fB\-\-no\-script\-cache ]\fR
 Erstellt die PHP\-Seiten bei jedem Aufruf neu
 .TP 
-\fB\-\-amule\-config\-file\fP=\fI<Pfad>\fP
-Pfad zur aMule Konfigurationsdatei. \fBNICHT DIREKT BENUTZEN!\fP aMule benutzt
-dies zum starten von amuleweb wenn aMule startet. Diese Option sorgt dafür,
-das alle anderen Paramter ignoriert werden, und nur aus der angegeben Datei
-gelesen werden, und impliziert auch die \fB\-q \-L\fP Optionen.
+\fB[ \-\-create\-config\-from\fP=\fI<Pfad>\fP \fB]\fP
+Konfigurationsdatei basierend auf \fI<Pfad>\fP, welche auf eine gültige
+aMule Konfigurationsdatei verweisen muss, erstellen und danach beenden.
 .TP 
-\fB\-\-help\fP
-Gibt eine kurze Beschreibung aus.
+.B_untranslated [ \-\-help ]\fR
+Gibt eine kurze Nutzungsbeschreibung aus.
 .TP 
-\fB\-\-version\fP
+.B_untranslated [ \-\-version ]\fR
 Zeigt die derzeitige Versionsnummer an.
+.TP 
+\fB[ \-\-amule\-config\-file\fP=\fI<Pfad>\fP \fB]\fP
+Pfad zur aMule Konfigurationsdatei. \fBNICHT DIREKT BENUTZEN!\fP aMule benutzt
+dies zum starten von amuleweb wenn aMule startet. Diese Option sorgt dafür,
+das alle anderen Parameter ignoriert werden, und nur aus der angegeben Datei
+gelesen werden, und impliziert auch die \fB\-q \-L\fP Optionen.
 .SH ANMERKUNGEN
 .SS Pfade
-If you specify a file without giving an absolute path (i.e. just a plain
-filename, such as \fB\-\-path\fP=\fIremote.conf\fP), then this file is searched
-within the aMule configuration directory, \fI~/.aMule\fP.
-.SS SPRACHEN
-Der \fI<Sprache>\fP Parameter für die \fB\-l\fP Option hat folgende Form:
-\fIsprache\fP[\fB_\fP\fISPRACHE\fP][\fB.\fP\fIKODIERUNG\fP][\fB@\fP\fIzusatz\fP] wobei \fIsprache\fP
-die primäre Sprache, \fISPRACHE\fP die Regionalsprache, \fIKODIERUNG\fP die
-Zeichentabelle ist, und \fIzusatz\fP "erlaubt es dem Nutzer eine bestimmte
-Auswahl innerhalb einer einzigen Kategorie auszuwählen".
-.PP
+Für alle Optionen die ein \fI<Pfad>\fP Argument erwarten, wenn der
+\fIPfad\fP kein Verzeichnis enthält(z.B. nur einen Dateinamen), dann wird
+angenommen, diese Datei liegt um aMule\-Konfigurationsverzeichnis,
+\fI~/.aMule\fP.
+.SS Sprachen
+Der \fI<Sprache>\fP Parameter der \fB\-l\fP Option hat folgende Form:
+\fIsprache\fP[\fB_\fP\fISPRACHE\fP][\fB.\fP\fIkodierung\fP][\fB@\fP\fImodifikation\fP] wobei
+\fIsprache\fP die eigentliche Sprache, \fISPRACHE\fP das Gebiet, \fIkodierung\fP den
+zu nutzenden Zeichensatz und \fImodifikation\fP eine bestimmte Untergruppe in
+diesem darstellt.
+
 Zum Besispiel sind die folgenden Zeichenketten gültig:
+.RS
+.RB_untranslated de
 .br
-de
-.br
-de_DE
+.RB_untranslated de_DE
 .br
-de_DE.iso88591
+.RB_untranslated de_DE.iso88591
 .br
-de_DE@euro
+.RB_untranslated de_DE@euro
 .br
-de_DE.iso88591@euro
-.PP
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
 Alle oben genannten Zeicheketten werden als gültige Sprachdefinitionen
 akzeptiert, \fIKODIERUNG\fP und \fIzusatz\fP werden zur Zeit nicht genutzt.
-.PP
-Zusätzlich zu den obigen Formaten, kann man komplette englishe
+
+Zusätzlich zu den obigen Formaten, kann man komplette englische
 Sprachbezeichnungen angeben \- \fB\-l german\fP ist ebenfalls gültig und
 entspricht \fB\-l de_DE\fP.
-.PP
+
 Wenn keine Sprache definiert wurde, weder in der Kommandozeile noch in der
 Konfigurationsdatei, wird die Standardsprache des Systems verwendet.
 .SH "SKIN UNTERSTÜTZUNG"
-\fBamuleweb\fP ist in der Lage Information in Verschiedenen Skins
-darzustellen. Diese Skins werden Templates genannt. du kannst aMule mit der
-\fB\-t\fP Kommandozeilenoption dazu veranlassen, ein bestimmtest Template zu
-laden. Templates werden an zwei Stellen gesucht: Zuerstt in
-\fI~/.aMule/webserver/\fP dann in \fI$(pkgdatadir)/webserver/\fP (\fI$(pkgdatadir)\fP
-ist der Installationsordner architekturunabhängiger Dateien, meistens
-/usr/share/amule). Jedes Template muss in einem Unterverzeichnis des
-Templatenamens liegen, und dieses Verzeichnis muss alle Dateien enthalten
-die das Template benötigt. Die Templatedatei heißt aMule.tmpl
+\fBamuleweb\fP ist in der Lage Informationen mit unterschiedlichen Skins
+anzuzeigen.  Diese Skins werden Templates genannt, und due kannst über die
+Kommandozeilenoption \fB\-t\fP angeben welches geladen werden soll.  Templates
+werden in 2 verschiedenen Orten gesucht: zuerst in \fI~/.aMule/webserver/\fP
+und dann in \fI/usr/share/amule/webserver/\fP wenn du mit \-\-prefix=/usr
+installiert hast.
 .PP
-Zum Beispiel, das Standardtemplate (Name: 'default') liegt in
-webserver/default/. Das Verzeichnis enthält aMule.tmpl und viele
-Bilddateien.
+Jedes Template muss in einem Unterverzeichnis des Templatenamens liegen,
+welches alle Dateien enthält, die das Template benötigt.
 .SH DATEIEN
 ~/.aMule/remote.conf
 .br
@@ -175,20 +198,25 @@
 .PP
 \fBamuleweb\fP \fB\-\-create\-config\-from\fP=\fI/home/username/.aMule/amule.conf\fP
 .PP
-Dies speichert die Einstellungen in \fI$HOME/.aMule/remote.conf\fP, und tippst
-du nur noch:
+Dies speichert die Einstellungen in \fI$HOME/.aMule/remote.conf\fP, und später
+tippst du nur noch:
 .PP
-\fBamuleweb\fP
+.B_untranslated amuleweb
 .PP
 Natürlich kann man zusätzliche Optionen angeben und einzelne auch beim
 ersten Start weglassen, oder es komplett anders machen.
 .SH "FEHLER MELDEN"
 Bitte meldet Fehler entweder in unserem Forum (\fIhttp://forum.amule.org/\fP),
 oder in unseren Bugtracker (\fIhttp://bugs.amule.org/\fP). Bitte meldet uns
-keine Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
+weder Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
 Teammitglieder.
 .SH COPYRIGHT
 aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU
 General Public License
 .SH "SIEHE AUCH"
-\fBamule\fP(1), \fBamulecmd\fP(1)
+.B_untranslated amule\fR(1), \fBamulecmd\fR(1)
+.SH VERFASSER
+Diese manpage wurde geschrieben von Vollstrecker
+<amule@vollstreckernet.de>
+
+Diese manpage wurde übersetzt von Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amuleweb.es.1 -> aMule-2.3.1.tar.bz2/docs/man/amuleweb.es.1 Changed

@@ -1,173 +1,215 @@
-.TH AMULEWEB 1 "Marzo 2005" "aMule webserver v2.0.0" "Utilidades de aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULEWEB 1 "November 2011" "aMule webserver v2.3.1" "aMule utilidades"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOMBRE
 amuleweb \- servidor web de aMule
-.SH SYNOPSIS
-.B amuleweb
-.RB [ \-h " " \fI<host> ]
-.RB [ \-p " " \fI<puerto> ]
-.RB [ \-P " " \fI<contraseña> ]
-.RB [ \-f " " \fI<localización> ]
-.RB [ \-l " " \fI<lenguaje> ]
-.RB [ \-q ]
-.RB [ \-v ]
-.RB [ \-w ]
-.RB [ \-t " " \fI<nombre> ]
-.RB [ \-s " " \fI<puerto> ]
-.RB [ \-z ]
-.RB [ \-Z ]
-.RB [ \-A " " \fI<contraseña> ]
-.RB [ \-G " " \fI<contraseña> ]
-.RB [ \-a ]
-.RB [ \-d ]
-.RB [ \-L ]
-.PP
-.B amuleweb
-.RB [ \-f " " \fI<localización> ]
-.B \-\-create-config-from=\fI<localización>
-.PP
-.B amuleweb
-.RB [ \-\-help ]
-.RB [ \-\-version ]
-.PP
-.RB amuleweb \-\-amule\-config\-file=\fI<localización>
-.SH DESCRIPCIÓN
-\fBamuleweb\fR permite administrar aMule a través de un navegador.
-Se puede iniciar amuleweb junto con \fBamule\fR(1), por separado, o en cualquier momento.
-Sus opciones se pueden especificar por linea de comandos o mediante su archivo de configuración.
-Las opciones pasadas a través de la linea de comandos tienen prioridad sobre las indicadas en el archivo de configuración.
-.TP
-\fB\-h\fR, \fB\-\-host\fR=\fI<host>\fR
-Host donde aMule esta siendo ejecutado (por defecto: \fIlocalhost\fR).
-\fI<host>\fR puede ser una IP o una dirección DNS.
-.TP
-\fB\-p\fR, \fB\-\-port\fR=\fI<puerto>\fR
-El puerto abierto en aMule's para conexiones de External Connections. Puede consultarlo en Preferencias->Controles Remotos (por defecto: \fI4712\fR)
-.TP
-\fB\-P\fR, \fB\-\-password\fR=\fI<contraseña>\fR
-Constraseña para External Connections
-.TP
-\fB\-f\fR, \fB\-\-config\-file\fR=\fI<localización>\fR
-Usar el arhivo de configuración indicado.
-Por defecto, \fI~/.aMule/remote.conf\fR
-.TP
-\fB\-l\fR, \fB\-\-locale\fR=\fI<lang>\fR
-Establece el lenguaje del programa.
-Ver la sección \fBNOTAS\fR para la descripción del parámetro \fI<lenguaje>\fR.
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-No mostrar nada en la consola.
-Probablemente interese también el parámetro \fB\-q\fR para ejecutar esta aplicación como demonio,
-Por ejemplo: '\fBamuleweb \-q &\fR'
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Mostrar información adicional \- mostrar también información para depuración.
-.TP
-\fB\-w\fR, \fB\-\-write\-config\fR
-Crear el archivo de configuración y salir.
-.TP
-\fB\-\-create\-config\-from\fR=\fI<localización>\fR
-Crear el archivo de configuración basándose en \fI<localización>\fR y salir. \fI<localización>\fR debe ser un archivo de configuración de aMule.
-.TP
-\fB\-t\fR, \fB\-\-template\fR=\fI<nombre>\fR
-Cargar la piel \fI<nombre>\fR. Ver la sección
-.B PIELES
-.TP
-\fB\-s\fR, \fB\-\-server\-port\fR=\fI<puerto>\fR
-El puerto HTTP del servidor web. Este es el puerto al que debe direccionar su navegador web (por defecto: \fI4711\fR)
-.TP
-\fB\-z\fR, \fB\-\-enable\-gzip\fR
-Emplear compresión gzip en las transferencias HTTP para reducir el ancho de banda usado.
-.TP
-\fB\-Z\fR, \fB\-\-disable\-gzip\fR
-Deshabilitar la compresión gzip en las transferencias HTTP (esta es la opción por defecto)
-.TP
-\fB\-A\fR, \fB\-\-admin\-pass\fR=\fI<contraseña>\fR
-Definir la contraseña de acceso total al servidor web.
-.TP
-\fB\-G\fR, \fB\-\-guest\-pass\fR=\fI<contraseña>\fR
-Definir la contraseña de acceso al servidor web en modo "invitado".
-.TP
-\fB\-a\fR, \fB\-\-allow\-guest\fR
-Permitir accesos al servidor web en modo "invitado".
-.TP
-\fB\-d\fR, \fB\-\-deny\-guest\fR
-Denegar accesos al servidor web en modo "invitado" (esta es la opción por defecto)
-.TP
-\fB\-L\fR, \fB\-\-load\-settings\fR
-Cargar/guardar la configuración de control remoto de aMule de/a la configuración de aMule.
-Esto hace que amuleweb ignore las parámetros que se le pasen y el archivo de configuración, en beneficio de lo que figura en la configuración de aMule.
-Al guardar las preferencias, ninguna se guardará en el archivo de configuraciñon del programa, sino en el de aMule.
-(Por supuesto, esto solo es válido para aquellas preferencias que pueden ser definidas desde Preferencias->Controles Remotos)
-.TP
-\fB\-\-amule\-config\-file\fR=\fI<localización>\fR
-Localización del archivo de configuración de aMule.
-.B NO USAR DIRECTAMENTE!
-aMule usa esta opción cuando se le pide ejecutar amuelweb al iniciarse.
-Esto hace que amuleweb ignore las parámetros que se le pasen y el archivo de configuración, las preferencias se leerán del archivo de configuracin especificado, e implica también las opciones \fB\-q \-L\fR.
-.TP
-\fB\-\-help\fR
-Mostrar información del modo de empleo y salir.
-.TP
-\fB\-\-version\fR
-Mostrar la versión del programa y salir.
+.SH SINOPSIS
+.B_untranslated amuleweb
+[\fB\-h\fP \fI<host>\fP] [\fB\-p\fP \fI<port>\fP] [\fB\-P\fP
+\fI<password>\fP] [\fB\-f\fP \fI<path>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<lang>\fP]
+.RB_untranslated [ \-w ]
+[\fB\-t\fP \fI<name>\fP] [\fB\-s\fP \fI<port>\fP]
+.RB_untranslated [ \-u ]
+[\fB\-U\fP \fI<port>\fP]
+.RB_untranslated [ \-z ]
+.RB_untranslated [ \-Z ]
+[\fB\-A\fP \fI<password>\fP] [\fB\-G\fP \fI<password>\fP]
+.RB_untranslated [ \-a " " | " " \-d ]
+.RB_untranslated [ \-L ]
+.RB_untranslated [ \-\-no\-php ]
+.RB_untranslated [ \-N ]
+
+.B_untranslated amuleweb
+[\fB\-\-create\-config\-from\fP=\fI<path>\fP]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-help ]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amuleweb
+[\fB\-\-amule\-config\-file\fP=\fI<path>\fP]
+
+.SH DESCRIPCIÃN
+\fBamuleweb\fP manages your access to amule through a web browser.  You can
+start amuleweb together with \fBamule\fP(1), or separately, any time later.
+Options can be specified via command\-line or via config\-file.  Command\-line
+options take precedence over config\-file options.
+.TP 
+\fB[ \-h\fP \fI<host>\fP, \fB\-\-host\fP=\fI<host>\fP \fB]\fP
+Host donde se estÃ¡ ejecutando aMule. (por defecto: \fIlocalhost\fP).
+\fI<host>\fP debe ser o una direcciÃ³n IP o un nombre DNS
+.TP 
+\fB[ \-p\fP \fI<port>\fP, \fB\-\-port\fP=\fI<port>\fP \fB]\fP
+Puerto de conexiÃ³n externa de aMule, puesto en Opciones\->Controles
+Remotos (por defecto: 4712)
+.TP 
+\fB[ \-P\fP \fI<password>\fP, \fB\-\-password\fP=\fI<password>\fP \fB]\fP
+ContraseÃ±a de conexiones externas
+.TP 
+\fB[ \-f\fP \fI<path>\fP, \fB\-\-config\-file\fP=\fI<path>\fP \fB]\fP
+Usar la configuraciÃ³n dada por el archivo. El archivo de configuraciÃ³n por
+defecto es \fI~/.aMule/remote.conf\fP
+.TP 
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+No mostrar nada por la salida estÃ¡ndar
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Modo Extendido \- muestra tambiÃ©n los mensajes de depuraciÃ³n.
+.TP 
+\fB[ \-l\fP \fI<lang>\fP, \fB\-\-locale\fP=\fI<lang>\fP \fB]\fP
+Selecciona el idioma del programa. Ver la secciÃ³n \fBNOTAS\fP para la
+descripciÃ³n del parÃ¡metro del \fI<lang>\fP.
+.TP 
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+Escribe opciones de la lÃnea de comando al archivo de configuraciÃ³n y
+termina.
+.TP 
+\fB[ \-t\fP \fI<name>\fP, \fB\-\-template\fP=\fI<name>\fP \fB]\fP
+Loads the template named \fI<name>\fP. See the \fBSKIN SUPPORT\fP section
+for details.
+.TP 
+\fB[ \-s\fP \fI<port>\fP, \fB\-\-server\-port\fP=\fI<port>\fP \fB]\fP
+Webserver's HTTP port. This is the port you must point your browser to
+(default: \fI4711\fP).
+.TP 
+.B_untranslated [ \-u ]\fR
+.br
+Habilitar UPnP.
+.TP 
+\fB[ \-U\fP \fI<port>\fP, \fB\-\-upnp\-port\fP \fI<port>\fP \fB]\fP
+Puerto UPnP.
+.TP 
+.B_untranslated [ \-z\fR, \fB\-\-enable\-gzip ]\fR
+Enables using gzip compression in HTTP traffic to save bandwidth.
+.TP 
+.B_untranslated [ \-Z\fR, \fB\-\-disable\-gzip ]\fR
+Deshabilitar la compresiÃ³n gzip (esto es por defecto).
+.TP 
+\fB[ \-A\fP \fI<passwd>\fP, \fB\-\-admin\-pass\fP=\fI<passwd>\fP \fB]\fP
+ContraseÃ±a de acceso completo al servidor web.
+.TP 
+\fB[ \-G\fP \fI<passwd>\fP, \fB\-\-guest\-pass\fP=\fI<passwd>\fP \fB]\fP
+ContraseÃ±a de invitado al servidor web.
+.TP 
+.B_untranslated [ \-a\fR, \fB\-\-allow\-guest ]\fR
+Permitir acceso invitado.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-deny\-guest ]\fR
+Deniega el acceso invitado (defecto)
+.TP 
+.B_untranslated [ \-L\fR, \fB\-\-load\-settings ]\fR
+Load/save webserver settings from/to remote aMule.  This causes amuleweb to
+ignore command\-line and config\-file settings, and load them from aMule.
+When saving preferences none will be written to the config file, but to
+aMule.  (Of course, this works only for those settings that can be set in
+aMule's Preferences\->Remote Controls.)
+.TP 
+.B_untranslated [ \-\-no\-php ]\fR
+Deshabilitar interprete PHP (obsoleto)
+.TP 
+.B_untranslated [ \-N\fR, \fB\-\-no\-script\-cache ]\fR
+Recompilar pÃ¡ginas PHP en cada solicitud.
+.TP 
+\fB[ \-\-create\-config\-from\fP=\fI<path>\fP \fB]\fP
+Crear archivo de configuraciÃ³n basado en \fI<path>\fP, el cual debe
+apuntar a un archivo de configuraciÃ³n vÃ¡lido, y entonces termina.
+.TP 
+.B_untranslated [ \-\-help ]\fR
+Imprime una breve descripciÃ³n de uso.
+.TP 
+.B_untranslated [ \-\-version ]\fR
+Mostrar el nÃºmero de la versiÃ³n actual.
+.TP 
+\fB[ \-\-amule\-config\-file\fP=\fI<path>\fP \fB]\fP
+aMule config file path.  \fBDO NOT USE DIRECTLY!\fP aMule uses this option when
+starting amuleweb at aMule startup.  This option causes all other
+command\-line and config\-file settings to be ignored, preferences to be read
+from the given config file, and also implies the \fB\-q \-L\fP options.
 .SH NOTAS
-.SS Localizaciones
-Para todas las opciones que reuieran un parámetro \fI<localización>\fR, si la \fIlocalización\fR no contiene el nombre de ningun directorio (por ejemplo, si es simplemente el nombre de un archivo), entonces se tomará como directorio contenedor de ese archivo el directorio de configuración de aMule, \fI~/.aMule\fR.
+.SS Rutas
+Todas las opciones que tengan \fI<path>\fP como valor, si \fIpath\fP
+contiene un directorio sin part (p.e. solo un archivo normal), entones se
+tomarÃ¡ el directorio de la configuraciÃ³n, \fI~/.aMule\fP.
 .SS Lenguajes
-El parámetro \fI<lenguaje>\fR para la opción \fB\-l\fR tiene el siguiente formato: \fIlenguaje\fR[\fB_\fILENGUAJE\fR][\fB.\fIcodificación\fR][\fB@\fImodificador\fR]
-donde \fIlenguaje\fR es el lenguaje principal, \fILENGUAJE\fR es el sublenguaje/territorio, \fIcodificación\fR es el conjunto de caracteres a usar y \fImodificador\fR
-"permite al usuario seleccionar una instancia específica de los datos ed localización dentro de una sola categoría".
-.PP
-Por ejemplo, los siguientes ejemplos son válidos:
+The \fI<lang>\fP parameter for the \fB\-l\fP option has the following form:
+\fIlang\fP[\fB_\fP\fILANG\fP][\fB.\fP\fIencoding\fP][\fB@\fP\fImodifier\fP] where \fIlang\fP is the
+primary language, \fILANG\fP is a sublanguage/territory, \fIencoding\fP is the
+character set to use and \fImodifier\fP allows the user to select a specific
+instance of localization data within a single category.
+
+Por ejemplo, las siguientes cadenas son vÃ¡lidas:
+.RS
+.RB_untranslated de
 .br
-fr
+.RB_untranslated de_DE
 .br
-fr_FR
+.RB_untranslated de_DE.iso88591
 .br
-de_DE.iso88591
+.RB_untranslated de_DE@euro
 .br
-de_DE@euro
-.br
-de_DE.iso88591@euro
-.PP
-A pesar de que todos los ejemplos anteriores son válidos como definiciones de lenguajes, \fIcodificación\fR y \fImodificador\fR siguen sin ser usados.
-.PP
-Además de lo especificado en el formato anterior, tambien puede especificar el nombre completo de un lenguaje en inglés - así pues, \fB\-l german\fR también es válido y es equivalente a \fB-l de_DE\fR.
-.PP
-Si no se define ningún lenguaje, ni en los parámetros del programa ni en el archivo de configuración, se usará el predeterminado del sistema.
-.SH PIELES
-\fBamuleweb\fR soporta diferentes pieles (aspectos de la interfaz).
-Puede especificar que piel debe usar amuleweb mediante la opción \fB\-t\fR en la linea de comandos.
-Los templates se buscan de dos lugares: primero en \fI~/.aMule/webserver/\fR y, en caso de no encontrarlo, en \fI$(pkgdatadir)/webserver/\fR 
-(\fI$(pkgdatadir)\fR es el directorio donde se encuentran los datos independientes de la plataforma en su sistema, normalmente algo parecido a /usr/share/amule).
-Cada piel debe encontrase en un directorio con el nombre de la piel y este directorio debe contener todos los archivos que esta piel necesite.
-El archivo indice de la piel debe llamarse aMule.tmpl.
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
+Though all the above strings are accepted as valid language definitions,
+\fIencoding\fP and \fImodifier\fP are yet unused.
+
+In addition to the format above, you can also specify full language names in
+English \- so \fB\-l german\fP is also valid and is equal to \fB\-l de_DE\fP.
+
+When no locale is defined, either on command\-line or in config file, system
+default language will be used.
+.SH "SOPORTE TEMAS."
+\fBamuleweb\fP is capable of displaying information in different skins.  These
+skins are called templates, and you can make amuleweb load a specific
+template via the \fB\-t\fP command line option.  Templates are searched in two
+places: first in \fI~/.aMule/webserver/\fP and then in
+\fI/usr/share/amule/webserver/\fP if you installed with \-\-prefix=/usr.
 .PP
-Por ejemplo, la piel por defecto (llamada 'default') se encuentra en webserver/default/, y este directorio contiene aMule.tmpl entre otros muchos archivos.
+Each template must be in a subdirectory of the template name, and this
+directory must contain all files the template needs.
 .SH ARCHIVOS
 ~/.aMule/remote.conf
 .br
 ~/.aMule/webserver/
 .br
-\fI$(pkgdatadir)\fR/webserver/
+\fI$(pkgdatadir)\fP/webserver/
 .SH EJEMPLO
-Normalmente la primera ejecución de amuleweb se hace de la siguiente manera:
+Normalmente amuleweb se ejecutara primero como:
 .PP
-\fBamuleweb\fR \fB\-h\fR \fIhostname\fR \fB\-p\fR \fIECport\fR \fB\-P\fR \fIECpassword\fR \fB\-s\fR \fIHTTPport\fR \fB\-A\fR \fIAdminPassword\fR \fB\-w\fR
+\fBamuleweb\fP \fB\-h\fP \fIhostname\fP \fB\-p\fP \fIECport\fP \fB\-P\fP \fIECpassword\fP \fB\-s\fP
+\fIHTTPport\fP \fB\-A\fP \fIAdminPassword\fP \fB\-w\fP
 .PP
 o
 .PP
-\fBamuleweb\fR \fB\-\-create-config-from\fR=\fI/home/username/.aMule/amule.conf\fR
+\fBamuleweb\fP \fB\-\-create\-config\-from\fP=\fI/home/usuario/.aMule/amule.conf\fP
 .PP
-Esto salva su configuración en \fI$HOME/.aMule/remote.conf\fR, de manera que en sucesivas ejecuciones bastará con:
+Esto guardarÃ¡ las opciones en \fI$HOME/.aMule/remote.conf\fP, y despuÃ©s sÃ³lo
+tiene que escribir:
 .PP
-.B amuleweb
+.B_untranslated amuleweb
 .PP
-Of course, you may specify any more or less options on the first example line, and you may also totally omit it.
-.SH BUGS
-Si descubre bugs, por favor comuníquelos en (\fIhttp://forum.amule.org/\fR), o en nuestro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Por favor, no comunique bugs por e-mail, ni a nuestro maillist ni directamente a ningún miembro del equipo de aMule.
+Por supuesto, puede especificar las opciones en el ejemplo de la primera
+linea, y tambiÃ©n puede omitirlo.
+.SH "INFORMANDO ERRORES"
+Por favor informa de fallos ya sea en nuestro foro
+(\fIhttp://forum.amule.org/\fP), o en nuestro bugtracker
+(\fIhttp://bugs.amule.org/\fP). Por favor no informe de fallos por correo, ni
+en nuestras listas, ni directamente al correo de algun miembro del equipo.
 .SH COPYRIGHT
-aMule, y todas las utilidades que con el vienen, se distribuyen bajo la licencia GPL.
-.SH VER
-\fBamule\fR(1), \fBamulecmd\fR(1)
+aMule y todas las demÃ¡s utilidades relacionadas son distribuidas bajo la GNU
+General Public License.
+.SH "VEASE TAMBIEN"
+.B_untranslated amule\fR(1), \fBamulecmd\fR(1)
+.SH AUTOR
+Esta pÃ¡gina de manualfue escrita por Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amuleweb.fr.1 -> aMule-2.3.1.tar.bz2/docs/man/amuleweb.fr.1 Changed

@@ -1,147 +1,224 @@
-.TH AMULEWEB 1 "Mars 2005" "Serveur Web d'aMule v2.0.0" "Outil pour aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULEWEB 1 "Novembre 2011" "aMule webserver v2.3.1" "Outils d'aMule"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOM
-amuleweb \- seruveur Web d'aMule
+amuleweb \- serveur web d'aMule
 .SH SYNOPSIS
-.B amuleweb
-.RB [ \-h " " \fI<hôte> ]
-.RB [ \-p " " \fI<port> ]
-.RB [ \-P " " \fI<motdepasse> ]
-.RB [ \-f " " \fI<chemin> ]
-.RB [ \-q ]
-.RB [ \-v ]
-.RB [ \-w ]
-.RB [ \-t " " \fI<nom> ]
-.RB [ \-s " " \fI<port> ]
-.RB [ \-z ]
-.RB [ \-Z ]
-.RB [ \-A " " \fI<motdepasse> ]
-.RB [ \-G " " \fI<motdepasse> ]
-.RB [ \-a ]
-.RB [ \-d ]
-.RB [ \-L ]
-.PP
-.B amuleweb
-.RB [ \-f " " \fI<chemin> ]
-.B \-\-create-config-from=\fI<chemin>
-.PP
-.B amuleweb
-.RB [ \-\-help ]
-.RB [ \-\-version ]
-.PP
-.B amuleweb
-.RB [ \-\-amule\-config\-file=\fI<chemin> ]
+.B_untranslated amuleweb
+[\fB\-h\fP \fI<hÃ´te>\fP] [\fB\-p\fP \fI<port>\fP] [\fB\-P\fP
+\fI<motdepasse>\fP] [\fB\-f\fP \fI<chemin>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<lang>\fP]
+.RB_untranslated [ \-w ]
+[\fB\-t\fP \fI<nom>\fP] [\fB\-s\fP \fI<port>\fP]
+.RB_untranslated [ \-u ]
+[\fB\-U\fP \fI<port>\fP]
+.RB_untranslated [ \-z ]
+.RB_untranslated [ \-Z ]
+[\fB\-A\fP \fI<motdepasse>\fP] [\fB\-G\fP \fI<motdepasse>\fP]
+.RB_untranslated [ \-a " " | " " \-d ]
+.RB_untranslated [ \-L ]
+.RB_untranslated [ \-\-no\-php ]
+.RB_untranslated [ \-N ]
+
+.B_untranslated amuleweb
+[\fB\-\-create\-config\-from\fP=\fI<chemin>\fP]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-help ]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amuleweb
+[\fB\-\-amule\-config\-file\fP=\fI<chemin>\fP]
+
 .SH DESCRIPTION
-\fBamuleweb\fR prend en charge l'accès à aMule à travers un navigateur Web.
-Vous pouvez le démarrer en même temps qu'\fBamule\fR(1), or séparemment, n'importe quand après.
-Les options peuvent être spécifiées par la ligne de commande ou par l'intermédiare d'un fichier de configuration.
-Les options spécifiées dans la ligne de commande ont priorité sur celles contenues dans le fichier de configuration.
-.TP
-\fB\-h\fR, \fB\-\-host\fR=\fI<hôte>\fR
-Hôte où aMule tourne (défaut: \fIlocalhost\fR).
-\fI<hôte>\fR peut être une adresse IP ou un nom DNS.
-.TP
-\fB\-p\fR, \fB\-\-port\fR=\fI<port>\fR
-Port d'aMule pour les Connexions Externes, tel que défini dans Preferences->Contrôles à Distance (défaut: \fI4712\fR).
-.TP
-\fB\-P\fR, \fB\-\-password\fR=\fI<motdepasse>\fR
-Mot de passe pour les Connexions Externes.
-.TP
-\fB\-f\fR, \fB\-\-config\-file\fR=\fI<chemin>\fR
-Utiliser le fichier de configuration désigné. 
-Le fichier de configuration par défaut est \fI~/.aMule/remote.conf\fR
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-N'afficher aucune sortie sur stdout.
-Il est utile d'utiliser \fB\-q\fR pour faire tourner amuleweb en service (daemon), i.e. en lançant '\fBamuleweb \-q &\fR'
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Mode bavard \- affiche aussi les messages de debugage.
-.TP
-\fB\-w\fR, \fB\-\-write\-config\fR
-Ecrire les options de la ligne de commande dans le fichier de configuration et quitter.
-.TP
-\fB\-\-create\-config\-from\fR=\fI<chemin>\fR
-Créer un fichier de configuration basé sur \fI<chemin>\fR, qui doit pointer sur un fichier de configration d'aMule valide, et quitter ensuite.
-.TP
-\fB\-t\fR, \fB\-\-template\fR=\fI<nom>\fR
-Charger le modèle nommé \fI<nom>\fR. Voir aussi la section
-.B PRISE EN CHARGE DES SKINS.
-.TP
-\fB\-s\fR, \fB\-\-server\-port\fR=\fI<port>\fR
-Port HTTP du serveur Web. C'est le port sur lequel votre navigateur Web doit pointer (défault: \fI4711\fR).
-.TP
-\fB\-z\fR, \fB\-\-enable\-gzip\fR
-Activer la compression gzip dans les échanges HTTP pour diminuer l'utilisation de la bande passante.
-.TP
-\fB\-Z\fR, \fB\-\-disable\-gzip\fR
-Désactiver la compression gzip (comportement par défaut).
-.TP
-\fB\-A\fR, \fB\-\-admin\-pass\fR=\fI<motdepasse>\fR
-Mot de passe pour un accès complet au serveur Web.
-.TP
-\fB\-G\fR, \fB\-\-guest\-pass\fR=\fI<motdepase>\fR
-Mot de passe pour un accès restreint au seveur Web (invité).
-.TP
-\fB\-a\fR, \fB\-\-allow\-guest\fR
-Autoriser l'accès aux invités.
-.TP
-\fB\-d\fR, \fB\-\-deny\-guest\fR
-Interdire l'accès aux invités (défaut).
-.TP
-\fB\-L\fR, \fB\-\-load\-settings\fR
-Charger/décharger les réglages du serveur Web depuis un aMule distant.
-Ceci permet d'ignorer les options de la ligne de commande et du fichier de configuration et charger celles\-ci depuis aMule.
-Lors de la sauvegarde des préférences, celles\-ci ne seront pas sauvegardées dasn le fichier de configuratio, mais vers aMule.
-(Bien sûr, ceci n'est valable que pour les options qui peuvent être configurées dans Preferences->Contrôle à Distance)
-.TP
-\fB\-\-amule\-config\-file\fR=\fI<chemin>\fR
-Chemin vers le fivhier de configuration d'aMule.
-.B NE PAS UTILISER DIRECTEMENT!
-aMule utilise cette option lorsqu'il démarre amuleweb au lancement d'aMule.
-Cette option provoque la non prise en compte des options de ligne de commande et du fichier de configuration, celles\-ci étant lues dans le fichier de configuration fourni en paramètre, et induit aussi les options \fB\-q \-L\fR
-.TP
-\fB\-\-help\fR
-Afficher l'aide d'utilisation et quitter.
-.TP
-\fB\-\-version\fR
-Afficher les informations sur la version courante et quitter.
-.SH NOTE
-Pour toutes les options prenant en paramètre un \fI<chemin>\fR, si le \fIchemin\fR ne contient pas de répertoire (i.e. juste un nom de fichier), alors il sera considéré comme étant dans le répertoire de configuration d'aMule, \fI~/.aMule\fR.
-.SH PRISE EN CHARGE DES SKINS
-\fBamuleweb\fR est capable d'afficher ses informations dans différents skins.
-Ces skins sont appelés modèles, et vous pouvez dire à amuleweb de charger un modèle spécifique par l'otion de ligne de commande \fB\-t\fR.
-Les modèles sont recherchés dans deux endroits: d'abord dans \fI~/.aMule/webserver/\fR puis dans \fI$(pkgdatadir)/webserver/\fR 
-(\fI$(pkgdatadir)\fR est le répertoire d'installation des données indépendantes de l'architecture, la plupart du temps quelque chose comme /usr/share/amule).
-Chaque modèle doit être dans un sous\-répertoire du nom du modèle, et ce répertoire doit contenir tous les fichiers dont à besoin le modèle.
-Le fichier modèle doit avoir comme nom aMule.tmpl.
+\fBamuleweb\fP gÃ¨re votre accÃ¨s Ã  amule via un navigateur Web.  Vous pouvez
+dÃ©marrer ensemble amuleweb et \fBamule\fP(1), ou sÃ©parÃ©ment, Ã  un moment
+ultÃ©rieur.  Les options peuvent Ãªtre spÃ©cifiÃ©es par ligne de commande ou via
+fichier de configuration. Les options passÃ©es en ligne de commande prÃ©valent
+sur les options de fichier de configuration.
+.TP 
+\fB[ \-h\fP \fI<hÃ´te>\fP, \fB\-\-host\fP=\fI<hÃ´te>\fP \fB]\fP
+HÃ´te oÃ¹ aMule fonctionne (par dÃ©faut : \fIlocalhost\fP). \fI<hÃ´te>\fP
+peut Ãªtre une adresse IP ou un nom DNS.
+.TP 
+\fB[ \-p\fP \fI<port>\fP, \fB\-\-port\fP=\fI<port>\fP \fB]\fP
+Port d'aMule pour les Connexions Externes, tel que dÃ©fini dans
+PrÃ©fÃ©rences\->ContrÃ´les Ã  Distance (dÃ©faut: \fI4712\fP)
+.TP 
+\fB[ \-P\fP \fI<motdepasse>\fP, \fB\-\-password\fP=\fI<motdepasse>\fP \fB]\fP
+Mot de passe des connexions externes.
+.TP 
+\fB[ \-f\fP \fI<chemin>\fP, \fB\-\-config\-file\fP=\fI<chemin>\fP \fB]\fP
+Utiliser le fichier de configuration dÃ©signÃ©. Le fichier de configuration
+par dÃ©faut est \fI~/.aMule/remote.conf\fP
+.TP 
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Ne pas afficher de sortie sur stdout.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Mode bavard \- affiche aussi les messages de deboguage.
+.TP 
+\fB[ \-l\fP \fI<lang>\fP, \fB\-\-locale\fP=\fI<lang>\fP \fB]\fP
+DÃ©finir les paramÃ¨tres rÃ©gionaux (langage). Voir la section \fBNOTES\fP pour la
+description du paramÃ¨tre \fI<lang>\fP.
+.TP 
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+Ãcrire les options de la ligne de commande dans le fichier de configuration
+et quitter
+.TP 
+\fB[ \-t\fP \fI<nom>\fP, \fB\-\-template\fP=\fI<nom>\fP \fB]\fP
+Charge le modÃ¨le nommÃ© \fI<nom>\fP. Voir la section \fBSKIN SUPPORT\fP
+pour plus de dÃ©tails.
+.TP 
+\fB[ \-s\fP \fI<port>\fP, \fB\-\-server\-port\fP=\fI<port>\fP \fB]\fP
+Port HTTP du serveur Web. Il s'agit du port dont votre navigateur doit
+pointer (par dÃ©faut : \fI4711\fP).
+.TP 
+.B_untranslated [ \-u ]\fR
+.br
+Activer UPnP.
+.TP 
+\fB[ \-U\fP \fI<port>\fP, \fB\-\-upnp\-port\fP \fI<port>\fP \fB]\fP
+Port UPnP.
+.TP 
+.B_untranslated [ \-z\fR, \fB\-\-enable\-gzip ]\fR
+Activer la compression gzip pour le trafic HTTP pour Ã©conomiser la bande
+passante.
+.TP 
+.B_untranslated [ \-Z\fR, \fB\-\-disable\-gzip ]\fR
+DÃ©sactiver la compression gzip (par dÃ©faut).
+.TP 
+\fB[ \-A\fP \fI<motdepasse>\fP, \fB\-\-admin\-pass\fP=\fI<motdepasse>\fP \fB]\fP
+Mot de passe d'accÃ¨s total pour le serveur web.
+.TP 
+\fB[ \-G\fP \fI<motdepasse>\fP, \fB\-\-guest\-pass\fP=\fI<motdepasse>\fP \fB]\fP
+Mot de passe invitÃ© pour le serveur web.
+.TP 
+.B_untranslated [ \-a\fR, \fB\-\-allow\-guest ]\fR
+Autoriser l'accÃ¨s invitÃ©.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-deny\-guest ]\fR
+Interdire l'accÃ¨s invitÃ© (par dÃ©faut).
+.TP 
+.B_untranslated [ \-L\fR, \fB\-\-load\-settings ]\fR
+Charger/enregistrer les paramÃ¨tres de serveur web Ã  partir de/vers l'aMule
+distant. amuleweb ignorera la ligne de commande et les paramÃ¨tres de fichier
+de configuration, et les chargera Ã  partir aMule. Lors de la sauvegarde,
+aucune prÃ©fÃ©rences seront Ã©crites dans le fichier config, mais pour
+aMule. (Bien sÃ»r, cela ne fonctionne que pour les paramÃ¨tres qui peuvent
+Ãªtre dÃ©finies dans les prÃ©fÃ©rences de \->ContrÃ´le Ã  distance d'aMule.)
+.TP 
+.B_untranslated [ \-\-no\-php ]\fR
+DÃ©sactiver l'interprÃ©teur PHP (obsolÃ¨te)
+.TP 
+.B_untranslated [ \-N\fR, \fB\-\-no\-script\-cache ]\fR
+Recompile les pages PHP Ã  chaque requÃªte.
+.TP 
+\fB[ \-\-create\-config\-from\fP=\fI<chemin>\fP \fB]\fP
+CrÃ©er un fichier de configuration basÃ© sur \fI<chemin>\fP, qui doit
+pointer sur un fichier de configration d'aMule valide, et quitter ensuite.
+.TP 
+.B_untranslated [ \-\-help ]\fR
+Afficher une court description d'utilisation.
+.TP 
+.B_untranslated [ \-\-version ]\fR
+Affiche le numÃ©ro de la version actuelle.
+.TP 
+\fB[ \-\-amule\-config\-file\fP=\fI<chemin>\fP \fB]\fP
+Chemin du fichier de configuration d'aMule. \fBNE PAS UTILISER DIRECTEMENT !\fP
+aMule utilise cette option lors du dÃ©marrage d'amuleweb au dÃ©marrage
+d'aMule. Cette option permet d'ignorer toutes les autres commandes en ligne
+et les paramÃ¨tres de fichier de configuration, et lit les prÃ©fÃ©rences dans
+un fichier de configuration prÃ©cisÃ©, et implique Ã©galement les options \fB\-q
+\-L\fP.
+.SH NOTES
+.SS Chemins
+Pour toutes les options prenant en paramÃ¨tre un \fI<chemin>\fP, si le
+\fIchemin\fP ne contient pas de rÃ©pertoire (i.e. juste un nom de fichier),
+alors il sera considÃ©rÃ© comme Ã©tant dans le rÃ©pertoire de configuration
+d'aMule, \fI~/.aMule\fP.
+.SS Langages
+Le paramÃ¨tre \fI<lang>\fP pour \fB\-l\fP l'option a la forme suivante :
+\fIlang\fP[\fB_\fP\fILANG\fP][\fB.\fP\fIencoding\fP][\fB@\fP\fImodifier\fP] oÃ¹ \fIlang\fP est la
+langue principale, \fILANG\fP est is a dialecte, \fIencoding\fP est le caractÃ¨re
+dÃ©fini Ã  utiliser et \fImodifier\fP permet Ã  l'utilisateur de sÃ©lectionner une
+instance spÃ©cifique des donnÃ©es de localisation dans une seule catÃ©gorie.
+
+Par exemple, les chaÃ®nes de caractÃ¨res suivantes sont valables :
+.RS
+.RB_untranslated de
+.br
+.RB_untranslated de_DE
+.br
+.RB_untranslated de_DE.iso88591
+.br
+.RB_untranslated de_DE@euro
+.br
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
+Bien que toutes les chaÃ®nes ci\-dessus sont acceptÃ©es comme des dÃ©finitions
+de langue valide,  \fIencoding\fP et \fImodifier\fP ne sont pas encore utilisÃ©.
+
+En plus du format ci\-dessus, vous pouvez Ã©galement spÃ©cifier des noms entier
+de langue en anglais \- so \fB\-l german\fP est Ã©galement valide et Ã©quivaut Ã 
+\fB\-l de_DE\fP.
+
+En l'absence de paramÃ¨tres linguistiques dÃ©finie, soit sur ââla ligne de
+commande ou dans le fichier de configuration, la langue utilisÃ© par dÃ©faut
+sera celle du systÃ¨me d'exploitation.
+.SH "SUPPORT DE THEMES"
+\fBamuleweb\fP est capable d'afficher des informations dans diffÃ©rents
+thÃ¨mes. Ces thÃ¨mes sont appelÃ©s modÃ¨les, et vous pouvez faire de charger Ã 
+amuleweb un modÃ¨le spÃ©cifique via \fB\-t\fP l'option en ligne de commande. Les
+modÃ¨les sont recherchÃ©s dans deux endroits : d'abord dans :
+\fI~/.aMule/webserver/\fP puis dans \fI/usr/share/amule/webserver/\fP si vous
+l'avez installÃ© avec \-\-prefix=/usr.
 .PP
-Par exemple, le modèle par défaut (nommé 'default') se trouve dans webserver/default/, et ce répertoure contient aMule.tmpl ainsi qu'un grand nombre de fichiers d'images.
+Chaque modÃ¨le doit Ãªtre dans un sous rÃ©pertoire du nom du modÃ¨le, et ce
+rÃ©pertoire doit contenir tous les fichiers dont le modÃ¨le a besoins.
 .SH FICHIERS
 ~/.aMule/remote.conf
 .br
 ~/.aMule/webserver/
 .br
-\fI$(pkgdatadir)\fR/webserver/
+\fI$(pkgdatadir)\fP/webserver/
 .SH EXEMPLE
-Typiquement amuleweb sera lancé la première fois de la façon suivante:
+Typiquement amuleweb sera lancÃ© la premier ainsi :
 .PP
-\fBamuleweb\fR \fB\-h\fR \fIhostname\fR \fB\-p\fR \fIECport\fR \fB\-P\fR \fIECpassword\fR \fB\-s\fR \fIHTTPport\fR \fB\-A\fR \fIAdminPassword\fR \fB\-w\fR
+\fBamuleweb\fP \fB\-h\fP \fInom de l'hÃ´te\fP \fB\-p\fP \fIport EC\fP \fB\-P\fP \fImot de passe EC\fP
+\fB\-s\fP \fIport HTTP\fP \fB\-A\fP \fImot de passe Admin\fP \fB\-w\fP
 .PP
 ou
 .PP
-\fBamuleweb\fR \fB\-\-create-config-from\fR=\fI/home/username/.aMule/amule.conf\fR
+\fBamuleweb\fP \fB\-\-create\-config\-from\fP=\fI/home/username/.aMule/amule.conf\fP
 .PP
-Cela sauvegardera les options dans \fI$HOME/.aMule/remote.conf\fR, et les fois suivantes, vous n'aurez à taper que:
+Cela sauvegardera les options dans \fI$HOME/.aMule/remote.conf\fP, et il
+suffira de taper plus tard :
 .PP
-.B amuleweb
+.B_untranslated amuleweb
 .PP
-Bien sûr, vous pouvez ajouter plus ou moins d'options de ligne de commande, ou vous pouvez aussi n'en spécifier aucune.
-.SH SIGNALEMENT DES BUGS
-Reportez les bugs sur notre forum (\fIhttp://forum.amule.org/\fR), ou dans notre bugtracker (\fIhttp://bugs.amule.org/\fR).
-N'utilisez ni un e-mail, ni notre liste de diffusion ni ne reportez directement un bug à un membre de notre equipe.
+Bien sÃ»r, vous pouvez spÃ©cifier plus ou moins d'options sur la premiÃ¨re
+ligne d'exemple, et vous pouvez Ã©galement totalement le supprimer.
+.SH "RAPPORTER DES BOGUES"
+Veuillez rapporter les bogues sur notre forum (\fIhttp://forum.amule.org/\fP),
+ou sur notre bugtracker (\fIhttp://bugs.amule.org/\fP).  Veuillez ne pas
+rapporter les bogues par e\-mail, sur notre liste de diffusion ou directement
+Ã  n'importe quel membre  de l'Ã©quipe.
 .SH COPYRIGHT
-aMule et tous les utilitaires associés sont distribués sous licence GNU General Public License.
-.SH VOIR AUSSI
-\fBamule\fR(1), \fBamulecmd\fR(1)
-.SH TRADUCTION
-ThePolish, 2005
+aMule et tout ses outils sont distribuÃ©s sous la licence GNU General Public
+License.
+.SH "VOIR AUSSI"
+.B_untranslated amule\fR(1), \fBamulecmd\fR(1)
+.SH AUTEUR
+Cette manpage a Ã©tÃ© Ã©crite par Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/amuleweb.hu.1 -> aMule-2.3.1.tar.bz2/docs/man/amuleweb.hu.1 Changed

@@ -1,171 +1,223 @@
-.TH AMULEWEB 1 "2005 március" "aMule web kiszolgáló v2.0.0" "aMule segédprogramok"
-.SH NÉV
-amuleweb \- aMule web kiszolgáló
-.SH ÁTTEKINTÉS
-.B amuleweb
-.RB [ \-h " " \fI<gép> ]
-.RB [ \-p " " \fI<port> ]
-.RB [ \-P " " \fI<jelszó> ]
-.RB [ \-f " " \fI<fájl> ]
-.RB [ \-l " " \fI<nyelv> ]
-.RB [ \-q ]
-.RB [ \-v ]
-.RB [ \-w ]
-.RB [ \-t " " \fI<név> ]
-.RB [ \-s " " \fI<port> ]
-.RB [ \-z ]
-.RB [ \-Z ]
-.RB [ \-A " " \fI<jelszó> ]
-.RB [ \-G " " \fI<jelszó> ]
-.RB [ \-a ]
-.RB [ \-d ]
-.RB [ \-L ]
-.PP
-.B amuleweb
-.RB [ \-f " " \fI<fájl> ]
-.B \-\-create-config-from=\fI<fájl>
-.PP
-.B amuleweb
-.RB [ \-\-help ]
-.RB [ \-\-version ]
-.PP
-.B amuleweb \-\-amule\-config\-file=\fI<fájl>
-.SH LEÍRÁS
-Az \fBamuleweb\fR kezeli az aMule-hoz való hozzáférést egy böngészõ segítségével.
-Az \fBamuleweb\fR kiszolgáló elindítható az \fBamule\fR(1) indítákor, azzal együtt, vagy külön, bármikor késõbb.
-Az opciók parancssorban vagy konfigurácós fájlban is megadhatók.
-A parancssorban megadott opciók felülbírálják a konfigurációs fájlban megadottakat.
-.SH OPCIÓK
-.TP
-\fB\-h\fR, \fB\-\-host\fR=\fI<gép>\fR
-A gép, ahol az aMule fut (alapértelmezés: \fIlocalhost\fR).
-A \fI<gép>\fR lehet egy IP cím vagy DNS név.
-.TP
-\fB\-p\fR, \fB\-\-port\fR=\fI<port>\fR
-Az aMule távoli elérés portja (alapértelmezés: \fI4712\fR).
-.TP
-\fB\-P\fR, \fB\-\-password\fR=\fI<jelszó>\fR
-A távoli elérés jelszava.
-.TP
-\fB\-f\fR, \fB\-\-config\-file\fR=\fI<fájl>\fR
-A megadott konfigurációs fájlt használja.
-Az alapértelmezés a \fI~/.aMule/remote.conf\fR
-.TP
-\fB\-l\fR, \fB\-\-locale\fR=\fI<nyelv>\fR
-Beállítja a program nyelvét.
-Lásd a \fBMEGJEGYZÉSEK\fR fejezetet a \fI<nyelv>\fR paraméter bõvebb leírásához.
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-Csendes mód, semmit nem ír ki a szabvány kimenetre.
-Ezt a háttérben való futtatáshoz lehet jól használni, pl. így indítva: \fBamuleweb \-q &\fR
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Bõbeszédû mód, a hibakeresési üzeneteket is megjeleníti.
-.TP
-\fB\-w\fR, \fB\-\-write\-config\fR
-A parancssori paramétereket kiírja a konfigurációs fájlba és kilép.
-.TP
-\fB\-\-create\-config\-from\fR=\fI<fájl>\fR
-Konfigurációs fájl készítése a \fI<fájl>\fR alapján, amely az aMule érvényes konfigurációs fájlja kell legyen, majd utána kilép.
-.TP
-\fB\-t\fR, \fB\-\-template\fR=\fI<név>\fR
-A megadott nevû sablon használata. Lásd még a \fBSABLONOK\fR fejezetet.
-.TP
-\fB\-s\fR, \fB\-\-server\-port\fR=\fI<port>\fR
-A web kiszolgáló HTTP portja, alapértelmezés szerint \fI4711\fR. Ezen keresztül kommunikál a böngészõvel.
-.TP
-\fB\-z\fR, \fB\-\-enable\-gzip\fR
-Gzip tömörítés engedélyezése a HTTP forgalom részére.
-.TP
-\fB\-Z\fR, \fB\-\-disable\-gzip\fR
-Gzip tömörítés tiltása (alapértelmezett).
-.TP
-\fB\-A\fR, \fB\-\-admin\-pass\fR=\fI<jelszó>\fR
-Teljes jogú web felület hozzáférést biztosító jelszó.
-.TP
-\fB\-G\fR, \fB\-\-guest\-pass\fR=\fI<jelszó>\fR
-Vendég felhasználó jelszava.
-.TP
-\fB\-a\fR, \fB\-\-allow\-guest\fR
-Vengég felhasználó engedélyezése.
-.TP
-\fB\-d\fR, \fB\-\-deny\-guest\fR
-Vendég felhasználó tiltása (alapértelmezett).
-.TP
-\fB\-L\fR, \fB\-\-load\-settings\fR
-A webkiszolgáló beállításainak töltése/mentése a távoli aMule-ról/ra.
-Ebben az esetben az \fBamuleweb\fR figyelmen kívül hagyja azokat a parancssori és konfigurációs fájlbeli beállításokat, amelyeket az aMule-tól is be tud szerezni (ezek beállíthatóak a Beállítások->Távoli Elérés pontban).
-A beállítások mentésekor sem írja azokat fájlba (mint egyébként), hanem az aMule-t értesíti a beállítások megváltozásáról.
-Azon beállítások, melyek az aMule Beállítások párbeszédpaneljén nem szerpelnek, nem kerülnek mentésre.
-.TP
-\fB\-\-amule\-config\-file\fR=\fI<fájl>\fR
-Az aMule konfigurációs fájljának elérési útvonala.
-.B NE HASZNÁLJA EZT A PARAMÉTERT!
-Ezt az aMule használja, hogy induláskor el tudja indítani a web kiszolgálót.
-Ennek hatására az \fBamuleweb\fR minden egyéb parancssori, konfigurációs és alapértelmezett beállítást figyelmen kívül hagy, és a megadott konfigurációs fájlból olvassa be azokat, ezen kívül úgy viselkedik, mintha a \fB\-q \-L\fR opciók is meg lennének adva.
-.TP
-\fB\-\-help\fR
-Megjeleníti a súgót és kilép.
-.TP
-\fB\-\-version\fR
-Megjeleníti a program verzióját, majd kilép.
-.SH MEGJEGYZÉSEK
-.SS Elérési utak
-Minden olyan opciónál, amely \fI<fájl>\fR paramétert kér, ha a megadott \fIfájl\fR nem tartalmaz könyvtár komponenst (vagyis tisztán csak egy fájlnév), akkor azt az aMule konfigurációs könyvtárában (\fI~/.aMule\fR) fogja keresni.
-.SS Nyelvek
-A \fB\-l\fR opció \fI<nyelv>\fR paramétere a következõ módon adható meg: \fInyelv\fR[\fB_\fITERÜLET\fR][\fB.\fIkódolás\fR][\fB@\fImódosító\fR], ahol \fInyelv\fR az elsõdleges nyelv, \fITERÜLET\fR egy nyelvváltozat/terület kódja, \fIkódolás\fR a karakter készlet kódja és a \fImódosító\fR "lehetõvé teszi, hogy a felhasználó kiválasszon egy meghatározott esetet a helyi jellemzõk adataiból egyetlen kategórián belül".
-.PP
-Például, a következõ értékek mind érvényesek:
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULEWEB 1 "2011. november" "aMule web kiszolgÃ¡lÃ³ v2.3.1" "aMule segÃ©dprogramok"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH NÃV
+amuleweb \- aMule web kiszolgÃ¡lÃ³
+.SH ÃTTEKINTÃS
+.B_untranslated amuleweb
+[\fB\-h\fP \fI<gÃ©p>\fP] [\fB\-p\fP \fI<port>\fP] [\fB\-P\fP
+\fI<jelszÃ³>\fP] [\fB\-f\fP \fI<fÃ¡jl>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<nyelv>\fP]
+.RB_untranslated [ \-w ]
+[\fB\-t\fP \fI<sablon>\fP] [\fB\-s\fP \fI<port>\fP]
+.RB_untranslated [ \-u ]
+[\fB\-U\fP \fI<port>\fP]
+.RB_untranslated [ \-z ]
+.RB_untranslated [ \-Z ]
+[\fB\-A\fP \fI<jelszÃ³>\fP] [\fB\-G\fP \fI<jelszÃ³>\fP]
+.RB_untranslated [ \-a " " | " " \-d ]
+.RB_untranslated [ \-L ]
+.RB_untranslated [ \-\-no\-php ]
+.RB_untranslated [ \-N ]
+
+.B_untranslated amuleweb
+[\fB\-\-create\-config\-from\fP=\fI<fÃ¡jl>\fP]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-help ]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amuleweb
+[\fB\-\-amule\-config\-file\fP=\fI<fÃ¡jl>\fP]
+
+.SH LEÃRÃS
+Az \fBamuleweb\fP programmal egy web\-bÃ¶ngÃ©szÅ segÃtsÃ©gÃ©vel vezÃ©relhetjÃ¼k az
+amule(d)\-t. Az amuleweb\-et az \fBamule\fP(1)\-vel egyÃ¼tt is lehet indÃtani, vagy
+kÃ¼lÃ¶n, kÃ©zzel. A beÃ¡llÃtÃ¡sait konfigurÃ¡ciÃ³s fÃ¡jlban vagy parancssorban is
+megadhatjuk. A parancssori opciÃ³k elsÅbbsÃ©get Ã©lveznek a konfigurÃ¡cÃ³s
+fÃ¡jlban talÃ¡ltakkal szemben.
+.TP 
+\fB[ \-h\fP \fI<gÃ©p>\fP, \fB\-\-host\fP=\fI<gÃ©p>\fP \fB]\fP
+A gÃ©p, amelyen az aMule fut (alapÃ©rtelmezÃ©s: \fIlocalhost\fP). A
+\fI<gÃ©p>\fP lehet egy IP cÃm vagy egy DNS nÃ©v.
+.TP 
+\fB[ \-p\fP \fI<port>\fP, \fB\-\-port\fP=\fI<port>\fP \fB]\fP
+Az aMule tÃ¡voli elÃ©rÃ©s portja, amint az a BeÃ¡llÃtÃ¡sok\->TÃ¡voli ElÃ©rÃ©s
+panelen beÃ¡llÃthatÃ³ (alapÃ©rtelemzÃ©s: \fI4712\fP).
+.TP 
+\fB[ \-P\fP \fI<jelszÃ³>\fP, \fB\-\-password\fP=\fI<jelszÃ³>\fP \fB]\fP
+A tÃ¡voli elÃ©rÃ©s jelszava.
+.TP 
+\fB[ \-f\fP \fI<fÃ¡jl>\fP, \fB\-\-config\-file\fP=\fI<fÃ¡jl>\fP \fB]\fP
+A megadott konfigurÃ¡ciÃ³s fÃ¡jl hasznÃ¡lata. Az alapÃ©rtelmezett konfigurÃ¡ciÃ³s
+fÃ¡jl: \fI~/.aMule/remote.conf\fP
+.TP 
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Ne Ãrjon semmit a szabvÃ¡ny kimenetre.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+BÅbeszÃ©dÅ± mÃ³d \- a hibakeresÃ©si Ã¼zenetek megjelenÃtÃ©se.
+.TP 
+\fB[ \-l\fP \fI<nyelv>\fP, \fB\-\-locale\fP=\fI<nyelv>\fP \fB]\fP
+BeÃ¡llÃtja a program nyelvÃ©t. LÃ¡sd a \fBMEGJEGYZÃSEK\fP fejezetet a
+\fI<nyelv>\fP paramÃ©ter bÅvebb leÃrÃ¡sÃ¡hoz.
+.TP 
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+A parancssori paramÃ©tereket beÃrja a konfigurÃ¡ciÃ³s fÃ¡jlba Ã©s kilÃ©p.
+.TP 
+\fB[ \-t\fP \fI<sablon>\fP, \fB\-\-template\fP=\fI<sablon>\fP \fB]\fP
+BetÃ¶lti a \fI<nÃ©v>\fP nevÅ± sablont. BÅvebb rÃ©szletekÃ©rt lÃ¡sd a
+\fBSABLONOK\fP fejezetet.
+.TP 
+\fB[ \-s\fP \fI<port>\fP, \fB\-\-server\-port\fP=\fI<port>\fP \fB]\fP
+Web kiszolgÃ¡lÃ³ HTTP port. Erre a portra kell irÃ¡nyÃtanod a bÃ¶ngÃ©szÅdet
+(alapÃ©rtelmezÃ©s: \fI4711\fP).
+.TP 
+.B_untranslated [ \-u ]\fR
 .br
-fr
+UPnP engedÃ©lyezÃ©se.
+.TP 
+\fB[ \-U\fP \fI<port>\fP, \fB\-\-upnp\-port\fP \fI<port>\fP \fB]\fP
+UPnP port.
+.TP 
+.B_untranslated [ \-z\fR, \fB\-\-enable\-gzip ]\fR
+EngedÃ©lyezi a gzip tÃ¶mÃ¶rÃtÃ©st a HTTP adatÃ¡tvitelnÃ©l a sÃ¡vszÃ©lessÃ©g jobb
+kihasznÃ¡lÃ¡sa Ã©rdekÃ©ben.
+.TP 
+.B_untranslated [ \-Z\fR, \fB\-\-disable\-gzip ]\fR
+gzip tÃ¶mÃ¶rÃtÃ©s tiltÃ¡sa (alapÃ©rtelmezett).
+.TP 
+\fB[ \-A\fP \fI<jelszÃ³>\fP, \fB\-\-admin\-pass\fP=\fI<jelszÃ³>\fP \fB]\fP
+Teljes hozzÃ¡fÃ©rÃ©sÅ± jelszÃ³ a web kiszolgÃ¡lÃ³hoz.
+.TP 
+\fB[ \-G\fP \fI<jelszÃ³>\fP, \fB\-\-guest\-pass\fP=\fI<jelszÃ³>\fP \fB]\fP
+Web kiszolgÃ¡lÃ³ vendÃ©g felhasznÃ¡lÃ³ jelszava.
+.TP 
+.B_untranslated [ \-a\fR, \fB\-\-allow\-guest ]\fR
+VendÃ©g felhasznÃ¡lÃ³ engedÃ©lyezÃ©se.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-deny\-guest ]\fR
+VendÃ©g felhasznÃ¡lÃ³ tiltÃ¡sa (alapÃ©rtelmezett).
+.TP 
+.B_untranslated [ \-L\fR, \fB\-\-load\-settings ]\fR
+BeÃ¡llÃtÃ¡sok tÃ¶ltÃ©se/mentÃ©se a tÃ¡voli aMule\-rÃ³l/ra. Ebben az esetben az
+amuleweb figyelmen kÃvÃ¼l hagyja azokat a parancssori Ã©s konfigurÃ¡ciÃ³s
+fÃ¡jlbeli beÃ¡llÃtÃ¡sokat, amelyeket az aMule\-tÃ³l is be tud szerezni (ezek
+beÃ¡llÃthatÃ³k a BeÃ¡llÃtÃ¡sok\->TÃ¡voli ElÃ©rÃ©s pontban). A beÃ¡llÃtÃ¡sok
+mentÃ©sekor sem Ãrja azokat fÃ¡jlba (mint egyÃ©bkÃ©nt), hanem az aMule\-t
+Ã©rtesÃti a beÃ¡llÃtÃ¡sok megvÃ¡ltozÃ¡sÃ¡rÃ³l. Azon beÃ¡llÃtÃ¡sok, melyek az aMule
+BeÃ¡llÃtÃ¡sok pÃ¡rbeszÃ©dpaneljÃ©n nem szerepelnek, nem kerÃ¼lnek mentÃ©sre.
+.TP 
+.B_untranslated [ \-\-no\-php ]\fR
+PHP Ã©rtelmezÅ letiltÃ¡sa (elavult, ne hasznÃ¡ld)
+.TP 
+.B_untranslated [ \-N\fR, \fB\-\-no\-script\-cache ]\fR
+PHP oldalak ÃºjrafordÃtÃ¡sa minden kÃ©rÃ©snÃ©l.
+.TP 
+\fB[ \-\-create\-config\-from\fP=\fI<fÃ¡jl>\fP \fB]\fP
+KonfigurÃ¡ciÃ³s fÃ¡jl kÃ©szÃtÃ©se a \fI<fÃ¡jl>\fP alapjÃ¡n, amely az aMule
+Ã©rvÃ©nyes konfigurÃ¡ciÃ³s fÃ¡jlja kell legyen, majd utÃ¡na kilÃ©p.
+.TP 
+.B_untranslated [ \-\-help ]\fR
+Egy rÃ¶vid hasznÃ¡lati leÃrÃ¡st jelenÃt meg.
+.TP 
+.B_untranslated [ \-\-version ]\fR
+MegjelenÃti a verziÃ³szÃ¡mot.
+.TP 
+\fB[ \-\-amule\-config\-file\fP=\fI<fÃ¡jl>\fP \fB]\fP
+aMule konfigurÃ¡ciÃ³s fÃ¡jl. \fBNE HASZNÃLD!\fP Az aMule hasznÃ¡lja ezt a
+paramÃ©tert amikor automatikusan indÃtja az amuleweb\-et. Ezen paramÃ©ter
+hatÃ¡sÃ¡ra minden mÃ¡s parancssori Ã©s konfigurÃ¡ciÃ³s fÃ¡jl\-bÃ©li beÃ¡llÃtÃ¡st
+figyelmen kÃvÃ¼l hagy, a beÃ¡llÃtÃ¡sait a megadott \fI<fÃ¡jl>\fP\-bÃ³l
+olvassa, illetve bekapcsolja a \fB\-q \-L\fP opciÃ³kat.
+.SH MEGJEGYZÃSEK
+.SS "ElÃ©rÃ©si utak"
+Minden olyan opciÃ³nÃ¡l amely \fI<fÃ¡jl>\fP paramÃ©tert kÃ©r, ha a megadott
+\fIfÃ¡jl\fP nem tartalmaz kÃ¶nyvtÃ¡r komponenst (vagyis tisztÃ¡n csak egy fÃ¡jlnÃ©v),
+akkor azt az aMule konfigurÃ¡ciÃ³s kÃ¶nyvtÃ¡rÃ¡ban (\fI~/.aMule\fP) fogja keresni.
+.SS Nyelvek
+A \fB\-l\fP opciÃ³ \fI<nyelv>\fP paramÃ©tere a kÃ¶vetkezÅkÃ©ppen adhatÃ³ meg:
+\fInyelv\fP[\fB_\fP\fITERÃLET\fP][\fB.\fP\fIkÃ³dolÃ¡s\fP][\fB@\fP\fImÃ³dosÃtÃ³\fP], ahol \fInyelv\fP az
+elsÅdleges nyelv, \fITERÃLET\fP egy nyelvvÃ¡ltozat/terÃ¼let kÃ³dja, \fIkÃ³dolÃ¡s\fP a
+karakterkÃ©szlet kÃ³dja Ã©s a \fImÃ³dosÃtÃ³\fP \(BqlehetÅvÃ© teszi, hogy a
+felhasznÃ¡lÃ³ kivÃ¡lasszon egy meghatÃ¡rozott esetet a helyi jellemzÅk adataibÃ³l
+egyetlen kategÃ³riÃ¡n belÃ¼l\(rq.
+
+PÃ©ldÃ¡ul a kÃ¶vetkezÅ Ã©rtÃ©kek mind Ã©rvÃ©nyesek:
+.RS
+.RB_untranslated de
 .br
-fr_FR
+.RB_untranslated de_DE
 .br
-de_DE.iso88591
+.RB_untranslated de_DE.iso88591
 .br
-de_DE@euro
+.RB_untranslated de_DE@euro
 .br
-de_DE.iso88591@euro
-.PP
-Habár a fenieket mind elfogadja a program, mint érvényes nyelvmeghatározást, a \fIkódolás\fR és \fImódosító\fR még nem használt.
-.PP
-Ráadaásként a fenti formátumhoz, megadható akár egy nyelv teljes angol megnevezése is, így például \fB\-l german\fR szintén érvényes, és egyenértékû a \fB-l de_DE\fR megadással.
-.PP
-Ha sem a parancssorban, sem a konfigurációs fájlban nincsen megadva a nyelv, akkor a rendszer alapértelmezett nyelvét fogja használni.
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
+HabÃ¡r a fentieket mind elfogadja a program, mint Ã©rvÃ©nyes
+nyelvmeghatÃ¡rozÃ¡st, a \fIkÃ³dolÃ¡s\fP Ã©s \fImÃ³dosÃtÃ³\fP mÃ©g nem hasznÃ¡lt.
+
+RÃ¡adÃ¡skÃ©nt a fenti formÃ¡tumhoz, megadhatÃ³ akÃ¡r egy nyelv teljes angol
+megnevezÃ©se is, Ãgy pÃ©ldÃ¡ul a \fB\-l german\fP szintÃ©n Ã©rvÃ©nyes Ã©s egyenÃ©rtÃ©kÅ± a
+\fB\-l de_DE\fP megadÃ¡ssal.
+
+Ha sem a konfigurÃ¡ciÃ³s fÃ¡jlban, sem a parancssorban nincs megadva a nyelv,
+akkor a rendszer alapÃ©rtelmezett nyelvÃ©t fogja hasznÃ¡lni.
 .SH SABLONOK
-Az \fBamuleweb\fR képes az információ különbözõ felületekkel történõ megjelenítésére.
-Ezeket hívjuk sablonoknak, és az \fBamuleweb\fR a \fB\-t\fR parancssori opcióval vehetõ rá egy adott sablon használatára.
-A sablonokat a következõ helyen keresi: elõször az \fI~/.aMule/webserver/\fR könyvtárban, majd utána a \fI$(pkgdatadir)/webserver/\fR könyvtárban, ahol (\fI$(pkgdatadir)\fR a hardver független adatok installálási helye, általában /usr/share/amule).
-Minden egyes sablonnak a sablon nevével megegyezõ alkönyvtárban kell lennie, és ez a könyvtár kell tartalmazzon minden fájlt, amelyre a sablonnak szüksége van.
-Magának a sablont tartalmazó fájlnak a neve aMule.tmpl kell, hogy legyen.
+Az \fBamuleweb\fP kÃ©pes az informÃ¡ciÃ³ kÃ¼lÃ¶nbÃ¶zÅ felÃ¼letekkel tÃ¶rtÃ©nÅ
+megjelenÃtÃ©sÃ©re. Ezeket hÃvjuk sablonoknak, Ã©s az amuleweb a \fB\-t\fP
+parancssori opciÃ³val vehetÅ rÃ¡ egy adott sablon hasznÃ¡latÃ¡ra. A sablonokat a
+kÃ¶vetkezÅ helyeken keresi: elÅszÃ¶r a \fI~/.aMule/webserver/\fP kÃ¶nyvtÃ¡rban,
+majd utÃ¡na a \fI/usr/share/amule/webserver/\fP kÃ¶nyvtÃ¡rban.
 .PP
-Például az alapértelmezett sablon (a neve 'default') a webserver/default/ könyvtárban van, és ez a könyvtár tartalmazza az aMule.tmpl fájlt, meg egy jó pár képet hozzá.
-.SH FÁJLOK
+Minden sablonnak a sablon nevÃ©vel megegyezÅ alkÃ¶nyvtÃ¡rban kell lennie, Ã©s ez
+a kÃ¶nyvtÃ¡r kell tartalmazzon minden fÃ¡jlt, amelyre a sablonnak szÃ¼ksÃ©ge van.
+.SH FÃJLOK
 ~/.aMule/remote.conf
 .br
 ~/.aMule/webserver/
 .br
-\fI$(pkgdatadir)\fR/webserver/
-.SH PÉLDA
-Tipikusan az \fBamuleweb\fR elsõ indításakor létrehozunk egy konfigurációs fájlt, vagy az
+\fI$(pkgdatadir)\fP/webserver/
+.SH PÃLDA
+Tipikusan az amuleweb\-et elÅszÃ¶r a kÃ¶vetkezÅkÃ©ppen indÃtjuk:
 .PP
-\fBamuleweb\fR \fB\-h\fR \fIgépnév\fR \fB\-p\fR \fIEC_port\fR \fB\-P\fR \fIEC_jelszó\fR \fB\-s\fR \fIHTTP_port\fR \fB\-A\fR \fITeljesJogúJelszó\fR \fB\-w\fR
+\fBamuleweb\fP \fB\-h\fP \fIgÃ©pnÃ©v\fP \fB\-p\fP \fIEC\-port\fP \fB\-P\fP \fIEC\-jelszÃ³\fP \fB\-s\fP
+\fIHTTP\-port\fP \fB\-A\fP \fIadmin\-jelszÃ³\fP \fB\-w\fP
 .PP
-paranccsal, vagy, ha nem akarjuk a parancssorban megadni a jelszót, akkor pl. az
+vagy
 .PP
-\fBamuleweb\fR \fB\-\-create-config-from\fR=\fI/home/felhasználónév/.aMule/amule.conf\fR
+\fBamuleweb\fP
+\fB\-\-create\-config\-from\fP=\fI/home/felhasznÃ¡lÃ³nÃ©v/.aMule/amule.conf\fP
 .PP
-paranccsal. Természetesen a fenti elérési út a helyi viszonyoknak megfelelõen változhat. A beállítások tehát elmentõdnek a \fI$HOME/.aMule/remote.conf\fR fájlba, és ezek után már egyszerûen az
+Ez elmenti a beÃ¡llÃtÃ¡sokat a \fI$HOME/.aMule/remote.conf\fP fÃ¡jlba, hogy kÃ©sÅbb
+mÃ¡r csak ezt kelljen Ãrni:
 .PP
-.B amuleweb
+.B_untranslated amuleweb
 .PP
-paranccsal indíthatjuk a web kiszolgálót.
-.SH HIBÁK JELENTÉSE
-A hibákat kérjük vagy a fórumon (\fIhttp://forum.amule.org/\fR), vagy a hibakövetõben (\fIhttp://bugs.amule.org/\fR) jelentsék.
-Hibákról kérjük ne írjanak levelet (e-mail-t) se a levelzési listára, se közvetlenül valamelyik fejlesztõnek.
+TermÃ©szetesen mÃ¡s paramÃ©terek is megadhatÃ³k az elsÅ pÃ©ldÃ¡ban, illetve
+teljesen el is hagyhatÃ³ak.
+.SH "HIBÃK JELENTÃSE"
+A hibÃ¡kat kÃ©rjÃ¼k vagy a fÃ³rumon (\fIhttp://forum.amule.org/\fP), vagy a
+hibakÃ¶vetÅben (\fIhttp://bugs.amule.org/\fP) jelentsÃ©k. HibÃ¡krÃ³l kÃ©rjÃ¼k ne
+Ãrjanak levelet (e\-mail\-t) se a levelezÃ©si listÃ¡ra, se kÃ¶zvetlenÃ¼l
+valamelyik fejlesztÅnek.
 .SH COPYRIGHT
-Az aMule és az összes hozzá tartozó segédprogram a GNU General Public Licence védelme alatt áll.
-.SH LÁSD MÉG
-\fBamule\fR(1), \fBamulecmd\fR(1)
-.SH MAGYAR FORDÍTÁS
-Dévai Tamás <gonosztopi@amule.org>
+Az aMule Ã©s az Ã¶sszes hozzÃ¡ tartozÃ³ segÃ©dprogram a GNU General Public
+License vÃ©delme alatt Ã¡ll.
+.SH "LÃSD MÃG"
+.B_untranslated amule\fR(1), \fBamulecmd\fR(1)
+.SH SZERZÅ
+Ezt a kÃ©zikÃ¶nyv lapot Vollstrecker <amule@vollstreckernet.de> Ãrta.
+.SH MAGYAR FORDÃTÃS
+DÃ©vai TamÃ¡s <gonosztopi@amule.org>

aMule-2.2.6.tar.bz2/docs/man/amuleweb.it.1 -> aMule-2.3.1.tar.bz2/docs/man/amuleweb.it.1 Changed

@@ -1,193 +1,224 @@
-.TH AMULEWEB 1 "Settembre 2009" "aMule webserver v2.2.6" "aMule utilities"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULEWEB 1 "Novembre 2011" "aMule webserver v2.3.1" "Utilità di aMule"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOME
-amuleweb \- Server web aMule
-.SH SINOPSI
-.B amuleweb
-.RB [ \-h " " \fI<host> ]
-.RB [ \-p " " \fI<port> ]
-.RB [ \-P " " \fI<passwd> ]
-.RB [ \-f " " \fI<path> ]
-.RB [ \-q ]
-.RB [ \-v ]
-.RB [ \-l " " \fI<lang> ]
-.RB [ \-w ]
-.RB [ \-t " " \fI<name> ]
-.RB [ \-s " " \fI<port> ]
-.RB [ \-u ]
-.RB [ \-U ]
-.RB [ \-z ]
-.RB [ \-Z ]
-.RB [ \-A " " \fI<pass> ]
-.RB [ \-G " " \fI<pass> ]
-.RB [ \-a ]
-.RB [ \-d ]
-.RB [ \-L ]
-.RB [ \-N ]
-.PP
-.B amuleweb
-.RB [ \-f " " \fI<path> ]
-.B \-\-create-config-from=\fI<path>
-.PP
-.B amuleweb
-.RB [ \-\-help ]
-.RB [ \-\-version ]
-.PP
-.B amuleweb \-\-amule\-config\-file=\fI<path>
-.PP
-.B amuleweb \-\-no\-php
+amuleweb \- aMule web server
+.SH SINTASSI
+.B_untranslated amuleweb
+[\fB\-h\fP \fI<host>\fP] [\fB\-p\fP \fI<porta>\fP] [\fB\-P\fP
+\fI<password>\fP] [\fB\-f\fP \fI<percorso>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<linguaggio>\fP]
+.RB_untranslated [ \-w ]
+\fB\-t\fP \fI<nome>\fP] [\fB\-s\fP \fI<porta>\fP]
+.RB_untranslated [ \-u ]
+[\fB\-U\fP \fI<porta>\fP]
+.RB_untranslated [ \-z ]
+.RB_untranslated [ \-Z ]
+[\fB\-A\fP \fI<password>\fP] [\fB\-G\fP \fI<password>\fP]
+.RB_untranslated [ \-a " " | " " \-d ]
+.RB_untranslated [ \-L ]
+.RB_untranslated [ \-\-no\-php ]
+.RB_untranslated [ \-N ]
+
+.B_untranslated amuleweb
+[\fB\-\-create\-config\-from\fP=\fI<percorso>\fP]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-help ]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amuleweb
+[\fB\-\-amule\-config\-file\fP=\fI<percorso>\fP]
+
 .SH DESCRIZIONE
-\fBamuleweb\fR gestisce il tuo accesso ad amule attraverso un browser web.
-Puoi avviare amuleweb assieme ad \fBamule\fR(1), o separatamente, in tempi successivi.
-Le opzioni possono essere specificate tramite linea di comando oppure tramite file di configurazione.
-Le opzioni da linea di comando hanno la precedenza sulle opzioni da file di configurazione.
-.TP
-\fB\-h\fR, \fB\-\-host\fR=\fI<host>\fR
-L'host in cui aMule è in esecuzione (predefinito: \fIlocalhost\fR).
-\fI<host>\fR potrebbe essere un indirizzo IP o un nome DNS.
-.TP
-\fB\-p\fR, \fB\-\-port\fR=\fI<port>\fR
-La porta di aMule per connessioni esterne, come impostato in Preferenze->Controlli remoti (predefinita: \fI4712\fR).
-.TP
-\fB\-P\fR, \fB\-\-password\fR=\fI<passwd>\fR.
-Password per le connessioni esterne.
-.TP
-\fB\-f\fR, \fB\-\-config\-file\fR=\fI<path>\fR
-Utilizza il file di configurazione fornito.
-Il file di configurazione predefinito è \fI~/.aMule/remote.conf\fR .
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-Non mostrare alcun output in stdout.
-You may want to use \fB\-q\fR to daemonize the webserver, i.e. running as '\fBamuleweb \-q &\fR'.
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Sii prolisso \- mostra anche i messaggi di debug.
-.TP
-\fB\-l\fR, \fB\-\-locale\fR=\fI<lang>\fR
-Imposta il locale del programma (lingua).
-See section \fBLANGUAGES\fR for the description of the \fI<lang>\fR parameter.
-.TP
-\fB\-w\fR, \fB\-\-write\-config\fR
-Writes command line options to config file and exit.
-.TP
-\fB\-\-create\-config\-from\fR=\fI<path>\fR
-Creates config file based upon \fI<path>\fR, which must point to a valid aMule config file, and then exit.
-.TP
-\fB\-t\fR, \fB\-\-template\fR=\fI<name>\fR
-Loads the template named \fI<name>\fR. See also the section
-.B SKIN SUPPORT.
-.TP
-\fB\-s\fR, \fB\-\-server\-port\fR=\fI<port>\fR
-Porta HTTP del server web. Questa è la porta su cui puoi pontare il tuo browser (predefinita: \fI4711\fR).
-.TP
-\fB\-z\fR, \fB\-\-enable\-upnp\fR
-Abilita l'utilizzo dell'inoltro di una porta UPnP sulla porta del server web.
-.TP
-\fB\-U\fR, \fB\-\-upnp\-port\fR
-Porta UPnP.
-.TP
-\fB\-z\fR, \fB\-\-enable\-gzip\fR
-Enables using gzip compression in HTTP traffic to save bandwidth.
-.TP
-\fB\-Z\fR, \fB\-\-disable\-gzip\fR
-Disables using gzip compression (this is the default).
-.TP
-\fB\-A\fR, \fB\-\-admin\-pass\fR=\fI<passwd>\fR
-Full access password for webserver.
-.TP
-\fB\-G\fR, \fB\-\-guest\-pass\fR=\fI<passwd>\fR
-Password ospite per il server web.
-.TP
-\fB\-a\fR, \fB\-\-allow\-guest\fR
-Permette l'accesso di ospiti.
-.TP
-\fB\-d\fR, \fB\-\-deny\-guest\fR
-Nega l'accesso di ospiti (predefinito).
-.TP
-\fB\-L\fR, \fB\-\-load\-settings\fR
-Load/save webserver settings from/to remote aMule.
-This causes amuleweb to ignore command-line and config-file settings, and load them from aMule.
-When saving preferences none will be written to the config file, but to aMule.
-(Of course, this works only for those settings that can be set in aMule's Preferences->Remote Controls.)
-.TP
-\fB\-N\fR, \fB\-\-no\-script\-cache\fR
-Recompiles PHP pages on each request.
-.TP
-\fB\-\-amule\-config\-file\fR=\fI<path>\fR
-aMule config file path.
-.B DO NOT USE DIRECTLY!
-aMule uses this option when starting amuleweb at aMule startup.
-This option causes all other command-line and config-file settings to be ignored, preferences to be read from the given config file, and also implies the \fB\-q \-L\fR options.
-.TP
-\fB\-\-help\fR
-Mostra una breve descrizione di utilizzo.
-.TP
-\fB\-\-version\fR
-Mostra il numero di versione corrente.
+\fBamuleweb\fP gestisce l'accesso ad amule attraverso un browser web.  Si può
+eseguire amuleweb insieme ad \fBamule\fP(1), o separatamente in qualunque
+momento successivo. Le opzioni possono essere specificate in riga di comando
+o nel file di configurazione. Le opzioni in riga di comando hanno la
+precedenza su quelle nel file di configurazione.
+.TP 
+\fB[ \-h\fP \fI<host>\fP, \fB\-\-host\fP=\fI<host>\fP \fB]\fP
+Computer dove è in esecuzione aMule (default:
+\fIlocalhost\fP). \fI<host>\fP può essere un indirizzo IP o un nome DNS.
+.TP 
+\fB[ \-p\fP \fI<porta>\fP, \fB\-\-port\fP=\fI<porta>\fP \fB]\fP
+Porta di aMule per le connessioni esterne, come impostata nelle
+preferenze\->controllo remoto (default: \fI4712\fP)
+.TP 
+\fB[ \-P\fP \fI<password>\fP, \fB\-\-password\fP=\fI<password>\fP \fB]\fP
+Password delle connessioni esterne.
+.TP 
+\fB[ \-f\fP \fI<percorso>\fP, \fB\-\-config\-file\fP=\fI<percorso>\fP \fB]\fP
+Usa il file di configurazione fornito. Il file di configurazione di default
+è \fI~/.aMule/remote.conf\fP
+.TP 
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Non scrivere nulla nello stdout.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Mostra anche i messaggi di debug.
+.TP 
+\fB[ \-l\fP \fI<linguaggio>\fP, \fB\-\-locale\fP=\fI<linguaggio>\fP \fB]\fP
+Imposta il linguaggio del programma. Vedi anche la sezione delle \fBNOTE\fP per
+la descrizione del parametro \fI<linguaggio>\fP .
+.TP 
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+Scrive le opzioni della riga di comando nel file di configurazione ed esce.
+.TP 
+\fB[ \-t\fP \fI<nome>\fP, \fB\-\-template\fP=\fI<nome>\fP \fB]\fP
+Carica il modello chiamato \fI<nome>\fP. Vedi la sezione \fBSUPPORTO
+AGLI SKIN\fP per i dettagli.
+.TP 
+\fB[ \-s\fP \fI<porta>\fP, \fB\-\-server\-port\fP=\fI<porta>\fP \fB]\fP
+Porta HTTP del server web. Questa è la porta da indicare nel browser
+(default: \fI4711\fP).
+.TP 
+.B_untranslated [ \-u ]\fR
+.br
+Abilita il supporto UPnP.
+.TP 
+\fB[ \-U\fP \fI<porta>\fP, \fB\-\-upnp\-port\fP \fI<porta>\fP \fB]\fP
+Porta per l'UPnP.
+.TP 
+.B_untranslated [ \-z\fR, \fB\-\-enable\-gzip ]\fR
+Abilita la compressione gzip nel traffico HTTP per risparmiare banda.
+.TP 
+.B_untranslated [ \-Z\fR, \fB\-\-disable\-gzip ]\fR
+Disabilita la compressione gzip (questo è il default).
+.TP 
+\fB[ \-A\fP \fI<password>\fP, \fB\-\-admin\-pass\fP=\fI<password>\fP \fB]\fP
+Password per l'accesso completo al web server.
+.TP 
+\fB[ \-G\fP \fI<password>\fP, \fB\-\-guest\-pass\fP=\fI<password>\fP \fB]\fP
+Password for l'accesso ospite al web server.
+.TP 
+.B_untranslated [ \-a\fR, \fB\-\-allow\-guest ]\fR
+Permette l'accesso ospite.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-deny\-guest ]\fR
+Nega l'accesso ospite (default).
+.TP 
+.B_untranslated [ \-L\fR, \fB\-\-load\-settings ]\fR
+Carica/salva le configurazioni del webserver da/verso aMule remoto. amuleweb
+ignorerà le opzioni in linea di comando e nel file di configurazione, e le
+caricherà invece da aMule. Quando si salveranno le preferenze, niente verrà
+scritto nel file di configurazione, ma in aMule. (Ovviamente, questo
+funzionerà solo per quelle impostazioni che possono essere scritte nelle
+preferenze di aMule\->controllo remoto.)
+.TP 
+.B_untranslated [ \-\-no\-php ]\fR
+Disabilita l'interprete PHP (deprecato)
+.TP 
+.B_untranslated [ \-N\fR, \fB\-\-no\-script\-cache ]\fR
+Ricompila le pagine PHP ad ogni richiesta.
+.TP 
+\fB[ \-\-create\-config\-from\fP=\fI<percorso>\fP \fB]\fP
+Crea un file di configurazione basandosi sul \fI<percorso>\fP, che deve
+puntare ad un file di configurazione di aMule valido, e quindi esce.
+.TP 
+.B_untranslated [ \-\-help ]\fR
+Visualizza una breve descrizione dell'utilizzo.
+.TP 
+.B_untranslated [ \-\-version ]\fR
+Visualizza il numero di versione corrente.
+.TP 
+\fB[ \-\-amule\-config\-file\fP=\fI<percorso>\fP \fB]\fP
+Percorso del file di configurazione di aMule. \fBNON USARE DIRETTAMENTE!\fP
+aMule usa questa opzione quando lancia amuleweb all'avvio di aMule. Questa
+opzione fa sì che tutte le altre impostazioni in riga di comando e nel file
+di configurazione vengano ignorate, le preferenze vengano lette dal file di
+configurazione dato, e anche implica le opzioni \fB\-q \-L\fP .
 .SH NOTE
 .SS Percorsi
-For all options which take a \fI<path>\fR value, if the \fIpath\fR contains no
-directory part (i.e. just a plain filename), then it is considered to be under
-the aMule configuration directory, \fI~/.aMule\fR.
-.SS LANGUAGES
-The \fI<lang>\fR parameter for the \fB\-l\fR option has the following form: \fIlang\fR[\fB_\fILANG\fR][\fB.\fIencoding\fR][\fB@\fImodifier\fR]
-where \fIlang\fR is the primary language, \fILANG\fR is a sublanguage/territory,
-\fIencoding\fR is the character set to use and \fImodifier\fR
-"allows the user to select a specific instance of localization data within a
-single category".
-.PP
+Per tutte le opzioni che accettano un \fI<percorso>\fP, se il
+\fIpercorso\fP non contiene una directory (ossia è solo un nome di file),
+allora si assume che esso sia presente nella directory di configurazione di
+aMule, \fI~/.aMule\fP.
+.SS Linguaggi
+Il parametro \fI<linguaggio>\fP per l'opzione \fB\-l\fP ha la forma
+seguente:
+\fIlinguaggio\fP[\fB_\fP\fILINGUAGGIO\fP][\fB.\fP\fIcodifica\fP][\fB@\fP\fImodificatore\fP] dove
+\fIlinguaggio\fP è il linguaggio primario, \fILINGUAGGIO\fP è il
+sottotipo/territorio, \fIcodifica\fP è l'insieme di caratteri usato e
+\fImodificatore\fP consente all'utente di selezionare una specifica istanza dei
+dati di localizzazione all'interno di una singola categoria.
+
 Per esempio, le stringhe seguenti sono valide:
+.RS
+.RB_untranslated de
 .br
-de
-.br
-de_DE
+.RB_untranslated de_DE
 .br
-de_DE.iso88591
+.RB_untranslated de_DE.iso88591
 .br
-de_DE@euro
+.RB_untranslated de_DE@euro
 .br
-de_DE.iso88591@euro
-.PP
-Though all the above strings are accepted as valid language definitions,
-\fIencoding\fR and \fImodifier\fR are yet unused.
-.PP
-In addition to the format above, you can also specify full language names in
-English - so \fB\-l german\fR is also valid and is equal to \fB-l de_DE\fR.
-.PP
-When no locale is defined, either on command-line or in config file, system
-default language will be used.
-.SH SKIN SUPPORT
-\fBamuleweb\fR is capable of displaying information in different skins.
-These skins are called templates, and you can make amuleweb load a specific template via the \fB\-t\fR command line option.
-Templates are searched in two places: first in \fI~/.aMule/webserver/\fR and then in \fI$(pkgdatadir)/webserver/\fR 
-(\fI$(pkgdatadir)\fR is the install location of architecture independent data, most likely something like /usr/share/amule).
-Each template must be in a subdirectory of the template name, and this directory must contain all files the template needs.
-The actual template filename must be aMule.tmpl.
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
+Sebbene tutte le stringhe sopra elencate sono accettate come definizioni di
+linguaggio valide, \fIcodifica\fP e \fImodificatore\fP sono ancora inutilizzati.
+
+In aggiunta al formato di cui sopra, si può anche specificare il nome
+completo del linguaggio in inglese, e quindi \fB\-l german\fP è valido ed
+equivalente a \fB\-l de_DE\fP.
+
+Quando nessun linguaggio è definito in riga di comando o nel file di
+configurazione, verrà usato il linguaggio di default del sistema.
+.SH "SUPPORTO AGLI SKIN"
+\fBamuleweb\fP può visualizzare l'informazione utilizzando diversi
+\&'skin'. Questi 'skin' sono contenuti in dei modelli, e si può far caricare
+da amuleweb un dato modello tramite l'opzione \fB\-t\fP in riga di comando. I
+modelli sono cercati in due posti: prima in \fI~/.aMule/webserver/\fP e quindi
+in \fI/usr/share/amule/webserver/\fP se aMule è stato installato con
+\-\-prefix=/usr.
 .PP
-For example, the default template (named 'default') is in webserver/default/, and this directory contains aMule.tmpl amongst a lot of image files.
+Ogni modello deve essere in una sottodirectory del nome di modello, e questa
+directory deve contenere tutti i file necessari al modello.
 .SH FILE
 ~/.aMule/remote.conf
 .br
 ~/.aMule/webserver/
 .br
-\fI$(pkgdatadir)\fR/webserver/
+\fI$(pkgdatadir)\fP/webserver/
 .SH ESEMPIO
-Typically amuleweb will be first run as:
+Di norma amuleweb sarà inizialmente eseguito con:
 .PP
-\fBamuleweb\fR \fB\-h\fR \fIhostname\fR \fB\-p\fR \fIECport\fR \fB\-P\fR \fIECpassword\fR \fB\-s\fR \fIHTTPport\fR \fB\-A\fR \fIAdminPassword\fR \fB\-w\fR
+\fBamuleweb\fP \fB\-h\fP \fInomehost\fP \fB\-p\fP \fIECporta\fP \fB\-P\fP \fIpasswordEC\fP \fB\-s\fP
+\fIportaHTTP\fP \fB\-A\fP \fIPasswordAmministrazione\fP \fB\-w\fP
 .PP
-or
+o
 .PP
-\fBamuleweb\fR \fB\-\-create-config-from\fR=\fI/home/username/.aMule/amule.conf\fR
+\fBamuleweb\fP \fB\-\-create\-config\-from\fP=\fI/home/username/.aMule/amule.conf\fP
 .PP
-These will save settings to \fI$HOME/.aMule/remote.conf\fR, and later you only need to type:
+In questo modo la configurazione verrà salvata in
+\fI$HOME/.aMule/remote.conf\fP, e le volte successive si dovrà solo digitare:
 .PP
-.B amuleweb
+.B_untranslated amuleweb
 .PP
-Of course, you may specify any more or less options on the first example line, and you may also totally omit it.
-.SH SEGNALARE BUG
-Please report bugs either on our forum (\fIhttp://forum.amule.org/\fR), or in our bugtracker (\fIhttp://bugs.amule.org/\fR).
-Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member.
+Ovviamente, si possono specificare più o meno opzioni della prima riga di
+esempio, e si si possono anche omettere completamente.
+.SH "SEGNALARE I BUG"
+Per favore segnalare i bug nel nostro forum (\fIhttp://forum.amule.org/\fP) o
+nel nostro bugtracker (\fIhttp://bugs.amule.org/\fP). Per favore non segnalare
+i bug via posta elettronica, né nella nostra mailing list né direttamente a
+qualunque membro del gruppo.
 .SH COPYRIGHT
-aMule e tutte le sue utilità correlate sono distribuite sotto la GNU General Public License.
-.SH CONSULTA ANCHE
-\fBamule\fR(1), \fBamulecmd\fR(1)
+aMule e tutti i programmi di utilità correlati sono distribuiti in accordo
+alla GNU General Public License.
+.SH "VEDI ANCHE"
+.B_untranslated amule\fR(1), \fBamulecmd\fR(1)
+.SH AUTORE
+Questa pagina del manuale è stata scritta da Vollstrecker
+<amule@vollstreckernet.de>
+.SH TRADUZIONE ITALIANA
+Stefano Corti <iz0bbz@libero.it>

aMule-2.3.1.tar.bz2/docs/man/amuleweb.ru.1 Added

@@ -0,0 +1,215 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULEWEB 1 "November 2011" "aMule webserver v2.3.1" "утилиты aMule"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH ИМЯ
+amuleweb \- вебсервер aMule
+.SH ОБЗОР
+.B_untranslated amuleweb
+[\fB\-h\fP \fI<хост>\fP] [\fB\-p\fP \fI<порт>\fP] [\fB\-P\fP
+\fI<пароль>\fP] [\fB\-f\fP \fI<путь>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<язык>\fP]
+.RB_untranslated [ \-w ]
+[\fB\-t\fP \fI<имя>\fP] [\fB\-s\fP \fI<порт>\fP]
+.RB_untranslated [ \-u ]
+[\fB\-U\fP \fI<порт>\fP]
+.RB_untranslated [ \-z ]
+.RB_untranslated [ \-Z ]
+[\fB\-A\fP \fI<пароль>\fP] [\fB\-G\fP \fI<пароль>\fP]
+.RB_untranslated [ \-a " " | " " \-d ]
+.RB_untranslated [ \-L ]
+.RB_untranslated [ \-\-no\-php ]
+.RB_untranslated [ \-N ]
+
+.B_untranslated amuleweb
+[\fB\-\-create\-config\-from\fP=\fI<путь>\fP]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-help ]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amuleweb
+[\fB\-\-amule\-config\-file\fP=\fI<путь>\fP]
+
+.SH ОПИСАНИЕ
+\fBamuleweb\fP организует доступ к amule через веб браузер. Вы можете запустить
+amuleweb вместе с \fBamule\fP(1), или отдельно позже. Настройки могут быть
+определены с помощью командной строки или файла конфигурации. Опции
+командной строки являются приоритетными по отношению к файлу конфигурации.
+.TP 
+\fB[ \-h\fP \fI<хост>\fP, \fB\-\-host\fP=\fI<хост>\fP \fB]\fP
+Адрес компьютера на котором работает aMule (по умолчанию:
+\fIlocalhost\fP). \fI<Хост>\fP может быть IP\-адресом или DNS\-именем.
+.TP 
+\fB[ \-p\fP \fI<порт>\fP, \fB\-\-port\fP=\fI<порт>\fP \fB]\fP
+Порт, который использует aMule для внешних соединений. Указывается в
+Настройках\->Удаленное управление (по умолчанию: \fI4712\fP)
+.TP 
+\fB[ \-P\fP \fI<пароль>\fP, \fB\-\-password\fP=\fI<пароль>\fP \fB]\fP
+Пароль для внешних соединений.
+.TP 
+\fB[ \-f\fP \fI<путь>\fP, \fB\-\-config\-file\fP=\fI<путь>\fP \fB]\fP
+Использовать указанный файл конфигурации. По умолчанию используется
+\fI~/.aMule/remote.conf\fP
+.TP 
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Не печетать ничего в стандартный вывод.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Выводить также отладочную информацию.
+.TP 
+\fB[ \-l\fP \fI<язык>\fP, \fB\-\-locale\fP=\fI<язык>\fP \fB]\fP
+Задать локаль (язык). См. секцию \fBЗАМЕЧАНИЯ\fP для дополнительной информации
+по параметру \fI<язык>\fP.
+.TP 
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+Записать параметр командной строки в файл конфигурации и выйти
+.TP 
+\fB[ \-t\fP \fI<имя>\fP, \fB\-\-template\fP=\fI<имя>\fP \fB]\fP
+Устанавливает шаблон с указанным \fI<именем>\fP. Подробности в секции
+\fBПОДДЕРЖКА СКИНОВ\fP.
+.TP 
+\fB[ \-s\fP \fI<порт>\fP, \fB\-\-server\-port\fP=\fI<порт>\fP \fB]\fP
+HTTP порт вебсервера. Этот порт должен быть указан в строке адреса браузера
+(по умолчанию: \fI4711\fP).
+.TP 
+.B_untranslated [ \-u ]\fR
+.br
+Включить UPnP.
+.TP 
+\fB[ \-U\fP \fI<порт>\fP, \fB\-\-upnp\-port\fP \fI<порт>\fP \fB]\fP
+Порт UPnP.
+.TP 
+.B_untranslated [ \-z\fR, \fB\-\-enable\-gzip ]\fR
+Включает использование gzip\-сжатия HTTP данных для уменьшения трафика.
+.TP 
+.B_untranslated [ \-Z\fR, \fB\-\-disable\-gzip ]\fR
+Отключает использование gzip\-сжатия (вариант по умолчанию).
+.TP 
+\fB[ \-A\fP \fI<пароль>\fP, \fB\-\-admin\-pass\fP=\fI<пароль>\fP \fB]\fP
+Пароль для полного доступа к вебсерверу.
+.TP 
+\fB[ \-G\fP \fI<пароль>\fP, \fB\-\-guest\-pass\fP=\fI<пароль>\fP \fB]\fP
+Пароль для гостевого доступа к вебсерверу.
+.TP 
+.B_untranslated [ \-a\fR, \fB\-\-allow\-guest ]\fR
+Разрешить гостевой доступ.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-deny\-guest ]\fR
+Запретить гостевой доступ (вариант по умолчанию).
+.TP 
+.B_untranslated [ \-L\fR, \fB\-\-load\-settings ]\fR
+Загрузить/сохранить настройки вебсервера из/в удаленный aMule. Это приводит
+к игнорированию параметров командной строки и конфигурационного файла, и
+загрузки их из aMule. При сохранении настроек они будут писаться не в файл
+конфигурации, а в aMule. (Конечно, работает только для настроек которые
+могут быть заданы через меню Настройки\->Удаленный контроль)
+.TP 
+.B_untranslated [ \-\-no\-php ]\fR
+Отключить интерпретатор PHP (устарело)
+.TP 
+.B_untranslated [ \-N\fR, \fB\-\-no\-script\-cache ]\fR
+Перекомпилирует страницы PHP при каждом обращении.
+.TP 
+\fB[ \-\-create\-config\-from\fP=\fI<путь>\fP \fB]\fP
+Создать файл конфигурации на основе файла указанного в \fI<пути>\fP и
+выйти. Указанный файл должен быть валидным файлом конфигурации aMule.
+.TP 
+.B_untranslated [ \-\-help ]\fR
+Выводит короткую помощь по использованию.
+.TP 
+.B_untranslated [ \-\-version ]\fR
+Выводит информацию о версии.
+.TP 
+\fB[ \-\-amule\-config\-file\fP=\fI<путь>\fP \fB]\fP
+Путь к файлу конфигурации aMule. \fBНЕ ИСПОЛЬЗУЙТЕ НАПРЯМУЮ!\fP aMule
+использует данную опцию для запуска amuleweb вместе с amule. Эта опция
+приводит к игнорированию параметров командной строки и конфигурационного
+файла, настройки читаются из заданного файла. Также подразумеваются опции
+\fB\-q \-L\fP.
+.SH ЗАМЕЧАНИЯ
+.SS Пути
+Для всех опций, в которых указывается \fI<путь>\fP, если \fIпуть\fP не
+содержит каталога (т.е. только имя самого файла), то предполагается, что
+файл находится в каталоге конфигурации, \fI~/.aMule\fP.
+.SS Языки
+Параметр \fI<язык>\fP для опции \fB\-l\fP имеет следующую форму:
+\fIязык\fP[\fB_\fP\fIЯЗЫК\fP][\fB.\fP\fIкодировка\fP][\fB@\fP\fIмодификатор\fP], где \fIязык\fP
+является основным языком, \fIЯЗЫК\fP \- диалект/территория, \fIкодировка\fP \-
+используемая кодировка символов и \fIмодификатор\fP позволяет пользователю
+использовать определенный вариант локализации в данной категории.
+
+К примеру, все следующие строчки являются приемлемыми:
+.RS
+.RB_untranslated de
+.br
+.RB_untranslated de_DE
+.br
+.RB_untranslated de_DE.iso88591
+.br
+.RB_untranslated de_DE@euro
+.br
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
+Хотя все приведенный строки будут приняты, поля \fIкодировка\fP и
+\fIмодификатор\fP пока не используются.
+
+К дополнению к приведенному формату, можно просто указать английское имя
+языка. Так, \fB\-l russian\fP тоже приемлемо и равносильно \fB\-l ru_RU\fP.
+
+Когда язык не указан ни в качестве опции ни в файле конфигурации,
+используется системный.
+.SH "ПОДДЕРЖКА СКИНОВ"
+\fBamuleweb\fP имеет возможность отображать информацию с разными скинами. Эти
+скины называются шаблонами, и вы можете переключить amuleweb на определенный
+шаблон использую опцию \fB\-t\fP командной строки. Шаблоны ищутся в двух местах:
+первое \fI~/.aMule/webserver/\fP, затем \fI/usr/share/amule/webserver/\fP, если
+инсталяция была проведена с \-\-prefix=/usr.
+.PP
+Каждый шаблон должен являться каталогом с именем шаблона, и все необходимые
+файлы должны находится внутри этого каталога.
+.SH ФАЙЛЫ
+~/.aMule/remote.conf
+.br
+~/.aMule/webserver/
+.br
+\fI$(pkgdatadir)\fP/webserver/
+.SH ПРИМЕРЫ
+Как правило, в первый раз amuleweb запускается так:
+.PP
+\fBamuleweb\fP \fB\-h\fP \fIимя_хоста\fP \fB\-p\fP \fIEC_порт\fP \fB\-P\fP \fIEC_пароль\fP \fB\-s\fP
+\fIHTTP_порт\fP \fB\-A\fP \fIпароль_полного_доступа\fP \fB\-w\fP
+.PP
+или
+.PP
+\fBamuleweb\fP \fB\-\-create\-config\-from\fP=\fI/home/username/.aMule/amule.conf\fP
+.PP
+Это сохранит параметры в \fI$HOME/.aMule/remote.conf\fP, и в дальнейшем надо
+будет только набрать:
+.PP
+.B_untranslated amuleweb
+.PP
+Конечно, вы можете указать иное количество аргументов в первой строке
+примера, или не использовать ее вообще.
+.SH "СООБЩЕНИЕ ОБ ОШИБКАХ"
+Пожалуйста, сообщайте об ошибках либо на нашем форуме
+(\fIhttp://forum.amule.org/\fP), либо в багтрекере
+(\fIhttp://bugs.amule.org/\fP). Пожалуйста, не сообщайте об ошбках по
+электронной почте, по нашим спискам рассылки, или напрямую участникам.
+.SH "АВТОРСКИЕ ПРАВА"
+aMule и все прилагающиеся инструменты распространаются под Открытым
+Лицензионным Соглашением GNU (GNU GPL).
+.SH "СМ. ТАКЖЕ"
+.B_untranslated amule\fR(1), \fBamulecmd\fR(1)
+.SH АВТОРЫ
+Автор страницы помощи: Vollstrecker <amule@vollstreckernet.de>,
+перевод: Radist Morse <radist.morse@gmail.com>

aMule-2.3.1.tar.bz2/docs/man/amuleweb.tr.1 Added

@@ -0,0 +1,217 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH AMULEWEB 1 "Kasım 2011" "aMule webserver v2.3.1" "aMule yardımcı araçları"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH İSİM
+amuleweb \- aMule web sunucusu
+.SH KULLANIM
+.B_untranslated amuleweb
+[\fB\-h\fP \fI<sunucu>\fP] [\fB\-p\fP \fI<port>\fP] [\fB\-P\fP
+\fI<şifre>\fP] [\fB\-f\fP \fI<yol>\fP]
+.RB_untranslated [ \-q ]
+.RB_untranslated [ \-v ]
+[\fB\-l\fP \fI<dil>\fP]
+.RB_untranslated [ \-w ]
+[\fB\-t\fP \fI<isim>\fP] [\fB\-s\fP \fI<port>\fP]
+.RB_untranslated [ \-u ]
+[\fB\-U\fP \fI<port>\fP]
+.RB_untranslated [ \-z ]
+.RB_untranslated [ \-Z ]
+[\fB\-A\fP \fI<şifre>\fP] [\fB\-G\fP \fI<şifre>\fP]
+.RB_untranslated [ \-a " " | " " \-d ]
+.RB_untranslated [ \-L ]
+.RB_untranslated [ \-\-no\-php ]
+.RB_untranslated [ \-N ]
+
+.B_untranslated amuleweb
+[\fB\-\-create\-config\-from\fP=\fI<yol>\fP]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-help ]
+
+.B_untranslated amuleweb
+.RB_untranslated [ \-\-version ]
+
+.B_untranslated amuleweb
+[\fB\-\-amule\-config\-file\fP=\fI<yol>\fP]
+
+.SH AÇIKLAMA
+\fBamuleweb\fP amule'e bir ağ tarayıcısı ile erişmenize olanak
+sağlar. amuleweb'i amule ile aynı anda ya da ayrı olarak, daha sonra ne
+zaman isterseniz başlatabilirsiniz. Seçenekleri komut satırı ya da
+yapılandırma dosyası ile belirtmek mümkündür. Komut satırı ile belirtilen
+seçenekler yapılandırma dosyası ile belirtilenlerden daha yüksek
+önceliklidir.
+.TP 
+\fB[ \-h\fP \fI<sunucu>\fP, \fB\-\-host\fP=\fI<sunucu>\fP \fB]\fP
+aMule'ün çalıştığı sunucu ya da bilgisayar (varsayılan:
+\fIlocalhost\fP). \fI<sunucu>\fP bir IP adresi ya da DNS ismi olabilir
+.TP 
+\fB[ \-p\fP \fI<port>\fP, \fB\-\-port\fP=\fI<port>\fP \fB]\fP
+aMule'ün dışarıya bağlandığında kullandığı port, Ayarlar\->Uzak
+Denetimler seçeneğinde belirlenir (varsayılan: \fI4712\fP)
+.TP 
+\fB[ \-P\fP \fI<şifre>\fP, \fB\-\-password\fP=\fI<şifre>\fP \fB]\fP
+Dışarıdan yapılan bağlantılar için şifre.
+.TP 
+\fB[ \-f\fP \fI<yol>\fP, \fB\-\-config\-file\fP=\fI<yol>\fP \fB]\fP
+Belirtilen yapılandırma dosyasını kullanır. Varsayılan yapılandırma dosyası
+şudur: \fI~/.aMule/remote.conf\fP
+.TP 
+.B_untranslated [ \-q\fR, \fB\-\-quiet ]\fR
+Standart çıktıya hiçbir veri yazdırmaz.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Geveze olur \- debug mesajlarını da gösterir.
+.TP 
+\fB[ \-l\fP \fI<dil>\fP, \fB\-\-locale\fP=\fI<dil>\fP \fB]\fP
+Programın kullandığı dili belirler. \fI<dil>\fP parametresinin
+tanımlaması için \fBNOTLAR\fP bölümüne bakınız.
+.TP 
+.B_untranslated [ \-w\fR, \fB\-\-write\-config ]\fR
+Komut satırı seçeneklerini yapılandırma dosyasına yazıp çıkar
+.TP 
+\fB[ \-t\fP \fI<isim>\fP, \fB\-\-template\fP=\fI<isim>\fP \fB]\fP
+Adı \fI<isim>\fP olan şablonu yükler. Ayrıntılar için \fBTEMA DESTEĞİ\fP
+bölümüne bakınız.
+.TP 
+\fB[ \-s\fP \fI<port>\fP, \fB\-\-server\-port\fP=\fI<port>\fP \fB]\fP
+Web sunucusunun HTTP portu. Bu ağ tarayıcınızda kullanmanız gereken port
+numarasıdır (varsayılan: \fI4711\fP).
+.TP 
+.B_untranslated [ \-u ]\fR
+.br
+UPnP'yi etkinleştirir.
+.TP 
+\fB[ \-U\fP \fI<port>\fP, \fB\-\-upnp\-port\fP \fI<port>\fP \fB]\fP
+UPnP port numarası.
+.TP 
+.B_untranslated [ \-z\fR, \fB\-\-enable\-gzip ]\fR
+Bant genişliğinden tasarruf etmek için gzip sıkıştırmasını etkinleştirir.
+.TP 
+.B_untranslated [ \-Z\fR, \fB\-\-disable\-gzip ]\fR
+Gzip sıkıştırmasını devre dışı bırakır (bu varsayılan değerdir).
+.TP 
+\fB[ \-A\fP \fI<şifre>\fP, \fB\-\-admin\-pass\fP=\fI<şifre>\fP \fB]\fP
+Sunucuya tam erişim için şifre (parola).
+.TP 
+\fB[ \-G\fP \fI<şifre>\fP, \fB\-\-guest\-pass\fP=\fI<şifre>\fP \fB]\fP
+Web sunucusu için misafir şifresi.
+.TP 
+.B_untranslated [ \-a\fR, \fB\-\-allow\-guest ]\fR
+Misafir erişimini etkinleştirir.
+.TP 
+.B_untranslated [ \-d\fR, \fB\-\-deny\-guest ]\fR
+Misafir erişimine izin vermez (varsayılan değer).
+.TP 
+.B_untranslated [ \-L\fR, \fB\-\-load\-settings ]\fR
+web sunucusu ayarlarını aMule'den/aMule'e yükler/kaydeder. Bu amuleweb'in
+komut satırı ve yapılandırma dosyası ayarlarını görmezden gelmesine yol
+açar. Ayarlar kaydedilirken hiçbiri yapılandırma dosyasına yazılmaz, aMule'e
+yazılır. (Tabii ki bu sadece aMule'ün Ayarlar\->Uzak Denetiminde
+kurulabilen değerler için geçerlidir.)
+.TP 
+.B_untranslated [ \-\-no\-php ]\fR
+PHP yorumlayıcısını devre dışı bırakır (eskimiş)
+.TP 
+.B_untranslated [ \-N\fR, \fB\-\-no\-script\-cache ]\fR
+PHP sayfalarını her sorguda yeniden derler.
+.TP 
+\fB[ \-\-create\-config\-from\fP=\fI<yol>\fP \fB]\fP
+\fI<yol>\fPa dayalı yapılandırma dosyası yaratır ve çıkar. Yolun
+geçerli bir aMule dosyasına işaret etmesi gerekir.
+.TP 
+.B_untranslated [ \-\-help ]\fR
+Kısa bir kullanım açıklaması görüntüler.
+.TP 
+.B_untranslated [ \-\-version ]\fR
+Geçerli sürüm numarasını görüntüler.
+.TP 
+\fB[ \-\-amule\-config\-file\fP=\fI<yol>\fP \fB]\fP
+aMule yapılandırma dosyasına erişim yolu.  \fBDOĞRUDAN KULLANMAYIN!\fP aMule bu
+seçeneği amuleweb'i aMule ile başlatırken kullanır.  Bu seçenek diğer tüm
+komut satırı ve yapılandırma dosyası ayarlarının görmezden gelinmesine,
+ayarların verilen yapılandırma dosyasından okunmasına yol açar ve \fB\-q \-L\fP
+seçeneklerinin kullanılacağı anlamına da gelir.
+.SH NOTLAR
+.SS Yollar
+\fI<yol>\fP değeri alan  tüm seçenekler için eğer \fIyol\fP hiçbir dizin
+içermiyorsa (yani sadece bir dosya ismiyse) aMule yapılandırma dizini
+(\fI~/.aMule\fP) varsayılır.
+.SS Diller
+\fB\-l\fP seçeneği için \fI<dil>\fP parametresi şu biçimde kullanılmalıdır:
+\fIdil\fP[\fB_\fP\fIDİL\fP][\fB.\fP\fIkodlama\fP][\fB@\fP\fIniteleyici\fP] ki burada \fIdil\fP
+birinci dil, \fIDİL\fP lehçe/bölge, \fIkodlama\fP karakter setidir ve
+\fIniteleyici\fP kullanıcıya belli bir kategori içinde belli yerelleştirme
+verileri kullanma olanağı sağlar.
+
+Örnek olarak, aşağıdaki dizeler geçerlidir:
+.RS
+.RB_untranslated de
+.br
+.RB_untranslated de_DE
+.br
+.RB_untranslated de_DE.iso88591
+.br
+.RB_untranslated de_DE@euro
+.br
+.RB_untranslated de_DE.iso88591@euro
+.RE
+
+Yukarıdaki tüm dizeler geçerlidir ancak \fIkodlama\fP ve \fIniteleyici\fP henüz
+kullanılmamaktadır.
+
+Yukarıdakilere ek olarak dil isimlerini İngilizce olarak belirtebilirsiniz \-
+yani \fB\-l german\fP ile \fB\-l de_DE\fP eşdeğerdir ve ikisi de geçerlidir.
+
+Ne komut satırında ne de yapılandırma dosyasında hiçbir dil belirtilmediği
+zaman sistemin varsayılan dili kullanılacaktır.
+.SH "TEMA DESTEĞİ"
+\fBamuleweb\fP bilgileri çeşitli temalarda görüntüleyebilir. Bu temalara şablon
+adı verilir ve amuleweb'in belli bir şablonu yüklemesini \fB\-t\fP komut satırı
+seçeneği ile sağlayabilirsiniz. Şablonlar iki konumda aranır: önce
+\fI~/.aMule/webserver/\fP konumunda, sonra da, kurulum \-\-prefix=/usr ile
+yapıldıysa \fI/usr/share/amule/webserver/\fP konumunda.
+.PP
+Her şablonun şablon isminin alt dizininde bulunması gerekir ve bu dizinin
+şablonun ihtiyaç duyduğu tüm dosyaları bulundurması şarttır.
+.SH DOSYALAR
+~/.aMule/remote.conf
+.br
+~/.aMule/webserver/
+.br
+\fI$(pkgdatadir)\fP/webserver/
+.SH ÖRNEK
+Tipik olarak amuleweb ilk defada şu şekilde başlayacaktır:
+.PP
+\fBamuleweb\fP \fB\-h\fP \fIhostismi\fP \fB\-p\fP \fIDBport\fP \fB\-P\fP \fIDBşifresi\fP \fB\-s\fP
+\fIHTTPport\fP \fB\-A\fP \fIAdminŞifresi\fP \fB\-w\fP
+.PP
+ya da
+.PP
+\fBamuleweb\fP \fB\-\-create\-config\-from\fP=\fI/home/kullanıcıadı/.aMule/amule.conf\fP
+.PP
+Ayarları \fI$HOME/.aMule/remote.conf\fP dosyasına kayıt eder ve daha sonra
+sadece şunu girmeniz yeterli olacaktır:
+.PP
+.B_untranslated amuleweb
+.PP
+Tabii ki ilk örnek satırında daha az ya da fazla seçenek belirtebilirsiniz,
+hatta onu tamamen görmezden gelebilirsiniz.
+.SH GERİBİLDİRİM
+Hataları bildirmek için forumumuzu (\fIhttp://forum.amule.org/\fP) ya da hata
+takipçimizi (\fIhttp://bugs.amule.org/\fP) kullanınız. Hataları bildirmek için
+e\-mail ve e\-mail listemizi kullanmamanızı ve geliştiricilerden birine
+doğrudan bildirmemenizi rica ederiz.
+.SH "TELİF HAKKI"
+aMule ve ilgili tüm yardımcı araçları GNU Genel Kamu Lisansı çerçevesinde
+dağıtılmaktadır.
+.SH "İLGİLİ BELGELER"
+.B_untranslated amule\fR(1), \fBamulecmd\fR(1)
+.SH YAZAN
+Bu kılavuz sayfası Vollstrecker <amule@vollstreckernet.de>
+tarafından yazılmıştır.

aMule-2.2.6.tar.bz2/docs/man/ed2k.1 -> aMule-2.3.1.tar.bz2/docs/man/ed2k.1 Changed

@@ -1,32 +1,62 @@
-.TH ED2K "1" "September 2009" "aMule ED2k link parser v1.4.1" "aMule utilities"
+.TH ED2K "1" "November 2011" "aMule eD2k link parser v1.5.1" "aMule utilities"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NAME
-ed2k \- aMule ED2k link parser
+ed2k \- aMule eD2k link parser
 .SH SYNOPSIS
-.B ed2k
-.I <ED2k_link>
-.PP
-.B ed2k
-.RB [ \-\-help ]
-.RB [ \-\-config\-dir, \-c ]
-.RB [ \-\-emulecollection, \-e ]
-.RB [ \-\-version ]
+.B_untranslated ed2k
+.RB [ \-c " " \fI<path> ]
+.RB [ \-t " " \fI<num> ]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-l ]
+.I <eD2k-link>
+
+.B_untranslated ed2k
+.RB_untranslated [ \-h ]
+
+.B_untranslated ed2k
+.RB_untranslated [ \-v ]
 .SH DESCRIPTION
-aMule ED2k link parser v1.4.1.
-Sends the given \fI<ED2k_link>\fR to aMule, i.e. writes it to the file ~/.aMule/ED2KLinks, which will be checked by aMule every second for links.
-\fBed2k\fR accepts file, server and serverlist links.
-.SS "Usage:"
+Sends the given \fI<eD2k-link>\fR to aMule, i.e. writes it to the file ~/.aMule/ED2KLinks, which will be checked by aMule every second for links.
 .TP
-\fB\-\-help\fR
-Prints a short usage description.
+\fB[ \-c\fR \fI<path>\fR, \fB\-\-config\-dir\fR=\fI<path>\fR \fB]\fR
+Read config from \fI<path>\fR instead of home
 .TP
-\fB\-c\fR, \fB\-\-config\-dir\fR=\fI<dir>\fR 
-Specifies the aMule configuration directory. This must be writeable by the user running \fBed2k\fR.
+\fB[ \-t\fR, \fB\-\-category\fR=\fI<num>\fR \fB]\fR
+Set category for passed eD2k links to \fI<num>\fR
 .TP
-\fB\-e\fR, \fB\-\-emulecollection \fI<file>\fR
-Loads all links of the emulecollection passed as parameter.
+.B_untranslated [ \-e\fR, \fB\-\-emulecollection ]\fR
+Loads all link found in the emulecollection given as \fI<ed2k-link>\fR
 .TP
-\fB\-\-version\fR
+.B_untranslated [ \-l\fR, \fB\-\-list ]\fR
+Lists all link found in the emulecollection given as \fI<ed2k-link>\fR
+.TP
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Prints a short usage description.
+.TP
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
 Displays the current version number.
+.TP
+\fB[ eD2k-link ]\fR
+Adds an eD2k-link to the core.
+.PP
+The eD2k link to be added can be:
+.RS 3
+.IP \(bu 2
+a file link (ed2k://|file|...), it will be added to the download queue;
+.IP \(bu 2
+a server link (ed2k://|server|...), it will be added to the server list;
+.IP \(bu 2
+a serverlist link, in which case all servers in the list will be added to the server list;
+.IP \(bu 2
+a magnet link;
+.IP \(bu 2
+an emulecollection file.
+.RE
+
+\fBThe order in which you give the parameters is important.\fR
+You can give more than one link, and every link can have it's own params.
+For example \fBed2k <link1> -t2 <link2>\fR will download \fI<link1>\fR in standard category and \fI<link2>\fR in category 2.
 .SH FILES
 ~/.aMule/ED2KLinks
 .SH REPORTING BUGS
@@ -35,4 +65,6 @@
 .SH COPYRIGHT
 aMule and all of its related utilities are distributed under the GNU General Public License.
 .SH SEE ALSO
-\fBamule\fR(1)
+.B_untranslated amule\fR(1)
+.SH AUTHOR
+This manpage was written by Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/ed2k.de.1 -> aMule-2.3.1.tar.bz2/docs/man/ed2k.de.1 Changed

@@ -3,38 +3,86 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH ED2K 1 "Januar 2007" "aMule ED2k link parser v1.2.0" "aMule Hilfsprogramme"
+.TH ED2K 1 "November 2011" "aMule eD2k Verweis parser v1.5.1" "aMule Hilfsprogramme"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NAME
-ed2k \- aMule ED2k link parser
+ed2k \- aMule ED2k Verweis\-Parser
 .SH SYNTAX
-\fBed2k\fP \fI<ED2k\-Link>\fP
-.PP
-\fBed2k\fP [\fB\-\-help\fP] [\fB\-\-config\-dir,\fP\-c\fB]\fP [\fB\-\-version\fP]
+.B_untranslated ed2k
+[\fB\-c\fP \fI<Pfad>\fP] [\fB\-t\fP \fI<Num>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-l ]
+\fI<eD2k\-link>\fP
+
+.B_untranslated ed2k
+.RB_untranslated [ \-h ]
+
+.B_untranslated ed2k
+.RB_untranslated [ \-v ]
 .SH BESCHREIBUNG
-aMule ED2k link parser v1.1.0. Sendet den übergebenen \fI<ED2k\-Link>\fP
-an aMule, z.B. schreibt ihn in die Datei ~/.aMule/ED2KLinks, welche von
-aMule auf neue Links überprüft wird.  \fBed2k\fP akzeptiert Datei\-, Server\- und
-Serverlistenlinks.
-.SS Nutzung:
+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.
+.TP 
+\fB[ \-c\fP \fI<Pfad>\fP, \fB\-\-config\-dir\fP=\fI<Pfad>\fP \fB]\fP
+Liest die Konfiguration <Pfad> anstelle des Home.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<Num>\fP \fB]\fP
+Setzt die Kategorie für den übergebenen eD2k Verweis \fI<Num>\fP
 .TP 
-\fB\-\-help\fP
-Gibt eine kurze Beschreibung aus.
+.B_untranslated [ \-e\fR, \fB\-\-emulecollection ]\fR
+Lädt alle Verweise aus der als \fI<eD2k_Verweis>\fP übergebenen
+emulecollection.
 .TP 
-\fB\-c\fP, \fB\-\-config\-dir\fP=\fI<Pfad>\fP 
-Gibt das aMule Konfigurationsverzeichnis an. Dieses muss durch den Nutzer
-der \fBed2k\fP aufruft Beschreibbar sein.
+.B_untranslated [ \-l\fR, \fB\-\-list ]\fR
+Listet alle Verweise in der emulecollection die als
+\fI<eD2k_Verweis>\fP übergeben wurde auf.
 .TP 
-\fB\-\-version\fP
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Gibt eine kurze Nutzungsbeschreibung aus.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
 Zeigt die derzeitige Versionsnummer an.
+.TP 
+\fB[ eD2k\-link ]\fP
+Fügt einen eD2k\-Verweis zur Downloadliste hinzu.
+.PP
+Der eD2k\-Verweis darf enthalten:
+.RS 3
+.IP \(bu 2
+ein Link zu einer Datei (ed2k://|file|...), dieser wird Downloadliste
+hinzugefügt;
+.IP \(bu 2
+ein Link zu einem Server (ed2k://|server|...), dieser wird der Serverliste
+hinzugefügt;
+.IP \(bu 2
+ein Serverlisten\-Verweis, in diesem Fall werden alle Server dieser Liste der
+Serverliste hinzugefügt;
+.IP \(bu 2
+ein Magnetverweis;
+.IP \(bu 2
+eine emulecollection Datei.
+.RE
+
+\fBDie Reihenfolge in der du die Parameter angibst, ist entscheidend.\fP Du
+kannst mehr als einen Verweis übergeben und jeder Verweis kann seine eigenen
+Parameter haben.  Zum Beispiel \fBed2k <Verweis1> \-t2
+<Verweis2>\fP lädt \fI<Verweis1>\fP in der Standardkategorie und
+\fI<Verweis2>\fP in Kategorie 2 herunter.
 .SH DATEIEN
 ~/.aMule/ED2KLinks
 .SH "FEHLER MELDEN"
 Bitte meldet Fehler entweder in unserem Forum (\fIhttp://forum.amule.org/\fP),
 oder in unseren Bugtracker (\fIhttp://bugs.amule.org/\fP). Bitte meldet uns
-keine Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
+weder Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
 Teammitglieder.
 .SH COPYRIGHT
 aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU
 General Public License
 .SH "SIEHE AUCH"
-\fBamule\fP(1)
+.B_untranslated amule\fR(1)
+.SH VERFASSER
+Diese manpage wurde geschrieben von Vollstrecker
+<amule@vollstreckernet.de>
+
+Diese manpage wurde übersetzt von Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/ed2k.es.1 -> aMule-2.3.1.tar.bz2/docs/man/ed2k.es.1 Changed

@@ -1,30 +1,83 @@
-.TH ED2K "1" "Marzo 2005" "aMule ED2k link parser v1.1.0" "Utilidades de aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ED2K 1 "November 2011" "Analizador aMule de enlaces eD2k v1.5.1" "aMule utilidades"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOMBRE
-ed2k \- digeridor de enlaces eD2k a aMule
-.SH SINOPSYS
-.B ed2k
-.I <enlace_eD2k>
+ed2k \- analizador aMule de enlaces eD2k
+.SH SINOPSIS
+.B_untranslated ed2k
+[\fB\-c\fP \fI<path>\fP] [\fB\-t\fP \fI<num>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-l ]
+\fI<eD2k\-link>\fP
+
+.B_untranslated ed2k
+.RB_untranslated [ \-h ]
+
+.B_untranslated ed2k
+.RB_untranslated [ \-v ]
+.SH DESCRIPCIÃN
+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.
+.TP 
+\fB[ \-c\fP \fI<path>\fP, \fB\-\-config\-dir\fP=\fI<path>\fP \fB]\fP
+Leer configuraciÃ³n desde \fI<path>\fP en lugar de home
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<num>\fP \fB]\fP
+Fijar categorÃa para enlace eD2k pasado a \fI<num>\fP
+.TP 
+.B_untranslated [ \-e\fR, \fB\-\-emulecollection ]\fR
+Loads all link found in the emulecollection given as \fI<ed2k\-link>\fP
+.TP 
+.B_untranslated [ \-l\fR, \fB\-\-list ]\fR
+Lists all link found in the emulecollection given as \fI<ed2k\-link>\fP
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Imprime una breve descripciÃ³n de uso.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Mostrar el nÃºmero de la versiÃ³n actual.
+.TP 
+\fB[ eD2k\-link ]\fP
+AÃ±adir un enlace eD2k al nÃºcleo.
 .PP
-.B ed2k
-.RB [ \-\-help ]
-.RB [ \-\-version ]
-.SH DESCRIPCIÓN
-aMule ED2k link parser v1.1.0.
-Envía el enlace \fI<enlace_eD2k>\fR a aMule, es decir, lo añade al archivo ~/.aMule/ED2KLinks, el cual será leido por aMule en busca de nuevas descargas.
-\fBed2k\fR acepta enlaces referidos a archivos, servidores y listas de servidores.
-.SS "Uso:"
-.TP
-\fB\-\-help\fR
-Muestra esta ayuda.
-.TP
-\fB\-\-version\fR
-Muestra la versión del programa.
+El enlace eD2k para ser aÃ±adido puede ser:
+.RS 3
+.IP \(bu 2
+un enlace de archivo (ed2k://|archivo|...), serÃ¡ aÃ±Ã¡dido a la cola de
+descarga.
+.IP \(bu 2
+un enlace de servidor (ed2k://|servidor|...), serÃ¡ aÃ±Ã¡dido a la cola de
+servidores.
+.IP \(bu 2
+un enlace de lista de servidores, en cuyo caso todos los servidores de la
+lista serÃ¡n aÃ±adidos a la lista de servidores.
+.IP \(bu 2
+Un enlace magnet;
+.IP \(bu 2
+Un archivo emulecollection.
+.RE
+
+\fBThe order in which you give the parameters is important.\fP You can give
+more than one link, and every link can have it's own params.  For example
+\fBed2k <link1> \-t2 <link2>\fP will download \fI<link1>\fP
+in standard category and \fI<link2>\fP in category 2.
 .SH ARCHIVOS
 ~/.aMule/ED2KLinks
-.SH BUGS
-Si descubre bugs, por favor comuníquelos en (\fIhttp://forum.amule.org/\fR), o en nuestro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Por favor, no comunique bugs por e-mail, ni a nuestro maillist ni directamente a ningún miembro del equipo de aMule.
+.SH "INFORMANDO ERRORES"
+Por favor informa de fallos ya sea en nuestro foro
+(\fIhttp://forum.amule.org/\fP), o en nuestro bugtracker
+(\fIhttp://bugs.amule.org/\fP). Por favor no informe de fallos por correo, ni
+en nuestras listas, ni directamente al correo de algun miembro del equipo.
 .SH COPYRIGHT
-aMule, y todas las utilidades que con el vienen, se distribuyen bajo la licencia GPL.
-.SH VER
-\fBamule\fR(1)
+aMule y todas las demÃ¡s utilidades relacionadas son distribuidas bajo la GNU
+General Public License.
+.SH "VEASE TAMBIEN"
+.B_untranslated amule\fR(1)
+.SH AUTOR
+Esta pÃ¡gina de manualfue escrita por Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/ed2k.fr.1 -> aMule-2.3.1.tar.bz2/docs/man/ed2k.fr.1 Changed

@@ -1,31 +1,87 @@
-.TH ED2K "1" "Mars 2005" "Prise en charge des liens ED2k d'aMule v1.1.0" "Outil pour aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ED2K 1 "Novembre 2011" "aMule eD2k link parser v1.5.1" "Outils d'aMule"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOM
-ed2k \- prise en charge des liens ED2K d'aMule
+ed2k \- analyseur lien eD2k pour aMule
 .SH SYNOPSIS
-.B ed2k
-.I <lien_ED2k>
-.PP
-.B ed2k
-.RB [ \-\-help ]
-.RB [ \-\-version ]
+.B_untranslated ed2k
+[\fB\-c\fP \fI<chemin>\fP] [\fB\-t\fP \fI<num>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-l ]
+\fI<lien eD2k>\fP
+
+.B_untranslated ed2k
+.RB_untranslated [ \-h ]
+
+.B_untranslated ed2k
+.RB_untranslated [ \-v ]
 .SH DESCRIPTION
-Envoi le lien ED2K \fI<lien_ED2k>\fR à aMule, i.e. écrit celui\-ci dans ~/.aMule/ED2KLinks, qui est examiné par aMule chaque seconde en quête de nouveaux liens.
-\fBed2k\fR accepte en lien un fichier, un serveur et une liste de serveurs.
-.SS "Usage:"
-.TP
-\fB\-\-help\fR
-Afficher l'aide d'utilisation.
-.TP
-\fB\-\-version\fR
-Afficher les informations sur la version courante.
+Envoie le \fI<lien\-eD2k>\fP Ã  aMule, c'est Ã  dire qu'il l'Ã©crit dans le
+fichier  ~/.aMule/ED2KLinks, qui sera vÃ©rifiÃ© par aMule chaque seconde pour
+les liens.
+.TP 
+\fB[ \-c\fP \fI<chemin>\fP, \fB\-\-config\-dir\fP=\fI<chemin>\fP \fB]\fP
+Utiliser le fichier de config \fI<chemin>\fP Ã  la place de celui par
+dÃ©faut
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<num>\fP \fB]\fP
+DÃ©finir la catÃ©gorie pour les liens eD2k passÃ© Ã   \fI<num>\fP
+.TP 
+.B_untranslated [ \-e\fR, \fB\-\-emulecollection ]\fR
+Charge tous les liens trouvÃ©s dans le emulecollection donnÃ© dans
+\fI<lien\-eD2k>\fP
+.TP 
+.B_untranslated [ \-l\fR, \fB\-\-list ]\fR
+Liste tous les liens trouvÃ©s dans le emulecollection donnÃ© dans
+\fI<lien\-eD2k>\fP
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Afficher une court description d'utilisation.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Affiche le numÃ©ro de la version actuelle.
+.TP 
+\fB[ lien eD2k ]\fP
+Ajoute un lien eD2k au noyau.
+.PP
+Le lien eD2k Ã  ajouter peut Ãªtre :
+.RS 3
+.IP \(bu 2
+un lien fichier (ed2k://|fichier|â¦), il sera ajoutÃ© Ã  la file de
+tÃ©lÃ©chargement;
+.IP \(bu 2
+un lien serveur (ed2k://|serveur|â¦), il sera ajoutÃ© Ã  la liste des serveurs;
+.IP \(bu 2
+un lien de liste de serveurs, dans ce cas tous les serveurs dans la liste
+seront ajoutÃ©s Ã  la liste des serveurs;
+.IP \(bu 2
+un lien magnÃ©tique;
+.IP \(bu 2
+un fichier de collection emule.
+.RE
+
+\fBLe ordre dans lequel vous donnez les paramÃ¨tres est important.\fP Vous
+pouvez donner plus d'un lien, et chaque lien peut avoir ses propres
+paramÃ¨tres. Par exemple, \fBed2k <lien1> \-t2 <lien2>\fP
+tÃ©lÃ©chargera \fI<lien1>\fP dans la catÃ©gorie standard et
+\fI<lien2>\fP dans la catÃ©gorie 2.
 .SH FICHIERS
 ~/.aMule/ED2KLinks
-.SH SIGNALEMENT DES BUGS
-Reportez les bugs sur notre forum (\fIhttp://forum.amule.org/\fR), ou dans notre bugtracker (\fIhttp://bugs.amule.org/\fR).
-N'utilisez ni un e-mail, ni notre liste de diffusion ni ne reportez directement un bug à un membre de notre equipe.
+.SH "RAPPORTER DES BOGUES"
+Veuillez rapporter les bogues sur notre forum (\fIhttp://forum.amule.org/\fP),
+ou sur notre bugtracker (\fIhttp://bugs.amule.org/\fP).  Veuillez ne pas
+rapporter les bogues par e\-mail, sur notre liste de diffusion ou directement
+Ã  n'importe quel membre  de l'Ã©quipe.
 .SH COPYRIGHT
-aMule et tous les utilitaires associés sont distribués sous licence GNU General Public License.
-.SH VOIR AUSSI
-\fBamule\fR(1)
-.SH TRADUCTION
-ThePolish, 2005
+aMule et tout ses outils sont distribuÃ©s sous la licence GNU General Public
+License.
+.SH "VOIR AUSSI"
+.B_untranslated amule\fR(1)
+.SH AUTEUR
+Cette manpage a Ã©tÃ© Ã©crite par Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/docs/man/ed2k.hu.1 -> aMule-2.3.1.tar.bz2/docs/man/ed2k.hu.1 Changed

@@ -1,32 +1,86 @@
-.TH ED2K "1" "2005 március" "aMule ED2k link parser v1.1.0" "aMule segédprogramok"
-.SH NÉV
-ed2k \- aMule ED2k hivatkozás feldolgozó
-.SH ÁTTEKINTÉS
-.B ed2k
-.I <ED2k_hivatkozás>
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ED2K 1 "2011. november" "aMule eD2k hivatkozÃ¡s kezelÅ v1.5.1" "aMule segÃ©dprogramok"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH NÃV
+ed2k \- Az aMule eD2k hivatkozÃ¡s kezelÅ.
+.SH ÃTTEKINTÃS
+.B_untranslated ed2k
+[\fB\-c\fP \fI<Ãºtvonal>\fP] [\fB\-t\fP \fI<szÃ¡m>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-l ]
+\fI<eD2k\-hivatkozÃ¡s>\fP
+
+.B_untranslated ed2k
+.RB_untranslated [ \-h ]
+
+.B_untranslated ed2k
+.RB_untranslated [ \-v ]
+.SH LEÃRÃS
+ElkÃ¼ldi a megadott \fI<eD2k hivatkozÃ¡s>\fP\-t az aMule\-nek, azaz beÃrja
+a ~/.aMule/ED2KLinks fÃ¡jlba, amit az aMule mÃ¡sodpercenkÃ©nt megnÃ©z,
+hivatkozÃ¡sokat keresve.
+.TP 
+\fB[ \-c\fP \fI<Ãºtvonal>\fP, \fB\-\-config\-dir\fP=\fI<Ãºtvonal>\fP \fB]\fP
+A beÃ¡llÃtÃ¡sokat az \fI<Ãºtvonal>\fP\-bÃ³l olvassa az alapÃ©rtelmezett
+helyett.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<szÃ¡m>\fP \fB]\fP
+A megadott eD2k hivatkozÃ¡st a \fI<szÃ¡m>\fP\-adik kategÃ³riÃ¡ba tÃ¶lti.
+.TP 
+.B_untranslated [ \-e\fR, \fB\-\-emulecollection ]\fR
+A megadott gyÅ±jtemÃ©ny Ã¶sszes fÃ¡jljÃ¡t letÃ¶lti.
+.TP 
+.B_untranslated [ \-l\fR, \fB\-\-list ]\fR
+KilistÃ¡zza a megadott gyÅ±jtmÃ©ny Ã¶sszes fÃ¡jljÃ¡t.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Egy rÃ¶vid hasznÃ¡lati leÃrÃ¡st jelenÃt meg.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+MegjelenÃti a verziÃ³szÃ¡mot.
+.TP 
+\fB[ eD2k\-hivatkozÃ¡s ]\fP
+eD2k hivatkozÃ¡s letÃ¶ltÃ©se.
 .PP
-.B ed2k
-.RB [ \-\-help ]
-.RB [ \-\-version ]
-.SH LEÍRÁS
-aMule ED2k hivatkozás feldolgozó v1.1.0.
-Elküldi a megadott \fI<ED2k_hivatkozás>\fR-t az aMule-nak, azaz a \fI~/.aMule/ED2KLinks\fR fájlba írja, amelyet az aMule minden másodpercben ellenõriz.
-Az \fBed2k\fR program elfogad fájl, szerver és szerver-lista hivatkozásokat.
-.SS "Használat:"
-.TP
-\fB\-\-help\fR
-Kiírja ezt a súgót.
-.TP
-\fB\-\-version\fR
-Kiírja a verzió információt.
-.SH FÁJLOK
+Az eD2k hivatkozÃ¡s a kÃ¶vetkezÅ lehet:
+.RS 3
+.IP \(bu 2
+egy fÃ¡jl hivatkozÃ¡s (ed2k://|file|...), ez a letÃ¶ltÃ©si sorhoz lesz
+hozzÃ¡adva;
+.IP \(bu 2
+egy kiszolgÃ¡lÃ³ hivatkozÃ¡s (ed2k://|server|...), ez a kiszolgÃ¡lÃ³\-listÃ¡hoz
+lesz hozzÃ¡adva;
+.IP \(bu 2
+egy kiszolgÃ¡lÃ³\-lista hivatkozÃ¡s, mely esetben a listÃ¡ban szereplÅ Ã¶sszes
+kiszolgÃ¡lÃ³ a kiszolgÃ¡lÃ³\-listÃ¡hoz adÃ³dik;
+.IP \(bu 2
+egy magnet hivatkozÃ¡s;
+.IP \(bu 2
+egy emulecollection (gyÅ±jtemÃ©ny) fÃ¡jl.
+.RE
+
+\fBA paramÃ©terek sorrendje szÃ¡mÃt.\fP Megadhatsz egynÃ©l tÃ¶bb hivatkozÃ¡st,
+mindegyiket a sajÃ¡t paramÃ©tereivel. PÃ©ldÃ¡ul az \fBed2k <link1> \-t2
+<link2>\fP parancs a \fI<link1>\fP\-et az alapÃ©rtelmezett, mÃg a
+\fI<link2>\fP\-t a 2. kategÃ³riÃ¡ba tÃ¶lti.
+.SH FÃJLOK
 ~/.aMule/ED2KLinks
-.SH HIBÁK JELENTÉSE
-A hibákat kérjük vagy a fórumon (\fIhttp://forum.amule.org/\fR), vagy a hibakövetõben (\fIhttp://bugs.amule.org/\fR) jelentsék.
-Hibákról kérjük ne írjanak levelet (e-mail-t) se a levelzési listára, se közvetlenül valamelyik fejlesztõnek.
+.SH "HIBÃK JELENTÃSE"
+A hibÃ¡kat kÃ©rjÃ¼k vagy a fÃ³rumon (\fIhttp://forum.amule.org/\fP), vagy a
+hibakÃ¶vetÅben (\fIhttp://bugs.amule.org/\fP) jelentsÃ©k. HibÃ¡krÃ³l kÃ©rjÃ¼k ne
+Ãrjanak levelet (e\-mail\-t) se a levelezÃ©si listÃ¡ra, se kÃ¶zvetlenÃ¼l
+valamelyik fejlesztÅnek.
 .SH COPYRIGHT
-Az aMule és az összes hozzá tartozó segédprogram a GNU General Public Licence védelme alatt áll.
-.SH LÁSD MÉG
-\fBamule\fR(1)
-.SH MAGYAR FORDÍTÁS
-Dévai Tamás <gonosztopi@amule.org>
+Az aMule Ã©s az Ã¶sszes hozzÃ¡ tartozÃ³ segÃ©dprogram a GNU General Public
+License vÃ©delme alatt Ã¡ll.
+.SH "LÃSD MÃG"
+.B_untranslated amule\fR(1)
+.SH SZERZÅ
+Ezt a kÃ©zikÃ¶nyv lapot Vollstrecker <amule@vollstreckernet.de> Ãrta.
+.SH MAGYAR FORDÃTÃS
+DÃ©vai TamÃ¡s <gonosztopi@amule.org>

aMule-2.2.6.tar.bz2/docs/man/ed2k.it.1 -> aMule-2.3.1.tar.bz2/docs/man/ed2k.it.1 Changed

@@ -1,38 +1,90 @@
-.TH ED2K "1" "Settembre 2009" "aMule ED2k link parser v1.4.1" "aMule utilities"
-.SH NAME
-ed2k \- aMule ED2k link parser
-.SH SINOPSI
-.B ed2k
-.I <ED2k_link>
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ED2K 1 "Novembre 2011" "Analizzatore di collegamenti eD2k per aMule v1.5.1" "Utilità di aMule"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH NOME
+ed2k \- Analizzatore di collegamenti eD2k per aMule
+.SH SINTASSI
+.B_untranslated ed2k
+[\fB\-c\fP \fI<percorso>\fP] [\fB\-t\fP \fI<numero>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-l ]
+\fI<collegamento\-eD2k>\fP
+
+.B_untranslated ed2k
+.RB_untranslated [ \-h ]
+
+.B_untranslated ed2k
+.RB_untranslated [ \-v ]
+.SH DESCRIZIONE
+Invia il \fI<collegamento\-eD2k>\fP ad aMule, cioè lo scrive nel file
+~/.aMule/ED2KLinks, che sarà controllato da aMule ogni secondo per nuovi
+collegamenti.
+.TP 
+\fB[ \-c\fP \fI<percorso>\fP, \fB\-\-config\-dir\fP=\fI<percorso>\fP \fB]\fP
+Legge la configurazione dal \fI<percorso>\fP invece che dalla directory
+dell'utente.
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<numero>\fP \fB]\fP
+Imposta la categoria per i collegamenti eD2k ricevuti a \fI<numero>\fP
+.TP 
+.B_untranslated [ \-e\fR, \fB\-\-emulecollection ]\fR
+Carica tutti i collegamenti trovati nel file emulecollection fornito come
+\fI<collegamento\-ed2k>\fP
+.TP 
+.B_untranslated [ \-l\fR, \fB\-\-list ]\fR
+Elenca tutti i collegamenti trovati nel file emulecollection fornito come
+\fI<collegamento\-ed2k>\fP
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Visualizza una breve descrizione dell'utilizzo.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Visualizza il numero di versione corrente.
+.TP 
+\fB[ collegamento\-eD2k ]\fP
+Aggiunge un collegamento eD2k.
 .PP
-.B ed2k
-.RB [ \-\-help ]
-.RB [ \-\-config\-dir, \-c ]
-.RB [ \-\-emulecollection, \-e ]
-.RB [ \-\-version ]
-.SH DESCRIPTION
-aMule ED2k link parser v1.4.1.
-Invia il \fI<collegamento_ED2k>\fR fornito ad aMule, per esempio lo scrive nel file ~/.aMule/ED2KLinks, che sarà controllato da aMule ogni secondo per verificare la presenza di collegamenti.
-\fBed2k\fR accetta collegamenti file, server e di elenchi server.
-.SS "Utilizzo:"
-.TP
-\fB\-\-help\fR
-Prints a short usage description.
-.TP
-\fB\-c\fR, \fB\-\-config\-dir\fR=\fI<dir>\fR 
-Specifies the aMule configuration directory. This must be writeable by the user running \fBed2k\fR.
-.TP
-\fB\-e\fR, \fB\-\-emulecollection \fI<file>\fR
-Carica tutti i collegamenti della collezione di emule passati come parametro.
-.TP
-\fB\-\-version\fR
-Mostra il numero di versione corrente.
+Il collegamento eD2k da aggiungere può essere:
+.RS 3
+.IP \(bu 2
+un collegamento a un file (ed2k://|file|...), sarà aggiunto alla coda di
+download;
+.IP \(bu 2
+un collegamento a un server (ed2k://|server|...), sarà aggiunto alla lista
+dei server;
+.IP \(bu 2
+un collegamento a una lista di server, nel cui caso tutti i server inclusi
+nella lista verranno aggiunti alla lista dei server;
+.IP \(bu 2
+un collegamento magnet;
+.IP \(bu 2
+un file emulecollection.
+.RE
+
+\fBL'ordine con cui fornisci i parametri è importante.\fP Si può fornire più di
+un collegamento, e ogni collegamento può avere propri parametri. Per esempio
+\fBed2k <collegamento1> \-t2 <collegamento2>\fP eseguirà il
+download di \fI<collegamento1>\fP in categoria standard e
+\fI<collegamento2>\fP in categoria 2.
 .SH FILE
 ~/.aMule/ED2KLinks
-.SH SEGNALARE BUG
-Per piacere segnala i bug sul nostro forum (\fIhttp://forum.amule.org/\fR), oppure nel nostro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Per piacere non segnalare bug tramite e-mail, tramite la nostra mailing list e neppure direttamente a qualsiasi membro della squadra.
+.SH "SEGNALARE I BUG"
+Per favore segnalare i bug nel nostro forum (\fIhttp://forum.amule.org/\fP) o
+nel nostro bugtracker (\fIhttp://bugs.amule.org/\fP). Per favore non segnalare
+i bug via posta elettronica, né nella nostra mailing list né direttamente a
+qualunque membro del gruppo.
 .SH COPYRIGHT
-aMule e tutte le sue utilità correlate sono distribuite sotto la GNU General Public License.
-.SH CONSULTA ANCHE
-\fBamule\fR(1)
+aMule e tutti i programmi di utilità correlati sono distribuiti in accordo
+alla GNU General Public License.
+.SH "VEDI ANCHE"
+.B_untranslated amule\fR(1)
+.SH AUTORE
+Questa pagina del manuale è stata scritta da Vollstrecker
+<amule@vollstreckernet.de>
+.SH TRADUZIONE ITALIANA
+Stefano Corti <iz0bbz@libero.it>

aMule-2.3.1.tar.bz2/docs/man/ed2k.ru.1 Added

@@ -0,0 +1,83 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ED2K 1 "November 2011" "aMule парсер ссылок eD2k v1.5.1" "утилиты aMule"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH ИМЯ
+ed2k \- aMule парсер ссылок eD2k
+.SH ОБЗОР
+.B_untranslated ed2k
+[\fB\-c\fP \fI<путь>\fP] [\fB\-t\fP \fI<число>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-l ]
+\fI<eD2k\-ссылка>\fP
+
+.B_untranslated ed2k
+.RB_untranslated [ \-h ]
+
+.B_untranslated ed2k
+.RB_untranslated [ \-v ]
+.SH ОПИСАНИЕ
+Пысылает указанную \fI<eD2k\-ссылку>\fP в aMule, т.е. пишет ее в файл
+~/.aMule/ED2KLinks, который проверяется каждую секунду.
+.TP 
+\fB[ \-c\fP \fI<путь>\fP, \fB\-\-config\-dir\fP=\fI<путь>\fP \fB]\fP
+Прочитать конфигурацию из места, указанного в \fI<пути>\fP, вместо
+домашнего каталога
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<номер>\fP \fB]\fP
+Указать \fI<номер>\fP категории для eD2k ссылок.
+.TP 
+.B_untranslated [ \-e\fR, \fB\-\-emulecollection ]\fR
+Загружает все ссылки из emulecollection как \fI<ed2k\-ссылки>\fP
+.TP 
+.B_untranslated [ \-l\fR, \fB\-\-list ]\fR
+Перечисляет все ссылки из emulecollection как \fI<ed2k\-ссылки>\fP
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Выводит короткую помощь по использованию.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Выводит информацию о версии.
+.TP 
+\fB[ eD2k\-ссылка ]\fP
+Передает eD2k\-ссылку в ядро.
+.PP
+Добавляемая eD2k\-ссылка может быть:
+.RS 3
+.IP \(bu 2
+файловая ссылка (ed2k://|file|...), она будет добавлена в очередь закачки;
+.IP \(bu 2
+серверная ссылка (ed2k://|server|...), она будет добавлена в список
+серверов;
+.IP \(bu 2
+ссылка на список серверов, тогда все сервера из списка будут добавлены в
+список серверов;
+.IP \(bu 2
+magnet\-ссылка;
+.IP \(bu 2
+файл emulecollection.
+.RE
+
+\fBПорядок параметров важен.\fP Вы можете указать более одной ссылки, и каждая
+ссылка может иметь свои собственные параметры. Например \fBed2k
+<ссылка1> \-t2 <ссылка2>\fP загрузит \fI<ссылку1>\fP в
+стандартную категорию и \fI<ссылку2>\fP в категорию 2.
+.SH ФАЙЛЫ
+~/.aMule/ED2KLinks
+.SH "СООБЩЕНИЕ ОБ ОШИБКАХ"
+Пожалуйста, сообщайте об ошибках либо на нашем форуме
+(\fIhttp://forum.amule.org/\fP), либо в багтрекере
+(\fIhttp://bugs.amule.org/\fP). Пожалуйста, не сообщайте об ошбках по
+электронной почте, по нашим спискам рассылки, или напрямую участникам.
+.SH "АВТОРСКИЕ ПРАВА"
+aMule и все прилагающиеся инструменты распространаются под Открытым
+Лицензионным Соглашением GNU (GNU GPL).
+.SH "СМ. ТАКЖЕ"
+.B_untranslated amule\fR(1)
+.SH АВТОРЫ
+Автор страницы помощи: Vollstrecker <amule@vollstreckernet.de>,
+перевод: Radist Morse <radist.morse@gmail.com>

aMule-2.3.1.tar.bz2/docs/man/ed2k.tr.1 Added

@@ -0,0 +1,85 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ED2K 1 "Kasım 2011" "aMule eD2k bağlantı çözümleyicisi v1.5.1" "aMule yardımcı araçları"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH İSİM
+ed2k \- aMule eD2k bağlantı çözümleyicisi
+.SH KULLANIM
+.B_untranslated ed2k
+[\fB\-c\fP \fI<yol>\fP] [\fB\-t\fP \fI<sayı>\fP]
+.RB_untranslated [ \-e ]
+.RB_untranslated [ \-l ]
+\fI<eD2k\-bağlantısı>\fP
+
+.B_untranslated ed2k
+.RB_untranslated [ \-h ]
+
+.B_untranslated ed2k
+.RB_untranslated [ \-v ]
+.SH AÇIKLAMA
+Herhangi bir \fI<eD2k\-bağlantısını>\fP aMule'e gönderir, yani onu
+~/.aMule/ED2KLinks dosyasına yazar ki bu dosya aMule tarafından her saniye
+bağlantılar için sorgulanır.
+.TP 
+\fB[ \-c\fP \fI<yol>\fP, \fB\-\-config\-dir\fP=\fI<yol>\fP \fB]\fP
+Yapılandırmayı home yerine \fI<yol>\fPdan oku
+.TP 
+\fB[ \-t\fP, \fB\-\-category\fP=\fI<sayı>\fP \fB]\fP
+\fI<sayı>\fPya gönderilen eD2k bağlantılarının kategorilerini belirler.
+.TP 
+.B_untranslated [ \-e\fR, \fB\-\-emulecollection ]\fR
+Bir emule koleksiyonunda \fI<ed2k\-bağlantısı>\fP şeklinde bulunan tüm
+bağlantıları yükler
+.TP 
+.B_untranslated [ \-l\fR, \fB\-\-list ]\fR
+Bir emule koleksiyonunda \fI<ed2k\-bağlantısı>\fP şeklinde bulunan tüm
+bağlantıları listeler
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Kısa bir kullanım açıklaması görüntüler.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-version ]\fR
+Geçerli sürüm numarasını görüntüler.
+.TP 
+\fB[ eD2k\-bağlantısı ]\fP
+Çekirdeğe bir eD2k bağlantısı ekler.
+.PP
+Eklenecek eD2k bağlantısı şunlardan biri olabilir:
+.RS 3
+.IP \(bu 2
+bir dosya bağlantısı (ed2k://|file|...) ki indirmeler kuyruğuna eklenir;
+.IP \(bu 2
+bir sunucu bağlantısı (ed2k://|server|...) ki sunucu listesine eklenir;
+.IP \(bu 2
+bir sunucu listesi bağlantısı, bu durumda listedeki tüm sunucular sunucu
+listesine eklenir;
+.IP \(bu 2
+bir magnet bağlantısı;
+.IP \(bu 2
+bir emulecollection dosyası.
+.RE
+
+\fBParametrelerin giriş sırası önemlidir.\fP Birden fazla bağlantı
+girebilirsiniz ve her bağlantının kendine özel parametreleri
+olabilir. Örneğin \fBed2k <bağlantı1> \-t2 <bağlantı2>\fP
+\fI<bağlantı1>\fP dosyasını standart kategoriye ve
+\fI<bağlantı2>\fP dosyasını ikinci kategoriye indirecektir.
+.SH DOSYALAR
+~/.aMule/ED2KLinks
+.SH GERİBİLDİRİM
+Hataları bildirmek için forumumuzu (\fIhttp://forum.amule.org/\fP) ya da hata
+takipçimizi (\fIhttp://bugs.amule.org/\fP) kullanınız. Hataları bildirmek için
+e\-mail ve e\-mail listemizi kullanmamanızı ve geliştiricilerden birine
+doğrudan bildirmemenizi rica ederiz.
+.SH "TELİF HAKKI"
+aMule ve ilgili tüm yardımcı araçları GNU Genel Kamu Lisansı çerçevesinde
+dağıtılmaktadır.
+.SH "İLGİLİ BELGELER"
+.B_untranslated amule\fR(1)
+.SH YAZAN
+Bu kılavuz sayfası Vollstrecker <amule@vollstreckernet.de>
+tarafından yazılmıştır.

aMule-2.3.1.tar.bz2/docs/man/po Added

aMule-2.3.1.tar.bz2/docs/man/po/manpages-de.add Added

aMule-2.3.1.tar.bz2/docs/man/po/manpages-de.po Added

@@ -0,0 +1,1995 @@
+# translation of manpages-de.po to
+#
+# Werner Mahr <werner@vollstreckernet.de>, 2007, 2009, 2010.
+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"
+"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"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+# type: TH
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "AMULE"
+msgstr "AMULE"
+
+#. 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"
+msgstr ""
+
+# 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"
+
+# type: TH
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule"
+msgstr "aMule"
+
+# type: SH
+#. type: SH
+#: amule.1:4 amulecmd.1:5 amuled.1:4 amuleweb.1:4 ed2k.1:4
+#: ../../src/utils/aLinkCreator/docs/alc.1:3
+#: ../../src/utils/aLinkCreator/docs/alcc.1:4 ../../src/utils/cas/docs/cas.1:4
+#: ../../src/utils/wxCas/docs/wxcas.1:3 ../../src/utils/xas/docs/xas.1:3
+#, no-wrap
+msgid "NAME"
+msgstr "NAME"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:6
+msgid "amule - the all-platform eMule p2p client"
+msgstr "amule - der alle-Plattformen eMule p2p Client"
+
+# type: SH
+#. type: SH
+#: amule.1:6 amulecmd.1:7 amuled.1:6 amulegui.1:6 amuleweb.1:6 ed2k.1:6
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6 ../../src/utils/cas/docs/cas.1:6
+#: ../../src/utils/wxCas/docs/wxcas.1:5 ../../src/utils/xas/docs/xas.1:5
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "SYNTAX"
+
+# type: TP
+#. type: Plain text
+#: amule.1:10 amulegui.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-geometry> I<E<lt>geomE<gt>>]"
+msgstr "[B<-c> I<E<lt>PfadE<gt>>] [B<-geometry> I<E<lt>geomE<gt>>]"
+
+# type: TP
+#. type: Plain text
+#: amule.1:13 amuled.1:15
+msgid "[B<-w> I<E<lt>pathE<gt>>]"
+msgstr "[B<-w> I<E<lt>PfadE<gt>>]"
+
+#. 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>]"
+
+# type: SH
+#. type: SH
+#: amule.1:24 amulecmd.1:26 amuled.1:25 amulegui.1:20 amuleweb.1:41 ed2k.1:19
+#: ../../src/utils/aLinkCreator/docs/alc.1:7
+#: ../../src/utils/aLinkCreator/docs/alcc.1:14
+#: ../../src/utils/cas/docs/cas.1:14 ../../src/utils/wxCas/docs/wxcas.1:7
+#: ../../src/utils/xas/docs/xas.1:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "BESCHREIBUNG"
+
+# type: Plain text
+#. type: TP
+#: amule.1:25 amuled.1:26 amulegui.1:24 ed2k.1:21
+#: ../../src/utils/cas/docs/cas.1:26
+#, no-wrap
+msgid "B<[ -c> I<E<lt>pathE<gt>>, B<--config-dir>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>PfadE<gt>>, B<--config-dir>=I<E<lt>PfadE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:28 amuled.1:29 amulegui.1:27 ed2k.1:24
+#: ../../src/utils/cas/docs/cas.1:29
+msgid "Read config from I<E<lt>pathE<gt>> instead of home"
+msgstr "Liest die Konfiguration E<lt>PfadE<gt> anstelle des Home."
+
+# type: TP
+#. type: TP
+#: amule.1:28 amulegui.1:27
+#, no-wrap
+msgid "B<[ -geometry >I<E<lt>geomE<gt>> B<]>"
+msgstr "B<[ -geometry >I<E<lt>geomE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:31 amulegui.1:30
+msgid ""
+"Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as "
+"standard X11 apps:\t[B<=>][I<E<lt>widthE<gt>>{B<xX>}I<E<lt>heightE<gt>>][{B<"
+"+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>]"
+msgstr ""
+"Gibt die Größe des Programmfensters an. I<E<lt>geomE<gt>> hat das selbe "
+"Format wie Standard X11 Anwendungen:\t[B<=>][I<E<lt>BreiteE<gt>>{B<xX>}"
+"I<E<lt>HöheE<gt>>][{B<+->}I<E<lt>xOffsetE<gt>>{B<+->}I<E<lt>yOffsetE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:34 amuled.1:42 amulegui.1:33
+msgid "Prints log messages to stdout."
+msgstr "Schreibt Log-Meldungen auf die Standardausgabe."
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:37 amuled.1:45 amulegui.1:36
+msgid "Resets config to default values."
+msgstr "Setzt die Konfiguration auf die Standardwerte zurück."
+
+# type: Plain text
+#. type: TP
+#: amule.1:37 amuled.1:45
+#, no-wrap
+msgid "B<[ -w> I<E<lt>pathE<gt>>, B<--use-amuleweb>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -w> I<E<lt>PfadE<gt>>, B<--use-amuleweb>=I<E<lt>PfadE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:40 amuled.1:48
+msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
+msgstr ""
+"Setzt den Ort der ausführbaren Datei von amuleweb auf I<E<lt>PfadE<gt>>."
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:43 amuled.1:51
+msgid "Does not handle fatal exception."
+msgstr "Fehlerbehandlung für fatale Fehler abschalten."
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:46 amuled.1:54
+msgid "Does not disable stdin."
+msgstr "Schaltet die Standardeingabe nicht ab."
+
+# type: TP
+#. type: TP
+#: amule.1:46 amuled.1:54 amulegui.1:39 ed2k.1:24
+#, no-wrap
+msgid "B<[ -t>, B<--category>=I<E<lt>numE<gt>> B<]>"
+msgstr "B<[ -t>, B<--category>=I<E<lt>NumE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:49 amuled.1:57 amulegui.1:42 ed2k.1:27
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
+msgstr "Setzt die Kategorie für den übergebenen eD2k Verweis I<E<lt>NumE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:52 amulecmd.1:66 amuled.1:60 amulegui.1:48 amuleweb.1:126 ed2k.1:39
+msgid "Displays the current version number."
+msgstr "Zeigt die derzeitige Versionsnummer an."
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:55 amulecmd.1:69 amuled.1:63 amulegui.1:45 amuleweb.1:123 ed2k.1:36
+#: ../../src/utils/aLinkCreator/docs/alcc.1:22
+#: ../../src/utils/cas/docs/cas.1:32
+msgid "Prints a short usage description."
+msgstr "Gibt eine kurze Nutzungsbeschreibung aus."
+
+#. type: TP
+#: amule.1:55 amuled.1:63 ed2k.1:39
+#, fuzzy, no-wrap
+#| msgid "B<[ eD2k-Link ]>"
+msgid "B<[ eD2k-link ]>"
+msgstr "B<[ eD2k-Link ]>"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:58 amuled.1:66 ed2k.1:42
+msgid "Adds an eD2k-link to the core."
+msgstr "Fügt einen eD2k-Verweis zur Downloadliste hinzu."
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:60 amulecmd.1:75 amuled.1:68 ed2k.1:44
+msgid "The eD2k link to be added can be:"
+msgstr "Der eD2k-Verweis darf enthalten:"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:63 amulecmd.1:78 amuled.1:71 ed2k.1:47
+msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
+msgstr ""
+"ein Link zu einer Datei (ed2k://|file|...), dieser wird Downloadliste "
+"hinzugefügt;"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:65 amulecmd.1:80 amuled.1:73 ed2k.1:49
+msgid ""
+"a server link (ed2k://|server|...), it will be added to the server list;"
+msgstr ""
+"ein Link zu einem Server (ed2k://|server|...), dieser wird der Serverliste "
+"hinzugefügt;"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:67 amuled.1:75 ed2k.1:51
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list;"
+msgstr ""
+"ein Serverlisten-Verweis, in diesem Fall werden alle Server dieser Liste der "
+"Serverliste hinzugefügt;"
+
+#. type: Plain text
+#: amule.1:69 amuled.1:77
+msgid "a magnet link."
+msgstr "ein Magnet Verweis."
+
+# type: SH
+#. type: SH
+#: amule.1:70 amulecmd.1:207 amuleweb.1:132
+#, no-wrap
+msgid "NOTES"
+msgstr "ANMERKUNGEN"
+
+# type: SS
+#. type: SS
+#: amule.1:71 amulecmd.1:208 amuleweb.1:133
+#, no-wrap
+msgid "Paths"
+msgstr "Pfade"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:75 amulecmd.1:212 amuleweb.1:137
+msgid ""
+"For all options which take a I<E<lt>pathE<gt>> value, if the I<path> "
+"contains no directory part (i.e. just a plain filename), then it is "
+"considered to be under the aMule configuration directory, I<~/.aMule>."
+msgstr ""
+"Für alle Optionen die ein I<E<lt>PfadE<gt>> Argument erwarten, wenn der "
+"I<Pfad> kein Verzeichnis enthält(z.B. nur einen Dateinamen), dann wird "
+"angenommen, diese Datei liegt um aMule-Konfigurationsverzeichnis, I<~/."
+"aMule>."
+
+# type: SH
+#. type: SH
+#: amule.1:75 amulecmd.1:240 amuled.1:78 amuleweb.1:171 ed2k.1:60
+#: ../../src/utils/cas/docs/cas.1:36
+#, no-wrap
+msgid "FILES"
+msgstr "DATEIEN"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:77 amuled.1:80
+msgid "~/.aMule/*"
+msgstr "~/.aMule/*"
+
+# type: SH
+#. type: SH
+#: amule.1:77 amulecmd.1:256 amuled.1:80 amulegui.1:48 amuleweb.1:191
+#: ed2k.1:62 ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+#: ../../src/utils/cas/docs/cas.1:42 ../../src/utils/wxCas/docs/wxcas.1:16
+#: ../../src/utils/xas/docs/xas.1:16
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr "FEHLER MELDEN"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+msgid ""
+"Please report bugs either on our forum (I<http://forum.amule.org/>), or in "
+"our bugtracker (I<http://bugs.amule.org/>).  Please do not report bugs in e-"
+"mail, neither to our mailing list nor directly to any team member."
+msgstr ""
+"Bitte meldet Fehler entweder in unserem Forum (I<http://forum.amule.org/>), "
+"oder in unseren Bugtracker (I<http://bugs.amule.org/>). Bitte meldet uns "
+"weder Fehler per E-Mail, noch auf unsere Mailingliste oder direkt an unsere "
+"Teammitglieder."
+
+# type: SH
+#. type: SH
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr "COPYRIGHT"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+msgid ""
+"aMule and all of its related utilities are distributed under the GNU General "
+"Public License."
+msgstr ""
+"aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU "
+"General Public License"
+
+# type: SH
+#. type: SH
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "SIEHE AUCH"
+
+# type: SH
+#. type: SH
+#: amule.1:84 amulecmd.1:263 amuled.1:87 amulegui.1:55 amuleweb.1:198
+#: ed2k.1:69 ../../src/utils/aLinkCreator/docs/alc.1:18
+#: ../../src/utils/aLinkCreator/docs/alcc.1:33
+#: ../../src/utils/cas/docs/cas.1:49 ../../src/utils/wxCas/docs/wxcas.1:23
+#: ../../src/utils/xas/docs/xas.1:23
+#, no-wrap
+msgid "AUTHOR"
+msgstr "VERFASSER"
+
+#. type: Plain text
+#: amule.1:85 amulecmd.1:264 amuled.1:88 amuleweb.1:199 ed2k.1:70
+#: ../../src/utils/aLinkCreator/docs/alc.1:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1:34
+#: ../../src/utils/cas/docs/cas.1:50 ../../src/utils/wxCas/docs/wxcas.1:24
+#: ../../src/utils/xas/docs/xas.1:24
+msgid ""
+"This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Diese manpage wurde geschrieben von Vollstrecker E<lt>amule@vollstreckernet."
+"deE<gt>"
+
+# type: TH
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "AMULECMD"
+msgstr "AMULECMD"
+
+# 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"
+
+# type: TH
+#. type: TH
+#: amulecmd.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 "aMule utilities"
+msgstr "aMule Hilfsprogramme"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:7
+msgid "amulecmd - Console-based program to control aMule"
+msgstr "amulecmd - Konsolenbasiertes Programm um aMule zu steuern"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:13 amuleweb.1:12
+msgid ""
+"[B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
+"I<E<lt>passwordE<gt>>] [B<-f> I<E<lt>pathE<gt>>]"
+msgstr ""
+"[B<-h> I<E<lt>HostE<gt>>] [B<-p> I<E<lt>PortE<gt>>] [B<-P> "
+"I<E<lt>PasswortE<gt>>] [B<-f> I<E<lt>PfadE<gt>>]"
+
+#. type: Plain text
+#: amulecmd.1:17
+msgid ""
+"[B<-l> I<E<lt>langE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>commandE<gt>>]"
+"B< >}"
+msgstr ""
+"[B<-l> I<E<lt>SpracheE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>BefehlE<gt>>]"
+"B< >}"
+
+# type: TP
+#. type: Plain text
+#: amulecmd.1:20 amuleweb.1:31
+msgid "[B<--create-config-from>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--create-config-from>=I<E<lt>PfadE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:29
+msgid "B<amulecmd> is a console-based client to control aMule."
+msgstr "B<amulecmd> ist ein Konsolenprogramm zur Steuerung von aMule."
+
+# type: TP
+#. type: TP
+#: amulecmd.1:29 amuleweb.1:46
+#, no-wrap
+msgid "B<[ -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<]>"
+msgstr "B<[ -h> I<E<lt>HostE<gt>>, B<--host>=I<E<lt>HostE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:33 amuleweb.1:50
+msgid ""
+"Host where aMule is running (default: I<localhost>).  I<E<lt>hostE<gt>> "
+"might be an IP address or a DNS name"
+msgstr ""
+"Der Rechner auf dem aMule läuft (Standard: I<localhost>).  I<E<lt>HostE<gt>> "
+"kann eine IP-Adresse oder ein DNS-Name sein."
+
+# type: TP
+#. type: TP
+#: amulecmd.1:33 amuleweb.1:50
+#, no-wrap
+msgid "B<[ -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>PortE<gt>>, B<--port>=I<E<lt>PortE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:36 amuleweb.1:53
+msgid ""
+"aMule's port for External Connections, as set in Preferences-E<gt>Remote "
+"Controls (default: I<4712>)"
+msgstr ""
+"aMule's Port für Externe Verbindungen, wie in den Optionen unter-"
+"E<gt>Fernsteuerung (Standard: I<4712>) eingestellt."
+
+# type: TP
+#. type: TP
+#: amulecmd.1:36 amuleweb.1:53
+#, no-wrap
+msgid "B<[ -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<]>"
+msgstr "B<[ -P> I<E<lt>PasswortE<gt>>, B<--password>=I<E<lt>PasswortE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:39 amuleweb.1:56
+msgid "External Connections password."
+msgstr "Passwort für Externe Verbindungen."
+
+# type: TP
+#. type: TP
+#: amulecmd.1:39 amuleweb.1:56
+#, no-wrap
+msgid "B<[ -f> I<E<lt>pathE<gt>>, B<--config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -f> I<E<lt>PfadE<gt>>, B<--config-file>=I<E<lt>PfadE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:43 amuleweb.1:60
+msgid ""
+"Use the given configuration file.  Default configuration file is I<~/.aMule/"
+"remote.conf>"
+msgstr ""
+"Benutzt die angegebene Konfigurationsdatei. Die Standardkonfigurationsdatei "
+"ist I<~/.aMule/remote.conf>"
+
+#. type: Plain text
+#: amulecmd.1:46 amuleweb.1:63
+msgid "Do not print any output to stdout."
+msgstr "Keine Ausgabe auf stdout ausgeben."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:50 amuleweb.1:67
+msgid "Be verbose - show also debug messages."
+msgstr "Sei gesprächig - Gebe auch Debuggingausgaben aus"
+
+# type: TP
+#. type: TP
+#: amulecmd.1:50 amuleweb.1:67
+#, no-wrap
+msgid "B<[ -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<]>"
+msgstr "B<[ -l> I<E<lt>SpracheE<gt>>, B<--locale>=I<E<lt>SpracheE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:54 amuleweb.1:71
+msgid ""
+"Sets program locale (language).  See the B<NOTES> section for the "
+"description of the I<E<lt>langE<gt>> parameter."
+msgstr ""
+"Setzt die Lokale (Sprache) des Programms.  Siehe Abschnitt B<ANMERKUNGEN> "
+"für die Beschreibung des I<E<lt>SpracheE<gt>> Parameters."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:57 amuleweb.1:74
+msgid "Write command line options to config file and exit"
+msgstr ""
+"Schreibe die Kommandozeilenoptionen in die Konfigurationsdatei und kehre zur "
+"Shell zurück."
+
+# type: TP
+#. type: TP
+#: amulecmd.1:57
+#, no-wrap
+msgid "B<[ -c> I<E<lt>commandE<gt>>, B<--command>=I<E<lt>commandE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>BefehlE<gt>>, B<--command>=I<E<lt>BefehlE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:60
+msgid ""
+"Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and "
+"exit."
+msgstr ""
+"Führe I<E<lt>BefehlE<gt>> aus, als wäre es auf amulecmd's "
+"Eingabeaufforderung eingegeben worden, und beende dich."
+
+# type: TP
+#. type: TP
+#: amulecmd.1:60 amuleweb.1:117
+#, no-wrap
+msgid "B<[ --create-config-from>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --create-config-from>=I<E<lt>PfadE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:63 amuleweb.1:120
+msgid ""
+"Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid "
+"aMule config file, and then exit."
+msgstr ""
+"Konfigurationsdatei basierend auf I<E<lt>PfadE<gt>>, welche auf eine gültige "
+"aMule Konfigurationsdatei verweisen muss, erstellen und danach beenden."
+
+# type: SH
+#. type: SH
+#: amulecmd.1:69
+#, no-wrap
+msgid "COMMANDS"
+msgstr "BEFEHLE"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:71
+msgid "All commands are case insensitive."
+msgstr "Alle Befehle können groß oder klein geschrieben werden."
+
+#. type: SS
+#: amulecmd.1:71
+#, no-wrap
+msgid "Add I<E<lt>eD2k-linkE<gt>> | I<E<lt>magnet-linkE<gt>>"
+msgstr "Add I<E<lt>eD2k-VerweisE<gt>> | I<E<lt>Magnet-VerweisE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:73
+msgid "Adds an eD2k-link or a magnet-link to the core."
+msgstr "Fügt einen eD2k- oder Magnetverweis dem Kern hinzu."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:82
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list."
+msgstr ""
+"eine Serverlisten-Verweis, in diesem Fall werden alle Server dieser Liste "
+"der Serverliste hinzugefügt."
+
+#. type: Plain text
+#: amulecmd.1:85
+msgid "The magnet link must contain the eD2k hash and file length."
+msgstr ""
+"Der Magnet Verweis muss die eD2k Prüfsumme und die Dateigröße enthalten."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:85
+#, no-wrap
+msgid "Cancel I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Cancel I<E<lt>PfrüfsummeE<gt>> | I<E<lt>NummerE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:87
+msgid ""
+"Cancels the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Bricht den Download, der mit I<E<lt>PrüfsummeE<gt>> oder I<E<lt>NummerE<gt>> "
+"angegeben wurde, ab. Benutze B<show> um den Wert zu erfahren."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:87
+#, no-wrap
+msgid "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|nameE<gt>> ]"
+msgstr "Connect [ I<kad> | I<ed2k> | I<E<lt>IP|NameE<gt>> ]"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:89
+msgid "Connect to the network."
+msgstr "Verbindung zu einem Netzwerk aufbauen."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:91
+msgid "This will connect to all networks that are enabled in Preferences."
+msgstr ""
+"Die Verbindung wird zu allen Netzwerken aufgebaut, die in den Einstellungen "
+"aktiviert wurden."
+
+#. type: Plain text
+#: amulecmd.1:95
+msgid ""
+"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."
+msgstr ""
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:98
+msgid ""
+"Disconnect from all networks you are connected to, or just disconnect from "
+"the specified network."
+msgstr ""
+"Trennt die Verbindung zu allen Netzwerken mit denen du verbunden bist, oder "
+"nur zu dem, welches angegeben wurde."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:98
+#, no-wrap
+msgid "Download I<E<lt>numberE<gt>>"
+msgstr "Download I<E<lt>NummerE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:100
+msgid "Start downloading a file."
+msgstr "Startet den Download einer Datei"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:104
+msgid ""
+"The I<E<lt>numberE<gt>> of a file from the last search has to be given.  "
+"Example: `download 12' will start to download the file with the number 12 of "
+"the previous search."
+msgstr ""
+"Die I<E<lt>NummerE<gt>> einer Datei aus der letzten Suche muss angegeben "
+"werden.  Beispiel: 'download 12' startet den Download der Datei, die in der "
+"letzten Suche die Nummer 12 hatte."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:106
+msgid "Disconnect from amule/amuled and quit amulecmd."
+msgstr "Verbindung zu amule/amuled trennen und amulecmd beenden."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:106
+#, no-wrap
+msgid "Get I<E<lt>whatE<gt>>"
+msgstr "Get I<E<lt>WertE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:108
+msgid "Get and display a preference value."
+msgstr "Liest eine Option und zeigt sie an."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:110 amulecmd.1:144 amulecmd.1:173 amulecmd.1:183
+msgid "Available values for I<E<lt>whatE<gt>>:"
+msgstr "Verfügbare Werte für I<E<lt>WasE<gt>>:"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:113
+msgid "Get bandwidth limits."
+msgstr "Bandbreitenbeschränkungen abfragen."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:115
+msgid "Get IPFilter preferences."
+msgstr "IPFilter Einstellungen abfragen."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:116
+#, no-wrap
+msgid "Help [ I<E<lt>commandE<gt>> ]"
+msgstr "Help [ I<E<lt>BefehlE<gt>> ]"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:120
+msgid ""
+"Prints a short usage description.  If called without parameter, it shows a "
+"list of available commands.  If called with I<E<lt>commandE<gt>>, it shows a "
+"short description of the given command."
+msgstr ""
+"Gibt eine kurze Nutzungsübersicht aus.  Wenn ohne Parameter aufgerufen, "
+"zeigt es eine Liste der verfügbaren Befehle an.  Wenn mit "
+"I<E<lt>BefehlE<gt>>aufgerufen, zeigt es eine Kurzbeschreibung diese Befehls "
+"an."
+
+#. type: SS
+#: amulecmd.1:120
+#, no-wrap
+msgid "Pause I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Pause I<E<lt>PrüfsummeE<gt>> | I<E<lt>NummerE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:122
+msgid ""
+"Pauses the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Pausiert den Download der mit I<E<lt>PrüfsummeE<gt>> oder "
+"I<E<lt>NumnerE<gt>> angegeben wurde. Benutze B<show> um den Wert zu erfahren."
+
+#. type: SS
+#: amulecmd.1:122
+#, no-wrap
+msgid "Priority I<E<lt>priorityE<gt>> I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Priority  I<E<lt>PrioritätE<gt>> I<E<lt>PrüfsummerE<gt>> | I<E<lt>NummerE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:124
+msgid ""
+"Set priority of a download specified by I<E<lt>hashE<gt>> or "
+"I<E<lt>numberE<gt>>."
+msgstr ""
+"Setzt die Priorität für den Download der mit I<E<lt>PrüfsummeE<gt>> oder "
+"I<E<lt>NummerE<gt>> angegeben wurde."
+
+# type: TP
+#. type: Plain text
+#: amulecmd.1:126
+msgid "Available values for I<E<lt>priorityE<gt>>:"
+msgstr "Verfügbare Werte für I<E<lt>PrioritätE<gt>>:"
+
+#. type: Plain text
+#: amulecmd.1:129
+msgid "Automatic priority."
+msgstr "Automatische Priorität."
+
+#. type: Plain text
+#: amulecmd.1:131
+msgid "High priority."
+msgstr "Hohe Priorität."
+
+#. type: Plain text
+#: amulecmd.1:133
+msgid "Low priority."
+msgstr "Niedrige Priorität."
+
+#. type: Plain text
+#: amulecmd.1:135
+msgid "Normal priority."
+msgstr "Normale Priorität."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:138
+msgid "Shows the progress of an on-going search."
+msgstr "Zeigt den Fortschritt einer laufenden Suche an."
+
+#. type: Plain text
+#: amulecmd.1:140
+msgid "A synonim of the B<exit> command."
+msgstr "Synonim für den B<exit> Befehl."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:140
+#, no-wrap
+msgid "Reload I<E<lt>whatE<gt>>"
+msgstr "Reload I<E<lt>WasE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:142
+msgid "Reloads a given object."
+msgstr "Aktualisiert das angegebene Objekt."
+
+#. type: Plain text
+#: amulecmd.1:147
+msgid "Reload shared files list."
+msgstr "Liste der freigegebenen Dateien neu laden."
+
+#. type: Plain text
+#: amulecmd.1:149
+msgid "Reload IP filter tables."
+msgstr "IP Filter Tabellen neu laden."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:152
+msgid "Reset the log."
+msgstr "Setzt das Log zurück."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:154
+msgid "Shows you the results of the last search."
+msgstr "Zeigt die Resultate der letzten Suche an."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:154
+#, no-wrap
+msgid "Resume I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Resume I<E<lt>PrüfsummeE<gt>> | I<E<lt>NummerE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:156
+msgid ""
+"Resumes the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Setzt den Download der mit I<E<lt>PrüfsummeE<gt>> oder I<E<lt>NummerE<gt>> "
+"angegeben wurde fort. Nutze B<show>, um den Wert zu erfahren."
+
+# type: Plain text
+#. type: SS
+#: amulecmd.1:156
+#, no-wrap
+msgid "Search I<E<lt>typeE<gt>> I<E<lt>keywordE<gt>>"
+msgstr "Search I<E<lt>TypE<gt>> I<E<lt>SchlüsselwortE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:159
+msgid ""
+"Makes a search for the given I<E<lt>keywordE<gt>>. A search type and a "
+"keyword to search is mandatory to do this.  Example: `search kad amule' "
+"performs a kad search for `amule'."
+msgstr ""
+"Startet eine Suche nach dem angegebenenI I<E<lt>SchlüsselwortE<gt>>. Ein "
+"Suchtyp und ein Schlüsselwort müssen angegeben werden. Beispiel: 'search kad "
+"amule' startet eine kad-Suche nach 'amule'."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:161
+msgid "Available search types:"
+msgstr "Verfügbare Suchtypen:"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:164
+msgid "Performs a global search."
+msgstr "Führt eine globale Suche durch."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:166
+msgid "Performs a search on the Kademlia network."
+msgstr "Führt eine Suche im Kad-Netzwerk durch."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:168
+msgid "Performs a local search."
+msgstr "Führt eine lokale Suche durch."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:169
+#, no-wrap
+msgid "Set I<E<lt>whatE<gt>>"
+msgstr "Set I<E<lt>WasE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:171
+msgid "Sets a given preferences value."
+msgstr "Setzt die angegebene Option."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:176
+msgid "Set bandwidth limits."
+msgstr "Setzt die Bandbreitenbeschränkungen."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:178
+msgid "Set IPFilter preferences."
+msgstr "IPFilter Einstellungen setzen."
+
+# type: TP
+#. type: SS
+#: amulecmd.1:179
+#, no-wrap
+msgid "Show I<E<lt>whatE<gt>>"
+msgstr "Show I<E<lt>WasE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:181
+msgid "Shows upload/download queue, servers list or shared files list."
+msgstr ""
+"Zeigt upload/download Warteschlange, Serverliste oder die Liste der "
+"freigegebenen Dateien an."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:186
+msgid "Show download queue."
+msgstr "Downloadwarteschlange anzeigen."
+
+#. type: Plain text
+#: amulecmd.1:188
+msgid "Show log."
+msgstr "Log anzeigen."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:190
+msgid "Show servers list."
+msgstr "Serverliste anzeigen."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:192
+msgid "Show upload queue."
+msgstr "Uploadwarteschlange anzeigen."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:196
+msgid ""
+"Shutdown the remote running core (amule/amuled).  This will also shut down "
+"the text client, since it is unusable without a running core."
+msgstr ""
+"Beendet das Programm (amule/amuled) zu dem du verbunden bist. Dies beendet "
+"auch den Textclient, da er ohne Verbindung nicht zu gebrauchen ist."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:196
+#, no-wrap
+msgid "Statistics [ I<E<lt>numberE<gt>> ]"
+msgstr "Statistics [ I<E<lt>NummerE<gt>> ]"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:198
+msgid "Show statistics tree."
+msgstr "Zeigt die Statistiken an."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:202
+msgid ""
+"The optional I<E<lt>numberE<gt>> in the range of 0-255 can be passed as "
+"argument to this command, which tells how many entries of the client version "
+"subtree should be shown. Passing 0, or omitting it means `unlimited'."
+msgstr ""
+"Die optionale I<E<lt>NummerE<gt>> im Bereich von 0-255 kann als Argument "
+"diesem Befehel übergeben werden. Sie gibt an, wie viele Einträge der "
+"Clientversionsliste angezeigt werden sollen. Der Wert 0, oder keine Angabe "
+"bedeutet 'unbegrenzt'."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:205
+msgid ""
+"Example: `statistics 5' will show only the top 5 versions for each client "
+"type."
+msgstr ""
+"Beispiel: 'statistics 5' zeigt nur die oberen 5 Versionen der einzelnen "
+"Clienttypen an."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:207
+msgid "Show connection status, current up/download speeds, etc."
+msgstr ""
+"Zeigt den Verbindungsstatus, aktuelle Up/Downloadgeschindigkeiten, etc. an."
+
+#. type: SS
+#: amulecmd.1:212 amuleweb.1:137
+#, no-wrap
+msgid "Languages"
+msgstr "Sprachen"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:218 amuleweb.1:143
+msgid ""
+"The I<E<lt>langE<gt>> parameter for the B<-l> option has the following form: "
+"I<lang>[B<_>I<LANG>][B<.>I<encoding>][B<@>I<modifier>] where I<lang> is the "
+"primary language, I<LANG> is a sublanguage/territory, I<encoding> is the "
+"character set to use and I<modifier> allows the user to select a specific "
+"instance of localization data within a single category."
+msgstr ""
+"Der I<E<lt>SpracheE<gt>> Parameter der B<-l> Option hat folgende Form: "
+"I<sprache>[B<_>I<SPRACHE>][B<.>I<kodierung>][B<@>I<modifikation>] wobei "
+"I<sprache> die eigentliche Sprache, I<SPRACHE> das Gebiet, I<kodierung> den "
+"zu nutzenden Zeichensatz und I<modifikation> eine bestimmte Untergruppe in "
+"diesem darstellt."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:220 amuleweb.1:145
+msgid "For example, the following strings are valid:"
+msgstr "Zum Besispiel sind die folgenden Zeichenketten gültig:"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:234 amuleweb.1:159
+msgid ""
+"Though all the above strings are accepted as valid language definitions, "
+"I<encoding> and I<modifier> are yet unused."
+msgstr ""
+"Alle oben genannten Zeicheketten werden als gültige Sprachdefinitionen "
+"akzeptiert, I<KODIERUNG> und I<zusatz> werden zur Zeit nicht genutzt."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:237 amuleweb.1:162
+msgid ""
+"In addition to the format above, you can also specify full language names in "
+"English - so B<-l german> is also valid and is equal to B<-l de_DE>."
+msgstr ""
+"Zusätzlich zu den obigen Formaten, kann man komplette englische "
+"Sprachbezeichnungen angeben - B<-l german> ist ebenfalls gültig und "
+"entspricht B<-l de_DE>."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:240 amuleweb.1:165
+msgid ""
+"When no locale is defined, either on command-line or in config file, system "
+"default language will be used."
+msgstr ""
+"Wenn keine Sprache definiert wurde, weder in der Kommandozeile noch in der "
+"Konfigurationsdatei, wird die Standardsprache des Systems verwendet."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:242 amuleweb.1:173
+msgid "~/.aMule/remote.conf"
+msgstr "~/.aMule/remote.conf"
+
+# type: SH
+#. type: SH
+#: amulecmd.1:242 amuleweb.1:177
+#, no-wrap
+msgid "EXAMPLE"
+msgstr "BEISPIEL"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:244
+msgid "Typically amulecmd will be first run as:"
+msgstr "Typischerweise startet man amulecmd als erstes mit:"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:246
+msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
+msgstr ""
+"B<amulecmd> B<-h> I<hostname> B<-p> I<EC-Port> B<-P> I<EC-Passwort> B<-w>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:248 amuleweb.1:183
+msgid "or"
+msgstr "oder"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:250
+msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+"B<amulecmd> B<--create-config-from>=I</home/Benutzer/.aMule/amule.conf>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:252 amuleweb.1:187
+msgid ""
+"These will save settings to I<$HOME/.aMule/remote.conf>, and later you only "
+"need to type:"
+msgstr ""
+"Dies speichert die Einstellungen in I<$HOME/.aMule/remote.conf>, und später "
+"tippst du nur noch:"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:256
+msgid "Of course, you don't have to follow this example."
+msgstr "Natürlich brauchst du dich nicht unbedingt an dieses Beispiel halten."
+
+# type: TH
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "AMULED"
+msgstr "AMULED"
+
+# 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"
+
+# type: TH
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon"
+msgstr "aMule Dämon"
+
+# type: Plain text
+#. type: Plain text
+#: amuled.1:6
+msgid "amuled - the all-platform eMule p2p client - daemonized version"
+msgstr "amuled - Der alle-Plattformen eMule p2p Client - dämonisierte Version"
+
+# type: TP
+#. type: Plain text
+#: amuled.1:9 ../../src/utils/cas/docs/cas.1:11
+msgid "[B<-c> I<E<lt>pathE<gt>>]"
+msgstr "[B<-c> I<E<lt>PfadE<gt>>]"
+
+# type: TP
+#. type: Plain text
+#: amuled.1:11
+msgid "[B<-p> I<E<lt>pathE<gt>>]"
+msgstr "[B<-p> I<E<lt>PfadE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amuled.1:32
+msgid "Forks to background."
+msgstr "Im Hintergrund ausführen"
+
+# type: Plain text
+#. type: TP
+#: amuled.1:32
+#, no-wrap
+msgid "B<[ -p> I<E<lt>pathE<gt>>, B<--pid-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>PfadE<gt>>, B<--pid-file>=I<E<lt>PfadE<gt>> B<]>"
+
+#. type: Plain text
+#: amuled.1:36
+msgid ""
+"After fork, create a pid-file in the I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> "
+"has to contain the filename."
+msgstr ""
+"Erstelle eine Pid-Datei in I<E<lt>PfadE<gt>>.  I<E<lt>PfadE<gt>> muss einen "
+"Dateinamen enthalten."
+
+# type: Plain text
+#. type: Plain text
+#: amuled.1:39
+msgid "Configure EC (External Connections)."
+msgstr "Konfiguration für EC (Externe Verbindungen)."
+
+# type: TH
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "AMULEGUI"
+msgstr "AMULEGUI"
+
+# 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"
+
+# type: TH
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
+
+#. type: Plain text
+#: amulegui.1:6
+msgid "amulegui - aMule control program with GUI"
+msgstr "amulegui - aMule Steuerungsprogramm mit GUI"
+
+# type: TP
+#. type: Plain text
+#: amulegui.1:14
+msgid "[B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-t> I<E<lt>NumE<gt>>]"
+
+#. type: Plain text
+#: amulegui.1:24
+msgid ""
+"B<amulegui> is a client program, and can be connected to amule or amuled via "
+"EC. You can manage your amule program with it. It provides almost the same "
+"functionalities as amule, even if the core works on another computer."
+msgstr ""
+"B<amulegui> ist ein Clientprogramm, das mit aMule oder amuled über EC "
+"verbunden werden kann. Du kannst aMule mit diesem Programm steuernt. Es "
+"besitzt annähernd die selbe Funktionalität wie aMule, auch wenn der Kern auf "
+"einem anderen Computer läuft."
+
+#. type: Plain text
+#: amulegui.1:39
+msgid "Skip connection dialog."
+msgstr "Überspringe den Verbindungsdialog."
+
+#. type: Plain text
+#: amulegui.1:57
+msgid ""
+"This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm "
+"DOT orgE<gt>"
+msgstr ""
+"Diese manpage wurde geschrieben von Julien Delange for Debian E<lt>julien AT "
+"gunnm DOT orgE<gt>"
+
+#. type: Plain text
+#: amulegui.1:58
+msgid ""
+"This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Diese manpage wurde überarbeitet von Vollstrecker E<lt>amule@vollstreckernet."
+"deE<gt>"
+
+# type: TH
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "AMULEWEB"
+msgstr "AMULEWEB"
+
+# 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"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:6
+msgid "amuleweb - aMule web server"
+msgstr "amuleweb - aMule Webserver"
+
+# type: TP
+#. type: Plain text
+#: amuleweb.1:15
+msgid "[B<-l> I<E<lt>langE<gt>>]"
+msgstr "[B<-l> I<E<lt>SpracheE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:18
+msgid "[B<-t> I<E<lt>nameE<gt>>] [B<-s> I<E<lt>portE<gt>>]"
+msgstr "[B<-t> I<E<lt>NameE<gt>>] [B<-s> I<E<lt>PortE<gt>>]"
+
+# type: TP
+#. type: Plain text
+#: amuleweb.1:20
+msgid "[B<-U> I<E<lt>portE<gt>>]"
+msgstr "[B<-U> I<E<lt>PortE<gt>>]"
+
+# type: TP
+#. type: Plain text
+#: amuleweb.1:24
+msgid "[B<-A> I<E<lt>passwordE<gt>>] [B<-G> I<E<lt>passwordE<gt>>]"
+msgstr "[B<-A> I<E<lt>PasswortE<gt>>] [B<-G> I<E<lt>PasswortE<gt>>]"
+
+# type: TP
+#. type: Plain text
+#: amuleweb.1:40
+msgid "[B<--amule-config-file>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--amule-config-file>=I<E<lt>PfadE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:46
+msgid ""
+"B<amuleweb> manages your access to amule through a web browser.  You can "
+"start amuleweb together with B<amule>(1), or separately, any time later.  "
+"Options can be specified via command-line or via config-file.  Command-line "
+"options take precedence over config-file options."
+msgstr ""
+"B<amuleweb> ermöglicht dir den Zugriff auf amule(d) per Webbrowser. Man kann "
+"amuleweb zusammen mit B<amule>(1) starten lassen, oder ihn separat später "
+"starten. Optionen können auf der Kommandozeile oder in der "
+"Konfigurationsdatei angegeben werden. Kommandozeilenoptionen überschreiben "
+"die Werte aus der Konfigurationsdatei."
+
+# type: TP
+#. type: TP
+#: amuleweb.1:74
+#, no-wrap
+msgid "B<[ -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<]>"
+msgstr "B<[ -t> I<E<lt>NameE<gt>>, B<--template>=I<E<lt>NameE<gt>> B<]>"
+
+# 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>"
+
+# type: TP
+#. type: TP
+#: amuleweb.1:77
+#, no-wrap
+msgid "B<[ -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -s> I<E<lt>PortE<gt>>, B<--server-port>=I<E<lt>PortE<gt>> B<]>"
+
+# 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>)"
+
+#. type: Plain text
+#: amuleweb.1:84
+msgid "Enable UPnP."
+msgstr "Aktiviere UPnP."
+
+# type: TP
+#. type: TP
+#: amuleweb.1:84
+#, no-wrap
+msgid "B<[ -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -U> I<E<lt>PortE<gt>>, B<--upnp-port> I<E<lt>PortE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:87
+msgid "UPnP port."
+msgstr "UPnP Port."
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:90
+msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
+msgstr "Benutzt gzip Kompression für den HTTP Verkehr um Bandbreite zu sparen"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:93
+msgid "Disables using gzip compression (this is the default)."
+msgstr "Schalten die gzip Kompression ab (Standard)"
+
+# type: TP
+#. type: TP
+#: amuleweb.1:93
+#, no-wrap
+msgid "B<[ -A> I<E<lt>passwdE<gt>>, B<--admin-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -A> I<E<lt>PasswortE<gt>>, B<--admin-pass>=I<E<lt>PasswortE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:96
+msgid "Full access password for webserver."
+msgstr "Passwort für vollen Zugriff auf den Webserver"
+
+# type: TP
+#. type: TP
+#: amuleweb.1:96
+#, no-wrap
+msgid "B<[ -G> I<E<lt>passwdE<gt>>, B<--guest-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -G> I<E<lt>PasswortE<gt>>, B<--guest-pass>=I<E<lt>PasswortE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:99
+msgid "Guest password for webserver."
+msgstr "Gäste Passwort für den Webserver"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:102
+msgid "Allows guest access."
+msgstr "Erlaubt den Zugriff als Gast"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:105
+msgid "Denies guest access (default)."
+msgstr "Verbietet den Zugriff als Gast (Standard)"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:111
+msgid ""
+"Load/save webserver settings from/to remote aMule.  This causes amuleweb to "
+"ignore command-line and config-file settings, and load them from aMule.  "
+"When saving preferences none will be written to the config file, but to "
+"aMule.  (Of course, this works only for those settings that can be set in "
+"aMule's Preferences-E<gt>Remote Controls.)"
+msgstr ""
+"Lade/Speichere Einstellungen vom/zum entfernen aMule. Dies bringt amuleweb "
+"dazu, die Kommandozeilen- und Konfigurationsdateieinstellungen zu "
+"ignorieren, und von aMule zu beziehen. Beim Speichern werden keine "
+"Einstellungen in die Konfigurationsdatei geschrieben, sondern zu aMule "
+"gesendet. (das funktioniert nur für Einstellungen in aMule's Einstellungen-"
+"E<gt>Fernsteuerung Dialog)"
+
+#. type: Plain text
+#: amuleweb.1:114
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Deaktiviert den PHP Interpreter (veraltet)"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:117
+msgid "Recompiles PHP pages on each request."
+msgstr "Erstellt die PHP-Seiten bei jedem Aufruf neu"
+
+# type: TP
+#. type: TP
+#: amuleweb.1:126
+#, no-wrap
+msgid "B<[ --amule-config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --amule-config-file>=I<E<lt>PfadE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:132
+msgid ""
+"aMule config file path.  B<DO NOT USE DIRECTLY!> aMule uses this option when "
+"starting amuleweb at aMule startup.  This option causes all other command-"
+"line and config-file settings to be ignored, preferences to be read from the "
+"given config file, and also implies the B<-q -L> options."
+msgstr ""
+"Pfad zur aMule Konfigurationsdatei. B<NICHT DIREKT BENUTZEN!> aMule benutzt "
+"dies zum starten von amuleweb wenn aMule startet. Diese Option sorgt dafür, "
+"das alle anderen Parameter ignoriert werden, und nur aus der angegeben Datei "
+"gelesen werden, und impliziert auch die B<-q -L> Optionen."
+
+# type: SH
+#. type: SH
+#: amuleweb.1:165
+#, no-wrap
+msgid "SKIN SUPPORT"
+msgstr "SKIN UNTERSTÜTZUNG"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:169
+msgid ""
+"B<amuleweb> is capable of displaying information in different skins.  These "
+"skins are called templates, and you can make amuleweb load a specific "
+"template via the B<-t> command line option.  Templates are searched in two "
+"places: first in I<~/.aMule/webserver/> and then in I</usr/share/amule/"
+"webserver/> if you installed with --prefix=/usr."
+msgstr ""
+"B<amuleweb> ist in der Lage Informationen mit unterschiedlichen Skins "
+"anzuzeigen.  Diese Skins werden Templates genannt, und due kannst über die "
+"Kommandozeilenoption B<-t> angeben welches geladen werden soll.  Templates "
+"werden in 2 verschiedenen Orten gesucht: zuerst in I<~/.aMule/webserver/> "
+"und dann in I</usr/share/amule/webserver/> wenn du mit --prefix=/usr "
+"installiert hast."
+
+#. type: Plain text
+#: amuleweb.1:171
+msgid ""
+"Each template must be in a subdirectory of the template name, and this "
+"directory must contain all files the template needs."
+msgstr ""
+"Jedes Template muss in einem Unterverzeichnis des Templatenamens liegen, "
+"welches alle Dateien enthält, die das Template benötigt."
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:175
+msgid "~/.aMule/webserver/"
+msgstr "~/.aMule/webserver/"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:177
+msgid "I<$(pkgdatadir)>/webserver/"
+msgstr "I<$(pkgdatadir)>/webserver/"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:179
+msgid "Typically amuleweb will be first run as:"
+msgstr "Typischerweise wird amuleweb als erstes folgendermaßen gestartet:"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:181
+msgid ""
+"B<amuleweb> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-s> "
+"I<HTTPport> B<-A> I<AdminPassword> B<-w>"
+msgstr ""
+"B<amuleweb> B<-h> I<hostname> B<-p> I<EC-Port> B<-P> I<EC-Passwort> B<-s> "
+"I<HTTP-Port> B<-A> I<Admin-Passwort> B<-w>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:185
+msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+"B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:191
+msgid ""
+"Of course, you may specify any more or less options on the first example "
+"line, and you may also totally omit it."
+msgstr ""
+"Natürlich kann man zusätzliche Optionen angeben und einzelne auch beim "
+"ersten Start weglassen, oder es komplett anders machen."
+
+# type: TH
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "ED2K"
+msgstr "ED2K"
+
+# type: TH
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "aMule eD2k link parser v1.5.1"
+msgstr "aMule eD2k Verweis parser v1.5.1"
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:6
+msgid "ed2k - aMule eD2k link parser"
+msgstr "ed2k - aMule ED2k Verweis-Parser"
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-c> I<E<lt>PfadE<gt>>] [B<-t> I<E<lt>NumE<gt>>]"
+
+# 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."
+
+#. type: Plain text
+#: ed2k.1:30
+msgid ""
+"Loads all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+"Lädt alle Verweise aus der als I<E<lt>eD2k_VerweisE<gt>> übergebenen "
+"emulecollection."
+
+#. type: Plain text
+#: ed2k.1:33
+msgid ""
+"Lists all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+"Listet alle Verweise in der emulecollection die als "
+"I<E<lt>eD2k_VerweisE<gt>> übergeben wurde auf."
+
+#. type: Plain text
+#: ed2k.1:53
+msgid "a magnet link;"
+msgstr "ein Magnetverweis;"
+
+#. type: Plain text
+#: ed2k.1:55
+msgid "an emulecollection file."
+msgstr "eine emulecollection Datei."
+
+#. type: Plain text
+#: ed2k.1:60
+msgid ""
+"B<The order in which you give the parameters is important.> You can give "
+"more than one link, and every link can have it's own params.  For example "
+"B<ed2k E<lt>link1E<gt> -t2 E<lt>link2E<gt>> will download I<E<lt>link1E<gt>> "
+"in standard category and I<E<lt>link2E<gt>> in category 2."
+msgstr ""
+"B<Die Reihenfolge in der du die Parameter angibst, ist entscheidend.> Du "
+"kannst mehr als einen Verweis übergeben und jeder Verweis kann seine eigenen "
+"Parameter haben.  Zum Beispiel B<ed2k E<lt>Verweis1E<gt> -t2 "
+"E<lt>Verweis2E<gt>> lädt I<E<lt>Verweis1E<gt>> in der Standardkategorie und "
+"I<E<lt>Verweis2E<gt>> in Kategorie 2 herunter."
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:62
+msgid "~/.aMule/ED2KLinks"
+msgstr "~/.aMule/ED2KLinks"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "ALC"
+msgstr "ALC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "aLinkCreator"
+msgstr "aLinkCreator"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+msgid "aLinkCreator - the aMule eD2k link creator"
+msgstr "ed2k - aMule eD2k Verweis parser"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:9
+msgid ""
+"B<alc> is a graphical utility to create an eD2k link to any file on your "
+"computer."
+msgstr ""
+"B<alc> ist ein graphisches Werkzeug zum erstellen von eD2k Links für Dateien "
+"auf deinem Computer."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/wxCas/docs/wxcas.1:16
+msgid "This app doesn't take any arguments."
+msgstr "Dieses Programm hat keine Parameter."
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "ALCC"
+msgstr "ALCC"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "aMule eD2k links calculator"
+msgstr "aMule eD2k Verweis Ersteller"
+
+# type: TH
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6
+msgid "alcc - text based eD2k links calculator for aMule"
+msgstr "alcc - textbasierter eD2k Verweis Ersteller für aMule"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:11
+msgid "I<E<lt>inputfiles_listE<gt>>"
+msgstr "I<E<lt>eingabedatei_listeE<gt>>"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:16
+msgid ""
+"Compute the eD2k links of all the input files given in the "
+"I<E<lt>inputfiles_listE<gt>> (There can be one or more files)."
+msgstr ""
+"Berechne die eD2k Verweise aller Eingabedateien aus I<E<lt>dateilisteE<gt>> "
+"(eine oder mehrere Dateien)."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:19
+msgid "Compute and add part hashes to the computed eD2k links."
+msgstr ""
+"Berechne Teilprüfsummen und füge sie dem berechneten eD2k Verweis hinzu."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+msgid "Be verbose - show also calculation steps."
+msgstr "Sei gesprächig - Zeige auch die Rechenschritte an."
+
+# type: TH
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "CAS"
+msgstr "CAS"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "cas v0.8"
+msgstr "cas v0.8"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:6
+msgid "cas - c aMule statistics"
+msgstr "cas - c aMule statistics"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:18
+#, fuzzy
+#| msgid ""
+#| "B<cas> is a program for displaying the contents of your aMule online "
+#| "signature file to console (in a human readable form)."
+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<cas> ist ein Program zum Anzeigen des Inhaltes deiner aMule Online "
+"Signaturdatei in der Konsole (in von Menschen lesbarem Format)."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:22
+msgid ""
+"Writes the online signature picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+"Erstellt das Bild der Online Signatur.  Optional kannst du "
+"I<=E<lt>PFADE<gt>> an diese Option anhängen, um anzugeben wohin es "
+"geschrieben werden soll."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:26
+msgid ""
+"HTML page with stats and picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+"HTML Seite mit Statistiken und Bild.  Optional kannst du I<=E<lt>PFADE<gt>> "
+"an diese Option anhängen, um anzugeben wohin es geschrieben werden soll."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:34
+msgid "Without any options, it prints online signature data to stdout."
+msgstr "Ohne Optionen schreibt es die Online Signatur auf die Standardausgabe."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:36
+msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+msgstr ""
+"B<cas> wurde geschrieben von Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:38
+msgid "~/.aMule/casrc"
+msgstr "~/.aMule/casrc"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:40
+msgid "stat.png"
+msgstr "stat.png"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:42
+msgid "tmp.html"
+msgstr "tmp.html"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "WXCAS"
+msgstr "WXCAS"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "wxCas"
+msgstr "wxCas"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:5
+msgid "wxcas - wx c aMule statistics"
+msgstr "wxcas - wx c aMule statistics"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:11
+#, fuzzy
+#| msgid ""
+#| "B<wxcas> is a program for displaying the contents of your online "
+#| "signature file in a nice wx Window on your Desktop.  Based on Pedro de "
+#| "Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish "
+#| "E<lt>thepolish@vipmail.ruE<gt>"
+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<wxcas> ist ein Programm zum Anzeigen des Inhaltes deiner Online "
+"Signaturdatei in einem hübschen wx Fenster auf deinem Desktop.  Basierend "
+"auf Pedro de Oliveira's B<cas>(1).  B<wxcas> wurde geschrieben von ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt>"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:14
+#, fuzzy
+#| msgid ""
+#| "B<wxcas> is a program for displaying the contents of your online "
+#| "signature file in a nice wx Window on your Desktop.  Based on Pedro de "
+#| "Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish "
+#| "E<lt>thepolish@vipmail.ruE<gt>"
+msgid ""
+"Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt>"
+msgstr ""
+"B<wxcas> ist ein Programm zum Anzeigen des Inhaltes deiner Online "
+"Signaturdatei in einem hübschen wx Fenster auf deinem Desktop.  Basierend "
+"auf Pedro de Oliveira's B<cas>(1).  B<wxcas> wurde geschrieben von ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt>"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "XAS"
+msgstr "XAS"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "xas v1.9"
+msgstr "xas v1.9"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:5
+msgid "xas - X-Chat aMule Statistics"
+msgstr "xas - X-Chat aMule Statistics"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:7
+msgid "B<none>"
+msgstr "B<Keine>"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:12
+#, 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<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 aMule's preferences."
+msgstr ""
+"B<xas> 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 "
+"Einstellungen von aMule einschalten."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:14
+#, fuzzy
+#| msgid ""
+#| "To enable it on every startup of xchat you can just run the script in /"
+#| "usr/bin/autstart-xas if, if you installed with --prefix=/usr"
+msgid ""
+"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)."
+msgstr ""
+"Um es bei jedem Start von xchat zu aktivieren kannst du das Skript /usr/bin/"
+"autostart-xas verwenden, wenn du mit --prefix=/usr installiert hast"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:16
+msgid "B<xas> was originally written by niet"
+msgstr "B<xas> wurde ursprünglich von niet geschrieben"
+
+#~ msgid "January 2010"
+#~ msgstr "Januar 2010"
+
+# type: Plain text
+#~ msgid ""
+#~ "When giving ed2k as parameter, it connects only to eD2k-network, to "
+#~ "servers in your serverlist. You may also optionally specify a server "
+#~ "address in IP:Port form, to connect to that server only. The IP must be a "
+#~ "dotted decimal IPv4 address, or a resolvable DNS name."
+#~ msgstr ""
+#~ "Wenn ed2k als Parameter übergeben wird, wird nur eine Verbindung zum eD2k-"
+#~ "Netzwerk und zu Servern aus der Serverliste aufgebaut. Man kann auch "
+#~ "optional einen Server in der Form IP:Port angeben, um nur zu diesem "
+#~ "Server eine Verbindung aufzubauen. Die IP muss entweder eine durch Punkte "
+#~ "getrennte dezimale IPv4-Adresse, oder ein auflösbarer DNS-Name sein."
+
+# type: Plain text
+#~ msgid "When giving kad, it connects to Kad only."
+#~ msgstr ""
+#~ "Wenn kad angegeben wird, wird ausschließlich eine kad-Verbindung "
+#~ "aufgebaut."

aMule-2.3.1.tar.bz2/docs/man/po/manpages-es.add Added

aMule-2.3.1.tar.bz2/docs/man/po/manpages-es.po Added

@@ -0,0 +1,1652 @@
+# Spanish translations for po package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the po package.
+# Automatically generated, 2010.
+#
+# Mad-Soft <mad.soft@gmail.com>, 2010
+msgid ""
+msgstr ""
+"Project-Id-Version: es\n"
+"POT-Creation-Date: 2011-10-31 22:06+0100\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: Spanish\n"
+"X-Poedit-Country: SPAIN\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "AMULE"
+msgstr "AMULE"
+
+#. 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"
+msgstr ""
+
+#. type: TH
+#: amule.1:1
+#, fuzzy, no-wrap
+#| msgid "aMule v2.3.0"
+msgid "aMule v2.3.1"
+msgstr "aMule v2.3.0"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule"
+msgstr "aMule"
+
+#. type: SH
+#: amule.1:4 amulecmd.1:5 amuled.1:4 amuleweb.1:4 ed2k.1:4
+#: ../../src/utils/aLinkCreator/docs/alc.1:3
+#: ../../src/utils/aLinkCreator/docs/alcc.1:4 ../../src/utils/cas/docs/cas.1:4
+#: ../../src/utils/wxCas/docs/wxcas.1:3 ../../src/utils/xas/docs/xas.1:3
+#, no-wrap
+msgid "NAME"
+msgstr "NOMBRE"
+
+#. type: Plain text
+#: amule.1:6
+msgid "amule - the all-platform eMule p2p client"
+msgstr "amule -cliente p2p multiplataforma basado en eMule "
+
+#. type: SH
+#: amule.1:6 amulecmd.1:7 amuled.1:6 amulegui.1:6 amuleweb.1:6 ed2k.1:6
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6 ../../src/utils/cas/docs/cas.1:6
+#: ../../src/utils/wxCas/docs/wxcas.1:5 ../../src/utils/xas/docs/xas.1:5
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "SINOPSIS"
+
+#. type: Plain text
+#: amule.1:10 amulegui.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-geometry> I<E<lt>geomE<gt>>]"
+msgstr "[B<-c> I<E<lt>pathE<gt>>] [B<-geometry> I<E<lt>geomE<gt>>]"
+
+#. type: Plain text
+#: amule.1:13 amuled.1:15
+msgid "[B<-w> I<E<lt>pathE<gt>>]"
+msgstr "[B<-w> I<E<lt>pathE<gt>>]"
+
+#. 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>>] [I<eD2k-Link>]"
+
+#. type: SH
+#: amule.1:24 amulecmd.1:26 amuled.1:25 amulegui.1:20 amuleweb.1:41 ed2k.1:19
+#: ../../src/utils/aLinkCreator/docs/alc.1:7
+#: ../../src/utils/aLinkCreator/docs/alcc.1:14
+#: ../../src/utils/cas/docs/cas.1:14 ../../src/utils/wxCas/docs/wxcas.1:7
+#: ../../src/utils/xas/docs/xas.1:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "DESCRIPCIÓN"
+
+#. type: TP
+#: amule.1:25 amuled.1:26 amulegui.1:24 ed2k.1:21
+#: ../../src/utils/cas/docs/cas.1:26
+#, no-wrap
+msgid "B<[ -c> I<E<lt>pathE<gt>>, B<--config-dir>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>pathE<gt>>, B<--config-dir>=I<E<lt>pathE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:28 amuled.1:29 amulegui.1:27 ed2k.1:24
+#: ../../src/utils/cas/docs/cas.1:29
+msgid "Read config from I<E<lt>pathE<gt>> instead of home"
+msgstr "Leer configuración desde I<E<lt>pathE<gt>> en lugar de home"
+
+#. type: TP
+#: amule.1:28 amulegui.1:27
+#, no-wrap
+msgid "B<[ -geometry >I<E<lt>geomE<gt>> B<]>"
+msgstr "B<[ -geometry >I<E<lt>geomE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:31 amulegui.1:30
+msgid ""
+"Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as "
+"standard X11 apps:\t[B<=>][I<E<lt>widthE<gt>>{B<xX>}I<E<lt>heightE<gt>>][{B<"
+"+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>]"
+msgstr ""
+"Fija la geometría de la aplicación. I<E<lt>geomE<gt>> usa el mismo formato "
+"estándar de las aplicaciones X11:\t[B<=>][I<E<lt>widthE<gt>>{B<xX>}"
+"I<E<lt>heightE<gt>>][{B<+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>]"
+
+#. type: Plain text
+#: amule.1:34 amuled.1:42 amulegui.1:33
+msgid "Prints log messages to stdout."
+msgstr "Imprime mensajes de registro en la salida estándar"
+
+#. type: Plain text
+#: amule.1:37 amuled.1:45 amulegui.1:36
+msgid "Resets config to default values."
+msgstr "Reiniciar configuracion a valores por defecto"
+
+#. type: TP
+#: amule.1:37 amuled.1:45
+#, no-wrap
+msgid "B<[ -w> I<E<lt>pathE<gt>>, B<--use-amuleweb>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -w> I<E<lt>pathE<gt>>, B<--use-amuleweb>=I<E<lt>pathE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:40 amuled.1:48
+msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
+msgstr "Especifica ubicacion del binario amuleweb en I<E<lt>pathE<gt>>."
+
+#. type: Plain text
+#: amule.1:43 amuled.1:51
+msgid "Does not handle fatal exception."
+msgstr "No maneja excepción grave"
+
+#. type: Plain text
+#: amule.1:46 amuled.1:54
+msgid "Does not disable stdin."
+msgstr "No deshabilitar entrada estándar"
+
+#. type: TP
+#: amule.1:46 amuled.1:54 amulegui.1:39 ed2k.1:24
+#, no-wrap
+msgid "B<[ -t>, B<--category>=I<E<lt>numE<gt>> B<]>"
+msgstr "B<[ -t>, B<--category>=I<E<lt>numE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:49 amuled.1:57 amulegui.1:42 ed2k.1:27
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
+msgstr "Fijar categoría para enlace eD2k pasado a I<E<lt>numE<gt>>"
+
+#. type: Plain text
+#: amule.1:52 amulecmd.1:66 amuled.1:60 amulegui.1:48 amuleweb.1:126 ed2k.1:39
+msgid "Displays the current version number."
+msgstr "Mostrar el número de la versión actual."
+
+#. type: Plain text
+#: amule.1:55 amulecmd.1:69 amuled.1:63 amulegui.1:45 amuleweb.1:123 ed2k.1:36
+#: ../../src/utils/aLinkCreator/docs/alcc.1:22
+#: ../../src/utils/cas/docs/cas.1:32
+msgid "Prints a short usage description."
+msgstr "Imprime una breve descripción de uso."
+
+#. type: TP
+#: amule.1:55 amuled.1:63 ed2k.1:39
+#, fuzzy, no-wrap
+#| msgid "B<[ eD2k-Link ]>"
+msgid "B<[ eD2k-link ]>"
+msgstr "B<[ eD2k-Link ]>"
+
+#. type: Plain text
+#: amule.1:58 amuled.1:66 ed2k.1:42
+msgid "Adds an eD2k-link to the core."
+msgstr "Añadir un enlace eD2k al núcleo."
+
+#. type: Plain text
+#: amule.1:60 amulecmd.1:75 amuled.1:68 ed2k.1:44
+msgid "The eD2k link to be added can be:"
+msgstr "El enlace eD2k para ser añadido puede ser:"
+
+#. type: Plain text
+#: amule.1:63 amulecmd.1:78 amuled.1:71 ed2k.1:47
+msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
+msgstr ""
+"un enlace de archivo (ed2k://|archivo|...), será añádido a la cola de "
+"descarga."
+
+#. type: Plain text
+#: amule.1:65 amulecmd.1:80 amuled.1:73 ed2k.1:49
+msgid ""
+"a server link (ed2k://|server|...), it will be added to the server list;"
+msgstr ""
+"un enlace de servidor (ed2k://|servidor|...), será añádido a la cola de "
+"servidores."
+
+#. type: Plain text
+#: amule.1:67 amuled.1:75 ed2k.1:51
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list;"
+msgstr ""
+"un enlace de lista de servidores, en cuyo caso todos los servidores de la "
+"lista serán añadidos a la lista de servidores."
+
+#. type: Plain text
+#: amule.1:69 amuled.1:77
+msgid "a magnet link."
+msgstr "un enlace magnet."
+
+#. type: SH
+#: amule.1:70 amulecmd.1:207 amuleweb.1:132
+#, no-wrap
+msgid "NOTES"
+msgstr "NOTAS"
+
+#. type: SS
+#: amule.1:71 amulecmd.1:208 amuleweb.1:133
+#, no-wrap
+msgid "Paths"
+msgstr "Rutas"
+
+#. type: Plain text
+#: amule.1:75 amulecmd.1:212 amuleweb.1:137
+msgid ""
+"For all options which take a I<E<lt>pathE<gt>> value, if the I<path> "
+"contains no directory part (i.e. just a plain filename), then it is "
+"considered to be under the aMule configuration directory, I<~/.aMule>."
+msgstr ""
+"Todas las opciones que tengan I<E<lt>pathE<gt>> como valor, si I<path> "
+"contiene un directorio sin part (p.e. solo un archivo normal), entones se "
+"tomará el directorio de la configuración, I<~/.aMule>."
+
+#. type: SH
+#: amule.1:75 amulecmd.1:240 amuled.1:78 amuleweb.1:171 ed2k.1:60
+#: ../../src/utils/cas/docs/cas.1:36
+#, no-wrap
+msgid "FILES"
+msgstr "ARCHIVOS"
+
+#. type: Plain text
+#: amule.1:77 amuled.1:80
+msgid "~/.aMule/*"
+msgstr "~/.aMule/*"
+
+#. type: SH
+#: amule.1:77 amulecmd.1:256 amuled.1:80 amulegui.1:48 amuleweb.1:191
+#: ed2k.1:62 ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+#: ../../src/utils/cas/docs/cas.1:42 ../../src/utils/wxCas/docs/wxcas.1:16
+#: ../../src/utils/xas/docs/xas.1:16
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr "INFORMANDO ERRORES"
+
+#. type: Plain text
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+msgid ""
+"Please report bugs either on our forum (I<http://forum.amule.org/>), or in "
+"our bugtracker (I<http://bugs.amule.org/>).  Please do not report bugs in e-"
+"mail, neither to our mailing list nor directly to any team member."
+msgstr ""
+"Por favor informa de fallos ya sea en nuestro foro (I<http://forum.amule.org/"
+">), o en nuestro bugtracker (I<http://bugs.amule.org/>). Por favor no "
+"informe de fallos por correo, ni en nuestras listas, ni directamente al "
+"correo de algun miembro del equipo."
+
+#. type: SH
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr "COPYRIGHT"
+
+#. type: Plain text
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+msgid ""
+"aMule and all of its related utilities are distributed under the GNU General "
+"Public License."
+msgstr ""
+"aMule y todas las demás utilidades relacionadas son distribuidas bajo la GNU "
+"General Public License."
+
+#. type: SH
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "VEASE TAMBIEN"
+
+#. type: SH
+#: amule.1:84 amulecmd.1:263 amuled.1:87 amulegui.1:55 amuleweb.1:198
+#: ed2k.1:69 ../../src/utils/aLinkCreator/docs/alc.1:18
+#: ../../src/utils/aLinkCreator/docs/alcc.1:33
+#: ../../src/utils/cas/docs/cas.1:49 ../../src/utils/wxCas/docs/wxcas.1:23
+#: ../../src/utils/xas/docs/xas.1:23
+#, no-wrap
+msgid "AUTHOR"
+msgstr "AUTOR"
+
+#. type: Plain text
+#: amule.1:85 amulecmd.1:264 amuled.1:88 amuleweb.1:199 ed2k.1:70
+#: ../../src/utils/aLinkCreator/docs/alc.1:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1:34
+#: ../../src/utils/cas/docs/cas.1:50 ../../src/utils/wxCas/docs/wxcas.1:24
+#: ../../src/utils/xas/docs/xas.1:24
+msgid ""
+"This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Esta página de manualfue escrita por Vollstrecker E<lt>amule@vollstreckernet."
+"deE<gt>"
+
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "AMULECMD"
+msgstr "AMULECMD"
+
+#. type: TH
+#: amulecmd.1:1
+#, fuzzy, no-wrap
+#| msgid "aMuleCmd v2.3.0"
+msgid "aMuleCmd v2.3.1"
+msgstr "aMuleCmd v2.3.0"
+
+#. type: TH
+#: amulecmd.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 "aMule utilities"
+msgstr "aMule utilidades"
+
+#. type: Plain text
+#: amulecmd.1:7
+msgid "amulecmd - Console-based program to control aMule"
+msgstr "amulecmd - Programa basado en consola para controlar aMule"
+
+#. type: Plain text
+#: amulecmd.1:13 amuleweb.1:12
+msgid ""
+"[B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
+"I<E<lt>passwordE<gt>>] [B<-f> I<E<lt>pathE<gt>>]"
+msgstr ""
+"[B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
+"I<E<lt>passwordE<gt>>] [B<-f> I<E<lt>pathE<gt>>]"
+
+#. type: Plain text
+#: amulecmd.1:17
+msgid ""
+"[B<-l> I<E<lt>langE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>commandE<gt>>]"
+"B< >}"
+msgstr ""
+"[B<-l> I<E<lt>langE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>commandE<gt>>]"
+"B< >}"
+
+#. type: Plain text
+#: amulecmd.1:20 amuleweb.1:31
+msgid "[B<--create-config-from>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--create-config-from>=I<E<lt>pathE<gt>>]"
+
+#. type: Plain text
+#: amulecmd.1:29
+msgid "B<amulecmd> is a console-based client to control aMule."
+msgstr "B<amulecmd> es un cliente basado en consola para controlar aMule."
+
+#. type: TP
+#: amulecmd.1:29 amuleweb.1:46
+#, no-wrap
+msgid "B<[ -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<]>"
+msgstr "B<[ -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:33 amuleweb.1:50
+msgid ""
+"Host where aMule is running (default: I<localhost>).  I<E<lt>hostE<gt>> "
+"might be an IP address or a DNS name"
+msgstr ""
+"Host donde se está ejecutando aMule. (por defecto: I<localhost>).  "
+"I<E<lt>hostE<gt>> debe ser o una dirección IP o un nombre DNS"
+
+#. type: TP
+#: amulecmd.1:33 amuleweb.1:50
+#, no-wrap
+msgid "B<[ -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:36 amuleweb.1:53
+msgid ""
+"aMule's port for External Connections, as set in Preferences-E<gt>Remote "
+"Controls (default: I<4712>)"
+msgstr ""
+"Puerto de conexión externa de aMule, puesto en Opciones-E<gt>Controles "
+"Remotos (por defecto: 4712)"
+
+#. type: TP
+#: amulecmd.1:36 amuleweb.1:53
+#, no-wrap
+msgid "B<[ -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<]>"
+msgstr "B<[ -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:39 amuleweb.1:56
+msgid "External Connections password."
+msgstr "Contraseña de conexiones externas"
+
+#. type: TP
+#: amulecmd.1:39 amuleweb.1:56
+#, no-wrap
+msgid "B<[ -f> I<E<lt>pathE<gt>>, B<--config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -f> I<E<lt>pathE<gt>>, B<--config-file>=I<E<lt>pathE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:43 amuleweb.1:60
+msgid ""
+"Use the given configuration file.  Default configuration file is I<~/.aMule/"
+"remote.conf>"
+msgstr ""
+"Usar la configuración dada por el archivo. El archivo de configuración por "
+"defecto es I<~/.aMule/remote.conf>"
+
+#. type: Plain text
+#: amulecmd.1:46 amuleweb.1:63
+msgid "Do not print any output to stdout."
+msgstr "No mostrar nada por la salida estándar"
+
+#. type: Plain text
+#: amulecmd.1:50 amuleweb.1:67
+msgid "Be verbose - show also debug messages."
+msgstr "Modo Extendido - muestra también los mensajes de depuración."
+
+#. type: TP
+#: amulecmd.1:50 amuleweb.1:67
+#, no-wrap
+msgid "B<[ -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<]>"
+msgstr "B<[ -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:54 amuleweb.1:71
+msgid ""
+"Sets program locale (language).  See the B<NOTES> section for the "
+"description of the I<E<lt>langE<gt>> parameter."
+msgstr ""
+"Selecciona el idioma del programa. Ver la sección B<NOTAS> para la "
+"descripción del parámetro del I<E<lt>langE<gt>>."
+
+#. type: Plain text
+#: amulecmd.1:57 amuleweb.1:74
+msgid "Write command line options to config file and exit"
+msgstr ""
+"Escribe opciones de la línea de comando al archivo de configuración y "
+"termina."
+
+#. type: TP
+#: amulecmd.1:57
+#, no-wrap
+msgid "B<[ -c> I<E<lt>commandE<gt>>, B<--command>=I<E<lt>commandE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>commandE<gt>>, B<--command>=I<E<lt>commandE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:60
+msgid ""
+"Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and "
+"exit."
+msgstr ""
+"Ejecuta I<E<lt>comandoE<gt>> y sal como si este fuera introducido en "
+"amulecmd."
+
+#. type: TP
+#: amulecmd.1:60 amuleweb.1:117
+#, no-wrap
+msgid "B<[ --create-config-from>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --create-config-from>=I<E<lt>pathE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:63 amuleweb.1:120
+msgid ""
+"Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid "
+"aMule config file, and then exit."
+msgstr ""
+"Crear archivo de configuración basado en I<E<lt>pathE<gt>>, el cual debe "
+"apuntar a un archivo de configuración válido, y entonces termina."
+
+#. type: SH
+#: amulecmd.1:69
+#, no-wrap
+msgid "COMMANDS"
+msgstr "COMANDOS"
+
+#. type: Plain text
+#: amulecmd.1:71
+msgid "All commands are case insensitive."
+msgstr "Todos los comandos ignoran las mayúsculas."
+
+#. type: SS
+#: amulecmd.1:71
+#, no-wrap
+msgid "Add I<E<lt>eD2k-linkE<gt>> | I<E<lt>magnet-linkE<gt>>"
+msgstr "Añadir I<E<lt>eD2k-linkE<gt>> | I<E<lt>magnet-linkE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:73
+msgid "Adds an eD2k-link or a magnet-link to the core."
+msgstr "Añadir un enlace eD2k o un enlace magnet al núcleo."
+
+#. type: Plain text
+#: amulecmd.1:82
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list."
+msgstr ""
+"un enlace con una lista de servidores, se añadirán todos los servidores a la "
+"lista."
+
+#. type: Plain text
+#: amulecmd.1:85
+msgid "The magnet link must contain the eD2k hash and file length."
+msgstr "El enlace magnet debe contener un hash eD2k y la longitud del archivo."
+
+#. type: SS
+#: amulecmd.1:85
+#, no-wrap
+msgid "Cancel I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Cancelar I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:87
+msgid ""
+"Cancels the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:87
+#, no-wrap
+msgid "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|nameE<gt>> ]"
+msgstr "Conectar [ I<kad> | I<ed2k> | I<E<lt>ip|nameE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:89
+msgid "Connect to the network."
+msgstr "Conectar a la red."
+
+#. type: Plain text
+#: amulecmd.1:91
+msgid "This will connect to all networks that are enabled in Preferences."
+msgstr ""
+"Esto conectará a todas las redes que estén habilitadas en las preferencias."
+
+#. type: Plain text
+#: amulecmd.1:95
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:98
+msgid ""
+"Disconnect from all networks you are connected to, or just disconnect from "
+"the specified network."
+msgstr ""
+"Desconectar de todas las redes a las que estás conectado, o solamente "
+"desconecta de la red especificada."
+
+#. type: SS
+#: amulecmd.1:98
+#, no-wrap
+msgid "Download I<E<lt>numberE<gt>>"
+msgstr "Descarga I<E<lt>numberE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:100
+msgid "Start downloading a file."
+msgstr "Comenzar a descargar un archivo."
+
+#. type: Plain text
+#: amulecmd.1:104
+msgid ""
+"The I<E<lt>numberE<gt>> of a file from the last search has to be given.  "
+"Example: `download 12' will start to download the file with the number 12 of "
+"the previous search."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:106
+msgid "Disconnect from amule/amuled and quit amulecmd."
+msgstr "Desconectar de amule/amuled y salir de amulecmd."
+
+#. type: SS
+#: amulecmd.1:106
+#, no-wrap
+msgid "Get I<E<lt>whatE<gt>>"
+msgstr "Obtener I<E<lt>whatE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:108
+msgid "Get and display a preference value."
+msgstr "Obtener y mostrar un valor de opciones."
+
+#. type: Plain text
+#: amulecmd.1:110 amulecmd.1:144 amulecmd.1:173 amulecmd.1:183
+msgid "Available values for I<E<lt>whatE<gt>>:"
+msgstr "Valores disponibles para I<E<lt>whatE<gt>>:"
+
+#. type: Plain text
+#: amulecmd.1:113
+msgid "Get bandwidth limits."
+msgstr "Obtener limites de ancho de banda."
+
+#. type: Plain text
+#: amulecmd.1:115
+msgid "Get IPFilter preferences."
+msgstr "Obtener opciones del filtro IP."
+
+#. type: SS
+#: amulecmd.1:116
+#, no-wrap
+msgid "Help [ I<E<lt>commandE<gt>> ]"
+msgstr "Ayuda [ I<E<lt>commandE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:120
+msgid ""
+"Prints a short usage description.  If called without parameter, it shows a "
+"list of available commands.  If called with I<E<lt>commandE<gt>>, it shows a "
+"short description of the given command."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:120
+#, no-wrap
+msgid "Pause I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Pausa I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:122
+msgid ""
+"Pauses the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:122
+#, no-wrap
+msgid "Priority I<E<lt>priorityE<gt>> I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:124
+msgid ""
+"Set priority of a download specified by I<E<lt>hashE<gt>> or "
+"I<E<lt>numberE<gt>>."
+msgstr ""
+"Fijar la prioridad de una descarga especificada por I<E<lt>hashE<gt>> o "
+"I<E<lt>numberE<gt>>."
+
+#. type: Plain text
+#: amulecmd.1:126
+msgid "Available values for I<E<lt>priorityE<gt>>:"
+msgstr "Valores disponibles para I<E<lt>priorityE<gt>>:"
+
+#. type: Plain text
+#: amulecmd.1:129
+msgid "Automatic priority."
+msgstr "Prioridad automática."
+
+#. type: Plain text
+#: amulecmd.1:131
+msgid "High priority."
+msgstr "Prioridad alta."
+
+#. type: Plain text
+#: amulecmd.1:133
+msgid "Low priority."
+msgstr "Prioridad baja."
+
+#. type: Plain text
+#: amulecmd.1:135
+msgid "Normal priority."
+msgstr "Prioridad normal."
+
+#. type: Plain text
+#: amulecmd.1:138
+msgid "Shows the progress of an on-going search."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:140
+msgid "A synonim of the B<exit> command."
+msgstr "Un sinónimo del comando B<exit>."
+
+#. type: SS
+#: amulecmd.1:140
+#, no-wrap
+msgid "Reload I<E<lt>whatE<gt>>"
+msgstr "Recargar I<E<lt>whatE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:142
+msgid "Reloads a given object."
+msgstr "Recargar un objeto dado."
+
+#. type: Plain text
+#: amulecmd.1:147
+msgid "Reload shared files list."
+msgstr "Recargar lista de archivos compartidos."
+
+#. type: Plain text
+#: amulecmd.1:149
+msgid "Reload IP filter tables."
+msgstr "Recargar tablas de filtros IP."
+
+#. type: Plain text
+#: amulecmd.1:152
+msgid "Reset the log."
+msgstr "Reiniciar el registro."
+
+#. type: Plain text
+#: amulecmd.1:154
+msgid "Shows you the results of the last search."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:154
+#, no-wrap
+msgid "Resume I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:156
+msgid ""
+"Resumes the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:156
+#, no-wrap
+msgid "Search I<E<lt>typeE<gt>> I<E<lt>keywordE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:159
+msgid ""
+"Makes a search for the given I<E<lt>keywordE<gt>>. A search type and a "
+"keyword to search is mandatory to do this.  Example: `search kad amule' "
+"performs a kad search for `amule'."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:161
+msgid "Available search types:"
+msgstr "Tipos de búsquedas disponibles:"
+
+#. type: Plain text
+#: amulecmd.1:164
+msgid "Performs a global search."
+msgstr "Realiza una búsqueda global."
+
+#. type: Plain text
+#: amulecmd.1:166
+msgid "Performs a search on the Kademlia network."
+msgstr "Realiza una búsqueda en la red Kademlia."
+
+#. type: Plain text
+#: amulecmd.1:168
+msgid "Performs a local search."
+msgstr "Realiza una búsqueda local."
+
+#. type: SS
+#: amulecmd.1:169
+#, no-wrap
+msgid "Set I<E<lt>whatE<gt>>"
+msgstr "Fija I<E<lt>whatE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:171
+msgid "Sets a given preferences value."
+msgstr "Asigna un valor dado de opción."
+
+#. type: Plain text
+#: amulecmd.1:176
+msgid "Set bandwidth limits."
+msgstr "Asignar limites de ancho de banda."
+
+#. type: Plain text
+#: amulecmd.1:178
+msgid "Set IPFilter preferences."
+msgstr "Fija las opciones del FiltroIP"
+
+#. type: SS
+#: amulecmd.1:179
+#, no-wrap
+msgid "Show I<E<lt>whatE<gt>>"
+msgstr "Mostrar I<E<lt>whatE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:181
+msgid "Shows upload/download queue, servers list or shared files list."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:186
+msgid "Show download queue."
+msgstr "Mostrar cola de descarga."
+
+#. type: Plain text
+#: amulecmd.1:188
+msgid "Show log."
+msgstr "Mostrar registro."
+
+#. type: Plain text
+#: amulecmd.1:190
+msgid "Show servers list."
+msgstr "Mostrar lista de servidores."
+
+#. type: Plain text
+#: amulecmd.1:192
+msgid "Show upload queue."
+msgstr "Mostrar cola de subida."
+
+#. type: Plain text
+#: amulecmd.1:196
+msgid ""
+"Shutdown the remote running core (amule/amuled).  This will also shut down "
+"the text client, since it is unusable without a running core."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:196
+#, no-wrap
+msgid "Statistics [ I<E<lt>numberE<gt>> ]"
+msgstr "Estadísticas [ I<E<lt>numberE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:198
+msgid "Show statistics tree."
+msgstr "Mostrar árbol de estadísticas."
+
+#. type: Plain text
+#: amulecmd.1:202
+msgid ""
+"The optional I<E<lt>numberE<gt>> in the range of 0-255 can be passed as "
+"argument to this command, which tells how many entries of the client version "
+"subtree should be shown. Passing 0, or omitting it means `unlimited'."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:205
+msgid ""
+"Example: `statistics 5' will show only the top 5 versions for each client "
+"type."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:207
+msgid "Show connection status, current up/download speeds, etc."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:212 amuleweb.1:137
+#, no-wrap
+msgid "Languages"
+msgstr "Lenguajes"
+
+#. type: Plain text
+#: amulecmd.1:218 amuleweb.1:143
+msgid ""
+"The I<E<lt>langE<gt>> parameter for the B<-l> option has the following form: "
+"I<lang>[B<_>I<LANG>][B<.>I<encoding>][B<@>I<modifier>] where I<lang> is the "
+"primary language, I<LANG> is a sublanguage/territory, I<encoding> is the "
+"character set to use and I<modifier> allows the user to select a specific "
+"instance of localization data within a single category."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:220 amuleweb.1:145
+msgid "For example, the following strings are valid:"
+msgstr "Por ejemplo, las siguientes cadenas son válidas:"
+
+#. type: Plain text
+#: amulecmd.1:234 amuleweb.1:159
+msgid ""
+"Though all the above strings are accepted as valid language definitions, "
+"I<encoding> and I<modifier> are yet unused."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:237 amuleweb.1:162
+msgid ""
+"In addition to the format above, you can also specify full language names in "
+"English - so B<-l german> is also valid and is equal to B<-l de_DE>."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:240 amuleweb.1:165
+msgid ""
+"When no locale is defined, either on command-line or in config file, system "
+"default language will be used."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:242 amuleweb.1:173
+msgid "~/.aMule/remote.conf"
+msgstr "~/.aMule/remote.conf"
+
+#. type: SH
+#: amulecmd.1:242 amuleweb.1:177
+#, no-wrap
+msgid "EXAMPLE"
+msgstr "EJEMPLO"
+
+#. type: Plain text
+#: amulecmd.1:244
+msgid "Typically amulecmd will be first run as:"
+msgstr "Normalmente amulecmd se ejecutara primero como::"
+
+#. type: Plain text
+#: amulecmd.1:246
+msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
+msgstr ""
+"B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
+
+#. type: Plain text
+#: amulecmd.1:248 amuleweb.1:183
+msgid "or"
+msgstr "o"
+
+#. type: Plain text
+#: amulecmd.1:250
+msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr "B<amulecmd> B<--create-config-from>=I</home/usuario/.aMule/amule.conf>"
+
+#. type: Plain text
+#: amulecmd.1:252 amuleweb.1:187
+msgid ""
+"These will save settings to I<$HOME/.aMule/remote.conf>, and later you only "
+"need to type:"
+msgstr ""
+"Esto guardará las opciones en I<$HOME/.aMule/remote.conf>, y después sólo "
+"tiene que escribir:"
+
+#. type: Plain text
+#: amulecmd.1:256
+msgid "Of course, you don't have to follow this example."
+msgstr ""
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "AMULED"
+msgstr "AMULED"
+
+#. 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"
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon"
+msgstr "Demonio aMule"
+
+#. type: Plain text
+#: amuled.1:6
+msgid "amuled - the all-platform eMule p2p client - daemonized version"
+msgstr ""
+
+#. type: Plain text
+#: amuled.1:9 ../../src/utils/cas/docs/cas.1:11
+msgid "[B<-c> I<E<lt>pathE<gt>>]"
+msgstr "[B<-c> I<E<lt>pathE<gt>>]"
+
+#. type: Plain text
+#: amuled.1:11
+msgid "[B<-p> I<E<lt>pathE<gt>>]"
+msgstr "[B<-p> I<E<lt>pathE<gt>>]"
+
+#. type: Plain text
+#: amuled.1:32
+msgid "Forks to background."
+msgstr "Enviar a segundo plano."
+
+#. type: TP
+#: amuled.1:32
+#, no-wrap
+msgid "B<[ -p> I<E<lt>pathE<gt>>, B<--pid-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>pathE<gt>>, B<--pid-file>=I<E<lt>pathE<gt>> B<]>"
+
+#. type: Plain text
+#: amuled.1:36
+msgid ""
+"After fork, create a pid-file in the I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> "
+"has to contain the filename."
+msgstr ""
+
+#. type: Plain text
+#: amuled.1:39
+msgid "Configure EC (External Connections)."
+msgstr ""
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "AMULEGUI"
+msgstr "AMULEGUI"
+
+#. type: TH
+#: amulegui.1:1
+#, fuzzy, no-wrap
+#| msgid "aMuleGUI v2.3.0"
+msgid "aMuleGUI v2.3.1"
+msgstr "aMuleGUI v2.3.0"
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
+
+#. type: Plain text
+#: amulegui.1:6
+msgid "amulegui - aMule control program with GUI"
+msgstr "amulegui - Programa para controlar aMule con Interfaz Gráfica"
+
+#. type: Plain text
+#: amulegui.1:14
+msgid "[B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-t> I<E<lt>numE<gt>>]"
+
+#. type: Plain text
+#: amulegui.1:24
+msgid ""
+"B<amulegui> is a client program, and can be connected to amule or amuled via "
+"EC. You can manage your amule program with it. It provides almost the same "
+"functionalities as amule, even if the core works on another computer."
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1:39
+msgid "Skip connection dialog."
+msgstr "Saltar diálogo de conexión"
+
+#. type: Plain text
+#: amulegui.1:57
+msgid ""
+"This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm "
+"DOT orgE<gt>"
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1:58
+msgid ""
+"This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "AMULEWEB"
+msgstr "AMULEWEB"
+
+#. 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"
+
+#. type: Plain text
+#: amuleweb.1:6
+msgid "amuleweb - aMule web server"
+msgstr "amuleweb - servidor web de aMule"
+
+#. type: Plain text
+#: amuleweb.1:15
+msgid "[B<-l> I<E<lt>langE<gt>>]"
+msgstr "[B<-l> I<E<lt>langE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:18
+msgid "[B<-t> I<E<lt>nameE<gt>>] [B<-s> I<E<lt>portE<gt>>]"
+msgstr "[B<-t> I<E<lt>nameE<gt>>] [B<-s> I<E<lt>portE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:20
+msgid "[B<-U> I<E<lt>portE<gt>>]"
+msgstr "[B<-U> I<E<lt>portE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:24
+msgid "[B<-A> I<E<lt>passwordE<gt>>] [B<-G> I<E<lt>passwordE<gt>>]"
+msgstr "[B<-A> I<E<lt>passwordE<gt>>] [B<-G> I<E<lt>passwordE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:40
+msgid "[B<--amule-config-file>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--amule-config-file>=I<E<lt>pathE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:46
+msgid ""
+"B<amuleweb> manages your access to amule through a web browser.  You can "
+"start amuleweb together with B<amule>(1), or separately, any time later.  "
+"Options can be specified via command-line or via config-file.  Command-line "
+"options take precedence over config-file options."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1:74
+#, no-wrap
+msgid "B<[ -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<]>"
+msgstr "B<[ -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:77
+msgid ""
+"Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section "
+"for details."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1:77
+#, no-wrap
+msgid "B<[ -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:80
+msgid ""
+"Webserver's HTTP port. This is the port you must point your browser to "
+"(default: I<4711>)."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:84
+msgid "Enable UPnP."
+msgstr "Habilitar UPnP."
+
+#. type: TP
+#: amuleweb.1:84
+#, no-wrap
+msgid "B<[ -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:87
+msgid "UPnP port."
+msgstr "Puerto UPnP."
+
+#. type: Plain text
+#: amuleweb.1:90
+msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:93
+msgid "Disables using gzip compression (this is the default)."
+msgstr "Deshabilitar la compresión gzip (esto es por defecto)."
+
+#. type: TP
+#: amuleweb.1:93
+#, no-wrap
+msgid "B<[ -A> I<E<lt>passwdE<gt>>, B<--admin-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -A> I<E<lt>passwdE<gt>>, B<--admin-pass>=I<E<lt>passwdE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:96
+msgid "Full access password for webserver."
+msgstr "Contraseña de acceso completo al servidor web."
+
+#. type: TP
+#: amuleweb.1:96
+#, no-wrap
+msgid "B<[ -G> I<E<lt>passwdE<gt>>, B<--guest-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -G> I<E<lt>passwdE<gt>>, B<--guest-pass>=I<E<lt>passwdE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:99
+msgid "Guest password for webserver."
+msgstr "Contraseña de invitado al servidor web."
+
+#. type: Plain text
+#: amuleweb.1:102
+msgid "Allows guest access."
+msgstr "Permitir acceso invitado."
+
+#. type: Plain text
+#: amuleweb.1:105
+msgid "Denies guest access (default)."
+msgstr "Deniega el acceso invitado (defecto)"
+
+#. type: Plain text
+#: amuleweb.1:111
+msgid ""
+"Load/save webserver settings from/to remote aMule.  This causes amuleweb to "
+"ignore command-line and config-file settings, and load them from aMule.  "
+"When saving preferences none will be written to the config file, but to "
+"aMule.  (Of course, this works only for those settings that can be set in "
+"aMule's Preferences-E<gt>Remote Controls.)"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:114
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Deshabilitar interprete PHP (obsoleto)"
+
+#. type: Plain text
+#: amuleweb.1:117
+msgid "Recompiles PHP pages on each request."
+msgstr "Recompilar páginas PHP en cada solicitud."
+
+#. type: TP
+#: amuleweb.1:126
+#, no-wrap
+msgid "B<[ --amule-config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --amule-config-file>=I<E<lt>pathE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:132
+msgid ""
+"aMule config file path.  B<DO NOT USE DIRECTLY!> aMule uses this option when "
+"starting amuleweb at aMule startup.  This option causes all other command-"
+"line and config-file settings to be ignored, preferences to be read from the "
+"given config file, and also implies the B<-q -L> options."
+msgstr ""
+
+#. type: SH
+#: amuleweb.1:165
+#, no-wrap
+msgid "SKIN SUPPORT"
+msgstr "SOPORTE TEMAS."
+
+#. type: Plain text
+#: amuleweb.1:169
+msgid ""
+"B<amuleweb> is capable of displaying information in different skins.  These "
+"skins are called templates, and you can make amuleweb load a specific "
+"template via the B<-t> command line option.  Templates are searched in two "
+"places: first in I<~/.aMule/webserver/> and then in I</usr/share/amule/"
+"webserver/> if you installed with --prefix=/usr."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:171
+msgid ""
+"Each template must be in a subdirectory of the template name, and this "
+"directory must contain all files the template needs."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:175
+msgid "~/.aMule/webserver/"
+msgstr "~/.aMule/webserver/"
+
+#. type: Plain text
+#: amuleweb.1:177
+msgid "I<$(pkgdatadir)>/webserver/"
+msgstr "I<$(pkgdatadir)>/webserver/"
+
+#. type: Plain text
+#: amuleweb.1:179
+msgid "Typically amuleweb will be first run as:"
+msgstr "Normalmente amuleweb se ejecutara primero como:"
+
+#. type: Plain text
+#: amuleweb.1:181
+msgid ""
+"B<amuleweb> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-s> "
+"I<HTTPport> B<-A> I<AdminPassword> B<-w>"
+msgstr ""
+"B<amuleweb> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-s> "
+"I<HTTPport> B<-A> I<AdminPassword> B<-w>"
+
+#. type: Plain text
+#: amuleweb.1:185
+msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr "B<amuleweb> B<--create-config-from>=I</home/usuario/.aMule/amule.conf>"
+
+#. type: Plain text
+#: amuleweb.1:191
+msgid ""
+"Of course, you may specify any more or less options on the first example "
+"line, and you may also totally omit it."
+msgstr ""
+"Por supuesto, puede especificar las opciones en el ejemplo de la primera "
+"linea, y también puede omitirlo."
+
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "ED2K"
+msgstr "ED2K"
+
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "aMule eD2k link parser v1.5.1"
+msgstr "Analizador aMule de enlaces eD2k v1.5.1"
+
+#. type: Plain text
+#: ed2k.1:6
+msgid "ed2k - aMule eD2k link parser"
+msgstr "ed2k - analizador aMule de enlaces eD2k"
+
+#. type: Plain text
+#: ed2k.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-c> I<E<lt>pathE<gt>>] [B<-t> I<E<lt>numE<gt>>]"
+
+#. 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-LinkE<gt>>"
+
+#. type: Plain text
+#: ed2k.1:21
+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 ""
+
+#. type: Plain text
+#: ed2k.1:30
+msgid ""
+"Loads all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1:33
+msgid ""
+"Lists all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1:53
+msgid "a magnet link;"
+msgstr "Un enlace magnet;"
+
+#. type: Plain text
+#: ed2k.1:55
+msgid "an emulecollection file."
+msgstr "Un archivo emulecollection."
+
+#. type: Plain text
+#: ed2k.1:60
+msgid ""
+"B<The order in which you give the parameters is important.> You can give "
+"more than one link, and every link can have it's own params.  For example "
+"B<ed2k E<lt>link1E<gt> -t2 E<lt>link2E<gt>> will download I<E<lt>link1E<gt>> "
+"in standard category and I<E<lt>link2E<gt>> in category 2."
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1:62
+msgid "~/.aMule/ED2KLinks"
+msgstr "~/.aMule/ED2KLinks"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "ALC"
+msgstr "ALC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "aLinkCreator"
+msgstr "aLinkCreator"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+msgid "aLinkCreator - the aMule eD2k link creator"
+msgstr "aLinkCreator - el creador de enlaces eD2k de aMule"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:9
+msgid ""
+"B<alc> is a graphical utility to create an eD2k link to any file on your "
+"computer."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/wxCas/docs/wxcas.1:16
+msgid "This app doesn't take any arguments."
+msgstr "Esta apli no tiene ningún argumento."
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "ALCC"
+msgstr "ALCC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "aMule eD2k links calculator"
+msgstr "Calculador de enlaces eD2k de aMule"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6
+msgid "alcc - text based eD2k links calculator for aMule"
+msgstr "alcc - calculador de enlaces eD2k basado en texto para aMule"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:11
+msgid "I<E<lt>inputfiles_listE<gt>>"
+msgstr "I<E<lt>inputfiles_listE<gt>>"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:16
+msgid ""
+"Compute the eD2k links of all the input files given in the "
+"I<E<lt>inputfiles_listE<gt>> (There can be one or more files)."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:19
+msgid "Compute and add part hashes to the computed eD2k links."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+msgid "Be verbose - show also calculation steps."
+msgstr "Modo Extendido - muestra también los pasos de cálculo."
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "CAS"
+msgstr "CAS"
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "cas v0.8"
+msgstr "cas v0.8"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:6
+msgid "cas - c aMule statistics"
+msgstr "cas - c estadisticas de aMule"
+
+#. 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
+msgid ""
+"Writes the online signature picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:26
+msgid ""
+"HTML page with stats and picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:34
+msgid "Without any options, it prints online signature data to stdout."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:36
+msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:38
+msgid "~/.aMule/casrc"
+msgstr "~/.aMule/casrc"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:40
+msgid "stat.png"
+msgstr "stat.png"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:42
+msgid "tmp.html"
+msgstr "tmp.html"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "WXCAS"
+msgstr "WXCAS"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "wxCas"
+msgstr "wxCas"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:5
+msgid "wxcas - wx c aMule statistics"
+msgstr "wxcas - wx c estadísticas de aMule"
+
+#. 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
+msgid ""
+"Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt>"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "XAS"
+msgstr "XAS"
+
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "xas v1.9"
+msgstr "xas v1.9"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:5
+msgid "xas - X-Chat aMule Statistics"
+msgstr "xas - Estadísticas aMule para X-Chat"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:7
+msgid "B<none>"
+msgstr "B<none>"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:12
+#, 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<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 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/xas/docs/xas.1:14
+msgid ""
+"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)."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:16
+msgid "B<xas> was originally written by niet"
+msgstr "B<xas> fué escrito originalmente por niet"
+
+#~ msgid "January 2010"
+#~ msgstr "Enero 2010"
+
+#~ msgid "When giving kad, it connects to Kad only."
+#~ msgstr "Al dar kad, solamente se conecta a Kad."

aMule-2.3.1.tar.bz2/docs/man/po/manpages-fr.add Added

aMule-2.3.1.tar.bz2/docs/man/po/manpages-fr.po Added

@@ -0,0 +1,1739 @@
+# aMule i18n resource file.
+# Copyright (C) 2010 - 2011 aMule Team
+# This file is distributed under the same license as the aMule package.
+#
+# Translation of aMule to French
+#
+# Dylan Aïssi <bob.dybian@gmail.com>, 2010 - 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: aMule\n"
+"POT-Creation-Date: 2011-10-31 22:06+0100\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "AMULE"
+msgstr "AMULE"
+
+#. 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"
+msgstr "Novembre 2011"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule v2.3.1"
+msgstr "aMule v2.3.1"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule"
+msgstr "aMule"
+
+#. type: SH
+#: amule.1:4 amulecmd.1:5 amuled.1:4 amuleweb.1:4 ed2k.1:4
+#: ../../src/utils/aLinkCreator/docs/alc.1:3
+#: ../../src/utils/aLinkCreator/docs/alcc.1:4 ../../src/utils/cas/docs/cas.1:4
+#: ../../src/utils/wxCas/docs/wxcas.1:3 ../../src/utils/xas/docs/xas.1:3
+#, no-wrap
+msgid "NAME"
+msgstr "NOM"
+
+#. type: Plain text
+#: amule.1:6
+msgid "amule - the all-platform eMule p2p client"
+msgstr "amule - le client P2P eMule multiplateforme"
+
+#. type: SH
+#: amule.1:6 amulecmd.1:7 amuled.1:6 amulegui.1:6 amuleweb.1:6 ed2k.1:6
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6 ../../src/utils/cas/docs/cas.1:6
+#: ../../src/utils/wxCas/docs/wxcas.1:5 ../../src/utils/xas/docs/xas.1:5
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "SYNOPSIS"
+
+#. type: Plain text
+#: amule.1:10 amulegui.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-geometry> I<E<lt>geomE<gt>>]"
+msgstr "[B<-c> I<E<lt>cheminE<gt>>] [B<-geometry> I<E<lt>géomE<gt>>]"
+
+#. type: Plain text
+#: amule.1:13 amuled.1:15
+msgid "[B<-w> I<E<lt>pathE<gt>>]"
+msgstr "[B<-w> I<E<lt>cheminE<gt>>]"
+
+#. type: Plain text
+#: amule.1:17 amuled.1:19
+msgid "[B<-t> I<E<lt>numE<gt>>] [I<eD2k-link>]"
+msgstr "[B<-t> I<E<lt>numE<gt>>] [I<lien eD2k>]"
+
+#. type: SH
+#: amule.1:24 amulecmd.1:26 amuled.1:25 amulegui.1:20 amuleweb.1:41 ed2k.1:19
+#: ../../src/utils/aLinkCreator/docs/alc.1:7
+#: ../../src/utils/aLinkCreator/docs/alcc.1:14
+#: ../../src/utils/cas/docs/cas.1:14 ../../src/utils/wxCas/docs/wxcas.1:7
+#: ../../src/utils/xas/docs/xas.1:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "DESCRIPTION"
+
+#. type: TP
+#: amule.1:25 amuled.1:26 amulegui.1:24 ed2k.1:21
+#: ../../src/utils/cas/docs/cas.1:26
+#, no-wrap
+msgid "B<[ -c> I<E<lt>pathE<gt>>, B<--config-dir>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>cheminE<gt>>, B<--config-dir>=I<E<lt>cheminE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:28 amuled.1:29 amulegui.1:27 ed2k.1:24
+#: ../../src/utils/cas/docs/cas.1:29
+msgid "Read config from I<E<lt>pathE<gt>> instead of home"
+msgstr ""
+"Utiliser le fichier de config I<E<lt>cheminE<gt>> à la place de celui par "
+"défaut"
+
+#. type: TP
+#: amule.1:28 amulegui.1:27
+#, no-wrap
+msgid "B<[ -geometry >I<E<lt>geomE<gt>> B<]>"
+msgstr "B<[ -geometry >I<E<lt>géomE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:31 amulegui.1:30
+msgid ""
+"Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as "
+"standard X11 apps:\t[B<=>][I<E<lt>widthE<gt>>{B<xX>}I<E<lt>heightE<gt>>][{B<"
+"+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>]"
+msgstr ""
+"Fixer la géometrie de l'application. I<E<lt>géomE<gt>> utilise le meme "
+"format que les applications X11 standards :\t[B<=>][I<E<lt>largeurE<gt>>"
+"{B<xX>}I<E<lt>hauteurE<gt>>][{B<+->}I<E<lt>xoffsetE<gt>>{B<+->}"
+"I<E<lt>yoffsetE<gt>>]"
+
+#. type: Plain text
+#: amule.1:34 amuled.1:42 amulegui.1:33
+msgid "Prints log messages to stdout."
+msgstr "Afficher les messages du journal sur stdout."
+
+#. type: Plain text
+#: amule.1:37 amuled.1:45 amulegui.1:36
+msgid "Resets config to default values."
+msgstr "Réinitialiser la configuration par défaut."
+
+#. type: TP
+#: amule.1:37 amuled.1:45
+#, no-wrap
+msgid "B<[ -w> I<E<lt>pathE<gt>>, B<--use-amuleweb>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -w> I<E<lt>cheminE<gt>>, B<--use-amuleweb>=I<E<lt>cheminE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:40 amuled.1:48
+msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
+msgstr "Préciser l'emplacement du binaire d'amuleweb I<E<lt>cheminE<gt>>."
+
+#. type: Plain text
+#: amule.1:43 amuled.1:51
+msgid "Does not handle fatal exception."
+msgstr "Ne pas prendre en charge une exception fatale."
+
+#. type: Plain text
+#: amule.1:46 amuled.1:54
+msgid "Does not disable stdin."
+msgstr "Ne pas désactiver stdin."
+
+#. type: TP
+#: amule.1:46 amuled.1:54 amulegui.1:39 ed2k.1:24
+#, no-wrap
+msgid "B<[ -t>, B<--category>=I<E<lt>numE<gt>> B<]>"
+msgstr "B<[ -t>, B<--category>=I<E<lt>numE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:49 amuled.1:57 amulegui.1:42 ed2k.1:27
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
+msgstr "Définir la catégorie pour les liens eD2k passé à  I<E<lt>numE<gt>>"
+
+#. type: Plain text
+#: amule.1:52 amulecmd.1:66 amuled.1:60 amulegui.1:48 amuleweb.1:126 ed2k.1:39
+msgid "Displays the current version number."
+msgstr "Affiche le numéro de la version actuelle."
+
+#. type: Plain text
+#: amule.1:55 amulecmd.1:69 amuled.1:63 amulegui.1:45 amuleweb.1:123 ed2k.1:36
+#: ../../src/utils/aLinkCreator/docs/alcc.1:22
+#: ../../src/utils/cas/docs/cas.1:32
+msgid "Prints a short usage description."
+msgstr "Afficher une court description d'utilisation."
+
+#. type: TP
+#: amule.1:55 amuled.1:63 ed2k.1:39
+#, no-wrap
+msgid "B<[ eD2k-link ]>"
+msgstr "B<[ lien eD2k ]>"
+
+#. type: Plain text
+#: amule.1:58 amuled.1:66 ed2k.1:42
+msgid "Adds an eD2k-link to the core."
+msgstr "Ajoute un lien eD2k au noyau."
+
+#. type: Plain text
+#: amule.1:60 amulecmd.1:75 amuled.1:68 ed2k.1:44
+msgid "The eD2k link to be added can be:"
+msgstr "Le lien eD2k à ajouter peut être :"
+
+#. type: Plain text
+#: amule.1:63 amulecmd.1:78 amuled.1:71 ed2k.1:47
+msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
+msgstr ""
+"un lien fichier (ed2k://|fichier|…), il sera ajouté à la file de "
+"téléchargement;"
+
+#. type: Plain text
+#: amule.1:65 amulecmd.1:80 amuled.1:73 ed2k.1:49
+msgid ""
+"a server link (ed2k://|server|...), it will be added to the server list;"
+msgstr ""
+"un lien serveur (ed2k://|serveur|…), il sera ajouté à la liste des serveurs;"
+
+#. type: Plain text
+#: amule.1:67 amuled.1:75 ed2k.1:51
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list;"
+msgstr ""
+"un lien de liste de serveurs, dans ce cas tous les serveurs dans la liste "
+"seront ajoutés à la liste des serveurs;"
+
+#. type: Plain text
+#: amule.1:69 amuled.1:77
+msgid "a magnet link."
+msgstr "un lien magnétique."
+
+#. type: SH
+#: amule.1:70 amulecmd.1:207 amuleweb.1:132
+#, no-wrap
+msgid "NOTES"
+msgstr "NOTES"
+
+#. type: SS
+#: amule.1:71 amulecmd.1:208 amuleweb.1:133
+#, no-wrap
+msgid "Paths"
+msgstr "Chemins"
+
+#. type: Plain text
+#: amule.1:75 amulecmd.1:212 amuleweb.1:137
+msgid ""
+"For all options which take a I<E<lt>pathE<gt>> value, if the I<path> "
+"contains no directory part (i.e. just a plain filename), then it is "
+"considered to be under the aMule configuration directory, I<~/.aMule>."
+msgstr ""
+"Pour toutes les options prenant en paramètre un I<E<lt>cheminE<gt>>, si le "
+"I<chemin> ne contient pas de répertoire (i.e. juste un nom de fichier), "
+"alors il sera considéré comme étant dans le répertoire de configuration "
+"d'aMule, I<~/.aMule>."
+
+#. type: SH
+#: amule.1:75 amulecmd.1:240 amuled.1:78 amuleweb.1:171 ed2k.1:60
+#: ../../src/utils/cas/docs/cas.1:36
+#, no-wrap
+msgid "FILES"
+msgstr "FICHIERS"
+
+#. type: Plain text
+#: amule.1:77 amuled.1:80
+msgid "~/.aMule/*"
+msgstr "~/.aMule/*"
+
+#. type: SH
+#: amule.1:77 amulecmd.1:256 amuled.1:80 amulegui.1:48 amuleweb.1:191
+#: ed2k.1:62 ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+#: ../../src/utils/cas/docs/cas.1:42 ../../src/utils/wxCas/docs/wxcas.1:16
+#: ../../src/utils/xas/docs/xas.1:16
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr "RAPPORTER DES BOGUES"
+
+#. type: Plain text
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+msgid ""
+"Please report bugs either on our forum (I<http://forum.amule.org/>), or in "
+"our bugtracker (I<http://bugs.amule.org/>).  Please do not report bugs in e-"
+"mail, neither to our mailing list nor directly to any team member."
+msgstr ""
+"Veuillez rapporter les bogues sur notre forum (I<http://forum.amule.org/>), "
+"ou sur notre bugtracker (I<http://bugs.amule.org/>).  Veuillez ne pas "
+"rapporter les bogues par e-mail, sur notre liste de diffusion ou directement "
+"à n'importe quel membre  de l'équipe."
+
+#. type: SH
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr "COPYRIGHT"
+
+#. type: Plain text
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+msgid ""
+"aMule and all of its related utilities are distributed under the GNU General "
+"Public License."
+msgstr ""
+"aMule et tout ses outils sont distribués sous la licence GNU General Public "
+"License."
+
+#. type: SH
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "VOIR AUSSI"
+
+#. type: SH
+#: amule.1:84 amulecmd.1:263 amuled.1:87 amulegui.1:55 amuleweb.1:198
+#: ed2k.1:69 ../../src/utils/aLinkCreator/docs/alc.1:18
+#: ../../src/utils/aLinkCreator/docs/alcc.1:33
+#: ../../src/utils/cas/docs/cas.1:49 ../../src/utils/wxCas/docs/wxcas.1:23
+#: ../../src/utils/xas/docs/xas.1:23
+#, no-wrap
+msgid "AUTHOR"
+msgstr "AUTEUR"
+
+#. type: Plain text
+#: amule.1:85 amulecmd.1:264 amuled.1:88 amuleweb.1:199 ed2k.1:70
+#: ../../src/utils/aLinkCreator/docs/alc.1:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1:34
+#: ../../src/utils/cas/docs/cas.1:50 ../../src/utils/wxCas/docs/wxcas.1:24
+#: ../../src/utils/xas/docs/xas.1:24
+msgid ""
+"This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Cette manpage a été écrite par Vollstrecker E<lt>amule@vollstreckernet."
+"deE<gt>"
+
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "AMULECMD"
+msgstr "AMULECMD"
+
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "aMuleCmd v2.3.1"
+msgstr "aMuleCmd v2.3.1"
+
+#. type: TH
+#: amulecmd.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 "aMule utilities"
+msgstr "Outils d'aMule"
+
+#. type: Plain text
+#: amulecmd.1:7
+msgid "amulecmd - Console-based program to control aMule"
+msgstr "amulecmd - Programme de contrôle d'aMule en mode texte"
+
+#. type: Plain text
+#: amulecmd.1:13 amuleweb.1:12
+msgid ""
+"[B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
+"I<E<lt>passwordE<gt>>] [B<-f> I<E<lt>pathE<gt>>]"
+msgstr ""
+"[B<-h> I<E<lt>hôteE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
+"I<E<lt>motdepasseE<gt>>] [B<-f> I<E<lt>cheminE<gt>>]"
+
+#. type: Plain text
+#: amulecmd.1:17
+msgid ""
+"[B<-l> I<E<lt>langE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>commandE<gt>>]"
+"B< >}"
+msgstr ""
+"[B<-l> I<E<lt>langE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>commandeE<gt>>]"
+"B< >}"
+
+#. type: Plain text
+#: amulecmd.1:20 amuleweb.1:31
+msgid "[B<--create-config-from>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--create-config-from>=I<E<lt>cheminE<gt>>]"
+
+#. type: Plain text
+#: amulecmd.1:29
+msgid "B<amulecmd> is a console-based client to control aMule."
+msgstr "B<amulecmd> est un client en mode texte pour contrôler aMule."
+
+#. type: TP
+#: amulecmd.1:29 amuleweb.1:46
+#, no-wrap
+msgid "B<[ -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<]>"
+msgstr "B<[ -h> I<E<lt>hôteE<gt>>, B<--host>=I<E<lt>hôteE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:33 amuleweb.1:50
+msgid ""
+"Host where aMule is running (default: I<localhost>).  I<E<lt>hostE<gt>> "
+"might be an IP address or a DNS name"
+msgstr ""
+"Hôte où aMule fonctionne (par défaut : I<localhost>). I<E<lt>hôteE<gt>>  "
+"peut être une adresse IP ou un nom DNS."
+
+#. type: TP
+#: amulecmd.1:33 amuleweb.1:50
+#, no-wrap
+msgid "B<[ -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:36 amuleweb.1:53
+msgid ""
+"aMule's port for External Connections, as set in Preferences-E<gt>Remote "
+"Controls (default: I<4712>)"
+msgstr ""
+"Port d'aMule pour les Connexions Externes, tel que défini dans Préférences-"
+"E<gt>Contrôles à Distance (défaut: I<4712>)"
+
+#. type: TP
+#: amulecmd.1:36 amuleweb.1:53
+#, no-wrap
+msgid "B<[ -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<]>"
+msgstr "B<[ -P> I<E<lt>motdepasseE<gt>>, B<--password>=I<E<lt>motdepasseE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:39 amuleweb.1:56
+msgid "External Connections password."
+msgstr "Mot de passe des connexions externes."
+
+#. type: TP
+#: amulecmd.1:39 amuleweb.1:56
+#, no-wrap
+msgid "B<[ -f> I<E<lt>pathE<gt>>, B<--config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -f> I<E<lt>cheminE<gt>>, B<--config-file>=I<E<lt>cheminE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:43 amuleweb.1:60
+msgid ""
+"Use the given configuration file.  Default configuration file is I<~/.aMule/"
+"remote.conf>"
+msgstr ""
+"Utiliser le fichier de configuration désigné. Le fichier de configuration "
+"par défaut est I<~/.aMule/remote.conf>"
+
+#. type: Plain text
+#: amulecmd.1:46 amuleweb.1:63
+msgid "Do not print any output to stdout."
+msgstr "Ne pas afficher de sortie sur stdout."
+
+#. type: Plain text
+#: amulecmd.1:50 amuleweb.1:67
+msgid "Be verbose - show also debug messages."
+msgstr "Mode bavard - affiche aussi les messages de deboguage."
+
+#. type: TP
+#: amulecmd.1:50 amuleweb.1:67
+#, no-wrap
+msgid "B<[ -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<]>"
+msgstr "B<[ -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:54 amuleweb.1:71
+msgid ""
+"Sets program locale (language).  See the B<NOTES> section for the "
+"description of the I<E<lt>langE<gt>> parameter."
+msgstr ""
+"Définir les paramètres régionaux (langage). Voir la section B<NOTES> pour la "
+"description du paramètre I<E<lt>langE<gt>>."
+
+#. type: Plain text
+#: amulecmd.1:57 amuleweb.1:74
+msgid "Write command line options to config file and exit"
+msgstr ""
+"Écrire les options de la ligne de commande dans le fichier de configuration "
+"et quitter"
+
+#. type: TP
+#: amulecmd.1:57
+#, no-wrap
+msgid "B<[ -c> I<E<lt>commandE<gt>>, B<--command>=I<E<lt>commandE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>commandeE<gt>>, B<--command>=I<E<lt>commandeE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:60
+msgid ""
+"Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and "
+"exit."
+msgstr ""
+"Éxecuter la I<E<lt>commandeE<gt>> comme si elle avait été entrée dans "
+"l'invite de commande d'amulecmd et quitter."
+
+#. type: TP
+#: amulecmd.1:60 amuleweb.1:117
+#, no-wrap
+msgid "B<[ --create-config-from>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --create-config-from>=I<E<lt>cheminE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:63 amuleweb.1:120
+msgid ""
+"Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid "
+"aMule config file, and then exit."
+msgstr ""
+"Créer un fichier de configuration basé sur I<E<lt>cheminE<gt>>, qui doit "
+"pointer sur un fichier de configration d'aMule valide, et quitter ensuite."
+
+#. type: SH
+#: amulecmd.1:69
+#, no-wrap
+msgid "COMMANDS"
+msgstr "COMMANDES"
+
+#. type: Plain text
+#: amulecmd.1:71
+msgid "All commands are case insensitive."
+msgstr "Toutes les commandes sont insensibles à la casse."
+
+#. type: SS
+#: amulecmd.1:71
+#, no-wrap
+msgid "Add I<E<lt>eD2k-linkE<gt>> | I<E<lt>magnet-linkE<gt>>"
+msgstr "Add I<E<lt>lien eD2kE<gt>> | I<E<lt>lien magnétiqueE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:73
+msgid "Adds an eD2k-link or a magnet-link to the core."
+msgstr "Ajoute un lien eD2k ou magnétique au noyau."
+
+#. type: Plain text
+#: amulecmd.1:82
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list."
+msgstr ""
+"un lien de liste de serveurs, dans ce cas tous les serveurs dans la liste "
+"seront ajoutés à la liste des serveurs."
+
+#. type: Plain text
+#: amulecmd.1:85
+msgid "The magnet link must contain the eD2k hash and file length."
+msgstr ""
+"Le lien magnétique doit contenir le hachage eD2k et la longueur du fichier."
+
+#. type: SS
+#: amulecmd.1:85
+#, no-wrap
+msgid "Cancel I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Cancel I<E<lt>hachageE<gt>> | I<E<lt>numéroE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:87
+msgid ""
+"Cancels the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Annule le téléchargement spécifié par  le I<E<lt>hachageE<gt>> ou le "
+"I<E<lt>numéroE<gt>>. Pour obtenir la valeur utilisée B<show>."
+
+#. type: SS
+#: amulecmd.1:87
+#, no-wrap
+msgid "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|nameE<gt>> ]"
+msgstr "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|nomE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:89
+msgid "Connect to the network."
+msgstr "Se connecter au réseau."
+
+#. type: Plain text
+#: amulecmd.1:91
+msgid "This will connect to all networks that are enabled in Preferences."
+msgstr ""
+"Cela connectera à tous les réseaux qui sont activés dans les préférences."
+
+#. type: Plain text
+#: amulecmd.1:95
+msgid ""
+"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."
+msgstr ""
+"Avec le paramètre optionnel, vous pouvez spécifier le réseau pour se "
+"connecter. Donner une adresse de serveur sous la forme IP:Port (où IP est "
+"soit une adresse décimale IPv4 ou un nom DNS résolvable) aMule se connectera "
+"à ce serveur uniquement."
+
+#. type: Plain text
+#: amulecmd.1:98
+msgid ""
+"Disconnect from all networks you are connected to, or just disconnect from "
+"the specified network."
+msgstr ""
+"Déconnecte de tous les réseaux dont vous êtes connecté, ou juste déconnecte "
+"d'un réseau spécifié."
+
+#. type: SS
+#: amulecmd.1:98
+#, no-wrap
+msgid "Download I<E<lt>numberE<gt>>"
+msgstr "Download I<E<lt>nombreE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:100
+msgid "Start downloading a file."
+msgstr "Commence à télécharger un fichier."
+
+#. type: Plain text
+#: amulecmd.1:104
+msgid ""
+"The I<E<lt>numberE<gt>> of a file from the last search has to be given.  "
+"Example: `download 12' will start to download the file with the number 12 of "
+"the previous search."
+msgstr ""
+"Le I<E<lt>numéroE<gt>> d'un fichier à partir de la dernière recherche doit "
+"être donné.  Exemple : `download 12' va commencer à télécharger le fichier "
+"avec le numéro 12 de la recherche précédente."
+
+#. type: Plain text
+#: amulecmd.1:106
+msgid "Disconnect from amule/amuled and quit amulecmd."
+msgstr "Déconnecte d'amule/amuled et quitter amulecmd."
+
+#. type: SS
+#: amulecmd.1:106
+#, no-wrap
+msgid "Get I<E<lt>whatE<gt>>"
+msgstr "Get I<E<lt>quoiE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:108
+msgid "Get and display a preference value."
+msgstr "Obtient et affiche une valeur de préférence."
+
+#. type: Plain text
+#: amulecmd.1:110 amulecmd.1:144 amulecmd.1:173 amulecmd.1:183
+msgid "Available values for I<E<lt>whatE<gt>>:"
+msgstr "Valeurs disponibles pour I<E<lt>quoiE<gt>>:"
+
+#. type: Plain text
+#: amulecmd.1:113
+msgid "Get bandwidth limits."
+msgstr "Obtenir les limites de bande passante."
+
+#. type: Plain text
+#: amulecmd.1:115
+msgid "Get IPFilter preferences."
+msgstr "Obtenir les préférences de filtrage IP."
+
+#. type: SS
+#: amulecmd.1:116
+#, no-wrap
+msgid "Help [ I<E<lt>commandE<gt>> ]"
+msgstr "Help [ I<E<lt>commandeE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:120
+msgid ""
+"Prints a short usage description.  If called without parameter, it shows a "
+"list of available commands.  If called with I<E<lt>commandE<gt>>, it shows a "
+"short description of the given command."
+msgstr ""
+"Affiche une courte description d'utilisation. S'il est appelé sans "
+"paramètre, il affiche une liste des commandes disponibles. Lorsqu'il est "
+"appelé avec la I<E<lt>commandeE<gt>>, il affiche une courte description de "
+"la commande donnée."
+
+#. type: SS
+#: amulecmd.1:120
+#, no-wrap
+msgid "Pause I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Pause I<E<lt>hachageE<gt>> | I<E<lt>numéroE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:122
+msgid ""
+"Pauses the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Interrompt le téléchargement spécifié par le I<E<lt>hachageE<gt>> ou le "
+"I<E<lt>numéroE<gt>>. Pour obtenir la valeur d'utilisée B<show>."
+
+#. type: SS
+#: amulecmd.1:122
+#, no-wrap
+msgid "Priority I<E<lt>priorityE<gt>> I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Priority I<E<lt>prioritéE<gt>> I<E<lt>hachageE<gt>> | I<E<lt>numéroE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:124
+msgid ""
+"Set priority of a download specified by I<E<lt>hashE<gt>> or "
+"I<E<lt>numberE<gt>>."
+msgstr ""
+"Définit la priorité d'un téléchargement spécifié par le I<E<lt>hachageE<gt>> "
+"ou le I<E<lt>numéroE<gt>>."
+
+#. type: Plain text
+#: amulecmd.1:126
+msgid "Available values for I<E<lt>priorityE<gt>>:"
+msgstr "Valeurs disponibles pour la I<E<lt>prioritéE<gt>> :"
+
+#. type: Plain text
+#: amulecmd.1:129
+msgid "Automatic priority."
+msgstr "Priorité automatique."
+
+#. type: Plain text
+#: amulecmd.1:131
+msgid "High priority."
+msgstr "Priorité haute."
+
+#. type: Plain text
+#: amulecmd.1:133
+msgid "Low priority."
+msgstr "Priorité basse."
+
+#. type: Plain text
+#: amulecmd.1:135
+msgid "Normal priority."
+msgstr "Priorité normal."
+
+#. type: Plain text
+#: amulecmd.1:138
+msgid "Shows the progress of an on-going search."
+msgstr "Affiche la progression d'une recherche en cours."
+
+#. type: Plain text
+#: amulecmd.1:140
+msgid "A synonim of the B<exit> command."
+msgstr "Un synonyme de la commande B<quitter>"
+
+#. type: SS
+#: amulecmd.1:140
+#, no-wrap
+msgid "Reload I<E<lt>whatE<gt>>"
+msgstr "Reload I<E<lt>quoiE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:142
+msgid "Reloads a given object."
+msgstr "Recharge un objet donné."
+
+#. type: Plain text
+#: amulecmd.1:147
+msgid "Reload shared files list."
+msgstr "Recharger la liste des fichiers partagés."
+
+#. type: Plain text
+#: amulecmd.1:149
+msgid "Reload IP filter tables."
+msgstr "Recharger les tables IP filter"
+
+#. type: Plain text
+#: amulecmd.1:152
+msgid "Reset the log."
+msgstr "Réinitialiser le journal."
+
+#. type: Plain text
+#: amulecmd.1:154
+msgid "Shows you the results of the last search."
+msgstr "Montre les résultats de la dernière recherche."
+
+#. type: SS
+#: amulecmd.1:154
+#, no-wrap
+msgid "Resume I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Resume I<E<lt>hachageE<gt>> | I<E<lt>numéroE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:156
+msgid ""
+"Resumes the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Reprise du téléchargement spécifié par le I<E<lt>hachageE<gt>> ou le "
+"I<E<lt>numéroE<gt>>. Pour obtenir la valeur utilisée B<show>."
+
+#. type: SS
+#: amulecmd.1:156
+#, no-wrap
+msgid "Search I<E<lt>typeE<gt>> I<E<lt>keywordE<gt>>"
+msgstr "Search I<E<lt>typeE<gt>> I<E<lt>mot cléE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:159
+msgid ""
+"Makes a search for the given I<E<lt>keywordE<gt>>. A search type and a "
+"keyword to search is mandatory to do this.  Example: `search kad amule' "
+"performs a kad search for `amule'."
+msgstr ""
+"Fait une recherche du I<E<lt>mot cléE<gt>> donné. Un type de recherche et "
+"d'un mot clé de recherche sont obligatoires pour le faire. Exemple: `search "
+"kad amule' effectue une recherche kad pour `amule'."
+
+#. type: Plain text
+#: amulecmd.1:161
+msgid "Available search types:"
+msgstr "Types de recherche disponibles :"
+
+#. type: Plain text
+#: amulecmd.1:164
+msgid "Performs a global search."
+msgstr "Effectuer une recherche globale."
+
+#. type: Plain text
+#: amulecmd.1:166
+msgid "Performs a search on the Kademlia network."
+msgstr "Effectuer une recherche sur le réseau Kademlia."
+
+#. type: Plain text
+#: amulecmd.1:168
+msgid "Performs a local search."
+msgstr "Effectue une recherche locale."
+
+#. type: SS
+#: amulecmd.1:169
+#, no-wrap
+msgid "Set I<E<lt>whatE<gt>>"
+msgstr "Set I<E<lt>quoiE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:171
+msgid "Sets a given preferences value."
+msgstr "Définit une valeur compte tenu des préférences."
+
+#. type: Plain text
+#: amulecmd.1:176
+msgid "Set bandwidth limits."
+msgstr "Définir les limites de bande passante."
+
+#. type: Plain text
+#: amulecmd.1:178
+msgid "Set IPFilter preferences."
+msgstr "Définir les préférences de filtrage d'IP."
+
+#. type: SS
+#: amulecmd.1:179
+#, no-wrap
+msgid "Show I<E<lt>whatE<gt>>"
+msgstr "Show I<E<lt>quoiE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:181
+msgid "Shows upload/download queue, servers list or shared files list."
+msgstr ""
+"Montrer la file d'attente des envois/réceptions, la liste des serveurs ou la "
+"liste des fichiers partagés."
+
+#. type: Plain text
+#: amulecmd.1:186
+msgid "Show download queue."
+msgstr "Montrer la file d'attente des réceptions."
+
+#. type: Plain text
+#: amulecmd.1:188
+msgid "Show log."
+msgstr "Afficher le journal."
+
+#. type: Plain text
+#: amulecmd.1:190
+msgid "Show servers list."
+msgstr "Afficher la liste des serveurs."
+
+#. type: Plain text
+#: amulecmd.1:192
+msgid "Show upload queue."
+msgstr "Montrer la file d'attente des envois."
+
+#. type: Plain text
+#: amulecmd.1:196
+msgid ""
+"Shutdown the remote running core (amule/amuled).  This will also shut down "
+"the text client, since it is unusable without a running core."
+msgstr ""
+"Arrêt du noyau distant exécutant (amule/amuled). Cela arrêtera aussi le "
+"client en mode texte, car il est inutilisable sans un noyau en cours "
+"d'exécution."
+
+#. type: SS
+#: amulecmd.1:196
+#, no-wrap
+msgid "Statistics [ I<E<lt>numberE<gt>> ]"
+msgstr "Statistics [ I<E<lt>numéroE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:198
+msgid "Show statistics tree."
+msgstr "Afficher l'arbre des statistiques."
+
+#. type: Plain text
+#: amulecmd.1:202
+msgid ""
+"The optional I<E<lt>numberE<gt>> in the range of 0-255 can be passed as "
+"argument to this command, which tells how many entries of the client version "
+"subtree should be shown. Passing 0, or omitting it means `unlimited'."
+msgstr ""
+"L'option I<E<lt>numéroE<gt>> dans l'interval 255 peut être passé comme "
+"argument à cette commande, ce qui indique le nombre d'entrées de la sous-"
+"arborescence du client qui doit être indiqué. Indiquer 0, ou en l'omettant, "
+"cela signifie 'illimité'."
+
+#. type: Plain text
+#: amulecmd.1:205
+msgid ""
+"Example: `statistics 5' will show only the top 5 versions for each client "
+"type."
+msgstr ""
+"Exemple: `statistics 5' affichera seulement le top 5 des versions pour "
+"chaque type de client."
+
+#. type: Plain text
+#: amulecmd.1:207
+msgid "Show connection status, current up/download speeds, etc."
+msgstr ""
+"Affiche l'état de la connexion, et la vitesse actuelle d'émission/réception, "
+"etc."
+
+#. type: SS
+#: amulecmd.1:212 amuleweb.1:137
+#, no-wrap
+msgid "Languages"
+msgstr "Langages"
+
+#. type: Plain text
+#: amulecmd.1:218 amuleweb.1:143
+msgid ""
+"The I<E<lt>langE<gt>> parameter for the B<-l> option has the following form: "
+"I<lang>[B<_>I<LANG>][B<.>I<encoding>][B<@>I<modifier>] where I<lang> is the "
+"primary language, I<LANG> is a sublanguage/territory, I<encoding> is the "
+"character set to use and I<modifier> allows the user to select a specific "
+"instance of localization data within a single category."
+msgstr ""
+"Le paramètre I<E<lt>langE<gt>> pour B<-l> l'option a la forme suivante : "
+"I<lang>[B<_>I<LANG>][B<.>I<encoding>][B<@>I<modifier>] où I<lang> est la "
+"langue principale, I<LANG> est is a dialecte, I<encoding> est le caractère "
+"défini à utiliser et I<modifier> permet à l'utilisateur de sélectionner une "
+"instance spécifique des données de localisation dans une seule catégorie."
+
+#. type: Plain text
+#: amulecmd.1:220 amuleweb.1:145
+msgid "For example, the following strings are valid:"
+msgstr "Par exemple, les chaînes de caractères suivantes sont valables :"
+
+#. type: Plain text
+#: amulecmd.1:234 amuleweb.1:159
+msgid ""
+"Though all the above strings are accepted as valid language definitions, "
+"I<encoding> and I<modifier> are yet unused."
+msgstr ""
+"Bien que toutes les chaînes ci-dessus sont acceptées comme des définitions "
+"de langue valide,  I<encoding> et I<modifier> ne sont pas encore utilisé."
+
+#. type: Plain text
+#: amulecmd.1:237 amuleweb.1:162
+msgid ""
+"In addition to the format above, you can also specify full language names in "
+"English - so B<-l german> is also valid and is equal to B<-l de_DE>."
+msgstr ""
+"En plus du format ci-dessus, vous pouvez également spécifier des noms entier "
+"de langue en anglais - so B<-l german> est également valide et équivaut à B<-"
+"l de_DE>."
+
+#. type: Plain text
+#: amulecmd.1:240 amuleweb.1:165
+msgid ""
+"When no locale is defined, either on command-line or in config file, system "
+"default language will be used."
+msgstr ""
+"En l'absence de paramètres linguistiques définie, soit sur la ligne de "
+"commande ou dans le fichier de configuration, la langue utilisé par défaut "
+"sera celle du système d'exploitation."
+
+#. type: Plain text
+#: amulecmd.1:242 amuleweb.1:173
+msgid "~/.aMule/remote.conf"
+msgstr "~/.aMule/remote.conf"
+
+#. type: SH
+#: amulecmd.1:242 amuleweb.1:177
+#, no-wrap
+msgid "EXAMPLE"
+msgstr "EXEMPLE"
+
+#. type: Plain text
+#: amulecmd.1:244
+msgid "Typically amulecmd will be first run as:"
+msgstr "Typiquement amulecmd sera lancé la première ainsi :"
+
+#. type: Plain text
+#: amulecmd.1:246
+msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
+msgstr ""
+"B<amulecmd> B<-h> I<nom de l'hôte> B<-p> I<port EC> B<-P> I<mot de passe EC> "
+"B<-w>"
+
+#. type: Plain text
+#: amulecmd.1:248 amuleweb.1:183
+msgid "or"
+msgstr "ou"
+
+#. type: Plain text
+#: amulecmd.1:250
+msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+"B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+
+#. type: Plain text
+#: amulecmd.1:252 amuleweb.1:187
+msgid ""
+"These will save settings to I<$HOME/.aMule/remote.conf>, and later you only "
+"need to type:"
+msgstr ""
+"Cela sauvegardera les options dans I<$HOME/.aMule/remote.conf>, et il "
+"suffira de taper plus tard :"
+
+#. type: Plain text
+#: amulecmd.1:256
+msgid "Of course, you don't have to follow this example."
+msgstr "Bien sûr, vous n'avez pas à suivre cet exemple."
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "AMULED"
+msgstr "AMULED"
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon v2.3.1"
+msgstr "aMule Daemon v2.3.1"
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon"
+msgstr "aMule Daemon"
+
+#. type: Plain text
+#: amuled.1:6
+msgid "amuled - the all-platform eMule p2p client - daemonized version"
+msgstr "amuled - le client P2P eMule multiplateforme - version daemonisée"
+
+#. type: Plain text
+#: amuled.1:9 ../../src/utils/cas/docs/cas.1:11
+msgid "[B<-c> I<E<lt>pathE<gt>>]"
+msgstr "[B<-c> I<E<lt>cheminE<gt>>]"
+
+#. type: Plain text
+#: amuled.1:11
+msgid "[B<-p> I<E<lt>pathE<gt>>]"
+msgstr "[B<-p> I<E<lt>cheminE<gt>>]"
+
+#. type: Plain text
+#: amuled.1:32
+msgid "Forks to background."
+msgstr "Embranchements en arrière plan."
+
+#. type: TP
+#: amuled.1:32
+#, no-wrap
+msgid "B<[ -p> I<E<lt>pathE<gt>>, B<--pid-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>cheminE<gt>>, B<--pid-file>=I<E<lt>cheminE<gt>> B<]>"
+
+#. type: Plain text
+#: amuled.1:36
+msgid ""
+"After fork, create a pid-file in the I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> "
+"has to contain the filename."
+msgstr ""
+"Après l'embranchement, créer un fichier pid dans le "
+"I<E<lt>répertoireE<gt>>.  I<E<lt>répertoireE<gt>> doit contenir le fichier."
+
+#. type: Plain text
+#: amuled.1:39
+msgid "Configure EC (External Connections)."
+msgstr "Configurer les EC (Connexions Externes)."
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "AMULEGUI"
+msgstr "AMULEGUI"
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI v2.3.1"
+msgstr "aMuleGUI v2.3.1"
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
+
+#. type: Plain text
+#: amulegui.1:6
+msgid "amulegui - aMule control program with GUI"
+msgstr "amulegui - programme de contrôle d'aMule avec Interface Graphique"
+
+#. type: Plain text
+#: amulegui.1:14
+msgid "[B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-t> I<E<lt>numE<gt>>]"
+
+#. type: Plain text
+#: amulegui.1:24
+msgid ""
+"B<amulegui> is a client program, and can be connected to amule or amuled via "
+"EC. You can manage your amule program with it. It provides almost the same "
+"functionalities as amule, even if the core works on another computer."
+msgstr ""
+"B<amulegui> est un programme client, et peut être connecté à amule ou amuled "
+"via EC. Vous pouvez gérer votre programme amule avec lui. Il fournit presque "
+"les mêmes fonctionnalités que amule, même si le noyau fonctionne sur un "
+"autre ordinateur."
+
+#. type: Plain text
+#: amulegui.1:39
+msgid "Skip connection dialog."
+msgstr "Sauter la boîte de dialogue de connexion."
+
+#. type: Plain text
+#: amulegui.1:57
+msgid ""
+"This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm "
+"DOT orgE<gt>"
+msgstr ""
+"Cette page de manuel a été rédigé par Julien Delange pour Debian E<lt>julien "
+"AT gunnm DOT orgE<gt>"
+
+#. type: Plain text
+#: amulegui.1:58
+msgid ""
+"This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Cette page de manuel a été réécrit par Vollstrecker "
+"E<lt>amule@vollstreckernet.deE<gt>"
+
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "AMULEWEB"
+msgstr "AMULEWEB"
+
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "aMule webserver v2.3.1"
+msgstr "aMule webserver v2.3.1"
+
+#. type: Plain text
+#: amuleweb.1:6
+msgid "amuleweb - aMule web server"
+msgstr "amuleweb - serveur web d'aMule"
+
+#. type: Plain text
+#: amuleweb.1:15
+msgid "[B<-l> I<E<lt>langE<gt>>]"
+msgstr "[B<-l> I<E<lt>langE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:18
+msgid "[B<-t> I<E<lt>nameE<gt>>] [B<-s> I<E<lt>portE<gt>>]"
+msgstr "[B<-t> I<E<lt>nomE<gt>>] [B<-s> I<E<lt>portE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:20
+msgid "[B<-U> I<E<lt>portE<gt>>]"
+msgstr "[B<-U> I<E<lt>portE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:24
+msgid "[B<-A> I<E<lt>passwordE<gt>>] [B<-G> I<E<lt>passwordE<gt>>]"
+msgstr "[B<-A> I<E<lt>motdepasseE<gt>>] [B<-G> I<E<lt>motdepasseE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:40
+msgid "[B<--amule-config-file>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--amule-config-file>=I<E<lt>cheminE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:46
+msgid ""
+"B<amuleweb> manages your access to amule through a web browser.  You can "
+"start amuleweb together with B<amule>(1), or separately, any time later.  "
+"Options can be specified via command-line or via config-file.  Command-line "
+"options take precedence over config-file options."
+msgstr ""
+"B<amuleweb> gère votre accès à amule via un navigateur Web.  Vous pouvez "
+"démarrer ensemble amuleweb et B<amule>(1), ou séparément, à un moment "
+"ultérieur.  Les options peuvent être spécifiées par ligne de commande ou via "
+"fichier de configuration. Les options passées en ligne de commande prévalent "
+"sur les options de fichier de configuration."
+
+#. type: TP
+#: amuleweb.1:74
+#, no-wrap
+msgid "B<[ -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<]>"
+msgstr "B<[ -t> I<E<lt>nomE<gt>>, B<--template>=I<E<lt>nomE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:77
+msgid ""
+"Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section "
+"for details."
+msgstr ""
+"Charge le modèle nommé I<E<lt>nomE<gt>>. Voir la section B<SKIN SUPPORT> "
+"pour plus de détails."
+
+#. type: TP
+#: amuleweb.1:77
+#, no-wrap
+msgid "B<[ -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:80
+msgid ""
+"Webserver's HTTP port. This is the port you must point your browser to "
+"(default: I<4711>)."
+msgstr ""
+"Port HTTP du serveur Web. Il s'agit du port dont votre navigateur doit "
+"pointer (par défaut : I<4711>)."
+
+#. type: Plain text
+#: amuleweb.1:84
+msgid "Enable UPnP."
+msgstr "Activer UPnP."
+
+#. type: TP
+#: amuleweb.1:84
+#, no-wrap
+msgid "B<[ -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:87
+msgid "UPnP port."
+msgstr "Port UPnP."
+
+#. type: Plain text
+#: amuleweb.1:90
+msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
+msgstr ""
+"Activer la compression gzip pour le trafic HTTP pour économiser la bande "
+"passante."
+
+#. type: Plain text
+#: amuleweb.1:93
+msgid "Disables using gzip compression (this is the default)."
+msgstr "Désactiver la compression gzip (par défaut)."
+
+#. type: TP
+#: amuleweb.1:93
+#, no-wrap
+msgid "B<[ -A> I<E<lt>passwdE<gt>>, B<--admin-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -A> I<E<lt>motdepasseE<gt>>, B<--admin-pass>=I<E<lt>motdepasseE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:96
+msgid "Full access password for webserver."
+msgstr "Mot de passe d'accès total pour le serveur web."
+
+#. type: TP
+#: amuleweb.1:96
+#, no-wrap
+msgid "B<[ -G> I<E<lt>passwdE<gt>>, B<--guest-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -G> I<E<lt>motdepasseE<gt>>, B<--guest-pass>=I<E<lt>motdepasseE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:99
+msgid "Guest password for webserver."
+msgstr "Mot de passe invité pour le serveur web."
+
+#. type: Plain text
+#: amuleweb.1:102
+msgid "Allows guest access."
+msgstr "Autoriser l'accès invité."
+
+#. type: Plain text
+#: amuleweb.1:105
+msgid "Denies guest access (default)."
+msgstr "Interdire l'accès invité (par défaut)."
+
+#. type: Plain text
+#: amuleweb.1:111
+msgid ""
+"Load/save webserver settings from/to remote aMule.  This causes amuleweb to "
+"ignore command-line and config-file settings, and load them from aMule.  "
+"When saving preferences none will be written to the config file, but to "
+"aMule.  (Of course, this works only for those settings that can be set in "
+"aMule's Preferences-E<gt>Remote Controls.)"
+msgstr ""
+"Charger/enregistrer les paramètres de serveur web à partir de/vers l'aMule "
+"distant. amuleweb ignorera la ligne de commande et les paramètres de fichier "
+"de configuration, et les chargera à partir aMule. Lors de la sauvegarde, "
+"aucune préférences seront écrites dans le fichier config, mais pour aMule. "
+"(Bien sûr, cela ne fonctionne que pour les paramètres qui peuvent être "
+"définies dans les préférences de -E<gt>Contrôle à distance d'aMule.)"
+
+#. type: Plain text
+#: amuleweb.1:114
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Désactiver l'interpréteur PHP (obsolète)"
+
+#. type: Plain text
+#: amuleweb.1:117
+msgid "Recompiles PHP pages on each request."
+msgstr "Recompile les pages PHP à chaque requête."
+
+#. type: TP
+#: amuleweb.1:126
+#, no-wrap
+msgid "B<[ --amule-config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --amule-config-file>=I<E<lt>cheminE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:132
+msgid ""
+"aMule config file path.  B<DO NOT USE DIRECTLY!> aMule uses this option when "
+"starting amuleweb at aMule startup.  This option causes all other command-"
+"line and config-file settings to be ignored, preferences to be read from the "
+"given config file, and also implies the B<-q -L> options."
+msgstr ""
+"Chemin du fichier de configuration d'aMule. B<NE PAS UTILISER DIRECTEMENT !> "
+"aMule utilise cette option lors du démarrage d'amuleweb au démarrage "
+"d'aMule. Cette option permet d'ignorer toutes les autres commandes en ligne "
+"et les paramètres de fichier de configuration, et lit les préférences dans "
+"un fichier de configuration précisé, et implique également les options B<-q -"
+"L>."
+
+#. type: SH
+#: amuleweb.1:165
+#, no-wrap
+msgid "SKIN SUPPORT"
+msgstr "SUPPORT DE THEMES"
+
+#. type: Plain text
+#: amuleweb.1:169
+msgid ""
+"B<amuleweb> is capable of displaying information in different skins.  These "
+"skins are called templates, and you can make amuleweb load a specific "
+"template via the B<-t> command line option.  Templates are searched in two "
+"places: first in I<~/.aMule/webserver/> and then in I</usr/share/amule/"
+"webserver/> if you installed with --prefix=/usr."
+msgstr ""
+"B<amuleweb> est capable d'afficher des informations dans différents thèmes. "
+"Ces thèmes sont appelés modèles, et vous pouvez faire de charger à amuleweb "
+"un modèle spécifique via B<-t> l'option en ligne de commande. Les modèles "
+"sont recherchés dans deux endroits : d'abord dans : I<~/.aMule/webserver/> "
+"puis dans I</usr/share/amule/webserver/> si vous l'avez installé avec --"
+"prefix=/usr."
+
+#. type: Plain text
+#: amuleweb.1:171
+msgid ""
+"Each template must be in a subdirectory of the template name, and this "
+"directory must contain all files the template needs."
+msgstr ""
+"Chaque modèle doit être dans un sous répertoire du nom du modèle, et ce "
+"répertoire doit contenir tous les fichiers dont le modèle a besoins."
+
+#. type: Plain text
+#: amuleweb.1:175
+msgid "~/.aMule/webserver/"
+msgstr "~/.aMule/webserver/"
+
+#. type: Plain text
+#: amuleweb.1:177
+msgid "I<$(pkgdatadir)>/webserver/"
+msgstr "I<$(pkgdatadir)>/webserver/"
+
+#. type: Plain text
+#: amuleweb.1:179
+msgid "Typically amuleweb will be first run as:"
+msgstr "Typiquement amuleweb sera lancé la premier ainsi :"
+
+#. type: Plain text
+#: amuleweb.1:181
+msgid ""
+"B<amuleweb> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-s> "
+"I<HTTPport> B<-A> I<AdminPassword> B<-w>"
+msgstr ""
+"B<amuleweb> B<-h> I<nom de l'hôte> B<-p> I<port EC> B<-P> I<mot de passe EC> "
+"B<-s> I<port HTTP> B<-A> I<mot de passe Admin> B<-w>"
+
+#. type: Plain text
+#: amuleweb.1:185
+msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+"B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+
+#. type: Plain text
+#: amuleweb.1:191
+msgid ""
+"Of course, you may specify any more or less options on the first example "
+"line, and you may also totally omit it."
+msgstr ""
+"Bien sûr, vous pouvez spécifier plus ou moins d'options sur la première "
+"ligne d'exemple, et vous pouvez également totalement le supprimer."
+
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "ED2K"
+msgstr "ED2K"
+
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "aMule eD2k link parser v1.5.1"
+msgstr "aMule eD2k link parser v1.5.1"
+
+#. type: Plain text
+#: ed2k.1:6
+msgid "ed2k - aMule eD2k link parser"
+msgstr "ed2k - analyseur lien eD2k pour aMule"
+
+#. type: Plain text
+#: ed2k.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-c> I<E<lt>cheminE<gt>>] [B<-t> I<E<lt>numE<gt>>]"
+
+#. type: Plain text
+#: ed2k.1:13
+msgid "I<E<lt>eD2k-linkE<gt>>"
+msgstr "I<E<lt>lien eD2kE<gt>>"
+
+#. type: Plain text
+#: ed2k.1:21
+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 ""
+"Envoie le I<E<lt>lien-eD2kE<gt>> à aMule, c'est à dire qu'il l'écrit dans le "
+"fichier  ~/.aMule/ED2KLinks, qui sera vérifié par aMule chaque seconde pour "
+"les liens."
+
+#. type: Plain text
+#: ed2k.1:30
+msgid ""
+"Loads all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+"Charge tous les liens trouvés dans le emulecollection donné dans I<E<lt>lien-"
+"eD2kE<gt>>"
+
+#. type: Plain text
+#: ed2k.1:33
+msgid ""
+"Lists all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+"Liste tous les liens trouvés dans le emulecollection donné dans I<E<lt>lien-"
+"eD2kE<gt>>"
+
+#. type: Plain text
+#: ed2k.1:53
+msgid "a magnet link;"
+msgstr "un lien magnétique;"
+
+#. type: Plain text
+#: ed2k.1:55
+msgid "an emulecollection file."
+msgstr "un fichier de collection emule."
+
+#. type: Plain text
+#: ed2k.1:60
+msgid ""
+"B<The order in which you give the parameters is important.> You can give "
+"more than one link, and every link can have it's own params.  For example "
+"B<ed2k E<lt>link1E<gt> -t2 E<lt>link2E<gt>> will download I<E<lt>link1E<gt>> "
+"in standard category and I<E<lt>link2E<gt>> in category 2."
+msgstr ""
+"B<Le ordre dans lequel vous donnez les paramètres est important.> Vous "
+"pouvez donner plus d'un lien, et chaque lien peut avoir ses propres "
+"paramètres. Par exemple, B<ed2k E<lt>lien1E<gt> -t2 E<lt>lien2E<gt>> "
+"téléchargera I<E<lt>lien1E<gt>> dans la catégorie standard et "
+"I<E<lt>lien2E<gt>> dans la catégorie 2."
+
+#. type: Plain text
+#: ed2k.1:62
+msgid "~/.aMule/ED2KLinks"
+msgstr "~/.aMule/ED2KLinks"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "ALC"
+msgstr "ALC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "aLinkCreator"
+msgstr "aLinkCreator"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+msgid "aLinkCreator - the aMule eD2k link creator"
+msgstr "aLinkCreator - le créateur de liens eD2k d'aMule"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:9
+msgid ""
+"B<alc> is a graphical utility to create an eD2k link to any file on your "
+"computer."
+msgstr ""
+"B<alc> est un utilitaire graphique pour créer un lien eD2k pour n'importe "
+"quel fichier sur votre ordinateur."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/wxCas/docs/wxcas.1:16
+msgid "This app doesn't take any arguments."
+msgstr "Cette application ne prend pas d'arguments."
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "ALCC"
+msgstr "ALCC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "aMule eD2k links calculator"
+msgstr "aMule eD2k links calculator"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6
+msgid "alcc - text based eD2k links calculator for aMule"
+msgstr "alcc - calculateur de lien eD2k pour aMule"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:11
+msgid "I<E<lt>inputfiles_listE<gt>>"
+msgstr "I<E<lt>liste de fichier d'entréE<gt>>"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:16
+msgid ""
+"Compute the eD2k links of all the input files given in the "
+"I<E<lt>inputfiles_listE<gt>> (There can be one or more files)."
+msgstr ""
+"Calcule les liens eD2k de tous les fichiers d'entrée précisé dans la "
+"I<E<lt>liste des fichiers d'entrésE<gt>> (Il peut y un seul fichier ou "
+"plusieurs)."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:19
+msgid "Compute and add part hashes to the computed eD2k links."
+msgstr "Calcule et ajoute les parties de hachages aux liens eD2k calculés."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+msgid "Be verbose - show also calculation steps."
+msgstr "Mode bavard - affiche aussi les étapes de calculs."
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "CAS"
+msgstr "CAS"
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "cas v0.8"
+msgstr "cas v0.8"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:6
+msgid "cas - c aMule statistics"
+msgstr "cas - c aMule statistics"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:18
+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<cas> est un programme pour afficher le contenu de votre fichier de "
+"signature aMule en ligne sur la console (sous une forme lisible par "
+"l'homme). Pour que cela fonctionne, vous devez activer l'option \"Online "
+"Signature\" dans les préférences d'aMule."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:22
+msgid ""
+"Writes the online signature picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+"Écrit l'image de la signature en ligne. Vous pouvez éventuellement ajouter "
+"I<=E<lt>PATHE<gt>> à cette option, pour spécifier l'emplacement où elle doit "
+"être écrite."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:26
+msgid ""
+"HTML page with stats and picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+"Page HTML avec des statistiques et l'image. Vous pouvez éventuellement "
+"ajouter I<=E<lt>PATHE<gt>> à cette option, pour spécifier l'emplacement où "
+"elle doit être écrite."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:34
+msgid "Without any options, it prints online signature data to stdout."
+msgstr ""
+"Sans aucune option, elle affiche des données de signature en ligne sur la "
+"sortie standard."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:36
+msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+msgstr ""
+"B<cas> a été écrit par Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:38
+msgid "~/.aMule/casrc"
+msgstr "~/.aMule/casrc"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:40
+msgid "stat.png"
+msgstr "stat.png"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:42
+msgid "tmp.html"
+msgstr "tmp.html"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "WXCAS"
+msgstr "WXCAS"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "wxCas"
+msgstr "wxCas"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:5
+msgid "wxcas - wx c aMule statistics"
+msgstr "wxcas - wx c aMule statistics"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:11
+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<wxcas> est un programme permettant d'afficher le contenu de votre fichier "
+"de signature en ligne dans une belle fenêtre wx sur votre bureau.  Pour que "
+"cela fonctionne, vous devez activer l'option \"Online Signature\" dans les "
+"préférences d'aMule."
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:14
+msgid ""
+"Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt>"
+msgstr ""
+"Basé sur B<cas>(1) de Pedro de Oliveira. B<wxcas> a été écrit par ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt>"
+
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "XAS"
+msgstr "XAS"
+
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "xas v1.9"
+msgstr "xas v1.9"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:5
+msgid "xas - X-Chat aMule Statistics"
+msgstr "xas - X-Chat aMule Statistics"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:7
+msgid "B<none>"
+msgstr "B<aucun>"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:12
+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 aMule's preferences."
+msgstr ""
+"B<xas> est une extension pour xchat. Pour le chargement voir la "
+"documentation de votre xchat. Après le chargement tapez /xas et il enverra "
+"des statistiques sur la canal où vous êtes. Elles sont prises à partir de "
+"votre fichier de signature en ligne. Pour que cela fonctionne, vous devez "
+"activer l'option \"Online Signature\" dans les préférences d'aMule."
+
+#. 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 "
+"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)."
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:16
+msgid "B<xas> was originally written by niet"
+msgstr "B<xas> a été initialement écrit par niet"
+
+#~ msgid "January 2010"
+#~ msgstr "Janvier 2010"

aMule-2.3.1.tar.bz2/docs/man/po/manpages-hu.add Added

aMule-2.3.1.tar.bz2/docs/man/po/manpages-hu.po Added

@@ -0,0 +1,1723 @@
+# Hungarian translations for po package
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the po package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: po 4a\n"
+"POT-Creation-Date: 2011-10-31 22:06+0100\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "AMULE"
+msgstr "AMULE"
+
+#. 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"
+msgstr "2011. november"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule v2.3.1"
+msgstr "aMule v2.3.1"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule"
+msgstr "aMule"
+
+#. type: SH
+#: amule.1:4 amulecmd.1:5 amuled.1:4 amuleweb.1:4 ed2k.1:4
+#: ../../src/utils/aLinkCreator/docs/alc.1:3
+#: ../../src/utils/aLinkCreator/docs/alcc.1:4 ../../src/utils/cas/docs/cas.1:4
+#: ../../src/utils/wxCas/docs/wxcas.1:3 ../../src/utils/xas/docs/xas.1:3
+#, no-wrap
+msgid "NAME"
+msgstr "NÉV"
+
+#. type: Plain text
+#: amule.1:6
+msgid "amule - the all-platform eMule p2p client"
+msgstr "amule - a \"minden-platform\" eMule p2p kliens"
+
+#. type: SH
+#: amule.1:6 amulecmd.1:7 amuled.1:6 amulegui.1:6 amuleweb.1:6 ed2k.1:6
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6 ../../src/utils/cas/docs/cas.1:6
+#: ../../src/utils/wxCas/docs/wxcas.1:5 ../../src/utils/xas/docs/xas.1:5
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "ÁTTEKINTÉS"
+
+#. type: Plain text
+#: amule.1:10 amulegui.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-geometry> I<E<lt>geomE<gt>>]"
+msgstr "[B<-c> I<E<lt>útvonalE<gt>>] [B<-geometry> I<E<lt>geomE<gt>>]"
+
+#. type: Plain text
+#: amule.1:13 amuled.1:15
+msgid "[B<-w> I<E<lt>pathE<gt>>]"
+msgstr "[B<-w> I<E<lt>fájlE<gt>>]"
+
+#. type: Plain text
+#: amule.1:17 amuled.1:19
+msgid "[B<-t> I<E<lt>numE<gt>>] [I<eD2k-link>]"
+msgstr "[B<-t> I<E<lt>számE<gt>>] [I<eD2k-hivatkozás>]"
+
+#. type: SH
+#: amule.1:24 amulecmd.1:26 amuled.1:25 amulegui.1:20 amuleweb.1:41 ed2k.1:19
+#: ../../src/utils/aLinkCreator/docs/alc.1:7
+#: ../../src/utils/aLinkCreator/docs/alcc.1:14
+#: ../../src/utils/cas/docs/cas.1:14 ../../src/utils/wxCas/docs/wxcas.1:7
+#: ../../src/utils/xas/docs/xas.1:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "LEÍRÁS"
+
+#. type: TP
+#: amule.1:25 amuled.1:26 amulegui.1:24 ed2k.1:21
+#: ../../src/utils/cas/docs/cas.1:26
+#, no-wrap
+msgid "B<[ -c> I<E<lt>pathE<gt>>, B<--config-dir>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>útvonalE<gt>>, B<--config-dir>=I<E<lt>útvonalE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:28 amuled.1:29 amulegui.1:27 ed2k.1:24
+#: ../../src/utils/cas/docs/cas.1:29
+msgid "Read config from I<E<lt>pathE<gt>> instead of home"
+msgstr ""
+"A beállításokat az I<E<lt>útvonalE<gt>>-ból olvassa az alapértelmezett "
+"helyett."
+
+#. type: TP
+#: amule.1:28 amulegui.1:27
+#, no-wrap
+msgid "B<[ -geometry >I<E<lt>geomE<gt>> B<]>"
+msgstr "B<[ -geometry >I<E<lt>geomE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:31 amulegui.1:30
+msgid ""
+"Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as "
+"standard X11 apps:\t[B<=>][I<E<lt>widthE<gt>>{B<xX>}I<E<lt>heightE<gt>>][{B<"
+"+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>]"
+msgstr ""
+"Beállítja az alkalmazás geometriáját. A I<E<lt>geomE<gt>> paraméter ugyanazt "
+"a formátumot használja, mint a többi X11 alkalmazás:\t[B<=>]"
+"[I<E<lt>szélességE<gt>>{B<xX>}I<E<lt>magasságE<gt>>][{B<+->}"
+"I<E<lt>xpozícióE<gt>>{B<+->}I<E<lt>ypozícióE<gt>>]"
+
+#. type: Plain text
+#: amule.1:34 amuled.1:42 amulegui.1:33
+msgid "Prints log messages to stdout."
+msgstr "A napló bejegyzéseket a szabvány kimenetre írja."
+
+#. type: Plain text
+#: amule.1:37 amuled.1:45 amulegui.1:36
+msgid "Resets config to default values."
+msgstr "Beállítások visszaállítása az alapértelmezett értékekre."
+
+#. type: TP
+#: amule.1:37 amuled.1:45
+#, no-wrap
+msgid "B<[ -w> I<E<lt>pathE<gt>>, B<--use-amuleweb>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -w> I<E<lt>fájlE<gt>>, B<--use-amuleweb>=I<E<lt>fájlE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:40 amuled.1:48
+msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
+msgstr "Az amuleweb programnak I<E<lt>fájlE<gt>>-t fogja használni."
+
+#. type: Plain text
+#: amule.1:43 amuled.1:51
+msgid "Does not handle fatal exception."
+msgstr "Nem kezeli a végzetes kivételeket."
+
+#. type: Plain text
+#: amule.1:46 amuled.1:54
+msgid "Does not disable stdin."
+msgstr "Nem zárja le a szabvány bemenetet."
+
+#. type: TP
+#: amule.1:46 amuled.1:54 amulegui.1:39 ed2k.1:24
+#, no-wrap
+msgid "B<[ -t>, B<--category>=I<E<lt>numE<gt>> B<]>"
+msgstr "B<[ -t>, B<--category>=I<E<lt>számE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:49 amuled.1:57 amulegui.1:42 ed2k.1:27
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
+msgstr ""
+"A megadott eD2k hivatkozást a I<E<lt>számE<gt>>-adik kategóriába tölti."
+
+#. type: Plain text
+#: amule.1:52 amulecmd.1:66 amuled.1:60 amulegui.1:48 amuleweb.1:126 ed2k.1:39
+msgid "Displays the current version number."
+msgstr "Megjeleníti a verziószámot."
+
+#. type: Plain text
+#: amule.1:55 amulecmd.1:69 amuled.1:63 amulegui.1:45 amuleweb.1:123 ed2k.1:36
+#: ../../src/utils/aLinkCreator/docs/alcc.1:22
+#: ../../src/utils/cas/docs/cas.1:32
+msgid "Prints a short usage description."
+msgstr "Egy rövid használati leírást jelenít meg."
+
+#. type: TP
+#: amule.1:55 amuled.1:63 ed2k.1:39
+#, no-wrap
+msgid "B<[ eD2k-link ]>"
+msgstr "B<[ eD2k-hivatkozás ]>"
+
+#. type: Plain text
+#: amule.1:58 amuled.1:66 ed2k.1:42
+msgid "Adds an eD2k-link to the core."
+msgstr "eD2k hivatkozás letöltése."
+
+#. type: Plain text
+#: amule.1:60 amulecmd.1:75 amuled.1:68 ed2k.1:44
+msgid "The eD2k link to be added can be:"
+msgstr "Az eD2k hivatkozás a következő lehet:"
+
+#. type: Plain text
+#: amule.1:63 amulecmd.1:78 amuled.1:71 ed2k.1:47
+msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
+msgstr ""
+"egy fájl hivatkozás (ed2k://|file|...), ez a letöltési sorhoz lesz hozzáadva;"
+
+#. type: Plain text
+#: amule.1:65 amulecmd.1:80 amuled.1:73 ed2k.1:49
+msgid ""
+"a server link (ed2k://|server|...), it will be added to the server list;"
+msgstr ""
+"egy kiszolgáló hivatkozás (ed2k://|server|...), ez a kiszolgáló-listához "
+"lesz hozzáadva;"
+
+#. type: Plain text
+#: amule.1:67 amuled.1:75 ed2k.1:51
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list;"
+msgstr ""
+"egy kiszolgáló-lista hivatkozás, mely esetben a listában szereplő összes "
+"kiszolgáló a kiszolgáló-listához adódik;"
+
+#. type: Plain text
+#: amule.1:69 amuled.1:77
+msgid "a magnet link."
+msgstr "egy magnet hivatkozás."
+
+#. type: SH
+#: amule.1:70 amulecmd.1:207 amuleweb.1:132
+#, no-wrap
+msgid "NOTES"
+msgstr "MEGJEGYZÉSEK"
+
+#. type: SS
+#: amule.1:71 amulecmd.1:208 amuleweb.1:133
+#, no-wrap
+msgid "Paths"
+msgstr "Elérési utak"
+
+#. type: Plain text
+#: amule.1:75 amulecmd.1:212 amuleweb.1:137
+msgid ""
+"For all options which take a I<E<lt>pathE<gt>> value, if the I<path> "
+"contains no directory part (i.e. just a plain filename), then it is "
+"considered to be under the aMule configuration directory, I<~/.aMule>."
+msgstr ""
+"Minden olyan opciónál amely I<E<lt>fájlE<gt>> paramétert kér, ha a megadott "
+"I<fájl> nem tartalmaz könyvtár komponenst (vagyis tisztán csak egy fájlnév), "
+"akkor azt az aMule konfigurációs könyvtárában (I<~/.aMule>) fogja keresni."
+
+#. type: SH
+#: amule.1:75 amulecmd.1:240 amuled.1:78 amuleweb.1:171 ed2k.1:60
+#: ../../src/utils/cas/docs/cas.1:36
+#, no-wrap
+msgid "FILES"
+msgstr "FÁJLOK"
+
+#. type: Plain text
+#: amule.1:77 amuled.1:80
+msgid "~/.aMule/*"
+msgstr "~/.aMule/*"
+
+#. type: SH
+#: amule.1:77 amulecmd.1:256 amuled.1:80 amulegui.1:48 amuleweb.1:191
+#: ed2k.1:62 ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+#: ../../src/utils/cas/docs/cas.1:42 ../../src/utils/wxCas/docs/wxcas.1:16
+#: ../../src/utils/xas/docs/xas.1:16
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr "HIBÁK JELENTÉSE"
+
+#. type: Plain text
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+msgid ""
+"Please report bugs either on our forum (I<http://forum.amule.org/>), or in "
+"our bugtracker (I<http://bugs.amule.org/>).  Please do not report bugs in e-"
+"mail, neither to our mailing list nor directly to any team member."
+msgstr ""
+"A hibákat kérjük vagy a fórumon (I<http://forum.amule.org/>), vagy a "
+"hibakövetőben (I<http://bugs.amule.org/>) jelentsék. Hibákról kérjük ne "
+"írjanak levelet (e-mail-t) se a levelezési listára, se közvetlenül "
+"valamelyik fejlesztőnek."
+
+#. type: SH
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr "COPYRIGHT"
+
+#. type: Plain text
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+msgid ""
+"aMule and all of its related utilities are distributed under the GNU General "
+"Public License."
+msgstr ""
+"Az aMule és az összes hozzá tartozó segédprogram a GNU General Public "
+"License védelme alatt áll."
+
+#. type: SH
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "LÁSD MÉG"
+
+#. type: SH
+#: amule.1:84 amulecmd.1:263 amuled.1:87 amulegui.1:55 amuleweb.1:198
+#: ed2k.1:69 ../../src/utils/aLinkCreator/docs/alc.1:18
+#: ../../src/utils/aLinkCreator/docs/alcc.1:33
+#: ../../src/utils/cas/docs/cas.1:49 ../../src/utils/wxCas/docs/wxcas.1:23
+#: ../../src/utils/xas/docs/xas.1:23
+#, no-wrap
+msgid "AUTHOR"
+msgstr "SZERZŐ"
+
+#. type: Plain text
+#: amule.1:85 amulecmd.1:264 amuled.1:88 amuleweb.1:199 ed2k.1:70
+#: ../../src/utils/aLinkCreator/docs/alc.1:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1:34
+#: ../../src/utils/cas/docs/cas.1:50 ../../src/utils/wxCas/docs/wxcas.1:24
+#: ../../src/utils/xas/docs/xas.1:24
+msgid ""
+"This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Ezt a kézikönyv lapot Vollstrecker E<lt>amule@vollstreckernet.deE<gt> írta."
+
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "AMULECMD"
+msgstr "AMULECMD"
+
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "aMuleCmd v2.3.1"
+msgstr "aMuleCmd v2.3.1"
+
+#. type: TH
+#: amulecmd.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 "aMule utilities"
+msgstr "aMule segédprogramok"
+
+#. type: Plain text
+#: amulecmd.1:7
+msgid "amulecmd - Console-based program to control aMule"
+msgstr "amulecmd - Szöveges program az aMule \"távvezérléséhez\""
+
+#. type: Plain text
+#: amulecmd.1:13 amuleweb.1:12
+msgid ""
+"[B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
+"I<E<lt>passwordE<gt>>] [B<-f> I<E<lt>pathE<gt>>]"
+msgstr ""
+"[B<-h> I<E<lt>gépE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
+"I<E<lt>jelszóE<gt>>] [B<-f> I<E<lt>fájlE<gt>>]"
+
+#. type: Plain text
+#: amulecmd.1:17
+msgid ""
+"[B<-l> I<E<lt>langE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>commandE<gt>>]"
+"B< >}"
+msgstr ""
+"[B<-l> I<E<lt>nyelvE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>parancsE<gt>>]"
+"B< >}"
+
+#. type: Plain text
+#: amulecmd.1:20 amuleweb.1:31
+msgid "[B<--create-config-from>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--create-config-from>=I<E<lt>fájlE<gt>>]"
+
+#. type: Plain text
+#: amulecmd.1:29
+msgid "B<amulecmd> is a console-based client to control aMule."
+msgstr "Az amulecmd egy szöveges program az aMule vezérlésére."
+
+#. type: TP
+#: amulecmd.1:29 amuleweb.1:46
+#, no-wrap
+msgid "B<[ -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<]>"
+msgstr "B<[ -h> I<E<lt>gépE<gt>>, B<--host>=I<E<lt>gépE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:33 amuleweb.1:50
+msgid ""
+"Host where aMule is running (default: I<localhost>).  I<E<lt>hostE<gt>> "
+"might be an IP address or a DNS name"
+msgstr ""
+"A gép, amelyen az aMule fut (alapértelmezés: I<localhost>). A "
+"I<E<lt>gépE<gt>> lehet egy IP cím vagy egy DNS név."
+
+#. type: TP
+#: amulecmd.1:33 amuleweb.1:50
+#, no-wrap
+msgid "B<[ -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:36 amuleweb.1:53
+msgid ""
+"aMule's port for External Connections, as set in Preferences-E<gt>Remote "
+"Controls (default: I<4712>)"
+msgstr ""
+"Az aMule távoli elérés portja, amint az a Beállítások-E<gt>Távoli Elérés "
+"panelen beállítható (alapértelemzés: I<4712>)."
+
+#. type: TP
+#: amulecmd.1:36 amuleweb.1:53
+#, no-wrap
+msgid "B<[ -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<]>"
+msgstr "B<[ -P> I<E<lt>jelszóE<gt>>, B<--password>=I<E<lt>jelszóE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:39 amuleweb.1:56
+msgid "External Connections password."
+msgstr "A távoli elérés jelszava."
+
+#. type: TP
+#: amulecmd.1:39 amuleweb.1:56
+#, no-wrap
+msgid "B<[ -f> I<E<lt>pathE<gt>>, B<--config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -f> I<E<lt>fájlE<gt>>, B<--config-file>=I<E<lt>fájlE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:43 amuleweb.1:60
+msgid ""
+"Use the given configuration file.  Default configuration file is I<~/.aMule/"
+"remote.conf>"
+msgstr ""
+"A megadott konfigurációs fájl használata. Az alapértelmezett konfigurációs "
+"fájl: I<~/.aMule/remote.conf>"
+
+#. type: Plain text
+#: amulecmd.1:46 amuleweb.1:63
+msgid "Do not print any output to stdout."
+msgstr "Ne írjon semmit a szabvány kimenetre."
+
+#. type: Plain text
+#: amulecmd.1:50 amuleweb.1:67
+msgid "Be verbose - show also debug messages."
+msgstr "Bőbeszédű mód - a hibakeresési üzenetek megjelenítése."
+
+#. type: TP
+#: amulecmd.1:50 amuleweb.1:67
+#, no-wrap
+msgid "B<[ -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<]>"
+msgstr "B<[ -l> I<E<lt>nyelvE<gt>>, B<--locale>=I<E<lt>nyelvE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:54 amuleweb.1:71
+msgid ""
+"Sets program locale (language).  See the B<NOTES> section for the "
+"description of the I<E<lt>langE<gt>> parameter."
+msgstr ""
+"Beállítja a program nyelvét. Lásd a B<MEGJEGYZÉSEK> fejezetet a "
+"I<E<lt>nyelvE<gt>> paraméter bővebb leírásához."
+
+#. type: Plain text
+#: amulecmd.1:57 amuleweb.1:74
+msgid "Write command line options to config file and exit"
+msgstr "A parancssori paramétereket beírja a konfigurációs fájlba és kilép."
+
+#. type: TP
+#: amulecmd.1:57
+#, no-wrap
+msgid "B<[ -c> I<E<lt>commandE<gt>>, B<--command>=I<E<lt>commandE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>parancsE<gt>>, B<--command>=I<E<lt>parancsE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:60
+msgid ""
+"Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and "
+"exit."
+msgstr ""
+"Végrehajtja a megadott parancsot, mintha azt a saját parancssorába írtuk "
+"volna be, majd kilép."
+
+#. type: TP
+#: amulecmd.1:60 amuleweb.1:117
+#, no-wrap
+msgid "B<[ --create-config-from>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --create-config-from>=I<E<lt>fájlE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:63 amuleweb.1:120
+msgid ""
+"Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid "
+"aMule config file, and then exit."
+msgstr ""
+"Konfigurációs fájl készítése a I<E<lt>fájlE<gt>> alapján, amely az aMule "
+"érvényes konfigurációs fájlja kell legyen, majd utána kilép."
+
+#. type: SH
+#: amulecmd.1:69
+#, no-wrap
+msgid "COMMANDS"
+msgstr "PARANCSOK"
+
+#. type: Plain text
+#: amulecmd.1:71
+msgid "All commands are case insensitive."
+msgstr "Minden parancs érzéketlen a kis/nagy betűkre."
+
+#. type: SS
+#: amulecmd.1:71
+#, no-wrap
+msgid "Add I<E<lt>eD2k-linkE<gt>> | I<E<lt>magnet-linkE<gt>>"
+msgstr "Add I<E<lt>eD2k-hivatkozásE<gt>> | I<E<lt>magnet-hivatkozásE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:73
+msgid "Adds an eD2k-link or a magnet-link to the core."
+msgstr "Egy eD2k vagy magnet hivatkozást ad a letöltéshez."
+
+#. type: Plain text
+#: amulecmd.1:82
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list."
+msgstr ""
+"egy kiszolgáló-lista hivatkozás, mely esetben a listában szereplő összes "
+"kiszolgáló a kiszolgáló-listához adódik."
+
+#. type: Plain text
+#: amulecmd.1:85
+msgid "The magnet link must contain the eD2k hash and file length."
+msgstr ""
+"A magnet hivatkozásnak tartalmaznia kell az eD2k hash-t és a fájl hosszát."
+
+#. type: SS
+#: amulecmd.1:85
+#, no-wrap
+msgid "Cancel I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Cancel I<E<lt>hashE<gt>> | I<E<lt>számE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:87
+msgid ""
+"Cancels the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Megszakítja a I<E<lt>hashE<gt>> vagy I<E<lt>számE<gt>> által azonosított "
+"letöltést. Az értékek megszerzéséhez használd a B<show> parancsot."
+
+#. type: SS
+#: amulecmd.1:87
+#, no-wrap
+msgid "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|nameE<gt>> ]"
+msgstr "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|névE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:89
+msgid "Connect to the network."
+msgstr "Kapcsolódik a hálózathoz."
+
+#. type: Plain text
+#: amulecmd.1:91
+msgid "This will connect to all networks that are enabled in Preferences."
+msgstr "A Beállításokban engedélyezett összes hálózathoz kapcsolódik."
+
+#. type: Plain text
+#: amulecmd.1:95
+msgid ""
+"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."
+msgstr ""
+"Az opcionális paraméterrel megadható, melyik hálózathoz csatlakozzon. Egy "
+"kiszolgáló címének IP:Port formában történő megadásával (ahol az IP vagy egy "
+"pontozott decimális cím, vagy egy feloldható DNS név) az aMule a megadott "
+"kiszolgálóhoz fog csatlakozni."
+
+#. type: Plain text
+#: amulecmd.1:98
+msgid ""
+"Disconnect from all networks you are connected to, or just disconnect from "
+"the specified network."
+msgstr ""
+"Leválasztás minden csatlakoztatott hálózatról, vagy csak a megadott "
+"hálózatról."
+
+#. type: SS
+#: amulecmd.1:98
+#, no-wrap
+msgid "Download I<E<lt>numberE<gt>>"
+msgstr "Download I<E<lt>számE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:100
+msgid "Start downloading a file."
+msgstr "Letölt egy fájlt."
+
+#. type: Plain text
+#: amulecmd.1:104
+msgid ""
+"The I<E<lt>numberE<gt>> of a file from the last search has to be given.  "
+"Example: `download 12' will start to download the file with the number 12 of "
+"the previous search."
+msgstr ""
+"Meg kell adni egy fájl számát a legutóbbi keresésből. Például: a "
+"\\(Bqdownload 12\\(rq parancs az előző keresés eredményei közül a 12-es "
+"sorszámú fájlt fogja letölteni."
+
+#. type: Plain text
+#: amulecmd.1:106
+msgid "Disconnect from amule/amuled and quit amulecmd."
+msgstr "Leválasztás az amule(d)-ről és kilépés az amulecmd-ből."
+
+#. type: SS
+#: amulecmd.1:106
+#, no-wrap
+msgid "Get I<E<lt>whatE<gt>>"
+msgstr "Get I<E<lt>mitE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:108
+msgid "Get and display a preference value."
+msgstr "Megmutat egy beállítás értéket."
+
+#. type: Plain text
+#: amulecmd.1:110 amulecmd.1:144 amulecmd.1:173 amulecmd.1:183
+msgid "Available values for I<E<lt>whatE<gt>>:"
+msgstr "A I<E<lt>mitE<gt>> lehetséges értékei:"
+
+#. type: Plain text
+#: amulecmd.1:113
+msgid "Get bandwidth limits."
+msgstr "Sávszélesség határok."
+
+#. type: Plain text
+#: amulecmd.1:115
+msgid "Get IPFilter preferences."
+msgstr "IP-szűrő beállítások."
+
+#. type: SS
+#: amulecmd.1:116
+#, no-wrap
+msgid "Help [ I<E<lt>commandE<gt>> ]"
+msgstr "Help [ I<E<lt>parancsE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:120
+msgid ""
+"Prints a short usage description.  If called without parameter, it shows a "
+"list of available commands.  If called with I<E<lt>commandE<gt>>, it shows a "
+"short description of the given command."
+msgstr ""
+"Egy rövid használati leírást jelenít meg. Ha paraméter nélkül hívjuk meg, "
+"kilistázza az elérhető parancsokat. Ha egy I<E<lt>parancsE<gt>>-ot is "
+"megadunk, rövid leírást ad az adott parancsról."
+
+#. type: SS
+#: amulecmd.1:120
+#, no-wrap
+msgid "Pause I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Pause I<E<lt>hashE<gt>> | I<E<lt>számE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:122
+msgid ""
+"Pauses the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Megállítja a I<E<lt>hashE<gt>> vagy I<E<lt>számE<gt>> által azonosított "
+"letöltést. Az értékek megszerzéséhez használd a B<show> parancsot."
+
+#. type: SS
+#: amulecmd.1:122
+#, no-wrap
+msgid "Priority I<E<lt>priorityE<gt>> I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Priority I<E<lt>prioritásE<gt>> I<E<lt>hashE<gt>> | I<E<lt>számE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:124
+msgid ""
+"Set priority of a download specified by I<E<lt>hashE<gt>> or "
+"I<E<lt>numberE<gt>>."
+msgstr ""
+"Beállítja a I<E<lt>hashE<gt>> vagy I<E<lt>számE<gt>> által azonosított "
+"letöltés prioritását."
+
+#. type: Plain text
+#: amulecmd.1:126
+msgid "Available values for I<E<lt>priorityE<gt>>:"
+msgstr "A I<E<lt>prioritásE<gt>> lehetséges értékei:"
+
+#. type: Plain text
+#: amulecmd.1:129
+msgid "Automatic priority."
+msgstr "Automatikus prioritás."
+
+#. type: Plain text
+#: amulecmd.1:131
+msgid "High priority."
+msgstr "Magas prioritás."
+
+#. type: Plain text
+#: amulecmd.1:133
+msgid "Low priority."
+msgstr "Alacsony prioritás."
+
+#. type: Plain text
+#: amulecmd.1:135
+msgid "Normal priority."
+msgstr "Normál prioritás."
+
+#. type: Plain text
+#: amulecmd.1:138
+msgid "Shows the progress of an on-going search."
+msgstr "Egy folymatban lévő keresés állapotát jeleníti meg."
+
+#. type: Plain text
+#: amulecmd.1:140
+msgid "A synonim of the B<exit> command."
+msgstr "Az B<exit> parancs szinonímája."
+
+#. type: SS
+#: amulecmd.1:140
+#, no-wrap
+msgid "Reload I<E<lt>whatE<gt>>"
+msgstr "Reload I<E<lt>mitE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:142
+msgid "Reloads a given object."
+msgstr "A megadott objektum újratöltése."
+
+#. type: Plain text
+#: amulecmd.1:147
+msgid "Reload shared files list."
+msgstr "A megosztott fájlok listájt tölti újra."
+
+#. type: Plain text
+#: amulecmd.1:149
+msgid "Reload IP filter tables."
+msgstr "Az IP szűrő újratöltése."
+
+#. type: Plain text
+#: amulecmd.1:152
+msgid "Reset the log."
+msgstr "Napló újrakezdése."
+
+#. type: Plain text
+#: amulecmd.1:154
+msgid "Shows you the results of the last search."
+msgstr "Az utolsó keresés eredményeinek megjelenítése."
+
+#. type: SS
+#: amulecmd.1:154
+#, no-wrap
+msgid "Resume I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Resume I<E<lt>hashE<gt>> | I<E<lt>számE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:156
+msgid ""
+"Resumes the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Folytatja a I<E<lt>hashE<gt>> vagy I<E<lt>számE<gt>> által azonosított "
+"letöltést. Az értékek megszerzéséhez használd a B<show> parancsot."
+
+#. type: SS
+#: amulecmd.1:156
+#, no-wrap
+msgid "Search I<E<lt>typeE<gt>> I<E<lt>keywordE<gt>>"
+msgstr "Search I<E<lt>típusE<gt>> I<E<lt>kulcsszóE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:159
+msgid ""
+"Makes a search for the given I<E<lt>keywordE<gt>>. A search type and a "
+"keyword to search is mandatory to do this.  Example: `search kad amule' "
+"performs a kad search for `amule'."
+msgstr ""
+"Elindít egy keresést a megadott I<E<lt>kulcsszóE<gt>>-ra. Kötelező megadni a "
+"keresés típusát és a kulcsszót. Példa: a \\(Bqsearch kad amule\\(rq parancs "
+"egy Kademlia keresést indít az \\(Bqamule\\(rq kulcsszóra."
+
+#. type: Plain text
+#: amulecmd.1:161
+msgid "Available search types:"
+msgstr "Elérhető keresés típusok:"
+
+#. type: Plain text
+#: amulecmd.1:164
+msgid "Performs a global search."
+msgstr "Globális keresést hajt végre."
+
+#. type: Plain text
+#: amulecmd.1:166
+msgid "Performs a search on the Kademlia network."
+msgstr "A Kademlia hálózaton keres."
+
+#. type: Plain text
+#: amulecmd.1:168
+msgid "Performs a local search."
+msgstr "Lokális keresés."
+
+#. type: SS
+#: amulecmd.1:169
+#, no-wrap
+msgid "Set I<E<lt>whatE<gt>>"
+msgstr "Set I<E<lt>mitE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:171
+msgid "Sets a given preferences value."
+msgstr "Egy beállítás érték megváltoztatása."
+
+#. type: Plain text
+#: amulecmd.1:176
+msgid "Set bandwidth limits."
+msgstr "Sávszélesség határok beállítása."
+
+#. type: Plain text
+#: amulecmd.1:178
+msgid "Set IPFilter preferences."
+msgstr "IP-szűrő beállításainak módosítása."
+
+#. type: SS
+#: amulecmd.1:179
+#, no-wrap
+msgid "Show I<E<lt>whatE<gt>>"
+msgstr "Show I<E<lt>mitE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:181
+msgid "Shows upload/download queue, servers list or shared files list."
+msgstr ""
+"Megmutatja a fel- és letöltési sort, a kiszolgáló- és megosztott fájlok "
+"listáját."
+
+#. type: Plain text
+#: amulecmd.1:186
+msgid "Show download queue."
+msgstr "Letöltési lista megjelenítése."
+
+#. type: Plain text
+#: amulecmd.1:188
+msgid "Show log."
+msgstr "Napló megjelenítése."
+
+#. type: Plain text
+#: amulecmd.1:190
+msgid "Show servers list."
+msgstr "Kiszolgálók listájának megjelenítése."
+
+#. type: Plain text
+#: amulecmd.1:192
+msgid "Show upload queue."
+msgstr "Feltöltési lista megjelenítése."
+
+#. type: Plain text
+#: amulecmd.1:196
+msgid ""
+"Shutdown the remote running core (amule/amuled).  This will also shut down "
+"the text client, since it is unusable without a running core."
+msgstr ""
+"Leállítja a távoli magot (amule/amuled). Ez egyszersmind a szöveges klienst "
+"is leállítja, mivel az nemigen használható futó mag nélkül."
+
+#. type: SS
+#: amulecmd.1:196
+#, no-wrap
+msgid "Statistics [ I<E<lt>numberE<gt>> ]"
+msgstr "Statistics [ I<E<lt>számE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:198
+msgid "Show statistics tree."
+msgstr "A statisztika fa megjelenítése."
+
+#. type: Plain text
+#: amulecmd.1:202
+msgid ""
+"The optional I<E<lt>numberE<gt>> in the range of 0-255 can be passed as "
+"argument to this command, which tells how many entries of the client version "
+"subtree should be shown. Passing 0, or omitting it means `unlimited'."
+msgstr ""
+"Lehetséges megadni egy számot a 0-255 tartományban, amely megadja az ügyfél-"
+"verziók al-fák maximális nagyságát. Nulla megadása vagy a szám teljes "
+"elhagyása nem korlátoz."
+
+#. type: Plain text
+#: amulecmd.1:205
+msgid ""
+"Example: `statistics 5' will show only the top 5 versions for each client "
+"type."
+msgstr ""
+"Példa: a \\(Bqstatistics 5\\(rq parancs csak az 5 leggyakoribb ügyfél "
+"változatot mutatja minden ügyfél típusra."
+
+#. type: Plain text
+#: amulecmd.1:207
+msgid "Show connection status, current up/download speeds, etc."
+msgstr ""
+"Megjeleníti a kapcsolat állapotát, pillanatnyi fel-/letöltési sebességet, "
+"stb."
+
+#. type: SS
+#: amulecmd.1:212 amuleweb.1:137
+#, no-wrap
+msgid "Languages"
+msgstr "Nyelvek"
+
+#. type: Plain text
+#: amulecmd.1:218 amuleweb.1:143
+msgid ""
+"The I<E<lt>langE<gt>> parameter for the B<-l> option has the following form: "
+"I<lang>[B<_>I<LANG>][B<.>I<encoding>][B<@>I<modifier>] where I<lang> is the "
+"primary language, I<LANG> is a sublanguage/territory, I<encoding> is the "
+"character set to use and I<modifier> allows the user to select a specific "
+"instance of localization data within a single category."
+msgstr ""
+"A B<-l> opció I<E<lt>nyelvE<gt>> paramétere a következőképpen adható meg: "
+"I<nyelv>[B<_>I<TERÜLET>][B<.>I<kódolás>][B<@>I<módosító>], ahol I<nyelv> az "
+"elsődleges nyelv, I<TERÜLET> egy nyelvváltozat/terület kódja, I<kódolás> a "
+"karakterkészlet kódja és a I<módosító> \\(Bqlehetővé teszi, hogy a "
+"felhasználó kiválasszon egy meghatározott esetet a helyi jellemzők adataiból "
+"egyetlen kategórián belül\\(rq."
+
+#. type: Plain text
+#: amulecmd.1:220 amuleweb.1:145
+msgid "For example, the following strings are valid:"
+msgstr "Például a következő értékek mind érvényesek:"
+
+#. type: Plain text
+#: amulecmd.1:234 amuleweb.1:159
+msgid ""
+"Though all the above strings are accepted as valid language definitions, "
+"I<encoding> and I<modifier> are yet unused."
+msgstr ""
+"Habár a fentieket mind elfogadja a program, mint érvényes "
+"nyelvmeghatározást, a I<kódolás> és I<módosító> még nem használt."
+
+#. type: Plain text
+#: amulecmd.1:237 amuleweb.1:162
+msgid ""
+"In addition to the format above, you can also specify full language names in "
+"English - so B<-l german> is also valid and is equal to B<-l de_DE>."
+msgstr ""
+"Ráadásként a fenti formátumhoz, megadható akár egy nyelv teljes angol "
+"megnevezése is, így például a B<-l german> szintén érvényes és egyenértékű a "
+"B<-l de_DE> megadással."
+
+#. type: Plain text
+#: amulecmd.1:240 amuleweb.1:165
+msgid ""
+"When no locale is defined, either on command-line or in config file, system "
+"default language will be used."
+msgstr ""
+"Ha sem a konfigurációs fájlban, sem a parancssorban nincs megadva a nyelv, "
+"akkor a rendszer alapértelmezett nyelvét fogja használni."
+
+#. type: Plain text
+#: amulecmd.1:242 amuleweb.1:173
+msgid "~/.aMule/remote.conf"
+msgstr "~/.aMule/remote.conf"
+
+#. type: SH
+#: amulecmd.1:242 amuleweb.1:177
+#, no-wrap
+msgid "EXAMPLE"
+msgstr "PÉLDA"
+
+#. type: Plain text
+#: amulecmd.1:244
+msgid "Typically amulecmd will be first run as:"
+msgstr "Tipikusan az amulecmd-t először a következőképpen indítjuk:"
+
+#. type: Plain text
+#: amulecmd.1:246
+msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
+msgstr "B<amulecmd> B<-h> I<gépnév> B<-p> I<EC-port> B<-P> I<EC-jelszó> B<-w>"
+
+#. type: Plain text
+#: amulecmd.1:248 amuleweb.1:183
+msgid "or"
+msgstr "vagy"
+
+#. type: Plain text
+#: amulecmd.1:250
+msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+"B<amulecmd> B<--create-config-from>=I</home/felhasználónév/.aMule/amule.conf>"
+
+#. type: Plain text
+#: amulecmd.1:252 amuleweb.1:187
+msgid ""
+"These will save settings to I<$HOME/.aMule/remote.conf>, and later you only "
+"need to type:"
+msgstr ""
+"Ez elmenti a beállításokat a I<$HOME/.aMule/remote.conf> fájlba, hogy később "
+"már csak ezt kelljen írni:"
+
+#. type: Plain text
+#: amulecmd.1:256
+msgid "Of course, you don't have to follow this example."
+msgstr "Természetesen nem kötelező ezt a példát követni."
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "AMULED"
+msgstr "AMULED"
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon v2.3.1"
+msgstr "aMule Daemon v2.3.1"
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon"
+msgstr "aMule Daemon"
+
+#. type: Plain text
+#: amuled.1:6
+msgid "amuled - the all-platform eMule p2p client - daemonized version"
+msgstr "amule - a \"minden-platform\" eMule p2p kliens - démon változat"
+
+#. type: Plain text
+#: amuled.1:9 ../../src/utils/cas/docs/cas.1:11
+msgid "[B<-c> I<E<lt>pathE<gt>>]"
+msgstr "[B<-c> I<E<lt>útvonalE<gt>>]"
+
+#. type: Plain text
+#: amuled.1:11
+msgid "[B<-p> I<E<lt>pathE<gt>>]"
+msgstr "[B<-p> I<E<lt>fájlE<gt>>]"
+
+#. type: Plain text
+#: amuled.1:32
+msgid "Forks to background."
+msgstr "Háttérbe vonul."
+
+#. type: TP
+#: amuled.1:32
+#, no-wrap
+msgid "B<[ -p> I<E<lt>pathE<gt>>, B<--pid-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>fájlE<gt>>, B<--pid-file>=I<E<lt>fájlE<gt>> B<]>"
+
+#. type: Plain text
+#: amuled.1:36
+msgid ""
+"After fork, create a pid-file in the I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> "
+"has to contain the filename."
+msgstr "A háttérbe vonulás után hozzon létre egy pid-fájlt."
+
+#. type: Plain text
+#: amuled.1:39
+msgid "Configure EC (External Connections)."
+msgstr "A távoli elérés beállítása."
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "AMULEGUI"
+msgstr "AMULEGUI"
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI v2.3.1"
+msgstr "aMuleGUI v2.3.1"
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
+
+#. type: Plain text
+#: amulegui.1:6
+msgid "amulegui - aMule control program with GUI"
+msgstr "amulegui - aMule vezérlő program grafikus felülettel"
+
+#. type: Plain text
+#: amulegui.1:14
+msgid "[B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-t> I<E<lt>számE<gt>>]"
+
+#. type: Plain text
+#: amulegui.1:24
+msgid ""
+"B<amulegui> is a client program, and can be connected to amule or amuled via "
+"EC. You can manage your amule program with it. It provides almost the same "
+"functionalities as amule, even if the core works on another computer."
+msgstr ""
+"Az B<amulegui> egy ügyfél program, távoli elérés segítségével kapcsolódik az "
+"amule(d)-hez. Majdnem a teljes funkcionalitást biztosítja, még ha a mag egy "
+"távoli gépen fut is."
+
+#. type: Plain text
+#: amulegui.1:39
+msgid "Skip connection dialog."
+msgstr "A kapcsolódási párbeszéd átugrása."
+
+#. type: Plain text
+#: amulegui.1:57
+msgid ""
+"This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm "
+"DOT orgE<gt>"
+msgstr ""
+"Ezt a kézikönyv oldalt Julien Delange E<lt>julien AT gunnm DOT orgE<gt> írta "
+"a Debian számára."
+
+#. type: Plain text
+#: amulegui.1:58
+msgid ""
+"This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Ezt a kézikönyv oldalt Vollstrecker E<lt>amule@vollstreckernet.deE<gt> "
+"újraírta."
+
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "AMULEWEB"
+msgstr "AMULEWEB"
+
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "aMule webserver v2.3.1"
+msgstr "aMule web kiszolgáló v2.3.1"
+
+#. type: Plain text
+#: amuleweb.1:6
+msgid "amuleweb - aMule web server"
+msgstr "amuleweb - aMule web kiszolgáló"
+
+#. type: Plain text
+#: amuleweb.1:15
+msgid "[B<-l> I<E<lt>langE<gt>>]"
+msgstr "[B<-l> I<E<lt>nyelvE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:18
+msgid "[B<-t> I<E<lt>nameE<gt>>] [B<-s> I<E<lt>portE<gt>>]"
+msgstr "[B<-t> I<E<lt>sablonE<gt>>] [B<-s> I<E<lt>portE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:20
+msgid "[B<-U> I<E<lt>portE<gt>>]"
+msgstr "[B<-U> I<E<lt>portE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:24
+msgid "[B<-A> I<E<lt>passwordE<gt>>] [B<-G> I<E<lt>passwordE<gt>>]"
+msgstr "[B<-A> I<E<lt>jelszóE<gt>>] [B<-G> I<E<lt>jelszóE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:40
+msgid "[B<--amule-config-file>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--amule-config-file>=I<E<lt>fájlE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:46
+msgid ""
+"B<amuleweb> manages your access to amule through a web browser.  You can "
+"start amuleweb together with B<amule>(1), or separately, any time later.  "
+"Options can be specified via command-line or via config-file.  Command-line "
+"options take precedence over config-file options."
+msgstr ""
+"Az B<amuleweb> programmal egy web-böngésző segítségével vezérelhetjük az "
+"amule(d)-t. Az amuleweb-et az B<amule>(1)-vel együtt is lehet indítani, vagy "
+"külön, kézzel. A beállításait konfigurációs fájlban vagy parancssorban is "
+"megadhatjuk. A parancssori opciók elsőbbséget élveznek a konfigurácós "
+"fájlban találtakkal szemben."
+
+#. type: TP
+#: amuleweb.1:74
+#, no-wrap
+msgid "B<[ -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<]>"
+msgstr "B<[ -t> I<E<lt>sablonE<gt>>, B<--template>=I<E<lt>sablonE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:77
+msgid ""
+"Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section "
+"for details."
+msgstr ""
+"Betölti a I<E<lt>névE<gt>> nevű sablont. Bővebb részletekért lásd a "
+"B<SABLONOK> fejezetet."
+
+#. type: TP
+#: amuleweb.1:77
+#, no-wrap
+msgid "B<[ -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:80
+msgid ""
+"Webserver's HTTP port. This is the port you must point your browser to "
+"(default: I<4711>)."
+msgstr ""
+"Web kiszolgáló HTTP port. Erre a portra kell irányítanod a böngésződet "
+"(alapértelmezés: I<4711>)."
+
+#. type: Plain text
+#: amuleweb.1:84
+msgid "Enable UPnP."
+msgstr "UPnP engedélyezése."
+
+#. type: TP
+#: amuleweb.1:84
+#, no-wrap
+msgid "B<[ -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:87
+msgid "UPnP port."
+msgstr "UPnP port."
+
+#. type: Plain text
+#: amuleweb.1:90
+msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
+msgstr ""
+"Engedélyezi a gzip tömörítést a HTTP adatátvitelnél a sávszélesség jobb "
+"kihasználása érdekében."
+
+#. type: Plain text
+#: amuleweb.1:93
+msgid "Disables using gzip compression (this is the default)."
+msgstr "gzip tömörítés tiltása (alapértelmezett)."
+
+#. type: TP
+#: amuleweb.1:93
+#, no-wrap
+msgid "B<[ -A> I<E<lt>passwdE<gt>>, B<--admin-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -A> I<E<lt>jelszóE<gt>>, B<--admin-pass>=I<E<lt>jelszóE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:96
+msgid "Full access password for webserver."
+msgstr "Teljes hozzáférésű jelszó a web kiszolgálóhoz."
+
+#. type: TP
+#: amuleweb.1:96
+#, no-wrap
+msgid "B<[ -G> I<E<lt>passwdE<gt>>, B<--guest-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -G> I<E<lt>jelszóE<gt>>, B<--guest-pass>=I<E<lt>jelszóE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:99
+msgid "Guest password for webserver."
+msgstr "Web kiszolgáló vendég felhasználó jelszava."
+
+#. type: Plain text
+#: amuleweb.1:102
+msgid "Allows guest access."
+msgstr "Vendég felhasználó engedélyezése."
+
+#. type: Plain text
+#: amuleweb.1:105
+msgid "Denies guest access (default)."
+msgstr "Vendég felhasználó tiltása (alapértelmezett)."
+
+#. type: Plain text
+#: amuleweb.1:111
+msgid ""
+"Load/save webserver settings from/to remote aMule.  This causes amuleweb to "
+"ignore command-line and config-file settings, and load them from aMule.  "
+"When saving preferences none will be written to the config file, but to "
+"aMule.  (Of course, this works only for those settings that can be set in "
+"aMule's Preferences-E<gt>Remote Controls.)"
+msgstr ""
+"Beállítások töltése/mentése a távoli aMule-ról/ra. Ebben az esetben az "
+"amuleweb figyelmen kívül hagyja azokat a parancssori és konfigurációs "
+"fájlbeli beállításokat, amelyeket az aMule-tól is be tud szerezni (ezek "
+"beállíthatók a Beállítások-E<gt>Távoli Elérés pontban). A beállítások "
+"mentésekor sem írja azokat fájlba (mint egyébként), hanem az aMule-t "
+"értesíti a beállítások megváltozásáról. Azon beállítások, melyek az aMule "
+"Beállítások párbeszédpaneljén nem szerepelnek, nem kerülnek mentésre."
+
+#. type: Plain text
+#: amuleweb.1:114
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "PHP értelmező letiltása (elavult, ne használd)"
+
+#. type: Plain text
+#: amuleweb.1:117
+msgid "Recompiles PHP pages on each request."
+msgstr "PHP oldalak újrafordítása minden kérésnél."
+
+#. type: TP
+#: amuleweb.1:126
+#, no-wrap
+msgid "B<[ --amule-config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --amule-config-file>=I<E<lt>fájlE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:132
+msgid ""
+"aMule config file path.  B<DO NOT USE DIRECTLY!> aMule uses this option when "
+"starting amuleweb at aMule startup.  This option causes all other command-"
+"line and config-file settings to be ignored, preferences to be read from the "
+"given config file, and also implies the B<-q -L> options."
+msgstr ""
+"aMule konfigurációs fájl. B<NE HASZNÁLD!> Az aMule használja ezt a "
+"paramétert amikor automatikusan indítja az amuleweb-et. Ezen paraméter "
+"hatására minden más parancssori és konfigurációs fájl-béli beállítást "
+"figyelmen kívül hagy, a beállításait a megadott I<E<lt>fájlE<gt>>-ból "
+"olvassa, illetve bekapcsolja a B<-q -L> opciókat."
+
+#. type: SH
+#: amuleweb.1:165
+#, no-wrap
+msgid "SKIN SUPPORT"
+msgstr "SABLONOK"
+
+#. type: Plain text
+#: amuleweb.1:169
+msgid ""
+"B<amuleweb> is capable of displaying information in different skins.  These "
+"skins are called templates, and you can make amuleweb load a specific "
+"template via the B<-t> command line option.  Templates are searched in two "
+"places: first in I<~/.aMule/webserver/> and then in I</usr/share/amule/"
+"webserver/> if you installed with --prefix=/usr."
+msgstr ""
+"Az B<amuleweb> képes az információ különböző felületekkel történő "
+"megjelenítésére. Ezeket hívjuk sablonoknak, és az amuleweb a B<-t> "
+"parancssori opcióval vehető rá egy adott sablon használatára. A sablonokat a "
+"következő helyeken keresi: először a I<~/.aMule/webserver/> könyvtárban, "
+"majd utána a I</usr/share/amule/webserver/> könyvtárban."
+
+#. type: Plain text
+#: amuleweb.1:171
+msgid ""
+"Each template must be in a subdirectory of the template name, and this "
+"directory must contain all files the template needs."
+msgstr ""
+"Minden sablonnak a sablon nevével megegyező alkönyvtárban kell lennie, és ez "
+"a könyvtár kell tartalmazzon minden fájlt, amelyre a sablonnak szüksége van."
+
+#. type: Plain text
+#: amuleweb.1:175
+msgid "~/.aMule/webserver/"
+msgstr "~/.aMule/webserver/"
+
+#. type: Plain text
+#: amuleweb.1:177
+msgid "I<$(pkgdatadir)>/webserver/"
+msgstr "I<$(pkgdatadir)>/webserver/"
+
+#. type: Plain text
+#: amuleweb.1:179
+msgid "Typically amuleweb will be first run as:"
+msgstr "Tipikusan az amuleweb-et először a következőképpen indítjuk:"
+
+#. type: Plain text
+#: amuleweb.1:181
+msgid ""
+"B<amuleweb> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-s> "
+"I<HTTPport> B<-A> I<AdminPassword> B<-w>"
+msgstr ""
+"B<amuleweb> B<-h> I<gépnév> B<-p> I<EC-port> B<-P> I<EC-jelszó> B<-s> I<HTTP-"
+"port> B<-A> I<admin-jelszó> B<-w>"
+
+#. type: Plain text
+#: amuleweb.1:185
+msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+"B<amuleweb> B<--create-config-from>=I</home/felhasználónév/.aMule/amule.conf>"
+
+#. type: Plain text
+#: amuleweb.1:191
+msgid ""
+"Of course, you may specify any more or less options on the first example "
+"line, and you may also totally omit it."
+msgstr ""
+"Természetesen más paraméterek is megadhatók az első példában, illetve "
+"teljesen el is hagyhatóak."
+
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "ED2K"
+msgstr "ED2K"
+
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "aMule eD2k link parser v1.5.1"
+msgstr "aMule eD2k hivatkozás kezelő v1.5.1"
+
+#. type: Plain text
+#: ed2k.1:6
+msgid "ed2k - aMule eD2k link parser"
+msgstr "ed2k - Az aMule eD2k hivatkozás kezelő."
+
+#. type: Plain text
+#: ed2k.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-c> I<E<lt>útvonalE<gt>>] [B<-t> I<E<lt>számE<gt>>]"
+
+#. type: Plain text
+#: ed2k.1:13
+msgid "I<E<lt>eD2k-linkE<gt>>"
+msgstr "I<E<lt>eD2k-hivatkozásE<gt>>"
+
+#. type: Plain text
+#: ed2k.1:21
+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 ""
+"Elküldi a megadott I<E<lt>eD2k hivatkozásE<gt>>-t az aMule-nek, azaz beírja "
+"a ~/.aMule/ED2KLinks fájlba, amit az aMule másodpercenként megnéz, "
+"hivatkozásokat keresve."
+
+#. type: Plain text
+#: ed2k.1:30
+msgid ""
+"Loads all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr "A megadott gyűjtemény összes fájlját letölti."
+
+#. type: Plain text
+#: ed2k.1:33
+msgid ""
+"Lists all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr "Kilistázza a megadott gyűjtmény összes fájlját."
+
+#. type: Plain text
+#: ed2k.1:53
+msgid "a magnet link;"
+msgstr "egy magnet hivatkozás;"
+
+#. type: Plain text
+#: ed2k.1:55
+msgid "an emulecollection file."
+msgstr "egy emulecollection (gyűjtemény) fájl."
+
+#. type: Plain text
+#: ed2k.1:60
+msgid ""
+"B<The order in which you give the parameters is important.> You can give "
+"more than one link, and every link can have it's own params.  For example "
+"B<ed2k E<lt>link1E<gt> -t2 E<lt>link2E<gt>> will download I<E<lt>link1E<gt>> "
+"in standard category and I<E<lt>link2E<gt>> in category 2."
+msgstr ""
+"B<A paraméterek sorrendje számít.> Megadhatsz egynél több hivatkozást, "
+"mindegyiket a saját paramétereivel. Például az B<ed2k E<lt>link1E<gt> -t2 "
+"E<lt>link2E<gt>> parancs a I<E<lt>link1E<gt>>-et az alapértelmezett, míg a "
+"I<E<lt>link2E<gt>>-t a 2. kategóriába tölti."
+
+#. type: Plain text
+#: ed2k.1:62
+msgid "~/.aMule/ED2KLinks"
+msgstr "~/.aMule/ED2KLinks"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "ALC"
+msgstr "ALC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "aLinkCreator"
+msgstr "aLinkCreator"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+msgid "aLinkCreator - the aMule eD2k link creator"
+msgstr "aLinkCreator - az aMule eD2k hivatkozás készítő"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:9
+msgid ""
+"B<alc> is a graphical utility to create an eD2k link to any file on your "
+"computer."
+msgstr "Az B<alc> egy grafikus segédprogram eD2k hivatkozások létrehozásához"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/wxCas/docs/wxcas.1:16
+msgid "This app doesn't take any arguments."
+msgstr "A program nem vár semmilyen paramétert."
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "ALCC"
+msgstr "ALCC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "aMule eD2k links calculator"
+msgstr "aMule eD2k hivatkozás készítő"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6
+msgid "alcc - text based eD2k links calculator for aMule"
+msgstr "alcc - szöveges eD2k hivatkozás készítő az aMule-hez"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:11
+msgid "I<E<lt>inputfiles_listE<gt>>"
+msgstr "I<E<lt>fájl(ok)...E<gt>>"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:16
+msgid ""
+"Compute the eD2k links of all the input files given in the "
+"I<E<lt>inputfiles_listE<gt>> (There can be one or more files)."
+msgstr ""
+"A parancssorban megadott fájl(ok)hoz számítja ki az eD2k hivatkozás(oka)t. "
+"Egyszerre több fájl is megadható."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:19
+msgid "Compute and add part hashes to the computed eD2k links."
+msgstr "Rész-hash-ek számítása és hozzáadása a készített eD2k hivatkozáshoz."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+msgid "Be verbose - show also calculation steps."
+msgstr "Bőbeszédű mód - a számítási lépéseket is megjeleníti."
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "CAS"
+msgstr "CAS"
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "cas v0.8"
+msgstr "cas v0.8"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:6
+msgid "cas - c aMule statistics"
+msgstr "cas - c aMule statisztikák"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:18
+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 ""
+"A B<cas> program az aMule online-aláírás fájljának tartalmát jeleníti meg a "
+"képernyőn. Ahhoz, hogy ez működjön, engedélyezni kell az \\(BqOnline aláírás"
+"\\(rq opciót az aMule beállításaiban."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:22
+msgid ""
+"Writes the online signature picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+"Az online-aláírás képet generálja. Lehetséges I<=E<lt>fájlE<gt>> "
+"hozzácsatolásával megmondani, hová írja."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:26
+msgid ""
+"HTML page with stats and picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+"Egy HTML oldalt generál, statisztikával és képpel. Lehetséges "
+"I<=E<lt>fájlE<gt>> hozzácsatolásával megmondani, hová írja."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:34
+msgid "Without any options, it prints online signature data to stdout."
+msgstr ""
+"Paraméterek nélkül az online-aláírás adatokat a szabvány kimenetre írja."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:36
+msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+msgstr "A B<cas>-t Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt> írta."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:38
+msgid "~/.aMule/casrc"
+msgstr "~/.aMule/casrc"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:40
+msgid "stat.png"
+msgstr "stat.png"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:42
+msgid "tmp.html"
+msgstr "tmp.html"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "WXCAS"
+msgstr "WXCAS"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "wxCas"
+msgstr "wxCas"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:5
+msgid "wxcas - wx c aMule statistics"
+msgstr "wxcas - wx c aMule statisztikák"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:11
+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 ""
+"A B<wxcas> az aMule online-aláírás fájljának tartalmát jeleníti meg "
+"grafikusan. Ahhoz, hogy ez működjön, engedélyezni kell az \\(BqOnline aláírás"
+"\\(rq opciót az aMule beállításaiban."
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:14
+msgid ""
+"Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt>"
+msgstr ""
+"Készült a Pedro de Oliveira írta B<cas>(1) alapján.  A B<wxcas>-t ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt> írta."
+
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "XAS"
+msgstr "XAS"
+
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "xas v1.9"
+msgstr "xas v1.9"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:5
+msgid "xas - X-Chat aMule Statistics"
+msgstr "xas - X-Chat aMule Statisztikák"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:7
+msgid "B<none>"
+msgstr "B<nincs>"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:12
+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 aMule's preferences."
+msgstr ""
+"A B<xas> egy xchat plugin. A betöltéshez olvasd el az xchat dokumentációját. "
+"Betöltés után a /xas parancs kiírja az aktuális csatornára az aMule "
+"statisztikáit. Ezek az Online Aláírás fájlból kerülnek kiolvasásra. Ahhoz, "
+"hogy ez működjön, engedélyezni kell az \\(BqOnline aláírás\\(rq opciót az "
+"aMule beállításaiban."
+
+#. 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 "
+"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 "
+"autostart-xas programot."
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:16
+msgid "B<xas> was originally written by niet"
+msgstr "A B<xas>-t eredetileg niet írta."
+
+#~ msgid "January 2010"
+#~ msgstr "2010 Január"
+
+#~ msgid ""
+#~ "When giving ed2k as parameter, it connects only to eD2k-network, to "
+#~ "servers in your serverlist. You may also optionally specify a server "
+#~ "address in IP:Port form, to connect to that server only. The IP must be a "
+#~ "dotted decimal IPv4 address, or a resolvable DNS name."
+#~ msgstr ""
+#~ "Ha ed2k-t adunk meg paraméterként, csak az eD2k hálózathoz kapcsolódik, "
+#~ "azaz a kiszolgálókhoz a kiszolgáló-listában. Megadható egy kiszolgáló "
+#~ "címe IP:Port formában, ekkor csak az adott kiszolgálóhoz kapcsolódik. Az "
+#~ "IP vagy egy decimális IPv4 cím, vagy egy érvényes DNS név kell legyen."
+
+#~ msgid "When giving kad, it connects to Kad only."
+#~ msgstr "Ha kad-ot adsz meg, csak a Kademlia hálózathoz kapcsolódik."

aMule-2.3.1.tar.bz2/docs/man/po/manpages-it.add Added

aMule-2.3.1.tar.bz2/docs/man/po/manpages-it.po Added

@@ -0,0 +1,1976 @@
+# Italian translations for aMule package
+# Traduzioni italiane per il pacchetto aMule.
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the aMule package.
+# Automatically generated, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: aMule SVN\n"
+"POT-Creation-Date: 2011-10-31 22:06+0100\n"
+"PO-Revision-Date: 2011-11-04 12:11+0100\n"
+"Last-Translator: Stefano Corti <iz0bbz@libero.it>\n"
+"Language-Team: none\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+# type: TH
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "AMULE"
+msgstr "AMULE"
+
+#. 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"
+msgstr "Novembre 2011"
+
+# type: TH
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule v2.3.1"
+msgstr "aMule v2.3.1"
+
+# type: TH
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule"
+msgstr "aMule"
+
+# type: SH
+#. type: SH
+#: amule.1:4 amulecmd.1:5 amuled.1:4 amuleweb.1:4 ed2k.1:4
+#: ../../src/utils/aLinkCreator/docs/alc.1:3
+#: ../../src/utils/aLinkCreator/docs/alcc.1:4 ../../src/utils/cas/docs/cas.1:4
+#: ../../src/utils/wxCas/docs/wxcas.1:3 ../../src/utils/xas/docs/xas.1:3
+#, no-wrap
+msgid "NAME"
+msgstr "NOME"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:6
+msgid "amule - the all-platform eMule p2p client"
+msgstr "amule - il client p2p multipiattaforma basato su eMule"
+
+# type: SH
+#. type: SH
+#: amule.1:6 amulecmd.1:7 amuled.1:6 amulegui.1:6 amuleweb.1:6 ed2k.1:6
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6 ../../src/utils/cas/docs/cas.1:6
+#: ../../src/utils/wxCas/docs/wxcas.1:5 ../../src/utils/xas/docs/xas.1:5
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "SINTASSI"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:10 amulegui.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-geometry> I<E<lt>geomE<gt>>]"
+msgstr "[B<-c> I<E<lt>percorsoE<gt>>] [B<-geometry> I<E<lt>geometriaE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:13 amuled.1:15
+msgid "[B<-w> I<E<lt>pathE<gt>>]"
+msgstr "[B<-w> I<E<lt>percorsoE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:17 amuled.1:19
+msgid "[B<-t> I<E<lt>numE<gt>>] [I<eD2k-link>]"
+msgstr "[B<-t> I<E<lt>numeroE<gt>>] [I<collegamento-eD2k>]"
+
+# type: SH
+#. type: SH
+#: amule.1:24 amulecmd.1:26 amuled.1:25 amulegui.1:20 amuleweb.1:41 ed2k.1:19
+#: ../../src/utils/aLinkCreator/docs/alc.1:7
+#: ../../src/utils/aLinkCreator/docs/alcc.1:14
+#: ../../src/utils/cas/docs/cas.1:14 ../../src/utils/wxCas/docs/wxcas.1:7
+#: ../../src/utils/xas/docs/xas.1:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "DESCRIZIONE"
+
+# type: TP
+#. type: TP
+#: amule.1:25 amuled.1:26 amulegui.1:24 ed2k.1:21
+#: ../../src/utils/cas/docs/cas.1:26
+#, no-wrap
+msgid "B<[ -c> I<E<lt>pathE<gt>>, B<--config-dir>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>percorsoE<gt>>, B<--config-dir>=I<E<lt>percorsoE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:28 amuled.1:29 amulegui.1:27 ed2k.1:24
+#: ../../src/utils/cas/docs/cas.1:29
+msgid "Read config from I<E<lt>pathE<gt>> instead of home"
+msgstr ""
+"Legge la configurazione dal I<E<lt>percorsoE<gt>> invece che dalla directory "
+"dell'utente."
+
+# type: TP
+#. type: TP
+#: amule.1:28 amulegui.1:27
+#, no-wrap
+msgid "B<[ -geometry >I<E<lt>geomE<gt>> B<]>"
+msgstr "B<[ -geometry >I<E<lt>geometriaE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:31 amulegui.1:30
+msgid ""
+"Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as "
+"standard X11 apps:\t[B<=>][I<E<lt>widthE<gt>>{B<xX>}I<E<lt>heightE<gt>>][{B<"
+"+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>]"
+msgstr ""
+"Imposta la geometria della applicazione. I<E<lt>geometriaE<gt>> usa lo "
+"stesso formato delle applicazioni X11 standard: \t[B<=>]"
+"[I<E<lt>larghezzaE<gt>>{B<xX>}I<E<lt>altezzaE<gt>>][{B<+->}"
+"I<E<lt>spostamentoxE<gt>>{B<+->}I<E<lt>spostamentoyE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:34 amuled.1:42 amulegui.1:33
+msgid "Prints log messages to stdout."
+msgstr "Scrive i messaggi di log nello stdout."
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:37 amuled.1:45 amulegui.1:36
+msgid "Resets config to default values."
+msgstr "Reimposta la configurazione ai valori di default."
+
+# type: TP
+#. type: TP
+#: amule.1:37 amuled.1:45
+#, no-wrap
+msgid "B<[ -w> I<E<lt>pathE<gt>>, B<--use-amuleweb>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -w> I<E<lt>percorsoE<gt>>, B<--use-amuleweb>=I<E<lt>percorsoE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:40 amuled.1:48
+msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
+msgstr ""
+"Specifica la posizione dell'eseguibile di amuleweb in I<E<lt>percorsoE<gt>>."
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:43 amuled.1:51
+msgid "Does not handle fatal exception."
+msgstr "Non gestisce le eccezioni fatali."
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:46 amuled.1:54
+msgid "Does not disable stdin."
+msgstr "Non disabilita lo stdin."
+
+# type: TP
+#. type: TP
+#: amule.1:46 amuled.1:54 amulegui.1:39 ed2k.1:24
+#, no-wrap
+msgid "B<[ -t>, B<--category>=I<E<lt>numE<gt>> B<]>"
+msgstr "B<[ -t>, B<--category>=I<E<lt>numeroE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:49 amuled.1:57 amulegui.1:42 ed2k.1:27
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
+msgstr ""
+"Imposta la categoria per i collegamenti eD2k ricevuti a I<E<lt>numeroE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:52 amulecmd.1:66 amuled.1:60 amulegui.1:48 amuleweb.1:126 ed2k.1:39
+msgid "Displays the current version number."
+msgstr "Visualizza il numero di versione corrente."
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:55 amulecmd.1:69 amuled.1:63 amulegui.1:45 amuleweb.1:123 ed2k.1:36
+#: ../../src/utils/aLinkCreator/docs/alcc.1:22
+#: ../../src/utils/cas/docs/cas.1:32
+msgid "Prints a short usage description."
+msgstr "Visualizza una breve descrizione dell'utilizzo."
+
+# type: TP
+#. type: TP
+#: amule.1:55 amuled.1:63 ed2k.1:39
+#, no-wrap
+msgid "B<[ eD2k-link ]>"
+msgstr "B<[ collegamento-eD2k ]>"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:58 amuled.1:66 ed2k.1:42
+msgid "Adds an eD2k-link to the core."
+msgstr "Aggiunge un collegamento eD2k."
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:60 amulecmd.1:75 amuled.1:68 ed2k.1:44
+msgid "The eD2k link to be added can be:"
+msgstr "Il collegamento eD2k da aggiungere può essere:"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:63 amulecmd.1:78 amuled.1:71 ed2k.1:47
+msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
+msgstr ""
+"un collegamento a un file (ed2k://|file|...), sarà aggiunto alla coda di "
+"download;"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:65 amulecmd.1:80 amuled.1:73 ed2k.1:49
+msgid ""
+"a server link (ed2k://|server|...), it will be added to the server list;"
+msgstr ""
+"un collegamento a un server (ed2k://|server|...), sarà aggiunto alla lista "
+"dei server;"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:67 amuled.1:75 ed2k.1:51
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list;"
+msgstr ""
+"un collegamento a una lista di server, nel cui caso tutti i server inclusi "
+"nella lista verranno aggiunti alla lista dei server;"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:69 amuled.1:77
+msgid "a magnet link."
+msgstr "un collegamento magnet."
+
+# type: SH
+#. type: SH
+#: amule.1:70 amulecmd.1:207 amuleweb.1:132
+#, no-wrap
+msgid "NOTES"
+msgstr "NOTE"
+
+# type: SS
+#. type: SS
+#: amule.1:71 amulecmd.1:208 amuleweb.1:133
+#, no-wrap
+msgid "Paths"
+msgstr "Percorsi"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:75 amulecmd.1:212 amuleweb.1:137
+msgid ""
+"For all options which take a I<E<lt>pathE<gt>> value, if the I<path> "
+"contains no directory part (i.e. just a plain filename), then it is "
+"considered to be under the aMule configuration directory, I<~/.aMule>."
+msgstr ""
+"Per tutte le opzioni che accettano un I<E<lt>percorsoE<gt>>, se il "
+"I<percorso> non contiene una directory (ossia è solo un nome di file), "
+"allora si assume che esso sia presente nella directory di configurazione di "
+"aMule, I<~/.aMule>."
+
+# type: SH
+#. type: SH
+#: amule.1:75 amulecmd.1:240 amuled.1:78 amuleweb.1:171 ed2k.1:60
+#: ../../src/utils/cas/docs/cas.1:36
+#, no-wrap
+msgid "FILES"
+msgstr "FILE"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:77 amuled.1:80
+msgid "~/.aMule/*"
+msgstr "~/.aMule/*"
+
+# type: SH
+#. type: SH
+#: amule.1:77 amulecmd.1:256 amuled.1:80 amulegui.1:48 amuleweb.1:191
+#: ed2k.1:62 ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+#: ../../src/utils/cas/docs/cas.1:42 ../../src/utils/wxCas/docs/wxcas.1:16
+#: ../../src/utils/xas/docs/xas.1:16
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr "SEGNALARE I BUG"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+msgid ""
+"Please report bugs either on our forum (I<http://forum.amule.org/>), or in "
+"our bugtracker (I<http://bugs.amule.org/>).  Please do not report bugs in e-"
+"mail, neither to our mailing list nor directly to any team member."
+msgstr ""
+"Per favore segnalare i bug nel nostro forum (I<http://forum.amule.org/>) o "
+"nel nostro bugtracker (I<http://bugs.amule.org/>). Per favore non segnalare "
+"i bug via posta elettronica, né nella nostra mailing list né direttamente a "
+"qualunque membro del gruppo."
+
+# type: SH
+#. type: SH
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr "COPYRIGHT"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+msgid ""
+"aMule and all of its related utilities are distributed under the GNU General "
+"Public License."
+msgstr ""
+"aMule e tutti i programmi di utilità correlati sono distribuiti in accordo "
+"alla GNU General Public License. "
+
+# type: SH
+#. type: SH
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "VEDI ANCHE"
+
+# type: SH
+#. type: SH
+#: amule.1:84 amulecmd.1:263 amuled.1:87 amulegui.1:55 amuleweb.1:198
+#: ed2k.1:69 ../../src/utils/aLinkCreator/docs/alc.1:18
+#: ../../src/utils/aLinkCreator/docs/alcc.1:33
+#: ../../src/utils/cas/docs/cas.1:49 ../../src/utils/wxCas/docs/wxcas.1:23
+#: ../../src/utils/xas/docs/xas.1:23
+#, no-wrap
+msgid "AUTHOR"
+msgstr "AUTORE"
+
+# type: Plain text
+#. type: Plain text
+#: amule.1:85 amulecmd.1:264 amuled.1:88 amuleweb.1:199 ed2k.1:70
+#: ../../src/utils/aLinkCreator/docs/alc.1:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1:34
+#: ../../src/utils/cas/docs/cas.1:50 ../../src/utils/wxCas/docs/wxcas.1:24
+#: ../../src/utils/xas/docs/xas.1:24
+msgid ""
+"This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Questa pagina del manuale è stata scritta da Vollstrecker "
+"E<lt>amule@vollstreckernet.deE<gt>"
+
+# type: TH
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "AMULECMD"
+msgstr "AMULECMD"
+
+# type: TH
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "aMuleCmd v2.3.1"
+msgstr "aMuleCmd v2.3.1"
+
+# type: TH
+#. type: TH
+#: amulecmd.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 "aMule utilities"
+msgstr "Utilità di aMule"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:7
+msgid "amulecmd - Console-based program to control aMule"
+msgstr "amulecmd - programma in console per controllare aMule"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:13 amuleweb.1:12
+msgid ""
+"[B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
+"I<E<lt>passwordE<gt>>] [B<-f> I<E<lt>pathE<gt>>]"
+msgstr ""
+"[B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portaE<gt>>] [B<-P> "
+"I<E<lt>passwordE<gt>>] [B<-f> I<E<lt>percorsoE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:17
+msgid ""
+"[B<-l> I<E<lt>langE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>commandE<gt>>]"
+"B< >}"
+msgstr ""
+"[B<-l> I<E<lt>linguaggioE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> "
+"I<E<lt>comandoE<gt>>]B< >}"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:20 amuleweb.1:31
+msgid "[B<--create-config-from>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--create-config-from>=I<E<lt>percorsoE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:29
+msgid "B<amulecmd> is a console-based client to control aMule."
+msgstr "B<amulecmd> è un client in console per controllare aMule."
+
+# type: TP
+#. type: TP
+#: amulecmd.1:29 amuleweb.1:46
+#, no-wrap
+msgid "B<[ -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<]>"
+msgstr "B<[ -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:33 amuleweb.1:50
+msgid ""
+"Host where aMule is running (default: I<localhost>).  I<E<lt>hostE<gt>> "
+"might be an IP address or a DNS name"
+msgstr ""
+"Computer dove è in esecuzione aMule (default: I<localhost>). "
+"I<E<lt>hostE<gt>> può essere un indirizzo IP o un nome DNS."
+
+# type: TP
+#. type: TP
+#: amulecmd.1:33 amuleweb.1:50
+#, no-wrap
+msgid "B<[ -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>portaE<gt>>, B<--port>=I<E<lt>portaE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:36 amuleweb.1:53
+msgid ""
+"aMule's port for External Connections, as set in Preferences-E<gt>Remote "
+"Controls (default: I<4712>)"
+msgstr ""
+"Porta di aMule per le connessioni esterne, come impostata nelle preferenze-"
+"E<gt>controllo remoto (default: I<4712>) "
+
+# type: TP
+#. type: TP
+#: amulecmd.1:36 amuleweb.1:53
+#, no-wrap
+msgid "B<[ -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<]>"
+msgstr "B<[ -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:39 amuleweb.1:56
+msgid "External Connections password."
+msgstr "Password delle connessioni esterne."
+
+# type: TP
+#. type: TP
+#: amulecmd.1:39 amuleweb.1:56
+#, no-wrap
+msgid "B<[ -f> I<E<lt>pathE<gt>>, B<--config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -f> I<E<lt>percorsoE<gt>>, B<--config-file>=I<E<lt>percorsoE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:43 amuleweb.1:60
+msgid ""
+"Use the given configuration file.  Default configuration file is I<~/.aMule/"
+"remote.conf>"
+msgstr ""
+"Usa il file di configurazione fornito. Il file di configurazione di default "
+"è I<~/.aMule/remote.conf>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:46 amuleweb.1:63
+msgid "Do not print any output to stdout."
+msgstr "Non scrivere nulla nello stdout."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:50 amuleweb.1:67
+msgid "Be verbose - show also debug messages."
+msgstr "Mostra anche i messaggi di debug."
+
+# type: TP
+#. type: TP
+#: amulecmd.1:50 amuleweb.1:67
+#, no-wrap
+msgid "B<[ -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<]>"
+msgstr "B<[ -l> I<E<lt>linguaggioE<gt>>, B<--locale>=I<E<lt>linguaggioE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:54 amuleweb.1:71
+msgid ""
+"Sets program locale (language).  See the B<NOTES> section for the "
+"description of the I<E<lt>langE<gt>> parameter."
+msgstr ""
+"Imposta il linguaggio del programma. Vedi anche la sezione delle B<NOTE> per "
+"la descrizione del parametro I<E<lt>linguaggioE<gt>> ."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:57 amuleweb.1:74
+msgid "Write command line options to config file and exit"
+msgstr ""
+"Scrive le opzioni della riga di comando nel file di configurazione ed esce."
+
+# type: TP
+#. type: TP
+#: amulecmd.1:57
+#, no-wrap
+msgid "B<[ -c> I<E<lt>commandE<gt>>, B<--command>=I<E<lt>commandE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>comandoE<gt>>, B<--command>=I<E<lt>comandoE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:60
+msgid ""
+"Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and "
+"exit."
+msgstr ""
+"Esegue il I<E<lt>comandoE<gt>> come se fosse stato immesso nel prompt di "
+"amulecmd ed esce."
+
+# type: TP
+#. type: TP
+#: amulecmd.1:60 amuleweb.1:117
+#, no-wrap
+msgid "B<[ --create-config-from>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --create-config-from>=I<E<lt>percorsoE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:63 amuleweb.1:120
+msgid ""
+"Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid "
+"aMule config file, and then exit."
+msgstr ""
+"Crea un file di configurazione basandosi sul I<E<lt>percorsoE<gt>>, che deve "
+"puntare ad un file di configurazione di aMule valido, e quindi esce."
+
+# type: SH
+#. type: SH
+#: amulecmd.1:69
+#, no-wrap
+msgid "COMMANDS"
+msgstr "COMANDI"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:71
+msgid "All commands are case insensitive."
+msgstr "Tutti i comandi non distinguono tra maiuscolo e minuscolo."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:71
+#, no-wrap
+msgid "Add I<E<lt>eD2k-linkE<gt>> | I<E<lt>magnet-linkE<gt>>"
+msgstr "Add I<E<lt>collegamento-eD2kE<gt>> | I<E<lt>collegamento-magnetE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:73
+msgid "Adds an eD2k-link or a magnet-link to the core."
+msgstr "Aggiunge un collegamento eD2k o un collegamento magnet."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:82
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list."
+msgstr ""
+"un collegamento ad una lista di server, nel cui caso tutti i server "
+"contenuti nella lista saranno aggiunti alla lista dei server correnti."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:85
+msgid "The magnet link must contain the eD2k hash and file length."
+msgstr ""
+"Il collegamento magnet deve contenere l'hash eD2k e la lunghezza del file."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:85
+#, no-wrap
+msgid "Cancel I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Cancel I<E<lt>hashE<gt>> | I<E<lt>numeroE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:87
+msgid ""
+"Cancels the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Cancella il download specificato da I<E<lt>hashE<gt>> o I<E<lt>numeroE<gt>>. "
+"Per ottenere il valore utilizzare B<show>."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:87
+#, no-wrap
+msgid "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|nameE<gt>> ]"
+msgstr "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|nomeE<gt>> ]"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:89
+msgid "Connect to the network."
+msgstr "Connessione alla rete."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:91
+msgid "This will connect to all networks that are enabled in Preferences."
+msgstr ""
+"Questo avvierà la connessione a tutte le reti abilitate nelle preferenze."
+
+#. type: Plain text
+#: amulecmd.1:95
+msgid ""
+"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."
+msgstr ""
+"Con il parametro opzionale si può specificare a che rete connettersi. "
+"Fornendo un indirizzo di server nella forma IP:Porta (dove IP è un indirizzo "
+"IPv4 in forma decimale puntata o un nome DNS risolvibile) aMule si "
+"connetterà solo a quel server."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:98
+msgid ""
+"Disconnect from all networks you are connected to, or just disconnect from "
+"the specified network."
+msgstr ""
+"Disconnette da tutte le reti attualmente connesse, o disconnette solo dalla "
+"rete specificata."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:98
+#, no-wrap
+msgid "Download I<E<lt>numberE<gt>>"
+msgstr "Download I<E<lt>numeroE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:100
+msgid "Start downloading a file."
+msgstr "Inizia il download di un file."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:104
+msgid ""
+"The I<E<lt>numberE<gt>> of a file from the last search has to be given.  "
+"Example: `download 12' will start to download the file with the number 12 of "
+"the previous search."
+msgstr ""
+"Deve essere fornito il I<E<lt>numeroE<gt>> di un file dall'ultima ricerca."
+"Esempio: `download 12' inizierà il download del file numero 12 della ricerca "
+"precedente."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:106
+msgid "Disconnect from amule/amuled and quit amulecmd."
+msgstr "Disconnette da amule/amuled ed esce da amulecmd."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:106
+#, no-wrap
+msgid "Get I<E<lt>whatE<gt>>"
+msgstr "Get I<E<lt>oggettoE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:108
+msgid "Get and display a preference value."
+msgstr "Legge e visualizza un valore delle preferenze."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:110 amulecmd.1:144 amulecmd.1:173 amulecmd.1:183
+msgid "Available values for I<E<lt>whatE<gt>>:"
+msgstr "I valori disponibili per l'I<E<lt>oggettoE<gt>> sono:"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:113
+msgid "Get bandwidth limits."
+msgstr "Legge i limiti di banda."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:115
+msgid "Get IPFilter preferences."
+msgstr "Legge le preferenze del filtro IP."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:116
+#, no-wrap
+msgid "Help [ I<E<lt>commandE<gt>> ]"
+msgstr "Help [ I<E<lt>comandoE<gt>> ]"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:120
+msgid ""
+"Prints a short usage description.  If called without parameter, it shows a "
+"list of available commands.  If called with I<E<lt>commandE<gt>>, it shows a "
+"short description of the given command."
+msgstr ""
+"Visualizza una breve descrizione dell'uso. Se chiamato senza parametro, "
+"mostra una lista dei comandi disponibili. Se chiamato con il parametro "
+"I<E<lt>commandE<gt>>, mostra una breve descrizione del comando dato"
+
+# type: SS
+#. type: SS
+#: amulecmd.1:120
+#, no-wrap
+msgid "Pause I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Pause I<E<lt>hashE<gt>> | I<E<lt>numeroE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:122
+msgid ""
+"Pauses the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Mette in pausa il download specificato da I<E<lt>hashE<gt>> o "
+"I<E<lt>numeroE<gt>>. Per ottenere il valore utilizzare B<show>."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:122
+#, no-wrap
+msgid "Priority I<E<lt>priorityE<gt>> I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Priority I<E<lt>prioritàE<gt>> I<E<lt>hashE<gt>> | I<E<lt>numeroE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:124
+msgid ""
+"Set priority of a download specified by I<E<lt>hashE<gt>> or "
+"I<E<lt>numberE<gt>>."
+msgstr ""
+"Imposta la priorità di un download specificato da I<E<lt>hashE<gt>> o "
+"I<E<lt>numeroE<gt>>."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:126
+msgid "Available values for I<E<lt>priorityE<gt>>:"
+msgstr "I valori disponibili per I<E<lt>prioritàE<gt>> sono:"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:129
+msgid "Automatic priority."
+msgstr "Priorità automatica."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:131
+msgid "High priority."
+msgstr "Priorità alta."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:133
+msgid "Low priority."
+msgstr "Priorità bassa."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:135
+msgid "Normal priority."
+msgstr "Priorità normale."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:138
+msgid "Shows the progress of an on-going search."
+msgstr "Mostra i progressi di una ricerca in corso."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:140
+msgid "A synonim of the B<exit> command."
+msgstr "Un sinonimo del comando B<exit>."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:140
+#, no-wrap
+msgid "Reload I<E<lt>whatE<gt>>"
+msgstr "Reload I<E<lt>oggettoE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:142
+msgid "Reloads a given object."
+msgstr "Ricarica un dato oggetto"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:147
+msgid "Reload shared files list."
+msgstr "Ricarica la lista dei file condivisi."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:149
+msgid "Reload IP filter tables."
+msgstr "Ricarica la tabella dei filtri IP."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:152
+msgid "Reset the log."
+msgstr "Cancella il log."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:154
+msgid "Shows you the results of the last search."
+msgstr "Mostra i risultati dell'ultima ricerca."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:154
+#, no-wrap
+msgid "Resume I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Resume I<E<lt>hashE<gt>> | I<E<lt>numeroE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:156
+msgid ""
+"Resumes the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Riprende il download specificato da I<E<lt>hashE<gt>> o I<E<lt>numeroE<gt>>. "
+"Per ottenere il valore utilizzare B<show>."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:156
+#, no-wrap
+msgid "Search I<E<lt>typeE<gt>> I<E<lt>keywordE<gt>>"
+msgstr "Search I<E<lt>tipoE<gt>> I<E<lt>parola-chiaveE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:159
+msgid ""
+"Makes a search for the given I<E<lt>keywordE<gt>>. A search type and a "
+"keyword to search is mandatory to do this.  Example: `search kad amule' "
+"performs a kad search for `amule'."
+msgstr ""
+"Esegue una ricerca per la data I<E<lt>parola-chiaveE<gt>>. Il tipo della "
+"ricerca e una parola chiave da cercare sono obbligatori. Esempio: `search "
+"kad amule' esegue una ricerca sulla rete kad per `amule'."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:161
+msgid "Available search types:"
+msgstr "Tipi di ricerca disponibili:"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:164
+msgid "Performs a global search."
+msgstr "Esegue una ricerca globale."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:166
+msgid "Performs a search on the Kademlia network."
+msgstr "Esegue una ricerca sulla rete Kademlia."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:168
+msgid "Performs a local search."
+msgstr "Esegue una ricerca locale."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:169
+#, no-wrap
+msgid "Set I<E<lt>whatE<gt>>"
+msgstr "Set I<E<lt>oggettoE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:171
+msgid "Sets a given preferences value."
+msgstr "Imposta un dato valore di preferenza."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:176
+msgid "Set bandwidth limits."
+msgstr "Imposta i limiti di banda."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:178
+msgid "Set IPFilter preferences."
+msgstr "Imposta le preferenze del filtro IP."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:179
+#, no-wrap
+msgid "Show I<E<lt>whatE<gt>>"
+msgstr "Show I<E<lt>oggettoE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:181
+msgid "Shows upload/download queue, servers list or shared files list."
+msgstr ""
+"Mostra la coda di upload/download, la lista dei server o la lista dei file "
+"condivisi."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:186
+msgid "Show download queue."
+msgstr "Mostra la coda di download."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:188
+msgid "Show log."
+msgstr "Mostra il log."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:190
+msgid "Show servers list."
+msgstr "Mostra la lista dei server."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:192
+msgid "Show upload queue."
+msgstr "Mostra la coda di upload."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:196
+msgid ""
+"Shutdown the remote running core (amule/amuled).  This will also shut down "
+"the text client, since it is unusable without a running core."
+msgstr ""
+"Chiude il motore remoto in esecuzione (amule/amuled). Questo chiuderà anche "
+"il cliente in formato testo, siccome è inutile senza un motore in esecuzione."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:196
+#, no-wrap
+msgid "Statistics [ I<E<lt>numberE<gt>> ]"
+msgstr "Statistics [ I<E<lt>numeroE<gt>> ]"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:198
+msgid "Show statistics tree."
+msgstr "Mostra l'albero delle statistiche."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:202
+msgid ""
+"The optional I<E<lt>numberE<gt>> in the range of 0-255 can be passed as "
+"argument to this command, which tells how many entries of the client version "
+"subtree should be shown. Passing 0, or omitting it means `unlimited'."
+msgstr ""
+"Il I<E<lt>numeroE<gt>> opzionale, nell'intervallo 0-255, può essere passato "
+"come argomento a questo comando per indicare quante righe del ramo delle "
+"versioni dei client devono essere mostrate. Indicando 0, o omettendo il "
+"parametro significa `illimitato'."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:205
+msgid ""
+"Example: `statistics 5' will show only the top 5 versions for each client "
+"type."
+msgstr ""
+"Esempio: `statistics 5' mostrerà solo le prime 5 versioni per ogni tipo di "
+"client."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:207
+msgid "Show connection status, current up/download speeds, etc."
+msgstr ""
+"Mostra lo stato della connessione, le velocità correnti di up/download, ecc."
+
+# type: SS
+#. type: SS
+#: amulecmd.1:212 amuleweb.1:137
+#, no-wrap
+msgid "Languages"
+msgstr "Linguaggi"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:218 amuleweb.1:143
+msgid ""
+"The I<E<lt>langE<gt>> parameter for the B<-l> option has the following form: "
+"I<lang>[B<_>I<LANG>][B<.>I<encoding>][B<@>I<modifier>] where I<lang> is the "
+"primary language, I<LANG> is a sublanguage/territory, I<encoding> is the "
+"character set to use and I<modifier> allows the user to select a specific "
+"instance of localization data within a single category."
+msgstr ""
+"Il parametro I<E<lt>linguaggioE<gt>> per l'opzione B<-l> ha la forma "
+"seguente: I<linguaggio>[B<_>I<LINGUAGGIO>][B<.>I<codifica>]"
+"[B<@>I<modificatore>] dove I<linguaggio> è il linguaggio primario, "
+"I<LINGUAGGIO> è il sottotipo/territorio, I<codifica> è l'insieme di "
+"caratteri usato e I<modificatore> consente all'utente di selezionare una "
+"specifica istanza dei dati di localizzazione all'interno di una singola "
+"categoria."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:220 amuleweb.1:145
+msgid "For example, the following strings are valid:"
+msgstr "Per esempio, le stringhe seguenti sono valide:"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:234 amuleweb.1:159
+msgid ""
+"Though all the above strings are accepted as valid language definitions, "
+"I<encoding> and I<modifier> are yet unused."
+msgstr ""
+"Sebbene tutte le stringhe sopra elencate sono accettate come definizioni di "
+"linguaggio valide, I<codifica> e I<modificatore> sono ancora inutilizzati."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:237 amuleweb.1:162
+msgid ""
+"In addition to the format above, you can also specify full language names in "
+"English - so B<-l german> is also valid and is equal to B<-l de_DE>."
+msgstr ""
+"In aggiunta al formato di cui sopra, si può anche specificare il nome "
+"completo del linguaggio in inglese, e quindi B<-l german> è valido ed "
+"equivalente a B<-l de_DE>."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:240 amuleweb.1:165
+msgid ""
+"When no locale is defined, either on command-line or in config file, system "
+"default language will be used."
+msgstr ""
+"Quando nessun linguaggio è definito in riga di comando o nel file di "
+"configurazione, verrà usato il linguaggio di default del sistema."
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:242 amuleweb.1:173
+msgid "~/.aMule/remote.conf"
+msgstr "~/.aMule/remote.conf"
+
+# type: SH
+#. type: SH
+#: amulecmd.1:242 amuleweb.1:177
+#, no-wrap
+msgid "EXAMPLE"
+msgstr "ESEMPIO"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:244
+msgid "Typically amulecmd will be first run as:"
+msgstr "Di norma amulecmd sarà inizialmente eseguito come:"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:246
+msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
+msgstr ""
+"B<amulecmd> B<-h> I<nomehost> B<-p> I<portaEC> B<-P> I<passwordEC> B<-w>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:248 amuleweb.1:183
+msgid "or"
+msgstr "o"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:250
+msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+"B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:252 amuleweb.1:187
+msgid ""
+"These will save settings to I<$HOME/.aMule/remote.conf>, and later you only "
+"need to type:"
+msgstr ""
+"In questo modo la configurazione verrà salvata in I<$HOME/.aMule/remote."
+"conf>, e le volte successive si dovrà solo digitare:"
+
+# type: Plain text
+#. type: Plain text
+#: amulecmd.1:256
+msgid "Of course, you don't have to follow this example."
+msgstr "Ma non è necessario seguire questo esempio."
+
+# type: TH
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "AMULED"
+msgstr "AMULED"
+
+# type: TH
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon v2.3.1"
+msgstr "aMule Daemon v2.3.1"
+
+# type: TH
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon"
+msgstr "aMule Daemon"
+
+# type: Plain text
+#. type: Plain text
+#: amuled.1:6
+msgid "amuled - the all-platform eMule p2p client - daemonized version"
+msgstr ""
+"amuled - il client p2p multipiattaforma basato su eMule - versione demone"
+
+# type: Plain text
+#. type: Plain text
+#: amuled.1:9 ../../src/utils/cas/docs/cas.1:11
+msgid "[B<-c> I<E<lt>pathE<gt>>]"
+msgstr "[B<-c> I<E<lt>percorsoE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amuled.1:11
+msgid "[B<-p> I<E<lt>pathE<gt>>]"
+msgstr "[B<-p> I<E<lt>percorsoE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amuled.1:32
+msgid "Forks to background."
+msgstr "Continua l'esecuzione in background."
+
+# type: TP
+#. type: TP
+#: amuled.1:32
+#, no-wrap
+msgid "B<[ -p> I<E<lt>pathE<gt>>, B<--pid-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>percorsoE<gt>>, B<--pid-file>=I<E<lt>percorsoE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amuled.1:36
+msgid ""
+"After fork, create a pid-file in the I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> "
+"has to contain the filename."
+msgstr ""
+"Dopo il passaggio in background, crea un file di pid in "
+"I<E<lt>percorsoE<gt>>. I<E<lt>percorsoE<gt>> deve includere il nome del file."
+
+# type: Plain text
+#. type: Plain text
+#: amuled.1:39
+msgid "Configure EC (External Connections)."
+msgstr "Configura le connessioni esterne (EC)."
+
+# type: TH
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "AMULEGUI"
+msgstr "AMULEGUI"
+
+# type: TH
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI v2.3.1"
+msgstr "aMuleGUI v2.3.1"
+
+# type: TH
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
+
+# type: Plain text
+#. type: Plain text
+#: amulegui.1:6
+msgid "amulegui - aMule control program with GUI"
+msgstr "amulegui - programma in interfaccia grafica per controllare aMule"
+
+# type: Plain text
+#. type: Plain text
+#: amulegui.1:14
+msgid "[B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-t> I<E<lt>numeroE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amulegui.1:24
+msgid ""
+"B<amulegui> is a client program, and can be connected to amule or amuled via "
+"EC. You can manage your amule program with it. It provides almost the same "
+"functionalities as amule, even if the core works on another computer."
+msgstr ""
+"B<amulegui> è un programma client, e può connettersi tramite EC ad amule o "
+"amuled. Con esso si può gestire amule. Fornisce circa le stesse funzionalità "
+"di amule, anche se il motore lavora su un'altro computer."
+
+# type: Plain text
+#. type: Plain text
+#: amulegui.1:39
+msgid "Skip connection dialog."
+msgstr "Salta la finestra di connessione."
+
+# type: Plain text
+#. type: Plain text
+#: amulegui.1:57
+msgid ""
+"This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm "
+"DOT orgE<gt>"
+msgstr ""
+"Questa pagina di manuale è stata scritta da Julien Delange per Debian "
+"E<lt>julien AT gunnm DOT orgE<gt>"
+
+# type: Plain text
+#. type: Plain text
+#: amulegui.1:58
+msgid ""
+"This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Questa pagina di manuale è stata riscritta da Vollstrecker "
+"E<lt>amule@vollstreckernet.deE<gt>"
+
+# type: TH
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "AMULEWEB"
+msgstr "AMULEWEB"
+
+# type: TH
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "aMule webserver v2.3.1"
+msgstr "aMule webserver v2.3.1"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:6
+msgid "amuleweb - aMule web server"
+msgstr "amuleweb - aMule web server"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:15
+msgid "[B<-l> I<E<lt>langE<gt>>]"
+msgstr "[B<-l> I<E<lt>linguaggioE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:18
+msgid "[B<-t> I<E<lt>nameE<gt>>] [B<-s> I<E<lt>portE<gt>>]"
+msgstr "B<-t> I<E<lt>nomeE<gt>>] [B<-s> I<E<lt>portaE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:20
+msgid "[B<-U> I<E<lt>portE<gt>>]"
+msgstr "[B<-U> I<E<lt>portaE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:24
+msgid "[B<-A> I<E<lt>passwordE<gt>>] [B<-G> I<E<lt>passwordE<gt>>]"
+msgstr "[B<-A> I<E<lt>passwordE<gt>>] [B<-G> I<E<lt>passwordE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:40
+msgid "[B<--amule-config-file>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--amule-config-file>=I<E<lt>percorsoE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:46
+msgid ""
+"B<amuleweb> manages your access to amule through a web browser.  You can "
+"start amuleweb together with B<amule>(1), or separately, any time later.  "
+"Options can be specified via command-line or via config-file.  Command-line "
+"options take precedence over config-file options."
+msgstr ""
+"B<amuleweb> gestisce l'accesso ad amule attraverso un browser web.  Si può "
+"eseguire amuleweb insieme ad B<amule>(1), o separatamente in qualunque "
+"momento successivo. Le opzioni possono essere specificate in riga di comando "
+"o nel file di configurazione. Le opzioni in riga di comando hanno la "
+"precedenza su quelle nel file di configurazione."
+
+# type: TP
+#. type: TP
+#: amuleweb.1:74
+#, no-wrap
+msgid "B<[ -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<]>"
+msgstr "B<[ -t> I<E<lt>nomeE<gt>>, B<--template>=I<E<lt>nomeE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:77
+msgid ""
+"Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section "
+"for details."
+msgstr ""
+"Carica il modello chiamato I<E<lt>nomeE<gt>>. Vedi la sezione B<SUPPORTO "
+"AGLI SKIN> per i dettagli."
+
+# type: TP
+#. type: TP
+#: amuleweb.1:77
+#, no-wrap
+msgid "B<[ -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -s> I<E<lt>portaE<gt>>, B<--server-port>=I<E<lt>portaE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:80
+msgid ""
+"Webserver's HTTP port. This is the port you must point your browser to "
+"(default: I<4711>)."
+msgstr ""
+"Porta HTTP del server web. Questa è la porta da indicare nel browser "
+"(default: I<4711>)."
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:84
+msgid "Enable UPnP."
+msgstr "Abilita il supporto UPnP."
+
+# type: TP
+#. type: TP
+#: amuleweb.1:84
+#, no-wrap
+msgid "B<[ -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -U> I<E<lt>portaE<gt>>, B<--upnp-port> I<E<lt>portaE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:87
+msgid "UPnP port."
+msgstr "Porta per l'UPnP."
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:90
+msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
+msgstr "Abilita la compressione gzip nel traffico HTTP per risparmiare banda."
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:93
+msgid "Disables using gzip compression (this is the default)."
+msgstr "Disabilita la compressione gzip (questo è il default)."
+
+# type: TP
+#. type: TP
+#: amuleweb.1:93
+#, no-wrap
+msgid "B<[ -A> I<E<lt>passwdE<gt>>, B<--admin-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -A> I<E<lt>passwordE<gt>>, B<--admin-pass>=I<E<lt>passwordE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:96
+msgid "Full access password for webserver."
+msgstr "Password per l'accesso completo al web server."
+
+# type: TP
+#. type: TP
+#: amuleweb.1:96
+#, no-wrap
+msgid "B<[ -G> I<E<lt>passwdE<gt>>, B<--guest-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -G> I<E<lt>passwordE<gt>>, B<--guest-pass>=I<E<lt>passwordE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:99
+msgid "Guest password for webserver."
+msgstr "Password for l'accesso ospite al web server."
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:102
+msgid "Allows guest access."
+msgstr "Permette l'accesso ospite."
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:105
+msgid "Denies guest access (default)."
+msgstr "Nega l'accesso ospite (default)."
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:111
+msgid ""
+"Load/save webserver settings from/to remote aMule.  This causes amuleweb to "
+"ignore command-line and config-file settings, and load them from aMule.  "
+"When saving preferences none will be written to the config file, but to "
+"aMule.  (Of course, this works only for those settings that can be set in "
+"aMule's Preferences-E<gt>Remote Controls.)"
+msgstr ""
+"Carica/salva le configurazioni del webserver da/verso aMule remoto. amuleweb "
+"ignorerà le opzioni in linea di comando e nel file di configurazione, e le "
+"caricherà invece da aMule. Quando si salveranno le preferenze, niente verrà "
+"scritto nel file di configurazione, ma in aMule. (Ovviamente, questo "
+"funzionerà solo per quelle impostazioni che possono essere scritte nelle "
+"preferenze di aMule-E<gt>controllo remoto.)"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:114
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Disabilita l'interprete PHP (deprecato)"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:117
+msgid "Recompiles PHP pages on each request."
+msgstr "Ricompila le pagine PHP ad ogni richiesta."
+
+# type: TP
+#. type: TP
+#: amuleweb.1:126
+#, no-wrap
+msgid "B<[ --amule-config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --amule-config-file>=I<E<lt>percorsoE<gt>> B<]>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:132
+msgid ""
+"aMule config file path.  B<DO NOT USE DIRECTLY!> aMule uses this option when "
+"starting amuleweb at aMule startup.  This option causes all other command-"
+"line and config-file settings to be ignored, preferences to be read from the "
+"given config file, and also implies the B<-q -L> options."
+msgstr ""
+"Percorso del file di configurazione di aMule. B<NON USARE DIRETTAMENTE!> "
+"aMule usa questa opzione quando lancia amuleweb all'avvio di aMule. Questa "
+"opzione fa sì che tutte le altre impostazioni in riga di comando e nel file "
+"di configurazione vengano ignorate, le preferenze vengano lette dal file di "
+"configurazione dato, e anche implica le opzioni B<-q -L> ."
+
+# type: SH
+#. type: SH
+#: amuleweb.1:165
+#, no-wrap
+msgid "SKIN SUPPORT"
+msgstr "SUPPORTO AGLI SKIN"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:169
+msgid ""
+"B<amuleweb> is capable of displaying information in different skins.  These "
+"skins are called templates, and you can make amuleweb load a specific "
+"template via the B<-t> command line option.  Templates are searched in two "
+"places: first in I<~/.aMule/webserver/> and then in I</usr/share/amule/"
+"webserver/> if you installed with --prefix=/usr."
+msgstr ""
+"B<amuleweb> può visualizzare l'informazione utilizzando diversi 'skin'. "
+"Questi 'skin' sono contenuti in dei modelli, e si può far caricare da "
+"amuleweb un dato modello tramite l'opzione B<-t> in riga di comando. I "
+"modelli sono cercati in due posti: prima in I<~/.aMule/webserver/> e quindi "
+"in I</usr/share/amule/webserver/> se aMule è stato installato con --prefix=/"
+"usr."
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:171
+msgid ""
+"Each template must be in a subdirectory of the template name, and this "
+"directory must contain all files the template needs."
+msgstr ""
+"Ogni modello deve essere in una sottodirectory del nome di modello, e questa "
+"directory deve contenere tutti i file necessari al modello."
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:175
+msgid "~/.aMule/webserver/"
+msgstr "~/.aMule/webserver/"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:177
+msgid "I<$(pkgdatadir)>/webserver/"
+msgstr "I<$(pkgdatadir)>/webserver/"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:179
+msgid "Typically amuleweb will be first run as:"
+msgstr "Di norma amuleweb sarà inizialmente eseguito con:"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:181
+msgid ""
+"B<amuleweb> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-s> "
+"I<HTTPport> B<-A> I<AdminPassword> B<-w>"
+msgstr ""
+"B<amuleweb> B<-h> I<nomehost> B<-p> I<ECporta> B<-P> I<passwordEC> B<-s> "
+"I<portaHTTP> B<-A> I<PasswordAmministrazione> B<-w>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:185
+msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+"B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+
+# type: Plain text
+#. type: Plain text
+#: amuleweb.1:191
+msgid ""
+"Of course, you may specify any more or less options on the first example "
+"line, and you may also totally omit it."
+msgstr ""
+"Ovviamente, si possono specificare più o meno opzioni della prima riga di "
+"esempio, e si si possono anche omettere completamente."
+
+# type: TH
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "ED2K"
+msgstr "ED2K"
+
+# type: TH
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "aMule eD2k link parser v1.5.1"
+msgstr "Analizzatore di collegamenti eD2k per aMule v1.5.1"
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:6
+msgid "ed2k - aMule eD2k link parser"
+msgstr "ed2k - Analizzatore di collegamenti eD2k per aMule"
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-c> I<E<lt>percorsoE<gt>>] [B<-t> I<E<lt>numeroE<gt>>]"
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:13
+msgid "I<E<lt>eD2k-linkE<gt>>"
+msgstr "I<E<lt>collegamento-eD2kE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:21
+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 ""
+"Invia il I<E<lt>collegamento-eD2kE<gt>> ad aMule, cioè lo scrive nel file ~/."
+"aMule/ED2KLinks, che sarà controllato da aMule ogni secondo per nuovi "
+"collegamenti."
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:30
+msgid ""
+"Loads all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+"Carica tutti i collegamenti trovati nel file emulecollection fornito come "
+"I<E<lt>collegamento-ed2kE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:33
+msgid ""
+"Lists all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+"Elenca tutti i collegamenti trovati nel file emulecollection fornito come "
+"I<E<lt>collegamento-ed2kE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:53
+msgid "a magnet link;"
+msgstr "un collegamento magnet;"
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:55
+msgid "an emulecollection file."
+msgstr "un file emulecollection."
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:60
+msgid ""
+"B<The order in which you give the parameters is important.> You can give "
+"more than one link, and every link can have it's own params.  For example "
+"B<ed2k E<lt>link1E<gt> -t2 E<lt>link2E<gt>> will download I<E<lt>link1E<gt>> "
+"in standard category and I<E<lt>link2E<gt>> in category 2."
+msgstr ""
+"B<L'ordine con cui fornisci i parametri è importante.> Si può fornire più di "
+"un collegamento, e ogni collegamento può avere propri parametri. Per esempio "
+"B<ed2k E<lt>collegamento1E<gt> -t2 E<lt>collegamento2E<gt>> eseguirà il "
+"download di I<E<lt>collegamento1E<gt>> in categoria standard e "
+"I<E<lt>collegamento2E<gt>> in categoria 2."
+
+# type: Plain text
+#. type: Plain text
+#: ed2k.1:62
+msgid "~/.aMule/ED2KLinks"
+msgstr "~/.aMule/ED2KLinks"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "ALC"
+msgstr "ALC"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "aLinkCreator"
+msgstr "aLinkCreator"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+msgid "aLinkCreator - the aMule eD2k link creator"
+msgstr "aLinkCreator - generatore di collegamenti eD2k di aMule"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:9
+msgid ""
+"B<alc> is a graphical utility to create an eD2k link to any file on your "
+"computer."
+msgstr ""
+"B<alc> è una utilità grafica per creare un collegamento eD2k da ogni file "
+"sul vostro computer."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/wxCas/docs/wxcas.1:16
+msgid "This app doesn't take any arguments."
+msgstr "Questa applicazione non accetta parametri."
+
+# type: TH
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "ALCC"
+msgstr "ALCC"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "aMule eD2k links calculator"
+msgstr "Calcolatore di collegamenti eD2k di aMule"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6
+msgid "alcc - text based eD2k links calculator for aMule"
+msgstr "alcc - Generatore di collegamenti eD2k in formato testo per aMule"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:11
+msgid "I<E<lt>inputfiles_listE<gt>>"
+msgstr "I<E<lt>elenco_di_fileE<gt>>"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:16
+msgid ""
+"Compute the eD2k links of all the input files given in the "
+"I<E<lt>inputfiles_listE<gt>> (There can be one or more files)."
+msgstr ""
+"Genera i collegamenti eD2k di tutti i file in ingresso forniti in "
+"I<E<lt>elenco_di_fileE<gt>> (Ci possono essere uno o più file)."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:19
+msgid "Compute and add part hashes to the computed eD2k links."
+msgstr "Genera e include gli hash delle singole parti al collegamento eD2k."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+msgid "Be verbose - show also calculation steps."
+msgstr "Dettagliato - mostra anche i passaggi di calcolo."
+
+# type: TH
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "CAS"
+msgstr "CAS"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "cas v0.8"
+msgstr "cas v0.8"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:6
+msgid "cas - c aMule statistics"
+msgstr "cas - statistiche c di aMule"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:18
+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<cas> è un programma per visualizzare i contenuti del file di firma "
+"generato da aMule in console (in forma leggibile dalle persone). Per il "
+"funzionamento, devi abilitare l'opzione \"firma online\" nelle preferenze di "
+"aMule."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:22
+msgid ""
+"Writes the online signature picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+"Genera il disegno per la firma. Si può anche aggiungere "
+"I<=E<lt>percorsoE<gt>> a questa opzione per specificare il luogo dove deve "
+"essere scritta."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:26
+msgid ""
+"HTML page with stats and picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+"Pagina HTML con le statistiche e il disegno. Si può anche aggiungere "
+"I<=E<lt>percorsoE<gt>> a questa opzione per specificare il luogo dove deve "
+"essere scritta."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:34
+msgid "Without any options, it prints online signature data to stdout."
+msgstr "Senza opzioni, scrive i dati della firma nello stdout."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:36
+msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+msgstr ""
+"B<cas> è stato scritto da Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:38
+msgid "~/.aMule/casrc"
+msgstr "~/.aMule/casrc"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:40
+msgid "stat.png"
+msgstr "stat.png"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:42
+msgid "tmp.html"
+msgstr "tmp.html"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "WXCAS"
+msgstr "WXCAS"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "wxCas"
+msgstr "wxCas"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:5
+msgid "wxcas - wx c aMule statistics"
+msgstr "wxcas - statistiche wx c di aMule"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:11
+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<wxcas> è un programma per visualizzare i contenuti del file di firma "
+"online in una bella finestra wx sul tuo schermo. Per il funzionamento, devi "
+"abilitare l'opzione \"firma online\" nelle preferenze di aMule."
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:14
+msgid ""
+"Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt>"
+msgstr ""
+"Basato su B<cas>(1) di Pedro de Oliveira.  B<wxcas> è stato scritto da "
+"ThePolish E<lt>thepolish@vipmail.ruE<gt>"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "XAS"
+msgstr "XAS"
+
+# type: TH
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "xas v1.9"
+msgstr "xas v1.9"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:5
+msgid "xas - X-Chat aMule Statistics"
+msgstr "xas - Statistiche di aMule per X-Chat"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:7
+msgid "B<none>"
+msgstr "B<nessuna>"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:12
+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 aMule's preferences."
+msgstr ""
+"B<xas> è un plugin per xchat. Per il caricamento vedere la documentazione di "
+"xchat. Dopo il caricamento digitare /xas e le statistiche verranno inviate "
+"sul canale a cui siete collegati. Queste sono prese dal file di firma "
+"online. Per il funzionamento, dovete abilitare l'opzione della \"firma online"
+"\" nelle preferenze di aMule."
+
+# type: Plain text
+#. 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 "
+"script (in /usr/bin if you installed with --prefix=/usr)."
+msgstr ""
+"Per abilitarlo ad ogni avvio di xchat dovete eseguire lo script autostart-"
+"xas (presente in /usr/bin se avete installato con --prefix=/usr)"
+
+# type: Plain text
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:16
+msgid "B<xas> was originally written by niet"
+msgstr "B<xas> è stato originalmente scritto da niet"

aMule-2.3.1.tar.bz2/docs/man/po/manpages-ru.add Added

aMule-2.3.1.tar.bz2/docs/man/po/manpages-ru.po Added

@@ -0,0 +1,1722 @@
+# aMule man page russian translation
+# Copyright (C) 2010 Free Software Foundation, Inc.
+# This file is distributed under the same license as the aMule package.
+# radist.morse <radist.morse@gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: manpages-ru\n"
+"POT-Creation-Date: 2011-10-31 22:06+0100\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: RU\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: Russian\n"
+"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "AMULE"
+msgstr "AMULE"
+
+#. 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"
+msgstr ""
+
+#. type: TH
+#: amule.1:1
+#, fuzzy, no-wrap
+#| msgid "aMule v2.3.0"
+msgid "aMule v2.3.1"
+msgstr "aMule v2.3.0"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule"
+msgstr "aMule"
+
+#. type: SH
+#: amule.1:4 amulecmd.1:5 amuled.1:4 amuleweb.1:4 ed2k.1:4
+#: ../../src/utils/aLinkCreator/docs/alc.1:3
+#: ../../src/utils/aLinkCreator/docs/alcc.1:4 ../../src/utils/cas/docs/cas.1:4
+#: ../../src/utils/wxCas/docs/wxcas.1:3 ../../src/utils/xas/docs/xas.1:3
+#, no-wrap
+msgid "NAME"
+msgstr "ИМЯ"
+
+#. type: Plain text
+#: amule.1:6
+msgid "amule - the all-platform eMule p2p client"
+msgstr "amule - мультиплатформенный p2p клиент eMule"
+
+#. type: SH
+#: amule.1:6 amulecmd.1:7 amuled.1:6 amulegui.1:6 amuleweb.1:6 ed2k.1:6
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6 ../../src/utils/cas/docs/cas.1:6
+#: ../../src/utils/wxCas/docs/wxcas.1:5 ../../src/utils/xas/docs/xas.1:5
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "ОБЗОР"
+
+#. type: Plain text
+#: amule.1:10 amulegui.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-geometry> I<E<lt>geomE<gt>>]"
+msgstr "[B<-c> I<E<lt>путьE<gt>>] [B<-geometry> I<E<lt>геометрияE<gt>>]"
+
+#. type: Plain text
+#: amule.1:13 amuled.1:15
+msgid "[B<-w> I<E<lt>pathE<gt>>]"
+msgstr "[B<-w> I<E<lt>путьE<gt>>]"
+
+#. type: Plain text
+#: amule.1:17 amuled.1:19
+msgid "[B<-t> I<E<lt>numE<gt>>] [I<eD2k-link>]"
+msgstr "[B<-t> I<E<lt>номерE<gt>>] [I<eD2k-ссылка>]"
+
+#. type: SH
+#: amule.1:24 amulecmd.1:26 amuled.1:25 amulegui.1:20 amuleweb.1:41 ed2k.1:19
+#: ../../src/utils/aLinkCreator/docs/alc.1:7
+#: ../../src/utils/aLinkCreator/docs/alcc.1:14
+#: ../../src/utils/cas/docs/cas.1:14 ../../src/utils/wxCas/docs/wxcas.1:7
+#: ../../src/utils/xas/docs/xas.1:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "ОПИСАНИЕ"
+
+#. type: TP
+#: amule.1:25 amuled.1:26 amulegui.1:24 ed2k.1:21
+#: ../../src/utils/cas/docs/cas.1:26
+#, no-wrap
+msgid "B<[ -c> I<E<lt>pathE<gt>>, B<--config-dir>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>путьE<gt>>, B<--config-dir>=I<E<lt>путьE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:28 amuled.1:29 amulegui.1:27 ed2k.1:24
+#: ../../src/utils/cas/docs/cas.1:29
+msgid "Read config from I<E<lt>pathE<gt>> instead of home"
+msgstr ""
+"Прочитать конфигурацию из места, указанного в I<E<lt>путиE<gt>>, вместо "
+"домашнего каталога"
+
+#. type: TP
+#: amule.1:28 amulegui.1:27
+#, no-wrap
+msgid "B<[ -geometry >I<E<lt>geomE<gt>> B<]>"
+msgstr "B<[ -geometry >I<E<lt>геометрияE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:31 amulegui.1:30
+msgid ""
+"Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as "
+"standard X11 apps:\t[B<=>][I<E<lt>widthE<gt>>{B<xX>}I<E<lt>heightE<gt>>][{B<"
+"+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>]"
+msgstr ""
+"Указать геометрию окна. I<E<lt>ГеометрияE<gt>> использует стандартный формат "
+"X11:\t[B<=>][I<E<lt>ширинаE<gt>>{B<xX>}I<E<lt>высотаE<gt>>][{B<+->}"
+"I<E<lt>смещениеXE<gt>>{B<+->}I<E<lt>смещениеYE<gt>>]"
+
+#. type: Plain text
+#: amule.1:34 amuled.1:42 amulegui.1:33
+msgid "Prints log messages to stdout."
+msgstr "Печатает сообщения лога в стандартный вывод."
+
+#. type: Plain text
+#: amule.1:37 amuled.1:45 amulegui.1:36
+msgid "Resets config to default values."
+msgstr "Сбрасывает конфигурацию в изначальную."
+
+#. type: TP
+#: amule.1:37 amuled.1:45
+#, no-wrap
+msgid "B<[ -w> I<E<lt>pathE<gt>>, B<--use-amuleweb>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -w> I<E<lt>путьE<gt>>, B<--use-amuleweb>=I<E<lt>путьE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:40 amuled.1:48
+msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
+msgstr "Указать I<E<lt>путьE<gt>> к исполняемому файлу amuleweb."
+
+#. type: Plain text
+#: amule.1:43 amuled.1:51
+msgid "Does not handle fatal exception."
+msgstr "Не обрабатывать фатальные исключительные ситуации."
+
+#. type: Plain text
+#: amule.1:46 amuled.1:54
+msgid "Does not disable stdin."
+msgstr "Не отключать стандартный ввод."
+
+#. type: TP
+#: amule.1:46 amuled.1:54 amulegui.1:39 ed2k.1:24
+#, no-wrap
+msgid "B<[ -t>, B<--category>=I<E<lt>numE<gt>> B<]>"
+msgstr "B<[ -t>, B<--category>=I<E<lt>номерE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:49 amuled.1:57 amulegui.1:42 ed2k.1:27
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
+msgstr "Указать I<E<lt>номерE<gt>> категории для eD2k ссылок."
+
+#. type: Plain text
+#: amule.1:52 amulecmd.1:66 amuled.1:60 amulegui.1:48 amuleweb.1:126 ed2k.1:39
+msgid "Displays the current version number."
+msgstr "Выводит информацию о версии."
+
+#. type: Plain text
+#: amule.1:55 amulecmd.1:69 amuled.1:63 amulegui.1:45 amuleweb.1:123 ed2k.1:36
+#: ../../src/utils/aLinkCreator/docs/alcc.1:22
+#: ../../src/utils/cas/docs/cas.1:32
+msgid "Prints a short usage description."
+msgstr "Выводит короткую помощь по использованию."
+
+#. type: TP
+#: amule.1:55 amuled.1:63 ed2k.1:39
+#, no-wrap
+msgid "B<[ eD2k-link ]>"
+msgstr "B<[ eD2k-ссылка ]>"
+
+#. type: Plain text
+#: amule.1:58 amuled.1:66 ed2k.1:42
+msgid "Adds an eD2k-link to the core."
+msgstr "Передает eD2k-ссылку в ядро."
+
+#. type: Plain text
+#: amule.1:60 amulecmd.1:75 amuled.1:68 ed2k.1:44
+msgid "The eD2k link to be added can be:"
+msgstr "Добавляемая eD2k-ссылка может быть:"
+
+#. type: Plain text
+#: amule.1:63 amulecmd.1:78 amuled.1:71 ed2k.1:47
+msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
+msgstr ""
+"файловая ссылка (ed2k://|file|...), она будет добавлена в очередь закачки;"
+
+#. type: Plain text
+#: amule.1:65 amulecmd.1:80 amuled.1:73 ed2k.1:49
+msgid ""
+"a server link (ed2k://|server|...), it will be added to the server list;"
+msgstr ""
+"серверная ссылка (ed2k://|server|...), она будет добавлена в список серверов;"
+
+#. type: Plain text
+#: amule.1:67 amuled.1:75 ed2k.1:51
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list;"
+msgstr ""
+"ссылка на список серверов, тогда все сервера из списка будут добавлены в "
+"список серверов;"
+
+#. type: Plain text
+#: amule.1:69 amuled.1:77
+msgid "a magnet link."
+msgstr "magnet-ссылка."
+
+#. type: SH
+#: amule.1:70 amulecmd.1:207 amuleweb.1:132
+#, no-wrap
+msgid "NOTES"
+msgstr "ЗАМЕЧАНИЯ"
+
+#. type: SS
+#: amule.1:71 amulecmd.1:208 amuleweb.1:133
+#, no-wrap
+msgid "Paths"
+msgstr "Пути"
+
+#. type: Plain text
+#: amule.1:75 amulecmd.1:212 amuleweb.1:137
+msgid ""
+"For all options which take a I<E<lt>pathE<gt>> value, if the I<path> "
+"contains no directory part (i.e. just a plain filename), then it is "
+"considered to be under the aMule configuration directory, I<~/.aMule>."
+msgstr ""
+"Для всех опций, в которых указывается I<E<lt>путьE<gt>>, если I<путь> не "
+"содержит каталога (т.е. только имя самого файла), то предполагается, что "
+"файл находится в каталоге конфигурации, I<~/.aMule>."
+
+#. type: SH
+#: amule.1:75 amulecmd.1:240 amuled.1:78 amuleweb.1:171 ed2k.1:60
+#: ../../src/utils/cas/docs/cas.1:36
+#, no-wrap
+msgid "FILES"
+msgstr "ФАЙЛЫ"
+
+#. type: Plain text
+#: amule.1:77 amuled.1:80
+msgid "~/.aMule/*"
+msgstr "~/.aMule/*"
+
+#. type: SH
+#: amule.1:77 amulecmd.1:256 amuled.1:80 amulegui.1:48 amuleweb.1:191
+#: ed2k.1:62 ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+#: ../../src/utils/cas/docs/cas.1:42 ../../src/utils/wxCas/docs/wxcas.1:16
+#: ../../src/utils/xas/docs/xas.1:16
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr "СООБЩЕНИЕ ОБ ОШИБКАХ"
+
+#. type: Plain text
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+msgid ""
+"Please report bugs either on our forum (I<http://forum.amule.org/>), or in "
+"our bugtracker (I<http://bugs.amule.org/>).  Please do not report bugs in e-"
+"mail, neither to our mailing list nor directly to any team member."
+msgstr ""
+"Пожалуйста, сообщайте об ошибках либо на нашем форуме (I<http://forum.amule."
+"org/>), либо в багтрекере (I<http://bugs.amule.org/>). Пожалуйста, не "
+"сообщайте об ошбках по электронной почте, по нашим спискам рассылки, или "
+"напрямую участникам."
+
+#. type: SH
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr "АВТОРСКИЕ ПРАВА"
+
+#. type: Plain text
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+msgid ""
+"aMule and all of its related utilities are distributed under the GNU General "
+"Public License."
+msgstr ""
+"aMule и все прилагающиеся инструменты распространаются под Открытым "
+"Лицензионным Соглашением GNU (GNU GPL)."
+
+#. type: SH
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "СМ. ТАКЖЕ"
+
+#. type: SH
+#: amule.1:84 amulecmd.1:263 amuled.1:87 amulegui.1:55 amuleweb.1:198
+#: ed2k.1:69 ../../src/utils/aLinkCreator/docs/alc.1:18
+#: ../../src/utils/aLinkCreator/docs/alcc.1:33
+#: ../../src/utils/cas/docs/cas.1:49 ../../src/utils/wxCas/docs/wxcas.1:23
+#: ../../src/utils/xas/docs/xas.1:23
+#, no-wrap
+msgid "AUTHOR"
+msgstr "АВТОРЫ"
+
+#. type: Plain text
+#: amule.1:85 amulecmd.1:264 amuled.1:88 amuleweb.1:199 ed2k.1:70
+#: ../../src/utils/aLinkCreator/docs/alc.1:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1:34
+#: ../../src/utils/cas/docs/cas.1:50 ../../src/utils/wxCas/docs/wxcas.1:24
+#: ../../src/utils/xas/docs/xas.1:24
+msgid ""
+"This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Автор страницы помощи: Vollstrecker E<lt>amule@vollstreckernet.deE<gt>, "
+"перевод: Radist Morse E<lt>radist.morse@gmail.comE<gt>"
+
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "AMULECMD"
+msgstr "AMULECMD"
+
+#. type: TH
+#: amulecmd.1:1
+#, fuzzy, no-wrap
+#| msgid "aMuleCmd v2.3.0"
+msgid "aMuleCmd v2.3.1"
+msgstr "aMuleCmd v2.3.0"
+
+#. type: TH
+#: amulecmd.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 "aMule utilities"
+msgstr "утилиты aMule"
+
+#. type: Plain text
+#: amulecmd.1:7
+msgid "amulecmd - Console-based program to control aMule"
+msgstr "amulecmd - консольная программа для управления aMule"
+
+#. type: Plain text
+#: amulecmd.1:13 amuleweb.1:12
+msgid ""
+"[B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
+"I<E<lt>passwordE<gt>>] [B<-f> I<E<lt>pathE<gt>>]"
+msgstr ""
+"[B<-h> I<E<lt>хостE<gt>>] [B<-p> I<E<lt>портE<gt>>] [B<-P> "
+"I<E<lt>парольE<gt>>] [B<-f> I<E<lt>путьE<gt>>]"
+
+#. type: Plain text
+#: amulecmd.1:17
+msgid ""
+"[B<-l> I<E<lt>langE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>commandE<gt>>]"
+"B< >}"
+msgstr ""
+"[B<-l> I<E<lt>языкE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>командаE<gt>>]"
+"B< >}"
+
+#. type: Plain text
+#: amulecmd.1:20 amuleweb.1:31
+msgid "[B<--create-config-from>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--create-config-from>=I<E<lt>путьE<gt>>]"
+
+#. type: Plain text
+#: amulecmd.1:29
+msgid "B<amulecmd> is a console-based client to control aMule."
+msgstr "B<amulecmd> консольный клиент для управления программой aMule."
+
+#. type: TP
+#: amulecmd.1:29 amuleweb.1:46
+#, no-wrap
+msgid "B<[ -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<]>"
+msgstr "B<[ -h> I<E<lt>хостE<gt>>, B<--host>=I<E<lt>хостE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:33 amuleweb.1:50
+msgid ""
+"Host where aMule is running (default: I<localhost>).  I<E<lt>hostE<gt>> "
+"might be an IP address or a DNS name"
+msgstr ""
+"Адрес компьютера на котором работает aMule (по умолчанию: I<localhost>). "
+"I<E<lt>ХостE<gt>> может быть IP-адресом или DNS-именем."
+
+#. type: TP
+#: amulecmd.1:33 amuleweb.1:50
+#, no-wrap
+msgid "B<[ -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>портE<gt>>, B<--port>=I<E<lt>портE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:36 amuleweb.1:53
+msgid ""
+"aMule's port for External Connections, as set in Preferences-E<gt>Remote "
+"Controls (default: I<4712>)"
+msgstr ""
+"Порт, который использует aMule для внешних соединений. Указывается в "
+"Настройках-E<gt>Удаленное управление (по умолчанию: I<4712>)"
+
+#. type: TP
+#: amulecmd.1:36 amuleweb.1:53
+#, no-wrap
+msgid "B<[ -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<]>"
+msgstr "B<[ -P> I<E<lt>парольE<gt>>, B<--password>=I<E<lt>парольE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:39 amuleweb.1:56
+msgid "External Connections password."
+msgstr "Пароль для внешних соединений."
+
+#. type: TP
+#: amulecmd.1:39 amuleweb.1:56
+#, no-wrap
+msgid "B<[ -f> I<E<lt>pathE<gt>>, B<--config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -f> I<E<lt>путьE<gt>>, B<--config-file>=I<E<lt>путьE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:43 amuleweb.1:60
+msgid ""
+"Use the given configuration file.  Default configuration file is I<~/.aMule/"
+"remote.conf>"
+msgstr ""
+"Использовать указанный файл конфигурации. По умолчанию используется I<~/."
+"aMule/remote.conf>"
+
+#. type: Plain text
+#: amulecmd.1:46 amuleweb.1:63
+msgid "Do not print any output to stdout."
+msgstr "Не печетать ничего в стандартный вывод."
+
+#. type: Plain text
+#: amulecmd.1:50 amuleweb.1:67
+msgid "Be verbose - show also debug messages."
+msgstr "Выводить также отладочную информацию."
+
+#. type: TP
+#: amulecmd.1:50 amuleweb.1:67
+#, no-wrap
+msgid "B<[ -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<]>"
+msgstr "B<[ -l> I<E<lt>языкE<gt>>, B<--locale>=I<E<lt>языкE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:54 amuleweb.1:71
+msgid ""
+"Sets program locale (language).  See the B<NOTES> section for the "
+"description of the I<E<lt>langE<gt>> parameter."
+msgstr ""
+"Задать локаль (язык). См. секцию B<ЗАМЕЧАНИЯ> для дополнительной информации "
+"по параметру I<E<lt>языкE<gt>>."
+
+#. type: Plain text
+#: amulecmd.1:57 amuleweb.1:74
+msgid "Write command line options to config file and exit"
+msgstr "Записать параметр командной строки в файл конфигурации и выйти"
+
+#. type: TP
+#: amulecmd.1:57
+#, no-wrap
+msgid "B<[ -c> I<E<lt>commandE<gt>>, B<--command>=I<E<lt>commandE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>командаE<gt>>, B<--command>=I<E<lt>командаE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:60
+msgid ""
+"Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and "
+"exit."
+msgstr ""
+"Выполнить I<E<lt>командуE<gt>> как если бы она была введена в консоль "
+"amulecmd и выйти."
+
+#. type: TP
+#: amulecmd.1:60 amuleweb.1:117
+#, no-wrap
+msgid "B<[ --create-config-from>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --create-config-from>=I<E<lt>путьE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:63 amuleweb.1:120
+msgid ""
+"Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid "
+"aMule config file, and then exit."
+msgstr ""
+"Создать файл конфигурации на основе файла указанного в I<E<lt>путиE<gt>> и "
+"выйти. Указанный файл должен быть валидным файлом конфигурации aMule."
+
+#. type: SH
+#: amulecmd.1:69
+#, no-wrap
+msgid "COMMANDS"
+msgstr "КОМАНДЫ"
+
+#. type: Plain text
+#: amulecmd.1:71
+msgid "All commands are case insensitive."
+msgstr "Все команды чувствительны к регистру."
+
+#. type: SS
+#: amulecmd.1:71
+#, no-wrap
+msgid "Add I<E<lt>eD2k-linkE<gt>> | I<E<lt>magnet-linkE<gt>>"
+msgstr "Add I<E<lt>eD2k-ссылкаE<gt>> | I<E<lt>magnet-ссылкаE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:73
+msgid "Adds an eD2k-link or a magnet-link to the core."
+msgstr "Добавляет eD2k-ссылку или magnet-ссылку в ядро."
+
+#. type: Plain text
+#: amulecmd.1:82
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list."
+msgstr ""
+"ссылка на список серверов, в этом случае все серверы из списка будут "
+"добавлены в список серверов."
+
+#. type: Plain text
+#: amulecmd.1:85
+msgid "The magnet link must contain the eD2k hash and file length."
+msgstr "Magnet-ссылка должна содержать eD2k-хэш и размер файла."
+
+#. type: SS
+#: amulecmd.1:85
+#, no-wrap
+msgid "Cancel I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Cancel I<E<lt>хэшE<gt>> | I<E<lt>номерE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:87
+msgid ""
+"Cancels the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Отменяет закачку указанную по I<E<lt>хэшуE<gt>> или I<E<lt>номеруE<gt>>. "
+"Чтобы определить значения, воспользуйтесь командой B<show>."
+
+#. type: SS
+#: amulecmd.1:87
+#, no-wrap
+msgid "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|nameE<gt>> ]"
+msgstr "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|имяE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:89
+msgid "Connect to the network."
+msgstr "Подключиться к сети."
+
+#. type: Plain text
+#: amulecmd.1:91
+msgid "This will connect to all networks that are enabled in Preferences."
+msgstr "Это подсоединит ко всем сетям, включенным в настройках."
+
+#. type: Plain text
+#: amulecmd.1:95
+msgid ""
+"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."
+msgstr ""
+"С помощью дополнительного параметра можно указать сеть к которой будет "
+"произведено подключение. При указании адреса сервера в виде IP:Порт (где IP "
+"может быть либо цифровым представлением IPv4 либо DNS-именем) aMule "
+"подключится только к этому серверу."
+
+#. type: Plain text
+#: amulecmd.1:98
+msgid ""
+"Disconnect from all networks you are connected to, or just disconnect from "
+"the specified network."
+msgstr "Отсоединяет от всех сетей, или только от указанной сети."
+
+#. type: SS
+#: amulecmd.1:98
+#, no-wrap
+msgid "Download I<E<lt>numberE<gt>>"
+msgstr "Download I<E<lt>номерE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:100
+msgid "Start downloading a file."
+msgstr "Начать закачку файла."
+
+#. type: Plain text
+#: amulecmd.1:104
+msgid ""
+"The I<E<lt>numberE<gt>> of a file from the last search has to be given.  "
+"Example: `download 12' will start to download the file with the number 12 of "
+"the previous search."
+msgstr ""
+"Должен быть указан I<E<lt>номерE<gt>> файла в последнем поиске.  Пример: "
+"`download 12' поставит на закачку файл, который был под номером 12 в "
+"последнем поиске."
+
+#. type: Plain text
+#: amulecmd.1:106
+msgid "Disconnect from amule/amuled and quit amulecmd."
+msgstr "Отключится от amule/amuled и выйти из amulecmd."
+
+#. type: SS
+#: amulecmd.1:106
+#, no-wrap
+msgid "Get I<E<lt>whatE<gt>>"
+msgstr "Get I<E<lt>параметрE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:108
+msgid "Get and display a preference value."
+msgstr "Вывести параметр настроек."
+
+#. type: Plain text
+#: amulecmd.1:110 amulecmd.1:144 amulecmd.1:173 amulecmd.1:183
+msgid "Available values for I<E<lt>whatE<gt>>:"
+msgstr "Возможные значения поля I<E<lt>параметрE<gt>>:"
+
+#. type: Plain text
+#: amulecmd.1:113
+msgid "Get bandwidth limits."
+msgstr "Вывести ограничения канала."
+
+#. type: Plain text
+#: amulecmd.1:115
+msgid "Get IPFilter preferences."
+msgstr "Вывести настройки IPFilter."
+
+#. type: SS
+#: amulecmd.1:116
+#, no-wrap
+msgid "Help [ I<E<lt>commandE<gt>> ]"
+msgstr "Help [ I<E<lt>командаE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:120
+msgid ""
+"Prints a short usage description.  If called without parameter, it shows a "
+"list of available commands.  If called with I<E<lt>commandE<gt>>, it shows a "
+"short description of the given command."
+msgstr ""
+"Вывести короткую справку. Если вызвана без параметров, выводит список "
+"возможных команд. Если вызвана с параметром I<E<lt>командаE<gt>>, показывает "
+"справку по данной команде."
+
+#. type: SS
+#: amulecmd.1:120
+#, no-wrap
+msgid "Pause I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Pause I<E<lt>хэшE<gt>> | I<E<lt>номерE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:122
+msgid ""
+"Pauses the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Ставит на паузу закачку указанную по I<E<lt>хэшуE<gt>> или "
+"I<E<lt>номеруE<gt>>. Чтобы определить значения, воспользуйтесь командой "
+"B<show>."
+
+#. type: SS
+#: amulecmd.1:122
+#, no-wrap
+msgid "Priority I<E<lt>priorityE<gt>> I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Priority I<E<lt>приоритетE<gt>> I<E<lt>хэшE<gt>> | I<E<lt>номерE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:124
+msgid ""
+"Set priority of a download specified by I<E<lt>hashE<gt>> or "
+"I<E<lt>numberE<gt>>."
+msgstr ""
+"Указывает приоритет закачки указанной по I<E<lt>хэшуE<gt>> или "
+"I<E<lt>номеруE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:126
+msgid "Available values for I<E<lt>priorityE<gt>>:"
+msgstr "Возможные значения I<E<lt>приоритетаE<gt>>:"
+
+#. type: Plain text
+#: amulecmd.1:129
+msgid "Automatic priority."
+msgstr "Автоматический приоритет."
+
+#. type: Plain text
+#: amulecmd.1:131
+msgid "High priority."
+msgstr "Высокий приоритет."
+
+#. type: Plain text
+#: amulecmd.1:133
+msgid "Low priority."
+msgstr "Низкий приоритет."
+
+#. type: Plain text
+#: amulecmd.1:135
+msgid "Normal priority."
+msgstr "Нормальный приоритет."
+
+#. type: Plain text
+#: amulecmd.1:138
+msgid "Shows the progress of an on-going search."
+msgstr "Показывает состояние работающего поиска."
+
+#. type: Plain text
+#: amulecmd.1:140
+msgid "A synonim of the B<exit> command."
+msgstr "То же что и B<exit>."
+
+#. type: SS
+#: amulecmd.1:140
+#, no-wrap
+msgid "Reload I<E<lt>whatE<gt>>"
+msgstr "Reload I<E<lt>объектE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:142
+msgid "Reloads a given object."
+msgstr "Обновляет указанный объект."
+
+#. type: Plain text
+#: amulecmd.1:147
+msgid "Reload shared files list."
+msgstr "Обновляет список публикуемых файлов."
+
+#. type: Plain text
+#: amulecmd.1:149
+msgid "Reload IP filter tables."
+msgstr "Обновляет таблицы IP фильтра."
+
+#. type: Plain text
+#: amulecmd.1:152
+msgid "Reset the log."
+msgstr "Обнуляет лог."
+
+#. type: Plain text
+#: amulecmd.1:154
+msgid "Shows you the results of the last search."
+msgstr "Выводит результат последнего поиска."
+
+#. type: SS
+#: amulecmd.1:154
+#, no-wrap
+msgid "Resume I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Resume I<E<lt>хэшE<gt>> | I<E<lt>номерE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:156
+msgid ""
+"Resumes the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"Возобновляет закачку указанную по I<E<lt>хэшуE<gt>> или I<E<lt>номеруE<gt>>. "
+"Чтобы определить значения, воспользуйтесь командой B<show>."
+
+#. type: SS
+#: amulecmd.1:156
+#, no-wrap
+msgid "Search I<E<lt>typeE<gt>> I<E<lt>keywordE<gt>>"
+msgstr "Search I<E<lt>типE<gt>> I<E<lt>словоE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:159
+msgid ""
+"Makes a search for the given I<E<lt>keywordE<gt>>. A search type and a "
+"keyword to search is mandatory to do this.  Example: `search kad amule' "
+"performs a kad search for `amule'."
+msgstr ""
+"Производит поиск по указанному I<E<lt>словуE<gt>>. Указание типа и слова "
+"обязательны. Пример: `search kad amule' производит поиск по kad по слову "
+"`amule'."
+
+#. type: Plain text
+#: amulecmd.1:161
+msgid "Available search types:"
+msgstr "Возможные типы поиска:"
+
+#. type: Plain text
+#: amulecmd.1:164
+msgid "Performs a global search."
+msgstr "Глобальный поиск."
+
+#. type: Plain text
+#: amulecmd.1:166
+msgid "Performs a search on the Kademlia network."
+msgstr "Поиск по сети kademlia."
+
+#. type: Plain text
+#: amulecmd.1:168
+msgid "Performs a local search."
+msgstr "Локальный поиск."
+
+#. type: SS
+#: amulecmd.1:169
+#, no-wrap
+msgid "Set I<E<lt>whatE<gt>>"
+msgstr "Set I<E<lt>параметрE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:171
+msgid "Sets a given preferences value."
+msgstr "Задает указанный параметр."
+
+#. type: Plain text
+#: amulecmd.1:176
+msgid "Set bandwidth limits."
+msgstr "Задает ограничения канала."
+
+#. type: Plain text
+#: amulecmd.1:178
+msgid "Set IPFilter preferences."
+msgstr "Задает параметры IPFilter."
+
+#. type: SS
+#: amulecmd.1:179
+#, no-wrap
+msgid "Show I<E<lt>whatE<gt>>"
+msgstr "Show I<E<lt>элементE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:181
+msgid "Shows upload/download queue, servers list or shared files list."
+msgstr ""
+"Выводит очередь закачки/отдачи, список серверов или опубликованные файлы."
+
+#. type: Plain text
+#: amulecmd.1:186
+msgid "Show download queue."
+msgstr "Выводит очередь закачки."
+
+#. type: Plain text
+#: amulecmd.1:188
+msgid "Show log."
+msgstr "Выводит лог."
+
+#. type: Plain text
+#: amulecmd.1:190
+msgid "Show servers list."
+msgstr "Выводит список серверов."
+
+#. type: Plain text
+#: amulecmd.1:192
+msgid "Show upload queue."
+msgstr "Выводит список отдачи."
+
+#. type: Plain text
+#: amulecmd.1:196
+msgid ""
+"Shutdown the remote running core (amule/amuled).  This will also shut down "
+"the text client, since it is unusable without a running core."
+msgstr ""
+"Завершает работу ядра (amule/amuled). Так же завершает работу amulecmd, т.к. "
+"он бесполезен без работающего ядра."
+
+#. type: SS
+#: amulecmd.1:196
+#, no-wrap
+msgid "Statistics [ I<E<lt>numberE<gt>> ]"
+msgstr "Statistics [ I<E<lt>числоE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:198
+msgid "Show statistics tree."
+msgstr "Выводит дерево статистики."
+
+#. type: Plain text
+#: amulecmd.1:202
+msgid ""
+"The optional I<E<lt>numberE<gt>> in the range of 0-255 can be passed as "
+"argument to this command, which tells how many entries of the client version "
+"subtree should be shown. Passing 0, or omitting it means `unlimited'."
+msgstr ""
+"Параметр I<E<lt>числоE<gt>> может быть в промежутке 0-255, и будет "
+"показывать сколько элементов показывать в под-дереве `версия клиента'. "
+"Указание 0 или пропуск означает `неограниченно'."
+
+#. type: Plain text
+#: amulecmd.1:205
+msgid ""
+"Example: `statistics 5' will show only the top 5 versions for each client "
+"type."
+msgstr ""
+"Пример: `statistics 5' покажет только 5 наиболее популярных версий для "
+"каждого типа клиента."
+
+#. type: Plain text
+#: amulecmd.1:207
+msgid "Show connection status, current up/download speeds, etc."
+msgstr "Вывести статус соединения, скорости, итд."
+
+#. type: SS
+#: amulecmd.1:212 amuleweb.1:137
+#, no-wrap
+msgid "Languages"
+msgstr "Языки"
+
+#. type: Plain text
+#: amulecmd.1:218 amuleweb.1:143
+msgid ""
+"The I<E<lt>langE<gt>> parameter for the B<-l> option has the following form: "
+"I<lang>[B<_>I<LANG>][B<.>I<encoding>][B<@>I<modifier>] where I<lang> is the "
+"primary language, I<LANG> is a sublanguage/territory, I<encoding> is the "
+"character set to use and I<modifier> allows the user to select a specific "
+"instance of localization data within a single category."
+msgstr ""
+"Параметр I<E<lt>языкE<gt>> для опции B<-l> имеет следующую форму: I<язык>"
+"[B<_>I<ЯЗЫК>][B<.>I<кодировка>][B<@>I<модификатор>], где I<язык> является "
+"основным языком, I<ЯЗЫК> - диалект/территория, I<кодировка> - используемая "
+"кодировка символов и I<модификатор> позволяет пользователю использовать "
+"определенный вариант локализации в данной категории."
+
+#. type: Plain text
+#: amulecmd.1:220 amuleweb.1:145
+msgid "For example, the following strings are valid:"
+msgstr "К примеру, все следующие строчки являются приемлемыми:"
+
+#. type: Plain text
+#: amulecmd.1:234 amuleweb.1:159
+msgid ""
+"Though all the above strings are accepted as valid language definitions, "
+"I<encoding> and I<modifier> are yet unused."
+msgstr ""
+"Хотя все приведенный строки будут приняты, поля I<кодировка> и "
+"I<модификатор> пока не используются."
+
+#. type: Plain text
+#: amulecmd.1:237 amuleweb.1:162
+msgid ""
+"In addition to the format above, you can also specify full language names in "
+"English - so B<-l german> is also valid and is equal to B<-l de_DE>."
+msgstr ""
+"К дополнению к приведенному формату, можно просто указать английское имя "
+"языка. Так, B<-l russian> тоже приемлемо и равносильно B<-l ru_RU>."
+
+#. type: Plain text
+#: amulecmd.1:240 amuleweb.1:165
+msgid ""
+"When no locale is defined, either on command-line or in config file, system "
+"default language will be used."
+msgstr ""
+"Когда язык не указан ни в качестве опции ни в файле конфигурации, "
+"используется системный."
+
+#. type: Plain text
+#: amulecmd.1:242 amuleweb.1:173
+msgid "~/.aMule/remote.conf"
+msgstr "~/.aMule/remote.conf"
+
+#. type: SH
+#: amulecmd.1:242 amuleweb.1:177
+#, no-wrap
+msgid "EXAMPLE"
+msgstr "ПРИМЕРЫ"
+
+#. type: Plain text
+#: amulecmd.1:244
+msgid "Typically amulecmd will be first run as:"
+msgstr "Как правило, в первый раз amulecmd запускается так:"
+
+#. type: Plain text
+#: amulecmd.1:246
+msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
+msgstr ""
+"B<amulecmd> B<-h> I<имя_хоста> B<-p> I<EC_порт> B<-P> I<EC_пароль> B<-w>"
+
+#. type: Plain text
+#: amulecmd.1:248 amuleweb.1:183
+msgid "or"
+msgstr "или"
+
+#. type: Plain text
+#: amulecmd.1:250
+msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+"B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+
+#. type: Plain text
+#: amulecmd.1:252 amuleweb.1:187
+msgid ""
+"These will save settings to I<$HOME/.aMule/remote.conf>, and later you only "
+"need to type:"
+msgstr ""
+"Это сохранит параметры в I<$HOME/.aMule/remote.conf>, и в дальнейшем надо "
+"будет только набрать:"
+
+#. type: Plain text
+#: amulecmd.1:256
+msgid "Of course, you don't have to follow this example."
+msgstr "Конечно, вы не обязаны следовать этим рекомендациям."
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "AMULED"
+msgstr "AMULED"
+
+#. 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"
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon"
+msgstr "Демон aMule"
+
+#. type: Plain text
+#: amuled.1:6
+msgid "amuled - the all-platform eMule p2p client - daemonized version"
+msgstr ""
+"amuled - мультиплатформенный p2p клиент eMule - демонизированная версия"
+
+#. type: Plain text
+#: amuled.1:9 ../../src/utils/cas/docs/cas.1:11
+msgid "[B<-c> I<E<lt>pathE<gt>>]"
+msgstr "[B<-c> I<E<lt>путьE<gt>>]"
+
+#. type: Plain text
+#: amuled.1:11
+msgid "[B<-p> I<E<lt>pathE<gt>>]"
+msgstr "[B<-p> I<E<lt>путьE<gt>>]"
+
+#. type: Plain text
+#: amuled.1:32
+msgid "Forks to background."
+msgstr "Уйти в фоновый режим"
+
+#. type: TP
+#: amuled.1:32
+#, no-wrap
+msgid "B<[ -p> I<E<lt>pathE<gt>>, B<--pid-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>путьE<gt>>, B<--pid-file>=I<E<lt>путьE<gt>> B<]>"
+
+#. type: Plain text
+#: amuled.1:36
+msgid ""
+"After fork, create a pid-file in the I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> "
+"has to contain the filename."
+msgstr ""
+"После запуска создать pid-файл по указанному I<E<lt>путиE<gt>>. "
+"I<E<lt>ПутьE<gt>> должен указывать на файл."
+
+#. type: Plain text
+#: amuled.1:39
+msgid "Configure EC (External Connections)."
+msgstr "Сконфигурировать EC (внешние соединения)."
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "AMULEGUI"
+msgstr "AMULEGUI"
+
+#. type: TH
+#: amulegui.1:1
+#, fuzzy, no-wrap
+#| msgid "aMuleGUI v2.3.0"
+msgid "aMuleGUI v2.3.1"
+msgstr "aMuleGUI v2.3.0"
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
+
+#. type: Plain text
+#: amulegui.1:6
+msgid "amulegui - aMule control program with GUI"
+msgstr "amulegui - программа управления aMule с GUI"
+
+#. type: Plain text
+#: amulegui.1:14
+msgid "[B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-t> I<E<lt>номерE<gt>>]"
+
+#. type: Plain text
+#: amulegui.1:24
+msgid ""
+"B<amulegui> is a client program, and can be connected to amule or amuled via "
+"EC. You can manage your amule program with it. It provides almost the same "
+"functionalities as amule, even if the core works on another computer."
+msgstr ""
+"Программа B<amulegui> позволяет управлять ядром (amule/amuled) по протоколу "
+"EC. Программа предоставляет функциональность почти идентичную amule, "
+"несмотря на то что ядро может работать на другом компьютере."
+
+#. type: Plain text
+#: amulegui.1:39
+msgid "Skip connection dialog."
+msgstr "Пропустить диалог соединения."
+
+#. type: Plain text
+#: amulegui.1:57
+msgid ""
+"This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm "
+"DOT orgE<gt>"
+msgstr ""
+"Автор страницы помощи (для Debian): Julien Delange E<lt>julien AT gunnm DOT "
+"orgE<gt>"
+
+#. type: Plain text
+#: amulegui.1:58
+msgid ""
+"This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Переработка страницы помощи: Vollstrecker E<lt>amule@vollstreckernet."
+"deE<gt>, перевод: Radist Morse E<lt>radist.morse@gmail.comE<gt>"
+
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "AMULEWEB"
+msgstr "AMULEWEB"
+
+#. 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"
+
+#. type: Plain text
+#: amuleweb.1:6
+msgid "amuleweb - aMule web server"
+msgstr "amuleweb - вебсервер aMule"
+
+#. type: Plain text
+#: amuleweb.1:15
+msgid "[B<-l> I<E<lt>langE<gt>>]"
+msgstr "[B<-l> I<E<lt>языкE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:18
+msgid "[B<-t> I<E<lt>nameE<gt>>] [B<-s> I<E<lt>portE<gt>>]"
+msgstr "[B<-t> I<E<lt>имяE<gt>>] [B<-s> I<E<lt>портE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:20
+msgid "[B<-U> I<E<lt>portE<gt>>]"
+msgstr "[B<-U> I<E<lt>портE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:24
+msgid "[B<-A> I<E<lt>passwordE<gt>>] [B<-G> I<E<lt>passwordE<gt>>]"
+msgstr "[B<-A> I<E<lt>парольE<gt>>] [B<-G> I<E<lt>парольE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:40
+msgid "[B<--amule-config-file>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--amule-config-file>=I<E<lt>путьE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:46
+msgid ""
+"B<amuleweb> manages your access to amule through a web browser.  You can "
+"start amuleweb together with B<amule>(1), or separately, any time later.  "
+"Options can be specified via command-line or via config-file.  Command-line "
+"options take precedence over config-file options."
+msgstr ""
+"B<amuleweb> организует доступ к amule через веб браузер. Вы можете запустить "
+"amuleweb вместе с B<amule>(1), или отдельно позже. Настройки могут быть "
+"определены с помощью командной строки или файла конфигурации. Опции "
+"командной строки являются приоритетными по отношению к файлу конфигурации."
+
+#. type: TP
+#: amuleweb.1:74
+#, no-wrap
+msgid "B<[ -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<]>"
+msgstr "B<[ -t> I<E<lt>имяE<gt>>, B<--template>=I<E<lt>имяE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:77
+msgid ""
+"Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section "
+"for details."
+msgstr ""
+"Устанавливает шаблон с указанным I<E<lt>именемE<gt>>. Подробности в секции "
+"B<ПОДДЕРЖКА СКИНОВ>."
+
+#. type: TP
+#: amuleweb.1:77
+#, no-wrap
+msgid "B<[ -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -s> I<E<lt>портE<gt>>, B<--server-port>=I<E<lt>портE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:80
+msgid ""
+"Webserver's HTTP port. This is the port you must point your browser to "
+"(default: I<4711>)."
+msgstr ""
+"HTTP порт вебсервера. Этот порт должен быть указан в строке адреса браузера "
+"(по умолчанию: I<4711>)."
+
+#. type: Plain text
+#: amuleweb.1:84
+msgid "Enable UPnP."
+msgstr "Включить UPnP."
+
+#. type: TP
+#: amuleweb.1:84
+#, no-wrap
+msgid "B<[ -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -U> I<E<lt>портE<gt>>, B<--upnp-port> I<E<lt>портE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:87
+msgid "UPnP port."
+msgstr "Порт UPnP."
+
+#. type: Plain text
+#: amuleweb.1:90
+msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
+msgstr "Включает использование gzip-сжатия HTTP данных для уменьшения трафика."
+
+#. type: Plain text
+#: amuleweb.1:93
+msgid "Disables using gzip compression (this is the default)."
+msgstr "Отключает использование gzip-сжатия (вариант по умолчанию)."
+
+#. type: TP
+#: amuleweb.1:93
+#, no-wrap
+msgid "B<[ -A> I<E<lt>passwdE<gt>>, B<--admin-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -A> I<E<lt>парольE<gt>>, B<--admin-pass>=I<E<lt>парольE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:96
+msgid "Full access password for webserver."
+msgstr "Пароль для полного доступа к вебсерверу."
+
+#. type: TP
+#: amuleweb.1:96
+#, no-wrap
+msgid "B<[ -G> I<E<lt>passwdE<gt>>, B<--guest-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -G> I<E<lt>парольE<gt>>, B<--guest-pass>=I<E<lt>парольE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:99
+msgid "Guest password for webserver."
+msgstr "Пароль для гостевого доступа к вебсерверу."
+
+#. type: Plain text
+#: amuleweb.1:102
+msgid "Allows guest access."
+msgstr "Разрешить гостевой доступ."
+
+#. type: Plain text
+#: amuleweb.1:105
+msgid "Denies guest access (default)."
+msgstr "Запретить гостевой доступ (вариант по умолчанию)."
+
+#. type: Plain text
+#: amuleweb.1:111
+msgid ""
+"Load/save webserver settings from/to remote aMule.  This causes amuleweb to "
+"ignore command-line and config-file settings, and load them from aMule.  "
+"When saving preferences none will be written to the config file, but to "
+"aMule.  (Of course, this works only for those settings that can be set in "
+"aMule's Preferences-E<gt>Remote Controls.)"
+msgstr ""
+"Загрузить/сохранить настройки вебсервера из/в удаленный aMule. Это приводит "
+"к игнорированию параметров командной строки и конфигурационного файла, и "
+"загрузки их из aMule. При сохранении настроек они будут писаться не в файл "
+"конфигурации, а в aMule. (Конечно, работает только для настроек которые "
+"могут быть заданы через меню Настройки-E<gt>Удаленный контроль)"
+
+#. type: Plain text
+#: amuleweb.1:114
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Отключить интерпретатор PHP (устарело)"
+
+#. type: Plain text
+#: amuleweb.1:117
+msgid "Recompiles PHP pages on each request."
+msgstr "Перекомпилирует страницы PHP при каждом обращении."
+
+#. type: TP
+#: amuleweb.1:126
+#, no-wrap
+msgid "B<[ --amule-config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --amule-config-file>=I<E<lt>путьE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:132
+msgid ""
+"aMule config file path.  B<DO NOT USE DIRECTLY!> aMule uses this option when "
+"starting amuleweb at aMule startup.  This option causes all other command-"
+"line and config-file settings to be ignored, preferences to be read from the "
+"given config file, and also implies the B<-q -L> options."
+msgstr ""
+"Путь к файлу конфигурации aMule. B<НЕ ИСПОЛЬЗУЙТЕ НАПРЯМУЮ!> aMule "
+"использует данную опцию для запуска amuleweb вместе с amule. Эта опция "
+"приводит к игнорированию параметров командной строки и конфигурационного "
+"файла, настройки читаются из заданного файла. Также подразумеваются опции B<-"
+"q -L>."
+
+#. type: SH
+#: amuleweb.1:165
+#, no-wrap
+msgid "SKIN SUPPORT"
+msgstr "ПОДДЕРЖКА СКИНОВ"
+
+#. type: Plain text
+#: amuleweb.1:169
+msgid ""
+"B<amuleweb> is capable of displaying information in different skins.  These "
+"skins are called templates, and you can make amuleweb load a specific "
+"template via the B<-t> command line option.  Templates are searched in two "
+"places: first in I<~/.aMule/webserver/> and then in I</usr/share/amule/"
+"webserver/> if you installed with --prefix=/usr."
+msgstr ""
+"B<amuleweb> имеет возможность отображать информацию с разными скинами. Эти "
+"скины называются шаблонами, и вы можете переключить amuleweb на определенный "
+"шаблон использую опцию B<-t> командной строки. Шаблоны ищутся в двух местах: "
+"первое I<~/.aMule/webserver/>, затем I</usr/share/amule/webserver/>, если "
+"инсталяция была проведена с --prefix=/usr."
+
+#. type: Plain text
+#: amuleweb.1:171
+msgid ""
+"Each template must be in a subdirectory of the template name, and this "
+"directory must contain all files the template needs."
+msgstr ""
+"Каждый шаблон должен являться каталогом с именем шаблона, и все необходимые "
+"файлы должны находится внутри этого каталога."
+
+#. type: Plain text
+#: amuleweb.1:175
+msgid "~/.aMule/webserver/"
+msgstr "~/.aMule/webserver/"
+
+#. type: Plain text
+#: amuleweb.1:177
+msgid "I<$(pkgdatadir)>/webserver/"
+msgstr "I<$(pkgdatadir)>/webserver/"
+
+#. type: Plain text
+#: amuleweb.1:179
+msgid "Typically amuleweb will be first run as:"
+msgstr "Как правило, в первый раз amuleweb запускается так:"
+
+#. type: Plain text
+#: amuleweb.1:181
+msgid ""
+"B<amuleweb> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-s> "
+"I<HTTPport> B<-A> I<AdminPassword> B<-w>"
+msgstr ""
+"B<amuleweb> B<-h> I<имя_хоста> B<-p> I<EC_порт> B<-P> I<EC_пароль> B<-s> "
+"I<HTTP_порт> B<-A> I<пароль_полного_доступа> B<-w>"
+
+#. type: Plain text
+#: amuleweb.1:185
+msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+"B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+
+#. type: Plain text
+#: amuleweb.1:191
+msgid ""
+"Of course, you may specify any more or less options on the first example "
+"line, and you may also totally omit it."
+msgstr ""
+"Конечно, вы можете указать иное количество аргументов в первой строке "
+"примера, или не использовать ее вообще."
+
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "ED2K"
+msgstr "ED2K"
+
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "aMule eD2k link parser v1.5.1"
+msgstr "aMule парсер ссылок eD2k v1.5.1"
+
+#. type: Plain text
+#: ed2k.1:6
+msgid "ed2k - aMule eD2k link parser"
+msgstr "ed2k - aMule парсер ссылок eD2k"
+
+#. type: Plain text
+#: ed2k.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-c> I<E<lt>путьE<gt>>] [B<-t> I<E<lt>числоE<gt>>]"
+
+#. type: Plain text
+#: ed2k.1:13
+msgid "I<E<lt>eD2k-linkE<gt>>"
+msgstr "I<E<lt>eD2k-ссылкаE<gt>>"
+
+#. type: Plain text
+#: ed2k.1:21
+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 ""
+"Пысылает указанную I<E<lt>eD2k-ссылкуE<gt>> в aMule, т.е. пишет ее в файл ~/."
+"aMule/ED2KLinks, который проверяется каждую секунду."
+
+#. type: Plain text
+#: ed2k.1:30
+msgid ""
+"Loads all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr "Загружает все ссылки из emulecollection как I<E<lt>ed2k-ссылкиE<gt>>"
+
+#. type: Plain text
+#: ed2k.1:33
+msgid ""
+"Lists all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr "Перечисляет все ссылки из emulecollection как I<E<lt>ed2k-ссылкиE<gt>>"
+
+#. type: Plain text
+#: ed2k.1:53
+msgid "a magnet link;"
+msgstr "magnet-ссылка;"
+
+#. type: Plain text
+#: ed2k.1:55
+msgid "an emulecollection file."
+msgstr "файл emulecollection."
+
+#. type: Plain text
+#: ed2k.1:60
+msgid ""
+"B<The order in which you give the parameters is important.> You can give "
+"more than one link, and every link can have it's own params.  For example "
+"B<ed2k E<lt>link1E<gt> -t2 E<lt>link2E<gt>> will download I<E<lt>link1E<gt>> "
+"in standard category and I<E<lt>link2E<gt>> in category 2."
+msgstr ""
+"B<Порядок параметров важен.> Вы можете указать более одной ссылки, и каждая "
+"ссылка может иметь свои собственные параметры. Например B<ed2k "
+"E<lt>ссылка1E<gt> -t2 E<lt>ссылка2E<gt>> загрузит I<E<lt>ссылку1E<gt>> в "
+"стандартную категорию и I<E<lt>ссылку2E<gt>> в категорию 2."
+
+#. type: Plain text
+#: ed2k.1:62
+msgid "~/.aMule/ED2KLinks"
+msgstr "~/.aMule/ED2KLinks"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "ALC"
+msgstr "ALC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "aLinkCreator"
+msgstr "aLinkCreator"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+msgid "aLinkCreator - the aMule eD2k link creator"
+msgstr "aLinkCreator - создатель eD2k-ссылок aMule"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:9
+msgid ""
+"B<alc> is a graphical utility to create an eD2k link to any file on your "
+"computer."
+msgstr ""
+"B<alc> - графическая утилита, которая создает eD2k-ссылку для любого файла "
+"на вашем компьютере."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/wxCas/docs/wxcas.1:16
+msgid "This app doesn't take any arguments."
+msgstr "Утилита не принимает параметров."
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "ALCC"
+msgstr "ALCC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "aMule eD2k links calculator"
+msgstr "aMule калькулятор eD2k-ссылок"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6
+msgid "alcc - text based eD2k links calculator for aMule"
+msgstr "alcc - текстовый калькулятор eD2k-ссылок для aMule"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:11
+msgid "I<E<lt>inputfiles_listE<gt>>"
+msgstr "I<E<lt>список_файловE<gt>>"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:16
+msgid ""
+"Compute the eD2k links of all the input files given in the "
+"I<E<lt>inputfiles_listE<gt>> (There can be one or more files)."
+msgstr ""
+"Вычисляет eD2k-ссылки для всех файлов указанных в I<E<lt>списке_файловE<gt>> "
+"(Может быть один или более файлов)."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:19
+msgid "Compute and add part hashes to the computed eD2k links."
+msgstr "Вычисляет и добавляет частичные хэши к вычисленным eD2k-ссылкам."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+msgid "Be verbose - show also calculation steps."
+msgstr "Показать подробности - показывает также шаги вычислений."
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "CAS"
+msgstr "CAS"
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "cas v0.8"
+msgstr "cas v0.8"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:6
+msgid "cas - c aMule statistics"
+msgstr "cas - c-статистика aMule"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:18
+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<cas> - программа для отображения содержимого файла вашей онлайн-подписи "
+"aMule на консоль (в читаемой форме). Чтобы это работало, вы должны включить "
+"опцию \"Онлайн подпись\" в настройках aMule."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:22
+msgid ""
+"Writes the online signature picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+"Записывает картинку с онлайн-подписью. Вы можете дополнительно указать "
+"I<=E<lt>ПУТЬE<gt>>, куда она будет сохранена."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:26
+msgid ""
+"HTML page with stats and picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+"HTML страница со статистикой и картинкой. Вы можете дополнительно указать "
+"I<=E<lt>ПУТЬE<gt>>, куда она будет сохранена."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:34
+msgid "Without any options, it prints online signature data to stdout."
+msgstr "Без опций программа выведет данные о подписи в стандартный вывод."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:36
+msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+msgstr "B<cas> был написан Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:38
+msgid "~/.aMule/casrc"
+msgstr "~/.aMule/casrc"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:40
+msgid "stat.png"
+msgstr "stat.png"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:42
+msgid "tmp.html"
+msgstr "tmp.html"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "WXCAS"
+msgstr "WXCAS"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "wxCas"
+msgstr "wxCas"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:5
+msgid "wxcas - wx c aMule statistics"
+msgstr "wxcas - wx c-статистика aMule"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:11
+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<wxcas> - программа для отображения содержимого файла вашей онлайн-подписи "
+"aMule в приятном wx Window окне на вашем рабочем столе. Чтобы это работало, "
+"вы должны включить опцию \"Онлайн подпись\" в настройках aMule."
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:14
+msgid ""
+"Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt>"
+msgstr ""
+"Основана на программе B<cas>(1) написанной Pedro de Oliveira. B<wxcas> была "
+"написана ThePolish E<lt>thepolish@vipmail.ruE<gt>"
+
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "XAS"
+msgstr "XAS"
+
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "xas v1.9"
+msgstr "xas v1.9"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:5
+msgid "xas - X-Chat aMule Statistics"
+msgstr "xas - X-Chat статистика aMule"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:7
+msgid "B<none>"
+msgstr "B<нет>"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:12
+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 aMule's preferences."
+msgstr ""
+"B<xas> - это плагин для xchat. Для установки смотрите вашу документацию по "
+"xchat. После загрузки наберите /xas и он пошлет вашу статистику в канал на "
+"котором вы находитесь. Статистика берется из файла онлайн-подписи. Чтобы это "
+"работало, вы должны включить опцию \"Онлайн подпись\" в настройках aMule."
+
+#. 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 "
+"script (in /usr/bin if you installed with --prefix=/usr)."
+msgstr ""
+"Чтобы включать его при каждом запуске xchat вы можете просто выполнить "
+"скрипт autstart-xas (в папке /usr/bin если вы установили с --prefix=/usr)."
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:16
+msgid "B<xas> was originally written by niet"
+msgstr "B<xas> изначально был написан niet"
+
+#~ msgid "January 2010"
+#~ msgstr "Январь 2010"
+
+#~ msgid ""
+#~ "When giving ed2k as parameter, it connects only to eD2k-network, to "
+#~ "servers in your serverlist. You may also optionally specify a server "
+#~ "address in IP:Port form, to connect to that server only. The IP must be a "
+#~ "dotted decimal IPv4 address, or a resolvable DNS name."
+#~ msgstr ""
+#~ "Когда в качестве параметра указывается ed2k, подключается только eD2k-"
+#~ "сеть к серверу из вашего списка. Адрес сервер может также быть указан "
+#~ "отдельно в формате адрес:порт. Адрес должен быть указан в десятичном "
+#~ "формате IPv4 или как DNS-имя."
+
+#~ msgid "When giving kad, it connects to Kad only."
+#~ msgstr "Когда указывается kad, подключение идет только к сети Kad."

aMule-2.3.1.tar.bz2/docs/man/po/manpages-tr.add Added

aMule-2.3.1.tar.bz2/docs/man/po/manpages-tr.po Added

@@ -0,0 +1,1716 @@
+# Turkish translations for aMule package
+# This file is distributed under the same license as the aMule package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: aMule\n"
+"POT-Creation-Date: 2011-10-31 22:06+0100\n"
+"PO-Revision-Date: 2011-11-01 23:37+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: tr\n"
+"X-Poedit-Language: Turkish\n"
+"X-Poedit-Country: TURKEY\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "AMULE"
+msgstr "AMULE"
+
+#. 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"
+msgstr "Kasım 2011"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule v2.3.1"
+msgstr "aMule v2.3.1"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule"
+msgstr "aMule"
+
+#. type: SH
+#: amule.1:4 amulecmd.1:5 amuled.1:4 amuleweb.1:4 ed2k.1:4
+#: ../../src/utils/aLinkCreator/docs/alc.1:3
+#: ../../src/utils/aLinkCreator/docs/alcc.1:4 ../../src/utils/cas/docs/cas.1:4
+#: ../../src/utils/wxCas/docs/wxcas.1:3 ../../src/utils/xas/docs/xas.1:3
+#, no-wrap
+msgid "NAME"
+msgstr "İSİM"
+
+#. type: Plain text
+#: amule.1:6
+msgid "amule - the all-platform eMule p2p client"
+msgstr "amule - her platformda çalışan eMule p2p istemcisi"
+
+#. type: SH
+#: amule.1:6 amulecmd.1:7 amuled.1:6 amulegui.1:6 amuleweb.1:6 ed2k.1:6
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6 ../../src/utils/cas/docs/cas.1:6
+#: ../../src/utils/wxCas/docs/wxcas.1:5 ../../src/utils/xas/docs/xas.1:5
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr "KULLANIM"
+
+#. type: Plain text
+#: amule.1:10 amulegui.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-geometry> I<E<lt>geomE<gt>>]"
+msgstr "[B<-c> I<E<lt>yolE<gt>>] [B<-geometry> I<E<lt>geomE<gt>>]"
+
+#. type: Plain text
+#: amule.1:13 amuled.1:15
+msgid "[B<-w> I<E<lt>pathE<gt>>]"
+msgstr "[B<-w> I<E<lt>yolE<gt>>]"
+
+#. type: Plain text
+#: amule.1:17 amuled.1:19
+msgid "[B<-t> I<E<lt>numE<gt>>] [I<eD2k-link>]"
+msgstr "[B<-t> I<E<lt>sayıE<gt>>] [I<eD2k-bağlantısı>]"
+
+#. type: SH
+#: amule.1:24 amulecmd.1:26 amuled.1:25 amulegui.1:20 amuleweb.1:41 ed2k.1:19
+#: ../../src/utils/aLinkCreator/docs/alc.1:7
+#: ../../src/utils/aLinkCreator/docs/alcc.1:14
+#: ../../src/utils/cas/docs/cas.1:14 ../../src/utils/wxCas/docs/wxcas.1:7
+#: ../../src/utils/xas/docs/xas.1:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr "AÇIKLAMA"
+
+#. type: TP
+#: amule.1:25 amuled.1:26 amulegui.1:24 ed2k.1:21
+#: ../../src/utils/cas/docs/cas.1:26
+#, no-wrap
+msgid "B<[ -c> I<E<lt>pathE<gt>>, B<--config-dir>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>yolE<gt>>, B<--config-dir>=I<E<lt>yolE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:28 amuled.1:29 amulegui.1:27 ed2k.1:24
+#: ../../src/utils/cas/docs/cas.1:29
+msgid "Read config from I<E<lt>pathE<gt>> instead of home"
+msgstr "Yapılandırmayı home yerine I<E<lt>yolE<gt>>dan oku"
+
+#. type: TP
+#: amule.1:28 amulegui.1:27
+#, no-wrap
+msgid "B<[ -geometry >I<E<lt>geomE<gt>> B<]>"
+msgstr "B<[ -geometry >I<E<lt>geomE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:31 amulegui.1:30
+msgid ""
+"Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as "
+"standard X11 apps:\t[B<=>][I<E<lt>widthE<gt>>{B<xX>}I<E<lt>heightE<gt>>][{B<"
+"+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>]"
+msgstr ""
+"Uygulamanın geometrisini düzenler. I<E<lt>geomE<gt>> standart X11 "
+"uygulamaları ile aynı biçimi kullanır:\t[B<=>][I<E<lt>genişlikE<gt>>{B<xX>}"
+"I<E<lt>yükseklikE<gt>>][{B<+->}I<E<lt>xoffsetE<gt>>{B<+->}"
+"I<E<lt>yoffsetE<gt>>]"
+
+#. type: Plain text
+#: amule.1:34 amuled.1:42 amulegui.1:33
+msgid "Prints log messages to stdout."
+msgstr "Log mesajlarını standart çıktıya gönderir."
+
+#. type: Plain text
+#: amule.1:37 amuled.1:45 amulegui.1:36
+msgid "Resets config to default values."
+msgstr "Yapılandırmayı varsayılan değerlere sıfırlar."
+
+#. type: TP
+#: amule.1:37 amuled.1:45
+#, no-wrap
+msgid "B<[ -w> I<E<lt>pathE<gt>>, B<--use-amuleweb>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -w> I<E<lt>yolE<gt>>, B<--use-amuleweb>=I<E<lt>yolE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:40 amuled.1:48
+msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
+msgstr ""
+"amuleweb çalıştırılabilir dosyasının konumunu I<E<lt>yolE<gt>> olarak "
+"belirler."
+
+#. type: Plain text
+#: amule.1:43 amuled.1:51
+msgid "Does not handle fatal exception."
+msgstr "Kritik istisnaları ele almaz."
+
+#. type: Plain text
+#: amule.1:46 amuled.1:54
+msgid "Does not disable stdin."
+msgstr "standart girdiyi devre dışı bırakmaz."
+
+#. type: TP
+#: amule.1:46 amuled.1:54 amulegui.1:39 ed2k.1:24
+#, no-wrap
+msgid "B<[ -t>, B<--category>=I<E<lt>numE<gt>> B<]>"
+msgstr "B<[ -t>, B<--category>=I<E<lt>sayıE<gt>> B<]>"
+
+#. type: Plain text
+#: amule.1:49 amuled.1:57 amulegui.1:42 ed2k.1:27
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
+msgstr ""
+"I<E<lt>sayıE<gt>>ya gönderilen eD2k bağlantılarının kategorilerini belirler."
+
+#. type: Plain text
+#: amule.1:52 amulecmd.1:66 amuled.1:60 amulegui.1:48 amuleweb.1:126 ed2k.1:39
+msgid "Displays the current version number."
+msgstr "Geçerli sürüm numarasını görüntüler."
+
+#. type: Plain text
+#: amule.1:55 amulecmd.1:69 amuled.1:63 amulegui.1:45 amuleweb.1:123 ed2k.1:36
+#: ../../src/utils/aLinkCreator/docs/alcc.1:22
+#: ../../src/utils/cas/docs/cas.1:32
+msgid "Prints a short usage description."
+msgstr "Kısa bir kullanım açıklaması görüntüler."
+
+#. type: TP
+#: amule.1:55 amuled.1:63 ed2k.1:39
+#, no-wrap
+msgid "B<[ eD2k-link ]>"
+msgstr "B<[ eD2k-bağlantısı ]>"
+
+#. type: Plain text
+#: amule.1:58 amuled.1:66 ed2k.1:42
+msgid "Adds an eD2k-link to the core."
+msgstr "Çekirdeğe bir eD2k bağlantısı ekler."
+
+#. type: Plain text
+#: amule.1:60 amulecmd.1:75 amuled.1:68 ed2k.1:44
+msgid "The eD2k link to be added can be:"
+msgstr "Eklenecek eD2k bağlantısı şunlardan biri olabilir:"
+
+#. type: Plain text
+#: amule.1:63 amulecmd.1:78 amuled.1:71 ed2k.1:47
+msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
+msgstr ""
+"bir dosya bağlantısı (ed2k://|file|...) ki indirmeler kuyruğuna eklenir;"
+
+#. type: Plain text
+#: amule.1:65 amulecmd.1:80 amuled.1:73 ed2k.1:49
+msgid ""
+"a server link (ed2k://|server|...), it will be added to the server list;"
+msgstr ""
+"bir sunucu bağlantısı (ed2k://|server|...) ki sunucu listesine eklenir;"
+
+#. type: Plain text
+#: amule.1:67 amuled.1:75 ed2k.1:51
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list;"
+msgstr ""
+"bir sunucu listesi bağlantısı, bu durumda listedeki tüm sunucular sunucu "
+"listesine eklenir;"
+
+#. type: Plain text
+#: amule.1:69 amuled.1:77
+msgid "a magnet link."
+msgstr "bir magnet bağlantısı."
+
+#. type: SH
+#: amule.1:70 amulecmd.1:207 amuleweb.1:132
+#, no-wrap
+msgid "NOTES"
+msgstr "NOTLAR"
+
+#. type: SS
+#: amule.1:71 amulecmd.1:208 amuleweb.1:133
+#, no-wrap
+msgid "Paths"
+msgstr "Yollar"
+
+#. type: Plain text
+#: amule.1:75 amulecmd.1:212 amuleweb.1:137
+msgid ""
+"For all options which take a I<E<lt>pathE<gt>> value, if the I<path> "
+"contains no directory part (i.e. just a plain filename), then it is "
+"considered to be under the aMule configuration directory, I<~/.aMule>."
+msgstr ""
+"I<E<lt>yolE<gt>> değeri alan  tüm seçenekler için eğer I<yol> hiçbir dizin "
+"içermiyorsa (yani sadece bir dosya ismiyse) aMule yapılandırma dizini (I<~/."
+"aMule>) varsayılır. "
+
+#. type: SH
+#: amule.1:75 amulecmd.1:240 amuled.1:78 amuleweb.1:171 ed2k.1:60
+#: ../../src/utils/cas/docs/cas.1:36
+#, no-wrap
+msgid "FILES"
+msgstr "DOSYALAR"
+
+#. type: Plain text
+#: amule.1:77 amuled.1:80
+msgid "~/.aMule/*"
+msgstr "~/.aMule/*"
+
+#. type: SH
+#: amule.1:77 amulecmd.1:256 amuled.1:80 amulegui.1:48 amuleweb.1:191
+#: ed2k.1:62 ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+#: ../../src/utils/cas/docs/cas.1:42 ../../src/utils/wxCas/docs/wxcas.1:16
+#: ../../src/utils/xas/docs/xas.1:16
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr "GERİBİLDİRİM"
+
+#. type: Plain text
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+msgid ""
+"Please report bugs either on our forum (I<http://forum.amule.org/>), or in "
+"our bugtracker (I<http://bugs.amule.org/>).  Please do not report bugs in e-"
+"mail, neither to our mailing list nor directly to any team member."
+msgstr ""
+"Hataları bildirmek için forumumuzu (I<http://forum.amule.org/>) ya da hata "
+"takipçimizi (I<http://bugs.amule.org/>) kullanınız. Hataları bildirmek için "
+"e-mail ve e-mail listemizi kullanmamanızı ve geliştiricilerden birine "
+"doğrudan bildirmemenizi rica ederiz."
+
+#. type: SH
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194
+#: ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14
+#: ../../src/utils/aLinkCreator/docs/alcc.1:29
+#: ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19
+#: ../../src/utils/xas/docs/xas.1:19
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr "TELİF HAKKI"
+
+#. type: Plain text
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+msgid ""
+"aMule and all of its related utilities are distributed under the GNU General "
+"Public License."
+msgstr ""
+"aMule ve ilgili tüm yardımcı araçları GNU Genel Kamu Lisansı çerçevesinde "
+"dağıtılmaktadır."
+
+#. type: SH
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196
+#: ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16
+#: ../../src/utils/aLinkCreator/docs/alcc.1:31
+#: ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21
+#: ../../src/utils/xas/docs/xas.1:21
+#, no-wrap
+msgid "SEE ALSO"
+msgstr "İLGİLİ BELGELER"
+
+#. type: SH
+#: amule.1:84 amulecmd.1:263 amuled.1:87 amulegui.1:55 amuleweb.1:198
+#: ed2k.1:69 ../../src/utils/aLinkCreator/docs/alc.1:18
+#: ../../src/utils/aLinkCreator/docs/alcc.1:33
+#: ../../src/utils/cas/docs/cas.1:49 ../../src/utils/wxCas/docs/wxcas.1:23
+#: ../../src/utils/xas/docs/xas.1:23
+#, no-wrap
+msgid "AUTHOR"
+msgstr "YAZAN"
+
+#. type: Plain text
+#: amule.1:85 amulecmd.1:264 amuled.1:88 amuleweb.1:199 ed2k.1:70
+#: ../../src/utils/aLinkCreator/docs/alc.1:19
+#: ../../src/utils/aLinkCreator/docs/alcc.1:34
+#: ../../src/utils/cas/docs/cas.1:50 ../../src/utils/wxCas/docs/wxcas.1:24
+#: ../../src/utils/xas/docs/xas.1:24
+msgid ""
+"This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Bu kılavuz sayfası Vollstrecker E<lt>amule@vollstreckernet.deE<gt> "
+"tarafından yazılmıştır."
+
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "AMULECMD"
+msgstr "AMULECMD"
+
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "aMuleCmd v2.3.1"
+msgstr "aMuleCmd v2.3.1"
+
+#. type: TH
+#: amulecmd.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 "aMule utilities"
+msgstr "aMule yardımcı araçları"
+
+#. type: Plain text
+#: amulecmd.1:7
+msgid "amulecmd - Console-based program to control aMule"
+msgstr "amulecmd - aMule'ü yönetmek için konsol temelli bir program"
+
+#. type: Plain text
+#: amulecmd.1:13 amuleweb.1:12
+msgid ""
+"[B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
+"I<E<lt>passwordE<gt>>] [B<-f> I<E<lt>pathE<gt>>]"
+msgstr ""
+"[B<-h> I<E<lt>sunucuE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
+"I<E<lt>şifreE<gt>>] [B<-f> I<E<lt>yolE<gt>>]"
+
+#. type: Plain text
+#: amulecmd.1:17
+msgid ""
+"[B<-l> I<E<lt>langE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>commandE<gt>>]"
+"B< >}"
+msgstr ""
+"[B<-l> I<E<lt>dilE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> I<E<lt>komutE<gt>>]B< >}"
+
+#. type: Plain text
+#: amulecmd.1:20 amuleweb.1:31
+msgid "[B<--create-config-from>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--create-config-from>=I<E<lt>yolE<gt>>]"
+
+#. type: Plain text
+#: amulecmd.1:29
+msgid "B<amulecmd> is a console-based client to control aMule."
+msgstr "B<amulecmd> aMule'ü yönetmek için konsol temelli bir programdır."
+
+#. type: TP
+#: amulecmd.1:29 amuleweb.1:46
+#, no-wrap
+msgid "B<[ -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<]>"
+msgstr "B<[ -h> I<E<lt>sunucuE<gt>>, B<--host>=I<E<lt>sunucuE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:33 amuleweb.1:50
+msgid ""
+"Host where aMule is running (default: I<localhost>).  I<E<lt>hostE<gt>> "
+"might be an IP address or a DNS name"
+msgstr ""
+"aMule'ün çalıştığı sunucu ya da bilgisayar (varsayılan: I<localhost>). "
+"I<E<lt>sunucuE<gt>> bir IP adresi ya da DNS ismi olabilir"
+
+#. type: TP
+#: amulecmd.1:33 amuleweb.1:50
+#, no-wrap
+msgid "B<[ -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:36 amuleweb.1:53
+msgid ""
+"aMule's port for External Connections, as set in Preferences-E<gt>Remote "
+"Controls (default: I<4712>)"
+msgstr ""
+"aMule'ün dışarıya bağlandığında kullandığı port, Ayarlar-E<gt>Uzak "
+"Denetimler seçeneğinde belirlenir (varsayılan: I<4712>)"
+
+#. type: TP
+#: amulecmd.1:36 amuleweb.1:53
+#, no-wrap
+msgid "B<[ -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<]>"
+msgstr "B<[ -P> I<E<lt>şifreE<gt>>, B<--password>=I<E<lt>şifreE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:39 amuleweb.1:56
+msgid "External Connections password."
+msgstr "Dışarıdan yapılan bağlantılar için şifre."
+
+#. type: TP
+#: amulecmd.1:39 amuleweb.1:56
+#, no-wrap
+msgid "B<[ -f> I<E<lt>pathE<gt>>, B<--config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -f> I<E<lt>yolE<gt>>, B<--config-file>=I<E<lt>yolE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:43 amuleweb.1:60
+msgid ""
+"Use the given configuration file.  Default configuration file is I<~/.aMule/"
+"remote.conf>"
+msgstr ""
+"Belirtilen yapılandırma dosyasını kullanır. Varsayılan yapılandırma dosyası "
+"şudur: I<~/.aMule/remote.conf>"
+
+#. type: Plain text
+#: amulecmd.1:46 amuleweb.1:63
+msgid "Do not print any output to stdout."
+msgstr "Standart çıktıya hiçbir veri yazdırmaz."
+
+#. type: Plain text
+#: amulecmd.1:50 amuleweb.1:67
+msgid "Be verbose - show also debug messages."
+msgstr "Geveze olur - debug mesajlarını da gösterir."
+
+#. type: TP
+#: amulecmd.1:50 amuleweb.1:67
+#, no-wrap
+msgid "B<[ -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<]>"
+msgstr "B<[ -l> I<E<lt>dilE<gt>>, B<--locale>=I<E<lt>dilE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:54 amuleweb.1:71
+msgid ""
+"Sets program locale (language).  See the B<NOTES> section for the "
+"description of the I<E<lt>langE<gt>> parameter."
+msgstr ""
+"Programın kullandığı dili belirler. I<E<lt>dilE<gt>> parametresinin "
+"tanımlaması için B<NOTLAR> bölümüne bakınız."
+
+#. type: Plain text
+#: amulecmd.1:57 amuleweb.1:74
+msgid "Write command line options to config file and exit"
+msgstr "Komut satırı seçeneklerini yapılandırma dosyasına yazıp çıkar"
+
+#. type: TP
+#: amulecmd.1:57
+#, no-wrap
+msgid "B<[ -c> I<E<lt>commandE<gt>>, B<--command>=I<E<lt>commandE<gt>> B<]>"
+msgstr "B<[ -c> I<E<lt>komutE<gt>>, B<--command>=I<E<lt>komutE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:60
+msgid ""
+"Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and "
+"exit."
+msgstr ""
+"I<E<lt>komutE<gt>>u amulecmd'ın komut istemine girilmiş gibi çalıştırır ve "
+"çıkar."
+
+#. type: TP
+#: amulecmd.1:60 amuleweb.1:117
+#, no-wrap
+msgid "B<[ --create-config-from>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --create-config-from>=I<E<lt>yolE<gt>> B<]>"
+
+#. type: Plain text
+#: amulecmd.1:63 amuleweb.1:120
+msgid ""
+"Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid "
+"aMule config file, and then exit."
+msgstr ""
+"I<E<lt>yolE<gt>>a dayalı yapılandırma dosyası yaratır ve çıkar. Yolun "
+"geçerli bir aMule dosyasına işaret etmesi gerekir."
+
+#. type: SH
+#: amulecmd.1:69
+#, no-wrap
+msgid "COMMANDS"
+msgstr "KOMUTLAR"
+
+#. type: Plain text
+#: amulecmd.1:71
+msgid "All commands are case insensitive."
+msgstr "Tüm komutlar harf büyüklüğüne duyarsızdır."
+
+#. type: SS
+#: amulecmd.1:71
+#, no-wrap
+msgid "Add I<E<lt>eD2k-linkE<gt>> | I<E<lt>magnet-linkE<gt>>"
+msgstr "Add I<E<lt>eD2k-bağlantısıE<gt>> | I<E<lt>magnet-bağlantısıE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:73
+msgid "Adds an eD2k-link or a magnet-link to the core."
+msgstr "Çekirdeğe bir eD2k ya da magnet bağlantısı ekler."
+
+#. type: Plain text
+#: amulecmd.1:82
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list."
+msgstr ""
+"bir sunucu listesi bağlantısı, bu durumda listedeki tüm sunucular sunucu "
+"listesine eklenir."
+
+#. type: Plain text
+#: amulecmd.1:85
+msgid "The magnet link must contain the eD2k hash and file length."
+msgstr "Magnet bağlantısı eD2k hash değerini ve dosya boyutunu içermelidir."
+
+#. type: SS
+#: amulecmd.1:85
+#, no-wrap
+msgid "Cancel I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Cancel I<E<lt>hashE<gt>> | I<E<lt>sayıE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:87
+msgid ""
+"Cancels the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"I<E<lt>hashE<gt>> ya da I<E<lt>sayıE<gt>> tarafından belirtilen indirmeyi "
+"iptal eder. Değerleri öğrenmek için B<show> komutunu kullanınız."
+
+#. type: SS
+#: amulecmd.1:87
+#, no-wrap
+msgid "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|nameE<gt>> ]"
+msgstr "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|isimE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:89
+msgid "Connect to the network."
+msgstr "Ağa bağlanır."
+
+#. type: Plain text
+#: amulecmd.1:91
+msgid "This will connect to all networks that are enabled in Preferences."
+msgstr "Ayarlarda ekinleştirilmiş tüm ağlara bağlanır."
+
+#. type: Plain text
+#: amulecmd.1:95
+msgid ""
+"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."
+msgstr ""
+"Ek bir parametreyle hangi ağa bağlanmak istediğinizi belirtebilirsiniz. IP:"
+"port şeklinde (IP ya noktalarla ayrılmış ondalık bir IPv4 adresi ya da "
+"çözümlenebilen bir DNS ismi olmalıdır) bir sunucu adresi verirseniz aMule "
+"sadece bu sunucuya bağlanacaktır."
+
+#. type: Plain text
+#: amulecmd.1:98
+msgid ""
+"Disconnect from all networks you are connected to, or just disconnect from "
+"the specified network."
+msgstr ""
+"Ya çevrimiçi olan tüm ağlarla bağlantıyı keser, ya da sadece belirtilen ağ "
+"ile."
+
+#. type: SS
+#: amulecmd.1:98
+#, no-wrap
+msgid "Download I<E<lt>numberE<gt>>"
+msgstr "Download I<E<lt>sayıE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:100
+msgid "Start downloading a file."
+msgstr "Bir dosyayı indirmeye başlar."
+
+#. type: Plain text
+#: amulecmd.1:104
+msgid ""
+"The I<E<lt>numberE<gt>> of a file from the last search has to be given.  "
+"Example: `download 12' will start to download the file with the number 12 of "
+"the previous search."
+msgstr ""
+"Bir dosyanın son aramadan I<E<lt>sayıE<gt>> değeri girilmesi gerekir. "
+"Örneğin `download 12' son aramadaki 12 numaralı dosyayı indirmeye başlar."
+
+#. type: Plain text
+#: amulecmd.1:106
+msgid "Disconnect from amule/amuled and quit amulecmd."
+msgstr "amule/amuled ile bağlantıyı keser ve amulecmd kapanır."
+
+#. type: SS
+#: amulecmd.1:106
+#, no-wrap
+msgid "Get I<E<lt>whatE<gt>>"
+msgstr "Get I<E<lt>değerE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:108
+msgid "Get and display a preference value."
+msgstr "Bir ayar değerini görüntüler."
+
+#. type: Plain text
+#: amulecmd.1:110 amulecmd.1:144 amulecmd.1:173 amulecmd.1:183
+msgid "Available values for I<E<lt>whatE<gt>>:"
+msgstr "I<E<lt>değerE<gt>> ile kullanılabilecek değerler:"
+
+#. type: Plain text
+#: amulecmd.1:113
+msgid "Get bandwidth limits."
+msgstr "Bant genişliği değerlerini görüntüler."
+
+#. type: Plain text
+#: amulecmd.1:115
+msgid "Get IPFilter preferences."
+msgstr "IPFilter ayarlarını görüntüler."
+
+#. type: SS
+#: amulecmd.1:116
+#, no-wrap
+msgid "Help [ I<E<lt>commandE<gt>> ]"
+msgstr "Help [ I<E<lt>komutE<gt>> ]"
+
+#. type: Plain text
+#: amulecmd.1:120
+msgid ""
+"Prints a short usage description.  If called without parameter, it shows a "
+"list of available commands.  If called with I<E<lt>commandE<gt>>, it shows a "
+"short description of the given command."
+msgstr ""
+"Kısa bir kullanım açıklaması görüntüler. Bir parametre ile kullanılırsa "
+"mevcut komutların listesini verir. I<E<lt>komutE<gt>> ile kullanılırsa "
+"belirtilen komutun kısa bir açıklamasını görüntüler."
+
+#. type: SS
+#: amulecmd.1:120
+#, no-wrap
+msgid "Pause I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Pause I<E<lt>hashE<gt>> | I<E<lt>sayıE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:122
+msgid ""
+"Pauses the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"I<E<lt>hashE<gt>> ya da I<E<lt>sayıE<gt>> değerleri ile belirtilen indirmeyi "
+"duraklatır. Bu değerleri elde etmek için B<show> komutunu kullanabilirsiniz."
+
+#. type: SS
+#: amulecmd.1:122
+#, no-wrap
+msgid "Priority I<E<lt>priorityE<gt>> I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Priority I<E<lt>öncelikE<gt>> I<E<lt>hashE<gt>> | I<E<lt>sayıE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:124
+msgid ""
+"Set priority of a download specified by I<E<lt>hashE<gt>> or "
+"I<E<lt>numberE<gt>>."
+msgstr ""
+"I<E<lt>hashE<gt>> ya da I<E<lt>sayıE<gt>> ile belirtilen bir indirmenin "
+"önceliğini ayarlar."
+
+#. type: Plain text
+#: amulecmd.1:126
+msgid "Available values for I<E<lt>priorityE<gt>>:"
+msgstr "I<E<lt>öncelikE<gt>> için kullanılabilecek değerler:"
+
+#. type: Plain text
+#: amulecmd.1:129
+msgid "Automatic priority."
+msgstr "Otomatik öncelik."
+
+#. type: Plain text
+#: amulecmd.1:131
+msgid "High priority."
+msgstr "Yüksek öncelik."
+
+#. type: Plain text
+#: amulecmd.1:133
+msgid "Low priority."
+msgstr "Düşük öncelik."
+
+#. type: Plain text
+#: amulecmd.1:135
+msgid "Normal priority."
+msgstr "Normal öncelik."
+
+#. type: Plain text
+#: amulecmd.1:138
+msgid "Shows the progress of an on-going search."
+msgstr "Sürmekte olan bir aramanın ilerlemesini gösterir."
+
+#. type: Plain text
+#: amulecmd.1:140
+msgid "A synonim of the B<exit> command."
+msgstr "B<exit> komutu ile eş anlamlıdır."
+
+#. type: SS
+#: amulecmd.1:140
+#, no-wrap
+msgid "Reload I<E<lt>whatE<gt>>"
+msgstr "Reload I<E<lt>değerE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:142
+msgid "Reloads a given object."
+msgstr "Belirtilen değeri yeniden yükler."
+
+#. type: Plain text
+#: amulecmd.1:147
+msgid "Reload shared files list."
+msgstr "Paylaşılan dosyalar listesini yeniden yükler."
+
+#. type: Plain text
+#: amulecmd.1:149
+msgid "Reload IP filter tables."
+msgstr "IP filtre tablolarını yeniden yükler."
+
+#. type: Plain text
+#: amulecmd.1:152
+msgid "Reset the log."
+msgstr "Günlüğü sıfırlar."
+
+#. type: Plain text
+#: amulecmd.1:154
+msgid "Shows you the results of the last search."
+msgstr "Son aramanın sonuçlarını gösterir."
+
+#. type: SS
+#: amulecmd.1:154
+#, no-wrap
+msgid "Resume I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr "Resume I<E<lt>hashE<gt>> | I<E<lt>sayıE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:156
+msgid ""
+"Resumes the download specified by I<E<lt>hashE<gt>> or I<E<lt>numberE<gt>>. "
+"To get the value use B<show>."
+msgstr ""
+"I<E<lt>hashE<gt>> ya da I<E<lt>sayıE<gt>> ile belirtilen indirmeye kaldığı "
+"yerden devam eder. Değeri öğrenmek için B<show> komutunu kullanabilirsiniz."
+
+#. type: SS
+#: amulecmd.1:156
+#, no-wrap
+msgid "Search I<E<lt>typeE<gt>> I<E<lt>keywordE<gt>>"
+msgstr "Search I<E<lt>türE<gt>> I<E<lt>anahtarkelimeE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:159
+msgid ""
+"Makes a search for the given I<E<lt>keywordE<gt>>. A search type and a "
+"keyword to search is mandatory to do this.  Example: `search kad amule' "
+"performs a kad search for `amule'."
+msgstr ""
+"Girilen I<E<lt>anahtarkelimeE<gt>> için bir arama yapar. Bir arama türü ve "
+"bir anahtar kelime kullanmanız mecburidir. Örneğin `search kad amule' kad "
+"ağında `amule' sözcüğü ile arama yapar."
+
+#. type: Plain text
+#: amulecmd.1:161
+msgid "Available search types:"
+msgstr "Kullanılabilecek arama türleri:"
+
+#. type: Plain text
+#: amulecmd.1:164
+msgid "Performs a global search."
+msgstr "Genel arama yapar."
+
+#. type: Plain text
+#: amulecmd.1:166
+msgid "Performs a search on the Kademlia network."
+msgstr "Kad ağında arama yapar."
+
+#. type: Plain text
+#: amulecmd.1:168
+msgid "Performs a local search."
+msgstr "Sunucuda arama yapar."
+
+#. type: SS
+#: amulecmd.1:169
+#, no-wrap
+msgid "Set I<E<lt>whatE<gt>>"
+msgstr "Set I<E<lt>değerE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:171
+msgid "Sets a given preferences value."
+msgstr "Belirtilen değeri ayarlara girer."
+
+#. type: Plain text
+#: amulecmd.1:176
+msgid "Set bandwidth limits."
+msgstr "Bant genişliği değerlerini ayarlar."
+
+#. type: Plain text
+#: amulecmd.1:178
+msgid "Set IPFilter preferences."
+msgstr "IPFilter tercihlerini ayarlar."
+
+#. type: SS
+#: amulecmd.1:179
+#, no-wrap
+msgid "Show I<E<lt>whatE<gt>>"
+msgstr "Show I<E<lt>değerE<gt>>"
+
+#. type: Plain text
+#: amulecmd.1:181
+msgid "Shows upload/download queue, servers list or shared files list."
+msgstr ""
+"İndirme/aktarma kuyruğunu, sunucu listesini ya da paylaşılan dosya listesini "
+"gösterir."
+
+#. type: Plain text
+#: amulecmd.1:186
+msgid "Show download queue."
+msgstr "İndirme kuyruğunu gösterir."
+
+#. type: Plain text
+#: amulecmd.1:188
+msgid "Show log."
+msgstr "Günlüğü (log) gösterir."
+
+#. type: Plain text
+#: amulecmd.1:190
+msgid "Show servers list."
+msgstr "Sunucu listesini gösterir."
+
+#. type: Plain text
+#: amulecmd.1:192
+msgid "Show upload queue."
+msgstr "Aktarma (gönderilen dosyalar) kuyruğunu gösterir."
+
+#. type: Plain text
+#: amulecmd.1:196
+msgid ""
+"Shutdown the remote running core (amule/amuled).  This will also shut down "
+"the text client, since it is unusable without a running core."
+msgstr ""
+"Uzakta çalışmakta olan çekirdeği (amule/amuled) kapatır. Bu metin temelli "
+"istemciyi de kapatacaktır çünkü çekirdek olmadan işleyemez."
+
+#. type: SS
+#: amulecmd.1:196
+#, no-wrap
+msgid "Statistics [ I<E<lt>numberE<gt>> ]"
+msgstr "İstatistikler [ I<E<lt>sayıE<gt>> ] "
+
+#. type: Plain text
+#: amulecmd.1:198
+msgid "Show statistics tree."
+msgstr "İstatistikler ağacını gösterir."
+
+#. type: Plain text
+#: amulecmd.1:202
+msgid ""
+"The optional I<E<lt>numberE<gt>> in the range of 0-255 can be passed as "
+"argument to this command, which tells how many entries of the client version "
+"subtree should be shown. Passing 0, or omitting it means `unlimited'."
+msgstr ""
+"0-255 arası I<E<lt>sayıE<gt>> isteğe bağlı argüman olarak komuta "
+"aktarılabilir, bu kaç tane istemci sürümü alt ağacının gösterileceğini "
+"belirtir. 0 kullanımı ya da hiçbir argüman kullanılmaması `sınırsız' "
+"anlamına gelir."
+
+#. type: Plain text
+#: amulecmd.1:205
+msgid ""
+"Example: `statistics 5' will show only the top 5 versions for each client "
+"type."
+msgstr ""
+"Örneğin `statistics 5' her istemcinin en çok kullanılan 5 sürümünü gösterir."
+
+#. type: Plain text
+#: amulecmd.1:207
+msgid "Show connection status, current up/download speeds, etc."
+msgstr ""
+"Bağlantı durumunu, sürmekte olan indirmeleri ve aktarmaları vs. gösterir."
+
+#. type: SS
+#: amulecmd.1:212 amuleweb.1:137
+#, no-wrap
+msgid "Languages"
+msgstr "Diller"
+
+#. type: Plain text
+#: amulecmd.1:218 amuleweb.1:143
+msgid ""
+"The I<E<lt>langE<gt>> parameter for the B<-l> option has the following form: "
+"I<lang>[B<_>I<LANG>][B<.>I<encoding>][B<@>I<modifier>] where I<lang> is the "
+"primary language, I<LANG> is a sublanguage/territory, I<encoding> is the "
+"character set to use and I<modifier> allows the user to select a specific "
+"instance of localization data within a single category."
+msgstr ""
+"B<-l> seçeneği için I<E<lt>dilE<gt>> parametresi şu biçimde kullanılmalıdır: "
+"I<dil>[B<_>I<DİL>][B<.>I<kodlama>][B<@>I<niteleyici>] ki burada I<dil> "
+"birinci dil, I<DİL> lehçe/bölge, I<kodlama> karakter setidir ve "
+"I<niteleyici> kullanıcıya belli bir kategori içinde belli yerelleştirme "
+"verileri kullanma olanağı sağlar."
+
+#. type: Plain text
+#: amulecmd.1:220 amuleweb.1:145
+msgid "For example, the following strings are valid:"
+msgstr "Örnek olarak, aşağıdaki dizeler geçerlidir:"
+
+#. type: Plain text
+#: amulecmd.1:234 amuleweb.1:159
+msgid ""
+"Though all the above strings are accepted as valid language definitions, "
+"I<encoding> and I<modifier> are yet unused."
+msgstr ""
+"Yukarıdaki tüm dizeler geçerlidir ancak I<kodlama> ve I<niteleyici> henüz "
+"kullanılmamaktadır."
+
+#. type: Plain text
+#: amulecmd.1:237 amuleweb.1:162
+msgid ""
+"In addition to the format above, you can also specify full language names in "
+"English - so B<-l german> is also valid and is equal to B<-l de_DE>."
+msgstr ""
+"Yukarıdakilere ek olarak dil isimlerini İngilizce olarak belirtebilirsiniz - "
+"yani B<-l german> ile B<-l de_DE> eşdeğerdir ve ikisi de geçerlidir."
+
+#. type: Plain text
+#: amulecmd.1:240 amuleweb.1:165
+msgid ""
+"When no locale is defined, either on command-line or in config file, system "
+"default language will be used."
+msgstr ""
+"Ne komut satırında ne de yapılandırma dosyasında hiçbir dil belirtilmediği "
+"zaman sistemin varsayılan dili kullanılacaktır."
+
+#. type: Plain text
+#: amulecmd.1:242 amuleweb.1:173
+msgid "~/.aMule/remote.conf"
+msgstr "~/.aMule/remote.conf"
+
+#. type: SH
+#: amulecmd.1:242 amuleweb.1:177
+#, no-wrap
+msgid "EXAMPLE"
+msgstr "ÖRNEK"
+
+#. type: Plain text
+#: amulecmd.1:244
+msgid "Typically amulecmd will be first run as:"
+msgstr "Tipik olarak amulecmd ilk defada şu şekilde başlayacaktır:"
+
+#. type: Plain text
+#: amulecmd.1:246
+msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
+msgstr ""
+"B<amulecmd> B<-h> I<bilgisayaradı> B<-p> I<DBport> B<-P> I<DBşifre> B<-w>"
+
+#. type: Plain text
+#: amulecmd.1:248 amuleweb.1:183
+msgid "or"
+msgstr "ya da"
+
+#. type: Plain text
+#: amulecmd.1:250
+msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+"B<amulecmd> B<--create-config-from>=I</home/kullanıcıadı/.aMule/amule.conf>"
+
+#. type: Plain text
+#: amulecmd.1:252 amuleweb.1:187
+msgid ""
+"These will save settings to I<$HOME/.aMule/remote.conf>, and later you only "
+"need to type:"
+msgstr ""
+"Ayarları I<$HOME/.aMule/remote.conf> dosyasına kayıt eder ve daha sonra "
+"sadece şunu girmeniz yeterli olacaktır:"
+
+#. type: Plain text
+#: amulecmd.1:256
+msgid "Of course, you don't have to follow this example."
+msgstr "Tabii ki bu örneğe harfiyen uymanız zorunlu değildir."
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "AMULED"
+msgstr "AMULED"
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon v2.3.1"
+msgstr "aMule Daemon v2.3.1"
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon"
+msgstr "aMule Daemon"
+
+#. type: Plain text
+#: amuled.1:6
+msgid "amuled - the all-platform eMule p2p client - daemonized version"
+msgstr "amuled - her platformda çalışan eMule p2p istemcisi - daemon sürümü"
+
+#. type: Plain text
+#: amuled.1:9 ../../src/utils/cas/docs/cas.1:11
+msgid "[B<-c> I<E<lt>pathE<gt>>]"
+msgstr "[B<-c> I<E<lt>yolE<gt>>]"
+
+#. type: Plain text
+#: amuled.1:11
+msgid "[B<-p> I<E<lt>pathE<gt>>]"
+msgstr "[B<-p> I<E<lt>yolE<gt>>]"
+
+#. type: Plain text
+#: amuled.1:32
+msgid "Forks to background."
+msgstr "Kendisini arkaplana çatallar."
+
+#. type: TP
+#: amuled.1:32
+#, no-wrap
+msgid "B<[ -p> I<E<lt>pathE<gt>>, B<--pid-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ -p> I<E<lt>yolE<gt>>, B<--pid-file>=I<E<lt>yolE<gt>> B<]>"
+
+#. type: Plain text
+#: amuled.1:36
+msgid ""
+"After fork, create a pid-file in the I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> "
+"has to contain the filename."
+msgstr ""
+"Çatallamadan sonra I<E<lt>yolE<gt>> konumunda bir pid-file dosyası yaratır. "
+"I<E<lt>yolE<gt>>un dosya ismini içermesi gerekir."
+
+#. type: Plain text
+#: amuled.1:39
+msgid "Configure EC (External Connections)."
+msgstr "DB (Dış Bağlantılar) Kurulumu"
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "AMULEGUI"
+msgstr "AMULEGUI"
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI v2.3.1"
+msgstr "aMuleGUI v2.3.1"
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI"
+msgstr "aMuleGUI"
+
+#. type: Plain text
+#: amulegui.1:6
+msgid "amulegui - aMule control program with GUI"
+msgstr "amulegui - Grafik arayüzlü aMule yönetme programı"
+
+#. type: Plain text
+#: amulegui.1:14
+msgid "[B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-t> I<E<lt>sayıE<gt>>]"
+
+#. type: Plain text
+#: amulegui.1:24
+msgid ""
+"B<amulegui> is a client program, and can be connected to amule or amuled via "
+"EC. You can manage your amule program with it. It provides almost the same "
+"functionalities as amule, even if the core works on another computer."
+msgstr ""
+"B<amulegui> istemci bir programdır ve amule ya da amuled'e DB yoluyla "
+"bağlanabilir. aMule'ü bu şekilde yönetebilirsiniz. Çekirdeğin başka bir "
+"bilgisayarda çalışmasına rağmen amule'ün neredeyse tüm işlevlerine erişim "
+"sağlar."
+
+#. type: Plain text
+#: amulegui.1:39
+msgid "Skip connection dialog."
+msgstr "Bağlantı diyaloğunu geç."
+
+#. type: Plain text
+#: amulegui.1:57
+msgid ""
+"This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm "
+"DOT orgE<gt>"
+msgstr ""
+"Bu man sayfası Debian için Julien Delange E<lt>julien AT gunnm DOT orgE<gt> "
+"tarafından yazılmıştır."
+
+#. type: Plain text
+#: amulegui.1:58
+msgid ""
+"This manpage was rewritten by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+"Bu kılavuz sayfası Vollstrecker E<lt>amule@vollstreckernet.deE<gt> "
+"tarafından yeniden yazılmıştır"
+
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "AMULEWEB"
+msgstr "AMULEWEB"
+
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "aMule webserver v2.3.1"
+msgstr "aMule webserver v2.3.1"
+
+#. type: Plain text
+#: amuleweb.1:6
+msgid "amuleweb - aMule web server"
+msgstr "amuleweb - aMule web sunucusu"
+
+#. type: Plain text
+#: amuleweb.1:15
+msgid "[B<-l> I<E<lt>langE<gt>>]"
+msgstr "[B<-l> I<E<lt>dilE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:18
+msgid "[B<-t> I<E<lt>nameE<gt>>] [B<-s> I<E<lt>portE<gt>>]"
+msgstr "[B<-t> I<E<lt>isimE<gt>>] [B<-s> I<E<lt>portE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:20
+msgid "[B<-U> I<E<lt>portE<gt>>]"
+msgstr "[B<-U> I<E<lt>portE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:24
+msgid "[B<-A> I<E<lt>passwordE<gt>>] [B<-G> I<E<lt>passwordE<gt>>]"
+msgstr "[B<-A> I<E<lt>şifreE<gt>>] [B<-G> I<E<lt>şifreE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:40
+msgid "[B<--amule-config-file>=I<E<lt>pathE<gt>>]"
+msgstr "[B<--amule-config-file>=I<E<lt>yolE<gt>>]"
+
+#. type: Plain text
+#: amuleweb.1:46
+msgid ""
+"B<amuleweb> manages your access to amule through a web browser.  You can "
+"start amuleweb together with B<amule>(1), or separately, any time later.  "
+"Options can be specified via command-line or via config-file.  Command-line "
+"options take precedence over config-file options."
+msgstr ""
+"B<amuleweb> amule'e bir ağ tarayıcısı ile erişmenize olanak sağlar. "
+"amuleweb'i amule ile aynı anda ya da ayrı olarak, daha sonra ne zaman "
+"isterseniz başlatabilirsiniz. Seçenekleri komut satırı ya da yapılandırma "
+"dosyası ile belirtmek mümkündür. Komut satırı ile belirtilen seçenekler "
+"yapılandırma dosyası ile belirtilenlerden daha yüksek önceliklidir."
+
+#. type: TP
+#: amuleweb.1:74
+#, no-wrap
+msgid "B<[ -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<]>"
+msgstr "B<[ -t> I<E<lt>isimE<gt>>, B<--template>=I<E<lt>isimE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:77
+msgid ""
+"Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section "
+"for details."
+msgstr ""
+"Adı I<E<lt>isimE<gt>> olan şablonu yükler. Ayrıntılar için B<TEMA DESTEĞİ> "
+"bölümüne bakınız."
+
+#. type: TP
+#: amuleweb.1:77
+#, no-wrap
+msgid "B<[ -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:80
+msgid ""
+"Webserver's HTTP port. This is the port you must point your browser to "
+"(default: I<4711>)."
+msgstr ""
+"Web sunucusunun HTTP portu. Bu ağ tarayıcınızda kullanmanız gereken port "
+"numarasıdır (varsayılan: I<4711>). "
+
+#. type: Plain text
+#: amuleweb.1:84
+msgid "Enable UPnP."
+msgstr "UPnP'yi etkinleştirir."
+
+#. type: TP
+#: amuleweb.1:84
+#, no-wrap
+msgid "B<[ -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<]>"
+msgstr "B<[ -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:87
+msgid "UPnP port."
+msgstr "UPnP port numarası."
+
+#. type: Plain text
+#: amuleweb.1:90
+msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
+msgstr ""
+"Bant genişliğinden tasarruf etmek için gzip sıkıştırmasını etkinleştirir."
+
+#. type: Plain text
+#: amuleweb.1:93
+msgid "Disables using gzip compression (this is the default)."
+msgstr "Gzip sıkıştırmasını devre dışı bırakır (bu varsayılan değerdir)."
+
+#. type: TP
+#: amuleweb.1:93
+#, no-wrap
+msgid "B<[ -A> I<E<lt>passwdE<gt>>, B<--admin-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -A> I<E<lt>şifreE<gt>>, B<--admin-pass>=I<E<lt>şifreE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:96
+msgid "Full access password for webserver."
+msgstr "Sunucuya tam erişim için şifre (parola)."
+
+#. type: TP
+#: amuleweb.1:96
+#, no-wrap
+msgid "B<[ -G> I<E<lt>passwdE<gt>>, B<--guest-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr "B<[ -G> I<E<lt>şifreE<gt>>, B<--guest-pass>=I<E<lt>şifreE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:99
+msgid "Guest password for webserver."
+msgstr "Web sunucusu için misafir şifresi."
+
+#. type: Plain text
+#: amuleweb.1:102
+msgid "Allows guest access."
+msgstr "Misafir erişimini etkinleştirir."
+
+#. type: Plain text
+#: amuleweb.1:105
+msgid "Denies guest access (default)."
+msgstr "Misafir erişimine izin vermez (varsayılan değer)."
+
+#. type: Plain text
+#: amuleweb.1:111
+msgid ""
+"Load/save webserver settings from/to remote aMule.  This causes amuleweb to "
+"ignore command-line and config-file settings, and load them from aMule.  "
+"When saving preferences none will be written to the config file, but to "
+"aMule.  (Of course, this works only for those settings that can be set in "
+"aMule's Preferences-E<gt>Remote Controls.)"
+msgstr ""
+"web sunucusu ayarlarını aMule'den/aMule'e yükler/kaydeder. Bu amuleweb'in "
+"komut satırı ve yapılandırma dosyası ayarlarını görmezden gelmesine yol "
+"açar. Ayarlar kaydedilirken hiçbiri yapılandırma dosyasına yazılmaz, aMule'e "
+"yazılır. (Tabii ki bu sadece aMule'ün Ayarlar-E<gt>Uzak Denetiminde "
+"kurulabilen değerler için geçerlidir.)"
+
+#. type: Plain text
+#: amuleweb.1:114
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "PHP yorumlayıcısını devre dışı bırakır (eskimiş)"
+
+#. type: Plain text
+#: amuleweb.1:117
+msgid "Recompiles PHP pages on each request."
+msgstr "PHP sayfalarını her sorguda yeniden derler."
+
+#. type: TP
+#: amuleweb.1:126
+#, no-wrap
+msgid "B<[ --amule-config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr "B<[ --amule-config-file>=I<E<lt>yolE<gt>> B<]>"
+
+#. type: Plain text
+#: amuleweb.1:132
+msgid ""
+"aMule config file path.  B<DO NOT USE DIRECTLY!> aMule uses this option when "
+"starting amuleweb at aMule startup.  This option causes all other command-"
+"line and config-file settings to be ignored, preferences to be read from the "
+"given config file, and also implies the B<-q -L> options."
+msgstr ""
+"aMule yapılandırma dosyasına erişim yolu.  B<DOĞRUDAN KULLANMAYIN!> aMule bu "
+"seçeneği amuleweb'i aMule ile başlatırken kullanır.  Bu seçenek diğer tüm "
+"komut satırı ve yapılandırma dosyası ayarlarının görmezden gelinmesine, "
+"ayarların verilen yapılandırma dosyasından okunmasına yol açar ve B<-q -L> "
+"seçeneklerinin kullanılacağı anlamına da gelir."
+
+#. type: SH
+#: amuleweb.1:165
+#, no-wrap
+msgid "SKIN SUPPORT"
+msgstr "TEMA DESTEĞİ"
+
+#. type: Plain text
+#: amuleweb.1:169
+msgid ""
+"B<amuleweb> is capable of displaying information in different skins.  These "
+"skins are called templates, and you can make amuleweb load a specific "
+"template via the B<-t> command line option.  Templates are searched in two "
+"places: first in I<~/.aMule/webserver/> and then in I</usr/share/amule/"
+"webserver/> if you installed with --prefix=/usr."
+msgstr ""
+"B<amuleweb> bilgileri çeşitli temalarda görüntüleyebilir. Bu temalara şablon "
+"adı verilir ve amuleweb'in belli bir şablonu yüklemesini B<-t> komut satırı "
+"seçeneği ile sağlayabilirsiniz. Şablonlar iki konumda aranır: önce I<~/."
+"aMule/webserver/> konumunda, sonra da, kurulum --prefix=/usr ile yapıldıysa "
+"I</usr/share/amule/webserver/> konumunda."
+
+#. type: Plain text
+#: amuleweb.1:171
+msgid ""
+"Each template must be in a subdirectory of the template name, and this "
+"directory must contain all files the template needs."
+msgstr ""
+"Her şablonun şablon isminin alt dizininde bulunması gerekir ve bu dizinin "
+"şablonun ihtiyaç duyduğu tüm dosyaları bulundurması şarttır."
+
+#. type: Plain text
+#: amuleweb.1:175
+msgid "~/.aMule/webserver/"
+msgstr "~/.aMule/webserver/"
+
+#. type: Plain text
+#: amuleweb.1:177
+msgid "I<$(pkgdatadir)>/webserver/"
+msgstr "I<$(pkgdatadir)>/webserver/"
+
+#. type: Plain text
+#: amuleweb.1:179
+msgid "Typically amuleweb will be first run as:"
+msgstr "Tipik olarak amuleweb ilk defada şu şekilde başlayacaktır:"
+
+#. type: Plain text
+#: amuleweb.1:181
+msgid ""
+"B<amuleweb> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-s> "
+"I<HTTPport> B<-A> I<AdminPassword> B<-w>"
+msgstr ""
+"B<amuleweb> B<-h> I<hostismi> B<-p> I<DBport> B<-P> I<DBşifresi> B<-s> "
+"I<HTTPport> B<-A> I<AdminŞifresi> B<-w>"
+
+#. type: Plain text
+#: amuleweb.1:185
+msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+"B<amuleweb> B<--create-config-from>=I</home/kullanıcıadı/.aMule/amule.conf>"
+
+#. type: Plain text
+#: amuleweb.1:191
+msgid ""
+"Of course, you may specify any more or less options on the first example "
+"line, and you may also totally omit it."
+msgstr ""
+"Tabii ki ilk örnek satırında daha az ya da fazla seçenek belirtebilirsiniz, "
+"hatta onu tamamen görmezden gelebilirsiniz."
+
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "ED2K"
+msgstr "ED2K"
+
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "aMule eD2k link parser v1.5.1"
+msgstr "aMule eD2k bağlantı çözümleyicisi v1.5.1"
+
+#. type: Plain text
+#: ed2k.1:6
+msgid "ed2k - aMule eD2k link parser"
+msgstr "ed2k - aMule eD2k bağlantı çözümleyicisi"
+
+#. type: Plain text
+#: ed2k.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-t> I<E<lt>numE<gt>>]"
+msgstr "[B<-c> I<E<lt>yolE<gt>>] [B<-t> I<E<lt>sayıE<gt>>]"
+
+#. type: Plain text
+#: ed2k.1:13
+msgid "I<E<lt>eD2k-linkE<gt>>"
+msgstr "I<E<lt>eD2k-bağlantısıE<gt>>"
+
+#. type: Plain text
+#: ed2k.1:21
+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 ""
+"Herhangi bir I<E<lt>eD2k-bağlantısınıE<gt>> aMule'e gönderir, yani onu ~/."
+"aMule/ED2KLinks dosyasına yazar ki bu dosya aMule tarafından her saniye "
+"bağlantılar için sorgulanır."
+
+#. type: Plain text
+#: ed2k.1:30
+msgid ""
+"Loads all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+"Bir emule koleksiyonunda I<E<lt>ed2k-bağlantısıE<gt>> şeklinde bulunan tüm "
+"bağlantıları yükler"
+
+#. type: Plain text
+#: ed2k.1:33
+msgid ""
+"Lists all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+"Bir emule koleksiyonunda I<E<lt>ed2k-bağlantısıE<gt>> şeklinde bulunan tüm "
+"bağlantıları listeler"
+
+#. type: Plain text
+#: ed2k.1:53
+msgid "a magnet link;"
+msgstr "bir magnet bağlantısı;"
+
+#. type: Plain text
+#: ed2k.1:55
+msgid "an emulecollection file."
+msgstr "bir emulecollection dosyası."
+
+#. type: Plain text
+#: ed2k.1:60
+msgid ""
+"B<The order in which you give the parameters is important.> You can give "
+"more than one link, and every link can have it's own params.  For example "
+"B<ed2k E<lt>link1E<gt> -t2 E<lt>link2E<gt>> will download I<E<lt>link1E<gt>> "
+"in standard category and I<E<lt>link2E<gt>> in category 2."
+msgstr ""
+"B<Parametrelerin giriş sırası önemlidir.> Birden fazla bağlantı "
+"girebilirsiniz ve her bağlantının kendine özel parametreleri olabilir. "
+"Örneğin B<ed2k E<lt>bağlantı1E<gt> -t2 E<lt>bağlantı2E<gt>> "
+"I<E<lt>bağlantı1E<gt>> dosyasını standart kategoriye ve "
+"I<E<lt>bağlantı2E<gt>> dosyasını ikinci kategoriye indirecektir."
+
+#. type: Plain text
+#: ed2k.1:62
+msgid "~/.aMule/ED2KLinks"
+msgstr "~/.aMule/ED2KLinks"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "ALC"
+msgstr "ALC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "aLinkCreator"
+msgstr "aLinkCreator"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+msgid "aLinkCreator - the aMule eD2k link creator"
+msgstr "aLinkCreator - aMule eD2k bağlantı yaratıcısı"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:9
+msgid ""
+"B<alc> is a graphical utility to create an eD2k link to any file on your "
+"computer."
+msgstr ""
+"B<alc> bilgisayarınızdaki herhangi bir dosya için eD2k bağlantısı "
+"yaratabilen grafik arayüzlü bir araçtır."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:11
+#: ../../src/utils/wxCas/docs/wxcas.1:16
+msgid "This app doesn't take any arguments."
+msgstr "Bu uygulama hiçbir argüman almaz."
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "ALCC"
+msgstr "ALCC"
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "aMule eD2k links calculator"
+msgstr "aMule eD2k bağlantı hesaplayıcısı"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6
+msgid "alcc - text based eD2k links calculator for aMule"
+msgstr "alcc - aMule için metin temelli eD2k bağlantı hesaplayıcısı"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:11
+msgid "I<E<lt>inputfiles_listE<gt>>"
+msgstr "I<E<lt>girdidosya_listesiE<gt>>"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:16
+msgid ""
+"Compute the eD2k links of all the input files given in the "
+"I<E<lt>inputfiles_listE<gt>> (There can be one or more files)."
+msgstr ""
+"I<E<lt>girdidosya_listesiE<gt>>nde girilen tüm dosyaların eD2k "
+"bağlantılarını hesaplar (bir ya da birden fazla dosya olabilir)"
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:19
+msgid "Compute and add part hashes to the computed eD2k links."
+msgstr "Bölümler için hash değerlerini hesaplar ve eD2k bağlantılarına ekler."
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+msgid "Be verbose - show also calculation steps."
+msgstr "Geveze olur - hesap adımlarını da gösterir."
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "CAS"
+msgstr "CAS"
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "cas v0.8"
+msgstr "cas v0.8"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:6
+msgid "cas - c aMule statistics"
+msgstr "cas - c aMule istatistikleri"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:18
+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<cas> çevrimiçi aMule imza dosyanızı konsolda (insanların okuyabileceği bir "
+"şekilde) görüntülemeye yarayan bir programdır. Bunun çalışması için aMule'ün "
+"ayarlarında \"Çevrim İçi İmza\" seçeneğini etkinleştirmeniz gerekmektedir."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:22
+msgid ""
+"Writes the online signature picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+"Çevrimiçi imza resmini yazar. Yazılacağı konumu belirtmek için İsteğinize "
+"bağlı olarak bu seçeneğe I<=E<lt>YOLE<gt>> ekleyebilirsiniz."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:26
+msgid ""
+"HTML page with stats and picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+"Resim ve istatistikleri bir HTML sayfasına yazar. Yazılacağı konumu "
+"belirtmek için İsteğinize bağlı olarak bu seçeneğe I<=E<lt>YOLE<gt>> "
+"ekleyebilirsiniz."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:34
+msgid "Without any options, it prints online signature data to stdout."
+msgstr ""
+"Hiçbir seçenek belirtilmediği zaman çevrimiçi imzayı standart çıktıda yazar."
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:36
+msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+msgstr ""
+"B<cas> Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt> tarafından "
+"yazılmıştır"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:38
+msgid "~/.aMule/casrc"
+msgstr "~/.aMule/casrc"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:40
+msgid "stat.png"
+msgstr "stat.png"
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:42
+msgid "tmp.html"
+msgstr "tmp.html"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "WXCAS"
+msgstr "WXCAS"
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "wxCas"
+msgstr "wxCas"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:5
+msgid "wxcas - wx c aMule statistics"
+msgstr "wxcas - wx c aMule istatistikleri"
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:11
+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<wxcas> çevrimiçi imzanızın içeriklerini güzel bir wx penceresinde "
+"görüntüler. Bunun çalışması için aMule'ün ayarlarında \"Çevrim İçi İmza\" "
+"seçeneğini etkinleştirmeniz gerekmektedir."
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:14
+msgid ""
+"Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt>"
+msgstr ""
+"Pedro de Oliveira'nın B<cas>(1) programına dayalıdır. B<wxcas> ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt> tarafından yazılmıştır"
+
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "XAS"
+msgstr "XAS"
+
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "xas v1.9"
+msgstr "xas v1.9"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:5
+msgid "xas - X-Chat aMule Statistics"
+msgstr "xas - X-Chat aMule İstatistikleri"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:7
+msgid "B<none>"
+msgstr "B<boş>"
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:12
+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 aMule's preferences."
+msgstr ""
+"B<xas> xchat için bir eklentidir. Yüklemek için xchat yardım belgelerine "
+"bakınız. Yüklendikten sonra /xas yazdığınızda istatistikleri bulunduğunuz "
+"kanala yollar. Bu bilgiler Çevrimiçi İmza dosyanızdan okunur. Bunun "
+"çalışması için aMule'ün ayarlarında \"Çevrim İçi İmza\" seçeneğini "
+"etkinleştirmeniz gerekmektedir."
+
+#. 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 "
+"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 "
+"çalıştırmanız yeterli olacaktır (--prefix=/usr ile kurduysanız /usr/bin "
+"dizininde bulunur)."
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:16
+msgid "B<xas> was originally written by niet"
+msgstr "B<xas> başlangıçta niet tarafından yazılmıştır"
+
+#~ msgid "January 2010"
+#~ msgstr "Ocak 2010"

aMule-2.3.1.tar.bz2/docs/man/po/manpages.pot Added

@@ -0,0 +1,1493 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-10-31 22:06+0100\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: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "AMULE"
+msgstr ""
+
+#. 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"
+msgstr ""
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule v2.3.1"
+msgstr ""
+
+#. type: TH
+#: amule.1:1
+#, no-wrap
+msgid "aMule"
+msgstr ""
+
+#. type: SH
+#: amule.1:4 amulecmd.1:5 amuled.1:4 amuleweb.1:4 ed2k.1:4 ../../src/utils/aLinkCreator/docs/alc.1:3 ../../src/utils/aLinkCreator/docs/alcc.1:4 ../../src/utils/cas/docs/cas.1:4 ../../src/utils/wxCas/docs/wxcas.1:3 ../../src/utils/xas/docs/xas.1:3
+#, no-wrap
+msgid "NAME"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:6
+msgid "amule - the all-platform eMule p2p client"
+msgstr ""
+
+#. type: SH
+#: amule.1:6 amulecmd.1:7 amuled.1:6 amulegui.1:6 amuleweb.1:6 ed2k.1:6 ../../src/utils/aLinkCreator/docs/alc.1:5 ../../src/utils/aLinkCreator/docs/alcc.1:6 ../../src/utils/cas/docs/cas.1:6 ../../src/utils/wxCas/docs/wxcas.1:5 ../../src/utils/xas/docs/xas.1:5
+#, no-wrap
+msgid "SYNOPSIS"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:10 amulegui.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-geometry> I<E<lt>geomE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:13 amuled.1:15
+msgid "[B<-w> I<E<lt>pathE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:17 amuled.1:19
+msgid "[B<-t> I<E<lt>numE<gt>>] [I<eD2k-link>]"
+msgstr ""
+
+#. type: SH
+#: amule.1:24 amulecmd.1:26 amuled.1:25 amulegui.1:20 amuleweb.1:41 ed2k.1:19 ../../src/utils/aLinkCreator/docs/alc.1:7 ../../src/utils/aLinkCreator/docs/alcc.1:14 ../../src/utils/cas/docs/cas.1:14 ../../src/utils/wxCas/docs/wxcas.1:7 ../../src/utils/xas/docs/xas.1:7
+#, no-wrap
+msgid "DESCRIPTION"
+msgstr ""
+
+#. type: TP
+#: amule.1:25 amuled.1:26 amulegui.1:24 ed2k.1:21 ../../src/utils/cas/docs/cas.1:26
+#, no-wrap
+msgid "B<[ -c> I<E<lt>pathE<gt>>, B<--config-dir>=I<E<lt>pathE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:28 amuled.1:29 amulegui.1:27 ed2k.1:24 ../../src/utils/cas/docs/cas.1:29
+msgid "Read config from I<E<lt>pathE<gt>> instead of home"
+msgstr ""
+
+#. type: TP
+#: amule.1:28 amulegui.1:27
+#, no-wrap
+msgid "B<[ -geometry >I<E<lt>geomE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:31 amulegui.1:30
+msgid ""
+"Sets the geometry of the app. I<E<lt>geomE<gt>> uses the same format as "
+"standard X11 "
+"apps:\t[B<=>][I<E<lt>widthE<gt>>{B<xX>}I<E<lt>heightE<gt>>][{B<+->}I<E<lt>xoffsetE<gt>>{B<+->}I<E<lt>yoffsetE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:34 amuled.1:42 amulegui.1:33
+msgid "Prints log messages to stdout."
+msgstr ""
+
+#. type: Plain text
+#: amule.1:37 amuled.1:45 amulegui.1:36
+msgid "Resets config to default values."
+msgstr ""
+
+#. type: TP
+#: amule.1:37 amuled.1:45
+#, no-wrap
+msgid "B<[ -w> I<E<lt>pathE<gt>>, B<--use-amuleweb>=I<E<lt>pathE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:40 amuled.1:48
+msgid "Specify location of amuleweb binary to I<E<lt>pathE<gt>>."
+msgstr ""
+
+#. type: Plain text
+#: amule.1:43 amuled.1:51
+msgid "Does not handle fatal exception."
+msgstr ""
+
+#. type: Plain text
+#: amule.1:46 amuled.1:54
+msgid "Does not disable stdin."
+msgstr ""
+
+#. type: TP
+#: amule.1:46 amuled.1:54 amulegui.1:39 ed2k.1:24
+#, no-wrap
+msgid "B<[ -t>, B<--category>=I<E<lt>numE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:49 amuled.1:57 amulegui.1:42 ed2k.1:27
+msgid "Set category for passed eD2k links to I<E<lt>numE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:52 amulecmd.1:66 amuled.1:60 amulegui.1:48 amuleweb.1:126 ed2k.1:39
+msgid "Displays the current version number."
+msgstr ""
+
+#. type: Plain text
+#: amule.1:55 amulecmd.1:69 amuled.1:63 amulegui.1:45 amuleweb.1:123 ed2k.1:36 ../../src/utils/aLinkCreator/docs/alcc.1:22 ../../src/utils/cas/docs/cas.1:32
+msgid "Prints a short usage description."
+msgstr ""
+
+#. type: TP
+#: amule.1:55 amuled.1:63 ed2k.1:39
+#, no-wrap
+msgid "B<[ eD2k-link ]>"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:58 amuled.1:66 ed2k.1:42
+msgid "Adds an eD2k-link to the core."
+msgstr ""
+
+#. type: Plain text
+#: amule.1:60 amulecmd.1:75 amuled.1:68 ed2k.1:44
+msgid "The eD2k link to be added can be:"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:63 amulecmd.1:78 amuled.1:71 ed2k.1:47
+msgid "a file link (ed2k://|file|...), it will be added to the download queue;"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:65 amulecmd.1:80 amuled.1:73 ed2k.1:49
+msgid "a server link (ed2k://|server|...), it will be added to the server list;"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:67 amuled.1:75 ed2k.1:51
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list;"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:69 amuled.1:77
+msgid "a magnet link."
+msgstr ""
+
+#. type: SH
+#: amule.1:70 amulecmd.1:207 amuleweb.1:132
+#, no-wrap
+msgid "NOTES"
+msgstr ""
+
+#. type: SS
+#: amule.1:71 amulecmd.1:208 amuleweb.1:133
+#, no-wrap
+msgid "Paths"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:75 amulecmd.1:212 amuleweb.1:137
+msgid ""
+"For all options which take a I<E<lt>pathE<gt>> value, if the I<path> "
+"contains no directory part (i.e. just a plain filename), then it is "
+"considered to be under the aMule configuration directory, I<~/.aMule>."
+msgstr ""
+
+#. type: SH
+#: amule.1:75 amulecmd.1:240 amuled.1:78 amuleweb.1:171 ed2k.1:60 ../../src/utils/cas/docs/cas.1:36
+#, no-wrap
+msgid "FILES"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:77 amuled.1:80
+msgid "~/.aMule/*"
+msgstr ""
+
+#. type: SH
+#: amule.1:77 amulecmd.1:256 amuled.1:80 amulegui.1:48 amuleweb.1:191 ed2k.1:62 ../../src/utils/aLinkCreator/docs/alc.1:11 ../../src/utils/aLinkCreator/docs/alcc.1:26 ../../src/utils/cas/docs/cas.1:42 ../../src/utils/wxCas/docs/wxcas.1:16 ../../src/utils/xas/docs/xas.1:16
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194 ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14 ../../src/utils/aLinkCreator/docs/alcc.1:29 ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19 ../../src/utils/xas/docs/xas.1:19
+msgid ""
+"Please report bugs either on our forum (I<http://forum.amule.org/>), or in "
+"our bugtracker (I<http://bugs.amule.org/>).  Please do not report bugs in "
+"e-mail, neither to our mailing list nor directly to any team member."
+msgstr ""
+
+#. type: SH
+#: amule.1:80 amulecmd.1:259 amuled.1:83 amulegui.1:51 amuleweb.1:194 ed2k.1:65 ../../src/utils/aLinkCreator/docs/alc.1:14 ../../src/utils/aLinkCreator/docs/alcc.1:29 ../../src/utils/cas/docs/cas.1:45 ../../src/utils/wxCas/docs/wxcas.1:19 ../../src/utils/xas/docs/xas.1:19
+#, no-wrap
+msgid "COPYRIGHT"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196 ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16 ../../src/utils/aLinkCreator/docs/alcc.1:31 ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21 ../../src/utils/xas/docs/xas.1:21
+msgid ""
+"aMule and all of its related utilities are distributed under the GNU General "
+"Public License."
+msgstr ""
+
+#. type: SH
+#: amule.1:82 amulecmd.1:261 amuled.1:85 amulegui.1:53 amuleweb.1:196 ed2k.1:67 ../../src/utils/aLinkCreator/docs/alc.1:16 ../../src/utils/aLinkCreator/docs/alcc.1:31 ../../src/utils/cas/docs/cas.1:47 ../../src/utils/wxCas/docs/wxcas.1:21 ../../src/utils/xas/docs/xas.1:21
+#, no-wrap
+msgid "SEE ALSO"
+msgstr ""
+
+#. type: SH
+#: amule.1:84 amulecmd.1:263 amuled.1:87 amulegui.1:55 amuleweb.1:198 ed2k.1:69 ../../src/utils/aLinkCreator/docs/alc.1:18 ../../src/utils/aLinkCreator/docs/alcc.1:33 ../../src/utils/cas/docs/cas.1:49 ../../src/utils/wxCas/docs/wxcas.1:23 ../../src/utils/xas/docs/xas.1:23
+#, no-wrap
+msgid "AUTHOR"
+msgstr ""
+
+#. type: Plain text
+#: amule.1:85 amulecmd.1:264 amuled.1:88 amuleweb.1:199 ed2k.1:70 ../../src/utils/aLinkCreator/docs/alc.1:19 ../../src/utils/aLinkCreator/docs/alcc.1:34 ../../src/utils/cas/docs/cas.1:50 ../../src/utils/wxCas/docs/wxcas.1:24 ../../src/utils/xas/docs/xas.1:24
+msgid "This manpage was written by Vollstrecker E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "AMULECMD"
+msgstr ""
+
+#. type: TH
+#: amulecmd.1:1
+#, no-wrap
+msgid "aMuleCmd v2.3.1"
+msgstr ""
+
+#. type: TH
+#: amulecmd.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 "aMule utilities"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:7
+msgid "amulecmd - Console-based program to control aMule"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:13 amuleweb.1:12
+msgid ""
+"[B<-h> I<E<lt>hostE<gt>>] [B<-p> I<E<lt>portE<gt>>] [B<-P> "
+"I<E<lt>passwordE<gt>>] [B<-f> I<E<lt>pathE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:17
+msgid ""
+"[B<-l> I<E<lt>langE<gt>>] {B< >[B<-w>]B< >|B< >[B<-c> "
+"I<E<lt>commandE<gt>>]B< >}"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:20 amuleweb.1:31
+msgid "[B<--create-config-from>=I<E<lt>pathE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:29
+msgid "B<amulecmd> is a console-based client to control aMule."
+msgstr ""
+
+#. type: TP
+#: amulecmd.1:29 amuleweb.1:46
+#, no-wrap
+msgid "B<[ -h> I<E<lt>hostE<gt>>, B<--host>=I<E<lt>hostE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:33 amuleweb.1:50
+msgid ""
+"Host where aMule is running (default: I<localhost>).  I<E<lt>hostE<gt>> "
+"might be an IP address or a DNS name"
+msgstr ""
+
+#. type: TP
+#: amulecmd.1:33 amuleweb.1:50
+#, no-wrap
+msgid "B<[ -p> I<E<lt>portE<gt>>, B<--port>=I<E<lt>portE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:36 amuleweb.1:53
+msgid ""
+"aMule's port for External Connections, as set in Preferences-E<gt>Remote "
+"Controls (default: I<4712>)"
+msgstr ""
+
+#. type: TP
+#: amulecmd.1:36 amuleweb.1:53
+#, no-wrap
+msgid "B<[ -P> I<E<lt>passwordE<gt>>, B<--password>=I<E<lt>passwordE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:39 amuleweb.1:56
+msgid "External Connections password."
+msgstr ""
+
+#. type: TP
+#: amulecmd.1:39 amuleweb.1:56
+#, no-wrap
+msgid "B<[ -f> I<E<lt>pathE<gt>>, B<--config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:43 amuleweb.1:60
+msgid ""
+"Use the given configuration file.  Default configuration file is "
+"I<~/.aMule/remote.conf>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:46 amuleweb.1:63
+msgid "Do not print any output to stdout."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:50 amuleweb.1:67
+msgid "Be verbose - show also debug messages."
+msgstr ""
+
+#. type: TP
+#: amulecmd.1:50 amuleweb.1:67
+#, no-wrap
+msgid "B<[ -l> I<E<lt>langE<gt>>, B<--locale>=I<E<lt>langE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:54 amuleweb.1:71
+msgid ""
+"Sets program locale (language).  See the B<NOTES> section for the "
+"description of the I<E<lt>langE<gt>> parameter."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:57 amuleweb.1:74
+msgid "Write command line options to config file and exit"
+msgstr ""
+
+#. type: TP
+#: amulecmd.1:57
+#, no-wrap
+msgid "B<[ -c> I<E<lt>commandE<gt>>, B<--command>=I<E<lt>commandE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:60
+msgid ""
+"Execute I<E<lt>commandE<gt>> as if it was entered at amulecmd's prompt and "
+"exit."
+msgstr ""
+
+#. type: TP
+#: amulecmd.1:60 amuleweb.1:117
+#, no-wrap
+msgid "B<[ --create-config-from>=I<E<lt>pathE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:63 amuleweb.1:120
+msgid ""
+"Create config file based upon I<E<lt>pathE<gt>>, which must point to a valid "
+"aMule config file, and then exit."
+msgstr ""
+
+#. type: SH
+#: amulecmd.1:69
+#, no-wrap
+msgid "COMMANDS"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:71
+msgid "All commands are case insensitive."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:71
+#, no-wrap
+msgid "Add I<E<lt>eD2k-linkE<gt>> | I<E<lt>magnet-linkE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:73
+msgid "Adds an eD2k-link or a magnet-link to the core."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:82
+msgid ""
+"a serverlist link, in which case all servers in the list will be added to "
+"the server list."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:85
+msgid "The magnet link must contain the eD2k hash and file length."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:85
+#, no-wrap
+msgid "Cancel I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:87
+msgid ""
+"Cancels the download specified by I<E<lt>hashE<gt>> or "
+"I<E<lt>numberE<gt>>. To get the value use B<show>."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:87
+#, no-wrap
+msgid "Connect [ I<kad> | I<ed2k> | I<E<lt>ip|nameE<gt>> ]"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:89
+msgid "Connect to the network."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:91
+msgid "This will connect to all networks that are enabled in Preferences."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:95
+msgid ""
+"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."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:98
+msgid ""
+"Disconnect from all networks you are connected to, or just disconnect from "
+"the specified network."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:98
+#, no-wrap
+msgid "Download I<E<lt>numberE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:100
+msgid "Start downloading a file."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:104
+msgid ""
+"The I<E<lt>numberE<gt>> of a file from the last search has to be given.  "
+"Example: `download 12' will start to download the file with the number 12 of "
+"the previous search."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:106
+msgid "Disconnect from amule/amuled and quit amulecmd."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:106
+#, no-wrap
+msgid "Get I<E<lt>whatE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:108
+msgid "Get and display a preference value."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:110 amulecmd.1:144 amulecmd.1:173 amulecmd.1:183
+msgid "Available values for I<E<lt>whatE<gt>>:"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:113
+msgid "Get bandwidth limits."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:115
+msgid "Get IPFilter preferences."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:116
+#, no-wrap
+msgid "Help [ I<E<lt>commandE<gt>> ]"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:120
+msgid ""
+"Prints a short usage description.  If called without parameter, it shows a "
+"list of available commands.  If called with I<E<lt>commandE<gt>>, it shows a "
+"short description of the given command."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:120
+#, no-wrap
+msgid "Pause I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:122
+msgid ""
+"Pauses the download specified by I<E<lt>hashE<gt>> or "
+"I<E<lt>numberE<gt>>. To get the value use B<show>."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:122
+#, no-wrap
+msgid "Priority I<E<lt>priorityE<gt>> I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:124
+msgid ""
+"Set priority of a download specified by I<E<lt>hashE<gt>> or "
+"I<E<lt>numberE<gt>>."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:126
+msgid "Available values for I<E<lt>priorityE<gt>>:"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:129
+msgid "Automatic priority."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:131
+msgid "High priority."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:133
+msgid "Low priority."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:135
+msgid "Normal priority."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:138
+msgid "Shows the progress of an on-going search."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:140
+msgid "A synonim of the B<exit> command."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:140
+#, no-wrap
+msgid "Reload I<E<lt>whatE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:142
+msgid "Reloads a given object."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:147
+msgid "Reload shared files list."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:149
+msgid "Reload IP filter tables."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:152
+msgid "Reset the log."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:154
+msgid "Shows you the results of the last search."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:154
+#, no-wrap
+msgid "Resume I<E<lt>hashE<gt>> | I<E<lt>numberE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:156
+msgid ""
+"Resumes the download specified by I<E<lt>hashE<gt>> or "
+"I<E<lt>numberE<gt>>. To get the value use B<show>."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:156
+#, no-wrap
+msgid "Search I<E<lt>typeE<gt>> I<E<lt>keywordE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:159
+msgid ""
+"Makes a search for the given I<E<lt>keywordE<gt>>. A search type and a "
+"keyword to search is mandatory to do this.  Example: `search kad amule' "
+"performs a kad search for `amule'."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:161
+msgid "Available search types:"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:164
+msgid "Performs a global search."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:166
+msgid "Performs a search on the Kademlia network."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:168
+msgid "Performs a local search."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:169
+#, no-wrap
+msgid "Set I<E<lt>whatE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:171
+msgid "Sets a given preferences value."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:176
+msgid "Set bandwidth limits."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:178
+msgid "Set IPFilter preferences."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:179
+#, no-wrap
+msgid "Show I<E<lt>whatE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:181
+msgid "Shows upload/download queue, servers list or shared files list."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:186
+msgid "Show download queue."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:188
+msgid "Show log."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:190
+msgid "Show servers list."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:192
+msgid "Show upload queue."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:196
+msgid ""
+"Shutdown the remote running core (amule/amuled).  This will also shut down "
+"the text client, since it is unusable without a running core."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:196
+#, no-wrap
+msgid "Statistics [ I<E<lt>numberE<gt>> ]"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:198
+msgid "Show statistics tree."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:202
+msgid ""
+"The optional I<E<lt>numberE<gt>> in the range of 0-255 can be passed as "
+"argument to this command, which tells how many entries of the client version "
+"subtree should be shown. Passing 0, or omitting it means `unlimited'."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:205
+msgid ""
+"Example: `statistics 5' will show only the top 5 versions for each client "
+"type."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:207
+msgid "Show connection status, current up/download speeds, etc."
+msgstr ""
+
+#. type: SS
+#: amulecmd.1:212 amuleweb.1:137
+#, no-wrap
+msgid "Languages"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:218 amuleweb.1:143
+msgid ""
+"The I<E<lt>langE<gt>> parameter for the B<-l> option has the following form: "
+"I<lang>[B<_>I<LANG>][B<.>I<encoding>][B<@>I<modifier>] where I<lang> is the "
+"primary language, I<LANG> is a sublanguage/territory, I<encoding> is the "
+"character set to use and I<modifier> allows the user to select a specific "
+"instance of localization data within a single category."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:220 amuleweb.1:145
+msgid "For example, the following strings are valid:"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:234 amuleweb.1:159
+msgid ""
+"Though all the above strings are accepted as valid language definitions, "
+"I<encoding> and I<modifier> are yet unused."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:237 amuleweb.1:162
+msgid ""
+"In addition to the format above, you can also specify full language names in "
+"English - so B<-l german> is also valid and is equal to B<-l de_DE>."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:240 amuleweb.1:165
+msgid ""
+"When no locale is defined, either on command-line or in config file, system "
+"default language will be used."
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:242 amuleweb.1:173
+msgid "~/.aMule/remote.conf"
+msgstr ""
+
+#. type: SH
+#: amulecmd.1:242 amuleweb.1:177
+#, no-wrap
+msgid "EXAMPLE"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:244
+msgid "Typically amulecmd will be first run as:"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:246
+msgid "B<amulecmd> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-w>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:248 amuleweb.1:183
+msgid "or"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:250
+msgid "B<amulecmd> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:252 amuleweb.1:187
+msgid ""
+"These will save settings to I<$HOME/.aMule/remote.conf>, and later you only "
+"need to type:"
+msgstr ""
+
+#. type: Plain text
+#: amulecmd.1:256
+msgid "Of course, you don't have to follow this example."
+msgstr ""
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "AMULED"
+msgstr ""
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon v2.3.1"
+msgstr ""
+
+#. type: TH
+#: amuled.1:1
+#, no-wrap
+msgid "aMule Daemon"
+msgstr ""
+
+#. type: Plain text
+#: amuled.1:6
+msgid "amuled - the all-platform eMule p2p client - daemonized version"
+msgstr ""
+
+#. type: Plain text
+#: amuled.1:9 ../../src/utils/cas/docs/cas.1:11
+msgid "[B<-c> I<E<lt>pathE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amuled.1:11
+msgid "[B<-p> I<E<lt>pathE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amuled.1:32
+msgid "Forks to background."
+msgstr ""
+
+#. type: TP
+#: amuled.1:32
+#, no-wrap
+msgid "B<[ -p> I<E<lt>pathE<gt>>, B<--pid-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amuled.1:36
+msgid ""
+"After fork, create a pid-file in the I<E<lt>pathE<gt>>.  I<E<lt>pathE<gt>> "
+"has to contain the filename."
+msgstr ""
+
+#. type: Plain text
+#: amuled.1:39
+msgid "Configure EC (External Connections)."
+msgstr ""
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "AMULEGUI"
+msgstr ""
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI v2.3.1"
+msgstr ""
+
+#. type: TH
+#: amulegui.1:1
+#, no-wrap
+msgid "aMuleGUI"
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1:6
+msgid "amulegui - aMule control program with GUI"
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1:14
+msgid "[B<-t> I<E<lt>numE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1:24
+msgid ""
+"B<amulegui> is a client program, and can be connected to amule or amuled via "
+"EC. You can manage your amule program with it. It provides almost the same "
+"functionalities as amule, even if the core works on another computer."
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1:39
+msgid "Skip connection dialog."
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1:57
+msgid ""
+"This manpage was written by Julien Delange for Debian E<lt>julien AT gunnm "
+"DOT orgE<gt>"
+msgstr ""
+
+#. type: Plain text
+#: amulegui.1:58
+msgid ""
+"This manpage was rewritten by Vollstrecker "
+"E<lt>amule@vollstreckernet.deE<gt>"
+msgstr ""
+
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "AMULEWEB"
+msgstr ""
+
+#. type: TH
+#: amuleweb.1:1
+#, no-wrap
+msgid "aMule webserver v2.3.1"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:6
+msgid "amuleweb - aMule web server"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:15
+msgid "[B<-l> I<E<lt>langE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:18
+msgid "[B<-t> I<E<lt>nameE<gt>>] [B<-s> I<E<lt>portE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:20
+msgid "[B<-U> I<E<lt>portE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:24
+msgid "[B<-A> I<E<lt>passwordE<gt>>] [B<-G> I<E<lt>passwordE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:40
+msgid "[B<--amule-config-file>=I<E<lt>pathE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:46
+msgid ""
+"B<amuleweb> manages your access to amule through a web browser.  You can "
+"start amuleweb together with B<amule>(1), or separately, any time later.  "
+"Options can be specified via command-line or via config-file.  Command-line "
+"options take precedence over config-file options."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1:74
+#, no-wrap
+msgid "B<[ -t> I<E<lt>nameE<gt>>, B<--template>=I<E<lt>nameE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:77
+msgid ""
+"Loads the template named I<E<lt>nameE<gt>>. See the B<SKIN SUPPORT> section "
+"for details."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1:77
+#, no-wrap
+msgid "B<[ -s> I<E<lt>portE<gt>>, B<--server-port>=I<E<lt>portE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:80
+msgid ""
+"Webserver's HTTP port. This is the port you must point your browser to "
+"(default: I<4711>)."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:84
+msgid "Enable UPnP."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1:84
+#, no-wrap
+msgid "B<[ -U> I<E<lt>portE<gt>>, B<--upnp-port> I<E<lt>portE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:87
+msgid "UPnP port."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:90
+msgid "Enables using gzip compression in HTTP traffic to save bandwidth."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:93
+msgid "Disables using gzip compression (this is the default)."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1:93
+#, no-wrap
+msgid "B<[ -A> I<E<lt>passwdE<gt>>, B<--admin-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:96
+msgid "Full access password for webserver."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1:96
+#, no-wrap
+msgid "B<[ -G> I<E<lt>passwdE<gt>>, B<--guest-pass>=I<E<lt>passwdE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:99
+msgid "Guest password for webserver."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:102
+msgid "Allows guest access."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:105
+msgid "Denies guest access (default)."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:111
+msgid ""
+"Load/save webserver settings from/to remote aMule.  This causes amuleweb to "
+"ignore command-line and config-file settings, and load them from aMule.  "
+"When saving preferences none will be written to the config file, but to "
+"aMule.  (Of course, this works only for those settings that can be set in "
+"aMule's Preferences-E<gt>Remote Controls.)"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:114
+msgid "Disable PHP interpreter (deprecated)"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:117
+msgid "Recompiles PHP pages on each request."
+msgstr ""
+
+#. type: TP
+#: amuleweb.1:126
+#, no-wrap
+msgid "B<[ --amule-config-file>=I<E<lt>pathE<gt>> B<]>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:132
+msgid ""
+"aMule config file path.  B<DO NOT USE DIRECTLY!> aMule uses this option when "
+"starting amuleweb at aMule startup.  This option causes all other "
+"command-line and config-file settings to be ignored, preferences to be read "
+"from the given config file, and also implies the B<-q -L> options."
+msgstr ""
+
+#. type: SH
+#: amuleweb.1:165
+#, no-wrap
+msgid "SKIN SUPPORT"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:169
+msgid ""
+"B<amuleweb> is capable of displaying information in different skins.  These "
+"skins are called templates, and you can make amuleweb load a specific "
+"template via the B<-t> command line option.  Templates are searched in two "
+"places: first in I<~/.aMule/webserver/> and then in "
+"I</usr/share/amule/webserver/> if you installed with --prefix=/usr."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:171
+msgid ""
+"Each template must be in a subdirectory of the template name, and this "
+"directory must contain all files the template needs."
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:175
+msgid "~/.aMule/webserver/"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:177
+msgid "I<$(pkgdatadir)>/webserver/"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:179
+msgid "Typically amuleweb will be first run as:"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:181
+msgid ""
+"B<amuleweb> B<-h> I<hostname> B<-p> I<ECport> B<-P> I<ECpassword> B<-s> "
+"I<HTTPport> B<-A> I<AdminPassword> B<-w>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:185
+msgid "B<amuleweb> B<--create-config-from>=I</home/username/.aMule/amule.conf>"
+msgstr ""
+
+#. type: Plain text
+#: amuleweb.1:191
+msgid ""
+"Of course, you may specify any more or less options on the first example "
+"line, and you may also totally omit it."
+msgstr ""
+
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "ED2K"
+msgstr ""
+
+#. type: TH
+#: ed2k.1:1
+#, no-wrap
+msgid "aMule eD2k link parser v1.5.1"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1:6
+msgid "ed2k - aMule eD2k link parser"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1:10
+msgid "[B<-c> I<E<lt>pathE<gt>>] [B<-t> I<E<lt>numE<gt>>]"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1:13
+msgid "I<E<lt>eD2k-linkE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1:21
+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 ""
+
+#. type: Plain text
+#: ed2k.1:30
+msgid "Loads all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1:33
+msgid "Lists all link found in the emulecollection given as I<E<lt>ed2k-linkE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1:53
+msgid "a magnet link;"
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1:55
+msgid "an emulecollection file."
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1:60
+msgid ""
+"B<The order in which you give the parameters is important.> You can give "
+"more than one link, and every link can have it's own params.  For example "
+"B<ed2k E<lt>link1E<gt> -t2 E<lt>link2E<gt>> will download I<E<lt>link1E<gt>> "
+"in standard category and I<E<lt>link2E<gt>> in category 2."
+msgstr ""
+
+#. type: Plain text
+#: ed2k.1:62
+msgid "~/.aMule/ED2KLinks"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "ALC"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alc.1:1
+#, no-wrap
+msgid "aLinkCreator"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:5
+msgid "aLinkCreator - the aMule eD2k link creator"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:9
+msgid ""
+"B<alc> is a graphical utility to create an eD2k link to any file on your "
+"computer."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alc.1:11 ../../src/utils/wxCas/docs/wxcas.1:16
+msgid "This app doesn't take any arguments."
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "ALCC"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/aLinkCreator/docs/alcc.1:1
+#, no-wrap
+msgid "aMule eD2k links calculator"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:6
+msgid "alcc - text based eD2k links calculator for aMule"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:11
+msgid "I<E<lt>inputfiles_listE<gt>>"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:16
+msgid ""
+"Compute the eD2k links of all the input files given in the "
+"I<E<lt>inputfiles_listE<gt>> (There can be one or more files)."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:19
+msgid "Compute and add part hashes to the computed eD2k links."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/aLinkCreator/docs/alcc.1:26
+msgid "Be verbose - show also calculation steps."
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "CAS"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/cas/docs/cas.1:1
+#, no-wrap
+msgid "cas v0.8"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:6
+msgid "cas - c aMule statistics"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:18
+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 ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:22
+msgid ""
+"Writes the online signature picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:26
+msgid ""
+"HTML page with stats and picture.  You can optionally append "
+"I<=E<lt>PATHE<gt>> to this option, to specify the location it should be "
+"written to."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:34
+msgid "Without any options, it prints online signature data to stdout."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:36
+msgid "B<cas> was written by Pedro de Oliveira E<lt>falso@rdk.homeip.netE<gt>"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:38
+msgid "~/.aMule/casrc"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:40
+msgid "stat.png"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/cas/docs/cas.1:42
+msgid "tmp.html"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "WXCAS"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/wxCas/docs/wxcas.1:1
+#, no-wrap
+msgid "wxCas"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:5
+msgid "wxcas - wx c aMule statistics"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:11
+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 ""
+
+#. type: Plain text
+#: ../../src/utils/wxCas/docs/wxcas.1:14
+msgid ""
+"Based on Pedro de Oliveira's B<cas>(1).  B<wxcas> was written by ThePolish "
+"E<lt>thepolish@vipmail.ruE<gt>"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "XAS"
+msgstr ""
+
+#. type: TH
+#: ../../src/utils/xas/docs/xas.1:1
+#, no-wrap
+msgid "xas v1.9"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:5
+msgid "xas - X-Chat aMule Statistics"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:7
+msgid "B<none>"
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:12
+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 aMule's "
+"preferences."
+msgstr ""
+
+#. 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 "
+"script (in /usr/bin if you installed with --prefix=/usr)."
+msgstr ""
+
+#. type: Plain text
+#: ../../src/utils/xas/docs/xas.1:16
+msgid "B<xas> was originally written by niet"
+msgstr ""

aMule-2.3.1.tar.bz2/docs/man/po4a.config Added

@@ -0,0 +1,15 @@
+[po4a_langs] de es fr hu it ru tr
+[po4a_paths] po/manpages.pot $lang:po/manpages-$lang.po
+[options] --master-charset UTF-8 --localized-charset UTF-8 --addendum-charset UTF-8
+[po4a_alias:man] man opt:"-o untranslated=als,B_untranslated,RB_untranslated,IP,SS_untranslated"
+[type: man] amule.1 $lang:amule.$lang.1 add_$lang:po/manpages-$lang.add
+[type: man] amulecmd.1 $lang:amulecmd.$lang.1 add_$lang:po/manpages-$lang.add
+[type: man] amuled.1 $lang:amuled.$lang.1 add_$lang:po/manpages-$lang.add
+[type: man] amulegui.1 $lang:amulegui.$lang.1 add_$lang:po/manpages-$lang.add
+[type: man] amuleweb.1 $lang:amuleweb.$lang.1 add_$lang:po/manpages-$lang.add
+[type: man] ed2k.1 $lang:ed2k.$lang.1 add_$lang:po/manpages-$lang.add
+[type: man] ../../src/utils/aLinkCreator/docs/alc.1 $lang:../../src/utils/aLinkCreator/docs/alc.$lang.1 add_$lang:po/manpages-$lang.add
+[type: man] ../../src/utils/aLinkCreator/docs/alcc.1 $lang:../../src/utils/aLinkCreator/docs/alcc.$lang.1 add_$lang:po/manpages-$lang.add
+[type: man] ../../src/utils/cas/docs/cas.1 $lang:../../src/utils/cas/docs/cas.$lang.1 add_$lang:po/manpages-$lang.add
+[type: man] ../../src/utils/wxCas/docs/wxcas.1 $lang:../../src/utils/wxCas/docs/wxcas.$lang.1 add_$lang:po/manpages-$lang.add
+[type: man] ../../src/utils/xas/docs/xas.1 $lang:../../src/utils/xas/docs/xas.$lang.1 add_$lang:po/manpages-$lang.add

aMule-2.2.6.tar.bz2/install-sh -> aMule-2.3.1.tar.bz2/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2005-05-14.22
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,38 +39,68 @@
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
+# from scratch.
+
+nl='
+'
+IFS=" ""	$nl"
 
 # set DOITPROG to echo to test this script
 
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
+doit=${DOITPROG-}
+if test -z "$doit"; then
+  doit_exec=exec
+else
+  doit_exec=$doit
+fi
 
-# put in absolute paths if you don't have them in your path; or use env. vars.
+# Put in absolute file names if you don't have them in your path;
+# or use environment vars.
+
+chgrpprog=${CHGRPPROG-chgrp}
+chmodprog=${CHMODPROG-chmod}
+chownprog=${CHOWNPROG-chown}
+cmpprog=${CMPPROG-cmp}
+cpprog=${CPPROG-cp}
+mkdirprog=${MKDIRPROG-mkdir}
+mvprog=${MVPROG-mv}
+rmprog=${RMPROG-rm}
+stripprog=${STRIPPROG-strip}
+
+posix_glob='?'
+initialize_posix_glob='
+  test "$posix_glob" != "?" || {
+    if (set -f) 2>/dev/null; then
+      posix_glob=
+    else
+      posix_glob=:
+    fi
+  }
+'
 
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
+posix_mkdir=
+
+# Desired mode of installed file.
+mode=0755
 
-chmodcmd="$chmodprog 0755"
-chowncmd=
 chgrpcmd=
-stripcmd=
+chmodcmd=$chmodprog
+chowncmd=
+mvcmd=$mvprog
 rmcmd="$rmprog -f"
-mvcmd="$mvprog"
+stripcmd=
+
 src=
 dst=
 dir_arg=
-dstarg=
+dst_arg=
+
+copy_on_change=false
 no_target_directory=
 
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+usage="\
+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
    or: $0 [OPTION]... SRCFILES... DIRECTORY
    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
    or: $0 [OPTION]... -d DIRECTORIES...
@@ -80,81 +110,86 @@
 In the 4th, create DIRECTORIES.
 
 Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
+     --help     display this help and exit.
+     --version  display version info and exit.
+
+  -c            (ignored)
+  -C            install only if different (preserve the last data modification time)
+  -d            create directories instead of installing files.
+  -g GROUP      $chgrpprog installed files to GROUP.
+  -m MODE       $chmodprog installed files to MODE.
+  -o USER       $chownprog installed files to USER.
+  -s            $stripprog installed files.
+  -t DIRECTORY  install into DIRECTORY.
+  -T            report an error if DSTFILE is a directory.
 
 Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+  RMPROG STRIPPROG
 "
 
-while test -n "$1"; do
+while test $# -ne 0; do
   case $1 in
-    -c) shift
-        continue;;
+    -c) ;;
+
+    -C) copy_on_change=true;;
 
-    -d) dir_arg=true
-        shift
-        continue;;
+    -d) dir_arg=true;;
 
     -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
     --help) echo "$usage"; exit $?;;
 
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
+    -m) mode=$2
+	case $mode in
+	  *' '* | *'	'* | *'
+'*	  | *'*'* | *'?'* | *'['*)
+	    echo "$0: invalid mode: $mode" >&2
+	    exit 1;;
+	esac
+	shift;;
 
     -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
+	shift;;
 
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
+    -s) stripcmd=$stripprog;;
 
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
+    -t) dst_arg=$2
+	shift;;
 
-    -T) no_target_directory=true
-	shift
-	continue;;
+    -T) no_target_directory=true;;
 
     --version) echo "$0 $scriptversion"; exit $?;;
 
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
+    --)	shift
 	break;;
+
+    -*)	echo "$0: invalid option: $1" >&2
+	exit 1;;
+
+    *)  break;;
   esac
+  shift
 done
 
-if test -z "$1"; then
+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
+  # When -d is used, all remaining arguments are directories to create.
+  # When -t is used, the destination is already specified.
+  # Otherwise, the last argument is the destination.  Remove it from $@.
+  for arg
+  do
+    if test -n "$dst_arg"; then
+      # $@ is not empty: it contains at least $arg.
+      set fnord "$@" "$dst_arg"
+      shift # fnord
+    fi
+    shift # arg
+    dst_arg=$arg
+  done
+fi
+
+if test $# -eq 0; then
   if test -z "$dir_arg"; then
     echo "$0: no input file specified." >&2
     exit 1
@@ -164,24 +199,47 @@
   exit 0
 fi
 
+if test -z "$dir_arg"; then
+  trap '(exit $?); exit' 1 2 13 15
+
+  # Set umask so as not to create temps with too-generous modes.
+  # However, 'strip' requires both read and write access to temps.
+  case $mode in
+    # Optimize common cases.
+    *644) cp_umask=133;;
+    *755) cp_umask=22;;
+
+    *[0-7])
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw='% 200'
+      fi
+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
+    *)
+      if test -z "$stripcmd"; then
+	u_plus_rw=
+      else
+	u_plus_rw=,u+rw
+      fi
+      cp_umask=$mode$u_plus_rw;;
+  esac
+fi
+
 for src
 do
   # Protect names starting with `-'.
   case $src in
-    -*) src=./$src ;;
+    -*) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
     dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
+    dstdir=$dst
+    test -d "$dstdir"
+    dstdir_status=$?
   else
+
     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
     # might cause directories to be created, which would be especially bad
     # if $src (and thus $dsttmp) contains '*'.
@@ -190,71 +248,199 @@
       exit 1
     fi
 
-    if test -z "$dstarg"; then
+    if test -z "$dst_arg"; then
       echo "$0: no destination specified." >&2
       exit 1
     fi
 
-    dst=$dstarg
+    dst=$dst_arg
     # Protect names starting with `-'.
     case $dst in
-      -*) dst=./$dst ;;
+      -*) dst=./$dst;;
     esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
     if test -d "$dst"; then
       if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
+	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
       fi
-      dst=$dst/`basename "$src"`
+      dstdir=$dst
+      dst=$dstdir/`basename "$src"`
+      dstdir_status=0
+    else
+      # Prefer dirname, but fall back on a substitute if dirname fails.
+      dstdir=`
+	(dirname "$dst") 2>/dev/null ||
+	expr X"$dst" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \
+	     X"$dst" : 'X$//$[^/]' \| \
+	     X"$dst" : 'X$//$$' \| \
+	     X"$dst" : 'X$/$' \| . 2>/dev/null ||
+	echo X"$dst" |
+	    sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{
+		   s//\1/
+		   q
+		 }
+		 /^X$\/\/$[^/].*/{
+		   s//\1/
+		   q
+		 }
+		 /^X$\/\/$$/{
+		   s//\1/
+		   q
+		 }
+		 /^X$\/$.*/{
+		   s//\1/
+		   q
+		 }
+		 s/.*/./; q'
+      `
+
+      test -d "$dstdir"
+      dstdir_status=$?
     fi
   fi
 
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+  obsolete_mkdir_used=false
+
+  if test $dstdir_status != 0; then
+    case $posix_mkdir in
+      '')
+	# Create intermediate dirs using mode 755 as modified by the umask.
+	# This is like FreeBSD 'install' as of 1997-10-28.
+	umask=`umask`
+	case $stripcmd.$umask in
+	  # Optimize common cases.
+	  *[2367][2367]) mkdir_umask=$umask;;
+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+	  *[0-7])
+	    mkdir_umask=`expr $umask + 22 \
+	      - $umask % 100 % 40 + $umask % 20 \
+	      - $umask % 10 % 4 + $umask % 2
+	    `;;
+	  *) mkdir_umask=$umask,go-w;;
+	esac
+
+	# With -d, create the new directory with the user-specified mode.
+	# Otherwise, rely on $mkdir_umask.
+	if test -n "$dir_arg"; then
+	  mkdir_mode=-m$mode
+	else
+	  mkdir_mode=
+	fi
+
+	posix_mkdir=false
+	case $umask in
+	  *[123567][0-7][0-7])
+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+	    ;;
+	  *)
+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+	    if (umask $mkdir_umask &&
+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+	    then
+	      if test -z "$dir_arg" || {
+		   # Check for POSIX incompatibilities with -m.
+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+		   # other-writeable bit of parent directory when it shouldn't.
+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
+		   case $ls_ld_tmpdir in
+		     d????-?r-*) different_mode=700;;
+		     d????-?--*) different_mode=755;;
+		     *) false;;
+		   esac &&
+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+		   }
+		 }
+	      then posix_mkdir=:
+	      fi
+	      rmdir "$tmpdir/d" "$tmpdir"
+	    else
+	      # Remove any dirs left behind by ancient mkdir implementations.
+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+	    fi
+	    trap '' 0;;
+	esac;;
+    esac
 
-  # Make sure that the destination directory exists.
+    if
+      $posix_mkdir && (
+	umask $mkdir_umask &&
+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+      )
+    then :
+    else
 
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
+      # The umask is ridiculous, or mkdir does not conform to POSIX,
+      # or it failed possibly due to a race condition.  Create the
+      # directory the slow way, step by step, checking for races as we go.
 
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
+      case $dstdir in
+	/*) prefix='/';;
+	-*) prefix='./';;
+	*)  prefix='';;
+      esac
 
-    pathcomp=
+      eval "$initialize_posix_glob"
 
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
+      oIFS=$IFS
+      IFS=/
+      $posix_glob set -f
+      set fnord $dstdir
       shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
+      $posix_glob set +f
+      IFS=$oIFS
+
+      prefixes=
+
+      for d
+      do
+	test -z "$d" && continue
+
+	prefix=$prefix$d
+	if test -d "$prefix"; then
+	  prefixes=
+	else
+	  if $posix_mkdir; then
+	    (umask=$mkdir_umask &&
+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+	    # Don't fail if two instances are running concurrently.
+	    test -d "$prefix" || exit 1
+	  else
+	    case $prefix in
+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+	      *) qprefix=$prefix;;
+	    esac
+	    prefixes="$prefixes '$qprefix'"
+	  fi
+	fi
+	prefix=$prefix/
+      done
+
+      if test -n "$prefixes"; then
+	# Don't fail if two instances are running concurrently.
+	(umask $mkdir_umask &&
+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
+	  test -d "$dstdir" || exit 1
+	obsolete_mkdir_used=true
       fi
-      pathcomp=$pathcomp/
-    done
+    fi
   fi
 
   if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
   else
-    dstfile=`basename "$dst"`
 
     # Make a couple of temp file names in the proper directory.
     dsttmp=$dstdir/_inst.$$_
@@ -262,10 +448,9 @@
 
     # Trap to clean up those temp files at exit.
     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
 
     # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
 
     # and set any options; do chmod last to preserve setuid bits.
     #
@@ -273,51 +458,63 @@
     # ignore errors from any of these, just make sure not to ignore
     # errors from the above "$doit $cpprog $src $dsttmp" command.
     #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+    # If -C, don't bother to copy if it wouldn't change the file.
+    if $copy_on_change &&
+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
+
+       eval "$initialize_posix_glob" &&
+       $posix_glob set -f &&
+       set X $old && old=:$2:$4:$5:$6 &&
+       set X $new && new=:$2:$4:$5:$6 &&
+       $posix_glob set +f &&
+
+       test "$old" = "$new" &&
+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+    then
+      rm -f "$dsttmp"
+    else
+      # Rename the file to the real destination.
+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+      # The rename failed, perhaps because mv can't rename something else
+      # to itself, or perhaps because mv is so ancient that it does not
+      # support -f.
+      {
+	# Now remove or move aside any old file at destination location.
+	# We try this two ways since rm can't unlink itself on some
+	# systems and the destination file might be busy for other
+	# reasons.  In this case, the final cleanup might fail but the new
+	# file should still install successfully.
+	{
+	  test ! -f "$dst" ||
+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+	  } ||
+	  { echo "$0: cannot unlink or rename $dst" >&2
+	    (exit 1); exit 1
+	  }
+	} &&
+
+	# Now rename the file to the real destination.
+	$doit $mvcmd "$dsttmp" "$dst"
+      }
+    fi || exit 1
+
+    trap '' 0
+  fi
 done
 
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

aMule-2.2.6.tar.bz2/intl/Makefile.in -> aMule-2.3.1.tar.bz2/intl/Makefile.in Changed

aMule-2.2.6.tar.bz2/m4/GeoIP.m4 -> aMule-2.3.1.tar.bz2/m4/GeoIP.m4 Changed

@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # This file is part of the aMule Project.
 #
-# Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+# 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
@@ -30,11 +30,9 @@
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([MULE_CHECK_GEOIP],
 [
-	AC_ARG_ENABLE([geoip],
-		[AS_HELP_STRING([--enable-geoip], [compile with GeoIP IP2Country library])],
-		[ENABLE_IP2COUNTRY=$enableval], [ENABLE_IP2COUNTRY=no])
+	MULE_ARG_ENABLE([geoip], [no], [compile with GeoIP IP2Country library])
 
-	AS_IF([test ${ENABLE_IP2COUNTRY:-no} = yes], [
+	MULE_IF_ENABLED([geoip], [
 		AC_ARG_WITH([geoip-headers],
 			AS_HELP_STRING([--with-geoip-headers=DIR], [GeoIP include files location]),
 			[GEOIP_CPPFLAGS="-I$withval"])
@@ -86,18 +84,18 @@
 						], [
 							GEOIP_LIBS="-Wl,-Bstatic $GEOIP_LIBS -Wl,-Bdynamic"
 						], [
-							AC_MSG_WARN([Cannot link GeoIP statically, because your linker ($LD) does not support it.])
+							MULE_WARNING([Cannot link GeoIP statically, because your linker ($LD) does not support it.])
 						])
 						MULE_RESTORE([LIBS])
 					])
 				])
 			], [
-				ENABLE_IP2COUNTRY=disabled
-				AC_MSG_WARN([GeoIP support has been disabled because the GeoIP libraries were not found])
+				MULE_ENABLEVAR([geoip])=disabled
+				MULE_WARNING([GeoIP support has been disabled because the GeoIP libraries were not found])
 			], [${GEOIP_WINSOCK_LIB:-}])
 		], [
-			ENABLE_IP2COUNTRY=disabled
-			AC_MSG_WARN([GeoIP support has been disabled because the GeoIP header files were not found])
+			MULE_ENABLEVAR([geoip])=disabled
+			MULE_WARNING([GeoIP support has been disabled because the GeoIP header files were not found])
 		])
 
 		MULE_RESTORE([CPPFLAGS])

aMule-2.2.6.tar.bz2/m4/build-tools.m4 -> aMule-2.3.1.tar.bz2/m4/build-tools.m4 Changed

aMule-2.2.6.tar.bz2/m4/cryptopp.m4 -> aMule-2.3.1.tar.bz2/m4/cryptopp.m4 Changed

@@ -1,7 +1,7 @@
 #							-*- Autoconf -*-
 # This file is part of the aMule Project.
 #
-# Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+# 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
@@ -77,26 +77,27 @@
 	cryptopp_libdir="unknown"
 
 	AS_IF([test -n "$with_crypto_prefix"], [
+		CRYPTOPP_PREFIX="$with_crypto_prefix"
 		# Find the Cryptopp header in the user-provided location
-		MULE_IF([test -f $with_crypto_prefix/$cryptopp_file_with_version], [
+		MULE_IF([test -f $CRYPTOPP_PREFIX/$cryptopp_file_with_version], [
 			CRYPTOPP_STYLE="sources"
 			CRYPTOPP_LIB_NAME="cryptopp"
 			cryptopp_includedir=
-			CRYPTOPP_INCLUDE_PREFIX="$with_crypto_prefix"
+			CRYPTOPP_INCLUDE_PREFIX="$CRYPTOPP_PREFIX"
 			cryptopp_libdir=
-		], [test -f $with_crypto_prefix/include/cryptopp/$cryptopp_file_with_version], [
+		], [test -f $CRYPTOPP_PREFIX/include/cryptopp/$cryptopp_file_with_version], [
 			CRYPTOPP_STYLE="installed"
 			CRYPTOPP_LIB_NAME="cryptopp"
-			cryptopp_includedir="$with_crypto_prefix/include"
+			cryptopp_includedir="$CRYPTOPP_PREFIX/include"
 			CRYPTOPP_INCLUDE_PREFIX="$CRYPTOPP_LIB_NAME"
-			cryptopp_libdir="$with_crypto_prefix/lib"
-		], [test -f $with_crypto_prefix/include/crypto++/$cryptopp_file_with_version], [
+			cryptopp_libdir="$CRYPTOPP_PREFIX/lib"
+		], [test -f $CRYPTOPP_PREFIX/include/crypto++/$cryptopp_file_with_version], [
 			# Debian uses libcrypto++5.1 - it's not my fault, please soda patch the package
 			CRYPTOPP_STYLE="gentoo_debian"
 			CRYPTOPP_LIB_NAME="crypto++"
-			cryptopp_includedir="$with_crypto_prefix/include"
+			cryptopp_includedir="$CRYPTOPP_PREFIX/include"
 			CRYPTOPP_INCLUDE_PREFIX="$CRYPTOPP_LIB_NAME"
-			cryptopp_libdir="$with_crypto_prefix/lib"
+			cryptopp_libdir="$CRYPTOPP_PREFIX/lib"
 		])
 	], [
 		for CRYPTOPP_PREFIX in /usr /usr/local /opt /opt/local /usr/pkg /mingw ; do

aMule-2.2.6.tar.bz2/m4/fallocate.m4 -> aMule-2.3.1.tar.bz2/m4/fallocate.m4 Changed

aMule-2.2.6.tar.bz2/m4/gdlib.m4 -> aMule-2.3.1.tar.bz2/m4/gdlib.m4 Changed

@@ -1,7 +1,7 @@
 #							-*- Autoconf -*-
 # This file is part of the aMule Project.
 #
-# Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+# 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
@@ -83,14 +83,14 @@
 				GDLIB_VERSION=
 			])
 		], [
-		AC_MSG_RESULT([yes (version $GDLIB_VERSION)])
-                       GDLIB_CFLAGS="`$GDLIB_CONFIG_WITH_ARGS --cflags`"
-                       GDLIB_LDFLAGS="`$GDLIB_CONFIG_WITH_ARGS --ldflags`"
-                       GDLIB_LIBS="`$GDLIB_CONFIG_WITH_ARGS --libs`"
-                       MULE_BACKUP([CFLAGS])
-                       MULE_APPEND([CFLAGS], [$GDLIB_CFLAGS])
-                       AC_CHECK_HEADER([gd.h],, [GDLIB_VERSION=])
-                       MULE_RESTORE([CFLAGS])
+			AC_MSG_RESULT([yes (version $GDLIB_VERSION)])
+			GDLIB_CFLAGS="`$GDLIB_CONFIG_WITH_ARGS --cflags`"
+			GDLIB_LDFLAGS="`$GDLIB_CONFIG_WITH_ARGS --ldflags`"
+			GDLIB_LIBS="`$GDLIB_CONFIG_WITH_ARGS --libs`"
+			MULE_BACKUP([CFLAGS])
+			MULE_APPEND([CFLAGS], [$GDLIB_CFLAGS])
+			AC_CHECK_HEADER([gd.h],, [GDLIB_VERSION=])
+			MULE_RESTORE([CFLAGS])
 		])
 	])

aMule-2.3.1.tar.bz2/m4/kde.m4 Added

@@ -0,0 +1,187 @@
+AC_DEFUN([KDE_CONFIG_OPTIONS],
+[
+	AC_ARG_WITH(
+		[kde4-config],
+		[AS_HELP_STRING([--with-kde4-config=PATH],
+			[kde4-config script to use])],
+		[KDE4_CONFIG=$withval], [KDE4_CONFIG=""])
+	AC_ARG_ENABLE(
+		[kde-in-home],
+		[AS_HELP_STRING([--enable-kde-in-home],
+			[install KDE related stuff in your home dir])],
+		[KDE_IN_HOME=$enableval], [KDE_IN_HOME=no])
+])
+
+AC_DEFUN([KDE_CONFIG_CHECK],
+[
+	AS_IF([test -z ${KDE4_CONFIG}],
+	[
+		AC_PATH_PROG(KDE4_CONFIG, kde4-config)
+	],
+	[
+		AC_MSG_CHECKING(for kde4-config)
+		AS_IF([test ! -x KDE4_CONFIG],
+		[
+			KDE4_CONFIG="not found"
+			AC_MSG_RESULT(not found)
+			exit 1
+		])
+	])
+
+	AS_IF([ test "${KDE4_CONFIG}" != "not found"],
+	[
+		KDE_CONF_VER=`${KDE4_CONFIG} --version | grep KDE | sed -e 's/^.*: //' -e 's/ (.*$//'`
+		AS_IF([test `echo ${KDE_CONF_VER} | sed -e 's/\..*$//'` = 4],
+		[
+			AC_MSG_RESULT(found ${KDE4_CONFIG} with version ${KDE_CONF_VER})
+		],
+		[
+			AC_MSG_RESULT(at least version 4 required)
+			exit 1
+		])
+	],
+	[
+		AC_MSG_RESULT(not found)
+		exit 1
+	])
+	AC_SUBST(KDE4_CONFIG)
+])
+
+AC_DEFUN([KDE_HEADER_CHECK],
+[
+	AC_MSG_CHECKING(for kde4 headers)
+	[KDE_HEADER_DIR=`${KDE4_CONFIG} --path include`]
+
+	AS_IF([test -f ${KDE_HEADER_DIR}kdirwatch.h],
+	[
+		AS_IF([test -f ${KDE_HEADER_DIR}plasma/dataengine.h],
+		[
+			AC_MSG_RESULT(${KDE_HEADER_DIR})
+		],
+		[
+			AC_MSG_RESULT(dataengine.h not found)
+			exit 1
+		])
+	],
+	[
+		AC_MSG_RESULT(kdirwatch.h not found)
+		exit 1
+	])
+	AC_SUBST(KDE_HEADER_DIR)
+])
+
+AC_DEFUN([KDE_SERVICE_PATH_CHECK],
+[
+	AC_REQUIRE([AC_PROG_EGREP])
+	AC_MSG_CHECKING(for kde4 services Path)
+	AS_IF([test `echo ${prefix} | grep home | wc -l` == 1],
+	[
+		KDE_IN_HOME="yes"
+	])
+	AS_IF([test ${KDE_IN_HOME} = "yes"],
+	[
+		KDE_SERVICE_PATH=`${KDE4_CONFIG} --path services | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
+	],
+	[
+		KDE_SERVICE_PATH=`${KDE4_CONFIG} --path services | tr ":" "\n" | grep /usr | head -1`
+	])
+	AC_MSG_RESULT(${KDE_SERVICE_PATH})
+	AC_SUBST(KDE_SERVICE_PATH)
+])
+
+AC_DEFUN([KDE_MODULE_PATH_CHECK],
+[
+	AC_REQUIRE([AC_PROG_EGREP])
+	AC_MSG_CHECKING(for kde4 plugins Path)
+	AS_IF([test `echo ${prefix} | grep home | wc -l` == 1],
+	[
+		KDE_IN_HOME="yes"
+	])
+	AS_IF([test ${KDE_IN_HOME} = "yes"],
+	[
+		KDE_MODULE_PATH=`${KDE4_CONFIG} --path module | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
+	],
+	[
+		KDE_MODULE_PATH=`${KDE4_CONFIG} --path module | tr ":" "\n" | grep /usr | head -1`
+	])
+	AC_MSG_RESULT(${KDE_MODULE_PATH})
+	AC_SUBST(KDE_MODULE_PATH)
+])
+
+AC_DEFUN([KDE_ICON_PATH_CHECK],
+[
+	AC_REQUIRE([AC_PROG_EGREP])
+	AC_MSG_CHECKING(for kde4 icons Path)
+	AS_IF([test `echo ${prefix} | grep home | wc -l` == 1],
+	[
+		KDE_IN_HOME="yes"
+	])
+	AS_IF([test ${KDE_IN_HOME} = "yes"],
+	[
+		KDE_ICON_PATH=`${KDE4_CONFIG} --path icon | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
+	],
+	[
+		KDE_ICON_PATH=`${KDE4_CONFIG} --path icon | tr ":" "\n" | grep /usr | head -1`
+	])
+	KDE_ICON_PATH=${KDE_ICON_PATH}hicolor/scalable/mimetypes/
+	AC_MSG_RESULT(${KDE_ICON_PATH})
+	AC_SUBST(KDE_ICON_PATH)
+])
+
+AC_DEFUN([KDE_MIME_PATH_CHECK],
+[
+	AC_REQUIRE([AC_PROG_EGREP])
+	AC_MSG_CHECKING(for location for mime-type installation)
+	AS_IF([test `echo ${prefix} | grep home | wc -l` == 1],
+	[
+		KDE_IN_HOME="yes"
+	])
+	AS_IF([test ${KDE_IN_HOME} = "yes"],
+	[
+		KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
+	],
+	[
+		AS_IF([test -n ${prefix}],
+		[
+			KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | grep ${prefix} | head -1`
+			AS_IF([test -n ${KDE_MIME_PATH}],
+			[
+				KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | $EGREP -v '(/home|/root)' | head -1`
+			])
+		],
+		[
+			KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | $EGREP -v '(/home|/root)' | head -1`
+		])
+	])
+	AC_MSG_RESULT(${KDE_MIME_PATH})
+	AC_SUBST(KDE_MIME_PATH)
+])
+
+AC_DEFUN([KDE_APPLNK_PATH_CHECK],
+[
+	AC_REQUIRE([AC_PROG_EGREP])
+	AC_MSG_CHECKING(for kde4 applinks Path)
+	AS_IF([test `echo ${prefix} | grep home | wc -l` == 1],
+	[
+		KDE_IN_HOME="yes"
+	])
+	AS_IF([test ${KDE_IN_HOME} = "yes"],
+	[
+		KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
+	],
+	[
+		AS_IF([test -n ${prefix}],
+		[
+			KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | grep ${prefix} | head -1`
+			AS_IF([test -n ${KDE_APPLNK_PATH}],
+			[
+				KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | grep -vE '(/home|/root)' | head -1`
+			])
+		],
+		[
+			KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | grep -vE '(/home|/root)' | head -1`
+		])
+	])
+	AC_MSG_RESULT(${KDE_APPLNK_PATH})
+	AC_SUBST(KDE_APPLNK_PATH)
+])

aMule-2.2.6.tar.bz2/m4/libpng.m4 -> aMule-2.3.1.tar.bz2/m4/libpng.m4 Changed

@@ -1,7 +1,7 @@
 #							-*- Autoconf -*-
 # This file is part of the aMule Project.
 #
-# Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+# 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
@@ -88,59 +88,40 @@
 			LIBPNG_LDFLAGS=`$LIBPNG_CONFIG_WITH_ARGS --ldflags | sed -e "s/ *${LIBPNG_LIBS}$//"`
 			LIBPNG_CFLAGS=`$LIBPNG_CONFIG_WITH_ARGS --cflags`
 			AC_MSG_RESULT([yes (version $LIBPNG_VERSION)])
-		])
-	], [
-		# Try hard to find a usable libpng
-		# Some RedHat RPMs miss libpng-config, so test for
-		# the usability with default options.
-		AC_MSG_CHECKING([for libpng >= REQUIRED_VERSION])
-		MULE_BACKUP([LIBS])
-		MULE_PREPEND([LIBS], [-lpng -lz -lm])
-		AC_RUN_IFELSE([
-			AC_LANG_PROGRAM([[
-				#include <png.h>
-				#include <stdio.h>
-
-				/* Check linking to png library */
-				void dummy() {
-					png_check_sig(NULL, 0);
-				}
-			]], [dnl Don't use double-quoting here!
-				/* png.h defines PNG_LIBPNG_VER=xyyzz */
-				FILE *f=fopen("conftestval", "w");
-				if (!f) exit(1);
-				fprintf(f, "%s", (PNG_LIBPNG_VER >= REQUIRED_VERSION_MAJOR * 10000 + REQUIRED_VERSION_MINOR * 100 + REQUIRED_VERSION_MICRO) ? "yes" : "no");
-				fclose(f);
-				f=fopen("conftestver", "w");
-				if (!f) exit(0);
-				fprintf(f, "%s", PNG_LIBPNG_VER_STRING);
-				fclose(f);
-				exit(0);
-			])
-		], [
-			AS_IF([test -f conftestval], [result=`cat conftestval`], [result=no])
-			AS_IF([test ${result:-no} = yes], [
-				AS_IF([test -f conftestver], [
-					LIBPNG_VERSION=`cat conftestver`
-					lib_version=" (version $LIBPNG_VERSION)"
-				], [
-					lib_version=
-					LIBPNG_VERSION="detected"
-				])
-			])
-			AC_MSG_RESULT([$result$lib_version])
-			LIBPNG_LIBS="-lpng -lz -lm"
-		], [
-			result=no
-			AC_MSG_RESULT([$result])
-		], [
-			AC_MSG_RESULT([cross-compilation detected, checking only the header])
-			AC_CHECK_HEADER([png.h], [
-				LIBPNG_VERSION="detected"
-				LIBPNG_LIBS="-lpng -lz -lm"
+
+			AC_MSG_CHECKING([if libpng is usable])
+
+			SAVED_CFLAGS=$CFLAGS
+			SAVED_LDFLAGS=$LDFLAGS
+			SAVED_LIBS=$LIBS
+
+			CFLAGS+=" $LIBPNG_CFLAGS"
+			LDFLAGS+=" $LIBPNG_LDFLAGS"
+			LIBS+=" $LIBPNG_LIBS"
+
+			AC_LINK_IFELSE([
+				AC_LANG_PROGRAM([[
+					#include <png.h>
+					#include <stdio.h>
+				]], [[
+					png_uint_32 libpng_vn = png_access_version_number();
+					printf("\nlibpng version %i\n\n", libpng_vn);
+				]])
+			], [
+				AC_MSG_RESULT([yes])
+			],
+			[
+				AC_MSG_RESULT([no (failed to compile and link test program)])
+				LIBPNG_LIBS=
+				LIBPNG_LDFLAGS=
+				LIBPNG_CFLAGS=
+				LIBPNG_VERSION=
 			])
+
+			CFLAGS=$SAVED_CFLAGS
+			LDFLAGS=$SAVED_LDFLAGS
+			LIBS=$SAVED_LIBS
 		])
-		MULE_RESTORE([LIBS])
 	])
 
 	AS_IF([test -n "$LIBPNG_VERSION"], [$2], [$3])

aMule-2.2.6.tar.bz2/m4/libupnp.m4 -> aMule-2.3.1.tar.bz2/m4/libupnp.m4 Changed

@@ -2,7 +2,7 @@
 # This file is part of the aMule project.
 # This file is part of the libupnp library project.
 #
-# Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+# Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 #
 # 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
@@ -52,12 +52,12 @@
 		[export PKG_CONFIG_PATH=$withval/lib/pkgconfig])
 
 dnl	Check for libupnp >= MIN_LIBUPNP_VERSION
-	AS_IF([test $cross_compiling = no], [dnl
+	AS_IF([test $cross_compiling = no], [
 		AC_MSG_CHECKING([for libupnp version >= MIN_LIBUPNP_VERSION])
-		AS_IF([test -n "$PKG_CONFIG"], [dnl
-			AS_IF([$PKG_CONFIG libupnp --exists], [dnl
+		AS_IF([test -n "$PKG_CONFIG"], [
+			AS_IF([$PKG_CONFIG libupnp --exists], [
 				LIBUPNP_VERSION=`$PKG_CONFIG libupnp --modversion`
-				AS_IF([$PKG_CONFIG libupnp --atleast-version=MIN_LIBUPNP_VERSION], [dnl
+				AS_IF([$PKG_CONFIG libupnp --atleast-version=MIN_LIBUPNP_VERSION], [
 					result=yes
 					resultstr=" (version $LIBUPNP_VERSION)"
 					LIBUPNP_CPPFLAGS=`$PKG_CONFIG libupnp --cflags-only-I`
@@ -65,25 +65,25 @@
 					LIBUPNP_LDFLAGS=`$PKG_CONFIG libupnp --libs-only-L`
 					LIBUPNP_LIBS=`$PKG_CONFIG libupnp --libs-only-other`
 					LIBUPNP_LIBS="$LIBUPNP_LIBS `$PKG_CONFIG libupnp --libs-only-l`"
-				], [dnl
+				], [
 					result=no
 					resultstr=" (version $LIBUPNP_VERSION is not new enough)"
-				])dnl
-			], [dnl
+				])
+			], [
 				result=no
 				resultstr=" (try to use --with-libupnp-prefix=PREFIX)"
-			])dnl
-		], [dnl
+			])
+		], [
 			result=no
 			resultstr=" (pkg-config not found)"
-		])dnl
+		])
 		AC_MSG_RESULT([$result$resultstr])
 		libupnp_error="libupnp >= MIN_LIBUPNP_VERSION not found$resultstr"
-	], [dnl
+	], [
 dnl Currently cross-compilation with libupnp is not supported.
 		result=no
 		libupnp_error="cross compiling"
-	])dnl
+	])
 
 dnl	Execute the right action.
 	AS_IF([test ${result:-no} = yes], [$2], [$3])

aMule-2.2.6.tar.bz2/m4/nls.m4 -> aMule-2.3.1.tar.bz2/m4/nls.m4 Changed

@@ -1,7 +1,7 @@
 #							-*- Autoconf -*-
 # This file is part of the aMule Project.
 #
-# Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+# 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
@@ -45,7 +45,7 @@
 dnl
 dnl This function will generate the list of manpages to be installed.
 dnl
-dnl TESTNAME is the name of a variable that'll evaluate to yes if this
+dnl TESTNAME is the name of a FEATURE selected by MULE_ARG_ENABLE() if this
 dnl set of manpages need installing. The list of files will be returned in
 dnl the TESTNAME_MANPAGES variable.
 dnl
@@ -53,18 +53,20 @@
 dnl to the package root (top_srcdir)
 dnl ---------------------------------------------------------------------------
 AC_DEFUN([GENERATE_MANS_TO_INSTALL],
-[
-	AS_IF([test "$[]$1" = "yes"], [
+[m4_define([MANPAGES], [m4_translit([$1], [a-z-], [A-Z_])[]_MANPAGES])dnl
+
+	MULE_IF_ENABLED([$1], [
 		AS_IF([test -z "$LINGUAS"],
-			[$1_MANPAGES=`ls -1 ${srcdir}/$2.* | sed -e 's:.*/::g'`],
+			[MANPAGES=`ls -1 ${srcdir}/$2.* | sed -e 's:.*/::g'`],
 		[
-			$1_MANPAGES=`ls -1 ${srcdir}/$2.* | sed -e 's:.*/::g' | grep $Generate_Langs `
-			$1_MANPAGES="`basename $2.1` $[]$1_MANPAGES"
+			MANPAGES=`ls -1 ${srcdir}/$2.* | sed -e 's:.*/::g' | grep $Generate_Langs`
+			MANPAGES="`basename $2.1` $[]MANPAGES"
 		])
-		$1_MANPAGES=`echo $[]$1_MANPAGES | tr -d '\n'`
-	], [$1_MANPAGES=])
+		MANPAGES=`echo $[]MANPAGES | tr -d '\n'`
+	], [MANPAGES=])
 
-AC_SUBST([$1_MANPAGES])dnl
+AC_SUBST(MANPAGES)dnl
+m4_undefine([MANPAGES])dnl
 ])
 
 
@@ -78,27 +80,27 @@
 	AC_ARG_WITH([language],
 		[AS_HELP_STRING([--with-language=<langs>],
 			[Specify a comma-separated list of languages you want to have installed. See po/LINGUAS for available languages])],
-		[AS_IF([test "$withval" = "all"], [LINGUAS='%UNSET%'], [LINGUAS="`echo $withval | sed -e 's/,/ /g'`"])])
+		[AS_IF([test "$withval" != "all"], [LINGUAS="`echo $withval | sed -e 's/,/ /g'`"])])
 
 	AM_GNU_GETTEXT([no-libtool], [need-ngettext])
 	AS_IF([test $USE_INCLUDED_LIBINTL = yes], [INCINTL=-I\${top_builddir}/intl])
 
 	AS_IF([test x$USE_NLS = xyes], [MULE_CHECK_AUTOPOINT(, [USE_NLS=no])])
-	AS_IF([test x$USE_NLS = xno -a x${enable_nls:-yes} = xyes], [AC_MSG_WARN([You need to install GNU gettext/gettext-tools to compile aMule with i18n support.])])
+	AS_IF([test x$USE_NLS = xno -a x${enable_nls:-yes} = xyes], [MULE_WARNING([You need to install GNU gettext/gettext-tools to compile aMule with i18n support.])])
 
 	AS_IF([test ${USE_NLS:-no} = yes], [
 		AC_MSG_CHECKING([for requested languages])
 		Generate_Langs=`echo $LINGUAS | $AWK ['OFS="\\\\|" { for (i = 1; i <= NF; ++i) $i = "\\\\." $i; print }']`
-		GENERATE_MANS_TO_INSTALL([AMULE_DAEMON], [docs/man/amuled])
-		GENERATE_MANS_TO_INSTALL([AMULECMD], [docs/man/amulecmd])
-		GENERATE_MANS_TO_INSTALL([WEB], [docs/man/amuleweb])
-		GENERATE_MANS_TO_INSTALL([AMULE_GUI], [docs/man/amulegui])
-		GENERATE_MANS_TO_INSTALL([CAS], [src/utils/cas/docs/cas])
-		GENERATE_MANS_TO_INSTALL([WXCAS], [src/utils/wxCas/docs/wxcas])
-		GENERATE_MANS_TO_INSTALL([ED2K], [docs/man/ed2k])
-		GENERATE_MANS_TO_INSTALL([ALC], [src/utils/aLinkCreator/docs/alc])
-		GENERATE_MANS_TO_INSTALL([ALCC], [src/utils/aLinkCreator/docs/alcc])
-		GENERATE_MANS_TO_INSTALL([MONOLITHIC], [docs/man/amule])
+		GENERATE_MANS_TO_INSTALL([amule-daemon], [docs/man/amuled])
+		GENERATE_MANS_TO_INSTALL([amulecmd], [docs/man/amulecmd])
+		GENERATE_MANS_TO_INSTALL([webserver], [docs/man/amuleweb])
+		GENERATE_MANS_TO_INSTALL([amule-gui], [docs/man/amulegui])
+		GENERATE_MANS_TO_INSTALL([cas], [src/utils/cas/docs/cas])
+		GENERATE_MANS_TO_INSTALL([wxcas], [src/utils/wxCas/docs/wxcas])
+		GENERATE_MANS_TO_INSTALL([ed2k], [docs/man/ed2k])
+		GENERATE_MANS_TO_INSTALL([alc], [src/utils/aLinkCreator/docs/alc])
+		GENERATE_MANS_TO_INSTALL([alcc], [src/utils/aLinkCreator/docs/alcc])
+		GENERATE_MANS_TO_INSTALL([monolithic], [docs/man/amule])
 		AC_MSG_RESULT([${LINGUAS:-all}])
 	])

aMule-2.2.6.tar.bz2/m4/pkg.m4 -> aMule-2.3.1.tar.bz2/m4/pkg.m4 Changed

aMule-2.3.1.tar.bz2/m4/plasmamule.m4 Added

@@ -0,0 +1,45 @@
+m4_define([DISABLE_PLASMAMULE], [MULE_ENABLEVAR([plasmamule])=disabled])
+
+AC_DEFUN([PLASMAMULE_CHECKS],
+[
+	CHECK_MOC_VERSION
+	AS_IF([test "${QT_MOC}" = "not found"], [DISABLE_PLASMAMULE])
+
+	MULE_IF_ENABLED([plasmamule],
+	[
+		CHECK_QT_HEADERS
+		AS_IF([test -z "${QT_CORE_CXXFLAGS}"], [DISABLE_PLASMAMULE])
+	])
+
+	MULE_IF_ENABLED([plasmamule],
+	[
+		KDE_CONFIG_CHECK
+		AS_IF([test "${KDE4_CONFIG}" = "not found"], [DISABLE_PLASMAMULE])
+	])
+
+	MULE_IF_ENABLED([plasmamule],
+	[
+		KDE_HEADER_CHECK
+		AS_IF([test -z ${KDE_HEADER_DIR}], [DISABLE_PLASMAMULE])
+	])
+
+	MULE_IF_ENABLED([plasmamule],
+	[
+		AS_IF([test -e `$BUILD_CC -print-file-name=libplasma.so` &&
+			test -e `$BUILD_CC -print-file-name=libkdecore.so`],
+			[
+				KDE_APPLNK_PATH_CHECK
+				KDE_SERVICE_PATH_CHECK
+				KDE_MODULE_PATH_CHECK
+				KDE_ICON_PATH_CHECK
+				KDE_MIME_PATH_CHECK
+			],
+			[DISABLE_PLASMAMULE])
+	])
+	
+	MULE_IF_ENABLED([debug],
+        [
+		DEBUGFLAG="-D__DEBUG__"
+		AC_SUBST(DEBUGFLAG)
+	])
+])

aMule-2.3.1.tar.bz2/m4/qt.m4 Added

@@ -0,0 +1,86 @@
+AC_DEFUN([QT_CONFIG_OPTIONS],
+[
+	AC_ARG_WITH(
+		[moc],
+		[AS_HELP_STRING([--with-moc=PATH],
+			[Search in PATH for Qt's meta object compiler])],
+		[QT_MOC=$withval], [QT_MOC=""])
+])
+
+AC_DEFUN([CHECK_MOC_VERSION],
+[
+	AS_IF([test -z ${QT_MOC}],
+	[
+		AC_PATH_PROGS(QT_MOC, moc-qt4 moc)
+		AS_IF([test -z ${QT_MOC}],
+		[
+			echo moc not found
+			exit 1
+		])
+	],
+	[
+		AC_MSG_CHECKING(for moc)
+		AS_IF([test -x ${QT_MOC}],
+		[
+			AC_MSG_RESULT(${QT_MOC})
+			AC_SUBST(QT_MOC)
+		],
+		[
+			AC_MSG_RESULT("not found")
+			QT_MOC="not found"
+			exit 1
+		])
+	])
+
+
+	AS_IF([test "${QT_MOC}" != "not found"],
+	[
+		AC_MSG_CHECKING(for moc version >= 4)
+		QT_MOC_VERSION=`${QT_MOC} -v 2>&1 | sed -e 's/^.* (/(/'`
+		AS_IF([test `echo ${QT_MOC_VERSION} | sed -e 's/^.* //' -e 's/\..*$//'` = 4],
+		[
+			AC_MSG_RESULT(found ${QT_MOC_VERSION})
+		],
+		[
+			AC_MSG_RESULT(not found ${QT_MOC_VERSION} is too old)
+			QT_MOC="not found"
+			exit 1
+		])
+	])
+])
+
+AC_DEFUN([CHECK_QT_HEADERS],
+[
+	AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+	AC_MSG_CHECKING(for qt)
+	AS_IF([test `${PKG_CONFIG} QtCore` --exists && `${PKG_CONFIG} QtGui --exists`],
+	[
+		AC_MSG_RESULT(found)
+		AC_MSG_CHECKING(for qt core cflags)
+		QT_CORE_CXXFLAGS=`${PKG_CONFIG} --cflags QtCore`
+		AC_MSG_RESULT($QT_CORE_CFLAGS)
+		AC_MSG_CHECKING(for qt core libs)
+		QT_CORE_LIBS=`${PKG_CONFIG} --libs QtCore`
+		AC_MSG_RESULT($QT_CORE_LIBS)
+		AC_MSG_CHECKING(for qt gui cflags)
+		QT_GUI_CXXFLAGS=`${PKG_CONFIG} --cflags QtGui`
+		AC_MSG_RESULT($QT_GUI_CFLAGS)
+		AC_MSG_CHECKING(for qt gui libs)
+		QT_GUI_LIBS=`${PKG_CONFIG} --libs QtGui`
+		AC_MSG_RESULT($QT_GUI_LIBS)
+	],
+		[AC_MSG_RESULT(not found)]
+		exit 1
+	)
+
+	AS_IF([test `${PKG_CONFIG} QtDBus --modversion | sed -e 's/\.//g'` -ge 470 ],
+	[
+		QT_DBUS_LDFLAGS="-lQtDBus"
+		AC_SUBST(QT_DBUS_LDFLAGS)
+	])
+
+	AC_SUBST(QT_CORE_CXXFLAGS)
+	AC_SUBST(QT_CORE_LIBS)
+	AC_SUBST(QT_GUI_CXXFLAGS)
+	AC_SUBST(QT_GUI_LIBS)
+])

aMule-2.2.6.tar.bz2/m4/readline.m4 -> aMule-2.3.1.tar.bz2/m4/readline.m4 Changed

aMule-2.2.6.tar.bz2/m4/wxwin.m4 -> aMule-2.3.1.tar.bz2/m4/wxwin.m4 Changed

@@ -3,7 +3,7 @@
 dnl                  Francesco Montorsi,
 dnl                  Bob McCown (Mac-testing)
 dnl Creation date:   24/11/2001
-dnl RCS-ID:          $Id: wxwin.m4 8040 2008-02-01 11:39:47Z phoenix $
+dnl RCS-ID:          $Id: wxwin.m4 10580 2011-06-13 10:24:37Z gonosztopi $
 dnl ---------------------------------------------------------------------------
 
 dnl ===========================================================================
@@ -204,7 +204,7 @@
   if test "$WX_CONFIG_PATH" != "no" ; then
     WX_VERSION_FULL=""
 
-    min_wx_version=ifelse([$1], ,2.2.1,$1)
+    min_wx_version=ifelse([$1], ,2.8.0,$1)
     if test -z "$5" ; then
       AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version])
     else
@@ -237,71 +237,14 @@
       AC_MSG_RESULT(yes (version $WX_VERSION_FULL))
       WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
 
-      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 2>/dev/null`
-      if test "x$WX_LIBS_STATIC" = "x"; then
-        AC_MSG_RESULT(no)
-      else
-        AC_MSG_RESULT(yes)
-      fi
+      WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp`
 
-      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
+      WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
+      WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
+      WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
 
-      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
-
-      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`
-         WX_CPPFLAGS=$WX_CFLAGS
-         WX_CXXFLAGS=$WX_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`
-         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
-         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
-
-         WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
-         WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
-      fi
+      WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
+      WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
 
       ifelse([$2], , :, [$2])
 
@@ -318,7 +261,6 @@
        WX_CPPFLAGS=""
        WX_CXXFLAGS=""
        WX_LIBS=""
-       WX_LIBS_STATIC=""
        WX_RESCOMP=""
 
        if test ! -z "$5"; then
@@ -354,7 +296,6 @@
     WX_CPPFLAGS=""
     WX_CXXFLAGS=""
     WX_LIBS=""
-    WX_LIBS_STATIC=""
     WX_RESCOMP=""
 
     ifelse([$3], , :, [$3])
@@ -367,7 +308,6 @@
   AC_SUBST(WX_CFLAGS_ONLY)
   AC_SUBST(WX_CXXFLAGS_ONLY)
   AC_SUBST(WX_LIBS)
-  AC_SUBST(WX_LIBS_STATIC)
   AC_SUBST(WX_VERSION_FULL)
   AC_SUBST(WX_RESCOMP)
 
@@ -602,9 +542,10 @@
                             "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
                             "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
                             "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" -a \
-                            "$TOOLKIT" != "base" ; then
+                            "$TOOLKIT" != "base" -a "$TOOLKIT" != "cocoa" -a \
+                            "$TOOLKIT" != "osx_cocoa"; then
                         AC_MSG_ERROR([
-    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb, base)
+    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb, base, cocoa, osx_cocoa)
                         ])
                     fi
 
@@ -656,7 +597,7 @@
                ])
 
         dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-wxversion since it's an option
-        dnl which must be able to accept the auto|26|27|28... values
+        dnl which must be able to accept the auto|28|29... values
         ifelse(index([$1], [wxversion]), [-1],,
                [
                 AC_ARG_WITH([wxversion],
@@ -680,7 +621,7 @@
                     if test "${#wx_requested_major_version}" != "1" -o \
                             "${#wx_requested_minor_version}" != "1" ; then
                         AC_MSG_ERROR([
-    Unrecognized option value (allowed values: auto, 2.6, 2.7, 2.8, 2.9)
+    Unrecognized option value (allowed values: auto, 2.8, 2.9)
                         ])
                     fi
 
@@ -800,14 +741,6 @@
 AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES],
         [
         WX_VERSION="$WX_VERSION_MAJOR""$WX_VERSION_MINOR"
-        if test $WX_VERSION -lt 26 ; then
-
-            AC_MSG_ERROR([
-    Cannot detect the wxWidgets configuration for the selected wxWidgets build
-    since its version is $WX_VERSION_FULL < 2.6.0; please install a newer
-    version of wxWidgets.
-                         ])
-        fi
 
         dnl The wx-config we are using understands the "--selected_config"
         dnl option which returns an easy-parseable string !
@@ -868,6 +801,8 @@
             WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*")
             WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*")
             WX_BASEPORT=$(expr "$WX_SELECTEDCONFIG" : ".*base.*")
+            WX_COCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*cocoa.*")
+            WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
 
             WX_PORT="unknown"
             if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
@@ -879,6 +814,8 @@
             if test "$WX_MGLPORT" != "0"; then WX_PORT="mgl"; fi
             if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi
             if test "$WX_BASEPORT" != "0"; then WX_PORT="base"; fi
+            if test "$WX_COCOAPORT" != "0"; then WX_PORT="cocoa"; fi
+            if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
 
             dnl check at least one of the WX_*PORT has been set !
 
@@ -893,7 +830,7 @@
         else
 
             dnl Use the setting given by the user
-            if test -z "$TOOLKIT" ; then
+            if test -n "$TOOLKIT" ; then
                 WX_PORT=$TOOLKIT
             else
                 dnl try with PORT
@@ -950,17 +887,6 @@
         if test "$TOOLKIT" = "auto"; then
             TOOLKIT=$WX_PORT
         fi
-
-dnl        dnl respect the DEBUG variable adding the optimize/debug flags
-dnl        dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we
-dnl        dnl       don't need to set them, too
-dnl        if test "$DEBUG" = "1"; then
-dnl            CXXFLAGS="$CXXFLAGS -g -O0"
-dnl            CFLAGS="$CFLAGS -g -O0"
-dnl        else
-dnl            CXXFLAGS="$CXXFLAGS -O2"
-dnl            CFLAGS="$CFLAGS -O2"
-dnl        fi
     ])
 
 dnl ---------------------------------------------------------------------------

aMule-2.2.6.tar.bz2/m4/zlib.m4 -> aMule-2.3.1.tar.bz2/m4/zlib.m4 Changed

aMule-2.2.6.tar.bz2/missing -> aMule-2.3.1.tar.bz2/missing Changed

@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2005-06-08.21
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -33,6 +31,8 @@
 fi
 
 run=:
+sed_output='s/.* --output[ =]$[^ ]*$.*/\1/p'
+sed_minuso='s/.* -o $[^ ]*$.*/\1/p'
 
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@@ -44,7 +44,7 @@
 
 msg="missing on your system"
 
-case "$1" in
+case $1 in
 --run)
   # Try to run requested program, and just exit if it succeeds.
   run=
@@ -77,6 +77,7 @@
   aclocal      touch file \`aclocal.m4'
   autoconf     touch file \`configure'
   autoheader   touch file \`config.h.in'
+  autom4te     touch the output file, or create a stub one
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
@@ -86,6 +87,9 @@
   tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
     ;;
@@ -103,15 +107,22 @@
 
 esac
 
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+  lex*|yacc*)
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar)
+  tar*)
     if test -n "$run"; then
        echo 1>&2 "ERROR: \`tar' requires --run"
        exit 1
@@ -135,7 +146,7 @@
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case "$1" in
+case $program in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -145,7 +156,7 @@
     touch aclocal.m4
     ;;
 
-  autoconf)
+  autoconf*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -154,7 +165,7 @@
     touch configure
     ;;
 
-  autoheader)
+  autoheader*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -164,7 +175,7 @@
     test -z "$files" && files="config.h"
     touch_files=
     for f in $files; do
-      case "$f" in
+      case $f in
       *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
       *) touch_files="$touch_files $f.in";;
@@ -184,7 +195,7 @@
 	   while read f; do touch "$f"; done
     ;;
 
-  autom4te)
+  autom4te*)
     echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -192,8 +203,8 @@
          You can get \`$1' as part of \`Autoconf' from any GNU
          archive site."
 
-    file=`echo "$*" | sed -n 's/.*--output[ =]*$[^ ]*$.*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*$[^ ]*$.*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -f "$file"; then
 	touch $file
     else
@@ -207,80 +218,78 @@
     fi
     ;;
 
-  bison|yacc)
+  bison*|yacc*)
     echo 1>&2 "\
 WARNING: \`$1' $msg.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
          in order for those modifications to take effect.  You can get
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f y.tab.h ]; then
+    if test ! -f y.tab.h; then
 	echo >y.tab.h
     fi
-    if [ ! -f y.tab.c ]; then
+    if test ! -f y.tab.c; then
 	echo 'main() { return 0; }' >y.tab.c
     fi
     ;;
 
-  lex|flex)
+  lex*|flex*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
          in order for those modifications to take effect.  You can get
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
+    if test $# -ne 1; then
         eval LASTARG="\${$#}"
-	case "$LASTARG" in
+	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
+	    if test -f "$SRCFILE"; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
     fi
-    if [ ! -f lex.yy.c ]; then
+    if test ! -f lex.yy.c; then
 	echo 'main() { return 0; }' >lex.yy.c
     fi
     ;;
 
-  help2man)
+  help2man*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
 
-    file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=$[^ ]*$.*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -f "$file"; then
 	touch $file
     else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
-	exit 1
+	exit $?
     fi
     ;;
 
-  makeinfo)
+  makeinfo*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -289,11 +298,17 @@
          DU, IRIX).  You might want to install the \`Texinfo' package or
          the \`GNU make' package.  Grab either from any GNU archive site."
     # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o $[^ ]*$.*/\1/p'`
+    file=`echo "$*" | sed -n "$sed_output"`
+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
     if test -z "$file"; then
       # ... or it is the one specified with @setfilename ...
       infile=`echo "$*" | sed 's/.* $[^ ]*$ *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* $[^ ]*$ *$/\1/; p; q; }' $infile`
+      file=`sed -n '
+	/^@setfilename/{
+	  s/.* $[^ ]*$ *$/\1/
+	  p
+	  q
+	}' $infile`
       # ... or it is derived from the source name (dir/f.texi becomes f.info)
       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
     fi
@@ -303,7 +318,7 @@
     touch $file
     ;;
 
-  tar)
+  tar*)
     shift
 
     # We have already tried tar in the generic part.
@@ -317,13 +332,13 @@
     fi
     firstarg="$1"
     if shift; then
-	case "$firstarg" in
+	case $firstarg in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case "$firstarg" in
+	case $firstarg in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
@@ -356,5 +371,6 @@
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:

aMule-2.2.6.tar.bz2/mkinstalldirs -> aMule-2.3.1.tar.bz2/mkinstalldirs Changed

aMule-2.3.1.tar.bz2/platforms Added

aMule-2.3.1.tar.bz2/platforms/MacOSX Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/aMule-Xcode Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/aMule-Xcode/English.lproj Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/aMule-Xcode/English.lproj/en Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/aMule-Xcode/README BEFORE BUILDING.rtf Added

@@ -0,0 +1,89 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290
+{\fonttbl\f0\fnil\fcharset0 Monaco;\f1\fmodern\fcharset0 Courier;\f2\fnil\fcharset128 KozGoPro-Heavy;
+}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+
+\f0\fs20 \cf0 This project allows for compilation of aMule in Xcode \ul without\ulnone  macports / fink. THIS IS NOT AN EASY PROCESS, so only attempt it if you're familiar with the terminal, and compiling programs there, as wxWidgets and cryptopp are still compiled via the terminal. I hope to automate this process in the future to eliminate that requirement.\
+\
+Compiling aMule on Xcode is important to automate the build of different configurations, ensure proper compatibility, and allow developers to use the Xcode interface to gdb which is tremendously useful to track and solve bugs. \
+\
+Current configuration supports i386/ppc build on SDK 10.4 (for Tiger), without country flags or UPnP, using wxWidgets 2.8.x. Other configurations will be added later.\
+\
+It's important for building that the following steps/requirements are met:\
+\
+1) This folder structure is needed for compilation:\
+  \
+  <some folder in your computer>\
+	|\
+	|-> aMule sources\
+	|\
+	|-> wxWidgets-2.8 (or wxWidgets for 2.9+)\
+	|\
+	|-> cryptopp (or cryptopp-64bits if you are using Snow Leopard and plan to use wxWidgets 2.9+ and SDK 10.6)\
+	\
+It's essential that the folders are named exactly like shown. If you want to change this, take a look at CFLAGS and link flags in the "aMule" target's properties.\
+\
+2) wxWidgets has to be compiled with universal binary support and static library. When using wxWidgets 2.8 on Snow Leopard, it's important that gcc-4.0 is used because gcc-4.2 defaults to 64bits builds, which wxWidgets 2.8.x doesn't support (see {\field{\*\fldinst{HYPERLINK "http://wiki.wxwidgets.org/Development:_wxMac#Building_on_Snow_Leopard_for_Snow_Leopard"}}{\fldrslt http://wiki.wxwidgets.org/Development:_wxMac#Building_on_Snow_Leopard_for_Snow_Leopard}} for more info).\
+\
+Personally I check out the sources using the following:\
+\
+\pard\pardeftab720\ql\qnatural
+
+\f1\fs24 \cf0 svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH wxWidgets-2.8\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+
+\f0\fs20 \cf0 for wxWidgets 2.8, and\
+\
+\pard\pardeftab720\ql\qnatural
+
+\f1\fs24 \cf0 svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/ wxWidgets
+\f0\fs20 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+\cf0 \
+for wxWidgets 2.9+, and configure with\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+
+\f1\fs24 \cf0 ./configure  CC=gcc-4.0 CXX=g++-4.0 LD=g++-4.0 --enable-debug --with-macosx-sdk=/Developer/SDKs/MacOSX10.4u.sdk --with-macosx-version-min=10.4 --enable-universal_binary --disable-universal --disable-shared \
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+
+\f0\fs20 \cf0 for wxWidgets 2.8, and\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+
+\f1\fs24 \cf0 ./configure --enable-unicode --disable-shared --enable-debug --enable-debug_gdb --with-osx_cocoa --with-macosx-version-min=10.6
+\f0\fs20 \
+\
+for wxWidgets 2.9+ on Snow Leopard for SDK 10.6.\
+
+\f1\fs24 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+
+\f0\fs20 \cf0 After that, just type "make" as usual. Do not "make install".\
+\
+3) Compiling cryptopp is complicated due to lack of proper support for building on MacOSX, especially for universal binaries. First download a cryptopp release from {\field{\*\fldinst{HYPERLINK "http://www.cryptopp.com/#download"}}{\fldrslt http://www.cryptopp.com/#download}} (latest are at the bottom) and uncompress it to the folder named "cryptopp" or "cryptopp-64bits" as shown in the folder structure above. If you are using wxWidgets 2.9+, then configure and compile as usual. If using wxWidgets 2.8 in Snow Leopard, edit the file named GNUmake and add the following lines at the beginning:\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+
+\f1\fs24 \cf0 CXXFLAGS = -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -DNDEBUG -g -O2\
+LDFLAGS = -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4\
+CXX=c++-4.0\
+CC=gcc-4.0\
+\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
+
+\f0\fs20 \cf0 Save the file, then type "make" as usual. 
+\f2\b\fs24 Do not "make install"
+\f0\b0\fs20 .\
+\
+Once you have finished compiling cryptopp and wxWidgets, and they are in the right folders, this project should compile correctly. If you get errors, please review all the steps before posting in the forum.\
+\
+Good luck!
+\f1\fs24 \
+\pard\pardeftab720\ql\qnatural
+\cf0 \
+- Kry\
+}
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/MacOSX/aMule-Xcode/aMule.xcodeproj Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/aMule-Xcode/aMule.xcodeproj/project.pbxproj Added

@@ -0,0 +1,2067 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		483344701196275F00D9BE75 /* amule.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4833446F1196275F00D9BE75 /* amule.icns */; };
+		4848D2CF1192E83100ED40CC /* GenericClientListCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4848D2CD1192E83100ED40CC /* GenericClientListCtrl.cpp */; };
+		4848DC291192E85A00ED40CC /* SharedFilePeersListCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4848D8091192E85900ED40CC /* SharedFilePeersListCtrl.cpp */; };
+		4848DC2A1192E85A00ED40CC /* SourceListCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4848D80B1192E85900ED40CC /* SourceListCtrl.cpp */; };
+		487911DA11925E61002C086E /* CFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879119511925E61002C086E /* CFile.cpp */; };
+		487911DB11925E61002C086E /* DataToText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879119711925E61002C086E /* DataToText.cpp */; };
+		487911DC11925E61002C086E /* ED2KLink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879119911925E61002C086E /* ED2KLink.cpp */; };
+		487911DD11925E61002C086E /* GapList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879119B11925E61002C086E /* GapList.cpp */; };
+		487911DE11925E61002C086E /* MagnetURI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879119D11925E61002C086E /* MagnetURI.cpp */; };
+		487911DF11925E61002C086E /* MemFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879119F11925E61002C086E /* MemFile.cpp */; };
+		487911E111925E61002C086E /* Packet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911A311925E61002C086E /* Packet.cpp */; };
+		487911E211925E61002C086E /* RLE.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911A511925E61002C086E /* RLE.cpp */; };
+		487911E311925E61002C086E /* SafeFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911A711925E61002C086E /* SafeFile.cpp */; };
+		487911E411925E61002C086E /* SHA.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911A911925E61002C086E /* SHA.cpp */; };
+		487911E511925E61002C086E /* Tag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911AB11925E61002C086E /* Tag.cpp */; };
+		487911E611925E61002C086E /* Timer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911AD11925E61002C086E /* Timer.cpp */; };
+		4879120211925FDD002C086E /* AsyncDNS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911E811925FDD002C086E /* AsyncDNS.cpp */; };
+		4879120311925FDD002C086E /* DeadSourceList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911EA11925FDD002C086E /* DeadSourceList.cpp */; };
+		4879120411925FDD002C086E /* FileArea.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911EC11925FDD002C086E /* FileArea.cpp */; };
+		4879120511925FDD002C086E /* FileAutoClose.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911EE11925FDD002C086E /* FileAutoClose.cpp */; };
+		4879120611925FDD002C086E /* Friend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911F011925FDD002C086E /* Friend.cpp */; };
+		4879120711925FDD002C086E /* Parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911F211925FDD002C086E /* Parser.cpp */; };
+		4879120811925FDD002C086E /* PlatformSpecific.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911F411925FDD002C086E /* PlatformSpecific.cpp */; };
+		4879120911925FDD002C086E /* RandomFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911F611925FDD002C086E /* RandomFunctions.cpp */; };
+		4879120A11925FDD002C086E /* RC4Encrypt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911F811925FDD002C086E /* RC4Encrypt.cpp */; };
+		4879120B11925FDD002C086E /* Scanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911FA11925FDD002C086E /* Scanner.cpp */; };
+		4879120C11925FDD002C086E /* StateMachine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911FC11925FDD002C086E /* StateMachine.cpp */; };
+		4879120D11925FDD002C086E /* ThreadScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487911FE11925FDD002C086E /* ThreadScheduler.cpp */; };
+		4879120E11925FDD002C086E /* UPnPBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879120011925FDD002C086E /* UPnPBase.cpp */; };
+		48791C961192601F002C086E /* Entry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487917E11192601E002C086E /* Entry.cpp */; };
+		48791C971192601F002C086E /* SearchManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487917E31192601E002C086E /* SearchManager.cpp */; };
+		48791D081192607A002C086E /* Contact.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791CD91192607A002C086E /* Contact.cpp */; };
+		48791D091192607A002C086E /* RoutingBin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791CDB1192607A002C086E /* RoutingBin.cpp */; };
+		48791D0C119260A0002C086E /* UInt128.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D0A119260A0002C086E /* UInt128.cpp */; };
+		48791D2A11926A0E002C086E /* BarShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D0E11926A0E002C086E /* BarShader.cpp */; };
+		48791D2B11926A0E002C086E /* ChatWnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D1011926A0E002C086E /* ChatWnd.cpp */; };
+		48791D2C11926A0E002C086E /* ColorFrameCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D1211926A0E002C086E /* ColorFrameCtrl.cpp */; };
+		48791D2D11926A0E002C086E /* CommentDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D1411926A0E002C086E /* CommentDialog.cpp */; };
+		48791D2E11926A0E002C086E /* CommentDialogLst.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D1611926A0E002C086E /* CommentDialogLst.cpp */; };
+		48791D2F11926A0E002C086E /* EditServerListDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D1811926A0E002C086E /* EditServerListDlg.cpp */; };
+		48791D3011926A0E002C086E /* FileDetailListCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D1A11926A0E002C086E /* FileDetailListCtrl.cpp */; };
+		48791D3111926A0E002C086E /* IP2Country.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D1C11926A0E002C086E /* IP2Country.cpp */; };
+		48791D3211926A0E002C086E /* MuleCollection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D1E11926A0E002C086E /* MuleCollection.cpp */; };
+		48791D3311926A0E002C086E /* MuleGifCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D2011926A0E002C086E /* MuleGifCtrl.cpp */; };
+		48791D3411926A0E002C086E /* MuleListCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D2211926A0E002C086E /* MuleListCtrl.cpp */; };
+		48791D3511926A0E002C086E /* MuleNotebook.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D2411926A0E002C086E /* MuleNotebook.cpp */; };
+		48791D3611926A0E002C086E /* MuleTextCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D2611926A0E002C086E /* MuleTextCtrl.cpp */; };
+		48791D3711926A0E002C086E /* muuli_wdr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D2811926A0E002C086E /* muuli_wdr.cpp */; };
+		48791D3B11926A2E002C086E /* listctrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D3911926A2E002C086E /* listctrl.cpp */; };
+		48791D7C11926AEE002C086E /* amule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D3D11926AEE002C086E /* amule.cpp */; };
+		48791D7D11926AEE002C086E /* BaseClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D3F11926AEE002C086E /* BaseClient.cpp */; };
+		48791D7E11926AEE002C086E /* CanceledFileList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D4011926AEE002C086E /* CanceledFileList.cpp */; };
+		48791D7F11926AEE002C086E /* ClientCreditsList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D4211926AEE002C086E /* ClientCreditsList.cpp */; };
+		48791D8011926AEE002C086E /* ClientList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D4411926AEE002C086E /* ClientList.cpp */; };
+		48791D8111926AEE002C086E /* ClientTCPSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D4611926AEE002C086E /* ClientTCPSocket.cpp */; };
+		48791D8211926AEE002C086E /* ClientUDPSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D4811926AEE002C086E /* ClientUDPSocket.cpp */; };
+		48791D8311926AEE002C086E /* CorruptionBlackBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D4A11926AEE002C086E /* CorruptionBlackBox.cpp */; };
+		48791D8411926AEE002C086E /* DownloadClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D4C11926AEE002C086E /* DownloadClient.cpp */; };
+		48791D8511926AEE002C086E /* DownloadQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D4D11926AEE002C086E /* DownloadQueue.cpp */; };
+		48791D8611926AEE002C086E /* ECSpecialCoreTags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D4F11926AEE002C086E /* ECSpecialCoreTags.cpp */; };
+		48791D8711926AEE002C086E /* EMSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D5011926AEE002C086E /* EMSocket.cpp */; };
+		48791D8811926AEE002C086E /* EncryptedDatagramSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D5211926AEE002C086E /* EncryptedDatagramSocket.cpp */; };
+		48791D8911926AEE002C086E /* EncryptedStreamSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D5411926AEE002C086E /* EncryptedStreamSocket.cpp */; };
+		48791D8A11926AEE002C086E /* ExternalConn.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D5611926AEE002C086E /* ExternalConn.cpp */; };
+		48791D8B11926AEE002C086E /* FriendList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D5711926AEE002C086E /* FriendList.cpp */; };
+		48791D8C11926AEE002C086E /* HTTPDownload.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D5911926AEE002C086E /* HTTPDownload.cpp */; };
+		48791D8D11926AEE002C086E /* IPFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D5B11926AEE002C086E /* IPFilter.cpp */; };
+		48791D8E11926AEE002C086E /* KnownFileList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D5D11926AEE002C086E /* KnownFileList.cpp */; };
+		48791D8F11926AEE002C086E /* ListenSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D5F11926AEE002C086E /* ListenSocket.cpp */; };
+		48791D9011926AEE002C086E /* MuleUDPSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D6111926AEE002C086E /* MuleUDPSocket.cpp */; };
+		48791D9111926AEE002C086E /* PartFileConvert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D6311926AEE002C086E /* PartFileConvert.cpp */; };
+		48791D9211926AEE002C086E /* SearchFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D6511926AEE002C086E /* SearchFile.cpp */; };
+		48791D9311926AEE002C086E /* SearchList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D6711926AEE002C086E /* SearchList.cpp */; };
+		48791D9411926AEE002C086E /* ServerConnect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D6911926AEE002C086E /* ServerConnect.cpp */; };
+		48791D9511926AEE002C086E /* ServerList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D6B11926AEE002C086E /* ServerList.cpp */; };
+		48791D9611926AEE002C086E /* ServerSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D6D11926AEE002C086E /* ServerSocket.cpp */; };
+		48791D9711926AEE002C086E /* ServerUDPSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D6F11926AEE002C086E /* ServerUDPSocket.cpp */; };
+		48791D9811926AEE002C086E /* SharedFileList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D7111926AEE002C086E /* SharedFileList.cpp */; };
+		48791D9911926AEE002C086E /* TerminationProcessAmuleweb.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D7311926AEE002C086E /* TerminationProcessAmuleweb.cpp */; };
+		48791D9A11926AEE002C086E /* ThreadTasks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D7511926AEE002C086E /* ThreadTasks.cpp */; };
+		48791D9B11926AEE002C086E /* UploadBandwidthThrottler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D7711926AEE002C086E /* UploadBandwidthThrottler.cpp */; };
+		48791D9C11926AEE002C086E /* UploadClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D7911926AEE002C086E /* UploadClient.cpp */; };
+		48791D9D11926AEE002C086E /* UploadQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791D7A11926AEE002C086E /* UploadQueue.cpp */; };
+		48791E1211926B21002C086E /* KademliaUDPListener.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791DE311926B21002C086E /* KademliaUDPListener.cpp */; };
+		48791E1311926B21002C086E /* PacketTracking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791DE511926B21002C086E /* PacketTracking.cpp */; };
+		48791E3611926B41002C086E /* Indexed.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791E2511926B41002C086E /* Indexed.cpp */; };
+		48791E3711926B41002C086E /* Kademlia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791E2711926B41002C086E /* Kademlia.cpp */; };
+		48791E3811926B41002C086E /* Prefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791E2911926B41002C086E /* Prefs.cpp */; };
+		48791E3911926B41002C086E /* Search.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791E2B11926B41002C086E /* Search.cpp */; };
+		48791E3A11926B41002C086E /* UDPFirewallTester.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791E2D11926B41002C086E /* UDPFirewallTester.cpp */; };
+		48791EA911926B54002C086E /* RoutingZone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791E7C11926B54002C086E /* RoutingZone.cpp */; };
+		48791EDC11926CC7002C086E /* AddFriend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EAB11926CC7002C086E /* AddFriend.cpp */; };
+		48791EDD11926CC7002C086E /* amule-gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EAD11926CC7002C086E /* amule-gui.cpp */; };
+		48791EDE11926CC7002C086E /* amuleDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EAE11926CC7002C086E /* amuleDlg.cpp */; };
+		48791EDF11926CC7002C086E /* CatDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EB011926CC7002C086E /* CatDialog.cpp */; };
+		48791EE011926CC7002C086E /* ChatSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EB211926CC7002C086E /* ChatSelector.cpp */; };
+		48791EE111926CC7002C086E /* ClientDetailDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EB411926CC7002C086E /* ClientDetailDialog.cpp */; };
+		48791EE311926CC7002C086E /* DirectoryTreeCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EB811926CC7002C086E /* DirectoryTreeCtrl.cpp */; };
+		48791EE411926CC7002C086E /* DownloadListCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EBA11926CC7002C086E /* DownloadListCtrl.cpp */; };
+		48791EE511926CC7002C086E /* FileDetailDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EBC11926CC7002C086E /* FileDetailDialog.cpp */; };
+		48791EE611926CC7002C086E /* FriendListCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EBE11926CC7002C086E /* FriendListCtrl.cpp */; };
+		48791EE711926CC7002C086E /* KadDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EC011926CC7002C086E /* KadDlg.cpp */; };
+		48791EE811926CC7002C086E /* MuleColour.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EC211926CC7002C086E /* MuleColour.cpp */; };
+		48791EE911926CC7002C086E /* MuleTrayIcon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EC411926CC7002C086E /* MuleTrayIcon.cpp */; };
+		48791EEA11926CC7002C086E /* OScopeCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EC611926CC7002C086E /* OScopeCtrl.cpp */; };
+		48791EEB11926CC7002C086E /* PartFileConvertDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EC811926CC7002C086E /* PartFileConvertDlg.cpp */; };
+		48791EEC11926CC7002C086E /* PrefsUnifiedDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791ECA11926CC7002C086E /* PrefsUnifiedDlg.cpp */; };
+		48791EED11926CC7002C086E /* SearchDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791ECC11926CC7002C086E /* SearchDlg.cpp */; };
+		48791EEE11926CC7002C086E /* SearchListCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791ECE11926CC7002C086E /* SearchListCtrl.cpp */; };
+		48791EEF11926CC7002C086E /* ServerListCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791ED011926CC7002C086E /* ServerListCtrl.cpp */; };
+		48791EF011926CC7002C086E /* ServerWnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791ED211926CC7002C086E /* ServerWnd.cpp */; };
+		48791EF111926CC7002C086E /* SharedFilesCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791ED411926CC7002C086E /* SharedFilesCtrl.cpp */; };
+		48791EF211926CC7002C086E /* SharedFilesWnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791ED611926CC7002C086E /* SharedFilesWnd.cpp */; };
+		48791EF311926CC7002C086E /* StatisticsDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791ED811926CC7002C086E /* StatisticsDlg.cpp */; };
+		48791EF411926CC7002C086E /* TransferWnd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791EDA11926CC7002C086E /* TransferWnd.cpp */; };
+		48791F8411926F24002C086E /* amuleAppCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F6611926F24002C086E /* amuleAppCommon.cpp */; };
+		48791F8511926F24002C086E /* ClientCredits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F6711926F24002C086E /* ClientCredits.cpp */; };
+		48791F8611926F24002C086E /* ECSpecialMuleTags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F6911926F24002C086E /* ECSpecialMuleTags.cpp */; };
+		48791F8711926F24002C086E /* GetTickCount.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F6A11926F24002C086E /* GetTickCount.cpp */; };
+		48791F8811926F24002C086E /* GuiEvents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F6C11926F24002C086E /* GuiEvents.cpp */; };
+		48791F8911926F24002C086E /* KnownFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F6E11926F24002C086E /* KnownFile.cpp */; };
+		48791F8A11926F24002C086E /* Logger.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F7011926F24002C086E /* Logger.cpp */; };
+		48791F8B11926F24002C086E /* PartFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F7211926F24002C086E /* PartFile.cpp */; };
+		48791F8C11926F24002C086E /* Preferences.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F7411926F24002C086E /* Preferences.cpp */; };
+		48791F8D11926F24002C086E /* Proxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F7611926F24002C086E /* Proxy.cpp */; };
+		48791F8E11926F24002C086E /* Server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F7811926F24002C086E /* Server.cpp */; };
+		48791F8F11926F24002C086E /* SHAHashSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F7A11926F24002C086E /* SHAHashSet.cpp */; };
+		48791F9011926F24002C086E /* Statistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F7C11926F24002C086E /* Statistics.cpp */; };
+		48791F9111926F24002C086E /* StatTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F7E11926F24002C086E /* StatTree.cpp */; };
+		48791F9211926F24002C086E /* TerminationProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F8011926F24002C086E /* TerminationProcess.cpp */; };
+		48791F9311926F24002C086E /* UserEvents.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791F8211926F24002C086E /* UserEvents.cpp */; };
+		4879200511926F74002C086E /* NetworkFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791FD611926F74002C086E /* NetworkFunctions.cpp */; };
+		4879200611926F74002C086E /* OtherFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48791FD811926F74002C086E /* OtherFunctions.cpp */; };
+		487920371192730F002C086E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 487920361192730F002C086E /* libz.dylib */; };
+		4879206A119274FA002C086E /* FileFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879205C119274FA002C086E /* FileFunctions.cpp */; };
+		4879206B119274FA002C086E /* Format.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879205E119274FA002C086E /* Format.cpp */; };
+		4879206C119274FA002C086E /* MD5Sum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48792060119274FA002C086E /* MD5Sum.cpp */; };
+		4879206D119274FA002C086E /* MuleDebug.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48792062119274FA002C086E /* MuleDebug.cpp */; };
+		4879206E119274FA002C086E /* Path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48792064119274FA002C086E /* Path.cpp */; };
+		4879206F119274FA002C086E /* StringFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48792066119274FA002C086E /* StringFunctions.cpp */; };
+		48792070119274FA002C086E /* TextFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48792068119274FA002C086E /* TextFile.cpp */; };
+		487921EA11927582002C086E /* ECMuleSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879213211927582002C086E /* ECMuleSocket.cpp */; };
+		487921EB11927582002C086E /* ECPacket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879213411927582002C086E /* ECPacket.cpp */; };
+		487921EC11927582002C086E /* ECSocket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879213611927582002C086E /* ECSocket.cpp */; };
+		487921ED11927582002C086E /* ECSpecialTags.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879213811927582002C086E /* ECSpecialTags.cpp */; };
+		487921EE11927582002C086E /* ECTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879213A11927582002C086E /* ECTag.cpp */; };
+		487921EF11927582002C086E /* RemoteConnect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4879213C11927582002C086E /* RemoteConnect.cpp */; };
+		4879238511927626002C086E /* CaptchaDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487922C811927626002C086E /* CaptchaDialog.cpp */; };
+		4879238611927626002C086E /* CaptchaGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 487922CA11927626002C086E /* CaptchaGenerator.cpp */; };
+		488D4E8F1192CB880089BF8E /* README BEFORE BUILDING.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 488D4E8E1192CB880089BF8E /* README BEFORE BUILDING.rtf */; };
+		48CB3DB611B58AA80051CAF2 /* IPFilterScanner.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 48CB3DB411B58AA80051CAF2 /* IPFilterScanner.cpp */; };
+		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
+		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		089C165DFE840E0CC02AAC07 /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = en; path = English.lproj/en; sourceTree = "<group>"; };
+		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+		256AC3F00F4B6AF500CF3369 /* aMule_Xcode_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aMule_Xcode_Prefix.pch; sourceTree = "<group>"; };
+		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+		4833446F1196275F00D9BE75 /* amule.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = amule.icns; sourceTree = "<group>"; };
+		4848D2CD1192E83100ED40CC /* GenericClientListCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GenericClientListCtrl.cpp; path = ../../../src/GenericClientListCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		4848D2CE1192E83100ED40CC /* GenericClientListCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GenericClientListCtrl.h; path = ../../../src/GenericClientListCtrl.h; sourceTree = SOURCE_ROOT; };
+		4848D8091192E85900ED40CC /* SharedFilePeersListCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SharedFilePeersListCtrl.cpp; path = ../../../src/SharedFilePeersListCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		4848D80A1192E85900ED40CC /* SharedFilePeersListCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedFilePeersListCtrl.h; path = ../../../src/SharedFilePeersListCtrl.h; sourceTree = SOURCE_ROOT; };
+		4848D80B1192E85900ED40CC /* SourceListCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourceListCtrl.cpp; path = ../../../src/SourceListCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		4848D80C1192E85900ED40CC /* SourceListCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourceListCtrl.h; path = ../../../src/SourceListCtrl.h; sourceTree = SOURCE_ROOT; };
+		48636E2A119E5A4300BC3DB6 /* ArchSpecific.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ArchSpecific.h; path = ../../../src/ArchSpecific.h; sourceTree = SOURCE_ROOT; };
+		48636E2B119E5A4300BC3DB6 /* Constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Constants.h; path = ../../../src/Constants.h; sourceTree = SOURCE_ROOT; };
+		48636E2C119E5A4300BC3DB6 /* CryptoPP_Inc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CryptoPP_Inc.h; path = ../../../src/CryptoPP_Inc.h; sourceTree = SOURCE_ROOT; };
+		4879119511925E61002C086E /* CFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CFile.cpp; path = ../../../src/CFile.cpp; sourceTree = SOURCE_ROOT; };
+		4879119611925E61002C086E /* CFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CFile.h; path = ../../../src/CFile.h; sourceTree = SOURCE_ROOT; };
+		4879119711925E61002C086E /* DataToText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DataToText.cpp; path = ../../../src/DataToText.cpp; sourceTree = SOURCE_ROOT; };
+		4879119811925E61002C086E /* DataToText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DataToText.h; path = ../../../src/DataToText.h; sourceTree = SOURCE_ROOT; };
+		4879119911925E61002C086E /* ED2KLink.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ED2KLink.cpp; path = ../../../src/ED2KLink.cpp; sourceTree = SOURCE_ROOT; };
+		4879119A11925E61002C086E /* ED2KLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ED2KLink.h; path = ../../../src/ED2KLink.h; sourceTree = SOURCE_ROOT; };
+		4879119B11925E61002C086E /* GapList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GapList.cpp; path = ../../../src/GapList.cpp; sourceTree = SOURCE_ROOT; };
+		4879119C11925E61002C086E /* GapList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GapList.h; path = ../../../src/GapList.h; sourceTree = SOURCE_ROOT; };
+		4879119D11925E61002C086E /* MagnetURI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MagnetURI.cpp; path = ../../../src/MagnetURI.cpp; sourceTree = SOURCE_ROOT; };
+		4879119E11925E61002C086E /* MagnetURI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MagnetURI.h; path = ../../../src/MagnetURI.h; sourceTree = SOURCE_ROOT; };
+		4879119F11925E61002C086E /* MemFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MemFile.cpp; path = ../../../src/MemFile.cpp; sourceTree = SOURCE_ROOT; };
+		487911A011925E61002C086E /* MemFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MemFile.h; path = ../../../src/MemFile.h; sourceTree = SOURCE_ROOT; };
+		487911A311925E61002C086E /* Packet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Packet.cpp; path = ../../../src/Packet.cpp; sourceTree = SOURCE_ROOT; };
+		487911A411925E61002C086E /* Packet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Packet.h; path = ../../../src/Packet.h; sourceTree = SOURCE_ROOT; };
+		487911A511925E61002C086E /* RLE.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RLE.cpp; path = ../../../src/RLE.cpp; sourceTree = SOURCE_ROOT; };
+		487911A611925E61002C086E /* RLE.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RLE.h; path = ../../../src/RLE.h; sourceTree = SOURCE_ROOT; };
+		487911A711925E61002C086E /* SafeFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SafeFile.cpp; path = ../../../src/SafeFile.cpp; sourceTree = SOURCE_ROOT; };
+		487911A811925E61002C086E /* SafeFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SafeFile.h; path = ../../../src/SafeFile.h; sourceTree = SOURCE_ROOT; };
+		487911A911925E61002C086E /* SHA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SHA.cpp; path = ../../../src/SHA.cpp; sourceTree = SOURCE_ROOT; };
+		487911AA11925E61002C086E /* SHA.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SHA.h; path = ../../../src/SHA.h; sourceTree = SOURCE_ROOT; };
+		487911AB11925E61002C086E /* Tag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tag.cpp; path = ../../../src/Tag.cpp; sourceTree = SOURCE_ROOT; };
+		487911AC11925E61002C086E /* Tag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Tag.h; path = ../../../src/Tag.h; sourceTree = SOURCE_ROOT; };
+		487911AD11925E61002C086E /* Timer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Timer.cpp; path = ../../../src/Timer.cpp; sourceTree = SOURCE_ROOT; };
+		487911AE11925E61002C086E /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Timer.h; path = ../../../src/Timer.h; sourceTree = SOURCE_ROOT; };
+		487911E811925FDD002C086E /* AsyncDNS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AsyncDNS.cpp; path = ../../../src/AsyncDNS.cpp; sourceTree = SOURCE_ROOT; };
+		487911E911925FDD002C086E /* AsyncDNS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AsyncDNS.h; path = ../../../src/AsyncDNS.h; sourceTree = SOURCE_ROOT; };
+		487911EA11925FDD002C086E /* DeadSourceList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DeadSourceList.cpp; path = ../../../src/DeadSourceList.cpp; sourceTree = SOURCE_ROOT; };
+		487911EB11925FDD002C086E /* DeadSourceList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DeadSourceList.h; path = ../../../src/DeadSourceList.h; sourceTree = SOURCE_ROOT; };
+		487911EC11925FDD002C086E /* FileArea.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileArea.cpp; path = ../../../src/FileArea.cpp; sourceTree = SOURCE_ROOT; };
+		487911ED11925FDD002C086E /* FileArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileArea.h; path = ../../../src/FileArea.h; sourceTree = SOURCE_ROOT; };
+		487911EE11925FDD002C086E /* FileAutoClose.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileAutoClose.cpp; path = ../../../src/FileAutoClose.cpp; sourceTree = SOURCE_ROOT; };
+		487911EF11925FDD002C086E /* FileAutoClose.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileAutoClose.h; path = ../../../src/FileAutoClose.h; sourceTree = SOURCE_ROOT; };
+		487911F011925FDD002C086E /* Friend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Friend.cpp; path = ../../../src/Friend.cpp; sourceTree = SOURCE_ROOT; };
+		487911F111925FDD002C086E /* Friend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Friend.h; path = ../../../src/Friend.h; sourceTree = SOURCE_ROOT; };
+		487911F211925FDD002C086E /* Parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Parser.cpp; path = ../../../src/Parser.cpp; sourceTree = SOURCE_ROOT; };
+		487911F311925FDD002C086E /* Parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Parser.hpp; path = ../../../src/Parser.hpp; sourceTree = SOURCE_ROOT; };
+		487911F411925FDD002C086E /* PlatformSpecific.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PlatformSpecific.cpp; path = ../../../src/PlatformSpecific.cpp; sourceTree = SOURCE_ROOT; };
+		487911F511925FDD002C086E /* PlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlatformSpecific.h; path = ../../../src/PlatformSpecific.h; sourceTree = SOURCE_ROOT; };
+		487911F611925FDD002C086E /* RandomFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RandomFunctions.cpp; path = ../../../src/RandomFunctions.cpp; sourceTree = SOURCE_ROOT; };
+		487911F711925FDD002C086E /* RandomFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RandomFunctions.h; path = ../../../src/RandomFunctions.h; sourceTree = SOURCE_ROOT; };
+		487911F811925FDD002C086E /* RC4Encrypt.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RC4Encrypt.cpp; path = ../../../src/RC4Encrypt.cpp; sourceTree = SOURCE_ROOT; };
+		487911F911925FDD002C086E /* RC4Encrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RC4Encrypt.h; path = ../../../src/RC4Encrypt.h; sourceTree = SOURCE_ROOT; };
+		487911FA11925FDD002C086E /* Scanner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Scanner.cpp; path = ../../../src/Scanner.cpp; sourceTree = SOURCE_ROOT; };
+		487911FB11925FDD002C086E /* Scanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Scanner.h; path = ../../../src/Scanner.h; sourceTree = SOURCE_ROOT; };
+		487911FC11925FDD002C086E /* StateMachine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StateMachine.cpp; path = ../../../src/StateMachine.cpp; sourceTree = SOURCE_ROOT; };
+		487911FD11925FDD002C086E /* StateMachine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StateMachine.h; path = ../../../src/StateMachine.h; sourceTree = SOURCE_ROOT; };
+		487911FE11925FDD002C086E /* ThreadScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadScheduler.cpp; path = ../../../src/ThreadScheduler.cpp; sourceTree = SOURCE_ROOT; };
+		487911FF11925FDD002C086E /* ThreadScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadScheduler.h; path = ../../../src/ThreadScheduler.h; sourceTree = SOURCE_ROOT; };
+		4879120011925FDD002C086E /* UPnPBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UPnPBase.cpp; path = ../../../src/UPnPBase.cpp; sourceTree = SOURCE_ROOT; };
+		4879120111925FDD002C086E /* UPnPBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UPnPBase.h; path = ../../../src/UPnPBase.h; sourceTree = SOURCE_ROOT; };
+		487917E11192601E002C086E /* Entry.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Entry.cpp; path = ../../../src/kademlia/kademlia/Entry.cpp; sourceTree = SOURCE_ROOT; };
+		487917E21192601E002C086E /* Entry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Entry.h; path = ../../../src/kademlia/kademlia/Entry.h; sourceTree = SOURCE_ROOT; };
+		487917E31192601E002C086E /* SearchManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SearchManager.cpp; path = ../../../src/kademlia/kademlia/SearchManager.cpp; sourceTree = SOURCE_ROOT; };
+		487917E41192601E002C086E /* SearchManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SearchManager.h; path = ../../../src/kademlia/kademlia/SearchManager.h; sourceTree = SOURCE_ROOT; };
+		48791CD91192607A002C086E /* Contact.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Contact.cpp; path = ../../../src/kademlia/routing/Contact.cpp; sourceTree = SOURCE_ROOT; };
+		48791CDA1192607A002C086E /* Contact.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Contact.h; path = ../../../src/kademlia/routing/Contact.h; sourceTree = SOURCE_ROOT; };
+		48791CDB1192607A002C086E /* RoutingBin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RoutingBin.cpp; path = ../../../src/kademlia/routing/RoutingBin.cpp; sourceTree = SOURCE_ROOT; };
+		48791CDC1192607A002C086E /* RoutingBin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RoutingBin.h; path = ../../../src/kademlia/routing/RoutingBin.h; sourceTree = SOURCE_ROOT; };
+		48791D0A119260A0002C086E /* UInt128.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UInt128.cpp; path = ../../../src/kademlia/utils/UInt128.cpp; sourceTree = SOURCE_ROOT; };
+		48791D0B119260A0002C086E /* UInt128.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UInt128.h; path = ../../../src/kademlia/utils/UInt128.h; sourceTree = SOURCE_ROOT; };
+		48791D0E11926A0E002C086E /* BarShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BarShader.cpp; path = ../../../src/BarShader.cpp; sourceTree = SOURCE_ROOT; };
+		48791D0F11926A0E002C086E /* BarShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BarShader.h; path = ../../../src/BarShader.h; sourceTree = SOURCE_ROOT; };
+		48791D1011926A0E002C086E /* ChatWnd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChatWnd.cpp; path = ../../../src/ChatWnd.cpp; sourceTree = SOURCE_ROOT; };
+		48791D1111926A0E002C086E /* ChatWnd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChatWnd.h; path = ../../../src/ChatWnd.h; sourceTree = SOURCE_ROOT; };
+		48791D1211926A0E002C086E /* ColorFrameCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ColorFrameCtrl.cpp; path = ../../../src/ColorFrameCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791D1311926A0E002C086E /* ColorFrameCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ColorFrameCtrl.h; path = ../../../src/ColorFrameCtrl.h; sourceTree = SOURCE_ROOT; };
+		48791D1411926A0E002C086E /* CommentDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommentDialog.cpp; path = ../../../src/CommentDialog.cpp; sourceTree = SOURCE_ROOT; };
+		48791D1511926A0E002C086E /* CommentDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommentDialog.h; path = ../../../src/CommentDialog.h; sourceTree = SOURCE_ROOT; };
+		48791D1611926A0E002C086E /* CommentDialogLst.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommentDialogLst.cpp; path = ../../../src/CommentDialogLst.cpp; sourceTree = SOURCE_ROOT; };
+		48791D1711926A0E002C086E /* CommentDialogLst.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CommentDialogLst.h; path = ../../../src/CommentDialogLst.h; sourceTree = SOURCE_ROOT; };
+		48791D1811926A0E002C086E /* EditServerListDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EditServerListDlg.cpp; path = ../../../src/EditServerListDlg.cpp; sourceTree = SOURCE_ROOT; };
+		48791D1911926A0E002C086E /* EditServerListDlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EditServerListDlg.h; path = ../../../src/EditServerListDlg.h; sourceTree = SOURCE_ROOT; };
+		48791D1A11926A0E002C086E /* FileDetailListCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileDetailListCtrl.cpp; path = ../../../src/FileDetailListCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791D1B11926A0E002C086E /* FileDetailListCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDetailListCtrl.h; path = ../../../src/FileDetailListCtrl.h; sourceTree = SOURCE_ROOT; };
+		48791D1C11926A0E002C086E /* IP2Country.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IP2Country.cpp; path = ../../../src/IP2Country.cpp; sourceTree = SOURCE_ROOT; };
+		48791D1D11926A0E002C086E /* IP2Country.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IP2Country.h; path = ../../../src/IP2Country.h; sourceTree = SOURCE_ROOT; };
+		48791D1E11926A0E002C086E /* MuleCollection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MuleCollection.cpp; path = ../../../src/MuleCollection.cpp; sourceTree = SOURCE_ROOT; };
+		48791D1F11926A0E002C086E /* MuleCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuleCollection.h; path = ../../../src/MuleCollection.h; sourceTree = SOURCE_ROOT; };
+		48791D2011926A0E002C086E /* MuleGifCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MuleGifCtrl.cpp; path = ../../../src/MuleGifCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791D2111926A0E002C086E /* MuleGifCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuleGifCtrl.h; path = ../../../src/MuleGifCtrl.h; sourceTree = SOURCE_ROOT; };
+		48791D2211926A0E002C086E /* MuleListCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MuleListCtrl.cpp; path = ../../../src/MuleListCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791D2311926A0E002C086E /* MuleListCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuleListCtrl.h; path = ../../../src/MuleListCtrl.h; sourceTree = SOURCE_ROOT; };
+		48791D2411926A0E002C086E /* MuleNotebook.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MuleNotebook.cpp; path = ../../../src/MuleNotebook.cpp; sourceTree = SOURCE_ROOT; };
+		48791D2511926A0E002C086E /* MuleNotebook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuleNotebook.h; path = ../../../src/MuleNotebook.h; sourceTree = SOURCE_ROOT; };
+		48791D2611926A0E002C086E /* MuleTextCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MuleTextCtrl.cpp; path = ../../../src/MuleTextCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791D2711926A0E002C086E /* MuleTextCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuleTextCtrl.h; path = ../../../src/MuleTextCtrl.h; sourceTree = SOURCE_ROOT; };
+		48791D2811926A0E002C086E /* muuli_wdr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = muuli_wdr.cpp; path = ../../../src/muuli_wdr.cpp; sourceTree = SOURCE_ROOT; };
+		48791D2911926A0E002C086E /* muuli_wdr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = muuli_wdr.h; path = ../../../src/muuli_wdr.h; sourceTree = SOURCE_ROOT; };
+		48791D3911926A2E002C086E /* listctrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = listctrl.cpp; path = ../../../src/extern/wxWidgets/listctrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791D3A11926A2E002C086E /* listctrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = listctrl.h; path = ../../../src/extern/wxWidgets/listctrl.h; sourceTree = SOURCE_ROOT; };
+		48791D3D11926AEE002C086E /* amule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = amule.cpp; path = ../../../src/amule.cpp; sourceTree = SOURCE_ROOT; };
+		48791D3E11926AEE002C086E /* amule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = amule.h; path = ../../../src/amule.h; sourceTree = SOURCE_ROOT; };
+		48791D3F11926AEE002C086E /* BaseClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BaseClient.cpp; path = ../../../src/BaseClient.cpp; sourceTree = SOURCE_ROOT; };
+		48791D4011926AEE002C086E /* CanceledFileList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CanceledFileList.cpp; path = ../../../src/CanceledFileList.cpp; sourceTree = SOURCE_ROOT; };
+		48791D4111926AEE002C086E /* CanceledFileList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CanceledFileList.h; path = ../../../src/CanceledFileList.h; sourceTree = SOURCE_ROOT; };
+		48791D4211926AEE002C086E /* ClientCreditsList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClientCreditsList.cpp; path = ../../../src/ClientCreditsList.cpp; sourceTree = SOURCE_ROOT; };
+		48791D4311926AEE002C086E /* ClientCreditsList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClientCreditsList.h; path = ../../../src/ClientCreditsList.h; sourceTree = SOURCE_ROOT; };
+		48791D4411926AEE002C086E /* ClientList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClientList.cpp; path = ../../../src/ClientList.cpp; sourceTree = SOURCE_ROOT; };
+		48791D4511926AEE002C086E /* ClientList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClientList.h; path = ../../../src/ClientList.h; sourceTree = SOURCE_ROOT; };
+		48791D4611926AEE002C086E /* ClientTCPSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClientTCPSocket.cpp; path = ../../../src/ClientTCPSocket.cpp; sourceTree = SOURCE_ROOT; };
+		48791D4711926AEE002C086E /* ClientTCPSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClientTCPSocket.h; path = ../../../src/ClientTCPSocket.h; sourceTree = SOURCE_ROOT; };
+		48791D4811926AEE002C086E /* ClientUDPSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClientUDPSocket.cpp; path = ../../../src/ClientUDPSocket.cpp; sourceTree = SOURCE_ROOT; };
+		48791D4911926AEE002C086E /* ClientUDPSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClientUDPSocket.h; path = ../../../src/ClientUDPSocket.h; sourceTree = SOURCE_ROOT; };
+		48791D4A11926AEE002C086E /* CorruptionBlackBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CorruptionBlackBox.cpp; path = ../../../src/CorruptionBlackBox.cpp; sourceTree = SOURCE_ROOT; };
+		48791D4B11926AEE002C086E /* CorruptionBlackBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CorruptionBlackBox.h; path = ../../../src/CorruptionBlackBox.h; sourceTree = SOURCE_ROOT; };
+		48791D4C11926AEE002C086E /* DownloadClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DownloadClient.cpp; path = ../../../src/DownloadClient.cpp; sourceTree = SOURCE_ROOT; };
+		48791D4D11926AEE002C086E /* DownloadQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DownloadQueue.cpp; path = ../../../src/DownloadQueue.cpp; sourceTree = SOURCE_ROOT; };
+		48791D4E11926AEE002C086E /* DownloadQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadQueue.h; path = ../../../src/DownloadQueue.h; sourceTree = SOURCE_ROOT; };
+		48791D4F11926AEE002C086E /* ECSpecialCoreTags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ECSpecialCoreTags.cpp; path = ../../../src/ECSpecialCoreTags.cpp; sourceTree = SOURCE_ROOT; };
+		48791D5011926AEE002C086E /* EMSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EMSocket.cpp; path = ../../../src/EMSocket.cpp; sourceTree = SOURCE_ROOT; };
+		48791D5111926AEE002C086E /* EMSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EMSocket.h; path = ../../../src/EMSocket.h; sourceTree = SOURCE_ROOT; };
+		48791D5211926AEE002C086E /* EncryptedDatagramSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EncryptedDatagramSocket.cpp; path = ../../../src/EncryptedDatagramSocket.cpp; sourceTree = SOURCE_ROOT; };
+		48791D5311926AEE002C086E /* EncryptedDatagramSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EncryptedDatagramSocket.h; path = ../../../src/EncryptedDatagramSocket.h; sourceTree = SOURCE_ROOT; };
+		48791D5411926AEE002C086E /* EncryptedStreamSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EncryptedStreamSocket.cpp; path = ../../../src/EncryptedStreamSocket.cpp; sourceTree = SOURCE_ROOT; };
+		48791D5511926AEE002C086E /* EncryptedStreamSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EncryptedStreamSocket.h; path = ../../../src/EncryptedStreamSocket.h; sourceTree = SOURCE_ROOT; };
+		48791D5611926AEE002C086E /* ExternalConn.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ExternalConn.cpp; path = ../../../src/ExternalConn.cpp; sourceTree = SOURCE_ROOT; };
+		48791D5711926AEE002C086E /* FriendList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FriendList.cpp; path = ../../../src/FriendList.cpp; sourceTree = SOURCE_ROOT; };
+		48791D5811926AEE002C086E /* FriendList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FriendList.h; path = ../../../src/FriendList.h; sourceTree = SOURCE_ROOT; };
+		48791D5911926AEE002C086E /* HTTPDownload.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTTPDownload.cpp; path = ../../../src/HTTPDownload.cpp; sourceTree = SOURCE_ROOT; };
+		48791D5A11926AEE002C086E /* HTTPDownload.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTTPDownload.h; path = ../../../src/HTTPDownload.h; sourceTree = SOURCE_ROOT; };
+		48791D5B11926AEE002C086E /* IPFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IPFilter.cpp; path = ../../../src/IPFilter.cpp; sourceTree = SOURCE_ROOT; };
+		48791D5C11926AEE002C086E /* IPFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IPFilter.h; path = ../../../src/IPFilter.h; sourceTree = SOURCE_ROOT; };
+		48791D5D11926AEE002C086E /* KnownFileList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KnownFileList.cpp; path = ../../../src/KnownFileList.cpp; sourceTree = SOURCE_ROOT; };
+		48791D5E11926AEE002C086E /* KnownFileList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KnownFileList.h; path = ../../../src/KnownFileList.h; sourceTree = SOURCE_ROOT; };
+		48791D5F11926AEE002C086E /* ListenSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ListenSocket.cpp; path = ../../../src/ListenSocket.cpp; sourceTree = SOURCE_ROOT; };
+		48791D6011926AEE002C086E /* ListenSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ListenSocket.h; path = ../../../src/ListenSocket.h; sourceTree = SOURCE_ROOT; };
+		48791D6111926AEE002C086E /* MuleUDPSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MuleUDPSocket.cpp; path = ../../../src/MuleUDPSocket.cpp; sourceTree = SOURCE_ROOT; };
+		48791D6211926AEE002C086E /* MuleUDPSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuleUDPSocket.h; path = ../../../src/MuleUDPSocket.h; sourceTree = SOURCE_ROOT; };
+		48791D6311926AEE002C086E /* PartFileConvert.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PartFileConvert.cpp; path = ../../../src/PartFileConvert.cpp; sourceTree = SOURCE_ROOT; };
+		48791D6411926AEE002C086E /* PartFileConvert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PartFileConvert.h; path = ../../../src/PartFileConvert.h; sourceTree = SOURCE_ROOT; };
+		48791D6511926AEE002C086E /* SearchFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SearchFile.cpp; path = ../../../src/SearchFile.cpp; sourceTree = SOURCE_ROOT; };
+		48791D6611926AEE002C086E /* SearchFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SearchFile.h; path = ../../../src/SearchFile.h; sourceTree = SOURCE_ROOT; };
+		48791D6711926AEE002C086E /* SearchList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SearchList.cpp; path = ../../../src/SearchList.cpp; sourceTree = SOURCE_ROOT; };
+		48791D6811926AEE002C086E /* SearchList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SearchList.h; path = ../../../src/SearchList.h; sourceTree = SOURCE_ROOT; };
+		48791D6911926AEE002C086E /* ServerConnect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ServerConnect.cpp; path = ../../../src/ServerConnect.cpp; sourceTree = SOURCE_ROOT; };
+		48791D6A11926AEE002C086E /* ServerConnect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ServerConnect.h; path = ../../../src/ServerConnect.h; sourceTree = SOURCE_ROOT; };
+		48791D6B11926AEE002C086E /* ServerList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ServerList.cpp; path = ../../../src/ServerList.cpp; sourceTree = SOURCE_ROOT; };
+		48791D6C11926AEE002C086E /* ServerList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ServerList.h; path = ../../../src/ServerList.h; sourceTree = SOURCE_ROOT; };
+		48791D6D11926AEE002C086E /* ServerSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ServerSocket.cpp; path = ../../../src/ServerSocket.cpp; sourceTree = SOURCE_ROOT; };
+		48791D6E11926AEE002C086E /* ServerSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ServerSocket.h; path = ../../../src/ServerSocket.h; sourceTree = SOURCE_ROOT; };
+		48791D6F11926AEE002C086E /* ServerUDPSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ServerUDPSocket.cpp; path = ../../../src/ServerUDPSocket.cpp; sourceTree = SOURCE_ROOT; };
+		48791D7011926AEE002C086E /* ServerUDPSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ServerUDPSocket.h; path = ../../../src/ServerUDPSocket.h; sourceTree = SOURCE_ROOT; };
+		48791D7111926AEE002C086E /* SharedFileList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SharedFileList.cpp; path = ../../../src/SharedFileList.cpp; sourceTree = SOURCE_ROOT; };
+		48791D7211926AEE002C086E /* SharedFileList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedFileList.h; path = ../../../src/SharedFileList.h; sourceTree = SOURCE_ROOT; };
+		48791D7311926AEE002C086E /* TerminationProcessAmuleweb.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TerminationProcessAmuleweb.cpp; path = ../../../src/TerminationProcessAmuleweb.cpp; sourceTree = SOURCE_ROOT; };
+		48791D7411926AEE002C086E /* TerminationProcessAmuleweb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TerminationProcessAmuleweb.h; path = ../../../src/TerminationProcessAmuleweb.h; sourceTree = SOURCE_ROOT; };
+		48791D7511926AEE002C086E /* ThreadTasks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadTasks.cpp; path = ../../../src/ThreadTasks.cpp; sourceTree = SOURCE_ROOT; };
+		48791D7611926AEE002C086E /* ThreadTasks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadTasks.h; path = ../../../src/ThreadTasks.h; sourceTree = SOURCE_ROOT; };
+		48791D7711926AEE002C086E /* UploadBandwidthThrottler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UploadBandwidthThrottler.cpp; path = ../../../src/UploadBandwidthThrottler.cpp; sourceTree = SOURCE_ROOT; };
+		48791D7811926AEE002C086E /* UploadBandwidthThrottler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UploadBandwidthThrottler.h; path = ../../../src/UploadBandwidthThrottler.h; sourceTree = SOURCE_ROOT; };
+		48791D7911926AEE002C086E /* UploadClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UploadClient.cpp; path = ../../../src/UploadClient.cpp; sourceTree = SOURCE_ROOT; };
+		48791D7A11926AEE002C086E /* UploadQueue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UploadQueue.cpp; path = ../../../src/UploadQueue.cpp; sourceTree = SOURCE_ROOT; };
+		48791D7B11926AEE002C086E /* UploadQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UploadQueue.h; path = ../../../src/UploadQueue.h; sourceTree = SOURCE_ROOT; };
+		48791DE311926B21002C086E /* KademliaUDPListener.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KademliaUDPListener.cpp; path = ../../../src/kademlia/net/KademliaUDPListener.cpp; sourceTree = SOURCE_ROOT; };
+		48791DE411926B21002C086E /* KademliaUDPListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KademliaUDPListener.h; path = ../../../src/kademlia/net/KademliaUDPListener.h; sourceTree = SOURCE_ROOT; };
+		48791DE511926B21002C086E /* PacketTracking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PacketTracking.cpp; path = ../../../src/kademlia/net/PacketTracking.cpp; sourceTree = SOURCE_ROOT; };
+		48791DE611926B21002C086E /* PacketTracking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PacketTracking.h; path = ../../../src/kademlia/net/PacketTracking.h; sourceTree = SOURCE_ROOT; };
+		48791E2511926B41002C086E /* Indexed.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Indexed.cpp; path = ../../../src/kademlia/kademlia/Indexed.cpp; sourceTree = SOURCE_ROOT; };
+		48791E2611926B41002C086E /* Indexed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Indexed.h; path = ../../../src/kademlia/kademlia/Indexed.h; sourceTree = SOURCE_ROOT; };
+		48791E2711926B41002C086E /* Kademlia.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Kademlia.cpp; path = ../../../src/kademlia/kademlia/Kademlia.cpp; sourceTree = SOURCE_ROOT; };
+		48791E2811926B41002C086E /* Kademlia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Kademlia.h; path = ../../../src/kademlia/kademlia/Kademlia.h; sourceTree = SOURCE_ROOT; };
+		48791E2911926B41002C086E /* Prefs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Prefs.cpp; path = ../../../src/kademlia/kademlia/Prefs.cpp; sourceTree = SOURCE_ROOT; };
+		48791E2A11926B41002C086E /* Prefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Prefs.h; path = ../../../src/kademlia/kademlia/Prefs.h; sourceTree = SOURCE_ROOT; };
+		48791E2B11926B41002C086E /* Search.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Search.cpp; path = ../../../src/kademlia/kademlia/Search.cpp; sourceTree = SOURCE_ROOT; };
+		48791E2C11926B41002C086E /* Search.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Search.h; path = ../../../src/kademlia/kademlia/Search.h; sourceTree = SOURCE_ROOT; };
+		48791E2D11926B41002C086E /* UDPFirewallTester.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UDPFirewallTester.cpp; path = ../../../src/kademlia/kademlia/UDPFirewallTester.cpp; sourceTree = SOURCE_ROOT; };
+		48791E2E11926B41002C086E /* UDPFirewallTester.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UDPFirewallTester.h; path = ../../../src/kademlia/kademlia/UDPFirewallTester.h; sourceTree = SOURCE_ROOT; };
+		48791E7C11926B54002C086E /* RoutingZone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RoutingZone.cpp; path = ../../../src/kademlia/routing/RoutingZone.cpp; sourceTree = SOURCE_ROOT; };
+		48791E7D11926B54002C086E /* RoutingZone.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RoutingZone.h; path = ../../../src/kademlia/routing/RoutingZone.h; sourceTree = SOURCE_ROOT; };
+		48791EAB11926CC7002C086E /* AddFriend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AddFriend.cpp; path = ../../../src/AddFriend.cpp; sourceTree = SOURCE_ROOT; };
+		48791EAC11926CC7002C086E /* AddFriend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AddFriend.h; path = ../../../src/AddFriend.h; sourceTree = SOURCE_ROOT; };
+		48791EAD11926CC7002C086E /* amule-gui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "amule-gui.cpp"; path = "../../../src/amule-gui.cpp"; sourceTree = SOURCE_ROOT; };
+		48791EAE11926CC7002C086E /* amuleDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = amuleDlg.cpp; path = ../../../src/amuleDlg.cpp; sourceTree = SOURCE_ROOT; };
+		48791EAF11926CC7002C086E /* amuleDlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = amuleDlg.h; path = ../../../src/amuleDlg.h; sourceTree = SOURCE_ROOT; };
+		48791EB011926CC7002C086E /* CatDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CatDialog.cpp; path = ../../../src/CatDialog.cpp; sourceTree = SOURCE_ROOT; };
+		48791EB111926CC7002C086E /* CatDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CatDialog.h; path = ../../../src/CatDialog.h; sourceTree = SOURCE_ROOT; };
+		48791EB211926CC7002C086E /* ChatSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChatSelector.cpp; path = ../../../src/ChatSelector.cpp; sourceTree = SOURCE_ROOT; };
+		48791EB311926CC7002C086E /* ChatSelector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChatSelector.h; path = ../../../src/ChatSelector.h; sourceTree = SOURCE_ROOT; };
+		48791EB411926CC7002C086E /* ClientDetailDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClientDetailDialog.cpp; path = ../../../src/ClientDetailDialog.cpp; sourceTree = SOURCE_ROOT; };
+		48791EB511926CC7002C086E /* ClientDetailDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClientDetailDialog.h; path = ../../../src/ClientDetailDialog.h; sourceTree = SOURCE_ROOT; };
+		48791EB811926CC7002C086E /* DirectoryTreeCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryTreeCtrl.cpp; path = ../../../src/DirectoryTreeCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791EB911926CC7002C086E /* DirectoryTreeCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DirectoryTreeCtrl.h; path = ../../../src/DirectoryTreeCtrl.h; sourceTree = SOURCE_ROOT; };
+		48791EBA11926CC7002C086E /* DownloadListCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DownloadListCtrl.cpp; path = ../../../src/DownloadListCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791EBB11926CC7002C086E /* DownloadListCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DownloadListCtrl.h; path = ../../../src/DownloadListCtrl.h; sourceTree = SOURCE_ROOT; };
+		48791EBC11926CC7002C086E /* FileDetailDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileDetailDialog.cpp; path = ../../../src/FileDetailDialog.cpp; sourceTree = SOURCE_ROOT; };
+		48791EBD11926CC7002C086E /* FileDetailDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileDetailDialog.h; path = ../../../src/FileDetailDialog.h; sourceTree = SOURCE_ROOT; };
+		48791EBE11926CC7002C086E /* FriendListCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FriendListCtrl.cpp; path = ../../../src/FriendListCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791EBF11926CC7002C086E /* FriendListCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FriendListCtrl.h; path = ../../../src/FriendListCtrl.h; sourceTree = SOURCE_ROOT; };
+		48791EC011926CC7002C086E /* KadDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KadDlg.cpp; path = ../../../src/KadDlg.cpp; sourceTree = SOURCE_ROOT; };
+		48791EC111926CC7002C086E /* KadDlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KadDlg.h; path = ../../../src/KadDlg.h; sourceTree = SOURCE_ROOT; };
+		48791EC211926CC7002C086E /* MuleColour.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MuleColour.cpp; path = ../../../src/MuleColour.cpp; sourceTree = SOURCE_ROOT; };
+		48791EC311926CC7002C086E /* MuleColour.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuleColour.h; path = ../../../src/MuleColour.h; sourceTree = SOURCE_ROOT; };
+		48791EC411926CC7002C086E /* MuleTrayIcon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MuleTrayIcon.cpp; path = ../../../src/MuleTrayIcon.cpp; sourceTree = SOURCE_ROOT; };
+		48791EC511926CC7002C086E /* MuleTrayIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuleTrayIcon.h; path = ../../../src/MuleTrayIcon.h; sourceTree = SOURCE_ROOT; };
+		48791EC611926CC7002C086E /* OScopeCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OScopeCtrl.cpp; path = ../../../src/OScopeCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791EC711926CC7002C086E /* OScopeCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OScopeCtrl.h; path = ../../../src/OScopeCtrl.h; sourceTree = SOURCE_ROOT; };
+		48791EC811926CC7002C086E /* PartFileConvertDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PartFileConvertDlg.cpp; path = ../../../src/PartFileConvertDlg.cpp; sourceTree = SOURCE_ROOT; };
+		48791EC911926CC7002C086E /* PartFileConvertDlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PartFileConvertDlg.h; path = ../../../src/PartFileConvertDlg.h; sourceTree = SOURCE_ROOT; };
+		48791ECA11926CC7002C086E /* PrefsUnifiedDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PrefsUnifiedDlg.cpp; path = ../../../src/PrefsUnifiedDlg.cpp; sourceTree = SOURCE_ROOT; };
+		48791ECB11926CC7002C086E /* PrefsUnifiedDlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrefsUnifiedDlg.h; path = ../../../src/PrefsUnifiedDlg.h; sourceTree = SOURCE_ROOT; };
+		48791ECC11926CC7002C086E /* SearchDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SearchDlg.cpp; path = ../../../src/SearchDlg.cpp; sourceTree = SOURCE_ROOT; };
+		48791ECD11926CC7002C086E /* SearchDlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SearchDlg.h; path = ../../../src/SearchDlg.h; sourceTree = SOURCE_ROOT; };
+		48791ECE11926CC7002C086E /* SearchListCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SearchListCtrl.cpp; path = ../../../src/SearchListCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791ECF11926CC7002C086E /* SearchListCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SearchListCtrl.h; path = ../../../src/SearchListCtrl.h; sourceTree = SOURCE_ROOT; };
+		48791ED011926CC7002C086E /* ServerListCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ServerListCtrl.cpp; path = ../../../src/ServerListCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791ED111926CC7002C086E /* ServerListCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ServerListCtrl.h; path = ../../../src/ServerListCtrl.h; sourceTree = SOURCE_ROOT; };
+		48791ED211926CC7002C086E /* ServerWnd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ServerWnd.cpp; path = ../../../src/ServerWnd.cpp; sourceTree = SOURCE_ROOT; };
+		48791ED311926CC7002C086E /* ServerWnd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ServerWnd.h; path = ../../../src/ServerWnd.h; sourceTree = SOURCE_ROOT; };
+		48791ED411926CC7002C086E /* SharedFilesCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SharedFilesCtrl.cpp; path = ../../../src/SharedFilesCtrl.cpp; sourceTree = SOURCE_ROOT; };
+		48791ED511926CC7002C086E /* SharedFilesCtrl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedFilesCtrl.h; path = ../../../src/SharedFilesCtrl.h; sourceTree = SOURCE_ROOT; };
+		48791ED611926CC7002C086E /* SharedFilesWnd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SharedFilesWnd.cpp; path = ../../../src/SharedFilesWnd.cpp; sourceTree = SOURCE_ROOT; };
+		48791ED711926CC7002C086E /* SharedFilesWnd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharedFilesWnd.h; path = ../../../src/SharedFilesWnd.h; sourceTree = SOURCE_ROOT; };
+		48791ED811926CC7002C086E /* StatisticsDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StatisticsDlg.cpp; path = ../../../src/StatisticsDlg.cpp; sourceTree = SOURCE_ROOT; };
+		48791ED911926CC7002C086E /* StatisticsDlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatisticsDlg.h; path = ../../../src/StatisticsDlg.h; sourceTree = SOURCE_ROOT; };
+		48791EDA11926CC7002C086E /* TransferWnd.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TransferWnd.cpp; path = ../../../src/TransferWnd.cpp; sourceTree = SOURCE_ROOT; };
+		48791EDB11926CC7002C086E /* TransferWnd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TransferWnd.h; path = ../../../src/TransferWnd.h; sourceTree = SOURCE_ROOT; };
+		48791F6611926F24002C086E /* amuleAppCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = amuleAppCommon.cpp; path = ../../../src/amuleAppCommon.cpp; sourceTree = SOURCE_ROOT; };
+		48791F6711926F24002C086E /* ClientCredits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ClientCredits.cpp; path = ../../../src/ClientCredits.cpp; sourceTree = SOURCE_ROOT; };
+		48791F6811926F24002C086E /* ClientCredits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClientCredits.h; path = ../../../src/ClientCredits.h; sourceTree = SOURCE_ROOT; };
+		48791F6911926F24002C086E /* ECSpecialMuleTags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ECSpecialMuleTags.cpp; path = ../../../src/ECSpecialMuleTags.cpp; sourceTree = SOURCE_ROOT; };
+		48791F6A11926F24002C086E /* GetTickCount.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GetTickCount.cpp; path = ../../../src/GetTickCount.cpp; sourceTree = SOURCE_ROOT; };
+		48791F6B11926F24002C086E /* GetTickCount.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GetTickCount.h; path = ../../../src/GetTickCount.h; sourceTree = SOURCE_ROOT; };
+		48791F6C11926F24002C086E /* GuiEvents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GuiEvents.cpp; path = ../../../src/GuiEvents.cpp; sourceTree = SOURCE_ROOT; };
+		48791F6D11926F24002C086E /* GuiEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = GuiEvents.h; path = ../../../src/GuiEvents.h; sourceTree = SOURCE_ROOT; };
+		48791F6E11926F24002C086E /* KnownFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = KnownFile.cpp; path = ../../../src/KnownFile.cpp; sourceTree = SOURCE_ROOT; };
+		48791F6F11926F24002C086E /* KnownFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = KnownFile.h; path = ../../../src/KnownFile.h; sourceTree = SOURCE_ROOT; };
+		48791F7011926F24002C086E /* Logger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Logger.cpp; path = ../../../src/Logger.cpp; sourceTree = SOURCE_ROOT; };
+		48791F7111926F24002C086E /* Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logger.h; path = ../../../src/Logger.h; sourceTree = SOURCE_ROOT; };
+		48791F7211926F24002C086E /* PartFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PartFile.cpp; path = ../../../src/PartFile.cpp; sourceTree = SOURCE_ROOT; };
+		48791F7311926F24002C086E /* PartFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PartFile.h; path = ../../../src/PartFile.h; sourceTree = SOURCE_ROOT; };
+		48791F7411926F24002C086E /* Preferences.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Preferences.cpp; path = ../../../src/Preferences.cpp; sourceTree = SOURCE_ROOT; };
+		48791F7511926F24002C086E /* Preferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Preferences.h; path = ../../../src/Preferences.h; sourceTree = SOURCE_ROOT; };
+		48791F7611926F24002C086E /* Proxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Proxy.cpp; path = ../../../src/Proxy.cpp; sourceTree = SOURCE_ROOT; };
+		48791F7711926F24002C086E /* Proxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Proxy.h; path = ../../../src/Proxy.h; sourceTree = SOURCE_ROOT; };
+		48791F7811926F24002C086E /* Server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Server.cpp; path = ../../../src/Server.cpp; sourceTree = SOURCE_ROOT; };
+		48791F7911926F24002C086E /* Server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Server.h; path = ../../../src/Server.h; sourceTree = SOURCE_ROOT; };
+		48791F7A11926F24002C086E /* SHAHashSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SHAHashSet.cpp; path = ../../../src/SHAHashSet.cpp; sourceTree = SOURCE_ROOT; };
+		48791F7B11926F24002C086E /* SHAHashSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SHAHashSet.h; path = ../../../src/SHAHashSet.h; sourceTree = SOURCE_ROOT; };
+		48791F7C11926F24002C086E /* Statistics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Statistics.cpp; path = ../../../src/Statistics.cpp; sourceTree = SOURCE_ROOT; };
+		48791F7D11926F24002C086E /* Statistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Statistics.h; path = ../../../src/Statistics.h; sourceTree = SOURCE_ROOT; };
+		48791F7E11926F24002C086E /* StatTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StatTree.cpp; path = ../../../src/StatTree.cpp; sourceTree = SOURCE_ROOT; };
+		48791F7F11926F24002C086E /* StatTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StatTree.h; path = ../../../src/StatTree.h; sourceTree = SOURCE_ROOT; };
+		48791F8011926F24002C086E /* TerminationProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TerminationProcess.cpp; path = ../../../src/TerminationProcess.cpp; sourceTree = SOURCE_ROOT; };
+		48791F8111926F24002C086E /* TerminationProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TerminationProcess.h; path = ../../../src/TerminationProcess.h; sourceTree = SOURCE_ROOT; };
+		48791F8211926F24002C086E /* UserEvents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = UserEvents.cpp; path = ../../../src/UserEvents.cpp; sourceTree = SOURCE_ROOT; };
+		48791F8311926F24002C086E /* UserEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UserEvents.h; path = ../../../src/UserEvents.h; sourceTree = SOURCE_ROOT; };
+		48791FD611926F74002C086E /* NetworkFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkFunctions.cpp; path = ../../../src/NetworkFunctions.cpp; sourceTree = SOURCE_ROOT; };
+		48791FD711926F74002C086E /* NetworkFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkFunctions.h; path = ../../../src/NetworkFunctions.h; sourceTree = SOURCE_ROOT; };
+		48791FD811926F74002C086E /* OtherFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OtherFunctions.cpp; path = ../../../src/OtherFunctions.cpp; sourceTree = SOURCE_ROOT; };
+		48791FD911926F74002C086E /* OtherFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OtherFunctions.h; path = ../../../src/OtherFunctions.h; sourceTree = SOURCE_ROOT; };
+		487920361192730F002C086E /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+		4879205C119274FA002C086E /* FileFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileFunctions.cpp; path = ../../../src/libs/common/FileFunctions.cpp; sourceTree = SOURCE_ROOT; };
+		4879205D119274FA002C086E /* FileFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileFunctions.h; path = ../../../src/libs/common/FileFunctions.h; sourceTree = SOURCE_ROOT; };
+		4879205E119274FA002C086E /* Format.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Format.cpp; path = ../../../src/libs/common/Format.cpp; sourceTree = SOURCE_ROOT; };
+		4879205F119274FA002C086E /* Format.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Format.h; path = ../../../src/libs/common/Format.h; sourceTree = SOURCE_ROOT; };
+		48792060119274FA002C086E /* MD5Sum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MD5Sum.cpp; path = ../../../src/libs/common/MD5Sum.cpp; sourceTree = SOURCE_ROOT; };
+		48792061119274FA002C086E /* MD5Sum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MD5Sum.h; path = ../../../src/libs/common/MD5Sum.h; sourceTree = SOURCE_ROOT; };
+		48792062119274FA002C086E /* MuleDebug.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MuleDebug.cpp; path = ../../../src/libs/common/MuleDebug.cpp; sourceTree = SOURCE_ROOT; };
+		48792063119274FA002C086E /* MuleDebug.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MuleDebug.h; path = ../../../src/libs/common/MuleDebug.h; sourceTree = SOURCE_ROOT; };
+		48792064119274FA002C086E /* Path.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Path.cpp; path = ../../../src/libs/common/Path.cpp; sourceTree = SOURCE_ROOT; };
+		48792065119274FA002C086E /* Path.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Path.h; path = ../../../src/libs/common/Path.h; sourceTree = SOURCE_ROOT; };
+		48792066119274FA002C086E /* StringFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StringFunctions.cpp; path = ../../../src/libs/common/StringFunctions.cpp; sourceTree = SOURCE_ROOT; };
+		48792067119274FA002C086E /* StringFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StringFunctions.h; path = ../../../src/libs/common/StringFunctions.h; sourceTree = SOURCE_ROOT; };
+		48792068119274FA002C086E /* TextFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextFile.cpp; path = ../../../src/libs/common/TextFile.cpp; sourceTree = SOURCE_ROOT; };
+		48792069119274FA002C086E /* TextFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextFile.h; path = ../../../src/libs/common/TextFile.h; sourceTree = SOURCE_ROOT; };
+		4879213211927582002C086E /* ECMuleSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ECMuleSocket.cpp; path = ../../../src/libs/ec/cpp/ECMuleSocket.cpp; sourceTree = SOURCE_ROOT; };
+		4879213311927582002C086E /* ECMuleSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ECMuleSocket.h; path = ../../../src/libs/ec/cpp/ECMuleSocket.h; sourceTree = SOURCE_ROOT; };
+		4879213411927582002C086E /* ECPacket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ECPacket.cpp; path = ../../../src/libs/ec/cpp/ECPacket.cpp; sourceTree = SOURCE_ROOT; };
+		4879213511927582002C086E /* ECPacket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ECPacket.h; path = ../../../src/libs/ec/cpp/ECPacket.h; sourceTree = SOURCE_ROOT; };
+		4879213611927582002C086E /* ECSocket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ECSocket.cpp; path = ../../../src/libs/ec/cpp/ECSocket.cpp; sourceTree = SOURCE_ROOT; };
+		4879213711927582002C086E /* ECSocket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ECSocket.h; path = ../../../src/libs/ec/cpp/ECSocket.h; sourceTree = SOURCE_ROOT; };
+		4879213811927582002C086E /* ECSpecialTags.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ECSpecialTags.cpp; path = ../../../src/libs/ec/cpp/ECSpecialTags.cpp; sourceTree = SOURCE_ROOT; };
+		4879213911927582002C086E /* ECSpecialTags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ECSpecialTags.h; path = ../../../src/libs/ec/cpp/ECSpecialTags.h; sourceTree = SOURCE_ROOT; };
+		4879213A11927582002C086E /* ECTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ECTag.cpp; path = ../../../src/libs/ec/cpp/ECTag.cpp; sourceTree = SOURCE_ROOT; };
+		4879213B11927582002C086E /* ECTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ECTag.h; path = ../../../src/libs/ec/cpp/ECTag.h; sourceTree = SOURCE_ROOT; };
+		4879213C11927582002C086E /* RemoteConnect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RemoteConnect.cpp; path = ../../../src/libs/ec/cpp/RemoteConnect.cpp; sourceTree = SOURCE_ROOT; };
+		4879213D11927582002C086E /* RemoteConnect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RemoteConnect.h; path = ../../../src/libs/ec/cpp/RemoteConnect.h; sourceTree = SOURCE_ROOT; };
+		487922C811927626002C086E /* CaptchaDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CaptchaDialog.cpp; path = ../../../src/CaptchaDialog.cpp; sourceTree = SOURCE_ROOT; };
+		487922C911927626002C086E /* CaptchaDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CaptchaDialog.h; path = ../../../src/CaptchaDialog.h; sourceTree = SOURCE_ROOT; };
+		487922CA11927626002C086E /* CaptchaGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CaptchaGenerator.cpp; path = ../../../src/CaptchaGenerator.cpp; sourceTree = SOURCE_ROOT; };
+		487922CB11927626002C086E /* CaptchaGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CaptchaGenerator.h; path = ../../../src/CaptchaGenerator.h; sourceTree = SOURCE_ROOT; };
+		488D4E8E1192CB880089BF8E /* README BEFORE BUILDING.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = "README BEFORE BUILDING.rtf"; sourceTree = "<group>"; };
+		48CB3DB411B58AA80051CAF2 /* IPFilterScanner.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IPFilterScanner.cpp; path = ../../../src/IPFilterScanner.cpp; sourceTree = SOURCE_ROOT; };
+		48CB3DB511B58AA80051CAF2 /* IPFilterScanner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IPFilterScanner.h; path = ../../../src/IPFilterScanner.h; sourceTree = SOURCE_ROOT; };
+		8D1107310486CEB800E47090 /* aMule_Xcode-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "aMule_Xcode-Info.plist"; sourceTree = "<group>"; };
+		8D1107320486CEB800E47090 /* aMule.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = aMule.app; sourceTree = BUILT_PRODUCTS_DIR; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8D11072E0486CEB800E47090 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
+				487920371192730F002C086E /* libz.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		080E96DDFE201D6D7F000001 /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				48791F9411926F44002C086E /* remote_common_sources */,
+				48791F6511926D4E002C086E /* common_sources */,
+				48791EAA11926B8E002C086E /* gui_sources */,
+				48791D3C11926A40002C086E /* core_sources */,
+				48791D0D119269A0002C086E /* libmuleappgui */,
+				487911E711925EA7002C086E /* libmuleappcore */,
+				4879114A11925DEC002C086E /* libmuleappcommon */,
+			);
+			name = Classes;
+			sourceTree = "<group>";
+		};
+		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
+				487920361192730F002C086E /* libz.dylib */,
+			);
+			name = "Linked Frameworks";
+			sourceTree = "<group>";
+		};
+		1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+				13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
+				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		19C28FACFE9D520D11CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D1107320486CEB800E47090 /* aMule.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		29B97314FDCFA39411CA2CEA /* aMule-Xcode */ = {
+			isa = PBXGroup;
+			children = (
+				488D4E8E1192CB880089BF8E /* README BEFORE BUILDING.rtf */,
+				48792056119274B2002C086E /* libs */,
+				080E96DDFE201D6D7F000001 /* Classes */,
+				29B97315FDCFA39411CA2CEA /* Other Sources */,
+				29B97323FDCFA39411CA2CEA /* Frameworks */,
+				19C28FACFE9D520D11CA2CBB /* Products */,
+			);
+			name = "aMule-Xcode";
+			sourceTree = "<group>";
+		};
+		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
+			isa = PBXGroup;
+			children = (
+				48636E2A119E5A4300BC3DB6 /* ArchSpecific.h */,
+				48636E2B119E5A4300BC3DB6 /* Constants.h */,
+				48636E2C119E5A4300BC3DB6 /* CryptoPP_Inc.h */,
+				256AC3F00F4B6AF500CF3369 /* aMule_Xcode_Prefix.pch */,
+			);
+			name = "Other Sources";
+			sourceTree = "<group>";
+		};
+		29B97317FDCFA39411CA2CEA /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				4833446F1196275F00D9BE75 /* amule.icns */,
+				8D1107310486CEB800E47090 /* aMule_Xcode-Info.plist */,
+				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
+				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		4879114A11925DEC002C086E /* libmuleappcommon */ = {
+			isa = PBXGroup;
+			children = (
+				4879119511925E61002C086E /* CFile.cpp */,
+				4879119611925E61002C086E /* CFile.h */,
+				4879119711925E61002C086E /* DataToText.cpp */,
+				4879119811925E61002C086E /* DataToText.h */,
+				4879119911925E61002C086E /* ED2KLink.cpp */,
+				4879119A11925E61002C086E /* ED2KLink.h */,
+				4879119B11925E61002C086E /* GapList.cpp */,
+				4879119C11925E61002C086E /* GapList.h */,
+				4879119D11925E61002C086E /* MagnetURI.cpp */,
+				4879119E11925E61002C086E /* MagnetURI.h */,
+				4879119F11925E61002C086E /* MemFile.cpp */,
+				487911A011925E61002C086E /* MemFile.h */,
+				487911A311925E61002C086E /* Packet.cpp */,
+				487911A411925E61002C086E /* Packet.h */,
+				487911A511925E61002C086E /* RLE.cpp */,
+				487911A611925E61002C086E /* RLE.h */,
+				487911A711925E61002C086E /* SafeFile.cpp */,
+				487911A811925E61002C086E /* SafeFile.h */,
+				487911A911925E61002C086E /* SHA.cpp */,
+				487911AA11925E61002C086E /* SHA.h */,
+				487911AB11925E61002C086E /* Tag.cpp */,
+				487911AC11925E61002C086E /* Tag.h */,
+				487911AD11925E61002C086E /* Timer.cpp */,
+				487911AE11925E61002C086E /* Timer.h */,
+			);
+			name = libmuleappcommon;
+			sourceTree = "<group>";
+		};
+		487911E711925EA7002C086E /* libmuleappcore */ = {
+			isa = PBXGroup;
+			children = (
+				29B97317FDCFA39411CA2CEA /* Resources */,
+				4879120F11925FE2002C086E /* kademlia */,
+				487911E811925FDD002C086E /* AsyncDNS.cpp */,
+				487911E911925FDD002C086E /* AsyncDNS.h */,
+				487911EA11925FDD002C086E /* DeadSourceList.cpp */,
+				487911EB11925FDD002C086E /* DeadSourceList.h */,
+				487911EC11925FDD002C086E /* FileArea.cpp */,
+				487911ED11925FDD002C086E /* FileArea.h */,
+				487911EE11925FDD002C086E /* FileAutoClose.cpp */,
+				487911EF11925FDD002C086E /* FileAutoClose.h */,
+				487911F011925FDD002C086E /* Friend.cpp */,
+				487911F111925FDD002C086E /* Friend.h */,
+				487911F211925FDD002C086E /* Parser.cpp */,
+				487911F311925FDD002C086E /* Parser.hpp */,
+				487911F411925FDD002C086E /* PlatformSpecific.cpp */,
+				487911F511925FDD002C086E /* PlatformSpecific.h */,
+				487911F611925FDD002C086E /* RandomFunctions.cpp */,
+				487911F711925FDD002C086E /* RandomFunctions.h */,
+				487911F811925FDD002C086E /* RC4Encrypt.cpp */,
+				487911F911925FDD002C086E /* RC4Encrypt.h */,
+				487911FA11925FDD002C086E /* Scanner.cpp */,
+				487911FB11925FDD002C086E /* Scanner.h */,
+				487911FC11925FDD002C086E /* StateMachine.cpp */,
+				487911FD11925FDD002C086E /* StateMachine.h */,
+				487911FE11925FDD002C086E /* ThreadScheduler.cpp */,
+				487911FF11925FDD002C086E /* ThreadScheduler.h */,
+				4879120011925FDD002C086E /* UPnPBase.cpp */,
+				4879120111925FDD002C086E /* UPnPBase.h */,
+			);
+			name = libmuleappcore;
+			sourceTree = "<group>";
+		};
+		4879120F11925FE2002C086E /* kademlia */ = {
+			isa = PBXGroup;
+			children = (
+				4879121211925FF9002C086E /* utils */,
+				4879121111925FF4002C086E /* routing */,
+				4879121011925FEF002C086E /* kademlia */,
+			);
+			name = kademlia;
+			sourceTree = "<group>";
+		};
+		4879121011925FEF002C086E /* kademlia */ = {
+			isa = PBXGroup;
+			children = (
+				487917E11192601E002C086E /* Entry.cpp */,
+				487917E21192601E002C086E /* Entry.h */,
+				487917E31192601E002C086E /* SearchManager.cpp */,
+				487917E41192601E002C086E /* SearchManager.h */,
+			);
+			name = kademlia;
+			sourceTree = "<group>";
+		};
+		4879121111925FF4002C086E /* routing */ = {
+			isa = PBXGroup;
+			children = (
+				48791CD91192607A002C086E /* Contact.cpp */,
+				48791CDA1192607A002C086E /* Contact.h */,
+				48791CDB1192607A002C086E /* RoutingBin.cpp */,
+				48791CDC1192607A002C086E /* RoutingBin.h */,
+			);
+			name = routing;
+			sourceTree = "<group>";
+		};
+		4879121211925FF9002C086E /* utils */ = {
+			isa = PBXGroup;
+			children = (
+				48791D0A119260A0002C086E /* UInt128.cpp */,
+				48791D0B119260A0002C086E /* UInt128.h */,
+			);
+			name = utils;
+			sourceTree = "<group>";
+		};
+		48791D0D119269A0002C086E /* libmuleappgui */ = {
+			isa = PBXGroup;
+			children = (
+				48791D3811926A11002C086E /* extern */,
+				48791D0E11926A0E002C086E /* BarShader.cpp */,
+				48791D0F11926A0E002C086E /* BarShader.h */,
+				48791D1011926A0E002C086E /* ChatWnd.cpp */,
+				48791D1111926A0E002C086E /* ChatWnd.h */,
+				48791D1211926A0E002C086E /* ColorFrameCtrl.cpp */,
+				48791D1311926A0E002C086E /* ColorFrameCtrl.h */,
+				48791D1411926A0E002C086E /* CommentDialog.cpp */,
+				48791D1511926A0E002C086E /* CommentDialog.h */,
+				48791D1611926A0E002C086E /* CommentDialogLst.cpp */,
+				48791D1711926A0E002C086E /* CommentDialogLst.h */,
+				48791D1811926A0E002C086E /* EditServerListDlg.cpp */,
+				48791D1911926A0E002C086E /* EditServerListDlg.h */,
+				48791D1A11926A0E002C086E /* FileDetailListCtrl.cpp */,
+				48791D1B11926A0E002C086E /* FileDetailListCtrl.h */,
+				48791D1C11926A0E002C086E /* IP2Country.cpp */,
+				48791D1D11926A0E002C086E /* IP2Country.h */,
+				48791D1E11926A0E002C086E /* MuleCollection.cpp */,
+				48791D1F11926A0E002C086E /* MuleCollection.h */,
+				48791D2011926A0E002C086E /* MuleGifCtrl.cpp */,
+				48791D2111926A0E002C086E /* MuleGifCtrl.h */,
+				48791D2211926A0E002C086E /* MuleListCtrl.cpp */,
+				48791D2311926A0E002C086E /* MuleListCtrl.h */,
+				48791D2411926A0E002C086E /* MuleNotebook.cpp */,
+				48791D2511926A0E002C086E /* MuleNotebook.h */,
+				48791D2611926A0E002C086E /* MuleTextCtrl.cpp */,
+				48791D2711926A0E002C086E /* MuleTextCtrl.h */,
+				48791D2811926A0E002C086E /* muuli_wdr.cpp */,
+				48791D2911926A0E002C086E /* muuli_wdr.h */,
+			);
+			name = libmuleappgui;
+			sourceTree = "<group>";
+		};
+		48791D3811926A11002C086E /* extern */ = {
+			isa = PBXGroup;
+			children = (
+				48791D3911926A2E002C086E /* listctrl.cpp */,
+				48791D3A11926A2E002C086E /* listctrl.h */,
+			);
+			name = extern;
+			sourceTree = "<group>";
+		};
+		48791D3C11926A40002C086E /* core_sources */ = {
+			isa = PBXGroup;
+			children = (
+				48791D9E11926AF6002C086E /* kademlia */,
+				48791D3D11926AEE002C086E /* amule.cpp */,
+				48791D3E11926AEE002C086E /* amule.h */,
+				48791D3F11926AEE002C086E /* BaseClient.cpp */,
+				48791D4011926AEE002C086E /* CanceledFileList.cpp */,
+				48791D4111926AEE002C086E /* CanceledFileList.h */,
+				48791D4211926AEE002C086E /* ClientCreditsList.cpp */,
+				48791D4311926AEE002C086E /* ClientCreditsList.h */,
+				48791D4411926AEE002C086E /* ClientList.cpp */,
+				48791D4511926AEE002C086E /* ClientList.h */,
+				48791D4611926AEE002C086E /* ClientTCPSocket.cpp */,
+				48791D4711926AEE002C086E /* ClientTCPSocket.h */,
+				48791D4811926AEE002C086E /* ClientUDPSocket.cpp */,
+				48791D4911926AEE002C086E /* ClientUDPSocket.h */,
+				48791D4A11926AEE002C086E /* CorruptionBlackBox.cpp */,
+				48791D4B11926AEE002C086E /* CorruptionBlackBox.h */,
+				48791D4C11926AEE002C086E /* DownloadClient.cpp */,
+				48791D4D11926AEE002C086E /* DownloadQueue.cpp */,
+				48791D4E11926AEE002C086E /* DownloadQueue.h */,
+				48791D4F11926AEE002C086E /* ECSpecialCoreTags.cpp */,
+				48791D5011926AEE002C086E /* EMSocket.cpp */,
+				48791D5111926AEE002C086E /* EMSocket.h */,
+				48791D5211926AEE002C086E /* EncryptedDatagramSocket.cpp */,
+				48791D5311926AEE002C086E /* EncryptedDatagramSocket.h */,
+				48791D5411926AEE002C086E /* EncryptedStreamSocket.cpp */,
+				48791D5511926AEE002C086E /* EncryptedStreamSocket.h */,
+				48791D5611926AEE002C086E /* ExternalConn.cpp */,
+				48791D5711926AEE002C086E /* FriendList.cpp */,
+				48791D5811926AEE002C086E /* FriendList.h */,
+				48791D5911926AEE002C086E /* HTTPDownload.cpp */,
+				48791D5A11926AEE002C086E /* HTTPDownload.h */,
+				48791D5B11926AEE002C086E /* IPFilter.cpp */,
+				48791D5C11926AEE002C086E /* IPFilter.h */,
+				48CB3DB511B58AA80051CAF2 /* IPFilterScanner.h */,
+				48CB3DB411B58AA80051CAF2 /* IPFilterScanner.cpp */,
+				48791D5D11926AEE002C086E /* KnownFileList.cpp */,
+				48791D5E11926AEE002C086E /* KnownFileList.h */,
+				48791D5F11926AEE002C086E /* ListenSocket.cpp */,
+				48791D6011926AEE002C086E /* ListenSocket.h */,
+				48791D6111926AEE002C086E /* MuleUDPSocket.cpp */,
+				48791D6211926AEE002C086E /* MuleUDPSocket.h */,
+				48791D6311926AEE002C086E /* PartFileConvert.cpp */,
+				48791D6411926AEE002C086E /* PartFileConvert.h */,
+				48791D6511926AEE002C086E /* SearchFile.cpp */,
+				48791D6611926AEE002C086E /* SearchFile.h */,
+				48791D6711926AEE002C086E /* SearchList.cpp */,
+				48791D6811926AEE002C086E /* SearchList.h */,
+				48791D6911926AEE002C086E /* ServerConnect.cpp */,
+				48791D6A11926AEE002C086E /* ServerConnect.h */,
+				48791D6B11926AEE002C086E /* ServerList.cpp */,
+				48791D6C11926AEE002C086E /* ServerList.h */,
+				48791D6D11926AEE002C086E /* ServerSocket.cpp */,
+				48791D6E11926AEE002C086E /* ServerSocket.h */,
+				48791D6F11926AEE002C086E /* ServerUDPSocket.cpp */,
+				48791D7011926AEE002C086E /* ServerUDPSocket.h */,
+				48791D7111926AEE002C086E /* SharedFileList.cpp */,
+				48791D7211926AEE002C086E /* SharedFileList.h */,
+				48791D7311926AEE002C086E /* TerminationProcessAmuleweb.cpp */,
+				48791D7411926AEE002C086E /* TerminationProcessAmuleweb.h */,
+				48791D7511926AEE002C086E /* ThreadTasks.cpp */,
+				48791D7611926AEE002C086E /* ThreadTasks.h */,
+				48791D7711926AEE002C086E /* UploadBandwidthThrottler.cpp */,
+				48791D7811926AEE002C086E /* UploadBandwidthThrottler.h */,
+				48791D7911926AEE002C086E /* UploadClient.cpp */,
+				48791D7A11926AEE002C086E /* UploadQueue.cpp */,
+				48791D7B11926AEE002C086E /* UploadQueue.h */,
+			);
+			name = core_sources;
+			sourceTree = "<group>";
+		};
+		48791D9E11926AF6002C086E /* kademlia */ = {
+			isa = PBXGroup;
+			children = (
+				48791DA111926B07002C086E /* routing */,
+				48791DA011926B03002C086E /* kademlia */,
+				48791D9F11926AFF002C086E /* net */,
+			);
+			name = kademlia;
+			sourceTree = "<group>";
+		};
+		48791D9F11926AFF002C086E /* net */ = {
+			isa = PBXGroup;
+			children = (
+				48791DE311926B21002C086E /* KademliaUDPListener.cpp */,
+				48791DE411926B21002C086E /* KademliaUDPListener.h */,
+				48791DE511926B21002C086E /* PacketTracking.cpp */,
+				48791DE611926B21002C086E /* PacketTracking.h */,
+			);
+			name = net;
+			sourceTree = "<group>";
+		};
+		48791DA011926B03002C086E /* kademlia */ = {
+			isa = PBXGroup;
+			children = (
+				48791E2511926B41002C086E /* Indexed.cpp */,
+				48791E2611926B41002C086E /* Indexed.h */,
+				48791E2711926B41002C086E /* Kademlia.cpp */,
+				48791E2811926B41002C086E /* Kademlia.h */,
+				48791E2911926B41002C086E /* Prefs.cpp */,
+				48791E2A11926B41002C086E /* Prefs.h */,
+				48791E2B11926B41002C086E /* Search.cpp */,
+				48791E2C11926B41002C086E /* Search.h */,
+				48791E2D11926B41002C086E /* UDPFirewallTester.cpp */,
+				48791E2E11926B41002C086E /* UDPFirewallTester.h */,
+			);
+			name = kademlia;
+			sourceTree = "<group>";
+		};
+		48791DA111926B07002C086E /* routing */ = {
+			isa = PBXGroup;
+			children = (
+				48791E7C11926B54002C086E /* RoutingZone.cpp */,
+				48791E7D11926B54002C086E /* RoutingZone.h */,
+			);
+			name = routing;
+			sourceTree = "<group>";
+		};
+		48791EAA11926B8E002C086E /* gui_sources */ = {
+			isa = PBXGroup;
+			children = (
+				4848D8091192E85900ED40CC /* SharedFilePeersListCtrl.cpp */,
+				4848D80A1192E85900ED40CC /* SharedFilePeersListCtrl.h */,
+				4848D80B1192E85900ED40CC /* SourceListCtrl.cpp */,
+				4848D80C1192E85900ED40CC /* SourceListCtrl.h */,
+				4848D2CD1192E83100ED40CC /* GenericClientListCtrl.cpp */,
+				4848D2CE1192E83100ED40CC /* GenericClientListCtrl.h */,
+				48791EAB11926CC7002C086E /* AddFriend.cpp */,
+				48791EAC11926CC7002C086E /* AddFriend.h */,
+				48791EAD11926CC7002C086E /* amule-gui.cpp */,
+				48791EAE11926CC7002C086E /* amuleDlg.cpp */,
+				48791EAF11926CC7002C086E /* amuleDlg.h */,
+				48791EB011926CC7002C086E /* CatDialog.cpp */,
+				48791EB111926CC7002C086E /* CatDialog.h */,
+				48791EB211926CC7002C086E /* ChatSelector.cpp */,
+				48791EB311926CC7002C086E /* ChatSelector.h */,
+				48791EB411926CC7002C086E /* ClientDetailDialog.cpp */,
+				48791EB511926CC7002C086E /* ClientDetailDialog.h */,
+				48791EB811926CC7002C086E /* DirectoryTreeCtrl.cpp */,
+				48791EB911926CC7002C086E /* DirectoryTreeCtrl.h */,
+				48791EBA11926CC7002C086E /* DownloadListCtrl.cpp */,
+				48791EBB11926CC7002C086E /* DownloadListCtrl.h */,
+				48791EBC11926CC7002C086E /* FileDetailDialog.cpp */,
+				48791EBD11926CC7002C086E /* FileDetailDialog.h */,
+				48791EBE11926CC7002C086E /* FriendListCtrl.cpp */,
+				48791EBF11926CC7002C086E /* FriendListCtrl.h */,
+				48791EC011926CC7002C086E /* KadDlg.cpp */,
+				48791EC111926CC7002C086E /* KadDlg.h */,
+				48791EC211926CC7002C086E /* MuleColour.cpp */,
+				48791EC311926CC7002C086E /* MuleColour.h */,
+				48791EC411926CC7002C086E /* MuleTrayIcon.cpp */,
+				48791EC511926CC7002C086E /* MuleTrayIcon.h */,
+				48791EC611926CC7002C086E /* OScopeCtrl.cpp */,
+				48791EC711926CC7002C086E /* OScopeCtrl.h */,
+				48791EC811926CC7002C086E /* PartFileConvertDlg.cpp */,
+				48791EC911926CC7002C086E /* PartFileConvertDlg.h */,
+				48791ECA11926CC7002C086E /* PrefsUnifiedDlg.cpp */,
+				48791ECB11926CC7002C086E /* PrefsUnifiedDlg.h */,
+				48791ECC11926CC7002C086E /* SearchDlg.cpp */,
+				48791ECD11926CC7002C086E /* SearchDlg.h */,
+				48791ECE11926CC7002C086E /* SearchListCtrl.cpp */,
+				48791ECF11926CC7002C086E /* SearchListCtrl.h */,
+				48791ED011926CC7002C086E /* ServerListCtrl.cpp */,
+				48791ED111926CC7002C086E /* ServerListCtrl.h */,
+				48791ED211926CC7002C086E /* ServerWnd.cpp */,
+				48791ED311926CC7002C086E /* ServerWnd.h */,
+				48791ED411926CC7002C086E /* SharedFilesCtrl.cpp */,
+				48791ED511926CC7002C086E /* SharedFilesCtrl.h */,
+				48791ED611926CC7002C086E /* SharedFilesWnd.cpp */,
+				48791ED711926CC7002C086E /* SharedFilesWnd.h */,
+				48791ED811926CC7002C086E /* StatisticsDlg.cpp */,
+				48791ED911926CC7002C086E /* StatisticsDlg.h */,
+				48791EDA11926CC7002C086E /* TransferWnd.cpp */,
+				48791EDB11926CC7002C086E /* TransferWnd.h */,
+			);
+			name = gui_sources;
+			sourceTree = "<group>";
+		};
+		48791F6511926D4E002C086E /* common_sources */ = {
+			isa = PBXGroup;
+			children = (
+				487922C811927626002C086E /* CaptchaDialog.cpp */,
+				487922C911927626002C086E /* CaptchaDialog.h */,
+				487922CA11927626002C086E /* CaptchaGenerator.cpp */,
+				487922CB11927626002C086E /* CaptchaGenerator.h */,
+				48791F6611926F24002C086E /* amuleAppCommon.cpp */,
+				48791F6711926F24002C086E /* ClientCredits.cpp */,
+				48791F6811926F24002C086E /* ClientCredits.h */,
+				48791F6911926F24002C086E /* ECSpecialMuleTags.cpp */,
+				48791F6A11926F24002C086E /* GetTickCount.cpp */,
+				48791F6B11926F24002C086E /* GetTickCount.h */,
+				48791F6C11926F24002C086E /* GuiEvents.cpp */,
+				48791F6D11926F24002C086E /* GuiEvents.h */,
+				48791F6E11926F24002C086E /* KnownFile.cpp */,
+				48791F6F11926F24002C086E /* KnownFile.h */,
+				48791F7011926F24002C086E /* Logger.cpp */,
+				48791F7111926F24002C086E /* Logger.h */,
+				48791F7211926F24002C086E /* PartFile.cpp */,
+				48791F7311926F24002C086E /* PartFile.h */,
+				48791F7411926F24002C086E /* Preferences.cpp */,
+				48791F7511926F24002C086E /* Preferences.h */,
+				48791F7611926F24002C086E /* Proxy.cpp */,
+				48791F7711926F24002C086E /* Proxy.h */,
+				48791F7811926F24002C086E /* Server.cpp */,
+				48791F7911926F24002C086E /* Server.h */,
+				48791F7A11926F24002C086E /* SHAHashSet.cpp */,
+				48791F7B11926F24002C086E /* SHAHashSet.h */,
+				48791F7C11926F24002C086E /* Statistics.cpp */,
+				48791F7D11926F24002C086E /* Statistics.h */,
+				48791F7E11926F24002C086E /* StatTree.cpp */,
+				48791F7F11926F24002C086E /* StatTree.h */,
+				48791F8011926F24002C086E /* TerminationProcess.cpp */,
+				48791F8111926F24002C086E /* TerminationProcess.h */,
+				48791F8211926F24002C086E /* UserEvents.cpp */,
+				48791F8311926F24002C086E /* UserEvents.h */,
+			);
+			name = common_sources;
+			sourceTree = "<group>";
+		};
+		48791F9411926F44002C086E /* remote_common_sources */ = {
+			isa = PBXGroup;
+			children = (
+				48791FD611926F74002C086E /* NetworkFunctions.cpp */,
+				48791FD711926F74002C086E /* NetworkFunctions.h */,
+				48791FD811926F74002C086E /* OtherFunctions.cpp */,
+				48791FD911926F74002C086E /* OtherFunctions.h */,
+			);
+			name = remote_common_sources;
+			sourceTree = "<group>";
+		};
+		48792056119274B2002C086E /* libs */ = {
+			isa = PBXGroup;
+			children = (
+				48792058119274BB002C086E /* ec */,
+				48792057119274B7002C086E /* common */,
+			);
+			name = libs;
+			sourceTree = "<group>";
+		};
+		48792057119274B7002C086E /* common */ = {
+			isa = PBXGroup;
+			children = (
+				4879205C119274FA002C086E /* FileFunctions.cpp */,
+				4879205D119274FA002C086E /* FileFunctions.h */,
+				4879205E119274FA002C086E /* Format.cpp */,
+				4879205F119274FA002C086E /* Format.h */,
+				48792060119274FA002C086E /* MD5Sum.cpp */,
+				48792061119274FA002C086E /* MD5Sum.h */,
+				48792062119274FA002C086E /* MuleDebug.cpp */,
+				48792063119274FA002C086E /* MuleDebug.h */,
+				48792064119274FA002C086E /* Path.cpp */,
+				48792065119274FA002C086E /* Path.h */,
+				48792066119274FA002C086E /* StringFunctions.cpp */,
+				48792067119274FA002C086E /* StringFunctions.h */,
+				48792068119274FA002C086E /* TextFile.cpp */,
+				48792069119274FA002C086E /* TextFile.h */,
+			);
+			name = common;
+			sourceTree = "<group>";
+		};
+		48792058119274BB002C086E /* ec */ = {
+			isa = PBXGroup;
+			children = (
+				487921F011927592002C086E /* cpp */,
+			);
+			name = ec;
+			sourceTree = "<group>";
+		};
+		487921F011927592002C086E /* cpp */ = {
+			isa = PBXGroup;
+			children = (
+				4879213211927582002C086E /* ECMuleSocket.cpp */,
+				4879213311927582002C086E /* ECMuleSocket.h */,
+				4879213411927582002C086E /* ECPacket.cpp */,
+				4879213511927582002C086E /* ECPacket.h */,
+				4879213611927582002C086E /* ECSocket.cpp */,
+				4879213711927582002C086E /* ECSocket.h */,
+				4879213811927582002C086E /* ECSpecialTags.cpp */,
+				4879213911927582002C086E /* ECSpecialTags.h */,
+				4879213A11927582002C086E /* ECTag.cpp */,
+				4879213B11927582002C086E /* ECTag.h */,
+				4879213C11927582002C086E /* RemoteConnect.cpp */,
+				4879213D11927582002C086E /* RemoteConnect.h */,
+			);
+			name = cpp;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		8D1107260486CEB800E47090 /* aMule */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "aMule" */;
+			buildPhases = (
+				8D1107290486CEB800E47090 /* Resources */,
+				8D11072C0486CEB800E47090 /* Sources */,
+				8D11072E0486CEB800E47090 /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = aMule;
+			productInstallPath = "$(HOME)/Applications";
+			productName = "aMule-Xcode";
+			productReference = 8D1107320486CEB800E47090 /* aMule.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		29B97313FDCFA39411CA2CEA /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "aMule" */;
+			compatibilityVersion = "Xcode 3.2";
+			hasScannedForEncodings = 1;
+			mainGroup = 29B97314FDCFA39411CA2CEA /* aMule-Xcode */;
+			projectDirPath = "";
+			projectRoots = (
+				"",
+				..,
+			);
+			targets = (
+				8D1107260486CEB800E47090 /* aMule */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D1107290486CEB800E47090 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
+				488D4E8F1192CB880089BF8E /* README BEFORE BUILDING.rtf in Resources */,
+				483344701196275F00D9BE75 /* amule.icns in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8D11072C0486CEB800E47090 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				487911DA11925E61002C086E /* CFile.cpp in Sources */,
+				487911DB11925E61002C086E /* DataToText.cpp in Sources */,
+				487911DC11925E61002C086E /* ED2KLink.cpp in Sources */,
+				487911DD11925E61002C086E /* GapList.cpp in Sources */,
+				487911DE11925E61002C086E /* MagnetURI.cpp in Sources */,
+				487911DF11925E61002C086E /* MemFile.cpp in Sources */,
+				487911E111925E61002C086E /* Packet.cpp in Sources */,
+				487911E211925E61002C086E /* RLE.cpp in Sources */,
+				487911E311925E61002C086E /* SafeFile.cpp in Sources */,
+				487911E411925E61002C086E /* SHA.cpp in Sources */,
+				487911E511925E61002C086E /* Tag.cpp in Sources */,
+				487911E611925E61002C086E /* Timer.cpp in Sources */,
+				4879120211925FDD002C086E /* AsyncDNS.cpp in Sources */,
+				4879120311925FDD002C086E /* DeadSourceList.cpp in Sources */,
+				4879120411925FDD002C086E /* FileArea.cpp in Sources */,
+				4879120511925FDD002C086E /* FileAutoClose.cpp in Sources */,
+				4879120611925FDD002C086E /* Friend.cpp in Sources */,
+				4879120711925FDD002C086E /* Parser.cpp in Sources */,
+				4879120811925FDD002C086E /* PlatformSpecific.cpp in Sources */,
+				4879120911925FDD002C086E /* RandomFunctions.cpp in Sources */,
+				4879120A11925FDD002C086E /* RC4Encrypt.cpp in Sources */,
+				4879120B11925FDD002C086E /* Scanner.cpp in Sources */,
+				4879120C11925FDD002C086E /* StateMachine.cpp in Sources */,
+				4879120D11925FDD002C086E /* ThreadScheduler.cpp in Sources */,
+				4879120E11925FDD002C086E /* UPnPBase.cpp in Sources */,
+				48791C961192601F002C086E /* Entry.cpp in Sources */,
+				48791C971192601F002C086E /* SearchManager.cpp in Sources */,
+				48791D081192607A002C086E /* Contact.cpp in Sources */,
+				48791D091192607A002C086E /* RoutingBin.cpp in Sources */,
+				48791D0C119260A0002C086E /* UInt128.cpp in Sources */,
+				48791D2A11926A0E002C086E /* BarShader.cpp in Sources */,
+				48791D2B11926A0E002C086E /* ChatWnd.cpp in Sources */,
+				48791D2C11926A0E002C086E /* ColorFrameCtrl.cpp in Sources */,
+				48791D2D11926A0E002C086E /* CommentDialog.cpp in Sources */,
+				48791D2E11926A0E002C086E /* CommentDialogLst.cpp in Sources */,
+				48791D2F11926A0E002C086E /* EditServerListDlg.cpp in Sources */,
+				48791D3011926A0E002C086E /* FileDetailListCtrl.cpp in Sources */,
+				48791D3111926A0E002C086E /* IP2Country.cpp in Sources */,
+				48791D3211926A0E002C086E /* MuleCollection.cpp in Sources */,
+				48791D3311926A0E002C086E /* MuleGifCtrl.cpp in Sources */,
+				48791D3411926A0E002C086E /* MuleListCtrl.cpp in Sources */,
+				48791D3511926A0E002C086E /* MuleNotebook.cpp in Sources */,
+				48791D3611926A0E002C086E /* MuleTextCtrl.cpp in Sources */,
+				48791D3711926A0E002C086E /* muuli_wdr.cpp in Sources */,
+				48791D3B11926A2E002C086E /* listctrl.cpp in Sources */,
+				48791D7C11926AEE002C086E /* amule.cpp in Sources */,
+				48791D7D11926AEE002C086E /* BaseClient.cpp in Sources */,
+				48791D7E11926AEE002C086E /* CanceledFileList.cpp in Sources */,
+				48791D7F11926AEE002C086E /* ClientCreditsList.cpp in Sources */,
+				48791D8011926AEE002C086E /* ClientList.cpp in Sources */,
+				48791D8111926AEE002C086E /* ClientTCPSocket.cpp in Sources */,
+				48791D8211926AEE002C086E /* ClientUDPSocket.cpp in Sources */,
+				48791D8311926AEE002C086E /* CorruptionBlackBox.cpp in Sources */,
+				48791D8411926AEE002C086E /* DownloadClient.cpp in Sources */,
+				48791D8511926AEE002C086E /* DownloadQueue.cpp in Sources */,
+				48791D8611926AEE002C086E /* ECSpecialCoreTags.cpp in Sources */,
+				48791D8711926AEE002C086E /* EMSocket.cpp in Sources */,
+				48791D8811926AEE002C086E /* EncryptedDatagramSocket.cpp in Sources */,
+				48791D8911926AEE002C086E /* EncryptedStreamSocket.cpp in Sources */,
+				48791D8A11926AEE002C086E /* ExternalConn.cpp in Sources */,
+				48791D8B11926AEE002C086E /* FriendList.cpp in Sources */,
+				48791D8C11926AEE002C086E /* HTTPDownload.cpp in Sources */,
+				48791D8D11926AEE002C086E /* IPFilter.cpp in Sources */,
+				48791D8E11926AEE002C086E /* KnownFileList.cpp in Sources */,
+				48791D8F11926AEE002C086E /* ListenSocket.cpp in Sources */,
+				48791D9011926AEE002C086E /* MuleUDPSocket.cpp in Sources */,
+				48791D9111926AEE002C086E /* PartFileConvert.cpp in Sources */,
+				48791D9211926AEE002C086E /* SearchFile.cpp in Sources */,
+				48791D9311926AEE002C086E /* SearchList.cpp in Sources */,
+				48791D9411926AEE002C086E /* ServerConnect.cpp in Sources */,
+				48791D9511926AEE002C086E /* ServerList.cpp in Sources */,
+				48791D9611926AEE002C086E /* ServerSocket.cpp in Sources */,
+				48791D9711926AEE002C086E /* ServerUDPSocket.cpp in Sources */,
+				48791D9811926AEE002C086E /* SharedFileList.cpp in Sources */,
+				48791D9911926AEE002C086E /* TerminationProcessAmuleweb.cpp in Sources */,
+				48791D9A11926AEE002C086E /* ThreadTasks.cpp in Sources */,
+				48791D9B11926AEE002C086E /* UploadBandwidthThrottler.cpp in Sources */,
+				48791D9C11926AEE002C086E /* UploadClient.cpp in Sources */,
+				48791D9D11926AEE002C086E /* UploadQueue.cpp in Sources */,
+				48791E1211926B21002C086E /* KademliaUDPListener.cpp in Sources */,
+				48791E1311926B21002C086E /* PacketTracking.cpp in Sources */,
+				48791E3611926B41002C086E /* Indexed.cpp in Sources */,
+				48791E3711926B41002C086E /* Kademlia.cpp in Sources */,
+				48791E3811926B41002C086E /* Prefs.cpp in Sources */,
+				48791E3911926B41002C086E /* Search.cpp in Sources */,
+				48791E3A11926B41002C086E /* UDPFirewallTester.cpp in Sources */,
+				48791EA911926B54002C086E /* RoutingZone.cpp in Sources */,
+				48791EDC11926CC7002C086E /* AddFriend.cpp in Sources */,
+				48791EDD11926CC7002C086E /* amule-gui.cpp in Sources */,
+				48791EDE11926CC7002C086E /* amuleDlg.cpp in Sources */,
+				48791EDF11926CC7002C086E /* CatDialog.cpp in Sources */,
+				48791EE011926CC7002C086E /* ChatSelector.cpp in Sources */,
+				48791EE111926CC7002C086E /* ClientDetailDialog.cpp in Sources */,
+				48791EE311926CC7002C086E /* DirectoryTreeCtrl.cpp in Sources */,
+				48791EE411926CC7002C086E /* DownloadListCtrl.cpp in Sources */,
+				48791EE511926CC7002C086E /* FileDetailDialog.cpp in Sources */,
+				48791EE611926CC7002C086E /* FriendListCtrl.cpp in Sources */,
+				48791EE711926CC7002C086E /* KadDlg.cpp in Sources */,
+				48791EE811926CC7002C086E /* MuleColour.cpp in Sources */,
+				48791EE911926CC7002C086E /* MuleTrayIcon.cpp in Sources */,
+				48791EEA11926CC7002C086E /* OScopeCtrl.cpp in Sources */,
+				48791EEB11926CC7002C086E /* PartFileConvertDlg.cpp in Sources */,
+				48791EEC11926CC7002C086E /* PrefsUnifiedDlg.cpp in Sources */,
+				48791EED11926CC7002C086E /* SearchDlg.cpp in Sources */,
+				48791EEE11926CC7002C086E /* SearchListCtrl.cpp in Sources */,
+				48791EEF11926CC7002C086E /* ServerListCtrl.cpp in Sources */,
+				48791EF011926CC7002C086E /* ServerWnd.cpp in Sources */,
+				48791EF111926CC7002C086E /* SharedFilesCtrl.cpp in Sources */,
+				48791EF211926CC7002C086E /* SharedFilesWnd.cpp in Sources */,
+				48791EF311926CC7002C086E /* StatisticsDlg.cpp in Sources */,
+				48791EF411926CC7002C086E /* TransferWnd.cpp in Sources */,
+				48791F8411926F24002C086E /* amuleAppCommon.cpp in Sources */,
+				48791F8511926F24002C086E /* ClientCredits.cpp in Sources */,
+				48791F8611926F24002C086E /* ECSpecialMuleTags.cpp in Sources */,
+				48791F8711926F24002C086E /* GetTickCount.cpp in Sources */,
+				48791F8811926F24002C086E /* GuiEvents.cpp in Sources */,
+				48791F8911926F24002C086E /* KnownFile.cpp in Sources */,
+				48791F8A11926F24002C086E /* Logger.cpp in Sources */,
+				48791F8B11926F24002C086E /* PartFile.cpp in Sources */,
+				48791F8C11926F24002C086E /* Preferences.cpp in Sources */,
+				48791F8D11926F24002C086E /* Proxy.cpp in Sources */,
+				48791F8E11926F24002C086E /* Server.cpp in Sources */,
+				48791F8F11926F24002C086E /* SHAHashSet.cpp in Sources */,
+				48791F9011926F24002C086E /* Statistics.cpp in Sources */,
+				48791F9111926F24002C086E /* StatTree.cpp in Sources */,
+				48791F9211926F24002C086E /* TerminationProcess.cpp in Sources */,
+				48791F9311926F24002C086E /* UserEvents.cpp in Sources */,
+				4879200511926F74002C086E /* NetworkFunctions.cpp in Sources */,
+				4879200611926F74002C086E /* OtherFunctions.cpp in Sources */,
+				4879206A119274FA002C086E /* FileFunctions.cpp in Sources */,
+				4879206B119274FA002C086E /* Format.cpp in Sources */,
+				4879206C119274FA002C086E /* MD5Sum.cpp in Sources */,
+				4879206D119274FA002C086E /* MuleDebug.cpp in Sources */,
+				4879206E119274FA002C086E /* Path.cpp in Sources */,
+				4879206F119274FA002C086E /* StringFunctions.cpp in Sources */,
+				48792070119274FA002C086E /* TextFile.cpp in Sources */,
+				487921EA11927582002C086E /* ECMuleSocket.cpp in Sources */,
+				487921EB11927582002C086E /* ECPacket.cpp in Sources */,
+				487921EC11927582002C086E /* ECSocket.cpp in Sources */,
+				487921ED11927582002C086E /* ECSpecialTags.cpp in Sources */,
+				487921EE11927582002C086E /* ECTag.cpp in Sources */,
+				487921EF11927582002C086E /* RemoteConnect.cpp in Sources */,
+				4879238511927626002C086E /* CaptchaDialog.cpp in Sources */,
+				4879238611927626002C086E /* CaptchaGenerator.cpp in Sources */,
+				4848D2CF1192E83100ED40CC /* GenericClientListCtrl.cpp in Sources */,
+				4848DC291192E85A00ED40CC /* SharedFilePeersListCtrl.cpp in Sources */,
+				4848DC2A1192E85A00ED40CC /* SourceListCtrl.cpp in Sources */,
+				48CB3DB611B58AA80051CAF2 /* IPFilterScanner.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				089C165DFE840E0CC02AAC07 /* en */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		48636E0A119E4DBA00BC3DB6 /* Development Debug - wxWidgets 2.9+ */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_THREADSAFE_STATICS = NO;
+				GCC_VERSION = 4.0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "../../src/**";
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = (
+					"-I../../../..//wxWidgets/lib/wx/include/osx_cocoa-unicode-static-2.9",
+					"-I../../../../wxWidgets/include",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D__WXMAC__",
+					"-D__WXOSX__",
+					"-D__WXOSX_COCOA__",
+				);
+				OTHER_LDFLAGS = "-L../../../../wxWidgets/lib";
+				PREBINDING = NO;
+				SDKROOT = macosx10.4;
+				VALID_ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+			};
+			name = "Development Debug - wxWidgets 2.9+";
+		};
+		48636E0B119E4DBA00BC3DB6 /* Development Debug - wxWidgets 2.9+ */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = aMule_Xcode_Prefix.pch;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					USE_WX_EXTENSIONS,
+					"CRYPTOPP_INCLUDE_PREFIX=cryptopp-64bits",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = "";
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../src\"",
+					"\"$(SRCROOT)/../../../src/libs/\"/**",
+					"\"$(SRCROOT)/../../../src/include/\"/**",
+				);
+				INFOPLIST_FILE = "aMule_Xcode-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../src\"",
+					"\"$(SRCROOT)/../src/libs/\"/**",
+					"\"$(SRCROOT)/../src/libs/ec/cpp\"",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_CFLAGS = (
+					"-I../../../../",
+					"-I../../../../wxWidgets/lib/wx/include/osx_cocoa-unicode-static-2.9",
+					"-I../../../../wxWidgets/include",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D__WXMAC__",
+					"-D__WXOSX__",
+					"-D__WXOSX_COCOA__",
+				);
+				OTHER_LDFLAGS = (
+					"-L../../../../cryptopp-64bits/",
+					"-lcryptopp",
+					"-L../../../../wxWidgets/lib",
+					"-framework",
+					IOKit,
+					"-framework",
+					Carbon,
+					"-framework",
+					Cocoa,
+					"-framework",
+					AudioToolbox,
+					"-framework",
+					System,
+					"-framework",
+					OpenGL,
+					"-framework",
+					QuickTime,
+					"../../../../wxWidgets/lib/libwx_osx_cocoau_xrc-2.9.a",
+					"../../../../wxWidgets/lib/libwx_osx_cocoau_html-2.9.a",
+					"../../../../wxWidgets/lib/libwx_osx_cocoau_qa-2.9.a",
+					"../../../../wxWidgets/lib/libwx_osx_cocoau_adv-2.9.a",
+					"../../../../wxWidgets/lib/libwx_osx_cocoau_core-2.9.a",
+					"../../../../wxWidgets/lib/libwx_baseu_xml-2.9.a",
+					"../../../../wxWidgets/lib/libwx_baseu_net-2.9.a",
+					"../../../../wxWidgets/lib/libwx_baseu-2.9.a",
+					"-framework",
+					WebKit,
+					"-lexpat",
+					"-lwxregexu-2.9",
+					"-lwxtiff-2.9",
+					"-lwxjpeg-2.9",
+					"-lwxpng-2.9",
+					"-lz",
+					"-lpthread",
+					"-liconv",
+				);
+				PRODUCT_NAME = aMule;
+				SDKROOT = macosx10.6;
+				VALID_ARCHS = "ppc i386 x86_64";
+			};
+			name = "Development Debug - wxWidgets 2.9+";
+		};
+		48636E0C119E4DC400BC3DB6 /* Deployment Debug - wxWidgets 2.9+ */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_THREADSAFE_STATICS = NO;
+				GCC_VERSION = 4.0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "../../src/**";
+				ONLY_ACTIVE_ARCH = NO;
+				OTHER_CFLAGS = (
+					"-I../../../../wxWidgets-2.8/lib/wx/include/mac-unicode-debug-2.8",
+					"-I../../../../wxWidgets-2.8/include",
+					"-I../../../../wxWidgets-2.8/contrib/include",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D_LARGE_FILES",
+					"-D__WXDEBUG__",
+					"-D__WXMAC__",
+				);
+				OTHER_LDFLAGS = (
+					"-L../../../../wxWidgets-2.8/lib",
+					"-framework",
+					IOKit,
+					"-framework",
+					Carbon,
+					"-framework",
+					Cocoa,
+					"-framework",
+					System,
+					"-framework",
+					QuickTime,
+					"-framework",
+					OpenGL,
+					"-framework",
+					AGL,
+					"-lwx_macud_richtext-2.8",
+					"-lwx_macud_aui-2.8",
+					"-lwx_macud_xrc-2.8",
+					"-lwx_macud_qa-2.8",
+					"-lwx_macud_html-2.8",
+					"-lwx_macud_adv-2.8",
+					"-lwx_macud_core-2.8",
+					"-lwx_base_carbonud_xml-2.8",
+					"-lwx_base_carbonud_net-2.8",
+					"-lwx_base_carbonud-2.8",
+				);
+				PREBINDING = NO;
+				SDKROOT = macosx10.4;
+				VALID_ARCHS = "i386 ppc";
+			};
+			name = "Deployment Debug - wxWidgets 2.9+";
+		};
+		48636E0D119E4DC400BC3DB6 /* Deployment Debug - wxWidgets 2.9+ */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = aMule_Xcode_Prefix.pch;
+				GCC_PREPROCESSOR_DEFINITIONS = USE_WX_EXTENSIONS;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = 4.0;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../src\"",
+					"\"$(SRCROOT)/../../../src/libs/\"/**",
+					"\"$(SRCROOT)/../../../src/include/\"/**",
+				);
+				INFOPLIST_FILE = "aMule_Xcode-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../src\"",
+					"\"$(SRCROOT)/../src/libs/\"/**",
+					"\"$(SRCROOT)/../src/libs/ec/cpp\"",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				OTHER_CFLAGS = (
+					"-I../../../../",
+					"-I../../../../wxWidgets-2.8/lib/wx/include/mac-unicode-debug-static-2.8",
+					"-I../../../../wxWidgets-2.8/include",
+					"-I../../../../wxWidgets-2.8/contrib/include",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D_LARGE_FILES",
+					"-D__WXDEBUG__",
+					"-D__WXMAC__",
+				);
+				OTHER_LDFLAGS = (
+					"-L../../../../cryptopp/",
+					"-lcryptopp",
+					"-L../../../../wxWidgets-2.8/lib",
+					"-framework",
+					IOKit,
+					"-framework",
+					Carbon,
+					"-framework",
+					Cocoa,
+					"-framework",
+					System,
+					"-framework",
+					QuickTime,
+					"-framework",
+					OpenGL,
+					"-framework",
+					AGL,
+					"../../../../wxWidgets-2.8/lib/libwx_macud_richtext-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_aui-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_xrc-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_qa-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_html-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_adv-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_core-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud_xml-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud_net-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud-2.8.a",
+					"-framework",
+					WebKit,
+					"-lwxregexud-2.8",
+					"-lwxexpatd-2.8",
+					"-lwxtiffd-2.8",
+					"-lwxjpegd-2.8",
+					"-lwxpngd-2.8",
+					"-lz",
+					"-lpthread",
+					"-liconv",
+				);
+				PRODUCT_NAME = aMule;
+				SDKROOT = macosx10.4;
+				VALID_ARCHS = "ppc i386";
+			};
+			name = "Deployment Debug - wxWidgets 2.9+";
+		};
+		48636E0E119E4DCB00BC3DB6 /* Deployment Release - wxWidgets 2.9+ */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_THREADSAFE_STATICS = NO;
+				GCC_VERSION = 4.0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "../../src/**";
+				OTHER_CFLAGS = (
+					"-I../../../../wxWidgets-2.8/lib/wx/include/mac-unicode-debug-2.8",
+					"-I../../../../wxWidgets-2.8/include",
+					"-I../../../../wxWidgets-2.8/contrib/include",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D_LARGE_FILES",
+					"-D__WXDEBUG__",
+					"-D__WXMAC__",
+				);
+				OTHER_LDFLAGS = (
+					"-L../../../../wxWidgets-2.8/lib",
+					"-framework",
+					IOKit,
+					"-framework",
+					Carbon,
+					"-framework",
+					Cocoa,
+					"-framework",
+					System,
+					"-framework",
+					QuickTime,
+					"-framework",
+					OpenGL,
+					"-framework",
+					AGL,
+					"-lwx_macud_richtext-2.8",
+					"-lwx_macud_aui-2.8",
+					"-lwx_macud_xrc-2.8",
+					"-lwx_macud_qa-2.8",
+					"-lwx_macud_html-2.8",
+					"-lwx_macud_adv-2.8",
+					"-lwx_macud_core-2.8",
+					"-lwx_base_carbonud_xml-2.8",
+					"-lwx_base_carbonud_net-2.8",
+					"-lwx_base_carbonud-2.8",
+				);
+				PREBINDING = NO;
+				SDKROOT = macosx10.4;
+				VALID_ARCHS = "i386 ppc";
+			};
+			name = "Deployment Release - wxWidgets 2.9+";
+		};
+		48636E0F119E4DCB00BC3DB6 /* Deployment Release - wxWidgets 2.9+ */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = aMule_Xcode_Prefix.pch;
+				GCC_PREPROCESSOR_DEFINITIONS = USE_WX_EXTENSIONS;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = 4.0;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../src\"",
+					"\"$(SRCROOT)/../../../src/libs/\"/**",
+					"\"$(SRCROOT)/../../../src/include/\"/**",
+				);
+				INFOPLIST_FILE = "aMule_Xcode-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../src\"",
+					"\"$(SRCROOT)/../src/libs/\"/**",
+					"\"$(SRCROOT)/../src/libs/ec/cpp\"",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				OTHER_CFLAGS = (
+					"-I../../../../",
+					"-I../../../../wxWidgets-2.8/lib/wx/include/mac-unicode-debug-static-2.8",
+					"-I../../../../wxWidgets-2.8/include",
+					"-I../../../../wxWidgets-2.8/contrib/include",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D_LARGE_FILES",
+					"-D__WXDEBUG__",
+					"-D__WXMAC__",
+				);
+				OTHER_LDFLAGS = (
+					"-L../../../../cryptopp/",
+					"-lcryptopp",
+					"-L../../../../wxWidgets-2.8/lib",
+					"-framework",
+					IOKit,
+					"-framework",
+					Carbon,
+					"-framework",
+					Cocoa,
+					"-framework",
+					System,
+					"-framework",
+					QuickTime,
+					"-framework",
+					OpenGL,
+					"-framework",
+					AGL,
+					"../../../../wxWidgets-2.8/lib/libwx_macud_richtext-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_aui-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_xrc-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_qa-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_html-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_adv-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_core-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud_xml-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud_net-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud-2.8.a",
+					"-framework",
+					WebKit,
+					"-lwxregexud-2.8",
+					"-lwxexpatd-2.8",
+					"-lwxtiffd-2.8",
+					"-lwxjpegd-2.8",
+					"-lwxpngd-2.8",
+					"-lz",
+					"-lpthread",
+					"-liconv",
+				);
+				PRODUCT_NAME = aMule;
+				SDKROOT = macosx10.4;
+				VALID_ARCHS = "ppc i386";
+			};
+			name = "Deployment Release - wxWidgets 2.9+";
+		};
+		4875E6EA1192DCF9004ABCD5 /* Deployment Debug - wxWidgets 2.8 */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_THREADSAFE_STATICS = NO;
+				GCC_VERSION = 4.0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "../../src/**";
+				ONLY_ACTIVE_ARCH = NO;
+				OTHER_CFLAGS = (
+					"-I../../../../wxWidgets-2.8/lib/wx/include/mac-unicode-debug-2.8",
+					"-I../../../../wxWidgets-2.8/include",
+					"-I../../../../wxWidgets-2.8/contrib/include",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D_LARGE_FILES",
+					"-D__WXDEBUG__",
+					"-D__WXMAC__",
+				);
+				OTHER_LDFLAGS = (
+					"-L../../../../wxWidgets-2.8/lib",
+					"-framework",
+					IOKit,
+					"-framework",
+					Carbon,
+					"-framework",
+					Cocoa,
+					"-framework",
+					System,
+					"-framework",
+					QuickTime,
+					"-framework",
+					OpenGL,
+					"-framework",
+					AGL,
+					"-lwx_macud_richtext-2.8",
+					"-lwx_macud_aui-2.8",
+					"-lwx_macud_xrc-2.8",
+					"-lwx_macud_qa-2.8",
+					"-lwx_macud_html-2.8",
+					"-lwx_macud_adv-2.8",
+					"-lwx_macud_core-2.8",
+					"-lwx_base_carbonud_xml-2.8",
+					"-lwx_base_carbonud_net-2.8",
+					"-lwx_base_carbonud-2.8",
+				);
+				PREBINDING = NO;
+				SDKROOT = macosx10.4;
+				VALID_ARCHS = "i386 ppc";
+			};
+			name = "Deployment Debug - wxWidgets 2.8";
+		};
+		4875E6EB1192DCF9004ABCD5 /* Deployment Debug - wxWidgets 2.8 */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = aMule_Xcode_Prefix.pch;
+				GCC_PREPROCESSOR_DEFINITIONS = USE_WX_EXTENSIONS;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = 4.0;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../src\"",
+					"\"$(SRCROOT)/../../../src/libs/\"/**",
+					"\"$(SRCROOT)/../../../src/include/\"/**",
+				);
+				INFOPLIST_FILE = "aMule_Xcode-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../src\"",
+					"\"$(SRCROOT)/../src/libs/\"/**",
+					"\"$(SRCROOT)/../src/libs/ec/cpp\"",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				OTHER_CFLAGS = (
+					"-I../../../../",
+					"-I../../../../wxWidgets-2.8/lib/wx/include/mac-unicode-debug-static-2.8",
+					"-I../../../../wxWidgets-2.8/include",
+					"-I../../../../wxWidgets-2.8/contrib/include",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D_LARGE_FILES",
+					"-D__WXDEBUG__",
+					"-D__WXMAC__",
+				);
+				OTHER_LDFLAGS = (
+					"-L../../../../cryptopp/",
+					"-lcryptopp",
+					"-L../../../../wxWidgets-2.8/lib",
+					"-framework",
+					IOKit,
+					"-framework",
+					Carbon,
+					"-framework",
+					Cocoa,
+					"-framework",
+					System,
+					"-framework",
+					QuickTime,
+					"-framework",
+					OpenGL,
+					"-framework",
+					AGL,
+					"../../../../wxWidgets-2.8/lib/libwx_macud_richtext-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_aui-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_xrc-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_qa-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_html-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_adv-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_core-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud_xml-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud_net-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud-2.8.a",
+					"-framework",
+					WebKit,
+					"-lwxregexud-2.8",
+					"-lwxexpatd-2.8",
+					"-lwxtiffd-2.8",
+					"-lwxjpegd-2.8",
+					"-lwxpngd-2.8",
+					"-lz",
+					"-lpthread",
+					"-liconv",
+				);
+				PRODUCT_NAME = aMule;
+				SDKROOT = macosx10.4;
+				VALID_ARCHS = "ppc i386";
+			};
+			name = "Deployment Debug - wxWidgets 2.8";
+		};
+		C01FCF4B08A954540054247B /* Development Debug - wxWidgets 2.8 */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = aMule_Xcode_Prefix.pch;
+				GCC_PREPROCESSOR_DEFINITIONS = USE_WX_EXTENSIONS;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = 4.0;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../src\"",
+					"\"$(SRCROOT)/../../../src/libs/\"/**",
+					"\"$(SRCROOT)/../../../src/include/\"/**",
+				);
+				INFOPLIST_FILE = "aMule_Xcode-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../src\"",
+					"\"$(SRCROOT)/../src/libs/\"/**",
+					"\"$(SRCROOT)/../src/libs/ec/cpp\"",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				OTHER_CFLAGS = (
+					"-I../../../../",
+					"-I../../../../wxWidgets-2.8/lib/wx/include/mac-unicode-debug-static-2.8",
+					"-I../../../../wxWidgets-2.8/include",
+					"-I../../../../wxWidgets-2.8/contrib/include",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D_LARGE_FILES",
+					"-D__WXDEBUG__",
+					"-D__WXMAC__",
+				);
+				OTHER_LDFLAGS = (
+					"-L../../../../cryptopp/",
+					"-lcryptopp",
+					"-L../../../../wxWidgets-2.8/lib",
+					"-framework",
+					IOKit,
+					"-framework",
+					Carbon,
+					"-framework",
+					Cocoa,
+					"-framework",
+					System,
+					"-framework",
+					QuickTime,
+					"-framework",
+					OpenGL,
+					"-framework",
+					AGL,
+					"../../../../wxWidgets-2.8/lib/libwx_macud_richtext-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_aui-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_xrc-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_qa-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_html-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_adv-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_core-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud_xml-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud_net-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud-2.8.a",
+					"-framework",
+					WebKit,
+					"-lwxregexud-2.8",
+					"-lwxexpatd-2.8",
+					"-lwxtiffd-2.8",
+					"-lwxjpegd-2.8",
+					"-lwxpngd-2.8",
+					"-lz",
+					"-lpthread",
+					"-liconv",
+				);
+				PRODUCT_NAME = aMule;
+				SDKROOT = macosx10.4;
+				VALID_ARCHS = "ppc i386";
+			};
+			name = "Development Debug - wxWidgets 2.8";
+		};
+		C01FCF4C08A954540054247B /* Deployment Release - wxWidgets 2.8 */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = aMule_Xcode_Prefix.pch;
+				GCC_PREPROCESSOR_DEFINITIONS = USE_WX_EXTENSIONS;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = 4.0;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../src\"",
+					"\"$(SRCROOT)/../../../src/libs/\"/**",
+					"\"$(SRCROOT)/../../../src/include/\"/**",
+				);
+				INFOPLIST_FILE = "aMule_Xcode-Info.plist";
+				INSTALL_PATH = "$(HOME)/Applications";
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../src\"",
+					"\"$(SRCROOT)/../src/libs/\"/**",
+					"\"$(SRCROOT)/../src/libs/ec/cpp\"",
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				OTHER_CFLAGS = (
+					"-I../../../../",
+					"-I../../../../wxWidgets-2.8/lib/wx/include/mac-unicode-debug-static-2.8",
+					"-I../../../../wxWidgets-2.8/include",
+					"-I../../../../wxWidgets-2.8/contrib/include",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D_LARGE_FILES",
+					"-D__WXDEBUG__",
+					"-D__WXMAC__",
+				);
+				OTHER_LDFLAGS = (
+					"-L../../../../cryptopp/",
+					"-lcryptopp",
+					"-L../../../../wxWidgets-2.8/lib",
+					"-framework",
+					IOKit,
+					"-framework",
+					Carbon,
+					"-framework",
+					Cocoa,
+					"-framework",
+					System,
+					"-framework",
+					QuickTime,
+					"-framework",
+					OpenGL,
+					"-framework",
+					AGL,
+					"../../../../wxWidgets-2.8/lib/libwx_macud_richtext-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_aui-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_xrc-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_qa-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_html-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_adv-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_macud_core-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud_xml-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud_net-2.8.a",
+					"../../../../wxWidgets-2.8/lib/libwx_base_carbonud-2.8.a",
+					"-framework",
+					WebKit,
+					"-lwxregexud-2.8",
+					"-lwxexpatd-2.8",
+					"-lwxtiffd-2.8",
+					"-lwxjpegd-2.8",
+					"-lwxpngd-2.8",
+					"-lz",
+					"-lpthread",
+					"-liconv",
+				);
+				PRODUCT_NAME = aMule;
+				SDKROOT = macosx10.4;
+				VALID_ARCHS = "ppc i386";
+			};
+			name = "Deployment Release - wxWidgets 2.8";
+		};
+		C01FCF4F08A954540054247B /* Development Debug - wxWidgets 2.8 */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_THREADSAFE_STATICS = NO;
+				GCC_VERSION = 4.0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "../../src/**";
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = (
+					"-I../../../../wxWidgets-2.8/lib/wx/include/mac-unicode-debug-2.8",
+					"-I../../../../wxWidgets-2.8/include",
+					"-I../../../../wxWidgets-2.8/contrib/include",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D_LARGE_FILES",
+					"-D__WXDEBUG__",
+					"-D__WXMAC__",
+				);
+				OTHER_LDFLAGS = (
+					"-L../../../../wxWidgets-2.8/lib",
+					"-framework",
+					IOKit,
+					"-framework",
+					Carbon,
+					"-framework",
+					Cocoa,
+					"-framework",
+					System,
+					"-framework",
+					QuickTime,
+					"-framework",
+					OpenGL,
+					"-framework",
+					AGL,
+					"-lwx_macud_richtext-2.8",
+					"-lwx_macud_aui-2.8",
+					"-lwx_macud_xrc-2.8",
+					"-lwx_macud_qa-2.8",
+					"-lwx_macud_html-2.8",
+					"-lwx_macud_adv-2.8",
+					"-lwx_macud_core-2.8",
+					"-lwx_base_carbonud_xml-2.8",
+					"-lwx_base_carbonud_net-2.8",
+					"-lwx_base_carbonud-2.8",
+				);
+				PREBINDING = NO;
+				SDKROOT = macosx10.4;
+				VALID_ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+			};
+			name = "Development Debug - wxWidgets 2.8";
+		};
+		C01FCF5008A954540054247B /* Deployment Release - wxWidgets 2.8 */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_THREADSAFE_STATICS = NO;
+				GCC_VERSION = 4.0;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = "../../src/**";
+				OTHER_CFLAGS = (
+					"-I../../../../wxWidgets-2.8/lib/wx/include/mac-unicode-debug-2.8",
+					"-I../../../../wxWidgets-2.8/include",
+					"-I../../../../wxWidgets-2.8/contrib/include",
+					"-D_FILE_OFFSET_BITS=64",
+					"-D_LARGE_FILES",
+					"-D__WXDEBUG__",
+					"-D__WXMAC__",
+				);
+				OTHER_LDFLAGS = (
+					"-L../../../../wxWidgets-2.8/lib",
+					"-framework",
+					IOKit,
+					"-framework",
+					Carbon,
+					"-framework",
+					Cocoa,
+					"-framework",
+					System,
+					"-framework",
+					QuickTime,
+					"-framework",
+					OpenGL,
+					"-framework",
+					AGL,
+					"-lwx_macud_richtext-2.8",
+					"-lwx_macud_aui-2.8",
+					"-lwx_macud_xrc-2.8",
+					"-lwx_macud_qa-2.8",
+					"-lwx_macud_html-2.8",
+					"-lwx_macud_adv-2.8",
+					"-lwx_macud_core-2.8",
+					"-lwx_base_carbonud_xml-2.8",
+					"-lwx_base_carbonud_net-2.8",
+					"-lwx_base_carbonud-2.8",
+				);
+				PREBINDING = NO;
+				SDKROOT = macosx10.4;
+				VALID_ARCHS = "i386 ppc";
+			};
+			name = "Deployment Release - wxWidgets 2.8";
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "aMule" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4B08A954540054247B /* Development Debug - wxWidgets 2.8 */,
+				48636E0B119E4DBA00BC3DB6 /* Development Debug - wxWidgets 2.9+ */,
+				4875E6EB1192DCF9004ABCD5 /* Deployment Debug - wxWidgets 2.8 */,
+				48636E0D119E4DC400BC3DB6 /* Deployment Debug - wxWidgets 2.9+ */,
+				C01FCF4C08A954540054247B /* Deployment Release - wxWidgets 2.8 */,
+				48636E0F119E4DCB00BC3DB6 /* Deployment Release - wxWidgets 2.9+ */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = "Deployment Release - wxWidgets 2.8";
+		};
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "aMule" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4F08A954540054247B /* Development Debug - wxWidgets 2.8 */,
+				48636E0A119E4DBA00BC3DB6 /* Development Debug - wxWidgets 2.9+ */,
+				4875E6EA1192DCF9004ABCD5 /* Deployment Debug - wxWidgets 2.8 */,
+				48636E0C119E4DC400BC3DB6 /* Deployment Debug - wxWidgets 2.9+ */,
+				C01FCF5008A954540054247B /* Deployment Release - wxWidgets 2.8 */,
+				48636E0E119E4DCB00BC3DB6 /* Deployment Release - wxWidgets 2.9+ */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = "Deployment Release - wxWidgets 2.8";
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}

aMule-2.3.1.tar.bz2/platforms/MacOSX/aMule-Xcode/aMule_Xcode-Info.plist Added

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>amule.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.amuleproject.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>3.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

aMule-2.3.1.tar.bz2/platforms/MacOSX/aMule-Xcode/aMule_Xcode_Prefix.pch Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/aMule-Xcode/amule.icns Changed

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/AddLinkDialogController.h Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/AddLinkDialogController.m Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/AppController.h Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/AppController.mm Added

@@ -0,0 +1,231 @@
+#import "AppController.h"
+
+#import "LoginDialogController.h"
+#import "DownloadsViewController.h"
+#import "AddLinkDialogController.h"
+
+#include <unistd.h>
+#include <signal.h>
+
+@implementation AppController
+
+- (IBAction)show_Networks:(id)sender {
+	[m_main_tabview selectTabViewItemAtIndex: 2];
+	
+
+//	ECLoginPacket *p = [ECLoginPacket loginPacket:@"123456" withVersion:@"0.1"];
+//	NSOutputStream *stream = [NSOutputStream outputStreamToMemory];
+//	uint8_t buffer[1024];
+//	memset(buffer, 0, 1024);
+//	NSOutputStream *stream = [NSOutputStream outputStreamToBuffer:buffer capacity:1024];
+//	[stream open];
+//	[p writeToSocket:stream];
+//	id data = [stream propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
+// 	int off = [data length];
+//	NSLog(@"off=%d", off);
+//	[m_connection sendPacket:p];
+}
+
+- (IBAction)show_Search:(id)sender {
+	[m_main_tabview selectTabViewItemAtIndex: 1];
+}
+
+- (IBAction)show_Sharing:(id)sender {
+	[m_main_tabview selectTabViewItemAtIndex: 3];
+}
+
+- (IBAction)show_Stats:(id)sender {
+	[m_main_tabview selectTabViewItemAtIndex: 4];
+}
+
+- (IBAction)show_Xfers:(id)sender {
+	[m_main_tabview selectTabViewItemAtIndex: 0];
+}
+
+-(IBAction)show_Preferences:(id)sender {
+}
+
+-(IBAction)show_About:(id)sender {
+}
+
+- (IBAction)addLink:(id)sender;{	
+	bool dlgResult = [m_add_link_dlg showDlg:nil];
+	if ( dlgResult ) {
+		ECPacket *packet = [ECPacket packetWithOpcode:EC_OP_ADD_LINK];
+		[packet.subtags addObject:[ECTagString tagFromString:[m_add_link_dlg link] withName:EC_TAG_ED2K_ID] ];
+		[m_connection sendPacket:packet];
+	}
+}
+
+- (bool)askCoreParams {
+	LoginDialogController *dlg = [[LoginDialogController alloc] init];
+	
+	bool dlgResult = [dlg showDlg:nil];
+
+	m_targetaddr = dlg.host;
+	m_targetport = dlg.port;
+	m_corepass = dlg.pass;
+	
+	return dlgResult;
+}
+
+- (void)applicationWillTerminate:(NSNotification *)aNotification {
+	//
+	// Save gui state in all views
+	//
+	if ([m_dload_controller respondsToSelector:@selector(saveGui)]) {
+		[m_dload_controller performSelector:@selector(saveGui)];
+	}
+	
+	//
+	// Save main window
+	//
+	[[NSUserDefaults standardUserDefaults] setInteger:[m_main_tabview indexOfTabViewItem: [m_main_tabview selectedTabViewItem] ] forKey:@"activeTab"];
+	
+	//
+	// If we have slave daemon process, terminate it
+	//
+	if ( m_daemon_pid ) {
+		//
+		// started in local mode - terminate daemon
+		//
+		kill(m_daemon_pid, SIGTERM);
+	}
+
+	NSLog(@"Exiting ...\n");
+}
+
+- (void)restoreMainWindow {
+	int activeTab = [[NSUserDefaults standardUserDefaults] integerForKey:@"activeTab"];
+	[m_main_tabview selectTabViewItemAtIndex: activeTab];
+
+}
+
+- (void)awakeFromNib {
+	NSUserDefaults *args = [NSUserDefaults standardUserDefaults];
+	NSString *mode = [args stringForKey:@"mode"];
+	NSLog(@"amule controller started, mode = [%@]\n", mode);
+	
+	
+	[[NSApplication sharedApplication] setDelegate:self];
+	
+	[self restoreMainWindow];
+	
+	m_targetaddr = 0;
+	m_targetport = 0;
+	m_corepass = nil;
+	
+	m_daemon_pid = 0;
+	if ( (mode != nil) && ([mode compare:@"guitest"] == NSOrderedSame) ) {
+		NSLog(@"Started in GUI test mode - will not connect to core");
+		return;
+	}	
+
+	if ( (mode != nil) && ([mode compare:@"remote"] == NSOrderedSame) ) {
+		m_targetaddr = @"127.0.0.1";
+		m_targetaddr = @"localhost";
+		m_targetport = 4712;
+		if (![self askCoreParams] ) {
+			// "Cancel" selected on login dialog
+			[[NSApplication sharedApplication] terminate:self];
+		}
+		[[NSUserDefaults standardUserDefaults] setObject:m_targetaddr forKey:@"LastTargetHost"];
+		[[NSUserDefaults standardUserDefaults] setInteger:m_targetport forKey:@"LastTargetPort"];
+		[[NSUserDefaults standardUserDefaults] synchronize];
+		NSLog(@"Remote mode selected, target=%@:%d\n", m_targetaddr, m_targetport);
+	} else {
+		NSLog(@"Local mode selected - starting daemon\n");
+		m_targetaddr = @"127.0.0.1";
+		m_targetport = 4712;
+		if ( [self startDaemon] == -1 ) {
+			NSRunCriticalAlertPanel(@"Daemon startup error", 
+							@"Unable to start core daemon (amuled)",
+							@"OK", nil,nil);
+			[[NSApplication sharedApplication] terminate:self];
+		}
+	}
+	
+	m_connection = [ECRemoteConnection remoteConnection];
+	[m_connection retain];
+	m_data = [amuleData initWithConnection:m_connection];
+	[m_data retain];
+
+	//
+	// bind datastructure to GUI controllers
+	//
+	[m_dload_controller linkAmuleData:m_data];
+	[m_search_controller linkAmuleData:m_data];
+	[m_shared_controller linkAmuleData:m_data];
+	//
+	// daemon (either local or remote) must be running by now
+	//
+	// try to connect 3 times, hopefully giving daemon enough
+	// time to start listening for EC
+	//
+	for(int i = 0; i < 3; i++) {
+		sleep(1);
+		[m_connection connectToAddress:m_targetaddr withPort:m_targetport];
+		[m_connection sendLogin:@"123456"];
+		if ( !m_connection.error ) {
+			break;
+		}
+	}
+	if ( m_connection.error ) {
+		NSRunCriticalAlertPanel(@"Connection error", 
+                        @"Unable to start communication with daemon",
+                        @"OK", nil,nil);
+		exit(-1);
+	}
+
+}
+
+
+- (int)startDaemon {
+	int pid = fork();
+	if ( pid == -1 ) {
+		// fork failed
+		return -1;
+	} else if ( pid > 0 ) {
+		sleep(2);
+		NSLog(@"Parent running, calling waitpid for pid %d\n", pid);
+		// parent
+		int status;
+		switch ( waitpid(pid, &status, WNOHANG) ) {
+			case -1:
+				NSLog(@"waitpid() call failed with code %d\n", errno);
+				break;
+			case 0:
+				NSLog(@"Daemon running on pid %d status %d\n", pid, status);
+				m_daemon_pid = pid;
+				break;
+			default:
+				//NSLog(@"waitpid returned pid=%d status=%x\n", pid, status);
+				if ( WIFEXITED(status) ) {
+					int exit_code = WEXITSTATUS(status);
+					NSLog(@"Daemon exec failed - child process exited with status %d", exit_code);
+					return -1;
+				} else if ( WIFSIGNALED(status) ) {
+					int sig_num = WTERMSIG(status);
+					NSLog(@"Child process terminated on signal %d", sig_num);
+					return -1;
+				} else if ( WIFSTOPPED(status) ) {
+					NSLog(@"Child process stopped. Not supposed to happen.");
+					return -1;
+				} else {
+					NSLog(@"Should not get here: child status unknown = %x", status);
+				}
+				break;
+		}
+		return 0;
+	} else {
+		// child
+		NSLog(@"Child running, calling execlp\n");
+		//execlp("/usr/bin/touch", "/usr/bin/touch", "xxxx", 0);
+		execlp("/Users/lfroen/prog/amule/src/amuled", "/Users/lfroen/prog/amule/src/amuled", 0);
+		NSLog(@"execlp() failed\n");
+		exit(-1);
+	}
+	return 0;
+}
+
+@end

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/DownloadsViewController.h Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/DownloadsViewController.mm Added

@@ -0,0 +1,108 @@
+#import "DownloadsViewController.h"
+
+
+@implementation DownloadsViewController
+
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex {
+	id value = nil;
+	NSString *columnId = [aTableColumn identifier];
+	DownloadingFile *i = [m_fileset objectAtIndex:rowIndex];
+//	if ( [columnId compare:@"filename"] == NSOrderedSame ) {
+//		value = @"val-for-filename";
+//	} else if ( [columnId compare:@"progress"] == NSOrderedSame ) {
+//		value = @"val-for-progress";
+//	} else if ( [columnId compare:@"size"] == NSOrderedSame ) {
+//		value = @"val-for-name";
+//	} else if ( [columnId compare:@"xferred"] == NSOrderedSame ) {
+//		value = @"val-for-size";
+//	} else if ( [columnId compare:@"completed"] == NSOrderedSame ) {
+//		value = @"val-for-completed";
+//	} else if ( [columnId compare:@"speed"] == NSOrderedSame ) {
+//		value = @"val-for-speed";
+//	} else if ( [columnId compare:@"prio"] == NSOrderedSame ) {
+//		value = @"val-for-prio";
+//	} else if ( [columnId compare:@"timerem"] == NSOrderedSame ) {
+//		value = @"val-for-timerem";
+//	} else if ( [columnId compare:@"lastcomp"] == NSOrderedSame ) {
+//		value = @"val-for-lastcomp";
+//	} else if ( [columnId compare:@"lastrx"] == NSOrderedSame ) {
+//		value = @"val-for-lastrx";
+//	} else {
+//		value = @"ERROR: bad column id";
+//	}
+	if ( [columnId compare:@"filename"] == NSOrderedSame ) {
+		value = i.name;
+	} else if ( [columnId compare:@"progress"] == NSOrderedSame ) {
+		value = @"progress-colored-bar";
+	} else if ( [columnId compare:@"size"] == NSOrderedSame ) {
+		value = [i convertWithPrefix: i.size];
+	} else if ( [columnId compare:@"xferred"] == NSOrderedSame ) {
+		value = [i convertWithPrefix: i.size_xfer];
+	} else if ( [columnId compare:@"completed"] == NSOrderedSame ) {
+		value = [i convertWithPrefix: i.size_done];
+	} else if ( [columnId compare:@"speed"] == NSOrderedSame ) {
+		value = ( i.speed ) ?
+			[[i convertWithPrefix: i.speed] stringByAppendingString: @"/sec"] : @"";
+	} else if ( [columnId compare:@"prio"] == NSOrderedSame ) {
+		value = i.sprio;
+	} else if ( [columnId compare:@"timerem"] == NSOrderedSame ) {
+		value = @"val-for-timerem";
+	} else if ( [columnId compare:@"lastcomp"] == NSOrderedSame ) {
+		value = @"val-for-lastcomp";
+	} else if ( [columnId compare:@"lastrx"] == NSOrderedSame ) {
+		value = @"val-for-lastrx";
+	} else {
+		value = @"ERROR: bad column id";
+	}
+	return value;
+}
+
+- (int)numberOfRowsInTableView:(NSTableView *)aTableView {
+//	return 3;
+	return [m_fileset count];
+}
+
+- (void)linkAmuleData:(amuleData *)amuledata {
+	m_amuledata = amuledata;
+	m_fileset = m_amuledata.downloads;
+	[amuledata.downloads setGuiController:self];
+}
+
+- (void)reload {
+	[m_tableview reloadData];
+}
+
+- (void)awakeFromNib {
+	[m_tableview setDelegate:self];
+	[m_tableview setDataSource:self];
+	
+	//
+	// load column status
+	//
+	for (NSTableColumn *c in [m_tableview tableColumns]) {
+		NSString *columnId = [c identifier];
+		NSString *keyWidth = [NSString stringWithFormat:@"DownloadView.Column_%@_Width", columnId];
+		int width = [[NSUserDefaults standardUserDefaults] integerForKey:keyWidth];
+		if ( width ) {
+			NSLog(@"Column %@ setting width %d\n", columnId, width);
+			[c setWidth:width];
+		}
+		NSString *keyHide = [NSString stringWithFormat:@"DownloadView.Column_%@_Hide", columnId];
+		int hide = [[NSUserDefaults standardUserDefaults] integerForKey:keyHide];
+		[c setHidden:hide];
+	}
+}
+
+- (void)saveGui {
+	for (NSTableColumn *c in [m_tableview tableColumns]) {
+		NSString *columnId = [c identifier];
+
+		NSString *keyWidth = [NSString stringWithFormat:@"DownloadView.Column_%@_Width", columnId];
+		[[NSUserDefaults standardUserDefaults] setInteger:c.width forKey:keyWidth];
+
+		NSString *keyHide = [NSString stringWithFormat:@"DownloadView.Column_%@_Hide", columnId];
+		[[NSUserDefaults standardUserDefaults] setInteger:[c isHidden] forKey:keyHide];
+	}
+}
+
+@end

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/EC.h Added

@@ -0,0 +1,219 @@
+#import <Cocoa/Cocoa.h>
+
+#include "ECCodes.h"
+#include "ECTagTypes.h"
+
+@interface ECTag : NSObject {
+	ECTagTypes m_type;
+    ECTagNames m_name;
+	
+	int m_size;
+	
+	NSMutableArray *m_subtags;
+}
+
++ (id)tagFromBuffer:(uint8_t **) buffer withLenght:(int) length;
++ (NSMutableArray *)readSubtags:(uint8_t **) buffer withLenght:(int) length;
+
+- (void)initSubtags;
+- (void)writeToSocket:(NSOutputStream *) socket;
+- (void)writeSubtagsToSocket:(NSOutputStream *) socket;
+
+- (int)getSize;
+- (int)tagCount;
+
+- (id)tagByName:(ECTagNames) tagname;
+
+- (uint64_t)tagInt64ByName:(ECTagNames) tagname;
+
+@property (readonly) ECTagTypes tagType;
+@property (readonly) ECTagNames tagName;
+
+// needed for fast enumeration of subtags in data updates
+@property (readonly) NSMutableArray *subtags;
+
+@end
+
+@interface ECTagInt8 : ECTag {
+	uint8_t m_val;
+}
+
++ (id)tagFromInt8:(uint8_t) value withName:(ECTagNames) name;
++ (id)tagFromBuffer:(uint8_t **) buffer;
+
+@property (readonly)uint8_t uint8Value;
+
+@end
+
+@interface ECTagInt16 : ECTag {
+	uint16_t m_val;
+}
+
++ (id)tagFromInt16:(uint16_t) value withName:(ECTagNames) name;
++ (id)tagFromBuffer:(uint8_t **) buffer;
+
+@property (readonly)uint16_t uint16Value;
+
+@end
+
+@interface ECTagInt32 : ECTag {
+	uint32_t m_val;
+}
+
++ (id)tagFromInt32:(uint32_t) value withName:(ECTagNames) name;
++ (id)tagFromBuffer:(uint8_t **) buffer;
+
+@property (readonly)uint32_t uint32Value;
+
+@end
+
+@interface ECTagInt64 : ECTag {
+	uint64_t m_val;
+}
+
++ (id)tagFromInt64:(uint64_t) value withName:(ECTagNames) name;
++ (id)tagFromBuffer:(uint8_t **) buffer;
+
+@property (readonly)uint64_t uint64Value;
+
+@end
+
+@interface ECTagData : ECTag {
+	NSData *m_data;
+}
+
+- (void)writeToSocket:(NSOutputStream *) socket;
++ (id)tagFromBuffer:(uint8_t **) buffer withLenght:(int) length;
+
+@end
+
+typedef struct {
+	uint64_t lo, hi;
+} MD5Data;
+
+@interface ECTagMD5 : ECTagData {
+	// contain either raw data (in case of hashed string) or 2 64-bit words (in case of tag coming from ec)
+	MD5Data m_val;
+}
+
++ (id)tagFromString:(NSString *) string withName:(ECTagNames) name;
++ (id)tagFromBuffer:(uint8_t **) buffer;
+
+- (MD5Data)getMD5Data;
+- (NSString *)stringKey;
+
+@end
+
+@interface ECTagString : ECTagData {
+	// string 
+	NSString *m_val;
+}
+
++ tagFromString:(NSString *) string withName:(ECTagNames) name;
++ (id)tagFromBuffer:(uint8_t **) buffer;
+
+@property (readonly) NSString * stringValue;
+
+@end
+
+@interface ECPacket : ECTag {
+	ec_opcode_t m_opcode;
+	uint32_t m_flags;
+}
+
++ (id)packetWithOpcode:(ec_opcode_t) opcode;
++ (id)packetFromBuffer:(uint8_t *) buffer withLength:(int)length;
+
+- (void)initWithOpcode:(ec_opcode_t) opcode;
+
+- (void)writeToSocket:(NSOutputStream *) socket;
+ 
+@property (readonly) ec_opcode_t opcode;
+
+@end
+
+@interface ECLoginAuthPacket : ECPacket {
+}
+
++ (id)loginPacket:(NSString *) password withSalt:(uint64_t) salt;
+
+- (NSString *)getMD5_Str:(NSString *) str;
+
+@end	
+
+@interface ECLoginRequestPacket : ECPacket
+{
+}
+
++ (id)loginPacket:(NSString *) version;
+
+
+@end
+
+@class ECRemoteConnection;
+
+@interface amuleLoginHandler : NSObject {
+	enum LOGIN_REQUEST_STATE {
+		LOGIN_IDLE,
+		LOGIN_REQUEST_SENT,
+		LOGIN_PASS_SENT,
+		LOGIN_OK
+	} m_state;
+	
+	ECRemoteConnection *m_connection;
+	
+	NSString *m_pass;
+}
+
++ (id)initWithConnection:(ECRemoteConnection *) connection;
+
+- (void)handlePacket:(ECPacket *) packet;
+
+- (void)usePass:(NSString *) pass;
+
+- (void)reset;
+- (bool)loginOK;
+
+@end
+
+
+@interface NSObject (ECRemoteConnection)
+- (void)handlePacket:(ECPacket *) packet;
+@end
+
+@interface ECRemoteConnection : NSObject {
+	NSInputStream *m_istream;
+	NSOutputStream *m_ostream;
+	
+	NSMutableData *m_rxbuf;
+	
+	int m_rx_size;
+	int m_remaining_size;
+
+
+	NSData *m_txbuf;
+	int m_tx_ptr;
+	int m_tx_size;
+		
+	amuleLoginHandler *m_login_handler;
+	
+    id delegate;
+	
+	bool m_error;
+}
+
++ (id)remoteConnection;
+
+- (void)stream:(NSStream *)stream handleEvent:(NSStreamEvent)eventCode;
+
+- (void)connectToAddress:(NSString *) hostname withPort:(int)trgport;
+- (void)sendLogin:(NSString *) password;
+
+- (void)sendPacket:(ECPacket *) packet;
+
+@property (readonly) bool error;
+
+- (void)setDelegate:(id) val;
+- (id)delegate;
+
+@end

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/EC.mm Added

@@ -0,0 +1,886 @@
+
+#import "EC.h"
+
+#import <CommonCrypto/CommonDigest.h>
+
+@implementation ECTag
+
+@synthesize tagName = m_name;
+@synthesize tagType = m_type;
+@synthesize subtags = m_subtags;
+
++ (id)tagFromBuffer:(uint8_t **) buffer withLenght:(int) length {
+	ECTag *tag = nil; //[[ECTag alloc] init];
+
+	if ( length < 4 ) {
+		NSLog(@"[EC] buffer for tag is too short");
+		return nil;
+	}
+	
+	uint16_t name16 = *(uint16_t *)(*buffer);
+	name16 = ntohs(name16);
+	bool have_subtags = (name16 & 1) != 0;
+	name16 >>= 1;
+	ECTagNames tag_name = (ECTagNames)(name16);
+	*buffer += sizeof(name16);
+	
+	uint8_t type8 = *(*buffer);
+	ECTagTypes tag_type = (ECTagTypes)type8;
+	*buffer += sizeof(type8);
+
+	uint32_t size32 = *(uint32_t *)(*buffer);
+	size32 = ntohl(size32);
+	*buffer += sizeof(uint32_t);
+	
+	NSMutableArray *subtags = have_subtags ? [ECTag readSubtags:buffer withLenght:(length-3)] : nil;
+
+	switch (tag_type) {
+		case EC_TAGTYPE_UINT8:
+			tag = [ECTagInt8 tagFromBuffer:buffer];
+			break;
+		case EC_TAGTYPE_UINT16:
+			tag = [ECTagInt16 tagFromBuffer:buffer];
+			break;
+		case EC_TAGTYPE_UINT32:
+			tag = [ECTagInt32 tagFromBuffer:buffer];
+			break;
+		case EC_TAGTYPE_UINT64:
+			tag = [ECTagInt64 tagFromBuffer:buffer];
+			break;
+		case EC_TAGTYPE_HASH16:
+			tag = [ECTagMD5 tagFromBuffer:buffer];
+			break;
+		case EC_TAGTYPE_STRING:
+			tag = [ECTagString tagFromBuffer:buffer];
+			break;
+		default: ;
+			break;
+	}
+	if ( tag != nil ) {
+		tag->m_name = tag_name;
+		tag->m_subtags = subtags;
+	}
+	return tag;	
+}
+
++ (NSMutableArray *)readSubtags:(uint8_t **) buffer withLenght:(int) length {
+
+	uint16_t count16 = *(uint16_t *)(*buffer);
+	count16 = ntohs(count16);
+	*buffer += sizeof(count16);
+	NSMutableArray *array = [[NSMutableArray alloc] init];
+	[array retain];
+	for(int i = 0; i < count16; i++) {
+		id tag = [ECTag tagFromBuffer:buffer withLenght:length];
+		if ( tag != nil ) {
+			[array addObject:tag];
+		}
+	}
+	
+	return array;
+}
+
+- (void)writeToSocket:(NSOutputStream *) socket {
+	uint16_t name16 = (uint16_t)m_name;
+	name16 <<= 1;
+	uint8_t type8 = (uint8_t)m_type;
+	if ( [m_subtags count] ) {
+		name16 |= 1;
+	}
+	name16 = htons(name16);
+	[socket write:(uint8_t *)&name16 maxLength:sizeof(name16)];
+	[socket write:&type8 maxLength:sizeof(type8)];
+	uint32_t size32 = [self getSize];
+	size32 = htonl(size32);
+	[socket write:(uint8_t *)&size32 maxLength:sizeof(size32)];
+}
+
+- (void)writeSubtagsToSocket:(NSOutputStream *) socket {
+	uint16_t count16 = [m_subtags count];
+	count16 = htons(count16);
+	[socket write:(uint8_t *)&count16 maxLength:sizeof(count16)];
+	for (ECTag *t in m_subtags) {
+		[t writeToSocket:socket];
+	}
+}
+
+- (int)getSize {
+	int total_size = m_size;
+	for (ECTag *t in m_subtags) {
+		total_size += [t getSize];
+		// name + type + size
+		total_size += (2 + 1 + 4);
+		if ([t->m_subtags count]) {
+			total_size += 2;
+		}
+	}
+	return total_size;
+}
+
+- (id)tagByName:(ECTagNames) tagname {
+	ECTag *mytag = nil;
+	for (ECTag *t in m_subtags) {
+		if (t.tagName == tagname) {
+			mytag = t;
+			break;
+		}
+	}
+	return mytag;
+}
+
+- (void)initSubtags {
+	m_subtags = [NSMutableArray array];
+	[m_subtags retain];
+}
+
+- (void) dealloc {
+	[m_subtags release];
+	[super dealloc];
+}
+
+- (uint64_t)tagInt64ByName: (ECTagNames) tagname {
+	ECTag *st = [self tagByName: tagname];
+	if (st == nil) {
+		return 0;
+	}
+	uint64_t value = 0;
+	switch ([st getSize]) {
+		case 1: {
+			ECTagInt8 *t = (ECTagInt8 *)st;
+			value = t.uint8Value;
+			break;
+			}
+		case 2: {
+			ECTagInt16 *t = (ECTagInt16 *)st;
+			value = t.uint16Value;
+			break;
+			}
+		case 4: {
+			ECTagInt32 *t = (ECTagInt32 *)st;
+			value = t.uint32Value;
+			break;
+			}
+		case 8: {
+			ECTagInt64 *t = (ECTagInt64 *)st;
+			value = t.uint64Value;
+			break;
+			}
+	}
+	return value;
+}
+
+- (int)tagCount {
+	return [m_subtags count];
+}
+
+@end
+
+@implementation ECTagInt8
+
+@synthesize uint8Value = m_val;
+
++ (id)tagFromInt8:(uint8_t) value withName:(ECTagNames) name {
+	ECTagInt8 *tag = [[ECTagInt8 alloc] init];
+	tag->m_val = value;
+	tag->m_size = 1;
+	tag->m_type = EC_TAGTYPE_UINT8;
+	tag->m_name = name;
+	
+	return tag;	
+}
+
++ (id)tagFromBuffer:(uint8_t **) buffer {
+	ECTagInt8 *tag = [[ECTagInt8 alloc] init];
+	tag->m_val = **buffer;
+	tag->m_size = 1;
+	tag->m_type = EC_TAGTYPE_UINT8;
+	
+	*buffer += 1;
+	
+	return tag;
+}
+
+- (void)writeToSocket:(NSOutputStream *) socket {
+	[super writeToSocket:socket];
+	
+	[socket write:&m_val maxLength:sizeof(m_val)];
+}
+
+@end
+
+@implementation ECTagInt16
+
+@synthesize uint16Value = m_val;
+
++ (id)tagFromInt16:(uint16_t) value withName:(ECTagNames) name {
+	ECTagInt16 *tag = [[ECTagInt16 alloc] init];
+	tag->m_val = value;
+	tag->m_size = 2;
+	tag->m_type = EC_TAGTYPE_UINT16;
+	tag->m_name = name;
+	
+	return tag;	
+}
+
++ (id)tagFromBuffer:(uint8_t **) buffer {
+	ECTagInt16 *tag = [[ECTagInt16 alloc] init];
+	
+	tag->m_val = ntohs(*((uint16_t *)(*buffer)));
+	tag->m_size = 2;
+	tag->m_type = EC_TAGTYPE_UINT16;
+	
+	*buffer += 2;
+
+	return tag;
+}
+
+
+@end
+
+@implementation ECTagInt32
+
+@synthesize uint32Value = m_val;
+
++ (id)tagFromInt32:(uint32_t) value withName:(ECTagNames) name {
+	ECTagInt32 *tag = [[ECTagInt32 alloc] init];
+	tag->m_val = value;
+	tag->m_size = 4;
+	tag->m_type = EC_TAGTYPE_UINT32;
+	tag->m_name = name;
+	
+	return tag;	
+}
+
++ (id)tagFromBuffer:(uint8_t **) buffer {
+	ECTagInt32 *tag = [[ECTagInt32 alloc] init];
+	
+	tag->m_val = ntohl(*((uint32_t *)(*buffer)));
+	tag->m_size = 4;
+	tag->m_type = EC_TAGTYPE_UINT32;
+	
+	*buffer += 4;
+
+	return tag;
+}
+
+
+@end
+
+@implementation ECTagInt64
+
+@synthesize uint64Value = m_val;
+
++ (id)tagFromInt64:(uint64_t) value withName:(ECTagNames) name {
+	ECTagInt64 *tag = [[ECTagInt64 alloc] init];
+	tag->m_val = value;
+	tag->m_size = 8;
+	tag->m_type = EC_TAGTYPE_UINT64;
+	tag->m_name = name;
+	
+	return tag;	
+}
+
+
++ (id)tagFromBuffer:(uint8_t **) buffer {
+	ECTagInt64 *tag = [[ECTagInt64 alloc] init];
+	uint64_t lo, hi;
+
+	uint32 val32 = *((uint32_t *)(*buffer));
+	hi = ntohl(val32);
+	*buffer += 4;
+	
+	val32 = *((uint32_t *)(*buffer));
+	lo = ntohl(val32);
+	*buffer += 4;
+	
+	tag->m_val = (hi << 32) | lo;
+	tag->m_size = 8;
+	tag->m_type = EC_TAGTYPE_UINT64;
+	
+	return tag;
+}
+
+
+- (void)writeToSocket:(NSOutputStream *) socket {
+	[super writeToSocket:socket];
+	
+	uint32_t val32 = m_val >> 32;
+	val32 = htonl(val32);
+	[socket write:(uint8_t *)&val32 maxLength:sizeof(val32)];
+
+	val32 = m_val & 0xffffffff;
+	val32 = htonl(val32);
+	[socket write:(uint8_t *)&val32 maxLength:sizeof(val32)];
+}
+
+@end
+
+
+@implementation ECTagData
+
+- (void)writeToSocket:(NSOutputStream *) socket {
+	[super writeToSocket:socket];
+	
+	[socket write:(const uint8_t *)[m_data bytes] maxLength:m_size];
+}
+
+- (void) dealloc {
+	[m_data release];
+	[super dealloc];
+}
+
++ (id)tagFromBuffer:(uint8_t **) buffer withLenght:(int) length {
+	ECTagData *tag = [[ECTagData alloc] init];
+
+	tag->m_data = [NSData dataWithBytes: *buffer length: length];
+	[tag->m_data retain];
+	
+	return tag;
+}
+
+
+@end
+
+@implementation ECTagMD5
+
++ (id)tagFromString:(NSString *) string withName:(ECTagNames) name {
+	ECTagMD5 *tag = [[ECTagMD5 alloc] init];
+
+	CC_MD5_CTX ctx;
+	unsigned char md5data[16];
+	CC_MD5_Init(&ctx);
+	CC_MD5_Update(&ctx, [string UTF8String], [string length]);
+	CC_MD5_Final(md5data, &ctx);
+	
+	tag->m_data = [NSData dataWithBytes: md5data length: sizeof(md5data)];
+	[tag->m_data retain];
+	tag->m_size = 16;
+	tag->m_type = EC_TAGTYPE_HASH16;
+	tag->m_name = name;
+
+	return tag;
+}
+
++ (id)tagFromBuffer:(uint8_t **) buffer {
+	ECTagMD5 *tag = [[ECTagMD5 alloc] init];
+	
+	tag->m_data = 0;
+	tag->m_val.lo = *((uint64_t *)(*buffer));
+	(*buffer) += 8;
+	tag->m_val.hi = *((uint64_t *)(*buffer));
+	(*buffer) += 8;
+	
+	return tag;
+}
+
+- (MD5Data)getMD5Data {
+	if ( m_data ) {
+		uint8_t *data_ptr = (uint8_t *)[m_data bytes];
+
+		uint64_t hi = *(uint64_t *)data_ptr;
+		data_ptr += 8;
+		uint64_t lo = *(uint64_t *)data_ptr;
+		MD5Data md5 = {hi, lo};
+		return md5;
+	} else {
+		return m_val;
+	}
+}
+- (NSString *)stringKey {
+	NSString *s = [NSString stringWithFormat:@"%qx%qx", m_val.hi, m_val.lo];
+	return s;
+}
+
+@end
+
+@implementation ECTagString
+
+@synthesize stringValue = m_val;
+
++ tagFromString:(NSString *) string withName:(ECTagNames) name {
+	ECTagString *tag = [[ECTagString alloc] init];
+
+	const char *rawstring = [string UTF8String];
+	tag->m_size = strlen(rawstring) + 1;
+	tag->m_data = [NSData dataWithBytes: rawstring length: tag->m_size];
+	[tag->m_data retain];
+	tag->m_type = EC_TAGTYPE_STRING;
+	tag->m_name = name;
+
+	return tag;
+}
+
++ (id)tagFromBuffer:(uint8_t **) buffer {
+	ECTagString *tag = [[ECTagString alloc] init];
+
+	tag->m_val = [NSString stringWithCString:(char *)(*buffer) encoding:NSUTF8StringEncoding];
+	*buffer += [tag->m_val length] + 1;
+	
+	return tag;
+}
+
+@end
+
+@implementation ECPacket
+
+@synthesize opcode = m_opcode;
+
++ (id)packetWithOpcode:(ec_opcode_t) opcode {
+	ECPacket *p = [[ECPacket alloc] init];
+
+	[p initWithOpcode:opcode];
+	
+	return p;
+}
+
+
+- (void)initWithOpcode:(ec_opcode_t) opcode {
+	m_opcode = opcode;
+	m_flags = 0x20;
+
+	// allow notification push to my client
+	m_flags |= EC_FLAG_NOTIFY | EC_FLAG_ACCEPTS;
+
+	[self initSubtags];
+}
+
++ (id)packetFromBuffer:(uint8_t *) buffer withLength:(int)length {
+	if ( length < 11 ) {
+		return nil;
+	}
+	ECPacket *p = [[ECPacket alloc] init];
+	uint8_t *data = buffer;
+	
+	p->m_flags = ntohl(*((uint32_t *)data));
+	data += 4;
+	uint32_t packet_size = ntohl(*((uint32_t *)data));
+	data += 4;
+	if ( packet_size > 1024*1024 ) {
+		return nil;
+	}
+	p->m_opcode = (ec_opcode_t)(*data);
+	data++;
+
+	uint16_t tag_count = ntohs(*((uint16_t *)data));
+	data += 2;
+	if ( tag_count ) {
+		p->m_subtags = [[NSMutableArray alloc] init];
+		[p->m_subtags retain];
+		uint8_t *start_ptr = data;
+		for(int i = 0; i < tag_count; i++) {
+			ECTag *tag = [ECTag tagFromBuffer:&data withLenght:(length - (data - start_ptr))];
+			// some tags are not supported yet
+			if ( tag != nil ) {
+				[p->m_subtags addObject:tag];
+			}
+		}
+	}
+	
+	return p;
+}
+
+- (void)writeToSocket:(NSOutputStream *) socket {
+	// 1 (command) + 2 (tag count)
+	int packet_size = [self getSize] + 1 + 2;
+
+// No need for zlib on client side	
+//	if ( packet_size > MaxUncompressedPacket ) {
+//		m_flags |= (Int32)ECFlags.EC_FLAG_ZLIB;
+//	}
+	uint32_t val32 = htonl(m_flags);
+	[socket write:(uint8_t *)&val32 maxLength:sizeof(val32)];
+	if ( m_flags & EC_FLAG_ACCEPTS ) {
+		[socket write:(uint8_t *)&val32 maxLength:sizeof(val32)];
+	}
+	val32 = htonl(packet_size);
+	[socket write:(uint8_t *)&val32 maxLength:sizeof(val32)];
+	[socket write:(uint8_t *)&m_opcode maxLength:sizeof(m_opcode)];
+
+	if ( [m_subtags count] ) {
+		[self writeSubtagsToSocket:socket];
+	} else {
+		uint16_t val16 = 0;
+		[socket write:(uint8_t *)&val16 maxLength:sizeof(val16)];
+	}
+}
+
+@end
+
+@implementation ECLoginAuthPacket
+
+- (NSString *)getMD5_Str:(NSString *) str {
+	CC_MD5_CTX ctx;
+	unsigned char md5data[16];
+	CC_MD5_Init(&ctx);
+	CC_MD5_Update(&ctx, [str UTF8String], [str length]);
+	CC_MD5_Final(md5data, &ctx);
+	NSString *MD5str = [NSString stringWithFormat:@"%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+						 md5data[0], md5data[1],md5data[2],md5data[3],
+						 md5data[4],md5data[5],md5data[6],md5data[7],
+						 md5data[8],md5data[9],md5data[10],md5data[11],
+						 md5data[12],md5data[13],md5data[14],md5data[15]
+						 ];
+	return MD5str;
+}
+
++ (id)loginPacket:(NSString *) password withSalt:(uint64_t) salt {
+	ECLoginAuthPacket *p = [[ECLoginAuthPacket alloc] init];
+
+	[p initWithOpcode:EC_OP_AUTH_PASSWD];
+
+	NSString *saltStr = [NSString stringWithFormat:@"%llX", salt];
+//	CC_MD5_CTX ctx;
+//	unsigned char md5data[16];
+//	CC_MD5_Init(&ctx);
+//	CC_MD5_Update(&ctx, [saltStr UTF8String], [saltStr length]);
+//	CC_MD5_Final(md5data, &ctx);
+//	NSString *saltMD5 = [NSString stringWithFormat:@"%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x",
+//						 md5data[0], md5data[1],md5data[2],md5data[3],
+//						 md5data[4],md5data[5],md5data[6],md5data[7],
+//						 md5data[8],md5data[9],md5data[10],md5data[11],
+//						 md5data[12],md5data[13],md5data[14],md5data[15]
+//						 ];
+	NSString *saltMD5 = [p getMD5_Str: saltStr];
+	
+	NSString *newPass = [NSString stringWithFormat:@"%@%@", [p getMD5_Str: password], saltMD5];
+
+	NSLog(@"[EC] using salt=%@ saltHash=%@ newPass=%@\n", saltStr, saltMD5, newPass);
+
+	ECTagMD5 *passtag = [ECTagMD5 tagFromString: newPass withName:EC_TAG_PASSWD_HASH];
+	[p->m_subtags addObject:passtag];
+
+	return p;
+}
+
+
+@end
+
+@implementation ECLoginRequestPacket
+
++ (id)loginPacket:(NSString *) version {
+	ECLoginRequestPacket *p = [[ECLoginRequestPacket alloc] init];
+	
+	[p initWithOpcode:EC_OP_AUTH_REQ];
+	
+	ECTagString *version_tag = [ECTagString tagFromString:version withName:EC_TAG_CLIENT_VERSION];
+	[p->m_subtags addObject:version_tag];
+	
+	ECTagString *client_name_tag = [ECTagString tagFromString:@"cocoa-frontend" withName:EC_TAG_CLIENT_NAME];
+	[p->m_subtags addObject:client_name_tag];
+	
+	ECTagInt64 *proto_version_tag = [ECTagInt64 tagFromInt64:EC_CURRENT_PROTOCOL_VERSION withName:EC_TAG_PROTOCOL_VERSION];
+	[p->m_subtags addObject:proto_version_tag];
+	
+	return p;
+}
+
+
+@end
+
+
+@implementation ECRemoteConnection
+
+@synthesize error = m_error;
+
++ (id)remoteConnection {
+	ECRemoteConnection *p = [[ECRemoteConnection alloc] init];
+	
+	//
+	// rx buffer can be resized as needed
+	//
+	p->m_rxbuf = [NSMutableData dataWithLength:1024];
+	[p->m_rxbuf retain];
+	
+	p->m_login_handler = [amuleLoginHandler initWithConnection:p];
+	[p->m_login_handler retain];
+	//
+	// client only transmit commands, which are
+	// quite small in size. "big enough" buffer will do the trick
+	//
+//	p->m_txbuf = [NSMutableData dataWithLength:1024];
+//	[p->m_txbuf retain];
+	p->m_txbuf = nil;
+	
+	return p;
+}
+
+- (void) dealloc {
+	[m_rxbuf release];
+	[m_txbuf release];
+
+	[m_istream release];
+	[m_ostream release];
+	
+	[super dealloc];
+}
+
+- (bool)isIpv4Address:(NSString *) address {
+	NSArray *ar = [address componentsSeparatedByString:@"."];
+	if ( [ar count] != 4 ) {
+		return false;
+	}
+	for (NSString *s in ar) {
+		const char *p = [s UTF8String];
+		while ( *p ) {
+			if ( !isdigit(*p) ) {
+				return false;
+			}
+			p++;
+		}
+	}
+	return true;
+}
+
+- (void)connectToAddress:(NSString *) hostname withPort:(int)trgport {
+	m_error = false;
+	
+	NSHost *host = [NSHost hostWithName:hostname];
+	NSString *addr = nil;
+	
+	//
+	// On Mac localhost has ipv6 address (linklocal), but amuled listen
+	// only on ipv4
+	//
+	for (NSString *ad in host.addresses) {
+		NSLog(@"host have address=%@ is_ipv4=%d\n", ad, [self isIpv4Address:ad]);
+		if ( [self isIpv4Address:ad] ) {
+			addr = ad;
+			break;
+		}
+	}
+	if ( addr == nil ) {
+		return;
+	}
+	host = [NSHost hostWithAddress:addr];
+
+	[NSStream getStreamsToHost:host port:trgport inputStream:&m_istream outputStream:&m_ostream];
+
+	[m_istream retain];
+	[m_ostream retain];
+	
+	[m_istream setDelegate:self];
+	[m_ostream setDelegate:self];
+	
+	[m_istream scheduleInRunLoop:[NSRunLoop currentRunLoop]
+            forMode:NSDefaultRunLoopMode];
+
+	[m_ostream scheduleInRunLoop:[NSRunLoop currentRunLoop]
+            forMode:NSDefaultRunLoopMode];
+
+	[m_istream open];
+	[m_ostream open];
+	
+	m_remaining_size = 8;
+	m_rx_size = 0;
+}
+
+- (void)sendLogin:(NSString *) password {
+
+	[m_login_handler usePass: password];
+	
+	ECLoginRequestPacket *p = [ECLoginRequestPacket loginPacket:@"0.1"];
+	[self sendPacket:p];
+}
+
+- (void)sendPacket:(ECPacket *) packet {
+	NSOutputStream *memstream = [NSOutputStream outputStreamToMemory];
+	[memstream open];
+	
+	[packet writeToSocket:memstream];
+	id data = [memstream propertyForKey:NSStreamDataWrittenToMemoryStreamKey];
+	
+ 	m_tx_size = [data length];
+	NSLog(@"[EC] sending packet %d bytes\n", m_tx_size);
+	m_tx_ptr = [m_ostream write:(const uint8_t *)[data bytes] maxLength:[data length]];
+	NSLog(@"[EC] %d bytes sent\n", m_tx_ptr);
+	if ( m_tx_ptr == m_tx_size ) {
+		m_txbuf = nil;
+	} else {
+		m_txbuf = (NSData *)data;
+		[m_txbuf retain];
+	}
+	NSStreamStatus stream_status = [m_ostream streamStatus];
+	switch ( stream_status ) {
+		case NSStreamStatusNotOpen:
+		case NSStreamStatusClosed:
+		case NSStreamStatusError:
+			NSLog(@"[EC] error in output stream\n");
+			m_error = true;
+			break;
+		default:;
+	}
+//	NSLog(@"[EC] status in output stream=%d\n", stream_status);
+
+}
+
+- (void)stream:(NSStream *)stream handleEvent:(NSStreamEvent)eventCode {
+    switch(eventCode) {
+		case NSStreamEventOpenCompleted:
+		{
+			NSLog(@"[EC] open complete\n");
+			break;
+		}
+		case NSStreamEventErrorOccurred:
+		{
+			NSError *e = [stream streamError];
+			NSString *description = [e localizedDescription];
+			NSLog(@"[EC] socket error [%s]\n", [description UTF8String]);
+			break;
+		}
+        case NSStreamEventHasBytesAvailable:
+        {
+			uint8_t *data_ptr = (uint8_t *)[m_rxbuf mutableBytes];
+			unsigned int len = [m_rxbuf length];
+
+            len = [(NSInputStream *)stream read:data_ptr + m_rx_size maxLength:len];
+#ifdef EC_RX_DEBUG
+			NSLog(@"[EC] receiving %d bytes, %d in total, %d remaining\n", len, m_rx_size, m_remaining_size);
+#endif
+			if ( len == 0 ) {
+				//
+				// Remote side must be closed connection
+				//
+				m_error = true;
+				if ( [delegate respondsToSelector:@selector(handleError)] ) {
+					[delegate performSelector:@selector(handleError)];
+				}
+			}
+			int total_len = len;
+			int packet_offset = 0;
+			while ( total_len != 0 ) {
+				len = ( m_remaining_size > total_len ) ? total_len : m_remaining_size;
+				total_len -= len;
+
+				// are we still waiting for flags and size?
+				if ( m_rx_size < 8 ) {
+					if ( (m_rx_size + len) >= 8 ) {
+						// got flags and packet size - may proceed
+						//uint32_t flags = *(((uint32_t *)[m_rxbuf mutableBytes]) + 0);
+						uint32_t val32 = *((uint32_t *)(data_ptr + 4 + packet_offset));
+
+						int delta = 8 - m_rx_size;
+
+						m_remaining_size = ntohl(val32) - (len - delta);
+#ifdef EC_RX_DEBUG
+						NSLog(@"[EC] rx got flags+size, remaining count %d\n", m_remaining_size);
+#endif
+					} else {
+						m_remaining_size -= len;
+					}
+				} else {
+					m_remaining_size -= len;
+				}
+				m_rx_size += len;
+				if ( m_remaining_size == 0 ) {
+					//
+					// full packet received, call handler
+					//
+					uint8_t *packet_start = data_ptr + packet_offset;
+					int packet_length = [m_rxbuf length] - packet_offset;
+					ECPacket *packet = [ECPacket packetFromBuffer:packet_start withLength:packet_length];
+					packet_offset += m_rx_size;
+					
+					if ( [m_login_handler loginOK] ) {
+#ifdef EC_RX_DEBUG
+						NSLog(@"[EC] calling delegate\n");
+#endif
+						if ( [delegate respondsToSelector:@selector(handlePacket:)] ) {
+							[delegate performSelector:@selector(handlePacket:) withObject:packet];
+						}
+					} else {
+						NSLog(@"[EC] login handler\n");
+						[m_login_handler handlePacket: packet];
+					}
+					m_remaining_size = 8;
+					m_rx_size = 0;
+				}
+			}
+            break;
+        }
+		
+        case NSStreamEventHasSpaceAvailable:
+		{
+			if ( m_txbuf != nil ) {
+				int remaining = [m_txbuf length] - m_tx_ptr;
+				if ( remaining ) {
+					const uint8_t *txdata = ((const uint8_t *)[m_txbuf bytes]) + m_tx_ptr;
+					int txcount = [m_ostream write:txdata maxLength:remaining];
+					m_tx_ptr += txcount;
+				} else {
+					[m_txbuf release];
+					m_txbuf = nil;
+				}
+
+			}
+			break;
+		}
+	}
+}
+
+- (void)setDelegate:(id)val {
+    delegate = val;
+}
+
+- (id)delegate {
+    return delegate;
+}
+
+
+@end
+
+@implementation amuleLoginHandler
+
++ (id)initWithConnection:(ECRemoteConnection *) connection {
+
+	amuleLoginHandler *obj = [[amuleLoginHandler alloc] init]; 
+	obj->m_connection = connection;
+	
+	obj->m_state = LOGIN_REQUEST_SENT;
+
+	return obj;
+}
+
+- (void)usePass:(NSString *) pass {
+	m_pass = pass;
+}
+
+- (void)handlePacket:(ECPacket *) packet {
+	switch(m_state) {
+		case LOGIN_IDLE:
+			NSLog(@"[EC]: error - no packet should come until request is sent\n");
+			break;
+		case LOGIN_REQUEST_SENT:
+			if ( packet.opcode == EC_OP_AUTH_SALT ) {
+				
+				uint64_t salt = [packet tagInt64ByName:EC_TAG_PASSWD_SALT];
+				ECLoginAuthPacket *auth_packet = [ECLoginAuthPacket loginPacket:m_pass withSalt:salt];
+				[m_connection sendPacket:auth_packet];
+				
+				m_state = LOGIN_PASS_SENT;
+			} else {
+				NSLog(@"[EC]: error - expecting packet with EC_OP_AUTH_SALT, not [%d]\n", packet.opcode);
+				m_state = LOGIN_IDLE;
+			} 
+			break;
+		case LOGIN_PASS_SENT:
+			if ( packet.opcode == EC_OP_AUTH_OK ) {
+				m_state = LOGIN_OK;
+			} else {
+				NSLog(@"[EC]: error - login failed, core replied with code=[%d]\n", packet.opcode);
+			}
+			break;
+		case LOGIN_OK:
+			NSLog(@"[EC]: error - this delegate should be replaced after login completed\n");
+			break;
+	}
+}
+- (void)reset {
+	m_state = LOGIN_IDLE;
+}
+
+- (bool)loginOK {
+	return m_state == LOGIN_OK;
+}
+
+
+@end

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/English.lproj Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/English.lproj/InfoPlist.strings Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/English.lproj/LoginDialog.nib Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/English.lproj/LoginDialog.nib/classes.nib Added

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBClasses</key>
+	<array>
+		<dict>
+			<key>CLASS</key>
+			<string>FirstResponder</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>closeCancel</key>
+				<string>id</string>
+				<key>closeOK</key>
+				<string>id</string>
+			</dict>
+			<key>CLASS</key>
+			<string>LoginDialogController</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>m_dlg</key>
+				<string>id</string>
+				<key>m_host_field</key>
+				<string>NSTextField</string>
+				<key>m_pass_field</key>
+				<string>NSTextField</string>
+				<key>m_port_field</key>
+				<string>NSTextField</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSObject</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+		</dict>
+	</array>
+	<key>IBVersion</key>
+	<string>1</string>
+</dict>
+</plist>

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/English.lproj/LoginDialog.nib/info.nib Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/English.lproj/LoginDialog.nib/keyedobjects.nib Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/English.lproj/MainMenu.nib Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/English.lproj/MainMenu.nib/designable.nib Added

@@ -0,0 +1,4179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
+	<data>
+		<int key="IBDocument.SystemTarget">1050</int>
+		<string key="IBDocument.SystemVersion">9G55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">677</string>
+		<string key="IBDocument.AppKitVersion">949.43</string>
+		<string key="IBDocument.HIToolboxVersion">353.00</string>
+		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="838"/>
+		</object>
+		<object class="NSArray" key="IBDocument.PluginDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>com.brandonwalkin.BWToolkit</string>
+			<string>com.apple.InterfaceBuilderKit</string>
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSCustomObject" id="1021">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSCustomObject" id="1014">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1050">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSMenu" id="649796088">
+				<string key="NSTitle">AMainMenu</string>
+				<object class="NSMutableArray" key="NSMenuItems">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSMenuItem" id="694149608">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">aMule</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<object class="NSCustomResource" key="NSOnImage" id="1071433421">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuCheckmark</string>
+						</object>
+						<object class="NSCustomResource" key="NSMixedImage" id="564125106">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuMixedState</string>
+						</object>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="110575045">
+							<string key="NSTitle">aMule</string>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="238522557">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">About aMule</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="304266470">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="609285721">
+									<reference key="NSMenu" ref="110575045"/>
+									<string type="base64-UTF8" key="NSTitle">UHJlZmVyZW5jZXPigKY</string>
+									<string key="NSKeyEquiv">,</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="481834944">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="1046388886">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Services</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="752062318">
+										<string key="NSTitle">Services</string>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+										</object>
+										<string key="NSName">_NSServicesMenu</string>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="646227648">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="755159360">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Hide aMule</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="342932134">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Hide Others</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="908899353">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Show All</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="1056857174">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="632727374">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Quit aMule</string>
+									<string key="NSKeyEquiv">q</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+							</object>
+							<string key="NSName">_NSAppleMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="379814623">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">File</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="1071433421"/>
+						<reference key="NSMixedImage" ref="564125106"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="720053764">
+							<string key="NSTitle">File</string>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="705341025">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Add ed2k link</string>
+									<string key="NSKeyEquiv">n</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="425164168">
+									<reference key="NSMenu" ref="720053764"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="294629803">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Page Setup...</string>
+									<string key="NSKeyEquiv">P</string>
+									<int key="NSKeyEquivModMask">1179648</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+									<string key="NSToolTip"/>
+								</object>
+								<object class="NSMenuItem" id="49223823">
+									<reference key="NSMenu" ref="720053764"/>
+									<string type="base64-UTF8" key="NSTitle">UHJpbnTigKY</string>
+									<string key="NSKeyEquiv">p</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+							</object>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="586577488">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">View</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="1071433421"/>
+						<reference key="NSMixedImage" ref="564125106"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="466310130">
+							<string key="NSTitle">View</string>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="102151532">
+									<reference key="NSMenu" ref="466310130"/>
+									<string key="NSTitle">Show Toolbar</string>
+									<string key="NSKeyEquiv">t</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+							</object>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="713487014">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Window</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="1071433421"/>
+						<reference key="NSMixedImage" ref="564125106"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="835318025">
+							<string key="NSTitle">Window</string>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="1011231497">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Minimize</string>
+									<string key="NSKeyEquiv">m</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="575023229">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Zoom</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="299356726">
+									<reference key="NSMenu" ref="835318025"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+								<object class="NSMenuItem" id="625202149">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Bring All to Front</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+							</object>
+							<string key="NSName">_NSWindowsMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="391199113">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Help</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="1071433421"/>
+						<reference key="NSMixedImage" ref="564125106"/>
+						<string key="NSAction">submenuAction:</string>
+						<object class="NSMenu" key="NSSubmenu" id="374024848">
+							<string key="NSTitle">Help</string>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="238773614">
+									<reference key="NSMenu" ref="374024848"/>
+									<string key="NSTitle">aMule Help</string>
+									<string key="NSKeyEquiv">?</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+							</object>
+						</object>
+					</object>
+				</object>
+				<string key="NSName">_NSMainMenu</string>
+			</object>
+			<object class="NSWindowTemplate" id="972006081">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{335, 74}, {1008, 676}}</string>
+				<int key="NSWTFlags">1946157056</int>
+				<string key="NSWindowTitle">aMule</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSToolbar" key="NSViewClass" id="545039154">
+					<object class="NSMutableString" key="NSToolbarIdentifier">
+						<characters key="NS.bytes">4914F9B0-9937-4196-9689-7544DD4FD074</characters>
+					</object>
+					<nil key="NSToolbarDelegate"/>
+					<bool key="NSToolbarPrefersToBeShown">YES</bool>
+					<bool key="NSToolbarShowsBaselineSeparator">YES</bool>
+					<bool key="NSToolbarAllowsUserCustomization">NO</bool>
+					<bool key="NSToolbarAutosavesConfiguration">NO</bool>
+					<int key="NSToolbarDisplayMode">1</int>
+					<int key="NSToolbarSizeMode">1</int>
+					<object class="NSMutableDictionary" key="NSToolbarIBIdentifiedItems">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>159427B1-5D8B-4F3C-A2FC-F2F453EA1D14</string>
+							<string>62AA47AC-884E-456B-9F94-1F3F04647AF6</string>
+							<string>767BD347-1697-4006-B735-86CBF19465F8</string>
+							<string>958D1D36-B9A4-4CDD-8CDC-7693F081D29B</string>
+							<string>D068E44F-D3FF-4B1C-BB88-295078B93B92</string>
+							<string>NSToolbarCustomizeToolbarItem</string>
+							<string>NSToolbarFlexibleSpaceItem</string>
+							<string>NSToolbarPrintItem</string>
+							<string>NSToolbarSeparatorItem</string>
+							<string>NSToolbarShowColorsItem</string>
+							<string>NSToolbarShowFontsItem</string>
+							<string>NSToolbarSpaceItem</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="NSToolbarItem" id="233912118">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">159427B1-5D8B-4F3C-A2FC-F2F453EA1D14</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Transfers</string>
+								<string key="NSToolbarItemPaletteLabel">Transfers</string>
+								<string key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Toolbar_Transfers</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="687973582">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">62AA47AC-884E-456B-9F94-1F3F04647AF6</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Shared</string>
+								<string key="NSToolbarItemPaletteLabel">Shared</string>
+								<string key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Toolbar_Shared</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="765865720">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">767BD347-1697-4006-B735-86CBF19465F8</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Stats</string>
+								<string key="NSToolbarItemPaletteLabel">Stats</string>
+								<string key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Toolbar_Stats</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="517137618">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">958D1D36-B9A4-4CDD-8CDC-7693F081D29B</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Network</string>
+								<string key="NSToolbarItemPaletteLabel">Network</string>
+								<string key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Toolbar_Network</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="665899689">
+								<object class="NSMutableString" key="NSToolbarItemIdentifier">
+									<characters key="NS.bytes">D068E44F-D3FF-4B1C-BB88-295078B93B92</characters>
+								</object>
+								<string key="NSToolbarItemLabel">Search</string>
+								<string key="NSToolbarItemPaletteLabel">Search</string>
+								<string key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSCustomResource" key="NSToolbarItemImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">Toolbar_Search</string>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="108438574">
+								<string key="NSToolbarItemIdentifier">NSToolbarCustomizeToolbarItem</string>
+								<string key="NSToolbarItemLabel">Customize</string>
+								<string key="NSToolbarItemPaletteLabel">Customize</string>
+								<string key="NSToolbarItemToolTip">Customize Toolbar</string>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSImage" key="NSToolbarItemImage">
+									<int key="NSImageFlags">683671552</int>
+									<string key="NSSize">{32, 32}</string>
+									<object class="NSMutableArray" key="NSReps">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSArray">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<integer value="0" id="8"/>
+											<object class="NSBitmapImageRep">
+												<object class="NSData" key="NSTIFFRepresentation">
+													<bytes key="NS.bytes">TU0AKgAAEAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAICAgbAAAABAAAAAAEBAQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAQEBAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAENDQ0dJSUlW11dXbBpaWnDb29vzyAgIGUPDw8xAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAABsbGyUoKChIHh4ePSkpKUonJycsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMDCEJCQoWvr6/i9fX1/fX19f7h4eH82dnZ+YODg9sYGBg8
+AAAAAAAAAAAAAAAAAAAAAAAAAAJFRUV6ZGRkvf39/f/+/v7//////0NDQ7QAAAAEAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8PDx9ISEiH2tra8/7+/v/j4+P/2NjY/7a2tv+ysrL/
+i4uL7j09PeUKCgoSAAAAAAAAAAAAAAAAUVFRlo2NjfTIyMj6x8fH/56env97e3v/ISEhMAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPDw8lRUVFjtDQ0Pb+/v7/4eHh/dDQ0P+NjY3/
+Tk5O6yoqKrIfHx+gGhoarCIiImwAAAABAAAAADg4OGWenp7/y8vL/d3d3f+8vLz/hYWF/0RERE0AAAAA
+AAAAAAAAAAAfHx8sAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAj8/P2za2try9/f3/+vr6/7Kysr/
+dnZ2/D4+PvwgICB+EBAQNAICAgcAAAAPERERPQMDAwkQEBASh4eH2MHBwf/o6Oj/39/f/3R0dP88PDxO
+AAAAAAAAAAAAAAAAcnJylkNDQ58HBwcIAAAAAAAAAAAAAAAAAAAAAAAAAAAGBgYMfn5+uMvLy/3Hx8f+
+u7u7/5OTk/9CQkL7HRYL7AICAgQAAAAAAAAAAAAAAAAAAAAAAgICBS4uLjOWlpbz6urq/+7u7v+rq6v/
+IyMj0wAAAAAAAAAAAAAAAIGBgZGLi4v/QkJC2Q0NDSYAAAAAAAAAAAAAAAAAAAAAGRkZJF5eXoylpaXz
+pqam/4qKiv91dXX/YWFh+iwkHvojEADrJhcGoAgICA0AAAAAAAAAAAAAAAAAAAAAPj4+RJaWlvr19fX/
+6+vr/7W1tfVaWlrlAwMDbAAAAACKioqcoqKi/7+/v/9HR0fnDg4OJwAAAAAAAAAAHR0dK3V1dZ+pqanC
++vr6/9vb2/99fX3+Y2Nj+EhISOgMCAP4JhIA8jgaAPBxNADsNyMMjgcHBwsAAAAAAAAAAAAAAAAMDAwO
+m5ub+Orq6v/y8vL/0NDQ7ICAgMtkZGTqcHBwzLOzs//Pz8//0tLS/0xMTNoJCQkhAAAAABoaGjZ/f3+4
+//////j4+P/9/f3/9vb2/0dHR/8oKCjkKSkpoAQCAJUNBQDXVSgA5XY5AOuTSADcOiUOewYGBgoAAAAA
+AAAAAB4eHmFlZWX76Ojo/+7u7v/5+fn/5OTk9Li4uO3f39//8PDw/+Hh4f/Ly8v/Ozs7rQICAgMAAAAA
+GBgYL3x8fP///////////7S0tP+np6f/QEBA+xUVFXUJCQkkBAQEDgcFA20jEQC7YzIA3n9BAOiiUwDK
+NiMObgYGBgoTExNIOzs74bGxsf3Dw8P/1dXV////////////////////////////8/Pz/3R0dOcPDw9H
+AAAAAQAAAAAAAAAAVVVVooCAgP/v7+//v7+//2VlZf86OjrLAQEBBgAAAAAAAAAAAAAAABENCVctFwCl
+ZTQA1oZFAOCqWgDAMiMTgzExMcKzs7P4wcHB/5+fn//W1tb///////v7+/v//////////729vfOFhYXy
+IyMjdAAAAAMAAAABAAAAAAAAAAAAAAAASkpKmlpaWv+RkZH/Nzc38hgYGG4AAAABAAAAAAAAAAAAAAAA
+AAAAAAsFAEUwGACbaDcAzXpCAOFnRiLjs7Kx+MTExP+pqan/09PT/3p6evpdXV3rbGxs6l1dXfVXV1fs
+UlJSxykpKWMAAAAGAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAQUFBmiMjI/8cHBysBQUFHQAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAsFAEAuGACfSzAT47y4s/24uLj/lJSU/9TU1P+Dg4PkMzMzzwYGBgw6OjpB
+QEBASQ8PDxYbGxshAAAAAgAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIiIimgoKCi4AAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAwJBYS9u7n4r6+v/4GBgf/Pz8//iISB6CYmJqoDAwMK
+AAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAABUwcHB7qurq/9ubm7/zs7O/5yOgPhlPhbf
+MhsCegAAAA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMnCgoKZsvLy++pqan/Wlpa/9LS0v+Nh4Hq
+SCYE4IdDAeSbTgDLNxsAhwAAAA8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMOxoaGobV1dXzq6ur/0ZGRv/Z2dn/
+hoaGxQkEAIY6HgCyaDMA2YVAAOuWSQDZPh4AngAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgYGFEoKCio0tLS86urq/8xMTH/
+4uLi/4+Pj84AAABIAAAAAg8HAGg6HQDKaDIA4YI+APCVRQDsRSEAuAAAABMAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFhYrNTU1z9ra2vb8/Pz/
+FxcX/+rq6v+amprZAAAASAAAAAIAAAAAAAAAABAIAIY4GwDiaTEA6X46APeVRAD/SyIA0gAAABIAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICBT8/P4asrKz3
+0dHR//39/f/z8/P/paWl5gUFBVkAAAACAAAAAAAAAAAAAAAAAAAAABIJAKUxFgD6bTMA9no4AP9uLwD/
+KxIAxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHBwcO
+QUFBmpqamv+pqan/+Pj4/7GxsfIXFxeBAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAHAMogDgD/
+WSkA/zwaAPcuEwCyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAEBAQMnJydWUFBQ85aWlvqoqKjfKioqrQEBAQUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAsFAOUXCQD6IA4AwgQCADMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAgICBBR0dHmi4uLnACAgIHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAgDAMwFAgA9AAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE
+AAAACQAAABAAAAAYAAAAIAAAACoAAAAxAAAANgAAADkAAAA4AQEBOQAAAC8AAAAnAAAAHQAAABUAAAAO
+AAAACgAAAAsAAAAPAAAAFwAAACAAAAAqAAAAMQAAADQAAAAzAAAALQAAACQAAAAbAAAAEgAAAAsAAAAA
+AAAAAAAAAAQAAAAJAAAAEAAAABgAAAAgAAAAKgAAADEAAAA2AAAAOQAAADgAAAA1AAAALwAAACcAAAAd
+AAAAFQAAAA4AAAAKAAAACwAAAA8AAAAXAAAAIAAAACoAAAAxAAAANAAAADMAAAAtAAAAJAAAABsAAAAS
+AAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0BAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA
+EKoBAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE
+AAABFgADAAAAAQD8AAABFwAEAAAAAQAAEAABHAADAAAAAQABAAABUgADAAAAAQABAAABUwADAAAABAAA
+ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
+												</object>
+											</object>
+										</object>
+									</object>
+									<object class="NSColor" key="NSColor" id="1026185587">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MCAwAA</bytes>
+									</object>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<string key="NSToolbarItemAction">runToolbarCustomizationPalette:</string>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarFlexibleSpaceItem" id="542504695">
+								<string key="NSToolbarItemIdentifier">NSToolbarFlexibleSpaceItem</string>
+								<string key="NSToolbarItemLabel"/>
+								<string key="NSToolbarItemPaletteLabel">Flexible Space</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<nil key="NSToolbarItemImage"/>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{1, 5}</string>
+								<string key="NSToolbarItemMaxSize">{20000, 32}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+								<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+							</object>
+							<object class="NSToolbarItem" id="570031734">
+								<string key="NSToolbarItemIdentifier">NSToolbarPrintItem</string>
+								<string key="NSToolbarItemLabel">Print</string>
+								<string key="NSToolbarItemPaletteLabel">Print</string>
+								<string key="NSToolbarItemToolTip">Print</string>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSImage" key="NSToolbarItemImage">
+									<int key="NSImageFlags">750780416</int>
+									<string key="NSSize">{32, 32}</string>
+									<object class="NSMutableArray" key="NSReps">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSArray">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<reference ref="8"/>
+											<object class="NSCoreUIImageRep">
+												<object class="NSMutableDictionary" key="NSCoreUIImageOptions">
+													<bool key="EncodedWithXMLCoder">YES</bool>
+													<object class="NSMutableArray" key="dict.sortedKeys">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<string>imageNameKey</string>
+														<string>widget</string>
+													</object>
+													<object class="NSMutableArray" key="dict.values">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<object class="NSMutableString">
+															<characters key="NS.bytes">image.ToolbarPrint</characters>
+														</object>
+														<string>image</string>
+													</object>
+												</object>
+												<string key="NSSize">{32, 32}</string>
+												<int key="NSBitsPerSample">0</int>
+												<bool key="NSHasAlpha">YES</bool>
+											</object>
+										</object>
+									</object>
+									<reference key="NSColor" ref="1026185587"/>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<string key="NSToolbarItemAction">printDocument:</string>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarSeparatorItem" id="257269317">
+								<string key="NSToolbarItemIdentifier">NSToolbarSeparatorItem</string>
+								<string key="NSToolbarItemLabel"/>
+								<string key="NSToolbarItemPaletteLabel">Separator</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<nil key="NSToolbarItemImage"/>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{12, 5}</string>
+								<string key="NSToolbarItemMaxSize">{12, 1000}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+								<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+							</object>
+							<object class="NSToolbarItem" id="369721526">
+								<string key="NSToolbarItemIdentifier">NSToolbarShowColorsItem</string>
+								<string key="NSToolbarItemLabel">Colors</string>
+								<string key="NSToolbarItemPaletteLabel">Colors</string>
+								<string key="NSToolbarItemToolTip">Show Color Panel</string>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSImage" key="NSToolbarItemImage">
+									<int key="NSImageFlags">683671552</int>
+									<string key="NSSize">{32, 32}</string>
+									<object class="NSMutableArray" key="NSReps">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSArray">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<reference ref="8"/>
+											<object class="NSBitmapImageRep">
+												<object class="NSData" key="NSTIFFRepresentation">
+													<bytes key="NS.bytes">TU0AKgAAEAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACCQEOEzkMUylkF5BChyLCWqEq6G+wL/1voSro
+ZYciwlFkGJAyOQxTCAkBDgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADkEPXiWEIbtJyTf/Yt9C/370Tf+d/lf/
+tv9c/77+V/+/9E7/u99C/7XJOf9+hCK7QUAOXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxQHHRZjIY42zEH+RvBI/2r/W/9//2D/
+kf9k/6L/Zv+w/mf/wf9m/9T/Zv/l/2H//v9e/+/ySv/Mwzj+Y1kXjhQRAx0AAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMUCR0adDOgP91f/1n/c/9c/2P/
+aP5i/4P+bv+Y/nL/qP53/7r+d//K/nb/2P5z/+f+bv/5/2f///9i///8W//dwD//dF4coBQPAx0AAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFmM0jj7dc/9Z/4r/
+Yf5//2z+ff9y/nX/iP59/6H+hf+w/on/wf6K/9H+if/g/ob/7/6A////eP//823//uNk///kXf/drT//
+Y0cXjgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA1BKF41zHv+
+WP+m/2H+mP9s/pb/eP6T/4L+jf+P/or/p/6V/7j+mv/L/p3/2/6a/+f+lv/8/5D///uH//7pe//+3G//
+/sxk///MXf/Mizj+QSkOXgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABCQYO
+IIRau0fwov9d/6//a/6q/3j+qv+H/qj/k/6l/5r+nv+s/qL/wv6q/9T+rP/i/qv/8v+m////n//+8ZX/
+/uGK//7Se//+w23//7hh//CdSv+ETiK7CQUBDgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAw5K1M2yZX/Wv/K/2P+vv90/rz/hP67/5L+uv+f/rr/qf60/7L+sP/K/rr/2/69/+z+u//8/7X/
+//mt//7nov/+2Jb//sqJ//65eP/+q2f//6Re/8htOf85GwxSAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAFmRRkD7ftv9d/9f/a/7O/3r+zv+M/s//mv7N/6r+zP+3/s3/wP7F/87+yP/l/s//
+9v/N////xP/+7bv//t6t//7Qn//+v5D//q+A//6fbv//lGH/321C/2MrGI8AAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAfh3fCSfTW/2D/4/9v/t//g/7f/5H+3/+k/t//sv7g/8H+3v/Q/t7/
+2P7Z/+3+4P///93///fT//7kxP/+17T//sSo//61l//+pYb//pRz//+FZv/0bU7/hzIiwgAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACihmehT/vn/Yv/z/3L/8f+F//H/lv/z/6f/8/+3//H/
+yf/x/9n/8v/o//D/+P/x///97f/+6dv//tnK//7Iuv/+tqr//qeZ//6WiP/+hXb//3Nl//5jVv+hMyno
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK62w/Vb///9j/v//dP7//4b+//+X/v//
+qP7//7f+///L/v//3P7//+////////////L0//7e4P/+zc///ru9//6qrP/+mZv//oiK//51d//+ZWf/
+/1pc/7AvMf0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAolqHoUfX+/2Hu//9x7f7/
+hO3+/5ft/v+m7f7/tu3+/8jt/v/X7P7/5Or+//Xt////6f///tvt//7K3f/+usv//qq7//6YrP/+h5r/
+/neK//9md//+VWj/oSk26AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB91h8JJ0fT/
+Yd///27b/v+A2/7/kdv+/6Hc/v+w2v7/wNv+/8rX/v/V1P7/69z+//7Z////0Pn//sLm//602P/+pcj/
+/pW3//6EqP/+cpb//2WJ//RNcP+HIjTCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+FlBkkD+x3/9a0f//asr+/3rL/v+Kyf7/mcr+/6fH/v+0x/7/u8D+/83F/v/ky/7/8sn///+////+uPD/
+/qng//6d0f/+jsP//n6y//5uov//Xpf/30Jx/2MXLI8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAALKjlTNJLJ/1jG//9huP7/crf+/4G2/v+Ptf7/nLP+/6av/v+xrP7/yLb+/9q3/v/qt/7/
++7L///+q+//+n+n//pPa//6Fy//+dLz//mWu//9cqP/IN3D/OAwbUgAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAEGCQ4eWIS7RZ3w/1us//9npf7/daX+/4Wj/v+OoP7/l5j+/6qg/v/Apv7/
+0Kj+/+Cn/v/wpP7//5r///+S8//+h+P//njU//5sxf//X7r/8Emd/4QhT7sJAQUOAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0mQV4zd8z+V6D//16T/v9pkf7/dY7+/3+G/v+Nh/7/
+pZH+/7aX/v/Jl/7/2Zb+/+aR/v/3jP///4L+//556//+bN7//mHO//9Zzv/MNo3+QA0pXQAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABUyY446bt3/VoX//156/v9ndv7/
+bm7+/4d3/v+fgv7/roP+/7+G/v/Phf7/3oL+/+18/v//dP///2v2//5h5f//Web/3T2u/2MWSI4AAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwgUHRkwdKA6WN3/
+VWz//1le//9nX/7/gWr+/5Ru/v+ncf7/tnT+/8hy/v/Wb/7/5mr+//Rj////Xf///1j+/90+wv90Gl+g
+EwMOHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+BAcWHxciaJMzPMz+RkTw/2hY//98Wv//j2H//6Bh//+uY/7/v2L//9Jg///jXf///Fr//+5H8v/MNcX+
+aBhdkxUEEh4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAACAAAABRMTU3QoI5TMSDPI/2FA3/9+SfT/mVH+/7RW//+8U/7/vUn0/7o+3/+zNcj/
+jSSUzFMSUnMAAAAFAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAQIAAAkFAAAVCAAAIg8EEkEmFl+UPCGOyE8op+dgK7D3biux/ncrsPd9KKfn
+dSGOyFkWX5QbBBJBCAAAIgUAABUCAAAJAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAABgIAABAFAAAcCAAAKQwAADkRAABIFQAAVRgAAF0YAABf
+GAAAXRUAAFURAABIDAAAOQgAACkFAAAcAgAAEAAAAAYAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAgAAAAUAAAAIAAAACwAAAA4AAAAS
+AAAAFAAAABUAAAAUAAAAEgAAAA4AAAALAAAACAAAAAUAAAACAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0BAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA
+EKoBAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE
+AAABFgADAAAAAQD8AAABFwAEAAAAAQAAEAABHAADAAAAAQABAAABUgADAAAAAQABAAABUwADAAAABAAA
+ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
+												</object>
+											</object>
+										</object>
+									</object>
+									<reference key="NSColor" ref="1026185587"/>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<string key="NSToolbarItemAction">orderFrontColorPanel:</string>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarItem" id="1063387075">
+								<string key="NSToolbarItemIdentifier">NSToolbarShowFontsItem</string>
+								<string key="NSToolbarItemLabel">Fonts</string>
+								<string key="NSToolbarItemPaletteLabel">Fonts</string>
+								<string key="NSToolbarItemToolTip">Show Font Panel</string>
+								<nil key="NSToolbarItemView"/>
+								<object class="NSImage" key="NSToolbarItemImage">
+									<int key="NSImageFlags">683671552</int>
+									<string key="NSSize">{32, 32}</string>
+									<object class="NSMutableArray" key="NSReps">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSArray">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<reference ref="8"/>
+											<object class="NSBitmapImageRep">
+												<object class="NSData" key="NSTIFFRepresentation">
+													<bytes key="NS.bytes">TU0AKgAAEAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAABQfL3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAOFiJQLkdt/wsRG0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACg+X+AuR23/FB8vcAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXIzaALkdt/y5Hbf8XIzaAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQgNICtCZvAuR23/Lkdt/yI1UsAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcLESgJTlY0C5Hbf8uR23/
+JTlY0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQgNIC5Hbf8LERtA
+Lkdt/y5Hbf8uR23/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiNVLA
+IjVSwAAAAAAoPl/gLkdt/y5Hbf8IDRQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+CxEbQC5Hbf8FCA0gAAAAACI1UsAuR23/Lkdt/wsRG0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAiNVLAHCxEoAAAAAAAAAAAHzFLsC5Hbf8uR23/FyM2gAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAACxEbQC5Hbf8FCA0gAAAAAAAAAAAXIzaALkdt/y5Hbf8cLESgAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAiNVLAIjVSwAsRG0ALERtACxEbQBwsRKAuR23/Lkdt/yI1UsAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACxEbQC5Hbf8uR23/Lkdt/y5Hbf8uR23/Lkdt/y5Hbf8uR23/
+K0Jm8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiNVLAHCxEoAAAAAAAAAAAAAAAAAAAAAAFCA0g
+Lkdt/y5Hbf8uR23/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACxEbQC5Hbf8FCA0gAAAAAAAAAAAAAAAA
+AAAAAAAAAAAuR23/Lkdt/y5Hbf8LERtAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiNVLAIjVSwAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAACg+X+AuR23/Lkdt/xEaKWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACxEbQC5Hbf8LERtA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIjVSwC5Hbf8uR23/FyM2gAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUIDSArQmbw
+Lkdt/wIEBhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAiNVLALkdt/y5Hbf8fMUuwAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBAYQ
+JTlY0C5Hbf8uR23/JTlY0AgNFDAAAAAAAAAAAAAAAAAAAAAADhYiUCg+X+AuR23/Lkdt/y5Hbf8IDRQw
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAP
+AAAAFiU5WNUlOVjWIjVRyiI1UcsiNVLMKD5f5gAAADQAAAA2AAAANhEaKYAuR23/JTlY2SI1UcsiNVHK
+JTlY1i5Hbf8FCQ0zAAAADwAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAACAAAAA8AAAAWAAAAHQAAACIAAAAnAAAALAAAAC8AAAAyAAAANAAAADYAAAA2AAAANAAAADIAAAAv
+AAAALAAAACcAAAAiAAAAHQAAABYAAAAPAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0BAAADAAAAAQAgAAABAQADAAAAAQAgAAABAgADAAAABAAA
+EKoBAwADAAAAAQABAAABBgADAAAAAQACAAABEQAEAAAAAQAAAAgBEgADAAAAAQABAAABFQADAAAAAQAE
+AAABFgADAAAAAQD8AAABFwAEAAAAAQAAEAABHAADAAAAAQABAAABUgADAAAAAQABAAABUwADAAAABAAA
+ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes>
+												</object>
+											</object>
+										</object>
+									</object>
+									<reference key="NSColor" ref="1026185587"/>
+								</object>
+								<nil key="NSToolbarItemTarget"/>
+								<string key="NSToolbarItemAction">orderFrontFontPanel:</string>
+								<string key="NSToolbarItemMinSize">{0, 0}</string>
+								<string key="NSToolbarItemMaxSize">{0, 0}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+							</object>
+							<object class="NSToolbarSpaceItem" id="801459404">
+								<string key="NSToolbarItemIdentifier">NSToolbarSpaceItem</string>
+								<string key="NSToolbarItemLabel"/>
+								<string key="NSToolbarItemPaletteLabel">Space</string>
+								<nil key="NSToolbarItemToolTip"/>
+								<nil key="NSToolbarItemView"/>
+								<nil key="NSToolbarItemImage"/>
+								<nil key="NSToolbarItemTarget"/>
+								<nil key="NSToolbarItemAction"/>
+								<string key="NSToolbarItemMinSize">{32, 5}</string>
+								<string key="NSToolbarItemMaxSize">{32, 32}</string>
+								<bool key="NSToolbarItemEnabled">YES</bool>
+								<bool key="NSToolbarItemAutovalidates">YES</bool>
+								<int key="NSToolbarItemTag">-1</int>
+								<bool key="NSToolbarIsUserRemovable">YES</bool>
+								<int key="NSToolbarItemVisibilityPriority">0</int>
+								<object class="NSMenuItem" key="NSToolbarItemMenuFormRepresentation">
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+								</object>
+							</object>
+						</object>
+					</object>
+					<object class="NSArray" key="NSToolbarIBAllowedItems">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<reference ref="369721526"/>
+						<reference ref="1063387075"/>
+						<reference ref="257269317"/>
+						<reference ref="570031734"/>
+						<reference ref="801459404"/>
+						<reference ref="542504695"/>
+						<reference ref="108438574"/>
+						<reference ref="233912118"/>
+						<reference ref="517137618"/>
+						<reference ref="665899689"/>
+						<reference ref="687973582"/>
+						<reference ref="765865720"/>
+					</object>
+					<object class="NSMutableArray" key="NSToolbarIBDefaultItems">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<reference ref="257269317"/>
+						<reference ref="233912118"/>
+						<reference ref="517137618"/>
+						<reference ref="665899689"/>
+						<reference ref="687973582"/>
+						<reference ref="765865720"/>
+						<reference ref="801459404"/>
+						<reference ref="542504695"/>
+					</object>
+					<object class="NSMutableArray" key="NSToolbarIBSelectableItems">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+					</object>
+				</object>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<object class="NSView" key="NSWindowView" id="439893737">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">274</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="BWSplitView" id="1043747929">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">274</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="BWSplitView" id="835260495">
+									<reference key="NSNextResponder" ref="1043747929"/>
+									<int key="NSvFlags">274</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="BWCustomView" id="99132219">
+											<reference key="NSNextResponder" ref="835260495"/>
+											<int key="NSvFlags">256</int>
+											<object class="NSMutableArray" key="NSSubviews">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="NSScrollView" id="134154892">
+													<reference key="NSNextResponder" ref="99132219"/>
+													<int key="NSvFlags">274</int>
+													<object class="NSMutableArray" key="NSSubviews">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<object class="NSClipView" id="34191992">
+															<reference key="NSNextResponder" ref="134154892"/>
+															<int key="NSvFlags">2304</int>
+															<object class="NSMutableArray" key="NSSubviews">
+																<bool key="EncodedWithXMLCoder">YES</bool>
+																<object class="NSOutlineView" id="424642996">
+																	<reference key="NSNextResponder" ref="34191992"/>
+																	<int key="NSvFlags">256</int>
+																	<string key="NSFrameSize">{212, 639}</string>
+																	<reference key="NSSuperview" ref="34191992"/>
+																	<bool key="NSEnabled">YES</bool>
+																	<object class="_NSCornerView" key="NSCornerView">
+																		<nil key="NSNextResponder"/>
+																		<int key="NSvFlags">-2147483392</int>
+																		<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
+																	</object>
+																	<object class="NSMutableArray" key="NSTableColumns">
+																		<bool key="EncodedWithXMLCoder">YES</bool>
+																		<object class="NSTableColumn" id="868975237">
+																			<string key="NSIdentifier">source</string>
+																			<double key="NSWidth">1.500000e+02</double>
+																			<double key="NSMinWidth">1.600000e+01</double>
+																			<double key="NSMaxWidth">1.000000e+03</double>
+																			<object class="NSTableHeaderCell" key="NSHeaderCell">
+																				<int key="NSCellFlags">75628032</int>
+																				<int key="NSCellFlags2">0</int>
+																				<string key="NSContents"/>
+																				<object class="NSFont" key="NSSupport" id="26">
+																					<string key="NSName">LucidaGrande</string>
+																					<double key="NSSize">1.100000e+01</double>
+																					<int key="NSfFlags">3100</int>
+																				</object>
+																				<object class="NSColor" key="NSBackgroundColor" id="32054840">
+																					<int key="NSColorSpace">3</int>
+																					<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+																				</object>
+																				<object class="NSColor" key="NSTextColor" id="329323885">
+																					<int key="NSColorSpace">6</int>
+																					<string key="NSCatalogName">System</string>
+																					<string key="NSColorName">headerTextColor</string>
+																					<object class="NSColor" key="NSColor" id="548335889">
+																						<int key="NSColorSpace">3</int>
+																						<bytes key="NSWhite">MAA</bytes>
+																					</object>
+																				</object>
+																			</object>
+																			<object class="NSTextFieldCell" key="NSDataCell" id="80458916">
+																				<int key="NSCellFlags">337772096</int>
+																				<int key="NSCellFlags2">2048</int>
+																				<string key="NSContents">Text Cell</string>
+																				<object class="NSFont" key="NSSupport" id="307917541">
+																					<string key="NSName">LucidaGrande</string>
+																					<double key="NSSize">1.300000e+01</double>
+																					<int key="NSfFlags">1044</int>
+																				</object>
+																				<reference key="NSControlView" ref="424642996"/>
+																				<object class="NSColor" key="NSBackgroundColor" id="216762640">
+																					<int key="NSColorSpace">6</int>
+																					<string key="NSCatalogName">System</string>
+																					<string key="NSColorName">controlBackgroundColor</string>
+																					<object class="NSColor" key="NSColor" id="68452420">
+																						<int key="NSColorSpace">3</int>
+																						<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+																					</object>
+																				</object>
+																				<object class="NSColor" key="NSTextColor" id="893644134">
+																					<int key="NSColorSpace">6</int>
+																					<string key="NSCatalogName">System</string>
+																					<string key="NSColorName">controlTextColor</string>
+																					<reference key="NSColor" ref="548335889"/>
+																				</object>
+																			</object>
+																			<int key="NSResizingMask">3</int>
+																			<bool key="NSIsResizeable">YES</bool>
+																			<reference key="NSTableView" ref="424642996"/>
+																		</object>
+																		<object class="NSTableColumn" id="528858694">
+																			<string key="NSIdentifier">status</string>
+																			<double key="NSWidth">5.600000e+01</double>
+																			<double key="NSMinWidth">4.000000e+01</double>
+																			<double key="NSMaxWidth">1.000000e+03</double>
+																			<object class="NSTableHeaderCell" key="NSHeaderCell">
+																				<int key="NSCellFlags">75628032</int>
+																				<int key="NSCellFlags2">0</int>
+																				<string key="NSContents"/>
+																				<reference key="NSSupport" ref="26"/>
+																				<reference key="NSBackgroundColor" ref="32054840"/>
+																				<reference key="NSTextColor" ref="329323885"/>
+																			</object>
+																			<object class="NSTextFieldCell" key="NSDataCell" id="189987630">
+																				<int key="NSCellFlags">337772096</int>
+																				<int key="NSCellFlags2">2048</int>
+																				<string key="NSContents">Text Cell</string>
+																				<reference key="NSSupport" ref="307917541"/>
+																				<reference key="NSControlView" ref="424642996"/>
+																				<reference key="NSBackgroundColor" ref="216762640"/>
+																				<reference key="NSTextColor" ref="893644134"/>
+																			</object>
+																			<int key="NSResizingMask">2</int>
+																			<bool key="NSIsResizeable">YES</bool>
+																			<reference key="NSTableView" ref="424642996"/>
+																		</object>
+																	</object>
+																	<double key="NSIntercellSpacingWidth">3.000000e+00</double>
+																	<object class="NSColor" key="NSBackgroundColor">
+																		<int key="NSColorSpace">6</int>
+																		<string key="NSCatalogName">System</string>
+																		<string key="NSColorName">_sourceListBackgroundColor</string>
+																		<object class="NSColor" key="NSColor">
+																			<int key="NSColorSpace">1</int>
+																			<bytes key="NSRGB">MC44MzkyMTU3IDAuODY2NjY2NjcgMC44OTgwMzkyMgA</bytes>
+																		</object>
+																	</object>
+																	<object class="NSColor" key="NSGridColor" id="813108314">
+																		<int key="NSColorSpace">6</int>
+																		<string key="NSCatalogName">System</string>
+																		<string key="NSColorName">gridColor</string>
+																		<object class="NSColor" key="NSColor">
+																			<int key="NSColorSpace">3</int>
+																			<bytes key="NSWhite">MC41AA</bytes>
+																		</object>
+																	</object>
+																	<double key="NSRowHeight">2.000000e+01</double>
+																	<int key="NSTvFlags">-767557632</int>
+																	<int key="NSColumnAutoresizingStyle">4</int>
+																	<int key="NSDraggingSourceMaskForLocal">15</int>
+																	<int key="NSDraggingSourceMaskForNonLocal">0</int>
+																	<bool key="NSAllowsTypeSelect">YES</bool>
+																	<int key="NSTableViewSelectionHighlightStyle">1</int>
+																	<float key="NSOutlineViewIndentationPerLevelKey">1.400000e+01</float>
+																</object>
+															</object>
+															<string key="NSFrame">{{1, 1}, {212, 639}}</string>
+															<reference key="NSSuperview" ref="134154892"/>
+															<reference key="NSNextKeyView" ref="424642996"/>
+															<reference key="NSDocView" ref="424642996"/>
+															<object class="NSColor" key="NSBGColor">
+																<int key="NSColorSpace">6</int>
+																<string key="NSCatalogName">System</string>
+																<string key="NSColorName">selectedControlColor</string>
+																<object class="NSColor" key="NSColor" id="630314492">
+																	<int key="NSColorSpace">3</int>
+																	<bytes key="NSWhite">MQA</bytes>
+																</object>
+															</object>
+															<int key="NScvFlags">2</int>
+														</object>
+														<object class="NSScroller" id="543575469">
+															<reference key="NSNextResponder" ref="134154892"/>
+															<int key="NSvFlags">-2147483392</int>
+															<string key="NSFrame">{{198, 1}, {15, 624}}</string>
+															<reference key="NSSuperview" ref="134154892"/>
+															<reference key="NSTarget" ref="134154892"/>
+															<string key="NSAction">_doScroller:</string>
+															<double key="NSPercent">9.984375e-01</double>
+														</object>
+														<object class="NSScroller" id="449545756">
+															<reference key="NSNextResponder" ref="134154892"/>
+															<int key="NSvFlags">-2147483392</int>
+															<string key="NSFrame">{{1, 625}, {197, 15}}</string>
+															<reference key="NSSuperview" ref="134154892"/>
+															<int key="NSsFlags">1</int>
+															<reference key="NSTarget" ref="134154892"/>
+															<string key="NSAction">_doScroller:</string>
+															<double key="NSPercent">9.953052e-01</double>
+														</object>
+													</object>
+													<string key="NSFrame">{{0, 1}, {214, 641}}</string>
+													<reference key="NSSuperview" ref="99132219"/>
+													<reference key="NSNextKeyView" ref="34191992"/>
+													<int key="NSsFlags">562</int>
+													<reference key="NSVScroller" ref="543575469"/>
+													<reference key="NSHScroller" ref="449545756"/>
+													<reference key="NSContentView" ref="34191992"/>
+													<bytes key="NSScrollAmts">QSAAAEEgAABBoAAAQaAAAA</bytes>
+												</object>
+											</object>
+											<string key="NSFrameSize">{214, 642}</string>
+											<reference key="NSSuperview" ref="835260495"/>
+											<string key="NSClassName">NSView</string>
+										</object>
+										<object class="BWCustomView" id="1070003598">
+											<reference key="NSNextResponder" ref="835260495"/>
+											<int key="NSvFlags">258</int>
+											<object class="NSMutableArray" key="NSSubviews">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="NSTabView" id="188524998">
+													<reference key="NSNextResponder" ref="1070003598"/>
+													<int key="NSvFlags">18</int>
+													<string key="NSFrame">{{-8, -10}, {808, 658}}</string>
+													<reference key="NSSuperview" ref="1070003598"/>
+													<object class="NSMutableArray" key="NSTabViewItems">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<object class="NSTabViewItem" id="675864263">
+															<string key="NSIdentifier">downloads</string>
+															<object class="NSView" key="NSView" id="257719914">
+																<nil key="NSNextResponder"/>
+																<int key="NSvFlags">274</int>
+																<object class="NSMutableArray" key="NSSubviews">
+																	<bool key="EncodedWithXMLCoder">YES</bool>
+																	<object class="NSSplitView" id="902110243">
+																		<reference key="NSNextResponder" ref="257719914"/>
+																		<int key="NSvFlags">274</int>
+																		<object class="NSMutableArray" key="NSSubviews">
+																			<bool key="EncodedWithXMLCoder">YES</bool>
+																			<object class="NSCustomView" id="107841350">
+																				<reference key="NSNextResponder" ref="902110243"/>
+																				<int key="NSvFlags">274</int>
+																				<object class="NSMutableArray" key="NSSubviews">
+																					<bool key="EncodedWithXMLCoder">YES</bool>
+																					<object class="NSScrollView" id="929288326">
+																						<reference key="NSNextResponder" ref="107841350"/>
+																						<int key="NSvFlags">274</int>
+																						<object class="NSMutableArray" key="NSSubviews">
+																							<bool key="EncodedWithXMLCoder">YES</bool>
+																							<object class="NSClipView" id="773872676">
+																								<reference key="NSNextResponder" ref="929288326"/>
+																								<int key="NSvFlags">2304</int>
+																								<object class="NSMutableArray" key="NSSubviews">
+																									<bool key="EncodedWithXMLCoder">YES</bool>
+																									<object class="NSTableView" id="394756216">
+																										<reference key="NSNextResponder" ref="773872676"/>
+																										<int key="NSvFlags">256</int>
+																										<string key="NSFrameSize">{794, 605}</string>
+																										<reference key="NSSuperview" ref="773872676"/>
+																										<bool key="NSEnabled">YES</bool>
+																										<object class="NSTableHeaderView" key="NSHeaderView" id="246284584">
+																											<reference key="NSNextResponder" ref="421730781"/>
+																											<int key="NSvFlags">256</int>
+																											<string key="NSFrameSize">{794, 17}</string>
+																											<reference key="NSSuperview" ref="421730781"/>
+																											<reference key="NSTableView" ref="394756216"/>
+																										</object>
+																										<object class="_NSCornerView" key="NSCornerView" id="35589854">
+																											<reference key="NSNextResponder" ref="929288326"/>
+																											<int key="NSvFlags">-2147483392</int>
+																											<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
+																											<reference key="NSSuperview" ref="929288326"/>
+																										</object>
+																										<object class="NSMutableArray" key="NSTableColumns">
+																											<bool key="EncodedWithXMLCoder">YES</bool>
+																											<object class="NSTableColumn" id="165659778">
+																												<string key="NSIdentifier">filename</string>
+																												<double key="NSWidth">2.000000e+02</double>
+																												<double key="NSMinWidth">4.000000e+01</double>
+																												<double key="NSMaxWidth">1.000000e+03</double>
+																												<object class="NSTableHeaderCell" key="NSHeaderCell">
+																													<int key="NSCellFlags">75628032</int>
+																													<int key="NSCellFlags2">0</int>
+																													<string key="NSContents">Filename</string>
+																													<reference key="NSSupport" ref="26"/>
+																													<object class="NSColor" key="NSBackgroundColor" id="386092044">
+																														<int key="NSColorSpace">3</int>
+																														<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+																													</object>
+																													<reference key="NSTextColor" ref="329323885"/>
+																												</object>
+																												<object class="NSTextFieldCell" key="NSDataCell" id="564249708">
+																													<int key="NSCellFlags">337772096</int>
+																													<int key="NSCellFlags2">2048</int>
+																													<string key="NSContents">Text Cell</string>
+																													<reference key="NSSupport" ref="307917541"/>
+																													<reference key="NSControlView" ref="394756216"/>
+																													<reference key="NSBackgroundColor" ref="216762640"/>
+																													<reference key="NSTextColor" ref="893644134"/>
+																												</object>
+																												<int key="NSResizingMask">3</int>
+																												<bool key="NSIsResizeable">YES</bool>
+																												<reference key="NSTableView" ref="394756216"/>
+																											</object>
+																											<object class="NSTableColumn" id="533922437">
+																												<string key="NSIdentifier">progress</string>
+																												<double key="NSWidth">1.000000e+02</double>
+																												<double key="NSMinWidth">4.000000e+01</double>
+																												<double key="NSMaxWidth">1.000000e+03</double>
+																												<object class="NSTableHeaderCell" key="NSHeaderCell">
+																													<int key="NSCellFlags">75628032</int>
+																													<int key="NSCellFlags2">0</int>
+																													<string key="NSContents">Progress</string>
+																													<reference key="NSSupport" ref="26"/>
+																													<reference key="NSBackgroundColor" ref="386092044"/>
+																													<reference key="NSTextColor" ref="329323885"/>
+																												</object>
+																												<object class="NSTextFieldCell" key="NSDataCell" id="983524537">
+																													<int key="NSCellFlags">337772096</int>
+																													<int key="NSCellFlags2">2048</int>
+																													<string key="NSContents">Text Cell</string>
+																													<reference key="NSSupport" ref="307917541"/>
+																													<reference key="NSControlView" ref="394756216"/>
+																													<reference key="NSBackgroundColor" ref="216762640"/>
+																													<reference key="NSTextColor" ref="893644134"/>
+																												</object>
+																												<int key="NSResizingMask">3</int>
+																												<bool key="NSIsResizeable">YES</bool>
+																												<bool key="NSIsEditable">YES</bool>
+																												<reference key="NSTableView" ref="394756216"/>
+																											</object>
+																											<object class="NSTableColumn" id="336953804">
+																												<string key="NSIdentifier">size</string>
+																												<double key="NSWidth">6.400000e+01</double>
+																												<double key="NSMinWidth">1.000000e+01</double>
+																												<double key="NSMaxWidth">3.402823e+38</double>
+																												<object class="NSTableHeaderCell" key="NSHeaderCell">
+																													<int key="NSCellFlags">75628032</int>
+																													<int key="NSCellFlags2">0</int>
+																													<string key="NSContents">Size</string>
+																													<reference key="NSSupport" ref="26"/>
+																													<object class="NSColor" key="NSBackgroundColor" id="60076722">
+																														<int key="NSColorSpace">6</int>
+																														<string key="NSCatalogName">System</string>
+																														<string key="NSColorName">headerColor</string>
+																														<reference key="NSColor" ref="630314492"/>
+																													</object>
+																													<reference key="NSTextColor" ref="329323885"/>
+																												</object>
+																												<object class="NSTextFieldCell" key="NSDataCell" id="253101532">
+																													<int key="NSCellFlags">337772096</int>
+																													<int key="NSCellFlags2">2048</int>
+																													<string key="NSContents">Text Cell</string>
+																													<reference key="NSSupport" ref="307917541"/>
+																													<reference key="NSControlView" ref="394756216"/>
+																													<reference key="NSBackgroundColor" ref="216762640"/>
+																													<reference key="NSTextColor" ref="893644134"/>
+																												</object>
+																												<int key="NSResizingMask">3</int>
+																												<bool key="NSIsResizeable">YES</bool>
+																												<bool key="NSIsEditable">YES</bool>
+																												<reference key="NSTableView" ref="394756216"/>
+																											</object>
+																											<object class="NSTableColumn" id="196165787">
+																												<string key="NSIdentifier">xferred</string>
+																												<double key="NSWidth">7.000000e+01</double>
+																												<double key="NSMinWidth">1.000000e+01</double>
+																												<double key="NSMaxWidth">3.402823e+38</double>
+																												<object class="NSTableHeaderCell" key="NSHeaderCell">
+																													<int key="NSCellFlags">75628032</int>
+																													<int key="NSCellFlags2">0</int>
+																													<string key="NSContents">Transferred</string>
+																													<reference key="NSSupport" ref="26"/>
+																													<reference key="NSBackgroundColor" ref="60076722"/>
+																													<reference key="NSTextColor" ref="329323885"/>
+																												</object>
+																												<object class="NSTextFieldCell" key="NSDataCell" id="681082546">
+																													<int key="NSCellFlags">337772096</int>
+																													<int key="NSCellFlags2">2048</int>
+																													<string key="NSContents">Text Cell</string>
+																													<reference key="NSSupport" ref="307917541"/>
+																													<reference key="NSControlView" ref="394756216"/>
+																													<reference key="NSBackgroundColor" ref="216762640"/>
+																													<reference key="NSTextColor" ref="893644134"/>
+																												</object>
+																												<int key="NSResizingMask">3</int>
+																												<bool key="NSIsResizeable">YES</bool>
+																												<bool key="NSIsEditable">YES</bool>
+																												<reference key="NSTableView" ref="394756216"/>
+																											</object>
+																											<object class="NSTableColumn" id="312824917">
+																												<string key="NSIdentifier">completed</string>
+																												<double key="NSWidth">6.400000e+01</double>
+																												<double key="NSMinWidth">1.000000e+01</double>
+																												<double key="NSMaxWidth">3.402823e+38</double>
+																												<object class="NSTableHeaderCell" key="NSHeaderCell">
+																													<int key="NSCellFlags">75628032</int>
+																													<int key="NSCellFlags2">0</int>
+																													<string key="NSContents">%%</string>
+																													<reference key="NSSupport" ref="26"/>
+																													<reference key="NSBackgroundColor" ref="60076722"/>
+																													<reference key="NSTextColor" ref="329323885"/>
+																												</object>
+																												<object class="NSTextFieldCell" key="NSDataCell" id="334425709">
+																													<int key="NSCellFlags">337772096</int>
+																													<int key="NSCellFlags2">2048</int>
+																													<string key="NSContents">Text Cell</string>
+																													<reference key="NSSupport" ref="307917541"/>
+																													<reference key="NSControlView" ref="394756216"/>
+																													<reference key="NSBackgroundColor" ref="216762640"/>
+																													<reference key="NSTextColor" ref="893644134"/>
+																												</object>
+																												<int key="NSResizingMask">3</int>
+																												<bool key="NSIsResizeable">YES</bool>
+																												<bool key="NSIsEditable">YES</bool>
+																												<reference key="NSTableView" ref="394756216"/>
+																											</object>
+																											<object class="NSTableColumn" id="878579444">
+																												<string key="NSIdentifier">speed</string>
+																												<double key="NSWidth">6.400000e+01</double>
+																												<double key="NSMinWidth">1.000000e+01</double>
+																												<double key="NSMaxWidth">3.402823e+38</double>
+																												<object class="NSTableHeaderCell" key="NSHeaderCell">
+																													<int key="NSCellFlags">75628032</int>
+																													<int key="NSCellFlags2">0</int>
+																													<string key="NSContents">Speed</string>
+																													<reference key="NSSupport" ref="26"/>
+																													<reference key="NSBackgroundColor" ref="60076722"/>
+																													<reference key="NSTextColor" ref="329323885"/>
+																												</object>
+																												<object class="NSTextFieldCell" key="NSDataCell" id="285155372">
+																													<int key="NSCellFlags">337772096</int>
+																													<int key="NSCellFlags2">2048</int>
+																													<string key="NSContents">Text Cell</string>
+																													<reference key="NSSupport" ref="307917541"/>
+																													<reference key="NSControlView" ref="394756216"/>
+																													<reference key="NSBackgroundColor" ref="216762640"/>
+																													<reference key="NSTextColor" ref="893644134"/>
+																												</object>
+																												<int key="NSResizingMask">3</int>
+																												<bool key="NSIsResizeable">YES</bool>
+																												<bool key="NSIsEditable">YES</bool>
+																												<reference key="NSTableView" ref="394756216"/>
+																											</object>
+																											<object class="NSTableColumn" id="88285858">
+																												<string key="NSIdentifier">prio</string>
+																												<double key="NSWidth">6.400000e+01</double>
+																												<double key="NSMinWidth">1.000000e+01</double>
+																												<double key="NSMaxWidth">3.402823e+38</double>
+																												<object class="NSTableHeaderCell" key="NSHeaderCell">
+																													<int key="NSCellFlags">75628032</int>
+																													<int key="NSCellFlags2">0</int>
+																													<string key="NSContents">Priority</string>
+																													<reference key="NSSupport" ref="26"/>
+																													<reference key="NSBackgroundColor" ref="60076722"/>
+																													<reference key="NSTextColor" ref="329323885"/>
+																												</object>
+																												<object class="NSTextFieldCell" key="NSDataCell" id="282927201">
+																													<int key="NSCellFlags">337772096</int>
+																													<int key="NSCellFlags2">2048</int>
+																													<string key="NSContents">Text Cell</string>
+																													<reference key="NSSupport" ref="307917541"/>
+																													<reference key="NSControlView" ref="394756216"/>
+																													<reference key="NSBackgroundColor" ref="216762640"/>
+																													<reference key="NSTextColor" ref="893644134"/>
+																												</object>
+																												<int key="NSResizingMask">3</int>
+																												<bool key="NSIsResizeable">YES</bool>
+																												<bool key="NSIsEditable">YES</bool>
+																												<reference key="NSTableView" ref="394756216"/>
+																											</object>
+																											<object class="NSTableColumn" id="657554659">
+																												<string key="NSIdentifier">timerem</string>
+																												<double key="NSWidth">6.400000e+01</double>
+																												<double key="NSMinWidth">1.000000e+01</double>
+																												<double key="NSMaxWidth">3.402823e+38</double>
+																												<object class="NSTableHeaderCell" key="NSHeaderCell">
+																													<int key="NSCellFlags">75628032</int>
+																													<int key="NSCellFlags2">0</int>
+																													<string key="NSContents">Rem. time</string>
+																													<reference key="NSSupport" ref="26"/>
+																													<reference key="NSBackgroundColor" ref="60076722"/>
+																													<reference key="NSTextColor" ref="329323885"/>
+																												</object>
+																												<object class="NSTextFieldCell" key="NSDataCell" id="1013428736">
+																													<int key="NSCellFlags">337772096</int>
+																													<int key="NSCellFlags2">2048</int>
+																													<string key="NSContents">Text Cell</string>
+																													<reference key="NSSupport" ref="307917541"/>
+																													<reference key="NSControlView" ref="394756216"/>
+																													<reference key="NSBackgroundColor" ref="216762640"/>
+																													<reference key="NSTextColor" ref="893644134"/>
+																												</object>
+																												<int key="NSResizingMask">3</int>
+																												<bool key="NSIsResizeable">YES</bool>
+																												<bool key="NSIsEditable">YES</bool>
+																												<reference key="NSTableView" ref="394756216"/>
+																											</object>
+																											<object class="NSTableColumn" id="849370645">
+																												<string key="NSIdentifier">lastcomp</string>
+																												<double key="NSWidth">6.400000e+01</double>
+																												<double key="NSMinWidth">1.000000e+01</double>
+																												<double key="NSMaxWidth">3.402823e+38</double>
+																												<object class="NSTableHeaderCell" key="NSHeaderCell">
+																													<int key="NSCellFlags">75628032</int>
+																													<int key="NSCellFlags2">0</int>
+																													<string key="NSContents">Last seen complete</string>
+																													<reference key="NSSupport" ref="26"/>
+																													<reference key="NSBackgroundColor" ref="60076722"/>
+																													<reference key="NSTextColor" ref="329323885"/>
+																												</object>
+																												<object class="NSTextFieldCell" key="NSDataCell" id="828729841">
+																													<int key="NSCellFlags">337772096</int>
+																													<int key="NSCellFlags2">2048</int>
+																													<string key="NSContents">Text Cell</string>
+																													<reference key="NSSupport" ref="307917541"/>
+																													<reference key="NSControlView" ref="394756216"/>
+																													<reference key="NSBackgroundColor" ref="216762640"/>
+																													<reference key="NSTextColor" ref="893644134"/>
+																												</object>
+																												<int key="NSResizingMask">3</int>
+																												<bool key="NSIsResizeable">YES</bool>
+																												<bool key="NSIsEditable">YES</bool>
+																												<reference key="NSTableView" ref="394756216"/>
+																											</object>
+																											<object class="NSTableColumn" id="218910539">
+																												<string key="NSIdentifier">lastrx</string>
+																												<double key="NSWidth">1.000000e+01</double>
+																												<double key="NSMinWidth">1.000000e+01</double>
+																												<double key="NSMaxWidth">3.402823e+38</double>
+																												<object class="NSTableHeaderCell" key="NSHeaderCell">
+																													<int key="NSCellFlags">75628032</int>
+																													<int key="NSCellFlags2">0</int>
+																													<string key="NSContents"/>
+																													<reference key="NSSupport" ref="26"/>
+																													<reference key="NSBackgroundColor" ref="60076722"/>
+																													<reference key="NSTextColor" ref="329323885"/>
+																												</object>
+																												<object class="NSTextFieldCell" key="NSDataCell" id="732471957">
+																													<int key="NSCellFlags">337772096</int>
+																													<int key="NSCellFlags2">2048</int>
+																													<string key="NSContents">Text Cell</string>
+																													<reference key="NSSupport" ref="307917541"/>
+																													<reference key="NSControlView" ref="394756216"/>
+																													<reference key="NSBackgroundColor" ref="216762640"/>
+																													<reference key="NSTextColor" ref="893644134"/>
+																												</object>
+																												<int key="NSResizingMask">3</int>
+																												<bool key="NSIsResizeable">YES</bool>
+																												<bool key="NSIsEditable">YES</bool>
+																												<reference key="NSTableView" ref="394756216"/>
+																											</object>
+																										</object>
+																										<double key="NSIntercellSpacingWidth">3.000000e+00</double>
+																										<double key="NSIntercellSpacingHeight">2.000000e+00</double>
+																										<reference key="NSBackgroundColor" ref="630314492"/>
+																										<reference key="NSGridColor" ref="813108314"/>
+																										<double key="NSRowHeight">1.700000e+01</double>
+																										<int key="NSTvFlags">-698351616</int>
+																										<int key="NSGridStyleMask">1</int>
+																										<int key="NSColumnAutoresizingStyle">4</int>
+																										<int key="NSDraggingSourceMaskForLocal">15</int>
+																										<int key="NSDraggingSourceMaskForNonLocal">0</int>
+																										<bool key="NSAllowsTypeSelect">YES</bool>
+																									</object>
+																								</object>
+																								<string key="NSFrame">{{1, 17}, {785, 605}}</string>
+																								<reference key="NSSuperview" ref="929288326"/>
+																								<reference key="NSNextKeyView" ref="394756216"/>
+																								<reference key="NSDocView" ref="394756216"/>
+																								<reference key="NSBGColor" ref="216762640"/>
+																								<int key="NScvFlags">4</int>
+																							</object>
+																							<object class="NSScroller" id="605426421">
+																								<reference key="NSNextResponder" ref="929288326"/>
+																								<int key="NSvFlags">-2147483392</int>
+																								<string key="NSFrame">{{771, 17}, {15, 605}}</string>
+																								<reference key="NSSuperview" ref="929288326"/>
+																								<reference key="NSTarget" ref="929288326"/>
+																								<string key="NSAction">_doScroller:</string>
+																								<double key="NSPercent">9.758065e-01</double>
+																							</object>
+																							<object class="NSScroller" id="621608261">
+																								<reference key="NSNextResponder" ref="929288326"/>
+																								<int key="NSvFlags">256</int>
+																								<string key="NSFrame">{{1, 622}, {785, 15}}</string>
+																								<reference key="NSSuperview" ref="929288326"/>
+																								<bool key="NSEnabled">YES</bool>
+																								<int key="NSsFlags">1</int>
+																								<reference key="NSTarget" ref="929288326"/>
+																								<string key="NSAction">_doScroller:</string>
+																								<double key="NSPercent">9.886650e-01</double>
+																							</object>
+																							<object class="NSClipView" id="421730781">
+																								<reference key="NSNextResponder" ref="929288326"/>
+																								<int key="NSvFlags">2304</int>
+																								<object class="NSMutableArray" key="NSSubviews">
+																									<bool key="EncodedWithXMLCoder">YES</bool>
+																									<reference ref="246284584"/>
+																								</object>
+																								<string key="NSFrame">{{1, 0}, {785, 17}}</string>
+																								<reference key="NSSuperview" ref="929288326"/>
+																								<reference key="NSNextKeyView" ref="246284584"/>
+																								<reference key="NSDocView" ref="246284584"/>
+																								<reference key="NSBGColor" ref="216762640"/>
+																								<int key="NScvFlags">4</int>
+																							</object>
+																							<reference ref="35589854"/>
+																						</object>
+																						<string key="NSFrameSize">{787, 638}</string>
+																						<reference key="NSSuperview" ref="107841350"/>
+																						<reference key="NSNextKeyView" ref="773872676"/>
+																						<int key="NSsFlags">690</int>
+																						<reference key="NSVScroller" ref="605426421"/>
+																						<reference key="NSHScroller" ref="621608261"/>
+																						<reference key="NSContentView" ref="773872676"/>
+																						<reference key="NSHeaderClipView" ref="421730781"/>
+																						<reference key="NSCornerView" ref="35589854"/>
+																						<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+																					</object>
+																				</object>
+																				<string key="NSFrameSize">{796, 658}</string>
+																				<reference key="NSSuperview" ref="902110243"/>
+																				<string key="NSClassName">NSView</string>
+																			</object>
+																		</object>
+																		<string key="NSFrame">{{2, -3}, {796, 658}}</string>
+																		<reference key="NSSuperview" ref="257719914"/>
+																		<int key="NSDividerStyle">2</int>
+																	</object>
+																</object>
+																<string key="NSFrame">{{10, 7}, {788, 638}}</string>
+															</object>
+															<string key="NSLabel">Downloads</string>
+															<object class="NSColor" key="NSColor" id="16080844">
+																<int key="NSColorSpace">6</int>
+																<string key="NSCatalogName">System</string>
+																<string key="NSColorName">controlColor</string>
+																<reference key="NSColor" ref="68452420"/>
+															</object>
+															<reference key="NSTabView" ref="188524998"/>
+														</object>
+														<object class="NSTabViewItem" id="300298249">
+															<string key="NSIdentifier">search</string>
+															<object class="NSView" key="NSView" id="511747603">
+																<nil key="NSNextResponder"/>
+																<int key="NSvFlags">256</int>
+																<string key="NSFrame">{{10, 7}, {788, 638}}</string>
+															</object>
+															<string key="NSLabel">Search</string>
+															<reference key="NSColor" ref="16080844"/>
+															<reference key="NSTabView" ref="188524998"/>
+														</object>
+														<object class="NSTabViewItem" id="750725839">
+															<string key="NSIdentifier">network</string>
+															<object class="NSView" key="NSView" id="966239350">
+																<nil key="NSNextResponder"/>
+																<int key="NSvFlags">256</int>
+																<string key="NSFrame">{{10, 7}, {788, 638}}</string>
+															</object>
+															<string key="NSLabel">Network</string>
+															<reference key="NSColor" ref="16080844"/>
+															<reference key="NSTabView" ref="188524998"/>
+														</object>
+														<object class="NSTabViewItem" id="993858922">
+															<string key="NSIdentifier">shared</string>
+															<object class="NSView" key="NSView" id="828057281">
+																<reference key="NSNextResponder" ref="188524998"/>
+																<int key="NSvFlags">256</int>
+																<object class="NSMutableArray" key="NSSubviews">
+																	<bool key="EncodedWithXMLCoder">YES</bool>
+																	<object class="NSScrollView" id="390445153">
+																		<reference key="NSNextResponder" ref="828057281"/>
+																		<int key="NSvFlags">274</int>
+																		<object class="NSMutableArray" key="NSSubviews">
+																			<bool key="EncodedWithXMLCoder">YES</bool>
+																			<object class="NSClipView" id="272456659">
+																				<reference key="NSNextResponder" ref="390445153"/>
+																				<int key="NSvFlags">2304</int>
+																				<object class="NSMutableArray" key="NSSubviews">
+																					<bool key="EncodedWithXMLCoder">YES</bool>
+																					<object class="NSTableView" id="717786622">
+																						<reference key="NSNextResponder" ref="272456659"/>
+																						<int key="NSvFlags">274</int>
+																						<string key="NSFrameSize">{792, 623}</string>
+																						<reference key="NSSuperview" ref="272456659"/>
+																						<bool key="NSEnabled">YES</bool>
+																						<object class="NSTableHeaderView" key="NSHeaderView" id="22876713">
+																							<reference key="NSNextResponder" ref="210560869"/>
+																							<int key="NSvFlags">256</int>
+																							<string key="NSFrameSize">{792, 17}</string>
+																							<reference key="NSSuperview" ref="210560869"/>
+																							<reference key="NSTableView" ref="717786622"/>
+																						</object>
+																						<object class="_NSCornerView" key="NSCornerView" id="875671470">
+																							<reference key="NSNextResponder" ref="390445153"/>
+																							<int key="NSvFlags">-2147483392</int>
+																							<string key="NSFrame">{{778, 0}, {16, 17}}</string>
+																							<reference key="NSSuperview" ref="390445153"/>
+																						</object>
+																						<object class="NSMutableArray" key="NSTableColumns">
+																							<bool key="EncodedWithXMLCoder">YES</bool>
+																							<object class="NSTableColumn" id="638274756">
+																								<string key="NSIdentifier">filename</string>
+																								<double key="NSWidth">1.010000e+02</double>
+																								<double key="NSMinWidth">4.000000e+01</double>
+																								<double key="NSMaxWidth">1.000000e+03</double>
+																								<object class="NSTableHeaderCell" key="NSHeaderCell">
+																									<int key="NSCellFlags">75628032</int>
+																									<int key="NSCellFlags2">0</int>
+																									<string key="NSContents">Name</string>
+																									<reference key="NSSupport" ref="26"/>
+																									<object class="NSColor" key="NSBackgroundColor" id="933734391">
+																										<int key="NSColorSpace">3</int>
+																										<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+																									</object>
+																									<reference key="NSTextColor" ref="329323885"/>
+																								</object>
+																								<object class="NSTextFieldCell" key="NSDataCell" id="494979165">
+																									<int key="NSCellFlags">337772096</int>
+																									<int key="NSCellFlags2">2048</int>
+																									<string key="NSContents">Text Cell</string>
+																									<reference key="NSSupport" ref="307917541"/>
+																									<reference key="NSControlView" ref="717786622"/>
+																									<reference key="NSBackgroundColor" ref="216762640"/>
+																									<reference key="NSTextColor" ref="893644134"/>
+																								</object>
+																								<int key="NSResizingMask">3</int>
+																								<bool key="NSIsResizeable">YES</bool>
+																								<reference key="NSTableView" ref="717786622"/>
+																							</object>
+																							<object class="NSTableColumn" id="101923277">
+																								<string key="NSIdentifier">size</string>
+																								<double key="NSWidth">8.000000e+01</double>
+																								<double key="NSMinWidth">4.000000e+01</double>
+																								<double key="NSMaxWidth">1.000000e+02</double>
+																								<object class="NSTableHeaderCell" key="NSHeaderCell">
+																									<int key="NSCellFlags">75628032</int>
+																									<int key="NSCellFlags2">0</int>
+																									<string key="NSContents">Size</string>
+																									<reference key="NSSupport" ref="26"/>
+																									<reference key="NSBackgroundColor" ref="933734391"/>
+																									<reference key="NSTextColor" ref="329323885"/>
+																								</object>
+																								<object class="NSTextFieldCell" key="NSDataCell" id="55855401">
+																									<int key="NSCellFlags">337772096</int>
+																									<int key="NSCellFlags2">2048</int>
+																									<string key="NSContents">Text Cell</string>
+																									<reference key="NSSupport" ref="307917541"/>
+																									<reference key="NSControlView" ref="717786622"/>
+																									<reference key="NSBackgroundColor" ref="216762640"/>
+																									<reference key="NSTextColor" ref="893644134"/>
+																								</object>
+																								<int key="NSResizingMask">3</int>
+																								<bool key="NSIsResizeable">YES</bool>
+																								<reference key="NSTableView" ref="717786622"/>
+																							</object>
+																							<object class="NSTableColumn" id="701368831">
+																								<string key="NSIdentifier">req</string>
+																								<double key="NSWidth">6.400000e+01</double>
+																								<double key="NSMinWidth">1.000000e+01</double>
+																								<double key="NSMaxWidth">1.000000e+02</double>
+																								<object class="NSTableHeaderCell" key="NSHeaderCell">
+																									<int key="NSCellFlags">75628032</int>
+																									<int key="NSCellFlags2">0</int>
+																									<string key="NSContents">Requested</string>
+																									<reference key="NSSupport" ref="26"/>
+																									<reference key="NSBackgroundColor" ref="60076722"/>
+																									<reference key="NSTextColor" ref="329323885"/>
+																								</object>
+																								<object class="NSTextFieldCell" key="NSDataCell" id="1055619154">
+																									<int key="NSCellFlags">337772096</int>
+																									<int key="NSCellFlags2">2048</int>
+																									<string key="NSContents">Text Cell</string>
+																									<reference key="NSSupport" ref="307917541"/>
+																									<reference key="NSControlView" ref="717786622"/>
+																									<reference key="NSBackgroundColor" ref="216762640"/>
+																									<reference key="NSTextColor" ref="893644134"/>
+																								</object>
+																								<int key="NSResizingMask">3</int>
+																								<bool key="NSIsResizeable">YES</bool>
+																								<reference key="NSTableView" ref="717786622"/>
+																							</object>
+																							<object class="NSTableColumn" id="1054049751">
+																								<string key="NSIdentifier">req_all</string>
+																								<double key="NSWidth">8.400000e+01</double>
+																								<double key="NSMinWidth">1.000000e+01</double>
+																								<double key="NSMaxWidth">3.402823e+38</double>
+																								<object class="NSTableHeaderCell" key="NSHeaderCell">
+																									<int key="NSCellFlags">75628032</int>
+																									<int key="NSCellFlags2">0</int>
+																									<string key="NSContents">Total Requests</string>
+																									<reference key="NSSupport" ref="26"/>
+																									<reference key="NSBackgroundColor" ref="60076722"/>
+																									<reference key="NSTextColor" ref="329323885"/>
+																								</object>
+																								<object class="NSTextFieldCell" key="NSDataCell" id="565817602">
+																									<int key="NSCellFlags">337772096</int>
+																									<int key="NSCellFlags2">2048</int>
+																									<string key="NSContents">Text Cell</string>
+																									<reference key="NSSupport" ref="307917541"/>
+																									<reference key="NSControlView" ref="717786622"/>
+																									<reference key="NSBackgroundColor" ref="216762640"/>
+																									<reference key="NSTextColor" ref="893644134"/>
+																								</object>
+																								<int key="NSResizingMask">3</int>
+																								<bool key="NSIsResizeable">YES</bool>
+																								<reference key="NSTableView" ref="717786622"/>
+																							</object>
+																							<object class="NSTableColumn" id="160854274">
+																								<string key="NSIdentifier">accept</string>
+																								<double key="NSWidth">6.400000e+01</double>
+																								<double key="NSMinWidth">1.000000e+01</double>
+																								<double key="NSMaxWidth">3.402823e+38</double>
+																								<object class="NSTableHeaderCell" key="NSHeaderCell">
+																									<int key="NSCellFlags">75628032</int>
+																									<int key="NSCellFlags2">0</int>
+																									<string key="NSContents">Accepted</string>
+																									<reference key="NSSupport" ref="26"/>
+																									<reference key="NSBackgroundColor" ref="60076722"/>
+																									<reference key="NSTextColor" ref="329323885"/>
+																								</object>
+																								<object class="NSTextFieldCell" key="NSDataCell" id="372696473">
+																									<int key="NSCellFlags">337772096</int>
+																									<int key="NSCellFlags2">2048</int>
+																									<string key="NSContents">Text Cell</string>
+																									<reference key="NSSupport" ref="307917541"/>
+																									<reference key="NSControlView" ref="717786622"/>
+																									<reference key="NSBackgroundColor" ref="216762640"/>
+																									<reference key="NSTextColor" ref="893644134"/>
+																								</object>
+																								<int key="NSResizingMask">3</int>
+																								<bool key="NSIsResizeable">YES</bool>
+																								<reference key="NSTableView" ref="717786622"/>
+																							</object>
+																							<object class="NSTableColumn" id="581523462">
+																								<string key="NSIdentifier">accept_all</string>
+																								<double key="NSWidth">9.400000e+01</double>
+																								<double key="NSMinWidth">1.000000e+01</double>
+																								<double key="NSMaxWidth">3.402823e+38</double>
+																								<object class="NSTableHeaderCell" key="NSHeaderCell">
+																									<int key="NSCellFlags">75628032</int>
+																									<int key="NSCellFlags2">0</int>
+																									<string key="NSContents">Total Accepted</string>
+																									<reference key="NSSupport" ref="26"/>
+																									<reference key="NSBackgroundColor" ref="60076722"/>
+																									<reference key="NSTextColor" ref="329323885"/>
+																								</object>
+																								<object class="NSTextFieldCell" key="NSDataCell" id="338148351">
+																									<int key="NSCellFlags">337772096</int>
+																									<int key="NSCellFlags2">2048</int>
+																									<string key="NSContents">Text Cell</string>
+																									<reference key="NSSupport" ref="307917541"/>
+																									<reference key="NSControlView" ref="717786622"/>
+																									<reference key="NSBackgroundColor" ref="216762640"/>
+																									<reference key="NSTextColor" ref="893644134"/>
+																								</object>
+																								<int key="NSResizingMask">3</int>
+																								<bool key="NSIsResizeable">YES</bool>
+																								<reference key="NSTableView" ref="717786622"/>
+																							</object>
+																							<object class="NSTableColumn" id="401815051">
+																								<string key="NSIdentifier">xfer</string>
+																								<double key="NSWidth">8.400000e+01</double>
+																								<double key="NSMinWidth">1.000000e+01</double>
+																								<double key="NSMaxWidth">3.402823e+38</double>
+																								<object class="NSTableHeaderCell" key="NSHeaderCell">
+																									<int key="NSCellFlags">75628032</int>
+																									<int key="NSCellFlags2">0</int>
+																									<string key="NSContents">Transferred</string>
+																									<reference key="NSSupport" ref="26"/>
+																									<reference key="NSBackgroundColor" ref="60076722"/>
+																									<reference key="NSTextColor" ref="329323885"/>
+																								</object>
+																								<object class="NSTextFieldCell" key="NSDataCell" id="992087773">
+																									<int key="NSCellFlags">337772096</int>
+																									<int key="NSCellFlags2">2048</int>
+																									<string key="NSContents">Text Cell</string>
+																									<reference key="NSSupport" ref="307917541"/>
+																									<reference key="NSControlView" ref="717786622"/>
+																									<reference key="NSBackgroundColor" ref="216762640"/>
+																									<reference key="NSTextColor" ref="893644134"/>
+																								</object>
+																								<int key="NSResizingMask">3</int>
+																								<bool key="NSIsResizeable">YES</bool>
+																								<reference key="NSTableView" ref="717786622"/>
+																							</object>
+																							<object class="NSTableColumn" id="102532951">
+																								<string key="NSIdentifier">xfer_all</string>
+																								<double key="NSWidth">1.970000e+02</double>
+																								<double key="NSMinWidth">1.000000e+01</double>
+																								<double key="NSMaxWidth">3.402823e+38</double>
+																								<object class="NSTableHeaderCell" key="NSHeaderCell">
+																									<int key="NSCellFlags">75628032</int>
+																									<int key="NSCellFlags2">0</int>
+																									<string key="NSContents">Total Transferred</string>
+																									<reference key="NSSupport" ref="26"/>
+																									<reference key="NSBackgroundColor" ref="60076722"/>
+																									<reference key="NSTextColor" ref="329323885"/>
+																								</object>
+																								<object class="NSTextFieldCell" key="NSDataCell" id="493987549">
+																									<int key="NSCellFlags">337772096</int>
+																									<int key="NSCellFlags2">2048</int>
+																									<string key="NSContents">Text Cell</string>
+																									<reference key="NSSupport" ref="307917541"/>
+																									<reference key="NSControlView" ref="717786622"/>
+																									<reference key="NSBackgroundColor" ref="216762640"/>
+																									<reference key="NSTextColor" ref="893644134"/>
+																								</object>
+																								<int key="NSResizingMask">3</int>
+																								<bool key="NSIsResizeable">YES</bool>
+																								<reference key="NSTableView" ref="717786622"/>
+																							</object>
+																						</object>
+																						<double key="NSIntercellSpacingWidth">3.000000e+00</double>
+																						<double key="NSIntercellSpacingHeight">2.000000e+00</double>
+																						<reference key="NSBackgroundColor" ref="216762640"/>
+																						<reference key="NSGridColor" ref="813108314"/>
+																						<double key="NSRowHeight">1.700000e+01</double>
+																						<int key="NSTvFlags">-692060160</int>
+																						<int key="NSColumnAutoresizingStyle">4</int>
+																						<int key="NSDraggingSourceMaskForLocal">15</int>
+																						<int key="NSDraggingSourceMaskForNonLocal">0</int>
+																						<bool key="NSAllowsTypeSelect">YES</bool>
+																					</object>
+																				</object>
+																				<string key="NSFrame">{{1, 17}, {792, 623}}</string>
+																				<reference key="NSSuperview" ref="390445153"/>
+																				<reference key="NSNextKeyView" ref="717786622"/>
+																				<reference key="NSDocView" ref="717786622"/>
+																				<reference key="NSBGColor" ref="216762640"/>
+																				<int key="NScvFlags">4</int>
+																			</object>
+																			<object class="NSScroller" id="750314488">
+																				<reference key="NSNextResponder" ref="390445153"/>
+																				<int key="NSvFlags">-2147483392</int>
+																				<string key="NSFrame">{{778, 17}, {15, 608}}</string>
+																				<reference key="NSSuperview" ref="390445153"/>
+																				<reference key="NSTarget" ref="390445153"/>
+																				<string key="NSAction">_doScroller:</string>
+																				<double key="NSPercent">9.759229e-01</double>
+																			</object>
+																			<object class="NSScroller" id="66072303">
+																				<reference key="NSNextResponder" ref="390445153"/>
+																				<int key="NSvFlags">-2147483392</int>
+																				<string key="NSFrame">{{1, 625}, {792, 15}}</string>
+																				<reference key="NSSuperview" ref="390445153"/>
+																				<int key="NSsFlags">1</int>
+																				<reference key="NSTarget" ref="390445153"/>
+																				<string key="NSAction">_doScroller:</string>
+																				<double key="NSPercent">9.753695e-01</double>
+																			</object>
+																			<object class="NSClipView" id="210560869">
+																				<reference key="NSNextResponder" ref="390445153"/>
+																				<int key="NSvFlags">2304</int>
+																				<object class="NSMutableArray" key="NSSubviews">
+																					<bool key="EncodedWithXMLCoder">YES</bool>
+																					<reference ref="22876713"/>
+																				</object>
+																				<string key="NSFrame">{{1, 0}, {792, 17}}</string>
+																				<reference key="NSSuperview" ref="390445153"/>
+																				<reference key="NSNextKeyView" ref="22876713"/>
+																				<reference key="NSDocView" ref="22876713"/>
+																				<reference key="NSBGColor" ref="216762640"/>
+																				<int key="NScvFlags">4</int>
+																			</object>
+																			<reference ref="875671470"/>
+																		</object>
+																		<string key="NSFrame">{{0, -5}, {794, 641}}</string>
+																		<reference key="NSSuperview" ref="828057281"/>
+																		<reference key="NSNextKeyView" ref="272456659"/>
+																		<int key="NSsFlags">562</int>
+																		<reference key="NSVScroller" ref="750314488"/>
+																		<reference key="NSHScroller" ref="66072303"/>
+																		<reference key="NSContentView" ref="272456659"/>
+																		<reference key="NSHeaderClipView" ref="210560869"/>
+																		<reference key="NSCornerView" ref="875671470"/>
+																		<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+																	</object>
+																</object>
+																<string key="NSFrame">{{10, 7}, {788, 638}}</string>
+																<reference key="NSSuperview" ref="188524998"/>
+															</object>
+															<string key="NSLabel">Sharing</string>
+															<reference key="NSColor" ref="16080844"/>
+															<reference key="NSTabView" ref="188524998"/>
+														</object>
+														<object class="NSTabViewItem" id="771035433">
+															<string key="NSIdentifier">5</string>
+															<object class="NSView" key="NSView" id="1034388736">
+																<nil key="NSNextResponder"/>
+																<int key="NSvFlags">256</int>
+																<string key="NSFrame">{{10, 7}, {788, 638}}</string>
+															</object>
+															<string key="NSLabel">Statistics</string>
+															<reference key="NSColor" ref="16080844"/>
+															<reference key="NSTabView" ref="188524998"/>
+														</object>
+													</object>
+													<reference key="NSSelectedTabViewItem" ref="993858922"/>
+													<reference key="NSFont" ref="307917541"/>
+													<int key="NSTvFlags">4</int>
+													<bool key="NSAllowTruncatedLabels">YES</bool>
+													<bool key="NSDrawsBackground">YES</bool>
+													<object class="NSMutableArray" key="NSSubviews">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<reference ref="828057281"/>
+													</object>
+												</object>
+											</object>
+											<string key="NSFrame">{{215, 0}, {792, 642}}</string>
+											<reference key="NSSuperview" ref="835260495"/>
+											<string key="NSClassName">NSView</string>
+										</object>
+									</object>
+									<string key="NSFrameSize">{1007, 642}</string>
+									<reference key="NSSuperview" ref="1043747929"/>
+									<bool key="NSIsVertical">YES</bool>
+									<int key="NSDividerStyle">2</int>
+									<reference key="BWSVColor" ref="548335889"/>
+									<bool key="BWSVColorIsEnabled">NO</bool>
+									<object class="NSMutableDictionary" key="BWSVMinValues">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSArray" key="dict.sortedKeys">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+										</object>
+										<object class="NSMutableArray" key="dict.values">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+										</object>
+									</object>
+									<object class="NSMutableDictionary" key="BWSVMaxValues">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSArray" key="dict.sortedKeys">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+										</object>
+										<object class="NSMutableArray" key="dict.values">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+										</object>
+									</object>
+									<object class="NSMutableDictionary" key="BWSVMinUnits">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSMutableArray" key="dict.sortedKeys">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<reference ref="8"/>
+											<integer value="1" id="9"/>
+										</object>
+										<object class="NSMutableArray" key="dict.values">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<reference ref="8"/>
+											<reference ref="8"/>
+										</object>
+									</object>
+									<object class="NSMutableDictionary" key="BWSVMaxUnits">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSMutableArray" key="dict.sortedKeys">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<reference ref="8"/>
+											<reference ref="9"/>
+										</object>
+										<object class="NSMutableArray" key="dict.values">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<reference ref="8"/>
+											<reference ref="8"/>
+										</object>
+									</object>
+									<int key="BWSVCollapsiblePopupSelection">1</int>
+									<bool key="BWSVDividerCanCollapse">NO</bool>
+								</object>
+								<object class="BWAddRegularBottomBar" id="166921940">
+									<reference key="NSNextResponder" ref="1043747929"/>
+									<int key="NSvFlags">270</int>
+									<string key="NSFrame">{{1008, 0}, {0, 642}}</string>
+									<reference key="NSSuperview" ref="1043747929"/>
+								</object>
+							</object>
+							<string key="NSFrame">{{0, 34}, {1008, 642}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<bool key="NSIsVertical">YES</bool>
+							<int key="NSDividerStyle">2</int>
+							<reference key="BWSVColor" ref="548335889"/>
+							<bool key="BWSVColorIsEnabled">NO</bool>
+							<object class="NSMutableDictionary" key="BWSVMinValues">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+								</object>
+								<object class="NSMutableArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+								</object>
+							</object>
+							<object class="NSMutableDictionary" key="BWSVMaxValues">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSArray" key="dict.sortedKeys">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+								</object>
+								<object class="NSMutableArray" key="dict.values">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+								</object>
+							</object>
+							<object class="NSMutableDictionary" key="BWSVMinUnits">
+								<reference key="NS.key.0" ref="8"/>
+								<reference key="NS.object.0" ref="8"/>
+							</object>
+							<object class="NSMutableDictionary" key="BWSVMaxUnits">
+								<reference key="NS.key.0" ref="8"/>
+								<reference key="NS.object.0" ref="8"/>
+							</object>
+							<int key="BWSVCollapsiblePopupSelection">0</int>
+							<bool key="BWSVDividerCanCollapse">NO</bool>
+						</object>
+						<object class="BWInsetTextField" id="264279150">
+							<reference key="NSNextResponder" ref="439893737"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{8, 12}, {300, 14}}</string>
+							<reference key="NSSuperview" ref="439893737"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="252325160">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">272761856</int>
+								<string key="NSContents">Conection status</string>
+								<reference key="NSSupport" ref="26"/>
+								<reference key="NSControlView" ref="264279150"/>
+								<reference key="NSBackgroundColor" ref="16080844"/>
+								<reference key="NSTextColor" ref="893644134"/>
+							</object>
+						</object>
+					</object>
+					<string key="NSFrameSize">{1008, 676}</string>
+					<reference key="NSSuperview"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+			</object>
+			<object class="NSCustomObject" id="147596840">
+				<string key="NSClassName">AppController</string>
+			</object>
+			<object class="NSCustomObject" id="788144270">
+				<string key="NSClassName">DownloadsViewController</string>
+			</object>
+			<object class="NSCustomObject" id="199664043">
+				<string key="NSClassName">SearchViewController</string>
+			</object>
+			<object class="NSWindowTemplate" id="524959524">
+				<int key="NSWindowStyleMask">3</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 428}, {752, 82}}</string>
+				<int key="NSWTFlags">1946157056</int>
+				<string key="NSWindowTitle">Add link</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<object class="NSView" key="NSWindowView" id="669917999">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSTextField" id="365621766">
+							<reference key="NSNextResponder" ref="669917999"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{20, 40}, {481, 22}}</string>
+							<reference key="NSSuperview" ref="669917999"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="16430511">
+								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="307917541"/>
+								<reference key="NSControlView" ref="365621766"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<object class="NSColor" key="NSBackgroundColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textBackgroundColor</string>
+									<reference key="NSColor" ref="630314492"/>
+								</object>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textColor</string>
+									<reference key="NSColor" ref="548335889"/>
+								</object>
+							</object>
+						</object>
+						<object class="NSPopUpButton" id="1035907965">
+							<reference key="NSNextResponder" ref="669917999"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{501, 37}, {100, 26}}</string>
+							<reference key="NSSuperview" ref="669917999"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSPopUpButtonCell" key="NSCell" id="875129753">
+								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags2">2048</int>
+								<reference key="NSSupport" ref="307917541"/>
+								<reference key="NSControlView" ref="1035907965"/>
+								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags2">1</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+								<object class="NSMenuItem" key="NSMenuItem" id="357294057">
+									<reference key="NSMenu" ref="430535427"/>
+									<string key="NSTitle">Category</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<int key="NSState">1</int>
+									<reference key="NSOnImage" ref="1071433421"/>
+									<reference key="NSMixedImage" ref="564125106"/>
+									<string key="NSAction">_popUpItemAction:</string>
+									<reference key="NSTarget" ref="875129753"/>
+								</object>
+								<bool key="NSMenuItemRespectAlignment">YES</bool>
+								<object class="NSMenu" key="NSMenu" id="430535427">
+									<string key="NSTitle">OtherViews</string>
+									<object class="NSMutableArray" key="NSMenuItems">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<reference ref="357294057"/>
+										<object class="NSMenuItem" id="576867891">
+											<reference key="NSMenu" ref="430535427"/>
+											<string key="NSTitle">Item 2</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="1071433421"/>
+											<reference key="NSMixedImage" ref="564125106"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="875129753"/>
+										</object>
+										<object class="NSMenuItem" id="116065698">
+											<reference key="NSMenu" ref="430535427"/>
+											<string key="NSTitle">Item 3</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="1071433421"/>
+											<reference key="NSMixedImage" ref="564125106"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="875129753"/>
+										</object>
+									</object>
+								</object>
+								<int key="NSPreferredEdge">1</int>
+								<bool key="NSUsesItemFromMenu">YES</bool>
+								<bool key="NSAltersState">YES</bool>
+								<int key="NSArrowPosition">2</int>
+							</object>
+						</object>
+						<object class="NSButton" id="556957166">
+							<reference key="NSNextResponder" ref="669917999"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{621, 33}, {96, 32}}</string>
+							<reference key="NSSuperview" ref="669917999"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="17246201">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<reference key="NSSupport" ref="307917541"/>
+								<reference key="NSControlView" ref="556957166"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+					</object>
+					<string key="NSFrameSize">{752, 82}</string>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+			</object>
+			<object class="NSCustomObject" id="36918369">
+				<string key="NSClassName">AddLinkDialogController</string>
+			</object>
+			<object class="NSCustomObject" id="602117137">
+				<string key="NSClassName">SourceViewController</string>
+			</object>
+			<object class="NSCustomObject" id="48224113">
+				<string key="NSClassName">SharedFilesViewController</string>
+			</object>
+		</object>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<object class="NSMutableArray" key="connectionRecords">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performMiniaturize:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="1011231497"/>
+					</object>
+					<int key="connectionID">37</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">arrangeInFront:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="625202149"/>
+					</object>
+					<int key="connectionID">39</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">print:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="49223823"/>
+					</object>
+					<int key="connectionID">86</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">runPageLayout:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="294629803"/>
+					</object>
+					<int key="connectionID">87</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performZoom:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="575023229"/>
+					</object>
+					<int key="connectionID">240</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showHelp:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="238773614"/>
+					</object>
+					<int key="connectionID">360</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleToolbarShown:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="102151532"/>
+					</object>
+					<int key="connectionID">366</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hide:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="755159360"/>
+					</object>
+					<int key="connectionID">367</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hideOtherApplications:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="342932134"/>
+					</object>
+					<int key="connectionID">368</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">terminate:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="632727374"/>
+					</object>
+					<int key="connectionID">369</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">unhideAllApplications:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="908899353"/>
+					</object>
+					<int key="connectionID">370</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">show_Preferences:</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="609285721"/>
+					</object>
+					<int key="connectionID">376</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">show_About:</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="238522557"/>
+					</object>
+					<int key="connectionID">377</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">show_Xfers:</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="233912118"/>
+					</object>
+					<int key="connectionID">406</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">show_Networks:</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="517137618"/>
+					</object>
+					<int key="connectionID">407</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">show_Search:</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="665899689"/>
+					</object>
+					<int key="connectionID">408</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">show_Sharing:</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="687973582"/>
+					</object>
+					<int key="connectionID">409</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">show_Stats:</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="765865720"/>
+					</object>
+					<int key="connectionID">410</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_dload_controller</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="788144270"/>
+					</object>
+					<int key="connectionID">428</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_search_controller</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="199664043"/>
+					</object>
+					<int key="connectionID">489</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">addLink:</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="705341025"/>
+					</object>
+					<int key="connectionID">502</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">closeOK:</string>
+						<reference key="source" ref="36918369"/>
+						<reference key="destination" ref="556957166"/>
+					</object>
+					<int key="connectionID">505</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_cat</string>
+						<reference key="source" ref="36918369"/>
+						<reference key="destination" ref="1035907965"/>
+					</object>
+					<int key="connectionID">506</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_link</string>
+						<reference key="source" ref="36918369"/>
+						<reference key="destination" ref="365621766"/>
+					</object>
+					<int key="connectionID">507</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_dlg</string>
+						<reference key="source" ref="36918369"/>
+						<reference key="destination" ref="524959524"/>
+					</object>
+					<int key="connectionID">508</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_add_link_dlg</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="36918369"/>
+					</object>
+					<int key="connectionID">509</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_tableview</string>
+						<reference key="source" ref="788144270"/>
+						<reference key="destination" ref="394756216"/>
+					</object>
+					<int key="connectionID">810</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_main_tabview</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="188524998"/>
+					</object>
+					<int key="connectionID">813</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_tab_view</string>
+						<reference key="source" ref="602117137"/>
+						<reference key="destination" ref="188524998"/>
+					</object>
+					<int key="connectionID">825</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_outline_view</string>
+						<reference key="source" ref="602117137"/>
+						<reference key="destination" ref="424642996"/>
+					</object>
+					<int key="connectionID">826</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_connection_status_text</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="264279150"/>
+					</object>
+					<int key="connectionID">837</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_shared_controller</string>
+						<reference key="source" ref="147596840"/>
+						<reference key="destination" ref="48224113"/>
+					</object>
+					<int key="connectionID">860</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">m_table_view</string>
+						<reference key="source" ref="48224113"/>
+						<reference key="destination" ref="717786622"/>
+					</object>
+					<int key="connectionID">861</int>
+				</object>
+			</object>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<object class="NSArray" key="orderedObjects">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<object class="NSArray" key="object" id="1049">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<reference key="children" ref="1048"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1021"/>
+						<reference key="parent" ref="1049"/>
+						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1014"/>
+						<reference key="parent" ref="1049"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1050"/>
+						<reference key="parent" ref="1049"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="649796088"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="713487014"/>
+							<reference ref="694149608"/>
+							<reference ref="391199113"/>
+							<reference ref="586577488"/>
+							<reference ref="379814623"/>
+						</object>
+						<reference key="parent" ref="1049"/>
+						<string key="objectName">MainMenu</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="713487014"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="835318025"/>
+						</object>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">56</int>
+						<reference key="object" ref="694149608"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="110575045"/>
+						</object>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">103</int>
+						<reference key="object" ref="391199113"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="374024848"/>
+						</object>
+						<reference key="parent" ref="649796088"/>
+						<string key="objectName">1</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">83</int>
+						<reference key="object" ref="379814623"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="720053764"/>
+						</object>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">81</int>
+						<reference key="object" ref="720053764"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="49223823"/>
+							<reference ref="705341025"/>
+							<reference ref="294629803"/>
+							<reference ref="425164168"/>
+						</object>
+						<reference key="parent" ref="379814623"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">78</int>
+						<reference key="object" ref="49223823"/>
+						<reference key="parent" ref="720053764"/>
+						<string key="objectName">6</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">82</int>
+						<reference key="object" ref="705341025"/>
+						<reference key="parent" ref="720053764"/>
+						<string key="objectName">9</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">77</int>
+						<reference key="object" ref="294629803"/>
+						<reference key="parent" ref="720053764"/>
+						<string key="objectName">5</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">79</int>
+						<reference key="object" ref="425164168"/>
+						<reference key="parent" ref="720053764"/>
+						<string key="objectName">7</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">106</int>
+						<reference key="object" ref="374024848"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="238773614"/>
+						</object>
+						<reference key="parent" ref="391199113"/>
+						<string key="objectName">2</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">111</int>
+						<reference key="object" ref="238773614"/>
+						<reference key="parent" ref="374024848"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">57</int>
+						<reference key="object" ref="110575045"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="238522557"/>
+							<reference ref="755159360"/>
+							<reference ref="908899353"/>
+							<reference ref="632727374"/>
+							<reference ref="646227648"/>
+							<reference ref="609285721"/>
+							<reference ref="481834944"/>
+							<reference ref="304266470"/>
+							<reference ref="1046388886"/>
+							<reference ref="1056857174"/>
+							<reference ref="342932134"/>
+						</object>
+						<reference key="parent" ref="694149608"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">58</int>
+						<reference key="object" ref="238522557"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="755159360"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="908899353"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">136</int>
+						<reference key="object" ref="632727374"/>
+						<reference key="parent" ref="110575045"/>
+						<string key="objectName">1111</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="646227648"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">129</int>
+						<reference key="object" ref="609285721"/>
+						<reference key="parent" ref="110575045"/>
+						<string key="objectName">121</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="481834944"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">236</int>
+						<reference key="object" ref="304266470"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">131</int>
+						<reference key="object" ref="1046388886"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="752062318"/>
+						</object>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">149</int>
+						<reference key="object" ref="1056857174"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="342932134"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="752062318"/>
+						<reference key="parent" ref="1046388886"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="835318025"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="299356726"/>
+							<reference ref="625202149"/>
+							<reference ref="575023229"/>
+							<reference ref="1011231497"/>
+						</object>
+						<reference key="parent" ref="713487014"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">92</int>
+						<reference key="object" ref="299356726"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="625202149"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">239</int>
+						<reference key="object" ref="575023229"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="1011231497"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">295</int>
+						<reference key="object" ref="586577488"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="466310130"/>
+						</object>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">296</int>
+						<reference key="object" ref="466310130"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="102151532"/>
+						</object>
+						<reference key="parent" ref="586577488"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">297</int>
+						<reference key="object" ref="102151532"/>
+						<reference key="parent" ref="466310130"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">371</int>
+						<reference key="object" ref="972006081"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="439893737"/>
+							<reference ref="545039154"/>
+						</object>
+						<reference key="parent" ref="1049"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">372</int>
+						<reference key="object" ref="439893737"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1043747929"/>
+							<reference ref="264279150"/>
+						</object>
+						<reference key="parent" ref="972006081"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">375</int>
+						<reference key="object" ref="147596840"/>
+						<reference key="parent" ref="1049"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">378</int>
+						<reference key="object" ref="545039154"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="369721526"/>
+							<reference ref="1063387075"/>
+							<reference ref="257269317"/>
+							<reference ref="570031734"/>
+							<reference ref="801459404"/>
+							<reference ref="542504695"/>
+							<reference ref="108438574"/>
+							<reference ref="233912118"/>
+							<reference ref="517137618"/>
+							<reference ref="665899689"/>
+							<reference ref="687973582"/>
+							<reference ref="765865720"/>
+						</object>
+						<reference key="parent" ref="972006081"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">379</int>
+						<reference key="object" ref="369721526"/>
+						<reference key="parent" ref="545039154"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">380</int>
+						<reference key="object" ref="1063387075"/>
+						<reference key="parent" ref="545039154"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">381</int>
+						<reference key="object" ref="257269317"/>
+						<reference key="parent" ref="545039154"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">382</int>
+						<reference key="object" ref="570031734"/>
+						<reference key="parent" ref="545039154"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">383</int>
+						<reference key="object" ref="801459404"/>
+						<reference key="parent" ref="545039154"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">384</int>
+						<reference key="object" ref="542504695"/>
+						<reference key="parent" ref="545039154"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">385</int>
+						<reference key="object" ref="108438574"/>
+						<reference key="parent" ref="545039154"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">401</int>
+						<reference key="object" ref="233912118"/>
+						<reference key="parent" ref="545039154"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">402</int>
+						<reference key="object" ref="517137618"/>
+						<reference key="parent" ref="545039154"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">403</int>
+						<reference key="object" ref="665899689"/>
+						<reference key="parent" ref="545039154"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">404</int>
+						<reference key="object" ref="687973582"/>
+						<reference key="parent" ref="545039154"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">405</int>
+						<reference key="object" ref="765865720"/>
+						<reference key="parent" ref="545039154"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">427</int>
+						<reference key="object" ref="788144270"/>
+						<reference key="parent" ref="1049"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">486</int>
+						<reference key="object" ref="199664043"/>
+						<reference key="parent" ref="1049"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">490</int>
+						<reference key="object" ref="524959524"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="669917999"/>
+						</object>
+						<reference key="parent" ref="1049"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">491</int>
+						<reference key="object" ref="669917999"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="365621766"/>
+							<reference ref="1035907965"/>
+							<reference ref="556957166"/>
+						</object>
+						<reference key="parent" ref="524959524"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">492</int>
+						<reference key="object" ref="365621766"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="16430511"/>
+						</object>
+						<reference key="parent" ref="669917999"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">493</int>
+						<reference key="object" ref="16430511"/>
+						<reference key="parent" ref="365621766"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">494</int>
+						<reference key="object" ref="1035907965"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="875129753"/>
+						</object>
+						<reference key="parent" ref="669917999"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">495</int>
+						<reference key="object" ref="875129753"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="430535427"/>
+						</object>
+						<reference key="parent" ref="1035907965"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">496</int>
+						<reference key="object" ref="430535427"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="357294057"/>
+							<reference ref="576867891"/>
+							<reference ref="116065698"/>
+						</object>
+						<reference key="parent" ref="875129753"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">497</int>
+						<reference key="object" ref="357294057"/>
+						<reference key="parent" ref="430535427"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">498</int>
+						<reference key="object" ref="576867891"/>
+						<reference key="parent" ref="430535427"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">499</int>
+						<reference key="object" ref="116065698"/>
+						<reference key="parent" ref="430535427"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">500</int>
+						<reference key="object" ref="556957166"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="17246201"/>
+						</object>
+						<reference key="parent" ref="669917999"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">501</int>
+						<reference key="object" ref="17246201"/>
+						<reference key="parent" ref="556957166"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">504</int>
+						<reference key="object" ref="36918369"/>
+						<reference key="parent" ref="1049"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">510</int>
+						<reference key="object" ref="1043747929"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="166921940"/>
+							<reference ref="835260495"/>
+						</object>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">574</int>
+						<reference key="object" ref="166921940"/>
+						<reference key="parent" ref="1043747929"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">575</int>
+						<reference key="object" ref="835260495"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="99132219"/>
+							<reference ref="1070003598"/>
+						</object>
+						<reference key="parent" ref="1043747929"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">576</int>
+						<reference key="object" ref="99132219"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="134154892"/>
+						</object>
+						<reference key="parent" ref="835260495"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">577</int>
+						<reference key="object" ref="1070003598"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="188524998"/>
+						</object>
+						<reference key="parent" ref="835260495"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">690</int>
+						<reference key="object" ref="188524998"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="771035433"/>
+							<reference ref="993858922"/>
+							<reference ref="750725839"/>
+							<reference ref="300298249"/>
+							<reference ref="675864263"/>
+						</object>
+						<reference key="parent" ref="1070003598"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">691</int>
+						<reference key="object" ref="771035433"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1034388736"/>
+						</object>
+						<reference key="parent" ref="188524998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">692</int>
+						<reference key="object" ref="993858922"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="828057281"/>
+						</object>
+						<reference key="parent" ref="188524998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">693</int>
+						<reference key="object" ref="750725839"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="966239350"/>
+						</object>
+						<reference key="parent" ref="188524998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">694</int>
+						<reference key="object" ref="300298249"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="511747603"/>
+						</object>
+						<reference key="parent" ref="188524998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">724</int>
+						<reference key="object" ref="511747603"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<reference key="parent" ref="300298249"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">743</int>
+						<reference key="object" ref="966239350"/>
+						<reference key="parent" ref="750725839"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">744</int>
+						<reference key="object" ref="828057281"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="390445153"/>
+						</object>
+						<reference key="parent" ref="993858922"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">745</int>
+						<reference key="object" ref="1034388736"/>
+						<reference key="parent" ref="771035433"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">695</int>
+						<reference key="object" ref="675864263"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="257719914"/>
+						</object>
+						<reference key="parent" ref="188524998"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">696</int>
+						<reference key="object" ref="257719914"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="902110243"/>
+						</object>
+						<reference key="parent" ref="675864263"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">697</int>
+						<reference key="object" ref="902110243"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="107841350"/>
+						</object>
+						<reference key="parent" ref="257719914"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">698</int>
+						<reference key="object" ref="107841350"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="929288326"/>
+						</object>
+						<reference key="parent" ref="902110243"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">772</int>
+						<reference key="object" ref="929288326"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="605426421"/>
+							<reference ref="621608261"/>
+							<reference ref="394756216"/>
+							<reference ref="246284584"/>
+						</object>
+						<reference key="parent" ref="107841350"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">773</int>
+						<reference key="object" ref="605426421"/>
+						<reference key="parent" ref="929288326"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">774</int>
+						<reference key="object" ref="621608261"/>
+						<reference key="parent" ref="929288326"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">775</int>
+						<reference key="object" ref="394756216"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="165659778"/>
+							<reference ref="533922437"/>
+							<reference ref="336953804"/>
+							<reference ref="196165787"/>
+							<reference ref="312824917"/>
+							<reference ref="878579444"/>
+							<reference ref="88285858"/>
+							<reference ref="657554659"/>
+							<reference ref="849370645"/>
+							<reference ref="218910539"/>
+						</object>
+						<reference key="parent" ref="929288326"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">776</int>
+						<reference key="object" ref="246284584"/>
+						<reference key="parent" ref="929288326"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">777</int>
+						<reference key="object" ref="165659778"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="564249708"/>
+						</object>
+						<reference key="parent" ref="394756216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">778</int>
+						<reference key="object" ref="533922437"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="983524537"/>
+						</object>
+						<reference key="parent" ref="394756216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">779</int>
+						<reference key="object" ref="983524537"/>
+						<reference key="parent" ref="533922437"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">780</int>
+						<reference key="object" ref="564249708"/>
+						<reference key="parent" ref="165659778"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">781</int>
+						<reference key="object" ref="336953804"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="253101532"/>
+						</object>
+						<reference key="parent" ref="394756216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">782</int>
+						<reference key="object" ref="253101532"/>
+						<reference key="parent" ref="336953804"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">783</int>
+						<reference key="object" ref="196165787"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="681082546"/>
+						</object>
+						<reference key="parent" ref="394756216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">784</int>
+						<reference key="object" ref="681082546"/>
+						<reference key="parent" ref="196165787"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">785</int>
+						<reference key="object" ref="312824917"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="334425709"/>
+						</object>
+						<reference key="parent" ref="394756216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">786</int>
+						<reference key="object" ref="334425709"/>
+						<reference key="parent" ref="312824917"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">787</int>
+						<reference key="object" ref="878579444"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="285155372"/>
+						</object>
+						<reference key="parent" ref="394756216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">788</int>
+						<reference key="object" ref="285155372"/>
+						<reference key="parent" ref="878579444"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">789</int>
+						<reference key="object" ref="88285858"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="282927201"/>
+						</object>
+						<reference key="parent" ref="394756216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">790</int>
+						<reference key="object" ref="282927201"/>
+						<reference key="parent" ref="88285858"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">791</int>
+						<reference key="object" ref="657554659"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1013428736"/>
+						</object>
+						<reference key="parent" ref="394756216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">792</int>
+						<reference key="object" ref="1013428736"/>
+						<reference key="parent" ref="657554659"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">793</int>
+						<reference key="object" ref="849370645"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="828729841"/>
+						</object>
+						<reference key="parent" ref="394756216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">794</int>
+						<reference key="object" ref="828729841"/>
+						<reference key="parent" ref="849370645"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">795</int>
+						<reference key="object" ref="218910539"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="732471957"/>
+						</object>
+						<reference key="parent" ref="394756216"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">796</int>
+						<reference key="object" ref="732471957"/>
+						<reference key="parent" ref="218910539"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">821</int>
+						<reference key="object" ref="602117137"/>
+						<reference key="parent" ref="1049"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">798</int>
+						<reference key="object" ref="134154892"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="424642996"/>
+							<reference ref="449545756"/>
+							<reference ref="543575469"/>
+						</object>
+						<reference key="parent" ref="99132219"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">801</int>
+						<reference key="object" ref="424642996"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="528858694"/>
+							<reference ref="868975237"/>
+						</object>
+						<reference key="parent" ref="134154892"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">804</int>
+						<reference key="object" ref="528858694"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="189987630"/>
+						</object>
+						<reference key="parent" ref="424642996"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">805</int>
+						<reference key="object" ref="189987630"/>
+						<reference key="parent" ref="528858694"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">803</int>
+						<reference key="object" ref="868975237"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="80458916"/>
+						</object>
+						<reference key="parent" ref="424642996"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">806</int>
+						<reference key="object" ref="80458916"/>
+						<reference key="parent" ref="868975237"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">800</int>
+						<reference key="object" ref="449545756"/>
+						<reference key="parent" ref="134154892"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">799</int>
+						<reference key="object" ref="543575469"/>
+						<reference key="parent" ref="134154892"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">835</int>
+						<reference key="object" ref="264279150"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="252325160"/>
+						</object>
+						<reference key="parent" ref="439893737"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">836</int>
+						<reference key="object" ref="252325160"/>
+						<reference key="parent" ref="264279150"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">838</int>
+						<reference key="object" ref="390445153"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="750314488"/>
+							<reference ref="66072303"/>
+							<reference ref="717786622"/>
+							<reference ref="22876713"/>
+						</object>
+						<reference key="parent" ref="828057281"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">839</int>
+						<reference key="object" ref="750314488"/>
+						<reference key="parent" ref="390445153"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">840</int>
+						<reference key="object" ref="66072303"/>
+						<reference key="parent" ref="390445153"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">841</int>
+						<reference key="object" ref="717786622"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="638274756"/>
+							<reference ref="101923277"/>
+							<reference ref="701368831"/>
+							<reference ref="1054049751"/>
+							<reference ref="160854274"/>
+							<reference ref="581523462"/>
+							<reference ref="401815051"/>
+							<reference ref="102532951"/>
+						</object>
+						<reference key="parent" ref="390445153"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">842</int>
+						<reference key="object" ref="22876713"/>
+						<reference key="parent" ref="390445153"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">843</int>
+						<reference key="object" ref="638274756"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="494979165"/>
+						</object>
+						<reference key="parent" ref="717786622"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">844</int>
+						<reference key="object" ref="101923277"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="55855401"/>
+						</object>
+						<reference key="parent" ref="717786622"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">845</int>
+						<reference key="object" ref="55855401"/>
+						<reference key="parent" ref="101923277"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">846</int>
+						<reference key="object" ref="494979165"/>
+						<reference key="parent" ref="638274756"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">847</int>
+						<reference key="object" ref="701368831"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1055619154"/>
+						</object>
+						<reference key="parent" ref="717786622"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">848</int>
+						<reference key="object" ref="1055619154"/>
+						<reference key="parent" ref="701368831"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">849</int>
+						<reference key="object" ref="1054049751"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="565817602"/>
+						</object>
+						<reference key="parent" ref="717786622"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">850</int>
+						<reference key="object" ref="565817602"/>
+						<reference key="parent" ref="1054049751"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">851</int>
+						<reference key="object" ref="160854274"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="372696473"/>
+						</object>
+						<reference key="parent" ref="717786622"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">852</int>
+						<reference key="object" ref="372696473"/>
+						<reference key="parent" ref="160854274"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">853</int>
+						<reference key="object" ref="581523462"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="338148351"/>
+						</object>
+						<reference key="parent" ref="717786622"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">854</int>
+						<reference key="object" ref="338148351"/>
+						<reference key="parent" ref="581523462"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">855</int>
+						<reference key="object" ref="401815051"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="992087773"/>
+						</object>
+						<reference key="parent" ref="717786622"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">856</int>
+						<reference key="object" ref="992087773"/>
+						<reference key="parent" ref="401815051"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">857</int>
+						<reference key="object" ref="102532951"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="493987549"/>
+						</object>
+						<reference key="parent" ref="717786622"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">858</int>
+						<reference key="object" ref="493987549"/>
+						<reference key="parent" ref="102532951"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">859</int>
+						<reference key="object" ref="48224113"/>
+						<reference key="parent" ref="1049"/>
+						<string key="objectName">Object</string>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="flattenedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSMutableArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>-1.IBPluginDependency</string>
+					<string>-2.IBPluginDependency</string>
+					<string>-3.IBPluginDependency</string>
+					<string>103.IBPluginDependency</string>
+					<string>103.ImportedFromIB2</string>
+					<string>106.IBPluginDependency</string>
+					<string>106.ImportedFromIB2</string>
+					<string>106.editorWindowContentRectSynchronizationRect</string>
+					<string>111.IBPluginDependency</string>
+					<string>111.ImportedFromIB2</string>
+					<string>129.IBPluginDependency</string>
+					<string>129.ImportedFromIB2</string>
+					<string>130.IBPluginDependency</string>
+					<string>130.ImportedFromIB2</string>
+					<string>130.editorWindowContentRectSynchronizationRect</string>
+					<string>131.IBPluginDependency</string>
+					<string>131.ImportedFromIB2</string>
+					<string>134.IBPluginDependency</string>
+					<string>134.ImportedFromIB2</string>
+					<string>136.IBPluginDependency</string>
+					<string>136.ImportedFromIB2</string>
+					<string>143.IBPluginDependency</string>
+					<string>143.ImportedFromIB2</string>
+					<string>144.IBPluginDependency</string>
+					<string>144.ImportedFromIB2</string>
+					<string>145.IBPluginDependency</string>
+					<string>145.ImportedFromIB2</string>
+					<string>149.IBPluginDependency</string>
+					<string>149.ImportedFromIB2</string>
+					<string>150.IBPluginDependency</string>
+					<string>150.ImportedFromIB2</string>
+					<string>19.IBPluginDependency</string>
+					<string>19.ImportedFromIB2</string>
+					<string>23.IBPluginDependency</string>
+					<string>23.ImportedFromIB2</string>
+					<string>236.IBPluginDependency</string>
+					<string>236.ImportedFromIB2</string>
+					<string>239.IBPluginDependency</string>
+					<string>239.ImportedFromIB2</string>
+					<string>24.IBPluginDependency</string>
+					<string>24.ImportedFromIB2</string>
+					<string>24.editorWindowContentRectSynchronizationRect</string>
+					<string>29.IBPluginDependency</string>
+					<string>29.ImportedFromIB2</string>
+					<string>29.WindowOrigin</string>
+					<string>29.editorWindowContentRectSynchronizationRect</string>
+					<string>295.IBPluginDependency</string>
+					<string>296.IBPluginDependency</string>
+					<string>296.editorWindowContentRectSynchronizationRect</string>
+					<string>297.IBPluginDependency</string>
+					<string>371.IBEditorWindowLastContentRect</string>
+					<string>371.IBViewEditorWindowController.showingBoundsRectangles</string>
+					<string>371.IBViewEditorWindowController.showingLayoutRectangles</string>
+					<string>371.IBWindowTemplateEditedContentRect</string>
+					<string>371.NSWindowTemplate.visibleAtLaunch</string>
+					<string>371.editorWindowContentRectSynchronizationRect</string>
+					<string>372.IBPluginDependency</string>
+					<string>375.IBPluginDependency</string>
+					<string>378.IBEditorWindowLastContentRect</string>
+					<string>378.IBPluginDependency</string>
+					<string>378.editorWindowContentRectSynchronizationRect</string>
+					<string>379.IBPluginDependency</string>
+					<string>380.IBPluginDependency</string>
+					<string>382.IBPluginDependency</string>
+					<string>385.IBPluginDependency</string>
+					<string>401.IBPluginDependency</string>
+					<string>402.IBPluginDependency</string>
+					<string>403.IBPluginDependency</string>
+					<string>404.IBPluginDependency</string>
+					<string>405.IBPluginDependency</string>
+					<string>427.IBPluginDependency</string>
+					<string>486.IBPluginDependency</string>
+					<string>490.IBEditorWindowLastContentRect</string>
+					<string>490.IBWindowTemplateEditedContentRect</string>
+					<string>490.NSWindowTemplate.visibleAtLaunch</string>
+					<string>490.editorWindowContentRectSynchronizationRect</string>
+					<string>491.IBPluginDependency</string>
+					<string>492.IBPluginDependency</string>
+					<string>493.IBPluginDependency</string>
+					<string>494.IBPluginDependency</string>
+					<string>495.IBPluginDependency</string>
+					<string>496.IBPluginDependency</string>
+					<string>497.IBPluginDependency</string>
+					<string>498.IBPluginDependency</string>
+					<string>499.IBPluginDependency</string>
+					<string>5.IBPluginDependency</string>
+					<string>5.ImportedFromIB2</string>
+					<string>500.IBPluginDependency</string>
+					<string>501.IBPluginDependency</string>
+					<string>504.IBPluginDependency</string>
+					<string>510.IBPluginDependency</string>
+					<string>56.IBPluginDependency</string>
+					<string>56.ImportedFromIB2</string>
+					<string>57.IBPluginDependency</string>
+					<string>57.ImportedFromIB2</string>
+					<string>57.editorWindowContentRectSynchronizationRect</string>
+					<string>574.IBPluginDependency</string>
+					<string>575.IBPluginDependency</string>
+					<string>576.IBPluginDependency</string>
+					<string>577.IBPluginDependency</string>
+					<string>58.IBPluginDependency</string>
+					<string>58.ImportedFromIB2</string>
+					<string>690.IBPluginDependency</string>
+					<string>691.IBPluginDependency</string>
+					<string>692.IBPluginDependency</string>
+					<string>693.IBPluginDependency</string>
+					<string>694.IBPluginDependency</string>
+					<string>695.IBPluginDependency</string>
+					<string>696.IBPluginDependency</string>
+					<string>697.IBPluginDependency</string>
+					<string>698.IBPluginDependency</string>
+					<string>724.IBPluginDependency</string>
+					<string>743.IBPluginDependency</string>
+					<string>744.IBPluginDependency</string>
+					<string>745.IBPluginDependency</string>
+					<string>77.IBPluginDependency</string>
+					<string>77.ImportedFromIB2</string>
+					<string>772.IBPluginDependency</string>
+					<string>773.IBPluginDependency</string>
+					<string>774.IBPluginDependency</string>
+					<string>775.IBPluginDependency</string>
+					<string>776.IBPluginDependency</string>
+					<string>777.IBPluginDependency</string>
+					<string>778.IBPluginDependency</string>
+					<string>779.IBPluginDependency</string>
+					<string>78.IBPluginDependency</string>
+					<string>78.ImportedFromIB2</string>
+					<string>780.IBPluginDependency</string>
+					<string>781.IBPluginDependency</string>
+					<string>782.IBPluginDependency</string>
+					<string>783.IBPluginDependency</string>
+					<string>784.IBPluginDependency</string>
+					<string>785.IBPluginDependency</string>
+					<string>786.IBPluginDependency</string>
+					<string>787.IBPluginDependency</string>
+					<string>788.IBPluginDependency</string>
+					<string>789.IBPluginDependency</string>
+					<string>79.IBPluginDependency</string>
+					<string>79.ImportedFromIB2</string>
+					<string>790.IBPluginDependency</string>
+					<string>791.IBPluginDependency</string>
+					<string>792.IBPluginDependency</string>
+					<string>793.IBPluginDependency</string>
+					<string>794.IBPluginDependency</string>
+					<string>795.IBPluginDependency</string>
+					<string>796.IBPluginDependency</string>
+					<string>798.IBPluginDependency</string>
+					<string>799.IBPluginDependency</string>
+					<string>800.IBPluginDependency</string>
+					<string>801.IBPluginDependency</string>
+					<string>803.IBPluginDependency</string>
+					<string>804.IBPluginDependency</string>
+					<string>805.IBPluginDependency</string>
+					<string>806.CustomClassName</string>
+					<string>806.IBPluginDependency</string>
+					<string>81.IBPluginDependency</string>
+					<string>81.ImportedFromIB2</string>
+					<string>81.editorWindowContentRectSynchronizationRect</string>
+					<string>82.IBPluginDependency</string>
+					<string>82.ImportedFromIB2</string>
+					<string>821.IBPluginDependency</string>
+					<string>83.IBPluginDependency</string>
+					<string>83.ImportedFromIB2</string>
+					<string>835.IBPluginDependency</string>
+					<string>836.IBPluginDependency</string>
+					<string>838.IBPluginDependency</string>
+					<string>839.IBPluginDependency</string>
+					<string>840.IBPluginDependency</string>
+					<string>841.IBPluginDependency</string>
+					<string>842.IBPluginDependency</string>
+					<string>843.IBPluginDependency</string>
+					<string>844.IBPluginDependency</string>
+					<string>845.IBPluginDependency</string>
+					<string>846.IBPluginDependency</string>
+					<string>859.IBPluginDependency</string>
+					<string>92.IBPluginDependency</string>
+					<string>92.ImportedFromIB2</string>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilderKit</string>
+					<string>com.apple.InterfaceBuilderKit</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>{{599, 444}, {150, 23}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>{{436, 809}, {64, 6}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>{{528, 394}, {197, 73}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>{74, 862}</string>
+					<string>{{366, 467}, {297, 20}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{478, 444}, {184, 23}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{170, -73}, {1008, 676}}</string>
+					<boolean value="NO"/>
+					<boolean value="YES"/>
+					<string>{{170, -73}, {1008, 676}}</string>
+					<reference ref="9"/>
+					<string>{{318, 123}, {905, 557}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{381, 800}, {616, 0}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{408, 770}, {617, 0}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{315, 763}, {752, 82}}</string>
+					<string>{{315, 763}, {752, 82}}</string>
+					<reference ref="8"/>
+					<string>{{318, 428}, {752, 82}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.brandonwalkin.BWToolkit</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>{{378, 284}, {186, 183}}</string>
+					<string>com.brandonwalkin.BWToolkit</string>
+					<string>com.brandonwalkin.BWToolkit</string>
+					<string>com.brandonwalkin.BWToolkit</string>
+					<string>com.brandonwalkin.BWToolkit</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>CellWithIcon</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>{{439, 394}, {188, 73}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.brandonwalkin.BWToolkit</string>
+					<string>com.brandonwalkin.BWToolkit</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="unlocalizedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="activeLocalization"/>
+			<object class="NSMutableDictionary" key="localizations">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="sourceID"/>
+			<int key="maxID">861</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">AddLinkDialogController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">closeOK:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>m_cat</string>
+							<string>m_dlg</string>
+							<string>m_link</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSPopUpButton</string>
+							<string>id</string>
+							<string>NSTextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">AddLinkDialogController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">AddLinkDialogController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">AppController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>addLink:</string>
+							<string>show_About:</string>
+							<string>show_Networks:</string>
+							<string>show_Preferences:</string>
+							<string>show_Search:</string>
+							<string>show_Sharing:</string>
+							<string>show_Stats:</string>
+							<string>show_Xfers:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>m_add_link_dlg</string>
+							<string>m_connection_status_text</string>
+							<string>m_dload_controller</string>
+							<string>m_main_tabview</string>
+							<string>m_search_controller</string>
+							<string>m_shared_controller</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">AppController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">AppController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">CellWithIcon</string>
+					<string key="superclassName">NSTextFieldCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="869514077">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">SourceViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">DownloadsViewController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">m_tableview</string>
+						<string key="NS.object.0">NSTableView</string>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">DownloadsViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">DownloadsViewController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">EC.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SearchViewController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">startSearch:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>m_result_list</string>
+							<string>m_search_text</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSOutlineView</string>
+							<string>NSTextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">SearchViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SearchViewController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SharedFilesViewController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">m_table_view</string>
+						<string key="NS.object.0">NSTableView</string>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">SharedFilesViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SharedFilesViewController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SourceViewController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>m_outline_view</string>
+							<string>m_tab_view</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<reference key="sourceIdentifier" ref="869514077"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">SourceViewController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBUserSource</string>
+						<string key="minorKey"/>
+					</object>
+				</object>
+			</object>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../cocoa-mule.xcodeproj</string>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/English.lproj/MainMenu.nib/keyedobjects.nib Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/Info.plist Added

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>org.amule.aMule</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>100</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>© 2009, aMule project</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/LoginDialogController.h Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/LoginDialogController.m Added

@@ -0,0 +1,53 @@
+#import "LoginDialogController.h"
+
+@implementation LoginDialogController
+
+@synthesize host = m_host;
+@synthesize pass = m_pass;
+@synthesize port = m_port;
+
+- (bool)showDlg:(NSWindow *)window {
+	if ( m_dlg == nil ) {
+		[NSBundle loadNibNamed: @"LoginDialog" owner: self];
+	}
+
+	NSString *default_host = [[NSUserDefaults standardUserDefaults] stringForKey:@"LastTargetHost"];
+	if ( default_host != nil ) {
+		[m_host_field setStringValue: default_host];
+	}
+	
+	NSString *default_port = [[NSUserDefaults standardUserDefaults] stringForKey:@"LastTargetPort"];
+	if ( default_port != nil ) {
+		[m_port_field setStringValue:[[NSUserDefaults standardUserDefaults] stringForKey:@"LastTargetPort"]];
+	}
+	[NSApp beginSheet: m_dlg modalForWindow: window
+		modalDelegate: nil didEndSelector: nil contextInfo: nil];
+					
+	[NSApp runModalForWindow: m_dlg];
+	
+	[NSApp endSheet: m_dlg];
+
+    [m_dlg orderOut: self];
+	
+	return m_dlg_result;
+}
+
+
+- (IBAction)closeCancel:(id)sender {
+	m_dlg_result = false;
+    [NSApp stopModal];
+}
+
+- (IBAction)closeOK:(id)sender {
+	m_dlg_result = true;
+	
+	m_host = [m_host_field stringValue];
+	NSString *port = [m_port_field stringValue];
+	m_port = [port intValue];
+	m_pass = [m_pass_field stringValue];
+	
+    [NSApp stopModal];
+}
+
+
+@end

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/SearchViewController.h Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/SearchViewController.mm Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/SharedFilesViewController.h Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/SharedFilesViewController.mm Added

@@ -0,0 +1,48 @@
+#import "SharedFilesViewController.h"
+
+@implementation SharedFilesViewController
+
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex {
+	id value = nil;
+	NSString *columnId = [aTableColumn identifier];
+	SharedFile *i = [m_fileset objectAtIndex:rowIndex];
+	if ( [columnId compare:@"filename"] == NSOrderedSame ) {
+		value = i.name;
+	} else if ( [columnId compare:@"size"] == NSOrderedSame ) {
+		value = [i convertWithPrefix: i.size];
+	} else if ( [columnId compare:@"xfer"] == NSOrderedSame ) {
+		value = [i convertWithPrefix: i.size_xfer];
+	} else if ( [columnId compare:@"xfer_all"] == NSOrderedSame ) {
+		value = [i convertWithPrefix: i.size_xfer_all];
+	} else if ( [columnId compare:@"prio"] == NSOrderedSame ) {
+		value = i.sprio;
+	} else {
+		value = @"ERROR: bad column id";
+	}
+	return value;
+}
+
+- (int)numberOfRowsInTableView:(NSTableView *)aTableView {
+	return [m_fileset count];
+}
+
+- (void)linkAmuleData:(amuleData *)amuledata {
+	m_amuledata = amuledata;
+	m_fileset = m_amuledata.shared;
+	[amuledata.shared setGuiController:self];
+}
+
+- (void)reload {
+	[m_table_view reloadData];
+}
+
+- (void)awakeFromNib {
+	[m_table_view setDelegate:self];
+	[m_table_view setDataSource:self];
+	
+	//
+	// load column status
+	//
+}
+
+@end

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/SourceViewController.h Added

@@ -0,0 +1,80 @@
+#import <Cocoa/Cocoa.h>
+
+@interface BaseItem : NSObject {
+	NSString *m_text;
+	
+	NSString *m_view_id;
+	
+	NSMutableArray *m_subitems;
+	int m_subitems_count;
+	
+	NSImage *m_icon;
+}
+
++ (BaseItem *) initWithText:(NSString *)text withViewId:(NSString *) viewId;
+
+- (void)activateView:(NSTabView *) view;
+
+- (int)subitemsCount;
+- (BaseItem *)itemAtIndex: (int) index;
+
+- (void)addSubItem:(BaseItem *) item;
+
+- (NSString *)text;
+- (NSString *)viewId;
+- (NSImage *)icon;
+
+@end
+
+@interface CategoryItemFactory : BaseItem
+{
+	
+}
+
++ (BaseItem *)initFilesItem;
++ (BaseItem *)initNetworksItem;
++ (BaseItem *)initSearchItem;
+
+@end
+
+enum {
+	RootItemNetwork = 0,
+	RootItemFiles,
+	RootItemSearch,
+	
+	RootItemLast
+};
+
+
+@interface amuleSourceListDataSource : NSObject
+{
+	BaseItem *g_root_items[RootItemLast];   
+}
+
++ (amuleSourceListDataSource *)initWithData;
+
+- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item;
+- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item;
+- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item;
+- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item;
+
+@end
+
+@interface CellWithIcon : NSTextFieldCell {
+@private
+    NSImage *m_icon;
+}
+
+- (NSImage *)icon;
+- (void)setIcon:(NSImage *)icon;
+
+
+
+@end
+
+@interface SourceViewController : NSObject {
+    IBOutlet id m_outline_view;
+    IBOutlet id m_tab_view;
+}
+
+@end

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/SourceViewController.m Added

@@ -0,0 +1,285 @@
+#import "SourceViewController.h"
+
+@implementation BaseItem
+
++(BaseItem*)initWithText:(NSString *)text withViewId:(NSString *) viewId {
+	BaseItem *node = [[BaseItem alloc] init];
+	node->m_text = [NSString stringWithString:text];
+	[node->m_text retain];
+	
+	node->m_subitems = [NSMutableArray arrayWithCapacity:16];
+	[node->m_subitems retain];
+	node->m_subitems_count = 0;
+	
+	node->m_view_id = viewId;
+	if ( viewId != nil ) {
+		[node->m_view_id retain];
+	}       
+	
+	
+//	NSString* imageName = [[NSBundle mainBundle] pathForResource:@"Client_Transfer" ofType:@"png"];
+//	NSImage* imageObj = [[NSImage alloc] initWithContentsOfFile:imageName];
+	NSString *imageName = @"Client_Transfer";
+	NSImage* imageObj = [NSImage imageNamed:imageName];
+	[imageObj retain];
+	assert(imageObj);
+	node->m_icon = imageObj;
+	
+	return node;
+}
+
+- (void)dealloc
+{
+	[m_text release];
+	[m_subitems release];
+	
+	[super dealloc];
+}
+
+-(int)subitemsCount {
+	return m_subitems_count;
+}
+
+- (NSString *)text {
+	return m_text;
+}
+
+- (NSString *)viewId {
+	return m_view_id;
+}
+
+- (NSImage *)icon {
+	return m_icon;
+}
+
+- (BaseItem*)itemAtIndex: (int) index {
+	if ( m_subitems_count ) {
+		return [m_subitems objectAtIndex:index];
+	}
+	return nil;
+}
+
+- (void)activateView:(NSTabView *) view {
+}
+
+- (void)addSubItem:(BaseItem *) item {
+	[m_subitems insertObject:item atIndex:m_subitems_count];
+	m_subitems_count++;
+}
+
+@end
+
+@implementation CategoryItemFactory
+
++ (BaseItem *)initFilesItem {
+	BaseItem *it = [BaseItem initWithText:@"Files" withViewId:nil];
+	
+	BaseItem *all = [BaseItem initWithText:@"All files" withViewId:@"all"];
+	BaseItem *dl = [BaseItem initWithText:@"Downloads" withViewId:@"downloads"];
+	BaseItem *ul = [BaseItem initWithText:@"Uploads" withViewId:@"upload"];
+	BaseItem *sh = [BaseItem initWithText:@"Shared" withViewId:@"shared"];
+	
+	[it addSubItem:all];
+	[it addSubItem:dl];
+	[it addSubItem:ul];
+	[it addSubItem:sh];
+	
+	return it;
+}
+
++ (BaseItem *)initNetworksItem {
+	BaseItem *it = [BaseItem initWithText:@"Networks" withViewId:nil];
+	return it;
+}
+
++ (BaseItem *)initSearchItem {
+	BaseItem *it = [BaseItem initWithText:@"Search" withViewId:nil];
+	return it;
+}
+
+
+@end
+
+@implementation amuleSourceListDataSource
+
++ (amuleSourceListDataSource *)initWithData {
+	amuleSourceListDataSource *obj = [[amuleSourceListDataSource alloc] init];
+	obj->g_root_items[RootItemFiles] = [CategoryItemFactory initFilesItem];
+	obj->g_root_items[RootItemNetwork] = [CategoryItemFactory initNetworksItem];
+	obj->g_root_items[RootItemSearch] = [CategoryItemFactory initSearchItem];
+	
+	return obj;
+}
+
+- (int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
+{
+	if ( item == nil ) {
+		return RootItemLast;
+	}
+	return [item subitemsCount];
+}
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
+{
+	if ( item == nil ) {
+		return YES;
+	}
+	return [item subitemsCount] ? YES : NO;
+}
+
+- (id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
+{
+	if ( item == nil ) {
+		return g_root_items[index];
+	}
+	return [item itemAtIndex: index];
+}
+
+- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item 
+{
+	NSString *columnId = [tableColumn identifier];
+	if ( [columnId compare:@"status"] == NSOrderedSame ) {
+		return nil;
+	}
+	NSString *s = [item text];
+	return s;
+}
+@end
+
+
+@implementation CellWithIcon
+
+- (id)init {
+    self = [super init];
+    if (self != nil) {
+        [self setLineBreakMode:NSLineBreakByTruncatingTail];
+    }
+    return self;
+}
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+    self = [super initWithCoder:aDecoder];
+    return self;
+}
+
+- (id)copyWithZone:(NSZone *)zone {
+    CellWithIcon *result = [super copyWithZone:zone];
+    if (result != nil) {
+        result->m_icon = nil;
+        [result setIcon:[self icon]];
+    }
+    return result;
+}
+
+- (void)dealloc {
+    [m_icon release];
+    [super dealloc];
+}
+
+- (NSImage *)icon {
+    return m_icon;
+}
+
+- (void)setIcon:(NSImage *)icon {
+    if (icon != m_icon) {
+        [m_icon release];
+        m_icon = [icon retain];
+    }
+}
+
+
+#define PADDING_BEFORE_IMAGE 5.0
+#define PADDING_BETWEEN_TITLE_AND_IMAGE 4.0
+
+
+- (NSRect)imageRectForBounds:(NSRect)bounds {
+    NSRect result = bounds;
+
+    result.origin.x += PADDING_BEFORE_IMAGE;
+
+	result.size = [m_icon size];
+	
+    return result;
+}
+
+- (NSRect)titleRectForBounds:(NSRect)bounds {
+    NSAttributedString *text = [self attributedStringValue];
+    NSRect result = bounds;
+	NSRect icon_size;
+	icon_size.size = [m_icon size];
+
+    result.origin.x += PADDING_BEFORE_IMAGE + icon_size.size.width + PADDING_BETWEEN_TITLE_AND_IMAGE;
+
+    if (text != nil) {
+        result.size = [text size];
+    } else {
+        result.size = NSZeroSize;
+    }
+
+    CGFloat maxX = NSMaxX(bounds) - icon_size.size.height;
+    CGFloat maxWidth = maxX - NSMinX(result);
+    if (maxWidth < 0) {
+		maxWidth = 0;
+	}
+    result.size.width = MIN(NSWidth(result), maxWidth);
+    return result;
+}
+
+- (void)drawInteriorWithFrame:(NSRect)bounds inView:(NSView *)controlView {
+	
+    NSRect imageRect = [self imageRectForBounds:bounds];
+
+	[m_icon setFlipped:[controlView isFlipped]];
+	[m_icon drawInRect:imageRect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0];
+	
+    NSRect titleRect = [self titleRectForBounds:bounds];
+    NSAttributedString *title = [self attributedStringValue];
+    if ([title length] > 0) {
+        [title drawInRect:titleRect];
+    }
+	
+}
+
+@end
+
+@implementation SourceViewController
+
+- (void)awakeFromNib {
+	[m_outline_view setDelegate:self];
+	
+	id datasource = [amuleSourceListDataSource initWithData];
+
+	[m_outline_view setDataSource:datasource];
+	[m_outline_view reloadData];
+
+	int i;
+	for(i = 0; i < [m_outline_view numberOfRows];i++) {
+		id item = [m_outline_view itemAtRow:i];
+		[m_outline_view expandItem:item];
+	}
+	
+}
+
+- (void)outlineViewSelectionDidChange:(NSNotification *)notification {
+	int selRow = [m_outline_view selectedRow];
+	id item = [m_outline_view itemAtRow:selRow];
+	id viewId = [item viewId];
+	NSLog(@"select tab=%@\n", viewId);
+	
+	[m_tab_view selectTabViewItemWithIdentifier:viewId]; 
+}
+
+- (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item {
+	id viewId = [item viewId];
+	return (viewId == nil) ? NO : YES;
+}
+
+- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item {
+//    if (tableColumn && [[tableColumn identifier] isEqualToString:@"status"]) {
+	NSImage *icon = [item icon];
+	if ( [cell isKindOfClass:[CellWithIcon class]] ) {
+		[cell setIcon:icon];
+    }
+}
+
+@end

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/amuleData.h Added

@@ -0,0 +1,180 @@
+#import <Cocoa/Cocoa.h>
+
+#import "EC.h"
+
+@interface amuleFile : NSObject {
+	NSString *m_name;
+	uint64_t m_size;
+
+	MD5Data m_hash;
+}
+
+- (unsigned)hash;
+- (NSString *)key;
+- (BOOL)isEqual: (id) object;
+
+- (NSString *)convertWithPrefix:(uint64_t)number;
+
+@property (readonly) NSString *name;
+@property (readonly) uint64_t size;
+
+@end
+
+@interface DownloadingFile : amuleFile {	
+	int m_src_count;
+	int m_non_current_src_count;
+	int m_xfer_src_count;
+	int m_a4af_src_count;
+	
+	uint64_t m_size_done;
+	uint64_t m_size_xfer;
+	
+	int m_prio;
+	bool m_auto_prio;
+	
+	int m_speed;
+	
+}
+
++ (id)createFromEC:(ECTagMD5 *) tag;
+
+- (void)updateFromEC:(ECTagMD5 *) tag;
+
+- (NSString *)prioToString:(int)prio;
+
+@property (readonly) int src_count;
+@property (readonly) int non_current_src_count;
+@property (readonly) int xfer_src_count;
+@property (readonly) int a4af_src_count;
+
+@property (readonly) int speed;
+
+@property (readonly) uint64_t size_done;
+@property (readonly) uint64_t size_xfer;
+
+@property (readonly) int prio;
+@property (copy, readonly) NSString * sprio;
+
+@end
+
+@interface SearchFile : amuleFile {
+	int m_src_count;
+	int m_complete_src_count;
+	
+	bool m_known;
+}
+
+
++ (id)createFromEC:(ECTagMD5 *) tag;
+
+- (void)updateFromEC:(ECTagMD5 *) tag;
+
+@property (readonly) int src_count;
+@property (readonly) int complete_src_count;
+
+@end
+
+@interface SharedFile : amuleFile {	
+	int m_req_count;
+	int m_req_count_all;
+	int m_accept_count;
+	int m_accept_count_all;
+	
+	uint64_t m_size_xfer;
+	uint64_t m_size_xfer_all;
+	
+	int m_prio;
+	bool m_auto_prio;	
+}
+
++ (id)createFromEC:(ECTagMD5 *) tag;
+
+- (void)updateFromEC:(ECTagMD5 *) tag;
+
+- (NSString *)prioToString:(int)prio;
+
+@property (readonly) int req_count;
+@property (readonly) int req_count_all;
+@property (readonly) int accept_count;
+@property (readonly) int accept_count_all;
+
+@property (readonly) uint64_t size_xfer;
+@property (readonly) uint64_t size_xfer_all;
+
+@property (readonly) int prio;
+@property (copy, readonly) NSString * sprio;
+
+@end
+
+@interface amuleFileSet : NSObject {
+	NSMutableDictionary *m_file_dict;
+	NSMutableArray *m_file_array;
+	
+	id m_gui_controller;
+}
+
+- (id)init;
+
+- (int)count;
+
+- (void)insertObject:(id)object;
+
+- (id)objectAtIndex:(int)index;
+- (id)objectForKey:(id)key;
+
+- (void)removeAtIndex:(int)index;
+- (void)removeAtKey:(id)key;
+
+- (void)setGuiController:(id)controller;
+
+- (void)reloadGui;
+
+@end
+
+@interface amuleData : NSObject {
+
+	//
+	// Core status
+	//
+	uint32_t m_ed2k_id;
+	bool m_ed2k_connected;
+	bool m_kad_connected;
+	NSString *m_ed2k_server;
+	int m_down_speed;
+	int m_up_speed;
+
+	amuleFileSet *m_downloads;
+	amuleFileSet *m_shared;
+
+	//
+	// Search info
+	//
+	bool m_search_running;
+	amuleFileSet *m_search_results;
+
+	ECRemoteConnection *m_connection;
+}
+
++ (id)initWithConnection:(ECRemoteConnection *) connection;
+
+//
+// Binding to EC
+//
+- (void)handlePacket:(ECPacket *) packet;
+- (void)handleError;
+
+- (void)handleDownloadQueueUpdate:(ECPacket *) packet;
+- (void)handleSharedFilesUpdate:(ECPacket *) packet;
+- (void)handleSearchUpdate:(ECPacket *) packet;
+
+- (void)handleStatusUpdate:(ECPacket *) packet;
+
+- (void)startSearch:(NSString *)text searchType:(EC_SEARCH_TYPE)searchType
+	minSize:(uint64_t)minSize maxSize:(uint64_t)maxSize avail:(uint32_t)avail;
+- (void)stopSearch;
+
+@property (readonly) amuleFileSet *downloads;
+@property (readonly) amuleFileSet *shared;
+@property (readonly) amuleFileSet *search_resuls;
+
+@end

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/amuleData.mm Added

@@ -0,0 +1,490 @@
+
+#import "amuleData.h"
+
+@implementation amuleFile
+
+@synthesize name = m_name;
+@synthesize size = m_size;
+
+- (unsigned)hash {
+	return m_hash.lo ^ m_hash.hi;
+}
+
+- (NSString *)key {
+	NSString *s = [NSString stringWithFormat:@"%qx%qx", m_hash.hi, m_hash.lo];
+	return s;
+}
+
+- (BOOL)isEqual: (id) object {
+	if ([object isKindOfClass:[amuleFile class]]) {
+		amuleFile *myobj = (amuleFile *)object;
+		return ((myobj->m_hash.lo == m_hash.lo) && (myobj->m_hash.hi == m_hash.hi));
+	} else {
+		return false;
+	}
+}
+
+- (NSString *)convertWithPrefix:(uint64_t)number {
+	NSString *res = nil;
+	double dnum = number;
+	if ( number < 1024 ) { // bytes
+		res = [NSString stringWithFormat:@"%llu bytes", number]; 
+	} else if ( number < 1024*1024 ) { // K
+		res = [NSString stringWithFormat:@"%0.2f Kb", dnum / 1024.0]; 
+	} else if ( number < 1024*1024*1024 ) { // M
+		res = [NSString stringWithFormat:@"%.2f Mb", dnum / 1048576.0]; 
+	} else {
+		res = [NSString stringWithFormat:@"%.2f Gb", dnum / 1073741824.0]; 
+	}
+	return res;
+}
+
+
+@end
+
+@implementation DownloadingFile
+
+@synthesize src_count = m_src_count;
+@synthesize non_current_src_count = m_non_current_src_count;
+@synthesize xfer_src_count = m_xfer_src_count;
+@synthesize a4af_src_count = m_a4af_src_count;
+
+@synthesize speed = m_speed;
+
+@synthesize size_done = m_size_done;
+@synthesize size_xfer = m_size_xfer;
+
+@synthesize prio = m_prio;
+
+@dynamic sprio;
+
+- (NSString *)sprio {
+	return [self prioToString: m_prio];
+}
+
+
++ (id)createFromEC: (ECTagMD5 *) tag {
+	DownloadingFile *obj = [[DownloadingFile alloc] init];
+	
+	obj->m_hash = [tag getMD5Data];
+	
+	ECTag *nametag = [tag tagByName: EC_TAG_PARTFILE_NAME];
+	ECTagString *stag = (ECTagString *)nametag;
+	obj->m_name = stag.stringValue;;
+	
+	obj->m_size = [tag tagInt64ByName: EC_TAG_PARTFILE_SIZE_FULL];
+	NSLog(@"[EC]: added partfile [%@]\n", obj->m_name);
+	[obj updateFromEC:tag];
+	
+	return obj;
+}
+
+- (void)updateFromEC:(ECTagMD5 *) tag {
+	NSLog(@"[EC]: updating partfile [%@]\n", m_name);
+	
+	m_size_done = [tag tagInt64ByName: EC_TAG_PARTFILE_SIZE_DONE];
+	m_size_xfer = [tag tagInt64ByName:EC_TAG_PARTFILE_SIZE_XFER];
+	
+	m_speed = [tag tagInt64ByName:EC_TAG_PARTFILE_SPEED];
+	
+	m_src_count = [tag tagInt64ByName: EC_TAG_PARTFILE_SOURCE_COUNT];
+	m_non_current_src_count = [tag tagInt64ByName: EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT];
+	m_xfer_src_count = [tag tagInt64ByName: EC_TAG_PARTFILE_SOURCE_COUNT_XFER];
+	m_a4af_src_count = [tag tagInt64ByName: EC_TAG_PARTFILE_SOURCE_COUNT_A4AF];
+
+	m_prio = [tag tagInt64ByName:EC_TAG_PARTFILE_PRIO];
+	if ( m_prio > 10 ) {
+		m_auto_prio = true;
+		m_prio -= 10;
+	} else {
+		m_auto_prio = false;
+	}
+}
+
+- (NSString *)prioToString:(int)prio {
+	NSString *s = nil;
+	switch (prio) {
+		case 0:
+			s = @"Low";
+			break;
+		case 1:
+			s = @"Normal";
+			break;
+		case 2:
+			s = @"High";
+			break;
+		case 3:
+			s = @"Very High";
+			break;
+		case 4:
+			s = @"Very Low";
+			break;
+		case 5:
+			s = @"Auto";
+			break;
+		case 6:
+			s = @"PowerShare";
+			break;
+		default:
+			break;
+	}
+	if ( m_auto_prio ) {
+		s = [s stringByAppendingString:@" (auto)"];
+	}
+	return s;
+}
+
+
+@end
+
+@implementation SearchFile
+
+@synthesize src_count = m_src_count;
+@synthesize complete_src_count = m_complete_src_count;
+
++ (id)createFromEC: (ECTagMD5 *) tag {
+	SearchFile *obj = [[SearchFile alloc] init];
+	
+	obj->m_hash = [tag getMD5Data];
+
+	ECTag *nametag = [tag tagByName: EC_TAG_PARTFILE_NAME];
+	ECTagString *stag = (ECTagString *)nametag;
+	obj->m_name = stag.stringValue;;
+
+	obj->m_size = [tag tagInt64ByName: EC_TAG_PARTFILE_SIZE_FULL];
+
+	obj->m_known = ([tag tagByName: EC_TAG_KNOWNFILE] == nil) ? false : true;
+	
+	[obj updateFromEC:tag];
+	
+	return obj;
+}
+
+- (void)updateFromEC:(ECTagMD5 *) tag {
+	m_src_count = [tag tagInt64ByName: EC_TAG_PARTFILE_SOURCE_COUNT];
+	m_complete_src_count = [tag tagInt64ByName: EC_TAG_PARTFILE_SOURCE_COUNT_XFER];
+
+}
+@end
+
+@implementation SharedFile
+
+@synthesize size_xfer = m_size_xfer;
+@synthesize size_xfer_all = m_size_xfer_all;
+
+@synthesize req_count = m_req_count;
+@synthesize req_count_all = m_req_count_all;
+
+@synthesize accept_count = m_accept_count;
+@synthesize accept_count_all = m_accept_count_all;
+
+@synthesize prio = m_prio;
+
+@dynamic sprio;
+
+- (NSString *)sprio {
+	return [self prioToString: m_prio];
+}
+
++ (id)createFromEC: (ECTagMD5 *) tag {
+	SharedFile *obj = [[SharedFile alloc] init];
+
+	obj->m_hash = [tag getMD5Data];
+	
+	ECTag *nametag = [tag tagByName: EC_TAG_PARTFILE_NAME];
+	ECTagString *stag = (ECTagString *)nametag;
+	obj->m_name = stag.stringValue;;
+	
+	obj->m_size = [tag tagInt64ByName: EC_TAG_PARTFILE_SIZE_FULL];
+		
+	[obj updateFromEC:tag];
+	
+	return obj;
+}
+
+- (NSString *)prioToString:(int)prio {
+	NSString *s = nil;
+	switch (prio) {
+		case 0:
+			s = @"Low";
+			break;
+		case 1:
+			s = @"Normal";
+			break;
+		case 2:
+			s = @"High";
+			break;
+		case 3:
+			s = @"Very High";
+			break;
+		case 4:
+			s = @"Very Low";
+			break;
+		case 5:
+			s = @"Auto";
+			break;
+		case 6:
+			s = @"PowerShare";
+			break;
+		default:
+			break;
+	}
+	if ( m_auto_prio ) {
+		s = [s stringByAppendingString:@" (auto)"];
+	}
+	return s;
+}
+
+
+- (void)updateFromEC:(ECTagMD5 *) tag {
+	m_req_count = [tag tagInt64ByName: EC_TAG_KNOWNFILE_REQ_COUNT];
+	m_req_count_all = [tag tagInt64ByName: EC_TAG_KNOWNFILE_REQ_COUNT_ALL];
+	m_accept_count = [tag tagInt64ByName: EC_TAG_KNOWNFILE_ACCEPT_COUNT];
+	m_accept_count_all = [tag tagInt64ByName: EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL];
+	
+	m_size_xfer = [tag tagInt64ByName: EC_TAG_KNOWNFILE_XFERRED];
+	m_size_xfer_all = [tag tagInt64ByName: EC_TAG_KNOWNFILE_XFERRED_ALL];
+	
+	m_prio = [tag tagInt64ByName:EC_TAG_PARTFILE_PRIO];
+	if ( m_prio > 10 ) {
+		m_auto_prio = true;
+		m_prio -= 10;
+	} else {
+		m_auto_prio = false;
+	}
+	
+}
+
+@end
+
+@implementation amuleFileSet
+
+- (id)init {
+    if ((self = [super init])) {
+		m_file_dict = [NSMutableDictionary dictionaryWithCapacity:256];
+		m_file_array = [[NSMutableArray alloc] init];
+	}
+	return self;
+}
+
+- (int)count {
+	return [m_file_dict count];
+}
+
+- (void)insertObject:(id)object {
+	id objKey = [object key];
+	[m_file_dict setObject:object forKey:objKey];
+	[m_file_array addObject:object];
+	
+	[self reloadGui];
+}
+
+- (void)reloadGui {
+	if ([m_gui_controller respondsToSelector:@selector(reload:)]) {
+		[m_gui_controller performSelector:@selector(reload:)];
+	} else {
+		NSLog(@"Internal error: gui controller doesnt respond to 'reload'\n");
+	}
+//	if ([m_gui_controller respondsToSelector:[m_gui_controller reload]) {
+//		[m_gui_controller performSelector:@selector(reload)];
+//	} else {
+//		NSLog(@"Internal error: gui controller doesnt respond to 'reload'\n");
+//	}
+}
+
+- (id)objectAtIndex:(int)index {
+	return [m_file_array objectAtIndex:index];
+}
+
+- (id)objectForKey:(id)key {
+	return [m_file_dict objectForKey:key];
+}
+
+- (void)removeAtIndex:(int)index {
+	id curr_obj = [m_file_array objectAtIndex:index];
+	id key = [curr_obj key];
+	[m_file_dict removeObjectForKey:key];
+	[m_file_array removeObjectAtIndex:index];
+
+	[self reloadGui];
+}
+
+- (void)removeAtKey:(id)key {
+	[m_file_dict removeObjectForKey:key];
+	int index = -1;
+	for (int i = 0; i < [m_file_array count]; i++) {
+		id curr_obj = [m_file_array objectAtIndex:i];
+		if ([curr_obj key] == key) {
+			index = i;
+			break;
+		}
+	}
+	if ( index != -1 ) {
+		[m_file_array removeObjectAtIndex:index];
+	} else {
+		NSLog(@"Internal error: object not found in array\n");
+	}
+
+	[self reloadGui];
+}
+
+- (void)setGuiController:(id)controller {
+	m_gui_controller = controller;
+}
+
+@end
+
+@implementation amuleData
+
+@synthesize downloads = m_downloads;
+@synthesize shared = m_shared;
+@synthesize search_resuls = m_search_results;
+
++ (id)initWithConnection:(ECRemoteConnection *) connection {
+	amuleData *obj = [[amuleData alloc] init];
+	connection.delegate = obj;
+	
+	obj->m_connection = connection;
+	
+	obj->m_downloads = [[amuleFileSet alloc] init];
+	obj->m_shared = [[amuleFileSet alloc] init];
+	obj->m_search_results = [[amuleFileSet alloc] init];
+	 
+	return obj;
+}
+
+- (void)handlePacket:(ECPacket *) packet {
+	switch(packet.opcode) {
+		case EC_OP_STATS : {
+			break;
+		}
+		case EC_OP_DLOAD_QUEUE: {
+			[self handleDownloadQueueUpdate: packet];
+			break;
+		}
+		case EC_OP_SHARED_FILES: {
+			[self handleSharedFilesUpdate: packet];
+			break;
+		}
+		case EC_OP_SEARCH_RESULTS: {
+			[self handleSearchUpdate: packet];
+			break;
+		}
+		default: {
+			NSLog(@"[EC] packet with opcode %d not handled\n", packet.opcode);
+		}
+	}
+}
+
+- (void)handleError {
+		NSRunCriticalAlertPanel(@"Daemon communication error", 
+						@"Connection with core daemon (amuled) failed",
+						@"Quit", nil,nil);
+		exit(-1);
+}
+
+- (void)handleDownloadQueueUpdate:(ECPacket *) packet {
+	for (ECTag *t in packet.subtags) {
+		if ( [t isKindOfClass:[ECTagMD5 class]] ) {
+			ECTagMD5 *tag = (ECTagMD5 *)t;
+			if ( [tag tagCount] == 0 ) {
+				//
+				// Only hash here - indication to remove the object
+				//
+				[m_downloads removeAtKey:[tag stringKey]];
+			} else {
+				NSLog(@"[EC] filehash=[%@]\n", [tag stringKey]);
+				DownloadingFile *file = [m_downloads objectForKey:[tag stringKey]];
+				if ( file == nil ) {
+					file = [DownloadingFile createFromEC:tag];
+					[m_downloads insertObject:file];
+				} else {
+					DownloadingFile *file = [m_downloads objectForKey:[tag stringKey]];
+					[file updateFromEC:tag];
+				}
+			}
+		} else {
+			NSLog(@"[EC] bad tag type '%s'\n", [t class]);
+		}
+	}
+}
+
+- (void)handleSharedFilesUpdate:(ECPacket *) packet {
+	for (ECTag *t in packet.subtags) {
+		if ( [t isKindOfClass:[ECTagMD5 class]] ) {
+			ECTagMD5 *tag = (ECTagMD5 *)t;
+			if ( [tag tagCount] == 0 ) {
+				//
+				// Only hash here - indication to remove the object
+				//
+				[m_shared removeAtKey:[tag stringKey]];
+			} else {
+				NSLog(@"[EC] filehash=[%@]\n", [tag stringKey]);
+				SharedFile *file = [m_shared objectForKey:[tag stringKey]];
+				if ( file == nil ) {
+					file = [SharedFile createFromEC:tag];
+					[m_shared insertObject:file];
+				} else {
+					SharedFile *file = [m_shared objectForKey:[tag stringKey]];
+					[file updateFromEC:tag];
+				}
+			}
+		} else {
+			NSLog(@"[EC] bad tag type '%s'\n", [t class]);
+		}
+	}
+}
+
+- (void)handleSearchUpdate:(ECPacket *) packet {
+	for (ECTag *t in packet.subtags) {
+		if ( [t isKindOfClass:[ECTagMD5 class]] ) {
+			ECTagMD5 *tag = (ECTagMD5 *)t;
+			SearchFile *file = [m_search_results objectForKey:[tag stringKey]];
+			if ( file == nil ) {
+				file = [SearchFile createFromEC:tag];
+				[m_search_results insertObject:file];
+			} else {
+				SearchFile *file = [m_search_results objectForKey:[tag stringKey]];
+				[file updateFromEC:tag];
+			}
+		}
+	}
+}
+
+- (void)handleStatusUpdate:(ECPacket *) packet {
+}
+
+- (void)startSearch:(NSString *)text searchType:(EC_SEARCH_TYPE)searchType
+	minSize:(uint64_t)minSize maxSize:(uint64_t)maxSize avail:(uint32_t)avail {
+
+	ECPacket *packet = [ECPacket packetWithOpcode:EC_OP_SEARCH_START];
+
+	ECTagInt8 *searchtag = [ECTagInt8 tagFromInt8:searchType withName:EC_TAG_SEARCH_TYPE];
+
+	[searchtag.subtags addObject:[ECTagString tagFromString:text withName:EC_TAG_SEARCH_NAME]];
+	if ( minSize ) {
+		[searchtag.subtags addObject:[ECTagInt64 tagFromInt64:minSize withName:EC_TAG_SEARCH_MIN_SIZE]];
+	}
+	if ( maxSize ) {
+		[searchtag.subtags addObject:[ECTagInt64 tagFromInt64:maxSize withName:EC_TAG_SEARCH_MAX_SIZE]];
+	}
+	if ( avail ) {
+		[searchtag.subtags addObject:[ECTagInt32 tagFromInt32:avail withName:EC_TAG_SEARCH_AVAILABILITY]];
+	}
+	
+	[packet.subtags addObject:searchtag];
+	
+	[m_connection sendPacket:packet];
+	
+	m_search_running = true;
+}
+
+- (void)stopSearch {
+	ECPacket *packet = [ECPacket packetWithOpcode:EC_OP_SEARCH_STOP];
+
+	[m_connection sendPacket:packet];
+	
+	m_search_running = false;
+}
+
+@end

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/cocoa-mule.xcodeproj Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/cocoa-mule.xcodeproj/project.pbxproj Added

@@ -0,0 +1,557 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 44;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; };
+		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
+		8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
+		8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
+		B201E59A0F77F945002001E0 /* BWToolkitFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B203F8B10F719AE100054498 /* BWToolkitFramework.framework */; };
+		B203F8EF0F719B4C00054498 /* BWToolkitFramework.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = B203F8B10F719AE100054498 /* BWToolkitFramework.framework */; };
+		B20467430F20DD1E00972AD8 /* AddLinkDialogController.m in Sources */ = {isa = PBXBuildFile; fileRef = B20467420F20DD1E00972AD8 /* AddLinkDialogController.m */; };
+		B20E7E300EFD313400EF0D8D /* LoginDialog.nib in Resources */ = {isa = PBXBuildFile; fileRef = B20E7E2F0EFD313400EF0D8D /* LoginDialog.nib */; };
+		B20E7E360EFD322C00EF0D8D /* LoginDialogController.m in Sources */ = {isa = PBXBuildFile; fileRef = B20E7E350EFD322C00EF0D8D /* LoginDialogController.m */; };
+		B228A7A60E7C426B009B94B4 /* EC.mm in Sources */ = {isa = PBXBuildFile; fileRef = B228A7A50E7C426B009B94B4 /* EC.mm */; };
+		B2499CA70E7CBBF400F67575 /* Client_A4AFNoNeededPartsQueueFull.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C7E0E7CBBF400F67575 /* Client_A4AFNoNeededPartsQueueFull.png */; };
+		B2499CA80E7CBBF400F67575 /* Client_aMule.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C7F0E7CBBF400F67575 /* Client_aMule.png */; };
+		B2499CA90E7CBBF400F67575 /* Client_BadGuy.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C800E7CBBF400F67575 /* Client_BadGuy.png */; };
+		B2499CAA0E7CBBF400F67575 /* Client_CommentOnly.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C810E7CBBF400F67575 /* Client_CommentOnly.png */; };
+		B2499CAB0E7CBBF400F67575 /* Client_Connecting.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C820E7CBBF400F67575 /* Client_Connecting.png */; };
+		B2499CAC0E7CBBF400F67575 /* Client_CreditsGrey.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C830E7CBBF400F67575 /* Client_CreditsGrey.png */; };
+		B2499CAD0E7CBBF400F67575 /* Client_CreditsYellow.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C840E7CBBF400F67575 /* Client_CreditsYellow.png */; };
+		B2499CAE0E7CBBF400F67575 /* Client_eDonkeyHybrid.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C850E7CBBF400F67575 /* Client_eDonkeyHybrid.png */; };
+		B2499CAF0E7CBBF400F67575 /* Client_eMule.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C860E7CBBF400F67575 /* Client_eMule.png */; };
+		B2499CB00E7CBBF400F67575 /* Client_Encrypted.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C870E7CBBF400F67575 /* Client_Encrypted.png */; };
+		B2499CB10E7CBBF400F67575 /* Client_ExcellentRatingOnFile.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C880E7CBBF400F67575 /* Client_ExcellentRatingOnFile.png */; };
+		B2499CB20E7CBBF400F67575 /* Client_ExtendedProtocol.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C890E7CBBF400F67575 /* Client_ExtendedProtocol.png */; };
+		B2499CB30E7CBBF400F67575 /* Client_FairRatingOnFile.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C8A0E7CBBF400F67575 /* Client_FairRatingOnFile.png */; };
+		B2499CB40E7CBBF400F67575 /* Client_Friend.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C8B0E7CBBF400F67575 /* Client_Friend.png */; };
+		B2499CB50E7CBBF400F67575 /* Client_GoodRatingOnFile.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C8C0E7CBBF400F67575 /* Client_GoodRatingOnFile.png */; };
+		B2499CB60E7CBBF400F67575 /* Client_InvalidRatingOnFile.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C8D0E7CBBF400F67575 /* Client_InvalidRatingOnFile.png */; };
+		B2499CB70E7CBBF400F67575 /* Client_lphant.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C8E0E7CBBF400F67575 /* Client_lphant.png */; };
+		B2499CB80E7CBBF400F67575 /* Client_mlDonkey.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C8F0E7CBBF400F67575 /* Client_mlDonkey.png */; };
+		B2499CB90E7CBBF400F67575 /* Client_OnQueue.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C900E7CBBF400F67575 /* Client_OnQueue.png */; };
+		B2499CBA0E7CBBF400F67575 /* Client_PoorRatingOnFile.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C910E7CBBF400F67575 /* Client_PoorRatingOnFile.png */; };
+		B2499CBB0E7CBBF400F67575 /* Client_SecIdent.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C920E7CBBF400F67575 /* Client_SecIdent.png */; };
+		B2499CBC0E7CBBF400F67575 /* Client_Shareaza.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C930E7CBBF400F67575 /* Client_Shareaza.png */; };
+		B2499CBD0E7CBBF400F67575 /* Client_StatusUnknown.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C940E7CBBF400F67575 /* Client_StatusUnknown.png */; };
+		B2499CBE0E7CBBF400F67575 /* Client_Transfer.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C950E7CBBF400F67575 /* Client_Transfer.png */; };
+		B2499CBF0E7CBBF400F67575 /* Client_Unknown.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C960E7CBBF400F67575 /* Client_Unknown.png */; };
+		B2499CC00E7CBBF400F67575 /* Client_Upload.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C970E7CBBF400F67575 /* Client_Upload.png */; };
+		B2499CC10E7CBBF400F67575 /* Client_xMule.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C980E7CBBF400F67575 /* Client_xMule.png */; };
+		B2499CC30E7CBBF400F67575 /* Toolbar_About.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C9A0E7CBBF400F67575 /* Toolbar_About.png */; };
+		B2499CC40E7CBBF400F67575 /* Toolbar_Blink.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C9B0E7CBBF400F67575 /* Toolbar_Blink.png */; };
+		B2499CC50E7CBBF400F67575 /* Toolbar_Connect.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C9C0E7CBBF400F67575 /* Toolbar_Connect.png */; };
+		B2499CC60E7CBBF400F67575 /* Toolbar_Connecting.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C9D0E7CBBF400F67575 /* Toolbar_Connecting.png */; };
+		B2499CC70E7CBBF400F67575 /* Toolbar_Disconnect.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C9E0E7CBBF400F67575 /* Toolbar_Disconnect.png */; };
+		B2499CC80E7CBBF400F67575 /* Toolbar_Import.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499C9F0E7CBBF400F67575 /* Toolbar_Import.png */; };
+		B2499CC90E7CBBF400F67575 /* Toolbar_Messages.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499CA00E7CBBF400F67575 /* Toolbar_Messages.png */; };
+		B2499CCA0E7CBBF400F67575 /* Toolbar_Network.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499CA10E7CBBF400F67575 /* Toolbar_Network.png */; };
+		B2499CCB0E7CBBF400F67575 /* Toolbar_Prefs.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499CA20E7CBBF400F67575 /* Toolbar_Prefs.png */; };
+		B2499CCC0E7CBBF400F67575 /* Toolbar_Search.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499CA30E7CBBF400F67575 /* Toolbar_Search.png */; };
+		B2499CCD0E7CBBF400F67575 /* Toolbar_Shared.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499CA40E7CBBF400F67575 /* Toolbar_Shared.png */; };
+		B2499CCE0E7CBBF400F67575 /* Toolbar_Stats.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499CA50E7CBBF400F67575 /* Toolbar_Stats.png */; };
+		B2499CCF0E7CBBF400F67575 /* Toolbar_Transfers.png in Resources */ = {isa = PBXBuildFile; fileRef = B2499CA60E7CBBF400F67575 /* Toolbar_Transfers.png */; };
+		B253EAAB0F87465E000EC011 /* SharedFilesViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B253EAA90F87465E000EC011 /* SharedFilesViewController.mm */; };
+		B257A4550F1A7AD800DC958E /* SearchViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B257A4540F1A7AD800DC958E /* SearchViewController.mm */; };
+		B291B8130F7E122500FF9F46 /* SourceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B291B8110F7E122500FF9F46 /* SourceViewController.m */; };
+		B2B307A40F05470200AE5E79 /* DownloadsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2B307A30F05470200AE5E79 /* DownloadsViewController.mm */; };
+		B2CDC5AD0E9541D5009370D9 /* amuleData.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2CDC5AC0E9541D5009370D9 /* amuleData.mm */; };
+		B2DD60230E7BC65400987099 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2DD60220E7BC65400987099 /* AppController.mm */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		B203F8C60F719B1F00054498 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "";
+			dstSubfolderSpec = 10;
+			files = (
+				B203F8EF0F719B4C00054498 /* BWToolkitFramework.framework in CopyFiles */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
+		29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
+		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+		29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
+		32CA4F630368D1EE00C91783 /* cocoa-mule_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "cocoa-mule_Prefix.pch"; sourceTree = "<group>"; };
+		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		8D1107320486CEB800E47090 /* cocoa-mule.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "cocoa-mule.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		B203F8B10F719AE100054498 /* BWToolkitFramework.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = BWToolkitFramework.framework; path = ../../BWToolkit/BWToolkitFramework.framework; sourceTree = SOURCE_ROOT; };
+		B20467410F20DD1E00972AD8 /* AddLinkDialogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddLinkDialogController.h; sourceTree = "<group>"; };
+		B20467420F20DD1E00972AD8 /* AddLinkDialogController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AddLinkDialogController.m; sourceTree = "<group>"; };
+		B20E7E340EFD322C00EF0D8D /* LoginDialogController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginDialogController.h; sourceTree = "<group>"; };
+		B20E7E350EFD322C00EF0D8D /* LoginDialogController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginDialogController.m; sourceTree = "<group>"; };
+		B228A7A40E7C426B009B94B4 /* EC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EC.h; sourceTree = "<group>"; };
+		B228A7A50E7C426B009B94B4 /* EC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EC.mm; sourceTree = "<group>"; };
+		B228A7BA0E7C438A009B94B4 /* ECCodes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ECCodes.h; path = ../src/libs/ec/cpp/ECCodes.h; sourceTree = SOURCE_ROOT; };
+		B228A7C70E7C43E1009B94B4 /* ECTagTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ECTagTypes.h; path = ../src/libs/ec/cpp/ECTagTypes.h; sourceTree = SOURCE_ROOT; };
+		B228A7CA0E7C441A009B94B4 /* ECVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ECVersion.h; path = ../src/libs/ec/cpp/ECVersion.h; sourceTree = SOURCE_ROOT; };
+		B2499C7E0E7CBBF400F67575 /* Client_A4AFNoNeededPartsQueueFull.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_A4AFNoNeededPartsQueueFull.png; sourceTree = "<group>"; };
+		B2499C7F0E7CBBF400F67575 /* Client_aMule.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_aMule.png; sourceTree = "<group>"; };
+		B2499C800E7CBBF400F67575 /* Client_BadGuy.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_BadGuy.png; sourceTree = "<group>"; };
+		B2499C810E7CBBF400F67575 /* Client_CommentOnly.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_CommentOnly.png; sourceTree = "<group>"; };
+		B2499C820E7CBBF400F67575 /* Client_Connecting.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_Connecting.png; sourceTree = "<group>"; };
+		B2499C830E7CBBF400F67575 /* Client_CreditsGrey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_CreditsGrey.png; sourceTree = "<group>"; };
+		B2499C840E7CBBF400F67575 /* Client_CreditsYellow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_CreditsYellow.png; sourceTree = "<group>"; };
+		B2499C850E7CBBF400F67575 /* Client_eDonkeyHybrid.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_eDonkeyHybrid.png; sourceTree = "<group>"; };
+		B2499C860E7CBBF400F67575 /* Client_eMule.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_eMule.png; sourceTree = "<group>"; };
+		B2499C870E7CBBF400F67575 /* Client_Encrypted.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_Encrypted.png; sourceTree = "<group>"; };
+		B2499C880E7CBBF400F67575 /* Client_ExcellentRatingOnFile.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_ExcellentRatingOnFile.png; sourceTree = "<group>"; };
+		B2499C890E7CBBF400F67575 /* Client_ExtendedProtocol.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_ExtendedProtocol.png; sourceTree = "<group>"; };
+		B2499C8A0E7CBBF400F67575 /* Client_FairRatingOnFile.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_FairRatingOnFile.png; sourceTree = "<group>"; };
+		B2499C8B0E7CBBF400F67575 /* Client_Friend.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_Friend.png; sourceTree = "<group>"; };
+		B2499C8C0E7CBBF400F67575 /* Client_GoodRatingOnFile.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_GoodRatingOnFile.png; sourceTree = "<group>"; };
+		B2499C8D0E7CBBF400F67575 /* Client_InvalidRatingOnFile.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_InvalidRatingOnFile.png; sourceTree = "<group>"; };
+		B2499C8E0E7CBBF400F67575 /* Client_lphant.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_lphant.png; sourceTree = "<group>"; };
+		B2499C8F0E7CBBF400F67575 /* Client_mlDonkey.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_mlDonkey.png; sourceTree = "<group>"; };
+		B2499C900E7CBBF400F67575 /* Client_OnQueue.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_OnQueue.png; sourceTree = "<group>"; };
+		B2499C910E7CBBF400F67575 /* Client_PoorRatingOnFile.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_PoorRatingOnFile.png; sourceTree = "<group>"; };
+		B2499C920E7CBBF400F67575 /* Client_SecIdent.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_SecIdent.png; sourceTree = "<group>"; };
+		B2499C930E7CBBF400F67575 /* Client_Shareaza.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_Shareaza.png; sourceTree = "<group>"; };
+		B2499C940E7CBBF400F67575 /* Client_StatusUnknown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_StatusUnknown.png; sourceTree = "<group>"; };
+		B2499C950E7CBBF400F67575 /* Client_Transfer.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_Transfer.png; sourceTree = "<group>"; };
+		B2499C960E7CBBF400F67575 /* Client_Unknown.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_Unknown.png; sourceTree = "<group>"; };
+		B2499C970E7CBBF400F67575 /* Client_Upload.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_Upload.png; sourceTree = "<group>"; };
+		B2499C980E7CBBF400F67575 /* Client_xMule.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Client_xMule.png; sourceTree = "<group>"; };
+		B2499C9A0E7CBBF400F67575 /* Toolbar_About.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_About.png; sourceTree = "<group>"; };
+		B2499C9B0E7CBBF400F67575 /* Toolbar_Blink.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_Blink.png; sourceTree = "<group>"; };
+		B2499C9C0E7CBBF400F67575 /* Toolbar_Connect.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_Connect.png; sourceTree = "<group>"; };
+		B2499C9D0E7CBBF400F67575 /* Toolbar_Connecting.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_Connecting.png; sourceTree = "<group>"; };
+		B2499C9E0E7CBBF400F67575 /* Toolbar_Disconnect.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_Disconnect.png; sourceTree = "<group>"; };
+		B2499C9F0E7CBBF400F67575 /* Toolbar_Import.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_Import.png; sourceTree = "<group>"; };
+		B2499CA00E7CBBF400F67575 /* Toolbar_Messages.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_Messages.png; sourceTree = "<group>"; };
+		B2499CA10E7CBBF400F67575 /* Toolbar_Network.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_Network.png; sourceTree = "<group>"; };
+		B2499CA20E7CBBF400F67575 /* Toolbar_Prefs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_Prefs.png; sourceTree = "<group>"; };
+		B2499CA30E7CBBF400F67575 /* Toolbar_Search.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_Search.png; sourceTree = "<group>"; };
+		B2499CA40E7CBBF400F67575 /* Toolbar_Shared.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_Shared.png; sourceTree = "<group>"; };
+		B2499CA50E7CBBF400F67575 /* Toolbar_Stats.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_Stats.png; sourceTree = "<group>"; };
+		B2499CA60E7CBBF400F67575 /* Toolbar_Transfers.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Toolbar_Transfers.png; sourceTree = "<group>"; };
+		B253EAA90F87465E000EC011 /* SharedFilesViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SharedFilesViewController.mm; sourceTree = "<group>"; };
+		B253EAAA0F87465E000EC011 /* SharedFilesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedFilesViewController.h; sourceTree = "<group>"; };
+		B257A4530F1A7AD800DC958E /* SearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchViewController.h; sourceTree = "<group>"; };
+		B257A4540F1A7AD800DC958E /* SearchViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SearchViewController.mm; sourceTree = "<group>"; };
+		B291B8110F7E122500FF9F46 /* SourceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SourceViewController.m; sourceTree = "<group>"; };
+		B291B8120F7E122500FF9F46 /* SourceViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SourceViewController.h; sourceTree = "<group>"; };
+		B29E77B50EFC357600F4C677 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/LoginDialog.nib; sourceTree = "<group>"; };
+		B2B307A20F05470200AE5E79 /* DownloadsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadsViewController.h; sourceTree = "<group>"; };
+		B2B307A30F05470200AE5E79 /* DownloadsViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DownloadsViewController.mm; sourceTree = "<group>"; };
+		B2CDC5AB0E9541D5009370D9 /* amuleData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = amuleData.h; sourceTree = "<group>"; };
+		B2CDC5AC0E9541D5009370D9 /* amuleData.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = amuleData.mm; sourceTree = "<group>"; };
+		B2DD601F0E7BC62A00987099 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = "<group>"; };
+		B2DD60220E7BC65400987099 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8D11072E0486CEB800E47090 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B201E59A0F77F945002001E0 /* BWToolkitFramework.framework in Frameworks */,
+				8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		080E96DDFE201D6D7F000001 /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				B2CDC5AB0E9541D5009370D9 /* amuleData.h */,
+				B2CDC5AC0E9541D5009370D9 /* amuleData.mm */,
+				B2B307A20F05470200AE5E79 /* DownloadsViewController.h */,
+				B2B307A30F05470200AE5E79 /* DownloadsViewController.mm */,
+				B253EAA90F87465E000EC011 /* SharedFilesViewController.mm */,
+				B253EAAA0F87465E000EC011 /* SharedFilesViewController.h */,
+				B257A4530F1A7AD800DC958E /* SearchViewController.h */,
+				B257A4540F1A7AD800DC958E /* SearchViewController.mm */,
+				B291B8110F7E122500FF9F46 /* SourceViewController.m */,
+				B291B8120F7E122500FF9F46 /* SourceViewController.h */,
+				32CA4F630368D1EE00C91783 /* cocoa-mule_Prefix.pch */,
+			);
+			name = Classes;
+			sourceTree = "<group>";
+		};
+		1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				B203F8B10F719AE100054498 /* BWToolkitFramework.framework */,
+				1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */,
+			);
+			name = "Linked Frameworks";
+			sourceTree = "<group>";
+		};
+		1058C7A2FEA54F0111CA2CBB /* Other Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				29B97324FDCFA39411CA2CEA /* AppKit.framework */,
+				13E42FB307B3F0F600E4EEF1 /* CoreData.framework */,
+				29B97325FDCFA39411CA2CEA /* Foundation.framework */,
+			);
+			name = "Other Frameworks";
+			sourceTree = "<group>";
+		};
+		19C28FACFE9D520D11CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D1107320486CEB800E47090 /* cocoa-mule.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		29B97314FDCFA39411CA2CEA /* cocoa-mule */ = {
+			isa = PBXGroup;
+			children = (
+				B2499C7D0E7CBBF400F67575 /* images */,
+				B228A7C30E7C4393009B94B4 /* EC */,
+				080E96DDFE201D6D7F000001 /* Classes */,
+				29B97315FDCFA39411CA2CEA /* GUI */,
+				29B97317FDCFA39411CA2CEA /* Resources */,
+				29B97323FDCFA39411CA2CEA /* Frameworks */,
+				19C28FACFE9D520D11CA2CBB /* Products */,
+			);
+			name = "cocoa-mule";
+			sourceTree = "<group>";
+		};
+		29B97315FDCFA39411CA2CEA /* GUI */ = {
+			isa = PBXGroup;
+			children = (
+				29B97316FDCFA39411CA2CEA /* main.m */,
+				B2DD60220E7BC65400987099 /* AppController.mm */,
+				B2DD601F0E7BC62A00987099 /* AppController.h */,
+				B20467410F20DD1E00972AD8 /* AddLinkDialogController.h */,
+				B20467420F20DD1E00972AD8 /* AddLinkDialogController.m */,
+				B20E7E350EFD322C00EF0D8D /* LoginDialogController.m */,
+				B20E7E340EFD322C00EF0D8D /* LoginDialogController.h */,
+			);
+			name = GUI;
+			sourceTree = "<group>";
+		};
+		29B97317FDCFA39411CA2CEA /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				8D1107310486CEB800E47090 /* Info.plist */,
+				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
+				29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
+				B20E7E2F0EFD313400EF0D8D /* LoginDialog.nib */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
+				1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		B228A7C30E7C4393009B94B4 /* EC */ = {
+			isa = PBXGroup;
+			children = (
+				B228A7A50E7C426B009B94B4 /* EC.mm */,
+				B228A7A40E7C426B009B94B4 /* EC.h */,
+				B228A7BA0E7C438A009B94B4 /* ECCodes.h */,
+				B228A7CA0E7C441A009B94B4 /* ECVersion.h */,
+				B228A7C70E7C43E1009B94B4 /* ECTagTypes.h */,
+			);
+			name = EC;
+			sourceTree = "<group>";
+		};
+		B2499C7D0E7CBBF400F67575 /* images */ = {
+			isa = PBXGroup;
+			children = (
+				B2499C7E0E7CBBF400F67575 /* Client_A4AFNoNeededPartsQueueFull.png */,
+				B2499C7F0E7CBBF400F67575 /* Client_aMule.png */,
+				B2499C800E7CBBF400F67575 /* Client_BadGuy.png */,
+				B2499C810E7CBBF400F67575 /* Client_CommentOnly.png */,
+				B2499C820E7CBBF400F67575 /* Client_Connecting.png */,
+				B2499C830E7CBBF400F67575 /* Client_CreditsGrey.png */,
+				B2499C840E7CBBF400F67575 /* Client_CreditsYellow.png */,
+				B2499C850E7CBBF400F67575 /* Client_eDonkeyHybrid.png */,
+				B2499C860E7CBBF400F67575 /* Client_eMule.png */,
+				B2499C870E7CBBF400F67575 /* Client_Encrypted.png */,
+				B2499C880E7CBBF400F67575 /* Client_ExcellentRatingOnFile.png */,
+				B2499C890E7CBBF400F67575 /* Client_ExtendedProtocol.png */,
+				B2499C8A0E7CBBF400F67575 /* Client_FairRatingOnFile.png */,
+				B2499C8B0E7CBBF400F67575 /* Client_Friend.png */,
+				B2499C8C0E7CBBF400F67575 /* Client_GoodRatingOnFile.png */,
+				B2499C8D0E7CBBF400F67575 /* Client_InvalidRatingOnFile.png */,
+				B2499C8E0E7CBBF400F67575 /* Client_lphant.png */,
+				B2499C8F0E7CBBF400F67575 /* Client_mlDonkey.png */,
+				B2499C900E7CBBF400F67575 /* Client_OnQueue.png */,
+				B2499C910E7CBBF400F67575 /* Client_PoorRatingOnFile.png */,
+				B2499C920E7CBBF400F67575 /* Client_SecIdent.png */,
+				B2499C930E7CBBF400F67575 /* Client_Shareaza.png */,
+				B2499C940E7CBBF400F67575 /* Client_StatusUnknown.png */,
+				B2499C950E7CBBF400F67575 /* Client_Transfer.png */,
+				B2499C960E7CBBF400F67575 /* Client_Unknown.png */,
+				B2499C970E7CBBF400F67575 /* Client_Upload.png */,
+				B2499C980E7CBBF400F67575 /* Client_xMule.png */,
+				B2499C9A0E7CBBF400F67575 /* Toolbar_About.png */,
+				B2499C9B0E7CBBF400F67575 /* Toolbar_Blink.png */,
+				B2499C9C0E7CBBF400F67575 /* Toolbar_Connect.png */,
+				B2499C9D0E7CBBF400F67575 /* Toolbar_Connecting.png */,
+				B2499C9E0E7CBBF400F67575 /* Toolbar_Disconnect.png */,
+				B2499C9F0E7CBBF400F67575 /* Toolbar_Import.png */,
+				B2499CA00E7CBBF400F67575 /* Toolbar_Messages.png */,
+				B2499CA10E7CBBF400F67575 /* Toolbar_Network.png */,
+				B2499CA20E7CBBF400F67575 /* Toolbar_Prefs.png */,
+				B2499CA30E7CBBF400F67575 /* Toolbar_Search.png */,
+				B2499CA40E7CBBF400F67575 /* Toolbar_Shared.png */,
+				B2499CA50E7CBBF400F67575 /* Toolbar_Stats.png */,
+				B2499CA60E7CBBF400F67575 /* Toolbar_Transfers.png */,
+			);
+			path = images;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		8D1107260486CEB800E47090 /* cocoa-mule */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "cocoa-mule" */;
+			buildPhases = (
+				8D1107290486CEB800E47090 /* Resources */,
+				8D11072C0486CEB800E47090 /* Sources */,
+				8D11072E0486CEB800E47090 /* Frameworks */,
+				B203F8C60F719B1F00054498 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "cocoa-mule";
+			productInstallPath = "$(HOME)/Applications";
+			productName = "cocoa-mule";
+			productReference = 8D1107320486CEB800E47090 /* cocoa-mule.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		29B97313FDCFA39411CA2CEA /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "cocoa-mule" */;
+			compatibilityVersion = "Xcode 3.0";
+			hasScannedForEncodings = 1;
+			mainGroup = 29B97314FDCFA39411CA2CEA /* cocoa-mule */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				8D1107260486CEB800E47090 /* cocoa-mule */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D1107290486CEB800E47090 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */,
+				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
+				B2499CA70E7CBBF400F67575 /* Client_A4AFNoNeededPartsQueueFull.png in Resources */,
+				B2499CA80E7CBBF400F67575 /* Client_aMule.png in Resources */,
+				B2499CA90E7CBBF400F67575 /* Client_BadGuy.png in Resources */,
+				B2499CAA0E7CBBF400F67575 /* Client_CommentOnly.png in Resources */,
+				B2499CAB0E7CBBF400F67575 /* Client_Connecting.png in Resources */,
+				B2499CAC0E7CBBF400F67575 /* Client_CreditsGrey.png in Resources */,
+				B2499CAD0E7CBBF400F67575 /* Client_CreditsYellow.png in Resources */,
+				B2499CAE0E7CBBF400F67575 /* Client_eDonkeyHybrid.png in Resources */,
+				B2499CAF0E7CBBF400F67575 /* Client_eMule.png in Resources */,
+				B2499CB00E7CBBF400F67575 /* Client_Encrypted.png in Resources */,
+				B2499CB10E7CBBF400F67575 /* Client_ExcellentRatingOnFile.png in Resources */,
+				B2499CB20E7CBBF400F67575 /* Client_ExtendedProtocol.png in Resources */,
+				B2499CB30E7CBBF400F67575 /* Client_FairRatingOnFile.png in Resources */,
+				B2499CB40E7CBBF400F67575 /* Client_Friend.png in Resources */,
+				B2499CB50E7CBBF400F67575 /* Client_GoodRatingOnFile.png in Resources */,
+				B2499CB60E7CBBF400F67575 /* Client_InvalidRatingOnFile.png in Resources */,
+				B2499CB70E7CBBF400F67575 /* Client_lphant.png in Resources */,
+				B2499CB80E7CBBF400F67575 /* Client_mlDonkey.png in Resources */,
+				B2499CB90E7CBBF400F67575 /* Client_OnQueue.png in Resources */,
+				B2499CBA0E7CBBF400F67575 /* Client_PoorRatingOnFile.png in Resources */,
+				B2499CBB0E7CBBF400F67575 /* Client_SecIdent.png in Resources */,
+				B2499CBC0E7CBBF400F67575 /* Client_Shareaza.png in Resources */,
+				B2499CBD0E7CBBF400F67575 /* Client_StatusUnknown.png in Resources */,
+				B2499CBE0E7CBBF400F67575 /* Client_Transfer.png in Resources */,
+				B2499CBF0E7CBBF400F67575 /* Client_Unknown.png in Resources */,
+				B2499CC00E7CBBF400F67575 /* Client_Upload.png in Resources */,
+				B2499CC10E7CBBF400F67575 /* Client_xMule.png in Resources */,
+				B2499CC30E7CBBF400F67575 /* Toolbar_About.png in Resources */,
+				B2499CC40E7CBBF400F67575 /* Toolbar_Blink.png in Resources */,
+				B2499CC50E7CBBF400F67575 /* Toolbar_Connect.png in Resources */,
+				B2499CC60E7CBBF400F67575 /* Toolbar_Connecting.png in Resources */,
+				B2499CC70E7CBBF400F67575 /* Toolbar_Disconnect.png in Resources */,
+				B2499CC80E7CBBF400F67575 /* Toolbar_Import.png in Resources */,
+				B2499CC90E7CBBF400F67575 /* Toolbar_Messages.png in Resources */,
+				B2499CCA0E7CBBF400F67575 /* Toolbar_Network.png in Resources */,
+				B2499CCB0E7CBBF400F67575 /* Toolbar_Prefs.png in Resources */,
+				B2499CCC0E7CBBF400F67575 /* Toolbar_Search.png in Resources */,
+				B2499CCD0E7CBBF400F67575 /* Toolbar_Shared.png in Resources */,
+				B2499CCE0E7CBBF400F67575 /* Toolbar_Stats.png in Resources */,
+				B2499CCF0E7CBBF400F67575 /* Toolbar_Transfers.png in Resources */,
+				B20E7E300EFD313400EF0D8D /* LoginDialog.nib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8D11072C0486CEB800E47090 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				8D11072D0486CEB800E47090 /* main.m in Sources */,
+				B2DD60230E7BC65400987099 /* AppController.mm in Sources */,
+				B228A7A60E7C426B009B94B4 /* EC.mm in Sources */,
+				B2CDC5AD0E9541D5009370D9 /* amuleData.mm in Sources */,
+				B20E7E360EFD322C00EF0D8D /* LoginDialogController.m in Sources */,
+				B2B307A40F05470200AE5E79 /* DownloadsViewController.mm in Sources */,
+				B257A4550F1A7AD800DC958E /* SearchViewController.mm in Sources */,
+				B20467430F20DD1E00972AD8 /* AddLinkDialogController.m in Sources */,
+				B291B8130F7E122500FF9F46 /* SourceViewController.m in Sources */,
+				B253EAAB0F87465E000EC011 /* SharedFilesViewController.mm in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				089C165DFE840E0CC02AAC07 /* English */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				29B97319FDCFA39411CA2CEA /* English */,
+			);
+			name = MainMenu.nib;
+			sourceTree = "<group>";
+		};
+		B20E7E2F0EFD313400EF0D8D /* LoginDialog.nib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				B29E77B50EFC357600F4C677 /* English */,
+			);
+			name = LoginDialog.nib;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		C01FCF4B08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../bin/BWToolkit\"",
+					"\"$(SRCROOT)/../../BWToolkit\"",
+				);
+				GCC_DEBUGGING_SYMBOLS = full;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_ENABLE_OBJC_GC = supported;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "cocoa-mule_Prefix.pch";
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(HOME)/Applications";
+				PRODUCT_NAME = "cocoa-mule";
+				WRAPPER_EXTENSION = app;
+				ZERO_LINK = YES;
+			};
+			name = Debug;
+		};
+		C01FCF4C08A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SRCROOT)/../../../bin/BWToolkit\"",
+					"\"$(SRCROOT)/../../BWToolkit\"",
+				);
+				GCC_MODEL_TUNING = G5;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "cocoa-mule_Prefix.pch";
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(HOME)/Applications";
+				PRODUCT_NAME = "cocoa-mule";
+				WRAPPER_EXTENSION = app;
+			};
+			name = Release;
+		};
+		C01FCF4F08A954540054247B /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				CURRENT_PROJECT_VERSION = 2.2;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PREBINDING = NO;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+			};
+			name = Debug;
+		};
+		C01FCF5008A954540054247B /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = (
+					ppc,
+					i386,
+				);
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PREBINDING = NO;
+				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		C01FCF4A08A954540054247B /* Build configuration list for PBXNativeTarget "cocoa-mule" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4B08A954540054247B /* Debug */,
+				C01FCF4C08A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		C01FCF4E08A954540054247B /* Build configuration list for PBXProject "cocoa-mule" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				C01FCF4F08A954540054247B /* Debug */,
+				C01FCF5008A954540054247B /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 29B97313FDCFA39411CA2CEA /* Project object */;
+}

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/cocoa-mule_Prefix.pch Added

aMule-2.3.1.tar.bz2/platforms/MacOSX/cocoa-mule/main.m Added

aMule-2.3.1.tar.bz2/platforms/Windows Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10 Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/PCH.cpp Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/PCH.h Added

@@ -0,0 +1,92 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2002-2011 Stu Redman ( sturedman@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 PCH_H
+#define PCH_H
+
+#include <wx/wxprec.h>
+
+#include <csignal>
+#include <cstring>
+#include <deque>
+#include <list>
+#include <map>
+#include <memory>
+#include <queue>
+#include <set>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+#include <zlib.h>
+
+#include "CryptoPP_Inc.h"
+
+#include "amule.h"
+#include "config.h"
+
+#include <common/ClientVersion.h>
+#include <common/EventIDs.h>
+#include <common/FileFunctions.h>
+#include <common/Format.h>
+#include <common/Macros.h>
+#include <common/MacrosProgramSpecific.h>
+#include <common/MD5Sum.h>
+#include <common/MuleDebug.h>
+#include <common/Path.h>
+#include <common/StringFunctions.h>
+#include <common/TextFile.h>
+
+#include "ClientCreditsList.h"
+#include "ClientList.h"
+#include "ClientRef.h"
+#include "ClientUDPSocket.h"
+#include "ExternalConn.h"
+#include "InternalEvents.h"
+#include "KnownFileList.h"
+#include "ListenSocket.h"
+#include "Logger.h"
+#include "MD4Hash.h"
+#include "OtherFunctions.h"
+#include "PartFile.h"
+#include "Preferences.h"
+#include "ScopedPtr.h"
+#include "Server.h"
+#include "Statistics.h"
+#include "ThreadTasks.h"
+#include "UserEvents.h"
+
+#ifndef CLIENT_GUI
+#include "kademlia/kademlia/Kademlia.h"
+#include "kademlia/kademlia/Prefs.h"
+#include "IPFilter.h"
+#endif
+
+#ifndef AMULE_DAEMON
+#include "amuleDlg.h"
+#include "muuli_wdr.h"
+#endif
+
+#endif

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/README - MSVC.txt Added

@@ -0,0 +1,80 @@
+How to build aMule with Visual Studio 2010 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. 
+
+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 
+with some generated files. 
+
+The solution expects to find the following items:
+
+* wxWidgets ( http://www.wxwidgets.org ) at a specific location: ..\..\wxWidgets\ from the solution directory.
+* crypto++ ( http://www.cryptopp.com/ ) at a specific location: ..\..\cryptopp\ from the solution directory.
+
+
+This means you must create a folder where you will compile aMule, and it must have this structure:
+
+- <Root folder> - Your main folder. You can name it whatever you want.
+ | 
+ | - wxWidgets ( wxWidgets sources, no intermediate subfolder )
+ |
+ | - wxWidgets29 ( wxWidgets 2.9 sources, only required if you want to build against unstable wx 2.9 )
+ |
+ | - cryptopp ( Crypto++ sources, no intermediate subfolder )
+ |
+ | - <amule-sources> ( aMule sources, no intermediate subfolder, can have any name )
+
+
+I hope this is simple enough to get you started. 
+
+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
+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. 
+
+There are 3 solutions:
+1) aMule-MSVC10E.sln
+   which includes aMule, aMule tools and aMule's internal libs
+2) aMule-MSVC10E-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
+
+
+The Debug/Release configs build against wxWidgets 2.8 (stable), Debug29/Release29 configs build against wxWidgets 2.9 (unstable)
+
+To build aMule with GeoIP see libs\libGeoIP\readme.txt . 
+Without it you get an error building libGeoIP when you build the full solution.
+Just ignore it or unload the libGeoIP project.
+
+
+If aMule fails to compile, here are some guidelines/patches to the most common problems:
+
+[*] If Scanner.cpp fails to compile, apply this change around line 1545:
+
+-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
++        b->yy_is_interactive = 0;
+
+if necessary.
+
+[*] The file muuli_wdr.cpp can also fail if it hasn't been patched for MSVC in the current code. The most common problem comes 
+from this kind of lines:
+
+        _("For a film you can say its length, its story, language ...\n"
+          "and if it's a fake, you can tell that to other users of aMule."),
+
+Notice the opening and closing parentheses are on a different line, and the quotes opened again. While this is ok for gcc, Visual
+Studio won't allow it. Change this lines to be a single-line quoted text. In the above example, the result will be:
+
+	_("For a film you can say its length, its story, language ...\nand if it's a fake, you can tell that to other users of aMule."),
+
+And that should be it. Feel free to ask in the aMule forum at forum.amule.org, "Compilation problems" section if you have further
+doubts.
+
+If you want to run aMule from inside Visual Studio, always set
+_NO_DEBUG_HEAP=1
+in Properties / Debugging / Environment!

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aLinkCreator Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aLinkCreator/aLinkCreator.vcxproj Added

@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}</ProjectGuid>
+    <RootNamespace>aLinkCreator</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;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>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;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>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Link Creator\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>NDEBUG;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Link Creator\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\alc.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\alcframe.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\alcpix.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\ed2khash.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\md4.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\alc.h" />
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\alcc.h" />
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\alcframe.h" />
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\alcpix.h" />
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\bithelp.h" />
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\ed2khash.h" />
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\md4.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\..\src\utils\aLinkCreator\alc.rc" />
+    <ResourceCompile Include="..\version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libs\libmulecommon\libmulecommon.vcxproj">
+      <Project>{293e6133-239a-4ed4-838e-9182b07c6b35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aLinkCreator/aLinkCreator.vcxproj.filters Added

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\alc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\alcframe.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\alcpix.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\ed2khash.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\md4.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\alc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\alcc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\alcframe.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\alcpix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\bithelp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\ed2khash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\md4.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="..\..\..\..\src\utils\aLinkCreator\alc.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aLinkCreator/alcc.vcxproj Added

@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}</ProjectGuid>
+    <RootNamespace>alcc</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)ALC\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)ALC\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)ALC\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)ALC\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;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>
+      <AdditionalDependencies>ws2_32.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;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>
+      <AdditionalDependencies>ws2_32.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Link Creator\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"aMule Link Creator\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\alcc.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\ed2khash.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\md4.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\alcc.h" />
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\bithelp.h" />
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\ed2khash.h" />
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\md4.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\..\src\utils\aLinkCreator\alc.rc" />
+    <ResourceCompile Include="..\version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libs\libmulecommon\libmulecommon.vcxproj">
+      <Project>{293e6133-239a-4ed4-838e-9182b07c6b35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aLinkCreator/alcc.vcxproj.filters Added

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\alcc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\ed2khash.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\aLinkCreator\src\md4.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\alcc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\bithelp.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\ed2khash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\aLinkCreator\src\md4.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="..\..\..\..\src\utils\aLinkCreator\alc.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMule Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMule-MSVC10E-ExtLibs.sln Added

@@ -0,0 +1,148 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "buildlibext", "libs\libext\buildlibext.vcxproj", "{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "..\..\..\..\wxWidgets\build\msw\wx_wxregex.vcxproj", "{A960D0AD-C20E-4FD6-B477-6509232C7D94}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "..\..\..\..\wxWidgets\build\msw\wx_wxzlib.vcxproj", "{99A6CD35-A635-4E39-93FF-F9A359E356D2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "..\..\..\..\wxWidgets\build\msw\wx_wxpng.vcxproj", "{4F88C347-8C7A-47C1-84C8-D4E154A33D30}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "..\..\..\..\wxWidgets\build\msw\wx_wxjpeg.vcxproj", "{4C6519FA-63B7-4631-B087-A17A368DBCD9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "..\..\..\..\wxWidgets\build\msw\wx_wxtiff.vcxproj", "{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "..\..\..\..\wxWidgets\build\msw\wx_wxexpat.vcxproj", "{474A0ED2-5969-47F0-B37F-7BC05C44F99B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\..\..\..\wxWidgets\build\msw\wx_base.vcxproj", "{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\..\..\..\wxWidgets\build\msw\wx_net.vcxproj", "{C963A510-37EB-4D71-85B9-2380FCD4B3D3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\..\..\wxWidgets\build\msw\wx_core.vcxproj", "{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "..\..\..\..\wxWidgets\build\msw\wx_adv.vcxproj", "{FE8C58CE-6828-4125-8563-28F929D307C2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "..\..\..\..\wxWidgets\build\msw\wx_media.vcxproj", "{6B245136-054C-4400-BF21-D30B05C231CD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbc", "..\..\..\..\wxWidgets\build\msw\wx_odbc.vcxproj", "{B535BE44-FCCC-4911-862F-A7ED6CC6B597}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbgrid", "..\..\..\..\wxWidgets\build\msw\wx_dbgrid.vcxproj", "{C4590207-2D76-445F-833D-D59BB14D2C51}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "..\..\..\..\wxWidgets\build\msw\wx_html.vcxproj", "{8E917A7A-CC97-45C8-80A1-2EBD30936D23}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "..\..\..\..\wxWidgets\build\msw\wx_qa.vcxproj", "{AE383B44-EE53-4353-9BF0-2F3767D6CE51}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "..\..\..\..\wxWidgets\build\msw\wx_xml.vcxproj", "{46B97E73-8E57-42C1-A46E-AF0495D625DD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "..\..\..\..\wxWidgets\build\msw\wx_xrc.vcxproj", "{BA59346E-5EB2-4D25-94A7-132D9C953A05}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\..\..\..\wxWidgets\build\msw\wx_aui.vcxproj", "{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "..\..\..\..\wxWidgets\build\msw\wx_richtext.vcxproj", "{4740520C-ADF1-464D-97C5-85FCFEECF76D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "..\..\..\..\wxWidgets\build\msw\wx_gl.vcxproj", "{8CF291F4-6284-4118-98A7-9D2146C6D5EA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\..\..\..\cryptopp\cryptlib.vcxproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.Build.0 = Debug|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.ActiveCfg = Release|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.Build.0 = Release|Win32
+		{A960D0AD-C20E-4FD6-B477-6509232C7D94}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{A960D0AD-C20E-4FD6-B477-6509232C7D94}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{A960D0AD-C20E-4FD6-B477-6509232C7D94}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{A960D0AD-C20E-4FD6-B477-6509232C7D94}.Release|Win32.Build.0 = Unicode Release|Win32
+		{99A6CD35-A635-4E39-93FF-F9A359E356D2}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{99A6CD35-A635-4E39-93FF-F9A359E356D2}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{99A6CD35-A635-4E39-93FF-F9A359E356D2}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{99A6CD35-A635-4E39-93FF-F9A359E356D2}.Release|Win32.Build.0 = Unicode Release|Win32
+		{4F88C347-8C7A-47C1-84C8-D4E154A33D30}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{4F88C347-8C7A-47C1-84C8-D4E154A33D30}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{4F88C347-8C7A-47C1-84C8-D4E154A33D30}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{4F88C347-8C7A-47C1-84C8-D4E154A33D30}.Release|Win32.Build.0 = Unicode Release|Win32
+		{4C6519FA-63B7-4631-B087-A17A368DBCD9}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{4C6519FA-63B7-4631-B087-A17A368DBCD9}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{4C6519FA-63B7-4631-B087-A17A368DBCD9}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{4C6519FA-63B7-4631-B087-A17A368DBCD9}.Release|Win32.Build.0 = Unicode Release|Win32
+		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}.Release|Win32.Build.0 = Unicode Release|Win32
+		{474A0ED2-5969-47F0-B37F-7BC05C44F99B}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{474A0ED2-5969-47F0-B37F-7BC05C44F99B}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{474A0ED2-5969-47F0-B37F-7BC05C44F99B}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{474A0ED2-5969-47F0-B37F-7BC05C44F99B}.Release|Win32.Build.0 = Unicode Release|Win32
+		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}.Release|Win32.Build.0 = Unicode Release|Win32
+		{C963A510-37EB-4D71-85B9-2380FCD4B3D3}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{C963A510-37EB-4D71-85B9-2380FCD4B3D3}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{C963A510-37EB-4D71-85B9-2380FCD4B3D3}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{C963A510-37EB-4D71-85B9-2380FCD4B3D3}.Release|Win32.Build.0 = Unicode Release|Win32
+		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}.Release|Win32.Build.0 = Unicode Release|Win32
+		{FE8C58CE-6828-4125-8563-28F929D307C2}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{FE8C58CE-6828-4125-8563-28F929D307C2}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{FE8C58CE-6828-4125-8563-28F929D307C2}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{FE8C58CE-6828-4125-8563-28F929D307C2}.Release|Win32.Build.0 = Unicode Release|Win32
+		{6B245136-054C-4400-BF21-D30B05C231CD}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{6B245136-054C-4400-BF21-D30B05C231CD}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{6B245136-054C-4400-BF21-D30B05C231CD}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{6B245136-054C-4400-BF21-D30B05C231CD}.Release|Win32.Build.0 = Unicode Release|Win32
+		{B535BE44-FCCC-4911-862F-A7ED6CC6B597}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{B535BE44-FCCC-4911-862F-A7ED6CC6B597}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{B535BE44-FCCC-4911-862F-A7ED6CC6B597}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{B535BE44-FCCC-4911-862F-A7ED6CC6B597}.Release|Win32.Build.0 = Unicode Release|Win32
+		{C4590207-2D76-445F-833D-D59BB14D2C51}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{C4590207-2D76-445F-833D-D59BB14D2C51}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{C4590207-2D76-445F-833D-D59BB14D2C51}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{C4590207-2D76-445F-833D-D59BB14D2C51}.Release|Win32.Build.0 = Unicode Release|Win32
+		{8E917A7A-CC97-45C8-80A1-2EBD30936D23}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{8E917A7A-CC97-45C8-80A1-2EBD30936D23}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{8E917A7A-CC97-45C8-80A1-2EBD30936D23}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{8E917A7A-CC97-45C8-80A1-2EBD30936D23}.Release|Win32.Build.0 = Unicode Release|Win32
+		{AE383B44-EE53-4353-9BF0-2F3767D6CE51}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{AE383B44-EE53-4353-9BF0-2F3767D6CE51}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{AE383B44-EE53-4353-9BF0-2F3767D6CE51}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{AE383B44-EE53-4353-9BF0-2F3767D6CE51}.Release|Win32.Build.0 = Unicode Release|Win32
+		{46B97E73-8E57-42C1-A46E-AF0495D625DD}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{46B97E73-8E57-42C1-A46E-AF0495D625DD}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{46B97E73-8E57-42C1-A46E-AF0495D625DD}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{46B97E73-8E57-42C1-A46E-AF0495D625DD}.Release|Win32.Build.0 = Unicode Release|Win32
+		{BA59346E-5EB2-4D25-94A7-132D9C953A05}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{BA59346E-5EB2-4D25-94A7-132D9C953A05}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{BA59346E-5EB2-4D25-94A7-132D9C953A05}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{BA59346E-5EB2-4D25-94A7-132D9C953A05}.Release|Win32.Build.0 = Unicode Release|Win32
+		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}.Release|Win32.Build.0 = Unicode Release|Win32
+		{4740520C-ADF1-464D-97C5-85FCFEECF76D}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{4740520C-ADF1-464D-97C5-85FCFEECF76D}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{4740520C-ADF1-464D-97C5-85FCFEECF76D}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{4740520C-ADF1-464D-97C5-85FCFEECF76D}.Release|Win32.Build.0 = Unicode Release|Win32
+		{8CF291F4-6284-4118-98A7-9D2146C6D5EA}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{8CF291F4-6284-4118-98A7-9D2146C6D5EA}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{8CF291F4-6284-4118-98A7-9D2146C6D5EA}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{8CF291F4-6284-4118-98A7-9D2146C6D5EA}.Release|Win32.Build.0 = Unicode Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.ActiveCfg = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMule-MSVC10E-ExtLibs29.sln Added

@@ -0,0 +1,133 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "buildlibext", "libs\libext\buildlibext.vcxproj", "{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\..\..\..\cryptopp\cryptlib.vcxproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxregex.vcxproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxzlib.vcxproj", "{8B867186-A0B5-5479-B824-E176EDD27C40}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxpng.vcxproj", "{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxjpeg.vcxproj", "{6053CC38-CDEE-584C-8BC8-4B000D800FC7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxtiff.vcxproj", "{75596CE6-5AE7-55C9-B890-C07B0A657A83}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxexpat.vcxproj", "{A1A8355B-0988-528E-9CC2-B971D6266669}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_base.vcxproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_net.vcxproj", "{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_core.vcxproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_adv.vcxproj", "{24C45343-FD20-5C92-81C1-35A2AE841E79}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_media.vcxproj", "{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_html.vcxproj", "{33CC42F9-7756-5587-863C-8D4461B7C5DD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_qa.vcxproj", "{E21129E0-7C08-5936-9D8C-0D60B5319BA7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_xml.vcxproj", "{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_xrc.vcxproj", "{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_aui.vcxproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_richtext.vcxproj", "{7FB0902D-8579-5DCE-B883-DAF66A885005}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_gl.vcxproj", "{DA8B15EF-6750-5928-BC0E-C748213CF9B2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.ActiveCfg = Debug29|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.Build.0 = Debug29|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.ActiveCfg = Release29|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.Build.0 = Release29|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.ActiveCfg = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32
+		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32
+		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32
+		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32
+		{8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.Build.0 = Debug|Win32
+		{8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32
+		{8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32
+		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.Build.0 = Debug|Win32
+		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32
+		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32
+		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.Build.0 = Debug|Win32
+		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32
+		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32
+		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.ActiveCfg = Debug|Win32
+		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.Build.0 = Debug|Win32
+		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32
+		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32
+		{A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.Build.0 = Debug|Win32
+		{A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32
+		{A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
+		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32
+		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32
+		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32
+		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
+		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.ActiveCfg = Debug|Win32
+		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.Build.0 = Debug|Win32
+		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32
+		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32
+		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32
+		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32
+		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32
+		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32
+		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32
+		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32
+		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32
+		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32
+		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32
+		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32
+		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32
+		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32
+		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32
+		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32
+		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32
+		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32
+		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32
+		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32
+		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32
+		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32
+		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32
+		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.Build.0 = Debug|Win32
+		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32
+		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMule-MSVC10E.sln Added

@@ -0,0 +1,155 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual C++ Express 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMule", "aMule\aMule.vcxproj", "{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmuleec", "libs\libmuleec\libmuleec.vcxproj", "{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmulecommon", "libs\libmulecommon\libmulecommon.vcxproj", "{293E6133-239A-4ED4-838E-9182B07C6B35}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmuleexternalwxlistctrl", "libs\libmuleexternalwxlistctrl\libmuleexternalwxlistctrl.vcxproj", "{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aLinkCreator", "aLinkCreator\aLinkCreator.vcxproj", "{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMuleCMD", "aMuleCMD\aMuleCMD.vcxproj", "{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMuleGUI", "aMuleGUI\aMuleGUI.vcxproj", "{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ed2k", "ed2k\ed2k.vcxproj", "{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileview", "fileview\fileview.vcxproj", "{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGeoIP", "libs\libGeoIP\libGeoIP.vcxproj", "{8CA0F896-7689-4CE0-9D16-99C9C83847E1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMuleD", "aMuleD\aMuleD.vcxproj", "{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMuleWeb", "aMuleWeb\aMuleWeb.vcxproj", "{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCas", "wxCas\wxCas.vcxproj", "{5FCAFC30-922E-446F-8DF5-D71819AB6356}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alcc", "aLinkCreator\alcc.vcxproj", "{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug29|Win32 = Debug29|Win32
+		Release|Win32 = Release|Win32
+		Release29|Win32 = Release29|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Debug|Win32.Build.0 = Debug|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Debug29|Win32.Build.0 = Debug29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Release|Win32.ActiveCfg = Release|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Release|Win32.Build.0 = Release|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Release29|Win32.ActiveCfg = Release29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Release29|Win32.Build.0 = Release29|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Debug|Win32.Build.0 = Debug|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Debug29|Win32.Build.0 = Debug29|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Release|Win32.ActiveCfg = Release|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Release|Win32.Build.0 = Release|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Release29|Win32.ActiveCfg = Release29|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Release29|Win32.Build.0 = Release29|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Debug|Win32.ActiveCfg = Debug|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Debug|Win32.Build.0 = Debug|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Debug29|Win32.Build.0 = Debug29|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Release|Win32.ActiveCfg = Release|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Release|Win32.Build.0 = Release|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Release29|Win32.ActiveCfg = Release29|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Release29|Win32.Build.0 = Release29|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Debug|Win32.Build.0 = Debug|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Debug29|Win32.Build.0 = Debug29|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Release|Win32.ActiveCfg = Release|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Release|Win32.Build.0 = Release|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Release29|Win32.ActiveCfg = Release29|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Release29|Win32.Build.0 = Release29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Debug|Win32.Build.0 = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Debug29|Win32.Build.0 = Debug29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Release|Win32.ActiveCfg = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Release|Win32.Build.0 = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Release29|Win32.ActiveCfg = Release29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Release29|Win32.Build.0 = Release29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Debug|Win32.Build.0 = Debug|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Debug29|Win32.Build.0 = Debug29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Release|Win32.ActiveCfg = Release|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Release|Win32.Build.0 = Release|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Release29|Win32.ActiveCfg = Release29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Release29|Win32.Build.0 = Release29|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Debug|Win32.Build.0 = Debug|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Debug29|Win32.Build.0 = Debug29|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Release|Win32.ActiveCfg = Release|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Release|Win32.Build.0 = Release|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Release29|Win32.ActiveCfg = Release29|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Release29|Win32.Build.0 = Release29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Debug|Win32.Build.0 = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Debug29|Win32.ActiveCfg = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Debug29|Win32.Build.0 = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Release|Win32.ActiveCfg = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Release|Win32.Build.0 = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Release29|Win32.ActiveCfg = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Release29|Win32.Build.0 = Release|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Debug|Win32.Build.0 = Debug|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Debug29|Win32.Build.0 = Debug29|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Release|Win32.ActiveCfg = Release|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Release|Win32.Build.0 = Release|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Release29|Win32.ActiveCfg = Release29|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Release29|Win32.Build.0 = Release29|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Debug|Win32.Build.0 = Debug|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Debug29|Win32.ActiveCfg = Debug|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Debug29|Win32.Build.0 = Debug|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Release|Win32.ActiveCfg = Release|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Release|Win32.Build.0 = Release|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Release29|Win32.ActiveCfg = Release|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Release29|Win32.Build.0 = Release|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Debug|Win32.Build.0 = Debug|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Debug29|Win32.Build.0 = Debug29|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Release|Win32.ActiveCfg = Release|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Release|Win32.Build.0 = Release|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Release29|Win32.ActiveCfg = Release29|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Release29|Win32.Build.0 = Release29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Debug|Win32.Build.0 = Debug|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Debug29|Win32.Build.0 = Debug29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Release|Win32.ActiveCfg = Release|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Release|Win32.Build.0 = Release|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Release29|Win32.ActiveCfg = Release29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Release29|Win32.Build.0 = Release29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Debug|Win32.Build.0 = Debug|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Debug29|Win32.Build.0 = Debug29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Release|Win32.ActiveCfg = Release|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Release|Win32.Build.0 = Release|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Release29|Win32.ActiveCfg = Release29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Release29|Win32.Build.0 = Release29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Debug|Win32.Build.0 = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Debug29|Win32.Build.0 = Debug29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Release|Win32.ActiveCfg = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Release|Win32.Build.0 = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Release29|Win32.ActiveCfg = Release29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Release29|Win32.Build.0 = Release29|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMule/aMule.vcxproj Added

@@ -0,0 +1,526 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}</ProjectGuid>
+    <RootNamespace>aMule</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm120 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;$(SolutionDir)libs\libGeoIP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;ENABLE_NLS;ENABLE_IP2COUNTRY;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>$(SolutionDir)PCH.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <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>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalOptions>
+      </AdditionalOptions>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm120 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;$(SolutionDir)libs\libGeoIP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;ENABLE_NLS;ENABLE_IP2COUNTRY;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>$(SolutionDir)PCH.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <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)\";wxUSE_NO_MANIFEST=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm150 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;$(SolutionDir)libs\libGeoIP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;ENABLE_NLS;ENABLE_IP2COUNTRY;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>$(SolutionDir)PCH.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <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>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm120 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;$(SolutionDir)libs\libGeoIP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;ENABLE_NLS;ENABLE_IP2COUNTRY;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>$(SolutionDir)PCH.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <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>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\AddFriend.cpp" />
+    <ClCompile Include="..\..\..\..\src\amule-gui.cpp" />
+    <ClCompile Include="..\..\..\..\src\amule.cpp" />
+    <ClCompile Include="..\..\..\..\src\amuleAppCommon.cpp" />
+    <ClCompile Include="..\..\..\..\src\amuleDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\AsyncDNS.cpp" />
+    <ClCompile Include="..\..\..\..\src\BarShader.cpp" />
+    <ClCompile Include="..\..\..\..\src\BaseClient.cpp" />
+    <ClCompile Include="..\..\..\..\src\CanceledFileList.cpp" />
+    <ClCompile Include="..\..\..\..\src\CaptchaDialog.cpp" />
+    <ClCompile Include="..\..\..\..\src\CaptchaGenerator.cpp" />
+    <ClCompile Include="..\..\..\..\src\CatDialog.cpp" />
+    <ClCompile Include="..\..\..\..\src\CFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\ChatSelector.cpp" />
+    <ClCompile Include="..\..\..\..\src\ChatWnd.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientCredits.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientCreditsList.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientDetailDialog.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientList.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientRef.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientTCPSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientUDPSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\ColorFrameCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\CommentDialog.cpp" />
+    <ClCompile Include="..\..\..\..\src\CommentDialogLst.cpp" />
+    <ClCompile Include="..\..\..\..\src\CorruptionBlackBox.cpp" />
+    <ClCompile Include="..\..\..\..\src\DataToText.cpp" />
+    <ClCompile Include="..\..\..\..\src\DeadSourceList.cpp" />
+    <ClCompile Include="..\..\..\..\src\DirectoryTreeCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\DownloadClient.cpp" />
+    <ClCompile Include="..\..\..\..\src\DownloadListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\DownloadQueue.cpp" />
+    <ClCompile Include="..\..\..\..\src\ECSpecialCoreTags.cpp" />
+    <ClCompile Include="..\..\..\..\src\ECSpecialMuleTags.cpp" />
+    <ClCompile Include="..\..\..\..\src\ED2KLink.cpp" />
+    <ClCompile Include="..\..\..\..\src\EditServerListDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\EMSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\EncryptedDatagramSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\EncryptedStreamSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\ExternalConn.cpp" />
+    <ClCompile Include="..\..\..\..\src\FileArea.cpp" />
+    <ClCompile Include="..\..\..\..\src\FileAutoClose.cpp" />
+    <ClCompile Include="..\..\..\..\src\FileDetailDialog.cpp" />
+    <ClCompile Include="..\..\..\..\src\FileDetailListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\Friend.cpp" />
+    <ClCompile Include="..\..\..\..\src\FriendList.cpp" />
+    <ClCompile Include="..\..\..\..\src\FriendListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\GapList.cpp" />
+    <ClCompile Include="..\..\..\..\src\GenericClientListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\GetTickCount.cpp" />
+    <ClCompile Include="..\..\..\..\src\GuiEvents.cpp" />
+    <ClCompile Include="..\..\..\..\src\HTTPDownload.cpp" />
+    <ClCompile Include="..\..\..\..\src\IP2Country.cpp" />
+    <ClCompile Include="..\..\..\..\src\IPFilter.cpp" />
+    <ClCompile Include="..\..\..\..\src\IPFilterScanner.cpp" />
+    <ClCompile Include="..\..\..\..\src\KadDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Entry.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Indexed.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Kademlia.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Prefs.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Search.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\SearchManager.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\UDPFirewallTester.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\net\KademliaUDPListener.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\net\PacketTracking.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\routing\Contact.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\routing\RoutingBin.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\routing\RoutingZone.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\utils\UInt128.cpp" />
+    <ClCompile Include="..\..\..\..\src\KnownFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\KnownFileList.cpp" />
+    <ClCompile Include="..\..\..\..\src\ListenSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\Logger.cpp" />
+    <ClCompile Include="..\..\..\..\src\MagnetURI.cpp" />
+    <ClCompile Include="..\..\..\..\src\MemFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleCollection.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleColour.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleGifCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleNotebook.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleTextCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleTrayIcon.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleUDPSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\muuli_wdr.cpp" />
+    <ClCompile Include="..\..\..\..\src\NetworkFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\OScopeCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\OtherFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\Packet.cpp" />
+    <ClCompile Include="..\..\..\..\src\Parser.cpp">
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">4065;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4065;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">4065;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4065;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PartFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\PartFileConvert.cpp" />
+    <ClCompile Include="..\..\..\..\src\PartFileConvertDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\SharedFilePeersListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\SourceListCtrl.cpp" />
+    <ClCompile Include="..\PCH.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PlatformSpecific.cpp" />
+    <ClCompile Include="..\..\..\..\src\Preferences.cpp" />
+    <ClCompile Include="..\..\..\..\src\PrefsUnifiedDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\Proxy.cpp" />
+    <ClCompile Include="..\..\..\..\src\RandomFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\RC4Encrypt.cpp" />
+    <ClCompile Include="..\..\..\..\src\RLE.cpp" />
+    <ClCompile Include="..\..\..\..\src\SafeFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\Scanner.cpp">
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">4003;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4003;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">4003;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4003;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SearchDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\SearchFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\SearchList.cpp" />
+    <ClCompile Include="..\..\..\..\src\SearchListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\Server.cpp" />
+    <ClCompile Include="..\..\..\..\src\ServerConnect.cpp" />
+    <ClCompile Include="..\..\..\..\src\ServerList.cpp" />
+    <ClCompile Include="..\..\..\..\src\ServerListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\ServerSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\ServerUDPSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\ServerWnd.cpp" />
+    <ClCompile Include="..\..\..\..\src\SHA.cpp" />
+    <ClCompile Include="..\..\..\..\src\SHAHashSet.cpp" />
+    <ClCompile Include="..\..\..\..\src\SharedFileList.cpp" />
+    <ClCompile Include="..\..\..\..\src\SharedFilesCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\SharedFilesWnd.cpp" />
+    <ClCompile Include="..\..\..\..\src\StateMachine.cpp" />
+    <ClCompile Include="..\..\..\..\src\Statistics.cpp" />
+    <ClCompile Include="..\..\..\..\src\StatisticsDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\StatTree.cpp" />
+    <ClCompile Include="..\..\..\..\src\Tag.cpp" />
+    <ClCompile Include="..\..\..\..\src\TerminationProcess.cpp" />
+    <ClCompile Include="..\..\..\..\src\TerminationProcessAmuleweb.cpp" />
+    <ClCompile Include="..\..\..\..\src\ThreadScheduler.cpp" />
+    <ClCompile Include="..\..\..\..\src\ThreadTasks.cpp" />
+    <ClCompile Include="..\..\..\..\src\Timer.cpp" />
+    <ClCompile Include="..\..\..\..\src\TransferWnd.cpp" />
+    <ClCompile Include="..\..\..\..\src\UploadBandwidthThrottler.cpp" />
+    <ClCompile Include="..\..\..\..\src\UploadClient.cpp" />
+    <ClCompile Include="..\..\..\..\src\UploadQueue.cpp" />
+    <ClCompile Include="..\..\..\..\src\UserEvents.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\AddFriend.h" />
+    <ClInclude Include="..\..\..\..\src\amule.h" />
+    <ClInclude Include="..\..\..\..\src\amuleDlg.h" />
+    <ClInclude Include="..\..\..\..\src\amuleIPV4Address.h" />
+    <ClInclude Include="..\..\..\..\src\ArchSpecific.h" />
+    <ClInclude Include="..\..\..\..\src\AsyncDNS.h" />
+    <ClInclude Include="..\..\..\..\src\BarShader.h" />
+    <ClInclude Include="..\..\..\..\src\BitVector.h" />
+    <ClInclude Include="..\..\..\..\src\CanceledFileList.h" />
+    <ClInclude Include="..\..\..\..\src\CaptchaDialog.h" />
+    <ClInclude Include="..\..\..\..\src\CaptchaGenerator.h" />
+    <ClInclude Include="..\..\..\..\src\CatDialog.h" />
+    <ClInclude Include="..\..\..\..\src\CFile.h" />
+    <ClInclude Include="..\..\..\..\src\ChatSelector.h" />
+    <ClInclude Include="..\..\..\..\src\ChatWnd.h" />
+    <ClInclude Include="..\..\..\..\src\ClientCredits.h" />
+    <ClInclude Include="..\..\..\..\src\ClientCreditsList.h" />
+    <ClInclude Include="..\..\..\..\src\ClientDetailDialog.h" />
+    <ClInclude Include="..\..\..\..\src\ClientList.h" />
+    <ClInclude Include="..\..\..\..\src\ClientRef.h" />
+    <ClInclude Include="..\..\..\..\src\ClientTCPSocket.h" />
+    <ClInclude Include="..\..\..\..\src\ClientUDPSocket.h" />
+    <ClInclude Include="..\..\..\..\src\ColorFrameCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\CommentDialog.h" />
+    <ClInclude Include="..\..\..\..\src\CommentDialogLst.h" />
+    <ClInclude Include="..\..\..\..\src\Constants.h" />
+    <ClInclude Include="..\..\..\..\src\CorruptionBlackBox.h" />
+    <ClInclude Include="..\..\..\..\src\CryptoPP_Inc.h" />
+    <ClInclude Include="..\..\..\..\src\DataToText.h" />
+    <ClInclude Include="..\..\..\..\src\DeadSourceList.h" />
+    <ClInclude Include="..\..\..\..\src\DirectoryTreeCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\DownloadListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\DownloadQueue.h" />
+    <ClInclude Include="..\..\..\..\src\GenericClientListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\include\common\MacrosProgramSpecific.h" />
+    <ClInclude Include="..\..\..\..\src\IPFilterScanner.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Defines.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Entry.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Error.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Indexed.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Kademlia.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Prefs.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Search.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\SearchManager.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\UDPFirewallTester.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\net\KademliaUDPListener.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\net\PacketTracking.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\routing\Contact.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\routing\Maps.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\routing\RoutingBin.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\routing\RoutingZone.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\utils\KadClientSearcher.h" />
+    <ClInclude Include="..\..\..\..\src\kademlia\utils\KadUDPKey.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" />
+    <ClInclude Include="..\..\..\..\src\EMSocket.h" />
+    <ClInclude Include="..\..\..\..\src\EncryptedDatagramSocket.h" />
+    <ClInclude Include="..\..\..\..\src\EncryptedStreamSocket.h" />
+    <ClInclude Include="..\..\..\..\src\ExternalConn.h" />
+    <ClInclude Include="..\..\..\..\src\ExternalConnector.h" />
+    <ClInclude Include="..\..\..\..\src\FileArea.h" />
+    <ClInclude Include="..\..\..\..\src\FileAutoClose.h" />
+    <ClInclude Include="..\..\..\..\src\FileDetailDialog.h" />
+    <ClInclude Include="..\..\..\..\src\FileDetailListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\FileLock.h" />
+    <ClInclude Include="..\..\..\..\src\Friend.h" />
+    <ClInclude Include="..\..\..\..\src\FriendList.h" />
+    <ClInclude Include="..\..\..\..\src\FriendListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\GapList.h" />
+    <ClInclude Include="..\..\..\..\src\GetTickCount.h" />
+    <ClInclude Include="..\..\..\..\src\GuiEvents.h" />
+    <ClInclude Include="..\..\..\..\src\HTTPDownload.h" />
+    <ClInclude Include="..\..\..\..\src\inetdownload.h" />
+    <ClInclude Include="..\..\..\..\src\InternalEvents.h" />
+    <ClInclude Include="..\..\..\..\src\IP2Country.h" />
+    <ClInclude Include="..\..\..\..\src\IPFilter.h" />
+    <ClInclude Include="..\..\..\..\src\KadDlg.h" />
+    <ClInclude Include="..\..\..\..\src\KnownFile.h" />
+    <ClInclude Include="..\..\..\..\src\KnownFileList.h" />
+    <ClInclude Include="..\..\..\..\src\ListenSocket.h" />
+    <ClInclude Include="..\..\..\..\src\Logger.h" />
+    <ClInclude Include="..\..\..\..\src\include\common\Macros.h" />
+    <ClInclude Include="..\..\..\..\src\MagnetURI.h" />
+    <ClInclude Include="..\..\..\..\src\MD4Hash.h" />
+    <ClInclude Include="..\..\..\..\src\MemFile.h" />
+    <ClInclude Include="..\..\..\..\src\MuleCollection.h" />
+    <ClInclude Include="..\..\..\..\src\MuleColour.h" />
+    <ClInclude Include="..\..\..\..\src\MuleGifCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\MuleListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\MuleNotebook.h" />
+    <ClInclude Include="..\..\..\..\src\MuleTextCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\MuleThread.h" />
+    <ClInclude Include="..\..\..\..\src\MuleTrayIcon.h" />
+    <ClInclude Include="..\..\..\..\src\MuleUDPSocket.h" />
+    <ClInclude Include="..\..\..\..\src\muuli_wdr.h" />
+    <ClInclude Include="..\..\..\..\src\NetworkFunctions.h" />
+    <ClInclude Include="..\..\..\..\src\Observable.h" />
+    <ClInclude Include="..\..\..\..\src\ObservableQueue.h" />
+    <ClInclude Include="..\..\..\..\src\OScopeCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\OtherFunctions.h" />
+    <ClInclude Include="..\..\..\..\src\OtherStructs.h" />
+    <ClInclude Include="..\..\..\..\src\Packet.h" />
+    <ClInclude Include="..\..\..\..\src\PartFile.h" />
+    <ClInclude Include="..\..\..\..\src\PartFileConvert.h" />
+    <ClInclude Include="..\..\..\..\src\PartFileConvertDlg.h" />
+    <ClInclude Include="..\..\..\..\src\SharedFilePeersListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\SourceListCtrl.h" />
+    <ClInclude Include="..\PCH.h" />
+    <ClInclude Include="..\..\..\..\src\PlatformSpecific.h" />
+    <ClInclude Include="..\..\..\..\src\Preferences.h" />
+    <ClInclude Include="..\..\..\..\src\PrefsUnifiedDlg.h" />
+    <ClInclude Include="..\..\..\..\src\Proxy.h" />
+    <ClInclude Include="..\..\..\..\src\RandomFunctions.h" />
+    <ClInclude Include="..\..\..\..\src\RangeMap.h" />
+    <ClInclude Include="..\..\..\..\src\RC4Encrypt.h" />
+    <ClInclude Include="..\..\..\..\src\RLE.h" />
+    <ClInclude Include="..\..\..\..\src\SafeFile.h" />
+    <ClInclude Include="..\..\..\..\src\Scanner.h" />
+    <ClInclude Include="..\..\..\..\src\ScopedPtr.h" />
+    <ClInclude Include="..\..\..\..\src\SearchDlg.h" />
+    <ClInclude Include="..\..\..\..\src\SearchExpr.h" />
+    <ClInclude Include="..\..\..\..\src\SearchFile.h" />
+    <ClInclude Include="..\..\..\..\src\SearchList.h" />
+    <ClInclude Include="..\..\..\..\src\SearchListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\Server.h" />
+    <ClInclude Include="..\..\..\..\src\ServerConnect.h" />
+    <ClInclude Include="..\..\..\..\src\ServerList.h" />
+    <ClInclude Include="..\..\..\..\src\ServerListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\ServerSocket.h" />
+    <ClInclude Include="..\..\..\..\src\ServerUDPSocket.h" />
+    <ClInclude Include="..\..\..\..\src\ServerWnd.h" />
+    <ClInclude Include="..\..\..\..\src\SHA.h" />
+    <ClInclude Include="..\..\..\..\src\SHAHashSet.h" />
+    <ClInclude Include="..\..\..\..\src\SharedFileList.h" />
+    <ClInclude Include="..\..\..\..\src\SharedFilesCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\SharedFilesWnd.h" />
+    <ClInclude Include="..\..\..\..\src\StateMachine.h" />
+    <ClInclude Include="..\..\..\..\src\Statistics.h" />
+    <ClInclude Include="..\..\..\..\src\StatisticsDlg.h" />
+    <ClInclude Include="..\..\..\..\src\StatTree.h" />
+    <ClInclude Include="..\..\..\..\src\Tag.h" />
+    <ClInclude Include="..\..\..\..\src\TerminationProcess.h" />
+    <ClInclude Include="..\..\..\..\src\ThreadScheduler.h" />
+    <ClInclude Include="..\..\..\..\src\ThreadTasks.h" />
+    <ClInclude Include="..\..\..\..\src\ThrottledSocket.h" />
+    <ClInclude Include="..\..\..\..\src\Timer.h" />
+    <ClInclude Include="..\..\..\..\src\TransferWnd.h" />
+    <ClInclude Include="..\..\..\..\src\Types.h" />
+    <ClInclude Include="..\..\..\..\src\updownclient.h" />
+    <ClInclude Include="..\..\..\..\src\UploadBandwidthThrottler.h" />
+    <ClInclude Include="..\..\..\..\src\UploadQueue.h" />
+    <ClInclude Include="..\..\..\..\src\UPnPCompatibility.h" />
+    <ClInclude Include="..\..\..\..\src\UserEvents.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\..\amule.rc" />
+    <ResourceCompile Include="..\version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libs\libGeoIP\libGeoIP.vcxproj">
+      <Project>{8ca0f896-7689-4ce0-9d16-99c9c83847e1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libs\libmulecommon\libmulecommon.vcxproj">
+      <Project>{293e6133-239a-4ed4-838e-9182b07c6b35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libs\libmuleec\libmuleec.vcxproj">
+      <Project>{5a9ec6a5-68a3-43c8-960e-f7f03b16f1d1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libs\libmuleexternalwxlistctrl\libmuleexternalwxlistctrl.vcxproj">
+      <Project>{16c7a051-9097-41a5-ba26-fec1ea1f16ef}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMule/aMule.vcxproj.filters Added

@@ -0,0 +1,905 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Source Files KAD">
+      <UniqueIdentifier>{cc8a6595-b6d5-4afe-8d44-0e3fed36e009}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="Header Files KAD">
+      <UniqueIdentifier>{ac85d3b7-e7e5-48af-ba9c-3bbd46cebb91}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\PCH.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\AddFriend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\amule-gui.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\amule.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\amuleAppCommon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\amuleDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\AsyncDNS.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\BarShader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\BaseClient.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CanceledFileList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CaptchaDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CaptchaGenerator.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CatDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ChatSelector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ChatWnd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientCredits.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientCreditsList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientDetailDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientTCPSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientUDPSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ColorFrameCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CommentDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CommentDialogLst.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CorruptionBlackBox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DataToText.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DeadSourceList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DirectoryTreeCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DownloadClient.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DownloadListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DownloadQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ECSpecialCoreTags.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ECSpecialMuleTags.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ED2KLink.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\EditServerListDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\EMSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\EncryptedDatagramSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\EncryptedStreamSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ExternalConn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\FileArea.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\FileAutoClose.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\FileDetailDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\FileDetailListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Friend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\FriendList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\FriendListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\GapList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\GetTickCount.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\GuiEvents.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\HTTPDownload.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\IP2Country.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\IPFilter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\KadDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\KnownFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\KnownFileList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ListenSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Logger.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MagnetURI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MemFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleCollection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleColour.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleGifCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleNotebook.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleTextCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleTrayIcon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleUDPSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\muuli_wdr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\NetworkFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\OScopeCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\OtherFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Packet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PartFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PartFileConvert.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PartFileConvertDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PlatformSpecific.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Preferences.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PrefsUnifiedDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Proxy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\RandomFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\RC4Encrypt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\RLE.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SafeFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Scanner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SearchDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SearchFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SearchList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SearchListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Server.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ServerConnect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ServerList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ServerListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ServerSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ServerUDPSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ServerWnd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SHA.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SHAHashSet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SharedFileList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SharedFilesCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SharedFilesWnd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\StateMachine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Statistics.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\StatisticsDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\StatTree.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Tag.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\TerminationProcess.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\TerminationProcessAmuleweb.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ThreadScheduler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ThreadTasks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\TransferWnd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\UploadBandwidthThrottler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\UploadClient.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\UploadQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\UserEvents.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\GenericClientListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SharedFilePeersListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SourceListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\IPFilterScanner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\routing\Contact.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\utils\UInt128.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Entry.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Indexed.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Kademlia.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\net\KademliaUDPListener.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\net\PacketTracking.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Prefs.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\routing\RoutingBin.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\routing\RoutingZone.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Search.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\SearchManager.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\UDPFirewallTester.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientRef.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\PCH.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\AddFriend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\amule.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\amuleDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\amuleIPV4Address.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ArchSpecific.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\AsyncDNS.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\BarShader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CanceledFileList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CaptchaDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CaptchaGenerator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CatDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ChatSelector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ChatWnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ClientCredits.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ClientCreditsList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ClientDetailDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ClientList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ClientTCPSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ClientUDPSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ColorFrameCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CommentDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CommentDialogLst.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Constants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CorruptionBlackBox.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CryptoPP_Inc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\DataToText.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\DeadSourceList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\DirectoryTreeCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\DownloadListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\DownloadQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\libs\ec\cpp\ECID.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ED2KLink.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\EditServerListDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\EMSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\EncryptedDatagramSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\EncryptedStreamSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ExternalConn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ExternalConnector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\FileArea.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\FileAutoClose.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\FileDetailDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\FileDetailListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\FileLock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Friend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\FriendList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\FriendListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\GapList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\GetTickCount.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\GuiEvents.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\HTTPDownload.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\inetdownload.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\InternalEvents.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\IP2Country.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\IPFilter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\KadDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\KnownFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\KnownFileList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ListenSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Logger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\include\common\Macros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MagnetURI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MD4Hash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MemFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleCollection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleColour.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleGifCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleNotebook.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleTextCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleThread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleTrayIcon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleUDPSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\muuli_wdr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\NetworkFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Observable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ObservableQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\OScopeCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\OtherFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\OtherStructs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Packet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\PartFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\PartFileConvert.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\PartFileConvertDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\PlatformSpecific.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Preferences.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\PrefsUnifiedDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Proxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\RandomFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\RangeMap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\RC4Encrypt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\RLE.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SafeFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Scanner.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ScopedPtr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SearchDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SearchExpr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SearchFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SearchList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SearchListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Server.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ServerConnect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ServerList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ServerListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ServerSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ServerUDPSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ServerWnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SHA.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SHAHashSet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SharedFileList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SharedFilesCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SharedFilesWnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\StateMachine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Statistics.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\StatisticsDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\StatTree.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Tag.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\TerminationProcess.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ThreadScheduler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ThreadTasks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ThrottledSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Timer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\TransferWnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\updownclient.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\UploadBandwidthThrottler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\UploadQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\UPnPCompatibility.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\UserEvents.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\GenericClientListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SharedFilePeersListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SourceListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\IPFilterScanner.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\BitVector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\include\common\MacrosProgramSpecific.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\routing\Contact.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\utils\UInt128.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Defines.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Entry.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Error.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Indexed.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\utils\KadClientSearcher.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Kademlia.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\net\KademliaUDPListener.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\utils\KadUDPKey.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\routing\Maps.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\net\PacketTracking.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Prefs.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\routing\RoutingBin.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\routing\RoutingZone.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\Search.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\SearchManager.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\kademlia\kademlia\UDPFirewallTester.h">
+      <Filter>Header Files KAD</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ClientRef.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="..\..\..\..\amule.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMuleCMD Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMuleCMD/aMuleCMD.vcxproj Added

@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}</ProjectGuid>
+    <RootNamespace>aMuleCMD</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_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>
+      <AdditionalDependencies>ws2_32.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_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>
+      <AdditionalDependencies>ws2_32.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_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>
+      <AdditionalDependencies>ws2_32.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_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>
+      <AdditionalDependencies>ws2_32.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\ExternalConnector.cpp" />
+    <ClCompile Include="..\..\..\..\src\LoggerConsole.cpp" />
+    <ClCompile Include="..\..\..\..\src\NetworkFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\OtherFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\TextClient.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\ExternalConnector.h" />
+    <ClInclude Include="..\..\..\..\src\NetworkFunctions.h" />
+    <ClInclude Include="..\..\..\..\src\OtherFunctions.h" />
+    <ClInclude Include="..\..\..\..\src\TextClient.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libs\libmulecommon\libmulecommon.vcxproj">
+      <Project>{293e6133-239a-4ed4-838e-9182b07c6b35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libs\libmuleec\libmuleec.vcxproj">
+      <Project>{5a9ec6a5-68a3-43c8-960e-f7f03b16f1d1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMuleCMD/aMuleCMD.vcxproj.filters Added

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\ExternalConnector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\LoggerConsole.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\NetworkFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\OtherFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\TextClient.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\ExternalConnector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\NetworkFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\OtherFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\TextClient.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMuleD Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMuleD/aMuleD.vcxproj Added

@@ -0,0 +1,318 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}</ProjectGuid>
+    <RootNamespace>aMuleD</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm120 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;AMULE_DAEMON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>$(SolutionDir)PCH.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <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>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm120 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;AMULE_DAEMON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>$(SolutionDir)PCH.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <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>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm120 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;AMULE_DAEMON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>$(SolutionDir)PCH.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <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>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm120 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;AMULE_DAEMON;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>$(SolutionDir)PCH.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <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>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib;shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\amule.cpp" />
+    <ClCompile Include="..\..\..\..\src\amuleAppCommon.cpp" />
+    <ClCompile Include="..\..\..\..\src\amuled.cpp" />
+    <ClCompile Include="..\..\..\..\src\AsyncDNS.cpp" />
+    <ClCompile Include="..\..\..\..\src\BaseClient.cpp" />
+    <ClCompile Include="..\..\..\..\src\CanceledFileList.cpp" />
+    <ClCompile Include="..\..\..\..\src\CFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientCredits.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientCreditsList.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientList.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientRef.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientTCPSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientUDPSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\IPFilterScanner.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\routing\Contact.cpp" />
+    <ClCompile Include="..\..\..\..\src\CorruptionBlackBox.cpp" />
+    <ClCompile Include="..\..\..\..\src\DataToText.cpp" />
+    <ClCompile Include="..\..\..\..\src\DeadSourceList.cpp" />
+    <ClCompile Include="..\..\..\..\src\DownloadClient.cpp" />
+    <ClCompile Include="..\..\..\..\src\DownloadQueue.cpp" />
+    <ClCompile Include="..\..\..\..\src\ECSpecialCoreTags.cpp" />
+    <ClCompile Include="..\..\..\..\src\ECSpecialMuleTags.cpp" />
+    <ClCompile Include="..\..\..\..\src\ED2KLink.cpp" />
+    <ClCompile Include="..\..\..\..\src\EMSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\EncryptedDatagramSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\EncryptedStreamSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Entry.cpp" />
+    <ClCompile Include="..\..\..\..\src\ExternalConn.cpp" />
+    <ClCompile Include="..\..\..\..\src\FileArea.cpp" />
+    <ClCompile Include="..\..\..\..\src\FileAutoClose.cpp" />
+    <ClCompile Include="..\..\..\..\src\Friend.cpp" />
+    <ClCompile Include="..\..\..\..\src\FriendList.cpp" />
+    <ClCompile Include="..\..\..\..\src\GapList.cpp" />
+    <ClCompile Include="..\..\..\..\src\GetTickCount.cpp" />
+    <ClCompile Include="..\..\..\..\src\GuiEvents.cpp" />
+    <ClCompile Include="..\..\..\..\src\HTTPDownload.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Indexed.cpp" />
+    <ClCompile Include="..\..\..\..\src\IPFilter.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Kademlia.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\net\KademliaUDPListener.cpp" />
+    <ClCompile Include="..\..\..\..\src\KnownFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\KnownFileList.cpp" />
+    <ClCompile Include="..\..\..\..\src\ListenSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\Logger.cpp" />
+    <ClCompile Include="..\..\..\..\src\MagnetURI.cpp" />
+    <ClCompile Include="..\..\..\..\src\MemFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleUDPSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\NetworkFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\OtherFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\Packet.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\net\PacketTracking.cpp" />
+    <ClCompile Include="..\..\..\..\src\Parser.cpp">
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">4065;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4065;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">4065;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4065;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PartFile.cpp" />
+    <ClCompile Include="..\PCH.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PlatformSpecific.cpp" />
+    <ClCompile Include="..\..\..\..\src\Preferences.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Prefs.cpp" />
+    <ClCompile Include="..\..\..\..\src\Proxy.cpp" />
+    <ClCompile Include="..\..\..\..\src\RandomFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\RC4Encrypt.cpp" />
+    <ClCompile Include="..\..\..\..\src\RLE.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\routing\RoutingBin.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\routing\RoutingZone.cpp" />
+    <ClCompile Include="..\..\..\..\src\SafeFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\Scanner.cpp">
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">4003;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4003;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">4003;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4003;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Search.cpp" />
+    <ClCompile Include="..\..\..\..\src\SearchFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\SearchList.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\SearchManager.cpp" />
+    <ClCompile Include="..\..\..\..\src\Server.cpp" />
+    <ClCompile Include="..\..\..\..\src\ServerConnect.cpp" />
+    <ClCompile Include="..\..\..\..\src\ServerList.cpp" />
+    <ClCompile Include="..\..\..\..\src\ServerSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\ServerUDPSocket.cpp" />
+    <ClCompile Include="..\..\..\..\src\SHA.cpp" />
+    <ClCompile Include="..\..\..\..\src\SHAHashSet.cpp" />
+    <ClCompile Include="..\..\..\..\src\SharedFileList.cpp" />
+    <ClCompile Include="..\..\..\..\src\StateMachine.cpp" />
+    <ClCompile Include="..\..\..\..\src\Statistics.cpp" />
+    <ClCompile Include="..\..\..\..\src\StatTree.cpp" />
+    <ClCompile Include="..\..\..\..\src\Tag.cpp" />
+    <ClCompile Include="..\..\..\..\src\TerminationProcess.cpp" />
+    <ClCompile Include="..\..\..\..\src\TerminationProcessAmuleweb.cpp" />
+    <ClCompile Include="..\..\..\..\src\ThreadScheduler.cpp" />
+    <ClCompile Include="..\..\..\..\src\ThreadTasks.cpp" />
+    <ClCompile Include="..\..\..\..\src\Timer.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\UDPFirewallTester.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\utils\UInt128.cpp" />
+    <ClCompile Include="..\..\..\..\src\UploadBandwidthThrottler.cpp" />
+    <ClCompile Include="..\..\..\..\src\UploadClient.cpp" />
+    <ClCompile Include="..\..\..\..\src\UploadQueue.cpp" />
+    <ClCompile Include="..\..\..\..\src\UserEvents.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\GapList.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libs\libmulecommon\libmulecommon.vcxproj">
+      <Project>{293e6133-239a-4ed4-838e-9182b07c6b35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libs\libmuleec\libmuleec.vcxproj">
+      <Project>{5a9ec6a5-68a3-43c8-960e-f7f03b16f1d1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMuleD/aMuleD.vcxproj.filters Added

@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+    <Filter Include="Source Files KAD">
+      <UniqueIdentifier>{a595d5a5-1d4c-4c56-ba8f-b0ac15403f03}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\PCH.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\amule.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\amuleAppCommon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\amuled.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\AsyncDNS.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\BaseClient.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CanceledFileList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientCredits.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientCreditsList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientTCPSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientUDPSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CorruptionBlackBox.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DataToText.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DeadSourceList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DownloadClient.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DownloadQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ECSpecialCoreTags.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ECSpecialMuleTags.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ED2KLink.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\EMSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\EncryptedDatagramSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\EncryptedStreamSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ExternalConn.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\FileArea.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\FileAutoClose.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Friend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\FriendList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\GapList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\GetTickCount.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\GuiEvents.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\HTTPDownload.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\IPFilter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\KnownFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\KnownFileList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ListenSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Logger.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MagnetURI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MemFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleUDPSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\NetworkFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\OtherFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Packet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Parser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PartFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PlatformSpecific.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Preferences.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Proxy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\RandomFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\RC4Encrypt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\RLE.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SafeFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Scanner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SearchFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SearchList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Server.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ServerConnect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ServerList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ServerSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ServerUDPSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SHA.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SHAHashSet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SharedFileList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\StateMachine.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Statistics.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\StatTree.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Tag.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\TerminationProcess.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\TerminationProcessAmuleweb.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ThreadScheduler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ThreadTasks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\UploadBandwidthThrottler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\UploadClient.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\UploadQueue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\UserEvents.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\IPFilterScanner.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\routing\Contact.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Entry.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Indexed.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Kademlia.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\net\KademliaUDPListener.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\net\PacketTracking.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Prefs.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\routing\RoutingBin.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\routing\RoutingZone.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\Search.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\SearchManager.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\kademlia\UDPFirewallTester.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\utils\UInt128.cpp">
+      <Filter>Source Files KAD</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientRef.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\GapList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMuleGUI Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMuleGUI/aMuleGUI.vcxproj Added

@@ -0,0 +1,404 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}</ProjectGuid>
+    <RootNamespace>aMuleGUI</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm120 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;$(SolutionDir)libs\libGeoIP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;CLIENT_GUI;ENABLE_NLS;ENABLE_IP2COUNTRY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>$(SolutionDir)PCH.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <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>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm120 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;$(SolutionDir)libs\libGeoIP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;CLIENT_GUI;ENABLE_NLS;ENABLE_IP2COUNTRY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>$(SolutionDir)PCH.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <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>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm120 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;$(SolutionDir)libs\libGeoIP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;CLIENT_GUI;ENABLE_NLS;ENABLE_IP2COUNTRY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>$(SolutionDir)PCH.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <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>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP /Zm120 %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;$(SolutionDir)libs\libGeoIP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;CLIENT_GUI;ENABLE_NLS;ENABLE_IP2COUNTRY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>$(SolutionDir)PCH.h</PrecompiledHeaderFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <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>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\AddFriend.cpp" />
+    <ClCompile Include="..\..\..\..\src\amule-gui.cpp" />
+    <ClCompile Include="..\..\..\..\src\amule-remote-gui.cpp" />
+    <ClCompile Include="..\..\..\..\src\amuleAppCommon.cpp" />
+    <ClCompile Include="..\..\..\..\src\amuleDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\BarShader.cpp" />
+    <ClCompile Include="..\..\..\..\src\CatDialog.cpp" />
+    <ClCompile Include="..\..\..\..\src\CFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\ChatSelector.cpp" />
+    <ClCompile Include="..\..\..\..\src\ChatWnd.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientCredits.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientDetailDialog.cpp" />
+    <ClCompile Include="..\..\..\..\src\ClientRef.cpp" />
+    <ClCompile Include="..\..\..\..\src\ColorFrameCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\CommentDialog.cpp" />
+    <ClCompile Include="..\..\..\..\src\CommentDialogLst.cpp" />
+    <ClCompile Include="..\..\..\..\src\DataToText.cpp" />
+    <ClCompile Include="..\..\..\..\src\DirectoryTreeCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\DownloadListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\ECSpecialMuleTags.cpp" />
+    <ClCompile Include="..\..\..\..\src\ED2KLink.cpp" />
+    <ClCompile Include="..\..\..\..\src\EditServerListDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\FileDetailDialog.cpp" />
+    <ClCompile Include="..\..\..\..\src\FileDetailListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\Friend.cpp" />
+    <ClCompile Include="..\..\..\..\src\FriendListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\GapList.cpp" />
+    <ClCompile Include="..\..\..\..\src\GenericClientListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\GetTickCount.cpp" />
+    <ClCompile Include="..\..\..\..\src\GuiEvents.cpp" />
+    <ClCompile Include="..\..\..\..\src\HTTPDownload.cpp" />
+    <ClCompile Include="..\..\..\..\src\IP2Country.cpp" />
+    <ClCompile Include="..\..\..\..\src\KadDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\KnownFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\Logger.cpp" />
+    <ClCompile Include="..\..\..\..\src\MagnetURI.cpp" />
+    <ClCompile Include="..\..\..\..\src\MemFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleCollection.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleColour.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleGifCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleNotebook.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleTextCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleTrayIcon.cpp" />
+    <ClCompile Include="..\..\..\..\src\muuli_wdr.cpp" />
+    <ClCompile Include="..\..\..\..\src\NetworkFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\OScopeCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\OtherFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\Packet.cpp" />
+    <ClCompile Include="..\..\..\..\src\PartFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\SharedFilePeersListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\SourceListCtrl.cpp" />
+    <ClCompile Include="..\PCH.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Preferences.cpp" />
+    <ClCompile Include="..\..\..\..\src\PrefsUnifiedDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\Proxy.cpp" />
+    <ClCompile Include="..\..\..\..\src\RLE.cpp" />
+    <ClCompile Include="..\..\..\..\src\SafeFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\SearchDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\SearchListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\Server.cpp" />
+    <ClCompile Include="..\..\..\..\src\ServerListCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\ServerWnd.cpp" />
+    <ClCompile Include="..\..\..\..\src\SHA.cpp" />
+    <ClCompile Include="..\..\..\..\src\SharedFilesCtrl.cpp" />
+    <ClCompile Include="..\..\..\..\src\SharedFilesWnd.cpp" />
+    <ClCompile Include="..\..\..\..\src\Statistics.cpp" />
+    <ClCompile Include="..\..\..\..\src\StatisticsDlg.cpp" />
+    <ClCompile Include="..\..\..\..\src\StatTree.cpp" />
+    <ClCompile Include="..\..\..\..\src\Tag.cpp" />
+    <ClCompile Include="..\..\..\..\src\TerminationProcess.cpp" />
+    <ClCompile Include="..\..\..\..\src\Timer.cpp" />
+    <ClCompile Include="..\..\..\..\src\TransferWnd.cpp" />
+    <ClCompile Include="..\..\..\..\src\UserEvents.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\AddFriend.h" />
+    <ClInclude Include="..\..\..\..\src\amule-remote-gui.h" />
+    <ClInclude Include="..\..\..\..\src\amule.h" />
+    <ClInclude Include="..\..\..\..\src\amuleDlg.h" />
+    <ClInclude Include="..\..\..\..\src\ArchSpecific.h" />
+    <ClInclude Include="..\..\..\..\src\BarShader.h" />
+    <ClInclude Include="..\..\..\..\src\BitVector.h" />
+    <ClInclude Include="..\..\..\..\src\CatDialog.h" />
+    <ClInclude Include="..\..\..\..\src\CFile.h" />
+    <ClInclude Include="..\..\..\..\src\ChatSelector.h" />
+    <ClInclude Include="..\..\..\..\src\ChatWnd.h" />
+    <ClInclude Include="..\..\..\..\src\ClientCredits.h" />
+    <ClInclude Include="..\..\..\..\src\ClientCreditsList.h" />
+    <ClInclude Include="..\..\..\..\src\ClientDetailDialog.h" />
+    <ClInclude Include="..\..\..\..\src\ClientList.h" />
+    <ClInclude Include="..\..\..\..\src\ClientRef.h" />
+    <ClInclude Include="..\..\..\..\src\ColorFrameCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\CommentDialog.h" />
+    <ClInclude Include="..\..\..\..\src\CommentDialogLst.h" />
+    <ClInclude Include="..\..\..\..\src\Constants.h" />
+    <ClInclude Include="..\..\..\..\src\CryptoPP_Inc.h" />
+    <ClInclude Include="..\..\..\..\src\DataToText.h" />
+    <ClInclude Include="..\..\..\..\src\DirectoryTreeCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\DownloadListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\DownloadQueue.h" />
+    <ClInclude Include="..\..\..\..\src\GenericClientListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\include\common\MacrosProgramSpecific.h" />
+    <ClInclude Include="..\..\..\..\src\libs\ec\cpp\ECID.h" />
+    <ClInclude Include="..\..\..\..\src\ED2KLink.h" />
+    <ClInclude Include="..\..\..\..\src\EditServerListDlg.h" />
+    <ClInclude Include="..\..\..\..\src\ExternalConn.h" />
+    <ClInclude Include="..\..\..\..\src\ExternalConnector.h" />
+    <ClInclude Include="..\..\..\..\src\FileDetailDialog.h" />
+    <ClInclude Include="..\..\..\..\src\FileDetailListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\FileLock.h" />
+    <ClInclude Include="..\..\..\..\src\Friend.h" />
+    <ClInclude Include="..\..\..\..\src\FriendList.h" />
+    <ClInclude Include="..\..\..\..\src\FriendListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\GapList.h" />
+    <ClInclude Include="..\..\..\..\src\GetTickCount.h" />
+    <ClInclude Include="..\..\..\..\src\GuiEvents.h" />
+    <ClInclude Include="..\..\..\..\src\InternalEvents.h" />
+    <ClInclude Include="..\..\..\..\src\IP2Country.h" />
+    <ClInclude Include="..\..\..\..\src\KadDlg.h" />
+    <ClInclude Include="..\..\..\..\src\KnownFile.h" />
+    <ClInclude Include="..\..\..\..\src\KnownFileList.h" />
+    <ClInclude Include="..\..\..\..\src\ListenSocket.h" />
+    <ClInclude Include="..\..\..\..\src\Logger.h" />
+    <ClInclude Include="..\..\..\..\src\include\common\Macros.h" />
+    <ClInclude Include="..\..\..\..\src\MagnetURI.h" />
+    <ClInclude Include="..\..\..\..\src\MD4Hash.h" />
+    <ClInclude Include="..\..\..\..\src\MemFile.h" />
+    <ClInclude Include="..\..\..\..\src\MuleCollection.h" />
+    <ClInclude Include="..\..\..\..\src\MuleColour.h" />
+    <ClInclude Include="..\..\..\..\src\MuleGifCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\MuleListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\MuleNotebook.h" />
+    <ClInclude Include="..\..\..\..\src\MuleTextCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\MuleThread.h" />
+    <ClInclude Include="..\..\..\..\src\MuleTrayIcon.h" />
+    <ClInclude Include="..\..\..\..\src\muuli_wdr.h" />
+    <ClInclude Include="..\..\..\..\src\Observable.h" />
+    <ClInclude Include="..\..\..\..\src\ObservableQueue.h" />
+    <ClInclude Include="..\..\..\..\src\OScopeCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\OtherFunctions.h" />
+    <ClInclude Include="..\..\..\..\src\OtherStructs.h" />
+    <ClInclude Include="..\..\..\..\src\PartFile.h" />
+    <ClInclude Include="..\..\..\..\src\SharedFilePeersListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\SourceListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\UpDownClientEC.h" />
+    <ClInclude Include="..\PCH.h" />
+    <ClInclude Include="..\..\..\..\src\Preferences.h" />
+    <ClInclude Include="..\..\..\..\src\PrefsUnifiedDlg.h" />
+    <ClInclude Include="..\..\..\..\src\Proxy.h" />
+    <ClInclude Include="..\..\..\..\src\RandomFunctions.h" />
+    <ClInclude Include="..\..\..\..\src\RangeMap.h" />
+    <ClInclude Include="..\..\..\..\src\RC4Encrypt.h" />
+    <ClInclude Include="..\..\..\..\src\RLE.h" />
+    <ClInclude Include="..\..\..\..\src\SafeFile.h" />
+    <ClInclude Include="..\..\..\..\src\Scanner.h" />
+    <ClInclude Include="..\..\..\..\src\ScopedPtr.h" />
+    <ClInclude Include="..\..\..\..\src\SearchDlg.h" />
+    <ClInclude Include="..\..\..\..\src\SearchFile.h" />
+    <ClInclude Include="..\..\..\..\src\SearchList.h" />
+    <ClInclude Include="..\..\..\..\src\SearchListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\Server.h" />
+    <ClInclude Include="..\..\..\..\src\ServerListCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\ServerWnd.h" />
+    <ClInclude Include="..\..\..\..\src\SHA.h" />
+    <ClInclude Include="..\..\..\..\src\SHAHashSet.h" />
+    <ClInclude Include="..\..\..\..\src\SharedFileList.h" />
+    <ClInclude Include="..\..\..\..\src\SharedFilesCtrl.h" />
+    <ClInclude Include="..\..\..\..\src\SharedFilesWnd.h" />
+    <ClInclude Include="..\..\..\..\src\StateMachine.h" />
+    <ClInclude Include="..\..\..\..\src\Statistics.h" />
+    <ClInclude Include="..\..\..\..\src\StatisticsDlg.h" />
+    <ClInclude Include="..\..\..\..\src\StatTree.h" />
+    <ClInclude Include="..\..\..\..\src\TerminationProcess.h" />
+    <ClInclude Include="..\..\..\..\src\ThreadScheduler.h" />
+    <ClInclude Include="..\..\..\..\src\ThreadTasks.h" />
+    <ClInclude Include="..\..\..\..\src\Timer.h" />
+    <ClInclude Include="..\..\..\..\src\TransferWnd.h" />
+    <ClInclude Include="..\..\..\..\src\Types.h" />
+    <ClInclude Include="..\..\..\..\src\UploadBandwidthThrottler.h" />
+    <ClInclude Include="..\..\..\..\src\UPnPCompatibility.h" />
+    <ClInclude Include="..\..\..\..\src\UserEvents.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\..\..\amule.rc" />
+    <ResourceCompile Include="..\version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libs\libGeoIP\libGeoIP.vcxproj">
+      <Project>{8ca0f896-7689-4ce0-9d16-99c9c83847e1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libs\libmulecommon\libmulecommon.vcxproj">
+      <Project>{293e6133-239a-4ed4-838e-9182b07c6b35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libs\libmuleec\libmuleec.vcxproj">
+      <Project>{5a9ec6a5-68a3-43c8-960e-f7f03b16f1d1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libs\libmuleexternalwxlistctrl\libmuleexternalwxlistctrl.vcxproj">
+      <Project>{16c7a051-9097-41a5-ba26-fec1ea1f16ef}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMuleGUI/aMuleGUI.vcxproj.filters Added

@@ -0,0 +1,566 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{26a80d8b-0652-4504-9031-910968275e24}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\PCH.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\AddFriend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\amule-gui.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\amule-remote-gui.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\amuleAppCommon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\amuleDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\BarShader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CatDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ChatSelector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ChatWnd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientCredits.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientDetailDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ColorFrameCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CommentDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\CommentDialogLst.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DataToText.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DirectoryTreeCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\DownloadListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ECSpecialMuleTags.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ED2KLink.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\EditServerListDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\FileDetailDialog.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\FileDetailListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\FriendListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\GapList.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\GetTickCount.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\GuiEvents.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\HTTPDownload.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\IP2Country.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\KadDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\KnownFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Logger.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MagnetURI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MemFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleCollection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleColour.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleGifCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleNotebook.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleTextCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\MuleTrayIcon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\muuli_wdr.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\NetworkFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\OScopeCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\OtherFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Packet.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PartFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Preferences.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\PrefsUnifiedDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Proxy.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\RLE.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SafeFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SearchDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SearchListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Server.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ServerListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ServerWnd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SHA.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SharedFilesCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SharedFilesWnd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Statistics.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\StatisticsDlg.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\StatTree.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Tag.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\TerminationProcess.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\TransferWnd.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\UserEvents.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\GenericClientListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SharedFilePeersListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SourceListCtrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Friend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\ClientRef.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\PCH.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\AddFriend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\amule-remote-gui.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\amule.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\amuleDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ArchSpecific.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\BarShader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CatDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ChatSelector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ChatWnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ClientCredits.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ClientCreditsList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ClientDetailDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ClientList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ColorFrameCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CommentDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CommentDialogLst.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Constants.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\CryptoPP_Inc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\DataToText.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\DirectoryTreeCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\DownloadListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\DownloadQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\libs\ec\cpp\ECID.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ED2KLink.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\EditServerListDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ExternalConn.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ExternalConnector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\FileDetailDialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\FileDetailListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\FileLock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Friend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\FriendList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\FriendListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\GapList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\GetTickCount.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\GuiEvents.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\InternalEvents.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\IP2Country.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\KadDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\KnownFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\KnownFileList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ListenSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Logger.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\include\common\Macros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MagnetURI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MD4Hash.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MemFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleCollection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleColour.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleGifCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleNotebook.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleTextCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleThread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\MuleTrayIcon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\muuli_wdr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Observable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ObservableQueue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\OScopeCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\OtherFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\OtherStructs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\PartFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Preferences.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\PrefsUnifiedDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Proxy.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\RandomFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\RangeMap.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\RC4Encrypt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\RLE.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SafeFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Scanner.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ScopedPtr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SearchDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SearchFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SearchList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SearchListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Server.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ServerListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ServerWnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SHA.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SHAHashSet.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SharedFileList.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SharedFilesCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SharedFilesWnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\StateMachine.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Statistics.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\StatisticsDlg.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\StatTree.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\TerminationProcess.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ThreadScheduler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ThreadTasks.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Timer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\TransferWnd.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\Types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\UploadBandwidthThrottler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\UPnPCompatibility.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\UserEvents.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\GenericClientListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SharedFilePeersListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\SourceListCtrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\BitVector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\include\common\MacrosProgramSpecific.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\UpDownClientEC.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\ClientRef.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="..\..\..\..\amule.rc" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMuleWeb Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMuleWeb/aMuleWeb.vcxproj Added

@@ -0,0 +1,228 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}</ProjectGuid>
+    <RootNamespace>aMuleWeb</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_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>
+      <AdditionalDependencies>ws2_32.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_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>
+      <AdditionalDependencies>ws2_32.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;$(SolutionDir)..\..\..\..\wxWidgets29\src\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;WITH_LIBPNG;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_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>
+      <AdditionalDependencies>ws2_32.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;$(SolutionDir)..\..\..\..\wxWidgets29\src\png;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;WITH_LIBPNG;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_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>
+      <AdditionalDependencies>ws2_32.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\ExternalConnector.cpp" />
+    <ClCompile Include="..\..\..\..\src\LoggerConsole.cpp" />
+    <ClCompile Include="..\..\..\..\src\NetworkFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\OtherFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\webserver\src\php_amule_lib.cpp" />
+    <ClCompile Include="..\..\..\..\src\webserver\src\php_core_lib.cpp" />
+    <ClCompile Include="..\..\..\..\src\webserver\src\php_lexer.c" />
+    <ClCompile Include="..\..\..\..\src\webserver\src\php_parser.c" />
+    <ClCompile Include="..\..\..\..\src\webserver\src\php_syntree.cpp" />
+    <ClCompile Include="..\..\..\..\src\RLE.cpp" />
+    <ClCompile Include="..\..\..\..\src\webserver\src\WebInterface.cpp" />
+    <ClCompile Include="..\..\..\..\src\webserver\src\WebServer.cpp" />
+    <ClCompile Include="..\..\..\..\src\webserver\src\WebSocket.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\ExternalConnector.h" />
+    <ClInclude Include="..\..\..\..\src\NetworkFunctions.h" />
+    <ClInclude Include="..\..\..\..\src\OtherFunctions.h" />
+    <ClInclude Include="..\..\..\..\src\webserver\src\php_core_lib.h" />
+    <ClInclude Include="..\..\..\..\src\webserver\src\php_parser.h" />
+    <ClInclude Include="..\..\..\..\src\webserver\src\php_syntree.h" />
+    <ClInclude Include="..\..\..\..\src\webserver\src\WebInterface.h" />
+    <ClInclude Include="..\..\..\..\src\webserver\src\WebServer.h" />
+    <ClInclude Include="..\..\..\..\src\webserver\src\WebSocket.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libs\libmulecommon\libmulecommon.vcxproj">
+      <Project>{293e6133-239a-4ed4-838e-9182b07c6b35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\libs\libmuleec\libmuleec.vcxproj">
+      <Project>{5a9ec6a5-68a3-43c8-960e-f7f03b16f1d1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/aMuleWeb/aMuleWeb.vcxproj.filters Added

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\ExternalConnector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\LoggerConsole.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\NetworkFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\OtherFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\webserver\src\php_amule_lib.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\webserver\src\php_core_lib.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\webserver\src\php_lexer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\webserver\src\php_parser.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\webserver\src\php_syntree.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\RLE.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\webserver\src\WebInterface.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\webserver\src\WebServer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\webserver\src\WebSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\ExternalConnector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\NetworkFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\OtherFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\webserver\src\php_core_lib.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\webserver\src\php_parser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\webserver\src\php_syntree.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\webserver\src\WebInterface.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\webserver\src\WebServer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\webserver\src\WebSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/ed2k Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/ed2k/ed2k.vcxproj Added

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}</ProjectGuid>
+    <RootNamespace>ed2k</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;USE_STD_STRING;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"ED2K Links Handler\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>USE_STD_STRING;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"ED2K Links Handler\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\ED2KLinkParser.cpp" />
+    <ClCompile Include="..\..\..\..\src\MagnetURI.cpp" />
+    <ClCompile Include="..\..\..\..\src\MuleCollection.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\FileLock.h" />
+    <ClInclude Include="..\..\..\..\src\MagnetURI.h" />
+    <ClInclude Include="..\..\..\..\src\MuleCollection.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libs\libmulecommon\libmulecommon.vcxproj">
+      <Project>{293e6133-239a-4ed4-838e-9182b07c6b35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/ed2k/ed2k.vcxproj.filters Added

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\ED2KLinkParser.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\MagnetURI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\MuleCollection.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\FileLock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\MagnetURI.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\MuleCollection.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/fileview Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/fileview/fileview.vcxproj Added

@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}</ProjectGuid>
+    <RootNamespace>fileview</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_SCL_SECURE_NO_WARNINGS;wxUSE_GUI=0;USE_WX_EXTENSIONS;MULEUNIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;wxUSE_GUI=0;USE_WX_EXTENSIONS;MULEUNIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_SCL_SECURE_NO_WARNINGS;wxUSE_GUI=0;USE_WX_EXTENSIONS;MULEUNIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_SCL_SECURE_NO_WARNINGS;wxUSE_GUI=0;USE_WX_EXTENSIONS;MULEUNIT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\CFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\fileview\eD2kFiles.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\fileview\FileView.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\fileview\KadFiles.cpp" />
+    <ClCompile Include="..\..\..\..\src\OtherFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\fileview\Print.cpp" />
+    <ClCompile Include="..\..\..\..\src\SafeFile.cpp" />
+    <ClCompile Include="..\..\..\..\src\Tag.cpp" />
+    <ClCompile Include="..\..\..\..\src\kademlia\utils\UInt128.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\utils\fileview\eD2kFiles.h" />
+    <ClInclude Include="..\..\..\..\src\utils\fileview\KadFiles.h" />
+    <ClInclude Include="..\..\..\..\src\utils\fileview\Print.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libs\libmulecommon\libmulecommon.vcxproj">
+      <Project>{293e6133-239a-4ed4-838e-9182b07c6b35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/fileview/fileview.vcxproj.filters Added

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\CFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\fileview\eD2kFiles.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\fileview\FileView.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\fileview\KadFiles.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\OtherFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\fileview\Print.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\SafeFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\Tag.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\kademlia\utils\UInt128.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\utils\fileview\eD2kFiles.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\fileview\KadFiles.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\fileview\Print.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/fixwxGUIDs.pl Added

@@ -0,0 +1,41 @@
+#!perl
+#
+# This script is only useful if your source is in a SVN working copy!
+#
+# Problem: whenever you add a new wxWidgets version and convert the VC6 projects,
+# they are converted to VC8 XML .vcproj . In the process, a new project GUID is created.
+# When you then open your solution, all GUIDs are updated.
+#
+# To avoid this:
+# 1) Open and close wx.dsw with VS9 to convert to wx.sln (VS10 can't open them)
+# 2) Open and close wx.sln, creating the .vcxproj
+# 3) Run this script. It will replace the new GUIDs in the wx vcxproj by the old ones from the aMule-MSVC10E-ExtLibs.sln .
+# 4) Now load aMule-MSVCE-ExtLibs.sln. It won't be changed anymore.
+#
+
+use strict;
+
+open(sln, 'aMule-MSVC10E-ExtLibs.sln') or die $!;
+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "..\..\..\..\wxWidgets\build\msw\wx_wxregex.vcxproj", "{A960D0AD-C20E-4FD6-B477-6509232C7D94}"
+#    <ProjectGuid>{B499DD81-BCA2-42D8-986C-E0FBAAC25B13}</ProjectGuid>
+while (<sln>) {
+	if (/^Project.*, \"(.+)\", \"(.+)\"/) {
+		my ($path, $guid) = ($1, $2);
+		next unless $path =~ /\\wxWidgets/;
+		$path =~ s-\\-/-g;
+		print "fix $path\n";
+		open(prj, $path) or die "$path $!";
+		my @content = <prj>;
+		close prj;
+		foreach (@content) {
+			if (/<ProjectGuid>/) {
+				$_ = "    <ProjectGuid>$guid</ProjectGuid>\n";
+				print $_;
+				last;
+			}
+		}
+		open(prj, ">$path") or die;
+		print prj @content;
+		close prj;
+	}
+}

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libGeoIP Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libGeoIP/GeoIP.cmd Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libGeoIP/GeoIP_X.hpp Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libGeoIP/libGeoIP.vcxproj Added

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8CA0F896-7689-4CE0-9D16-99C9C83847E1}</ProjectGuid>
+    <RootNamespace>libGeoIP</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="GeoIP_X.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="GeoIP.h" />
+    <ClInclude Include="GeoIP_X.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="GeoIP.cmd">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">create dummy files</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">GeoIP.cmd
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">GeoIP_X.c;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">create dummy files</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">GeoIP.cmd
+</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">GeoIP_X.c;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libGeoIP/libGeoIP.vcxproj.filters Added

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="GeoIP_X.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="GeoIP.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="GeoIP_X.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="GeoIP.cmd" />
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libGeoIP/readme.txt Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libext Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libext/buildlibext.vcxproj Added

@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}</ProjectGuid>
+    <RootNamespace>MSVCExpressExtLibs</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Utility</ConfigurationType>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <PostBuildEvent>
+      <Message>join external libs</Message>
+      <Command>if not exist ..\..\$(Configuration) mkdir ..\..\$(Configuration)
+lib /LTCG /out:..\..\$(Configuration)\libext.lib "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_media.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxjpegd.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_adv.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxregexud.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_richtext.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxzlibd.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28ud.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_qa.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28ud_xml.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28ud_odbc.lib" "..\..\..\..\..\..\cryptopp\win32\output\debug\cryptlib.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxtiffd.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28ud_net.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_core.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_gl.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxpngd.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_dbgrid.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_xrc.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxexpatd.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_html.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_aui.lib"
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <PostBuildEvent>
+      <Message>join external libs</Message>
+      <Command>if not exist ..\..\$(Configuration) mkdir ..\..\$(Configuration)
+lib /LTCG /out:..\..\$(Configuration)\libext.lib "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_media.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxjpeg.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_adv.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxregexu.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_richtext.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxzlib.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_qa.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u_xml.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u_odbc.lib" "..\..\..\..\..\..\cryptopp\win32\output\release\cryptlib.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxtiff.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u_net.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_core.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_gl.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxpng.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_dbgrid.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_xrc.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxexpat.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_html.lib" "..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_aui.lib"
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <PostBuildEvent>
+      <Message>join external libs</Message>
+      <Command>if not exist ..\..\$(Configuration) mkdir ..\..\$(Configuration)
+lib /LTCG /out:..\..\$(Configuration)\libext.lib "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29ud_media.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxjpegd.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29ud_adv.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxregexud.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29ud_richtext.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxzlibd.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxbase29ud.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29ud_qa.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxbase29ud_xml.lib" "..\..\..\..\..\..\cryptopp\win32\output\debug\cryptlib.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxtiffd.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxbase29ud_net.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29ud_core.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29ud_gl.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxpngd.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29ud_xrc.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxexpatd.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29ud_html.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29ud_aui.lib"
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <PostBuildEvent>
+      <Message>join external libs</Message>
+      <Command>if not exist ..\..\$(Configuration) mkdir ..\..\$(Configuration)
+lib /LTCG /out:..\..\$(Configuration)\libext.lib "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29u_media.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxjpeg.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29u_adv.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxregexu.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29u_richtext.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxzlib.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxbase29u.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29u_qa.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxbase29u_xml.lib" "..\..\..\..\..\..\cryptopp\win32\output\release\cryptlib.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxtiff.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxbase29u_net.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29u_core.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29u_gl.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxpng.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29u_xrc.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxexpat.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29u_html.lib" "..\..\..\..\..\..\wxWidgets29\lib\vc_lib\wxmsw29u_aui.lib"
+</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_adv.vcxproj">
+      <Project>{24c45343-fd20-5c92-81c1-35a2ae841e79}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_aui.vcxproj">
+      <Project>{a16d3832-0f42-57ce-8f48-50e06649ade8}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_base.vcxproj">
+      <Project>{3fcc50c2-81e9-5db2-b8d8-2129427568b1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_core.vcxproj">
+      <Project>{6744dad8-9c70-574a-bff2-9f8dddb24a75}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_gl.vcxproj">
+      <Project>{da8b15ef-6750-5928-bc0e-c748213cf9b2}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_html.vcxproj">
+      <Project>{33cc42f9-7756-5587-863c-8d4461b7c5dd}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_media.vcxproj">
+      <Project>{8bd8f8d9-4275-5b42-a8f4-f1db2970a550}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_net.vcxproj">
+      <Project>{69f2ede4-7d21-5738-9bc0-f66f61c9ae00}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_qa.vcxproj">
+      <Project>{e21129e0-7c08-5936-9d8c-0d60b5319ba7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_richtext.vcxproj">
+      <Project>{7fb0902d-8579-5dce-b883-daf66a885005}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxexpat.vcxproj">
+      <Project>{a1a8355b-0988-528e-9cc2-b971d6266669}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxjpeg.vcxproj">
+      <Project>{6053cc38-cdee-584c-8bc8-4b000d800fc7}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxpng.vcxproj">
+      <Project>{8acc122a-ca6a-5aa6-9c97-9cdd2e533db0}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxregex.vcxproj">
+      <Project>{56a4b526-bb81-5d01-aaa9-16d23bbb169d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxtiff.vcxproj">
+      <Project>{75596ce6-5ae7-55c9-b890-c07b0a657a83}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxzlib.vcxproj">
+      <Project>{8b867186-a0b5-5479-b824-e176edd27c40}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_xml.vcxproj">
+      <Project>{3e6dca27-5fa3-53ec-bbd6-2d42294b7ae6}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets29\build\msw\wx_vc9_xrc.vcxproj">
+      <Project>{09f2f96a-1cc6-5e43-af1d-956ec2a4888d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_adv.vcxproj">
+      <Project>{fe8c58ce-6828-4125-8563-28f929d307c2}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_aui.vcxproj">
+      <Project>{64dd39fc-b3fa-4625-86ba-d8a7ae7d1d2c}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_base.vcxproj">
+      <Project>{3ea1ce4c-c6fa-42c0-a152-10fda37fe935}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_core.vcxproj">
+      <Project>{83e249bf-12a0-4d0d-b9a5-b9560fde0ba1}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_dbgrid.vcxproj">
+      <Project>{c4590207-2d76-445f-833d-d59bb14d2c51}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_gl.vcxproj">
+      <Project>{8cf291f4-6284-4118-98a7-9d2146c6d5ea}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_html.vcxproj">
+      <Project>{8e917a7a-cc97-45c8-80a1-2ebd30936d23}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_media.vcxproj">
+      <Project>{6b245136-054c-4400-bf21-d30b05c231cd}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_net.vcxproj">
+      <Project>{c963a510-37eb-4d71-85b9-2380fcd4b3d3}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_odbc.vcxproj">
+      <Project>{b535be44-fccc-4911-862f-a7ed6cc6b597}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_qa.vcxproj">
+      <Project>{ae383b44-ee53-4353-9bf0-2f3767d6ce51}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_richtext.vcxproj">
+      <Project>{4740520c-adf1-464d-97c5-85fcfeecf76d}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_wxexpat.vcxproj">
+      <Project>{474a0ed2-5969-47f0-b37f-7bc05c44f99b}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_wxjpeg.vcxproj">
+      <Project>{4c6519fa-63b7-4631-b087-a17a368dbcd9}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_wxpng.vcxproj">
+      <Project>{4f88c347-8c7a-47c1-84c8-d4e154a33d30}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_wxregex.vcxproj">
+      <Project>{a960d0ad-c20e-4fd6-b477-6509232c7d94}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_wxtiff.vcxproj">
+      <Project>{456e58bd-84ca-4190-a88b-0a9b30dfd6d6}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_wxzlib.vcxproj">
+      <Project>{99a6cd35-a635-4e39-93ff-f9a359e356d2}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_xml.vcxproj">
+      <Project>{46b97e73-8e57-42c1-a46e-af0495d625dd}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\..\..\wxWidgets\build\msw\wx_xrc.vcxproj">
+      <Project>{ba59346e-5eb2-4d25-94a7-132d9c953a05}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="dummy.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libext/buildlibext.vcxproj.filters Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libmulecommon Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libmulecommon/libmulecommon.vcxproj Added

@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{293E6133-239A-4ED4-838E-9182B07C6B35}</ProjectGuid>
+    <RootNamespace>libmulecommon</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;$(SolutionDir)..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\..\src\libs\common\FileFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\..\src\libs\common\Format.cpp" />
+    <ClCompile Include="..\..\..\..\..\src\libs\common\MD5Sum.cpp" />
+    <ClCompile Include="..\..\..\..\..\src\libs\common\MuleDebug.cpp" />
+    <ClCompile Include="..\..\..\..\..\src\libs\common\Path.cpp" />
+    <ClCompile Include="..\..\..\..\..\src\libs\common\strerror_r.c" />
+    <ClCompile Include="..\..\..\..\..\src\libs\common\StringFunctions.cpp" />
+    <ClCompile Include="..\..\..\..\..\src\libs\common\TextFile.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\..\..\src\include\common\ClientVersion.h">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">Create config.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">cd "$(SolutionDir)..\..\.."
+"$(SolutionDir)makeconfig.cmd"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create config.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cd "$(SolutionDir)..\..\.."
+"$(SolutionDir)makeconfig.cmd"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">Create config.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">cd "$(SolutionDir)..\..\.."
+"$(SolutionDir)makeconfig.cmd"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)..\..\..\config.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create config.h</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cd "$(SolutionDir)..\..\.."
+"$(SolutionDir)makeconfig.cmd"</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)..\..\..\config.h;%(Outputs)</Outputs>
+    </CustomBuild>
+    <ClInclude Include="..\..\..\..\..\src\libs\common\FileFunctions.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\common\Format.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\common\MD5Sum.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\common\MuleDebug.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\common\Path.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\common\strerror_r.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\common\StringFunctions.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\common\TextFile.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libmulecommon/libmulecommon.vcxproj.filters Added

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\..\src\libs\common\FileFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\..\src\libs\common\Format.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\..\src\libs\common\MD5Sum.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\..\src\libs\common\MuleDebug.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\..\src\libs\common\Path.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\..\src\libs\common\StringFunctions.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\..\src\libs\common\TextFile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\..\src\libs\common\strerror_r.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\..\src\libs\common\FileFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\..\src\libs\common\Format.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\..\src\libs\common\MD5Sum.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\..\src\libs\common\MuleDebug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\..\src\libs\common\Path.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\..\src\libs\common\StringFunctions.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\..\src\libs\common\TextFile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\..\src\libs\common\strerror_r.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\..\..\..\src\include\common\ClientVersion.h">
+      <Filter>Header Files</Filter>
+    </CustomBuild>
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libmuleec Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libmuleec/libmuleec.vcxproj Added

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}</ProjectGuid>
+    <RootNamespace>libmuleec</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\..\src\libs\ec\cpp\ECMuleSocket.cpp" />
+    <ClCompile Include="..\..\..\..\..\src\libs\ec\cpp\ECPacket.cpp" />
+    <ClCompile Include="..\..\..\..\..\src\libs\ec\cpp\ECSocket.cpp" />
+    <ClCompile Include="..\..\..\..\..\src\libs\ec\cpp\ECSpecialTags.cpp" />
+    <ClCompile Include="..\..\..\..\..\src\libs\ec\cpp\ECTag.cpp" />
+    <ClCompile Include="..\..\..\..\..\src\libs\ec\cpp\RemoteConnect.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\..\src\libs\ec\cpp\ECCodes.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\ec\cpp\ECFileConfig.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\ec\cpp\ECID.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\ec\cpp\ECMuleSocket.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\ec\cpp\ECPacket.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\ec\cpp\ECSocket.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\ec\cpp\ECSpecialTags.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\ec\cpp\ECTag.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\ec\cpp\ECTagTypes.h" />
+    <ClInclude Include="..\..\..\..\..\src\libs\ec\cpp\RemoteConnect.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libmulecommon\libmulecommon.vcxproj">
+      <Project>{293e6133-239a-4ed4-838e-9182b07c6b35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libmuleec/libmuleec.vcxproj.filters Added

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\libs\ec\cpp\ECMuleSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libs\ec\cpp\ECPacket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libs\ec\cpp\ECSocket.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libs\ec\cpp\ECSpecialTags.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libs\ec\cpp\ECTag.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\libs\ec\cpp\RemoteConnect.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\libs\ec\cpp\ECCodes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libs\ec\cpp\ECFileConfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libs\ec\cpp\ECID.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libs\ec\cpp\ECMuleSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libs\ec\cpp\ECPacket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libs\ec\cpp\ECSocket.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libs\ec\cpp\ECSpecialTags.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libs\ec\cpp\ECTag.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libs\ec\cpp\ECTagTypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\src\libs\ec\cpp\RemoteConnect.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libmuleexternalwxlistctrl Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libmuleexternalwxlistctrl/libmuleexternalwxlistctrl.vcxproj Added

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}</ProjectGuid>
+    <RootNamespace>libmuleexternalwxlistctrl</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Async</ExceptionHandling>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\..\src\extern\wxWidgets\listctrl.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\..\src\extern\wxWidgets\listctrl.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/libs/libmuleexternalwxlistctrl/libmuleexternalwxlistctrl.vcxproj.filters Added

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\extern\wxWidgets\listctrl.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\src\extern\wxWidgets\listctrl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/makeconfig.cmd Added

@@ -0,0 +1,35 @@
+@echo off
+echo #ifndef CONFIG_H>config.h
+echo #define CONFIG_H>>config.h
+
+rem Tarballs have a .svn-revision for identification
+if not exist .svn-revision goto svn1
+FOR /F %%i IN (.svn-revision) DO set svnv=%%i
+goto :foundsvnversion
+
+:svn1
+rem Try to get version from a SVN working copy, svnversion must be in path
+set svnv=exported
+call svnversion >nul 2>&1
+if errorlevel 1 goto nosvnversion
+FOR /F %%i IN ('svnversion src') DO set svnv=%%i
+if %svnv%==exported goto nosvnversion
+if %svnv%==Unversioned goto nosvnversion
+
+:foundsvnversion
+echo SVNDATE is %svnv%
+echo #define SVNDATE "rev. %svnv%">>config.h
+echo #define VERSION "SVN">>config.h
+echo #define __PRERELEASE__>>config.h
+goto finish
+
+:nosvnversion
+echo release build, version from ^<common/ClientVersion.h^>
+echo #include ^<src/include/common/ClientVersion.h^> >>config.h
+
+:finish
+echo #define CRYPTOPP_INCLUDE_PREFIX	../cryptopp>>config.h
+echo #define PACKAGE "amule">>config.h
+echo #define HAVE_ERRNO_H>>config.h
+echo #define HAVE_STRERROR>>config.h
+echo #endif>>config.h

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/version.rc Added

@@ -0,0 +1,52 @@
+#include <winver.h>
+#define HAVE_CONFIG_H
+#include "../../../src/include/common/ClientVersion.h"
+
+#ifdef __PRERELEASE__
+#define VER_PRERELEASE	VS_FF_PRERELEASE
+#undef VER_RELEASE
+#define VER_RELEASE	0
+#define VER_PRODUCTVERSION_STR	VERSION " " SVNDATE
+#else
+#define VER_PRERELEASE	0
+#ifndef VER_RELEASE
+#define VER_RELEASE	1
+#endif
+#define VER_PRODUCTVERSION_STR	VERSION
+#endif
+
+#ifdef __DEBUG__
+#define VER_DEBUG	VS_FF_DEBUG
+#else
+#define VER_DEBUG	0
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION	VERSION_MJR, VERSION_MIN, VERSION_UPDATE, VER_RELEASE
+	PRODUCTVERSION	VERSION_MJR, VERSION_MIN, VERSION_UPDATE, VER_RELEASE
+	FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
+	FILEFLAGS	VER_DEBUG | VER_PRERELEASE
+	FILEOS		VOS__WINDOWS32
+	FILETYPE	VFT_APP
+	FILESUBTYPE	0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE	"Comments",			"http://www.amule.org/"
+			VALUE	"FileDescription",	VER_FILEDESCRIPTION_STR
+			VALUE	"FileVersion",		VER_PRODUCTVERSION_STR
+			VALUE	"InternalName",		VER_INTERNALNAME_STR
+			VALUE	"OriginalFilename",	VER_ORIGINALFILENAME_STR
+			VALUE	"ProductName",		"aMule"
+			VALUE	"ProductVersion",	VER_PRODUCTVERSION_STR
+			VALUE	"LegalCopyright",	"aMule Team ( admin@amule.org )"
+			VALUE	"CompanyName",		"http://www.amule.org/"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE	"Translation", 0x0409, 1200
+	END
+END

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/wxCas Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/wxCas/wxCas.vcxproj Added

@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug29|Win32">
+      <Configuration>Debug29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release29|Win32">
+      <Configuration>Release29</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5FCAFC30-922E-446F-8DF5-D71819AB6356}</ProjectGuid>
+    <RootNamespace>wxCas</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;$(SolutionDir)libs\libGeoIP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;ENABLE_NLS;ENABLE_IP2COUNTRY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;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>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets\include;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib;$(SolutionDir)libs\libGeoIP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;ENABLE_NLS;ENABLE_IP2COUNTRY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;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>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;$(SolutionDir)libs\libGeoIP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;ENABLE_NLS;ENABLE_IP2COUNTRY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"Graphical aMule Statistics\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release29|Win32'">
+    <ClCompile>
+      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu;$(SolutionDir)..\..\..\src\libs;$(SolutionDir)..\..\..\src;$(SolutionDir)..\..\..\src\include;$(SolutionDir)..\..\..\;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib;$(SolutionDir)libs\libGeoIP;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;ENABLE_NLS;ENABLE_IP2COUNTRY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\"Graphical aMule Statistics\";VER_INTERNALNAME_STR=\"$(ProjectName)\";VER_ORIGINALFILENAME_STR=\"$(TargetFileName)\";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\..\wxWidgets29\include;$(SolutionDir)..\..\..;$(SolutionDir)..\..\..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>comctl32.lib;ws2_32.lib;rpcrt4.lib;shlwapi.lib;$(OutDir)libext.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\linuxmon.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\onlinesig.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\wxcas.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\wxcascte.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\wxcasframe.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\wxcaspix.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\wxcasprefs.cpp" />
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\wxcasprint.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\linuxmon.h" />
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\onlinesig.h" />
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\wxcas.h" />
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\wxcascte.h" />
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\wxcasframe.h" />
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\wxcaspix.h" />
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\wxcasprefs.h" />
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\wxcasprint.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc" />
+    <ResourceCompile Include="..\..\..\..\src\utils\wxCas\wxcas.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libs\libmulecommon\libmulecommon.vcxproj">
+      <Project>{293e6133-239a-4ed4-838e-9182b07c6b35}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC10/wxCas/wxCas.vcxproj.filters Added

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\linuxmon.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\onlinesig.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\wxcas.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\wxcascte.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\wxcasframe.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\wxcaspix.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\wxcasprefs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\src\utils\wxCas\src\wxcasprint.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\linuxmon.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\onlinesig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\wxcas.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\wxcascte.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\wxcasframe.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\wxcaspix.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\wxcasprefs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\src\utils\wxCas\src\wxcasprint.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\version.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+    <ResourceCompile Include="..\..\..\..\src\utils\wxCas\wxcas.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9 Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/PCH.cpp Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/PCH.h Added

@@ -0,0 +1,92 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2002-2011 Stu Redman ( sturedman@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 PCH_H
+#define PCH_H
+
+#include <wx/wxprec.h>
+
+#include <csignal>
+#include <cstring>
+#include <deque>
+#include <list>
+#include <map>
+#include <memory>
+#include <queue>
+#include <set>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+#include <zlib.h>
+
+#include "CryptoPP_Inc.h"
+
+#include "amule.h"
+#include "config.h"
+
+#include <common/ClientVersion.h>
+#include <common/EventIDs.h>
+#include <common/FileFunctions.h>
+#include <common/Format.h>
+#include <common/Macros.h>
+#include <common/MacrosProgramSpecific.h>
+#include <common/MD5Sum.h>
+#include <common/MuleDebug.h>
+#include <common/Path.h>
+#include <common/StringFunctions.h>
+#include <common/TextFile.h>
+
+#include "ClientCreditsList.h"
+#include "ClientList.h"
+#include "ClientRef.h"
+#include "ClientUDPSocket.h"
+#include "ExternalConn.h"
+#include "InternalEvents.h"
+#include "KnownFileList.h"
+#include "ListenSocket.h"
+#include "Logger.h"
+#include "MD4Hash.h"
+#include "OtherFunctions.h"
+#include "PartFile.h"
+#include "Preferences.h"
+#include "ScopedPtr.h"
+#include "Server.h"
+#include "Statistics.h"
+#include "ThreadTasks.h"
+#include "UserEvents.h"
+
+#ifndef CLIENT_GUI
+#include "kademlia/kademlia/Kademlia.h"
+#include "kademlia/kademlia/Prefs.h"
+#include "IPFilter.h"
+#endif
+
+#ifndef AMULE_DAEMON
+#include "amuleDlg.h"
+#include "muuli_wdr.h"
+#endif
+
+#endif

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/README - MSVC.txt Added

@@ -0,0 +1,76 @@
+How to build aMule with Visual Studio
+See also http://www.amule.org/wiki/index.php/HowTo_compile_with_Visual_Studio
+
+This solution for Microsoft's Visual Studio 2008 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 
+with some generated files. 
+
+The solution expects to find the following items:
+
+* wxWidgets ( http://www.wxwidgets.org ) at a specific location: ..\..\wxWidgets\ from the solution directory.
+* crypto++ ( http://www.cryptopp.com/ ) at a specific location: ..\..\cryptopp\ from the solution directory.
+
+
+This means you must create a folder where you will compile aMule, and it must have this structure:
+
+- <Root folder> - Your main folder. You can name it whatever you want.
+ | 
+ | - wxWidgets ( wxWidgets sources, no intermediate subfolder )
+ |
+ | - wxWidgets29 ( wxWidgets 2.9 sources, only required if you want to build against unstable wx 2.9 )
+ |
+ | - cryptopp ( Crypto++ sources, no intermediate subfolder )
+ |
+ | - <amule-sources> ( aMule sources, no intermediate subfolder, can have any name )
+
+
+I hope this is simple enough to get you started. 
+
+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
+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. 
+
+There are four solutions:
+1) aMule-MSVCE.sln
+   which includes aMule, aMule tools and aMule's internal libs
+2) aMule-MSVCE-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-MSVCE-ExtLibs29.sln
+   same but using wxWidgets 2.9
+4) aMule-MSVC.sln
+   includes everything and is organized in folders. It only works with the commercial edition of MSVC and is outdated now.
+
+The Debug/Release configs build against wxWidgets 2.8 (stable), Debug29/Release29 configs build against wxWidgets 2.9 (unstable)
+
+To build aMule with GeoIP see libs\libGeoIP\readme.txt . 
+Without it you get an error building libGeoIP when you build the full solution.
+Just ignore it or unload the libGeoIP project.
+
+
+If aMule fails to compile, here are some guidelines/patches to the most common problems:
+
+[*] If Scanner.cpp fails to compile, apply this change around line 1545:
+
+-        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
++        b->yy_is_interactive = 0;
+
+if necessary.
+
+[*] The file muuli_wdr.cpp can also fail if it hasn't been patched for MSVC in the current code. The most common problem comes 
+from this kind of lines:
+
+        _("For a film you can say its length, its story, language ...\n"
+          "and if it's a fake, you can tell that to other users of aMule."),
+
+Notice the opening and closing parentheses are on a different line, and the quotes opened again. While this is ok for gcc, Visual
+Studio won't allow it. Change this lines to be a single-line quoted text. In the above example, the result will be:
+
+	_("For a film you can say its length, its story, language ...\nand if it's a fake, you can tell that to other users of aMule."),
+
+And that should be it. Feel free to ask in the aMule forum at forum.amule.org, "Compilation problems" section if you have further
+doubts.

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests/FileDataIO Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests/FileDataIO/FileDataIO.vcproj Added

@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="FileDataIO"
+	ProjectGUID="{C27E39F5-BA92-4245-A537-7B7852508900}"
+	RootNamespace="FileDataIO"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\unittests&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;wxUSE_GUI=0;MULEUNIT;USE_WX_EXTENSIONS"
+				MinimalRebuild="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="2"
+				IgnoreAllDefaultLibraries="false"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\unittests&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;MULEUNIT;USE_WX_EXTENSIONS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\src\CFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\unittests\tests\FileDataIOTest.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\MemFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\SafeFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\Tag.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests/FormatTest Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests/FormatTest/FormatTest.vcproj Added

@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="Format"
+	ProjectGUID="{269AD4B7-8245-4476-9179-E4659F6E217F}"
+	RootNamespace="FormatTest"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\unittests&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;wxUSE_GUI=0;MULEUNIT;USE_WX_EXTENSIONS"
+				MinimalRebuild="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\unittests&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;MULEUNIT;USE_WX_EXTENSIONS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\unittests\tests\FormatTest.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests/NetworkFunctions Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests/NetworkFunctions/NetworkFunctions.vcproj Added

@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="NetworkFunctions"
+	ProjectGUID="{6B452F4F-43C9-408E-BDF3-C70FCA9F257D}"
+	RootNamespace="NetworkFunctions"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\unittests&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;wxUSE_GUI=0;MULEUNIT;USE_WX_EXTENSIONS"
+				MinimalRebuild="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\unittests&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;MULEUNIT;USE_WX_EXTENSIONS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\src\NetworkFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\unittests\tests\NetworkFunctionsTest.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests/RangeMap Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests/RangeMap/RangeMap.vcproj Added

@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="RangeMap"
+	ProjectGUID="{9A19C692-FFBD-467C-B8A8-63166F421940}"
+	RootNamespace="RangeMap"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\unittests&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;wxUSE_GUI=0;MULEUNIT;USE_WX_EXTENSIONS"
+				MinimalRebuild="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\unittests&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;MULEUNIT;USE_WX_EXTENSIONS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\unittests\tests\RangeMapTest.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests/StringFunctions Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests/StringFunctions/StringFunctions.vcproj Added

@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="StringFunctions"
+	ProjectGUID="{5A024799-C5ED-41CF-BF0C-914A11799234}"
+	RootNamespace="StringFunctions"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\unittests&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;wxUSE_GUI=0;MULEUNIT;USE_WX_EXTENSIONS"
+				MinimalRebuild="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\unittests&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;MULEUNIT;USE_WX_EXTENSIONS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\unittests\tests\StringFunctionsTest.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests/libmuleunittest Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/UnitTests/libmuleunittest/libmuleunittest.vcproj Added

@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libmuleunittest"
+	ProjectGUID="{5FE132E5-83CB-4880-B2D9-CA828E008786}"
+	RootNamespace="libmuleunittest"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;"
+				PreprocessorDefinitions="_DEBUG;_LIB;MULEUNIT"
+				MinimalRebuild="true"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;"
+				PreprocessorDefinitions="_LIB;MULEUNIT"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\unittests\muleunit\main.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\unittests\muleunit\test.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\unittests\muleunit\testcase.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\unittests\muleunit\testregistry.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\unittests\muleunit\test.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\unittests\muleunit\testcase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\unittests\muleunit\testregistry.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aLinkCreator Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aLinkCreator/aLinkCreator.vcproj Added

@@ -0,0 +1,414 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="aLinkCreator"
+	ProjectGUID="{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}"
+	RootNamespace="aLinkCreator"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;HAVE_CONFIG_H"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Link Creator\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\&quot;"
+				PreprocessorDefinitions="NDEBUG;HAVE_CONFIG_H"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Link Creator\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;HAVE_CONFIG_H"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Link Creator\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\&quot;"
+				PreprocessorDefinitions="NDEBUG;HAVE_CONFIG_H"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Link Creator\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\alc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\alcframe.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\alcpix.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\ed2khash.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\md4.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\alc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\alcc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\alcframe.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\alcpix.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\bithelp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\ed2khash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\md4.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\alc.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\version.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aLinkCreator/alcc.vcproj Added

@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="alcc"
+	ProjectGUID="{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}"
+	RootNamespace="alcc"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)ALC"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;HAVE_CONFIG_H"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Link Creator\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)ALC"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;HAVE_CONFIG_H"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Link Creator\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)ALC"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;HAVE_CONFIG_H"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Text Client\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)ALC"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;HAVE_CONFIG_H"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Link Creator\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\alcc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\ed2khash.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\md4.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\alcc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\bithelp.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\ed2khash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\src\md4.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\utils\aLinkCreator\alc.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\version.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMule Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMule-MSVC.sln Changed

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMule-MSVCE-ExtLibs.sln Added

@@ -0,0 +1,168 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "buildlibext", "libs\libext\buildlibext.vcproj", "{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C4590207-2D76-445F-833D-D59BB14D2C51} = {C4590207-2D76-445F-833D-D59BB14D2C51}
+		{4740520C-ADF1-464D-97C5-85FCFEECF76D} = {4740520C-ADF1-464D-97C5-85FCFEECF76D}
+		{C963A510-37EB-4D71-85B9-2380FCD4B3D3} = {C963A510-37EB-4D71-85B9-2380FCD4B3D3}
+		{99A6CD35-A635-4E39-93FF-F9A359E356D2} = {99A6CD35-A635-4E39-93FF-F9A359E356D2}
+		{6B245136-054C-4400-BF21-D30B05C231CD} = {6B245136-054C-4400-BF21-D30B05C231CD}
+		{AE383B44-EE53-4353-9BF0-2F3767D6CE51} = {AE383B44-EE53-4353-9BF0-2F3767D6CE51}
+		{B535BE44-FCCC-4911-862F-A7ED6CC6B597} = {B535BE44-FCCC-4911-862F-A7ED6CC6B597}
+		{4F88C347-8C7A-47C1-84C8-D4E154A33D30} = {4F88C347-8C7A-47C1-84C8-D4E154A33D30}
+		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935} = {3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}
+		{BA59346E-5EB2-4D25-94A7-132D9C953A05} = {BA59346E-5EB2-4D25-94A7-132D9C953A05}
+		{46B97E73-8E57-42C1-A46E-AF0495D625DD} = {46B97E73-8E57-42C1-A46E-AF0495D625DD}
+		{8E917A7A-CC97-45C8-80A1-2EBD30936D23} = {8E917A7A-CC97-45C8-80A1-2EBD30936D23}
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
+		{A960D0AD-C20E-4FD6-B477-6509232C7D94} = {A960D0AD-C20E-4FD6-B477-6509232C7D94}
+		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6} = {456E58BD-84CA-4190-A88B-0A9B30DFD6D6}
+		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1} = {83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}
+		{FE8C58CE-6828-4125-8563-28F929D307C2} = {FE8C58CE-6828-4125-8563-28F929D307C2}
+		{474A0ED2-5969-47F0-B37F-7BC05C44F99B} = {474A0ED2-5969-47F0-B37F-7BC05C44F99B}
+		{8CF291F4-6284-4118-98A7-9D2146C6D5EA} = {8CF291F4-6284-4118-98A7-9D2146C6D5EA}
+		{4C6519FA-63B7-4631-B087-A17A368DBCD9} = {4C6519FA-63B7-4631-B087-A17A368DBCD9}
+		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C} = {64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\..\..\..\cryptopp\cryptlib.vcproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "..\..\..\..\wxWidgets\build\msw\wx_wxregex.vcproj", "{A960D0AD-C20E-4FD6-B477-6509232C7D94}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "..\..\..\..\wxWidgets\build\msw\wx_wxzlib.vcproj", "{99A6CD35-A635-4E39-93FF-F9A359E356D2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "..\..\..\..\wxWidgets\build\msw\wx_wxpng.vcproj", "{4F88C347-8C7A-47C1-84C8-D4E154A33D30}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "..\..\..\..\wxWidgets\build\msw\wx_wxjpeg.vcproj", "{4C6519FA-63B7-4631-B087-A17A368DBCD9}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "..\..\..\..\wxWidgets\build\msw\wx_wxtiff.vcproj", "{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "..\..\..\..\wxWidgets\build\msw\wx_wxexpat.vcproj", "{474A0ED2-5969-47F0-B37F-7BC05C44F99B}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\..\..\..\wxWidgets\build\msw\wx_base.vcproj", "{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\..\..\..\wxWidgets\build\msw\wx_net.vcproj", "{C963A510-37EB-4D71-85B9-2380FCD4B3D3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\..\..\wxWidgets\build\msw\wx_core.vcproj", "{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "..\..\..\..\wxWidgets\build\msw\wx_adv.vcproj", "{FE8C58CE-6828-4125-8563-28F929D307C2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "..\..\..\..\wxWidgets\build\msw\wx_media.vcproj", "{6B245136-054C-4400-BF21-D30B05C231CD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "odbc", "..\..\..\..\wxWidgets\build\msw\wx_odbc.vcproj", "{B535BE44-FCCC-4911-862F-A7ED6CC6B597}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbgrid", "..\..\..\..\wxWidgets\build\msw\wx_dbgrid.vcproj", "{C4590207-2D76-445F-833D-D59BB14D2C51}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "..\..\..\..\wxWidgets\build\msw\wx_html.vcproj", "{8E917A7A-CC97-45C8-80A1-2EBD30936D23}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "..\..\..\..\wxWidgets\build\msw\wx_qa.vcproj", "{AE383B44-EE53-4353-9BF0-2F3767D6CE51}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "..\..\..\..\wxWidgets\build\msw\wx_xml.vcproj", "{46B97E73-8E57-42C1-A46E-AF0495D625DD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "..\..\..\..\wxWidgets\build\msw\wx_xrc.vcproj", "{BA59346E-5EB2-4D25-94A7-132D9C953A05}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\..\..\..\wxWidgets\build\msw\wx_aui.vcproj", "{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "..\..\..\..\wxWidgets\build\msw\wx_richtext.vcproj", "{4740520C-ADF1-464D-97C5-85FCFEECF76D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "..\..\..\..\wxWidgets\build\msw\wx_gl.vcproj", "{8CF291F4-6284-4118-98A7-9D2146C6D5EA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Release|Win32 = Release|Win32
+		Debug|Win32 = Debug|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.ActiveCfg = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32
+		{A960D0AD-C20E-4FD6-B477-6509232C7D94}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{A960D0AD-C20E-4FD6-B477-6509232C7D94}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{A960D0AD-C20E-4FD6-B477-6509232C7D94}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{A960D0AD-C20E-4FD6-B477-6509232C7D94}.Release|Win32.Build.0 = Unicode Release|Win32
+		{99A6CD35-A635-4E39-93FF-F9A359E356D2}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{99A6CD35-A635-4E39-93FF-F9A359E356D2}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{99A6CD35-A635-4E39-93FF-F9A359E356D2}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{99A6CD35-A635-4E39-93FF-F9A359E356D2}.Release|Win32.Build.0 = Unicode Release|Win32
+		{4F88C347-8C7A-47C1-84C8-D4E154A33D30}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{4F88C347-8C7A-47C1-84C8-D4E154A33D30}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{4F88C347-8C7A-47C1-84C8-D4E154A33D30}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{4F88C347-8C7A-47C1-84C8-D4E154A33D30}.Release|Win32.Build.0 = Unicode Release|Win32
+		{4C6519FA-63B7-4631-B087-A17A368DBCD9}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{4C6519FA-63B7-4631-B087-A17A368DBCD9}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{4C6519FA-63B7-4631-B087-A17A368DBCD9}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{4C6519FA-63B7-4631-B087-A17A368DBCD9}.Release|Win32.Build.0 = Unicode Release|Win32
+		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{456E58BD-84CA-4190-A88B-0A9B30DFD6D6}.Release|Win32.Build.0 = Unicode Release|Win32
+		{474A0ED2-5969-47F0-B37F-7BC05C44F99B}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{474A0ED2-5969-47F0-B37F-7BC05C44F99B}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{474A0ED2-5969-47F0-B37F-7BC05C44F99B}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{474A0ED2-5969-47F0-B37F-7BC05C44F99B}.Release|Win32.Build.0 = Unicode Release|Win32
+		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{3EA1CE4C-C6FA-42C0-A152-10FDA37FE935}.Release|Win32.Build.0 = Unicode Release|Win32
+		{C963A510-37EB-4D71-85B9-2380FCD4B3D3}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{C963A510-37EB-4D71-85B9-2380FCD4B3D3}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{C963A510-37EB-4D71-85B9-2380FCD4B3D3}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{C963A510-37EB-4D71-85B9-2380FCD4B3D3}.Release|Win32.Build.0 = Unicode Release|Win32
+		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{83E249BF-12A0-4D0D-B9A5-B9560FDE0BA1}.Release|Win32.Build.0 = Unicode Release|Win32
+		{FE8C58CE-6828-4125-8563-28F929D307C2}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{FE8C58CE-6828-4125-8563-28F929D307C2}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{FE8C58CE-6828-4125-8563-28F929D307C2}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{FE8C58CE-6828-4125-8563-28F929D307C2}.Release|Win32.Build.0 = Unicode Release|Win32
+		{6B245136-054C-4400-BF21-D30B05C231CD}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{6B245136-054C-4400-BF21-D30B05C231CD}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{6B245136-054C-4400-BF21-D30B05C231CD}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{6B245136-054C-4400-BF21-D30B05C231CD}.Release|Win32.Build.0 = Unicode Release|Win32
+		{B535BE44-FCCC-4911-862F-A7ED6CC6B597}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{B535BE44-FCCC-4911-862F-A7ED6CC6B597}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{B535BE44-FCCC-4911-862F-A7ED6CC6B597}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{B535BE44-FCCC-4911-862F-A7ED6CC6B597}.Release|Win32.Build.0 = Unicode Release|Win32
+		{C4590207-2D76-445F-833D-D59BB14D2C51}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{C4590207-2D76-445F-833D-D59BB14D2C51}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{C4590207-2D76-445F-833D-D59BB14D2C51}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{C4590207-2D76-445F-833D-D59BB14D2C51}.Release|Win32.Build.0 = Unicode Release|Win32
+		{8E917A7A-CC97-45C8-80A1-2EBD30936D23}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{8E917A7A-CC97-45C8-80A1-2EBD30936D23}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{8E917A7A-CC97-45C8-80A1-2EBD30936D23}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{8E917A7A-CC97-45C8-80A1-2EBD30936D23}.Release|Win32.Build.0 = Unicode Release|Win32
+		{AE383B44-EE53-4353-9BF0-2F3767D6CE51}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{AE383B44-EE53-4353-9BF0-2F3767D6CE51}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{AE383B44-EE53-4353-9BF0-2F3767D6CE51}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{AE383B44-EE53-4353-9BF0-2F3767D6CE51}.Release|Win32.Build.0 = Unicode Release|Win32
+		{46B97E73-8E57-42C1-A46E-AF0495D625DD}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{46B97E73-8E57-42C1-A46E-AF0495D625DD}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{46B97E73-8E57-42C1-A46E-AF0495D625DD}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{46B97E73-8E57-42C1-A46E-AF0495D625DD}.Release|Win32.Build.0 = Unicode Release|Win32
+		{BA59346E-5EB2-4D25-94A7-132D9C953A05}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{BA59346E-5EB2-4D25-94A7-132D9C953A05}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{BA59346E-5EB2-4D25-94A7-132D9C953A05}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{BA59346E-5EB2-4D25-94A7-132D9C953A05}.Release|Win32.Build.0 = Unicode Release|Win32
+		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{64DD39FC-B3FA-4625-86BA-D8A7AE7D1D2C}.Release|Win32.Build.0 = Unicode Release|Win32
+		{4740520C-ADF1-464D-97C5-85FCFEECF76D}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{4740520C-ADF1-464D-97C5-85FCFEECF76D}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{4740520C-ADF1-464D-97C5-85FCFEECF76D}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{4740520C-ADF1-464D-97C5-85FCFEECF76D}.Release|Win32.Build.0 = Unicode Release|Win32
+		{8CF291F4-6284-4118-98A7-9D2146C6D5EA}.Debug|Win32.ActiveCfg = Unicode Debug|Win32
+		{8CF291F4-6284-4118-98A7-9D2146C6D5EA}.Debug|Win32.Build.0 = Unicode Debug|Win32
+		{8CF291F4-6284-4118-98A7-9D2146C6D5EA}.Release|Win32.ActiveCfg = Unicode Release|Win32
+		{8CF291F4-6284-4118-98A7-9D2146C6D5EA}.Release|Win32.Build.0 = Unicode Release|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.Build.0 = Debug|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.ActiveCfg = Release|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMule-MSVCE-ExtLibs29.sln Added

@@ -0,0 +1,154 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "buildlibext", "libs\libext\buildlibext.vcproj", "{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7FB0902D-8579-5DCE-B883-DAF66A885005} = {7FB0902D-8579-5DCE-B883-DAF66A885005}
+		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00} = {69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}
+		{8B867186-A0B5-5479-B824-E176EDD27C40} = {8B867186-A0B5-5479-B824-E176EDD27C40}
+		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550} = {8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}
+		{E21129E0-7C08-5936-9D8C-0D60B5319BA7} = {E21129E0-7C08-5936-9D8C-0D60B5319BA7}
+		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0} = {8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1} = {3FCC50C2-81E9-5DB2-B8D8-2129427568B1}
+		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D} = {09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}
+		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6} = {3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}
+		{33CC42F9-7756-5587-863C-8D4461B7C5DD} = {33CC42F9-7756-5587-863C-8D4461B7C5DD}
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
+		{56A4B526-BB81-5D01-AAA9-16D23BBB169D} = {56A4B526-BB81-5D01-AAA9-16D23BBB169D}
+		{75596CE6-5AE7-55C9-B890-C07B0A657A83} = {75596CE6-5AE7-55C9-B890-C07B0A657A83}
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75} = {6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}
+		{24C45343-FD20-5C92-81C1-35A2AE841E79} = {24C45343-FD20-5C92-81C1-35A2AE841E79}
+		{A1A8355B-0988-528E-9CC2-B971D6266669} = {A1A8355B-0988-528E-9CC2-B971D6266669}
+		{DA8B15EF-6750-5928-BC0E-C748213CF9B2} = {DA8B15EF-6750-5928-BC0E-C748213CF9B2}
+		{6053CC38-CDEE-584C-8BC8-4B000D800FC7} = {6053CC38-CDEE-584C-8BC8-4B000D800FC7}
+		{A16D3832-0F42-57CE-8F48-50E06649ADE8} = {A16D3832-0F42-57CE-8F48-50E06649ADE8}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\..\..\..\cryptopp\cryptlib.vcproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxregex.vcproj", "{56A4B526-BB81-5D01-AAA9-16D23BBB169D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxzlib", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxzlib.vcproj", "{8B867186-A0B5-5479-B824-E176EDD27C40}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxpng", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxpng.vcproj", "{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxjpeg", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxjpeg.vcproj", "{6053CC38-CDEE-584C-8BC8-4B000D800FC7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxtiff", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxtiff.vcproj", "{75596CE6-5AE7-55C9-B890-C07B0A657A83}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxexpat", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_wxexpat.vcproj", "{A1A8355B-0988-528E-9CC2-B971D6266669}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_base.vcproj", "{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_net.vcproj", "{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_core.vcproj", "{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "adv", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_adv.vcproj", "{24C45343-FD20-5C92-81C1-35A2AE841E79}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_media.vcproj", "{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_html.vcproj", "{33CC42F9-7756-5587-863C-8D4461B7C5DD}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qa", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_qa.vcproj", "{E21129E0-7C08-5936-9D8C-0D60B5319BA7}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xml", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_xml.vcproj", "{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrc", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_xrc.vcproj", "{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aui", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_aui.vcproj", "{A16D3832-0F42-57CE-8F48-50E06649ADE8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "richtext", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_richtext.vcproj", "{7FB0902D-8579-5DCE-B883-DAF66A885005}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gl", "..\..\..\..\wxWidgets29\build\msw\wx_vc9_gl.vcproj", "{DA8B15EF-6750-5928-BC0E-C748213CF9B2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.ActiveCfg = Debug29|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.Build.0 = Debug29|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.ActiveCfg = Release29|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.Build.0 = Release29|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.ActiveCfg = Release|Win32
+		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32
+		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Debug|Win32.Build.0 = Debug|Win32
+		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.ActiveCfg = Release|Win32
+		{56A4B526-BB81-5D01-AAA9-16D23BBB169D}.Release|Win32.Build.0 = Release|Win32
+		{8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8B867186-A0B5-5479-B824-E176EDD27C40}.Debug|Win32.Build.0 = Debug|Win32
+		{8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.ActiveCfg = Release|Win32
+		{8B867186-A0B5-5479-B824-E176EDD27C40}.Release|Win32.Build.0 = Release|Win32
+		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Debug|Win32.Build.0 = Debug|Win32
+		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.ActiveCfg = Release|Win32
+		{8ACC122A-CA6A-5AA6-9C97-9CDD2E533DB0}.Release|Win32.Build.0 = Release|Win32
+		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Debug|Win32.Build.0 = Debug|Win32
+		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.ActiveCfg = Release|Win32
+		{6053CC38-CDEE-584C-8BC8-4B000D800FC7}.Release|Win32.Build.0 = Release|Win32
+		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.ActiveCfg = Debug|Win32
+		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Debug|Win32.Build.0 = Debug|Win32
+		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.ActiveCfg = Release|Win32
+		{75596CE6-5AE7-55C9-B890-C07B0A657A83}.Release|Win32.Build.0 = Release|Win32
+		{A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A1A8355B-0988-528E-9CC2-B971D6266669}.Debug|Win32.Build.0 = Debug|Win32
+		{A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.ActiveCfg = Release|Win32
+		{A1A8355B-0988-528E-9CC2-B971D6266669}.Release|Win32.Build.0 = Release|Win32
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Debug|Win32.Build.0 = Debug|Win32
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.ActiveCfg = Release|Win32
+		{3FCC50C2-81E9-5DB2-B8D8-2129427568B1}.Release|Win32.Build.0 = Release|Win32
+		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.ActiveCfg = Debug|Win32
+		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Debug|Win32.Build.0 = Debug|Win32
+		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.ActiveCfg = Release|Win32
+		{69F2EDE4-7D21-5738-9BC0-F66F61C9AE00}.Release|Win32.Build.0 = Release|Win32
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Debug|Win32.Build.0 = Debug|Win32
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.ActiveCfg = Release|Win32
+		{6744DAD8-9C70-574A-BFF2-9F8DDDB24A75}.Release|Win32.Build.0 = Release|Win32
+		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.ActiveCfg = Debug|Win32
+		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Debug|Win32.Build.0 = Debug|Win32
+		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.ActiveCfg = Release|Win32
+		{24C45343-FD20-5C92-81C1-35A2AE841E79}.Release|Win32.Build.0 = Release|Win32
+		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Debug|Win32.Build.0 = Debug|Win32
+		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.ActiveCfg = Release|Win32
+		{8BD8F8D9-4275-5B42-A8F4-F1DB2970A550}.Release|Win32.Build.0 = Release|Win32
+		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.ActiveCfg = Debug|Win32
+		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Debug|Win32.Build.0 = Debug|Win32
+		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.ActiveCfg = Release|Win32
+		{33CC42F9-7756-5587-863C-8D4461B7C5DD}.Release|Win32.Build.0 = Release|Win32
+		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Debug|Win32.Build.0 = Debug|Win32
+		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.ActiveCfg = Release|Win32
+		{E21129E0-7C08-5936-9D8C-0D60B5319BA7}.Release|Win32.Build.0 = Release|Win32
+		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Debug|Win32.Build.0 = Debug|Win32
+		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.ActiveCfg = Release|Win32
+		{3E6DCA27-5FA3-53EC-BBD6-2D42294B7AE6}.Release|Win32.Build.0 = Release|Win32
+		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Debug|Win32.Build.0 = Debug|Win32
+		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.ActiveCfg = Release|Win32
+		{09F2F96A-1CC6-5E43-AF1D-956EC2A4888D}.Release|Win32.Build.0 = Release|Win32
+		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Debug|Win32.Build.0 = Debug|Win32
+		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.ActiveCfg = Release|Win32
+		{A16D3832-0F42-57CE-8F48-50E06649ADE8}.Release|Win32.Build.0 = Release|Win32
+		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Debug|Win32.Build.0 = Debug|Win32
+		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.ActiveCfg = Release|Win32
+		{7FB0902D-8579-5DCE-B883-DAF66A885005}.Release|Win32.Build.0 = Release|Win32
+		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Debug|Win32.Build.0 = Debug|Win32
+		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.ActiveCfg = Release|Win32
+		{DA8B15EF-6750-5928-BC0E-C748213CF9B2}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMule-MSVCE.sln Added

@@ -0,0 +1,216 @@
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMule", "aMule\aMule.vcproj", "{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}"
+	ProjectSection(ProjectDependencies) = postProject
+		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF} = {16C7A051-9097-41A5-BA26-FEC1EA1F16EF}
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1} = {8CA0F896-7689-4CE0-9D16-99C9C83847E1}
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1} = {5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmuleec", "libs\libmuleec\libmuleec.vcproj", "{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmulecommon", "libs\libmulecommon\libmulecommon.vcproj", "{293E6133-239A-4ED4-838E-9182B07C6B35}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmuleexternalwxlistctrl", "libs\libmuleexternalwxlistctrl\libmuleexternalwxlistctrl.vcproj", "{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aLinkCreator", "aLinkCreator\aLinkCreator.vcproj", "{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}"
+	ProjectSection(ProjectDependencies) = postProject
+		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMuleCMD", "aMuleCMD\aMuleCMD.vcproj", "{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1} = {5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMuleGUI", "aMuleGUI\aMuleGUI.vcproj", "{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF} = {16C7A051-9097-41A5-BA26-FEC1EA1F16EF}
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1} = {8CA0F896-7689-4CE0-9D16-99C9C83847E1}
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1} = {5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ed2k", "ed2k\ed2k.vcproj", "{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libext", "libs\libext\libext.vcproj", "{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fileview", "fileview\fileview.vcproj", "{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGeoIP", "libs\libGeoIP\libGeoIP.vcproj", "{8CA0F896-7689-4CE0-9D16-99C9C83847E1}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMuleD", "aMuleD\aMuleD.vcproj", "{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1} = {5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aMuleWeb", "aMuleWeb\aMuleWeb.vcproj", "{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1} = {5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxCas", "wxCas\wxCas.vcproj", "{5FCAFC30-922E-446F-8DF5-D71819AB6356}"
+	ProjectSection(ProjectDependencies) = postProject
+		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "alcc", "aLinkCreator\alcc.vcproj", "{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{293E6133-239A-4ED4-838E-9182B07C6B35} = {293E6133-239A-4ED4-838E-9182B07C6B35}
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6} = {F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug29|Win32 = Debug29|Win32
+		Release|Win32 = Release|Win32
+		Release29|Win32 = Release29|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Debug|Win32.Build.0 = Debug|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Debug29|Win32.Build.0 = Debug29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Release|Win32.ActiveCfg = Release|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Release|Win32.Build.0 = Release|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Release29|Win32.ActiveCfg = Release29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}.Release29|Win32.Build.0 = Release29|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Debug|Win32.Build.0 = Debug|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Debug29|Win32.Build.0 = Debug29|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Release|Win32.ActiveCfg = Release|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Release|Win32.Build.0 = Release|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Release29|Win32.ActiveCfg = Release29|Win32
+		{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}.Release29|Win32.Build.0 = Release29|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Debug|Win32.ActiveCfg = Debug|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Debug|Win32.Build.0 = Debug|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Debug29|Win32.Build.0 = Debug29|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Release|Win32.ActiveCfg = Release|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Release|Win32.Build.0 = Release|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Release29|Win32.ActiveCfg = Release29|Win32
+		{293E6133-239A-4ED4-838E-9182B07C6B35}.Release29|Win32.Build.0 = Release29|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Debug|Win32.Build.0 = Debug|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Debug29|Win32.Build.0 = Debug29|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Release|Win32.ActiveCfg = Release|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Release|Win32.Build.0 = Release|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Release29|Win32.ActiveCfg = Release29|Win32
+		{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}.Release29|Win32.Build.0 = Release29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Debug|Win32.Build.0 = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Debug29|Win32.Build.0 = Debug29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Release|Win32.ActiveCfg = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Release|Win32.Build.0 = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Release29|Win32.ActiveCfg = Release29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB5}.Release29|Win32.Build.0 = Release29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Debug|Win32.Build.0 = Debug|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Debug29|Win32.Build.0 = Debug29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Release|Win32.ActiveCfg = Release|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Release|Win32.Build.0 = Release|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Release29|Win32.ActiveCfg = Release29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}.Release29|Win32.Build.0 = Release29|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Debug|Win32.Build.0 = Debug|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Debug29|Win32.Build.0 = Debug29|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Release|Win32.ActiveCfg = Release|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Release|Win32.Build.0 = Release|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Release29|Win32.ActiveCfg = Release29|Win32
+		{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}.Release29|Win32.Build.0 = Release29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Debug|Win32.Build.0 = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Debug29|Win32.ActiveCfg = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Debug29|Win32.Build.0 = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Release|Win32.ActiveCfg = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Release|Win32.Build.0 = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Release29|Win32.ActiveCfg = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}.Release29|Win32.Build.0 = Release|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug|Win32.Build.0 = Debug|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Debug29|Win32.Build.0 = Debug29|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.ActiveCfg = Release|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release|Win32.Build.0 = Release|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release29|Win32.ActiveCfg = Release29|Win32
+		{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}.Release29|Win32.Build.0 = Release29|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Debug|Win32.Build.0 = Debug|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Debug29|Win32.Build.0 = Debug29|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Release|Win32.ActiveCfg = Release|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Release|Win32.Build.0 = Release|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Release29|Win32.ActiveCfg = Release29|Win32
+		{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}.Release29|Win32.Build.0 = Release29|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Debug|Win32.Build.0 = Debug|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Debug29|Win32.ActiveCfg = Debug|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Debug29|Win32.Build.0 = Debug|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Release|Win32.ActiveCfg = Release|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Release|Win32.Build.0 = Release|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Release29|Win32.ActiveCfg = Release|Win32
+		{8CA0F896-7689-4CE0-9D16-99C9C83847E1}.Release29|Win32.Build.0 = Release|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Debug|Win32.Build.0 = Debug|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Debug29|Win32.Build.0 = Debug29|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Release|Win32.ActiveCfg = Release|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Release|Win32.Build.0 = Release|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Release29|Win32.ActiveCfg = Release29|Win32
+		{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}.Release29|Win32.Build.0 = Release29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Debug|Win32.Build.0 = Debug|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Debug29|Win32.Build.0 = Debug29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Release|Win32.ActiveCfg = Release|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Release|Win32.Build.0 = Release|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Release29|Win32.ActiveCfg = Release29|Win32
+		{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}.Release29|Win32.Build.0 = Release29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Debug|Win32.Build.0 = Debug|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Debug29|Win32.Build.0 = Debug29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Release|Win32.ActiveCfg = Release|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Release|Win32.Build.0 = Release|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Release29|Win32.ActiveCfg = Release29|Win32
+		{5FCAFC30-922E-446F-8DF5-D71819AB6356}.Release29|Win32.Build.0 = Release29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Debug|Win32.Build.0 = Debug|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Debug29|Win32.ActiveCfg = Debug29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Debug29|Win32.Build.0 = Debug29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Release|Win32.ActiveCfg = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Release|Win32.Build.0 = Release|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Release29|Win32.ActiveCfg = Release29|Win32
+		{FF560C5D-4369-4DEF-B2EC-6F507D994DB6}.Release29|Win32.Build.0 = Release29|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMule/aMule.vcproj Added

@@ -0,0 +1,1648 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="aMule"
+	ProjectGUID="{5FCAFC30-922E-446F-8DF5-D71819ABC2FE}"
+	RootNamespace="aMule"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP /Zm120"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;;&quot;$(SolutionDir)libs\libGeoIP&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;ENABLE_NLS;ENABLE_IP2COUNTRY;HAVE_CONFIG_H"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(SolutionDir)PCH.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(SolutionDir)PCH.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;All-Platform P2P Client Based on eMule\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP /Zm120"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;;&quot;$(SolutionDir)libs\libGeoIP&quot;"
+				PreprocessorDefinitions="USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;ENABLE_NLS;ENABLE_IP2COUNTRY;HAVE_CONFIG_H"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(SolutionDir)PCH.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(SolutionDir)PCH.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;All-Platform P2P Client Based on eMule\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP /Zm120"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;;&quot;$(SolutionDir)libs\libGeoIP&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;ENABLE_NLS;ENABLE_IP2COUNTRY;HAVE_CONFIG_H"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(SolutionDir)PCH.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(SolutionDir)PCH.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;All-Platform P2P Client Based on eMule\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP /Zm120"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;;&quot;$(SolutionDir)libs\libGeoIP&quot;"
+				PreprocessorDefinitions="USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;ENABLE_NLS;ENABLE_IP2COUNTRY;HAVE_CONFIG_H"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(SolutionDir)PCH.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(SolutionDir)PCH.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;All-Platform P2P Client Based on eMule\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\AddFriend.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amule-gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amule.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amuleAppCommon.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amuleDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\AsyncDNS.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\BarShader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\BaseClient.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CanceledFileList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CaptchaDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CaptchaGenerator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CatDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ChatSelector.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ChatWnd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientCredits.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientCreditsList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientDetailDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientRef.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientTCPSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientUDPSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ColorFrameCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CommentDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CommentDialogLst.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CorruptionBlackBox.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DataToText.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DeadSourceList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DirectoryTreeCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DownloadClient.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DownloadListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DownloadQueue.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ECSpecialCoreTags.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ECSpecialMuleTags.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ED2KLink.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EditServerListDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EMSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EncryptedDatagramSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EncryptedStreamSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ExternalConn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileArea.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileAutoClose.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileDetailDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileDetailListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Friend.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FriendList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FriendListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GapList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GenericClientListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GetTickCount.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GuiEvents.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\HTTPDownload.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\IP2Country.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\IPFilter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\IPFilterScanner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KadDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KnownFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KnownFileList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ListenSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Logger.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MagnetURI.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MemFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleCollection.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleColour.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleGifCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleNotebook.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleTextCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleTrayIcon.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleUDPSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\muuli_wdr.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\NetworkFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OScopeCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OtherFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Packet.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Parser.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4065"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4065"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4065"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4065"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PartFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PartFileConvert.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PartFileConvertDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\PCH.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PlatformSpecific.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Preferences.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PrefsUnifiedDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Proxy.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RandomFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RC4Encrypt.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RLE.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SafeFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Scanner.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4003"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4003"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4003"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4003"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Server.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerConnect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerUDPSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerWnd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SHA.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SHAHashSet.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFileList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFilePeersListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFilesCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFilesWnd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SourceListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StateMachine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Statistics.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StatisticsDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StatTree.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Tag.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TerminationProcess.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TerminationProcessAmuleweb.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ThreadScheduler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ThreadTasks.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Timer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TransferWnd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UploadBandwidthThrottler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UploadClient.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UploadQueue.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UserEvents.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\AddFriend.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amule.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amuleDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amuleIPV4Address.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ArchSpecific.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\AsyncDNS.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\BarShader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\BitVector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CanceledFileList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CaptchaDialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CaptchaGenerator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CatDialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ChatSelector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ChatWnd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientCredits.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientCreditsList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientDetailDialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientRef.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientTCPSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientUDPSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ColorFrameCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CommentDialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CommentDialogLst.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Constants.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CorruptionBlackBox.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CryptoPP_Inc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DataToText.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DeadSourceList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DirectoryTreeCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DownloadListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DownloadQueue.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\libs\ec\cpp\ECID.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ED2KLink.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EditServerListDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EMSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EncryptedDatagramSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EncryptedStreamSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ExternalConn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ExternalConnector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileArea.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileAutoClose.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileDetailDialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileDetailListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileLock.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Friend.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FriendList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FriendListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GapList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GenericClientListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GetTickCount.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GuiEvents.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\HTTPDownload.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\inetdownload.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\InternalEvents.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\IP2Country.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\IPFilter.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\IPFilterScanner.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KadDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KnownFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KnownFileList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ListenSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Logger.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\include\common\Macros.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MagnetURI.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MD4Hash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MemFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleCollection.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleColour.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleGifCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleNotebook.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleTextCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleThread.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleTrayIcon.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleUDPSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\muuli_wdr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\NetworkFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Observable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ObservableQueue.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OScopeCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OtherFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OtherStructs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Packet.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PartFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PartFileConvert.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PartFileConvertDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\PCH.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PlatformSpecific.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Preferences.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PrefsUnifiedDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Proxy.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RandomFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RangeMap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RC4Encrypt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RLE.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SafeFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Scanner.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ScopedPtr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchExpr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Server.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerConnect.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerUDPSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerWnd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SHA.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SHAHashSet.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFileList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFilePeersListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFilesCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFilesWnd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SourceListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StateMachine.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Statistics.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StatisticsDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StatTree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Tag.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TerminationProcess.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ThreadScheduler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ThreadTasks.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ThrottledSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Timer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TransferWnd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Types.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\updownclient.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UploadBandwidthThrottler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UploadQueue.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UPnPCompatibility.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UserEvents.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\..\..\..\amule.rc"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions="_UNICODE;UNICODE;MSVC"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug29|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions="_UNICODE;UNICODE;MSVC"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\version.rc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files KAD"
+			>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\routing\Contact.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Defines.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Entry.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Error.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Indexed.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\utils\KadClientSearcher.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Kademlia.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\net\KademliaUDPListener.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\utils\KadUDPKey.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\routing\Maps.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\net\PacketTracking.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Prefs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\routing\RoutingBin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\routing\RoutingZone.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Search.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\SearchManager.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\UDPFirewallTester.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\utils\UInt128.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files KAD"
+			>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\routing\Contact.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Entry.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Indexed.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Kademlia.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\net\KademliaUDPListener.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\net\PacketTracking.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Prefs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\routing\RoutingBin.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\routing\RoutingZone.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Search.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\SearchManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\UDPFirewallTester.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\utils\UInt128.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMuleCMD Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMuleCMD/aMuleCMD.vcproj Added

@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="aMuleCMD"
+	ProjectGUID="{EC3DE6B0-0C01-4D64-928A-4ADDB09472BA}"
+	RootNamespace="aMuleCMD"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Text Client\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Text Client\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Text Client\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Text Client\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\ExternalConnector.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\LoggerConsole.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\NetworkFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OtherFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TextClient.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\ExternalConnector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\NetworkFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OtherFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TextClient.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\version.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMuleD Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMuleD/aMuleD.vcproj Added

@@ -0,0 +1,836 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="aMuleD"
+	ProjectGUID="{10E42FDA-AA34-4F8E-BC7C-B51EACA4E75F}"
+	RootNamespace="aMuleD"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP /Zm120"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;AMULE_DAEMON"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(SolutionDir)PCH.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(SolutionDir)PCH.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Daemon\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP /Zm120"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;AMULE_DAEMON"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(SolutionDir)PCH.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(SolutionDir)PCH.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Daemon\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP /Zm120"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;AMULE_DAEMON"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(SolutionDir)PCH.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(SolutionDir)PCH.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Daemon\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP /Zm120"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;AMULE_DAEMON"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(SolutionDir)PCH.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(SolutionDir)PCH.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Daemon\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\amule.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amuleAppCommon.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amuled.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\AsyncDNS.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\BaseClient.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CanceledFileList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientCredits.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientCreditsList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientRef.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientTCPSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientUDPSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\routing\Contact.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CorruptionBlackBox.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DataToText.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DeadSourceList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DownloadClient.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DownloadQueue.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ECSpecialCoreTags.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ECSpecialMuleTags.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ED2KLink.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EMSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EncryptedDatagramSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EncryptedStreamSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Entry.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ExternalConn.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileArea.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileAutoClose.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Friend.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FriendList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GapList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GetTickCount.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GuiEvents.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\HTTPDownload.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Indexed.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\IPFilter.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\IPFilterScanner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Kademlia.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\net\KademliaUDPListener.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KnownFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KnownFileList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ListenSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Logger.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MagnetURI.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MemFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleUDPSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\NetworkFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OtherFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Packet.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\net\PacketTracking.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Parser.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4065"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4065"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4065"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4065"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PartFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\PCH.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PlatformSpecific.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Preferences.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Prefs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Proxy.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RandomFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RC4Encrypt.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RLE.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\routing\RoutingBin.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\routing\RoutingZone.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SafeFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Scanner.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4003"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4003"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4003"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4003"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\Search.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\SearchManager.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Server.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerConnect.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerUDPSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SHA.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SHAHashSet.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFileList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StateMachine.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Statistics.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StatTree.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Tag.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TerminationProcess.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TerminationProcessAmuleweb.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ThreadScheduler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ThreadTasks.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Timer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\kademlia\UDPFirewallTester.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\utils\UInt128.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UploadBandwidthThrottler.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UploadClient.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UploadQueue.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UserEvents.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\GapList.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\version.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMuleGUI Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMuleGUI/aMuleGUI.vcproj Added

@@ -0,0 +1,1118 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="aMuleGUI"
+	ProjectGUID="{9E601FE7-C3E1-48A8-8EAB-A1EEB501FBC7}"
+	RootNamespace="aMuleGUI"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP /Zm120"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;;&quot;$(SolutionDir)libs\libGeoIP&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;CLIENT_GUI;ENABLE_NLS;ENABLE_IP2COUNTRY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(SolutionDir)PCH.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(SolutionDir)PCH.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Remote GUI\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP /Zm120"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;;&quot;$(SolutionDir)libs\libGeoIP&quot;"
+				PreprocessorDefinitions="USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;CLIENT_GUI;ENABLE_NLS;ENABLE_IP2COUNTRY"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(SolutionDir)PCH.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(SolutionDir)PCH.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Remote GUI\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP /Zm120"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;;&quot;$(SolutionDir)libs\libGeoIP&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;CLIENT_GUI;ENABLE_NLS;ENABLE_IP2COUNTRY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(SolutionDir)PCH.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(SolutionDir)PCH.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Remote GUI\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP /Zm120"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;;&quot;$(SolutionDir)libs\libGeoIP&quot;"
+				PreprocessorDefinitions="USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;CLIENT_GUI;ENABLE_NLS;ENABLE_IP2COUNTRY"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="$(SolutionDir)PCH.h"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				ForcedIncludeFiles="$(SolutionDir)PCH.h"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Remote GUI\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\AddFriend.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amule-gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amule-remote-gui.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amuleAppCommon.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amuleDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\BarShader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CatDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ChatSelector.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ChatWnd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientCredits.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientDetailDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientRef.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ColorFrameCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CommentDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CommentDialogLst.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DataToText.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DirectoryTreeCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DownloadListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ECSpecialMuleTags.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ED2KLink.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EditServerListDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileDetailDialog.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileDetailListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Friend.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FriendListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GapList.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GenericClientListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GetTickCount.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GuiEvents.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\HTTPDownload.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\IP2Country.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KadDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KnownFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Logger.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MagnetURI.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MemFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleCollection.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleColour.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleGifCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleNotebook.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleTextCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleTrayIcon.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\muuli_wdr.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\NetworkFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OScopeCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OtherFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Packet.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PartFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\PCH.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release29|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Preferences.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PrefsUnifiedDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Proxy.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RLE.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SafeFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Server.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerWnd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SHA.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFilePeersListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFilesCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFilesWnd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SourceListCtrl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Statistics.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StatisticsDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StatTree.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Tag.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TerminationProcess.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Timer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TransferWnd.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UserEvents.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\AddFriend.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amule-remote-gui.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amule.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\amuleDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ArchSpecific.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\BarShader.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\BitVector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CatDialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ChatSelector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ChatWnd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientCredits.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientCreditsList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientDetailDialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ClientRef.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ColorFrameCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CommentDialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CommentDialogLst.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Constants.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\CryptoPP_Inc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DataToText.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DirectoryTreeCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DownloadListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\DownloadQueue.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\libs\ec\cpp\ECID.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ED2KLink.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\EditServerListDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ExternalConn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ExternalConnector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileDetailDialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileDetailListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FileLock.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Friend.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FriendList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\FriendListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GapList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GenericClientListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GetTickCount.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\GuiEvents.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\InternalEvents.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\IP2Country.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KadDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KnownFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\KnownFileList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ListenSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Logger.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\include\common\Macros.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MagnetURI.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MD4Hash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MemFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleCollection.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleColour.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleGifCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleNotebook.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleTextCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleThread.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleTrayIcon.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\muuli_wdr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Observable.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ObservableQueue.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OScopeCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OtherFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OtherStructs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PartFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\PCH.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Preferences.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\PrefsUnifiedDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Proxy.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RandomFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RangeMap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RC4Encrypt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RLE.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SafeFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Scanner.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ScopedPtr.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchFile.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SearchListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Server.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ServerWnd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SHA.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SHAHashSet.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFileList.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFilePeersListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFilesCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SharedFilesWnd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SourceListCtrl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StateMachine.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Statistics.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StatisticsDlg.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\StatTree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TerminationProcess.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ThreadScheduler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\ThreadTasks.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Timer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\TransferWnd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Types.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UpDownClientEC.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UploadBandwidthThrottler.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UPnPCompatibility.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\UserEvents.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			>
+			<File
+				RelativePath="..\..\..\..\amule.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\version.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMuleWeb Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/aMuleWeb/aMuleWeb.vcproj Added

@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="aMuleWeb"
+	ProjectGUID="{EC3DE6B0-0C01-4D64-928A-4ADDB09473BA}"
+	RootNamespace="aMuleWeb"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Web Server\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Web Server\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\png&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;WITH_LIBPNG;HAVE_CONFIG_H"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Web Server\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\png&quot;"
+				PreprocessorDefinitions="_CONSOLE;wxUSE_GUI=0;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS;WITH_LIBPNG;HAVE_CONFIG_H"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;aMule Web Server\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\ExternalConnector.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\LoggerConsole.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\NetworkFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OtherFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\php_amule_lib.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\php_core_lib.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\php_lexer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\php_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\php_syntree.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\RLE.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\WebInterface.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\WebServer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\WebSocket.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\ExternalConnector.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\NetworkFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OtherFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\php_core_lib.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\php_parser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\php_syntree.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\WebInterface.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\WebServer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\webserver\src\WebSocket.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\version.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/ed2k Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/ed2k/ed2k.vcproj Added

@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="ed2k"
+	ProjectGUID="{FF560C5D-4369-4DEF-B2EC-6F507D554DB6}"
+	RootNamespace="ed2k"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;USE_STD_STRING;_SCL_SECURE_NO_WARNINGS"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;ED2K Links Handler\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="USE_STD_STRING;_SCL_SECURE_NO_WARNINGS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;ED2K Links Handler\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\ED2KLinkParser.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MagnetURI.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleCollection.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\FileLock.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MagnetURI.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\MuleCollection.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\version.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/fileview Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/fileview/fileview.vcproj Added

@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="fileview"
+	ProjectGUID="{02A90868-EC36-4EA2-8D46-3B0BB33AEAC6}"
+	RootNamespace="fileview"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_SCL_SECURE_NO_WARNINGS;wxUSE_GUI=0;USE_WX_EXTENSIONS;MULEUNIT"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_SCL_SECURE_NO_WARNINGS;wxUSE_GUI=0;USE_WX_EXTENSIONS;MULEUNIT"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_SCL_SECURE_NO_WARNINGS;wxUSE_GUI=0;USE_WX_EXTENSIONS;MULEUNIT"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_SCL_SECURE_NO_WARNINGS;wxUSE_GUI=0;USE_WX_EXTENSIONS;MULEUNIT"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\CFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\fileview\eD2kFiles.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\fileview\FileView.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\fileview\KadFiles.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\OtherFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\fileview\Print.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\SafeFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\Tag.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\kademlia\utils\UInt128.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\utils\fileview\eD2kFiles.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\fileview\KadFiles.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\fileview\Print.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/fixwxGUIDs.pl Added

@@ -0,0 +1,39 @@
+#!perl
+#
+# This script is only useful if your source is in a SVN working copy!
+#
+# Problem: whenever you add a new wxWidgets version and convert the VC6 projects,
+# they are converted to VC8 XML .vcproj . In the process, a new project GUID is created.
+# When you then open your solution, all GUIDs are updated.
+#
+# To avoid this:
+# 1) Open and close wx.dsw, creating the .vcproj
+# 2) Run this script. It will replace the new GUIDs in the wx vcproj by the old ones from the aMule-MSVCE-ExtLibs.sln .
+# 3) Now load aMule-MSVCE-ExtLibs.sln. It won't be changed anymore.
+#
+
+use strict;
+
+open(sln, 'aMule-MSVCE-ExtLibs.sln');
+#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxregex", "..\..\wxWidgets\build\msw\wx_wxregex.vcproj", "{B4ACF599-824F-4806-8390-414B2DF64922}"
+while (<sln>) {
+	if (/^Project.*, \"(.+)\", (\".+\")/) {
+		my ($path, $guid) = ($1, $2);
+		next unless $path =~ /\\wxWidgets/;
+		$path =~ s-\\-/-g;
+		print "fix $path\n";
+		open(prj, $path) or die "$path $!";
+		my @content = <prj>;
+		close prj;
+		foreach (@content) {
+			if (/ProjectGUID=/) {
+				$_ = "\tProjectGUID=$guid\n";
+				print $_;
+				last;
+			}
+		}
+		open(prj, ">$path") or die;
+		print prj @content;
+		close prj;
+	}
+}

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libGeoIP Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libGeoIP/GeoIP.cmd Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libGeoIP/libGeoIP.vcproj Added

@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="libGeoIP"
+	ProjectGUID="{8CA0F896-7689-4CE0-9D16-99C9C83847E1}"
+	RootNamespace="libGeoIP"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories=""
+				PreprocessorDefinitions="WIN32;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\GeoIP_X.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\GeoIP.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<File
+			RelativePath=".\GeoIP.cmd"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="create dummy files"
+					CommandLine="GeoIP.cmd&#x0D;&#x0A;"
+					Outputs="GeoIP_X.c"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="create dummy files"
+					CommandLine="GeoIP.cmd&#x0D;&#x0A;"
+					Outputs="GeoIP_X.c"
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libGeoIP/readme.txt Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libext Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libext/buildlibext.vcproj Added

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="buildlibext"
+	ProjectGUID="{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}"
+	RootNamespace="MSVCExpressExtLibs"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				Description=""
+				CommandLine=""
+				Outputs=""
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="join external libs"
+				CommandLine="if not exist ..\..\$(ConfigurationName) mkdir ..\..\$(ConfigurationName)&#x0D;&#x0A;lib /out:..\..\$(ConfigurationName)\libext.lib &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_media.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxjpegd.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_adv.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxregexud.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_richtext.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxzlibd.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28ud.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_qa.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28ud_xml.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28ud_odbc.lib&quot; &quot;..\..\..\..\..\..\cryptopp\win32\output\debug\cryptlib.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxtiffd.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28ud_net.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_core.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_gl.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxpngd.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_dbgrid.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_xrc.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxexpatd.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_html.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28ud_aui.lib&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				Description=""
+				CommandLine=""
+				Outputs=""
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="join external libs"
+				CommandLine="if not exist ..\..\$(ConfigurationName) mkdir ..\..\$(ConfigurationName)&#x0D;&#x0A;lib /out:..\..\$(ConfigurationName)\libext.lib &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_media.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxjpeg.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_adv.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxregexu.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_richtext.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxzlib.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_qa.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u_xml.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u_odbc.lib&quot; &quot;..\..\..\..\..\..\cryptopp\win32\output\release\cryptlib.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxtiff.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxbase28u_net.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_core.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_gl.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxpng.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_dbgrid.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_xrc.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxexpat.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_html.lib&quot; &quot;..\..\..\..\..\..\wxwidgets\lib\vc_lib\wxmsw28u_aui.lib&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				Description=""
+				CommandLine=""
+				Outputs=""
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="join external libs"
+				CommandLine="if not exist ..\..\$(ConfigurationName) mkdir ..\..\$(ConfigurationName)&#x0D;&#x0A;lib /out:..\..\$(ConfigurationName)\libext.lib &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29ud_media.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxjpegd.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29ud_adv.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxregexud.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29ud_richtext.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxzlibd.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxbase29ud.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29ud_qa.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxbase29ud_xml.lib&quot; &quot;..\..\..\..\..\..\cryptopp\win32\output\debug\cryptlib.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxtiffd.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxbase29ud_net.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29ud_core.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29ud_gl.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxpngd.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29ud_xrc.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxexpatd.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29ud_html.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29ud_aui.lib&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="10"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				Description=""
+				CommandLine=""
+				Outputs=""
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				Description="join external libs"
+				CommandLine="if not exist ..\..\$(ConfigurationName) mkdir ..\..\$(ConfigurationName)&#x0D;&#x0A;lib /out:..\..\$(ConfigurationName)\libext.lib &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29u_media.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxjpeg.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29u_adv.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxregexu.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29u_richtext.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxzlib.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxbase29u.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29u_qa.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxbase29u_xml.lib&quot; &quot;..\..\..\..\..\..\cryptopp\win32\output\release\cryptlib.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxtiff.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxbase29u_net.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29u_core.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29u_gl.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxpng.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29u_xrc.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxexpat.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29u_html.lib&quot; &quot;..\..\..\..\..\..\wxwidgets29\lib\vc_lib\wxmsw29u_aui.lib&quot;&#x0D;&#x0A;"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libext/libext.vcproj Added

@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="libext"
+	ProjectGUID="{F8C2C7F5-CBF1-46C1-81C9-22AD406B52C6}"
+	RootNamespace="MSVCExpressExtLibs"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				Description=""
+				CommandLine=""
+				Outputs=""
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libext.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				Description=""
+				CommandLine=""
+				Outputs=""
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				LinkLibraryDependencies="true"
+				OutputFile="$(OutDir)\libext.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				Description=""
+				CommandLine=""
+				Outputs=""
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\libext.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				Description=""
+				CommandLine=""
+				Outputs=""
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				LinkLibraryDependencies="true"
+				OutputFile="$(OutDir)\libext.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libmulecommon Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libmulecommon/libmulecommon.vcproj Added

@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="libmulecommon"
+	ProjectGUID="{293E6133-239A-4ED4-838E-9182B07C6B35}"
+	RootNamespace="libmulecommon"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\FileFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\Format.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\MD5Sum.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\MuleDebug.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\Path.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\StringFunctions.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\TextFile.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\src\include\common\ClientVersion.h"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Create config.h"
+						CommandLine="cd &quot;$(SolutionDir)..\..\..&quot;&#x0D;&#x0A;&quot;$(SolutionDir)makeconfig.cmd&quot;"
+						Outputs="&quot;$(SolutionDir)..\..\..\config.h&quot;"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Create config.h"
+						CommandLine="cd &quot;$(SolutionDir)..\..\..&quot;&#x0D;&#x0A;&quot;$(SolutionDir)makeconfig.cmd&quot;"
+						Outputs="&quot;$(SolutionDir)..\..\..\config.h&quot;"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug29|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Create config.h"
+						CommandLine="cd &quot;$(SolutionDir)..\..\..&quot;&#x0D;&#x0A;&quot;$(SolutionDir)makeconfig.cmd&quot;"
+						Outputs="&quot;$(SolutionDir)..\..\..\config.h&quot;"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release29|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Create config.h"
+						CommandLine="cd &quot;$(SolutionDir)..\..\..&quot;&#x0D;&#x0A;&quot;$(SolutionDir)makeconfig.cmd&quot;"
+						Outputs="&quot;$(SolutionDir)..\..\..\config.h&quot;"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\FileFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\Format.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\MD5Sum.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\MuleDebug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\Path.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\StringFunctions.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\common\TextFile.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libmuleec Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libmuleec/libmuleec.vcproj Added

@@ -0,0 +1,358 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="libmuleec"
+	ProjectGUID="{5A9EC6A5-68A3-43C8-960E-F7F03B16F1D1}"
+	RootNamespace="libmuleec"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib\&quot;"
+				PreprocessorDefinitions="_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib\&quot;"
+				PreprocessorDefinitions="_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECMuleSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECPacket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECSocket.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECSpecialTags.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECTag.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\RemoteConnect.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECCodes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECFileConfig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECID.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECMuleSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECPacket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECSocket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECSpecialTags.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECTag.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\ECTagTypes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\src\libs\ec\cpp\RemoteConnect.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libmuleexternalwxlistctrl Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/libs/libmuleexternalwxlistctrl/libmuleexternalwxlistctrl.vcproj Added

@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="libmuleexternalwxlistctrl"
+	ProjectGUID="{16C7A051-9097-41A5-BA26-FEC1EA1F16EF}"
+	RootNamespace="libmuleexternalwxlistctrl"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_LIB;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;_LIB;_CRT_SECURE_NO_WARNINGS"
+				ExceptionHandling="2"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\..\&quot;"
+				PreprocessorDefinitions="_LIB;USE_WX_EXTENSIONS;_CRT_SECURE_NO_WARNINGS"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\src\extern\wxWidgets\listctrl.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\..\src\extern\wxWidgets\listctrl.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/makeconfig.cmd Added

@@ -0,0 +1,35 @@
+@echo off
+echo #ifndef CONFIG_H>config.h
+echo #define CONFIG_H>>config.h
+
+rem Tarballs have a .svn-revision for identification
+if not exist .svn-revision goto svn1
+FOR /F %%i IN (.svn-revision) DO set svnv=%%i
+goto :foundsvnversion
+
+:svn1
+rem Try to get version from a SVN working copy, svnversion must be in path
+set svnv=exported
+call svnversion >nul 2>&1
+if errorlevel 1 goto nosvnversion
+FOR /F %%i IN ('svnversion src') DO set svnv=%%i
+if %svnv%==exported goto nosvnversion
+if %svnv%==Unversioned goto nosvnversion
+
+:foundsvnversion
+echo SVNDATE is %svnv%
+echo #define SVNDATE "rev. %svnv%">>config.h
+echo #define VERSION "SVN">>config.h
+echo #define __PRERELEASE__>>config.h
+goto finish
+
+:nosvnversion
+echo release build, version from ^<common/ClientVersion.h^>
+echo #include ^<src/include/common/ClientVersion.h^> >>config.h
+
+:finish
+echo #define CRYPTOPP_INCLUDE_PREFIX	../cryptopp>>config.h
+echo #define PACKAGE "amule">>config.h
+echo #define HAVE_ERRNO_H>>config.h
+echo #define HAVE_STRERROR>>config.h
+echo #endif>>config.h

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/version.rc Added

@@ -0,0 +1,52 @@
+#include <winver.h>
+#define HAVE_CONFIG_H
+#include "../../../src/include/common/ClientVersion.h"
+
+#ifdef __PRERELEASE__
+#define VER_PRERELEASE	VS_FF_PRERELEASE
+#undef VER_RELEASE
+#define VER_RELEASE	0
+#define VER_PRODUCTVERSION_STR	VERSION " " SVNDATE
+#else
+#define VER_PRERELEASE	0
+#ifndef VER_RELEASE
+#define VER_RELEASE	1
+#endif
+#define VER_PRODUCTVERSION_STR	VERSION
+#endif
+
+#ifdef __DEBUG__
+#define VER_DEBUG	VS_FF_DEBUG
+#else
+#define VER_DEBUG	0
+#endif
+
+VS_VERSION_INFO VERSIONINFO
+	FILEVERSION	VERSION_MJR, VERSION_MIN, VERSION_UPDATE, VER_RELEASE
+	PRODUCTVERSION	VERSION_MJR, VERSION_MIN, VERSION_UPDATE, VER_RELEASE
+	FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
+	FILEFLAGS	VER_DEBUG | VER_PRERELEASE
+	FILEOS		VOS__WINDOWS32
+	FILETYPE	VFT_APP
+	FILESUBTYPE	0x0L
+BEGIN
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904b0"
+		BEGIN
+			VALUE	"Comments",			"http://www.amule.org/"
+			VALUE	"FileDescription",	VER_FILEDESCRIPTION_STR
+			VALUE	"FileVersion",		VER_PRODUCTVERSION_STR
+			VALUE	"InternalName",		VER_INTERNALNAME_STR
+			VALUE	"OriginalFilename",	VER_ORIGINALFILENAME_STR
+			VALUE	"ProductName",		"aMule"
+			VALUE	"ProductVersion",	VER_PRODUCTVERSION_STR
+			VALUE	"LegalCopyright",	"aMule Team ( admin@amule.org )"
+			VALUE	"CompanyName",		"http://www.amule.org/"
+		END
+	END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE	"Translation", 0x0409, 1200
+	END
+END

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/wxCas Added

aMule-2.3.1.tar.bz2/platforms/Windows/MSVC9/wxCas/wxCas.vcproj Added

@@ -0,0 +1,428 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="wxCas"
+	ProjectGUID="{5FCAFC30-922E-446F-8DF5-D71819AB6356}"
+	RootNamespace="wxCas"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;;&quot;$(SolutionDir)libs\libGeoIP&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;ENABLE_NLS;ENABLE_IP2COUNTRY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;Graphical aMule Statistics\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets\src\zlib&quot;;&quot;$(SolutionDir)libs\libGeoIP&quot;"
+				PreprocessorDefinitions="USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;ENABLE_NLS;ENABLE_IP2COUNTRY"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;Graphical aMule Statistics\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswud&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;;&quot;$(SolutionDir)libs\libGeoIP&quot;"
+				PreprocessorDefinitions="_DEBUG;__DEBUG__;USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;ENABLE_NLS;ENABLE_IP2COUNTRY"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;Graphical aMule Statistics\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release29|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
+				Optimization="3"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\lib\vc_lib\mswu&quot;;&quot;$(SolutionDir)..\..\..\src\libs&quot;;&quot;$(SolutionDir)..\..\..\src&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;;&quot;$(SolutionDir)..\..\..\&quot;;&quot;$(SolutionDir)..\..\..\..\wxWidgets29\src\zlib&quot;;&quot;$(SolutionDir)libs\libGeoIP&quot;"
+				PreprocessorDefinitions="USE_WX_EXTENSIONS;CONVAMULE_CPP;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;ENABLE_NLS;ENABLE_IP2COUNTRY"
+				RuntimeLibrary="0"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_UNICODE;UNICODE;VER_FILEDESCRIPTION_STR=\&quot;Graphical aMule Statistics\&quot;;VER_INTERNALNAME_STR=\&quot;$(ProjectName)\&quot;;VER_ORIGINALFILENAME_STR=\&quot;$(TargetFileName)\&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)..\..\..\..\wxWidgets29\include&quot;;&quot;$(SolutionDir)..\..\..&quot;;&quot;$(SolutionDir)..\..\..\src\include&quot;"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\linuxmon.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\onlinesig.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\wxcas.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\wxcascte.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\wxcasframe.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\wxcaspix.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\wxcasprefs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\wxcasprint.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\linuxmon.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\onlinesig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\wxcas.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\wxcascte.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\wxcasframe.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\wxcaspix.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\wxcasprefs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\src\wxcasprint.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\version.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\src\utils\wxCas\wxcas.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

aMule-2.2.6.tar.bz2/po/Makefile.in.in -> aMule-2.3.1.tar.bz2/po/Makefile.in.in Changed

aMule-2.2.6.tar.bz2/po/POTFILES.in -> aMule-2.3.1.tar.bz2/po/POTFILES.in Changed

@@ -1,85 +1,96 @@
-src/Parser.cpp
-src/libs/ec/cpp/RemoteConnect.cpp
-src/libs/ec/cpp/ECSpecialTags.cpp
-src/libs/ec/cpp/ECSocket.cpp
-src/ThreadTasks.cpp
+src/AddFriend.cpp
+src/amuleAppCommon.cpp
+src/amule.cpp
+src/amuled.cpp
+src/amuleDlg.cpp
+src/amule-gui.cpp
+src/amule-remote-gui.cpp
 src/BaseClient.cpp
+src/CanceledFileList.cpp
+src/CaptchaDialog.cpp
+src/CatDialog.cpp
+src/ChatSelector.cpp
+src/ChatWnd.cpp
+src/ClientCreditsList.cpp
+src/ClientDetailDialog.cpp
+src/ClientRef.cpp
+src/ClientTCPSocket.cpp
+src/CommentDialog.cpp
+src/CommentDialogLst.cpp
+src/CorruptionBlackBox.cpp
+src/DataToText.cpp
+src/DownloadListCtrl.cpp
+src/DownloadQueue.cpp
+src/ExternalConn.cpp
+src/ExternalConnector.cpp
+src/FileDetailDialog.cpp
+src/FileDetailListCtrl.cpp
+src/FriendList.cpp
 src/FriendListCtrl.cpp
-src/UserEvents.h
-src/SharedFilesCtrl.cpp
-src/UploadQueue.cpp
-src/TextClient.h
+src/GenericClientListCtrl.cpp
+src/HTTPDownload.cpp
+src/IP2Country.cpp
+src/IPFilter.cpp
+src/KadDlg.cpp
 src/kademlia/kademlia/SearchManager.cpp
 src/kademlia/routing/RoutingZone.cpp
+src/KnownFile.cpp
+src/KnownFileList.cpp
+src/libs/common/Format.cpp
+src/libs/ec/cpp/ECSocket.cpp
+src/libs/ec/cpp/ECSpecialTags.cpp
+src/libs/ec/cpp/RemoteConnect.cpp
 src/ListenSocket.cpp
-src/webserver/src/WebServer.cpp
-src/webserver/src/WebInterface.cpp
-src/StatTree.cpp
-src/HTTPDownload.cpp
-src/utils/wxCas/src/wxcasprefs.cpp
-src/utils/wxCas/src/linuxmon.cpp
-src/utils/wxCas/src/wxcas.cpp
-src/utils/wxCas/src/wxcasframe.cpp
-src/utils/wxCas/src/onlinesig.cpp
-src/utils/aLinkCreator/src/md4.cpp
-src/utils/aLinkCreator/src/ed2khash.cpp
-src/utils/aLinkCreator/src/alcframe.cpp
-src/utils/aLinkCreator/src/alcc.cpp
-src/utils/aLinkCreator/src/alc.cpp
-src/utils/aLinkCreator/src/bithelp.h
-src/DataToText.cpp
-src/Preferences.cpp
-src/ServerListCtrl.cpp
+src/Logger.cpp
+src/MuleNotebook.cpp
+src/MuleTextCtrl.cpp
+src/MuleTrayIcon.cpp
+src/muuli_wdr.cpp
 src/OScopeCtrl.cpp
-src/amuleDlg.cpp
+src/OtherFunctions.cpp
+src/OtherStructs.h
+src/Parser.cpp
+src/PartFileConvert.cpp
+src/PartFileConvertDlg.cpp
+src/PartFile.cpp
+src/Preferences.cpp
 src/PrefsUnifiedDlg.cpp
-src/ExternalConn.cpp
-src/UploadClient.cpp
-src/TerminationProcess.cpp
-src/ServerWnd.cpp
-src/Statistics.cpp
-src/MuleTextCtrl.cpp
+src/SearchDlg.cpp
 src/SearchList.cpp
-src/ClientTCPSocket.cpp
-src/KadDlg.cpp
-src/Server.cpp
-src/Logger.cpp
-src/AddFriend.cpp
 src/SearchListCtrl.cpp
-src/amule-remote-gui.cpp
-src/DownloadListCtrl.cpp
-src/PartFile.cpp
-src/KnownFileList.cpp
-src/SharedFileList.cpp
-src/CommentDialogLst.cpp
 src/ServerConnect.cpp
-src/DownloadQueue.cpp
-src/TextClient.cpp
+src/Server.cpp
+src/ServerList.cpp
+src/ServerListCtrl.cpp
 src/ServerSocket.cpp
-src/IP2Country.cpp
-src/TransferWnd.cpp
-src/FileDetailListCtrl.cpp
-src/KnownFile.cpp
-src/CommentDialog.cpp
-src/PartFileConvert.cpp
-src/PartFileConvertDlg.cpp
-src/OtherFunctions.cpp
-src/IPFilter.cpp
+src/ServerWnd.cpp
+src/SharedFileList.cpp
+src/SharedFilePeersListCtrl.cpp
+src/SharedFilesCtrl.cpp
+src/SourceListCtrl.cpp
+src/Statistics.cpp
 src/StatisticsDlg.cpp
-src/FileDetailDialog.cpp
-src/muuli_wdr.cpp
-src/CatDialog.cpp
-src/ExternalConnector.cpp
-src/ClientCreditsList.cpp
-src/amuled.cpp
-src/OtherStructs.h
-src/ClientListCtrl.cpp
-src/ClientDetailDialog.cpp
-src/SearchDlg.cpp
-src/MuleTrayIcon.cpp
-src/ChatSelector.cpp
-src/MuleNotebook.cpp
-src/ServerList.cpp
+src/StatTree.cpp
+src/TerminationProcess.cpp
+src/TextClient.cpp
+src/TextClient.h
+src/ThreadTasks.cpp
+src/TransferWnd.cpp
+src/UploadClient.cpp
+src/UploadQueue.cpp
 src/UserEvents.cpp
-src/amule.cpp
-src/FriendList.cpp
+src/UserEvents.h
+src/utils/aLinkCreator/src/alcc.cpp
+src/utils/aLinkCreator/src/alc.cpp
+src/utils/aLinkCreator/src/alcframe.cpp
+src/utils/aLinkCreator/src/bithelp.h
+src/utils/aLinkCreator/src/ed2khash.cpp
+src/utils/aLinkCreator/src/md4.cpp
+src/utils/fileview/Print.h
+src/utils/wxCas/src/linuxmon.cpp
+src/utils/wxCas/src/onlinesig.cpp
+src/utils/wxCas/src/wxcas.cpp
+src/utils/wxCas/src/wxcasframe.cpp
+src/utils/wxCas/src/wxcasprefs.cpp
+src/webserver/src/WebInterface.cpp
+src/webserver/src/WebServer.cpp

aMule-2.2.6.tar.bz2/po/amule.pot -> aMule-2.3.1.tar.bz2/po/amule.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
@@ -17,1298 +17,1127 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr ""
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
 msgstr ""
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
 msgstr ""
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
 msgstr ""
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
 msgstr ""
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
 msgstr ""
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
 msgstr ""
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
 msgstr ""
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
+msgid "web server running on pid %d"
 msgstr ""
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
+#: src/amule.cpp:658
+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/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
 msgstr ""
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/BaseClient.cpp:1967
-#, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
+msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:768
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
+msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
+#: src/amule.cpp:774
+#, c-format
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
-msgstr ""
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/UserEvents.h:60
-msgid "Download completed"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
 msgstr ""
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
 msgstr ""
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/UserEvents.h:87
-msgid "Message sender."
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/UserEvents.h:92
-msgid "Out of space"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
 msgstr ""
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
+#: src/amule.cpp:1879
+msgid "Kad started."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:501
 msgid ""
-"Feedback from: %s (%s)\n"
+"'All-Platform' p2p client based on eMule \n"
 "\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr ""
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 msgstr ""
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
 msgstr ""
 
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr ""
-
-#: src/TextClient.h:60
-msgid "aMule text client"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
 msgstr ""
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
 msgstr ""
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
 msgstr ""
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
 msgstr ""
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
 msgstr ""
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr ""
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
+msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr ""
-
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr ""
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr ""
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
+#: src/BaseClient.cpp:2899
+#, c-format
 msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
+#: src/CatDialog.cpp:87
+msgid "New Category"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr ""
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr ""
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
+msgid "%.1f kB/s"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f KB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f GB"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%.2f TB"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "Unable to open %s"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
+#: src/ClientTCPSocket.cpp:982
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Done in %.2f s"
-msgstr ""
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
+#: src/CorruptionBlackBox.cpp:227
+#, c-format
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
+#: src/DataToText.cpp:37
+msgid "Auto [Lo]"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
-#, c-format
-msgid "Processing file number %u: %s"
+#: src/DataToText.cpp:38
+msgid "Auto [No]"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+#: src/DataToText.cpp:39
+msgid "Auto [Hi]"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
-#, c-format
-msgid "%s ---> Non existant file !\n"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
 msgstr ""
 
-#: src/DataToText.cpp:37
-msgid "Auto [Lo]"
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
 msgstr ""
 
-#: src/DataToText.cpp:38
-msgid "Auto [No]"
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
 msgstr ""
 
-#: src/DataToText.cpp:39
-msgid "Auto [Hi]"
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
 msgstr ""
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
 msgstr ""
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr ""
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr ""
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr ""
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
 msgstr ""
 
 #: src/DataToText.cpp:66
@@ -1335,8 +1164,7 @@
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr ""
 
@@ -1368,8 +1196,8 @@
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr ""
 
@@ -1393,8 +1221,8 @@
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr ""
 
@@ -1418,7 +1246,7 @@
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr ""
 
@@ -1430,5488 +1258,5928 @@
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
 
-#: src/Preferences.cpp:629
-msgid "Albanian"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
 msgstr ""
 
-#: src/Preferences.cpp:630
-msgid "Arabic"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
 msgstr ""
 
-#: src/Preferences.cpp:631
-msgid "Asturian"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
 msgstr ""
 
-#: src/Preferences.cpp:632
-msgid "Basque"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
 msgstr ""
 
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
 msgstr ""
 
-#: src/Preferences.cpp:634
-msgid "Catalan"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
 msgstr ""
 
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
 msgstr ""
 
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "Croatian"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
 msgstr ""
 
-#: src/Preferences.cpp:638
-msgid "Czech"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
 msgstr ""
 
-#: src/Preferences.cpp:639
-msgid "Danish"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
 msgstr ""
 
-#: src/Preferences.cpp:640
-msgid "Dutch"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
 msgstr ""
 
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
 
-#: src/Preferences.cpp:642
-msgid "Estonian"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
 msgstr ""
 
-#: src/Preferences.cpp:643
-msgid "Finnish"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
 msgstr ""
 
-#: src/Preferences.cpp:644
-msgid "French"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
 msgstr ""
 
-#: src/Preferences.cpp:645
-msgid "Galician"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
 msgstr ""
 
-#: src/Preferences.cpp:646
-msgid "German"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
 msgstr ""
 
-#: src/Preferences.cpp:647
-msgid "Greek"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/Preferences.cpp:648
-msgid "Hebrew"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/Preferences.cpp:649
-msgid "Hungarian"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/Preferences.cpp:650
-msgid "Italian"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
 msgstr ""
 
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
 msgstr ""
 
-#: src/Preferences.cpp:652
-msgid "Japanese"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
 msgstr ""
 
-#: src/Preferences.cpp:653
-msgid "Korean"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
 msgstr ""
 
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:656
-msgid "Polish"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
 msgstr ""
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
 msgstr ""
 
-#: src/Preferences.cpp:659
-msgid "Russian"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
 msgstr ""
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
 msgstr ""
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
 msgstr ""
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
 msgstr ""
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
+#: src/DownloadListCtrl.cpp:1268
+#, c-format
+msgid "Downloads (%i)"
 msgstr ""
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
+#: src/DownloadListCtrl.cpp:1412
+msgid ""
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
+msgstr ""
+
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
 msgstr ""
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
+#: src/DownloadListCtrl.cpp:1461
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
 msgstr ""
 
-#: src/Preferences.cpp:1680
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
+msgstr ""
+
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr ""
+
+#: src/DownloadQueue.cpp:113
+#, c-format
+msgid "Loading temp files from %s."
+msgstr ""
+
+#: src/DownloadQueue.cpp:132
+#, c-format
+msgid "Loading PartFile %u of %u"
+msgstr ""
+
+#: src/DownloadQueue.cpp:154
 msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
 
-#: src/Preferences.cpp:1681
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr ""
+
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr ""
+
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Default port will be used (%d)"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
+#: src/DownloadQueue.cpp:374
+#, c-format
+msgid "Downloading %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
+#: src/DownloadQueue.cpp:382
+#, c-format
+msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
+#: src/DownloadQueue.cpp:394
+#, c-format
+msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
+#: src/DownloadQueue.cpp:399
+#, c-format
+msgid "You are already trying to download the file %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
+#: src/DownloadQueue.cpp:1401
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
+#: src/DownloadQueue.cpp:1409
+#, c-format
+msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
+#: src/DownloadQueue.cpp:1430
+#, c-format
+msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
+#: src/ExternalConn.cpp:278
+msgid "External connection closed."
+msgstr ""
+
+#: src/ExternalConn.cpp:317
+msgid "External connections disabled due to empty password!"
+msgstr ""
+
+#: src/ExternalConn.cpp:340
+msgid "External connections disabled in config file"
+msgstr ""
+
+#: src/ExternalConn.cpp:400
+msgid "New external connection accepted"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:144
+#: src/ExternalConn.cpp:403
+msgid "ERROR: couldn't accept a new external connection"
+msgstr ""
+
+#: src/ExternalConn.cpp:421
+msgid "External connection refused due to empty password in preferences!"
+msgstr ""
+
+#: src/ExternalConn.cpp:430
+#, c-format
+msgid "Connecting client: %s %s"
+msgstr ""
+
+#: src/ExternalConn.cpp:432
+msgid "Unknown version"
+msgstr ""
+
+#: src/ExternalConn.cpp:442
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Incorrect EC version ID, there might be binary incompatibility. Use core and "
+"remote from same snapshot."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
+#: src/ExternalConn.cpp:447
+msgid ""
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
+#: src/ExternalConn.cpp:475
+msgid "Invalid protocol version."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:149
+#: src/ExternalConn.cpp:480
+msgid "Missing protocol version tag."
+msgstr ""
+
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr ""
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr ""
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
+msgstr ""
+
+#: src/ExternalConn.cpp:521
+msgid "Access granted."
+msgstr ""
+
+#: src/ExternalConn.cpp:529
 #, c-format
-msgid "Are you sure you want to delete the static server %s"
+msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
+#: src/ExternalConn.cpp:799
+#, c-format
+msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:346
+#: src/ExternalConn.cpp:801
 #, c-format
-msgid "Failed to open '%s'"
+msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:369
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
+msgid "OOPS! OpCode processing error!"
+msgstr ""
+
+#: src/ExternalConn.cpp:876
+msgid "Server not added"
+msgstr ""
+
+#: src/ExternalConn.cpp:894
 #, c-format
-msgid "Servers (%i)"
+msgid "server not found: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
+#: src/ExternalConn.cpp:910
+msgid "need to define server to be removed"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
+#: src/ExternalConn.cpp:924
+msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
+#: src/ExternalConn.cpp:1102
+msgid "Search in progress. Refetch results in a moment!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
+#: src/ExternalConn.cpp:1108
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
+#: src/ExternalConn.cpp:1306
+msgid "No points for graph."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
+#: src/ExternalConn.cpp:1315
+msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
+#: src/ExternalConn.cpp:1342
+msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
+#: src/ExternalConn.cpp:1354
+msgid "Already shutting down."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
+#: src/ExternalConn.cpp:1366
+#, c-format
+msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
+#: src/ExternalConn.cpp:1372
+msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
+#: src/ExternalConn.cpp:1442
+msgid "File not found."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
+#: src/ExternalConn.cpp:1447
+msgid "Invalid file name."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
+#: src/ExternalConn.cpp:1455
+msgid "Unable to rename file."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
+#: src/ExternalConn.cpp:1790
+msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
+#: src/ExternalConn.cpp:1793
+msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
+#: src/ExternalConn.cpp:1801
+msgid "Already connected to Kad."
 msgstr ""
 
-#: src/amuleDlg.cpp:212
-#, c-format
-msgid "Running on %s"
+#: src/ExternalConn.cpp:1804
+msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
+#: src/ExternalConn.cpp:1811
+msgid "All networks are disabled."
 msgstr ""
 
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
+#: src/ExternalConn.cpp:1819
+msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
+#: src/ExternalConn.cpp:1823
+msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
+#: src/ExternalConn.cpp:1832
+#, c-format
+msgid "External Connection: invalid opcode received: %#x"
+msgstr ""
+
+#: src/ExternalConn.cpp:1835
+msgid "Invalid opcode (wrong protocol version?)"
+msgstr ""
+
+#: src/ExternalConnector.cpp:142
+#, c-format
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp:144
+#, c-format
+msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:464
+#: src/ExternalConnector.cpp:156
 msgid ""
-" 'All-Platform' p2p client based on eMule \n"
 "\n"
+"This command cannot have an argument.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:467
+#: src/ExternalConnector.cpp:167
 msgid ""
-" FAQ: http://wiki.amule.org \n"
 "\n"
+"Available extensions:\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:469
+#: src/ExternalConnector.cpp:186
+#, c-format
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
 "\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
 msgstr ""
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
 msgstr ""
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
+#: src/ExternalConnector.cpp:248
+#, c-format
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
 msgstr ""
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
 msgstr ""
 
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
 msgstr ""
 
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
 msgstr ""
 
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
+#: src/ExternalConnector.cpp:302
+#, c-format
+msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
+#: src/ExternalConnector.cpp:357
+#, c-format
+msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
+#: src/ExternalConnector.cpp:359
+#, c-format
+msgid "This is %s %s\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
+#: src/ExternalConnector.cpp:414
+#, c-format
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
 msgstr ""
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
 msgstr ""
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/amuleDlg.cpp:836
-#, c-format
-msgid "aMule (%s | Disconnected)"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
 msgstr ""
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
 msgstr ""
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/amuleDlg.cpp:1182
-#, c-format
-msgid "Skin directory '%s' does not exist"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/amuleDlg.cpp:1187
-#, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
 msgstr ""
 
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
 msgstr ""
 
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
 msgstr ""
 
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
+#: src/FileDetailDialog.cpp:113
+#, c-format
+msgid "%.1f%% done"
 msgstr ""
 
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
 msgstr ""
 
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
 msgstr ""
 
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
 msgstr ""
 
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
 msgstr ""
 
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
 msgstr ""
 
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
 msgstr ""
 
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
 msgstr ""
 
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
 msgstr ""
 
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
 msgstr ""
 
-#: src/amuleDlg.cpp:1468
-msgid "No network"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
+#: src/GenericClientListCtrl.cpp:547
+msgid "Send message to user"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
+#: src/GenericClientListCtrl.cpp:548
+msgid "Message to send:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
+#: src/GenericClientListCtrl.cpp:587
+msgid "Remove from friends"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
+#: src/GenericClientListCtrl.cpp:598
+msgid "Send message"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
+#: src/GenericClientListCtrl.cpp:600
+msgid "Swap to this file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
+#: src/GenericClientListCtrl.cpp:943
+msgid "A4AF"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
+#: src/GenericClientListCtrl.cpp:995
+#, c-format
+msgid "On Queue: %u (%i)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
+msgid "Asked for another file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
+#: src/GenericClientListCtrl.cpp:1026
+#, c-format
+msgid "On Queue: %u"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+#: src/HTTPDownload.cpp:205
+#, c-format
+msgid "Unable to create destination file %s for download!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
+#: src/HTTPDownload.cpp:233
+#, c-format
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
+#: src/HTTPDownload.cpp:275
+#, c-format
+msgid "Downloaded %d bytes"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
+#: src/HTTPDownload.cpp:279
+#, c-format
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:656
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+#: src/IP2Country.cpp:100
+#, c-format
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
+#, c-format
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
+#: src/IP2Country.cpp:140
+#, c-format
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:920
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Choose a folder for %s"
+msgid "Successfully updated %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, c-format
+msgid "Failed to download %s from %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "Executable%s"
+msgid "Failed to load country data for '%s'."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/IPFilter.cpp:299
+#, c-format
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1031
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr ""
+
+#: src/IPFilter.cpp:329
+#, c-format
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connections Graph Scale: %d"
+msgid "Failed to rename new %s file, aborting update."
+msgstr ""
+
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr ""
+
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Nodes (%u)"
+msgstr ""
+
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr ""
+
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr ""
+
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr ""
+
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr ""
+
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr ""
+
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr ""
+
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
+msgid "Keyword for search: %s"
+msgstr ""
+
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr ""
+
+#: src/kademlia/routing/RoutingZone.cpp:172
+msgid ""
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
+msgstr ""
+
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
+#, c-format
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
+msgstr ""
+
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
+#: src/KnownFile.cpp:1545
+msgid "File size"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr ""
+
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr ""
+
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr ""
+
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr ""
+
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr ""
+
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
+msgstr ""
+
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
+msgstr ""
+
+#: src/libs/common/Format.cpp:307
 #, c-format
-msgid "Execute command on `%s' event"
+msgid "Unknown error %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
 msgstr ""
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
 msgstr ""
 
-#: src/ExternalConn.cpp:116
-msgid "External connection closed."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
 msgstr ""
 
-#: src/ExternalConn.cpp:143
-msgid "External connections disabled due to empty password!"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/ExternalConn.cpp:168
-msgid "External connections disabled in config file"
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
 msgstr ""
 
-#: src/ExternalConn.cpp:217
-msgid "New external connection accepted"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
 msgstr ""
 
-#: src/ExternalConn.cpp:220
-msgid "ERROR: couldn't accept a new external connection"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/ExternalConn.cpp:239
-msgid "External connection refused due to empty password in preferences!"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:249
-#, c-format
-msgid "Connecting client: %s %s"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
 msgstr ""
 
-#: src/ExternalConn.cpp:251
-msgid "Unknown version"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/ExternalConn.cpp:262
-msgid ""
-"Incorrect EC version ID, there might be binary incompatibility. Use core and "
-"remote from same snapshot."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/ExternalConn.cpp:267
-msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
 msgstr ""
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ExternalConn.cpp:292
-msgid "Invalid protocol version."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/ExternalConn.cpp:296
-msgid "Missing protocol version tag."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
 msgstr ""
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
 msgstr ""
 
-#: src/ExternalConn.cpp:306
-msgid "Access granted."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
 msgstr ""
 
-#: src/ExternalConn.cpp:564
-#, c-format
-msgid "Remote PartFile command failed: FileHash not found: %s"
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
 msgstr ""
 
-#: src/ExternalConn.cpp:566
-#, c-format
-msgid "FileHash not found: %s"
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
 msgstr ""
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
-msgid "OOPS! OpCode processing error!"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
 msgstr ""
 
-#: src/ExternalConn.cpp:659
-msgid "Server not added"
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
 msgstr ""
 
-#: src/ExternalConn.cpp:677
-#, c-format
-msgid "server not found: %s"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
 msgstr ""
 
-#: src/ExternalConn.cpp:693
-msgid "need to define server to be removed"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
 msgstr ""
 
-#: src/ExternalConn.cpp:707
-msgid "eD2k is disabled in preferences."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
 msgstr ""
 
-#: src/ExternalConn.cpp:803
-msgid "Search in progress. Refetch results in a moment!"
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/ExternalConn.cpp:808
-msgid "WebSearch from remote interface makes no sense."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
 msgstr ""
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
 msgstr ""
 
-#: src/ExternalConn.cpp:1020
-msgid "No points for graph."
+#: src/MuleTrayIcon.cpp:304
+#, c-format
+msgid "UL: %u"
 msgstr ""
 
-#: src/ExternalConn.cpp:1029
-msgid "Your client is not configured for this detail level."
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
 msgstr ""
 
-#: src/ExternalConn.cpp:1057
-msgid "External Connection: shutdown requested"
+#: src/MuleTrayIcon.cpp:314
+#, c-format
+msgid "DL: %u"
 msgstr ""
 
-#: src/ExternalConn.cpp:1069
-msgid "Already shutting down."
+#: src/MuleTrayIcon.cpp:318
+#, c-format
+msgid "Download speed: %.1f"
 msgstr ""
 
-#: src/ExternalConn.cpp:1077
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "ExternalConn: adding link '%s'."
+msgid "Upload speed: %.1f"
 msgstr ""
 
-#: src/ExternalConn.cpp:1083
-msgid "Invalid link or already on list."
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
 msgstr ""
 
-#: src/ExternalConn.cpp:1168
-msgid "File not found."
+#: src/MuleTrayIcon.cpp:330
+#, c-format
+msgid "Nickname: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1173
-msgid "Invalid file name."
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1181
-msgid "Unable to rename file."
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1405
-msgid "Already connected to eD2k."
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
 msgstr ""
 
-#: src/ExternalConn.cpp:1408
-msgid "Connecting to eD2k..."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1416
-msgid "Already connected to Kad."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1419
-msgid "Connecting to Kad..."
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
 msgstr ""
 
-#: src/ExternalConn.cpp:1424
-msgid "All networks are disabled."
+#: src/MuleTrayIcon.cpp:365
+#, c-format
+msgid "IP: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1432
-msgid "Disconnected from eD2k."
+#: src/MuleTrayIcon.cpp:374
+#, c-format
+msgid "TCP port: %d"
 msgstr ""
 
-#: src/ExternalConn.cpp:1436
-msgid "Disconnected from Kad."
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/ExternalConn.cpp:1444
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "External Connection: invalid opcode received: %#x"
+msgid "UDP port: %d"
 msgstr ""
 
-#: src/ExternalConn.cpp:1447
-msgid "Invalid opcode (wrong protocol version?)"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/UploadClient.cpp:273
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
+msgid "Uptime: %s"
 msgstr ""
 
-#: src/UploadClient.cpp:718
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Hashset requested for unknown file: %s"
+msgid "Shared files: %d"
 msgstr ""
 
-#: src/TerminationProcess.cpp:48
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
+msgid "Queued clients: %d"
 msgstr ""
 
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
+#: src/MuleTrayIcon.cpp:425
+#, c-format
+msgid "Total DL: %s"
 msgstr ""
 
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
+#: src/MuleTrayIcon.cpp:432
+#, c-format
+msgid "Total UL: %s"
 msgstr ""
 
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
 msgstr ""
 
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
 msgstr ""
 
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
 msgstr ""
 
-#: src/ServerWnd.cpp:173
-msgid "ID"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
 msgstr ""
 
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
 msgstr ""
 
-#: src/ServerWnd.cpp:208
-msgid "Running"
+#: src/muuli_wdr.cpp:75
+msgid "eD2k Link: "
 msgstr ""
 
-#: src/ServerWnd.cpp:214
-msgid "Status:"
+#: src/muuli_wdr.cpp:82
+msgid "Commit"
 msgstr ""
 
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
+#: src/muuli_wdr.cpp:83
+msgid ""
+"Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
+#: src/muuli_wdr.cpp:91
+msgid ""
+"Events are displayed here. For a complete list of events, refer to the log "
+"in the Servers-tab."
 msgstr ""
 
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
+#: src/muuli_wdr.cpp:94
+msgid "Loading ..."
 msgstr ""
 
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
+#: src/muuli_wdr.cpp:102
+msgid "Number of users on the server you are connected to ..."
 msgstr ""
 
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
+#: src/muuli_wdr.cpp:105
+msgid "Users: 0"
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
+#: src/muuli_wdr.cpp:106
+msgid ""
+"Users connected to the current server and an estimate of the total number of "
+"users."
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
+#: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
 msgstr ""
 
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
+#: src/muuli_wdr.cpp:118
+msgid ""
+"Current average upload and download rates. If enabled the numbers in the "
+"braces signify the overhead from client communication."
 msgstr ""
 
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
+#: src/muuli_wdr.cpp:126
+msgid ""
+"Displays the connected status and active transfers. Red arrows signifies "
+"that you are currently not connected, yellow arrows signify that you have "
+"low ID (firewalled) and green arrows signify that you have high ID (The "
+"optimal connection type)."
 msgstr ""
 
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
+#: src/muuli_wdr.cpp:130
+msgid "Not Connected ..."
 msgstr ""
 
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
+#: src/muuli_wdr.cpp:131
+msgid "Currently connected server."
 msgstr ""
 
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
+#: src/muuli_wdr.cpp:177
+msgid "Search"
 msgstr ""
 
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
+#: src/muuli_wdr.cpp:183
+msgid "Name:"
 msgstr ""
 
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
 msgstr ""
 
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
+msgid "Local"
 msgstr ""
 
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
+#: src/muuli_wdr.cpp:197
+msgid "Global"
 msgstr ""
 
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
+#: src/muuli_wdr.cpp:199
+msgid "FileHash"
 msgstr ""
 
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
+#: src/muuli_wdr.cpp:207
+msgid "Extended Parameters"
 msgstr ""
 
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
+#: src/muuli_wdr.cpp:213
+msgid "Filtering"
 msgstr ""
 
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
+#: src/muuli_wdr.cpp:224
+msgid "File Type"
 msgstr ""
 
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
 msgstr ""
 
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
 msgstr ""
 
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
 msgstr ""
 
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
 msgstr ""
 
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
 msgstr ""
 
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
 msgstr ""
 
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
 msgstr ""
 
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
 msgstr ""
 
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
+#: src/muuli_wdr.cpp:254
+msgid "Extension"
 msgstr ""
 
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
+#: src/muuli_wdr.cpp:260
+msgid "Min Size"
 msgstr ""
 
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+msgid "Bytes"
 msgstr ""
 
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
+msgid "KB"
 msgstr ""
 
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
 msgstr ""
 
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
 msgstr ""
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
+#: src/muuli_wdr.cpp:283
+msgid "Max Size"
 msgstr ""
 
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
+#: src/muuli_wdr.cpp:306
+msgid "Availability"
 msgstr ""
 
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
+#: src/muuli_wdr.cpp:319
+msgid "Filter:"
 msgstr ""
 
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
+#: src/muuli_wdr.cpp:328
+msgid "Filter Results"
 msgstr ""
 
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
+#: src/muuli_wdr.cpp:334
+msgid "Invert Result"
 msgstr ""
 
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
+#: src/muuli_wdr.cpp:340
+msgid "Hide Known Files"
 msgstr ""
 
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
 msgstr ""
 
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
+#: src/muuli_wdr.cpp:356
+msgid "More"
 msgstr ""
 
-#: src/Statistics.cpp:709
-msgid "Filtered"
+#: src/muuli_wdr.cpp:357
+msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
+#: src/muuli_wdr.cpp:364
+msgid "Stop"
 msgstr ""
 
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
 msgstr ""
 
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
+#: src/muuli_wdr.cpp:378
+msgid "Reset Fields"
 msgstr ""
 
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
+#: src/muuli_wdr.cpp:393
+msgid "Results"
 msgstr ""
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
+#: src/muuli_wdr.cpp:422
+msgid "Clears completed downloads"
 msgstr ""
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
 msgstr ""
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
 msgstr ""
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
+#: src/muuli_wdr.cpp:525
+msgid "Full Name :"
 msgstr ""
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
+msgid "N/A"
 msgstr ""
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
+#: src/muuli_wdr.cpp:536
+msgid "met-File :"
 msgstr ""
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
+#: src/muuli_wdr.cpp:547
+msgid "Hash :"
 msgstr ""
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
+#: src/muuli_wdr.cpp:562
+msgid "Filesize :"
 msgstr ""
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
+#: src/muuli_wdr.cpp:573
+msgid "Partfilestatus :"
 msgstr ""
 
-#: src/Statistics.cpp:731
-#, c-format
-msgid "Average file size: %s"
+#: src/muuli_wdr.cpp:584
+msgid "Last seen complete :"
 msgstr ""
 
-#: src/Statistics.cpp:872
-msgid "Operating System"
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
 msgstr ""
 
-#: src/Statistics.cpp:897
-msgid "Not Received"
+#: src/muuli_wdr.cpp:606
+msgid "Found Sources :"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
+#: src/muuli_wdr.cpp:617
+msgid "Transferring Sources :"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
+#: src/muuli_wdr.cpp:628
+msgid "Filepart-Count :"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
+#: src/muuli_wdr.cpp:639
+msgid "Available :"
 msgstr ""
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
+#: src/muuli_wdr.cpp:650
+msgid "Datarate :"
 msgstr ""
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/muuli_wdr.cpp:661
+msgid "Download Active Time: "
 msgstr ""
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
+#: src/muuli_wdr.cpp:672
+msgid "Transferred :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
+#: src/muuli_wdr.cpp:683
+msgid "Completed Size :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
+#: src/muuli_wdr.cpp:710
+msgid "Intelligent Corruption Handling"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#: src/muuli_wdr.cpp:719
+msgid "Lost to corruption :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+#: src/muuli_wdr.cpp:730
+msgid "Gained by compression :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+#: src/muuli_wdr.cpp:741
+msgid "Packages saved by I.C.H. :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/muuli_wdr.cpp:754
+msgid "File Names"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
+#: src/muuli_wdr.cpp:763
+msgid "Takeover"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+#: src/muuli_wdr.cpp:773
+msgid "Cleanup"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
+msgid "Apply"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
+#: src/muuli_wdr.cpp:798
+msgid "Ok"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
+#: src/muuli_wdr.cpp:823
+msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
+#: src/muuli_wdr.cpp:829
+msgid ""
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
+#: src/muuli_wdr.cpp:841
+msgid "File Quality"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
 msgstr ""
 
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
 msgstr ""
 
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
 msgstr ""
 
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
 msgstr ""
 
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
 msgstr ""
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
 msgstr ""
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+#: src/muuli_wdr.cpp:854
+msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
+#: src/muuli_wdr.cpp:898
+msgid "Refresh"
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
+#: src/muuli_wdr.cpp:925
+msgid "Downloading, please wait ..."
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
+#: src/muuli_wdr.cpp:931
+msgid "Unknown size"
 msgstr ""
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
+#: src/muuli_wdr.cpp:955
+msgid "Required Information"
 msgstr ""
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
+#: src/muuli_wdr.cpp:960
+msgid "IP Address :"
 msgstr ""
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
+#: src/muuli_wdr.cpp:966
+msgid "Port :"
 msgstr ""
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
+#: src/muuli_wdr.cpp:976
+msgid "Additional Information"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
+#: src/muuli_wdr.cpp:981
+msgid "Username :"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
+#: src/muuli_wdr.cpp:987
+msgid "Userhash :"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
+#: src/muuli_wdr.cpp:1046
+msgid "Download-Speed"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
+msgid "Current"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
+msgid "Running average"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
+msgid "Session average"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
+#: src/muuli_wdr.cpp:1095
+msgid "Upload-Speed"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
+#: src/muuli_wdr.cpp:1144
+msgid "Connections"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
+msgid "Active downloads"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
+#: src/muuli_wdr.cpp:1173
+msgid "Active connections (1:1)"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
+msgid "Active uploads"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/muuli_wdr.cpp:1193
+msgid "Statistics Tree"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#: src/muuli_wdr.cpp:1223
+msgid "Username:"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
+#: src/muuli_wdr.cpp:1226
+msgid "Userhash:"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
+#: src/muuli_wdr.cpp:1249
+msgid "Client software:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
+#: src/muuli_wdr.cpp:1258
+msgid "Client version:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
+msgid "IP address:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
+#: src/muuli_wdr.cpp:1274
+msgid "User ID:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
+#: src/muuli_wdr.cpp:1281
+msgid "Server IP:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
+#: src/muuli_wdr.cpp:1290
+msgid "Server name:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
+#: src/muuli_wdr.cpp:1297
+msgid "Obfuscation:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
+#: src/muuli_wdr.cpp:1306
+msgid "Kad:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
+#: src/muuli_wdr.cpp:1317
+msgid "Transfers to client"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
+#: src/muuli_wdr.cpp:1322
+msgid "Current request:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
-msgid "Send message to user"
+#: src/muuli_wdr.cpp:1335
+msgid "Average upload rate:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
-msgid "Message to send:"
+#: src/muuli_wdr.cpp:1344
+msgid "Average download rate:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
+#: src/muuli_wdr.cpp:1351
+msgid "Uploaded (session):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
+#: src/muuli_wdr.cpp:1360
+msgid "Downloaded (session):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
+#: src/muuli_wdr.cpp:1367
+msgid "Uploaded (total):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
+#: src/muuli_wdr.cpp:1376
+msgid "Downloaded (total):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
+#: src/muuli_wdr.cpp:1387
+msgid "Scores"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
+#: src/muuli_wdr.cpp:1394
+msgid "DL/UP modifier:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
+#: src/muuli_wdr.cpp:1403
+msgid "Secure ident:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
+#: src/muuli_wdr.cpp:1419
+msgid "Queue score:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
+#: src/muuli_wdr.cpp:1448
+msgid "Nick"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
+#: src/muuli_wdr.cpp:1452
+msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Remove from friends"
+#: src/muuli_wdr.cpp:1471
+msgid "Check for new version at startup"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
+#: src/muuli_wdr.cpp:1472
+msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
-msgid "Send message"
+#: src/muuli_wdr.cpp:1475
+msgid "Start minimized"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1017
-msgid "Swap to this file"
+#: src/muuli_wdr.cpp:1476
+msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
+#: src/muuli_wdr.cpp:1479
+msgid "Prompt on exit"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1657
-msgid "A4AF"
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/muuli_wdr.cpp:1487
+msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1721
-msgid "Asked for another file"
+#: src/muuli_wdr.cpp:1488
+msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
+#: src/muuli_wdr.cpp:1491
+msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2275
+#: src/muuli_wdr.cpp:1492
 msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
+"Enabling this will make aMule minimize to the System Tray, rather than the "
+"taskbar."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
 msgstr ""
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
+#: src/muuli_wdr.cpp:1511
+msgid "Browser Selection"
 msgstr ""
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
+#: src/muuli_wdr.cpp:1517
+msgid ""
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
 msgstr ""
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
+#: src/muuli_wdr.cpp:1525
+msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#: src/muuli_wdr.cpp:1527
+msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/muuli_wdr.cpp:1532
+msgid "Video Player"
 msgstr ""
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr ""
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/muuli_wdr.cpp:1579
+msgid "Upload"
 msgstr ""
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
+#: src/muuli_wdr.cpp:1588
+msgid "Slot Allocation"
 msgstr ""
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
 msgstr ""
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
 msgstr ""
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
+#: src/muuli_wdr.cpp:1611
+msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
 msgstr ""
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
 msgstr ""
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
+#: src/muuli_wdr.cpp:1649
 msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-msgstr[1] ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+#: src/muuli_wdr.cpp:1676
+msgid "Kademlia"
 msgstr ""
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
 msgstr ""
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
+#: src/muuli_wdr.cpp:1689
+msgid "Autoconnect on startup"
 msgstr ""
 
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/muuli_wdr.cpp:1692
+msgid "Reconnect on loss"
 msgstr ""
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+#: src/muuli_wdr.cpp:1716
+msgid "Remove dead server after"
 msgstr ""
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+#: src/muuli_wdr.cpp:1722
+msgid "retries"
 msgstr ""
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
+#: src/muuli_wdr.cpp:1729
+msgid "Auto-update server list at startup"
 msgstr ""
 
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+#: src/muuli_wdr.cpp:1732
+msgid "List"
 msgstr ""
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
+#: src/muuli_wdr.cpp:1737
+msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
+#: src/muuli_wdr.cpp:1740
+msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
+#: src/muuli_wdr.cpp:1743
+msgid "Use priority system"
 msgstr ""
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/muuli_wdr.cpp:1747
+msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
+#: src/muuli_wdr.cpp:1751
+msgid "Safe connect"
 msgstr ""
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
+#: src/muuli_wdr.cpp:1755
+msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#: src/muuli_wdr.cpp:1758
+msgid "Set manually added servers to High Priority"
 msgstr ""
 
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
 msgstr ""
 
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
 msgstr ""
 
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
 
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1791
+msgid "Add files to download in pause mode"
+msgstr ""
 
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
+#: src/muuli_wdr.cpp:1794
+msgid "Add files to download with auto priority"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
+#: src/muuli_wdr.cpp:1797
+msgid "Try to download first and last chunks first"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
+#: src/muuli_wdr.cpp:1805
+msgid "From the same category"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:104
-#, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr ""
 
-#: src/ServerConnect.cpp:69
+#: src/muuli_wdr.cpp:1812
 msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
 msgstr ""
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
 msgstr ""
 
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
 
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
 msgstr ""
 
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
 msgstr ""
 
-#: src/ServerConnect.cpp:381
-#, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1884
+msgid "(Right click on folder icon for recursive share)"
+msgstr ""
 
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
+#: src/muuli_wdr.cpp:1891
+msgid "Share hidden files"
 msgstr ""
 
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
+#: src/muuli_wdr.cpp:1911
+msgid "Graphs"
 msgstr ""
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
+msgid "Update delay : 5 secs"
 msgstr ""
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
+#: src/muuli_wdr.cpp:1920
+msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+#: src/muuli_wdr.cpp:1926
+msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
 msgstr ""
 
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr ""
 
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
 msgstr ""
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/muuli_wdr.cpp:1963
+msgid "Background"
 msgstr ""
 
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
+#: src/muuli_wdr.cpp:1964
+msgid "Grid"
 msgstr ""
 
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
+#: src/muuli_wdr.cpp:1965
+msgid "Download current"
 msgstr ""
 
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
+#: src/muuli_wdr.cpp:1966
+msgid "Download running average"
 msgstr ""
 
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
+#: src/muuli_wdr.cpp:1967
+msgid "Download session average"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+#: src/muuli_wdr.cpp:1968
+msgid "Upload current"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
+#: src/muuli_wdr.cpp:1969
+msgid "Upload running average"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
+#: src/muuli_wdr.cpp:1970
+msgid "Upload session average"
 msgstr ""
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
+#: src/muuli_wdr.cpp:1971
+msgid "Active connections"
 msgstr ""
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+#: src/muuli_wdr.cpp:1974
+msgid "Systray Icon Speedbar"
 msgstr ""
 
-#: src/TextClient.cpp:309
-msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+#: src/muuli_wdr.cpp:1975
+msgid "Kad-nodes current"
 msgstr ""
 
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
+#: src/muuli_wdr.cpp:1976
+msgid "Kad-nodes running"
 msgstr ""
 
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
+#: src/muuli_wdr.cpp:1977
+msgid "Kad-nodes session"
 msgstr ""
 
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
+msgid "Select"
 msgstr ""
 
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
 msgstr ""
 
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
+#: src/muuli_wdr.cpp:2000
+msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
+#: src/muuli_wdr.cpp:2028
+msgid "!!! WARNING !!!"
 msgstr ""
 
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
+#: src/muuli_wdr.cpp:2042
+msgid "Max new connections / 5 secs"
 msgstr ""
 
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
+#: src/muuli_wdr.cpp:2048
+msgid "File Buffer Size: 240000 bytes"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
+#: src/muuli_wdr.cpp:2054
+msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
+#: src/muuli_wdr.cpp:2060
+msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
 msgstr ""
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
 msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
 msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
 msgstr ""
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
 msgstr ""
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
 msgstr ""
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
 msgstr ""
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
 msgstr ""
 
-#: src/TextClient.cpp:809
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
 msgstr ""
 
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
 msgstr ""
 
-#: src/TextClient.cpp:828
-#, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
 msgstr ""
 
-#: src/TextClient.cpp:841
-msgid "Show short status information."
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
 msgstr ""
 
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
 msgstr ""
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
 msgstr ""
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
 msgstr ""
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/TextClient.cpp:848
+#: src/muuli_wdr.cpp:2190
 msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
 msgstr ""
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
 msgstr ""
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
 msgstr ""
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
 msgstr ""
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
 msgstr ""
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
 msgstr ""
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
 msgstr ""
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
 msgstr ""
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
 msgstr ""
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
 msgstr ""
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
 msgstr ""
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
 msgstr ""
 
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
+#: src/muuli_wdr.cpp:2326
+msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
+#: src/muuli_wdr.cpp:2330
+msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
+#: src/muuli_wdr.cpp:2354
+msgid "Title :"
 msgstr ""
 
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
+#: src/muuli_wdr.cpp:2364
+msgid "Comment :"
 msgstr ""
 
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
+#: src/muuli_wdr.cpp:2374
+msgid "Incoming Dir :"
 msgstr ""
 
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
+#: src/muuli_wdr.cpp:2387
+msgid "Change priority for new assigned files :"
 msgstr ""
 
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr ""
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
+#: src/muuli_wdr.cpp:2406
+msgid "Select color for this Category (currently selected) :"
 msgstr ""
 
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
 msgstr ""
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
+msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/TextClient.cpp:880
+#: src/muuli_wdr.cpp:2528
+msgid "Click on this button to update the servers list from URL ..."
+msgstr ""
+
+#: src/muuli_wdr.cpp:2532
+msgid "Server list"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2537
 msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+"Enter the url to a server.met file here and press the button to the left to "
+"update the list of known servers."
 msgstr ""
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
+#: src/muuli_wdr.cpp:2544
+msgid "Add server manually: Name"
 msgstr ""
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
+#: src/muuli_wdr.cpp:2548
+msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
 msgstr ""
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
+#: src/muuli_wdr.cpp:2555
+msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
+#: src/muuli_wdr.cpp:2562
+msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
+#: src/muuli_wdr.cpp:2566
+msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
 msgstr ""
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
 msgstr ""
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
+#: src/muuli_wdr.cpp:2612
+msgid "ED2K Info"
 msgstr ""
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
+#: src/muuli_wdr.cpp:2616
+msgid "Kad Info"
 msgstr ""
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
+#: src/muuli_wdr.cpp:2645
+msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
+#: src/muuli_wdr.cpp:2649
+msgid "Nodes (0)"
 msgstr ""
 
-#: src/TextClient.cpp:901
+#: src/muuli_wdr.cpp:2654
 msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+"Enter the url to a nodes.dat file here and press the button to the left to "
+"update the list of known nodes."
 msgstr ""
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
+#: src/muuli_wdr.cpp:2659
+msgid "Nodes stats"
 msgstr ""
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
+#: src/muuli_wdr.cpp:2710
+msgid "Bootstrap"
 msgstr ""
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
+#: src/muuli_wdr.cpp:2713
+msgid "New node"
 msgstr ""
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
+#: src/muuli_wdr.cpp:2718
+msgid "IP:"
 msgstr ""
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
+#: src/muuli_wdr.cpp:2747
+msgid "Port:"
 msgstr ""
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
 msgstr ""
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
+#: src/muuli_wdr.cpp:2768
+msgid "Disconnect Kad"
 msgstr ""
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/TextClient.cpp:913
+#: src/muuli_wdr.cpp:2808
 msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
 msgstr ""
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
+#: src/muuli_wdr.cpp:2811
+msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
+#: src/muuli_wdr.cpp:2814
+msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
+#: src/muuli_wdr.cpp:2816
+msgid ""
+"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
+"connections from other clients."
 msgstr ""
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
+#: src/muuli_wdr.cpp:2819
+msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+#: src/muuli_wdr.cpp:2821
+msgid ""
+"This option makes aMule use Protocol Obfuscation when connecting other "
+"clients/servers."
 msgstr ""
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
+#: src/muuli_wdr.cpp:2824
+msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
+#: src/muuli_wdr.cpp:2825
+msgid ""
+"This option makes aMule only accept obfuscated connections. You will have "
+"less sources, but all your traffic will be obfuscated"
 msgstr ""
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
+#: src/muuli_wdr.cpp:2832
+msgid "Everybody"
 msgstr ""
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
+#: src/muuli_wdr.cpp:2834
+msgid "No one"
 msgstr ""
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
+#: src/muuli_wdr.cpp:2837
+msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
+#: src/muuli_wdr.cpp:2840
+msgid "IP-Filtering"
 msgstr ""
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
+#: src/muuli_wdr.cpp:2847
+msgid "Filter clients"
 msgstr ""
 
-#: src/TextClient.cpp:940
-msgid "Show log."
+#: src/muuli_wdr.cpp:2849
+msgid ""
+"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
+#: src/muuli_wdr.cpp:2852
+msgid "Filter servers"
 msgstr ""
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
+#: src/muuli_wdr.cpp:2854
+msgid ""
+"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Deprecated command, use '%s' instead."
+#: src/muuli_wdr.cpp:2861
+msgid "Reload List"
 msgstr ""
 
-#: src/TextClient.cpp:952
-#, c-format
+#: src/muuli_wdr.cpp:2862
+msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2870
+msgid "URL:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2876
+msgid "Update now"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2881
+msgid "Auto-update ipfilter at startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2886
+msgid "Filtering Level:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2896
+msgid "Always filter LAN IPs"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2900
+msgid "Paranoid handling of non-matching IPs"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2902
 msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
+"Rejects packet if the client ip is different from the ip where the packet is "
+"received from. Use with caution."
 msgstr ""
 
-#: src/ServerSocket.cpp:259
-#, c-format
-msgid "ERROR: %s (%s) - %s"
+#: src/muuli_wdr.cpp:2905
+msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/ServerSocket.cpp:274
-#, c-format
-msgid "WARNING: %s (%s) - %s"
+#: src/muuli_wdr.cpp:2906
+msgid ""
+"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
+"file."
 msgstr ""
 
-#: src/ServerSocket.cpp:417
-#, c-format
-msgid "New clientid is %u"
+#: src/muuli_wdr.cpp:2925
+msgid "Enable Online-Signature"
 msgstr ""
 
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
+#: src/muuli_wdr.cpp:2927
+msgid ""
+"Enables the writing of the OS file, which can be used by external apps to "
+"create signatures and the like."
 msgstr ""
 
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
+#: src/muuli_wdr.cpp:2932
+msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
+#: src/muuli_wdr.cpp:2936
+msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
 msgstr ""
 
-#: src/ServerSocket.cpp:539
-#, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:2952
+msgid ""
+"Click here to select the directory containing the the Online Signature files."
+msgstr ""
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
+#: src/muuli_wdr.cpp:2974
+msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
+#: src/muuli_wdr.cpp:2977
+msgid "Filter all messages"
 msgstr ""
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
+#: src/muuli_wdr.cpp:2980
+msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
+#: src/muuli_wdr.cpp:2983
+msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
+#: src/muuli_wdr.cpp:2986
+msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
+msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
 msgstr ""
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
+#: src/muuli_wdr.cpp:2998
+msgid "Comments"
 msgstr ""
 
-#: src/ServerSocket.cpp:760
-#, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
+#: src/muuli_wdr.cpp:3001
+msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
 msgstr ""
 
-#: src/IP2Country.cpp:105
-#, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr ""
 
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
 msgstr ""
 
-#: src/TransferWnd.cpp:342
-msgid "All others"
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
 msgstr ""
 
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
 msgstr ""
 
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
+#: src/muuli_wdr.cpp:3050
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
+#: src/muuli_wdr.cpp:3051
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
+#: src/muuli_wdr.cpp:3056
+msgid "Proxy type:"
 msgstr ""
 
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
+#: src/muuli_wdr.cpp:3069
+msgid "Proxy host:"
 msgstr ""
 
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
+#: src/muuli_wdr.cpp:3073
+msgid "The proxy host name"
 msgstr ""
 
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
+#: src/muuli_wdr.cpp:3076
+msgid "Proxy port:"
 msgstr ""
 
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
+#: src/muuli_wdr.cpp:3080
+msgid "The proxy port"
 msgstr ""
 
-#: src/TransferWnd.cpp:367
-msgid "Add category"
+#: src/muuli_wdr.cpp:3101
+msgid "Connect to:"
 msgstr ""
 
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
+#: src/muuli_wdr.cpp:3115
+msgid "Login to remote amule"
 msgstr ""
 
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
+#: src/muuli_wdr.cpp:3120
+msgid "User name"
 msgstr ""
 
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
+#: src/muuli_wdr.cpp:3137
+msgid "Remember those settings"
 msgstr ""
 
-#: src/KnownFile.cpp:1360
-msgid "File size"
+#: src/muuli_wdr.cpp:3166
+msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
+#: src/muuli_wdr.cpp:3169
+msgid "Message Categories:"
 msgstr ""
 
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
 msgstr ""
 
-#: src/KnownFile.cpp:1363
-msgid "Requested"
+#: src/muuli_wdr.cpp:3222
+msgid "Add imports"
 msgstr ""
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
+#: src/muuli_wdr.cpp:3226
+msgid "Retry selected"
 msgstr ""
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
+#: src/muuli_wdr.cpp:3229
+msgid "Remove selected"
 msgstr ""
 
-#: src/PartFileConvert.cpp:208
-#, c-format
-msgid "Importing %s: %s"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr ""
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
 msgstr ""
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
 msgstr ""
 
-#: src/PartFileConvert.cpp:331
-#, c-format
-msgid "Loading data from old download file (%u of %u)"
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
 msgstr ""
 
-#: src/PartFileConvert.cpp:351
-#, c-format
-msgid "Saving data block into new single download file (%u of %u)"
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
 msgstr ""
 
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
 msgstr ""
 
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:176
-#, c-format
-msgid "%s (Disk: %s)"
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
+#: src/muuli_wdr.cpp:3527
+msgid "Connect to any server and/or Kad"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
 msgstr ""
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp:106
 msgid "byte"
 msgid_plural "bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/OtherFunctions.cpp:114
+#: src/OtherFunctions.cpp:108
 msgid "kB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr ""
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr ""
-
-#: src/OtherFunctions.cpp:120
+#: src/OtherFunctions.cpp:114
 msgid "TB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:130
+#: src/OtherFunctions.cpp:124
 msgid "k"
 msgstr ""
 
-#: src/OtherFunctions.cpp:132
+#: src/OtherFunctions.cpp:126
 msgid "M"
 msgstr ""
 
-#: src/OtherFunctions.cpp:134
+#: src/OtherFunctions.cpp:128
 msgid "G"
 msgstr ""
 
-#: src/OtherFunctions.cpp:136
+#: src/OtherFunctions.cpp:130
 msgid "T"
 msgstr ""
 
-#: src/OtherFunctions.cpp:143
+#: src/OtherFunctions.cpp:137
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/OtherFunctions.cpp:147
+#: src/OtherFunctions.cpp:141
 msgid "MB/s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
 msgid "secs"
 msgstr ""
 
-#: src/OtherFunctions.cpp:170
+#: src/OtherFunctions.cpp:157
 msgid "mins"
 msgstr ""
 
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
 msgid "hours"
 msgstr ""
 
-#: src/OtherFunctions.cpp:185
+#: src/OtherFunctions.cpp:163
 msgid "Days"
 msgstr ""
 
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
+#: src/OtherFunctions.cpp:671
+msgid "all"
 msgstr ""
 
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
+#: src/OtherFunctions.cpp:672
+msgid "all others"
 msgstr ""
 
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
 msgstr ""
 
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
 msgstr ""
 
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
 msgstr ""
 
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
 msgstr ""
 
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
 msgstr ""
 
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
 msgstr ""
 
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
+#: src/PartFileConvert.cpp:200
+#, c-format
+msgid "Importing %s: %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:693
-msgid "all"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
 msgstr ""
 
-#: src/OtherFunctions.cpp:694
-msgid "all others"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
 msgstr ""
 
-#: src/IPFilter.cpp:285
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/IPFilter.cpp:326
+#: src/PartFileConvert.cpp:347
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/IPFilter.cpp:331
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr ""
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:169
 #, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
+msgid "%s (Disk: %s)"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:194
+msgid ""
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:198
+msgid ""
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr ""
+
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr ""
+
+#: src/PartFile.cpp:336
+#, c-format
+msgid "Trying to load backup of met-file from %s"
+msgstr ""
+
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr ""
+
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr ""
+
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr ""
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr ""
+
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+msgstr ""
+
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr ""
+
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr ""
+
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr ""
+
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr ""
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr ""
+
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr ""
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr ""
+
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr ""
+
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr ""
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr ""
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/IPFilter.cpp:333
+#: src/PartFile.cpp:1049
 #, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
+msgid "Partfile %s (%s) has no seeds file"
+msgstr ""
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr ""
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr ""
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
+msgid ""
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/PartFile.cpp:1175
 #, c-format
-msgid "Active connections (1:%u)"
+msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:114
+#: src/PartFile.cpp:2128
 #, c-format
-msgid "%.2f%% done"
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/muuli_wdr.cpp:73
-msgid "eD2k Link: "
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:80
-msgid "Commit"
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:81
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr ""
+
+#: src/PartFile.cpp:2292
+#, c-format
 msgid ""
-"Click here to add the eD2k link in the text control to your download queue."
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Events are displayed here. For a complete list of events, refer to the log "
-"in the Servers-tab."
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:92
-msgid "Loading ..."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:101
-msgid "Number of users on the server you are connected to ..."
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:104
-msgid "Users: 0"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:105
-msgid ""
-"Users connected to the current server and an estimate of the total number of "
-"users."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:117
-msgid ""
-"Current average upload and download rates. If enabled the numbers in the "
-"braces signify the overhead from client communication."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:125
-msgid ""
-"Displays the connected status and active transfers. Red arrows signifies "
-"that you are currently not connected, yellow arrows signify that you have "
-"low ID (firewalled) and green arrows signify that you have high ID (The "
-"optimal connection type)."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
 msgstr ""
 
-#: src/muuli_wdr.cpp:129
-msgid "Not Connected ..."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/muuli_wdr.cpp:130
-msgid "Currently connected server."
+#: src/Preferences.cpp:630
+msgid "System default"
 msgstr ""
 
-#: src/muuli_wdr.cpp:176
-msgid "Search"
+#: src/Preferences.cpp:631
+msgid "Albanian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:182
-msgid "Name:"
+#: src/Preferences.cpp:632
+msgid "Arabic"
 msgstr ""
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
-msgid "Local"
+#: src/Preferences.cpp:633
+msgid "Asturian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:196
-msgid "Global"
+#: src/Preferences.cpp:634
+msgid "Basque"
 msgstr ""
 
-#: src/muuli_wdr.cpp:198
-msgid "FileHash"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:206
-msgid "Extended Parameters"
+#: src/Preferences.cpp:636
+msgid "Catalan"
 msgstr ""
 
-#: src/muuli_wdr.cpp:212
-msgid "Filtering"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
-msgid "File Type"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:253
-msgid "Extension"
+#: src/Preferences.cpp:639
+msgid "Croatian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:259
-msgid "Min Size"
+#: src/Preferences.cpp:640
+msgid "Czech"
 msgstr ""
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
-msgid "Bytes"
+#: src/Preferences.cpp:641
+msgid "Danish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
-msgid "KB"
+#: src/Preferences.cpp:642
+msgid "Dutch"
 msgstr ""
 
-#: src/muuli_wdr.cpp:282
-msgid "Max Size"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:305
-msgid "Availability"
+#: src/Preferences.cpp:644
+msgid "Estonian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:318
-msgid "Filter:"
+#: src/Preferences.cpp:645
+msgid "Finnish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:327
-msgid "Filter Results"
+#: src/Preferences.cpp:646
+msgid "French"
 msgstr ""
 
-#: src/muuli_wdr.cpp:333
-msgid "Invert Result"
+#: src/Preferences.cpp:647
+msgid "Galician"
 msgstr ""
 
-#: src/muuli_wdr.cpp:339
-msgid "Hide Known Files"
+#: src/Preferences.cpp:648
+msgid "German"
 msgstr ""
 
-#: src/muuli_wdr.cpp:355
-msgid "More"
+#: src/Preferences.cpp:649
+msgid "Greek"
 msgstr ""
 
-#: src/muuli_wdr.cpp:356
-msgid "Searches for more results on eD2k. Not supported for Kad yet."
+#: src/Preferences.cpp:650
+msgid "Hebrew"
 msgstr ""
 
-#: src/muuli_wdr.cpp:363
-msgid "Stop"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:377
-msgid "Reset Fields"
+#: src/Preferences.cpp:652
+msgid "Italian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:392
-msgid "Results"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:428
-msgid "Clears completed downloads"
+#: src/Preferences.cpp:654
+msgid "Japanese"
 msgstr ""
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
+#: src/Preferences.cpp:655
+msgid "Korean"
 msgstr ""
 
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:540
-msgid "Send"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
+#: src/Preferences.cpp:658
+msgid "Polish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
 msgstr ""
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:575
-msgid "Full Name :"
+#: src/Preferences.cpp:661
+msgid "Russian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
-msgid "N/A"
+#: src/Preferences.cpp:662
+msgid "Slovenian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:586
-msgid "met-File :"
+#: src/Preferences.cpp:663
+msgid "Spanish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:597
-msgid "Hash :"
+#: src/Preferences.cpp:664
+msgid "Swedish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:612
-msgid "Filesize :"
+#: src/Preferences.cpp:665
+msgid "Turkish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:623
-msgid "Partfilestatus :"
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:634
-msgid "Last seen complete :"
+#: src/Preferences.cpp:728
+msgid "Change Language"
 msgstr ""
 
-#: src/muuli_wdr.cpp:656
-msgid "Found Sources :"
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:667
-msgid "Transferring Sources :"
+#: src/Preferences.cpp:771
+msgid "No languages available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:678
-msgid "Filepart-Count :"
+#: src/Preferences.cpp:902
+msgid "no options available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:689
-msgid "Available :"
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/muuli_wdr.cpp:700
-msgid "Datarate :"
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/muuli_wdr.cpp:711
-msgid "Download Active Time: "
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
-msgid "Transferred :"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:733
-msgid "Completed Size :"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
-msgid "Intelligent Corruption Handling"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
 msgstr ""
 
-#: src/muuli_wdr.cpp:769
-msgid "Lost to corruption :"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:780
-msgid "Gained by compression :"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:791
-msgid "Packages saved by I.C.H. :"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
-msgid "File Names"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
 msgstr ""
 
-#: src/muuli_wdr.cpp:825
-msgid "Takeover"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:835
-msgid "Cleanup"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
-msgid "Apply"
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
 msgstr ""
 
-#: src/muuli_wdr.cpp:854
-msgid "Ok"
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:883
-msgid "Comment/Rate file (Text will be visible to all users)"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
 msgstr ""
 
-#: src/muuli_wdr.cpp:897
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:249
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:905
-msgid "File Quality"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
 msgstr ""
 
-#: src/muuli_wdr.cpp:920
-msgid "Choose the file rating or advice users if the file is invalid ..."
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:964
-msgid "Refresh"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:991
-msgid "Downloading, please wait ..."
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/muuli_wdr.cpp:997
-msgid "Unknown size"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1021
-msgid "Required Information"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1026
-msgid "IP Address :"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1032
-msgid "Port :"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1042
-msgid "Additional Information"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1047
-msgid "Username :"
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1053
-msgid "Userhash :"
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1206
-msgid "Download-Speed"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
-msgid "Current"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
-msgid "Running average"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
-msgid "Session average"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
-msgid "Upload-Speed"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1304
-msgid "Connections"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
-msgid "Active downloads"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1333
-msgid "Active connections (1:1)"
+#: src/PrefsUnifiedDlg.cpp:1003
+#, c-format
+msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
-msgid "Active uploads"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
-msgid "Statistics Tree"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
-msgid "Username:"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1386
-msgid "Userhash:"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1409
-msgid "Client software:"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1418
-msgid "Client version:"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1425
-msgid "IP address:"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1434
-msgid "User ID:"
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1441
-msgid "Server IP:"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, c-format
+msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1450
-msgid "Server name:"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1457
-msgid "Obfuscation:"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1466
-msgid "Kad:"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1477
-msgid "Transfers to client"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1482
-msgid "Current request:"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1495
-msgid "Average upload rate:"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1504
-msgid "Average download rate:"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1511
-msgid "Uploaded (session):"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
-msgid "Downloaded (session):"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1527
-msgid "Uploaded (total):"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1536
-msgid "Downloaded (total):"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1547
-msgid "Scores"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1554
-msgid "DL/UP modifier:"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Secure ident:"
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
+#: src/SearchListCtrl.cpp:639
+#, c-format
+msgid "Get %s for this file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1579
-msgid "Queue score:"
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1610
-msgid "Nick"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1614
-msgid "This is the name that other users will see when connecting to you."
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1634
-msgid "Check for new version at startup"
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1638
-msgid "Start minimized"
+#: src/ServerConnect.cpp:198
+#, c-format
+msgid "Connected to %s (%s:%i)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1639
-msgid "Enabling this makes aMule minimize itself upon start."
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
-msgid "Prompt on exit"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1647
-msgid "Enable Tray Icon"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1648
-msgid "This Enables/Disables the system tray (or taskbar) icon."
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1651
-msgid "Minimize to Tray Icon"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1652
-msgid ""
-"Enabling this will make aMule minimize to the System Tray, rather than the "
-"taskbar."
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
-msgid "Browser Selection"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
+#: src/ServerList.cpp:88
+#, c-format
+msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
+#: src/ServerList.cpp:93
+msgid "Server.met file not found!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
+#: src/ServerList.cpp:101
+#, c-format
+msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
+#: src/ServerList.cpp:107
+msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
+#: src/ServerList.cpp:118
+#, c-format
+msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
+#: src/ServerList.cpp:173
+#, c-format
+msgid "%i server in server.met found"
+msgid_plural "%i servers in server.met found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ServerList.cpp:175
+#, c-format
+msgid "%d server added"
+msgid_plural "%d servers added"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
+#: src/ServerList.cpp:195
+#, c-format
+msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
+#: src/ServerList.cpp:213
+#, c-format
+msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
+#: src/ServerList.cpp:232
+#, c-format
+msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
+#: src/ServerList.cpp:250
+#, c-format
+msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/ServerList.cpp:345
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"You are connected to the server you are trying to delete. please disconnect "
+"first."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1705
-msgid "Open in new tab if possible"
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1707
-msgid "Open the web page in a new tab instead of in a new window when possible"
+#: src/ServerList.cpp:685
+msgid "Failed to save server.met!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1712
-msgid "Video Player"
+#: src/ServerList.cpp:832
+msgid "Invalid URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
+#: src/ServerList.cpp:854
+#, c-format
+msgid "Finished downloading the server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/ServerList.cpp:869
+msgid ""
+"No server list address entry in 'addresses.dat' found. Please paste a valid "
+"server list address into this file in order to auto-update your server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
-msgid "Upload"
+#: src/ServerList.cpp:882
+#, c-format
+msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1775
-msgid "Slot Allocation"
+#: src/ServerList.cpp:891
+#, c-format
+msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
+#: src/ServerList.cpp:895
+msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1796
-msgid "This is the standard eD2k port and cannot be disabled."
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
+#: src/ServerList.cpp:985
+msgid ""
+"Local server is filtered by the IPFilters, reconnecting to a different "
+"server!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
+#: src/ServerListCtrl.cpp:148
+msgid ""
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1886
-msgid "Kademlia"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
-msgid "Autoconnect on startup"
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1916
-msgid "Reconnect on loss"
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1947
-msgid "Remove dead server after"
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1953
-msgid "retries"
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1960
-msgid "Auto-update server list at startup"
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1963
-msgid "List"
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1968
-msgid "Update server list when connecting to a server"
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1971
-msgid "Update server list when a client connects"
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1974
-msgid "Use priority system"
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1978
-msgid "Use smart LowID check on connect"
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1982
-msgid "Safe connect"
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1986
-msgid "Autoconnect to servers in static list only"
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1989
-msgid "Set manually added servers to High Priority"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2024
-msgid "Add files to download in pause mode"
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2027
-msgid "Add files to download with auto priority"
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Try to download first and last chunks first"
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr ""
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2045
-msgid "From the same category"
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
+#: src/ServerWnd.cpp:171
+msgid "ID"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2122
-msgid "(Right click on folder icon for recursive share)"
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2129
-msgid "Share hidden files"
+#: src/ServerWnd.cpp:206
+msgid "Running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2149
-msgid "Graphs"
+#: src/ServerWnd.cpp:209
+msgid "Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
-msgid "Update delay : 5 secs"
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2158
-msgid "Time for average graph: 100 mins"
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2164
-msgid "Connections Graph Scale: 100 "
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2177
-msgid "Background"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2178
-msgid "Grid"
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2179
-msgid "Download current"
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2180
-msgid "Download running average"
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2181
-msgid "Download session average"
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2182
-msgid "Upload current"
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2183
-msgid "Upload running average"
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2184
-msgid "Upload session average"
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2185
-msgid "Active connections"
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2188
-msgid "Systray Icon Speedbar"
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2189
-msgid "Kad-nodes current"
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2190
-msgid "Kad-nodes running"
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2191
-msgid "Kad-nodes session"
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
-msgid "Select"
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2214
-msgid "Number of Client Versions shown (0=unlimited)"
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2272
-msgid "!!! WARNING !!!"
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Max new connections / 5 secs"
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2294
-msgid "File Buffer Size: 240000 bytes"
+#: src/SharedFilePeersListCtrl.cpp:35
+msgid "Upload Status"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2300
-msgid "Upload Queue Size: 5000 clients"
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2306
-msgid "Server connection refresh interval: Disable"
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+msgid "Shares File List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2583
-msgid "Click here to apply any changes made to the preferences."
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2587
-msgid "Reset any changes made to the preferences."
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2611
-msgid "Title :"
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2621
-msgid "Comment :"
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2631
-msgid "Incoming Dir :"
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
-msgid "Change priority for new assigned files :"
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2663
-msgid "Select color for this Category (currently selected) :"
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
-msgid "Click this button to reset the log."
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2806
-msgid "Click on this button to update the servers list from URL ..."
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2810
-msgid "Server list"
+#: src/Statistics.cpp:785
+msgid "Clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2815
-msgid ""
-"Enter the url to a server.met file here and press the button to the left to "
-"update the list of known servers."
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2822
-msgid "Add server manually: Name"
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2826
-msgid "Enter the name of the new server here"
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2833
-msgid "Enter the IP of the server here, using the x.x.x.x format."
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2840
-msgid "Enter the port of the server here."
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2844
-msgid "Add manually a server (fill fields to the left before) ..."
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2890
-msgid "ED2K Info"
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
-msgid "Kad Info"
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2923
-msgid "Click on this button to update the nodes list from URL ..."
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2927
-msgid "Nodes (0)"
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2932
-msgid ""
-"Enter the url to a nodes.dat file here and press the button to the left to "
-"update the list of known nodes."
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2937
-msgid "Nodes stats"
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2988
-msgid "Bootstrap"
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2991
-msgid "New node"
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2996
-msgid "IP:"
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3025
-msgid "Port:"
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3048
-msgid "Disconnect Kad"
+#: src/Statistics.cpp:955
+msgid "Operating System"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
+#: src/Statistics.cpp:980
+msgid "Not Received"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3096
-msgid "Protocol Obfuscation"
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3099
-msgid "Support Protocol Obfuscation"
+#: src/StatTree.cpp:550
+msgid "Not available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3101
-msgid ""
-"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
-"connections from other clients."
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3104
-msgid "Use obfuscation for outgoing connections"
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3106
-msgid ""
-"This option makes aMule use Protocol Obfuscation when connecting other "
-"clients/servers."
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3109
-msgid "Accept only obfuscated connections"
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3110
+#: src/TextClient.cpp:323
 msgid ""
-"This option makes aMule only accept obfuscated connections. You will have "
-"less sources, but all your traffic will be obfuscated"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:3120
-msgid "Everybody"
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:3122
-msgid "No one"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3125
-msgid "Select who can request to view a list of your shared files."
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3130
-msgid "IP-Filtering"
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3137
-msgid "Filter clients"
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3139
-msgid ""
-"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3142
-msgid "Filter servers"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3144
-msgid ""
-"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3151
-msgid "Reload List"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3152
-msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3160
-msgid "URL:"
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3166
-msgid "Update now"
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3171
-msgid "Auto-update ipfilter at startup"
+#: src/TextClient.cpp:699
+msgid "eD2k"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3176
-msgid "Filtering Level:"
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3186
-msgid "Always filter LAN IPs"
+#: src/TextClient.cpp:710
+msgid "Now connecting"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3190
-msgid "Paranoid handling of non-matching IPs"
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3192
-msgid ""
-"Rejects packet if the client ip is different from the ip where the packet is "
-"received from. Use with caution."
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3195
-msgid "Use system-wide ipfilter.dat if available"
+#: src/TextClient.cpp:734
+#, c-format
+msgid ""
+"\n"
+"Download:\t%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3196
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
-"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
-"file."
+"\n"
+"Upload:\t%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
+#: src/TextClient.cpp:740
+#, c-format
+msgid ""
+"\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3201
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
+"\n"
+"Total sources:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3223
-msgid "Enable Online-Signature"
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3225
-msgid ""
-"Enables the writing of the OS file, which can be used by external apps to "
-"create signatures and the like."
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3230
-msgid "Update Frequency (Secs):"
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3234
-msgid "Change the frequency (in seconds) of Online Signature updates."
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
+#: src/TextClient.cpp:850
+msgid "Show short status information."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3249
-msgid ""
-"Click here to select the directory containing the the Online Signature files."
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3271
-msgid "Filter incoming messages (except current chat):"
+#: src/TextClient.cpp:854
+msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
+"\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3277
-msgid "Filter all messages"
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3280
-msgid "Filter messages from people not on your friend list"
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3283
-msgid "Filter messages from unknown clients"
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3286
-msgid "Filter messages containing (use ',' as separator):"
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
-msgid "add here the words amule should filter and block messages including it"
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3302
-msgid "Comments"
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3310
-msgid "Filter comments containing (use ',' as separator):"
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3339
-msgid "Enable Proxy"
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3340
-msgid "Enable/disable proxy support"
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3345
-msgid "Proxy type:"
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3359
-msgid "Proxy host:"
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3363
-msgid "The proxy host name"
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
+"\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3366
-msgid "Proxy port:"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3370
-msgid "The proxy port"
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3424
-msgid "Connect to:"
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3438
-msgid "Login to remote amule"
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3443
-msgid "User name"
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3460
-msgid "Remember those settings"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3492
-msgid "Enable Verbose Debug-Logging."
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3497
-msgid "Message Categories:"
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3550
-msgid "Add imports"
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3554
-msgid "Retry selected"
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3557
-msgid "Remove selected"
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3668
-msgid "Connect to any server and/or Kad"
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
+#: src/TextClient.cpp:913
+msgid "Execute a search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
 msgstr ""
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
 msgstr ""
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
 msgstr ""
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
 msgstr ""
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
 msgstr ""
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:141
-#, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
 msgstr ""
 
-#: src/ExternalConnector.cpp:143
-#, c-format
-msgid "Unknown command '%s'.\n"
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/TextClient.cpp:933
+msgid "Pause download."
 msgstr ""
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/TextClient.cpp:936
+msgid "Resume download."
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
-msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+#: src/TextClient.cpp:939
+msgid "Cancel download."
 msgstr ""
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/TextClient.cpp:942
+msgid "Set download priority."
 msgstr ""
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:185
-#, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
 msgstr ""
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
 msgstr ""
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
 msgstr ""
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
 msgstr ""
 
-#: src/ExternalConnector.cpp:243
-#, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
 msgstr ""
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
 msgstr ""
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
+#: src/TextClient.cpp:952
+msgid "Show download queue."
 msgstr ""
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
+#: src/TextClient.cpp:953
+msgid "Show log."
 msgstr ""
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
+#: src/TextClient.cpp:954
+msgid "Show servers list."
 msgstr ""
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
+#: src/TextClient.cpp:957
+msgid "Reset log."
 msgstr ""
 
-#: src/ExternalConnector.cpp:297
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Type '%s' to get more help.\n"
+msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/TextClient.cpp:965
 #, c-format
-msgid "This is %s %s %s\n"
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:364
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr ""
+
+#: src/ThreadTasks.cpp:363
 #, c-format
-msgid "This is %s %s\n"
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:395
-msgid ""
-"\n"
-"Creating client...\n"
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:418
+#: src/ThreadTasks.cpp:454
 #, c-format
-msgid ""
-"\n"
-"Ok, exiting %s...\n"
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:424
-msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr ""
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
 msgstr ""
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
 msgstr ""
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
+#: src/TransferWnd.cpp:341
+msgid "All others"
 msgstr ""
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
 msgstr ""
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
+#: src/TransferWnd.cpp:366
+msgid "Add category"
 msgstr ""
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
 msgstr ""
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
+#: src/UploadClient.cpp:240
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
 msgstr ""
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/ClientCreditsList.cpp:168
+#: src/UploadQueue.cpp:613
 #, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Suspending upload of file: %s"
+msgstr ""
 
-#: src/ClientCreditsList.cpp:171
+#: src/UserEvents.cpp:138
 #, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr ""
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
+#: src/UserEvents.h:60
+msgid "Download completed"
 msgstr ""
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
 msgstr ""
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
+#: src/UserEvents.h:84
+msgid "New chat session started"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
+#: src/UserEvents.h:87
+msgid "Message sender."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
+#: src/UserEvents.h:92
+msgid "Out of space"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
+#: src/UserEvents.h:95
+msgid "Disk partition."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
+#: src/UserEvents.h:100
+msgid "Error on completion"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:699
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "QR: %u"
+msgid "%s ---> Non existant file !\n"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:368
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Download speed: %.1f"
+msgid "Done in %.2f s"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Upload speed: %.1f"
+msgid "Unable to open %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
+#: src/utils/wxCas/src/onlinesig.cpp:234
 #, c-format
-msgid "Nickname: %s"
+msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:416
+#: src/utils/wxCas/src/onlinesig.cpp:342
 #, c-format
-msgid "IP: %s"
+msgid "%.2f KB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:425
+#: src/utils/wxCas/src/onlinesig.cpp:345
 #, c-format
-msgid "TCP port: %d"
+msgid "%.2f MB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:436
+#: src/utils/wxCas/src/onlinesig.cpp:351
 #, c-format
-msgid "UDP port: %d"
+msgid "%.2f TB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:483
-#, c-format
-msgid "Total UL: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/ChatSelector.cpp:127
-#, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
 msgstr ""
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
 msgstr ""
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
 msgstr ""
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/ServerList.cpp:84
-#, c-format
-msgid "Loading server.met file: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
 msgstr ""
 
-#: src/ServerList.cpp:89
-msgid "Server.met file not found!"
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
 msgstr ""
 
-#: src/ServerList.cpp:97
-#, c-format
-msgid "Failed to load server.met file '%s', unknown format encountered."
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
 msgstr ""
 
-#: src/ServerList.cpp:103
-msgid "Failed to open server.met!"
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/ServerList.cpp:114
-#, c-format
-msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
 msgstr ""
 
-#: src/ServerList.cpp:169
-#, c-format
-msgid "%i server in server.met found"
-msgid_plural "%i servers in server.met found"
-msgstr[0] ""
-msgstr[1] ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr ""
 
-#: src/ServerList.cpp:171
-#, c-format
-msgid "%d server added"
-msgid_plural "%d servers added"
-msgstr[0] ""
-msgstr[1] ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr ""
 
-#: src/ServerList.cpp:192
-#, c-format
-msgid "Server not added: [%s:%d] does not specify a valid port."
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
 msgstr ""
 
-#: src/ServerList.cpp:208
-#, c-format
-msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
 msgstr ""
 
-#: src/ServerList.cpp:228
-#, c-format
-msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/ServerList.cpp:247
-#, c-format
-msgid "Server added: Server at [%s:%d] using the name '%s'."
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
 msgstr ""
 
-#: src/ServerList.cpp:342
-msgid ""
-"You are connected to the server you are trying to delete. please disconnect "
-"first."
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
 msgstr ""
 
-#: src/ServerList.cpp:629
-msgid "Failed to save server.met!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
 msgstr ""
 
-#: src/ServerList.cpp:782
-msgid "Invalid URL"
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
 msgstr ""
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
 msgstr ""
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
 msgstr ""
 
-#: src/ServerList.cpp:818
-msgid ""
-"No server list address entry in 'addresses.dat' found. Please paste a valid "
-"server list address into this file in order to auto-update your server list"
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
 msgstr ""
 
-#: src/ServerList.cpp:831
-#, c-format
-msgid "Start downloading server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
 msgstr ""
 
-#: src/ServerList.cpp:840
-#, c-format
-msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
 msgstr ""
 
-#: src/ServerList.cpp:844
-msgid "No valid server.met auto-download url on addresses.dat"
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
 msgstr ""
 
-#: src/ServerList.cpp:937
-msgid ""
-"Local server is filtered by the IPFilters, reconnecting to a different "
-"server!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
 msgstr ""
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
 msgstr ""
 
-#: src/amule.cpp:703
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
 msgstr ""
 
-#: src/amule.cpp:787
-msgid "Server list download"
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
 msgstr ""
 
-#: src/amule.cpp:846
-#, c-format
-msgid "web server running on pid %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/amule.cpp:850
-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"
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
 msgstr ""
 
-#: src/amule.cpp:937
-#, c-format
-msgid "Could not bind ports to the specified address: %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/amule.cpp:964
-#, c-format
-msgid "Port %u is not available. You will be LOWID\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/amule.cpp:970
-#, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
 msgstr ""
 
-#: src/amule.cpp:1308
-#, c-format
-msgid "This is the first time you run aMule %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
 msgstr ""
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
 msgstr ""
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/amule.cpp:1316
-msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
 msgstr ""
 
-#: src/amule.cpp:1317
-msgid ""
-"\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1318
-msgid ""
-"\n"
-"* Disabled updating the server list from other server and clients.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1319
-msgid ""
-"\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/amule.cpp:1320
-msgid ""
-"\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
 msgstr ""
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
 msgstr ""
 
-#: src/amule.cpp:1341
-msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
 msgstr ""
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
 msgstr ""
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
 msgstr ""
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
 msgstr ""
 
-#: src/amule.cpp:1826
-#, c-format
-msgid "ServerMessage: %s"
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
 msgstr ""
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
 msgstr ""
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
 msgstr ""
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/amule.cpp:1907
-#, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/amule.cpp:1911
-#, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
 msgstr ""
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/amule.cpp:2025
+#: src/webserver/src/WebServer.cpp:370
 #, c-format
-msgid "Users: %s | Files: %s"
+msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/amule.cpp:2026
-#, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
 msgstr ""
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/amule.cpp:2102
-#, c-format
-msgid "Connected to %s %s"
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/amule.cpp:2105
-#, c-format
-msgid "Connecting to %s"
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/amule.cpp:2114
-msgid "Kad started."
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
 msgstr ""
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
 msgstr ""
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
 msgstr ""
 
-#: src/amule.cpp:2191
-msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
 msgstr ""
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
 msgstr ""
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
 msgstr ""

aMule-2.2.6.tar.bz2/po/ar.po -> aMule-2.3.1.tar.bz2/po/ar.po Changed

@@ -1,5 +1,5 @@
 # Translation of amule interface to arabic
-# Copyright (C) YEAR aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the PACKAGE package.
 #  saleh alhathal <hathalsal@hotmail.com>, 2004.
 #
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
 "PO-Revision-Date: 2004-03-28 22:15+0300\n"
 "Last-Translator: saleh alhathal <hathalsal@hotmail.com>\n"
 "Language-Team: \n"
@@ -15,1264 +15,1078 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr ""
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "أضف صديق"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr ""
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "يجب ان تضيف عنوان شبكي ومنفذ صحيحان!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "اكتمال"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "اكتمل"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "ايقاف مؤقت"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "خاطئ"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "تحميل"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "انتظار"
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "فشل لفتح %s (%s)"
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
 
-#: src/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/ThreadTasks.cpp:141
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create AICH hash for file: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/ThreadTasks.cpp:350
+#: src/amule.cpp:261
 #, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr ""
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "فشل"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr ""
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "تاكيد الخروج"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "غير معرف"
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "قبل إتصال خارجي جديد\n"
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
 msgstr ""
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
 msgstr ""
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr ""
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "معلومات"
 
-#: src/BaseClient.cpp:1790
-#, c-format
-msgid "1.x (based on eMule v0.%u)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
+#: src/amule.cpp:581
+msgid "Server list download"
 msgstr ""
 
-#: src/BaseClient.cpp:1962
-#, fuzzy, c-format
-msgid "Requested: %s\n"
-msgstr "طلب:"
-
-#: src/BaseClient.cpp:1964
-#, fuzzy, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] "إحصائية الملفات لهذة الجلسة: قبل %d من %d طلب , %s تم نقله \n"
-msgstr[1] "إحصائية الملفات لهذة الجلسة: قبل %d من %d طلب , %s تم نقله \n"
-
-#: src/BaseClient.cpp:1967
-#, fuzzy, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] "إحصائية الملفات لهذة الجلسة: قبل %d من %d طلب , %s تم نقله \n"
-msgstr[1] "إحصائية الملفات لهذة الجلسة: قبل %d من %d طلب , %s تم نقله \n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "طلب ملف غير معروف"
-
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:654
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr ""
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "اسم مستخدم"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "اصدقاء"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "عرض &تفاصيل"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "اضف صديق"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "احذف صديق"
-
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "ارسل &رسالة"
-
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "اعرض الملفات"
-
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
+msgid "web server running on pid %d"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:273
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
-
-#: src/FriendListCtrl.cpp:275
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
-
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "إلغاء"
-
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:658
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
-msgstr ""
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
+"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/UserEvents.h:60
-msgid "Download completed"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
+#: src/amule.cpp:741
+#, c-format
+msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
+#: src/amule.cpp:768
+#, c-format
+msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
+#: src/amule.cpp:774
+#, c-format
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
 msgstr ""
 
-#: src/UserEvents.h:87
-msgid "Message sender."
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/UserEvents.h:92
-msgid "Out of space"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr ""
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr "ﻻ نضمن انه خالي من اﻻخطاء, قد يتسبب باعطال\n"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "اسم الملف"
-
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "حجم"
-
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "نوع"
-
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "أولوية"
-
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "تعريف ملف"
-
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "طلبات"
-
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "طلبات مقبوله"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "بينات محوله"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "أجزاء مكتسبة"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "ملفات مشاركة"
-
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "متدني جدا"
-
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "متدني"
-
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "عادي"
-
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "مرتفع"
-
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "عالي جدا"
-
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "ذاتي"
-
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr ""
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "إسم الخادم"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "اعد تسمية"
-
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
+#: src/amule.cpp:1613
 #, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "يجب ان تكون ذا هوية مرتفعة لتتمكن من انشاء رابط مصدر"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:451
+#: src/amule.cpp:1616
 #, c-format
-msgid "Shared Files (%i)"
-msgstr "ملفات مشاركة (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/UploadQueue.cpp:511
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
 #, c-format
-msgid "Resuming uploads of file: %s"
+msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:520
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
 #, c-format
-msgid "Suspending upload of file: %s"
-msgstr ""
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr ""
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:374
+#: src/amule.cpp:1867
 #, c-format
-msgid "Request failed with the following error: %s."
+msgid "Connected to %s %s"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
+#: src/amule.cpp:1879
+msgid "Kad started."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
 msgstr ""
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
 msgstr ""
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
 msgstr ""
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "تحميل ..."
-
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
 msgstr ""
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "اعدادت"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "يتم الإتصال"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "تصفح"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr ""
+#: src/amuleDlg.cpp:719
+#, fuzzy
+msgid "Kad: Connected"
+msgstr "متصل"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr ""
+#: src/amuleDlg.cpp:724
+#, fuzzy
+msgid "Kad: Connecting"
+msgstr "يتم الإتصال"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr ""
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "إلغاء"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr ""
+#: src/amuleDlg.cpp:775
+#, fuzzy
+msgid "Stop the current connection attempts"
+msgstr "إيقاف محاولة اﻹتصال الحاليه"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr ""
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "فصل"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
+#: src/amuleDlg.cpp:781
+#, fuzzy
+msgid "Disconnect from the currently connected networks"
+msgstr "فصل من المستضيف الحالي"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr ""
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "إتصال"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr ""
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "تحميل: %.1f(%.1f) | رفع: %.1f(%.1f)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr ""
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "رفع : %.1f |تحميل : %.1f"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr ""
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "هل تريد حقا الخروج من البرنامج؟"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr ""
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "تاكيد الخروج"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
-#, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "معاد"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr ""
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "بحث"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr ""
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "نافذة البحث"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr ""
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "تحميل"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr ""
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "تحميل"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr ""
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "نافذة ملفات المشاركة"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr ""
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "رسائل"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr ""
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "نافذة الرسائل"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr ""
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "احصائات"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr ""
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "نافذة اﻻحصائيات"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr ""
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "اعدادت"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "نافذة اﻹعدادات"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
+#: src/amuleDlg.cpp:1489
+msgid "No network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr ""
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "خطأ قاتل :فشل في تكوين الموَقت"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr ""
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "خطأ قاتل :فشل في تكوين الموَقت"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr ""
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "يتم الإتصال"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr ""
+#: src/amule-remote-gui.cpp:316
+#, fuzzy
+msgid "Going down"
+msgstr "تسجيل الدخول اﻻن"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr ""
+#: src/amule-remote-gui.cpp:407
+#, fuzzy
+msgid "Ready"
+msgstr "اعد تحميل"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr ""
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "غير معرف"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr ""
+#: src/BaseClient.cpp:1590
+#, fuzzy
+msgid "Searching buddy for lowid connection"
+msgstr "بانتظار اﻻتصال ..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/BaseClient.cpp:2027
 #, c-format
-msgid "%.2f kB/s"
+msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr ""
+#: src/BaseClient.cpp:2029
+#, fuzzy, c-format
+msgid "Requested: %s\n"
+msgstr "طلب:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr ""
+#: src/BaseClient.cpp:2031
+#, fuzzy, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] "إحصائية الملفات لهذة الجلسة: قبل %d من %d طلب , %s تم نقله \n"
+msgstr[1] "إحصائية الملفات لهذة الجلسة: قبل %d من %d طلب , %s تم نقله \n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr ""
+#: src/BaseClient.cpp:2034
+#, fuzzy, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] "إحصائية الملفات لهذة الجلسة: قبل %d من %d طلب , %s تم نقله \n"
+msgstr[1] "إحصائية الملفات لهذة الجلسة: قبل %d من %d طلب , %s تم نقله \n"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "طلب ملف غير معروف"
+
+#: src/BaseClient.cpp:2700
 #, c-format
-msgid "%02uD %02uh %02umin %02us"
+msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/BaseClient.cpp:2807
 #, c-format
-msgid "%02uh %02umin %02us"
+msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
+#: src/BaseClient.cpp:2899
 #, c-format
-msgid "%02umin %02us"
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
 #, c-format
-msgid "%02us"
+msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "هوية متدنية"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "فشل غير متوقع اثناء كتابة ملف %s : %s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "غير متصل"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "خطأ أثناء اﻹتصال بي%s (%s:%i): %d"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr ""
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "صنف"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
+#: src/CatDialog.cpp:87
+msgid "New Category"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
-#, c-format
-msgid "%.2f GB"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "اختر مكان الملفات القادمة"
+
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-#, fuzzy
-msgid "Cancelled !"
-msgstr "إلغاء"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ChatSelector.cpp:129
 #, c-format
-msgid "Unable to open %s"
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/ChatSelector.cpp:336
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "اضف"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "واضح"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr ""
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "اضف لي صديق"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr ""
+#: src/ClientCreditsList.cpp:158
+#, fuzzy, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "حمل ملف الرصيد, تم التعرف على %u عميل"
+msgstr[1] "حمل ملف الرصيد, تم التعرف على %u عميل"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "ابدء"
+#: src/ClientCreditsList.cpp:161
+#, fuzzy, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] "الرصيد منتهى!"
+msgstr[1] "الرصيد منتهى!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr ""
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "تفاصيل العميل"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "خروج"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "هوية متدنية"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr ""
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "متصل"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr ""
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "فصل الإتصال"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr ""
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "غير مكتمل"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-#, fuzzy
-msgid "Can't open the clipboard"
-msgstr "نسخ رابط ED2k للحافظة"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "شخص سيئ"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr ""
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "تأكيد - صحيح"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr ""
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "غير متوفر"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
+#: src/ClientTCPSocket.cpp:928
+#, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
+#: src/ClientTCPSocket.cpp:933
+#, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/ClientTCPSocket.cpp:982
 #, c-format
-msgid "Done in %.2f s"
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/ClientTCPSocket.cpp:1006
 #, c-format
-msgid "Processing file number %u: %s"
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr ""
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "ملف تعليقات"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
-#, c-format
-msgid "%s ---> Non existant file !\n"
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "اسم مستخدم"
+
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "اسم الملف"
+
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "تقيم"
+
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "ﻻ تعليق "
+
+#: src/CommentDialogLst.cpp:105
+#, fuzzy, c-format
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "ﻻ تعليق "
+msgstr[1] "ﻻ تعليق "
+
+#: src/CorruptionBlackBox.cpp:227
+#, c-format
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
 #: src/DataToText.cpp:37
@@ -1287,31 +1101,57 @@
 msgid "Auto [Hi]"
 msgstr "ذاتي عالي"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "يتم الإتصال"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "متدني جدا"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "متدني"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "عادي"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "مرتفع"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "عالي جدا"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr ""
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "اطلب"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "اتصال من خلال خادم"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "اﻻنتظار ممتلئ"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "في اﻻنتظار"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "نقل"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "تحميل"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1337,8 +1177,7 @@
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "حظر"
 
@@ -1370,8 +1209,8 @@
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr ""
 
@@ -1392,12 +1231,11 @@
 msgstr ""
 
 #: src/DataToText.cpp:135
-#, fuzzy
 msgid "Search Result"
-msgstr "نتيجت البحث"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "اكمل"
 
@@ -1421,7 +1259,7 @@
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr ""
 
@@ -1433,5518 +1271,6119 @@
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "اﻹفتراضية بالنظام"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
 
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "العربيه"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "حجم"
 
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "الأستونيه"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "نقل"
 
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr ""
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "سرعة"
 
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "البلغاريه"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "تقدم"
 
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr ""
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "مصدر"
 
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "أولوية"
 
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "حالة"
 
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "الوقت المتبقي"
 
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr ""
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "اخر اكتمال"
 
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "الدانماركيه"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "اخر إستقبال"
 
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "الهولنديه"
+#: src/DownloadListCtrl.cpp:411
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
 
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
+#: src/DownloadListCtrl.cpp:413
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
+
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
 
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "الأستونيه"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "ذاتي"
 
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "الفلنديه"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "%إيقاف"
 
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "الفرنسية"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&إيقاف مؤقت"
 
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr ""
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "%إكمل"
 
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "الألمانيه"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "إ&نتهاء التنظيف"
 
-#: src/Preferences.cpp:647
-msgid "Greek"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/Preferences.cpp:648
-msgid "Hebrew"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "الهنغاريه"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "الايطاليه"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr ""
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "خيرات اضافية"
 
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "الكوريه"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "مشاهدة"
 
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "الليتوانيه"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "اعرض الملف &تفاصيل"
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "اعرض كل التعليقات"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "البرتغاليه"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr ""
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "الروسيه"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr ""
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
 msgstr ""
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "الإسبانيه"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&فتح الملف"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
 msgstr ""
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
 msgstr ""
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
 msgstr ""
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr ""
+#: src/DownloadListCtrl.cpp:1268
+#, c-format
+msgid "Downloads (%i)"
+msgstr "تحميل (%i)"
 
-#: src/Preferences.cpp:1680
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
 
-#: src/Preferences.cpp:1681
-#, c-format
-msgid "Default port will be used (%d)"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "إسم الخادم"
+#: src/DownloadListCtrl.cpp:1461
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "منفذ"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "وصف"
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "طلب ملف مشاركة من '%s'"
 
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
+#: src/DownloadQueue.cpp:132
+#, c-format
+msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "مستخدمين"
+#: src/DownloadQueue.cpp:154
+msgid ""
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "ملفات"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "فشل"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "ﻻ وجود ﻻجزاء الملفات"
 
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "ثابت"
+#: src/DownloadQueue.cpp:168
+#, fuzzy, c-format
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "وجد %i جزء ملفات"
+msgstr[1] "وجد %i جزء ملفات"
 
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "نسخة"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:144
-msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "معلومات"
+#: src/DownloadQueue.cpp:374
+#, c-format
+msgid "Downloading %s"
+msgstr "تحميل %s"
 
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
+#: src/DownloadQueue.cpp:382
+#, c-format
+msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:149
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Are you sure you want to delete the static server %s"
+msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "نعم"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "ﻻ"
+#: src/DownloadQueue.cpp:399
+#, c-format
+msgid "You are already trying to download the file %s"
+msgstr "قمت بمحاولت تحميل الملف مسبقا %s"
 
-#: src/ServerListCtrl.cpp:346
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Failed to open '%s'"
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:369
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Servers (%i)"
-msgstr "خادمات (%i)"
-
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "خادم"
+msgid "Unknown protocol of link: %s"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
+#: src/DownloadQueue.cpp:1430
+#, c-format
+msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
+#: src/ExternalConn.cpp:278
+msgid "External connection closed."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
+#: src/ExternalConn.cpp:317
+msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
+#: src/ExternalConn.cpp:340
+msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "الغاء الخادم"
+#: src/ExternalConn.cpp:400
+msgid "New external connection accepted"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:440
-#, fuzzy
-msgid "Remove servers"
-msgstr "الغاء الخادم"
+#: src/ExternalConn.cpp:403
+msgid "ERROR: couldn't accept a new external connection"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "الغاء كل الخادمات"
+#: src/ExternalConn.cpp:421
+msgid "External connection refused due to empty password in preferences!"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
+#: src/ExternalConn.cpp:430
+#, c-format
+msgid "Connecting client: %s %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
+#: src/ExternalConn.cpp:432
+msgid "Unknown version"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
+#: src/ExternalConn.cpp:442
+msgid ""
+"Incorrect EC version ID, there might be binary incompatibility. Use core and "
+"remote from same snapshot."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
+#: src/ExternalConn.cpp:447
+msgid ""
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:570
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
+#: src/ExternalConn.cpp:475
+msgid "Invalid protocol version."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:572
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
+#: src/ExternalConn.cpp:480
+msgid "Missing protocol version tag."
+msgstr ""
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "تعطيل [%s]"
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/amuleDlg.cpp:212
-#, c-format
-msgid "Running on %s"
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
+#: src/ExternalConn.cpp:521
+msgid "Access granted."
 msgstr ""
 
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/ExternalConn.cpp:799
+#, c-format
+msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
+#: src/ExternalConn.cpp:801
+#, c-format
+msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
+msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
+#: src/ExternalConn.cpp:876
+msgid "Server not added"
 msgstr ""
 
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
+#: src/ExternalConn.cpp:894
+#, c-format
+msgid "server not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:469
-msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+#: src/ExternalConn.cpp:910
+msgid "need to define server to be removed"
 msgstr ""
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
+#: src/ExternalConn.cpp:924
+msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/ExternalConn.cpp:1102
+msgid "Search in progress. Refetch results in a moment!"
+msgstr "جاري البحث ستم جلب النتيجة في لحظة"
+
+#: src/ExternalConn.cpp:1108
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#: src/ExternalConn.cpp:1306
+msgid "No points for graph."
 msgstr ""
 
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
+#: src/ExternalConn.cpp:1315
+msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
+#: src/ExternalConn.cpp:1342
+msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
+#: src/ExternalConn.cpp:1354
+msgid "Already shutting down."
 msgstr ""
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
+#: src/ExternalConn.cpp:1366
+#, c-format
+msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
+#: src/ExternalConn.cpp:1372
+msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/amuleDlg.cpp:696
-#, fuzzy
-msgid "Kad: Connected"
-msgstr "متصل"
+#: src/ExternalConn.cpp:1442
+msgid "File not found."
+msgstr ""
 
-#: src/amuleDlg.cpp:701
-#, fuzzy
-msgid "Kad: Connecting"
-msgstr "يتم الإتصال"
+#: src/ExternalConn.cpp:1447
+msgid "Invalid file name."
+msgstr ""
 
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
+#: src/ExternalConn.cpp:1455
+msgid "Unable to rename file."
 msgstr ""
 
-#: src/amuleDlg.cpp:752
-#, fuzzy
-msgid "Stop the current connection attempts"
-msgstr "إيقاف محاولة اﻹتصال الحاليه"
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr ""
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "فصل"
+#: src/ExternalConn.cpp:1790
+msgid "Already connected to eD2k."
+msgstr ""
 
-#: src/amuleDlg.cpp:758
-#, fuzzy
-msgid "Disconnect from the currently connected networks"
-msgstr "فصل من المستضيف الحالي"
+#: src/ExternalConn.cpp:1793
+msgid "Connecting to eD2k..."
+msgstr ""
 
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "إتصال"
+#: src/ExternalConn.cpp:1801
+msgid "Already connected to Kad."
+msgstr ""
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
+#: src/ExternalConn.cpp:1804
+msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "تحميل: %.1f(%.1f) | رفع: %.1f(%.1f)"
+#: src/ExternalConn.cpp:1811
+msgid "All networks are disabled."
+msgstr ""
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "رفع : %.1f |تحميل : %.1f"
+#: src/ExternalConn.cpp:1819
+msgid "Disconnected from eD2k."
+msgstr ""
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
+#: src/ExternalConn.cpp:1823
+msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/amuleDlg.cpp:836
+#: src/ExternalConn.cpp:1832
 #, c-format
-msgid "aMule (%s | Disconnected)"
+msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "هل تريد حقا الخروج من البرنامج؟"
-
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "تاكيد الخروج"
+#: src/ExternalConn.cpp:1835
+msgid "Invalid opcode (wrong protocol version?)"
+msgstr ""
 
-#: src/amuleDlg.cpp:1182
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Skin directory '%s' does not exist"
+msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1187
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
+msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "بحث"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "نقل"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
+#: src/ExternalConnector.cpp:186
+#, c-format
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "رسائل"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr ""
 
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
 msgstr ""
 
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "احصائات"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
 
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
+#: src/ExternalConnector.cpp:248
+#, c-format
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
 msgstr ""
 
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
 msgstr ""
 
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
 msgstr ""
 
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
 msgstr ""
 
-#: src/amuleDlg.cpp:1468
-msgid "No network"
+#: src/ExternalConnector.cpp:302
+#, c-format
+msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "عام"
+#: src/ExternalConnector.cpp:357
+#, c-format
+msgid "This is %s %s %s\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "اتصال"
+#: src/ExternalConnector.cpp:359
+#, c-format
+msgid "This is %s %s\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "مجلدات"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "الخادمات"
+#: src/ExternalConnector.cpp:414
+#, c-format
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:177
-#, fuzzy
-msgid "Filters"
-msgstr "ملفات"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "تحكم عن بعد"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+#: src/FileDetailDialog.cpp:113
+#, c-format
+msgid "%.1f%% done"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "رفع :0.0 | تحميل : 0.0"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "اصدقاء"
 
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "عرض &تفاصيل"
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "اضف صديق"
 
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "احذف صديق"
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
-msgstr ""
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "ارسل &رسالة"
 
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "اعرض الملفات"
+
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
+#: src/FriendListCtrl.cpp:169
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
+
+#: src/FriendListCtrl.cpp:171
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
+#: src/GenericClientListCtrl.cpp:547
+msgid "Send message to user"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
+#: src/GenericClientListCtrl.cpp:548
+msgid "Message to send:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
+#: src/GenericClientListCtrl.cpp:587
+msgid "Remove from friends"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:950
-#, c-format
-msgid "Executable%s"
+#: src/GenericClientListCtrl.cpp:598
+msgid "Send message"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
+#: src/GenericClientListCtrl.cpp:600
+msgid "Swap to this file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/GenericClientListCtrl.cpp:943
+msgid "A4AF"
 msgstr ""
-"أضف هنا عنوان لتحميل ملفات server.met \n"
-"عنوان واحد فقط لكل سطر"
 
-#: src/PrefsUnifiedDlg.cpp:1031
+#: src/GenericClientListCtrl.cpp:995
 #, fuzzy, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "تحيدث كل:5 ثواني"
-msgstr[1] "تحيدث كل:5 ثواني"
+msgid "On Queue: %u (%i)"
+msgstr "في اﻻنتظار"
 
-#: src/PrefsUnifiedDlg.cpp:1038
-#, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
+msgid "Asked for another file"
+msgstr "طلب ملف اخر"
 
-#: src/PrefsUnifiedDlg.cpp:1044
-#, c-format
-msgid "Connections Graph Scale: %d"
-msgstr ""
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "تحميل ينتظر: %i"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/GenericClientListCtrl.cpp:1026
 #, fuzzy, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "تحيدث كل:5 ثواني"
-msgstr[1] "تحيدث كل:5 ثواني"
+msgid "On Queue: %u"
+msgstr "في اﻻنتظار"
 
-#: src/PrefsUnifiedDlg.cpp:1056
-#, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] ""
-msgstr[1] ""
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "الرفع"
 
-#: src/PrefsUnifiedDlg.cpp:1062
-#, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] ""
-msgstr[1] ""
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "ﻻ احد"
 
-#: src/PrefsUnifiedDlg.cpp:1069
-#, fuzzy, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "فترة تحديث الإتصال بالخادم %i دقيقة"
-msgstr[1] "فترة تحديث الإتصال بالخادم %i دقيقة"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "ﻻ"
 
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "فترة تحديث الإتصال بالخادم :معطل"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "نعم"
 
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr ""
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "تحميل ..."
 
-#: src/PrefsUnifiedDlg.cpp:1118
+#: src/HTTPDownload.cpp:109
 #, fuzzy
-msgid "disabled"
-msgstr "تعطيل"
+msgid "HTTP download cancelled"
+msgstr "سعة نطاق التحميل الحقيقية"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
+msgid "Unable to create destination file %s for download!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
+#: src/HTTPDownload.cpp:233
+#, c-format
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr ""
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
+msgstr "مجموع التحميل"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
+#: src/HTTPDownload.cpp:279
+#, c-format
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
 
-#: src/ExternalConn.cpp:116
-msgid "External connection closed."
+#: src/HTTPDownload.cpp:336
+msgid ""
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
 
-#: src/ExternalConn.cpp:143
-msgid "External connections disabled due to empty password!"
-msgstr ""
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "أنت غير متصل بي مستظيف!"
 
-#: src/ExternalConn.cpp:168
-msgid "External connections disabled in config file"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
 
-#: src/ExternalConn.cpp:217
-msgid "New external connection accepted"
+#: src/IP2Country.cpp:100
+#, c-format
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:220
-msgid "ERROR: couldn't accept a new external connection"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:239
-msgid "External connection refused due to empty password in preferences!"
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
+#, c-format
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:249
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Connecting client: %s %s"
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:251
-msgid "Unknown version"
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
+#, c-format
+msgid "Successfully updated %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:262
-msgid ""
-"Incorrect EC version ID, there might be binary incompatibility. Use core and "
-"remote from same snapshot."
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
 
-#: src/ExternalConn.cpp:267
-msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
-msgstr ""
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "فشل في تحميل قائمة الخادمات من %s"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr ""
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "فشل في تحميل النموذج %s\n"
 
-#: src/ExternalConn.cpp:292
-msgid "Invalid protocol version."
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/ExternalConn.cpp:296
-msgid "Missing protocol version tag."
+#: src/IPFilter.cpp:299
+#, c-format
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/IPFilter.cpp:325
+#, c-format
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/ExternalConn.cpp:306
-msgid "Access granted."
-msgstr ""
+#: src/IPFilter.cpp:329
+#, c-format
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:564
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Remote PartFile command failed: FileHash not found: %s"
-msgstr ""
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:566
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "FileHash not found: %s"
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
-msgid "OOPS! OpCode processing error!"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
 
-#: src/ExternalConn.cpp:659
-msgid "Server not added"
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
 msgstr ""
 
-#: src/ExternalConn.cpp:677
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "server not found: %s"
-msgstr ""
-
-#: src/ExternalConn.cpp:693
-msgid "need to define server to be removed"
+msgid "Nodes (%u)"
 msgstr ""
 
-#: src/ExternalConn.cpp:707
-msgid "eD2k is disabled in preferences."
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/ExternalConn.cpp:803
-msgid "Search in progress. Refetch results in a moment!"
-msgstr "جاري البحث ستم جلب النتيجة في لحظة"
-
-#: src/ExternalConn.cpp:808
-msgid "WebSearch from remote interface makes no sense."
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
 msgstr ""
 
-#: src/ExternalConn.cpp:1020
-msgid "No points for graph."
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/ExternalConn.cpp:1029
-msgid "Your client is not configured for this detail level."
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/ExternalConn.cpp:1057
-msgid "External Connection: shutdown requested"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
 msgstr ""
 
-#: src/ExternalConn.cpp:1069
-msgid "Already shutting down."
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
 msgstr ""
 
-#: src/ExternalConn.cpp:1077
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "ExternalConn: adding link '%s'."
+msgid "Keyword for search: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1083
-msgid "Invalid link or already on list."
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1168
-msgid "File not found."
+#: src/kademlia/routing/RoutingZone.cpp:172
+msgid ""
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
 
-#: src/ExternalConn.cpp:1173
-msgid "Invalid file name."
-msgstr ""
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
+#, c-format
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:1181
-msgid "Unable to rename file."
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/ExternalConn.cpp:1405
-msgid "Already connected to eD2k."
-msgstr ""
+#: src/kademlia/routing/RoutingZone.cpp:307
+#, c-format
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:1408
-msgid "Connecting to eD2k..."
+#: src/kademlia/routing/RoutingZone.cpp:338
+#, c-format
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
 msgstr ""
 
-#: src/ExternalConn.cpp:1416
-msgid "Already connected to Kad."
+#: src/KnownFile.cpp:1545
+msgid "File size"
 msgstr ""
 
-#: src/ExternalConn.cpp:1419
-msgid "Connecting to Kad..."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
 msgstr ""
 
-#: src/ExternalConn.cpp:1424
-msgid "All networks are disabled."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
 msgstr ""
 
-#: src/ExternalConn.cpp:1432
-msgid "Disconnected from eD2k."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1436
-msgid "Disconnected from Kad."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:1444
-#, c-format
-msgid "External Connection: invalid opcode received: %#x"
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
 msgstr ""
 
-#: src/ExternalConn.cpp:1447
-msgid "Invalid opcode (wrong protocol version?)"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/TerminationProcess.cpp:48
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "غير معروف :%i"
+
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
 #, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
+msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
 msgstr ""
 
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "اكتمال"
 
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "اكتمل"
 
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "متصل"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "ايقاف مؤقت"
 
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "عنوان شبكي :منفذ"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "خاطئ"
 
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "هوية"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "انتظار"
 
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/ServerWnd.cpp:208
-msgid "Running"
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
 msgstr ""
 
-#: src/ServerWnd.cpp:214
-msgid "Status:"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
 msgstr ""
 
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "فصل الإتصال"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "موافق"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr ""
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "عوامل اﻻتصال الخارجي"
 
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "فترة التشغيل: %s"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr ""
 
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "نقل"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr ""
 
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "ارفع"
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "اغلق"
 
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
 msgstr ""
 
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
 msgstr ""
 
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
 msgstr ""
 
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr ""
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "واضح"
 
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
 msgstr ""
 
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
 msgstr ""
 
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr ""
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "بلا حدود"
 
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
 msgstr ""
 
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
 msgstr ""
 
-#: src/Statistics.cpp:665
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Total failed upload sessions: %s"
+msgid "UL: %u"
 msgstr ""
 
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "متوسط زمن التحميل : %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "تحميل"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
 msgstr ""
 
-#: src/Statistics.cpp:683
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "Found Sources: %s"
+msgid "DL: %u"
 msgstr ""
 
-#: src/Statistics.cpp:684
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "Active Downloads (chunks): %s"
+msgid "Download speed: %.1f"
 msgstr ""
 
-#: src/Statistics.cpp:686
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "Session UL:DL Ratio (Total): %s"
+msgid "Upload speed: %.1f"
 msgstr ""
 
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
 msgstr ""
 
-#: src/Statistics.cpp:690
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Average upload rate (Session): %s"
+msgid "Nickname: %s"
 msgstr ""
 
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "هوية العميل: "
+
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
 msgstr ""
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "اعادة اﻹتصال : %i"
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "إسم الخادم: "
 
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "الوقت منذ بدء التحميل: %s"
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "عنوان الخادم: "
 
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "متصل بالخادم منذ : %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "غير متصل"
 
-#: src/Statistics.cpp:696
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Active Connections (estimate): %i"
+msgid "IP: %s"
 msgstr ""
 
-#: src/Statistics.cpp:697
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Max Connection Limit Reached: %s"
+msgid "TCP port: %d"
 msgstr ""
 
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/Statistics.cpp:700
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Peak Connections (estimate): %i"
+msgid "UDP port: %d"
 msgstr ""
 
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "عميل"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr ""
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "توقيع أثناء الإتصال: ممكن"
+
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "توقيع أثناء الإتصال: معطل"
 
-#: src/Statistics.cpp:715
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Working Servers: %i"
-msgstr ""
+msgid "Uptime: %s"
+msgstr "فترة التشغيل: %s"
 
-#: src/Statistics.cpp:716
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Failed Servers: %i"
+msgid "Shared files: %d"
 msgstr ""
 
-#: src/Statistics.cpp:717
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "Total: %s"
+msgid "Queued clients: %d"
 msgstr ""
 
-#: src/Statistics.cpp:718
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Deleted Servers: %s"
+msgid "Total DL: %s"
 msgstr ""
 
-#: src/Statistics.cpp:719
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Filtered Servers: %s"
+msgid "Total UL: %s"
 msgstr ""
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
 msgstr ""
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
 msgstr ""
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
 msgstr ""
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
 msgstr ""
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "إحتلال الخادم: %.2f%%"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "خروج"
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
+#: src/muuli_wdr.cpp:75
+msgid "eD2k Link: "
 msgstr ""
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "مجموع حجم ملفات المشاركة : %s"
+#: src/muuli_wdr.cpp:82
+msgid "Commit"
+msgstr "ارتكب"
 
-#: src/Statistics.cpp:731
-#, c-format
-msgid "Average file size: %s"
+#: src/muuli_wdr.cpp:83
+msgid ""
+"Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/Statistics.cpp:872
-msgid "Operating System"
+#: src/muuli_wdr.cpp:91
+msgid ""
+"Events are displayed here. For a complete list of events, refer to the log "
+"in the Servers-tab."
 msgstr ""
 
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr ""
+#: src/muuli_wdr.cpp:94
+msgid "Loading ..."
+msgstr "تحميل ..."
 
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr ""
+#: src/muuli_wdr.cpp:102
+msgid "Number of users on the server you are connected to ..."
+msgstr "عدد المستخدمين على الخادم الذي تتصل به..."
 
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr ""
+#: src/muuli_wdr.cpp:105
+msgid "Users: 0"
+msgstr "مستخدمين: 0"
 
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
+#: src/muuli_wdr.cpp:106
+msgid ""
+"Users connected to the current server and an estimate of the total number of "
+"users."
 msgstr ""
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
+#: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "رفع :0.0 | تحميل : 0.0"
+
+#: src/muuli_wdr.cpp:118
+msgid ""
+"Current average upload and download rates. If enabled the numbers in the "
+"braces signify the overhead from client communication."
 msgstr ""
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/muuli_wdr.cpp:126
+msgid ""
+"Displays the connected status and active transfers. Red arrows signifies "
+"that you are currently not connected, yellow arrows signify that you have "
+"low ID (firewalled) and green arrows signify that you have high ID (The "
+"optimal connection type)."
 msgstr ""
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
+#: src/muuli_wdr.cpp:130
+msgid "Not Connected ..."
+msgstr "غير متصل"
+
+#: src/muuli_wdr.cpp:131
+msgid "Currently connected server."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
+#: src/muuli_wdr.cpp:177
+msgid "Search"
+msgstr "بحث"
+
+#: src/muuli_wdr.cpp:183
+msgid "Name:"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "نوع"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
+msgid "Local"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#: src/muuli_wdr.cpp:197
+msgid "Global"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+#: src/muuli_wdr.cpp:199
+msgid "FileHash"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+#: src/muuli_wdr.cpp:207
+msgid "Extended Parameters"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/muuli_wdr.cpp:213
+msgid "Filtering"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
+#: src/muuli_wdr.cpp:224
+msgid "File Type"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "اي"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "ارشيف"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "سمعي"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "صور"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "برامج"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "فيديو"
+
+#: src/muuli_wdr.cpp:254
+msgid "Extension"
+msgstr "إمتداد"
+
+#: src/muuli_wdr.cpp:260
+msgid "Min Size"
+msgstr "اقل حجم"
+
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+msgid "Bytes"
+msgstr "بايت"
+
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
+msgid "KB"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
+#: src/muuli_wdr.cpp:283
+msgid "Max Size"
+msgstr "اكبر حجم"
+
+#: src/muuli_wdr.cpp:306
+msgid "Availability"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/muuli_wdr.cpp:319
+msgid "Filter:"
 msgstr ""
 
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
+#: src/muuli_wdr.cpp:328
+msgid "Filter Results"
 msgstr ""
 
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
+#: src/muuli_wdr.cpp:334
+msgid "Invert Result"
 msgstr ""
 
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
+#: src/muuli_wdr.cpp:340
+msgid "Hide Known Files"
 msgstr ""
 
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "ابدء"
+
+#: src/muuli_wdr.cpp:356
+msgid "More"
 msgstr ""
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
+#: src/muuli_wdr.cpp:357
+msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+#: src/muuli_wdr.cpp:364
+msgid "Stop"
 msgstr ""
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "التحميل"
+
+#: src/muuli_wdr.cpp:378
+msgid "Reset Fields"
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
+#: src/muuli_wdr.cpp:393
+msgid "Results"
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
+#: src/muuli_wdr.cpp:422
+msgid "Clears completed downloads"
 msgstr ""
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "أضف صديق"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "ايجاد المصدر :"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "يجب ان تضيف عنوان شبكي ومنفذ صحيحان!"
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "عام"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
+#: src/muuli_wdr.cpp:525
+msgid "Full Name :"
+msgstr "اﻻسم كامل :"
+
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
+msgid "N/A"
+msgstr "غير متوفر"
+
+#: src/muuli_wdr.cpp:536
+msgid "met-File :"
 msgstr ""
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
+#: src/muuli_wdr.cpp:547
+msgid "Hash :"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "مصدر"
+#: src/muuli_wdr.cpp:562
+msgid "Filesize :"
+msgstr "حجم الملف :"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "ملف"
+#: src/muuli_wdr.cpp:573
+msgid "Partfilestatus :"
+msgstr "حالة جزء الملف :"
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "التحميل"
+#: src/muuli_wdr.cpp:584
+msgid "Last seen complete :"
+msgstr "اخر مرة تم اكتمال :"
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "صنف"
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "نقل"
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr ""
+#: src/muuli_wdr.cpp:606
+msgid "Found Sources :"
+msgstr "ايجاد المصدر :"
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr ""
+#: src/muuli_wdr.cpp:617
+msgid "Transferring Sources :"
+msgstr "نقل المصدر :"
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr ""
+#: src/muuli_wdr.cpp:628
+msgid "Filepart-Count :"
+msgstr "احصاء اجزاء الملف :"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
+#: src/muuli_wdr.cpp:639
+msgid "Available :"
+msgstr "متوفر :"
+
+#: src/muuli_wdr.cpp:650
+msgid "Datarate :"
+msgstr "نسبة المصادر :"
+
+#: src/muuli_wdr.cpp:661
+msgid "Download Active Time: "
 msgstr ""
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
+#: src/muuli_wdr.cpp:672
+msgid "Transferred :"
+msgstr "محول :"
+
+#: src/muuli_wdr.cpp:683
+msgid "Completed Size :"
+msgstr "حجم المكمل :"
+
+#: src/muuli_wdr.cpp:710
+msgid "Intelligent Corruption Handling"
+msgstr "معالجة الفاسد بذكاء"
+
+#: src/muuli_wdr.cpp:719
+msgid "Lost to corruption :"
+msgstr "فقد بسبب فساد :"
+
+#: src/muuli_wdr.cpp:730
+msgid "Gained by compression :"
+msgstr "أكتسب بواسطة الضغط :"
+
+#: src/muuli_wdr.cpp:741
+msgid "Packages saved by I.C.H. :"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
+#: src/muuli_wdr.cpp:754
+msgid "File Names"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
+#: src/muuli_wdr.cpp:763
+msgid "Takeover"
+msgstr "سيطر"
+
+#: src/muuli_wdr.cpp:773
+msgid "Cleanup"
+msgstr "نظف"
+
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
+msgid "Apply"
+msgstr "طبق"
+
+#: src/muuli_wdr.cpp:798
+msgid "Ok"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
+#: src/muuli_wdr.cpp:823
+msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
+#: src/muuli_wdr.cpp:829
 msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr ""
+#: src/muuli_wdr.cpp:841
+msgid "File Quality"
+msgstr "جودة الملف"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "غير مقيم"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "غير صحيح / معطوب / مزيف"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "فقير"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "عادل"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "جيد"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "ممتاز"
+
+#: src/muuli_wdr.cpp:854
+msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
+#: src/muuli_wdr.cpp:898
+msgid "Refresh"
+msgstr "انعش"
+
+#: src/muuli_wdr.cpp:925
+msgid "Downloading, please wait ..."
+msgstr "تحميل ,رجاء انتظر..."
+
+#: src/muuli_wdr.cpp:931
+msgid "Unknown size"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "نقل"
+#: src/muuli_wdr.cpp:955
+msgid "Required Information"
+msgstr "مطلوب معلومات"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "سرعة"
+#: src/muuli_wdr.cpp:960
+msgid "IP Address :"
+msgstr "عنوان IP :"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "تقدم"
+#: src/muuli_wdr.cpp:966
+msgid "Port :"
+msgstr "منفذ :"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "حالة"
+#: src/muuli_wdr.cpp:976
+msgid "Additional Information"
+msgstr "معلومت إضافية"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "الوقت المتبقي"
+#: src/muuli_wdr.cpp:981
+msgid "Username :"
+msgstr "اسم المستخدم :"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "اخر اكتمال"
+#: src/muuli_wdr.cpp:987
+msgid "Userhash :"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "اخر إستقبال"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "اضف"
 
-#: src/DownloadListCtrl.cpp:581
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
+#: src/muuli_wdr.cpp:1046
+msgid "Download-Speed"
+msgstr "سرعة-التحميل"
 
-#: src/DownloadListCtrl.cpp:583
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
+msgid "Current"
+msgstr "الحالي"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
-msgid "Send message to user"
-msgstr ""
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
+msgid "Running average"
+msgstr "معدل العمل"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
-msgid "Message to send:"
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
+msgid "Session average"
+msgstr "معدل الجلسة"
+
+#: src/muuli_wdr.cpp:1095
+msgid "Upload-Speed"
+msgstr "سرعة-الرفع"
+
+#: src/muuli_wdr.cpp:1144
+msgid "Connections"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "%إيقاف"
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
+msgid "Active downloads"
+msgstr "تحميل نشط"
 
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&إيقاف مؤقت"
+#: src/muuli_wdr.cpp:1173
+msgid "Active connections (1:1)"
+msgstr "إتصال نشط (1:1)"
 
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "%إكمل"
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
+msgid "Active uploads"
+msgstr "رفع نشط"
 
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "إ&نتهاء التنظيف"
+#: src/muuli_wdr.cpp:1193
+msgid "Statistics Tree"
+msgstr "شجرة اﻻحصائيات"
 
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
+#: src/muuli_wdr.cpp:1223
+msgid "Username:"
+msgstr "اسم المستخدم:"
+
+#: src/muuli_wdr.cpp:1226
+msgid "Userhash:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
+#: src/muuli_wdr.cpp:1249
+msgid "Client software:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
+#: src/muuli_wdr.cpp:1258
+msgid "Client version:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "خيرات اضافية"
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
+msgid "IP address:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "مشاهدة"
+#: src/muuli_wdr.cpp:1274
+msgid "User ID:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "اعرض الملف &تفاصيل"
+#: src/muuli_wdr.cpp:1281
+msgid "Server IP:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "اعرض كل التعليقات"
+#: src/muuli_wdr.cpp:1290
+msgid "Server name:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
+#: src/muuli_wdr.cpp:1297
+msgid "Obfuscation:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
+#: src/muuli_wdr.cpp:1306
+msgid "Kad:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
+#: src/muuli_wdr.cpp:1317
+msgid "Transfers to client"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&فتح الملف"
+#: src/muuli_wdr.cpp:1322
+msgid "Current request:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Remove from friends"
+#: src/muuli_wdr.cpp:1335
+msgid "Average upload rate:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "اضف لي صديق"
+#: src/muuli_wdr.cpp:1344
+msgid "Average download rate:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
-msgid "Send message"
+#: src/muuli_wdr.cpp:1351
+msgid "Uploaded (session):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1017
-msgid "Swap to this file"
+#: src/muuli_wdr.cpp:1360
+msgid "Downloaded (session):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
+#: src/muuli_wdr.cpp:1367
+msgid "Uploaded (total):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
+#: src/muuli_wdr.cpp:1376
+msgid "Downloaded (total):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1657
-msgid "A4AF"
+#: src/muuli_wdr.cpp:1387
+msgid "Scores"
+msgstr "مصدر"
+
+#: src/muuli_wdr.cpp:1394
+msgid "DL/UP modifier:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/muuli_wdr.cpp:1403
+msgid "Secure ident:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1721
-msgid "Asked for another file"
-msgstr "طلب ملف اخر"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "اﻻنتظار ممتلئ"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "تحميل (%i)"
+#: src/muuli_wdr.cpp:1419
+msgid "Queue score:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
+#: src/muuli_wdr.cpp:1448
+msgid "Nick"
+msgstr "مستعار"
+
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
+#: src/muuli_wdr.cpp:1452
+msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
 msgstr ""
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "خطأ: فشل في تكوين ملف اجزاء)"
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr ""
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
+#: src/muuli_wdr.cpp:1471
+msgid "Check for new version at startup"
 msgstr ""
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
+#: src/muuli_wdr.cpp:1472
+msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#: src/muuli_wdr.cpp:1475
+msgid "Start minimized"
+msgstr "بدء مصغر"
+
+#: src/muuli_wdr.cpp:1476
+msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/muuli_wdr.cpp:1479
+msgid "Prompt on exit"
 msgstr ""
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
+#: src/muuli_wdr.cpp:1487
+msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
+#: src/muuli_wdr.cpp:1488
+msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "فشل لفتح %s (%s)"
+#: src/muuli_wdr.cpp:1491
+msgid "Minimize to Tray Icon"
+msgstr ""
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
+#: src/muuli_wdr.cpp:1492
+msgid ""
+"Enabling this will make aMule minimize to the System Tray, rather than the "
+"taskbar."
 msgstr ""
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
 msgstr ""
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
+#: src/muuli_wdr.cpp:1511
+msgid "Browser Selection"
 msgstr ""
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "فشل في حفظ ملف part.met.seeds لي %s"
+#: src/muuli_wdr.cpp:1517
+msgid ""
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
+msgstr ""
 
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "تصفح"
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
+#: src/muuli_wdr.cpp:1525
+msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
+#: src/muuli_wdr.cpp:1527
+msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
+#: src/muuli_wdr.cpp:1532
+msgid "Video Player"
+msgstr "مشغل الفيديو"
+
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr ""
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1579
+msgid "Upload"
+msgstr "الرفع"
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
+#: src/muuli_wdr.cpp:1588
+msgid "Slot Allocation"
 msgstr ""
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
 msgstr ""
 
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
 msgstr ""
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
+#: src/muuli_wdr.cpp:1611
+msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
 msgstr ""
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
 msgstr ""
 
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
 msgstr ""
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "إيقاف"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr ""
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
+#: src/muuli_wdr.cpp:1676
+msgid "Kademlia"
 msgstr ""
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
 msgstr ""
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#: src/muuli_wdr.cpp:1689
+msgid "Autoconnect on startup"
+msgstr "ربط تلقائي عند بدء التشغيل"
+
+#: src/muuli_wdr.cpp:1692
+msgid "Reconnect on loss"
+msgstr "إعادة اﻹتصال عند الفصل"
+
+#: src/muuli_wdr.cpp:1716
+msgid "Remove dead server after"
+msgstr "إحذ الخادمات التي ﻻ تعمل بعد"
+
+#: src/muuli_wdr.cpp:1722
+msgid "retries"
+msgstr "أعد المحاولة"
+
+#: src/muuli_wdr.cpp:1729
+msgid "Auto-update server list at startup"
 msgstr ""
 
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
+#: src/muuli_wdr.cpp:1732
+msgid "List"
+msgstr "قائمة"
+
+#: src/muuli_wdr.cpp:1737
+msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
+#: src/muuli_wdr.cpp:1740
+msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/SharedFileList.cpp:352
-#, fuzzy, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "وجد %i ملف مشاركة معرف"
-msgstr[1] "وجد %i ملف مشاركة معرف"
+#: src/muuli_wdr.cpp:1743
+msgid "Use priority system"
+msgstr "إستخدم نظام اﻷولوية"
 
-#: src/SharedFileList.cpp:358
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "وجد %i ملفات مشاركة معروفة , %i غير معروفة"
-msgstr[1] "وجد %i ملفات مشاركة معروفة , %i غير معروفة"
+#: src/muuli_wdr.cpp:1747
+msgid "Use smart LowID check on connect"
+msgstr ""
 
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
+#: src/muuli_wdr.cpp:1751
+msgid "Safe connect"
+msgstr "إتصال أمن"
+
+#: src/muuli_wdr.cpp:1755
+msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "ملف تعليقات"
+#: src/muuli_wdr.cpp:1758
+msgid "Set manually added servers to High Priority"
+msgstr "جعل الخادمات المضافة يدويا ذو اولوية عالية"
 
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "تقيم"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "ﻻ تعليق "
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
 
-#: src/CommentDialogLst.cpp:104
-#, fuzzy, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "ﻻ تعليق "
-msgstr[1] "ﻻ تعليق "
+#: src/muuli_wdr.cpp:1791
+msgid "Add files to download in pause mode"
+msgstr "أضف الملفات للتحميل بوضع متوقف"
 
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
+#: src/muuli_wdr.cpp:1794
+msgid "Add files to download with auto priority"
+msgstr "أضف الملفات للتحميل بوضع ذاتي"
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "فشل في اﻹتصال باي خادم في القائمة القيام بمحاولة اخرى"
+#: src/muuli_wdr.cpp:1797
+msgid "Try to download first and last chunks first"
+msgstr "حاول تحميل القطع اﻻولى واﻻخيرة اوﻻ"
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+#: src/muuli_wdr.cpp:1805
+msgid "From the same category"
 msgstr ""
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "متصل بي %s (%s:%i)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "إتصال بي : %s"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr ""
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr "خطأ قاتل اثناء محاولة اﻹتصال . احتمال أنك غير متصل باﻹنترنت"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
 
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "فقد اﻹتصال بي %s (%s:%i)"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr ""
 
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) يظهر انه ﻻ يعمل"
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr ""
 
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/ServerConnect.cpp:381
-#, fuzzy, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "اﻹتصال الذاتي بالخادم سيعيد المحاولة بعد %d ثانية"
-msgstr[1] "اﻹتصال الذاتي بالخادم سيعيد المحاولة بعد %d ثانية"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr ""
 
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "اﻹتصال فقد"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "ارفع"
 
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "أضف ملفات مشاركة جديدة بوضع ذاتي"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
 msgstr ""
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
 msgstr ""
 
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+#: src/muuli_wdr.cpp:1884
+msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "ﻻ وجود ﻻجزاء الملفات"
+#: src/muuli_wdr.cpp:1891
+msgid "Share hidden files"
+msgstr ""
 
-#: src/DownloadQueue.cpp:171
-#, fuzzy, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "وجد %i جزء ملفات"
-msgstr[1] "وجد %i جزء ملفات"
+#: src/muuli_wdr.cpp:1911
+msgid "Graphs"
+msgstr "رسم بياني"
 
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
+msgid "Update delay : 5 secs"
+msgstr "تحيدث كل:5 ثواني"
+
+#: src/muuli_wdr.cpp:1920
+msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/muuli_wdr.cpp:1926
+msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "تحميل %s"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr ""
 
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
 msgstr ""
 
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
 msgstr ""
 
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "قمت بمحاولت تحميل الملف مسبقا %s"
+#: src/muuli_wdr.cpp:1963
+msgid "Background"
+msgstr "خلفية"
 
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+#: src/muuli_wdr.cpp:1964
+msgid "Grid"
+msgstr "شبكة"
+
+#: src/muuli_wdr.cpp:1965
+msgid "Download current"
+msgstr "حمل الحالي"
+
+#: src/muuli_wdr.cpp:1966
+msgid "Download running average"
+msgstr "معدل تحميل الحالي"
+
+#: src/muuli_wdr.cpp:1967
+msgid "Download session average"
+msgstr "معدل تحميل الجلسة"
+
+#: src/muuli_wdr.cpp:1968
+msgid "Upload current"
+msgstr "ارفع الحالي"
+
+#: src/muuli_wdr.cpp:1969
+msgid "Upload running average"
+msgstr "معدل رفع الحالي"
+
+#: src/muuli_wdr.cpp:1970
+msgid "Upload session average"
+msgstr "معدل رفع الجلسة"
+
+#: src/muuli_wdr.cpp:1971
+msgid "Active connections"
+msgstr "اتصال نشط"
+
+#: src/muuli_wdr.cpp:1974
+msgid "Systray Icon Speedbar"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
+#: src/muuli_wdr.cpp:1975
+msgid "Kad-nodes current"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
+#: src/muuli_wdr.cpp:1976
+msgid "Kad-nodes running"
 msgstr ""
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
+#: src/muuli_wdr.cpp:1977
+msgid "Kad-nodes session"
 msgstr ""
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
+msgid "Select"
+msgstr "اختر"
+
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
 msgstr ""
 
-#: src/TextClient.cpp:309
-msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+#: src/muuli_wdr.cpp:2000
+msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
+#: src/muuli_wdr.cpp:2028
+msgid "!!! WARNING !!!"
+msgstr "!!!تحذير!!!"
+
+#: src/muuli_wdr.cpp:2042
+msgid "Max new connections / 5 secs"
+msgstr "الحد اﻷعلى للتصالات لكل 5 ثواني"
+
+#: src/muuli_wdr.cpp:2048
+msgid "File Buffer Size: 240000 bytes"
 msgstr ""
 
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
+#: src/muuli_wdr.cpp:2054
+msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+#: src/muuli_wdr.cpp:2060
+msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
 msgstr ""
 
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "اظهر معدل النقل علي العنوان"
+
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "اظهر معدل النقل علي العنوان"
+
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
 msgstr ""
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
 msgstr ""
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
 msgstr ""
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
 msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
 msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
 msgstr ""
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
 msgstr ""
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
 msgstr ""
 
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "عوامل اﻻتصال الخارجي"
+
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "اقبل اتصال خارجي"
+
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/TextClient.cpp:726
-#, c-format
+#: src/muuli_wdr.cpp:2190
 msgid ""
-"\n"
-"Upload:\t%s"
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
 msgstr ""
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
 msgstr ""
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/TextClient.cpp:809
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
 msgstr ""
 
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
 msgstr ""
 
-#: src/TextClient.cpp:828
-#, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
 msgstr ""
 
-#: src/TextClient.cpp:841
-msgid "Show short status information."
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
 msgstr ""
 
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
 msgstr ""
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
 msgstr ""
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
 msgstr ""
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "زمن تحديث الصفحة (بالثانية)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr " Gzipتمكين ضغط نوع"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "موافق"
+
+#: src/muuli_wdr.cpp:2326
+msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
+#: src/muuli_wdr.cpp:2330
+msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
+#: src/muuli_wdr.cpp:2354
+msgid "Title :"
+msgstr "عنوان :"
+
+#: src/muuli_wdr.cpp:2364
+msgid "Comment :"
+msgstr "تعليق :"
+
+#: src/muuli_wdr.cpp:2374
+msgid "Incoming Dir :"
+msgstr "مجلد القادم"
+
+#: src/muuli_wdr.cpp:2387
+msgid "Change priority for new assigned files :"
+msgstr "تغير الأولوية للملفات الحديثة :"
+
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
+msgstr "ﻻ تغير"
+
+#: src/muuli_wdr.cpp:2406
+msgid "Select color for this Category (currently selected) :"
 msgstr ""
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "معاد"
+
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
+msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/TextClient.cpp:855
+#: src/muuli_wdr.cpp:2528
+msgid "Click on this button to update the servers list from URL ..."
+msgstr "قم بالضغط على هذا الزر لتحديث قائمة الخادمات من العنوان ..."
+
+#: src/muuli_wdr.cpp:2532
+msgid "Server list"
+msgstr "قائمة الخادمات"
+
+#: src/muuli_wdr.cpp:2537
 msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+"Enter the url to a server.met file here and press the button to the left to "
+"update the list of known servers."
 msgstr ""
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
+#: src/muuli_wdr.cpp:2544
+msgid "Add server manually: Name"
 msgstr ""
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
+#: src/muuli_wdr.cpp:2548
+msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "عنوان شبكي :منفذ"
+
+#: src/muuli_wdr.cpp:2555
+msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
+#: src/muuli_wdr.cpp:2562
+msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
+#: src/muuli_wdr.cpp:2566
+msgid "Add manually a server (fill fields to the left before) ..."
+msgstr "اضف خادم يدويا )قم بمل الخانة على اليسار اوﻻ)..."
+
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "سجل aMule"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "معلومات الخادم"
+
+#: src/muuli_wdr.cpp:2612
+msgid "ED2K Info"
 msgstr ""
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
+#: src/muuli_wdr.cpp:2616
+msgid "Kad Info"
 msgstr ""
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
+#: src/muuli_wdr.cpp:2645
+msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/TextClient.cpp:865
+#: src/muuli_wdr.cpp:2649
+msgid "Nodes (0)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2654
 msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+"Enter the url to a nodes.dat file here and press the button to the left to "
+"update the list of known nodes."
 msgstr ""
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
+#: src/muuli_wdr.cpp:2659
+msgid "Nodes stats"
 msgstr ""
 
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
+#: src/muuli_wdr.cpp:2710
+msgid "Bootstrap"
 msgstr ""
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
+#: src/muuli_wdr.cpp:2713
+msgid "New node"
 msgstr ""
 
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
+#: src/muuli_wdr.cpp:2718
+msgid "IP:"
 msgstr ""
 
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
+#: src/muuli_wdr.cpp:2747
+msgid "Port:"
 msgstr ""
 
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
 msgstr ""
 
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
+#: src/muuli_wdr.cpp:2768
+msgid "Disconnect Kad"
 msgstr ""
 
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
 msgstr ""
 
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
+#: src/muuli_wdr.cpp:2811
+msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
+#: src/muuli_wdr.cpp:2814
+msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:880
+#: src/muuli_wdr.cpp:2816
 msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
+"connections from other clients."
 msgstr ""
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
+#: src/muuli_wdr.cpp:2819
+msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
+#: src/muuli_wdr.cpp:2821
+msgid ""
+"This option makes aMule use Protocol Obfuscation when connecting other "
+"clients/servers."
 msgstr ""
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
+#: src/muuli_wdr.cpp:2824
+msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
+#: src/muuli_wdr.cpp:2825
+msgid ""
+"This option makes aMule only accept obfuscated connections. You will have "
+"less sources, but all your traffic will be obfuscated"
 msgstr ""
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr ""
+#: src/muuli_wdr.cpp:2832
+msgid "Everybody"
+msgstr "الكل"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
+#: src/muuli_wdr.cpp:2834
+msgid "No one"
 msgstr ""
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
+#: src/muuli_wdr.cpp:2837
+msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
+#: src/muuli_wdr.cpp:2840
+msgid "IP-Filtering"
 msgstr ""
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
+#: src/muuli_wdr.cpp:2847
+msgid "Filter clients"
 msgstr ""
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
+#: src/muuli_wdr.cpp:2849
+msgid ""
+"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
+#: src/muuli_wdr.cpp:2852
+msgid "Filter servers"
 msgstr ""
 
-#: src/TextClient.cpp:901
+#: src/muuli_wdr.cpp:2854
 msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
+#: src/muuli_wdr.cpp:2861
+msgid "Reload List"
 msgstr ""
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
+#: src/muuli_wdr.cpp:2862
+msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
+#: src/muuli_wdr.cpp:2870
+msgid "URL:"
 msgstr ""
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
+#: src/muuli_wdr.cpp:2876
+msgid "Update now"
 msgstr ""
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
+#: src/muuli_wdr.cpp:2881
+msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
+#: src/muuli_wdr.cpp:2886
+msgid "Filtering Level:"
 msgstr ""
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
+#: src/muuli_wdr.cpp:2896
+msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
+#: src/muuli_wdr.cpp:2900
+msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/TextClient.cpp:913
+#: src/muuli_wdr.cpp:2902
 msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+"Rejects packet if the client ip is different from the ip where the packet is "
+"received from. Use with caution."
 msgstr ""
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
+#: src/muuli_wdr.cpp:2905
+msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
+#: src/muuli_wdr.cpp:2906
+msgid ""
+"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
+"file."
 msgstr ""
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
+#: src/muuli_wdr.cpp:2925
+msgid "Enable Online-Signature"
+msgstr "تمكين التوقيع الشبكي"
+
+#: src/muuli_wdr.cpp:2927
+msgid ""
+"Enables the writing of the OS file, which can be used by external apps to "
+"create signatures and the like."
 msgstr ""
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
+#: src/muuli_wdr.cpp:2932
+msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+#: src/muuli_wdr.cpp:2936
+msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
 msgstr ""
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
+#: src/muuli_wdr.cpp:2952
+msgid ""
+"Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
+#: src/muuli_wdr.cpp:2974
+msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
+#: src/muuli_wdr.cpp:2977
+msgid "Filter all messages"
 msgstr ""
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
+#: src/muuli_wdr.cpp:2980
+msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
+#: src/muuli_wdr.cpp:2983
+msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
+#: src/muuli_wdr.cpp:2986
+msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
+msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/TextClient.cpp:940
-msgid "Show log."
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
 msgstr ""
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
+#: src/muuli_wdr.cpp:2998
+msgid "Comments"
 msgstr ""
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
+#: src/muuli_wdr.cpp:3001
+msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Deprecated command, use '%s' instead."
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
 msgstr ""
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
 msgstr ""
 
-#: src/ServerSocket.cpp:259
-#, c-format
-msgid "ERROR: %s (%s) - %s"
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/ServerSocket.cpp:274
-#, c-format
-msgid "WARNING: %s (%s) - %s"
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
 msgstr ""
 
-#: src/ServerSocket.cpp:417
-#, c-format
-msgid "New clientid is %u"
-msgstr "عميل جديد هو %u"
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr ""
 
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
 msgstr ""
 
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
+#: src/muuli_wdr.cpp:3050
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
+#: src/muuli_wdr.cpp:3051
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/ServerSocket.cpp:539
-#, fuzzy, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "تلقي %d خادم جديد"
-msgstr[1] "تلقي %d خادم جديد"
+#: src/muuli_wdr.cpp:3056
+msgid "Proxy type:"
+msgstr ""
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
+#: src/muuli_wdr.cpp:3069
+msgid "Proxy host:"
 msgstr ""
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "الخادم رفض اخر امر"
+#: src/muuli_wdr.cpp:3073
+msgid "The proxy host name"
+msgstr ""
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
+#: src/muuli_wdr.cpp:3076
+msgid "Proxy port:"
 msgstr ""
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
+#: src/muuli_wdr.cpp:3080
+msgid "The proxy port"
 msgstr ""
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
+#: src/muuli_wdr.cpp:3101
+msgid "Connect to:"
 msgstr ""
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
+#: src/muuli_wdr.cpp:3115
+msgid "Login to remote amule"
 msgstr ""
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
+#: src/muuli_wdr.cpp:3120
+msgid "User name"
 msgstr ""
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
+#: src/muuli_wdr.cpp:3137
+msgid "Remember those settings"
 msgstr ""
 
-#: src/ServerSocket.cpp:760
-#, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
+#: src/muuli_wdr.cpp:3166
+msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#: src/muuli_wdr.cpp:3169
+msgid "Message Categories:"
 msgstr ""
 
-#: src/IP2Country.cpp:105
-#, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "إنتظار..."
 
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr "هل أنت متاكد من حذف كل الملفات في هذا المصنف؟"
+#: src/muuli_wdr.cpp:3222
+msgid "Add imports"
+msgstr ""
 
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "مطلوب التاكيد"
+#: src/muuli_wdr.cpp:3226
+msgid "Retry selected"
+msgstr ""
 
-#: src/TransferWnd.cpp:342
-msgid "All others"
+#: src/muuli_wdr.cpp:3229
+msgid "Remove selected"
 msgstr ""
 
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "غير مكتمل"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr ""
 
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "فيديو"
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "رفع نشط :"
 
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "سمعي"
+#: src/muuli_wdr.cpp:3368
+#, fuzzy
+msgid "Percent of total files"
+msgstr "مجموع الملفات"
 
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "أرشيف"
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "ملفات مشاركة"
 
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "إختر فلتر العرض"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "رفع نشط"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "منفذ العميل"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "اعد تحميل"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
 msgstr ""
 
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "صور"
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "ارسل"
 
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "نص"
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr ""
 
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "إختر فلتر العرض"
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr ""
 
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "اضف مجموعة"
+#: src/muuli_wdr.cpp:3527
+msgid "Connect to any server and/or Kad"
+msgstr ""
 
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "عرض المجموعة"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "ملفات مشاركة"
 
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "الغاء المجموعة"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "تعطيل [%s]"
 
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
+#: src/OtherFunctions.cpp:106
+#, fuzzy
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "بايت"
+msgstr[1] "بايت"
+
+#: src/OtherFunctions.cpp:108
+msgid "kB"
 msgstr ""
 
-#: src/KnownFile.cpp:1360
-msgid "File size"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
 msgstr ""
 
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
+#: src/OtherFunctions.cpp:124
+msgid "k"
 msgstr ""
 
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
+#: src/OtherFunctions.cpp:126
+msgid "M"
 msgstr ""
 
-#: src/KnownFile.cpp:1363
-msgid "Requested"
+#: src/OtherFunctions.cpp:128
+msgid "G"
 msgstr ""
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
+#: src/OtherFunctions.cpp:130
+msgid "T"
 msgstr ""
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
+#: src/OtherFunctions.cpp:137
+#, fuzzy
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "بايت"
+msgstr[1] "بايت"
+
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr ""
+
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "ثانية"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "دقيقة"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr ""
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr ""
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "الكل"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "الكل ماعدا"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "غير مكتمل"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "إيقاف"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "فيديو"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "أرشيف"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "نص"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
 msgstr ""
 
-#: src/PartFileConvert.cpp:208
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr ""
+
+#: src/PartFileConvert.cpp:200
 #, c-format
 msgid "Importing %s: %s"
 msgstr ""
 
-#: src/PartFileConvert.cpp:239
+#: src/PartFileConvert.cpp:237
 msgid "Reading temp folder"
 msgstr ""
 
-#: src/PartFileConvert.cpp:243
+#: src/PartFileConvert.cpp:241
 msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:322
+#: src/PartFileConvert.cpp:318
 msgid "Creating destination file"
 msgstr ""
 
-#: src/PartFileConvert.cpp:331
+#: src/PartFileConvert.cpp:327
 #, c-format
 msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:351
+#: src/PartFileConvert.cpp:347
 #, c-format
 msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/PartFileConvert.cpp:418
+#: src/PartFileConvert.cpp:413
 msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/PartFileConvert.cpp:443
+#: src/PartFileConvert.cpp:436
 msgid "Adding download and saving new partfile"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
+#: src/PartFileConvertDlg.cpp:84
 msgid "Import partfiles"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
+#: src/PartFileConvertDlg.cpp:92
 msgid "State"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
+#: src/PartFileConvertDlg.cpp:94
 msgid "Filehash"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "إنتظار..."
-
-#: src/PartFileConvertDlg.cpp:176
+#: src/PartFileConvertDlg.cpp:169
 #, c-format
 msgid "%s (Disk: %s)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:202
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
 "Please choose a folder to search for temporary downloads! (subfolders will "
 "be included)"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:206
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
 "Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:207
+#: src/PartFileConvertDlg.cpp:199
 msgid "Remove sources?"
 msgstr ""
 
-#: src/OtherFunctions.cpp:112
+#: src/PartFile.cpp:298
 #, fuzzy
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "بايت"
-msgstr[1] "بايت"
+msgid "ERROR: Failed to create partfile"
+msgstr "خطأ: فشل في تكوين ملف اجزاء)"
 
-#: src/OtherFunctions.cpp:114
-msgid "kB"
+#: src/PartFile.cpp:336
+#, c-format
+msgid "Trying to load backup of met-file from %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:120
-msgid "TB"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr ""
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr "خطأ: %s (%s) معطوب, غير قادر لتحميل الملف"
 
-#: src/OtherFunctions.cpp:132
-msgid "M"
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/OtherFunctions.cpp:134
-msgid "G"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/OtherFunctions.cpp:136
-msgid "T"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
 
-#: src/OtherFunctions.cpp:143
-#, fuzzy
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "بايت"
-msgstr[1] "بايت"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "ثانية"
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr ""
 
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "دقيقة"
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "فشل لفتح %s (%s)"
 
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/OtherFunctions.cpp:185
-msgid "Days"
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "فيديو"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "ارشيف"
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "خطأ أثناء حفظ ملف اجزاء: %s (%s => %s)"
 
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
 msgstr ""
 
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "برامج"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "اي"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "غير مقيم"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "غير صحيح / معطوب / مزيف"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "فقير"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "عادل"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "جيد"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "ممتاز"
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr ""
 
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "الكل"
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "فشل في حفظ ملف part.met.seeds لي %s"
 
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "الكل ماعدا"
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
 msgstr ""
 
-#: src/IPFilter.cpp:285
+#: src/PartFile.cpp:1058
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgid "Partfile %s (%s) has a void seeds file"
 msgstr ""
 
-#: src/IPFilter.cpp:326
+#: src/PartFile.cpp:1114
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr ""
 
-#: src/IPFilter.cpp:331
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
 #, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
+msgid ""
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/IPFilter.cpp:333
+#: src/PartFile.cpp:1175
 #, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] ""
-msgstr[1] ""
+msgid "Found completed part (%i) in %s"
+msgstr ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/PartFile.cpp:1208
 #, c-format
-msgid "Active connections (1:%u)"
-msgstr "إتصال نشط (1:%u)"
+msgid "Finished rehashing %s"
+msgstr ""
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:114
+#: src/PartFile.cpp:2165
 #, c-format
-msgid "%.2f%% done"
+msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:73
-msgid "eD2k Link: "
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:80
-msgid "Commit"
-msgstr "ارتكب"
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr ""
 
-#: src/muuli_wdr.cpp:81
+#: src/PartFile.cpp:2292
+#, c-format
 msgid ""
-"Click here to add the eD2k link in the text control to your download queue."
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Events are displayed here. For a complete list of events, refer to the log "
-"in the Servers-tab."
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:92
-msgid "Loading ..."
-msgstr "تحميل ..."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:101
-msgid "Number of users on the server you are connected to ..."
-msgstr "عدد المستخدمين على الخادم الذي تتصل به..."
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:104
-msgid "Users: 0"
-msgstr "مستخدمين: 0"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:105
-msgid ""
-"Users connected to the current server and an estimate of the total number of "
-"users."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:117
-msgid ""
-"Current average upload and download rates. If enabled the numbers in the "
-"braces signify the overhead from client communication."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:125
-msgid ""
-"Displays the connected status and active transfers. Red arrows signifies "
-"that you are currently not connected, yellow arrows signify that you have "
-"low ID (firewalled) and green arrows signify that you have high ID (The "
-"optimal connection type)."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
 msgstr ""
 
-#: src/muuli_wdr.cpp:129
-msgid "Not Connected ..."
-msgstr "غير متصل"
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr ""
 
-#: src/muuli_wdr.cpp:130
-msgid "Currently connected server."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "اﻹفتراضية بالنظام"
+
+#: src/Preferences.cpp:631
+msgid "Albanian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:176
-msgid "Search"
-msgstr "بحث"
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "العربيه"
 
-#: src/muuli_wdr.cpp:182
-msgid "Name:"
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "الأستونيه"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
 msgstr ""
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
-msgid "Local"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "البلغاريه"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
 msgstr ""
 
-#: src/muuli_wdr.cpp:196
-msgid "Global"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:198
-msgid "FileHash"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:206
-msgid "Extended Parameters"
+#: src/Preferences.cpp:639
+msgid "Croatian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:212
-msgid "Filtering"
+#: src/Preferences.cpp:640
+msgid "Czech"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
-msgid "File Type"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "الدانماركيه"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "الهولنديه"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:253
-msgid "Extension"
-msgstr "إمتداد"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "الأستونيه"
 
-#: src/muuli_wdr.cpp:259
-msgid "Min Size"
-msgstr "اقل حجم"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "الفلنديه"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
-msgid "Bytes"
-msgstr "بايت"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "الفرنسية"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
-msgid "KB"
+#: src/Preferences.cpp:647
+msgid "Galician"
 msgstr ""
 
-#: src/muuli_wdr.cpp:282
-msgid "Max Size"
-msgstr "اكبر حجم"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "الألمانيه"
 
-#: src/muuli_wdr.cpp:305
-msgid "Availability"
+#: src/Preferences.cpp:649
+msgid "Greek"
 msgstr ""
 
-#: src/muuli_wdr.cpp:318
-msgid "Filter:"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
 msgstr ""
 
-#: src/muuli_wdr.cpp:327
-msgid "Filter Results"
-msgstr ""
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "الهنغاريه"
 
-#: src/muuli_wdr.cpp:333
-msgid "Invert Result"
-msgstr ""
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "الايطاليه"
 
-#: src/muuli_wdr.cpp:339
-msgid "Hide Known Files"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:355
-msgid "More"
+#: src/Preferences.cpp:654
+msgid "Japanese"
 msgstr ""
 
-#: src/muuli_wdr.cpp:356
-msgid "Searches for more results on eD2k. Not supported for Kad yet."
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "الكوريه"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "الليتوانيه"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:363
-msgid "Stop"
+#: src/Preferences.cpp:658
+msgid "Polish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:377
-msgid "Reset Fields"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "البرتغاليه"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:392
-msgid "Results"
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "الروسيه"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:428
-msgid "Clears completed downloads"
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "الإسبانيه"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
+#: src/Preferences.cpp:665
+msgid "Turkish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "عملاء في اﻻنتظار:"
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr ""
 
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "ارسل"
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "الغة"
 
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "اغلق"
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "غير متوفر"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
+#: src/Preferences.cpp:902
+msgid "no options available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:575
-msgid "Full Name :"
-msgstr "اﻻسم كامل :"
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr ""
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
-msgid "N/A"
-msgstr "غير متوفر"
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
 
-#: src/muuli_wdr.cpp:586
-msgid "met-File :"
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:597
-msgid "Hash :"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:612
-msgid "Filesize :"
-msgstr "حجم الملف :"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "اتصال"
 
-#: src/muuli_wdr.cpp:623
-msgid "Partfilestatus :"
-msgstr "حالة جزء الملف :"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "مجلدات"
 
-#: src/muuli_wdr.cpp:634
-msgid "Last seen complete :"
-msgstr "اخر مرة تم اكتمال :"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "الخادمات"
 
-#: src/muuli_wdr.cpp:656
-msgid "Found Sources :"
-msgstr "ايجاد المصدر :"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "ملفات"
 
-#: src/muuli_wdr.cpp:667
-msgid "Transferring Sources :"
-msgstr "نقل المصدر :"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr ""
 
-#: src/muuli_wdr.cpp:678
-msgid "Filepart-Count :"
-msgstr "احصاء اجزاء الملف :"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr ""
 
-#: src/muuli_wdr.cpp:689
-msgid "Available :"
-msgstr "متوفر :"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr ""
 
-#: src/muuli_wdr.cpp:700
-msgid "Datarate :"
-msgstr "نسبة المصادر :"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
 
-#: src/muuli_wdr.cpp:711
-msgid "Download Active Time: "
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "تحكم عن بعد"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
-msgid "Transferred :"
-msgstr "محول :"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr ""
 
-#: src/muuli_wdr.cpp:733
-msgid "Completed Size :"
-msgstr "حجم المكمل :"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr ""
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
-msgid "Intelligent Corruption Handling"
-msgstr "معالجة الفاسد بذكاء"
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr ""
 
-#: src/muuli_wdr.cpp:769
-msgid "Lost to corruption :"
-msgstr "فقد بسبب فساد :"
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
 
-#: src/muuli_wdr.cpp:780
-msgid "Gained by compression :"
-msgstr "أكتسب بواسطة الضغط :"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
 
-#: src/muuli_wdr.cpp:791
-msgid "Packages saved by I.C.H. :"
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
-msgid "File Names"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:825
-msgid "Takeover"
-msgstr "سيطر"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr ""
 
-#: src/muuli_wdr.cpp:835
-msgid "Cleanup"
-msgstr "نظف"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
-msgid "Apply"
-msgstr "طبق"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
 
-#: src/muuli_wdr.cpp:854
-msgid "Ok"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:883
-msgid "Comment/Rate file (Text will be visible to all users)"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:897
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "عوامل اﻻتصال الخارجي"
+
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "عوامل اﻻتصال الخارجي"
+
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "عوامل اﻻتصال الخارجي"
+
+#: src/PrefsUnifiedDlg.cpp:623
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:905
-msgid "File Quality"
-msgstr "جودة الملف"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
 
-#: src/muuli_wdr.cpp:920
-msgid "Choose the file rating or advice users if the file is invalid ..."
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:964
-msgid "Refresh"
-msgstr "انعش"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr ""
 
-#: src/muuli_wdr.cpp:991
-msgid "Downloading, please wait ..."
-msgstr "تحميل ,رجاء انتظر..."
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr ""
 
-#: src/muuli_wdr.cpp:997
-msgid "Unknown size"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1021
-msgid "Required Information"
-msgstr "مطلوب معلومات"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1026
-msgid "IP Address :"
-msgstr "عنوان IP :"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1032
-msgid "Port :"
-msgstr "منفذ :"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1042
-msgid "Additional Information"
-msgstr "معلومت إضافية"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1047
-msgid "Username :"
-msgstr "اسم المستخدم :"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1053
-msgid "Userhash :"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
+#: src/PrefsUnifiedDlg.cpp:1003
+#, c-format
+msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "الجلسة الحالية"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "المجموع"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "طلب :"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "رفع نشط :"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1206
-msgid "Download-Speed"
-msgstr "سرعة-التحميل"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
-msgid "Current"
-msgstr "الحالي"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
-msgid "Running average"
-msgstr "معدل العمل"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"أضف هنا عنوان لتحميل ملفات server.met \n"
+"عنوان واحد فقط لكل سطر"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
-msgid "Session average"
-msgstr "معدل الجلسة"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, fuzzy, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "تحيدث كل:5 ثواني"
+msgstr[1] "تحيدث كل:5 ثواني"
 
-#: src/muuli_wdr.cpp:1255
-msgid "Upload-Speed"
-msgstr "سرعة-الرفع"
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/muuli_wdr.cpp:1304
-msgid "Connections"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
-msgid "Active downloads"
-msgstr "تحميل نشط"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/muuli_wdr.cpp:1333
-msgid "Active connections (1:1)"
-msgstr "إتصال نشط (1:1)"
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
-msgid "Active uploads"
-msgstr "رفع نشط"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, fuzzy, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "فترة تحديث الإتصال بالخادم %i دقيقة"
+msgstr[1] "فترة تحديث الإتصال بالخادم %i دقيقة"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
-msgid "Statistics Tree"
-msgstr "شجرة اﻻحصائيات"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "فترة تحديث الإتصال بالخادم :معطل"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
-msgid "Username:"
-msgstr "اسم المستخدم:"
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "تعطيل"
 
-#: src/muuli_wdr.cpp:1386
-msgid "Userhash:"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, c-format
+msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1409
-msgid "Client software:"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1418
-msgid "Client version:"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1425
-msgid "IP address:"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1434
-msgid "User ID:"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1441
-msgid "Server IP:"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1450
-msgid "Server name:"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1457
-msgid "Obfuscation:"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1466
-msgid "Kad:"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1477
-msgid "Transfers to client"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1482
-msgid "Current request:"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1495
-msgid "Average upload rate:"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1504
-msgid "Average download rate:"
-msgstr ""
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "تعريف ملف"
 
-#: src/muuli_wdr.cpp:1511
-msgid "Uploaded (session):"
-msgstr ""
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "ملف"
 
-#: src/muuli_wdr.cpp:1520
-msgid "Downloaded (session):"
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1527
-msgid "Uploaded (total):"
-msgstr ""
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "طلب ملف اخر"
 
-#: src/muuli_wdr.cpp:1536
-msgid "Downloaded (total):"
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1547
-msgid "Scores"
-msgstr "مصدر"
-
-#: src/muuli_wdr.cpp:1554
-msgid "DL/UP modifier:"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Secure ident:"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "إلغاء"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1579
-msgid "Queue score:"
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1610
-msgid "Nick"
-msgstr "مستعار"
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "فشل في اﻹتصال باي خادم في القائمة القيام بمحاولة اخرى"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1614
-msgid "This is the name that other users will see when connecting to you."
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "الغة"
+#: src/ServerConnect.cpp:198
+#, c-format
+msgid "Connected to %s (%s:%i)"
+msgstr "متصل بي %s (%s:%i)"
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
-msgstr ""
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "إتصال بي : %s"
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "خيرات متفرقة"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr "خطأ قاتل اثناء محاولة اﻹتصال . احتمال أنك غير متصل باﻹنترنت"
 
-#: src/muuli_wdr.cpp:1634
-msgid "Check for new version at startup"
-msgstr ""
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "فقد اﻹتصال بي %s (%s:%i)"
 
-#: src/muuli_wdr.cpp:1635
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) يظهر انه ﻻ يعمل"
+
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1638
-msgid "Start minimized"
-msgstr "بدء مصغر"
+#: src/ServerConnect.cpp:392
+#, fuzzy, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "اﻹتصال الذاتي بالخادم سيعيد المحاولة بعد %d ثانية"
+msgstr[1] "اﻹتصال الذاتي بالخادم سيعيد المحاولة بعد %d ثانية"
 
-#: src/muuli_wdr.cpp:1639
-msgid "Enabling this makes aMule minimize itself upon start."
-msgstr ""
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "اﻹتصال فقد"
 
-#: src/muuli_wdr.cpp:1642
-msgid "Prompt on exit"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1647
-msgid "Enable Tray Icon"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1648
-msgid "This Enables/Disables the system tray (or taskbar) icon."
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1651
-msgid "Minimize to Tray Icon"
+#: src/ServerList.cpp:88
+#, c-format
+msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1652
-msgid ""
-"Enabling this will make aMule minimize to the System Tray, rather than the "
-"taskbar."
+#: src/ServerList.cpp:93
+msgid "Server.met file not found!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
+#: src/ServerList.cpp:101
+#, c-format
+msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
+#: src/ServerList.cpp:107
+msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
-msgid "Browser Selection"
+#: src/ServerList.cpp:118
+#, c-format
+msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
+#: src/ServerList.cpp:173
+#, fuzzy, c-format
+msgid "%i server in server.met found"
+msgid_plural "%i servers in server.met found"
+msgstr[0] "%i خادمات وجدت في server.met"
+msgstr[1] "%i خادمات وجدت في server.met"
+
+#: src/ServerList.cpp:175
+#, fuzzy, c-format
+msgid "%d server added"
+msgid_plural "%d servers added"
+msgstr[0] "%d خادم مضاف"
+msgstr[1] "%d خادم مضاف"
+
+#: src/ServerList.cpp:178
+#, fuzzy
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "خطأ: ملف server.met معطوب"
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "فشل غير متوقع اثناء كتابة ملف %s : %s"
+
+#: src/ServerList.cpp:195
+#, c-format
+msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
+#: src/ServerList.cpp:213
+#, c-format
+msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
+#: src/ServerList.cpp:232
+#, c-format
+msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
+#: src/ServerList.cpp:250
+#, c-format
+msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
+#: src/ServerList.cpp:345
+msgid ""
+"You are connected to the server you are trying to delete. please disconnect "
+"first."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
+#: src/ServerList.cpp:685
+msgid "Failed to save server.met!"
+msgstr "فشل في حفظ server.met!"
+
+#: src/ServerList.cpp:832
+msgid "Invalid URL"
+msgstr "عنوان شبكي غير صحيح"
+
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
+msgstr "فشل في تحميل قائمة الخادمات من %s"
+
+#: src/ServerList.cpp:869
+msgid ""
+"No server list address entry in 'addresses.dat' found. Please paste a valid "
+"server list address into this file in order to auto-update your server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
+#: src/ServerList.cpp:882
+#, c-format
+msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
+#: src/ServerList.cpp:891
+#, c-format
+msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
+#: src/ServerList.cpp:895
+msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/ServerList.cpp:985
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Local server is filtered by the IPFilters, reconnecting to a different "
+"server!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1705
-msgid "Open in new tab if possible"
-msgstr ""
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "إسم الخادم"
 
-#: src/muuli_wdr.cpp:1707
-msgid "Open the web page in a new tab instead of in a new window when possible"
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1712
-msgid "Video Player"
-msgstr "مشغل الفيديو"
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "منفذ"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr ""
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "وصف"
 
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
-msgid "Upload"
-msgstr "الرفع"
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "مستخدمين"
 
-#: src/muuli_wdr.cpp:1775
-msgid "Slot Allocation"
-msgstr ""
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "ثابت"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr ""
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "نسخة"
 
-#: src/muuli_wdr.cpp:1796
-msgid "This is the standard eD2k port and cannot be disabled."
+#: src/ServerListCtrl.cpp:148
+msgid ""
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "تعطيل"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "خادمات (%i)"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "خادم"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "حد أعلى للمصادر لكل ملف"
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "أعلى أتصال"
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "الغاء الخادم"
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
+#: src/ServerListCtrl.cpp:419
+#, fuzzy
+msgid "Remove servers"
+msgstr "الغاء الخادم"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "الغاء كل الخادمات"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1886
-msgid "Kademlia"
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
+#: src/ServerListCtrl.cpp:541
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
+
+#: src/ServerListCtrl.cpp:543
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "هل انت متاكد من الغاء زحذف هذه الملفات ؟\n"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
-msgid "Autoconnect on startup"
-msgstr "ربط تلقائي عند بدء التشغيل"
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "عميل جديد هو %u"
 
-#: src/muuli_wdr.cpp:1916
-msgid "Reconnect on loss"
-msgstr "إعادة اﻹتصال عند الفصل"
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1947
-msgid "Remove dead server after"
-msgstr "إحذ الخادمات التي ﻻ تعمل بعد"
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1953
-msgid "retries"
-msgstr "أعد المحاولة"
+#: src/ServerSocket.cpp:535
+#, fuzzy, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "تلقي %d خادم جديد"
+msgstr[1] "تلقي %d خادم جديد"
 
-#: src/muuli_wdr.cpp:1960
-msgid "Auto-update server list at startup"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1963
-msgid "List"
-msgstr "قائمة"
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "الخادم رفض اخر امر"
 
-#: src/muuli_wdr.cpp:1968
-msgid "Update server list when connecting to a server"
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1971
-msgid "Update server list when a client connects"
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1974
-msgid "Use priority system"
-msgstr "إستخدم نظام اﻷولوية"
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1978
-msgid "Use smart LowID check on connect"
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1982
-msgid "Safe connect"
-msgstr "إتصال أمن"
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1986
-msgid "Autoconnect to servers in static list only"
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1989
-msgid "Set manually added servers to High Priority"
-msgstr "جعل الخادمات المضافة يدويا ذو اولوية عالية"
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. نشط"
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2024
-msgid "Add files to download in pause mode"
-msgstr "أضف الملفات للتحميل بوضع متوقف"
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2027
-msgid "Add files to download with auto priority"
-msgstr "أضف الملفات للتحميل بوضع ذاتي"
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "هوية"
 
-#: src/muuli_wdr.cpp:2030
-msgid "Try to download first and last chunks first"
-msgstr "حاول تحميل القطع اﻻولى واﻻخيرة اوﻻ"
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "أضف ملفات مشاركة جديدة بوضع ذاتي"
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
+#: src/ServerWnd.cpp:206
+msgid "Running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "إبدا الملف الموقف التالي عند اﻻنتهاء من ملف"
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2045
-msgid "From the same category"
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "اعلى سرعة اتصال تقديرية"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "يتم الإتصال"
+
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "متصل بي %s (%s:%i)"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "ايجاد المصدر :"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2122
-msgid "(Right click on folder icon for recursive share)"
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2129
-msgid "Share hidden files"
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2149
-msgid "Graphs"
-msgstr "رسم بياني"
+#: src/SharedFileList.cpp:371
+#, fuzzy, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "وجد %i ملف مشاركة معرف"
+msgstr[1] "وجد %i ملف مشاركة معرف"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
-msgid "Update delay : 5 secs"
-msgstr "تحيدث كل:5 ثواني"
+#: src/SharedFileList.cpp:377
+#, fuzzy, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "وجد %i ملفات مشاركة معروفة , %i غير معروفة"
+msgstr[1] "وجد %i ملفات مشاركة معروفة , %i غير معروفة"
 
-#: src/muuli_wdr.cpp:2158
-msgid "Time for average graph: 100 mins"
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2164
-msgid "Connections Graph Scale: 100 "
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "اختر لون اﻻحصائيات"
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2177
-msgid "Background"
-msgstr "خلفية"
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "اسم مستخدم"
 
-#: src/muuli_wdr.cpp:2178
-msgid "Grid"
-msgstr "شبكة"
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "سرعة-التحميل"
 
-#: src/muuli_wdr.cpp:2179
-msgid "Download current"
-msgstr "حمل الحالي"
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "سرعة-الرفع"
 
-#: src/muuli_wdr.cpp:2180
-msgid "Download running average"
-msgstr "معدل تحميل الحالي"
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "متوفر :"
 
-#: src/muuli_wdr.cpp:2181
-msgid "Download session average"
-msgstr "معدل تحميل الجلسة"
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "ارفع"
 
-#: src/muuli_wdr.cpp:2182
-msgid "Upload current"
-msgstr "ارفع الحالي"
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#, fuzzy
+msgid "Download Status"
+msgstr "تحميل"
 
-#: src/muuli_wdr.cpp:2183
-msgid "Upload running average"
-msgstr "معدل رفع الحالي"
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2184
-msgid "Upload session average"
-msgstr "معدل رفع الجلسة"
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "اسم الملف"
 
-#: src/muuli_wdr.cpp:2185
-msgid "Active connections"
-msgstr "اتصال نشط"
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "ملفات مشاركة"
 
-#: src/muuli_wdr.cpp:2188
-msgid "Systray Icon Speedbar"
-msgstr ""
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "طلبات"
 
-#: src/muuli_wdr.cpp:2189
-msgid "Kad-nodes current"
-msgstr ""
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "طلبات مقبوله"
 
-#: src/muuli_wdr.cpp:2190
-msgid "Kad-nodes running"
-msgstr ""
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "بينات محوله"
 
-#: src/muuli_wdr.cpp:2191
-msgid "Kad-nodes session"
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
-msgid "Select"
-msgstr "اختر"
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "أجزاء مكتسبة"
 
-#: src/muuli_wdr.cpp:2214
-msgid "Number of Client Versions shown (0=unlimited)"
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "قدرة الخط"
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2272
-msgid "!!! WARNING !!!"
-msgstr "!!!تحذير!!!"
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "اعد تسمية"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Max new connections / 5 secs"
-msgstr "الحد اﻷعلى للتصالات لكل 5 ثواني"
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2294
-msgid "File Buffer Size: 240000 bytes"
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2300
-msgid "Upload Queue Size: 5000 clients"
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2306
-msgid "Server connection refresh interval: Disable"
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "تقدم طابور ملفات التحميل"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "إظهار نسبة مئوية"
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "إظهار شريط التقدم"
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "يجب ان تكون ذا هوية مرتفعة لتتمكن من انشاء رابط مصدر"
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "سمة شريط التطور"
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "ملفات مشاركة (%i)"
 
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr ""
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "اسم الملف"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "اظهر معدل النقل علي العنوان"
-
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr ""
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "متوسط زمن التحميل : %s"
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "زمن تحديث الصفحة (بالثانية)"
-
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr " Gzipتمكين ضغط نوع"
-
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr ""
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "اعادة اﻹتصال : %i"
 
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "عوامل اﻻتصال الخارجي"
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "الوقت منذ بدء التحميل: %s"
 
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "اقبل اتصال خارجي"
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "متصل بالخادم منذ : %s"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2583
-msgid "Click here to apply any changes made to the preferences."
-msgstr ""
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "عميل"
 
-#: src/muuli_wdr.cpp:2587
-msgid "Reset any changes made to the preferences."
-msgstr ""
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "غير معروف :%i"
 
-#: src/muuli_wdr.cpp:2611
-msgid "Title :"
-msgstr "عنوان :"
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "تم ترشيح : %i"
 
-#: src/muuli_wdr.cpp:2621
-msgid "Comment :"
-msgstr "تعليق :"
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "حظر"
 
-#: src/muuli_wdr.cpp:2631
-msgid "Incoming Dir :"
-msgstr "مجلد القادم"
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
-msgid "Change priority for new assigned files :"
-msgstr "تغير الأولوية للملفات الحديثة :"
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
-msgstr "ﻻ تغير"
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2663
-msgid "Select color for this Category (currently selected) :"
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "معلومات الخادم"
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
-msgid "Click this button to reset the log."
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "سجل aMule"
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2806
-msgid "Click on this button to update the servers list from URL ..."
-msgstr "قم بالضغط على هذا الزر لتحديث قائمة الخادمات من العنوان ..."
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2810
-msgid "Server list"
-msgstr "قائمة الخادمات"
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "إحتلال الخادم: %.2f%%"
 
-#: src/muuli_wdr.cpp:2815
-msgid ""
-"Enter the url to a server.met file here and press the button to the left to "
-"update the list of known servers."
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2822
-msgid "Add server manually: Name"
-msgstr ""
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "مجموع حجم ملفات المشاركة : %s"
 
-#: src/muuli_wdr.cpp:2826
-msgid "Enter the name of the new server here"
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2833
-msgid "Enter the IP of the server here, using the x.x.x.x format."
+#: src/Statistics.cpp:955
+msgid "Operating System"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2840
-msgid "Enter the port of the server here."
+#: src/Statistics.cpp:980
+msgid "Not Received"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2844
-msgid "Add manually a server (fill fields to the left before) ..."
-msgstr "اضف خادم يدويا )قم بمل الخانة على اليسار اوﻻ)..."
-
-#: src/muuli_wdr.cpp:2890
-msgid "ED2K Info"
-msgstr ""
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "إتصال نشط (1:%u)"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
-msgid "Kad Info"
+#: src/StatTree.cpp:550
+msgid "Not available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2923
-msgid "Click on this button to update the nodes list from URL ..."
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2927
-msgid "Nodes (0)"
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2932
-msgid ""
-"Enter the url to a nodes.dat file here and press the button to the left to "
-"update the list of known nodes."
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2937
-msgid "Nodes stats"
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2988
-msgid "Bootstrap"
+#: src/TextClient.cpp:323
+msgid ""
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2991
-msgid "New node"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2996
-msgid "IP:"
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:3025
-msgid "Port:"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3048
-msgid "Disconnect Kad"
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3096
-msgid "Protocol Obfuscation"
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3099
-msgid "Support Protocol Obfuscation"
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3101
-msgid ""
-"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
-"connections from other clients."
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3104
-msgid "Use obfuscation for outgoing connections"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3106
-msgid ""
-"This option makes aMule use Protocol Obfuscation when connecting other "
-"clients/servers."
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3109
-msgid "Accept only obfuscated connections"
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3110
-msgid ""
-"This option makes aMule only accept obfuscated connections. You will have "
-"less sources, but all your traffic will be obfuscated"
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3120
-msgid "Everybody"
-msgstr "الكل"
-
-#: src/muuli_wdr.cpp:3122
-msgid "No one"
+#: src/TextClient.cpp:699
+msgid "eD2k"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3125
-msgid "Select who can request to view a list of your shared files."
+#: src/TextClient.cpp:710
+msgid "Now connecting"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3130
-msgid "IP-Filtering"
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3137
-msgid "Filter clients"
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3139
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
+"\n"
+"Download:\t%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3142
-msgid "Filter servers"
+#: src/TextClient.cpp:737
+#, c-format
+msgid ""
+"\n"
+"Upload:\t%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3144
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
-"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
+"\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3151
-msgid "Reload List"
+#: src/TextClient.cpp:743
+#, c-format
+msgid ""
+"\n"
+"Total sources:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3152
-msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3160
-msgid "URL:"
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3166
-msgid "Update now"
-msgstr ""
+#: src/TextClient.cpp:832
+#, fuzzy
+msgid "Search progress not available"
+msgstr "%s غير متوفر"
 
-#: src/muuli_wdr.cpp:3171
-msgid "Auto-update ipfilter at startup"
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3176
-msgid "Filtering Level:"
+#: src/TextClient.cpp:850
+msgid "Show short status information."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3186
-msgid "Always filter LAN IPs"
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3190
-msgid "Paranoid handling of non-matching IPs"
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3192
+#: src/TextClient.cpp:854
 msgid ""
-"Rejects packet if the client ip is different from the ip where the packet is "
-"received from. Use with caution."
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
+"\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3195
-msgid "Use system-wide ipfilter.dat if available"
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3196
+#: src/TextClient.cpp:857
 msgid ""
-"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
-"file."
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3223
-msgid "Enable Online-Signature"
-msgstr "تمكين التوقيع الشبكي"
-
-#: src/muuli_wdr.cpp:3225
-msgid ""
-"Enables the writing of the OS file, which can be used by external apps to "
-"create signatures and the like."
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3230
-msgid "Update Frequency (Secs):"
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3234
-msgid "Change the frequency (in seconds) of Online Signature updates."
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "حدث server.met من العنوان"
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/TextClient.cpp:868
 msgid ""
-"Click here to select the directory containing the the Online Signature files."
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3271
-msgid "Filter incoming messages (except current chat):"
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3277
-msgid "Filter all messages"
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3280
-msgid "Filter messages from people not on your friend list"
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3283
-msgid "Filter messages from unknown clients"
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3286
-msgid "Filter messages containing (use ',' as separator):"
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
-msgid "add here the words amule should filter and block messages including it"
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
+"\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3302
-msgid "Comments"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3310
-msgid "Filter comments containing (use ',' as separator):"
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3339
-msgid "Enable Proxy"
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3340
-msgid "Enable/disable proxy support"
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3345
-msgid "Proxy type:"
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3359
-msgid "Proxy host:"
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3363
-msgid "The proxy host name"
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3366
-msgid "Proxy port:"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3370
-msgid "The proxy port"
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3424
-msgid "Connect to:"
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3438
-msgid "Login to remote amule"
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3443
-msgid "User name"
+#: src/TextClient.cpp:913
+msgid "Execute a search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3460
-msgid "Remember those settings"
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3492
-msgid "Enable Verbose Debug-Logging."
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3497
-msgid "Message Categories:"
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3550
-msgid "Add imports"
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3554
-msgid "Retry selected"
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3557
-msgid "Remove selected"
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr ""
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "إظهار شريط التقدم"
 
-#: src/muuli_wdr.cpp:3668
-msgid "Connect to any server and/or Kad"
-msgstr ""
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "إظهار شريط التقدم"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "نافذة البحث"
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "نافذة ملفات النقل"
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr ""
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "نافذة ملفات المشاركة"
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr ""
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "نافذة الرسائل"
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr ""
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "نافذة اﻻحصائيات"
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr ""
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "نافذة اﻹعدادات"
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr ""
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
 msgstr ""
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "اختر مكان الملفات القادمة"
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr ""
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
 msgstr ""
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
 msgstr ""
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
 msgstr ""
 
-#: src/ExternalConnector.cpp:141
-#, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:143
-#, c-format
-msgid "Unknown command '%s'.\n"
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
 msgstr ""
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/TextClient.cpp:952
+msgid "Show download queue."
 msgstr ""
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/TextClient.cpp:953
+msgid "Show log."
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
-msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+#: src/TextClient.cpp:954
+msgid "Show servers list."
 msgstr ""
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/TextClient.cpp:957
+msgid "Reset log."
 msgstr ""
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
+#: src/TextClient.cpp:964
+#, c-format
+msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/ExternalConnector.cpp:185
+#: src/TextClient.cpp:965
 #, c-format
 msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
+#: src/TextClient.h:60
+msgid "aMule text client"
 msgstr ""
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:243
+#: src/ThreadTasks.cpp:454
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr ""
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr "هل أنت متاكد من حذف كل الملفات في هذا المصنف؟"
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr ""
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "مطلوب التاكيد"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr ""
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "عدد اتصلات كثيرة"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
+#: src/TransferWnd.cpp:341
+msgid "All others"
 msgstr ""
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr ""
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "إختر فلتر العرض"
 
-#: src/ExternalConnector.cpp:297
-#, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr ""
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "اضف مجموعة"
 
-#: src/ExternalConnector.cpp:362
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "عرض المجموعة"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "الغاء المجموعة"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "This is %s %s %s\n"
+msgid "Failed to open file (%s), removing from list of shared files."
 msgstr ""
 
-#: src/ExternalConnector.cpp:364
+#: src/UploadClient.cpp:683
 #, c-format
-msgid "This is %s %s\n"
+msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:395
-msgid ""
-"\n"
-"Creating client...\n"
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:418
+#: src/UploadQueue.cpp:613
 #, c-format
-msgid ""
-"\n"
-"Ok, exiting %s...\n"
+msgid "Suspending upload of file: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:424
-msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
 msgstr ""
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
+#: src/UserEvents.h:60
+msgid "Download completed"
 msgstr ""
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
 msgstr ""
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
+#: src/UserEvents.h:84
+msgid "New chat session started"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
+#: src/UserEvents.h:87
+msgid "Message sender."
 msgstr ""
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
+#: src/UserEvents.h:92
+msgid "Out of space"
 msgstr ""
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/UserEvents.h:95
+msgid "Disk partition."
 msgstr ""
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
+#: src/UserEvents.h:100
+msgid "Error on completion"
 msgstr ""
 
-#: src/ClientCreditsList.cpp:168
-#, fuzzy, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "حمل ملف الرصيد, تم التعرف على %u عميل"
-msgstr[1] "حمل ملف الرصيد, تم التعرف على %u عميل"
-
-#: src/ClientCreditsList.cpp:171
-#, fuzzy, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] "الرصيد منتهى!"
-msgstr[1] "الرصيد منتهى!"
-
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/amuled.cpp:750
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "ERROR: %s"
+msgid "%s ---> Non existant file !\n"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "ﻻ تمنع"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "عرض الرفع"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "أظهر المنتظرين"
-
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "إنتظار"
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "زمن الرفع"
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "أولوية ملف"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "نتيجة"
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "طلب"
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "اخر مشاهدة"
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "داخل اﻻنتظار"
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "تفاصيل العميل"
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "غير مكتمل"
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "شخص سيئ"
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "تأكيد - صحيح"
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "غير متوفر"
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "بلا حدود"
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+#, fuzzy
+msgid "Cancelled !"
+msgstr "إلغاء"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
+#, c-format
+msgid "Done in %.2f s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:354
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "UL: %u"
-msgstr ""
-
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
+msgid "Unable to open %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:364
+#: src/utils/wxCas/src/linuxmon.cpp:86
 #, c-format
-msgid "DL: %u"
+msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:368
+#: src/utils/wxCas/src/onlinesig.cpp:234
 #, c-format
-msgid "Download speed: %.1f"
+msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "Upload speed: %.1f"
+msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
+#: src/utils/wxCas/src/onlinesig.cpp:240
 #, c-format
-msgid "Nickname: %s"
+msgid "%02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "هوية العميل: "
-
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "إسم الخادم: "
-
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "عنوان الخادم: "
-
-#: src/MuleTrayIcon.cpp:416
+#: src/utils/wxCas/src/onlinesig.cpp:342
 #, c-format
-msgid "IP: %s"
+msgid "%.2f KB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:425
+#: src/utils/wxCas/src/onlinesig.cpp:345
 #, c-format
-msgid "TCP port: %d"
+msgid "%.2f MB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:436
+#: src/utils/wxCas/src/onlinesig.cpp:351
 #, c-format
-msgid "UDP port: %d"
+msgid "%.2f TB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "توقيع أثناء الإتصال: ممكن"
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "توقيع أثناء الإتصال: معطل"
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:483
-#, c-format
-msgid "Total UL: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/ChatSelector.cpp:127
-#, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
 msgstr ""
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
 msgstr ""
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
 msgstr ""
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/ServerList.cpp:84
-#, c-format
-msgid "Loading server.met file: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
 msgstr ""
 
-#: src/ServerList.cpp:89
-msgid "Server.met file not found!"
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
 msgstr ""
 
-#: src/ServerList.cpp:97
-#, c-format
-msgid "Failed to load server.met file '%s', unknown format encountered."
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
 msgstr ""
 
-#: src/ServerList.cpp:103
-msgid "Failed to open server.met!"
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/ServerList.cpp:114
-#, c-format
-msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
 msgstr ""
 
-#: src/ServerList.cpp:169
-#, fuzzy, c-format
-msgid "%i server in server.met found"
-msgid_plural "%i servers in server.met found"
-msgstr[0] "%i خادمات وجدت في server.met"
-msgstr[1] "%i خادمات وجدت في server.met"
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr ""
 
-#: src/ServerList.cpp:171
-#, fuzzy, c-format
-msgid "%d server added"
-msgid_plural "%d servers added"
-msgstr[0] "%d خادم مضاف"
-msgstr[1] "%d خادم مضاف"
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr ""
 
-#: src/ServerList.cpp:192
-#, c-format
-msgid "Server not added: [%s:%d] does not specify a valid port."
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
 msgstr ""
 
-#: src/ServerList.cpp:208
-#, c-format
-msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
 msgstr ""
 
-#: src/ServerList.cpp:228
-#, c-format
-msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/ServerList.cpp:247
-#, c-format
-msgid "Server added: Server at [%s:%d] using the name '%s'."
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
 msgstr ""
 
-#: src/ServerList.cpp:342
-msgid ""
-"You are connected to the server you are trying to delete. please disconnect "
-"first."
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
 msgstr ""
 
-#: src/ServerList.cpp:629
-msgid "Failed to save server.met!"
-msgstr "فشل في حفظ server.met!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr ""
 
-#: src/ServerList.cpp:782
-msgid "Invalid URL"
-msgstr "عنوان شبكي غير صحيح"
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr ""
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
 msgstr ""
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
 msgstr ""
 
-#: src/ServerList.cpp:818
-msgid ""
-"No server list address entry in 'addresses.dat' found. Please paste a valid "
-"server list address into this file in order to auto-update your server list"
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
 msgstr ""
 
-#: src/ServerList.cpp:831
-#, c-format
-msgid "Start downloading server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
 msgstr ""
 
-#: src/ServerList.cpp:840
-#, c-format
-msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
 msgstr ""
 
-#: src/ServerList.cpp:844
-msgid "No valid server.met auto-download url on addresses.dat"
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
 msgstr ""
 
-#: src/ServerList.cpp:937
-msgid ""
-"Local server is filtered by the IPFilters, reconnecting to a different "
-"server!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
 msgstr ""
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
 msgstr ""
 
-#: src/amule.cpp:703
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
 msgstr ""
 
-#: src/amule.cpp:787
-msgid "Server list download"
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
 msgstr ""
 
-#: src/amule.cpp:846
-#, c-format
-msgid "web server running on pid %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/amule.cpp:850
-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"
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
 msgstr ""
 
-#: src/amule.cpp:937
-#, c-format
-msgid "Could not bind ports to the specified address: %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/amule.cpp:964
-#, c-format
-msgid "Port %u is not available. You will be LOWID\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/amule.cpp:970
-#, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
 msgstr ""
 
-#: src/amule.cpp:1308
-#, c-format
-msgid "This is the first time you run aMule %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
 msgstr ""
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
 msgstr ""
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "ﻻ نضمن انه خالي من اﻻخطاء, قد يتسبب باعطال\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr ""
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/amule.cpp:1316
-msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
 msgstr ""
 
-#: src/amule.cpp:1317
-msgid ""
-"\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1318
-msgid ""
-"\n"
-"* Disabled updating the server list from other server and clients.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1319
-msgid ""
-"\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/amule.cpp:1320
-msgid ""
-"\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
 msgstr ""
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
 msgstr ""
 
-#: src/amule.cpp:1341
-msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
 msgstr ""
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
 msgstr ""
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
 msgstr ""
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
 msgstr ""
 
-#: src/amule.cpp:1826
-#, c-format
-msgid "ServerMessage: %s"
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
 msgstr ""
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
 msgstr ""
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
 msgstr ""
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/amule.cpp:1907
-#, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/amule.cpp:1911
-#, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
 msgstr ""
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/amule.cpp:2025
+#: src/webserver/src/WebServer.cpp:370
 #, c-format
-msgid "Users: %s | Files: %s"
+msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/amule.cpp:2026
-#, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
 msgstr ""
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/amule.cpp:2102
-#, c-format
-msgid "Connected to %s %s"
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/amule.cpp:2105
-#, c-format
-msgid "Connecting to %s"
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/amule.cpp:2114
-msgid "Kad started."
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
 msgstr ""
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
 msgstr ""
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
 msgstr ""
 
-#: src/amule.cpp:2191
-msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
 msgstr ""
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
 msgstr ""
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
 msgstr ""
 
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "الأستونيه"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "تحميل"
+
+#, fuzzy
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "تحيدث كل:5 ثواني"
+#~ msgstr[1] "تحيدث كل:5 ثواني"
+
+#~ msgid "Transferring"
+#~ msgstr "نقل"
+
+#, fuzzy
+#~ msgid "Only files currently uploading"
+#~ msgstr "حاليا تحميل :"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "اﻻنتظار ممتلئ"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "تحميل"
+
+#~ msgid "Transfers"
+#~ msgstr "نقل"
+
+#~ msgid "Unban"
+#~ msgstr "ﻻ تمنع"
+
+#~ msgid "Show Uploads"
+#~ msgstr "عرض الرفع"
+
+#~ msgid "Show Queue"
+#~ msgstr "أظهر المنتظرين"
+
+#~ msgid "Waited"
+#~ msgstr "إنتظار"
+
+#~ msgid "Upload Time"
+#~ msgstr "زمن الرفع"
+
+#~ msgid "File Priority"
+#~ msgstr "أولوية ملف"
+
+#~ msgid "Score"
+#~ msgstr "نتيجة"
+
+#~ msgid "Asked"
+#~ msgstr "طلب"
+
+#~ msgid "Last Seen"
+#~ msgstr "اخر مشاهدة"
+
+#~ msgid "Entered Queue"
+#~ msgstr "داخل اﻻنتظار"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "عملاء في اﻻنتظار:"
+
+#~ msgid "Current Session"
+#~ msgstr "الجلسة الحالية"
+
+#~ msgid "Total"
+#~ msgstr "المجموع"
+
+#~ msgid "Requested :"
+#~ msgstr "طلب :"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "نافذة ملفات النقل"
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "تحميل (%i)"
+
+#, fuzzy
+#~ msgid "HTTP download thread ended"
+#~ msgstr "سعة نطاق التحميل الحقيقية"
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "فشل"
+
+#~ msgid "Line Capacities"
+#~ msgstr "قدرة الخط"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "حد أعلى للمصادر لكل ملف"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "إبدا الملف الموقف التالي عند اﻻنتهاء من ملف"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "اختر لون اﻻحصائيات"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "تقدم طابور ملفات التحميل"
+
+#~ msgid "Show percentage"
+#~ msgstr "إظهار نسبة مئوية"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. نشط"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "سمة شريط التطور"
+
+#~ msgid "Misc Options"
+#~ msgstr "خيرات متفرقة"
+
+#~ msgid "Max Connections"
+#~ msgstr "أعلى أتصال"
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "لم يحديد إمر لتشغيل المتصفح"
 
+#~ msgid "Copy ED2k link to clipboard"
+#~ msgstr "نسخ رابط ED2k للحافظة"
+
 #, fuzzy
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "نسخ رابط ED2k للحافظة"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "خطأ قاتل :فشل في تكوين الموَقت"
-
 #, fuzzy
 #~ msgid "ED2K: Connecting"
 #~ msgstr "يتم الإتصال"
@@ -7007,9 +7446,6 @@
 #~ msgid "Manual Server Add : Name"
 #~ msgstr "اضافة خادم يدويا : اسم"
 
-#~ msgid "No One"
-#~ msgstr "ﻻ احد"
-
 #~ msgid "TCP Port: Not Ready"
 #~ msgstr "منفذ TCP: غير جاهز"
 
@@ -7133,9 +7569,6 @@
 #~ msgid "Connect to any server"
 #~ msgstr "إتصل باي مستظيف"
 
-#~ msgid "You are not connected to a server!"
-#~ msgstr "أنت غير متصل بي مستظيف!"
-
 #~ msgid "This ed2k link is invalid (%s)"
 #~ msgstr "رابط ed2k غير صحيح (%s)"
 
@@ -7154,9 +7587,6 @@
 #~ msgid "Unable to retrieve shared files from '%s'"
 #~ msgstr "غير قادر علي استرجاعملف مشاركة من '%s'"
 
-#~ msgid "Requesting shared files from '%s'"
-#~ msgstr "طلب ملف مشاركة من '%s'"
-
 #~ msgid "Requesting shared files from user %s (%u) is already in progress"
 #~ msgstr "طلب ملفات المشاركةمن المستخدم %s (%u) في طور العمل"
 
@@ -7246,9 +7676,6 @@
 #~ msgid "can't write file '%s'"
 #~ msgstr "غير قادر لكتابة ملف '%s'"
 
-#~ msgid "New external connection accepted\n"
-#~ msgstr "قبل إتصال خارجي جديد\n"
-
 #~ msgid "done"
 #~ msgstr "إنتها"
 
@@ -7306,9 +7733,6 @@
 #~ msgid "Source Names"
 #~ msgstr "اسماء المصادر"
 
-#~ msgid "Reload"
-#~ msgstr "اعد تحميل"
-
 #~ msgid "Clientsoftware :"
 #~ msgstr "برنامج العميل :"
 
@@ -7324,9 +7748,6 @@
 #~ msgid "Servername :"
 #~ msgstr "اسم الخادم :"
 
-#~ msgid "Currently downloading :"
-#~ msgstr "حاليا تحميل :"
-
 #~ msgid "Downloaded (this session) :"
 #~ msgstr "حمل في الجلسة :"
 
@@ -7384,9 +7805,6 @@
 #~ msgid "Show Splashscreen"
 #~ msgstr "عرض شاشة ترحيب"
 
-#~ msgid "Clientport"
-#~ msgstr "منفذ العميل"
-
 #~ msgid "IP-Filter"
 #~ msgstr "فلتر -IP"
 
@@ -7453,9 +7871,6 @@
 #~ msgid "Error: %s (%s) is corrupt"
 #~ msgstr "خطأ : %s (%s) معطوب"
 
-#~ msgid "Error: %s (%s) is corrupt, unable to load file"
-#~ msgstr "خطأ: %s (%s) معطوب, غير قادر لتحميل الملف"
-
 #~ msgid ""
 #~ "Unexpected file error while reading server.met: %s, unable to load "
 #~ "serverlist"
@@ -7466,9 +7881,6 @@
 #~ msgid "Warning: %s might be corrupted"
 #~ msgstr "تحذير : %sقد يكون معطوب"
 
-#~ msgid "ERROR while saving partfile: %s (%s => %s)"
-#~ msgstr "خطأ أثناء حفظ ملف اجزاء: %s (%s => %s)"
-
 #~ msgid ".part file not found"
 #~ msgstr "ملف .partغير موجود"
 
@@ -7499,9 +7911,6 @@
 #~ msgid "ICH: Recovered corrupted part %i  (%s)"
 #~ msgstr "ICH: تم تصحيح الجزء المعطوب %i (%s)"
 
-#~ msgid "Unexpected file error while writing %s : %s"
-#~ msgstr "فشل غير متوقع اثناء كتابة ملف %s : %s"
-
 #~ msgid ""
 #~ "Partfilename: %s\n"
 #~ "Parts: %d , %s: %d (%.1f%%)\n"
@@ -7563,15 +7972,9 @@
 #~ msgid "Unable to retrieve serverlist"
 #~ msgstr "غير قادر على إسترجاع قائمة الخادمات"
 
-#~ msgid "Failed to download the serverlist from %s"
-#~ msgstr "فشل في تحميل قائمة الخادمات من %s"
-
 #~ msgid "Failed to load server.met!"
 #~ msgstr "فشل في تحميل server.met!"
 
-#~ msgid "Error: the file server.met is corrupted"
-#~ msgstr "خطأ: ملف server.met معطوب"
-
 #~ msgid "Server added: "
 #~ msgstr "خادم مضاف: "
 
@@ -7599,9 +8002,6 @@
 #~ msgid "Connecting to %s (%s:%i)..."
 #~ msgstr "إتصال بي %s (%s:%i)..."
 
-#~ msgid "Error while connecting to %s (%s:%i): %d"
-#~ msgstr "خطأ أثناء اﻹتصال بي%s (%s:%i): %d"
-
 #~ msgid "This is "
 #~ msgstr "هذا هو"
 
@@ -7665,9 +8065,6 @@
 #~ msgid "Refreshing server connection"
 #~ msgstr "إعادة تنشيط اﻹتصال بالخادم"
 
-#~ msgid "Filtered: %i"
-#~ msgstr "تم ترشيح : %i"
-
 #~ msgid "Uptime: "
 #~ msgstr "مدة التشغيل: "
 
@@ -7686,9 +8083,6 @@
 #~ msgid "Active Uploads: %i"
 #~ msgstr "تحميل نشط : %i"
 
-#~ msgid "Waiting Uploads: %i"
-#~ msgstr "تحميل ينتظر: %i"
-
 #~ msgid "Total successful upload sessions: %i"
 #~ msgstr "مجموع الجلسات الناجحة للتحميل :%i"
 
@@ -7710,21 +8104,12 @@
 #~ msgid "waiting for transfer..."
 #~ msgstr "بإنتظار التحميل ..."
 
-#~ msgid "waiting for connection..."
-#~ msgstr "بانتظار اﻻتصال ..."
-
 #~ msgid "Session UL:DL Ratio (Total):"
 #~ msgstr "نسبة الرفع للتحميل في الجلسة (المجموع):"
 
-#~ msgid "%s Not available"
-#~ msgstr "%s غير متوفر"
-
 #~ msgid "Number of Shared Files: %i"
 #~ msgstr "عدد ملفات المشاركة : %i"
 
-#~ msgid "Unknown: %i"
-#~ msgstr "غير معروف :%i"
-
 #~ msgid "Working Servers"
 #~ msgstr "خادم يعمل"
 
@@ -7743,9 +8128,6 @@
 #~ msgid "Total Users"
 #~ msgstr "مجموع المستخدمين"
 
-#~ msgid "Total Files"
-#~ msgstr "مجموع الملفات"
-
 #~ msgid "Active Connections (estimate)"
 #~ msgstr "إتصاﻻت نشطة تقديري"
 
@@ -7755,9 +8137,6 @@
 #~ msgid "Average Connections (estimate)"
 #~ msgstr "متوسط سرعة اﻻتصال تقديرية"
 
-#~ msgid "Peak Connections (estimate)"
-#~ msgstr "اعلى سرعة اتصال تقديرية"
-
 #~ msgid "Detection Disabled"
 #~ msgstr "الكشف عن المعطل"
 
@@ -7827,9 +8206,6 @@
 #~ msgid "requested file not found"
 #~ msgstr "لم يتم العثور على الملف المطلوب"
 
-#~ msgid "Failed to load template %s\n"
-#~ msgstr "فشل في تحميل النموذج %s\n"
-
 #~ msgid "Access denied!"
 #~ msgstr "رفض الدخول!"
 
@@ -7860,9 +8236,6 @@
 #~ msgid "Limits"
 #~ msgstr "حدود"
 
-#~ msgid "Server name"
-#~ msgstr "إسم الخادم"
-
 #~ msgid "files"
 #~ msgstr "ملفات"
 
@@ -7875,9 +8248,6 @@
 #~ msgid "Are you sure to remove this server from list?"
 #~ msgstr "هل انت متاكد من حذف الخادم من القائمة؟"
 
-#~ msgid "Downloaded total"
-#~ msgstr "مجموع التحميل"
-
 #~ msgid "Uploaded total"
 #~ msgstr "مجموع الرفع"
 
@@ -7899,9 +8269,6 @@
 #~ msgid "Add to list"
 #~ msgstr "أضف الى القائمة"
 
-#~ msgid "Update server.met from URL"
-#~ msgstr "حدث server.met من العنوان"
-
 #~ msgid "URL"
 #~ msgstr "عنوان"
 
@@ -7941,12 +8308,12 @@
 #~ msgid "Enter your password here"
 #~ msgstr "أدخل كلمة المرور هنا"
 
-#~ msgid "Login Now"
-#~ msgstr "تسجيل الدخول اﻻن"
-
 #~ msgid "Webserver: Logout"
 #~ msgstr "خادم شبكة: تسجيل الخروج"
 
+#~ msgid "Search Results"
+#~ msgstr "نتيجت البحث"
+
 #~ msgid "Refetch Results"
 #~ msgstr "إعادة جلب النتيجة"
 
@@ -7994,9 +8361,6 @@
 #~ msgid "Select your connection type here :"
 #~ msgstr "اختر نوع اﻻتصال هنا:"
 
-#~ msgid "True download bandwidth"
-#~ msgstr "سعة نطاق التحميل الحقيقية"
-
 #~ msgid "True upload bandwidth"
 #~ msgstr "سعة نطاق الرفع الحقيقية"

aMule-2.2.6.tar.bz2/po/ast.po -> aMule-2.3.1.tar.bz2/po/ast.po Changed

@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: new_ast\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-08-19 12:34+0100\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
@@ -18,1299 +18,1137 @@
 "X-Poedit-Language: Asturian\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Tienes d'especificar una contraseña non erma"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Contraseña incorreuta, nun ye un códigu MD5!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Fallu de conexón"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "La conexón EC falló. Rempuesta erma."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Conexón esterna: Accesu denegáu, xida:"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Conexón esterna: Accesu denegáu"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Conexón esterna: Rempuesta del sirvidor incorreuta. Conexón zarrada."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "¡Fecho! Conexón afitada con aMule"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "¡Fecho! Conexón afitada."
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Amestar a un Collaciu"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Codificando"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Ye necesario introducir una IP y puertu válidos"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Completando"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Información"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Completáu"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "¡El hash d'usuariu especificáu nun ye válidu!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Posáu"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Fallu al abrir ficheru ED2KLinks."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Erróneu"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"AVISU: Nun pues amestate a tí mesmu como una fonte pa un enllaz eD2k "
+"teniendo ID baxa."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Descargando"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Agora, saliendo de l'aplicación principal..."
+
+#: src/amule.cpp:258
+#, fuzzy, c-format
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Matando instancia amuleweb con pid `%ld' ... "
+
+#: src/amule.cpp:261
+#, fuzzy, c-format
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Matando instancia amuleweb con pid `%ld' ... "
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Aguardando"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Falló"
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Entamando a criar el hash MD4 y AICH del ficheru: %s"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: Terminando núcleu."
 
-#: src/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Entamando a criar el hash MD4 del ficheru: %s"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "Zarru d'aMule completáu."
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Entamando a criar el hash AICH del ficheru: %s"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Resultaos de depuración de memoria na salida d'aMule: "
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Convirtiendo antiguos hashsets AICH en  '%s' a 64b en '%s'."
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+"\n"
+"Configuración EC"
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "ALERTA: El nome de ficheru '%s' ye incorreutu y sedrá renomáu a '%s'."
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Contraseña fixada y conexones esternes habilitaes."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "ALERTA: El ficheru '%s' yá esiste, renomando el nuevu a '%s'."
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "ALERTA"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "ALERTA: Nun se pue desaniciar '%s' orixinal, criando copia de seguridá"
+#: src/amule.cpp:495
+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/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "ALERTA: Fallu al desaniciar %s"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Fallu al obtener la llista de compartíos del usuariu '%s'"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Nun tienes dengún sirvidor na llista de sirvidores.\n"
+"¿Quies que aMule descargue una nueva llista agora?"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Desconocíu"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Descarga llista de sirvidores"
 
-#: src/BaseClient.cpp:1738
+#: src/amule.cpp:654
 #, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Versión Falsa eMule %#x)"
+msgid "web server running on pid %d"
+msgstr "sirvidor web corriendo con pid: %d"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Falsu eMule)"
+#: src/amule.cpp:658
+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 ""
+"Solicitaste executar el sirvidor web al aniciu pero nun pudo correse'l "
+"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/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Falsu eMule)"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "FALLU"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:741
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (basáu en eMule v0.%u)"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Nun ye dable direicionar los puertos a la direición especificada: %s"
 
-#: src/BaseClient.cpp:1960
+#: src/amule.cpp:768
 #, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Nomatu:  %s ID: %u"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "El puertu %u nun ta disponible. Tendrás IDBaxa\n"
 
-#: src/BaseClient.cpp:1962
+#: src/amule.cpp:774
 #, c-format
-msgid "Requested: %s\n"
-msgstr "Solicitáu: %s\n"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Puertu %u nun ta disponible!\n"
+"\n"
+"Esto significa que tendrás IDBaxa.\n"
+"\n"
+"Comprueba la to rede y asegúrate de que'l puertu ta abiertu pa entrada y "
+"salida."
 
-#: src/BaseClient.cpp:1964
-#, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Estadístiques de ficheru pa esta sesión: %d Aceutada de %d petición, %s "
-"tresfería\n"
-msgstr[1] ""
-"Estadístiques de ficheru pa esta sesión: %d Aceutaes de %d peticiones, %s "
-"tresferíes\n"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Fallu al criar el ficheru de RoblaOnline"
 
-#: src/BaseClient.cpp:1967
-#, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Estadístiques de ficheru pa toles sesiones: %d Aceutada de %d petición, %s "
-"tresfería\n"
-msgstr[1] ""
-"Estadístiques de ficheru pa toles sesiones: %d Aceutaes de %d peticiones, %s "
-"tresferíes\n"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Fallu al criar el ficheru de RoblaOnline aMule"
 
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Solicitáu un ficheru desconocíu"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"La llingua seleicionada nun paez tar instalada. (Nota: Tentará de ponese de "
+"toes formes)"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:1040
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Veceru %s en IP:Puertu %s:%d usando %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Nome d'usuariu"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Collacios"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Amosar &Detalles"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Amestar un collaciu"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Desaniciar collaciu"
+msgid "This is the first time you run aMule %s"
+msgstr "Ye la primer vegada qu'anicies aMule %s"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Unviar &Mensax"
+#: src/amule.cpp:1042
+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/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Ver ficheros"
+#: src/amule.cpp:1043
+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"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Afitar puestu reserváu a un collaciu"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "o fila la to sidra. Pero *tendría* de ser seguru de toes formes. \n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "¿Daveres quies desaniciar al collaciu seleicionáu?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Podrás alcontrar na nuesa web, más información, sofitu y nueves versiones, \n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "¿Daveres quies desaniciar a los collacios seleicionaos?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"en www.aMule.org, o nel nuesu canal de IRC #aMule en irc.freenode.net. \n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Encaboxar"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Unvíanos cualesquier fallu a http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Nun se-y permite asignar más d'ún puestu reserváu.\n"
-" Namái s'asignó un puestu reserváu."
+"El direutoriu qu'especificaste de Robla Online nun ye válidu\n"
+"La Robla Online deshabilitóse hasta que lo igües nes opciones."
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Seleición múltiple"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Nome sirvidor notificáu"
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Descarga fecha ensembre"
-
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "El camín completu al ficheru."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "La reserva del espaciu en discu pal ficheru '%s' falló: %s"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "El nome del ficheru ensin el camín."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "FALLU: nun puede abrise'l ficheru de rexistru"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "El hash eD2k del ficheru."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "ALERTA: el ficheru de rexistru ta ermu. Hai daqué mal."
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "El tamañu del ficheru en bytes."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "El rexistru resetióse"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Tiempu d'actividá de descarga acumuláu."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Mensax del sirvidor: %s"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Aniciada Nueva sesión de charra"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Remitente del mensax."
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Fallu al descargar la llista de nodos."
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Ensin espaciu"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Fallu al abrir el ficheru de comprobación de versión descargáu"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Partición de discu"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Ficheru de comprobación de versión toyíu"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Fallu completando"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "¡Tas usando una versión antigua de aMule!"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Nome de ficheru"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "La to versión de aMule ye %i.%i.%i y la cabera versión ye %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Tamañu"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "La cabera versión pues alcontrala siempres en http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Triba"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "ALERTA: La to versión de aMuled ye obsoleta: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioridá"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "LA to copia de aMule ta actualizada."
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "ID Ficheru"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Fallu al descargar el ficheru de comprobación de versión"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Peticiones"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Usuarios: %s | Ficheros: %s"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Peticiones aceutaes"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Usuarios: E: %s K: %s | Ficheros: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Datos tresferíos"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Ensin redes seleicionaes"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Media Compartíu"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "con IDBaxa"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Partes obteníes"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "con IDAlta"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Fontes completes"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Coneutáu a %s %s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Direutoriu"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Coneutando a %s"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Fich compartíos"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Desconeutáu de eD2k"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Mui baxa"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad aniciáu."
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Baxa"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad deteníu."
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normal"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Coneutáu a Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Alta"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Coneutáu a Kad (tres torgafueos)"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Mui alta"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Desconeutáu de Kad"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Llanzamientu"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Red Kad nun pue usase si'l puertu UDP ta deshabilitáu n'opciones, non "
+"aniciando."
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Auto"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Red Kad deshabilitada n'opciones, nun coneutará."
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Amestar Comentariu/Valoración"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"ERROR: el daemon d'aMule nun pue usase cuando tán desactivaes les conexones "
+"esternes. P'activales, use o bien un aMule normal, anicie amuled cola opción "
+"--ec-config, o bien, afite \"AcceptExternalConnections\" a 1, nel ficheru ~/."
+"aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Editar Comentariu/Valoración"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"ERROR: Contraseña válida ye requería pa usar conexones esternes y el demoniu "
+"aMule nun pue usase ensin conexones esternes. P'aniciar el demoniu aMule, "
+"tienes d'especificar nel campu \"ECPassword\" del ficheru ~/.aMule/amule."
+"conf col valor apropiáu. Executa amuled col parámetru --ec-config pa "
+"especificar la contraseña. Más información pue alcontrase en http://wiki."
+"amule.org"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: EnAniciu - Aniciando reló"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: derivando al fondu - vémonos"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Nun puede Crease un Ficheru Pid"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Renomar"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "ERROR: %s"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Amestar ficheros en colleición a la llista de descargues"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Esto ye aMule %s basáu en eMule."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Copiar &URL magnéticu al cartafueyos"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Executándose en %s"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Copiar l'en&llaz eD2k al cartafueyos."
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Visita http://www.amule.org pa comprobar si hai una nueva versión disponible"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Copiar l'enllaz eD2k al cartafueyos (&Fonte)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "FALLU GRAVE: Nun pudo criase'l temporizador"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Copiar l'enllaz eD2k al cartafueyos (Fonte) (&Con opciones de cifráu)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Control remotu de aMule"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Copiar l'enllaz eD2k al cartafueyos (&Nome del host)"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Versión:"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
-"Copiar l'enllaz eD2k al cartafueyos (Nome del host) (Co&n opciones de cifráu)"
+"Veceru p2p multiplataforma basáu en eMule \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Copiar l'enllaz eD2k al cartafueyos (Información &AICH)"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Web: http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Copiar rempuesta al cartafueyos"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Foru: http://forum.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:504
 msgid ""
-"Feedback from: %s (%s)\n"
+"FAQ: http://wiki.amule.org \n"
 "\n"
 msgstr ""
-"Reaición dende: %s (%s)\n"
+"FAQ: http://wiki.amule.org \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Necesites IDAlta pa criar un enllaz fonte válidu"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "ALERTA"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Ficheros Compartíos (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[Ficheru part]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Introduza'l nuevu nome pa esti ficheru:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Renomar ficheru"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Resumiendo xubíes del ficheru: %s"
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Suspendiendo xuba del ficheru: %s"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Contautar: admin@amule.org (problemes alministrativos) \n"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "Veceru de testu aMule"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: pallabra de gueta enforma curtia"
-
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Lleíu %u contautu Kad"
-msgstr[1] "Lleíos %u contautos Kad"
-
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Namái %d contautu Kad disponible, nodes.dat non escritu"
-msgstr[1] "Namái %d contautos Kad disponible, nodes.dat non escritu"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (C) 2003-2011 Equipu aMule \n"
+"\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Escritu %d contautu Kad"
-msgstr[1] "Escritos %d contautos Kad"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Parte d'aMule básase en \n"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "FALLU: Nun pue escuchase nel puertu TCP."
-
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "conexón aceutada del veceru web\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Direicionamientu P2P basáu na métrica XOR.\n"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "FALLU: nun pue aceutase la conexón del veceru web\n"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Mensax"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Solicitú fallía col siguiente fallu: %s."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "Diálogu aMule afaráu"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Solicitú fallía con un fallu desconocíu."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Coneutando"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Ficheru índiz non alcontráu: "
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Coneutando"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Sesión finada - solicitando conexón\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Desconeutáu"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sesión ok, coneutáu\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Tres Tornafueos"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sesión ok, non coneutáu\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Coneutáu"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Nun hai denguna sesión - coneute de nuevu\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Coneutando"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Sesión criada - solicitando conexón\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Apagada"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Procesando solicitú [orixinal]: "
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Encaboxar"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Comprobando contraseña\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Detener los intentos de conexón actuales"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Hash de la contraseña incorreutu\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Desconeutar"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Contraseña ok\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Desconeutase de les redes coneutaes"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Contraseña incorreuta\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Coneutar"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr ""
-"Nun introduxisti denguna contraseña. Nun ta permitía una contraseña en "
-"blancu.\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Coneutase a les redes disponibles"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Desconexón solicitada\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Xu: %.1f(%.1f) | Desc: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Procesando solicitú [redirixía]: "
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Xu: %.1f | Desc: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Carga la plantía <str>"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Coneutáu)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Puertu HTTP del sirvidor web"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Desconeutáu)"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Usar forwarding de puertos UPnP nel puertu del sirvidor web"
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Daveres quies colar de aMule?"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Puertu UPnP"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Confirmar colar."
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Usar compresión gzip"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Llanzar comandu:"
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- Por defeutu -"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Contraseña d'accesu total pal sirvidor web"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "El direutorio de tema '%s' nun esiste"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Contraseña d'invitáu pa sirvidor web"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "ATENCIÓN: Nun pue abrise'l ficheru de temes '%s' pa llectura"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Permitir accesu a invitáu"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Redes"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Denegar accesu a invitáu"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Ventana de redes"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Cargar/guardar la configuración del sirvidor web dende/a aMule remotu"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Guetar"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Camín al ficheru config de aMule. ¡NUN USAR DIREUTAMENTE!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Ventana de gueta"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Deshabilitar intérprete PHP (desusu)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Descargues"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Recompila páxines PHP pa otra solicitú"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Descargando"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Sirvidor Web aMule"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Ficheros compartíos"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Non disponible"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Ventana de ficheros compartíos"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Enxamás"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Mensaxes"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Descargando..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Ventana de mensaxes"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Estadístiques"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "Esperábense %d bytes pero descargáronse %d bytes"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Ventana de gráficos d'estadístiques"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Preferencies"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Direutoriu que contién el ficheru amulesig.dat"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Desaminar"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Introduz el direutoriu au s'alluga'l to ficheru amulesig.dat"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Intervalu de refrescu en segundos"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Xenerar un ficheru d'estadístiques siempres que s'actualice"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Ventana d'opciones"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Introduz el direutoriu au quies xenerar la imaxe d'estadístiques"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Xube periódicamente la to imaxe d'estadístiques al sirvidor FTP"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "La ferramienta pa importar ficheros part"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "Url FTP"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Tocante a"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Direutoriu FTP"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Tocante a/Aida"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Introduz la URL del to sirvidor FTP"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Rede eD2k"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
-"Introduz el direutoriu del to sirvidor FTP au poner la to imaxe "
-"d'estadístiques"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Rede Kad"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Usuariu"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Ensin rede"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Contraseña"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "control remotu de aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Introduz el nome d'usuariu pa coneutate al to sirvidor FTP"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Introduz la contraseña d'usuariu pa coneutate al to sirvidor FTP"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Fallu Grave: Nun pudo criase'l temporizador"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Intervalu d'actualización de FTP en minutos"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Coneutar a amule remotu"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Validáu"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Fallu Grave: Nun pudo criase'l temporizador"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Diendo a eventu bucle..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Coneutando..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Direutoriu que contién el to ficheru de robla"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Conexón fallida"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Direutoriu au se xenera la imaxe d'estadístiques"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Remanador d'eventu EC n'Interface Remota"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Baxando"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i día(es) %i hora(es) %i min %i s"
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Fallu de conexón. Nun ye dable coneutar a %s:%d\n"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, Estadístiques aMule en llinia"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Zarróse la conexón - ye dable que aMule finare."
+
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Llistu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "¡Bienllegáu!"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Toos"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
+"Nun puede crease'l direutoriu '%s' pa la categoría '%s', calteniendo "
+"direutoriu '%s'."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Máximu índiz Desc dende que wxCas ta executándose: "
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Desconocíu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Máximu índiz Desc absolutu durante execuciones anteriores de wxCas"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Fallu al obtener la llista de compartíos del usuariu '%s'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Reafitar"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Guetando a un collaciu con conexón idbaxa"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistema"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Versión Falsa eMule %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Parar auto recargar"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Falsu eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Salvar imaxe d'estadístiques en llinia"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Falsu eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Imprentar imaxe d'estadístiques en llinia"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (basáu en eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Opciones"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Nomatu:  %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Tocante a wxCas"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Solicitáu: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Aniciar Auto Recargar"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Estadístiques de ficheru pa esta sesión: %d Aceutada de %d petición, %s "
+"tresfería\n"
+msgstr[1] ""
+"Estadístiques de ficheru pa esta sesión: %d Aceutaes de %d peticiones, %s "
+"tresferíes\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Auto recargar, deteníu"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Estadístiques de ficheru pa toles sesiones: %d Aceutada de %d petición, %s "
+"tresfería\n"
+msgstr[1] ""
+"Estadístiques de ficheru pa toles sesiones: %d Aceutaes de %d peticiones, %s "
+"tresferíes\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Auto recargar, aniciáu"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Solicitáu un ficheru desconocíu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Salvar imaxe d'estadístiques"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Mensax fieltráu de '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Estadístiques aMule en llinia"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nuevu mensax de '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"Hebo un fallu imprentando.\n"
-"Seique la to imprentadora actual nun tea configurada"
+"Usuariu %s (%u) solicitó la to llista de ficheros compartíos del direutoriu %"
+"s-> Refugada"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Imprentando"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, fuzzy, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "ALVERTENCIA: nun puede abrise known.met."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/CanceledFileList.cpp:61
+#, fuzzy
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
-"wxCas, Estadística de robla en llinia de aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Eeepa, aMule nun ta executándose..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule yá ta executándose"
+"AVISU: Ficheru de llista de compartíos corruptu, tien una testera inválida."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule ta executándose, pero ta desconeutáu"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "IO error lleendo'l ficheru known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule ta coneutando..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Fallu guardando ficheru known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh Oh, l'estáu d'aMule ye desconocíu..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Inxertar Captcha"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Categoría"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " foi executáu durante "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nueva Categoría"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " ¡ ta deteníu !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Seleiciona un direutoriu pa los ficheros entrantes"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " ¡ nun ta coneutáu !"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "¡Tienes d'especificar un nome pa la categoría!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " ta coneutando..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "¡Tienes d'especificar un camín pa la categoría!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " ta faciendo daqué raro, ¡ compruébalo !"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"¡Fallu al criar el direutoriu entrante de la categoría. Por favor "
+"especifique un camín correutu!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " ta coneutáu a "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Sesión Charra Aniciada: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Coneutáu al Veceru ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Coneutando al veceru ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "tres tornafueos"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Fallu al coneutar col veceru / Conexón perdía ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "apagáu"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr "*** Aprobóse'l captcha, y l'usuariu recibirá'l to mensax. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " coneutáu "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** La to rempuesta al captcha nun ye correuta y el to mensax va inorase. "
+"Puedes solicitar otru captcha unviando un mensax nuevu. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " con "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Total Descargáu: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Zarrar llingüeta"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Xubío:"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Zarrar toles llingüetes"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Descarga de sesión"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Zarrar les otres llingüetes"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Descargáu:"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Amestar a collacios"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Xuba: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Ficheru de créditos cargáu, %u veceru conocíu"
+msgstr[1] "Ficheru de créditos cargáu, %u veceros conocíos"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - ¡Caducó'l créditu de %u veceru!"
+msgstr[1] " - ¡Caducaron los créditos de %u veceros!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Compartiendo:"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Ficheru 'cryptkey.dat' nun alcontráu, criando."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " ficheru(os), Veceros na cola: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Detalles del veceru"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Tiempu:"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "ID-Baxa"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "ID-Alta"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " en "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Habilitáu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Media de carga del sistema (1-5-15 min): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Sofitáu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Tiempu d'execución del sistema: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Non sofitáu"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Deshabilitáu"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Coneutáu"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Desconeutáu"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02us"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "ID-Alta"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "ID-Baxa"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Non completáu"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Non coneutáu"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Veceru sospechosu"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Verificáu - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Non disponible"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr ""
+"Usuariu %s (%u) solicitó la to llista de ficheros compartíos -> Aceutada"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+"Usuariu %s (%u) solicitó la to llista de ficheros compartíos -> Refugada"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "¡ Encaboxáu !"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"Usuariu %s (%u) solicitó la to llista de direutorios compartíos -> Aceutada"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "Unable to open %s"
-msgstr "Nun ye dable abrir %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Parámetros d'entrada"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Ficheru a codificar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Amestar URLs opcionales pa esti ficheru"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Introduz equí el ficheru del que quieras calcular l'enllaz eD2k"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+"Usuariu %s (%u) solicitó la to llista de direutorios compartíos -> Refugada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Introduz equí la URL que quies amestar al enllaz eD2k: Amiesta / al final pa "
-"permitir a aLinkCreator amestar el nome del ficheru actual"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Amestar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Desaniciar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Llimpiar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Criar enllaz con hashes de partes"
+"Usuariu %s (%u) solicitó la to llista de ficheros compartíos del direutoriu %"
+"s -> Aceutada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Aida pa separtar ficheros nuevos y raros más aína, el costu sedrá un tamañu "
-"d'enllaz mayor"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Hash de ficheru MD4"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "Hash de ficheru eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "Enllaz eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Entamar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Guardar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Copiar al cartafueyos"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Colar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Abrir"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Abrir un ficheru pa calcular el so enllaz eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Copiar l'enllaz eD2k calculáu al cartafueyos"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Guardar como"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Guardar l'enllaz eD2k calculáu nun ficheru"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Tocante a"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Tocante a aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Seleiciona el ficheru del que quieras calcular l'enllaz eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Nun pue abrise'l cartafueyos"
+"Usuariu %s (%u) solicitó la to llista de ficheros compartíos del direutoriu %"
+"s-> Refugada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "¡Res pa copiar agora!"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Usuariu %s (%u) direutorios compartíos %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Seleiciona'l ficheru pal enllaz eD2k calculáu"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Usuariu %s (%u) unviáu direutorios compartíos non solicitaos."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Imposible abrir"
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr ""
+"Usuariu %s (%u) unviada la llista de ficheros compartíos por direutoriu %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Por favor, introduz un nome de ficheru"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Usuariu %s (%u) finó l'unvíu de la llista de ficheros compartíos"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "¡Nun hai res agora pa guardar!"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Usuariu %s (%u) unviada la llista de ficheros compartíos non deseyada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
-"aLinkCreator, el criador d'enllaces eD2k de aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Imáxenes dende http://www.everaldo.com y http://www.icomania.com\n"
-"y http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distribuyíu baxo la llicencia GPL"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Calculando hash..."
+"Usuariu %s (%u) refugó l'accesu a la llista de direutorios/ficheros "
+"compartíos"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator trabayando pa ti"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Comentarios de ficheru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Calculando MD4 Hash..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Nome d'usuariu"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Calculando eD2k Hashes..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Nome de ficheru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Fináu en %.2f s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Valoración"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "¡ Yá amestaste esa URL !"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Comentariu"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Por favor, introduz una URL"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Ensin comentarios"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Procesando númberu de ficheru %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Entrugaste por hashes de partes (Namái usáu por ficheros > 9.5 MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u comentariu"
+msgstr[1] "%u comentarios"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s --->¡ Nun esiste'l ficheru !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, el criador d'enllaces eD2k p'aMule"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"Veceru %s baneáu por unviar %s datos toyíos de %s en total pal ficheru '%s'"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1324,31 +1162,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Al]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Coneutando"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Mui baxa"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Baxa"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normal"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Alta"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Mui alta"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Llanzamientu"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Entrugando"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Coneutando vía sirvidor"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Cola enllena"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "Na cola"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Tresfiriendo"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Descargando"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1374,8 +1238,7 @@
 msgid "Too many Kad connections"
 msgstr "Abondes conexones Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Baneáu"
 
@@ -1407,8 +1270,8 @@
 msgid "Remote Server"
 msgstr "Sirvidor remotu"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1432,8 +1295,8 @@
 msgid "Search Result"
 msgstr "Resultáu de la gueta"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Completáu"
 
@@ -1457,7 +1320,7 @@
 msgid "ERROR: Failed!"
 msgstr "ERROR: Falló!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "En cola"
 
@@ -1469,875 +1332,308 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Formatu de ficheru temp incorreutu o desconocíu."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Por defeutu"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albanés"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Árabe"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturianu"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Euskera"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Búlgaru"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Catalán"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Chinu (simplificáu)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Chinu (Tradicional)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Croata"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Parte"
 
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Checu"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Danés"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Holandés"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Inglés (U.K.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estoniu"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finlandés"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Francés"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Gallegu"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Alemán"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Griegu"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hebréu"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Húngaru"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italianu"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italianu (Suizu)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Xaponés"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Coreanu"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lituanu"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Noruegu"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Tamañu"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polacu"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Tresferío"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugués"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Velocidá"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugués (Brasil)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Progresu"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Rusu"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Fontes"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Eslovenu"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioridá"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Español"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Estáu"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Suecu"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Tiempu Restante"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turcu"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Cabera comprobación completa"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ucranianu"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Cabera receición"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "¡Nun se pue determinar el restolador seleicionáu!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "¿De xuru quies desaniciar esti ficheru?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"Puertu TCP nun pue ser más altu de 65532 darréu que'l socket del sirvidor "
-"UDP ye TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "¿De xuru quies desaniciar estos ficheros?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Puertu por defeutu que s'usará (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Nome del Sirvidor"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Direición"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Puertu"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Descripción"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Usuarios"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Ficheros"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Falló"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Sirvidor fixu"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versión"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Tas coneutáu a un sirvidor, que tas tentando desaniciar. Desconéutate "
-"enantes. El sirvidor NUN se desaniciará."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Nome desconocíu)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "De xuru quies desaniciar el sirvidor fixu %s"
+"Reaición dende: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Sí"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Non"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Detener"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Fallu al abrir '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Posar"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Sirvidores (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Reanudar"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Sirvidor"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "&Llimpiar completaos"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Coneutar al sirvidor"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Intercambiar toles fontes (A4AF) a esti ficheru"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Conseñar como sirvidor fixu"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Intercambiar toles fontes (A4AF) a esti ficheru (Auto)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Conseñar como sirvidor non-fixu"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Intercambiar toles fontes (A4AF) a otru ficheru"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Conseñar sirvidores como fixos"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Opciones estendíes"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Conseñar sirvidores como non-fixos"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Previsualizar"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Desaniciar sirvidor"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Amosar detalles fi&cheru"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Desaniciar sirvidores"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Amosar tolos comentarios"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Desaniciar tolos sirvidores"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Copiar la URL magnético al cartafueyos"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Copiar l'enllaz eD2k al cartafueyos"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Copiar l'en&llaz eD2k al cartafueyos."
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Copiar los enllaces eD2k al cartafueyos"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Copiar rempuesta al cartafueyos"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Reconeutar al sirvidor"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "non asignáu"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "¿De xuru quies desaniciar tolos sirvidores?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Asignar a categoría"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "¿De xuru quies desaniciar el sirvidor seleicionáu?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Abrir el ficheru"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "¿De xuru quies desaniciar los sirvidores seleicionaos?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Introduza'l nuevu nome pa esti ficheru:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Deshabilitáu [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Renomar ficheru"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Esto ye aMule %s basáu en eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Executándose en %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Visita http://www.amule.org pa comprobar si hai una nueva versión disponible"
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "FALLU GRAVE: Nun pudo criase'l temporizador"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Control remotu de aMule"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Versión:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" Veceru p2p multiplataforma basáu en eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Web: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Foru: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Contautar: admin@amule.org (problemes alministrativos) \n"
+msgid "Downloads (%i)"
+msgstr "Descargues (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 Equipu aMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Parte d'aMule básase en \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Direicionamientu P2P basáu na métrica XOR.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (c) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Mensax"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Coneutando"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Desconeutáu"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Tres Tornafueos"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Coneutáu"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Coneutando"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Apagada"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Detener los intentos de conexón actuales"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Desconeutar"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Desconeutase de les redes coneutaes"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Coneutar"
+"Pa prevenir l'apaición d'esta alvertencia en cada vista previa,\n"
+"afita'l to reproductor de vídeos nes preferencies (mplayer por defeutu)."
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Coneutase a les redes disponibles"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Previsualizar"
 
-#: src/amuleDlg.cpp:810
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Xu: %.1f(%.1f) | Desc: %.1f(%.1f)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr ""
+"ERROR:¡Fallu al executar un reproductor de medios esternu! Comandu: `%s'"
 
-#: src/amuleDlg.cpp:812
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Xu: %.1f | Desc: %.1f"
+msgid "Saving PartFile %u of %u"
+msgstr "Guardando ficheru part %u de %u"
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Coneutáu)"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Tolos ficheros part atroxaos."
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Desconeutáu)"
+msgid "Loading temp files from %s."
+msgstr "Cargando ficheros temporales dende %s."
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Daveres quies colar de aMule?"
-
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Confirmar colar."
-
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "El direutorio de tema '%s' nun esiste"
-
-#: src/amuleDlg.cpp:1187
-#, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "ATENCIÓN: Nun pue abrise'l ficheru de temes '%s' pa llectura"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Redes"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Ventana de redes"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Guetar"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Ventana de gueta"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Tráficu"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Ventana de tresferencia de ficheros"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Ficheros compartíos"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Ventana de ficheros compartíos"
+msgid "Loading PartFile %u of %u"
+msgstr "Cargando ficheru part %u de %u"
 
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Mensaxes"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Ventana de mensaxes"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Estadístiques"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Ventana del gráficu de les estadístiques"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Ventana de la configuración de les preferencies"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importar"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "La ferramienta pa importar ficheros part"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Tocante a/Aida"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "Rede eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Rede Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Ensin rede"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Xeneral"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Conexón"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Direutorios"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Sirvidores"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Seguridá"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Interface"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Fieltros"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Controles remotos"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Robla online"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Avanzáu"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Eventos"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Debugging"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Definíu pol usuariu"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"aMule tien de reaniciase p'aplicar los cambeos:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- Puertu TCP camudáu.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- Puertu UDP camudáu.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"La to llista Auto-actualizable de sirvidores ta erma.\n"
-"La llista de sirvidores auto-anovable al entamu desactivaráse."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Tienes habilitao les conexones externes, pero nun tienes especificada una "
-"contraseña.\n"
-"Les conexones externes nun puen ser habilitaes sacante qu'especifiques una "
-"contraseña válida."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Llingua camudada.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Direutoriu TEMP camudáu.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- Rede ED2K activada.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Xu: 0.0 | Desc: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"eD2k y Kad tán desactivaos.\n"
-"Nun podrás coneutate hasta qu'actives a lo menos ún d'ellos."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad nun s'aniciará si'l to puertu UDP ta deshabilitáu.\n"
-"Habilita un puertu UDP o deshabilita Kad."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"Hai de reaniciar aMule agora.\n"
-"Si nun reanicies agora, nun sabemos si pasará daqué malo.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"La to auto-actualización de llista de sirvidores ta en blanco.\n"
-"Por favor introduz a lo menos una URL con un ficheru server.met válidu.\n"
-"Click nel botón \"Llista\" d'esta caxella  pa introducir una URL."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Ficheros temporales"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Ficheros entrantes"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Robles online"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Escueye una carpeta pa %s"
+"ERROR: Nun pudo cargase'l ficheru de copia de seguridá. Llea en http://forum."
+"amule.org p'alcontrar soluciones de recuperación d'archivos part.met."
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Esplorar"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Tolos ficheros part cargaos."
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Seleiciona restolador"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Nun s'alcontraron ficheros .part"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Executable%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Editar llista de sirvidores"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Alcontróse %u parte de ficheru"
+msgstr[1] "Alcontráronse %u partes de ficheru"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Amesta equí les URL's pa descargar los ficheros server.met.\n"
-"Namái una url per llinia."
+"El sistema de ficheros del direutoriu Temporal, nun pue remanar ficheros "
+"grandes."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Intervalu d'actualización: %d seg"
-msgstr[1] "Intervalu d'actualización: %d segs"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"El sistema de ficheros del direutoriu Entrante, nun pue remanar ficheros "
+"grandes."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Tiempu mediu del gráficu: %d min"
-msgstr[1] "Tiempu mediu del gráficu: %d mins"
+msgid "Downloading %s"
+msgstr "Descargando %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Escala gráfica de conexones: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Yá tas descargando esti ficheru '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Intervalu d'actualización: %d seg"
-msgstr[1] "Intervalu d'actualización: %d segs"
+msgid "You already have the file '%s'"
+msgstr "Yá tienes esti ficheru '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Tamañu del buffer de ficheru: %d byte"
-msgstr[1] "Tamañu del buffer de ficheru: %d bytes"
+msgid "You are already trying to download the file %s"
+msgstr "Yá tas descargando el ficheru %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Tamañu de la cola de xuba: %d veceru"
-msgstr[1] "Tamañu de la cola de xuba: %d veceros"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Nun pue convertise l'enllaz magnet a eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Intervalu de refrescu de la conexón al sirvidor: %d minutu"
-msgstr[1] "Intervalu de refrescu de la conexón al sirvidor: %d minutos"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Intervalu de refrescu de la conexón al sirvidor: Deshabilitáu"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Puertu UDP pa peticiones del sirvidor (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "deshabilitáu"
+msgid "Unknown protocol of link: %s"
+msgstr "Protocolu desconocíu del enllaz: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Executar comandu nel eventu `%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Habilitar execución de comandu nel núcleu"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Comandu del núcleu:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Habilitar execución de comandu na Interface"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Comandu de la Interface: "
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Les siguientes variables trocaránse:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Enllaz eD2k inválidu! FALLU: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Intentu d'accesu non autorizáu. Conexón zarrada."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "El veceru unvió un paquete dempués que falló l'autenticación."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Conexón esterna zarrada."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "¡Conexones esternas deshabilitaes darréu d'una contraseña en blanco!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Conexones esternas deshabilitaes nel ficheru de configuración"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Nueva conexón esterna, aceutada"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "FALLU: nun pudo aceutase una nueva conexón esterna"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "¡Conexón esterna refugada darréu d'una contraseña en blanco nes opciones!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Coneutando con veceru: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Versión desconocía"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2345,2224 +1641,1062 @@
 "EC Incorreutu na ID de versión, tien d'haber una incompatibilidá. Usa núcleu "
 "y remotu de la mesma versión."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 "¡Nun pues coneutar a una versión final dende una versión SVN cualesquiera! "
 "*sigh* dable fallu evitáu"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Autenticación fallía"
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Versión de protocolu non válida"
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Marcador de versión de protocolu inesistente"
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "Autenticación fallía"
+
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "Autenticación fallía"
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr "Solicitú non válida, tendríes d'autenticate primero."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Accesu concedíu."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, fuzzy, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Fieltrar mensaxes de veceros desconocíos"
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Intentu d'accesu non autorizáu. Conexón zarrada."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 "Fallu en comandu remotu del ficheru Part: Hash de ficheru non alcontráu: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Hash de ficheru non alcontráu: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "¡OOPS! ¡Fallu procesando OpCode!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Sirvidor non amestáu"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "sirvidor non amestáu: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "necesites definir un sirvidor pa desanicialu"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k ta desabilitáu nes preferencies"
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Gueta en procesu. Resultaos obteníos aína! "
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Gueta web dende un interface remotu nun tien xacíu"
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad ta deshabilitáu n'opciones."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Ensin puntos pal gráficu."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "El to veceru nun ta configuráu pa esti nivel de detalle."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Conexón esterna: apagáu solicitáu"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Yá tas zarrando."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Conexón esterna: amestando enllaz '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Enllaz non válidu o yá ta na llista."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Ficheru non alcontráu"
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Nome de ficheru incorreutu"
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Nun ye dable renomar ficheru"
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad ta deshabilitáu n'opciones."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Yá tas coneutáu a eD2k."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Coneutando a eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Yá tas coneutáu a Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Coneutando a Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Toles redes tán deshabilitaes"
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Desconeutando de eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Desconeutando de Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Conexón esterna: recibíu códigu d'operación inválidu: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "opcode non válidu (¿versión de protocolu incorreuta?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Fallu al abrir el ficheru (%s), desaniciando de la llista de compartíos."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Hashset solicitáu de ficheru desconocíu: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Comandu `%s' con pid `%d' finó con códigu `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Sirvidor non amestáu: IP o nome de host non especificáu."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Sirvidor non amestáu: Sirvidor-puertu especificáu non válidu."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Estáu de eD2k:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Coneutáu"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Puertu"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Estáu Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Executando"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Estáu:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Desconeutáu"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Estáu de conexón:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Tres Tornafueos"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "Aceutar"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Estáu tres tornafueos:"
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Coneutando a collaciu"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Non collaciu"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Media d'usuarios:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Media de ficheros:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Non executando"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Tiempu d'execución: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Tresferencia"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Xubíes"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Datos xubíos (Sesión (Total)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Total por tráficu escedente (Paquetes): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Escedente por peticiones de ficheru (Paquetes): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Escedente por intercambéu de fontes (Paquetes): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Tráficu escedente de sirvidores (Paquetes): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Tráficu escedente Kad (Paquetes): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Cifráu escedente (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Xubíes actives: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Xubíes n'espera: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Total de xubíes satisfactories: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Total de xubíes fallíes: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Tiempu mediu de xuba: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Descargues"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Datos descargaos (Sesión (Total)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Fontes alcontraes: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Descargues actives (partes): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Índiz XU:DE Sesión (Total): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Velocidá media de descarga (Sesión): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Velocidá media de xuba (Sesión): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Velocidá máxima de descarga (Sesión): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Velocidá máxima de xuba (Sesión): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Reconexones: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Tiempu dende la primer tresferencia: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Coneutáu al sirvidor dende: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Conexones actives (estimáu): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Algamóse'l llímite máximu de conexones: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Media de conexones (estimáu): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Picu de conexones (estimáu): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Veceros"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Fieltráu"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Total: %i Conocíu(os): %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Sirvidores activos: %i"
-
-#: src/Statistics.cpp:716
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Failed Servers: %i"
-msgstr "Sirvidores cayíos: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Total: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Sirvidores desaniciaos: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Sirvidores fieltraos: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Usuarios en sirvidores activos: %llu"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Estensión desconocía '%s' pal comandu '%s'.\n"
 
-#: src/Statistics.cpp:721
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Ficheros en sirvidores activos: %llu"
+msgid "Unknown command '%s'.\n"
+msgstr "Comandu desconocíu '%s'.\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Usuarios totales: %llu"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Esti comandu nun tien un argumentu.\n"
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "Ficheros totales: %llu"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Esti comandu tien de tener un argumentu.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Ocupación de Sirvidores: %.2f%%"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Esti comandu ta incompletu, tienes d'usar una de les estensiones....\n"
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Númberu de ficheros compartíos: %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Estensiones disponibles:\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Tamañu total de ficheros compartíos: %s"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Comandos disponibles:\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Average file size: %s"
-msgstr "Tamañu mediu de ficheru: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Sistema Operativu"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Non recibíu"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Apegar"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Esbillar too"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Nun se pue guetar en Kad si nun ta coneutáu a Kad"
-
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "Nun pue facese una gueta en eD2k si nun se ta coneutáu a eD2k"
-
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Fallu non esperáu mentantu tentaba guetar en Kad: "
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Tolos comandos son sensibles a les mayúscules.\n"
+"Teclea '%s <comandu>' pa obtener información detallao del <comandu>.\n"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Mensax fieltráu de '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Colar de l'aplicación."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nuevu mensax de '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Amosar aida"
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
-"Usuariu %s (%u) solicitó la to llista de ficheros compartíos -> Aceutada"
+"Pa tener aida d'un comandu, teclea 'help <comandu>'.\n"
+"Pa tener la llista completa de comandos, teclea 'help'.\n"
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
-"Usuariu %s (%u) solicitó la to llista de ficheros compartíos -> Refugada"
+"\n"
+"Usa '%s' pa la llista de comandos\n"
+"\n"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"Usuariu %s (%u) solicitó la to llista de direutorios compartíos -> Aceutada"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "¡Fallu de sintaxis!"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
-"Usuariu %s (%u) solicitó la to llista de direutorios compartíos -> Refugada"
+"Fallu procesando'l comandu - ¡enxamás tendría de pasar! Informa del fallu, "
+"por favor\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"Usuariu %s (%u) solicitó la to llista de ficheros compartíos del direutoriu %"
-"s -> Aceutada"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Esti comandu nun tendría de tener dengún parámetru"
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"Usuariu %s (%u) solicitó la to llista de ficheros compartíos del direutoriu %"
-"s-> Refugada"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Esti comandu tien de tener un parámetru."
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Usuariu %s (%u) direutorios compartíos %s"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Argumentu non válidu."
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Usuariu %s (%u) unviáu direutorios compartíos non solicitaos."
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Esto ye un comandu incompletu."
 
-#: src/ClientTCPSocket.cpp:1025
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr ""
-"Usuariu %s (%u) unviada la llista de ficheros compartíos por direutoriu %s"
+msgid "Type '%s' to get more help.\n"
+msgstr "Teclea '%s' pa tener más aida.\n"
 
-#: src/ClientTCPSocket.cpp:1032
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Usuariu %s (%u) finó l'unvíu de la llista de ficheros compartíos"
+msgid "This is %s %s %s\n"
+msgstr "Esto ye %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1037
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Usuariu %s (%u) unviada la llista de ficheros compartíos non deseyada"
+msgid "This is %s %s\n"
+msgstr "Esto ye %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
-"Usuariu %s (%u) refugó l'accesu a la llista de direutorios/ficheros "
-"compartíos"
+"\n"
+"Criando veceru...\n"
 
-#: src/KadDlg.cpp:132
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Nodes (%u)"
-msgstr "Nodos (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "IP non válida pa coneutar"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Puertu non válidu pa coneutar"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Por favor enllene tolos campos requeríos"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "¿De xuru quies descargar un nuevu nodes.dat?\n"
-
-#: src/KadDlg.cpp:197
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Si lo faes, desaniciarás tolos tos nodos actuales y reaniciarás la conexón "
-"Kademlia."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "¿Siguir?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "FALLU:"
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "AVISU:"
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Amestar a un Collaciu"
+"\n"
+"Ok, colando %s...\n"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Ye necesario introducir una IP y puertu válidos"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
+"Nun ye dable coneutar con una contraseña en blanco.\n"
+"Tienes d'especificar una contraseña nel ficheru config\n"
+"o na llinia de comandos, o introduz una cuando t'entrugue.\n"
+"\n"
+"Colando...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Información"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Amosar esta aida."
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "¡El hash d'usuariu especificáu nun ye válidu!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Host au ta executándose aMule. (por defeutu: localhost)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Fontes"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Puertu de conexón esterna de aMule. (por defeutu: 4712)"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Ficheru"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Contraseña de conexones esternes"
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Descarga"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Lleer configuración dende'l ficheru."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Categoría"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Nun amueses denguna salida."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Principal"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Mou Estendíu - amuesa tamién los mensaxes de depuración"
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Descargar na categoría"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Seleiciona la llingua del programa."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Guetar ficheros rellacionaos (eD2k, gueta llocal)"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Escribe opciones de la llinia de comandu al ficheru de configuración."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Conseñar como ficheru conocíu"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr ""
+"Criar ficheru de configuración basáu nel ficheru de configuración de aMule."
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Coneutar a amule remotu"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Imprenta versión del programa."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Conexón fallida"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Detalles del ficheru"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "FALLU"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% fináu."
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Fallu de conexón. Nun ye dable coneutar a %s:%d\n"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
-"AVISU: Nun pues amestate a tí mesmu como una fonte pa un enllaz eD2k "
-"teniendo ID baxa."
+"¡ Nun pudo abrise'l ficheru de collacios 'emfriends.met' pa la so llectura !"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Usuarios: E: %s K: %s | Ficheros E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+"¡ Nun pudo abrise'l ficheru de collacios 'emfriends.met' pa la so escritura !"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Toos"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "CRITICU - ensin veceru en sesión charra d'aniciu"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Total Usuarios: %s | Total Ficheros: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Collacios"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Tresferío"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Amosar &Detalles"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Velocidá"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Amestar un collaciu"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Progresu"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Desaniciar collaciu"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Estáu"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Unviar &Mensax"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Tiempu Restante"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Ver ficheros"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Cabera comprobación completa"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Afitar puestu reserváu a un collaciu"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Cabera receición"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "¿Daveres quies desaniciar al collaciu seleicionáu?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "¿De xuru quies desaniciar esti ficheru?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "¿Daveres quies desaniciar a los collacios seleicionaos?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "¿De xuru quies desaniciar estos ficheros?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Nun se-y permite asignar más d'ún puestu reserváu.\n"
+" Namái s'asignó un puestu reserváu."
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Seleición múltiple"
+
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Unviar mensax al usuariu"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Mensax a unviar:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Detener"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Posar"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Reanudar"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "&Llimpiar completaos"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Intercambiar toles fontes (A4AF) a esti ficheru"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Intercambiar toles fontes (A4AF) a esti ficheru (Auto)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Intercambiar toles fontes (A4AF) a otru ficheru"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Opciones estendíes"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Previsualizar"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Amosar detalles fi&cheru"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Amosar tolos comentarios"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Copiar la URL magnético al cartafueyos"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "non asignáu"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Asignar a categoría"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Abrir el ficheru"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Desaniciar de collacios"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Amestar a collacios"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Unviar mensax"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Intercambia esti ficheru"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "LC: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Pidióse otru ficheru"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Descargues (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Pa prevenir l'apaición d'esta alvertencia en cada vista previa,\n"
-"afita'l to reproductor de vídeos nes preferencies (mplayer por defeutu)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Previsualizar"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr ""
-"ERROR:¡Fallu al executar un reproductor de medios esternu! Comandu: `%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "ERROR: Fallu al criar el ficheru part"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Intentando cargar copia de seguridá del ficheru met dende %s"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ERROR: Nun pudo abrise'l ficheru part.met: %s ===> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ERROR: el ficheru part.met tien tamañu 0: %s ===> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ERROR: Versión de ficheru part.met Inválida: %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"ERROR: %s (%s) ta toyíu (cuenta d'etiquetes errónea), nun se pue cargar el "
-"ficheru."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Intentando recuperar info de ficheru..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "Recuperando ficheru ensin nome - recuperarase como RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "Recuperóse tola info disponible del ficheru :D - Tentando usala..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Nun pudo recuperase la info de ficheru..."
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Fallu al abrir %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "AVISU: %s pue tar toyíu (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "FALLU salvando ficheru part: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Nun pue recuperase la duración de '%s' - usando'l ficheru %s."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "de dalgún mou el tamañu de '%s' ye 0 - usando ficheru %s."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Fallu al guardar ficheru part.met.seeds por %s"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Guardáu %i semiente de fontes en ficheru part: %s (%s)"
-msgstr[1] "Guardaes %i semientes de fontes en ficheru part: %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Ficheru part %s (%s) nun tien ficheru de semientes"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Xubíes n'espera: %s"
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Ficheru part %s (%s) tien un ficheru de semientes ermu"
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "Na cola"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Fallu lleendo semientes del ficheru part (%s - %s): %s"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Xuba"
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Parte toyía alcontrada (%i) en %d parte del ficheru %s - Resultáu del hash "
-"del ficheru |%s| Hash del ficheru |%s|"
-msgstr[1] ""
-"Parte toyía alcontrada (%i) en %d partes del ficheru %s - Resultáu del hash "
-"del ficheru |%s| Hash del ficheru |%s|"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Dengún"
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Parte (%i) completa alcontrada en %s"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Non"
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Recodificación finada %s"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Sí"
 
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Fallu inesperáu mientres se completaba %s. Ficheru posáu"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Descargando..."
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Descarga finada: %s"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "Descarga HTTP encaboxada"
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Desaniciando ficheru: %s"
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "Carpeta de destín pa les descargues"
 
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
-"AVISU: Nun pue criase'l hash de la parte descargada, set de hashes "
-"incompletu pa '%s'"
 
-#: src/PartFile.cpp:2389
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
-"ERROR: Nun pue criase'l hash de la parte descargada, set de hashes "
-"incompletu pa (%s). Esto nun tendría de pasar enxamás"
-
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "AVISU: Nun hai espaciu llibre nel discu! Posando ficheru: %s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Parte descargada %i toyía nel ficheru: %s"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Recuperada parte toyía %i de %s -> Bytes salvaos: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Asignando"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Espaciu en discu insuficiente"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Deteníu"
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Descargáu"
-
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ERROR: Fallu al abrir ficheru part '%s'"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "ALVERTENCIA: nun puede abrise known.met."
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
-"AVISU: Ficheru de llista de compartíos corruptu, tien una testera inválida."
-
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "IO error lleendo'l ficheru known.met: %s"
-
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Fallu guardando ficheru known.met: %s"
-
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Alcontróse %i ficheru compartíu"
-msgstr[1] "Alcontráronse %i ficheros compartíos"
-
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Alcontróse %i ficheru compartíu, %i desconocíu"
-msgstr[1] "Alcontráronse %i ficheros compartíos, %i desconocíos"
 
-#: src/SharedFileList.cpp:367
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "FALLU: Tentando compartir %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Comentarios de ficheru"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Valoración"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Comentariu"
+msgid "Downloaded %d bytes"
+msgstr "Descargaos %d bytes"
 
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Ensin comentarios"
-
-#: src/CommentDialogLst.cpp:104
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u comentariu"
-msgstr[1] "%u comentarios"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Esperábense %d bytes pero descargáronse %d bytes"
 
-#: src/ServerConnect.cpp:69
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"Fallu al coneutar a tolos sirvidores ofuscaos llistaos. Tentándolo de nuevu "
-"ensin ofuscación."
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Fallu al coneutar a tolos sirvidores."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "Protocolu eD2k deshabilitáu nes preferencies, nun se coneuta."
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Reconeutar al sirvidor"
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
-"Nun s'alcontraron sirvidores válidos pa coneutar na llista de sirvidores"
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Coneutáu a %s (%s:%i)"
-
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Conexón afitada en: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr "Fallu fatal coneutando. La conexón a Internet podría tar desactivada"
-
-#: src/ServerConnect.cpp:339
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Conexón perdía con %s (%s:%i)"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Descargar nuevu GeoIP.dat dende %s"
 
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) paez tar cayíu."
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "Fallu al descargar ficheru GeoIP.dat, albortando actualización."
+
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
+#, fuzzy, c-format
+msgid "Failed to remove %s file, aborting update."
+msgstr "Fallu al desaniciar el ficheru GeoIP.dat, albortando actualización."
+
+#: src/IP2Country.cpp:140
+#, fuzzy, c-format
+msgid "Failed to rename %s file, aborting update."
+msgstr "Fallu al renomar el nuevu ficheru GeoIP.dat, albortando actualización."
+
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
+#, fuzzy, c-format
+msgid "Successfully updated %s"
+msgstr "Actualizacion GeoIP.dat satisfactoria"
+
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Fallu actualizando GeoIP.dat"
+
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Fallu al descargar GeoIP.dat dende %s"
+
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Fallu al descargar GeoIP.dat dende %s"
+
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Cargando fieltros IP 'ipfilter.dat' y 'ipfilter_static.dat'"
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) paez tar enllenu."
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "Fallu al cargar ipfilter.dat '%s', alcontráu formatu desconocíu."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Reintentaráse la conexón automática al sirvidor en %d segundu"
-msgstr[1] "Reintentaráse la conexón automática al sirvidor en %d segundos"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Conexón perdida"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "Fallu al cargar ipfilter.dat '%s', nun ye dable abrir el ficheru."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Coneutando con %s (%s:%i) fallíu"
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ERROR: Socket inválidu al comprobar el timeout"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Cargáu %u rangu IP dende '%s'."
+msgstr[1] "Cargáu %u rangos IP dende '%s'."
 
-#: src/ServerConnect.cpp:460
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Intentu de conexón con %s (%s:%i) tiempu escosáu."
-
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-"ERROR: Nun pudo cargase'l ficheru de copia de seguridá. Llea en http://forum."
-"amule.org p'alcontrar soluciones de recuperación d'archivos part.met."
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Nun s'alcontraron ficheros .part"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u llinia malformada descartóse"
+msgstr[1] "%u llinies malformaes descartáronse"
 
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Alcontróse %u parte de ficheru"
-msgstr[1] "Alcontráronse %u partes de ficheru"
+#: src/IPFilter.cpp:503
+#, fuzzy, c-format
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Fallu al renomar el nuevu ficheru GeoIP.dat, albortando actualización."
 
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
-"El sistema de ficheros del direutoriu Temporal, nun pue remanar ficheros "
-"grandes."
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"El sistema de ficheros del direutoriu Entrante, nun pue remanar ficheros "
-"grandes."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Descargando %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Yá tas descargando esti ficheru '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Yá tienes esti ficheru '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Yá tas descargando el ficheru %s"
+"Coneutar dende \n"
+"veceros conocíos"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Nun pue convertise l'enllaz magnet a eD2k: %s"
+msgid "Nodes (%u)"
+msgstr "Nodos (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Protocolu desconocíu del enllaz: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "IP non válida pa coneutar"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Enllaz eD2k inválidu! FALLU: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Puertu non válidu pa coneutar"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Executa <str> y cuela."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Por favor enllene tolos campos requeríos"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Formatu IP non válidu. Usa xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "¿De xuru quies descargar un nuevu nodes.dat?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Esti comandu requier un argumentu. Argumentos válidos: 'all (too)' o un "
-"númberu.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Procesando por hash: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Procesando por nome de ficheru: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr ""
-"Esti comandu requier un argumentu. Argumentos válidos: un hash de ficheru.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Númberu inválidu\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Hash non válidu (la llonxitú tendría de ser esautamente 32 carauteres)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Operación satisfactoria."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Solicitú fallía col siguiente fallu: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "El Fieltru IP pa veceros ye %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "APAGÁU"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "ENCENDÍU"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "El Fieltru IP pa sirvidores ye %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "El nivel de fieltráu de IP actual ye %d.\n"
+"Si lo faes, desaniciarás tolos tos nodos actuales y reaniciarás la conexón "
+"Kademlia."
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Llímites del anchor de banda: Xuba: %u kB/s, Baxada: %u kB/s\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "¿Siguir?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: pallabra de gueta enforma curtia"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Coneutáu a %s %s %s"
+msgid "Keyword for search: %s"
+msgstr "Pallabra clave pa gueta: %s"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "con IDBaxa"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: Pallabra de gueta enforma curtia:"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "con IDAlta"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Coneutando agora"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Non coneutáu"
-
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Descarga:\t%s"
 
-#: src/TextClient.cpp:726
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"Xuba:\t%s"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Lleíu %u contautu Kad"
+msgstr[1] "Lleíos %u contautos Kad"
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Veceros na cola:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
+msgstr "Contautos non alcontraos, por favor descarga un ficheru nodes.dat."
 
-#: src/TextClient.cpp:732
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
-msgstr ""
-"\n"
-"Fontes totales:\t%d\n"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Namái %d contautu Kad disponible, nodes.dat non escritu"
+msgstr[1] "Namái %d contautos Kad disponible, nodes.dat non escritu"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Númberu de resultaos de la gueta: %i\n"
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Escritu %d contautu Kad"
+msgstr[1] "Escritos %d contautos Kad"
 
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TOU - amuesa'l progresu d'una gueta"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Nome ficheru"
 
-#: src/TextClient.cpp:828
-#, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Recibióse una rempuesta desconocía dende'l sirvidor, OpCode = %#x."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Tamañu ficheru"
 
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Amosar una información curtia sobro l'estáu."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Media compartío"
 
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Amosar estáu de conexón, velocidá xuba/descarga actual, etc.\n"
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Xubío"
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Amosar árbol d'estadístiques ensembre."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Pidío"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Opcionalmente, un númberu ente 0-255 pue ser un argumentu d'esti comandu,\n"
-"que diz cuántes entraes del árbol de versión de veceru tendríen d'amosase.\n"
-"Con 0 o ensin valor significa 'ensin llímite'.\n"
-"\n"
-"Exemplu: 'statistics 5' amosará namái les 5 versiones que más se repiten de "
-"cualesquier veceru.\n"
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Aceutao"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Finar aMule."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Fontes completes"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Finar el núcleu remotu (amule/amuled) en funcionamientu.\n"
-"Esto finará tamién el veceru mou testu, darréu que nun se pue\n"
-"usar ensin un núcleu en funcionamientu.\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Recargar l'oxetu dau."
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Recargar llista de ficheros compartíos."
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Recargar tabla de fieltru de IP dende ficheru."
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Coneutáu a la rede."
+"AVISU: Ficheru de llista de compartíos corruptu, tien una testera inválida."
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"Esto coneutará a toles redes que tean habilitaes nes opciones.\n"
-"Opcionalmente tamién puedes especificar un sirvidor de forma IP:Puertu, pa\n"
-"coneutar a esi sirvidor namái. La IP tien de ser una direición IPv4,\n"
-"o un nome DNS."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Coneutar namái a eD2k."
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Coneutar namái a Kad"
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Desconeutáu de la rede."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Esto desconeutaráte de toles redes nes que tas coneutáu nesti intre.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Desconeutar de eD2k namái."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Desconeutar de Kad namái."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Amiesta un enllaz eD2k o magnet al núcleu."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"El enllaz eD2k a amestar pue ser:\n"
-"*) un enllaz a un ficheru (ed2k://|file|...),amestaráse a la cola de "
-"descargues,\n"
-"*) un enllaz a un sirvidor (ed2k://|server|...), amestaráse a la llista de "
-"sirvidores,\n"
-"*) o un enllaz a una llista de sirvidores, en talu casu, tolos sirvidores na "
-"llista\n"
-"amestaránse a la llista de sirvidores.\n"
-"\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Asigna un valor d'opción"
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Asignar opciones de fieltráu de IP."
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Activa el fieltru pa veceros y sirvidores."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Desactiva el fieltru pa veceros y sirvidores."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Activa/Desactiva el fieltru IP pa veceros."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Activa el fieltru pa veceros."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Desactiva el fieltru pa veceros."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Activa/Desactiva el fieltru pa sirvidores."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Activa el fieltru pa sirvidores."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Desactiva el fieltru pa sirvidores."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Seleición nivel de fieltráu de IP"
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
-msgstr ""
-"Niveles válidos nel fieltru 0-255, y el valor por defeutu (inicial)\n"
-"ye 127.\n"
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Versión desconocía"
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Asignar llímites d'anchor de banda."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Carpeta de destín pa les descargues"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "El valor dau a estos comandos han ser en kilobytes/seg.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Asignar un llímite de xuba."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Codificando"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Asignar un llímite de descarga."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Completando"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Obtener y amosar un valor d'opciones"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Completáu"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Obtener opciones de fieltráu de IP"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Posáu"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Obtener estáu del fieltru IP pa veceros y sirvidores."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Erróneu"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Obtener estáu del fieltru IP pa veceros."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Aguardando"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Obtener estáu del fieltru IP pa sirvidores."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Tienes d'especificar una contraseña non erma"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Obtener nivel de fieltráu de IP."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Contraseña incorreuta, nun ye un códigu MD5!"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Obtener llímites d'anchor de banda."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Fallu de conexón"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Fai una gueta."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "La conexón EC falló. Rempuesta erma."
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
-"Una gueta por triba, tien d'especificase la triba:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Exemplu: 'search kad ficheru' executara una gueta en kad de \"ficheru\".\n"
+"Conexón esterna: Rempuesta del sirvidor incorreuta, falló handshake. Conexón "
+"zarrada."
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Fai una gueta global."
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Fai una gueta llocal."
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Fai una gueta en kad."
-
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Amuesa los resultaos de la cabera gueta."
-
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Devuelve los resultaos de la gueta anterior.\n"
-
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Amuesa'l progresu d'una gueta."
-
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Amuesa'l progresu d'una gueta.\n"
-
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Entamar descargando un ficheru"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "¡Fecho! Conexón afitada con aMule"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"El númberu d'un ficheru de la cabera gueta tien de dase.\n"
-"Exemplu: 'download 12' aniciará la descarga del ficheru col númberu 12 de la "
-"gueta anterior.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "¡Fecho! Conexón afitada."
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Posar descarga."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Conexón esterna: Accesu denegáu, xida:"
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Resumir descarga."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Conexón esterna: Falló handshake."
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "Socket d'escucha: Ok"
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Encaboxar descarga."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "FALLU: Nun pue escuchase nel puertu TCP."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Asignar prioridá de descarga."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "FALLU:"
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Fixa prioridá de la descarga a Baxa, Normal, Alta o Auto.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "AVISU:"
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Afitar la prioridá a baxa."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Zarrar"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Afitar la prioridá a normal."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Cortar"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Afitar la prioridá a alta."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Copiar"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Afitar la prioridá a auto."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Apegar"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Amosar coles/llistes."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Llimpiar"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Amosar cola xuba/descarga, llista de sirvidores o llista de ficheros "
-"compartíos.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Esbillar too"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Amosar cola de xuba"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Amosar cola de descarga."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Illimitáu"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Amosar rexistru."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Menú aMule"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Amosar llista de sirvidores."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Llímites de velocidá"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Llimpiar rexistru."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "XU: Dengún"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Comandu en desusu, usa %s."
+msgid "UL: %u"
+msgstr "XU: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Esti ye un comandu en desusu, y desaniciaráse nel futuru.\n"
-"Usa '%s' en so llugar.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DE: Denguna, "
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ERROR: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "DE: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "AVISU: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Velocidá de descarga: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "El nuevU ID-Veceru ye %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "AVISU: ¡Recibiste ID-Baxa!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tEsto asocede porque tas darrera d'un torgafueos o d'un router."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tPa mas información, por favor ve a http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Velocidá de xuba: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "¡Información recibía del sirvidor desconocía! - enforma pequeña"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Información del veceru"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Recibíu %d nuevu sirvidor"
-msgstr[1] "Recibiéronse %d nuevos sirvidores"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Guardáu de llista de sirvidores fechu."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "El sirvidor refuga'l caberu comandu"
+msgid "Nickname: %s"
+msgstr "Nomatu: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Paquete bogus recibíu dende'l sirvidor: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "¡Dengún nomatu conseñáu!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Fallu mientres que se taba procesando un paquete dende'l sirvidor: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID Veceru:"
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Nun pue criase un filu de resolución de DNS pa coneutar con %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Non coneutáu"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "Sirvidor IP %s (%s) ta fieltráu. Nun coneutará."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Nome del sirvidor: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "usando ofuscación de protocolu."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP del sirvidor: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Coneutando a %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Non coneutáu"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Imposible resolver dns pal sirvidor %s: ¡Imposible coneutar! "
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Fallu al cargar el datu del país dende "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Cargada %d semeya de bandera."
-msgstr[1] "Cargaes %d semeyes de banderes."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr "¿Daveres quies encaboxar y desaniciar tolos ficheros d'esta categoría?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Requierse Confirmación"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Ensin catalogar"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Incompletu"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Activu"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Vídeu"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Audio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Ficheru"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Imáxenes de CD"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Imáxenes"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Testu"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Seleicionar fieltru de vistes"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Amestar categoría"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Editar categoría"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Desaniciar categoría"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Nome ficheru"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Tamañu ficheru"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Media compartío"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Xubío"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Pidío"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Aceutao"
+msgid "TCP port: %d"
+msgstr "Puertu TCP: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Fontes completes"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "Puertu TCP: Nun ta llistu"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Importando %s: %s"
+msgid "UDP port: %d"
+msgstr "Puertu UDP: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Lleendo direutoriu temp"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "Puertu UDP: Nun ta llistu"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Obteniendo información básica de ficheru info de descarga"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Robla Online: Activada"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Criando ficheru de destín"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Robla Online: Desactivada"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Cargando datos dende l'antigua descarga del ficheru (%u de %u)"
+msgid "Uptime: %s"
+msgstr "Tiempu d'execución: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Atroxando bloque de datos nun nuevu ficheru de descarga (%u de %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Obteniendo información del ficheru fonte de descarga"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Amestando descarga y guardando nuevu ficheru part"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importar ficheros part"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Estáu"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Hash de ficheru"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Esperando..."
+msgid "Shared files: %d"
+msgstr "Ficheros compartíos: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Discu: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"¡Por favor escueye un direutoriu pa guetar por descargues temporales! "
-"(incluyiránse subdireutorios)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"¿Quies que los ficheros fonte d'una descarga importada satisfactoriamente "
-"seyan desaniciaos?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "¿Desaniciar fontes?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/seg"
-msgstr[1] "bytes/seg"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "segs"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "mins"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "hores"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Díes"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Videos"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Archivos"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Testos"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programes"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Toos"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Non evaluada"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Inválidu / Toyíu / Falsificación"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Probe"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Aceutable"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Bonu"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Mui bonu"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "too"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "el restu"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Cargando fieltros IP 'ipfilter.dat' y 'ipfilter_static.dat'"
+msgid "Queued clients: %d"
+msgstr "Veceros na cola: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Fallu al cargar ipfilter.dat '%s', alcontráu formatu desconocíu."
+msgid "Total DL: %s"
+msgstr "Total DE: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "Fallu al cargar ipfilter.dat '%s', nun ye dable abrir el ficheru."
+msgid "Total UL: %s"
+msgstr "Total XU: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Cargáu %u rangu IP dende '%s'."
-msgstr[1] "Cargáu %u rangos IP dende '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Llímite de xuba"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u llinia malformada descartóse"
-msgstr[1] "%u llinies malformaes descartáronse"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Llímite de descarga"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Conexones actives (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Anubrir aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Detalles del ficheru"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Amosar aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% fináu."
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Colar"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "Enllaz eD2k:"
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Unviar"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Fai Click equí p'amestar l'enllaz eD2k de la entrada de testu de control a "
 "la cola de descargues."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4570,19 +2704,19 @@
 "Los eventos son amosaos equí. Pa una llista completa d'eventos, empobina al "
 "rexistru de la llingüeta de sirvidores."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Cargando ..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Númberu d'usuarios nel sirvidor al que tas coneutáu ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Usuarios: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4591,6 +2725,10 @@
 "d'usuarios."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Xu: 0.0 | Desc: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4598,7 +2736,7 @@
 "Índiz actual de xubíes y descargues. Si habilites los númberos signifiquen "
 "los gastos indireutos na comunicación del veceru."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4610,521 +2748,579 @@
 "d'un torgafueos) y les verdes que tienes ID-Alta (La triba de conexón ye "
 "bona)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Non Coneutáu ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Coneutáu al sirvidor."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Guetar"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Triba"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Llocal"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "FileHash"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Opciones estendíes"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Fieltrar"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Triba de ficheru"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Toos"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Archivos"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Audio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Imáxenes de CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Imáxenes"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programes"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Testos"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Videos"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Estensión"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Tamañu mín"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Tamañu Máx"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Disponibilidá"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Fieltru:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Fieltrar Resultaos"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Invertir Resultáu"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Anubrir Ficheros Conocíos"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Entamar"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Más"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Guetar más resultaos en eD2k. Entá nun furrula en Kad."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Encaboxar"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Descarga"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Llimpiar Campos"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Resultaos"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Llimpiar descargues completaes"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Amosar xuba / Cola de xuba"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Veceros na cola :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Unviar"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Unviar un mensax específicu."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Zarrar"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Fontes completes"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Zarrar esta sesión de charra"
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Xeneral"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Nome Completu :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/A"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "Ficheru-met :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Hash :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Tamañu :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Estáu ficheru part :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Cabera comprobación completa :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Tresferencia"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Fontes alcontraes :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Tresfiriendo fontes :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Númberu de partes :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Disponibles :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Fluxu de datos :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Tiempu Descarga Activa: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Tresferío :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Tamañu Completáu :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Xestión intelixente de corrupción"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Perdío por corrupción :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Ganao por compresión :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Paquetes salvaos por I.C.H.:"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Nomes de ficheru"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Tomar"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Llimpiar"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 "Comentariu/Calificación del ficheru (El testu podrán velu tolos usuarios)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Pa una película, pues poner la so duración, la so hestoria, la llingua ...\n"
-"y si ye una falsificación (fake) pues informar a los demás usuarios d'aMule."
+"Pa una película, pues poner la so duración, la so hestoria, la llingua ...\\n"
+"\\ny si ye una falsificación (fake) pues informar a los demás usuarios "
+"d'aMule."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Calificación de ficheru"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Non evaluada"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Inválidu / Toyíu / Falsificación"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Probe"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Aceutable"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Bonu"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Mui bonu"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Camudar la calificación del ficheru o alvertir a otros usuarios si nun ye "
 "válidu"
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Descargando, por favor aguarda ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Tamañu desconocíu"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Información requería"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "Señes IP :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Puertu :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Nome d'usuariu :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Hash del usuariu :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Recargar los tos ficheros compartíos"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Sesión actual"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Total"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Peticiones:"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Xubes aceutaes :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Amestar"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Velocidá de descarga"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Actual"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Media d'execución"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Media de la sesión"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Velocidá de xuba"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Conexones"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Descargues actives"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Conexones actives (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Xubes actives"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Árbol d'estadístiques"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Nome d'usuariu:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Hash d'usuariu:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Software del veceru:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Versión del veceru:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "Señes IP:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID usuariu:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP Sirvidor:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Nome sirvidor:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Ofuscación:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Tresferencies al veceru"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Solicitú actual:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Velocidá media de xuba :"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Velocidá media de descarga :"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Xubíu (sesión):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Descargáu (sesión):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Xubíu (total):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Descargáu (total):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Resultaos"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Modificador DE/XU:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Ident Segura:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Calificación (total):"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "En cola"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Puntuación cola:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Nomatu"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
 msgstr "http://www.aMule.org - la mula multi-plataforma"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 "Esti ye'l nome que verán los otros usuarios verán cuando se coneuten a tí."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Llingua"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Llingua: "
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Allanciu enantes d'amosar los mensaxes emerxentes."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Esto especifica la llingua usada nos controles."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Opciones Misc"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Comprobar nueva versión al entamu"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Habilitando esto, fadrá que aMule compruebe si esiste una nueva versión al "
 "entamu."
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Aniciar minimizáu"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Habilitando esto, faes que aMule se minimice nel aniciu."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Entrugar al colar"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
 msgstr "Facer que aMule entrugue enantes de colar."
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Habilitar iconu de sistema"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Esto habilita/deshabilita iconu de sistema (o de la barra de xeres)."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Minimizar al iconu de la bandexa"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5132,289 +3328,217 @@
 "Activando esto fadrás que aMule se minimice na bandexa del sistema, asemeyao "
 "a la barra de xeres."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Tiempu d'allanciu de los mensaxes emerxentes en segs"
-
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Allanciu enantes d'amosar los mensaxes emerxentes."
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Tiempu d'allanciu de los mensaxes emerxentes: "
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "segundos"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Seleición del restolador"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Predefiníu del Sistema"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Esbille restolador equí"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Restolador actual:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Introduz el nome del restolador. Pa usar un restolador personal, esbilla "
-"personalizáu nel menú d'arriba."
+"Introduz el nome del to restolador. Déxalo ermo si quies usar el que hai por "
+"defeutu."
+
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Desaminar"
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Abrir en nueva llingüeta si ye dable"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Abrir cuando seya dable, la páxina web nuna nueva llingüeta n'arroú de nuna "
 "nueva ventana"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Reproductor de vídeu"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Criar un copia pa la previsualización"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Llímites del anchor de banda"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Xuba"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Asignación de puestu reserváu"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Puertu TCP estándar del veceru:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Puertos"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Puertu TCP estándar "
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Esti ye'l puertu eD2k estándar y nun pue deshabilitase"
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Puertu UDP estándar:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "Puertu UDP pa peticiones del sirvidor (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Puertu UDP estándar (Kad / gueta global) "
+
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr "Esti puertu UDP úsase pa peticiones estendíes de eD2k y la rede Kad"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "deshabilitáu"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Habilitar UPnP pal reunvíu de puertu del router"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Direición obligada"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Puertu UDP pa peticiones del sirvidor (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Max. fontes por ficheru"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "Puertu UPnP TCP (Opcional):"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Llímite superior"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Señes IP llocal de enllaz: (erma pa cualesquiera):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Llímites de conexón"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Conexones máximes"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Namái usuarios avanzaos: Si tu tienes múltiples tarxetes de rede, introduz "
+"la direición de la tarxeta, que aMule tendrá d'usar."
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Max. fontes descargando un ficheru:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Máx. conexones al empar:"
+
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Habilitar UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Puertu UPnP TCP:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Autoconeutar al aniciar"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Reconeutar al perder la conexón"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Amosar anchor de banda escedente"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Opciones de sirvidores"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Desaniciar sirvidores cayíos tres"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "reintentos"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Auto-actualizar la llista de sirvidores al aniciu"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Llista"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Actualizar la llista de sirvidores al coneutar a un sirvidor"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Actualizar la llista de sirvidores cuando un veceru se coneuta"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Usar sistema de prioridaes"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Control intelixente de IDBaxa al coneutar"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Conexón segura"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Autoconeutar namái a Sirvidores fixos"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Asignar alta prioridá a los sirvidores amestaos manualmente"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "Activar I.C.H"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH confiar en tolos hash (nun s'encamienta)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Remanador Intelixente de Corrupciones (I.C.H)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Habilitar"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "I.C.H. avanzáu, confiar en tolos hash (non recomendáu)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Amestar ficheros pa descargar en mou posáu"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Amestar nueves descargues con auto prioridá"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Tentar descargar enantes la primer y cabera parte"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Amestar nuevos ficheros compartíos con auto prioridá"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Tentar tresferir partes completes en toles xubes"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr "Descargar siguiente ficheru posáu cuandu otru se complete"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Namái na mesma categoría"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Guardar 10 fontes en ficheros raros (< 20 fontes)"
-
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Espaciu en discu"
-
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Comprobar espaciu en discu"
-
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Seleiciona esta opción si quies que aMule comprebe l'espaciu en discu"
-
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Espaciu mínimu en discu:"
-
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
-msgstr "Introduz l'espaciu mínimu de discu deseyáu."
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2077
+#: src/muuli_wdr.cpp:1811
 msgid "Preallocate disk space for new files"
 msgstr "Reservar espaciu en discu pa los nuevos ficheros"
 
-#: src/muuli_wdr.cpp:2078
+#: src/muuli_wdr.cpp:1812
 msgid ""
 "For new files preallocates disk space for the whole file, thus reduces "
 "fragmentation"
@@ -5422,291 +3546,248 @@
 "Pa los nuevos ficheros reservar tol espaciu del ficheru, esto amenorga la "
 "fragmentación"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Entrantes"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Temporales"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Compartíos"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Detener descargues cuando s'algame l'espaciu llibre en discu"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Seleiciona esta opción si quies que aMule comprebe l'espaciu en discu"
+
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
+msgstr "Introduz l'espaciu mínimu de discu deseyáu."
+
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Guardar 10 fontes en ficheros raros (< 20 fontes)"
+
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Xubíes"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Amestar nuevos ficheros compartíos con auto prioridá"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Carpeta de destín pa les descargues"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Carpeta pa los ficheros temporales de descargues"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Carpetes compartíes"
+
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Click drechu n'iconu de carpeta, pa compartición recursiva)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Compartir ficheros anubríos"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Intervalu d'actualización : 5 segs"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Tiempu de promediu del gráficu: 100 min"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Escala del gráficu de les conexones: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Esbillar colores d'estadístiques"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Descargar escala gráfica:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Escala gráfica de descarga:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Colores: "
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Fondu"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Rexella"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Descarga actual"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Promediu descarga n'execución"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Promediu Descarga/sesión"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Xuba actual"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Promediu Xuba/tiempu"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Promediu xuba/sesión"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Conexones actives"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Barra de velocidá del iconu de sistema"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Kad-nodos actual"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Kad-nodos executando"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Kad-nodos sesión"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Seleicionar"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Árbol"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Númberu de versiones de veceros a amosar (0=ensin llímite)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Capacidá"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Nota: Estos valores namái s'usen pa estadístiques."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "¡¡¡ AVISU !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Nun cambies estos parámetros sacante que sepas\n"
-"lo que faes, de nun ser d'esta miente pues\n"
-"facer que aMule furrule peor.\n"
-"\n"
-"aMule furrulará bien ensin que camudes dengún\n"
-"d'estos parámetros."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Axustes avanzos"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Nueves conexones máx. / 5 segs"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Tamañu del buffer de ficheru: 240000 bytes"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Tamañu cola d'espera: 5000 veceros"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervalu d'actualización de conexón al sirvidor: Desactiváu"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Progresu de los ficheos de la llista de descarga"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Amosar porcentax"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Amosar barra de progresu"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Estilu de la barra de Progresu"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Planu"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "3D"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Sofitu pa temes visuales"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Activar sofitu de temes visuales"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Tema:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- nun hai temes visuales disponibles -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Axeitando columna"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Auto-axeitar ficheros en la cola de descarga (Alta CPU)"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Tema a usar: "
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule ordenará automáticamente les columnes na to llista de descargues"
-
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Dellos Tweaks Gui"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Amosar el xestor rápidu d'enllaces eD2k"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Amosar \"Xestor rápidu d'enllaces eD2k\", en toles ventanes."
 
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Amosar info estendía nes llingüetes de les categoríes"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Amosar índices de tresferencia nel títulu"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "Amosar índices de tresferencia nel títulu"
 
-#: src/muuli_wdr.cpp:2412
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Enantes del nome de l'aplicación"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Dempués del nome de l'aplicación"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Amosar anchor de banda escedente"
+
+#: src/muuli_wdr.cpp:2124
 msgid "Vertical toolbar orientation"
 msgstr "Orientación vertical de la barra de ferramientes"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Amosar númberu de ficheru part, enantes del nome de ficheru"
-
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Parámetros del sirvidor web"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Aniciar amuleweb al entamu"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Puertos del sirvidor web"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Habilitar el forwarding de puertos UPnP nel puertu del sirvidor web"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Puerto del UPnP del sirvidor web"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Ficheros de la cola de descarga"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Tiempu d'actualización de páxina (en segs)"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Amosar porcentax de progresu"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Activar compresión gzip"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Amosar barra de progresu"
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Activar invitáu"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Planu"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Contraseña alministrador"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "3D"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Contraseña invitáu"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Auto-ordenar ficheros (Alta CPU)"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Plantía Web"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "aMule ordenará automáticamente les columnes na to llista de descargues"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Parámetros de conexón esterna"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Aceutar conexones esternes"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"IP de la interface que ta escuchando\n"
-"(ermo pa cualesquiera)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP de la interface que ta escuchando"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5714,76 +3795,117 @@
 "Introduz una IP válida de la interface que ta escuchando. Un campu ermu o "
 "0.0.0.0 significará cualesquier interface."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Puertu TCP"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "Puertu TCP:"
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Habilitar UPnP port forwarding nel puertu EC"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Contraseña"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Parámetros del sirvidor web"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Aniciar sirvidor web al entamu"
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Plantía Web"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Contraseña alministrador"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Activar invitáu"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Contraseña invitáu"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Usar forwarding de puertos UPnP nel puertu del sirvidor web"
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Puertu HTTP del sirvidor web (Opcional)"
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Tiempu d'actualización de páxina (en segs)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Activar compresión gzip"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "Aceutar"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Aplicar cualesquier cambéu fechu nes opciones."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Encaboxar cualesquier cambéu fechu nes opciones."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Títulu :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Comentariu : "
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Direutoriu entrante :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Cambiar prioridá a nuevos ficheros asignaos :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "Non cambiar"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Seleiciona color pa esta categoría (seleicionada) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Amosar motd del sirvidor cuando tes coneutáu ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Info. sirvidores"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Reafitar"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Calca esti botón pa llimpiar el registru."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Rexistru"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 "Click nesti botón p'actualizar la llista de sirvidores dende una URL ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Llista de sirvidores"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5791,43 +3913,55 @@
 "Introduz la url a un ficheru server.met y calca'l botón de la esquierda "
 "p'actualizar la llista de sirvidores conocíos."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Amestar sirvidor manualmente: Nome"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Introduz el nome del nuevu sirvidor"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Puertu"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Introduz la IP del sirvidor, usando'l formatu X.X.X.X."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Introduz el puertu del sirvidor"
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Amestar manualmente un sirvidor (rellena los campos) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Rexistru"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Info. sirvidores"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "Info ED2K"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Info Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Click nesti botón p'actualizar la llista de nodos dende la URL ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nodos (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5835,51 +3969,58 @@
 "Introduz equí la url al ficheru nodes.dat y calca'l botón de la esquierda, "
 "p'actualizar la llista de nodos conocíos."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Estadístiques nodos"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Coneutar"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Nuevu nodu"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Puertu:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+#, fuzzy
+msgid "Bootstrap from known clients"
 msgstr ""
 "Coneutar dende \n"
 "veceros conocíos"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Desconeutar Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "Info eD2K"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Usar Identificación Segura d'Usuariu"
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Encamiéntase a activar esta opción. Nun recibirá créditos si la ISU "
+"(Identificación Segura d'Usuariu) nun ta habilitada."
+
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Ofuscación de protocolu"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Sofitu d'ofuscación de protocolu"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5887,11 +4028,11 @@
 "Esta opción activa la ofuscación de protocolu, y fai que aMule aceute "
 "conexones ofuscaes de otros veceros."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Usar ofuscación pa conexones salientes"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5899,11 +4040,11 @@
 "Esta opción fai que aMule use ofuscación de protocolu cuando se coneuten "
 "otros veceros/sirvidores."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Aceutar namái conexones ofuscaes"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5911,86 +4052,82 @@
 "Esa opción fai que aMule namái aceute conexones ofuscaes. Tendrá menos "
 "fontes, pero tol so tráficu sedrá ofuscáu."
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Opciones del ficheru"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Toos"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Dengún"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
 msgstr "Quién pue adicar los mios ficheros compartíos:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 "Seleiciona quién pue solicitar adicar la nuesa llista de ficheros compartíos."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Fieltráu de IPs"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Fieltru veceros"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Habilitar fieltráu de IPs de veceros definíu nel ficheru ~/.aMule/ipfilter."
 "dat"
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Fieltru sirvidores"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Habilitar fieltráu de IPs de sirvidores definíu nel ficheru ~/.aMule/"
 "ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Recargar llista"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Recargar llista de fieltráu de IPs dende ficheru ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Actualizar agora"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Auto-actualizar el fieltráu de IPs al entamu"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Nivel de fieltráu:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Fieltrar siempres IP's de LAN"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Control paranoicu de IPs non comprobaes"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -5998,11 +4135,11 @@
 "Refugar paquetes si la ip del veceru ye diferente de la ip dende au el "
 "paquete ye recibíu. Usar con curiáu."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Usar el ipfilter.dat de sistema si ta disponible"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -6010,23 +4147,11 @@
 "Si nun s'alcuentra un ficheru ipfilter.dat llocal, permitir l'usu d'un "
 "ficheru ipfilter de sistema"
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Usar Identificación Segura d'Usuariu"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Encamiéntase a activar esta opción. Nun recibirá créditos si la ISU "
-"(Identificación Segura d'Usuariu) nun ta habilitada."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Activar Robla online"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6034,848 +4159,1314 @@
 "Habilitar la escritura de ficheros del SO, suel usase pa criar robles por "
 "aplicaciones esternes."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Frecuencia d'actualización (segs):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 "Cambiar la frecuencia (en segundos) de l'actualización de la robla-online"
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Direutoriu de Robla Online:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Guardar ficheru de robla online en: "
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "Click equí pa seleicionar el direutoriu que contién los ficheros de robles-"
 "online."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Deshabilitar/Habilitar"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Fieltrar mensaxes entrantes (sacantes conversación actual):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Opciones de filtráu:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Fieltrar tolos mensaxes"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Fieltrar mensaxes de xente que nun ta na to llista de collacios"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Fieltrar mensaxes de veceros desconocíos"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Fieltrar mensaxes que contienen (usa ',' como separtador):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "amiesta equí les pallabres que amule tien de fieltrar y bloquiar mensaxes "
 "incluyíos"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Amosar mensaxes recibíos nel rexistru"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Comentarios"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Fieltrar comentarios que contengan (usar ',' como separtador):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Conexón automática al sirvidor ensin proxy"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Habilitar autentificación"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Habilita/deshabilita autentificación usuariu/contraseña"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Nome d'usuariu:"
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "El nome d'usuariu a usar pa coneutar al proxy"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "La contraseña a usar pa coneutar al proxy"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Habilitar Proxy"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Habilitar/Deshabilitar soporte Proxy"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Triba Proxy:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "La triba de proxy a la que tas coneutando"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Sirvidor Proxy:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Nome del host del proxy"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Puertu Proxy:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "El puertu del proxy"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Autenticación"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Habilitar autentificación"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Habilita/deshabilita autentificación usuariu/contraseña"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "El nome d'usuariu a usar pa coneutar al proxy"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Contraseña:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "La contraseña a usar pa coneutar al proxy"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Conexón automática al sirvidor ensin proxy"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Coneutar a:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Conexón a aMule remotu"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Nome usuariu:"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Remembrar estes opciones"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Habilita mou estendíu de depuración al aniciu"
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Mensaxes de categoríes:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Esperando..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Amestar imports"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Reintentar seleicionáu"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Desaniciar seleicionáu"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Tipos d'Eventos"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr "Tipos Eventos"
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Xubes aceutaes :"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Anubre los ficheros compartíos"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Seleicionar fieltru de vistes"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Xubes actives"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Amosar Veceros"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Recargar llista"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Recargar los tos ficheros compartíos"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Unviar"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Unviar un mensax específicu."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Zarrar esta sesión de charra"
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Coneutar a cualesquier sirvidor y/o Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Ventana de redes"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Fich compartíos"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Ventana de gueta"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Deshabilitáu [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Ventana de tresferencies de ficheros"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Ventana de ficheros compartíos"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Ventana de mensaxes"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Ventana de gráficos d'estadístiques"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Ventana d'opciones"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nueva Categoría"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Seleiciona un direutoriu pa los ficheros entrantes"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "¡Tienes d'especificar un nome pa la categoría!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/seg"
+msgstr[1] "bytes/seg"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "¡Tienes d'especificar un camín pa la categoría!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "segs"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "mins"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "hores"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Díes"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "too"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "el restu"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Incompletu"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Deteníu"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Vídeu"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Ficheru"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Testu"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Activu"
+
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
 msgstr ""
-"¡Fallu al criar el direutoriu entrante de la categoría. Por favor "
-"especifique un camín correutu!"
 
-#: src/ExternalConnector.cpp:141
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Esperando a ficheru part matando filu..."
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Estensión desconocía '%s' pal comandu '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Importando %s: %s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Lleendo direutoriu temp"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Obteniendo información básica de ficheru info de descarga"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Criando ficheru de destín"
+
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Comandu desconocíu '%s'.\n"
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Cargando datos dende l'antigua descarga del ficheru (%u de %u)"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Esti comandu nun tien un argumentu.\n"
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Atroxando bloque de datos nun nuevu ficheru de descarga (%u de %u)"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Esti comandu tien de tener un argumentu.\n"
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Obteniendo información del ficheru fonte de descarga"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Amestando descarga y guardando nuevu ficheru part"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Importar ficheros part"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Estáu"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Hash de ficheru"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Discu: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Esti comandu ta incompletu, tienes d'usar una de les estensiones....\n"
+"¡Por favor escueye un direutoriu pa guetar por descargues temporales! "
+"(incluyiránse subdireutorios)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Estensiones disponibles:\n"
+"¿Quies que los ficheros fonte d'una descarga importada satisfactoriamente "
+"seyan desaniciaos?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Comandos disponibles:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "¿Desaniciar fontes?"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "ERROR: Fallu al criar el ficheru part"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Tolos comandos son sensibles a les mayúscules.\n"
-"Teclea '%s <comandu>' pa obtener información detallao del <comandu>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Intentando cargar copia de seguridá del ficheru met dende %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Colar de l'aplicación."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "ERROR: Nun pudo abrise'l ficheru part.met: %s ===> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Amosar aida"
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "ERROR: el ficheru part.met tien tamañu 0: %s ===> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "ERROR: Versión de ficheru part.met Inválida: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Pa tener aida d'un comandu, teclea 'help <comandu>'.\n"
-"Pa tener la llista completa de comandos, teclea 'help'.\n"
+"ERROR: %s (%s) ta toyíu (cuenta d'etiquetes errónea), nun se pue cargar el "
+"ficheru."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Usa '%s' pa la llista de comandos\n"
-"\n"
+"ERROR: %s (%s) ta toyíu (cuenta d'etiquetes errónea), nun se pue cargar el "
+"ficheru."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "¡Fallu de sintaxis!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Intentando recuperar info de ficheru..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr ""
-"Fallu procesando'l comandu - ¡enxamás tendría de pasar! Informa del fallu, "
-"por favor\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "Recuperando ficheru ensin nome - recuperarase como RecoveredFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Esti comandu nun tendría de tener dengún parámetru"
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "Recuperóse tola info disponible del ficheru :D - Tentando usala..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Esti comandu tien de tener un parámetru."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Nun pudo recuperase la info de ficheru..."
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Argumentu non válidu."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Fallu al abrir %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Esto ye un comandu incompletu."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "AVISU: %s pue tar toyíu (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Teclea '%s' pa tener más aida.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "FALLU salvando ficheru part: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "ERROR E/S atroxando ficheru part: "
+
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Esto ye %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Nun pue recuperase la duración de '%s' - usando'l ficheru %s."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Esto ye %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "de dalgún mou el tamañu de '%s' ye 0 - usando ficheru %s."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Fallu al guardar ficheru part.met.seeds por %s"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Guardáu %i semiente de fontes en ficheru part: %s (%s)"
+msgstr[1] "Guardaes %i semientes de fontes en ficheru part: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Ficheru part %s (%s) nun tien ficheru de semientes"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Ficheru part %s (%s) tien un ficheru de semientes ermu"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Fallu lleendo semientes del ficheru part (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Parte toyía alcontrada (%i) en %d parte del ficheru %s - Resultáu del hash "
+"del ficheru |%s| Hash del ficheru |%s|"
+msgstr[1] ""
+"Parte toyía alcontrada (%i) en %d partes del ficheru %s - Resultáu del hash "
+"del ficheru |%s| Hash del ficheru |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Parte (%i) completa alcontrada en %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Recodificación finada %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Fallu inesperáu mientres se completaba %s. Ficheru posáu"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Descarga finada: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Desaniciando ficheru: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Criando veceru...\n"
+"AVISU: Nun pue criase'l hash de la parte descargada, set de hashes "
+"incompletu pa '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Ok, colando %s...\n"
+"ERROR: Nun pue criase'l hash de la parte descargada, set de hashes "
+"incompletu pa (%s). Esto nun tendría de pasar enxamás"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Nun ye dable coneutar con una contraseña en blanco.\n"
-"Tienes d'especificar una contraseña nel ficheru config\n"
-"o na llinia de comandos, o introduz una cuando t'entrugue.\n"
-"\n"
-"Colando...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Amosar esta aida."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "AVISU: Nun hai espaciu llibre nel discu! Posando ficheru: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Host au ta executándose aMule. (por defeutu: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Parte descargada %i toyía nel ficheru: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Puertu de conexón esterna de aMule. (por defeutu: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Recuperada parte toyía %i de %s -> Bytes salvaos: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Contraseña de conexones esternes"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Asignando"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Lleer configuración dende'l ficheru."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Espaciu en discu insuficiente"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Nun amueses denguna salida."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Descargáu"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Mou Estendíu - amuesa tamién los mensaxes de depuración"
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "ERROR: Fallu al abrir ficheru part '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Seleiciona la llingua del programa."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Por defeutu"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Escribe opciones de la llinia de comandu al ficheru de configuración."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albanés"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr ""
-"Criar ficheru de configuración basáu nel ficheru de configuración de aMule."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Árabe"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Imprenta versión del programa."
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturianu"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Ficheru de créditos cargáu, %u veceru conocíu"
-msgstr[1] "Ficheru de créditos cargáu, %u veceros conocíos"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Euskera"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - ¡Caducó'l créditu de %u veceru!"
-msgstr[1] " - ¡Caducaron los créditos de %u veceros!"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Búlgaru"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Ficheru 'cryptkey.dat' nun alcontráu, criando."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Catalán"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"ERROR: el daemon d'aMule nun pue usase cuando tán desactivaes les conexones "
-"esternes. P'activales, use o bien un aMule normal, anicie amuled cola opción "
-"--ec-config, o bien, afite \"AcceptExternalConnections\" a 1, nel ficheru ~/."
-"aMule/amule.conf"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Chinu (simplificáu)"
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "ERROR: %s"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Chinu (Tradicional)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Realmitir"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Amosar xubíes"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Amosar Cola"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Croata"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Amosar Veceros"
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Checu"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Seleicionar Vista"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Danés"
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Software Veceru"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Holandés"
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "N'espera"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Inglés (U.K.)"
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Xubiendo"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estoniu"
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Xuba/Descarga"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finlandés"
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Estáu remotu"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Francés"
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "LC: %u"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Gallegu"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Prioridá del ficheru"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Alemán"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Resultáu"
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Griegu"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Entrugáu"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebréu"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Cabera comprobación"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Húngaru"
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Entráu na cola"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italianu"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Estáu de la xuba"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italianu (Suizu)"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Xubío"
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Xaponés"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Estáu de la descarga"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Coreanu"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Descargáu"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lituanu"
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Hash d'usuariu"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Cifráu"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Noruegu"
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Anubre los ficheros compartíos"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polacu"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Detalles del veceru"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugués"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Habilitáu"
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugués (Brasil)"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Sofitáu"
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Rusu"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Non sofitáu"
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Eslovenu"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Deshabilitáu"
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Español"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Suecu"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Non completáu"
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turcu"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Veceru sospechosu"
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ucranianu"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Verificáu - OK"
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Llingua: "
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
 msgstr "Non disponible"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "opciones non disponibles"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Categoría inválida alcontrada, saltando"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
-"El tamañu mínimu tien de ser menor al tamañu máximu. Tamañu máximu inoráu."
+"Puertu TCP nun pue ser más altu de 65532 darréu que'l socket del sirvidor "
+"UDP ye TCP+3"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Alerta de gueta"
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
+msgstr "Puertu por defeutu que s'usará (%d)"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Illimitáu"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Quitando direutoriu compartíu non esistente: %s"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Menú aMule"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Conexón"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Llímites de velocidá"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Direutorios"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "XU: Dengún"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Sirvidores"
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "XU: %u"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Ficheros"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DE: Denguna, "
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Seguridá"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "DE: %u"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Interface"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Fieltros"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Controles remotos"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Robla online"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Avanzáu"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Eventos"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Debugging"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Nun cambies estos parámetros sacante que sepas\n"
+"lo que faes, de nun ser d'esta miente pues\n"
+"facer que aMule furrule peor.\n"
+"\n"
+"aMule furrulará bien ensin que camudes dengún\n"
+"d'estos parámetros."
+
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Velocidá de descarga: %.1f"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Error al coneutar configuración con programa, col ID %d y clave %s"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Velocidá de xuba: %.1f"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
+"Error al tresferir datos dende la configuración al programa, col ID %d y la "
+"clave %s"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Información del veceru"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "La triba de proxy a la que tas coneutando"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:534
 #, c-format
-msgid "Nickname: %s"
-msgstr "Nomatu: %s"
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
+"Error al tresferir datos dende'l programa a la configuración, col ID %d y la "
+"clave %s"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "¡Dengún nomatu conseñáu!"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"aMule tien de reaniciase p'aplicar los cambeos:\n"
+"\n"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID Veceru:"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- Puertu TCP camudáu.\n"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Nome del sirvidor: "
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- Puertu UDP camudáu.\n"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP del sirvidor: "
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Conexón esterna zarrada."
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Nueva conexón esterna, aceutada"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Conexón esterna zarrada."
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"La to llista Auto-actualizable de sirvidores ta erma.\n"
+"La llista de sirvidores auto-actualizable al entamu desactivaráse."
+
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Tienes habilitao les conexones externes, pero nun tienes especificada una "
+"contraseña.\n"
+"Les conexones externes nun puen ser habilitaes sacante qu'especifiques una "
+"contraseña válida."
+
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Llingua camudada.\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Direutoriu TEMP camudáu.\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- Rede ED2K activada.\n"
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"eD2k y Kad tán desactivaos.\n"
+"Nun podrás coneutate hasta qu'actives a lo menos ún d'ellos."
+
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad nun s'aniciará si'l to puertu UDP ta deshabilitáu.\n"
+"Habilita un puertu UDP o deshabilita Kad."
+
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Hai de reaniciar aMule agora.\n"
+"Si nun reanicies agora, nun sabemos si pasará daqué malo.\n"
+
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"La to auto-actualización de llista de sirvidores ta en blanco.\n"
+"Por favor introduz a lo menos una URL con un ficheru server.met válidu.\n"
+"Click nel botón \"Llista\" d'esta caxella  pa introducir una URL."
+
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Ficheros temporales"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Ficheros entrantes"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Robles online"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "TCP port: %d"
-msgstr "Puertu TCP: %d"
+msgid "Choose a folder for %s"
+msgstr "Escueye una carpeta pa %s"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "Puertu TCP: Nun ta llistu"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Esplorar"
+
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Seleiciona restolador"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "UDP port: %d"
-msgstr "Puertu UDP: %d"
+msgid "Executable%s"
+msgstr "Executable%s"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "Puertu UDP: Nun ta llistu"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Editar llista de sirvidores"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Robla Online: Activada"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Amesta equí les URL's pa descargar los ficheros server.met.\n"
+"Namái una url per llinia."
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Robla Online: Desactivada"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Intervalu d'actualización: %d seg"
+msgstr[1] "Intervalu d'actualización: %d segs"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "Shared files: %d"
-msgstr "Ficheros compartíos: %d"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Tiempu mediu del gráficu: %d min"
+msgstr[1] "Tiempu mediu del gráficu: %d mins"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/PrefsUnifiedDlg.cpp:1127
 #, c-format
-msgid "Queued clients: %d"
-msgstr "Veceros na cola: %d"
+msgid "Connections Graph Scale: %d"
+msgstr "Escala gráfica de conexones: %d"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "Total DL: %s"
-msgstr "Total DE: %s"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Tamañu del buffer de ficheru: %d byte"
+msgstr[1] "Tamañu del buffer de ficheru: %d bytes"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Total UL: %s"
-msgstr "Total XU: %s"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Tamañu de la cola de xuba: %d veceru"
+msgstr[1] "Tamañu de la cola de xuba: %d veceros"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Llímite de xuba"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Intervalu de refrescu de la conexón al sirvidor: %d minutu"
+msgstr[1] "Intervalu de refrescu de la conexón al sirvidor: %d minutos"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Llímite de descarga"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Intervalu de refrescu de la conexón al sirvidor: Deshabilitáu"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Anubrir aMule"
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "deshabilitáu"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Amosar aMule"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "Executar comandu nel eventu `%s'"
+
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Habilitar execución de comandu nel núcleu"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Comandu del núcleu:"
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Habilitar execución de comandu na Interface"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Comandu de la Interface: "
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Les siguientes variables trocaránse:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+"El tamañu mínimu tien de ser menor al tamañu máximu. Tamañu máximu inoráu."
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Alerta de gueta"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Principal"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Nun se pue guetar en Kad si nun ta coneutáu a Kad"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "Nun pue facese una gueta en eD2k si nun se ta coneutáu a eD2k"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Fallu non esperáu mentantu tentaba guetar en Kad: "
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "ID Ficheru"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Ficheru"
 
-#: src/ChatSelector.cpp:127
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Descargar na categoría"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Amestar URLs opcionales pa esti ficheru"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Guetar ficheros rellacionaos (eD2k, gueta llocal)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Conseñar como ficheru conocíu"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Copiar l'enllaz eD2k al cartafueyos"
+
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Encaboxar"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr ""
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Fallu al coneutar a tolos sirvidores ofuscaos llistaos. Tentándolo de nuevu "
+"ensin ofuscación."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Fallu al coneutar a tolos sirvidores."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "Protocolu eD2k deshabilitáu nes preferencies, nun se coneuta."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
+"Nun s'alcontraron sirvidores válidos pa coneutar na llista de sirvidores"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Sesión Charra Aniciada: %s (%s:%u) - %s %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Coneutáu a %s (%s:%i)"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Coneutáu al Veceru ***"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Conexón afitada en: %s"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Coneutando al veceru ***"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr "Fallu fatal coneutando. La conexón a Internet podría tar desactivada"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Fallu al coneutar col veceru / Conexón perdía ***"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Conexón perdía con %s (%s:%i)"
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Zarrar llingüeta"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) paez tar cayíu."
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Zarrar toles llingüetes"
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) paez tar enllenu."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Zarrar les otres llingüetes"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Reintentaráse la conexón automática al sirvidor en %d segundu"
+msgstr[1] "Reintentaráse la conexón automática al sirvidor en %d segundos"
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Conexón perdida"
 
-#: src/ServerList.cpp:84
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Coneutando con %s (%s:%i) fallíu"
+
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "ERROR: Socket inválidu al comprobar el timeout"
+
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Intentu de conexón con %s (%s:%i) tiempu escosáu."
+
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Recibióse'l caberu resultáu de la to gueta DNS, descartando."
+
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Cargando ficheru server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "¡Nun s'alcontró ficheru server.met!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Fallu al cargar el ficheru server.met '%s', alcontróse formatu desconocíu."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "¡Fallu al abrir server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Ficheru server.met toyíu, alcontróse versión non válida: 0x%x, tamañu %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "%i sirvidor alcontráu en server.met"
 msgstr[1] "%i sirvidores alcontraos en server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d sirvidor amestáu"
 msgstr[1] "%d sirvidores amestaos"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "IO error lleendo'l ficheru known.met: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Sirvidor non amestáu: [%s:%d] nun especificaste un puertu válidu."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Sirvidor non amestáu: La IP de [%s:%d] ta fieltrada o nun ye válida."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr "Sirvidor non amestáu: Sirvidor IP:Puertu [%s:%d] alcontráu na llista."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Sirvidor amestáu: Sirvidor en [%s:%d] usando'l nome '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6883,25 +5474,25 @@
 "Tas coneutáu al sirvidor, que tentes desaniciar. Por favor desconéutate "
 "primero."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Fallu al abrir '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "¡Fallu al guardar server.met!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "URL non válida"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
 msgstr "Descarga finada de la llista de sirvidores de %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Fallu al descargar la llista de sirvidores dende %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6910,23 +5501,28 @@
 "una llista de sirvidores válida nesti ficheru pa poder actualizar de mou "
 "automáticu la llista de sirvidores."
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Descargando llista de sirvidores de %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "ALVERTENCIA: especificada una URL inválida pa l'actualización automática de "
 "sirvidores : %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Fallu en addresses.dat, server.met de la url de auto descarga inválidu"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Fallu al descargar la llista de sirvidores dende %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -6934,637 +5530,2346 @@
 "Sirvidor llocal ye fieltráu polos Fieltros IP, ¡coneutando a un sirvidor "
 "distintu!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Fallu al executar el comandu '%s' nel eventu `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Nome del Sirvidor"
 
-#: src/amule.cpp:703
-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/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Direición"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Puertu"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Descripción"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Usuarios"
 
-#: src/amule.cpp:786
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Sirvidor fixu"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versión"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Nun tienes dengún sirvidor na llista de sirvidores.\n"
-"¿Quies que aMule descargue una nueva llista agora?"
+"Tas coneutáu a un sirvidor, que tas tentando desaniciar. Desconéutate "
+"enantes. El sirvidor NUN se desaniciará."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Descarga llista de sirvidores"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Nome desconocíu)"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "web server running on pid %d"
-msgstr "sirvidor web corriendo con pid: %d"
+msgid "Are you sure you want to delete the static server %s"
+msgstr "De xuru quies desaniciar el sirvidor fixu %s"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Sirvidores (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Sirvidor"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Coneutar al sirvidor"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Conseñar como sirvidor fixu"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Conseñar como sirvidor non-fixu"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Conseñar sirvidores como fixos"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Conseñar sirvidores como non-fixos"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Desaniciar sirvidor"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Desaniciar sirvidores"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Desaniciar tolos sirvidores"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Copiar los enllaces eD2k al cartafueyos"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Reconeutar al sirvidor"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "¿De xuru quies desaniciar tolos sirvidores?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "¿De xuru quies desaniciar el sirvidor seleicionáu?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "¿De xuru quies desaniciar los sirvidores seleicionaos?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "ERROR: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "AVISU: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "El nuevU ID-Veceru ye %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "AVISU: ¡Recibiste ID-Baxa!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tEsto asocede porque tas darrera d'un torgafueos o d'un router."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tPa mas información, por favor ve a http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "¡Información recibía del sirvidor desconocía! - enforma pequeña"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Recibíu %d nuevu sirvidor"
+msgstr[1] "Recibiéronse %d nuevos sirvidores"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Guardáu de llista de sirvidores fechu."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "El sirvidor refuga'l caberu comandu"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Paquete bogus recibíu dende'l sirvidor: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Fallu mientres que se taba procesando un paquete dende'l sirvidor: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Nun pue criase un filu de resolución de DNS pa coneutar con %s"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "Sirvidor IP %s (%s) ta fieltráu. Nun coneutará."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "usando ofuscación de protocolu."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Coneutando a %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Imposible resolver dns pal sirvidor %s: ¡Imposible coneutar! "
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Sirvidor non amestáu: IP o nome de host non especificáu."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Sirvidor non amestáu: Sirvidor-puertu especificáu non válidu."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Estáu de eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Estáu Kademlia:"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "Executándose en %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Executando"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Estáu:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Estáu de conexón:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Tres torgafueos - abre'l puertu TCP %d nel to router o torgafueos"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "Estáu de conexón UDP:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Tres torgafueos - abre'l puertu UDP %d nel to router o torgafueos"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Estáu tres tornafueos:"
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Nun se requier collaciu - puertu TCP abiertu"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Nun se requier collaciu - puertu UDP abiertu"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Non collaciu"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Coneutando a collaciu"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Coneutáu a collaciu en %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Fontes indizaes: %s"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Pallabres clave indizaes:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Notes indizaes: "
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Notes indizaes:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Media d'usuarios:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Media de ficheros:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Non executando"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Amestando ficheru %s a compartíos"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Alcontróse %i ficheru compartíu"
+msgstr[1] "Alcontráronse %i ficheros compartíos"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Alcontróse %i ficheru compartíu, %i desconocíu"
+msgstr[1] "Alcontráronse %i ficheros compartíos, %i desconocíos"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "FALLU: Tentando compartir %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Direutoriu compartíu non alcontráu, saltando: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Ensin ficheros que compartir en direutoriu: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Nome usuariu:"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Velocidá de descarga"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Velocidá de xuba"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Disponibles :"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Estáu de la xuba"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Estáu de la descarga"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
 msgstr ""
-"Solicitaste executar el sirvidor web al aniciu pero nun pudo correse'l "
-"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:937
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Nome de ficheru"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Fich compartíos"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Peticiones"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Peticiones aceutaes"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Datos tresferíos"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Media Compartíu"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Partes obteníes"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Fontes completes"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Direutoriu"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Amestar Comentariu/Valoración"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Editar Comentariu/Valoración"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Renomar"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Amestar ficheros en colleición a la llista de descargues"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Copiar &URL magnéticu al cartafueyos"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Copiar l'enllaz eD2k al cartafueyos (&Fonte)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Copiar l'enllaz eD2k al cartafueyos (Fonte) (&Con opciones de cifráu)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Copiar l'enllaz eD2k al cartafueyos (&Nome del host)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+"Copiar l'enllaz eD2k al cartafueyos (Nome del host) (Co&n opciones de cifráu)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Copiar l'enllaz eD2k al cartafueyos (Información &AICH)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Necesites IDAlta pa criar un enllaz fonte válidu"
+
+#: src/SharedFilesCtrl.cpp:461
 #, 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"
+msgid "Shared Files (%i)"
+msgstr "Ficheros Compartíos (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[Ficheru part]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Nome de ficheru"
 
-#: src/amule.cpp:964
+#: src/Statistics.cpp:732
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "El puertu %u nun ta disponible. Tendrás IDBaxa\n"
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Datos xubíos (Sesión (Total)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Total por tráficu escedente (Paquetes): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Escedente por peticiones de ficheru (Paquetes): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Escedente por intercambéu de fontes (Paquetes): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Tráficu escedente de sirvidores (Paquetes): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Tráficu escedente Kad (Paquetes): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Cifráu escedente (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Xubíes actives: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Xubíes n'espera: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Total de xubíes satisfactories: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Total de xubíes fallíes: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Tiempu mediu de xuba: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Datos descargaos (Sesión (Total)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Fontes alcontraes: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Descargues actives (partes): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Índiz XU:DE Sesión (Total): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Velocidá media de descarga (Sesión): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Velocidá media de xuba (Sesión): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Velocidá máxima de descarga (Sesión): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Velocidá máxima de xuba (Sesión): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Reconexones: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Tiempu dende la primer tresferencia: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Coneutáu al sirvidor dende: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Conexones actives (estimáu): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Algamóse'l llímite máximu de conexones: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Media de conexones (estimáu): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Picu de conexones (estimáu): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Veceros"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Desconocíu: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Filtráu: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Baneáu: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Total: %i Conocíu(os): %i"
 
-#: src/amule.cpp:970
+#: src/Statistics.cpp:798
 #, c-format
+msgid "Working Servers: %i"
+msgstr "Sirvidores activos: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Sirvidores cayíos: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Total: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Sirvidores desaniciaos: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Sirvidores fieltraos: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Usuarios en sirvidores activos: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Ficheros en sirvidores activos: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Usuarios totales: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Ficheros totales: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Ocupación de Sirvidores: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Númberu de ficheros compartíos: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Tamañu total de ficheros compartíos: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Tamañu mediu de ficheru: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Sistema Operativu"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Non recibíu"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Conexones actives (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Non disponible"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Enxamás"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Comandu `%s' con pid `%d' finó con códigu `%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Executa <str> y cuela."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Formatu IP non válidu. Usa xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Puertu %u nun ta disponible!\n"
-"\n"
-"Esto significa que tendrás IDBaxa.\n"
-"\n"
-"Comprueba la to rede y asegúrate de que'l puertu ta abiertu pa entrada y "
-"salida."
+"Esti comandu requier un argumentu. Argumentos válidos: 'all (too)' o un "
+"númberu.\n"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Fallu al criar el ficheru de RoblaOnline"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Procesando por hash: "
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Fallu al criar el ficheru de RoblaOnline aMule"
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Procesando por nome de ficheru: "
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
-"La llingua seleicionada nun paez tar instalada. (Nota: Tentará de ponese de "
-"toes formes)"
+"Esti comandu requier un argumentu. Argumentos válidos: un hash de ficheru.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Númberu inválidu\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr ""
+"Hash non válidu (la llonxitú tendría de ser esautamente 32 carauteres)\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Solicitú fallía con un fallu desconocíu."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Operación satisfactoria."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Ye la primer vegada qu'anicies aMule %s"
+msgid "Request failed with the following error: %s"
+msgstr "Solicitú fallía col siguiente fallu: %s"
 
-#: src/amule.cpp:1310
-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/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "El Fieltru IP pa veceros ye %s.\n"
 
-#: src/amule.cpp:1311
-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"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "APAGÁU"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "o fila la to sidra. Pero *tendría* de ser seguru de toes formes. \n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "ENCENDÍU"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "El Fieltru IP pa sirvidores ye %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "El nivel de fieltráu de IP actual ye %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Llímites del anchor de banda: Xuba: %u kB/s, Baxada: %u kB/s\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Coneutáu a %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Coneutando agora"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "tres tornafueos"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"Les siguientes opciones camudaron nesta versión por razones de seguridá:\n"
+"\n"
+"Descarga:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Activáu sofitu d'ofuscación de protocolu pa conexones entrantes y "
-"salientes.\n"
+"Xuba:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Desactivada l'actualización de la llista de sirvidores dende otru veceru o "
-"sirvidor.\n"
+"Veceros na cola:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Pa más información de la sida d'estos cambeos, guete información\n"
-"de \"fake servers\" na wiki de aMule http://wiki.amule.org.\n"
-"Ye importante que llimpie cualesquier sirvidor falsu de la so llista de "
-"sirvidores pa que aMule furrule correcho."
+"Fontes totales:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Númberu de resultaos de la gueta: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/TextClient.cpp:832
+#, fuzzy
+msgid "Search progress not available"
+msgstr "Amosar porcentax de progresu"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Recibióse una rempuesta desconocía dende'l sirvidor, OpCode = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Amosar una información curtia sobro l'estáu."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Amosar estáu de conexón, velocidá xuba/descarga actual, etc.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Amosar árbol d'estadístiques ensembre."
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Opcionalmente, un númberu ente 0-255 pue ser un argumentu d'esti comandu,\n"
+"que diz cuántes entraes del árbol de versión de veceru tendríen d'amosase.\n"
+"Con 0 o ensin valor significa 'ensin llímite'.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Exemplu: 'statistics 5' amosará namái les 5 versiones que más se repiten de "
+"cualesquier veceru.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Finar aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
+"Finar el núcleu remotu (amule/amuled) en funcionamientu.\n"
+"Esto finará tamién el veceru mou testu, darréu que nun se pue\n"
+"usar ensin un núcleu en funcionamientu.\n"
+
+#: src/TextClient.cpp:859
+#, fuzzy
+msgid "Reload the given object."
+msgstr "Recargar l'oxetu dau."
+
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
+msgstr "Recargar llista de ficheros compartíos."
+
+#: src/TextClient.cpp:862
+#, fuzzy
+msgid "Reload IP filtering table."
+msgstr "Recargar tabla de fieltru de IP dende ficheru."
+
+#: src/TextClient.cpp:863
+#, fuzzy
+msgid "Reload current IP filtering table."
+msgstr "Seleición nivel de fieltráu de IP"
+
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "Recargar tabla de fieltru de IP dende ficheru."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr ""
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Coneutáu a la rede."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Esto coneutará a toles redes que tean habilitaes nes opciones.\n"
+"Opcionalmente tamién puedes especificar un sirvidor de forma IP:Puertu, pa\n"
+"coneutar a esi sirvidor namái. La IP tien de ser una direición IPv4,\n"
+"o un nome DNS."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Coneutar namái a eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Coneutar namái a Kad"
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Desconeutáu de la rede."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Esto desconeutaráte de toles redes nes que tas coneutáu nesti intre.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Desconeutar de eD2k namái."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Desconeutar de Kad namái."
+
+#: src/TextClient.cpp:877
+#, fuzzy
+msgid "Add an eD2k or magnet link to core."
+msgstr "Amiesta un enllaz eD2k o magnet al núcleu."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"El enllaz eD2k a amestar pue ser:\n"
+"*) un enllaz a un ficheru (ed2k://|file|...),amestaráse a la cola de "
+"descargues,\n"
+"*) un enllaz a un sirvidor (ed2k://|server|...), amestaráse a la llista de "
+"sirvidores,\n"
+"*) o un enllaz a una llista de sirvidores, en talu casu, tolos sirvidores na "
+"llista\n"
+"amestaránse a la llista de sirvidores.\n"
 "\n"
-"Adicionalmente, les opciones del restolador foron restauraes. Por favor "
-"configura les opciones del to restolador otra vegada si ye necesario.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Asigna un valor d'opción"
+
+#: src/TextClient.cpp:883
+#, fuzzy
+msgid "Set IP filtering preferences."
+msgstr "Asignar opciones de fieltráu de IP."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Activa el fieltru pa veceros y sirvidores."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Desactiva el fieltru pa veceros y sirvidores."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Activa/Desactiva el fieltru IP pa veceros."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Activa el fieltru pa veceros."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Desactiva el fieltru pa veceros."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Activa/Desactiva el fieltru pa sirvidores."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Activa el fieltru pa sirvidores."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Desactiva el fieltru pa sirvidores."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Seleición nivel de fieltráu de IP"
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Podrás alcontrar na nuesa web, más información, sofitu y nueves versiones, \n"
+"Niveles válidos nel fieltru 0-255, y el valor por defeutu (inicial)\n"
+"ye 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Asignar llímites d'anchor de banda."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "El valor dau a estos comandos han ser en kilobytes/seg.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Asignar un llímite de xuba."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Asignar un llímite de descarga."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Obtener y amosar un valor d'opciones"
+
+#: src/TextClient.cpp:905
+#, fuzzy
+msgid "Get IP filtering preferences."
+msgstr "Obtener opciones de fieltráu de IP"
+
+#: src/TextClient.cpp:906
+#, fuzzy
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Obtener estáu del fieltru IP pa veceros y sirvidores."
+
+#: src/TextClient.cpp:907
+#, fuzzy
+msgid "Get IP filtering state for clients only."
+msgstr "Obtener estáu del fieltru IP pa veceros."
+
+#: src/TextClient.cpp:908
+#, fuzzy
+msgid "Get IP filtering state for servers only."
+msgstr "Obtener estáu del fieltru IP pa sirvidores."
+
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "Seleición nivel de fieltráu de IP"
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Obtener llímites d'anchor de banda."
+
+#: src/TextClient.cpp:913
+#, fuzzy
+msgid "Execute a search."
+msgstr "Fai una gueta en kad."
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"en www.aMule.org, o nel nuesu canal de IRC #aMule en irc.freenode.net. \n"
+"Una gueta por triba, tien d'especificase la triba:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Exemplu: 'search kad ficheru' executara una gueta en kad de \"ficheru\".\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Unvíanos cualesquier fallu a http://forum.amule.org"
+#: src/TextClient.cpp:915
+#, fuzzy
+msgid "Execute a global search."
+msgstr "Fai una gueta global."
+
+#: src/TextClient.cpp:916
+#, fuzzy
+msgid "Execute a local search"
+msgstr "Fai una gueta llocal."
+
+#: src/TextClient.cpp:917
+#, fuzzy
+msgid "Execute a kad search"
+msgstr "Fai una gueta en kad."
+
+#: src/TextClient.cpp:919
+#, fuzzy
+msgid "Show the results of the last search."
+msgstr "Amuesa los resultaos de la cabera gueta."
+
+#: src/TextClient.cpp:920
+#, fuzzy
+msgid "Return the results of the previous search.\n"
+msgstr "Devuelve los resultaos de la gueta anterior.\n"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "Amuesa'l progresu d'una gueta."
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "Amuesa'l progresu d'una gueta.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Entamar descargando un ficheru"
+
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"El direutoriu qu'especificaste de Robla Online nun ye válidu\n"
-"La Robla Online deshabilitóse hasta que lo igües nes opciones."
+"El númberu d'un ficheru de la cabera gueta tien de dase.\n"
+"Exemplu: 'download 12' aniciará la descarga del ficheru col númberu 12 de la "
+"gueta anterior.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Posar descarga."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Resumir descarga."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Encaboxar descarga."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Asignar prioridá de descarga."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Fixa prioridá de la descarga a Baxa, Normal, Alta o Auto.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Afitar la prioridá a baxa."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Afitar la prioridá a normal."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Afitar la prioridá a alta."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Afitar la prioridá a auto."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Amosar coles/llistes."
+
+#: src/TextClient.cpp:950
+#, fuzzy
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Amosar cola xuba/descarga, llista de sirvidores o llista de ficheros "
+"compartíos.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Amosar cola de xuba"
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Amosar cola de descarga."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Amosar rexistru."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Amosar llista de sirvidores."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Llimpiar rexistru."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "La reserva del espaciu en discu pal ficheru '%s' falló: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Comandu en desusu, usa %s."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "FALLU: nun puede abrise'l ficheru de rexistru"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Esti ye un comandu en desusu, y desaniciaráse nel futuru.\n"
+"Usa '%s' en so llugar.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "ALERTA: el ficheru de rexistru ta ermu. Hai daqué mal."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Veceru de testu aMule"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "El rexistru resetióse"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Convirtiendo antiguos hashsets AICH en  '%s' a 64b en '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Mensax del sirvidor: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "ALERTA: El nome de ficheru '%s' ye incorreutu y sedrá renomáu a '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Fallu al descargar la llista de nodos."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "ALERTA: El ficheru '%s' yá esiste, renomando el nuevu a '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Fallu al abrir el ficheru de comprobación de versión descargáu"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr "¿Daveres quies encaboxar y desaniciar tolos ficheros d'esta categoría?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Ficheru de comprobación de versión toyíu"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Requierse Confirmación"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "¡Tas usando una versión antigua de aMule!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
+
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Abondes conexones"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Ensin catalogar"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Seleicionar fieltru de vistes"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Amestar categoría"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Editar categoría"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Desaniciar categoría"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "La to versión de aMule ye %i.%i.%i y la cabera versión ye %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+"Fallu al abrir el ficheru (%s), desaniciando de la llista de compartíos."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "La cabera versión pues alcontrala siempres en http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Hashset solicitáu de ficheru desconocíu: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "ALERTA: La to versión de aMuled ye obsoleta: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Resumiendo xubíes del ficheru: %s"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "LA to copia de aMule ta actualizada."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Suspendiendo xuba del ficheru: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Fallu al descargar el ficheru de comprobación de versión"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Fallu al executar el comandu '%s' nel eventu `%s'."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Descarga fecha ensembre"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "El camín completu al ficheru."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "El nome del ficheru ensin el camín."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "El hash eD2k del ficheru."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "El tamañu del ficheru en bytes."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Tiempu d'actividá de descarga acumuláu."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Aniciada Nueva sesión de charra"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Remitente del mensax."
 
-#: src/amule.cpp:2025
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Ensin espaciu"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Partición de discu"
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Fallu completando"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Usuarios: %s | Ficheros: %s"
+msgid "Processing file number %u: %s"
+msgstr "Procesando númberu de ficheru %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Entrugaste por hashes de partes (Namái usáu por ficheros > 9.5 MB)"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Usuarios: E: %s K: %s | Ficheros: E: %s K: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s --->¡ Nun esiste'l ficheru !\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Ensin redes seleicionaes"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, el criador d'enllaces eD2k p'aMule"
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "¡Bienllegáu!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Parámetros d'entrada"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Ficheru a codificar"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Amestar URLs opcionales pa esti ficheru"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Introduz equí el ficheru del que quieras calcular l'enllaz eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Introduz equí la URL que quies amestar al enllaz eD2k: Amiesta / al final pa "
+"permitir a aLinkCreator amestar el nome del ficheru actual"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Desaniciar"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Criar enllaz con hashes de partes"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Aida pa separtar ficheros nuevos y raros más aína, el costu sedrá un tamañu "
+"d'enllaz mayor"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Hash de ficheru MD4"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "Hash de ficheru eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "Enllaz eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Guardar"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Copiar al cartafueyos"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Abrir"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Abrir un ficheru pa calcular el so enllaz eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Copiar l'enllaz eD2k calculáu al cartafueyos"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Guardar como"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Guardar l'enllaz eD2k calculáu nun ficheru"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Tocante a aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Seleiciona el ficheru del que quieras calcular l'enllaz eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Nun pue abrise'l cartafueyos"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "¡Res pa copiar agora!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Seleiciona'l ficheru pal enllaz eD2k calculáu"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Imposible abrir"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Por favor, introduz un nome de ficheru"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "¡Nun hai res agora pa guardar!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, el criador d'enllaces eD2k de aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Imáxenes dende http://www.everaldo.com y http://www.icomania.com\n"
+"y http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distribuyíu baxo la llicencia GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Calculando hash..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator trabayando pa ti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Calculando MD4 Hash..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Calculando eD2k Hashes..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "¡ Encaboxáu !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Coneutáu a %s %s"
+msgid "Done in %.2f s"
+msgstr "Fináu en %.2f s"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "¡ Yá amestaste esa URL !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Por favor, introduz una URL"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "Coneutando a %s"
+msgid "Unable to open %s"
+msgstr "Nun ye dable abrir %s"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Desconeutáu de eD2k"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i día(es) %i hora(es) %i min %i s"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad aniciáu."
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad deteníu."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Coneutáu a Kad (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Coneutáu a Kad (tres torgafueos)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Desconeutáu de Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, Estadístiques aMule en llinia"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Máximu índiz Desc dende que wxCas ta executándose: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Máximu índiz Desc absolutu durante execuciones anteriores de wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistema"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Parar auto recargar"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Salvar imaxe d'estadístiques en llinia"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Imprentar imaxe d'estadístiques en llinia"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Opciones"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Tocante a wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Aniciar Auto Recargar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Auto recargar, deteníu"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Auto recargar, aniciáu"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Salvar imaxe d'estadístiques"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Estadístiques aMule en llinia"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Red Kad nun pue usase si'l puertu UDP ta deshabilitáu n'opciones, non "
-"aniciando."
+"Hebo un fallu imprentando.\n"
+"Seique la to imprentadora actual nun tea configurada"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Red Kad deshabilitada n'opciones, nun coneutará."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Imprentando"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
-"¡ Nun pudo abrise'l ficheru de collacios 'emfriends.met' pa la so llectura !"
+"wxCas, Estadística de robla en llinia de aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Eeepa, aMule nun ta executándose..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule yá ta executándose"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule ta executándose, pero ta desconeutáu"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule ta coneutando..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh Oh, l'estáu d'aMule ye desconocíu..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " foi executáu durante "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " ¡ ta deteníu !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " ¡ nun ta coneutáu !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " ta coneutando..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " ta faciendo daqué raro, ¡ compruébalo !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " ta coneutáu a "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "apagáu"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " coneutáu "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " con "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Total Descargáu: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Xubío:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Descarga de sesión"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Descargáu:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Xuba: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Compartiendo:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " ficheru(os), Veceros na cola: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Tiempu:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " en "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Media de carga del sistema (1-5-15 min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Tiempu d'execución del sistema: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Direutoriu que contién el ficheru amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Introduz el direutoriu au s'alluga'l to ficheru amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Intervalu de refrescu en segundos"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Xenerar un ficheru d'estadístiques siempres que s'actualice"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Introduz el direutoriu au quies xenerar la imaxe d'estadístiques"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Xube periódicamente la to imaxe d'estadístiques al sirvidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "Url FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Direutoriu FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Introduz la URL del to sirvidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
-"¡ Nun pudo abrise'l ficheru de collacios 'emfriends.met' pa la so escritura !"
+"Introduz el direutoriu del to sirvidor FTP au poner la to imaxe "
+"d'estadístiques"
 
-#~ msgid "Fetching status..."
-#~ msgstr "Obteniendo estáu..."
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Usuariu"
 
-#~ msgid "Now, exiting main app..."
-#~ msgstr "Agora, saliendo de l'aplicación principal..."
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Introduz el nome d'usuariu pa coneutate al to sirvidor FTP"
 
-#~ msgid "Killing amuleweb instance with pid `%ld' ... "
-#~ msgstr "Matando instancia amuleweb con pid `%ld' ... "
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Introduz la contraseña d'usuariu pa coneutate al to sirvidor FTP"
 
-#~ msgid "Killed!"
-#~ msgstr "¡Matáu!"
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Intervalu d'actualización de FTP en minutos"
 
-#~ msgid "aMule OnExit: Terminating core."
-#~ msgstr "aMule OnExit: Terminando núcleu."
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Validáu"
 
-#~ msgid "aMule shutdown completed."
-#~ msgstr "Zarru d'aMule completáu."
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Direutoriu que contién el to ficheru de robla"
 
-#~ msgid "Memory debug results for aMule exit:"
-#~ msgstr "Resultaos de depuración de memoria na salida d'aMule: "
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Direutoriu au se xenera la imaxe d'estadístiques"
 
-#~ msgid ""
-#~ "\n"
-#~ "EC configuration"
-#~ msgstr ""
-#~ "\n"
-#~ "Configuración EC"
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Carga la plantía <str>"
 
-#~ msgid "Password set and external connections enabled."
-#~ msgstr "Contraseña fixada y conexones esternes habilitaes."
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Puertu HTTP del sirvidor web"
 
-#~ msgid "Using amuleweb in '%s'."
-#~ msgstr "Usando amuleweb en '%s'."
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Usar forwarding de puertos UPnP nel puertu del sirvidor web"
 
-#~ msgid "Server hostname notified"
-#~ msgstr "Nome sirvidor notificáu"
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Puertu UPnP"
 
-#~ msgid ""
-#~ "ERROR: A valid password is required to use external connections, and "
-#~ "aMule daemon cannot be used without external connections. To run aMule "
-#~ "deamon, you must set the \"ECPassword\" field in the file ~/.aMule/amule."
-#~ "conf with an appropriate value. Execute amuled with the flag --ec-config "
-#~ "to set the password. More information can be found at http://wiki.amule."
-#~ "org"
-#~ msgstr ""
-#~ "ERROR: Contraseña válida ye requería pa usar conexones esternes y el "
-#~ "demoniu aMule nun pue usase ensin conexones esternes. P'aniciar el "
-#~ "demoniu aMule, tienes d'especificar nel campu \"ECPassword\" del ficheru "
-#~ "~/.aMule/amule.conf col valor apropiáu. Executa amuled col parámetru --ec-"
-#~ "config pa especificar la contraseña. Más información pue alcontrase en "
-#~ "http://wiki.amule.org"
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Usar compresión gzip"
 
-#~ msgid "amuled: OnInit - starting timer"
-#~ msgstr "amuled: EnAniciu - Aniciando reló"
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Contraseña d'accesu total pal sirvidor web"
 
-#~ msgid "amuled: forking to background - see you"
-#~ msgstr "amuled: derivando al fondu - vémonos"
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Contraseña d'invitáu pa sirvidor web"
 
-#~ msgid "Shutting down aMule..."
-#~ msgstr "Apagando aMule..."
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Permitir accesu a invitáu"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Denegar accesu a invitáu"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Cargar/guardar la configuración del sirvidor web dende/a aMule remotu"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Camín al ficheru config de aMule. ¡NUN USAR DIREUTAMENTE!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Deshabilitar intérprete PHP (desusu)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Recompila páxines PHP pa otra solicitú"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Sirvidor Web aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "conexón aceutada del veceru web\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "FALLU: nun pue aceutase la conexón del veceru web\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Solicitú fallía col siguiente fallu: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Ficheru índiz non alcontráu: "
 
-#~ msgid "aMule dialog destroyed"
-#~ msgstr "Diálogu aMule afaráu"
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Sesión finada - solicitando conexón\n"
 
-#~ msgid "Launch Command: "
-#~ msgstr "Llanzar comandu:"
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sesión ok, coneutáu\n"
 
-#~ msgid "aMule remote control"
-#~ msgstr "control remotu de aMule"
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sesión ok, non coneutáu\n"
 
-#~ msgid "Fatal Error: Failed to create Core Timer"
-#~ msgstr "Fallu Grave: Nun pudo criase'l temporizador"
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Nun hai denguna sesión - coneute de nuevu\n"
 
-#~ msgid "Fatal Error: Failed to create Poll Timer"
-#~ msgstr "Fallu Grave: Nun pudo criase'l temporizador"
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Sesión criada - solicitando conexón\n"
 
-#~ msgid "Going to event loop..."
-#~ msgstr "Diendo a eventu bucle..."
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Procesando solicitú [orixinal]: "
 
-#~ msgid "Connecting..."
-#~ msgstr "Coneutando..."
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Nun s'especificó dengún password, nun se permite l'accesu."
 
-#~ msgid "Remote GUI EC event handler"
-#~ msgstr "Remanador d'eventu EC n'Interface Remota"
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Comprobando contraseña\n"
 
-#~ msgid "Going down"
-#~ msgstr "Baxando"
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Hash de la contraseña incorreutu\n"
 
-#~ msgid "Ready"
-#~ msgstr "Llistu"
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Contraseña ok\n"
 
-#~ msgid "Searching buddy for lowid connection"
-#~ msgstr "Guetando a un collaciu con conexón idbaxa"
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Contraseña incorreuta\n"
 
-#~ msgid "Part"
-#~ msgstr "Parte"
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr ""
+"Nun introduxisti denguna contraseña. Nun ta permitía una contraseña en "
+"blancu.\n"
 
-#~ msgid "Saving PartFile %u of %u"
-#~ msgstr "Guardando ficheru part %u de %u"
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Desconexón solicitada\n"
 
-#~ msgid "All PartFiles Saved."
-#~ msgstr "Tolos ficheros part atroxaos."
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Procesando solicitú [redirixía]: "
 
-#~ msgid "Loading temp files from %s."
-#~ msgstr "Cargando ficheros temporales dende %s."
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Albanés"
 
-#~ msgid "Loading PartFile %u of %u"
-#~ msgstr "Cargando ficheru part %u de %u"
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Estáu de la descarga"
 
-#~ msgid "All PartFiles Loaded."
-#~ msgstr "Tolos ficheros part cargaos."
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
 
-#~ msgid "Failed to open ED2KLinks file."
-#~ msgstr "Fallu al abrir ficheru ED2KLinks."
+#~ msgid "..."
+#~ msgstr "..."
 
-#~ msgid "CRITICAL - no client on StartChatSession"
-#~ msgstr "CRITICU - ensin veceru en sesión charra d'aniciu"
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
 
-#~ msgid "HTTP download cancelled"
-#~ msgstr "Descarga HTTP encaboxada"
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
 
-#~ msgid "HTTP download thread started"
-#~ msgstr "Descarga HTTP filu entamáu"
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
 
-#~ msgid "Download size: %i"
-#~ msgstr "Tamañu de descarga: %i"
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
 
-#~ msgid "HTTP download thread ended"
-#~ msgstr "Descarga HTTP filu fináu"
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Intervalu d'actualización: %d seg"
+#~ msgstr[1] "Intervalu d'actualización: %d segs"
 
-#~ msgid "Host: %s:%i\n"
-#~ msgstr "Host: %s:%i\n"
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr "Comentarios y valoraciones entá nun tán sofitaos na gui remota"
 
-#~ msgid "Response: %i (Error: %i)"
-#~ msgstr "Rempuesta: %i (Error: %i)"
+#~ msgid "Transferring"
+#~ msgstr "Tresfiriendo"
 
-#~ msgid "WARNING: Void response on stream creation"
-#~ msgstr "ALERTA: Rempuesta erma na criación del mediu"
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "LC: %u"
 
-#~ msgid "ERROR: Redirection code received with no URL"
-#~ msgstr "FALLU: Códigu de redireición ensin URL"
+#~ msgid "QR: %u"
+#~ msgstr "LC: %u"
 
-#~ msgid "Download new GeoIP.dat from %s"
-#~ msgstr "Descargar nuevu GeoIP.dat dende %s"
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "En cola"
 
-#~ msgid "Download of GeoIP.dat file failed, aborting update."
-#~ msgstr "Fallu al descargar ficheru GeoIP.dat, albortando actualización."
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TOU - amuesa'l progresu d'una gueta"
 
-#~ msgid "Failed to remove GeoIP.dat file, aborting update."
-#~ msgstr "Fallu al desaniciar el ficheru GeoIP.dat, albortando actualización."
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Entamando a criar el hash MD4 y AICH del ficheru: %s"
 
-#~ msgid "Failed to rename new GeoIP.dat file, aborting update."
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Entamando a criar el hash MD4 del ficheru: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Entamando a criar el hash AICH del ficheru: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
 #~ msgstr ""
-#~ "Fallu al renomar el nuevu ficheru GeoIP.dat, albortando actualización."
+#~ "ALERTA: Nun se pue desaniciar '%s' orixinal, criando copia de seguridá"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "ALERTA: Fallu al desaniciar %s"
 
-#~ msgid "Successfully updated GeoIP.dat"
-#~ msgstr "Actualizacion GeoIP.dat satisfactoria"
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
 
-#~ msgid "Error updating GeoIP.dat"
-#~ msgstr "Fallu actualizando GeoIP.dat"
+#~ msgid "Rating (total):"
+#~ msgstr "Calificación (total):"
 
-#~ msgid "Failed to download GeoIP.dat from %s"
-#~ msgstr "Fallu al descargar GeoIP.dat dende %s"
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Tentar tresferir partes completes en toles xubes"
 
-#~ msgid "Keyword for search: %s"
-#~ msgstr "Pallabra clave pa gueta: %s"
+#~ msgid "Networks window"
+#~ msgstr "Ventana de redes"
 
-#~ msgid "Kademlia: Search keyword is already on search list: "
-#~ msgstr "Kademlia: Pallabra de gueta enforma curtia:"
+#~ msgid "Searches window"
+#~ msgstr "Ventana de gueta"
 
-#~ msgid "No contacts found, please bootstrap, or download a nodes.dat file."
-#~ msgstr "Contautos non alcontraos, por favor descarga un ficheru nodes.dat."
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Descargando"
 
-#~ msgid "ListenSocket: Ok."
-#~ msgstr "Socket d'escucha: Ok"
+#~ msgid "Shared files window"
+#~ msgstr "Ventana de ficheros compartíos"
+
+#~ msgid "Messages window"
+#~ msgstr "Ventana de mensaxes"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Ventana del gráficu de les estadístiques"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Ventana de la configuración de les preferencies"
 
 #~ msgid "Traybar-icon lost, trying to recreate ..."
 #~ msgstr "Iconu de sistema perdíu, tentando recrialu..."
 
-#~ msgid "seconds"
-#~ msgstr "segundos"
-
-#~ msgid ""
-#~ "Enter your browser name here. Leave this field empty to use the system "
-#~ "default browser."
-#~ msgstr ""
-#~ "Introduz el nome del to restolador. Déxalo ermo si quies usar el que hai "
-#~ "por defeutu."
+#~ msgid "Transfers"
+#~ msgstr "Tráficu"
 
-#~ msgid "Ports"
-#~ msgstr "Puertos"
+#~ msgid "Files transfers window"
+#~ msgstr "Ventana de tresferencia de ficheros"
 
-#~ msgid "4665"
-#~ msgstr "4665"
+#~ msgid "Unban"
+#~ msgstr "Realmitir"
 
-#~ msgid "Extended UDP port (Kad / global search) "
-#~ msgstr "Puertu UDP estándar (Kad / gueta global) "
+#~ msgid "Show Uploads"
+#~ msgstr "Amosar xubíes"
 
-#~ msgid "Enable UPnP for router port forwarding"
-#~ msgstr "Habilitar UPnP pal reunvíu de puertu del router"
+#~ msgid "Show Queue"
+#~ msgstr "Amosar Cola"
 
-#~ msgid "Bind local address to IP (empty for any):"
-#~ msgstr "Señes IP llocal de enllaz: (erma pa cualesquiera):"
+#~ msgid "Select View"
+#~ msgstr "Seleicionar Vista"
 
-#~ msgid ""
-#~ "Advanced users only: If you have multiple network interfaces, enter the "
-#~ "address of the interface to which aMule should be bound."
-#~ msgstr ""
-#~ "Namái usuarios avanzaos: Si tu tienes múltiples tarxetes de rede, "
-#~ "introduz la direición de la tarxeta, que aMule tendrá d'usar."
+#~ msgid "Client Software"
+#~ msgstr "Software Veceru"
 
-#~ msgid "Max simultaneous connections:"
-#~ msgstr "Máx. conexones al empar:"
+#~ msgid "Waited"
+#~ msgstr "N'espera"
 
-#~ msgid "Intelligent Corruption Handling (I.C.H.)"
-#~ msgstr "Remanador Intelixente de Corrupciones (I.C.H)"
+#~ msgid "Upload Time"
+#~ msgstr "Xubiendo"
 
-#~ msgid "Stop downloads when free disk space reaches "
-#~ msgstr "Detener descargues cuando s'algame l'espaciu llibre en discu"
+#~ msgid "Upload/Download"
+#~ msgstr "Xuba/Descarga"
 
-#~ msgid "Destination folder for downloads"
-#~ msgstr "Carpeta de destín pa les descargues"
+#~ msgid "Remote Status"
+#~ msgstr "Estáu remotu"
 
-#~ msgid "Folder for temporary download files"
-#~ msgstr "Carpeta pa los ficheros temporales de descargues"
+#~ msgid "File Priority"
+#~ msgstr "Prioridá del ficheru"
 
-#~ msgid "Shared folders"
-#~ msgstr "Carpetes compartíes"
+#~ msgid "Score"
+#~ msgstr "Resultáu"
 
-#~ msgid "Download graph scale:"
-#~ msgstr "Descargar escala gráfica:"
+#~ msgid "Asked"
+#~ msgstr "Entrugáu"
 
-#~ msgid "Upload graph scale:"
-#~ msgstr "Escala gráfica de descarga:"
+#~ msgid "Last Seen"
+#~ msgstr "Cabera comprobación"
 
-#~ msgid "Colours: "
-#~ msgstr "Colores: "
+#~ msgid "Entered Queue"
+#~ msgstr "Entráu na cola"
 
-#~ msgid "Tree"
-#~ msgstr "Árbol"
+#~ msgid "Transferred Up"
+#~ msgstr "Xubío"
 
-#~ msgid "Skin to use: "
-#~ msgstr "Tema a usar: "
+#~ msgid "Transferred Down"
+#~ msgstr "Descargáu"
 
-#~ msgid "- default -"
-#~ msgstr "- Por defeutu -"
+#~ msgid "Userhash"
+#~ msgstr "Hash d'usuariu"
 
-#~ msgid "Before application name"
-#~ msgstr "Enantes del nome de l'aplicación"
+#~ msgid "Encrypted"
+#~ msgstr "Cifráu"
 
-#~ msgid "After application name"
-#~ msgstr "Dempués del nome de l'aplicación"
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "Cargaes %d semeyes de banderes."
 
-#~ msgid "Web server UPnP TCP port (Optional)"
-#~ msgstr "Puertu HTTP del sirvidor web (Opcional)"
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Amosar xuba / Cola de xuba"
 
-#~ msgid "Save online signature file in: "
-#~ msgstr "Guardar ficheru de robla online en: "
+#~ msgid "Clients on queue :"
+#~ msgstr "Veceros na cola :"
 
-#~ msgid "Show received messages in the log"
-#~ msgstr "Amosar mensaxes recibíos nel rexistru"
+#~ msgid "Current Session"
+#~ msgstr "Sesión actual"
 
-#~ msgid "Username: "
-#~ msgstr "Nome d'usuariu:"
+#~ msgid "Total"
+#~ msgstr "Total"
 
-#~ msgid "Waiting for partfile convert thread to die..."
-#~ msgstr "Esperando a ficheru part matando filu..."
+#~ msgid "Requested :"
+#~ msgstr "Peticiones:"
 
-#~ msgid "IO failure while saving partfile: "
-#~ msgstr "ERROR E/S atroxando ficheru part: "
+#~ msgid "Create backup for preview"
+#~ msgstr "Criar un copia pa la previsualización"
 
-#~ msgid "Invalid category found, skipping"
-#~ msgstr "Categoría inválida alcontrada, saltando"
+#~ msgid "Files Transfers Window"
+#~ msgstr "Ventana de tresferencies de ficheros"
 
-#~ msgid "Dropping non-existing shared directory: %s"
-#~ msgstr "Quitando direutoriu compartíu non esistente: %s"
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Total Usuarios: %s | Total Ficheros: %s"
 
-#~ msgid "Failed to connect Cfg to widget with the ID %d and key %s"
-#~ msgstr "Error al coneutar configuración con programa, col ID %d y clave %s"
+#~ msgid "HTTP download thread started"
+#~ msgstr "Descarga HTTP filu entamáu"
 
-#~ msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+#~ msgid "Download size not received, downloading until connection is closed"
 #~ msgstr ""
-#~ "Error al tresferir datos dende la configuración al programa, col ID %d y "
-#~ "la clave %s"
+#~ "Nun se recibió tamañu de la descarga; descargando hasta que se zarre la "
+#~ "conexón"
 
-#~ msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
-#~ msgstr ""
-#~ "Error al tresferir datos dende'l programa a la configuración, col ID %d y "
-#~ "la clave %s"
+#~ msgid "Download size: %i"
+#~ msgstr "Tamañu de descarga: %i"
 
-#~ msgid "Received late result of DNS lookup, discarding."
-#~ msgstr "Recibióse'l caberu resultáu de la to gueta DNS, descartando."
+#~ msgid "HTTP download thread ended"
+#~ msgstr "Descarga HTTP filu fináu"
 
-#~ msgid "Firewalled - open TCP port %d in your router or firewall"
-#~ msgstr "Tres torgafueos - abre'l puertu TCP %d nel to router o torgafueos"
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Host: %s:%i\n"
 
-#~ msgid "UDP Connection State:"
-#~ msgstr "Estáu de conexón UDP:"
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Rempuesta: %i (Error: %i)"
 
-#~ msgid "Firewalled - open UDP port %d in your router or firewall"
-#~ msgstr "Tres torgafueos - abre'l puertu UDP %d nel to router o torgafueos"
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "ALERTA: Rempuesta erma na criación del mediu"
 
-#~ msgid "No buddy required - TCP port open"
-#~ msgstr "Nun se requier collaciu - puertu TCP abiertu"
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "FALLU: Códigu de redireición ensin URL"
 
-#~ msgid "No buddy required - UDP port open"
-#~ msgstr "Nun se requier collaciu - puertu UDP abiertu"
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country(): Fallu al cargar el datu del país dende "
 
-#~ msgid "Connected to buddy at %s"
-#~ msgstr "Coneutáu a collaciu en %s"
+#~ msgid "Get IPFilter level."
+#~ msgstr "Obtener nivel de fieltráu de IP."
 
-#~ msgid "Indexed sources:"
-#~ msgstr "Fontes indizaes: %s"
+#~ msgid "Makes a search."
+#~ msgstr "Fai una gueta."
 
-#~ msgid "Indexed keywords:"
-#~ msgstr "Pallabres clave indizaes:"
+#~ msgid "Killed!"
+#~ msgstr "¡Matáu!"
+
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Usando amuleweb en '%s'."
+
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Apagando aMule..."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Les siguientes opciones camudaron nesta versión por razones de seguridá:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Activáu sofitu d'ofuscación de protocolu pa conexones entrantes y "
+#~ "salientes.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Desactivada l'actualización de la llista de sirvidores dende otru "
+#~ "veceru o sirvidor.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Pa más información de la sida d'estos cambeos, guete información\n"
+#~ "de \"fake servers\" na wiki de aMule http://wiki.amule.org.\n"
+#~ "Ye importante que llimpie cualesquier sirvidor falsu de la so llista de "
+#~ "sirvidores pa que aMule furrule correcho."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Adicionalmente, les opciones del restolador foron restauraes. Por favor "
+#~ "configura les opciones del to restolador otra vegada si ye necesario.\n"
+
+#~ msgid "Fetching status..."
+#~ msgstr "Obteniendo estáu..."
 
-#~ msgid "Indexed notes:"
-#~ msgstr "Notes indizaes: "
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Usuarios: E: %s K: %s | Ficheros E: %s K: %s"
 
-#~ msgid "Indexed load:"
-#~ msgstr "Notes indizaes:"
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Veceru %s en IP:Puertu %s:%d usando %s %s %s"
 
-#~ msgid "Adding file %s to shares"
-#~ msgstr "Amestando ficheru %s a compartíos"
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "¡Nun se pue determinar el restolador seleicionáu!"
 
-#~ msgid "Shared directory not found, skipping: %s"
-#~ msgstr "Direutoriu compartíu non alcontráu, saltando: %s"
+#~ msgid "User Defined"
+#~ msgstr "Definíu pol usuariu"
 
-#~ msgid "No shareable files found in directory: %s"
-#~ msgstr "Ensin ficheros que compartir en direutoriu: %s"
+#~ msgid "Firewalled"
+#~ msgstr "Tres Tornafueos"

aMule-2.2.6.tar.bz2/po/bg.po -> aMule-2.3.1.tar.bz2/po/bg.po Changed

@@ -1,6 +1,6 @@
 # translation of source_strings.po to Bulgarian
 # aMule i18n resource file.
-# Copyright (C) 2004 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the aMule package.
 # Kry <elkry@users.sourceforge.net>, 2004.
 # Boyan Ivanov <boyan17@bulgaria.com>, 2004.
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: source_strings\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
 "PO-Revision-Date: 2004-02-07 21:55+0200\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -19,1271 +19,1078 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr ""
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Добавяне на приятел"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr ""
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Трябва да въведете валиден адрес и порт"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr ""
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Грешка при запис на файла с кредити"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
+#: src/amule.cpp:258
+#, c-format
+msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Завършено"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Пауза"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
+#: src/amule.cpp:261
+#, c-format
+msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Изтегляне"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Грешка"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr ""
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "Потвърждение за изход"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
 msgstr ""
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
 msgstr ""
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
 msgstr ""
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
 msgstr ""
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
+#: src/amule.cpp:581
+msgid "Server list download"
 msgstr ""
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Неизвестен"
-
-#: src/BaseClient.cpp:1738
+#: src/amule.cpp:654
 #, c-format
-msgid " (Fake eMule version %#x)"
+msgid "web server running on pid %d"
 msgstr ""
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
+#: src/amule.cpp:658
+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/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
 msgstr ""
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:741
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
+msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/BaseClient.cpp:1960
+#: src/amule.cpp:768
 #, c-format
-msgid "NickName: %s ID: %u"
+msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/BaseClient.cpp:1962
-#, fuzzy, c-format
-msgid "Requested: %s\n"
-msgstr "Поискан:"
-
-#: src/BaseClient.cpp:1964
-#, fuzzy, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Статистика за текущата сесия : Приети %d от %d заявки,%s осъществени\n"
-msgstr[1] ""
-"Статистика за текущата сесия : Приети %d от %d заявки,%s осъществени\n"
-
-#: src/BaseClient.cpp:1967
-#, fuzzy, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Статистика за текущата сесия : Приети %d от %d заявки,%s осъществени\n"
-msgstr[1] ""
-"Статистика за текущата сесия : Приети %d от %d заявки,%s осъществени\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Заявен е несъществуващ файл"
-
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Потребителско име"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Приятели"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Показване на &детайли"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Добавяне на приятел"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Изтриване на приятел"
-
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Изпращане на &съобщение"
-
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Преглед на файловете"
-
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Създаване на приятелска връзка"
-
-#: src/FriendListCtrl.cpp:273
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected friend?"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
 msgstr ""
-"Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/FriendListCtrl.cpp:275
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected friends?"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
 msgstr ""
-"Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Отказ"
-
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1031
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
-msgstr ""
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
 msgstr ""
 
-#: src/UserEvents.h:60
-msgid "Download completed"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
 msgstr ""
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
 msgstr ""
 
-#: src/UserEvents.h:87
-msgid "Message sender."
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/UserEvents.h:92
-msgid "Out of space"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
 msgstr ""
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Име на файл"
-
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Размер"
-
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Тип"
-
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Приоритет"
-
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Заявки"
-
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Приети заявки"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Пренесени данни"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Ниско"
-
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Нормален"
-
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Високо"
-
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Автоматично"
-
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+#: src/amule.cpp:1879
+msgid "Kad started."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Трябва да имате HighID, за да създадете валиден сорс линк"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Споделени файлове (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
 msgstr ""
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
 msgstr ""
 
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/TextClient.h:60
-msgid "aMule text client"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:374
+#: src/amuled.cpp:711
 #, c-format
-msgid "Request failed with the following error: %s."
+msgid "ERROR: %s"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr ""
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Свързва"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr ""
+#: src/amuleDlg.cpp:719
+#, fuzzy
+msgid "Kad: Connected"
+msgstr "Връзкате е установена"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr ""
+#: src/amuleDlg.cpp:724
+#, fuzzy
+msgid "Kad: Connecting"
+msgstr "Свързва"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr ""
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Отказ"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr ""
+#: src/amuleDlg.cpp:775
+#, fuzzy
+msgid "Stop the current connection attempts"
+msgstr "Спира текущите опити за свързване"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr ""
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Разкачи"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr ""
+#: src/amuleDlg.cpp:781
+#, fuzzy
+msgid "Disconnect from the currently connected networks"
+msgstr "Изключване от текущия сървър"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr ""
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Връзка"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
 msgstr ""
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Изтеглям..."
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Кач.: %.1f(%.1f) | Свал.: %.1f(%.1f)"
 
-#: src/HTTPDownload.cpp:75
+#: src/amuleDlg.cpp:848
 #, c-format
-msgid "( %s / %s )"
-msgstr ""
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Кач.: %.1f | Свал.: %.1f"
 
-#: src/HTTPDownload.cpp:239
+#: src/amuleDlg.cpp:874
 #, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
+msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Настройки"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Избери"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr ""
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Наистина ли желаете да изключите aМуле?"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr ""
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Потвърждение за изход"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr ""
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Изтегляне"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr ""
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Съобщения"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr ""
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Статистика"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
-#, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr ""
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Настройки"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Нулира"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr ""
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Фатална грешка: не можах да създам брояч"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr ""
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Фатална грешка: не можах да създам брояч"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr ""
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "Свързва"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr ""
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Неизвестен"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr ""
+#: src/BaseClient.cpp:1590
+#, fuzzy
+msgid "Searching buddy for lowid connection"
+msgstr "изчакване за свързване..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr ""
+#: src/BaseClient.cpp:2029
+#, fuzzy, c-format
+msgid "Requested: %s\n"
+msgstr "Поискан:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr ""
+#: src/BaseClient.cpp:2031
+#, fuzzy, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Статистика за текущата сесия : Приети %d от %d заявки,%s осъществени\n"
+msgstr[1] ""
+"Статистика за текущата сесия : Приети %d от %d заявки,%s осъществени\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr ""
+#: src/BaseClient.cpp:2034
+#, fuzzy, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Статистика за текущата сесия : Приети %d от %d заявки,%s осъществени\n"
+msgstr[1] ""
+"Статистика за текущата сесия : Приети %d от %d заявки,%s осъществени\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr ""
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Заявен е несъществуващ файл"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
+#: src/BaseClient.cpp:2899
+#, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-#, fuzzy
-msgid " kB/s"
-msgstr "кБ/с"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr ""
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Категория"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
+#: src/CatDialog.cpp:87
+msgid "New Category"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr ""
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Изберете папка за входящи файлове"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/ChatSelector.cpp:129
 #, c-format
-msgid "%02uh %02umin %02us"
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
-#, c-format
-msgid "%02us"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
-#, c-format
-msgid "%.2f GB"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-#, fuzzy
-msgid "Cancelled !"
-msgstr "Отказ"
+#: src/ClientCreditsList.cpp:158
+#, fuzzy, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Файлът с кредити зареден, %u клиента са разпознати"
+msgstr[1] "Файлът с кредити зареден, %u клиента са разпознати"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientCreditsList.cpp:161
 #, c-format
-msgid "Unable to open %s"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr ""
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Добавяне"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Изчисти"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Старт"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr ""
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Връзкате е установена"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Изход"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Връзката е разпадната"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-#, fuzzy
-msgid "Can't open the clipboard"
-msgstr "Копиране на ED2k линк в системния буфер (име на хост)"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
+#: src/ClientTCPSocket.cpp:928
+#, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
+#: src/ClientTCPSocket.cpp:933
+#, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
+#: src/ClientTCPSocket.cpp:982
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr ""
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Коментари за файла"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr ""
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Потребителско име"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr ""
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Име на файл"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr ""
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Оценка"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
-#, c-format
-msgid "Processing file number %u: %s"
-msgstr ""
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Няма коментари"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr ""
+#: src/CommentDialogLst.cpp:105
+#, fuzzy, c-format
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "Няма коментари"
+msgstr[1] "Няма коментари"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
 #: src/DataToText.cpp:37
@@ -1298,31 +1105,57 @@
 msgid "Auto [Hi]"
 msgstr "Автоматичен [Hi]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Свързва"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr ""
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Ниско"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Нормален"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Високо"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr ""
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr ""
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Запитване"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Свързване чрез сървър"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Опашката е пълна"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "На опашката"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Сваляне"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Изтегляне"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1348,8 +1181,7 @@
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr ""
 
@@ -1381,8 +1213,8 @@
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr ""
 
@@ -1403,12 +1235,11 @@
 msgstr ""
 
 #: src/DataToText.cpp:135
-#, fuzzy
 msgid "Search Result"
-msgstr "Резултати от Търсене"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Завършен"
 
@@ -1432,7 +1263,7 @@
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr ""
 
@@ -1444,5516 +1275,6025 @@
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
 
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Размер"
 
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr ""
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Пренесен"
 
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Скорост"
 
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr ""
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Прогрес"
 
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Източници"
 
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Каталунски"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Приоритет"
 
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Статус"
 
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "Croatian"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
 msgstr ""
 
-#: src/Preferences.cpp:638
-msgid "Czech"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
 msgstr ""
 
-#: src/Preferences.cpp:639
-msgid "Danish"
+#: src/DownloadListCtrl.cpp:411
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected file?"
 msgstr ""
+"Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/Preferences.cpp:640
-msgid "Dutch"
+#: src/DownloadListCtrl.cpp:413
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected files?"
 msgstr ""
+"Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
 
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Автоматично"
 
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr ""
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Стоп"
 
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Френски"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Пауза"
 
-#: src/Preferences.cpp:645
-msgid "Galician"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "В&ъзобновява"
+
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
 msgstr ""
 
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Немски"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr ""
 
-#: src/Preferences.cpp:647
-msgid "Greek"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/Preferences.cpp:648
-msgid "Hebrew"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/Preferences.cpp:649
-msgid "Hungarian"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
 msgstr ""
 
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Италиански"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Преглед"
 
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
 msgstr ""
 
-#: src/Preferences.cpp:652
-msgid "Japanese"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
 msgstr ""
 
-#: src/Preferences.cpp:653
-msgid "Korean"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:656
-msgid "Polish"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
 msgstr ""
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
 msgstr ""
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
 msgstr ""
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Руски"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr ""
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
 msgstr ""
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
 msgstr ""
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
+#: src/DownloadListCtrl.cpp:1268
+#, c-format
+msgid "Downloads (%i)"
+msgstr "Файлове за сваляне (%i)"
+
+#: src/DownloadListCtrl.cpp:1412
+msgid ""
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
 msgstr ""
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
+#: src/DownloadListCtrl.cpp:1461
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
 msgstr ""
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/Preferences.cpp:1681
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "Искане на споделени файлове от '%s'"
+
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "Default port will be used (%d)"
+msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Име на сървър"
+#: src/DownloadQueue.cpp:154
+msgid ""
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Порт"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Не са открити части от файлове"
 
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Описание"
+#: src/DownloadQueue.cpp:168
+#, fuzzy, c-format
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Открити са %i части от файлове"
+msgstr[1] "Открити са %i части от файлове"
 
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Потребители"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Файлове"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Грешка"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Статичен"
+#: src/DownloadQueue.cpp:374
+#, c-format
+msgid "Downloading %s"
+msgstr "Сваляне %s"
 
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
+#: src/DownloadQueue.cpp:382
+#, c-format
+msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:144
-msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+#: src/DownloadQueue.cpp:394
+#, c-format
+msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
+#: src/DownloadQueue.cpp:399
+#, c-format
+msgid "You are already trying to download the file %s"
+msgstr "Вие вече опитвате да свалите файла %s"
+
+#: src/DownloadQueue.cpp:1401
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
+#: src/DownloadQueue.cpp:1409
+#, c-format
+msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:149
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Are you sure you want to delete the static server %s"
+msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Да"
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Не"
+#: src/ExternalConn.cpp:278
+msgid "External connection closed."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
+#: src/ExternalConn.cpp:317
+msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Сървъри (%i)"
+#: src/ExternalConn.cpp:340
+msgid "External connections disabled in config file"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Сървър"
+#: src/ExternalConn.cpp:400
+msgid "New external connection accepted"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
+#: src/ExternalConn.cpp:403
+msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
+#: src/ExternalConn.cpp:421
+msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
+#: src/ExternalConn.cpp:430
+#, c-format
+msgid "Connecting client: %s %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
+#: src/ExternalConn.cpp:432
+msgid "Unknown version"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
+#: src/ExternalConn.cpp:442
+msgid ""
+"Incorrect EC version ID, there might be binary incompatibility. Use core and "
+"remote from same snapshot."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Премахване на сървър"
+#: src/ExternalConn.cpp:447
+msgid ""
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:440
-#, fuzzy
-msgid "Remove servers"
-msgstr "Премахване на сървър"
+#: src/ExternalConn.cpp:475
+msgid "Invalid protocol version."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Изтриване на всички сървъри"
+#: src/ExternalConn.cpp:480
+msgid "Missing protocol version tag."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:570
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected server?"
+#: src/ExternalConn.cpp:521
+msgid "Access granted."
 msgstr ""
-"Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/ServerListCtrl.cpp:572
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected servers?"
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
 msgstr ""
-"Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/OScopeCtrl.cpp:242
+#: src/ExternalConn.cpp:534
 #, c-format
-msgid "Disabled [%s]"
+msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/amuleDlg.cpp:210
+#: src/ExternalConn.cpp:799
 #, c-format
-msgid "This is aMule %s based on eMule."
+msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:212
+#: src/ExternalConn.cpp:801
 #, c-format
-msgid "Running on %s"
+msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
+msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
+#: src/ExternalConn.cpp:876
+msgid "Server not added"
 msgstr ""
 
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
+#: src/ExternalConn.cpp:894
+#, c-format
+msgid "server not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
+#: src/ExternalConn.cpp:910
+msgid "need to define server to be removed"
 msgstr ""
 
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/ExternalConn.cpp:924
+msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
+#: src/ExternalConn.cpp:1102
+msgid "Search in progress. Refetch results in a moment!"
 msgstr ""
 
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
+#: src/ExternalConn.cpp:1108
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
+#: src/ExternalConn.cpp:1306
+msgid "No points for graph."
 msgstr ""
 
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
+#: src/ExternalConn.cpp:1315
+msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/amuleDlg.cpp:469
-msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+#: src/ExternalConn.cpp:1342
+msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
+#: src/ExternalConn.cpp:1354
+msgid "Already shutting down."
 msgstr ""
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/ExternalConn.cpp:1366
+#, c-format
+msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#: src/ExternalConn.cpp:1372
+msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
+#: src/ExternalConn.cpp:1442
+msgid "File not found."
 msgstr ""
 
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
+#: src/ExternalConn.cpp:1447
+msgid "Invalid file name."
 msgstr ""
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
+#: src/ExternalConn.cpp:1455
+msgid "Unable to rename file."
 msgstr ""
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
+#: src/ExternalConn.cpp:1790
+msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/amuleDlg.cpp:696
-#, fuzzy
-msgid "Kad: Connected"
-msgstr "Връзкате е установена"
+#: src/ExternalConn.cpp:1793
+msgid "Connecting to eD2k..."
+msgstr ""
 
-#: src/amuleDlg.cpp:701
-#, fuzzy
-msgid "Kad: Connecting"
-msgstr "Свързва"
+#: src/ExternalConn.cpp:1801
+msgid "Already connected to Kad."
+msgstr ""
 
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
+#: src/ExternalConn.cpp:1804
+msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/amuleDlg.cpp:752
-#, fuzzy
-msgid "Stop the current connection attempts"
-msgstr "Спира текущите опити за свързване"
+#: src/ExternalConn.cpp:1811
+msgid "All networks are disabled."
+msgstr ""
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Разкачи"
+#: src/ExternalConn.cpp:1819
+msgid "Disconnected from eD2k."
+msgstr ""
 
-#: src/amuleDlg.cpp:758
-#, fuzzy
-msgid "Disconnect from the currently connected networks"
-msgstr "Изключване от текущия сървър"
+#: src/ExternalConn.cpp:1823
+msgid "Disconnected from Kad."
+msgstr ""
 
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Връзка"
+#: src/ExternalConn.cpp:1832
+#, c-format
+msgid "External Connection: invalid opcode received: %#x"
+msgstr ""
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
+#: src/ExternalConn.cpp:1835
+msgid "Invalid opcode (wrong protocol version?)"
 msgstr ""
 
-#: src/amuleDlg.cpp:810
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Кач.: %.1f(%.1f) | Свал.: %.1f(%.1f)"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr ""
 
-#: src/amuleDlg.cpp:812
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Кач.: %.1f | Свал.: %.1f"
+msgid "Unknown command '%s'.\n"
+msgstr ""
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:836
-#, c-format
-msgid "aMule (%s | Disconnected)"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Наистина ли желаете да изключите aМуле?"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Потвърждение за изход"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
 
-#: src/amuleDlg.cpp:1182
-#, c-format
-msgid "Skin directory '%s' does not exist"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1187
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
 msgstr ""
 
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
 msgstr ""
 
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
+#: src/ExternalConnector.cpp:248
+#, c-format
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
 msgstr ""
 
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
 msgstr ""
 
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Съобщения"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
 msgstr ""
 
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Статистика"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr ""
 
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
+#: src/ExternalConnector.cpp:302
+#, c-format
+msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
+#: src/ExternalConnector.cpp:357
+#, c-format
+msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
+#: src/ExternalConnector.cpp:359
+#, c-format
+msgid "This is %s %s\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
+#: src/ExternalConnector.cpp:414
+#, c-format
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
 msgstr ""
 
-#: src/amuleDlg.cpp:1468
-msgid "No network"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Общи"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Връзка"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Директории"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Сървъри"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:177
-#, fuzzy
-msgid "Filters"
-msgstr "Файлове"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Дистанционни управления"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
+#: src/FileDetailDialog.cpp:113
+#, c-format
+msgid "%.1f%% done"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Приятели"
+
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Показване на &детайли"
+
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Добавяне на приятел"
+
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Изтриване на приятел"
+
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Изпращане на &съобщение"
+
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Преглед на файловете"
+
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Създаване на приятелска връзка"
+
+#: src/FriendListCtrl.cpp:169
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected friend?"
 msgstr ""
+"Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
+#: src/FriendListCtrl.cpp:171
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected friends?"
 msgstr ""
+"Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/PrefsUnifiedDlg.cpp:560
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
 msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
+#: src/GenericClientListCtrl.cpp:547
+msgid "Send message to user"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
+#: src/GenericClientListCtrl.cpp:548
+msgid "Message to send:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
+#: src/GenericClientListCtrl.cpp:587
+msgid "Remove from friends"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
+#: src/GenericClientListCtrl.cpp:598
+msgid "Send message"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
+#: src/GenericClientListCtrl.cpp:600
+msgid "Swap to this file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
+#: src/GenericClientListCtrl.cpp:943
+msgid "A4AF"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
+msgstr "На опашката"
+
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
+msgid "Asked for another file"
+msgstr "Поискан му е друг файл"
+
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Файлове за качване: %i"
+
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "На опашката"
+
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Качване"
+
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "готово"
+
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Не"
+
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Да"
+
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Изтеглям..."
+
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+#: src/HTTPDownload.cpp:205
+#, c-format
+msgid "Unable to create destination file %s for download!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
+#: src/HTTPDownload.cpp:233
+#, c-format
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:920
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
+msgstr "Свален:"
+
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "Choose a folder for %s"
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Търсене на видео плеър"
+#: src/HTTPDownload.cpp:336
+msgid ""
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr ""
+
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "Executable%s"
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
+#, c-format
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
-"Тук добавете линкове за сваляне на .met файлове.\n"
-"Само по един URL на ред."
 
-#: src/PrefsUnifiedDlg.cpp:1031
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Failed to rename %s file, aborting update."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Successfully updated %s"
+msgstr ""
+
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "Connections Graph Scale: %d"
+msgid "Failed to download %s from %s"
+msgstr ""
+
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Грешка при зареждане на файла с кредити"
+
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
+#: src/IPFilter.cpp:503
+#, c-format
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1118
-#, fuzzy
-msgid "disabled"
-msgstr "деактивиране"
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Execute command on `%s' event"
+msgid "Nodes (%u)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
+#: src/KadDlg.cpp:213
+msgid "Continue?"
 msgstr ""
 
-#: src/ExternalConn.cpp:116
-msgid "External connection closed."
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
 msgstr ""
 
-#: src/ExternalConn.cpp:143
-msgid "External connections disabled due to empty password!"
+#: src/kademlia/kademlia/SearchManager.cpp:133
+#, c-format
+msgid "Keyword for search: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:168
-msgid "External connections disabled in config file"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/ExternalConn.cpp:217
-msgid "New external connection accepted"
+#: src/kademlia/routing/RoutingZone.cpp:172
+msgid ""
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
 
-#: src/ExternalConn.cpp:220
-msgid "ERROR: couldn't accept a new external connection"
-msgstr ""
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
+#, c-format
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:239
-msgid "External connection refused due to empty password in preferences!"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/ExternalConn.cpp:249
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Connecting client: %s %s"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/kademlia/routing/RoutingZone.cpp:338
+#, c-format
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
 msgstr ""
 
-#: src/ExternalConn.cpp:251
-msgid "Unknown version"
+#: src/KnownFile.cpp:1545
+msgid "File size"
 msgstr ""
 
-#: src/ExternalConn.cpp:262
-msgid ""
-"Incorrect EC version ID, there might be binary incompatibility. Use core and "
-"remote from same snapshot."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
 msgstr ""
 
-#: src/ExternalConn.cpp:267
-msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
 msgstr ""
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:292
-msgid "Invalid protocol version."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:296
-msgid "Missing protocol version tag."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
 msgstr ""
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/ExternalConn.cpp:306
-msgid "Access granted."
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/ExternalConn.cpp:564
-#, c-format
-msgid "Remote PartFile command failed: FileHash not found: %s"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/ExternalConn.cpp:566
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Неизвестно: %i"
+
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
 #, c-format
-msgid "FileHash not found: %s"
+msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
-msgid "OOPS! OpCode processing error!"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
 msgstr ""
 
-#: src/ExternalConn.cpp:659
-msgid "Server not added"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
 msgstr ""
 
-#: src/ExternalConn.cpp:677
-#, c-format
-msgid "server not found: %s"
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Завършено"
 
-#: src/ExternalConn.cpp:693
-msgid "need to define server to be removed"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Пауза"
+
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
 msgstr ""
 
-#: src/ExternalConn.cpp:707
-msgid "eD2k is disabled in preferences."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
 msgstr ""
 
-#: src/ExternalConn.cpp:803
-msgid "Search in progress. Refetch results in a moment!"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/ExternalConn.cpp:808
-msgid "WebSearch from remote interface makes no sense."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
 msgstr ""
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
 msgstr ""
 
-#: src/ExternalConn.cpp:1020
-msgid "No points for graph."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/ExternalConn.cpp:1029
-msgid "Your client is not configured for this detail level."
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:1057
-msgid "External Connection: shutdown requested"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
 msgstr ""
 
-#: src/ExternalConn.cpp:1069
-msgid "Already shutting down."
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/ExternalConn.cpp:1077
-#, c-format
-msgid "ExternalConn: adding link '%s'."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1083
-msgid "Invalid link or already on list."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
 msgstr ""
 
-#: src/ExternalConn.cpp:1168
-msgid "File not found."
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ExternalConn.cpp:1173
-msgid "Invalid file name."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/ExternalConn.cpp:1181
-msgid "Unable to rename file."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1405
-msgid "Already connected to eD2k."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1408
-msgid "Connecting to eD2k..."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Затвори"
+
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
 msgstr ""
 
-#: src/ExternalConn.cpp:1416
-msgid "Already connected to Kad."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
 msgstr ""
 
-#: src/ExternalConn.cpp:1419
-msgid "Connecting to Kad..."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
 msgstr ""
 
-#: src/ExternalConn.cpp:1424
-msgid "All networks are disabled."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Изчисти"
+
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
 msgstr ""
 
-#: src/ExternalConn.cpp:1432
-msgid "Disconnected from eD2k."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "кБ/с"
+
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
 msgstr ""
 
-#: src/ExternalConn.cpp:1436
-msgid "Disconnected from Kad."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/ExternalConn.cpp:1444
-#, c-format
-msgid "External Connection: invalid opcode received: %#x"
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
 msgstr ""
 
-#: src/ExternalConn.cpp:1447
-msgid "Invalid opcode (wrong protocol version?)"
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
 msgstr ""
 
-#: src/UploadClient.cpp:273
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
+msgid "UL: %u"
 msgstr ""
 
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
 msgstr ""
 
-#: src/TerminationProcess.cpp:48
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
+msgid "DL: %u"
 msgstr ""
 
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
+#: src/MuleTrayIcon.cpp:318
+#, c-format
+msgid "Download speed: %.1f"
 msgstr ""
 
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
+#: src/MuleTrayIcon.cpp:320
+#, c-format
+msgid "Upload speed: %.1f"
 msgstr ""
 
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
 msgstr ""
 
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Връзкате е установена"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
+#: src/MuleTrayIcon.cpp:330
+#, c-format
+msgid "Nickname: %s"
 msgstr ""
 
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/ServerWnd.cpp:208
-msgid "Running"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
 msgstr ""
 
-#: src/ServerWnd.cpp:214
-msgid "Status:"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
 msgstr ""
 
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Връзката е разпадната"
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr ""
 
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
 msgstr ""
 
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
 msgstr ""
 
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
+#: src/MuleTrayIcon.cpp:365
+#, c-format
+msgid "IP: %s"
 msgstr ""
 
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
+#: src/MuleTrayIcon.cpp:374
+#, c-format
+msgid "TCP port: %d"
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
+#: src/MuleTrayIcon.cpp:385
+#, c-format
+msgid "UDP port: %d"
 msgstr ""
 
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
 msgstr ""
 
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
 msgstr ""
 
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
 msgid "Uptime: %s"
 msgstr ""
 
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Трансфер"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
+#: src/MuleTrayIcon.cpp:412
+#, c-format
+msgid "Shared files: %d"
 msgstr ""
 
-#: src/Statistics.cpp:649
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "Uploaded Data (Session (Total)): %s"
+msgid "Queued clients: %d"
 msgstr ""
 
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Total Overhead (Packets): %s"
+msgid "Total DL: %s"
 msgstr ""
 
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "File Request Overhead (Packets): %s"
+msgid "Total UL: %s"
 msgstr ""
 
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
 msgstr ""
 
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
 msgstr ""
 
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
 msgstr ""
 
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
 msgstr ""
 
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Изход"
+
+#: src/muuli_wdr.cpp:75
+msgid "eD2k Link: "
 msgstr ""
 
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
+#: src/muuli_wdr.cpp:82
+msgid "Commit"
 msgstr ""
 
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
+#: src/muuli_wdr.cpp:83
+msgid ""
+"Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
+#: src/muuli_wdr.cpp:91
+msgid ""
+"Events are displayed here. For a complete list of events, refer to the log "
+"in the Servers-tab."
 msgstr ""
 
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Средно време за качване: %s"
+#: src/muuli_wdr.cpp:94
+msgid "Loading ..."
+msgstr "Зареждам..."
 
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
+#: src/muuli_wdr.cpp:102
+msgid "Number of users on the server you are connected to ..."
 msgstr ""
 
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
+#: src/muuli_wdr.cpp:105
+msgid "Users: 0"
 msgstr ""
 
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
+#: src/muuli_wdr.cpp:106
+msgid ""
+"Users connected to the current server and an estimate of the total number of "
+"users."
 msgstr ""
 
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
+#: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
 msgstr ""
 
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
+#: src/muuli_wdr.cpp:118
+msgid ""
+"Current average upload and download rates. If enabled the numbers in the "
+"braces signify the overhead from client communication."
 msgstr ""
 
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
+#: src/muuli_wdr.cpp:126
+msgid ""
+"Displays the connected status and active transfers. Red arrows signifies "
+"that you are currently not connected, yellow arrows signify that you have "
+"low ID (firewalled) and green arrows signify that you have high ID (The "
+"optimal connection type)."
 msgstr ""
 
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
+#: src/muuli_wdr.cpp:130
+msgid "Not Connected ..."
 msgstr ""
 
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
+#: src/muuli_wdr.cpp:131
+msgid "Currently connected server."
 msgstr ""
 
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
+#: src/muuli_wdr.cpp:177
+msgid "Search"
+msgstr "Търсене"
+
+#: src/muuli_wdr.cpp:183
+msgid "Name:"
 msgstr ""
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Повторни свързвания: %i"
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Тип"
 
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Изтекло време от пърия трансфер: %s"
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
+msgid "Local"
+msgstr ""
 
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Свързан към сървъра от : %s"
+#: src/muuli_wdr.cpp:197
+msgid "Global"
+msgstr ""
 
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
+#: src/muuli_wdr.cpp:199
+msgid "FileHash"
 msgstr ""
 
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
+#: src/muuli_wdr.cpp:207
+msgid "Extended Parameters"
 msgstr ""
 
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
+#: src/muuli_wdr.cpp:213
+msgid "Filtering"
 msgstr ""
 
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
+#: src/muuli_wdr.cpp:224
+msgid "File Type"
 msgstr ""
 
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Клиенти"
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Всеки"
 
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr ""
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Архиви"
 
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr ""
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Аудио"
 
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr ""
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD-изображения"
 
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr ""
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Картинки"
 
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr ""
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Програми"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
 msgstr ""
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr ""
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Клипове"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr ""
+#: src/muuli_wdr.cpp:254
+msgid "Extension"
+msgstr "Разширение"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
+#: src/muuli_wdr.cpp:260
+msgid "Min Size"
+msgstr "Минимален размер"
+
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+msgid "Bytes"
+msgstr "Байта"
+
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
+msgid "KB"
+msgstr "KB"
+
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
+msgid "Max Size"
+msgstr "Максимален размер"
+
+#: src/muuli_wdr.cpp:306
+msgid "Availability"
 msgstr ""
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
+#: src/muuli_wdr.cpp:319
+msgid "Filter:"
 msgstr ""
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
+#: src/muuli_wdr.cpp:328
+msgid "Filter Results"
 msgstr ""
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
+#: src/muuli_wdr.cpp:334
+msgid "Invert Result"
 msgstr ""
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
+#: src/muuli_wdr.cpp:340
+msgid "Hide Known Files"
 msgstr ""
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Общ размер на споределните файлове : %s"
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Старт"
 
-#: src/Statistics.cpp:731
-#, c-format
-msgid "Average file size: %s"
+#: src/muuli_wdr.cpp:356
+msgid "More"
 msgstr ""
 
-#: src/Statistics.cpp:872
-msgid "Operating System"
+#: src/muuli_wdr.cpp:357
+msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 
-#: src/Statistics.cpp:897
-msgid "Not Received"
+#: src/muuli_wdr.cpp:364
+msgid "Stop"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Изтегляне"
+
+#: src/muuli_wdr.cpp:378
+msgid "Reset Fields"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
+#: src/muuli_wdr.cpp:393
+msgid "Results"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
+#: src/muuli_wdr.cpp:422
+msgid "Clears completed downloads"
 msgstr ""
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Намерени източници: %i"
+
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Общи"
+
+#: src/muuli_wdr.cpp:525
+msgid "Full Name :"
 msgstr ""
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
+msgid "N/A"
+msgstr "Няма"
+
+#: src/muuli_wdr.cpp:536
+msgid "met-File :"
 msgstr ""
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
+#: src/muuli_wdr.cpp:547
+msgid "Hash :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
+#: src/muuli_wdr.cpp:562
+msgid "Filesize :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
+#: src/muuli_wdr.cpp:573
+msgid "Partfilestatus :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#: src/muuli_wdr.cpp:584
+msgid "Last seen complete :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Трансфер"
+
+#: src/muuli_wdr.cpp:606
+msgid "Found Sources :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+#: src/muuli_wdr.cpp:617
+msgid "Transferring Sources :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/muuli_wdr.cpp:628
+msgid "Filepart-Count :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
+#: src/muuli_wdr.cpp:639
+msgid "Available :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+#: src/muuli_wdr.cpp:650
+msgid "Datarate :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
+#: src/muuli_wdr.cpp:661
+msgid "Download Active Time: "
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
+#: src/muuli_wdr.cpp:672
+msgid "Transferred :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
+#: src/muuli_wdr.cpp:683
+msgid "Completed Size :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
+#: src/muuli_wdr.cpp:710
+msgid "Intelligent Corruption Handling"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
+#: src/muuli_wdr.cpp:719
+msgid "Lost to corruption :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/muuli_wdr.cpp:730
+msgid "Gained by compression :"
 msgstr ""
 
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
+#: src/muuli_wdr.cpp:741
+msgid "Packages saved by I.C.H. :"
 msgstr ""
 
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
+#: src/muuli_wdr.cpp:754
+msgid "File Names"
 msgstr ""
 
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
+#: src/muuli_wdr.cpp:763
+msgid "Takeover"
 msgstr ""
 
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
+#: src/muuli_wdr.cpp:773
+msgid "Cleanup"
+msgstr "Изчистване"
+
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
+msgid "Apply"
+msgstr "Потвърди"
+
+#: src/muuli_wdr.cpp:798
+msgid "Ok"
 msgstr ""
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
+#: src/muuli_wdr.cpp:823
+msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/KadDlg.cpp:197
+#: src/muuli_wdr.cpp:829
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
+#: src/muuli_wdr.cpp:841
+msgid "File Quality"
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr ""
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Няма оценки"
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr ""
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Грешен / Развален / Фалшив"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Добавяне на приятел"
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Лош"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Трябва да въведете валиден адрес и порт"
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Средно добър"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr ""
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Добър"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr ""
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Отличен"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Източници"
+#: src/muuli_wdr.cpp:854
+msgid "Choose the file rating or advice users if the file is invalid ..."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Файл"
+#: src/muuli_wdr.cpp:898
+msgid "Refresh"
+msgstr "Опресняване"
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Изтегляне"
+#: src/muuli_wdr.cpp:925
+msgid "Downloading, please wait ..."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Категория"
+#: src/muuli_wdr.cpp:931
+msgid "Unknown size"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
+#: src/muuli_wdr.cpp:955
+msgid "Required Information"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
+#: src/muuli_wdr.cpp:960
+msgid "IP Address :"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
+#: src/muuli_wdr.cpp:966
+msgid "Port :"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
+#: src/muuli_wdr.cpp:976
+msgid "Additional Information"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
+#: src/muuli_wdr.cpp:981
+msgid "Username :"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
+#: src/muuli_wdr.cpp:987
+msgid "Userhash :"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Добавяне"
+
+#: src/muuli_wdr.cpp:1046
+msgid "Download-Speed"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
+msgid "Current"
+msgstr "Текущ"
+
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
+msgid "Running average"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
+msgid "Session average"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#: src/muuli_wdr.cpp:1095
+msgid "Upload-Speed"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
+#: src/muuli_wdr.cpp:1144
+msgid "Connections"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
+msgid "Active downloads"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Пренесен"
+#: src/muuli_wdr.cpp:1173
+msgid "Active connections (1:1)"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Скорост"
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
+msgid "Active uploads"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Прогрес"
+#: src/muuli_wdr.cpp:1193
+msgid "Statistics Tree"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Статус"
+#: src/muuli_wdr.cpp:1223
+msgid "Username:"
+msgstr "Име на потребител:"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
+#: src/muuli_wdr.cpp:1226
+msgid "Userhash:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
+#: src/muuli_wdr.cpp:1249
+msgid "Client software:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
+#: src/muuli_wdr.cpp:1258
+msgid "Client version:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:581
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected file?"
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
+msgid "IP address:"
 msgstr ""
-"Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/DownloadListCtrl.cpp:583
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected files?"
+#: src/muuli_wdr.cpp:1274
+msgid "User ID:"
 msgstr ""
-"Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
-msgid "Send message to user"
+#: src/muuli_wdr.cpp:1281
+msgid "Server IP:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
-msgid "Message to send:"
+#: src/muuli_wdr.cpp:1290
+msgid "Server name:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Стоп"
+#: src/muuli_wdr.cpp:1297
+msgid "Obfuscation:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Пауза"
+#: src/muuli_wdr.cpp:1306
+msgid "Kad:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "В&ъзобновява"
+#: src/muuli_wdr.cpp:1317
+msgid "Transfers to client"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
+#: src/muuli_wdr.cpp:1322
+msgid "Current request:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
+#: src/muuli_wdr.cpp:1335
+msgid "Average upload rate:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
+#: src/muuli_wdr.cpp:1344
+msgid "Average download rate:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
+#: src/muuli_wdr.cpp:1351
+msgid "Uploaded (session):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
+#: src/muuli_wdr.cpp:1360
+msgid "Downloaded (session):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Преглед"
+#: src/muuli_wdr.cpp:1367
+msgid "Uploaded (total):"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
+#: src/muuli_wdr.cpp:1376
+msgid "Downloaded (total):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
+#: src/muuli_wdr.cpp:1387
+msgid "Scores"
+msgstr "Точки"
+
+#: src/muuli_wdr.cpp:1394
+msgid "DL/UP modifier:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
+#: src/muuli_wdr.cpp:1403
+msgid "Secure ident:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "Опашката е пълна"
+
+#: src/muuli_wdr.cpp:1419
+msgid "Queue score:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
+#: src/muuli_wdr.cpp:1448
+msgid "Nick"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Remove from friends"
+#: src/muuli_wdr.cpp:1452
+msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
-msgid "Send message"
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1017
-msgid "Swap to this file"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "кБ/с"
+#: src/muuli_wdr.cpp:1471
+msgid "Check for new version at startup"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
+#: src/muuli_wdr.cpp:1472
+msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1657
-msgid "A4AF"
+#: src/muuli_wdr.cpp:1475
+msgid "Start minimized"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/muuli_wdr.cpp:1476
+msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1721
-msgid "Asked for another file"
-msgstr "Поискан му е друг файл"
+#: src/muuli_wdr.cpp:1479
+msgid "Prompt on exit"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Файлове за сваляне (%i)"
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
+#: src/muuli_wdr.cpp:1487
+msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+#: src/muuli_wdr.cpp:1488
+msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
+#: src/muuli_wdr.cpp:1491
+msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
+#: src/muuli_wdr.cpp:1492
+msgid ""
+"Enabling this will make aMule minimize to the System Tray, rather than the "
+"taskbar."
 msgstr ""
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
 msgstr ""
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#: src/muuli_wdr.cpp:1511
+msgid "Browser Selection"
 msgstr ""
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/muuli_wdr.cpp:1517
+msgid ""
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Избери"
+
+#: src/muuli_wdr.cpp:1525
+msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/muuli_wdr.cpp:1527
+msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
+#: src/muuli_wdr.cpp:1532
+msgid "Video Player"
+msgstr "Видео плеър"
+
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr ""
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
+#: src/muuli_wdr.cpp:1579
+msgid "Upload"
+msgstr "Качване"
+
+#: src/muuli_wdr.cpp:1588
+msgid "Slot Allocation"
 msgstr ""
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
 msgstr ""
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
 msgstr ""
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
+#: src/muuli_wdr.cpp:1611
+msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
 msgstr ""
 
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr ""
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
 msgstr ""
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
+#: src/muuli_wdr.cpp:1649
 msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
 msgstr ""
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
+#: src/muuli_wdr.cpp:1676
+msgid "Kademlia"
 msgstr ""
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
 msgstr ""
 
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/muuli_wdr.cpp:1689
+msgid "Autoconnect on startup"
 msgstr ""
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+#: src/muuli_wdr.cpp:1692
+msgid "Reconnect on loss"
 msgstr ""
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+#: src/muuli_wdr.cpp:1716
+msgid "Remove dead server after"
 msgstr ""
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
+#: src/muuli_wdr.cpp:1722
+msgid "retries"
 msgstr ""
 
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+#: src/muuli_wdr.cpp:1729
+msgid "Auto-update server list at startup"
 msgstr ""
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
+#: src/muuli_wdr.cpp:1732
+msgid "List"
+msgstr "Списък"
+
+#: src/muuli_wdr.cpp:1737
+msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
+#: src/muuli_wdr.cpp:1740
+msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Спрян"
+#: src/muuli_wdr.cpp:1743
+msgid "Use priority system"
+msgstr ""
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/muuli_wdr.cpp:1747
+msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
+#: src/muuli_wdr.cpp:1751
+msgid "Safe connect"
 msgstr ""
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
+#: src/muuli_wdr.cpp:1755
+msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#: src/muuli_wdr.cpp:1758
+msgid "Set manually added servers to High Priority"
 msgstr ""
 
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
 msgstr ""
 
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
 msgstr ""
 
-#: src/SharedFileList.cpp:352
-#, fuzzy, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Известни са %i споделени файлове"
-msgstr[1] "Известни са %i споделени файлове"
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
 
-#: src/SharedFileList.cpp:358
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Известни са %i споделени файлове"
-msgstr[1] "Известни са %i споделени файлове"
+#: src/muuli_wdr.cpp:1791
+msgid "Add files to download in pause mode"
+msgstr ""
 
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
+#: src/muuli_wdr.cpp:1794
+msgid "Add files to download with auto priority"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Коментари за файла"
+#: src/muuli_wdr.cpp:1797
+msgid "Try to download first and last chunks first"
+msgstr ""
 
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Оценка"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr ""
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
+#: src/muuli_wdr.cpp:1805
+msgid "From the same category"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Няма коментари"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/CommentDialogLst.cpp:104
-#, fuzzy, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "Няма коментари"
-msgstr[1] "Няма коментари"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr ""
 
-#: src/ServerConnect.cpp:69
+#: src/muuli_wdr.cpp:1812
 msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Грешка при свързване към всички сървъри в списъка - започвам отначало."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Свързан към %s (%s:%i)"
-
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Връзката установена на: %s"
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
+msgstr ""
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
-"Фатална грешка при опит за свързване,вероятно не сте се включили към интернет"
 
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Връзката към %s (%s:%i) бе прекъсната"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr ""
 
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) изглежда не отговаря"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr ""
 
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
 
-#: src/ServerConnect.cpp:381
-#, fuzzy, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "На всеки %d секунди ще бъде правен автоматичен опит за свързване"
-msgstr[1] "На всеки %d секунди ще бъде правен автоматичен опит за свързване"
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr ""
 
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Връзката е прекъсната"
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr ""
 
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
+#: src/muuli_wdr.cpp:1884
+msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
+#: src/muuli_wdr.cpp:1891
+msgid "Share hidden files"
 msgstr ""
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
+#: src/muuli_wdr.cpp:1911
+msgid "Graphs"
+msgstr "Диаграми"
+
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
+msgid "Update delay : 5 secs"
 msgstr ""
 
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+#: src/muuli_wdr.cpp:1920
+msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Не са открити части от файлове"
+#: src/muuli_wdr.cpp:1926
+msgid "Connections Graph Scale: 100 "
+msgstr ""
 
-#: src/DownloadQueue.cpp:171
-#, fuzzy, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Открити са %i части от файлове"
-msgstr[1] "Открити са %i части от файлове"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr ""
 
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
 msgstr ""
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
 msgstr ""
 
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Сваляне %s"
+#: src/muuli_wdr.cpp:1963
+msgid "Background"
+msgstr "Фон"
 
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr ""
+#: src/muuli_wdr.cpp:1964
+msgid "Grid"
+msgstr "Мрежа"
 
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
+#: src/muuli_wdr.cpp:1965
+msgid "Download current"
 msgstr ""
 
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Вие вече опитвате да свалите файла %s"
+#: src/muuli_wdr.cpp:1966
+msgid "Download running average"
+msgstr ""
 
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+#: src/muuli_wdr.cpp:1967
+msgid "Download session average"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
+#: src/muuli_wdr.cpp:1968
+msgid "Upload current"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
+#: src/muuli_wdr.cpp:1969
+msgid "Upload running average"
 msgstr ""
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
+#: src/muuli_wdr.cpp:1970
+msgid "Upload session average"
 msgstr ""
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+#: src/muuli_wdr.cpp:1971
+msgid "Active connections"
 msgstr ""
 
-#: src/TextClient.cpp:309
-msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+#: src/muuli_wdr.cpp:1974
+msgid "Systray Icon Speedbar"
 msgstr ""
 
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
+#: src/muuli_wdr.cpp:1975
+msgid "Kad-nodes current"
 msgstr ""
 
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
+#: src/muuli_wdr.cpp:1976
+msgid "Kad-nodes running"
 msgstr ""
 
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+#: src/muuli_wdr.cpp:1977
+msgid "Kad-nodes session"
 msgstr ""
 
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
+msgid "Select"
+msgstr "Избор"
+
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
 msgstr ""
 
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
+#: src/muuli_wdr.cpp:2000
+msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
+#: src/muuli_wdr.cpp:2028
+msgid "!!! WARNING !!!"
 msgstr ""
 
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
+#: src/muuli_wdr.cpp:2042
+msgid "Max new connections / 5 secs"
 msgstr ""
 
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
+#: src/muuli_wdr.cpp:2048
+msgid "File Buffer Size: 240000 bytes"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
+#: src/muuli_wdr.cpp:2054
+msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
+#: src/muuli_wdr.cpp:2060
+msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
 msgstr ""
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
 msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
 msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
 msgstr ""
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
 msgstr ""
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
 msgstr ""
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
 msgstr ""
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
 msgstr ""
 
-#: src/TextClient.cpp:809
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
 msgstr ""
 
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
 msgstr ""
 
-#: src/TextClient.cpp:828
-#, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
 msgstr ""
 
-#: src/TextClient.cpp:841
-msgid "Show short status information."
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
 msgstr ""
 
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
 msgstr ""
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
 msgstr ""
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
 msgstr ""
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/TextClient.cpp:848
+#: src/muuli_wdr.cpp:2190
 msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
 msgstr ""
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
 msgstr ""
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
 msgstr ""
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
 msgstr ""
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
 msgstr ""
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
 msgstr ""
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
 msgstr ""
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
 msgstr ""
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
 msgstr ""
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
 msgstr ""
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
 msgstr ""
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
 msgstr ""
 
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
+#: src/muuli_wdr.cpp:2326
+msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
+#: src/muuli_wdr.cpp:2330
+msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
+#: src/muuli_wdr.cpp:2354
+msgid "Title :"
 msgstr ""
 
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
+#: src/muuli_wdr.cpp:2364
+msgid "Comment :"
+msgstr "Коментар:"
+
+#: src/muuli_wdr.cpp:2374
+msgid "Incoming Dir :"
 msgstr ""
 
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
+#: src/muuli_wdr.cpp:2387
+msgid "Change priority for new assigned files :"
 msgstr ""
 
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr ""
 
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
+#: src/muuli_wdr.cpp:2406
+msgid "Select color for this Category (currently selected) :"
 msgstr ""
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Нулира"
+
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
+msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
+#: src/muuli_wdr.cpp:2528
+msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
+#: src/muuli_wdr.cpp:2532
+msgid "Server list"
 msgstr ""
 
-#: src/TextClient.cpp:880
+#: src/muuli_wdr.cpp:2537
 msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+"Enter the url to a server.met file here and press the button to the left to "
+"update the list of known servers."
 msgstr ""
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
+#: src/muuli_wdr.cpp:2544
+msgid "Add server manually: Name"
 msgstr ""
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
+#: src/muuli_wdr.cpp:2548
+msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
 msgstr ""
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
+#: src/muuli_wdr.cpp:2555
+msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
+#: src/muuli_wdr.cpp:2562
+msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
+#: src/muuli_wdr.cpp:2566
+msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
 msgstr ""
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
 msgstr ""
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
+#: src/muuli_wdr.cpp:2612
+msgid "ED2K Info"
 msgstr ""
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
+#: src/muuli_wdr.cpp:2616
+msgid "Kad Info"
 msgstr ""
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
+#: src/muuli_wdr.cpp:2645
+msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
+#: src/muuli_wdr.cpp:2649
+msgid "Nodes (0)"
 msgstr ""
 
-#: src/TextClient.cpp:901
+#: src/muuli_wdr.cpp:2654
 msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+"Enter the url to a nodes.dat file here and press the button to the left to "
+"update the list of known nodes."
 msgstr ""
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
+#: src/muuli_wdr.cpp:2659
+msgid "Nodes stats"
 msgstr ""
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
+#: src/muuli_wdr.cpp:2710
+msgid "Bootstrap"
 msgstr ""
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
+#: src/muuli_wdr.cpp:2713
+msgid "New node"
 msgstr ""
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
+#: src/muuli_wdr.cpp:2718
+msgid "IP:"
 msgstr ""
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
+#: src/muuli_wdr.cpp:2747
+msgid "Port:"
 msgstr ""
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
 msgstr ""
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
+#: src/muuli_wdr.cpp:2768
+msgid "Disconnect Kad"
 msgstr ""
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/TextClient.cpp:913
+#: src/muuli_wdr.cpp:2808
 msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
 msgstr ""
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
+#: src/muuli_wdr.cpp:2811
+msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
+#: src/muuli_wdr.cpp:2814
+msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
+#: src/muuli_wdr.cpp:2816
+msgid ""
+"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
+"connections from other clients."
 msgstr ""
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
+#: src/muuli_wdr.cpp:2819
+msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+#: src/muuli_wdr.cpp:2821
+msgid ""
+"This option makes aMule use Protocol Obfuscation when connecting other "
+"clients/servers."
 msgstr ""
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
+#: src/muuli_wdr.cpp:2824
+msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
+#: src/muuli_wdr.cpp:2825
+msgid ""
+"This option makes aMule only accept obfuscated connections. You will have "
+"less sources, but all your traffic will be obfuscated"
 msgstr ""
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr ""
+#: src/muuli_wdr.cpp:2832
+msgid "Everybody"
+msgstr "Всеки"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
+#: src/muuli_wdr.cpp:2834
+msgid "No one"
 msgstr ""
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
+#: src/muuli_wdr.cpp:2837
+msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
+#: src/muuli_wdr.cpp:2840
+msgid "IP-Filtering"
 msgstr ""
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
+#: src/muuli_wdr.cpp:2847
+msgid "Filter clients"
 msgstr ""
 
-#: src/TextClient.cpp:940
-msgid "Show log."
+#: src/muuli_wdr.cpp:2849
+msgid ""
+"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
+#: src/muuli_wdr.cpp:2852
+msgid "Filter servers"
 msgstr ""
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
+#: src/muuli_wdr.cpp:2854
+msgid ""
+"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Deprecated command, use '%s' instead."
+#: src/muuli_wdr.cpp:2861
+msgid "Reload List"
 msgstr ""
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
+#: src/muuli_wdr.cpp:2862
+msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/ServerSocket.cpp:259
-#, c-format
-msgid "ERROR: %s (%s) - %s"
+#: src/muuli_wdr.cpp:2870
+msgid "URL:"
 msgstr ""
 
-#: src/ServerSocket.cpp:274
-#, c-format
-msgid "WARNING: %s (%s) - %s"
+#: src/muuli_wdr.cpp:2876
+msgid "Update now"
 msgstr ""
 
-#: src/ServerSocket.cpp:417
-#, c-format
-msgid "New clientid is %u"
-msgstr "Новият номер на клиента е %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
+#: src/muuli_wdr.cpp:2881
+msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
+#: src/muuli_wdr.cpp:2886
+msgid "Filtering Level:"
 msgstr ""
 
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
+#: src/muuli_wdr.cpp:2896
+msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
+#: src/muuli_wdr.cpp:2900
+msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/ServerSocket.cpp:539
-#, fuzzy, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Получени са %d нови сървъра"
-msgstr[1] "Получени са %d нови сървъра"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
+#: src/muuli_wdr.cpp:2902
+msgid ""
+"Rejects packet if the client ip is different from the ip where the packet is "
+"received from. Use with caution."
 msgstr ""
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Сървърът отхвърли последната команда"
+#: src/muuli_wdr.cpp:2905
+msgid "Use system-wide ipfilter.dat if available"
+msgstr ""
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
+#: src/muuli_wdr.cpp:2906
+msgid ""
+"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
+"file."
 msgstr ""
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
+#: src/muuli_wdr.cpp:2925
+msgid "Enable Online-Signature"
 msgstr ""
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
+#: src/muuli_wdr.cpp:2927
+msgid ""
+"Enables the writing of the OS file, which can be used by external apps to "
+"create signatures and the like."
 msgstr ""
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
+#: src/muuli_wdr.cpp:2932
+msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
+#: src/muuli_wdr.cpp:2936
+msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
 msgstr ""
 
-#: src/ServerSocket.cpp:760
-#, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
+#: src/muuli_wdr.cpp:2952
+msgid ""
+"Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#: src/muuli_wdr.cpp:2974
+msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/IP2Country.cpp:105
-#, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:2977
+msgid "Filter all messages"
+msgstr ""
 
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
+#: src/muuli_wdr.cpp:2980
+msgid "Filter messages from people not on your friend list"
 msgstr ""
-"Сигурни ли сте,че желаете да откажете и изтриете всички файлове в тази "
-"категория?"
 
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Изисква потвърждение"
+#: src/muuli_wdr.cpp:2983
+msgid "Filter messages from unknown clients"
+msgstr ""
 
-#: src/TransferWnd.cpp:342
-msgid "All others"
+#: src/muuli_wdr.cpp:2986
+msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Незавършен"
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
+msgid "add here the words amule should filter and block messages including it"
+msgstr ""
 
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
 msgstr ""
 
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Видео"
+#: src/muuli_wdr.cpp:2998
+msgid "Comments"
+msgstr ""
 
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Аудио"
+#: src/muuli_wdr.cpp:3001
+msgid "Filter comments containing (use ',' as separator):"
+msgstr ""
 
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Архив"
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr ""
 
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD-изображения"
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr ""
 
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Картинки"
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr ""
 
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Текст"
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr ""
 
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Избор на филтър"
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr ""
 
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Добавяне на категория"
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr ""
 
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Промяна на категория"
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr ""
 
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Премахване на категория"
+#: src/muuli_wdr.cpp:3050
+msgid "Enable Proxy"
+msgstr ""
 
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
+#: src/muuli_wdr.cpp:3051
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/KnownFile.cpp:1360
-msgid "File size"
+#: src/muuli_wdr.cpp:3056
+msgid "Proxy type:"
 msgstr ""
 
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
+#: src/muuli_wdr.cpp:3069
+msgid "Proxy host:"
 msgstr ""
 
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
+#: src/muuli_wdr.cpp:3073
+msgid "The proxy host name"
 msgstr ""
 
-#: src/KnownFile.cpp:1363
-msgid "Requested"
+#: src/muuli_wdr.cpp:3076
+msgid "Proxy port:"
 msgstr ""
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
+#: src/muuli_wdr.cpp:3080
+msgid "The proxy port"
 msgstr ""
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
+#: src/muuli_wdr.cpp:3101
+msgid "Connect to:"
 msgstr ""
 
-#: src/PartFileConvert.cpp:208
-#, c-format
-msgid "Importing %s: %s"
+#: src/muuli_wdr.cpp:3115
+msgid "Login to remote amule"
 msgstr ""
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
+#: src/muuli_wdr.cpp:3120
+msgid "User name"
 msgstr ""
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
+#: src/muuli_wdr.cpp:3137
+msgid "Remember those settings"
 msgstr ""
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
+#: src/muuli_wdr.cpp:3166
+msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/PartFileConvert.cpp:331
-#, c-format
-msgid "Loading data from old download file (%u of %u)"
+#: src/muuli_wdr.cpp:3169
+msgid "Message Categories:"
 msgstr ""
 
-#: src/PartFileConvert.cpp:351
-#, c-format
-msgid "Saving data block into new single download file (%u of %u)"
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Изчакване"
+
+#: src/muuli_wdr.cpp:3222
+msgid "Add imports"
 msgstr ""
 
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
+#: src/muuli_wdr.cpp:3226
+msgid "Retry selected"
 msgstr ""
 
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
+#: src/muuli_wdr.cpp:3229
+msgid "Remove selected"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Активни качвания: %i"
+
+#: src/muuli_wdr.cpp:3368
+#, fuzzy
+msgid "Percent of total files"
+msgstr "Общо файлове"
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Споделени файлове (%i)"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Избор на филтър"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Активни качвания: %i"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Клиенти"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Качване"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Изчакване"
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Изпраща"
 
-#: src/PartFileConvertDlg.cpp:176
-#, c-format
-msgid "%s (Disk: %s)"
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
+#: src/muuli_wdr.cpp:3527
+msgid "Connect to any server and/or Kad"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
 msgstr ""
 
-#: src/OtherFunctions.cpp:112
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr ""
+
+#: src/OtherFunctions.cpp:106
 #, fuzzy
 msgid "byte"
 msgid_plural "bytes"
 msgstr[0] "Байта"
 msgstr[1] "Байта"
 
-#: src/OtherFunctions.cpp:114
+#: src/OtherFunctions.cpp:108
 msgid "kB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
+#: src/OtherFunctions.cpp:114
 msgid "TB"
 msgstr "TB"
 
-#: src/OtherFunctions.cpp:130
+#: src/OtherFunctions.cpp:124
 msgid "k"
 msgstr ""
 
-#: src/OtherFunctions.cpp:132
+#: src/OtherFunctions.cpp:126
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:134
+#: src/OtherFunctions.cpp:128
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:136
+#: src/OtherFunctions.cpp:130
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:143
+#: src/OtherFunctions.cpp:137
 #, fuzzy
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr[0] "Байта"
 msgstr[1] "Байта"
 
-#: src/OtherFunctions.cpp:147
+#: src/OtherFunctions.cpp:141
 msgid "MB/s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
 msgid "secs"
 msgstr "сек."
 
-#: src/OtherFunctions.cpp:170
+#: src/OtherFunctions.cpp:157
 msgid "mins"
 msgstr "мин."
 
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
 msgid "hours"
 msgstr ""
 
-#: src/OtherFunctions.cpp:185
+#: src/OtherFunctions.cpp:163
 msgid "Days"
 msgstr ""
 
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Клипове"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Архиви"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr ""
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Програми"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Всеки"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Няма оценки"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Грешен / Развален / Фалшив"
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "Всички"
 
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Лош"
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "всички останали"
 
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Средно добър"
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Незавършен"
 
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Добър"
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Спрян"
 
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Отличен"
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Видео"
 
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "Всички"
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Архив"
 
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "всички останали"
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Текст"
 
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
 msgstr ""
 
-#: src/IPFilter.cpp:285
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgid "Using config dir: %s"
 msgstr ""
 
-#: src/IPFilter.cpp:326
-#, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/IPFilter.cpp:331
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] ""
-msgstr[1] ""
+msgid "Importing %s: %s"
+msgstr ""
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] ""
-msgstr[1] ""
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr ""
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Активни връзки (1:%u)"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr ""
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:114
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "%.2f%% done"
+msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:73
-msgid "eD2k Link: "
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:80
-msgid "Commit"
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/muuli_wdr.cpp:81
-msgid ""
-"Click here to add the eD2k link in the text control to your download queue."
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
 msgstr ""
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
-msgid ""
-"Events are displayed here. For a complete list of events, refer to the log "
-"in the Servers-tab."
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
 msgstr ""
 
-#: src/muuli_wdr.cpp:92
-msgid "Loading ..."
-msgstr "Зареждам..."
-
-#: src/muuli_wdr.cpp:101
-msgid "Number of users on the server you are connected to ..."
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
 msgstr ""
 
-#: src/muuli_wdr.cpp:104
-msgid "Users: 0"
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:105
-msgid ""
-"Users connected to the current server and an estimate of the total number of "
-"users."
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:117
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"Current average upload and download rates. If enabled the numbers in the "
-"braces signify the overhead from client communication."
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:125
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"Displays the connected status and active transfers. Red arrows signifies "
-"that you are currently not connected, yellow arrows signify that you have "
-"low ID (firewalled) and green arrows signify that you have high ID (The "
-"optimal connection type)."
-msgstr ""
-
-#: src/muuli_wdr.cpp:129
-msgid "Not Connected ..."
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:130
-msgid "Currently connected server."
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:176
-msgid "Search"
-msgstr "Търсене"
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "Фатална грешка: не можах да създам брояч"
 
-#: src/muuli_wdr.cpp:182
-msgid "Name:"
+#: src/PartFile.cpp:336
+#, c-format
+msgid "Trying to load backup of met-file from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
-msgid "Local"
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:196
-msgid "Global"
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:198
-msgid "FileHash"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:206
-msgid "Extended Parameters"
-msgstr ""
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr "Грешка:файлът known.met е повреден,зареждането на списъка пропадна"
 
-#: src/muuli_wdr.cpp:212
-msgid "Filtering"
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
-msgid "File Type"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:253
-msgid "Extension"
-msgstr "Разширение"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr ""
 
-#: src/muuli_wdr.cpp:259
-msgid "Min Size"
-msgstr "Минимален размер"
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
-msgid "Bytes"
-msgstr "Байта"
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr ""
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
-msgid "KB"
-msgstr "KB"
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:282
-msgid "Max Size"
-msgstr "Максимален размер"
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:305
-msgid "Availability"
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:318
-msgid "Filter:"
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:327
-msgid "Filter Results"
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:333
-msgid "Invert Result"
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:339
-msgid "Hide Known Files"
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:355
-msgid "More"
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:356
-msgid "Searches for more results on eD2k. Not supported for Kad yet."
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:363
-msgid "Stop"
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:377
-msgid "Reset Fields"
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
+msgid ""
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:392
-msgid "Results"
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:428
-msgid "Clears completed downloads"
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Изпраща"
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr ""
 
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
+#: src/PartFile.cpp:2292
+#, c-format
+msgid ""
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
 
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Затвори"
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
+msgid ""
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:575
-msgid "Full Name :"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
-msgid "N/A"
-msgstr "Няма"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:586
-msgid "met-File :"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:597
-msgid "Hash :"
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:612
-msgid "Filesize :"
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
 msgstr ""
 
-#: src/muuli_wdr.cpp:623
-msgid "Partfilestatus :"
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/muuli_wdr.cpp:634
-msgid "Last seen complete :"
+#: src/Preferences.cpp:630
+msgid "System default"
 msgstr ""
 
-#: src/muuli_wdr.cpp:656
-msgid "Found Sources :"
+#: src/Preferences.cpp:631
+msgid "Albanian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:667
-msgid "Transferring Sources :"
+#: src/Preferences.cpp:632
+msgid "Arabic"
 msgstr ""
 
-#: src/muuli_wdr.cpp:678
-msgid "Filepart-Count :"
+#: src/Preferences.cpp:633
+msgid "Asturian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:689
-msgid "Available :"
+#: src/Preferences.cpp:634
+msgid "Basque"
 msgstr ""
 
-#: src/muuli_wdr.cpp:700
-msgid "Datarate :"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:711
-msgid "Download Active Time: "
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Каталунски"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
-msgid "Transferred :"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:733
-msgid "Completed Size :"
+#: src/Preferences.cpp:639
+msgid "Croatian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
-msgid "Intelligent Corruption Handling"
+#: src/Preferences.cpp:640
+msgid "Czech"
 msgstr ""
 
-#: src/muuli_wdr.cpp:769
-msgid "Lost to corruption :"
+#: src/Preferences.cpp:641
+msgid "Danish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:780
-msgid "Gained by compression :"
+#: src/Preferences.cpp:642
+msgid "Dutch"
 msgstr ""
 
-#: src/muuli_wdr.cpp:791
-msgid "Packages saved by I.C.H. :"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
-msgid "File Names"
+#: src/Preferences.cpp:644
+msgid "Estonian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:825
-msgid "Takeover"
+#: src/Preferences.cpp:645
+msgid "Finnish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:835
-msgid "Cleanup"
-msgstr "Изчистване"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Френски"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
-msgid "Apply"
-msgstr "Потвърди"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr ""
 
-#: src/muuli_wdr.cpp:854
-msgid "Ok"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Немски"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
 msgstr ""
 
-#: src/muuli_wdr.cpp:883
-msgid "Comment/Rate file (Text will be visible to all users)"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
 msgstr ""
 
-#: src/muuli_wdr.cpp:897
-msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+#: src/Preferences.cpp:651
+msgid "Hungarian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:905
-msgid "File Quality"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Италиански"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:920
-msgid "Choose the file rating or advice users if the file is invalid ..."
+#: src/Preferences.cpp:654
+msgid "Japanese"
 msgstr ""
 
-#: src/muuli_wdr.cpp:964
-msgid "Refresh"
-msgstr "Опресняване"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr ""
 
-#: src/muuli_wdr.cpp:991
-msgid "Downloading, please wait ..."
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:997
-msgid "Unknown size"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1021
-msgid "Required Information"
+#: src/Preferences.cpp:658
+msgid "Polish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1026
-msgid "IP Address :"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1032
-msgid "Port :"
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1042
-msgid "Additional Information"
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Руски"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1047
-msgid "Username :"
+#: src/Preferences.cpp:663
+msgid "Spanish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1053
-msgid "Userhash :"
+#: src/Preferences.cpp:664
+msgid "Swedish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
+#: src/Preferences.cpp:665
+msgid "Turkish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Общо"
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Език"
 
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
+#: src/Preferences.cpp:771
+msgid "No languages available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1206
-msgid "Download-Speed"
+#: src/Preferences.cpp:902
+msgid "no options available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
-msgid "Current"
-msgstr "Текущ"
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
-msgid "Running average"
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
-msgid "Session average"
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
-msgid "Upload-Speed"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1304
-msgid "Connections"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Връзка"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Директории"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Сървъри"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Файлове"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
-msgid "Active downloads"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1333
-msgid "Active connections (1:1)"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
-msgid "Active uploads"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
-msgid "Statistics Tree"
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Дистанционни управления"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
-msgid "Username:"
-msgstr "Име на потребител:"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1386
-msgid "Userhash:"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1409
-msgid "Client software:"
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1418
-msgid "Client version:"
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1425
-msgid "IP address:"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1434
-msgid "User ID:"
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1441
-msgid "Server IP:"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1450
-msgid "Server name:"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1457
-msgid "Obfuscation:"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1466
-msgid "Kad:"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1477
-msgid "Transfers to client"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1482
-msgid "Current request:"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1495
-msgid "Average upload rate:"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1504
-msgid "Average download rate:"
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1511
-msgid "Uploaded (session):"
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
-msgid "Downloaded (session):"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1527
-msgid "Uploaded (total):"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1536
-msgid "Downloaded (total):"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1547
-msgid "Scores"
-msgstr "Точки"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1554
-msgid "DL/UP modifier:"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Secure ident:"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1579
-msgid "Queue score:"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1610
-msgid "Nick"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1614
-msgid "This is the name that other users will see when connecting to you."
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Език"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
+#: src/PrefsUnifiedDlg.cpp:1003
+#, c-format
+msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Допълнителни Опции"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Търсене на видео плеър"
 
-#: src/muuli_wdr.cpp:1634
-msgid "Check for new version at startup"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1638
-msgid "Start minimized"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1639
-msgid "Enabling this makes aMule minimize itself upon start."
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
 msgstr ""
+"Тук добавете линкове за сваляне на .met файлове.\n"
+"Само по един URL на ред."
 
-#: src/muuli_wdr.cpp:1642
-msgid "Prompt on exit"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1647
-msgid "Enable Tray Icon"
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "деактивиране"
+
+#: src/PrefsUnifiedDlg.cpp:1222
+#, c-format
+msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1648
-msgid "This Enables/Disables the system tray (or taskbar) icon."
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1651
-msgid "Minimize to Tray Icon"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1652
-msgid ""
-"Enabling this will make aMule minimize to the System Tray, rather than the "
-"taskbar."
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
-msgid "Browser Selection"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Файл"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Поискан му е друг файл"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Отказ"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/ServerConnect.cpp:74
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1705
-msgid "Open in new tab if possible"
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Грешка при свързване към всички сървъри в списъка - започвам отначало."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1707
-msgid "Open the web page in a new tab instead of in a new window when possible"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1712
-msgid "Video Player"
-msgstr "Видео плеър"
+#: src/ServerConnect.cpp:198
+#, c-format
+msgid "Connected to %s (%s:%i)"
+msgstr "Свързан към %s (%s:%i)"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr ""
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Връзката установена на: %s"
 
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
+"Фатална грешка при опит за свързване,вероятно не сте се включили към интернет"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
-msgid "Upload"
-msgstr "Качване"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Връзката към %s (%s:%i) бе прекъсната"
 
-#: src/muuli_wdr.cpp:1775
-msgid "Slot Allocation"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) изглежда не отговаря"
+
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
+#: src/ServerConnect.cpp:392
+#, fuzzy, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "На всеки %d секунди ще бъде правен автоматичен опит за свързване"
+msgstr[1] "На всеки %d секунди ще бъде правен автоматичен опит за свързване"
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Връзката е прекъсната"
+
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1796
-msgid "This is the standard eD2k port and cannot be disabled."
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "деактивиране"
+#: src/ServerList.cpp:88
+#, c-format
+msgid "Loading server.met file: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
+#: src/ServerList.cpp:93
+msgid "Server.met file not found!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
+#: src/ServerList.cpp:101
+#, c-format
+msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
+#: src/ServerList.cpp:107
+msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
+#: src/ServerList.cpp:118
+#, c-format
+msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/ServerList.cpp:173
+#, fuzzy, c-format
+msgid "%i server in server.met found"
+msgid_plural "%i servers in server.met found"
+msgstr[0] "%i сървъра бяха намерени в server.met"
+msgstr[1] "%i сървъра бяха намерени в server.met"
+
+#: src/ServerList.cpp:175
+#, fuzzy, c-format
+msgid "%d server added"
+msgid_plural "%d servers added"
+msgstr[0] "%d сървъра бяха добавени"
+msgstr[1] "%d сървъра бяха добавени"
+
+#: src/ServerList.cpp:178
+#, fuzzy
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Грешка: файлът server.met е повреден"
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
+#: src/ServerList.cpp:195
+#, c-format
+msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
+#: src/ServerList.cpp:213
+#, c-format
+msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1886
-msgid "Kademlia"
+#: src/ServerList.cpp:232
+#, c-format
+msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
+#: src/ServerList.cpp:250
+#, c-format
+msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
+#: src/ServerList.cpp:345
+msgid ""
+"You are connected to the server you are trying to delete. please disconnect "
+"first."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
-msgid "Autoconnect on startup"
+#: src/ServerList.cpp:685
+msgid "Failed to save server.met!"
+msgstr "Грешка при записа на server.met!"
+
+#: src/ServerList.cpp:832
+msgid "Invalid URL"
+msgstr "Грешен URL"
+
+#: src/ServerList.cpp:854
+#, c-format
+msgid "Finished downloading the server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1916
-msgid "Reconnect on loss"
+#: src/ServerList.cpp:869
+msgid ""
+"No server list address entry in 'addresses.dat' found. Please paste a valid "
+"server list address into this file in order to auto-update your server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
+#: src/ServerList.cpp:882
+#, c-format
+msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
+#: src/ServerList.cpp:891
+#, c-format
+msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1947
-msgid "Remove dead server after"
+#: src/ServerList.cpp:895
+msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1953
-msgid "retries"
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1960
-msgid "Auto-update server list at startup"
+#: src/ServerList.cpp:985
+msgid ""
+"Local server is filtered by the IPFilters, reconnecting to a different "
+"server!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1963
-msgid "List"
-msgstr "Списък"
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Име на сървър"
 
-#: src/muuli_wdr.cpp:1968
-msgid "Update server list when connecting to a server"
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1971
-msgid "Update server list when a client connects"
-msgstr ""
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Порт"
 
-#: src/muuli_wdr.cpp:1974
-msgid "Use priority system"
-msgstr ""
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Описание"
 
-#: src/muuli_wdr.cpp:1978
-msgid "Use smart LowID check on connect"
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1982
-msgid "Safe connect"
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Потребители"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Статичен"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1986
-msgid "Autoconnect to servers in static list only"
+#: src/ServerListCtrl.cpp:148
+msgid ""
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1989
-msgid "Set manually added servers to High Priority"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Сървъри (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Сървър"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2024
-msgid "Add files to download in pause mode"
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2027
-msgid "Add files to download with auto priority"
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Try to download first and last chunks first"
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Премахване на сървър"
+
+#: src/ServerListCtrl.cpp:419
+#, fuzzy
+msgid "Remove servers"
+msgstr "Премахване на сървър"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Изтриване на всички сървъри"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2045
-msgid "From the same category"
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
+#: src/ServerListCtrl.cpp:541
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected server?"
 msgstr ""
+"Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
+#: src/ServerListCtrl.cpp:543
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected servers?"
 msgstr ""
+"Сигурни ли сте,че желаете да откажете свалянето и изтриете тези файлове ?\n"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Новият номер на клиента е %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
+#: src/ServerSocket.cpp:535
+#, fuzzy, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Получени са %d нови сървъра"
+msgstr[1] "Получени са %d нови сървъра"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Сървърът отхвърли последната команда"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2122
-msgid "(Right click on folder icon for recursive share)"
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2129
-msgid "Share hidden files"
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2149
-msgid "Graphs"
-msgstr "Диаграми"
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
-msgid "Update delay : 5 secs"
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2158
-msgid "Time for average graph: 100 mins"
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2164
-msgid "Connections Graph Scale: 100 "
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2177
-msgid "Background"
-msgstr "Фон"
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2178
-msgid "Grid"
-msgstr "Мрежа"
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
 
-#: src/muuli_wdr.cpp:2179
-msgid "Download current"
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2180
-msgid "Download running average"
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2181
-msgid "Download session average"
+#: src/ServerWnd.cpp:206
+msgid "Running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2182
-msgid "Upload current"
+#: src/ServerWnd.cpp:209
+msgid "Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2183
-msgid "Upload running average"
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2184
-msgid "Upload session average"
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2185
-msgid "Active connections"
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "Максимален брой връзки (изчисляване)"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2188
-msgid "Systray Icon Speedbar"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2189
-msgid "Kad-nodes current"
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2190
-msgid "Kad-nodes running"
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2191
-msgid "Kad-nodes session"
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
-msgid "Select"
-msgstr "Избор"
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "Свързва"
 
-#: src/muuli_wdr.cpp:2214
-msgid "Number of Client Versions shown (0=unlimited)"
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "Свързан към %s (%s:%i)"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "Намерени източници: %i"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2272
-msgid "!!! WARNING !!!"
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Max new connections / 5 secs"
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2294
-msgid "File Buffer Size: 240000 bytes"
+#: src/SharedFileList.cpp:371
+#, fuzzy, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Известни са %i споделени файлове"
+msgstr[1] "Известни са %i споделени файлове"
+
+#: src/SharedFileList.cpp:377
+#, fuzzy, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Известни са %i споделени файлове"
+msgstr[1] "Известни са %i споделени файлове"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2300
-msgid "Upload Queue Size: 5000 clients"
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2306
-msgid "Server connection refresh interval: Disable"
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Потребителско име"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Изтегляне"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Време на качване"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Наличен"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Лимит за качване"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#, fuzzy
+msgid "Download Status"
+msgstr "Изтегляне"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Име на файл"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Споделени файлове (%i)"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Заявки"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Приети заявки"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Пренесени данни"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Трябва да имате HighID, за да създадете валиден сорс линк"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Споделени файлове (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Име на файл"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Средно време за качване: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Повторни свързвания: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Изтекло време от пърия трансфер: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Свързан към сървъра от : %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2583
-msgid "Click here to apply any changes made to the preferences."
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2587
-msgid "Reset any changes made to the preferences."
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2611
-msgid "Title :"
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2621
-msgid "Comment :"
-msgstr "Коментар:"
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Клиенти"
 
-#: src/muuli_wdr.cpp:2631
-msgid "Incoming Dir :"
-msgstr ""
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "Неизвестно: %i"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "Филтрирани: %i"
 
-#: src/muuli_wdr.cpp:2644
-msgid "Change priority for new assigned files :"
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2663
-msgid "Select color for this Category (currently selected) :"
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
-msgid "Click this button to reset the log."
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2806
-msgid "Click on this button to update the servers list from URL ..."
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2810
-msgid "Server list"
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2815
-msgid ""
-"Enter the url to a server.met file here and press the button to the left to "
-"update the list of known servers."
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2822
-msgid "Add server manually: Name"
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2826
-msgid "Enter the name of the new server here"
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2833
-msgid "Enter the IP of the server here, using the x.x.x.x format."
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2840
-msgid "Enter the port of the server here."
-msgstr ""
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Общ размер на споределните файлове : %s"
 
-#: src/muuli_wdr.cpp:2844
-msgid "Add manually a server (fill fields to the left before) ..."
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2890
-msgid "ED2K Info"
+#: src/Statistics.cpp:955
+msgid "Operating System"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
-msgid "Kad Info"
+#: src/Statistics.cpp:980
+msgid "Not Received"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2923
-msgid "Click on this button to update the nodes list from URL ..."
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Активни връзки (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2927
-msgid "Nodes (0)"
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2932
-msgid ""
-"Enter the url to a nodes.dat file here and press the button to the left to "
-"update the list of known nodes."
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2937
-msgid "Nodes stats"
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2988
-msgid "Bootstrap"
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2991
-msgid "New node"
+#: src/TextClient.cpp:323
+msgid ""
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2996
-msgid "IP:"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:3025
-msgid "Port:"
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3048
-msgid "Disconnect Kad"
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3096
-msgid "Protocol Obfuscation"
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3099
-msgid "Support Protocol Obfuscation"
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3101
-msgid ""
-"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
-"connections from other clients."
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3104
-msgid "Use obfuscation for outgoing connections"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3106
-msgid ""
-"This option makes aMule use Protocol Obfuscation when connecting other "
-"clients/servers."
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3109
-msgid "Accept only obfuscated connections"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3110
-msgid ""
-"This option makes aMule only accept obfuscated connections. You will have "
-"less sources, but all your traffic will be obfuscated"
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3120
-msgid "Everybody"
-msgstr "Всеки"
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3122
-msgid "No one"
+#: src/TextClient.cpp:699
+msgid "eD2k"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3125
-msgid "Select who can request to view a list of your shared files."
+#: src/TextClient.cpp:710
+msgid "Now connecting"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3130
-msgid "IP-Filtering"
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3137
-msgid "Filter clients"
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3139
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
+"\n"
+"Download:\t%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3142
-msgid "Filter servers"
+#: src/TextClient.cpp:737
+#, c-format
+msgid ""
+"\n"
+"Upload:\t%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3144
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
-"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
+"\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3151
-msgid "Reload List"
+#: src/TextClient.cpp:743
+#, c-format
+msgid ""
+"\n"
+"Total sources:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3152
-msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3160
-msgid "URL:"
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3166
-msgid "Update now"
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3171
-msgid "Auto-update ipfilter at startup"
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3176
-msgid "Filtering Level:"
+#: src/TextClient.cpp:850
+msgid "Show short status information."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3186
-msgid "Always filter LAN IPs"
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3190
-msgid "Paranoid handling of non-matching IPs"
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3192
+#: src/TextClient.cpp:854
 msgid ""
-"Rejects packet if the client ip is different from the ip where the packet is "
-"received from. Use with caution."
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
+"\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3195
-msgid "Use system-wide ipfilter.dat if available"
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3196
+#: src/TextClient.cpp:857
 msgid ""
-"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
-"file."
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3223
-msgid "Enable Online-Signature"
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3225
-msgid ""
-"Enables the writing of the OS file, which can be used by external apps to "
-"create signatures and the like."
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3230
-msgid "Update Frequency (Secs):"
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3234
-msgid "Change the frequency (in seconds) of Online Signature updates."
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/TextClient.cpp:868
 msgid ""
-"Click here to select the directory containing the the Online Signature files."
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3271
-msgid "Filter incoming messages (except current chat):"
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3277
-msgid "Filter all messages"
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3280
-msgid "Filter messages from people not on your friend list"
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3283
-msgid "Filter messages from unknown clients"
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3286
-msgid "Filter messages containing (use ',' as separator):"
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
-msgid "add here the words amule should filter and block messages including it"
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
+"\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3302
-msgid "Comments"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3310
-msgid "Filter comments containing (use ',' as separator):"
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3339
-msgid "Enable Proxy"
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3340
-msgid "Enable/disable proxy support"
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3345
-msgid "Proxy type:"
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3359
-msgid "Proxy host:"
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3363
-msgid "The proxy host name"
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3366
-msgid "Proxy port:"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3370
-msgid "The proxy port"
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3424
-msgid "Connect to:"
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3438
-msgid "Login to remote amule"
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3443
-msgid "User name"
+#: src/TextClient.cpp:913
+msgid "Execute a search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3460
-msgid "Remember those settings"
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3492
-msgid "Enable Verbose Debug-Logging."
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3497
-msgid "Message Categories:"
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3550
-msgid "Add imports"
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3554
-msgid "Retry selected"
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3557
-msgid "Remove selected"
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3668
-msgid "Connect to any server and/or Kad"
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
+#: src/TextClient.cpp:933
+msgid "Pause download."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
+#: src/TextClient.cpp:936
+msgid "Resume download."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
+#: src/TextClient.cpp:939
+msgid "Cancel download."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
+#: src/TextClient.cpp:942
+msgid "Set download priority."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
 msgstr ""
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Изберете папка за входящи файлове"
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr ""
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
 msgstr ""
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
 msgstr ""
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
 msgstr ""
 
-#: src/ExternalConnector.cpp:141
-#, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:143
-#, c-format
-msgid "Unknown command '%s'.\n"
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
 msgstr ""
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/TextClient.cpp:952
+msgid "Show download queue."
 msgstr ""
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/TextClient.cpp:953
+msgid "Show log."
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
-msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+#: src/TextClient.cpp:954
+msgid "Show servers list."
 msgstr ""
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/TextClient.cpp:957
+msgid "Reset log."
 msgstr ""
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
+#: src/TextClient.cpp:964
+#, c-format
+msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/ExternalConnector.cpp:185
+#: src/TextClient.cpp:965
 #, c-format
 msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
+#: src/TextClient.h:60
+msgid "aMule text client"
 msgstr ""
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:243
+#: src/ThreadTasks.cpp:454
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr ""
+"Сигурни ли сте,че желаете да откажете и изтриете всички файлове в тази "
+"категория?"
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr ""
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Изисква потвърждение"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr ""
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Твърде много връзки"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
+#: src/TransferWnd.cpp:341
+msgid "All others"
 msgstr ""
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr ""
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Избор на филтър"
 
-#: src/ExternalConnector.cpp:297
-#, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr ""
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Добавяне на категория"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Промяна на категория"
 
-#: src/ExternalConnector.cpp:362
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Премахване на категория"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "This is %s %s %s\n"
+msgid "Failed to open file (%s), removing from list of shared files."
 msgstr ""
 
-#: src/ExternalConnector.cpp:364
+#: src/UploadClient.cpp:683
 #, c-format
-msgid "This is %s %s\n"
+msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:395
-msgid ""
-"\n"
-"Creating client...\n"
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:418
+#: src/UploadQueue.cpp:613
 #, c-format
-msgid ""
-"\n"
-"Ok, exiting %s...\n"
+msgid "Suspending upload of file: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:424
-msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
 msgstr ""
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
+#: src/UserEvents.h:60
+msgid "Download completed"
 msgstr ""
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
 msgstr ""
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
+#: src/UserEvents.h:84
+msgid "New chat session started"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
+#: src/UserEvents.h:87
+msgid "Message sender."
 msgstr ""
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
+#: src/UserEvents.h:92
+msgid "Out of space"
 msgstr ""
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/UserEvents.h:95
+msgid "Disk partition."
 msgstr ""
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
+#: src/UserEvents.h:100
+msgid "Error on completion"
 msgstr ""
 
-#: src/ClientCreditsList.cpp:168
-#, fuzzy, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Файлът с кредити зареден, %u клиента са разпознати"
-msgstr[1] "Файлът с кредити зареден, %u клиента са разпознати"
-
-#: src/ClientCreditsList.cpp:171
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
+msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/amuled.cpp:750
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "ERROR: %s"
+msgid "%s ---> Non existant file !\n"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Показване на опашка"
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Изчакал"
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Време на качване"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:215
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+#, fuzzy
+msgid "Cancelled !"
+msgstr "Отказ"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "%u (QR: %u)"
+msgid "Done in %.2f s"
 msgstr ""
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
 msgstr ""
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#, c-format
+msgid "Unable to open %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:354
+#: src/utils/wxCas/src/onlinesig.cpp:238
 #, c-format
-msgid "UL: %u"
+msgid "%02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:364
+#: src/utils/wxCas/src/onlinesig.cpp:339
 #, c-format
-msgid "DL: %u"
+msgid "%.0f B"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:368
+#: src/utils/wxCas/src/onlinesig.cpp:342
 #, c-format
-msgid "Download speed: %.1f"
+msgid "%.2f KB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/utils/wxCas/src/onlinesig.cpp:345
 #, c-format
-msgid "Upload speed: %.1f"
+msgid "%.2f MB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
+#: src/utils/wxCas/src/onlinesig.cpp:351
 #, c-format
-msgid "Nickname: %s"
+msgid "%.2f TB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:483
-#, c-format
-msgid "Total UL: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
 msgstr ""
 
-#: src/ChatSelector.cpp:127
-#, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
 msgstr ""
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
 msgstr ""
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
 msgstr ""
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
 msgstr ""
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
 msgstr ""
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
 msgstr ""
 
-#: src/ServerList.cpp:84
-#, c-format
-msgid "Loading server.met file: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
 msgstr ""
 
-#: src/ServerList.cpp:89
-msgid "Server.met file not found!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/ServerList.cpp:97
-#, c-format
-msgid "Failed to load server.met file '%s', unknown format encountered."
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
 msgstr ""
 
-#: src/ServerList.cpp:103
-msgid "Failed to open server.met!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
 msgstr ""
 
-#: src/ServerList.cpp:114
-#, c-format
-msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
 msgstr ""
 
-#: src/ServerList.cpp:169
-#, fuzzy, c-format
-msgid "%i server in server.met found"
-msgid_plural "%i servers in server.met found"
-msgstr[0] "%i сървъра бяха намерени в server.met"
-msgstr[1] "%i сървъра бяха намерени в server.met"
-
-#: src/ServerList.cpp:171
-#, fuzzy, c-format
-msgid "%d server added"
-msgid_plural "%d servers added"
-msgstr[0] "%d сървъра бяха добавени"
-msgstr[1] "%d сървъра бяха добавени"
-
-#: src/ServerList.cpp:192
-#, c-format
-msgid "Server not added: [%s:%d] does not specify a valid port."
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
 msgstr ""
 
-#: src/ServerList.cpp:208
-#, c-format
-msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
 msgstr ""
 
-#: src/ServerList.cpp:228
-#, c-format
-msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
 msgstr ""
 
-#: src/ServerList.cpp:247
-#, c-format
-msgid "Server added: Server at [%s:%d] using the name '%s'."
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
 msgstr ""
 
-#: src/ServerList.cpp:342
-msgid ""
-"You are connected to the server you are trying to delete. please disconnect "
-"first."
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
 msgstr ""
 
-#: src/ServerList.cpp:629
-msgid "Failed to save server.met!"
-msgstr "Грешка при записа на server.met!"
-
-#: src/ServerList.cpp:782
-msgid "Invalid URL"
-msgstr "Грешен URL"
-
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
 msgstr ""
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
 msgstr ""
 
-#: src/ServerList.cpp:818
-msgid ""
-"No server list address entry in 'addresses.dat' found. Please paste a valid "
-"server list address into this file in order to auto-update your server list"
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+#, fuzzy
+msgid " kB/s"
+msgstr "кБ/с"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
 msgstr ""
 
-#: src/ServerList.cpp:831
-#, c-format
-msgid "Start downloading server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/ServerList.cpp:840
-#, c-format
-msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
 msgstr ""
 
-#: src/ServerList.cpp:844
-msgid "No valid server.met auto-download url on addresses.dat"
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
 msgstr ""
 
-#: src/ServerList.cpp:937
-msgid ""
-"Local server is filtered by the IPFilters, reconnecting to a different "
-"server!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
 msgstr ""
 
-#: src/amule.cpp:703
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/amule.cpp:787
-msgid "Server list download"
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/amule.cpp:846
-#, c-format
-msgid "web server running on pid %d"
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/amule.cpp:850
-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"
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/amule.cpp:937
-#, c-format
-msgid "Could not bind ports to the specified address: %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
 msgstr ""
 
-#: src/amule.cpp:964
-#, c-format
-msgid "Port %u is not available. You will be LOWID\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
 msgstr ""
 
-#: src/amule.cpp:970
-#, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
 msgstr ""
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
 msgstr ""
 
-#: src/amule.cpp:1308
-#, c-format
-msgid "This is the first time you run aMule %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
 msgstr ""
 
-#: src/amule.cpp:1316
-msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/amule.cpp:1317
-msgid ""
-"\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/amule.cpp:1318
-msgid ""
-"\n"
-"* Disabled updating the server list from other server and clients.\n"
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
 msgstr ""
 
-#: src/amule.cpp:1319
-msgid ""
-"\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
 msgstr ""
 
-#: src/amule.cpp:1320
-msgid ""
-"\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
 msgstr ""
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
 msgstr ""
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
 msgstr ""
 
-#: src/amule.cpp:1341
-msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
 msgstr ""
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
 msgstr ""
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
 msgstr ""
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/amule.cpp:1826
-#, c-format
-msgid "ServerMessage: %s"
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
 msgstr ""
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/amule.cpp:1907
+#: src/webserver/src/WebServer.cpp:370
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
 msgstr ""
 
-#: src/amule.cpp:1911
-#, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/amule.cpp:2025
-#, c-format
-msgid "Users: %s | Files: %s"
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/amule.cpp:2026
-#, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
 msgstr ""
 
-#: src/amule.cpp:2102
-#, c-format
-msgid "Connected to %s %s"
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/amule.cpp:2105
-#, c-format
-msgid "Connecting to %s"
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
 msgstr ""
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
 msgstr ""
 
-#: src/amule.cpp:2114
-msgid "Kad started."
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
 msgstr ""
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
 msgstr ""
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
 msgstr ""
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
 msgstr ""
 
-#: src/amule.cpp:2191
-msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
-msgstr ""
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Изтегляне"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr ""
+#~ msgid "..."
+#~ msgstr "..."
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr ""
+#~ msgid "Transferring"
+#~ msgstr "Сваляне"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr ""
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "Опашката е пълна"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Изтегляне"
+
+#~ msgid "Show Queue"
+#~ msgstr "Показване на опашка"
+
+#~ msgid "Waited"
+#~ msgstr "Изчакал"
+
+#~ msgid "Total"
+#~ msgstr "Общо"
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Файлове за сваляне (%i)"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "Фатална грешка: не можах да създам брояч"
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Грешка"
+
+#~ msgid "Misc Options"
+#~ msgstr "Допълнителни Опции"
+
+#, fuzzy
+#~ msgid "Copy ED2k links to clipboard"
+#~ msgstr "Копиране на ED2k линк в системния буфер (име на хост)"
 
 #, fuzzy
 #~ msgid "ED2K: Connecting"
@@ -6981,9 +7321,6 @@
 #~ msgid "0"
 #~ msgstr "0"
 
-#~ msgid "Upload Limit"
-#~ msgstr "Лимит за качване"
-
 #~ msgid "Download Limit"
 #~ msgstr "Лимит за сваляне"
 
@@ -7056,9 +7393,6 @@
 #~ msgid "Unable to retrieve shared files from '%s'"
 #~ msgstr "Получаването на споделени файлове от '%s' е невъзможно"
 
-#~ msgid "Requesting shared files from '%s'"
-#~ msgstr "Искане на споделени файлове от '%s'"
-
 #~ msgid "Requesting shared files from user %s (%u) is already in progress"
 #~ msgstr "Вече е поискан списъкът със споделени файлове на %s (%u)"
 
@@ -7108,15 +7442,9 @@
 #~ msgid "*** Disconnected"
 #~ msgstr "*** Изключен"
 
-#~ msgid "Failed to load creditfile"
-#~ msgstr "Грешка при зареждане на файла с кредити"
-
 #~ msgid "Creditfile is out of date and will be replaced"
 #~ msgstr "Файлът с кредити е остарял и ще бъде заменен"
 
-#~ msgid "Failed to save creditfile"
-#~ msgstr "Грешка при запис на файла с кредити"
-
 #~ msgid "Creditfile loaded"
 #~ msgstr "Файлът с кредити зареден"
 
@@ -7170,15 +7498,9 @@
 #~ msgid "can't write file '%s'"
 #~ msgstr "писането във файла '%s' е невъзможно"
 
-#~ msgid "done"
-#~ msgstr "готово"
-
 #~ msgid "Loaded ipfilter with %d IP addresses."
 #~ msgstr "Зареден е ip филтър с %d ip адреса."
 
-#~ msgid "Error: the file known.met is corrupted, unable to load known files"
-#~ msgstr "Грешка:файлът known.met е повреден,зареждането на списъка пропадна"
-
 #~ msgid "accepted"
 #~ msgstr "приет"
 
@@ -7200,6 +7522,9 @@
 #~ msgid "Clear All"
 #~ msgstr "Изчисти всичко"
 
+#~ msgid "Search Results"
+#~ msgstr "Резултати от Търсене"
+
 #~ msgid ")"
 #~ msgstr ")"
 
@@ -7230,12 +7555,6 @@
 #~ msgid "?"
 #~ msgstr "?"
 
-#~ msgid "Downloaded:"
-#~ msgstr "Свален:"
-
-#~ msgid "Available"
-#~ msgstr "Наличен"
-
 #~ msgid "Executable (*)|*||"
 #~ msgstr "Изпълними (*)|*||"
 
@@ -7251,9 +7570,6 @@
 #~ msgid "Invalid versiontag in server.met (0x%X)!"
 #~ msgstr "Невалиден етикет за версия в server.met (0x%X)!"
 
-#~ msgid "Error: the file server.met is corrupted"
-#~ msgstr "Грешка: файлът server.met е повреден"
-
 #~ msgid "Server added: "
 #~ msgstr "Добавен сървър:"
 
@@ -7350,24 +7666,12 @@
 #~ msgid "Refreshing server connection"
 #~ msgstr "Опресняване на връзката"
 
-#~ msgid "Filtered: %i"
-#~ msgstr "Филтрирани: %i"
-
-#~ msgid "Found Sources: %i"
-#~ msgstr "Намерени източници: %i"
-
 #~ msgid "Active Downloads (chunks): %i"
 #~ msgstr "Активни сваляния (парчета) : %i"
 
 #~ msgid "Uploaded Data (Session (Total)): %s (%s)"
 #~ msgstr "Качена информация (На сесия (Общо)): %s (%s)"
 
-#~ msgid "Active Uploads: %i"
-#~ msgstr "Активни качвания: %i"
-
-#~ msgid "Waiting Uploads: %i"
-#~ msgstr "Файлове за качване: %i"
-
 #~ msgid "Total successful upload sessions: %i"
 #~ msgstr "Общо успешни сесии на качване: %i"
 
@@ -7389,9 +7693,6 @@
 #~ msgid "waiting for transfer..."
 #~ msgstr "изчакване за трансфер..."
 
-#~ msgid "waiting for connection..."
-#~ msgstr "изчакване за свързване..."
-
 #~ msgid "Session UL:DL Ratio (Total):"
 #~ msgstr "UL:DL съотношение (общо)"
 
@@ -7422,9 +7723,6 @@
 #~ msgid "New MLDonkey: %i (%1.1f%%)"
 #~ msgstr "Ново MlDonkey: %i (%1.1f%%)"
 
-#~ msgid "Unknown: %i"
-#~ msgstr "Неизвестно: %i"
-
 #~ msgid "Working Servers"
 #~ msgstr "Работещи сървъри"
 
@@ -7443,9 +7741,6 @@
 #~ msgid "Total Users"
 #~ msgstr "Общо потребители"
 
-#~ msgid "Total Files"
-#~ msgstr "Общо файлове"
-
 #~ msgid "Active Connections (estimate)"
 #~ msgstr "Активни връзки (изчисляване)"
 
@@ -7455,9 +7750,6 @@
 #~ msgid "Average Connections (estimate)"
 #~ msgstr "Среден брой връзки (изчисляване)"
 
-#~ msgid "Peak Connections (estimate)"
-#~ msgstr "Максимален брой връзки (изчисляване)"
-
 #~ msgid "Show"
 #~ msgstr "Показва"

aMule-2.2.6.tar.bz2/po/ca.po -> aMule-2.3.1.tar.bz2/po/ca.po Changed

@@ -1,1329 +1,1167 @@
 # aMule i18n resource file.
-# Copyright (C) 2004 - 2008 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the aMule package.
 #
 # Translation of aMule to Catalan / Valencian
 #
+# Main translation:
 # pukyxd <pukyxd@yahoo.com> 2004 - 2005
-# Carles Escrig (simkin) <royo@aditel.org> 2005 - 2008
-# Kry <elkry@users.sourceforge.net>, 2004 - 2008, 2009.
+# simkin <royo@aditel.org> 2005 - 2010
+#
+# Contributors:
+# Kry <elkry@users.sourceforge.net>, Diego Silva Galan <diegosilvagalan@gmail.com>, sergei manolo <sergei.saz@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-03-04 20:44+0100\n"
-"Last-Translator: FoxDie\n"
-"Language-Team: Catalan\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
+"PO-Revision-Date: 2010-01-15 03:38+0200\n"
+"Last-Translator: simkin <simkin@ono.com>\n"
+"Language-Team: Català\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Poedit-Language: Catalan\n"
-"X-Generator: Lokalize 0.3\n"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Heu d'especificar una contrasenya (no buida)."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Contrasenya invàlida, no és un resum MD5!"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Afegeix un amic"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Fallada en la connexió"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Heu d'introduir una IP i port vàlids!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "La connexió externa ha fallat. Resposta buida."
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Informació"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Connexió externa: Accés denegat perquè: "
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "El resum d'usuari especificat no és vàlid!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Connexió externa: Accés denegat"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "No s'ha pogut obrir el fitxer de enllaços ED2K."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
-"Connexió externa: Resposta del servidor incorrecta. S'ha tancat la connexió."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Connexió establerta amb l'aMule"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Connexió establerta amb èxit."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Resumint"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Completant"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Complet"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Pausat"
+"AVÍS: No us podeu afegir com a font per a un enllaç eD2k mentre teniu ID "
+"Baixa."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Erroni"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Sortint del programa..."
+
+#: src/amule.cpp:258
+#, fuzzy, c-format
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "S'està aturant el procés amuleweb amb pid `%ld' ... "
+
+#: src/amule.cpp:261
+#, fuzzy, c-format
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Aturant procés amuleweb amb pid `%ld' ... "
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "S'està baixant"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Fallades"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Esperant"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule Sortida: Finalitzant nucli."
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "S'està començant la creació del resum MD4 i AICH per al fitxer: %s"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "Aturada aMule completada."
 
-#: src/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "S'està començant la creació del resum MD4 per al fitxer: %s"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Resultat de la depuració de la memòria a la sortida de l'aMule:"
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "S'està començant el creació del resum AICH per al fitxer: %s"
-
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
 msgstr ""
-"S'està convertint els conjunts de resums AICH antics en '%s' a 64b en '%s'."
+"\n"
+"Configuració EC"
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr ""
-"AVÍS: El nom de fitxer '%s' és invàlid i ha estat reanomenat com a '%s'."
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Contrassenya definida i connexions externes activades."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr ""
-"AVÍS: El fitxer '%s' ja existeix, el fitxer nou ha estat reanomenat com a '%"
-"s'."
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "AVÍS"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
 msgstr ""
-"AVÍS: No s'ha pogut esborrar l'original '%s' després de crear la còpia de "
-"seguretat"
+"S'ha establert l'idioma Predeterminat del Sistema a causa d'un canvi de "
+"configuració. Disculpeu."
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "AVÍS: No s'ha pogut esborrar %s"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Informació"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "No s'han pogut obtenir els compartits de l'usuari '%s'"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"No teniu cap servidor a la llista de servidors.\n"
+"Voleu que l'aMule baixi una llista nova?"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Desconegut"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Baixada de la llista de servidors"
 
-#: src/BaseClient.cpp:1738
+#: src/amule.cpp:654
 #, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Versió d'eMule falsa %#x)"
+msgid "web server running on pid %d"
+msgstr "servidor web executant-se al pid %d"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (eMule fals)"
+#: src/amule.cpp:658
+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 ""
+"Heu demanat que s'executi el servidor web a l'inici, però no s'ha trobat el "
+"fitxer binari de l'amuleweb. Si us plau instal·leu el paquet que conté el "
+"servidor web de l'aMule, o compileu l'aMule usant la opció --enable-"
+"webserver i executeu make install"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (eMule fals)"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "ERROR"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:741
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (basat en l'eMule v0.%u)"
+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/BaseClient.cpp:1960
+#: src/amule.cpp:768
 #, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Sobrenom: %s ID: %u"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "El port %u no està disponible. Tindreu ID BAIXA\n"
 
-#: src/BaseClient.cpp:1962
+#: src/amule.cpp:774
 #, c-format
-msgid "Requested: %s\n"
-msgstr "Demanat: %s\n"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"El port %u no està disponible!\n"
+"\n"
+"Això significa que tindreu ID BAIXA.\n"
+"\n"
+"Comproveu la configuració de la xarxa per a assegurar-vos que el port està "
+"obert."
 
-#: src/BaseClient.cpp:1964
-#, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Estadístiques dels fitxers per a aquesta sessió: %d petició acceptada de %d, "
-"%s transferida\n"
-msgstr[1] ""
-"Estadístiques dels fitxers per a aquesta sessió: %d peticions acceptades de %"
-"d, %s transferides\n"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "No s'ha pogut crear el fitxer de la signatura en línia"
 
-#: src/BaseClient.cpp:1967
-#, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Estadístiques dels fitxers per a totes les sessions: %d petició acceptada de "
-"%d, %s transferida\n"
-msgstr[1] ""
-"Estadístiques dels fitxers per a totes les sessions: %d peticions acceptades "
-"de %d, %s transferides\n"
+#: src/amule.cpp:861
+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/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "S'ha demanat un fitxer desconegut"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"L'idioma seleccionat no està instal·lat al PC. (Nota: s'intentarà establir "
+"igualment)"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:1040
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Client %s amb IP:Port %s:%d usant %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Usuari"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Amics"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Mostra els &detalls"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Afegeix un amic"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Elimina l'amic"
+msgid "This is the first time you run aMule %s"
+msgstr "És la primera vegada que executeu l'aMule %s"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Envia un &missatge"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Aquesta és una versió de prova, actualitzada diàriament, i\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Veure els compartits"
+#: src/amule.cpp:1043
+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"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Estableix posició (slot) d'amic"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "o mati al gos. Tanmateix el seu ús *hauria* de ser segur.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Esteu segur que voleu esborrar l'amic seleccionat?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Podeu trobar més informació, ajuda i noves versions a la nostra pàgina web,\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Esteu segur que voleu esborrar els amics seleccionats?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "www.aMule.org, o al nostre canal IRC #aMule de irc.freenode.net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Cancel·la"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Podeu informar de qualsevol error a http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"No podeu establir més d'una posició d'amic.\n"
-" Només s'ha assignat una posició."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Selecció múltiple"
+"La carpeta especificada per als fitxers de la signatura en línia és "
+"INVÀLIDA!\n"
+" S'INHABILITARÀ la signatura en línia fins que ho resolgueu a les "
+"preferències."
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Descàrrega completada"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Nom del servidor notificat"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "La ruta completa al fitxer"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "La preassignació d'espai per al fitxer '%s' ha fallat: %s"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "El nom del fitxer sense la ruta."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "ERROR: no es pot obrir el fitxer de registre"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "El resum eD2k del fitxer."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "AVÍS: el fitxer de registre està buit. Alguna cosa no va bé."
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "La mida del fitxer en bytes."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "S'ha reiniciat el registre"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Temps d'activitat de baixada acumulat."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Missatge del servidor: %s"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Iniciada nova sessió de xat"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Remitent del missatge."
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "No s'ha pogut baixar la llista de nodes."
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Sense espai"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "No s'ha pogut obrir el fitxer de comprovació de versió"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Partició de disc."
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Fitxer de comprovació de versió corrupte"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Error completant"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Esteu usant una versió antiga de l'aMule!"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Fitxer"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr ""
+"La vostra versió de l'aMule és %i.%i.%i i l'última versió és %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Mida"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Sempre podeu trobar l'última versió a http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tipus"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "AVÍS: La vostra versió d'aMuled és antiga: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioritat"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "La vostra versió de l'aMule és l'última."
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "Resum del fitxer"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "No s'ha pogut baixar el fitxer de comprovació de versió"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Peticions"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Usuaris: %s | Fitxers: %s"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Peticions acceptades"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Usuaris: E: %s K: %s | Fitxers: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Dades transferides"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "No s'han seleccionat xarxes"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Rati"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "amb ID Baixa"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Parts obtingudes"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "amb ID Alta"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Fonts completes"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Connectat a %s %s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Ubicació"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "S'està connectant a %s"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Compartits"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Desconnectat de eD2k"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Molt baixa"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "S'ha engegat la xarxa Kad."
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Baixa"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "S'ha aturat la xarxa Kad."
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normal"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Connectat a Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Alta"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Connectat a Kad (tallafocs)"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Molt alta"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Desconnectat de Kad"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Llançament"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"No es pot usar la xarxa Kad si el port UDP està inhabilitat a les "
+"preferències, no s'engegarà."
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Auto"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "La xarxa Kad està inhabilitada a les preferències, no es connectarà."
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Afegeix comentari / valoració"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"ERROR: no es pot usar el dimoni aMule quan les connexions externes estan "
+"inhabilitades. Per a activar les connexions externes, feu servir l'aMule "
+"normal, inicieu l'amuled amb la opció --ec-config o establiu el paràmetre "
+"\"AcceptExternalConnections\" a 1 al fitxer ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Edita comentari / valoració"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"ERROR: És obligatori l'ús d'una contrassenya vàlida per usar connexions "
+"externes, el dimoni de l'aMule no pot usar-se sense connexions externes. Per "
+"executar el dimoni aMule, el camp \"ECPassword\" del fitxer ~/.aMule/amule."
+"conf ha de tenir un valor assignat. Executa amuled amb els paràmetres --ec-"
+"config per establir una contrassenya. Més informació a http://wiki.amule.org"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: A l'Inici - Iniciant timer"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: Bifurcant-se a segon pla - adeu siau"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "No s'ha pogut crear el fitxer Pid"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Reanomena"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "ERROR: %s"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Afegeix els fitxers de la col·lecció a les transferències"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "aMule %s basat en eMule."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Copia l'enllaç en format &Magnet al porta-retalls"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "S'està executant sobre %s"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Copia &l'enllaç eD2k al porta-retalls"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Visiteu http://www.amule.org per a comprovar si hi ha disponible una versió "
+"nova."
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Copia l'enllaç eD2k al porta-retalls (&Font)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ERROR GREU: No s'ha pogut crear el temporitzador"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr ""
-"Copia l'enllaç eD2k al porta-retalls (Font) (amb les opcions de &xifrat)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Control remot de l'aMule "
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Copia l'enllaç eD2k al porta-retalls (&Nom de l'ordinador)"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Snapshot:"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr ""
-"Copia l'enllaç eD2k al porta-retalls (Nom de l'ordinador) (amb les &opcions "
-"de xifrat)"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr "Client P2P 'Multiplataforma' basat en eMule \n"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Copia l'enllaç eD2k al porta-retalls (amb l'informació &AICH)"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Lloc web: http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Copia la &informació al porta-retalls"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Fòrum: http://forum.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:504
 msgid ""
-"Feedback from: %s (%s)\n"
+"FAQ: http://wiki.amule.org \n"
 "\n"
 msgstr ""
-"Retroacció des de: %s (%s)\n"
+"PMF: http://wiki.amule.org \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Necessiteu ID Alta per crear un enllaç font vàlid"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Contacte: admin@amule.org (temes administratius) \n"
 
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "AVÍS"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Fitxers compartits (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[Fitxer de parts]"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Introduïu un nom nou per al fitxer:"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Part de l'aMule està basat en \n"
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Reanomena"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Encaminament p2p basat en la mètrica XOR.\n"
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "S'està reprenent la pujada del fitxer: %s"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr "Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Missatge"
 
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "S'està suspenent la pujada del fitxer: %s"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "Diàleg de l'aMule tancat"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "client de text de l'aMule"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Connectant"
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: la paraula clau de cerca és massa curta"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: S'està connectant"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "S'ha llegit %u contacte Kad"
-msgstr[1] "S'han llegit %u contactes Kad"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Desconnectat"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Només és disponible %d contacte Kad, no s'ha escrit nodes.dat"
-msgstr[1] "Només són disponibles %d contactes Kad, no s'ha escrit nodes.dat"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Bloquejat"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "S'ha escrit %d contecte Kad"
-msgstr[1] "S'han escrit %d contactes Kad"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Connectat"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ERROR: No s'ha pogut escoltar el port TCP."
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Connectant"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "s'ha acceptat la connexió del client web\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Inativa"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ERROR: no es pot acceptar la connexió del client web\n"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Cancel·la"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Ha fallat la petició amb el següent error: %s."
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Atura els intents de connexió actuals"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "La petició ha fallat amb un error desconegut."
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Desconnecta"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "No s'ha trobat el fitxer d'índex:"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Desconnecta de les xarxes on s'està connectat actualment."
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "La sessió ha caducat - s'està demanant la identificació\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Connecta"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sessió correcta, identificat\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Connecta a la xarxa habilitades."
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sessió correcta, sense identificar\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "PU: %.1f(%.1f) | BA: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "No hi ha cap sessió oberta - es demanarà identificació\n"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "PU: %.1f | BA: %.1f"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Sessió creada - s'està demanant la identificació\n"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Connectat)"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "S'està processant la petició [original]: "
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Desconnectat)"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "S'està comprovant la contrasenya\n"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Esteu segur que voleu eixir de %s?"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "El resum de la contrasenya és invàlid\n"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Confirmació de sortida"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Contrasenya correcta\n"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Ordre:"
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- defecte -"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Contrasenya incorrecta\n"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "El directori del tema '%s' no existeix"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
-"No heu especificat cap contrasenya. No es permet una contrasenya en blanc.\n"
-
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Eixida sol·licitada\n"
-
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "S'està processant la petició [redirigit]: "
-
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Carrega la plantilla <str>"
-
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Port HTTP del servidor web"
-
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Usa l'encaminament UPnP al port del servidor web"
-
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Port UPnP"
-
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Usa la compressió gzip"
-
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Contrasenya d'accés total per al servidor web"
-
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Contrasenya de convidat per al servidor web"
+"AVÍS: No ha estat possible obrir el fitxer d'aparença '%s' per a lectura"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Permetre l'accés de convidats"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Xarxes"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Denega l'accés de convidats"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Finestra de les Xarxes"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr ""
-"Carrega / desa la configuració del servidor web des de / a l'aMule remot"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Cerques"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr ""
-"Directori del fitxer de configuració de l'aMule. NO L'USEU DIRECTAMENT!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Finestra de cerques"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Inhabilita el intèrpret PHP (obsolet)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Baixades"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Recompila les pàgines PHP a cada petició"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "S'està baixant"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Servidor web de l'aMule"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Compartits"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "No disponible"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Finestra de fitxers compartits"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Mai"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Missatges"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "S'està baixant..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Finestra de Missatges"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Estadístiques"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "Esperats %d bytes, però %d bytes descarregats."
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Finestra del gràfic d'estadístiques"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Preferències"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "El directori on està el fitxer amulesig.dat"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Finestra de la configuració de preferències"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Explora"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importa"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Poseu ací el directori on està el fitxer amulesig.dat"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Eina d'importació de fitxers de parts"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Interval de refresc en segons"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Quant a"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Genera una imatge a cada refresc"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Quant a / Ajuda"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Poseu ací el directori on es generarà la imatge d'estadístiques"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Xarxa eD2k"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Puja periòdicament la imatge d'estat a un servidor FTP"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Xarxa Kad"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "Adreça FTP"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Cap xarxa"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Directori FTP"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "Control remot de l'aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Poseu ací l'adreça del servidor FTP"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "Poseu ací el directori del servidor FTP on es desarà la imatge"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Error Fatal: Ha fallat la creació del Core Timer"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Usuari"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Connecta a l'amule remot"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Contrasenya"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Error Fatal: Ha fallat la creació del Poll Timer"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "S'està executant un bucle..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Connectant..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Poseu ací el nom d'usuari per a entrar al servidor FTP"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "La connexió ha fallat "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Poseu ací la contrasenya per a entrar al servidor FTP"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Gestor d'esdeveniments de la IGU EC Remota  "
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Aturant"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Interval d'actualització de l'FTP en minuts"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Connexió fallida. No ha estat possible connectar-se a %s:%d\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "D'acord"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "S'ha tancat la connexió - segurament l'aMule s'ha terminat."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Directori on està el fitxer de signatura"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "A punt"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Directori on es genera la imatge"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Tots"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:631
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i dies %i hores %i min %i s"
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, Estadístiques en línia de l'aMule"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Benvinguts!"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
+"No s'ha pogut crear el directori '%s' per a la categoria '%s', es mantindrà "
+"el directori '%s'."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Rati de BA màxim des que el wxCas funciona"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Desconegut"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Màxim absolut de rati de BA històric del wxCas"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "No s'han pogut obtenir els compartits de l'usuari '%s'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Reinicia"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Buscant amic per connexió amb ID Baixa"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistema"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Versió d'eMule falsa %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Atura l'autorefresc"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (eMule fals)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Desa la imatge de les estadístiques en línia"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (eMule fals)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Imprimeix la imatge de les estadístiques en línia"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (basat en l'eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Paràmetre de les preferències"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Sobrenom: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Quant al wxCas"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Demanat: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Inicia l'autorefresc"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Estadístiques dels fitxers per a aquesta sessió: %d petició acceptada de %d, "
+"%s transferida\n"
+msgstr[1] ""
+"Estadístiques dels fitxers per a aquesta sessió: %d peticions acceptades de %"
+"d, %s transferides\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Autorefresc aturat"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Estadístiques dels fitxers per a totes les sessions: %d petició acceptada de "
+"%d, %s transferida\n"
+msgstr[1] ""
+"Estadístiques dels fitxers per a totes les sessions: %d peticions acceptades "
+"de %d, %s transferides\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Autorefresc iniciat"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "S'ha demanat un fitxer desconegut"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Desa la imatge de les estadístiques"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Missatge filtrat de '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Estadístiques en línia de l'aMule"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nou missatge de '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"Ha hagut un problema en imprimir.\n"
-"Tal volta la impressora actual no està configurada correctament?"
+"L'usuari %s (%u) ha demanat la llista de fitxers compartits del directori %"
+"s  -> Denegada"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Imprimint"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "AVÍS: No es pot obrir %s."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
-"wxCAS, Signatura d'estadístiques en Línia de l'aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Basat en CAS de Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distribuït sota GPL"
+"AVÍS: La llista dels fitxers cancel·lats és malmesa, conté una capçalera no "
+"vàlida."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "L'aMule no s'està executant..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "L'aMule s'està executant"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Error d'E/S metre es llegia el fitxer %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "L'aMule s'està executant, però desconnectat"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Error mentre es desava el fitxer %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "L'aMule s'està connectant..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Entra "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "L'estat de l'aMule és desconegut..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Categoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " ha estat funcionant durant "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nova categoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " està aturat!"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Carpeta per als fitxers entrants"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " no està connectat!"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Heu d'especificar un nom per a la categoria!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " està connectant..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Heu d'especificar un directori per a la categoria!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " està fent alguna cosa estranya, comproveu-lo!"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"No s'ha pogut crear el carpeta d'entrada per a la categoria. Si us plau, "
+"especifiqueu un directori vàlid!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " està connectat a "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "S'ha iniciat una sessió de xat: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Connectat amb el client ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "correcte"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** S'està connectant amb el client ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "protegit per un tallafocs"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** No s'ha pogut connectar amb el client / Connexió perduda ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "inactiu"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
+"*** Has superat el procés de comprovació del captcha i l'usuari ha rebut el "
+"teu missatge. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " és a "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** La teva resposta al captcha he estat errònea i el teu missatge ha "
+"estatignorat. Pots demanar un nou captcha enviant un nou missatge. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " amb "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Xat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Total baixat: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Tanca la pestanya"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", pujat: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Tanca totes les pestanyes"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Baixat durant la sessió: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Tanca les altres pestanyes"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Baixant: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Afegeix a la llista d'amics"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr "kB/s, pujant: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "El fitxer de crèdits ha estat carregat, %u és un client conegut"
+msgstr[1] "El fitxer de crèdits ha estat carregat, %u són clients coneguts"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Han vençut els crèdits de %u client!"
+msgstr[1] " - Han vençut els crèdits de %u clients!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Compartint: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "No s'ha trobat el fitxer 'cryptkey.dat', creant-lo."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " fitxers, clients a la cua: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Detalls del client"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Hora: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "ID Baixa"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "ID Alta"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " a "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Habilitada"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Mitjana de càrrega del sistema (1-5-15 min): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Suportada"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Sistema en funcionament des de: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "No suportada"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Inhabilitada"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Connectat"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Desconnectat"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02us"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "ID Alta"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Sense completar"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "ID Baixa"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Dolent"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Desconnectat"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Verificat - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "No disponible"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr ""
+"L'usuari %s (%u) ha demanat la llista de fitxers compartits -> Acceptada"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+"L'usuari %s (%u) ha demanat la llista de fitxers compartits -> Denegada"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
-
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Cancel·lat !"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"L'usuari %s (%u) ha demanat la llista de directoris compartits -> Acceptada"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "Unable to open %s"
-msgstr "No s'ha pogut obrir %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Paràmetres d'entrada"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Fitxer"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Afegeix adreces opcionals per al fitxer"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Introduïu ací el fitxer per al qual voleu calcular l'enllaç eD2k"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+"L'usuari %s (%u) ha demanat la llista de directoris compartits -> Denegada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Introduïu ací l'URL que voleu agregar a l'enllaç eD2k: Afegiu / al final per "
-"a que el programa integri el nom del fitxer actual"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Afegeix"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Esborra"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Neteja"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Crea l'enllaç amb resums per a cada part"
+"L'usuari %s (%u) ha demanat la llista de fitxers compartits del directori %"
+"s  -> Acceptada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Ajuda a escampar més ràpidament els fitxer nous i rars, a costa d'un enllaç "
-"més gros"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Resum MD4 del fitxer"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "Resum eD2k del fitxer"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "Enllaç eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Inicia"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Desa"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Copia al porta-retalls"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Surt"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Obre"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Obre un fitxer per a crear-ne l'enllaç eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Copia"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Copia l'enllaç eD2k al porta-retalls"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Desa com a"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Desa l'enllaç eD2k a un fitxer"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Quant a"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Quant a l'aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Seleccioneu el fitxer per al qual voleu crear l'enllaç eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "No s'ha pogut obrir el porta-retalls"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "No hi ha res a copiar!"
+"L'usuari %s (%u) ha demanat la llista de fitxers compartits del directori %"
+"s  -> Denegada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Seleccioneu el fitxer per a l'enllaç eD2k creat"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "L'usuari %s (%u) comparteix el directori %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "No s'ha pogut obrir "
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "L'usuari %s (%u) ha enviat directoris compartits no demanats."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Per favor, introduïu un nom que no sigui buit"
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr ""
+"L'usuari %s (%u) ha enviat la llista de fitxers compartits del directori %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "No hi ha res a desar!"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr ""
+"L'usuari %s (%u) ha acabat l'enviament de la llista de fitxers compartits"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
-"aLinkCreator, el creador d'enllaços eD2k de l'aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Gràfics de http://www.everaldo.com i http://www.icomania.com\n"
-"i http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distribuït sota llicència GPL"
+"L'usuari %s (%u) ha enviat una llista de fitxers compartits no desitjada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Fent el resum..."
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr ""
+"L'usuari %s (%u) ha denegat l'accés a la llista de fitxers/directoris "
+"compartits"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "El creador d'enllaços està treballant"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Comentaris del Fitxer"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Calculant el resum MD4..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Usuari"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Calculant els resums eD2k..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Fitxer"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Fet en %.2f s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Valoració"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Ja heu afegit aquesta adreça!"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Comentari"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Per favor, introduïu una adreça que no sigui buida"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Sense comentaris"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "S'està processant el fitxer número %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr ""
-"Heu preguntat per els resums de les parts (Només per a fitxers > 9.5MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u comentari"
+msgstr[1] "%u comentaris"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Fitxer inexistent !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, el creador d'enllaços eD2k de l'aMule"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"S'ha expulsat el client %s per haver enviat %s dades corruptes d'un total de "
+"%s del fitxer '%s'"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1337,31 +1175,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Al]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Connectant"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Molt baixa"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Baixa"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normal"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Alta"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Molt alta"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Llançament"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Preguntant"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "S'està connectant via servidor"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Cua plena"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "Cua"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Transferint"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "S'està baixant"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1387,8 +1251,7 @@
 msgid "Too many Kad connections"
 msgstr "Massa connexions Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Expulsats"
 
@@ -1420,8 +1283,8 @@
 msgid "Remote Server"
 msgstr "Servidor remot"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1445,8 +1308,8 @@
 msgid "Search Result"
 msgstr "Resultat de la cerca"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Completat"
 
@@ -1470,7 +1333,7 @@
 msgid "ERROR: Failed!"
 msgstr "ERROR: Ha fallat!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "En cua"
 
@@ -1482,881 +1345,310 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Format de fitxer temporal desconegut o defectuós."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Predeterminat"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Part"
 
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albanès"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Àrab"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturià"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Basc"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Búlgar"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Català; Valencià"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Xinès (Simplificat)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Xinès (Tradicional)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Croat"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Txec"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Danès"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Holandès"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Anglès (R.U.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estonià"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finès"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Francès"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Gallec"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Alemany"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Grec"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hebreu"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Hongarès"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italià"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italià (Suïssa)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japonès"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Coreà"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lituà"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Noruec"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Mida"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polonès"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Transferit"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portuguès"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Velocitat"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portuguès (Brasil)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Progrés"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Rus"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Fonts"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Eslovè"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioritat"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Espanyol; Castellà"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Estat"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Suec"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Temps Restant"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turc"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Últim cop vist complet"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ucraïnès"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Última recepció"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "No s'ha pogut determinar el navegador seleccionat"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Esteu segur que voleu esborrar el fitxer seleccionat?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"El port TCP no pot ser més gran que 65532 puix el sòcol UDP del servidor és "
-"TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Esteu segur que voleu esborrar els fitxers seleccionats?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "S'usarà el port per defecte (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Nom"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adreça"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Descripció"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Usuaris"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Fitxers"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Fallades"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Estàtic"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versió"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Esteu intentant esborrar un servidor al què esteu connectat. Per favor, "
-"desconnecteu-vos primer. NO s'ha esborrat el servidor."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Informació"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Nom desconegut)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Esteu segur que voleu esborrar el servidor estàtic %s"
+"Retroacció des de: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Sí"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "No"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Atura"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "No s'ha pogut obrir '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pausa"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Servidors (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Continua"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Servidor"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "&Neteja els completats"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Connecta al servidor"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Intercanvia cada A4AF a aquest fitxer ara"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Marca el servidor com a estàtic"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Intercanvia cada A4AF a aquest fitxer (Automàtic)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Marca el servidor com a no estàtic"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Intercanvia cada A4AF a qualsevol altre fitxer ara"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Marca els servidors com a estàtics"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Opcions avançades"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Marca els servidors com a no estàtics"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Previsualitza"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Esborra el servidor"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Mostra els &detalls del fitxer"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Esborra els servidors"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Mostra els comentaris"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Esborra tots els servidors"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Copia l'enllaç amb format Magnet al porta-retalls"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Copia l'enllaç eD2k al porta-retalls"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Copia &l'enllaç eD2k al porta-retalls"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Copia els enllaços eD2k al porta-retalls"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Copia la &informació al porta-retalls"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Reconnecta amb el servidor"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "Cap categoria"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Esteu segur que voleu esborrar tots els servidors?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Assigna a una categoria"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Esteu segur que voleu esborrar el servidor seleccionat?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Obre el fitxer"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Esteu segur que voleu esborrar els servidors seleccionats?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Introduïu un nom nou per al fitxer:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Inhabilitat [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Reanomena"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "aMule %s basat en eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%d/%m/%y %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "S'està executant sobre %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Visiteu http://www.amule.org per a comprovar si hi ha disponible una versió "
-"nova."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ERROR GREU: No s'ha pogut crear el temporitzador"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Control remot de l'aMule "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Snapshot:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" Client p2p multiplataforma basat en l'eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Pàgina: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Fòrum: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" PMF: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Contacte: admin@amule.org (problemes administratius) \n"
+msgid "Downloads (%i)"
+msgstr "Baixades (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Una part de l'aMule està basada en \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Encaminament p2p basat en la mètrica XOR.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Missatge"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: S'està connectant"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: S'està desconnectant"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: bloquejat per un tallafocs"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Connectat"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Connectant"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Inativa"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Atura els intents de connexió actuals"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Desconnecta"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Desconnecta de les xarxes on s'està connectat actualment."
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Connecta"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Connecta a la xarxa habilitades."
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "PU: %.1f(%.1f) | BA: %.1f(%.1f)"
+"Per a evitar que en cada previsualització aparegui aquest avís, configureu\n"
+"un reproductor de vídeo a les preferències (per defecte s'usa mplayer)."
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "PU: %.1f | BA: %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Previsualització"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Connectat)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr ""
+"ERROR: No s'ha pogut executar un reproductor multimèdia extern! Ordre: `%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Desconnectat)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Esteu segur que voleu eixir de l'aMule?"
+msgid "Saving PartFile %u of %u"
+msgstr "Desant fitxer de parts %u de %u"
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Confirmació de sortida"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Tots els fitxers de parts desats."
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "El directori del tema '%s' no existeix"
+msgid "Loading temp files from %s."
+msgstr "S'estan carregant els fitxers de %s."
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr ""
-"AVÍS: No ha estat possible obrir el fitxer d'aparença '%s' per a lectura"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Xarxes"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Finestra de xarxes"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Cerques"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Finestra de cerques"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Transferències"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Finestra de transferència de fitxers"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Fitxers compartits"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Finestra de fitxers compartits"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Missatges"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Finestra de missatges"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Estadístiques"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Finestra del gràfic d'estadístiques"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Finestra dels paràmetres de configuració"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importa"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Eina d'importació de fitxers de parts"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Quant a / Ajuda"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "Xarxa eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Xarxa Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Cap xarxa"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "General"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Connexió"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Directoris"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Servidors"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Seguretat"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Interfície"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Servidor intermediari"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filtres"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Control remot"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Signatura en línia"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Avançat"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Esdeveniments"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Depuració"
+msgid "Loading PartFile %u of %u"
+msgstr "S'està carregant els fitxer de descarrega %u de %u"
 
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Definit per l'usuari"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"S'ha de reiniciar l'aMule per a habilitar aquests canvis:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- El port TCP ha canviat.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- El port UDP ha canviat.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"La llista d'autoactualització de servidors és buida.\n"
-"Es desactivarà l'actualització automàtica a l'inici."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Heu habilitat les connexions externes però no heu especificat una "
-"contrasenya.\n"
-"Les connexions externes no poden ser habilitades a menys que s'hagi "
-"especificat una contrasenya externa vàlida."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- L'idioma ha canviat.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- El directori temporal ha canviat.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- Xarxa ED2K habilitada.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "PU: 0.0 | BA: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Les xarxes eD2k i Kad estan inhabilitades.\n"
-"No podreu connectar fins que n'habiliteu almenys una."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"La xarxa Kad no s'engegarà si el port UDP està inhabilitat.\n"
-"Habiliteu el port UDP o inhabiliteu la xarxa Kad."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"HEU de reiniciar l'aMule ara mateix.\n"
-"Si no reinicieu ara, no vos queixeu dels possibles problemes.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"La llista d'actualització automàtica de servidors és buida.\n"
-"Per favor, ompliu-la amb almenys una adreça que apunti a un fitxer server."
-"met vàlid.\n"
-"Feu clic sobre el botó \"Llista\" d'aquest quadre de verificació per afegir "
-"una adreça."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Fitxers temporals"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Fitxers entrants"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Signatures en línia"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Carpeta per a %s"
+"ERROR: No s'ha pogut carregar la còpia de seguretat. Cerqueu '.part.met "
+"recovery solutions' a http://forum.amule.org"
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Explora per a trobar un reproductor de vídeo"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Tots els fitxers de parts carregats."
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Selecciona navegador"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "No s'han trobat fitxers de parts"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Executable%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Edita la llista de servidors"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Trobat %u fitxer de parts"
+msgstr[1] "Trobats %u fitxers de parts"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Afegiu ací adreces d'on baixar el fitxer server.met.\n"
-"Només una adreça a cada línia."
+"El sistema de fitxers del directori Temp no pot gestionar fitxers de grans "
+"dimensions."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Retard de l'actualització: %d seg"
-msgstr[1] "Retard de l'actualització: %d segs"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"El sistema de fitxers per al directori Incoming no pot gestionar fitxers de "
+"grans dimensions."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Temps per al gràfic de mitjanes: %d min"
-msgstr[1] "Temps per al gràfic de mitjanes: %d mins"
+msgid "Downloading %s"
+msgstr "S'està baixant %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Escala del gràfic de connexions: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Ja esteu intentant baixar el fitxer '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Retard de l'actualització: %d seg"
-msgstr[1] "Retard de l'actualització: %d segs"
+msgid "You already have the file '%s'"
+msgstr "Ja disposeu del fitxer '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Mida de la memòria intermèdia de fitxer: %d byte"
-msgstr[1] "Mida de la memòria intermèdia de fitxer: %d bytes"
+msgid "You are already trying to download the file %s"
+msgstr "Ja esteu intentant baixar el fitxer %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Mida de la cua de pujada: %d client"
-msgstr[1] "Mida de la cua de pujada: %d clients"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "No s'ha pogut convertir l'enllaç magnet a eD2k: %s+"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Interval de refresc de la connexió amb el servidor: %d minut"
-msgstr[1] "Interval de refresc de la connexió amb el servidor: %d minuts"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Interval de refresc de la connexió amb el servidor: Inhabilitat"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Port UDP per a peticions esteses del servidor (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "inhabilitat"
+msgid "Unknown protocol of link: %s"
+msgstr "Protocol desconegut de l'enllaç: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Executa una ordre per a l'esdeveniment '%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Activa l'execució d'ordres al nucli"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Odre del nucli:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Activa l'execució d'ordres a la interfície gràfica"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Ordre de la GUI:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Les següents variables seran reemplaçades:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Enllaç eD2k invàlid! ERROR: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Intent d'accés no autoritzat. Connexió tancada."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "El client ha enviat un paquet després d'una autenticació fallida."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Connexió externa tancada."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr ""
 "Les connexions externes han estat inhabilitades per manca d'una contrasenya!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Les connexions externes estan inhabilitades al fitxer de configuració"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Nova connexió externa acceptada"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERROR: no s'ha pogut acceptar una nova connexió externa"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "S'ha rebutjat la connexió externa per manca d'una contrasenya a les "
 "preferències!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "S'està connectant al client: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Versió desconeguda"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2364,2276 +1656,1092 @@
 "ID de versió EC incorrecta, pot haver-hi incompatibilitat binaria. Useu un "
 "nucli i un client remot del mateix llançament (versió)."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"No podeu connectar a una versió estable des de una versió SVN arbitrària! és "
-"possible que es produeixin fallades"
+"No podeu connectar a una versió estable des d'una versió CVS arbitrària! "
+"Quedeu advertit de possibles fallades."
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Ha fallat l'autenticació."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Versió del protocol invàlida."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Marcador de la versió del protocol inexistent."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "Ha fallat l'autenticació."
+
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "Ha fallat l'autenticació."
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr "Petició invàlida, primer heu d'autenticar-vos."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Accés concedit."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, fuzzy, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Filtra els missatges dels clients desconeguts"
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Intent d'accés no autoritzat. Connexió tancada."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 "Ha fallat una ordre remota de fitxer de parts: No s'ha trobat el resum del "
 "fitxer: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "No s'ha trobat el resum del fitxer: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "Error en processar el codi d'opció!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "No s'ha afegit el servidor"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "no s'ha trobat el servidor: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "és necessari definir el servidor a esborrar"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k és inhabilitada a les preferències."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Cerca en procés. S'obtindran resultats en un moment!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "La recerca web des de la interfície remota no té sentit."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad està inhabilitada a les preferències."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Cap punt per al gràfic."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "El vostre client no està configurat per a aquest nivell de detall."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Connexió externa: s'ha demanat l'aturada"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Ja s'està aturant."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: afegint l'enllaç '%s'"
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "L'enllaç és invàlid o ja és present a la llista."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "No s'ha trobat el fitxer."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Nom de fitxer invàlid."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "No s'ha pogut canviar el nom del fitxer."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad està inhabilitada a les preferències."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Ja esteu connectat a eD2k."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Connectant a eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Ja esteu connectat a Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "S'està connectant a Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Totes les xarxes estan inhabilitades."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Desconnectat de eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Desconnectat de Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Connexió externa: s'ha rebut un codi d'opció invàlid: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Codi d'opció invàlid (versió de protocol errònia?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"No s'ha pogut obrir el fitxer (%s), s'eliminarà de la llista de fitxers "
-"compartits."
-
-#: src/UploadClient.cpp:718
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "S'ha demanat un conjunt de resums d'un fitxer desconegut: %s"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Extensió '%s' desconeguda per a l'ordre '%s'.\n"
 
-#: src/TerminationProcess.cpp:48
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "El procés '%s' amb pid '%d' ha finalitzat amb el codi d'estat '%d'"
+msgid "Unknown command '%s'.\n"
+msgstr "Ordre '%s' desconeguda.\n"
 
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
-"No s'ha afegit el servidor: No s'ha especificat cap IP o nom de servidor."
+"\n"
+"Aquesta ordre no pot tenir un argument.\n"
 
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
-"No s'ha afegit el servidor: El port del servidor especificat és invàlid."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Estat eD2k:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Connectat"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Port"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Estat Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Funcionant"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Estat:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Desconnectat"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Estat de la connexió:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Rere tallafocs"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Estat rere-tallafocs: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Connectat amb l'amic"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Cap amic"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Mitjana d'usuaris:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Mitjana de fitxers:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Aturat"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Funcionant: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Transferència"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Pujades"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Dades pujades (sessió (total)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Sobrecàrrega total (paquets): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Sobrecàrrega per peticions de fitxers (paquets): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Sobrecàrrega en l'intercanvi de fonts (paquets): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Sobrecàrrega del servidor (paquets): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Sobrecàrrega Kad (paquets): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Excedent per xifrat (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Pujades actius: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Pujades en espera: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Total de sessions de pujada resoltes: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Total de sessions de pujada fallades: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Temps mitjà de pujada: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Baixades"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Dades baixades (sessió (total)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Fonts trobades: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Baixades actives (trossos): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Rati PU:BA de la sessió (total): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Rati de baixada mitjà (Sessió): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Rati de pujada mitjà (Sessió): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Rati de baixada màxim (Sessió): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Rati de pujada màxim (Sessió): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Reconnexions: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Temps des de la primera transferència: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Connectat al servidor des de: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Connexions actives (aprox.): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "S'ha arribat al límit de connexions màxim: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Mitjana de connexions (aprox.): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Pic de connexions (aprox.): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Clients"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrats"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Total: %i Coneguts: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Servidors funcionant: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Servidors que han fallat: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Total: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Servidors esborrats: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Servidors filtrats: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Usuaris en servidors funcionant: %llu"
-
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Fitxers en servidors funcionant: %llu"
-
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Usuaris totals: %llu"
-
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "Fitxers totals: %llu"
+"\n"
+"Aquesta ordre ha de tenir un argument.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Càrrega del servidor: %.2f%%"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Aquesta ordre és incompleta, heu d'usar una de les extensions de sota.\n"
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Fitxers compartits: %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Extensions disponibles:\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Mida total dels fitxers compartits: %s"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Ordres disponibles:\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Average file size: %s"
-msgstr "Mida mitjana de fitxer: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Sistema operatiu"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "No s'ha rebut"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Retalla"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Enganxa"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Selecciona-ho tot"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "No es pot fer una cerca Kad si la xarxa Kad no està engegada"
-
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "No es pot executar una cerca eD2k si la xarxa eD2k no està connectada"
-
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Error inesperat mentre s'intentava fer una cerca Kad: "
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Les majúscules no influeixen a les ordres.\n"
+"Escriviu '%s <ordre>' per a aconseguir informació sobre l' <ordre>.\n"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Missatge filtrat de '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Surt de l'aplicació."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nou missatge de '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Mostra l'ajuda."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
-"L'usuari %s (%u) ha demanat la llista de fitxers compartits -> Acceptada"
+"Per a aconseguir ajuda sobre una ordre, escriviu 'help <ordre>'.\n"
+"Per a veure la llista completa d'ordres escriviu 'help'.\n"
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
-"L'usuari %s (%u) ha demanat la llista de fitxers compartits -> Denegada"
+"\n"
+"Useu '%s' per a la llista d'ordres\n"
+"\n"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"L'usuari %s (%u) ha demanat la llista de directoris compartits -> Acceptada"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Error de sintaxi!"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
-"L'usuari %s (%u) ha demanat la llista de directoris compartits -> Denegada"
+"S'ha produït un error processant una ordre - això no hauria de passar mai! "
+"Informeu de l'error, si us plau\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"L'usuari %s (%u) ha demanat la llista de fitxers compartits del directori %"
-"s  -> Acceptada"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Aquesta ordre no hauria de tenir cap paràmetre."
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"L'usuari %s (%u) ha demanat la llista de fitxers compartits del directori %"
-"s  -> Denegada"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Aquesta ordre ha de tenir un paràmetre."
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "L'usuari %s (%u) comparteix el directori %s"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Argument invàlid."
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "L'usuari %s (%u) ha enviat directoris compartits no demanats."
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Aquesta ordre és incompleta."
 
-#: src/ClientTCPSocket.cpp:1025
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr ""
-"L'usuari %s (%u) ha enviat la llista de fitxers compartits del directori %s"
+msgid "Type '%s' to get more help.\n"
+msgstr "Escriviu '%s' per a aconseguir més ajuda.\n"
 
-#: src/ClientTCPSocket.cpp:1032
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr ""
-"L'usuari %s (%u) ha acabat l'enviament de la llista de fitxers compartits"
+msgid "This is %s %s %s\n"
+msgstr "Això és %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1037
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr ""
-"L'usuari %s (%u) ha enviat una llista de fitxers compartits no desitjada"
+msgid "This is %s %s\n"
+msgstr "Això és %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
-"L'usuari %s (%u) ha denegat l'accés a la llista de fitxers/directoris "
-"compartits"
+"\n"
+"S'està creant el client...\n"
 
-#: src/KadDlg.cpp:132
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Nodes (%u)"
-msgstr "Nodes (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "IP invàlida per a l'arrancada"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Port invàlid per a l'arrancada"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Per favor empleneu tots els camps requerits"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Esteu segur que voleu baixar un nou fitxer nodes.dat?\n"
-
-#: src/KadDlg.cpp:197
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
-msgstr "Fer-ho esborrarà els nodes actuals i reiniciarà la connexió Kademlia."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Voleu continuar?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "ERROR: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "AVÍS: "
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Afegeix un amic"
+"\n"
+"Ok, exiting %s...\n"
+msgstr ""
+"\n"
+"D'acord, eixint %s ...\n"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Heu d'introduir una IP i port vàlids"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
+"No es pot connectar amb una contrasenya buida.\n"
+"Heu d'especificar una contrasenya o bé al fitxer de configuració\n"
+"o a la línia d'ordres, o introduir-ne una quan se vos demani.\n"
+"\n"
+"Eixint...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informació"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Mostra aquest text d'ajuda."
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "El resum d'usuari especificat no és vàlid!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Ordinador on està executant-se l'aMule. (per defecte: localhost)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Fonts"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Port de l'aMule per a connexions externes. (per defecte: 4712)"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Fitxer"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Contrasenya per a les connexions externes."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Baixada"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Llegeix la configuració des del fitxer."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Categoria"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "No mostra res per la sortida estàndard."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Principal"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Detallat - mostra també els missatges de depuració."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Baixa a la categoria"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Estableix la localització del programa (idioma)."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Cerca fitxers relacionats (eD2k, servidor local)"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Escriu al fitxer de configuració les opcions de la línia d'ordres."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Marca com a fitxer conegut"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Crea un fitxer de configuració basat en el de l'aMule."
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Connecta a l'amule remot"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Mostra la versió del programa."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "La connexió ha fallat "
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Detalls del fitxer"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "ERROR"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% fet"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "La connexió ha fallat. Ha estat impossible connectar amb %s:%d\n"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
-"AVÍS: No vos podeu afegir com a font per a un enllaç eD2k mentre teniu ID "
-"Baixa."
+"No s'ha pogut obrir el fitxer amb la llista d'amics 'emfriends.met' per a "
+"lectura!"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Usuaris: E: %s K: %s | Fitxers E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+"No s'ha pogut obrir el fitxer amb la llista d'amics 'emfriends.met' per a "
+"escriptura!"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Tots"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "CRITIC - no hi ha client a l'Inici de Sessió del Xat"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Usuaris Totals: %s | Fitxers Totals: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Amics"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Transferit"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Mostra els &detalls"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Velocitat"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Afegeix un amic"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Progrés"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Elimina l'amic"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Estat"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Envia un &missatge"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Temps Restant"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Veure els compartits"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Últim cop vist complet"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Estableix posició (slot) d'amic"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Última recepció"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Esteu segur que voleu esborrar l'amic seleccionat?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Esteu segur que voleu esborrar el fitxer seleccionat?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Esteu segur que voleu esborrar els amics seleccionats?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Esteu segur que voleu esborrar els fitxers seleccionats?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"No podeu establir més d'una posició d'amic.\n"
+" Només s'ha assignat una posició."
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Selecció múltiple"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Envia un missatge a l'usuari"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Missatge a enviar:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Atura"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pausa"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Continua"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "&Neteja els completats"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Intercanvia cada A4AF a aquest fitxer ara"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Intercanvia cada A4AF a aquest fitxer (Automàtic)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Intercanvia cada A4AF a qualsevol altre fitxer ara"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Opcions avançades"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Previsualitza"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Mostra els &detalls del fitxer"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Mostra els comentaris"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Copia l'enllaç amb format Magnet al porta-retalls"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "Cap categoria"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Assigna a una categoria"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Obre el fitxer"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Elimina'l dels amics"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Afegeix a la llista d'amics"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Envia un missatge"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Intercanvia cap a aquest fitxer"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%d/%m/%y %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "C: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "S'ha preguntat per un altre fitxer"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Baixades (%i)"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Pujades en espera: %s"
 
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Per a evitar que en cada previsualització aparegui aquest avís, configureu\n"
-"un reproductor de vídeo a les preferències (per defecte s'usa mplayer)."
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "Cua"
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Previsualització"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Pujada"
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr ""
-"ERROR: No s'ha pogut executar un reproductor multimèdia extern! Ordre: `%s'"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Ningú"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "ERROR: No s'ha pogut crear el fitxer de parts)"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "No"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "S'està intentant carregar la còpia del fitxer met des de %s"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Sí"
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ERROR: No s'ha pogut obrir el fitxer part.met: %s ==> %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "S'està baixant..."
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ERROR: el fitxer part.met té mida 0: %s ==> %s"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "Descàrrega HTTP cancel·lada"
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ERROR: Versió del fitxer part.met invàlida: %s ==> %s"
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "Carpeta on desar les descàrregues"
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
-"ERROR: %s (%s) és corrupte (compte d'etiquetes erroni), no s'ha pogut "
-"carregar el fitxer."
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "S'està intentant recuperar la informació del fitxer..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/HTTPDownload.cpp:233
+#, c-format
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
-"S'està recuperant un fitxer sense nom - s'intentarà recuperar com a "
-"RecoveredFile.dat"
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
-"S'ha recuperat tota la informació disponible :D - S'està intentant usar-la..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "No s'ha pogut recuperar la informació del fitxer :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "No s'ha pogut obrir %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "AVÍS: %s pot ser corrupte (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "ERROR mentre es desava un fitxer de parts: %s (%s ==> %s)"
 
-#: src/PartFile.cpp:919
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "No s'ha pogut recuperar la mida de '%s' - usant el fitxer %s."
+msgid "Downloaded %d bytes"
+msgstr "S'han baixat %d bytes"
 
-#: src/PartFile.cpp:927
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' és buit - s'està usant el fitxer %s."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "No s'ha pogut desar el fitxer part.met.seeds per a %s"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "%i llavor font desada per al fitxer de parts: %s (%s)"
-msgstr[1] "%i llavors fonts desades per al fitxer de parts: %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "El fitxer de parts %s (%s) no té fitxer de llavors"
-
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "El fitxer de parts %s (%s) té un fitxer de llavors buit"
-
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Error en llegir el fitxer de llavors del fitxer de parts (%s - %s): %s"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Esperats %d bytes, però %d bytes descarregats."
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"S'ha trobat una part corrupta (%d) en el fitxer de parts %d %s - "
-"FileResultHash |%s| FileHash |%s|"
-msgstr[1] ""
-"S'ha trobat una part corrupta (%d) en els fitxers de parts %d %s - "
-"FileResultHash |%s| FileHash |%s|"
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "S'ha trobat una part completa (%i) a %s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "S'ha acabat de refer els resums de %s"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"S'ha produït un error inesperat mentre es completava %s. S'ha pausat el "
-"fitxer."
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "S'ha acabat de baixar: %s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "S'està esborrant el fitxer: %s"
-
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"AVÍS: No ha estat possible fer el resum de la part descarregada - conjunt de "
-"resums incomplet per a '%s'"
-
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
-msgstr ""
-"ERROR: No ha estat possible fer el resum de la part descarregada - conjunt "
-"de resums incomplet (%s). Açò no hauria de passar mai."
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Reconnecta amb el servidor"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
-"AVÍS: No hi ha suficient espai al disc dur! S'està pausant el fitxer: %s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Corrupció a la part baixada %i del fitxer: %s"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: S'ha recuperat la part corrupta %i de %s -> Bytes desats: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Assignant"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Espai en disc insuficient"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Aturat"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Baixat"
 
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ERROR: No s'ha pogut obrir el fitxer part '%s'"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Baixant nou GeoIP.dat de %s"
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "AVÍS: No es pot obrir el fitxer known.met."
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "Baixada del fitxer GeoIP.dat fallida, actualització interrompuda."
+
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
+#, fuzzy, c-format
+msgid "Failed to remove %s file, aborting update."
+msgstr "Fallada a l'esborrar GeoIP.dat, actualització interrompuda."
+
+#: src/IP2Country.cpp:140
+#, fuzzy, c-format
+msgid "Failed to rename %s file, aborting update."
+msgstr ""
+"Fallada al canviar de nom el nou fitxer GeoIP.dat, actualització "
+"interrompuda."
+
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
+#, fuzzy, c-format
+msgid "Successfully updated %s"
+msgstr "Actualització GeoIP.dat correcta."
+
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Error actualitzant GeoIP.dat"
+
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Descarregar GeoIP.dat de %s fallida"
+
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Descarregar GeoIP.dat de %s fallida"
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
-"AVÍS: La llista de fitxers coneguts és corrupta, conté una capçalera "
-"invàlida."
-
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Error d'E/S metre es llegia el fitxer known.met: %s"
-
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Error mentre es desava el fitxer known.met: %s"
-
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "S'ha trobat %i fitxer compartit"
-msgstr[1] "S'han trobat %i fitxers compartits"
-
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "S'ha trobat %i fitxer compartit conegut, %i desconeguts"
-msgstr[1] "S'han trobat %i fitxers compartits coneguts, %i desconeguts"
-
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ERROR: S'ha intentat compartir %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Comentaris del Fitxer"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Valoració"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Comentari"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Sense comentaris"
+"S'està carregant els filtres IP 'ipfilter.dat' i 'ipfilter_static.dat'."
 
-#: src/CommentDialogLst.cpp:104
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u comentari"
-msgstr[1] "%u comentaris"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"No s'ha pogut connectar amb els servidors ofuscats de la llista. Intentant-"
-"ho de nou sense ofuscació."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
-"No s'ha pogut connectar amb cap servidor de la llista. Intentant-ho de nou."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "La xarxa eD2k és inhabilitada a les preferències, no es connectarà."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "No s'han trobat a la llista servidors vàlids als que connectar"
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Connectat a %s (%s:%i)"
+"No s'ha pogut carregar el fitxer ipfilter.dat '%s', s'ha trobat un format "
+"desconegut."
 
-#: src/ServerConnect.cpp:263
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Connexió establerta amb: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
-"Error fatal en intentar connectar. La connexió a Internet pot haver caigut"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "S'ha perdut la connexió a %s (%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) sembla estar mort."
-
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) sembla estar ple."
-
-#: src/ServerConnect.cpp:381
-#, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Es reintentarà la connexió al servidor d'ací %d segon"
-msgstr[1] "Es reintentarà la connexió al servidor d'ací %d segons"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "S'ha perdut la connexió"
-
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "No s'ha pogut connectar a %s (%s:%i)."
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ERROR: Sòcol invàlid en comprovar el temps d'espera"
+"No s'ha pogut carregar el fitxer ipfilter.dat '%s', ha estat impossible "
+"obrir el fitxer."
 
-#: src/ServerConnect.cpp:460
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "L'intent de connexió a %s (%s:%i) ha excedit el temps."
-
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-"ERROR: No s'ha pogut carregar la còpia de seguretat. Cerqueu '.part.met "
-"recovery solutions' a http://forum.amule.org"
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "No s'han trobat fitxers de parts"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "S'ha carregat %u rang IP des de '%s'."
+msgstr[1] "S'han carregat %u rangs IP des de '%s'."
 
-#: src/DownloadQueue.cpp:171
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Trobat %u fitxer de parts"
-msgstr[1] "Trobats %u fitxers de parts"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "S'ha descartat %u línia malformada."
+msgstr[1] "S'han descartat %u línies malformades."
 
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
+#: src/IPFilter.cpp:503
+#, fuzzy, c-format
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
-"El sistema de fitxers del directori Temp no pot gestionar fitxers de grans "
-"dimensions."
+"Fallada al canviar de nom el nou fitxer GeoIP.dat, actualització "
+"interrompuda."
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
-"El sistema de fitxers per al directori Incoming no pot gestionar fitxers de "
-"grans dimensions."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "S'està baixant %s"
 
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Ja esteu intentant baixar el fitxer '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Ja disposeu del fitxer '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Ja esteu intentant baixar el fitxer %s"
-
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "No s'ha pogut convertir l'enllaç magnet a eD2k: %s+"
-
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Protocol desconegut de l'enllaç: %s"
-
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Enllaç eD2k invàlid! ERROR: %s"
-
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Executa <str> i surt."
-
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Format IP invàlid. Useu xxx.xxx.xxx.xxx:xxxx\n"
-
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:86
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Aquesta ordre requereix un argument. Arguments vàlids: 'all', nom del "
-"fitxer, o un número.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "S'està processant per resum: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "S'està processant per nom del fitxer: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr ""
-"Aquesta ordre requereix un argument. Arguments vàlids: un resum de fitxer "
-"(hash).\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Número invàlid\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"No és un resum vàlid (la longitud hauria de ser exactament de 32 caràcters)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "La operació ha finalitzat amb èxit."
+"Inicia des dels \n"
+"clients coneguts"
 
-#: src/TextClient.cpp:637
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Request failed with the following error: %s"
-msgstr "La petició ha fallat amb el següent error: %s"
+msgid "Nodes (%u)"
+msgstr "Nodes (%u)"
 
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "El filtre IP per a clients és: %s.\n"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "IP invàlida per a l'arrancada"
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "Desactivat"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Port invàlid per a l'arrancada"
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "Activat"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Si us plau empleneu tots els camps requerits"
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "El filtre IP per a servidors és: %s.\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Esteu segur que voleu baixar un nou fitxer nodes.dat?\n"
 
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "El nivell actual del filtre IP és %d.\n"
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr "Fer-ho esborrarà els nodes actuals i reiniciarà la connexió Kademlia."
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Límits d'ample de banda: Pujada: %u kB/s, Baixada: %u kB/s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Voleu continuar?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: la paraula clau de cerca és massa curta"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Connectat a %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "amb ID Baixa"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "amb ID Alta"
+msgid "Keyword for search: %s"
+msgstr "Paraula clau de cerca: %s"
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Connectant"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Desconnectat"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: Paraula clau de cerca ja es troba a la llista de cerca: "
 
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
-msgstr ""
-"\n"
-"Baixada:\t%s"
-
-#: src/TextClient.cpp:726
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Upload:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Pujada:\t%s"
 
-#: src/TextClient.cpp:729
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Clients a la cua:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "S'ha llegit %u contacte Kad"
+msgstr[1] "S'han llegit %u contactes Kad"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Fonts totals:\t%d\n"
+"No es troben contactes, si us plau reinicia o baixa un nou fitxer nodes.dat."
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Número de resultats de la cerca: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - mostra el progrés d'una cerca"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Només %d contacte Kad disponible, nodes.dat no es pot escriure"
+msgstr[1] "Només %d contactes Kad disponibles, nodes.dat no es pot escriure"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "S'ha rebut una resposta desconeguda del servidor, codi d'opció = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Mostra la informació d'estat resumida."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr ""
-"Mostra l'estat de la connexió, velocitat de pujada/baixada actuals, etc.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Mostra l'arbre d'estadístiques complet."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "S'ha escrit %d contecte Kad"
+msgstr[1] "S'han escrit %d contactes Kad"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"De manera opcional, es pot passar un número en el rang 0-255 com a argument "
-"d'aquesta\n"
-"ordre, que diu quantes entrades del subarbre de la versió de client "
-"s'haurien de\n"
-"mostrar. Passar 0 o ometre'l es igual a 'il·limitades'.\n"
-"\n"
-"Exemple: 'statistics 5' només mostrarà les 5 versions més usades de cada "
-"tipus de client.\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Nom del fitxer"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Atura l'aMule."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Mida"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Atura el nucli remot en execució (amule/amuled).\n"
-"Açò també aturarà el client de text, ja que no és pot usar sense\n"
-"haver un nucli en execució.\n"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Ràtio"
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Recarrega l'objecte donat."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Transferit"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Recarrega la llista de fitxers compartits."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Peticions"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Recarrega la taula de filtrat IP des del fitxer."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Acceptades"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Connecta a la xarxa."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Fonts completes"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Connectarà amb totes les xarxes que són habilitades a les Preferències.\n"
-"Opcionalment també podeu especificar l'adreça d'un servidor en format IP:"
-"Port, per a \n"
-"connectar només amb aquest servidor. L'IP ha de ser una adreça IPv4 decimal "
-"puntejada,\n"
-"o un nom DNS resoluble."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Connecta només a eD2k."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Connecta només a Kad."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Desconnecta de la xarxa."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Desconnectarà de totes les xarxes que estiguin connectades ara.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Desconnecta només de eD2k."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Desconnecta només de Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Afegeix un enllaç magnet o eD2k al nucli."
+"ALERTA: Llista de fitxers coneguts malmesa, conté una capçalera no vàlida."
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"L'enllaç eD2k a afegir pot ser:\n"
-"*) un enllaç a un fitxer (ed2k://|file|...), s'afegirà a la cua de "
-"baixades,\n"
-"*) un enllaç a un servidor (ed2k://|server|...), s'afegirà a la llista de "
-"servidors,\n"
-"*) o un enllaç a una llista de servidors, en aquest cas tots els servidors "
-"en la llista s'afegiràn\n"
-"   a la llista de servidors.\n"
-"\n"
-"L'enllaç magnet ha de contenir el resum (hash) eD2k i la mida del fitxer.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Defineix un valor de configuració."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Defineix les preferències del filtrat IP."
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Activa el filtre IP per a clients i servidors"
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Atura el filtre IP per a clients i servidors"
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Activa/Desactiva el filtre IP per a clients"
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Activa el filtre IP per a clients"
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Atura el filtre IP per a clients"
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Activa/Desactiva el filtre IP per a servidors"
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Activa el filtre IP per a servidors"
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Atura el filtre IP per a servidors"
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Selecciona el nivell de filtratge IP."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Els nivells de filtratge vàlids són en el rang 0-255, i el valor per "
-"defecte\n"
-"(inicial) és 127.\n"
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Defineix els límits d'ample de banda."
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Versió desconeguda"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "El valor donat ha de ser en kilobytes/seg.\n"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Carpeta on desar les descàrregues"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Defineix el límit d'ample de banda de pujada."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Resumint"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Defineix el límit d'ample de banda de baixada."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Completant"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Obté i mostra un valor de les preferències."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Complet"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Obté les preferències del filtratge IP."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Pausat"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Obtenir l'estat del filtre IP per a clients i servidors"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Erroni"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Obtenir l'estat del filtre IP només per a clients"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Esperant"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Obtenir l'estat del filtre IP només per a servidors"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Heu d'especificar una contrasenya (no buida)."
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Obté el nivell del filtratge IP."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Contrasenya invàlida, no és un resum MD5!"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Obté els límits d'ample de banda."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Fallada en la connexió"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Realitza una cerca."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "La connexió externa ha fallat. Resposta buida."
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
-"S'ha d'especificat un tipus de cerca:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Exemple:'search kad fitxer' executarà una cerca kad per a \"fitxer\".\n"
-
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Realitza una cerca global"
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Realitza una cerca local"
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Realitza una cerca kad"
-
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Mostra els resultats de l'última cerca."
-
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Retorna els resultats de la cerca anterior.\n"
+"Connexió externa: Resposta incorrecta, confirmació de connexió fallida. S'ha "
+"tancat la connexió."
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Mostra el progrés d'una cerca."
-
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Mostra el progrés d'una cerca.\n"
-
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Comença a baixar un fitxer"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Connexió establerta amb l'aMule"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"S'ha de donar el número d'un fitxer de l'última recerca.\n"
-"Exemple: 'download 12' començarà a baixar el fitxer amb el número 12 de la "
-"recerca anterior.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Connexió establerta amb èxit."
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Pausa la baixada."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Connexió externa: Accés denegat perquè: "
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Reprèn la baixada."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Connexió externa: Conformitat de connexió denegada."
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "ListenSocket: Ok."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Cancel·la la baixada."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "ERROR: No s'ha pogut escoltar el port TCP."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Assigna una prioritat de baixada"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "ERROR: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Estableix la prioritat d'una baixada a Baixa, Normal, Alta o Auto.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "AVÍS: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Estableix la prioritat a baixa"
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Tanca"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Estableix la prioritat a normal."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Retalla"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Estableix la prioritat a alta."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Copia"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Estableix la prioritat a auto."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Enganxa"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Mostra les cues/llistes."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Neteja"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Mostra la cua de pujades/baixades, la llista de servidors o la llista de "
-"fitxers compartits.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Selecciona-ho tot"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Mostra la cua de pujades."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Mostra la cua de baixades."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Il·limitat"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Mostrar el registre."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Menú de la icona d'estat"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Mostra la llista de servidors."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Límits de velocitat"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Buida el registre."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "PU: cap"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Ordre obsoleta, useu '%s' en el seu lloc."
+msgid "UL: %u"
+msgstr "PU: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Aquesta és una ordre obsoleta, i pot ser s'elimini en el futur.\n"
-"Useu '%s' en el seu lloc.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "BA: cap"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ERROR: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "BA: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "AVÍS: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Velocitat de baixada: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "La nova ID d'usuari és %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "AVÍS: Heu rebut una ID Baixa!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr ""
-"\tAixò normalment és perquè esteu darrere d'un tallafocs o un encaminador."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tPer a rebre més informació, per favor visiteu http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Velocitat de pujada: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "S'ha rebut una informació desconeguda del servidor! - massa curta"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Informació del client"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "S'han rebut %d servidor nou"
-msgstr[1] "S'han rebut %d servidors nous"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "S'ha desat la llista de servidors."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "El servidor ha rebutjat l'última ordre"
+msgid "Nickname: %s"
+msgstr "Sobrenom: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "S'ha rebut un paquet fals del servidor: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "No heu seleccionat cap sobrenom!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr ""
-"S'ha produït un error sense tractament mentre es processava un paquet del "
-"servidor: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID de client: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "No es pot crear el fil per a resoldre DNSs per a connectar amb %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Desconnectat"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "L'IP del servidor %s (%s) està filtrada.  No es connectarà."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Servidor: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "S'està utilitzant l'ofuscació de protocol"
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP del Servidor: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "S'està connectant a %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Desconnectat"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr ""
-"No es pot resoldre el dns per al servidor %s: Ha estat impossible connectar!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr ""
-"CIP2Country::CIP2Country(): No s'han pogut carregar les dades del país des de"
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "S'ha carregat %d imatge de bandera."
-msgstr[1] "S'han carregat %d imatges de banderes."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Esteu segur que voleu cancel·lar i esborrar tots els fitxer d'aquesta "
-"categoria?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Es Requereix Confirmació"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Tota la resta"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Incomplet"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Actiu"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Vídeos"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Àudio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Arxius"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Imatges de CD"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Imatges"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Documents"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Selecciona un filtre de vista"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Afegeix una categoria"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Edita la categoria"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Elimina la categoria"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Nom del fitxer"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Mida"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Rati"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Transferit"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Peticions"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Acceptades"
+msgid "TCP port: %d"
+msgstr "Port TCP: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Fonts completes"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "Port TCP: No està llest"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "S'està important %s: %s"
+msgid "UDP port: %d"
+msgstr "Port UDP: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "S'està llegint la carpeta temporal"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "Port UDP: No està llest"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr ""
-"S'està recuperant la informació bàsica del fitxer d'informació de baixada"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Signatura en línia: Habilitada"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "S'està creant el fitxer de destí"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Signatura en línia: Inhabilitada"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "S'està carregant les dades del fitxer de baixada antic (%u de %u)"
+msgid "Uptime: %s"
+msgstr "Funcionant: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr ""
-"S'està desant el bloc de dades a un nou fitxer de baixada únic (%u de %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "S'està recuperant informació del fitxer de baixada font"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "S'està afegint la baixada i desant un nou fitxer de parts"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importa fitxers de parts"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Estat"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Resum del fitxer"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Esperant..."
+msgid "Shared files: %d"
+msgstr "Fitxers compartits: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disc: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr "Seleccioneu una carpeta amb baixades temporals! (recursiu)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"Voleu que s'esborrin els fitxers originals de les baixades importades amb "
-"èxit?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Voleu esborrar les fonts?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/seg"
-msgstr[1] "bytes/seg"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "segs"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "mins"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "hores"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Dies"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Vídeos"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Arxius"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Documents"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programes"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Qualsevol"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Sense Valorar"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Invàlid / Corrupte / Fals"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Pobre"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Correcte"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Bo"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Excel·lent"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "tot"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "tota la resta"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr ""
-"S'està carregant els filtres IP 'ipfilter.dat' i 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Clients en cua: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr ""
-"No s'ha pogut carregar el fitxer ipfilter.dat '%s', s'ha trobat un format "
-"desconegut."
+msgid "Total DL: %s"
+msgstr "Total BA: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"No s'ha pogut carregar el fitxer ipfilter.dat '%s', ha estat impossible "
-"obrir el fitxer."
+msgid "Total UL: %s"
+msgstr "Total PU: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "S'ha carregat %u rang IP des de '%s'."
-msgstr[1] "S'han carregat %u rangs IP des de '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Límit de pujada"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "S'ha descartat %u línia malformada."
-msgstr[1] "S'han descartat %u línies malformades."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Límit de baixada"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Connexions actives (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Amaga l'aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Detalls del fitxer"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Mostra l'aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% fet"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Surt"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "Enllaç eD2k: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "D'acord"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
-"Feu clic ací per a afegir l'enllaç eD2k de la capça de text a la cua de "
+"Feu clic per a afegir l'enllaç eD2k del camp de text a la cua de "
 "descàrregues."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr ""
-"Els esdeveniments es mostren ací. Per a veure la llista completa, mireu el "
+"Els esdeveniments es mostren aquí. Per a veure la llista completa, mireu el "
 "registre de la pestanya Servidors."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Carregant..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Número d'usuaris al servidor on esteu connectat ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Usuaris: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4642,6 +2750,10 @@
 "d'usuaris."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "PU: 0.0 | BA: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4650,527 +2762,584 @@
 "parèntesis mostra la sobrecàrrega provinent de les comunicacions amb els "
 "clients."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
 "low ID (firewalled) and green arrows signify that you have high ID (The "
 "optimal connection type)."
 msgstr ""
-"Mostra l'estat de la connexió i les transferències actives. El roig vol dir "
-"que no esteu connectat actualment, el groc que teniu ID baixa (rere "
-"tallafocs) i el verd que teniu ID alta (El tipus de connexió òptim)."
+"Mostra l'estat de la connexió i les transferències actives. El vermell vol "
+"dir que no esteu connectat actualment, el groc que teniu ID baixa (bloquejat "
+"per un tallafocs) i el verd que teniu ID alta (el tipus de connexió òptim)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Desconnectat ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Servidor connectat actualment."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Cerca"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Nom:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tipus"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Resum del fitxer"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Cerca avançada"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtratge"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Tipus de fitxer"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Qualsevol"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Arxius"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Àudio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Imatges de CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Imatges"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programes"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Documents"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Vídeos"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Extensió"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Mida Mín."
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Mida Màx."
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Disponibilitat"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filtre:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Resultat del filtre"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Inverteix el resultat"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Amaga els fitxers coneguts"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Inicia"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Més"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Cerca més resultats a eD2k. No disponible per a Kad encara."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Atura"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Baixada"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Buida els camps"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Resultats"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Neteja les baixades completades"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Mostra les Pujades / Cua"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Clients a la cua:"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Envia"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Envia el missatge especificat."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Tanca"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Fonts completes"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Tanca aquesta sessió de xat."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "General"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Nom Complet:"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/D"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "Fitxer-met:"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Resum:"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Mida:"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Estat de les parts:"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Últim cop vist complet:"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Transferència"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Fonts trobades:"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Fonts transferint:"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Compte de parts:"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Disponibilitat:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Velocitat:"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Temps actiu de baixada: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Transferit:"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Completats:"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Gestió intel·ligent de la Corrupció "
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Perdut per corrupció:"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Guanyat per compressió:"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Paquets recuperats per I.C.H.:"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Noms del fitxer"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Copia"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Neteja"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Aplica"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Comenta o valora el fitxer (visible per a tots els usuaris)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"D'una pel·lícula pots dir la durada, el gènere, l'idioma ...\n"
-"i si és falsa, pots avisar a la resta d'usuaris."
+"Per una pel·lícula es pot definir la seva durada, la seva història, "
+"llenguatge...\\n\\ni si és falsa, es pot informar a altres usuaris d'aMule."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Qualitat del fitxer"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Sense Valorar"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Invàlid / Corrupte / Fals"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Pobre"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Correcte"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Bo"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Excel·lent"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "Seleccioneu una valoració, o aviseu si el fitxer no és correcte ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Refresca"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
-msgstr "S'està baixant, per favor espereu ..."
+msgstr "S'està baixant, si us plau espereu ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Mida desconeguda"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Informació requerida"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "Adreça IP:"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Port:"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Informació addicional"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Usuari:"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Resum de l'usuari:"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Recarrega els compartits"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Sessió actual"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Total"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Demanat:"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Pujades actives:"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Afegeix"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Velocitat de baixada"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Actual"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Mitjana total"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Mitjana de la sessió"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Velocitat de pujada"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Connexions"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Baixades actives"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Connexions actives (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Pujades actives"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Arbre d'estadístiques"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Resum de l'usuari:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Programari:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Versió:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "Adreça IP:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID de l'usuari:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP del servidor:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Nom del servidor:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Ofuscació:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Transferències amb el client"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Petició actual:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Mitjana de pujada:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Mitjana de baixada:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Pujat (sessió):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Baixat (sessió):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Pujat (total):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Baixat (total):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Puntuacions"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Modificador PU/BA:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Identificació segura:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Puntuació (total):"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "En cua"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Puntuació (a la cua):"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Sobrenom"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - la Mula de Linux"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - el Mule multi-plataforma"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 "Aquest és el (vostre) nom que els altres usuaris veuran en connectar-se."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Idioma"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Idioma:"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "El retard abans de mostrar els consells (notes emergents)."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Açò especifica la llengua que s'usarà."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Miscel·lània"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Comprova si hi ha noves versions a l'inici"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr "L'aMule comprovarà si hi ha noves versions durant l'inici"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Inicia minimitzat"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "L'aMule es minimitzarà automàticament a l'inici."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Confirmació per a eixir"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "L'aMule demanarà confirmació abans de sortir."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "Sol·licita confirmació al sortir."
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Habilita la icona d'estat"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Habilita/Inhabilita la icona d'estat a la safata del sistema."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Minimitzar a la safata de sistema"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5178,289 +3347,217 @@
 "L'aMule es minimitzarà a la safata de sistema (icona), enlloc de a la barra "
 "de tasques (llista de programes)."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Temps de retard dels consells en segons"
-
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "El retard abans de mostrar els consells (notes emergents)."
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Temps de retard de l'indicador de funció:"
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "segons"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Selecció del navegador"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Valor per defecte del sistema"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Seleccioneu el navegador ací"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Navegador personalitzat:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Poseu ací el nom del navegador. Per a usar un navegador personalitzar, "
-"seleccioneu Personalitzat al menú de sota."
+"Introdueix el nom del teu navegador. Deixa el camp buit per usar el "
+"navegador per defecte del sistema."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Explora"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Obre en una nova pestanya si és possible"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Obre la pàgina web en una nova pestanya en comptes de obrir una nova "
 "finestra si és possible"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Reproductor de vídeo"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Crea una còpia per a fer la previsualització"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Límits d'ample de banda"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Pujada"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Per posició (slot)"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Port TCP del client estàndard:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Ports"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Port TCP per defecte"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Aquest és el port eD2k estàndard i no es pot inhabilitar."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Port UDP del client estès:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "Port UDP per sol·licituds del servidor (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr "Aquest port UDP s'usa per a peticions ed2k esteses i la xarxa Kad"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Port UDP extès (Kad / cerca global)"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "inhabilita"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr "Aquest port UDP és utilitzat per sol·licituds eD2k i Kad exteses"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Adreça d'escolta"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Port UDP per a peticions esteses del servidor (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Màx. fonts per fitxer"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Activa UPnP per redirecció de ports"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Límit dur"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnP Port TCP (Opcional):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Límit de connexions"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Màx. connexions"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Vincula l'adreça local a l'IP (buit per qualsevol): "
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Només usuaris avançats: Si disposeu de multiples interfícies de xarxa, "
+"entreu l'adreça de la interfície a la que l'aMule hauria d'estar vinculada."
+
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Nombre màxim de fonts per descàrrega:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Nombre màxim de connexions simultànies:"
+
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Activa UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Port TCP UPnP:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Autoconnecta a l'inici"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Reconnecta en perdre la connexió"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Mostra la sobrecàrrega d'ample"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Opcions del servidor"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Elimina els servidors morts després de"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "intents"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Actualitza automàticament la llista de servidors a l'inici"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Llista"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Actualitza la llista de servidors quan es connecti amb un servidor"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Actualitza la llista de servidors quan es connecta un client"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Usa el sistema de prioritats"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Usa la comprovació intel·ligent d'ID Baixa en connectar"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Connexió segura"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Autoconnecta només a servidors de la llista estàtica"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Estableix prioritat Alta per als servidors afegits manualment"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. actiu"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "L'AICH es refia de cada resum (no recomanat)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Gestió d'Errors Inteligent (I.C.H.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Activa"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "I.C.H. avançat confia en totes les comprovacions (no recomanat)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Afegeix les noves baixades en mode pausat"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Afegeix les noves baixades amb prioritat automàtica"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Intenta baixar abans les parts inicials i finals"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Afegeix els nous fitxer compartits amb prioritat automàtica"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Intenta transferir parts completes a totes les pujades"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Comença el següent fitxer pausat quan es completi un fitxer"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Inicia el següent fitxer pausat quan s'acabi una descàrrega"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "De la mateixa categoria"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Recorda 10 fonts dels fitxers rars (amb < 20 fonts)"
-
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Espai de disc"
-
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Comprova l'espai de disc"
-
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Seleccioneu-ho si voleu que l'aMule comprovi l'espai del disc"
-
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Espai mín. al disc:"
-
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
-msgstr "Poseu ací l'espai mínim desitjat."
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2077
+#: src/muuli_wdr.cpp:1811
 msgid "Preallocate disk space for new files"
 msgstr "Preassigna l'espai al disc per als fitxers nous"
 
-#: src/muuli_wdr.cpp:2078
+#: src/muuli_wdr.cpp:1812
 msgid ""
 "For new files preallocates disk space for the whole file, thus reduces "
 "fragmentation"
@@ -5468,468 +3565,485 @@
 "Per a fitxers nous reserva l'espai que ocuparà el fitxer complet. Açò "
 "redueix la fragmentació"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Entrada"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Temporal"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Compartit"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Atura les descàrregues quan l'espai buit al disc arribi a "
+
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Seleccioneu-ho si voleu que l'aMule comprovi l'espai del disc"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
+msgstr "Poseu l'espai mínim de disc desitjat."
+
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Recorda 10 fonts dels fitxers rars (amb < 20 fonts)"
+
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Pujades"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Afegeix els nous fitxer compartits amb prioritat automàtica"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Carpeta on desar les descàrregues"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Carpeta on desar les descàrregues temporals"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Carpetes compartides"
+
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Per a compartir recursivament feu clic dret sobre el directori)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Comparteix els fitxers ocults"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Gràfics"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Actualitza cada: 5 segs"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Temps per al gràfic de mitjana: 100 mins"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Escala del Gràfic de Connexions: 100 "
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Selecciona els colors de les estadístiques"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Escala del gràfic de descàrrega: "
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Escala del gràfic de pujada: "
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Colors: "
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Fons"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Graella"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Baixada actual"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Mitjana de baixada total"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Mitjana de baixada de la sessió"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Pujada actual"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Mitjana de pujada total"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Mitjana de pujada de la sessió"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Connexions actives"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Barra de velocitat de la icona d'estat"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Nodes-Kad actuals"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Nodes-Kad funcionant"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Nodes-Kad de la sessió"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Selecciona"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Arbre"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Nombre de versions de client a mostrar (0=il·limitat)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Capacitat de la línia"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Nota: Aquests valors només s'usen per a les estadístiques."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! AVÍS !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"No canvieu aquests paràmetres si no sabeu\n"
-"el que esteu fent, d'altra manera podeu\n"
-"fer que tot funcioni pitjor.\n"
-"\n"
-"L'aMule anirà bé sense canviar cap\n"
-"d'aquests paràmetres."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Configuració avançada"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Connexions noves màx. / 5 segs"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Mida del buffer de fitxer: 240000 bytes"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Mida de la cua de pujades: 5000 clients"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Interval de refresc de la connexió amb el servidor: Inhabilitat"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Progrés dels fitxers de la cua de baixades"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Mostra el percentatge"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Mostra la barra de progrés"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Aspecte de la barra de progrés"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Plana"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Arrodonida"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Aparença a usar:"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Suport d'aparences"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Habilitar el suport d'aparences"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Tema:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- no hi han temes disponibles - "
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Mostra \"Gestor ràpid de links eD2k\" en totes les finestres."
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Ordre de les columnes"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
+msgstr "Mostra informació estesa a les pestanyes de les categories"
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Ordena automàticament els fitxers de la cua de baixades (més CPU)"
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Mostra les velocitats de transferència al títol"
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "L'aMule ordenarà automàticament les columnes de la llista de baixades"
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Mostra les velocitats de transferència al títol"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Miscel·lània"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Mostra el gestor ràpid d'enllaços eD2k"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Abans del nom de l'aplicació"
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
-msgstr "Mostra informació estesa a les pestanyes de les categories"
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Després del nom de l'aplicació"
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "Mostra els ratis de transferència al títol"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Mostra ample de banda sobrecarregat"
 
-#: src/muuli_wdr.cpp:2412
+#: src/muuli_wdr.cpp:2124
 msgid "Vertical toolbar orientation"
 msgstr "Orientació vertical de la barra d'eines"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Mostra el número del fitxer part abans del nom del fitxer"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Paràmetres del servidor web"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Cua de descàrregues"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Executa l'amuleweb a l'inici"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Port del servidor web"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Activa l'encaminament UPnP al port del servidor web"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Port TCP UPnP del servidor web"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Mostra el percentatge de descàrrega"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Temps de refresc de la pàgina (en segons)"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Mostra barra de descàrrega"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Habilita la compressió Gzip"
-
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Habilita l'usuari convidat"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Plana"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Contrasenya de l'administrador"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Arrodonida"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Contrasenya del convidat"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Auto ordena els fitxers (Alta CPU)"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Plantilla web"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "L'aMule ordenarà automàticament les columnes de la llista de baixades"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Paràmetres de la connexió externa"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Accepta connexions externes"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"IP de la interfície que escolta\n"
-"(buit per a qualsevol)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP de la interfície que rep connexions:"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
 msgstr ""
-"Introduïu ací una IP vàlida amb format a.b.c.d per a la interfície EC que "
+"Introduïu una IP vàlida amb format a.b.c.d per a la interfície EC que "
 "escolta. Un camp buit o 0.0.0.0 significarà qualsevol interfície."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Port TCP"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "Port TCP:"
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Activa l'encaminament UPnP al port de connexions externes"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Contrasenya"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Paràmetres del servidor web"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Executa el servidor web a l'inici"
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Plantilla web"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Contrasenya de l'administrador"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Habilita l'usuari convidat"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Contrasenya del convidat"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Activa redirecció de ports UPnP en el port del servidor web"
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Port TCP del servidor web (Opcional) "
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Temps de refresc de la pàgina (en segons)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Habilita la compressió Gzip"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
-msgstr "Feu clic ací per a aplicar qualsevol canvi fet a les preferències."
+msgstr "Feu clic per a aplicar qualsevol canvi fet a les preferències."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Reinicia qualsevol canvi fet a les preferències."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Títol:"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Comentari:"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Dir. d'entrada:"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Canvia la prioritat per als nous fitxers assignats:"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "No canviïs"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Seleccioneu un color per a la Categoria (actualment seleccionat):"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Visualitza el \"missatge del dia\" del servidor en connectar ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Informació del servidor"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Reinicia"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
-msgstr "Feu clic ací per a reiniciar el registre."
-
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Registre de l'aMule"
+msgstr "Feu clic per a reiniciar el registre."
 
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 "Feu clic en aquest botó per a actualitzar la llista de servidors des d'una "
-"adreça ... "
+"URL ... "
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Llista de servidors"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
 msgstr ""
-"Introduïu ací l'adreça d'un fitxer server.met i premeu el botó de l'esquerra "
-"per a actualitzar la llista de servidors coneguts."
+"Introduïu l'adreça d'un fitxer server.met i premeu el botó de l'esquerra per "
+"a actualitzar la llista de servidors coneguts."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Afegeix un servidor manualment: Nom"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
-msgstr "Introduïu ací el nom del nou servidor"
+msgstr "Introduïu el nom del nou servidor"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Port"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
-msgstr "Introduïu ací la IP del servidor, fent servir el format x.x.x.x."
+msgstr "Introduïu la IP del servidor, fent servir el format x.x.x.x."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
-msgstr "Introduïu ací el port del servidor."
+msgstr "Introduïu el port del servidor."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 "Afegeix un servidor manualment (abans omple els camps de l'esquerra) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Registre de l'aMule"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Informació del servidor"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "Info. ED2K"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Info. Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 "Feu clic en aquest botó per a actualitzar la llista de nodes des d'una "
-"adreça ..."
+"URL ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nodes (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
 msgstr ""
-"Introduïu ací l'adreça d'un fitxer nodes.dat i premeu el botó de l'esquerra "
-"per a actualitzar la llista de nodes coneguts."
+"Introduïu la URL d'un fitxer nodes.dat i premeu el botó de l'esquerra per a "
+"actualitzar la llista de nodes coneguts."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Estadístiques de nodes"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Arrancada"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Nou node"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Port:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+#, fuzzy
+msgid "Bootstrap from known clients"
 msgstr ""
 "Inicia des dels \n"
 "clients coneguts"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Desconnecta Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "Info eD2k"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Usa la Identificació Segura d'Usuari"
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Es recomana activar aquesta opció. No rebreu crèdits (punts) si la "
+"Identificació Segura d'Usuari no és habilitada."
+
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Ofuscació de protocol"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Suport per a l'ofuscació de protocol"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5937,11 +4051,11 @@
 "Habilita l'ofuscació de protocol, i permet a l'aMule acceptar connexions "
 "ofuscades d'altres clients."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Usa l'ofuscació per a les connexions sortints"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5949,11 +4063,11 @@
 "L'aMule usarà l'ofuscació de protocol en connectar amb altres clients/"
 "servidors"
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Accepta únicament les connexions ofuscades"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5961,86 +4075,82 @@
 "L'aMule només acceptarà les connexions ofuscades. Tindreu menys fonts, però "
 "tot el tràfic serà ofuscat"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Opcions de fitxer"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Tothom"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Ningú"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Qui pot veure els fitxers compartits:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Qui pot veure els meus fitxers compartits:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Selecciona qui pot veure la llista de fitxers compartits."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Filtratge IP"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtra els clients"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Habilita el filtratge de les IP de clients especificades al fitxer ~/.aMule/"
 "ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtra els servidors"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Habilita el filtratge de les IP de servidors especificades al fitxer ~/."
 "aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Recarrega la llista"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 "Recarrega la llista d'IPs a filtrar des del fitxer ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "Adreça:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Actualitza ara"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Actualitza automàticament a l'inici"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Nivell de filtratge:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Filtra sempre les IP LAN"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Gestió paranoica de les IP no corresponents"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6048,11 +4158,11 @@
 "Rebutja el paquet si l'IP del client és diferent de l'IP on es rep el "
 "paquet. Useu amb prudència."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Usa l'ipfilter.dat del sistema si està disponible"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -6060,23 +4170,11 @@
 "Si no es troba l'ipfilter.dat local, permet l'ús del fitxer ipfilter del "
 "sistema."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Usa la Identificació Segura d'Usuari"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Es recomana activar aquesta opció. No rebreu crèdits (punts) si la "
-"Identificació Segura d'Usuari no és habilitada."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Habilita la signatura en línia"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6084,878 +4182,1348 @@
 "Habilita l'escriptura del fitxer de signatura, que altres aplicacions "
 "externes poden usar per a crear signatures i similars."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Freqüència d'actualització (segs):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 "Canvia la freqüència d'actualització (en segons) de la signatura en línia."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Directori de la signatura en línia:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Desa el fitxer de signatura en línia a: "
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
-"Feu clic ací per a seleccionar el directori que conté els fitxers de "
-"signatura en línia."
+"Feu clic per a seleccionar el directori que conté els fitxers de signatura "
+"en línia."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Inhabilita/Habilita"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtra els missatges entrants (excepte el xat actual):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Opcions de filtratge:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtra tots els missatges"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtra els missatges de la gent que no és a la llista d'amics"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtra els missatges dels clients desconeguts"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtra els missatges que continguin (useu ',' per a separar):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "Els missatges que continguin aquestes paraules seran filtrats i bloquejats "
 "per l'aMule"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Mostra els missatges rebuts en el registre"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Comentaris"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtra els comentaris que continguin (useu ',' per a separar):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Connexió automàtica al servidor sense servidor intermediari"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Habilita l'autenticació"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Habilita/inhabilita l'autenticació amb usuari/contrasenya"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Nom d'usuari:"
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "El nom d'usuari per a connectar al servidor intermediari"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Contrasenya:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "La contrasenya per a connectar al servidor intermediari"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Habilita el servidor intermediari"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Habilita/inhabilita el suport per a servidor intermediari"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Tipus de servidor:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "El tipus de servidor intermediari al que connecteu"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Servidor intermediari:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "El nom del servidor intermediari"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Port del servidor:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "El port del servidor intermediari"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Autenticació"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Habilita l'autenticació"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Habilita/inhabilita l'autenticació amb usuari/contrasenya"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "El nom d'usuari per a connectar al servidor intermediari"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Contrasenya:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "La contrasenya per a connectar al servidor intermediari"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Connexió automàtica al servidor sense servidor intermediari"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Connecta a:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Entra a l'aMule remot"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Nom d'usuari"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Recorda la configuració"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Habilita la depuració-registre detallats."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Categories de missatge:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Esperant..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Afegeix"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Reintenta"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Esborra"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "Tipus d'esdeveniments"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Pujades actives:"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Oculta els fitxers compartits"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Selecciona un filtre de vista"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Pujades actives"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Mostra els clients"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Recarrega la llista"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Recarrega els compartits"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Envia"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Envia el missatge especificat."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Tanca aquesta sessió de xat."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Connecta amb qualsevol servidor i/o Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Finestra de les Xarxes"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Compartits"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Finestra de cerques"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Inhabilitat [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Finestra de transferència de fitxers"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Finestra de fitxers compartits"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Finestra de Missatges"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Finestra del gràfic d'estadístiques"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Finestra de la configuració de preferències"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nova categoria"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Carpeta per als fitxers entrants"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Heu d'especificar un nom per a la categoria!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/seg"
+msgstr[1] "bytes/seg"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Heu d'especificar un directori per a la categoria!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"No s'ha pogut crear el carpeta d'entrada per a la categoria. Per favor, "
-"especifiqueu un directori vàlid!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "segs"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "mins"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "hores"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Dies"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "tot"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "tota la resta"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Incomplet"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Aturat"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Vídeos"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Arxius"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Documents"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Actiu"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Extensió '%s' desconeguda per a l'ordre '%s'.\n"
+msgid "Using config dir: %s"
+msgstr ""
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Esperant que el fil de conversió de fitxers de parts acabi..."
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Ordre '%s' desconeguda.\n"
+msgid "Importing %s: %s"
+msgstr "S'està important %s: %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "S'està llegint la carpeta temporal"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
 msgstr ""
-"\n"
-"Aquesta ordre no pot tenir un argument.\n"
+"S'està recuperant la informació bàsica del fitxer d'informació de baixada"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "S'està creant el fitxer de destí"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "S'està carregant les dades del fitxer de baixada antic (%u de %u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
-"\n"
-"Aquesta ordre ha de tenir un argument.\n"
+"S'està desant el bloc de dades a un nou fitxer de baixada únic (%u de %u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "S'està recuperant informació del fitxer de baixada font"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "S'està afegint la baixada i desant un nou fitxer de parts"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Importa fitxers de parts"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Estat"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Resum del fitxer"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Disc: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
-msgstr ""
-"\n"
-"Aquesta ordre és incompleta, heu d'usar una de les extensions de sota.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
+msgstr "Seleccioneu una carpeta amb baixades temporals! (recursiu)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Extensions disponibles:\n"
+"Voleu que s'esborrin els fitxers originals de les baixades importades amb "
+"èxit?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Ordres disponibles:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Voleu esborrar les fonts?"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "ERROR: No s'ha pogut crear el fitxer de parts)"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Les majúscules no influeixen a les ordres.\n"
-"Escriviu '%s <ordre>' per a aconseguir informació sobre l' <ordre>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "S'està intentant carregar la còpia del fitxer met des de %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Surt de l'aplicació."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "ERROR: No s'ha pogut obrir el fitxer part.met: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Mostra l'ajuda."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "ERROR: el fitxer part.met té mida 0: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "ERROR: Versió del fitxer part.met invàlida: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Per a aconseguir ajuda sobre una ordre, escriviu 'help <ordre>'.\n"
-"Per a veure la llista completa d'ordres escriviu 'help'.\n"
+"Error: %s (%s) és corrupte (etiqueta de compte incorrecta), no s'ha pogut "
+"carregar el fitxer."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Useu '%s' per a la llista d'ordres\n"
-"\n"
+"ERROR: %s (%s) és corrupte (compte d'etiquetes erroni), no s'ha pogut "
+"carregar el fitxer."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Error de sintaxi!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "S'està intentant recuperar la informació del fitxer..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"S'ha produït un error processant una ordre - açò no hauria de passar mai! "
-"Informeu de l'error, per favor\n"
+"S'està recuperant un fitxer sense nom - s'intentarà recuperar com a "
+"RecoveredFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Aquesta ordre no hauria de tenir cap paràmetre."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+"S'ha recuperat tota la informació disponible :D - S'està intentant usar-la..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Aquesta ordre ha de tenir un paràmetre."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "No s'ha pogut recuperar la informació del fitxer :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Argument invàlid."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "No s'ha pogut obrir %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Aquesta ordre és incompleta."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "AVÍS: %s pot ser corrupte (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Escriviu '%s' per a aconseguir més ajuda.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "ERROR mentre es desava un fitxer de parts: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "ERROR E/S mentre es desava un fitxer de parts: "
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "%s·%s·%s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "No s'ha pogut recuperar la mida de '%s' - usant el fitxer %s."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "%s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' és buit - s'està usant el fitxer %s."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "No s'ha pogut desar el fitxer part.met.seeds per a %s"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "%i llavor font desada per al fitxer de parts: %s (%s)"
+msgstr[1] "%i llavors fonts desades per al fitxer de parts: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "El fitxer de parts %s (%s) no té fitxer de llavors"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "El fitxer de parts %s (%s) té un fitxer de llavors buit"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Error en llegir el fitxer de llavors del fitxer de parts (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"S'ha trobat una part corrupta (%d) en el fitxer de parts %d %s - "
+"FileResultHash |%s| FileHash |%s|"
+msgstr[1] ""
+"S'ha trobat una part corrupta (%d) en els fitxers de parts %d %s - "
+"FileResultHash |%s| FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "S'ha trobat una part completa (%i) a %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "S'ha acabat de refer els resums de %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
-"\n"
-"S'està creant el client...\n"
+"S'ha produït un error inesperat mentre es completava %s. S'ha pausat el "
+"fitxer."
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "S'ha acabat de baixar: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "S'està esborrant el fitxer: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr ""
+"AVÍS: No ha estat possible fer el resum de la part descarregada - conjunt de "
+"resums incomplet per a '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"D'acord, eixint %s ...\n"
+"ERROR: No ha estat possible fer el resum de la part descarregada - conjunt "
+"de resums incomplet (%s). Açò no hauria de passar mai."
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"No es pot connectar amb una contrasenya buida.\n"
-"Heu d'especificar una contrasenya o bé al fitxer de configuració\n"
-"o a la línia d'ordres, o introduir-ne una quan se vos demani.\n"
-"\n"
-"Eixint...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Mostra aquest text d'ajuda."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr ""
+"AVÍS: No hi ha suficient espai al disc dur! S'està pausant el fitxer: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Ordinador on està executant-se l'aMule. (per defecte: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Corrupció a la part baixada %i del fitxer: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Port de l'aMule per a connexions externes. (per defecte: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: S'ha recuperat la part corrupta %i de %s -> Bytes desats: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Contrasenya per a les connexions externes."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Assignant"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Llegeix la configuració des del fitxer."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Espai en disc insuficient"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "No mostra res per la sortida estàndard."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Baixat"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Detallat - mostra també els missatges de depuració."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "ERROR: No s'ha pogut obrir el fitxer part '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Estableix la localització del programa (idioma)."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Predeterminat"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Escriu al fitxer de configuració les opcions de la línia d'ordres."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albanès"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Crea un fitxer de configuració basat en el de l'aMule."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Àrab"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Mostra la versió del programa."
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturià"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "El fitxer de crèdits ha estat carregat, %u és un client conegut"
-msgstr[1] "El fitxer de crèdits ha estat carregat, %u són clients coneguts"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Basc"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Han vençut els crèdits de %u client!"
-msgstr[1] " - Han vençut els crèdits de %u clients!"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Búlgar"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "No s'ha trobat el fitxer 'cryptkey.dat', creant-lo."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Català; Valencià"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"ERROR: no es pot usar el dimoni aMule quan les connexions externes estan "
-"inhabilitades. Per a activar les connexions externes, feu servir l'aMule "
-"normal, inicieu l'amuled amb la opció --ec-config o establiu el paràmetre "
-"\"AcceptExternalConnections\" a 1 al fitxer '~/.aMule/amule.conf'"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Xinès (Simplificat)"
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "ERROR: %s"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Xinès (Tradicional)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Admet de nou"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Mostra les pujades"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Mostra la cua"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Croat"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Mostra els clients"
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Txec"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Selecciona la vista"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Programari"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Temps esperat"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Temps pujant"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Pujat/Baixat"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Danès"
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Estat remot"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Holandès"
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "C: %u"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Anglès (R.U.)"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Prioritat"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estonià"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Puntuació"
-
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Demanat"
-
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Últim cop vist"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finès"
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "En cua"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Francès"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Estat local"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Gallec"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Pujat"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Alemany"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Estat remot"
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Grec"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Baixat"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebreu"
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Resum de l'usuari"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Xifrat"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Hongarès"
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Oculta els fitxers compartits"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italià"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Detalls del client"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italià (Suïssa)"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Habilitada"
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japonès"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Suportada"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Coreà"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "No suportada"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lituà"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Inhabilitada"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Noruec"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polonès"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Sense completar"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portuguès"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Dolent"
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portuguès (Brasil)"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Verificat - OK"
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Rus"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Eslovè"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Espanyol; Castellà"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Suec"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turc"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ucranià"
+
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Idioma"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
+
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
 msgstr "No disponible"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (C: %u)"
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "No hi ha opcions disponibles"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Categoria invàlida trobada, omitint"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
-"La mida mínima ha de ser menor que la màxima. S'ignorarà la mida màxima."
+"El port TCP no pot ser més gran que 65532 puix el sòcol UDP del servidor és "
+"TCP+3"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Avís de cerca"
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
+msgstr "S'usarà el port per defecte (%d)"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Il·limitat"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Ignorant carpeta compartida inexistent: %s"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Menú de la icona d'estat"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Connexió"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Límits de velocitat"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Directoris"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "PU: cap"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Servidors"
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "PU: %u"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Fitxers"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "BA: cap"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Seguretat"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "BA: %u"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Interfície "
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Servidor intermediari"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Filtres "
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Control remot"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Signatura en línia"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Avançat "
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Esdeveniments"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Depuració"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"No canvieu aquests paràmetres si no sabeu\n"
+"el que esteu fent, d'altra manera podeu\n"
+"fer que tot funcioni pitjor.\n"
+"\n"
+"L'aMule anirà bé sense canviar cap\n"
+"d'aquests paràmetres."
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Velocitat de baixada: %.1f"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Connexió fallida entre Cfg i el giny amb ID %d i clau %s"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Velocitat de pujada: %.1f"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr "Fallida en l'enviament de dades de Cfg al giny amb ID %d i clau %s"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Informació del client"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "El tipus de servidor intermediari al que connecteu"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:534
 #, c-format
-msgid "Nickname: %s"
-msgstr "Sobrenom: %s"
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr "Fallida en l'enviament de dades del giny al Cfg amb ID %d i clau %s"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "No heu seleccionat cap sobrenom!"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"S'ha de reiniciar l'aMule per a habilitar aquests canvis:\n"
+"\n"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID de client: "
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- El port TCP ha canviat.\n"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Servidor: "
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- El port UDP ha canviat.\n"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP del Servidor: "
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Connexió externa tancada."
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Nova connexió externa acceptada"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Connexió externa tancada."
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"La llista d'actualització de servidors és buida.\n"
+"L'actualització de servidors a l'inici serà desactivada."
+
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Heu habilitat les connexions externes però no heu especificat una "
+"contrasenya.\n"
+"Les connexions externes no poden ser habilitades a menys que s'hagi "
+"especificat una contrasenya externa vàlida."
+
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- L'idioma ha canviat.\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- El directori temporal ha canviat.\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- Xarxa ED2K habilitada.\n"
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Les xarxes eD2k i Kad estan inhabilitades.\n"
+"No podreu connectar fins que n'habiliteu almenys una."
+
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"La xarxa Kad no s'engegarà si el port UDP està inhabilitat.\n"
+"Habiliteu el port UDP o inhabiliteu la xarxa Kad."
+
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"HEU de reiniciar l'aMule ara mateix.\n"
+"Si no reinicieu ara, no vos queixeu dels possibles problemes.\n"
+
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"La llista d'actualització automàtica de servidors és buida.\n"
+"Si us plau, ompliu-la amb una URL que apunti a un fitxer server.met vàlid.\n"
+"Feu clic sobre el botó \"Llista\" d'aquest quadre de verificació per afegir "
+"una adreça."
+
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Fitxers temporals"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Fitxers entrants"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Signatures en línia"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "TCP port: %d"
-msgstr "Port TCP: %d"
+msgid "Choose a folder for %s"
+msgstr "Carpeta per a %s"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "Port TCP: No està llest"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Explora per a trobar un reproductor de vídeo"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Selecciona navegador"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "UDP port: %d"
-msgstr "Port UDP: %d"
+msgid "Executable%s"
+msgstr "Executable%s"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "Port UDP: No està llest"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Edita la llista de servidors"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Signatura en línia: Habilitada"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Afegiu adreces URL d'on baixar el fitxer server.met.\n"
+"Només una adreça a cada línia."
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Signatura en línia: Inhabilitada"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Retard de l'actualització: %d seg"
+msgstr[1] "Retard de l'actualització: %d segs"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "Shared files: %d"
-msgstr "Fitxers compartits: %d"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Temps per al gràfic de mitjanes: %d min"
+msgstr[1] "Temps per al gràfic de mitjanes: %d mins"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/PrefsUnifiedDlg.cpp:1127
 #, c-format
-msgid "Queued clients: %d"
-msgstr "Clients en cua: %d"
+msgid "Connections Graph Scale: %d"
+msgstr "Escala del gràfic de connexions: %d"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "Total DL: %s"
-msgstr "Total BA: %s"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Mida de la memòria intermèdia de fitxer: %d byte"
+msgstr[1] "Mida de la memòria intermèdia de fitxer: %d bytes"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Total UL: %s"
-msgstr "Total PU: %s"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Mida de la cua de pujada: %d client"
+msgstr[1] "Mida de la cua de pujada: %d clients"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Límit de pujada"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Interval de refresc de la connexió amb el servidor: %d minut"
+msgstr[1] "Interval de refresc de la connexió amb el servidor: %d minuts"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Límit de baixada"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Interval de refresc de la connexió amb el servidor: Inhabilitat"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Amaga l'aMule"
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "inhabilitat"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Mostra l'aMule"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "Executa una ordre per a l'esdeveniment '%s'"
 
-#: src/ChatSelector.cpp:127
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Activa l'execució d'ordres al nucli"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Odre del nucli:"
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Activa l'execució d'ordres a la interfície gràfica"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Ordre de la GUI:"
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Les següents variables seran reemplaçades:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+"La mida mínima ha de ser menor que la màxima. S'ignorarà la mida màxima."
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Avís de cerca"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Principal"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "No es pot fer una cerca Kad si la xarxa Kad no està engegada"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "No es pot executar una cerca eD2k si la xarxa eD2k no està connectada"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Error inesperat mentre s'intentava fer una cerca Kad: "
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "Resum del fitxer"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Fitxer"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Baixa a la categoria"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Afegeix URL opcionals per al fitxer"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Cerca fitxers relacionats (eD2k, servidor local)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Marca com a fitxer conegut"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Copia l'enllaç eD2k al porta-retalls"
+
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Cancel·lat"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Nou"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"No s'ha pogut connectar amb els servidors ofuscats de la llista. Intentant-"
+"ho de nou sense ofuscació."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"No s'ha pogut connectar amb cap servidor de la llista. Intentant-ho de nou."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "La xarxa eD2k és inhabilitada a les preferències, no es connectarà."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "No s'han trobat a la llista servidors vàlids als que connectar"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "S'ha iniciat una sessió de xat: %s (%s:%u) - %s %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Connectat a %s (%s:%i)"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Connectat amb el client ***"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Connexió establerta amb: %s"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** S'està connectant amb el client ***"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Error fatal en intentar connectar. La connexió a Internet pot haver caigut"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** No s'ha pogut connectar amb el client / Connexió perduda ***"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "S'ha perdut la connexió a %s (%s:%i)"
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Tanca la pestanya"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) sembla estar aturat."
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Tanca totes les pestanyes"
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) sembla estar ple."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Tanca les altres pestanyes"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Es reintentarà la connexió al servidor en %d segon"
+msgstr[1] "Es reintentarà la connexió al servidor en %d segons"
 
-#: src/ServerList.cpp:84
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "S'ha perdut la connexió"
+
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "No s'ha pogut connectar a %s (%s:%i)."
+
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "ERROR: Sòcol invàlid en comprovar el temps d'espera"
+
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "L'intent de connexió a %s (%s:%i) ha excedit el temps."
+
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Resposta de DNS rebuda a destemps, omitint."
+
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "S'està carregant el fitxer server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "No s'ha trobat el fitxer server.met!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "No s'ha pogut carregar el fitxer server.met '%s', s'ha trobat un format "
 "desconegut."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "No s'ha pogut obrir el server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Fitxer server.met corrupte, s'ha trobat una etiqueta de versió invàlida: 0x%"
 "x, mida %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "S'ha trobat %i servidor al server.met"
 msgstr[1] "S'han trobat %i servidors al server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d servidor afegit"
 msgstr[1] "%d servidors afegits"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "Error d'E/S metre es llegia el fitxer %s: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "No s'ha afegit el servidor: [%s:%d] no s'especifica un port vàlid."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr ""
 "No s'ha afegit el servidor: L'IP de [%s:%d] ha estat filtrada o no és vàlida."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "No s'ha afegit el servidor: S'ha trobat un servidor amb IP:Port [%s:%d] "
 "iguals."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "S'ha afegit un Servidor: [%s:%d] s'està usant el nom '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr ""
-"Esteu connectat al servidor què intenteu eliminar. Per favor, primer "
+"Esteu connectat al servidor què intenteu eliminar. Si us plau, primer "
 "desconnecteu-vos."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "No s'ha pogut obrir '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "No s'ha pogut desar el server.met"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Adreça invàlida"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
 msgstr "S'ha acabat de baixar la llista de servidors des de %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "No s'ha pogut baixar la llista de servidors des de %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6964,25 +5532,29 @@
 "dat'. Enganxeu una adreça cap a una llista de servidors vàlida a aquest "
 "fitxer per a que es pugui actualitzar automàticament la llista de servidors"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Comença a baixar la llista de servidors des de %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
-"AVÍS: s'ha especificat una adreça invàlida per a l'actualització automàtica "
-"de servidors: %s"
+"AVÍS: s'ha especificat una URL invàlida per a l'actualització automàtica de "
+"servidors: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
-"No s'ha trobat una adreça automàtica per a baixar un server.met al fitxer "
-"addresses.dat"
+"No s'ha trobat una URL per a baixar un server.met al fitxer addresses.dat"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "No s'ha pogut baixar la llista de servidors des de %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -6990,321 +5562,2381 @@
 "El servidor local està filtrat pels filtres IP, s'està reconnectant a un "
 "servidor diferent!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Error en executar l'ordre '%s' per a l'esdeveniment '%s'"
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Nom"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Adreça"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Port"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Descripció"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Usuaris"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Estàtic"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versió"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"S'ha establert la localització Predeterminada del Sistema a causa d'un canvi "
-"de configuració. Disculpeu."
+"Esteu intentant esborrar un servidor al què esteu connectat. Si us plau, "
+"desconnecteu-vos primer. NO s'ha esborrat el servidor."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Nom desconegut)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Esteu segur que voleu esborrar el servidor estàtic %s"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Servidors (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Servidor"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Connecta al servidor"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Marca el servidor com a estàtic"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Marca el servidor com a no estàtic"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Marca els servidors com a estàtics"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Marca els servidors com a no estàtics"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Esborra el servidor"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Esborra els servidors"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Esborra tots els servidors"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Copia els enllaços eD2k al porta-retalls"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Reconnecta amb el servidor"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Esteu segur que voleu esborrar tots els servidors?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Esteu segur que voleu esborrar el servidor seleccionat?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Esteu segur que voleu esborrar els servidors seleccionats?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "ERROR: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "AVÍS: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "La nova ID d'usuari és %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "AVÍS: Heu rebut una ID Baixa!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
-"No teniu cap servidor a la llista de servidors.\n"
-" Voleu que l'aMule baixi una llista nova?"
+"\tAixò normalment és perquè esteu darrere d'un tallafocs o un encaminador."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Baixada de la llista de servidors"
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tPer a rebre més informació, si us plau visiteu http://wiki.amule.org"
 
-#: src/amule.cpp:846
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "S'ha rebut una informació desconeguda del servidor! - massa curta"
+
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "web server running on pid %d"
-msgstr "servidor web executant-se al pid %d"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "S'han rebut %d servidor nou"
+msgstr[1] "S'han rebut %d servidors nous"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "S'ha desat la llista de servidors."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "El servidor ha rebutjat l'última ordre"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "S'ha rebut un paquet fals del servidor: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
-"Heu demanat que s'executi el servidor web a l'inici, però no s'ha trobat el "
-"fitxer binari de l'amuleweb. Per favor instal·leu el paquet que conté el "
-"servidor web de l'aMule, o compileu l'aMule usant la opció --enable-"
-"webserver and run make install"
+"S'ha produït un error sense tractament mentre es processava un paquet del "
+"servidor: %s"
 
-#: src/amule.cpp:937
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "No s'han pogut encaminar els ports a l'adreça especificada: %s"
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "No es pot crear el fil per a resoldre DNSs per a connectar amb %s"
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:725
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "El port %u no està disponible. Tindreu ID BAIXA\n"
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "L'IP del servidor %s (%s) està filtrada.  No es connectarà."
 
-#: src/amule.cpp:970
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "S'està utilitzant l'ofuscació de protocol"
+
+#: src/ServerSocket.cpp:744
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "S'està connectant a %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
-"El port %u no està disponible!\n"
-"\n"
-"Això significa que tindreu ID BAIXA.\n"
-"\n"
-"Comproveu la configuració de la xarxa per a assegurar-vos que el port està "
-"obert."
+"No es pot resoldre el dns per al servidor %s: Ha estat impossible connectar!"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "No s'ha pogut crear el fitxer de la signatura en línia"
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr ""
+"No s'ha afegit el servidor: No s'ha especificat cap IP o nom de servidor."
 
-#: src/amule.cpp:1131
-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/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr ""
+"No s'ha afegit el servidor: El port del servidor especificat és invàlid."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Estat eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Estat Kademlia:"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "S'està executant sobre %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Funcionant"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Estat:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Estat de la connexió:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Bloquejat - obre el port TCP %d en el teu encaminador o tallafocs"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "Estat de la connexió UDP:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Bloquejat - obre el port UDP %d en el teu encaminador o tallafocs"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Estat rere-tallafocs: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Cap amic necessari - Port TCP obert"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Cap amic necessari - Port UDP obert"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Cap amic"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Connectant amb un amic"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Connectat amb l'amic a %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Fonts indexades:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Paraules clau indexades: "
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Notes indexades:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Càrrega indexada: "
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Mitjana d'usuaris:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Mitjana de fitxers:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Aturat"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Afegint fitxer %s a compartits"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "S'ha trobat %i fitxer compartit"
+msgstr[1] "S'han trobat %i fitxers compartits"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "S'ha trobat %i fitxer compartit conegut, %i desconeguts"
+msgstr[1] "S'han trobat %i fitxers compartits coneguts, %i desconeguts"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "ERROR: S'ha intentat compartir %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Carpeta compartida no trobada, omitint: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "No s'ha trobat cap fitxer en el directori: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Nom d'usuari"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Velocitat de baixada"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Velocitat de pujada"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Disponibilitat:"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Estat local"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Estat remot"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Fitxer"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Compartits"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Peticions"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Peticions acceptades"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Dades transferides"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Ràtio"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Parts obtingudes"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Fonts completes"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Ubicació"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Afegeix comentari / valoració"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Edita comentari / valoració"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Reanomena"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Afegeix els fitxers de la col·lecció a les transferències"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Copia l'enllaç en format &Magnet al porta-retalls"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Copia l'enllaç eD2k al porta-retalls (&Font)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr ""
+"Copia l'enllaç eD2k al porta-retalls (Font) (amb les opcions de &xifrat)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Copia l'enllaç eD2k al porta-retalls (&Nom de l'ordinador)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+"Copia l'enllaç eD2k al porta-retalls (Nom de l'ordinador) (amb les &opcions "
+"de xifrat)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Copia l'enllaç eD2k al porta-retalls (amb l'informació &AICH)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Necessiteu ID Alta per crear un enllaç font vàlid"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Fitxers compartits (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[Fitxer de parts]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Fitxer"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Dades pujades (sessió (total)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Sobrecàrrega total (paquets): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Sobrecàrrega per peticions de fitxers (paquets): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Sobrecàrrega en l'intercanvi de fonts (paquets): %s"
 
-#: src/amule.cpp:1299
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Sobrecàrrega del servidor (paquets): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Sobrecàrrega Kad (paquets): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Excedent per xifrat (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Pujades actius: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Pujades en espera: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Total de sessions de pujada resoltes: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Total de sessions de pujada fallades: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Temps mitjà de pujada: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Dades baixades (sessió (total)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Fonts trobades: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Baixades actives (trossos): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Raó PU:BA de la sessió (total): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Raó de baixada mitjana (Sessió): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Raó de pujada mitjana (Sessió): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Raó de baixada màxima (Sessió): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Raó de pujada màxima (Sessió): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Reconnexions: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Temps des de la primera transferència: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Connectat al servidor des de fa: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Connexions actives (aprox.): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "S'ha arribat al límit de connexions màxim: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Mitjana de connexions (aprox.): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Pic de connexions (aprox.): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Clients"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Desconegut: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Filtrat: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Expulsat: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Total: %i Coneguts: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Servidors funcionant: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Servidors que han fallat: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Total: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Servidors esborrats: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Servidors filtrats: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Usuaris en servidors funcionant: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Fitxers en servidors funcionant: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Usuaris totals: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Fitxers totals: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Càrrega del servidor: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Fitxers compartits: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Mida total dels fitxers compartits: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Mida mitjana de fitxer: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Sistema operatiu"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "No s'ha rebut"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Connexions actives (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "No disponible"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Mai"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "El procés '%s' amb pid '%d' ha finalitzat amb el codi d'estat '%d'"
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Executa <str> i surt."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Format IP invàlid. Useu xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
+msgstr ""
+"Aquesta ordre requereix un argument. Arguments vàlids: 'all', nom del "
+"fitxer, o un número.\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "S'està processant per resum: "
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "S'està processant per nom del fitxer: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
-"La localització seleccionada no està instal·lada al PC. (Nota: s'intentarà "
-"establir igualment)"
+"Aquesta ordre requereix un argument. Arguments vàlids: un resum de fitxer "
+"(hash).\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Número invàlid\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr ""
+"No és un resum vàlid (la longitud hauria de ser exactament de 32 caràcters)\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "La petició ha fallat amb un error desconegut."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "La operació ha finalitzat amb èxit."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "És la primera vegada que executeu l'aMule %s"
+msgid "Request failed with the following error: %s"
+msgstr "La petició ha fallat amb el següent error: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Aquesta és una versió de prova, actualitzada diàriament, i\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "El filtre IP per a clients és: %s.\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "no podem garantir que no trenqui res, cremi la vostra casa,\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "Desactivat"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "o mati al gos. Tanmateix el seu ús *hauria* de ser segur.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "Activat"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "El filtre IP per a servidors és: %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "El nivell actual del filtre IP és %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Límits d'ample de banda: Pujada: %u kB/s, Baixada: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Connectat a %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Connectant"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "protegit per un tallafocs"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "correcte"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"En aquesta versió s'han canviat les següents opcions per motius de "
-"seguretat:\n"
+"\n"
+"Baixada:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Habilitada l'ofuscació de protocol per a les connexions d'entrada i "
-"eixida.\n"
+"Pujada:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Inhabilitada l'actualització de la llista de servidors des d'altres "
-"servidors i clients.\n"
+"Clients a la cua:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Per a més informació sobre els motius d'aquests canvis, cerqueu\n"
-"informació sobre \"fake servers\" al wiki de l'aMule http://wiki.amule.org.\n"
-"És important que esborreu qualsevol servidor fals de la llista per a que tot "
-"funcioni correctament."
+"Fonts totals:\t%d\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Número de resultats de la cerca: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/TextClient.cpp:832
+#, fuzzy
+msgid "Search progress not available"
+msgstr "Mostra el percentatge de descàrrega"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "S'ha rebut una resposta desconeguda del servidor, codi d'opció = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Mostra la informació d'estat resumida."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr ""
+"Mostra l'estat de la connexió, velocitat de pujada/baixada actuals, etc.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Mostra l'arbre d'estadístiques complet."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"De manera opcional, es pot passar un número en el rang 0-255 com a argument "
+"d'aquesta\n"
+"ordre, que diu quantes entrades del subarbre de la versió de client "
+"s'haurien de\n"
+"mostrar. Passar 0 o ometre'l es igual a 'il·limitades'.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Exemple: 'statistics 5' només mostrarà les 5 versions més usades de cada "
+"tipus de client.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Atura l'aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Atura el nucli remot en execució (amule/amuled).\n"
+"Açò també aturarà el client de text, ja que no és pot usar sense\n"
+"haver un nucli en execució.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Recarrega l'objecte donat."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Recarrega la llista de fitxers compartits."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "Recarrega la taula de filtrat IP."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Recarrega la taula de filtrat IP actual."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "Recarrega la taula de filtrat IP des d'una URL."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "Si s'omet l'URL s'usa l'URL de les preferències."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Connecta a la xarxa."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
+"Connectarà amb totes les xarxes que són habilitades a les Preferències.\n"
+"Opcionalment també podeu especificar l'adreça d'un servidor en format IP:"
+"Port, per a \n"
+"connectar només amb aquest servidor. L'IP ha de ser una adreça IPv4 decimal "
+"puntejada,\n"
+"o un nom DNS resoluble."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Connecta només a eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Connecta només a Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Desconnecta de la xarxa."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Desconnectarà de totes les xarxes que estiguin connectades ara.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Desconnecta només de eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Desconnecta només de Kad."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Afegeix un enllaç magnet o eD2k al nucli."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"L'enllaç eD2k a afegir pot ser:\n"
+"*) un enllaç a un fitxer (ed2k://|file|...), s'afegirà a la cua de "
+"baixades,\n"
+"*) un enllaç a un servidor (ed2k://|server|...), s'afegirà a la llista de "
+"servidors,\n"
+"*) o un enllaç a una llista de servidors, en aquest cas tots els servidors "
+"en la llista s'afegiràn\n"
+"   a la llista de servidors.\n"
 "\n"
-"A més a més, s'han reiniciat les preferències del navegador als valors per "
-"defecte del sistema. Per favor configureu-les de nou si és necessari.\n"
+"L'enllaç magnet ha de contenir el resum (hash) eD2k i la mida del fitxer.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Defineix un valor de configuració."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "Defineix les preferències del filtrat IP."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Activa el filtre IP per a clients i servidors"
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Atura el filtre IP per a clients i servidors"
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Activa/Desactiva el filtre IP per a clients"
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Activa el filtre IP per a clients"
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Atura el filtre IP per a clients"
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Activa/Desactiva el filtre IP per a servidors"
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Activa el filtre IP per a servidors"
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Atura el filtre IP per a servidors"
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Selecciona el nivell de filtratge IP."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Podeu trobar més informació, ajuda i noves versions a la nostra pàgina web,\n"
+"Els nivells de filtratge vàlids són en el rang 0-255, i el valor per "
+"defecte\n"
+"(inicial) és 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "a www.aMule.org, o al nostre canal IRC #aMule de irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Defineix els límits d'ample de banda."
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Podeu informar de qualsevol error a http://forum.amule.org"
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "El valor donat ha de ser en kilobytes/seg.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Defineix el límit d'ample de banda de pujada."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Defineix el límit d'ample de banda de baixada."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Obté i mostra un valor de les preferències."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "Obté les preferències del filtratge IP."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Obtenir l'estat del filtre IP per a clients i servidors"
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Obtenir l'estat del filtre IP només per a clients"
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Obtenir l'estat del filtre IP només per a servidors"
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "Selecciona el nivell de filtratge IP."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Obté els límits d'ample de banda."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Realitza una cerca"
+
+#: src/TextClient.cpp:914
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"La carpeta especificada per als fitxers de la signatura en línia és "
-"INVÀLIDA!\n"
-" S'INHABILITARÀ la signatura en línia fins que ho resolgueu a les "
-"preferències."
+"S'ha d'especificat un tipus de cerca:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Exemple:'search kad fitxer' executarà una cerca kad per a \"fitxer\".\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Realitza una cerca global"
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Realitza una cerca local"
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Realitza una cerca kad"
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Mostra els resultats de l'última cerca."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Retorna els resultats de la cerca anterior.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Mostra el progrés d'una cerca."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Mostra el progrés d'una cerca.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Comença a baixar un fitxer"
+
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
+"S'ha de donar el número d'un fitxer de l'última recerca.\n"
+"Exemple: 'download 12' començarà a baixar el fitxer amb el número 12 de la "
+"recerca anterior.\n"
+
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Pausa la baixada."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Reprèn la baixada."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Cancel·la la baixada."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Assigna una prioritat de baixada"
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Estableix la prioritat d'una baixada a Baixa, Normal, Alta o Auto.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Estableix la prioritat a baixa"
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Estableix la prioritat a normal."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Estableix la prioritat a alta."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Estableix la prioritat a auto."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Mostra les cues/llistes."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Mostra la cua de pujades/baixades, la llista de servidors o la llista de "
+"fitxers compartits.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Mostra la cua de pujades."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Mostra la cua de baixades."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Mostrar el registre."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Mostra la llista de servidors."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Buida el registre."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "La preassignació d'espai per al fitxer '%s' ha fallat: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Ordre obsoleta, useu '%s' en el seu lloc."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "ERROR: no es pot obrir el fitxer de registre"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Aquesta és una ordre obsoleta, i pot ser s'elimini en el futur.\n"
+"Useu '%s' en el seu lloc.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "AVÍS: el fitxer de registre està buit. Alguna cosa no va bé."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "client de text de l'aMule"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "S'ha reiniciat el registre"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr ""
+"S'està convertint els conjunts de resums AICH antics en '%s' a 64b en '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Missatge del servidor: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr ""
+"AVÍS: El nom de fitxer '%s' és invàlid i ha estat reanomenat com a '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "No s'ha pogut baixar la llista de nodes."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"AVÍS: El fitxer '%s' ja existeix, el fitxer nou ha estat reanomenat com a '%"
+"s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "No s'ha pogut obrir el fitxer de comprovació de versió"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Esteu segur que voleu cancel·lar i esborrar tots els fitxer d'aquesta "
+"categoria?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Fitxer de comprovació de versió corrupte"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Es Requereix Confirmació"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Esteu usant una versió antiga de l'aMule!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Massa connexions"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Tota la resta"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Selecciona un filtre de vista"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Afegeix una categoria"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Edita la categoria"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Elimina la categoria"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
 msgstr ""
-"La vostra versió de l'aMule és %i.%i.%i i l'última versió és %li.%li.%li"
+"No s'ha pogut obrir el fitxer (%s), s'eliminarà de la llista de fitxers "
+"compartits."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Sempre podeu trobar l'última versió a http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "S'ha demanat un conjunt de resums d'un fitxer desconegut: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "AVÍS: La vostra versió d'aMuled és antiga: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "S'està reprenent la pujada del fitxer: %s"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "La vostra versió de l'aMule és l'última."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "S'està suspenent la pujada del fitxer: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "No s'ha pogut baixar el fitxer de comprovació de versió"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Error en executar l'ordre '%s' per a l'esdeveniment '%s'"
 
-#: src/amule.cpp:2025
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Descàrrega completada"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "La ruta completa al fitxer"
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "El nom del fitxer sense la ruta."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "El resum eD2k del fitxer."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "La mida del fitxer en bytes."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Temps d'activitat de baixada acumulat."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Inici d'una nova sessió de xat"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Remitent del missatge."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Sense espai"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Partició de disc."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Error completant"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Usuaris: %s | Fitxers: %s"
+msgid "Processing file number %u: %s"
+msgstr "S'està processant el fitxer número %u: %s"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr ""
+"Heu preguntat per els resums de les parts (Només per a fitxers > 9.5MB)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Usuaris: E: %s K: %s | Fitxers: E: %s K: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Fitxer inexistent !\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "No s'han seleccionat xarxes"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, el creador d'enllaços eD2k de l'aMule"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Benvinguts!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Paràmetres d'entrada"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Fitxer"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Afegeix URL opcionals per al fitxer"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Introduïu el fitxer per al qual voleu calcular l'enllaç eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Introduïu la URL que voleu agregar a l'enllaç eD2k: Afegiu / al final perqué "
+"aLinkCreator integri el nom del fitxer actual"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Esborra"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Crea l'enllaç amb resums per a cada part"
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Ajuda a escampar més ràpidament els fitxer nous i rars, a costa d'un enllaç "
+"més gros"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Resum MD4 del fitxer"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "Resum eD2k del fitxer"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "Enllaç eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Desa"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Copia al porta-retalls"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Obre"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Obre un fitxer per a crear-ne l'enllaç eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Copia l'enllaç eD2k al porta-retalls"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Anomena i desa"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Desa l'enllaç eD2k a un fitxer"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Quant a l'aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Seleccioneu el fitxer per al qual voleu crear l'enllaç eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "No es pot obrir el porta-retalls"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "No hi ha res a copiar!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Seleccioneu el fitxer per a l'enllaç eD2k creat"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "No s'ha pogut obrir "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Si us plau, introduïu un nom que no sigui buit"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "No hi ha res a desar!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, el creador d'enllaços eD2k de l'aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Gràfics de http://www.everaldo.com i http://www.icomania.com\n"
+"i http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distribuït sota llicència GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Fent el resum..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator està funcionant"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Calculant comprovació MD4..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Calculant comprovació eD2k..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Cancel·lat !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Connectat a %s %s"
+msgid "Done in %.2f s"
+msgstr "Fet en %.2f s"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Ja heu afegit aquesta adreça URL!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Si us plau, introduïu una URL que no sigui buida"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "S'està connectant a %s"
+msgid "Unable to open %s"
+msgstr "No s'ha pogut obrir %s"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Desconnectat de eD2k"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i dies %i hores %i min %i s"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "S'ha engegat la xarxa Kad."
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "S'ha aturat la xarxa Kad."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Connectat a Kad (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Connectat a Kad (tallafocs)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Desconnectat de Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, Estadístiques en línia de l'aMule"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Raó de BA màxima des que el wxCas funciona"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Velocitat màxima de BA des que s'usa l'wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistema"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Atura l'autorefresc"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Desa la imatge de les estadístiques en línia"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Imprimeix la imatge de les estadístiques en línia"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Paràmetre de les preferències"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Quant al wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Inicia l'autorefresc"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Autorefresc aturat"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Autorefresc iniciat"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Desa la imatge de les estadístiques"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Estadístiques en línia de l'aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"No es pot usar la xarxa Kad si el port UDP està inhabilitat a les "
-"preferències, no s'engegarà."
+"Ha hagut un problema en imprimir.\n"
+"Tal volta la impressora actual no està configurada correctament?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "La xarxa Kad està inhabilitada a les preferències, no es connectarà."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Imprimint"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
-"No s'ha pogut obrir el fitxer amb la llista d'amics 'emfriends.met' per a "
-"lectura!"
+"wxCAS, Signatura d'estadístiques en Línia de l'aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Basat en CAS de Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distribuït sota GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "L'aMule no s'està executant..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "L'aMule s'està executant"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "L'aMule s'està executant, però desconnectat"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "L'aMule s'està connectant..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "L'estat de l'aMule és desconegut..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " ha estat funcionant durant "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " està aturat!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " no està connectat!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " està connectant..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " està fent alguna cosa estranya, comproveu-lo!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " està connectat a "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "inactiu"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " és a "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " amb "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Total baixat: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", pujat: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Baixat durant la sessió: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Baixant: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr "kB/s, pujant: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Compartint: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " fitxers, clients a la cua: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Hora: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " a "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Mitjana de càrrega del sistema (1-5-15 min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Sistema en funcionament des de: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "El directori on està el fitxer amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Introduïu el directori on es troba el fitxer amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Interval de refresc en segons"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Genera una imatge a cada refresc"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Introduïu el directori on es generarà la imatge d'estadístiques"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Puja periòdicament la imatge d'estat a un servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "Adreça FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Directori FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Introduïu l'adreça del servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "Introduïu el directori del servidor FTP on es desarà la imatge"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Usuari"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Introduïu el nom d'usuari per a entrar al servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Introduïu la contrasenya per a entrar al servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Interval d'actualització de l'FTP en minuts"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "D'acord"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Directori on està el fitxer de signatura"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Directori on es genera la imatge"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Carrega la plantilla <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Port HTTP del servidor web"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Usa l'encaminament UPnP al port del servidor web"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Port UPnP"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Usa la compressió gzip"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Contrasenya d'accés total per al servidor web"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Contrasenya de convidat per al servidor web"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Permetre l'accés de convidats"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Denega l'accés de convidats"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
-"No s'ha pogut obrir el fitxer amb la llista d'amics 'emfriends.met' per a "
-"escriptura!"
+"Carrega / desa la configuració del servidor web des de / a l'aMule remot"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr ""
+"Directori del fitxer de configuració de l'aMule. NO L'USEU DIRECTAMENT!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Inhabilita el intèrpret PHP (obsolet)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Recompila les pàgines PHP a cada petició"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Servidor web de l'aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "s'ha acceptat la connexió del client web\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "ERROR: no es pot acceptar connexions de clients web\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Ha fallat la petició amb el següent error: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "No s'ha trobat el fitxer d'índex:"
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "La sessió ha caducat - s'està demanant la identificació\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sessió correcta, identificat\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sessió correcta, sense identificar\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "No hi ha cap sessió oberta - es demanarà identificació\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Sessió creada - s'està demanant la identificació\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "S'està processant la petició [original]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "No s'ha especificat cap contrasenya, no es permetrà la identificació."
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "S'està comprovant la contrasenya\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "El resum de la contrasenya és invàlid\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Contrasenya correcta\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Contrasenya incorrecta\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr ""
+"No heu especificat cap contrasenya. No es permet una contrasenya en blanc.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Eixida sol·licitada\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "S'està processant la petició [redirigit]: "
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Albanès"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Estat remot"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Retard de l'actualització: %d seg"
+#~ msgstr[1] "Retard de l'actualització: %d segs"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr "Encara no es poden fer comentaris ni valoracions al client remot"
+
+#~ msgid "Transferring"
+#~ msgstr "Transferint"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "C: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "C: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "En cua"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - mostra el progrés d'una cerca"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "S'està començant la creació del resum MD4 i AICH per al fitxer: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "S'està començant la creació del resum MD4 per al fitxer: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "S'està començant el creació del resum AICH per al fitxer: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "AVÍS: No s'ha pogut esborrar l'original '%s' després de crear la còpia de "
+#~ "seguretat"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "AVÍS: No s'ha pogut esborrar %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (C: %u)"
+
+#~ msgid ""
+#~ "You cannot connect to a release version from an arbitrary SVN version! "
+#~ "*sigh* possible crash prevented"
+#~ msgstr ""
+#~ "No podeu connectar a una versió estable des de una versió SVN arbitrària! "
+#~ "és possible que es produeixin fallades"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Puntuació (total):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Intenta transferir parts completes a totes les pujades"
+
+#~ msgid "Networks window"
+#~ msgstr "Finestra de xarxes"
+
+#~ msgid "Searches window"
+#~ msgstr "Finestra de cerques"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "S'està baixant"
+
+#~ msgid "Shared files window"
+#~ msgstr "Finestra de fitxers compartits"
+
+#~ msgid "Messages window"
+#~ msgstr "Finestra de missatges"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Finestra del gràfic d'estadístiques"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Finestra dels paràmetres de configuració"
+
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Icona de la safata del sistema perduda, recreant-la ..."
+
+#~ msgid "Transfers"
+#~ msgstr "Transferències"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Finestra de transferència de fitxers"
+
+#~ msgid "Unban"
+#~ msgstr "Admet de nou"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Mostra les pujades"
+
+#~ msgid "Show Queue"
+#~ msgstr "Mostra la cua"
+
+#~ msgid "Select View"
+#~ msgstr "Selecciona la vista"
+
+#~ msgid "Client Software"
+#~ msgstr "Programari"
+
+#~ msgid "Waited"
+#~ msgstr "Temps esperat"
+
+#~ msgid "Upload Time"
+#~ msgstr "Temps pujant"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Pujat/Baixat"
+
+#~ msgid "Remote Status"
+#~ msgstr "Estat remot"
+
+#~ msgid "File Priority"
+#~ msgstr "Prioritat"
+
+#~ msgid "Score"
+#~ msgstr "Puntuació"
+
+#~ msgid "Asked"
+#~ msgstr "Demanat"
+
+#~ msgid "Last Seen"
+#~ msgstr "Últim cop vist"
+
+#~ msgid "Entered Queue"
+#~ msgstr "En cua"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Pujat"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Baixat"
+
+#~ msgid "Userhash"
+#~ msgstr "Resum de l'usuari"
+
+#~ msgid "Encrypted"
+#~ msgstr "Xifrat"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "Carregat %d senyaladors de mapa de bits."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Mostra les Pujades / Cua"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Clients a la cua:"
+
+#~ msgid "Current Session"
+#~ msgstr "Sessió actual"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Requested :"
+#~ msgstr "Demanat:"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Crea còpia de seguretat al previsualitzar"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Finestra de transferència de fitxers"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Usuaris Totals: %s | Fitxers Totals: %s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "S'ha iniciat el fil de descàrrega HTTP."
+
+#~ msgid "Download size not received, downloading until connection is closed"
+#~ msgstr "No s'ha rebut la mida, descarregant fins que la connexió es tanqui"
+
+#~ msgid "Download size: %i"
+#~ msgstr "Mida descarrega: %i"
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "Fil de Descàrrega HTTP "
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Servidor: %s:%i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Resposta: %i (Error: %i)"
+
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "AVÍS: Resposta buida en la creació del flux."
+
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "ERROR: Codi de redirecció rebut sense URL"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr ""
+#~ "CIP2Country::CIP2Country(): No s'han pogut carregar les dades del país "
+#~ "des de"
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Obté el nivell del filtratge IP."
+
+#~ msgid "Makes a search."
+#~ msgstr "Realitza una cerca."
+
+#~ msgid "Killed!"
+#~ msgstr "Aturat!"
+
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Utilitzant amuleweb a '%s'."
+
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Aturant l'aMule..."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "En aquesta versió s'han canviat les següents opcions per motius de "
+#~ "seguretat:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Habilitada l'ofuscació de protocol per a les connexions d'entrada i "
+#~ "sortida.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Inhabilitada l'actualització de la llista de servidors des d'altres "
+#~ "servidors i clients.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Per a més informació sobre els motius d'aquests canvis, cerqueu "
+#~ "informació sobre \"fake servers\" al wiki de l'aMule http://wiki.amule."
+#~ "org.\n"
+#~ "És important que esborreu qualsevol servidor fals de la llista per a que "
+#~ "tot funcioni correctament."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "A més a més, s'ha reiniciat les preferències del navegador als valors per "
+#~ "defecte del sistema. Si us plau configureu-les de nou si és necessari.\n"
 
 #~ msgid "Fetching status..."
 #~ msgstr "Recollint l'estat..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Usuaris: E: %s K: %s | Fitxers E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Client %s amb IP:Port %s:%d usant %s %s %s"
+
+#~ msgid "Filtered"
+#~ msgstr "Filtrats"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() ha retornat NULL"
 
+#~ msgid "Firewalled"
+#~ msgstr "Bloquejat per un tallafocs"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "S'ha carregat %d imatge de bandera."
+#~ msgstr[1] "S'han carregat %d imatges de banderes."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr "El fitxer %s és massa gran per al Donkey: el màxim permès són 4GB."
+
+#~ msgid "No handler for this file type."
+#~ msgstr "No hi ha gestor per a aquest tipus de fitxer"
+
+#~ msgid "File was not saved"
+#~ msgstr "No s'ha desat el fitxer"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr ""
+#~ "La connexió ha fallat. Ha estat impossible connectar amb l'ordinador "
+#~ "especificat\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "Filtre de missatges"
 
@@ -7314,14 +7946,184 @@
 #~ msgid "Core Tweaks"
 #~ msgstr "Nucli"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "No hi ha gestor per a aquest tipus de fitxer"
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Temps de retard dels consells en segons"
 
-#~ msgid "File was not saved"
-#~ msgstr "No s'ha desat el fitxer"
+#~ msgid "Show part file number before file name"
+#~ msgstr "Mostra el número del fitxer part abans del nom del fitxer"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
-#~ msgstr "El fitxer %s és massa gran per al Donkey: el màxim permès són 4GB."
+#~ msgid "Skin Support"
+#~ msgstr "Suport d'aparences"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- no hi han temes disponibles - "
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Directori de la signatura en línia:"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Opcions de filtratge:"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Capacitat de la línia"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
+#~ msgstr ""
+#~ "Nota: Aquests valors només\n"
+#~ "s'usen per a les estadístiques."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Port TCP del client estàndard:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Port UDP del client estès:"
+
+#~ msgid "Bind Address"
+#~ msgstr "Adreça d'escolta"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "Port UDP per a peticions esteses del servidor (TCP+3): 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Màx. fonts per fitxer"
+
+#~ msgid "Connection limits"
+#~ msgstr "Límit de connexions"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Universal Plug and Play"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "Activa UPnP"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "Port TCP UPnP:"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Comença el següent fitxer pausat quan es completi un fitxer"
+
+#~ msgid "Check disk space"
+#~ msgstr "Comprova l'espai de disc"
+
+#~ msgid "Min disk space:"
+#~ msgstr "Espai mín. al disc:"
+
+#~ msgid "Incoming"
+#~ msgstr "Entrada"
+
+#~ msgid "Temporary"
+#~ msgstr "Temporal"
+
+#~ msgid "Shared"
+#~ msgstr "Compartit"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Selecciona els colors de les estadístiques"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Progrés dels fitxers de la cua de baixades"
+
+#~ msgid "Show percentage"
+#~ msgstr "Mostra el percentatge"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Mostra la barra de progrés"
+
+#~ msgid "Enable skin support "
+#~ msgstr "Habilitar el suport d'aparences"
+
+#~ msgid "Skin:"
+#~ msgstr "Tema:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "Ordena automàticament els fitxers de la cua de baixades (més CPU)"
+
+#~ msgid "Show Fast eD2k Links Handler"
+#~ msgstr "Mostra el gestor ràpid d'enllaços eD2k"
+
+#~ msgid "Web server port"
+#~ msgstr "Port del servidor web"
+
+#~ msgid "Enable UPnP port forwarding on the web server port"
+#~ msgstr "Activa l'encaminament UPnP al port del servidor web"
+
+#~ msgid "Web server UPnP TCP port"
+#~ msgstr "Port TCP UPnP del servidor web"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "IP de la interfície que escolta\n"
+#~ "(buit per a qualsevol)"
+
+#~ msgid "TCP port"
+#~ msgstr "Port TCP"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Qui pot veure els fitxers compartits:"
+
+#~ msgid "Event types"
+#~ msgstr "Tipus d'esdeveniments"
+
+#~ msgid "ERROR: can not accept web client connection\n"
+#~ msgstr "ERROR: no es pot acceptar la connexió del client web\n"
+
+#~ msgid ""
+#~ "Your Auto-update server list is empty.\n"
+#~ "'Auto-update server list at startup will be disabled."
+#~ msgstr ""
+#~ "La llista d'autoactualització de servidors és buida.\n"
+#~ "Es desactivarà l'actualització automàtica a l'inici."
+
+#~ msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "ERROR: Versió del fitxer part.met invàlida: %s ==> %s"
+
+#~ msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#~ msgstr ""
+#~ "AVÍS: La llista de fitxers coneguts és corrupta, conté una capçalera "
+#~ "invàlida."
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "L'aMule demanarà confirmació abans de sortir."
+
+#~ msgid "Bandwith limits"
+#~ msgstr "Límits d'ample de banda"
+
+#~ msgid "This UDP port is used for extended ed2k requests and Kad network"
+#~ msgstr "Aquest port UDP s'usa per a peticions ed2k esteses i la xarxa Kad"
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Mostra la sobrecàrrega d'ample"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. actiu"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "L'AICH es refia de cada resum (no recomanat)"
+
+#~ msgid "Disk space"
+#~ msgstr "Espai de disc"
+
+#~ msgid "Create Backup for preview"
+#~ msgstr "Crea una còpia per a fer la previsualització"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Configuració avançada"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Aspecte de la barra de progrés"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Ordre de les columnes"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Miscel·lània"
+
+#~ msgid "File Options"
+#~ msgstr "Opcions de fitxer"
 
 #~ msgid "Status text"
 #~ msgstr "Text d'estat"
@@ -7329,18 +8131,144 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "Text d'estat en finestra emergent"
 
-#~ msgid "Please wait... "
-#~ msgstr "Per favor, espereu... "
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr ""
+#~ " Client p2p multiplataforma basat en l'eMule \n"
+#~ "\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr " Pàgina: http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr " Fòrum: http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ " PMF: http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " Contacte: admin@amule.org (problemes administratius) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr " Una part de l'aMule està basada en \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " Copyright (C) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "D'una pel·lícula pots dir la durada, el gènere, l'idioma ...\n"
+#~ "i si és falsa, pots avisar a la resta d'usuaris."
+
+#~ msgid "Misc Options"
+#~ msgstr "Miscel·lània"
+
+#~ msgid "Server Options"
+#~ msgstr "Opcions del servidor"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Visualitza el \"missatge del dia\" del servidor en connectar ..."
+
+#~ msgid "eD2k Info"
+#~ msgstr "Info eD2k"
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Inhabilita/Habilita"
+
+#~ msgid "Authentication"
+#~ msgstr "Autenticació"
 
 #~ msgid "General Settings"
 #~ msgstr "Paràmetres generals"
 
+#~ msgid "Hard limit"
+#~ msgstr "Límit dur"
+
+#~ msgid "Max Connections"
+#~ msgstr "Màx. connexions"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "Paràmetres de la GUI"
 
 #~ msgid "Remote Control"
 #~ msgstr "Control remot"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "No s'ha pogut determinar el navegador seleccionat"
+
+#~ msgid "User Defined"
+#~ msgstr "Definit per l'usuari"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - la Mula de Linux"
+
+#~ msgid "System Default"
+#~ msgstr "Valor per defecte del sistema"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Seleccioneu el navegador ací"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Navegador personalitzat:"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Poseu ací el nom del navegador. Per a usar un navegador personalitzar, "
+#~ "seleccioneu Personalitzat al menú de sota."
+
+#~ msgid "Please wait... "
+#~ msgstr "Per favor, espereu... "
+
+#~ msgid ""
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed."
+#~ msgstr ""
+#~ "A més a més, s'han reiniciat les preferències del navegador als valors "
+#~ "per defecte del sistema. Per favor configureu-les de nou si és necessari."
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "No s'ha pogut determinar l'ordre per a executar el navegador."
 
@@ -7457,9 +8385,6 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "Copia l'enllaç ED2K al porta-retalls"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "Error Fatal: Ha fallat la creació del Timer"
-
 #, fuzzy
 #~ msgid "ED2K: Connecting"
 #~ msgstr "Connectant"
@@ -7569,11 +8494,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "Error: La versió del fitxer part.met és invàlida: %s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr ""
-#~ "Error: %s (%s) és corrupte (etiqueta de compte incorrecta), no s'ha pogut "
-#~ "carregar el fitxer."
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "Avís: %s podria ser corrupte (%i)"
 
@@ -7989,9 +8909,6 @@
 #~ msgid "Client request is invalid! %i / %i"
 #~ msgstr "La petició del client és invàlida! %i / %i"
 
-#~ msgid "Command: %s"
-#~ msgstr "Ordre: %s"
-
 #~ msgid "Unable to open %s file - using %s file."
 #~ msgstr "No s'ha pogut obrir el fitxer %s - usant el fitxer %s."
 
@@ -8008,13 +8925,6 @@
 #~ msgid "Waiting for subprocess termination failed"
 #~ msgstr "L'espera de la terminació del procés fill ha fallat"
 
-#~ msgid ""
-#~ "You cannot connect to a release version from an arbitrary CVS version! "
-#~ "*sigh* possible crash prevented"
-#~ msgstr ""
-#~ "No podeu connectar a una versió estable des d'una versió CVS arbitrària! "
-#~ "Quedeu advertit de possibles fallades."
-
 #~ msgid "doesn't work"
 #~ msgstr "No funciona"
 
@@ -8046,7 +8956,7 @@
 #~ " FAQ: http://wiki.amule.org \n"
 #~ "\n"
 #~ " Contact: admin@amule.org (administrative issues) \n"
-#~ " Copyright (C) 2003-2009 aMule Team \n"
+#~ " Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
 #~ " Part of aMule is based on \n"
 #~ " Kademlia: Peer-to-peer routing based on the XOR metric.\n"
@@ -8060,16 +8970,13 @@
 #~ " FAQ: http://wiki.amule.org \n"
 #~ "\n"
 #~ " Contacte: admin@amule.org (problemes administratius) \n"
-#~ " Copyright (C) 2003-2009 Equip aMule \n"
+#~ " Copyright (C) 2003-2008 Equip aMule \n"
 #~ "\n"
 #~ " Una part de l'aMule està basada en\n"
 #~ " Kademlia: Encaminament P2P basat en la mètrica XOR.\n"
 #~ " Copyright (C) 2002 Petar Maymounkov\n"
 #~ " http://kademlia.scs.cs.nyu.edu\n"
 
-#~ msgid "Syncronization thread started."
-#~ msgstr "S'ha iniciat el fil de sincronització."
-
 #~ msgid "Masterhashes of known files have been loaded."
 #~ msgstr "S'han carregat les claus mestres dels fitxers coneguts."

aMule-2.2.6.tar.bz2/po/cs.po -> aMule-2.3.1.tar.bz2/po/cs.po Changed

@@ -1,1305 +1,1121 @@
-# Czech aMule 2.2.6 translation
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# David Watzke <david@watzke.cz>, 2007.
+# # Czech aMule 2.2.6 translation
+# This file is distributed under the same license as the aMule package.
+# David Watzke <david@watzke.cz>, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule 2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2007-09-03 20:20+0100\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Musíte zadat (neprázdné) heslo."
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Přidat kamaráda"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Neplatné heslo, není MD5 hash!"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Musíte zadat platnou IP adresu a port!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Chyba při připojování"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Informace"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr ""
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Zadaný userhash je neplatný!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr ""
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Selhalo otvírání souboru ED2KLinks."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
+"VAROVÁNÍ: Nemůžete přidat sebe jako zdroj pro eD2k odkaz, když máte LowID."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr ""
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Ukončuji hlavní aplikaci..."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Připojení k aMule uspělo"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Připojení uspělo."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Hashuji"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Dokončování"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Dokončeno"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Pozastaveno"
+#: src/amule.cpp:258
+#, fuzzy, c-format
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Ukončuji instanci amuleweb s PID `%ld'..."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Poškozený"
+#: src/amule.cpp:261
+#, fuzzy, c-format
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Zabíjím instanci amuleweb s PID `%ld'..."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Stahuji"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Selhal"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Čekám"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: Ukončuji jádro."
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Vytváří se MD4 a AICH hash pro soubor: %s"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "Ukončení aMule dokončeno."
 
-#: src/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Vytváří se MD4 hash pro soubor: %s"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr ""
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Vytváří se AICH hash pro soubor: %s"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+"\n"
+"Konfigurace EC"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Převádí se staré AICH hashsety v '%s' do 64b v '%s'."
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Heslo nastaveno a externí připojení povoleno."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "VAROVÁNÍ: Název souboru '%s' je neplatný a byl změněn na '%s'."
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "VAROVÁNÍ"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
 msgstr ""
-"VAROVÁNÍ: Soubor '%s' již existuje, nový soubor byl přejmenován na '%s'."
-
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "VAROVÁNÍ: Nelze smazat původní '%s' po vytvoření zálohy"
+"Vaše nastavení locale bylo změněno na výchozí systémové nastavení kvůli "
+"změně v konfiguraci. Pardon."
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "VAROVÁNÍ: Nelze smazat %s"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Nelze získat seznam sdílených souborů od uživatele '%s'"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Neznámý"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr ""
 
-#: src/BaseClient.cpp:1738
+#: src/amule.cpp:654
 #, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (falešná eMule verze %#x)"
+msgid "web server running on pid %d"
+msgstr "webserver běží s PID %d"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (falešná eMule)"
+#: src/amule.cpp:658
+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/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (falešná eMule)"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "CHYBA"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:741
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (založeno na eMule v.%u)"
+msgid "Could not bind ports to the specified address: %s"
+msgstr ""
 
-#: src/BaseClient.cpp:1960
+#: src/amule.cpp:768
 #, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Přezdívka: %s ID: %u"
-
-#: src/BaseClient.cpp:1962
-#, fuzzy, c-format
-msgid "Requested: %s\n"
-msgstr "Vyžádáno:"
-
-#: src/BaseClient.cpp:1964
-#, fuzzy, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statistika souboru pro toto sezení: Přijato %d z %d požadavků, %s přeneseno\n"
-msgstr[1] ""
-"Statistika souboru pro toto sezení: Přijato %d z %d požadavků, %s přeneseno\n"
-
-#: src/BaseClient.cpp:1967
-#, fuzzy, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statistika souboru pro všechna sezení: Přijato %d z %d požadavků, %s "
-"přeneseno\n"
-msgstr[1] ""
-"Statistika souboru pro všechna sezení: Přijato %d z %d požadavků, %s "
-"přeneseno\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Vyžádán neznámý soubor"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Port %u je nedostupný. Budete mít LowID\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Klient %s s IP %s na portu %d používá %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Jméno"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Kamarádi"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Zobrazit &podrobnosti"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Přidat kamaráda"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Odstranit kamaráda"
-
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Poslat &zprávu"
-
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Zobrazit soubory"
-
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Založit kamarádský slot"
-
-#: src/FriendListCtrl.cpp:273
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Opravdu si přejete odstranit vybrané kamarády?"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Port %u je nedostupný!\n"
+"\n"
+"To znamená, že budete mít LowID.\n"
+"\n"
+"Zkontrolujte nastavení vaší sítě a ujistěte se, že je port v obou směrech "
+"otevřený."
 
-#: src/FriendListCtrl.cpp:275
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Opravdu si přejete odstranit vybrané kamarády?"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Selhalo vytvoření OnlineSig souboru"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Zrušit"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Selhalo vytvoření aMule OnlineSig souboru"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1031
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
 msgstr ""
-"Nemůžete založit více než jeden kamarádský slot.\n"
-" Byl přidělen pouze jeden slot."
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Vícenásobný výběr"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "Toto je vaše první spuštění aMule %s"
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr ""
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Toto je testovací verze, která je denně aktualizovaná a\n"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr ""
+#: src/amule.cpp:1043
+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/UserEvents.h:67
-msgid "The name of the file without path component."
+#: src/amule.cpp:1044
+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"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
+"Více informací, podporu a nová vydání naleznete na naší domovské stránce,\n"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
 msgstr ""
+"na www.aMule.org, nebo na našem IRC kanálu #aMule na irc.freenode.net.\n"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr ""
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Hlašte chyby na adrese http://forum.amule.org/"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/UserEvents.h:87
-msgid "Message sender."
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
 msgstr ""
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr ""
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Předalokace místa na disku pro soubor '%s' selhala: %s"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr ""
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "CHYBA: nelze otevřít logovací soubor"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr ""
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "VAROVÁNÍ: log je prázdný. Něco je špatně."
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Název souboru"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Log byl vymazán"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Velikost"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Zpráva od serveru: %s"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Typ"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Priorita"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Selhalo stahování seznamu uzlů."
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "ID souboru"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Selhalo otvírání staženého kontrolního souboru s verzí"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Požadavky"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Porušený soubor pro kontrolu verze"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Přijaté požadavky"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Používáte zastaralou verzi aMule!"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Přenesená data"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Vaše verze aMule je %i.%i.%i a poslední verze je %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Poměr sdílení"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Poslední verze jsou vždy k nalezení na http://www.amule.org/"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Obdržené části"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "VAROVÁNÍ: Vaše verze aMuled je zastaralá: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Kompletní zdroje"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Vaše verze aMule je aktuální."
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Cesta"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Selhalo stahování kontrolního souboru s verzí"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Sdílené soubory"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Uživatelů: %s | Souborů: %s"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Velmi nízká"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Uživatelů: E: %s K: %s | Souborů: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Nízká"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Nezvoleny žádné sítě"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normální"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "s LowID"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Vysoká"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "s HighID"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Velmi vysoká"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Připojen k %s %s"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Vydání"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Připojování k %s"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Auto"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Odpojen od eD2k"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Přidat komentář/hodnocení"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad spuštěn"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Upravit komentář/hodnocení"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad zastaven"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Přejmenovat"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Připojen ke Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr ""
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Připojen ke kad (za firewallem)"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Zkopírovat magnet URI do schránky"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Odpojen od Kad"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr ""
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr "Síť Kad nelze použít, když je v nastavení zakázán UDP port."
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr ""
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Síť Kad je zakázána v nastavení, nepřipojuji se."
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amuled.cpp:560
+#, fuzzy
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
 msgstr ""
+"CHYBA: démon aMule nelze použít, když jsou zakázaná externí připojení. Pro "
+"jejich povolení použijte buď normální aMule, nebo klíči "
+"\"AcceptExternalConnections\" v souboru ~/.aMule/amule.conf nastavte hodnotu "
+"1"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr ""
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: jdu do pozadí - měj se"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Uložit odezvu do schránky"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Nelze vytvořit soubor s PID"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
+#: src/amuled.cpp:711
 #, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "K vytvoření platného odkazu potřebujete HighID"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "VAROVÁNÍ"
+msgid "ERROR: %s"
+msgstr "CHYBA: %s"
 
-#: src/SharedFilesCtrl.cpp:451
+#: src/amuleDlg.cpp:238
 #, c-format
-msgid "Shared Files (%i)"
-msgstr "Sdílené soubory (%i)"
+msgid "This is aMule %s based on eMule."
+msgstr "Toto je aMule %s založená na eMule."
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[PartSoubor]"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Běží na %s"
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Zadejte nový název pro tento soubor:"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Navštivte http://www.amule.org/ pro kontrolu, jestli není dostupná nová "
+"verze."
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Přejmenování souboru"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "KRITICKÁ CHYBA: Vytváření časovače selhalo"
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Obnovuji odesílání souboru %s"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Vzdálené ovládání aMule"
 
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Zastavuji odesílání souboru %s"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Snapshot:"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
+"Multiplatformní p2p klient založený na eMule \n"
+"\n"
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: hledaný výraz je příliš krátký"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Web: http://www.amule.org\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, fuzzy, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Přečteno %u Kad kontaktů"
-msgstr[1] "Přečteno %u Kad kontaktů"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Fórum: http://forum.amule.org\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 msgstr ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 msgstr ""
+"Copyright (c) 2003-2011 Tým aMule \n"
+"\n"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Požadavek selhal kvůli následující chybě: %s."
-
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Požadavek selhal kvůli neznámé chybě."
-
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Index nenalezen: "
-
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Sezení vypršelo - vyžaduji přihlášení\n"
-
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Relace je v pořádku, přihlášen\n"
-
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Relace je v pořádku, nepřihlášen\n"
-
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Není otevřené žádné sezení - vyžaduji přihlášení\n"
-
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Relace zahájena - vyžadování přihlášení\n"
-
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Zpracování požadavku [původní]: "
-
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Kontrola hesla\n"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Část aMule je založena na \n"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Hash hesla je neplatný\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Heslo v pořádku\n"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Zpráva"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Špatné heslo\n"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "Dialog aMule zničen"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Nezadal(a) jste heslo. Prázdné heslo není povoleno.\n"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Připojuji"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Bylo vyžádáno odhlášení\n"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: připojuji"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Zpracování požadavku [přesměrovaný]:"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: odpojeno"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Načte šablonu <str>"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Za firewallem"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr ""
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Připojen"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr ""
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Připojuji"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP port"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: vypnut"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Použít gzip kompresi"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Zrušit"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr ""
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Zastaví aktuální pokusy o připojení"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr ""
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Odpojit"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Povolit přístup hostům"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Odpojit se od aktuálně připojených sítí"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Zakázat přístup hostům"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Připojit"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr ""
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Připojit se k povoleným sítím"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Cesta ke konfiguráku aMule. NEPOUŽÍVEJTE PŘÍMO!"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Od: %.1f(%.1f) | St: %.1f(%.1f)"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Zakázat PHP interpreter (zastaralé)"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Od: %.1f | St: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Překompilovat PHP stránky při každém požadavku"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | připojen)"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Webový server aMule"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | odpojen)"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Nedostupný"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Opravdu si přejete ukončit %s?"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Nikdy"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Potvrzení ukončení"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Stahuji..."
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Spustit příkaz: "
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- výchozí -"
 
-#: src/HTTPDownload.cpp:75
+#: src/amuleDlg.cpp:1232
 #, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+msgid "Skin directory '%s' does not exist"
+msgstr "Adresář se skiny '%s' neexistuje"
 
-#: src/HTTPDownload.cpp:239
+#: src/amuleDlg.cpp:1237
 #, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr ""
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Nastavení"
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "VAROVÁNÍ: Nelze otevřít soubor se vzhledem '%s' pro čtení"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Adresář obsahující soubor amulesig.dat"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Sítě"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Procházet"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Okno sítí"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Zadejte cestu k adresáři, ve kterém je soubor amulesig.dat"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Vyhledávání"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Interval pro obnovování v sekundách"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Vyhledávací okno"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Vygenerovat obrázek při každém obnovení"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Stahování"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Zadejte adresář, do kterého si přejete vygenerovat obrázek statistik"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Stahování"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Pravidelně nahrávat obrázek statistik na FTP server"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Sdílené soubory"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP url"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Okno se sdílenými soubory"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP cesta"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Zprávy"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Zadejte URL vašeho FTP serveru"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Okno zpráv"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
-"Zadejte sem adresář, do kterého se na FTP budou ukládat obrázky statistik"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistiky"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Uživatel"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Okno se statistikami"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Heslo"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Nastavení"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Zadejte sem uživatelské jméno pro přihlášení k vašemu FTP serveru"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Okno s nastavením"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Zadejte sem heslo pro přihlášení k vašemu FTP serveru"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Import"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Interval aktualizace FTP v minutách"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Nástroj pro import částečných souborů"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Zkontrolovat"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "O programu"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Adresář obsahující váš soubor s podpisem"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "O programu/Nápověda"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Adresář pro generování obrázků statistik"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Síť eD2k"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
-#, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i dní %i hodin %i min %i sek"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Síť Kad"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, online statistiky aMule"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Žádná síť"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Vítejte!"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "Vzdálené ovládání aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
 msgid "aMule"
 msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Maximální rychlost stahování během tohoto běhu wxCas"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Maximální rychlost stahování během všech běhů wxCas"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Kritická chyba: Selhalo vytváření časovače jádra"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Reset"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Systém"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Připojit se ke vzdálené amuli"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Přerušit automatické obnovování"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Kritická chyba: Selhalo vytváření časovače pro dotazování"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Zahajuji smyčku událostí..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Připojuji..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Uložit obrázek online statistik"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Připojení selhalo"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Vytisknout obrázek online statistik"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Nastavení"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Ukončuji"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "O wxCas"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Spustit automatické obnovování"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Spojení uzavřeno - aMule se pravděpodobně ukončila."
+
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Připraven"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Automatické obnovování zastaveno"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Vše"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Automatické obnovování spuštěno"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Uložit obrázek statistiky"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Neznámý"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Online statistiky aMule"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Nelze získat seznam sdílených souborů od uživatele '%s'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
-"Nastal problém při tisku.\n"
-"Možná vaše tiskárna není správně nastavena."
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Hledám kamaráda pro LowID připojení"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Tisknu"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (falešná eMule verze %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"wxCas, aMule online statistiky\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Založený na CAS od Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distribuovaný pod GPL licencí"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (falešná eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "aMule neběží..."
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (falešná eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule běží"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (založeno na eMule v.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule běží, ale je odpojená"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Přezdívka: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule se připojuje..."
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Vyžádáno: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Stav aMule je neznámý..."
+#: src/BaseClient.cpp:2031
+#, fuzzy, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statistika souboru pro toto sezení: Přijat %d z %d požadavku, %s přeneseno\n"
+msgstr[1] ""
+"Statistika souboru pro toto sezení: Přijato %d z %d požadavků, %s přeneseno\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule"
+#: src/BaseClient.cpp:2034
+#, fuzzy, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statistika souboru pro všechna sezení: Přijat %d z %d požadavku, %s "
+"přeneseno\n"
+msgstr[1] ""
+"Statistika souboru pro všechna sezení: Přijato %d z %d požadavků, %s "
+"přeneseno\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " běží už "
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Vyžádán neznámý soubor"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " je zastavená!"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Zpráva od '%s' filtrována (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " je nepřipojená!"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nová zpráva od '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " se připojuje..."
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr ""
+"Uživatel %s (%u) si vyžádal váš seznam sdílených souborů v adresáři %s -> "
+"zakázáno"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " je asi vypnutá, zkontrolujte to!"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "VAROVÁNÍ: %s nelze otevřít."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " je připojena k "
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr "VAROVÁNÍ: Soubor je porušen, obsahuje neplatnou hlavičku."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "I/O chyba při čtení souboru known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Došlo k chybě při ukládání souboru known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "za firewallem"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Vložte captchu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "vypnuto"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategorie"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr "běží"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nová kategorie"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-#, fuzzy
-msgid " with "
-msgstr "] s"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Zvolte adresář pro stažené soubory"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Celkem staženo:"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Musíte zadat název kategorie!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Odesláno:"
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Musíte zadat cestu pro kategorii!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
+"Nemohu vytvořit příchozí adresář pro kategorii. Zadejte prosím platnou cestu!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Stahování: "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, odesílání: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Připojen ke klientovi ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-#, fuzzy
-msgid " kB/s"
-msgstr "kB/s"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Připojuji se ke klientovi ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Sdílení:"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Připojování ke klientovi selhalo / připojení ztraceno ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " soubor(ů), klientů ve frontě: "
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Čas:"
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Chat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " na "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Zavřít tab"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Průměrná zátěž systému (1-5-15 minut): "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Zavřít všechny taby"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Běh systému: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Zavřít ostatní taby"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02umin %02us"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Přidat do přátel"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/ClientCreditsList.cpp:158
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
+#: src/ClientCreditsList.cpp:161
 #, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
-#, c-format
-msgid "%02us"
-msgstr "%02us"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Soubor 'cryptkey.dat' nenalezen, vytvářím."
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Podrobnosti klienta"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
 msgid "LowID"
 msgstr "LowID"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Nepřipojen"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Povoleno"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Podporováno"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Nepodporováno"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Zakázáno"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Připojen"
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-#, fuzzy
-msgid "Cancelled !"
-msgstr "Přerušeno!"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Odpojeno"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "Unable to open %s"
-msgstr "Nelze otevřít %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Vstupní parametry"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Soubor k hashování"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Nekompletní"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Přidat volitelné URL pro tento soubor"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Zloduch"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr ""
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Ověřeno - OK"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
-msgstr ""
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Nedostupný"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Přidat"
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "Uživatel %s (%u) si vyžádal váš seznam sdílených souborů -> přijato"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Odebrat"
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "Uživatel %s (%u) si vyžádal váš seznam sdílených souborů -> odmítnuto"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Vyčistit"
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "Uživatel %s (%u) si vyžádal váš seznam sdílených adresářů -> přijato"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Vytvořit odkaz s hashi částí"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "Uživatel %s (%u) si vyžádal váš seznam sdílených adresářů -> odmítnuto"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
-msgstr ""
-"Pomůže rozšířit nové a raritní soubory rychleji, za cenu zvýšené velikosti "
-"odkazu"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4 hash souboru"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
+"Uživatel %s (%u) si vyžádal váš seznam sdílených souborů v adresáři %s -> "
+"přijato"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Spustit"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Uložit"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Zkopírovat do schránky"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Ukončit"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-#, fuzzy
-msgid "Open"
-msgstr "Opera"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
+"Uživatel %s (%u) si vyžádal váš seznam sdílených souborů v adresáři %s -> "
+"zakázáno"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopírovat"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Uživatel %s (%u) sdílí adresář %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-#, fuzzy
-msgid "Save as"
-msgstr "Uložit"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
+"Uživatel %s (%u) si vyžádal váš seznam sdílených souborů v adresáři %s -> "
+"zakázáno"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "O programu"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "O aLinkCreatoru"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-#, fuzzy
-msgid "Can't open the clipboard"
-msgstr "Zkopírovat do schránky"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Zatím není co zkopírovat!"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Nelze otevřít"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Zadejte prosím (neprázdný) název souboru"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Zatím není co ukládat!"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Hashování..."
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr ""
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Komentáře k souboru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr ""
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Jméno"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr ""
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Název souboru"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Hotovo za %.2f s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Hodnocení"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Tato URL je již přidána!"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Komentář"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Zadejte prosím neprázdnou URL"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Žádné komentáře"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Zpracovávám soubor č. %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Vyžádal jste si částečné hashe (používá se pouze pro soubory > 9,5 MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Neexistující soubor !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
 #: src/DataToText.cpp:37
@@ -1314,31 +1130,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Vy]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Připojuji"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Velmi nízká"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Nízká"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normální"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Vysoká"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Velmi vysoká"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Vydání"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Vyžaduji"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Připojuji se přes server"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Plná fronta"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "Ve frontě"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Přenáším"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Stahuji"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1364,8 +1206,7 @@
 msgid "Too many Kad connections"
 msgstr "Příliš Kad připojení"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Zabanován"
 
@@ -1397,8 +1238,8 @@
 msgid "Remote Server"
 msgstr "Vzdálený server"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1419,12 +1260,11 @@
 msgstr ""
 
 #: src/DataToText.cpp:135
-#, fuzzy
 msgid "Search Result"
-msgstr "Vyhledávání"
+msgstr "Výsledek hledání"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Dokončeno"
 
@@ -1434,7 +1274,7 @@
 
 #: src/DataToText.cpp:147
 msgid "ERROR: Out of diskspace"
-msgstr ""
+msgstr "CHYBA: Došlo místo na disku"
 
 #: src/DataToText.cpp:148
 msgid "ERROR: Partmet not found"
@@ -1442,13 +1282,13 @@
 
 #: src/DataToText.cpp:149
 msgid "ERROR: IO error!"
-msgstr ""
+msgstr "CHYBA: I/O chyba!"
 
 #: src/DataToText.cpp:150
 msgid "ERROR: Failed!"
-msgstr ""
+msgstr "CHYBA: Selhání!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "Ve frontě"
 
@@ -1460,3061 +1300,1360 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Neznámý nebo špatný formát dočasného souboru."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Výchozí pro systém"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Část"
 
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr ""
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabský"
-
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "Estonština"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Baskičtina"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulharský"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Katalánština"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Čínština (zjednodušená)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Čínština (tradiční)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Chorvatština"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr ""
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Dánština"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Nizozemština"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Angličtina (britská)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estonština"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finština"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Velikost"
 
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Francouzština"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Přeneseno"
 
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galicijština"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Rychlost"
 
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Němčina"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Průběh"
 
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr ""
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Zdroje"
 
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr ""
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Priorita"
 
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Maďarština"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Stav"
 
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italština"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Zbývající čas"
 
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italština (švýcarská)"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Naposledy spatřen kompletní"
 
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr ""
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Poslední příjem"
 
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Korejština"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Opravdu si přejete smazat vybraný soubor?"
 
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Opravdu si přejete smazat vybrané soubory?"
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
+"Odezva od: %s (%s)\n"
+"\n"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polština"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugalština"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Zastavit"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugalština (brazilská)"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pozastavit"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Ruština"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Obnovit"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Slovinština"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "V&yčistit dokončené"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Španělština"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Přesunout A4AF zdroje k tomuto souboru"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr ""
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Přesunout A4AF zdroje k tomuto souboru (automaticky)"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turečtina"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Přesunout A4AF zdroje k jinému souboru"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Rozšířené nastavení"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Nemohu rozpoznat vybraný prohlížeč!"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Náhled"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr "TCP port nemůže být vyšší než 65532, protože UDP port je TCP+3"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Zobrazit &podrobnosti souboru"
 
-#: src/Preferences.cpp:1681
-#, c-format
-msgid "Default port will be used (%d)"
-msgstr "Bude použit výchozí port (%d)"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Zobrazit všechny komentáře"
 
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Název serveru"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Zkopírovat magnet URI do schránky"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adresa"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Zkopírovat eD2k &odkaz do schránky"
 
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Uložit odezvu do schránky"
 
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Popis"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "zrušit přiřazení"
 
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Zařadit do kategorie"
 
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Uživatelé"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Otevřít tento soubor"
 
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Soubory"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Zadejte nový název pro tento soubor:"
 
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Selhal"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Přejmenování souboru"
 
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Pevný"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Verze"
+#: src/DownloadListCtrl.cpp:1268
+#, c-format
+msgid "Downloads (%i)"
+msgstr "Stahování (%i)"
 
-#: src/ServerListCtrl.cpp:144
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-"Jste připojen(a) na server, který se pokoušíte smazat. Nejprve se prosím "
-"odpojte. Server NEbyl smazán."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(neznámý název)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Opravdu si přejete smazat stálý server %s?"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Ano"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Ne"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Náhled souboru"
 
-#: src/ServerListCtrl.cpp:346
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "Failed to open '%s'"
-msgstr "Nemohu otevřít '%s'"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "CHYBA: Nezdařilo se spustit externí přehrávač! Příkaz: `%s'"
 
-#: src/ServerListCtrl.cpp:369
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "Servers (%i)"
-msgstr "Servery (%i)"
-
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Server"
-
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Připojit k serveru"
-
-#: src/ServerListCtrl.cpp:428
-#, fuzzy
-msgid "Mark server as static"
-msgstr "Označit server(y) jako stálé"
-
-#: src/ServerListCtrl.cpp:429
-#, fuzzy
-msgid "Mark server as non-static"
-msgstr "Označit server(y) jako nestálé"
-
-#: src/ServerListCtrl.cpp:431
-#, fuzzy
-msgid "Mark servers as static"
-msgstr "Označit server(y) jako stálé"
-
-#: src/ServerListCtrl.cpp:432
-#, fuzzy
-msgid "Mark servers as non-static"
-msgstr "Označit server(y) jako nestálé"
-
-#: src/ServerListCtrl.cpp:438
-#, fuzzy
-msgid "Remove server"
-msgstr "Odstranit server(y)"
-
-#: src/ServerListCtrl.cpp:440
-#, fuzzy
-msgid "Remove servers"
-msgstr "Odstranit server(y)"
-
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Odstranit všechny servery"
-
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
+msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Znovu připojit k serveru"
-
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Opravdu si přejete smazat všechny servery?"
-
-#: src/ServerListCtrl.cpp:570
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Opravdu si přejete smazat vybrané servery?"
-
-#: src/ServerListCtrl.cpp:572
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Opravdu si přejete smazat vybrané servery?"
-
-#: src/OScopeCtrl.cpp:242
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Disabled [%s]"
-msgstr "Zakázaný [%s]"
+msgid "Loading temp files from %s."
+msgstr "Načítám dočasné soubory z %s"
 
-#: src/amuleDlg.cpp:210
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Toto je aMule %s založená na eMule."
-
-#: src/amuleDlg.cpp:212
-#, c-format
-msgid "Running on %s"
-msgstr "Běží na %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Navštivte http://www.amule.org/ pro kontrolu, jestli není dostupná nová "
-"verze."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr ""
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Vzdálené ovládání aMule"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Snapshot:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr ""
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr ""
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
+msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadQueue.cpp:154
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-msgstr ""
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr ""
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr ""
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Nenalezeny žádné částečné soubory"
 
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Zpráva"
+#: src/DownloadQueue.cpp:168
+#, c-format
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/amuleDlg.cpp:692
-#, fuzzy
-msgid "Kad: Firewalled"
-msgstr "Za firewallem"
-
-#: src/amuleDlg.cpp:696
-#, fuzzy
-msgid "Kad: Connected"
-msgstr "Připojen"
-
-#: src/amuleDlg.cpp:701
-#, fuzzy
-msgid "Kad: Connecting"
-msgstr "Připojuji"
-
-#: src/amuleDlg.cpp:705
-#, fuzzy
-msgid "Kad: Off"
-msgstr " Kad: "
-
-#: src/amuleDlg.cpp:752
-#, fuzzy
-msgid "Stop the current connection attempts"
-msgstr "Zastaví nynější pokusy o připojení"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Odpojit"
-
-#: src/amuleDlg.cpp:758
-#, fuzzy
-msgid "Disconnect from the currently connected networks"
-msgstr "Odpojit se od sítě."
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Připojit"
-
-#: src/amuleDlg.cpp:764
-#, fuzzy
-msgid "Connect to the currently enabled networks"
-msgstr "Připojit se k síti."
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Od: %.1f(%.1f) | St: %.1f(%.1f)"
-
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Od: %.1f | St: %.1f"
-
-#: src/amuleDlg.cpp:834
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | připojen)"
-
-#: src/amuleDlg.cpp:836
-#, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | odpojen)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Opravdu si přejete ukončit aMule?"
-
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Potvrzení ukončení"
+msgid "Downloading %s"
+msgstr "Stahování %s"
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Adresář se skiny '%s' neexistuje"
+msgid "You are already trying to download the file '%s'"
+msgstr "Soubor '%s' se již pokoušíte stáhnout"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr ""
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Sítě"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Vyhledávání"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Přenosy"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Zprávy"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistiky"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Import"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Nástroj pro import částečných souborů"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "O programu/Nápověda"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr ""
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr ""
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Hlavní"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Připojení"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Adresáře"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Servery"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Bezpečnost"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-#, fuzzy
-msgid "Filters"
-msgstr "Filtr:"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Vzdálené ovládání"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Online podpis"
-
-#: src/PrefsUnifiedDlg.cpp:180
-#, fuzzy
-msgid "Advanced"
-msgstr "Pokročilá nastavení"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Události"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Debugování"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Uživatelem definované"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"Restartujte aMule, aby se projevily následující změny:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP port změněn.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP port změněn.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Jazyk byl změněn.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Dočasný adresář byl změněn.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-#, fuzzy
-msgid "- ED2K network enabled.\n"
-msgstr "Všechny sítě jsou zakázány."
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Up: 0.0 | Down: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad se nespustí, když máte zakázaný UDP port.\n"
-"Povolte UDP port, nebo zakažte připojování na Kad."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"Nyní MUSÍTE restartovat aMule.\n"
-"Pokud to neuděláte, tak si pak nestěžujte, když se přihodí něco špatného.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Dočasné soubory"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Příchozí soubory"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Online podpisy"
+msgid "You already have the file '%s'"
+msgstr "Soubor '%s' již máte"
 
-#: src/PrefsUnifiedDlg.cpp:920
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "Choose a folder for %s"
-msgstr "Zvolte adresář pro %s"
-
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Zvolit přehrávač videa"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Výběr prohlížeče"
+msgid "You are already trying to download the file %s"
+msgstr "Soubor %s se již pokoušíte stáhnout"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Executable%s"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
-"Sem přidejte URL pro stažení server.met souborů.\n"
-"Pouze jedno URL na každý řádek."
-
-#: src/PrefsUnifiedDlg.cpp:1031
-#, fuzzy, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Prodleva aktualizace: %d sekund"
-msgstr[1] "Prodleva aktualizace: %d sekund"
-
-#: src/PrefsUnifiedDlg.cpp:1038
-#, fuzzy, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Čas pro průměrný graf: %d minut"
-msgstr[1] "Čas pro průměrný graf: %d minut"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Connections Graph Scale: %d"
+msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1050
-#, fuzzy, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Prodleva aktualizace: %d sekund"
-msgstr[1] "Prodleva aktualizace: %d sekund"
-
-#: src/PrefsUnifiedDlg.cpp:1056
-#, fuzzy, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Velikost zásobníku pro soubory: %d bajtů"
-msgstr[1] "Velikost zásobníku pro soubory: %d bajtů"
-
-#: src/PrefsUnifiedDlg.cpp:1062
-#, fuzzy, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Velikost fronty pro odesílání: %d klientů"
-msgstr[1] "Velikost fronty pro odesílání: %d klientů"
-
-#: src/PrefsUnifiedDlg.cpp:1069
-#, fuzzy, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Interval pro obnovení připojení k serveru: %d minut"
-msgstr[1] "Interval pro obnovení připojení k serveru: %d minut"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Interval pro obnovení připojení k serveru: Zakázáno"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-#, fuzzy
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "UDP port pro rozšířené požadavky serveru (TCP+3): 4665"
-
-#: src/PrefsUnifiedDlg.cpp:1118
-#, fuzzy
-msgid "disabled"
-msgstr "zakázat"
-
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Spustí příkaz při událost `%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Povolit jaderné příkazy"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Příkaz jádra:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Povolit GUI příkazy"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Příkaz GUI:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Následující proměnné budou nahrazeny:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Neplatný eD2k odkaz! CHYBA: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Neautorizovaný přístup. Připojení uzavřeno."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "Klient odeslal paket poté, co selhala autentizace."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Externí připojení uzavřeno."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Externí připojení jsou zakázány kvůli prázdnému heslu!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Externí připojení jsou zakázány v konfiguračním souboru"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Nové externí připojení přijato"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Externí připojení odmítnuto kvůli prázdnému heslu v nastavení!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Připojuji klienta: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Neznámá verze"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
 msgstr ""
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Autentizace selhala."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Neplatná verze protokolu."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr ""
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
-msgstr "Neplatný požadavek, nejdřív se autentizujte."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Autentizace selhala: nesprávné heslo."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Autentizace selhala: chybějící heslo."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
+msgstr "Neplatný požadavek, nejdřív se prosím autentizujte."
+
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Přistup povolen."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Odeslána chybová hláška \"%s\" pro klienta."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Neautorizovaný pokus o přístup z %s. Připojení uzavřeno."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:566
-#, fuzzy, c-format
+#: src/ExternalConn.cpp:801
+#, c-format
 msgid "FileHash not found: %s"
 msgstr "FileHash nenalezen: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Server nepřidán"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "server nenalezen: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr ""
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
-msgstr ""
+msgstr "eD2k je zakázané v nastavení."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr ""
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad je zakázaný v nastavení."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Žádné údaje pro graf."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Vás klient není nakonfigurován pro tuto úroveň detailů."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Již se ukončuji."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Neplatný odkaz, nebo je již v seznamu."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Soubor nenalezen."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Neplatný název souboru."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Nelze přejmenovat soubor."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad je zakázaný v nastavení."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
-msgstr ""
+msgstr "Již připojen k eD2k."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
-msgstr ""
+msgstr "Připojuji se k eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Již jste připojen k síti Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Připojuji se k síti Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Všechny sítě jsou zakázány."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
-msgstr ""
+msgstr "Odpojen od eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Odpojen od Kademlia."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr ""
 
-#: src/UploadClient.cpp:273
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr ""
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Neznámé rozšíření '%s' pro příkaz '%s'.\n"
 
-#: src/TerminationProcess.cpp:48
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr ""
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr ""
+msgid "Unknown command '%s'.\n"
+msgstr "Neznámý příkaz '%s'.\n"
 
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
+"\n"
+"Tento příkaz nesmí dostat argument.\n"
 
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
+"\n"
+"Tento příkaz musí dostat argument.\n"
 
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Připojen"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Port"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Stav Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Běží"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Stav:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Odpojeno"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Stav připojení:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Za firewallem"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "Budiž"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Stav firewallu: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Připojen ke kamarádovi"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Žádný kamarád"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
 msgstr ""
+"\n"
+"Dostupná rozšíření:\n"
 
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Neběží"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Uptime: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Přenos"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Odesílání"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Odeslaná data (sezení (celkem)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Celková režie (pakety): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr ""
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Dostupné příkazy:\n"
 
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Source Exchange Overhead (Packets): %s"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Režie serveru (pakety): %s"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Ukončí aplikaci."
 
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Režie Kadu (pakety): %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Zobrazit nápovědu."
 
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Aktivní odesílání: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Čekající odesílání: %s"
-
-#: src/Statistics.cpp:664
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Total successful upload sessions: %s"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
 
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr ""
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Chyba syntaxe!"
 
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
+"Chyba při zpracování příkazu - to by se nikdy nemělo stát! Prosím, nahlašte "
+"chybu\n"
 
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Stahování"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Tento příkaz by neměl mít parametry."
 
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Stažená data (sezení (celkem)): %s"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Tento příkaz musí mít parametr."
 
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Nalezené zdroje: %s"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Neplatný argument."
 
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Aktivní stahování (části): %s"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Toto je nekompletní příkaz."
 
-#: src/Statistics.cpp:686
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "UL:DL poměr sezení (celkem): %s"
+msgid "Type '%s' to get more help.\n"
+msgstr "Pro nápovědu spusťte '%s'.\n"
 
-#: src/Statistics.cpp:689
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "Average download rate (Session): %s"
-msgstr ""
+msgid "This is %s %s %s\n"
+msgstr "Tohle je %s %s %s\n"
 
-#: src/Statistics.cpp:690
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "Average upload rate (Session): %s"
-msgstr ""
+msgid "This is %s %s\n"
+msgstr "Tohle je %s %s\n"
 
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
+"\n"
+"Vytvářím klienta...\n"
 
-#: src/Statistics.cpp:692
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Max upload rate (Session): %s"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
+"\n"
+"OK, opouštím %s...\n"
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Znovupřipojení: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Doba od prvního přenosu: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Připojen k serveru od: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Aktivních připojení (odhad): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Limit připojení dosažen: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Průměrný počet připojení (odhad): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
 
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Klienti"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrování"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Celkem: %i Známých: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Fungující servery: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Nefungující servery: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Celkem: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Smazané servery: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Filtrované servery: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Uživatelů na fungujících serverech: %llu"
-
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Souborů na fungujících serverech: %llu"
-
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Celkem uživatelů: %llu"
-
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "Celkem souborů: %llu"
-
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Zaplnění serveru: %.2f%%"
-
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Počet sdílených souborů: %s"
-
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Celková velikost sdílených souborů: %s"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Zobrazí tuto nápovědu."
 
-#: src/Statistics.cpp:731
-#, c-format
-msgid "Average file size: %s"
-msgstr ""
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Hostitel, kde běží aMule. (výchozí: localhost)"
 
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Operační systém"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Port aMule pro externí připojení. (výchozí: 4712)"
 
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Neobdrženo"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Heslo pro externí připojení."
 
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Vyjmout"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Načíst konfiguraci ze souboru."
 
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Vložit"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Nevypisovat nic na stdout."
 
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Označit vše"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Buď upovídaný - ukaž také debugovací hlášky"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Nemohu vyhledávat přes Kad, když není spuštěn"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Nastaví locale programu (jazyk)."
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
 msgstr ""
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Neočekávaná chyba během vyhledávání v síti Kad: "
-
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Zpráva od '%s' filtrována (IP:%s)"
-
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nová zpráva od '%s' (IP:%s)"
-
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "Uživatel %s (%u) si vyžádal váš seznam sdílených souborů -> přijato"
-
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "Uživatel %s (%u) si vyžádal váš seznam sdílených souborů -> odmítnuto"
-
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "Uživatel %s (%u) si vyžádal váš seznam sdílených adresářů -> přijato"
-
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "Uživatel %s (%u) si vyžádal váš seznam sdílených adresářů -> odmítnuto"
-
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
 msgstr ""
-"Uživatel %s (%u) si vyžádal váš seznam sdílených souborů v adresáři %s -> "
-"přijato"
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"Uživatel %s (%u) si vyžádal váš seznam sdílených souborů v adresáři %s -> "
-"zakázáno"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Vypíše verzi programu."
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Uživatel %s (%u) sdílí adresář %s"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Podrobnosti souboru"
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr ""
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% dokončeno"
 
-#: src/ClientTCPSocket.cpp:1025
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr ""
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Uzly (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Neplatná IP pro bootstrap"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Neplatný port pro bootstrap"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Prosím vyplňte všechna potřebná pole"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Opravdu chcete stáhnout nový soubor nodes.dat?\n"
-
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
-msgstr "Odstraní se tak současné uzly a restartuje se připojení ke Kademlia."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Pokračovat?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr ""
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Kamarádi"
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr ""
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Zobrazit &podrobnosti"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
 msgstr "Přidat kamaráda"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Musíte zadat platnou IP adresu a port!"
-
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informace"
-
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr ""
-
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Zdroje"
-
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Soubor"
-
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Stahování"
-
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategorie"
-
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Hlavní"
-
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr ""
-
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr ""
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Odstranit kamaráda"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr ""
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Poslat &zprávu"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Připojit se ke vzdálené amuli"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Zobrazit soubory"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Připojení selhalo"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Založit kamarádský slot"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr ""
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Opravdu si přejete odstranit vybraného kamaráda?"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, fuzzy, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Připojení selhalo. Nemohu se připojit k zadanému hostiteli\n"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Opravdu si přejete odstranit vybrané kamarády?"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
 msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
-msgstr ""
-
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Uživ.: E: %s K: %s | Soub. E: %s K: %s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Vše"
-
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Celkem uživ.: %s | Celkem soub.: %s"
-
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Přeneseno"
-
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Rychlost"
-
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Průběh"
-
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Stav"
-
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Zbývající čas"
-
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Naposledy spatřen kompletní"
-
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
+"Nemůžete založit více než jeden kamarádský slot.\n"
+" Byl přidělen pouze jeden slot."
 
-#: src/DownloadListCtrl.cpp:581
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Opravdu si přejete smazat vybrané soubory?"
-
-#: src/DownloadListCtrl.cpp:583
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Opravdu si přejete smazat vybrané soubory?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Vícenásobný výběr"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Poslat zprávu uživateli"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Zpráva k odeslání:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Zastavit"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pozastavit"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Obnovit"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "V&yčistit dokončené"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Přesunout A4AF zdroje k tomuto souboru"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Přesunout A4AF zdroje k tomuto souboru (automaticky)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Přesunout A4AF zdroje k jinému souboru"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Rozšířené nastavení"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Náhled"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Zobrazit &podrobnosti souboru"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Zobrazit všechny komentáře"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Zkopírovat magnet URI do schránky"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "zrušit přiřazení"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Zařadit do kategorie"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Otevřít tento soubor"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Odstranit z přátel"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Přidat do přátel"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Poslat zprávu"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Vyžádán jiný soubor"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Stahování (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Čekání na odesílací slot"
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Náhled souboru"
-
-#: src/DownloadListCtrl.cpp:2320
+#: src/GenericClientListCtrl.cpp:1026
 #, fuzzy, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "CHYBA: Nezdařilo se spustit externí přehrávač!"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "CHYBA: Částečný soubor nelze vytvořit)"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Zkouší se načíst záloha .met souboru z %s"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr ""
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr ""
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr ""
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Zkouším obnovit info o souboru..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "Obnovuje se soubor bez názvu - bude obnoven s názvem RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Všechny dostupné informace o souboru obnoveny :D - Zkouším je použít..."
+msgid "On Queue: %u"
+msgstr "Ve frontě"
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Nelze obnovit info o souboru :("
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Odesílám"
+
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Nic"
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Nelze otevřít %s (%s)"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Ne"
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr ""
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Ano"
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "CHYBA během ukládání částečného souboru: %s (%s ==> %s)"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Stahuji..."
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr ""
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "HTTP stahování zrušeno"
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' má nulovou velikost - používám soubor %s."
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "Nemohu otevřít soubor se skinem %s pro čtení"
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Selhalo ukládání souboru part.met.seeds pro %s"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "URL pro stahování nesmí být prázdné"
 
-#: src/PartFile.cpp:1024
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "URL %s vrátilo: %i - Chyba (%i)!"
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr ""
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Kritická chyba během zápisu staženého souboru"
 
-#: src/PartFile.cpp:1062
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr ""
+msgid "Downloaded %d bytes"
+msgstr "Staženo %d bytů"
 
-#: src/PartFile.cpp:1118
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr ""
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Očekáváno %d bytů, ale staženo %d bytů"
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Dokončeno přehashování %s"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "Nelze se připojit k HTTP serveru"
 
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr ""
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Neplatná odpověď od HTTP serveru"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Dokončené stahování: %s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Mazání souboru: %s"
-
-#: src/PartFile.cpp:2384
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
 
-#: src/PartFile.cpp:3086
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "VAROVÁNÍ: Nedostatek volného místa na disku! Pozastavuji soubor: %s"
+msgid "Failed to remove %s file, aborting update."
+msgstr "Přejmenování souboru %s selhalo, přerušuji aktualizaci."
 
-#: src/PartFile.cpp:3171
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Stažená část %i souboru '%s' je poškozená."
+msgid "Failed to rename %s file, aborting update."
+msgstr "Přejmenování souboru %s selhalo, přerušuji aktualizaci."
 
-#: src/PartFile.cpp:3214
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr ""
+msgid "Successfully updated %s"
+msgstr "Úspěšně aktualizováno: %s"
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr ""
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr ""
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Zastaveno"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Selhala aktualizace GeoIP.dat"
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr ""
-
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr ""
+msgid "Failed to download %s from %s"
+msgstr "Stahování %s z %s selhalo"
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr ""
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Stahování seznamu serverů z %s selhalo"
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr ""
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Načítám IP filtry 'ipfilter.dat' a 'ipfilter_static.dat'."
 
-#: src/KnownFileList.cpp:112
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "I/O chyba při čtení souboru known.met: %s"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "Nemohu načíst ipfilter.dat (%s), neznámý formát."
 
-#: src/KnownFileList.cpp:158
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Došlo k chybě při ukládání souboru known.met: %s"
-
-#: src/SharedFileList.cpp:352
-#, fuzzy, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Nalezeno %i známých sdílených souborů"
-msgstr[1] "Nalezeno %i známých sdílených souborů"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "Nemohu načíst ipfilter.dat (%s), soubor nelze otevřít."
 
-#: src/SharedFileList.cpp:358
+#: src/IPFilter.cpp:329
 #, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Nalezeno %i známých a %i neznámých sdílených souborů"
-msgstr[1] "Nalezeno %i známých a %i neznámých sdílených souborů"
-
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr ""
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Komentáře k souboru"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Hodnocení"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Komentář"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Žádné komentáře"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Načteno %u IP rozsahů z '%s'. %u vadných řádků bylo vyřazeno."
+msgstr[1] "Načteno %u IP rozsahů z '%s'. %u vadných řádků bylo vyřazeno."
 
-#: src/CommentDialogLst.cpp:104
+#: src/IPFilter.cpp:331
 #, fuzzy, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%s komentář(ů)"
-msgstr[1] "%s komentář(ů)"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Selhalo připojení ke všem vybraným serverům. Zkouším to znovu bez obfuskace."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Selhalo připojení ke všem vybraným serverům. Zkouším znovu."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr ""
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr ""
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Připojen k %s (%s:%i)"
-
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Připojení vytvořeno k %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr ""
-"Kritická chyba během pokusu o připojení. Možná je vypnuté/nefunkční "
-"připojení k Internetu"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Ztracené připojení k %s (%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) se zdá být mrtvý."
-
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) se zdá být plný."
-
-#: src/ServerConnect.cpp:381
-#, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Připojení ztraceno."
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "Načteno %u IP rozsahů z '%s'. %u vadných řádků bylo vyřazeno."
+msgstr[1] "Načteno %u IP rozsahů z '%s'. %u vadných řádků bylo vyřazeno."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Připojování k %s (%s:%i) selhalo."
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Pokusu o připojení k %s (%s:%i) vypršel čas."
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "IP filtr je připraven"
 
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Nenalezeny žádné částečné soubory"
-
-#: src/DownloadQueue.cpp:171
-#, fuzzy, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Nalezeno %u častečných souborů"
-msgstr[1] "Nalezeno %u častečných souborů"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+"Bootstrap from \n"
+"known clients"
 msgstr ""
+"Bootstrap od \n"
+"známých klientů"
 
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Stahování %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Soubor '%s' se již pokoušíte stáhnout"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Soubor '%s' již máte"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Soubor %s se již pokoušíte stáhnout"
-
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
+msgid "Nodes (%u)"
+msgstr "Uzly (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr ""
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Neplatná IP pro bootstrap"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr ""
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Neplatný port pro bootstrap"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Spustí <str> a ukončí se."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Prosím vyplňte všechna potřebná pole"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Neplatný formát IP adresy. Použijte xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Opravdu chcete stáhnout nový soubor nodes.dat?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-
-#: src/TextClient.cpp:347
-#, fuzzy
-msgid "Processing by hash: "
-msgstr "Zpracovávám soubor č. %u: %s"
-
-#: src/TextClient.cpp:362
-#, fuzzy
-msgid "Processing by filename: "
-msgstr "Zpracovávám soubor č. %u: %s"
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr ""
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Neplatné číslo\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr ""
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Operace byla úspěšná."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr ""
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr ""
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "vypnuto"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "zapnuto"
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr "Odstraní se tak současné uzly a restartuje se připojení ke Kademlia."
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr ""
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Pokračovat?"
 
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr ""
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: hledaný výraz je příliš krátký"
 
-#: src/TextClient.cpp:671
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgid "Keyword for search: %s"
 msgstr ""
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "Připojen k %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "s LowID"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "s HighID"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Připojování"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Nepřipojen"
-
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Stahování:\t%s"
-
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"Odesílání:\t%s"
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Klientů ve frontě:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
+#, fuzzy, c-format
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Přečteno %u Kad kontaktů"
+msgstr[1] "Přečteno %u Kad kontaktů"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Celkem zdrojů:\t%d\n"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Počet výsledků vyhledávání: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - zobrazit průběh vyhledávání"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Obdržena neznámá odpověď od serveru, kód operace = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr ""
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr ""
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Zobrazit celý strom statistik."
-
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr ""
-
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr ""
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr ""
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr ""
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Připojit se k síti."
-
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr ""
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Připojit se pouze ke Kademlia."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Odpojit se od sítě."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr ""
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr ""
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Odpojit se pouze od Kademlia."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr ""
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
-msgstr ""
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr ""
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr ""
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Povolit klientům i serverům filtrování IP."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Zakázat klientům i serverům filtrování IP."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Povolit/zakázat klientům filtrování IP."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Povolit klientům filtrování IP."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Zakázat klientům filtrování IP."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Povolit/zakázat klientům filtrování IP."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Název souboru"
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Povolit serverům filtrování IP."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Velikost souboru"
 
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Zakázat serverům filtrování IP."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Poměr sdílení"
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Zvolte úroveň filtrování IP."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Odesláno"
 
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
-msgstr ""
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Vyžádáno"
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Nastavit limity šířky pásma."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Přijato"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr ""
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Kompletní zdroje"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr ""
-
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr ""
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Neznámá verze"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr ""
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Nemohu otevřít soubor se skinem %s pro čtení"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Hashuji"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Dokončování"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Dokončeno"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Provede vyhledávání."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Pozastaveno"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Poškozený"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Spustí globální vyhledávání"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Čekám"
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Spustí lokální vyhledávání"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Musíte zadat (neprázdné) heslo."
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Spustí vyhledávání v síti Kad"
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Neplatné heslo, není MD5 hash!"
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Zobrazí výsledky posledního vyhledávání."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Chyba při připojování"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr ""
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "Špatná odpověď od serveru. Spojení uzavřeno."
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr ""
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Připojení k aMule uspělo"
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr ""
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Připojení uspělo."
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Pozastavit stahování."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "Heslo pro externí připojení."
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Pokračovat ve stahování."
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "Naslouchací socket: Ok."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Zrušit stahování."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "CHYBA: Nemohu naslouchat na TCP portu"
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Nastaví prioritu stahování."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "CHYBA: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr ""
-"Nastavte prioritu stahovaného souboru na nízkou, normální, vysokou, nebo "
-"automatickou.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "VAROVÁNÍ: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr ""
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Zavřít"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr ""
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Vyjmout"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr ""
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Kopírovat"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr ""
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Vložit"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr ""
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Vyprázdnit"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Označit vše"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Zobrazit frontu odesílání."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Zobrazit frontu stahování."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Neomezený"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Zobrazit log."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Tray menu aMule"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Zobrazit seznam serverů."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Rychlostní limity:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Vyčistit log."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "UL: žádný"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr ""
+msgid "UL: %u"
+msgstr "UL: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DL: žádný"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr ""
+msgid "DL: %u"
+msgstr "DL: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr ""
+msgid "Download speed: %.1f"
+msgstr "Rychlost stahování: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Nové ID klienta je %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr ""
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr ""
-"\tPravděpodobně je to způsobeno tím, že jste za firewallem či routerem."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tPro více informací prosím běžte na http://wiki.amule.org/"
-
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr ""
-
-#: src/ServerSocket.cpp:539
-#, fuzzy, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Získáno %d nových serverů"
-msgstr[1] "Získáno %d nových serverů"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Uložení seznamu serverů dokončeno."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Server odmítl poslední příkaz"
+msgid "Upload speed: %.1f"
+msgstr "Rychlost odesílání: %.1f"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Chybný paket obdržen od serveru: %s"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Informace o klientu"
 
-#: src/ServerSocket.cpp:607
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Došlo k neznámé chybě při zpracovávání paketu od serveru: %s"
+msgid "Nickname: %s"
+msgstr "Přezdívka: %s"
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr ""
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Nezvolena žádná přezdívka!"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "IP serveru %s (%s) je filtrována. Nepřipojuji se."
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID klienta: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "používám zatemňování protokolu (obfuscation)."
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Nepřipojen"
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Připojování k %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Název serveru: "
 
-#: src/ServerSocket.cpp:760
-#, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr ""
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP serveru: "
 
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr ""
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Nepřipojen"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr "Opravdu si přejete zrušit a smazat všechny soubory v této kategorii?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Potvrzení je nutné"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Vše ostatní"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Nekompletní"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Aktivní"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Video"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Audio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Archív"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Obrazy CD"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Obrázky"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Text"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr ""
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Přidat kategorii"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Upravit kategorii"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Odstranit kategorii"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Název souboru"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr ""
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr ""
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr ""
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr ""
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr ""
+#: src/MuleTrayIcon.cpp:374
+#, c-format
+msgid "TCP port: %d"
+msgstr "TCP port: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr ""
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP port: nepřipraven"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Importování %s: %s"
+msgid "UDP port: %d"
+msgstr "UDP port: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Čtení dočasného adresáře"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UDP port: nepřipraven"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr ""
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Online podpis: Povolen"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Vytvářím cílový soubor"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Online podpis: Zakázán"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr ""
+msgid "Uptime: %s"
+msgstr "Uptime: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr ""
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr ""
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Přidávám do stahování a ukládám nový částečný soubor"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Import částečných souborů"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Stav"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Hash souboru"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Čekání..."
+msgid "Shared files: %d"
+msgstr "Sdílené soubory: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (disk: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Prosím zvolte adresář pro vyhledávání dočasných souborů! (budou zahrnuty i "
-"podadresáře)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "Přejete si smazat zdrojové soubory úspěšný importovaných stahování?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Odstranit zdroje?"
-
-#: src/OtherFunctions.cpp:112
-#, fuzzy
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "bytů"
-msgstr[1] "bytů"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-#, fuzzy
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "bytů/sek."
-msgstr[1] "bytů/sek."
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "sek."
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "min."
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "hod."
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "dní"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Videa"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Archívy"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Texty"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programy"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Cokoliv"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Nehodnocené"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Neplatný / porušený / podvod"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Špatný"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "V pořádku"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Dobrý"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Výborný"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "vše"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "vše ostatní"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Načítám IP filtry 'ipfilter.dat' a 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Klienti ve frontě: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Nemohu načíst ipfilter.dat (%s), neznámý formát."
+msgid "Total DL: %s"
+msgstr "Celkem DL: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "Nemohu načíst ipfilter.dat (%s), soubor nelze otevřít."
+msgid "Total UL: %s"
+msgstr "Celkem UL: %s"
 
-#: src/IPFilter.cpp:331
-#, fuzzy, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Načteno %u IP rozsahů z '%s'. %u vadných řádků bylo vyřazeno."
-msgstr[1] "Načteno %u IP rozsahů z '%s'. %u vadných řádků bylo vyřazeno."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Limit odesílání"
 
-#: src/IPFilter.cpp:333
-#, fuzzy, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "Načteno %u IP rozsahů z '%s'. %u vadných řádků bylo vyřazeno."
-msgstr[1] "Načteno %u IP rozsahů z '%s'. %u vadných řádků bylo vyřazeno."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Limit stahování"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktivní připojení (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Skrýt aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Podrobnosti souboru"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Zobrazit aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% dokončeno"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Ukončit"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
-msgstr ""
+msgstr "eD2k odkaz: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Přidat"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr ""
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Načítání ..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Uživatelů: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr ""
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Up: 0.0 | Down: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
 msgstr ""
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4522,2211 +2661,2640 @@
 "optimal connection type)."
 msgstr ""
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Nepřipojen ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
-msgstr ""
+msgstr "Aktuální připojený server."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Vyhledávání"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Název:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Typ"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Lokální"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Globální"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "FileHash"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Rozšířené parametry"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtrování"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Typ souboru"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Cokoliv"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Archívy"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Audio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Obrazy CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Obrázky"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programy"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Texty"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Videa"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Přípona"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Min. velikost"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "bajtů"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Max. velikost"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Dostupnost"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Filtrování výsledků"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
-msgstr ""
+msgstr "Invertovat výsledek"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Skrýt známé soubory"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Spustit"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Více"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Zastavit"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Stahování"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
-msgstr "Vyčistit pole"
+msgstr "Vyprázdnit pole"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Výsledky"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Vyčistí dokončená stahování"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr ""
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Klienti ve frontě"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Zdroje souboru:"
 
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Odeslat"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Odešle zadanou zprávu."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Zavřít"
-
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Zavře tento chat."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Hlavní"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Celá název:"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/A"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "Soubor .met:"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Hash:"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Velikost:"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr ""
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Naposledy spatřen kompletní:"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Přenos"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Nalezené zdroje:"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr ""
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr ""
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Dostupný:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr ""
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Doba stahování:"
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Přeneseno:"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Dokončeno:"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Chytré zacházení s poškozenými částmi"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Ztraceno poškozením:"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Získáno kompresí:"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
-msgstr "Balíčků zachránených od I.C.H.:"
+msgstr "Balíčků zachráněných pomocí I.C.H.:"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Názvy souborů"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Převzít"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
-msgstr "Vyčistit"
+msgstr "Upravit"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Použít"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Budiž"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"U filmu můžete sdělit jeho délku, příběh, jazyk ...\n"
-"a pokud je to podfuk (fake), můžete o tom informovat ostatní."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Kvalita souboru"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Nehodnocené"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Neplatný / porušený / podvod"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Špatný"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "V pořádku"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Dobrý"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Výborný"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Obnovit"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Stahuji, prosím čekejte ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Neznámá velikost"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Nezbytné informace"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP adresa :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Port :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Dodatečné informace"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Uživatelské jméno:"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Znovu načíst vaše sdílené soubory"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Současné sezení"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Celkem"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Aktivní odesílání:"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Přidat"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Rychlost stahování"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Průměr sezení"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Rychlost odesílání"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Připojení"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Aktivní stahování"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Aktivní připojení (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Aktivní odesílání"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Strom statistik"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Jméno:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Software klienta:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Verze klienta:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP adresa:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID uživ.:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP serveru:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Název serveru:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
-msgstr ""
+msgstr "Zatemnění:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
-msgstr ""
+msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Přenosy ke klientovi"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Průmerná rychlost odesílání:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Průměrná rychlost stahování:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Odesláno (sezení):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Staženo (sezení):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Odesláno (celkem):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Staženo (celkem):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Skóre"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "DL/UP poměr:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Hodnocení (celkové):"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "Pořadí ve frontě"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org/ - Linuxová Mula"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Toto jméno uvidí ostatní uživatelé, kteří se k vám připojí."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Jazyk"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Prodleva před zobrazením tooltipů."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Jazyk ovládání programu"
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Různá nastavení"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Kontrola nové verze po spuštění"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr "aMule po spuštění zkontroluje, zda nevyšla nová verze"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Minimalizace po spuštění"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "aMule se po spuštění minimalizuje"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Ptát se na ukončení programu"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "aMule se před ukončením zeptá."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Povolit ikonu v trayi"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Povolí/zakáže ikonu v systray."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Minimalizovat do tray ikony"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr "Povolením tohoto se aMule minimalizuje do traye (místo pruhu úloh)."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Prodleva mezi zobrazením nástrojových tipů"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Prodleva před zobrazením tooltipů."
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Výběr prohlížeče"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Select your browser here"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Vlastní prohlížeč:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Procházet"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Otevřít pokud možno v novém tabu"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Otevřít webovou stránku v novém tabu místo otvírání nového okna, pokud je to "
 "možné"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Video přehrávač"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr ""
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
+msgstr "Limity šířky pásma"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Odesílání"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Přidělování slotů"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Standardní TCP port klienta:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Porty"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Standardní TCP port"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
-msgstr ""
+msgstr "Tohle je standardní eD2k port a nelze jej zakázat."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Rozšířující UDP port klienta:"
-
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr ""
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "UDP port pro požadavky serveru (TCP+3):"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "zakázat"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Rozšířený UDP port (Kad / globální vyhledávání)"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr ""
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr "Tento UDP port je použit pro rozšířené požadavky eD2k a pro síť Kad"
 
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "UDP port pro rozšířené požadavky serveru (TCP+3): 4665"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Povolit UPnP port forwarding"
 
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Maximum zdrojů na soubor"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnP TCP port (volitelné):"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Maximum připojení"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Max. zdrojů na stahovaný soubor:"
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Maximum připojení naráz:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Univerzální Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Povolit UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP TCP port:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Automatické připojení po spuštění"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Po odpojení znovu připojit"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Zobrazit šířku pásma režie"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Nastavení serverů"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Odstranit mrtvý server po"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "pokusech"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
-msgstr ""
+msgstr "Automaticky aktualizovat seznam serverů po spuštění"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Seznam"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Použít systém priorit"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Použít po připojení chytrou kontrolu LowID"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Bezpečné připojení"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
-msgstr ""
+msgstr "Přidělit ručně přidaným serverům vysokou prioritu"
+
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Inteligentní zpracování poškození (I.C.H.)"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. aktivní"
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Povolit"
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Přidávat soubory ke stažení do fronty pozastavené"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Přidávat soubory ke stažení do fronty s \"auto\" prioritou"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Pokusit se nejprve stáhnout první a poslední části"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Přidat nově sdílené soubory s \"auto\" prioritou"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Pokusit se odesílat celé části všem"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Ze stejné kategorie"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr ""
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Předalokovat místo na disku pro nové soubory"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr ""
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Toto zvolte chcete-li, aby aMule kontrolovala místo na disku"
 
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "Zadejte minimum místa na disku."
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Odesílání"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr ""
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Přidat nově sdílené soubory s \"auto\" prioritou"
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr ""
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Cílový adresář pro stahování"
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Sdílené adresáře"
+
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Sdílet skryté soubory"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Grafy"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Prodleva aktualizace: 5 sekund"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Zvolte barvy statistik"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Barvy: "
+
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Na pozadí"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Mřížka"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Aktivní připojení"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
-msgstr ""
+msgstr "Ukazatel rychlosti v tray ikoně"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Vyberte"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Strom"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Počet verzí klientů k zobrazení (0=neomezeně)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Kapacita linky"
-
-#: src/muuli_wdr.cpp:2249
-#, fuzzy
-msgid "Note: These values are only used for statistics."
-msgstr ""
-"Pozn.: Tyto hodnoty používají\n"
-" pouze statistiky."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! VAROVÁNÍ !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Neměňte tato nastavení, pokud nevíte\n"
-"co děláte, protože jinak můžete snadno\n"
-"pokazit různé věci.\n"
-"\n"
-"aMule poběží v pohodě bez změny\n"
-"nastavení na tomto tabu."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Pokročilá nastavení"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Max. nových připojení za 5 sek."
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Velikost zásobníku pro soubory: 240000 bytů"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Velikost fronty odesílání: 5000 klientů"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Průběh stahování souborů ve frontě"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Zobrazit procenta"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Zobrazit ukazatel průběhu"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Styl ukazatele průběhu"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Plochý"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Kulatý"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Podpora skinů"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Povolit skiny"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Skin:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- nejsou dostupné žádné skiny -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Řazení sloupců"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Automaticky řadit sloupce ve frontě stahování (žere CPU)"
-
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule automaticky seřadí kolonky ve vaší frontě stahování"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Různé vychytávky GUI"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Vzhled: "
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Zobrazit rozšířené informace na tabech kategorií"
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
 msgstr "Zobrazit rychlosti přenosu v titulku okna"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Vertikální umístění nástrojové lišty"
-
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Zobrazit číslo částečného souboru před názvem"
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Zobrazit rychlosti přenosu v titulku okna"
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr ""
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Před názvem programu"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Za názvem programu"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Spustit amuleweb po spuštění"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Zobrazit šířku pásma režie"
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr ""
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Vertikální umístění nástrojové lišty"
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Obnovování stránky (v sek.)"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Zobrazit procenta průběhu"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Povoliz Gzip kompresi"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Zobrazit ukazatel průběhu"
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Povolit uživatele s omezenými právy"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Plochý"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Heslo pro plná práva"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Kulatý"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Heslo pro omezená práva"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Automaticky řadit soubory (žere CPU)"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Šablona webu"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "aMule automaticky seřadí kolonky ve vaší frontě stahování"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Nastavení externího připojení"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Přijímat externí připojení"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"IP naslouchajícího rozhraní\n"
-"(prázdné = jakékoliv)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP naslouchajícího zařízení:"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP port"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "TCP port:"
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
-msgstr ""
+msgstr "Povolit UPnP port forwarding na EC portu"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Heslo"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Parametry webserveru"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Spustit webserver při spuštění aMule"
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Šablona webu"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Heslo pro plná práva"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Povolit uživatele s omezenými právy"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Heslo pro omezená práva"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Povolit UPnP port forwarding portu webserveru"
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "UPnP TCP port webserveru (volitelné)"
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Obnovování stránky (v sek.)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Povoliz Gzip kompresi"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "Budiž"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
-msgstr ""
+msgstr "Klikněte zde pro aplikování změn nastavení."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Zahodí všechny změny v nastavení."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
-msgstr "Titul:"
+msgstr "Titulek:"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Komentář:"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Příchozí adresář:"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Změnit prioritu pro nově přiřazené soubory:"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "Neměnit"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Barva pro tuto kategorii:"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Zobrazit MOTD serveru po připojení ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Info o severu"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Reset"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Klikněte na toto tlačítko pro vynulování logu."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Log aMule"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
-msgstr ""
+msgstr "Seznam serverů"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
-msgstr ""
+msgstr "Přidat server ručně: Název"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Zadejte název serveru"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Port"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Zadejte IP serveru ve tvaru x.x.x.x."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Zadejte port serveru."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Log aMule"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Info o serveru"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "ED2K Info"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad Info"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Aktualizuje seznam uzlů z dané URL..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Uzly (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Statistiky uzlů"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
-msgstr ""
+msgstr "Bootstrap"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Nový uzel"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Port:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bootstrap od \n"
-"známých klientů"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Bootstrap od známých klientů"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Odpojit Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Použít bezpečnou uživatelskou identifikaci"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
-msgstr ""
+msgstr "Zatemnění protokolu"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
-msgstr ""
+msgstr "Podporuje zatemnění protokolu"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
-msgstr ""
+msgstr "Použít zatemnění protokolu pro odchozí spojení"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
-msgstr ""
+msgstr "Přijímat pouze zatemněná spojení"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Volby souboru"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Všichni"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
-msgstr ""
+msgstr "Nikdo"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Kdo může vidět sdílené soubory:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Kdo může prohlížet moje sdílené soubory:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP filtrování"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtrovat klienty"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtrovat servery"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Obnovit seznam"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Obnovit"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Automaticky aktualizovat IP filtr po spuštění"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Úroveň filtrování:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Vždy filtrovat LAN IP"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoidní nakládání s nesouhlasícími IP"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
-msgstr ""
+msgstr "Použít systémový ipfilter.dat, je-li dostupný"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
-msgstr ""
-
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
+msgstr "Neexistuje-li místní ipfilter.dat, umožní použití systémového."
 
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Povolit online podpis"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Prodleva aktualizace (sek.):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Adresář s online podpisy:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Zakázat/povolit"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Nastavení filtrování:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtrovat všechny zprávy"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtrovat zprávy, které nejsou od přátel"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtrovat zprávy od neznámých klientů"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrovat zprávy obsahující (použijte ',' jako oddělovač):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "zadejte slova, která by měla amule filtrovat a blokovat zprávy obsahující je"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Komentáře"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
+msgstr "Filtrovat komentáře obsahující (použijte ',' jako oddělovač):"
+
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Povolit autentizaci"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Povolí/zakáže autentizaci (uživatelské jméno a heslo)"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Uživatelské jméno: "
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Uživatelské jméno, které se použije pro přihlášení k proxy"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Heslo:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Heslo, které se použije pro přihlášení k proxy"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Povolit proxy"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Povolí/zakáže proxy"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Typ proxy:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Typ proxy, ke které se připojujete"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Hostitel proxy:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Název hostitele proxy"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Port proxy:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Port proxy"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Autentizace"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Povolit autentizaci"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Povolí/zakáže autentizaci (uživatelské jméno a heslo)"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Uživatelské jméno, které se použije pro přihlášení k proxy"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Heslo:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Heslo, které se použije pro přihlášení k proxy"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Připojit se k:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Připojit k vzdálené aMuli"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Uživatelské jméno"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Zapamatovat si toto nastavení"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Čekání..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Odstranit vybrané"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Typy událostí"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Aktivní odesílání"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Všechny sdílené soubory"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Sdílené soubory"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Aktivní odesílání"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Zobrazit klienty"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Obnovit:"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Znovu načíst vaše sdílené soubory"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Odeslat"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Odešle zadanou zprávu."
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Zavře tento chat."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Připojit k nějakému serveru a/nebo Kadu"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Okno sítí"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Sdílené soubory"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Vyhledávací okno"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Zakázaný [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Okno s přenosy"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Okno se sdílenými soubory"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Okno zpráv"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Okno se statistikami"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Okno s nastavením"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nová kategorie"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Zvolte adresář pro stažené soubory"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Musíte zadat název kategorie!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Musíte zadat cestu pro kategorii!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "sek."
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "min."
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "hod."
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "dní"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "vše"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "vše ostatní"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Nekompletní"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Zastaveno"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Video"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Archív"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Text"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Aktivní"
+
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
+msgstr "Používám konfigurační adresář: %s"
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
 msgstr ""
-"Nemohu vytvořit příchozí adresář pro kategorii. Zadejte prosím platnou cestu!"
 
-#: src/ExternalConnector.cpp:141
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
+msgid "Importing %s: %s"
+msgstr "Importování %s: %s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Čtení dočasného adresáře"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Vytvářím cílový soubor"
+
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Unknown command '%s'.\n"
+msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Přidávám do stahování a ukládám nový částečný soubor"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Import částečných souborů"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Stav"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Hash souboru"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (disk: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
+"Prosím zvolte adresář pro vyhledávání dočasných souborů! (budou zahrnuty i "
+"podadresáře)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "Přejete si smazat zdrojové soubory úspěšný importovaných stahování?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr ""
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Odstranit zdroje?"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "CHYBA: Částečný soubor nelze vytvořit)"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
+msgid "Trying to load backup of met-file from %s"
+msgstr "Zkouší se načíst záloha .met souboru z %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "CHYBA: Selhalo otevírání souboru part.met: %s ==> %s"
+
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "CHYBA: Soubor part.met má nulovou velikost: %s ==> %s"
+
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "CHYBA: Neplatná verze souboru part.met: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr "Chyba: %s (%s) je porušený (špatný \"tagcount\"), nelze načíst soubor."
+
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Zobrazit nápovědu."
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Zkouším obnovit info o souboru..."
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "Obnovuje se soubor bez názvu - bude obnoven s názvem RecoveredFile.dat"
+
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
+"Všechny dostupné informace o souboru obnoveny :D - Zkouším je použít..."
+
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Nelze obnovit info o souboru :("
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:665
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "Failed to open %s (%s)"
+msgstr "Nelze otevřít %s (%s)"
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "VAROVÁNÍ: %s je možná poškozený (%i)"
+
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "CHYBA během ukládání částečného souboru: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "I/O chyba během ukládání části: "
+
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Chyba syntaxe!"
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' má nulovou velikost - používám soubor %s."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Selhalo ukládání souboru part.met.seeds pro %s"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
 msgstr ""
-"Chyba při zpracování příkazu - to by se nikdy nemělo stát! Prosím, nahlašte "
-"chybu\n"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Tento příkaz by neměl mít parametry."
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr ""
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Tento příkaz musí mít parametr."
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr ""
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Neplatný argument."
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
+msgid ""
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Toto je nekompletní příkaz."
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr ""
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:1208
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Pro nápovědu spusťte '%s'.\n"
+msgid "Finished rehashing %s"
+msgstr "Dokončeno přehashování %s"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:2128
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Tohle je %s %s %s\n"
+msgid "Unexpected error while completing %s. File paused"
+msgstr ""
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:2165
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Tohle je %s %s\n"
+msgid "Finished downloading: %s"
+msgstr "Dokončené stahování: %s"
 
-#: src/ExternalConnector.cpp:395
-msgid ""
-"\n"
-"Creating client...\n"
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Mazání souboru: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Vytvářím klienta...\n"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"OK, opouštím %s...\n"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Zobrazí tuto nápovědu."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "VAROVÁNÍ: Nedostatek volného místa na disku! Pozastavuji soubor: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Hostitel, kde běží aMule. (výchozí: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Stažená část %i souboru '%s' je poškozená."
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Port aMule pro externí připojení. (výchozí: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr ""
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Heslo pro externí připojení."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Alokuji"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Načíst konfiguraci ze souboru."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Nedostatek místa na disku"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Nevypisovat nic na stdout."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Staženo"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr ""
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Výchozí pro systém"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr ""
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albánština"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabský"
+
+#: src/Preferences.cpp:633
+msgid "Asturian"
 msgstr ""
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Vypíše verzi programu."
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Baskičtina"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulharský"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] ""
-msgstr[1] ""
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Katalánština"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Čínština (zjednodušená)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Čínština (tradiční)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Chorvatština"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Česky"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Dánština"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Nizozemština"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Angličtina (britská)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estonština"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finština"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Francouzština"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galicijština"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Němčina"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Řečtina"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebrejština"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Maďarština"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italština"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italština (švýcarská)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japonština"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Korejština"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Litevština"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norština"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polština"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugalština"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugalština (brazilská)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Ruština"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Slovinština"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Španělština"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Švédština"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turečtina"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ukrajinština"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Změnit jazyk"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
 msgstr ""
 
-#: src/amuled.cpp:594
+#: src/Preferences.cpp:771
 #, fuzzy
+msgid "No languages available"
+msgstr "Nedostupný"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "není dostupné žádné nastavení"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Nalezena neplatná kategorie, přeskakuji"
+
+#: src/Preferences.cpp:1766
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"CHYBA: démon aMule nelze použít, když jsou zakázaná externí připojení. Pro "
-"jejich povolení použijte buď normální aMule, nebo klíči "
-"\"AcceptExternalConnections\" v souboru ~/.aMule/amule.conf nastavte hodnotu "
-"1"
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr "TCP port nemůže být vyšší než 65532, protože UDP port je TCP+3"
 
-#: src/amuled.cpp:750
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "ERROR: %s"
-msgstr "CHYBA: %s"
+msgid "Default port will be used (%d)"
+msgstr "Bude použit výchozí port (%d)"
+
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Ignoruji neexistující sdílený adresář: %s"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Odbanovat"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Zobrazit odesílání"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Zobrazit frontu"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Připojení"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Zobrazit klienty"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Adresáře"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr ""
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Servery"
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Software klienta"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Soubory"
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Čekání"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Bezpečnost"
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Čas odesílání"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Rozhraní"
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Odesláno/Staženo"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Vzdálený stav"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Filtry"
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Vzdálené ovládání"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Priorita souboru"
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Online podpis"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Skóre"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Pokročilé"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Události"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Debugování"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Naposledy spatřen"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Neměňte tato nastavení, pokud nevíte\n"
+"co děláte, protože jinak můžete snadno\n"
+"pokazit různé věci.\n"
+"\n"
+"aMule poběží v pohodě bez změny\n"
+"nastavení na tomto tabu."
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Stav odesílání"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Odesláno"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Typ proxy, ke které se připojujete"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Průběh stahování"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Staženo"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"Restartujte aMule, aby se projevily následující změny:\n"
+"\n"
+
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP port změněn.\n"
+
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP port změněn.\n"
+
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Externí připojení uzavřeno."
+
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Nové externí připojení přijato"
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Userhash"
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Externí připojení uzavřeno."
 
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Podrobnosti klienta"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Jazyk byl změněn.\n"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Dočasný adresář byl změněn.\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- Síť eD2k povolena.\n"
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
 msgstr ""
+"Kad se nespustí, když máte zakázaný UDP port.\n"
+"Povolte UDP port, nebo zakažte připojování na Kad."
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
+"\n"
+"Nyní MUSÍTE restartovat aMule.\n"
+"Pokud to neuděláte, tak si pak nestěžujte, když se přihodí něco špatného.\n"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Dočasné soubory"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Příchozí soubory"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Online podpisy"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "Choose a folder for %s"
+msgstr "Zvolte adresář pro %s"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Nekompletní"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Zvolit přehrávač videa"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Zloduch"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Výběr prohlížeče"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Ověřeno - OK"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "Spustitelný soubor %s"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Nedostupný"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Upravit seznam serverů"
 
-#: src/ClientDetailDialog.cpp:215
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Sem přidejte URL pro stažení server.met souborů.\n"
+"Pouze jedno URL na každý řádek."
+
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1121
 #, fuzzy, c-format
-msgid "%u (QR: %u)"
-msgstr "QR: %u"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Čas pro průměrný graf: %d minut"
+msgstr[1] "Čas pro průměrný graf: %d minut"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
 msgstr ""
-"Min. velikost musí být menší než max. velikost. Ignoruji max. velikost."
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr ""
+#: src/PrefsUnifiedDlg.cpp:1139
+#, fuzzy, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Velikost zásobníku pro soubory: %d bajtů"
+msgstr[1] "Velikost zásobníku pro soubory: %d bajtů"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Neomezený"
+#: src/PrefsUnifiedDlg.cpp:1145
+#, fuzzy, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Velikost fronty pro odesílání: %d klientů"
+msgstr[1] "Velikost fronty pro odesílání: %d klientů"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Tray menu aMule"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, fuzzy, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Interval pro obnovení připojení k serveru: %d minut"
+msgstr[1] "Interval pro obnovení připojení k serveru: %d minut"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr ""
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Interval pro obnovení připojení k serveru: Zakázáno"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "UL: žádný"
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "zakázáno"
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "UL: %u"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "Spustí příkaz při událost `%s'"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DL: žádný"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Povolit jaderné příkazy"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "DL: %u"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Příkaz jádra:"
 
-#: src/MuleTrayIcon.cpp:368
-#, c-format
-msgid "Download speed: %.1f"
-msgstr ""
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Povolit GUI příkazy"
 
-#: src/MuleTrayIcon.cpp:370
-#, c-format
-msgid "Upload speed: %.1f"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Příkaz GUI:"
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Následující proměnné budou nahrazeny:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
+"Min. velikost musí být menší než max. velikost. Ignoruji max. velikost."
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Informace o klientu"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Varování při vyhledávání"
 
-#: src/MuleTrayIcon.cpp:380
-#, c-format
-msgid "Nickname: %s"
-msgstr "Přezdívka: %s"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Hlavní"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr ""
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Nemohu vyhledávat přes Kad, když není spuštěn"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID klienta: "
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "Nelze vyhledávat na eD2k, když nejste připojen"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Název serveru: "
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Neočekávaná chyba během vyhledávání v síti Kad: "
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP serveru: "
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "ID souboru"
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Soubor"
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr ""
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Přidat volitelné URL pro tento soubor"
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
-msgstr ""
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Vyhledat související soubory (eD2k, lokální server)"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr ""
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Označit jako známý soubor"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Online podpis: Povolen"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Zkopírovat eD2k odkaz do schránky"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Online podpis: Zakázán"
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Zrušeno"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Nový"
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
 msgstr ""
+"Selhalo připojení ke všem vybraným serverům. Zkouším to znovu bez obfuskace."
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Selhalo připojení ke všem vybraným serverům. Zkouším znovu."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "Síť eD2k je zakázána v nastavení, nepřipojuji se."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:476
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total DL: %s"
-msgstr "Celkem DL: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Připojen k %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/ServerConnect.cpp:274
 #, c-format
-msgid "Total UL: %s"
-msgstr "Celkem UL: %s"
-
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr ""
+msgid "Connection established on: %s"
+msgstr "Připojení vytvořeno k %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
+"Kritická chyba během pokusu o připojení. Možná je vypnuté/nefunkční "
+"připojení k Internetu"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Skrýt aMule"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Ztracené připojení k %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Zobrazit aMule"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) se zdá být mrtvý."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr ""
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) se zdá být plný."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Připojen ke klientovi ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Připojuji se ke klientovi ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Připojení ztraceno."
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Připojování ke klientovi selhalo / připojení ztraceno ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Připojování k %s (%s:%i) selhalo."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Zavřít tab"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr ""
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Zavřít všechny taby"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Pokusu o připojení k %s (%s:%i) vypršel čas."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Zavřít ostatní taby"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr ""
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Načítám soubor server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Soubor server.met nenalezen!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Otevření souboru server.met (%s) selhalo: neznámý formát."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Nelze otevřít server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Soubor server.met je porušený, nalezena neplatná verze: 0x%x, velikost %i"
 
-#: src/ServerList.cpp:169
-#, fuzzy, c-format
+#: src/ServerList.cpp:173
+#, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
-msgstr[0] "V server.met bylo nalezeno %i serverů"
-msgstr[1] "V server.met bylo nalezeno %i serverů"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ServerList.cpp:171
-#, fuzzy, c-format
+#: src/ServerList.cpp:175
+#, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
-msgstr[0] "Přidáno %d serverů"
-msgstr[1] "Přidáno %d serverů"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "I/O chyba při čtení souboru known.met: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Server nebyl přidán: [%s:%d] neudává platný port."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Server nebyl přidán: IP adresa [%s:%d] je neplatná, nebo blokovaná."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Server nebyl přidán: Server s totožnou IP a portem [%s:%d] je již v seznamu."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Server byl přidán: [%s:%d] pod názvem '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6734,330 +5302,2223 @@
 "Snažíte se smazat server, na který jste právě připojen(a). Nejprve se prosím "
 "odpojte."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Nemohu otevřít '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Ukládání server.met selhalo!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Neplatná URL"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
-msgstr ""
-
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
 msgstr "Stahování seznamu serverů z %s selhalo"
 
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
 msgstr ""
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
-msgstr ""
+msgstr "Stáhnout seznam serverů z %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 "V addresses.dat není žádná platná URL pro automatické stahování server.met"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Stahování seznamu serverů z %s selhalo"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr ""
 
-#: src/UserEvents.cpp:132
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Název serveru"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Adresa"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Port"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Popis"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Uživatelé"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Pevný"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Verze"
+
+#: src/ServerListCtrl.cpp:148
+msgid ""
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
+msgstr ""
+"Jste připojen(a) na server, který se pokoušíte smazat. Nejprve se prosím "
+"odpojte. Server NEbyl smazán."
+
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(neznámý název)"
+
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Opravdu si přejete smazat stálý server %s?"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Servery (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Server"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Připojit k serveru"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Označit server jako stálý"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Označit server jako nestálý"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Označit servery jako stálé"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Označit servery jako nestálé"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Vzdálený server"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Vzdálené servery"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Odstranit všechny servery"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/amule.cpp:703
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Znovu připojit k serveru"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Opravdu si přejete smazat všechny servery?"
+
+#: src/ServerListCtrl.cpp:541
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Opravdu si přejete smazat vybrané servery?"
+
+#: src/ServerListCtrl.cpp:543
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Opravdu si přejete smazat vybrané servery?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/amule.cpp:787
-msgid "Server list download"
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Nové ID klienta je %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr ""
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
+"\tPravděpodobně je to způsobeno tím, že jste za firewallem či routerem."
 
-#: src/amule.cpp:846
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tPro více informací prosím běžte na http://wiki.amule.org/"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr ""
+
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "web server running on pid %d"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Uložení seznamu serverů dokončeno."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Server odmítl poslední příkaz"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Chybný paket obdržen od serveru: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Došlo k neznámé chybě při zpracovávání paketu od serveru: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "IP serveru %s (%s) je filtrována. Nepřipojuji se."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "používám zatemňování protokolu (obfuscation)."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Připojování k %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr ""
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/amule.cpp:937
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr ""
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Stav eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Stav Kademlia:"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "Běží na %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Běží"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Stav:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Stav připojení:"
+
+#: src/ServerWnd.cpp:214
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Za firewallem - otevřete TCP port %d na vašem routeru či ve firewallu"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "Stav UDP připojení:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Za firewallem - otevřete UDP port %d na vašem routeru či ve firewallu"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Stav firewallu: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Není třeba kamaráda - TCP port je otevřený"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Není třeba kamaráda - UDP port je otevřený"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Žádný kamarád"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Připojuji se ke kamarádovi"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Připojen ke kamarádovi na %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Indexované zdroje:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Indexovaná klíčová slova:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr ""
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr ""
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr ""
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
 msgstr ""
 
-#: src/amule.cpp:964
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Neběží"
+
+#: src/SharedFileList.cpp:332
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Port %u je nedostupný. Budete mít LowID\n"
+msgid "Adding file %s to shares"
+msgstr ""
 
-#: src/amule.cpp:970
+#: src/SharedFileList.cpp:371
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/SharedFileList.cpp:377
+#, fuzzy, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Nalezeno %i známých a %i neznámých sdílených souborů"
+msgstr[1] "Nalezeno %i známých a %i neznámých sdílených souborů"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
 msgstr ""
-"Port %u je nedostupný!\n"
-"\n"
-"To znamená, že budete mít LowID.\n"
-"\n"
-"Zkontrolujte nastavení vaší sítě a ujistěte se, že je port v obou směrech "
-"otevřený."
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Selhalo vytvoření OnlineSig souboru"
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Sdílený adresář nenalezen, přeskakuji: %s"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Selhalo vytvoření aMule OnlineSig souboru"
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Uživatelské jméno"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Rychlost stahování"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Rychlost odesílání"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Dostupné části"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Stav odesílání"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Průběh stahování"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Původ"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Název souboru"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Sdílené soubory"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Požadavky"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Přijaté požadavky"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Přenesená data"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Poměr sdílení"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Obdržené části"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Kompletní zdroje"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Cesta"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Přidat komentář/hodnocení"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Upravit komentář/hodnocení"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Přejmenovat"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Zkopírovat magnet URI do schránky"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Zkopírovat eD2k odkaz do schránky (%zdroj)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "K vytvoření platného odkazu potřebujete HighID"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Sdílené soubory (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[PartSoubor]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Název souboru"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Odeslaná data (sezení (celkem)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Celková režie (pakety): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr ""
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr ""
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Režie serveru (pakety): %s"
 
-#: src/amule.cpp:1299
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Režie Kadu (pakety): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr ""
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Aktivní odesílání: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Čekající odesílání: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr ""
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr ""
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Průměrný čas odesílání: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Stažená data (sezení (celkem)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Nalezené zdroje: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Aktivní stahování (části): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "UL:DL poměr sezení (celkem): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Průměrzná rychlost stahování (sezení): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Průměrzná rychlost odesílání (sezení): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Maximální rychlost stahování (sezení): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Maximální rychlost odesílání (sezení): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Znovupřipojení: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Doba od prvního přenosu: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Připojen k serveru od: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Aktivních připojení (odhad): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Limit připojení dosažen: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Průměrný počet připojení (odhad): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr ""
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Klienti"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Neznámý: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Filtrován: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Zabanován: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Celkem: %i Známých: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Fungující servery: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Nefungující servery: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Celkem: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Smazané servery: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Filtrované servery: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Uživatelů na fungujících serverech: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Souborů na fungujících serverech: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Celkem uživatelů: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Celkem souborů: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Zaplnění serveru: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Počet sdílených souborů: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Celková velikost sdílených souborů: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Průměrná velikost souboru: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Operační systém"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Neobdrženo"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktivní připojení (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Nedostupný"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Nikdy"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr ""
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Spustí <str> a ukončí se."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Neplatný formát IP adresy. Použijte xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Zpracovávám podle hashe: "
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Zpracovávám podle názvu souboru: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr ""
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Neplatné číslo\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr ""
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Požadavek selhal kvůli neznámé chybě."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Operace byla úspěšná."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Toto je vaše první spuštění aMule %s"
+msgid "Request failed with the following error: %s"
+msgstr ""
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Toto je testovací verze, která je denně aktualizovaná a\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr ""
 
-#: src/amule.cpp:1311
-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/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "vypnuto"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "zapnuto"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
 msgstr ""
-"nebo zabít vašeho psa. Nicméně i tak by *mělo* být její používání bezpečné.\n"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr ""
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr ""
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Připojen k %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Připojování"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "za firewallem"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
+"\n"
+"Stahování:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
+"\n"
+"Odesílání:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
+"\n"
+"Klientů ve frontě:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
+msgstr ""
+"\n"
+"Celkem zdrojů:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Počet výsledků vyhledávání: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/TextClient.cpp:832
+#, fuzzy
+msgid "Search progress not available"
+msgstr "Zobrazit procenta průběhu"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Obdržena neznámá odpověď od serveru, kód operace = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr ""
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Zobrazit celý strom statistik."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Ukončit aMuli"
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr ""
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Znovu načte seznam sdílených souborů."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr ""
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr ""
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr ""
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr ""
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Připojit se k síti."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Připojit se pouze k eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Připojit se pouze ke Kademlia."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Odpojit se od sítě."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr ""
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Odpojit se pouze od eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Odpojit se pouze od Kademlia."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Přidat eD2k nebo magnet odkaz do jádra."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Nastavit hodnotu nastavení."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "Nastavit filtrování IP."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Povolit klientům i serverům filtrování IP."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Zakázat klientům i serverům filtrování IP."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Povolit/zakázat klientům filtrování IP."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Povolit klientům filtrování IP."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Zakázat klientům filtrování IP."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Povolit/zakázat klientům filtrování IP."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Povolit serverům filtrování IP."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Zakázat serverům filtrování IP."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Zvolte úroveň filtrování IP."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Více informací, podporu a nová vydání naleznete na naší domovské stránce,\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Nastavit limity šířky pásma."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
-"na www.aMule.org, nebo na našem IRC kanálu #aMule na irc.freenode.net.\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Hlašte chyby na adrese http://forum.amule.org/"
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Nastavit limit šířky pásma pro odesílání."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Nastavit limit šířky pásma pro stahování."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr ""
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr ""
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr ""
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr ""
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr ""
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr ""
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr ""
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Spustí vyhledávání v síti Kad"
+
+#: src/TextClient.cpp:914
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Spustí globální vyhledávání"
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Spustí lokální vyhledávání"
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Spustí vyhledávání v síti Kad"
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Zobrazí výsledky posledního vyhledávání."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Zobrazí výsledky posledního vyhledávání.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Zobrazí průběh vyhledávání."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Zobrazí průběh vyhledávání.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
 msgstr ""
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "CHYBA: nelze otevřít logovací soubor"
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "VAROVÁNÍ: log je prázdný. Něco je špatně."
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Pozastavit stahování."
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Log byl vymazán"
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Pokračovat ve stahování."
 
-#: src/amule.cpp:1826
-#, c-format
-msgid "ServerMessage: %s"
-msgstr "Zpráva od serveru: %s"
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Zrušit stahování."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Selhalo stahování seznamu uzlů."
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Nastaví prioritu stahování."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Selhalo otvírání staženého kontrolního souboru s verzí"
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr ""
+"Nastavte prioritu stahovaného souboru na nízkou, normální, vysokou, nebo "
+"automatickou.\n"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Porušený soubor pro kontrolu verze"
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Nastaví nízkou prioritu."
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Používáte zastaralou verzi aMule!"
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Nastaví normální prioritu."
 
-#: src/amule.cpp:1907
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Nastaví vysokou prioritu."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Nastaví automatickou prioritu."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Zobrazit fronty/seznamy."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Zobrazit frontu odesílání."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Zobrazit frontu stahování."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Zobrazit log."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Zobrazit seznam serverů."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Vyčistit log."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Vaše verze aMule je %i.%i.%i a poslední verze je %li.%li.%li"
+msgid "Deprecated command, use '%s' instead."
+msgstr ""
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Poslední verze jsou vždy k nalezení na http://www.amule.org/"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Toto je zastaralý příkaz, který může být v budoucnosti odstraněn.\n"
+"Použijte místo něj '%s'.\n"
+
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Textový klient aMule"
 
-#: src/amule.cpp:1911
+#: src/ThreadTasks.cpp:363
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "VAROVÁNÍ: Vaše verze aMuled je zastaralá: %i.%i.%i < %li.%li.%li"
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Převádí se staré AICH hashsety v '%s' do 64b v '%s'."
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Vaše verze aMule je aktuální."
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "VAROVÁNÍ: Název souboru '%s' je neplatný a byl změněn na '%s'."
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Selhalo stahování kontrolního souboru s verzí"
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"VAROVÁNÍ: Soubor '%s' již existuje, nový soubor byl přejmenován na '%s'."
+
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr "Opravdu si přejete zrušit a smazat všechny soubory v této kategorii?"
+
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Potvrzení je nutné"
+
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
+
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Příliš mnoho připojení"
 
-#: src/amule.cpp:2025
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Vše ostatní"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr ""
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Přidat kategorii"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Upravit kategorii"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Odstranit kategorii"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Users: %s | Files: %s"
+msgid "Failed to open file (%s), removing from list of shared files."
 msgstr ""
 
-#: src/amule.cpp:2026
+#: src/UploadClient.cpp:683
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
+msgstr "Obnovuji odesílání souboru %s"
+
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Zastavuji odesílání souboru %s"
+
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
 msgstr ""
 
-#: src/amule.cpp:2102
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Stahování dokončeno"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Celá cesta k souboru."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr ""
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "ED2k hash souboru."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Velikost souboru v bytech."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr ""
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Zahájeno nové sezení v chatu"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Odesílač zpráv."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Došlo místo"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Diskový oddíl."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Chyba při dokončení"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Připojen k %s %s"
+msgid "Processing file number %u: %s"
+msgstr "Zpracovávám soubor č. %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Vyžádal jste si částečné hashe (používá se pouze pro soubory > 9,5 MB)"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Connecting to %s"
-msgstr "Připojování k %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Neexistující soubor !\n"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, tvůrce eD2k odkazů z aMule"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Vítejte!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Vstupní parametry"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Soubor k hashování"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Přidat volitelné URL pro tento soubor"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Sem zadejte soubor pro který chcete vypočítat eD2k odkaz"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad spuštěn"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Odebrat"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad zastaven"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Vytvořit odkaz s hashi částí"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Připojen ke Kad (ok)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Pomůže rozšířit nové a raritní soubory rychleji, za cenu zvýšené velikosti "
+"odkazu"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Připojen ke kad (za firewallem)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4 hash souboru"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Odpojen od Kad"
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k hash souboru"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k odkaz"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Uložit"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Zkopírovat do schránky"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Otevřít"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Otevřít soubor pro vytvoření jeho eD2k odkazu"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Zkopírovat vypočítaný eD2k odkaz do schránky"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Uložit jako"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Uložit vytvořený eD2k odkaz do souboru"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "O aLinkCreatoru"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Vyberte soubor jemuž chcete vytvořit eD2k odkaz"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Nelze otevřít schránku"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Zatím není co zkopírovat!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Zvolte soubor s vaším vytvořeným eD2k odkazem"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Nelze otevřít"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Zadejte prosím (neprázdný) název souboru"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Zatím není co ukládat!"
 
-#: src/amule.cpp:2191
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
-msgstr "Síť Kad nelze použít, když je v nastavení zakázán UDP port."
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, tvůrce eD2k odkazů, součást aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Ikony z http://www.everaldo.com a http://www.icomania.com\n"
+"a http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Šířeno pod GPL"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Síť Kad je zakázána v nastavení, nepřipojuji se."
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Hashování..."
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator pracuje"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Počítám MD4 hash..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Počítám eD2k hashe..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Přerušeno!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
+#, c-format
+msgid "Done in %.2f s"
+msgstr "Hotovo za %.2f s"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Tato URL je již přidána!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Zadejte prosím neprázdnou URL"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#, c-format
+msgid "Unable to open %s"
+msgstr "Nelze otevřít %s"
+
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i dní %i hodin %i min %i sek"
+
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, online statistiky aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Maximální rychlost stahování během tohoto běhu wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Maximální rychlost stahování během všech běhů wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Systém"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Přerušit automatické obnovování"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Uložit obrázek online statistik"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Vytisknout obrázek online statistik"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Nastavení"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "O wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Spustit automatické obnovování"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Automatické obnovování zastaveno"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Automatické obnovování spuštěno"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Uložit obrázek statistiky"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Online statistiky aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
+"Nastal problém při tisku.\n"
+"Možná vaše tiskárna není správně nastavena."
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Tisknu"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
+"wxCas, aMule online statistiky\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Založený na CAS od Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distribuovaný pod GPL licencí"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "aMule neběží..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule běží"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule běží, ale je odpojená"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule se připojuje..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Stav aMule je neznámý..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " běží už "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " je zastavená!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " je nepřipojená!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " se připojuje..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " je asi vypnutá, zkontrolujte to!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " je připojena k "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "vypnuto"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr "běží"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Celkem staženo:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Odesláno:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr ""
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Stahování: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, odesílání: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Sdílení:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " soubor(ů), klientů ve frontě: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Čas:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " na "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Průměrná zátěž systému (1-5-15 minut): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Běh systému: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Adresář obsahující soubor amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Zadejte cestu k adresáři, ve kterém je soubor amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Interval pro obnovování v sekundách"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Vygenerovat obrázek při každém obnovení"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Zadejte adresář, do kterého si přejete vygenerovat obrázek statistik"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Pravidelně nahrávat obrázek statistik na FTP server"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP url"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP cesta"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Zadejte URL vašeho FTP serveru"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr ""
+"Zadejte sem adresář, do kterého se na FTP budou ukládat obrázky statistik"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Uživatel"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Zadejte sem uživatelské jméno pro přihlášení k vašemu FTP serveru"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Zadejte sem heslo pro přihlášení k vašemu FTP serveru"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Interval aktualizace FTP v minutách"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Zkontrolovat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Adresář obsahující váš soubor s podpisem"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Adresář pro generování obrázků statistik"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Načte šablonu <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "HTTP port webserveru"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Použít UPnP port forwarding pro webserver"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP port"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Použít gzip kompresi"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Heslo pro plný přístup k webserveru"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Heslo pro omezený přístup k webserveru"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Povolit přístup hostům"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Zakázat přístup hostům"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Cesta ke konfiguráku aMule. NEPOUŽÍVEJTE PŘÍMO!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Zakázat PHP interpreter (zastaralé)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Překompilovat PHP stránky při každém požadavku"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Webový server aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "CHYBA: nelze přijmout připojení na webového klienta\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Požadavek selhal kvůli následující chybě: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Index nenalezen: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Sezení vypršelo - vyžaduji přihlášení\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Relace je v pořádku, přihlášen\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Relace je v pořádku, nepřihlášen\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Není otevřené žádné sezení - vyžaduji přihlášení\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Relace zahájena - vyžadování přihlášení\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Zpracování požadavku [původní]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Heslo nezadáno, přihlášení nebude možné."
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Kontrola hesla\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Hash hesla je neplatný\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Heslo v pořádku\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Špatné heslo\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Nezadal(a) jste heslo. Prázdné heslo není povoleno.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Bylo vyžádáno odhlášení\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Zpracování požadavku [přesměrovaný]:"
+
+#~ msgid "Romanian"
+#~ msgstr "Rumunština"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Průběh stahování"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Transferring"
+#~ msgstr "Přenáším"
+
+#~ msgid "QR: ???"
+#~ msgstr "QR: ???"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#~ msgid "Only files currently uploading"
+#~ msgstr "Pouze soubory zrovna odesílané"
+
+#~ msgid "Queue Rank"
+#~ msgstr "Pořadí ve frontě"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - zobrazit průběh vyhledávání"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Vytváří se MD4 a AICH hash pro soubor: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Vytváří se MD4 hash pro soubor: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Vytváří se AICH hash pro soubor: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr "VAROVÁNÍ: Nelze smazat původní '%s' po vytvoření zálohy"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "VAROVÁNÍ: Nelze smazat %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Hodnocení (celkové):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Pokusit se odesílat celé části všem"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Stahuji"
+
+#~ msgid "Transfers"
+#~ msgstr "Přenosy"
+
+#~ msgid "Unban"
+#~ msgstr "Odbanovat"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Zobrazit odesílání"
+
+#~ msgid "Show Queue"
+#~ msgstr "Zobrazit frontu"
+
+#~ msgid "Client Software"
+#~ msgstr "Software klienta"
+
+#~ msgid "Waited"
+#~ msgstr "Čekání"
+
+#~ msgid "Upload Time"
+#~ msgstr "Čas odesílání"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Odesláno/Staženo"
+
+#~ msgid "Remote Status"
+#~ msgstr "Vzdálený stav"
+
+#~ msgid "File Priority"
+#~ msgstr "Priorita souboru"
+
+#~ msgid "Score"
+#~ msgstr "Skóre"
+
+#~ msgid "Last Seen"
+#~ msgstr "Naposledy spatřen"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Odesláno"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Staženo"
+
+#~ msgid "Userhash"
+#~ msgstr "Userhash"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Klienti ve frontě"
+
+#~ msgid "Current Session"
+#~ msgstr "Současné sezení"
+
+#~ msgid "Total"
+#~ msgstr "Celkem"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Okno s přenosy"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Celkem uživ.: %s | Celkem soub.: %s"
+
+#, fuzzy
+#~ msgid "HTTP download thread started"
+#~ msgstr "Synchronizační vlákno spuštěno."
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Stahování (%i)"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "VAROVÁNÍ: Nelze smazat původní '%s' po vytvoření zálohy"
+
+#~ msgid "Makes a search."
+#~ msgstr "Provede vyhledávání."
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Selhal"
+
+#, fuzzy
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Spustit amuleweb po spuštění"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Ukončit aMule."
 
 #~ msgid "Fetching status..."
 #~ msgstr "Zjišťuji stav..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Uživ.: E: %s K: %s | Soub. E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Klient %s s IP %s na portu %d používá %s %s %s"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() vrátila NULL"
 
+#~ msgid "Firewalled"
+#~ msgstr "Za firewallem"
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr "Soubor %s je pro Donkey příliš velký: maximum jsou 4 GB."
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Nenalezen žádný obslužný program pro tento typ souboru."
+
+#~ msgid "File was not saved"
+#~ msgstr "Soubor nebyl uložen"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr "Připojení selhalo. Nemohu se připojit k zadanému hostiteli\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "Filtr zpráv"
 
@@ -7067,27 +7528,192 @@
 #~ msgid "Core Tweaks"
 #~ msgstr "Vychytávky jádra"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Nenalezen žádný obslužný program pro tento typ souboru."
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Prodleva mezi zobrazením nástrojových tipů"
 
-#~ msgid "File was not saved"
-#~ msgstr "Soubor nebyl uložen"
+#~ msgid "Show part file number before file name"
+#~ msgstr "Zobrazit číslo částečného souboru před názvem"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
-#~ msgstr "Soubor %s je pro Donkey příliš velký: maximum jsou 4 GB."
+#~ msgid "Skin Support"
+#~ msgstr "Podpora skinů"
 
-#~ msgid "Please wait... "
-#~ msgstr "Prosím čekejte..."
+#~ msgid "- no skins available -"
+#~ msgstr "- nejsou dostupné žádné skiny -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Adresář s online podpisy:"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Nastavení filtrování:"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Kapacita linky"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
+#~ msgstr ""
+#~ "Pozn.: Tyto hodnoty používají\n"
+#~ " pouze statistiky."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Standardní TCP port klienta:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Rozšířující UDP port klienta:"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "UDP port pro rozšířené požadavky serveru (TCP+3): 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Maximum zdrojů na soubor"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Univerzální Plug and Play"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "Povolit UPnP"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "UPnP TCP port:"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Zvolte barvy statistik"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Průběh stahování souborů ve frontě"
+
+#~ msgid "Show percentage"
+#~ msgstr "Zobrazit procenta"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Zobrazit ukazatel průběhu"
+
+#~ msgid "Enable skin support "
+#~ msgstr "Povolit skiny"
+
+#~ msgid "Skin:"
+#~ msgstr "Skin:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "Automaticky řadit sloupce ve frontě stahování (žere CPU)"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "IP naslouchajícího rozhraní\n"
+#~ "(prázdné = jakékoliv)"
+
+#~ msgid "TCP port"
+#~ msgstr "TCP port"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Kdo může vidět sdílené soubory:"
+
+#~ msgid "Event types"
+#~ msgstr "Typy událostí"
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "aMule se před ukončením zeptá."
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Zobrazit šířku pásma režie"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. aktivní"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Pokročilá nastavení"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Styl ukazatele průběhu"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Řazení sloupců"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Různé vychytávky GUI"
+
+#~ msgid "File Options"
+#~ msgstr "Volby souboru"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "U filmu můžete sdělit jeho délku, příběh, jazyk ...\n"
+#~ "a pokud je to podfuk (fake), můžete o tom informovat ostatní."
+
+#~ msgid "Misc Options"
+#~ msgstr "Různá nastavení"
+
+#~ msgid "Server Options"
+#~ msgstr "Nastavení serverů"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Zobrazit MOTD serveru po připojení ..."
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Zakázat/povolit"
+
+#~ msgid "Authentication"
+#~ msgstr "Autentizace"
 
 #~ msgid "General Settings"
 #~ msgstr "Hlavní nastavení"
 
+#~ msgid "Max Connections"
+#~ msgstr "Maximum připojení"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "Vychytávky GUI"
 
 #~ msgid "Remote Control"
 #~ msgstr "Ovládání na dálku"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Nemohu rozpoznat vybraný prohlížeč!"
+
+#~ msgid "User Defined"
+#~ msgstr "Uživatelem definované"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org/ - Linuxová Mula"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Select your browser here"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Vlastní prohlížeč:"
+
+#~ msgid "Please wait... "
+#~ msgstr "Prosím čekejte..."
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "Nelze zjistit příkaz pro spuštění prohlížeče."
 
@@ -7100,9 +7726,6 @@
 #~ msgid "ExternalConn: Access denied"
 #~ msgstr "Přístup odepřen"
 
-#~ msgid "ExternalConn: Bad reply from server. Connection closed."
-#~ msgstr "Špatná odpověď od serveru. Spojení uzavřeno."
-
 #~ msgid "Copy ED2k &link to clipboard"
 #~ msgstr "Zkopírovat eD2k do &schránky"
 
@@ -7187,9 +7810,6 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "Zkopírovat ED2k odkaz do schránky"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "Kritická chyba: Selhalo vytváření časovače"
-
 #, fuzzy
 #~ msgid "ED2K: Connecting"
 #~ msgstr "Připojuji"
@@ -7198,10 +7818,6 @@
 #~ msgid "ED2K: Disconnected"
 #~ msgstr "Odpojeno"
 
-#, fuzzy
-#~ msgid "Warning: Unable to open skin file '%s' for read"
-#~ msgstr "Nemohu otevřít soubor se skinem %s pro čtení"
-
 #~ msgid ""
 #~ "Your Auto-update servers list is in blank.\n"
 #~ "'Auto-update serverlist at startup' will be disabled."
@@ -7282,22 +7898,12 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "Chyba: Neplatná verze souboru part.met: %s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr ""
-#~ "Chyba: %s (%s) je porušený (špatný \"tagcount\"), nelze načíst soubor."
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "Varování: %s může být porušen (%i)"
 
 #~ msgid "Unexpected file error while completing %s. File paused"
 #~ msgstr "Neočekávaná chyba souboru při dokončování %s. Pozastaveno"
 
-#~ msgid "Warning: known.met cannot be opened."
-#~ msgstr "Varování: soubor known.met nelze otevřít."
-
-#~ msgid "Warning: Knownfile list corrupted, contains invalid header."
-#~ msgstr "Varování: Soubor known.met je porušen, obsahuje neplatnou hlavičku."
-
 #~ msgid "ERROR! Attempted to share %s"
 #~ msgstr "CHYBA! Pokus o sdílení %s"
 
@@ -7313,18 +7919,12 @@
 #~ msgid "Bandwidth Limits: Up: %u kB/s, Down: %u kB/s.\n"
 #~ msgstr "Omezení šířky pásma: Od: %u kB/s, St: %u kB/s.\n"
 
-#~ msgid "Shutdown aMule."
-#~ msgstr "Ukončit aMule."
-
 #~ msgid "Connect to ED2K only."
 #~ msgstr "Připojit se pouze k ED2K."
 
 #~ msgid "Disconnect from ED2K only."
 #~ msgstr "Odpojit se pouze od ED2K."
 
-#~ msgid "Adds an ed2k or magnet link to core."
-#~ msgstr "Přidá ed2k nebo magnet URI do jádra."
-
 #~ msgid "Error: %s (%s) - %s"
 #~ msgstr "Chyba: %s (%s) - %s"
 
@@ -7413,9 +8013,6 @@
 #~ msgid "Manual Server Add : Name"
 #~ msgstr "Ruční přidání serveru : Název"
 
-#~ msgid "No One"
-#~ msgstr "Nikdo"
-
 #~ msgid "Speed Limits:"
 #~ msgstr "Rychlostní omezení:"
 
@@ -7589,9 +8186,6 @@
 #~ msgid "Client request is invalid! %i / %i"
 #~ msgstr "Požadavek klienta je neplatný! %i / %i"
 
-#~ msgid "Command: %s"
-#~ msgstr "Příkaz: %s"
-
 #~ msgid "Unable to open %s file - using %s file."
 #~ msgstr "Nelze otevřít soubor %s - používám %s."
 
@@ -7605,9 +8199,6 @@
 #~ "CSharedFileList::FindSharedFiles: Odstraňuji %s ze seznamu sdílených "
 #~ "adresářů: adresář nenalezen."
 
-#~ msgid "Syncronization thread started."
-#~ msgstr "Synchronizační vlákno spuštěno."
-
 #~ msgid "Masterhashes of known files have been loaded."
 #~ msgstr "Masterhashe známých souborů byly načteny."
 
@@ -7643,7 +8234,7 @@
 #~ " FAQ: http://wiki.amule.org \n"
 #~ "\n"
 #~ " Contact: admin@amule.org (administrative issues) \n"
-#~ " Copyright (C) 2003-2009 aMule Team \n"
+#~ " Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
 #~ " Part of aMule is based on \n"
 #~ " Kademlia: Peer-to-peer routing based on the XOR metric.\n"
@@ -7657,7 +8248,7 @@
 #~ " FAQ: http://wiki.amule.org/ \n"
 #~ "\n"
 #~ " Kontakt: admin@amule.org (administrativní záležitosti)\n"
-#~ " Copyright (C) 2003-2009 Tým aMule \n"
+#~ " Copyright (C) 2003-2008 Tým aMule \n"
 #~ "\n"
 #~ " Část aMule je založená na \n"
 #~ " Kademlia: P2P protokol založený na XOR metrice.\n"
@@ -7714,12 +8305,6 @@
 #~ msgid ".%d"
 #~ msgstr ".%d"
 
-#~ msgid "Shows the process of a search."
-#~ msgstr "Zobrazí průběh vyhledávání."
-
-#~ msgid "Shows the process of a search..\n"
-#~ msgstr "Zobrazí průběh vyhledávání..\n"
-
 #~ msgid "Set riority to low."
 #~ msgstr "Nastaví nízkou prioritu."
 
@@ -7825,9 +8410,6 @@
 #~ msgid "Source Dropping"
 #~ msgstr "Zahazování zdrojů"
 
-#~ msgid "Keep sources"
-#~ msgstr "Ponechat zdroje"
-
 #~ msgid "Drop sources"
 #~ msgstr "Zahodit zdroje"

aMule-2.2.6.tar.bz2/po/da.po -> aMule-2.3.1.tar.bz2/po/da.po Changed

@@ -1,5 +1,5 @@
 # aMule i18n resource file.
-# Copyright (C) 2004 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the aMule package.
 # Kry <elkry@users.sourceforge.net>, 2004.
 #
@@ -7,1285 +7,1090 @@
 msgstr ""
 "Project-Id-Version: aMule CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Du skal specificere et ikke tomt kodeord"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Forkert kodeord, ikke it MD5 hash!"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "TilfÃ¸j en Ven"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Forbindelsen fejlede"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Du skal indtaste en brugbar IP og port"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr ""
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Kunne ikke Ã¥bne %s (%s)"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Succes! Forbindelse oprettet til aMule"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Succes! Forbindelse oprettet"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Hasher"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Færdiggør"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Færdig"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Pause"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Beskadiget"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Henter"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Venter"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr ""
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Begynder at lave MD4 og AICH hash for fil: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Begynder at lave MD4 hash for fil: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Begynder at lave AICH hash for fil: %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Fejlede"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Konverter gamle AICH hashsæt i '%s' til 64b i '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr ""
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
 msgstr ""
-"ADVARSEL: Filnavnet '%s' er ikke understøttet og er blevet omdøbt til '%s'"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "ADVARSEL: Filen '%s' eksistere, ny fil omdøbt til '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr ""
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "ADVARSEL: Kunne ikke fjerne orginal '%s' efter oprettelse af backup"
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "BekrÃ¦ft afslut"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "ADVARSEL: Kunne ikke slette '%s'"
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "Accepter ydre forbindelser"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Hentelse af delte fier fra bruger '%s' fejlede"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr ""
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Ukendt"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Falsk eMule version-%#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " Falsk eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Falsk eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr ""
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (baseret på eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr ""
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
+#: src/amule.cpp:658
+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/BaseClient.cpp:1962
-#, fuzzy, c-format
-msgid "Requested: %s\n"
-msgstr "Anmodede:"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr ""
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not bind ports to the specified address: %s"
+msgstr ""
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Anmodet om ukendt fil"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr ""
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Brugernavn"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Venner"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Vis &Detaljer"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Tilføj en ven"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Fjern Ven"
-
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Send &Besked"
-
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Se Filer"
-
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:273
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Er du sikker på at du ønsker at slette de(n) valgt(e) ven(ner)?"
-
-#: src/FriendListCtrl.cpp:275
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Er du sikker på at du ønsker at slette de(n) valgt(e) ven(ner)?"
-
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Afbryd"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr ""
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1031
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/UserEvents.h:60
-msgid "Download completed"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
+#: src/amule.cpp:1043
+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/UserEvents.h:67
-msgid "The name of the file without path component."
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
 msgstr ""
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
 msgstr ""
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr ""
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "Servernavn :"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr ""
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "FEJL: Kan ikke Ã¥bne logfil"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr ""
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "FARE: logfilen er tom. Noget er galt"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Fil Navn"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Log nulstillet"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Størrelse"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "ServerBesked: %s"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Type"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Priotet"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Fejl ved hentning af node listen"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "Fil ID"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Fejl ved Ã¥bning af den hentet version check filen"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Anmodninger"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Korrupt version check fil"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Godtaget Anmodninger"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Du bruger en forÃ¦ldet version af aMule"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Overført Data"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Din aMule version er %i.%i.%i og den sisdte nye version er %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Delings Kvote"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Den sidste nye version kan altid findes hos http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Sendte Dele"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "FARE: Din aMule version er forÃ¦ldet: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Hele kilder"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Din kopi af aMule er op til dato"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Mappe sti"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Fejl ved hentning af version check filen"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Delte Filer"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Meget lav"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Lav"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normal"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Høj"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Meget Høj"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Forbundet til %s %s"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Udgiv"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Forbundet til %s"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Auto"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Tilføj kommentar/bedømmelse"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad startet."
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Rediger Kommentar/Bedømmelse"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad stoppet."
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Omdøb"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Forbundet til Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Tilføj filer i samling til overførelses liste"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Forbundet til Kad (med firewall)"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Kopier magnet &URI til udklipsholder"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Afbrudt fra Kad"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
 msgstr ""
+"Kad netvÃ¦rk kan ikke bruges hvis UDP port er fravalgt i instillinger, "
+"starter ikke."
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr ""
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Kad netvÃ¦rk fravalgt i instillinger, forbinder ikke."
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
+#: src/amuled.cpp:711
 #, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-
-#: src/SharedFilesCtrl.cpp:306
-#, fuzzy
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Du skal have et HighID for at lave et godkendt kildelink"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
+msgid "ERROR: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:451
+#: src/amuleDlg.cpp:238
 #, c-format
-msgid "Shared Files (%i)"
-msgstr "Delte Filer (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[DeleAfFil]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Indtast nyt navn for denne fil:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Omdøb fil"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Genoptager uploads af fil: %s"
-
-#: src/UploadQueue.cpp:520
-#, fuzzy, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Suspender upload af fil: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
+msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: søgeord er for kort"
-
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, fuzzy, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Læs %u Kad kontakter"
-msgstr[1] "Læs %u Kad kontakter"
-
-#: src/kademlia/routing/RoutingZone.cpp:297
+#: src/amuleDlg.cpp:240
 #, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
+msgid "Running on %s"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Admoding fejlede med følgende fejl: %s."
-
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Admodning fejlede med en ukendt fejl."
-
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Index fil ikke fundet: "
-
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Session udløbet - admoder login\n"
-
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Session ok, logget in\n"
-
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Session ok, ikke logget in\n"
-
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Ingen session åbnet - vil admode om login\n"
-
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Session oprettet - admoder login\n"
-
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Udfører anmodning [Original]: "
-
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Undersøger password\n"
-
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Password hash invalid\n"
-
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Passwork ok\n"
-
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Password forkert\n"
-
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Intet password skrevet. Blank password er ikke gyldigt.\n"
-
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Logout anmodning\n"
-
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Udfører forespørgsel [omledt]: "
-
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Henter template <str>"
-
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP port"
-
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Brug gzip komprimering"
-
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Tillad bruger adgang"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMule configurations fil sti. BRUG IKKE DIREKTE"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule Web Server"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Ikke tilgængelig"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr ""
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Aldrig"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr ""
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Downloader..."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr ""
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Forbinder"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Indstillinger"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Mappe indholdende amulesig.dat fil"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Gennemse"
+#: src/amuleDlg.cpp:715
+#, fuzzy
+msgid "Kad: Firewalled"
+msgstr "firewalled"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Skriv her i hvilken mappe amulesig.dat befinder sig"
+#: src/amuleDlg.cpp:719
+#, fuzzy
+msgid "Kad: Connected"
+msgstr "Forbundet"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Opdaterings rate interval i sekunder"
+#: src/amuleDlg.cpp:724
+#, fuzzy
+msgid "Kad: Connecting"
+msgstr "Forbinder"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Generer et statistisk billede for hver opdaterings hændelse"
+#: src/amuleDlg.cpp:728
+#, fuzzy
+msgid "Kad: Off"
+msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Skriv her mappen hvor du vil generere det statistiske billede"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Afbryd"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Upload periodisk dit statistiske billede til en FTP server"
+#: src/amuleDlg.cpp:775
+#, fuzzy
+msgid "Stop the current connection attempts"
+msgstr "Stop de nuvÃ¦rende forbindelses forsÃ¸g"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP Url"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Afbryd"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP Sti"
+#: src/amuleDlg.cpp:781
+#, fuzzy
+msgid "Disconnect from the currently connected networks"
+msgstr "Afbryd fra nuvÃÅ rende server"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Skriv her URL på din FTP server"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Forbind"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
 msgstr ""
-"Skriv her biblioteket hvor dit statistiske billede på FPT serveren skal ligge"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Bruger"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Password"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Op: %.1f | Ned: %.1f"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Skriv her brugernavnet for at logge på din FTP server"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Skriv her bruger passworded for at logge på din FTP server"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "FTP opdaterings interval i minutter"
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Vil du virkelig afslutte aMule?"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Valider"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "BekrÃ¦ft afslut"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Mapper der indeholder din signatur fil"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Mappe hvor det statistiske billede bliver genereret"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amuleDlg.cpp:1232
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i dag(e) %i time(r) %i Minut(ter) %i s"
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, aMule Online Statistik"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Velkommen"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+msgid "Skin directory '%s' does not exist"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Maksimum DL rate siden wxCas er startet"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Absolute Maksimum DL rate gennem wxCas forrige kørsel"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Reset"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "System"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "SÃ¸g"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Stop Auto Genopfriskning"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "SÃ¸ge Vindue"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Gem Online Statistisk billede"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Downloads"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Print Online Statistisk billede"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Henter"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Omking wxCas"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Start Auto Opdatering"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Beskeder"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Auto Opdatering stoppet"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Besked Vindue"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Auto Opdatering startet"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Gem Statistisk Billede"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMule Online Statistik"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Indstillinger"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
 msgstr ""
-"Der var et problem med udskrivningen.\n"
-"Måske printer instillingerne er forkerte."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Udskrivning"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
 msgstr ""
-"wxCas, aMule Online Signatur Statistik\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Baseret på CAS af Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"Omdelt under GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, aMule kører ikke..."
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule kører"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule kører men ikke forbundet"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule forbinder"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh Oh, aMule status ukendt..."
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " har kørt i "
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " er stoppet !"
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Fatal Fejl: Kunne ikke oprette timer"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " er ikke forbundet !"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " forbinder..."
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Fatal Fejl: Kunne ikke oprette timer"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr "gør noget mærkeligt, undersøg det !"
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " er forbundet til "
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "Forbinder"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "firewalled"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "afbrudt"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " er tændt "
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
+#: src/amule-remote-gui.cpp:407
 #, fuzzy
-msgid " with "
-msgstr "] med "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr " Total Download: "
+msgid "Ready"
+msgstr "Opdater"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Upload: "
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Sesion Download: "
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Download: "
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Ukendt"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upload: "
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Hentelse af delte fier fra bruger '%s' fejlede"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/BaseClient.cpp:1590
 #, fuzzy
-msgid " kB/s"
-msgstr "kB/s"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Deling: "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " fil(er), Klienter i kø: "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Tid: "
+msgid "Searching buddy for lowid connection"
+msgstr "venter pÃÂ¥ forbindelse..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/BaseClient.cpp:1802
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " tændt "
+msgid " (Fake eMule version %#x)"
+msgstr " (Falsk eMule version-%#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "System Hentnings Gennemsnit (1-5-15 min): "
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " Falsk eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr ""
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Falsk eMule)"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
+#: src/BaseClient.cpp:1854
 #, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02umin %02us"
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (baseret pÃ¥ eMule v0.%u)"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/BaseClient.cpp:2027
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+msgid "NickName: %s ID: %u"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+#: src/BaseClient.cpp:2029
+#, fuzzy, c-format
+msgid "Requested: %s\n"
+msgstr "Anmodede:"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/BaseClient.cpp:2031
 #, c-format
-msgid "%02us"
-msgstr "%02us"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HøjtID"
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "Lavt ID"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Ingen Forbindelse"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Anmodet om ukendt fil"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
+#: src/BaseClient.cpp:2700
 #, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/BaseClient.cpp:2807
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "New message from '%s' (IP:%s)"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr "Bruger %s (%u) anmodede om din deleliste -> %s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "WARNING: %s cannot be opened."
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-#, fuzzy
-msgid "Cancelled !"
-msgstr "Anulleret !"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Uventet fil fejl ved skrivning %s : %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
-#, c-format
-msgid "Unable to open %s"
-msgstr "Ikke muligt at åbne %s"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Fejl ved forbindelse til %s (%s:%i): %d"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Indput parametre"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategori"
+
+#: src/CatDialog.cpp:87
+msgid "New Category"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "VÃ¦lg en mappe til indkommende filer"
+
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/CatDialog.cpp:162
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Tilføj"
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Ryd"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ChatSelector.cpp:335
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr ""
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Luk tab"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Start"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Luk alle tabs"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr ""
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Luk andre tabs"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr ""
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "TilfÃ¸j til Venner"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Afslut"
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr ""
+#: src/ClientCreditsList.cpp:161
+#, fuzzy, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] "Kredit udlÃÅ¾bet!"
+msgstr[1] "Kredit udlÃÅ¾bet!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr ""
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Klient Detaljer"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr ""
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "Lavt ID"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr ""
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HÃ¸jtID"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-#, fuzzy
-msgid "Can't open the clipboard"
-msgstr "Kopier magnet &URI til udklipsholder"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Forbundet"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr ""
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Afbrudt"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Ikke fÃ¦rdig"
+
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
+msgstr "Bruger %s (%u) anmodede om din deleliste -> %s"
+
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr "Bruger %s (%u) anmodede om din deleliste -> %s"
+
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/ClientTCPSocket.cpp:967
 #, c-format
-msgid "Done in %.2f s"
+msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "Bruger %s (%u) anmodede om din deleliste -> %s"
+
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/ClientTCPSocket.cpp:1006
 #, c-format
-msgid "Processing file number %u: %s"
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Fil Kommentarer"
+
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Brugernavn"
+
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Fil Navn"
+
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
-#, c-format
-msgid "%s ---> Non existant file !\n"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Ingen kommentarer"
+
+#: src/CommentDialogLst.cpp:105
+#, fuzzy, c-format
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "Ingen kommentarer"
+msgstr[1] "Ingen kommentarer"
+
+#: src/CorruptionBlackBox.cpp:227
+#, c-format
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
 #: src/DataToText.cpp:37
@@ -1298,37 +1103,63 @@
 
 #: src/DataToText.cpp:39
 msgid "Auto [Hi]"
-msgstr "Auto [Hø]"
+msgstr "Auto [HÃ¸]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Forbinder"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Meget lav"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Lav"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normal"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "HÃ¸j"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Meget HÃ¸j"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Udgiv"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
-msgstr "Spørger"
+msgstr "SpÃ¸rger"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Forbinder via Server"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
-msgstr "Kø Fuld"
+msgstr "KÃ¸ Fuld"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
-msgstr "I Kø"
+msgstr "I KÃ¸"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Overfører"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Henter"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
-msgstr "Modtaget Hashsæt"
+msgstr "Modtaget HashsÃ¦t"
 
 #: src/DataToText.cpp:67
 msgid "No needed parts"
@@ -1350,8 +1181,7 @@
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Banlyst"
 
@@ -1383,8 +1213,8 @@
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr ""
 
@@ -1405,14 +1235,13 @@
 msgstr ""
 
 #: src/DataToText.cpp:135
-#, fuzzy
 msgid "Search Result"
-msgstr "Søg"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
-msgstr "Færdig"
+msgstr "FÃ¦rdig"
 
 #: src/DataToText.cpp:146
 msgid "In progress"
@@ -1434,7 +1263,7 @@
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr ""
 
@@ -1446,5523 +1275,6160 @@
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "System standard"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
 
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabic"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "StÃ¸rrelse"
 
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "Estonian"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "OverfÃ¸rt"
 
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Basque"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Hastighed"
 
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgarian"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "ForlÃ¸b"
 
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Catalan"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Kilder"
 
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Priotet"
 
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Status"
 
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Tid Tilbage"
 
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr ""
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Sidst FÃ¦rdig"
 
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Danish"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Sidste Kontakt"
 
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Dutch"
+#: src/DownloadListCtrl.cpp:411
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Er du sikker pÃ¥ at du Ã¸nsker at slette de(n) valgt(e) ven(ner)?"
 
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
+#: src/DownloadListCtrl.cpp:413
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Er du sikker pÃ¥ at du Ã¸nsker at slette de(n) valgt(e) ven(ner)?"
+
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
 
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estonian"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finnish"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Stop"
 
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "French"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pause"
 
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr ""
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Genoptag"
 
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "German"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "Ryd fÃ¦rdige"
 
-#: src/Preferences.cpp:647
-msgid "Greek"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/Preferences.cpp:648
-msgid "Hebrew"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/Preferences.cpp:649
-msgid "Hungarian"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italian"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Udvidet Muligheder"
 
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Smug Kig"
 
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr ""
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Vis fil &detaljer"
 
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Korean"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Vis alle kommentarer"
 
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lithuanian"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr ""
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polish"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr ""
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portuguese"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "fjern fra ketegori"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Flyt til kategori"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Russian"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Ãben filen"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Indtast nyt navn for denne fil:"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Spanish"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "OmdÃ¸b fil"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
 msgstr ""
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr ""
+#: src/DownloadListCtrl.cpp:1268
+#, c-format
+msgid "Downloads (%i)"
+msgstr "Downloads (%i)"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
+#: src/DownloadListCtrl.cpp:1412
+msgid ""
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
 msgstr ""
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+#: src/DownloadListCtrl.cpp:1461
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
 msgstr ""
 
-#: src/Preferences.cpp:1681
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "Default port will be used (%d)"
+msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Servernavn"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Beskrivelse"
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "Anmoder om delte filer fra '%s'"
 
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
+#: src/DownloadQueue.cpp:132
+#, c-format
+msgid "Loading PartFile %u of %u"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Brugere"
+#: src/DownloadQueue.cpp:154
+msgid ""
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Filer"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Fejlede"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Ingen part filer fundet"
 
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Statistik"
+#: src/DownloadQueue.cpp:168
+#, fuzzy, c-format
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Fandt %i part filer"
+msgstr[1] "Fandt %i part filer"
 
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:144
-msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
+#: src/DownloadQueue.cpp:374
+#, c-format
+msgid "Downloading %s"
+msgstr "Downloader %s"
 
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
+#: src/DownloadQueue.cpp:382
+#, c-format
+msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:149
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Are you sure you want to delete the static server %s"
+msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Ja"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Nej"
+#: src/DownloadQueue.cpp:399
+#, c-format
+msgid "You are already trying to download the file %s"
+msgstr "Du prÃ¸ver allerede at downloade denne fil %s"
 
-#: src/ServerListCtrl.cpp:346
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Failed to open '%s'"
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:369
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Servers (%i)"
-msgstr "Servere (%i)"
+msgid "Unknown protocol of link: %s"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Server"
+#: src/DownloadQueue.cpp:1430
+#, c-format
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
+#: src/ExternalConn.cpp:278
+msgid "External connection closed."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
+#: src/ExternalConn.cpp:317
+msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
+#: src/ExternalConn.cpp:340
+msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
+#: src/ExternalConn.cpp:400
+msgid "New external connection accepted"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Fjern server"
+#: src/ExternalConn.cpp:403
+msgid "ERROR: couldn't accept a new external connection"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:440
-#, fuzzy
-msgid "Remove servers"
-msgstr "Fjern server"
+#: src/ExternalConn.cpp:421
+msgid "External connection refused due to empty password in preferences!"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Fjern Alle servere"
+#: src/ExternalConn.cpp:430
+#, c-format
+msgid "Connecting client: %s %s"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
+#: src/ExternalConn.cpp:432
+msgid "Unknown version"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
+#: src/ExternalConn.cpp:442
+msgid ""
+"Incorrect EC version ID, there might be binary incompatibility. Use core and "
+"remote from same snapshot."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
+#: src/ExternalConn.cpp:447
+msgid ""
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
+#: src/ExternalConn.cpp:475
+msgid "Invalid protocol version."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:570
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Er du sikker på at du ønsker at slette de(n) valgt(e) ven(ner)?"
+#: src/ExternalConn.cpp:480
+msgid "Missing protocol version tag."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:572
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Er du sikker på at du ønsker at slette de(n) valgt(e) ven(ner)?"
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Inaktiv [%s]"
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr ""
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/amuleDlg.cpp:212
-#, c-format
-msgid "Running on %s"
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
+#: src/ExternalConn.cpp:521
+msgid "Access granted."
 msgstr ""
 
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
+#: src/ExternalConn.cpp:799
+#, c-format
+msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/ExternalConn.cpp:801
+#, c-format
+msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
+msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
+#: src/ExternalConn.cpp:876
+msgid "Server not added"
 msgstr ""
 
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
+#: src/ExternalConn.cpp:894
+#, c-format
+msgid "server not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
+#: src/ExternalConn.cpp:910
+msgid "need to define server to be removed"
 msgstr ""
 
-#: src/amuleDlg.cpp:469
-msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+#: src/ExternalConn.cpp:924
+msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
+#: src/ExternalConn.cpp:1102
+msgid "Search in progress. Refetch results in a moment!"
 msgstr ""
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/ExternalConn.cpp:1108
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#: src/ExternalConn.cpp:1306
+msgid "No points for graph."
 msgstr ""
 
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
+#: src/ExternalConn.cpp:1315
+msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
+#: src/ExternalConn.cpp:1342
+msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
+#: src/ExternalConn.cpp:1354
+msgid "Already shutting down."
 msgstr ""
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
+#: src/ExternalConn.cpp:1366
+#, c-format
+msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/amuleDlg.cpp:692
-#, fuzzy
-msgid "Kad: Firewalled"
-msgstr "firewalled"
+#: src/ExternalConn.cpp:1372
+msgid "Invalid link or already on list."
+msgstr ""
 
-#: src/amuleDlg.cpp:696
-#, fuzzy
-msgid "Kad: Connected"
-msgstr "Forbundet"
+#: src/ExternalConn.cpp:1442
+msgid "File not found."
+msgstr ""
 
-#: src/amuleDlg.cpp:701
-#, fuzzy
-msgid "Kad: Connecting"
-msgstr "Forbinder"
+#: src/ExternalConn.cpp:1447
+msgid "Invalid file name."
+msgstr ""
 
-#: src/amuleDlg.cpp:705
-#, fuzzy
-msgid "Kad: Off"
-msgstr " Kad: "
+#: src/ExternalConn.cpp:1455
+msgid "Unable to rename file."
+msgstr ""
 
-#: src/amuleDlg.cpp:752
-#, fuzzy
-msgid "Stop the current connection attempts"
-msgstr "Stop de nuværende forbindelses forsøg"
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr ""
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Afbryd"
+#: src/ExternalConn.cpp:1790
+msgid "Already connected to eD2k."
+msgstr ""
 
-#: src/amuleDlg.cpp:758
-#, fuzzy
-msgid "Disconnect from the currently connected networks"
-msgstr "Afbryd fra nuvÃ¦rende server"
+#: src/ExternalConn.cpp:1793
+msgid "Connecting to eD2k..."
+msgstr ""
 
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Forbind"
+#: src/ExternalConn.cpp:1801
+msgid "Already connected to Kad."
+msgstr ""
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
+#: src/ExternalConn.cpp:1804
+msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+#: src/ExternalConn.cpp:1811
+msgid "All networks are disabled."
+msgstr ""
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Op: %.1f | Ned: %.1f"
+#: src/ExternalConn.cpp:1819
+msgid "Disconnected from eD2k."
+msgstr ""
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
+#: src/ExternalConn.cpp:1823
+msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/amuleDlg.cpp:836
+#: src/ExternalConn.cpp:1832
 #, c-format
-msgid "aMule (%s | Disconnected)"
+msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Vil du virkelig afslutte aMule?"
-
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Bekræft afslut"
+#: src/ExternalConn.cpp:1835
+msgid "Invalid opcode (wrong protocol version?)"
+msgstr ""
 
-#: src/amuleDlg.cpp:1182
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Skin directory '%s' does not exist"
+msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1187
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
+msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Søg"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Overførsler"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
+#: src/ExternalConnector.cpp:186
+#, c-format
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Beskeder"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
 msgstr ""
 
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistik"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
 msgstr ""
 
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
+#: src/ExternalConnector.cpp:248
+#, c-format
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
 msgstr ""
 
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
 msgstr ""
 
-#: src/amuleDlg.cpp:1468
-msgid "No network"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "General"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Forbindelse"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Mapper"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Servere"
+#: src/ExternalConnector.cpp:302
+#, c-format
+msgid "Type '%s' to get more help.\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
+#: src/ExternalConnector.cpp:357
+#, c-format
+msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
+#: src/ExternalConnector.cpp:359
+#, c-format
+msgid "This is %s %s\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:177
-#, fuzzy
-msgid "Filters"
-msgstr "Filer"
+#: src/ExternalConnector.cpp:414
+#, c-format
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Fjern Kontrol"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
+#: src/FileDetailDialog.cpp:113
+#, c-format
+msgid "%.1f%% done"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Op: 0.0 | Ned: 0.0"
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
-msgstr ""
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Venner"
 
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Vis &Detaljer"
+
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "TilfÃ¸j en ven"
+
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Fjern Ven"
+
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Send &Besked"
+
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Se Filer"
+
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
+#: src/FriendListCtrl.cpp:169
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Er du sikker pÃ¥ at du Ã¸nsker at slette de(n) valgt(e) ven(ner)?"
+
+#: src/FriendListCtrl.cpp:171
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Er du sikker pÃ¥ at du Ã¸nsker at slette de(n) valgt(e) ven(ner)?"
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
+#: src/GenericClientListCtrl.cpp:547
+msgid "Send message to user"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Gennemse efter Video Afspiller"
+#: src/GenericClientListCtrl.cpp:548
+msgid "Message to send:"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
+#: src/GenericClientListCtrl.cpp:587
+msgid "Remove from friends"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:950
-#, c-format
-msgid "Executable%s"
+#: src/GenericClientListCtrl.cpp:598
+msgid "Send message"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
+#: src/GenericClientListCtrl.cpp:600
+msgid "Swap to this file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/GenericClientListCtrl.cpp:943
+msgid "A4AF"
 msgstr ""
-"Tilføj URLer hvor der kan hentes server.met filer.\n"
-"Kun en URL på hver linje."
 
-#: src/PrefsUnifiedDlg.cpp:1031
+#: src/GenericClientListCtrl.cpp:995
 #, fuzzy, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Opdaterings interval : 5 sek"
-msgstr[1] "Opdaterings interval : 5 sek"
+msgid "On Queue: %u (%i)"
+msgstr "I KÃ¸"
 
-#: src/PrefsUnifiedDlg.cpp:1038
-#, fuzzy, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Tid for gennemsnitlig graf: 100 min"
-msgstr[1] "Tid for gennemsnitlig graf: 100 min"
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
+msgid "Asked for another file"
+msgstr "SpÃ¸rger efter en anden fil"
 
-#: src/PrefsUnifiedDlg.cpp:1044
-#, c-format
-msgid "Connections Graph Scale: %d"
-msgstr ""
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Ventende Uploads: %i"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/GenericClientListCtrl.cpp:1026
 #, fuzzy, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Opdaterings interval : 5 sek"
-msgstr[1] "Opdaterings interval : 5 sek"
+msgid "On Queue: %u"
+msgstr "I KÃ¸"
 
-#: src/PrefsUnifiedDlg.cpp:1056
-#, fuzzy, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Fil Buffer StÃ¸rrelse %i bytes"
-msgstr[1] "Fil Buffer StÃ¸rrelse %i bytes"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Upload"
 
-#: src/PrefsUnifiedDlg.cpp:1062
-#, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] ""
-msgstr[1] ""
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Ingen"
 
-#: src/PrefsUnifiedDlg.cpp:1069
-#, fuzzy, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Server forbindelses opdaterings interval %i min"
-msgstr[1] "Server forbindelses opdaterings interval %i min"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Nej"
 
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Server forbindelses opdaterings interval: Inaktiv"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Ja"
 
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr ""
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Downloader..."
 
-#: src/PrefsUnifiedDlg.cpp:1118
+#: src/HTTPDownload.cpp:109
 #, fuzzy
-msgid "disabled"
-msgstr "deaktiver"
+msgid "HTTP download cancelled"
+msgstr "Max download grÃÅ nse"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
+msgid "Unable to create destination file %s for download!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
+#: src/HTTPDownload.cpp:233
+#, c-format
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr ""
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
+msgstr "Downloaded:"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
+#: src/HTTPDownload.cpp:279
+#, c-format
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
 
-#: src/ExternalConn.cpp:116
-msgid "External connection closed."
+#: src/HTTPDownload.cpp:336
+msgid ""
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
 
-#: src/ExternalConn.cpp:143
-msgid "External connections disabled due to empty password!"
-msgstr ""
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Du er ikke forbundet til en server!"
 
-#: src/ExternalConn.cpp:168
-msgid "External connections disabled in config file"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
 
-#: src/ExternalConn.cpp:217
-msgid "New external connection accepted"
+#: src/IP2Country.cpp:100
+#, c-format
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:220
-msgid "ERROR: couldn't accept a new external connection"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:239
-msgid "External connection refused due to empty password in preferences!"
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
+#, c-format
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:249
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Connecting client: %s %s"
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:251
-msgid "Unknown version"
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
+#, c-format
+msgid "Successfully updated %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:262
-msgid ""
-"Incorrect EC version ID, there might be binary incompatibility. Use core and "
-"remote from same snapshot."
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
 
-#: src/ExternalConn.cpp:267
-msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
-msgstr ""
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Kunne ikke hente serverlist fra %s"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr ""
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Fejl ved indlÃÅ sning af kreditfil"
 
-#: src/ExternalConn.cpp:292
-msgid "Invalid protocol version."
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/ExternalConn.cpp:296
-msgid "Missing protocol version tag."
+#: src/IPFilter.cpp:299
+#, c-format
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/IPFilter.cpp:325
+#, c-format
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/ExternalConn.cpp:306
-msgid "Access granted."
-msgstr ""
+#: src/IPFilter.cpp:329
+#, c-format
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:564
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Remote PartFile command failed: FileHash not found: %s"
-msgstr ""
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:566
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "FileHash not found: %s"
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
-msgid "OOPS! OpCode processing error!"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
 
-#: src/ExternalConn.cpp:659
-msgid "Server not added"
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
 msgstr ""
 
-#: src/ExternalConn.cpp:677
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "server not found: %s"
+msgid "Nodes (%u)"
 msgstr ""
 
-#: src/ExternalConn.cpp:693
-msgid "need to define server to be removed"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/ExternalConn.cpp:707
-msgid "eD2k is disabled in preferences."
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/ExternalConn.cpp:803
-msgid "Search in progress. Refetch results in a moment!"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
 msgstr ""
 
-#: src/ExternalConn.cpp:808
-msgid "WebSearch from remote interface makes no sense."
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/ExternalConn.cpp:1020
-msgid "No points for graph."
+#: src/KadDlg.cpp:213
+msgid "Continue?"
 msgstr ""
 
-#: src/ExternalConn.cpp:1029
-msgid "Your client is not configured for this detail level."
-msgstr ""
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: sÃ¸geord er for kort"
 
-#: src/ExternalConn.cpp:1057
-msgid "External Connection: shutdown requested"
+#: src/kademlia/kademlia/SearchManager.cpp:133
+#, c-format
+msgid "Keyword for search: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1069
-msgid "Already shutting down."
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1077
-#, c-format
-msgid "ExternalConn: adding link '%s'."
+#: src/kademlia/routing/RoutingZone.cpp:172
+msgid ""
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
 
-#: src/ExternalConn.cpp:1083
-msgid "Invalid link or already on list."
-msgstr ""
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
+#, fuzzy, c-format
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "LÃ¦s %u Kad kontakter"
+msgstr[1] "LÃ¦s %u Kad kontakter"
 
-#: src/ExternalConn.cpp:1168
-msgid "File not found."
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/ExternalConn.cpp:1173
-msgid "Invalid file name."
-msgstr ""
+#: src/kademlia/routing/RoutingZone.cpp:307
+#, c-format
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:1181
-msgid "Unable to rename file."
-msgstr ""
+#: src/kademlia/routing/RoutingZone.cpp:338
+#, c-format
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:1405
-msgid "Already connected to eD2k."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
 msgstr ""
 
-#: src/ExternalConn.cpp:1408
-msgid "Connecting to eD2k..."
+#: src/KnownFile.cpp:1545
+msgid "File size"
 msgstr ""
 
-#: src/ExternalConn.cpp:1416
-msgid "Already connected to Kad."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
 msgstr ""
 
-#: src/ExternalConn.cpp:1419
-msgid "Connecting to Kad..."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
 msgstr ""
 
-#: src/ExternalConn.cpp:1424
-msgid "All networks are disabled."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1432
-msgid "Disconnected from eD2k."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:1436
-msgid "Disconnected from Kad."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
 msgstr ""
 
-#: src/ExternalConn.cpp:1444
-#, c-format
-msgid "External Connection: invalid opcode received: %#x"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/ExternalConn.cpp:1447
-msgid "Invalid opcode (wrong protocol version?)"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr ""
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Ukendt: %i"
 
-#: src/TerminationProcess.cpp:48
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
 #, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
+msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Hasher"
 
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "FÃ¦rdiggÃ¸r"
 
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "FÃ¦rdig"
 
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Forbundet"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Pause"
 
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Port"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Beskadiget"
 
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Venter"
 
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr ""
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Du skal specificere et ikke tomt kodeord"
 
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr ""
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Forkert kodeord, ikke it MD5 hash!"
 
-#: src/ServerWnd.cpp:214
-msgid "Status:"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Forbindelsen fejlede"
+
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Afbrudt"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "ExternalConn: DÃ¥rligt svar fra server. Forbindelse lukket"
 
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr ""
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Succes! Forbindelse oprettet til aMule"
 
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Succes! Forbindelse oprettet"
+
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "Ydre Forbindelses Parametre"
 
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
 msgstr ""
 
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
 msgstr ""
 
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr ""
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Luk"
 
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
 msgstr ""
 
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
 msgstr ""
 
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Overfør"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr ""
 
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Uploads"
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Ryd"
 
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
 msgstr ""
 
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
+
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "UbegrÃ¦nset"
+
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
 msgstr ""
 
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
 msgstr ""
 
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Server Overhead (Packets): %s"
+msgid "UL: %u"
 msgstr ""
 
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
 msgstr ""
 
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "Crypt overhead (UDP): %s"
+msgid "DL: %u"
 msgstr ""
 
-#: src/Statistics.cpp:662
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "Active Uploads: %s"
+msgid "Download speed: %.1f"
 msgstr ""
 
-#: src/Statistics.cpp:663
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "Waiting Uploads: %s"
+msgid "Upload speed: %.1f"
 msgstr ""
 
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
 msgstr ""
 
-#: src/Statistics.cpp:665
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Total failed upload sessions: %s"
+msgid "Nickname: %s"
 msgstr ""
 
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Gennemsnitlig upload tid: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr ""
 
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Downloads"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "Klient ID: "
 
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
 msgstr ""
 
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr ""
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "ServerNavn: "
 
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr ""
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "ServerIP: "
 
-#: src/Statistics.cpp:686
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Ingen Forbindelse"
+
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Session UL:DL Ratio (Total): %s"
+msgid "IP: %s"
 msgstr ""
 
-#: src/Statistics.cpp:689
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Average download rate (Session): %s"
+msgid "TCP port: %d"
 msgstr ""
 
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/Statistics.cpp:691
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Max download rate (Session): %s"
+msgid "UDP port: %d"
 msgstr ""
 
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Genforbindelser: %i"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Online Signatur: Aktiv"
 
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Tid Siden Første Overførsel: %s"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Online Signatur: Inaktiv"
 
-#: src/Statistics.cpp:695
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Forbundet Til Server Siden: %s"
+msgid "Uptime: %s"
+msgstr ""
 
-#: src/Statistics.cpp:696
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Active Connections (estimate): %i"
+msgid "Shared files: %d"
 msgstr ""
 
-#: src/Statistics.cpp:697
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "Max Connection Limit Reached: %s"
+msgid "Queued clients: %d"
 msgstr ""
 
-#: src/Statistics.cpp:698
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Average Connections (estimate): %g"
+msgid "Total DL: %s"
 msgstr ""
 
-#: src/Statistics.cpp:700
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Peak Connections (estimate): %i"
+msgid "Total UL: %s"
 msgstr ""
 
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Klienter"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
 msgstr ""
 
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
 msgstr ""
 
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
 msgstr ""
 
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
 msgstr ""
 
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr ""
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Afslut"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
+#: src/muuli_wdr.cpp:75
+msgid "eD2k Link: "
 msgstr ""
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr ""
+#: src/muuli_wdr.cpp:82
+msgid "Commit"
+msgstr "OverfÃ¸r"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
+#: src/muuli_wdr.cpp:83
+msgid ""
+"Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
+#: src/muuli_wdr.cpp:91
+msgid ""
+"Events are displayed here. For a complete list of events, refer to the log "
+"in the Servers-tab."
 msgstr ""
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr ""
+#: src/muuli_wdr.cpp:94
+msgid "Loading ..."
+msgstr "Henter ..."
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr ""
+#: src/muuli_wdr.cpp:102
+msgid "Number of users on the server you are connected to ..."
+msgstr "Antal brugere pÃ¥ den server du er forbundet til ..."
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr ""
+#: src/muuli_wdr.cpp:105
+msgid "Users: 0"
+msgstr "Brugere: 0"
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
+#: src/muuli_wdr.cpp:106
+msgid ""
+"Users connected to the current server and an estimate of the total number of "
+"users."
 msgstr ""
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Total Størrelse Af Delte Filer: %s"
+#: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Op: 0.0 | Ned: 0.0"
 
-#: src/Statistics.cpp:731
-#, c-format
-msgid "Average file size: %s"
+#: src/muuli_wdr.cpp:118
+msgid ""
+"Current average upload and download rates. If enabled the numbers in the "
+"braces signify the overhead from client communication."
 msgstr ""
 
-#: src/Statistics.cpp:872
-msgid "Operating System"
+#: src/muuli_wdr.cpp:126
+msgid ""
+"Displays the connected status and active transfers. Red arrows signifies "
+"that you are currently not connected, yellow arrows signify that you have "
+"low ID (firewalled) and green arrows signify that you have high ID (The "
+"optimal connection type)."
 msgstr ""
 
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr ""
+#: src/muuli_wdr.cpp:130
+msgid "Not Connected ..."
+msgstr "Ikke Forbundet ..."
 
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
+#: src/muuli_wdr.cpp:131
+msgid "Currently connected server."
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr ""
+#: src/muuli_wdr.cpp:177
+msgid "Search"
+msgstr "SÃ¸g"
 
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
+#: src/muuli_wdr.cpp:183
+msgid "Name:"
 msgstr ""
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr ""
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Type"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
+msgid "Local"
 msgstr ""
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
+#: src/muuli_wdr.cpp:197
+msgid "Global"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
+#: src/muuli_wdr.cpp:199
+msgid "FileHash"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
+#: src/muuli_wdr.cpp:207
+msgid "Extended Parameters"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#: src/muuli_wdr.cpp:213
+msgid "Filtering"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+#: src/muuli_wdr.cpp:224
+msgid "File Type"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Alle"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr ""
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Arkiver"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Lyd"
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD-Aftryk"
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr ""
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Billeder"
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr ""
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programer"
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr ""
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Videoer"
 
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
+#: src/muuli_wdr.cpp:254
+msgid "Extension"
+msgstr "Endelse"
+
+#: src/muuli_wdr.cpp:260
+msgid "Min Size"
+msgstr "Min StÃ¸rrelse"
+
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+msgid "Bytes"
+msgstr "Bytes"
+
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
+msgid "KB"
+msgstr "KB"
+
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
+msgid "Max Size"
+msgstr "Max StÃ¸rrelse"
+
+#: src/muuli_wdr.cpp:306
+msgid "Availability"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/muuli_wdr.cpp:319
+msgid "Filter:"
 msgstr ""
 
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
+#: src/muuli_wdr.cpp:328
+msgid "Filter Results"
 msgstr ""
 
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
+#: src/muuli_wdr.cpp:334
+msgid "Invert Result"
 msgstr ""
 
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
+#: src/muuli_wdr.cpp:340
+msgid "Hide Known Files"
 msgstr ""
 
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Start"
+
+#: src/muuli_wdr.cpp:356
+msgid "More"
 msgstr ""
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
+#: src/muuli_wdr.cpp:357
+msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+#: src/muuli_wdr.cpp:364
+msgid "Stop"
 msgstr ""
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Download"
+
+#: src/muuli_wdr.cpp:378
+msgid "Reset Fields"
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
+#: src/muuli_wdr.cpp:393
+msgid "Results"
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
+#: src/muuli_wdr.cpp:422
+msgid "Clears completed downloads"
 msgstr ""
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Tilføj en Ven"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Fundne Kilder :"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Du skal indtaste en brugbar IP og port"
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "General"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr ""
+#: src/muuli_wdr.cpp:525
+msgid "Full Name :"
+msgstr "Navn :"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
+msgid "N/A"
+msgstr "N/A"
+
+#: src/muuli_wdr.cpp:536
+msgid "met-File :"
+msgstr "met-Fil :"
+
+#: src/muuli_wdr.cpp:547
+msgid "Hash :"
+msgstr "Hash :"
+
+#: src/muuli_wdr.cpp:562
+msgid "Filesize :"
+msgstr "FilstÃ¸rrelse :"
+
+#: src/muuli_wdr.cpp:573
+msgid "Partfilestatus :"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Kilder"
+#: src/muuli_wdr.cpp:584
+msgid "Last seen complete :"
+msgstr "Sidst fÃ¦rdig :"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Fil"
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "OverfÃ¸r"
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Download"
+#: src/muuli_wdr.cpp:606
+msgid "Found Sources :"
+msgstr "Fundne Kilder :"
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategori"
+#: src/muuli_wdr.cpp:617
+msgid "Transferring Sources :"
+msgstr "OverfÃ¸rer Kilder :"
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
+#: src/muuli_wdr.cpp:628
+msgid "Filepart-Count :"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr ""
+#: src/muuli_wdr.cpp:639
+msgid "Available :"
+msgstr "TilgÃ¦ngelig :"
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
+#: src/muuli_wdr.cpp:650
+msgid "Datarate :"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
+#: src/muuli_wdr.cpp:661
+msgid "Download Active Time: "
 msgstr ""
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr ""
+#: src/muuli_wdr.cpp:672
+msgid "Transferred :"
+msgstr "OverfÃ¸rt :"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr ""
+#: src/muuli_wdr.cpp:683
+msgid "Completed Size :"
+msgstr "FÃ¦rdig StÃ¸rrelse :"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
+#: src/muuli_wdr.cpp:710
+msgid "Intelligent Corruption Handling"
+msgstr "Intelligent Fejl HÃ¥ndtering"
+
+#: src/muuli_wdr.cpp:719
+msgid "Lost to corruption :"
+msgstr "Tabt pga beskadigelse :"
+
+#: src/muuli_wdr.cpp:730
+msgid "Gained by compression :"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
+#: src/muuli_wdr.cpp:741
+msgid "Packages saved by I.C.H. :"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/muuli_wdr.cpp:754
+msgid "File Names"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Brugere E: %s K: %s | Filer E: %s K: %s"
+#: src/muuli_wdr.cpp:763
+msgid "Takeover"
+msgstr "Overtag"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr ""
+#: src/muuli_wdr.cpp:773
+msgid "Cleanup"
+msgstr "Ryd Op"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
+msgid "Apply"
+msgstr "Anvend"
+
+#: src/muuli_wdr.cpp:798
+msgid "Ok"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Overført"
+#: src/muuli_wdr.cpp:823
+msgid "Comment/Rate file (Text will be visible to all users)"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Hastighed"
+#: src/muuli_wdr.cpp:829
+msgid ""
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Forløb"
+#: src/muuli_wdr.cpp:841
+msgid "File Quality"
+msgstr "Fil Kvalitet"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Status"
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Ikke anslÃ¥et"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Tid Tilbage"
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Invalid / fejl / Falsk"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Sidst Færdig"
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "DÃ¥rlig"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Sidste Kontakt"
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Nogen Lunde"
 
-#: src/DownloadListCtrl.cpp:581
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Er du sikker på at du ønsker at slette de(n) valgt(e) ven(ner)?"
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "God"
 
-#: src/DownloadListCtrl.cpp:583
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Er du sikker på at du ønsker at slette de(n) valgt(e) ven(ner)?"
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Glimrende"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
-msgid "Send message to user"
+#: src/muuli_wdr.cpp:854
+msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
-msgid "Message to send:"
+#: src/muuli_wdr.cpp:898
+msgid "Refresh"
+msgstr "Opdater"
+
+#: src/muuli_wdr.cpp:925
+msgid "Downloading, please wait ..."
+msgstr "Henter, vent venligst"
+
+#: src/muuli_wdr.cpp:931
+msgid "Unknown size"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Stop"
+#: src/muuli_wdr.cpp:955
+msgid "Required Information"
+msgstr "KrÃ¦vet Information"
 
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pause"
+#: src/muuli_wdr.cpp:960
+msgid "IP Address :"
+msgstr "IP Adresse :"
 
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Genoptag"
+#: src/muuli_wdr.cpp:966
+msgid "Port :"
+msgstr "Port :"
 
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "Ryd færdige"
+#: src/muuli_wdr.cpp:976
+msgid "Additional Information"
+msgstr "Aktuelle Adresse"
 
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr ""
+#: src/muuli_wdr.cpp:981
+msgid "Username :"
+msgstr "Brugernavn :"
 
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
+#: src/muuli_wdr.cpp:987
+msgid "Userhash :"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr ""
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "TilfÃ¸j"
 
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Udvidet Muligheder"
+#: src/muuli_wdr.cpp:1046
+msgid "Download-Speed"
+msgstr "Download-Hastighed"
 
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Smug Kig"
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
+msgid "Current"
+msgstr "NuvÃ¦rende"
 
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Vis fil &detaljer"
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
+msgid "Running average"
+msgstr "NuvÃ¦rende Gennemsnit"
 
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Vis alle kommentarer"
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
+msgid "Session average"
+msgstr "Sessions Gennemsnit"
 
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
+#: src/muuli_wdr.cpp:1095
+msgid "Upload-Speed"
+msgstr "Upload-Hastighed"
+
+#: src/muuli_wdr.cpp:1144
+msgid "Connections"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "fjern fra ketegori"
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
+msgid "Active downloads"
+msgstr "Aktive Downloads"
 
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Flyt til kategori"
+#: src/muuli_wdr.cpp:1173
+msgid "Active connections (1:1)"
+msgstr "Aktive Forbindelser (1:1)"
 
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Åben filen"
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
+msgid "Active uploads"
+msgstr "Aktive Uploads"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Remove from friends"
+#: src/muuli_wdr.cpp:1193
+msgid "Statistics Tree"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Tilføj til Venner"
+#: src/muuli_wdr.cpp:1223
+msgid "Username:"
+msgstr "Navn:"
 
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
-msgid "Send message"
+#: src/muuli_wdr.cpp:1226
+msgid "Userhash:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1017
-msgid "Swap to this file"
+#: src/muuli_wdr.cpp:1249
+msgid "Client software:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
+#: src/muuli_wdr.cpp:1258
+msgid "Client version:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1657
-msgid "A4AF"
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
+msgid "IP address:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/muuli_wdr.cpp:1274
+msgid "User ID:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1721
-msgid "Asked for another file"
-msgstr "Spørger efter en anden fil"
-
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Downloads (%i)"
+#: src/muuli_wdr.cpp:1281
+msgid "Server IP:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
+#: src/muuli_wdr.cpp:1290
+msgid "Server name:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
+#: src/muuli_wdr.cpp:1297
+msgid "Obfuscation:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+#: src/muuli_wdr.cpp:1306
+msgid "Kad:"
 msgstr ""
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "Fejl: Kunne ikke oprette partfil"
+#: src/muuli_wdr.cpp:1317
+msgid "Transfers to client"
+msgstr ""
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
+#: src/muuli_wdr.cpp:1322
+msgid "Current request:"
 msgstr ""
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
+#: src/muuli_wdr.cpp:1335
+msgid "Average upload rate:"
 msgstr ""
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
+#: src/muuli_wdr.cpp:1344
+msgid "Average download rate:"
 msgstr ""
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#: src/muuli_wdr.cpp:1351
+msgid "Uploaded (session):"
 msgstr ""
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/muuli_wdr.cpp:1360
+msgid "Downloaded (session):"
 msgstr ""
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
+#: src/muuli_wdr.cpp:1367
+msgid "Uploaded (total):"
 msgstr ""
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/muuli_wdr.cpp:1376
+msgid "Downloaded (total):"
 msgstr ""
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
+#: src/muuli_wdr.cpp:1387
+msgid "Scores"
+msgstr "Point:"
+
+#: src/muuli_wdr.cpp:1394
+msgid "DL/UP modifier:"
 msgstr ""
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
+#: src/muuli_wdr.cpp:1403
+msgid "Secure ident:"
 msgstr ""
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Kunne ikke åbne %s (%s)"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "KÃ¸ Fuld"
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
+#: src/muuli_wdr.cpp:1419
+msgid "Queue score:"
 msgstr ""
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr ""
+#: src/muuli_wdr.cpp:1448
+msgid "Nick"
+msgstr "Brugernavn"
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
 msgstr ""
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
+#: src/muuli_wdr.cpp:1452
+msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
 msgstr ""
 
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr ""
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
+#: src/muuli_wdr.cpp:1471
+msgid "Check for new version at startup"
 msgstr ""
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
+#: src/muuli_wdr.cpp:1472
+msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1475
+msgid "Start minimized"
+msgstr "Start minimeret"
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
+#: src/muuli_wdr.cpp:1476
+msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr ""
+#: src/muuli_wdr.cpp:1479
+msgid "Prompt on exit"
+msgstr "SpÃ¸rg ved afslut"
 
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
+#: src/muuli_wdr.cpp:1487
+msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/muuli_wdr.cpp:1488
+msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+#: src/muuli_wdr.cpp:1491
+msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+#: src/muuli_wdr.cpp:1492
+msgid ""
+"Enabling this will make aMule minimize to the System Tray, rather than the "
+"taskbar."
 msgstr ""
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
 msgstr ""
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
+#: src/muuli_wdr.cpp:1511
+msgid "Browser Selection"
 msgstr ""
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
+#: src/muuli_wdr.cpp:1517
+msgid ""
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "stoppet"
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Gennemse"
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/muuli_wdr.cpp:1525
+msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
+#: src/muuli_wdr.cpp:1527
+msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr ""
+#: src/muuli_wdr.cpp:1532
+msgid "Video Player"
+msgstr "Video Afspiller"
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr ""
 
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
+#: src/muuli_wdr.cpp:1579
+msgid "Upload"
+msgstr "Upload"
+
+#: src/muuli_wdr.cpp:1588
+msgid "Slot Allocation"
+msgstr "Slot Tildeling"
+
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
 msgstr ""
 
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
 msgstr ""
 
-#: src/SharedFileList.cpp:352
-#, fuzzy, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Fandt %i kendte delte filer"
-msgstr[1] "Fandt %i kendte delte filer"
+#: src/muuli_wdr.cpp:1611
+msgid "This is the standard eD2k port and cannot be disabled."
+msgstr ""
 
-#: src/SharedFileList.cpp:358
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Fandt %i kendte delte filer"
-msgstr[1] "Fandt %i kendte delte filer"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr ""
 
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Fil Kommentarer"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
 
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Ingen kommentarer"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr ""
 
-#: src/CommentDialogLst.cpp:104
-#, fuzzy, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "Ingen kommentarer"
-msgstr[1] "Ingen kommentarer"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr ""
 
-#: src/ServerConnect.cpp:69
+#: src/muuli_wdr.cpp:1649
 msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
 msgstr ""
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+#: src/muuli_wdr.cpp:1676
+msgid "Kademlia"
 msgstr ""
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Forbundet til %s (%s:%i)"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr ""
 
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Forbindelse oprettet til: %s"
+#: src/muuli_wdr.cpp:1689
+msgid "Autoconnect on startup"
+msgstr "Auto forbind ved start"
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr "Kunne ikke forbinde. Internettet må være nede."
+#: src/muuli_wdr.cpp:1692
+msgid "Reconnect on loss"
+msgstr "Genforbind ved fejl"
 
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Mistede forbindelsen til %s (%s:%i)"
+#: src/muuli_wdr.cpp:1716
+msgid "Remove dead server after"
+msgstr "Fjern ikke tilgÃ¦ngelige servere, efter"
 
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) ser ud til at være død"
+#: src/muuli_wdr.cpp:1722
+msgid "retries"
+msgstr "forsÃ¸g"
 
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
+#: src/muuli_wdr.cpp:1729
+msgid "Auto-update server list at startup"
 msgstr ""
 
-#: src/ServerConnect.cpp:381
-#, fuzzy, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Automatisk forbindelse til server vil prøve igen om %d sekunder"
-msgstr[1] "Automatisk forbindelse til server vil prøve igen om %d sekunder"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Forbindelse afbrudt"
+#: src/muuli_wdr.cpp:1732
+msgid "List"
+msgstr "Liste"
 
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
+#: src/muuli_wdr.cpp:1737
+msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
+#: src/muuli_wdr.cpp:1740
+msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr ""
+#: src/muuli_wdr.cpp:1743
+msgid "Use priority system"
+msgstr "Brug prioterings system"
 
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
+#: src/muuli_wdr.cpp:1747
+msgid "Use smart LowID check on connect"
+msgstr "Brug smart LavID tjek ved forbindelse"
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Ingen part filer fundet"
+#: src/muuli_wdr.cpp:1751
+msgid "Safe connect"
+msgstr "Sikker forbindelse"
 
-#: src/DownloadQueue.cpp:171
-#, fuzzy, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Fandt %i part filer"
-msgstr[1] "Fandt %i part filer"
+#: src/muuli_wdr.cpp:1755
+msgid "Autoconnect to servers in static list only"
+msgstr "Autoforbind kun til servere i statik liste"
 
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
+#: src/muuli_wdr.cpp:1758
+msgid "Set manually added servers to High Priority"
+msgstr "SÃ¦t manuelt tilfÃ¸jede servere til HÃ¸j Priotet"
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
 msgstr ""
 
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Downloader %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
 msgstr ""
 
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
 msgstr ""
 
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Du prøver allerede at downloade denne fil %s"
+#: src/muuli_wdr.cpp:1791
+msgid "Add files to download in pause mode"
+msgstr "TilfÃ¸j filer til download i pause tilstand"
 
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
+#: src/muuli_wdr.cpp:1794
+msgid "Add files to download with auto priority"
+msgstr "TilfÃ¸j filer til download med auto priotet"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
+#: src/muuli_wdr.cpp:1797
+msgid "Try to download first and last chunks first"
+msgstr "PrÃ¸v at download fÃ¸rste og sidste del fÃ¸rst"
+
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
+#: src/muuli_wdr.cpp:1805
+msgid "From the same category"
 msgstr ""
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
 msgstr ""
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/TextClient.cpp:309
+#: src/muuli_wdr.cpp:1812
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
 msgstr ""
 
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/TextClient.cpp:362
-#, fuzzy
-msgid "Processing by filename: "
-msgstr "Udfører anmodning [Original]: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr ""
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Uploads"
 
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr ""
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "TilfÃ¸j nye delte filer med auto priotet"
 
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
 msgstr ""
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
+#: src/muuli_wdr.cpp:1884
+msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
+#: src/muuli_wdr.cpp:1891
+msgid "Share hidden files"
 msgstr ""
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/muuli_wdr.cpp:1911
+msgid "Graphs"
+msgstr "Grafer"
+
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
+msgid "Update delay : 5 secs"
+msgstr "Opdaterings interval : 5 sek"
+
+#: src/muuli_wdr.cpp:1920
+msgid "Time for average graph: 100 mins"
+msgstr "Tid for gennemsnitlig graf: 100 min"
+
+#: src/muuli_wdr.cpp:1926
+msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
 msgstr ""
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
 msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
 msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
+#: src/muuli_wdr.cpp:1963
+msgid "Background"
+msgstr "Baggrund"
+
+#: src/muuli_wdr.cpp:1964
+msgid "Grid"
 msgstr ""
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
+#: src/muuli_wdr.cpp:1965
+msgid "Download current"
+msgstr "Download nu"
+
+#: src/muuli_wdr.cpp:1966
+msgid "Download running average"
 msgstr ""
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
+#: src/muuli_wdr.cpp:1967
+msgid "Download session average"
 msgstr ""
 
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+#: src/muuli_wdr.cpp:1968
+msgid "Upload current"
+msgstr "Upload nu"
+
+#: src/muuli_wdr.cpp:1969
+msgid "Upload running average"
 msgstr ""
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/muuli_wdr.cpp:1970
+msgid "Upload session average"
 msgstr ""
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+#: src/muuli_wdr.cpp:1971
+msgid "Active connections"
+msgstr "Aktive Forbindelser"
+
+#: src/muuli_wdr.cpp:1974
+msgid "Systray Icon Speedbar"
 msgstr ""
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/muuli_wdr.cpp:1975
+msgid "Kad-nodes current"
 msgstr ""
 
-#: src/TextClient.cpp:809
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/muuli_wdr.cpp:1976
+msgid "Kad-nodes running"
 msgstr ""
 
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
+#: src/muuli_wdr.cpp:1977
+msgid "Kad-nodes session"
 msgstr ""
 
-#: src/TextClient.cpp:828
-#, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
+msgid "Select"
+msgstr "VÃ¦lg"
+
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
 msgstr ""
 
-#: src/TextClient.cpp:841
-msgid "Show short status information."
+#: src/muuli_wdr.cpp:2000
+msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
+#: src/muuli_wdr.cpp:2028
+msgid "!!! WARNING !!!"
+msgstr "!!! Advarsel !!!"
+
+#: src/muuli_wdr.cpp:2042
+msgid "Max new connections / 5 secs"
+msgstr "Max nye forbindelser / 5 sekunder"
+
+#: src/muuli_wdr.cpp:2048
+msgid "File Buffer Size: 240000 bytes"
+msgstr "Fil Buffer StÃ¸rrelse"
+
+#: src/muuli_wdr.cpp:2054
+msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
+#: src/muuli_wdr.cpp:2060
+msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
 msgstr ""
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Vis overfÃ¸rsels hastighed i titel"
+
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Vis overfÃ¸rsels hastighed i titel"
+
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
 msgstr ""
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
 msgstr ""
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
 msgstr ""
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
 msgstr ""
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
 msgstr ""
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
 msgstr ""
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Flad"
+
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Rund"
+
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
 msgstr ""
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
 msgstr ""
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "Ydre Forbindelses Parametre"
+
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "Accepter ydre forbindelser"
+
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/TextClient.cpp:865
+#: src/muuli_wdr.cpp:2190
 msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
 msgstr ""
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
 msgstr ""
 
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Password"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
 msgstr ""
 
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
 msgstr ""
 
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
 msgstr ""
 
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Fuld rettigheds kodeord"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Aktiver lav rettigheds brugere"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Lav rettigheds kodeord"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Side Opdaterings Tid (i sek)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Aktiver Gzip komprimering"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
+
+#: src/muuli_wdr.cpp:2326
+msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
+#: src/muuli_wdr.cpp:2330
+msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
+#: src/muuli_wdr.cpp:2354
+msgid "Title :"
+msgstr "Titel :"
+
+#: src/muuli_wdr.cpp:2364
+msgid "Comment :"
+msgstr "Kommentar :"
+
+#: src/muuli_wdr.cpp:2374
+msgid "Incoming Dir :"
+msgstr "Indkommende Mappe :"
+
+#: src/muuli_wdr.cpp:2387
+msgid "Change priority for new assigned files :"
 msgstr ""
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr ""
 
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/muuli_wdr.cpp:2406
+msgid "Select color for this Category (currently selected) :"
 msgstr ""
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Reset"
+
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
+msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
+#: src/muuli_wdr.cpp:2528
+msgid "Click on this button to update the servers list from URL ..."
+msgstr "Tryk pÃ¥ denne knap for at opdatere serverlisten fra URL ..."
+
+#: src/muuli_wdr.cpp:2532
+msgid "Server list"
 msgstr ""
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
+#: src/muuli_wdr.cpp:2537
+msgid ""
+"Enter the url to a server.met file here and press the button to the left to "
+"update the list of known servers."
 msgstr ""
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
+#: src/muuli_wdr.cpp:2544
+msgid "Add server manually: Name"
 msgstr ""
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
+#: src/muuli_wdr.cpp:2548
+msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Port"
+
+#: src/muuli_wdr.cpp:2555
+msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
+#: src/muuli_wdr.cpp:2562
+msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
+#: src/muuli_wdr.cpp:2566
+msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule Log"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Server Info"
+
+#: src/muuli_wdr.cpp:2612
+msgid "ED2K Info"
 msgstr ""
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
+#: src/muuli_wdr.cpp:2616
+msgid "Kad Info"
 msgstr ""
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
+#: src/muuli_wdr.cpp:2645
+msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
+#: src/muuli_wdr.cpp:2649
+msgid "Nodes (0)"
 msgstr ""
 
-#: src/TextClient.cpp:901
+#: src/muuli_wdr.cpp:2654
 msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+"Enter the url to a nodes.dat file here and press the button to the left to "
+"update the list of known nodes."
 msgstr ""
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
+#: src/muuli_wdr.cpp:2659
+msgid "Nodes stats"
 msgstr ""
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
+#: src/muuli_wdr.cpp:2710
+msgid "Bootstrap"
 msgstr ""
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
+#: src/muuli_wdr.cpp:2713
+msgid "New node"
 msgstr ""
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
+#: src/muuli_wdr.cpp:2718
+msgid "IP:"
 msgstr ""
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
+#: src/muuli_wdr.cpp:2747
+msgid "Port:"
 msgstr ""
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
 msgstr ""
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
+#: src/muuli_wdr.cpp:2768
+msgid "Disconnect Kad"
 msgstr ""
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/TextClient.cpp:913
+#: src/muuli_wdr.cpp:2808
 msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
 msgstr ""
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
+#: src/muuli_wdr.cpp:2811
+msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
+#: src/muuli_wdr.cpp:2814
+msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
+#: src/muuli_wdr.cpp:2816
+msgid ""
+"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
+"connections from other clients."
 msgstr ""
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
+#: src/muuli_wdr.cpp:2819
+msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+#: src/muuli_wdr.cpp:2821
+msgid ""
+"This option makes aMule use Protocol Obfuscation when connecting other "
+"clients/servers."
 msgstr ""
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
+#: src/muuli_wdr.cpp:2824
+msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
+#: src/muuli_wdr.cpp:2825
+msgid ""
+"This option makes aMule only accept obfuscated connections. You will have "
+"less sources, but all your traffic will be obfuscated"
 msgstr ""
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr ""
+#: src/muuli_wdr.cpp:2832
+msgid "Everybody"
+msgstr "Alle"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
+#: src/muuli_wdr.cpp:2834
+msgid "No one"
 msgstr ""
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
+#: src/muuli_wdr.cpp:2837
+msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
+#: src/muuli_wdr.cpp:2840
+msgid "IP-Filtering"
 msgstr ""
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
+#: src/muuli_wdr.cpp:2847
+msgid "Filter clients"
 msgstr ""
 
-#: src/TextClient.cpp:940
-msgid "Show log."
+#: src/muuli_wdr.cpp:2849
+msgid ""
+"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
+#: src/muuli_wdr.cpp:2852
+msgid "Filter servers"
 msgstr ""
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
+#: src/muuli_wdr.cpp:2854
+msgid ""
+"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Deprecated command, use '%s' instead."
+#: src/muuli_wdr.cpp:2861
+msgid "Reload List"
 msgstr ""
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
+#: src/muuli_wdr.cpp:2862
+msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/ServerSocket.cpp:259
-#, c-format
-msgid "ERROR: %s (%s) - %s"
+#: src/muuli_wdr.cpp:2870
+msgid "URL:"
 msgstr ""
 
-#: src/ServerSocket.cpp:274
-#, c-format
-msgid "WARNING: %s (%s) - %s"
+#: src/muuli_wdr.cpp:2876
+msgid "Update now"
 msgstr ""
 
-#: src/ServerSocket.cpp:417
-#, c-format
-msgid "New clientid is %u"
-msgstr "Ny Klient-ID er %u"
+#: src/muuli_wdr.cpp:2881
+msgid "Auto-update ipfilter at startup"
+msgstr ""
 
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
+#: src/muuli_wdr.cpp:2886
+msgid "Filtering Level:"
 msgstr ""
 
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
+#: src/muuli_wdr.cpp:2896
+msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
+#: src/muuli_wdr.cpp:2900
+msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
+#: src/muuli_wdr.cpp:2902
+msgid ""
+"Rejects packet if the client ip is different from the ip where the packet is "
+"received from. Use with caution."
 msgstr ""
 
-#: src/ServerSocket.cpp:539
-#, fuzzy, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Modtog %d nye Servere"
-msgstr[1] "Modtog %d nye Servere"
+#: src/muuli_wdr.cpp:2905
+msgid "Use system-wide ipfilter.dat if available"
+msgstr ""
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
+#: src/muuli_wdr.cpp:2906
+msgid ""
+"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
+"file."
 msgstr ""
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Server afviste sidste kommando"
+#: src/muuli_wdr.cpp:2925
+msgid "Enable Online-Signature"
+msgstr "Aktiver online-signatur"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
+#: src/muuli_wdr.cpp:2927
+msgid ""
+"Enables the writing of the OS file, which can be used by external apps to "
+"create signatures and the like."
 msgstr ""
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
+#: src/muuli_wdr.cpp:2932
+msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
+#: src/muuli_wdr.cpp:2936
+msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
 msgstr ""
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
+#: src/muuli_wdr.cpp:2952
+msgid ""
+"Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
+#: src/muuli_wdr.cpp:2974
+msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/ServerSocket.cpp:760
-#, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
+#: src/muuli_wdr.cpp:2977
+msgid "Filter all messages"
 msgstr ""
 
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#: src/muuli_wdr.cpp:2980
+msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/IP2Country.cpp:105
-#, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
+#: src/muuli_wdr.cpp:2983
+msgid "Filter messages from unknown clients"
 msgstr ""
-"Er du sikker på du vil annullere og slette alle filer i denne kategori?"
 
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Bekræftelse Krævet"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
+#: src/muuli_wdr.cpp:2986
+msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Mangelfuld"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
+msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Video"
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
 
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Lyd"
+#: src/muuli_wdr.cpp:2998
+msgid "Comments"
+msgstr ""
 
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Arkiv"
+#: src/muuli_wdr.cpp:3001
+msgid "Filter comments containing (use ',' as separator):"
+msgstr ""
 
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD-Aftryk"
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr ""
 
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Billeder"
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr ""
 
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Tekst"
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr ""
 
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
 msgstr ""
 
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Tilføj kategori"
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr ""
 
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Ændre kategori"
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr ""
 
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Fjern kategori"
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr ""
 
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
+#: src/muuli_wdr.cpp:3050
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/KnownFile.cpp:1360
-msgid "File size"
+#: src/muuli_wdr.cpp:3051
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
+#: src/muuli_wdr.cpp:3056
+msgid "Proxy type:"
 msgstr ""
 
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
+#: src/muuli_wdr.cpp:3069
+msgid "Proxy host:"
 msgstr ""
 
-#: src/KnownFile.cpp:1363
-msgid "Requested"
+#: src/muuli_wdr.cpp:3073
+msgid "The proxy host name"
 msgstr ""
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
+#: src/muuli_wdr.cpp:3076
+msgid "Proxy port:"
 msgstr ""
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
+#: src/muuli_wdr.cpp:3080
+msgid "The proxy port"
 msgstr ""
 
-#: src/PartFileConvert.cpp:208
-#, c-format
-msgid "Importing %s: %s"
+#: src/muuli_wdr.cpp:3101
+msgid "Connect to:"
 msgstr ""
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
+#: src/muuli_wdr.cpp:3115
+msgid "Login to remote amule"
 msgstr ""
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
+#: src/muuli_wdr.cpp:3120
+msgid "User name"
 msgstr ""
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
+#: src/muuli_wdr.cpp:3137
+msgid "Remember those settings"
 msgstr ""
 
-#: src/PartFileConvert.cpp:331
-#, c-format
-msgid "Loading data from old download file (%u of %u)"
+#: src/muuli_wdr.cpp:3166
+msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/PartFileConvert.cpp:351
-#, c-format
-msgid "Saving data block into new single download file (%u of %u)"
+#: src/muuli_wdr.cpp:3169
+msgid "Message Categories:"
 msgstr ""
 
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Venter..."
+
+#: src/muuli_wdr.cpp:3222
+msgid "Add imports"
 msgstr ""
 
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
+#: src/muuli_wdr.cpp:3226
+msgid "Retry selected"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
+#: src/muuli_wdr.cpp:3229
+msgid "Remove selected"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Venter..."
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Aktive Uploads :"
 
-#: src/PartFileConvertDlg.cpp:176
-#, c-format
-msgid "%s (Disk: %s)"
+#: src/muuli_wdr.cpp:3368
+#, fuzzy
+msgid "Percent of total files"
+msgstr "Antal Filer Total"
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Delte Filer"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Slettede Servere"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Aktive Uploads"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Vis Liste"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Opdater"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Send"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
+#: src/muuli_wdr.cpp:3527
+msgid "Connect to any server and/or Kad"
 msgstr ""
 
-#: src/OtherFunctions.cpp:112
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Delte Filer"
+
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Inaktiv [%s]"
+
+#: src/OtherFunctions.cpp:106
 #, fuzzy
 msgid "byte"
 msgid_plural "bytes"
 msgstr[0] "Bytes"
 msgstr[1] "Bytes"
 
-#: src/OtherFunctions.cpp:114
+#: src/OtherFunctions.cpp:108
 msgid "kB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
+#: src/OtherFunctions.cpp:114
 msgid "TB"
 msgstr "TB"
 
-#: src/OtherFunctions.cpp:130
+#: src/OtherFunctions.cpp:124
 msgid "k"
 msgstr ""
 
-#: src/OtherFunctions.cpp:132
+#: src/OtherFunctions.cpp:126
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:134
+#: src/OtherFunctions.cpp:128
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:136
+#: src/OtherFunctions.cpp:130
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:143
+#: src/OtherFunctions.cpp:137
 #, fuzzy
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr[0] "kB/s"
 msgstr[1] "kB/s"
 
-#: src/OtherFunctions.cpp:147
+#: src/OtherFunctions.cpp:141
 msgid "MB/s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
 msgid "secs"
 msgstr "sek"
 
-#: src/OtherFunctions.cpp:170
+#: src/OtherFunctions.cpp:157
 msgid "mins"
 msgstr "min"
 
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
 msgid "hours"
 msgstr ""
 
-#: src/OtherFunctions.cpp:185
+#: src/OtherFunctions.cpp:163
 msgid "Days"
 msgstr ""
 
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Videoer"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Arkiver"
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "alt"
 
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr ""
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "alt andet"
 
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programer"
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Mangelfuld"
 
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Alle"
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "stoppet"
 
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Ikke anslået"
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Video"
 
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Invalid / fejl / Falsk"
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Arkiv"
 
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Dårlig"
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Tekst"
 
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Nogen Lunde"
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr ""
 
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "God"
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Glimrende"
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr ""
 
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "alt"
+#: src/PartFileConvert.cpp:200
+#, c-format
+msgid "Importing %s: %s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "alt andet"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr ""
 
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/IPFilter.cpp:285
-#, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
 msgstr ""
 
-#: src/IPFilter.cpp:326
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/IPFilter.cpp:331
+#: src/PartFileConvert.cpp:347
 #, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] ""
-msgstr[1] ""
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr ""
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] ""
-msgstr[1] ""
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr ""
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktive forbindelser (1:%u)"
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr ""
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
 msgstr ""
 
-#: src/muuli_wdr.cpp:73
-msgid "eD2k Link: "
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:80
-msgid "Commit"
-msgstr "Overfør"
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:81
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"Click here to add the eD2k link in the text control to your download queue."
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"Events are displayed here. For a complete list of events, refer to the log "
-"in the Servers-tab."
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:92
-msgid "Loading ..."
-msgstr "Henter ..."
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr ""
 
-#: src/muuli_wdr.cpp:101
-msgid "Number of users on the server you are connected to ..."
-msgstr "Antal brugere på den server du er forbundet til ..."
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "Fejl: Kunne ikke oprette partfil"
 
-#: src/muuli_wdr.cpp:104
-msgid "Users: 0"
-msgstr "Brugere: 0"
+#: src/PartFile.cpp:336
+#, c-format
+msgid "Trying to load backup of met-file from %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:105
-msgid ""
-"Users connected to the current server and an estimate of the total number of "
-"users."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:117
-msgid ""
-"Current average upload and download rates. If enabled the numbers in the "
-"braces signify the overhead from client communication."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:125
-msgid ""
-"Displays the connected status and active transfers. Red arrows signifies "
-"that you are currently not connected, yellow arrows signify that you have "
-"low ID (firewalled) and green arrows signify that you have high ID (The "
-"optimal connection type)."
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:129
-msgid "Not Connected ..."
-msgstr "Ikke Forbundet ..."
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr "Fejl: filen known.met er beskadiget, kunne ikke hente kendte filer"
 
-#: src/muuli_wdr.cpp:130
-msgid "Currently connected server."
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:176
-msgid "Search"
-msgstr "Søg"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr ""
 
-#: src/muuli_wdr.cpp:182
-msgid "Name:"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
-msgid "Local"
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:196
-msgid "Global"
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
 msgstr ""
 
-#: src/muuli_wdr.cpp:198
-msgid "FileHash"
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Kunne ikke Ã¥bne %s (%s)"
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:206
-msgid "Extended Parameters"
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:212
-msgid "Filtering"
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "Fejl ved gemning af partfil: %s (%s => %s)"
+
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
-msgid "File Type"
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:253
-msgid "Extension"
-msgstr "Endelse"
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:259
-msgid "Min Size"
-msgstr "Min Størrelse"
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
-msgid "Bytes"
-msgstr "Bytes"
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
-msgid "KB"
-msgstr "KB"
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr ""
 
-#: src/muuli_wdr.cpp:282
-msgid "Max Size"
-msgstr "Max Størrelse"
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:305
-msgid "Availability"
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
+msgid ""
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:318
-msgid "Filter:"
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:327
-msgid "Filter Results"
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/muuli_wdr.cpp:333
-msgid "Invert Result"
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:339
-msgid "Hide Known Files"
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:355
-msgid "More"
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/muuli_wdr.cpp:356
-msgid "Searches for more results on eD2k. Not supported for Kad yet."
+#: src/PartFile.cpp:2292
+#, c-format
+msgid ""
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
 
-#: src/muuli_wdr.cpp:363
-msgid "Stop"
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
+msgid ""
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:377
-msgid "Reset Fields"
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:392
-msgid "Results"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:428
-msgid "Clears completed downloads"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Klienter i kø :"
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr ""
 
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Send"
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr ""
 
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Luk"
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "System standard"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
+#: src/Preferences.cpp:631
+msgid "Albanian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:575
-msgid "Full Name :"
-msgstr "Navn :"
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabic"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
-msgid "N/A"
-msgstr "N/A"
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "Estonian"
 
-#: src/muuli_wdr.cpp:586
-msgid "met-File :"
-msgstr "met-Fil :"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Basque"
 
-#: src/muuli_wdr.cpp:597
-msgid "Hash :"
-msgstr "Hash :"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgarian"
 
-#: src/muuli_wdr.cpp:612
-msgid "Filesize :"
-msgstr "Filstørrelse :"
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Catalan"
 
-#: src/muuli_wdr.cpp:623
-msgid "Partfilestatus :"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:634
-msgid "Last seen complete :"
-msgstr "Sidst færdig :"
-
-#: src/muuli_wdr.cpp:656
-msgid "Found Sources :"
-msgstr "Fundne Kilder :"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:667
-msgid "Transferring Sources :"
-msgstr "Overfører Kilder :"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr ""
 
-#: src/muuli_wdr.cpp:678
-msgid "Filepart-Count :"
+#: src/Preferences.cpp:640
+msgid "Czech"
 msgstr ""
 
-#: src/muuli_wdr.cpp:689
-msgid "Available :"
-msgstr "Tilgængelig :"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Danish"
 
-#: src/muuli_wdr.cpp:700
-msgid "Datarate :"
-msgstr ""
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Dutch"
 
-#: src/muuli_wdr.cpp:711
-msgid "Download Active Time: "
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
-msgid "Transferred :"
-msgstr "Overført :"
-
-#: src/muuli_wdr.cpp:733
-msgid "Completed Size :"
-msgstr "Færdig Størrelse :"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estonian"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
-msgid "Intelligent Corruption Handling"
-msgstr "Intelligent Fejl Håndtering"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finnish"
 
-#: src/muuli_wdr.cpp:769
-msgid "Lost to corruption :"
-msgstr "Tabt pga beskadigelse :"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "French"
 
-#: src/muuli_wdr.cpp:780
-msgid "Gained by compression :"
+#: src/Preferences.cpp:647
+msgid "Galician"
 msgstr ""
 
-#: src/muuli_wdr.cpp:791
-msgid "Packages saved by I.C.H. :"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "German"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
-msgid "File Names"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
 msgstr ""
 
-#: src/muuli_wdr.cpp:825
-msgid "Takeover"
-msgstr "Overtag"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr ""
 
-#: src/muuli_wdr.cpp:835
-msgid "Cleanup"
-msgstr "Ryd Op"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italian"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
-msgid "Apply"
-msgstr "Anvend"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:854
-msgid "Ok"
+#: src/Preferences.cpp:654
+msgid "Japanese"
 msgstr ""
 
-#: src/muuli_wdr.cpp:883
-msgid "Comment/Rate file (Text will be visible to all users)"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Korean"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lithuanian"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:897
-msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polish"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portuguese"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
 msgstr ""
-"For en film kan du sige den længde, dens histori, sprog ...\n"
-"og hvis den er falsk, kan du også fortælle det til andre aMule brugere."
 
-#: src/muuli_wdr.cpp:905
-msgid "File Quality"
-msgstr "Fil Kvalitet"
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Russian"
 
-#: src/muuli_wdr.cpp:920
-msgid "Choose the file rating or advice users if the file is invalid ..."
+#: src/Preferences.cpp:662
+msgid "Slovenian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:964
-msgid "Refresh"
-msgstr "Opdater"
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Spanish"
 
-#: src/muuli_wdr.cpp:991
-msgid "Downloading, please wait ..."
-msgstr "Henter, vent venligst"
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr ""
 
-#: src/muuli_wdr.cpp:997
-msgid "Unknown size"
+#: src/Preferences.cpp:665
+msgid "Turkish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1021
-msgid "Required Information"
-msgstr "Krævet Information"
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1026
-msgid "IP Address :"
-msgstr "IP Adresse :"
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Sprog"
 
-#: src/muuli_wdr.cpp:1032
-msgid "Port :"
-msgstr "Port :"
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1042
-msgid "Additional Information"
-msgstr "Aktuelle Adresse"
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "Ikke tilgÃ¦ngelig"
 
-#: src/muuli_wdr.cpp:1047
-msgid "Username :"
-msgstr "Brugernavn :"
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1053
-msgid "Userhash :"
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Nuværende Session"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Total"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Anmodet :"
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Aktive Uploads :"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1206
-msgid "Download-Speed"
-msgstr "Download-Hastighed"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Forbindelse"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
-msgid "Current"
-msgstr "Nuværende"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Mapper"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
-msgid "Running average"
-msgstr "Nuværende Gennemsnit"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Servere"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
-msgid "Session average"
-msgstr "Sessions Gennemsnit"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Filer"
 
-#: src/muuli_wdr.cpp:1255
-msgid "Upload-Speed"
-msgstr "Upload-Hastighed"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1304
-msgid "Connections"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
-msgid "Active downloads"
-msgstr "Aktive Downloads"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1333
-msgid "Active connections (1:1)"
-msgstr "Aktive Forbindelser (1:1)"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
-msgid "Active uploads"
-msgstr "Aktive Uploads"
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Fjern Kontrol"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
-msgid "Statistics Tree"
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
-msgid "Username:"
-msgstr "Navn:"
-
-#: src/muuli_wdr.cpp:1386
-msgid "Userhash:"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1409
-msgid "Client software:"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1418
-msgid "Client version:"
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1425
-msgid "IP address:"
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1434
-msgid "User ID:"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1441
-msgid "Server IP:"
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1450
-msgid "Server name:"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1457
-msgid "Obfuscation:"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1466
-msgid "Kad:"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1477
-msgid "Transfers to client"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1482
-msgid "Current request:"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1495
-msgid "Average upload rate:"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1504
-msgid "Average download rate:"
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Ydre Forbindelses Parametre"
+
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Ydre Forbindelses Parametre"
+
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Ydre Forbindelses Parametre"
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1511
-msgid "Uploaded (session):"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
-msgid "Downloaded (session):"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1527
-msgid "Uploaded (total):"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1536
-msgid "Downloaded (total):"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1547
-msgid "Scores"
-msgstr "Point:"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1554
-msgid "DL/UP modifier:"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Secure ident:"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1579
-msgid "Queue score:"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1610
-msgid "Nick"
-msgstr "Brugernavn"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1614
-msgid "This is the name that other users will see when connecting to you."
+#: src/PrefsUnifiedDlg.cpp:1003
+#, c-format
+msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Sprog"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Gennemse efter Video Afspiller"
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Andre Indstillinger"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1634
-msgid "Check for new version at startup"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
 msgstr ""
+"TilfÃ¸j URLer hvor der kan hentes server.met filer.\n"
+"Kun en URL pÃ¥ hver linje."
 
-#: src/muuli_wdr.cpp:1638
-msgid "Start minimized"
-msgstr "Start minimeret"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, fuzzy, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Opdaterings interval : 5 sek"
+msgstr[1] "Opdaterings interval : 5 sek"
 
-#: src/muuli_wdr.cpp:1639
-msgid "Enabling this makes aMule minimize itself upon start."
+#: src/PrefsUnifiedDlg.cpp:1121
+#, fuzzy, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Tid for gennemsnitlig graf: 100 min"
+msgstr[1] "Tid for gennemsnitlig graf: 100 min"
+
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
-msgid "Prompt on exit"
-msgstr "Spørg ved afslut"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, fuzzy, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Fil Buffer StÃÅ¾rrelse %i bytes"
+msgstr[1] "Fil Buffer StÃÅ¾rrelse %i bytes"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr ""
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/muuli_wdr.cpp:1647
-msgid "Enable Tray Icon"
-msgstr ""
+#: src/PrefsUnifiedDlg.cpp:1152
+#, fuzzy, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Server forbindelses opdaterings interval %i min"
+msgstr[1] "Server forbindelses opdaterings interval %i min"
 
-#: src/muuli_wdr.cpp:1648
-msgid "This Enables/Disables the system tray (or taskbar) icon."
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Server forbindelses opdaterings interval: Inaktiv"
+
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "deaktiver"
+
+#: src/PrefsUnifiedDlg.cpp:1222
+#, c-format
+msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1651
-msgid "Minimize to Tray Icon"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1652
-msgid ""
-"Enabling this will make aMule minimize to the System Tray, rather than the "
-"taskbar."
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
-msgid "Browser Selection"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "Fil ID"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Fil"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Indtast nyt navn for denne fil:"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Afbryd"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/ServerConnect.cpp:74
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1705
-msgid "Open in new tab if possible"
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1707
-msgid "Open the web page in a new tab instead of in a new window when possible"
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1712
-msgid "Video Player"
-msgstr "Video Afspiller"
-
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr ""
+#: src/ServerConnect.cpp:198
+#, c-format
+msgid "Connected to %s (%s:%i)"
+msgstr "Forbundet til %s (%s:%i)"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
-msgid "Upload"
-msgstr "Upload"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Forbindelse oprettet til: %s"
 
-#: src/muuli_wdr.cpp:1775
-msgid "Slot Allocation"
-msgstr "Slot Tildeling"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr "Kunne ikke forbinde. Internettet mÃ¥ vÃ¦re nede."
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr ""
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Mistede forbindelsen til %s (%s:%i)"
 
-#: src/muuli_wdr.cpp:1796
-msgid "This is the standard eD2k port and cannot be disabled."
-msgstr ""
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) ser ud til at vÃ¦re dÃ¸d"
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr ""
+#: src/ServerConnect.cpp:392
+#, fuzzy, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Automatisk forbindelse til server vil prÃ¸ve igen om %d sekunder"
+msgstr[1] "Automatisk forbindelse til server vil prÃ¸ve igen om %d sekunder"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "deaktiver"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Forbindelse afbrudt"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Max Kilder Pr Fil"
-
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Max Forbindelser"
-
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
+#: src/ServerList.cpp:88
+#, c-format
+msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1886
-msgid "Kademlia"
+#: src/ServerList.cpp:93
+msgid "Server.met file not found!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
+#: src/ServerList.cpp:101
+#, c-format
+msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
+#: src/ServerList.cpp:107
+msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
+#: src/ServerList.cpp:118
+#, c-format
+msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
-msgid "Autoconnect on startup"
-msgstr "Auto forbind ved start"
+#: src/ServerList.cpp:173
+#, fuzzy, c-format
+msgid "%i server in server.met found"
+msgid_plural "%i servers in server.met found"
+msgstr[0] "%i Serverer fundet i server.met"
+msgstr[1] "%i Serverer fundet i server.met"
 
-#: src/muuli_wdr.cpp:1916
-msgid "Reconnect on loss"
-msgstr "Genforbind ved fejl"
+#: src/ServerList.cpp:175
+#, fuzzy, c-format
+msgid "%d server added"
+msgid_plural "%d servers added"
+msgstr[0] "Servere tilfÃÅ¾jet: "
+msgstr[1] "Servere tilfÃÅ¾jet: "
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr ""
+#: src/ServerList.cpp:178
+#, fuzzy
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Fejl: filen server.met er beskadiget"
 
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr ""
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "Uventet fil fejl ved skrivning %s : %s"
 
-#: src/muuli_wdr.cpp:1947
-msgid "Remove dead server after"
-msgstr "Fjern ikke tilgængelige servere, efter"
+#: src/ServerList.cpp:195
+#, c-format
+msgid "Server not added: [%s:%d] does not specify a valid port."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1953
-msgid "retries"
-msgstr "forsøg"
+#: src/ServerList.cpp:213
+#, c-format
+msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1960
-msgid "Auto-update server list at startup"
+#: src/ServerList.cpp:232
+#, c-format
+msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1963
-msgid "List"
-msgstr "Liste"
+#: src/ServerList.cpp:250
+#, c-format
+msgid "Server added: Server at [%s:%d] using the name '%s'."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1968
-msgid "Update server list when connecting to a server"
+#: src/ServerList.cpp:345
+msgid ""
+"You are connected to the server you are trying to delete. please disconnect "
+"first."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1971
-msgid "Update server list when a client connects"
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1974
-msgid "Use priority system"
-msgstr "Brug prioterings system"
+#: src/ServerList.cpp:685
+msgid "Failed to save server.met!"
+msgstr "Fejl ved gemning af server.met!"
 
-#: src/muuli_wdr.cpp:1978
-msgid "Use smart LowID check on connect"
-msgstr "Brug smart LavID tjek ved forbindelse"
+#: src/ServerList.cpp:832
+msgid "Invalid URL"
+msgstr "Invalid URL"
 
-#: src/muuli_wdr.cpp:1982
-msgid "Safe connect"
-msgstr "Sikker forbindelse"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
+msgstr "Kunne ikke hente serverlist fra %s"
 
-#: src/muuli_wdr.cpp:1986
-msgid "Autoconnect to servers in static list only"
-msgstr "Autoforbind kun til servere i statik liste"
+#: src/ServerList.cpp:869
+msgid ""
+"No server list address entry in 'addresses.dat' found. Please paste a valid "
+"server list address into this file in order to auto-update your server list"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1989
-msgid "Set manually added servers to High Priority"
-msgstr "Sæt manuelt tilføjede servere til Høj Priotet"
+#: src/ServerList.cpp:882
+#, c-format
+msgid "Start downloading server list from %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. aktiv"
+#: src/ServerList.cpp:891
+#, c-format
+msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
+#: src/ServerList.cpp:895
+msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2024
-msgid "Add files to download in pause mode"
-msgstr "Tilføj filer til download i pause tilstand"
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2027
-msgid "Add files to download with auto priority"
-msgstr "Tilføj filer til download med auto priotet"
+#: src/ServerList.cpp:985
+msgid ""
+"Local server is filtered by the IPFilters, reconnecting to a different "
+"server!"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Try to download first and last chunks first"
-msgstr "Prøv at download første og sidste del først"
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Servernavn"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Tilføj nye delte filer med auto priotet"
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr ""
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Prøv at overføre hele dele til uploads"
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Beskrivelse"
 
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Start næste pausede fil når en fil er færdig"
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
 
-#: src/muuli_wdr.cpp:2045
-msgid "From the same category"
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Brugere"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Statistik"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
+#: src/ServerListCtrl.cpp:148
+msgid ""
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Servere (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Server"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Fjern server"
+
+#: src/ServerListCtrl.cpp:419
+#, fuzzy
+msgid "Remove servers"
+msgstr "Fjern server"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Fjern Alle servere"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2122
-msgid "(Right click on folder icon for recursive share)"
+#: src/ServerListCtrl.cpp:541
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Er du sikker pÃ¥ at du Ã¸nsker at slette de(n) valgt(e) ven(ner)?"
+
+#: src/ServerListCtrl.cpp:543
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Er du sikker pÃ¥ at du Ã¸nsker at slette de(n) valgt(e) ven(ner)?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2129
-msgid "Share hidden files"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2149
-msgid "Graphs"
-msgstr "Grafer"
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Ny Klient-ID er %u"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
-msgid "Update delay : 5 secs"
-msgstr "Opdaterings interval : 5 sek"
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2158
-msgid "Time for average graph: 100 mins"
-msgstr "Tid for gennemsnitlig graf: 100 min"
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2164
-msgid "Connections Graph Scale: 100 "
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2177
-msgid "Background"
-msgstr "Baggrund"
+#: src/ServerSocket.cpp:535
+#, fuzzy, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Modtog %d nye Servere"
+msgstr[1] "Modtog %d nye Servere"
 
-#: src/muuli_wdr.cpp:2178
-msgid "Grid"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2179
-msgid "Download current"
-msgstr "Download nu"
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Server afviste sidste kommando"
 
-#: src/muuli_wdr.cpp:2180
-msgid "Download running average"
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2181
-msgid "Download session average"
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2182
-msgid "Upload current"
-msgstr "Upload nu"
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2183
-msgid "Upload running average"
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2184
-msgid "Upload session average"
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2185
-msgid "Active connections"
-msgstr "Aktive Forbindelser"
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2188
-msgid "Systray Icon Speedbar"
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2189
-msgid "Kad-nodes current"
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2190
-msgid "Kad-nodes running"
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2191
-msgid "Kad-nodes session"
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
-msgid "Select"
-msgstr "Vælg"
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
 
-#: src/muuli_wdr.cpp:2214
-msgid "Number of Client Versions shown (0=unlimited)"
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Linie Kapasitet"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2272
-msgid "!!! WARNING !!!"
-msgstr "!!! Advarsel !!!"
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
+#: src/ServerWnd.cpp:209
+msgid "Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Max new connections / 5 secs"
-msgstr "Max nye forbindelser / 5 sekunder"
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2294
-msgid "File Buffer Size: 240000 bytes"
-msgstr "Fil Buffer Størrelse"
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "Peak Forbindelser (anslÃÂ¥et)"
 
-#: src/muuli_wdr.cpp:2300
-msgid "Upload Queue Size: 5000 clients"
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2306
-msgid "Server connection refresh interval: Disable"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Vis procent"
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Viss statusbar"
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Forløbs Stil"
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "Forbundet til %s"
 
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Flad"
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "Forbundet til %s %s"
 
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Rund"
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "Fundne Kilder :"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr ""
+#: src/ServerWnd.cpp:254
+#, fuzzy
+msgid "Indexed notes:"
+msgstr "Index fil ikke fundet: "
 
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
+#: src/SharedFileList.cpp:371
+#, fuzzy, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Fandt %i kendte delte filer"
+msgstr[1] "Fandt %i kendte delte filer"
+
+#: src/SharedFileList.cpp:377
+#, fuzzy, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Fandt %i kendte delte filer"
+msgstr[1] "Fandt %i kendte delte filer"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "Vis overførsels hastighed i titel"
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Brugernavn"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr ""
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Download-Hastighed"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Upload-Hastighed"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "TilgÃ¦ngelig :"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Uploads"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#, fuzzy
+msgid "Download Status"
+msgstr "Downloads"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Fil Navn"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Delte Filer"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Anmodninger"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Godtaget Anmodninger"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "OverfÃ¸rt Data"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Delings Kvote"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Sendte Dele"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Hele kilder"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Mappe sti"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "TilfÃ¸j kommentar/bedÃ¸mmelse"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Rediger Kommentar/BedÃ¸mmelse"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "OmdÃ¸b"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "TilfÃ¸j filer i samling til overfÃ¸relses liste"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Kopier magnet &URI til udklipsholder"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Side Opdaterings Tid (i sek)"
+#: src/SharedFilesCtrl.cpp:315
+#, fuzzy
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Du skal have et HighID for at lave et godkendt kildelink"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Aktiver Gzip komprimering"
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Delte Filer (%i)"
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Aktiver lav rettigheds brugere"
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[DeleAfFil]"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Fuld rettigheds kodeord"
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Fil Navn"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Lav rettigheds kodeord"
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "Ydre Forbindelses Parametre"
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "Accepter ydre forbindelser"
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2583
-msgid "Click here to apply any changes made to the preferences."
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2587
-msgid "Reset any changes made to the preferences."
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2611
-msgid "Title :"
-msgstr "Titel :"
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2621
-msgid "Comment :"
-msgstr "Kommentar :"
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Gennemsnitlig upload tid: %s"
 
-#: src/muuli_wdr.cpp:2631
-msgid "Incoming Dir :"
-msgstr "Indkommende Mappe :"
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
-msgid "Change priority for new assigned files :"
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2663
-msgid "Select color for this Category (currently selected) :"
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Server Info"
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
-msgid "Click this button to reset the log."
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule Log"
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Genforbindelser: %i"
 
-#: src/muuli_wdr.cpp:2806
-msgid "Click on this button to update the servers list from URL ..."
-msgstr "Tryk på denne knap for at opdatere serverlisten fra URL ..."
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Tid Siden FÃ¸rste OverfÃ¸rsel: %s"
 
-#: src/muuli_wdr.cpp:2810
-msgid "Server list"
-msgstr ""
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Forbundet Til Server Siden: %s"
 
-#: src/muuli_wdr.cpp:2815
-msgid ""
-"Enter the url to a server.met file here and press the button to the left to "
-"update the list of known servers."
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2822
-msgid "Add server manually: Name"
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2826
-msgid "Enter the name of the new server here"
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2833
-msgid "Enter the IP of the server here, using the x.x.x.x format."
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2840
-msgid "Enter the port of the server here."
-msgstr ""
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Klienter"
 
-#: src/muuli_wdr.cpp:2844
-msgid "Add manually a server (fill fields to the left before) ..."
-msgstr ""
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "Ukendt: %i"
 
-#: src/muuli_wdr.cpp:2890
-msgid "ED2K Info"
-msgstr ""
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "Filtreret: %i"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
-msgid "Kad Info"
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "Banlyst"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2923
-msgid "Click on this button to update the nodes list from URL ..."
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2927
-msgid "Nodes (0)"
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2932
-msgid ""
-"Enter the url to a nodes.dat file here and press the button to the left to "
-"update the list of known nodes."
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2937
-msgid "Nodes stats"
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2988
-msgid "Bootstrap"
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2991
-msgid "New node"
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2996
-msgid "IP:"
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3025
-msgid "Port:"
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3048
-msgid "Disconnect Kad"
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3096
-msgid "Protocol Obfuscation"
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Total StÃ¸rrelse Af Delte Filer: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3099
-msgid "Support Protocol Obfuscation"
+#: src/Statistics.cpp:955
+msgid "Operating System"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3101
-msgid ""
-"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
-"connections from other clients."
+#: src/Statistics.cpp:980
+msgid "Not Received"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3104
-msgid "Use obfuscation for outgoing connections"
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktive forbindelser (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Ikke tilgÃ¦ngelig"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Aldrig"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3106
-msgid ""
-"This option makes aMule use Protocol Obfuscation when connecting other "
-"clients/servers."
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3109
-msgid "Accept only obfuscated connections"
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3110
+#: src/TextClient.cpp:323
 msgid ""
-"This option makes aMule only accept obfuscated connections. You will have "
-"less sources, but all your traffic will be obfuscated"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:3120
-msgid "Everybody"
-msgstr "Alle"
+#: src/TextClient.cpp:373
+#, fuzzy
+msgid "Processing by filename: "
+msgstr "UdfÃ¸rer anmodning [Original]: "
 
-#: src/muuli_wdr.cpp:3122
-msgid "No one"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3125
-msgid "Select who can request to view a list of your shared files."
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3130
-msgid "IP-Filtering"
-msgstr ""
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Admodning fejlede med en ukendt fejl."
 
-#: src/muuli_wdr.cpp:3137
-msgid "Filter clients"
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3139
-msgid ""
-"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3142
-msgid "Filter servers"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3144
-msgid ""
-"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3151
-msgid "Reload List"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3152
-msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3160
-msgid "URL:"
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3166
-msgid "Update now"
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3171
-msgid "Auto-update ipfilter at startup"
+#: src/TextClient.cpp:699
+msgid "eD2k"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3176
-msgid "Filtering Level:"
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3186
-msgid "Always filter LAN IPs"
+#: src/TextClient.cpp:710
+msgid "Now connecting"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3190
-msgid "Paranoid handling of non-matching IPs"
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "firewalled"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
+msgid ""
+"\n"
+"Download:\t%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3192
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
-"Rejects packet if the client ip is different from the ip where the packet is "
-"received from. Use with caution."
+"\n"
+"Upload:\t%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3195
-msgid "Use system-wide ipfilter.dat if available"
+#: src/TextClient.cpp:740
+#, c-format
+msgid ""
+"\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3196
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
-"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
-"file."
+"\n"
+"Total sources:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3223
-msgid "Enable Online-Signature"
-msgstr "Aktiver online-signatur"
+#: src/TextClient.cpp:832
+#, fuzzy
+msgid "Search progress not available"
+msgstr "%s Ikke tilgÃÅ ngelig"
 
-#: src/muuli_wdr.cpp:3225
-msgid ""
-"Enables the writing of the OS file, which can be used by external apps to "
-"create signatures and the like."
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3230
-msgid "Update Frequency (Secs):"
+#: src/TextClient.cpp:850
+msgid "Show short status information."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3234
-msgid "Change the frequency (in seconds) of Online Signature updates."
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/TextClient.cpp:854
 msgid ""
-"Click here to select the directory containing the the Online Signature files."
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
+"\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3271
-msgid "Filter incoming messages (except current chat):"
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3277
-msgid "Filter all messages"
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3280
-msgid "Filter messages from people not on your friend list"
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3283
-msgid "Filter messages from unknown clients"
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3286
-msgid "Filter messages containing (use ',' as separator):"
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
-msgid "add here the words amule should filter and block messages including it"
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3302
-msgid "Comments"
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3310
-msgid "Filter comments containing (use ',' as separator):"
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3339
-msgid "Enable Proxy"
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3340
-msgid "Enable/disable proxy support"
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3345
-msgid "Proxy type:"
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
+"\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3359
-msgid "Proxy host:"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3363
-msgid "The proxy host name"
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3366
-msgid "Proxy port:"
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3370
-msgid "The proxy port"
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3424
-msgid "Connect to:"
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3438
-msgid "Login to remote amule"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3443
-msgid "User name"
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3460
-msgid "Remember those settings"
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3492
-msgid "Enable Verbose Debug-Logging."
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3497
-msgid "Message Categories:"
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3550
-msgid "Add imports"
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3554
-msgid "Retry selected"
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3557
-msgid "Remove selected"
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3668
-msgid "Connect to any server and/or Kad"
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Søge Vindue"
-
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Fil Overførsel Vindue"
-
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
+#: src/TextClient.cpp:913
+msgid "Execute a search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Besked Vindue"
-
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
 msgstr ""
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
 msgstr ""
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Vælg en mappe til indkommende filer"
-
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
 msgstr ""
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
 msgstr ""
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:141
-#, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr ""
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "Viss statusbar"
 
-#: src/ExternalConnector.cpp:143
-#, c-format
-msgid "Unknown command '%s'.\n"
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "Viss statusbar"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
 msgstr ""
 
-#: src/ExternalConnector.cpp:155
+#: src/TextClient.cpp:926
 msgid ""
-"\n"
-"This command cannot have an argument.\n"
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/TextClient.cpp:933
+msgid "Pause download."
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
-msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+#: src/TextClient.cpp:936
+msgid "Resume download."
 msgstr ""
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/TextClient.cpp:939
+msgid "Cancel download."
 msgstr ""
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
+#: src/TextClient.cpp:942
+msgid "Set download priority."
 msgstr ""
 
-#: src/ExternalConnector.cpp:185
-#, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
 msgstr ""
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
 msgstr ""
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
 msgstr ""
 
-#: src/ExternalConnector.cpp:243
-#, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
 msgstr ""
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
 msgstr ""
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
 msgstr ""
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
+#: src/TextClient.cpp:952
+msgid "Show download queue."
 msgstr ""
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
+#: src/TextClient.cpp:953
+msgid "Show log."
 msgstr ""
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
+#: src/TextClient.cpp:954
+msgid "Show servers list."
 msgstr ""
 
-#: src/ExternalConnector.cpp:297
-#, c-format
-msgid "Type '%s' to get more help.\n"
+#: src/TextClient.cpp:957
+msgid "Reset log."
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/TextClient.cpp:964
 #, c-format
-msgid "This is %s %s %s\n"
+msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/ExternalConnector.cpp:364
+#: src/TextClient.cpp:965
 #, c-format
-msgid "This is %s %s\n"
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:395
-msgid ""
-"\n"
-"Creating client...\n"
+#: src/TextClient.h:60
+msgid "aMule text client"
 msgstr ""
 
-#: src/ExternalConnector.cpp:418
+#: src/ThreadTasks.cpp:363
 #, c-format
-msgid ""
-"\n"
-"Ok, exiting %s...\n"
-msgstr ""
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Konverter gamle AICH hashsÃ¦t i '%s' til 64b i '%s'."
 
-#: src/ExternalConnector.cpp:424
-msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
+"ADVARSEL: Filnavnet '%s' er ikke understÃ¸ttet og er blevet omdÃ¸bt til '%s'"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr ""
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "ADVARSEL: Filen '%s' eksistere, ny fil omdÃ¸bt til '%s'."
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr ""
+"Er du sikker pÃ¥ du vil annullere og slette alle filer i denne kategori?"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr ""
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "BekrÃ¦ftelse KrÃ¦vet"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr ""
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "For mange forbindelser"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
+#: src/TransferWnd.cpp:341
+msgid "All others"
 msgstr ""
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr ""
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "TilfÃ¸j kategori"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr ""
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Ãndre kategori"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Fjern kategori"
+
+#: src/UploadClient.cpp:240
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
 msgstr ""
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/ClientCreditsList.cpp:168
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Resuming uploads of file: %s"
+msgstr "Genoptager uploads af fil: %s"
 
-#: src/ClientCreditsList.cpp:171
+#: src/UploadQueue.cpp:613
 #, fuzzy, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] "Kredit udlÃ¸bet!"
-msgstr[1] "Kredit udlÃ¸bet!"
+msgid "Suspending upload of file: %s"
+msgstr "Suspender upload af fil: %s"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
 msgstr ""
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+#: src/UserEvents.h:60
+msgid "Download completed"
 msgstr ""
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Vis Uploads"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Vis Køen"
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr ""
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
+#: src/UserEvents.h:84
+msgid "New chat session started"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Ventet"
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr ""
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Upload Tid"
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
+#: src/UserEvents.h:95
+msgid "Disk partition."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
+#: src/UserEvents.h:100
+msgid "Error on completion"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:699
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "QR: %u"
+msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Fil Priotet"
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Point"
+#: src/utils/aLinkCreator/src/alcc.cpp:95
+#, c-format
+msgid "%s ---> Non existant file !\n"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Spurgte"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Sidst Set"
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Velkommen"
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Kom I Kø"
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Indput parametre"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Klient Detaljer"
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Ikke færdig"
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
 msgstr ""
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Ubegrænset"
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:368
-#, c-format
-msgid "Download speed: %.1f"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
-#, c-format
-msgid "Upload speed: %.1f"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+#, fuzzy
+msgid "Cancelled !"
+msgstr "Anulleret !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Nickname: %s"
+msgid "Done in %.2f s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "Klient ID: "
-
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "ServerNavn: "
-
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "ServerIP: "
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:416
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "IP: %s"
-msgstr ""
+msgid "Unable to open %s"
+msgstr "Ikke muligt at Ã¥bne %s"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/utils/wxCas/src/linuxmon.cpp:86
 #, c-format
-msgid "TCP port: %d"
-msgstr ""
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i dag(e) %i time(r) %i Minut(ter) %i s"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr ""
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "UDP port: %d"
-msgstr ""
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr ""
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Online Signatur: Aktiv"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Online Signatur: Inaktiv"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/utils/wxCas/src/onlinesig.cpp:342
 #, c-format
-msgid "Shared files: %d"
-msgstr ""
+msgid "%.2f KB"
+msgstr "%.2f KB"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/utils/wxCas/src/onlinesig.cpp:345
 #, c-format
-msgid "Queued clients: %d"
-msgstr ""
+msgid "%.2f MB"
+msgstr "%.2f MB"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/utils/wxCas/src/onlinesig.cpp:348
 #, c-format
-msgid "Total DL: %s"
-msgstr ""
+msgid "%.2f GB"
+msgstr "%.2f GB"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/utils/wxCas/src/onlinesig.cpp:351
 #, c-format
-msgid "Total UL: %s"
-msgstr ""
+msgid "%.2f TB"
+msgstr "%.2f TB"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr ""
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, aMule Online Statistik"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Maksimum DL rate siden wxCas er startet"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Absolute Maksimum DL rate gennem wxCas forrige kÃ¸rsel"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "System"
 
-#: src/ChatSelector.cpp:127
-#, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Stop Auto Genopfriskning"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Gem Online Statistisk billede"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Print Online Statistisk billede"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
 msgstr ""
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Luk tab"
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Omking wxCas"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Luk alle tabs"
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Start Auto Opdatering"
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Luk andre tabs"
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Auto Opdatering stoppet"
 
-#: src/ServerList.cpp:84
-#, c-format
-msgid "Loading server.met file: %s"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Auto Opdatering startet"
 
-#: src/ServerList.cpp:89
-msgid "Server.met file not found!"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Gem Statistisk Billede"
 
-#: src/ServerList.cpp:97
-#, c-format
-msgid "Failed to load server.met file '%s', unknown format encountered."
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMule Online Statistik"
 
-#: src/ServerList.cpp:103
-msgid "Failed to open server.met!"
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
+"Der var et problem med udskrivningen.\n"
+"MÃ¥ske printer instillingerne er forkerte."
 
-#: src/ServerList.cpp:114
-#, c-format
-msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Udskrivning"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
+"wxCas, aMule Online Signatur Statistik\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Baseret pÃ¥ CAS af Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"Omdelt under GPL"
 
-#: src/ServerList.cpp:169
-#, fuzzy, c-format
-msgid "%i server in server.met found"
-msgid_plural "%i servers in server.met found"
-msgstr[0] "%i Serverer fundet i server.met"
-msgstr[1] "%i Serverer fundet i server.met"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh Oh, aMule kÃ¸rer ikke..."
 
-#: src/ServerList.cpp:171
-#, fuzzy, c-format
-msgid "%d server added"
-msgid_plural "%d servers added"
-msgstr[0] "Servere tilfÃ¸jet: "
-msgstr[1] "Servere tilfÃ¸jet: "
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule kÃ¸rer"
 
-#: src/ServerList.cpp:192
-#, c-format
-msgid "Server not added: [%s:%d] does not specify a valid port."
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule kÃ¸rer men ikke forbundet"
 
-#: src/ServerList.cpp:208
-#, c-format
-msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule forbinder"
 
-#: src/ServerList.cpp:228
-#, c-format
-msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh Oh, aMule status ukendt..."
 
-#: src/ServerList.cpp:247
-#, c-format
-msgid "Server added: Server at [%s:%d] using the name '%s'."
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
 
-#: src/ServerList.cpp:342
-msgid ""
-"You are connected to the server you are trying to delete. please disconnect "
-"first."
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " har kÃ¸rt i "
 
-#: src/ServerList.cpp:629
-msgid "Failed to save server.met!"
-msgstr "Fejl ved gemning af server.met!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " er stoppet !"
 
-#: src/ServerList.cpp:782
-msgid "Invalid URL"
-msgstr "Invalid URL"
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " er ikke forbundet !"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " forbinder..."
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr "gÃ¸r noget mÃ¦rkeligt, undersÃ¸g det !"
 
-#: src/ServerList.cpp:818
-msgid ""
-"No server list address entry in 'addresses.dat' found. Please paste a valid "
-"server list address into this file in order to auto-update your server list"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " er forbundet til "
 
-#: src/ServerList.cpp:831
-#, c-format
-msgid "Start downloading server list from %s"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
 
-#: src/ServerList.cpp:840
-#, c-format
-msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "afbrudt"
 
-#: src/ServerList.cpp:844
-msgid "No valid server.met auto-download url on addresses.dat"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " er tÃ¦ndt "
 
-#: src/ServerList.cpp:937
-msgid ""
-"Local server is filtered by the IPFilters, reconnecting to a different "
-"server!"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#, fuzzy
+msgid " with "
+msgstr "] med "
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr " Total Download: "
 
-#: src/amule.cpp:703
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Upload: "
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Sesion Download: "
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Download: "
 
-#: src/amule.cpp:846
-#, c-format
-msgid "web server running on pid %d"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Upload: "
 
-#: src/amule.cpp:850
-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/utils/wxCas/src/wxcasframe.cpp:1115
+#, fuzzy
+msgid " kB/s"
+msgstr "kB/s"
 
-#: src/amule.cpp:937
-#, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Deling: "
 
-#: src/amule.cpp:964
-#, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " fil(er), Klienter i kÃ¸: "
 
-#: src/amule.cpp:970
-#, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Tid: "
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " tÃ¦ndt "
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "System Hentnings Gennemsnit (1-5-15 min): "
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
 msgstr ""
 
-#: src/amule.cpp:1308
-#, c-format
-msgid "This is the first time you run aMule %s"
-msgstr ""
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Mappe indholdende amulesig.dat fil"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr ""
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Skriv her i hvilken mappe amulesig.dat befinder sig"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Opdaterings rate interval i sekunder"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Generer et statistisk billede for hver opdaterings hÃ¦ndelse"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Skriv her mappen hvor du vil generere det statistiske billede"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Upload periodisk dit statistiske billede til en FTP server"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP Url"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP Sti"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Skriv her URL pÃ¥ din FTP server"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
-"Vi giver ikke garanti for at det ikke vil ødelægge noget, brænde dit hus,\n"
+"Skriv her biblioteket hvor dit statistiske billede pÃ¥ FPT serveren skal ligge"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Bruger"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Skriv her brugernavnet for at logge pÃ¥ din FTP server"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Skriv her bruger passworded for at logge pÃ¥ din FTP server"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "FTP opdaterings interval i minutter"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Valider"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Mapper der indeholder din signatur fil"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Mappe hvor det statistiske billede bliver genereret"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Henter template <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
 msgstr ""
 
-#: src/amule.cpp:1316
-msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/amule.cpp:1317
-msgid ""
-"\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP port"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Brug gzip komprimering"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
 msgstr ""
 
-#: src/amule.cpp:1318
-msgid ""
-"\n"
-"* Disabled updating the server list from other server and clients.\n"
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
 msgstr ""
 
-#: src/amule.cpp:1319
-msgid ""
-"\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Tillad bruger adgang"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
 msgstr ""
 
-#: src/amule.cpp:1320
-msgid ""
-"\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMule configurations fil sti. BRUG IKKE DIREKTE"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule Web Server"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/amule.cpp:1341
-msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/amule.cpp:1627
+#: src/webserver/src/WebServer.cpp:370
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
+msgid "Request failed with the following error: %s."
+msgstr "Admoding fejlede med fÃ¸lgende fejl: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Index fil ikke fundet: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Session udlÃ¸bet - admoder login\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Session ok, logget in\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Session ok, ikke logget in\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Ingen session Ã¥bnet - vil admode om login\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Session oprettet - admoder login\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "UdfÃ¸rer anmodning [Original]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "FEJL: Kan ikke åbne logfil"
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "UndersÃ¸ger password\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "FARE: logfilen er tom. Noget er galt"
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Password hash invalid\n"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Log nulstillet"
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Passwork ok\n"
 
-#: src/amule.cpp:1826
-#, c-format
-msgid "ServerMessage: %s"
-msgstr "ServerBesked: %s"
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Password forkert\n"
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Fejl ved hentning af node listen"
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Intet password skrevet. Blank password er ikke gyldigt.\n"
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Fejl ved åbning af den hentet version check filen"
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Logout anmodning\n"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Korrupt version check fil"
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "UdfÃ¸rer forespÃ¸rgsel [omledt]: "
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Du bruger en forældet version af aMule"
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Estonian"
 
-#: src/amule.cpp:1907
-#, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Din aMule version er %i.%i.%i og den sisdte nye version er %li.%li.%li"
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Downloads"
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Den sidste nye version kan altid findes hos http://www.amule.org"
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
 
-#: src/amule.cpp:1911
-#, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "FARE: Din aMule version er forældet: %i.%i.%i < %li.%li.%li"
+#, fuzzy
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Opdaterings interval : 5 sek"
+#~ msgstr[1] "Opdaterings interval : 5 sek"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Din kopi af aMule er op til dato"
+#~ msgid "Transferring"
+#~ msgstr "OverfÃ¸rer"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Fejl ved hentning af version check filen"
+#, fuzzy
+#~ msgid "Only files currently uploading"
+#~ msgstr "Downloader Nu :"
 
-#: src/amule.cpp:2025
-#, c-format
-msgid "Users: %s | Files: %s"
-msgstr ""
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "KÃ¸ Fuld"
 
-#: src/amule.cpp:2026
-#, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr ""
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Begynder at lave MD4 og AICH hash for fil: %s"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr ""
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Begynder at lave MD4 hash for fil: %s"
 
-#: src/amule.cpp:2102
-#, c-format
-msgid "Connected to %s %s"
-msgstr "Forbundet til %s %s"
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Begynder at lave AICH hash for fil: %s"
 
-#: src/amule.cpp:2105
-#, c-format
-msgid "Connecting to %s"
-msgstr "Forbundet til %s"
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr "ADVARSEL: Kunne ikke fjerne orginal '%s' efter oprettelse af backup"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr ""
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "ADVARSEL: Kunne ikke slette '%s'"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad startet."
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "PrÃ¸v at overfÃ¸re hele dele til uploads"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad stoppet."
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Henter"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Forbundet til Kad (ok)"
+#~ msgid "Transfers"
+#~ msgstr "OverfÃ¸rsler"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Forbundet til Kad (med firewall)"
+#~ msgid "Show Uploads"
+#~ msgstr "Vis Uploads"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Afbrudt fra Kad"
+#~ msgid "Show Queue"
+#~ msgstr "Vis KÃ¸en"
 
-#: src/amule.cpp:2191
-msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
-msgstr ""
-"Kad netværk kan ikke bruges hvis UDP port er fravalgt i instillinger, "
-"starter ikke."
+#~ msgid "Waited"
+#~ msgstr "Ventet"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kad netværk fravalgt i instillinger, forbinder ikke."
+#~ msgid "Upload Time"
+#~ msgstr "Upload Tid"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr ""
+#~ msgid "File Priority"
+#~ msgstr "Fil Priotet"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr ""
+#~ msgid "Score"
+#~ msgstr "Point"
 
-#~ msgid "File was not saved"
-#~ msgstr "Fil ikke gemt"
+#~ msgid "Asked"
+#~ msgstr "Spurgte"
+
+#~ msgid "Last Seen"
+#~ msgstr "Sidst Set"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Kom I KÃ¸"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Klienter i kÃ¸ :"
+
+#~ msgid "Current Session"
+#~ msgstr "NuvÃ¦rende Session"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Requested :"
+#~ msgstr "Anmodet :"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Fil OverfÃ¸rsel Vindue"
+
+#, fuzzy
+#~ msgid "HTTP download thread started"
+#~ msgstr "Synkroniserings trÃ¥d startet."
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Downloads (%i)"
+
+#, fuzzy
+#~ msgid "HTTP download thread ended"
+#~ msgstr "Max download grÃÅ nse"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "ADVARSEL: Kunne ikke fjerne orginal '%s' efter oprettelse af backup"
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Fejlede"
+
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Brugere E: %s K: %s | Filer E: %s K: %s"
 
 #~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
 #~ msgstr "Filen %s er for stor til Donkey: maksimum tilladt er 4GB."
 
+#~ msgid "File was not saved"
+#~ msgstr "Fil ikke gemt"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Linie Kapasitet"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Max Kilder Pr Fil"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Start nÃ¦ste pausede fil nÃ¥r en fil er fÃ¦rdig"
+
+#~ msgid "Show percentage"
+#~ msgstr "Vis procent"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. aktiv"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "ForlÃ¸bs Stil"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "For en film kan du sige den lÃ¦ngde, dens histori, sprog ...\n"
+#~ "og hvis den er falsk, kan du ogsÃ¥ fortÃ¦lle det til andre aMule brugere."
+
+#~ msgid "Misc Options"
+#~ msgstr "Andre Indstillinger"
+
+#~ msgid "Max Connections"
+#~ msgstr "Max Forbindelser"
+
 #~ msgid "EC Connection Failed. Empty reply."
 #~ msgstr "EC-Forbindelse-fejlede. Tomt svar"
 
@@ -6972,9 +7438,6 @@
 #~ msgid "ExternalConn: Access denied"
 #~ msgstr "ExternalConn: Adgang afvist"
 
-#~ msgid "ExternalConn: Bad reply from server. Connection closed."
-#~ msgstr "ExternalConn: Dårligt svar fra server. Forbindelse lukket"
-
 #~ msgid "Copy ED2k &link to clipboard"
 #~ msgstr "Kopier ED2k-Link til udklipsholder"
 
@@ -7026,9 +7489,6 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "Kopier ED2k-Link til udklipsholder"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "Fatal Fejl: Kunne ikke oprette timer"
-
 #, fuzzy
 #~ msgid "ED2K: Connecting"
 #~ msgstr "Forbinder"
@@ -7038,10 +7498,10 @@
 #~ msgstr "Afbrudt"
 
 #~ msgid "Edit Serverlist"
-#~ msgstr "Ændre Serverlisten"
+#~ msgstr "Ãndre Serverlisten"
 
 #~ msgid "Average filesize: %s"
-#~ msgstr "Gennemsnitlig filstørrelse: %s"
+#~ msgstr "Gennemsnitlig filstÃ¸rrelse: %s"
 
 #~ msgid "Error"
 #~ msgstr "Fejl"
@@ -7050,7 +7510,7 @@
 #~ "Error: Unable to hash downloaded part - hashset incomplete (%s). This "
 #~ "should never happen"
 #~ msgstr ""
-#~ "Fejl: Kunne ikke hashe downloadede del - hashsæt ikke færdig (%s). Dette "
+#~ "Fejl: Kunne ikke hashe downloadede del - hashsÃ¦t ikke fÃ¦rdig (%s). Dette "
 #~ "skulle aldrig ske"
 
 #~ msgid "No valid servers to connect in serverlist found"
@@ -7063,10 +7523,10 @@
 #~ msgstr "Tilladte Hastigheder"
 
 #~ msgid "Hard Limit"
-#~ msgstr "Fast Grænse"
+#~ msgstr "Fast GrÃ¦nse"
 
 #~ msgid "Connection Limits"
-#~ msgstr "Forbindelses Grænser"
+#~ msgstr "Forbindelses GrÃ¦nser"
 
 #~ msgid "Auto-update serverlist at startup"
 #~ msgstr "Opdater serverliste ved start"
@@ -7075,7 +7535,7 @@
 #~ msgstr "Opdater serverliste ved forbindelse til server"
 
 #~ msgid "Update serverlist when a client connect"
-#~ msgstr "Opdater serverliste når en klient forbinder"
+#~ msgstr "Opdater serverliste nÃ¥r en klient forbinder"
 
 #~ msgid "Incoming Directory :"
 #~ msgstr "Indkommende Mappe :"
@@ -7090,7 +7550,7 @@
 #~ msgstr "Opret backup for smug kig"
 
 #~ msgid "Show Fast ED2K Links Handler"
-#~ msgstr "Vis hurtig ED2K link håndtering"
+#~ msgstr "Vis hurtig ED2K link hÃ¥ndtering"
 
 #~ msgid "Webserver Parameters"
 #~ msgstr "Webserver Parametre"
@@ -7102,10 +7562,7 @@
 #~ msgstr "Serverliste"
 
 #~ msgid "Manual Server Add : Name"
-#~ msgstr "Tilføj Manuelt en server : Navn"
-
-#~ msgid "No One"
-#~ msgstr "Ingen"
+#~ msgstr "TilfÃ¸j Manuelt en server : Navn"
 
 #~ msgid "TCP Port: Not Ready"
 #~ msgstr "TCP Port: Ikke Klar"
@@ -7114,28 +7571,28 @@
 #~ msgstr "UDP Port: Ikke Klar"
 
 #~ msgid "Upload Limit"
-#~ msgstr "Upload Grænse"
+#~ msgstr "Upload GrÃ¦nse"
 
 #~ msgid "Download Limit"
-#~ msgstr "Download Grænse"
+#~ msgstr "Download GrÃ¦nse"
 
 #~ msgid "Disconnected from ED2K"
 #~ msgstr "Afbrudt fra ED2K"
 
 #~ msgid "Failed to open friendlist file 'emfriends.met' for reading!"
-#~ msgstr "Fejl ved åbning af venneliste fil 'emfriends.met' ved læsning!"
+#~ msgstr "Fejl ved Ã¥bning af venneliste fil 'emfriends.met' ved lÃ¦sning!"
 
 #~ msgid "Failed to open friendlist file 'emfriends.met' for writing!"
-#~ msgstr "Fejl ved åbing af venneliste fil 'emfriends.met' ved skrivning!"
+#~ msgstr "Fejl ved Ã¥bing af venneliste fil 'emfriends.met' ved skrivning!"
 
 #~ msgid "Can't create web socket thread\n"
-#~ msgstr "Kan ikke oprette web socket tråd\n"
+#~ msgstr "Kan ikke oprette web socket trÃ¥d\n"
 
 #~ msgid "Web Server: Started\n"
 #~ msgstr "Web Server: Startet\n"
 
 #~ msgid "Not Supported"
-#~ msgstr "Ikke Understøttet"
+#~ msgstr "Ikke UnderstÃ¸ttet"
 
 #~ msgid "Browse wav"
 #~ msgstr "Find wav"
@@ -7153,7 +7610,7 @@
 #~ msgstr "Brug lyd"
 
 #~ msgid "Pop out when :"
-#~ msgstr "Popop når :"
+#~ msgstr "Popop nÃ¥r :"
 
 #~ msgid "New entry on log"
 #~ msgstr "Ny tekst i log"
@@ -7165,7 +7622,7 @@
 #~ msgstr "En ny chat besked er modtaget"
 
 #~ msgid "A download is added or finished"
-#~ msgstr "En download er tilføjet eller færdig"
+#~ msgstr "En download er tilfÃ¸jet eller fÃ¦rdig"
 
 #~ msgid "New aMule version detected"
 #~ msgstr "Ny aMule version fundet"
@@ -7177,7 +7634,7 @@
 #~ msgstr "Underret via Mail"
 
 #~ msgid "Send an Email when transfer complete."
-#~ msgstr "Send en Email når overførsel er færdig."
+#~ msgstr "Send en Email nÃ¥r overfÃ¸rsel er fÃ¦rdig."
 
 #~ msgid "SMTP server :"
 #~ msgstr "SMTP server :"
@@ -7194,18 +7651,15 @@
 #~ msgid " | Kad: "
 #~ msgstr " | Kad: "
 
-#~ msgid "Syncronization thread started."
-#~ msgstr "Synkroniserings tråd startet."
-
 #~ msgid "Masterhashes of known files have been loaded."
-#~ msgstr "Masterhashes af kendte filer er indlæst."
+#~ msgstr "Masterhashes af kendte filer er indlÃ¦st."
 
 #, fuzzy
 #~ msgid "Error while reading Kad contacts - 0 entries"
-#~ msgstr "Fejl under indlæsning af Kad kontakter - 0 indtastninger"
+#~ msgstr "Fejl under indlÃ¦sning af Kad kontakter - 0 indtastninger"
 
 #~ msgid "Merge attempt"
-#~ msgstr "Samlings forsøg"
+#~ msgstr "Samlings forsÃ¸g"
 
 #~ msgid "Sucessful merge!"
 #~ msgstr "Succesfuld samling"
@@ -7217,22 +7671,22 @@
 #~ msgstr "%d"
 
 #~ msgid "Send sources to any other file before dropping (High CPU)"
-#~ msgstr "Send kilder til en anden fil før droppelse (Høj CPU)"
+#~ msgstr "Send kilder til en anden fil fÃ¸r droppelse (HÃ¸j CPU)"
 
 #~ msgid "Full Queue Sources Handling"
-#~ msgstr "Kilder i fyldt kø håndtering"
+#~ msgstr "Kilder i fyldt kÃ¸ hÃ¥ndtering"
 
 #~ msgid "Enable auto drop Full Queue Sources"
-#~ msgstr "Drop kilder som er i en fuld kø"
+#~ msgstr "Drop kilder som er i en fuld kÃ¸"
 
 #~ msgid "High Queue Rating Sources Handling"
-#~ msgstr "Kilder i lang kø håndtering"
+#~ msgstr "Kilder i lang kÃ¸ hÃ¥ndtering"
 
 #~ msgid "Enable auto drop High Queue Rating Sources"
-#~ msgstr "Drop automatisk kilder i lang kø"
+#~ msgstr "Drop automatisk kilder i lang kÃ¸"
 
 #~ msgid "High Queue Rating value"
-#~ msgstr "For køer som er over"
+#~ msgstr "For kÃ¸er som er over"
 
 #~ msgid "(Min 300 / Max 3000)"
 #~ msgstr "(Min 300 / Max 3000)"
@@ -7247,10 +7701,10 @@
 #~ msgstr "(Min 60 / 3600 Max)"
 
 #~ msgid "Minimize to trayicon"
-#~ msgstr "Minimer til statusomrÃ¥de"
+#~ msgstr "Minimer til statusomrÃÂ¥de"
 
 #~ msgid "Port %d is not available. You will be LOWID"
-#~ msgstr "Port %d er ikke tilgÃ¦ngelig. Du fÃ¥r LAVID"
+#~ msgstr "Port %d er ikke tilgÃÅ ngelig. Du fÃÂ¥r LAVID"
 
 #~ msgid ""
 #~ "Port %d is not available !!\n"
@@ -7260,11 +7714,11 @@
 #~ "Use netstat to determine when port becomes available\n"
 #~ "and try starting amule again."
 #~ msgstr ""
-#~ "Port %d er ikke tilgÃ¦ngelig !!\n"
+#~ "Port %d er ikke tilgÃÅ ngelig !!\n"
 #~ "\n"
-#~ "Dette vil sige du fÃ¥r et LAV ID.\n"
+#~ "Dette vil sige du fÃÂ¥r et LAV ID.\n"
 #~ "\n"
-#~ "Brug netstat for at finde ud af nÃ¥r porten er fri\n"
+#~ "Brug netstat for at finde ud af nÃÂ¥r porten er fri\n"
 #~ "og start aMule igen."
 
 #~ msgid "Failed to save"
@@ -7277,27 +7731,27 @@
 #~ "Unable to launch browser. Please set correct browserexecutable path in "
 #~ "Preferences."
 #~ msgstr ""
-#~ "Kunne ikke starte din browser. VÃ¦lg venligt en korekt sti til den under "
+#~ "Kunne ikke starte din browser. VÃÅ lg venligt en korekt sti til den under "
 #~ "indstillinger."
 
 #~ msgid ""
 #~ " --- This is the first time you run aMule %s ---\n"
 #~ "\n"
 #~ msgstr ""
-#~ " --- Dette er fÃ¸rste fanf du kÃ¸rer aMule %s ---\n"
+#~ " --- Dette er fÃÅ¾rste fanf du kÃÅ¾rer aMule %s ---\n"
 #~ "\n"
 
 #~ msgid "This version is a testing version, updated daily, and \n"
 #~ msgstr "Denne version er en test version, opdateret daglig, og \n"
 
 #~ msgid "or kill your dog. But it *should* be safe to use anyway. \n"
-#~ msgstr "eller drÃ¦be din hund, Men det skulle vÃ¦re sikkert at bruge. \n"
+#~ msgstr "eller drÃÅ be din hund, Men det skulle vÃÅ re sikkert at bruge. \n"
 
 #~ msgid "client credits will be lost on this first run. \n"
-#~ msgstr "klient kredits vil gÃ¥ tabt ved denne fÃ¸rste kÃ¸rsel \n"
+#~ msgstr "klient kredits vil gÃÂ¥ tabt ved denne fÃÅ¾rste kÃÅ¾rsel \n"
 
 #~ msgid "Feel free to report any bugs to forum.amule.org"
-#~ msgstr "Reporter gerne alle fejl pÃ¥ forum.amule.org"
+#~ msgstr "Reporter gerne alle fejl pÃÂ¥ forum.amule.org"
 
 #~ msgid "Desktop integration"
 #~ msgstr "Desktop integration"
@@ -7306,10 +7760,7 @@
 #~ msgstr "Forbindelse etableret til: "
 
 #~ msgid "Connect to any server"
-#~ msgstr "Forbind til en tilfÃ¦ldig server"
-
-#~ msgid "You are not connected to a server!"
-#~ msgstr "Du er ikke forbundet til en server!"
+#~ msgstr "Forbind til en tilfÃÅ ldig server"
 
 #~ msgid "This ed2k link is invalid (%s)"
 #~ msgstr "Dette ed2k link er invalid (%s)"
@@ -7326,9 +7777,6 @@
 #~ msgid "Unable to retrieve shared files from '%s'"
 #~ msgstr "Kunne ikke modtage delte filer fra '%s'"
 
-#~ msgid "Requesting shared files from '%s'"
-#~ msgstr "Anmoder om delte filer fra '%s'"
-
 #~ msgid "Requesting shared files from user %s (%u) is already in progress"
 #~ msgstr "Anmoder bruger %s (%u) om delte filer, allerede igang."
 
@@ -7339,31 +7787,31 @@
 #~ msgstr "kan ikke oprette fil '%s'"
 
 #~ msgid "Can't open file '%s'"
-#~ msgstr "Kan ikke Ã¥bne fil '%s'"
+#~ msgstr "Kan ikke ÃÂ¥bne fil '%s'"
 
 #~ msgid "can't close file descriptor %d"
 #~ msgstr "kan ikke lukke fil beskrivelse %d"
 
 #~ msgid "can't read from file descriptor %d"
-#~ msgstr "kan ikke lÃ¦se fil beskrivelse %d"
+#~ msgstr "kan ikke lÃÅ se fil beskrivelse %d"
 
 #~ msgid "can't write to file descriptor %d"
 #~ msgstr "kan ikke skrive til fil beskrivelse %d"
 
 #~ msgid "can't flush file descriptor %d"
-#~ msgstr "kan ikke tÃ¸mme fil beskrivelse %d"
+#~ msgstr "kan ikke tÃÅ¾mme fil beskrivelse %d"
 
 #~ msgid "unknown seek origin"
-#~ msgstr "ikke kendt sÃ¸ge oprindelse"
+#~ msgstr "ikke kendt sÃÅ¾ge oprindelse"
 
 #~ msgid "can't get seek position on file descriptor %d"
-#~ msgstr "kan ikke sÃ¸ge position i fil beskrivelse %d"
+#~ msgstr "kan ikke sÃÅ¾ge position i fil beskrivelse %d"
 
 #~ msgid "can't find length of file on file descriptor %d"
-#~ msgstr "kan ikke finde lÃ¦ngde af fil i fil beskrivelse %d"
+#~ msgstr "kan ikke finde lÃÅ ngde af fil i fil beskrivelse %d"
 
 #~ msgid "can't determine if the end of file is reached on descriptor %d"
-#~ msgstr "kan ikke afgÃ¸re om enden af filen er nÃ¥et i beskrivelse %d"
+#~ msgstr "kan ikke afgÃÅ¾re om enden af filen er nÃÂ¥et i beskrivelse %d"
 
 #~ msgid "invalid eof() return value."
 #~ msgstr "invalid eof() tilbage melding."
@@ -7380,9 +7828,6 @@
 #~ msgid "*** Disconnected"
 #~ msgstr "*** Ikke Forbundet"
 
-#~ msgid "Failed to load creditfile"
-#~ msgstr "Fejl ved indlÃ¦sning af kreditfil"
-
 #~ msgid "Failed to save creditfile"
 #~ msgstr "Kunne ikke gemme kreditfil"
 
@@ -7393,7 +7838,7 @@
 #~ msgstr "<- Klient Version ->v"
 
 #~ msgid "Not Avaiable"
-#~ msgstr "Ikke TilgÃ¦ngelig"
+#~ msgstr "Ikke TilgÃÅ ngelig"
 
 #~ msgid "Corrupted compressed packet for %s received (error %i)"
 #~ msgstr "Beskadiget pakket pakke fra %s modtaget (fejl %i)"
@@ -7404,9 +7849,6 @@
 #~ msgid "Copy ED2k link to clipboard (&HTML)"
 #~ msgstr "Kopier ED2k-Link til udklipsholder (&HTML)"
 
-#~ msgid "Show Lists"
-#~ msgstr "Vis Liste"
-
 #~ msgid "Hide Lists"
 #~ msgstr "Skjul Liste"
 
@@ -7438,16 +7880,16 @@
 #~ msgstr "Ny MLdonkey"
 
 #~ msgid "Are you sure that you want to cancel and delete this file ?\n"
-#~ msgstr "Er du sikker pÃ¥ du vil annullere og slette denne fil ?\n"
+#~ msgstr "Er du sikker pÃÂ¥ du vil annullere og slette denne fil ?\n"
 
 #~ msgid "Are you sure that you want to cancel and delete these files ?\n"
-#~ msgstr "Er du sikker pÃ¥ du vil annullere og slette denne fil ?\n"
+#~ msgstr "Er du sikker pÃÂ¥ du vil annullere og slette denne fil ?\n"
 
 #~ msgid "You already have the file %s"
 #~ msgstr "Du har allerede filen %s"
 
 #~ msgid "Bad link."
-#~ msgstr "DÃ¥rligt link."
+#~ msgstr "DÃÂ¥rligt link."
 
 #~ msgid "not a well-formed ed2k link"
 #~ msgstr "ikke et odentligt ed2k link"
@@ -7459,31 +7901,25 @@
 #~ msgstr "kan ikke skrive fil '%s'"
 
 #~ msgid "done"
-#~ msgstr "fÃ¦rdig"
+#~ msgstr "fÃÅ rdig"
 
 #~ msgid "Failed to copy the file '%s' to '%s'"
 #~ msgstr "Fejlede ved kopiering af fil '%s' til '%s'"
 
 #~ msgid "Loaded ipfilter with %d IP addresses."
-#~ msgstr "IndlÃ¦ste ipfilter med IP adresse %d."
-
-#~ msgid "Error: the file known.met is corrupted, unable to load known files"
-#~ msgstr "Fejl: filen known.met er beskadiget, kunne ikke hente kendte filer"
+#~ msgstr "IndlÃÅ ste ipfilter med IP adresse %d."
 
 #~ msgid ""
 #~ "Unexpected file error while reading known.met: %s, unable to load known "
 #~ "files"
 #~ msgstr ""
-#~ "Uventet fejl ved lÃ¦sning af known.met: %s, kunne ikke hente kendte filer"
-
-#~ msgid "User %s (%u) requested your sharedfiles-list -> %s"
-#~ msgstr "Bruger %s (%u) anmodede om din deleliste -> %s"
+#~ "Uventet fejl ved lÃÅ sning af known.met: %s, kunne ikke hente kendte filer"
 
 #~ msgid "accepted"
 #~ msgstr "accepteret"
 
 #~ msgid "denied"
-#~ msgstr "nÃ¦gtet"
+#~ msgstr "nÃÅ gtet"
 
 #~ msgid "Client '%s' (IP:%s) caused an error: %s. Disconnecting client!"
 #~ msgstr "Klient '%s' (IP:%s) lavede en fejl: %s. Afbryder Klient"
@@ -7509,13 +7945,10 @@
 #~ msgstr "Forbindelses Type"
 
 #~ msgid "Select your connection type here :"
-#~ msgstr "VÃ¦lg din forbindelse type her :"
-
-#~ msgid "True download bandwidth"
-#~ msgstr "Max download grÃ¦nse"
+#~ msgstr "VÃÅ lg din forbindelse type her :"
 
 #~ msgid "True upload bandwidth"
-#~ msgstr "Max upload grÃ¦nse"
+#~ msgstr "Max upload grÃÅ nse"
 
 #~ msgid "Unit:"
 #~ msgstr "Enhed:"
@@ -7528,9 +7961,9 @@
 #~ "you must specify which desktop you are using.\n"
 #~ "You can change this later from preferences."
 #~ msgstr ""
-#~ "For at fÃ¥ amule til at integrere med statusomrÃ¥det,\n"
-#~ "skal du vÃ¦lge hvilken desktop du bruger.\n"
-#~ "du kan Ã¦ndre dette senere."
+#~ "For at fÃÂ¥ amule til at integrere med statusomrÃÂ¥det,\n"
+#~ "skal du vÃÅ lge hvilken desktop du bruger.\n"
+#~ "du kan ÃÅ ndre dette senere."
 
 #~ msgid "Desktop"
 #~ msgstr "Desktop"
@@ -7545,19 +7978,19 @@
 #~ msgstr "KDE 2.x / Gnome 1.2 "
 
 #~ msgid "No systray integration, please"
-#~ msgstr "Ingen integration til statusomrÃ¥de"
+#~ msgstr "Ingen integration til statusomrÃÂ¥de"
 
 #~ msgid "Fast ED2K Links Handler (Direct Download)"
-#~ msgstr "Hurtig ED2K Link HÃ¥ndtering (Direkte Download)"
+#~ msgstr "Hurtig ED2K Link HÃÂ¥ndtering (Direkte Download)"
 
 #~ msgid "Name"
 #~ msgstr "Navn"
 
 #~ msgid "Min Availability"
-#~ msgstr "Min TilgÃ¦ngelighed"
+#~ msgstr "Min TilgÃÅ ngelighed"
 
 #~ msgid "Search global"
-#~ msgstr "SÃ¸g globalt"
+#~ msgstr "SÃÅ¾g globalt"
 
 #~ msgid "Clear All"
 #~ msgstr "Ryd Alt"
@@ -7569,7 +8002,7 @@
 #~ msgstr "Codec:"
 
 #~ msgid "Length:"
-#~ msgstr "LÃ¦ngde:"
+#~ msgstr "LÃÅ ngde:"
 
 #~ msgid " / ("
 #~ msgstr " / ("
@@ -7580,9 +8013,6 @@
 #~ msgid "Source Names"
 #~ msgstr "Kilde Navne"
 
-#~ msgid "Reload"
-#~ msgstr "Opdater"
-
 #~ msgid "Clientsoftware :"
 #~ msgstr "Klientsoftware :"
 
@@ -7595,12 +8025,6 @@
 #~ msgid "ID :"
 #~ msgstr "ID :"
 
-#~ msgid "Servername :"
-#~ msgstr "Servernavn :"
-
-#~ msgid "Currently downloading :"
-#~ msgstr "Downloader Nu :"
-
 #~ msgid "Downloaded (this session) :"
 #~ msgstr "Downloaded (denne session) :"
 
@@ -7656,10 +8080,10 @@
 #~ msgstr "Dobbeltklik for udfoldelse af downloadlist"
 
 #~ msgid "Tooltip Delay Time in secs (1s to 5s)"
-#~ msgstr "StatusomrÃ¥de ikons opdaterings tid i sekunder (1s til 5s)"
+#~ msgstr "StatusomrÃÂ¥de ikons opdaterings tid i sekunder (1s til 5s)"
 
 #~ msgid "Systray Integration"
-#~ msgstr "StatusomrÃ¥de Integration"
+#~ msgstr "StatusomrÃÂ¥de Integration"
 
 #~ msgid "Startup"
 #~ msgstr "Programm start"
@@ -7671,7 +8095,7 @@
 #~ msgstr "Se efter ny version"
 
 #~ msgid "Show Splashscreen"
-#~ msgstr "Vis velkomstskÃ¦rm"
+#~ msgstr "Vis velkomstskÃÅ rm"
 
 #~ msgid "Clientport"
 #~ msgstr "Klient Port"
@@ -7692,7 +8116,7 @@
 #~ msgstr "IP-Filter Aktiv / Inaktiv"
 
 #~ msgid "Always filter bad IPs"
-#~ msgstr "Filtrer dÃ¥rlige IPer"
+#~ msgstr "Filtrer dÃÂ¥rlige IPer"
 
 #~ msgid "See my shares"
 #~ msgstr "Kan se mine delte filer"
@@ -7701,7 +8125,7 @@
 #~ msgstr "mplayer -idx"
 
 #~ msgid "Autotake ED2K Links only during runtime"
-#~ msgstr "Overtag kun ED2K links nÃ¥r amule kÃ¸rer"
+#~ msgstr "Overtag kun ED2K links nÃÂ¥r amule kÃÅ¾rer"
 
 #~ msgid "Arrange Downloads"
 #~ msgstr "Arranger Downloads"
@@ -7716,7 +8140,7 @@
 #~ msgstr "Antal kilder"
 
 #~ msgid "GTK Theme Selector"
-#~ msgstr "GTK Tema VÃ¦lger"
+#~ msgstr "GTK Tema VÃÅ lger"
 
 #~ msgid "Theme :"
 #~ msgstr "Tema :"
@@ -7728,7 +8152,7 @@
 #~ msgstr "Font"
 
 #~ msgid "No Needed Sources Handling"
-#~ msgstr "Ikke Brugbar Kilde HÃ¥ndtering"
+#~ msgstr "Ikke Brugbar Kilde HÃÂ¥ndtering"
 
 #~ msgid "Enable auto drop No Needed Sources"
 #~ msgstr "Aktiver auto dropning af ikke brugbare kilder"
@@ -7752,7 +8176,7 @@
 #~ msgstr "Aktiver kodeord"
 
 #~ msgid "Notify"
-#~ msgstr "PÃ¥mind"
+#~ msgstr "PÃÂ¥mind"
 
 #~ msgid ""
 #~ "http://ocbmaurice.dyndns.org/pl/slist.pl/server.met?download/server-good."
@@ -7780,7 +8204,7 @@
 #~ msgstr "D"
 
 #~ msgid "Error: Failed to open part.met file! (%s => %s)"
-#~ msgstr "Kunne ikke Ã¥bne part.met fil! (%s => %s)"
+#~ msgstr "Kunne ikke ÃÂ¥bne part.met fil! (%s => %s)"
 
 #~ msgid "Error: Invalid part.met fileversion! (%s => %s)"
 #~ msgstr "Fejl: Invalid part.met filversion! (%s => %s)"
@@ -7789,16 +8213,13 @@
 #~ msgstr "Fejl: %s (%s) er beskadiget"
 
 #~ msgid "Warning: %s might be corrupted"
-#~ msgstr "Advarsel: %s er mÃ¥ske beskadiget"
-
-#~ msgid "ERROR while saving partfile: %s (%s => %s)"
-#~ msgstr "Fejl ved gemning af partfil: %s (%s => %s)"
+#~ msgstr "Advarsel: %s er mÃÂ¥ske beskadiget"
 
 #~ msgid ".part file not found"
 #~ msgstr ".part fil ikke fundet"
 
 #~ msgid "Unable to open %s file - using .bak file.\n"
-#~ msgstr "Kunne ikke indlÃ¦se %s - bruger .bak fil.\n"
+#~ msgstr "Kunne ikke indlÃÅ se %s - bruger .bak fil.\n"
 
 #~ msgid "Found corrupted part (%i) in %s"
 #~ msgstr "Fandt beskadigede dele (%i) i %s"
@@ -7807,17 +8228,14 @@
 #~ msgstr "Kunne ikke slette %s"
 
 #~ msgid "Finished downloading %s :-)"
-#~ msgstr "FÃ¦rdig med downloading af %s :-)"
-
-#~ msgid "Downloaded:"
-#~ msgstr "Downloaded:"
+#~ msgstr "FÃÅ rdig med downloading af %s :-)"
 
 #~ msgid "A file with that name already exists, the file has been saved as %s"
 #~ msgstr "En fil med dette navn findes allerede, filen er blevet gemt som %s"
 
 #~ msgid "Warning: Unable to hash downloaded part - hashset incomplete (%s)"
 #~ msgstr ""
-#~ "Advarsel: kunne ikke hashe downloadede del - hashsÃ¦t ikke fÃ¦rdig (%s)"
+#~ "Advarsel: kunne ikke hashe downloadede del - hashsÃÅ t ikke fÃÅ rdig (%s)"
 
 #~ msgid "ERROR: Cannot write to disk"
 #~ msgstr "Fejl: Kan ikke skrive til disk"
@@ -7828,9 +8246,6 @@
 #~ msgid "ICH: Recovered corrupted part %i  (%s)"
 #~ msgstr "I.C.H.: Reddede beskadiget del %i (%s)"
 
-#~ msgid "Unexpected file error while writing %s : %s"
-#~ msgstr "Uventet fil fejl ved skrivning %s : %s"
-
 #~ msgid ""
 #~ "Partfilename: %s\n"
 #~ "Parts: %d , %s: %d (%.1f%%)\n"
@@ -7839,13 +8254,13 @@
 #~ "Dele: %d , %s: %d (%.1f%%)\n"
 
 #~ msgid "%d%% done (%s) - Transferring from %d sources"
-#~ msgstr "%d%% fÃ¦rdig (%s) - OverfÃ¸rer fra %d kilder"
+#~ msgstr "%d%% fÃÅ rdig (%s) - OverfÃÅ¾rer fra %d kilder"
 
 #~ msgid "Available"
-#~ msgstr "TilgÃ¦ngelig"
+#~ msgstr "TilgÃÅ ngelig"
 
 #~ msgid "Last Seen Complete :"
-#~ msgstr "Sidst FÃ¦rdig :"
+#~ msgstr "Sidst FÃÅ rdig :"
 
 #~ msgid "Last Reception:"
 #~ msgstr "Sidst Aktiv"
@@ -7854,7 +8269,7 @@
 #~ msgstr "Program (*)|*||"
 
 #~ msgid "Language change will not be applied until aMule is restarted."
-#~ msgstr "Sprog Ã¦ndringer vil ikke blive aktiveret fÃ¸r du genstarter aMule."
+#~ msgstr "Sprog ÃÅ ndringer vil ikke blive aktiveret fÃÅ¾r du genstarter aMule."
 
 #~ msgid "Update: Disabled"
 #~ msgstr "Opdater: Inaktiv"
@@ -7869,7 +8284,7 @@
 #~ msgstr "Tuning"
 
 #~ msgid "Choose a folder for "
-#~ msgstr "VÃ¦lg en mappe til "
+#~ msgstr "VÃÅ lg en mappe til "
 
 #~ msgid "%i days"
 #~ msgstr "%i dage"
@@ -7881,7 +8296,7 @@
 #~ msgstr "Kopier ED2k-Link til udklipsholder (HTML)"
 
 #~ msgid "Close this search result"
-#~ msgstr "Luk dette sÃ¸ge resultat"
+#~ msgstr "Luk dette sÃÅ¾ge resultat"
 
 #~ msgid "Description: %s"
 #~ msgstr "Beskrivelse: %s"
@@ -7895,23 +8310,17 @@
 #~ msgid "Unable to retrieve serverlist"
 #~ msgstr "Kunne ikke modtage serverliste"
 
-#~ msgid "Failed to download the serverlist from %s"
-#~ msgstr "Kunne ikke hente serverlist fra %s"
-
 #~ msgid "Failed to load server.met!"
-#~ msgstr "Fejl ved indlÃ¦sning af server.met!"
+#~ msgstr "Fejl ved indlÃÅ sning af server.met!"
 
 #~ msgid "Invalid versiontag in server.met (0x%i , size %i)!"
-#~ msgstr "Invalid versionsnummer i server.met (0x%i , stÃ¸rrelse %i)!"
-
-#~ msgid "Error: the file server.met is corrupted"
-#~ msgstr "Fejl: filen server.met er beskadiget"
+#~ msgstr "Invalid versionsnummer i server.met (0x%i , stÃÅ¾rrelse %i)!"
 
 #~ msgid "Connect to this server"
 #~ msgstr "Forbind til denne server"
 
 #~ msgid "Add to static"
-#~ msgstr "TilfÃ¸j til statitik"
+#~ msgstr "TilfÃÅ¾j til statitik"
 
 #~ msgid "Remove from static server list"
 #~ msgstr "Fjern fra static server liste"
@@ -7923,10 +8332,10 @@
 #~ msgstr "Ingen Indstilling"
 
 #~ msgid "Failed to open staticservers.dat"
-#~ msgstr "Kunne ikke Ã¥bne staticservers.dat"
+#~ msgstr "Kunne ikke ÃÂ¥bne staticservers.dat"
 
 #~ msgid "Added to static server list"
-#~ msgstr "TilfÃ¸j til statik server liste"
+#~ msgstr "TilfÃÅ¾j til statik server liste"
 
 #~ msgid "Unknown server info received !"
 #~ msgstr "Ukendt server info modtaget !"
@@ -7934,9 +8343,6 @@
 #~ msgid "Connecting to %s (%s:%i)..."
 #~ msgstr "Forbinder til %s (%s:%i)..."
 
-#~ msgid "Error while connecting to %s (%s:%i): %d"
-#~ msgstr "Fejl ved forbindelse til %s (%s:%i): %d"
-
 #~ msgid "Error in serversocket: %s (%s:%i): %u"
 #~ msgstr "Fejl i Serversocket: %s (%s:%i): %u"
 
@@ -7944,27 +8350,27 @@
 #~ msgstr "Dette er "
 
 #~ msgid " (based on "
-#~ msgstr " (baseret pÃ¥ "
+#~ msgstr " (baseret pÃÂ¥ "
 
 #~ msgid "Visit http://www.amule.org to check if a new version is available.\n"
 #~ msgstr ""
-#~ "BesÃ¸g http://www.amule.org for at tjekke om der er en ny version "
-#~ "tilgÃ¦ngelig.\n"
+#~ "BesÃÅ¾g http://www.amule.org for at tjekke om der er en ny version "
+#~ "tilgÃÅ ngelig.\n"
 
 #~ msgid "Please enter a serveraddress"
 #~ msgstr "Indtast venligst en serveradresse"
 
 #~ msgid "Incomplete serverport: Please enter a serverport"
-#~ msgstr "forkert serverport: IndsÃ¦t en serverport"
+#~ msgstr "forkert serverport: IndsÃÅ t en serverport"
 
 #~ msgid "Server not added!"
-#~ msgstr "Server ikke tilfÃ¸jet!"
+#~ msgstr "Server ikke tilfÃÅ¾jet!"
 
 #~ msgid "Low ID"
 #~ msgstr "Lav ID"
 
 #~ msgid "High ID"
-#~ msgstr "hÃ¸j ID"
+#~ msgstr "hÃÅ¾j ID"
 
 #~ msgid "Loading..."
 #~ msgstr "Henter..."
@@ -7979,13 +8385,13 @@
 #~ msgstr "Kun venner"
 
 #~ msgid "Locked"
-#~ msgstr "LÃ¥st"
+#~ msgstr "LÃÂ¥st"
 
 #~ msgid "Permissions"
 #~ msgstr "Tilladelser"
 
 #~ msgid "Change this file's comment..."
-#~ msgstr "Ãndre kommentaren til denne fil"
+#~ msgstr "ÃÂndre kommentaren til denne fil"
 
 #~ msgid "Auto [Re]"
 #~ msgstr "Auto [Re]"
@@ -7994,19 +8400,16 @@
 #~ msgstr "Skjult"
 
 #~ msgid "You cannot change permissions while a file is still downloading!"
-#~ msgstr "Du kan ikke Ã¦ndre rettigheder mens filen stadig downloader!"
+#~ msgstr "Du kan ikke ÃÅ ndre rettigheder mens filen stadig downloader!"
 
 #~ msgid "%s (%s:%i) appears to be full"
-#~ msgstr "%s (%s:%i) ser ud til at vÃ¦re fuld"
+#~ msgstr "%s (%s:%i) ser ud til at vÃÅ re fuld"
 
 #~ msgid "Connecting to %s (%s:%i ) failed."
 #~ msgstr "Forbindelse til %s (%s:%i ) fejlede."
 
 #~ msgid "Connection attempt to %s (%s:%i ) timed out"
-#~ msgstr "Forbindelses forsÃ¸g til %s (%s:%i ) tid gik"
-
-#~ msgid "Filtered: %i"
-#~ msgstr "Filtreret: %i"
+#~ msgstr "Forbindelses forsÃÅ¾g til %s (%s:%i ) tid gik"
 
 #~ msgid "Downloaded Data (Session (Total)): %s (%s)"
 #~ msgstr "Downloadet Data (session (Total)): %s (%s)"
@@ -8023,11 +8426,8 @@
 #~ msgid "Active Uploads: %i"
 #~ msgstr "Aktive Uploads: %i"
 
-#~ msgid "Waiting Uploads: %i"
-#~ msgstr "Ventende Uploads: %i"
-
 #~ msgid "Total successful upload sessions: %i"
-#~ msgstr "FÃ¦rdige upload sessioner (Total): %i"
+#~ msgstr "FÃÅ rdige upload sessioner (Total): %i"
 
 #~ msgid "Total failed upload sessions: %i"
 #~ msgstr "Fejlede upload sessioner (Total): %i"
@@ -8045,13 +8445,7 @@
 #~ msgstr "Max Download Hastighed (Session): %.2f kB/s"
 
 #~ msgid "waiting for transfer..."
-#~ msgstr "Venter pÃ¥ overfÃ¸rsel..."
-
-#~ msgid "waiting for connection..."
-#~ msgstr "venter pÃ¥ forbindelse..."
-
-#~ msgid "%s Not available"
-#~ msgstr "%s Ikke tilgÃ¦ngelig"
+#~ msgstr "Venter pÃÂ¥ overfÃÅ¾rsel..."
 
 #~ msgid "Number of Shared Files: %i"
 #~ msgstr "Antal Delte Filer: %i"
@@ -8080,47 +8474,35 @@
 #~ msgid "New MLDonkey: %i (%1.1f%%)"
 #~ msgstr "Ny MLDonkey: %i (%1.1f%%)"
 
-#~ msgid "Unknown: %i"
-#~ msgstr "Ukendt: %i"
-
 #~ msgid "Working Servers"
 #~ msgstr "Virkende Servere"
 
 #~ msgid "Failed Servers"
 #~ msgstr "Fejlede Servere"
 
-#~ msgid "Deleted Servers"
-#~ msgstr "Slettede Servere"
-
 #~ msgid "Users on Working Servers"
-#~ msgstr "Brugere PÃ¥ Virkende Servere"
+#~ msgstr "Brugere PÃÂ¥ Virkende Servere"
 
 #~ msgid "Files on Working Servers"
-#~ msgstr "Filer PÃ¥ Virkende Servere"
+#~ msgstr "Filer PÃÂ¥ Virkende Servere"
 
 #~ msgid "Total Users"
 #~ msgstr "Antal Brugere Total"
 
-#~ msgid "Total Files"
-#~ msgstr "Antal Filer Total"
-
 #~ msgid "Active Connections (estimate)"
-#~ msgstr "Aktive Forbindelser (anslÃ¥et)"
+#~ msgstr "Aktive Forbindelser (anslÃÂ¥et)"
 
 #~ msgid "Max Connection Limit Reached"
-#~ msgstr "Max Forbindelses GrÃ¦nse NÃ¥et"
+#~ msgstr "Max Forbindelses GrÃÅ nse NÃÂ¥et"
 
 #~ msgid "Average Connections (estimate)"
-#~ msgstr "Gennemsnitlige Forbindelser (anslÃ¥et)"
-
-#~ msgid "Peak Connections (estimate)"
-#~ msgstr "Peak Forbindelser (anslÃ¥et)"
+#~ msgstr "Gennemsnitlige Forbindelser (anslÃÂ¥et)"
 
 #~ msgid "Not Found"
 #~ msgstr "Ikke Fundet"
 
 #~ msgid "Actual Speed Limits:"
-#~ msgstr "NuvÃ¦rende Hastigheds GrÃ¦nser:"
+#~ msgstr "NuvÃÅ rende Hastigheds GrÃÅ nser:"
 
 #~ msgid "DL: "
 #~ msgstr "DL: "
@@ -8168,7 +8550,7 @@
 #~ msgstr "Delte Filer"
 
 #~ msgid "Queued Clients: "
-#~ msgstr "Klienter i KÃ¸: "
+#~ msgstr "Klienter i KÃÅ¾: "
 
 #~ msgid "Total DL: "
 #~ msgstr "Total DL: "
@@ -8216,14 +8598,14 @@
 #~ "Client '%s' seems to be an aggressive client and is banned from the "
 #~ "uploadqueue"
 #~ msgstr ""
-#~ "Klient '%s' ser ud til at være en aggresiv klient og er banlyst fra "
-#~ "upload køen"
+#~ "Klient '%s' ser ud til at vÃ¦re en aggresiv klient og er banlyst fra "
+#~ "upload kÃ¸en"
 
 #~ msgid "%s [%s:%i] using %s removed : invalide eMule client"
 #~ msgstr "%s [%s:%i] bruger %s fjernet : invalid eMule klient"
 
 #~ msgid "%s [%s:%i] using %s removed : suspicious mod string change"
-#~ msgstr "%s [%s:%i] bruger %s fjernet : mÃ¦rklig mod string Ã¦ndring"
+#~ msgstr "%s [%s:%i] bruger %s fjernet : mÃÅ rklig mod string ÃÅ ndring"
 
 #~ msgid "Wizard"
 #~ msgstr "Assistent"
@@ -8238,7 +8620,7 @@
 #~ msgstr "manuel"
 
 #~ msgid "(enter below!)"
-#~ msgstr "(indsÃ¦t nedenfor!)"
+#~ msgstr "(indsÃÅ t nedenfor!)"
 
 #~ msgid "56-k Modem"
 #~ msgstr "56k-Modem"

aMule-2.2.6.tar.bz2/po/de.po -> aMule-2.3.1.tar.bz2/po/de.po Changed

@@ -1,6 +1,6 @@
 # translation of de.po to
 # aMule i18n resource file.
-# Copyright (C) 2004 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the aMule package.
 #
 # Kry <elkry@users.sourceforge.net>, 2004.
@@ -12,1306 +12,1163 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-08-19 11:00+0100\n"
-"Last-Translator: Johannes Krampf <wuischke@amule.org>\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Das angegebene Passwort darf nicht leer sein."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Ungültiges Passwort, keine MD5-Prüfsumme!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Verbindungsfehler"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "EC-Verbindung fehlgeschlagen. Leere Antwort."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Externe Verbindungen: Zugriff verweigert wegen:"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Externe Verbindungen: Zugriff verweigert"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Externe Verbindungen: Falsche Antwort vom Server. Verbindung beendet."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Gelungen! Verbindung aufgebaut zu aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Verbindung hergestellt."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Prüfsumme erstellen"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Einen Freund hinzufügen"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Wird abgeschlossen"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Du musst einen gültigen Port und eine gültige IP eingeben!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Vollständig"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Information"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Pausiert"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Die angegebene Benutzerprüfsumme ist nicht gültig!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Fehlerhaft"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Fehler beim Öffnen der ED2KLinks-Datei."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Herunterladen"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"WARNUNG: Man kann sich nicht als Quelle für einen eD2k-Verweis hinzufügen "
+"während man eine niedrige ID hat."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Warten"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Beende nun Hauptanwendung ..."
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Beginne, MD4- und AICH-Prüfsummen zu berechnen für Datei %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Beende amuleweb-Instanz mit pid '%ld' ... "
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Beginne, MD4-Prüfsumme zu berechnen für Datei %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Erzwinge Beenden der amuleweb-Instanz mit pid '%ld' ... "
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Beginne, AICH-Prüfsumme zu berechnen für Datei %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Fehlgeschlagen"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Wandle alte AICH-Prüfsummensätze von '%s' um in 64b in '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: Beende Programmkern."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "WARNUNG: Der Dateiname '%s' ist ungültig und wurde in '%s' umbenannt."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "aMule-Herunterfahren abgeschlossen."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "WARNUNG: Die Datei '%s' gibt es schon, neue Datei in '%s' umbenannt."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Speicherfehlerbehebungsresultate für aMule-Beendung:"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
 msgstr ""
-"WARNUNG: Konnte original '%s' nach Erstellen des Backups nicht entfernen"
+"\n"
+"EC-Konfiguration"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "WARNUNG: Fehler beim Löschen von %s"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Passwort eingestellt und externe Verbindungen aktiviert."
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Konnte Liste der freigegebenen Dateien von Benutzer '%s' nicht abrufen"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "WARNUNG"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Unbekannt"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Fake eMule version %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Fake eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Es sind keinerlei Server in der Server-Liste.\n"
+"Soll aMule jetzt eine neue Liste herunterladen?"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Fake eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Server-Liste herunterladen"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (basiert auf eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr "Webserver läuft mit pid %d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Spitzname: %s ID: %u"
+#: src/amule.cpp:658
+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 ""
+"Du hast \"amuleweb zusammen mit aMule starten\" aktiviert, allerdings kann "
+"die amuleweb-Programmdatei nicht gestartet werden. Bitte installiere das "
+"Paket, das amuleweb enthält, oder kompiliere aMule mit --enable-webserver "
+"neu."
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Angefordert: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "FEHLER"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Dateistatistik dieser Sitzung: %d von %d Anfrage akzeptiert, %s übertragen\n"
-msgstr[1] ""
-"Dateistatistik dieser Sitzung: %d von %d Anfragen akzeptiert, %s übertragen\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Kann Ports nicht mit der festgelegten Adresse verbinden: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Dateistatistik aller Sitzungen: %d von %d Anfrage akzeptiert, %s übertragen\n"
-msgstr[1] ""
-"Dateistatistik aller Sitzungen: %d von %d Anfragen akzeptiert, %s "
-"übertragen\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Unbekannte Datei angefordert"
+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/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Client %s auf IP:Port %s:%d benutzt %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Benutzername"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Port %u ist nicht erreichbar!\n"
+"\n"
+"Dies bedeutet, dass du eine niedrige ID erhalten wirst.\n"
+"\n"
+"Bitte überprüfe deine Netzwerkeinstellungen, um sicherzugehen, dass der Port "
+"für ein- und ausgehenden Traffic geöffnet ist."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Freunde"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Erstellen der OnlineSig-Datei gescheitert"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Zeige &Details"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Erstellen der aMule OnlineSig-Datei gescheitert"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Freund hinzufügen"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"Die ausgewählte Locale scheint nicht auf dem System installiert zu sein."
+"(INFO: Ich werde trotzdem versuchen, sie zu setzen)"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Freund entfernen"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "Dies ist das erste Mal, dass du aMule %s startest"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "&Message senden"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Dies ist eine Testversion, täglich aktualisiert, und\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Dateien ansehen"
+#: src/amule.cpp:1043
+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"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Friendslot erstellen"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"oder deinen Hund tötet. Aber es *sollte* sicher sein, sie zu benutzen.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Den markierten Freund wirklich löschen?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Mehr Informationen und neue Releases können auf unserer Homepage gefunden "
+"werden\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Die markierten Freunde wirklich löschen?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"unter www.aMule.org, oder in unserem IRC-Channel #amule auf irc.freenode."
+"net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Abbruch"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Bitte melde Fehler unter http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Du darfst nicht mehr als einen Friendslot vergeben.\n"
-" Nur ein Slot wurde vergeben."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Mehrfachauswahl"
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Download fertiggestellt"
+"Das angegebene Verzeichnis für die Online-Signaturdateien ist UNGÜLTIG!\n"
+"Online-Signatur wird bis zur Fehlerbehebung in den Einstellungen DEAKTIVIERT."
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Der vollständige Pfad zur Datei."
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Server Hostname benachrichtigt."
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Der Name der Datei ohne den Pfadanteil."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Speicherplatzvorbelegung für Datei '%s' fehlgeschlagen: %s"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "Die eD2k-Prüfsumme der Datei."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "FEHLER: kann Logdatei nicht öffnen"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Die Dateigröße in Byte."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "WARNUNG: Logdatei ist leer. Etwas ist falsch."
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Die Gesamtzeit aktiven Herunterladens."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Das Log wurde zurückgesetzt"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Neue Chat-Sitzung gestartet."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Servernachricht: %s"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Nachrichtensender."
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "Lade %s nicht herunter, weil die angeforderte Datei nicht neuer ist."
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Kein Speicherplatz mehr vorhanden."
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Knotenliste kann nicht geholt werden."
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Festplattenpartition."
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Konnte heruntergeladene Datei zur Versionsprüfung nicht öffnen"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Fehler beim Fertigstellen der Datei."
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Fehlerhafte Versionsprüfungsdatei"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Dateiname"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Du benutzt eine veraltete aMule-Version!"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Größe"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr ""
+"Diese Version von aMule ist %i.%i.%i und die aktuelle Version ist %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Suchtyp"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Die neueste Version kann man immer auf http://www.amule.org finden."
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Priorität"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "WARNUNG: Diese Version von aMuled ist veraltet: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "Datei-ID"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Deine Kopie von aMule ist aktuell."
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Anfragen"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Konnte die Versionsprüfungsdatei nicht herunterladen"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Akzeptierte Anfragen"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Benutzer: %s | Dateien: %s"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Übertragene Datenmenge"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Benutzer: E: %s K: %s | Dateien: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Verteilungsfaktor"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Keine Netzwerke ausgewählt"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Erhaltene Teile"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "mit niedriger ID"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Vollständige Quellen"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "mit hoher ID"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Verzeichnispfad"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Verbunden zu %s %s"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Freigaben"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Verbinde zu %s"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Sehr niedrig"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "eD2k getrennt"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Niedrig"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad gestartet."
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normal"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad beendet."
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Hoch"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Kad verbunden (ok)"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Sehr hoch"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Kad verbunden (firewalled)"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Release"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Kad getrennt"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Automatisch"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Kad-Netzwerk kann mit deaktiviertem UDP-Port nicht benutzt werden, nicht "
+"gestartet."
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Kommentar/Bewertung abgeben"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr ""
+"Kad-Netzwerk ist in den Voreinstellungen deaktiviert, kein "
+"Verbindungsversuch."
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Kommentar/Bewertung ändern"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"FEHLER: aMule daemon kann nicht verwendet werden wenn externe Verbindungen "
+"deaktiviert sind. Zum aktivieren von externen Verbindungen entweder normales "
+"aMule benutzen, amuled mit der Option --ec-config starten oder in der Datei "
+"~/.aMule/amule.conf die Einstellung \"AcceptExternalConnections\" auf 1 "
+"ändern."
+
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"FEHLER: Ein gültiges Password ist nötig um externe Verbindungen nutzen zu "
+"können und aMule daemon kann ohne externe Verbindungen nicht benutzt werden. "
+"Um aMule daemon zu starten muss das \"ECPassword\"-Feld in der Datei ~/."
+"aMule/amule.conf mit einem richtigen Wert versehen sein. amuled kann mit dem "
+"Argument --ec-config gestartet werden um das Passwort zu setzen. Mehr "
+"Informationen können in der Wiki unter http://wiki.amule.org gefunden werden."
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: OnInit - Zeitmesser wird gestartet"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: Wechsele in den Hintergrund."
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Kann keine Pid-Datei erstellen"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Umbenennen"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "FEHLER: %s"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Füge Dateien aus Sammlung zur Übertragungsliste"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Dies ist aMule %s, basierend auf eMule."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Kopiere Magnet-URL &URI in Zwischenablage"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Läuft auf %s"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Kopiere eD2k &Link in die Zwischenablage"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Besuche http://www.amule.org um zu sehen, ob eine neue Version verfügbar ist."
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Kopiere eD2k-Verweis in die Zwischenablage (&Source)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "UNBEHEBBARER FEHLER: Es konnte kein Zeitgeber erstellt werden."
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Kopiere eD2k-Verweis in Zwischenablage (Source) (&With Crypt options)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "aMule-Fernbedienung "
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "eD2k-Link in Zwischenablage kopieren (&Hostname)"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Schnappschuss:"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
-"Kopiere eD2k-Verweis in Zwischenablage (Hostname) (With &Crypt options)"
+"'All-Plattform' p2p Client basierend auf eMule \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Kopiere eD2k-Verweis in die Zwischenablage (&AICH Info)"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Webseite: http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Feedback in die Zwischenablage kopieren"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Forum: http://forum.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:504
 msgid ""
-"Feedback from: %s (%s)\n"
+"FAQ: http://wiki.amule.org \n"
 "\n"
 msgstr ""
-"Rückmeldung von: %s (%s)\n"
+"FAQ: http://wiki.amule.org \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr ""
-"Du brauchst eine hohe ID (\"HighID\"), um einen gültigen Quellenverweis zu "
-"erstellen"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "WARNUNG"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Freigegebene Dateien (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[PartFile]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Einen neuen Namen für diese Datei eingeben:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Datei umbenennen"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Wiederaufnahme des Hochladens der Datei '%s'."
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Aussetzen des Hochladens der Datei '%s'."
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMule Textclient"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: Suchbegriff zu kurz"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Kontakt: admin@amule.org (administrative Fragen) \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Lese %u Kad-Kontakt"
-msgstr[1] "Lese %u Kad-Kontakte"
-
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Nur %d Kad-Kontakt verfügbar, nodes.dat wurde nicht geschrieben."
-msgstr[1] "Nur %d Kad-Kontakte verfügbar, nodes.dat wurde nicht geschrieben."
-
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "%d Kad-Kontakt geschrieben."
-msgstr[1] "%d Kad-Kontakte geschrieben."
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "FEHLER: Kann nicht auf TCP-Port lauschen."
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Teile von aMule basieren auf \n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "Webclient-Verbindung akzeptiert.\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Peer-to-peer Weiterleitung basierend auf der XOR Funktion.\n"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "FEHLER: Kann Webclient-Verbindung nicht akzeptieren.\n"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Nachricht"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Anfrage mit folgendem Fehler gescheitert: %s."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "aMule Dialog zerstört."
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Anfrage ist mit unbekanntem Fehler gescheitert."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Verbinden"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Index-Datei nicht gefunden: "
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Baue Verbindung auf"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Sitzung abgelaufen - fordere Anmeldung\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Verbindung getrennt"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sitzung ok, angemeldet\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Firewalled"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sitzung ok, nicht angemeldet\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Verbunden"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Keine Sitzung geöffnet - fordere Anmeldung\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Baue Verbindung auf"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Sitzung eröffnet - fordere Anmeldung\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: aus"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Anfrage verarbeiten [original]: "
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Abbruch"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Prüfe Passwort\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Beendet die derzeitigen Verbindungsversuche"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Passwort-Prüfsumme ungültig\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Trennen"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Passwort ok\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Von den momentan verbundenen Netzwerken trennen."
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Falsches Passwort\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Verbinden"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Du hast kein Passwort angegeben. Leeres Passwort ist nicht erlaubt.\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Mit den aktuell aktivierten Netzwerken verbinden."
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Fordere Abmeldung\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Hoch: %.1f(%.1f) | Herunter: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Anfrage verarbeiten [umgeleitet]: "
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Hoch: %.1f | Herunter: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Lädt Vorlage <str>"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Verbunden)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Webserver-HTTP-Port"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Getrennt)"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Benutze UPnP-Port-Weiterleitung für Webserver-Port"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "%s wirklich beenden?"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP-Port"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Beenden bestätigen"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Benutze gzip-Kompression"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Startbefehl:"
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- Voreinstellung -"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Vollzugriff-Passwort für den Webserver"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Skin-Verzeichnis '%s' existiert nicht"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Gast-Passwort für den Webserver"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "WARNUNG: Öffnen der Skin-Datei '%s' zum Lesen nicht möglich"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Erlaube Gastzugriff"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Netzwerke"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Verweigere Gastzugriff"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Übersicht der verwendeten Netzwerke"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Lade/Speichere Webserver-Einstellungen von/zu entferntem aMule"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Suchen"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMule-Konfigurationsdateipfad. NICHT DIREKT BENUTZEN!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Dateisuche in den verbundenen Netzwerken"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "PHP-Interpreter deaktivieren (überholt)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Downloads"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Rekompiliere PHP-Seiten bei jeder Anfrage"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Download-Fenster"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule Webserver"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Freigegebene Dateien"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Nicht verfügbar"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Übersicht der freigegebenen Dateien"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Niemals"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Nachrichten"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Lädt herunter..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Nachrichten, Chat, Freundesliste"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistiken"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "%d Bytes erwartet, aber %d Bytes heruntergeladen."
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Diverse Statistiken über Up- und Download, Verbindungen, Clients usw."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Verzeichnis mit der Datei amulesig.dat"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Fenster für Einstellungen"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Durchsuchen"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importiere"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Hier das Verzeichnis zur Datei amulesig.dat angeben"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Das Importierwerkzeug für Part-Dateien"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Aktualisierungsintervall in Sekunden"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Über"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Erzeuge bei jeder Aktualisierung ein Statistikbild"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Über/Hilfe - Hinweise zur Version usw."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Hier das Zielverzeichnis zum Erstellen des Statistikbildes angeben"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "eD2k-Netzwerk"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Statistikbild periodisch auf einen FTP-Server hochladen"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Kad-Netzwerk"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP-URL"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Kein Netzwerk"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP-Pfad"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "aMule Fernsteuerung"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Hier die URL deines FTP-Servers eingeben"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
-"Hier das Zielverzeichnis für das Statistikbild auf dem FTP-Server angeben"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Schwerer Fehler: Der Kern-Zeitgeber konnte nicht erstellt werden."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Benutzer"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Verbinde mit entferntem aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Passwort"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Schwerer Fehler: Der Nachfrage-Zeitgeber konnte nicht erstellt werden."
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Gehe in Ereignisschleife..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Verbinde..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Hier den Benutzernamen zur Anmeldung auf deinem FTP-Server eingeben"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Verbindung fehlgeschlagen "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Hier das Benutzerpasswort zur Anmeldung auf dem FTP-Server eingeben"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "EC-Ereignissteuerung für entfernte Benutzeroberfläche"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Beende..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "FTP-Aktualisierungsintervall in Minuten"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Verbindung fehlgeschlagen. Konnte nicht zu %s:%d verbinden\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Bestätigen"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Verbindung getrennt - wahrscheinlich hat aMule sich beendet"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Verzeichnis mit deiner Signaturdatei"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Bereit"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Verzeichnis zum Erzeugen des Statistikbildes"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Alle"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:631
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i Tag(e) %i Std. %i Min. %i Sek."
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, die aMule-Onlinestatistik"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Willkommen!"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
+"Konnte das Verzeichnis '%s' für die Kategorie '%s' nicht erstellen, nutze "
+"weiter das Verzeichnis '%s'."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Höchste Downloadrate seit wxCas läuft"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Höchste Downloadrate während wxCas jemals lief"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Konnte Liste der freigegebenen Dateien von Benutzer '%s' nicht abrufen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Zurücksetzen"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Suche Kumpel für Verbindung mit niedriger ID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "System"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Fake eMule version %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Automatische Aktualisierung beenden"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Fake eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Speichere Onlinestatistikbild"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Fake eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Drucke Onlinestatistikbild"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (basiert auf eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Einstellungen"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Spitzname: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Über wxCas"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Angefordert: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Beginne automatische Aktualisierung"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Dateistatistik dieser Sitzung: %d von %d Anfrage akzeptiert, %s übertragen\n"
+msgstr[1] ""
+"Dateistatistik dieser Sitzung: %d von %d Anfragen akzeptiert, %s übertragen\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Automatische Aktualisierung angehalten"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Dateistatistik aller Sitzungen: %d von %d Anfrage akzeptiert, %s übertragen\n"
+msgstr[1] ""
+"Dateistatistik aller Sitzungen: %d von %d Anfragen akzeptiert, %s "
+"übertragen\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Automatische Aktualisierung begonnen"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Unbekannte Datei angefordert"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Speichere Statistikbild"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Nachricht gefiltert von '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMule-Onlinestatistik"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Neue Nachricht von '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/BaseClient.cpp:2899
+#, c-format
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"Es gab ein Problem beim Drucken.\n"
-"Vielleicht ist der aktuelle Drucker nicht richtig eingestellt?"
+"Benutzer %s (%u) hat die Liste freigegebener Dateien für das nicht "
+"vorhandene Verzeichnis '%s' angefordert -> Ignoriert"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Drucke"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "WARNUNG: Datei '%s' kann nicht geöffnet werden."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
-"wxCas, aMule Online-Signatur-Statistiken\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Basierend auf CAS von Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Vertrieben unter der GPL"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh-oh, aMule läuft nicht..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule läuft"
+"WARNUNG: Liste der abgebrochenen Dateien korrumpiert, enthält ungültigen "
+"Header."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule läuft, aber nicht verbunden"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "IO-Fehler während des Lesens der Datei '%s': %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule verbindet gerade...."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Fehler während des Speicherns der Datei '%s': %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh-oh, aMule-Status ist unbekannt..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Captcha eingeben"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategorie"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " läuft seit "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Neue Kategorie"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr "ist angehalten!"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Wähle einen Ordner für eingehende Dateien"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " ist nicht verbunden!"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Du musst einen Namen für diese Kategorie festlegen!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " verbindet sich..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Du musst einen Pfad für diese Kategorie festlegen!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " macht irgendetwas Merkwürdiges, bitte überprüfen!"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Anlegen des Verzeichnisses für eingehende Dateien der Kategorie "
+"fehlgeschlagen. Bitte einen gültigen Pfad angeben!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " ist verbunden mit "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Beginn der Chat-Sitzung: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Verbunden mit Client ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Verbinde mit Client ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "firewalled"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Verbindung zum Client fehlgeschlagen / Verbindung verloren ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "aus"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
+"*** Captcha-Überprüfung bestanden, Nachricht wurde vom Benutzer empfangen. "
+"***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " ist auf "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** Falsche Antwort zum Captcha, Nachricht wurde ignoriert. Bitte eine neue "
+"Nachricht senden um ein neues Captcha anzufordern. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " mit "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Chat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Gesamtdownload: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Reiter schließen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Upload: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Alle Reiter schließen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Sitzung Download: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Andere Reiter schließen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Download: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Zu Freunden hinzufügen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upload: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Credit-Datei geladen, %u Client ist bekannt"
+msgstr[1] "Credit-Datei geladen, %u Clients sind bekannt"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Credits für %u Client abgelaufen!"
+msgstr[1] " - Credits für %u Clients abgelaufen!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Freigegeben: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Keine 'cryptkey.dat' gefunden, erzeuge eine neue."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " Datei(en), Clients in Warteschlange: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Client-Details"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Zeit:"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "Niedrige ID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "Hohe ID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " auf "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Aktiviert"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Durchschnittliche Systemlast (1-5-15 min): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Unterstützt"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Systemlaufzeit: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Nicht Unterstützt"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uT %02uStd %02uMin %02uSek"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Deaktiviert"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uStd %02uMin %02uSek"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Verbunden"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02uMin %02uSek"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Verbindung getrennt"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02uSek"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "Hohe ID"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Nicht vollständig"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "Niedrige ID"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Böser Bube"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Nicht verbunden"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Verifiziert - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Nicht verfügbar"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr ""
+"Benutzer %s (%u) hat Deine Liste der freigegebenen Dateien angefordert -> "
+"akzeptiert"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+"Benutzer %s (%u) hat Deine Liste der freigegebenen Dateien angefordert -> "
+"abgelehnt"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"Benutzer %s (%u) hat die Liste Deiner freigegebenen Verzeichnisse angefragt -"
+"> akzeptiert"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Abgebrochen !"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+"Benutzer %s (%u) hat die Liste Deiner freigegebenen Dateien angefragt -> "
+"abgelehnt"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "Unable to open %s"
-msgstr "Konnte '%s' nicht öffnen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Eingabeparameter"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Datei für Prüfsummenberechnung"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Dieser Datei optionale URLs hinzufügen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Hier die Datei zum Erzeugen des eD2k-Verweises eingeben."
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Hier die URL eingeben, die zum eD2k-Verweis hinzugefügt werden soll. Füge am "
-"Ende einen / ein, damit aLinkCreator den momentanen Dateinamen übernimmt."
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Entferne"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Leere"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Erstelle Verweis mit Part-Prüfsummen"
+"Benutzer %s (%u) hat deine Liste freigegebener Dateien für das Verzeichnis '%"
+"s' angefordert -> akzeptiert"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Hilft, neue und seltene Dateien schneller zu verteilen auf Kosten einer "
-"erhöhten Verweisgröße"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4-Dateiprüfsumme"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k-Dateiprüfsumme"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k-Verweis"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Start"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Speichern"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "In die Zwischenablage kopieren"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Schließen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Öffnen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Eine Datei zum Erstellen ihres eD2k-Verweises öffnen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopieren"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Kopiere erstellten eD2k-Verweis in die Zwischenablage"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Speichern unter"
+"Benutzer %s (%u) hat deine Liste freigegebener Dateien für das Verzeichnis '%"
+"s' angefordert -> abgelehnt"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Speichere erstellten eD2k-Verweis in Datei"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Über"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Über aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Datei zum Erstellen des eD2k-Verweises auswählen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Kann die Zwischenablage nicht öffnen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Derzeit nichts zu Kopieren!"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Datei zu dem errechneten eD2k-Verweis auswählen"
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Benutzer %s (%u) hat das Verzeichnis '%s' freigegeben"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Konnte Datei nicht öffnen "
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr ""
+"Benutzer %s (%u) hat ungefragt seine freigegebenen Verzeichnisse gesendet."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Bitte keinen leeren Dateinamen eingeben"
+#: src/ClientTCPSocket.cpp:982
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr ""
+"Benutzer %s (%u) hat die Liste freigegebener Dateien für das Verzeichnis '%"
+"s' gesendet"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Momentan nichts zu speichern!"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr ""
+"Benutzer %s (%u) hat das Senden der Liste freigegebener Dateien abgeschlossen"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
-"aLinkCreator, der aMule eD2k-Verweis-Ersteller\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps von http://www.everaldo.com\n"
-"und http://www.icomania.com\n"
-"und http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Vertrieben unter der GPL"
+"Benutzer %s (%u) hat ungefragt die Liste seiner freigegebenen Dateien "
+"gesendet"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Prüfsummenberechnung..."
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr ""
+"Benutzer %s (%u) verweigert den Zugriff auf die Liste freigegebener "
+"Verzeichnisse/Dateien."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator arbeitet jetzt..."
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Dateikommentare"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Berechne MD4-Prüfsumme"
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Benutzername"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Berechne eD2k-Prüfsummen"
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Dateiname"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Fertig in %.2f s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Bewertung"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Du hast diese URL bereits eingegeben!"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Kommentar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Bitte keine leere URL eingeben"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Keine Kommentare"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Verarbeite Datei Nummer %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Du willst Part-Prüfsummen erstellen (nur bei Dateien > 9,5 MiB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u Kommentar"
+msgstr[1] "%u Kommentare"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Datei existiert nicht!\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, der aMule-eD2k-Verweis-Ersteller"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"Client %s wurde gebannt, weil er %s korrupte Daten für %s gesamt für die "
+"Datei '%s' gesendet hat."
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1325,31 +1182,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Ho]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Verbinden"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Sehr niedrig"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Niedrig"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normal"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Hoch"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Sehr hoch"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Release"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Anfragen"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Verbunden über Server"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Warteschlange voll"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "in Warteschlange"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Übertragen"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Herunterladen"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1361,7 +1244,7 @@
 
 #: src/DataToText.cpp:68
 msgid "Cannot connect LowID to LowID"
-msgstr "Verbindung LowID zu LowID unmöglich"
+msgstr "Verbindung niedriger ID zu niedriger ID nicht möglich"
 
 #: src/DataToText.cpp:69
 msgid "Too many connections"
@@ -1375,8 +1258,7 @@
 msgid "Too many Kad connections"
 msgstr "Zu viele Kad-Verbindungen"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Gebannt"
 
@@ -1408,8 +1290,8 @@
 msgid "Remote Server"
 msgstr "Entfernter Server"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1431,10 +1313,10 @@
 
 #: src/DataToText.cpp:135
 msgid "Search Result"
-msgstr "Suchergebnis"
+msgstr "Suchresultate:"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Fertiggestellt"
 
@@ -1458,885 +1340,317 @@
 msgid "ERROR: Failed!"
 msgstr "FEHLER: Fehlgeschlagen!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "In Warteschlange"
 
 #: src/DataToText.cpp:152
 msgid "Already downloading"
-msgstr "Bereits herunterladend"
+msgstr "Wird bereits heruntergeladen"
 
 #: src/DataToText.cpp:153
 msgid "Unknown or bad tempfile format."
 msgstr "Unbekanntes oder fehlerhaftes Format der Temp-Datei."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Systemvorgabe"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albanisch"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabisch"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturisch"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Baskisch"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgarisch"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Katalanisch"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Chinesisch (vereinfacht)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Chinesisch (traditionell)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Kroatisch"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Tschechisch"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Dänisch"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Holländisch"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Englisch (UK)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estnisch"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finnisch"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Französisch"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galizisch"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Deutsch"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Teil"
 
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Griechisch"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hebräisch"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Ungarisch"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italienisch"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italienisch (Schweiz)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japanisch"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Koreanisch"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Litauisch"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norwegisch"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Größe"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polnisch"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Übertragen"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugiesisch"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Geschwindigkeit"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugiesisch (Brasilianisch)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Fortschritt"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Russisch"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Quellen"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Slowenisch"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Priorität"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Spanisch"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Status"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Schwedisch"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Verbleibende Zeit"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Türkisch"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Zuletzt vollständig gesehen"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ukrainisch"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Letzter Empfang"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Kann ausgewählten Browser nicht bestimmen!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Wirklich die ausgewählte Datei löschen?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"TCP-Port kann nicht größer als 65532 sein, da der Server-UDP-Port=TCP-Port+3 "
-"ist"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Wirklich die ausgewählten Dateien löschen?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Standard-Port wird verwendet (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Servername"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adresse"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Beschreibung"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Benutzer"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Dateien"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Fehlgeschlagen"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Statisch"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Version"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Du möchtest einen Server löschen, mit dem Du verbunden bist. Bitte trenne "
-"Dich zuerst. Der Server wurde NICHT gelöscht."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Unbekannter Name)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Wirklich den statischen Server '%s' löschen?"
+"Rückmeldung von: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Ja"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Automatisch"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Nein"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Stopp"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Konnte '%s' nicht öffnen"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pausieren"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Server (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "Fo&rtsetzen"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Server"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "&Liste um fertige Dateien bereinigen"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Verbinde mit Server"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "[A4AF] Weise alle Quellen dieser Datei zu"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Markiere den Server als statisch"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "[A4AF] Automatisches Zuweisen von Quellen zu dieser Datei"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Markiere den Server als nicht statisch"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "[A4AF] Weise alle Quellen einer anderen Datei zu"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Markiere die Server als statisch"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Erweiterte Optionen"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Markiere dieServer als nicht statisch"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Vorschau"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Entferne Server"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Zeige &Dateieigenschaften"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Entferne die Server"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Zeige alle Kommentare"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Alle Server entfernen"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Kopiere Magnet-URI in Zwischenablage"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Kopiere eD2k-Verweis in die Zwischenablage"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Kopiere eD2k &Link in die Zwischenablage"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopiere eD2k-Verweise in die Zwischenablage"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Feedback in die Zwischenablage kopieren"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Wiederverbinden mit Server"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "Zuweisung rückgängig machen"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Wirklich alle Server löschen?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Einer Kategorie hinzufügen"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Wirklich den markierten Server löschen?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Oeffne diese Datei"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Wirklich die markierten Server löschen?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Einen neuen Namen für diese Datei eingeben:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Ausgeschaltet [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Datei umbenennen"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Dies ist aMule %s, basierend auf eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Läuft auf %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Besuche http://www.amule.org um zu sehen, ob eine neue Version verfügbar ist."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "UNBEHEBBARER FEHLER: Es konnte kein Zeitgeber erstellt werden."
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMule-Fernbedienung "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Schnappschuss:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr "portabler P2P-Client, basierend auf eMule\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr "Webseite:  http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr "Forum: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Kontakt: admin@amule.org (administrative Fragen) \n"
+msgid "Downloads (%i)"
+msgstr "Downloads (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Teile von aMule basieren auf \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Peer-to-peer Weiterleitung basierend auf der XOR Funktion.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Nachricht"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Baue Verbindung auf"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Verbindung getrennt"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Firewalled"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Verbunden"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Baue Verbindung auf"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: aus"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Beendet die derzeitigen Verbindungsversuche"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Trennen"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Von den momentan verbundenen Netzwerken trennen."
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Verbinden"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Mit den aktuell aktivierten Netzwerken verbinden."
+"Bitte trage deinen bevorzugten Videoplayer in den Einstellungen ein.\n"
+"Bis dahin wird aMule versuchen, mplayer zu starten, und bei jeder Vorschau "
+"wird diese Warnung angezeigt werden."
 
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Dateivorschau"
 
-#: src/amuleDlg.cpp:812
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Up: %.1f | Down: %.1f"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "FEHLER: Konnte externen Mediaplayer nicht starten!Befehl: `%s'"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Verbunden)"
+msgid "Saving PartFile %u of %u"
+msgstr "Speichere unfertige Datei %u von %u"
 
-#: src/amuleDlg.cpp:836
-#, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Getrennt)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "aMule wirklich beenden?"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Alle unfertigen Dateien gespeichert."
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Beenden bestätigen"
-
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Verkleidungs(\"Skin\")-Verzeichnis '%s' existiert nicht"
+msgid "Loading temp files from %s."
+msgstr "Lade temporäre Dateien von %s."
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "WARNUNG: Öffnen der Verkleidungsdatei '%s' zum Lesen nicht möglich"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Netzwerke"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Übersicht der verwendeten Netzwerke"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Suchen"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Dateisuche in den verbundenen Netzwerken"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Übertragungen"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Datentransfer - Zeigt Up- und Downloads, Warteschlangen usw."
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Freigegebene Dateien"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Übersicht der freigegebenen Dateien"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Nachrichten"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Nachrichten, Chat, Freundesliste"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistiken"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Diverse Statistiken über Up- und Download, Verbindungen, Clients usw."
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Hier können die verschiedenen Einstellungen vorgenommen werden."
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importiere"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Das Importierwerkzeug für Part-Dateien"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Über/Hilfe - Hinweise zur Version usw."
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "eD2k-Netzwerk"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Kad-Netzwerk"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Kein Netzwerk"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Allgemein"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Verbindung"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Verzeichnisse"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Server"
+msgid "Loading PartFile %u of %u"
+msgstr "Lade unfertige Datei %u von %u"
 
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Sicherheit"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Aussehen"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filter"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Fernsteuerung"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Onlinesignatur"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Ereignisse"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Fehlersuche (Debugging)"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Benutzerdefiniert"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"aMule muss neu gestartet werden, um diese Änderungen zu übernehmen:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP-Port geändert.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP-Port geändert.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"Die Auto-Update-Serverliste ist leer.\n"
-"'Automatisches Aktualisieren der Serverliste beim Start' wird deaktiviert."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Du hast die externen Verbindungen aktiviert, aber kein Passwort angegeben.\n"
-"Externe Verbindungen können nur aktiviert werden, wenn ein gültiges Passwort "
-"angegeben wird."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Sprache geändert.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Temp-Verzeichnis geändert.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- ED2k-Netzwerk aktiviert.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Up: 0.0 | Down: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Beide Netzwerke, eD2k und Kad, sind deaktiviert.\n"
-"Mindestens eins davon muss aktiviert sein, um sich verbinden zu können."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad wird nicht starten, solange der UDP-Port deaktiviert ist.\n"
-"Bitte UDP-Port aktivieren, oder Kad ausschalten."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"aMule MUSS jetzt neu gestartet werden.\n"
-"Wenn du jetzt nicht neustartest, beklage dich nicht, wenn irgendwas übles "
-"passiert.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Deine Auto-Update-Serverliste ist leer.\n"
-"Bitte gib mindestens eine URL zu einer gültigen server.met ein.\n"
-"Drücke dazu den Knopf \"Liste\" neben diesem Kontrollkästchen."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Temporäre Dateien"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Fertige Dateien"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Online-Signaturen"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Wähle einen Ordner für %s"
+"FEHLER: Konnte Sicherungsdatei nicht laden. Suche auf http://forum.amule.org "
+"nach .part.met Wiederherstellungslösungen."
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Suche nach einem Videoplayer"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Alle unfertigen Dateien geladen."
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Browser-Wahl"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Keine Part-Dateien gefunden"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Ausführbar%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Serverliste bearbeiten"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "%u part-Datei gefunden"
+msgstr[1] "%u part-Dateien gefunden"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Hier URL's für server.met-Dateien eintragen.\n"
-"Nur eine URL pro Zeile!"
+"Das Dateisystem für temporäre Dateien unterstützt keine großen Dateien."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Aktualisierungsverzögerung: %d Sekunde"
-msgstr[1] "Update-Verzögerung: %d Sekunden"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr "Das Dateisystem für fertige Dateien unterstützt keine großen Dateien."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Zeit für Durchschnittslinie: %d Minute"
-msgstr[1] "Zeit für Durchschnittslinie: %d Minuten"
+msgid "Downloading %s"
+msgstr "Herunterladen von %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Verbindungsgraphenskala: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Du versuchst bereits, die Datei '%s' herunterzuladen"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Aktualisierungsverzögerung: %d Sekunde"
-msgstr[1] "Aktualisierungsverzögerung: %d Sekunden"
+msgid "You already have the file '%s'"
+msgstr "Die Datei '%s' ist bereits vorhanden"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Dateipuffergröße: %d Byte"
-msgstr[1] "Dateipuffergröße: %d Bytes"
+msgid "You are already trying to download the file %s"
+msgstr "Die Datei %s wird bereits heruntergeladen"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Upload-Warteschlangengröße: %d Client"
-msgstr[1] "Upload-Warteschlangengröße: %d Clients"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Kann Magnet-Verweis nicht in eD2k umwandeln: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Server-Wiederverbindungsintervall: %d Minute"
-msgstr[1] "Server-Wiederverbindungsintervall: %d Minuten"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Server-Wiederverbindungsintervall: Aus"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "UDP-Port für erweiterte Serveranfragen (TCP+3):"
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "deaktiviert"
+msgid "Unknown protocol of link: %s"
+msgstr "Unbekanntes Protokoll von Verweis: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Führe Kommando aus aufgrund Ereignis '%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Aktiviere Befehlsausführung im Kern"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Kern-Befehl:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Aktiviere Befehlsausführung in GUI"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "GUI-Befehl:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Die folgenden Variablen werden ersetzt:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Ungültiger eD2k-Link! Fehler: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Unerlaubter Verbindungsversuch. Verbindung getrennt."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "Client sendete Paket nach fehlgeschlagener Authentifizierung."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Externe Verbindung getrennt."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Externe Verbindungen deaktiviert. Leeres Passwort!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Externe Verbindungen in der Konfigurationsdatei deaktiviert"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Neue externe Verbindung akzeptiert"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "FEHLER: Konnte keine neue externe Verbindung akzeptieren"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "Externe Verbindung verweigert. Kein Passwort in den Einstellungen angegeben!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Verbinde mit Client: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Unbekannte Version"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2344,2251 +1658,1073 @@
 "Unkorrekte EC-Versions-ID; es könnte eine binär-Inkompatibilität vorliegen. "
 "Benutze Kern und Fernsteuerung desselben Schnappschusses."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"Du kannst nicht von einer beliebigen SVN-Version zu einer Release-Version "
-"verbinden! *seufz* möglichen Absturz verhindert"
-
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Authentifizierung fehlgeschlagen."
+"Du kannst nicht zu einer Release-Version von einer beliebigen Entwicklungs-"
+"Version verbinden! *seufz* möglicher Absturz verhindert"
 
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Ungültige Protokollversion."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Fehlende Protokollversionsmarke."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
-msgstr "Ungültige Anfrage, Du solltest Dich zuerst authentifizieren."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+"Authentifizierung fehlgeschlagen: ungültiger Hash als EC-Passwort angegeben."
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Authentifizierung fehlgeschlagen: falsches Passwort."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Authentifizierung fehlgeschlagen: fehlendes Passwort."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
+msgstr "Ungültige Anfrage, bitte zuerst authentifizieren."
+
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Zugang gewährt."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Fehlermeldung \"%s\" zu Client gesendet."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Unerlaubter Verbindungsversuch von %s. Verbindung getrennt."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 "Fernsteuerungs-Part-Datei-Kommando gescheitert: Dateiprüfsumme nicht "
 "gefunden: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Dateiprüfsumme nicht gefunden: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! OpCode-Verarbeitungsfehler!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Server nicht hinzugefügt"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "Server nicht gefunden: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "Der zu entfernende Server muss angegeben sein"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k ist in den Einstellungen deaktiviert."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Suche läuft gerade. Aktualisiere gleich die Ergebnisse!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Websuche mit der Fernsteuerungsschnittstelle macht keinen Sinn."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad ist in den Einstellungen deaktiviert."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Keine Punkte für Graphen."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Der Client ist nicht nicht für diese Detailstufe eingestellt."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Externe Verbindungen: Herunterfahren gefordert"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Wird bereits heruntergefahren."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Externe Verbindungen: Füge hinzu Verweis '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Ungültiger Verweis oder schon auf der Liste"
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Datei nicht gefunden."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Ungültiger Dateiname."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Datei kann nicht umbenannt werden."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad ist in den Einstellungen deaktiviert."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Bereits mit eD2k verbunden."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Verbinde mit eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Bereits mit Kad verbunden."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Verbinde mit Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Alle Netzwerke sind deaktiviert."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Von eD2k getrennt."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Von Kad getrennt."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Externe Verbindungen: ungültigen Opcode empfangen: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Ungültiger OpCode (falsche Protokollversion?)"
 
-#: src/UploadClient.cpp:273
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Öffnen der Datei '%s' fehlgeschlagen, sie wird aus der Liste freigegebener "
-"Dateien entfernt."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Prüfsummensatz angefordert für unbekannte Datei '%s'"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Befehl `%s' mit PID `%d' abgeschlossen mit Status-Code `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Server nicht hinzugefügt: Keine IP-Adresse oder Hostname angegeben."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Server nicht hinzugefügt: Ungültiger Server-Port angegeben."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "eD2k-Status:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Verbunden"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Port"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kademlia-Status:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Läuft"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Status:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Verbindung getrennt"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Verbindungszustand:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Firewalled"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Firewalled-Status: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Verbunden mit Kumpel(\"Buddy\")"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Kein Kumpel(\"Buddy\")"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Benutzer im Schnitt:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Dateien im Schnitt:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Läuft nicht"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Laufzeit: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Übertragungen"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Uploads"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Hochgeladene Daten (Sitzung (Gesamt)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Gesamt-Overhead (Pakete): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Dateianfragen-Overhead (Pakete): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Quellenaustausch-Overhead (Pakete): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Server-Overhead (Pakete): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Kad-Overhead (Pakete): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "zusätzlicher Datenverkehr durch Verschlüsselung (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Laufende Uploads: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Wartende Uploads: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Erfolgreiche Upload-Sitzungen insgesamt: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Fehlgeschlagene Upload-Sitzungen insgesamt: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Gesamte Upload-Zeit: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Downloads"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Heruntergeladene Daten (Sitzung (Gesamt)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Gefundene Quellen: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Laufende Downloads (Chunks): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Sitzung UL:DL-Rate (Gesamt): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Durchschnittliche Download-Rate (Sitzung): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Durchschnittliche Upload-Rate (Sitzung): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Max. Download-Rate (Sitzung): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Max. Upload-Rate (Sitzung): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Server-Wiederverbindungen: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Zeit seit erster Übertragung: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Verbunden mit Server seit: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Aktive Verbindungen (geschätzt): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Verbindungslimit erreicht: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Durchschnittliche Verbindungen (geschätzt): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Höchste Verbindungsanzahl (geschätzt): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Clients"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Gefiltert"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Gesamt: %i Bekannt: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Funktionierende Server: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Ausgefallene Server: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Gesamt: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Gelöschte Server: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Gefilterte Server: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Benutzer auf funktionierenden Servern: %llu"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Unbekannte Erweiterung '%s' für Befehl '%s'.\n"
 
-#: src/Statistics.cpp:721
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Dateien auf funktionierenden Servern: %llu"
+msgid "Unknown command '%s'.\n"
+msgstr "Unbekannter Befehl '%s'.\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Benutzer insgesamt: %llu"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Dieser Befehl kann kein Argument haben.\n"
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "Dateien insgesamt: %llu"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Dieser Befehl muss ein Argument haben.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Server-Auslastung: %.2f%%"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Befehl unvollständig, eine der folgenden Erweiterungen muss verwendet "
+"werden:\n"
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Anzahl freigegebener Dateien: %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Verfügbare Erweiterungen:\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Gesamtgröße der freigegebenen Dateien: %s"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Verfügbare Befehle:\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Average file size: %s"
-msgstr "Durchschnittliche Dateigröße: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Betriebssystem"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Nicht empfangen"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Ausschneiden"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Einfügen"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Alles auswählen"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad-Suche kann nicht ausgeführt werden, wenn Kad nicht läuft"
-
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "eD2k-Suche kann nicht ausgeführt werden, wenn eD2k nicht verbunden ist"
-
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Unerwarteter Fehler bei der Kad-Suche:"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Alle Befehle sind unabhängig von Groß- und Kleinschreibung.\n"
+"Eingabe von '%s <Befehl>' für weitere Informationen zu <Befehl>.\n"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Nachricht gefiltert von '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Programm verlassen."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Neue Nachricht von '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Hilfe anzeigen."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
-"Benutzer %s (%u) hat Deine Liste der freigegebenen Dateien angefordert -> "
-"akzeptiert"
+"Um Hilfe zu einem Befehl zu bekommen, gib 'help <Befehl>' ein.\n"
+"Eine vollständige Befehlsübersicht erhält man mit 'help'.\n"
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
-"Benutzer %s (%u) hat Deine Liste der freigegebenen Dateien angefordert -> "
-"abgelehnt"
+"\n"
+"'%s' zeigt die Befehlsübersicht.\n"
+"\n"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"Benutzer %s (%u) hat die Liste Deiner freigegebenen Verzeichnisse angefragt -"
-"> akzeptiert"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Syntax Fehler!"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
-"Benutzer %s (%u) hat die Liste Deiner freigegebenen Dateien angefragt -> "
-"abgelehnt"
+"Fehler beim Ausführen des Befehls - sollte niemals passieren! Bitte den "
+"Fehler melden.\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"Benutzer %s (%u) hat Deine Liste der freigegebenen Dateien für Verzeichnis %"
-"s angefordert -> akzeptiert"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Dieser Befehl sollte keine Parameter haben."
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"Benutzer %s (%u) hat Deine Liste der freigegebenen Dateien für Verzeichnis %"
-"s angefordert -> abgelehnt"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Dieser Befehl muss einen Parameter haben."
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Benutzer %s (%u) hat Verzeichnis %s freigegeben"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Ungültiges Argument."
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr ""
-"Benutzer %s (%u) hat ungefragt seine freigegebenen Verzeichnisse gesendet."
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Unvollständiger Befehl."
 
-#: src/ClientTCPSocket.cpp:1025
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr ""
-"Benutzer %s (%u) hat die Liste der freigegebenen Dateien für Verzeichnis %s "
-"gesendet"
+msgid "Type '%s' to get more help.\n"
+msgstr "Gib '%s' ein, um mehr Hilfe zu bekommen.\n"
 
-#: src/ClientTCPSocket.cpp:1032
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr ""
-"Benutzer %s (%u) hat das Senden der Liste freigegebener Dateien abgeschlossen"
+msgid "This is %s %s %s\n"
+msgstr "Dies ist %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1037
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr ""
-"Benutzer %s (%u) hat ungefragt die Liste seiner freigegebenen Dateien "
-"gesendet"
+msgid "This is %s %s\n"
+msgstr "Dies ist %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
-"Benutzer %s (%u) verweigert den Zugriff auf die Liste "
-"freigegebenerVerzeichnisse/Dateien."
+"\n"
+"Erstelle Client...\n"
 
-#: src/KadDlg.cpp:132
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Nodes (%u)"
-msgstr "Knoten (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Ungültige Bootstrap-IP"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Ungültiger Bootstrap-Port"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Bitte alle erforderlichen Felder ausfüllen"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Wirklich neue nodes.dat herunterladen?\n"
-
-#: src/KadDlg.cpp:197
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Dies wird alle momentanen Knoten entfernen und die Kademlia-Verbindung "
-"neustarten."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Weiter?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "FEHLER: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "WARNUNG: "
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Einen Freund hinzufügen"
+"\n"
+"Ok, beende %s...\n"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Du musst einen gültigen Port und eine gültige IP eingeben!"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
+"Kann nicht mit leerem Passwort verbinden.\n"
+"Gib ein Passwort in der Konfigurationsdatei\n"
+"oder als Option an oder gib es nach Aufforderung ein.\n"
+"\n"
+"Beende...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Information"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Zeige diese Hilfe."
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Die angegebene Benutzerprüfsumme ist nicht gültig!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Host, auf dem aMule läuft. (Standard: localhost)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Quellen"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "aMules Port für externe Verbindungen. (Standard: 4712)"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Datei"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Passwort für externe Verbindungen."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Download"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Lese Konfiguration aus Datei."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategorie"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Schreibe keinerlei Ausgabe auf stdout."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Hauptkategorie"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Sei ausführlich - Zeige auch Debug-Nachrichten."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Herunterladen in Kategorie"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Setze Programm-Locale (Sprache)."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Suche verwandte Dateien (eD2k, lokale Server)"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Schreibe Kommandozeilen-Optionen in Konfigurationsdatei."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Als bekannte Datei kennzeichnen"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Erstelle Konfigurationsdatei basierend auf aMules Konfigurationsdatei."
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Verbinde mit entferntem aMule"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Drucke Programmversion."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Verbindung fehlgeschlagen "
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Dateieinzelheiten"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "FEHLER"
+#: src/FileDetailDialog.cpp:113
+#, c-format
+msgid "%.1f%% done"
+msgstr "%.1f%% erledigt"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Verbindung fehlgeschlagen. Kann nicht zu %s:%d verbinden.\n"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
-msgstr ""
-"WARNUNG: Man kann sich nicht als Quelle für einen eD2k-Verweis hinzufügen "
-"während man eine niedrige ID hat (\"LowID\")."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "Konnte Freundes-Liste 'emfriends.met' nicht lesen!"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "User: E: %s K: %s | Dateien E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "Konnte Freundes-Liste 'emfriends.met' nicht schreiben!"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Alle"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "KRITISCH - kein Client bei StartChatSession"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Benutzer insgesamt: %s | Dateien insgesamt: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Freunde"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Übertragen"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Zeige &Details"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Geschwindigkeit"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Freund hinzufügen"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Fortschritt"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Freund entfernen"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Status"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "&Message senden"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Verbleibende Zeit"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Dateien ansehen"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Zuletzt vollständig gesehen"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Friendslot erstellen"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Letzter Empfang"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Den markierten Freund wirklich löschen?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Wirklich die ausgewählte Dateie löschen?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Die markierten Freunde wirklich löschen?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Wirklich die ausgewählten Dateien löschen?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Du darfst nicht mehr als einen Friendslot vergeben.\n"
+" Nur ein Slot wurde vergeben."
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Mehrfachauswahl"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Sende Nachricht an Benutzer"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Zu sendende Nachricht:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Stopp"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pausieren"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "Fo&rtsetzen"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "&Liste um fertige Dateien bereinigen"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "[A4AF] Weise alle Quellen dieser Datei zu"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "[A4AF] Automatisches Zuweisen von Quellen zu dieser Datei"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "[A4AF] Weise alle Quellen einer anderen Datei zu"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Erweiterte Optionen"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Vorschau"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Zeige &Dateieigenschaften"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Zeige alle Kommentare"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Kopiere Magnet-URI in Zwischenablage"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "Zuweisung rückgängig machen"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Einer Kategorie hinzufügen"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Oeffne diese Datei"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Entferne von Freundesliste"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Zu Freunden hinzufügen"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Sende Nachricht"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Zu dieser Datei verschieben"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
-msgstr "QR: %u (%i)"
+msgid "On Queue: %u (%i)"
+msgstr "In Warteschlange: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Andere Datei angefordert"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Downloads (%i)"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Warte auf Uploadslot"
 
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Bitte trage deinen bevorzugten Videoplayer in den Einstellungen ein.\n"
-"Bis dahin wird aMule versuchen, mplayer zu starten, und bei jeder Vorschau "
-"wird diese Warnung angezeigt werden."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Dateivorschau"
-
-#: src/DownloadListCtrl.cpp:2320
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "FEHLER: Konnte externen Mediaplayer nicht starten!Befehl: `%s'"
+msgid "On Queue: %u"
+msgstr "In Warteschlange: %u"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "FEHLER: Erstellen der Part-Datei fehlgeschlagen)"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Hochladen"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Versuche, Sicherung der met-Datei von %s zu laden"
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Keine"
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "FEHLER: Konnte part.met-Datei nicht öffnen: %s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "FEHLER: part.met-Datei hat die Größe 0: %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "FEHLER: Ungültige part.met-Dateiversion: %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"Fehler: %s (%s) ist defekt (falscher Tagcount), kann Datei nicht öffnen)."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Versuche, Dateiinformation wiederherzustellen..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr ""
-"Unbenannte Datei wird versucht wiederherzustellen - Es wird versucht, sie "
-"als RecoveredFile.dat zu speichern"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Alle verfügbaren Dateiinformationen wiederhergestellt :D - Versuche, sie zu "
-"benutzen..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Konnte Dateiinfo nicht wiederherstellen :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Fehler beim Öffnen von %s (%s)"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Nein"
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "WARNUNG: %s könnte defekt sein (%i)"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Ja"
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "FEHLER beim Speichern der Part-Datei: %s (%s ==> %s)"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Lädt herunter..."
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Konnte die Länge von '%s' nicht ermitteln - benutze %s-Datei."
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "HTTP-Download abgebrochen"
 
-#: src/PartFile.cpp:927
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' hat die Größe 0 - benutze Datei %s."
+msgid "Unable to create destination file %s for download!"
+msgstr "Kann Zieldatei %s für Download nicht erstellen!"
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Speichern der Datei 'part.met.seeds' für %s fehlgeschlagen"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "Die Download-URL kann nicht leer sein."
 
-#: src/PartFile.cpp:1024
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "%i Einstiegsquelle für Part-Datei %s (%s) gespeichert."
-msgstr[1] "%i Einstiegsquellen für Part-Datei %s (%s) gespeichert."
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "Die URL %s antwortet mit %i - Fehler (%i)!"
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Part-Datei %s (%s) hat keine Einstiegsquellendatei"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Kritischer Fehler während des Schreibens der heruntergeladenen Datei."
 
-#: src/PartFile.cpp:1062
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Part-Datei %s (%s) hat eine leere Einstiegsquellendatei"
+msgid "Downloaded %d bytes"
+msgstr "%d Bytes heruntergeladen"
 
-#: src/PartFile.cpp:1118
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Fehler beim Lesen der Partfile-Einstiegsquellendatei (%s - %s): %s"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "%d Bytes erwartet, aber %d Bytes heruntergeladen."
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"korrumpierter Teil (%1$d) in Datei %3$s mit %2$d Teil gefunden - "
-"Dateiergebnishash |%4$s| Dateihash |%5$s|"
-msgstr[1] ""
-"korrumpierter Teil (%1$d) in Datei %3$s mit %2$d Teilen gefunden - "
-"Dateiergebnishash |%4$s| Dateihash |%5$s|"
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Vollständigen Teil (%i) in %s gefunden"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Prüfsumme für %s neu erstellt"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"Unerwarteter Fehler beim Abschließen des Herunterladens von %s. Datei "
-"pausiert."
+"Ungültige URL für HTTP-Download oder HTTP-Weiterleitung ('http://' "
+"vergessen?)"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Herunterladen abgeschlossen: %s"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "Kann nicht zu HTTP-Downloadserver verbinden."
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Lösche Datei: %s"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Ungültige Antwort von HTTP-Downloadserver"
 
-#: src/PartFile.cpp:2384
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"WARNUNG: Konnte für heruntergeladenen Teil die Prüfsumme nicht berechnen - "
-"Prüfsummensatz unvollständig für '%s'."
+msgid "Download new GeoIP.dat from %s"
+msgstr "Lade neue GeoIP.dat-Datei von %s."
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
-"FEHLER: Prüfsumme für einen Teil konnte nicht erstellt werden - Prüfsumme "
-"unvollständig (%s). Dies dürfte eigentlich nie passieren."
+"Das Herunterladen der GeoIP.dat-Datei ist fehlgeschlagen, breche "
+"Aktualisierung ab."
 
-#: src/PartFile.cpp:3086
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "WARNUNG: Nicht genügend freier Festplattenplatz! Pausiere Datei: %s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Heruntergeladener Teil %i in Datei '%s' ist defekt"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Defekter Teil %i in %s wiederhergestellt -> Gesparte Bytes: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Reserviere"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Ungenügender Festplattenplatz"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Angehalten"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Heruntergeladen"
-
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "FEHLER: Öffnen von Partfile '%s' fehlgeschlagen"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "WARNUNG: Datei 'known.met' kann nicht geöffnet werden."
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
-"WARNUNG: Die Liste bekannter Dateien ist beschädigt, enthält ungültigen "
-"Header."
+"Das Entfernen der %s-Datei ist fehlgeschlagen, breche Aktualisierung ab."
 
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "IO-Fehler während des Lesens der 'known.met': %s"
+msgid "Failed to rename %s file, aborting update."
+msgstr ""
+"Das Umbenennen der neuen %s-Datei ist fehlgeschlagen, breche Aktualisierung "
+"ab."
 
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Fehler während des Speicherns der 'known.met': %s"
+msgid "Successfully updated %s"
+msgstr "%s erfolgreich aktualisiert."
 
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "%i bekannte freigegebene Dateie gefunden"
-msgstr[1] "%i bekannte freigegebene Dateien gefunden"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Fehler beim aktualisieren der GeoIP.dat-Datei"
 
-#: src/SharedFileList.cpp:358
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "%i bekannte Dateie gefunden, %i unbekannt"
-msgstr[1] "%i bekannte Dateien gefunden, %i unbekannt"
+msgid "Failed to download %s from %s"
+msgstr "Herunterladen der Datei %s von %s fehlgeschlagen."
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "FEHLER: Versucht, %s freizugeben"
+msgid "Failed to load country data for '%s'."
+msgstr "Herunterladen der Länderdaten für '%s' fehlgeschlagen."
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Dateikommentare"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Bewertung"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Kommentar"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Keine Kommentare"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Lade IP-Filter 'ipfilter.dat'·und·'ipfilter_static.dat'."
 
-#: src/CommentDialogLst.cpp:104
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u Kommentar"
-msgstr[1] "%u Kommentare"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Verbindung zu allen gelisteten verschleierten Servern misslungen. Versuche "
-"erneut, ohne Verschleierung."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
-"Fehler beim Verbinden zu allen Servern in der Liste. Ein neuer Durchgang "
-"wird gestartet."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "eD2k-Netzwerk ist in den Einstellungen deaktiviert - verbinde nicht."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Keine gültigen Server zum Verbinden in der Serverliste gefunden"
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Verbunden mit %s (%s:%i)"
+"Laden der ipfilter.dat '%s' fehlgeschlagen, unbekanntes Format aufgetreten."
 
-#: src/ServerConnect.cpp:263
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Verbindung hergestellt mit %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
-"Schwerer Fehler beim Verbinden. Möglicherweise ist die Internetverbindung "
-"getrennt"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Verbindung verloren zu %s (%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) scheint tot zu sein."
-
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) scheint voll zu sein."
+"Fehler beim Laden der ipfilter.dat '%s', Datei konnte nicht geöffnet werden."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] ""
-"Automatische Verbindungsherstellung zum Server wird in %d Sekunde wiederholt"
-msgstr[1] ""
-"Automatische Verbindungsherstellung zum Server wird in %d Sekunden wiederholt"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Verbindung verloren"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "%u IP-Bereich von '%s' geladen."
+msgstr[1] "%u IP-Bereiche von '%s' geladen."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Verbindung zu %s (%s:%i) fehlgeschlagen."
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "FEHLER: Ungültiger Socket bei Prüfung auf Zeitüberschreitung"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u fehlerhafte Zeile wurde ignoriert."
+msgstr[1] "%u fehlerhafte Zeilen wurden ignoriert."
 
-#: src/ServerConnect.cpp:460
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Verbindungsversuch zu %s (%s:%i): Timeout."
-
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
-"FEHLER: Konnte Sicherungsdatei nicht laden.Suche aufhttp://forum.amule.org "
-"nach .part.met Wiederherstellungslösungen."
+"Das Umbenennen der neuen %s-Datei ist fehlgeschlagen, breche Aktualisierung "
+"ab."
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Keine Part-Dateien gefunden"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "IP-Filter ist bereit"
 
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "%u part-Dateie gefunden"
-msgstr[1] "%u part-Dateien gefunden"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Das Dateisystem für temporäre Dateien unterstützt keine großen Dateien."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr "Das Dateisystem für fertige Dateien unterstützt keine großen Dateien."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Herunterladen von %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Du versuchst bereits, die Datei '%s' herunterzuladen"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Die Datei '%s' ist bereits vorhanden"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Die Datei %s wird bereits heruntergeladen"
+"Bootstrap von \n"
+"bekannten Clients"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Kann Magnet-Verweis nicht in eD2k umwandeln: %s"
+msgid "Nodes (%u)"
+msgstr "Knoten (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Unbekanntes Protokoll von Verweis: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Ungültige Bootstrap-IP"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Ungültiger eD2k-Link! Fehler: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Ungültiger Bootstrap-Port"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Führe <str> aus und beende."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Bitte alle erforderlichen Felder ausfüllen"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Ungültiges IP-Format. Benutze xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Wirklich neue nodes.dat herunterladen?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Dieser Befehl benötigt ein Argument. Mögliche Argumente sind 'all', ein "
-"Dateiname oder eine Zahl.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Verarbeite Datei Nnach Hash:"
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Verarbeite Datei nach Namen:"
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Dieser Befehl benötigt ein Argument. Mögliche Argumente: ein Datei-Hash\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Keine gültige Nummer\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Keine gültige Prüfsumme (sollte genau 32 Zeichen lang sein)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Vorgang erfolgreich."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Anfrage mit folgendem Fehler gescheitert: %s."
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "IP-Filterung für Clients ist %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "AUS"
+"Dies wird alle momentanen Knoten entfernen und die Kademlia-Verbindung neu "
+"starten."
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "AN"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "IP-Filterung für Server ist %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Momentane IP-Filterstufe ist %d.\n"
-
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Bandbreiteneinstellungen: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Fortsetzen?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: Suchbegriff zu kurz"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Verbunden mit %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "mit niedriger ID"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "mit hoher ID"
+msgid "Keyword for search: %s"
+msgstr "Schlüsselwort für Suche: %s"
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Verbinde"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: Das Suchwort ist bereits auf der Suchliste."
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Nicht verbunden"
-
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Download:\t%s"
+"Lesen der nodes.dat Datei fehlgeschlagen - zu alt. Diese Version (0) wird "
+"nicht mehr unterstützt."
 
-#: src/TextClient.cpp:726
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"Upload:\t%s"
-
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Clients in Warteschlange:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Lese %u Kad-Kontakt"
+msgstr[1] "Lese %u Kad-Kontakte"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Quellen insgesamt:\t%d\n"
+"Keine Kontakte gefunden, bitte von einem anderen Client bootstrappen oder "
+"eine nodes.dat-Datei herunterladen."
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Anzahl der Suchergebnisse: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - Suchfortschrittsanzeige"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Nur %d Kad-Kontakt verfügbar, nodes.dat wurde nicht geschrieben."
+msgstr[1] "Nur %d Kad-Kontakte verfügbar, nodes.dat wurde nicht geschrieben."
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Unbekannte Antwort vom Server empfangen, OpCode = %#x"
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Zeige kurze Statusinformation."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr ""
-"Verbindungszustand, momentane Up/Downloadgeschwindigkeit, usw. zeigen\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Zeige vollständigen Statistikbaum."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "%d Kad-Kontakt geschrieben."
+msgstr[1] "%d Kad-Kontakte geschrieben."
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Wahlweise kann man diesem Befehl eine Zahl zwischen 0-255 als Argument\n"
-"übergeben, um die Anzahl der angezeigten Einträge für die "
-"Unterverzeichnisse\n"
-"der Clientversionen anzugeben. 0 oder leer bedeutet 'unbegrenzt'.\n"
-"\n"
-"Beispiel: 'statistics 5' zeigt nur die ersten 5 Versionen für jeden "
-"Clienttyp.\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Dateiname"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "aMule beenden."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Dateigröße"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Herunterfahren des fernbedienten Kerns (amule/amuled):\n"
-"Dadurch wird auch der Textclient beendet, weil er\n"
-"ohne laufenden Kern (core) nicht verwendbar ist.\n"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Tauschverhältnis"
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Neuladen des angegebenen Objekts."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Hochgeladen"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Liste freigegebener Dateien neu laden."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Angefordert"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "IP-Filtertabelle von Datei neu laden."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Akzeptiert"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Mit Netzwerk verbinden."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "vollständige Quellen"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Verbindet zu allen in den Voreinstellungen aktivierten Netzwerken.\n"
-"Wahlweise kann eine Serveradresse nach dem Schema IP:Port angegeben\n"
-"werden, um nur zu diesem Server zu verbinden. Die IP muss eine dezimale,\n"
-"punktgetrennte IPv4-Adresse, oder ein auflösbarer DNS-Name sein."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Nur mit eD2k verbinden."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Nur mit Kad verbinden."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Vom Netzwerk trennen."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Dies wird von allen momentan verbundenen Netzwerken trennen.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Nur von eD2k trennen."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Nur von Kad trennen."
+"WARNUNG: Liste der bekannten Dateien korrumpiert, enthält ungültigen Header."
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Sendet einen eD2k- oder Magnet-Verweis an den Kern."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"Der hinzuzufügende eD2k-Verweis kann sein:\n"
-"*) ein Dateiverweis (ed2k://|file|...), der in die Herunterlade-Schlange "
-"eingereiht wird\n"
-"*) ein Server-Verweis (ed2k://|server|...), der zur Server-Liste hinzugefügt "
-"wird\n"
-"*) oder ein Server-Listen-Verweis, wobei dann alle Server in der Liste zur\n"
-"···Server-Liste hinzugefügt werden\n"
-"\n"
-"Der Magnet-Verweis muss die eD2k-Prüfsumme(\"Hash\") und die Dateigröße "
-"beinhalten.\n"
+"Laden eines Eintrags aus der Liste bekannter Dateien fehlgeschlagen, Datei "
+"möglicherweise beschädigt"
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Einstellwert festlegen."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "IP-Filtereinstellungen festlegen."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Aktiviere IP-Filterung sowohl für Clients als auch für Server."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Deaktiviere IP-Filterung sowohl für Clients als auch für Server."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Ein-/Ausschalten von IP-Filterung für Clients."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Einschalten der IP-Filterung für Clients."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Ausschalten der IP-Filterung für Clients."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Ein-/Ausschalten der IP-Filterung für Server."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Einschalten der IP-Filterung für Server."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Ausschalten der IP-Filterung für Server."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "IP-Filterstufe auswählen."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Gültige Filterlevel liegen im Bereich zwischen 0-255, und die\n"
-"Standardeinstellung (Ausgangswert) ist 127.\n"
+"Ungültiger Eintrag in der Liste bekannter Dateien, Datei möglicherweise "
+"beschädigt: "
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Bandbreiteneinstellungen festlegen."
+#: src/libs/common/Format.cpp:307
+#, c-format
+msgid "Unknown error %d"
+msgstr "Unbekannter Fehler %d"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "Der Wert für diese Befehle muss in Kilobytes/Sek. angegeben werden.\n"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Kann Fehlerbeschreibung für Fehler %d nicht erhalten"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Upload-Bandbreitenbegrenzung festlegen."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Prüfsumme erstellen"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Download-Bandbreitenbegrenzung festlegen."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Wird abgeschlossen"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Einstellungswert holen und anzeigen."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Vollständig"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "IP-Filtereinstellungen holen."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Pausiert"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Hole IP-Filter-Status für Clients und Server."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Fehlerhaft"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Hole IP-Filter-Status nur für Clients."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Warten"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Hole IP-Filter-Status nur für Server."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Das angegebene Passwort darf nicht leer sein."
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "IP-Filterstufe holen."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Ungültiges Passwort, keine MD5-Prüfsumme!"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Bandbreiteneinstellungen holen."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Verbindungsfehler"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Beginnt eine Suche."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "EC-Verbindung fehlgeschlagen. Leere Antwort."
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
-"Ein Suchtyp muss angegeben werden durch Auswahl von:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Beispiel: 'search kad Datei' führt eine kad Suche für \"Datei\" aus.\n"
+"Externe Verbindungen: Falsche Antwort, Verhandlung fehlgeschlagen. "
+"Verbindung beendet."
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Vollzieht eine globale Suche."
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Vollzieht eine lokale Suche."
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Vollzieht eine Kade-Suche."
-
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Zeigt die Ergebnisse der letzten Suche an."
-
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Holt die Ergebnisse der vorhergehenden Suche.\n"
-
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Zeigt den Fortschritt einer Suche."
-
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Zeigt den Fortschritt einer Suche.\n"
-
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Beginne, eine Datei herunterzuladen."
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Gelungen! Verbindung aufgebaut zu aMule "
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Die Nummer einer Datei aus der letzten Suche muss angegeben sein.\n"
-"Beispiel: 'download 12' beginnt das Herunterladen der Datei Nr. 12 der "
-"letzten Suche.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Verbindung hergestellt."
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Download anhalten."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Externe Verbindungen: Zugriff verweigert wegen:"
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Download weiterführen."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Externe Verbindungen: Verhandlung fehlgeschlagen."
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "ListenSocket: OK"
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Download löschen."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "FEHLER: Kann nicht auf TCP-Port lauschen."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Setze Herunterlade-Priorität."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "FEHLER: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr ""
-"Setze die Priorität einer herunterladenden Datei auf niedrig, normal, hoch "
-"oder Auto.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "WARNUNG: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Setze niedrige Priorität."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Schließen"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Setze normale Priorität."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Ausschneiden"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Setze hohe Priorität."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Kopieren"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Setze automatische Priorität."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Einfügen"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Warteschlangen/Listen zeigen."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Leeren"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Upload-/Download-Warteschlange, Serverliste, oder Liste freigegebener "
-"Dateien zeigen.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Alles auswählen"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Upload-Warteschlange zeigen."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Download-Warteschlange zeigen."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Unbegrenzt"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Zeige Log."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule-Traymenü"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Serverliste zeigen."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Geschwindigkeitsbegrenzungen:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Setze Log zurück."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "UL: Keine"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Veralteter Befehl, bitte '%s' nutzen."
+msgid "UL: %u"
+msgstr "UL: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Das ist ein veralteter Befehl und könnte in der Zukunft enfernt werden.\n"
-"Nutze stattdessen '%s'.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DL: Keine"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "Fehler: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "DL: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "WARNUNG: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Download-Geschwindigkeit: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Neue Benutzer-ID ist %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "WARNUNG: Du hast eine Low-ID zugeordnet bekommen!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr ""
-"\tDies rührt vermutlich daher, dass Du Dich hinter einem Router oder einer "
-"Firewall befindest."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tMehr Informationen dazu gibt es hier: http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Upload-Geschwindigkeit: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Unbekannte Serverinfo empfangen! - Zu kurz"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Client-Information"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "%d neuen Server empfangen"
-msgstr[1] "%d neue Server empfangen"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Speichern der Serverliste abgeschlossen."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Server hat letzten Befehl abgelehnt"
+msgid "Nickname: %s"
+msgstr "Spitzname: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Seltsames Paket vom Server empfangen: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Kein Spitzname ausgewählt!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Unbearbeiteter Fehler beim Verarbeiten eines Paketes vom Server: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "Client-ID: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Kann DNS-Auflöse-Thread nicht erstellen, um zu %s zu verbinden"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Nicht verbunden"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "Server-IP %s (%s) ist gefiltert. Verbinde nicht."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Servername: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "verwende Protokollverschleierung."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "ServerIP: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Verbinde mit·%s·(%s·-·%s:%i)·%s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Nicht verbunden"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Konnte DNS-Namen von Server %s nicht auflösen: Kann nicht verbinden!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country():·Misslungenes Laden von Länderdaten von "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "%d Flaggenbitmap geladen."
-msgstr[1] "%d Flaggenbitmaps geladen."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Wirklich das Herunterladen aller Dateien in dieser Kategorie abbrechen und "
-"alle Dateien darin löschen??"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Bestätigung erforderlich"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Alle anderen"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Unvollständig"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Aktiv"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Video"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Audio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Archiv"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD-Abbilder"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Bilder"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Text"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Ansichtenfilter wählen"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Kategorie hinzufügen"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Kategorie bearbeiten"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Kategorie entfernen"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Dateiname"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Dateigröße"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Tauschverhältnis"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Hochgeladen"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Angefordert"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Akzeptiert"
+msgid "TCP port: %d"
+msgstr "TCP-Port: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "vollständige Quellen"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP-Port: Nicht bereit"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Importiere %s: %s"
+msgid "UDP port: %d"
+msgstr "UDP-Port: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Lese Temp-Verzeichnis"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UDP-Port: Nicht bereit"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Hole Basis-Informationen aus der Download-Info-Datei"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Online-Signatur: An"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Erzeuge Zieldatei"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Online-Signatur: Aus"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Lade Daten aus der alten Download-Datei (%u von %u)"
+msgid "Uptime: %s"
+msgstr "Laufzeit: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Speichere Datenblock in die neue, einzelne Download-Datei (%u von %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Hole Quellen-Download-Datei-Informationen"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Füge Download hinzu und speichere neue Part-Datei"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importiere Part-Dateien"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Status"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Dateiprüfsumme"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Wartend..."
+msgid "Shared files: %d"
+msgstr "Freigegebene Dateien: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Platte: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Bitte wähle einen Ordner, um nach temporären Downloads zu suchen! "
-"(Unterordner werden mit eingeschlossen!)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "Quelldateien der erfolgreich importierten Downloads löschen?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Quellen entfernen?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "Byte"
-msgstr[1] "Bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "Byte/Sek"
-msgstr[1] "Bytes/Sek"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "Sekunden"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "Minuten"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "Stunden"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Tage"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Videos"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Archive"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Texte"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programme"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Jeder"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Nicht bewertet"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Ungültig / fehlerhaft / Fälschung"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Schlecht"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Ordentlich"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Gut"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Überragend"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "alle"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "alle anderen"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Lade IP-Filter 'ipfilter.dat'·und·'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Clients in Warteschlange: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr ""
-"Laden der ipfilter.dat '%s' fehlgeschlagen, unbekanntes Format aufgetreten."
+msgid "Total DL: %s"
+msgstr "Gesamt-DL: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Fehler beim Laden der ipfilter.dat '%s', Datei konnte nicht geöffnet werden."
+msgid "Total UL: %s"
+msgstr "Gesamt-UL: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "%u IP-Bereich von %s geladen."
-msgstr[1] "%u IP-Bereiche von %s geladen."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Upload-Einstellung"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u fehlerhafte Zeile wurden ignoriert."
-msgstr[1] "%u fehlerhafte Zeilen wurden ignoriert."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Download-Einstellung"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktive Verbindungen (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Verstecke aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Dateieinzelheiten"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Zeige aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% erledigt"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Schließen"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "eD2k-Verweis: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Übernehmen"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
-"Hier klicken, um den eD2k-Verweis im Texteingabefeld zur Downloadschlange "
+"Hier klicken, um den eD2k-Verweis im Texteingabefeld zur Download-Liste "
 "hinzuzufügen. "
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4596,19 +2732,19 @@
 "Hier werden Ereignisse angezeigt. Eine komplette Ereignisliste kann im Log "
 "unter dem Server-Reiter eingesehen werden."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Lade ..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Anzahl Benutzer auf dem Server, mit dem du verbunden bist ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Benutzer: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4617,6 +2753,10 @@
 "insgesamt im Netz."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Hoch: 0.0 | Herunter: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4624,7 +2764,7 @@
 "Derzeitige Upload- und Download-Raten im Schnitt. Wenn aktiviert, dann auch "
 "noch in Klammern der Overhead durch Client-Kommunikation."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4632,818 +2772,805 @@
 "optimal connection type)."
 msgstr ""
 "Zeigt den aktuellen Verbindungsstatus an: rote Pfeile bedeuten, dass du im "
-"Moment nicht verbunden bist, gelb bedeutet, du hast eine LowID (firewalled), "
-"und grün bedeutet, dass du eine hohe ID hast (die beste Verbindung)."
+"Moment nicht verbunden bist, gelb bedeutet, du hast eine niedrige ID "
+"(firewalled), und grün bedeutet, dass du eine hohe ID hast (die beste "
+"Verbindung)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Nicht verbunden..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Momentan verbundener Server."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Suche"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Name:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Suchtyp"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Lokal"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Dateiprüfsumme"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Erweiterte Parameter"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtere"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Dateityp"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Jeder"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Archive"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Audio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD-Abbilder"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Bilder"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programme"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Texte"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Videos"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
-msgstr "Dateityp"
+msgstr "Dateiendung"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Mindestgröße"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Höchstgröße"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Verfügbarkeit"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filter:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Filterergebnisse"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Ergebnisse umkehren"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Bekannte Dateien ausblenden"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Start"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Mehr"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 "Sucht nach weiteren Ergebnissen in eD2k. Bislang keine Unterstützung für Kad."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Download"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Setze Felder zurück."
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Ergebnisse"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Vollständige Downloads entfernen"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Uploads/Warteschlange/Clients"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Clients in der Warteschlange:"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Dateiquellen:"
 
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Senden"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Sendet die angegebene Nachricht."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Schließen"
-
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Schließe diese Chat-Sitzung."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Allgemein"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Name:"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "Nicht verfügbar"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "met-Datei:"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Prüfsumme:"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Dateigröße:"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Status der Part-Datei:"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Zuletzt vollständig gesehen:"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Übertragungen"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Gefundene Quellen:"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Übertragende Quellen:"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Anzahl der Part-Dateien:"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Verfügbar:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Datenrate:"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Dauer aktiven Herunterladens: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Übertragen:"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Fertiggestellt:"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligente Fehlerkorrektur"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Durch Fehler verloren:"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Durch Kompression gewonnen:"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Durch I.C.H. gesparte Pakete:"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Dateinamen"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Übernehmen"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Aufräumen"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Übernehmen"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 "Kommentiere/bewerte Datei (der Text wird für alle Benutzer sichtbar sein)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Bei einem Film beispielsweise Laufzeit, Thema, Sprache...\n"
-"oder informiere andere Benutzer über Täuschungen."
+"Für einen Film kann man die Länge, die Handlung, die Sprache,... angeben\n"
+"\n"
+"und wenn es eine Fälschung ist, kann man andere aMule-Benutzer davor warnen."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
-msgstr "Dateigüte"
+msgstr "Dateiqualität"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Nicht bewertet"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Ungültig / fehlerhaft / Fälschung"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Schlecht"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Ordentlich"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Gut"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Hervorragend"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Bewerte diese Datei oder gib anderen Benutzern einen Hinweis, wenn sie "
 "ungültig ist..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Wird geladen, bitte warten ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Unbekannte Größe"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Benötigte Information"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP-Adresse:"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Port:"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Zusätzliche Information"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Benutzername:"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Benutzerprüfsumme:"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Freigegebene Dateien neu laden"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Laufende Sitzung"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Gesamt"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Nachfragen:"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Aktive Uploads:"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Hinzufügen"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Download-Geschwindigkeit"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Aktuell"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
-msgstr "Läuft im Schnitt"
+msgstr "gleitender Mittelwert"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Sitzungsdurchschnitt"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Upload-Geschwindigkeit"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Aktive Downloads"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Aktive Verbindungen (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Aktive Uploads"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Statistikbaum"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Benutzerprüfsumme:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Client-Software:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Client-Version:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP-Adresse:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "Benutzer-ID:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "Server-IP:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Servername:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Verschleierung:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Übertragungen zum Client"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Momentane Anfrage:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Durchschnittliche Uploadrate:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Durchschnittliche Downloadrate:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Hochgeladen (Sitzung):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Heruntergeladen (Sitzung):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Hochgeladen (Gesamt):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Heruntergeladen (Gesamt):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Punkte"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "DL/UP-Modifikator:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Sichere Erkennung:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Bewertung (Gesamt):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Warteschlangenposition:"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Wartepunkte:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Spitzname"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - Der Linux-Muli"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - der multiplattform Muli"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 "Dies ist der Name, den andere Benutzer sehen, wenn sie mit dir verbunden "
 "sind."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Sprache"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Sprache:"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Verzögerung vor dem Anzeigen der Tooltips. "
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Verwendete Sprache für die Einstellungen festlegen."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Weitere Optionen"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Beim Start auf neue Version prüfen"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Wenn dies aktiviert ist, wird aMule beim Start überprüfen, ob eine neue "
 "Version vorliegt"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "minimiert starten"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Wenn dies aktiviert ist, wird aMule sofort nach dem Start minimiert. "
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Abfrage beim Beenden"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Sicherheitsabfrage vor dem Beenden."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "Sicherheitsabfrage vorm Beenden."
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr "Anwendungsfenster bei Klick auf \"Schließen\" verbergen"
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Tray-Icon aktivieren"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
-msgstr "Dies aktiviert/deaktiviert das Symbol im Systray (oder Taskbar)."
+msgstr ""
+"Dies aktiviert/deaktiviert das Symbol im Infobereich (oder Taskleiste)."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
-msgstr "Minimiere zu Tray-Symbol"
+msgstr "Minimiere zu Symbol im Infobereich"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr ""
-"Wird dies aktiviert, minimiert aMule zu einem System-Tray-Symbol, anstatt "
-"zur Taskbar."
+"Wird dies aktiviert, minimiert sich aMule in den Infobereich, anstatt in die "
+"Taskleiste."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Tooltip-Verzögerung in Sek."
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Tooltip-Verzögerungszeit:"
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Verzögerung vor dem Anzeigen der Tooltips. "
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "Sekunden"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Browser-Wahl"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "System-Voreinstellung"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Hier den Browser auswählen"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Benutzerdefinierter Browser:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Gebe hier den Namen deines Browsers ein. Um einen individuellen Browser zu "
-"nehmen, wähle Benutzerdefiniert vom Auswahlmenü darüber."
+"Gib den Namen des gewünschten Browsers hier ein. Bei einem leeren Feld wird "
+"der voreingestellte Systembrowser benutzt."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Durchsuchen"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Öffne in neuem Reiter, wenn möglich"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Öffne die Webseite in einem neuen Reiter, statt einem neuen Fenster, wenn "
 "möglich"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Videoplayer"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Erstelle eine Kopie für die Vorschau"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr "Bandbreiteneinstellungen"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
+msgstr "Bandbreitenbegrenzungen"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Slotzuteilung"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Standard-Client-TCP-Port:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Ports"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Standard-TCP-Port"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Dies ist der Standard-eD2k-Port. Er kann nicht deaktiviert werden."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Erweiterter Client-UDP-Port:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "UDP-Port für Serveranfragen (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Erweiterter UDP-Port (Kad / globale Suche)"
+
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
-"Dieser UDP-Port wird für erweiterte eD2k-Anfragen und das Kad-Netzwerk "
-"verwendet."
+"Dieser UDP-Port wird für erweiterte ED2k-Anfragen und das Kad-Netzwerk "
+"benutzt."
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "deaktivieren"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Aktiviere UPnP für Router-Port-Weiterleitung"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Bind-Adresse"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "UDP-Port für erweiterte Serveranfragen (TCP+3):4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "max. Quellen pro Datei"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnP-TCP-Port (optional):"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Hartes Limit"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Verknüpfe lokale Adresse mit IP (Leer für beliebige):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Verbindungslimits"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Maximale Verbindungen"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Nur für fortgeschrittene Benutzer: Wenn es mehrere Netzwerkverbindungen "
+"gibt, hier die Adresse der Verbindung, mit der aMule verknüpft werden soll, "
+"eingeben."
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "eD2k"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Maximale Anzahl Quellen pro heruntergeladener Datei:"
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Maximale gleichzeitige Verbindungen:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universelles Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Aktiviere UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP-TCP-Port:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "eD2k"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Automatisches Verbinden beim Start"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Wiederverbinden nach Trennung"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Zeige Overhead-Bandbreite"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Serveroptionen"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Lösche tote Server nach"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "Versuchen"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Serverliste beim Programmstart aktualisieren"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Liste"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Serverliste von verbundenem Server beziehen"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Serverliste beim Verbinden zu einem Client beziehen"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Benutze Prioritätssystem"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
-msgstr "Benutze intelligente LowID-Prüfung beim Verbinden"
+msgstr "Benutze intelligente Prüfung für niedrige ID beim Verbinden"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Sicheres/langsames Verbinden zu Servern"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Automatisches Verbinden nur zu Servern aus der statischen Liste"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Setze manuell hinzugefügte Server auf hohe Priorität"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. aktiviert"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH vertraut jeder Prüfsumme (nicht empfohlen)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Intelligente Korruptionsverarbeitung (I.C.H.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Aktiviere"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Advanced I.C.H vertraut jeder Prüfsumme (nicht empfohlen)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Neue Dateien dem Download pausiert hinzufügen"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Neu hinzugefügte Dateien im Download auf Autopriorität stellen"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Versuche, zuerst die ersten und letzten Dateiteile herunterzuladen"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Neue freigegebene Dateien auf Autopriorität stellen"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Versuche, nur komplette Chunks hochzuladen"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Bei fertigem Download nächste pausierte Datei fortsetzen"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Starte nächste pausierte Datei, wenn eine Datei fertiggestellt wird"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Aus der selben Kategorie"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Bei seltenen (< 20 Quellen) Dateien zehn Quellen speichern"
-
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Festplattenplatz"
-
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Festplattenplatz überprüfen"
-
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Wähle dies aus, wenn aMule deinen Festplattenplatz prüfen soll"
-
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Mindest-Festplattenplatz:"
-
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
-msgstr "Hier den minimalen erwünschten Festplattenplatz angeben."
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "In alphabetischer Reihenfolge"
 
-#: src/muuli_wdr.cpp:2077
+#: src/muuli_wdr.cpp:1811
 msgid "Preallocate disk space for new files"
 msgstr "Reserviere Speicherplatz für neue Dateien"
 
-#: src/muuli_wdr.cpp:2078
+#: src/muuli_wdr.cpp:1812
 msgid ""
 "For new files preallocates disk space for the whole file, thus reduces "
 "fragmentation"
@@ -5451,293 +3578,248 @@
 "Reserviert für neue Dateien Speicherplatz für die ganze Datei und reduziert "
 "so Fragmentierung."
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Eingehende Dateien:"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Temporäre Dateien:"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Freigegebene Verzeichnisse"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Stoppe Downloads wenn freier Speicherplatz folgenden Wert erreicht:"
+
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Wähle dies aus, wenn aMule deinen Festplattenplatz prüfen soll"
+
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
+msgstr "Hier den minimalen erwünschten Festplattenplatz angeben."
+
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Bei seltenen (< 20 Quellen) Dateien zehn Quellen speichern"
+
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Uploads"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Neue freigegebene Dateien auf Autopriorität stellen"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Zielverzeichnis für Downloads."
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Verzeichnis für temporäre Downloaddateien"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Freigegebene Ordner"
+
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 "(Rechtsklick auf das Symbol des rekursiv freizugebenden Verzeichnisses)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Versteckte Dateien freigeben"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Graphen"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Aktualisierungsverzögerung: 5 Sekunden"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
-msgstr "Durchschnittsgraphen in Minunten berechnen: 100 mins"
+msgstr "Durchschnittsgraphen in Minuten berechnen: 100 min"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
-msgstr "Verbindungsgraphenskala: 100"
+msgstr "Verbindungsgraphenskalierung: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Farben des Graphen"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Downloadgraphenskalierung:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Uploadgraphenskalierung:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Farben:"
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Hintergrund"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Gitter"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Aktueller Download"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Download: Durchschnitt"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Download: Sitzungsdurchschnitt"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Aktueller Upload"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Upload: Durchschnitt"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Upload: Sitzungsdurchschnitt"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Aktive Verbindungen"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
-msgstr "Systrayicon Transferbalken"
+msgstr "Transferbalken des Symbols im Infobereich"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Momentane Kad-Knoten"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Laufende Kad-Knoten"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Kad-Knoten Sitzung"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Auswahl"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Baum"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Anzahl angezeigter Client-Versionen (0=unbegrenzt)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Kapazitäten"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Hinweis: Diese Werte werden nur für die Statistik benutzt."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! WARNUNG !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Ändere diese Einstellungen nur, wenn du genau\n"
-"weißt, was du tust, denn andernfalls können\n"
-"negative Effekte auftreten.\n"
-"\n"
-"aMule funktioniert auch hervorragend, ohne\n"
-"dass diese Einstellungen verändert werden."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Erweiterte Einstellungen"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Maximale neue Verbindungen pro 5 Sekunden"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
-msgstr "Dateipuffergröße: 240000 bytes"
+msgstr "Dateipuffergröße: 240000 Bytes"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Upload-Warteschlangengröße: 5000 Clients"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Server-Wiederverbindungsintervall: Aus"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Download-Fortschrittsanzeige"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Prozentsatz anzeigen"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Statusbalken anzeigen "
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Statusbalkenstil"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Flach"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Rund"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Zeitgesteuerten Bereitschaftsmodus des Computers deaktivieren"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "benutztes Aussehen:"
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Zeige \"schnelle eD2k-Linkverarbeitung\" in jedem Fenster"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Verkleidungs(\"Skin\")-Unterstützung"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Aktiviere Verkleidungs(\"Skin\")-Unterstützung"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Verkleidung(\"Skin\"):"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- keine Verkleidungen(\"Skins\") verfügbar -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Spaltensortierung"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr ""
-"Automatisches Sortieren der Dateien in der Downloadschlange (hohe CPU-Last)"
-
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule sortiert automatisch die Anzeige der Downloadliste"
-
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Diverse Oberflächeneinstellungen"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Zeige schnelle eD2k-Linkverarbeitung"
-
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Zeige erweiterte Informationen auf Kategorie-Reitern"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
+msgstr "Zeige Programmversion im Titel"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "Zeige Transferraten im Titel"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Toolbar senkrecht ausrichten"
-
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Zeige Part-Datei-Nummer vor Dateinamen"
-
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Webserver-Parameter"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Vor dem Anwendungsnamen"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Nach dem Anwendungsnamen"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "amuleweb beim Start ausführen"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Webserver-Port"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Aktiviere UPnP-Port-Weiterleitung zu Webserver-Port"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Webserver-UPnP-TCP-Port"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Zeige Overhead-Bandbreite"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Aktualisierungsintervall in Sekunden"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Toolbar senkrecht ausrichten"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Gzip-Kompression an"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "Landesflaggen für Clients anzeigen"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Downloadwarteschlangendateien"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Zeige Prozent des Fortschritts"
+
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Zeige Fortschrittsbalken"
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Eingeschränkter Benutzer aktiviert"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Flach"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Kennwort für Vollzugriff"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Rund"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Kennwort für eingeschränkten Zugriff"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "sortiere Dateien automatisch (hohe CPU-Auslastung)"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Webvorlage"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "aMule sortiert automatisch die Spalten der Downloadliste"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Parameter für externe Verbindungen"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Externe Verbindungen annehmen"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"IP-Adresse der lauschenden Schnittstelle\n"
-"(leerlassen für beliebig)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP der lauschenden Schnittstelle:"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5745,76 +3827,116 @@
 "Hier eine gültige IP im Format a.b.c.d für das lauschende EC-Interface "
 "eingeben. Ein leeres Feld oder 0.0.0.0 bedeutet ein beliebiges Interface."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP-Port"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "TCP-Port:"
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Aktiviere UPnP-Port-Weiterleitung zu EC-Port"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Passwort"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Webserver-Parameter"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Starte Webserver mit aMule"
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Webvorlage"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Kennwort für Vollzugriff"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Eingeschränkten Benutzer aktivieren"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Kennwort für eingeschränkten Zugriff"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Aktiviere UPnP-Port-Weiterleitung des Webserverports"
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Webserver UPnP-TCP-Port (optional)"
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Aktualisierungsintervall in Sekunden"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Gzip-Kompression an"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Hier klicken, um alle Einstellungsänderungen zu übernehmen."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Alle Änderungen zu den Einstellungen zurücksetzen."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Titel:"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Kommentar:"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Verzeichnis für eingehende Dateien:"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Priorität bei neu zugewiesenen Dateien ändern:"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "Nicht ändern"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Farbe für diese Kategorie wählen (momentan ausgewählt):"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Tagesmotto des Servers anzeigen, wenn verbunden..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Serverinformation"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Zurücksetzen"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Drücke diesen Knopf, um das Log zurückzusetzen."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule-Log"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 "Hier klicken, um die Serverliste über die angegebene URL zu aktualisieren"
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Serverliste"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5822,44 +3944,56 @@
 "Hier die URL einer server.met eingeben, und dann den Knopf links vom "
 "Eingabefeld drücken, um die Serverliste zu aktualisieren."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Server manuell hinzufügen: Name"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Gib den Namen das neuen Servers hier ein"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Port"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Hier die IP des Servers im Format x.x.x.x eingeben."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Hier den Serverport eingeben."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 "Einen Server manuell hinzufügen (vorher bitte links die Felder ausfüllen)..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule-Log"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Serverinformation"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "eD2k-Info"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad-Info"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Zum Aktualisieren der nodes.dat von URL diese Schaltfläche drücken."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Knoten (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5867,51 +4001,55 @@
 "Hier die URL einer nodes.dat eingeben, und dann den Knopf links vom "
 "Eingabefeld drücken, um die Liste der bekannten Knoten zu aktualisieren."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Knotenstatistik"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Bootstrap"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Neuer Knoten"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Port:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bootstrap von \n"
-"bekannten Clients"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Bootstrap von bekannten Clients"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Kad trennen"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2k Informationen"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Benutze sichere Benutzeridentifikation"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Es wird empfohlen diese Option zu aktivieren. Du wirst keine Credits "
+"erhalten, wenn SUI nicht aktiviert ist."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Protokollverschleierung"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Unterstütze Protokollverschleierung"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5919,11 +4057,11 @@
 "Diese Option aktiviert die Protokollverschleierung und verfügt aMule, "
 "verschleierte Verbindungen von anderen Clients anzunehmen."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Verschleiere ausgehende Verbindungen"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5931,11 +4069,11 @@
 "Diese Option verfügt aMule, Protokollverschleierung zu verwenden bei der "
 "Verbindung zu anderen Clients und/oder Servern."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
-msgstr "Aktzeptiere ausschließlich verschleierte Verbindungen"
+msgstr "Akzeptiere ausschließlich verschleierte Verbindungen"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5944,86 +4082,82 @@
 "akzeptieren. Das führt zu weniger Quellen, jedoch ist sämtlicher Verkehr "
 "verschleiert."
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Dateieigenschaften"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Jeder"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Niemand"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Wer kann die freigegebenen Dateien sehen:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Wer kann freigegebene Dateien sehen:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Wähle, wer deine freigegebenen Dateien einsehen darf."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP-Filterung"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtere Clients"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Aktiviere die Filterung von Client-IPs, die in der Datei ~/.aMule/ipfilter."
 "dat definiert sind."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtere Server"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Aktiviere das Filtern von Server-IPs, die in der Datei ~/.aMule/ipfilter.dat "
 "definiert sind."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Aktualisieren der Liste"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 "Aktualisiert die Liste der zu filternden IPs in der ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Jetzt aktualisieren"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "IP-Filter beim Start automatisch aktualisieren"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Filterstufe:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "LAN-IP-Adressen immer filtern"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoides Handhaben nicht-passender IP-Adressen"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6031,35 +4165,23 @@
 "Weise Paket zurück, wenn die Client-IP abweicht von der IP, von der das "
 "Paket empfangen wurde. Mit Vorsicht zu benutzen."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Benutze systemweite ipfilter.dat, wenn verfügbar."
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
 msgstr ""
-"Erlaube die Benutzung des systemweiten Ipfilters, falls keine lokale "
-"ipfilter.dat gefunden wird"
-
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Benutze sichere Benutzeridentifikation"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Es wird empfohlen diese Option zu aktivieren. Du wirst keine Credits "
-"erhalten, wenn SUI nicht aktiviert ist."
+"Erlaube die Benutzung der systemweiten ipfilter-Datei, falls keine lokale "
+"ipfilter.dat gefunden wird."
 
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
-msgstr "Online-Signatur erstellen"
+msgstr "Online-Signatur aktivieren"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6067,853 +4189,1320 @@
 "Aktiviert das Schreiben der Online-Signaturdatei, die von externen "
 "Programmen verwendet werden kann, um Signaturen o.ä. zu erstellen."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Aktualisierungsintervall (Sekunden):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
-msgstr "Ändern des Online-Signatur-Aktualisierungintervalls (in Sekunden)."
+msgstr "Ändern des Online-Signatur-Aktualisierungsintervalls (in Sekunden)."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Online-Signaturverzeichnis:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Speichere Online-Signatur-Datei in:"
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "Hier klicken, um das Verzeichnis mit den Dateien für die Online-Signatur "
 "auszuwählen."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Deaktivieren/Aktivieren"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Eingehende Nachrichten filtern (außer momentanen Chats):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Filterauswahl:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtere alle Nachrichten"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr ""
 "Filtere Nachrichten von Benutzern, die nicht auf deiner Freundesliste stehen"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtere Nachrichten von unbekannten Clients"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 "Filtere Nachrichten, die folgende Worte enthalten (benutze ',' als Trenner):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "Hier die Worte eingeben, die aMule filtern soll, und um Nachrichten "
 "abzuweisen, in denen sie vorkommen"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Zeige empfangene Nachrichten im Log an"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Kommentare"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 "Filtere Komentare, die folgende Worte enthalten (benutze ',' als Trenner):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Automatisch zum Server verbinden ohne Proxy"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Authentifizierung aktivieren"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Aktiviere/Deaktiviere Authentifizierung mit Benutzername/Passwort"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Benutzername:"
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Der Benutzername, um sich beim Proxy anzumelden"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Passwort:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Proxy-Verbindungspasswort"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Proxy aktivieren"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Aktiviere/Deaktiviere Proxy-Unterstützung"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Proxy-Typ:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Der Typ des Proxy, zu dem du verbindest"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Proxy-Host:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Der Hostname des Proxy"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Proxy-Port:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Der Port des Proxy"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Authentifizierung"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Authentifizierung aktivieren"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Aktiviere/Deaktiviere Authentifizierung mit Benutzername/Passwort"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Der Benutzername, um sich beim Proxy anzumelden"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Passwort:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Proxy-Verbindungspasswort"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Automatisch zum Server verbinden ohne Proxy"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Verbinde zu:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Beim entfernten aMule anmelden"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Benutzername"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Diese Einstellungen speichern"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Aktiviere ausführliche Debug-Protokollierung"
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Nachrichtenkategorien:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Wartend..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Füge Importe hinzu"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Versuche Ausgewähltes noch einmal"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Auswahl entfernen"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Ereignis-Typen"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr "Ereignisarten"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+"Statistiken und Clients in der Warteschlange für ausgewählte Datei(en): "
+"Sitzung / Insgesamt"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Aktive Uploads"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "Prozent aller Dateien"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Alle Dateien"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Ausgewählte Dateien"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Nur aktive Uploads"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Clients anzeigen für"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Aktualisieren:"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Freigegebene Dateien neu laden"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Senden"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Sendet die angegebene Nachricht."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Schließe diese Chat-Sitzung."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Mit irgendeinem Server und/oder Kad verbinden"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Übersicht der verwendeten Netzwerke"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Freigaben"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Dateisuche in den verbundenen Netzwerken"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Ausgeschaltet [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Datentransfer - Zeigt Up- und Downloads, Warteschlangen usw."
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "Byte"
+msgstr[1] "Bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Übersicht der freigegebenen Dateien"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Nachrichten, Chat, Freundesliste"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Diverse Statistiken über Up- und Download, Verbindungen, Clients usw."
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Hier können die verschiedenen Einstellungen vorgenommen werden."
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Neue Kategorie"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Wähle einen Ordner für eingehende Dateien"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Du musst einen Namen für diese Kategorie festlegen!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "Byte/Sek"
+msgstr[1] "Bytes/Sek"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Du musst einen Pfad für diese Kategorie festlegen!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"Anlegen des Verzeichnisses für eingehende Dateien der Kategorie "
-"fehlgeschlagen. Bitte einen gültigen Pfad angeben!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "Sekunden"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "Minuten"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "Stunden"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Tage"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "alle"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "alle anderen"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Unvollständig"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Angehalten"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Video"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Archiv"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Text"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Aktiv"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Unbekannte Erweiterung '%s' für Befehl '%s'.\n"
+msgid "Using config dir: %s"
+msgstr "Verwende Konfigurationsverzeichnis: %s"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Warte auf Ende des Umwandlungsthreads für unfertige Dateien..."
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Unbekannter Befehl '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Importiere %s: %s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Lese Temp-Verzeichnis"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Hole Basis-Informationen aus der Download-Info-Datei"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Erzeuge Zieldatei"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Lade Daten aus der alten Download-Datei (%u von %u)"
 
-#: src/ExternalConnector.cpp:155
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Speichere Datenblock in die neue, einzelne Download-Datei (%u von %u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Hole Quellen-Download-Datei-Informationen"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Füge Download hinzu und speichere neue Part-Datei"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Importiere Part-Dateien"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Status"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Dateiprüfsumme"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Platte: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command cannot have an argument.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Dieser Befehl kann kein Argument haben.\n"
+"Bitte wähle einen Ordner, um nach temporären Downloads zu suchen! "
+"(Unterordner werden mit eingeschlossen!)"
 
-#: src/ExternalConnector.cpp:157
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"This command must have an argument.\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "Quelldateien der erfolgreich importierten Downloads löschen?"
+
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Quellen entfernen?"
+
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "FEHLER: Erstellen der Part-Datei fehlgeschlagen"
+
+#: src/PartFile.cpp:336
+#, c-format
+msgid "Trying to load backup of met-file from %s"
+msgstr "Versuche, Sicherung der met-Datei von %s zu laden"
+
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "FEHLER: Konnte part.met-Datei nicht öffnen: %s ==> %s"
+
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "FEHLER: part.met-Datei hat die Größe 0: %s ==> %s"
+
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "FEHLER: ungültige part.met-Dateiversion: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr "Fehler: %s (%s) ist defekt (falsche Tags: %s), kann Datei nicht laden."
+
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Dieser Befehl muss ein Argument haben.\n"
+"Fehler: %s (%s) ist defekt (falscher Tagcount), kann Datei nicht öffnen)."
 
-#: src/ExternalConnector.cpp:160
-msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Versuche, Dateiinformation wiederherzustellen..."
+
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"\n"
-"Befehl unvollständig, eine der folgenden Erweiterungen muss verwendet "
-"werden:\n"
+"Unbenannte Datei wird versucht wiederherzustellen - Es wird versucht, sie "
+"als RecoveredFile.dat zu speichern"
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
-"\n"
-"Verfügbare Erweiterungen:\n"
+"Alle verfügbaren Dateiinformationen wiederhergestellt :D - Versuche, sie zu "
+"benutzen..."
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Verfügbare Befehle:\n"
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Konnte Dateiinfo nicht wiederherstellen :("
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Fehler beim Öffnen von %s (%s)"
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "WARNUNG: %s könnte defekt sein (%i)"
+
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "FEHLER beim Speichern der Part-Datei: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "Eingabe/Ausgabe-Fehler beim Speicher der unfertigen Dateien:"
+
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Konnte die Länge von '%s' nicht ermitteln - benutze %s-Datei."
+
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' hat die Größe 0 - benutze Datei %s."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Speichern der Datei 'part.met.seeds' für %s fehlgeschlagen"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "%i Einstiegsquelle für Part-Datei %s (%s) gespeichert."
+msgstr[1] "%i Einstiegsquellen für Part-Datei %s (%s) gespeichert."
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Part-Datei %s (%s) hat keine Einstiegsquellendatei"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Part-Datei %s (%s) hat eine leere Einstiegsquellendatei"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Fehler beim Lesen der Partfile-Einstiegsquellendatei (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
 #, c-format
 msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"korrumpierter Teil (%d) in %d-teiliger Datei %s gefunden - Dateiergebnishash "
+"|%s| Dateihash |%s|"
+msgstr[1] ""
+"korrumpierter Teil (%d) in %d-teiliger Datei %s gefunden - Dateiergebnishash "
+"|%s| Dateihash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Vollständigen Teil (%i) in %s gefunden"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Prüfsumme für %s neu erstellt"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
-"\n"
-"Alle Befehle sind unabhängig von Groß- und Kleinschreibung.\n"
-"Eingabe von '%s <Befehl>' für weitere Informationen zu <Befehl>.\n"
+"Unerwarteter Fehler beim Abschließen des Herunterladens von %s. Datei "
+"pausiert."
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Programm verlassen."
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Herunterladen abgeschlossen: %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Hilfe anzeigen."
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Lösche Datei: %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr ""
+"WARNUNG: Konnte für heruntergeladenen Teil die Prüfsumme nicht berechnen - "
+"Prüfsummensatz unvollständig für '%s'."
+
+#: src/PartFile.cpp:2292
+#, c-format
 msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"Um Hilfe zu einem Befehl zu bekommen, gib 'help <Befehl>' ein.\n"
-"Eine vollständige Befehlsübersicht erhält man mit 'help'.\n"
+"FEHLER: Prüfsumme für einen Teil konnte nicht erstellt werden - Prüfsumme "
+"unvollständig (%s). Dies dürfte eigentlich nie passieren."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
 #, c-format
 msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"\n"
-"'%s' zeigt die Befehlsübersicht.\n"
-"\n"
+"EOF beim Hashen des %u. heruntergeladenen Teils, mit der Länge %u (max %u), "
+"für die Part-Datei '%s', mit der Länge %u: %s"
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Syntaxerror!"
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "WARNUNG: Nicht genügend freier Festplattenplatz! Pausiere Datei: %s"
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr ""
-"Fehler beim Ausführen des Befehls - sollte niemals passieren! Bitte den "
-"Fehler melden.\n"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Heruntergeladener Teil %i in Datei '%s' ist defekt"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Dieser Befehl sollte keine Parameter haben."
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Defekter Teil %i in %s wiederhergestellt -> Gesparte Bytes: %s"
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Dieser Befehl muss einen Parameter haben."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Reserviere"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Ungültiges Argument."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Zu wenig Festplattenplatz"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Unvollständiger Befehl."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Heruntergeladen"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:4003
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Gib '%s' ein, um mehr Hilfe zu bekommen.\n"
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "FEHLER: Öffnen von Partfile '%s' fehlgeschlagen"
+
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Systemvorgabe"
+
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albanisch"
+
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabisch"
+
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturisch"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Baskisch"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgarisch"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Katalanisch"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Chinesisch (vereinfacht)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Chinesisch (traditionell)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Kroatisch"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Tschechisch"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Dänisch"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Holländisch"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Englisch (UK)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estnisch"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finnisch"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Französisch"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galizisch"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Deutsch"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Griechisch"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebräisch"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Ungarisch"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italienisch"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italienisch (Schweiz)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japanisch"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Koreanisch"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Litauisch"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norwegisch"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polnisch"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugiesisch"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugiesisch (Brasilianisch)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Russisch"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Slowenisch"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Spanisch"
 
-#: src/ExternalConnector.cpp:362
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Schwedisch"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Türkisch"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ukrainisch"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Sprache ändern"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr "Für aMule sind keine Übersetzungen installiert"
+
+#: src/Preferences.cpp:771
+msgid "No languages available"
+msgstr "Keine Sprachen verfügbar"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "keine Optionen verfügbar"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Ungültige Kategorie gefunden, überspringe."
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
+"TCP-Port kann nicht größer als 65532 sein, da der Server-UDP-Port=TCP-Port+3 "
+"ist"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Dies ist %s %s %s\n"
+msgid "Default port will be used (%d)"
+msgstr "Standard-Port wird verwendet (%d)"
 
-#: src/ExternalConnector.cpp:364
+#: src/Preferences.cpp:1790
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Dies ist %s %s\n"
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Lösche nicht existierenden freigegebenen Ordner: %s"
+
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Verbindung"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Verzeichnisse"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Server"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Dateien"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Sicherheit"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Aussehen"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
 
-#: src/ExternalConnector.cpp:395
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Filter"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Fernsteuerung"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Onlinesignatur"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Fortgeschritten"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Ereignisse"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Fehlersuche (Debugging)"
+
+#: src/PrefsUnifiedDlg.cpp:249
 msgid ""
-"\n"
-"Creating client...\n"
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
-"\n"
-"Erstelle Client...\n"
+"Die folgenden Variablen werden ersetzt:\n"
+"    %PARTFILE - ganzer Pfad zur Datei\n"
+"    %PARTNAME - nur der Dateiname"
 
-#: src/ExternalConnector.cpp:418
-#, c-format
+#: src/PrefsUnifiedDlg.cpp:289
 msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
 "\n"
-"Ok, exiting %s...\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
 msgstr ""
+"Ändere diese Einstellungen nur, wenn du genau\n"
+"weißt, was du tust, denn andernfalls können\n"
+"negative Effekte auftreten.\n"
 "\n"
-"Ok, beende %s...\n"
+"aMule funktioniert auch hervorragend, ohne\n"
+"dass diese Einstellungen verändert werden."
+
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr ""
+"Verbindung von Einstellung zu Steuerelement mit ID %d und Schlüssel %s "
+"fehlgeschlagen."
+
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
+"Datentransfer von Einstellung zu Steuerelement mit ID %d und Schlüssel %s "
+"fehlgeschlagen."
 
-#: src/ExternalConnector.cpp:424
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Der Typ des Proxy, zu dem du verbindest"
+
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
+"Datentransfer von Steuerelement zu Einstellung mit ID %d und Schlüssel %s "
+"fehlgeschlagen."
+
+#: src/PrefsUnifiedDlg.cpp:589
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
+"aMule must be restarted to enable these changes:\n"
 "\n"
-"Exiting...\n"
 msgstr ""
-"Kann nicht mit leerem Passwort verbinden.\n"
-"Gib ein Passwort in der Konfigurationsdatei\n"
-"oder als Option an oder gib es nach Aufforderung ein.\n"
+"aMule muss neu gestartet werden, um diese Änderungen zu übernehmen:\n"
 "\n"
-"Beende...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Zeige diese Hilfe."
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP-Port geändert.\n"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Host, auf dem aMule läuft. (Standard: localhost)"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP-Port geändert.\n"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "aMules Port für externe Verbindungen. (Standard: 4712)"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- Port externer Verbindung geändert.\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- Akzeptanz externer Verbindung geändert.\n"
+
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- Schnittstelle der externen Verbindung geändert.\n"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Passwort für externe Verbindungen."
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"Die Auto-Update-Serverliste ist leer.\n"
+"'Serverliste beim Programmstart aktualisieren' wird deaktiviert."
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Lese Konfiguration aus Datei."
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Du hast die externen Verbindungen aktiviert, aber kein Passwort angegeben.\n"
+"Externe Verbindungen können nur aktiviert werden, wenn ein gültiges Passwort "
+"angegeben wird."
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Schreibe keinerlei Ausgabe auf stdout."
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Sprache geändert.\n"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Sei ausführlich - Zeige auch Debugnachrichten."
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Temp-Verzeichnis geändert.\n"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Setze Programm-Locale (Sprache)."
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- ED2k-Netzwerk aktiviert.\n"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Schreibe Kommandozeilen-Optionen in Konfigurationsdatei."
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Beide Netzwerke, eD2k und Kad, sind deaktiviert.\n"
+"Mindestens eins davon muss aktiviert sein, um sich verbinden zu können."
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Erstelle Konfigurationsdatei basierend auf aMules Konfigurationsdatei."
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad wird nicht starten, solange der UDP-Port deaktiviert ist.\n"
+"Bitte UDP-Port aktivieren, oder Kad ausschalten."
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Drucke Programmversion."
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"aMule MUSS jetzt neu gestartet werden.\n"
+"Wenn du jetzt nicht neu startest, beklage dich nicht, wenn irgendwas übles "
+"passiert.\n"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Credit-Datei geladen, %u Client ist bekannt"
-msgstr[1] "Credit-Datei geladen, %u Clients sind bekannt"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Deine Auto-Update-Serverliste ist leer.\n"
+"Bitte gib mindestens eine URL zu einer gültigen server.met ein.\n"
+"Drücke dazu den Knopf \"Liste\" neben diesem Kontrollkästchen."
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Credits für %u Client abgelaufen!"
-msgstr[1] " - Credits für %u Clients abgelaufen!"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Temporäre Dateien"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Keine 'cryptkey.dat' gefunden, erzeuge eine neue."
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Fertige Dateien"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"FEHLER: aMule daemon kann nicht verwendet werden wenn Externe Verbindungen "
-"deaktiviert sind. Zum aktivieren von Externen Verbindungen, nutze entweder "
-"den normalen aMule, starte amuled mit der Option --ec-config oder ändere "
-"\"AcceptExternalConnections\" auf 1 in ~/.aMule/amule.conf"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Online-Signaturen"
 
-#: src/amuled.cpp:750
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "ERROR: %s"
-msgstr "FEHLER: %s"
+msgid "Choose a folder for %s"
+msgstr "Wähle einen Ordner für %s"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Bann entfernen"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Uploads zeigen"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Warteschlange anzeigen"
-
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Clients zeigen"
-
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Ansicht auswählen"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Client-Software"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Wartete"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Uploadzeit"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Upload/Download"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "entfernter Status"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Dateipriorität"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Suche nach einem Videoplayer"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Punkte"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Browser-Wahl"
+
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "Ausführbar%s"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Gefragt"
-
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Zuletzt gesehen"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "In Warteschlange seit"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Serverliste bearbeiten"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Upload-Status"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Hier URL's für server.met-Dateien eintragen.\n"
+"Nur eine URL pro Zeile!"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Übertragen Up"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Aktualisierungsverzögerung: %d Sekunde"
+msgstr[1] "Aktualisierungsverzögerung: %d Sekunden"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Download-Status"
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Zeit für Durchschnittslinie: %d Minute"
+msgstr[1] "Zeit für Durchschnittslinie: %d Minuten"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Übertragen Down"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Benutzerprüfsumme"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Verschlüsselt"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Freigegebene Dateien verbergen"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Verbindungsgraphenskala: %d"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Client-Details"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Dateipuffergröße: %d Byte"
+msgstr[1] "Dateipuffergröße: %d Bytes"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Aktiviert"
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Upload-Warteschlangengröße: %d Client"
+msgstr[1] "Upload-Warteschlangengröße: %d Clients"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Unterstützt"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Server-Wiederverbindungsintervall: %d Minute"
+msgstr[1] "Server-Wiederverbindungsintervall: %d Minuten"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Nicht Unterstützt"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Server-Wiederverbindungsintervall: Aus"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Deaktiviert"
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "deaktiviert"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "Execute command on '%s' event"
+msgstr "Führe Kommando beim '%s' Ereignis aus"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Nicht vollständig"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Aktiviere Befehlsausführung im Kern"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Böser Bube"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Kern-Befehl:"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Verifiziert - OK"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Aktiviere Befehlsausführung in GUI"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Nicht verfügbar"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "GUI-Befehl:"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Die folgenden Variablen werden ersetzt:"
 
-#: src/SearchDlg.cpp:527
+#: src/SearchDlg.cpp:506
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 "Mindestgröße muss kleiner sein, als die Höchstgröße: Höchstgröße ignoriert."
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
 msgid "Search warning"
 msgstr "Suchwarnung"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Unbegrenzt"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Hauptkategorie"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule-Traymenü"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad-Suche kann nicht ausgeführt werden, wenn Kad nicht läuft"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Geschwindigkeitsbegrenzungen:"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "eD2k-Suche kann nicht ausgeführt werden, wenn eD2k nicht verbunden ist"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "UL: Keiner"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Unerwarteter Fehler bei der Kad-Suche:"
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "UL: %u"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "Datei-ID"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DL: Keine"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Datei"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "DL: %u"
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Herunterladen in Kategorie"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/SearchListCtrl.cpp:639
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Download-Geschwindigkeit: %.1f"
+msgid "Get %s for this file"
+msgstr "%s für diese Datei erhalten"
 
-#: src/MuleTrayIcon.cpp:370
-#, c-format
-msgid "Upload speed: %.1f"
-msgstr "Upload-Geschwindigkeit: %.1f"
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Suche verwandte Dateien (eD2k, lokale Server)"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Client-Information"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Als bekannte Datei kennzeichnen"
 
-#: src/MuleTrayIcon.cpp:380
-#, c-format
-msgid "Nickname: %s"
-msgstr "Spitzname: %s"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Kopiere eD2k-Verweis in die Zwischenablage"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Kein Spitzname ausgewählt!"
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Abgebrochen"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Neu"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "Client-ID: "
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Verbindung zu allen gelisteten verschleierten Servern misslungen. Versuche "
+"erneut, ohne Verschleierung."
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Servername: "
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"Fehler beim Verbinden zu allen Servern in der Liste. Ein neuer Durchgang "
+"wird gestartet."
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "ServerIP: "
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "eD2k-Netzwerk ist in den Einstellungen deaktiviert - verbinde nicht."
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "Keine gültigen Server zum Verbinden in der Serverliste gefunden"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "TCP port: %d"
-msgstr "TCP-Port: %d"
-
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "TCP-Port: Nicht bereit"
+msgid "Connected to %s (%s:%i)"
+msgstr "Verbunden mit %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/ServerConnect.cpp:274
 #, c-format
-msgid "UDP port: %d"
-msgstr "UDP-Port: %d"
-
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "UDP-Port: Nicht bereit"
-
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Online-Signatur: An"
+msgid "Connection established on: %s"
+msgstr "Verbindung hergestellt mit %s"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Online-Signatur: Aus"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Schwerer Fehler beim Verbinden. Möglicherweise ist die Internetverbindung "
+"getrennt"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/ServerConnect.cpp:350
 #, c-format
-msgid "Shared files: %d"
-msgstr "Freigegebene Dateien: %d"
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Verbindung verloren zu %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/ServerConnect.cpp:360
 #, c-format
-msgid "Queued clients: %d"
-msgstr "Clients in Warteschlange: %d"
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) scheint tot zu sein."
 
-#: src/MuleTrayIcon.cpp:476
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Total DL: %s"
-msgstr "Gesamt-DL: %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) scheint voll zu sein."
 
-#: src/MuleTrayIcon.cpp:483
+#: src/ServerConnect.cpp:392
 #, c-format
-msgid "Total UL: %s"
-msgstr "Gesamt-UL: %s"
-
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Upload-Einstellung"
-
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Download-Einstellung"
-
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Verstecke aMule"
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] ""
+"Automatische Verbindungsherstellung zum Server wird in %d Sekunde wiederholt"
+msgstr[1] ""
+"Automatische Verbindungsherstellung zum Server wird in %d Sekunden wiederholt"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Zeige aMule"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Verbindung verloren"
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:419
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Beginn der Chat-Sitzung: %s (%s:%u) - %s %s"
-
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Verbunden mit Client ***"
-
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Verbinde mit Client ***"
-
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Verbindung zum Client nicht aufbaubar / Verbindung verloren ***"
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Verbindung zu %s (%s:%i) fehlgeschlagen."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Reiter schließen"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "FEHLER: Ungültiger Socket bei Prüfung auf Zeitüberschreitung"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Alle Reiter schließen"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Verbindungsversuch zu %s (%s:%i): Zeitüberschreitung."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Andere Reiter schließen"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Verspätetes Ergebnis für DNS-Nachschlag erhalten, wird verworfen."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Lade Datei server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Datei server.met nicht gefunden!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Laden der server.met '%s' fehlgeschlagen, unbekanntes Format aufgetreten."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Konnte Datei server.met nicht öffnen!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Server.met unbrauchbar, unzulässige Versionsmarke gefunden: 0x%x, Größe %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "%i Server in server.met gefunden"
 msgstr[1] "%i Server in server.met gefunden"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d Server hinzugefügt"
 msgstr[1] "%d Server hinzugefügt"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Fehler: die 'server.met' Datei ist defekt: "
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "IO-Fehler beim Lesen der 'server.met' Datei: "
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Server nicht hinzugefügt: [%s:%d] Gibt keinen gültigen Port an."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr ""
 "Server nicht hinzugefügt: Die IP-Adresse [%s:%d] ist gefiltert oder ungültig."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Server nicht hinzugefügt: Server mit gleicher IP:Port [%s:%d] bereits "
 "vorhanden."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Server hinzugefügt: Server bei [%s:%d] mit Namen '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6921,25 +5510,25 @@
 "Du bist zu einem Server verbunden, den du zu löschen versuchst. Bitte zuerst "
 "trennen."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Konnte '%s' nicht öffnen"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Speichern der server.met fehlgeschlagen!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Ungültige URL"
 
-#: src/ServerList.cpp:805
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Finished to download the server list from %s"
+msgid "Finished downloading the server list from %s"
 msgstr "Download der Serverliste von %s beendet"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Konnte Serverliste von %s nicht herunterladen"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6947,23 +5536,28 @@
 "Keine Serverlistenadresse in 'addresses.dat' gefunden. Bitte dort zum "
 "automatischen Aktualisieren eine gültige Serverlistenadresse eintragen."
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Beginne Download der Serverliste von %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "WARNUNG: ungültige URL für das automatische Aktualisieren der Serverliste "
 "angegeben: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Keine gültige server.met Auto-Download URL in addresses.dat"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Konnte Serverliste von %s nicht herunterladen"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -6971,322 +5565,2365 @@
 "Lokaler Server ist gefiltert durch IPFilters, verbinde neu zu einem anderen "
 "Server!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Befehlsausführung fehlgeschlagen: Befehl `%s' aufgrund Eregnis `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Servername"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Adresse"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Port"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Beschreibung"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Benutzer"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Statisch"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Version"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Deine Locale wurde wegen einer Konfigurationsänderung auf Systemstandard "
-"geändert. Sorry."
+"Du möchtest einen Server löschen, mit dem Du verbunden bist. Bitte trenne "
+"Dich zuerst. Der Server wurde NICHT gelöscht."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Unbekannter Name)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Wirklich den statischen Server '%s' löschen?"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Server (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Server"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Verbinde mit Server"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Markiere den Server als statisch"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Markiere den Server als nicht statisch"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Markiere die Server als statisch"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Markiere die Server als nicht statisch"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Entferne Server"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Entferne die Server"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Alle Server entfernen"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopiere eD2k-Verweise in die Zwischenablage"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Wiederverbinden mit Server"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Wirklich alle Server löschen?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Wirklich den markierten Server löschen?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Wirklich die markierten Server löschen?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "Fehler: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "WARNUNG: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Neue Benutzer-ID ist %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "WARNUNG: Du hast eine Low-ID zugeordnet bekommen!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
-"Es sind keinerlei Server in der Server-Liste.\n"
-"Soll aMule jetzt eine neue Liste herunterladen?"
+"\tDies rührt vermutlich daher, dass Du Dich hinter einem Router oder einer "
+"Firewall befindest."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Server-Liste herunterladen"
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tMehr Informationen dazu gibt es hier: http://wiki.amule.org"
 
-#: src/amule.cpp:846
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Unbekannte Serverinfo empfangen! - Zu kurz"
+
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "web server running on pid %d"
-msgstr "Webserver läuft mit PID %d"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "%d neuen Server empfangen"
+msgstr[1] "%d neue Server empfangen"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Speichern der Serverliste abgeschlossen."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Server hat letzten Befehl abgelehnt"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Seltsames Paket vom Server empfangen: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Unbearbeiteter Fehler beim Verarbeiten eines Paketes vom Server: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Kann DNS-Auflöse-Thread nicht erstellen, um zu %s zu verbinden"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "Server-IP %s (%s) ist gefiltert. Verbinde nicht."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "verwende Protokollverschleierung."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Verbinde mit·%s·(%s·-·%s:%i)·%s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Konnte DNS-Namen von Server %s nicht auflösen: Kann nicht verbinden!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Server nicht hinzugefügt: Keine IP-Adresse oder Hostname angegeben."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Server nicht hinzugefügt: Ungültiger Server-Port angegeben."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "eD2k-Status:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kademlia-Status:"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "Läuft im LAN Modus"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Läuft"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Status:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Verbindungszustand:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Firewalled - bitte TCP-Port %d in Router oder Firewall öffnen."
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "UDP-Verbindungszustand:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Firewalled - bitte UDP-Port %d in Router oder Firewall öffnen."
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Firewalled-Status: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Kein Kumpel notwendig - TCP-Port ist geöffnet."
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Kein Kumpel notwendig - UDP-Port ist geöffnet."
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Kein Kumpel"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Verbinde zu Kumpel"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Verbunden mit Kumpel an %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Indizierte Quellen:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Indizierte Schlüsselwörter:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Indizierte Anmerkungen:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Indizes geladen:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Benutzer im Schnitt:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Dateien im Schnitt:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Läuft nicht"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Füge Datei %s zu freigegebenen Dateien hinzu"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "%i bekannte freigegebene Datei gefunden"
+msgstr[1] "%i bekannte freigegebene Dateien gefunden"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "%i bekannte Datei gefunden, %i unbekannt"
+msgstr[1] "%i bekannte Dateien gefunden, %i unbekannt"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "FEHLER: Versuchte %s freizugeben"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Freigegebenes Verzeichnis nicht gefunden, überspringe: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Keine freigebbaren Dateien im Ordner gefunden: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Benutzername"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Download-Geschwindigkeit"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Upload-Geschwindigkeit"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Verfügbare Teile"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+msgid "Upload Status"
+msgstr "Upload-Status"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Download-Status"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Ursprung"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Lokaler Dateiname"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+msgid "Shares File List"
+msgstr "Liste der Freigaben"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Anfragen"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Akzeptierte Anfragen"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Übertragene Datenmenge"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Verteilungsfaktor"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Erhaltene Teile"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Vollständige Quellen"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Verzeichnispfad"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Kommentar/Bewertung abgeben"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Kommentar/Bewertung ändern"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Füge Dateien aus Sammlung zur Übertragungsliste"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Kopiere Magnet-URL &URI in Zwischenablage"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Kopiere eD2k-Verweis in die Zwischenablage (&Source)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Kopiere eD2k-Verweis in Zwischenablage (Source) (&With Crypt options)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "eD2k-Link in Zwischenablage kopieren (&Hostname)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
-"Du hast \"amuleweb zusammen mit aMule starten\" aktiviert, allerdings kann "
-"die amuleweb-Programmdatei nicht gestartet werden. Bitte installiere das "
-"Paket, das amuleweb enthält, oder kompiliere aMule mit --enable-webserver "
-"neu."
+"Kopiere eD2k-Verweis in Zwischenablage (Hostname) (With &Crypt options)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Kopiere eD2k-Verweis in die Zwischenablage (&AICH Info)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr ""
+"Du brauchst eine hohe ID, um einen gültigen Quellenverweis zu erstellen"
 
-#: src/amule.cpp:937
+#: src/SharedFilesCtrl.cpp:461
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Kann Ports nicht mit der festgelegten Adresse verbinden: %s"
+msgid "Shared Files (%i)"
+msgstr "Freigegebene Dateien (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[PartFile]"
 
-#: src/amule.cpp:964
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Ferndateiname"
+
+#: src/Statistics.cpp:732
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Port %u ist nicht erreichbar. Du wirst eine LOWID erhalten\n"
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Hochgeladene Daten (Sitzung (Gesamt)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Gesamt-Overhead (Pakete): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Dateianfragen-Overhead (Pakete): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Quellenaustausch-Overhead (Pakete): %s"
 
-#: src/amule.cpp:970
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
 #, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Server-Overhead (Pakete): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Kad-Overhead (Pakete): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "zusätzlicher Datenverkehr durch Verschlüsselung (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Laufende Uploads: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Wartende Uploads: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Erfolgreiche Upload-Sitzungen insgesamt: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Fehlgeschlagene Upload-Sitzungen insgesamt: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Gesamte Upload-Zeit: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Heruntergeladene Daten (Sitzung (Gesamt)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Gefundene Quellen: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Laufende Downloads (Chunks): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Sitzung UL:DL-Rate (Gesamt): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Durchschnittliche Download-Rate (Sitzung): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Durchschnittliche Upload-Rate (Sitzung): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Max. Download-Rate (Sitzung): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Max. Upload-Rate (Sitzung): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Server-Wiederverbindungen: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Zeit seit erster Übertragung: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Verbunden mit Server seit: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Aktive Verbindungen (geschätzt): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Verbindungslimit erreicht: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Durchschnittliche Verbindungen (geschätzt): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Höchste Verbindungsanzahl (geschätzt): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Clients"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Unbekannt: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Gefiltert: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Gebannt: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Gesamt: %i Bekannt: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Funktionierende Server: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Ausgefallene Server: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Gesamt: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Gelöschte Server: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Gefilterte Server: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Benutzer auf funktionierenden Servern: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Dateien auf funktionierenden Servern: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Benutzer insgesamt: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Dateien insgesamt: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Server-Auslastung: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Anzahl freigegebener Dateien: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Gesamtgröße der freigegebenen Dateien: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Durchschnittliche Dateigröße: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Betriebssystem"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Nicht empfangen"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktive Verbindungen (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Nicht verfügbar"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Niemals"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Befehl '%s' mit pid '%d' wurde mit Status-Code '%d' abgeschlossen."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Führe <str> aus und beende."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Ungültiges IP-Format. Benutze xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Port %u ist nicht erreichbar!\n"
-"\n"
-"Dies bedeutet, dass du eine niedrige ID erhalten wirst.\n"
-"\n"
-"Bitte überprüfe deine Netzwerkeinstellungen, um sicherzugehen, dass der Port "
-"für ein- und ausgehenden Traffic geöffnet ist."
+"Dieser Befehl benötigt ein Argument. Mögliche Argumente sind 'all', ein "
+"Dateiname oder eine Zahl.\n"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Erstellen der OnlineSig-Datei gescheitert"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Verarbeite Datei nach Hash:"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Erstellen der aMule OnlineSig-Datei gescheitert"
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Verarbeite Datei nach Namen:"
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
-"Die ausgewählte Locale scheint nicht auf dem System installiert zu sein."
-"(INFO: Ich werde trotzdem versuchen, sie zu setzen)"
+"Dieser Befehl benötigt ein Argument. Mögliche Argumente: ein Datei-Hash\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Keine gültige Nummer\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Keine gültige Prüfsumme (sollte genau 32 Zeichen lang sein)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Anfrage ist mit unbekanntem Fehler gescheitert."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Vorgang erfolgreich."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Dies ist das erste Mal, dass du aMule %s startest"
+msgid "Request failed with the following error: %s"
+msgstr "Anfrage mit folgendem Fehler gescheitert: %s."
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Dies ist eine Testversion, täglich aktualisiert, und\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "IP-Filterung für Clients ist %s.\n"
 
-#: src/amule.cpp:1311
-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"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "AUS"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr ""
-"oder deinen Hund tötet. Aber es *sollte* sicher sein, sie zu benutzen.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "AN"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "IP-Filterung für Server ist %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Momentane IP-Filterstufe ist %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Bandbreiteneinstellungen: Hoch: %u kB/s, Herunter: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Verbunden mit %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Verbinde"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "firewalled"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"Die folgenden Optionen wurden in dieser Veröffentlichung aus "
-"Sicherheitsgründen geändert:\n"
+"\n"
+"Download:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Aktivierung der Protokollverschleierungsunterstützung für eingehende und "
-"ausgehende Verbindungen.\n"
+"Upload:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Deaktivierung der Aktualisierung der Server-Liste von anderen Servern oder "
-"Clients.\n"
+"Clients in Warteschlange:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Für mehr Informationen über die Hintergründe für diese Änderungen,\n"
-"suche im aMule-Wiki auf http://wiki.amule.org nach \"fake servers\".\n"
-"Es ist wichtig, dass Du keine gefälschten (\"fake\") Server in Deiner Server-"
-"Liste hast, damit aMule vernünftig funktioniert."
+"Quellen insgesamt:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Anzahl der Suchergebnisse: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Vergleichsfortschritt: %u %% \n"
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Fortschritt der Suche nicht verfügbar"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Unbekannte Antwort vom Server empfangen, OpCode = %#x"
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Zeige kurze Statusinformation."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr ""
+"Verbindungszustand, momentane Geschwindigkeit des Hoch-/Herunterladens, usw. "
+"zeigen\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Zeige vollständigen Statistikbaum."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Wahlweise kann man diesem Befehl eine Zahl zwischen 0-255 als Argument\n"
+"übergeben, um die Anzahl der angezeigten Einträge für die "
+"Unterverzeichnisse\n"
+"der Clientversionen anzugeben. 0 oder leer bedeutet 'unbegrenzt'.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Beispiel: 'statistics 5' zeigt nur die ersten 5 Versionen für jeden "
+"Clienttyp.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "aMule beenden."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Herunterfahren des fernbedienten Kerns (amule/amuled):\n"
+"Dadurch wird auch der Textclient beendet, weil er\n"
+"ohne laufenden Kern (core) nicht verwendbar ist.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Neu laden des angegebenen Objekts."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Liste freigegebener Dateien neu laden."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "IP-Filtertabelle neu laden."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Aktuelle IP-Filtertabelle neu laden."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "IP-Filtertabelle von URL aktualisieren."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
+"Wenn keine URL eingetragen wird, wird die URL aus den Einstellungen benutzt."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Mit Netzwerk verbinden."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Verbindet zu allen in den Voreinstellungen aktivierten Netzwerken.\n"
+"Wahlweise kann eine Serveradresse nach dem Schema IP:Port angegeben\n"
+"werden, um nur zu diesem Server zu verbinden. Die IP muss eine dezimale,\n"
+"punktgetrennte IPv4-Adresse, oder ein auflösbarer DNS-Name sein."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Nur mit eD2k verbinden."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Nur mit Kad verbinden."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Vom Netzwerk trennen."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Dies wird von allen momentan verbundenen Netzwerken trennen.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Nur von eD2k trennen."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Nur von Kad trennen."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Sendet einen eD2k- oder Magnet-Verweis an den Kern."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"Der hinzuzufügende eD2k-Verweis kann sein:\n"
+"*) ein Dateiverweis (ed2k://|file|...), der in die Herunterlade-Schlange "
+"eingereiht wird\n"
+"*) ein Server-Verweis (ed2k://|server|...), der zur Server-Liste hinzugefügt "
+"wird\n"
+"*) oder ein Server-Listen-Verweis, wobei dann alle Server in der Liste zur\n"
+"···Server-Liste hinzugefügt werden\n"
 "\n"
-" Weiterhin wurde die Browser-Einstellung auf die System-Voreinstellung "
-"zurückgesetzt. Bitte die Browser-Optionen neu konfigurieren, wenn nötig.\n"
+"Der Magnet-Verweis muss die eD2k-Prüfsumme(\"Hash\") und die Dateigröße "
+"beinhalten.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Einstellwert festlegen."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "IP-Filter-Einstellungen festlegen."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Aktiviere IP-Filterung sowohl für Clients als auch für Server."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Deaktiviere IP-Filterung sowohl für Clients als auch für Server."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Ein-/Ausschalten von IP-Filterung für Clients."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Einschalten der IP-Filterung für Clients."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Ausschalten der IP-Filterung für Clients."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Ein-/Ausschalten der IP-Filterung für Server."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Einschalten der IP-Filterung für Server."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Ausschalten der IP-Filterung für Server."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "IP-Filterstufe auswählen."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Mehr Informationen und neue Releases können auf unserer Homepage gefunden "
-"werden\n"
+"Gültige Filterlevel liegen im Bereich zwischen 0-255, und die\n"
+"Standardeinstellung (Ausgangswert) ist 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Bandbreiteneinstellungen festlegen."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "Der Wert für diese Befehle muss in Kilobytes/Sek. angegeben werden.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Upload-Bandbreitenbegrenzung festlegen."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Download-Bandbreitenbegrenzung festlegen."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Einstellungswert holen und anzeigen."
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "IP-Filter-Einstellungen holen."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Hole IP-Filter-Status für Clients und Server."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Hole IP-Filter-Status nur für Clients."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Hole IP-Filter-Status nur für Server."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "IP-Filterstufe holen."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Bandbreiteneinstellungen holen."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Suche ausführen."
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"unter www.aMule.org, oder in unserem IRC-Channel #amule auf irc.freenode."
-"net.\n"
+"Ein Suchtyp muss angegeben werden durch Auswahl von:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Beispiel: 'search kad Datei' führt eine kad Suche für \"Datei\" aus.\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Bitte melde Fehler unter http://forum.amule.org"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Globale Suche ausführen."
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Lokale Suche ausführen."
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Kad-Suche ausführen."
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Zeige die Ergebnisse der letzten Suche an."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Hole die Ergebnisse der vorhergehenden Suche.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Zeige den Fortschritt einer Suche."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Zeige den Fortschritt einer Suche.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Beginne, eine Datei herunterzuladen."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"Das angegebene Verzeichnis für die Online-Signaturdateien ist UNGÜLTIG!\n"
-"Online-Signatur wird bis zur Fehlerbehebung in den Einstellungen DEAKTIVIERT."
+"Die Nummer einer Datei aus der letzten Suche muss angegeben sein.\n"
+"Beispiel: 'download 12' beginnt das Herunterladen der Datei Nr. 12 der "
+"letzten Suche.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Download anhalten."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Download weiterführen."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Download löschen."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Setze Herunterlade-Priorität."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr ""
+"Setze die Priorität einer herunterladenden Datei auf niedrig, normal, hoch "
+"oder Auto.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Setze niedrige Priorität."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Setze normale Priorität."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Setze hohe Priorität."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Setze automatische Priorität."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Warteschlangen/Listen zeigen."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Upload-/Download-Warteschlange, Serverliste, oder Liste freigegebener "
+"Dateien zeigen.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Upload-Warteschlange zeigen."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Download-Warteschlange zeigen."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Zeige Log."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Serverliste zeigen."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Setze Log zurück."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Speicherplatzvorbelegung für Datei '%s' fehlgeschlagen: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Veralteter Befehl, bitte '%s' nutzen."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "FEHLER: kann Logdatei nicht öffnen"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Das ist ein veralteter Befehl und könnte in der Zukunft enfernt werden.\n"
+"Nutze stattdessen '%s'.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "WARNUNG: Logdatei ist leer. Etwas ist falsch."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMule Textclient"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Das Log wurde zurückgesetzt"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Wandle alte AICH-Prüfsummensätze von '%s' um in 64b in '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Servernachricht: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "WARNUNG: Der Dateiname '%s' ist ungültig und wurde in '%s' umbenannt."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Knotenliste kann nicht geholt werden."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "WARNUNG: Die Datei '%s' gibt es schon, neue Datei in '%s' umbenannt."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Konnte heruntergeladene Datei zur Versionsprüfung nicht öffnen"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Wirklich das Herunterladen aller Dateien in dieser Kategorie abbrechen und "
+"alle Dateien darin löschen??"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Fehlerhafte Versionsprüfungsdatei"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Bestätigung erforderlich"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Du benutzt eine veraltete aMule-Version!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "Es werden nur 99 Kategorien unterstützt."
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "Zu viele Kategorien!"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Alle anderen"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Ansichtenfilter wählen"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Kategorie hinzufügen"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Kategorie bearbeiten"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Kategorie entfernen"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
 msgstr ""
-"Diese Version von aMule ist %i.%i.%i und die aktuelle Version ist %li.%li.%li"
+"Öffnen der Datei '%s' fehlgeschlagen, sie wird aus der Liste freigegebener "
+"Dateien entfernt."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Die neueste Version kann man immer auf http://www.amule.org finden."
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Prüfsummensatz angefordert für unbekannte Datei '%s'"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "WARNUNG: Diese Version von aMuled ist veraltet: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Wiederaufnahme des Hochladens der Datei '%s'."
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Deine Kopie von aMule ist aktuell."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Aussetzen des Hochladens der Datei '%s'."
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Konnte die Versionsprüfungsdatei nicht herunterladen"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Befehlsausführung fehlgeschlagen: Befehl `%s' aufgrund Ereignis `%s'."
 
-#: src/amule.cpp:2025
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Download fertiggestellt"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Der vollständige Pfad zur Datei."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Der Name der Datei ohne den Pfadanteil."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "Die eD2k-Prüfsumme der Datei."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Die Dateigröße in Byte."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Die Gesamtzeit aktiven Herunterladens."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Neue Chat-Sitzung gestartet."
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Nachrichtensender."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Kein Speicherplatz mehr vorhanden."
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Festplattenpartition."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Fehler beim Fertigstellen der Datei."
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Benutzer: %s | Dateien: %s"
+msgid "Processing file number %u: %s"
+msgstr "Verarbeite Datei Nummer %u: %s"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Du willst Part-Prüfsummen erstellen (nur bei Dateien > 9,5 MiB)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Benutzer: E: %s K: %s | Dateien: E: %s K: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Datei existiert nicht!\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Keine Netzwerke ausgewählt"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, der aMule-eD2k-Verweis-Ersteller"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Willkommen!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Eingabeparameter"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Datei für Prüfsummenberechnung"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Dieser Datei optionale URLs hinzufügen"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Hier die Datei zum Erzeugen des eD2k-Verweises eingeben."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Hier die URL eingeben, die zum eD2k-Verweis hinzugefügt werden soll. Füge am "
+"Ende einen / ein, damit aLinkCreator den momentanen Dateinamen übernimmt."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Entferne"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Erstelle Verweis mit Part-Prüfsummen"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Hilft, neue und seltene Dateien schneller zu verteilen auf Kosten einer "
+"erhöhten Verweisgröße"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4-Dateiprüfsumme"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k-Dateiprüfsumme"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k-Verweis"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Speichern"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "In die Zwischenablage kopieren"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Öffnen..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Eine Datei zum Erstellen ihres eD2k-Verweises öffnen"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Kopiere erstellten eD2k-Verweis in die Zwischenablage"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Speichern unter..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Speichere erstellten eD2k-Verweis in Datei"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Über aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Datei zum Erstellen des eD2k-Verweises auswählen"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Kann die Zwischenablage nicht öffnen."
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Derzeit nichts zu Kopieren!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Datei zu dem errechneten eD2k-Verweis auswählen"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Konnte Datei nicht öffnen "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Bitte keinen leeren Dateinamen eingeben"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Momentan nichts zu speichern!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, der aMule eD2k-Verweis-Ersteller\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps von http://www.everaldo.com\n"
+"und http://www.icomania.com\n"
+"und http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Vertrieben unter der GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Prüfsummenberechnung..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator arbeitet gerade für dich"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Berechne MD4-Hash..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Berechne eD2k-Hash..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Abgebrochen !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Verbunden zu %s %s"
+msgid "Done in %.2f s"
+msgstr "Fertig in %.2f s"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Du hast diese URL bereits eingegeben!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Bitte keine leere URL eingeben"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "Verbinde zu %s"
+msgid "Unable to open %s"
+msgstr "Konnte '%s' nicht öffnen"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "eD2k getrennt"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i Tag(e) %i Std. %i Min. %i Sek."
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad gestartet."
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uT %02uStd %02uMin %02uSek"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad beendet."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uStd %02uMin %02uSek"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Kad verbunden (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02uMin %02uSek"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Kad verbunden (firewalled)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02uSek"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Kad getrennt"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, die aMule-Onlinestatistik"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Höchste Downloadrate seit wxCas läuft"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Höchste Downloadrate während wxCas jemals lief"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "System"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Automatische Aktualisierung beenden"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Speichere Onlinestatistikbild"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Drucke Onlinestatistikbild"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Einstellungen"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Über wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Beginne automatische Aktualisierung"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Automatische Aktualisierung angehalten"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Automatische Aktualisierung begonnen"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Speichere Statistikbild"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMule-Onlinestatistik"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Kad-Netzwerk kann mit deaktiviertem UDP-Port nicht benutzt werden, nicht "
-"gestartet."
+"Es gab ein Problem beim Drucken.\n"
+"Vielleicht ist der aktuelle Drucker nicht richtig eingestellt?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Drucke"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
-"Kad-Netzwerk ist in den Voreinstellungen deaktiviert, kein "
-"Verbindungsversuch."
+"wxCas, aMule Online-Signatur-Statistiken\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Basierend auf CAS von Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Vertrieben unter der GPL"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Konnte Freundes-Liste 'emfriends.dat' nicht lesen!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh-oh, aMule läuft nicht..."
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Konnte Freundes-Liste 'emfriends.dat' nicht schreiben!"
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule läuft"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule läuft, aber nicht verbunden"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule verbindet gerade...."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh-oh, aMule-Status ist unbekannt..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " läuft seit "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr "ist angehalten!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " ist nicht verbunden!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " verbindet sich..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " macht irgendetwas Merkwürdiges, bitte überprüfen!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " ist verbunden mit "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "aus"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " ist auf "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " mit "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Gesamtdownload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Upload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Sitzung Download: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Download: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Upload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Freigegeben: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " Datei(en), Clients in Warteschlange: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Zeit:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " auf "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Durchschnittliche Systemlast (1-5-15 min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Systemlaufzeit: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Verzeichnis mit der Datei amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Hier das Verzeichnis zur Datei amulesig.dat angeben"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Aktualisierungsintervall in Sekunden"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Erzeuge bei jeder Aktualisierung ein Statistikbild"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Hier das Zielverzeichnis zum Erstellen des Statistikbildes angeben"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Statistikbild periodisch auf einen FTP-Server hochladen"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP-URL"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP-Pfad"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Hier die URL deines FTP-Servers eingeben"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr ""
+"Hier das Zielverzeichnis für das Statistikbild auf dem FTP-Server angeben"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Benutzer"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Hier den Benutzernamen zur Anmeldung auf deinem FTP-Server eingeben"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Hier das Benutzerpasswort zur Anmeldung auf dem FTP-Server eingeben"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "FTP-Aktualisierungsintervall in Minuten"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Bestätigen"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Verzeichnis mit deiner Signaturdatei"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Verzeichnis zum Erzeugen des Statistikbildes"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Lädt Vorlage <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Webserver-HTTP-Port"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Benutze UPnP-Port-Weiterleitung für Webserver-Port"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP-Port"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Benutze gzip-Kompression"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Vollzugriff-Passwort für den Webserver"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Gast-Passwort für den Webserver"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Erlaube Gastzugriff"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Verweigere Gastzugriff"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Lade/Speichere Webserver-Einstellungen von/zu entferntem aMule"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMule-Konfigurationsdateipfad. NICHT DIREKT BENUTZEN!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "PHP-Interpreter deaktivieren (überholt)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Rekompiliere PHP-Seiten bei jeder Anfrage"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule Webserver"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "Webclient-Verbindung akzeptiert.\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "FEHLER: Kann Webclientverbindung nicht akzeptieren.\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Anfrage mit folgendem Fehler gescheitert: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Index-Datei nicht gefunden: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Sitzung abgelaufen - fordere Anmeldung\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sitzung ok, angemeldet\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sitzung ok, nicht angemeldet\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Keine Sitzung geöffnet - fordere Anmeldung\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Sitzung eröffnet - fordere Anmeldung\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Anfrage verarbeiten [original]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Kein Passwort angegeben, Anmeldung wird nicht erlaubt."
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Prüfe Passwort\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Passwort-Prüfsumme ungültig\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Passwort ok\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Falsches Passwort\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Du hast kein Passwort angegeben. Leeres Passwort ist nicht erlaubt.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Fordere Abmeldung\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Anfrage verarbeiten [umgeleitet]: "
+
+#~ msgid "Romanian"
+#~ msgstr "Rumänisch"
+
+#~ msgid "Download status"
+#~ msgstr "Download-Status"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Aktualisierungsverzögerung: %d Sekunde"
+#~ msgstr[1] "Aktualisierungsverzögerung: %d Sekunden"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr ""
+#~ "Kommentare und Bewertungen werden im Fernsteuerungs-GUI noch nicht "
+#~ "unterstützt"
+
+#~ msgid "Transferring"
+#~ msgstr "Übertragen"
+
+#~ msgid "QR: ???"
+#~ msgstr "QR: ???"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#~ msgid "Only files currently uploading"
+#~ msgstr "Nur momentan hochgeladene Dateien"
+
+#~ msgid "Queue Rank"
+#~ msgstr "Warteschlangenposition"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - Suchfortschrittsanzeige"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Beginne, MD4- und AICH-Prüfsummen zu berechnen für Datei %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Beginne, MD4-Prüfsumme zu berechnen für Datei %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Beginne, AICH-Prüfsumme zu berechnen für Datei %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "WARNUNG: Konnte original '%s' nach Erstellen des Backups nicht entfernen"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "WARNUNG: Fehler beim Löschen von %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid ""
+#~ "You cannot connect to a release version from an arbitrary SVN version! "
+#~ "*sigh* possible crash prevented"
+#~ msgstr ""
+#~ "Du kannst nicht von einer beliebigen SVN-Version zu einer Release-Version "
+#~ "verbinden! *seufz* möglichen Absturz verhindert"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Bewertung (Gesamt):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Versuche, nur komplette Chunks hochzuladen"
+
+#~ msgid "Networks window"
+#~ msgstr "Übersicht der verwendeten Netzwerke"
+
+#~ msgid "Searches window"
+#~ msgstr "Dateisuche in den verbundenen Netzwerken"
+
+#~ msgid "Shared files window"
+#~ msgstr "Übersicht der freigegebenen Dateien"
+
+#~ msgid "Messages window"
+#~ msgstr "Nachrichten, Chat, Freundesliste"
+
+#~ msgid "Statistics graph window"
+#~ msgstr ""
+#~ "Diverse Statistiken über Up- und Download, Verbindungen, Clients usw."
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Hier können die verschiedenen Einstellungen vorgenommen werden."
+
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Trayicon verloren, versuche neu zu erstellen ..."
+
+#~ msgid "Transfers"
+#~ msgstr "Übertragungen"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Datentransfer - Zeigt Up- und Downloads, Warteschlangen usw."
+
+#~ msgid "Unban"
+#~ msgstr "Bann entfernen"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Uploads zeigen"
+
+#~ msgid "Show Queue"
+#~ msgstr "Warteschlange anzeigen"
+
+#~ msgid "Select View"
+#~ msgstr "Ansicht auswählen"
+
+#~ msgid "Client Software"
+#~ msgstr "Client-Software"
+
+#~ msgid "Waited"
+#~ msgstr "Wartete"
+
+#~ msgid "Upload Time"
+#~ msgstr "Uploadzeit"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Upload/Download"
+
+#~ msgid "Remote Status"
+#~ msgstr "entfernter Status"
+
+#~ msgid "File Priority"
+#~ msgstr "Dateipriorität"
+
+#~ msgid "Score"
+#~ msgstr "Punkte"
+
+#~ msgid "Asked"
+#~ msgstr "Gefragt"
+
+#~ msgid "Last Seen"
+#~ msgstr "Zuletzt gesehen"
+
+#~ msgid "Entered Queue"
+#~ msgstr "In Warteschlange seit"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Übertragen Up"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Übertragen Down"
+
+#~ msgid "Userhash"
+#~ msgstr "Benutzerprüfsumme"
+
+#~ msgid "Encrypted"
+#~ msgstr "Verschlüsselt"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "%d Flaggenbitmaps geladen."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Uploads/Warteschlange/Clients"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Clients in der Warteschlange:"
+
+#~ msgid "Current Session"
+#~ msgstr "Laufende Sitzung"
+
+#~ msgid "Total"
+#~ msgstr "Gesamt"
+
+#~ msgid "Requested :"
+#~ msgstr "Nachfragen:"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Erstelle Sicherheitskopie für Vorschau"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Datentransfer - Zeigt Up- und Downloads, Warteschlangen usw."
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Benutzer insgesamt: %s | Dateien insgesamt: %s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "HTTP-Download-Thread gestartet."
+
+#~ msgid "Download size not received, downloading until connection is closed"
+#~ msgstr ""
+#~ "Downloadgröße nicht empfangen, lade herunter bis Verbindung beendet wird"
+
+#~ msgid "Download size: %i"
+#~ msgstr "Downloadgröße: %i"
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "HTTP-Download-Thread beendet."
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Host: %s:%i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Antwort: %i (Fehler: %i)"
+
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "WARNUNG: Leere Antwort auf Verbindungsstromerstellung"
+
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "FEHLER: Umleitungscode ohne URL erhalten"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country():·Misslungenes Laden von Länderdaten von "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "IP-Filterstufe holen."
+
+#~ msgid "Makes a search."
+#~ msgstr "Beginnt eine Suche."
+
+#~ msgid "Killed!"
+#~ msgstr "Beendet!"
+
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Benutze amuleweb in '%s'."
+
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Beende aMule ..."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Die folgenden Optionen wurden in dieser Veröffentlichung aus "
+#~ "Sicherheitsgründen geändert:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Aktivierung der Protokollverschleierungsunterstützung für eingehende "
+#~ "und ausgehende Verbindungen.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Deaktivierung der Aktualisierung der Server-Liste von anderen Servern "
+#~ "oder Clients.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Für mehr Informationen über die Hintergründe für diese Änderungen,\n"
+#~ "suche im aMule-Wiki auf http://wiki.amule.org nach \"fake servers\".\n"
+#~ "Es ist wichtig, dass Du keine gefälschten (\"fake\") Server in Deiner "
+#~ "Server-Liste hast, damit aMule vernünftig funktioniert."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Außerdem wurden die Browsereinstellungen auf die Systemvoreinstellung "
+#~ "zurückgesetzt. Bitte die Browseroptionen neu konfigurieren, wenn nötig.\n"
 
 #~ msgid "Fetching status..."
 #~ msgstr "Hole Status..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "User: E: %s K: %s | Dateien E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Client %s auf IP:Port %s:%d benutzt %s %s %s"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() returned NULL"
 
+#~ msgid "Firewalled"
+#~ msgstr "Firewalled"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "%d Flaggenbitmap geladen."
+#~ msgstr[1] "%d Flaggenbitmaps geladen."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr ""
+#~ "Die Datei '%s' ist zu groß für den Esel: erlaubtes Maximum ist 4 GiB."
+
+#~ msgid "User:"
+#~ msgstr "Benutzer:"
+
+#~ msgid "System:"
+#~ msgstr "System:"
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Keine Verarbeitungsmethode für diesen Dateityp."
+
+#~ msgid "File was not saved"
+#~ msgstr "Datei wurde nicht gespeichert"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr ""
+#~ "Verbindung fehlgeschlagen. Verbindung zum angegebenen Host nicht möglich\n"
+
+#~ msgid ""
+#~ "Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+
+#~ msgid "Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr "Copyright (C) 2002 Petar Maymounkov\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "Nachrichtenfilter"
 
@@ -7296,15 +7933,194 @@
 #~ msgid "Core Tweaks"
 #~ msgstr "Feinabstimmung"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Keine Verarbeitungsmethode für diesen Dateityp."
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Tooltip-Verzögerung in Sek."
 
-#~ msgid "File was not saved"
-#~ msgstr "Datei wurde nicht gespeichert"
+#~ msgid "Show part file number before file name"
+#~ msgstr "Zeige Part-Datei-Nummer vor Dateinamen"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgid "Skin Support"
+#~ msgstr "Verkleidungs(\"Skin\")-Unterstützung"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- keine Verkleidungen(\"Skins\") verfügbar -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Online-Signaturverzeichnis:"
+
+#~ msgid "Show messages in log"
+#~ msgstr "Zeige Nachrichten im Log"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Filterauswahl:"
+
+#~ msgid "UDP port for extended server requests (TCP+3):"
+#~ msgstr "UDP-Port für erweiterte Serveranfragen (TCP+3):"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Kapazitäten"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
 #~ msgstr ""
-#~ "Die Datei '%s' ist zu groß für den Esel: erlaubtes Maximum ist 4 GiB."
+#~ "Hinweis: Diese Werte werden\n"
+#~ "nur für die Statistik gebraucht."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Standard-Client-TCP-Port:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Erweiterter Client-UDP-Port:"
+
+#~ msgid "Bind Address"
+#~ msgstr "Bind-Adresse"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "UDP-Port für erweiterte Serveranfragen (TCP+3):4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "max. Quellen pro Datei"
+
+#~ msgid "Connection limits"
+#~ msgstr "Verbindungslimits"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Universelles Plug and Play"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "Aktiviere UPnP"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "UPnP-TCP-Port:"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Bei fertigem Download nächste pausierte Datei fortsetzen"
+
+#~ msgid "Check disk space"
+#~ msgstr "Festplattenplatz überprüfen"
+
+#~ msgid "Min disk space:"
+#~ msgstr "Mindest-Festplattenplatz:"
+
+#~ msgid "Incoming"
+#~ msgstr "Eingehende Dateien:"
+
+#~ msgid "Temporary"
+#~ msgstr "Temporäre Dateien:"
+
+#~ msgid "Shared"
+#~ msgstr "Freigegebene Verzeichnisse"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Farben des Graphen"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Download-Fortschrittsanzeige"
+
+#~ msgid "Show percentage"
+#~ msgstr "Prozentsatz anzeigen"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Statusbalken anzeigen "
+
+#~ msgid "Enable skin support "
+#~ msgstr "Aktiviere Verkleidungs(\"Skin\")-Unterstützung"
+
+#~ msgid "Skin:"
+#~ msgstr "Verkleidung(\"Skin\"):"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr ""
+#~ "Automatisches Sortieren der Dateien in der Downloadschlange (hohe CPU-"
+#~ "Last)"
+
+#~ msgid "Show Fast eD2k Links Handler"
+#~ msgstr "Zeige schnelle eD2k-Linkverarbeitung"
+
+#~ msgid "Web server port"
+#~ msgstr "Webserver-Port"
+
+#~ msgid "Enable UPnP port forwarding on the web server port"
+#~ msgstr "Aktiviere UPnP-Port-Weiterleitung zu Webserver-Port"
+
+#~ msgid "Web server UPnP TCP port"
+#~ msgstr "Webserver-UPnP-TCP-Port"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "IP-Adresse der lauschenden Schnittstelle\n"
+#~ "(leerlassen für beliebig)"
+
+#~ msgid "TCP port"
+#~ msgstr "TCP-Port"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Wer kann die freigegebenen Dateien sehen:"
+
+#~ msgid "Event types"
+#~ msgstr "Ereignis-Typen"
+
+#~ msgid "ERROR: can not accept web client connection\n"
+#~ msgstr "FEHLER: Kann Webclient-Verbindung nicht akzeptieren.\n"
+
+#~ msgid ""
+#~ "Your Auto-update server list is empty.\n"
+#~ "'Auto-update server list at startup will be disabled."
+#~ msgstr ""
+#~ "Die Auto-Update-Serverliste ist leer.\n"
+#~ "'Automatisches Aktualisieren der Serverliste beim Start' wird deaktiviert."
+
+#~ msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "FEHLER: Ungültige part.met-Dateiversion: %s ==> %s"
+
+#~ msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#~ msgstr ""
+#~ "WARNUNG: Die Liste bekannter Dateien ist beschädigt, enthält ungültigen "
+#~ "Header."
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "Sicherheitsabfrage vor dem Beenden."
+
+#~ msgid "Bandwith limits"
+#~ msgstr "Bandbreiteneinstellungen"
+
+#~ msgid "This UDP port is used for extended ed2k requests and Kad network"
+#~ msgstr ""
+#~ "Dieser UDP-Port wird für erweiterte eD2k-Anfragen und das Kad-Netzwerk "
+#~ "verwendet."
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Zeige Overhead-Bandbreite"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. aktiviert"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICH vertraut jeder Prüfsumme (nicht empfohlen)"
+
+#~ msgid "Disk space"
+#~ msgstr "Festplattenplatz"
+
+#~ msgid "Create Backup for preview"
+#~ msgstr "Erstelle eine Kopie für die Vorschau"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Erweiterte Einstellungen"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Statusbalkenstil"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Spaltensortierung"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Diverse Oberflächeneinstellungen"
+
+#~ msgid "File Options"
+#~ msgstr "Dateieigenschaften"
 
 #~ msgid "Status text"
 #~ msgstr "Statustext"
@@ -7312,18 +8128,135 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "Statustextfenster zeigen"
 
-#~ msgid "Please wait... "
-#~ msgstr "Bitte warten... "
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr "portabler P2P-Client, basierend auf eMule\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr "Webseite:  http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr "Forum: http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " Kontakt: admin@amule.org (administrative Fragen) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr " Teile von aMule basieren auf \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " Copyright (C) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "Bei einem Film beispielsweise Laufzeit, Thema, Sprache...\n"
+#~ "oder informiere andere Benutzer über Täuschungen."
+
+#~ msgid "Misc Options"
+#~ msgstr "Weitere Optionen"
+
+#~ msgid "Server Options"
+#~ msgstr "Serveroptionen"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Tagesmotto des Servers anzeigen, wenn verbunden..."
+
+#~ msgid "eD2k Info"
+#~ msgstr "eD2k Informationen"
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Deaktivieren/Aktivieren"
+
+#~ msgid "Authentication"
+#~ msgstr "Authentifizierung"
 
 #~ msgid "General Settings"
 #~ msgstr "Allgemeine Einstellungen"
 
+#~ msgid "Hard limit"
+#~ msgstr "Hartes Limit"
+
+#~ msgid "Max Connections"
+#~ msgstr "Maximale Verbindungen"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "GUI-Einstellungen"
 
 #~ msgid "Remote Control"
 #~ msgstr "Fernbedienung"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Kann ausgewählten Browser nicht bestimmen!"
+
+#~ msgid "User Defined"
+#~ msgstr "Benutzerdefiniert"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - Der Linux-Muli"
+
+#~ msgid "System Default"
+#~ msgstr "Systemvoreinstellung"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Hier den Browser auswählen"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Benutzerdefinierter Browser:"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Gebe hier den Namen deines Browsers ein. Um einen individuellen Browser "
+#~ "zu nehmen, wähle Benutzerdefiniert vom Auswahlmenü darüber."
+
+#~ msgid "Please wait... "
+#~ msgstr "Bitte warten... "
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "Konnte den Befehl zur Ausführung des Browsers nicht ermitteln."
 
@@ -7447,9 +8380,6 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "Kopiere eD2k-Verweise in die Zwischenablage"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "Schwerer Fehler: Es konnte kein Zeitgeber erstellt werden."
-
 #~ msgid "ED2K: Connecting"
 #~ msgstr "eD2k: Baue Verbindung auf"
 
@@ -7559,10 +8489,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "Fehler: Ungültige part.met-Dateiversion: %s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr ""
-#~ "Fehler: %s (%s) ist defekt (falscher Tagcount), kann Datei nicht öffnen)."
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "Warnung: %s könnte defekt sein (%i)"
 
@@ -7865,6 +8791,33 @@
 #~ msgid "Not Supported"
 #~ msgstr "Nicht unterstützt"
 
+#~ msgid ""
+#~ "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+#~ "Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+#~ msgstr ""
+#~ "Dateistatistik für diese Sitzung: %d von %d Anfrage akzeptiert, %s "
+#~ "übertragen\n"
+#~ "Dateistatistik für diese Sitzung: %d von %d Anfragen akzeptiert, %s "
+#~ "übertragen\n"
+
+#~ msgid ""
+#~ "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+#~ "Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+#~ msgstr ""
+#~ "Dateistatistik für alle Sitzungen: %d von %d Anfrage akzeptiert, %s "
+#~ "übertragen\n"
+#~ "Dateistatistik für alle Sitzungen: %d von %d Anfragen akzeptiert, %s "
+#~ "übertragen\n"
+
+#~ msgid ""
+#~ "Found corrupted part (%d) in %d part file %s - FileResultHash |%s| "
+#~ "FileHash |%s|Found corrupted part (%d) in %d parts file %s - "
+#~ "FileResultHash |%s| FileHash |%s|"
+#~ msgstr ""
+#~ "Fehlerhaften Teil (%d) in %d Part-Datei %s gefunden - FileResultHash |%s| "
+#~ "FileHash |%s|Fehlerhaften Teil (%d) in %d Part-Datei %s gefunden - "
+#~ "FileResultHash |%s| FileHash |%s|"
+
 #~ msgid "LowID: %u (%.2f%% Total %.2f%% Known)"
 #~ msgstr "LowID: %u (%.2f%% Gesamt %.2f%% Bekannt)"
 
@@ -8002,9 +8955,6 @@
 #~ msgid "Client request is invalid! %i / %i"
 #~ msgstr "Client-Anfrage ist ungültig! %i / %i"
 
-#~ msgid "Command: %s"
-#~ msgstr "Befehl: %s"
-
 #~ msgid "Unable to open %s file - using %s file."
 #~ msgstr "Kann %s-Datei nicht öffnen - benutze %s-Datei."
 
@@ -8021,13 +8971,6 @@
 #~ msgid "Waiting for subprocess termination failed"
 #~ msgstr "Warten auf Unterprozess-Abbruch fehlgeschlagen"
 
-#~ msgid ""
-#~ "You cannot connect to a release version from an arbitrary CVS version! "
-#~ "*sigh* possible crash prevented"
-#~ msgstr ""
-#~ "Du kannst nicht zu einer Release-Version von einer beliebigen CVS-Version "
-#~ "verbinden! *seufz* möglicher Absturz verhindert"
-
 #~ msgid "doesn't work"
 #~ msgstr "funktioniert nicht"
 
@@ -8059,7 +9002,7 @@
 #~ " FAQ: http://wiki.amule.org \n"
 #~ "\n"
 #~ " Contact: admin@amule.org (administrative issues) \n"
-#~ " Copyright (C) 2003-2009 aMule Team \n"
+#~ " Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
 #~ " Part of aMule is based on \n"
 #~ " Kademlia: Peer-to-peer routing based on the XOR metric.\n"
@@ -8073,7 +9016,7 @@
 #~ " FAQ: http://wiki.amule.org \n"
 #~ "\n"
 #~ " Kontakt: admin@amule.org·(für administrative Anliegen) \n"
-#~ "Copyright (C) 2003-2009 aMule-Team \n"
+#~ "Copyright (C) 2003-2008 aMule-Team \n"
 #~ "\n"
 #~ " Teile von aMule basieren auf \n"
 #~ " Kademlia: Peer-to-peer-Routing basierend auf der XOR-Metrik.\n"
@@ -8184,9 +9127,6 @@
 #~ "Dieser Befehl ist veraltet, und kann demnächst entfernt werden.\n"
 #~ "Verwende stattdessen 'Set BwLimit Down'.\n"
 
-#~ msgid "Syncronization thread started."
-#~ msgstr "Beginne Synchronisations-Nebenprozess (\"Thread\")"
-
 #~ msgid "Masterhashes of known files have been loaded."
 #~ msgstr "Hauptprüfsummen bekannter Dateien wurden geladen"
 
@@ -8248,9 +9188,6 @@
 #~ msgid "Source Dropping"
 #~ msgstr "Quellenverwurf"
 
-#~ msgid "Keep sources"
-#~ msgstr "Quellen behalten"
-
 #~ msgid "Drop sources"
 #~ msgstr "Quellen verwerfen"

aMule-2.2.6.tar.bz2/po/el.po -> aMule-2.3.1.tar.bz2/po/el.po Changed

@@ -1,5 +1,4 @@
 # Greek translations for aMule.
-# Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as aMule.
 # Dimitrios Galanakis <dgalanak@yahoo.com>, 2007.
 #
@@ -7,1364 +6,1222 @@
 msgstr ""
 "Project-Id-Version: el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2008-12-06 23:06-0600\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
+"PO-Revision-Date: 2008-07-30 01:25-0600\n"
 "Last-Translator: Dimitris <dgalanak@yahoo.com>\n"
 "Language-Team: Greek\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Πρέπει να προσδιορίσετε ένα μη κενό κωδικό."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Άκυρο κωδικό, δεν είναι κατακερματισμός τύπου MD5!"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Προσθήκη φίλου"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Αποτυχία σύνδεσης"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Πρέπει να βάλετε σωστή IP και θύρα!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "Η εξωτερική σύνδεση απέτυχε. Κενή ανταπόκριση."
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Πληροφορίες"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Εξωτερική Σύνδεση: Η πρόσβαση απορρίφθηκε επειδή"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Ο προσδιορισμένος κατακερματισμός χρήστη δεν είναι έγκυρος!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Εξωτερική σύνδεση: Η πρόσβαση απορρίφθηκε"
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Αποτυχία ανοίγματος %s (%s)"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
-"Εξωτερική Σύνδεση: Κακή ανταπόκριση από τον διακομιστή. Η σύνδεση "
-"τερματίστηκε."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Επιτυχία! Έγινε σύνδεση με το aMule"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Επιτυχία! Έγινε σύνδεση"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Κατακερματισμός"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Ολοκληρώνεται"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Ολοκληρώθηκε"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Σταματημένο"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Εσφαλμένο"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Κατεβαίνει"
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Δεν μπορείτε να προσθέσετε τον εαυτό σας σαν πηγή για έναν "
+"σύνδεσμο eD2k ενώ έχετε χαμηλή προτεραιότητα."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Περιμένει"
+#: src/amule.cpp:239
+#, fuzzy
+msgid "Now, exiting main app..."
+msgstr ""
+"\n"
+"Όλα μια χαρά, έξοδος %s...\n"
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Ξεκινάει η δημιουργία κατακερματισμού MD5 και AICH για το αρχείο: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Εκκίνηση δημιουργίας κατακερματισμού MD5 για το αρχείο: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Εκκίνηση δημιουργίας κατακερματισμού AICH για το αρχείο: %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Απέτυχε"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
 msgstr ""
-"Μετατροπή των παλιών συνόλων κατακερματισμού AICH στο '%s' σε 64b στο '%s'."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr ""
-"Ειδοποίηση: Το όνομα αρχείου '%s' είναι άκυρο και μετονομάστηκε σε '%s' "
+#: src/amule.cpp:335
+#, fuzzy
+msgid "aMule shutdown completed."
+msgstr "Το κατέβασμα ολοκληρώθηκε"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
 msgstr ""
-"Ειδοποίηση: Το αρχείο '%s' υπάρχει ήδη, το νέο αρχείο μετονομάστηκε σε '%s'"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr ""
-"Ειδοποίηση: Δεν μπόρεσα να σβήσω το αρχικό '%s' μετά τη δημιουργία "
-"αντιγράφου ασφαλείας"
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "Έξοδος επιβεβαίωσης"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "Ειδοποίηση: Απέτυχα να σβήσω το %s"
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "Νέα εξωτερική σύνδεση έγινε δεκτή"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Αποτυχία λήψης των κοινών αρχείων του χρήστη '%s'"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Αγνωστο"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Οι τοπικές ρυθμίσεις άλλαξαν στις προεπιλεγμένες του συστήματος λόγο μιας "
+"αλλαγής παραμέτρων. Sorry!"
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr "(Πλασματική έκδοση eMule %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Πληροφορίες"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr "(Πλασματικό eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Δεν υπάρχουν διακομιστές στην λίστα.\n"
+"Θέλετε το aMule να κατεβάσει μία νέα λίστα τώρα;"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Πλασματικό eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Κατέβασμα της λίστας διακομιστών"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (βασισμένο στο eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr "διακομιστής ιστού τρέχει με αριθμό διεργασίας %d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Παρατσούκλι: %s Ταυτότητα: %u"
+#: src/amule.cpp:658
+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 ""
+"Ζητήσατε να τρέχετε τον διακομιστή ιστού κατά την εκκίνηση, αλλά το "
+"εκτελέσιμο αρχείο amuleweb δεν βρέθηκε. Παρακαλώ εγκαταστήστε το πακέτο που "
+"περιέχει τον διακομιστή ιστού του aMule, ή μεταφράστε το aMule "
+"χρησιμοποιώντας την παράμετρο --enable-webserver"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Ζητήθηκε: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "ΣΦΑΛΜΑ"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Στατιστικές αρχείων για αυτή τη συνεδρία: Δεκτό %d από %d αίτηση, %s "
-"μεταφέρθηκε\n"
-msgstr[1] ""
-"Στατιστικές αρχείων για αυτή τη συνεδρία: Δεκτά %d από %d αίτησεις, %s "
-"μεταφέρθηκαν\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Δεν μπόρεσε να προσδέσει τις θύρες στην προσδιορισμένη διεύθυνση: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Στατιστικές αρχείων για όλες τις συνεδρίες: Δεκτό %d από %d αίτηση, %s "
-"μεταφέρθηκε\n"
-msgstr[1] ""
-"Στατιστικές αρχείων για όλες τις συνεδρίες: Δεκτά %d από %d αίτησεις, %s "
-"μεταφέρθηκαν\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Αναζητήθηκε άγνωστο αρχείο"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr ""
+"Η θύρα %u δεν είναι διαθέσιμη. Θα σας αποδωθεί LOWID (χαμηλή προτεραιότητα)\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Πελάτης %s στην θύρα IP %s:%d ο οποίος χρησιμοποιεί %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Όνομα Χρήστη"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Η θύρα %u δεν είναι διαθέσιμη!\n"
+"\n"
+"Αυτό σημαίνει ότι θα έχετε LOWID (χαμηλή προτεραιότητα).\n"
+"\n"
+"Ελέξτε το δίκτυο σας για να βεβαιωθήτε ότι η θύρα είναι ανοιχτή για είσοδο "
+"και έξοδο."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Φίλοι"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Αποτυχία δημιουργίας αρχείου Συνδεδεμένων Υπογραφών"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Ενδείξεις &Πληροφορίες"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Αποτυχία δημιουργίας αρχείου Συνδεδεμένων Υπογραφών του aMule"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Πρόσθεσε έναν φίλο"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"Οι επιλεγμένες τοπικές ρυθμίσεις δεν φαίνεται να είναι εγκατεστημένες στο "
+"σύστημά σας. (Σημ. Θα προσπαθήσω να τις θέσω ούτως ή άλλως)"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Αφαίρεσε έναν φίλο"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "Αυτή είναι η πρώτη φορά που τρέχετε το aMule %s"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Στείλε &Μύνημα"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Αυτή η έκδοση είναι δοκιμαστική, και αναβαθμίζεται καθημερινά, και\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Δες αρχεία"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr ""
+"δεν δίνουμε εγγύηση ότι δεν θα χαλάσει κάτι, δεν θα κάψει το σπίτι σας,\n"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Εγκαθίδρυσε φιλική σχισμή "
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"ή δεν θα σκοτώσει το σκύλο σας. Αλλά πρέπει να είναι ασφαλές στη χρήση\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Σίγουρα θέλετε να διαγράψετε τον επιλεγμένο φίλο;"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Περισσότερες πληροφορίες, υποστήριξη και νέες εκδόσεις μπορούν να βρεθούν "
+"στην ιστοσελίδα μας,\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Σίγουρα θέλετε να διαγράψετε τους επιλεγμένους φίλους;"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "στο www.aMule.org, ή στο κανάλι #aMule του IRC στο irc.freenode.net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Ακύρωση"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr ""
+"Παρακαλούμε αναφέρετε σφάλματα του προγράμματος στο http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Δεν επιτρέπεται να θέσεις μόνο πανω από μία φιλική σχισμή (ανώμαλε). \n"
-" Γι αυτό μόνο μία ανατέθηκε."
+"Ο δικτυακός κατάλογος των ηλεκτρονικών αρχείων υπογραφών που προσδιορίσατε "
+"είναι ΑΚΥΡΟΣ!\n"
+"Οι ηλεκτρονικές υπογραφές θα ΑΠΕΝΕΡΓΟΠΟΙΗΘΟΥΝ μέχρι να το φτιάξετε στις "
+"προτιμήσεις."
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Πολλαπλή επιλογή"
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "Όνομα διακομιστή:"
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Το κατέβασμα ολοκληρώθηκε"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Η εκχώρηση χώρου για το αρχείο '%s' απέτυχε: '%s'"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Η πλήρης διαδρομή του αρχείου"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "ΣΦΑΛΜΑ: το αρχείο καταγραφής δεν μπορεί να ανοίξει"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Το όνομα του αρχείου χωρίς τη διαδρομή."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το αρχείο καταγραφών είναι άδειο. Κάτι δεν πάει καλά."
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "Ο κατακερματισμός eD2k του αρχείου."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Το αρχείο καταγραφών επαναφέρθηκε στην αρχική κατάσταση"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Το μέγεθος του αρχείου σε μπάιτ."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Μήνυμα Διακομιστή: %s"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Συνολική διάρκεια κατεβάσματος"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Ξεκίνησε καινούρια περίοδος συνομιλίας"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Αποτυχία κατεβάσματος της λίστας κόμβων."
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Αποστολέας μηνύματος"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Αποτυχία ανοίγματος του κατεβασμένου αρχείου ελέγχου έκδοσης"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Δεν υπάρχει χώρος"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Φθαρμένο αρχείο ελέγχου έκδοσης"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Κατάτμηση δίσκου"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Χρησιμοποιείται μία ξεπερασμένη έκδοση του aMule!"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Σφάλμα κατά την ολοκλήρωση"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Η παρούσα έκδοση του aMule είναι %i.%i.%i και η τελευταία %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Όνομα αρχείου"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Η τελευταία έκδοση μπορεί να βρεθεί στο http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Μέγεθος"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η έκδοση του aMuled είναι ξεπερασμένη: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Τύπος"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Αυτό το αντίγραφο του aMule είναι σύγχρονο. "
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Προτεραιότητα"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Αποτυχία κατεβάσματος του αρχείου ελέγχου έκδοσης"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "Τιμή ταυτότητας αρχείου"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Χρήστες: %s | Αρχεία: %s"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Αιτήσεις"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Χρήστες: E: %s K: %s | Αρχεία: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Αποδεκτές αιτήσεις"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Δεν έχουν επιλεχθεί δίκτυα"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Όγκος μεταφερμένων δεδομένων"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "με Χαμηλή Προτεραιότητα"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Λόγος συμμετοχής"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "με Υψηλή Προτεραιότητα"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Κεκτημένα τμήματα"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Σύνδεση με το %s %s"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Ολοκληρωμένες πηγές"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Διαδικασία σύνδεσης με %s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Μονοπάτι καταλόγου"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Αποσυνδεδεμένο από το eD2k"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Κοινόχρηστα αρχεία"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Το Kad ξεκίνησε."
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Πολή χαμηλή"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Το Kad είναι σταματημένο."
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Χαμηλή"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Συνδεδεμένο στο Kad (ΟΚ)"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Κανονική"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Συνδεδεμένο στο Kad (με προστατευτικό τοίχο)"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Υψηλή"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Αποσυνδεδεμένο από το Kad"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Πολή υψηλή"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Το δίκτυο Kad δεν μπορεί να χρησιμοποιηθεί αν η θύρα UDP είναι "
+"απενεργοποιημένη στις προτιμήσεις. Δεν έγινε εκκίνηση."
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Επίσημη έκδοση"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr ""
+"Το δίκτυο Kad είναι απενεργοποιημένο από τις προτιμήσεις. Δεν έγινε σύνδεση."
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Αυτόματο"
+#: src/amuled.cpp:560
+#, fuzzy
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"ΣΦΑΛΜΑ: ο δαίμονας του aMule δεν μπορεί να χρησιμοποιηθεί όταν οι εξωτερικές "
+"συνδέσεις είναι απενεργοποιημένες. Για να ενεργοποιήσετε τις εξωτερικές "
+"συνδέσεις, χρησιμοποιήστε είτε ένα κανονικό aMule, ξεκινήστε το amuled με "
+"την παράμετρο --ec-config ή θέστε το κλειδί \"AcceptExternalConnections\" "
+"στην τιμή 1 στο αρχείο ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Προσθήκη σχολίου/Αξιολόγησης"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Επεξεργασία σχολίου/Αξιολόγησης"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Μετονομασία"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Προσθήκη των αρχείων της συλλογής στην λίστα με τα μεταφερόμενα"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Αντιγραφή μαγνήτη &URI στην πρόχειρη μνήμη"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "ΣΦΑΛΜΑ: %s"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Αντιγραφή του συνδεσμού eD2k στο πρόχειρο"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Αυτό το aMule %s είναι βασισμένο στο eMule."
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο (&Πηγή)"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Τρέχει στο %s"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
 msgstr ""
-"Αντιγραφή του συνδέσμου eD2k στο πρόχειρο (Πηγή) (& Με κρυπτογραφικές "
-"επιλογές)"
-
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Αντιγραφή του συνδεσμου eD2k στο πρόχειρο (&Όνομα υπολογιστή)"
+"Επισκεφτείτε το http://www.amule.org για να δείτε αν υπάρχει νέα έκδοση."
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr ""
-"Αντιγραφή του συνδέσμου eD2k στο πρόχειρο (Όνομα υπολογιστή) (&Με "
-"κρυπρογραφίκές επιλογές)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ΜΟΙΡΑΙΟ ΣΦΑΛΜΑ: Αποτυχία δημιουργίας Χρονομέτρου"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο) (Πληροφορίες AICH)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Τηλεχειρισμός aMule"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Αντιγραφή των συμβουλων στην πρόχειρη μνήμη"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Στιγμιότυπο"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:501
 msgid ""
-"Feedback from: %s (%s)\n"
+"'All-Platform' p2p client based on eMule \n"
 "\n"
 msgstr ""
-"Αντίδραση από %s (%s)\n"
+"Πελάτης P2P για όλες τις πλατφόρμες βασισμένος στο eMule \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr ""
-"Χρειάζεται Υψηλή Προτεραιότητα για τη δημιουργία έγκυρου πηγαίου συνδέσμου"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Κοινόχρηστα αρχεία (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[Μέρος αρχείου]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Δώστε νέο όνομα γι αυτό το αρχείο:"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Ιστοσελίδα: http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Μετονομασία αρχείου"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Συζητήσεις: http://forum.amule.org \n"
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Σύνεχεια του ανεβάσματος του αρχείου: %s"
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Αναστολή ανεβάσματος του αρχείου: %s"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"Συχνές Ερωτήσεις: http://wiki.amule.org \n"
+"\n"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "Διακομιστής κειμένου του aMule"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Επικοινωνία: admin@amule.org (διαδικαστικά θέματα) \n"
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: Η λέξη κλειδί αναζήτησης είναι πολυ μικρούλα"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Πνευματικά Δικαιώματα (c) 2003-2008 η ομάδα του aMule \n"
+"\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Ανάγνωση %u επαφής Kad"
-msgstr[1] "Ανάγνωση %u επαφών Kad"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Μέρος του aMule είναι βασισμένο στο  \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-"Μόνο %d γνωριμία Kad είναι διαθέσιμο. το αρχείο nodes.dat δεν γράφτηκε"
-msgstr[1] ""
-"Μόνο %d γνωριμίες Kad είναι διαθέσιμες. το αρχείο nodes.dat δεν γράφτηκε"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Δρομολόγηση Peer-to-peer βασισμένη στην μετρική XOR.\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Γράψιμο %d επαφής Kad"
-msgstr[1] "Γράψιμο %d επαφών Kad"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ΣΦΑΛΜΑ: Δεν μπορώ να ακούσω την θύρα TCP."
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "η σύνδεση πελάτη ιστού έγινε αποδεκτή\n"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Μήνυμα"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ΣΦΑΛΜΑ: Η σύνδεση πελάτη ιστού δεν μπορεί να γίνει δεκτή.\n"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Η αίτηση απέτυχε με το εξής σφάλμα: %s"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Συνδέοντας"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Η αίτηση απέτυχε για άγνωστο λόγο"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Συνδέεται"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Το αρχείο δεικτών δεν βρέθηκε (ψάχνω ψάχνω και τίποτα δεν βρίσκω)"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Αποσυνδεδεμένο"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Η περίοδος εργασίας έληξε - αίτηση επανασύνδεσης\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Πίσω από τοίχο προστασίας"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Η Περίοδος εργασίας είναι εντάξη, συνδεδεμένο\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Συνδεδεμένο"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Η Περίοδος εργασίας είναι εντάξη, μη συνδεδεμένο\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Σε διαδικασία σύνδεσης"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Δεν έχει ξεκινήσει περίοδος εργασίας - θα ξητηθεί σύνδεση\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Εκτός"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Δημιουργία περιόδου εργασίας - ζήτηση σύνδεσης\n"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Ακύρωση"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "H αίτηση διεκπεραιώνεται [αρχικό]:"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Σταμάτησε τις τρέχουσες απόπειρες σύνδεσης"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Έλεγχος κωδικού\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Αποσύνδεση"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Ο κωδικός κατακερματισμού είναι άκυρος\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Αποσύνδεση από τα συνδεδεμένα δίκτυα"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Ο κωδικός είναι εντάξει\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Σύνδεση"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Κακός κωδικός\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Σύνδεση στα ενεργοποιημένα δίκτυα"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Δεν βάλατε κανέναν κωδικό. Δεν επιτρέπεται κενός κωδικός.\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Πάνω: %.1f(%.1f) | Κάτω: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Ζητήθηκε αποσύνδεση\n"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Πάνω: %.1f | Κάτω: %.1f"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Επεξεργασία αιτήματος [ανακατεύθυνση]"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Συνδεδεμένο)"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Φορτώνει προτύπου <str>"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Αποσυνδεδεμένο)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Θύρα HTTP του διακομιστή ιστού"
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Σίγουρα θέλετε να κλείσετε το aMule;"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Χρήση της προώθησης της θύρας UPnP στη θύρα διακομιστή ιστού"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Έξοδος επιβεβαίωσης"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Θύρα UPnP "
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr " Χρήση συμπίεσης τύπου gzip"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- Προεπιλεγμένο -"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Κωδικός πλήρους πρόσβασης για τον διακομιστή ιστού"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Ο κατάλογος των θεμάτων '%s'  δεν υπάρχει"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Κωδικός επισκέπτη για τον διακομιστή ιστού"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Δεν είναι δυνατή η ανάγνωση του αρχείου θέματος '%s' "
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Να επιτρέπεται η πρόσβαση σε επισκέπτες"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Δίκτυα"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Να απαγορεύεται η πρόσβαση σε επισκέπτες"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Παράθυρο δικτύων"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr ""
-"Φόρτωση/Αποθήκευση των ρυθμίσεων του διακομιστή ιστού από/προς απομακρυσμένο "
-"aMule"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Αναζητήσεις"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Η διαδρομή στα αρχεία ρυθμίσεων του aMule. ΜΗΝ ΑΛΛΑΖΕΤΕ ΑΠΕΥΘΕΙΑΣ"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Παράθυρο αναζητήσεων"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Απενεργοποίηση του διερμηνέα PHP (απαρχαιωμένο)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Κατεβασμένα"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Μετάγλωτιση των σελίδων PHP σε κάθε αίτηση"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Κατεβαίνει"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Ο διακομιστής δικτύου του aMule"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Κοινόχρηστα αρχεία"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Δεν είναι διαθέσιμο"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Παράθυρο κοινόχρηστων αρχείων"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Ποτέ"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Μηνύματα"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Μεταφόρτωση..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Παράθυρό μηνυμάτων"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Στατιστικές"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr ""
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Παράθυρο στατιστικών διαγραμμάτων"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Ο κατάλογος που περιέχει το αρχείο amulesig.dat."
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Πλοήγηση"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Παράθυρο ρυθμίσεων"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Γράψτε εδώ το όνομα του καταλόγου που περιέχει το αρχείο amulesig.dat"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Εισαγωγή"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Περίδος ανανέωσης σε δεπτερόλεπτα"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Το εργαλείο εισαγωγής ημιτελών αρχείων"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Παραγωγή στατιστικής απεικόνισης σε κάθε συμβάν ανανέωσης"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Σχετικά"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr ""
-"Γράψτε εδώ τον κατάλογο όπου θέλετε να παραχθεί η στατιστική απεικόνιση"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Σχετικά/Βοήθεια"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Περιοδικό ανέβασμα του ειδώλου στατιστικών στον διακομιστή FTP"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Δίκτυο eD2k"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "Διεύθυνση FTP"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Δίκτυο Kad"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Διαδρομή FTP"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Κανένα δίκτυο"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Εδώ εισάγετε τη διεύθυνση του διακομιστή FTP"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "Έλεγχος του aMule εξ' αποστασεως"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
-"Εισάγετε εδώ τον κατάλογο που θα μπεί το είδωλο στατιστικών στον διακομιστή "
-"FTP"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Χρήστης"
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Μοιραίο σφάλμα: Αποτυχία δημιουργίας χρονομέτρου"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Κωδικός"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Σύνδεση σε απομακρυσμένο amule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Γράψτε εδώ το όνομα χρήστη για να συνδεθείτε στον διακομιστή FTP"
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Μοιραίο σφάλμα: Αποτυχία δημιουργίας χρονομέτρου"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Γράψτε εδώ τοn κωδικό χρήστη για να συνδεθείτε στον διακομιστή FTP"
+#: src/amule-remote-gui.cpp:268
+#, fuzzy
+msgid "Going to event loop..."
+msgstr "Προσπάθεια ανάκτηση πληροφοριών αρχείου..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Περίοδος ενημέρωσης του FTP σε λεπτά"
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "Συνδέοντας"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Τεκμηρίωση"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Αποτυχία σύνδεσης"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Κατάλογος που περιέχει το αρχείο υπογραφής"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Κατάλογος οπου να δημιουργηθεί η στατιστική απεικόνιση"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i Ημέρες %i Ώρες %i λεπτά %i s"
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, Στατιστικές σύνδεσης aMule"
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Καλώς ήρθατε (Καλώς σας βρήκαμε)"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Μέγιστη ταχύτητα κατεβάσματος στη διάρκεια που το wxCas τρέχει"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Όλα"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
-"Απόλυτα ελάχιστη ταχύτητα κατεβάσματος στις προηγούμενες εκτελέσεις του wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Επαναφορά"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Άγνωστο"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Σύστημα"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Αποτυχία λήψης των κοινόχρηστων αρχείων του χρήστη '%s'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Διακοπή της αυτόματης ανανέωσης"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Αποθήκευση της απεικόνισης στατιστικών σύνδεσης"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr "(Πλασματική έκδοση eMule %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Εκτύπωση της απεικόνισης στατιστικών σύνδεσης"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr "(Πλασματικό eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Ρυθμίσεις προτιμήσεων"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Πλασματικό eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Σχετικά με το wxCas"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (βασισμένο στο eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Εκκίνηση της αυτόματης ανανέωσης"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Παρατσούκλι: %s Ταυτότητα: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Η αυτόματη ανανέωση σταμάτησε"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Ζητήθηκε: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Η αυτόματη ανανέωση ξεκίνησε"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Στατιστικές αρχείων για αυτή τη συνεδρία: Δεκτό %d από %d αίτηση, %s "
+"μεταφέρθηκε\n"
+msgstr[1] ""
+"Στατιστικές αρχείων για αυτή τη συνεδρία: Δεκτά %d από %d αίτησεις, %s "
+"μεταφέρθηκαν\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Αοθήκευση της στατιστικής απεικόνισης"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Στατιστικές αρχείων για όλες τις συνεδρίες: Δεκτό %d από %d αίτηση, %s "
+"μεταφέρθηκε\n"
+msgstr[1] ""
+"Στατιστικές αρχείων για όλες τις συνεδρίες: Δεκτά %d από %d αίτησεις, %s "
+"μεταφέρθηκαν\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Στατιστικές σύνδεσης του aMule"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Αναζητήθηκε άγνωστο αρχείο"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
-"Υπήρξε πρόβλημα κατά την εκτύπωση.\n"
-"Μήπως ο τρέχων εκτυπωτής δεν έχει ρυθμιστεί σωστά;"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Φιλτραρίστηκε το μήνυμα από τον '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Εκτύπωση"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Καινούριο μήνυμα από τον '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
 msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"wxCas, Στατιστικές συνδεδεμένων υπογραφών\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Βασισμένο στο CAS του Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Διανέμετε υπό την GPL"
+"Ο χρήστης %s (%u) ζήτησε λίστα κοινόχρηστων αρχείων του κατάλογου %s -> "
+"Απορρίφθηκε"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Να πάρει! Το amule δεν τρέχει.."
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, fuzzy, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το αρχείο known.met δεν μπορεί να ανοιχτεί."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "Το aMule τρέχει"
+#: src/CanceledFileList.cpp:61
+#, fuzzy
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: η λίστα των γνωστών αρχείων είναι φθαρμένη, περιέχει άκυρη "
+"επικεφαλίδα."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "Το aMule τρέχει, αλλά δεν είναι συνδεδεμένο"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Σφάλμα εισόδου εξόδου κατά την ανάγνωση του αρχείου known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "Το aMule συνδέεται..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Σφάλμα κατά το αποθήκευση του αρχείου known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Στο καλό! Η κατάσταση του aMule είναι άγνωστη..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Κατηγορία"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr "τρέχει επί"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Καινούρια κατηγορία"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr "έχει διακοπεί !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Επιλέξτε έναν κατάλογο για τα εισερχόμενα αρχεία"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr "δεν είναι συνδεδεμένο !"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Πρέπει να προσδιορίσετε ένα όνομα για την κατηγορία!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr "συνδέεται.."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Πρέπει να προσδιορίσετε μία διαδρομή για την κατηγορία!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr "κάνει κάτι κουφό, τσέκαρέ το!"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Αποτυχία δημιουργίας καταλόγου εισερχομένων για την κατηγορία. Παρακαλώ "
+"προσδιορίστε μία έγκυρη διαδρομή!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr "είναι συνδεδεμένο με"
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Ξεκίνησε συνεδρία συνομιλίας: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Συνδεδεμένος σε πελάτη ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "Εντάξει"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Συνδέεται σε πελάτη ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "βρίσκεται πίσω από τοίχο προστασίας"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Αποτυχία σύνδεσης σε πελάτη/η σύνδεση χάθηκε ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "κλειστό"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr "είναι ανοιχτό"
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr "με"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Συνολική μεταφόρτωση:"
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Κλείσιμο καρτέλας"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Ανέβασμα: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Κλείσιμο όλων των καρτελών"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Περίοδος κατεβάσματος:"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Κλείσιμο των άλλων καρτελών"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Μεταφόρτωση"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Προσθήκη στους φίλους"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Ανέβασμα: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Φορτώθηκε το αρχείο πιστώσεων, %u πελάτη είναι γνωστός"
+msgstr[1] "Φορτώθηκε το αρχείο πιστώσεων, %u πελάτες είναι γνωστοί"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] "- Εξέπνευσε η προθεσμία πιστώσεων για %u πελάτη!"
+msgstr[1] "- Εξέπνευσε η προθεσμία πιστώσεων για %u πελάτες!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Κοινοκτημοσύνη"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Δεν βρέθηκε το αρχείο 'cryptkey.dat' και γι αυτό το δημιουργώ"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr "Αρχείο(α), Πελάτες στην αναμονή: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Πληροφορίες πελάτη"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Χρόνος"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "Κακή ποιότητα σύνδεσης (LowID)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "Καλή ποιότητα σύνδεσης (HighID)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " ανοιχτό"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Ενεργό"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Μέσο φορτίο συστήματος (1-5-15 λεπτα): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Υποστηρίζεται"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Χρόνος λειτουργικότητας συστήματος:"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Δεν υποστηρίζεται"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Απενεργοποιημένο"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Συνδεδεμένο"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Αποσυνδεδεμένο"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02us"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "Καλή ποιότητα σύνδεσης (HighID)"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "Κακή ποιότητα σύνδεσης (LowID)"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Δεν ολοκληρώθηκε"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Δέν είναι συνδεδεμένο"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Κακό παιδί"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Επιβεβαιώθηκε - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Δεν υπάρχει"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr ""
+"Ο χρήστης %s (%u) ζήτησε τη λίστα με τα κοινόχρηστα αρχεία -> Έγινε δεκτό"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+"Ο χρήστης %s (%u) ζήτησε τη λίστα με τα κοινόχρηστα αρχεία -> Απορρίφθηκε"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Ακυρώθηκε!"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"Ο χρήστης %s (%u) ζήτησε τη λίστα με τους κοινόχρηστους καταλόγους -> Έγινε "
+"δεκτό"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "Unable to open %s"
-msgstr "Αποτυχία ανοίγματος του %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Παράμετρος εισόδου"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Αρχείο προς κατακερματισμό"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Προσθήκη προεραιτικών URL για αυτό το αρχείο"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
-"Εδώ εισάγετε το αρχείο για το οποίο θέλετε να υπολογίσετε τον σύνδεσμο eD2k"
+"Ο χρήστης %s (%u) ζήτησε τη λίστα με τους κοινόχρηστους καταλόγους -> "
+"Απορρίφθηκε"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Εδώ εισάγετε την διεύθυνση που θέλετε να προσθέσετε στον σύνδεσμο eD2k: "
-"Προσθέστε / στο τέλος για να ενημερώσετε τον δημιουργό συνδέσμων να "
-"επισυνάψει το τρέχων όνομα αρχείου"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Προσθήκη"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Αφαίρεση"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Καθαρισμός"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Δημιουργία συνδέσμου με μερικό κατακερματισμό"
+"Ο χρήστης %s (%u) ζήτησε λίστα κοινόχρηστων αρχεία του κατάλογου %s -> Έγινε "
+"δεκτό"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Βοηθήστε στην διανομή καινούριων και σπάνιων αρχείων  ταχύτερα, με αντίτιμο "
-"έμα μεγαλύτερο μέγεθος συνδέσμου"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Κατακερματισμός αρχείου MD4"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "Αρχείο κατακερματισμού eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "σύνδεσμος eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Εκκίνηση"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Αποθύκευση"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Αντιγραφή στο πρόχειρο"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Έξοδος"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Άνοιγμα"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "¨ανοιγμα αρχείου για τον υπολογισμου του συνδέσμου eD2k του"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Αντιγραφή"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Αντιγραφή υπολογισμένου συνδέσμου eD2k στο πρόχειρο"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Αποθήκευση ως"
+"Ο χρήστης %s (%u) ζήτησε λίστα κοινόχρηστων αρχείων του κατάλογου %s -> "
+"Απορρίφθηκε"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Αποθήκευση υπολογισμένου συνδέσμου eD2k σε αρχείο"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Ο χρήστης %s (%u) μοιράζεται τον κατάλογο %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Σχετικά"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Ο χρήστης %s (%u) έστειλε κοινόχρηστους καταλόγους χωρίς να ζητηθούν."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Σχετικά με τον aLinkCreator"
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "Ο χρήσης %s (%u) έστειλε λίστα κοινόχρηστων αρχείων για κατάλογο %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
-"Επιλέξτε το αρχείο για το οποίο θέλετε να υπολογίσετε τον σύνδεσμο eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Το πρόχειρο δεν μπορεί να ανοίξει"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Δεν υπάρχει τίποτα για να αντιγραφεί σε αυτή τη φάση !"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Επιλεξτε το αρχείο για τον υπολογισμένο σύνδεσμο eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Αδύνατο το άνοιγμα"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Παρακαλώ δώστε ένα μη κενό όνομα αρχείου"
+"Ο χρήστης %s (%u) τελείωσε την αποστολή της λίστας κοινόχρηστων αρχείων"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Δεν υπάρχει τίποτα για να σωθεί σε αυτή τη φάση !"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Ο χρήστης %s (%u) έστειλε αχρείαστη λίστα κοινόχρηστων αρχείων"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
-"aLinkCreator, ο δημιουργός συνδέσμων eD2k του aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Εικονίδια από το http://www.everaldo.com και το http://www.icomania.com\n"
-"καθώς και το http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Διανέμεται υπό την GPL"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Κατακερματίζοντας..."
+"Ο χρήστης %s (%u) αρνήθηκε πρόσβαση στη λίστα κοινόχρηστψων καταλόγων/αρχείων"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "Ο aLinkCreator δουλεύει για σας"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Σχόλια αρχείου"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Υπολογίζει τον κατακερματισμό MD4..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Όνομα Χρήστη"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Υπολογίζει τους κατακερματισμούς eD2k..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Όνομα αρχείου"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Ολοκληρώθηκε σε %.2f δεύτερα"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Αξιολόγηση"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Έχετε ήδη προσθέσει αυτήν την URL !"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Σχόλιο"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Παρακαλώ εισάγετε μια μή κενή URL"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Κανένα σχόλιο"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Επεξεργασία του αρχείου υπ' αριθμόν %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Ζητήσατε μερικά τεμάχια (Χρησιμοποιήται μόνο για αρχεία > 9.5ΜΒ)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u σχόλιο"
+msgstr[1] "%u σχόλια"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Ανύπαρκτο αρχείο !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, ο δημιουργός συνδέσμων eD2k του aMule"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
-msgstr "Αυτόματο [Χαμηλό]"
+msgstr "Αυτόματη [Χαμηλή]"
 
 #: src/DataToText.cpp:38
 msgid "Auto [No]"
-msgstr "Αυτόματο [Όχι]"
+msgstr "Αυτόματη [Κανονική]"
 
 #: src/DataToText.cpp:39
 msgid "Auto [Hi]"
-msgstr "Αυτόματο [Υψηλό]"
+msgstr "Αυτόματη [Υψηλή]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Συνδέοντας"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Πολύ χαμηλή"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Χαμηλή"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Κανονική"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Υψηλή"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Πολύ υψηλή"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Επίσημη έκδοση"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
-msgstr "Ερωτόντας"
+msgstr "Ζητώντας"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Σύνδεση μέσω διακομιστή"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Ουρά γεμάτη"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
-msgstr "Στην ουρά"
+msgstr "Εν αναμονή"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Μεταφέρεται"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Κατεβαίνει"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1390,10 +1247,9 @@
 msgid "Too many Kad connections"
 msgstr "Υπερβολικά πολλές συνδέσεις Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
-msgstr "Απαγορευμένο"
+msgstr "Απαγορευμένοι"
 
 #: src/DataToText.cpp:74
 msgid "Connection Error"
@@ -1423,8 +1279,8 @@
 msgid "Remote Server"
 msgstr "Απομακρυσμένος διακομιστής"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1448,10 +1304,10 @@
 msgid "Search Result"
 msgstr "Αποτέλεσμα Αναζήτησης"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
-msgstr "Έχουν ολοκληρωθεί"
+msgstr "Ολοκληρώθηκαν"
 
 #: src/DataToText.cpp:146
 msgid "In progress"
@@ -1473,7 +1329,7 @@
 msgid "ERROR: Failed!"
 msgstr "ΣΦΑΛΜΑ: Απέτυχε!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "Εν αναμονή"
 
@@ -1485,882 +1341,312 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Άγνωστος ή κακός τύπος προσωρινού αρχείου."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Εργοστασιακές ρυθμίσεις"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Αλβανικά"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Αραβικά"
-
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "Εστονικά"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Βασκικά"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Βουλγάρικα"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Καταλανικά"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Κινέζικα (απλοποιημένα)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Κινέζικα (Παραδοσιακά)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Κροάτικα"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Μέρος"
 
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Τσέχικα"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Δανέζικα"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Ολανδικά"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Αγγλικα (Ην. Βασίλειο)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Εστονικά"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Φιλανδικά"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Γαλλικά"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Γαλικιακά"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Γερμανικά"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Ελληνικά"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Εβραϊκά"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Ουγκαρέζικα"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Ιταλικά"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Ιταλικά (Ελβετίας)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Γιαπωνέζικα"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Κορεάτικα"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Λιθουανιά"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Νορβηγικά"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Μέγεθος"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Πολωνέζικα"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Μεταφέρθηκαν"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Πορτογαλλικά"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Ταχύτητα"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Πορτογαλικά (Βραζιλίας)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Πρόοδος"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Ρωσικά"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Αρ. πηγών"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Σλοβένικα"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Προτεραιότητα"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Ισπανικά"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Κατάσταση"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Σουηδικά"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Υπόλοιπος Χρόνος"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Τούρκικα"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Τελευταία φορά που εμφανίστηκε ολοκληρωμένο"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ουκρανικά"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Τελευταία λήψη"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Ο τύπος του πλοηγού δεν μπορεί να προσδιοριστεί"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε το συγκεκριμένο αρχείο;"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"Η θύρα TCP δεν μπορεί να είναι μεγαλύτερη από 65532, διότι η θύρα UDP του "
-"διακομιστή είναι TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τα συγκεκριμένα αρχεία;"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Θα χρησιμοποιηθεί η στάνταρ θύρα (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Όνομα διακομιστή"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Διεύθυνση"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Θύρα"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Περιγραφή"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ηχοβολιστής πακέτων"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Χρήστες"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Αρχεία"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Απέτυχε"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Στατικό"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Έκδοση"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Είστε συνδεδεμένος σε έναν διακομιστή που προσπαθείτε να διαγράψετε. "
-"Παρακαλω αποσυνδεθείτε πρώτα. Ο διακομιστής δεν διαγράφηκε."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Πληροφορίες"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Άγνωστο όνομα)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Είστε σίγουρος/η οτι θέλετε να διαγράψετε τον στατικό διακομιστή %s"
+"Αντίδραση από %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Ναι"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Αυτόματη"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Όχι"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Σταμάτημα"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Αποτυχημένη προσπάθεια να ανοίξει '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Παύση"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Διακομιστές (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Συνέχιση"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Διακομιστής"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "Κ&αθάρισμα των ολοκληρωμένων"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Σύνδεση σε διακομιστή"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Εναλλαγή κάθε A4AF μέχρι αυτό το αρχείο τώρα"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Σημαδέψτε τον διακομιστή σαν στατικό"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Εναλλαγή κάθε A4AF μέχρι αυτό το αρχείο (αυτόματα)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Σημαδέψτε τον διακομιστή σαν μη-στατικό"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Εναλλαγή κάθε A4AF μέχρι κάθε άλλο αρχείο (αυτόματα)"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Σημαδέψτε τους διακομιστές σαν στατικούς"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Εκτεταμένες Προτιμήσεις"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Σημαδέψτε τους διακομιστές σαν μη-στατικούς"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Προεπισκόπιση"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Αφαίρεση διακομιστή"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Εμφάνιση &λεπτομερειών για το αρχείο"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Αφαίρεση διακομιστών"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Εμφάνιση όλων των σχολίων"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Διαγράψτε όλους τους διακομιστές"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Αντιγραφή μαγνητικής URI στο πρόχειρο"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
 msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Αντιγραφή συνδέσμων eD2k στο πρόχειρο"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Αντιγραφή των συμβουλών στην πρόχειρη μνήμη"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Επανασυνδεση στον διακομιστή"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "μη ανάθεση"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Σίγουρα να σβηστούν όλοι οι διακομιστές;"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Ανάθεση σε κατηγορία"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τον επιλεγμένο διακομιστή;"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Άνοιγμα αρχείου"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τους επιλεγμένους διακομιστές;"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Δώστε νέο όνομα γι αυτό το αρχείο:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Απενεργοποιημένο [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Μετονομασία αρχείου"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Αυτό το aMule %s είναι βασισμένο στο eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Τρέχει στο %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Επισκευτήτε το http://www.amule.org to για να δείτε αν υπάρχει νέα έκδοση."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ΜΟΙΡΑΙΟ ΣΦΑΛΜΑ: Αποτυχία δημιουργίας Χρονομέτρου"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMule remote control "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Στιγμιότυπο"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Πελάτης P2P βασισμένος στο eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr "Ιστοσελίδα: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr "Τόπος συζήτησης: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-"Συχνές Ερωτήσεις: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr "Επικοινωνία: admin@amule.org (διοικητικά θέματα) \n"
+msgid "Downloads (%i)"
+msgstr "Κατεβασμένα (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-"Πνευματικά δικαιώματα (C) 2003-2009 η ομάδα του aMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr "Μέρος του aMule βασίζεται στο \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Δρομολόγηση Peer-to-peer βασισμένη στην μετρική XOR.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr "Πνευματικά δικαιώματα (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Μύνημα"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Συνδέεται"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Αποσυνδεδεμένο"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Πίσω από τοίχο προστασίας"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Συνδεδεμένο"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Σε διαδικασία σύνδεσης"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Εκτός"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Σταμάτησε τις τρέχουσες απόπειρες σύνδεσης"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Αποσύνδεση"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Αποσύνδεση από τα συνδεδεμένα δίκτυα"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Σύνδεση"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Σύνδεση στα ενεργοποιημένα δίκτυα"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Πάνω: %.1f(%.1f) | Κάτω: %.1f(%.1f)"
-
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Πάνω: %.1f | Κάτω: %.1f"
-
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Συνδεδεμένο)"
-
-#: src/amuleDlg.cpp:836
-#, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Αποσυνδεδεμένο)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Πραγματίκα θέλετε να κλείσετε το aMule;"
-
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Έξοδος επιβεβαίωσης"
+"Για να μην εμφανίζεται αυτή η προειδοποίηση σε κάθε προεπισκόπιση,\n"
+"θέστε το προτιμητέο πρόγραμμα βίντεο στις ρυθμίσεις (ο mplayer είναι "
+"προεπιλεγμένος)."
 
-#: src/amuleDlg.cpp:1182
-#, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Ο κατάλογος των εξωτερικών εμφανίσεων '%s'  δεν υπάρχει"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Προεπισκόπηση αρχείου"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr ""
-"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Δεν είναι δυνατή η ανάγνωση του αρχείου εξωτερικής εμφάνισης "
-"'%s' "
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Δίκτυα"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Παράθυρο δικτύων"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Αναζητήσεις"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Παράθυρο αναζητήσεων"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Μεταφορές"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Παράθηρο μεταφορών αρχείων"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Κοινόχρηστα αρχεία"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Παράθυρο κοινόχρηστων αρχείων"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Μυνήματα"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Παράθυρο μυνημάτων"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Στατιστικές"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Παράθυρο γραφημάτων στατιστικών"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Παράθυρο ρυθμίσεων"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Εισαγωγή"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Το εργαλείο εισαγωγής ημιτελών αρχείων"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Σχετικά/Βοήθεια"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "Δίκτυο eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Δίκτυο Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Κανένα δίκτυο"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Γενικά"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Σύνδεση"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Κατάλογοι"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Διακομιστές"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Ασφάλεια"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Περιβάλλον"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Διακομιστής διαμεσολάβησης"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Φίλτρα"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Τηλεχειριστήριο"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Διασυνδεδεμένη υπογραφή"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Προχωρημένες επιλογές"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Γεγονότα"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Έλεγχος σφαλμάτων προγράμματος"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Ο χρήστης προσδιορίστηκε"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
 msgstr ""
-"το aMule πρέπει να επανεκινηθεί για να ενεργοποιηθούν αυτές οι αλλαγές: \n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- Άλλαξε η θύρα TCP.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- Άλλαξε η θύρα UDP.\n"
+"ΣΦΑΛΜΑ: Αποτυχία εκτέλεσης του εξωτερικού προγράμματος εμφάνισης πολυμέσων! "
+"Εντολή: `%s'"
 
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
 msgstr ""
-"Η λίστα διακομιστών αυτόματης ενημέρωσης είναι κενή.\n"
-"Η αυτόματη ενημέρωση λίστας διακομιστών κατά την εκκίνηση θα απενεργοποιηθεί."
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
-"Έχετε ενεργοποιήσει τις εξωτερικές συνδέσεις αλλά δεν έχετε προσδιορίσει "
-"κωδικό.\n"
-"Οι εξωτερικές συνδέσεις δεν μπορούν να ενεργοποιηθούν μέχρι να προσδιοριστεί "
-"ένας έγκυρος κωδικός."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Η γλώσσα άλλαξε.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Ο προσωρινός κατάλογος άλλαξε.\n"
 
-#: src/PrefsUnifiedDlg.cpp:589
-#, fuzzy
-msgid "- ED2K network enabled.\n"
-msgstr "Όλα τα δίκτυα είναι απενεργοποιημένα."
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Πάνω: 0.0 | Κάτω: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Και το δίκτυο eD2k και το Kad είναι απενεργοποιημένα.\n"
-"Δεν θα μπορέσετε να συνδεθείτε μέχρι να ενεργοποιήσετε τουλάχιστον ένα από "
-"αυτα."
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "Φόρτωση του αρχείου διακομιστών: %s"
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Το δίκτυο Kad δεν θα ξεκινήσει αν η θύρα UDP είναι απενεργοποιημένη.\n"
-"Ενεργοποιήστε τη θύρα UDP ή απενεργοποιήστε το Kad."
+#: src/DownloadQueue.cpp:132
+#, fuzzy, c-format
+msgid "Loading PartFile %u of %u"
+msgstr "Φόρτωση δεδομένων από το παλιό αρχείο κατεβάσματος (%u από %u)"
 
-#: src/PrefsUnifiedDlg.cpp:669
+#: src/DownloadQueue.cpp:154
 msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"\n"
-"Τώρα πρέπει να επανεκινήσετε το aMule.\n"
-"Διαφορετικά μην διαμαρτυρηθείτε αν συμβεί κάτι κακό.\n"
+"ΣΦΑΛΜΑ: Αποτυχία φορτώματος του αντιγράφου ασφαλείας. Ψάξτε στο http://forum."
+"amule.org για λύσεις ανάκτησης αρχείων .part.met"
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
-"Η λίστα με τους διακομιστές αυτόματης ανανέωσης είναι κενή.\n"
-"Παρακαλώ βάλτε τουλάχιστον μία URL που να δείχνει σε ένα έγκυρο αρχείο sever."
-"met.\n"
-"Πατήστε το διπλανό κουμπί \"List\" για να βάλετε ένα URL."
 
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Προσωρινά αρχεία"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Εισερχόμενα αρχεία"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Συνδεδεμένες υπογραφές"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Επιλέξτε κατάλογο για %s"
-
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Αναζήτηση του βιντεοπαίχτη"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Επιλογή περιηγητή"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Δεν βρέθηκαν ημιτελή αρχεία"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Εκτελέσιμο%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Επεξεργασία λίστας διακομιστών"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Βρέθηκε %u ημιτελές αρχείο"
+msgstr[1] "Βρέθηκαν %u ημιτελή αρχεία"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Βάλτε εδώ τη διεύθηνση για το κατέβασμα των αρχείων server.met. \n"
-"Μία διεύθηνση σε κάθε γραμμή"
+"Το σύστημα αρχείων του προσωρινού καταλόγου δεν μπορεί να διαχειριστεί "
+"μεγάλα αρχεία."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Καθυστέρηση ενημέρωσης: %d δεπτερόλεπτο"
-msgstr[1] "Καθυστέρηση ενημέρωσης: %d δεπτερόλεπτα"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"Το σύστημα αρχείων του καταλόγου εισερχομένων δεν μπορεί να διαχειριστεί "
+"μεγάλα αρχεία."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Χρόνος για μέσο γράφημα: %d λεπτό"
-msgstr[1] "Χρόνος για μέσο γράφημα: %d λεπτά"
+msgid "Downloading %s"
+msgstr "Κατεβάζοντας %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Κλίμακα γραφήματος συνδέσεων: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Προσπαθείτε ήδη να κατεβάσετε αυτό το αρχείο '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Καθυστέρηση ενημέρωσης: %d δεπτερόλεπτο"
-msgstr[1] "Καθυστέρηση ενημέρωσης: %d δεπτερόλεπτα"
+msgid "You already have the file '%s'"
+msgstr "Το αρχείο '%s' υπάρχει ήδη"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Μέγεθος χώρου ενδιάμεσης αποθήκευση αρχείου: %d byte"
-msgstr[1] "Μέγεθος χώρου ενδιάμεσης αποθήκευση αρχείου: %d byteς"
+msgid "You are already trying to download the file %s"
+msgstr "Ήδη προσπαθείτε να κατεβάσετε το αρχείο %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Μέγεθος λίστας αναμονής ανεβασμάτων: %d πελάτης"
-msgstr[1] "Μέγεθος λίστας αναμονής ανεβασμάτων: %d πελάτες"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Δεν γίνεται η μετατροπή του μαγνητικού συνδέσμου σε σύνδεσμο eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Διάστημα ανανέωσης της σύνδεσης σε διακομιστή: %d λεπτό"
-msgstr[1] "Διάστημα ανανέωσης της σύνδεσης σε διακομιστή: %d λεπτά"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Διάστημα ανανέωσης της σύνδεσης σε διακομιστή: Απενεργοποιημένο"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Θύρα UDP για εκτεταμένες αιτήσεις στο διακομιστή (TCP+3):"
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "απενεργοποιμένο"
+msgid "Unknown protocol of link: %s"
+msgstr "Άγνωστο πρωτόκολλο του συνδέσμου: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Εκτέλεση εντολής κατά το γεγονός `%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Ενεργοποίηση εκτέλεσης εντολών στον πυρήνα"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Εντολή πυρήνα:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Ενεργοποίηση εκτέλεσης εντολών στο γραφικό περιβάλλον"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Εντολή γραφικού περιβάλλοντος:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Οι παρακάτω μεταβλητές θα αντικατασταθούν:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Άκυρος σύνδεσμος eD2k! ΣΦΑΛΜΑ: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Απόπειρα μη εξουδιοδοτημένης πρόσβασης. Η σύνδεση έκλεισε."
+#: src/ExternalConn.cpp:260
+#, fuzzy
+msgid "Client sent packet after authentication failed."
+msgstr "Η πιστοποίηση απέτυχε."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Η εξωτερική σύνδεση έκλεισε."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Οι εξωτερικές συνδέσεις απενεργοποιήθηκαν λόγω καινού κωδικού!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Οι εξωτερικές συνδέσεις απενεργοποιήθηκαν στο αρχείο ρυθμίσεων"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Νέα εξωτερική σύνδεση έγινε δεκτή"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
-msgstr "ΣΦΑΛΜΑ: δεν μπορεσα να αποδεχτώ νέα εξωτερική σύνδεση"
+msgstr "ΣΦΑΛΜΑ: δεν μπόρεσα να αποδεχτώ νέα εξωτερική σύνδεση"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "Οι εξωτερικές συνδέσεις απενεργοποιήθηκαν λόγω καινού κωδικού στις "
 "προτιμήσεις!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Συνδεόμενος πελάτης: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Άγνωστη έκδοση"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2368,2295 +1654,1094 @@
 "Λανθασμένη ταυτότητα έκδοσης EC, ίσως υπάρχει δυαδική ασυμβατότητα. "
 "Χρησιμοποιήστε πυρήνα και απομακρυσμένο μέρος από το ίδιο στιγμιότυπο."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"Δεν μπορείτε να συνδεθείτε σε μια επίσημη έκδοση από μια αναπτυσόμενη (SVN) "
-"έκδοση! *ούφ* απετεύχθει πιθανό κρέμασμα"
-
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Η πιστοποίηση απέτυχε."
+"Δεν μπορείτε να συνδεθείτε σε μια επίσημη έκδοση από μια αναπτυσσόμενη (SVN) "
+"έκδοση! *ουφ* αποφευχθεί πιθανό κρέμασμα"
 
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
-msgstr "Άκυρη έκδοση πρωτοκόλου."
+msgstr "Άκυρη έκδοση πρωτοκόλλου."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
-msgstr "Λείπει η ετικέτα με την έκδοση του πρωτοκόλου."
+msgstr "Λείπει η ετικέτα με την έκδοση του πρωτοκόλλου."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "Η πιστοποίηση απέτυχε."
+
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "Η πιστοποίηση απέτυχε."
+
+#: src/ExternalConn.cpp:516
+#, fuzzy
+msgid "Invalid request, please authenticate first."
 msgstr "Άκυρη αίτηση, πρέπει πρώτα να πιστοποιηθήτε."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Η πρόσβαση επικυρώθηκε."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, fuzzy, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Διήθηση μηνυμάτων από άγνωστους πελάτες"
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Απόπειρα μη εξουσιοδοτημένης πρόσβασης. Η σύνδεση έκλεισε."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 "Η απομακρυσμένη εντολή ημιτελούς αρχείου απέτυχε: Ο κατακερματισμός αρχείου "
 "δεν βρέθηκε: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Ο κατακερματισμός αρχείου δεν βρέθηκε: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "Όπα! Σφάλμα επεξεργασίας OpCode!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Ο διακομιστής δεν προστέθηκε"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "Ο διακομιστής δεν βρέθηκε: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "χρειάζεται να οριστεί ο διακομιστής που να διαγραφεί"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
-msgstr "Το eD2k είναι απενεργοποιημένο στις ρυθμισείς."
+msgstr "Το eD2k είναι απενεργοποιημένο στις ρυθμίσεις."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
-msgstr "Αναξήτηση δια εξέλιξη. Επανανάκληση αποτελεσμάτων σε λίγο!"
+msgstr "Αναζήτηση δια εξέλιξη. Επανάκτηση αποτελεσμάτων σε λίγο!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 "Η αναζήτηση από τον ιστό από απομακρυσμένο περιβάλλον δεν έχει κανένα νόημα."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Το Kad έχει απενεργοποιηθεί στις προτιμήσεις."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Δεν υπάρχουν σημεία για γράφημα."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Ο πελάτης σας δεν έχει ρυθμιστεί με τόση λεπτομέρεια"
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Εξωτερική σύνδεση: ζητήθηκε κλείσιμο"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Ήδη η λειτουργία είναι σε φάση διακοπής"
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
-msgstr "ExternalConn: προσθέτωντας τον σύνδεσμο '%s'."
+msgstr "Εξωτερική Σύνδεση: προστίθεται ο σύνδεσμος '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Άκυρος σύνδεσμο ή ήδη στην λίστα."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Το αρχείο δεν βρέθηκε."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Άκυρο όνομα αρχείου."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Αποτυχία μετονομασίας αρχείου."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Το Kad έχει απενεργοποιηθεί στις προτιμήσεις."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Ήδη συνδεδεμένο στο eD2k."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
-msgstr "Σύνδεεται στο eD2k..."
+msgstr "Συνδέεται στο eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Ήδη συνδεδεμένο στο Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Διαδικασία σύνδεσης στο Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Όλα τα δίκτυα είναι απενεργοποιημένα."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Αποσυνδεδεμένο από το eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Αποσυνδεδεμένο από το Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Εξωτερική σύνδεση: λήφθηκε άκυρος opcode: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
-msgstr "Εσφαλμένος κωδικός (λάθος έκδοση πρωτοκόλου;)"
-
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Αποτυχία ανοίγματος του αρχείου (%s), αφαίρεση από τη λίστα κοινοχρήστων "
-"αρχείων."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Σύνολο κατακερματισμού για άγνωστο αρχείο: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Η εντολή `%s' με pid `%d' τελείωση με κωδικό κατάστασης `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Ο διακομιστής δεν προστέθηκε: Δεν προσδιορίστηκε διεύθυνση."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Ο διακομιστής δεν προστέθηκε: Προσδιορίστηκε άκυρη θύρα διακομιστή."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Κατάσταση eD2k:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Συνδεδεμένο"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "Διεύθηνση:Θύρα"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "Ταυτότητα"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Κατάσταση Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Τρέχει"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Κατάσταση:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Αποσυνδεδεμένο"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Κατάσταση σύνδεσης:"
+msgstr "Εσφαλμένος κωδικός (λάθος έκδοση πρωτοκόλλου;)"
 
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Πίσω από τοίχο προστασίας"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "Εντάξει"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Κατάσταση τοίχου προστασίας:"
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Συνδεδεμένος στον φιλαράκο"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Όχι φιλαράκος"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Μέσοι χρήστες:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Μέσα αρχεία:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Δεν τρέχει"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Uptime: %s"
-msgstr "Χρόνος λειτουργίας: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Μεταφορά"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Ανεβασμένα"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Ανεβασμένα Δεδομένα (Συνεδρία (Συνολικά)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Συνολική επιβάρυνση (Πακέτα): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Επιβάρυνση αίτησης αρχείου (Πακέτα): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Επιβάρυνση ανταλλαγής πηγών (Πακέτα): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Επιβάρυνση διακομιστή (Πακέτα): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Επιβάρυνση Kad (Πακέτα): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Κρυπτογραφική επιβάρυνση (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Ενεργά ανεβάσματα: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Ανεβάσματα σε αναμονή: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Συνολικός αρ. επιτυχών συνεδριών ανεβάσματος: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Συνολικός αριθμός αποτυχημένων συνεδριών ανεβάσματος: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Μέσος χρόνος ανεβάσματος: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Κατεβασμένα"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Κατέβηκαν δεδομένα (Συνεδρία (Συνολικά)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Βρέθηκαν πηγές: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Ενεργά κατεβάσματα (κομμάτια): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Συνεδρία λόγος Ανω:Κάτω (Σύνολο): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Μέσος ρυθμός κατεβάσματος (Συνεδρία): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Μέσος ρυθμός ανεβάσματος (Συνεδρία): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Μέγιστος ρυθμός κατεβάσματος (Συνεδρία): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Ελλαχιστος ρυθμός κατεβάσματος (Συνεδρία): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Επανασυνδέσεις: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Χρόνος μετά από την πρώτη μεταφορά: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Συνδεση με τον διακομιστή από: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Ενεργές συνδέσεις (εκτίμηση): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Έφτασε στο μέγιστο αρ. συνδέσεων: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Μέσες συνδέσεις (εκτίμηση): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Κορυφαίες συνδέσεις (εκτίμηση): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Πελάτες"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Φιλτραρισμένοι"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Συνολικοί: %i Γνωστοί: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Εργαζόμενοι διακομιστές: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Αποτυχημένοι διακομιστές: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Συνολο: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Διεγραμμένοι διακομιστές: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Φιλτραρισμένοι διακομιστές: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Χρήστες στους εργαζόμενους διακομιστές: %llu"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Άγνωστη επέκταση  '%s' για την εντολή '%s'.\n"
 
-#: src/Statistics.cpp:721
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Αρχεία στους εργαζόμενους διακομιστές: %llu"
+msgid "Unknown command '%s'.\n"
+msgstr "Άγνωστη εντολή '%s'.\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Σύνολο χρηστών: %llu"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Αυτή η εντολή δεν μπορεί να έχει όρισμα.\n"
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "Σύνολο αρχείων: %llu"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Αυτή η εντολή πρέπει να έχει όρισμα.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Κατοχή διακομιστών: %.2f%%"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Αυτή η εντολή είναι ημιτελής, πρέπει να χρησιμοποιήσετε μία από τις παρακάτω "
+"επεκτάσεις.\n"
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Αριθμός κοινόχρηστων αρχείων: %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Διαθέσιμες επεκτάσεις:\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Συνολικό μέγεθος κοινόχρηστων αρχείων: %s"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Διαθέσιμες εντολές:\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Average file size: %s"
-msgstr "Μέσο μέγεθος αρχείου: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Λειτουργικό σύστημα"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Δεν ελήφθει"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Αποκοπή"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Επικόλληση"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Επιλογή όλων"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Δεν μπορεί να γίνει αναζήτηση στο Kad αν το Kad δεν τρέχει"
-
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
-"Δεν μπορεί να γίναι αναζήτηση στο eD2k αν το eD2k δεν είναι συνδεδεμένο"
-
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Άγνωστο σφάλμα όταν έγινε απόπειρα αναζήτησης στο Kad:"
+"\n"
+"Όλες οι εντολές δεν διακρίνουν πεζά από κεφαλαία.\n"
+"Γράψτε '%s <command>' για να πάρετε λεπτομερείς πληροφορίες πάνω στην "
+"<εντολή>.\n"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Φιλτραρίστηκε το μύνημα από τον '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Κλείσιμο της εφαρμογής."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Καινούριο μύνημα από τον '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Εμφάνιση βοήθειας."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
-"Ο χρήστης %s (%u) ζήτησε τη λίστα με τα κοινόχρηστα αρχεία -> Έγινε δεκτό"
+"Για βοήθεια πάνω σε μία εντολή, γράψτε 'help <εντολή>'.\n"
+"Για την πλήρη λίστα εντολών γράψτε 'help'.\n"
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
-"Ο χρήστης %s (%u) ζήτησε τη λίστα με τα κοινόχρηστα αρχεία -> Απορρίφθηκε"
+"\n"
+"Χρησιμοποιήστε '%s' για την λίστα εντολών\n"
+"\n"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"Ο χρήστης %s (%u) ζήτησε τη λίστα με τους κοινόχρηστους καταλόγους -> Έγινε "
-"δεκτό"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Συντακτικό λάθος!"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
-"Ο χρήστης %s (%u) ζήτησε τη λίστα με τους κοινόχρηστους καταλόγους -> "
-"Απορρίφθηκε"
+"Σφάλμα κατά την επεξεργασία της εντολής - δεν έπρεπε να συμβεί ποτέ! "
+"Παρακαλείστε να αναφέρετε σφάλμα προγράμματος\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"Ο χρήστης %s (%u) ζήτησε λίστα κοινόχρηστων αρχεία του κατάλογου %s -> Έγινε "
-"δεκτό"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Αυτή η εντολή δεν πρέπει να έχει παραμέτρους."
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"Ο χρήστης %s (%u) ζήτησε λίστα κοινόχρηστων αρχείων του κατάλογου %s -> "
-"Απορρίφθηκε"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Αυτή η εντολή πρέπει να έχει παράμετρο."
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Ο χρήστης %s (%u) μοιράζεται τον κατάλογο %s"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Άκυρο όρισμα."
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Ο χρήστης %s (%u) έστειλε κοινόχρηστους καταλόγους χωρίς να ζητηθούν."
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Αυτή είναι ημιτελής εντολή."
 
-#: src/ClientTCPSocket.cpp:1025
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "Ο χρήσης %s (%u) έστειλε λίστα κοινόχρηστων αρχείων για κατάλογο %s"
+msgid "Type '%s' to get more help.\n"
+msgstr "Για περισσότερη βοήθεια, γράψτε '%s'.\n"
 
-#: src/ClientTCPSocket.cpp:1032
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr ""
-"Ο χρήστης %s (%u) τελείωσε την αποστολή της λίστας κοινόχρηστων αρχείων"
+msgid "This is %s %s %s\n"
+msgstr "Αυτό είναι %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1037
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Ο χρήστης %s (%u) έστειλε αχρείαστη λίστα κοινόχρηστων αρχείων"
+msgid "This is %s %s\n"
+msgstr "Αυτό είναι %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
-"Ο χρήστης %s (%u) αρνήθηκε πρόσβαση στη λίστα κοινόχρηστψων καταλόγων/αρχείων"
+"\n"
+" Δημιουργία πελάτη...\n"
 
-#: src/KadDlg.cpp:132
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Nodes (%u)"
-msgstr "Κόμβοι (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Άκυρη διεύθυνση ip για εκκινητήρα"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Άκυρη θύρα για εκκινητήρα"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Παρακαλώ συμπληρώστε όλα τα απαιτούμενα πεδία"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Είστε σίγουροι ότι θέλετε να κατεβάσετε ένα καινούριο αρχείο nodes.dat;\n"
+"\n"
+"Όλα μια χαρά, έξοδος %s...\n"
 
-#: src/KadDlg.cpp:197
+#: src/ExternalConnector.cpp:420
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"Κάτι τέτοιο θα αφαιρέσεις του τρέχοντες κόμβους και θα επανεκινήσει την "
-"σύνδεση Kademlia"
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Συνέχιση;"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "ΣΦΑΛΜΑ:"
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ:"
+"Δεν είναι δυνατη η σύνδεση με κενό κωδικό.\n"
+"Πρέπει να προσδιορίσετε έναν κωδικό είτε στο αρχείο παραμέτρων\n"
+"είτε στην γραμμή εντολών είτε προσδιορίζοντας κάποιο όταν ζητηθεί.\n"
+"Έξοδος...\n"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Προσθήκη φίλου"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Δείξε αυτό το αρχείο βοήθειας."
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Πρέπει να βάλετε σωστή IP και θύρα!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr ""
+"Υπολογιστής όπου το aMule τρέχει (προεπιλεγμένος: ο τοπικός υπολογιστής)"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Πληροφορίες"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Η Θύρα του aMule για Εξωτερική σύνδεση. (προεπιλεγμένη: 4712)"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Ο προσδιορισμένος κατακερματισμός χρήστη δεν είναι έγγυρος!"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Κωδικός εξωτερικής σύνδεσης"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Πηγές"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Διάβασε το αρχείο διευθετήσεων"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Αρχείο"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Μην στέλνεις μηνύματα στην stdout."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Κατέβασμα"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Να είσαι αναλυτικός - δείξε και να μηνύματα αποσφαλμάτωσης"
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Κατηγορία"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Θέσε τις τοπικές ρυθμίσεις"
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Κύρια"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Εγγραφή των παραμέτρων της γραμμής εντολών σε αρχείο."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Κατέβασμα στην κατηγορία"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr ""
+"Δημιουργεί ένα αρχείο παραμέτρων βασισμένο στο αρχείο παραμέτρων του aMule."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Αναζήτηση παρόμοιων αρχείων (στο eD2k, τοπικός διακομιστής)"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Τύπωσε την έκδοση του προγράμματος."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Σημείωση αρχείου ως γνωστού"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Λεπτομέρειες αρχείου"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Σύνδεση σε απομακρυσμένο amule"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% ολοκληρώθηκαν"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Αποτυχία σύνδεσης"
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "ΣΦΑΛΜΑ"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "Αποτυχία ανάγνωσης του αρχείου της λίστας φίλων 'emfriends.met' "
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Η σύνδεση απέτυχε. Αποτυχία σύνδεσης με τον %s:%d\n"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "Αποτυχία γραψίματος στο αρχείο της λίστας φίλων 'emfriends.met' "
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
-"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Δεν μπορείτε να προσθέσετε τον εαυτό σας σαν πηγή για έναν "
-"σύνδεσμο eD2k ενώ έχετε χαμηλή προτεραιότητα."
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Χρήστες: E: %s K: %s | Αρχεία E: %s K: %s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Όλα"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Φίλοι"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Συνολικοί Χρήστες: %s | Συνολικά Αρχεία: %s"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Εμφάνιση &Λεπτομερειών"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Έχουν μεταφερθεί"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Πρόσθεσε έναν φίλο"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Ταχύτητα"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Αφαίρεσε έναν φίλο"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Πρόοδος"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Στείλε &Μήνυμα"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Κατάσταση"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Παρουσίαση αρχείων"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Εναπομείνων χρόνος"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Εγκαθίδρυσε φιλική θυρίδα"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Τελευταία φορα που ειδώθηκε ολοκληρωμένο"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Σίγουρα θέλετε να διαγράψετε τον επιλεγμένο φίλο;"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Τελευταία λήψη"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Σίγουρα θέλετε να διαγράψετε τους επιλεγμένους φίλους;"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Εϊστε σίγουροι ότι θέλετε να διαγράψετε το συγκεκριμένο αρχείο;"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Δεν επιτρέπεται να θέσεις μόνο πανω από μία φιλική θυρίδα. \n"
+" Γι αυτό μόνο μία ανατέθηκε."
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Εϊστε σίγουροι ότι θέλετε να διαγράψετε τα συγκεκριμένα αρχεία;"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Πολλαπλή επιλογή"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Αποστολή μηνύματος στον χρήστη"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
-msgstr "Μύνημα προς αποστολή:"
-
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Σταμάτημα"
+msgstr "Μήνυμα προς αποστολή:"
 
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Παύση"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Συνέχιση"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "Κ&αθάρισμα των ολοκληρωμένων"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Εναλλαγή κάθε A4AF μέχρι αυτό το αρχείο τώρα"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Εναλλαγή κάθε A4AF μέχρι αυτό το αρχείο (αυτόματα)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Εναλλαγή κάθε A4AF μέχρι κάθε άλλο αρχείο (αυτόματα)"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Εκτεταμένες Προτιμήσεις"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Προεπισκόπιση"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Εμφάνιση &λεπτομερειών για το αρχείο"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Εμφάνιση όλων των σχολίων"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Αντιγραή μαγνητικής URI στο πρόχειρο"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "μη-ανάθεση"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Ανάθεση σε κατηγορία"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Άνοιγμα αρχείου"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Αφαίρεση από του φίλους"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Προσθήκη στους φίλους"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Εναλλαγή σε αυτό το αρχείο"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
-msgstr "Αιτήση ενός άλλου αρχείου"
+msgstr "Αίτηση ενός άλλου αρχείου"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Κατεβασμένα (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Για να μην εμφανίζεται αυτή η προειδοποίηση σε κάθε προεπισκόπιση,\n"
-"θέστε το προτιμητέο πρόγραμμα βίντεο στις ρυθμίσεις (ο mplayer είναι "
-"προεπιλεγμένος)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Προεπισκόπηση αρχείου"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Ανεβάσματα σε αναμονή: %s"
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr ""
-"ΣΦΑΛΜΑ: Αποτυχία εκτέλεσης του εξωτερικού προγράμματος εμφάνισης πολυμέσων! "
-"Εντολή: `%s'"
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "Εν αναμονή"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "ΣΦΑΛΜΑ: Αποτυχία δημιουργίας ημιτελούς αρχείου"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Ανέβασμα"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Προσπάθεια φόρτωσης του αντιγράφου ασφαλείας του αρχείου met από το %s"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Κανείς"
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ΣΦΑΛΜΑ: Αποτυχία ανοίγματος του αρχείου part.met: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Όχι"
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ΣΦΑΛΜΑ: το αρχείο έχει μηδενικό μέγεθος: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Ναι"
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ΣΦΑΛΜΑ: Άκυρη έκδοση αρχείου part.met: %s ==> %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Μεταφόρτωση..."
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
-"ΣΦΑΛΜΑ: %s (%s) είναι φθαρμένο (εσφαλμένη απαρρίθμηση ετικέτας), δεν είναι "
-"δύνατο το φόρτωμα του αρχείου."
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Προσπάθεια ανάκτηση πληροφοριών αρχείου..."
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "Κατάλογος για τα εισερχόμενα"
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
-"Ανάκτηση αρχείου χωρίς όνομα -  θα γίνει προσπάθεια ανάκτησης ως "
-"RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Ανακτήθηκαν όλες οι διαθέσιμες πληροφορίες αρχείου :D - Τώρα προσπαθώ να τις "
-"χρησιμοποιήσω..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Δεν είναι δυνατή η ανάκτηση πληροφοριών αρχείου :("
 
-#: src/PartFile.cpp:660
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Αποτυχία ανοίγματος %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %s μπορεί να είναι φθαρμένο (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "ΣΦΑΛΜΑ κατά το αποθήκευση του ημιτελούς αρχείου: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Δεν μπορεί να βρεθεί το μέγεθος του '%s' - χρήση του αρχείου %s."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' έχει μηδενικό μέγεθος για κάποιο λόγο - χρήση του αρχείου %s."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Αποτυχία του σωσίματος του αρχείου part.met.seeds για %s"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Σώθηκε %i σπόρος πηγής για το ημιτελές αρχείο: %s (%s) "
-msgstr[1] "Σώθηκαν %i σπόροι πηγής για το ημιτελές αρχείο: %s (%s) "
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Το ημιτελές αρχείο %s (%s) δεν έχει αρχείο σπόρων"
-
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Το ημιτελές αρχείο %s (%s) έχει κενό αρχείο σπόρων"
-
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
-"Σφάλμα κατά την ανάγνωση του αρχείου σπόρου του ημιτελούς αρχείου (%s - %s): "
-"%s"
-
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Βρέθηκε φθαρμένο τμήμα (%d) στο %d μέρος αρχείου %s -  FileResultHash |%s| "
-"FileHash |%s|"
-msgstr[1] ""
-"Βρέθηκε φθαρμένο τμήμα (%d) στα %d μέρη αρχείου %s -  FileResultHash |%s| "
-"FileHash |%s|"
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Βρέθηκε ολοκληρωμένο μέρος (%i) στο %s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Τελείωσε ο επανακατακερματισμός του %s"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Απρόσμενο σφάμα κατά την ολοκλήρωση του %s. Το αρχεί έπαψε"
-
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Ολοκλήρωση του κατεβάσματος: %s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Σβήσιμο αρχείου: %s"
-
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
-"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Δεν είναι δυνατός ο κατακερματισμός του κατεβασμένου τμήματος "
-"- του σύνολο κατακερματισμού για το '%s' είναι ημιτελές"
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
-msgstr ""
-"ΣΦΑΛΜΑ: Δεν είναι δυνατός ο κατακερματισμός του κατεβασμένου τμήματος - του "
-"σύνολο κατακερματισμού για το '%s' είναι ημιτελές. Αυτό δεν πρέπει να "
-"ξανασυμβεί ποτέ"
-
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Μη αρκετός χώρος στο δίσκο! Παύση αρχείου: %s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Το κατεβασμένο τμήμα υπ. αρ. %i είναι φθαρμένο στο αρχείο: %s"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Ανακτήθηκε φθαρμένο τεμάχιο %i για το %s -> Σωσμένα bytes: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Εκχωρόντας"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Ανεπαρκής χώρος στο δίσκο"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Σταματημένο"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
 msgstr "Έχει κατεβεί"
 
-#: src/PartFile.cpp:4167
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ΣΦΑΛΜΑ: Αποτυχία ανοίγματος του ημιτελούς αρχείου '%s'"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το αρχείο known.met δεν μπορεί να ανοιχτεί."
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
-"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η λίστα γνωστών αρχείων είναι φθαρμένη, περιέχει άκυρη "
-"επικεφαλίδα."
-
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Σφάλμα εισόδου εξόδου κατά την ανάγνωση του αρχείου known.met: %s"
-
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Σφάλμα κατά το αποθήκευση του αρχείου known.met: %s"
-
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Βρέθηκε %i γνωστό κοινόχρηστο αρχείο"
-msgstr[1] "Βρέθηκαν %i γνωστά κοινόχρηστα αρχεία"
-
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Βρέθηκε %i γνωστό κοινόχρηστο αρχείο και %i άγνωστο"
-msgstr[1] "Βρέθηκαν %i γνωστά κοινόχρηστα αρχεία και %i άγνωστα"
-
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ΣΦΑΛΜΑ: Αποπειράθηκε να μοιραστεί το %s"
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Σχόλια αρχείου"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Αξιολόγηση"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Σχόλιο"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Κανένα σχόλιο"
-
-#: src/CommentDialogLst.cpp:104
-#, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u σχόλιο"
-msgstr[1] "%u σχόλια"
-
-#: src/ServerConnect.cpp:69
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"Αποτυχία σύνδεσης σε όλους τους συσκοτισμένους διακομιστές της λίστας. Θα "
-"γίνει άλλο ένα πέρασμα χωρίς συσκότιση."
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr ""
-"Αποτυχία σύνδεσης σε όλους τους διακομιστές της λίστας. Θα γίνει άλλο ένα "
-"πέρασμα."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "Το δίκτυο eD2k απενεργοποιήθηκε στις επιλογές, δεν γίνεται σύνδεση."
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Επανασύνδεση στον διακομιστή"
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
-"Δεν βρέθηκαν διακομιστές στη λίστα διακομιστών στους οποίους να γίνει σύνδεση"
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Συνδεδεμένο στο %s (%s:%i)"
-
-#: src/ServerConnect.cpp:263
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Σύνδεση παγιώθηκε στο: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
-"Μοιραίο Σφάλμα κατά την προσπάθεια σύνδεσης. Η σύνδεση στο διαδίκτυο πρέπει "
-"να έχει διακοπεί"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Χάθηκε η σύνδεσε στο %s (%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) φαίνεται να είναι νεκρό"
-
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) φαίνεται να είναι γεμάτο."
-
-#: src/ServerConnect.cpp:381
-#, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] ""
-"Αυτόματη σύνδεση στον διακομιστή θα επανεπιχειρηθεί σε %d δεπτερόλεπτο"
-msgstr[1] ""
-"Αυτόματη σύνδεση στον διακομιστή θα επανεπιχειρηθεί σε %d δεπτερόλεπτα"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Η σύνδεση χάθηκε"
 
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Η σύνδεση στο %s (%s:%i) απέτυχε."
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ΣΦΑΛΜΑ: Η υποδοχή κρίθηκε άκυρη κατά τον έλεγχο χρονικού ορίου"
-
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Η απόπειρα σύνδεσης στο %s (%s:%i) ξεπέρασε το χρονικό όριο."
-
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
-"ΣΦΑΛΜΑ: Αποτυχία φορτώματος του αντιγράφου ασφαλείας. Ψάξτε στο http://forum."
-"amule.org για λύσεις ανάκτησης αρχείων .part.met"
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Δεν βρέθηκαν ημιτελή αρχεία"
 
-#: src/DownloadQueue.cpp:171
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Βρέθηκε %u ημιτελές αρχείο"
-msgstr[1] "Βρέθηκαν %u ημιτελή αρχεία"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
-"Το σύστημα αρχείων του προσωρινού καταλόγου δεν μπορεί να διαχειριστεί "
-"μεγάλα αρχεία."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr ""
-"Το σύστημα αρχείων του καταλόγου εισερχομένων δεν μπορεί να διαχειριστεί "
-"μεγάλα αρχεία."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Κατεβάζοντας %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Ήδη προσπαθείτε να κατεβάσετε το αρχείο '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Το αρχείο '%s' υπάρχει ήδη"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Ήδη προσπαθείτε να κατεβάσετε το αρχείο %s"
-
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Δεν γίνεται η μετατροπή του μαγνητικού συνδέσμου σε σύνδεσμο eD2k: %s"
 
-#: src/DownloadQueue.cpp:1307
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Άγνωστο πρωτόκολλο του συνδέσμου: %s"
-
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Άκυρος σύνδεσμος eD2k! ΣΦΑΛΜΑ: %s"
-
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Εκτέλεση <str> και έξοδος."
-
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Άκυρη μορφή διεύθυνσης IP. Χρησιμοποιήστε xxx.xxx.xxx.xxx:xxxx\n"
-
-#: src/TextClient.cpp:309
-msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
-"Αυτή η εντολή χρειάζεται ένα όρισμα. Έγκυρα ορίσματα: 'all', όνομα αρχείου ή "
-"έναν αριθμό.\n"
 
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Επεξεργασία κατά κατακερματιστή:"
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Επεξεργασία κατά όνομα αρχείου:"
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
+#, c-format
+msgid "Successfully updated %s"
 msgstr ""
-"Αυτή η εντολή χρειάζεται ένα όρισμα. Έκτυρα ορίσματα: ένας κατακερματιστής "
-"αρχείου.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "'Ακυρος αριθμός\n"
 
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
-"Δεν είναι έγκυρος κατακερματισμός (το μήκος πρέπει να είναι ακριβώς 32 "
-"χαρακτήρες)\n"
 
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Η διαδικασία ολοκληρώθηκε επιτυχώς."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Η αίτηση απέτυχε με το ακόλουθο σφάλμα: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Το φιλτρο IP για πελάτες είναι %s.\n"
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Αποτυχία κατεβάσματος της λίστας διακομιστών από το %s"
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "Εκτός"
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Αποτυχία κατεβάσματος της λίστας διακομιστών από το %s"
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "Σε λειτουργία"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Το φιλτράρισμα διευθύνσεων για διακομιστές είναι %s.\n"
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Φόρτωση των φίλτρων IP 'ipfilter.dat' και 'ipfilter_static.dat'."
 
-#: src/TextClient.cpp:664
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Το τρέχον επίπεδο IPFilter είναι %d.\n"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr ""
+"Αποτυχία φόρτωσης του αρχείου ipfilter.dat '%s', εκδηλώθηκε άγνωστο σφάλμα."
 
-#: src/TextClient.cpp:671
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Ευρυζωνικά όρια: Πάνω: %u kB/s, Κάτω: %u kB/s.\n"
-
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr ""
+"Αποτυχία φόρτωσης του αρχείου ipfilter.dat '%s', δεν μπόρεσε να ανοίξει το "
+"αρχείο."
 
-#: src/TextClient.cpp:693
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Συνδεδεμένο στο %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "με Χαμηλή Προτεραιότητα"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "με Υψηλή Προτεραιότητα"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Συνδέεται τώρα"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Συνδεδεμένο τώρα"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Φορτώθηκε διάστημα IP %u από '%s'."
+msgstr[1] "Φορτώθηκαν διαστήματα IP %u από '%s'."
 
-#: src/TextClient.cpp:723
+#: src/IPFilter.cpp:331
 #, c-format
-msgid ""
-"\n"
-"Download:\t%s"
-msgstr ""
-"\n"
-"Κατέβασμα:\t%s"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u παραμορφωμένη γραμμή απορρίφθηκε."
+msgstr[1] "%u παραμορφωμένες γραμμές απορρίφθηκαν."
 
-#: src/TextClient.cpp:726
+#: src/IPFilter.cpp:503
 #, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
-"\n"
-"Ανέβασμα:\t%s"
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
-"\n"
-"Πελάτες σε αναμονή:\t%d\n"
 
-#: src/TextClient.cpp:732
-#, c-format
+#: src/KadDlg.cpp:86
 msgid ""
-"\n"
-"Total sources:\t%d\n"
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"\n"
-"Συνολικές πηγές:\t%d\n"
-
-#: src/TextClient.cpp:809
-#, c-format
-msgid "Number of search results: %i\n"
-msgstr "Αριθμός αποτελεσμάτων αναξήτησης: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - εμφάνιση πρόοδο αναζήτησης"
+"Εκκίνηση από\n"
+"γνωστούς πελάτες"
 
-#: src/TextClient.cpp:828
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Ελήφθη άγνωστη απάντηση από τον διακομιστή, OpCode = %#x."
+msgid "Nodes (%u)"
+msgstr "Κόμβοι (%u)"
 
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Εμφάνιση σύντομων πληροφοριών κατάστασης."
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Άκυρη διεύθυνση ip για εκκινητήρα"
 
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr ""
-"Εμφάνιση κατάστασης σύνδεσης, τρέχουσες ταχύτητες ανεβοκατεβάσματος, κτλ.\n"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Άκυρη θύρα για εκκινητήρα"
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Εμφάνιση πλήρους δέντρου σταστιστικών."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Παρακαλώ συμπληρώστε όλα τα απαιτούμενα πεδία"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
-"Προαιρετικά, ένας αριθμός από 0 ώς 255 μπορεί να δωθεί σαν όρισμα σε αυτήν\n"
-"την εντολή και ο οποίος λέει πόσες καταχωρήσεις των υποδέντρων της έκδοσης "
-"πελάτη θα πρέπει\n"
-"να εμφανίζονται. Το μηδέν ή παράλειψη ερμηνεύεται σαν 'απεριόριστο'.\n"
-"\n"
-"Παράδειγμα: 'statistics 5' θα δείξει μόνο τις 5 πρώτες εκδόσεις του κάθε "
-"τύπου πελάτη.\n"
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Κλείσιμο του aMule."
+"Είστε σίγουροι ότι θέλετε να κατεβάσετε ένα καινούριο αρχείο nodes.dat;\n"
 
-#: src/TextClient.cpp:848
+#: src/KadDlg.cpp:212
 msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Κλείσιμο του απομακρυσμένου πυρήνα (amule/amuled).\n"
-"Αυτό θα κλείσει και τον πελάτη κειμένου, γιατί είναι άχρηστος χωρίς έναν\n"
-"τρέχοντα πυρήνα.\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Επαναφορτώνει το δεδομένο αντικείμενο"
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Επαναφορτώνει τη λίστα κοινοχρήστων αρχείων."
+"Κάτι τέτοιο θα αφαιρέσει του τρέχοντες κόμβους και θα ξαναξεκινήσει την "
+"σύνδεση Kademlia"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Επαναφορτώνει τον πίνακα φίλτρων IP από αρχείο"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Συνέχιση;"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Σύνδεση στο δίκτυο."
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: O κωδικός αναζήτησης είναι πολύ μικρός"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/kademlia/kademlia/SearchManager.cpp:133
+#, c-format
+msgid "Keyword for search: %s"
 msgstr ""
-"Αυτό θα προκαλέσει σύνδεση σε όλα τα δίκτυα που είναι ενεργοποιημένα στις "
-"Προτιμήσεις.\n"
-"Προαιρετικά, μπορείτε να προσδιορίσετε μία διεύθυνση διακομιστή της μορφής "
-"IP:θύρα για σύνδεση\n"
-"μόνο σε αυτόν τον διακομιστή. Η διεύθυνση IP πρέπει να είναι μια διάστικτη "
-"δεκαδική διεύθυνση IPv4\n"
-"ή ένα επιλύσιμο όνομα DNS."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Σύνδεση μόνο στο eD2k."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Σύνδεση μόνο στο Kad."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Αποσύνδεση από το δίκτυο."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Αυτό θα προκαλέσει αποσύνδεση από όλα τα συνδεδεμένα δίκτυα.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Αποσύνδεση μόνο από το eD2k."
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Αποσύνδεση μόνο από το Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Προσθήκη ενός μαγνητικού συνδέσμου ή συνδέσμου eD2k στον πυρήνα."
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: Ο κωδικός αναζήτησης υπάρχει ήδη στη λίστα αναζητήσεων: "
 
-#: src/TextClient.cpp:865
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"Ο καινούριος συνδεσμος eD2k μπορεί να είναι:\n"
-"*) ένας σύνδεσμος αρχείου (ed2k://|file|...), θα προστεθεί στην λίστα "
-"αναμονής κατεβασμάτων,\n"
-"*) ένας σύνδεσμος διακομιστή (ed2k://|server|...), θα προστεθεί στην λίστα "
-"διακομιστών,\n"
-"*) ένας σύνδεσμος σε λίστα διακομιστών, στην οποία περίπτωση όλοι οι "
-"διακομιστές τις λίστας θα προστεθούν\n"
-"    στη λίστα διακομιστών.\n"
-"\n"
-"Ο μαγνητικός σύνδεσμος πρέπει να περιέχει τον κατακερματισμό \n"
-" και το μέγεθος αρχείου.\n"
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Θέτει την τιμή μίας προτίμησης."
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
+#, c-format
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Ανάγνωση %u επαφής Kad"
+msgstr[1] "Ανάγνωση %u επαφών Kad"
 
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Θέτει τις προτιμήσεις του φίλτρου IP."
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
+msgstr ""
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Άνοιγμα του φίλτρου IP τόσο για πελάτες όσο και για διακομιστές."
+#: src/kademlia/routing/RoutingZone.cpp:307
+#, c-format
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+"Μόνο %d γνωριμία Kad είναι διαθέσιμο. το αρχείο nodes.dat δεν γράφτηκε"
+msgstr[1] ""
+"Μόνο %d γνωριμίες Kad είναι διαθέσιμες. το αρχείο nodes.dat δεν γράφτηκε"
 
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Κλείσιμο του φίλτρου IP τόσο για πελάτες όσο και για διακομιστές."
+#: src/kademlia/routing/RoutingZone.cpp:338
+#, c-format
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Γράψιμο %d επαφής Kad"
+msgstr[1] "Γράψιμο %d επαφών Kad"
 
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Ενεργοποίηση/Απενεργοποίηση του φίλτρου IP για πελάτες."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Όνομα αρχείου"
 
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Άνοιγμα του φίλτρου IP τόσο για πελάτες."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Μέγεθος αρχείου"
 
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Κλείσιμο του φίλτρου IP τόσο για πελάτες."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Λόγος μοιράσματος"
 
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Ενεργοποίηση/Απενεργοποίηση του φίλτρου IP για διακομιστές."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Ανέβηκε"
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Άνοιγμα του φιλτραρίσματος IP για τους διακομιστές."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Ζητήθηκε:"
 
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Κλείσιμο του φιλτραρίσματος IP για τους διακομιστές."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Έγινε δεκτό"
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Επιλογή επιπέδου φιλτραρίσματος IP."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Ολοκλήρωση πηγών"
 
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Έγκυρα επίπερα φιλτραρίσματος είναι στο διάστημα 0-255, και η προεπιλεγμένη "
-"(αρχική)\n"
-"τιμή είναι 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Ρύθμιση ορίων εύρους ζώνης."
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: η λίστα των γνωστών αρχείων είναι φθαρμένη, περιέχει άκυρη "
+"επικεφαλίδα."
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"Η τιμή που δίνεται σε αυτές τις εντολές πρέπει να είναι σε kilobytes/"
-"δεπτερόλεπτο.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Θέσε το όριο εύρους ζώνης για ανέβασμα."
-
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Θέσε το όριο εύρους ζώνης για κατέβασμα."
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Λήψη και εμφάνιση της τιμής μίας προτίμησης."
-
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Λήψη προτιμήσεων φίλτρου IP."
-
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Λήψη κατάστασης φίλτρου IP για πελάτες και διακομιστές."
-
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Λήψη κατάστασης φίλτρου IP μόνο για πελάτες."
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Λήψη κατάστασης φίλτρου IP μόνο για διακομιστές."
-
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Λήψη επιπέδου φίλτρου IP."
-
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Λήψη τον ορίων εύρους ζώνης."
-
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Εκτελεί μία αναζήτηση."
-
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Ο τύπος της αναζήτησης πρέπει να δωθεί μέσω των εξής επιλογών:\n"
-"    ΚΑΘΟΛΙΚΗ\n"
-"    ΤΟΠΙΚΗ\n"
-"    KAD\n"
-"Για παράδειγμα: 'search kad αρχειάκι' θα εκτελέσει μία αναζήτηση Kad για το "
-"αρχείο \"αρχειάκι\".\n"
-
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Εκτελεί συνολική αναζήτηση."
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Εκτελεί τοπική αναζήτηση"
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Άγνωστη έκδοση"
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Εκτελεί αναζήση στο Kad"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Κατάλογος για τα εισερχόμενα"
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Δείχνει τα αποτελέσματα της τελευταίας αναζήτησης."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Κατακερματισμός"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Επιστρέφει τα αποτελέσματα της προηγούμενης αναζήτησης.\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Ολοκληρώνεται"
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Δείχνει την πρόοδο της αναζήτησης."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Ολοκληρωμένο"
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Shows the progress of a search.\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Σταματημένο"
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Ξεκινά να κατεβάζει ένα αρχείο"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Εσφαλμένο"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Πρέπει να δωθεί αριθμός του αρχείου από την τελευταί αναζήτηση.\n"
-" Για παράδειγμα \"download 12\" θα ξεκινήσει να κατεβάζει το αρχείο υπ' "
-"αριθμό 12 της προηγούμενης αναζήτησης.\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Εν αναμονή"
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Παύση κατεβάσματος."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Πρέπει να προσδιορίσετε ένα μη κενό κωδικό."
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Συνέχιση κατεβάσματος."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Άκυρο κωδικό, δεν είναι κατακερματισμός τύπου MD5!"
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Ακύρωση κατεβάσματος."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Αποτυχία σύνδεσης"
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Θέσε την προτεραιότητα κατεβάσματος."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "Η εξωτερική σύνδεση απέτυχε. Κενή ανταπόκριση."
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
-"Θέστε την προτεραιότητα κατεβάσματος σε χαμηλή, κανονική ηψηλη ή αυτόματη.\n"
-
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Θέστε χαμηλή προτεραιότητα."
+"Εξωτερική Σύνδεση: Κακή ανταπόκριση από τον διακομιστή. Η σύνδεση "
+"τερματίστηκε."
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Θέστε κανονική προτεραιότητα."
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Επιτυχία! Έγινε σύνδεση με το aMule"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Θέστε υψηλή προτεραιότητα."
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Επιτυχία! Έγινε σύνδεση"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Θέστε αυτόματη προτεραιότητα."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Εξωτερική Σύνδεση: Η πρόσβαση απορρίφθηκε επειδή"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Δείξε τις ουρές/λίστες."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "Εξωτερική σύνδεση: Η πρόσβαση απορρίφθηκε"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
-"Δείχνει την ουρά ανεβάσματος/κατεβάσματος, τη λίστα διακομιστών ή "
-"κοινόχρηστών αρχείων.\n"
-
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Δείξε την ουρά ανεβάσματος."
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Δείξε την ουρά κατεβάσματος."
-
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Δείξε τον αρχείο καταγραφής."
-
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Δείξε τη λίστα των διακομιστών."
-
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Επαναφορά αρχείου καταγραφής."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "ΣΦΑΛΜΑ: Δεν μπορώ να ακούσω την θύρα TCP."
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Δεν σύνισταται αυτή η εντολή, αντ' αυτής χρησιμοποιήστε την '%s'."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "ΣΦΑΛΜΑ:"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Αυτή είναι μη συνιστώμενη εντολή και μπορεί να αφαιρεθεί στο μέλλον. \n"
-"Χρησιμοποιήστε '%s' καλύτερα.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ:"
 
-#: src/ServerSocket.cpp:259
-#, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ΣΦΑΛΜΑ: %s (%s) - %s"
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Κλείσιμο"
 
-#: src/ServerSocket.cpp:274
-#, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %s (%s) - %s"
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Αποκοπή"
 
-#: src/ServerSocket.cpp:417
-#, c-format
-msgid "New clientid is %u"
-msgstr "Ο νέος πελάτης είναι %u"
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Αντιγραφή"
 
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: σας έχει αποδωθεί Low-ID!"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Επικόλληση"
 
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr ""
-"\tΠιθανότατα αυτό είναι γιατί είστε πίσω από τοίχο προστασίας ή δρομολογητή."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Καθαρισμός"
 
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr ""
-"\tΓια περισσότερες πληροφορίες, παρακαλώ αναφερθειτε στο http://wiki.amule."
-"org"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Επιλογή όλων"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Ελήφθησαν άγνωστες πληροφορίες διακομιστή! - υπερβολικά σύντομες"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/ServerSocket.cpp:539
-#, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Ελήφη %d καινούριος διακομιστής"
-msgstr[1] "Ελήφησαν %d καινούριοι διακομιστές"
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Απεριόριστο"
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Το αποθήκευση τις λίστας διακομιστών ολοκληρώθηκε."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Μενού για το Tray του aMule"
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Ο διακομιστής απέρριψε την τελευταία εντολή"
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Όρια ταχύτητας:"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Κάλπικο πακέτο ελήφθει από τον διακομιστή: %s"
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "Όριο Ανεβάσματος: Κανένα"
 
-#: src/ServerSocket.cpp:607
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr ""
-"Αδιαχείριστο σφάλμα κατά την επεξεργασία πακέτου από τον διακομιστή: %s"
+msgid "UL: %u"
+msgstr "Όριο Ανεβάσματος: %u"
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Δεν μπορεί να δημιουργηθεί νήμα επίλυσης DNS για τη σύνδεση στο %s"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "Όριο Κατεβάσματος: Κανένα"
 
-#: src/ServerSocket.cpp:729
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr ""
-"Η διεύθυνση IP %s (%s) του διακομιστή είναι φιλτραρισμένη. Δεν γίνεται "
-"σύνδεση."
-
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "χρήση πρωτοκόλλου συσκότησης."
+msgid "DL: %u"
+msgstr "Όριο Κατεβάσματος: %u"
 
-#: src/ServerSocket.cpp:748
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Σύνδεση σε %s (%s - %s:%i) %s"
+msgid "Download speed: %.1f"
+msgstr "Ταχύτητα κατεβάσματος: %.1f"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr ""
-"Δεν μπόρεσε να γίνει επίλυση dns για τον διακομιστή %s: Δεν είναι δυνατή ή "
-"σύνδεση!"
+msgid "Upload speed: %.1f"
+msgstr "Ταχύτητα ανεβάσματος: %.1f"
 
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Αποτυχία φορτώματος δεδομένων χώρας από"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Πληροφορίες πελάτη"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Φορτώθηκε %d ψηφιογραφημένο γραφικό σημαίας"
-msgstr[1] "Φορτώθηκαν %d ψηφιογραφημένα γραφικά σημαιών"
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Είστε σίγουροι ότι θέλετε να ακυρώσετε και να σβήσετε όλα τα αρχεία σε αυτήν "
-"την κατηγορία;"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Χρειάζεται επιβεβαίωση"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Όλα τα άλλα"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Ημιτελές"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Ενεργό"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Βίντεο"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Ήχος"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Αρχείο"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Είδωλα CD"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Φωτογραφίες"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Κείμενο "
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Επιλογή φίλτρου εμφάνισης"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Προσθήκη κατηγορίας"
+msgid "Nickname: %s"
+msgstr "Παρατσούκλι: %s"
 
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Επεξεργασία κατηγορίας"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Δεν επιλέχτηκε παρατσούκλι!"
 
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Διαγραφή κατηγορίας"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "Ταυτότητα πελάτη:"
 
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Όνομα αρχείου"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Συνδεδεμένο τώρα"
 
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Μέγεθος αρχείου"
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Όνομα διακομιστή:"
 
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Λόγος μοιράσματος"
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "Διεύθυνση διακομιστή:"
 
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Ανέβηκε"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Δεν είναι συνδεδεμένο"
 
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Ζητήθηκε:"
+#: src/MuleTrayIcon.cpp:365
+#, c-format
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Έγινε δεκτό"
+#: src/MuleTrayIcon.cpp:374
+#, c-format
+msgid "TCP port: %d"
+msgstr "Θύρα TCP: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Ολοκλήρωση πηγών"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "Θύρα TCP: Δεν είναι έτοιμη"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Εισαγωγή %s: %s"
+msgid "UDP port: %d"
+msgstr "Θύρα UDP: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Ανάγνωση του προσωρινού καταλόγου"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "Θύρα UDP: Δεν είναι έτοιμη"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr ""
-"Ανάκτηση στοιχειωδών πληροφοριών από το αρχείο πληροφοριών κατεβάσματος"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Συνδεδεμένη Υπογραφή: Ενεργοποιημένη"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Δημιουργία αρχείου προορισμού"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Συνδεδεμένη Υπογραφή: Απενεργοποιημένη"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Φόρτωση δεδομένων από το παλίο αρχείο κατεβάσματος (%u από %u)"
+msgid "Uptime: %s"
+msgstr "Χρόνος λειτουργίας: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr ""
-"Αποθήκευση του τεμαχίου δεδομένων σε ένα καινούριο μοναδικό αρχείο "
-"κατεβάσματος (%u από %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Διαδικασία ανάκτησης πηγαίων πληροφοριών αρχείου κατεβασμάτων"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Προσθήκη κατεβάσματος και αποθήκευση του καινούριου ημιτελούς αρχείου"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Εισαγωγή ημιτελών αρχείων"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Κατασταση"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Αρχείο κατακερματισμού"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Αναμονή..."
+msgid "Shared files: %d"
+msgstr "Κοινόχρηστα αρχεία: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Δίσκος: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Παρακαλώ διαλέξτε έναν κατάλογο για αναζήτηση προσωρινών κατεβάσματων! (θα "
-"συμπεριληφθούν και οι υποκατάλογοι)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"Θέλετε να σβηστούν τα πηγαία αρχεία των επιτυχών εισαγόμενων κατεβασμάτων;"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Αφαίρεση πηγών;"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/δεπτερόλεπτο"
-msgstr[1] "bytes/δεπτερόλεπτο"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "δεπτερόλεπτα"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "λεπτά"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "ώρες"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Μέρες"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Βίντεο"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Αρχεία"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Κείμενα"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Προγράμματα"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Οτιδήποτε"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Μη αποτιμημένο"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Άκυρο / Φθαρμένο / Πλαστό"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Φτωχή"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Ανεκτή"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Καλή"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Εξαιρετική"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "όλα"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "όλα τα άλλα"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Φόρτωση των φίλτρων IP 'ipfilter.dat' και 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Πελάτες στην αναμονή: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr ""
-"Αποτυχία φόρτωσης του αρχείου ipfilter.dat '%s', εκδηλώθηκε άγνωστο σφάλμα."
+msgid "Total DL: %s"
+msgstr "Συνολικό Κατέβασμα: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Αποτυχία φόρτωσης του αρχείου ipfilter.dat '%s', δεν μπόρεσε να ανοίξει το "
-"αρχείο."
+msgid "Total UL: %s"
+msgstr "Συνολικό Ανέβασμα: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Φορτώθηκε διάστημα IP %u από '%s'."
-msgstr[1] "Φορτώθηκαν διάστηματα IP %u από '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Όριο ανεβάσματος"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u παραμορφωμένη γραμμή απορρίφθηκε."
-msgstr[1] "%u παραμορφωμένες γραμμές απορρίφθηκαν."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Όριο κατεβάσματος"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Ενεργές συνδέσεις (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Κρύψιμο aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Λεπτομέρειες αρχείου"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Εμφάνιση aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% ολοκληρώθηκαν"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Έξοδος"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "Σύνδεσμος eD2k:"
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Εκτέλεση"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Πατήστε εδώ για να προσθέσετε τον σύνδεσμο eD2k στον διαχειριστή κειμένου "
 "της λίστας αναμονής κατεβασμάτων."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr ""
-"Τα γεγονότα εμφανίζονται εδώ. Για μια πλήρη λιστα γεγονότων, αναφερθείται "
-"στο αρχείο καταγραφής στην καρτέλα διακομιστών. "
+"Τα γεγονότα εμφανίζονται εδώ. Για μια πλήρη λίστα γεγονότων, αναφερθείτε στο "
+"αρχείο καταγραφής στην καρτέλα διακομιστών. "
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Φόρτωμα σε εξέλιξη ..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Αριθμός χρηστών στον διακομιστή στον οποίο είστε συνδεδεμένος ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Χρήστες: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4665,6 +2750,10 @@
 "αριθμού χρηστών."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Πάνω: 0.0 | Κάτω: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4672,7 +2761,7 @@
 "Τρέχωντες μέσοι ρυθμοί ανεβάσματος και κατεβάσματος. Όταν ενεργοποιηθεί, οι "
 "αριθμοί σε αγκύλες δείχνουν την επιβάρυνση λόγω της επικοινωνίας των πελατών."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4681,526 +2770,583 @@
 msgstr ""
 "Εμφανίζει το καθεστώς σύνδεσης καθώς και τις ενεργές μεταφορές. Τα κόκκινα "
 "βέλη δείχνουν ότι είστε συνδεδεμένοι, τα κίτρινα ότι έχετε χαμηλή ποιότητα "
-"(LowID, firewalled) και τα πράσσινα ότι έχετε υψηλή ποιότητα (HighID, ο "
+"(LowID, firewalled) και τα πράσινα ότι έχετε υψηλή ποιότητα (HighID, ο "
 "ιδανικός τύπος σύνδεσης)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Δεν είναι συνδεδεμένο ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Διακομιστές συνδεδεμένοι αυτή τη στιγμή."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Τύπος"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Τοπικό"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Καθολικό"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Τεμάχιο Αρχείου"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Εκτεταμένες παράμετροι"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Διήθηση"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Τύπος αρχείου"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Οτιδήποτε"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Αρχεία"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Ήχος"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Είδωλα CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Φωτογραφίες"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Προγράμματα"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Κείμενα"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Βίντεο"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Κατάληξη"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
-msgstr "Ελάχισμο μέγεθος"
+msgstr "Ελάχιστο μέγεθος"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Μέγιστο αρχείο"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Διαθεσιμότητα"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Φίλτρο:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Αποτελέσματα φιλτραρίσματος"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Αντιστροφή αποτελεσμάτων"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Απόκρυψη γνωστών τύπων"
 
-#: src/muuli_wdr.cpp:355
-msgid "More"
-msgstr "Περισσότορα"
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Εκκίνηση"
 
 #: src/muuli_wdr.cpp:356
+msgid "More"
+msgstr "Περισσότερα"
+
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 "Αναζητεί περισσότερα αποτελέσματα στο eD2k. Δεν υποστηρίζεται ακόμα από το "
 "Kad."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Σταμάτημα"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Κατέβασμα"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Επαναφορά πεδίων"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Αποτελέσματα"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
-msgstr "Καθαρίσμα των ολοκληρωμένων κατεβασμάτων"
+msgstr "Καθάρισμα των ολοκληρωμένων κατεβασμάτων"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Δείχνει το ανέβασμα / ουρά ανεβάσματος"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Πελάτες στην ουρά"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Αποστολή"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Αποστολή του προσδιορισμένου μυνήματος."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Κλείσιμο"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Ολοκλήρωση πηγών"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Κλείσιμο της συνομιλίας."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Γενικά"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Πλήρες Όνομα :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "Δεν υπάρχει"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "Αρχείο met:"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
-msgstr "Κατακερματιμός :"
+msgstr "Κατακερματισμός :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Μέγεθος αρχείου :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Κατάσταση ημιτελούς αρχείου:"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
-msgstr "Τελευταία φορά που εθεάθει ολόκληρο :"
+msgstr "Τελευταία φορά που εμφανίστηκε ολόκληρο :"
+
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Μεταφορά"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Βρέθηκαν πηγές :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
-msgstr "Μεταφέροντας τις Πηγές :"
+msgstr "Ενεργές πηγές :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
-msgstr "Απαρίθμηση-Τμημάτων αρχείου:"
+msgstr "Απαρίθμηση τμημάτων αρχείου:"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
-msgstr "Διαθέσιμο :"
+msgstr "Διαθέσιμα:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
-msgstr "Ρυθμός Ροής Δεδομένων :"
+msgstr "Ρυθμός ροής δεδομένων :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Ενεργός χρόνος κατεβάσματος:"
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
-msgstr "Έχουν μεταφερθέι :"
+msgstr "Μεταφέρθηκαν :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
-msgstr "Ολοκληρωμένο μέγεθος :"
+msgstr "Ολοκληρωμένος όγκος :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
-msgstr "Έξυπνη διαχείριση φθοράς :"
+msgstr "Έξυπνη διαχείριση φθοράς (Ε.Δ.Φ.):"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Χάθηκε λόγο φθοράς :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Κέρδος σε μέγεθος λόγω συμπίεσης :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
-msgstr "Πακέτα που σώθηκαν από το I.C.H. :"
+msgstr "Πακέτα που σώθηκαν από την Ε.Δ.Φ. :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Ονόματα αρχείων"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Ανάληψη ελέγχου"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Καθάρισμα"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Εφαρμογή"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Εντάξει"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 "Αρχείο σχολίων/Αξιολόγησης (το κείμενο θα είναι ορατό σε όλους του χρήστες)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Για μια ταινία μπορείτε να πείτε τη διάρκεια, το σενάριο, τη γλώσα ...\n"
-"και αν είναι πλαστό, μπορείτε να το πείτε στούς άλλους χρήστες του aMule."
+"Για ταινίες μπορείτε να πείτε το μέγεθος, το σενάριο, τη γλωσσα ...\\n\\nκαι "
+"αν είναι ψεύτικη, μπορείτε να το πείτε στους άλλους χρήστες του aMule."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Ποιότητα αρχείου"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Μη αποτιμημένο"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Άκυρο / Φθαρμένο / Πλαστό"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Φτωχή"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Ανεκτή"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Καλή"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Εξαιρετική"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Βαθμολογήστε την αξία του αρχείου ή ενημερώστε τους χρήστες αν το αρχείο "
 "είναι έγκυρο ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Κατεβαίνει, παρακαλώ περιμένετε ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Άγνωστο μέγεθος"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Απαιτούμενες πληροφορίες"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "Διεύθυνση IP :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Θύρα :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Πρόσθετες πληροφορίες"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Όνομα χρήστη :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Τεμάχιο χρήστη :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Επαναφόρτωση των κοινόχρηστων αρχείων"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Τρέχουσα περίοδος"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Σύνολο"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Ζητήθηκε :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Ενεργά ανεβάσματα :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Προσθήκη"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Ταχύτητα κατεβάσματος"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Τρέχων"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Μέσο τρεξίματος"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Μέσο περιόδου"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Ταχύτητα ανεβάσματος"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Συνδέσεις"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Ενεργά κατεβάσματα"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Ενεργές συνδέσεις (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Ενεργά ανεβάσματα"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Δέντρο στατιστικών"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Όνομα χρήστη:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Τεμάχιο χρήστη:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Λογισμικό πελάτη:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Αριθμός έκδοσης πελάτη:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
-msgstr "διεύθυνση IP:"
+msgstr "Διεύθυνση IP:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "Αριθμός Χρήστη:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "Διεύθυνση διακομιστή:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Όνομα διακομιστή:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Συσκότιση:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Μεταφορές προς τον πελάτη"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Τρέχουσα αίτηση:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Μέσος ρυθμός ανεβάσματος:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Μέσος ρυθμός κατεβάσματος:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
-msgstr "Ανέβηκαν μέσα στην περίδο:"
+msgstr "Ανέβηκαν (συνεδρία):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
-msgstr "Κατέβηκαν μέσα στην περίδο:"
+msgstr "Κατέβηκαν (συνεδρία):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
-msgstr "Ανέβηκαν συνολικά:"
+msgstr "Ανέβηκαν (συνολικά):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
-msgstr "Κατέβηκαν συνολικά:"
+msgstr "Κατέβηκαν (συνολικά):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
-msgstr "Σκόρ"
+msgstr "Σκορ"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Τροποποιητής Ανεβοκατεβάσματος:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Ασφαλής ταυτότητα:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Αξιολόηση (σύνολο):"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "Εν αναμονή"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Βαθμολογία αναμονής:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Παρατσούκλι"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - Το μουλάρι του Λίνουξ"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - το μουλάρι όλων των πλατφόρμων"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
-"Αυτ΄έιναι το όνομα που οι άλλοι χρήστες θα βλέπουν όταν είναι συνδεδεμένοι "
+"Αυτό είναι το όνομα που οι άλλοι χρήστες θα βλέπουν όταν είναι συνδεδεμένοι "
 "με εσάς."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Γλώσσα"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Γλώσσα:"
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
-msgstr "Αυτό ορίζει την γλώσα που χρησιμοποιείται στο γραφικό περιβάλλον."
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Ο χρόνος πριν εμφανιστεί το επεξηγηματικό κείμενο."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Διάφορες επιλογές"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
+msgstr "Αυτό ορίζει την γλώσσα που χρησιμοποιείται στο γραφικό περιβάλλον."
 
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Έλεγχος για νέα έκδοση κατά την εκκίνηση"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Αν ενεργοποιηθεί, το aMule θα ελέγχει αν υπάρχει νέα έκδοση κατά την εκκίνηση"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
-msgstr "Ξεκίνα ελαχιστοποιημένο"
+msgstr "Εκκίνηση σαν ελαχιστοποιημένο"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Αν ενεργοποιηθεί, το aMule θα ξεκινήσει ελαχιστοποιημένο."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
-msgstr "Προτροπή κατά την έξοδο"
+msgstr "Επιβεβαίωση κατά την έξοδο"
+
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "Κάνει το aMule να επιβεβαιώνει πριν την έξοδο."
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Κάνει το aMule ζητά άδεια πριν κλείσει."
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Ενεργοποιεί την εικόνα της μπάρας"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
-msgstr "Αυτό ενεργοποιεί/απενεργοποιεί την είκόνα της μπάρας του συστήματος."
+msgstr "Αυτό ενεργοποιεί/απενεργοποιεί την εικόνα της μπάρας του συστήματος."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Ελαχιστοποίηση στην μπάρα"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5208,588 +3354,471 @@
 "Αν ενεργοποιηθεί το aMule θα ελαχιστοποιηθεί στην μπάρα του συστήματος αντί "
 "για την μπάρα εφαρμογών"
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Χρόνος καθυστέρησης επεξηγήσεων σε δεπτερόλεπτα"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Χρόνος καθυστέρησης επεξηγήσεων:"
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Ο χρόνος πριν εμφανιστεί το επεξηγηματικό κείμενο."
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "δεπτερόλεπτα"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
-msgstr "Επιλογή φυλλομετρητή ιστοσελίδων"
-
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Προεπιλογή συστήματος"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Εδώ επιλέγετε τον φυλλομετρητή ιστοσελίδων σας"
+msgstr "Επιλογή περιηγητή ιστοσελίδων"
 
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Προσωπικός φυλλομετρητής ιστοσελίδων"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Γράψτε το όνομα του φυλλομετρητή ιστοσελίδων σας εδώ. Για χρήση του "
-"προσωπικού φυλλομετρητή ιστοσελίδων, επιλέξτε το \"Προσωπικό\" στοιχείο του "
-"μενού από την παραπάνω λίστα."
+"Εισάγετε το όνομα το περιηγητή ιστολελίδων. Αφήστε αυτό το πεδίο κενό για "
+"τον προεπιλεγμένο περιηγητή."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Επιλογή"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
-msgstr "Αν είναι δυνατόν, άνοιξε το σε καινούρια καρτέλα"
+msgstr "Αν είναι δυνατόν, άνοιξε τη σελίδα σε καινούρια καρτέλα"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Άνοιξε την ιστοσελίδα σε καινούρια καρτέλα αντί σε καινούριο παράθυρο αν "
 "αυτό είναι εφικτό"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Πρόγραμμα προβολής βίντεο"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Δημιουργία αντιγράφου ασφαλείας"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Ευρυζωνικά όρια"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Ανέβασμα"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Ανάθεση θυρίδας"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Πρότυπη θύρα πελάτη TCP:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Θύρες"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Πρότυπη θύρα TCP"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Αυτή είναι η βασική θύρα eD2k και δεν μπορεί να απενεργοποιηθεί."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Εκτεταμένη θύρα πελάτη UDP:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "Θύρα UDP για αιτήσεις εξυπηρετητή (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Εκτεταμένη θύρα UDP (Kad / καθολική αναζήτηση)"
+
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
-"Αυτή η θύρα UDP χρησιμοποιείται για εκτεταμένες αιστήσεις στα δίκτυα ed2k "
-"και Kad"
+"Αυτή η θύρα UDP χρησιμοποιήται για εκτεταμένες αιτήσεις eD2k και για το "
+"δίκτυο Kad"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "απενεργοποίηση"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Ενεργοποίηση UPnP για προώθηση της θύρας του δρομολογητή"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Προσδεδεμένη διεύθυνση"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Θύρα UDP για εκτεταμένες αιτήσεις στο διακομιστή (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Μέγιστος αριθμός πηγών ανά αρχείο"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "Θύρα UPnP TCP (Προαιρετική):"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Σκληρό όριο"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Συνέδεσε την τοπική διεύθυνση στην διεύθυνση (κενό για όλες):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Όρια σύνδεσης"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Μέγιστες συνδέσεις"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Μόνο για προχωρημένους χρήστες: Αν έχετε πολλαπλά δικτυακά περιβάλλοντα, "
+"εισάγετε την διεύθυνση του περιβάλλοντος με το οποίο το aMule πρέπει να "
+"συνδεθεί."
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Μέγιστος αριθμός πηγών ανά εισερχόμενο αρχείο:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Μέγιστος αριθμός παράλληλων συνδέσεων:"
+
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Ενεργοποίηση UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Θύρα UPnP TCP:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Αυτόματη σύνδεση κατά την εκκίνηση"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Επανασύνδεση σε περίπτωση διακοπής"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Εμφάνιση επιβάρυνσης στο εύρος ζώνης"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Επιλογές διακομιστή"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Αφαίρεση του νεκρού διακομιστή ύστερα από"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "προσπάθειες"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Αυτόματη ενημέρωση λίστας διακομιστών κατά την εκκίνηση"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Λίστα"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Ενημέρωση της λίστας διακομιστών κατά τη σύνδεση σε διακομιστή"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
-msgstr "Ενημέρωση της λίστας διακομιστών όταν συνδέεται πελάτης"
+msgstr "Ενημέρωση της λίστας διακομιστών κατά τη σύνδεση σε πελάτη"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Χρήση συστήματος προτεραιότητα"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Χρήση έξυπνου ελέγχου LowID κατά τη σύνδεση"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Ασφαλής σύνδεση"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
-msgstr "Αυτόματη σύνδεση μόνο στους διακομιστές της στατικής λίστας"
+msgstr "Αυτόματη σύνδεση μόνο με τους διακομιστές της στατικής λίστας"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
-msgstr ""
-"Θέσε τους διακομιστές που προστέθηκαν με το χέρι σε υψηλή προτεραιότητα"
+msgstr "Υψηλή προτεραιότητα στους διακομιστές που προστέθηκαν με το χέρι"
+
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Έξυπνη διαχείριση φθοράς (Ε.Δ.Φ.)"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. Ενεργό"
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Ενεργοποιήση"
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "το AICH εμπιστεύεται κάθε κατακερματισμό (δεν συνιστάται)"
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Προχωρημένη Ε.Δ.Φ. εμπιστεύεται κάθε κατακερματισμό (δεν συνιστάται)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Προσθήκη αρχείων προς κατέβασμα κατά τη διάρκεια παύσης"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Προσθήκη αρχείων προς κατέβασμα με αυτόματη προτεραιότητα"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Προσπάθησε να κατεβάσεις πρώτα τα αρχικά και τελικά κομμάτια"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Προσθήκη νέων κοινόχρηστων αρχείων με αυτόματη προτεραιότητα"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Προσπάθησε να μεταφέρει ολόκληρα κομμάτια σε όλα τα ανεβάσματα"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Ξεκίνα το επόμενο σταματημένο αρχείο όταν ένα αρχείο ολοκληρωθεί"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Εκκίνηση του επόμενου σταματημένου αρχείου όταν ένα αρχείο ολοκληρωθεί"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Από την ίδια κατηγορία"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Αποθήκευση 10 πηγών σε σπάνια αρχεία (<20 πηγές)"
-
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Χώρος στο δίσκο"
-
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Έλεγχος χώρου στο δίσκο"
-
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Επιλέξτε αυρό αν θέλετε το aMule να ελέγξει τον χώρο στον δίσκο σας"
-
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Ελάχιστος χώρος στο δίσκο:"
-
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
-msgstr "Γράψτε εδώ των ελάχιστο επιθυμητό χώρο στον δίσκο."
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2077
+#: src/muuli_wdr.cpp:1811
 msgid "Preallocate disk space for new files"
 msgstr "Δέσμευση χώρου στο δίσκο για καινούρια αρχεία"
 
-#: src/muuli_wdr.cpp:2078
+#: src/muuli_wdr.cpp:1812
 msgid ""
 "For new files preallocates disk space for the whole file, thus reduces "
 "fragmentation"
 msgstr ""
-"Δεσμέυει χώρο στο δίσκο για καινούρια αρχεία και έτσι μειώνει τον "
+"Δεσμεύει χώρο στο δίσκο για καινούρια αρχεία και έτσι μειώνει τον "
 "κατακερματισμό"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Εισερχόμενα"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Προσωρινά"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Κοινόχρηστα"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Σταμάτημα του κατεβάσματος όταν ο ελεύθερος δίσκος φτάσει τα"
+
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Επιλέξτε αυτό αν θέλετε το aMule να ελέγξει τον χώρο στον δίσκο σας"
+
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
+msgstr "Γράψτε εδώ των ελάχιστο επιθυμητό χώρο στον δίσκο."
+
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Αποθήκευση 10 πηγών σε σπάνια αρχεία (<20 πηγές)"
+
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Ανεβασμένα"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Προσθήκη νέων κοινόχρηστων αρχείων με αυτόματη προτεραιότητα"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Κατάλογος για τα εισερχόμενα"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Κατάλογος για τα προσωρινά αρχεία"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Κοινόχρηστα αρχεία"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 "(Δεξί κλικ στην εικόνα του καταλόγου για να γίνουν κοινόχρηστοι οι "
 "υποκατάλογοι)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Κάνε τα κρυφά αρχεία κοινόχρηστα"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
-msgstr "Γράφοι"
+msgstr "Γραφικές Παραστάσεις"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
-msgstr "Χρόνος καθυστέρηση ενημέρωσης : 5 δεπτερόλεπτα"
+msgstr "Χρόνος καθυστέρηση ενημέρωσης : 5 δευτερόλεπτα"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Χρόνος μέσου γραφήματος: 100 λεπτά"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
-msgstr "Κλιματα διαγράμματος συνδέσεων: 100"
+msgstr "Κλίμακα διαγράμματος συνδέσεων: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Επιλογή χρωμάτων για στατιστικές"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Κλιματα του γραφήματος εισερχομένων:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Κλιμακα του γραφήματος εξερχομένων"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Χρώματα:"
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Υπόβαθρο"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Πλέγμα"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Κατέβασμα του τρέχοντος"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Μέσο τρέξιμο κατεβάσματος"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Μέσο συνεδρίας κατεβάσματος"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Ανέβασμα του τρέχοντος"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Μέσο τρέξιμο ανεβάσματος"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Μέσο συνεδρίας ανεβάσματος"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Ενεργές συνδέσεις"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
-msgstr "Είκονα για την μπάρα ταχείας πρόσβασης του Systray"
+msgstr "Εικόνα για την μπάρα ταχείας πρόσβασης του Systray"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Σύνδεσμοι-Kad παρόντες"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Σύνδεσμοι-Kad τρέχοντες"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Σύνδεσμοι-Kad συνεδρία"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Επέλεξε"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Δέντρο"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Αριθμός των εμφανιζόμενων εκδόσεων πελάτη (0=απεριόριστος)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Χωρητικότητες γραμμών"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Σημ.: Αυτές οι τιμές χρημοποιούνται μόνο για στατιστική."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! Προειδοποίηση !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Μην αλλάξετε αυτές τις ρυθμίσεις εκτός και αν ξέρετε τι κάνετε,\n"
-"διαφορετικά μπορείτε εύκολα να κάνετε τη ζωή σας δύσκολη. \n"
-"\n"
-"Το aMule θα τρέχει μια χαρά χωρίς την αλλαγή καμιάς από αυτές\n"
-" τις ρυθμίσεις."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Προχωρημένες επιλογές"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
-msgstr "Μέγιστος αρ. νέων συνδέσεων /5 δεπτερόλεπτα"
+msgstr "Μέγιστος αρ. νέων συνδέσεων /5 δευτερόλεπτα"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Χώρος προσωρινής αποθήκευσης αρχείου: 240000 bytes"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Λίστα αναμονής ανεβάσματος: 5000 πελάτες"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
-msgstr "Διάστημα ανανέωσης της σύνδεσης σε διακομιστή: Απενεργοποιηση"
-
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Πρόοδος αρχείων λίστας κατεβασμάτων"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Εμφάνιση ποσοστού"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Εμφάνιση μπάρας προόδου"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Τύπος μπάρας προόδου"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Επίπεδο"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Στρογγυλό"
+msgstr "Διάστημα ανανέωσης της σύνδεσης σε διακομιστή: Απενεργοποίηση"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Υποστήριξη εξωτερικής εμφάνισης"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Ενεργοποίηση υποστήριξης εξωτερικών εμφανίσεων"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Εξωτερική εμφάνιση:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- δεν υπάρχουν εξωτερικές εμφανίσεις -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Ταξινόμηση στήλης"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
-"Αυτόματη ταξινόμηση των αρχείων στην λίστα αναμονής κατεβάσματος (υψηλή "
-"χρήση υπολογιστικής ισχύος)"
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "Το aMule θα ταξινομήσει τις στήλες τις λίστας κατεβασμάτων αυτόματα."
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Θέμα:"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Ποικίλα φινιρίσματα του γραφικού περιβάλλοντος"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Εμφάνιση γρήγορου διαχειριστή συνδέσμων eD2k"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Εμφάνιση \"Γρήγορου διαχειριστή συνδέσμων eD2k\" σε όλα τα παράθυρα."
 
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Εμφάνιση εκτεταμένων πληροφοριών στην καρτέλα κατηγοριών"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Εμφάνιση των ταχυτήτων μεταφοράς στον τίτλο"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "Εμφάνιση των ταχυτήτων μεταφοράς στον τίτλο"
 
-#: src/muuli_wdr.cpp:2412
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Πριν απο το όνομα της εφαρμογής"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Μετά το όνομα της εφαρμογής"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Εμφάνιση επιβάρυνσης στο εύρος ζώνης"
+
+#: src/muuli_wdr.cpp:2124
 msgid "Vertical toolbar orientation"
 msgstr "Κατακόρυφος προσανατολισμός της γραμμής εντολών"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Εμφάνιση του αριθμού ημιτελούς αρχείου πρίν το όνομα αρχείου"
-
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Παράμετροι διακομιστή ιστού"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Τρέξε τον amuleweb κατά την εκκίνηση"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Θύρα διακομιστή ιστού"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Ενεργοποίηση προώθησης θύρας UPnP στη θύρα διακομιστή ιστού"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Θύρα UPnP TCP διακομιστή ιστού"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Ουρά εισερχομένων αρχείων"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Χρόνος ανανέωσης σελίδας (σε δεπτερόλεπτα)"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Εμφάνιση ποσοστού προόδου"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Ενεργοποίηση συμπίεσης Gzip"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Εμφάνιση μπάρας προόδου"
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Ενεργοποίηση χρήστη μειωμένων δικαιωμάτων"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Επίπεδη"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Κωδικών πλήρων δικαιωμάτων"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Στρογγυλή"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Κωδικός μειωμένων δικαιωμάτων"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Αυτόματη ταξινόμηση αρχείων (υψηλή απαίτηση σε υπολογική ισχύη)"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Πρότυπη σελίδα"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "Το aMule θα ταξινομήσει τις στήλες τις λίστας κατεβασμάτων αυτόματα."
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Παράμετροι εξωτερικών συνδέσεων"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
-msgstr "Να γίνονται αποδεκτές οι εξωτερικώ συνδέσεις"
+msgstr "Να γίνονται αποδεκτές οι εξωτερικές συνδέσεις"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"Διεύθυνση IP του εισακούοντος περιβάλλοντος\n"
-"(κενό για όλα)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "Η διεύθυνση του εισακούοντος περιβάλλοντος:"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5797,123 +3826,177 @@
 "Εισάγετε μία έγκυρη διεύθυνση με φόρμα a.b.c.d για σύνδεση με το περιβάλλον "
 "EC. Άδειο πεδίου ή 0.0.0.0 συμβολίζει όλα τα περιβάλλοντα."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Θύρα TCP"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "Θύρα TCP:"
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Ενεργοποίηση της προώθησης της θύρας UPnP στην θύρα EC"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Κωδικός"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Παράμετροι διακομιστή ιστού"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Έναρξη του εξυπηρετητή ιστού κατά την εκκίνηση"
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Πρότυπη σελίδα"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Κωδικός πλήρων δικαιωμάτων"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Ενεργοποίηση χρήστη μειωμένων δικαιωμάτων"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Κωδικός μειωμένων δικαιωμάτων"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr ""
+"Ενεργοποίηση της προώθησης της θύρας του εξηπηρετητή ιστού στη θύρα UPnP"
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Θύρα UPnP TCP του εξυπηρετητή (Προαιρετική)"
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Χρόνος ανανέωσης σελίδας (σε δευτερόλεπτα)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Ενεργοποίηση συμπίεσης Gzip"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "Εντάξει"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
-msgstr "Κλικ εδώ για εφαρμογή των αλλάγών που έγιναν στις προτιμήσεις."
+msgstr "Κλικ εδώ για εφαρμογή των αλλαγών που έγιναν στις προτιμήσεις."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
-msgstr "Επαναγορά κάθε αλλαγής που έγινε στις προτιμήσεις."
+msgstr "Επαναφορά κάθε αλλαγής που έγινε στις προτιμήσεις."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Τίτλος:"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Σχόλιο:"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Κατάλογος εισερχομένων :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Αλλαγή προτεραιότητας για τα νέα προσδιορισμένα αρχεία :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "Να μην αλλάξει"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Επιλογή χρώματος για τη συγκεκριμένη κατηγορία (τρέχουσα επιλογή) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Εμφάνιση του διακομιστή motd κατά τη σύνδεση ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Πληροφορίες διακομιστή"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Καθαρισμός"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
-msgstr "Πατήστε αυτό το κουμπί για την επαναφορά του αρχείου καταγραφής."
+msgstr "Πατήστε αυτό το κουμπί για το καθάρισμα του αρχείου καταγραφής."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Αρχείο καταγραφείς aMule"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 "Πατήστε αυτό το αρχείο για να ανανεώσετε την λίστα διακομιστών από την "
 "URL ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Λίστα διακομιστών"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
 msgstr ""
-"Βάλτα εδω την url ενός αρχείου server.met και πατήστε το κουμπί στα αριστερά "
+"Εισάγετε την url ενός αρχείου server.met και πατήστε το κουμπί στα αριστερά "
 "για να ανανεώσετε τη λίστα με τους γνωστούς διακομιστές"
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Προσθήκη διακομιστή: Όνομα"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Γράψτε το όνομα του νέου διακομιστή εδώ"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "Διεύθυνση:Θύρα"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Γράψτε την IP του διακομιστή εδώ, σε μορφή x.x.x.x"
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Γράψτε την θύρα του διακομιστή εδώ."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 "Βάλτε τον διακομιστή με το χέρι (γεμίστε πρώτα τα πεδία στα αριστερά) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Αρχείο καταγραφής aMule"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Πληροφορίες διακομιστή"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "Πληροφορίες ED2K"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Πληροφορίες Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 "Πατήστε το κουμπί για να ανανεώσετε την λίστα των κόμβων από την URL ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Κόμβοι (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5921,164 +4004,167 @@
 "Βάλτε εδώ την url ενός αρχείου nodes.dat και πατήστε το κουμπί στα αριστερά "
 "για να ανανεώσετε την λίστα των γνωστών κόμβων."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Στατιστικές κόμβων"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Εκκινητήρας"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Καινούριος κόμβος"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Θύρα:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+#, fuzzy
+msgid "Bootstrap from known clients"
 msgstr ""
 "Εκκίνηση από\n"
 "γνωστούς πελάτες"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Αποσυνδεδεμένο Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "Πληροφορίες eD2k"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Χρήση Ασφαλούς Ταυτοποίησης χρήστη"
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Ενδείκνυται να ενεργοποιήσετε αυτήν την προτίμηση. Δεν θα λάβετε πίστωση αν "
+"το SUI δεν είναι ενεργοποιημένο."
+
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
-msgstr "Ασάφεια πρωτοκόλου"
+msgstr "Συσκότιση πρωτοκόλλου"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
-msgstr "Υποστήρηξη ασάφειας πρωτοκόλου"
+msgstr "Υποστήριξη συσκότισης πρωτοκόλλου"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
 msgstr ""
-"Αυτή η επιλογή ενεργοποίησε την Ασάφεια Πρωτοκόλου και κάνει το aMule να "
-"δέχετε ασαφείς συνδέσεις από άλλους πελάτες"
+"Αυτή η επιλογή ενεργοποίησε την συσκότιση πρωτοκόλλου και κάνει το aMule να "
+"δέχεται συσκοτισμένες συνδέσεις από άλλους πελάτες"
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
-msgstr "Χρήση ασάφειας για εξωτερικές συνδέσεις"
+msgstr "Χρήση συσκότισης για εξωτερικές συνδέσεις"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
 msgstr ""
-"Αυτή η επιλογή κάνει το aMule να χρησιμοποιεί Ασάφεια Πρωτοκόλου όταν "
+"Αυτή η επιλογή κάνει το aMule να χρησιμοποιεί συσκότιση πρωτοκόλλου όταν "
 "συνδέεται σε άλλους πελάτες/διακομιστές."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
-msgstr "Να γίνονται δεκτές μόνο ασαφείς συνδέσεις"
+msgstr "Να γίνονται δεκτές μόνο συσκοτισμένες συνδέσεις"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
 msgstr ""
-"Αυτή η επιλογή κάνει το aMule να δέχετε μόνο ασαφείς συνδέσεις. Θα υπαρχουν "
-"λιγότερες πηγές αλλά όλη η κυκλοφορία θα είναι ασαφής"
+"Αυτή η επιλογή κάνει το aMule να δέχεται μόνο συσκοτισμένες συνδέσεις. Θα "
+"υπάρχουν λιγότερες πηγές αλλά όλη η κυκλοφορία θα είναι συσκοτισμένη"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Παράμετροι αρχείων"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Οι πάντες"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
-msgstr "Κανένα"
+msgstr "Κανείς"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Ποίος μπορεί να δεί τα κοινόχρηστα αρχεία:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Ποίος μπορεί να δεί τα κοινόχρηστα αρχεία μου:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
-"Επιλέξτε ποίος μπορεί να ξητήσει να δει τη λίστα με τα κοινόχρηστα αρχεία "
+"Επιλέξτε ποίος μπορεί να ζητήσει να δει τη λίστα με τα κοινόχρηστα αρχεία "
 "σας."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Φίλτρο IP"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Φιλτράρισμα πελατών"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
-"Ενεργοποίηση φιλτραρίσματων του IP των πελατών όπως ορίζεται στο ~/.aMule/"
-"ipfilter.dat."
+"Ενεργοποίηση φίλτρου του IP των πελατών όπως ορίζεται στο ~/.aMule/ipfilter."
+"dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Φιλτράρισμα διακομιστών"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
-"Ενεργοποίηση φιλτραρίσματων του IP των διακομιστών όπως ορίζεται στο ~/."
-"aMule/ipfilter.dat."
+"Ενεργοποίηση φίλτρου του IP των διακομιστών όπως ορίζεται στο ~/.aMule/"
+"ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
-msgstr "Επαναφώρτωση λίστας"
+msgstr "Επαναφόρτωση λίστας"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 "Επαναφόρτωση για φιλτράρισμα της λίστας των IP από το ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Ανανέωσε τώρα"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Αυτόματη ανανέωση του ipfilter κατά την εκκίνηση"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Επίπεδο φιλτραρίσματος:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Πάντα φίλτραρε τις IP του τοπικού δικτύου"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Παρανοϊκή διαχείριση των αταίριαστων διευθύνσεων IP"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6086,11 +4172,11 @@
 "Απορρίπτει τα πακέτα αν η IP του πελάτη είναι διαφορετική από την IP από την "
 "οποία ελήφθη το πακέτο. Χρήση με προσοχή."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
-msgstr "Χρηση του ipfilter.dat όλου του συστήματος αν αυτό υπάρχει"
+msgstr "Χρήση του ipfilter.dat όλου του συστήματος αν αυτό υπάρχει"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -6098,23 +4184,11 @@
 "Αν δεν βρεθεί τοπικό ipfilter.dat, να γίνει επιτρεπτή η χρήση του αρχείου "
 "ipfilter (φίλτρο διευθύνσεων) όλου του συστήματος."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Χρήση Ασφαλούς Ταυτοποίησης χρήστη"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Ενδείκνυται να ενεργοποιήσετε αυτήν την προτίμηση. Δεν θα λάβετε πίστωση αν "
-"το SUI δεν είναι ενεργοποιημένο."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Ενεργοποίηση συνδεδεμένων υπογραφών"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6122,883 +4196,1364 @@
 "Ενεργοποίηση γραψίματος του αρχείου συστήματος, το οποίο μπορεί να "
 "χρησιμοποιηθεί από εξωτερικές εφαρμογές για τη δημιουργία υπογραφών κτλ."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
-msgstr "Συχνότητα ανανέωσης (δεπτερόλεπτα):"
+msgstr "Συχνότητα ανανέωσης (δευτερόλεπτα):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
-"Αλλαγή της συχνότητας (σε δεπτερόλεπτα) για την ενημέρωση Συνδεδεμένων "
+"Αλλαγή της συχνότητας (σε δευτερόλεπτα) για την ενημέρωση Συνδεδεμένων "
 "υπογραφών."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Κατάλογος Συνδεδεμένων Υπογραφών:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Αποθύκευση του αρχείου συνδεδεμένων υπογραφών σε:"
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "Κλικ εδώ για την επιλογή του καταλόγου που περιέχει τα αρχεία Συνδεδεμένων "
 "Υπογραφών."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Απενεργοποίηση/Ενεργοποίηση"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Φιλτράρισμα εισερχομένων μηνυμάτων (εκτός από την τρέχουσα συνομιλία):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Ρυθμίσεις διήθησης:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
-msgstr "Διήθηση όλων των μυνημάτων"
+msgstr "Διήθηση όλων των μηνυμάτων"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
-msgstr "Διήθηση των μυνημάτων από μη μέλη της λίστας φίλων"
+msgstr "Διήθηση των μηνυμάτων από μέλη εκτός της λίστας φίλων"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
-msgstr "Διήθηση μυνημά από άγνωστους πελάτες"
+msgstr "Διήθηση μηνυμάτων από άγνωστους πελάτες"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
-msgstr "Διήθηση των μυνημάτων που περιέχουν (χρήση ',' ως διαχωριστικού):"
+msgstr "Διήθηση των μηνυμάτων που περιέχουν (χρήση ',' ως διαχωριστικού):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "προσθήκη σε αυτό το σημείο των λέξεων που το aMule πρέπει να φιλτράρει και "
-"μπλοκάρισμα μυνημάτων που το περιέχουν"
+"μπλοκάρισμα μηνυμάτων που το περιέχουν"
+
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Εμφάνιση των ληφθέντων μηνυμάτων στο αρχείο καταγραφής"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Σχόλια"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
-msgstr "Φιλτράρισμα σχολίων που περιέχουν (χρήσιμοποίηση ',' ως διαχωριστή):"
+msgstr "Φιλτράρισμα σχολίων που περιέχουν (χρησιμοποίηση ',' ως διαχωριστή):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Αυτόματη σύνδεση χωρίς μεσολαβητή"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Ενεργοποίηση πιστοποίησης"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Ενεργοποίηση/Απενεργοποίηση πιστοποίησης ονόματος χρήστη/κωδικού"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Όνομα χρήστη:"
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Το όνομα χρήστη για τη σύνδεση με τον μεσολαβητή"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Κωδικός:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Ο κωδικός που χρειάζεται για τη σύνδεση με τον μεσολαβητή"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Ενεργοποίηση διακομιστή μεσολάβησης"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Ενεργοποίηση/Απενεργοποίηση υποστήριξης διακομιστή μεσολάβησης"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Τύπος διαμεσολάβησης"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Ο τύπος του διακομιστή μεσολαβησης στον οποίον συνδέεστε"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
-msgstr "Υπολογιστής διακομιστή μεσολάβησης"
+msgstr "Διεύθυνση διακομιστή μεσολάβησης:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Όνομα του διακομιστή μεσολάβησης"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Θύρα διακομιστή μεσολάβησης:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Η θύρα διακομιστή μεσολάβησης"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Πιστοποίηση"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Ενεργοποίηση πιστοποίησης"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Ενεργοποίηση/Απενεργοποίηση πιστοποίησης όνοματος χρήστη/κωδικού"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Το όνομα χρήστη για τη σύνδεση με τον μεσολαβητή"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Κωδικός:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Ο κωδίκος που χρειάζεται για τη σύνδεση με τον μεσολαβητή"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Αυτόματη σύνδεση με τον διακομιστή χωρίς μεσολάβητή"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Σύνδεση με:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Σύνδεση σε απομακρυσμένο amule"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Όνομα χρήστη"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Απομνημόνευση αυτών των ρυθμίσεων"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Ενεργοποίηση λεπτομερούς καταγραφής για έλεγχο σφαλμάτων"
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Κατηγορίες μηνυμάτων:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Αναμονή..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Προσθήκη εισακτέων"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Επαναπροσπάθεια των επιλεγμένων"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Αφαίρεση των επιλεγμένων"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Τύποι γεγονότων"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr "Τύποι συμβάντων"
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Ενεργά ανεβάσματα :"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Κρύψιμο των κοινόχρηστων αρχείων "
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Επιλογή φίλτρου εμφάνισης"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Ενεργά ανεβάσματα"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Δείξε τους πελάτες"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Επαναφόρτωση λίστας"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Επαναφόρτωση των κοινόχρηστων αρχείων"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Αποστολή"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Αποστολή του προσδιορισμένου μηνύματος."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Κλείσιμο της συνομιλίας."
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Σύνδεση σε κάθε διακομιστή ή/και Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Παράθυρο δικτύων"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Κοινόχρηστα αρχεία"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Παράθυρο αναζητήσεων"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Απενεργοποιημένο [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Παράθυρο μεταφοράς αρχείων"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Παράθυρο κοινόχρηστων αρχείων"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Παράθυρό μυνημάτων"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Παράθυρο στατιστικών διαγραμμάτων"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Παράθυρο ρυθμίσεων"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Καινούρια κατηγορία"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Επιλέξτε έναν κατάλογο για τα εισεργόμενα αρχεία"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Πρέπει να προσδιορίσετε ένα όνομα για την κατηγορία!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/δευτερόλεπτο"
+msgstr[1] "bytes/δευτερόλεπτο"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Πρέπει να προσδιορίσετε μία διαδρομή για την κατηγορία!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"Αποτυχία δημιουργίας καταλόγου εισερχομένων για την κατηγορία. Παρακαλώ "
-"προσδιορίστε μία έγκυρη διαδρομή!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "δευτερόλεπτα"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "λεπτά"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "ώρες"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Μέρες"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "όλα"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "όλα τα άλλα"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Ημιτελές"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Σταματημένο"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Βίντεο"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Αρχείο"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Κείμενο "
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Ενεργό"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Άγνωστη επέκταση  '%s' για την εντολή '%s'.\n"
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr ""
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Άγνωστη εντολή '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Εισαγωγή %s: %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Ανάγνωση του προσωρινού καταλόγου"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
 msgstr ""
-"\n"
-"Αυτή η εντολή δεν μπορεί να έχει όρισμα.\n"
+"Ανάκτηση στοιχειωδών πληροφοριών από το αρχείο πληροφοριών κατεβάσματος"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Δημιουργία αρχείου προορισμού"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Φόρτωση δεδομένων από το παλιό αρχείο κατεβάσματος (%u από %u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
-"\n"
-"Αυτή η εντολή πρέπει να έχει όρισμα.\n"
+"Αποθήκευση του τεμαχίου δεδομένων σε ένα καινούριο μοναδικό αρχείο "
+"κατεβάσματος (%u από %u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Διαδικασία ανάκτησης πηγαίων πληροφοριών αρχείου κατεβασμάτων"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Προσθήκη κατεβάσματος και αποθήκευση του καινούριου ημιτελούς αρχείου"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Εισαγωγή ημιτελών αρχείων"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Κατάσταση"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Αρχείο κατακερματισμού"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Δίσκος: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Αυτή η εντολή είναι ημιτελής, πρέπει να χρησιμοποιήσετε μία από τις παρακάτω "
-"επεκτάσεις.\n"
+"Παρακαλώ διαλέξτε έναν κατάλογο για αναζήτηση προσωρινών κατεβασμάτων! (θα "
+"συμπεριληφθούν και οι υποκατάλογοι)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Διαθέσιμές επεκτάσεις:\n"
+"Θέλετε να σβηστούν τα πηγαία αρχεία των επιτυχών εισαγόμενων κατεβασμάτων;"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Διαθέσιμές εντολές:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Αφαίρεση πηγών;"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "ΣΦΑΛΜΑ: Αποτυχία δημιουργίας ημιτελούς αρχείου"
+
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Όλες οι εντολές δεν διακρίνουν πεζά από κεφαλαία.\n"
-"Γράψτε '%s <command>' για να πάρετε λεπτομερείς πληροφορίες πάνω στην "
-"<εντολή>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Προσπάθεια φόρτωσης του αντιγράφου ασφαλείας του αρχείου met από το %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Κλείσιμο της εφαρμογής."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "ΣΦΑΛΜΑ: Αποτυχία ανοίγματος του αρχείου part.met: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Εμφάνιση βοήθειας."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "ΣΦΑΛΜΑ: το αρχείο έχει μηδενικό μέγεθος: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "ΣΦΑΛΜΑ: άκυρη έκδοση του αρχείου part.met: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Για βοήθεια πάνω σε μία εντολή, γράψτε 'help <εντολή>'.\n"
-"Για την πλήρη λίστα εντολών γράψτε 'help'.\n"
+"Σφάλμα: το %s (%s) είναι φθαρμένο (εσφαλμένη απαρίθμηση ετικέτας), δεν είναι "
+"δυνατή η φόρτωση του αρχείου."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Χρησιμοποιήστε '%s' για την λίστα εντολών\n"
-"\n"
+"ΣΦΑΛΜΑ: %s (%s) είναι φθαρμένο (εσφαλμένη απαρρίθμηση ετικέτας), δεν είναι "
+"δύνατο το φόρτωμα του αρχείου."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Συντακτικό λάθος!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Προσπάθεια ανάκτηση πληροφοριών αρχείου..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"Σφάλμα κατά την επεξεργασία της εντολής - δεν έπρεπε να συμβέι ποτέ! "
-"Παρακαλείστε να αναφέρετε σφάλμα προγράμματος\n"
+"Ανάκτηση αρχείου χωρίς όνομα -  θα γίνει προσπάθεια ανάκτησης ως "
+"RecoveredFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Αυτή η εντολή δεν πρέπει να έχει παραμέτρους."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+"Ανακτήθηκαν όλες οι διαθέσιμες πληροφορίες αρχείου :D - Τώρα προσπαθώ να τις "
+"χρησιμοποιήσω..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Αυτή η εντολή πρέπει να έχει παράμετρο."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Δεν είναι δυνατή η ανάκτηση πληροφοριών αρχείου :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Άκυρο όρισμα."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Αποτυχία ανοίγματος %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Αυτή είναι ημιτελής εντολή."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %s μπορεί να είναι φθαρμένο (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Για περισσότερη βοήθεια, γράψτε '%s'.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "ΣΦΑΛΜΑ κατά το αποθήκευση του ημιτελούς αρχείου: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "ΣΦΑΛΜΑ κατά το αποθήκευση του ημιτελούς αρχείου: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Αυτό είναι %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Δεν μπορεί να βρεθεί το μέγεθος του '%s' - χρήση του αρχείου %s."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Αυτό είναι %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' έχει μηδενικό μέγεθος για κάποιο λόγο - χρήση του αρχείου %s."
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Απέτυχε να σωθεί το αρχείο part.met.seeds για %s"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Σώθηκε %i σπόρος πηγής για το ημιτελές αρχείο: %s (%s) "
+msgstr[1] "Σώθηκαν %i σπόροι πηγής για το ημιτελές αρχείο: %s (%s) "
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Το ημιτελές αρχείο %s (%s) δεν έχει αρχείο σπόρων"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Το ημιτελές αρχείο %s (%s) έχει κενό αρχείο σπόρων"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr ""
+"Σφάλμα κατά την ανάγνωση του αρχείου σπόρου του ημιτελούς αρχείου (%s - %s): "
+"%s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Βρέθηκε φθαρμένο τμήμα (%d) στο %d μέρος αρχείου %s -  FileResultHash |%s| "
+"FileHash |%s|"
+msgstr[1] ""
+"Βρέθηκε φθαρμένο τμήμα (%d) στα %d μέρη αρχείου %s -  FileResultHash |%s| "
+"FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Βρέθηκε ολοκληρωμένο μέρος (%i) στο %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Τελείωσε ο επανακατακερματισμός του %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Απρόσμενο σφάλμα κατά την ολοκλήρωση του %s. Το αρχεί έπαψε"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Ολοκλήρωση του κατεβάσματος: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Σβήσιμο αρχείου: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-" Δημιουργία πελάτη...\n"
+"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Δεν είναι δυνατός ο κατακερματισμός του κατεβασμένου τμήματος "
+"- του σύνολο κατακερματισμού για το '%s' είναι ημιτελές"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Όλα μια χαρά, έξοδος %s...\n"
+"ΣΦΑΛΜΑ: Δεν είναι δυνατός ο κατακερματισμός του κατεβασμένου τμήματος - του "
+"σύνολο κατακερματισμού για το '%s' είναι ημιτελές. Αυτό δεν πρέπει να "
+"ξανασυμβεί ποτέ"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Δεν είναι δυνατη η σύνδεση με κενό κωδικό.\n"
-"Πρέπει να προσδιορίσετε έναν κωδικό είτε στο αρχείο παραμέτρων\n"
-"είτε στην γραμμή εντολών είτε προσδιορίζοντας κάποιο όταν ζητηθεί.\n"
-"Έξοδος...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Δείξε αυτό το αρχείο βοήθειας."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Μη αρκετός χώρος στο δίσκο! Παύση αρχείου: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr ""
-"Υπολογιστής όπου το aMule τρέχει (προεπιλεγμένος: ο τοπικός υπολογίστής)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Το κατεβασμένο τμήμα υπ. αρ. %i είναι φθαρμένο στο αρχείο: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Η Θύρα του aMule για Εξωτερική σύνδεση. (προεπιλεγμένη: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Ανακτήθηκε φθαρμένο τεμάχιο %i για το %s -> Σωσμένα bytes: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Κωδικός εξωτερικής σύνδεσης"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Κατανέμει"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Διάβασε το αρχείο διευθετήσεων"
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Ανεπαρκής χώρος στο δίσκο"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Μην στέλνεις μηνήματα στην stdout."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Έχει κατεβεί"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Να είσαι αναλυτικός - δείξε και να μηνήματα αποσφαλμάτωσης"
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "ΣΦΑΛΜΑ: Αποτυχία ανοίγματος του ημιτελούς αρχείου '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Θέσε τις τοπικές ρυθμίσεις"
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Εργοστασιακές ρυθμίσεις"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Εγγραφή των παραμέτρων της γραμμής εντολών σε αρχείο."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Αλβανικά"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Αραβικά"
+
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "Εσθονικά"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Βάσκικα"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Βουλγάρικα"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Καταλανικά"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Κινέζικα (απλοποιημένα)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Κινέζικα (Παραδοσιακά)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Κροατικά"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Τσέχικα"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Δανέζικα"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Ολλανδικά"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Αγγλικά (Ην. Βασίλειο)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Εσθονικά"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Φιλανδικά"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Γαλλικά"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Γαλικιακά"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Γερμανικά"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Ελληνικά"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Εβραϊκά"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Ουγγαρέζικα"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Ιταλικά"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Ιταλικά (Ελβετίας)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Γιαπωνέζικα"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Κορεάτικα"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Λιθουανικά"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Νορβηγικά"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Πολωνέζικα"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Πορτογαλλικά"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Πορτογαλλικά (Βραζιλίας)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Ρωσικά"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Σλοβένικα"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Ισπανικά"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Σουηδικά"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Τούρκικα"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
 msgstr ""
-"Δημιουργεί ένα αρχείο παραμέτρων βασισμένο στο αρχείο παραμέτρων του aMule."
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Τύπωσε την έκδοση του προγράμματος."
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Γλώσσα"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Φορτώθηκε το αρχείο πιστώσεων, %u πελάτη είναι γνωστός"
-msgstr[1] "Φορτώθηκε το αρχείο πιστώσεων, %u πελάτες είναι γνωστοί"
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] "- Εξέπνευσε η προθεσμία πιστώσεων για %u πελάτη!"
-msgstr[1] "- Εξέπνευσε η προθεσμία πιστώσεων για %u πελάτες!"
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "Δεν είναι διαθέσιμο"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Δεν βρέθηκε το αρχείο 'cryptkey.dat' και γι αυτό το δημιουργώ"
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "Δεν υπάρχουν επιλογές"
 
-#: src/amuled.cpp:594
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp:1766
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
-"ΣΦΑΛΜΑ: ο δαίμονας του aMule δεν μπορεί να χρησιμοποιηθεί όταν οι εξωτερικές "
-"συνδέσεις είναι απενεργοποιημένες. Για να ενεργοποιήσετε τις εξωτερικές "
-"συνδέσεις, χρησιμοποιήστε είτε ένα κανονικό aMule, ξεκινίστε το amuled με "
-"την παράμετρο --ec-config ή θέστε το κλειδί \"AcceptExternalConnections\" "
-"στην τιμή 1 στο αρχείο ~/.aMule/amule.conf"
+"Η θύρα TCP δεν μπορεί να είναι μεγαλύτερη από 65532, διότι η θύρα UDP του "
+"διακομιστή είναι TCP+3"
 
-#: src/amuled.cpp:750
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "ERROR: %s"
-msgstr "ΣΦΑΛΜΑ: %s"
+msgid "Default port will be used (%d)"
+msgstr "Θα χρησιμοποιηθεί η στάνταρ θύρα (%d)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Άρση απαγόρευσης"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Δείξε τα ανεβάσματα"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Δείξε τη λίστα προτεραιότητας"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Δείξε τους πελάτες"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Σύνδεση"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Επιλογή προβολής"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Λογισμικό πελάτη"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Ανέμεινε"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Χρόνος ανεβάσμανος"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Κατέβασμα/Ανέβασμα"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Κατάσταση του μακρυνού πελάτη"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Προτεραιότητα αρχείου"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Κατάλογοι Αρχείων"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Σκορ"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Διακομιστές"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Ερωτήθηκε"
-
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Ειδόθηκε τελευταία φορά"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Εισήχθει στην λίστα προτεραιότητας"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Αρχεία"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Κατάσταση ανεβάσματος"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Ασφάλεια"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Μεταφέρθηκαν προς τα πάνω"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Περιβάλλον"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Κατάσταση κατεβάσματος"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Διακομιστής διαμεσολάβησης"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Μεταφέρθηκαν προς τα κάτω"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Πίνακας ατακερματισμού χρηστών"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Κρυπτογραφημένο"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Φίλτρα"
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Κρύψιμο των κοινόχρηστων αρχείων "
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Τηλεχειρισμός"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Πληροφορίες πελάτη"
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Διασυνδεδεμένη υπογραφή"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Ενεργό"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Προχωρημένες"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Υποστηριζόμενο"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Γεγονότα"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Ανυποστήριχτο"
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Έλεγχος σφαλμάτων προγράμματος"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Απεβεργοποιημένο"
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Μην αλλάξετε αυτές τις ρυθμίσεις εκτός και αν ξέρετε τι κάνετε,\n"
+"διαφορετικά μπορείτε εύκολα να κάνετε τη ζωή σας δύσκολη. \n"
+"\n"
+"Το aMule θα τρέχει μια χαρά χωρίς την αλλαγή καμιάς από αυτές\n"
+" τις ρυθμίσεις."
+
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Δεν ολοκληρώθηκε"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Κακό παιδί"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Ο τύπος του διακομιστή μεσολάβησης στον οποίον συνδέεστε"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Επιβεβαιώθηκε - OK"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Δεν υπάρχει"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"το aMule πρέπει να επανεκινηθεί για να ενεργοποιηθούν αυτές οι αλλαγές: \n"
+"\n"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- Άλλαξε η θύρα TCP.\n"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- Άλλαξε η θύρα UDP.\n"
+
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Η εξωτερική σύνδεση έκλεισε."
+
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Νέα εξωτερική σύνδεση έγινε δεκτή"
+
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Η εξωτερική σύνδεση έκλεισε."
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
-"Το ελάχιστο μέγεθος πρέπει να είναι μικρότερο από το μέγιστο. Το μέγιστο "
-"μέγεθος θα αγνοηθεί."
+"Η λίστα αυτόματης ενημέρωσης διακομιστών είναι κενή.\n"
+"Θα απενεργοποιηθεί η επιλογή: 'Αυτόματη ενημέρωση λίστας διακομιστών κατά "
+"την εκκίνηση' "
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Προειδοποίηση ψαξίματος"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Έχετε ενεργοποιήσει τις εξωτερικές συνδέσεις αλλά δεν έχετε προσδιορίσει "
+"κωδικό.\n"
+"Οι εξωτερικές συνδέσεις δεν μπορούν να ενεργοποιηθούν μέχρι να προσδιοριστεί "
+"ένας έγκυρος κωδικός."
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Απεριόριστο"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Η γλώσσα άλλαξε.\n"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Μενού για το Tray του aMule"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Ο προσωρινός κατάλογος άλλαξε.\n"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Όρια ταχύτητας:"
+#: src/PrefsUnifiedDlg.cpp:652
+#, fuzzy
+msgid "- ED2K network enabled.\n"
+msgstr "Όλα τα δίκτυα είναι απενεργοποιημένα."
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "Όριο Ανεβάσματος: Κανένα"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Και το δίκτυο eD2k και το Kad είναι απενεργοποιημένα.\n"
+"Δεν θα μπορέσετε να συνδεθείτε μέχρι να ενεργοποιήσετε τουλάχιστον ένα από "
+"αυτα."
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "Όριο Ανεβάσματος: %u"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Το δίκτυο Kad δεν θα ξεκινήσει αν η θύρα UDP είναι απενεργοποιημένη.\n"
+"Ενεργοποιήστε τη θύρα UDP ή απενεργοποιήστε το Kad."
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "Όριο Κατεβάσματος: Κανένα"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Τώρα πρέπει να επανεκινήσετε το aMule.\n"
+"Διαφορετικά μην διαμαρτυρηθείτε αν συμβεί κάτι κακό.\n"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "Όριο Κατεβάσματος: %u"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Η λίστα με τους διακομιστές αυτόματης ανανέωσης είναι κενή.\n"
+"Παρακαλώ βάλτε τουλάχιστον μία URL που να δείχνει σε ένα έγκυρο αρχείο sever."
+"met.\n"
+"Πατήστε το διπλανό κουμπί \"List\" για να βάλετε ένα URL."
 
-#: src/MuleTrayIcon.cpp:368
-#, c-format
-msgid "Download speed: %.1f"
-msgstr "Ταχύτητα κατεβάσματος: %.1f"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Προσωρινά αρχεία"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Εισερχόμενα αρχεία"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Συνδεδεμένες υπογραφές"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Ταχύτητα ανεβάσματος: %.1f"
+msgid "Choose a folder for %s"
+msgstr "Επιλέξτε κατάλογο για %s"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Πληροφορίες πελάτη"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Αναζήτηση του προγράμματος για βίντεο"
+
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Επιλογή περιηγητή"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "Nickname: %s"
-msgstr "Παρατσούκλι: %s"
+msgid "Executable%s"
+msgstr "Εκτελέσιμο%s"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Δεν επιλέχτηκε παρατσούκλι!"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Επεξεργασία λίστας διακομιστών"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "Ταυτότητα πελάτη:"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Βάλτε εδώ τη διεύθυνση για το κατέβασμα των αρχείων server.met. \n"
+"Μία διεύθυνση σε κάθε γραμμή"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Όνομα διακομιστή:"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Καθυστέρηση ενημέρωσης: %d δευτερόλεπτο"
+msgstr[1] "Καθυστέρηση ενημέρωσης: %d δευτερόλεπτα"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "Διεύθυνση διακομιστή:"
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Χρόνος για μέσο γράφημα: %d λεπτό"
+msgstr[1] "Χρόνος για μέσο γράφημα: %d λεπτά"
 
-#: src/MuleTrayIcon.cpp:416
+#: src/PrefsUnifiedDlg.cpp:1127
 #, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+msgid "Connections Graph Scale: %d"
+msgstr "Κλίμακα γραφήματος συνδέσεων: %d"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "TCP port: %d"
-msgstr "Θύρα TCP: %d"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Μέγεθος χώρου ενδιάμεσης αποθήκευση αρχείου: %d byte"
+msgstr[1] "Μέγεθος χώρου ενδιάμεσης αποθήκευση αρχείου: %d byteς"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "Θύρα TCP: Δεν είναι έτοιμη"
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Μέγεθος λίστας αναμονής αποστελλόμενων: %d πελάτης"
+msgstr[1] "Μέγεθος λίστας αναμονής ανεβασμάτων: %d πελάτες"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "UDP port: %d"
-msgstr "Θύρα UDP: %d"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Διάστημα ανανέωσης της σύνδεσης σε διακομιστή: %d λεπτό"
+msgstr[1] "Διάστημα ανανέωσης της σύνδεσης σε διακομιστή: %d λεπτά"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "Θύρα UDP: Δεν είναι έτοιμη"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Διάστημα ανανέωσης της σύνδεσης σε διακομιστή: Απενεργοποιημένο"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Συνδεδεμένη Υπογραφή: Ενεργοποιημένη"
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "απενεργοποίηση"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Συνδεδεμένη Υπογραφή: Απενεργοποιημένη"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "Εκτέλεση εντολής κατά το γεγονός `%s'"
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
-msgstr "Κοινόχρηστα αρχεία: %d"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Ενεργοποίηση εκτέλεσης εντολών στον πυρήνα"
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
-msgstr "Πελάτες στην αναμονή: %d"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Εντολή πυρήνα:"
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
-msgstr "Συνολικό Κατέβασμα: %s"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Ενεργοποίηση εκτέλεσης εντολών στο γραφικό περιβάλλον"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Εντολή γραφικού περιβάλλοντος:"
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Οι παρακάτω μεταβλητές θα αντικατασταθούν:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+"Το ελάχιστο μέγεθος πρέπει να είναι μικρότερο από το μέγιστο. Το μέγιστο "
+"μέγεθος θα αγνοηθεί."
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Προειδοποίηση ψαξίματος"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Κύρια"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Δεν μπορεί να γίνει αναζήτηση στο Kad αν το Kad δεν τρέχει"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr ""
+"Δεν μπορεί να γίνει αναζήτηση στο eD2k αν το eD2k δεν είναι συνδεδεμένο"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Άγνωστο σφάλμα όταν έγινε απόπειρα αναζήτησης στο Kad:"
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "Τιμή ταυτότητας αρχείου"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Αρχείο"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Κατέβασμα στην κατηγορία"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Προσθήκη προαιρετικών URL για αυτό το αρχείο"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Αναζήτηση παρόμοιων αρχείων (στο eD2k, τοπικός διακομιστής)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Σημείωση αρχείου ως γνωστού"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο"
+
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Ακύρωση"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr ""
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Αποτυχία σύνδεσης σε όλους τους συσκοτισμένους διακομιστές της λίστας. Θα "
+"γίνει άλλο ένα πέρασμα χωρίς συσκότιση."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"Αποτυχία σύνδεσης σε όλους τους διακομιστές της λίστας. Θα γίνει άλλο ένα "
+"πέρασμα."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "Το δίκτυο eD2k απενεργοποιήθηκε στις επιλογές, δεν γίνεται σύνδεση."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
+"Δεν βρέθηκαν διακομιστές στη λίστα διακομιστών στους οποίους να γίνει σύνδεση"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "Συνολικό Ανέβασμα: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Συνδεδεμένο στο %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Όριο ανεβάσματος"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Σύνδεση παγιώθηκε στο: %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Όριο κατεβάσματος"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Μοιραίο Σφάλμα κατά την προσπάθεια σύνδεσης. Η σύνδεση στο διαδίκτυο πρέπει "
+"να έχει διακοπεί"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Κρύψιμο aMule"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Χάθηκε η σύνδεση στο %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Εμφάνιση aMule"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) φαίνεται να είναι νεκρό"
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Ξεκίνησε συνεδρία συνομιλίας: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) φαίνεται να είναι γεμάτο."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Συνδεδεμένος σε πελάτη ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] ""
+"Αυτόματη σύνδεση στον διακομιστή θα επιχειρηθεί ξανά σε %d δευτερόλεπτο"
+msgstr[1] ""
+"Αυτόματη σύνδεση στον διακομιστή θα επιχειρηθεί ξανά σε %d δευτερόλεπτα"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Συνδέεται σε πελάτη ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Η σύνδεση χάθηκε"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Αποτυχία σύνδεσης σε πελάτη/η σύνδεση χάθηκε ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Η σύνδεση στο %s (%s:%i) απέτυχε."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Κλείσιμο καρτέλας"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "ΣΦΑΛΜΑ: Η υποδοχή κρίθηκε άκυρη κατά τον έλεγχο χρονικού ορίου"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Κλείσιμο όλων των καρτελών"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Η απόπειρα σύνδεσης στο %s (%s:%i) ξεπέρασε το χρονικό όριο."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Κλείσιμο των άλλων καρτελών"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr ""
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Φόρτωση του αρχείου διακομιστών: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Το αρχείο server.met δεν βρέθηκε"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Σφάλμα φόρτωσης του αρχείου server.met '%s', βρέθηκε άγνωστη μορφοποίηση."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Αποτυχία ανοίγματος του αρχείου server.met"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Το αρχείο server.met είναι φθαρμένο. βρέθηκε λανθασμένη ετικέτα έκδοσης: 0x%"
 "x, μεγεθος %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "βρέθηκε %i διακομιστής στο server.met"
 msgstr[1] "βρέθηκαν %i διακομιστές στο server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "Προστέθηκε %d διακομιστής"
 msgstr[1] "Προστέθηκαν %d διακομιστές"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "Σφάλμα εισόδου εξόδου κατά την ανάγνωση του αρχείου known.met: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Ο διακομιστής δεν προστέθηκε: [%s:%d] δεν προσδιορίζει έγκυρη θύρα."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr ""
 "Ο διακομιστής δεν προστέθηκε: Το IP του [%s:%d] είναι φιλτραρισμένο ή άκυρο."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Ο διακομιστής δεν προστέθηκε: Διακομιστής με το ίδιο IP:Θύρα [%s:%d] βρέθηκε "
 "στη λίστα."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Ο διακομιστής προστέθηκε: Διακομιστής στην [%s:%d] με όνομα '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr ""
 "Είστε συνδεδεμένος στον διακομιστή που προσπαθείτε να σβήσετε. Παρακαλείστε "
-"να αποσυνδεθείται πρώτα"
+"να αποσυνδεθείτε πρώτα"
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Αποτυχημένη προσπάθεια να ανοίξει '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Αποτυχία σβησίματος του server.met!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Άκυρη URL"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
-msgstr "Οοκληρώθηκε το κατέβασμα της λίστας διακομιστών από το %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
+msgstr "Ολοκληρώθηκε το κατέβασμα της λίστας διακομιστών από το %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Αποτυχία κατεβάσματος της λίστας διακομιστών απο το %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -7007,23 +5562,28 @@
 "επικολλήστε μια έγκυρη λίστα σε αυτό το αρχείο έτσι ώστε να ενημερωθεί "
 "αυτόματα η λίστα διακομιστών σας"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Εκκίνηση του κατεβάσματος της λίστας διακομιστών από το %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Προσδιορίστηκε άκυρη διεύθυνση για την αυτόματη ενημέρωση των "
 "διακομιστών: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Άκυρη URL αυτόματο κατέβασμα του server.met στο αρχείο addresses.dat"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Αποτυχία κατεβάσματος της λίστας διακομιστών από το %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -7031,343 +5591,2618 @@
 "Ο τοπικός διακομιστής είναι φιλτραρισμένος από τα IPFilters, επανασύνδεση σε "
 "διαφορετικό διακομιστή!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Αποτυχία εκτέλεσης εντολής `%s' στο συμβάν `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Όνομα διακομιστή"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Διεύθυνση"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Θύρα"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Περιγραφή"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ηχοβόλιση πακέτων"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Χρήστες"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Στατικό"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Έκδοση"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Οι τοπικές ρυθμίσεις άλλαξαν στις προεπιλεγμένες του συστήματος λόγο μιας "
-"αλλαγής παραμέτρων. Sorry!"
+"Είστε συνδεδεμένος σε έναν διακομιστή που προσπαθείτε να διαγράψετε. "
+"Παρακαλώ αποσυνδεθείτε πρώτα. Ο διακομιστής δεν διαγράφηκε."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Άγνωστο όνομα)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Είστε σίγουρος/η ότι θέλετε να διαγράψετε τον στατικό διακομιστή %s"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Διακομιστές (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Διακομιστής"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Σύνδεση σε διακομιστή"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Σημαδέψτε τον διακομιστή σαν στατικό"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Σημαδέψτε τον διακομιστή σαν μη στατικό"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Σημαδέψτε τους διακομιστές σαν στατικούς"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Σημαδέψτε τους διακομιστές σαν μη στατικούς"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Αφαίρεση διακομιστή"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Αφαίρεση διακομιστών"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Διαγράψτε όλους τους διακομιστές"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Αντιγραφή συνδέσμων eD2k στο πρόχειρο"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Επανασύνδεση στον διακομιστή"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Σίγουρα να σβηστούν όλοι οι διακομιστές;"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τον επιλεγμένο διακομιστή;"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Είστε σίγουροι ότι θέλετε να διαγράψετε τους επιλεγμένους διακομιστές;"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "ΣΦΑΛΜΑ: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Ο νέος πελάτης είναι %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: σας έχει αποδοθεί Low-ID!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
-"Δεν υπάρχουν διακομιστές στην λίστα.\n"
-"Θέλετε το aMule να κατεβάσει μία νέα λίστα τώρα;"
+"\tΠιθανότατα αυτό είναι γιατί είστε πίσω από τοίχο προστασίας ή δρομολογητή."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Κατέβασμα της λίστας διακομιστών"
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr ""
+"\tΓια περισσότερες πληροφορίες, παρακαλώ αναφερθείτε στο http://wiki.amule."
+"org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Ελήφθησαν άγνωστες πληροφορίες διακομιστή! - υπερβολικά σύντομες"
 
-#: src/amule.cpp:846
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "web server running on pid %d"
-msgstr "διακομιστής ιστού τρέχει με αριθμό διεργασίας %d"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Λήφθηκε %d καινούριος διακομιστής"
+msgstr[1] "Λήφθηκαν %d καινούριοι διακομιστές"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Το αποθήκευση τις λίστας διακομιστών ολοκληρώθηκε."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Ο διακομιστής απέρριψε την τελευταία εντολή"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Κάλπικο πακέτο ελήφθει από τον διακομιστή: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
-"Ζητήσατε να τρέχετε τον διακομιστή ιστού κατά την εκκίνηση, αλλά το "
-"εκτελέσιμο αρχείο amuleweb δεν βρέθηκε. Παρακαλώ εγκαταστήστε το πακέτο που "
-"περιέχει τον διακομιστή ιστού του aMule, ή μεταφράστε το aMule "
-"χρησιμοποιώντας την παράμετρο --enable-webserver"
+"Αδιαχείριστο σφάλμα κατά την επεξεργασία πακέτου από τον διακομιστή: %s"
 
-#: src/amule.cpp:937
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Δεν μπόρεσε να προσδέσει τις θύρες στην προσιορισμένη διεύθυνση: %s"
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Δεν μπορεί να δημιουργηθεί νήμα επίλυσης DNS για τη σύνδεση στο %s"
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:725
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
+msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
-"Η θύρα %u δεν είναι διαθέσιμη. Θα σας αποδωθεί LOWID (χαμηλή προτεραιότητα)\n"
+"Η διεύθυνση IP %s (%s) του διακομιστή είναι φιλτραρισμένη. Δεν γίνεται "
+"σύνδεση."
 
-#: src/amule.cpp:970
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "χρήση πρωτοκόλλου συσκότισης."
+
+#: src/ServerSocket.cpp:744
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Σύνδεση σε %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
-"Η θύρα %u δεν είναι διαθέσιμη!\n"
-"\n"
-"Αυτό σημαίνει ότι θα έχετε LOWID (χαμηλή προτεραιότητα).\n"
-"\n"
-"Ελέξτε το δίκτυο σας για να βεβαιωθήτε ότι η θύρα είναι ανοιχτή για είσοδο "
-"και έξοδο."
+"Δεν μπόρεσε να γίνει επίλυση dns για τον διακομιστή %s: Δεν είναι δυνατή ή "
+"σύνδεση!"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Αποτυχία δημιουργίας αρχείου Συνδεδεμένων Υπογραφών"
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Ο διακομιστής δεν προστέθηκε: Δεν προσδιορίστηκε διεύθυνση."
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Αποτυχία δημιουργίας αρχείου Συνδεδεμένων Υπογραφών του aMule"
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Ο διακομιστής δεν προστέθηκε: Προσδιορίστηκε άκυρη θύρα διακομιστή."
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Κατάσταση eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "Ταυτότητα"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Κατάσταση Kademlia:"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "Τρέχει στο %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Τρέχει"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Κατάσταση:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Κατάσταση σύνδεσης:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
-"Οι επιλεγμένες τοπικές ρυθμίσεις δεν φαίνεται να είναι εγκατεστημένες στο "
-"σύστημά σας. (Σημ. Θα προσπαθήσω να τις θέσω ούτως ή άλλως)"
 
-#: src/amule.cpp:1308
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "Κατάσταση σύνδεσης:"
+
+#: src/ServerWnd.cpp:219
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Αυτή είναι η πρώτη φορά που τρέχετε το aMule %s"
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr ""
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Αυτή η έκδοση είναι δοκιμαστική, και αναβαθμίζεται καθημερινά, και\n"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Κατάσταση τοίχου προστασίας:"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
 msgstr ""
-"δεν δίνουμε εγγύηση ότι δεν θα χαλάσει κάτι, δεν θα κάψει το σπίτι σας,\n"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
 msgstr ""
-"ή δεν θα σκοτώσει το σκύλο σας. Αλλά πρέπει να είναι ασφαλές στη χρήση\n"
 
-#: src/amule.cpp:1316
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Όχι φιλαράκος"
+
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "Συνδεδεμένος στον φιλαράκο"
+
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "Συνδεδεμένος στον φιλαράκο"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "Βρέθηκαν πηγές :"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr ""
+
+#: src/ServerWnd.cpp:254
+#, fuzzy
+msgid "Indexed notes:"
+msgstr "Το αρχείο δεικτών δεν βρέθηκε (ψάχνω ψάχνω και τίποτα δεν βρίσκω)"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr ""
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Μέσοι χρήστες:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Μέσα αρχεία:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Δεν τρέχει"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr ""
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Βρέθηκε %i γνωστό κοινόχρηστο αρχείο"
+msgstr[1] "Βρέθηκαν %i γνωστά κοινόχρηστα αρχεία"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Βρέθηκε %i γνωστό κοινόχρηστο αρχείο και %i άγνωστο"
+msgstr[1] "Βρέθηκαν %i γνωστά κοινόχρηστα αρχεία και %i άγνωστα"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "ΣΦΑΛΜΑ: Αποπειράθηκε να μοιραστεί το %s"
+
+#: src/SharedFileList.cpp:410
+#, fuzzy, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Ο διακομιστής δεν βρέθηκε: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Όνομα χρήστη"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Ταχύτητα κατεβάσματος"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Ταχύτητα ανεβάσματος"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Διαθέσιμα:"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Κατάσταση ανεβάσματος"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Κατάσταση κατεβάσματος"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Όνομα αρχείου"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Κοινόχρηστα αρχεία"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Αιτήσεις"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Δεκτές αιτήσεις"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Όγκος δεδομένων που μεταφέρθηκαν"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Λόγος συμμετοχής"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Κεκτημένα τμήματα"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Ολοκληρωμένες πηγές"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Μονοπάτι καταλόγου"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Προσθήκη σχολίου/Αξιολόγησης"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Επεξεργασία σχολίου/Αξιολόγησης"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Μετονομασία"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Προσθήκη των αρχείων της συλλογής στην λίστα με τα μεταφερόμενα"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Αντιγραφή μαγνήτη &URI στην πρόχειρη μνήμη"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο (&Πηγή)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr ""
+"Αντιγραφή του συνδέσμου eD2k στο πρόχειρο (Πηγή) (& Με κρυπτογραφικές "
+"επιλογές)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο (&Όνομα υπολογιστή)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+"Αντιγραφή του συνδέσμου eD2k στο πρόχειρο (Όνομα υπολογιστή) (&Με "
+"κρυπτογραφικές επιλογές)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Αντιγραφή του συνδέσμου eD2k στο πρόχειρο) (Πληροφορίες AICH)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr ""
+"Χρειάζεται Υψηλή Προτεραιότητα για τη δημιουργία έγκυρου πηγαίου συνδέσμου"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Κοινόχρηστα αρχεία (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[Μέρος αρχείου]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Όνομα αρχείου"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Ανεβασμένα Δεδομένα (Συνεδρία (Συνολικά)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Συνολική επιβάρυνση (Πακέτα): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Επιβάρυνση αίτησης αρχείου (Πακέτα): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Επιβάρυνση ανταλλαγής πηγών (Πακέτα): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Επιβάρυνση διακομιστή (Πακέτα): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Επιβάρυνση Kad (Πακέτα): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Κρυπτογραφική επιβάρυνση (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Ενεργά ανεβάσματα: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Ανεβάσματα σε αναμονή: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Συνολικός αρ. επιτυχών συνεδριών ανεβάσματος: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Συνολικός αριθμός αποτυχημένων συνεδριών ανεβάσματος: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Μέσος χρόνος ανεβάσματος: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Κατέβηκαν δεδομένα (Συνεδρία (Συνολικά)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Βρέθηκαν πηγές: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Ενεργά κατεβάσματα (κομμάτια): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Συνεδρία λόγος Άνω:Κάτω (Σύνολο): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Μέσος ρυθμός κατεβάσματος (Συνεδρία): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Μέσος ρυθμός ανεβάσματος (Συνεδρία): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Μέγιστος ρυθμός κατεβάσματος (Συνεδρία): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Ελάχιστος ρυθμός κατεβάσματος (Συνεδρία): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Επανασυνδέσεις: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Χρόνος μετά από την πρώτη μεταφορά: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Σύνδεση με τον διακομιστή από: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Ενεργές συνδέσεις (εκτίμηση): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Έφτασε στο μέγιστο αρ. συνδέσεων: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Μέσες συνδέσεις (εκτίμηση): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Κορυφαίες συνδέσεις (εκτίμηση): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Πελάτες"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "Άγνωστο μέγεθος"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "Φιλτραρισμένοι"
+
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "Απαγορευμένοι"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Συνολικοί: %i Γνωστοί: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Εργαζόμενοι διακομιστές: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Αποτυχημένοι διακομιστές: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Σύνολο: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Διαγραμμένοι διακομιστές: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Φιλτραρισμένοι διακομιστές: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Χρήστες στους εργαζόμενους διακομιστές: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Αρχεία στους εργαζόμενους διακομιστές: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Σύνολο χρηστών: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Σύνολο αρχείων: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Κατοχή διακομιστών: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Αριθμός κοινόχρηστων αρχείων: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Συνολικό μέγεθος κοινόχρηστων αρχείων: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Μέσο μέγεθος αρχείου: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Λειτουργικό σύστημα"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Δεν ελήφθει"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Ενεργές συνδέσεις (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Δεν είναι διαθέσιμο"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Ποτέ"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Η εντολή `%s' με pid `%d' τελείωση με κωδικό κατάστασης `%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Εκτέλεση <str> και έξοδος."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Άκυρη μορφή διεύθυνσης IP. Χρησιμοποιήστε xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
+msgid ""
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
+msgstr ""
+"Αυτή η εντολή χρειάζεται ένα όρισμα. Έγκυρα ορίσματα: 'all', όνομα αρχείου ή "
+"έναν αριθμό.\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Επεξεργασία κατά κατακερματιστή:"
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Επεξεργασία κατά όνομα αρχείου:"
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr ""
+"Αυτή η εντολή χρειάζεται ένα όρισμα. Έγκυρα ορίσματα: ένας κατακερματιστής "
+"αρχείου.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Άκυρος αριθμός\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr ""
+"Δεν είναι έγκυρος κατακερματισμός (το μήκος πρέπει να είναι ακριβώς 32 "
+"χαρακτήρες)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Η αίτηση απέτυχε για άγνωστο λόγο"
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Η διαδικασία ολοκληρώθηκε επιτυχώς."
+
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
+msgstr "Η αίτηση απέτυχε με το ακόλουθο σφάλμα: %s"
+
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Το φίλτρο IP για πελάτες είναι %s.\n"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "Εκτός"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "Σε λειτουργία"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Το φιλτράρισμα διευθύνσεων για διακομιστές είναι %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Το τρέχον επίπεδο IPFilter είναι %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Ευρυζωνικά όρια: Πάνω: %u kB/s, Κάτω: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Συνδεδεμένο στο %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Συνδέεται τώρα"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "βρίσκεται πίσω από τοίχο προστασίας"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "Εντάξει"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"Οι παρακάτω επιλογές έχουν αλλάξει σε αυτήν την έκδοση για λόγους "
-"ασφαλείας: \n"
+"\n"
+"Κατέβασμα:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Ενεργοποιημένη υποστήριξη συσκότισης πρωτοκόλλου για εισερχόμενες και "
-"εξερχόμενες συνδέσεις. \n"
+"Ανέβασμα:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Απενεργοποίηση της ενημέρωσης της λίστας διακομιστών από άλλους "
-"διακομιστές και πελάτες.\n"
+"Πελάτες σε αναμονή:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Για περισσότερες πληροφορίες για του λόγους αυτών των αλλαγών, ψάξτε\n"
-"στo βίκυ του aMule στη διεύθυνση http://wiki.amule.org για \"fake servers\" "
-"info.\n"
-"Είναι σημαντικό να εκκαθαρίσετε κάθε πλαστό διακομιστή από τη λίστα σας ώστε "
-"το aMule να δουλεύει σωστά."
+"Συνολικές πηγές:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Αριθμός αποτελεσμάτων αναζήτησης: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/TextClient.cpp:832
+#, fuzzy
+msgid "Search progress not available"
+msgstr "Εμφάνιση ποσοστού προόδου"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Ελήφθη άγνωστη απάντηση από τον διακομιστή, OpCode = %#x."
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Εμφάνιση σύντομων πληροφοριών κατάστασης."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr ""
+"Εμφάνιση κατάστασης σύνδεσης, τρέχουσες ταχύτητες ανεβοκατεβάσματος, κτλ.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Εμφάνιση πλήρους δέντρου στατιστικών."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Προαιρετικά, ένας αριθμός από 0 ώς 255 μπορεί να δωθεί σαν όρισμα σε αυτήν\n"
+"την εντολή και ο οποίος λέει πόσες καταχωρήσεις των υποδέντρων της έκδοσης "
+"πελάτη θα πρέπει\n"
+"να εμφανίζονται. Το μηδέν ή παράλειψη ερμηνεύεται σαν 'απεριόριστο'.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Παράδειγμα: 'statistics 5' θα δείξει μόνο τις 5 πρώτες εκδόσεις του κάθε "
+"τύπου πελάτη.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Κλείσιμο του aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Κλείσιμο του απομακρυσμένου πυρήνα (amule/amuled).\n"
+"Αυτό θα κλείσει και τον πελάτη κειμένου, γιατί είναι άχρηστος χωρίς έναν\n"
+"τρέχοντα πυρήνα.\n"
+
+#: src/TextClient.cpp:859
+#, fuzzy
+msgid "Reload the given object."
+msgstr "Επαναφορτώνει το δεδομένο αντικείμενο"
+
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
+msgstr "Επαναφορτώνει τη λίστα κοινοχρήστων αρχείων."
+
+#: src/TextClient.cpp:862
+#, fuzzy
+msgid "Reload IP filtering table."
+msgstr "Επαναφορτώνει τον πίνακα φίλτρων IP από αρχείο"
+
+#: src/TextClient.cpp:863
+#, fuzzy
+msgid "Reload current IP filtering table."
+msgstr "Επιλογή επιπέδου φιλτραρίσματος IP."
+
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "Επαναφορτώνει τον πίνακα φίλτρων IP από αρχείο"
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Σύνδεση στο δίκτυο."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Αυτό θα προκαλέσει σύνδεση σε όλα τα δίκτυα που είναι ενεργοποιημένα στις "
+"Προτιμήσεις.\n"
+"Προαιρετικά, μπορείτε να προσδιορίσετε μία διεύθυνση διακομιστή της μορφής "
+"IP:θύρα για σύνδεση\n"
+"μόνο σε αυτόν τον διακομιστή. Η διεύθυνση IP πρέπει να είναι μια διάστικτη "
+"δεκαδική διεύθυνση IPv4\n"
+"ή ένα επιλύσιμο όνομα DNS."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Σύνδεση μόνο στο eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Σύνδεση μόνο στο Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Αποσύνδεση από το δίκτυο."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Αυτό θα προκαλέσει αποσύνδεση από όλα τα συνδεδεμένα δίκτυα.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Αποσύνδεση μόνο από το eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Αποσύνδεση μόνο από το Kad."
+
+#: src/TextClient.cpp:877
+#, fuzzy
+msgid "Add an eD2k or magnet link to core."
+msgstr "Προσθήκη ενός μαγνητικού συνδέσμου ή συνδέσμου eD2k στον πυρήνα."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"Ο καινούριος συνδεσμος eD2k μπορεί να είναι:\n"
+"*) ένας σύνδεσμος αρχείου (ed2k://|file|...), θα προστεθεί στην λίστα "
+"αναμονής κατεβασμάτων,\n"
+"*) ένας σύνδεσμος διακομιστή (ed2k://|server|...), θα προστεθεί στην λίστα "
+"διακομιστών,\n"
+"*) ένας σύνδεσμος σε λίστα διακομιστών, στην οποία περίπτωση όλοι οι "
+"διακομιστές τις λίστας θα προστεθούν\n"
+"    στη λίστα διακομιστών.\n"
 "\n"
-"Επιπλέον, οι ρυθμίσεις του περιηγητή ιστοσελίδων τέθηκαν στις "
-"προσδιορισμένες συστήματος. Παρακαλώ ρυθμίστε τις ξανά αν χρειάζεται.\n"
+"Ο μαγνητικός σύνδεσμος πρέπει να περιέχει τον κατακερματισμό \n"
+" και το μέγεθος αρχείου.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Θέτει την τιμή μίας προτίμησης."
+
+#: src/TextClient.cpp:883
+#, fuzzy
+msgid "Set IP filtering preferences."
+msgstr "Θέτει τις προτιμήσεις του φίλτρου IP."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Άνοιγμα του φίλτρου IP τόσο για πελάτες όσο και για διακομιστές."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Κλείσιμο του φίλτρου IP τόσο για πελάτες όσο και για διακομιστές."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Ενεργοποίηση/Απενεργοποίηση του φίλτρου IP για πελάτες."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Άνοιγμα του φίλτρου IP τόσο για πελάτες."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Κλείσιμο του φίλτρου IP τόσο για πελάτες."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Ενεργοποίηση/Απενεργοποίηση του φίλτρου IP για διακομιστές."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Άνοιγμα του φιλτραρίσματος IP για τους διακομιστές."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Κλείσιμο του φιλτραρίσματος IP για τους διακομιστές."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Επιλογή επιπέδου φιλτραρίσματος IP."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
+msgstr ""
+"Έγκυρα επίπερα φιλτραρίσματος είναι στο διάστημα 0-255, και η προεπιλεγμένη "
+"(αρχική)\n"
+"τιμή είναι 127.\n"
+
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Ρύθμιση ορίων εύρους ζώνης."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
-"Περισσότερες πληροφορίες, υποστήριξη και νέες εκδόσεις μπορούνα βρεθούν στην "
-"ιστοσελίδα μας,\n"
+"Η τιμή που δίνεται σε αυτές τις εντολές πρέπει να είναι σε kilobytes/"
+"δευτερόλεπτο.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "στο www.aMule.org, ή στο κανάλι #aMule του IRC στο irc.freenode.net.\n"
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Θέσε το όριο εύρους ζώνης για ανέβασμα."
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Θέσε το όριο εύρους ζώνης για κατέβασμα."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Λήψη και εμφάνιση της τιμής μίας προτίμησης."
+
+#: src/TextClient.cpp:905
+#, fuzzy
+msgid "Get IP filtering preferences."
+msgstr "Λήψη προτιμήσεων φίλτρου IP."
+
+#: src/TextClient.cpp:906
+#, fuzzy
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Λήψη κατάστασης φίλτρου IP για πελάτες και διακομιστές."
+
+#: src/TextClient.cpp:907
+#, fuzzy
+msgid "Get IP filtering state for clients only."
+msgstr "Λήψη κατάστασης φίλτρου IP μόνο για πελάτες."
+
+#: src/TextClient.cpp:908
+#, fuzzy
+msgid "Get IP filtering state for servers only."
+msgstr "Λήψη κατάστασης φίλτρου IP μόνο για διακομιστές."
+
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "Επιλογή επιπέδου φιλτραρίσματος IP."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Λήψη τον ορίων εύρους ζώνης."
+
+#: src/TextClient.cpp:913
+#, fuzzy
+msgid "Execute a search."
+msgstr "Εκτελεί αναζήτηση στο Kad"
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"Παρακαλούμε αναφέρετε σφάλματα του προγράμματος στο http://forum.amule.org"
+"Ο τύπος της αναζήτησης πρέπει να δωθεί μέσω των εξής επιλογών:\n"
+"    ΚΑΘΟΛΙΚΗ\n"
+"    ΤΟΠΙΚΗ\n"
+"    KAD\n"
+"Για παράδειγμα: 'search kad αρχειάκι' θα εκτελέσει μία αναζήτηση Kad για το "
+"αρχείο \"αρχειάκι\".\n"
+
+#: src/TextClient.cpp:915
+#, fuzzy
+msgid "Execute a global search."
+msgstr "Εκτελεί συνολική αναζήτηση."
+
+#: src/TextClient.cpp:916
+#, fuzzy
+msgid "Execute a local search"
+msgstr "Εκτελεί τοπική αναζήτηση"
+
+#: src/TextClient.cpp:917
+#, fuzzy
+msgid "Execute a kad search"
+msgstr "Εκτελεί αναζήτηση στο Kad"
+
+#: src/TextClient.cpp:919
+#, fuzzy
+msgid "Show the results of the last search."
+msgstr "Δείχνει τα αποτελέσματα της τελευταίας αναζήτησης."
+
+#: src/TextClient.cpp:920
+#, fuzzy
+msgid "Return the results of the previous search.\n"
+msgstr "Επιστρέφει τα αποτελέσματα της προηγούμενης αναζήτησης.\n"
+
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "Δείχνει την πρόοδο της αναζήτησης."
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "Δείχνει την πρόοδο της αναζήτησης.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Ξεκινά να κατεβάζει ένα αρχείο"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"Ο δικτυακός κατάλογος των ηλεκτρονικών αρχείων υπογραφών που προσδιορίσατε "
-"είναι ΑΚΥΡΟΣ!\n"
-"Οι ηλεκτρονικές υπογραφές θα ΑΠΕΝΕΡΓΟΠΟΙΗΘΟΥΝ μέχρι να το φτιάξετε στις "
-"προτιμήσεις."
+"Πρέπει να δωθεί αριθμός του αρχείου από την τελευταί αναζήτηση.\n"
+" Για παράδειγμα \"download 12\" θα ξεκινήσει να κατεβάζει το αρχείο υπ' "
+"αριθμό 12 της προηγούμενης αναζήτησης.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Παύση κατεβάσματος."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Συνέχιση κατεβάσματος."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Ακύρωση κατεβάσματος."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Θέσε την προτεραιότητα κατεβάσματος."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr ""
+"Βάλτε την προτεραιότητα κατεβάσματος σε χαμηλή, κανονική, ηψηλή ή αυτόματη.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Θέστε χαμηλή προτεραιότητα."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Θέστε κανονική προτεραιότητα."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Θέστε υψηλή προτεραιότητα."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Θέστε αυτόματη προτεραιότητα."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Δείξε τις ουρές/λίστες."
+
+#: src/TextClient.cpp:950
+#, fuzzy
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Δείχνει την ουρά ανεβάσματος/κατεβάσματος, τη λίστα διακομιστών ή "
+"κοινόχρηστων αρχείων.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Δείξε την ουρά ανεβάσματος."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Δείξε την ουρά κατεβάσματος."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Δείξε τον αρχείο καταγραφής."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Δείξε τη λίστα των διακομιστών."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Καθάρισμα αρχείου καταγραφής."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Η εκχώρηση χώρου για το αρχείο '%s' απέτυχε: '%s'"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Δεν συνίσταται αυτή η εντολή, αντ' αυτής χρησιμοποιήστε την '%s'."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "ΣΦΑΛΜΑ: το αρχείο καταγραφής δεν μπορεί να ανοίξει"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Αυτή είναι μη συνιστώμενη εντολή και μπορεί να αφαιρεθεί στο μέλλον. \n"
+"Χρησιμοποιήστε '%s' καλύτερα.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το αρχείο καταγραφών είναι άδειο. Κάτι δεν πάει καλά."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Διακομιστής κειμένου του aMule"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Το αρχείο καταγραφών επαναφέρθηκε στην αρχική κατάσταση"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr ""
+"Μετατροπή των παλιών συνόλων κατακερματισμού AICH στο '%s' σε 64b στο '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Μύνημα Διακομιστή: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr ""
+"Ειδοποίηση: Το όνομα αρχείου '%s' είναι άκυρο και μετονομάστηκε σε '%s' "
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Αποτυχία κατεβάσματος της λίστας κόμβων."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"Ειδοποίηση: Το αρχείο '%s' υπάρχει ήδη, το νέο αρχείο μετονομάστηκε σε '%s'"
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Αποτυχία ανοίγματος του κατεβασμένου αρχείου ελέγχου έκδοσης"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Είστε σίγουροι ότι θέλετε να ακυρώσετε και να σβήσετε όλα τα αρχεία σε αυτήν "
+"την κατηγορία;"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Φθαρμένο αρχείο ελέγχου έκδοσης"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Χρειάζεται επιβεβαίωση"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Χρησιμοποιείται μία ξεπερασμένη έκδοση του aMule!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Υπερβολικά πολλές συνδέσεις"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Όλα τα άλλα"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Επιλογή φίλτρου εμφάνισης"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Προσθήκη κατηγορίας"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Επεξεργασία κατηγορίας"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Διαγραφή κατηγορίας"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Η παρούσα έκδοση του aMule είναι %i.%i.%i και η τελευταία %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+"Αποτυχία ανοίγματος του αρχείου (%s), αφαίρεση από τη λίστα κοινοχρήστων "
+"αρχείων."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Η τελευταία έκδοση μπορεί να βρεθεί στο http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Σύνολο κατακερματισμού για άγνωστο αρχείο: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Συνέχεια του ανεβάσματος του αρχείου: %s"
+
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Αναστολή ανεβάσματος του αρχείου: %s"
+
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Αποτυχία εκτέλεσης εντολής `%s' στο συμβάν `%s'."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Το κατέβασμα ολοκληρώθηκε"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Η πλήρης διαδρομή του αρχείου"
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Το όνομα του αρχείου χωρίς τη διαδρομή."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "Ο κατακερματισμός eD2k του αρχείου."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Το μέγεθος του αρχείου σε byte."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Συνολική διάρκεια κατεβάσματος"
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Ξεκίνησε καινούρια περίοδος συνομιλίας"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Αποστολέας μηνύματος"
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Δεν υπάρχει χώρος"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Κατάτμηση δίσκου"
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Σφάλμα κατά την ολοκλήρωση"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
+msgstr "Επεξεργασία του αρχείου υπ' αριθμόν %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Ζητήσατε μερικά τεμάχια (Χρησιμοποιείται μόνο για αρχεία > 9.5ΜΒ)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
+#, c-format
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Ανύπαρκτο αρχείο !\n"
+
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, ο δημιουργός συνδέσμων eD2k του aMule"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Καλώς ήρθατε (Καλώς σας βρήκαμε)"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Παράμετρος εισόδου"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Αρχείο προς κατακερματισμό"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Προσθήκη προαιρετικών URL για αυτό το αρχείο"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
-"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η έκδοση του aMuled είναι ξεπερασμένη: %i.%i.%i < %li.%li.%li"
+"Εδώ εισάγετε το αρχείο για το οποίο θέλετε να υπολογίσετε τον σύνδεσμο eD2k"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Αυτό το αντίγραφο του aMule είναι σύγχρονο. "
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Εδώ εισάγετε την διεύθυνση που θέλετε να προσθέσετε στον σύνδεσμο eD2k: "
+"Προσθέστε / στο τέλος για να ενημερώσετε τον δημιουργό συνδέσμων να "
+"επισυνάψει το τρέχων όνομα αρχείου"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Αποτυχία κατεβάσματος του αρχείου ελέγχου έκδοσης"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Αφαίρεση"
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Δημιουργία συνδέσμου με μερικό κατακερματισμό"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Βοηθήστε στην διανομή καινούριων και σπάνιων αρχείων  ταχύτερα, με αντίτιμο "
+"ένα μεγαλύτερο μέγεθος συνδέσμου"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Κατακερματισμός αρχείου MD4"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "Αρχείο κατακερματισμού eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "σύνδεσμος eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Αποθήκευση"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Αντιγραφή στο πρόχειρο"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Άνοιγμα αρχείου για τον υπολογισμού του συνδέσμου eD2k του"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Αντιγραφή υπολογισμένου συνδέσμου eD2k στο πρόχειρο"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Αποθήκευση υπολογισμένου συνδέσμου eD2k σε αρχείο"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Σχετικά με τον aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr ""
+"Επιλέξτε το αρχείο για το οποίο θέλετε να υπολογίσετε τον σύνδεσμο eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Δεν υπάρχει τίποτα για να αντιγραφεί σε αυτή τη φάση !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Επιλέξτε το αρχείο για τον υπολογισμένο σύνδεσμο eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Αδύνατο το άνοιγμα"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Παρακαλώ δώστε ένα μη κενό όνομα αρχείου"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Δεν υπάρχει τίποτα για να σωθεί σε αυτή τη φάση !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, ο δημιουργός συνδέσμων eD2k του aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Εικονίδια από το http://www.everaldo.com και το http://www.icomania.com\n"
+"καθώς και το http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Διανέμεται υπό την GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Κατακερματίζεται..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Ακυρώθηκε!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Χρήστες: %s | Αρχεία: %s"
+msgid "Done in %.2f s"
+msgstr "Ολοκληρώθηκε σε %.2f δεύτερα"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Έχετε ήδη προσθέσει αυτήν την URL !"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Παρακαλώ εισάγετε μια μη κενή URL"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Χρήστες: E: %s K: %s | Αρχεία: E: %s K: %s"
+msgid "Unable to open %s"
+msgstr "Αποτυχία ανοίγματος του %s"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Δεν εχουν επιλεχθεί δίκτυα"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i Ημέρες %i Ώρες %i λεπτά %i s"
 
-#: src/amule.cpp:2102
+#: src/utils/wxCas/src/onlinesig.cpp:234
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Συνδεση με το %s %s"
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
 
-#: src/amule.cpp:2105
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "Connecting to %s"
-msgstr "Διαδικασία σύνδεσης με %s"
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Αποσυνδεδεμένο από το eD2k"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Το Kad ξεκίνησε."
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Το Kad είναι σταματημένο."
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Συνδεδεμένο στο Kad (ΟΚ)"
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Συνδεδεμένο στο Kad (με προστατευτικό τοίχο)"
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Αποσυνδεδεμένο από το Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, Στατιστικές σύνδεσης aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Μέγιστη ταχύτητα κατεβάσματος στη διάρκεια που το wxCas τρέχει"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr ""
+"Απόλυτα ελάχιστη ταχύτητα κατεβάσματος στις προηγούμενες εκτελέσεις του wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Σύστημα"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Διακοπή της αυτόματης ανανέωσης"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Αποθήκευση της απεικόνισης στατιστικών σύνδεσης"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Εκτύπωση της απεικόνισης στατιστικών σύνδεσης"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Ρυθμίσεις προτιμήσεων"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Σχετικά με το wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Εκκίνηση της αυτόματης ανανέωσης"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Η αυτόματη ανανέωση σταμάτησε"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Η αυτόματη ανανέωση ξεκίνησε"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Αποθήκευση της στατιστικής απεικόνισης"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Στατιστικές σύνδεσης του aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Το δίκτυο Kad δεν μπορεί να χρησιμοποιηθεί αν η θύρα UDP είναι "
-"απενεργοποιημένη στις προτιμήσεις. Δεν έγινε εκκίνηση."
+"Υπήρξε πρόβλημα κατά την εκτύπωση.\n"
+"Μήπως ο τρέχων εκτυπωτής δεν έχει ρυθμιστεί σωστά;"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Εκτύπωση"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
-"Το δίκτυο Kad είναι απενεργοποιημένο από τις προτιμήσεις. Δεν έγινε σύνδεση."
+"wxCas, Στατιστικές συνδεδεμένων υπογραφών\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Βασισμένο στο CAS του Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Διανέμετε υπό την GPL"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Αποτυχία ανάγνωσης του αρχείου της λίστας φίλων 'emfriends.met' "
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Να πάρει! Το amule δεν τρέχει.."
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Αποτυχία γραψίματος στο αρχείο της λίστας φίλων 'emfriends.met' "
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "Το aMule τρέχει"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "Το aMule τρέχει, αλλά δεν είναι συνδεδεμένο"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "Το aMule συνδέεται..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Στο καλό! Η κατάσταση του aMule είναι άγνωστη..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr "τρέχει επί"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr "έχει διακοπεί !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr "δεν είναι συνδεδεμένο !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr "συνδέεται.."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr "κάνει κάτι περίεργο, τσεκάρει το!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr "είναι συνδεδεμένο με"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "κλειστό"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr "είναι ανοιχτό"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr "με"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Συνολική μεταφόρτωση:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Ανέβασμα: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Περίοδος κατεβάσματος:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Μεταφόρτωση"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Ανέβασμα: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Κοινοκτημοσύνη"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr "Αρχείο(α), Πελάτες στην αναμονή: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Χρόνος"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " ανοιχτό"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Μέσο φορτίο συστήματος (1-5-15 λεπτά): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Χρόνος λειτουργικότητας συστήματος:"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Ο κατάλογος που περιέχει το αρχείο amulesig.dat."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Γράψτε εδώ το όνομα του καταλόγου που περιέχει το αρχείο amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Περίοδος ανανέωσης σε δευτερόλεπτα"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Παραγωγή στατιστικής απεικόνισης σε κάθε συμβάν ανανέωσης"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr ""
+"Γράψτε εδώ τον κατάλογο όπου θέλετε να παραχθεί η στατιστική απεικόνιση"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Περιοδικό ανέβασμα του ειδώλου στατιστικών στον διακομιστή FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "Διεύθυνση FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Διαδρομή FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Εδώ εισάγετε τη διεύθυνση του διακομιστή FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr ""
+"Εισάγετε εδώ τον κατάλογο που θα μπει το είδωλο στατιστικών στον διακομιστή "
+"FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Χρήστης"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Γράψτε εδώ το όνομα χρήστη για να συνδεθείτε στον διακομιστή FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Γράψτε εδώ τον κωδικό χρήστη για να συνδεθείτε στον διακομιστή FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Περίοδος ενημέρωσης του FTP σε λεπτά"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Τεκμηρίωση"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Κατάλογος που περιέχει το αρχείο υπογραφής"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Κατάλογος όπου να δημιουργηθεί η στατιστική απεικόνιση"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Φορτώνει προτύπου <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Θύρα HTTP του διακομιστή ιστού"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Χρήση της προώθησης της θύρας UPnP στη θύρα διακομιστή ιστού"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Θύρα UPnP "
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr " Χρήση συμπίεσης τύπου gzip"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Κωδικός πλήρους πρόσβασης για τον διακομιστή ιστού"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Κωδικός επισκέπτη για τον διακομιστή ιστού"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Να επιτρέπεται η πρόσβαση σε επισκέπτες"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Να απαγορεύεται η πρόσβαση σε επισκέπτες"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr ""
+"Φόρτωση/Αποθήκευση των ρυθμίσεων του διακομιστή ιστού από/προς απομακρυσμένο "
+"aMule"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Η διαδρομή στα αρχεία ρυθμίσεων του aMule. ΜΗΝ ΑΛΛΑΖΕΤΕ ΑΠΕΥΘΕΙΑΣ"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Απενεργοποίηση του διερμηνέα PHP (απαρχαιωμένο)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Μεταγλώττιση των σελίδων PHP σε κάθε αίτηση"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Ο διακομιστής δικτύου του aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "η σύνδεση πελάτη ιστού έγινε αποδεκτή\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "ΣΦΑΛΜΑ: δεν μπορεί να γίνει δεκτή η σύνδεση πελάτη ιστού\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Η αίτηση απέτυχε με το εξής σφάλμα: %s"
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Το αρχείο δεικτών δεν βρέθηκε (ψάχνω ψάχνω και τίποτα δεν βρίσκω)"
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Η περίοδος εργασίας έληξε - αίτηση επανασύνδεσης\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Η Περίοδος εργασίας είναι εντάξει, συνδεδεμένο\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Η περίοδος εργασίας είναι εντάξει, μη συνδεδεμένο\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Δεν έχει ξεκινήσει περίοδος εργασίας - θα ζητήσει σύνδεση\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Δημιουργία περιόδου εργασίας - ζήτηση σύνδεσης\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "H αίτηση διεκπεραιώνεται [αρχικό]:"
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Έλεγχος κωδικού\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Ο κωδικός κατακερματισμού είναι άκυρος\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Ο κωδικός είναι εντάξει\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Κακός κωδικός\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Δεν βάλατε κανέναν κωδικό. Δεν επιτρέπεται κενός κωδικός.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Ζητήθηκε αποσύνδεση\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Επεξεργασία αιτήματος [ανακατεύθυνση]"
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Αλβανικά"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Κατάσταση κατεβάσματος"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Καθυστέρηση ενημέρωσης: %d δευτερόλεπτο"
+#~ msgstr[1] "Καθυστέρηση ενημέρωσης: %d δευτερόλεπτα"
+
+#~ msgid "Transferring"
+#~ msgstr "Μεταφέρεται"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "QR: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "Εν αναμονή"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - εμφάνιση πρόοδο αναζήτησης"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr ""
+#~ "Ξεκινάει η δημιουργία κατακερματισμού MD5 και AICH για το αρχείο: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Εκκίνηση δημιουργίας κατακερματισμού MD5 για το αρχείο: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Εκκίνηση δημιουργίας κατακερματισμού AICH για το αρχείο: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "Ειδοποίηση: Δεν μπόρεσα να σβήσω το αρχικό '%s' μετά τη δημιουργία "
+#~ "αντιγράφου ασφαλείας"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "Ειδοποίηση: Απέτυχα να σβήσω το %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Αξιολόγηση (σύνολο):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Προσπάθησε να μεταφέρει ολόκληρα κομμάτια σε όλα τα ανεβάσματα"
+
+#~ msgid "Networks window"
+#~ msgstr "Παράθυρο δικτύων"
+
+#~ msgid "Searches window"
+#~ msgstr "Παράθυρο αναζητήσεων"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Κατεβαίνει"
+
+#~ msgid "Shared files window"
+#~ msgstr "Παράθυρο κοινόχρηστων αρχείων"
+
+#~ msgid "Messages window"
+#~ msgstr "Παράθυρο μηνυμάτων"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Παράθυρο γραφημάτων στατιστικών"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Παράθυρο ρυθμίσεων"
+
+#~ msgid "Transfers"
+#~ msgstr "Μεταφορές"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Παράθυρο μεταφορών αρχείων"
+
+#~ msgid "Unban"
+#~ msgstr "Άρση απαγόρευσης"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Δείξε τα ανεβάσματα"
+
+#~ msgid "Show Queue"
+#~ msgstr "Δείξε τη λίστα προτεραιότητας"
+
+#~ msgid "Select View"
+#~ msgstr "Επιλογή προβολής"
+
+#~ msgid "Client Software"
+#~ msgstr "Λογισμικό πελάτη"
+
+#~ msgid "Waited"
+#~ msgstr "Περίμενε"
+
+#~ msgid "Upload Time"
+#~ msgstr "Χρόνος ανεβάσματος"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Κατέβασμα/Ανέβασμα"
+
+#~ msgid "Remote Status"
+#~ msgstr "Κατάσταση του μακρινού πελάτη"
+
+#~ msgid "File Priority"
+#~ msgstr "Προτεραιότητα αρχείου"
+
+#~ msgid "Score"
+#~ msgstr "Σκορ"
+
+#~ msgid "Asked"
+#~ msgstr "Ερωτήθηκε"
+
+#~ msgid "Last Seen"
+#~ msgstr "Εμφανίστηκε τελευταία φορά"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Εισήλθε στην λίστα προτεραιότητας"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Εστάλησαν"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Ελήφθησαν"
+
+#~ msgid "Userhash"
+#~ msgstr "Πίνακας κατακερματισμού χρηστών"
+
+#~ msgid "Encrypted"
+#~ msgstr "Κρυπτογραφημένο"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Δείχνει το ανέβασμα / ουρά ανεβάσματος"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Πελάτες στην ουρά"
+
+#~ msgid "Current Session"
+#~ msgstr "Τρέχουσα συνεδρία"
+
+#~ msgid "Total"
+#~ msgstr "Σύνολο"
+
+#~ msgid "Requested :"
+#~ msgstr "Ζητήθηκε :"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Δημιουργία αντιγράφου ασφαλείας για προεπισκόπιση"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Παράθυρο μεταφοράς αρχείων"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Συνολικοί Χρήστες: %s | Συνολικά Αρχεία: %s"
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Κατεβασμένα (%i)"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr ""
+#~ "Ειδοποίηση: Δεν μπόρεσα να σβήσω το αρχικό '%s' μετά τη δημιουργία "
+#~ "αντιγράφου ασφαλείας"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country(): Αποτυχία φορτώματος δεδομένων χώρας από"
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Λήψη επιπέδου φίλτρου IP."
+
+#~ msgid "Makes a search."
+#~ msgstr "Εκτελεί μία αναζήτηση."
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Απέτυχε"
+
+#, fuzzy
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Τρέξε τον διακομιστή ιστού του aΜule κατά την εκκίνηση"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Κλείσιμο του aMule."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Οι παρακάτω επιλογές έχουν αλλάξει σε αυτήν την έκδοση για λόγους "
+#~ "ασφαλείας: \n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Ενεργοποιημένη υποστήριξης συσκότισης πρωτοκόλλου για εισερχόμενες και "
+#~ "εξερχόμενες συνδέσεις. \n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Απενεργοποίηση της ενημέρωσης της λίστας διακομιστών από άλλους "
+#~ "διακομιστές και πελάτες.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Για περισσότερες πληροφορίες για του λόγους αυτών των αλλαγών, ψάξτε\n"
+#~ "στo βίκυ του aMule στη διεύθυνση http://wiki.amule.org για \"fake servers"
+#~ "\" info.\n"
+#~ "Είναι σημαντικό να εκκαθαρίσετε κάθε πλαστό διακομιστή από τη λίστα σας "
+#~ "ώστε το aMule να δουλεύει σωστά."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Επιπλέον, οι ρυθμίσεις του περιηγητή ιστοσελίδων τέθηκαν στις "
+#~ "προσδιορισμένες συστήματος. Παρακαλώ ρυθμίστε τις ξανά αν χρειάζεται.\n"
 
 #~ msgid "Fetching status..."
-#~ msgstr "Ανάλκηση κατάστασης..."
+#~ msgstr "Ανάκληση κατάστασης..."
+
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Χρήστες: E: %s K: %s | Αρχεία E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Πελάτης %s στην θύρα IP %s:%d ο οποίος χρησιμοποιεί %s %s %s"
 
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() επέστρεψε NULL"
 
+#~ msgid "Firewalled"
+#~ msgstr "Πίσω από τοίχο προστασίας"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "Φορτώθηκε %d ψηφιογραφημένο γραφικό σημαίας"
+#~ msgstr[1] "Φορτώθηκαν %d ψηφιογραφημένα γραφικά σημαιών"
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr ""
+#~ "Το αρχείο %s είναι πολύ μεγάλο για το Μουλάρι: το μέγιστο επιτρεπτό είναι "
+#~ "4 GB."
+
+#~ msgid "User:"
+#~ msgstr "Χρήστης:"
+
+#~ msgid "System:"
+#~ msgstr "Σύστημα:"
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Δεν υπάρχει χειριστής για αυτόν τον τύπο αρχείου"
+
+#~ msgid "File was not saved"
+#~ msgstr "Το αρχείο δεν αποθηκεύτηκε"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr ""
+#~ "Η σύνδεση απέτυχε. Αποτυχία σύνδεσης με τον προσδιορισμένο υπολογιστή\n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov <petar@post.harvard.edu>\n"
+#~ msgstr ""
+#~ "Πνευματικά Δικαιώματα (C) 2002 Petar Maymounkov <petar@post.harvard.edu>\n"
+
+#~ msgid ""
+#~ "Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Πνευματικά δικαιώματα (C) 2003-2008 η ομάδα του aMule \n"
+#~ "\n"
+
+#~ msgid "Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr "Πνευματικά δικαιώματα (C) 2002 Petar Maymounkov\n"
+
+#~ msgid "Show part file number before file name"
+#~ msgstr "Εμφάνιση του αριθμού ημιτελούς αρχείου πριν το όνομα αρχείου"
+
 #~ msgid "Message Filter"
 #~ msgstr "Φίλτρο μηνυμάτων"
 
 #~ msgid "Gui Tweaks"
-#~ msgstr "Φινίρισματα γραφικού περιβάλλοντος"
+#~ msgstr "Φινίρισμα γραφικού περιβάλλοντος"
 
 #~ msgid "Core Tweaks"
-#~ msgstr "Φινιρίσματα πυρήνα"
+#~ msgstr "Φινίρισμα πυρήνα"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Δεν υπάρχει χειριστής για αυτόν τον τύπο αρχείου"
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Χρόνος καθυστέρησης επεξηγήσεων σε δευτερόλεπτα"
 
-#~ msgid "File was not saved"
-#~ msgstr "Το αρχείο δεν αποθυκεύτηκε"
+#~ msgid "Skin Support"
+#~ msgstr "Υποστήριξη θεμάτων"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgid "- no skins available -"
+#~ msgstr "- δεν υπάρχουν θέματα -"
+
+#~ msgid "Other"
+#~ msgstr "Άλλο"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Κατάλογος Συνδεδεμένων Υπογραφών:"
+
+#~ msgid "Show messages in log"
+#~ msgstr "Εμφάνιση μηνημάτων στο αρχείο καταχωρίσεων"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Ρυθμίσεις διήθησης:"
+
+#~ msgid "UDP port for extended server requests (TCP+3):"
+#~ msgstr "Θύρα UDP για εκτεταμένες αιτήσεις διακομιστή (TCP+3):"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Χωρητικότητες γραμμών"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
 #~ msgstr ""
-#~ "Το αρχείο %s είναι πολύ μεγάλο για το Μουλάρι: το μέγιστο επιτρεπτό είναι "
-#~ "4 GB."
+#~ "Σημείωση: Αυτές οι τιμές\n"
+#~ "χρημιμοποιούνται μόνο για στατιστική."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Πρότυπη θύρα TCP πελάτη:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Εκτεταμένη θύρα UDP πελάτη:"
+
+#~ msgid "Bind Address"
+#~ msgstr "Προσδεδεμένη διεύθυνση"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "Θύρα UDP για εκτεταμένες αιτήσεις στο διακομιστή (TCP+3): 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Μέγιστος αριθμός πηγών ανά αρχείο"
+
+#~ msgid "Connection limits"
+#~ msgstr "Όρια σύνδεσης"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Universal Plug and Play"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "Ενεργοποίηση UPnP"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "Θύρα UPnP TCP:"
+
+#~ msgid "Activate Intelligent Corruption Handling (I.C.H.)"
+#~ msgstr "Ενεργοποίηση της έξυπνης διαχείρισης φθοράς (Ε.Δ.Φ.)"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr ""
+#~ "Εκκίνηση του επόμενου σταματημένου αρχείου όταν ένα αρχείο ολοκληρωθεί"
+
+#~ msgid "Check disk space"
+#~ msgstr "Έλεγχος χώρου στο δίσκο"
+
+#~ msgid "Min disk space:"
+#~ msgstr "Ελάχιστος χώρος στο δίσκο:"
+
+#~ msgid "Incoming"
+#~ msgstr "Εισερχόμενα"
+
+#~ msgid "Temporary"
+#~ msgstr "Προσωρινά"
+
+#~ msgid "Shared"
+#~ msgstr "Κοινόχρηστα"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Επιλογή χρωμάτων για στατιστικές"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Πρόοδος αρχείων λίστας κατεβασμάτων"
+
+#~ msgid "Show percentage"
+#~ msgstr "Εμφάνιση ποσοστού"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Εμφάνιση μπάρας προόδου"
+
+#~ msgid "Progressbar style"
+#~ msgstr "Τύπος μπάρος προόδου"
+
+#~ msgid "Enable skin support "
+#~ msgstr "Ενεργοποίηση υποστήριξης θεμάτων"
+
+#~ msgid "Skin:"
+#~ msgstr "Θέμα:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr ""
+#~ "Αυτόματη ταξινόμηση των αρχείων στην λίστα αναμονής κατεβάσματος (υψηλή "
+#~ "χρήση υπολογιστικής ισχύος)"
+
+#~ msgid "Show Fast eD2k Links Handler"
+#~ msgstr "Εμφάνιση γρήγορου διαχειριστή συνδέσμων eD2k"
+
+#~ msgid "Web server port"
+#~ msgstr "Θύρα διακομιστή ιστού"
+
+#~ msgid "Enable UPnP port forwarding on the web server port"
+#~ msgstr "Ενεργοποίηση προώθησης θύρας UPnP στη θύρα διακομιστή ιστού"
+
+#~ msgid "Web server UPnP TCP port"
+#~ msgstr "Θύρα UPnP TCP διακομιστή ιστού"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "Το IP του εισακούοντος περιβάλλοντος\n"
+#~ "(κενό για όλα)"
+
+#~ msgid "TCP port"
+#~ msgstr "Θύρα TCP"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Ποίος μπορεί να δει τα κοινόχρηστα αρχεία:"
+
+#~ msgid "Event types"
+#~ msgstr "Τύποι γεγονότων"
+
+#~ msgid "ERROR: can not accept web client connection\n"
+#~ msgstr "ΣΦΑΛΜΑ: Η σύνδεση πελάτη ιστού δεν μπορεί να γίνει δεκτή.\n"
+
+#~ msgid ""
+#~ "Your Auto-update server list is empty.\n"
+#~ "'Auto-update server list at startup will be disabled."
+#~ msgstr ""
+#~ "Η λίστα διακομιστών αυτόματης ενημέρωσης είναι κενή.\n"
+#~ "Η αυτόματη ενημέρωση λίστας διακομιστών κατά την εκκίνηση θα "
+#~ "απενεργοποιηθεί."
+
+#~ msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "ΣΦΑΛΜΑ: Άκυρη έκδοση αρχείου part.met: %s ==> %s"
+
+#~ msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#~ msgstr ""
+#~ "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η λίστα γνωστών αρχείων είναι φθαρμένη, περιέχει άκυρη "
+#~ "επικεφαλίδα."
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "Κάνει το aMule να ζητά άδεια πριν κλείσει."
+
+#~ msgid "Bandwith limits"
+#~ msgstr "Ευρυζωνικά όρια"
+
+#~ msgid "This UDP port is used for extended ed2k requests and Kad network"
+#~ msgstr ""
+#~ "Αυτή η θύρα UDP χρησιμοποιείται για εκτεταμένες αιτήσεις στα δίκτυα ed2k "
+#~ "και Kad"
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Εμφάνιση επιβάρυνσης στο εύρος ζώνης"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. Ενεργό"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "το AICH εμπιστεύεται κάθε κατακερματισμό (δεν συνιστάται)"
+
+#~ msgid "Disk space"
+#~ msgstr "Χώρος στο δίσκο"
+
+#~ msgid "Create Backup for preview"
+#~ msgstr "Δημιουργία αντιγράφου ασφαλείας"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Προχωρημένες επιλογές"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Μορφή μπάρας προόδου"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Ταξινόμηση στήλης"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Ποικίλα φινιρίσματα του γραφικού περιβάλλοντος"
+
+#~ msgid "File Options"
+#~ msgstr "Παράμετροι αρχείων"
 
 #~ msgid "Status text"
 #~ msgstr "Κατάσταση κειμένου"
@@ -7375,18 +8210,138 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "Αναδυόμενο κείμενο κατάστασης"
 
-#~ msgid "Please wait... "
-#~ msgstr "Παρακαλώ περιμένετε..."
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Πελάτης P2P βασισμένος στο eMule \n"
+#~ "\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr "Ιστοσελίδα: http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr "Τόπος συζήτησης: http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Συχνές Ερωτήσεις: http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr "Επικοινωνία: admin@amule.org (διοικητικά θέματα) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Πνευματικά δικαιώματα (C) 2003-2008 η ομάδα του aMule \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr "Μέρος του aMule βασίζεται στο \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr "Πνευματικά δικαιώματα (C) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "Για μια ταινία μπορείτε να πείτε τη διάρκεια, το σενάριο, τη γλώσσα ...\n"
+#~ "και αν είναι πλαστό, μπορείτε να το πείτε στούς άλλους χρήστες του aMule."
+
+#~ msgid "Misc Options"
+#~ msgstr "Διάφορες επιλογές"
+
+#~ msgid "Server Options"
+#~ msgstr "Επιλογές διακομιστή"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Εμφάνιση του διακομιστή motd κατά τη σύνδεση ..."
+
+#~ msgid "eD2k Info"
+#~ msgstr "Πληροφορίες eD2k"
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Απενεργοποίηση/Ενεργοποίηση"
+
+#~ msgid "Authentication"
+#~ msgstr "Πιστοποίηση"
 
 #~ msgid "General Settings"
 #~ msgstr "Γενικές ρυθμίσεις"
 
+#~ msgid "Hard limit"
+#~ msgstr "Σκληρό όριο"
+
+#~ msgid "Max Connections"
+#~ msgstr "Μέγιστες συνδέσεις"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "Φινίρισμα γραφικού περιβάλλοντος"
 
 #~ msgid "Remote Control"
 #~ msgstr "Τηλεχειριστήριο"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Ο τύπος του πλοηγού δεν μπορεί να προσδιοριστεί"
+
+#~ msgid "User Defined"
+#~ msgstr "Επιλογή χρήστη"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - Το μουλάρι του Λίνουξ"
+
+#~ msgid "System Default"
+#~ msgstr "Προεπιλογή συστήματος"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Εδώ επιλέγετε τον περιηγητή ιστοσελίδων σας"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Προσωπικός περιηγητής ιστοσελίδων"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Γράψτε το όνομα του περιηγητή ιστοσελίδων σας εδώ. Για χρήση του "
+#~ "προσωπικού φυλλομετρητή ιστοσελίδων, επιλέξτε το \"Προσωπικό\" στοιχείο "
+#~ "του μενού από την παραπάνω λίστα."
+
+#~ msgid "Please wait... "
+#~ msgstr "Παρακαλώ περιμένετε..."
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr ""
 #~ "Δεν μπόρεσε να προσδιορίσει την εντολή για το τρέξιμο του φυλλομετρηρή "
@@ -7517,9 +8472,6 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "Αντιγραφή συνδέσμων ED2k πρόχειρο"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "Μοιραίο σφάλμα: Αποτυχία δημιουργίας χρονομέτρου"
-
 #~ msgid "ED2K: Connecting"
 #~ msgstr "ED2K: Σε διαδικασία σύνδεσης"
 
@@ -7634,11 +8586,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "Σφάλμα: Άκυρή έκδοση αρχείου part.met: %s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr ""
-#~ "Σφάλμα: το %s (%s) είναι φθαρμένο (εσφαλμένη απαρίθμηση ετικέτας), δεν "
-#~ "είναι δυνατή η φόρτωση του αρχείου."
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "Προειδοποίηση: το %s μπορεί να είναι φθαρμένο (%i)"

aMule-2.2.6.tar.bz2/po/en_GB.po -> aMule-2.3.1.tar.bz2/po/en_GB.po Changed

@@ -1,5 +1,5 @@
 # aMule i18n resource file.
-# Copyright (C) 2004 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the aMule package.
 # Kry <elkry@users.sourceforge.net>, 2004.
 #
@@ -7,1306 +7,1135 @@
 msgstr ""
 "Project-Id-Version: aMule CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2008-06-10 21:25+0100\n"
-"Last-Translator: Dévai Tamás <devait@vnet.hu>\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr ""
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
 msgstr ""
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
 msgstr ""
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
 msgstr ""
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
 msgstr ""
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
 msgstr ""
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
 msgstr ""
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
 msgstr ""
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
+msgid "web server running on pid %d"
 msgstr ""
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
+#: src/amule.cpp:658
+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/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
 msgstr ""
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/BaseClient.cpp:1967
-#, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
+msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:768
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
+msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
+#: src/amule.cpp:774
+#, c-format
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
-msgstr ""
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/UserEvents.h:60
-msgid "Download completed"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
 msgstr ""
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
 msgstr ""
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/UserEvents.h:87
-msgid "Message sender."
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/UserEvents.h:92
-msgid "Out of space"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
 msgstr ""
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
+#: src/amule.cpp:1879
+msgid "Kad started."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:501
 msgid ""
-"Feedback from: %s (%s)\n"
+"'All-Platform' p2p client based on eMule \n"
 "\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr ""
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 msgstr ""
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
 msgstr ""
 
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
 msgstr ""
 
-#: src/TextClient.h:60
-msgid "aMule text client"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ERROR: cannot accept web client connection\n"
-
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
 msgstr ""
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
 msgstr ""
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
 msgstr ""
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
 msgstr ""
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
 msgstr ""
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr ""
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr ""
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
+msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr ""
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr ""
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
+#: src/BaseClient.cpp:2899
+#, c-format
 msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
+#: src/CatDialog.cpp:87
+msgid "New Category"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr ""
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr ""
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
+msgid "%.1f kB/s"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f KB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f GB"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%.2f TB"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "Unable to open %s"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
+#: src/ClientTCPSocket.cpp:982
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Done in %.2f s"
-msgstr ""
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
+#: src/CorruptionBlackBox.cpp:227
+#, c-format
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
+#: src/DataToText.cpp:37
+msgid "Auto [Lo]"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
-#, c-format
-msgid "Processing file number %u: %s"
+#: src/DataToText.cpp:38
+msgid "Auto [No]"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+#: src/DataToText.cpp:39
+msgid "Auto [Hi]"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
-#, c-format
-msgid "%s ---> Non existant file !\n"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
 msgstr ""
 
-#: src/DataToText.cpp:37
-msgid "Auto [Lo]"
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
 msgstr ""
 
-#: src/DataToText.cpp:38
-msgid "Auto [No]"
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
 msgstr ""
 
-#: src/DataToText.cpp:39
-msgid "Auto [Hi]"
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
 msgstr ""
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
 msgstr ""
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr ""
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr ""
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr ""
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
 msgstr ""
 
 #: src/DataToText.cpp:66
@@ -1333,8 +1162,7 @@
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr ""
 
@@ -1366,8 +1194,8 @@
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr ""
 
@@ -1391,8 +1219,8 @@
 msgid "Search Result"
 msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr ""
 
@@ -1416,7 +1244,7 @@
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr ""
 
@@ -1428,5491 +1256,5928 @@
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
 
-#: src/Preferences.cpp:629
-msgid "Albanian"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
 msgstr ""
 
-#: src/Preferences.cpp:630
-msgid "Arabic"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
 msgstr ""
 
-#: src/Preferences.cpp:631
-msgid "Asturian"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
 msgstr ""
 
-#: src/Preferences.cpp:632
-msgid "Basque"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
 msgstr ""
 
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
 msgstr ""
 
-#: src/Preferences.cpp:634
-msgid "Catalan"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
 msgstr ""
 
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
 msgstr ""
 
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
 msgstr ""
 
-#: src/Preferences.cpp:637
-msgid "Croatian"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
 msgstr ""
 
-#: src/Preferences.cpp:638
-msgid "Czech"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
 msgstr ""
 
-#: src/Preferences.cpp:639
-msgid "Danish"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
 msgstr ""
 
-#: src/Preferences.cpp:640
-msgid "Dutch"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
 msgstr ""
 
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
 
-#: src/Preferences.cpp:642
-msgid "Estonian"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
 msgstr ""
 
-#: src/Preferences.cpp:643
-msgid "Finnish"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
 msgstr ""
 
-#: src/Preferences.cpp:644
-msgid "French"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
 msgstr ""
 
-#: src/Preferences.cpp:645
-msgid "Galician"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
 msgstr ""
 
-#: src/Preferences.cpp:646
-msgid "German"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
 msgstr ""
 
-#: src/Preferences.cpp:647
-msgid "Greek"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/Preferences.cpp:648
-msgid "Hebrew"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/Preferences.cpp:649
-msgid "Hungarian"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/Preferences.cpp:650
-msgid "Italian"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
 msgstr ""
 
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
 msgstr ""
 
-#: src/Preferences.cpp:652
-msgid "Japanese"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
 msgstr ""
 
-#: src/Preferences.cpp:653
-msgid "Korean"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
 msgstr ""
 
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:656
-msgid "Polish"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
 msgstr ""
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
 msgstr ""
 
-#: src/Preferences.cpp:659
-msgid "Russian"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
 msgstr ""
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
 msgstr ""
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
 msgstr ""
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
 msgstr ""
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
+#: src/DownloadListCtrl.cpp:1268
+#, c-format
+msgid "Downloads (%i)"
 msgstr ""
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
+#: src/DownloadListCtrl.cpp:1412
+msgid ""
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
+msgstr ""
+
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr ""
+
+#: src/DownloadListCtrl.cpp:1461
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr ""
+
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/Preferences.cpp:1680
+#: src/DownloadQueue.cpp:113
+#, c-format
+msgid "Loading temp files from %s."
+msgstr ""
+
+#: src/DownloadQueue.cpp:132
+#, c-format
+msgid "Loading PartFile %u of %u"
+msgstr ""
+
+#: src/DownloadQueue.cpp:154
 msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
+msgstr ""
+
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/Preferences.cpp:1681
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr ""
+
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Default port will be used (%d)"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
+#: src/DownloadQueue.cpp:374
+#, c-format
+msgid "Downloading %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
+#: src/DownloadQueue.cpp:382
+#, c-format
+msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
+#: src/DownloadQueue.cpp:394
+#, c-format
+msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
+#: src/DownloadQueue.cpp:399
+#, c-format
+msgid "You are already trying to download the file %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
+#: src/DownloadQueue.cpp:1401
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
+#: src/DownloadQueue.cpp:1409
+#, c-format
+msgid "Unknown protocol of link: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
+#: src/DownloadQueue.cpp:1430
+#, c-format
+msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
+#: src/ExternalConn.cpp:278
+msgid "External connection closed."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:144
+#: src/ExternalConn.cpp:317
+msgid "External connections disabled due to empty password!"
+msgstr ""
+
+#: src/ExternalConn.cpp:340
+msgid "External connections disabled in config file"
+msgstr ""
+
+#: src/ExternalConn.cpp:400
+msgid "New external connection accepted"
+msgstr ""
+
+#: src/ExternalConn.cpp:403
+msgid "ERROR: couldn't accept a new external connection"
+msgstr ""
+
+#: src/ExternalConn.cpp:421
+msgid "External connection refused due to empty password in preferences!"
+msgstr ""
+
+#: src/ExternalConn.cpp:430
+#, c-format
+msgid "Connecting client: %s %s"
+msgstr ""
+
+#: src/ExternalConn.cpp:432
+msgid "Unknown version"
+msgstr ""
+
+#: src/ExternalConn.cpp:442
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Incorrect EC version ID, there might be binary incompatibility. Use core and "
+"remote from same snapshot."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
+#: src/ExternalConn.cpp:447
+msgid ""
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
+#: src/ExternalConn.cpp:475
+msgid "Invalid protocol version."
+msgstr ""
+
+#: src/ExternalConn.cpp:480
+msgid "Missing protocol version tag."
+msgstr ""
+
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:149
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr ""
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
+msgstr ""
+
+#: src/ExternalConn.cpp:521
+msgid "Access granted."
+msgstr ""
+
+#: src/ExternalConn.cpp:529
 #, c-format
-msgid "Are you sure you want to delete the static server %s"
+msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
+#: src/ExternalConn.cpp:799
+#, c-format
+msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:346
+#: src/ExternalConn.cpp:801
 #, c-format
-msgid "Failed to open '%s'"
+msgid "FileHash not found: %s"
+msgstr ""
+
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
+msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:369
+#: src/ExternalConn.cpp:876
+msgid "Server not added"
+msgstr ""
+
+#: src/ExternalConn.cpp:894
 #, c-format
-msgid "Servers (%i)"
+msgid "server not found: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
+#: src/ExternalConn.cpp:910
+msgid "need to define server to be removed"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
+#: src/ExternalConn.cpp:924
+msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
+#: src/ExternalConn.cpp:1102
+msgid "Search in progress. Refetch results in a moment!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
+#: src/ExternalConn.cpp:1108
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
+#: src/ExternalConn.cpp:1306
+msgid "No points for graph."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
+#: src/ExternalConn.cpp:1315
+msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
+#: src/ExternalConn.cpp:1342
+msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
+#: src/ExternalConn.cpp:1354
+msgid "Already shutting down."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
+#: src/ExternalConn.cpp:1366
+#, c-format
+msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
+#: src/ExternalConn.cpp:1372
+msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
+#: src/ExternalConn.cpp:1442
+msgid "File not found."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
+#: src/ExternalConn.cpp:1447
+msgid "Invalid file name."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
+#: src/ExternalConn.cpp:1455
+msgid "Unable to rename file."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
+#: src/ExternalConn.cpp:1790
+msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
+#: src/ExternalConn.cpp:1793
+msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
+#: src/ExternalConn.cpp:1801
+msgid "Already connected to Kad."
 msgstr ""
 
-#: src/amuleDlg.cpp:212
-#, c-format
-msgid "Running on %s"
+#: src/ExternalConn.cpp:1804
+msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
+#: src/ExternalConn.cpp:1811
+msgid "All networks are disabled."
 msgstr ""
 
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
+#: src/ExternalConn.cpp:1819
+msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
+#: src/ExternalConn.cpp:1823
+msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
+#: src/ExternalConn.cpp:1832
+#, c-format
+msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/amuleDlg.cpp:464
+#: src/ExternalConn.cpp:1835
+msgid "Invalid opcode (wrong protocol version?)"
+msgstr ""
+
+#: src/ExternalConnector.cpp:142
+#, c-format
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp:144
+#, c-format
+msgid "Unknown command '%s'.\n"
+msgstr ""
+
+#: src/ExternalConnector.cpp:156
 msgid ""
-" 'All-Platform' p2p client based on eMule \n"
 "\n"
+"This command cannot have an argument.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:467
+#: src/ExternalConnector.cpp:167
 msgid ""
-" FAQ: http://wiki.amule.org \n"
 "\n"
+"Available extensions:\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:469
+#: src/ExternalConnector.cpp:186
+#, c-format
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
 "\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
 msgstr ""
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
 msgstr ""
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
+#: src/ExternalConnector.cpp:248
+#, c-format
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
 msgstr ""
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
 msgstr ""
 
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
 msgstr ""
 
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
 msgstr ""
 
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
+#: src/ExternalConnector.cpp:302
+#, c-format
+msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
+#: src/ExternalConnector.cpp:357
+#, c-format
+msgid "This is %s %s %s\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
+#: src/ExternalConnector.cpp:359
+#, c-format
+msgid "This is %s %s\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
+#: src/ExternalConnector.cpp:414
+#, c-format
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
 msgstr ""
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
 msgstr ""
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
 msgstr ""
 
-#: src/amuleDlg.cpp:836
-#, c-format
-msgid "aMule (%s | Disconnected)"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
 msgstr ""
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
 msgstr ""
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/amuleDlg.cpp:1182
-#, c-format
-msgid "Skin directory '%s' does not exist"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/amuleDlg.cpp:1187
-#, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
 msgstr ""
 
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
 msgstr ""
 
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
 msgstr ""
 
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
+#: src/FileDetailDialog.cpp:113
+#, c-format
+msgid "%.1f%% done"
 msgstr ""
 
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
 msgstr ""
 
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
 msgstr ""
 
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
 msgstr ""
 
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
 msgstr ""
 
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
 msgstr ""
 
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
 msgstr ""
 
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
 msgstr ""
 
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
 msgstr ""
 
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
 msgstr ""
 
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
 msgstr ""
 
-#: src/amuleDlg.cpp:1468
-msgid "No network"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
+#: src/GenericClientListCtrl.cpp:547
+msgid "Send message to user"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
+#: src/GenericClientListCtrl.cpp:548
+msgid "Message to send:"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
+#: src/GenericClientListCtrl.cpp:587
+msgid "Remove from friends"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
+#: src/GenericClientListCtrl.cpp:598
+msgid "Send message"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
+#: src/GenericClientListCtrl.cpp:600
+msgid "Swap to this file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
+#: src/GenericClientListCtrl.cpp:943
+msgid "A4AF"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
+#: src/GenericClientListCtrl.cpp:995
+#, c-format
+msgid "On Queue: %u (%i)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
+msgid "Asked for another file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
+#: src/GenericClientListCtrl.cpp:1026
+#, c-format
+msgid "On Queue: %u"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+#: src/HTTPDownload.cpp:205
+#, c-format
+msgid "Unable to create destination file %s for download!"
 msgstr ""
-"Your auto-update server list is empty.\n"
-"'Auto-update server list at startup' will be disabled."
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
+#: src/HTTPDownload.cpp:233
+#, c-format
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
+#: src/HTTPDownload.cpp:275
+#, c-format
+msgid "Downloaded %d bytes"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
+#: src/HTTPDownload.cpp:279
+#, c-format
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:656
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+#: src/IP2Country.cpp:100
+#, c-format
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
+#, c-format
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
+#: src/IP2Country.cpp:140
+#, c-format
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:920
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Choose a folder for %s"
+msgid "Successfully updated %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, c-format
+msgid "Failed to download %s from %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "Executable%s"
+msgid "Failed to load country data for '%s'."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/IPFilter.cpp:299
+#, c-format
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1031
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr ""
+
+#: src/IPFilter.cpp:329
+#, c-format
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connections Graph Scale: %d"
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr ""
+
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
+msgstr ""
+
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Nodes (%u)"
+msgstr ""
+
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr ""
+
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr ""
+
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr ""
+
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr ""
+
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr ""
+
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr ""
+
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
+msgid "Keyword for search: %s"
+msgstr ""
+
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr ""
+
+#: src/kademlia/routing/RoutingZone.cpp:172
+msgid ""
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
+msgstr ""
+
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
+#, c-format
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
+msgstr ""
+
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1114
-#, fuzzy
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "This UDP port is used for extended eD2k requests and Kad network"
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr ""
+
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr ""
+
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr ""
+
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr ""
+
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
+msgstr ""
+
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
+msgstr ""
+
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
+msgstr ""
+
+#: src/libs/common/Format.cpp:307
 #, c-format
-msgid "Execute command on `%s' event"
+msgid "Unknown error %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
 msgstr ""
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
 msgstr ""
 
-#: src/ExternalConn.cpp:116
-msgid "External connection closed."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
 msgstr ""
 
-#: src/ExternalConn.cpp:143
-msgid "External connections disabled due to empty password!"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/ExternalConn.cpp:168
-msgid "External connections disabled in config file"
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
 msgstr ""
 
-#: src/ExternalConn.cpp:217
-msgid "New external connection accepted"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
 msgstr ""
 
-#: src/ExternalConn.cpp:220
-msgid "ERROR: couldn't accept a new external connection"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/ExternalConn.cpp:239
-msgid "External connection refused due to empty password in preferences!"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/ExternalConn.cpp:249
-#, c-format
-msgid "Connecting client: %s %s"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
 msgstr ""
 
-#: src/ExternalConn.cpp:251
-msgid "Unknown version"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/ExternalConn.cpp:262
-msgid ""
-"Incorrect EC version ID, there might be binary incompatibility. Use core and "
-"remote from same snapshot."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/ExternalConn.cpp:267
-msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
 msgstr ""
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ExternalConn.cpp:292
-msgid "Invalid protocol version."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/ExternalConn.cpp:296
-msgid "Missing protocol version tag."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
 msgstr ""
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
 msgstr ""
 
-#: src/ExternalConn.cpp:306
-msgid "Access granted."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
 msgstr ""
 
-#: src/ExternalConn.cpp:564
-#, c-format
-msgid "Remote PartFile command failed: FileHash not found: %s"
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
 msgstr ""
 
-#: src/ExternalConn.cpp:566
-#, c-format
-msgid "FileHash not found: %s"
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
 msgstr ""
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
-msgid "OOPS! OpCode processing error!"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
 msgstr ""
 
-#: src/ExternalConn.cpp:659
-msgid "Server not added"
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
 msgstr ""
 
-#: src/ExternalConn.cpp:677
-#, c-format
-msgid "server not found: %s"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
 msgstr ""
 
-#: src/ExternalConn.cpp:693
-msgid "need to define server to be removed"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
 msgstr ""
 
-#: src/ExternalConn.cpp:707
-msgid "eD2k is disabled in preferences."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
 msgstr ""
 
-#: src/ExternalConn.cpp:803
-msgid "Search in progress. Refetch results in a moment!"
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/ExternalConn.cpp:808
-msgid "WebSearch from remote interface makes no sense."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
 msgstr ""
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
 msgstr ""
 
-#: src/ExternalConn.cpp:1020
-msgid "No points for graph."
+#: src/MuleTrayIcon.cpp:304
+#, c-format
+msgid "UL: %u"
 msgstr ""
 
-#: src/ExternalConn.cpp:1029
-msgid "Your client is not configured for this detail level."
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
 msgstr ""
 
-#: src/ExternalConn.cpp:1057
-msgid "External Connection: shutdown requested"
+#: src/MuleTrayIcon.cpp:314
+#, c-format
+msgid "DL: %u"
 msgstr ""
 
-#: src/ExternalConn.cpp:1069
-msgid "Already shutting down."
+#: src/MuleTrayIcon.cpp:318
+#, c-format
+msgid "Download speed: %.1f"
 msgstr ""
 
-#: src/ExternalConn.cpp:1077
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "ExternalConn: adding link '%s'."
+msgid "Upload speed: %.1f"
 msgstr ""
 
-#: src/ExternalConn.cpp:1083
-msgid "Invalid link or already on list."
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
 msgstr ""
 
-#: src/ExternalConn.cpp:1168
-msgid "File not found."
+#: src/MuleTrayIcon.cpp:330
+#, c-format
+msgid "Nickname: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1173
-msgid "Invalid file name."
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/ExternalConn.cpp:1181
-msgid "Unable to rename file."
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1405
-msgid "Already connected to eD2k."
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
 msgstr ""
 
-#: src/ExternalConn.cpp:1408
-msgid "Connecting to eD2k..."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1416
-msgid "Already connected to Kad."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1419
-msgid "Connecting to Kad..."
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
 msgstr ""
 
-#: src/ExternalConn.cpp:1424
-msgid "All networks are disabled."
+#: src/MuleTrayIcon.cpp:365
+#, c-format
+msgid "IP: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1432
-msgid "Disconnected from eD2k."
+#: src/MuleTrayIcon.cpp:374
+#, c-format
+msgid "TCP port: %d"
 msgstr ""
 
-#: src/ExternalConn.cpp:1436
-msgid "Disconnected from Kad."
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/ExternalConn.cpp:1444
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "External Connection: invalid opcode received: %#x"
+msgid "UDP port: %d"
 msgstr ""
 
-#: src/ExternalConn.cpp:1447
-msgid "Invalid opcode (wrong protocol version?)"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/UploadClient.cpp:273
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr ""
+
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
+msgid "Uptime: %s"
 msgstr ""
 
-#: src/UploadClient.cpp:718
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Hashset requested for unknown file: %s"
+msgid "Shared files: %d"
 msgstr ""
 
-#: src/TerminationProcess.cpp:48
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
+msgid "Queued clients: %d"
 msgstr ""
 
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
+#: src/MuleTrayIcon.cpp:425
+#, c-format
+msgid "Total DL: %s"
 msgstr ""
 
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
+#: src/MuleTrayIcon.cpp:432
+#, c-format
+msgid "Total UL: %s"
 msgstr ""
 
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
 msgstr ""
 
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
 msgstr ""
 
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
 msgstr ""
 
-#: src/ServerWnd.cpp:173
-msgid "ID"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
 msgstr ""
 
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
 msgstr ""
 
-#: src/ServerWnd.cpp:208
-msgid "Running"
+#: src/muuli_wdr.cpp:75
+msgid "eD2k Link: "
 msgstr ""
 
-#: src/ServerWnd.cpp:214
-msgid "Status:"
+#: src/muuli_wdr.cpp:82
+msgid "Commit"
 msgstr ""
 
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
+#: src/muuli_wdr.cpp:83
+msgid ""
+"Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
+#: src/muuli_wdr.cpp:91
+msgid ""
+"Events are displayed here. For a complete list of events, refer to the log "
+"in the Servers-tab."
 msgstr ""
 
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
+#: src/muuli_wdr.cpp:94
+msgid "Loading ..."
 msgstr ""
 
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
+#: src/muuli_wdr.cpp:102
+msgid "Number of users on the server you are connected to ..."
 msgstr ""
 
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
+#: src/muuli_wdr.cpp:105
+msgid "Users: 0"
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
+#: src/muuli_wdr.cpp:106
+msgid ""
+"Users connected to the current server and an estimate of the total number of "
+"users."
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
+#: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
 msgstr ""
 
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
+#: src/muuli_wdr.cpp:118
+msgid ""
+"Current average upload and download rates. If enabled the numbers in the "
+"braces signify the overhead from client communication."
 msgstr ""
 
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
+#: src/muuli_wdr.cpp:126
+msgid ""
+"Displays the connected status and active transfers. Red arrows signifies "
+"that you are currently not connected, yellow arrows signify that you have "
+"low ID (firewalled) and green arrows signify that you have high ID (The "
+"optimal connection type)."
 msgstr ""
 
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
+#: src/muuli_wdr.cpp:130
+msgid "Not Connected ..."
 msgstr ""
 
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
+#: src/muuli_wdr.cpp:131
+msgid "Currently connected server."
 msgstr ""
 
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
+#: src/muuli_wdr.cpp:177
+msgid "Search"
 msgstr ""
 
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
+#: src/muuli_wdr.cpp:183
+msgid "Name:"
 msgstr ""
 
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
 msgstr ""
 
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
+msgid "Local"
 msgstr ""
 
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
+#: src/muuli_wdr.cpp:197
+msgid "Global"
 msgstr ""
 
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
+#: src/muuli_wdr.cpp:199
+msgid "FileHash"
 msgstr ""
 
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
+#: src/muuli_wdr.cpp:207
+msgid "Extended Parameters"
 msgstr ""
 
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
+#: src/muuli_wdr.cpp:213
+msgid "Filtering"
 msgstr ""
 
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
+#: src/muuli_wdr.cpp:224
+msgid "File Type"
 msgstr ""
 
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
 msgstr ""
 
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
 msgstr ""
 
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
 msgstr ""
 
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
 msgstr ""
 
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
 msgstr ""
 
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
 msgstr ""
 
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
 msgstr ""
 
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
 msgstr ""
 
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
+#: src/muuli_wdr.cpp:254
+msgid "Extension"
 msgstr ""
 
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
+#: src/muuli_wdr.cpp:260
+msgid "Min Size"
 msgstr ""
 
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+msgid "Bytes"
 msgstr ""
 
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
+msgid "KB"
 msgstr ""
 
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
 msgstr ""
 
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
 msgstr ""
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
+#: src/muuli_wdr.cpp:283
+msgid "Max Size"
 msgstr ""
 
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
+#: src/muuli_wdr.cpp:306
+msgid "Availability"
 msgstr ""
 
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
+#: src/muuli_wdr.cpp:319
+msgid "Filter:"
 msgstr ""
 
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
+#: src/muuli_wdr.cpp:328
+msgid "Filter Results"
 msgstr ""
 
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
+#: src/muuli_wdr.cpp:334
+msgid "Invert Result"
 msgstr ""
 
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
+#: src/muuli_wdr.cpp:340
+msgid "Hide Known Files"
 msgstr ""
 
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
 msgstr ""
 
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
+#: src/muuli_wdr.cpp:356
+msgid "More"
 msgstr ""
 
-#: src/Statistics.cpp:709
-msgid "Filtered"
+#: src/muuli_wdr.cpp:357
+msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
+#: src/muuli_wdr.cpp:364
+msgid "Stop"
 msgstr ""
 
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
 msgstr ""
 
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
+#: src/muuli_wdr.cpp:378
+msgid "Reset Fields"
 msgstr ""
 
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
+#: src/muuli_wdr.cpp:393
+msgid "Results"
 msgstr ""
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
+#: src/muuli_wdr.cpp:422
+msgid "Clears completed downloads"
 msgstr ""
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
 msgstr ""
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
 msgstr ""
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
+#: src/muuli_wdr.cpp:525
+msgid "Full Name :"
 msgstr ""
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
+msgid "N/A"
 msgstr ""
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
+#: src/muuli_wdr.cpp:536
+msgid "met-File :"
 msgstr ""
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
+#: src/muuli_wdr.cpp:547
+msgid "Hash :"
 msgstr ""
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
+#: src/muuli_wdr.cpp:562
+msgid "Filesize :"
 msgstr ""
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
+#: src/muuli_wdr.cpp:573
+msgid "Partfilestatus :"
 msgstr ""
 
-#: src/Statistics.cpp:731
-#, c-format
-msgid "Average file size: %s"
+#: src/muuli_wdr.cpp:584
+msgid "Last seen complete :"
 msgstr ""
 
-#: src/Statistics.cpp:872
-msgid "Operating System"
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
 msgstr ""
 
-#: src/Statistics.cpp:897
-msgid "Not Received"
+#: src/muuli_wdr.cpp:606
+msgid "Found Sources :"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
+#: src/muuli_wdr.cpp:617
+msgid "Transferring Sources :"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
+#: src/muuli_wdr.cpp:628
+msgid "Filepart-Count :"
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
+#: src/muuli_wdr.cpp:639
+msgid "Available :"
 msgstr ""
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
+#: src/muuli_wdr.cpp:650
+msgid "Datarate :"
 msgstr ""
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/muuli_wdr.cpp:661
+msgid "Download Active Time: "
 msgstr ""
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
+#: src/muuli_wdr.cpp:672
+msgid "Transferred :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
+#: src/muuli_wdr.cpp:683
+msgid "Completed Size :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
+#: src/muuli_wdr.cpp:710
+msgid "Intelligent Corruption Handling"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#: src/muuli_wdr.cpp:719
+msgid "Lost to corruption :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+#: src/muuli_wdr.cpp:730
+msgid "Gained by compression :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+#: src/muuli_wdr.cpp:741
+msgid "Packages saved by I.C.H. :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/muuli_wdr.cpp:754
+msgid "File Names"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
+#: src/muuli_wdr.cpp:763
+msgid "Takeover"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+#: src/muuli_wdr.cpp:773
+msgid "Cleanup"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
+msgid "Apply"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
+#: src/muuli_wdr.cpp:798
+msgid "Ok"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
+#: src/muuli_wdr.cpp:823
+msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
+#: src/muuli_wdr.cpp:829
+msgid ""
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
+#: src/muuli_wdr.cpp:841
+msgid "File Quality"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
 msgstr ""
 
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
 msgstr ""
 
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
 msgstr ""
 
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
 msgstr ""
 
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
 msgstr ""
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
 msgstr ""
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+#: src/muuli_wdr.cpp:854
+msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
+#: src/muuli_wdr.cpp:898
+msgid "Refresh"
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
+#: src/muuli_wdr.cpp:925
+msgid "Downloading, please wait ..."
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
+#: src/muuli_wdr.cpp:931
+msgid "Unknown size"
 msgstr ""
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
+#: src/muuli_wdr.cpp:955
+msgid "Required Information"
 msgstr ""
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
+#: src/muuli_wdr.cpp:960
+msgid "IP Address :"
 msgstr ""
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
+#: src/muuli_wdr.cpp:966
+msgid "Port :"
 msgstr ""
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
+#: src/muuli_wdr.cpp:976
+msgid "Additional Information"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
+#: src/muuli_wdr.cpp:981
+msgid "Username :"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
+#: src/muuli_wdr.cpp:987
+msgid "Userhash :"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
+#: src/muuli_wdr.cpp:1046
+msgid "Download-Speed"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
+msgid "Current"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
+msgid "Running average"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
+msgid "Session average"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
+#: src/muuli_wdr.cpp:1095
+msgid "Upload-Speed"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
+#: src/muuli_wdr.cpp:1144
+msgid "Connections"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
+msgid "Active downloads"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
+#: src/muuli_wdr.cpp:1173
+msgid "Active connections (1:1)"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
+msgid "Active uploads"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/muuli_wdr.cpp:1193
+msgid "Statistics Tree"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#: src/muuli_wdr.cpp:1223
+msgid "Username:"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
+#: src/muuli_wdr.cpp:1226
+msgid "Userhash:"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
+#: src/muuli_wdr.cpp:1249
+msgid "Client software:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
+#: src/muuli_wdr.cpp:1258
+msgid "Client version:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
+msgid "IP address:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
+#: src/muuli_wdr.cpp:1274
+msgid "User ID:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
+#: src/muuli_wdr.cpp:1281
+msgid "Server IP:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
+#: src/muuli_wdr.cpp:1290
+msgid "Server name:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
+#: src/muuli_wdr.cpp:1297
+msgid "Obfuscation:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
+#: src/muuli_wdr.cpp:1306
+msgid "Kad:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
+#: src/muuli_wdr.cpp:1317
+msgid "Transfers to client"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
+#: src/muuli_wdr.cpp:1322
+msgid "Current request:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
-msgid "Send message to user"
+#: src/muuli_wdr.cpp:1335
+msgid "Average upload rate:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
-msgid "Message to send:"
+#: src/muuli_wdr.cpp:1344
+msgid "Average download rate:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
+#: src/muuli_wdr.cpp:1351
+msgid "Uploaded (session):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
+#: src/muuli_wdr.cpp:1360
+msgid "Downloaded (session):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
+#: src/muuli_wdr.cpp:1367
+msgid "Uploaded (total):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
+#: src/muuli_wdr.cpp:1376
+msgid "Downloaded (total):"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
+#: src/muuli_wdr.cpp:1387
+msgid "Scores"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
+#: src/muuli_wdr.cpp:1394
+msgid "DL/UP modifier:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
+#: src/muuli_wdr.cpp:1403
+msgid "Secure ident:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
+#: src/muuli_wdr.cpp:1419
+msgid "Queue score:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
+#: src/muuli_wdr.cpp:1448
+msgid "Nick"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
+#: src/muuli_wdr.cpp:1452
+msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Remove from friends"
+#: src/muuli_wdr.cpp:1471
+msgid "Check for new version at startup"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
+#: src/muuli_wdr.cpp:1472
+msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
-msgid "Send message"
+#: src/muuli_wdr.cpp:1475
+msgid "Start minimized"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1017
-msgid "Swap to this file"
+#: src/muuli_wdr.cpp:1476
+msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
+#: src/muuli_wdr.cpp:1479
+msgid "Prompt on exit"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1657
-msgid "A4AF"
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/muuli_wdr.cpp:1487
+msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1721
-msgid "Asked for another file"
+#: src/muuli_wdr.cpp:1488
+msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
+#: src/muuli_wdr.cpp:1491
+msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2275
+#: src/muuli_wdr.cpp:1492
 msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
+"Enabling this will make aMule minimize to the System Tray, rather than the "
+"taskbar."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
 msgstr ""
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
+#: src/muuli_wdr.cpp:1511
+msgid "Browser Selection"
 msgstr ""
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
+#: src/muuli_wdr.cpp:1517
+msgid ""
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
 msgstr ""
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
+#: src/muuli_wdr.cpp:1525
+msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ERROR: Invalid part.met file version: %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/muuli_wdr.cpp:1527
+msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
+#: src/muuli_wdr.cpp:1532
+msgid "Video Player"
 msgstr ""
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr ""
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
+#: src/muuli_wdr.cpp:1579
+msgid "Upload"
 msgstr ""
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
+#: src/muuli_wdr.cpp:1588
+msgid "Slot Allocation"
 msgstr ""
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
 msgstr ""
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
 msgstr ""
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
+#: src/muuli_wdr.cpp:1611
+msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
 msgstr ""
 
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr ""
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
 msgstr ""
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
+#: src/muuli_wdr.cpp:1649
 msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-msgstr[1] ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+#: src/muuli_wdr.cpp:1676
+msgid "Kademlia"
 msgstr ""
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
 msgstr ""
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
+#: src/muuli_wdr.cpp:1689
+msgid "Autoconnect on startup"
 msgstr ""
 
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/muuli_wdr.cpp:1692
+msgid "Reconnect on loss"
 msgstr ""
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+#: src/muuli_wdr.cpp:1716
+msgid "Remove dead server after"
 msgstr ""
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+#: src/muuli_wdr.cpp:1722
+msgid "retries"
 msgstr ""
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
+#: src/muuli_wdr.cpp:1729
+msgid "Auto-update server list at startup"
 msgstr ""
 
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+#: src/muuli_wdr.cpp:1732
+msgid "List"
 msgstr ""
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
+#: src/muuli_wdr.cpp:1737
+msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
+#: src/muuli_wdr.cpp:1740
+msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
+#: src/muuli_wdr.cpp:1743
+msgid "Use priority system"
 msgstr ""
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/muuli_wdr.cpp:1747
+msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
+#: src/muuli_wdr.cpp:1751
+msgid "Safe connect"
 msgstr ""
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
+#: src/muuli_wdr.cpp:1755
+msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr "WARNING: Known file list corrupted, contains invalid header."
+#: src/muuli_wdr.cpp:1758
+msgid "Set manually added servers to High Priority"
+msgstr ""
 
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
 msgstr ""
 
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
 msgstr ""
 
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
 
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1791
+msgid "Add files to download in pause mode"
+msgstr ""
 
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
+#: src/muuli_wdr.cpp:1794
+msgid "Add files to download with auto priority"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
+#: src/muuli_wdr.cpp:1797
+msgid "Try to download first and last chunks first"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
+#: src/muuli_wdr.cpp:1805
+msgid "From the same category"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:104
-#, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr ""
 
-#: src/ServerConnect.cpp:69
+#: src/muuli_wdr.cpp:1812
 msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
 msgstr ""
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
 msgstr ""
 
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
 
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
 msgstr ""
 
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
 msgstr ""
 
-#: src/ServerConnect.cpp:381
-#, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1884
+msgid "(Right click on folder icon for recursive share)"
+msgstr ""
 
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
+#: src/muuli_wdr.cpp:1891
+msgid "Share hidden files"
 msgstr ""
 
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
+#: src/muuli_wdr.cpp:1911
+msgid "Graphs"
 msgstr ""
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
+msgid "Update delay : 5 secs"
 msgstr ""
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
+#: src/muuli_wdr.cpp:1920
+msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+#: src/muuli_wdr.cpp:1926
+msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
 msgstr ""
 
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr ""
 
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
 msgstr ""
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/muuli_wdr.cpp:1963
+msgid "Background"
 msgstr ""
 
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
+#: src/muuli_wdr.cpp:1964
+msgid "Grid"
 msgstr ""
 
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
+#: src/muuli_wdr.cpp:1965
+msgid "Download current"
 msgstr ""
 
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
+#: src/muuli_wdr.cpp:1966
+msgid "Download running average"
 msgstr ""
 
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
+#: src/muuli_wdr.cpp:1967
+msgid "Download session average"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+#: src/muuli_wdr.cpp:1968
+msgid "Upload current"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
+#: src/muuli_wdr.cpp:1969
+msgid "Upload running average"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
+#: src/muuli_wdr.cpp:1970
+msgid "Upload session average"
 msgstr ""
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
+#: src/muuli_wdr.cpp:1971
+msgid "Active connections"
 msgstr ""
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+#: src/muuli_wdr.cpp:1974
+msgid "Systray Icon Speedbar"
 msgstr ""
 
-#: src/TextClient.cpp:309
-msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+#: src/muuli_wdr.cpp:1975
+msgid "Kad-nodes current"
 msgstr ""
 
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
+#: src/muuli_wdr.cpp:1976
+msgid "Kad-nodes running"
 msgstr ""
 
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
+#: src/muuli_wdr.cpp:1977
+msgid "Kad-nodes session"
 msgstr ""
 
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
+msgid "Select"
 msgstr ""
 
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
 msgstr ""
 
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
+#: src/muuli_wdr.cpp:2000
+msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
+#: src/muuli_wdr.cpp:2028
+msgid "!!! WARNING !!!"
 msgstr ""
 
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
+#: src/muuli_wdr.cpp:2042
+msgid "Max new connections / 5 secs"
 msgstr ""
 
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
+#: src/muuli_wdr.cpp:2048
+msgid "File Buffer Size: 240000 bytes"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
+#: src/muuli_wdr.cpp:2054
+msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
+#: src/muuli_wdr.cpp:2060
+msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
 msgstr ""
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
 msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
 msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
 msgstr ""
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
 msgstr ""
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
 msgstr ""
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
 msgstr ""
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
 msgstr ""
 
-#: src/TextClient.cpp:809
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
 msgstr ""
 
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
 msgstr ""
 
-#: src/TextClient.cpp:828
-#, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
 msgstr ""
 
-#: src/TextClient.cpp:841
-msgid "Show short status information."
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
 msgstr ""
 
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
 msgstr ""
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
 msgstr ""
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
 msgstr ""
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/TextClient.cpp:848
+#: src/muuli_wdr.cpp:2190
 msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
 msgstr ""
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
 msgstr ""
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
 msgstr ""
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
 msgstr ""
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
 msgstr ""
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
 msgstr ""
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
 msgstr ""
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
 msgstr ""
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
 msgstr ""
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
 msgstr ""
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
 msgstr ""
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
 msgstr ""
 
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
+#: src/muuli_wdr.cpp:2326
+msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
+#: src/muuli_wdr.cpp:2330
+msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
+#: src/muuli_wdr.cpp:2354
+msgid "Title :"
 msgstr ""
 
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
+#: src/muuli_wdr.cpp:2364
+msgid "Comment :"
 msgstr ""
 
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
+#: src/muuli_wdr.cpp:2374
+msgid "Incoming Dir :"
 msgstr ""
 
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
+#: src/muuli_wdr.cpp:2387
+msgid "Change priority for new assigned files :"
 msgstr ""
 
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr ""
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
+#: src/muuli_wdr.cpp:2406
+msgid "Select color for this Category (currently selected) :"
 msgstr ""
 
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
 msgstr ""
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
+msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/TextClient.cpp:880
+#: src/muuli_wdr.cpp:2528
+msgid "Click on this button to update the servers list from URL ..."
+msgstr ""
+
+#: src/muuli_wdr.cpp:2532
+msgid "Server list"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2537
 msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+"Enter the url to a server.met file here and press the button to the left to "
+"update the list of known servers."
 msgstr ""
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
+#: src/muuli_wdr.cpp:2544
+msgid "Add server manually: Name"
 msgstr ""
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
+#: src/muuli_wdr.cpp:2548
+msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
 msgstr ""
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
+#: src/muuli_wdr.cpp:2555
+msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
+#: src/muuli_wdr.cpp:2562
+msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
+#: src/muuli_wdr.cpp:2566
+msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
 msgstr ""
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
 msgstr ""
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
+#: src/muuli_wdr.cpp:2612
+msgid "ED2K Info"
 msgstr ""
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
+#: src/muuli_wdr.cpp:2616
+msgid "Kad Info"
 msgstr ""
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
+#: src/muuli_wdr.cpp:2645
+msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
+#: src/muuli_wdr.cpp:2649
+msgid "Nodes (0)"
 msgstr ""
 
-#: src/TextClient.cpp:901
+#: src/muuli_wdr.cpp:2654
 msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+"Enter the url to a nodes.dat file here and press the button to the left to "
+"update the list of known nodes."
 msgstr ""
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
+#: src/muuli_wdr.cpp:2659
+msgid "Nodes stats"
 msgstr ""
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
+#: src/muuli_wdr.cpp:2710
+msgid "Bootstrap"
 msgstr ""
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
+#: src/muuli_wdr.cpp:2713
+msgid "New node"
 msgstr ""
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
+#: src/muuli_wdr.cpp:2718
+msgid "IP:"
 msgstr ""
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
+#: src/muuli_wdr.cpp:2747
+msgid "Port:"
 msgstr ""
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
 msgstr ""
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
+#: src/muuli_wdr.cpp:2768
+msgid "Disconnect Kad"
 msgstr ""
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/TextClient.cpp:913
+#: src/muuli_wdr.cpp:2808
 msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
 msgstr ""
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
+#: src/muuli_wdr.cpp:2811
+msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
+#: src/muuli_wdr.cpp:2814
+msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
+#: src/muuli_wdr.cpp:2816
+msgid ""
+"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
+"connections from other clients."
 msgstr ""
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
+#: src/muuli_wdr.cpp:2819
+msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+#: src/muuli_wdr.cpp:2821
+msgid ""
+"This option makes aMule use Protocol Obfuscation when connecting other "
+"clients/servers."
 msgstr ""
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
+#: src/muuli_wdr.cpp:2824
+msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
+#: src/muuli_wdr.cpp:2825
+msgid ""
+"This option makes aMule only accept obfuscated connections. You will have "
+"less sources, but all your traffic will be obfuscated"
 msgstr ""
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
+#: src/muuli_wdr.cpp:2832
+msgid "Everybody"
 msgstr ""
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
+#: src/muuli_wdr.cpp:2834
+msgid "No one"
 msgstr ""
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
+#: src/muuli_wdr.cpp:2837
+msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
+#: src/muuli_wdr.cpp:2840
+msgid "IP-Filtering"
 msgstr ""
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
+#: src/muuli_wdr.cpp:2847
+msgid "Filter clients"
 msgstr ""
 
-#: src/TextClient.cpp:940
-msgid "Show log."
+#: src/muuli_wdr.cpp:2849
+msgid ""
+"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
+#: src/muuli_wdr.cpp:2852
+msgid "Filter servers"
 msgstr ""
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
+#: src/muuli_wdr.cpp:2854
+msgid ""
+"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Deprecated command, use '%s' instead."
+#: src/muuli_wdr.cpp:2861
+msgid "Reload List"
 msgstr ""
 
-#: src/TextClient.cpp:952
-#, c-format
+#: src/muuli_wdr.cpp:2862
+msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2870
+msgid "URL:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2876
+msgid "Update now"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2881
+msgid "Auto-update ipfilter at startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2886
+msgid "Filtering Level:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2896
+msgid "Always filter LAN IPs"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2900
+msgid "Paranoid handling of non-matching IPs"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2902
 msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
+"Rejects packet if the client ip is different from the ip where the packet is "
+"received from. Use with caution."
 msgstr ""
 
-#: src/ServerSocket.cpp:259
-#, c-format
-msgid "ERROR: %s (%s) - %s"
+#: src/muuli_wdr.cpp:2905
+msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/ServerSocket.cpp:274
-#, c-format
-msgid "WARNING: %s (%s) - %s"
+#: src/muuli_wdr.cpp:2906
+msgid ""
+"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
+"file."
 msgstr ""
 
-#: src/ServerSocket.cpp:417
-#, c-format
-msgid "New clientid is %u"
+#: src/muuli_wdr.cpp:2925
+msgid "Enable Online-Signature"
 msgstr ""
 
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
+#: src/muuli_wdr.cpp:2927
+msgid ""
+"Enables the writing of the OS file, which can be used by external apps to "
+"create signatures and the like."
 msgstr ""
 
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
+#: src/muuli_wdr.cpp:2932
+msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
+#: src/muuli_wdr.cpp:2936
+msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
 msgstr ""
 
-#: src/ServerSocket.cpp:539
-#, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:2952
+msgid ""
+"Click here to select the directory containing the the Online Signature files."
+msgstr ""
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
+#: src/muuli_wdr.cpp:2974
+msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
+#: src/muuli_wdr.cpp:2977
+msgid "Filter all messages"
 msgstr ""
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
+#: src/muuli_wdr.cpp:2980
+msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
+#: src/muuli_wdr.cpp:2983
+msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
+#: src/muuli_wdr.cpp:2986
+msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
+msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
 msgstr ""
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
+#: src/muuli_wdr.cpp:2998
+msgid "Comments"
 msgstr ""
 
-#: src/ServerSocket.cpp:760
-#, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
+#: src/muuli_wdr.cpp:3001
+msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
 msgstr ""
 
-#: src/IP2Country.cpp:105
-#, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr ""
 
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
 msgstr ""
 
-#: src/TransferWnd.cpp:342
-msgid "All others"
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
 msgstr ""
 
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
 msgstr ""
 
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
+#: src/muuli_wdr.cpp:3050
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
+#: src/muuli_wdr.cpp:3051
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
+#: src/muuli_wdr.cpp:3056
+msgid "Proxy type:"
 msgstr ""
 
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
+#: src/muuli_wdr.cpp:3069
+msgid "Proxy host:"
 msgstr ""
 
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
+#: src/muuli_wdr.cpp:3073
+msgid "The proxy host name"
 msgstr ""
 
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
+#: src/muuli_wdr.cpp:3076
+msgid "Proxy port:"
 msgstr ""
 
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
+#: src/muuli_wdr.cpp:3080
+msgid "The proxy port"
 msgstr ""
 
-#: src/TransferWnd.cpp:367
-msgid "Add category"
+#: src/muuli_wdr.cpp:3101
+msgid "Connect to:"
 msgstr ""
 
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
+#: src/muuli_wdr.cpp:3115
+msgid "Login to remote amule"
 msgstr ""
 
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
+#: src/muuli_wdr.cpp:3120
+msgid "User name"
 msgstr ""
 
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
+#: src/muuli_wdr.cpp:3137
+msgid "Remember those settings"
 msgstr ""
 
-#: src/KnownFile.cpp:1360
-msgid "File size"
+#: src/muuli_wdr.cpp:3166
+msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
+#: src/muuli_wdr.cpp:3169
+msgid "Message Categories:"
 msgstr ""
 
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
 msgstr ""
 
-#: src/KnownFile.cpp:1363
-msgid "Requested"
+#: src/muuli_wdr.cpp:3222
+msgid "Add imports"
 msgstr ""
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
+#: src/muuli_wdr.cpp:3226
+msgid "Retry selected"
 msgstr ""
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
+#: src/muuli_wdr.cpp:3229
+msgid "Remove selected"
 msgstr ""
 
-#: src/PartFileConvert.cpp:208
-#, c-format
-msgid "Importing %s: %s"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr ""
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
 msgstr ""
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
 msgstr ""
 
-#: src/PartFileConvert.cpp:331
-#, c-format
-msgid "Loading data from old download file (%u of %u)"
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
 msgstr ""
 
-#: src/PartFileConvert.cpp:351
-#, c-format
-msgid "Saving data block into new single download file (%u of %u)"
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
 msgstr ""
 
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
 msgstr ""
 
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:176
-#, c-format
-msgid "%s (Disk: %s)"
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
+#: src/muuli_wdr.cpp:3527
+msgid "Connect to any server and/or Kad"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
 msgstr ""
 
-#: src/OtherFunctions.cpp:112
+#: src/OtherFunctions.cpp:106
 msgid "byte"
 msgid_plural "bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/OtherFunctions.cpp:114
+#: src/OtherFunctions.cpp:108
 msgid "kB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr ""
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr ""
-
-#: src/OtherFunctions.cpp:120
+#: src/OtherFunctions.cpp:114
 msgid "TB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:130
+#: src/OtherFunctions.cpp:124
 msgid "k"
 msgstr ""
 
-#: src/OtherFunctions.cpp:132
+#: src/OtherFunctions.cpp:126
 msgid "M"
 msgstr ""
 
-#: src/OtherFunctions.cpp:134
+#: src/OtherFunctions.cpp:128
 msgid "G"
 msgstr ""
 
-#: src/OtherFunctions.cpp:136
+#: src/OtherFunctions.cpp:130
 msgid "T"
 msgstr ""
 
-#: src/OtherFunctions.cpp:143
+#: src/OtherFunctions.cpp:137
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/OtherFunctions.cpp:147
+#: src/OtherFunctions.cpp:141
 msgid "MB/s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
 msgid "secs"
 msgstr ""
 
-#: src/OtherFunctions.cpp:170
+#: src/OtherFunctions.cpp:157
 msgid "mins"
 msgstr ""
 
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
 msgid "hours"
 msgstr ""
 
-#: src/OtherFunctions.cpp:185
+#: src/OtherFunctions.cpp:163
 msgid "Days"
 msgstr ""
 
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
+#: src/OtherFunctions.cpp:671
+msgid "all"
 msgstr ""
 
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
+#: src/OtherFunctions.cpp:672
+msgid "all others"
 msgstr ""
 
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
 msgstr ""
 
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
 msgstr ""
 
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
 msgstr ""
 
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
 msgstr ""
 
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
 msgstr ""
 
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
 msgstr ""
 
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
+#: src/PartFileConvert.cpp:200
+#, c-format
+msgid "Importing %s: %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:693
-msgid "all"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
 msgstr ""
 
-#: src/OtherFunctions.cpp:694
-msgid "all others"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
 msgstr ""
 
-#: src/IPFilter.cpp:285
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/IPFilter.cpp:326
+#: src/PartFileConvert.cpp:347
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
 
-#: src/IPFilter.cpp:331
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr ""
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:169
 #, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
+msgid "%s (Disk: %s)"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:194
+msgid ""
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:198
+msgid ""
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr ""
+
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr ""
+
+#: src/PartFile.cpp:336
+#, c-format
+msgid "Trying to load backup of met-file from %s"
+msgstr ""
+
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr ""
+
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr ""
+
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr ""
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr ""
+
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+msgstr ""
+
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr ""
+
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr ""
+
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr ""
+
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr ""
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr ""
+
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr ""
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr ""
+
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr ""
+
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr ""
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr ""
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/IPFilter.cpp:333
+#: src/PartFile.cpp:1049
 #, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
+msgid "Partfile %s (%s) has no seeds file"
+msgstr ""
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr ""
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr ""
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
+msgid ""
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/PartFile.cpp:1175
 #, c-format
-msgid "Active connections (1:%u)"
+msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:114
+#: src/PartFile.cpp:2128
 #, c-format
-msgid "%.2f%% done"
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/muuli_wdr.cpp:73
-msgid "eD2k Link: "
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:80
-msgid "Commit"
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:81
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr ""
+
+#: src/PartFile.cpp:2292
+#, c-format
 msgid ""
-"Click here to add the eD2k link in the text control to your download queue."
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Events are displayed here. For a complete list of events, refer to the log "
-"in the Servers-tab."
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:92
-msgid "Loading ..."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:101
-msgid "Number of users on the server you are connected to ..."
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:104
-msgid "Users: 0"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:105
-msgid ""
-"Users connected to the current server and an estimate of the total number of "
-"users."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:117
-msgid ""
-"Current average upload and download rates. If enabled the numbers in the "
-"braces signify the overhead from client communication."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:125
-msgid ""
-"Displays the connected status and active transfers. Red arrows signifies "
-"that you are currently not connected, yellow arrows signify that you have "
-"low ID (firewalled) and green arrows signify that you have high ID (The "
-"optimal connection type)."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
 msgstr ""
 
-#: src/muuli_wdr.cpp:129
-msgid "Not Connected ..."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/muuli_wdr.cpp:130
-msgid "Currently connected server."
+#: src/Preferences.cpp:630
+msgid "System default"
 msgstr ""
 
-#: src/muuli_wdr.cpp:176
-msgid "Search"
+#: src/Preferences.cpp:631
+msgid "Albanian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:182
-msgid "Name:"
+#: src/Preferences.cpp:632
+msgid "Arabic"
 msgstr ""
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
-msgid "Local"
+#: src/Preferences.cpp:633
+msgid "Asturian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:196
-msgid "Global"
+#: src/Preferences.cpp:634
+msgid "Basque"
 msgstr ""
 
-#: src/muuli_wdr.cpp:198
-msgid "FileHash"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:206
-msgid "Extended Parameters"
+#: src/Preferences.cpp:636
+msgid "Catalan"
 msgstr ""
 
-#: src/muuli_wdr.cpp:212
-msgid "Filtering"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
-msgid "File Type"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:253
-msgid "Extension"
+#: src/Preferences.cpp:639
+msgid "Croatian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:259
-msgid "Min Size"
+#: src/Preferences.cpp:640
+msgid "Czech"
 msgstr ""
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
-msgid "Bytes"
+#: src/Preferences.cpp:641
+msgid "Danish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
-msgid "KB"
+#: src/Preferences.cpp:642
+msgid "Dutch"
 msgstr ""
 
-#: src/muuli_wdr.cpp:282
-msgid "Max Size"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:305
-msgid "Availability"
+#: src/Preferences.cpp:644
+msgid "Estonian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:318
-msgid "Filter:"
+#: src/Preferences.cpp:645
+msgid "Finnish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:327
-msgid "Filter Results"
+#: src/Preferences.cpp:646
+msgid "French"
 msgstr ""
 
-#: src/muuli_wdr.cpp:333
-msgid "Invert Result"
+#: src/Preferences.cpp:647
+msgid "Galician"
 msgstr ""
 
-#: src/muuli_wdr.cpp:339
-msgid "Hide Known Files"
+#: src/Preferences.cpp:648
+msgid "German"
 msgstr ""
 
-#: src/muuli_wdr.cpp:355
-msgid "More"
+#: src/Preferences.cpp:649
+msgid "Greek"
 msgstr ""
 
-#: src/muuli_wdr.cpp:356
-msgid "Searches for more results on eD2k. Not supported for Kad yet."
+#: src/Preferences.cpp:650
+msgid "Hebrew"
 msgstr ""
 
-#: src/muuli_wdr.cpp:363
-msgid "Stop"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:377
-msgid "Reset Fields"
+#: src/Preferences.cpp:652
+msgid "Italian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:392
-msgid "Results"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:428
-msgid "Clears completed downloads"
+#: src/Preferences.cpp:654
+msgid "Japanese"
 msgstr ""
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
+#: src/Preferences.cpp:655
+msgid "Korean"
 msgstr ""
 
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:540
-msgid "Send"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
+#: src/Preferences.cpp:658
+msgid "Polish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
 msgstr ""
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:575
-msgid "Full Name :"
+#: src/Preferences.cpp:661
+msgid "Russian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
-msgid "N/A"
+#: src/Preferences.cpp:662
+msgid "Slovenian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:586
-msgid "met-File :"
+#: src/Preferences.cpp:663
+msgid "Spanish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:597
-msgid "Hash :"
+#: src/Preferences.cpp:664
+msgid "Swedish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:612
-msgid "Filesize :"
+#: src/Preferences.cpp:665
+msgid "Turkish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:623
-msgid "Partfilestatus :"
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:634
-msgid "Last seen complete :"
+#: src/Preferences.cpp:728
+msgid "Change Language"
 msgstr ""
 
-#: src/muuli_wdr.cpp:656
-msgid "Found Sources :"
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:667
-msgid "Transferring Sources :"
+#: src/Preferences.cpp:771
+msgid "No languages available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:678
-msgid "Filepart-Count :"
+#: src/Preferences.cpp:902
+msgid "no options available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:689
-msgid "Available :"
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/muuli_wdr.cpp:700
-msgid "Datarate :"
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/muuli_wdr.cpp:711
-msgid "Download Active Time: "
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
-msgid "Transferred :"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:733
-msgid "Completed Size :"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
-msgid "Intelligent Corruption Handling"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
 msgstr ""
 
-#: src/muuli_wdr.cpp:769
-msgid "Lost to corruption :"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:780
-msgid "Gained by compression :"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:791
-msgid "Packages saved by I.C.H. :"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
-msgid "File Names"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
 msgstr ""
 
-#: src/muuli_wdr.cpp:825
-msgid "Takeover"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:835
-msgid "Cleanup"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
-msgid "Apply"
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
 msgstr ""
 
-#: src/muuli_wdr.cpp:854
-msgid "Ok"
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:883
-msgid "Comment/Rate file (Text will be visible to all users)"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
 msgstr ""
 
-#: src/muuli_wdr.cpp:897
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:249
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:905
-msgid "File Quality"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
 msgstr ""
 
-#: src/muuli_wdr.cpp:920
-msgid "Choose the file rating or advice users if the file is invalid ..."
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:964
-msgid "Refresh"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:991
-msgid "Downloading, please wait ..."
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/muuli_wdr.cpp:997
-msgid "Unknown size"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1021
-msgid "Required Information"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1026
-msgid "IP Address :"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1032
-msgid "Port :"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1042
-msgid "Additional Information"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1047
-msgid "Username :"
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1053
-msgid "Userhash :"
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1206
-msgid "Download-Speed"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
-msgid "Current"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
-msgid "Running average"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
-msgid "Session average"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
-msgid "Upload-Speed"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1304
-msgid "Connections"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
-msgid "Active downloads"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1333
-msgid "Active connections (1:1)"
+#: src/PrefsUnifiedDlg.cpp:1003
+#, c-format
+msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
-msgid "Active uploads"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
-msgid "Statistics Tree"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
-msgid "Username:"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1386
-msgid "Userhash:"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1409
-msgid "Client software:"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1418
-msgid "Client version:"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1425
-msgid "IP address:"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1434
-msgid "User ID:"
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1441
-msgid "Server IP:"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, c-format
+msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1450
-msgid "Server name:"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1457
-msgid "Obfuscation:"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1466
-msgid "Kad:"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1477
-msgid "Transfers to client"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1482
-msgid "Current request:"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1495
-msgid "Average upload rate:"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1504
-msgid "Average download rate:"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1511
-msgid "Uploaded (session):"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
-msgid "Downloaded (session):"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1527
-msgid "Uploaded (total):"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1536
-msgid "Downloaded (total):"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1547
-msgid "Scores"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1554
-msgid "DL/UP modifier:"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Secure ident:"
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
+#: src/SearchListCtrl.cpp:639
+#, c-format
+msgid "Get %s for this file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1579
-msgid "Queue score:"
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1610
-msgid "Nick"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1614
-msgid "This is the name that other users will see when connecting to you."
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1634
-msgid "Check for new version at startup"
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1638
-msgid "Start minimized"
+#: src/ServerConnect.cpp:198
+#, c-format
+msgid "Connected to %s (%s:%i)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1639
-msgid "Enabling this makes aMule minimize itself upon start."
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
-msgid "Prompt on exit"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1647
-msgid "Enable Tray Icon"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1648
-msgid "This Enables/Disables the system tray (or taskbar) icon."
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1651
-msgid "Minimize to Tray Icon"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1652
-msgid ""
-"Enabling this will make aMule minimize to the System Tray, rather than the "
-"taskbar."
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
-msgid "Browser Selection"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
+#: src/ServerList.cpp:88
+#, c-format
+msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
+#: src/ServerList.cpp:93
+msgid "Server.met file not found!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
+#: src/ServerList.cpp:101
+#, c-format
+msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
+#: src/ServerList.cpp:107
+msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
+#: src/ServerList.cpp:118
+#, c-format
+msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
+#: src/ServerList.cpp:173
+#, c-format
+msgid "%i server in server.met found"
+msgid_plural "%i servers in server.met found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ServerList.cpp:175
+#, c-format
+msgid "%d server added"
+msgid_plural "%d servers added"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
+#: src/ServerList.cpp:195
+#, c-format
+msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
+#: src/ServerList.cpp:213
+#, c-format
+msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
+#: src/ServerList.cpp:232
+#, c-format
+msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
+#: src/ServerList.cpp:250
+#, c-format
+msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/ServerList.cpp:345
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"You are connected to the server you are trying to delete. please disconnect "
+"first."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1705
-msgid "Open in new tab if possible"
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1707
-msgid "Open the web page in a new tab instead of in a new window when possible"
+#: src/ServerList.cpp:685
+msgid "Failed to save server.met!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1712
-msgid "Video Player"
+#: src/ServerList.cpp:832
+msgid "Invalid URL"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Create backup for preview"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr "Bandwidth limits"
+#: src/ServerList.cpp:854
+#, c-format
+msgid "Finished downloading the server list from %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
-msgid "Upload"
+#: src/ServerList.cpp:869
+msgid ""
+"No server list address entry in 'addresses.dat' found. Please paste a valid "
+"server list address into this file in order to auto-update your server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1775
-msgid "Slot Allocation"
+#: src/ServerList.cpp:882
+#, c-format
+msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
+#: src/ServerList.cpp:891
+#, c-format
+msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1796
-msgid "This is the standard eD2k port and cannot be disabled."
+#: src/ServerList.cpp:895
+msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr "This UDP port is used for extended eD2k requests and Kad network"
+#: src/ServerList.cpp:985
+msgid ""
+"Local server is filtered by the IPFilters, reconnecting to a different "
+"server!"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1886
-msgid "Kademlia"
+#: src/ServerListCtrl.cpp:148
+msgid ""
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
-msgid "Autoconnect on startup"
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1916
-msgid "Reconnect on loss"
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Show overhead bandwidth"
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1947
-msgid "Remove dead server after"
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1953
-msgid "retries"
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1960
-msgid "Auto-update server list at startup"
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1963
-msgid "List"
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1968
-msgid "Update server list when connecting to a server"
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1971
-msgid "Update server list when a client connects"
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1974
-msgid "Use priority system"
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1978
-msgid "Use smart LowID check on connect"
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1982
-msgid "Safe connect"
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1986
-msgid "Autoconnect to servers in static list only"
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1989
-msgid "Set manually added servers to High Priority"
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2024
-msgid "Add files to download in pause mode"
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2027
-msgid "Add files to download with auto priority"
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Try to download first and last chunks first"
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2045
-msgid "From the same category"
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
+#: src/ServerWnd.cpp:171
+msgid "ID"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2122
-msgid "(Right click on folder icon for recursive share)"
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2129
-msgid "Share hidden files"
+#: src/ServerWnd.cpp:206
+msgid "Running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2149
-msgid "Graphs"
+#: src/ServerWnd.cpp:209
+msgid "Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
-msgid "Update delay : 5 secs"
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2158
-msgid "Time for average graph: 100 mins"
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2164
-msgid "Connections Graph Scale: 100 "
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2177
-msgid "Background"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2178
-msgid "Grid"
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2179
-msgid "Download current"
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2180
-msgid "Download running average"
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2181
-msgid "Download session average"
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2182
-msgid "Upload current"
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2183
-msgid "Upload running average"
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2184
-msgid "Upload session average"
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2185
-msgid "Active connections"
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2188
-msgid "Systray Icon Speedbar"
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2189
-msgid "Kad-nodes current"
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2190
-msgid "Kad-nodes running"
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2191
-msgid "Kad-nodes session"
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
-msgid "Select"
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2214
-msgid "Number of Client Versions shown (0=unlimited)"
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2272
-msgid "!!! WARNING !!!"
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Max new connections / 5 secs"
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2294
-msgid "File Buffer Size: 240000 bytes"
+#: src/SharedFilePeersListCtrl.cpp:35
+msgid "Upload Status"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2300
-msgid "Upload Queue Size: 5000 clients"
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2306
-msgid "Server connection refresh interval: Disable"
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+msgid "Shares File List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2583
-msgid "Click here to apply any changes made to the preferences."
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2587
-msgid "Reset any changes made to the preferences."
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2611
-msgid "Title :"
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2621
-msgid "Comment :"
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2631
-msgid "Incoming Dir :"
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2644
-msgid "Change priority for new assigned files :"
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2663
-msgid "Select color for this Category (currently selected) :"
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
-msgid "Click this button to reset the log."
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2806
-msgid "Click on this button to update the servers list from URL ..."
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2810
-msgid "Server list"
+#: src/Statistics.cpp:785
+msgid "Clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2815
-msgid ""
-"Enter the url to a server.met file here and press the button to the left to "
-"update the list of known servers."
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2822
-msgid "Add server manually: Name"
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2826
-msgid "Enter the name of the new server here"
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2833
-msgid "Enter the IP of the server here, using the x.x.x.x format."
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2840
-msgid "Enter the port of the server here."
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2844
-msgid "Add manually a server (fill fields to the left before) ..."
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2890
-msgid "ED2K Info"
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
-msgid "Kad Info"
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2923
-msgid "Click on this button to update the nodes list from URL ..."
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2927
-msgid "Nodes (0)"
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2932
-msgid ""
-"Enter the url to a nodes.dat file here and press the button to the left to "
-"update the list of known nodes."
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2937
-msgid "Nodes stats"
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2988
-msgid "Bootstrap"
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2991
-msgid "New node"
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2996
-msgid "IP:"
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3025
-msgid "Port:"
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3048
-msgid "Disconnect Kad"
+#: src/Statistics.cpp:955
+msgid "Operating System"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
+#: src/Statistics.cpp:980
+msgid "Not Received"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3096
-msgid "Protocol Obfuscation"
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3099
-msgid "Support Protocol Obfuscation"
+#: src/StatTree.cpp:550
+msgid "Not available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3101
-msgid ""
-"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
-"connections from other clients."
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3104
-msgid "Use obfuscation for outgoing connections"
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3106
-msgid ""
-"This option makes aMule use Protocol Obfuscation when connecting other "
-"clients/servers."
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3109
-msgid "Accept only obfuscated connections"
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3110
+#: src/TextClient.cpp:323
 msgid ""
-"This option makes aMule only accept obfuscated connections. You will have "
-"less sources, but all your traffic will be obfuscated"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:3120
-msgid "Everybody"
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:3122
-msgid "No one"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3125
-msgid "Select who can request to view a list of your shared files."
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3130
-msgid "IP-Filtering"
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3137
-msgid "Filter clients"
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3139
-msgid ""
-"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3142
-msgid "Filter servers"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3144
-msgid ""
-"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3151
-msgid "Reload List"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3152
-msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3160
-msgid "URL:"
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3166
-msgid "Update now"
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3171
-msgid "Auto-update ipfilter at startup"
+#: src/TextClient.cpp:699
+msgid "eD2k"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3176
-msgid "Filtering Level:"
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3186
-msgid "Always filter LAN IPs"
+#: src/TextClient.cpp:710
+msgid "Now connecting"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3190
-msgid "Paranoid handling of non-matching IPs"
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3192
-msgid ""
-"Rejects packet if the client ip is different from the ip where the packet is "
-"received from. Use with caution."
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3195
-msgid "Use system-wide ipfilter.dat if available"
+#: src/TextClient.cpp:734
+#, c-format
+msgid ""
+"\n"
+"Download:\t%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3196
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
-"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
-"file."
+"\n"
+"Upload:\t%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
+#: src/TextClient.cpp:740
+#, c-format
+msgid ""
+"\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3201
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
+"\n"
+"Total sources:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3223
-msgid "Enable Online-Signature"
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3225
-msgid ""
-"Enables the writing of the OS file, which can be used by external apps to "
-"create signatures and the like."
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3230
-msgid "Update Frequency (Secs):"
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3234
-msgid "Change the frequency (in seconds) of Online Signature updates."
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
+#: src/TextClient.cpp:850
+msgid "Show short status information."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3249
-msgid ""
-"Click here to select the directory containing the the Online Signature files."
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3271
-msgid "Filter incoming messages (except current chat):"
+#: src/TextClient.cpp:854
+msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
+"\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3277
-msgid "Filter all messages"
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3280
-msgid "Filter messages from people not on your friend list"
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3283
-msgid "Filter messages from unknown clients"
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3286
-msgid "Filter messages containing (use ',' as separator):"
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
-msgid "add here the words amule should filter and block messages including it"
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3302
-msgid "Comments"
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3310
-msgid "Filter comments containing (use ',' as separator):"
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3339
-msgid "Enable Proxy"
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3340
-msgid "Enable/disable proxy support"
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3345
-msgid "Proxy type:"
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3359
-msgid "Proxy host:"
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3363
-msgid "The proxy host name"
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
+"\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3366
-msgid "Proxy port:"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3370
-msgid "The proxy port"
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3424
-msgid "Connect to:"
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3438
-msgid "Login to remote amule"
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3443
-msgid "User name"
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3460
-msgid "Remember those settings"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3492
-msgid "Enable Verbose Debug-Logging."
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3497
-msgid "Message Categories:"
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3550
-msgid "Add imports"
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3554
-msgid "Retry selected"
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3557
-msgid "Remove selected"
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3668
-msgid "Connect to any server and/or Kad"
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
+#: src/TextClient.cpp:913
+msgid "Execute a search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
 msgstr ""
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
 msgstr ""
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
 msgstr ""
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
 msgstr ""
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
 msgstr ""
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:141
-#, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
 msgstr ""
 
-#: src/ExternalConnector.cpp:143
-#, c-format
-msgid "Unknown command '%s'.\n"
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/TextClient.cpp:933
+msgid "Pause download."
 msgstr ""
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/TextClient.cpp:936
+msgid "Resume download."
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
-msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+#: src/TextClient.cpp:939
+msgid "Cancel download."
 msgstr ""
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/TextClient.cpp:942
+msgid "Set download priority."
 msgstr ""
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:185
-#, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
 msgstr ""
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
 msgstr ""
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
 msgstr ""
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
 msgstr ""
 
-#: src/ExternalConnector.cpp:243
-#, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
 msgstr ""
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
 msgstr ""
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
+#: src/TextClient.cpp:952
+msgid "Show download queue."
 msgstr ""
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
+#: src/TextClient.cpp:953
+msgid "Show log."
 msgstr ""
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
+#: src/TextClient.cpp:954
+msgid "Show servers list."
 msgstr ""
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
+#: src/TextClient.cpp:957
+msgid "Reset log."
 msgstr ""
 
-#: src/ExternalConnector.cpp:297
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Type '%s' to get more help.\n"
+msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/TextClient.cpp:965
 #, c-format
-msgid "This is %s %s %s\n"
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+
+#: src/TextClient.h:60
+msgid "aMule text client"
 msgstr ""
 
-#: src/ExternalConnector.cpp:364
+#: src/ThreadTasks.cpp:363
 #, c-format
-msgid "This is %s %s\n"
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:395
-msgid ""
-"\n"
-"Creating client...\n"
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:418
+#: src/ThreadTasks.cpp:454
 #, c-format
-msgid ""
-"\n"
-"Ok, exiting %s...\n"
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:424
-msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr ""
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
 msgstr ""
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
 msgstr ""
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
+#: src/TransferWnd.cpp:341
+msgid "All others"
 msgstr ""
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
 msgstr ""
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
+#: src/TransferWnd.cpp:366
+msgid "Add category"
 msgstr ""
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
 msgstr ""
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
+#: src/UploadClient.cpp:240
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
 msgstr ""
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/ClientCreditsList.cpp:168
+#: src/UploadQueue.cpp:613
 #, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Suspending upload of file: %s"
+msgstr ""
 
-#: src/ClientCreditsList.cpp:171
+#: src/UserEvents.cpp:138
 #, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr ""
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
+#: src/UserEvents.h:60
+msgid "Download completed"
 msgstr ""
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
 msgstr ""
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
+#: src/UserEvents.h:84
+msgid "New chat session started"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
+#: src/UserEvents.h:87
+msgid "Message sender."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
+#: src/UserEvents.h:92
+msgid "Out of space"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
+#: src/UserEvents.h:95
+msgid "Disk partition."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
+#: src/UserEvents.h:100
+msgid "Error on completion"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:699
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "QR: %u"
+msgid "%s ---> Non existant file !\n"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
 msgstr ""
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:368
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Download speed: %.1f"
+msgid "Done in %.2f s"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Upload speed: %.1f"
+msgid "Unable to open %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
+#: src/utils/wxCas/src/onlinesig.cpp:234
 #, c-format
-msgid "Nickname: %s"
+msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:416
+#: src/utils/wxCas/src/onlinesig.cpp:342
 #, c-format
-msgid "IP: %s"
+msgid "%.2f KB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:425
+#: src/utils/wxCas/src/onlinesig.cpp:345
 #, c-format
-msgid "TCP port: %d"
+msgid "%.2f MB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:436
+#: src/utils/wxCas/src/onlinesig.cpp:351
 #, c-format
-msgid "UDP port: %d"
+msgid "%.2f TB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:483
-#, c-format
-msgid "Total UL: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/ChatSelector.cpp:127
-#, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
 msgstr ""
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
 msgstr ""
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
 msgstr ""
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/ServerList.cpp:84
-#, c-format
-msgid "Loading server.met file: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
 msgstr ""
 
-#: src/ServerList.cpp:89
-msgid "Server.met file not found!"
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
 msgstr ""
 
-#: src/ServerList.cpp:97
-#, c-format
-msgid "Failed to load server.met file '%s', unknown format encountered."
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
 msgstr ""
 
-#: src/ServerList.cpp:103
-msgid "Failed to open server.met!"
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/ServerList.cpp:114
-#, c-format
-msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
 msgstr ""
 
-#: src/ServerList.cpp:169
-#, c-format
-msgid "%i server in server.met found"
-msgid_plural "%i servers in server.met found"
-msgstr[0] ""
-msgstr[1] ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr ""
 
-#: src/ServerList.cpp:171
-#, c-format
-msgid "%d server added"
-msgid_plural "%d servers added"
-msgstr[0] ""
-msgstr[1] ""
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr ""
 
-#: src/ServerList.cpp:192
-#, c-format
-msgid "Server not added: [%s:%d] does not specify a valid port."
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
 msgstr ""
 
-#: src/ServerList.cpp:208
-#, c-format
-msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
 msgstr ""
 
-#: src/ServerList.cpp:228
-#, c-format
-msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/ServerList.cpp:247
-#, c-format
-msgid "Server added: Server at [%s:%d] using the name '%s'."
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
 msgstr ""
 
-#: src/ServerList.cpp:342
-msgid ""
-"You are connected to the server you are trying to delete. please disconnect "
-"first."
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
 msgstr ""
 
-#: src/ServerList.cpp:629
-msgid "Failed to save server.met!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
 msgstr ""
 
-#: src/ServerList.cpp:782
-msgid "Invalid URL"
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
 msgstr ""
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
 msgstr ""
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
 msgstr ""
 
-#: src/ServerList.cpp:818
-msgid ""
-"No server list address entry in 'addresses.dat' found. Please paste a valid "
-"server list address into this file in order to auto-update your server list"
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
 msgstr ""
 
-#: src/ServerList.cpp:831
-#, c-format
-msgid "Start downloading server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
 msgstr ""
 
-#: src/ServerList.cpp:840
-#, c-format
-msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
 msgstr ""
 
-#: src/ServerList.cpp:844
-msgid "No valid server.met auto-download url on addresses.dat"
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
 msgstr ""
 
-#: src/ServerList.cpp:937
-msgid ""
-"Local server is filtered by the IPFilters, reconnecting to a different "
-"server!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
 msgstr ""
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
 msgstr ""
 
-#: src/amule.cpp:703
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
 msgstr ""
 
-#: src/amule.cpp:787
-msgid "Server list download"
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
 msgstr ""
 
-#: src/amule.cpp:846
-#, c-format
-msgid "web server running on pid %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/amule.cpp:850
-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"
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
 msgstr ""
 
-#: src/amule.cpp:937
-#, c-format
-msgid "Could not bind ports to the specified address: %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/amule.cpp:964
-#, c-format
-msgid "Port %u is not available. You will be LOWID\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/amule.cpp:970
-#, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
 msgstr ""
 
-#: src/amule.cpp:1308
-#, c-format
-msgid "This is the first time you run aMule %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
 msgstr ""
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
 msgstr ""
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/amule.cpp:1316
-msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
 msgstr ""
 
-#: src/amule.cpp:1317
-msgid ""
-"\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1318
-msgid ""
-"\n"
-"* Disabled updating the server list from other server and clients.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1319
-msgid ""
-"\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/amule.cpp:1320
-msgid ""
-"\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
 msgstr ""
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
 msgstr ""
 
-#: src/amule.cpp:1341
-msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
 msgstr ""
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
 msgstr ""
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
 msgstr ""
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
 msgstr ""
 
-#: src/amule.cpp:1826
-#, c-format
-msgid "ServerMessage: %s"
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
 msgstr ""
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
 msgstr ""
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
 msgstr ""
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/amule.cpp:1907
-#, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/amule.cpp:1911
-#, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
 msgstr ""
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/amule.cpp:2025
+#: src/webserver/src/WebServer.cpp:370
 #, c-format
-msgid "Users: %s | Files: %s"
+msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/amule.cpp:2026
-#, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
 msgstr ""
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/amule.cpp:2102
-#, c-format
-msgid "Connected to %s %s"
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/amule.cpp:2105
-#, c-format
-msgid "Connecting to %s"
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/amule.cpp:2114
-msgid "Kad started."
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
 msgstr ""
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
 msgstr ""
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
 msgstr ""
 
-#: src/amule.cpp:2191
-msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
 msgstr ""
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
 msgstr ""
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
 msgstr ""

aMule-2.2.6.tar.bz2/po/es.po -> aMule-2.3.1.tar.bz2/po/es.po Changed

@@ -1,1320 +1,1167 @@
 # translation of es.po to Spanish
-# Copyright (C) 2004 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the terms of the GNU General Public
 # License
 #
-#
 # FIRST AUTHOR <aquatroll@ADDRESS>, 2004.
-# Mad-Soft <mad.soft@gmail.com>, 2004, 2005, 2006, 2007, 2008.
+# Errico2 <errico2@terra.es>, 2011
+# Mad-Soft <mad.soft@gmail.com>, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 # Ignacio Casal Quinteiro <icq@cvs.gnome.org>, 2007.
 # Carlos Diaz <cskyline@gmail.com>, 2007, 2008.
-# Festor Wailon Dacoba <festor90@gmail.com>, 2007, 2009.
+# Festor Wailon Dacoba <festor90@gmail.com>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-03-04 20:43+0100\n"
-"Last-Translator: \n"
-"Language-Team: Spanish <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
+"PO-Revision-Date: 2011-04-28 17:03+0100\n"
+"Last-Translator: errico2 <errico2@terra.es>\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"
 "X-Poedit-Country: SPAIN\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Lokalize 0.3\n"
+"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Language: es_ES\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Debes especificar una contraseña no vacía."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "¡Contraseña incorrecta, no es un código MD5!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Error de conexión"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "La conexión EC ha fallado, Respuesta vacía."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Conexión externa: Acceso denegado, razón:"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Conexión externa: Acceso denegado"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Conexión externa: Respuesta del servidor incorrecta. Conexión cerrada."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "¡Hecho! Conexión establecida con aMule"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "¡Hecho! Conexión establecida."
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Añadir un amigo"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Codificando"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Has de introducir una IP y puerto válidos!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Completando"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Información"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Completado"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "¡El hash de usuario especificado no es válido!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Pausado"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Imposible abrir el archivo de enlaces ED2K."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Erróneo"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"ADVERTENCIA: No puedes añadirte a ti mismo como una fuente para un enlace "
+"eD2k teniendo ID baja."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Descargando"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Ahora, saliendo de aplicación principal..."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Esperando"
-
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Comenzando a crear el hash MD4 y AICH del archivo: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Cerrando instancia amuleweb con pid '%ld' ... "
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Comenzando a crear el hash MD4 del archivo: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Matando instancia amulweb con pid '%ld' ... "
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Comenzando a crear el hash AICH del archivo: %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Error"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Convirtiendo antiguos hashsets AICH en  '%s' a 64b en '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: Terminando núcleo."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr ""
-"ALERTA: El nombre de archivo '%s' es incorrecto y será renombrado a '%s'."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "Cierre de aMule completado."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "ALERTA: El archivo '%s' ya existe, renombrando el nuevo a '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Resultados de depuración de memoria en la salida de aMule: "
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "ALERTA: Imposible borrar '%s' original, creando copia de seguridad"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+"\n"
+"Configuración EC"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "ALERTA: Error al borrar %s"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Contraseña fijada y conexiones externas habilitadas."
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Error al obtener la lista de compartidos del usuario '%s'"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "ALERTA"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Desconocido"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Versión Falsa eMule %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Falso eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"No tienes ningún servidor en la lista de servidores.\n"
+"¿Quieres que aMule descargue una nueva lista ahora?"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Falso eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Descarga lista de servidores"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (basado en eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr "servidor web corriendo con pid: %d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Alias:  %s ID: %u"
+#: src/amule.cpp:658
+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 "
+"correr el binario de amuleweb. Por favor instala el paquete que contanga el "
+"servidor web de aMule o compila aMule usando --enable-webserver y ejecuta "
+"make install"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Solicitado: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "ERROR"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Estadísticas de archivo para esta sesión: %d Aceptada de %d petición, %s "
-"transferida\n"
-msgstr[1] ""
-"Estadísticas de archivo para esta sesión: %d Aceptadas de %d peticiones, %s "
-"transferidas\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Imposible direccionar los puertos a la dirección especificada: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Estadísticas de archivo para todas las sesiones: %d Aceptada de %d petición, "
-"%s transferida\n"
-msgstr[1] ""
-"Estadísticas de archivo para todas las sesiones: %d Aceptadas de %d "
-"peticiones, %s transferidas\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Solicitado un archivo desconocido"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Puerto %u no está disponible. Tendrás IDBaja\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Cliente %s en IP:Puerto %s:%d usando %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Nombre de usuario"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Puerto %u no está disponible!\n"
+"\n"
+"Esto significa que tendrás IDBaja.\n"
+"\n"
+"Comprueba tu red y asegúrate de que el puerto está abierto para entrada y "
+"salida."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Amigos"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Error al crear el archivo de FirmaOnline"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Mostrar &Detalles"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Error al crear el archivo de FirmaOnline aMule"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Añadir un amigo"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"El idioma seleccionado no parece estar instalado. (Nota: Intentaré ponerlo "
+"de todos modos)"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Eliminar amigo"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "Es la primera vez que inicias aMule %s"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Enviar &Mensaje"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Esto es una versión de prueba, actualízate diariamente, y \n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Ver archivos"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr "no damos garantía si rompiera algo, queme tu casa,\n"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Establecer puesto reservado a un amigo"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "o mata a tu perro. Pero *debería* ser seguro de todas formas. \n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "¿Estás seguro que deseas borrar al amigo seleccionado?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Podrás encontrar en nuestra web, mas información, soporte y nuevas "
+"versiones, \n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "¿Estás seguro que deseas borrar a los amigos seleccionados?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"en www.aMule.org, o en nuestro canal de IRC #aMule en irc.freenode.net. \n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Cancelar"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Envíanos cualquier fallo a http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"No se le permite asignar mas de un puesto reservado.\n"
-" Solo se asignó un puesto reservado."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Selección múltiple"
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Descarga completada"
-
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "La ruta completa al archivo."
+"El directorio que has especificado de Firma Online no es válido\n"
+"La Firma Online ha sido deshabilitado hasta que lo arregles en opciones."
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "El nombre del archivo sin la ruta."
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Nombre servidor notificado"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "El hash eD2k del archivo."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "La reserva del espacio en disco para el archivo '%s' falló: %s"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "El tamaño del archivo en bytes."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "ERROR: no puedo abrir el archivo de registro"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Tiempo de actividad de descarga acumulado."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "ALERTA: el archivo de registro está vacío. Algo está mal"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Nueva sesión de chat iniciada"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Registro ha sido borrado"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Remitente del mensaje."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Mensaje del servidor: %s"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Sin espacio"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
+"Se ha descartado la descarga de %s, porque el archivo solicitado no es mas "
+"nuevo."
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Partición de disco."
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Error al descargar la lista de nodos."
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Error completando"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Error al abrir el archivo de comprobación de versión descargado"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Nombre de archivo"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Archivo de comprobación de versión corrupto"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Tamaño"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "¡Estás usando una versión anticuada de aMule!"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tipo"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Tu versión de aMule es %i.%i.%i y la última versión es %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioridad"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "La última versión puede siempre ser encontrada en http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "ID Archivo"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "ALERTA: Tu versión de aMuled está obsoleta: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Peticiones"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Tu copia de aMule está actualizada."
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Peticiones aceptadas"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Error al descargar el archivo de comprobación de versión"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Datos transferidos"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Usuarios: %s | Archivos: %s"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Media Compartido"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Usuarios: E: %s K: %s | Archivos: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Partes obtenidas"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Sin redes seleccionadas"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Fuentes completas"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "con IDBaja"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Directorio"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "con IDAlta"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Compartidos"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Conectado a %s %s"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Muy baja"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Conectando a %s"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Baja"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Desconectado de eD2k"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normal"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad iniciado."
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Alta"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad detenido."
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Muy alta"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Conectado a Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Lanzamiento"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Conectado a Kad (tras cortafuegos)"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Auto"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Desconectado de Kad"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Añadir Comentario/Valoración"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Red Kad no puede ser usada si el puerto UDP está deshabilitado en opciones, "
+"no iniciando."
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Editar Comentario/Valoración"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Red Kad deshabilitada en opciones, no conectará."
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Renombrar"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"ERROR: el daemon de aMule no se puede usar cuando están desactivadas las "
+"conexiones externas. Para activarlas, use o bien un aMule normal, inicie "
+"amuled con la opción --ec-config, o bien, establezca "
+"\"AcceptExternalConnections\" a 1, en el archivo ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Añadir archivos en colección a la lista de descargas"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"ERROR: Contraseña válida es requerida para usar conexiones externas, y el "
+"demonio aMule no se puede usar sin conexiones externas. Para iniciar el "
+"demonio aMule, debes especificar en el campo \"ECPassword\" del archivo ~/."
+"aMule/amule.conf con el valor apropiado. Ejecuta amuled con el parámetro --"
+"ec-config para especificar la contraseña. Mas información puede ser "
+"encontrada en http://wiki.amule.org"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: EnInicio - Iniciando reloj"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: derivando al fondo - nos vemos"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "No se puede crear el archivo Pid"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Copiar &URL magnético al portapapeles"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "ERROR: %s"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Copiar el en&lace eD2k al portapapeles."
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Esto es aMule %s basado en eMule."
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Copiar el enlace eD2k al portapapeles (&Fuente)"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Ejecutándose en %s"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
 msgstr ""
-"Copiar el enlace eD2k al portapapeles (Fuente) (&Con opciones de cifrado)"
-
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Copiar el enlace eD2k al portapapeles (&Nombre del host)"
+"Visita http://www.amule.org para comprobar si hay una nueva versión "
+"disponible"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr ""
-"Copiar el enlace eD2k al portapapeles (Nombre del host) (&Con opciones de "
-"cifrado)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ERROR GRAVE: No se ha podido crear el temporizador"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Copiar el enlace eD2k al portapapeles (Información &AICH)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Control remoto de aMule"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Copiar respuesta al portapapeles"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Versión:"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:501
 msgid ""
-"Feedback from: %s (%s)\n"
+"'All-Platform' p2p client based on eMule \n"
 "\n"
 msgstr ""
-"Reacción desde: %s (%s)\n"
+"Cliente p2p multiplataforma basado en eMule \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Necesitas IDAlta para crear un enlace fuente válido"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "ALERTA"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Web: http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Archivos Compartidos (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[Archivo part]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Introduce el nuevo nombre para este archivo:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Renombrar archivo"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Resumiendo subidas del archivo: %s"
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Suspendiendo subida del archivo: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "Cliente de texto aMule"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: palabra de búsqueda demasiado corta"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Foro: http://forum.amule.org \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Leído %u contacto Kad"
-msgstr[1] "Leídos %u contactos Kad"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Solo %d contacto Kad disponible, nodes.dat no escrito"
-msgstr[1] "Solo %d contactos Kad disponibles, nodes.dat no escrito"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Contactar: admin@amule.org (problemas administrativos) \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Escrito %d contacto Kad"
-msgstr[1] "Escritos %d contactos Kad"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ERROR: No se puede escuchar en el puerto TCP."
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Parte de aMule está basado en \n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "conexión aceptada del cliente web\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr " Kademlia: Direccionamiento P2P basado en la métrica XOR.\n"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ERROR: no se puede aceptar la conexión del cliente web\n"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Mensaje"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Solicitud fallida con el siguiente error: %s."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "Dialogo aMule destruido"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Solicitud fallida con un error desconocido."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Conectando"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Fichero índice no encontrado: "
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Conectando"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Sesión terminada - solicitando conexión\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Desconectado"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sesión ok, conectado\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Tras Cortafuegos"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sesión ok, no conectado\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Conectado"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "No hay ninguna sesión - conecte de nuevo\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Conectando"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Sesión creada - solicitando conexión\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Apagada"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Procesando solicitud [original]:"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Comprobando contraseña\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Detener los intentos de conexión actuales"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Hash de la contraseña incorrecto\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Desconectar"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Contraseña ok\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Desconectarse de las redes conectas"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Contraseña errónea\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Conectar"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr ""
-"No has introducido ninguna contraseña. No está permitida una contraseña en "
-"blanco.\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Conectarse a las redes disponibles"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Desconexión solicitada\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Su: %.1f(%.1f) | Desc: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Procesando solicitud [redirigida]:"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Su: %.1f | Desc: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Carga la plantilla <str>"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Conectado)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Puerto HTTP del servidor web"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Desconectado)"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Usar forwarding de puertos UPnP en el puerto del servidor web"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "¿Realmente deseas cerrar %s?"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Puerto UPnP"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Confirmación de salida"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Usar compresión gzip"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Lanzar comando:"
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- defecto -"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Contraseña de acceso total para el servidor web"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "El directorio de tema '%s' no existe"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Contraseña de invitado para servidor web"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "ATENCIÓN: No se puede abrir el archivo de pieles '%s' para lectura"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Permitir acceso a invitado"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Redes"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Denegar acceso a invitado"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Ventana de redes"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Cargar/guardar la configuración del servidor web desde/a aMule remoto"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Buscar"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Ruta al archivo config de aMule. ¡NO USAR DIRECTAMENTE!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Ventana de búsquedas"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Deshabilitar interprete PHP (desuso)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Descargas"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Recompila páginas PHP para otra solicitud"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Descargas"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Servidor web aMule"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Compartidos"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "No disponible"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Ventana de archivos compartidos"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Nunca"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Mensajes"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Descargando..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Ventana de mensajes"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Estadísticas"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "Se experaban %d bytes, pero se descargaron %d bytes"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Ventana de gráficos de estadísticas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Opciones"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Directorio que contiene el archivo amulesig.dat"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Examinar"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Introduce el directorio donde está tu archivo amulesig.dat"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Intervalo de refresco en segundos"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Ventana de opciones"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Generar un archivo de estadísticas siempre que se actualice"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr ""
-"Introduce el directorio donde tu quieres generar la imagen de estadísticas"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "La herramienta para importar archivos part"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Sube periódicamente tu imagen de estadísticas al servidor FTP"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Acerca de"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "Url FTP"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Acerca de/Ayuda"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Directorio FTP"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Red eD2k"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Introduce la URL de tu servidor FTP"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "red Kad"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
-"Introduce el directorio de tu servidor FTP donde poner tu imagen de "
-"estadísticas"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Sin red"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Usuario"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "Control remoto de aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Contraseña"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Introduce el nombre de usuario para conectarte a tu servidor FTP"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Error Fatal: Imposible crear el reloj del núcleo"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Introduce la contraseña de usuario para conectarte a tu servidor FTP"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Conectar a amule remoto"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Intervalo de actualización de FTP en minutos"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Error Fatal: Imposible crear el  Poll Timer"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Yendo a evento bucle..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Conectando..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Validado"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Conexión fallida"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Directorio que contiene tu archivo de firma"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Manejador de evento EC en Interfaz Remota"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Bajando"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Directorio donde se genera la imagen de estadísticas"
-
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i día(s) %i hora(s) %i min %i s"
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Error de conexión. Imposible conectar a %s:%d\n"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, Estadísticas aMule en linea"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Conexión cerrada - Probablemente aMule se habrá cerrado."
+
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Listo"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "¡Bienvenido!"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Todos"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
+"Imposible crear el directorio '%s' para la categoría '%s', manteniendo el "
+"directorio '%s'."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Máximo índice Desc desde que wxCas está ejecutándose: "
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Desconocido"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Máximo índice Desc absoluto durante ejecuciones anteriores de wxCas"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Error al obtener la lista de compartidos del usuario '%s'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Restablecer"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Buscando amigo con conexión idbaja"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistema"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Versión Falsa eMule %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Parar auto recargar"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Falso eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Salvar imagen de estadísticas en linea"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Falso eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Imprimir imagen de estadísticas en linea"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (basado en eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Opciones"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Alias:  %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Acerca de wxCas"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Solicitado: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Iniciar auto recargar"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Estadísticas de archivo para esta sesión: %d Aceptada de %d petición, %s "
+"transferida\n"
+msgstr[1] ""
+"Estadísticas de archivo para esta sesión: %d Aceptadas de %d peticiones, %s "
+"transferidas\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Auto recargar, detenido"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Estadísticas de archivo para todas las sesiones: %d Aceptada de %d petición, "
+"%s transferida\n"
+msgstr[1] ""
+"Estadísticas de archivo para todas las sesiones: %d Aceptadas de %d "
+"peticiones, %s transferidas\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Auto recargar, iniciado"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Solicitado un archivo desconocido"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Salvar imagen de estadísticas"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Mensaje filtrado de '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Estadísticas aMule en linea"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nuevo mensaje de '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/BaseClient.cpp:2899
+#, c-format
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"Hubo un problema imprimiendo.\n"
-"Tal vez tu impresora actual no este configurada"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Imprimiendo"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
-msgstr "wxCas, Estadística de firma en linea de aMule"
+"Usuario %s (%u) solicitó tu lista de archivos compartidos del directorio %s -"
+"> Ignorado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, aMule no está ejecutándose..."
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "ALERTA: %s no se puede abrir."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule ya está ejecutándose"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+"ALERTA: Cancelada lista de archivos corruptos, contiene una cabecera "
+"inválida."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule se está ejecutando, pero está desconectado"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "IO error leyendo %s archivo: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule está conectando..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Error guardando %s archivo: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh Oh, estado de aMule desconocido..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Introduce "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Categoría"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " ha sido ejecutado durante"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nueva Categoría"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " ¡ está detenido !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Selecciona un directorio para los archivos entrantes"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " ¡ no está conectado !"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "¡Debes especificar un nombre para la categoría!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " está conectando..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "¡Debes especificar una ruta para la categoría!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " está haciendo algo extraño, ¡ compruébalo !"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"¡Error al crear el directorio entrante de la categoría. Por favor "
+"especifique una ruta correcta!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " está conectado a"
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Sesión Chat Iniciada: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Conectado al cliente ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Conectando al cliente ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "tras cortafuegos"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Error al conectar con el cliente / Conexión perdida ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "apagado"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
+"*** Has pasado la comprobación del captcha y el usuario recibirá tu mensaje. "
+"***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " conectado"
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** Tu repuesta al captcha fue incorrecta y tu mensaje ha sido ignorado. "
+"Puedes pedir un nuevo captcha enviando un nuevo mensaje. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " con "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Chat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Total Descargado:"
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Cerrar pestaña"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Subido: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Cerrar todas las pestañas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Descarga de sesión"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Cerrar las otras pestañas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Descargado: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Añadir a Amigos"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Subida: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Archivo de créditos cargado, %u cliente conocido"
+msgstr[1] "Archivo de créditos cargado, %u clientes conocidos"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - ¡Ha expirado el crédito de %u cliente!"
+msgstr[1] " - ¡Han expirado los créditos de %u clientes!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Compartiendo: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Archivo 'cryptkey.dat' no encontrado, creando."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr "archivo(s), Clientes en cola: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Detalles del cliente"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Tiempo: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "ID Baja"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "ID Alta"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " en "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Habilitado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Media de carga del sistema (1-5-15 min): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Soportado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Tiempo de ejecución del sistema"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "No soportado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Deshabilitado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Conectado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Desconectado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02us"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "ID Alta"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "No completado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "ID Baja"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Cliente sospechoso"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "No conectado"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Verificado - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "No disponible"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "Usuario %s (%u) solicitó tu lista de archivos compartidos -> Aceptada"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "Usuario %s (%u) solicitó tu lista de archivos compartidos -> Denegada"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"Usuario %s (%u) ha solicitado tu lista de directorios compartidos -> Aceptada"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "¡ Cancelado !"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+"Usuario %s (%u) ha solicitado tu lista de directorios compartidos -> Denegada"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "Unable to open %s"
-msgstr "Imposible abrir %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Parámetros de entrada"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Archivo a codificar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Añadir URLs opcionales para este archivo"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Introduce aquí el archivo del que quieras calcular el enlace eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Introduce aquí la URL que quieres añadir al enlace eD2k: Añade / al final "
-"para permitir a aLinkCreator agregar el nombre del archivo actual"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Añadir"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Borrar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Limpiar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Crear enlace con hashes de partes"
+"Usuario %s (%u) solicitó tu lista de archivos compartidos del directorio %s -"
+"> aceptada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Ayuda para separar archivos nuevos y raros mas rápidamente, el coste sera un "
-"tamaño de enlace mayor"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Hash de archivo MD4"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "Hash del archivo eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "Enlace eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Comenzar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Guardar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Copiar al porta papeles"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Salir"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Abrir"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Abrir un archivo para calcular su enlace eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Copiar el enlace eD2k calculado al portapapeles"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Guardar como"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Guardar el enlace eD2k calculado en un archivo"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Acerca de"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Acerca de aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Selecciona el archivo del que quieras calcular el enlace eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Imposible abrir el portapapeles"
+"Usuario %s (%u) solicitó tu lista de archivos compartidos del directorio %s -"
+"> denegada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "¡Nada para copiar ahora!"
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Usuario %s (%u) comparte el directorio '%s'"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Selecciona el fichero para el enlace eD2k calculado"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Usuario %s (%u) enviado directorios compartidos no solicitados."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Imposible abrir "
+#: src/ClientTCPSocket.cpp:982
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr ""
+"Usuario %s (%u) envió la lista de archivos compartidos del directorio %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Por favor, introduce un nombre de archivo"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Usuario %s (%u) finalizó el envío de la lista de archivos compartidos"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "¡Nada para guardar ahora!"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Usuario %s (%u) enviada la lista de archivos compartidos no deseada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
-"aLinkCreator, el creador de enlaces eD2k de aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Imágenes desde http://www.everaldo.com y http://www.icomania.com\n"
-"y http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distribuido bajo la licencia GPL"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Calculando hash..."
+"Usuario %s (%u) denegó el acceso a la lista de directorios/archivos "
+"compartidos"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator está trabajando para ti"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Comentarios del archivo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Calculando Hash MD4..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Nombre de usuario"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Calculando Hashes eD2k..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Nombre de archivo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Terminado en %.2f s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Valoración"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "¡ Ya tienes añadida esa URL !"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Comentario"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Por favor, introduce una URL"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Sin comentarios"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Procesando numero de archivo %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Has preguntado por hashes de partes (Solo usado por archivos > 9.5 MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u comentario"
+msgstr[1] "%u comentarios"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s --->¡ No existe el archivo !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, el creador de enlaces eD2k para aMule"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"Cliente bloqueado %s por enviar %s datos corruptos de un total de %s para el "
+"archivo '%s'"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1328,31 +1175,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Al]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Conectando"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Muy baja"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Baja"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normal"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Alta"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Muy alta"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Lanzamiento"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Preguntando"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Conectando vía servidor"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Cola Llena"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "En Cola"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Transfiriendo"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Descargando"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1372,14 +1245,13 @@
 
 #: src/DataToText.cpp:71
 msgid "Connecting via Kad"
-msgstr "Conectando via Kad"
+msgstr "Conectando vía Kad"
 
 #: src/DataToText.cpp:72
 msgid "Too many Kad connections"
 msgstr "Demasiadas conexiones Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Baneado"
 
@@ -1411,8 +1283,8 @@
 msgid "Remote Server"
 msgstr "Servidor remoto"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1436,8 +1308,8 @@
 msgid "Search Result"
 msgstr "Resultado de la búsqueda"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Completado"
 
@@ -1461,7 +1333,7 @@
 msgid "ERROR: Failed!"
 msgstr "ERROR: No se ha podido realizar la acción!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "En cola"
 
@@ -1473,874 +1345,309 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Formato de archivo temp incorrecto o desconocido."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Por defecto"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albanés"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Árabe"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturiano"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Euskera"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Búlgaro"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Catalán"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Chino (Simplificado)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Chino (Tradicional)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Croata"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Checo"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Danés"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Holandés"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Inglés (U.K.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estonio"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finlandés"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Francés"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Gallego"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Alemán"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Griego"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hebreo"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Húngaro"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italiano (Suizo)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japonés"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Coreano"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lituano"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Parte"
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Noruego"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Tamaño"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polaco"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Transferido"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugués"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Velocidad"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugués (Brasileño)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Progreso"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Ruso"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Fuentes"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Esloveno"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioridad"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Español"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Estado"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Sueco"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Tiempo restante"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turco"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Última comprobación completa"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ucraniano"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Última recepción"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "¡Imposible determinar el navegador seleccionado!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "¿Estás seguro que deseas borrar este archivo?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"Puerto TCP no puede ser mas alto de 65532 debido a que el socket del "
-"servidor UDP es TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "¿Estás seguro que deseas borrar estos archivos?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Puerto por defecto que será usado (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Nombre del servidor"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Dirección"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Puerto"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Descripción"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Usuarios"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Archivos"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Error"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Servidor fijo"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versión"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Estás conectado a un servidor, que estás intentando borrar. Desconéctate "
-"primero. El servidor no será borrado."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Nombre desconocido)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Estás seguro que quieres eliminar el servidor fijo %s"
+"Reacción desde: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Sí"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "No"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Detener"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Error al abrir '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pausar"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Servidores (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Reanudar"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Servidor"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "&Limpiar completados"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Conectar al servidor"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Intercambiar todas las fuentes (A4AF) a este archivo"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Marcar servidor como fijo"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Intercambiar todas las fuentes (A4AF) a este archivo (Auto)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Desmarcar servidor como fijo"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Intercambiar todas las fuentes (A4AF) a otro archivo"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Marcar servidores como fijos"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Opciones Extendidas"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Desmarcar servidores como fijos"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Previsualizar"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Borrar servidor"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Mostrar detalles archivo"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Borrar servidores"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Mostrar todos los comentarios"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Eliminar todos los servidores"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Copiar la URL magnética al portapapeles"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Copiar el enlace eD2k al portapapeles"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Copiar el en&lace eD2k al portapapeles."
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Copiar los enlaces eD2k al portapapeles"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Copiar respuesta al portapapeles"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Reconectar al servidor"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "no asignado"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "¿Estás seguro que deseas borrar todos los servidores?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Asignar a categoría"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Estás seguro que deseas borrar el servidor seleccionado"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Abrir el archivo"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Estás seguro que deseas borrar los servidores seleccionados"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Introduce el nuevo nombre para este archivo:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Deshabilitado [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Renombrar archivo"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Esto es aMule %s basado en eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Ejecutándose en %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Visita http://www.amule.org para comprobar si hay una nueva versión "
-"disponible"
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ERROR GRAVE: No se ha podido crear el temporizador"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Control remoto de aMule"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Versión:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" Cliente p2p multiplataforma basado en eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Web: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Foro: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr " FAQ: http://wiki.amule.org \n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Contactar: admin@amule.org (problemas administrativos) \n"
+msgid "Downloads (%i)"
+msgstr "Descargas (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 Equipo aMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Parte de aMule está basado en \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr " Kademlia: Direccionamiento P2P basado en la métrica XOR.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Mensaje"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Conectando"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Desconectado"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Tras Cortafuegos"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Conectado"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Conectando"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Apagada"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Detener los intentos de conexión actuales"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Desconectar"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Desconectarse de las redes conectas"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Conectar"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Conectarse a las redes disponibles"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Su: %.1f(%.1f) | Desc: %.1f(%.1f)"
+"Para prevenir la aparición de esta advertencia en cada vista previa,\n"
+"establece tu reproductor de vídeos en las preferencias (mplayer por defecto)."
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Su: %.1f | Desc: %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Previsualizar"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Conectado)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr ""
+"ERROR:¡Fallo al ejecutar un reproductor de medios externo! Comando: `%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Desconectado)"
+msgid "Saving PartFile %u of %u"
+msgstr "Guardando archivo part %u de %u"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "¿Realmente deseas cerrar aMule?"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Todos los archivos part guardados."
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Confirmación de salida"
-
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "El directorio de tema '%s' no existe"
+msgid "Loading temp files from %s."
+msgstr "Cargando archivo temporales desde %s."
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "ATENCIÓN: No se puede abrir el archivo de pieles '%s' para lectura"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Redes"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Ventana de redes"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Buscar"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Ventana de búsquedas"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Tráfico"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Ventana de transferencia de archivos"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Archivos compartidos"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Ventana de archivos compartidos"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Mensajes"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Ventana de mensajes"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Estadísticas"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Ventana del gráfico de las estadísticas"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Ventana de la configuración de las preferencias"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importar"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "La herramienta para importar archivos part"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Acerca de/Ayuda"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "Red eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "red Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Sin red"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "General"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Conexión"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Directorios"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Servidores"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Seguridad"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Interfaz"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filtros"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Controles remotos"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Firma online"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Eventos"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Depurando"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Definido por el usuario"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"aMule debe reiniciarse para aplicar los cambios:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- Puerto TCP cambiado.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- Puerto UDP cambiado.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"Tu lista auto-actualizable de servidores esta vacía.\n"
-"La lista de servidores auto-actualizable al inicio será desactivada."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Tienes habilitado las conexiones externas, pero no tienes especificada una "
-"contraseña.\n"
-"Las conexiones externas no pueden ser habilitadas a menos que especifiques "
-"una contraseña válida."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Lenguaje cambiado.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Directorio TEMP cambiado.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- Red ED2K habilitada.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Su: 0.0 | Desc: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"eD2k y Kad están desactivados.\n"
-"No podrás conectarte hasta que actives al menos uno de ellos."
+msgid "Loading PartFile %u of %u"
+msgstr "Cargando archivo part %u de %u"
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad no se iniciará si tu puerto UDP está deshabilitado.\n"
-"Habilita un puerto UDP o deshabilita Kad."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"Debes reiniciar aMule ahora.\n"
-"Sino reinicias ahora, no sabemos si pasará algo malo.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Tu auto-actualización de lista de servidores está en blanco.\n"
-"Por favor introduce al menos una URL con un archivo server.met válido.\n"
-"Click en el botón \"Lista\" de este casilla  para introducir una URL."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Archivos temporales"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Archivos entrantes"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Firmas Online"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Elige una carpeta para %s"
+"ERROR: No se ha podido cargar el archivo de copia de seguridad. Busca en "
+"http://forum.amule.org para encontrar soluciones de recuperación de archivos "
+"part.met."
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Explorar"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Todos los archivos part cargados."
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Selecciona navegador"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "No se han encontrado archivos .part"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Ejecutable%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Editar la lista de servidores"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Encontrado %u parte de archivo"
+msgstr[1] "Encontrado %u partes de archivo"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Añade aquí las URL's para descargar los archivos server.met.\n"
-"Sólo una url por línea."
+"El sistema de ficheros del directorio Temporal, no puede manejar archivos "
+"grandes."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Intervalo de actualización: %d seg"
-msgstr[1] "Intervalo de actualización: %d segs"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"El sistema de ficheros del directorio Entrante, no puede manejar archivos "
+"grandes."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Tiempo medio del gráfico: %d min"
-msgstr[1] "Tiempo medio del gráfico: %d mins"
+msgid "Downloading %s"
+msgstr "Descargando %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Escala gráfica de conexiones: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Ya estás descargando este archivo '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Intervalo de actualización: %d seg"
-msgstr[1] "Intervalo de actualización: %d segs"
+msgid "You already have the file '%s'"
+msgstr "Ya tienes este archivo '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Tamaño del buffer de archivo: %d byte"
-msgstr[1] "Tamaño del buffer de archivo: %d bytes"
+msgid "You are already trying to download the file %s"
+msgstr "Ya estás descargando el archivo %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Tamaño de la cola de subida: %d cliente"
-msgstr[1] "Tamaño de la cola de subida: %d clientes"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "No se puede convertir el enlace magnet a eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Intervalo de refresco de la conexión al servidor: %d minuto"
-msgstr[1] "Intervalo de refresco de la conexión al servidor: %d minutos"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Intervalo de refresco de la conexión al servidor: Deshabilitado"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Puerto UDP para peticiones extendidas al servidor (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "deshabilitado"
+msgid "Unknown protocol of link: %s"
+msgstr "Protocolo desconocido del enlace: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Ejecutar comando en el evento `%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Habilitar ejecución de comando en el núcleo"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Comando del núcleo:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Habilitar ejecución de comando en la Interfaz"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Comando de la Interfaz: "
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Las siguientes variables serán reemplazadas:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Enlace eD2k inválido! ERROR: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Intento de acceso no autorizado. Conexión cerrada."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "Cliente envió un paquete despues de una autentificación fallida."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Conexión externa cerrada."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "¡Conexiones externas deshabilitadas debido a contraseña en blanco!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Conexiones externas deshabilitadas en el archivo de configuración"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Nueva conexión externa, aceptada"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERROR: no se ha podido aceptar una nueva conexión externa"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "¡Conexión externa rechazada debido a contraseña en blanco en las opciones!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Conectando con cliente: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Versión desconocida"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2348,2232 +1655,1063 @@
 "EC Incorrecto en la ID de versión, debe haber una incompatibilidad. Usa "
 "núcleo y remoto de la misma versión."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 "¡No puedes conectar a una versión final desde una versión SVN cualquiera! "
-"*sigh* posible error evitado"
-
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Autentificación fallida."
+"*ufff* posible error evitado"
 
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Versión de protocolo no válida."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Marcador de versión de protocolo inexistente."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+"Autentificación fallída: hash inválido especificado como contraseña EC."
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Autentificación fallida: contraseña incorrecta."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Autentificación fallida: falta contraseña."
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr "Solicitud no válida, deberías autentificarte primero."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Acceso concedido."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Mensaje \"%s\" de error enviado al cliente."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Intento de acceso no autorizado desde %s. Conexión cerrada."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 "Error en comando remoto del archivo Part: Hash de archivo no encontrado: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Hash de archivo no encontrado: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "¡OOPS! ¡Error procesando OpCode!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Servidor no añadido"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "servidor no encontrado: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "necesitas definir un servidor para borrarlo"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k está deshabilitado en las preferencias."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Búsqueda en proceso. Resultados obtenidos en breve!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Búsqueda web desde un interfaz remota no tiene sentido."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad está deshabilitado en opciones."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Sin puntos para el gráfico."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Tu cliente no está configurado para este nivel de detalle."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Conexión externa: apagado solicitado"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Ya estás cerrando."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Conexión externa: añadiendo enlace '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Enlace no válido o ya está en la lista."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Archivo no encontrado"
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Nombre de archivo incorrecto"
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Imposible renombrar archivo."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad está deshabilitado en opciones."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Ya estás conectado a eD2k."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Conectado a eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Ya estás conectado a Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Conectando a Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Todas las redes están deshabilitadas."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Desconectado de eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Desconectado de Kad"
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Conexión externa: recibido código de operación inválido: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "opcode no válido (¿versión de protocolo incorrecta?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr "Error al abrir el archivo (%s), borrando de la lista de compartidos."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Hashset solicitado de archivo desconocido: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Comando `%s' con pid `%d' ha terminado con código `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Servidor no añadido: IP o nombre de host no especificado."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Servidor no añadido: Servidor-puerto especificado no válido."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Status de eD2k:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Conectado"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Puerto"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Estado Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Ejecutando"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Estado:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Desconectado"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Estado de Conexión:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Tras Cortafuegos"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "Aceptar"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Estado tras cortafuegos:"
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Conectado a amigo"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "No amigo"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Media de Usuarios:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Media de Archivos:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "No ejecutando"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Tiempo de ejecución: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Transferencia"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Subidas"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Datos subidos (Sesión (Total)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Total por tráfico excedente (Paquetes): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Excedente por peticiones de archivo (Paquetes): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Excedente por intercambio de fuentes (Paquetes): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Tráfico excedente de servidores (Paquetes): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Tráfico excedente Kad (Paquetes): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Cifrado excedente (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Subidas activas: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Subidas en espera: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Total de subidas satisfactorias: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Total de subidas erróneas: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Tiempo medio de subida: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Descargas"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Datos descargados (Sesión (Total)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Fuentes encontradas: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Descargas activas (partes): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Índice SU:DE Sesión (Total): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Velocidad media de descarga (Sesión): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Velocidad media de subida (Sesión): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Velocidad máxima de descarga (Sesión): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Velocidad máxima de subida (Sesión): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Reconexiones: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Tiempo desde la primera transferencia: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Conectado al servidor desde: %s"
-
-#: src/Statistics.cpp:696
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Conexiones activas (estimado): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Alcanzado límite máximo de conexiones: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Media de conexiones (estimado): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Pico de conexiones (estimado): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Clientes"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrado"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Total: %i Conocido(s): %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Servidores activos: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Servidores caídos: %i"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Extensión desconocida '%s' para el comando '%s'.\n"
 
-#: src/Statistics.cpp:717
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Total: %s"
-msgstr "Total: %s"
+msgid "Unknown command '%s'.\n"
+msgstr "Comando desconocido '%s'.\n"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Servidores borrados: %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Este comando no tiene un argumento.\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Servidores filtrados: %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Este comando debe tener un argumento.\n"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Usuarios en servidores activos: %llu"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Este comando está incompleto, debes usar una de la extensiones....\n"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Archivos en servidores activos: %llu"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Extensiones disponibles:\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Usuarios totales: %llu"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Comandos disponibles:\n"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Total Files: %llu"
-msgstr "Archivos totales: %llu"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Todos los comandos son sensibles a las mayúsculas.\n"
+"Teclea '%s <comando>' para obtener información detallada del <comando>.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Ocupación de Servidores: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Salir de la aplicación."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Número de archivos compartidos: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Mostrar ayuda"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Tamaño total de archivos compartidos: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Para obtener ayuda de un comando, teclea 'help <comando>'.\n"
+"Para obtener la lista completa de comandos, teclea 'help'.\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
-msgstr "Tamaño medio de archivo: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Sistema Operativo"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "No recibido"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Pegar"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Seleccionar todo"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Usa '%s' para la lista de comandos\n"
+"\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "No se buscará en Kad si no está conectado a Kad"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "¡Error de sintaxis!"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
-"No se puede realizar una búsqueda en eD2k si no se está conectado a eD2k"
+"Error procesando el comando - ¡nunca debería pasar! Informa del fallo, por "
+"favor\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Error inesperado mientras intentaba buscar en Kad: "
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Este comando no debería tener ningún parámetro"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Mensaje filtrado de '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Este comando debe tener un parámetro."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nuevo mensaje de '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Argumento no válido."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "Usuario %s (%u) solicitó tu lista de archivos compartidos -> Aceptada"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Esto es un comando incompleto."
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "Usuario %s (%u) solicitó tu lista de archivos compartidos -> Denegada"
+msgid "Type '%s' to get more help.\n"
+msgstr "Teclea '%s' para obtener mas ayuda.\n"
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"Usuario %s (%u) ha solicitado tu lista de directorios compartidos -> Aceptada"
+msgid "This is %s %s %s\n"
+msgstr "Esto es %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr ""
-"Usuario %s (%u) ha solicitado tu lista de directorios compartidos -> Denegada"
+msgid "This is %s %s\n"
+msgstr "Esto es %s %s\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"Usuario %s (%u) solicitó tu lista de archivos compartidos del directorio %s -"
-"> aceptada"
-
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"Usuario %s (%u) solicitó tu lista de archivos compartidos del directorio %s -"
-"> denegada"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Usuario %s (%u) directorios compartidos %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Usuario %s (%u) enviado directorios compartidos no solicitados."
-
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
+"\n"
+"Creating client...\n"
 msgstr ""
-"Usuario %s (%u) enviada la lista de archivos compartidos por directorio %s"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Usuario %s (%u) finalizó el envío de la lista de archivos compartidos"
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Usuario %s (%u) enviada la lista de archivos compartidos no deseada"
+"\n"
+"Creando cliente...\n"
 
-#: src/ClientTCPSocket.cpp:1049
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Usuario %s (%u) denegó el acceso a la lista de directorios/archivos "
-"compartidos"
-
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Nodos (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "IP no válida para conectar"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Puerto no válido para conectar"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Por favor rellena todos los campos requeridos"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "¿Estás seguro que quieres descargar un nuevo nodes.dat?\n"
+"\n"
+"Ok, saliendo %s...\n"
 
-#: src/KadDlg.cpp:197
+#: src/ExternalConnector.cpp:420
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"Si lo haces borrarás tus nodos actuales y reiniciarás la conexión Kademlia."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "¿Continuar?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "ERROR:"
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "ADVERTENCIA:"
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Añadir un amigo"
-
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Es necesario introducir una IP y puerto válidos"
+"Imposible conectar con una contraseña en blanco.\n"
+"Debes especificar una contraseña en el archivo config\n"
+"o en linea de comandos, o introduce una cuando te pregunte.\n"
+"\n"
+"Saliendo...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Información"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Mostrar esta ayuda."
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "¡El hash de usuario especificado no es válido!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Host donde se está ejecutando aMule. (por defecto: localhost)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Fuentes"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Puerto de conexión externa de aMule. (por defecto: 4712)"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Archivo"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Contraseña de conexiones externas"
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Descarga"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Leer configuración desde el archivo."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Categoría"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "No muestres ninguna salida."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Principal"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Modo Extendido - muestra también los mensajes de depuración"
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Descargar en la categoría"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Selecciona el idioma del programa."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Buscar archivos relacionados (eD2k, búsqueda local)"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Escribe opciones de la línea de comando al archivo de configuración."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Marcar como archivo conocido"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr ""
+"Crear archivo de configuración basado en el archivo de configuración de "
+"aMule."
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Conectar a amule remoto"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Imprime versión del programa."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Conexión fallida"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Detalles del archivo"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "ERROR"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% terminado."
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Error de conexión. Imposible conectar a %s:%d\n"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
-"ADVERTENCIA: No puedes añadirte a ti mismo como una fuente para un enlace "
-"eD2k teniendo ID baja."
+"¡ No se ha podido abrir el archivo de amigos 'emfriends.met' para su "
+"lectura !"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Usuarios: E: %s K: %s | Archivos E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+"¡ No se ha podido abrir el archivo de amigos 'emfriends.met' para su "
+"escritura !"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Todos"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "CRITICO - sin cliente en sesión chat de inicio"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Total Usuarios: %s | Total Archivos: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Amigos"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Transferido"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Mostrar &Detalles"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Velocidad"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Añadir un amigo"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Progreso"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Eliminar amigo"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Estado"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Enviar &Mensaje"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Tiempo restante"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Ver archivos"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Última comprobación completa"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Establecer puesto reservado a un amigo"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Última recepción"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "¿Estás seguro que deseas borrar al amigo seleccionado?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "¿Estás seguro que deseas borrar este archivo?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "¿Estás seguro que deseas borrar a los amigos seleccionados?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "¿Estás seguro que deseas borrar estos archivos?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"No se le permite asignar mas de un puesto reservado.\n"
+" Solo se asignó un puesto reservado."
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Selección múltiple"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Enviar mensaje al usuario"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Mensaje a enviar:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Detener"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pausar"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Reanudar"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "&Limpiar completados"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Intercambiar todas las fuentes (A4AF) a este archivo"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Intercambiar todas las fuentes (A4AF) a este archivo (Auto)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Intercambiar todas las fuentes (A4AF) a otro archivo"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Opciones Extendidas"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Previsualizar"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Mostrar detalles archivo"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Mostrar todos los comentarios"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Copiar la URL magnética al portapapeles"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "no asignado"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Asignar a categoría"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Abrir el archivo"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Borrar desde amigos"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Añadir a Amigos"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Intercambia a este archivo"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
-msgstr "LC: %u (%i)"
+msgid "On Queue: %u (%i)"
+msgstr "En cola: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Se ha pedido otro archivo"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Descargas (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Para prevenir la aparición de esta advertencia en cada vista previa,\n"
-"establece tu reproductor de vídeos en las preferencias (mplayer por defecto)."
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Esperando por un puesto de subida"
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Previsualizar"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr ""
-"ERROR:¡Fallo al ejecutar un reproductor de medios externo! Comando: `%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "ERROR: Error al crear el archivo part"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Intentando cargar copia de seguridad del archivo met desde %s"
-
-#: src/PartFile.cpp:334
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ERROR: No se ha podido abrir el archivo part.met: %s ===> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ERROR: el archivo part.met tiene tamaño 0: %s ===> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ERROR: Archivo part.met inválido: ERROR: versión: %s ===> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"ERROR: %s (%s) está corrupto (cuenta de etiquetas errónea), imposible cargar "
-"el archivo."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Intentando recuperar info de archivo..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "Recuperando archivo sin nombre - lo recuperaré como RecoveredFile.dat"
+msgid "On Queue: %u"
+msgstr "En Cola: %u"
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Recuperada toda la info disponible del archivo :D - Intentando usarla..."
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Subiendo"
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Imposible recuperar info de archivo..."
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Ninguno"
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Error al abrir %s (%s)"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "No"
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "ADVERTENCIA: %s puede estar corrupto (%i)"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Sí"
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "ERROR salvando archivo part: %s (%s ==> %s)"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Descargando..."
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "No se puede recuperar la duración de '%s' - usando el archivo %s."
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "Descarga HTTP cancelada"
 
-#: src/PartFile.cpp:927
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "de alguna manera el tamaño de '%s' es 0 - usando archivo %s."
+msgid "Unable to create destination file %s for download!"
+msgstr "Imposible crear archivo de destino %s para la descarga!"
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Error al guardar archivo part.met.seeds por %s"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "La URL a descargar no puede estar vacía"
 
-#: src/PartFile.cpp:1024
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Guardado %i semilla de fuentes en archivo part: %s (%s)"
-msgstr[1] "Guardado %i semillas de fuentes en archivo part: %s (%s)"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "La URL %s devolvió: %i - Error (%i)!"
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Archivo part %s (%s) no tiene archivo de semillas"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Error crítico guardando el archivo descargado"
 
-#: src/PartFile.cpp:1062
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Archivo part %s (%s) tiene un archivo de semillas vacío"
+msgid "Downloaded %d bytes"
+msgstr "Descargado %d bytes"
 
-#: src/PartFile.cpp:1118
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Error leyendo semillas del archivo part (%s - %s): %s"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Se experaban %d bytes, pero se descargaron %d bytes"
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Parte corrupta encontrada (%i) en %d parte del archivo %s - Resultado del "
-"hash del archivo |%s| Hash del archivo |%s|"
-msgstr[1] ""
-"Parte corrupta encontrada (%i) en %d partes del archivo %s - Resultado del "
-"hash del archivo |%s| Hash del archivo |%s|"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
+msgstr ""
+"URL inválida para descarga HTTP o redirección HTTP (¿ no habrás olvidado "
+"'http://' ?)"
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Parte (%i) completa encontrada en %s"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "Imposible conectar al servidor de descarga HTTP"
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Recodificación terminada %s"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Respuesta incorrecta desde el servidor de descarga HTTP"
 
-#: src/PartFile.cpp:2239
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Error inesperado mientras se completaba %s. Archivo pausado"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Descargar nuevo GeoIP.dat desde %s"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Descarga terminada: %s"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "Descarga del archivo GeoIP.dat fallida, abortando actualización."
 
-#: src/PartFile.cpp:2323
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "Deleting file: %s"
-msgstr "Borrando archivo: %s"
+msgid "Failed to remove %s file, aborting update."
+msgstr "Error al borrar el archivo %s, abortando actualización."
 
-#: src/PartFile.cpp:2384
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"ADVERTENCIA: No se puede crear el hash de la parte descargada, set de hashes "
-"incompleto para '%s'"
+msgid "Failed to rename %s file, aborting update."
+msgstr "Error al renombrar el archivo %s, abortando actualización."
 
-#: src/PartFile.cpp:2389
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
-msgstr ""
-"ERROR: No se puede crear el hash de la parte descargada, set de hashes "
-"incompleto para (%s). Esto no debería pasar nunca"
-
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "ALERTA: No hay espacio libre en el disco! Pausando archivo: %s"
+msgid "Successfully updated %s"
+msgstr "Actualizacion realizada %s"
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Parte descargada %i corrupta en archivo: %s"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Error actualizando GeoIP.dat"
 
-#: src/PartFile.cpp:3214
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Recuperada parte corrupta %i de %s -> Bytes salvados: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Asignando"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Espacio en disco insuficiente"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Detenido"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Descargado"
+msgid "Failed to download %s from %s"
+msgstr "Error al descargar %s desde %s"
 
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ERROR: Fallo al abrir archivo part '%s'"
+msgid "Failed to load country data for '%s'."
+msgstr "Error al cargar datos de paises desde '%s'."
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "ADVERTENCIA: no se puede abrir known.met."
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Cargando filtros IP 'ipfilter.dat' y 'ipfilter_static.dat'."
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr ""
-"ADVERTENCIA: lista de conocidos (knownfile) corrupta, la cabecera es "
-"incorrecta."
-
-#: src/KnownFileList.cpp:112
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "IO error leyendo el archivo known.met: %s"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "Error al cargar ipfilter.dat '%s', encontrado formato desconocido."
 
-#: src/KnownFileList.cpp:158
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Error guardando archivo known.met: %s"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "Error al cargar ipfilter.dat '%s', imposible abrir el archivo."
 
-#: src/SharedFileList.cpp:352
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Encontrado %i archivos compartido"
-msgstr[1] "Encontrado %i archivos compartidos"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Cargado %u rango IP desde '%s'."
+msgstr[1] "Cargado %u rangos IP desde '%s'."
 
-#: src/SharedFileList.cpp:358
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Encontrado %i archivo compartido, %i desconocido"
-msgstr[1] "Encontrado %i archivos compartidos, %i desconocidos"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u línea malformada fue descartada"
+msgstr[1] "%u líneas malformadas fueron descartadas"
 
-#: src/SharedFileList.cpp:367
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ERROR: Intentando compartir %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Comentarios del archivo"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Valoración"
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Error al renombrar el archivo %s, abortando actualización."
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Comentario"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "Filtro IP está listo"
 
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Sin comentarios"
-
-#: src/CommentDialogLst.cpp:104
-#, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u comentario"
-msgstr[1] "%u comentarios"
-
-#: src/ServerConnect.cpp:69
+#: src/KadDlg.cpp:86
 msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Fallo al conectar a todo los servidores ofuscados listados. Intentándolo de "
-"nuevo sin ofuscación."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Error al conectar a todos los servidores."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "Protocolo eD2k deshabilitado en las preferencias, no se conecta."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr ""
-"No se han encontrado servidores válidos para conectar en la lista de "
-"servidores"
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Conectado a %s (%s:%i)"
-
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Conexión establecida en: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Error fatal conectando. La conexión a Internet podría estar desactivada"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Conexión perdida con %s (%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) parece estar caído."
-
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) parece estar lleno."
+"Conectar desde \n"
+"clientes conocidos"
 
-#: src/ServerConnect.cpp:381
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Se reintentará la conexión automática al servidor en %d segundo"
-msgstr[1] "Se reintentará la conexión automática al servidor en %d segundos"
+msgid "Nodes (%u)"
+msgstr "Nodos (%u)"
 
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Conexión perdida"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "IP no válida para conectar"
 
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Conectando con %s (%s:%i) fallido"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Puerto no válido para conectar"
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ERROR: Socket inválido al comprobar el timeout"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Por favor rellena todos los campos requeridos"
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Intento de conexión con %s (%s:%i) tiempo agotado."
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "¿Estás seguro que quieres descargar un nuevo nodes.dat?\n"
 
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:212
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-"ERROR: No se ha podido cargar el archivo de copia de seguridad. Busca en "
-"http://forum.amule.org para encontrar soluciones de recuperación de archivos "
-"part.met."
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "No se han encontrado archivos .part"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Encontrado %u parte de archivo"
-msgstr[1] "Encontrado %u partes de archivo"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
-"El sistema de ficheros del directorio Temporal, no puede manejar archivos "
-"grandes."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"El sistema de ficheros del directorio Entrante, no puede manejar archivos "
-"grandes."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Descargando %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Ya estás descargando este archivo '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Ya tienes este archivo '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Ya estás descargando el archivo %s"
+"Si lo haces borrarás tus nodos actuales y reiniciarás la conexión Kademlia."
 
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "No se puede convertir el enlace magnet a eD2k: %s"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "¿Continuar?"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Protocolo desconocido del enlace: %s"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: palabra de búsqueda demasiado corta"
 
-#: src/DownloadQueue.cpp:1328
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Enlace eD2k inválido! ERROR: %s"
+msgid "Keyword for search: %s"
+msgstr "Palabra clave para búsqueda: %s"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Ejecuta <str> y sal."
-
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Formato IP no válido. Usa xxx.xxx.xxx.xxx:xxxx\n"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: palabra de búsqueda ya está en la lista de búsqueda: "
 
-#: src/TextClient.cpp:309
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Este comando requiere un argumento. Argumentos válidos: 'all (todo)' o un "
-"numero.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Procesando por hash: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Procesando por nombre de archivo: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"Este comando requiere un argumento. Argumentos válidos: un hash de archivo.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Número inválido\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Hash no válido (la longitud debería ser exactamente 32 caracteres)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Operación satisfactoria."
+"Error al leer el archivo nodes.dat - demasiado antiguo. Esta versión (0) ya "
+"no está soportada."
 
-#: src/TextClient.cpp:637
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Solicitud fallida con el siguiente error: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "El Filtro IP para clientes es %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "Apagado"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "Encendido"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Leído %u contacto Kad"
+msgstr[1] "Leídos %u contactos Kad"
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "El Filtro IP para servidores es %s.\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
+msgstr "Contactos no encontrados, por favor descarga un archivo nodes.dat."
 
-#: src/TextClient.cpp:664
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "El nivel de filtrado de IP actual es %d.\n"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Solo %d contacto Kad disponible, nodes.dat no escrito"
+msgstr[1] "Solo %d contactos Kad disponibles, nodes.dat no escrito"
 
-#: src/TextClient.cpp:671
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Límites del ancho de banda: Subida: %u kB/s, Bajada: %u kB/s\n"
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Escrito %d contacto Kad"
+msgstr[1] "Escritos %d contactos Kad"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Nombre de archivo"
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "Conectado a %s %s %s"
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Tamaño de archivo"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "con IDBaja"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Media compartido"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "con IDAlta"
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Subido"
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Conectando ahora"
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Pedido"
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "No conectado"
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Aceptado"
 
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
-msgstr ""
-"\n"
-"Descarga:\t%s"
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Fuentes completas"
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"\n"
-"Subida:\t%s"
+"ALERTA: Fichero de lista de compartidos corrupto, contiene una cabecera "
+"inválida."
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"\n"
-"Clientes en cola:\t%d\n"
+"Error al cargar entrada en lista de conocidos, el archivo debe estar corrupto"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"\n"
-"Fuentes totales:\t%d\n"
+"Entrada inválida en lista de conocidos, el archivo debe estar corrupto: "
 
-#: src/TextClient.cpp:809
+#: src/libs/common/Format.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Número de resultados de la búsqueda: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - muestra el progreso de una búsqueda"
+msgid "Unknown error %d"
+msgstr "Error desconocido %d"
 
-#: src/TextClient.cpp:828
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Recibida una respuesta desconocida desde el servidor, OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Mostrar una breve información de estado."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Mostrar estado de conexión, velocidad subida/descarga actual, etc.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Mostrar árbol completo de estadísticas."
-
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Opcionalmente, un número entre 0-255 puede ser un argumento de este "
-"comando,\n"
-"el cual dice cuantas entradas del árbol de versión de cliente deberían "
-"mostrarse.\n"
-"Con 0 o sin valor significa 'sin limite'.\n"
-"\n"
-"Ejemplo: 'statistics 5' mostrará solo las 5 versiones que mas se repiten de "
-"cualquier cliente.\n"
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Terminar aMule."
-
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Terminar el núcleo remoto (amule/amuled) en funcionamiento.\n"
-"Esto terminará también el cliente modo texto, ya que no se puede\n"
-"usar sin un núcleo en funcionamiento.\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Recargar el objeto dado"
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Recargar lista de archivos compartidos."
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Recargar tabla de filtro de IP desde archivo."
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Conectado a la red."
-
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"Esto conectará a todas las redes que estén habilitadas en opciones.\n"
-"Opcionalmente también puedes especificar un servidor de forma IP:Puerto, "
-"para\n"
-"conectar a ese servidor solamente. La IP debe ser una dirección IPv4,\n"
-"o un nombre DNS."
+msgid "Unable to get error description for error %d"
+msgstr "Imposible obtener descripción de error para el error %d"
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Conectar solo a eD2k."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Conectar solamente a Kad"
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Desconectado de la red."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr ""
-"Esto te desconectará de todas las redes en las que estás actualmente "
-"conectado.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Desconectar de eD2k solo."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Desconectar solamente Kad"
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Añade un enlace eD2k o magnet al núcleo."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
-msgstr ""
-"En enlace eD2k a añadir puede ser:\n"
-"*) un enlace a un archivo (ed2k://|file|...),será añadido a la cola de "
-"descargas,\n"
-"*) un enlace a un servidor (ed2k://|server|...), será añadido a la lista de "
-"servidores,\n"
-"*) o un enlace a una lista de servidores, en tal caso, todos los servidores "
-"en  la lista\n"
-"serán añadidos a la lista de servidores.\n"
-"\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Asigna un valor de opción"
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Asignar opciones de filtrado de IP."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Activa el filtro para clientes y servidores."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Desactiva el filtro para clientes y servidores."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Activa/Desactiva el filtro para clientes."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Activa el filtro para clientes."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Desactiva el filtro para clientes."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Activa/Desactiva el filtro para servidores."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Activa el filtro para servidores."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Desactiva el filtro para servidores."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Selección nivel de filtrado de IP"
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
-msgstr ""
-"Niveles válidos en el filtro 0-255, y el valor por defecto (inicial)\n"
-"es 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Asignar limites de ancho de banda."
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "El valor dado a estos comandos han de ser en kilobytes/seg.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Asignar un limite de subida."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Codificando"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Asignar un limite de descarga."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Completando"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Obtener y mostrar un valor de opciones"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Completado"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Obtener opciones de filtrado de IP"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Pausado"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Obtener estado del filtro IP para clientes y servidores."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Erróneo"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Obtener estado del filtro IP para clientes."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Esperando"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Obtener estado del filtro IP para servidores."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Debes especificar una contraseña no vacía."
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Obtener nivel de filtrado de IP."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "¡Contraseña incorrecta, no es un código MD5!"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Obtener limites de ancho de banda."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Error de conexión"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Haz una búsqueda."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "La conexión EC ha fallado, Respuesta vacía."
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
-"Una búsqueda por tipo, debe especificarse el tipo:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Ejemplo: 'search kad archivo' ejecutara una búsqueda en kad de \"archivo\".\n"
+"Conexión externa: Respuesta errónea, fallo el manejador. Conexión cerrada."
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Ejecuta una búsqueda global."
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Ejecuta una búsqueda local."
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Ejecuta una búsqueda kad."
-
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Muestra los resultados de la última búsqueda."
-
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Devuelve los resultados de la búsqueda anterior.\n"
-
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Muestra el progreso de una búsqueda."
-
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Muestra el progreso de una búsqueda..\n"
-
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Comenzar descargando un archivo"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "¡Hecho! Conexión establecida con aMule"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"El número de un archivo de la última búsqueda se tiene que dar.\n"
-"Ejemplo: 'download 12' iniciará la descarga del archivo con el número 12 de "
-"la búsqueda anterior.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "¡Hecho! Conexión establecida."
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Pausar descarga."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Conexión externa: Acceso denegado, razón:"
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Resumir descarga."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Conexión externa: Falló el manejador."
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "Socket de escucha: Ok"
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Cancelar descarga."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "ERROR: No se puede escuchar en el puerto TCP."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Asignar prioridad de descarga."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "ERROR:"
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Fija prioridad de la descarga a Baja, Normal, Alta o Auto.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "ADVERTENCIA:"
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Establecer la prioridad a baja."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Cerrar"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Establecer la prioridad a normal."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Cortar"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Establecer la prioridad a alta."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Copiar"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Establecer la prioridad a auto."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Pegar"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Mostrar colas/listas."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Limpiar"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Mostrar cola subida/descarga, lista de servidores o lista de archivos "
-"compartidos.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Seleccionar todo"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Mostrar cola de subida"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Mostrar cola de descarga."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Ilimitado"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Mostrar registro."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Menú aMule"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Mostrar lista de servidores."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Límites de velocidad"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Limpiar registro."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "SU: Ninguno"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Comando deprecado, usa %s."
+msgid "UL: %u"
+msgstr "SU: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Este es un comando en desuso, y será borrado en el futuro.\n"
-"Usa '%s' en su lugar.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DE: Ninguna, "
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ERROR: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "DE: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "ADVERTENCIA: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Velocidad de descarga: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "El nuevo ID-Cliente es %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "ALERTA: ¡Has recibido ID-Baja!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tEsto sucede porque estás detrás de un cortafuegos o de un router."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tPara mas información, por favor ves a http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Velocidad de subida: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "¡Información recibida del servidor desconocida! - demasiado pequeña"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Información del cliente"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Recibido %d servidores nuevo"
-msgstr[1] "Recibido %d servidores nuevos"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Guardado lista de servidores completado."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "El servidor rechaza el último comando"
+msgid "Nickname: %s"
+msgstr "Alias: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Paquete bogus recibido desde el servidor: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "¡Ningún alias introducido!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Error mientras se estaba procesando un paquete desde el servidor: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID Cliente:"
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Imposible crear un hilo de resolución de DNS para conectar con %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "No conectado"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "Servidor IP %s (%s) está filtrado. No conectará."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Nombre del servidor: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "usando ofuscación de protocolo."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP del servidor: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Conectando a %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "No conectado"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Imposible resolver dns para el servidor %s: ¡Imposible conectar! "
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Error al cargar el dato del país desde "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Cargada %d foto de una bandera."
-msgstr[1] "Cargadas %d fotos de banderas."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"¿Estás seguro que deseas cancelar y borrar todos los archivos de esta "
-"categoría?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Confirmación requerida"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Sin catalogar."
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Incompleto"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Activo"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Vídeo"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Audio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Archivos"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Imágenes de CD"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Imágenes"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Texto"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Seleccionar filtro de vistas"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Añadir categoría"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Editar categoría"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Eliminar categoría"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Nombre de archivo"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Tamaño de archivo"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Media compartido"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Subido"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Pedido"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Aceptado"
+msgid "TCP port: %d"
+msgstr "Puerto TCP: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Fuentes completas"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "Puerto TCP: No está listo"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Importando %s: %s"
+msgid "UDP port: %d"
+msgstr "Puerto UDP: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Leyendo directorio temp"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "Puerto UDP: No está listo"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Obteniendo información básica de archivo info de descarga"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Firma Online: Activada"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Creando archivo de destino"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Firma Online: Desactivada"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Cargando datos desde la antigua descarga del archivo (%u de %u)"
+msgid "Uptime: %s"
+msgstr "Tiempo de ejecución: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Guardando bloque de datos en un nuevo archivo de descarga (%u de %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Obteniendo información del archivo fuente de descarga"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Añadiendo descarga y guardando nuevo archivo part"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importar archivos part"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Estado"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Hash de archivo"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Esperando..."
+msgid "Shared files: %d"
+msgstr "Archivos compartidos: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disco: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"¡Por favor elige un directorio para buscar descargas temporales! "
-"(subdirectorios serán incluidos)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"¿Quieres que los archivos fuente de una descarga importada "
-"satisfactoriamente sean borrados?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "¿Borrar fuentes?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/seg"
-msgstr[1] "bytes/seg"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "segs"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "mins"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "horas"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "días"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Vídeos"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Archivos"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Textos"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programas"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Todos"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "No evaluada"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Inválido / Corrupto / Falsificación"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Pobre"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Aceptable"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Bueno"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Excelente"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "Todo"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "El resto"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Cargando filtros IP 'ipfilter.dat' y 'ipfilter_static.dat'"
+msgid "Queued clients: %d"
+msgstr "Clientes en cola: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Error al cargar ipfilter.dat '%s', encontrado formato desconocido."
+msgid "Total DL: %s"
+msgstr "Total DE: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "Error al cargar ipfilter.dat '%s', imposible abrir el archivo."
+msgid "Total UL: %s"
+msgstr "Total SU: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Cargado %u rango IP desde '%s'."
-msgstr[1] "Cargado %u rangos IP desde '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Límite de subida"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u línea malformada fue descartada"
-msgstr[1] "%u líneas malformadas fueron descartadas"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Límite de descarga"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Conexiones activas (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Ocultar aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Detalles del archivo"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Mostrar aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% terminado."
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Salir"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "Enlace eD2k:"
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Enviar"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Haz Click aquí para añadir el enlace eD2k de la entrada de texto de control "
 "a la cola de descargas."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4581,19 +2719,19 @@
 "Los eventos son mostrados aquí. Para una lista completa de eventos, ves al "
 "registro, de la pestaña de servidores."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Cargando ..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Número de usuarios en el servidor al cual estás conectado ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Usuarios: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4602,6 +2740,10 @@
 "de usuarios."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Su: 0.0 | Desc: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4609,7 +2751,7 @@
 "Índice actual de subidas y descargas. Si habilitas los números significan "
 "los gastos indirectos en la comunicación del cliente."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4621,524 +2763,579 @@
 "que tienes ID-Baja (detrás de cortafuegos) y flechas verdes significan que "
 "tienes ID-Alta (El tipo de conexión óptima)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "No Conectado ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Conectado al servidor."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Buscar"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Nombre: "
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tipo"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "FileHash"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Opciones extendidas"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtrar"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Tipo de archivo"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Todos"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Archivos"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Audio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Imágenes de CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Imágenes"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programas"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Textos"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Vídeos"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Extensión"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Tamaño Min"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Tamaño Max"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Disponibilidad"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Filtrar Resultados"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Invertir Resultado"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Ocultar Archivos Conocidos"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Comenzar"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Mas"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
-msgstr "Busca más resultados en en eD2k. No soportado por Kad aún."
+msgstr "Busca más resultados en eD2k. Aún no soportado por Kad."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Cancelar"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Descarga"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Limpiar campos"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Resultados"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Limpiar descargas completadas"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Mostrar subida / Cola de subida"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Clientes en cola :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Enviar"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Enviar un mensaje específico."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Cerrar"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Fuentes de archivo:"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Cerrar esta sesión de chat"
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "General"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Nombre Completo :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/D"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "Archivo-met :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Hash :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Tamaño :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Estado archivo part :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Última comprobación completa :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Transferencia"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Fuentes encontradas :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Transfiriendo fuentes :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Número de partes :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Disponibles :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Flujo de datos :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Tiempo Descarga Activa: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Transferido :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Tamaño Completado :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Gestión inteligente de corrupción"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Perdido por corrupción :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Ganado por compresión :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Paquetes salvados por I.C.H.:"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Nombres de archivo"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Tomar"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Limpiar"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 "Comentario/Calificación del archivo (El texto será visible por todos los "
 "usuarios)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Para una película, puedes poner su duración, su descripción, el idioma ...\n"
-"y si es una falsificación (fake) puedes informar a los demás usuarios de "
-"aMule"
+"Para una película, puedes poner su duración, su historia, el idioma ...\\n"
+"\\ny si es una falsificación (fake) puedes informar a los demás usuarios de "
+"aMule."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Calificación de archivo"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "No evaluada"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Inválido / Corrupto / Falsificación"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Pobre"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Aceptable"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Bueno"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Excelente"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Cambiar la calificación del archivo o advertir a otros usuarios si no es "
 "válido"
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Descargando, por favor espera ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Tamaño desconocido"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Información requerida"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "Dirección IP :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Puerto :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Nombre de usuario :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Hash del usuario :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Recargar tus archivos compartidos"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Sesión actual"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Total"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Peticiones:"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Subidas aceptadas :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Añadir"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Velocidad de descarga"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Actual"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Media de ejecución"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Media de la sesión"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Velocidad de subida"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Conexiones"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Descargas activas"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Conexiones activas (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Subidas activas"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Árbol de estadísticas"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Nombre de usuario:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Hash de usuario:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Software del cliente:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Versión del cliente:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "Dirección IP:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID usuario:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP Servidor:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Nombre servidor:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Ofuscación:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Transferencias al cliente"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Solicitud actual:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Velocidad media de subida :"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Velocidad media de descarga :"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Subido (sesión):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Descargado (sesión):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Subido (total):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Descargado (total):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Resultados"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Modificador DE/SU:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Ident Segura:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Calificación (total):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Rango de cola"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Puntuación cola:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Alias"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - la Mula de Linux"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - la mula multi-plataforma"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 "Este es el nombre que los otros usuarios verán cuando se este conectando a "
 "ti."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Idioma"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Lenguaje: "
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Retardo antes de mostrar los mensajes emergentes."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Esto especifica el lenguaje usado en los controles."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Opciones varias"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Comprobar nueva versión al inicio"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Habilitando esto, hará que aMule compruebe si existe una nueva versión al "
 "inicio."
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Iniciar minimizado"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Habilitando esto, haces que aMule se minimice en el inicio."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Preguntar al salir"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
 msgstr "Hacer que aMule pregunte antes de salir."
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Habilitar icono de sistema"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Esto habilita/deshabilita icono de sistema (o de la barra de tareas)."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Minimizar al icono de la bandeja"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5146,660 +3343,585 @@
 "Activando esto hará que aMule se minimice en la bandeja del sistema, "
 "parecido a la barra de tareas."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Retardo de los mensajes emergentes en segs"
-
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Retardo antes de mostrar los mensajes emergentes."
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Tiempo de retardo de los mensajes emergentes: "
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "segundos"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Navegador por defecto"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Selecciona tu navegador aquí"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Navegador personal:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Introduce el nombre del navegador. Para usar un navegador personal, "
-"selecciona personalizado en el menú de arriba."
+"Introduce el nombre de tú navegador. Dejaló en blanco si quieres usar el de "
+"por defecto."
+
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Examinar"
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Abrir en nueva pestaña si es posible"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Abrir cuando sea posible, la página web en una nueva pestaña en lugar de en "
 "una nueva ventana"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Reproductor de vídeo"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Crear un copia para la previsualización"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Límites del ancho de banda"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Subida"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Asignación de puesto reservado"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Puerto TCP estándar:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Puertos"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Puerto TCP estándar "
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Este es el puerto eD2k estándar y no puede ser deshabilitado"
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Puerto UDP estándar:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "Puerto UDP para peticiones del servidor (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Puerto UDP estándar (Kad / búsqueda global) "
+
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
-"Este puerto UDP se usa para peticiones extendidas de las redes ed2k y Kad"
+"Este puerto UDP es usado para peticiones extendidas de eD2k y la red Kad"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "desactivar"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Habilitar UPnP para el reenvío de puerto del router"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Dirección de enlace"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Puerto UDP para peticiones extendidas al servidor (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Max. fuentes/archivo"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "Puerto UPnP TCP (Opcional):"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Límite superior"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Dirección IP local de enlace: (vacía para cualquiera):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Límites de conexión"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Conexiones máximas"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Solo usuarios avanzados: Si tu tienes múltiples tarjetas de red, introduce "
+"la dirección de la tarjeta, la cual, aMule deberá usar."
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Max. fuentes descargando un archivo:"
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Max. conexiones simultaneas:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Habilitar UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Puerto UPnP TCP:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Autoconectar al iniciar"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Reconectar al perder la conexión"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Mostrar ancho de banda excedente"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Opciones de servidor"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Eliminar servidores caídos tras"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "reintentos"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Auto-actualizar la lista de servidores al inicio"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Actualizar la lista de servidores al conectar a un servidor"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Actualizar la lista de servidores cuando un cliente se conecta"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Usar sistema de prioridades"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Control inteligente de IDBaja al conectar"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Conexión segura"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Autoconectar sólo a Servidores fijos"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Asignar alta prioridad a los servidores añadidos manualmente"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "Activar I.C.H"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH confiar en todos los hash (no recomendado)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Manejador Inteligente de Corrupciones (I.C.H)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Habilitar"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "I.C.H. avanzado, confiar en todos los hash (no recomendado)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Añadir archivos para descargar en modo pausado"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Añadir nuevas descargas con auto prioridad"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Intentar descargar antes la primera y última parte"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Añadir nuevos archivos compartidos con auto prioridad"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Intentar transferir partes completas en todas las subidas"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr "Descargar siguiente archivo pausado cuando otro se complete"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Solo en la misma categoría"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Guardar 10 fuentes en archivos raros (< 20 fuentes)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "En orden alfabético"
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Espacio en disco"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Reservar espacio en disco para los nuevos archivos"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Comprobar espacio en disco"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
+"Para los nuevos archivos reservar todo el espacio del archivo, esto reduce "
+"la fragmentación"
+
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Detener descargas cuando se alcance el espacio libre en disco"
 
-#: src/muuli_wdr.cpp:2058
+#: src/muuli_wdr.cpp:1819
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 "Selecciona esta opción si quieres que aMule compruebe el espacio en disco"
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Espacio mínimo en disco:"
-
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "Introduce el espacio mínimo de disco deseado."
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "Reservar espacio en disco para los nuevos archivos"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Guardar 10 fuentes en archivos raros (< 20 fuentes)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
-"Para los nuevos archivos reservar todo el espacio del archivo, esto reduce "
-"la fragmentación"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Subidas"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Añadir nuevos archivos compartidos con auto prioridad"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Incoming"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Temporal"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Compartido"
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Carpeta de destino para las descargas"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Carpeta para los archivos temporales de descargas"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Carpeta de compartidos"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Click derecho en icono de carpeta, para compartición recursiva)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Compartir archivos ocultos"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Intervalo de actualización : 5 segs"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Tiempo de promedio del gráfico: 100 min"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Escala del gráfico de las conexiones: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Seleccionar colores de estadísticas"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Escala gráfica de descarga:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Escala gráfica de subida:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Colores: "
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Fondo"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Rejilla"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Descarga actual"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Promedio descarga en ejecución"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Promedio Descarga/sesión"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Subida actual"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Promedio Subida/tiempo"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Promedio subida/sesión"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Conexiones activas"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Barra de velocidad del icono de sistema"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Kad-nodos actual"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Kad-nodos ejecutando"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Kad-nodos sesión"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Árbol"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Número de versiones de clientes a mostrar (0=sin limite)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Capacidad"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Nota: Estos valores sólo son usados para estadísticas."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "¡¡¡ AVISO !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"No cambies estos parámetros a menos que sepas\n"
-"lo que estás haciendo, de lo contrario puedes\n"
-"hacer que aMule funcione peor.\n"
-"\n"
-"aMule funcionará bien sin que cambies ninguno\n"
-"de estos parámetros."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Opciones avanzadas"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Nuevas conexiones max. / 5 segs"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Tamaño del buffer de archivo: 240000 bytes"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Tamaño cola de espera: 5000 clientes"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervalo de actualización de conexión al servidor: Desactivado"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Progreso de los archivos de la lista de descarga"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Mostrar porcentaje"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Deshabilitar modo en reposo de ordenador"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Piel a usar: "
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Mostrar \"Gestor rápido de enlaces eD2k\", en todas las ventanas."
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Mostrar barra de progreso"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
+msgstr "Mostrar info extendida en las pestañas de las categorías"
+
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Mostrar índices de transferencia en el título"
+
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Mostrar índices de transferencia en el título"
+
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Antes del nombre de la aplicación"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Después del nombre de la aplicación"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Mostrar ancho de banda excedente"
+
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Orientación vertical de la barra de herramientas"
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Estilo de la barra de progreso"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "Mostrar las banderas de los países para los clientes"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Archivos de la cola de descarga"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Mostrar porcentaje de progreso"
 
-#: src/muuli_wdr.cpp:2351
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Mostrar barra de progreso"
+
+#: src/muuli_wdr.cpp:2144
 msgid "Flat"
 msgstr "Plano"
 
-#: src/muuli_wdr.cpp:2354
+#: src/muuli_wdr.cpp:2150
 msgid "Round"
 msgstr "3D"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Soporte para temas visuales"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Activar soporte de temas"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Tema:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- no hay temas disponibles -"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Auto-ordenar archivos (Alta CPU)"
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Ordenando columna"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Auto-ordenar archivos en la cola de descarga (Alta CPU)"
-
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp:2157
 msgid "aMule will sort the columns in your download list automatically"
 msgstr "aMule ordenará automáticamente las columnas en tu lista de descargas"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Varios Tweaks Gui"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Mostrar el gestor rápido de enlaces eD2k"
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "Parámetros de conexión externa"
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
-msgstr "Mostrar info extendida en las pestañas de las categorías"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "Aceptar conexiones externas"
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "Mostrar índices de transferencia en el título"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP de la interfaz que está escuchando"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Orientación vertical de la barra de herramientas"
+#: src/muuli_wdr.cpp:2190
+msgid ""
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
+msgstr ""
+"Introduce una IP valida de la interfaz que está escuchando. Un campo vacío o "
+"0.0.0.0 significará cualquier interfaz."
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Mostrar número de archivo part, antes del nombre de archivo"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "Puerto TCP:"
 
-#: src/muuli_wdr.cpp:2434
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
+msgstr "Habilitar UPnP port forwarding en el puerto EC"
+
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Contraseña"
+
+#: src/muuli_wdr.cpp:2221
 msgid "Web server parameters"
 msgstr "Parámetros del servidor web"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
 msgstr "Iniciar servidor web al inicio"
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Puertos del servidor web"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Habilitar el forwarding de puertos UPnP en el puerto del servidor web"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Puerto del UPnP del servidor web"
-
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Tiempo de actualización de página (en segs)"
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Plantilla Web"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Activar compresión gzip"
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Contraseña administrador"
 
-#: src/muuli_wdr.cpp:2477
+#: src/muuli_wdr.cpp:2243
 msgid "Enable Low rights User"
 msgstr "Activar invitado"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Contraseña administrador"
-
-#: src/muuli_wdr.cpp:2490
+#: src/muuli_wdr.cpp:2249
 msgid "Low rights password"
 msgstr "Contraseña invitado"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Plantilla Web"
-
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "Parámetros de conexión externa"
-
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "Aceptar conexiones externas"
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Habilitar el reenvío de puertos UPnP en el puerto del servidor web"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"IP de la interfaz que está escuchando\n"
-"(vacío para cualquiera)"
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Puerto TCP del servidor web para UPnP (Opcional)"
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
-msgstr ""
-"Introduce una IP valida de la interfaz que está escuchando. Un campo vacío o "
-"0.0.0.0 significará cualquier interfaz."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Tiempo de actualización de página (en segs)"
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Puerto TCP"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Activar compresión gzip"
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
-msgstr "Habilitar UPnP port forwarding en el puerto EC"
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "Aceptar"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Aplicar cualquier cambio hecho en las opciones."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Cancelar cualquier cambio hecho en las opciones."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Titulo :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Comentario : "
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Directorio entrante :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Cambiar prioridad a nuevos archivos asignados :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "No cambiar"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Selecciona color para esta categoría (seleccionada) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Mostrar motd del servidor cuando estés conectado ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Info. servidores"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Restablecer"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Pulsa este botón para limpiar el registro."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Registro"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 "Click en este botón para actualizar la lista de servidores desde una URL ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Lista de servidores"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5807,43 +3929,55 @@
 "Introduce la url a un archivo server.met y presiona el botón de la izquierda "
 "para actualizar la lista de servidores conocidos."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Añadir servidor manualmente: Nombre"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Introduce el nombre del nuevo servidor"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Puerto"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Introduce la IP del servidor, usando el formato X.X.X.X."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Introduce el puerto del servidor"
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Añadir manualmente un servidor (rellena los campos) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Registro"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Info. servidores"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "Info ED2K"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Info Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Click en este botón para actualizar la lista de nodos desde la URL ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nodos (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5851,51 +3985,55 @@
 "Introduce aquí la url al archivo nodes.dat y presiona el botón de la "
 "izquierda, para actualizar la lista de nodos conocidos."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Estadísticas nodos"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Conectar"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Nuevo nodo"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Conectar desde \n"
-"clientes conocidos"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Conectar desde clientes conocidos"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Desconectar Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "Información eD2k"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Usar Identificación Segura de Usuario"
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Se recomienda activar esta opción. No recibirá créditos si la ISU "
+"(Identificación Segura de Usuario) no está habilitada."
+
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Ofuscación de protocolo"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Soporte de ofuscación de protocolo"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5903,11 +4041,11 @@
 "Esta opción activa la ofuscación de protocolo, e hace que aMule acepte "
 "conexiones ofuscadas de otros clientes."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Usar ofuscación para conexiones salientes"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5915,11 +4053,11 @@
 "Esta opción hace que aMule use ofuscación de protocolo cuando se conectan "
 "otros clientes/servidores."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Aceptar solo conexiones ofuscadas"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5927,86 +4065,82 @@
 "Esa opción hace que aMule solo acepte conexiones ofuscadas. Tendrá menos "
 "fuentes, pero todo su tráfico será ofuscado."
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Opciones de archivo"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Todos"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Ninguno"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Quien puede ver los archivos compartidos:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Quien puede ver mis archivos compartidos:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 "Selecciona quien puede solicitar ver nuestra lista de archivos compartidos."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Filtrado de IPs"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtro clientes"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Habilitar filtrado de IPs de clientes definido en el archivo ~/.aMule/"
 "ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtro servidores"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Habilitar filtrado de IPs de servidores definido en el archivo ~/.aMule/"
 "ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Recargar lista"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Recargar lista de filtrado de IPs desde archivo ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Actualizar ahora"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Auto-actualizar el filtrado de IPs al inicio"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Nivel de filtrado:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Filtrar siempre IP's de LAN"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Control paranoico de IPs no comprobadas"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6014,11 +4148,11 @@
 "Rechazar paquetes si la ip del cliente es diferente de la ip desde donde el "
 "paquete es recibido. Usar con cautela."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Usar el ipfilter.dat de sistema si está disponible"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -6026,23 +4160,11 @@
 "Si no se encuentra un archivo ipfilter.dat local, permitir el uso de un "
 "archivo ipfilter de sistema"
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Usar Identificación Segura de Usuario"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Se recomienda activar esta opción. No recibirá créditos si la ISU "
-"(Identificación Segura de Usuario) no está habilitada."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Activar Firma online"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6050,849 +4172,1312 @@
 "Habilitar la escritura de archivos del SO, se suele usar para crear firmas "
 "por aplicaciones externas."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Frecuencia de actualización (segs):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 "Cambiar la frecuencia (en segundos) de la actualización de la firma-online"
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Directorio de Firma Online:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Guardar archivo de firma online en: "
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "Click aquí para seleccionar el directorio que contienen los archivos de "
 "firmas-online."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Deshabilitar/Habilitar"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtrar mensajes entrantes (excepto conversación actual):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Opciones de filtrado:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtrar todos los mensajes"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtrar mensajes de gente que no está en tu lista de amigos"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtrar mensajes de clientes desconocidos"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrar mensajes que contienen (usa ',' como separador):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "añade aquí las palabras que amule debe filtrar y bloquear mensajes incluidos"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Mostrar mensajes recibidos en el registro"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Comentarios"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrar comentarios que contengan (usar ',' como separador):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Conexión automática al servidor sin proxy"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Habilitar autentificación"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Habilita/deshabilita autentificación usuario/contraseña"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Nombre de usuario: "
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "El nombre de usuario a usar para conectar al proxy"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Contraseña:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "La contraseña a usar para conectar al proxy"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Habilitar Proxy"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Habilitar/Deshabilitar soporte Proxy"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Tipo Proxy:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "El tipo de proxy al que estás conectando"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Servidor Proxy:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Nombre del host del proxy"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Puerto Proxy:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "El puerto del proxy"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Autentificación"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Habilitar autentificación"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Habilita/deshabilita autentificación usuario/contraseña"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "El nombre de usuario a usar para conectar al proxy"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Contraseña:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "La contraseña a usar para conectar al proxy"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Conexión automática al servidor sin proxy"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Conectar a:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Conexión a aMule remoto"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Nombre usuario:"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Recordar estas opciones"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Habilita modo extendido de depuración al inicio"
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Mensajes de categorías:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Esperando..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Añadir .part"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Reintentar seleccionado"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Borrar seleccionado"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "Tipos de eventos"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+"Estadísticas y clientes encolados para archivo(s) seleccionado(s) : Sesión / "
+"Total"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Subidas activas"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "Porcentaje de archivos totales"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Todos los archivos"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Archivos seleccionados"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Solo subidas activas"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Mostrar clientes para"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Recargar:"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Recargar tus archivos compartidos"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Enviar"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Enviar un mensaje específico."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Cerrar esta sesión de chat"
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Conectar a cualquier servidor y/o Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Ventana de redes"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Compartidos"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Ventana de búsquedas"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Deshabilitado [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Ventana de transferencias de archivos"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Ventana de archivos compartidos"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Ventana de mensajes"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Ventana de gráficos de estadísticas"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Ventana de opciones"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nueva Categoría"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Selecciona un directorio para los archivos entrantes"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "¡Debes especificar un nombre para la categoría!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/seg"
+msgstr[1] "bytes/seg"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "¡Debes especificar una ruta para la categoría!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"¡Error al crear el directorio entrante de la categoría. Por favor "
-"especifique una ruta correcta!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "segs"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "mins"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "horas"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "días"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "Todo"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "El resto"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Incompleto"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Detenido"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Vídeo"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Archivos"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Texto"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Activo"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Extensión desconocida '%s' para el comando '%s'.\n"
+msgid "Using config dir: %s"
+msgstr "Usando directorio de configuración: %s"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Esperando a archivo part matando hilo..."
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Comando desconocido '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Importando %s: %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Este comando no tiene un argumento.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Leyendo directorio temp"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Este comando debe tener un argumento.\n"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Obteniendo información básica de archivo info de descarga"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Creando archivo de destino"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Cargando datos desde la antigua descarga del archivo (%u de %u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Guardando bloque de datos en un nuevo archivo de descarga (%u de %u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Obteniendo información del archivo fuente de descarga"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Añadiendo descarga y guardando nuevo archivo part"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Importar archivos part"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Estado"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Hash de archivo"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Disco: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Este comando está incompleto, debes usar una de la extensiones....\n"
+"¡Por favor elige un directorio para buscar descargas temporales! "
+"(subdirectorios serán incluidos)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Extensiones disponibles:\n"
+"¿Quieres que los archivos fuente de una descarga importada "
+"satisfactoriamente sean borrados?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Comandos disponibles:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "¿Borrar fuentes?"
+
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "ERROR: Falló crear el archivo part"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Todos los comandos son sensibles a las mayúsculas.\n"
-"Teclea '%s <comando>' para obtener información detallada del <comando>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Intentando cargar copia de seguridad del archivo met desde %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Salir de la aplicación."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "ERROR: No se ha podido abrir el archivo part.met: %s ===> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Mostrar ayuda"
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "ERROR: el archivo part.met tiene tamaño 0: %s ===> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "ERROR:Versión de archivo part.met Inválida: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Para obtener ayuda de un comando, teclea 'help <comando>'.\n"
-"Para obtener la lista completa de comandos, teclea 'help'.\n"
+"Error: %s (%s) está corrupto (etiquetas erróneas: %s), imposible cargar el "
+"archivo."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Usa '%s' para la lista de comandos\n"
-"\n"
+"ERROR: %s (%s) está corrupto (cuenta de etiquetas errónea), imposible cargar "
+"el archivo."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "¡Error de sintaxis!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Intentando recuperar info de archivo..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "Recuperando archivo sin nombre - lo recuperaré como RecoveredFile.dat"
+
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
-"Error procesando el comando - ¡nunca debería pasar! Informa del fallo, por "
-"favor\n"
+"Recuperada toda la info disponible del archivo :D - Intentando usarla..."
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Este comando no debería tener ningún parámetro"
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Imposible recuperar info de archivo..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Este comando debe tener un parámetro."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Error al abrir %s (%s)"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Argumento no válido."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "ADVERTENCIA: %s puede estar corrupto (%i)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Esto es un comando incompleto."
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "ERROR salvando archivo part: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "ERROR E/S guardando archivo part: "
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:917
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Teclea '%s' para obtener mas ayuda.\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "No se puede recuperar la duración de '%s' - usando el archivo %s."
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Esto es %s %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "de alguna manera el tamaño de '%s' es 0 - usando archivo %s."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:994
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Esto es %s %s\n"
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Error al guardar archivo part.met.seeds por %s"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Guardado %i semilla de fuentes en archivo part: %s (%s)"
+msgstr[1] "Guardado %i semillas de fuentes en archivo part: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Archivo part %s (%s) no tiene archivo de semillas"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Archivo part %s (%s) tiene un archivo de semillas vacío"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Error leyendo semillas del archivo part (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Parte corrupta encontrada (%i) en %d parte del archivo %s - Resultado del "
+"hash del archivo |%s| Hash del archivo |%s|"
+msgstr[1] ""
+"Parte corrupta encontrada (%i) en %d partes del archivo %s - Resultado del "
+"hash del archivo |%s| Hash del archivo |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Parte (%i) completa encontrada en %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Recodificación terminada %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Error inesperado mientras se completaba %s. Archivo pausado"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Descarga terminada: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Borrando archivo: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Creando cliente...\n"
+"ADVERTENCIA: No se puede crear el hash de la parte descargada, set de hashes "
+"incompleto para '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Ok, saliendo %s...\n"
+"ERROR: No se puede crear el hash de la parte descargada, set de hashes "
+"incompleto para (%s). Esto no debería pasar nunca"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Imposible conectar con una contraseña en blanco.\n"
-"Debes especificar una contraseña en el archivo config\n"
-"o en linea de comandos, o introduce una cuando te pregunte.\n"
-"\n"
-"Saliendo...\n"
+"EOF mientras comprobaba el hash de la parte %u con longitud %u (max %u) del "
+"trozo de fichero '%s' con longitud %u: %s"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Mostrar esta ayuda."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "ALERTA: No hay espacio libre en el disco! Pausando archivo: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Host donde se está ejecutando aMule. (por defecto: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Parte descargada %i corrupta en archivo: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Puerto de conexión externa de aMule. (por defecto: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Recuperada parte corrupta %i de %s -> Bytes salvados: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Contraseña de conexiones externas"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Asignando"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Leer configuración desde el archivo."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Espacio en disco insuficiente"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "No muestres ninguna salida."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Descargado"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Modo Extendido - muestra también los mensajes de depuración"
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "ERROR: Fallo al abrir archivo part '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Selecciona el idioma del programa."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Por defecto"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Escribe opciones de la línea de comando al archivo de configuración."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albanés"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr ""
-"Crear archivo de configuración basado en el archivo de configuración de "
-"aMule."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Árabe"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Imprime versión del programa."
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturiano"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Archivo de créditos cargado, %u cliente conocido"
-msgstr[1] "Archivo de créditos cargado, %u clientes conocidos"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Euskera"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - ¡Ha expirado el crédito de %u cliente!"
-msgstr[1] " - ¡Han expirado los créditos de %u clientes!"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Búlgaro"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Archivo 'cryptkey.dat' no encontrado, creando."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Catalán"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"ERROR: el daemon de aMule no se puede usar cuando están desactivadas las "
-"conexiones externas. Para activar las conexiones externas, use o bien un "
-"aMule normal, inicie amuled con la opción --ec-config, o bien, establezca "
-"\"AcceptExternalConnections\" a 1, en el archivo ~/.aMule/amule.conf"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Chino (Simplificado)"
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "ERROR: %s"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Chino (Tradicional)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Readmitir"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Mostrar subidas"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Mostrar cola"
-
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Mostrar clientes"
-
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Seleccionar vista"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Software Cliente"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "En espera"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Croata"
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Subiendo"
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Checo"
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Subida/Descarga"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Danés"
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Estado remoto"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Holandés"
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "LC: %u"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Inglés (U.K.)"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Prioridad del archivo"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estonio"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Resultado"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finlandés"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Preguntado"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Francés"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Última comprobación"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Gallego"
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Entrado en cola"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Alemán"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Estado de la subida"
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Griego"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Subido"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebreo"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Estado de la descarga"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Húngaro"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Descargado"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italiano"
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Hash de usuario"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Cifrado"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Oculta los archivos compartidos"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italiano (Suizo)"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Detalles del cliente"
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japonés"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Habilitado"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Coreano"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Soportado"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lituano"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "No soportado"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Noruego"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Deshabilitado"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polaco"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugués"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "No completado"
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugués (Brasileño)"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Cliente sospechoso"
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Ruso"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Verificado - OK"
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Esloveno"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Español"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Sueco"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turco"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ucraniano"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Cambiar Lenguaje: "
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
+
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
 msgstr "No disponible"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "opciones no disponibles"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Categoría inválida encontrada, saltando"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
-"El tamaño mínimo debe ser menor al tamaño máximo. Tamaño máximo ignorado."
+"Puerto TCP no puede ser mas alto de 65532 debido a que el socket del "
+"servidor UDP es TCP+3"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Alerta de búsqueda"
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
+msgstr "Puerto por defecto que será usado (%d)"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Ilimitado"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Quitando directorio compartido no existente: %s"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Menú aMule"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Conexión"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Límites de velocidad"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Directorios"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "SU: Ninguno"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Servidores"
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "SU: %u"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Archivos"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DE: Ninguna, "
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Seguridad"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "DE: %u"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Interfaz"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Filtros"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Controles remotos"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Firma online"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Eventos"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Depurando"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+"Las siguientes variables serán sustituidas:\n"
+"    %PARTFILE - ruta completa al archivo\n"
+"    %PARTNAME - nombre del archivo"
+
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"No cambies estos parámetros a menos que sepas\n"
+"lo que estás haciendo, de lo contrario puedes\n"
+"hacer que aMule funcione peor.\n"
+"\n"
+"aMule funcionará bien sin que cambies ninguno\n"
+"de estos parámetros."
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Velocidad de descarga: %.1f"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Error al conectar configuración con programa, con el ID %d y clave %s"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Velocidad de subida: %.1f"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
+"Error al transferir datos desde la configuración al programa, con el ID %d y "
+"la clave %s"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Información del cliente"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "El tipo de proxy al que estás conectando"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:534
 #, c-format
-msgid "Nickname: %s"
-msgstr "Alias: %s"
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
+"Error al transferir datos desde el programa a la configuración, con el ID %d "
+"y la clave %s"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "¡Ningún alias introducido!"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"aMule debe reiniciarse para aplicar los cambios:\n"
+"\n"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID Cliente:"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- Puerto TCP cambiado.\n"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Nombre del servidor: "
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- Puerto UDP cambiado.\n"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP del servidor: "
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- Puerto de conexión externa cambiado.\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- Aprobación de conexión externa cambiada.\n"
+
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- Interfaz de conexión externa cambiada.\n"
 
-#: src/MuleTrayIcon.cpp:416
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"Tu lista auto-actualizable de servidores esta vacía.\n"
+"La lista de servidores auto-actualizable al inicio será desactivada."
+
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Tienes habilitado las conexiones externas, pero no tienes especificada una "
+"contraseña.\n"
+"Las conexiones externas no pueden ser habilitadas a menos que especifiques "
+"una contraseña válida."
+
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Lenguaje cambiado.\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Directorio TEMP cambiado.\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- Red ED2K habilitada.\n"
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"eD2k y Kad están desactivados.\n"
+"No podrás conectarte hasta que actives al menos uno de ellos."
+
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad no se iniciará si tu puerto UDP está deshabilitado.\n"
+"Habilita un puerto UDP o deshabilita Kad."
+
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Debes reiniciar aMule ahora.\n"
+"Sino reinicias ahora, no sabemos si pasará algo malo.\n"
+
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Tu auto-actualización de lista de servidores está en blanco.\n"
+"Por favor introduce al menos una URL con un archivo server.met válido.\n"
+"Click en el botón \"Lista\" de este casilla  para introducir una URL."
+
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Archivos temporales"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Archivos entrantes"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Firmas Online"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+msgid "Choose a folder for %s"
+msgstr "Elige una carpeta para %s"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Buscar reproductor de video."
+
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Selecciona navegador"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "TCP port: %d"
-msgstr "Puerto TCP: %d"
+msgid "Executable%s"
+msgstr "Ejecutable %s"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "Puerto TCP: No está listo"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Editar la lista de servidores"
+
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Añade aquí las URL's para descargar los archivos server.met.\n"
+"Sólo una url por línea."
 
-#: src/MuleTrayIcon.cpp:436
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
 #, c-format
-msgid "UDP port: %d"
-msgstr "Puerto UDP: %d"
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Intervalo de actualización: %d seg"
+msgstr[1] "Intervalo de actualización: %d segs"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "Puerto UDP: No está listo"
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Tiempo medio del gráfico: %d min"
+msgstr[1] "Tiempo medio del gráfico: %d mins"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Firma Online: Activada"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Escala gráfica de conexiones: %d"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Firma Online: Desactivada"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Tamaño del buffer de archivo: %d byte"
+msgstr[1] "Tamaño del buffer de archivo: %d bytes"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Shared files: %d"
-msgstr "Archivos compartidos: %d"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Tamaño de la cola de subida: %d cliente"
+msgstr[1] "Tamaño de la cola de subida: %d clientes"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "Queued clients: %d"
-msgstr "Clientes en cola: %d"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Intervalo de refresco de la conexión al servidor: %d minuto"
+msgstr[1] "Intervalo de refresco de la conexión al servidor: %d minutos"
+
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Intervalo de refresco de la conexión al servidor: Deshabilitado"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "deshabilitado"
+
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "Total DL: %s"
-msgstr "Total DE: %s"
+msgid "Execute command on '%s' event"
+msgstr "Ejecutar comando en el evento '%s'"
+
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Habilitar ejecución de comando en el núcleo"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Comando del núcleo:"
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Habilitar ejecución de comando en la Interfaz"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Comando de la Interfaz: "
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Las siguientes variables serán reemplazadas:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+"El tamaño mínimo debe ser menor al tamaño máximo. Tamaño máximo ignorado."
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Alerta de búsqueda"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Principal"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "No se buscará en Kad si no está conectado a Kad"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr ""
+"No se puede realizar una búsqueda en eD2k si no se está conectado a eD2k"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Error inesperado mientras intentaba buscar en Kad: "
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "ID Archivo"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Archivo"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Descargar en la categoría"
+
+#: src/SearchListCtrl.cpp:639
 #, c-format
-msgid "Total UL: %s"
-msgstr "Total SU: %s"
+msgid "Get %s for this file"
+msgstr "Añadir %s para este archivo"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Límite de subida"
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Buscar archivos relacionados (eD2k, búsqueda local)"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Límite de descarga"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Marcar como archivo conocido"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Ocultar aMule"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Copiar el enlace eD2k al portapapeles"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Mostrar aMule"
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Cancelada"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Nuevo"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Fallo al conectar a todo los servidores ofuscados listados. Intentándolo de "
+"nuevo sin ofuscación."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Error al conectar a todos los servidores."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "Protocolo eD2k deshabilitado en las preferencias, no se conecta."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
+"No se han encontrado servidores válidos para conectar en la lista de "
+"servidores"
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Sesión Chat Iniciada: %s (%s:%u) - %s %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Conectado a %s (%s:%i)"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Conectado al cliente ***"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Conexión establecida en: %s"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Conectando al cliente ***"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Error fatal conectando. La conexión a Internet podría estar desactivada"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Error al conectar con el cliente / Conexión perdida ***"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Conexión perdida con %s (%s:%i)"
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Cerrar pestaña"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) parece estar caído."
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Cerrar todas las pestañas"
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) parece estar lleno."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Cerrar las otras pestañas"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Se reintentará la conexión automática al servidor en %d segundo"
+msgstr[1] "Se reintentará la conexión automática al servidor en %d segundos"
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Conexión perdida"
+
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Conectando con %s (%s:%i) fallido"
+
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "ERROR: Socket inválido al comprobar el timeout"
 
-#: src/ServerList.cpp:84
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Intento de conexión con %s (%s:%i) tiempo agotado."
+
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Recibido último resultado de tu búsqueda DNS, descartando."
+
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Cargando archivo server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "¡Archivo server.met no encontrado!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Error al cargar el archivo server.met '%s', encontrado formato desconocido."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "¡Error al abrir server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Archivo server.met corrupto, encontrada versión no válida: 0x%x, tamaño %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "%i servidor encontrado en server.met"
 msgstr[1] "%i servidores encontrados en server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d servidor añadido"
 msgstr[1] "%d servidores añadidos"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Error: el fichero 'server.met' está corrupto:"
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "Error E/S leyendo 'server.met'"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Servidor no añadido: [%s:%d] no has especificado un puerto válido."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Servidor no añadido: La IP de [%s:%d] está filtrada o no es válida."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Servidor no añadido: Servidor IP:Puerto [%s:%d] encontrado en la lista."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Servidor añadido: Servidor en [%s:%d] usando el nombre '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6900,25 +5485,25 @@
 "Estás conectado al servidor, que intentas borrar. Por favor desconéctate "
 "primero."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Error al abrir '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "¡Error al guardar server.met!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "URL no válida"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
-msgstr "Descarga finalizada de la lista de servidores de %s"
-
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Error al descargar la lista de servidores desde %s"
+msgid "Finished downloading the server list from %s"
+msgstr "Descarga de la lista de servidores finalizada desde %s"
 
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6927,23 +5512,28 @@
 "pega un lista de servidores válida en este archivo para poder actualizar de "
 "forma automática la lista de servidores."
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Descargando lista de servidores de %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "ADVERTENCIA: especificada una URL inválida para la actualización automática "
 "de servidores : %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Error en addresses.dat, server.met de la url de auto descarga inválido"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Error al descargar la lista de servidores desde %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -6951,356 +5541,2310 @@
 "Servidor local es filtrado por los Filtros IP, ¡conectando a un servidor "
 "diferente!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Error al ejecutar el comando '%s' en el evento `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Nombre del servidor"
 
-#: src/amule.cpp:703
-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/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Dirección"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Puerto"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Descripción"
 
-#: src/amule.cpp:786
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Usuarios"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Servidor fijo"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versión"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"No tienes ningún servidor en la lista de servidores.\n"
-"¿Quieres que aMule descargue una nueva lista ahora?"
+"Estás conectado a un servidor, que estás intentando borrar. Desconéctate "
+"primero. El servidor no será borrado."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Descarga lista de servidores"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Nombre desconocido)"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "web server running on pid %d"
-msgstr "servidor web corriendo con pid: %d"
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Estás seguro que quieres eliminar el servidor fijo %s"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Servidores (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Servidor"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Conectar al servidor"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Marcar servidor como fijo"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Desmarcar servidor como fijo"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Marcar servidores como fijos"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Desmarcar servidores como fijos"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Borrar servidor"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Borrar servidores"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Eliminar todos los servidores"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Copiar los enlaces eD2k al portapapeles"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Reconectar al servidor"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "¿Estás seguro que deseas borrar todos los servidores?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Estás seguro que deseas borrar el servidor seleccionado"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Estás seguro que deseas borrar los servidores seleccionados"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "ERROR: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "ADVERTENCIA: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "El nuevo ID-Cliente es %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "ALERTA: ¡Has recibido ID-Baja!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tEsto sucede porque estás detrás de un cortafuegos o de un router."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tPara mas información, por favor ves a http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "¡Información recibida del servidor desconocida! - demasiado pequeña"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Recibido %d servidores nuevo"
+msgstr[1] "Recibido %d servidores nuevos"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Guardado lista de servidores completado."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "El servidor rechaza el último comando"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Paquete bogus recibido desde el servidor: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Error mientras se estaba procesando un paquete desde el servidor: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Imposible crear un hilo de resolución de DNS para conectar con %s"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "Servidor IP %s (%s) está filtrado. No conectará."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "usando ofuscación de protocolo."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Conectando a %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Imposible resolver dns para el servidor %s: ¡Imposible conectar! "
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Servidor no añadido: IP o nombre de host no especificado."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Servidor no añadido: Servidor-puerto especificado no válido."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Status de eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Estado Kademlia:"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "Ejecutándose en modo Red Local"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Ejecutando"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Estado:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Estado de Conexión:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Tras cortafuegos - abre el puerto TCP %d en tu enrutador o cortafuegos"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "Estado de Conexión UDP:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Tras cortafuegos - abre el puerto UDP %d en tu enrutador o cortafuegos"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Estado tras cortafuegos: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "No se requiere amigo - puerto TCP abierto"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "No se requiere amigo - puerto UDP abierto"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "No amigo"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Conectando a amigo"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Conectando a amigo en %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Fuentes indexadas:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Palabras clave indexadas:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Notas indexadas:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Carga indexada:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Media de Usuarios:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Media de Archivos:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "No ejecutando"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Añadiendo archivo %s a compartidos"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Encontrado %i archivos compartido"
+msgstr[1] "Encontrado %i archivos compartidos"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Encontrado %i archivo compartido, %i desconocido"
+msgstr[1] "Encontrado %i archivos compartidos, %i desconocidos"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "ERROR: Intentando compartir %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Directorio compartido no encontrado, saltando: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Sin archivos que compartir en directorio: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Nombre Usuario"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Velocidad De Descarga"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Velocidad de subida"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Partes Disponibles"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Estado de la subida"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Estado de la descarga"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Origen"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Nombre de archivo local"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Compartidos"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Peticiones"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Peticiones aceptadas"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Datos transferidos"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Media Compartido"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Partes obtenidas"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Fuentes completas"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Directorio"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Añadir Comentario/Valoración"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Editar Comentario/Valoración"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Renombrar"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Añadir archivos en colección a la lista de descargas"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Copiar &URL magnético al portapapeles"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Copiar el enlace eD2k al portapapeles (&Fuente)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
-"Has solicitado ejecutar el servidor web al inicio pero no se ha podido "
-"correr el binario de amuleweb. Por favor instala el paquete que contanga el "
-"servidor web de aMule o compila aMule usando --enable-webserver y ejecuta "
-"make install"
+"Copiar el enlace eD2k al portapapeles (Fuente) (&Con opciones de cifrado)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Copiar el enlace eD2k al portapapeles (&Nombre del host)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+"Copiar el enlace eD2k al portapapeles (Nombre del host) (&Con opciones de "
+"cifrado)"
 
-#: src/amule.cpp:937
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Copiar el enlace eD2k al portapapeles (Información &AICH)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Necesitas IDAlta para crear un enlace fuente válido"
+
+#: src/SharedFilesCtrl.cpp:461
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Imposible direccionar los puertos a la dirección especificada: %s"
+msgid "Shared Files (%i)"
+msgstr "Archivos Compartidos (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[Archivo part]"
 
-#: src/amule.cpp:964
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Nombre de archivo remoto"
+
+#: src/Statistics.cpp:732
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Puerto %u no está disponible. Tendrás IDBaja\n"
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Datos subidos (Sesión (Total)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Total por tráfico excedente (Paquetes): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Excedente por peticiones de archivo (Paquetes): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Excedente por intercambio de fuentes (Paquetes): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Tráfico excedente de servidores (Paquetes): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Tráfico excedente Kad (Paquetes): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Cifrado excedente (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Subidas activas: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Subidas en espera: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Total de subidas satisfactorias: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Total de subidas erróneas: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Tiempo medio de subida: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Datos descargados (Sesión (Total)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Fuentes encontradas: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Descargas activas (partes): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Índice SU:DE Sesión (Total): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Velocidad media de descarga (Sesión): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Velocidad media de subida (Sesión): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Velocidad máxima de descarga (Sesión): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Velocidad máxima de subida (Sesión): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Reconexiones: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Tiempo desde la primera transferencia: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Conectado al servidor desde: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Conexiones activas (estimado): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Alcanzado límite máximo de conexiones: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Media de conexiones (estimado): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Pico de conexiones (estimado): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Clientes"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Desconocido: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Filtrado: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Bloqueado: %s"
 
-#: src/amule.cpp:970
+#: src/Statistics.cpp:794
 #, c-format
+msgid "Total: %i Known: %i"
+msgstr "Total: %i Conocido(s): %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Servidores activos: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Servidores caídos: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Total: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Servidores borrados: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Servidores filtrados: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Usuarios en servidores activos: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Archivos en servidores activos: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Usuarios totales: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Archivos totales: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Ocupación de Servidores: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Número de archivos compartidos: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Tamaño total de archivos compartidos: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Tamaño medio de archivo: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Sistema Operativo"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "No recibido"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Conexiones activas (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "No disponible"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Nunca"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Comando '%s' con pid '%d' ha terminado con código '%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Ejecuta <str> y sal."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Formato IP no válido. Usa xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Puerto %u no está disponible!\n"
-"\n"
-"Esto significa que tendrás IDBaja.\n"
-"\n"
-"Comprueba tu red y asegúrate de que el puerto está abierto para entrada y "
-"salida."
+"Este comando requiere un argumento. Argumentos válidos: 'all (todo)' o un "
+"numero.\n"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Error al crear el archivo de FirmaOnline"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Procesando por hash: "
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Error al crear el archivo de FirmaOnline aMule"
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Procesando por nombre de archivo: "
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
-"El idioma seleccionado no parece estar instalado. (Nota: Intentaré ponerlo "
-"de todos modos)"
+"Este comando requiere un argumento. Argumentos válidos: un hash de archivo.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Número inválido\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Hash no válido (la longitud debería ser exactamente 32 caracteres)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Solicitud fallida con un error desconocido."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Operación satisfactoria."
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Es la primera vez que inicias aMule %s"
+msgid "Request failed with the following error: %s"
+msgstr "Solicitud fallida con el siguiente error: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Esto es una versión de prueba, actualízate diariamente, y \n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "El Filtro IP para clientes es %s.\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "no damos garantía si rompiera algo, queme tu casa,\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "Apagado"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "o mata a tu perro. Pero *debería* ser seguro de todas formas. \n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "Encendido"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "El Filtro IP para servidores es %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "El nivel de filtrado de IP actual es %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Límites del ancho de banda: Subida: %u kB/s, Bajada: %u kB/s\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Conectado a %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Conectando ahora"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "tras cortafuegos"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"Las siguientes opciones cambiaron en esta versión por razones de seguridad:\n"
+"\n"
+"Descarga:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Activado soporte de ofuscación de protocolo para conexiones entrantes y "
-"salientes.\n"
+"Subida:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Desactivada la actualización de la lista de servidores desde otro cliente "
-"o servidor.\n"
+"Clientes en cola:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Para más información de la razón de estés cambios, busque información\n"
-"de \"fake servers\" en la wiki de aMule http://wiki.amule.org.\n"
-"Es importante que limpie cualquier servidor falso de su lista de servidores "
-"para que aMule funcione correctamente."
+"Fuentes totales:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Número de resultados de la búsqueda: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Progreso Búsqueda: %u %% \n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Progreso de búsqueda no disponible"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Recibida una respuesta desconocida desde el servidor, OpCode = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Mostrar una breve información de estado."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Mostrar estado de conexión, velocidad subida/descarga actual, etc.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Mostrar árbol completo de estadísticas."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Opcionalmente, un número entre 0-255 puede ser un argumento de este "
+"comando,\n"
+"el cual dice cuantas entradas del árbol de versión de cliente deberían "
+"mostrarse.\n"
+"Con 0 o sin valor significa 'sin limite'.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Ejemplo: 'statistics 5' mostrará solo las 5 versiones que mas se repiten de "
+"cualquier cliente.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Terminar aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
+"Terminar el núcleo remoto (amule/amuled) en funcionamiento.\n"
+"Esto terminará también el cliente modo texto, ya que no se puede\n"
+"usar sin un núcleo en funcionamiento.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Recargar el objeto dado."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Recargar lista de compartidos."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "Recargar tabla de filtrado IP."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Selección tabla actual de filtrado IP."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "Actualizar tabla de filtrado IP desde URL."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "Si la URL es omitida, será usada la URL de las opciones."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Conectado a la red."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Esto conectará a todas las redes que estén habilitadas en opciones.\n"
+"Opcionalmente también puedes especificar un servidor de forma IP:Puerto, "
+"para\n"
+"conectar a ese servidor solamente. La IP debe ser una dirección IPv4,\n"
+"o un nombre DNS."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Conectar solo a eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Conectar a Kad solamente."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Desconectado de la red."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr ""
+"Esto te desconectará de todas las redes en las que estás actualmente "
+"conectado.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Desconectarse solo de eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Desconectarse solo de Kad."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Añadir un enlace eD2k o magnet al núcleo."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"En enlace eD2k a añadir puede ser:\n"
+"*) un enlace a un archivo (ed2k://|file|...),será añadido a la cola de "
+"descargas,\n"
+"*) un enlace a un servidor (ed2k://|server|...), será añadido a la lista de "
+"servidores,\n"
+"*) o un enlace a una lista de servidores, en tal caso, todos los servidores "
+"en  la lista\n"
+"serán añadidos a la lista de servidores.\n"
 "\n"
-"Adicionalmente, las opciones del navegador han sido restauradas. Por favor "
-"configura las opciones de tu navegador otra vez si es necesario.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Asigna un valor de opción."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "Asignar opciones de filtrado IP."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Activa el filtro para clientes y servidores."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Desactiva el filtro para clientes y servidores."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Activa/Desactiva el filtro para clientes."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Activa el filtro para clientes."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Desactiva el filtro para clientes."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Activa/Desactiva el filtro para servidores."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Activa el filtro para servidores."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Desactiva el filtro para servidores."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Selección nivel de filtrado de IP"
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Podrás encontrar en nuestra web, mas información, soporte y nuevas "
-"versiones, \n"
+"Niveles válidos en el filtro 0-255, y el valor por defecto (inicial)\n"
+"es 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Asignar limites de ancho de banda."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "El valor dado a estos comandos han de ser en kilobytes/seg.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Asignar un limite de subida."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Asignar un limite de descarga."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Obtener y mostrar un valor de opciones"
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "Obtener opciones de filtrado IP."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Obtener estado del filtrado IP para clientes y servidores."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Obtener estado del filtrado IP para clientes."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Obtener estado del filtrado IP para servidores."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "Obtener nivel de filtrado IP."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Obtener limites de ancho de banda."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Ejecuta una búsqueda."
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"en www.aMule.org, o en nuestro canal de IRC #aMule en irc.freenode.net. \n"
+"Una búsqueda por tipo, debe especificarse el tipo:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Ejemplo: 'search kad archivo' ejecutara una búsqueda en kad de \"archivo\".\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Envíanos cualquier fallo a http://forum.amule.org"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Ejecuta una búsqueda global."
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Ejecuta una búsqueda local"
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Ejecuta una búsqueda kad"
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Muestra los resultados de la última búsqueda."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Devuelve los resultados de la búsqueda anterior.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Muestra el progreso de una búsqueda."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Muestra el progreso de una búsqueda.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Comenzar descargando un archivo"
+
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"El directorio que has especificado de Firma Online no es válido\n"
-"La Firma Online ha sido deshabilitado hasta que lo arregles en opciones."
+"El número de un archivo de la última búsqueda se tiene que dar.\n"
+"Ejemplo: 'download 12' iniciará la descarga del archivo con el número 12 de "
+"la búsqueda anterior.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Pausar descarga."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Resumir descarga."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Cancelar descarga."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Asignar prioridad de descarga."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Fija prioridad de la descarga a Baja, Normal, Alta o Auto.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Establecer la prioridad a baja."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Establecer la prioridad a normal."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Establecer la prioridad a alta."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Establecer la prioridad a auto."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Mostrar colas/listas."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Mostrar cola subida/descarga, lista de servidores o lista de compartidos.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Mostrar cola de subida."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Mostrar cola de descarga."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Mostrar registro."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Mostrar lista de servidores."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Limpiar registro."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "La reserva del espacio en disco para el archivo '%s' falló: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Comando deprecado, usa %s."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "ERROR: no puedo abrir el archivo de registro"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Este es un comando en desuso, y será borrado en el futuro.\n"
+"Usa '%s' en su lugar.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "ALERTA: el archivo de registro está vacío. Algo está mal"
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Cliente de texto aMule"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Registro ha sido borrado"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Convirtiendo antiguos hashsets AICH en  '%s' a 64b en '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Mensaje del servidor: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr ""
+"ALERTA: El nombre de archivo '%s' es incorrecto y será renombrado a '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Error al descargar la lista de nodos."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "ALERTA: El archivo '%s' ya existe, renombrando el nuevo a '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Error al abrir el archivo de comprobación de versión descargado"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"¿Estás seguro que deseas cancelar y borrar todos los archivos de esta "
+"categoría?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Archivo de comprobación de versión corrupto"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Confirmación requerida"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "¡Estás usando una versión anticuada de aMule!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "Máximo 99 categorías soportadas."
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "Demasiadas categorías"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Sin catalogar"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Seleccionar filtro de vistas"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Añadir categoría"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Editar categoría"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Eliminar categoría"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Tu versión de aMule es %i.%i.%i y la última versión es %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Error al abrir el archivo (%s), borrando de la lista de compartidos."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "La última versión puede siempre ser encontrada en http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Hashset solicitado de archivo desconocido: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "ALERTA: Tu versión de aMuled está obsoleta: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Resumiendo subidas del archivo: %s"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Tu copia de aMule está actualizada."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Suspendiendo subida del archivo: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Error al descargar el archivo de comprobación de versión"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Error al ejecutar el comando `%s' en el evento `%s'."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Descarga completada"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "La ruta completa al archivo."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "El nombre del archivo sin la ruta."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "El hash eD2k del archivo."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "El tamaño del archivo en bytes."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Tiempo de actividad de descarga acumulado."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Nueva sesión de chat iniciada"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Remitente del mensaje."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Sin espacio"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Partición de disco."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Error completando"
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Usuarios: %s | Archivos: %s"
+msgid "Processing file number %u: %s"
+msgstr "Procesando numero de archivo %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Has preguntado por hashes de partes (Solo usado por archivos > 9.5 MB)"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Usuarios: E: %s K: %s | Archivos: E: %s K: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s --->¡ No existe el archivo !\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Sin redes seleccionadas"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, el creador de enlaces eD2k para aMule"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "¡Bienvenido!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Parámetros de entrada"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Archivo a codificar"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Añadir URLs opcionales para este archivo"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Introduce aquí el archivo del que quieras calcular el enlace eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Introduce aquí la URL que quieres añadir al enlace eD2k: Añade / al final "
+"para permitir a aLinkCreator agregar el nombre del archivo actual"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Borrar"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Crear enlace con hashes de partes"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Ayuda para separar archivos nuevos y raros mas rápidamente, el coste sera un "
+"tamaño de enlace mayor"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Hash de archivo MD4"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "Hash del archivo eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "Enlace eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Guardar"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Copiar al porta papeles"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Abrir"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Abrir un archivo para calcular su enlace eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Copiar el enlace eD2k calculado al portapapeles"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Guardar como"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Guardar el enlace eD2k calculado en un archivo"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Acerca de aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Selecciona el archivo del que quieras calcular el enlace eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Imposible abrir el portapapeles"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "¡Nada para copiar ahora!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Selecciona el fichero para el enlace eD2k calculado"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Imposible abrir "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Por favor, introduce un nombre de archivo"
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "¡Nada para guardar ahora!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, el creador de enlaces eD2k de aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Imágenes desde http://www.everaldo.com y http://www.icomania.com\n"
+"y http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distribuido bajo la licencia GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Calculando hash..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator está trabajando para ti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Calculando Hash MD4..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Calculando Hashes eD2k..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "¡ Cancelado !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Conectado a %s %s"
+msgid "Done in %.2f s"
+msgstr "Terminado en %.2f s"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "¡ Ya tienes añadida esa URL !"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Por favor, introduce una URL"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "Conectando a %s"
+msgid "Unable to open %s"
+msgstr "Imposible abrir %s"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Desconectado de eD2k"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i día(s) %i hora(s) %i min %i s"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad iniciado."
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad detenido."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Conectado a Kad (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Conectado a Kad (tras cortafuegos)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Desconectado de Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, Estadísticas aMule en linea"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Máximo índice Desc desde que wxCas está ejecutándose"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Máximo índice Desc absoluto durante ejecuciones anteriores de wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistema"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Parar auto recargar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Salvar imagen de estadísticas en linea"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Imprimir imagen de estadísticas en linea"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Opciones"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Acerca de wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Iniciar auto recargar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Auto recargar, detenido"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Auto recargar, iniciado"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Salvar imagen de estadísticas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Estadísticas aMule en linea"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Red Kad no puede ser usada si el puerto UDP está deshabilitado en opciones, "
-"no iniciando."
+"Hubo un problema imprimiendo.\n"
+"Tal vez tu impresora actual no este configurada"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Red Kad deshabilitada en opciones, no conectará."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Imprimiendo"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
-"¡ No se ha podido abrir el archivo de amigos 'emfriends.met' para su "
-"lectura !"
+"wxCas, Estadística de firma en linea de aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Basado en CAS por Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distribuido bajo GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh Oh, aMule no está ejecutándose..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule ya está ejecutándose"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule se está ejecutando, pero está desconectado"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule está conectando..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh Oh, estado de aMule desconocido..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " ha sido ejecutado durante"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " ¡ está detenido !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " ¡ no está conectado !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " está conectando..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " está haciendo algo extraño, ¡ compruébalo !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " está conectado a"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "apagado"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " conectado"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " con "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Total Descargado:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Subido: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Descarga de sesión"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Descargado: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Subida: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Compartiendo: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr "archivo(s), Clientes en cola: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Tiempo: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " en "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Media de carga del sistema (1-5-15 min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Tiempo de ejecución del sistema"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Directorio que contiene el archivo amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Introduce el directorio donde está tu archivo amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Intervalo de refresco en segundos"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Generar un archivo de estadísticas siempre que se actualice"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
-"¡ No se ha podido abrir el archivo de amigos 'emfriends.met' para su "
-"escritura !"
+"Introduce el directorio donde tu quieres generar la imagen de estadísticas"
 
-#~ msgid "Fetching status..."
-#~ msgstr "Obteniendo estado..."
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Sube periódicamente tu imagen de estadísticas al servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "Url FTP"
 
-#~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
-#~ msgstr "theApp->serverlist->GetServerByAddress() devolvió NULL"
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Directorio FTP"
 
-#~ msgid "Message Filter"
-#~ msgstr "Filtro de mensajes"
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Introduce la URL de tu servidor FTP"
 
-#~ msgid "Gui Tweaks"
-#~ msgstr "Tweaks GUI"
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr ""
+"Introduce el directorio de tu servidor FTP donde poner tu imagen de "
+"estadísticas"
 
-#~ msgid "Core Tweaks"
-#~ msgstr "Tweaks Núcleo"
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Usuario"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Sin asociar este tipo de archivo"
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Introduce el nombre de usuario para conectarte a tu servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Introduce la contraseña de usuario para conectarte a tu servidor FTP"
 
-#~ msgid "File was not saved"
-#~ msgstr "Archivo no fue guardado"
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Intervalo de actualización de FTP en minutos"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Validado"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Directorio que contiene tu archivo de firma"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Directorio donde se genera la imagen de estadísticas"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Carga la plantilla <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Puerto HTTP del servidor web"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Usar redirección de puertos UPnP en el puerto del servidor web"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Puerto UPnP"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Usar compresión gzip"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Contraseña de acceso total para el servidor web"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Contraseña de invitado para servidor web"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Permitir acceso a invitado"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Denegar acceso a invitado"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Cargar/guardar la configuración del servidor web desde/a aMule remoto"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Ruta al archivo config de aMule. ¡NO USAR DIRECTAMENTE!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Deshabilitar interprete PHP (desuso)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Recompila páginas PHP para otra solicitud"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Servidor web aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "conexión aceptada del cliente web\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "ERROR: no se acepta conexión del cliente web\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Solicitud fallida con el siguiente error: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Fichero índice no encontrado: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Sesión terminada - solicitando conexión\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sesión ok, conectado\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sesión ok, no conectado\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "No hay ninguna sesión - conecte de nuevo\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Sesión creada - solicitando conexión\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Procesando solicitud [original]:"
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Contraseña no especificada, el inicio de sesión no será permitido."
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Comprobando contraseña\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Hash de la contraseña incorrecto\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Contraseña ok\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Contraseña errónea\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr ""
+"No has introducido ninguna contraseña. No está permitida una contraseña en "
+"blanco.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Desconexión solicitada\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Procesando solicitud [redirigida]:"
+
+#~ msgid "Romanian"
+#~ msgstr "Rumano"
+
+#~ msgid "Download status"
+#~ msgstr "Estado de la descarga"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Intervalo de actualización: %d seg"
+#~ msgstr[1] "Intervalo de actualización: %d segs"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
 #~ msgstr ""
-#~ "El archivo %s es demasiado grande para el Donkey: el máximo permitido es "
-#~ "4 GB"
+#~ "Comentarios y valoraciones todavía no están soportadas en la interfaz "
+#~ "remota"
+
+#~ msgid "Transferring"
+#~ msgstr "Transfiriendo"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "LC: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "LC: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "En cola"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - muestra el progreso de una búsqueda"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Comenzando a crear el hash MD4 y AICH del archivo: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Comenzando a crear el hash MD4 del archivo: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Comenzando a crear el hash AICH del archivo: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr "ALERTA: Imposible borrar '%s' original, creando copia de seguridad"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "ALERTA: Error al borrar %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Calificación (total):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Intentar transferir partes completas en todas las subidas"
+
+#~ msgid "Networks window"
+#~ msgstr "Ventana de redes"
+
+#~ msgid "Searches window"
+#~ msgstr "Ventana de búsquedas"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Descargando"
 
-#~ msgid "Status text"
-#~ msgstr "Estado del texto"
+#~ msgid "Shared files window"
+#~ msgstr "Ventana de archivos compartidos"
 
-#~ msgid "Pop-up status text"
-#~ msgstr "Estado del mensaje emergente"
+#~ msgid "Messages window"
+#~ msgstr "Ventana de mensajes"
 
-#~ msgid "Please wait... "
-#~ msgstr "Por favor espera ..."
+#~ msgid "Statistics graph window"
+#~ msgstr "Ventana del gráfico de las estadísticas"
 
-#~ msgid "General Settings"
-#~ msgstr "Opciones generales"
+#~ msgid "Preferences settings window"
+#~ msgstr "Ventana de la configuración de las preferencias"
 
-#~ msgid "GUI Tweaks"
-#~ msgstr "Tweaks GUI"
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Icono de sistema perdido, intentando recrearlo..."
+
+#~ msgid "Transfers"
+#~ msgstr "Tráfico"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Ventana de transferencia de archivos"
+
+#~ msgid "Unban"
+#~ msgstr "Readmitir"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Mostrar subidas"
+
+#~ msgid "Show Queue"
+#~ msgstr "Mostrar cola"
+
+#~ msgid "Select View"
+#~ msgstr "Seleccionar vista"
+
+#~ msgid "Client Software"
+#~ msgstr "Software Cliente"
+
+#~ msgid "Waited"
+#~ msgstr "En espera"
+
+#~ msgid "Upload Time"
+#~ msgstr "Subiendo"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Subida/Descarga"
+
+#~ msgid "Remote Status"
+#~ msgstr "Estado remoto"
+
+#~ msgid "File Priority"
+#~ msgstr "Prioridad del archivo"
+
+#~ msgid "Score"
+#~ msgstr "Resultado"
+
+#~ msgid "Asked"
+#~ msgstr "Preguntado"
+
+#~ msgid "Last Seen"
+#~ msgstr "Última comprobación"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Entrado en cola"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Subido"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Descargado"
+
+#~ msgid "Userhash"
+#~ msgstr "Hash de usuario"
+
+#~ msgid "Encrypted"
+#~ msgstr "Cifrado"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "Cargadas %d fotos de banderas."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Mostrar subida / Cola de subida"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Clientes en cola :"
+
+#~ msgid "Current Session"
+#~ msgstr "Sesión actual"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Requested :"
+#~ msgstr "Peticiones:"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Crear un copia para la previsualización"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Ventana de transferencias de archivos"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Total Usuarios: %s | Total Archivos: %s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "Descarga HTTP hilo comenzado"
+
+#~ msgid "Download size: %i"
+#~ msgstr "Tamaño de descarga: %i"
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "Descarga HTTP hilo finalizado"
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Host: %s:%i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Respuesta: %i (Error: %i)"
+
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "ALERTA: Repuesta vacía en la creación del medio"
+
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "ERROR: Código de redirección sin URL"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country(): Error al cargar el dato del país desde "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Obtener nivel de filtrado de IP."
+
+#~ msgid "Makes a search."
+#~ msgstr "Haz una búsqueda."
+
+#~ msgid "Killed!"
+#~ msgstr "¡Matado!"
+
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Usando amuleweb en '%s'."
+
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Apagando aMule..."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Las siguientes opciones cambiaron en esta versión por razones de "
+#~ "seguridad:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Activado soporte de ofuscación de protocolo para conexiones entrantes y "
+#~ "salientes.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Desactivada la actualización de la lista de servidores desde otro "
+#~ "cliente o servidor.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Para más información de la razón de estés cambios, busque información\n"
+#~ "de \"fake servers\" en la wiki de aMule http://wiki.amule.org.\n"
+#~ "Es importante que limpie cualquier servidor falso de su lista de "
+#~ "servidores para que aMule funcione correctamente."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Adicionalmente, las opciones del navegador han sido restauradas. Por "
+#~ "favor configura las opciones de tu navegador otra vez si es necesario.\n"
+
+#~ msgid "Fetching status..."
+#~ msgstr "Obteniendo estado..."
 
-#~ msgid "Remote Control"
-#~ msgstr "Control Remoto"
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Usuarios: E: %s K: %s | Archivos E: %s K: %s"
 
-#~ msgid "Could not determine the command for running the browser."
-#~ msgstr "Imposible encontrar el comando para iniciar el navegador."
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Cliente %s en IP:Puerto %s:%d usando %s %s %s"

aMule-2.2.6.tar.bz2/po/et_EE.po -> aMule-2.3.1.tar.bz2/po/et_EE.po Changed

@@ -4,1308 +4,1144 @@
 # This file is distributed under the same license as the aMule package.
 #
 # Kry <elkry@users.sourceforge.net>, 2004.
-# Hans <herringfish@hot.ee>, 2006, 2007, 2008, 2009.
+# Hans <herringfish@hot.ee>, 2006, 2007, 2008, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: et_EE\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-03-06 10:43+0200\n"
-"Last-Translator: Hans <herringfish@hot.ee>\n"
-"Language-Team:  <et@li.org>\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
+"PO-Revision-Date: 2011-01-01 19:46+0200\n"
+"Last-Translator: \n"
+"Language-Team: Estonian <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Pead defineerima mittetühja parooli."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Vigane parool, pole MD5 kontrollsumma!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Ühenduse viga"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "EC ühendus ebaõnnestus. Tühi vastus."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Väline Ühendus: Ligipääs keelatud sest: "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Väline Ühendus: Ligipääs keelatud"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Väline Ühendus: Serveri vigane vastus. Ühendus suletud."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Õnnestus! Ühendus aMulaga loodud "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Õnnestus! Ühendus loodud."
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Lisa Sõber"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Räsin"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Pead sisestama kehtiva IP ja pordi!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Lõpetatud"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Informatsioon"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Valmis"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Määratud kasutaja kontrollsumma pole kehtiv!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Peatatud"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Ei suuda avada ED2KLinks faili."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Vigane"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"HOIATUS: Sa ei saa ennast eD2k lingi jaoks allikana lisada ajal kui omad "
+"lowid'd."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Tõmban"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Ok, lahkun põhiprogrammist..."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Ootan"
-
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Alustan faili '%s' MD4 ja AICH kontrollsumma loomist"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Mõrvan amuleweb tegelase, protsessi id '%ld' ... "
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Alustan faili '%s' MD4 kontrollsumma loomist"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Mõrvan amuleweb tegelase, protsessi id '%ld' ... "
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Alustan faili '%s' AICH kontrollsumma loomist"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Nurjunud"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Konverteerin vanad '%s' AICH kontrollsummad 64b '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: Peatan tuuma."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "HOIATUS: Fail ninega '%s' on vigane ja nimetatati ringi '%s'."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "aMule seiskamine lõpetatud."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "aMule väljumise mälu veajälituse tulemus:"
+
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
 msgstr ""
-"HOIATUS: Sama nimega fail '%s' on olemas, uus fail nimetatati ringi '%s'."
+"\n"
+"EC seadistused"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "HOIATUS: peale varukoopia tegemist ei suuda '%s' originaali eemaldada"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Parool on määratud ja välised ühendused võimalikud."
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "HOIATUS: Ei suutnud %s kustutada"
-
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Ei suuda tõmmata kasutaja '%s' jagatud faili"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "!!! HOIATUS !!!"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Teadmata"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Valetatud eMule versioon %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Valetatud eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Serverite nimekirjas pole ühtegi serverit.\n"
+"Kas aMule võiks uue nimekirja tõmmata?"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Valetatud eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Serverite nimekiri tõmmatud"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (baseerub eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr "web server töötab protsessi id'ga %d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Kasutajanimi: %s ID: %u"
+#: src/amule.cpp:658
+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 ""
+"Soovisid et web server käivitataks käivitumisel, kuid amuleweb programm pole "
+"võimeline käivituma. Palun paigalada versioon mis sisaldab aMule web "
+"serverit või kompileeri aMule kasutades võtit --enable-webserver ja seejärel "
+"make install"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Küsitud: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "VIGA"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Selle seansi failistatistika: Aksepteeritud %d/%d päringust, %s siirdatud\n"
-msgstr[1] ""
-"Selle seansi failistatistika: Aksepteeritud %d/%d päringust, %s siirdatud\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Ei suuda siduda porti määratud aadressiga: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Kõikide seansside failistatistika: Aksepteeritud %d/%d päringust, %s "
-"siirdatud\n"
-msgstr[1] ""
-"Kõikide seansside failistatistika: Aksepteeritud %d/%d päringust, %s "
-"siirdatud\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Küsiti tundmatut faili"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Port %u ei ole kasutatav. Sa saad LOWID\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Klient %s IP:Port %s:%d kasutab %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Kasutajanimi"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Port %u ei ole kasutatav. !!\n"
+"\n"
+"Sa saad kasutada kui LOWID kasutaja.\n"
+"Kasuta netstat programmi kontrollimaks kuna port vabaneb\n"
+"ja proovi amule uuesti käivitada."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Sõbrad"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Ei suutnud luua OnlineSig Faili"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Näita &detaile"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Ei suutnud luua aMule OnlineSig Faili"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Lisa sõber."
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"Tundub et valitud keelelokaat pole sinu karpi installeritud. (Märkus: Ma "
+"proovin seda seada sellest hoolimata)"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Eemalda sõber"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "See on aMule %s käivitamise esimene kord"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Saada sõnu&m"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "See on testversioon, mida igapäevaselt uuendatakse ja\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Vaata faile"
+#: src/amule.cpp:1043
+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"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Taasta sõbraslot"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"ega tapa sinu koera. Sellest hoolimata peaks see olema *turvaline* "
+"kasutada.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Oled kindel et tahad valitud sõbra(d) kustutada?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Rohkem informatsiooni, tuge ja uusi programmi versioone leiad meie "
+"kodulehelt,\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Oled kindel et tahad valitud sõbra(d) kustutada? "
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"aadressil www.aMule.org või meie IRC kanalis #aMule aadressil irc.freenode."
+"net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Loobu"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr ""
+"Tunne ennast vabalt suvaliste vigade leidmisest teavitamisel aadressil "
+"http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Sul pole lubatud määrata rohkem kui üks sõbraslot.\n"
-"Määrati ainult üks slott."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Vali mitu"
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Tõmbamine lõpetatud"
-
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Faili asukoht koos täieliku rajaga."
-
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Faili nimi ilma raja osata."
+"Online Allkirja kataloog on VIGANE!\n"
+" Online Allkirja ei kasutata, kuni parandad vea seadetes."
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "Faili eD2k räsi."
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Teatatud serveri nimi"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Faili suurus baitides."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Kettaruumi eraldamine faili '%s' jaoks ebaõnnestus: %s"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Kumuleeruv tõmbamise aeg."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "VIGA: Ei suutnud avada logifaili"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Uus vestlussession alustatud"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "HOIATUS: logifail on tühi, miskit on kapitaalselt viltu."
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Teate saatja."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Log on nullitud"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Pole enam ruumi"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Serveri teade: %s"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Ketta partitsioon."
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "Fail %s jäeti vahele, sest soovitud fail pole uuem."
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Viga lõpetamisel"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Ebaõnnestus sõlmede nimekirja tõmbamine."
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Faili nimi"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Ebaõnnestus tõmmatud versiooni kotrollfaili avamine"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Suurus"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Versiooni kontrollfail on korrumpeerunud"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tüüp"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Kasutad aegunud aMule versiooni!"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioriteet"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Sinu aMule versioon on %i.%i.%i ja uusim versioon on %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "FailiID"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Uuema aMule versiooni saad alati aadressilt http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Päringuid"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "HOAITUS: Sinu aMuled versioon on vananenud: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Aktsepteeritud päringuid"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Sinu aMule koopia on ajakohane."
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Siiratud andmed"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Versiooni kontrollfaili tõmbamine ebaõnnestus"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Jagamise suhe"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Kasutajaid: %s | Faile: %s"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Saadud osi"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Kasutajaid: E: %s K: %s | Faile E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Täielikke allikaid"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Ühtegi võrku pole valitud"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Kataloogi asukoht"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "koos LowID"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Jagatud failid"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "koos HighID"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Väga madal"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Ühendatud %s %s"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Madal"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Ühendun %s"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Keskmine"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "eD2k ühendus katkestatud."
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Kõrge"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad käivitatud."
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Väga Kõrge"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad peatatud."
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Versioon"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Ühendus Kad võrk (ok)"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Auto"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Ühendus Kad võrku (tulemüüriga)"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Lisa Kommentaar/Hinnang"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Ühendus Kad võrguga katkestatud"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Muuda Kommentaari/Hinnangut"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Kad võrku ei saa kasutada kui seadetes on UDP port väljalülitatud, ei ühendu."
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Nimeta ümber"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Kad on seadetes väljalülitatud, ei ühenda."
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Lisa failid ülekantavate failide loetellu"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"VIGA: aMule deemonit ei saa katkestatud Välisühendustega kasutada. "
+"Välisühenduste lubamiseks kasuta tavalist aMule, käivita amuled võtmega '--"
+"ec-config' või määra võtme \"AcceptExternalConnections\" väärtuseks 1 "
+"konfiguratsioonifailis ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Kopeeri magnet &URI lõikepuhvrisse"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"VIGA: Väliste ühenduste jaoks peab olema määratud kehtiv parool ning aMule "
+"deemonit ei saa kasutada ilma väliste ühendusteta. aMule deemoni "
+"kasutamiseks pead määrama konfiguratsioonifailis ~/.aMule/amule.conf  "
+"\"ECPassword\" väärtuseks kohase väärtuse.Parooli seadmiseks käivita amuled "
+"võtmega '--ec-config'. Lisainformatsiooni leiad http://wiki.amule.org"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: OnInit - käivituse stopper"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: lahkun taustaprotsessiks - näeme veel"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Ei suuda luua PID faili"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Kopeeri eD2k &link lõikepuhvrisse"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "VIGA: %s"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Kopeeri eD2k link lõikepuhvrisse (Allika&s)"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "See on eMulel põhinev aMule %s."
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Kopeeri eD2k link lõikepuhvrisse (Allikas)(&Koos Krüpto seadetega)"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Jookseb %s peal"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Kopeeri eD2k link lõikepuhvrisse (&Hostinimi)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr "Külasta http://www.amule.org ja vaata ehk on uuem versioon saadaval."
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr "Kopeeri eD2k link lõikepuhvrisse (Hostinimi)(Koos &Krüpto seadetega)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "Fataalne VIGA: Ei suutnud luua stopperit."
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Kopeeri eD2k link lõikepuhvrisse (&AICH info)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "aMule kaugjuhtimine "
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Kopeeri tagasiside lõikepuhvrisse"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Piiluvaade:"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:501
 msgid ""
-"Feedback from: %s (%s)\n"
+"'All-Platform' p2p client based on eMule \n"
 "\n"
 msgstr ""
-"Tagasiside : %s (%s)\n"
+" eMulel põhinev, platvormist sõltumatu, p2p klient \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Allika lingi loomiseks pead omama HighID'd."
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "!!! HOIATUS !!!"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Web: http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Jagatud failid (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[FailiOsa]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Sisesta selle faili uus nimi:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Faili ümbernimetamine"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Taastan faili '%s' saatmise"
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Peatan faili '%s' saatmise"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMule tekstiline klient"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: otsingu võtmesõna on liiga lühike"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Foorum: http://forum.amule.org \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Loetud %u Kad kontakti"
-msgstr[1] "Loetud %u Kad kontakti"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"KKK: http://wiki.amule.org \n"
+"\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Saadaval ainult %d Kad kontakt, nodes.dat ei lisatud"
-msgstr[1] "Saadaval ainult %d Kad kontakti, nodes.dat ei lisatud"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Kontakt: admin@amule.org (administratiivsed küsimused) \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Salvestatud %d Kad kontakt"
-msgstr[1] "Salvestatud %d Kad kontakti"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 aMule Meeskond \n"
+"\n"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "VIGA: Ei suuda kuulata TCP porti."
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Osa aMule põhineb \n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "web kliendi ühenus lubatud\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Sõlmest-Sõlmeni ruutimine põhineb XOR meetrikal.\n"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "VIGA: ei luba web kliendil ühenduda\n"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (C) 2002-2011 Petar Maymounkov <petar@post.harvard.edu>\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Teade"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Päring ebaõnnestus, põhjus: %s."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "aMule dialoog hävitatud"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Päring ebaõnnestus tundmatu vea tõttu."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Ühendun"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Indeksfaili ei leidnud: "
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Ühendun"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Seanss on aegunud - vajalik uuestilogimine\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Lahutatud"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Seanss ok, sisselogitud\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Tulemüüriga"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Seanss ok, pole sisselogitud\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Ühendatud"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Pole avatud seanssi - nõuan logimist\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Ühendun"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Seanss loodud - nõuan logimist\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Väljas"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Töötlen päringut [algupärane]:"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Loobu"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Kontrollin parooli\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Lõpeta käimasolevad ühenduskatsed"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Parooli kontrollsumma vigane\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Ühendu lahti"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Parool ok\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Lõpeta ühendus ühendatud võrkudega"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Parool, paha\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Ühenda"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Sa ei sisestanud parooli. Tühja prooli kasutamine pole lubatud.\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Ühendu olemasolevate, aktiivsete võrkudega"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Nõuti väljalogimist\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Üles: %.1f(%.1f) | Alla: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Töötlen päringut [ümbersuunatud]: "
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Üles: %.1f | Alla: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Laeb malli <str>"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Ühendatud)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "WEB serveri HTTP port"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Ühenduseta)"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Kasuta UPnP pordisuunamist webserveri portide suunamiseks"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Kas sa tõesti tahad %s'st väljuda?"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP port"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Kinnitan väljumise"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Kasuta gzip pakkimist"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Käivitamise korraldus: "
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- vaikimisi -"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Webserveri täieliku ligipääsu parool"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Rüüde kataloogi  '%s' ei eksiteeri"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Webserveri külalise (guest) parool"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "HOIATUS: Ei suuda rüüfaili '%s' lugemiseks avada"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Luba külalise (guest) ligipääs"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Võrgud"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Keela külalise (guest) ligipääs"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Võrgud"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Lae/salvesta webserveri parameetrid eemal-asuvast/asuvasse aMule"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Otsingud"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMule seadetefaili asukoht. ÄRA KASUTA OTSE!!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Otsingu aken"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Ära kasuta PHP interpretaatorit (aegunud)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Tõmbamised"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Loo PHP lehed iga päringu puhul uuesti"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Tõmbamised"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule WebServer"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Jagatud failid"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Info puudub"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Jagatud failide Aken"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Mitte kunagi"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Teated"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Tõmban..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Teadete Aken"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistika"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "Oodati %d baiti, kuid tõmmates saadi %d baiti"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Statistiliste graafikute aken"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Seaded"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "amulesig.dat fail asukoht"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Seadete aken"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Lehitse"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Impordi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Siia sisesta kataloog kus asub sinu amulesig.dat fail"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Osafailide importimise tööriist"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Värskendamise intervall sekundites"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Info"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Genereeri igal värskendamisel staatiline pilt"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Info/Appi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Kataloog, kuhu soovid salvestada genereeritud staatilised pildid"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "eD2k võrk"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Saada perioodiliselt oma stat fail FTP serverisse"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Kad võrk"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP Url"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Võrk puudub"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP asukoht"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "aMule kaugjuhtimine"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Sisesta siia oma FTP serveri URL"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "Sisesta siia FTP serveri kataloog kuhu paigutada staatilised pildid"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Fataalne VIGA: Ei suutnud stopperit."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Kasutaja"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Ühendu eemalasuva amuulaga"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Parool"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Fataalne VIGA: Ei suutnud luua Poll stopperit."
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Lähen tegevuse tsüklisse..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Ühendun..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Sinu kasutajanimi FTP serverisse logimiseks"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Ühendus ebaõnnestus "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Sinu parool FTP serverisse logimiseks"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Võrgu GUI EC sündmuse haldur"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Peatun "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "FTP värskendamise intervall minutites"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Ühendus ebaõnnestus. Ei suuda määratud ühenduda %s:%d\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Kinnita/kontrolli"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Ühendus suletud - aMule on ilmselt seisatud."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Sinu allkirjafaili asukoha kataloog"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Valmis"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Genereeritud statistiliste piltide kataloog"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Kõik"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:631
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i päev(a) %i tundi %i min %i s"
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, aMule Online Statistika"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Ohoo, rõõm sind näha!"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
+"Ei suuda luua kataloogi '%s' '%s' kategooria jaoks, säilitan '%s' kataloogi."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Suurim Tõmbamine alates wxCas käivitamisest"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Teadmata"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Absoluutselt suurim Tõmbamine wxCas eelmistest käivitamistest"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Ei suuda tõmmata kasutaja '%s' jagatud faili"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Algväärtusta"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Otsin lowid ühenduse jaoks semu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Süsteem"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Valetatud eMule versioon %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Peata Automaatne Värskendus"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Valetatud eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Salvesta Ühenduse Statistiline pilt"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Valetatud eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Trüki Ühenduse Statistiline pilt"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (baseerub eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Seaded"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Kasutajanimi: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "wxCas Info"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Küsitud: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Käivita automaatne värskendamine"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Selle seansi failistatistika: Aksepteeritud %d/%d päringust, %s siirdatud\n"
+msgstr[1] ""
+"Selle seansi failistatistika: Aksepteeritud %d/%d päringust, %s siirdatud\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Automaatne värskendamine on peatatud"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Kõikide seansside failistatistika: Aksepteeritud %d/%d päringust, %s "
+"siirdatud\n"
+msgstr[1] ""
+"Kõikide seansside failistatistika: Aksepteeritud %d/%d päringust, %s "
+"siirdatud\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Automaatne värskendamine on käivitatud"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Küsiti tundmatut faili"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Salvesta Statistika"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "'%s' (IP:%s) teade filtreeriti"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMule Online Statistika"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "'%s' (IP:%s) saatis uue teate"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"Tekkis viga printimisel.\n"
-"Võibolla pole su printer korralikult seadistatud?"
+"Kasutaja %s (%u) küsis sinu jagatudfailde loetelu kataloogile %s -> keeldusid"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Trükin"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "HOIATUS: %s faili ei saa avada."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
-"wxCas, aMule OnLine Allkirja Statistikal\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Baseerub Pedro de Oliveira <falso@rdk.homeip.net> CAS\n"
-"\n"
-"Jaotatakse GPL litsentsi järgselt"
+"HOIATUS: Katkestatud failde loetelu on riknenud, sisaldab riknenud päist."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, aMule ei tööta ..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule töötab"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule töötab aga ühendus on katkestatud"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "IO viga %s faili lugemisel: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule ühendub..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "VIGA: tekkis %s faili salvestamisel: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh Oh, aMule olek on teadmata..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Sisesta inimtesti kontrollkood"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategooria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " on toimetanud juba "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Uus Kategooria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " on seiskunud !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Vali sissetulevate failide kataloog"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " pole ühendatud !"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Sa pead kategooria jaoks nime defineerima!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " ühendub..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Sa pead kategooria jaoks asukoha defineerima!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " teeb midagi imelikku, kontrolli !!"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Ei suutnud luua kategooria sisendkataloogi. Palun defineeri kehtiv asukoht!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " on ühendatud  "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "VestlusSeanss Alustatud: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Ühenduses Kliendiga ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Ühendun Kliendiga ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "tulemüüriga"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Kliendiga ühendumine ebaõnnestus / Ühendus kadunud ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "väljas"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr "*** Läbisid inimtesti ja kasutaja sai sinu sõnumi kätte. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " baseerub "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** Sinu vastus inimtestile oli vale, sinu sõnumit ignoreeriti. Inimtesti "
+"uuesti läbimiseks saada uus sõnbum. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " koos "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Vestle"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Kokku Tõmbamisi: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Sulge leht"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Saatmine: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Sulge kõik lehed"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Seansil Tõmmatud: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Sulge teised lehed"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Tõmbamine: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Lisa sõprade nimistusse"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Saatmine: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Fail 'creditfile' loetud, tuvastati %u klienti"
+msgstr[1] "Fail 'creditfile' loetud, tuvastati %u klienti"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - %u Kliendi Krediit aegunud!"
+msgstr[1] " - %u Kliendi Krediit aegunud!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Jagamine: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Ei leidnud 'cryptkey.dat' faili, loon uue."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " faili, Klienti järjekorras: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Kliendi detailid"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Kellaaeg: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LowID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " on "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Lubatud"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Süsteemi koormuse keskmised (1-5-15 min): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Toetatud"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Süsteem on elus juba: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Pole toetatud"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uP %02ut %02umin %02us"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Keelatud"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02ut %02umin %02us"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Ühendatud"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Pole ühendust"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02us"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LowID"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Pole täielik"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Pole ühendust"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Paha Poiss"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Kontrollitud - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Info Puudub"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr ""
+"Kasutaja %s (%u) küsis sinu jagatud kataloogide nimekirja -> Kinnitasid"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "Kasutaja %s (%u) küsis sinu jagatud kataloogide nimekirja -> Keeldusid"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Tühistatud !"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"Kasutaja %s (%u) küsis sinu jagatud kataloogide nimekirja -> Kinnitasid"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "Unable to open %s"
-msgstr "Ei suuda %s avada"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Sisendparameetrid"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Räsitav fail"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Lisa selle faili alternatiivsed URL'id"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Sisesta siia fail, millele soovid luua eD2k linki"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "Kasutaja %s (%u) küsis sinu jagatud kataloogide nimekirja -> Keeldusid"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Sisesta siia see URL mida soovid eD2k lingile lisada: Lisa / lõppu, et "
-"aLinkCreator lisaks sellele faili nime"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Lisa"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Eemalda"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Puhasta"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Loo link osa-kontrollsummadega"
+"Kasutaja %s (%u) küsis sinu jagatudfailde loetelu kataloogile %s -> "
+"Kinnitasid"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Aita suurenenud lingi hinnaga uusi ja haruldasi faile kiiremini levitada."
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4 Faili kontrollsumma"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k Faili kontrollsumma"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k link"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Alusta"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Salvesta"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Kopeeri lõikepuhvrisse"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Välju"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Ava"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Ava fail tema eD2k lingi loomiseks"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopeeri"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Kopeeri arvutatud eD2k link lõikepuhvrisse"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Salvesta kui"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Salvesta arvutatud eD2k link faili"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Info"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "aLinkCreator'ist"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Vali fail, mille eD2k linki soovid arvutada"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Ei suuda lõikepuhvrit avada"
+"Kasutaja %s (%u) küsis sinu jagatudfailde loetelu kataloogile %s -> keeldusid"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Praeguseks hetkeks pole midagi kopeerida !"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Kasutaja %s (%u) jagab kataloogi %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Vali fail mille eD2k lingi arvutasid"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Kasutaja %s (%u) saatis soovimatu jagatud kataloogide nimekirja."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Ei suuda avada "
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "Kasutaja %s (%u) saatis kataloogi %s jagatud failide nimekirja"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Palun sisesta mittetühi faili nimi"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Kasutaja %s (%u) lõpetas jagatud failide nimekirja saatmise"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Pole midagi praeguseks hetkeks salvestada !"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Kasutaja %s (%u) saatis soovimatu jagatud failide nimekirja"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
-"aLinkCreator, aMule eD2k lingilooja\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pildid pärinevad http://www.everaldo.com ja http://www.icomania.com\n"
-"ja http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Jaotatakse GPL litsentsi järgselt"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Räsin..."
+"Kasutaja %s (%u) keelas ligipääsu jagatud kataloogide/failide nimekirjale"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator toimib sinu jaoks"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Faili kommentaarid"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Arvutan MD4 räsi..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Kasutajanimi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Arvutan eD2k räsi..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Faili nimi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Tehtud %.2f sekundiga"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Hinnang"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Oled juba selle URL lisanud !"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Kommentaar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Palun sisesta mittetühi URL"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Kommentaarid puuduvad"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Töötlen faili number %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr ""
-"Soovisid osade kontrollsummasid (Kasutatakse ainult failidel mis on > 9.5 MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u kommentaar"
+msgstr[1] "%u kommentaar(i)"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Faili pole olemas !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, aMule eD2k lingilooja"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"Klient %s bänniti %s riknenud info saatmise eest (kokku %s faili '%s' kohta)"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1319,31 +1155,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Kõrge]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Ühendun"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Väga madal"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Madal"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Keskmine"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Kõrge"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Väga Kõrge"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Versioon"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Pärin"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Ühendun serveri kaudu"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Järjekord täis"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "Järjekorras"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Saadan"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Tõmban"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1369,8 +1231,7 @@
 msgid "Too many Kad connections"
 msgstr "Liiga palju Kad ühendusi"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Blokeeritud"
 
@@ -1380,7 +1241,7 @@
 
 #: src/DataToText.cpp:75
 msgid "Remote Queue Full"
-msgstr "Järjekord täis"
+msgstr "KaugJärjekord täis"
 
 #: src/DataToText.cpp:105
 msgid "Old MLDonkey"
@@ -1402,8 +1263,8 @@
 msgid "Remote Server"
 msgstr "Kaug server"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1427,8 +1288,8 @@
 msgid "Search Result"
 msgstr "Otsingu tulemus"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Valmis"
 
@@ -1452,7 +1313,7 @@
 msgid "ERROR: Failed!"
 msgstr "VIGA: Ebaõnnestus!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "Järjekorras"
 
@@ -1464,869 +1325,303 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Tundmatu või paha tempfaili formaat."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Süsteemi vaikeväärtus"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Osa"
 
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albaania"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Araabia"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturia"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Baski"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgaaria"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Kataloonia"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Hiina (Lihtsustatud)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Hiina (Traditsiooniline)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Kroaatia"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Tšehhi"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Taani"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Hollandi"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Inglise (U.K.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Eesti"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Soome"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Prantsuse"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galiitsia"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Saksa"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Kreeka"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Heebrea"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Ungari"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Itaalia"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Itaalia (Shveits)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Jaapani"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Korea"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Leedu"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norra"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Suurus"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Poola"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Siiratud"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugali"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Kiirus"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugali (Brasiilia)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Edenemine"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Vene"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Allikaid"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Sloveenia"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioriteet"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Hispaania"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Olek"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Rootsi"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Lõpetamiseni"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Türgi"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Viimati nähtud terviklikuna"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ukraina"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Viimane vastuvõtt"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Valitud lehitsejat ei suuda tuvastada!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Oled kindel et tahad valitud faili kustutada?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr "TCP port ei saa olla suuerm kui 65532, sest serveri UDP soket on TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Oled kindel et tahad valitud failid kustutada?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Kasutan vaikimisi porti (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Serveri nimi"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Aadress"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Kirjeldus"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Kasutajad"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Failid"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Nurjunud"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Staatiline"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versioon"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Sa oled ühenduses selle serveriga mida soovid kustutada. Palun katkesta "
-"ühendus. Serverit ei kustutatud."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Tundmatu nimi)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Oled kindel et tahad kustutada staatilise serveri %s"
+"Tagasiside : %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Jah"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Ei"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Seis"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Ei suuda avada '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Paus"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Servereid (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Taasta"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Server"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "Va&lmis"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Ühendu serveriga"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Tõsta (A4AF) allikad selle faili külge"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Märgi server staatilisena"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Tõsta automaatselt kõik (A4AF) allikad selle faili külge"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Märgi server mittestaatilisena"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Tõsta (A4AF) allikad teiste failide külge"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Märgi serverid staatilisena"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Laiendatud valikud"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Märgi serverid mittestaatilisena"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Eelvaade"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Eemalda server"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Näita &detaile"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Eemalda serverid"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Näita kõiki kommentaare"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Eemalda kõik serverid"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Kopeeri magnet URI lõikepuhvrisse"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Kopeeri eD2k link lõikepuhvrisse"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Kopeeri eD2k &link lõikepuhvrisse"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopeeri eD2k lingid lõikepuhvrisse"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Kopeeri tagasiside lõikepuhvrisse"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Taasühendu serveriga"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "määramata"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Oled kindel et tahad kõik serverid kustutada?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Määra kategooria"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Oled kindel et tahad valitud serveri kustutada?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "Ava Fail"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Oled kindel et tahad valitud serverid kustutada?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Sisesta selle faili uus nimi:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Eemaldatud [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Faili ümbernimetamine"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "See on eMulel põhinev aMule %s."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%H:%M:%S %d/%m/%y"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Jookseb %s peal"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr "Külasta http://www.amule.org ja vaata ehk on uuem versioon saadaval."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "Fataalne VIGA: Ei suutnud luua stopperit."
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMule kaugjuhtimine "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Piiluvaade:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"eMulel põhinev, platvormist sõltumatu, p2p klient \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Web: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Foorum: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" KKK: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Kontakt: admin@amule.org (administratiivsed küsimused) \n"
+msgid "Downloads (%i)"
+msgstr "Tõmbamised (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (c) 2003-2009 aMule Meeskond \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Osa aMule põhineb \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Sõlmest-Sõlmeni ruutimine põhineb XOR meetrikal.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002-2008 Petar Maymounkov <petar@post.harvard.edu>\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Teade"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Ühendun"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Lahutatud"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Tulemüüriga"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Ühendatud"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Ühendun"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Väljas"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Lõpeta käimasolevad ühenduskatsed"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Ühendu lahti"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Lõpeta ühendus ühendatud võrkudega"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Ühenda"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Ühendu olemasolevate, aktiivsete võrkudega"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Üles: %.1f(%.1f) | Alla: %.1f(%.1f)"
+"Et seda viga eelvaatuse ajal rohkem mitte näitdata \n"
+"määra oma seadetes eelistatud video mängija (vaikimisi mplayer)."
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Üles: %.1f | Alla: %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Faili eelvaade"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Ühendatud)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "VIGA: Ei suutnud käivitada välist meediamängijat! Käsk: `%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Ühenduseta)"
+msgid "Saving PartFile %u of %u"
+msgstr "Salvestan osafaili %u %u-st"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Kas sa tõesti tahad aMule'st väljuda?"
-
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Kinnitan väljumise"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Kõik osafailid salvestatud"
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Rüüde kataloogi  '%s' ei eksiteeri"
+msgid "Loading temp files from %s."
+msgstr "Laen temp faile %s"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "HOIATUS: Ei suuda rüüfaili '%s' lugemiseks avada"
+msgid "Loading PartFile %u of %u"
+msgstr "Laen osafaili %u %u-st"
 
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Võrgud"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Võrgud"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Otsingud"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Otsingu aken"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Liiklus"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Failide siirdamise aken"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Jagatud failid"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Jagatud failide aken"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Teated"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Teadete aken"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistika"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Statistiliste graafikute aken"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Seadete aken"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Impordi"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Osafailide importimise tööriist"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Info/Appi"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "eD2k võrk"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Kad võrk"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Võrk puudub"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Üldine"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Ühendus"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Kataloogid"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Serverid"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Turvalisus"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Liides"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Puhverserver"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filtrid"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Kaugjuhtimine"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Online Allkiri"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Muud"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Sündmused"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Veajälitus"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Kasutaja määratud"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"Nende muudatuste jõustamiseks pead aMUle taaskäivitama:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP port muudetud.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP port muudetud.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"Sinu automaane serverinimekirja värskendamise loetelu on tühi.\n"
-"Käivitamisel serverinimekirja automaatselt ei uuendata."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Lülitasid sisse välised ühendused kuid ei määranud parooli.\n"
-"Väliseid ühendusi ei saa enne kehtiva parooli määramist kasutada."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Keel on muudetud.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Ajutiste failide kataloog on muudetud.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- ED2K võrk on lubatud.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Üles: 0.0 | Alla: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Mõlemad, nii eD2k kui ka Kad võrgud on mitteaktiivsed.\n"
-"Sa ei saa ühenduda enne, kui vähemalt üks neist on aktiivne."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad ei saa käivitada kuni UDP port on väljalülitatud.\n"
-"Lülita UDP port sisse, või Kad välja."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"Sa PEAD aMule nüüd taaskäivitama.\n"
-"Kui sa seda ei tee siis ära tänita kui midagi paha juhtub.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Serverite automaatse värskendamise loetelu on tühi.\n"
-"Palun sisesta vähemalt üks server.met faili asukoha kehtiv URL.\n"
-"URL sisestamiseks kliki nupule 'Loend'."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Ajutised failid"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Saabuvad failid"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Online Allkirjad"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Vali %s kataloog"
+"VIGA: Ei suutnud laadida tagavarafaili. Vaata aadressilt http://forum.amule."
+"org, kas leiad juhiseid .part. met faili taastamiseks"
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Otsi filmi taasesitamise programmi"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Kõik osafailid laetud"
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Vali lehitseja (browser)"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Part(osalisi) faile ei leidnud!"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Käivitusprogramm%s"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Leidsin %u osalist faili"
+msgstr[1] "Leidsin %u part(osalist) faili."
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Muuda serverite nimekirja"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
+msgstr "Temp kataloogi failisüsteem ei suuda suuri faile käidelda."
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
-"Lisa siia server.met faili(de) laadimise URL.\n"
-"Üks URL rea kohta."
-
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Värskenduse viide: %d sekundit"
-msgstr[1] "Värskenduse viide: %d sekundit"
+"Sisenevate failide kataloogi failisüsteem ei suuda suuri faile käidelda."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Keskmiste graafiku aeg: %d minutit"
-msgstr[1] "Keskmiste graafiku aeg: %d  minutit"
+msgid "Downloading %s"
+msgstr "Tõmban '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Ühenduse graafiku skaala: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Sa juba proovid faili '%s' tõmmata"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Värskenduse viide: %d sekundit"
-msgstr[1] "Värskenduse viide: %d sekundit"
+msgid "You already have the file '%s'"
+msgstr "Fail '%s' on juba olemas"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Failipuhvri suurus: %d baiti"
-msgstr[1] "Failipuhvri suurus: %d baiti"
+msgid "You are already trying to download the file %s"
+msgstr "Sa juba proovid '%s' faili tõmmata"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Saatmise Saba suurus: %d klienti"
-msgstr[1] "Saatmise Saba suurus: %d klienti"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Ei suuda muuta magnet linki eD2k lingiks: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Serveri ühenduse värskendamise intervall: %d minutit"
-msgstr[1] "Serveri ühenduse värskendamise intervall: %d minutit"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Serveri ühenduse värskendamise intervall: Ei kasuta"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "UDP port serveri laiendatud päringute jaoks (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "keelatud"
+msgid "Unknown protocol of link: %s"
+msgstr "Lingi %s protokoll on tundmatu"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Käivita käsk peale '%s' sündmust"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Luba käskude käivitamine tuumas"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Tuumkäsk:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Luba käskude käivitamine GUI's"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "GUI Käsk:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Järgnevad muutujad asendatakse:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Vigane eD2k link! VIGA: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Autoriseerimata ligipääsukatse. Ühendus suletud."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "Klient saatis paketi peale ebaõnnestunud autoriseerimist."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Välisühendus suleti"
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Välisühendused on tühja parooli tõttu mitteaktiivsed"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Välisühendused on konfiguratsioonifailis defineeritud mitteaktiivsena."
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Kinnitati uus väline ühendus"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "VIGA: Ei suutnud uut välist ühendust aksepteerida"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Välisühendustest keelduti tühja parooli tõttu seadetes!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Ühendan klienti: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Versioon teadmata"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2334,2227 +1629,1080 @@
 "Mittekorrektne Välisühenduste versiooni ID, siin võib olla binaarne "
 "kokkusobimatus.Kasuta sama versiooni tuuma ja kaugklienti."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"Sa ei saa ajutise SVN versiooniga ühenduda reliisi versiooniga!!!! *RRRRRR* "
+"Ajutise arendusversiooniga ei saa ühenduda reliisi versiooniga!!!! *RRRRRR* "
 "hoidsin ära võimaliku crässi"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Autoriserimine ebaõnnestus"
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Vigane protokolli versioon."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Puudub protokolli versiooni märgis"
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr "Autoriseerimine ebaõnnestus: EC parooliks on määratud vigane räsi."
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Autoriserimine ebaõnnestus: vale parool."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Autoriserimine ebaõnnestus: parool puudub."
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr "Vigane päring, alustuseks pead ennast autoriseerima."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Ligipääs Lubatud."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Veateade \"%s\" kliendile saadetud."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Autoriseerimata pääsukatse %s. Ühendus suletud."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Kaug OsaFaili käsk ebaõnnestus: Faili kontrollsummat ei leidnud: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Faili '%s' kontrollsummat ei leitud"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! OpCode töötlemise viga!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Serverit ei lisatud"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "serverit ei leidnud: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "eemaldatav server on vaja määrata"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k on seadetes väljalülitatud."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Otsing on käimas. Varsti näed tulemusi!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Web Otsing kaugtöökohast ei oma mõtet."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad on seadetes väljalülitatud."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Graafiku jaoks pole punkte."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Sinu klient pole seadistatud sellise detailsuse astme jaoks."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Väline Ühendus: nõutakse seiskamist"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Juba sulgun..."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Väline ühendus: lisan lingi '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Vigane link või on juba loetelus."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Faili ei leitud."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Vigane failinimi."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Ei suuda faili ringinimetada."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad on seadetes väljalülitatud."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Juba ühendatud eD2k võrku."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Ühendun eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Juba ühendatud Kad võrku."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Ühendun Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Kõik võrgud on väljalülitatud."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "eD2k ühendus katkestatud."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Kad ühendus katkestatud."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Väline Ühendus: sain vigase opkoodi: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Vigane opcode (vale protokolli versioon?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr "Faili '%s' avamine ebaõnnestus, eemaldan jagatud failide nimekirjast."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Tundmatu faili '%s' jaoks küsiti kontrollsummat."
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Käsk `%s' protsessi'id %d' lõpetas staatusega`%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Serverit ei lisatud: IP aadressi või masinanime pole defineeritud."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Serverit ei lisatud: Defineerisid vigase pordi."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "eD2k Olek:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Ühendatud"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Port"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kademlia Olek:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Töötab"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Olek:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Pole ühendust"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Ühenduse olek:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Tulemüüriga"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "Sobib"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Olek tulemüüriga: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Ühendus semuga"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Semu puudub"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Keskmiselt kasutajaid:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Keskmiselt faile:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Ei tööta"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Elus juba: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Liiklus"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Saatmised"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Saadetud andmeid (Seansil (Kokku)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Raisatud Kokku (pakette): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Raisatud faili päringuid (pakette): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Raisatud allikavahetusi (pakette): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Raisatud Servereid (pakette): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Raisatud Kad (pakette): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Krüpteerimise ulatus (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Aktiivsed saatmised: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Ootel saatmised: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Kokku õnnestunud saatmisi: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Kokku ebaõnnestunud saatmisi: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Keskmine saatmise aeg: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Tõmbamised"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Tõmmatud Andmed (Seansil (Kokku)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Leitud allikaid: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Aktiivsed tõmbamised (tükid): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Seanss ÜL:AL suhe (Kokku): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Keskmine tõmbamise kiirus (Sessioon): %s"
-
-#: src/Statistics.cpp:690
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Keskmine saatmise kiirus (Sessioon): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Maksimaalne tõmbamise kiirus (Sessioon): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Maksimaalne saatmise kiirus (Sessioon): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Ühenduse taastumised: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Aeg alates esimesest saatmisest: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Ühendatud serveriga alates: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Aktiivseid ühendusi (hinnang): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Saavutati maksimaalne arv ühendusi: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Keskmiselt ühendusi (hinnang): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Suurim ühenduste arv (hinnang): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Kliendid"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtreeritud"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Kokku: %i Tuntuid: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Töötavad serverid: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Ebaõnnestunud serverid: %i"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Tundmatu laiend '%s' käsule '%s'.\n"
 
-#: src/Statistics.cpp:717
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Total: %s"
-msgstr "Kokku: %s"
+msgid "Unknown command '%s'.\n"
+msgstr "Tundmatu käsk '%s'.\n"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Kustutatud serverid: %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"See käsk ei saa omada parameetrit.\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Filtreeritud serverid: %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Sellel käsul peavad olema parameetrid.\n"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Kasutajaid töötavail servereil: %llu"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Käsk on lõpetamata, pead kasutama üht laienditest allpool.\n"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Faile töötavail servereil: %llu"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Saadaval laiendid:\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Kokku kasutajaid: %llu"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Võiamlikud käsud:\n"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Total Files: %llu"
-msgstr "Kokku faile: %llu"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Kõik käsud on tõstutundetud.\n"
+"Tipi '%s <käsunimi>' et saada <käsunimi> kohta rohkem infot.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Serveri hõivatus: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Lahkub rakendusest."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Jagatud failide arv: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Näita Abimeest."
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Jagatud failide suurus kokku: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Käsu kohta abi saamiseks tipi 'help <käsunimi>'.\n"
+"Käskude täieliku loetelu saamiseks tipi 'help'.\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
-msgstr "Keskmine faili suurus: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Operatsioonisüsteem"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Pole vastu võetud"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Lõika"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Käsuloendi saamiseks kasuta '%s'\n"
+"\n"
 
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Aseta"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Süntaksi viga!"
 
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Vali kõik"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+"Viga käsu töötlemisel - sede ei tohiks mitte kunagi juhtuda!! Palun "
+"informeeri sellest\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad otsing pole võimalik kui Kad ei tööta"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Sellel käsul ei tohiks olla ühtegi parameetrit."
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "eD2k otsing pole võimalik kui eD2k pole ühendatud"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Sellel käsul peab olema parameeter."
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Ootamatu viga proovides Kad otsingut: "
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Vigane muutuja."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "'%s' (IP:%s) teade filtreeriti"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "See on poolik/lõpetamata käsk."
 
-#: src/ClientTCPSocket.cpp:803
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "'%s' (IP:%s) saatis uue teate"
+msgid "Type '%s' to get more help.\n"
+msgstr "Rohkema info saamiseks tipi '%s'.\n"
 
-#: src/ClientTCPSocket.cpp:821
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr ""
-"Kasutaja %s (%u) küsis sinu jagatud kataloogide nimekirja -> Kinnitasid"
+msgid "This is %s %s %s\n"
+msgstr "See on %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "Kasutaja %s (%u) küsis sinu jagatud kataloogide nimekirja -> Keeldusid"
+msgid "This is %s %s\n"
+msgstr "See on %s %s\n"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
-"Kasutaja %s (%u) küsis sinu jagatud kataloogide nimekirja -> Kinnitasid"
-
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "Kasutaja %s (%u) küsis sinu jagatud kataloogide nimekirja -> Keeldusid"
+"\n"
+"Loon klienti ....\n"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ExternalConnector.cpp:414
 #, c-format
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Kasutaja %s (%u) küsis sinu jagatudfailde loetelu kataloogile %s -> "
-"Kinnitasid"
+"\n"
+"Ok, lahkun %s...\n"
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"Kasutaja %s (%u) küsis sinu jagatudfailde loetelu kataloogile %s -> keeldusid"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Kasutaja %s (%u) jagab kataloogi %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Kasutaja %s (%u) saatis soovimatu jagatud kataloogide nimekirja."
-
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "Kasutaja %s (%u) saatis kataloogi %s jagatud failide nimekirja"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Kasutaja %s (%u) lõpetas jagatud failide nimekirja saatmise"
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Kasutaja %s (%u) saatis soovimatu jagatud failide nimekirja"
+"Ei suuda tühja parooliga ühenduda.\n"
+"Pead määrama parooli kas konfiguratsioonifailis või\n"
+"käsureal või selle küsimise korral sisestama.\n"
+"\n"
+"Lahkun...\n"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr ""
-"Kasutaja %s (%u) keelas ligipääsu jagatud kataloogide/failide nimekirjale"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Näita seda abiteksti."
 
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Sõlmed (%u)"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Masin milles aMule töötab. (vaikimisi: localhost)"
 
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Bootstrapil vigane IP"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "aMule välisühenduse port. (vaikimisi: 4712)"
 
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Bootstrapil vigane port"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Välisühenduse parool."
 
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Palun täida kõik nõutud väljad"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Loen konfiguratsiooni failist."
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Oled kindel et tahad tõmmata uut nodes.dat faili?\n"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Ära trüki midagi standardväljudisse."
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
-msgstr ""
-"Nii tehes eemaldad oma olemasolevad sõlmed ja taaskäivitad Kademlia ühenduse."
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Ole jutukas - näita ka veajälituse infot."
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Kas jätkata?"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Määrab programmi keele."
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "VIGA: "
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Kirjuta käsurea valikud konfiguratsioonifaili."
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "HOIATUS: "
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Loob konfiguratsioonifaili alusel aMule konfigratsioonifaili."
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Lisa Sõber"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Näita programmi versiooni."
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Pead sisestama kehtiva IP ja pordi!"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Faili detailid"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informatsioon"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% tehtud"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Määratud kasutaja kontrollsumma pole kehtiv!"
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Allikaid"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "Sõprade faili 'emfriends.met' avamine lugemiseks ebaõnnestus!"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Fail"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "Sõprade faili 'emfriends.met' avamine kirjutamiseks ebaõnnestus!"
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Tõmbamine"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "KRIITILINE - StartChatSession puudub klient"
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategooria"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Sõbrad"
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Peamine"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Näita &detaile"
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Tõmba kataloogi"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Lisa sõber."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Otsi seotud faile (eD2k, kohalik server)"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Eemalda sõber"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Märgi fail tuntuks"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Saada sõnu&m"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Ühendu eemalasuva amuulaga"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Vaata faile"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Ühendus ebaõnnestus "
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Taasta sõbraslot"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "VIGA"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Oled kindel et tahad valitud sõbra(d) kustutada?"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Ühendus ebaõnnestus. Ei suuda määratud ühenduda %s:%d\n"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Oled kindel et tahad valitud sõbra(d) kustutada? "
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
 msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
-"HOIATUS: Sa ei saa ennast eD2k lingi jaoks allikana lisada ajal kui omad "
-"lowid'd."
-
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Kasutajaid: E:%s K:%s | Faile E:%s K:%s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Kõik"
-
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Kokku Kasutajaid: %s | Kokku Faile: %s"
-
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Siiratud"
-
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Kiirus"
-
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Edenemine"
-
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Olek"
-
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Lõpetamiseni"
-
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Viimati nähtud terviklikuna"
-
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Viimane vastuvõtt"
-
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Oled kindel et tahad valitud faili kustutada?"
+"Sul pole lubatud määrata rohkem kui üks sõbraslot.\n"
+"Määrati ainult üks slott."
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Oled kindel et tahad valitud failid kustutada?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Vali mitu"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Saada kasutajale teade"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Saadetav teade:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Seis"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Paus"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Taasta"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "Va&lmis"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Tõsta (A4AF) allikad selle faili külge"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Tõsta automaatselt kõik (A4AF) allikad selle faili külge"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Tõsta (A4AF) allikad teiste failide külge"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Laiendatud valikud"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Eelvaade"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Näita &detaile"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Näita kõiki kommentaare"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Kopeeri magnet URI lõikepuhvrisse"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "määramata"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Määra kategooria"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "Ava Fail"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Eemalda sõpradest"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Lisa sõprade nimistusse"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Saada teade"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Tõsta selle faili külge"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%H:%M:%S %d/%m/%y"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
+msgid "On Queue: %u (%i)"
 msgstr "JK: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Küsitud teist faili"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Tõmbamised (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Et seda viga eelvaatuse ajal rohkem mitte näitdata \n"
-"määra oma seadetes eelistatud video mängija (vaikimisi mplayer)."
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Ootan saatmise slotti"
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Faili eelvaade"
-
-#: src/DownloadListCtrl.cpp:2320
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "VIGA: Ei suutnud käivitada välist meediamängijat! Käsk: `%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "VIGA: Ei suutnud luua osafaili!"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Proovin laadida met-faili tagavarakoopiat aadressilt %s"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "VIGA: Ei suuda avada part.met faili: %s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "VIGA: part.met faili on 0 suurusega: %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "VIGA: Vigane fail part.met versioon : %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr "VIGA: %s (%s) on vigane (vale märgiseloendur), ei suuda faili laadida."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Proovin taastada faili infot..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "Taastan nimetu faili - proovin ta taastada nimega RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "Taastatud kogu olemasolev failiinfo :D - Proovin nüüd kasutada..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Ei suuda faili infot taastada :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Ei suuda avada: %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "HOIATUS: %s võib olla riknenud (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "VIGA salvestades osafaili: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Ei suuda tõmmata '%s' pikkust - kasutan %s faili."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' on millegipärast 0 suurusega - kasutan %s faili."
+msgid "On Queue: %u"
+msgstr "Järjekorras: %u"
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Ei saanud salvestada faili part.met.seeds %s jaoks!"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Saadan"
 
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Salvestatud %i allikat osafailile: %s (%s)"
-msgstr[1] "Salvestatud %i allikat osafailile: %s (%s)"
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Mitte keegi"
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Osafail %s (%s) ei oma toitefaili"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Ei"
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Osafailil %s (%s) on kehtetu toitefail"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Jah"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "VIGA osafaili toitefaili lugemisel (%s - %s): %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Tõmban..."
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Leidsin riknenud osa (%d) %d osast fail '%s' - Arvutatud Kontrollsumma |%s| "
-"Saadetud Kontrollsumma |%s|"
-msgstr[1] ""
-"Leidsin riknenud osa (%d) %d osast fail '%s' - Arvutatud Kontrollsumma |%s| "
-"Saadetud Kontrollsumma |%s|"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "HTTP allalaadimine katkestatud"
 
-#: src/PartFile.cpp:1181
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Leitud lõpetatud osa (%i)  %s"
+msgid "Unable to create destination file %s for download!"
+msgstr "Ei suuda luua sihtkoha faili %s."
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "'%s' faili kontrollsumma arvutamine lõpetatud"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "Tõmbamise URL ei saa olla tühi."
 
-#: src/PartFile.cpp:2239
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Ootamatu viga %s lõpetamisel. Fail peatatud"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "URL %s ütles: %i - VIGA (%i)!"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Faili '%s' tõmbamine lõpetatud"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Kriitiline viga tõmmatud faili salvestamisel"
 
-#: src/PartFile.cpp:2323
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Deleting file: %s"
-msgstr "Kustutan faili: %s"
+msgid "Downloaded %d bytes"
+msgstr "Tõmmatud %d baiti"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"HOIATUS: Ei suuda tõmmatud osale arvutada kontrollsummat - kontrollsumma on "
-"mittetäielik '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Oodati %d baiti, kuid tõmmates saadi %d baiti"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"VIGA: ei suuda tõmmatud osale arvutada kontrollsummat- kontrollsumma on "
-"mittetäielik(%s). Seda ei tohiks kunagi juhtuda."
+"Vigane link HTTP tõmbamiseks või HTTP ümbersuunamine (ega sa unustanud "
+"lisada 'http://' ?)"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "HOIATUS: Pole piisavalt vaba kettaruumi! Pausin faili: %s"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "Ei suuda ühenduda HTTP serveriga"
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Tõmmatud osa %i on failis %s vigane"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "HTTP serveri vigane vastus"
 
-#: src/PartFile.cpp:3214
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Taastatud riknenud osa %i %s jaoks -> Päästsin: %s baiti"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Eraldamine"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Ebapiisav kettaruum"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Peatatud"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Tõmban uut GeoIP.dat faili aadressilt %s"
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Allalaetud"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "GeoIP.dat faili tõmbamine ebaõnnastus, katkestan uuendamise."
 
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "VIGA: Osafaili '%s' avamine ebaõnnestus"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "HOIATUS: known.met faili ei saa avada."
+msgid "Failed to remove %s file, aborting update."
+msgstr "Faili %s eemaldamine ebaõnnastus, katkestan uuendamise."
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr ""
-"HOIATUS: Tuttavate failde loetelu on riknenud, sisaldab riknenud päist."
-
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "IO viga known.met faili lugemisel: %s"
+msgid "Failed to rename %s file, aborting update."
+msgstr "Faili %s ümbernimetamine ebaõnnestus, katkestan uuendamise."
 
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "VIGA: tekkis known.met faili salvestamisel: %s"
+msgid "Successfully updated %s"
+msgstr "%s uuendamine õnnestus"
 
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Leitud %i tuntud ja jagatud faili"
-msgstr[1] "Leitud %i tuntud ja jagatud faili."
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "GeoIP.dat uuendamise viga"
 
-#: src/SharedFileList.cpp:358
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Leitud %i tuntud ja jagatud faili, %i tundmatut"
-msgstr[1] "Leitud %i tuntud ja jagatud faili, %i tundmatut."
+msgid "Failed to download %s from %s"
+msgstr "Faili %s tõmbamine aadressilt %s ebaõnnestus"
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "VIGA: Katse jagada %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Faili kommentaarid"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Hinnang"
+msgid "Failed to load country data for '%s'."
+msgstr "'%s' riigiinfo laadimine ebaõnnestus."
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Kommentaar"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Kommentaarid puuduvad"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Laen IP-filtrid 'ipfilter.dat' ja 'ipfilter_static.dat'."
 
-#: src/CommentDialogLst.cpp:104
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u kommentaar"
-msgstr[1] "%u kommentaar(i)"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
-"Kõigi näidatud hämatud serveritega ühenduse loomine ebaõnnestus. Lähen uuele "
-"katsele, seekord ilma hämamiseta."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Serveritega ühenduse loomine ebaõnnestus. Lähen uuele katsele."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "eD2k on seadetes väljalülitatud, ei ühendu"
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Serverite loetelus pole ühendumiseks sobivat kehtivat serverit"
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Ühendus %s (%s:%i)"
-
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Ühendus loodud: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr "Fataalne viga ühendumisel. Kontrolli ühendust."
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Kaotasin ühenduse %s (%s:%i)"
+"Ebaõnnestus ipfilter.dat faili '%s' laadimine, arusaamatu formaat sattus "
+"ette."
 
-#: src/ServerConnect.cpp:349
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) on vist surnud."
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "Ebaõnnestus ipfilter.dat faili '%s' laadimine, ei suuda faili avada."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) on vist täis."
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Laetud %u IP-piirkond failist '%s'."
+msgstr[1] "Laetud %u IP-piirkonda failist '%s'."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Proovin %d sekundi pärast serveriga uuesti automaatselt ühenduda."
-msgstr[1] "Proovin %d sekundi pärast uuesti serveriga automaatselt ühenduda."
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Ühendus kadunud."
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "ignoreeritud %u vigast rida."
+msgstr[1] "ignoreeritud %u vigast rida."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Ühendumine %s (%s:%i) ebaõnnestus."
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Faili %s ümbernimetamine ebaõnnestus, katkestan uuendamise."
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "VIGA: Vigane socket aegumise kontrollil"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "IP filter on lähtestatud"
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Serveriga '%s (%s:%i)' ühendumise katsed aegusid."
-
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-"VIGA: Ei suutnud laadida tagavarafaili. Vaata aadressilt http://forum.amule."
-"org, kas leiad juhiseid .part. met faili taastamiseks"
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Part(osalisi) faile ei leidnud!"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Leidsin %u osalist faili"
-msgstr[1] "Leidsin %u part(osalist) faili."
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr "Temp kataloogi failisüsteem ei suuda suuri faile käidelda."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Sisenevate failide kataloogi failisüsteem ei suuda suuri faile käidelda."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Tõmban '%s'"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Sa juba proovid faili '%s' tõmmata"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Fail '%s' on juba olemas"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Sa juba proovid '%s' faili tõmmata"
+"Tuntud klientide \n"
+"Bootstrap"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Ei suuda muuta magnet linki eD2k lingiks: %s"
+msgid "Nodes (%u)"
+msgstr "Sõlmed (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Lingi %s protokoll on tundmatu"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Bootstrapil vigane IP"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Vigane eD2k link! VIGA: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Bootstrapil vigane port"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Käivita <str> ja välju."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Palun täida kõik nõutud väljad"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Vigane IP formaat. Kasuta xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Oled kindel et tahad tõmmata uut nodes.dat faili?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"See käsk vajab muutujat. Sobivad muutujad on: 'all', failinimi või number.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Töötlen räsi järgi: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Töötlen failinime järgi: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr "See käsk vajab argumenti. Sobivad argumendid on: faili räasi.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Pole korrektne number\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Pole kehtiv kontrollsumma (pikkus peab olema täpselt 32 märki)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Operatsioon oli edukas."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Päring ebaõnnestus järgneval põhjusel: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Klientide IP-Filter on %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "Väljas"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "Sees"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Serverite IP-Filter on %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Kehtiv IPFilter Tase on %d.\n"
+"Nii tehes eemaldad oma olemasolevad sõlmed ja taaskäivitad Kademlia ühenduse."
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Ribalaiuse piirangud: Üles :%u kB/s, Alla: %u kB/s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Kas jätkata?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: otsingu võtmesõna on liiga lühike"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Ühendatud %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "koos LowID"
+msgid "Keyword for search: %s"
+msgstr "Otsingu märksõna: %s"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "koos HighID"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: otsingu võtmesõna on juba loetelus: "
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Ühendun"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Pole ühendatud"
-
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Tõmbamine:\t%s"
+"nodes.dat faili laadimine ebaõnnestus -  fail on liiga vana. See versiooni "
+"(0) on toetuseta."
 
-#: src/TextClient.cpp:726
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"Saatmine:\t%s"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Loetud %u Kad kontakti"
+msgstr[1] "Loetud %u Kad kontakti"
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Kliente järjekorras:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
+msgstr "Kontakte ei leitud, palun bootstrap või tõmba nodes.dat fail."
 
-#: src/TextClient.cpp:732
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
-msgstr ""
-"\n"
-"Kokku allikaid:\t%d\n"
-
-#: src/TextClient.cpp:809
-#, c-format
-msgid "Number of search results: %i\n"
-msgstr "Otsingu tulemusi: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - näita otsingu edenemist"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Saadaval ainult %d Kad kontakt, nodes.dat ei lisatud"
+msgstr[1] "Saadaval ainult %d Kad kontakti, nodes.dat ei lisatud"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Serverilt saabus tundmatu vastus, OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Näitab lühikest oleku ja statistika infot."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Näita ühenduse olekut, kehtivat saatmise/tõmbamise kiirust jne.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Näitab täieliku statistika puud."
-
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Sellele käsule võib argumendiks lisada numbri vahemikus 0 kuni 255, mis "
-"näitab\n"
-"mitu klienditarkvara erinevat versiooni statistika puu harudes näidata. "
-"Omistades\n"
-"väärtuseks 0, tähendab see 'piiramatult'.\n"
-"\n"
-"Näiteks: 'statistics 5' näitab ainult 5 enamesinenud versiooni iga kliendi "
-"tüübi kohta.\n"
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Seiska aMule"
-
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Seiska eemalasuv töötav tuum (amule/amuled).\n"
-"Seiskab ka tekstikliendi, kuna see on kasutu ilma töötava tuumata.\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr ".Taaslaeb määratud objekti."
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Taaslaeb jagatud failide loetelu."
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Lae IP Filter failist uuesti."
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Ühendu võrguga"
-
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"Ühendab kõigi seadetes määratud võrkudega.\n"
-"Võid lisaks määrata serveri aadressi moel IP:Port, et ühenduda ainult selle\n"
-"serveriga. IP peab olema IPv4 vastav aadress või DNS lahenduv nimi."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Ühendu ainult eD2k võrku."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Ühendu ainult Kad võrku."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Lõpeta ühendus võrguga."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Lõpetad ühenduse kõigi, hetkel ühenduses olevate võrkudega.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Lõpeta ühendus ainult eD2k võrguga."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Lõpeta ühendus ainult Kad võrguga."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Lisab tuumale eD2k või magnet lingi."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
-msgstr ""
-"Lisatav eD2k link saab olla:\n"
-"*) link failile (ed2k://|file|...), lisatakse tõmbamise järjekorda,\n"
-"*) link serverile (ed2k://|server|...), lisatakse serverite loetellu,\n"
-"*) või link serverite loetelule, sellisel juhul lisatakse kõik loetelus "
-"olevad\n"
-"   serverid serverite nimekirja.\n"
-"Magnet link peab sisaldama eD2k kontrollsummat ja faili pikkust.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Määra seade väärtus."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Määra IPFiltri seaded."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Lülita serverite ja klientide IP filtreerimine sisse."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Lülita serverite ja klientide IP filtreerimine välja."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Rakenda/ära rakenda klientide IP Filtreerimist."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Lülita klientide IP-filtreerimine sisse."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Salvestatud %d Kad kontakt"
+msgstr[1] "Salvestatud %d Kad kontakti"
 
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Lülita klientide IP-filtreerimine välja."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Faili nimi"
 
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Rakenda/ära rakenda serverite IP Filtreerimist."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Faili suurus"
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Lülita serverite IP-filtreerimine sisse."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Üles- ja allalaadimise suhe"
 
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Lülita serverite IP-filtreerimine välja."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Üleslaaditud"
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Vali IP Filtreerimise tase."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Küsitud"
 
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
-msgstr ""
-"Võimalikud filtreerimise tasemed on vahemikus 0 kuni 255, vaikeväärtus on "
-"127.\n"
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Aksepteeritud"
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Määra ribalaiuse piirang."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Täielikke allikaid"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Väärtus, mis nendele käskudele antakse, peab olema kilobaiti/sekundis.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Määra saatmise ribalaiuse piirang."
-
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Määra tõmbamise ribalaiuse piirang."
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Hangi ja näita atribuudi väärtus."
-
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Hangi IPFiltri seaded."
+"HOIATUS: Tuttavate failde loetelu on riknenud, sisaldab riknenud päist."
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Hangi IPFiltri olek nii klientide kui ka serverite kohta."
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
+msgstr "Tuntud falide loetelu laadimine ebaõnnestus, fail võib olla vigane"
+
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
+msgstr "Tuntud falide loetelus vigane kirje, fail võib olla vigane: "
+
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Versioon teadmata"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Hangi IPFiltri olek ainult klientide kohta."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Ei suuda luua sihtkoha faili %s."
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Hangi IPFiltri olek ainult serverite kohta."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Räsin"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Kehtiv IPFilteri Tase."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Lõpetatud"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Kehtiv Ribalaiuse piirang"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Valmis"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Teostab otsingu."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Peatatud"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"ASelletüübilise otsingu jaoks peab määrama otsingu tüübi:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Näide: 'search kad fail' otsib \"fail\" kad võrgust.\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Vigane"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Käivitab globaalse otsingu."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Ootan"
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Käivitab lokaalse otsingu."
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Käivitab otsingu kad võrgust."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Pead defineerima mittetühja parooli."
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Näitab viimase otsingu tulemusi."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Vigane parool, pole MD5 kontrollsumma!"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Tagastab eelmise otsingu tulemuse.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Ühenduse viga"
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Näitab otsingu edenemist."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "EC ühendus ebaõnnestus. Tühi vastus."
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Näitab otsingu edenemist.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "Väline Ühendus: Vigane vastus, kätlemine ebaõnnestus. Ühendus suletud."
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Alusta faili tõmbamist"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Õnnestus! Ühendus aMulaga loodud "
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Pead andma eelmise/viimase otsingu faili numbri.\n"
-"Näiteks 'download 12' alustab eelmise otsingu 12'nda faili tõmbamist.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Õnnestus! Ühendus loodud."
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Peata tõmbamine."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Väline Ühendus: Ligipääs keelatud sest: "
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Jätka tõmbamist."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Väline Ühendus: Kätlemine ebaõnnestus."
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "ListenSocket: Ok."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Katkesta tõmbamine."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "VIGA: Ei suuda kuulata TCP porti."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Määra tõmbamise prioriteet."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "VIGA: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Määra tõmbamise prioriteet Low, Normal, High või Auto.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "HOIATUS: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Määra madal prioriteet."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Sulge"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Määra normaalne prioriteet."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Lõika"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Määra kõrge prioriteet."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Kopeeri"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Määra automaatne prioriteet."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Aseta"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Näita järjekorda/nimekirja."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Puhasta"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Näitab saatmise/tõmbamise järjekorda, serveri jagatud failide loetelu.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Vali kõik"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Näita saatmise saba."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Näita tõmbamise järjekorda."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Piiramatu"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Näita logi."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule Riba Menüü"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Näita serverite nimekirja."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Kiiruse piirangud:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Tühjenda logi."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "ÜL: puudub"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Aegnud käsk, kasuta selle asemel '%s'."
+msgid "UL: %u"
+msgstr "ÜL: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"See on vananenud/aegunud käsk ja võidakse tulevikus eemaldada.\n"
-"Selle asemel kasuta '%s'.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "AL: pole"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "VIGA: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "AL: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "HOIATUS: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Tõmbamise kiirus: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Uus kliendi ID %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "HOIATUS: Said omale Low-ID!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tTõenäolisem põhjus on sinu asumine tulemüüri või ruuteri 'taga'."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tTäpsemat informatsiooni leiad http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Saatmise kiirus: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Saabus tundmatu serveriinfo! - liiga lühike"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Kliendi informatsioon"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Sain %d uut serverit"
-msgstr[1] "Sain %d uut serveri nime"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Serverite loetelu salvestamine lõpetatud."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Server lükkas viimase korralduse tagasi"
+msgid "Nickname: %s"
+msgstr "Hüüdnimi: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Tüngapakett saabus serverist: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Hüüdnime pole valitud!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Defineerimatu viga serverist %s saabunud paketi töötlemisel"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "KliendiID: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Ei suuda luua DNS lõime serveriga %s ühendumiseks"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Pole ühendatud"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "Server IP %s (%s) on filtris. Ei ühenda."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Serveri nimi: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "kasutan protokolli hämamist"
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "ServeriIP: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Ühendun %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Pole ühendust"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Ei suuda masina %s dns nime lahendada: Ei saa ühenduda!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Riigi info laadimine ebaõnnestus "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Laetud %d riigilipu pilti."
-msgstr[1] "Laetud %d riigilipu pilti."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Oled kindel et tahad katkestada ja kustutada kõik selle kategooria failid?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Ootan kinnitust"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "kõik teised"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Poolik"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Aktiivne"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Film"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Muusika"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Arhiiv"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD-Image"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Pildid"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Tekst"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Vali vaate filter"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Lisa kategooria"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Muuda kategooria"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Eemalda kategooria"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Faili nimi"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Faili suurus"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Üles- ja allalaadimise suhe"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Üleslaaditud"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Küsitud"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Aksepteeritud"
+msgid "TCP port: %d"
+msgstr "TCP port: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Täielikke allikaid"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP port: Pole valmis"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Impordin %s: %s"
+msgid "UDP port: %d"
+msgstr "UDP port: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Loen ajutist kataloogi"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UDP port: Pole valmis"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Hangin põhiinformatsiooni tõmmatavast infofailist"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Online Allkiri: Lubatud"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Loon sihtkohafaili"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Online Allkiri: Keelatud"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Laen vanast tõmbamisefailist andmeid (%u %u-st)"
+msgid "Uptime: %s"
+msgstr "Elus juba: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Salvestan andmeblokki uude, üksikusse tõmbamisefaili (%u %u-st)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Hanging allika tõmmatavate failide informatsiooni"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Lisan tõmbamise ja salvestan osafili"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Imporditud osafailid"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Olek"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Faili kontrollsumma"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Ootan..."
+msgid "Shared files: %d"
+msgstr "Jagatud failid: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Ketas: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Palun vali ajutiste tõmbamiste otsingu kataloog (alamkataloogid kuuluvad ka "
-"siia)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "Kas soovid õnnestunult imporditud tõmmatud failide allikad kustutada?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Eemaldan allikaid?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "baiti"
-msgstr[1] "baiti"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "baiti/sek"
-msgstr[1] "baiti/sek"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "sek"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "min"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "tundi"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "päev(a)"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Filmid"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Archiwum"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Tekst"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programmid"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Suvaline"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Pole hinnatud"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Vigane / Vigastatud / Pole õige"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Halb"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Hea"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Keskpärane"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Väga hea"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "kõik"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "kõik teised"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Laen IP-filtrid 'ipfilter.dat' ja 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Kliente sabas: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr ""
-"Ebaõnnestus ipfilter.dat faili '%s' laadimine, arusaamatu formaat sattus "
-"ette."
+msgid "Total DL: %s"
+msgstr "Kokku AL: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "Ebaõnnestus ipfilter.dat faili '%s' laadimine, ei suuda faili avada."
+msgid "Total UL: %s"
+msgstr "Kokku ÜL: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Laetud %u IP-piirkond failist '%s'."
-msgstr[1] "Laetud %u IP-piirkonda failist '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Saatmise limiit"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "ignoreeritud %u vigast rida."
-msgstr[1] "ignoreeritud %u vigast rida."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Tõmbamise limiit"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktiivseid ühendusi (l:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Peida aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Faili detailid"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Näita aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% tehtud"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Välju"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "eD2k Link: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Jõusta"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr "Klikka siia, et lisada eD2k link tekstiväljalt tõmbamise järjekorda."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr ""
 "Siin näidatakse sündmusi. Kogu sündmuste loetelu on logis Serverid lehel."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Laadimine..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Kasutajate arv serveris, kuhu sinagi oled ühendunud ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Kasutajad: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr "Kasutajaid serveriga ühenduses ja arvatav kasutajate koguarv."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Üles: 0.0 | Alla: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4562,7 +2710,7 @@
 "Hetkel kehtivad keskmised saatmise ja tõmbamise kiirused. Valituna näitavad "
 "numbrid sulgudes kliendikommunikatsiooni raisatud pakette."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4574,805 +2722,789 @@
 "ühenduses läbi tulemüüri) ja roheline nool näitab et omad HighID "
 "(Optimaalseim) ühenduse tüüp."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Pole ühendust ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Sa oled serveriga ühenduses."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Otsing"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tüüp"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Kohalik"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Üleüldine"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Faili kontrollsumma"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Laiendatud parameetreid"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtreerimine"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Faili tüüp"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Suvaline"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Archiwum"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Muusika"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD-Image"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Pildid"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programmid"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Tekst"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Filmid"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Laiend"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Vähim Suurus"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Baiti"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Suurim Suurus"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Saadavus"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filter:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Filtreerimise tulemused"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Tulemus peeglisse"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Vaata faile"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Alusta"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Rohkem"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Rohkemate eD2k tulemuste otsimine. Pole veel Kad poolt toetatud."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Seiska"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Tõmbamine"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Lähtesta väljad"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Tulemused"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Puhastab lõpetatud tõmbamised"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Näita saatmisi/saba"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Kliente sabas :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Saada"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Saada määratud teade."
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Faili allikad:"
 
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Sulge"
-
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Sulge see vestlus-seanss."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Üldine"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Täis nimi :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/A"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "met-Fail :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Kontrollsumma :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Faili suurus :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Osafaili staatus :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Viimati nähtud tervikuna :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Liiklus"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Leitud allikaid :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Saatvaid allikaid :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Failiosi :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Saadaval :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Andmekiirus :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Aktiivne Tõmbamine: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Siiratud :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Valmis suurus :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligentne riknemise vältimine"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Riknemise tõttu kaotatud :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Võidetud tänu kokkusurumisele :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "I.C.H. päästetud paketid :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Failide nimed"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Võta Üle"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Puhasta"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Jõusta"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Kommenteeri/Hinda faili (Tekst on nähtav kõigile)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Filmi puhul saad öelda tema pikkuse, tema süzee, keele ....\n"
-"ja kui see on võltsing siis saad sellest teisi aMule kasutajaid hoiatada."
+"Filmi puhul saad öelda tema pikkuse, tema süzee, keele ....\\n\\nja kui see "
+"on võltsing siis saad sellest teisi aMule kasutajaid hoiatada."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Faili kavliteet"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Pole hinnatud"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Vigane / Vigastatud / Pole õige"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Halb"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Hea"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Keskpärane"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Väga hea"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "Määra faili hinnang või hoiata kasutajaid juhul kui fail on vigane ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Tõmban, palun oota ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Suurus teadmata"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Vajalik informatsioon"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP Aadress :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Port :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Lisainformatsioon"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Kasutajanimi :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Kasutaja kontrollsumma :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Lae oma jagatud failid uuesti"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Käimasolev seanss"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Kokku"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Küsitud :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Aktiivsed saatmised :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Lisa"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Tõmbamise kiirus"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Hetkel"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Hetke keskmine"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Seansi keskmine"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Saatmise kiirus"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Ühendused"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Aktiivsed tõmbamised"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Aktiivseid ühendusi (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Aktiivsed saatmised"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Statistika Puu"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Kasutajanimi:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Kasutaja kontrollsumma:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Klienditarkvara:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Kliendiversioon:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP aadress:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "Kasutaja ID:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "Serveri IP:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Serveri nimi:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Hämatud:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Liiklus kliendile"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Praegune päring:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Keskmine saatmise suhe:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Keskmine tõmbamise suhe:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Saadetud (selles seansis):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Tõmmatud (selles seansis):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Saadetud (kokku):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Tõmmatud (kokku):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Skoorid"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "AL/ÜL kordaja:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Turvaline ident:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Reiting (kokku):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Järjekorras:"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Saba skoor:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Nimi"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - Linuxi Muul"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - mitme platvormi Muul"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "See on see nimi mida teised näevad kui sinuga ühenduvad."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Keel"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Keel: "
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Abitekstide kuvamise ajaline viide."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "See määrab kasutatava keele."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Muud valikud"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Kontrolli käivitumisel uue versiooni olemasolu"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr "Valituna kontrollib aMule käivitumisel värskema versiooni olemasolu"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Käivita vähendatult"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Valituna minimeerib aMule ennast peale käivitumist."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Kinnita väljumine"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
 msgstr "Sunnib aMule väljumiseks kinnitust küsima."
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Luba Riba(tray) ikoon"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
-msgstr "Siin saad lubada/keelata süsteemiriba (või tegumiriba) ikooni."
+msgstr "Valituna lubadab süsteemiriba (või tegumiriba) ikooni."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Vähenda Ribale ikooniks"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr ""
 "Valituna vähendab aMule ennast pigem Süsteemiribale, kui tööriistaribale."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Abitekstide viide sekundites"
-
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Abitekstide kuvamise ajaline viide."
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Abitekstide viide sekundites: "
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "sekundit"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Lehitseja valik"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Süsteemi vaikeväärtus"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Vali siin oma lehitseja"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Isemääratud lehitseja:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Sisesta siia oma lemmiklehitseja asukoht. Isemääratud lemmiklehitseja "
-"kasutamiseks vali allolevast rippmenüüst Custom."
+"Sisesta siia lehitsejaprogrammi nimi. Jättes välja tühjaks, kasutab süsteem "
+"vaikimisi määratud lehitsejat."
+
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Lehitse"
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Võimalusel ava uus sakk"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Ava, kui võimalik, webileht uuel lehel selle asemel et avada uus aken"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Video mängija"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Loo eelvaateks koopia"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Ribalaiuse piirid"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Saatmine"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Määratud pesa"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Standard kliendi TCP Port:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Pordid"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Vaikimisi TCP Port "
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "See on eD2k standard port ja seda ei saa välja lülitada."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Laiendatud kliendi UDP Port:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "UDP port serveri päringute jaoks (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Laiendatud UDP port (Kad / globaalne otsing) "
+
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 "Seda UDP porti kasutatkse laiendatud omadustega eD2k ja Kad võrgu puhul"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "ära kasuta"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Luba UPnP ruuteri portide suunamiseks"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Seo aadress"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "UDP port serveri laiendatud päringute jaoks (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Maksimaalseid allikaid Faili kohta"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnp TCP Port (Lisana):"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Maksimaalselt"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Seo lokaalne aadress IP'ga (suvaliseks jäta tühjaks)"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Ühenduse piirangud"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Max ühendusi"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Ainult edasijõudnud kasutajatele: Kui sul on kasutada mitu võrguliidest, "
+"siis sisesta selle liidese aadress millega aMule võib ennast siduda."
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Maksimaalseid allikaid tõmmatava faili kohta:"
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Maksimaalselt samaaegseid ühendusi:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universaalne Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Luba UPnP kasutamine"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnp TCP Port:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Automaatne ühendumine käivitumisel"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Ühenduse kadumisel taasta ühendus"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Näita raisatud ribalaiust"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Serveri valikud"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Eemalda surnud server peale"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "katset"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Käivitamisel värskenda automaatselt serverite nimekirja"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Loend"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Värskenda serverite nimekirja serveriga ühendumisel"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Värskenda serverite nimekirja kliendi ühendumisel"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Kasuta prioriteedisüsteemi"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Ühendumisel kasuta nutikat LowID kontrolli "
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Ohutu ühendumine"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr ""
 "Automaatne ühendumine ainult staatilises serverinimekirjas olevate "
 "serveritega"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Määra käsitsi lisatud serveritel Kõrge Prioriteet"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "Aktiveeri I.C.H."
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH usaldab suvalist kontrollsummat (pole soovitatav valik)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Intelligentne Riknemise Vältimine (I.C.H.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Luba"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+"Laiendatud I.C.H. usaldab suvalist kontrollsummat (pole soovitatav valik)"
+
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Lisa failid tõmbamiseks peatatud olekus"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Lisa failid tõmbamiseks automaatse prioriteediga"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Proovi alustuseks tõmmata esimene ja viimane tükk"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Lisa uued jagatud failid automaatse prioriteediga"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Proovi saatmisel siirata täielikud tükid"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr "Alusta järgmise peatatud failiga, kui fail lõpetab"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Samast kategooriast"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Salvesta haruldaste failide 10 allikat (< 20 allikat)"
-
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Kettaruum"
-
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Kontrolli kettaruumi"
-
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Vali see kui soovid et aMule sinu kettaruumi kontrolliks"
-
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Min Kettaruum:"
-
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
-msgstr "Sisesta siia vähim soovitud kettaruum"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "Tähestikulises järjekorras"
 
-#: src/muuli_wdr.cpp:2077
+#: src/muuli_wdr.cpp:1811
 msgid "Preallocate disk space for new files"
 msgstr "Eralda kettaruum uute failide jaoks"
 
-#: src/muuli_wdr.cpp:2078
+#: src/muuli_wdr.cpp:1812
 msgid ""
 "For new files preallocates disk space for the whole file, thus reduces "
 "fragmentation"
@@ -5380,292 +3512,248 @@
 "Eraldab uuet failide jaoks vajamineva kettaruumi, seeläbi väheneb faili "
 "fragmenteerumine"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Sisenev"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Ajutine"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Jagatud"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Lõpeta tõmbamine, kui vaba kettaruumi on jäänud "
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Vali see kui soovid et aMule sinu kettaruumi kontrolliks"
+
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
+msgstr "Sisesta siia vähim soovitud kettaruum"
+
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Salvesta haruldaste failide 10 allikat (< 20 allikat)"
+
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Saatmised"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Lisa uued jagatud failid automaatse prioriteediga"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Tõmmatavate failide kataloog"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Ajutiste tõmmatavate failide kataloog"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Jagatud kataloogid"
+
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Rekursiivseks jagamiseks tee paremklikk kataloogi ikoonil)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Jaga peidetud failid"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Graafikud"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Värskenduste vahe : 5 sekundit"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Keskmine graafiku aeg: 100 minutit"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Ühenduse graafiku skaala: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Vali statistika värvid"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Tõmbamise graafiku skaala:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Saatmise graafiku skaala:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Värvid: "
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Taust"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Alusvõrk"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Allalaadimine, jooksev"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Allalaadimine, jooksev keskmine"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Allalaadimine, seansi keskmine"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Saatmine hetkel"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Hetke saatmise keskmine"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Seansi keskmine saatmine"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Aktiivseid ühendusi"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Süsteemiriba Kiirvaliku Ikoon"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Kad-sõlmi hetkel"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Kad-sõlmi jooksvalt"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Kad-sõlmi seansis"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Vali"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Puu"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Kuvatavate Kliendi Versioonide arv (0=piiramatu)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Liini võimalused"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Märkus: Neid väärtusi kasutatkse ainult statistikas."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! HOIATUS !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Ära muuda neid seadeid, kui sa ei tea mida sa teed,\n"
-"vastasel juhul võid omale kergesti probleeme tekitada\n"
-"ja olukord võib väljuda kontrolli alt.\n"
-"\n"
-"aMule toimib ilusasti ilma siinolevaid seadeid muutmata\n"
-"You Are WARNED!!."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Laiendatud seadistused"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Maksimaalne arv uusi ühendusi / 5 sek."
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Faili puhvri suurus: 240000 baiti"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Saatmise saba suurus: 5000 klienti"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Serveriühenduse värskenadamise intervall: Ei kasuta"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Järjekorra edenemine"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Näita protsendiliselt"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Näita edenemise riba "
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Edenemise riba stiil"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Lame"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Ümar"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Rüüde tugi"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Võimalda rüüde tugi"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Rüü:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- rüüd pole saadaval -"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Keela arvuti ajastatud uinumine"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Kasutatav rüü: "
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Näita igas aknas \"Kiiret eD2k lingi käsitlejat\". "
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Tulpade sorteerimine"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr ""
-"Tõmbamise järjekorras olevate failide automaatne sorteerimine (high CPU)"
-
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule sorteerib tulbad tõmbamise sabas automaatselt"
-
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Muud GUI seaded"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Näita kiiret eD2k lingi käsitlejat"
-
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Näita kategooria juures laiendatud infot"
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
 msgstr "Näita tiitelribal siirdamise kiirusi"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Vertikaalne tööriistariba paigutus"
-
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Näita osafaili numbrit enne failinime"
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Näita tiitelribal siirdamise kiirusi"
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Web serveri seaded"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Eelmise rakenduse nimi"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Järgneva rakenduse nimi"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Käivita amuleweb (WEBserver) koos aMulega"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Web serveri port"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Luba UPnP pordisuunamist webservri portide jaoks"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Webserveri UPnP TCP port"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Näita raisatud ribalaiust"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Lehekülje värskendusaeg (sekundites)"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Vertikaalne tööriistariba paigutus"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Luba Gzip pakkimine"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "Näita klientide riigi lippe"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Tõmbamise Järjekorrafailid"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Näita edenemist protsentuaalselt"
+
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Näita edenemise riba"
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Luba madalate õigustega kasutaja"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Lame"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Täisõiguste parool"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Ümar"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Madalate õiguste parool"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Sorteeri failid automaatselt (high CPU)"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "WEB näidis/mall"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "aMule sorteerib tulbad tõmbamise sabas automaatselt"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Välisühenduse parameetrid"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Aksepteeri väliseid ühendusi"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"Kuulava liidese IP aadress \n"
-"(suvalise aadressi jaoks jäta tühjaks)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "Kuulava liidese IP aadress:"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5673,75 +3761,115 @@
 "Sisesta siia välisühenduse liidese kehtiv ip aadress a.b.c.d formaadis. Tühi "
 "väli või 0.0.0.0 tähendab suvalist liidest."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP port"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "TCP port:"
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Luba UPnP pordisuunamist EC pordile"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Parool"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Web serveri seaded"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Käivita WEBserver koos aMulega"
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "WEB näidis/mall"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Täisõiguste parool"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Luba madalate õigustega kasutaja"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Madalate õiguste parool"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Luba webservri portide UPnP pordisuunamist"
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Webserveri UPnP TCP port (Valikuline)"
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Lehekülje värskendusaeg (sekundites)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Luba Gzip pakkimine"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "Sobib"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Seadetes tehtud muudatuste jõustamiseks klikka siia."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Tühista kõik seadetes tehtud muudatused."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Tiitel :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Kommentaar :"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Tõmmatud failide kataloog :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Muuda uute failide prioriteeti :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "Ära muuda"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Vali praegu valitud kategooriale värv :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Näita ühendumisel serveri motd ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Serveri info"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Algväärtusta"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Klikates seda nuppu tühjendad logi."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule Logi"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Sellele nupule klikates värskendad serverite loetelu URL ilt ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Serverite nimekiri"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5749,43 +3877,55 @@
 "Sisesta siia server.met faili asukoha URL ja pressi vasakul olevat nuppu "
 "tuntud serverite nimekirja värskendamiseks."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Lisa server käsitsi: Nimi"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Sisesta siia uue serveri nimi"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Port"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Sisesta siia serveri IP aadrdess, kasutades x.x.x.x formaati."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Sisesta siia serveri port."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Täites esiteks vasakul olevad väljad, lisa server käsitsi ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule Logi"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Serveri info"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "ED2K Info"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad Info"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Klikates sellele nupule värskendad sõlmede loetelu URL'ilt ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Sõlmed (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5793,51 +3933,55 @@
 "Sisesta siia nodes.dat faili url ja pressi vasakul olevat nuppu, et tuntud "
 "sõlmede loetelu täiendada."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Sõlmede statistika"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Bootstrap"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Uus sõlm"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Port:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Tuntud klientide \n"
-"Bootstrap"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Tuntud klientide Bootstrap"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Lõpeta Kad ühendus"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2k Info"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Kasuta Turvalist Kasutaja tuvastamist"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"On soovitatav see omadus lubada. Sa ei saa krediiti kui SUI on välja "
+"lülitatud."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Protokolli Hämamine"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Protokolli Hämamine lubatud"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5845,11 +3989,11 @@
 "See valik lülitab Protokolli Hämamise sisse ja sunnib aMule aksepteerima "
 "ainult teiste klientide hämatud ühendusi."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Kasuta väljuvatel ühendustel hämamist"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5857,11 +4001,11 @@
 "See valik sunnib aMule kasutama teiste serverite/klientidega ühendumisel "
 "Protokolli Hämamist."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Aksepteeri ainult hämatud ühendusi"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5869,85 +4013,81 @@
 "See valik sunnib aMule aksepteerima ainult hämatud ühendusi. Sul on vähem "
 "allikaid aga kogu liiklus on hämatud."
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Faili valikud"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Igaüks"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Mitte keegi"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Kes näeb jagatud faile:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Kes näeb minu jagatud faile:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Vali, kes võib vaatamiseks küsida sinu jagatud falide nimekira."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP-Filtreerimine"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtreeri kliente"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Rakenda klientide IP filtreerimine failis ~/.aMule/ipfilter.dat defineeritud "
 "aadressidele."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtreeri servereid"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Rakenda serverite IP filtreerimine failis ~/.aMule/ipfilter.dat defineeritud "
 "aadressidele."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Lae loetelu uuesti"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Taaslae filtreeritavad IP aadressid failist ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Värskenda"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Käivitamisel värskenda automaatselt ipfiltrit"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Filtreerimise tase:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Filtreeri alati LAN IP aadresse"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Mitteklappivate IP aadresside paranoiline käitlemine"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -5955,11 +4095,11 @@
 "Viskab paketi minema kui kliendi IP erineb paketi saatja IP aadressist. "
 "Kasuta ettevaatlikult."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Kasuta süsteemi ipfilter.dat kui see on saadaval"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -5967,23 +4107,11 @@
 "Kui kohalik ipfilter.dat fail puudub, kasuta süsteemi globaalset ipfilter "
 "faili."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Kasuta Turvalist Kasutaja tuvastamist"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"On soovitatav see omadus lubada. Sa ei saa krediiti kui SUI on välja "
-"lülitatud."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Luba Online-Allkiri"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -5991,842 +4119,1291 @@
 "Võimaldab kirjutada OS faile, mida saavad kasutada välised rakendused kasvõi "
 "allkirja loomiseks."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Värskenduse sagedus (Sek):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Muuda Online Allkirja värskendamise (sekundites) sagedust."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Online Allkirja asukoha kataloog:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Salvesta online ollkirja fail: "
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr "Siin saad valida kataloogi kus asub sinu Online Allkirja fail."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Ära kasuta/Kasuta"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtreeri saabuvaid teateid (va. käimasolev vestlus):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Filtreerimise valikud:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtreeri kõiki teateid"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtreeri sinu sõbralistiväliste kodanike teateid"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtreeri tundmatute klientide teateid"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtreeri teateid, mis sisaldavad (loetelus kasuta eraldajana koma):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "lisa siia sõnad mille amule peab väljafiltreerima ja bloki teated mis seda "
 "sisaldavad"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Näita logis saabunud teateid"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Kommentaarid"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtreeri teateid, mis sisaldavad (loetelus kasuta eraldajana koma):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Automaatne, ilma puhverserverita, serveriga ühendumine "
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Nõua autoriseerimist"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Autoriseerimisel Kasuta/Ära kasuta kasutajanime/parooli"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Kasutajanimi: "
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Puhverserveriga ühenduseks vajalik kasutajanimi"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Parool:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Puhverserveri kasutamiseks vajalik parool"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Kasuta puhverserverit"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Kasuta/ärakasuta puhverserveri tuge"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Puhverserveri tüüp:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Selle puhverserveri tüüp kuhu sa ühendud"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Puhverserveri nimi:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Selle puhverserveri/hosti nimi "
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Puhverserveri port:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Selle puhverserveri pordi number"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Autoriseerimine"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Nõua autoriseerimist"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Autoriseerimisel Kasuta/Ära kasuta kasutajanime/parooli"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Puhverserveriga ühenduseks vajalik kasutajanimi"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Parool:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Puhverserveri kasutamiseks vajalik parool"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Automaatne, ilma puhverserverita, serveriga ühendumine "
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Ühendu :"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Logi sisse eemalasuvasse amuula"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Kasutaja nimi"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Pea need seaded meeles"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Võimalda inimkieelne Veajälitus-Logimine"
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Saadetav teade:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Ootan..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Lisa imporditavad"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Proovi valitutega uuesti"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Eemalda valitud"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "Sündmuse tüübid"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+"Statistika ja järjekorras kliendid valitud faili(de) kohta : Sessioon / Kokku"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Aktiivsed saatmised"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "Protsenti kogufailidest"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Kõik failid"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Valitud failid"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Ainult aktiivsed saatmised"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Näita Kliente"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Taaslae:"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Lae oma jagatud failid uuesti"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Saada"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Saada määratud teade."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Sulge see vestlus-seanss."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Ühendu suvalise serveri ja/või Kad võrguga"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Võrgud"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Jagatud failid"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Otsingu aken"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Eemaldatud [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Failide siirdamise aken"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "baiti"
+msgstr[1] "baiti"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Jagatud failide Aken"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Teadete Aken"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Statistiliste graafikute aken"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Seadete aken"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Uus Kategooria"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Vali sissetulevate failide kataloog"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Sa pead kategooria jaoks nime defineerima!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "baiti/sek"
+msgstr[1] "baiti/sek"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Sa pead kategooria jaoks asukoha defineerima!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"Ei suutnud luua kategooria sisendkataloogi. Palun defineeri kehtiv asukoht!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "sek"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "min"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "tundi"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "päev(a)"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "kõik"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "kõik teised"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Poolik"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Peatatud"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Film"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Arhiiv"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Tekst"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Aktiivne"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Tundmatu laiend '%s' käsule '%s'.\n"
+msgid "Using config dir: %s"
+msgstr "Kasutan seadete kataloogi: %s"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Ootan osafaili konverteerimise lõime suremist ..."
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Tundmatu käsk '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Impordin %s: %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"See käsk ei saa omada parameetrit.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Loen ajutist kataloogi"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Sellel käsul peavad olema parameetrid.\n"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Hangin põhiinformatsiooni tõmmatavast infofailist"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Loon sihtkohafaili"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Laen vanast tõmbamisefailist andmeid (%u %u-st)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Salvestan andmeblokki uude, üksikusse tõmbamisefaili (%u %u-st)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Hanging allika tõmmatavate failide informatsiooni"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Lisan tõmbamise ja salvestan osafili"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Imporditud osafailid"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Olek"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Faili kontrollsumma"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Ketas: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Käsk on lõpetamata, pead kasutama üht laienditest allpool.\n"
+"Palun vali ajutiste tõmbamiste otsingu kataloog (alamkataloogid kuuluvad ka "
+"siia)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
-"\n"
-"Saadaval laiendid:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "Kas soovid õnnestunult imporditud tõmmatud failide allikad kustutada?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Võiamlikud käsud:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Eemaldan allikaid?"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "VIGA: Ei suutnud luua osafaili!"
+
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Kõik käsud on tõstutundetud.\n"
-"Tipi '%s <käsunimi>' et saada <käsunimi> kohta rohkem infot.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Proovin laadida met-faili tagavarakoopiat aadressilt %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Lahkub rakendusest."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "VIGA: Ei suuda avada part.met faili: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Näita Abimeest."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "VIGA: part.met faili on 0 suurusega: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
-msgstr ""
-"Käsu kohta abi saamiseks tipi 'help <käsunimi>'.\n"
-"Käskude täieliku loetelu saamiseks tipi 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "VIGA: Vigane fail part.met versioon : %s ==> %s"
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr "VIGA: %s (%s) on vigane (vale märgiseloendur), ei suuda faili laadida."
+
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
-msgstr ""
-"\n"
-"Käsuloendi saamiseks kasuta '%s'\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+msgstr "VIGA: %s (%s) on vigane (vale märgiseloendur), ei suuda faili laadida."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Süntaksi viga!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Proovin taastada faili infot..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr ""
-"Viga käsu töötlemisel - sede ei tohiks mitte kunagi juhtuda!! Palun "
-"informeeri sellest\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "Taastan nimetu faili - proovin ta taastada nimega RecoveredFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Sellel käsul ei tohiks olla ühtegi parameetrit."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "Taastatud kogu olemasolev failiinfo :D - Proovin nüüd kasutada..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Sellel käsul peab olema parameeter."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Ei suuda faili infot taastada :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Vigane muutuja."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Ei suuda avada: %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "See on poolik/lõpetamata käsk."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "HOIATUS: %s võib olla riknenud (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Rohkema info saamiseks tipi '%s'.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "VIGA salvestades osafaili: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "IO viga osafaili salvestamisel: "
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "See on %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Ei suuda tõmmata '%s' pikkust - kasutan %s faili."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "See on %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' on millegipärast 0 suurusega - kasutan %s faili."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Ei saanud salvestada faili part.met.seeds %s jaoks!"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Salvestatud %i allikat osafailile: %s (%s)"
+msgstr[1] "Salvestatud %i allikat osafailile: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Osafail %s (%s) ei oma toitefaili"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Osafailil %s (%s) on kehtetu toitefail"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "VIGA osafaili toitefaili lugemisel (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Leidsin riknenud osa (%d) %d osast fail '%s' - Arvutatud Kontrollsumma |%s| "
+"Saadetud Kontrollsumma |%s|"
+msgstr[1] ""
+"Leidsin riknenud osa (%d) %d osast fail '%s' - Arvutatud Kontrollsumma |%s| "
+"Saadetud Kontrollsumma |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Leitud lõpetatud osa (%i)  %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "'%s' faili kontrollsumma arvutamine lõpetatud"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Ootamatu viga %s lõpetamisel. Fail peatatud"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Faili '%s' tõmbamine lõpetatud"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Kustutan faili: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Loon klienti ....\n"
+"HOIATUS: Ei suuda tõmmatud osale arvutada kontrollsummat - kontrollsumma on "
+"mittetäielik '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Ok, lahkun %s...\n"
+"VIGA: ei suuda tõmmatud osale arvutada kontrollsummat- kontrollsumma on "
+"mittetäielik(%s). Seda ei tohiks kunagi juhtuda."
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Ei suuda tühja parooliga ühenduda.\n"
-"Pead määrama parooli kas konfiguratsioonifailis või\n"
-"käsureal või selle küsimise korral sisestama.\n"
-"\n"
-"Lahkun...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Näita seda abiteksti."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "HOIATUS: Pole piisavalt vaba kettaruumi! Pausin faili: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Masin milles aMule töötab. (vaikimisi: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Tõmmatud osa %i on failis %s vigane"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "aMule välisühenduse port. (vaikimisi: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Taastatud riknenud osa %i %s jaoks -> Päästsin: %s baiti"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Välisühenduse parool."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Eraldamine"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Loen konfiguratsiooni failist."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Ebapiisav kettaruum"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Ära trüki midagi standardväljudisse."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Allalaetud"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Ole jutukas - näita ka veajälituse infot."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "VIGA: Osafaili '%s' avamine ebaõnnestus"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Määrab programmi keele."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Süsteemi vaikeväärtus"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Kirjuta käsurea valikud konfiguratsioonifaili."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albaania"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Loob konfiguratsioonifaili alusel aMule konfigratsioonifaili."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Araabia"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Näita programmi versiooni."
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturia"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Fail 'creditfile' loetud, tuvastati %u klienti"
-msgstr[1] "Fail 'creditfile' loetud, tuvastati %u klienti"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Baski"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - %u Kliendi Krediit aegunud!"
-msgstr[1] " - %u Kliendi Krediit aegunud!"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgaaria"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Ei leidnud 'cryptkey.dat' faili, loon uue."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Kataloonia"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"VIGA: aMule deemonit ei saa kasutada kui Välisühendused on katkestatud. "
-"Välisühenduste lubamiseks kasuta tavalist aMule, käivita amuled võtmega '--"
-"ec-config' või määra võtme \"AcceptExternalConnections\" väärtuseks 1 "
-"konfiguratsioonifailis ~/.aMule/amule.conf"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Hiina (Lihtsustatud)"
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "VIGA: %s"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Hiina (Traditsiooniline)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Lõpeta blokeering"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Näita Saatmisi"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Näita Järjekorda"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Kroaatia"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Näita Kliente"
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Tšehhi"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Vali Vaade"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Kliendi Tarkvara"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Oodanud"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Saadetud"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Saatmine/Tõmbamine"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Staatus eemalt"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Taani"
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "JK: %u"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Hollandi"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Prioriteet"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Inglise (U.K.)"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Skoor"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Eesti"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Küsitud"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Soome"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Viimati nähtud"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Võetud järjekorda"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Prantsuse"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Saatmise olek"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galiitsia"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Saadetud"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Saksa"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Tõmbamise olek"
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Kreeka"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Tõmmatud"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Kasutaja kontrollsumma"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Krüpteeritud"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Peida jagatud failid"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Heebrea"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Kliendi detailid"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Ungari"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Lubatud"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Itaalia"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Toetatud"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Itaalia (Shveits)"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Pole toetatud"
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Jaapani"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Keelatud"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Korea"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Leedu"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Pole täielik"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norra"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Paha Poiss"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Poola"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Kontrollitud - OK"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugali"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Info Puudub"
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugali (Brasiilia)"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (JK: %u)"
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Vene"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr "Min suurus peab olema väiksem kui max suurus. Ignoreerin Max suurust."
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Sloveenia"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Otsingu hoiatus"
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Hispaania"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Piiramatu"
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Rootsi"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule Riba Menüü"
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Türgi"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Kiiruse piirangud:"
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ukraina"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "ÜL: puudub"
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Muuda keel"
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "ÜL: %u"
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "AL: pole"
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "Info puudub"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "valikud puuduvad"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Leidsin vigase kategooria, ignoreerin"
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr "TCP port ei saa olla suuerm kui 65532, sest serveri UDP soket on TCP+3"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "DL: %u"
-msgstr "AL: %u"
+msgid "Default port will be used (%d)"
+msgstr "Kasutan vaikimisi porti (%d)"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/Preferences.cpp:1790
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Tõmbamise kiirus: %.1f"
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Eemaldan olematu jagatud kataloogi: %s"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Ühendus"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Kataloogid"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Serverid"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Failid"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Turvalisus"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Liides"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Puhverserver"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Filtrid"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Kaugjuhtimine"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Online Allkiri"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Muud"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Sündmused"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Veajälitus"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+"Järgmised muutujad asendatakse:\n"
+"   %PARTFILE - fail täis rada\n"
+"   %PARTNAME - faili nimi"
+
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Ära muuda neid seadeid, kui sa ei tea mida sa teed,\n"
+"vastasel juhul võid omale kergesti probleeme tekitada\n"
+"ja olukord võib väljuda kontrolli alt.\n"
+"\n"
+"aMule toimib ilusasti ilma siinolevaid seadeid muutmata\n"
+"You Are WARNED!!."
+
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Saatmise kiirus: %.1f"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Widgeti ühendamine Cfg'a, kasutades ID %d ja võtit %s, ebaõnnestus"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Kliendi informatsioon"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
+"Andmete ülekandmine Cfg'st Widget'isse, kasutades ID %d ja võtit %s, "
+"ebaõnnestus"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Selle puhverserveri tüüp kuhu sa ühendud"
+
+#: src/PrefsUnifiedDlg.cpp:534
 #, c-format
-msgid "Nickname: %s"
-msgstr "Hüüdnimi: %s"
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
+"Andmete ülekandmine Widgetist Cfg'sse, kasutades ID %d ja võtit %s, "
+"ebaõnnestus"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Hüüdnime pole valitud!"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"Nende muudatuste jõustamiseks pead aMUle taaskäivitama:\n"
+"\n"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "KliendiID: "
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP port muudetud.\n"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Serveri nimi: "
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP port muudetud.\n"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "ServeriIP: "
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- Välisühenduse port on muutunud.\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- Välisühenduse luba on muudetud.\n"
+
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- Välisühenduse liides muutunud.\n"
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"Sinu automaane serverinimekirja värskendamise loetelu on tühi.\n"
+"Käivitamisel serverinimekirja automaatselt ei uuendata."
+
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Lülitasid sisse välised ühendused kuid ei määranud parooli.\n"
+"Väliseid ühendusi ei saa enne kehtiva parooli määramist kasutada."
+
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Keel on muudetud.\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Ajutiste failide kataloog on muudetud.\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- ED2K võrk on lubatud.\n"
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Mõlemad, nii eD2k kui ka Kad võrgud on mitteaktiivsed.\n"
+"Sa ei saa ühenduda enne, kui vähemalt üks neist on aktiivne."
+
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad ei saa käivitada kuni UDP port on väljalülitatud.\n"
+"Lülita UDP port sisse, või Kad välja."
+
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Sa PEAD aMule nüüd taaskäivitama.\n"
+"Kui sa seda ei tee siis ära tänita kui midagi paha juhtub.\n"
+
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Serverite automaatse värskendamise loetelu on tühi.\n"
+"Palun sisesta vähemalt üks server.met faili asukoha kehtiv URL.\n"
+"URL sisestamiseks kliki nupule 'Loend'."
+
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Ajutised failid"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Saabuvad failid"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Online Allkirjad"
 
-#: src/MuleTrayIcon.cpp:416
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+msgid "Choose a folder for %s"
+msgstr "Vali %s kataloog"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Otsi filmi taasesitamise programmi"
+
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Vali lehitseja (browser)"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "TCP port: %d"
-msgstr "TCP port: %d"
+msgid "Executable%s"
+msgstr "Käivitusprogramm%s"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "TCP port: Pole valmis"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Muuda serverite nimekirja"
+
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Lisa siia server.met faili(de) laadimise URL.\n"
+"Üks URL rea kohta."
 
-#: src/MuleTrayIcon.cpp:436
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
 #, c-format
-msgid "UDP port: %d"
-msgstr "UDP port: %d"
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Värskenduse viide: %d sekundit"
+msgstr[1] "Värskenduse viide: %d sekundit"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "UDP port: Pole valmis"
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Keskmiste graafiku aeg: %d minutit"
+msgstr[1] "Keskmiste graafiku aeg: %d  minutit"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Online Allkiri: Lubatud"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Ühenduse graafiku skaala: %d"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Online Allkiri: Keelatud"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Failipuhvri suurus: %d baiti"
+msgstr[1] "Failipuhvri suurus: %d baiti"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Shared files: %d"
-msgstr "Jagatud failid: %d"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Saatmise Saba suurus: %d klienti"
+msgstr[1] "Saatmise Saba suurus: %d klienti"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "Queued clients: %d"
-msgstr "Kliente sabas: %d"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Serveri ühenduse värskendamise intervall: %d minutit"
+msgstr[1] "Serveri ühenduse värskendamise intervall: %d minutit"
+
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Serveri ühenduse värskendamise intervall: Ei kasuta"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "keelatud"
+
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "Total DL: %s"
-msgstr "Kokku AL: %s"
+msgid "Execute command on '%s' event"
+msgstr "Käivita käsk peale '%s' sündmust"
+
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Luba käskude käivitamine tuumas"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Tuumkäsk:"
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Luba käskude käivitamine GUI's"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "GUI Käsk:"
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Järgnevad muutujad asendatakse:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr "Min suurus peab olema väiksem kui max suurus. Ignoreerin Max suurust."
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Otsingu hoiatus"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Peamine"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad otsing pole võimalik kui Kad ei tööta"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "eD2k otsing pole võimalik kui eD2k pole ühendatud"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Ootamatu viga proovides Kad otsingut: "
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "FailiID"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Fail"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Tõmba kataloogi"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Lisa selle faili alternatiivsed URL'id"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Otsi seotud faile (eD2k, kohalik server)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Märgi fail tuntuks"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Kopeeri eD2k link lõikepuhvrisse"
+
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Loobutud"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Uus"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Kõigi näidatud hämatud serveritega ühenduse loomine ebaõnnestus. Lähen uuele "
+"katsele, seekord ilma hämamiseta."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Serveritega ühenduse loomine ebaõnnestus. Lähen uuele katsele."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "eD2k on seadetes väljalülitatud, ei ühendu"
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "Serverite loetelus pole ühendumiseks sobivat kehtivat serverit"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "Kokku ÜL: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Ühendus %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Saatmise limiit"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Ühendus loodud: %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Tõmbamise limiit"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr "Fataalne viga ühendumisel. Kontrolli ühendust."
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Peida aMule"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Kaotasin ühenduse %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Näita aMule"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) on vist surnud."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "VestlusSeanss Alustatud: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) on vist täis."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Ühenduses Kliendiga ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Proovin %d sekundi pärast serveriga uuesti automaatselt ühenduda."
+msgstr[1] "Proovin %d sekundi pärast uuesti serveriga automaatselt ühenduda."
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Ühendun Kliendiga ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Ühendus kadunud."
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Kliendiga ühendumine ebaõnnestus / Ühendus kadunud ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Ühendumine %s (%s:%i) ebaõnnestus."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Sulge leht"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "VIGA: Vigane socket aegumise kontrollil"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Sulge kõik lehed"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Serveriga '%s (%s:%i)' ühendumise katsed aegusid."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Sulge teised lehed"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Saabus DNS päringu hilinenud vastus, ignoreerin."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Laen server.met faili: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Server.met faili ei leitud."
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "server.met faili '%s' laadimine ebaõnnestus, arusaamatu formaat sattus ette."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Ei saanud avada server.met faili!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Server.met fail on riknenud, leidsin vigase versiooni sildi: 0x%x, suurus %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "Failis server.met on %i serverit"
 msgstr[1] "Failis server.met on %i serverit"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d server lisatud"
 msgstr[1] "%d server(it) lisatud"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "IO viga %s faili lugemisel: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Serverit ei lisatud: [%s:%d] ei määra kehtivat porti."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Serverit ei lisatud: [%s:%d] IP aadress on filtris või vigane."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr "Serverit ei lisatud: Sama server IP:Port [%s:%d] on juba loetelus."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Lisati server: Server [%s:%d] kasutab nime *%s*."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6834,25 +5411,25 @@
 "Sa oled serveriga, mida soovid kustutada, ühenduses. Palun katkesta ühendus. "
 "Serverit ei kustutatud."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Ei suuda avada '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Ei saanud salvestada server.met faili!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Vigane URL"
 
-#: src/ServerList.cpp:805
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Finished to download the server list from %s"
+msgid "Finished downloading the server list from %s"
 msgstr "Serverite nimekirja tõmbamine aadressilt %s lõpetatud"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Serverite nimekirja tõmbamine aadressilt %s ebaõnnestus"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6861,334 +5438,2240 @@
 "kehtiv serveri nimekirja asukoha aadress sellesse faili, vastasel juhul "
 "nimekirja automaatset värskendamist ei toimu."
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Tõmba serverite nimekiri aadressilt %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "HOIATUS: vigane URL on määratud serverinimekirja automaatseks "
 "värskendamiseks: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 "addresses.dat failis pole kehtivat server.met faili automaatse tõmbamise "
 "URL'i"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Serverite nimekirja tõmbamine aadressilt %s ebaõnnestus"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr ""
 "Kohalik server on IPFiltri poolt väljafiltreeritud, ühendud teise serveriga!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Käsu '%s' käivitamine '%s' sündmuse puhul ebaõnnestus"
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Serveri nimi"
 
-#: src/amule.cpp:703
-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/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Aadress"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Port"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Kirjeldus"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Kasutajad"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Staatiline"
 
-#: src/amule.cpp:786
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versioon"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Serverite nimekirjas pole ühtegi serverit.\n"
-"Kas aMule võiks uue nimekirja tõmmata?"
+"Sa oled ühenduses selle serveriga mida soovid kustutada. Palun katkesta "
+"ühendus. Serverit ei kustutatud."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Serverite nimekiri tõmmatud"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Tundmatu nimi)"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "web server running on pid %d"
-msgstr "web server töötab protsessi id'ga %d"
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Oled kindel et tahad kustutada staatilise serveri %s"
 
-#: src/amule.cpp:850
-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 ""
-"Soovisid et web server käivitataks käivitumisel, kuid amuleweb programm pole "
-"võimeline käivituma. Palun paigalada versioon mis sisaldab aMule web "
-"serverit või kompileeri aMule kasutades võtit --enable-webserver ja seejärel "
-"make install"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Servereid (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Server"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Ühendu serveriga"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Märgi server staatilisena"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Märgi server mittestaatilisena"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Märgi serverid staatilisena"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Märgi serverid mittestaatilisena"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Eemalda server"
 
-#: src/amule.cpp:937
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Eemalda serverid"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Eemalda kõik serverid"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopeeri eD2k lingid lõikepuhvrisse"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Taasühendu serveriga"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Oled kindel et tahad kõik serverid kustutada?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Oled kindel et tahad valitud serveri kustutada?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Oled kindel et tahad valitud serverid kustutada?"
+
+#: src/ServerSocket.cpp:259
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Ei suuda siduda porti määratud aadressiga: %s"
+msgid "ERROR: %s (%s) - %s"
+msgstr "VIGA: %s (%s) - %s"
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:274
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Port %u ei ole kasutatav. Sa saad LOWID\n"
+msgid "WARNING: %s (%s) - %s"
+msgstr "HOIATUS: %s (%s) - %s"
 
-#: src/amule.cpp:970
+#: src/ServerSocket.cpp:413
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
-msgstr ""
-"Port %u ei ole kasutatav. !!\n"
-"\n"
-"Sa saad kasutada kui LOWID kasutaja.\n"
-"Kasuta netstat programmi kontrollimaks kuna port vabaneb\n"
-"ja proovi amule uuesti käivitada."
+msgid "New clientid is %u"
+msgstr "Uus kliendi ID %u"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Ei suutnud luua OnlineSig Faili"
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "HOIATUS: Said omale Low-ID!"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Ei suutnud luua aMule OnlineSig Faili"
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tTõenäolisem põhjus on sinu asumine tulemüüri või ruuteri 'taga'."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tTäpsemat informatsiooni leiad http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Saabus tundmatu serveriinfo! - liiga lühike"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Sain %d uut serverit"
+msgstr[1] "Sain %d uut serveri nime"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Serverite loetelu salvestamine lõpetatud."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Server lükkas viimase korralduse tagasi"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Tüngapakett saabus serverist: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Defineerimatu viga serverist %s saabunud paketi töötlemisel"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Ei suuda luua DNS lõime serveriga %s ühendumiseks"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "Server IP %s (%s) on filtris. Ei ühenda."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "kasutan protokolli hämamist"
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Ühendun %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Ei suuda masina %s dns nime lahendada: Ei saa ühenduda!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Serverit ei lisatud: IP aadressi või masinanime pole defineeritud."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Serverit ei lisatud: Defineerisid vigase pordi."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "eD2k Olek:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kademlia Olek:"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "Jookseb LAN olekus"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Töötab"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Olek:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Ühenduse olek:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Tulemüüriga - ava oma ruuteris või tulemüüris TCP%d port"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "UDP ühenduse olek:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Tulemüüriga - ava oma ruuteris või tulemüüris UDP %d port"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Olek tulemüüriga: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Semu pole tarvis - TCP port on avatud"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Semu pole tarvis - UDP port on avatud"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Semu puudub"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Ühendun semuga"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Ühendus semuga %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Indekseeritud allikaid:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Indekseeritud märksõnu:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Indekseeritud märkmeid:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Indekseeritud laadimisi:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Keskmiselt kasutajaid:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Keskmiselt faile:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Ei tööta"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Lisan faili '%s' jagatute hulka"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Leitud %i tuntud ja jagatud faili"
+msgstr[1] "Leitud %i tuntud ja jagatud faili."
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Leitud %i tuntud ja jagatud faili, %i tundmatut"
+msgstr[1] "Leitud %i tuntud ja jagatud faili, %i tundmatut."
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "VIGA: Katse jagada %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Jagatud kataloogi ei leitud, jätan vahele: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Kataloogis '%s' pole jagatavaid faile"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Kasutaja nimi"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Tõmbamise kiirus"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Saatmise kiirus"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Saadaval osi"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Saatmise olek"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Tõmbamise olek"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Allikas"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Kohalik faili nimi"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Jagatud failid"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Päringuid"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Aktsepteeritud päringuid"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Siiratud andmed"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Jagamise suhe"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Saadud osi"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Täielikke allikaid"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Kataloogi asukoht"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Lisa Kommentaar/Hinnang"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Muuda Kommentaari/Hinnangut"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Nimeta ümber"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Lisa failid ülekantavate failide loetellu"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Kopeeri magnet &URI lõikepuhvrisse"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Kopeeri eD2k link lõikepuhvrisse (Allika&s)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Kopeeri eD2k link lõikepuhvrisse (Allikas)(&Koos Krüpto seadetega)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Kopeeri eD2k link lõikepuhvrisse (&Hostinimi)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr "Kopeeri eD2k link lõikepuhvrisse (Hostinimi)(Koos &Krüpto seadetega)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Kopeeri eD2k link lõikepuhvrisse (&AICH info)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Allika lingi loomiseks pead omama HighID'd."
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Jagatud failid (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[FailiOsa]"
+
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Kaugfaili nimi"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Saadetud andmeid (Seansil (Kokku)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Raisatud Kokku (pakette): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Raisatud faili päringuid (pakette): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Raisatud allikavahetusi (pakette): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Raisatud Servereid (pakette): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Raisatud Kad (pakette): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Krüpteerimise ulatus (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Aktiivsed saatmised: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Ootel saatmised: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Kokku õnnestunud saatmisi: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Kokku ebaõnnestunud saatmisi: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Keskmine saatmise aeg: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Tõmmatud Andmed (Seansil (Kokku)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Leitud allikaid: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Aktiivsed tõmbamised (tükid): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Seanss ÜL:AL suhe (Kokku): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Keskmine tõmbamise kiirus (Sessioon): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Keskmine saatmise kiirus (Sessioon): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Maksimaalne tõmbamise kiirus (Sessioon): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Maksimaalne saatmise kiirus (Sessioon): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Ühenduse taastumised: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Aeg alates esimesest saatmisest: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Ühendatud serveriga alates: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Aktiivseid ühendusi (hinnang): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Saavutati maksimaalne arv ühendusi: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Keskmiselt ühendusi (hinnang): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Suurim ühenduste arv (hinnang): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Kliendid"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Tundmatu: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Filtreeritud: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Blokeeritud: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Kokku: %i Tuntuid: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Töötavad serverid: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Ebaõnnestunud serverid: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Kokku: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Kustutatud serverid: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Filtreeritud serverid: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Kasutajaid töötavail servereil: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Faile töötavail servereil: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Kokku kasutajaid: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Kokku faile: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Serveri hõivatus: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Jagatud failide arv: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Jagatud failide suurus kokku: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Keskmine faili suurus: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Operatsioonisüsteem"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Pole vastu võetud"
 
-#: src/amule.cpp:1299
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktiivseid ühendusi (l:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Info puudub"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Mitte kunagi"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Käsk '%s' protsessi'id '%d' lõpetas staatusega '%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Käivita <str> ja välju."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Vigane IP formaat. Kasuta xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Tundub et valitud keelelokaat pole sinu karpi installeritud. (Märkus: Ma "
-"proovin seda seada sellest hoolimata)"
+"See käsk vajab muutujat. Sobivad muutujad on: 'all', failinimi või number.\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Töötlen räsi järgi: "
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Töötlen failinime järgi: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr "See käsk vajab argumenti. Sobivad argumendid on: faili räasi.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Pole korrektne number\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Pole kehtiv kontrollsumma (pikkus peab olema täpselt 32 märki)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Päring ebaõnnestus tundmatu vea tõttu."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Operatsioon oli edukas."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "See on aMule %s käivitamise esimene kord"
+msgid "Request failed with the following error: %s"
+msgstr "Päring ebaõnnestus järgneval põhjusel: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "See on testversioon, mida igapäevaselt uuendatakse ja\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Klientide IP-Filter on %s.\n"
 
-#: src/amule.cpp:1311
-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"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "Väljas"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr ""
-"ega tapa sinu koera. Sellest hoolimata peaks see olema *turvaline* "
-"kasutada.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "Sees"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Serverite IP-Filter on %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Kehtiv IPFilter Tase on %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Ribalaiuse piirangud: Üles :%u kB/s, Alla: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Ühendatud %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Ühendun"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "tulemüüriga"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"Selles versioonis on turvalisusest johtuvalt muudetud järgmisi seadeid:\n"
+"\n"
+"Tõmbamine:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Lisatud on Protokolli Hämamise tugi sisenevatele ja väljuvatele "
-"ühendustele.\n"
+"Saatmine:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Eemaldatud on serverite nimekirja värskendmine teistest serveritest ja "
-"klientidest.\n"
+"Kliente järjekorras:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"See muudatuse põhjustest leiad lisainfot aMule wiki'st, otsides \n"
-"aadressilt http://wiki.amule.org märksõna \"fake servers\" järgi\n"
-"On oluline et aMule ei kasutaks võltsservereid, vastasel juhul ei pruugi\n"
-"aMule korralikult toimida."
+"Kokku allikaid:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Otsingu tulemusi: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Otsing : %u %% \n"
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Otsingu edenemist ei saa näidata"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Serverilt saabus tundmatu vastus, OpCode = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Näitab lühikest oleku ja statistika infot."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Näita ühenduse olekut, kehtivat saatmise/tõmbamise kiirust jne.\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Näitab täieliku statistika puud."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
 msgstr ""
+"Sellele käsule võib argumendiks lisada numbri vahemikus 0 kuni 255, mis "
+"näitab\n"
+"mitu klienditarkvara erinevat versiooni statistika puu harudes näidata. "
+"Omistades\n"
+"väärtuseks 0, tähendab see 'piiramatult'.\n"
 "\n"
+"Näiteks: 'statistics 5' näitab ainult 5 enamesinenud versiooni iga kliendi "
+"tüübi kohta.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Seiska aMule"
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Seiska eemalasuv töötav tuum (amule/amuled).\n"
+"Seiskab ka tekstikliendi, kuna see on kasutu ilma töötava tuumata.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Määratud objekt taaslaadimine."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Jagatud failide loetelu taaslaadimine."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "IP Filteri taaslaadimine."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Lae preagune IP filtreerimise tabel uuesti."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "Uuenda IP filtrit URL'ist."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "Kui URL puudub siis kasutatakseseadetes määratud URL'i."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Ühendu võrguga"
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Ühendab kõigi seadetes määratud võrkudega.\n"
+"Võid lisaks määrata serveri aadressi moel IP:Port, et ühenduda ainult selle\n"
+"serveriga. IP peab olema IPv4 vastav aadress või DNS lahenduv nimi."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Ühendu ainult eD2k võrku."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Ühendu ainult Kad võrku."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Lahku võrgust."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Lõpetad ühenduse kõigi, hetkel ühenduses olevate võrkudega.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Lõpeta ühendus ainult eD2k võrguga."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Lõpeta ühendus ainult Kad võrguga."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Lisa tuumale eD2k või magnet link."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
-"Lisaks sellele taastati ka lehitseja vaikeväärtused. Palun määra vajadusel "
-"lehitsejale uued väärtused.\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"Lisatav eD2k link saab olla:\n"
+"*) link failile (ed2k://|file|...), lisatakse tõmbamise järjekorda,\n"
+"*) link serverile (ed2k://|server|...), lisatakse serverite loetellu,\n"
+"*) või link serverite loetelule, sellisel juhul lisatakse kõik loetelus "
+"olevad\n"
+"   serverid serverite nimekirja.\n"
+"Magnet link peab sisaldama eD2k kontrollsummat ja faili pikkust.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Määra seade väärtus."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "Määra IP filtri seaded."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Lülita serverite ja klientide IP filtreerimine sisse."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Lülita serverite ja klientide IP filtreerimine välja."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Rakenda/ära rakenda klientide IP Filtreerimist."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Lülita klientide IP-filtreerimine sisse."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Lülita klientide IP-filtreerimine välja."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Rakenda/ära rakenda serverite IP Filtreerimist."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Lülita serverite IP-filtreerimine sisse."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Lülita serverite IP-filtreerimine välja."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Vali IP Filtreerimise tase."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Rohkem informatsiooni, tuge ja uusi programmi versioone leiad meie "
-"kodulehelt,\n"
+"Võimalikud filtreerimise tasemed on vahemikus 0 kuni 255, vaikeväärtus on "
+"127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Määra ribalaiuse piirang."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
-"aadressil www.aMule.org või meie IRC kanalis #aMule aadressil irc.freenode."
-"net.\n"
+"Väärtus, mis nendele käskudele antakse, peab olema kilobaiti/sekundis.\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Määra saatmise ribalaiuse piirang."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Määra tõmbamise ribalaiuse piirang."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Hangi ja näita atribuudi väärtus."
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "Hangi IP filtri seaded."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Hangi IP filtri olek nii klientide kui ka serverite kohta."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Hangi IP filtri olek ainult klientide kohta."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Hangi IP filtri olek ainult serverite kohta."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "Vali IP filtreerimise tase."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Kehtiv Ribalaiuse piirang"
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Käivita otsing."
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"Tunne ennast vabalt suvaliste vigade leidmisest teavitamisel aadressil "
-"http://forum.amule.org"
+"ASelletüübilise otsingu jaoks peab määrama otsingu tüübi:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Näide: 'search kad fail' otsib \"fail\" kad võrgust.\n"
+
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Käivita globaalne otsing."
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Käivita lokaalne otsing."
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Käivita otsing kad võrgust."
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Näita viimase otsingu tulemusi."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Tagasta eelmise otsingu tulemuse.\n"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Näita otsingu edenemist."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Näita otsingu edenemist.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Alusta faili tõmbamist"
+
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"Online Allkirja kataloog on VIGANE!\n"
-" Online Allkirja ei kasutata, kuni parandad vea seadetes."
+"Pead andma eelmise/viimase otsingu faili numbri.\n"
+"Näiteks 'download 12' alustab eelmise otsingu 12'nda faili tõmbamist.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Peata tõmbamine."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Jätka tõmbamist."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Katkesta tõmbamine."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Määra tõmbamise prioriteet."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Määra tõmbamise prioriteet Low, Normal, High või Auto.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Määra madal prioriteet."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Määra normaalne prioriteet."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Määra kõrge prioriteet."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Määra automaatne prioriteet."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Näita järjekorda/nimekirja."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Näita saatmise/tõmbamise järjekorda, serveri jagatud failide loetelu.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Näita saatmise saba."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Näita tõmbamise järjekorda."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Näita logi."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Näita serverite nimekirja."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Tühjenda logi."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Kettaruumi eraldamine faili '%s' jaoks ebaõnnestus: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Aegnud käsk, kasuta selle asemel '%s'."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "VIGA: Ei suutnud avada logifaili"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"See on vananenud/aegunud käsk ja võidakse tulevikus eemaldada.\n"
+"Selle asemel kasuta '%s'.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "HOIATUS: logifail on tühi, miskit on kapitaalselt viltu."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMule tekstiline klient"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Log on nullitud"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Konverteerin vanad '%s' AICH kontrollsummad 64b '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Serveri teade: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "HOIATUS: Fail ninega '%s' on vigane ja nimetatati ringi '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Ebaõnnestus sõlmede nimekirja tõmbamine."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"HOIATUS: Sama nimega fail '%s' on olemas, uus fail nimetatati ringi '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Ebaõnnestus tõmmatud versiooni kotrollfaili avamine"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Oled kindel et tahad katkestada ja kustutada kõik selle kategooria failid?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Versiooni kontrollfail on korrumpeerunud"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Ootan kinnitust"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Kasutad aegunud aMule versiooni!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
+
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Liiga palju ühendusi"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "kõik teised"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Vali vaate filter"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Lisa kategooria"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Muuda kategooria"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Eemalda kategooria"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Sinu aMule versioon on %i.%i.%i ja uusim versioon on %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Faili '%s' avamine ebaõnnestus, eemaldan jagatud failide nimekirjast."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Uuema aMule versiooni saad alati aadressilt http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Tundmatu faili '%s' jaoks küsiti kontrollsummat."
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "HOAITUS: Sinu aMuled versioon on vananenud: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Taastan faili '%s' saatmise"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Sinu aMule koopia on ajakohane."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Peatan faili '%s' saatmise"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Versiooni kontrollfaili tõmbamine ebaõnnestus"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Käsu '%s' käivitamine '%s' sündmuse puhul ebaõnnestus"
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Tõmbamine lõpetatud"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Faili asukoht koos täieliku rajaga."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Faili nimi ilma raja osata."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "Faili eD2k räsi."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Faili suurus baitides."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Kumuleeruv tõmbamise aeg."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Uus vestlussession alustatud"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Teate saatja."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Pole enam ruumi"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Ketta partitsioon."
 
-#: src/amule.cpp:2025
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Viga lõpetamisel"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Kasutajaid: %s | Faile: %s"
+msgid "Processing file number %u: %s"
+msgstr "Töötlen faili number %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr ""
+"Soovisid osade kontrollsummasid (Kasutatakse ainult failidel mis on > 9.5 MB)"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Kasutajaid: E: %s K: %s | Faile E: %s K: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Faili pole olemas !\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Ühtegi võrku pole valitud"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, aMule eD2k lingilooja"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Ohoo, rõõm sind näha!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Sisendparameetrid"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Räsitav fail"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Lisa selle faili alternatiivsed URL'id"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Sisesta siia fail, millele soovid luua eD2k linki"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Sisesta siia see URL mida soovid eD2k lingile lisada: Lisa / lõppu, et "
+"aLinkCreator lisaks sellele faili nime"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Eemalda"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Loo link osa-kontrollsummadega"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Aita suurenenud lingi hinnaga uusi ja haruldasi faile kiiremini levitada."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4 Faili kontrollsumma"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k Faili kontrollsumma"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k link"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Salvesta"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Kopeeri lõikepuhvrisse"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Ava"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Ava fail tema eD2k lingi loomiseks"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Kopeeri arvutatud eD2k link lõikepuhvrisse"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Salvesta kui"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Salvesta arvutatud eD2k link faili"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "aLinkCreator'ist"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Vali fail, mille eD2k linki soovid arvutada"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Ei suuda lõikepuhvrit avada"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Praeguseks hetkeks pole midagi kopeerida !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Vali fail mille eD2k lingi arvutasid"
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Ei suuda avada "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Palun sisesta mittetühi faili nimi"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Pole midagi praeguseks hetkeks salvestada !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, aMule eD2k lingilooja\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pildid pärinevad http://www.everaldo.com ja http://www.icomania.com\n"
+"ja http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Jaotatakse GPL litsentsi järgselt"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Räsin..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator toimib sinu jaoks"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Arvutan MD4 räsi..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Arvutan eD2k räsi..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Tühistatud !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Ühendatud %s %s"
+msgid "Done in %.2f s"
+msgstr "Tehtud %.2f sekundiga"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Oled juba selle URL lisanud !"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Palun sisesta mittetühi URL"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "Ühendun %s"
+msgid "Unable to open %s"
+msgstr "Ei suuda %s avada"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "eD2k ühendus katkestatud."
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i päev(a) %i tundi %i min %i s"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad käivitatud."
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uP %02ut %02umin %02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad peatatud."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02ut %02umin %02us"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Ühendus Kad võrk (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Ühendus Kad võrku (tulemüüriga)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Ühendus Kad võrguga katkestatud"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, aMule Online Statistika"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Suurim Tõmbamine alates wxCas käivitamisest"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Absoluutselt suurim Tõmbamine wxCas eelmistest käivitamistest"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Süsteem"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Peata Automaatne Värskendus"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Salvesta Ühenduse Statistiline pilt"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Trüki Ühenduse Statistiline pilt"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Seaded"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "wxCas Info"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Käivita automaatne värskendamine"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Automaatne värskendamine on peatatud"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Automaatne värskendamine on käivitatud"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Salvesta Statistika"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMule Online Statistika"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Kad võrku ei saa kasutada kui seadetes on UDP port väljalülitatud, ei ühendu."
+"Tekkis viga printimisel.\n"
+"Võibolla pole su printer korralikult seadistatud?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kad on seadetes väljalülitatud, ei ühenda."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Trükin"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Sõprade faili 'emfriends.met' avamine lugemiseks ebaõnnestus!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, aMule OnLine Allkirja Statistikal\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Baseerub Pedro de Oliveira <falso@rdk.homeip.net> CAS\n"
+"\n"
+"Jaotatakse GPL litsentsi järgselt"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Sõprade faili 'emfriends.met' avamine kirjutamiseks ebaõnnestus!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh Oh, aMule ei tööta ..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule töötab"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule töötab aga ühendus on katkestatud"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule ühendub..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh Oh, aMule olek on teadmata..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " on toimetanud juba "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " on seiskunud !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " pole ühendatud !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " ühendub..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " teeb midagi imelikku, kontrolli !!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " on ühendatud  "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "väljas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " baseerub "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " koos "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Kokku Tõmbamisi: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Saatmine: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Seansil Tõmmatud: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Tõmbamine: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Saatmine: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Jagamine: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " faili, Klienti järjekorras: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Kellaaeg: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " on "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Süsteemi koormuse keskmised (1-5-15 min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Süsteem on elus juba: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "amulesig.dat fail asukoht"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Siia sisesta kataloog kus asub sinu amulesig.dat fail"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Värskendamise intervall sekundites"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Genereeri igal värskendamisel staatiline pilt"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Kataloog, kuhu soovid salvestada genereeritud staatilised pildid"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Saada perioodiliselt oma stat fail FTP serverisse"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP Url"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP asukoht"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Sisesta siia oma FTP serveri URL"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "Sisesta siia FTP serveri kataloog kuhu paigutada staatilised pildid"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Kasutaja"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Sinu kasutajanimi FTP serverisse logimiseks"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Sinu parool FTP serverisse logimiseks"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "FTP värskendamise intervall minutites"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Kinnita/kontrolli"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Sinu allkirjafaili asukoha kataloog"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Genereeritud statistiliste piltide kataloog"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Laeb malli <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "WEB serveri HTTP port"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Kasuta UPnP pordisuunamist webserveri portide suunamiseks"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP port"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Kasuta gzip pakkimist"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Webserveri täieliku ligipääsu parool"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Webserveri külalise (guest) parool"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Luba külalise (guest) ligipääs"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Keela külalise (guest) ligipääs"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Lae/salvesta webserveri parameetrid eemal-asuvast/asuvasse aMule"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMule seadetefaili asukoht. ÄRA KASUTA OTSE!!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Ära kasuta PHP interpretaatorit (aegunud)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Loo PHP lehed iga päringu puhul uuesti"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule WebServer"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "web kliendi ühenus lubatud\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "VIGA: ei luba web kliendil ühenduda\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Päring ebaõnnestus, põhjus: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Indeksfaili ei leidnud: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Seanss on aegunud - vajalik uuestilogimine\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Seanss ok, sisselogitud\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Seanss ok, pole sisselogitud\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Pole avatud seanssi - nõuan logimist\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Seanss loodud - nõuan logimist\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Töötlen päringut [algupärane]:"
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Ilma paroolita logimine pole lubatud."
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Kontrollin parooli\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Parooli kontrollsumma vigane\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Parool ok\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Parool, paha\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Sa ei sisestanud parooli. Tühja prooli kasutamine pole lubatud.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Nõuti väljalogimist\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Töötlen päringut [ümbersuunatud]: "
+
+#~ msgid "Romanian"
+#~ msgstr "Rumeenia"
+
+#~ msgid "Download status"
+#~ msgstr "Tõmbamise olek"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Värskenduse viide: %d sekundit"
+#~ msgstr[1] "Värskenduse viide: %d sekundit"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr "Võrguversioonis pole kommmentaarid ja hinnangud veel toetatud"
+
+#~ msgid "Transferring"
+#~ msgstr "Saadan"
+
+#~ msgid "QR: ???"
+#~ msgstr "JK: ???"
+
+#~ msgid "QR: %u"
+#~ msgstr "JK: %u"
+
+#~ msgid "Only files currently uploading"
+#~ msgstr "Ainult failid käimasolevast saatmisest"
+
+#~ msgid "Queue Rank"
+#~ msgstr "Järjekorras"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - näita otsingu edenemist"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Alustan faili '%s' MD4 ja AICH kontrollsumma loomist"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Alustan faili '%s' MD4 kontrollsumma loomist"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Alustan faili '%s' AICH kontrollsumma loomist"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "HOIATUS: peale varukoopia tegemist ei suuda '%s' originaali eemaldada"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "HOIATUS: Ei suutnud %s kustutada"
+
+#~ msgid "%u"
+#~ msgstr "%u"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (JK: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Reiting (kokku):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Proovi saatmisel siirata täielikud tükid"
+
+#~ msgid "Networks window"
+#~ msgstr "Võrgud"
+
+#~ msgid "Searches window"
+#~ msgstr "Otsingu aken"
+
+#~ msgid "Downloads window"
+#~ msgstr "Tõmbamised"
+
+#~ msgid "Shared files window"
+#~ msgstr "Jagatud failide aken"
+
+#~ msgid "Messages window"
+#~ msgstr "Teadete aken"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Statistiliste graafikute aken"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Seadete aken"
+
+#~ msgid "Transfers"
+#~ msgstr "Liiklus"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Failide siirdamise aken"
+
+#~ msgid "Unban"
+#~ msgstr "Lõpeta blokeering"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Näita Saatmisi"
+
+#~ msgid "Show Queue"
+#~ msgstr "Näita Järjekorda"
+
+#~ msgid "Select View"
+#~ msgstr "Vali Vaade"
+
+#~ msgid "Client Software"
+#~ msgstr "Kliendi Tarkvara"
+
+#~ msgid "Waited"
+#~ msgstr "Oodanud"
+
+#~ msgid "Upload Time"
+#~ msgstr "Saadetud"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Saatmine/Tõmbamine"
+
+#~ msgid "Remote Status"
+#~ msgstr "Staatus eemalt"
+
+#~ msgid "File Priority"
+#~ msgstr "Prioriteet"
+
+#~ msgid "Score"
+#~ msgstr "Skoor"
+
+#~ msgid "Asked"
+#~ msgstr "Küsitud"
+
+#~ msgid "Last Seen"
+#~ msgstr "Viimati nähtud"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Võetud järjekorda"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Saadetud"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Tõmmatud"
+
+#~ msgid "Userhash"
+#~ msgstr "Kasutaja kontrollsumma"
+
+#~ msgid "Encrypted"
+#~ msgstr "Krüpteeritud"
+
+#~ msgid ""
+#~ "Client capabilities: ZLIB: %s  UTF8 numbers: %s  Push notification: %s"
+#~ msgstr ""
+#~ "Kliendi võimalused : ZLIB: %s UTF8 numbrid: %s Tõukamise märgend: %s"
+
+#~ msgid "yes"
+#~ msgstr "jah"
+
+#~ msgid "no"
+#~ msgstr "ei"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "Laetud %d riigilipu pilti."
+
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Tööriistaribe ikoon on kadunud, proovin taastada ...."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Näita saatmisi/saba"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Kliente sabas :"
+
+#~ msgid "Current Session"
+#~ msgstr "Käimasolev seanss"
+
+#~ msgid "Total"
+#~ msgstr "Kokku"
+
+#~ msgid "Requested :"
+#~ msgstr "Küsitud :"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Loo eelvaateks koopia"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Failide siirdamise aken"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Kokku Kasutajaid: %s | Kokku Faile: %s"

aMule-2.2.6.tar.bz2/po/eu.po -> aMule-2.3.1.tar.bz2/po/eu.po Changed

@@ -1,1318 +1,1164 @@
-# translation of amule-eu.po to Euskara
-# Piarres Beobide <pi@beobide.net>, 2005, 2007, 2008.
+# translation of eu.po to Euskara
 # translation of source_strings-04-08-2005.po to
-# Copyright (C) 2005-2006, 2007, 2008Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
+# Piarres Beobide <pi@beobide.net>, 2005, 2007, 2008, 2010, 2011.
+# Administrator <pi@beobide.net>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: amule-eu\n"
+"Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2008-12-15 22:35+0100\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
+"PO-Revision-Date: 2011-11-04 23:17+0100\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
-"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
+"Language-Team: Euskara <librezale@librezale.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.1.0\n"
-"X-Poedit-Language: Basque\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Lokalize 1.2\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Zuria ez den pasahitz bat ezarri behar duzu."
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Gehitu laguna"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Pasahitz baliogabea, ez da MD5 egiaztapena!"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Baliozko IP helbide eta ataka sartu behar dituzu!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Konexioak huts egin du"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Argibideak"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "KK konexioak huts egin du. Erantzun hutsa."
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Emandako erabiltzaile egiaztapena ez da baliozkoa!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Kanpo konexioa: Sarrera honegatik ukatua: "
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Huts ED2KLinks fitxategia irekitzerakoan."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Kanpo konexioa: Sarrera ukatua"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"KONTUZ: Ezin duzu zure burua ezarri eD2k lotura batean Id baxua duzunean."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Kanpo konexioa: Erantzun okerra zerbitzaritik. Konexioa itxia."
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Orain, aplikazio nagusia ixten..."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Lortua! Amulera konexioa sortua "
+#: src/amule.cpp:258
+#, c-format
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "'%ld' pid-a duen amuleweb instantzia amaitzen ... "
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Lortua! Konexioa sortua."
+#: src/amule.cpp:261
+#, c-format
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "'%ld' pid-a duen amuleweb instantzia hiltzen ... "
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Aztertzen"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Huts egin du"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Osotzen"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule irteten: Muina ixten."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Amaitua"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "aMule itzaltzea osaturik."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Geraturik"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "aMule ixtearen memoria arazte irteera:"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Akatsduna"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+"\n"
+"EC konfigurazioa"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Deskargatzen"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Pasahitza ezarria eta kanpo konexioak gaiturik."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Zain"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "OHARRA"
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Fitxategiarentzat AICH eta MD4 egiaztapenak sortzen: %s"
+#: src/amule.cpp:495
+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/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Fitxategiarentzat MD4 egiaztapena sortzen: %s"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Argb"
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Fitxategiarentzat AICH egiaztapena sortzen: %s"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Ez duzu zerbitzaririk zerbitzari zerrendan.\n"
+"aMulek zerrenda berri bat orain deskargatzea nahi al duzu?"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "'%s'-ko AICH egiaztapen zaharra 64b-ekoa bihurtzen '%s'-en."
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Zerbitzari zerrenda deskargatu"
 
-#: src/ThreadTasks.cpp:429
+#: src/amule.cpp:654
 #, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr ""
-"Oharra: '%s' fitxategi izena baliogabea da eta'%s' bezala berrizendatuko da."
+msgid "web server running on pid %d"
+msgstr "web zerbitzaria abiarazirik %d pid-arekin"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+#: src/amule.cpp:658
+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 ""
-"Oharra: '%s' fitxategia badago dagoeneko eta'%s' bezala berrizendatuko da."
+"Abioan web-zerbitzaria exekutatzea eskatu duzu, baina amuleweb bitarra ezin "
+"da exekutatu. Mesedez instalatu amule web zerbitzaria duen paketea edo "
+"konpilatu ezazu amule --enable-webserver erabilian eta make install egin"
+
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "ERROREA"
 
-#: src/ThreadTasks.cpp:455
+#: src/amule.cpp:741
 #, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "KONTUZ: Ezin da jatorrizko '%s' ezabatu basbeskopia sortu ondoren"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Ezin da atakak ezarritako helbidean ireki: %s"
 
-#: src/ThreadTasks.cpp:467
+#: src/amule.cpp:768
 #, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "KONTUZ: Huts %s ezabatzerakoan"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "%u ataka ez dago eskuragarri. IDBaxua izango duzu\n"
 
-#: src/BaseClient.cpp:1307
+#: src/amule.cpp:774
 #, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Huts '%s' erabiltzailearen partekatutako fitxategiak jasotzerakoan"
-
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Ezezaguna"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"%u ataka ez dago eskuragarri!\n"
+"\n"
+"Honek IDBaxua izango duzula esna nahi du.\n"
+"\n"
+"Egiaztatu zure sarea ataka sarrera eta irteerarako irekirik dagoela "
+"ziurtatzeko."
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Gezurrezko eMule bertsioa %#x)"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Huts online sinadura fitxategia sortzerakoan"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Gezurrezko eMule)"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Huts aMule online sinadura fitxategia sortzerakoan"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Gezurrezko eMule)"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"Aukeratutako lokalak ez dirudi zure sisteman instalaturik. (Oharra: Hala ere "
+"erabiltzen saiatuko da)"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:1040
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (eMule v0.%u-tan oinarriturik)"
+msgid "This is the first time you run aMule %s"
+msgstr "aMule %s abiarazten duzun lehen aldia da"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Ezizena: %s ID-a: %u"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Bertsioa hau beta bertsio bat da, egunero eguneratzen da, eta\n"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Eskaerak: %s\n"
+#: src/amule.cpp:1043
+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/BaseClient.cpp:1964
-#, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Fitxategi estatistikak saio honentzat. Onarturik %d - eskakizun %d-etik, %s "
-"transferiturik\n"
-msgstr[1] ""
-"Fitxategi estatistikak saio honentzat. Onarturik %d - %d eskakizunetik, %s "
-"transferiturik\n"
+#: src/amule.cpp:1044
+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/BaseClient.cpp:1967
-#, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Fitxategi estatistikak saio guztientzat. Onarturik %d  eskakizun %d-etik, %s "
-"transferiturik\n"
-msgstr[1] ""
-"Fitxategi estatistikak saio guztientzat. Onarturik %d  %d eskakizunetik, %s "
-"transferiturik\n"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Argibide gehiago, laguntza eta bertsio berriak gure webgunean aurki "
+"ditzakezu,\n"
 
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Fitxategi ezezaguna eskaturik"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "www.aMule.org -en, edo irc.freenode.net IRC sareko #aMule kanalean.\n"
 
-#: src/BaseClient.cpp:2242
-#, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "%s bezeroa %s:%d IP:Atakan %s %s %s erabiliaz"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Edozein akatsen berri emateko:http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Erabiltzaile izena"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
+msgstr ""
+"Zuk aukeratutako sinadura karpeta BALIOGABEA da!\n"
+" Lehenespenak konpondu artean lineako sinadura EZGAITU egingo da."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Lagunak"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Zerbitzari ostalari-izena notifikatua"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Erakutsi &xehetasunak"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Disko aurresleipenak huts egin du '%s' fitxategiarentzat: %s"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Laguna gehitu"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "ERROREA: ezin da erregistro fitxategia ireki"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Ezabatu laguna"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "ABISUA: erregistro fitxategia hutsik dago. Zerbait oker dago."
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Bidali &mezua"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Erregistroa berrezarri egin da"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Ikusi fitxategiak"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "ZerbitzariMezua: %s"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Ezarri lagunen ataka"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "%s-ren deskarga baztertua, eskatutako fitxategia ez da berria eta."
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Ziur zaude hautatako laguna ezabatu nahi duzula?"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Huts egin du nodo zerrenda deskargatzerakoan."
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Ziur zaude hautatako lagunak ezabatu nahi dituzula?"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Huts egin du"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Utzi"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Hondaturiko bertsio arakatze fitxategia"
 
-#: src/FriendListCtrl.cpp:359
-msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
-msgstr ""
-"Ez duzu lagun-ataka bat baino gehiago ezartzeko baimenik.\n"
-" Ataka bat bakarrik dago sinaturik."
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Zaharkiturik dagoen aMule bertsio bat erabiltzen ari zara!"
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Aukera anitza"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Zure aMule bertsioa %i.%i.%i da eta azken bertsioa %li.%li.%li da"
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Deskarga osatua"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Azken bertsioa beti http://www.amule.org webgunean aurki daiteke"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Fitxategiaren bide osoa."
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "OHARRA: Zure aMuled bertsioa zaharkiturik dago: %i.%i.%i < %li.%li.%li"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Fitxategiaren izena biderik gabe."
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Zure aMule kopia zaharkiturik dago."
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "Fitxategiaren eD2k egiaztapena."
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Huts bertsio arakatze fitxategia deskargatzerakoan"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Fitxategi tamaina byteetan."
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Erab: %s | Fitx: %s"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Batutako deskarga aktibitate denbora."
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Erab: E: %s K: %s | Fitx: E: %s K: %s"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Elkarrizketa saio berria hasia"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Ez dago sarerik hautatuta"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Mezu bidaltzailea."
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "IDBaxuarekin"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Ez dago lekurik"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "IDAltuarekin"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Disko partizioa."
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "%s %s-ra konektaturik"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Errorea osatzean"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "%s-ra konektatzen"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Fitxategi izena"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "eD2k-tik deskonektatua"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Tamaina"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad abiarazirik."
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Mota"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad gelditurik."
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Lehentasuna"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Kad-era Konektatuta (ondo)"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "FitxategiID"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Kad-era Konektatuta (suebakirik)"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Eskaerak"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Kad-etik deskonektatua"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Onartutako eskaerak"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Kad sarea ezin da erabili hobespenetan UDP ataka ezgaiturik badago, ez da "
+"abiaraziko."
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Transferitutako datuak"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Kad sarea hobespenetan ezgaiturik, ez da konektatuko."
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Partekatze erlazioa"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"ERROREA: aMule deabrua ezin da erabili kanpo konexioak ezgaiturik badaude. "
+"Kanpo konexioak gaitzeko aMule arrunta erabili, amuled --ec-config aukeraz "
+"abiarazi edo ezarri \"AcceptExternalConnections\" gakoa 1 balioaz ~/.aMule/"
+"amule.conf fitxategian"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Eskuratutako zatiak"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"ERROREA: Pasahitz erabilgarri bat behar da kanpo konexioak onartzeko, eta "
+"aMule deabrua ezin da erabili kanpo konexiorik gabe. aMule deabrua "
+"abiarazteko \"ECPassword\" eremua dagokion balioarekin ezarri behar duzu ~/."
+"aMule/amule.conf fitxategian. Exekutatu amule --ec-config banderarekin "
+"pasahitza ezartzeko. Argibide gehiago http://wiki.amule.org gunean"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: Abioan - ordularia abiarazten"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: bigarren planoan lanean - ikusten gaituk"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Ezin da Pid fitxategia sortu"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Jatorri osoak"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "ERROREA: %s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Karpeta bidea"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Hau eMulen oinarrituriko aMule %s da."
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Partekatutako fitxategiak"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "%s-n abiarazirik"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Oso txikia"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Bisitatu http://www.amule.org gunea bertsio berriagorik eskuragarri dagoen "
+"jakiteko."
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Baxua"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ERRORE KONPONEZINA: Huts kronometroa sortzean"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normala"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "aMule urruneko kontrola "
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Altua"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Argazkia:"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Oso altua"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"'Plataforma-orotarako' p2p bezeroa eMulen oinarritua \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Bertsioa"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Webgunea: http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Auto"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Foroa: http://forum.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Iruzkina/Kalifikazioa gehitu"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Iruzkina/Kalifikazioa editatu"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Kontaktua: admin@amule.org (arazo administratiboak) \n"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Izena aldatu"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 aMule taldea \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Gehitu fitxategiak bildumara zerrenda bidaltzeko"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "aMuleren zati bat \n"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Kopiatu &URI magnetikoa arbelera"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Parez-pareko routing-a XOR metrikan oinarritua.\n"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Kopiatu eD2l &lotura arbelera"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Mezua"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Kopiatu eD2l lotura arbelera (&Jatorria)"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "aMule elkarrizketa suntsitua"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Kopiatu eD2l lotura arbelera (jatorria) (&Kriptografia aukerekin)"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Konektatzen"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Kopiatu eD2l lotura arbelera (&Ostalari-izena)"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Konektatzen"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr ""
-"Kopiatu eD2l lotura arbelera (Ostalari-izena) (&Kriptografia aukerekin)"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Deskonektatua"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Kopiatu eD2l lotura arbelera (&AICH info)"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Suebakirik"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Kopiatu berrelikadura arbelera"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Konektaturik"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-"Berrelikatu hemendik: %s (%s)\n"
-"\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Konektatzen"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "ID altua behar duzu baliozko jatorri lotura bat sortzeko"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Itzalia"
 
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "OHARRA"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Utzi"
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Partekatutako fitxategiak (%i)"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Geratu uneko konexio saiakerak"
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[ZatiFitxategia]"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Deskonektatu"
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Sar izen berri bat fitxategi honentzat:"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Deskonektatu konektatutako sareetatik"
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Fitxategia berrizendatu"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Konektatu"
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Fitxategiaren igoerak berriarazten: %s"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Konektatu gaituriko sareetara"
 
-#: src/UploadQueue.cpp:520
+#: src/amuleDlg.cpp:846
 #, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Fitxategiaren igoerak gelditzen: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMule testu bezeroa"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: bilaketa gako laburregia"
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Gora: %.1f(%.1f) | Behera: %.1f(%.1f)"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
+#: src/amuleDlg.cpp:848
 #, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Irakurri Kad kontaktu %u "
-msgstr[1] "Irakurri %u Kad kontaktu"
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Gora: %.1f | Behera: %.1f"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
+#: src/amuleDlg.cpp:874
 #, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Bakarrik Kad kontaktu %d erabilgarri, nodes.dat ez da idatziko"
-msgstr[1] "Bakarrik %d Kad kontaktu erabilgarri, nodes.dat ez da idatziko"
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Konektaturik)"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
+#: src/amuleDlg.cpp:876
 #, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Kad kontaktu %d idatzia"
-msgstr[1] "%d kad kontaktu idatziak"
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Ez konektaturik)"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ERROREA: Ezin da TCP ataka entzun."
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Benetan %s utzi egin nahi duzu?"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "web bezero konexioa onartua\n"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Irteera berrespena"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ERROREA: ezin da web bezero konexioa onartu\n"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Abiarazi komandoa: "
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- lehenetsia -"
 
-#: src/webserver/src/WebServer.cpp:374
+#: src/amuleDlg.cpp:1232
 #, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Eskakizunak errore honez huts egin du: %s."
+msgid "Skin directory '%s' does not exist"
+msgstr "Ez dago '%s' itxura direktorioa"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Eskakizunak errore ezezagun batez huts egin du."
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "ABISUA: Ezin da '%s' azal fitxategia irakurri"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Ez da index fitxategia aurkitu: "
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Sareak"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Saioa iraungirik - saio hasiera eskatzen\n"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Sare leihoa"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Saioa ondo, saioa hasirik\n"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Bilaketak"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Saioa ondo, saioa hasi gabe\n"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Bilaketa leihoa"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Ez dago saio irekirik - saio hasiera eskatuko da\n"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Deskargak"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Saioa sorturik - saio hasiera eskatzen\n"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Deskargak leihoa"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Eskakizuna prozesatzen [jatorrizkoa]: "
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Partekatutako fitxategiak"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Pasahitza egiaztatzen\n"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Partekatutako fitxategi leihoa"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Pasahitz egiaztapen baliogabea\n"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Mezuak"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Pasahitza ondo\n"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Mezu leihoa"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Pasahitza oker\n"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Estatistikak"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Ez duzu pasahitzik idatzi. Ez da pasahitz zuria onartzen.\n"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Estatistika grafiko leihoa"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Saio amaiera eskakizuna\n"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Hobespenak"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Eskakizuna prozesatzen [berbidalia]: "
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Hobespen ezarpen leihoa"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "<str> txantiloia kargatzen du"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Inportatu"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Web zerbitzariaren HTTP ataka"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Zati fitxategi inportazio tresna"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "UPnP erabili web zerbitzari atakaren berbidalketa egiteko"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Honi buruz"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP ataka"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Honi buruz/Laguntza"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Erabili gzip konpresioa"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "eD2k sarea"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Web zerbitzariko baimen guztidun sarrera pasahitza"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Kad sarea"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Web zerbitzariko baimen mugatudun sarrera pasahitza"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Sarerik ez"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Gaitu gonbidatu sarrera"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "aMule urruneko kontrola"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Gonbidatu sarrera ezgaitu"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Kargatu/gorde web zerbitzari ezarpenak urruneko aMuletik/aMulera"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Errore konponezina: Akats ordutegi nagusia sortzerakoan"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMule konfigurazio fitxategi bidea. EZ ERABILI ZUZENEAN!"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Urruneko amulera konektatu"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "PHP interpretea ezgaitu (zaharkiturik)"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Errore konponezina: Akats ilara ordutegia sortzerakoan"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Gertaera begizta batera joaten..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Konektatzen..."
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "PHP orrialdeak eskakizun bakoitzean birkonpilatu"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Konexioak huts egin du "
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule Web-a Zerbitzaria"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Urruneko interfaze KK gertaera kudeatzailea"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Itzaltzen"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Ez dago erabilgarri"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Konexioak huts egin du. Ezin da %s-ra konektatu:%d\n"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Inoiz ere ez"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Konexioa itxita - aMule itxi egin da ziurrenik."
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Deskargatzen..."
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Prest"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Guztiak"
 
-#: src/HTTPDownload.cpp:239
+#: src/amule-remote-gui.cpp:631
 #, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
+"Ezin da '%s' direktorioa sortu '%s' kategoriarentzat, '%s' direktorioa "
+"mantenduko da."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Hobespenak"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "amulesig.dat fitxategia duen karpeta"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Arakatu"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Idatzi zure amulesig.dat fitxategia dagoen karpeta izena"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Berritze aldia segundotan"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Sortu estatistika irudi bat berritze bakoitzean"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Idatzi hemen estatistika irudiak sortzea nahi duzun karpeta"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Igo aldiro zure estatistika irudia FTP zerbitzarira"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP Url-a"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Ezezaguna"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP Bidea"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Huts '%s' erabiltzailearen partekatutako fitxategiak jasotzerakoan"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Sar hemen zure FTP zerbitzariaren helbidea"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Laguna bilatzen id-baxu konexiorako"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
-"Idatzi hemen estatistika irudiak FTP zerbitzarian gordeko diren karpeta"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Gezurrezko eMule bertsioa %#x)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Erabiltzaile"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Gezurrezko eMule)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Pasahitza"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Gezurrezko eMule)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Idatzi hemen zure FTP zerbitzarian sartzeko erabiltzaile izena"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (eMule v0.%u-tan oinarriturik)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Idatzi hemen zure FTP zerbitzarian sartzeko pasahitza"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Ezizena: %s ID-a: %u"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "FTP igoera aldia minututan"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Eskaerak: %s\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Egiaztatu"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Fitxategi estatistikak saio honentzat. Onarturik %d - eskakizun %d-etik, %s "
+"transferiturik\n"
+msgstr[1] ""
+"Fitxategi estatistikak saio honentzat. Onarturik %d - %d eskakizunetik, %s "
+"transferiturik\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Zure sinadura fitxategia duen karpeta"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Fitxategi estatistikak saio guztientzat: Onarturik %d eskakizun %d-etik, %s "
+"transferiturik\n"
+msgstr[1] ""
+"Fitxategi estatistikak saio guztientzat: Onarturik %d %d eskakizunetik, %s "
+"transferiturik\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Estatistika irudiak sortuko diren karpeta"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Fitxategi ezezaguna eskaturik"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/BaseClient.cpp:2700
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i egun %i ordu %i min %i s"
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "'%s'-ren mezu bat iragazi da (IP:%s)"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, amule Estatistika"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "'%s'-ren mezu berria (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Ongietorria!"
+#: src/BaseClient.cpp:2899
+#, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr ""
+"%s (%u) erabiltzaileak ez dagoen %s direktorioaren partekatutako fitxategi "
+"zerrenda eskatu du -> Ukatua"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "Oharra: %s ezin da ireki."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Deskarga abiadura handiena wxCas abiarazirik dagoenetik"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+"Abisua: Utzitako fitxategi zerrenda hondaturik dago, buru baliogabeak ditu."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Guztizko gehienezko deskarga abiadura wxCas aurreko abiarazteetan"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "SI errorea %s fitxategia irakurtzean: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Garbitu"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Errorea %s fitxategia gordetzerakoan: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistema"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Idatzi kaptxa"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Auto Berritzea Gelditu"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Gorde estatistikak irudiak"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Kategoria berria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Inprimatu estatistika irudia"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Aukeratu karpeta bat deskargatutako fitxategientzat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Hobespen ezarpenak"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Kategoria izen bat ezarri behar duzu!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "WxCas-ri buruz"
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Kategoriarentzat bide bat ezarri behar duzu!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Auto Berritzea Abiarazi"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Huts kategoriarentzat sarrera karpeta sortzerakoan. Mesedez ezarri baliozko "
+"bide bat!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Auto Berritzea Geraturik"
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Berriketa saioa abiarazirik: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Auto Berritzea abiarazirik"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Bezerora konektaturik ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Gorde estatistika Irudia"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Bezerora konektatzen ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMule Estatistikak"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Huts bezerora konektatzerakoan / Konexio galdua ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/ChatSelector.cpp:335
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
 msgstr ""
-"Arazo bat dago Inprimatzerakoan.\n"
-"Agian zure inprimagailua ez dago behar bezala ezarririk?"
+"*** Kaptxa egiaztapena pasa duzu eta erabiltzaileak zure mezua jaso du. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Inprimatzen"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:414
+#: src/ChatSelector.cpp:336
 msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pedro de Oliveiraren <falso@rdk.homeip.net> CAS-en oinarriturik \n"
-"\n"
-"GPL lizentziapean banaturik"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, aMule ez dago abiarazirik..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule abiarazirik dago"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule abiarazirik dago, baina deskonektaturik"
+"*** Kaptxa egiaztapena huts egin du eta zure mezua baztertua izan da. Mezu "
+"berri bat bidaliaz kaptxa berri bat eskatu dezakezu. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule konektatzen ari da..."
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Elkarrizketa"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh Oh, aMule egoera ezezaguna da..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " noiz abiarazirik "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Itxi fitxa"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " gelditurik dago !"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Itxi fitxa guztiak"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " ez dago konektaturik !"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Itxi beste fitxak"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " konektatzen..."
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Gehitu lagun zerrendara"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " zerbait arraroa egiten ari da, araka ezazu !"
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Kreditu fitxategia kargaturik, bezero %u ezagutzen da"
+msgstr[1] "Kreditu fitxategia kargaturik, %u bezero ezagutzen dira"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " hona konektaturik dago: "
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - bezero %u-ren kredituak amaitu dira!"
+msgstr[1] " - %u bezeroren kredituak amaitu dira!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Ez da 'cryptkey.dat' fitxategia aurkitu, sortzen."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ondo"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Bezero xehetasunak"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "suebakirik"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "IDBaxua"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "deskonektaturik"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "IDAltua"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " hona konektaturik "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Gaitua"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " eta "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Onartua"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Deskargak Guztira: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Ez da onartzen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Igoerak: "
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Ezgaitua"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Saio Deskargak: "
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Konektaturik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Deskargak: "
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Deskonektatuta"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Igoerak: "
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Ez osorik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Partekatuak: "
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Tipo gaiztoa"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " fitxategi. Bezeroak ilaran: "
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Egiaztaturik: Ondo"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Denbora: "
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Ez dago erabilgarri"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " - "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Sistema karga batezbestekoak (1-5-15 min): "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Sistema noiztik abiarazirik: "
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr ""
+"%s (%u) erabiltzaileak zure partekatutako fitxategi zerrenda eskatu du -> "
+"Onartua"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uE %02uh %02umin %02us"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+"%s (%u) erabiltzaileak zure partekatutako fitxategi zerrenda eskatu du -> "
+"Ukatua"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"%s (%u) erabiltzaileak zure partekatutako direktorioen zerrenda eskatu du -> "
+"Onarturik"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+"%s (%u) erabiltzaileak zure partekatutako direktorioen zerrenda eskatu du -> "
+"Ukaturik"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "%02us"
-msgstr "%02us"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "IDAltua"
-
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "IDBaxua"
-
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Konektatu gabe"
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
+msgstr ""
+"%s (%u) erabiltzaileak '%s' direktorioaren partekatutako fitxategi zerrenda "
+"eskatu du -> Onartua"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
+#: src/ClientTCPSocket.cpp:933
 #, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr ""
+"%s (%u) erabiltzaileak '%s' direktorioaren partekatutako fitxategi zerrenda "
+"eskatu du -> Ukatua"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:952
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "User %s (%u) shares directory '%s'"
+msgstr "%s (%u) erabiltzailearen '%s' partekatutako direktorioa"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:967
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr ""
+"%s (%u) erabiltzailea eskatu gabeko partekatutako direktorioak bidali ditu."
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:982
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr ""
+"%s (%u) erabiltzaileak '%s' direktorioko partekatutako fitxategi zerrenda "
+"bidali du"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:989
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Ezeztaturik !"
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr ""
+"%s (%u) erabiltzaileak partekatutako fitxategi zerrenda bidaltzeaz bukatu du"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:994
 #, c-format
-msgid "Unable to open %s"
-msgstr "Ezin da %s ireki"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Sarrera parametroak"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Egiaztatzeko Fitxategia"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Gehitu Aukerako URL gehiago fitxategi honentzat"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Idatzi hemen eD2k lotura sortzea nahi duzun fitxategia"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
-"Idatzi hemen eD2k loturara gehitzea nahi duzun URLa: Gehitu / amaieran "
-"aLinkCreator-ek amaieran fitxategiaren izena gehitu dezan"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Gehitu"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Ezabatu"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Garbitu"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Zati egiaztapenekin lotura bat sortu"
+"%s (%u) erabiltzaileak eskatu gabeko partekatutako fitxategi zerrenda bidali "
+"du"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
-"Fitxategi berri eta arraroak zabaltzen laguntzen du, lotura tamaina "
-"handitzearen kostuarekin"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4 fitxategi egiaztapena"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k fitxategi egiaztapena"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k lotura"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Hasi"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Gorde"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Arbelara kopiatu"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Irten"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Ireki"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Ireki fitxategia bere eD2k lotura konputatzeko"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopiatu"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Kopiatu konputaturiko eD2k lotura arbelara"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Gorde honela"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Gorde konputaturiko eD2k lotura fitxategi batetan"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Honi buruz"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "ALinkCreator-ri buruz"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Hautatu eD2k lotura konputatzeko fitxategia"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Ezin da arbela ireki"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Kopiatzeko ezer ez oraingoz !"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Hautatu zure eD2k loturaren fitxategia"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Ezin da ireki "
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Mesedez idatzi fitxategi izen bat"
+"%s (%u) erabiltzaileak fitxategi/direktorio partekatuen zerrenda ikustea "
+"ukatu du"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Gordetzeko ezer ez oraingoz !"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Fitxategi Iruzkinak"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"aLinkCreator, aMule eD2k lotura sortzailea\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pix-mapak: from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"GPL lizentzipean zabaldua"
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Erabiltzaile izena"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Aztertzen..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Fitxategi izena"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator zuretzat lanean ari da"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Kalifikazioa"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "MD4 egiaztapena konputatzen..."
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Iruzkina"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "eD2k egiaztapenak konputatzen..."
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Ez dago iruzkinik"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Done in %.2f s"
-msgstr "%.2f seg-etan egina"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "URL dagoeneko gehiturik duzu !"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Mesedez idatzi zurian ez dagoen URL bat"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "Iruzkin %u"
+msgstr[1] "%u iruzkin"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "%u zenbakidun fitxategia prozesatzen: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
-"Zati egiaztapenak eskatu dituzu (9.5 MB baino fitxategi txikiagoekin "
-"bakarrik)"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:83
-#, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Fitxategia ez dago !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, aMuleren eD2k lotura sortzailea"
+"Baztertutako %s bezeroa %s datu hondatu bidaltzeagatik '%s' fitxategiaren "
+"osotasunaren %s"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1326,31 +1172,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto[Alt]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Konektatzen"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Oso txikia"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Baxua"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normala"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Altua"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Oso Altua"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Bertsioa"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Eskatzen"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Konektatu zerbitzaria bidez"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Ilara Osoa"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "Ilaran"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Bidaltzen"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Deskargatzen"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1370,20 +1242,19 @@
 
 #: src/DataToText.cpp:71
 msgid "Connecting via Kad"
-msgstr "Kad bidez konektatzen"
+msgstr "Kad bidez Konektatzen"
 
 #: src/DataToText.cpp:72
 msgid "Too many Kad connections"
 msgstr "Kad konexio gehiegi"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Ukatuak"
 
 #: src/DataToText.cpp:74
 msgid "Connection Error"
-msgstr "Konexioa Errorea"
+msgstr "Konexioa errorea"
 
 #: src/DataToText.cpp:75
 msgid "Remote Queue Full"
@@ -1391,32 +1262,32 @@
 
 #: src/DataToText.cpp:105
 msgid "Old MLDonkey"
-msgstr "MLDonkey Zaharra"
+msgstr "MLDonkey zaharra"
 
 #: src/DataToText.cpp:108
 msgid "New MLDonkey"
-msgstr "MLDonkey Berria"
+msgstr "MLDonkey berria"
 
 #: src/DataToText.cpp:118
 msgid "eMule Compatible"
-msgstr "eMule Bateragarria"
+msgstr "eMule bateragarria"
 
 #: src/DataToText.cpp:128
 msgid "Local Server"
-msgstr "Zerbitzari Lokala"
+msgstr "Zerbitzari lokala"
 
 #: src/DataToText.cpp:129
 msgid "Remote Server"
-msgstr "Urruneko Zerbitzaria"
+msgstr "Urruneko zerbitzaria"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
 #: src/DataToText.cpp:131
 msgid "Source Exchange"
-msgstr "Jatorri Trukaketa"
+msgstr "Jatorri trukaketa"
 
 #: src/DataToText.cpp:132
 msgid "Passive"
@@ -1432,10 +1303,10 @@
 
 #: src/DataToText.cpp:135
 msgid "Search Result"
-msgstr "Bilaketa emaitzak"
+msgstr "Bilaketa emaitza"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Amaitua"
 
@@ -1445,11 +1316,11 @@
 
 #: src/DataToText.cpp:147
 msgid "ERROR: Out of diskspace"
-msgstr "ERROREA: Disko askieza"
+msgstr "ERROREA: Disko-leku gabe"
 
 #: src/DataToText.cpp:148
 msgid "ERROR: Partmet not found"
-msgstr "ERROREA: Ezin da partmet aurkitu"
+msgstr "ERROREA: Partmet ez da aurkitu"
 
 #: src/DataToText.cpp:149
 msgid "ERROR: IO error!"
@@ -1457,9 +1328,9 @@
 
 #: src/DataToText.cpp:150
 msgid "ERROR: Failed!"
-msgstr "ERROREA: Huts!"
+msgstr "ERROREA: Huts egin du!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "Ilaran"
 
@@ -1471,3160 +1342,1417 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Aldiroko fitxategia formatu ezezagun edo okerrekoa."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Sistema lehenetsia"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albaniera"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabiera"
-
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "Estoniera"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Euskara"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgariera"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Katalana"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Txinatarra (Sinplea)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Txinatarra (ohizkoa)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Kroaziarra"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Txekiera"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Daniera"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Alemaniarra"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Ingelesa (E.B.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estoniera"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finlandiera"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Frantsesa"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galiziera"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Alemaniera"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Grekoa"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hebreera"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Hungariera"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italiera"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italiera (Suizarra)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japoniera"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Koreera"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Zatia"
 
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lituaniera"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvegiera (Nynorsk)"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Tamaina"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Poloniera"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Transferituta"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugesa"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Abiadura"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugesa (Brasildarra)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Egoera"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Errusiera"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Jatorriak"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Esloveniera"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Lehentasuna"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Gaztelera"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Egoera"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Suediera"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Denbora faltan"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turkiera"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Azkenez osoa ikusirik"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ukraniera"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Azkenez jasoa"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Ezin da ezarritako nabigatzailea jakin!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Ziur zaude aukeratutako fitxategia ezabatu nahi duzula?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr "TCP ataka ezin da 65532 baino altuagoa izan UDP socket-a TCP+3 bait da"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Ziur zaude aukeratutako fitxategia ezabatu nahi duzula?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Lehenetsiriko ataka erabiliko da (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Zerbitzaria Izena"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Helbidea"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Ataka"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Azalpena"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Erabi."
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Fitxategiak"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Huts egin du"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Estatikoa"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Bertsioa"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Ezabatu naian zauden zerbitzarira konektaturik zaude. Mesedez deskonektatu "
-"zaitez aurretik. Zerbitzaria EZ da ezabatuko."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Argb"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Izen ezezaguna)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Ziur al zaude %s zerbitzari tinkoa ezabatu nahi duzula"
+"Erantzuna hemendik: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Bai"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Ez"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Gelditu"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Huts '%s' irekitzerakoan"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pausa"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Zerbitzariak (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Berrekin"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Zerbitzaria"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "G&arbitu bukaturikoak"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Zerbitzarira konektatu"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Jaitsi fitxategi honen A4AF guztiak orain"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Zerbitzaria estatiko bezala markatu"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Jaitsi fitxategi honen A4AF guztiak (Auto)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Zerbitzaria ez-estatiko bezala markatu"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Jaitsi fitxategi guztien A4AF guztiak orain"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Zerbitzariak estatiko bezala markatu"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Hedatutako aukerak"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Zerbitzariak ez-estatiko bezala markatu"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Aurrebista"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Ezabatu zerbitzaria"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Erakutsi &xehetasunak"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Ezabatu zerbitzariak"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Erakutsi iruzkin guztiak"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Kendu zerbitzari guztiak"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Kopiatu URI magnetikoa arbelera"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Kopiatu eD2k lotura arbelara"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Kopiatu eD2k &lotura arbelera"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopiatu eD2k loturak arbelara"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Kopiatu berrelikadura arbelera"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Zerbitzarira birkonektatu"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "ezarri gabea"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Ziur zaude zerbitzari guztiak ezabatu nahi dituzula?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Ezarri kategoria bat"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Ziur zaude aukeratutako zerbitzaria ezabatu nahi duzula?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Ireki fitxategia"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Ziur zaude aukeratutako zerbitzariak ezabatu nahi dituzula?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Sar izen berri bat fitxategi honentzat:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Ezgaitua [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Fitxategia berrizendatu"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Hau eMulen oinarrituriko aMule %s da."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "%s-n abiarazirik"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Bisitatu http://www.amule.org gunea bertsio berriagorik eskuragarri dagoen "
-"jakiteko."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ERRORE KONPONEZINA: Huts Timer sortzean"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMule urruneko kontrola "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Argazkia:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" 'Plataforma-orotarako' parez-pareko bezeroa eMule-n oinarritua \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Webgunea: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Foroa: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Kontaktua: admin@amule.org (administrazio arazoak) \n"
+msgid "Downloads (%i)"
+msgstr "Deskargak (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " aMule zati bat honetan oinarriturik dago: \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Parez-pareko routing-a XOR metrikan oinarritua.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Mezua"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Konektatzen"
+"Ohar hau aurreikuspen bakoitzean agertzea saihesteko,\n"
+"ezarri zure bideo erreproduzigailu gogokoena hobespen leihoan (lehenetsia "
+"mplayer da)."
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Deskonektaturik"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Suebakirik"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Konektaturik"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Konektatzen"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Itzalia"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Geratu uneko konexio saiakerak"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Deskonektatu"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Deskonektatu konektatutako sareetatik"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Konektatu"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Konektatu gaituriko sareetara"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Gora: %.1f(%.1f) | Behera: %.1f(%.1f)"
-
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Gora: %.1f | Behera: %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Fitxategi aurreikuspena"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Konektaturik)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr ""
+"ERROREA: Huts kanpo bideo erreproduzigailua abiaraztean! Komandoa: `%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Ez konektaturik)"
+msgid "Saving PartFile %u of %u"
+msgstr "%u zati fitxategia gordetzen %u-tik"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Benetan aMule itxi egin nahi duzu?"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "ZatiFitxategi guztiak gorde dira."
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Irteera berrespena"
-
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Ez dago '%s' itxura direktorioa"
+msgid "Loading temp files from %s."
+msgstr "%sd-tik aldiroko fitxategiak kargatzen."
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "ABISUA: Ezin da '%s' itxura fitxategia irakurketarako ireki"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Sareak"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Sare leihoa"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Bilaketak"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Bilaketa leihoa"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Transferentziak"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Fitxategi transferentzia leihoa"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Partekatutako fitxategiak"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Partekatutako fitxategien leihoa"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Mezuak"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Mezu leihoa"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Estatistikak"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Estatistika grafiko leihoa"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Hobespen ezarpen leihoa"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Inportatu"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Zati fitxategi inportazio tresna"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Honi Buruz/Laguntza"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "eD2k sarea"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Kad sarea"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Sarerik ez"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Orokorra"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Konexioa"
+msgid "Loading PartFile %u of %u"
+msgstr "%u zati fitxategia kargatzen %u-tik"
 
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Direktorioak"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Zerbitzariak"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Segurtasuna"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Interfazea"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy-a"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Iragazkiak"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Urruneko Kontrolak"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Sinadura Linean"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Aurreratua"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Gertaerak"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Arazpena"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Erabiltzaileak ezarririk"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"aMule berrabiarazi egin behar da aldaketa hauek gaitu ahal izateko:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP ataka aldaturik.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP - ataka aldaturik.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"Zure auto-eguneratze zerbitzari zerrenda hutsik dago.\n"
-"'Zerbitzari zerrenda abiaraztean auto-eguneratzea ezgaitu egingo da."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Kanpo konexioak gaiturik dituzu baina ez duzu pasahitzik ezarri.\n"
-"Kanpo konexiorik ezin da onartu baliozko pasahitza ezarri arte."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Hizkuntza aldaturik.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Aldiroko karpeta aldaturik.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-#, fuzzy
-msgid "- ED2K network enabled.\n"
-msgstr "Sare guztiak ezgaiturik daude."
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Gora: 0.0 | Behera: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Bai eD2k eta bai Kad sareak ezgaiturik daude.\n"
-"Ezingo zara konektatu hauetako bat behintzat gaitu arte."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad ezin da abaiarazi zure UDP ataka ezgaiturik badago.\n"
-"UDP ataka gaitu edo Kad ezgaitu."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"aMule orain berrabiarazi BEHAR duzu.\n"
-"Orain ez berrabiaraziaz gero ez kexatu ezer txarra gertatzen bada.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Zure auto-eguneraketa zerbitzari zerrenda zurian dago.\n"
-"Mesedez bete behintzat baliozko server.met fitxategi batetara zuzenduaz.\n"
-"Klikatu \"zerrenda\" botoia URLa sartzeko."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Aldi baterako fitxategiak"
+"ERROREA: Huts babeskopia fitxategia kargatzerakoan. Bilatu http://forum."
+"amule.org -en .part.met fitxategi berreskuratze konponbideak."
 
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Sarrera fitxategiak"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Linean Sinadurak"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "ZatiFitxategi guztiak kargatu dira."
 
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Aukeratu karpeta bat %s-rentzat"
-
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Arakatu bideo erreproduktorea"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Hautatu"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Ez da zati fitxategirik aurkitu"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Abiarazgarria%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Editatu zerbitzari zerrenda"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "zati fitxategi %u aurkitu da"
+msgstr[1] "%u zati fitxategi aurkitu dira"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Gehitu hemen server.met deskargatzeko URLa.\n"
-"URL helbide bat lerro bakoitzean."
+"Aldiroko direktorioaren fitxategi sistemak ez ditu fitxategi luzeak onartzen."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Eguneratze maiztasuna: seg %d"
-msgstr[1] "Eguneratze maiztasuna: %d seg"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"Sarrera direktorioaren fitxategi sistemak ez ditu fitxategi luzeak onartzen."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Batez besteko grafiko denbora: minutu %d"
-msgstr[1] "Batez besteko grafiko denbora: %d minutu"
+msgid "Downloading %s"
+msgstr "%s Deskargatzen"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Konexio grafiko eskala: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Dagoeneko '%s' fitxategia deskargatzen ari zara"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Eguneratze atzerapena : segundu %d"
-msgstr[1] "Eguneratze atzerapena : %d segundu"
+msgid "You already have the file '%s'"
+msgstr "Dagoeneko baduzu '%s' fitxategia"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Fitxategi buffer Tamaina: byte %d"
-msgstr[1] "Fitxategi buffer Tamaina: %d byte"
+msgid "You are already trying to download the file %s"
+msgstr "Dagoeneko %s fitxategia deskargatzen ari zara"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Igoera ilara tamaina: bezero %d"
-msgstr[1] "Igoera ilara tamaina: %d bezero"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Ezin da lotura magnetikoa eD2k bihurtu: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Zerbitzari konexio berritze maiztasuna: minutu %d"
-msgstr[1] "Zerbitzari konexio berritze maiztasuna: %d minutu"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Zerbitzarira konexio berritze maiztasuna: Ezgaiturik"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Zerbitzari eskaera hedatuetarako UDP ataka (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "ezgaituta"
+msgid "Unknown protocol of link: %s"
+msgstr "Lotura protokolo ezezaguna: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Komandoa`%s' gertaeran exekutatu"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Gaitu komando exekuzioa muinean"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Muin komandoa:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Gaitu komando exekuzioa urruneko interfazean"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Urruneko interfaze komandoa:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Hurrengo aldagiak aldatuko dira:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Okerreko eD2k lotura! ERROREA: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Baimendu gabeko sarrera saiakera. Konexioa itxirik."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "Bezeroak pakete bat bidali du egiaztapenak huts egin ondoren."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Kanpo konexioa ukaturik."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Pasahitz zuria dela eta kanpo konexioak ezgaiturik!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Kanpo konexioak ezgaiturik konfigurazio fitxategian"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Kanpo konexio berri bat onartu da"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
-msgstr "ERROREA: ez dira kanpo konexio berriak onartzen"
+msgstr "ERROREA: ezin da kanpo konexio berria onartu"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Hobespenetan pasahitza zurian dela eta kanpo konexioak ukaturik!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Bezerora konektatzen: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Bertsio ezezaguna"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
 msgstr ""
-"Okerreko bertsio IDa, bitar baterezintasuna dago. Erabili urruneko eta "
+"Okerreko bertsio ID-a, bitar bateratze ezintasuna dago. Erabili urruneko eta "
 "nagusi bertsio berdina."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"Ezin zara kaleratutako bertsio batetara konektatu edozein SVN bertsiotik! "
-"*ikusi* apurketa aukera saihestua"
-
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Egiaztapenak huts egin du."
+"Ezin zara argitaratutako bertsio batetara konektatu edozein garapen "
+"bertsiotik! *ikusi* apurketa aukera saihestua"
 
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Protokolo bertsio baliogabea."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Protokolo bertsio marka falta da."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
-msgstr "Eskakizun baliogabea, lehenik identifikatu egin behar zara."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+"Autentifikazio errorea: okerreko egiaztapena ezarri da EC pasahitz gisa."
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Egiaztapenak huts egin du: okerreko pasahitza."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Egiaztapenak huts egin du: pasahitza falta da."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
+msgstr "Eskakizun baliogabea, mesedez identifikatu aurretik."
+
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Sarrera onartua."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "\"%s\" errore mezua bezerora bidalia."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Baimendu gabeko sarrera saiakera %s-tik. Konexioa itxia."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 "Urruneko ZatiFitxategi komandoak huts egin du: Ez da %s fitxategi "
 "egiaztapena aurkitu"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Ez da %s fitxategi egiaztapena aurkitu"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! OpCode prozesu errorea!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Zerbitzaria ez da gehitu"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "ez da zerbitzaria aurkitu: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "ezabatzeko zerbitzaria ezarri behar da"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k ezgaiturik dago hobespenetan."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
-msgstr "Bilaketa bidean. Emaitzak emango une batetan!"
+msgstr "Bilaketa bidean. Emaitzak emango une batean!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Urruneko interfazeko Web bilaketak ez du zentzurik."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad ezgaiturik dago hobespenetan."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Ez dago punturik grafikoarentzat."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Zure bezeroa ez dago xehetasun maila honetarako konfiguraturik."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
-msgstr "Kanpo Konexioa: itzaltzea eskatua"
+msgstr "Kanpo konexioa: itzaltzea eskatuta"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Dagoeneko irteten."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "KanpoKonexioa: '%s' lotura gehitzen."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Lotura baliogabea edo zerrendan dagoeneko."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Fitxategia ez da aurkitu."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Fitxategi izen baliogabea."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Ezinda fitxategia berrizendatu."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad ezgaiturik dago hobespenetan."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Dagoeneko eD2k-ra konektaturik."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
-msgstr "eD2k-ra konektatzen..."
+msgstr "ed2k-era konektatzen..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Dagoeneko Kad-era konektaturik."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Kad-era konektatzen..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Sare guztiak ezgaiturik daude."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
-msgstr "eD2k-tik deskonektaturik."
+msgstr "eD2k-tik deskonektatua."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Kad-etik deskonektaturik."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
-msgstr "Kanpo konexioa: opcode baliogabea jasoa: %#x"
+msgstr "Kanpo Konexioa: okerreko opcode-a jasoa: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Opcode baliogabea (okerreko protokolo bertsioa?)"
 
-#: src/UploadClient.cpp:273
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Huts fitxategia irekitzean (%s), partekatutako fitxategi zerrendatik kentzen."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Egiaztapena eskaturik fitxategi ezezagunarentzat: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "`%s' komandoa (`%d' pid-a duena) `%d' egoera kodeaz amaitu da."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Zerbitzaria ez da gehitu: ez da IP edo ostalari izenik ezarri."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Zerbitzaria ez da gehitu: Baliogabeko zerbitzari-ataka ezarririk."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "eD2k egoera:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Konektaturik"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP Ataka"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kademlia Egoera:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Martxan"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Egoera:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Deskonektatuta"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Konexio Egoera:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Suebakirik"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "Ados"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Suebaki egoera: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Lagunera konektaturik"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Laguna ez"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Batazbesteko Erabi.:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Batazbesteko Fitxategiak:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Geldirik"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Abiarazia: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Transferentzia"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Igoerak"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Igotako Datuak (Saioa (Guztira)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Guztira Buruak (Paketeak): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Fitxategi Eskakizun Buruak (Paketeak): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Jatorri Aldaketa Buruak (Paketeak): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Zerbitzari Buruak (Paketeak): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Kad Buruak (Paketeak): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Kriptografi goiburua (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Igoera Aktiboak: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Igoerak Zain: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Guztira behar bezala igotako saioak: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Guztira oker igotako saioak: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Batez besteko igoera denbora: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Deskargak"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Deskargaturiko Datuak (Saioa (Guztira)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Aurkituriko Iturburuak: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Deskarga Aktiboak (zatiak): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Saio IG/DE Abiadura (Guztira): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Batazbesteko deskarga tasa (saioa): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Batazbesteko igoera tasa (saioa): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Gehienezko deskarga tasa (saioa) %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Gehienezko igoera tasa (saioa): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Berkonexioak: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Denbora lehen transferentziatik: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Zerbitzaria noiztik konektatua: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Konexio Aktiboak (estimazioa): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Gehienezko Konexio Mugara iritsi: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Batez besteko Konexioak (ebaluazioa): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Puntako konexioak (estimazioa): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Bezeroak"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Iragazirik"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Guztira: %i Ezagunak: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Zerbitzariak Martxan: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Huts egindako Zerbitzariak: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Guztira: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Ezabatutako Zerbitzariak: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Iragaziriko Zerbitzariak: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Erabiltzaileak - Zerbitzariak Martxan: %llu"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "'%s' luzapen ezezaguna '%s' komandoarentzat.\n"
 
-#: src/Statistics.cpp:721
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Fitxategiak - Zerbitzariak Martxan: %llu"
+msgid "Unknown command '%s'.\n"
+msgstr "'%s' komando ezezaguna.\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Guztira Erabiltzaileak: %llu"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Komando honek ezin du argumenturik eduki.\n"
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "Guztira Fitxategiak: %llu"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Komando honek argumentu bat eduki behar du.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Zerbitzari lan karga %.2f%%"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Komando hau osotu gabe dago, beheko luzapen hauetako bat erabili dezakezu.\n"
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Partekatutako Fitxategi kopurua: %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Gehigarri erabilgarriak:\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Guztira Partekatutako Fitxategi tamaina: %s"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Komando erabilgarriak:\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Average file size: %s"
-msgstr "Batazbesteko fitxategi izena: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Sistema Eragilea"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Ez Jasoa"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Ebaki"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Itsatsi"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Hautatu dena"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Ezin da Kad bilaketarik egin Kad ez badago abiarazirik"
-
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "eD2k bilaketa ezin da egin eD2k ez badago konektaturik"
-
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Espero gabeko errorea Kad bilaketa egitean: "
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Komando guztietan berdin da maiuskula/minuskula.\n"
+"Idatzi '%s <komandoa>' <komandoa>-ri buruzko xehetasunak ikusteko.\n"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "'%s'-ren mezu bat iragazi da (IP:%s)"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Aplikaziotik ateratzen da."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "'%s'-ren mezu berria (IP:%s)"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Laguntza bistarazi."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
-"%s (%u) erabiltzaileak zure partekatutako fitxategi zerrenda eskatu du -> "
-"Onartua"
+"Komando bati buruz laguntza jasotzeko, idatz ezazu 'help <komandoa>'.\n"
+"Komandoen zerrenda osoa eskuratzeko, 'help' idatzi.\n"
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
-"%s (%u) erabiltzaileak zure partekatutako fitxategi zerrenda eskatu du -> "
-"Ukatua"
+"\n"
+"Erabili '%s' komando zerrendarentzako\n"
+"\n"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"%s (%u) erabiltzaileak zure partekatutako direktorioen zerrenda eskatu du -> "
-"Onarturik"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Sintaxi errorea!"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
-"%s (%u) erabiltzaileak zure partekatutako direktorioen zerrenda eskatu du -> "
-"Ukaturik"
+"Errorea komandoa prozesatzekoan - Ez zen inoiz pasa beharko! Mesedez "
+"zorriaren berri eman\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"%s (%u) erabiltzaileak %s direktorioaren partekatutako fitxategi zerrenda "
-"eskatu du -> Onarturik"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Komando honek ez luke parametrorik eduki beharko."
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"%s (%u) erabiltzaileak %s direktorioaren partekatutako fitxategi zerrenda "
-"eskatu du -> Ukatua"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Komando honek parametro bat eduki beharko luke."
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "%s (%u) erabiltzailearen %s partekatutako direktorioa"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Argumentu baliogabea."
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr ""
-"%s (%u) erabiltzailea eskatugabeko partekatutako direktorioak bidali ditu."
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Hau komando osatugabe bat da."
 
-#: src/ClientTCPSocket.cpp:1025
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr ""
-"%s (%u) erabiltzaileak %s direktorioko partekatutako fitxategi zerrenda "
-"bidali du"
+msgid "Type '%s' to get more help.\n"
+msgstr "Sakatu '%s' laguntza gehiagorako.\n"
 
-#: src/ClientTCPSocket.cpp:1032
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr ""
-"%s (%u) erabiltzaileak partekatutako fitxategi zerrenda bidaltzeaz bukatu du"
+msgid "This is %s %s %s\n"
+msgstr "Hau %s %s %s da\n"
 
-#: src/ClientTCPSocket.cpp:1037
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr ""
-"%s (%u) erabiltzaileak eskatu gabeko partekatutako fitxategi zerrenda bidali "
-"du"
+msgid "This is %s %s\n"
+msgstr "Hau %s %s da\n"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
-"%s (%u) erabiltzaileak fitxategi/direktorio partekatuen zerrenda ikustea "
-"ukatu du"
+"\n"
+"Bezeroa sortzen...\n"
 
-#: src/KadDlg.cpp:132
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Nodes (%u)"
-msgstr "Nodoak (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Abiarazteko ip baliogabea"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Abiarazteko ataka baliogabea"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Beharrezko eremu guztiak bete"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Ziur zaude nodes.dat fitxategi berri bat deskargatu nahi duzula?\n"
-
-#: src/KadDlg.cpp:197
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Hau eginez zure nodo zerrenda ezabatu eta Kademlia konexioa berrabiaraziko "
-"da."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Jarraitu?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "ERROREA: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "ABISUA: "
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Laguna gehitu"
+"\n"
+"Ados, %s uzten...\n"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Baliozko IP helbide eta ataka sartu behar dituzu!"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
+"Ezin da pasahitz zuri batez konektatu.\n"
+"Pasahitz bat ezarri behar duzu konfigurazio fitxategian,\n"
+"komando lerroan, edo eskatzen zaizunean sartu.\n"
+"\n"
+"Irteten...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Argibideak"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Laguntza testu hau bistarazi."
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Emandako erabiltzaile egiaztapena ez da baliozkoa!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "aMule abiarazirik duen ostalaria. (lehenetsia: localhost)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Jatorriak"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Kanpo konexioetarako aMuleren ataka. (Lehenetsia 4712)"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Fitxategia"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Kanpo konexio pasahitza."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Deskargatu"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Konfigurazio fitxategitik irakurri."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategoria"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Ez ezer bistarazi irteera estandarrean."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Nagusia"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Luze - arazten mezuak ere bistarazi."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Kategori honetan deskargatu: "
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Programa lokala (hizkuntza) ezarri."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Bilatu antzerako fitxategiak (eD2k, zerbitzari lokala)"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Idatzi komando lerroko aukerak konfigurazio fitxategira."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Markatu fitxategia ezaguna bezala"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr ""
+"aMuleren konfigurazio fitxategian oinarriturik konfigurazio fitxategia "
+"sortzen du."
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Urruneko amulera konektatu"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Programa bertsioa bistarazi."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Konexioak huts egin du "
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Fitxategi xehetasunak"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "ERROREA"
+#: src/FileDetailDialog.cpp:113
+#, c-format
+msgid "%.1f%% done"
+msgstr "%.1f%% egina"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Konexioak huts egin du. Ezin da %s:%d-ra konektatu\n"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
-msgstr "ABISUA: Ezin duzu zure burua eD3k lotura jatorri bezala gehitu."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr ""
+"Huts 'emfriends.met' lagun zerrenda fitxategia irakurketarako irekitzean!"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Erabiltzaileak: E: %s K: %s | Fitxategiak E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "Huts 'emfriends.met' lagun zerrenda fitxategia idazteko irekitzean!"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Guztiak"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "KRITIKOA - ez dago bezerorik StartChatSession-en"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Guztira Erab: %s | Guztira Fitxategiak: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Lagunak"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Transferituta"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Erakutsi &xehetasunak"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Abiadura"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Gehitu laguna"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Egoera"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Ezabatu laguna"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Egoera"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Bidali &mezua"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Denbora Faltan"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Ikusi fitxategiak"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Azkenez Osoa Ikusirik"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Ezarri lagunen ataka"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Azkenez jasoa"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Ziur zaude hautatako laguna ezabatu nahi duzula?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Ziur zaude aukeratutako fitxategia ezabatu nahi duzula?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Ziur zaude hautatako lagunak ezabatu nahi dituzula?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Ziur zaude aukeratutako fitxategia ezabatu nahi duzula?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Ez duzu lagun-ataka bat baino gehiago ezartzeko baimenik.\n"
+" Ataka bat bakarrik dago sinaturik."
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Aukera anitza"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Bidali mezua erabiltzaileari"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Bidali behar de mezua:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Gelditu"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pausa"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Berrekin"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "G&arbitu bukaturikoak"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Jaitsi fitxategi honen A4AF guztiak orain"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Jaitsi fitxategi honen A4AF guztiak (Auto)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Jaitsi fitxategi guztien a4af guztiak orain"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Hedatutako Aukerak"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Aurrebista"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Erakutsi &xehetasunak"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Erakutsi iruzkin guztiak"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Kopiatu URI magnetikoa arbelera"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "ezarri gabea"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Ezarri kategoria bat"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Ireki fitxategia"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Lagunetatik kendu"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Gehitu lagun zerrendara"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Mezua bidali"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Swap fitxategi honentzat"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
-msgstr "QR: %u (%i)"
+msgid "On Queue: %u (%i)"
+msgstr "Ilaran: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Beste fitxategi batez galdeturik"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Deskargak (%i)"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Igoera ataka baten zain"
 
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Abisu hau aurreikuspen baliotzean ikustea saihesteko,\n"
-"ezarri zure lehenetsitako erreproduktorea hobespenetan (lehenetsia mplayer "
-"da)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Fitxategi aurreikuspena"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ERROREA: Huts  kanpo bideo erreproduktorea abiaraztean! Komandoa: `%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "ERROREA: Huts zati fitxategia sortzerakoan)"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "met-file fitxategiaren basbeskopia %s-tik kargatzen saiatzen"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ERROREA: Huts part.met fitxategia irekitzean: %s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ERROREA: part.met fitxategi tamaina 0 da: %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ERROREA: part.met fitxategi bertsio baliogabea; %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"ERROREA: %s (%s) hondaturik dago (etiketa kopuru okerra), ezin da fitxategia "
-"kargatu."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Fitxategi informazioa berreskuratzen saiatzen..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr ""
-"Izen gabeko fitxategia berreskuratzen - RecoveredFile.dat bezala "
-"berreskuratzen saiatuko da"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"fitxategi informazio eskuragarri guztia berreskuraturik :D - Erabiltzen "
-"saiatzen..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Ezin da fitxategi informazioa berreskuratu:("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Huts egin du irekitzerakoan: %s (%s)"
-
-#: src/PartFile.cpp:708
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "ABISUA: %s hondaturik egon daiteke (%i)"
+msgid "On Queue: %u"
+msgstr "Ilaran: %u"
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "ERROREA zati fitxategia gordetzerakoan: %s (%s ==> %s)"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Igotzen"
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Ezin da '%s'-ren tamaina eskuratu - %s fitxategia erabiltzen."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' hutsik dago  - %s fitxategia erabiliko da."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Errorea %s-ren part.met.seeds fitxategia gordetzerakoan"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "jatorri ale %i bildurik zati fitxategiarentzat: %s (%s)"
-msgstr[1] "%i jatorri ale bildurik zati fitxategiarentzat: %s (%s)"
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Batez"
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "%s (%s) zati fitxategiak ez du ale fitxategirik"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Ez"
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "%s (%s) zati fitxategiak ale fitxategi huts bat du"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Bai"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Errorea zati-fitxategi hazi fitxategia irakurtzerakoan (%s - %s): %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Deskargatzen..."
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Hondaturiko zatia (%d) aurkitu da %d zati %s zati fitxategian - "
-"FitxategiEgiaztapenEmaitza |%s| fitxategiEgiaztapena |%s|"
-msgstr[1] ""
-"Hondaturiko zatia  (%d) aurkitu da %d zatitan %s zati fitxategian - "
-"FitxategiEgiaztapenEmaitza |%s| fitxategiEgiaztapena |%s|"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "HTTP deskarga utzia"
 
-#: src/PartFile.cpp:1181
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Bukatutako (%i) zatia aurkiturik %s-n"
+msgid "Unable to create destination file %s for download!"
+msgstr "Ezin da helburu fitxategia sortu %s deskargarentzat!"
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Amaitutako berrazterketa: %s"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "Deskargatzeko URLa ezin da hutsik egon"
 
-#: src/PartFile.cpp:2239
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Errore esperogabea %s osatzean: Fitxategia gelditu egin da"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "%s URL-aren erantzuna: %i - Errorea (%i)!"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Deskarga amaiturik: %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Errore larria deskargatutako fitxategia idazterakoan"
 
-#: src/PartFile.cpp:2323
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Deleting file: %s"
-msgstr "fitxategia ezabatzen:%s"
+msgid "Downloaded %d bytes"
+msgstr "%d byte deskargaturik"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"ANISUA: Ezinda deskargaturiko zatia egiaztatu- '%s' egiaztapen osatugea"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "%d byte espero ziren, baina %d deskargatu dira"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"ANISUA: Ezinda deskargaturiko zatia egiaztatu- egiaztapen osatugea (%s). Hau "
-"ez zen inoiz pasa beharko"
+"Okerreko URLa HTTP deskarga edo HTTP berbideraketarako ('http://' ahaztu al "
+"duzu?)"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "KONTUZ: Diskoa leku askieza! Fitxategia gelditzen: %s"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "Ezin da HTTP deskarga zerbitzaria konektatu"
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Deskargaturiko %i zatia hondaturik dago fitxategi honetan: %s"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Okerreko erantzuna HTTP deskarga zerbitzaritik"
 
-#: src/PartFile.cpp:3214
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Hondaturiko %i zatia (%s) konpondurik -> Gordetako byte-ak: %s"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Deskargatu GeoIP.dat berria %s-tik"
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Esleitzen"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Disko leku askieza"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Gelditua"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "GeoIP.dat deskargak huts egin du eguneraketa baztertzen."
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Deskargaturik"
-
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ERROREA: Huts '%s' zati-fitxategia irekitzean"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "ABISUA: known.met ezin da ireki."
+msgid "Failed to remove %s file, aborting update."
+msgstr "Huts %s fitxategia ezabatzean, eguneraketa baztertzen."
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr "ABISUA: Knowfile zerrenda hondaturik dago, goiburu baliogabea du."
-
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "SI errorea known.met fitxategia irakurtzean: %s"
+msgid "Failed to rename %s file, aborting update."
+msgstr "Huts %s fitxategia berrizendatzean, eguneraketa baztertzen."
 
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Errorea known.met fitxategia gordetzerakoan: %s"
+msgid "Successfully updated %s"
+msgstr "%s behar bezala eguneratu da"
 
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Ezagututako partekatutako fitxategi %i aurkiturik"
-msgstr[1] "%i ezagututako partekatutako fitxategi aurkiturik"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Huts GeoIP.dat deskargatzean"
 
-#: src/SharedFileList.cpp:358
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "%i ezagututako partekatutako eta ezezagun %i aurkiturik"
-msgstr[1] "%i ezagututako partekatutako eta %i ezezagun aurkiturik"
+msgid "Failed to download %s from %s"
+msgstr "Huts %s %s-tik deskargatzean"
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ERROREA: %s partekatzen saiatzen"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Fitxategi Iruzkinak"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Kalifikazioa"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Iruzkina"
+msgid "Failed to load country data for '%s'."
+msgstr "Huts '%s'-ren estatu datuak kargatzean."
 
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Ez dago iruzkinik"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "'ipfilter.dat' eta 'ipfilter_static.dat' IP iragazkiak kargatzen."
 
-#: src/CommentDialogLst.cpp:104
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "Iruzkin %u"
-msgstr[1] "%u iruzkin"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Huts zerrendaturiko nahasitako zerbitzarietara konektatzean. Nahaste gabeko "
-"beste saiakera bat egiten."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
-"Huts zerrendako zerbitzari guztietara konektatzen saiatzerakoan, berriz "
-"hasiko nahiz."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "eD2k hobespenetan ezgaiturik, ez da konektatuko."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Ez dago konektatzeko baliozko zerbitzaririk zerbitzari zerrendan"
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "%s (%s:%i)-ra konektaturik"
+"Huts egin du ipfilter.dat '%s' fitxategia kargatzerakoan, formatu ezezagunak "
+"aurkitu dira."
 
-#: src/ServerConnect.cpp:263
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Konexioa sorturik: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
-"Errore konponezina konektatzen saiatzean. Internet konexioa eroria egon "
-"daiteke"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "%s (%s:%i)-ra konexioa galduta"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) hilik dagoela dirudi."
+"Huts egin du ipfilter.dat '%s' fitxategia kargatzerakoan, ezin da fitxategia "
+"ireki."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) beterik dagoela dirudi."
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "IP-eremu %u kargaturik'%s'-tik."
+msgstr[1] "%u IP-eremu kargaturik'%s'-tik."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] ""
-"Zerbitzariarekiko konexio automatikoa berriz saiatuko da segundu %d-etan"
-msgstr[1] ""
-"Zerbitzariarekiko konexio automatikoa berriz saiatuko da %d segundotan"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Konexioa galdu egin da"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "Gaizki eratutako lerro %u alde batetara utzi da."
+msgstr[1] "Gaizki eratutako %u lerro alde batetara utzi dira."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Huts %s (%s:%i) -ra konektatzerakoan."
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Huts %s fitxategi berria berrizendatzean, eguneraketa baztertzen."
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "Errorea: Socket baliogabea denbora-muga egiaztapenean"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "IP iragazkia presta dago"
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "%s (%s:%i) -ra konexio saiakera denboraz kanpo geratu da."
-
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-"ERROREA_ Huts babeskopia fitxategia irekitzean. Ikusi http://forum.amule.org "
-"webgunean .part.met berreskuratze aukerak."
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Ez da zati fitxategirik aurkitu"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "zati fitxategi %u aurkitu da"
-msgstr[1] "%u zati fitxategi aurkitu dira"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
-"Aldiroko direktorioko fitxategi-sistemak ezin ditu fitxategi handiak kudeatu."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Sarrera direktorioko fitxategi-sistemak ezin ditu fitxategi handiak kudeatu."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "%s Deskargatzen"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Dagoeneko '%s' fitxategia deskargatzen ari zara"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Dagoeneko baduzu '%s' fitxategia"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Dagoeneko %s fitxategia deskargatzen ari zara"
+"Hemendik abiarazi:\n"
+"bezero ezagunak"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Ezin da lotura magnetikoa eD2k lotura bihurtu: %s"
+msgid "Nodes (%u)"
+msgstr "Nodoak (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Lotura protokolo ezezaguna: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Abiarazteko ip baliogabea"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "eD2k lotura okerra: ERROREA: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Abiarazteko ataka baliogabea"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "<str> exekutatu eta irten."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Beharrezko eremu guztiak bete"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "IP Formatu baliogabea erabili xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Ziur zaude nodes.dat fitxategi berri bat deskargatu nahi duzula?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Komando honek argumentu bat behar du. Baliozko argumentuak: 'all' fitxategi-"
-"izena  edo zenbaki bat.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Egiaztapenez prozesatzen: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Izenez prozesatzen: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr ""
-"Komando honek argumentu bat behar du. Baliozko argumentuak: fitxategi "
-"egiaztapena.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Ez da baliozko zenbaki bat\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Ez da baliozko egiaztapen bat (luzera zehazki 32 karakterekoa izan behar "
-"da)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Ekintza arrakastatsuki amaitu da."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Eskakizunak errore honekin huts egin du: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Bezero IP iragazketa %s dago.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "EZGAITURIK"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "GAITURIK"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Zerbitzari IP iragazketa %s dago.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Uneko IPiragazki maila %d da.\n"
+"Hau eginez zure nodo zerrenda ezabatu eta Kademlia konexioa berrabiaraziko "
+"da."
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Banda-zabalera mugak: Gora: %u kB/s, Behera: %u kB/s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Jarraitu?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: bilaketa gako laburregia"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "%s %s %s-ra konektaturik"
+msgid "Keyword for search: %s"
+msgstr "Bilatzeko gakoa: %s"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "IDBaxuarekin"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: Bilaketa gakoa dagoeneko bilaketa zerrendan dago: "
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "IDAltuarekin"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Ez konektatzen"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "konektatu gabe"
-
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Deskargatu:\t%s"
+"Huts nodes.dat fitxategia irakurtzean - zaharregia. Bertsioa hau (0) ez da "
+"luzaroago onartzen."
 
-#: src/TextClient.cpp:726
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"Igo:\t%s"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Irakurri Kad kontaktu %u"
+msgstr[1] "Irakurri %u Kad kontaktu"
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Bezero ilaran:\t%d\n"
+"Ez da kontakturik aurkitu, mesedez autoabiatu edo deskargatu nodes.dat "
+"fitxategi bat."
 
-#: src/TextClient.cpp:732
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
-msgstr ""
-"\n"
-"Jatorriak guztira:\t%d\n"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Bakarrik Kad kontaktu %d dago eskuragarri, nodes.dat ez da idatziko"
+msgstr[1] ""
+"Bakarrik %d Kad kontaktu daude eskuragarri, nodes.dat ez da idatziko"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Bilaketa emaitza kopurua: %i\n"
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Idatzi Kad kontaktu %d"
+msgstr[1] "Idatzi %d Kad kontaktu"
 
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "EGITEKE - bilaketa aurrerapena ikusi"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Fitxategia"
 
-#: src/TextClient.cpp:828
-#, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Zerbitzaritik erantzun ezezagun bat jaso da, OpCode = %#x."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Fitxategi tamaina"
 
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Egoera informazio laburra bistarazi."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Partekatze erlazioa"
 
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Konexio egoera bistarazi, uneko igo/deskarga abiadura, etab.\n"
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Igoa"
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Estatistika zuhaitz osoa bistarazi."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Eskatutakoa"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Aukeran, 0-255 tarteko argumentu bat eman daiteke komando honi. Honekin "
-"bezero\n"
-"zuhaitzean ikusiko diren sarrera muga ezarri daiteke. 0 emanez edo ez emanez "
-"gero\n"
-"mugagabea' izango da.\n"
-"\n"
-"Adibidea: 'statistics 5' erabiliaz bezero mota bakoitzeko 5 bertsio nagusiak "
-"ikusiriko dira.\n"
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Onartua"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Itzali aMule."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Jatorri osoak"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Itzali urrunean abiarazitako muina(amule(amuled).\n"
-"Honek testu bezeroa ere itxiko du abiarazitako muin bat gabe\n"
-"erabilezina bait da.\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Emandako objektua birkargatu."
+"Abisua: Fitxategi ezagun zerrenda hondaturik dago, buru baliogabeak ditu."
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Partekatutako fitxategi zerrenda freskatu."
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "IP Iragazkia taula fitxategitik birkargatu."
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Sarera konektatu."
-
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"Honek hobespenetan gaiturik dauden sare guztietara konektatuko du.\n"
-"Aukeran IP:Ataka formatuan zerbitzari helbide bat ezarri dezakezu "
-"zerbitzari\n"
-"horretara bakarrik konektatzeko. IP helbidea puntuaturiko IPv4 hamartar "
-"helbide\n"
-"bat izan behar da edo ebatzi daitekeen izen bat."
+"Huts fitxategi ezagunen zerrendako sarrera bat kargatzean, hondaturik egon "
+"liteke"
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "eD2k sarera bakarrik konektatu."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "KAD sarera bakarrik konektatu."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Saretik deskonektatu."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Honek konektaturik zauden sare guztietatik deskonektatuko zaitu.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "eD2k saretik bakarrik deskonektatu."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Kad saretik bakarrik deskonektatu."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Gehitu eD2k edo magnetiko lotura muinera."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
-msgstr ""
-"Gehitu daitezken eD2k loturak:\n"
-"*) fitxategi lotura (ed2k://|fitx|...), deskarga ilaran gehituko da,\n"
-"*) zerbitzari lotura (ed2k://|server|...), zerbitzari zerrendara gehituko "
-"da, \n"
-"*) edo zerbitzari-zerrenda lotura, kasu honetan zerrendako zerbitzari "
-"guztiak zerbitzari\n"
-"   zerrendara gehituko dira.\n"
-"\n"
-"Lotura magnetikoak eD2k fitxategi egiaztapena eta fitxategi tamaina eduki "
-"behar du.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Hobespen balio bat ezarri."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "IP iragazki hobespenak ezarri."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "IP iragazketa gaitu bai bezero bai zerbitzarientzat."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "IP iragazketa ezgaitu bai bezero bai zerbitzarientzat."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "IP iragazketa gaitu/ezgaitu bezeroentzat."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "IP iragazketa gaitu bezeroentzat."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "IP iragazketa ezgaitu bezeroentzat."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "IP iragazketa gaitu/ezgaitu zerbitzarientzat."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "IP iragazketa gaitu zerbitzarientzat."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "IP iragazketa ezgaitu zerbitzarientzat."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Ip Iragazte maila hautatu."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Baliozko iragazte maila 0-255 tartekoak dira, eta lehenetsiriko balioa\n"
-"(hasierakoa) 127 da.\n"
+"Okerreko sarrera fitxategi ezagunen zerrendako fitxategian, hondaturik egon "
+"liteke: "
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Konexio zabalera mugak ezarri."
+#: src/libs/common/Format.cpp:307
+#, c-format
+msgid "Unknown error %d"
+msgstr "%d errore ezezaguna"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "Komando hauentzat emandako balioa Kb/s-tan egon behar da.\n"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Ezin da %d errorearen azalpena eskuratu"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Igoera konexio zabalera muga ezarri."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Aztertzen"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Deskarga konexio zabalera muga ezarri."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Osotzen"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Hobespen balio bat eskuratu eta bistarazi."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Amaitua"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "IP iragazki hobespenak eskuratu."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Geraturik"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "IP iragazketa egoera eskuratu bai bezero bai zerbitzarientzat."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Akasdun"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "IP iragazketa egoera eskuratu bezeroentzat."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Zain"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "IP iragazketa egoera eskuratu zerbitzarientzat."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Pasahitz ez zuri bat ezarri behar duzu."
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "IPiragazki maila eskuratu."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Pasahitz baliogabea, ez da MD5 egiaztapena!"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Konexio zabalera mugak eskuratu."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Konexio errorea"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Bilaketa bat egiten du."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "EC konexioa huts egin du. Erantzun hutsa."
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
-"Bilaketa mota ezarri behar da mota idatziaz:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Adibidez: 'search kad fitxategia' erabiliaz \"fitxategia\" bilatuko du Kad "
-"sarean.\n"
-
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Bilaketa orokor bat egiten du."
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Bilaketa lokal bat egiten du"
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Kad bilaketa bat egiten du"
-
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Azken bilaketaren emaitzak bistaratzen ditu."
-
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Aurreko bilaketaren emaitzak bistaratzen ditu.\n"
+"Kanpo konexioa: Okerreko erantzuna, esku-emateak huts egin du. Konexioa "
+"itxirik."
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Ikusi bilaketaren aurrerapena."
-
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Ikusi bilaketaren aurrerapena.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Lortua! Amulera konexioa sortua "
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Fitxategia deskargatzen hasi"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Lortua! Konexioa sortua."
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Azkenengo bilaketako fitxategiaren zenbakia eman behar da.\n"
-"Adibiez: 'download 12' erabiliaz azken bilaketako hamabigarren emaitzaren "
-"deskarga abiaraziko da.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Kanpo konexioa: Sarrera ukatze arrazoia: "
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Deskarga pausarazi."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Kanpo Konexioa: Esku-emateak huts egin du."
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Berrekin deskarga."
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "ListenSocket: Ondo."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Utzi deskarga."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "ERROREA: Ezin da TCP ataka entzun."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Deskarga lehenespena ezarri."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "ERROREA: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr ""
-"Deskarga baten lehenespena ezarri Baxua, Normala, Altua edo Auto bezala.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "OHARRA: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Ezarri lehentasun txikia."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Itxi"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Ezarri lehentasun normala."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Ebaki"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Ezarri lehentasunhandia."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Kopiatu"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Ezarri lehentasun automatikoa."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Itsatsi"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Ilarak/zerrenda bistarazi."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Garbitu"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Igoera/deskarga ilara, zerbitzari zerrenda edo partekatutako fitxategi "
-"zerrenda bistarazi.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Hautatu dena"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Igoera ilara bistarazi."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Deskarga ilara bistarazi."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Mugarik gabea"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Erregistroa ikusi."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule tresna-barra Menua"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Zerbitzari zerrenda bistarazi."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Abiadura mugak:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Erregistroa garbitu."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "IG: Batez"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Zaharkitutako komendoa '%s' erabili honen ordez."
+msgid "UL: %u"
+msgstr "IG: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Hau zaharkituriko komando bat da eta etorkizunean ezabatu egin daiteke.\n"
-"Erabili '%s' horren ordez.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DE: Batez"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ERROREA: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "DE: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "ABISUA: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Deskarga abiadura: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Bezero id berria: %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "ABISUA: ID baxua jaso duzu!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tZiurrenik suebaki edo router baten atzean zaudelako izan daiteke."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tArgibide gehiagorako begiratu http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Igoera abiadura: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Zerbitzari argibide ezezaguna jasoa - laburregia"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Bezero argibidea"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "zerbitzari berri %d jasoa"
-msgstr[1] "%d zerbitzari berri jasoak"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Zerbitzari zerrenda gordetzeaz amaitu da."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Zerbitzariak azken komadoa ukatu du"
+msgid "Nickname: %s"
+msgstr "Ezizena: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Hondaturiko paketebat jaso da zerbitzaritik: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Goitizena ez hautatuta!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Errore kudeaezina zerbitzariko paketea prozesatzekoan: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "BezeroID: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Ezin da DNS ebazpen hari bat sortu %s-ra konektatzeko"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "konektatu gabe"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "%s (%s) IP-dun zerbitzaria iragazirik dago.  Ez dago konektatzen."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Zerbitzari izena: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "protokolo nahastea erabiltzen."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "ZerbitzariIP: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Konektatzen: %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Konektatu gabe"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Ezin da %s zerbitzariaren dns-a ebatzi: Ezin da konektatu!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr ""
-"CIP2Country::CIP2Country(): Huts herrialde datuak hemendik kargatzean:  "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "bandera bitmapa %d kargaturik."
-msgstr[1] "%d bandera bitmapa kargaturik."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Ziur zaude kategoria honetako fitxategi guztiak ezeztatu eta ezabatu nahi "
-"dituzula?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Baieztapena Beharrezkoa"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Beste guztiak"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Amaitugabea"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Martxan"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Bideoa"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Audioa"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Fitxategia"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD-Imaginak"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Irudiak"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Testua"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Hautatu ikuspen iruzkina"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Gehitu kategoria"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Editatu kategoria"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Ezabatu kategoria"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Fitxategia"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Fitxategi tamaina"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Partekatze erlazioa"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Igota"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Eskatua"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Onartua"
+msgid "TCP port: %d"
+msgstr "TCP ataka: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Osoturiko jatorriak"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP ataka: Ez dago prest"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "%s inportatzen: %s"
+msgid "UDP port: %d"
+msgstr "TCP ataka: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Aldiroko karpeta irakurtzen"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UDP ataka: Ez dago prest"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Deskarga fitxategiaren argibide oinarrizkoak eskuratzen"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Linean sinadura: Gaituta"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Helburu fitxategia sortzen"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Linean sinadura: Ezgaitua"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Deskarga fitxategi zaharretik kargatzen (%u %u-tik)"
+msgid "Uptime: %s"
+msgstr "Abiarazia: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Datu blokeak deskarga fitxategi berrian gordetzen (%u %u-tik)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Deskarga fitxategi argibide jatorria eskuratzen"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Deskarga gehitu eta zati fitxategi berria gordetzen"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Zati fitxategiak inportatu"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Egoera"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "FitxategiEgiaztapena"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Zain..."
+msgid "Shared files: %d"
+msgstr "Partekatutako fitxategiak: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Diskoa: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Mesedez ezarri aldiroko fitxategiak bilatuko diren karpeta (azpikarpetak ere "
-"arakatuko dira)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "fitxategiak?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Ezabatu?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "byte"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "A"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/seg"
-msgstr[1] "byte/seg"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "seg"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "min"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "ordu"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Egunak"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Bideoak"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Konprimituak"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Testuak"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programak"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Edozein"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Kalifikatu gabea"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Baliogabe / Apurturik / Gezurra"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Pobrea"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Oso ona"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Ondo"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Ezinobea"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "denak"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "Beste denak"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "'ipfilter.dat' eta 'ipfilter_static.dat' IP iragazkiak kargatzen."
+msgid "Queued clients: %d"
+msgstr "Bezeroak ilaran: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr ""
-"Huts egin du ipfilter.dat '%s' fitxategia kargatzerakoan, formatu ezezagunak "
-"aurkitu dira."
+msgid "Total DL: %s"
+msgstr "DE guztira: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Huts egin du ipfilter.dat '%s' fitxategia kargatzerakoan, ezin da fitxategia "
-"ireki."
+msgid "Total UL: %s"
+msgstr "IG guztira: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "IP-eremu %u kargaturik'%s'-tik."
-msgstr[1] "%u IP-eremu kargaturik'%s'-tik."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Igoera muga"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "Gaizki eratutako lerro %u alde batetar utzi da."
-msgstr[1] "Gaizki eratutako %u lerro alde batetar utzi dira."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Deskarga muga"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Konexio aktiboak (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "aMule ezkutatu"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Fitxategi Xehetasunak"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "aMule erakutsi"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% egina"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Irten"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "eD2k lotura: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Burutu"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
-"Hemen klikatu eD2k lotura testu kontrolean zure deskargarako gehitzeko."
+"Hemen klikatu eD2k lotura deskarga ilararen testu kontrolean gehitzeko."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr ""
-"Geraterak hemen agertuko dira. Gertaera zerrenda osorako, begiratu "
+"Gertaerak hemen agertuko dira. Gertaera zerrenda osorako, begiratu "
 "Zerbitzari fitxako erregistroan."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Kargatzen ..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Konektatuta zauden zerbitzariaren erabiltzaile kopurua ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Erabiltzaile: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr ""
-"Uneko zerbitzarira konektauriko erabiltzaileak eta guztirako erabiltzaile "
+"Uneko zerbitzarira konektaturiko erabiltzaileak eta guztirako erabiltzaile "
 "kalkulua."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Gora: 0.0 | Behera: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
 msgstr ""
-"Unekoa Igoera eta deskarga batez bestekoa. Gaiturik badago parentesi arteko "
+"Unekoa igoera eta deskarga batez bestekoa. Gaiturik badago parentesi arteko "
 "zenbakiak bezero goiburu datuak dira."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4632,522 +2760,577 @@
 "optimal connection type)."
 msgstr ""
 "Konexio egoera eta uneko transferentziak bistaratzen ditu. Gezi gorriak "
-"deskonektaturik zaudela adierazten du, horiak berriz ID baxua duzula eta "
-"berdeak ID altua (konexio mota hoberena)."
+"deskonektaturik zaudela adierazten du, horiak berriz ID baxua (suebakia) "
+"duzula eta berdeak ID altua (konexio mota hoberena)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Ez konektaturik ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Une honetan konektaturiko zerbitzaria."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Bilatu"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Izena:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Mota"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Lokala"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Orokorra"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "FitxategiEgiaztapena"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
-msgstr "Hedatutako Parametroak"
+msgstr "Hedatutako parametroak"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Iragazten"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
-msgstr "Fitxategi Mota"
+msgstr "Fitxategi mota"
+
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Edozein"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Konprimituak"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Audioa"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD-irudiak"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Irudiak"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programak"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Testuak"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Bideoak"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Hedapena"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
-msgstr "Gutx. Tamaina"
+msgstr "Gutx. tamaina"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Byte"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
-msgstr "Gehi. Tamaina"
+msgstr "Gehi. tamaina"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Eskuragarritasuna"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Iragazkia:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
-msgstr "Iragazi Emaitzak"
+msgstr "Iragazi emaitzak"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Emaitza alderantzikatu"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
-msgstr "Fitxategi Ezagunak Ezkutatu"
+msgstr "Fitxategi ezagunak ezkutatu"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Hasi"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Gehiago"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
-"Bilaketa emaitza gehiago eD2k sarean. Ez da onartzen Kad sarean oraindik."
+"Bilatu emaitza gehiagoren bila eD2k sarean. Kad-en ez da onartzen oraindik."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Gelditu"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Deskargatu"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
-msgstr "Eremuak Garbitu"
+msgstr "Eremuak garbitu"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Emaitzak"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Garbitu amaituriko deskargak"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Bistaratu igoera / ig-ilara"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Bezeroak ilaran:"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Bidali"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Fitxategiaren iturburua:"
 
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Ezarritako mezua bidali."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Itxi"
-
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Itxi elkarrizketa saio hau."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Orokorra"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
-msgstr "Izen osoa:"
+msgstr "Izen osoa :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "E/G"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
-msgstr "met Fitxategia:"
+msgstr "met-fitxategia :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Aztertze zenbakia :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Fitxategi tamaina :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
-msgstr "Fitxategi zati egoera:"
+msgstr "Fitxategi zati egoera :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
-msgstr "Azkenez osorik ikusia:"
+msgstr "Azkenez osorik ikusia :"
+
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Transferentzia"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
-msgstr "Aurkitutako jatorriak:"
+msgstr "Aurkitutako jatorriak :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
-msgstr "Jatorriak transferitzen:"
+msgstr "Jatorriak transferitzen :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
-msgstr "Fitxategi zati kopurua:"
+msgstr "Fitxategi zati kopurua :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
-msgstr "Erabilgarri:"
+msgstr "Erabilgarri :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
-msgstr "Data abiadura:"
+msgstr "Data abiadura :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
-msgstr "Deskarga aktibo denbora:"
+msgstr "Deskarga aktibo denbora: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Transferituta :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
-msgstr "Amaitutako tamaina:"
+msgstr "Amaitua tamaina :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
-msgstr "Korrupzio kudeaketa adimentsua"
+msgstr "Hondatze kudeaketa adimentsua"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
-msgstr "Apurketetan galdutakoa:"
+msgstr "Hondaketan galdutakoa :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
-msgstr "Konpresioaz irabazitakoa:"
+msgstr "Konpresioaz irabazitakoa :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "I.C.H. gordetako paketeak :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
-msgstr "Fitxategi Izenak"
+msgstr "Fitxategi izenak"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Konpondu"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Garbitu"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Ezarri"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ados"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
-msgstr "Iruzkina Testua denak erabiltzaileak"
+msgstr "Iruzkin/tasa fitxategia (testua erabiltzaile guztiek ikusgarria)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Filma batentzat bere luzera, hizkuntza ... esan ditzakezu.\n"
-"eta gezurra bada, zuk beste aMule erabiltzeei abisatu dezakezu."
+"Filma batentzat iraupena, istorioa, hizkuntza ...\\n\\neta faltsua den esan "
+"dezakezu, aMule beste erabiltzaileei esan diezaiekezu."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
-msgstr "Fitxategi Kalitatea"
+msgstr "Fitxategi kalitatea"
+
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Kalifikatu gabea"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Baliogabe / Apurturik / Gezurra"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Pobrea"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Oso ona"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Ondo"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Hobezina"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Fitxategi kalifikazioa hartu edo fitxategia baliogabea bada besteak "
 "abisatu ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Berritu"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Deskargatzen, itxoin mesedez ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Ezezaguna"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Behar den Informazioa"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
-msgstr "IP Helbidea:"
+msgstr "IP helbidea :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
-msgstr "Ataka:"
+msgstr "Ataka :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
-msgstr "Bestelako Informazioa"
+msgstr "Bestelako informazioa"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
-msgstr "Erabiltzaile izena:"
+msgstr "Erabiltzaile-izena :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Erabiltzaile aztertze zenbakia :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Berritu zure partekatutako fitxategiak"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Uneko Saioa"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Guztira"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Eskaerak:"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Igoerak:"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Gehitu"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
-msgstr "Deskarga Abiadura"
+msgstr "Deskarga abiadura"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Unekoa"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Funtzionamendu bataz bestekoa"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "saio batez bestekoa"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
-msgstr "Igoera Abiadura"
+msgstr "Igoera abiadura"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Konexioak"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Deskarga aktiboak"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "konexio aktiboak (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Igoera aktiboak"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Estatistika zuhaitza"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Erabiltzaile izena:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
-msgstr "Erabiltzailoe-egiaztapena:"
+msgstr "Erabiltzaile-Egiaztapena:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Bezero softwarea:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Bezero bertsioa:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP helbidea:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
-msgstr "Erabiltzaile IDa:"
+msgstr "Erabiltzaile ID-a:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "Zerbitzaria IP-a:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Zerbitzari izena:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
-msgstr "Nahastea:"
+msgstr "Nahasmena:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "bezerora transferentziak"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Uneko eskakizuna:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
-msgstr "Batazbesteko igoera abiadura;"
+msgstr "Bataz besteko igoera abiadura:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
-msgstr "Batazbesteko deskarga abiadura;"
+msgstr "Bataz besteko deskarga abiadura:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Igoa (saioa):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Deskargatua (saioa):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Igoa (denera):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Deskargatua (denera):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Puntuak"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "DE/IG aldagaia:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Identitate ziurra:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Kalifikazioa (guztira):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Ilara ranking-a:"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Ilara puntuak:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Ezizena"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - Linux Mandoa"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - plataforma anitzetarako mandoa"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Hau beste erabiltzaileek zuri konektatzerakoan ikusiko duten izena da."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Hizkuntza"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Hizkuntza: "
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Argibideak bistarazi aurreko denbora."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Honek kontroletan erabiliko den hizkuntza ezartzen du."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Beste aukerak"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Arakatu bertsio berrien bila abiaraztean"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
-"Hau gaitzeak Amulek abiaraztean bertsio berririk dagoen arakatzea egingo du"
+"Hau gaitzean Amulek abiaraztean bertsio berririk dagoen arakatzea egingo du"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Hasi txikiturik"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Gaitzerakoan aMule txikituri abiaraziko da."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Galdetu irteterakoan"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "aMule-k itxi aurretik galdetzea egiten du."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "aMulek irten aurretik galdetzea egiten du."
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr "Ezkutatu aplikazio leihoa itxi botoia sakatzean"
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
-msgstr "Tresnabarra Ikonoa Gaitu"
+msgstr "Tresna-barra ikonoa gaitu"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
-msgstr "Honek Tresnabarra (edo lan barra) Ikonoa gaitu/ezgaitzen du."
+msgstr "Honek tresna-barra (edo lan-barra) ikonoa gaitu/ezgaitzen du."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
-msgstr "Txikitu Ikono-barrara"
+msgstr "Txikitu ikono-barrara"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5155,580 +3338,465 @@
 "Hau gaitzeak aMule zeregin-barrara beharrean sistema tresna-barrara "
 "txikitzea eragingo du."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Argibide atzerapena segundotan"
-
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Argibideak bistarazi aurreko denbora."
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Gomendio atzerapena: "
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "segundo"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Nabigatzaile hautaketa"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Sistema lehenespena"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Aukeratu zure nabigatzailea hemen"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Nabigatzaile Pertsonalizatua:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Idatzi zure nabigatzaile izena hemen. Pertsonalizatutako nabigatzailea "
-"erabiltzeko 'Erabiltzaileak ezarririk' aukeratu goiko menuan."
+"Idatzi zure nabigatzaile izena hemen. Zurian utzi sisteman lehenetsitako "
+"nabigatzailea erabiltzeko."
+
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Arakatu"
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Ireki fitxa berrian aukera dagoenenean"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Ireki web orria fitxa berrian leiho berrian ordez aukera dagoenenean"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
-msgstr "Bideo erreproduzitzailea"
-
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Sortu babeskopia aurreikusteko"
+msgstr "Bideo-erreproduzigailua"
 
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr "Banda-zabalera mugak"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
+msgstr "Konexio mugak"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Igo"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
-msgstr "Ataka Ezarpena"
+msgstr "Ataka ezarpena"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Bezero TCP ataka estandarra:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Atakak"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "TCP ataka estandarra "
+
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Hau eD2k ataka estandarra da eta ezin da ezgaitu."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Hedaturiko bezero UDP ataka:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "UDP ataka zerbitzari eskakizunetarako (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr "UDP ataka hedaturiko ed2k eskaera eta Kad sarearentzako erabiltzen da"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Hedatutako UDP ataka (Kad / bilaketa orokorra) "
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "ezgaitu"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr "UDP ataka hau hedaturiko eD2k eskakizun eta Kad sarerako erabiltzen da"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Helbidea Behartu"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Eskaera hedatuetarako UDP ataka (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Fitxategiko jatorri muga"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Gaitu UPnP router ataka berbideraketarako"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Muga gogorra"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnP TCP ataka (aukerakoa):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Konexio mugak"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Lotu helbide lokala IP batetara (zurian edozeinentzat):"
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Gehienezko konexioak"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Erabiltzaile aurreratuak bakarrik: Sare interfaze anitz badituzu idatzi "
+"amulek erabili behar duen sare interfazearen helbidea."
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Jatorri muga deskarga bakoitzerako:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Aldibereko konexioa muga:"
+
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "UPnP gaitu"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP TCP Ataka:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Konektatu abiaraztekoan"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
-msgstr "berkonektatu konexioa galtzean"
-
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Ikusi konexio erabilpena"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Zerbitzari Aukerak"
+msgstr "birkonektatu konexioa galtzean"
 
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Ezabatu hildako zerbitzaria geroago"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "saiakerak"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
-msgstr "Auto-eguneratu zerbitzari zerrenda abiaraztean"
+msgstr "Auto-eguneratu zerbitzari zerrenda abioan"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Zerrenda"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Eguneratu zerbitzari zerrenda zerbitzari batetara konektatzean"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Eguneratu zerbitzari zerrenda bezero bat konektatzean"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Erabili lehentasun sistema"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Erabili IDbaxu egiaztapena konektatzerakoan"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Konexio ziurra"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
-msgstr "Estatiko zerbitzarieta bakarrik autokonektatu"
+msgstr "Estatiko zerbitzarietara bakarrik auto-konektatu"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Ezarri eskuz gehitutako zerbitzariak lehentasun altuan"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "K.K.A. gaiturik"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH egiaztapen guztiez fidatu (ez gomendaturik)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Hondatze kudeaketa adimentsua (I.C.H)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Gaitu"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+"I.C.H aurreratuak, egiaztapen bakoitza egiaztatzen du (ez da gomendatzen)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Gehitu fitxategiak deskargetara geldirik"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Gehitu fitxategiak deskarga zerrendara auto-lehentasunarekin"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Saiatu lehen eta azken zatiak hasieran deskargatzen"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Gehitu partekatutako fitxategi berriak auto-lehentasunarekin"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "saiatu zati osoak transferitzen bidaltze guztietan"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Abiarazi geratutako hurrengo fitxategia bat bukatzerakoan"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Abiarazi lehen pausaturiko fitxategia fitxategi bat osatzean"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Kategoria berdinekoa"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "10 jatorri gorde fitxategi arraroentzat (< 20 jatorri)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "Orden alfabetikoan"
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Disko lekua"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Aurresleitu disko lekua fitxategi berrientzat"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Egiaztatu disko lekua"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
+"Fitxategi berrientzat fitxategi bakoitzarentzat disko leku osoa "
+"aurresleitzen du, honek fragmentazioa murrizten du"
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Hau hautatu aMulek duzun disko lekua egiaztatzea nahi baduzu"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Gelditu deskargak disko-leku librea hona iristean "
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Gutx disko lekua:"
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Aukera hau hautatu aMulek zure disko-lekua egiaztatzea nahi baduzu"
 
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
-msgstr "Ezarri hemen libre eduki nahi duzun disko toki txikiena."
+msgstr "Ezarri hemen nahi duzu disko toki txikiena."
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "Aurre-gorde disko lekua fitxategi berrientzat"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "10 jatorri gorde fitxategi arraroentzat (< 20 jatorri)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
-"Fitxategi berrietan fitxategi osoaren disko-lekua aurre-gordetzen da, honek "
-"fragmentazioa murrizten du"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Igoerak"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Gehitu partekatutako fitxategi berriak auto-lehentasunarekin"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Sarrera"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Aldirokoa"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Partekatua"
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Deskargentzat helburu karpeta"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Aldiroko deskarga fitxategientzat karpeta"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Partekatutako karpetak"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
-"(Egin klik eskubiko botoiaz karpeta ikono batetan barnekoak ere partekatzeko)"
+"(Egin klik eskuineko botoiaz karpeta ikono batean barnekoak ere partekatzeko)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Partekatu ezkutatutako fitxategiak"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Grafikak"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Eguneratze atzerapena : 5 seg"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Bataz besteko grafiko denbora : 100 min"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
-msgstr "Konexio Graf Eskala: 100 "
+msgstr "Konexio graf eskala: 100 "
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Aukeratu Estatistikak Koloreak"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Deskarga grafiko eskala:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Igoera grafiko eskala:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Koloreak: "
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Atzeko planoa"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Sareta"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Uneko deskargak"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Martxan deskargak bataz bestean"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Saioaren bataz besteko deskargak"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Uneko igoerak"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Martxan igoerak bataz bestean"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Saioaren bataz besteko igoerak"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Konexio aktiboak"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
-msgstr "Sistema barra Abiadura barra ikonoa"
+msgstr "Sistema-barra abiadura-barra ikonoa"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Uneko Kad-nodoak"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Kad-nodoak martxan"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Kad-nodo saioa"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Hautatu"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Zuhaitza"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Erakutsiko diren bezero kopurua (0=mugagabea)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Konexio gaitasunak"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Oharra: Balio hauek estatistiketarako erabiltzen dira."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! KONTUZ !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Ezarpen hauek ez aldatu ez badakizu zer egiten\n"
-"ari zaren, bestela normalean gauzak daudenak\n"
-"baino okerrago geratuko dira zuretzat\n"
-"\n"
-"Amulek ondo funtzionatu beharko luke ezarpen\n"
-"hauek aldatu gabe."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Ezarpen aurreratuak"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Gehienezko konexio berri / 5 seg"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
-msgstr "Fitxategia  Buffer Tamaina: 240000 byte"
+msgstr "Fitxategia buffer tamaina: 240000 byte"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Igoera ilara tamaina: 5000 bezero"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Zerbitzari konexio berritze aldia: Ezgaiturik"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Deskarga Ilara Fitxategi aurrerapena"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Ikusi ehunekoa"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Ikusi aurrerapen-barra "
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Aurrerapen barra Estiloa"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Laua"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Biribildu"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Itxura Onarpena"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Gaitu itxura onarpena "
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Itxura:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- ez dago itxira erabilgarririk -"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Ezgaitu ordenagailu ordulariaren bigarren planoko modua"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Erabiltzeko azala: "
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Erakutsi \"eD2k lotura kudeatzaile azkarra\" leiho bakoitzean."
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Zutabe Sailkapena"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Auto-sailkatu fitxategiak deskarga ilaran (CPU altua)"
-
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "Amule-k zure deskarga zerrendako zutabeak automatikoki sailkatuko ditu"
-
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Beste Interfaze Aldagaiak"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Ikusi eD2k lotura kudeatzaile azkarra"
-
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Erakutsi argibide hedatuak kategoria fitxetan"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
+msgstr "Erakutsi aplikazio bertsioa izenburuan"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "Erakutsi transferentziak izenburuan"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Tresnabarra bertikal orientazioa"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Aplikazio izenaren aurretik"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Aplikazio izenaren ondoren"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Erakutsi goiburu erabilpena"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Zati fitxategi zenbakia ikusi fitxategi izenaren aurretik"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Tresna-barra bertikal orientazioa"
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Web zerbitzari parametroak"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "Bistarazi estatu banderak bezeroentzat"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Abiaraztean amuleweb abiarazi"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Web zerbitzari ataka"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Gaitu UPnP ataka berbidalketa web zerbitzari atakan"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Web zerbitzariaren UPnP TCP ataka"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Deskargatu ilara fitxategiak"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Orrialdea berritzeko denbora (segundotan)"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Erakutsi aurrerapen ehunekoa"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Gaitu Gzip konpresioa"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Erakutsi aurrerapen barra"
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Gaitu baimen gutxiko erabiltzailea"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Laua"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Baimen osorako pasahitza"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Biribildu"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Baimen baxuko pasahitza"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Auto-ordenatu fitxategiak (PUZ handia)"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Web txantiloia"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "Amule-k zure deskarga zerrendako zutabeak automatikoki sailkatuko ditu"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Urruneko konexio ezarpenak"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Onartu urruneko konexioak"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"Entzuten den interfazearen IP-a\n"
-"(hutsik edozeinentzat)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "Entzunean dagoen interfazearen IPa:"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5737,75 +3805,115 @@
 "helbidea. Eremu huts batek edo 0.0.0.0 ezartzeak edozein interfazetan "
 "entzutea eragingo du."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP ataka"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "TCP ataka:"
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "UPnP berbideraketa gaitu EC atakan"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Pasahitza"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Web zerbitzari parametroak"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Exekutatu web-zerbitzaria abioan"
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Web txantiloia"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Baimen osorako pasahitza"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Gaitu baimen gutxiko erabiltzailea"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Baimen baxuko pasahitza"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Gaitu web zerbitzari atakaren UPnP ataka birbidalketa"
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Web zerbitzari UPnP ataka (aukerakoa)"
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Orrialdea berritzeko denbora (segundotan)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Gaitu Gzip konpresioa"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "Ados"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Hemen klik egin hobespenetan eginiko edozein aldaketa ezartzeko."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Berrezarri hobespenetan eginiko edozein aldaketa."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Titulua :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Iruzkina :"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Deskarga direktorioa :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Aldatu lehentasuna fitxategi berrientzat :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "Ez aldatu"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
-msgstr "Hautatu kolorea kategoria honentzat (unean aukeratutakoa):"
-
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Bistaratu zerbitzariko motd konektatzerakoan ..."
+msgstr "Hautatu kolorea kategoria honentzat (unean aukeratutakoa) :"
 
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Zerbitzari argibideak"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Garbitu"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Botoi hau klikatu erregistroa garbitzeko."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule Erregistroa"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Klik egin botoi honetan zerbitzari zerrenda URL-tik eguneratzeko ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Zerbitzari zerrenda"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5813,43 +3921,55 @@
 "Idatzi server.met fitxategiaren URL bat hemen eta gero ezkerreko botoia "
 "sakatu zerbitzari ezagunen zerrenda eguneratzeko."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Gehitu zerbitzaria eskuz: Izena"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Idatzi zerbitzari berriaren izen hemen"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP ataka"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Idatzi x.x.x.x formatua erabiliaz zerbitzariaren ip helbidea."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Idatzi zerbitzariaren ataka hemen."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Gehitu zerbitzari bat eskuz (sar datuak ezkerrean lehenik) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule erregistroa"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Zerbitzari argibideak"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
-msgstr "ED2K Argb"
+msgstr "Argb"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad Argb"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Klikatu botoi honetan nodo zerrenda URL honetatik eguneratzeko ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nodoak (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5857,51 +3977,55 @@
 "nodes.dat fitxategi baten URL-a idatzi eta ezkerreko botoia sakatu nodo "
 "ezagunen zerrenda eguneratzeko."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Nodo estatistikak"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Autoabioa"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Nodo berria"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Ataka:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Hemendik abiarazi:\n"
-"bezero ezagunak"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Bezero ezagunetarik abiarazi"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
-msgstr "Kad Deskonektatu"
+msgstr "Kad deskonektatu"
+
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Erabili erabiltzaile identifikazio segurua"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2k argb."
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Gomendagarri da aukera hau gaitzea. Ez duzu krediturik jasoko EIS erabiltzen "
+"ez baduzu."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Protokolo nahastea"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Gaitu protokolo nahastea"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5909,120 +4033,116 @@
 "Aukera honek protokolo nahastea gaitzen du eta aMule-k beste bezeroetako "
 "konexio nahastuak onartzea eragite du."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Erabili nahastea kanporako konexioetan"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
 msgstr ""
 "Aukera honek Amulek beste bezero/zerbitzarietara konektatzerakoan protokolo "
-"nahaspena erabiltzea eragiten du."
+"nahastea erabiltzea eragiten du."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Onartu nahasitako konexioak bakarrik"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
 msgstr ""
-"Aukera honek Amulek nahasitako konexioak Bakerik onartzea eragiten du. "
+"Aukera honek Amulek nahasitako konexioak bakarrik onartzea eragiten du. "
 "Jatorri gutxiago izango dituzu baina zure trafiko guztia nahasia egongo da"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Fitxategi aukerak"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Edozeini"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
-msgstr "Batez"
+msgstr "Bat ere ez"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Nork ikus ditzake partekatutako fitxategiak:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Nork ikusi ditzaken nire partekatutako fitxategiak:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Hautatu zure partekatutako fitxategiak nork ikus ditzakeen."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP-Iragazkia"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Bezeroak iragazi"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "~/.aMule/ipfilter.dat fitxategian ezarritako bezero IP iragazketa gaitu."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Zerbitzariak iragazi"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "~/.aMule/ipfilter.dat fitxategian ezarritako zerbitzari IP iragazketa gaitu."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
-msgstr "Berritu Zerrenda"
+msgstr "Berritu zerrenda"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 "Berritu ~/.aMule/ipfilter.dat fitxategian ezarritako IP helbideen iragazkia"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
-msgstr "URLa:"
+msgstr "URL-a:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Eguneratu orain"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Automatikoki eguneratu ip iragazkia abioan"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
-msgstr "Iragazki Maila:"
+msgstr "Iragazki maila:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
-msgstr "Beti Iragazi LAN IPak"
+msgstr "Beti iragazi LAN IP-ak"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoia kudeaketa pareko ez diren IP helbideentzat"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
 msgstr ""
-"Paketea atzera bota bezero IPa paketea jaso den IParen ezberdina bada. Kontu "
-"handiaz erabili."
+"Paketea atzera bota bezero ip-a paketea jaso den ip-aren ezberdina bada. "
+"Kontu handiaz erabili."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Erabili sistemako ipfilter.dat eskuragarri badago"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -6030,23 +4150,11 @@
 "Ez bada ipfilter.dat fitxategi lokalik aurkitu, orduan onartu sistema "
 "ipfilter fitxategia erabiltzea."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Erabili erabiltzaile identifikazio segurua"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Gomendagarri da aukera hau gaitzea. Ez duzu krediturik jasoko EIS erabiltzen "
-"ez baduzu."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
-msgstr "Gaitu Sinadura linean"
+msgstr "Gaitu sinadura linean"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6054,901 +4162,1363 @@
 "Gaitu sistemak fitxategiak idaztea, kanpo programek sinadurak sortu ahal "
 "izateko egiten da."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
-msgstr "Eguneratu Maiztasuna (Seg):"
+msgstr "Eguneratu maiztasuna (Seg):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
-msgstr "Aldatu Linean sinadura eguneraketa aldia (seguntutan)."
+msgstr "Aldatu linean sinadura eguneraketa aldia (segundotan)."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Sare Sinadura Karpeta:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Gorde sare sinadura fitxategia hemen: "
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr "Klikatu hemen linean sinadurak dituen karpeta aukeratzeko."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Ezgaitu/Gaitu"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "sarrera mezu iragazkia (txat honetan ezik):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Iragazki Aukerak:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Mezu guztiak iragazi"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Lagun zerrendan ez daudenen mezuak iragazi"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Bezero ezezagunen mezuak iragazi"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Hau duten mezuak iragazi (erabili ',' bereizle bezala):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr "Gehitu amulek mezuetan blokeatzea nahi dituzun hitzak"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Ikusi jasotako mezuak erregistroan"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Iruzkinak"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Fitxategi iruzkinak hau du (',' erabili bereizle gisa):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Proxy gabeko zerbitzari konexio automatikoa"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Gaitu autentifikazioa"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "erabiltzaile/pasahitz autentifikazioa gaitu/ezgaitu"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Erabiltzaile izena: "
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Proxy-ra konektatzeko erabiliko den erabiltzaile izena"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Pasahitza:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Proxy-ra konektatzeko erabiliko den pasahitza"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Proxy-a gaitu"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Proxy onarpena gaitu/ezgaitu"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Proxy mota:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Konektatzen ari zaren proxyaren mota"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Proxy ostalaria:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Proxy ostalari izena"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Proxy ataka:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Proxy ataka"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Egiaztapena"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Egiaztapena gaitu"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "erabiltzaile/pasahitz egiaztapena gaitu/ezgaitu"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Proxy-ra konektatzeko erabiliko den erabiltzaile izena"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Pasahitza:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Proxy-ra konektatzeko erabiliko den pasahitza"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Proxy gabeko zerbitzari konexio automatikoa"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Hona konektaturik:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
-msgstr "Saioa hasi urruneko amulen"
+msgstr "Urruneko aMulen saioa hasi"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Erabiltzaile izena"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Ezarpen hauek gogoratu"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
-msgstr "Gaitu Arazpen luzeko saio hasiera."
+msgstr "Gaitu arazten luzeko saio hasiera."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
-msgstr "Mezu Kategoriak:"
+msgstr "Mezu kategoriak:"
+
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Zain..."
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Gehitu"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Berriz saiatu hautaturikoak"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Ezabatu hautaturikoak"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "Gertaera motak"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr "Hautako fitxategientzat estatistika eta bezero ilara: Saioa / osotara"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Igoera aktiboak"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "fitxategi guztien ehunekoa"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Fitxategi guztiak"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Hautatutako fitxategiak"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Igoera aktiboak bakarrik"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Erakutsi bezeroak:"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Berritu:"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Berritu zure partekatutako fitxategiak"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Bidali"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Zehaztutako mezua bidali."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Itxi elkarrizketa saio hau."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Konektatu edozein zerbitzari eta/edo Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Sare Leihoa"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Partekatutako fitxategiak"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Bilaketa leihoa"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Ezgaitua [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Fitxategi Transferentzia leihoa"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "byte"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Partekatutako fitxategi leihoa"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Mezu leihoa"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Estatistika grafiko leihoa"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Hobespen Ezarpen Leihoa"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Kategoria Berria"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "A"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Aukeratu karpeta bat deskargatutako fitxategientzat"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Kategoria izen bat ezarri behar duzu!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/seg"
+msgstr[1] "byte/seg"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Kategoria bide bat ezarri behar duzu!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"Huts kategoriarentzat sarrera karpeta sortzerakoan. Mesedez ezarri baliozko "
-"bide bat!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "seg"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "min"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "ordu"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Egunak"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "denak"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "Beste denak"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Amaitugabea"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Gelditua"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Bideoa"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Fitxategia"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Testua"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Martxan"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "'%s' luzapen ezezaguna '%s' komandoarentzat.\n"
+msgid "Using config dir: %s"
+msgstr "Konfigurazio direktorioa: %s"
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Zati-fitxategiak aria bihurtzearen zain ixteko..."
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "'%s' komando ezezaguna.\n"
+msgid "Importing %s: %s"
+msgstr "%s inportatzen: %s"
 
-#: src/ExternalConnector.cpp:155
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Aldiroko karpeta irakurtzen"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Deskarga fitxategiaren argibide oinarrizkoak eskuratzen"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Helburu fitxategia sortzen"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Deskarga fitxategi zaharretik Kargatzen (%u %u-tik)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Datu blokeak deskarga fitxategi berrian gordetzen (%u %u-tik)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Deskarga fitxategi argibide jatorria eskuratzen"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Deskarga gehitu eta zati fitxategi berria gordetzen"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Zati fitxategiak inportatu"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Egoera"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "FitxategiEgiaztapena"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Diskoa: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command cannot have an argument.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Komando honek ezin du argumenturik eduki.\n"
+"Mesedez ezarri aldiroko fitxategiak bilatuko diren karpeta! (azpikarpetak "
+"ere arakatuko dira)"
 
-#: src/ExternalConnector.cpp:157
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"This command must have an argument.\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Komando honek argumentu bat eduki behar du.\n"
+"Behar bezala deskargaturiko fitxategien jatorri fitxategiak ezabatze nahi al "
+"duzu?"
 
-#: src/ExternalConnector.cpp:160
-msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Ezabatu jatorriak?"
+
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "ERROREA: Huts zati fitxategia sortzerakoan"
+
+#: src/PartFile.cpp:336
+#, c-format
+msgid "Trying to load backup of met-file from %s"
+msgstr "met-file fitxategiaren babes-kopia %s-tik kargatzen saiatzen"
+
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "ERROREA: Huts part.met fitxategiak irekitzean: %s ==> %s"
+
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "ERROREA: part.met fitxategi tamaina 0 da: %s ==> %s"
+
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "ERROREA: part.met fitxategi bertsio okerra: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"\n"
-"Komando hau osotu gabe dago, beheko luzapen hauetako bat erabili dezakezu.\n"
+"Errorea: %s (%s) hondaturik dago (marka okerrak: %s), ezin da fitxategia "
+"kargatu."
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Gehigarri erabilgarriak:\n"
+"ERROREA: %s (%s) hondaturik dago (okerreko etiketa-kopurua), ezin da "
+"fitxategia kargatu."
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Komando erabilgarriak:\n"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Fitxategi informazioa berreskuratzen saiatzen..."
+
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr ""
+"Izen gabeko fitxategia berreskuratzen - RecoveredFile.dat bezala "
+"berreskuratzen saiatuko da"
+
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+"Fitxategi informazio eskuragarri guztia berreskuraturik :D - Erabiltzen "
+"saiatzen..."
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Ezin da fitxategi informazioa berreskuratu:("
+
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Huts egin du irekitzerakoan: %s (%s)"
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "ABISUA: %s agian hondaturik dago (%i)"
+
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "ERROREA zati fitxategia gordetzerakoan: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "SI errorea zati fitxategia gordetzerakoan: "
+
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Ezin da '%s'-ren tamaina eskuratu - %s fitxategia erabiltzen."
+
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' hutsik dago - %s fitxategia erabiliko da."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Errorea %s-ren part.met.seeds fitxategia gordetzerakoan"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "jatorri ale %i bildurik zati fitxategiarentzat: %s (%s)"
+msgstr[1] "%i jatorri ale bildurik zati fitxategiarentzat: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "%s (%s) zati fitxategiak ez du ale fitxategirik"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "%s (%s) zati fitxategiak ale fitxategi huts bat du"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Errorea zati-fitxategi hazi fitxategia irakurtzerakoan (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
 #, c-format
 msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Komando guztietan berdin da maiuskula/minuskula.\n"
-"Idatzi '%s <komandoa>' <komandoa>-ri buruzko xehetasunak ikusteko.\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Hondaturiko zatia (%d) aurkitu da %d zati %s zati fitxategian - "
+"FitxategiEgiaztapenEmaitza |%s| fitxategiEgiaztapena |%s|"
+msgstr[1] ""
+"Hondaturiko zatia (%d) aurkitu da %d zatitan %s zati fitxategian - "
+"FitxategiEgiaztapenEmaitza |%s| fitxategiEgiaztapena |%s|"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Aplikazioa utzi."
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Bukatutako (%i) zatia aurkiturik %s-n"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Laguntza bistarazi."
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Amaitutako berrazterketa: %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Ustekabeko errorea %s osatzean. Fitxategia gelditurik"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Deskarga amaiturik: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "fitxategia ezabatzen:%s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr ""
+"ABISUA: Ezinda deskargaturiko zatia egiaztatu - egiaztapen-bilduma osatugabe "
+"'%s'-rentzat"
+
+#: src/PartFile.cpp:2292
+#, c-format
 msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"Komando bati buruz laguntza jasotzeko, idatz ezazu 'help <komandoa>'.\n"
-"Komandoen zerrenda osoa eskuratzeko, 'help' idatzi.\n"
+"ERROREA: Ezin da deskargaturiko zatia egiaztatu - egiaztapen-bilduma "
+"osatugabea (%s). Hau ez zen inoiz gertatu beharko"
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
 #, c-format
 msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"\n"
-"Erabili '%s' komando zerrendarentzako\n"
-"\n"
+"Egiaztapenean fitxategi amaiera deskargaturiko %2$u tamaina duen %1$u zatian "
+"(geh. %3$u) %5$u tamaina duen '%4$s' zati-fitxategian: %6$s"
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Sintaxi errorea!"
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "KONTUZ: Diskoa leku askieza! Fitxategia gelditzen: %s"
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr ""
-"Errorea komandoa prozesatzekoan - Ez zen inoiz pasa beharko! Mesedez "
-"zorriaren berri eman\n"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Deskargaturiko %i zatia hondaturik dago fitxategi honetan: %s"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Komando honek ez luke parametrorik eduki beharko."
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Hondaturiko %i zatia %s-rena -> Gordetako byte-ak: %s"
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Komando honek parametro bat eduki beharko luke."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Esleitzen"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Argumentu baliogabea."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Disko leku askieza"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Hau komando osatugabe bat da."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Deskargatua"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:4003
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Sakatu '%s' laguntza gehiagorako.\n"
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "ERROREA: Huts '%s' zati fitxategia irekitzean"
+
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Sistema lehenetsia"
+
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albaniera"
+
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabiera"
+
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Bablea"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Euskara"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgariera"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Katalana"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Txinatarra (Sinplea)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Txinatarra (ohizkoa)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Kroaziera"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Txekiera"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Daniera"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Nederlandera"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Ingelesa (E.B.)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estoniera"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finlandiera"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Frantsesa"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galiziera"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Alemana"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Grekoa"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebreera"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Hungariera"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italiera"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italiera (Suitzarra)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japoniera"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Koreera"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lituaniera"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvegiera (Nynorsk)"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Poloniera"
 
-#: src/ExternalConnector.cpp:362
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugesa"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugesa (Brasildarra)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Errusiera"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Esloveniera"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Gaztelera"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Suediera"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turkiera"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ukraniera"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Aldatu hizkuntza"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr "Ez dago aMulerentzat itzulpen instalaturik"
+
+#: src/Preferences.cpp:771
+msgid "No languages available"
+msgstr "Ez dago hizkuntza erabilgarririk"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "ez dago aukera erabilgarririk"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Kategoria baliogabe aurkitua, baztertzen"
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr "TCP ataka ezin da 65532 baino altuagoa izan UDP socket-a TCP+3 bait da"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Hau %s %s %s da\n"
+msgid "Default port will be used (%d)"
+msgstr "Lehenetsiriko ataka erabiliko da (%d)"
 
-#: src/ExternalConnector.cpp:364
+#: src/Preferences.cpp:1790
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Hau %s %s da\n"
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Kentzen ez-dagoen partekatutako direktorioa: %s"
+
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Konexioa"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Direktorioak"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Zerbitzariak"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Fitxategiak"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Segurtasuna"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Interfazea"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy-a"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Iragazkiak"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Urruneko kontrolak"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Sinadura linean"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Aurreratua"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Gertaerak"
 
-#: src/ExternalConnector.cpp:395
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Araztena"
+
+#: src/PrefsUnifiedDlg.cpp:249
 msgid ""
-"\n"
-"Creating client...\n"
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
-"\n"
-"Bezeroa sortzen...\n"
+"Hurrengo aldagaiak ordeztuko dira:\n"
+"    %PARTFILE - fitxategiaren bide osoa\n"
+"    %PARTNAME - fitxategi-izena soilik"
 
-#: src/ExternalConnector.cpp:418
-#, c-format
+#: src/PrefsUnifiedDlg.cpp:289
 msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
 "\n"
-"Ok, exiting %s...\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
 msgstr ""
+"Ezarpen hauek ez aldatu ez badakizu zer egiten\n"
+"ari zaren, bestela normalean gauzak daudenak\n"
+"baino okerrago geratuko dira zuretzat.\n"
 "\n"
-"Ados, %s uzten...\n"
+"Amulek ondo funtzionatu beharko luke ezarpen\n"
+"hauek aldatu gabe."
+
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Huts %d IDa eta %s gakoaz konfiguraziotik programara konektatzean"
+
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr "Huts %d IDa eta %s gakoaz konfiguraziotik programara datuak bidaltzean"
+
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Konektatzen ari zaren Proxy-aren mota"
+
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr "Huts %d IDa eta %s gakoaz programatik konfiguraziora datuak bidaltzean"
 
-#: src/ExternalConnector.cpp:424
+#: src/PrefsUnifiedDlg.cpp:589
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
+"aMule must be restarted to enable these changes:\n"
 "\n"
-"Exiting...\n"
 msgstr ""
-"Ezin da pasahitz zuri batez konektatu.\n"
-"Pasahitz bat ezarri behar duzu konfigurazio fitxategian,\n"
-"komando lerroan, edo eskatzen zaizunean sartu.\n"
+"aMule berrabiarazi egin behar da aldaketa hauek gaitu ahal izateko:\n"
 "\n"
-"Irteten...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Laguntza testu hau bistarazi."
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP ataka aldaturik.\n"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "aMule abiarazirik duen ostalaria (lehenetsia: localhost)"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP - ataka aldaturik.\n"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Kanpo Konexioetarako aMuleren ataka. (Lehenetsia 4712)"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- Kanpo konexio ataka aldatua.\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- Lanpo konexio onarpena aldatua.\n"
+
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- Kanpo konexio interfazea aldatua.\n"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Kanpo Konexio Pasahitza."
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"Auto-eguneraketa zerbitzari zerrenda hutsa dago.\n"
+"'Auto-eguneratu zerbitzari zerrenda abioan' ezgaitu egingo da."
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Konfigurazio fitxategitik irakurri."
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Kanpo konexioak gaiturik dituzu baina ez duzu pasahitzik ezarri.\n"
+"Kanpo konexiorik ezin da onartu baliozko pasahitza ezarri arte."
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Ez ezer bistarazi irteera estandarrean."
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Hizkuntza aldaturik.\n"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Luze - arazpen mezuak ere bistarazi."
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Aldiroko karpeta aldaturik.\n"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Programa lokala (hizkuntza) ezarri."
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- ED2K sarea gaiturik.\n"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Idatzi komando lerroko aukerak konfigurazio fitxategira."
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Bai eD2k eta bai Kad sareak ezgaiturik daude.\n"
+"Ezingo zara konektatu behintzat bietako bat gaitu arte."
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
 msgstr ""
-"aMuleren konfigurazio fitxategian oinarriturik konfigurazio fitxategia "
-"sortzen du."
+"Kad ezin da abiarazi zure UDP ataka ezgaiturik badago.\n"
+"UDP ataka gaitu edo Kad ezgaitu."
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Programa bertsioa bistarazi."
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"aMule orain berrabiarazi BEHAR duzu.\n"
+"Orain ez berrabiaraziaz gero ez kexatu ezer txarra gertatzen bada.\n"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Kreditu fitxategia kargaturik, bezero %u ezagutzen da"
-msgstr[1] "Kreditu fitxategia kargaturik, %u bezero ezagutzen dira"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Zure auto-eguneraketa zerbitzari zerrenda zurian dago.\n"
+"Mesedez bete behintzat baliozko server.met fitxategi batetara zuzenduaz.\n"
+"Klikatu \"zerrenda\" botoia URL-a sartzeko."
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - bezero %u-ren kredituak amaitu dira!"
-msgstr[1] " - %u bezeroren kredituak amaitu dira!"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Aldi baterako fitxategiak"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Ez da 'cryptkey.dat' fitxategia aurkitu, sortzen."
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Sarrera fitxategiak"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"ERROREA: aMule deabrua ezin da erabili kanpo konexioak ezgaiturik badaude. "
-"Kanpo konexioak gaitzeko aMule arrunta erabili, amuled --ec-config aukeraz "
-"abiarazi edo ezarri \"AcceptExternalConnections\" gakoa 1 balioaz ~/.aMule/"
-"amule.conf fitxategian"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Linean sinadurak"
 
-#: src/amuled.cpp:750
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "ERROR: %s"
-msgstr "ERROREA: %s"
+msgid "Choose a folder for %s"
+msgstr "Aukeratu karpeta bat %s-rentzat"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Barkatu"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Erakutsi Igoerak"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Erakutsi Ilara"
-
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Erakutsi Bezeroak"
-
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Hautatu Ikuspegia"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Bezero Softwarea"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Itxoindakoa"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Ordu Denbora"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Igo/Deskargatu"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Urruneko Egoera"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Fitxategia Lehentasuna"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Arakatu bideo erreproduzigailua"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Puntuak"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Hautatu nabigatzailea"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Galdeturik"
-
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Azkenez ikusia"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Ilaran jarri da"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "Abiarazgarria%s"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Igoera Egoera"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Editatu zerbitzari zerrenda"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Igotarikoa"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Gehitu hemen server.met deskargatzeko URL-a.\n"
+"URL helbide bat lerro bakoitzean."
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Deskarga Egoera"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Eguneratze maiztasuna: seg %d"
+msgstr[1] "Eguneratze maiztasuna: %d seg"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Deskargaturikoa"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "ErabiltzaileEgiaztapena"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Enkriptatuta"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Ezkutatu partekatutako fitxategiak"
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Batez besteko grafiko denbora: minutu %d"
+msgstr[1] "Batez besteko grafiko denbora: %d minutu"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Bezero xehetasunak"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Konexio grafiko eskala: %d"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Gaiturik"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Fitxategi buffer tamaina: byte %d"
+msgstr[1] "Fitxategi buffer tamaina: %d byte"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Onartua"
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Igoera ilara tamaina: bezero %d"
+msgstr[1] "Igoera ilara tamaina: %d bezero"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Ez da onartzen"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Zerbitzari konexio berritze maiztasuna: minutu %d"
+msgstr[1] "Zerbitzari konexio berritze maiztasuna: %d minutu"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Ezgaiturik"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Zerbitzarira konexio berritze maiztasuna: Ezgaiturik"
+
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "ezgaiturik"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "Execute command on '%s' event"
+msgstr "Gertaeran'%s' komandoa exekutatu"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Ez osorik"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Gaitu komando exekuzioa muinean"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Tipo Gaiztoa"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Muin komandoa:"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Egiaztaturik: Ondo"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Gaitu komando exekuzioa urruneko interfazean"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Ez dago erabilgarri"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Urruneko interfaze komandoa:"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Hurrengo aldagaiak aldatuko dira:"
 
-#: src/SearchDlg.cpp:527
+#: src/SearchDlg.cpp:506
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 "Gutxienezko tamaina gehienezkoa baino txikiagoa izan behar da. Gehienezkoa "
 "alde batetara utziko da."
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
 msgid "Search warning"
 msgstr "Bilaketa oharra"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Mugarik gabea"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Nagusia"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule tresna-barra Menua"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Ezin da Kad bilaketarik egin Kad ez badago abiarazirik"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Abiadura mugak:"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "Ezin da eD2k bilaketarik egin eD2k ez badago konektaturik"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "IG: Batez"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Espero gabeko errorea Kad bilaketa egitean: "
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "IG: %u"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "FitxategiID"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DE: Batez"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Fitxategia"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "DE: %u"
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Kategori honetan deskargatu"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/SearchListCtrl.cpp:639
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Deskarga abiadura: %.1f"
+msgid "Get %s for this file"
+msgstr "Eskuratu %s fitxategi honentzat"
 
-#: src/MuleTrayIcon.cpp:370
-#, c-format
-msgid "Upload speed: %.1f"
-msgstr "Igoera abiadura: %.1f"
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Bilatu erlazionatutako fitxategiak (eD2k, zerbitzari lokala)"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Bezero argibideak"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Markatu fitxategia ezaguna bezala"
 
-#: src/MuleTrayIcon.cpp:380
-#, c-format
-msgid "Nickname: %s"
-msgstr "Ezizena: %s"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Kopiatu ed2k lotura arbelera"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Goitizena Ez Hautatuta!"
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Utzia"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Berria"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "BezeroID: "
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Huts zerrendaturiko nahasitako zerbitzarietara konektatzean. Nahaste gabeko "
+"beste saiakera bat egiten."
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Zerbitzari izena: "
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"Huts zerrendako zerbitzari guztietara konektatzen saiatzerakoan. Berriz "
+"hasiko nahiz."
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "ZerbitzariIP: "
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "eD2k sarea hobespenetan ezgaiturik, ez da konektatuko."
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "Ez da konektatzeko baliozko zerbitzaririk aurkitu zerbitzari zerrendan"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "TCP port: %d"
-msgstr "TCP ataka: %d"
-
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "TCP ataka: Ez dago prest"
+msgid "Connected to %s (%s:%i)"
+msgstr "%s (%s:%i)-ra konektaturik"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/ServerConnect.cpp:274
 #, c-format
-msgid "UDP port: %d"
-msgstr "UDP ataka: %d"
-
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "UDP ataka: Ez dago prest"
-
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Linean Sinadura: Gaituta"
+msgid "Connection established on: %s"
+msgstr "Konexioa sorturik: %s"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Linean Sinadura: Ezgaitua"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Errore konponezina konektatzen saiatzean. Internet konexioa eroria egon "
+"daiteke"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/ServerConnect.cpp:350
 #, c-format
-msgid "Shared files: %d"
-msgstr "Part. fitx.: %d"
+msgid "Lost connection to %s (%s:%i)"
+msgstr "%s (%s:%i)-ra konexioa galduta"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/ServerConnect.cpp:360
 #, c-format
-msgid "Queued clients: %d"
-msgstr "Ilarako bezeroak: %d"
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) hilik dagoela dirudi."
 
-#: src/MuleTrayIcon.cpp:476
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Total DL: %s"
-msgstr "DE Guztira: %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) beterik dagoela dirudi."
 
-#: src/MuleTrayIcon.cpp:483
+#: src/ServerConnect.cpp:392
 #, c-format
-msgid "Total UL: %s"
-msgstr "IG Guztira: %s"
-
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Igoera muga"
-
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Deskarga muga"
-
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "aMule ezkutatu"
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] ""
+"Zerbitzariarekiko konexio automatikoa berriz saiatuko da segundo %d-etan"
+msgstr[1] ""
+"Zerbitzariarekiko konexio automatikoa berriz saiatuko da %d segundotan"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "aMule erakutsi"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Konexioa galdu egin da"
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:419
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Berriketa saioa abiarazirik: %s (%s:%u) - %s %s"
-
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Bezerora Konektaturik ***"
-
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Bezerora Konektatzen ***"
-
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Huts bezerora konektatzerakoan / Konexio galdua ***"
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Huts %s (%s:%i) -ra konektatzerakoan."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Itxi fitxa"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "ERROREA: Socket baliogabea denbora-muga egiaztapenean"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Itxi fitxa guztiak"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "%s (%s:%i) -ra konexio saiakera denboraz kanpo geratu da."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Itxi beste fitxak"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Zaharkitutako DNS galdeketa erantzuna, baztertzen."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "server.met fitxategia kargatzen: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Server.met fitxategia ez da aurkitu!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Huts '%s' server.met fitxategi irakurtzerakoan, formatu ezezaguna aurkiturik."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Huts server.met fitxategia irekitzerakoan!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Server.met fitxategia hondaturik dago, bertsio marka baliogabea aurkitu da: "
 "0x%x, tamaina %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "zerbitzari %i aurkiturik server.met fitxategian"
 msgstr[1] "%i zerbitzari aurkiturik server.met fitxategian"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "zerbitzari %d gehiturik"
 msgstr[1] "%d zerbitzari gehiturik"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Errorea: 'server.met' fitxategia hondatua dago: "
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "SI errorea 'server.met' fitxategia irakurtzean: "
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Zerbitzaria ez da gehitu: [%s:%d] -ek ez du baliozko atakarik ezarri."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr ""
 "Zerbitzaria ez da gehitu: [%s:%d] -ren IP helbidea iragazirik dago edo "
 "baliogabea da."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Zerbitzaria ez da gehitu: [%s:%d] IP:Ataka dun zerbitzaria aurkitu da "
 "zerrendan."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Zerbitzaria gehiturik: [%s:%d] zerbitzaria '%s' izena erabiltzen."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr ""
-"Konektaturik zauden zerbitzaria ezabatzen saiatzen ari zara. Mesedez "
-"deskonektatu lehenik."
+"Konektaturik zauden zerbitzaria ezabatu nahi duzu. Mesedez deskonektatu "
+"lehenik."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Huts '%s' irekitzerakoan"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Huts server.met gordetzerakoan!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "URL Baliogabea"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
-msgstr "Amaiatuta zerbitzari zerrenda %s-tik deskargatzeaz"
-
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Huts zerbitzari zerrenda %s-tik deskargatzerakoan"
+msgid "Finished downloading the server list from %s"
+msgstr "Amaituta zerbitzari zerrenda %s-tik deskargatzeaz"
 
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
 msgstr ""
-"Ez da zerbitzari zerrenda helbiderik aurkitu 'addresses.dat' fitxategian. "
-"Mesedez itsatsi baliozko zerbitzari zerrenda helbide bat fitxategi honetan "
-"zerbitzari-zerrenda automatikoki eguneratu ahal izateko"
+"Ez da zerbitzari zerrenda helbideri aurkitu 'addresses.dat' fitxategian. "
+"Mesedez itsatsi zerbitzari zerrenda erabilgarri bat fitxategi honetan "
+"zerbitzari-zerrenda eguneratu ahal izateko"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Hasi zerbitzari zerrenda %s-tik deskargatzen"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
-msgstr "ABISUA: Okerreko URLa zehaztu da zerbitzari auto-eguneraketentzat: %s"
+msgstr "OHARRA: URL baliogabea ezarri zerbitzari auto-eguneraketarako: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 "Ez da baliozko server.met auto-deskarga url helbiderik aurkitu addresses.dat "
 "fitxategian"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Huts zerbitzari zerrenda %s-tik deskargatzerakoan"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -6956,310 +5526,3169 @@
 "Zerbitzari lokala IPIragazkiak iragazirik dago, beste zerbitzari batetara "
 "birkonektatzen!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Huts `%s' komandoa `%s' gertaeran exekutatzean."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Zerbitzaria izena"
 
-#: src/amule.cpp:703
-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/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Helbidea"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Ataka"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Azalpena"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Erabi."
 
-#: src/amule.cpp:786
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Estatikoa"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Bertsioa"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Ez duzu zerbitzaririk zerbitzari zerrendan.\n"
-"aMulek zerrenda berri bat orain deskargatzea nahi al duzu?"
+"Ezabatu naian zauden zerbitzarira konektaturik zaude. Mesedez deskonektatu "
+"zaitez aurretik. Zerbitzaria EZ da ezabatuko."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Zerbitzari zerrenda deskargatu"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Izen ezezaguna)"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "web server running on pid %d"
-msgstr "web zerbitzaria %d pid-arekin martxan"
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Ziur al zaude %s zerbitzari tinkoa ezabatu nahi duzula"
 
-#: src/amule.cpp:850
-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 ""
-"Abioan web zerbitzari bat exekutatzea eskatu duzu, baina ezin da emuleweb "
-"bitarra exekutatu. Mesede instalatu aMule web zerbitzaria duen paketea edo "
-"aMule --enable-webserver erabiliaz konpilatu eta 'make install' egin"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Zerbitzariak (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Zerbitzaria"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Zerbitzarira konektatu"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Zerbitzaria estatiko bezala markatu"
 
-#: src/amule.cpp:937
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Zerbitzaria ez-estatiko bezala markatu"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Zerbitzariak estatiko bezala markatu"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Zerbitzariak ez-estatiko bezala markatu"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Ezabatu zerbitzaria"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Ezabatu zerbitzariak"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Kendu zerbitzari guztiak"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopiatu eD2k loturak arbelera"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Zerbitzarira birkonektatu"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Ziur zaude zerbitzari guztiak ezabatu nahi dituzula?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Ziur zaude aukeratutako zerbitzaria ezabatu nahi duzula?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Ziur zaude aukeratutako zerbitzariak ezabatu nahi dituzula?"
+
+#: src/ServerSocket.cpp:259
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Ezin da atakak ezarritako helbidean ireki: %s"
+msgid "ERROR: %s (%s) - %s"
+msgstr "ERROREA: %s (%s) - %s"
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:274
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "%u ataka ez dago eskuragarri. IDBaxua izango duzu\n"
+msgid "WARNING: %s (%s) - %s"
+msgstr "ABISUA: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Bezero id berria: %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "ABISUA: ID baxua jaso duzu!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tZiurrenik firewall edo router baten atzean zaudelako izan daiteke."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tArgibide gehiagorako begiratu http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Zerbitzari argibide ezezaguna jasoa! - laburregia"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Zerbitzari berri %d jasoa"
+msgstr[1] "%d zerbitzari berri jasoak"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Zerbitzari zerrenda gordetzeaz amaitu da."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Zerbitzariak azken komandoa ukatu du"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Hondaturiko pakete bat jaso da zerbitzaritik: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Errore kudeaezina zerbitzariko paketea prozesatzekoan: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Ezin da DNS ebazpen hari bat sortu %s-ra konektatzeko"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "%s (%s) IP-dun zerbitzaria iragazirik dago.  Ez dago konektatzen."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "protokolo nahastea erabiltzen."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Konektatzen: %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Ezin da %s zerbitzariaren dns-a ebatzi: Ezin da konektatu!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Zerbitzaria ez da gehitu: ez da IP edo ostalari izenik ezarri."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Zerbitzaria ez da gehitu: Baliogabeko zerbitzari-ataka ezarririk."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "eD2k egoera:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kademlia egoera:"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "LAN moduan abiarazirik"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Martxan"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Egoera:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Konexio egoera:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Suebakirik - ireki %d TCP ataka zure router edo suebakian"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "UDP konexio egoera:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Suebakirik - ireki %d UDP ataka zure router edo suebakian"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Suebaki egoera: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Ez da lagunik behar - TCP ataka irekia"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Ez da lagunik behar - UDP ataka irekia"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Laguna ez"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Lagunera konektatzen"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Lagunera %s-en konektaturik"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Indexatutako jatorriak:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Indexaturiko gakoak:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Indexatutako oharrak:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Indexaturiko karga:"
 
-#: src/amule.cpp:970
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Bataz besteko erab:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Bataz besteko fitxategiak:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Geldirik"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "%s fitxategia partekatuei gehitzen"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Ezagututako partekatutako fitxategi %i aurkiturik"
+msgstr[1] "%i ezagututako partekatutako fitxategi aurkiturik"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "%i ezagututako partekatutako eta ezezagun %i aurkiturik"
+msgstr[1] "%i ezagututako partekatutako eta %i ezezagun aurkiturik"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "ERROREA: %s partekatzeko saiakera"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Partekatutako direktorioa ez da aurkitu, baztertzen: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Ez da partekatu daitekeen fitxategirik direktorioan: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Erabiltzaile izena"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Deskarga abiadura"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Igoera abiadura"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Zati eskuragarriak"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+msgid "Upload Status"
+msgstr "Igoera egoera"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Deskarga Egoera"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Jatorria"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Fitxategi lokalaren izena"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+msgid "Shares File List"
+msgstr "Partekatutako fitxategi zerrendak"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Eskaerak"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Onartutako eskaerak"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Transferitutako datuak"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Partekatze erlazioa"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Eskuratutako zatiak"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Jatorri osoak"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Karpeta bidea"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Iruzkina/Kalifikazioa gehitu"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Iruzkina/Kalifikazioa editatu"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Izena aldatu"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Gehitu fitxategiak bildumara zerrenda bidaltzeko"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Kopiat&URI magnetikoa arbelera"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Kopiatu eD2k lotura arbelera (&Jatorria)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Kopiatu eD2k lotura arbelera (Jatorria) (&zifratu aukerekin)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Kopiatu eD2k lotura arbelera (&ostalaria)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr "Kopiatu eD2k lotura arbelera (ostalaria) (&zifratu aukerekin)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Kopiatu eD2k lotura arbelera (&AICH argb)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "ID altua behar duzu baliozko jatorri lotura bat sortzeko"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Partekatutako fitxategiak (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[ZatiFitxategia]"
+
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Urruneko fitxategiaren izena"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Igotako datuak (saioa (guztira)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Guztira buruak (paketeak): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Fitxategi eskakizun buruak (paketeak): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Jatorri aldaketa buruak (paketeak): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Zerbitzari buruak (paketeak): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Kad buruak (paketeak): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Zifratu goiburua (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Igoera aktiboak: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Igoerak zain: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Guztira behar bezala igotako saioak: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Guztira oker igotako saioak: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Batez besteko igoera denbora: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Deskargaturiko datuak (saioa (guztira)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Aurkituriko iturburuak: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Deskarga aktiboak (zatiak): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Saio IG/DE abiadura (guztira): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Bataz besteko deskarga tasa (saioa): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Bataz besteko igoera tasa (saioa): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Gehienezko deskarga tasa (saioa): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Gehienezko igoera tasa (saioa): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Berkonexioak: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Denbora lehen transferentziatik: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Zerbitzaria noiztik konektatua: %s"
+
+#: src/Statistics.cpp:779
 #, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Konexio aktiboak (estimazioa): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Gehienezko konexio mugara iritsi: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Batez besteko konexioak (ebaluazioa): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Puntako konexioak (estimazioa): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Bezeroak"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Ezezaguna: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Iragazirik: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Ukatuak: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Guztira: %i Ezagunak: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Zerbitzariak martxan: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Huts egindako zerbitzariak: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Guztira: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Ezabatutako zerbitzariak: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Iragaziriko zerbitzariak: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Erabiltzaileak - zerbitzariak martxan: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Fitxategiak - zerbitzariak martxan: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Guztira erabiltzaileak: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Guztira fitxategiak: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Zerbitzari lan karga %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Partekatutako fitxategi kopurua: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Guztira partekatutako fitxategi tamaina: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Bataz besteko fitxategi tamaina: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Sistema eragilea"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Ez Jasoa"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Konexio aktiboak (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Ez dago erabilgarri"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Inoiz ere ez"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "'%2$d' pid-a duen '%1$s' komandoa '%3$d' egoera kodeaz amaitu da."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "<str> exekutatu eta irten."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "IP Formatu baliogabea. Erabili xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"%u ataka ez dago eskuragarri!\n"
-"\n"
-"Honek IDBaxua izango duzula esna nahi du.\n"
-"\n"
-"Egiaztatu zure sarea ataka sarrera eta irteerarako irekirik dagoela "
-"ziurtatzeko."
+"Komando honek argumentu bat behar du. Baliozko argumentuak: 'all' fitxategi-"
+"izena edo zenbaki bat.\n"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Huts Online Sinadura Fitxategia sortzerakoan"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Egiaztapenez prozesatzen: "
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Huts aMule Online Sinadura Fitxategia sortzerakoan"
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Izenez prozesatzen: "
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
-"Aukeratutako lokalak ez dirudi zure sisteman instalaturik (Oharra: Hala ere "
-"erabiltzen saiatuko da)"
+"Komando honek argumentu bat behar du. Baliozko argumentuak: fitxategi "
+"egiaztapena.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Ez da baliozko zenbaki bat\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr ""
+"Ez da baliozko egiaztapen bat (luzera zehazki 32 karakterekoa izan behar "
+"da)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Eskakizunak errore ezezagun batez huts egin du."
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Ekintza arrakastatsuki amaitu da."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "aMule %s abiarazten duzun lehen aldia da"
+msgid "Request failed with the following error: %s"
+msgstr "Eskakizunak errore honekin huts egin du: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Bertsioa hau beta bertsio bat da, egunero eguneratzen da, eta\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Bezero IP iragazketa %s dago.\n"
 
-#: src/amule.cpp:1311
-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/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "EZGAITURIK"
 
-#: src/amule.cpp:1312
-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/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "GAITURIK"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Zerbitzari IP iragazketa %s dago.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Uneko IPiragazki maila %d da.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Banda-zabalera mugak: Gora: %u kB/s, Behera: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "%s %s %s-(e)ra konektaturik"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Ez konektatzen"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "suebakirik"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ondo"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"Hurrengo aukerak aldatu egion dira bertsio honetan segurtasun arrazoiak "
-"direla eta:\n"
+"\n"
+"Deskargatu:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Kanporako eta barnerako konexioetan protokolo nahastea gaiturik.\n"
+"Igo:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Zerbitzari zerrenda beste bezero eta zerbitzarietatik deskargatzea "
-"ezgaitu.\n"
+"Bezero ilaran:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Aldaketa hauen arrazoiei buruz argibide gehiagorako, bilatu\n"
-"AMule wikian (http://wiki.amule.org)  \"fake servers\"  buruzko argibideak.\n"
-"Garrantzitsua da zuk gezurrezko zerbitzariak ezabatzea zerbitzari "
-"zerrendatik aMule-k behar bezala funtziona dezan."
+"Jatorriak guztira:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Bilaketa emaitza kopurua: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Bilaketa aurrerapena: %u %% \n"
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Bilaketa aurrerapena ez dago eskuragarri"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Zerbitzaritik erantzun ezezagun bat jaso da, OpCode = %#x."
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Egoera informazio laburra bistarazi."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Konexio egoera bistarazi, uneko igo/deskarga abiadura, etab.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Estatistika zuhaitz osoa bistarazi."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Aukeran, 0-255 tarteko argumentu bat eman daiteke komando honi. Honekin "
+"bezero\n"
+"zuhaitzean ikusiko diren sarrera muga ezarri daiteke. 0 emanez edo ez emanez "
+"gero\n"
+"'mugagabea' izango da.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Adibidea: 'statistics 5' erabiliaz bezero mota bakoitzeko 5 bertsio nagusiak "
+"ikusiriko dira.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Itzali aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
+"Itzali urruneko muina (amule/amuled).\n"
+"Honek testu bezeroa ere itxiko du ez bait da muinik gabe funtzionatzeko\n"
+"gai.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Emandako objektua birkargatu."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Partekatutako fitxategi zerrenda birkargatu."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "IP iragazki taula birkargatu."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Uneko Ip iragazte taula birkargatu."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "IP iragazki taula URLtik eguneratu."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "URLa ez bada ezartzen hobespenetakoa erabiliko da."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Sarera konektatu."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Honek hobespenetan gaiturik dauden sare guztietara konektatuko du.\n"
+"Aukeran IP:Ataka formatuan zerbitzari helbide bat ezarri dezakezu "
+"zerbitzari\n"
+"horretara bakarrik konektatzeko. IP helbidea puntuaturiko IPv4 hamartar "
+"helbide\n"
+"bat izan behar da edo ebatzi daitekeen izen bat."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "eD2k sarera bakarrik konektatu."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "KAD sarera bakarrik konektatu."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Saretik deskonektatu."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Honek konektaturik zauden sare guztietatik deskonektatuko zaitu.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "eD2k saretik bakarrik deskonektatu."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Kad saretik bakarrik deskonektatu."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Ed2k edo lotura magnetiko bat gehitu muinera."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"Gehitzeko eD2k lotura hauetako bat izan daiteke:\n"
+"*) fitxategi lotura bat (ed2k://|file|...), berau deskarga ilaran gehituko "
+"da,\n"
+"*) zerbitzari lotura bat (ed2k://|server|...), berau zerbitzari zerrendan "
+"gehituko da\n"
+"*) edo zerbitzari-zerrenda lotura bat, kasu honetan zerbitzari guztiak "
+"gehituko dira\n"
+"   zerbitzari zerrendara.\n"
 "\n"
-"Honetaz gain, nabigatzaile ezarpenak sistema lehenespenetara berrezarri "
-"dira. Mesedez konfiguratu nabigatzaile aukerak beharrezko baduzu.\n"
+"Lotura magnetikoak ed2k egiaztapena eta fitxategi tamaina eduki behar ditu.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Hobespen balio bat ezarri."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "IP iragazki hobespenak ezarri."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "IP iragazketa gaitu bai bezero bai zerbitzarientzat."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "IP iragazketa ezgaitu bai bezero bai zerbitzarientzat."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "IP iragazketa gaitu/ezgaitu bezeroentzat."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "IP iragazketa gaitu bezeroentzat."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "IP iragazketa ezgaitu bezeroentzat."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "IP iragazketa gaitu/ezgaitu zerbitzarientzat."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "IP iragazketa gaitu zerbitzarientzat."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "IP iragazketa ezgaitu zerbitzarientzat."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Ip Iragazte maila hautatu."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Argibide gehiago, laguntza eta bertsio berriak gure webgunean aurki "
-"ditzakezu,\n"
+"Baliozko iragazte maila 0-255 tartekoak dira, eta lehenetsiriko balioa\n"
+"(hasierakoa) 127 da.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "www.aMule.org -en, edo irc.freenode.net IRC sareko #aMule kanalean.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Konexio zabalera mugak ezarri."
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Edozein akatsen berri emateko:http://forum.amule.org"
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "Komando hauentzat emandako balioa Kb/s-tan egon behar da.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Igoera konexio zabalera muga ezarri."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Deskarga konexio zabalera muga ezarri."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Hobespen balio bat eskuratu eta bistarazi."
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "IP iragazki hobespenak eskuratu."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "IP iragazketa egoera eskuratu bai bezero bai zerbitzarientzat."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "IP iragazketa egoera eskuratu bezeroentzat."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "IP iragazketa egoera eskuratu zerbitzarientzat."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "Ip iragazte maila hautatu."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Konexio zabalera mugak eskuratu."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Bilaketa bat egiten."
+
+#: src/TextClient.cpp:914
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"Zuk aukeratutako sinadura karpeta BALIOGABEA da!\n"
-" Lehenespenak konpondu artean lineako sinadura EZGAITU egingo da."
+"Bilaketa mota ezarri behar da mota idatziaz:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Adibidez: 'search kad fitxategia' erabiliaz \"fitxategia\" bilatuko du Kad "
+"sarean.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Bilaketa orokor bat egin."
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Bilaketa lokal bat egin"
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Kad bilaketa bat egin"
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Azken bilaketaren emaitzak bistaratzen ditu."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Aurreko bilaketaren emaitzak bistaratzen ditu.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Ikusi bilaketaren aurrerapena."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Ikusi bilaketaren aurrerapena.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Fitxategia deskargatzen hasi"
+
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
+"Azkenengo bilaketako fitxategiaren zenbakia eman behar da.\n"
+"Adibidez: 'download 12' erabiliaz azken bilaketako 12. emaitzaren deskarga "
+"abiaraziko da.\n"
+
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Deskarga pausarazi."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Deskarga berrekin."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Deskarga utzi."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Deskarga lehentasuna ezarri."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr ""
+"Deskarga baten lehentasuna ezarri Baxua, Normala, Altua edo Auto bezala.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Ezarri lehentasun txikia."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Ezarri lehentasun normala."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Ezarri lehentasun handia."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Ezarri lehentasun automatikoa."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Ilarak/zerrenda bistarazi."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Igoera/deskarga- ilara, zerbitzari zerrenda edo partekatutako fitxategi "
+"zerrenda bistarazi.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Igoera ilara bistarazi."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Deskarga ilara bistarazi."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Erregistroa ikusi."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Zerbitzari zerrenda bistarazi."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Erregistroa garbitu."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "'%s' fitxategiarentzat disko-leku aurregordetzeak huts egin du: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Zaharkitutako komandoa, '%s' erabili horren ordez."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "ERROREA: ezin da erregistro fitxategia ireki"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Hau zaharkituriko komando bat da eta etorkizunean ezabatu egin daiteke.\n"
+"Erabili '%s' horren ordez.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "ABISUA: erregistro fitxategia hutsik dago. Zerbait oker dago."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMule testu bezeroa"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Erregistroa berrezarri egin da"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "'%s'-ko AICH egiaztapen zaharra 64b-ekoa bihurtzen '%s'-en."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "ZerbitzariMezua: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr ""
+"Oharra: '%s' fitxategi izena baliogabea da eta'%s' bezala berrizendatuko da."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Huts egin du nodo zerrenda deskargatzerakoan."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"Oharra: '%s' fitxategia badago dagoeneko eta'%s' bezala berrizendatuko da."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Huts egin du"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Ziur zaude kategoria honetako fitxategi guztiak ezeztatu eta ezabatu nahi "
+"dituzula?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Hondaturiko bertsio arakatze fitxategia"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Berrespena beharrezkoa"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Zaharkiturik dagoen aMule bertsio bat erabiltzen ari zara!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "99 kategoria soilik onartzen dira."
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "Kategoria gehiegi!"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Beste guztiak"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Hautatu ikuspen iruzkina"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Gehitu kategoria"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Editatu kategoria"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Ezabatu kategoria"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Zure aMule bertsioa %i.%i.%i da eta azken bertsioa %li.%li.%li da"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+"Huts fitxategia irekitzean (%s), partekatutako fitxategi zerrendatik kentzen."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Azken bertsioa beti http://www.amule.org webgunean aurki daiteke"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Egiaztapena eskaturik fitxategi ezezagunarentzat: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "OHARRA: Zure aMuled bertsioa zaharkiturik dago: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Fitxategiaren igoerak berriarazten: %s"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Zure aMule kopia zaharkiturik dago."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Fitxategiaren igoerak gelditzen: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Huts bertsio arakatze fitxategia deskargatzerakoan"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Huts `%s' komandoa `%s' gertaeran exekutatzean."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Deskarga osatua"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Fitxategiaren bide osoa."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Fitxategiaren izena biderik gabe."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "Fitxategiaren eD2k egiaztapena."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Fitxategi tamaina byte-etan."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Batutako deskarga aktibitate denbora."
 
-#: src/amule.cpp:2025
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Elkarrizketa saio berria hasia"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Mezu bidaltzailea."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Ez dago lekurik"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Disko partizioa."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Errorea osatzean"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Erab: %s | Fitx: %s"
+msgid "Processing file number %u: %s"
+msgstr "%u zenbakidun fitxategia prozesatzen: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr ""
+"Zati egiaztapenak eskatu dituzu (9.5 MB baino fitxategi txikiagoekin "
+"bakarrik)"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Erabil: E: %s K: %s | Fitx: E: %s K: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Fitxategia ez dago !\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Ez da sarerik hautatu"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, aMuleren eD2k lotura sortzailea"
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Ongietorria!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Sarrera parametroak"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Egiaztatzeko Fitxategia"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Gehitu aukerako URL gehiago fitxategi honentzat"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Sar hemen eD2k lotura konputatzea nahi duzun fitxategia"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Sartu hemen eD2k loturara gehitzea nahi duzun URLa: Gehitu / amaieran "
+"aLinkCreator-ek uneko fitxategi izena gehitzeko"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Ezabatu"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Zati egiaztapenekin lotura bat sortu"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Fitxategi berri eta arraroak zabaltzen laguntzen du, lotura tamaina "
+"handitzearen kostuarekin"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4 fitxategi egiaztapena"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "MD4 fitxategi egiaztapena"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k lotura"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Gorde"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Kopiatu arbelera"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Ireki"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Ireki fitxategi bat bere eD2k lotura konputatzeko"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Kopiatu konputaturiko eD2l lotura arbelera"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Gorde honela"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Gorde konputaturiko eD2k lotura fitxategi batean"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "ALinkCreator-ri buruz"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Hautatu eD2k lotura konputatzea nahi duzun fitxategia"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Ezin da arbela ireki"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Kopiatzeko ezer ez oraingoz !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Hautatu eD2k lotura konputazioaren fitxategia"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Ezin da ireki "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Mesedez idatzi fitxategi izen bat"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Gordetzeko ezer ez oraingoz !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, aMule eD2k lotura sortzailea\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmap-ak: http://www.everaldo.com eta http://www.icomania.com\n"
+"eta http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"GPL-pean banatua"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Aztertzen..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator zuretzat lanean dago"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "MD4 egiaztapena konputatzen..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "eD2k egiaztapena konputatzen..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Ezeztaturik !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "%s %s-ra konektaturik"
+msgid "Done in %.2f s"
+msgstr "%.2f seg-etan egina"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "URL dagoeneko gehiturik duzu !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Mesedez idatzi zurian ez dagoen URL bat"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "%s-ra konektatzen"
+msgid "Unable to open %s"
+msgstr "Ezin da %s ireki"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "eD2k-tik deskonektatuta"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i egun %i ordu %i min %i s"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad abiarazirik."
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uE %02uh %02umin %02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad gelditurik."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Kad-era konektatuta (ondo)"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Kad-era konektatuta (suebakirik)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Kad-etik deskonektatua"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, amule Estatistika"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Deskarga abiadura handiena wxCas abiarazirik dagoenetik"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Guztizko gehienezko deskarga abiadura wxCas aurreko abiarazteetan"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistema"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Auto berritzea gelditu"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Gorde estatistikak irudiak"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Inprimatu estatistika irudia"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Hobespen ezarpenak"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "WxCas-ri buruz"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Auto berritzea abiarazi"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Auto berritzea geraturik"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Auto berritzea abiarazirik"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Gorde estatistika Irudia"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMule estatistikak"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Kad sarea ezin da erabili hobespenetan UDP ataka ezgaiturik badago, ez da "
-"abiaraziko."
+"Arazo bat dago inprimatzerakoan.\n"
+"Agian zure inprimagailua ez dago behar bezala ezarririk?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kad sarea hobespenetan ezgaiturik, ez da konektatuko."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Inprimatzen"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Huts 'emfriends.met' lagun zerrenda fitxategia irakurketarako ireki!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pedro de Oliveiraren <falso@rdk.homeip.net> CAS-en oinarriturik \n"
+"\n"
+"GPL lizentziapean banaturik"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Huts 'emfriends.met' lagun zerrenda fitxategia idazketarako ireki!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh Oh, aMule ez dago abiarazirik..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule abiarazirik dago"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule abiarazirik dago, baina deskonektaturik"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule konektatzen ari da..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh Oh, aMule egoera ezezaguna da..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " noiz abiarazirik "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " gelditurik dago !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " ez dago konektaturik !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " konektatzen..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " zerbait arraroa egiten ari da, araka ezazu !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " hona konektaturik dago: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "deskonektaturik"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " hona konektaturik "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " eta "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Deskargak guztira: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Igoerak: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Saio deskargak: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Deskargak: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Igoerak: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Partekatuak: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " fitxategia(k), bezero ilaran: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Denbora: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " - "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Sistema karga bataz-bestekoak (1-5-15 min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Sistema noiztik abiarazirik: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "amulesig.dat fitxategia duen karpeta"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Idatzi zure amulesig.dat fitxategia dagoen karpeta izena"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Berritze aldia segundotan"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Sortu estatistika irudi bat berritze bakoitzean"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Idatzi hemen estatistika irudiak sortzea nahi duzun karpeta"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Igo aldiro zure estatistika irudia FTP zerbitzarira"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP Url-a"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP bidea"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Sar hemen zure FTP zerbitzariaren helbidea"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr ""
+"Idatzi hemen estatistika irudiak FTP zerbitzarian gordeko diren karpeta"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Erabiltzaile"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Idatzi hemen zure FTP zerbitzarian sartzeko erabiltzaile izena"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Idatzi hemen zure FTP zerbitzarian sartzeko pasahitza"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "FTP igoera aldia minututan"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Egiaztatu"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Zure sinadura fitxategia duen karpeta"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Estatistika irudiak sortuko diren karpeta"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "<str> txantiloia kargatzen du"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Web zerbitzariaren HTTP ataka"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Erabili UPnP ataka berbideraketa web zerbitzari atakan"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP ataka"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Erabili gzip konpresioa"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Sarrera osoko pasahitza web zerbitzarirako"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Gonbidatu pasahitza web zerbitzarirako"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Gaitu gonbidatu sarrera"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Gonbidatu sarrera ezgaitu"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Kargatu/gorde web-zerbitzari ezarpenak urruneko aMule-tik/ra"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMule konfigurazio fitxategi bidea. EZ ERABILI ZUZENEAN!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "PHP interpretea ezgaitu (zaharkiturik)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "PHP orrialdeak eskakizun bakoitzean birkonpilatu"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule web zerbitzaria"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "web bezero konexioa onartua\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "ERROREA: ezin da web bezero konexioa onartu\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Eskakizunak errore honez huts egin du: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Ez da index fitxategia aurkitu: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Saioa Iraungirik - saio hasiera eskatzen\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Saioa ondo, saioa hasirik\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Saioa ondo, saioa hasi gabe\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Ez dago saio irekirik - saio hasiera eskatuko da\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Saioa sorturik - saio hasiera eskatzen\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Eskakizuna prozesatzen [jatorrizkoa]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Ez da pasahitzik ezarri, ez da saioa hastea onartzen."
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Pasahitz egiaztatzen\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Pasahitz egiaztapen baliogabea\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Pasahitza ondo\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Pasahitza oker\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Ez duzu pasahitzik idatzi. Ez da pasahitz zuria onartzen.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Saio amaiera eskakizuna\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Eskakizuna prozesatzen [birbidalia]: "
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Albaniera"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Deskarga Egoera"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Eguneratze atzerapena : segundo %d"
+#~ msgstr[1] "Eguneratze atzerapena : %d segundo"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr ""
+#~ "Iruzkinak eta botazioak ez dira onartzen urruneko interfazean oraindik"
+
+#~ msgid "Transferring"
+#~ msgstr "Bidaltzen"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "QR: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "Ilaran"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "EGITEKE - bilaketa aurrerapena ikusi"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Fitxategiarentzat AICH eta MD4 egiaztapenak sortzen: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Fitxategiarentzat MD4 egiaztapena sortzen: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Fitxategiarentzat AICH egiaztapena sortzen: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr "KONTUZ: Ezin da jatorrizko '%s' ezabatu basbeskopia sortu ondoren"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "KONTUZ: Huts %s ezabatzerakoan"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Kalifikazioa (Guztira):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Saiatu zati osoak transferitzen bidaltze guztietan"
+
+#~ msgid "Networks window"
+#~ msgstr "Sare leihoa"
+
+#~ msgid "Searches window"
+#~ msgstr "Bilaketa leihoa"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Deskargatzen"
+
+#~ msgid "Shared files window"
+#~ msgstr "Partekatutako fitxategi leihoa"
+
+#~ msgid "Messages window"
+#~ msgstr "Mezu leihoa"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Estatistika grafiko leihoa"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Hobespen ezarpen leihoa"
+
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Ataza-barra ikonoa galdua, birsortzen saiatzen ..."
+
+#~ msgid "Transfers"
+#~ msgstr "Transferentziak"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Fitxategi transferentzia leihoa"
+
+#~ msgid "Unban"
+#~ msgstr "Barkatu"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Erakutsi igoerak"
+
+#~ msgid "Show Queue"
+#~ msgstr "Erakutsi ilara"
+
+#~ msgid "Select View"
+#~ msgstr "Hautatu Ikuspegia"
+
+#~ msgid "Client Software"
+#~ msgstr "Bezero Softwarea"
+
+#~ msgid "Waited"
+#~ msgstr "Itxoindakoa"
+
+#~ msgid "Upload Time"
+#~ msgstr "Ordu Denbora"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Igo/Deskargatu"
+
+#~ msgid "Remote Status"
+#~ msgstr "Urruneko Egoera"
+
+#~ msgid "File Priority"
+#~ msgstr "Fitxategia Lehentasuna"
+
+#~ msgid "Score"
+#~ msgstr "Puntuak"
+
+#~ msgid "Asked"
+#~ msgstr "Galdeturik"
+
+#~ msgid "Last Seen"
+#~ msgstr "Azkenez ikusia"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Ilaran jarri da"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Igotarikoa"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Deskargaturikoa"
+
+#~ msgid "Userhash"
+#~ msgstr "ErabiltzaileEgiaztapena"
+
+#~ msgid "Encrypted"
+#~ msgstr "Enkriptatuta"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "%d bandera bit-mapa deskargaturik."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Bistaratu igoera / ilara"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Bezeroak ilaran:"
+
+#~ msgid "Current Session"
+#~ msgstr "Uneko saioa"
+
+#~ msgid "Total"
+#~ msgstr "Guztira"
+
+#~ msgid "Requested :"
+#~ msgstr "Eskaerak:"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Sortu babeskopia aurreikuspenerako"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Fitxategi transferentzia leihoa"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Guztira Erab: %s | Guztira Fitxategiak: %s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "HTTP deskarga haria hasia"
+
+#~ msgid "Download size not received, downloading until connection is closed"
+#~ msgstr "Deskarga tamaina ez da jaso, konexioa itxi arte deskargatzen"
+
+#~ msgid "Download size: %i"
+#~ msgstr "Deskarga tamaina: %i"
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "HTTP deskarga haria gaitua"
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Ostalaria: %s:%i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Erantzuna: %i (Errorea: %i)"
+
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "KONTUZ: Erantzun hutsa korrontea sortzean"
+
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "ERROREA: Berbideraketa kodea jasoa URL gabe"
+
+#~ msgid "Successfully updated GeoIP.dat"
+#~ msgstr "GeoIP.dat behar bezala bertsio-berritu da"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr ""
+#~ "CIP2Country::CIP2Country(): Huts herrialde datuak hemendik kargatzean: "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "IPiragazki maila eskuratu."
+
+#~ msgid "Makes a search."
+#~ msgstr "Bilaketa bat egiten du."
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Huts egin du"
+
+#, fuzzy
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Abiaraztean amuleweb abiarazi"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "aMule Itzali."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Hurrengo aukerak aldatu egion dira bertsio honetan segurtasun arrazoiak "
+#~ "direla eta:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Kanporako eta barnerako konexioetan protokolo nahastea gaiturik.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Zerbitzari zerrenda beste bezero eta zerbitzarietatik deskargatzea "
+#~ "ezgaitu.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Aldaketa hauen arrazoiei buruz argibide gehiagorako, bilatu\n"
+#~ "AMule wikian (http://wiki.amule.org)  \"fake servers\"  buruzko "
+#~ "argibideak.\n"
+#~ "Garrantzitsua da zuk gezurrezko zerbitzariak ezabatzea zerbitzari "
+#~ "zerrendatik aMule-k behar bezala funtziona dezan."
 
 #~ msgid "Fetching status..."
 #~ msgstr "Bilaketa egoera..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Erabiltzaileak: E: %s K: %s | Fitxategiak E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "%s bezeroa %s:%d IP:Atakan %s %s %s erabiliaz"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() NULL itzuli du"
+
+#~ msgid "Firewalled"
+#~ msgstr "Suebakirik"
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr "%s fitxategia edonkey-rentzat handiegia da, onarpen muga 4GB da."
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Ez dago mota honetarako kudeatzailerik."
+
+#~ msgid "File was not saved"
+#~ msgstr "Fitxategia ez da gorde"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr "Konexioa Huts egin du. Ezin da eskatutako ostalarira konektatu\n"
+
+#~ msgid "Message Filter"
+#~ msgstr "Mezu Iragazkia"
+
+#~ msgid "Gui Tweaks"
+#~ msgstr "Interfaze Aldagaiak"
+
+#~ msgid "Core Tweaks"
+#~ msgstr "Oinarri Aldagaiak"
+
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Argibide atzerapena segundotan"
+
+#~ msgid "Show part file number before file name"
+#~ msgstr "Zati fitxategi zenbakia ikusi fitxategi izenaren aurretik"
+
+#~ msgid "Skin Support"
+#~ msgstr "Itxura Onarpena"
+
+#~ msgid "- no skins available -"
+#~ msgstr " - ez dago itxira erabilgarririk -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Sare Sinadura Karpeta:"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Iragazki Aukerak:"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Konexio gaitasunak"
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Bezero TCP ataka estandarra:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Hedaturiko bezero UDP ataka:"
+
+#~ msgid "Bind Address"
+#~ msgstr "Helbidea Behartu"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "Eskaera hedatuetarako UDP ataka (TCP+3): 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Fitxategiko jatorri muga"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Universal Plug and Play"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "UPnP gaitu"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "UPnP TCP Ataka:"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Abiarazi geratutako hurrengo fitxategia bat bukatzerakoan"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Aukeratu Estatistikak Koloreak"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Deskarga Ilara Fitxategi aurrerapena"
+
+#~ msgid "Show percentage"
+#~ msgstr "Ikusi Ehunekoa"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Ikusi aurrerapen barra"
+
+#~ msgid "Enable skin support "
+#~ msgstr "Gaitu itxura onarpena"
+
+#~ msgid "Skin:"
+#~ msgstr "Itxura:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "Auto-sailkatu fitxategiak deskarga hilaran (CPU altua)"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "Entzuten den interfazearen IP-a\n"
+#~ "(hutsik edozeinentzat)"
+
+#~ msgid "TCP port"
+#~ msgstr "TCP ataka"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Nork ikus ditzake partekatutako fitxategiak:"
+
+#~ msgid "Event types"
+#~ msgstr "Gertaera motak"
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "aMule-k itxi aurretik galdetzea egiten du."
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Ikusi konexio erabilpena"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "K.K.A. gaiturik"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICH egiaztapen guztiez fidatu (ez gomendaturik)"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Ezarpen aurreratuak"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Aurrerapen barra Estiloa"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Zutabe Sailkapena"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Beste Interfaze Aldagaiak"
+
+#~ msgid "File Options"
+#~ msgstr "Fitxategi aukerak"
+
+#~ msgid "Status text"
+#~ msgstr "Egoera testua"
+
+#~ msgid "Pop-up status text"
+#~ msgstr "Bistaratu egoera testua"
+
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr ""
+#~ " 'Plataforma-orotarako' parez-pareko bezeroa eMule-n oinarritua \n"
+#~ "\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr " Web gunea: http://www.amule.org\n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr " Foroa: http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " Kontaktua: admin@amule.org (administrazio arazoak) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr " aMule zati bat honetan oinarriturik dago: \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " Copyright (C) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "Filma batentzat bere luzera, hizkuntza ... esan ditzakezu.\n"
+#~ "eta gezurra bada, zuk beste aMule erabiltzeei abisatu dezakezu."
+
+#~ msgid "Misc Options"
+#~ msgstr "Beste aukerak"
+
+#~ msgid "Server Options"
+#~ msgstr "Zerbitzari Aukerak"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Bistaratu zerbitzariko motd konektatzerakoan..."
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Ezgaitu/Gaitu"
+
+#~ msgid "Authentication"
+#~ msgstr "Egiaztapena"
+
+#~ msgid "General Settings"
+#~ msgstr "Ezarpen orokorrak"
+
+#~ msgid "Max Connections"
+#~ msgstr "Gehienezko konexioak"
+
+#~ msgid "GUI Tweaks"
+#~ msgstr "GUI Aldagaiak"
+
+#~ msgid "Remote Control"
+#~ msgstr "Urruneko kontrola"
+
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Ezin da ezarritako nabigatzailea jakin!"
+
+#~ msgid "User Defined"
+#~ msgstr "Erabiltzaileak ezarririk"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - Linux Mandoa"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Aukeratu zure nabigatzailea hemen"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Nabigatzaile Pertsonalizatua:"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Idatzi zure nabigatzaile izena hemen. Pertsonalizatutako nabigatzailea "
+#~ "erabiltzeko 'Erabiltzaileak ezarririk' aukeratu goiko menuan."
+
+#~ msgid "Please wait... "
+#~ msgstr "Itxoin mesedez... "
+
+#~ msgid "Could not determine the command for running the browser."
+#~ msgstr "Ezin dut nabigatzailea irekitzeko komandoa asmatu."
+
+#~ msgid "EC Connection Failed. Empty reply."
+#~ msgstr "EC Konexioa huts egin du. Erantzun hutsa."
+
+#~ msgid "ExternalConn: Access denied because: "
+#~ msgstr "KanpoKon: Sarrera honegatik ukatua: "
+
+#~ msgid "ExternalConn: Access denied"
+#~ msgstr "KanpoKon: Sarrera ukaturik"
+
+#~ msgid "The ed2k hash of the file."
+#~ msgstr "Fitxategiaren ed2k egiaztapena."
+
+#~ msgid "Copy ED2k &link to clipboard"
+#~ msgstr "Kopiatu ED2k &lotura arbelera"
+
+#~ msgid "Copy ED2k link to clipboard (&Source)"
+#~ msgstr "Kopiatu ED2k lotura arbelara (&Jatorria)"
+
+#~ msgid "Copy ED2k link to clipboard (Source) (&With Crypt options)"
+#~ msgstr "Kopiatu ED2k lotura arbelara (Jatorria) (Kriptogra&fia aukerekin)"
+
+#~ msgid "Copy ED2k link to clipboard (&Hostname)"
+#~ msgstr "Kopiatu ED2k esteka arbelara (&Ostalari-izena)"
+
+#~ msgid "Copy ED2k link to clipboard (Hostname) (With &Crypt options)"
+#~ msgstr "Kopiatu ED2k esteka arbelara (Ostalari-izena) (&Kripto aukerekin)."
+
+#~ msgid "Copy ED2k link to clipboard (&AICH info)"
+#~ msgstr "Kopiatu ED2k esteka arbelara (&AICH argb)"
+
+#~ msgid "Warning"
+#~ msgstr "Oharra"
+
+#~ msgid "Error: Could not listen to TCP port."
+#~ msgstr "Errorea: Ezin dira TCP atakak entzun."
+
+#~ msgid "Webserver HTTP port"
+#~ msgstr "Web zerbitzari HTTP ataka"
+
+#~ msgid "Use UPnP port forwarding on webserver port"
+#~ msgstr "UPnP ataka berbideraketa erabili web zerbitzari atakan"
+
+#~ msgid "Full access password for webserver"
+#~ msgstr "Web zerbitzariaren baimen guztiko pasahitza"
+
+#~ msgid "Guest password for webserver"
+#~ msgstr "Web zerbitzariaren gonbidatu pasahitza"
+
+#~ msgid "Load/save webserver settings from/to remote aMule"
+#~ msgstr ""
+#~ "Kargatu/gorde web zerbitzari ezarpenak urruneko aMule zerbitzaritik/"
+#~ "zerbitzarira"
+
+#~ msgid "Enter here the file you want to compute the Ed2k link"
+#~ msgstr "Sar hemen ed2k lotura konputatu nahi duzun fitxategia"
+
+#~ msgid ""
+#~ "Enter here the URL you want to add to the Ed2k link: Add / at the end to "
+#~ "let aLinkCreator append the current file name"
+#~ msgstr ""
+#~ "Sar Ed2k loturara gehitu nahi duzun URL-a: Gehitu / bukaeran aLinkCreator-"
+#~ "ri uneko fitxategi izena gehitzeko"
+
+#~ msgid "Ed2k File Hash"
+#~ msgstr "Ed2k Fitxategi egiaztapena"
+
+#~ msgid "Ed2k link"
+#~ msgstr "Ed2k lotura"
+
+#~ msgid "Open a file to compute its ed2k link"
+#~ msgstr "ed2k lotura konputatzeko fitxategi bat ireki"
+
+#~ msgid "Copy computed ed2k link to clipboard"
+#~ msgstr "Konputaturiko ed2k lotura arbelara kopiatu"
+
+#~ msgid "Save computed ed2k link to file"
+#~ msgstr "Konputaturiko ed2k lotura fitxategi batetan gorde"
+
+#~ msgid "Select the file you want to compute the ed2k link"
+#~ msgstr "Ed2k lotura konputatu nahi duzun fitxategia aukeratu"
+
+#~ msgid "Select the file to your computed ed2k link"
+#~ msgstr "Ed2k lotura konputatzeko fitxategia aukeratu"
+
+#~ msgid ""
+#~ "aLinkCreator, the aMule ed2k link creator\n"
+#~ "\n"
+#~ "(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+#~ "\n"
+#~ "Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+#~ "and http://jimmac.musichall.cz/ikony.php3\n"
+#~ "\n"
+#~ "Distributed under GPL"
+#~ msgstr ""
+#~ "aLinkCreator, aMule ed2k lotura sortzailea\n"
+#~ "\n"
+#~ "(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+#~ "\n"
+#~ "Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+#~ "and http://jimmac.musichall.cz/ikony.php3\n"
+#~ "\n"
+#~ "GPL lizentziapean banaturik"
+
+#~ msgid "aLinkCreator, the aMule ed2k link creator"
+#~ msgstr "aLinkCreator, aMule ed2k lotura sortzailea"
+
+#~ msgid "Copy ED2k link to clipboard"
+#~ msgstr "Kopiatu ED2k lotura arbelera"
+
+#~ msgid "Copy ED2k links to clipboard"
+#~ msgstr "Kopiatu ED2k loturak arbelera"
+
+#~ msgid "ED2K: Connecting"
+#~ msgstr "ED2K: Konektatzen"
+
+#~ msgid "ED2K: Disconnected"
+#~ msgstr "ED2K: Deskonektatuta"
+
+#~ msgid "Warning: Unable to open skin file '%s' for read"
+#~ msgstr "Abisua: Ezin da '%s' itxura fitxategia irakurketarako ireki"
+
+#~ msgid ""
+#~ "Your Auto-update servers list is in blank.\n"
+#~ "'Auto-update serverlist at startup' will be disabled."
+#~ msgstr ""
+#~ "Zure zerbitzari auto-eguneraketa zerrenda hutsik dago.\n"
+#~ "'Abiaraztean zerbitzari zerrenda auto-eguneraketa' ezgaituko da"
+
+#~ msgid ""
+#~ "Both ED2K and Kad network are disabled.\n"
+#~ "You won't be able to connect until you enable at least one of them."
+#~ msgstr ""
+#~ "Bai ED2K bai Kad sareak ezgaiturik daude,\n"
+#~ "Ez zara konektatzeko gai izango behintzat bietako bat gaitu arte."
+
+#~ msgid "Edit Serverlist"
+#~ msgstr "Editatu zerbitzari zerrenda"
+
+#~ msgid "Error: couldn't accept a new external connection"
+#~ msgstr "Errorea: ezin da kanpo konexio berririk onartu"
+
+#~ msgid "ED2K is disabled in preferences."
+#~ msgstr "ED2K hobespenetan ezgaiturik dago."
+
+#~ msgid "ExternalConn: shutdown requested"
+#~ msgstr "KanpoKonexioa: itzaltzeko eskaera eginik"
+
+#~ msgid "Already connected to ED2K."
+#~ msgstr "Dagoeneko ED2K-ra konektaturik."
+
+#~ msgid "Connecting to ED2K..."
+#~ msgstr "ED2K-ra konektatzen..."
+
+#~ msgid "Disconnected from ED2K."
+#~ msgstr "ED2k-tik deskonektaturik."
+
+#~ msgid "ExternalConn: invalid opcode received: %#x"
+#~ msgstr "KanpoKonexioa: opcode baliogabea jasoa: %#x"
+
+#~ msgid "ED2K Status:"
+#~ msgstr "ED2k Egoera:"
+
+#~ msgid "Average Downloadrate (Session): %s"
+#~ msgstr "Batez besteko deskarga (Saioa): %s"
+
+#~ msgid "Average Uploadrate (Session): %s"
+#~ msgstr "Batez besteko igoera (Saioa): %s"
+
+#~ msgid "Max Downloadrate (Session): %s"
+#~ msgstr "Gehienezko deskarga abiadura (Saioa): %s"
+
+#~ msgid "Max Uploadrate (Session): %s"
+#~ msgstr "Gehienezko igoera abiadura (Saioa): %s"
+
+#~ msgid "Average filesize: %s"
+#~ msgstr "Batez besteko fitxategi tamaina: %s"
+
+#~ msgid "ED2K search can't be done if ED2K is not connected"
+#~ msgstr "Ezin da ED2K bilaketarik egin ED2K ez badago konektaturik"
+
+#~ msgid "Error: "
+#~ msgstr "Errorea:"
+
+#~ msgid "Warning: "
+#~ msgstr "Oharra:"
+
+#~ msgid "Search related files (ED2k, local server)"
+#~ msgstr "Zerikusia duten fitxategiak bilatu (ED2k, zerbitzari lokala)"
+
+#~ msgid "Error"
+#~ msgstr "Errorea"
+
+#~ msgid ""
+#~ "WARNING: You can't add yourself as a source for a ed2k link while being "
+#~ "lowid."
+#~ msgstr ""
+#~ "ABISUA: Ezin duzu zure burua ed2k lotura jatorri bezala ezarri id-baxua "
+#~ "duzun bitartean."
+
+#~ msgid ""
+#~ "Please set your preferred video player on preferences.\n"
+#~ "Meanwhile, aMule will attempt to use mplayer and you will get this "
+#~ "warning on every preview"
+#~ msgstr ""
+#~ "Mesedez ezarri zure bideo erreproduktore lehenetsia ezarpenetan.\n"
+#~ "Bestela, aMule mplayer erabiltzen saiatu eta aurreikuspen bakoitzean mezu "
+#~ "hau bistaraziko da"
+
+#~ msgid "Error: Failed to open part.met file: %s ==> %s"
+#~ msgstr "Errorea: huts part.met fitxategia irekitzerakoan: %s ==> %s"
+
+#~ msgid "Error: part.met file is 0 size: %s ==> %s"
+#~ msgstr "Errorea: part.met fitxategia hutsik dago: %s ==> %s"
+
+#~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "Errorea: part.met fitxategi bertsio baliogabea: %s ==> %s"
+
+#~ msgid "Warning: %s might be corrupted (%i)"
+#~ msgstr "Abisua: %s hondaturik egon liteke (%i)"
+
+#~ msgid "Unexpected file error while completing %s. File paused"
+#~ msgstr "Espero ez zen errorea %s osatzerakoan. Fitxategia gelditurik"
+
+#~ msgid ""
+#~ "Warning: Unable to hash downloaded part - hashset incomplete for '%s'"
+#~ msgstr ""
+#~ "Kontuz: Ezin da deskargaturiko zatia egiaztatu - '%s' egiaztapen "
+#~ "osatugabea"
+
+#~ msgid ""
+#~ "Error: Unable to hash downloaded part - hashset incomplete (%s). This "
+#~ "should never happen"
+#~ msgstr ""
+#~ "Errorea: Ezin da deskargatutako zatia aztertu - azterketa burua ez dago "
+#~ "osorik (%s). Hau ez zen\n"
+#~ "inoiz gertatu beharko"
+
+#~ msgid "Insufficient Diskspace"
+#~ msgstr "Disko leku askieza"
+
+#~ msgid "ERROR! Attempted to share %s"
+#~ msgstr "ERROREA! %s partekatzen saiatzen"
+
+#~ msgid "ED2K network disabled on preferences, not connecting."
+#~ msgstr "ED2K sarea ezgaiturik dago hobespenetan, ez da konektatuko."
+
+#~ msgid "No valid servers to connect in serverlist found"
+#~ msgstr ""
+#~ "Ez da konektatzeko baliozko zerbitzaririk aurkitu zerbitzari zerrendan"
+
+#~ msgid "Error: Socket invalid at timeoutcheck"
+#~ msgstr "Errorea: Socket baliogabea denboraz kanpo arakatzean"
+
+#~ msgid ""
+#~ "Error: Failed to load backup file. Search http://forum.amule.org for ."
+#~ "part.met recovery solutions."
+#~ msgstr ""
+#~ "Errorea: Huts basbeskopia fitxategia irekitzean. Bilatu http://forum."
+#~ "amule.org-en part.met berreskuraketa konponbideetarako."
+
+#~ msgid "Cannot convert magnet link to ed2k: %s"
+#~ msgstr "Ezin da lotura magnetikoa ed2k lotura bihurtu: %s"
+
+#~ msgid "Invalid ed2k link! Error: %s"
+#~ msgstr "ed2k lotura baliogabea! Errorea: %s"
+
+#~ msgid "Bandwidth Limits: Up: %u kB/s, Down: %u kB/s.\n"
+#~ msgstr "Konexio Mugak: Gora: %u kB/s, Behera: %u kB/s.\n"
+
+#~ msgid ""
+#~ "Shutdown the remote running core (amule/amuled).\n"
+#~ "This will also shut down the text client, since it is unusable without a\n"
+#~ "running core.\n"
+#~ msgstr ""
+#~ "Urruneko abiaraziriko muina itxi (amule/amuled).\n"
+#~ "Honek testu bezeroa ere itxiko du, ezin bait da abiaraziriko muin bat\n"
+#~ "gabe erabili.\n"
+
+#~ msgid "Connect to ED2K only."
+#~ msgstr "ED2K sarera bakarrik konektatu."
+
+#~ msgid "Disconnect from ED2K only."
+#~ msgstr "ED2K saretik bakarrik deskonektatu."
+
+#~ msgid ""
+#~ "The ed2k link to be added can be:\n"
+#~ "*) a file link (ed2k://|file|...), it will be added to the download "
+#~ "queue,\n"
+#~ "*) a server link (ed2k://|server|...), it will be added to the server "
+#~ "list,\n"
+#~ "*) or a serverlist link, in which case all servers in the list will be "
+#~ "added to the\n"
+#~ "   server list.\n"
+#~ "\n"
+#~ "The magnet link must contain the ed2k hash and file length.\n"
+#~ msgstr ""
+#~ "Gehitzeko ed2k lotura aukerak:\n"
+#~ "*) fitxategi lotura bat (ed2k://|file|...), berau deskarga hilarara "
+#~ "gehituko da,\n"
+#~ "*) zerbitzari lotura bat (ed2k://|server|...), berau zerbitzari "
+#~ "zerrendara gehituko da,\n"
+#~ "*) edo zerbitzari-zerenda lotura, kasu honetan zerrendako zerbitzari "
+#~ "guztiak\n"
+#~ "   zerbitzari-zerrendara gehitukodira.\n"
+#~ "\n"
+#~ "Lotura magnetikoak ed2k egiaztapena eta fitxategi tamaina eduki behar "
+#~ "ditu.\n"
+
+#~ msgid "Deprecated command, now '%s'."
+#~ msgstr "Zaharkitutako komandoa, orain '%s' erabili."
+
+#~ msgid "Error: %s (%s) - %s"
+#~ msgstr "Errorea: %s (%s) - %s"
+
+#~ msgid "Warning: %s (%s) - %s"
+#~ msgstr "Kontuz: %s (%s) - %s"
+
+#~ msgid "Error: Out of diskspace"
+#~ msgstr "Errorea. Disko leku gabe"
+
+#~ msgid "Error: Partmet not found"
+#~ msgstr "Errorea: Partmet ez da aurkitu"
+
+#~ msgid "Error: IO error!"
+#~ msgstr "Errorea: IO errorea!"
+
+#~ msgid "Error: Failed!"
+#~ msgstr "Errorea Huts egin du!"
+
+#~ msgid "ED2K Link: "
+#~ msgstr "ED2K Lotura: "
+
+#~ msgid ""
+#~ "Click here to add the ed2k link in the text control to your download "
+#~ "queue."
+#~ msgstr ""
+#~ "Klikatu hemen testu kontrolean dagoen ed2k lotura deskarga hilarara "
+#~ "gehitzeko."
+
+#~ msgid "Searches for more results on ED2K. Not supported for Kad yet."
+#~ msgstr "ED2K emaitza gehiago bilatu. Ez da onartzen Kad-ekin oraindik."
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "Bandwith Limits"
+#~ msgstr "Konexio gaitasunak"
+
+#~ msgid "This is the standard ED2K port and cannot be disabled."
+#~ msgstr "Hau ED2K ataka estandarra da eta ezin da ezgaitu."
+
+#~ msgid "This UDP port is used for extended Ed2K requests and Kad network"
+#~ msgstr ""
+#~ "UDP ataka hau Ed2k hedaturiko eskaera eta Kad sarearentzat erabiliko da."
+
+#~ msgid "Hard Limit"
+#~ msgstr "Muga gogorra"
+
+#~ msgid "Connection Limits"
+#~ msgstr "Konexio mugak"
+
+#~ msgid "Auto-update serverlist at startup"
+#~ msgstr "Eguneratu zerbitzari zerrenda abiaraztean"
+
+#~ msgid "Update serverlist when connecting to a server"
+#~ msgstr "Eguneratu  zerbitzari zerrenda zerbitzari batetara konektatzean"
+
+#~ msgid "Update serverlist when a client connect"
+#~ msgstr "Eguneratu  zerbitzari zerrenda bezero bat konektatzerakoan"
+
+#~ msgid "Disk Space"
+#~ msgstr "Disko Tokia"
+
+#~ msgid "Check Disk Space"
+#~ msgstr "Arakatu Disko Tokia"
+
+#~ msgid "Select this if you want aMule to check your Disk Space"
+#~ msgstr "Aukeratu hau zuk Amule-k disko tokia araztea nahi baduzu"
+
+#~ msgid "Min Disk Space:"
+#~ msgstr "Gutxienezko Disko Lekua:"
+
+#~ msgid "Incoming Directory :"
+#~ msgstr "Deskarga direktorioa:"
+
+#~ msgid "Temporary Directory :"
+#~ msgstr "Aldi baterakoa Direktorioa:"
+
+#~ msgid "Shared Directories"
+#~ msgstr "Partekatutako direktorioak"
+
+#~ msgid "Create Backup to preview"
+#~ msgstr "Sortu Babeskopia  aurreikusteko"
+
+#~ msgid "Show Fast ED2K Links Handler"
+#~ msgstr "Erakutsi ED2K lastermarka kudeatzaile azkarra"
+
+#~ msgid "Webserver Parameters"
+#~ msgstr "Web zerbitzari ezarpenak"
+
+#~ msgid "Webserver port"
+#~ msgstr "Web zerbitzari ataka"
+
+#~ msgid "Enable UPnP port forwarding on the Webserver port"
+#~ msgstr "UPnP ataka berbideraketa gaitu Web zerbitzari atakan"
+
+#~ msgid "Webserver UPnP TCP port"
+#~ msgstr "Web zerbitzari UPnP TCP ataka"
+
+#~ msgid "Serverlist"
+#~ msgstr "Zerbitzari Zerrenda"
+
+#~ msgid "Manual Server Add : Name"
+#~ msgstr "Zerbitzaria eskuz gehitu: Izena"
+
+#~ msgid "No One"
+#~ msgstr "Inori"
+
+#~ msgid "Speed Limits:"
+#~ msgstr "Abiadura Mugak:"
+
+#~ msgid "Download Speed: %.1f"
+#~ msgstr "Deskargatu Abiadura: %.1f"
+
+#~ msgid "Upload Speed: %.1f"
+#~ msgstr "Igo Abiadura: %.1f"
+
+#~ msgid "TCP Port: %d"
+#~ msgstr "TCP Ataka: %d"
+
+#~ msgid "TCP Port: Not Ready"
+#~ msgstr "TCP Ataka: Ez dago prest"
+
+#~ msgid "UDP Port: %d"
+#~ msgstr "UDP Ataka: %d"
+
+#~ msgid "UDP Port: Not Ready"
+#~ msgstr "UDP Ataka: Ez dago prest"
+
+#~ msgid "Shared Files: %d"
+#~ msgstr "Partekatutako Fitxategiak: %d"
+
+#~ msgid "Queued Clients: %d"
+#~ msgstr "Hilarako Bezeroak: %d"
+
+#~ msgid "Upload Limit"
+#~ msgstr "Igoera muga"
+
+#~ msgid "Download Limit"
+#~ msgstr "Deskarga muga"
+
+#~ msgid ""
+#~ "No serverlist address entry in 'addresses.dat' found. Please paste a "
+#~ "valid serverlist address into this file in order to auto-update your "
+#~ "serverlist"
+#~ msgstr ""
+#~ "'addresses.dat' fitxategian ez da zerbitzari zerrenda helbiderik aurkitu. "
+#~ "Mesedez itsatsi baliozko zerbitzari zerrenda helbide bat fitxategian "
+#~ "zerbitzari zerenda auto-eguneratzeko"
+
+#~ msgid "Warning, invalid URL specified for auto-updating of servers: %s"
+#~ msgstr "Abisua, Baliogabeko URL bat ezarria zerbitzariak eguneratzeko: %s"
+
+#~ msgid "webserver running on pid %d"
+#~ msgstr "webzerbitzari abiarazia %d pid-arekin"
+
+#~ msgid ""
+#~ "You requested to run webserver from startup, but the amuleweb binary "
+#~ "cannot be run. Please install the package containing aMule webserver, or "
+#~ "compile aMule using --enable-webserver and run make install"
+#~ msgstr ""
+#~ "Webzerbitzaria abiaraztean exekutatzea eskatu duzu, baina amuleweb "
+#~ "bitarra ezin da abiarazi. Mesedez aMule web zerbitzaria duen paketea "
+#~ "instalatu edo -enable-webserver erabiliaz aMule konpilatu eta make "
+#~ "install abiarazi"
+
+#~ msgid "Disconnected from ED2K"
+#~ msgstr "ED2K-tik Deskonektatuta"
+
+#~ msgid "Failed to open friendlist file 'emfriends.met' for reading!"
+#~ msgstr "Huts 'emfriends.met' lagun fitxategia irakurtzeko irekitzerakoan!"
+
+#~ msgid "Failed to open friendlist file 'emfriends.met' for writing!"
+#~ msgstr "Huts 'emfriends.met' lagun fitxategia idazteko irekitzerakoan!"
+
+#~ msgid "ERROR: Failed to open partfile)"
+#~ msgstr "ERROREA: Huts zati fitxategia irekitzerakoan)"
+
+#~ msgid "Mb"
+#~ msgstr "Mb"
+
+#~ msgid "Can't create web socket thread\n"
+#~ msgstr "Ezin da Web socket haria sortu\n"
+
+#~ msgid "Web Server: Started\n"
+#~ msgstr "WebZerbitzaria: Abiarazirik\n"
+
+#~ msgid "Not Supported"
+#~ msgstr "Ez da onartzen"
+
+#~ msgid "LowID: %u (%.2f%% Total %.2f%% Known)"
+#~ msgstr "IDBaxua: %u (%.2f%% Guztira %.2f%% Ezagun)"
+
+#~ msgid "SecIdent On/Off: %u (%.2f%%) : %u (%.2f%%)"
+#~ msgstr "Identitate ziurra gaitu/ezgaiturik: %u (%.2f%%) : %u (%.2f%%)"
+
+#~ msgid "Browse wav"
+#~ msgstr "Arakatu wav"
+
+#~ msgid "File wav (*.wav)|*.wav||"
+#~ msgstr "wav fitxategia (*.wav)|*.wav||"
+
+#~ msgid "No comment(s)"
+#~ msgstr "Iruzkinik ez"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ "only used for statistics."
+#~ msgstr ""
+#~ "Oharra: Balio hauek estatistiketarako\n"
+#~ "bakarrik erabiltzen dira."
+
+#~ msgid "Notifications"
+#~ msgstr "Abisuak"
+
+#~ msgid "Messages popup"
+#~ msgstr "Mezu popup"
+
+#~ msgid "Use sound"
+#~ msgstr "Erabili soinua"
+
+#~ msgid "Pop out when :"
+#~ msgstr "Leihoa ireki :"
+
+#~ msgid "New entry on log"
+#~ msgstr "Log-ean sarrera berria"
+
+#~ msgid "Starts a new chat session"
+#~ msgstr "Txat saio berri bat hasi"
+
+#~ msgid "A new chat message is received"
+#~ msgstr "Txat mezu berri bat jaso da"
+
+#~ msgid "A download is added or finished"
+#~ msgstr "Deskarga gehitu edo amaitu da"
+
+#~ msgid "New aMule version detected"
+#~ msgstr "aMule bertsio berria aurkitua"
+
+#~ msgid "Urgent OOD, serverconnection lost"
+#~ msgstr "Presazko OOD, zerbitzari konexioa galduta"
+
+#~ msgid "Notify by Mail"
+#~ msgstr "Jakinarazi epostaz"
+
+#~ msgid "Send an Email when transfer complete."
+#~ msgstr "Bidali ePosta mezu bat deskarga amaitzerakoan."
+
+#~ msgid "SMTP server :"
+#~ msgstr "SMTP zerbitzaria :"
+
+#~ msgid "Email Address :"
+#~ msgstr "Eposta Helbidea:"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid ""
+#~ "The selected locale seems not to be installed on your box\n"
+#~ "You must generate it to use this language.\n"
+#~ "A good start on linux systems is the file /etc/locale.gen and the package "
+#~ "'locales'\n"
+#~ "Good luck!\n"
+#~ "(Note: I'll try to set it anyway)"
+#~ msgstr ""
+#~ "Aukeratutako lokala zure ekipoan instalaturik ez dagoela dirudi\n"
+#~ "Zuk lokalak sortu beharko zenituzke erabili ahal izateko. Linux "
+#~ "sistemetan abiapuntu on bat /etc/locale.gen fitxategia eta locales "
+#~ "paketea dira\n"
+#~ "Zorte on!\n"
+#~ "(Oharra: Ezartzen saiatuko da)"
+
+#~ msgid "Never show this again"
+#~ msgstr "Ez erakutsi berriro"
+
+#~ msgid "Enable/Disable"
+#~ msgstr "Gaitu/ezgaitu"

aMule-2.2.6.tar.bz2/po/fi.po -> aMule-2.3.1.tar.bz2/po/fi.po Changed

@@ -1,1310 +1,1147 @@
 # aMule i18n resource file.
-# Copyright (C) 2004 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the aMule package.
 # Kry <elkry@users.sourceforge.net>, 2004.
+# Tapio Rantala <tapio.rantala@iki.fi>, 2007-2008.
+# Tapio Rantala <tapio.rantala@nomovok.com>, 2010.
+#
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: fi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-09-12 15:22+0200\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Salasana ei voi olla tyhjä."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Virheellinen salasana, ei MD5-tarkiste!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Yhdistäminen ei onnistunut"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "Etäyhteysyritys epäonnistui. Vastaus oli tyhjä."
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Etäyhteys: Pääsy evättiin: "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Etäyhteys: Pääsy evättiin"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Etäyhteys: Epäkelpo vastaus palvelimelta. Yhteys suljettu."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Yhdistetty onnistuneesti kohteeseen aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Yhdistetty onnistuneesti."
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Lisää kaveri"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Luo tarkistetta"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Sinun on annettava kelvollinen IP ja portti!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Viimeistelee"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Tietoa"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Valmis"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Annettu käyttäjätarkiste ei ole kelvollinen!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Tauotettu"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "ED2KLinks-tiedoston avaus epäonnistui."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Virheellinen"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"VAROITUS: Et voi lisätä itseäsi lähteeksi eD2k-linkkiin kun sinulla on LowID."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Lataa"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Pääohjelmaa suljetaan..."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Odottaa"
-
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Lasketaan MD4- sekä AICH-tarkistetta tiedostolle %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Lopetetaan amulewebin instanssi prosessinumerolla '%ld' ... "
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Lasketaan MD4-tarkistetta tiedostolle %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Tuhotaan amulewebin instanssi prosessinumerolla '%ld' ... "
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Lasketaan AICH-tarkistetta tiedostolle %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Epäonnistunut"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Muunnetaan vanhat AICH-tarkistejoukot '%s' 64-bittisiksi '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMulen poistuessa: Lopetetaan ydin."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr ""
-"VAROITUS: Tiedostonimi '%s' ei kelpaa ja tiedosto uudelleennimettiin '%s'."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "aMule sammutettu."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "VAROITUS: Tiedosto '%s' on jo olemassa, uusi tiedosto nimettiin '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Muistin virheiden etsinnän tulokset aMulen sulkeutuessa:"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
 msgstr ""
-"VAROITUS: Alkuperäistä '%s' ei voitu poistaa varmuuskopion valmistuttua"
+"\n"
+"Etäyhteyksien asetukset"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "VAROITUS: Ei voitu poistaa %s"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Salasana asetettu ja etäyhteydet sallittu."
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Jaettujen tiedostojen listaus käyttäjältä '%s' ei onnistunut"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "VAROITUS"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Tuntematon"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Vale-eMule versio %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Vale-eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Palvelinlistallasi ei ole palvelimia.\n"
+"Haluatko että aMule hakee uuden listan nyt?"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Vale-eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Palvelinlistan lataus"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (pohjautuu eMule-versioon v0.%u)"
+msgid "web server running on pid %d"
+msgstr "web-palvelin käynnissä prosessinumerolla %d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Nimimerkki: %s Tunnus: %u"
+#: src/amule.cpp:658
+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 ""
+"Olet asettanut web-palvelimen ajettavaksi käynnistettäessä, mutta amuleweb-"
+"ohjelmaa ei voida ajaa. Ole hyvä ja asenna aMule web-palvelimen sisältävä "
+"paketti tai käännä aMule käyttäen parametria --enable-webserver ja suorita "
+"make install"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Pyydetty: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "VIRHE"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Tiedostotilasto tästä sessiosta: Hyväksytty %d / %d pyynnöstä, %s siirretty\n"
-msgstr[1] ""
-"Tiedostotilasto tästä sessiosta: Hyväksytty %d / %d pyynnöstä, %s siirretty\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Ei voitu sitoa portteja annettuun osoitteeseen: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Tiedostotilasto kaikista sessioista: Hyväksytty %d / %d pyynnöstä, %s "
-"siirretty\n"
-msgstr[1] ""
-"Tiedostotilasto kaikista sessioista: Hyväksytty %d / %d pyynnöstä, %s "
-"siirretty\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Pyydetty tuntematonta tiedostoa"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Portti %u ei ole saatavilla. Sinulle annetaan LowID\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Asiakas %s IP:Portti %s:%d ohjelmalla %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Käyttäjänimi"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Portti %u ei ole saatavilla!\n"
+"\n"
+"Tämä tarkoittaa että sinulle annetaan LowID.\n"
+"\n"
+"Tarkista yhteytesi varmistaaksesi että portti on avoinna sekä ulos että "
+"sisään."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Kaverit"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Online-Signeeraustiedoston luonti epäonnistui"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Näytä tie&dot"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "aMulen Online-Signeeraustiedoston luonti epäonnistui"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Lisää kaveri"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"Valittu maa-asetus ei näytä olevan asennettuna järjestelmääsi. (Huom: Yritän "
+"asettaa sen kuitenkin)"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Poista kaveri"
+#: src/amule.cpp:1040
+#, 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/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Lähetä Viesti"
+#: src/amule.cpp:1042
+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/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Näytä tiedostot"
+#: src/amule.cpp:1043
+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"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Vapauta kaveripaikka"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"tai tapa koiraasi. Mutta sen *pitäisi* olla silti turvallinen käyttää.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Oletko varma että haluat poistaa valitun kaverin?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Lisätietoa, tukea ja uudet julkaisut löytyvät kotisivuiltamme osoitteessa\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Oletko varma että haluat poistaa valitut kaverit?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"http://www.aMule.org tai IRC-kanavaltamme #aMule palvelimella irc.freenode."
+"net (englanniksi).\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Peruuta"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Voit vapaasti raportoida bugeista osoitteessa http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Et voi asettaa enempää kuin yhden kaveripaikan.\n"
-" Asetettiin yksi paikka."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Monivalinta"
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Lataus valmistunut"
-
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Koko polku tiedostoon."
-
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Tiedoston nimi ilman polkua."
-
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "Tiedoston e2dk-tarkiste."
+"Online-Signeeraukselle asettamasi kansio ei ole kelvollinen!\n"
+" Online-Signeeraus kytketään pois päältä kunnes korjaat asian asetuksista."
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Tiedoston koko tavuina."
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Palvelimen verkkonimi ilmoitettu"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Kumulatiivinen latausaika."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Levytilan esivaraus tiedostolle '%s' epäonnistui: %s"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Uusi keskustelu aloitettu"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "VIRHE: Lokitiedostoa ei voida avata"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Viestin lähettäjä."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "VAROITUS: Lokitiedosto on tyhjä. Jotain on pielessä."
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Levytila loppu"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Loki nollattiin"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Levyosio."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Palvelimen viesti: %s"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Virhe viimeistellessä"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "Hypättiin yli latauksesta %s, koska pyydetty tiedosto ei ole uudempi."
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Tiedoston nimi"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Yhteyspisteiden listan lataus epäonnistui."
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Koko"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Ladatun versiotarkistustiedoston avaus epäonnistui"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tyyppi"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Turmeltunut versiotarkistustiedosto"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Tärkeys"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Käytät vanhentunutta versiota aMulesta!"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "Tiedostotunniste"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Tämän aMulen versio on %i.%i.%i ja uusin versio on %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Pyynnöt"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Uusin version löytyy aina osoitteesta http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Hyväksytyt pyynnöt"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "VAROITUS: aMulesi versio on vanhentunut: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Siirretty data"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "aMulesi on uusinta versiota."
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Jakosuhde"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Versiotarkistustiedoston lataus epäonnistui"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Hankitut osat"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Käyttäjiä: %s | Tiedostoja: %s"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Täysiä kopioita"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Käyttäjiä: E: %s K: %s | Tiedostoja: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Kansiopolku"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Ei valittuja verkkoja"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Jaetut tiedostot"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "LowID:llä"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Erittäin matala"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "HighID:llä"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Matala"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Yhdistetty %s %s"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normaali"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Yhdistän %s"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Korkea"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "eD2k-yhteys katkaistu"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Erittäin korkea"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Käynnistettiin Kad."
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Julkaisu"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Pysäytettiin Kad."
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Automaattinen"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Yhdistetty Kadiin (ok)"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Lisää kommentti/luokitus"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Yhdistetty Kadiin (palomuurattu)"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Muuta kommenttia/luokitusta"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Yhteys Kadiin katkaistu"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Uudelleennimeä"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Kad-verkkoa ei voida käyttää mikäli UDP-portti on estetty asetuksissa, ei "
+"käynnistetä."
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Lisää tiedostot kokoelmassa siirtolistalle"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Kad-verkko estetty asetuksissa, ei yhdistetä."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Kopioi magnet-&URI leikepöydälle"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"VIRHE: aMule-taustaprosessia ei voida käyttää kun etäyhteydet ovat poissa "
+"päältä. Etäyhteydet voidaan kytkeä päälle normaalista aMulesta, "
+"käynnistämällä amuled parametrilla --ec-config tai asettamalla avain "
+"\"AcceptExternalConnections\" arvoon 1 tiedostossa ~/.aMule/amule.conf"
+
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"VIRHE: Kelvollinen salasana vaaditaan etäyhteyksien käyttämiseksi ja aMule-"
+"taustaprosessia ei voida käyttää ilman etäyhteyksiä. Käynnistääksesi aMule-"
+"taustaprosessin sinun pitää asettaa kenttään \"ECPassword\" tiedostossa ~/."
+"aMule/amule.conf kelvollinen arvo. Käynnistä amuled parametrilla --ec-config "
+"asettaaksesi salasanan. Lisää tiedoa löytyy osoitteesta at http://wiki.amule."
+"org"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: käynnistettäessä - käynnistän ajastimen"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: haaroitun taustalle - nähdään"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Ei voitu luoda prosessinumerotiedostoa"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Kopioi eD2k-&linkki leikepöydälle"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "VIRHE: %s"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Kopioi eD2k-linkki työpöydälle (Lähde)"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Tämä on aMule %s ja pohjautuu eMuleen."
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Kopioi eD2k-linkki leikepöydälle (Lähde) (Kryptaustiedoilla)"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Käynnissä %s"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Kopioi eD2k-linkki leikepöydälle (Isäntänimi)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Vieraile nettisivulla http://www.amule.org tarkistaaksi uuden version "
+"saatavuuden."
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr "Kopioi eD2k-linkki leikepöydälle (Isäntänimi) (Kyptaustiedoilla)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "KRIITTINEN VIRHE: Ajastimen luominen epäonnistui"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Kopioi eD2k-linkki leikepöydälle (&AICH-tiedot)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "aMule etähallinta "
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Kopioi palaute leikepöydälle"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Tilannevedos:"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:501
 msgid ""
-"Feedback from: %s (%s)\n"
+"'All-Platform' p2p client based on eMule \n"
 "\n"
 msgstr ""
-"Palaute tullut: %s (%s)\n"
+"'Kaikkien alustojen' p2p-asiakas perustuen eMuleen\n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Tarvitset HighID:een luodaksesi voimassa olevan lähdelinkin"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "VAROITUS"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Jaetut tiedostot (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[Osatiedosto]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Anna uusi nimi tälle tiedostolle:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Tiedoston uudelleennimeäminen"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Jatketaan tiedoston %s lähetyksiä"
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Keskeytetään tiedoston %s lähetys"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Verkkosivu: http://www.amule.org\n"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMule tekstiasiakas"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Foorumi: http://forum.amule.org\n"
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: hakusana on liian lyhyt"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"UKK: http://wiki.amule.org\n"
+"\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Luettu %u Kad-kontakti"
-msgstr[1] "Luettu %u Kad-kontaktia"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Yhteys: admin@amule.org (hallinnolliset asiat, englanniksi)\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Vain %d Kad-kontakti saatavilla, nodes.dat-tiedostoa ei tallennettu"
-msgstr[1] ""
-"Vain %d Kad-kontaktia saatavilla, nodes.dat-tiedostoa ei tallennettu"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Tekijänoikeudet (c) 2003-2008 aMule-Tiimi\n"
+"\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Kirjoitettu %d Kad-kontakti"
-msgstr[1] "Kirjoitettu %d Kad-kontaktia"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Osa aMulesta perustuu\n"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "VIRHE: Ei voida kuunnella TCP-porttia."
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademliaan: Vertaisreititys perustuen XOR-metriikkaan.\n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "web-asiakasyhteys hyväksytty\n"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
+" Tekijänoikeudet (c) 2002-2008 Petar Maymounkov ( petar@post.harvard.edu )\n"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "VIRHE: ei voida hyväksyä web-asiakkaan yhteyttä\n"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Viesti"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Pyyntö ei onnistunut, virhe: %s."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "aMulen dialogi tuhottu"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Pyyntö ei onnistunut, tuntematon virhe."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Yhdistetään"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Indeksitiedostoa ei löydetty: "
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Yhdistetään"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Sessio vanhentunut - pyydetään kirjautumista\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Ei yhdistetty"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sessio kunnossa, kirjautuneena\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Palomuurattu"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sessio kunnossa, ei kirjautuneena\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Yhdistety"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Ei avattua sessiota - tulee pyytämään kirjautumista\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Yhdistetään"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Sessio luotu - pyytää kirjautumista\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Pois päältä"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Käsittelee pyyntöä [alkuperäinen]: "
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Peruuta"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Tarkistaa salasanaa\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Pysäytä nykyiset yhteysyritykset"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Salasanatarkiste ei kelpaa\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Katkaise yhteys"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Salasana hyväksytty\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Katkaise yhteys yhdistettyihin verkkoihin"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Virheellinen salasana\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Yhdistä"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Et antanut salasanaa. Tyhjä salasana ei ole sallittu.\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Yhdistä sallittuihin verkkoihin"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Uloskirjautumista pyydetty\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Ylös: %.1f(%.1f) | Alas: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Käsittelee pyyntöä [uudelleenohjattu]: "
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Ylös: %.1f | Alas: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Lataa mallin <str>"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Yhdistetty)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Web-palvelimen HTTP-portti"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Ei yhdistetty)"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Käytä UPnP-portinohjausta web-palvelimen portissa"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Haluatko varmasti sulkea %sn?"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP-portti"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Lopettamisen varmistus"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Käytä gzip-pakkausta"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Suorita komento: "
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- oletus -"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Täyden käyttöoikeuden salasana web-palvelimelle"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Teemakansiota '%s' ei ole olemassa"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Vieraan salasana web-palvelimelle"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "VAROITUS: Ei voida avata teematiedostoa '%s' luettavaksi"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Salli vieraskäyttö"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Verkot"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Estä vieraskäyttö"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Verkkoikkuna"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Hae/tallenna web-palvelimen asetukset etä-aMulesta/een"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Haut"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMulen konfiguraatiotiedoston polku. ÄLÄ KÄYTÄ SUORAAN!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Hakujen ikkuna"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Poista PHP-tulkki käytöstä (vanhentunut)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Lataukset"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Uudelleenkoosta PHP-sivut joka pyynnöllä"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Latausten ikkuna"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule Web-Palvelin"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Jaetut tiedostot"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Ei saatavissa"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Jaettujen tiedostojen ikkuna"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Ei koskaan"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Viestit"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Ladataan..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Viestien ikkuna"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Tilastot"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "Odotettiin %d tavua, mutta ladattiin %d tavua"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Tilastokuvaajien ikkuna"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Tiedoston amulesig.dat sisältävä kansio"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Asetuksien säätöikkuna"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Selaa"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Tuonti"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Syötä tähän kansio jossa on amulesig.dat-tiedostosi"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Osatiedostojen tuontityökalu"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Päivitysväli sekunteina"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Tietoja"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Luo tilastokuva joka päivityksen yhteydessä"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Tietoja/Ohje"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Syötä tähän kansio johon haluat tilastokuvan luotavan"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "eD2k-verkko"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Lähetä tilastokuvasi toistuvasti FTP-palvelimelle"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Kad-verkko"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP-osoite"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Ei verkkoa"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP-kansiopolku"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "aMulen etähallinta"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Syötä tähän FTP-palvelimen osoite"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "Syötä tähän kansio FTP-palvelimella mihin tilastokuvasi tallennetaan"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Kriittinen virhe: Ytimen ajastimen luominen epäonnistui"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Käyttäjänimi"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Yhdistä etä-aMuleen"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Salasana"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Kriittinen virhe: Kyselyajastimen luominen epäonnistui"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Siirrytään tapahtumasilmukkaan..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Yhdistetään..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Syötä tähän käyttäjänimi jota käytät kirjautuessasi FTP-palvelimelle"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Yhdistäminen epäonnistui "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Syötä tähän salasana jota käytät kirjautuessasi FTP-palvelimelle"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Graafisen etäkäyttöliittymän tapahtumakäsittelijä"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Suljen"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "FTP-päivityksien väli minuuteissa"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Yhdistäminen epäonnistui. Ei saatu yhteyttä %s:%d\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Tarkista oikeellisuus"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Yhteys suljettu - aMule on varmaankin lopetettu."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Kansio joka sisältää signeeraustiedostosi"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Valmis"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Kansio mihin luodaan tilastokuva"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Kaikki"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:631
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i päivä(ä) %i tunti(a) %i minuutti(a) %i sekunti(a)"
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, aMulen Online-Tilastotiedot"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Tervetuloa!"
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr "Ei voida luoda kansiota '%s' luokalle '%s', pidän kansion '%s'."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Suurin latausnopeus wxCasin käynnistämisestä lähtien"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Tuntematon"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Suurin latausnopeus edellisten wxCasin ajokertojen aikana"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Jaettujen tiedostojen listaus käyttäjältä '%s' ei onnistunut"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Tyhjennä"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Etsitään kaveria lowid-yhteydelle"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Järjestelmä"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Vale-eMule versio %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Pysäytä Automaattinen Päivitys"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Vale-eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Tallenna Online-Tilastotietokuva"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Vale-eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Tulosta Online-Tilastotietokuva"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (pohjautuu eMule-versioon v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Asetus"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Nimimerkki: %s Tunnus: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Tietoja wxCasista"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Pyydetty: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Aloita Automaattinen Päivitys"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Tiedostotilasto tästä sessiosta: Hyväksytty %d / %d pyynnöstä, %s siirretty\n"
+msgstr[1] ""
+"Tiedostotilasto tästä sessiosta: Hyväksytty %d / %d pyynnöstä, %s siirretty\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Automaattinen Päivitys pysäytetty"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Tiedostotilasto kaikista sessioista: Hyväksytty %d / %d pyynnöstä, %s "
+"siirretty\n"
+msgstr[1] ""
+"Tiedostotilasto kaikista sessioista: Hyväksytty %d / %d pyynnöstä, %s "
+"siirretty\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Automaattinen Päivitys aloitettu"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Pyydetty tuntematonta tiedostoa"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Tallenna Tilastokuva"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Viesti suodatettu käyttäjältä '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMulen Online-Tilastotiedot"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Viesti käyttäjältä '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/BaseClient.cpp:2899
+#, c-format
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"Tulostamisessa oli ongelma.\n"
-"Kenties tulostin ei ole asennettu oikein?"
+"Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista olemattomassa kansiossa "
+"'%s' -> Jätettiin huomioimatta"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Tulostus"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "VAROITUS: Tiedostoa %s ei voida avata."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
-"wxCas, aMulen OnLine Signeeraus-Tilastotiedot\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pohjautuu CAS:iin jonka on tehnyt Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Jaetaan GPL:n alaisena"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oi Oi, aMule ei ole käynnissä..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule on käynnissä"
+"VAROITUS: Peruutettujen latausten lista on turmeltunut, sisältää epäkelvon "
+"otsakkeen."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule on käynnissä, mutta ei yhdistettynä"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "IO-virhe luettaessa tiedostoa %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule yhdistää..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Virhe tallennettaessa tiedostoa %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oi Oi, aMulen tila on tuntematon..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Syötä kuvavarmennus"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Luokittelu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " on ollut käynnissä "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Uusi luokka"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " on pysäytetty !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Valitse kansio saapuville tiedostoille"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " ei ole yhdistetty !"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Sinun on annettava nimi luokalle!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " on yhdistämässä..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Sinun on annettava polku luokalle!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " on tekemässä jotain outoa, tarkista se !"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr "Saapuvien kansion luonti luokalle epäonnistui. Anna kelvollinen polku!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " on yhdistetty: "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Keskustelu aloitettu: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Yhdistetty asiakkaaseen ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Yhdistetään asiakkaaseen ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "palomuurattu"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Asiakkaaseen yhdistäminen epäonnistui / Yhteys katkesi ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "pois päältä"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr "*** Läpäisit kuvavarmennuksen ja käyttäjä on saanut viestisi. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " palvelimella "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** Vastauksesi kuvavarmennukseen on väärä ja viestisi on jätetty "
+"huomioimatta. Voit yrittää uudestaan lähettämällä uuden viestin. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " käyttäen "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Keskustelu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Yhteensä Ladattu: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Sulje välilehti"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Lähetetty: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Sulje kaikki välilehdet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Istunnossa Ladattu: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Sulje muut välilehdet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Lataus: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Lisää kavereihin"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " KiB/s, Lähetys: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Pisteytystiedosto avattu, %u tunnettu asiakas"
+msgstr[1] "Pisteytystiedosto avattu, %u tunnettua asiakasta"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " KiB/s"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Pisteet ovat vanhentuneet %u asiakkaalle!"
+msgstr[1] " - Pisteet ovat vanhentuneet %u asiakkaalle!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Jako: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Tiedostoa 'cryptkey.dat' ei löydetty, luodaan."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " tiedosto(a), Asiakkaita jonossa: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Asiakkaan tiedot"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Aika: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LowID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f KiB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " hetkellä "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Käytössä"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Järjestelmän Kuormituskeskiarvo (1-5-15 min): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Tuettu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Järjestelmä päällä: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Ei tuettu"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uvrk %02ut %02umin %02us"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Poissa käytöstä"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02ut %02umin %02us"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Yhdistetty"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Yhteys katkaistu"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02us"
+msgid "%.1f kB/s"
+msgstr "%.1f KB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Ei vielä valmis"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LowID"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Pahis"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Ei yhdistetty"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Vahvistettu - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Ei saatavilla"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KiB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista -> Annettu"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MiB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista -> Estetty"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GiB"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista kansioista -> Annettu"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TiB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Peruutettu !"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista kansioista -> Estetty"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "Unable to open %s"
-msgstr "Ei voida avata %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Syöteparametrit"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Tiedostosta Tarkiste"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Lisää Valinnaisia URLeja tälle tiedostolle"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Syötä tähän tiedosto josta haluat laskea eD2k-linkin"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Syötä tähän url jonka haluat lisätä eD2k-linkkiin: Lisää / perään jotta "
-"aLinkCreator voi lisätä tiedoston nimen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Lisää"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Poista"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Pyyhi"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Luo linkki osatarkisteilla"
+"Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista kansiossa '%s' -> "
+"Annettu"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Auttaa levittämään uusia ja harvinaisia tiedostoja nopeammin, kustannuksena "
-"linkin koon kasvu"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4-Tiedostotarkiste"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k-tiedostotarkiste"
+"Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista kansiossa '%s' -> "
+"Estetty"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k-linkki"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Käynnistä haku"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Tallenna"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Kopioi leikepöydälle"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Sulje"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Avaa"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Avaa tiedosto laskeaksesi sen eD2k-linkin"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopioi"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Kopioi laskettu eD2k-linkki leikepöydälle"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Tallenna nimellä"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Tallenna laskettu eD2k-linkki tiedostoon"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Tietoja"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Tietoja aLinkCreatorista"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Valitse tiedosto josta haluat laskea eD2k-linkin"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Leikepöytää ei voitu avata"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Toistaiseksi ei mitään kopioitavaa !"
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Käyttäjä %s (%u) jakaa kansion '%s'"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Valitse tiedosto lasketulle eD2k-linkille"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Käyttäjä %s (%u) lähetti jakolistan pyytämättä."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Ei voitu avata "
+#: src/ClientTCPSocket.cpp:982
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "Käyttäjä %s (%u) lähetti listan jaetuista tiedostoista kansiossa '%s'"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Ole hyvä ja syötä ei-tyhjä tiedoston nimi"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Käyttäjän %s (%u) jaettujen tiedostojen lista on lähetetty"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Toistaiseksi ei mitään tallennettavaa !"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Käyttäjä %s (%u) lähetti pyytämättä jaettujen tiedostojen listan"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
-"aLinkCreator, aMule eD2k-linkkien tekijä\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Bittikartat osoitteista http://www.everaldo.com, http://www.icomania.com\n"
-"ja http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Jaetaan GPL:n alaisena"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Laskee tarkistetta..."
+"Käyttäjä %s (%u) on estänyt jaettujen kansioiden/tiedostojen listaamisen."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator on toiminnassa"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Tiedoston kommentit"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Laskee MD4-tarkistetta..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Käyttäjänimi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Lasken eD2k-tarkistussummaa..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Tiedoston nimi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Valmis %.2f sekunnissa"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Luokitus"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Olet jo lisännyt tämän URLin !"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Kommentti"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Ole hyvä ja syötä ei-tyhjä URL"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Ei kommentteja"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Käsittelee tiedostoa numero %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Olet pyytänyt osatarkisteita (Vain tiedostoille jotka ovat > 9.5 MiB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u kommentti"
+msgstr[1] "%u kommenttia"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Tiedostoa ei ole !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "\"aLinkCreator, aMule eD2k-linkkien tekijä"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"Estettiin asiakas %s, lähetti turmeltunutta dataa %s yhteismäärästä %s "
+"tiedostolle '%s'"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1318,31 +1155,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Ko]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Yhdistää"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Erittäin matala"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Matala"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normaali"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Korkea"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Erittäin korkea"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Julkaisu"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Kysyy"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
-msgstr "Yhdistää serverin kautta"
+msgstr "Yhdistetään serverin kautta"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Jono täynnä"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "Jonossa"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Siirtää"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Lataa"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1362,14 +1225,13 @@
 
 #: src/DataToText.cpp:71
 msgid "Connecting via Kad"
-msgstr "Yhdistää Kadiin"
+msgstr "Yhdistetään Kadilla"
 
 #: src/DataToText.cpp:72
 msgid "Too many Kad connections"
 msgstr "Liian monta Kad-yhteyttä"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Estetty"
 
@@ -1401,8 +1263,8 @@
 msgid "Remote Server"
 msgstr "Etäpalvelin"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1426,8 +1288,8 @@
 msgid "Search Result"
 msgstr "Haun tulos"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Valmiina"
 
@@ -1451,7 +1313,7 @@
 msgid "ERROR: Failed!"
 msgstr "VIRHE: Epäonnistui!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "Jonossa"
 
@@ -1463,874 +1325,304 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Tuntematon tai käyttökelvoton väliaikaistiedostomuoto."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Järjestelmän vakio"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albania"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabia"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturia"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Osa"
 
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Baski"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgaria"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Katalaani"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Kiina (Yksinkertaistettu)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Kiina (Perinteinen)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Kroatia"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Tsekki"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Tanska"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Hollanti"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Englanti (U.K.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Viro"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Suomi"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Ranska"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galicia (Galego)"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Saksa"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Kreikka"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Heprea"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Unkari"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italia"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italia (Sveitsi)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japani"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Korea"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Liettua"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norja (Nynorsk)"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Koko"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Puola"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Siirretty"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugali"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Nopeus"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugali (Brazilia)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Edistyminen"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Venäjä"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Lähteet"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Slovenia"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Tärkeys"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Espanja"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Tila"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Ruotsi"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Aikaa jäljellä"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turkki"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Viimeksi nähty kokonaisena"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ukraina"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Viimeisin vastaanotto"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Ei voitu tunnistaa valittua selainta!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Oletko varma että haluat poistaa valitun tiedoston?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"TCP-portti ei voi olla korkeampi kuin 65532 koska serverin käyttämä UDP "
-"socket on TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Oletko varma että haluat poistaa valitut tiedostot?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Käytetään oletusporttia (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Palvelimen nimi"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Osoite"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Portti"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Kuvaus"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Viive"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Käyttäjiä"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Tiedostot"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Epäonnistunut"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Kiinteä"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versio"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Olet yhdistettynä palvelimeen jota yrität poistaa. Katkaise yhteys ensin. "
-"Palvelinta EI poistettu."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Tuntematon nimi)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Oletko varma että haluat poistaa pysyvän palvelimen %s"
+"Palaute tullut: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Kyllä"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Automaattinen"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Ei"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "Py&säytä"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Kohteen '%s' avaaminen ei onnistunut"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Tauota"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Palvelimet (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Jatka"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Palvelin"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "Poista va&lmistuneet"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Yhdistä palvelimelle"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Vaihda jokainen A4AF tälle tiedostolle nyt"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Merkitse palvelin pysyväksi"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Vaihda jokainen A4AF tälle tiedostolle nyt (Automaattinen)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Poista palvelimen pysyvyysmerkintä"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Vaihda jokainen A4AF muille tiedostolle nyt"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Merkitse palvelimet pysyviksi"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Laajat asetukset"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Poista palvelimien pysyvyysmerkintä"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Esikatsele"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Poista palvelin"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Näytä tie&doston tiedot"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Poista palvelimet"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Näytä kaikki kommentit"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Poista kaikki palvelimet"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Kopioi magnet-URI leikepöydälle"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Kopioi eD2k-linkki leikepöydälle"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Kopioi eD2k-&linkki leikepöydälle"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopioi eD2k-linkit leikepöydälle"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Kopioi palaute leikepöydälle"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Uudelleenyhdistä palvelimelle"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "poista luokittelu"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Oletko varma että haluat poistaa kaikki palvelimet?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Luokittele"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Oletko varma että haluat poistaa valitun palvelimen?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "Avaa tied&osto"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Oletko varma että haluat poistaa valitut palvelimet?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Anna uusi nimi tälle tiedostolle:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Poissa käytöstä [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Tiedoston uudelleennimeäminen"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Tämä on aMule %s ja pohjautuu eMuleen."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Käynnissä %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Vieraile nettisivulla http://www.amule.org tarkistaaksi uuden version "
-"saatavuuden."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "KRIITTINEN VIRHE: Ajastimen luominen epäonnistui"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMule etähallinta "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Tilannevedos:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" 'Kaikkien alustojen' vertaisverkkoasiakas pohjautuen eMuleen \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Verkkosivu: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Foorumi: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" UKK: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Yhteydenotot: admin@amule.org (hallinnolliset asiat, englanniksi) \n"
+msgid "Downloads (%i)"
+msgstr "Lataukset (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Tekijänoikeudet (C) 2003-2009 aMule-Tiimi \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Osa aMulesta pohjautuu \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademliaan: Vertaisreititys perustuen XOR-metriikkaan.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Tekijänoikeudet (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Viesti"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Yhdistää"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Ei yhdistetty"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Palomuurattu"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Yhdistetty"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Yhdistää"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Pois päältä"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Pysäytä nykyiset yhteysyritykset"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Katkaise yhteys"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Katkaise yhteys yhdistettyihin verkkoihin"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Yhdistä"
+"Estääksesi tämän varoituksen näyttämisen joka kerralla,\n"
+"aseta haluamasi videotoistin asetuksissa (oletuksena mplayer)."
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Yhdistä sallittuihin verkkoihin"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Tiedoston esikatselu"
 
-#: src/amuleDlg.cpp:810
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Ylös: %.1f(%.1f) | Alas: %.1f(%.1f)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "VIRHE: Ulkoista mediatoistinta ei voitu käynnistää! Komento: `%s'"
 
-#: src/amuleDlg.cpp:812
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Ylös: %.1f | Alas: %.1f"
+msgid "Saving PartFile %u of %u"
+msgstr "Tallennetaan osatiedostoa %u / %u"
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Yhdistetty)"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Kaikki osatiedostot tallennettu."
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Ei yhdistetty)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Haluatko varmasti sulkea aMulen?"
-
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Lopettamisen varmistus"
+msgid "Loading temp files from %s."
+msgstr "Lataan väliaikaistiedostoja kohteesta %s."
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Teemakansiota '%s' ei ole olemassa"
-
-#: src/amuleDlg.cpp:1187
-#, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "VAROITUS: Ei voida avata teematiedostoa '%s' luettavaksi"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Verkot"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Verkkoikkuna"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Haut"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Hakujen ikkuna"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Siirrot"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Siirrettävien tiedostojen ikkuna"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Jaetut tiedostot"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Jaettujen tiedostojen ikkuna"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Viestit"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Viestien ikkuna"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Tilastot"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Tilastokuvaajien ikkuna"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Asetuksien säätöikkuna"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Tuonti"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Osatiedostojen tuontityökalu"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Tietoja/Ohje"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "eD2k-verkko"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Kad-verkko"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Ei verkkoa"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Yleiset"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Yhteys"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Kansiot"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Palvelimet"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Turvallisuus"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Käyttöliittymä"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Välityspalvelin"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Suodattimet"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Etähallinta"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Online-Signeeraus"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Lisäasetukset"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Tapahtumat"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Debuggaus"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Käyttäjän määrittelemä"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"aMule on käynnistettävä uudestaan näiden muutosten voimaansaattamiseksi:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP-portti muuttui.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP-portti muuttui.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"Palvelinlistan päivitysten hakulista on tyhjä.\n"
-"Palvelinlistan automaattinen päivitys käynnistettäessä kytketään pois päältä."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Olet sallinut etäyhteydet mutta et ole antanut salasanaa.\n"
-"Etäyhteydet eivät ole mahdollisia ellei salasanaa ole annettu."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Kieli vaihtui.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Väliaikaiskansio muuttui.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- ED2K-verkko kytkettiin päälle.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Ylös: 0,0 | Alas: 0,0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Sekä eD2k- että Kad-verkko on pois päältä.\n"
-"Et voi yhdistää ennen kuin ainakin toinen niistä on sallittu."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad ei käynnisty mikäli UDP-portti on pois päältä.\n"
-"Salli UDP-portti tai kytke Kad pois päältä."
+msgid "Loading PartFile %u of %u"
+msgstr "Lataan osatiedostoa %u %u:sta"
 
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"Sinun on uudelleenkäynnistettävä aMule nyt.\n"
-"Mikäli et uudelleenkäynnistä nyt, älä valita mikäli jotain pahaa tapahtuu.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Palvelinlistan päivitysten hakulista on tyhjä.\n"
-"Ole hyvä ja syötä ainakin yksi URL joka osoittaa käypään server.met-"
-"tiedostoon.\n"
-"Klikkaa nappia \"Lista\" tämän valintaruudun vierestä syöttääksesi URLin."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Väliaikaiset tiedostot"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Saapuvat tiedostot"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Online-Signeeraukset"
+"VIRHE: Varmuuskopiotiedostoa ei saatu avattua.  Katso sivuilta http://forum."
+"amule.org ratkaisuja .part.met -palautukseen."
 
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Valitse kansio kohteelle %s"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Kaikki osatiedostot avattu."
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Etsi videosoitin"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Valitse selain"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Osatiedostoja ei löytynyt"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Suoritettava tiedosto%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Muokkaa palvelinlistaa"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Löydetty %u osatiedosto"
+msgstr[1] "Löydetty %u osatiedostoa"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Syötä tähän URLit joista server.met-tiedostot haetaan.\n"
-"Vain yksi urli riville."
+"Väliaikaiskansion tiedostojärjestelmä ei osaa käsitellä suuria tiedostoja."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Päivitysväli: %d sekunti"
-msgstr[1] "Päivitysväli: %d sekuntia"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"Saapuvien kansion tiedostojärjestelmä ei osaa käsitellä suuria tiedostoja."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Keskiarvoviivan aika: %d minuutti"
-msgstr[1] "Keskiarvoviivan aika: %d minuuttia"
+msgid "Downloading %s"
+msgstr "Ladataan %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Yhteyskuvaajan skaala: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Olet jo lataamassa tiedostoa '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Päivitysviive: %d sekunti"
-msgstr[1] "Päivitysviive: %d sekuntia"
+msgid "You already have the file '%s'"
+msgstr "Sinulla on jo tiedosto '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Tiedostopuskurin koko: %d tavu"
-msgstr[1] "Tiedostopuskurin koko: %d tavua"
+msgid "You are already trying to download the file %s"
+msgstr "Lataat jo tiedostoa %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Lähetysjonon koko: %d asiakas"
-msgstr[1] "Lähetysjonon koko: %d asiakasta"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Ei voitu kääntää magnet-linkkiä eD2k-linkiksi: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Palvelinyhteyden päivitysväli: %d minuutti"
-msgstr[1] "Palvelinyhteyden päivitysväli: %d minuuttia"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Palvelinyhteyden päivitysväli: Ei käytössä"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "UDP-portti laajennettuihin palvelinpyyntöihin (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "estetty"
+msgid "Unknown protocol of link: %s"
+msgstr "Linkin protokolla tuntematon: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Suorita komento tapahtuman `%s' yhteydessä"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Mahdollista komentojen suorittaminen ytimestä"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Ytimen komento:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Mahdollista komentojen suorittaminen graafisesta käyttöliittymästä"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Graafisen käyttöliittymän komento:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Seuraavat muuttujat korvataan:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Virheellinen eD2k-linkki! VIRHE: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Luvaton yhteysyritys. Yhteys suljettu."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "Asiakas lähetti paketin tunnistautumisen epäonnistumisen jälkeen."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Etäyhteys suljettu."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Etäyhteydet kielletty sillä salasana on tyhjä!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Etäyhteydet estetty asetustiedostossa"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Uusi etäyhteys hyväksytty"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "VIRHE: uutta etäyhteyttä ei voitu ottaa vastaan"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Etäyhteys torjuttu koska salasana on tyhjä asetuksissa!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Yhdistän asiakkaaseen: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Tuntematon versio"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2338,2219 +1630,1061 @@
 "Epäkelpo etäversiotunniste, binäärinen epäyhteensopivuus on mahdollinen. "
 "Käytä ydintä ja etäpäätettä samasta vedoksesta."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 "Et voi yhdistää julkaisuversioon mielivaltaisella kehitysversiolla! *huoh* "
 "mahdollinen kaatuminen estetty"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Tunnistautuminen epäonnistui."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Väärä protokollaversio."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Puuttuva protokollan versiomerkintä."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
-msgstr "Epäkelpo pyyntö, sinun pitäisi ensin tunnistautua."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr "Tunnistautuminen epäonnistui: etäyhteyssalasanan tarkiste on väärin."
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Tunnistautuminen epäonnistui: väärä salasana."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Tunnistautuminen epäonnistui: salasana puuttui."
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
+msgstr "Epäkelpo pyyntö, tunnistaudu ensin."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Pääsy myönnetty."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Virheilmoitus \"%s\" lähetetty asiakkaalle."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Luvaton yhteysyritys osoitteesta %s. Yhteys suljettu."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 "Etäosatiedoston komento epäonnistui: Tiedostotarkistetta ei löytynyt: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Tiedostotarkistetta ei löytynyt: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "Hupsis! Komentosanan käsittelyvirhe!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Palvelinta ei lisätty"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "palvelinta ei löytynyt: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "poistettava palvelin on määriteltävä"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k on poistettu käytöstä asetuksissa."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Haku on käynnissä. Nouda tuloksia kohta uudelleen!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Verkkohaku etäliittymästä ei ole mielekästä."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad on poistettu päältä asetuksissa."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Ei pisteitä kaavioon."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Asiakasohjelmaasi ei ole asetettu tälle tarkkuustasolle."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Etäyhteys: sulkemista pyydetty"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Sulkeminen on jo käynnissä."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Etäyhteys: lisään linkkiä '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Virheellinen linkki tai se on jo listalla."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Tiedostoa ei löytynyt."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Epäkelpo tiedostonimi."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Tiedostoa ei voitu uudelleennimetä."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad on poistettu päältä asetuksissa."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "eD2k on jo yhdistetty."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
-msgstr "Yhdistää eD2k..."
+msgstr "Yhdistetään eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Kad on jo yhdistetty."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
-msgstr "Yhdistää Kadiin..."
+msgstr "Yhdistetään Kadiin..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Kaikki verkot ovat pois päältä."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "eD2k-yhteys katkaistu"
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Kad-yhteys katkaistu."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Etäyhteys: vastaanotettiin epäkelpo komentosana: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Epäkelpo komentosana (väärä protokollaversio?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Tiedostoa '%s' ei voitu avata, poistetaan jaettujen tiedostojen listalta."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Tarkistejoukkoa pyydettiin tuntemattomalle tiedostolle: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Komento `%s' prosessinumerolla `%d' on suoritettu tuloskoodilla `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Palvelinta ei lisätty: IP:tä tai isäntänimeä ei annettu."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Palvelinta ei lisätty: Epäkelpo palvelinportti."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "eD2k-tilanne:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Yhdistetty"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Portti"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kademlian tilanne:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Käynnissä"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Tila:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Yhteys katkaistu"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Yhteyden tila:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Palomuurattu"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Palomuurattu tilanne: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Yhdistetty kaveriin"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Ei kaveria"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Keskimäärin käyttäjiä:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Keskimäärin tiedostoja:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Ei käynnissä"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Päälläoloaika: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Siirto"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Lähetykset"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Lähetetty data (Sessiossa (Yhteensä)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Otsikkotietoja yhteensä (Paketteja): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Tiedostopyyntöotsikkoja (Paketteja): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Lähdevaihdon otsikkoja (Paketteja): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Palvelimen otsikkoja (Paketteja): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Kad-otsikkoja (Paketteja): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Kryptauksen otsikkoja (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Lähetyksiä käynnissä: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Lähetyksiä odottamassa: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Onnistuneita lähetyksiä yhteensä: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Epäonnistuneita lähetyksiä yhteensä: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Keskimääräinen lähetysaika: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Lataukset"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Ladattu data (Sessiossa (Yhteensä)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Lähteitä löytynyt: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Latauksia käynnissä (paloja): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Session jakosuhde lähetys:lataus (Yhteensä): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Keskimääräinen latausnopeus (Sessiossa): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Keskimääräinen lähetysnopeus (Sessiossa): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Suurin latausnopeus (Sessiossa): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Suurin lähetysnopeus (Sessiossa): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Uudelleenyhdistämisiä: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Aikaa ensimmäisestä siirrosta: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Yhdistetty palvelimeen: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Aktiivisia yhteyksiä (arvio): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Maksimimäärä yhteyksiä saavutettu: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Yhteyksiä keskimäärin (arvio): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Yhteyksiä enimmillään (arvio): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Asiakkaat"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Suodatettu"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Yhteensä: %i Tunnettuja: %i"
-
-#: src/Statistics.cpp:715
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Working Servers: %i"
-msgstr "Toimivia palvelimia: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Toimimattomia palvelimia: %i"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Tuntematon laajennos '%s' komennolle '%s'.\n"
 
-#: src/Statistics.cpp:717
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Total: %s"
-msgstr "Yhteensä: %s"
+msgid "Unknown command '%s'.\n"
+msgstr "Tuntematon komento '%s'.\n"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Poistettuja palvelimia: %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Tälle komennolle ei voi antaa parametria.\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Suodatettuja palvelimia: %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Tälle komennolle on annettava parametri.\n"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Käyttäjiä toimivilla palvelimilla: %llu"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Tämä komento on puutteellinen, sinun on käytettävä jotakin alla olevista "
+"laajennoksista.\n"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Tiedostoja toimivilla palvelimilla: %llu"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Mahdolliset laajennokset:\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Käyttäjiä yhteensä: %llu"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Käytettävissä olevat komennot:\n"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Total Files: %llu"
-msgstr "Tiedostoja yhteensä: %llu"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Komennot eivät erottele isoja ja pieniä kirjaimia.\n"
+"Kirjoita '%s <komento>' saadaksesi lisätietoa komennosta.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Palvelimien käyttö: %.2f% %"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Poistuu sovelluksesta."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Jaettuja tiedostoja: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Näyttää ohjeen."
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Jaettujen tiedostojen yhteenlaskettu koko: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Saadaksesi ohjeen komennosta, kirjoita 'help <komento>'.\n"
+"Saadaksesi listan komennoista kirjoita 'help'.\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
-msgstr "Keskimääräinen tiedostokoko: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Käyttöjärjestelmä"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Ei vastaanotettu"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Leikkaa"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Liitä"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Valitse kaikki"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Käytä '%s' listataksesi komennot\n"
+"\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad-hakua ei voida tehdä mikäli Kad ei ole päällä"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Syntaksivirhe!"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "eD2k-hakua ei voida tehdä mikäli eD2k ei ole yhdistettynä"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+"Virhe käsiteltäessä komentoa - näin ei pitäisi tapahtua! Ole hyvä ja "
+"raportoi tästä\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Odottamaton virhe Kad-hakua tehtäessä: "
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Tämä komento ei tarvitse parametreja."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Viesti suodatettu käyttäjältä '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Tälle komennolle on annettava parametri."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Viesti käyttäjältä '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Virheellinen parametri."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista -> Annettu"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Komento on puutteellinen."
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista -> Estetty"
+msgid "Type '%s' to get more help.\n"
+msgstr "Kirjoita '%s' saadaksesi lisää ohjeita.\n"
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista kansioista -> Annettu"
+msgid "This is %s %s %s\n"
+msgstr "Tämä on %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "Käyttäjä %s (%u) kysyi listaa jaetuista kansioista -> Estetty"
+msgid "This is %s %s\n"
+msgstr "Tämä on %s %s\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista kansiossa %s -> Annettu"
-
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+"\n"
+"Creating client...\n"
 msgstr ""
-"Käyttäjä %s (%u) kysyi listaa jaetuista tiedostoista kansiossa %s -> Estetty"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Käyttäjä %s (%u) jakaa kansiota %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Käyttäjä %s (%u) lähetti jakolistan pyytämättä."
-
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "Käyttäjä %s (%u) lähetti jaettujen tiedostojen listan kansiolle %s"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Käyttäjän %s (%u) jaettujen tiedostojen lista on lähetetty"
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Käyttäjä %s (%u) lähetti pyytämättä jaettujen tiedostojen listan"
+"\n"
+"Luon asiakasta...\n"
 
-#: src/ClientTCPSocket.cpp:1049
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Käyttäjä %s (%u) on estänyt jaettujen kansioiden/tiedostojen listaamisen."
-
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Yhteyspisteitä (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "IP ei kelpaa yhdistämisavuksi"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Portti ei kelpaa yhdistämisavuksi"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Ole hyvä ja täytä kaikki vaaditut kentät"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Oletko varma että haluat ladata uuden nodes.dat-tiedoston?\n"
+"\n"
+"Ok, suljen %s...\n"
 
-#: src/KadDlg.cpp:197
+#: src/ExternalConnector.cpp:420
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"Tämä toiminto korvaa kaikki tunnetut yhteyspisteet ja uudelleenyhdistää "
-"Kademlian."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Jatketaanko?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "VIRHE: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "VAROITUS: "
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Lisää kaveri"
-
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Sinun on annettava kelvollinen IP ja portti!"
+"Tyhjällä salasanalla ei voida yhdistää.\n"
+"Sinun on annettava salasana joko asetustiedostossa,\n"
+"komentorivillä tai annettava se kysyttäessä.\n"
+"\n"
+"Suljen...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Tietoa"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Näytä tämä ohje."
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Annettu käyttäjätarkiste ei ole kelvollinen!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Verkkonimi koneelle jossa aMule on käynnissä. (oletus: localhost)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Lähteet"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "aMulen portti etäyhteydelle. (oletus: 4712)"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Tiedosto"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Etäyhteyden salasana."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Lataa"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Lue asetukset tiedostosta."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Luokittelu"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Älä tulosta mitään stdout:iin."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Kaikki"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Ole monisanainen - näytä myös virheenetsintäviestit."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Lataa luokassa"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Asettaa ohjelman maa-asetukset (kielen)."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Hae tähän liittyviä tiedostoja (eD2k, paikallinen palvelin)"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Kirjoita komentoriviparametrit asetustiedostoon."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Merkitse tunnetuksi tiedostoksi"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Luo asetustiedoston perustuen aMulen asetustiedostoon."
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Yhdistä etä-aMuleen"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Näyttää ohjelman version."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Yhdistäminen epäonnistui "
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Tiedoston tiedot"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "VIRHE"
+#: src/FileDetailDialog.cpp:113
+#, c-format
+msgid "%.1f%% done"
+msgstr "%.1f%% valmiina"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Yhteysyritys epäonnistui. Ei saatu yhteyttä osoitteeseen %s:%d\n"
+msgid "%.2f kB/s"
+msgstr "%.2f KB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "Kaverilistatiedostoa 'emfriends.met' ei saatu avattua luettavaksi!"
+
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
-"VAROITUS: Et voi lisätä itseäsi lähteeksi eD2k-linkkiin kun sinulla on LowID."
+"Kaverilistatiedostoa 'emfriends.met' ei saatu avattua kirjoitettavaksi!"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Käyttäjiä E: %s K: %s | Tiedostoja E: %s K: %s"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "KRIITTINEN - ei asiakasta keskustelun aloituksessa"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Kaikki"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Kaverit"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Käyttäjiä yhteensä: %s | Tiedostoja yhteensä: %s"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Näytä tie&dot"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Siirretty"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Lisää kaveri"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Nopeus"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Poista kaveri"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Edistyminen"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Lähetä Viesti"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Tila"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Näytä tiedostot"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Aikaa jäljellä"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Vapauta kaveripaikka"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Viimeksi nähty kokonaisena"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Oletko varma että haluat poistaa valitun kaverin?"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Viimeisin vastaanotto"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Oletko varma että haluat poistaa valitut kaverit?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Oletko varma että haluat poistaa valitun tiedoston?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Et voi asettaa enempää kuin yhden kaveripaikan.\n"
+" Asetettiin yksi paikka."
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Oletko varma että haluat poistaa valitut tiedostot?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Monivalinta"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Lähetä viesti käyttäjälle"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Lähetettävä viesti:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "Py&säytä"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Tauota"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Jatka"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "Poista va&lmistuneet"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Vaihda jokainen A4AF tälle tiedostolle nyt"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Vaihda jokainen A4AF tälle tiedostolle nyt (Automaattinen)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Vaihda jokainen A4AF muille tiedostolle nyt"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Laajat asetukset"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Esikatsele"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Näytä tie&doston tiedot"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Näytä kaikki kommentit"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Kopioi magnet-URI leikepöydälle"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "poista luokittelu"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Luokittele"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "Avaa tied&osto"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Poista ystävistä"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Lisää kavereihin"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Lähetä viesti"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Vaihda tähän tiedostoon"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "KiB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
+msgid "On Queue: %u (%i)"
 msgstr "Jonossa: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Kysyttiin toista tiedostoa"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Lataukset (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Estääksesi tämän varoituksen näyttämisen joka kerralla,\n"
-"aseta haluamasi videotoistin asetuksissa (oletuksena mplayer)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Tiedoston esikatselu"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "VIRHE: Ulkoista mediatoistinta ei voitu käynnistää! Komento: `%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "VIRHE: osatiedoston luominen epäonnistui)"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Yritän ladata met-tiedoston varmuuskopion kohteesta %s"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "VIRHE: part.met-tiedostoa ei avattu: %s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "VIRHE: part.met-tiedosto on tyhjä: %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "VIRHE: Epäsopiva part.met-tiedostoversio: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Odottaa lähetyspaikkaa"
 
-#: src/PartFile.cpp:601
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"VIRHE: %s (%s) on turmeltunut (väärä tunnistemäärä), tiedostoa ei voitu "
-"ladata."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Yritän palauttaa tiedoston tietoja..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr ""
-"Palautan nimetöntä tiedostoa - yritetään tallentaa nimelle RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "Saatavissa olevat tiedot palautettiin :D - Yritän käyttää niitä..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Tiedoston tietoja ei saatu palautettua :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Avaaminen epäonnistui: %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "VAROITUS: %s voi olla turmeltunut (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "VIRHE osatiedostoa tallennettaessa: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Pituutta ei saatu noudettua: '%s' - käytän %s tiedostoa."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' on jostain syystä tyhjä - käytetään tiedostoa %s."
+msgid "On Queue: %u"
+msgstr "Jonossa: %u"
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Tiedoston part.met.seeds tallentaminen epäonnistui kohteelle %s"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Lähettää"
+
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Ei yhtään"
 
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Tallennettu %i lähde osatiedostolle: %s (%s)"
-msgstr[1] "Tallennettu %i lähdettä osatiedostolle: %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Osatiedostolla %s (%s) ei ole lähdetiedostoa"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Ei"
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Osatiedostolla %s (%s) on tyhjä lähdetiedosto"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Kyllä"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Virhe luettaessa osatiedoston lähdetiedostoa (%s - %s): %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Ladataan..."
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Turmeltunut osa (%d) %d osassa tiedostossa %s - Tiedostotulostarkiste |%s| "
-"Tiedostotarkiste |%s|"
-msgstr[1] ""
-"Turmeltunut osa (%d) %d osassa tiedostossa %s - Tiedostotulostarkiste |%s| "
-"Tiedostotarkiste |%s|"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "HTTP-lataus peruutettu"
 
-#: src/PartFile.cpp:1181
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Valmis osa (%i) kohteessa %s"
+msgid "Unable to create destination file %s for download!"
+msgstr "Kohdetiedostoa %s ei voitu luoda lataukselle!"
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Tarkiste uudelleenluotu: %s"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "Ladattava URL ei voi olla tyhjä"
 
-#: src/PartFile.cpp:2239
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Odottamaton virhe viimeistellessä %s. Tiedosto tauotettu"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "URL %s palautti: %i - Virhe (%i)!"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Lataus suoritettu: %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Kriittinen virhe ladattua tiedostoa tallennettaessa"
 
-#: src/PartFile.cpp:2323
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Deleting file: %s"
-msgstr "Poistan tiedoston: %s"
+msgid "Downloaded %d bytes"
+msgstr "Ladattu %d tavua"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"VAROITUS: Ei voitu laskea tarkistetta ladatusta osasta - tarkistejoukko on "
-"puutteellinen kohteelle '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Odotettiin %d tavua, mutta ladattiin %d tavua"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"VIRHE: Ei voitu luoda tarkistetta ladatulle osalle - tarkistejoukko on "
-"puutteellinen (%s). Näin ei pitäisi koskaan tapahtua."
-
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "VAROITUS: Levytilaa ei ole tarpeeksi! Tauotan tiedoston: %s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Ladattu osa %i on turmeltunut tiedostossa: %s"
+"Epäkelpo URL HTTP lataukseen tai HTTP uudelleenohjaus (unohditko edestä "
+"'http://' ?)"
 
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Palautettu turmeltunut osa %i kohteessa %s -> Säästetyt tavut: %s"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "HTTP-palvelimeen ei voitu yhdistää"
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Allokoidaan"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Epäkelpo vastaus HTTP-palvelimelta"
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Riittämätön levytila"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Pysäytetty"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Ladattu"
-
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "VIRHE: Ei voida avata osatiedostoa '%s'"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "VAROITUS: Tiedostoa known.met ei voida avata."
+msgid "Download new GeoIP.dat from %s"
+msgstr "Hae uusi GeoIP.dat osoitteesta %s"
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr "VAROITUS: Tunnettujen tiedosto on turmeltunut, virheellinen otsikko."
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "GeoIP.dat-tiedoston lataus epäonnistui, keskeytän päivittämisen."
 
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "IO-virhe luettaessa tiedostoa known.met: %s"
+msgid "Failed to remove %s file, aborting update."
+msgstr "Tiedoston %s poisto epäonnistui, keskeytän päivityksen."
 
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Virhe tallennettaessa tiedostoa known.met: %s"
+msgid "Failed to rename %s file, aborting update."
+msgstr "Tiedoston %s uudelleennimeäminen epäonnistui, keskeytän päivityksen."
 
-#: src/SharedFileList.cpp:352
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Löydetty %i tunnettu jaettu tiedosto"
-msgstr[1] "Löydetty %i tunnettua jaettua tiedostoa"
+msgid "Successfully updated %s"
+msgstr "Tiedoston %s päivitys onnistui"
 
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Löydetty %i tunnettu jaettu tiedosto, %i tuntematonta"
-msgstr[1] "Löydetty %i tunnettua jaettua tiedostoa, %i tuntematonta"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Virhe päivitettäessä GeoIP.dat-tiedostoa"
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "VIRHE: Yritettiin jakaa %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Tiedoston kommentit"
+msgid "Failed to download %s from %s"
+msgstr "Tiedoston %s lataus osoitteesta %s epäonnistui"
 
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Luokitus"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Kommentti"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Ei kommentteja"
-
-#: src/CommentDialogLst.cpp:104
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u kommentti"
-msgstr[1] "%u kommenttia"
+msgid "Failed to load country data for '%s'."
+msgstr "Valtiotietojen lataus osoitteesta '%s' epäonnistui."
 
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Kätketyt yhteysyritykset palvelimille epäonnistuivat. Yritetään uudestaan "
-"ilman kätkemistä."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr ""
-"Yhdistäminen kaikkiin listattuihin palvelimiin epäonnistui. Aloitetaan uusi "
-"kierros."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "eD2k-verkko kytketty pois päältä asetuksista, ei yhdistetä."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Palvelinlistasta ei löytynyt toimivia palvelimia joihin yhdistää"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Lataan IP-suodattimet 'ipfilter.dat' sekä 'ipfilter_static.dat'."
 
-#: src/ServerConnect.cpp:187
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Yhdistetty %s (%s:%i)"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "Ipfilter.dat-tiedoston '%s' avaaminen epäonnistui, muoto tuntematon."
 
-#: src/ServerConnect.cpp:263
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Yhteys muodostettu: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
-"Kriittinen virhe yhdistettäessä. Internet-yhteys on mahdollisesti poikki"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Yhteys palvelimeen %s (%s:%i) katkesi"
+"Ipfilter.dat-tiedoston '%s' avaaminen epäonnistui, tiedostoa ei voitu avata."
 
-#: src/ServerConnect.cpp:349
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) näyttää kuolleelta."
-
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) on ilmeisesti täysi."
-
-#: src/ServerConnect.cpp:381
-#, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Automaattinen uudelleenyhdistäminen palvelimelle %d sekunnin päästä"
-msgstr[1] "Automaattinen uudelleenyhdistäminen palvelimelle %d sekunnin päästä"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Yhteys katkesi"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Ladattu %u IP-alue kohteesta '%s'."
+msgstr[1] "Ladattu %u IP-aluetta kohteesta '%s'."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Yhdistäminen kohteeseen %s (%s:%i) epäonnistui."
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "VIRHE: Socket virheellinen aikakatkaisutarkistuksessa"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u epämuodostunut rivi ohitettiin."
+msgstr[1] "%u epämuodostunutta riviä ohitettiin."
 
-#: src/ServerConnect.cpp:460
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Yhteysyritys kohteeseen %s (%s:%i) aikakatkaistiin."
-
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
-"VIRHE: Varmuuskopiotiedostoa ei saatu ladattua.  Katso sivuilta http://forum."
-"amule.org ratkaisuja .part.met -palautukseen."
+"Uuden tiedoston %s uudelleennimeäminen epäonnistui, keskeytän päivityksen."
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Osatiedostoja ei löytynyt"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "IP-suodatin on valmiina"
 
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Löydetty %u osatiedosto"
-msgstr[1] "Löydetty %u osatiedostoa"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
-"Väliaikaiskansion tiedostojärjestelmä ei osaa käsitellä suuria tiedostoja."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Saapuvien kansion tiedostojärjestelmä ei osaa käsitellä suuria tiedostoja."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Ladataan %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Olet jo lataamassa tiedostoa '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Sinulla on jo tiedosto '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Lataat jo tiedostoa %s"
+"Käytä tunnettuja \n"
+"asiakkaita yhdistämisapuna"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Ei voitu kääntää magnet-linkkiä eD2k-linkiksi: %s"
+msgid "Nodes (%u)"
+msgstr "Yhteyspisteitä (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Linkin protokolla tuntematon: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "IP ei kelpaa yhdistämisavuksi"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Virheellinen eD2k-linkki! VIRHE: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Portti ei kelpaa yhdistämisavuksi"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Suorita <str> ja poistu."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Ole hyvä ja täytä kaikki vaaditut kentät"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Virheellinen IP-muoto. Käytä xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Oletko varma että haluat ladata uuden nodes.dat-tiedoston?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Tälle komennolle on annettava parametri. Kelvollisia ovat: 'all', "
-"tiedostonimi, tai numero.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Käsittelee tarkisteen mukaan: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Käsittelee tiedostonimen mukaan: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Tälle komennolle on annettava parametri. Kelvollisia ovat: "
-"tiedostotarkiste.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Ei ole kelvollinen numero\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Tarkiste ei ole kelvollinen (pituuden on oltava tasan 32 merkkiä)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Toiminto onnistui."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Pyyntö epäonnistui virheeseen: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Asiakkaiden IP-suodatus on %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "POIS PÄÄLTÄ"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "PÄÄLLÄ"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Palvelimien IP-suodatus on %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Nykyinen IP-suodatustaso on %d.\n"
+"Tämä toiminto korvaa kaikki tunnetut yhteyspisteet ja uudelleenyhdistää "
+"Kademlian."
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Kaistarajoitukset: Ylös: %u KiB/s, Alas: %u KiB/s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Jatketaanko?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: hakusana on liian lyhyt"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Yhdistetty %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "LowID:llä"
+msgid "Keyword for search: %s"
+msgstr "Avainsana hakuun: %s"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "HighID:llä"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: Hakusana on jo hakulistalla:"
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Yhdistän"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Ei yhdistetty"
-
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Lataus:\t%s"
+"Tiedoston nodes.dat luku epäonnistui sillä se liian vanha. Versio 0 ei ole "
+"enää tuettu."
 
-#: src/TextClient.cpp:726
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"Lähetys:\t%s"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Luettu %u Kad-kontakti"
+msgstr[1] "Luettu %u Kad-kontaktia"
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Asiakkaita jonossa:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
+msgstr "Ei kontakteja, käytä yhdistämisapua tai hae nodes.dat-tiedosto."
 
-#: src/TextClient.cpp:732
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
-msgstr ""
-"\n"
-"Lähteitä yhteensä:\t%d\n"
-
-#: src/TextClient.cpp:809
-#, c-format
-msgid "Number of search results: %i\n"
-msgstr "Hakutuloksia: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "KESKENERÄINEN - haun edistymisen näyttö"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Vain %d Kad-kontakti saatavilla, tiedostoa nodes.dat ei tallennettu"
+msgstr[1] ""
+"Vain %d Kad-kontaktia saatavilla, tiedostoa nodes.dat ei tallennettu"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Palvelin lähetti tunnistamattoman vastauksen, komentosana = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Näytä tilannetiedot lyhyesti."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Näyttää yhteyden tilan, nykyiset lähetys-/latausnopeudet, jne.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Näytä täydet tilastotiedot."
-
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Tälle komennolle voidaan antaa valinnaisesti parametrina luku väliltä 0-"
-"255,\n"
-"joka määrää kuinka monta merkintää asiakkaiden versiopuusta näytetään.\n"
-"Luku 0 tai ei parametria tarkoittaa rajoittamattomasti.\n"
-"\n"
-"Esimerkki: 'statistics 5' näyttää vain viisi suosituinta versiota kustakin "
-"asiakastyypistä.\n"
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Sammuta aMule."
-
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Sulje etäsuorituksessa oleva ydin (amule/amuled).\n"
-"Tämä sulkee myös tekstikäyttöliittymän, koska se on käyttökelvoton ilman\n"
-"suoritettavaa ydintä.\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Lataa uudelleen annetun kohteen."
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Lataa uudelleen jaettujen tiedostojen listan."
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Lataa uudelleen IP-suodatustaulukon tiedostosta."
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Yhdistää verkkoon."
-
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"Tämä yhdistää kaikkiin verkkoihin jotka on sallittu asetuksista.\n"
-"Voit myös antaa palvelimen muodossa IP:Portti yhdistääksesi vain\n"
-"kyseiselle palvelimelle. IP:n on oltava pisteillä erotettu IPv4-numero\n"
-"tai DNS-nimi."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Kirjoitettu %d Kad-kontakti"
+msgstr[1] "Kirjoitettu %d Kad-kontaktia"
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Yhdistä vain eD2k:hon."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Tiedoston nimi"
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Yhdistä vain Kadiin."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Tiedostokoko"
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Katkaise yhteys verkkoon."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Jakosuhde"
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Tämä katkaisee yhteyden kaikkiin yhdistettyihin verkkoihin.\n"
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Lähetetty"
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Katkaise vain eD2k-yhteys."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Pyydetty"
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Katkaise vain Kad-yhteys."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Hyväksytty"
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Lisää eD2k- tai magnet-linkin ytimelle."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Täysiä lähteitä"
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Lisättävä eD2k-linkki voi olla:\n"
-"*) tiedostolinkki (ed2k://|file|...), ja se lisätään latauslistalle,\n"
-"*) palvelinlinkki (ed2k://|server|...), ja se lisätään palvelinlistalle,\n"
-"*) tai palvelinlistalinkki, ja kaikki palvelimet listalta lisätään\n"
-"   palvelinlistalle.\n"
-"\n"
-"Magnet-linkin on sisällettävä eD2k-tarkiste ja tiedoston pituus.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Aseta haluamasi asetukset."
+"VAROITUS: Tunnettujen tiedostojen lista on turmeltunut, sisältää epäkelvon "
+"otsakkeen."
 
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Aseta IP-suodatusasetukset."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Kytke IP-suodatus päälle sekä asiakkaille että palvelimille."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Kytke IP-suodatus pois päältä sekä asiakkailta että palvelimilta."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Salli/estä asiakkaiden IP-suodatus."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Kytke IP-suodatus päälle asiakkaille."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Kytke IP-suodatus pois päältä asiakkailta."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Salli/estä palvelinten IP-suodatus."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Kytke IP-suodatus päälle palvelimille."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Kytke IP-suodatus pois päältä palvelimilta."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Valitse IP-suodatuksen taso."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"Sallitut suodatustasot ovat välillä 0-255 oletusarvon (myös lähtöarvon)\n"
-"ollessa 127.\n"
+"Merkinnän luku tunnettujen tiedostojen lista -tiedostosta epäonnistui, "
+"tiedosto saattaa olla turmeltunut"
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Aseta kaistankäytön rajoitukset."
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Näille komennoille annettujen arvojen on oltava kilotavuja sekunnissa.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Aseta lähetyskaistan raja."
+"Epäkelpo merkintä tunnettujen tiedostojen lista -tiedostossa, tiedosto "
+"saattaa olla turmeltunut: "
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Aseta latauskaistan raja."
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Näytä asetuksen arvo."
-
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Hae IP-suodatuksen asetukset."
-
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Hae IP-suodatuksen tila sekä asiakkaille että palvelimille."
-
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Hae IP-suodatuksen tila asiakkaille."
+#: src/libs/common/Format.cpp:307
+#, c-format
+msgid "Unknown error %d"
+msgstr "Tuntematon virhe %d"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Hae IP-suodatuksen tila palvelimille."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Virheelle %d ei ole virhekuvausta"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Hae IP-suodatuksen taso."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Luo tarkistetta"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Hae kaistankäytön rajat."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Viimeistelee"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Tekee haun."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Valmis"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"Haun tyyppi on annettava:\n"
-"    GLOBAL (kaikkialta)\n"
-"    LOCAL (paikallinen)\n"
-"    KAD (vain kadista)\n"
-"Esimerkki: 'search kad tiedosto' suorittaa kad-haun nimellä \"tiedosto\".\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Tauotettu"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Suorittaa haun kaikkialta."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Virheellinen"
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Suorittaa haun paikallisesti"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Odottaa"
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Suorittaa kad-haun"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Salasana ei voi olla tyhjä."
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Näyttää viimeisimmän haun tulokset."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Virheellinen salasana, ei MD5-tarkiste!"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Näyttää edellisen haun tulokset.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Yhdistäminen ei onnistunut"
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Näyttää haun edistymisen."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "Etäyhteysyritys epäonnistui. Vastaus oli tyhjä."
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Näyttää haun edistymisen.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "Etäyhteys: Epäkelpo vastaus, kättely epäonnistui. Yhteys suljettu."
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Aloittaa tiedoston lataamisen"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Yhdistetty onnistuneesti kohteeseen aMule "
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Tiedoston numero viimeisimmästä hausta on annettava.\n"
-"Esimerkki: 'download 12' aloittaa viimeisen haun tiedoston numero 12 "
-"latauksen.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Yhdistetty onnistuneesti."
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Tauota lataus."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Etäyhteys: Pääsy evättiin: "
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Jatka latausta."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Etäyhteys: Kättely epäonnistui"
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "KuunteluPistukka: Ok."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Peruuta lataus."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "VIRHE: Ei voida kuunnella TCP-porttia."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Aseta latauksen tärkeys."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "VIRHE: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr ""
-"Aseta tärkeys lataukselle, joko Alhainen, Normaali, Korkea tai "
-"Automaattinen.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "VAROITUS: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Aseta tärkeys alhaiseksi."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Sulje"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Aseta tärkeys normaaliksi."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Leikkaa"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Aseta tärkeys korkeaksi."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Kopioi"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Aseta tärkeys automaattiseksi."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Liitä"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Näytä jonot/listaukset."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Pyyhi"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Näyttää lähetys/latausjonon, palvelinlistan tai jaettujen tiedostojen "
-"listan.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Valitse kaikki"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Näytä lähetysjono."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "KB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Näytä latausjono."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Rajoittamaton"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Näytä loki."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMulen palkkivalikko"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Näytä palvelinlista."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Nopeusrajoitukset:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Nollaa loki."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "Ylös: Ei ole"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Vanhentunut komento, käytä sen sijaan '%s'."
+msgid "UL: %u"
+msgstr "Ylös: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Tämä on vanhentunut komento ja se voidaan poistaa tulevaisuudessa.\n"
-"Käytä sen sijaan '%s'.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "Alas: Ei ole"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "VIRHE: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "Alas: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "VAROITUS: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Latausnopeus: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Uusi asiakastunnus on %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "VAROITUS: Sinulla on Low-ID!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr ""
-"\tTodennäköisimmin tämä johtuu siitä että olet palomuurin tai reitittimen "
-"takana"
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tLisätietoa http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Lähetysnopeus: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Tuntematon palvelintieto vastaanotettu! - liian lyhyt"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Asiakkaan tiedot"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Vastaanotettiin %d uusi palvelin"
-msgstr[1] "Vastaanotettiin %d uutta palvelinta"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Palvelinlista tallennettu."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Palvelin hylkäsi viimeisimmän komennon"
+msgid "Nickname: %s"
+msgstr "Nimimerkki: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Virheellinen paketti saatu palvelimelta: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Nimimerkkiä ei ole valittu!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Odottamaton virhe käsiteltäessä pakettia palvelimelta: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "Asiakastunnus: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Ei voitu luoda DNS-selvittäjää yhdistäessä %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Ei yhdistetty"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "Palvelin IP %s (%s) on suodatettu. Ei yhdistetä."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Palvelinnimi: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "käyttää protokollan kätkentää."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "Palvelin-IP: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Yhdistää %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Ei yhdistetty"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Ei voitu selvittää dns-nimeä palvelimelle %s: Ei voida yhdistää!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr ""
-"CIP2Country::CIP2Country(): Maatietojen lataaminen epäonnistui lähteestä  "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Ladattiin %d lippukuva."
-msgstr[1] "Ladattiin %d lippukuvaa."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Oletko varma että haluat perua ja poistaa kaikki tiedostot tässä luokassa?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Vaaditaan vahvistus"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Kaikki muut"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Keskeneräinen"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Aktiivinen"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Video"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Ääni"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Pakattu"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD-levykuvat"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Kuvat"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Teksti"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Valitse suodatin"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Lisää luokka"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Muokkaa luokkaa"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Poista luokka"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Tiedoston nimi"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Tiedostokoko"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Jakosuhde"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Lähetetty"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Pyydetty"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Hyväksytty"
+msgid "TCP port: %d"
+msgstr "TCP-portti: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Täysiä lähteitä"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP-portti: Ei valmis"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Tuon %s: %s"
+msgid "UDP port: %d"
+msgstr "UDP-portti: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Luen väliaikaishakemistoa"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UPD-portti: Ei valmis"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Haen perustietoja ladatusta tietopaketista"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Online-Signeeraus: Käytössä"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Luon kohdetiedostoa"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Online-Signeeraus: Pois päältä"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Lataan tiedot vanhasta lataustiedostosta (%u %u:sta)"
+msgid "Uptime: %s"
+msgstr "Päälläoloaika: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Tallennan datalohkon yhteen uuteen lataustiedostoon (%u %u:sta)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Haen lähdelataustiedoston tietoja"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Lisään latauksen ja tallennan uuden osatiedoston"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Tuo osatiedostot"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Tila"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Tiedostotarkiste"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Odottaa..."
+msgid "Shared files: %d"
+msgstr "Jaettuja tiedostoja: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Levy: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Valitse kansio josta etsitään väliaikaislatauksia (alikansiot sisällytetään "
-"hakuun)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"Haluatko että lähteenä käytetyt tiedostot poistetaan onnistuneen tuonnin "
-"jälkeen?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Poistetaanko lähteet?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "tavu"
-msgstr[1] "tavua"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "KiB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MiB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GiB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TiB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "tavu/s"
-msgstr[1] "tavua/s"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MiB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "s"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "m"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "tuntia"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "päivää"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Videot"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Pakatut"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Tekstiä"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Ohjelmat"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Kaikki"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Ei luokitusta"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Epäkelpo / Turmeltunut / Väärennös"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Huono"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Kohtalainen"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Hyvä"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Erinomainen"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "kaikki"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "kaikki muut"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Lataan IP-suodattimet 'ipfilter.dat' sekä 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Asiakkaita jonossa: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Ipfilter.dat-tiedoston '%s' lataaminen epäonnistui, muoto tuntematon."
+msgid "Total DL: %s"
+msgstr "Yht alas: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Ipfilter.dat-tiedoston '%s' lataaminen epäonnistui, tiedostoa ei voitu avata."
+msgid "Total UL: %s"
+msgstr "Yht ylös: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Ladattu %u IP-alue kohteesta '%s'."
-msgstr[1] "Ladattu %u IP-aluetta kohteesta '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Lähetysraja"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u epämuodostunut rivi ohitettiin."
-msgstr[1] "%u epämuodostunutta riviä ohitettiin."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Latausraja"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktiiviset yhteydet: (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Piilota aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Tiedoston tiedot"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Näytä aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% valmiina"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Sulje"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "eD2k-linkki: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Suorita"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr "Klikkaa tästä lisätäksesi eD2k-linkin tekstikentästä latauslistaasi."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4558,19 +2692,19 @@
 "Tapahtumat näytetään tässä. Nähdäksesi täyden listan tapahtumista, katso "
 "loki Palvelimet-välilehdeltä."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Lataa ..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Käyttäjien määrä palvelimella johon olet yhteydessä ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Käyttäjiä: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4579,6 +2713,10 @@
 "käyttäjien määrästä."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Ylös: 0,0 | Alas: 0,0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4586,7 +2724,7 @@
 "Nykyiset keskimääräiset lähetys- ja latausnopeudet. Mikäli aktivoitu, "
 "numerot suluissa näyttävät asiakasyhteyksien otsikkotietojen nopeuksia."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4598,809 +2736,792 @@
 "palomuurin takana) ja vihreät nuolet että sinulla on HighID (paras "
 "yhdistettävyys)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Ei yhdistetty ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Palvelin johon yhdistetty."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Etsi"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tyyppi"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Paikallinen"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Kaikkialta"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Tiedostotarkiste"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Laajat parametrit"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Suodatus"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Tiedostotyyppi"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Kaikki"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Pakatut"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Ääni"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD-levykuvat"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Kuvat"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Ohjelmat"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Tekstiä"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Videot"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Pääte"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Vähimmäiskoko"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Tavua"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
-msgstr "KiB"
+msgstr "KB"
+
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Enimmäiskoko"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Saatavuus"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Suodatin:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Suodata tulokset"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Käännä tulos"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Piilota tunnetut tiedostot"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Käynnistä haku"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Hae lisää"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Hakee enemmän tuloksia eD2k:sta. Ei vielä tuettuna Kadissa."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Pysäytä"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Lataa"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Nollaa kentät"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Tulokset"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Siivoaa valmistuneet lataukset pois näkyvistä"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Näytä lähetykset / lähetysjono"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Asiakkaita jonossa :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Lähetä"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Lähettää annetun viestin."
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Tiedostolähteet:"
 
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Sulje"
-
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Sulje tämä keskustelu."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Yleiset"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Koko nimi :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "Ei saatavilla"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "Osatiedosto (met) :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Tarkiste :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Tiedostokoko :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Osatiedoston tila  :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Viimeksi nähty kokonaisena :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Siirto"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Löydetyt lähteet :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Siirtäviä lähteitä :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Osien määrä :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Saatavilla :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Siirtonopeus :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Lataus ollut aktiivisena: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Siirretty :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Valmiina :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Älykäs turmeltumien käsittely (I.C.H.)"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Menetetty turmeltumille :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Pakkaamalla saatu hyöty :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Pelastetut paketit (I.C.H.) :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Tiedostonimet"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Muuta nimi"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Siivoa"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Käytä"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Kommentoi/luokittele tiedosto (Teksti näkyy kaikille käyttäjille)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Elokuvasta voit kertoa sen pituuden, juonen sekä kielen\n"
-"ja jos se on väärennös, voit kertoa sen muille aMulen käyttäjille."
+"Elokuvalle voit kertoa sen pituuden, tarinan, kielen ...\\n\\nja mikäli se "
+"on väärennös, voit kertoa sen muille aMulen käyttäjille."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Tiedoston laatu"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Ei luokitusta"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Epäkelpo / Turmeltunut / Väärennös"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Huono"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Kohtalainen"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Hyvä"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Erinomainen"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Valitse tiedoston luokitus tai ilmoita muille käyttäjille jos tiedosto on "
 "viallinen ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Päivitä"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Lataan, odota hetki ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Koko on tuntematon"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Vaadittavat tiedot"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP-osoite :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Portti :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Käyttäjänimi :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Käyttäjätarkiste :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Uudelleenlataa jaetut tiedostot"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Nykyinen sessio"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Yhteensä"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Pyydetty :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Aktiiviset lähetykset :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Lisää"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Latausnopeus"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Nykyinen"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
-msgstr "Jatkuva keskiarvo"
+msgstr "Yhtäjaksoinen keskiarvo"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Session keskiarvo"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Lähetysnopeus"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Yhteydet"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Aktiiviset lataukset"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Aktiiviset yhteydet (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Aktiiviset lähetykset"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Tilastopuu"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Käyttäjänimi:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Käyttäjätarkiste:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Asiakasohjelma:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Asiakasversio:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP-osoite:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "Käyttäjätunniste:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "Palvelimen IP:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Palvelimen nimi:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Kätkeminen:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Siirrot asiakkaalle"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Nykyinen pyyntö:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Keskimääräinen lähetysnopeus:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Keskimääräinen latausnopeus:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Lähetetty (sessiossa):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Ladattu (sessiossa):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Lähetetty (yhteensä):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Ladattu (yhteensä):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Pisteet"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Lähetys/vastaanotto-määre:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Turvattu tunnistus:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Luokitus (yhteensä):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Sijoitus jonossa:"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Jonopisteet:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Nimimerkki"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - Linuxin Muuli"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - monen alustan Mule"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Tämä on nimi jonka muut käyttäjät näkevät yhdistäessään sinuun."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Kieli"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Kieli:"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Viive työkaluvihjeiden näyttämiseen."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Tämä määrittää kontrolleissa käytetyn kielen."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Yleiset asetukset"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Tarkista uuden version saatavuus käynnistettäessä"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "aMule tarkistaa käynnistyessään uuden version olemassaolon kun tämä on "
 "päällä."
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Aloita pienennettynä"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Tämä päällä aMule pienentää itsensä käynnistyessään."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Vahvista sulkeminen"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Suljettaessa aMule kysyy varmistuksen."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "Amule kysyy varmistuksen ennen poistumista."
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr "Piilota sovelluksen ikkuna painettaessa sulje -nappulaa"
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Näytä kuvake palkissa"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 "Tämä sallii tai estää kuvakkeen näyttämisen järjestelmä-/tehtäväpalkissa."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Pienennä palkkikuvakkeeksi"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr "Tämä päällä aMule pienentyy järjestelmäpalkkiin tehtäväpalkin sijaan."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Työkaluvihjeen viive sekunteina"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Työkaluvihjeiden viive:"
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "sekuntia"
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Viive työkaluvihjeiden näyttämiseen."
-
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Järjestelmän oletus"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Valitse selaimesi tässä"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Muu selain:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Syötä selaimesi nimi tähän. Käyttääksesi jotain muuta selainta valitse Muu "
-"yläpuolelta pudotusvalikosta."
+"Syötä tähän selaimesi nimi. Jätä tyhjäksi jos haluat käyttää järjestelmän "
+"oletusselainta."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Selaa"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Avaa uuteen välilehteen mikäli mahdollista"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Avaa verkkosivun uuteen välilehteen uuden ikkunan sijaan kun se on "
 "mahdollista"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Videotoistin"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Tee kopio esikatselua varten"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr "Kaistarajoitukset"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
+msgstr "Kaistankäytön rajoitukset"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Lähetys"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Paikkavaraus"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Vakio asiakas-TCP-portti:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Portit"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Vakio TCP-portti"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Tämä on vakio eD2k-portti eikä sitä voi kytkeä pois päältä."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Laajennettu asiakas-UDP-portti:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "UDP-portti palvelinpyyntöihin (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Laajennettu UDP-portti (Kad / haku kaikkialta)."
+
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
-"Tätä UDP-porttia käytetään laajennettuihin eD2k-pyyntöihin sekä Kad-verkossa"
+"Tätä UDP-porttia käytetään laajennettuihin eD2k-hakuihin sekä Kad-verkossa"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "estä"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Käytä UPnP:tä reitittimen portinohjauksessa"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Sido verkkoliitäntään"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "UDP-portti laajennettuihin palvelinpyyntöihin (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Lähteitä enintään tiedostoa kohti"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnP:n TCP-portti (Valinnainen):"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Pysyvä rajoitus"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Sido paikallinen osoite IP:hen (tyhjä sallii mihin tahansa):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Yhteyksien rajoitus"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Yhteyksiä enintään"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Vain edistyneille käyttäjille: mikäli sinulla on useampia verkkoliitäntöjä, "
+"syötä sen liitännän osoite johon haluat aMulen sidottavan."
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Lähteitä enintään tiedostoa kohden:"
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Yhtäaikaisten yhteyksien enimmäismäärä:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Käytä UPnP:tä"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP TCP-portti:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Yhdistä automaattisesti käynnistettäessä"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Yhdistä uudelleen yhteyden katketessa"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Näytä otsikkotietoihin kuluva kaista"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Palvelimen valinnat"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Poista toimimattomat palvelimet"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "yrityksen jälkeen"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Päivitä palvelinlista käynnistettäessä"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Päivitä palvelinlista yhdistettäessä palvelimelle"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Päivitä palvelinlista asiakkaan yhdistäessä"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Käytä tärkeysjärjestystä"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Käytä älykästä LowID-tarkistusta yhdistettäessä"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Turvallinen yhdistäminen"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Yhdistä automaattisesti vain pysyville palvelimille"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Aseta käsin syötetyt palvelimet korkealle tärkeydelle"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. aktiivinen"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH luottaa kaikkiin tarkisteisiin (ei suositella)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Älykäs turmeltumien käsittely (I.C.H.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Käytä"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Kehittynyt I.C.H. luottaa kaikkiin tarkisteisiin (ei suositella)"
+
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Lisää tiedostot lataukseen tauotettuna"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Lisää tiedostot lataukseen tärkeys automaattisella"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Yritä ladata ensimmäiset ja viimeiset palat ensin"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Lisää uudet jaetut tiedostot tärkeys automaattisella"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Yritä siirtää kokonaisia paloja lähetettäessä"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Aloita seuraava tauotettu tiedosto edellisen valmistuttua"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Käynnistä seuraava tauotetty tiedosto kun tiedosto valmistuu"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Samasta luokasta"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Tallenna 10 lähdettä harvinaisille tiedostoille (< 20 lähdettä)"
-
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Levytile"
-
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Tarkista levytila"
-
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Valitse tämä mikäli haluat aMulen tarkistavan vapaan levytilan määrän"
-
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Levytilaa vähintään:"
-
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
-msgstr "Syötä tähän levytila jonka haluat jättää vapaaksi."
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "Aakkosellisessa järjestyksessä"
 
-#: src/muuli_wdr.cpp:2077
+#: src/muuli_wdr.cpp:1811
 msgid "Preallocate disk space for new files"
 msgstr "Esivaraa levytila uusille tiedostoille"
 
-#: src/muuli_wdr.cpp:2078
+#: src/muuli_wdr.cpp:1812
 msgid ""
 "For new files preallocates disk space for the whole file, thus reduces "
 "fragmentation"
@@ -5408,293 +3529,248 @@
 "Uusia tiedostoja lisätessä varaa levytilaa koko tiedostolle, vähentää "
 "pirstaloitumista"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Saapuvat"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Väliaikainen"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Jaettu"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Pysäytä lataukset kun tyhjän levytilan määrä saavuttaa "
+
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Valitse tämä mikäli haluat aMulen tarkistavan vapaan levytilan määrän"
+
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
+msgstr "Syötä tähän levytila jonka haluat jättää vapaaksi."
+
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Tallenna 10 lähdettä harvinaisille tiedostoille (< 20 lähdettä)"
+
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Lähetykset"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Lisää uudet jaetut tiedostot tärkeys automaattisella"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Kansio ladatuille tiedostoille"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Kansio latauksen väliaikaisille tiedostoille"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Jaetut kansiot"
+
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 "(Klikkaa oikealla painikkeella kansion kuvaketta jakaaksesi rekursiivisesti)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Jaa piilotiedostot"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Kuvaajat"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Päivitysväli : 5 sekuntia"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
-msgstr "Keskiarvoviivan aika: 100 minuuttia"
+msgstr "Keskimääräiskuvaajan aika: 100 minuuttia"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Yhteyskuvaajan Skaala: 100 "
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Valitse tilastojen värit"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Latauskuvaajan skaala:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Lähetyskuvaajan skaala:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Värit:"
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Taustaväri"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Ruudukko"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Hetkittäinen lataus"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
-msgstr "Latauksen jatkuva keskiarvo"
+msgstr "Latauksen yhtäjaksoinen keskiarvo"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Latauksen keskiarvo sessiossa"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Hetkittäinen lähetys"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
-msgstr "Lähetyksen jatkuva keskiarvo"
+msgstr "Lähetyksen yhtäjaksoinen keskiarvo"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Lähetyksen keskiarvo sessiossa"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Aktiiviset yhteydet"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Järjestelmäpalkin nopeusnäyttö"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Kad-yhteyksiä tällä hetkellä"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Kad-yhteyksiä aktiivisena"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Kad-yhteyksiä sessiossa"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Valitse"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Puu"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Näytettävien asiakasversioiden määrä (0=rajoittamattomasti)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Linjan kapasiteetit"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Huomio: Näitä arvoja käytetään vain tilastoissa."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! VAROITUS !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Älä koske näihin asetuksiin ellet tiedä mitä\n"
-"olet tekemässä, muuten voit helposti\n"
-"hankaloittaa omia asioitasi.\n"
-"\n"
-"aMule toimii hyvin vaikka näitä ei\n"
-"säädettäisikään."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Laajennetut asetukset"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Enimmäismäärä uusia yhteyksiä / 5 s"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Tiedostopuskurin koko: 240000 tavua"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Lähetysjonon koko: 5000 asiakasta"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Palvelinyhteyden päivitysväli: Poissa käytöstä"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Latausjonon tiedostojen edistyminen"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Näytä prosenttiosuus"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Näytä edistymispalkki "
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Edistymispalkin tyyli"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Tasainen"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Pyöreä"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Teematuki"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Salli teeman muuttaminen "
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Teema:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- teemoja ei ole saatavilla -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Sarakkeiden lajittelu"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr ""
-"Järjestä latausjonon tiedostot automaattisesti (Iso suorittimen käyttö)"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Poista käytöstä tietokoneen ajastettu siirtyminen valmiustilaan"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Käytettävä teema:"
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Näytä \"Nopea eD2k-linkkien käsittelijä\" jokaisessa ikkunassa."
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule järjestää sarakkeet latauslistassasi automaattisesti"
-
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Käyttöliittymä, muut"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Näytä nopea eD2k-linkkien käsittelijä"
-
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Näytä laajennetut tiedot luokitteluvälilehdillä"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
+msgstr "Näytä sovelluksen versio otsikossa"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "Näytä siirtonopeudet otsikossa"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Pystysuuntainen työkalupalkki"
-
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Näytä osatiedoston numero ennen tiedoston nimeä"
-
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Web-palvelimen asetukset"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Ennen sovelluksen nimeä"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Sovelluksen nimen perässä"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Suorita amuleweb käynnistettäessä"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Web-palvelimen portti"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Salli UPnP-porttiohjaus web-palvelimen portille"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Web-palvelimen UPnP TCP-portti"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Näytä otsikkotietoihin kuluva kaista"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Sivun päivitysväli (sekunneissa)"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Pystysuuntainen työkalupalkki"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Salli gzip-pakkaus"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "Näytä asiakkaiden valtioiden liput"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Latausjonon tiedostot"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Näytä edistyminen prosentteina"
+
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Näytä edistymispalkki"
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Salli rajoitettujen oikeuksien käyttäjä"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Tasainen"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Täysien oikeuksien salasana"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Pyöreä"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Rajoitettujen oikeuksien salasana"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Järjestä tiedostot automaattisesti (iso suorittimen käyttö)"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Web-sapluuna"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "aMule järjestää sarakkeet latauslistassasi automaattisesti"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Etäyhteyksien asetukset"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Hyväksy etäyhteydet"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"Kuunneltavan liitännän IP\n"
-"(tyhjä tarkoittaa kaikkia)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "Kuunneltavan verkkoliitännän IP:"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5702,75 +3778,115 @@
 "Syötä tähän sen verkkoliitännän ip jota kuunnellaan etäyhteyksiä varten. "
 "Tyhjä tai 0.0.0.0 tarkoittaa kaikkia verkkoliitäntöjä."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP-portti"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "TCP-portti:"
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Kytke päälle UPnP-portinohjaus etäyhteysportissa"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Salasana"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Web-palvelimen asetukset"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Käynnistä web-palvelin käynnistettäessä"
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Web-sapluuna"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Täysien oikeuksien salasana"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Salli rajoitettujen oikeuksien käyttäjä"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Rajoitettujen oikeuksien salasana"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Käytä UPnP-portinohjausta web-palvelimen portissa"
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Web-palvelimen UPnP TCP-portti (Valinnainen)"
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Sivun päivitysväli (sekunneissa)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Salli gzip-pakkaus"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Napsauta tästä saattaaksesi voimaan asetuksiin tehdyt muutokset."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Nollaa asetuksiin tekemäsi muutokset."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Otsikko :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Kommentti :"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Saapuvien kansio :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Vaihda tärkeyttä uusille sijoitetuille tiedostoille :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "Älä vaihda"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Valitse väri tälle luokalle (valittuna) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Näytä palvelimen päivän viesti yhdistettynä ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Palvelimen tiedot"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Tyhjennä"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Napsauta tätä painiketta nollataksesi lokin."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule loki"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Napsauta tätä nappia päivittääksesi palvelinlistan osoitteesta ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Palvelinlista"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5778,44 +3894,56 @@
 "Syötä tähän server.met-tiedostoon osoittava url ja paina nappia vasemmalla "
 "päivittääksesi tunnettujen palvelimien listan."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Palvelimen lisäys käsin: Nimi"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Syötä uuden palvelimen nimi tähän"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Portti"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Syötä uuden palvelimen IP tähän, muodossa x.x.x.x."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Syötä palvelimen portti tähän."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Lisää palvelin käsin (täytä vasemmalla olevat kentät) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule loki"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Palvelimen tiedot"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
-msgstr "Ed2k Info"
+msgstr "ED2K Info"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad Info"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 "Napsauta tätä nappia päivittääksesi yhteyspisteiden listan osoitteesta ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Yhteyspisteitä (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5823,51 +3951,54 @@
 "Syötä tähän nodes.dat-tiedostoon osoittava url ja paina nappia vasemmalla "
 "päivittääksesi tunnettujen yhteyspisteiden listan."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Yhteyspisteiden tilastot"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Yhdistämisapu"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Uusi yhteyspiste"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Portti:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Käytä tunnettuja \n"
-"asiakkaita yhdistämisapuna"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Käytä tunnettuja asiakkaita yhdistämisapuna"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Katkaise Kad-yhteys"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2k info"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Käytä turvattua käyttäjän tunnistusta"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Tunnistuksen käyttö on suositeltavaa. Muuten et hyödy pistejärjestelmästä."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Protokollan kätkeminen"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Tuki protokollan kätkemiselle"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5875,23 +4006,23 @@
 "Tämä valinta sallii aMulen ottaa vastaan kätketyn protokollan yhteyksiä "
 "muilta asiakkailta."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Käytä kätkemistä lähtevissä yhteyksissä"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
 msgstr ""
-"aMule käyttää protokollan kätkemistä ottaessaan yhteyttä muihin asiakkaisiin "
-"ja palvelimiin."
+"Tämä valittuna aMule käyttää protokollan kätkemistä ottaessaan yhteyttä "
+"muihin asiakkaisiin/palvelimiin."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Vastaanota vain kätkettyjä yhteyksiä"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5899,87 +4030,83 @@
 "Tämä valittuna aMule hyväksyy vain kätketyt yhteydet. Lähteitä on vähemmän "
 "saatavilla mutta kaikki liikenteesi on kätketyllä protokollalla."
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Tiedostoasetukset"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Kaikki"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Ei kukaan"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Ketkä näkevät jaetut tiedostosi:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Ketkä voivat nähdä jaetut tiedostoni:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 "Valitse ketkä voivat pyytää nähtäville sinun jaettujen tiedostojen listaasi."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP-suodatus"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Suodata asiakkaat"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Salli asiakas-IP:den suodatus kuten määritelty tiedostossa ~/.aMule/ipfilter."
 "dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Suodata palvelimet"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Salli palvelin-IP:den suodatus kuten määritelty tiedostossa ~/.aMule/"
 "ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Uudelleenlataa lista"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 "Uudelleenlataa suodatettavien IP:den lista tiedostosta ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Päivitä nyt"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Päivitä ip-suodatus automaattisesti käynnistettäessä"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Suodatustaso:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Suodata aina lähiverkon IP:t"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Käsittele muut IP:t vainoharhaisesti"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -5987,11 +4114,11 @@
 "Hylkää paketit mikäli asiakkaan ip on eri kuin mistä paketti saapui. Käytä "
 "varoen."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Käytä järjestelmänlaajuista ipfilter.dat-tiedostoa mikäli saatavilla"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -5999,22 +4126,11 @@
 "Mikäli paikallista ipfilter.dat:ia ei löydy, käytetään järjestelmänlaajuista "
 "ipfilter.dat-tiedostoa."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Käytä turvattua käyttäjän tunnistusta"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Tunnistuksen käyttö on suositeltavaa. Muuten et hyödy pistejärjestelmästä."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Kytke Online-Signeeraus päälle"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6022,868 +4138,1329 @@
 "Kytkee päälle Online-Signeeraustiedoston kirjoittamisen, jota muut ohjelmat "
 "voivat käyttää esimerkiksi signeerauksissa."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Päivitysväli (sekuntia):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Muuttaa Online-Signeerauksen päivitysväliä, annetaan sekunteina."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Online-Signeerauksen kansio:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Online-signeeraus-tiedoston tallennuspaikka:"
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr "Napsauta tästä valitaksesi kansio Online-Signeerauksen tiedostoille."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Kytke pois/päälle"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Suodata saapuvat viestit (ei koske keskusteluja):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Suodatuksen vaihtoehdot:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Suodata kaikki viestit"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Suodata viestit ihmisiltä jotka eivät ole kaverilistallasi"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Suodata viestit tuntemattomilta asiakkailta"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Suodata viestit jotka sisältävät (käytä merkkiä ',' erottimena):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "Syötä tähän suodatettavat sanat ja aMule estää viestit jotka sisältävät "
 "sellaisen"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Näytä vastaanotetut viestit lokissa"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Kommentit"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Suodata kommentit jotka sisältävät (käytä merkkiä ',' erottimena):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Automaattinen palvelinyhteys ilman välityspalvelinta"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Käytä tunnistautumista"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Kytkee päälle/pois käyttäjänimellä/salasanalla tunnistautumisen"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Käyttäjänimi:"
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Käyttäjänimi tunnistautuessa välityspalvelimelle"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Salasana:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Salasana tunnistautuessa välityspalvelimelle"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Käytä välityspalvelinta"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Kytke päälle/pois välityspalvelimen tuki"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Tyyppi:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Yhdistettävän välityspalvelimen tyyppi"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
-msgstr "Isäntänimi:"
+msgstr "Välityspalvelin:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
-msgstr "Välityspalvelimen isäntänimi"
+msgstr "Välityspalvelimen verkkonimi"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Portti:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Välityspalvelimen portti"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Tunnistautuminen"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Käytä tunnistautumista"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Kytkee päälle/pois käyttäjänimellä/salasanalla tunnistautumisen"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Käyttäjänimi tunnistautuessa välityspalvelimelle"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Salasana:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Salasana tunnistautuessa välityspalvelimelle"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Automaattinen palvelinyhteys ilman välityspalvelinta"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Yhdistä:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Kirjaudu etä-aMuleen"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Käyttäjänimi"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Muista nämä asetukset"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Käytä monisanaista lokiin kirjausta."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
-msgstr "Viestien luokat:"
+msgstr "Viestien luokittelut:"
+
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Odottaa..."
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Lisää tuonteja"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Yritä uudelleen valittuja"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Poista valitut"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "Tapahtumatyypit"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+"Tilastot ja jonottavat asiakkaat valitu(i)lle tiedosto(i)lle: Sessiossa / "
+"Yhteensä"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Aktiiviset lähetykset"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "Prosenttia kaikista tiedostoista"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Kaikki tiedostot"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Valitut tiedostot"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Vain aktiiviset lähetykset"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Näytä asiakkaat"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Uudelleenlataa:"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Uudelleenlataa jaetut tiedostot"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Lähetä"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Lähettää annetun viestin."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Sulje tämä keskustelu."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Yhdistä mihin tahansa palvelimeen ja/tai Kadiin"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Verkkoikkuna"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Jaetut tiedostot"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Hakujen ikkuna"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Poissa käytöstä [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Siirrettävien tiedostojen ikkuna"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "tavu"
+msgstr[1] "tavua"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Jaettujen tiedostojen ikkuna"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "KB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Viestien ikkuna"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Tilastokuvaajien ikkuna"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Asetuksien säätöikkuna"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Uusi luokka"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Valitse kansio saapuville tiedostoille"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Sinun on annettava nimi luokalle!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "tavu/s"
+msgstr[1] "tavua/s"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Sinun on annettava polku luokalle!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr "Saapuvien kansion luonti luokalle epäonnistui. Anna kelvollinen polku!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "s"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "m"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "tuntia"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "päivää"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "kaikki"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "kaikki muut"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Keskeneräinen"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Pysäytetty"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Video"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Pakattu"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Teksti"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Aktiivinen"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Tuntematon laajennos '%s' komennolle '%s'.\n"
+msgid "Using config dir: %s"
+msgstr "Asetuskansio: %s"
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Odotellaan osatiedostojen muuntosäikeen päättymistä..."
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Tuntematon komento '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Tuon %s: %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Tälle komennolle ei voi antaa parametria.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Luen väliaikaiskansiota"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Tälle komennolle on annettava parametri.\n"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Haen perustietoja ladatusta tietopaketista"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Luon kohdetiedostoa"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Lataan tiedot vanhasta lataustiedostosta (%u %u:sta)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Tallennan datalohkon yhteen uuteen lataustiedostoon (%u %u:sta)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Haen lähdelataustiedoston tietoja"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Lisään latauksen ja tallennan uuden osatiedoston"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Tuo osatiedostot"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Tila"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Tiedostotarkiste"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Levy: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Tämä komento on puutteellinen, sinun on käytettävä jotakin alla olevista "
-"laajennoksista.\n"
+"Valitse kansio josta etsitään väliaikaislatauksia (alikansiot sisällytetään "
+"hakuun)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Mahdolliset laajennokset:\n"
+"Haluatko että lähteenä käytetyt tiedostot poistetaan onnistuneen tuonnin "
+"jälkeen?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Käytettävissä olevat komennot:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Poistetaanko lähteet?"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "VIRHE: Osatiedoston luominen epäonnistui"
+
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Komennot eivät erottele isoja ja pieniä kirjaimia.\n"
-"Kirjoita '%s <komento>' saadaksesi lisätietoa komennosta.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Yritän avata met-tiedoston varmuuskopion kohteesta %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Poistuu sovelluksesta."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "VIRHE: part.met-tiedostoa ei avattu: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Näyttää ohjeen."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "VIRHE: part.met-tiedosto on tyhjä: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "VIRHE: Epäkelpo part.met-tiedoston versio: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Saadaksesi ohjeen komennosta, kirjoita 'help <komento>'.\n"
-"Saadaksesi listan komennoista kirjoita 'help'.\n"
+"Virhe: %s (%s) on turmeltunut (väärät tagit: %s), tiedostoa ei voitu ladata."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Käytä '%s' listataksesi komennot\n"
-"\n"
+"VIRHE: %s (%s) on turmeltunut (väärä tagimäärä), tiedostoa ei voitu avata."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Syntaksivirhe!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Yritän palauttaa tiedoston tietoja..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"Virhe käsiteltäessä komentoa - näin ei pitäisi tapahtua! Ole hyvä ja "
-"raportoi tästä\n"
+"Palautan nimetöntä tiedostoa - yritetään tallentaa nimelle RecoveredFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Tämä komento ei tarvitse parametreja."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "Saatavissa olevat tiedot palautettiin :D - Yritän käyttää niitä..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Tälle komennolle on annettava parametri."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Tiedoston tietoja ei saatu palautettua :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Virheellinen parametri."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Avaaminen epäonnistui: %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Komento on puutteellinen."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "VAROITUS: %s voi olla turmeltunut (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Kirjoita '%s' saadaksesi lisää ohjeita.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "VIRHE osatiedostoa tallennettaessa: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "IO-virhe osatiedostoa tallennettaessa: "
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Tämä on %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Pituutta ei saatu noudettua: '%s' - käytän %s tiedostoa."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Tämä on %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' on jostain syystä tyhjä - käytetään tiedostoa %s."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Tiedoston part.met.seeds tallentaminen epäonnistui kohteelle %s"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Tallennettu %i lähde osatiedostolle: %s (%s)"
+msgstr[1] "Tallennettu %i lähdettä osatiedostolle: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Osatiedostolla %s (%s) ei ole lähdetiedostoa"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Osatiedostolla %s (%s) on tyhjä lähdetiedosto"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Virhe luettaessa osatiedoston lähdetiedostoa (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Turmeltunut osa (%d) %d osasta tiedostossa %s - Tiedostotulostarkiste |%s| "
+"Tiedostotarkiste |%s|"
+msgstr[1] ""
+"Turmeltunut osa (%d) %d osasta tiedostossa %s - Tiedostotulostarkiste |%s| "
+"Tiedostotarkiste |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Valmis osa (%i) kohteessa %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Tarkiste uudelleenluotu: %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Odottamaton virhe viimeistellessä %s. Tiedosto tauotettu"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Lataus suoritettu: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Poistetaan tiedosto: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Luon asiakasta...\n"
+"VAROITUS: Ei voitu laskea tarkistetta ladatusta osasta - tarkistejoukko on "
+"puutteellinen kohteelle '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Ok, suljen %s...\n"
+"VIRHE: Ei voitu luoda tarkistetta ladatulle osalle - tarkistejoukko on "
+"puutteellinen (%s). Näin ei pitäisi koskaan tapahtua."
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Tyhjällä salasanalla ei voida yhdistää.\n"
-"Sinun on annettava salasana joko asetustiedostossa,\n"
-"komentorivillä tai annettava se kysyttäessä.\n"
-"\n"
-"Suljen...\n"
+"Data loppui (EOF) luotaessa tarkistetta ladatulle osalle %u jonka pituus on %"
+"u (maksimi on %u) osatiedostosta '%s' jonka pituus on %u: %s"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Näytä tämä ohje."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "VAROITUS: Levytilaa ei ole tarpeeksi! Tauotan tiedoston: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Isäntäkone jossa aMule on käynnissä. (oletus: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Ladattu osa %i on turmeltunut tiedostossa: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "aMulen portti etäyhteydelle. (oletus: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr ""
+"ICH: Ennallistettu turmeltunut osa %i kohteessa %s -> Säästetyt tavut: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Etäyhteyden salasana."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Allokoidaan"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Lue asetukset tiedostosta."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Riittämätön levytila"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Älä tulosta mitään stdout:iin."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Ladattu"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Ole monisanainen - näytä myös virheenetsintäviestit."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "VIRHE: Ei voida avata osatiedostoa '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Asettaa ohjelman maa-asetukset (kielen)."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Järjestelmän vakio"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Kirjoita komentoriviparametrit asetustiedostoon."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albania"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Luo asetustiedoston perustuen aMulen asetustiedostoon."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabia"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Näyttää ohjelman version."
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturia"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Pisteytystiedosto ladattu, %u tunnettu asiakas"
-msgstr[1] "Pisteytystiedosto ladattu, %u tunnettua asiakasta"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Baski"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Pisteet ovat vanhentuneet %u asiakkaalle!"
-msgstr[1] " - Pisteet ovat vanhentuneet %u asiakkaalle!"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgaria"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Tiedostoa 'cryptkey.dat' ei löydetty, luodaan."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Katalaani"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Kiina (Yksinkertaistettu)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Kiina (Perinteinen)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Kroatia"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Tsekki"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Tanska"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Hollanti"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Englanti (U.K.)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Viro"
 
-#: src/amuled.cpp:594
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Suomi"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Ranska"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galicia (Galego)"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Saksa"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Kreikka"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Heprea"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Unkari"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italia"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italia (Sveitsi)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japani"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Korea"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Liettua"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norja (Nynorsk)"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Puola"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugali"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugali (Brazilia)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Venäjä"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Slovenia"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Espanja"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Ruotsi"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turkki"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ukraina"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Vaihda kieli"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr "Käännöksiä ei ole asennettuna aMulelle"
+
+#: src/Preferences.cpp:771
+msgid "No languages available"
+msgstr "Kieliä ei saatavilla"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "vaihtoehtoja ei saatavilla"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Löytyi epäkelpo luokka, hypätään yli"
+
+#: src/Preferences.cpp:1766
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
-"VIRHE: aMule-taustaprosessia ei voida käyttää kun etäyhteydet ovat poissa "
-"päältä. Etäyhteyksien päälle kytkemiseksi käytä normaalia aMulea, käynnistä "
-"amuled parametrilla --ec-config tai aseta avain \"AcceptExternalConnections"
-"\" arvoon 1 tiedostossa ~/.aMule/amule.conf"
+"TCP-portti ei voi olla korkeampi kuin 65532 koska serverin käyttämä UDP-"
+"pistukka on TCP+3"
 
-#: src/amuled.cpp:750
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "ERROR: %s"
-msgstr "VIRHE: %s"
+msgid "Default port will be used (%d)"
+msgstr "Käytetään oletusporttia (%d)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Salli"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Näytä lähetykset"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Näytä jono"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Unohdetaan olematon jaettu kansio: %s"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Näytä asiakkaat"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Yhteys"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Valitse näkymä"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Asiakasohjelma"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Odottanut"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Lähetysaika"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Lähetetty/vastaanotettu"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Etäpään tilanne"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Kansiot"
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "Jonossa: %u"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Palvelimet"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Tiedoston tärkeys"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Tiedostot"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Pisteet"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Turvallisuus"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Kysytty"
-
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Viimeksi nähty"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Saapunut jonoon"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Käyttöliittymä"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Lähetyksen tilanne"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Välityspalvelin"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Lähetetty"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Suodattimet"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Latauksen tilanne"
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Etähallinta"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Ladattu"
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Online-Signeeraus"
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Käyttäjätarkiste"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Salattu"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Piilota jaetut tiedostot"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Laajennetut"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Asiakkaan tiedot"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Tapahtumat"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Käytössä"
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Debuggaus"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Tuettu"
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+"Seuraavat muuttujat korvataan:\n"
+"    %PARTFILE - koko polku tiedostoon\n"
+"    %PARTNAME - pelkästään tiedoston nimi"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Ei tuettu"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Älä koske näihin asetuksiin ellet tiedä mitä\n"
+"olet tekemässä, muuten voit helposti\n"
+"hankaloittaa omia asioitasi.\n"
+"\n"
+"aMule toimii hyvin vaikka näitä ei\n"
+"säädettäisikään."
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Poissa käytöstä"
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Asetuksen kytkeminen widgettiin epäonnistui ID:llä %d ja avaimella %s"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f KiB/s"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
+"Datan siirtäminen asetuksesta widgettiin epäonnistui ID:llä %d ja avaimella %"
+"s"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Ei vielä valmis"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Yhdistettävän välityspalvelimen tyyppi"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Pahis"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
+"Datan siirtäminen widgetistä asetukseen epäonnistui ID:llä %d ja avaimella %s"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Vahvistettu - OK"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"aMule on käynnistettävä uudelleen näiden muutosten voimaansaattamiseksi:\n"
+"\n"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Ei saatavilla"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP-portti muuttui.\n"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (Jono: %u)"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP-portti muuttui.\n"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- Etäyhteyden portti vaihtui.\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- Etäyhteyden vastaanotto muuttui.\n"
+
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- Etäyhteyden sovitin muuttui.\n"
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
-"Vähimmäiskoon pitää olla pienempi kuin enimmäiskoon. Enimmäiskokoa ei "
-"huomioida."
+"Palvelinlistan automaattisen päivityksen lista on tyhjä.\n"
+"'Päivitä palvelinlista käynnistettäessä' kytketään pois päältä."
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Hakuvaroitus"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Olet sallinut etäyhteydet mutta et ole antanut salasanaa.\n"
+"Etäyhteydet eivät ole mahdollisia ellei salasanaa ole annettu."
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Rajoittamaton"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Kieli vaihtui.\n"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMulen palkkivalikko"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Väliaikaiskansio muuttui.\n"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Nopeusrajoitukset:"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- ED2K-verkko käytössä.\n"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "Ylös: Ei ole"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Sekä eD2k- että Kad-verkko on pois päältä.\n"
+"Et voi yhdistää ennen kuin ainakin toinen niistä on sallittu."
+
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad ei käynnisty mikäli UDP-portti on pois päältä.\n"
+"Salli UDP-portti tai kytke Kad pois päältä."
+
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Sinun on uudelleenkäynnistettävä aMule nyt.\n"
+"Mikäli et uudelleenkäynnistä nyt, älä valita mikäli jotain pahaa tapahtuu.\n"
+
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Palvelinlistan päivitysten hakulista on tyhjä.\n"
+"Ole hyvä ja syötä ainakin yksi URL joka osoittaa käypään server.met-"
+"tiedostoon.\n"
+"Klikkaa nappia \"Lista\" tämän valintaruudun vierestä syöttääksesi URLin."
+
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Väliaikaiset tiedostot"
 
-#: src/MuleTrayIcon.cpp:354
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Saapuvat tiedostot"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Online-Signeeraukset"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "UL: %u"
-msgstr "Ylös: %u"
+msgid "Choose a folder for %s"
+msgstr "Valitse kansio kohteelle %s"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "Alas: Ei ole"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Etsi videosoitin"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Valitse selain"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "DL: %u"
-msgstr "Alas: %u"
+msgid "Executable%s"
+msgstr "Suoritettava tiedosto%s"
+
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Muokkaa palvelinlistaa"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Syötä tähän URLit joista server.met-tiedostot haetaan.\n"
+"Vain yksi urli riville."
+
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Latausnopeus: %.1f"
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Päivitysväli: %d sekunti"
+msgstr[1] "Päivitysväli: %d sekuntia"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Lähetysnopeus: %.1f"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Keskimääräiskuvaajan aika: %d minuutti"
+msgstr[1] "Keskimääräiskuvaajan aika: %d minuuttia"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Asiakkaan tiedot"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Yhteyskuvaajan skaala: %d"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "Nickname: %s"
-msgstr "Nimimerkki: %s"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Tiedostopuskurin koko: %d tavu"
+msgstr[1] "Tiedostopuskurin koko: %d tavua"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Nimimerkkiä ei ole valittu!"
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Lähetysjonon koko: %d asiakas"
+msgstr[1] "Lähetysjonon koko: %d asiakasta"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "Asiakastunnus: "
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Palvelinyhteyden päivitysväli: %d minuutti"
+msgstr[1] "Palvelinyhteyden päivitysväli: %d minuuttia"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Palvelinnimi: "
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Palvelinyhteyden päivitysväli: Ei käytössä"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "Palvelin-IP: "
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "poissa käytöstä"
 
-#: src/MuleTrayIcon.cpp:416
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+msgid "Execute command on '%s' event"
+msgstr "Suorita komento tapahtuman '%s' yhteydessä"
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
-msgstr "TCP-portti: %d"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Mahdollista komentojen suorittaminen ytimestä"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "TCP-portti: Ei valmis"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Ytimen komento:"
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
-msgstr "UDP-portti: %d"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Mahdollista komentojen suorittaminen graafisesta käyttöliittymästä"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "UPD-portti: Ei valmis"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Graafisen käyttöliittymän komento:"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Online-Signeeraus: Käytössä"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Seuraavat muuttujat korvataan:"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Online-Signeeraus: Pois päältä"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+"Vähimmäiskoon pitää olla pienempi kuin enimmäiskoon. Enimmäiskokoa ei "
+"huomioida."
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
-msgstr "Jaettuja tiedostoja: %d"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Hakuvaroitus"
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
-msgstr "Asiakkaita jonossa: %d"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Kaikki"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad-hakua ei voida tehdä mikäli Kad ei ole päällä"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "eD2k-hakua ei voida tehdä mikäli eD2k ei ole yhdistettynä"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Odottamaton virhe Kad-hakua tehtäessä: "
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "Tiedostotunniste"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Tiedosto"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Lataa luokassa"
+
+#: src/SearchListCtrl.cpp:639
 #, c-format
-msgid "Total DL: %s"
-msgstr "Yht alas: %s"
+msgid "Get %s for this file"
+msgstr "Hanki %s tälle tiedostolle"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Hae tähän liittyviä tiedostoja (eD2k, paikallinen palvelin)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Merkitse tunnetuksi tiedostoksi"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Kopioi eD2k-linkki leikepöydälle"
+
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Peruutettu"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Uusi"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Kätketyt yhteysyritykset palvelimille epäonnistuivat. Yritetään uudelleen "
+"ilman kätkemistä."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"Yhdistäminen kaikkiin listattuihin palvelimiin epäonnistui. Aloitetaan uusi "
+"kierros."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "eD2k-verkko kytketty pois päältä asetuksista, ei yhdistetä."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "Palvelinlistasta ei löytynyt toimivia palvelimia joihin yhdistää"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "Yht ylös: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Yhdistetty %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Lähetysraja"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Yhteys muodostettu: %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Latausraja"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Kriittinen virhe yhdistettäessä. Internet-yhteys on mahdollisesti poikki"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Piilota aMule"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Yhteys palvelimeen %s (%s:%i) katkesi"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Näytä aMule"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) näyttää kuolleelta."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Keskustelu aloitettu: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) on ilmeisesti täysi."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Yhdistetty asiakkaaseen ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Automaattinen uudelleenyhdistäminen palvelimelle %d sekunnin päästä"
+msgstr[1] "Automaattinen uudelleenyhdistäminen palvelimelle %d sekunnin päästä"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Yhdistää asiakkaaseen ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Yhteys katkesi"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Asiakkaaseen yhdistäminen epäonnistui / Yhteys katkesi ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Yhdistäminen kohteeseen %s (%s:%i) epäonnistui."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Sulje välilehti"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "VIRHE: Pistukka virheellinen aikakatkaisutarkistuksessa"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Sulje kaikki välilehdet"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Yhteysyritys kohteeseen %s (%s:%i) aikakatkaistiin."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Sulje muut välilehdet"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Vastaanotettiin myöhästynyt vastaus DNS-kyselyyn, ohitetaan."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Lataan tiedostoa server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Tiedostoa server.met ei löytynyt!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
-msgstr "Server.met-tiedoston '%s' lataus epäonnistui, tuntematon muotoilu."
+msgstr "Server.met-tiedoston '%s' avaaminen epäonnistui, tuntematon muotoilu."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Server.met:in avaus epäonnistui!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Server.met on turmeltunut, virheellinen versiotunniste: 0x%x, koko %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "%i palvelin tiedostossa server.met"
 msgstr[1] "%i palvelinta tiedostossa server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d palvelin lisätty"
 msgstr[1] "%d palvelinta lisätty"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Virhe: tiedosto 'server.met' on turmeltunut: "
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "IO-virhe luettaessa tiedostoa 'server.met': "
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Palvelinta ei lisätty: [%s:%d] ei määritä kelvollista porttia."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Palvelinta ei lisätty: IP [%s:%d] on suodatettu tai virheellinen."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Palvelinta ei lisätty: IP:porttia [%s:%d] vastaava palvelin on jo listalla."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Palvelin lisätty: Palvelin [%s:%d] on nimeltään '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr ""
 "Olet yhdistettynä palvelimeen jota yrität poistaa, katkaise yhteys ensin."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Kohteen '%s' avaaminen ei onnistunut"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Server.met:n tallennus epäonnistui!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Virheellinen URL"
 
-#: src/ServerList.cpp:805
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Finished to download the server list from %s"
+msgid "Finished downloading the server list from %s"
 msgstr "Palvelinlista ladattu osoitteesta %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Palvelinlistan %s lataus epäonnistui"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6892,327 +5469,2263 @@
 "ja liitä kelvollinen palvelinlistan osoite tähän tiedostoon palvelinlistan "
 "automaattiseksi päivittämiseksi"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Aloita palvelinlistan lataus osoitteesta %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "VAROITUS: palvelinlistan automaattisen päivityksen url ei kelpaa: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 "Addresses.dat-tiedostosta ei löytynyt kelvollisia urleja server.met:in "
 "automaattilataukselle"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Palvelinlistan %s lataus epäonnistui"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr "Paikallinen palvelin IP-suodatetaan, yhdistän toiselle palvelimelle!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Komennon '%s' suoritus epäonnistui tapahtuman '%s' yhteydessä."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Palvelimen nimi"
 
-#: src/amule.cpp:703
-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/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Osoite"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Portti"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Kuvaus"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Viive"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Käyttäjiä"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Kiinteä"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versio"
 
-#: src/amule.cpp:786
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Palvelinlistallasi ei ole palvelimia.\n"
-"Haluatko että aMule lataa uuden listan nyt?"
+"Olet yhdistettynä palvelimeen jota yrität poistaa. Katkaise yhteys ensin. "
+"Palvelinta EI poistettu."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Palvelinlistan lataus"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Tuntematon nimi)"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "web server running on pid %d"
-msgstr "web-palvelin käynnissä prosessinumerolla %d"
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Oletko varma että haluat poistaa pysyvän palvelimen %s"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Palvelimet (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Palvelin"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Yhdistä palvelimelle"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Merkitse palvelin pysyväksi"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Poista palvelimen pysyvyysmerkintä"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Merkitse palvelimet pysyviksi"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Poista palvelimien pysyvyysmerkintä"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Poista palvelin"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Poista palvelimet"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Poista kaikki palvelimet"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopioi eD2k-linkit leikepöydälle"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Uudelleenyhdistä palvelimelle"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Oletko varma että haluat poistaa kaikki palvelimet?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Oletko varma että haluat poistaa valitun palvelimen?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Oletko varma että haluat poistaa valitut palvelimet?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "VIRHE: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "VAROITUS: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Uusi asiakastunnus on %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "VAROITUS: Sinulla on Low-ID!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
-"Olet asettanut web-palvelimen ajettavaksi käynnistettäessä, mutta amuleweb-"
-"ohjelmaa ei voida ajaa. Ole hyvä ja asenna aMule web-palvelimen sisältävä "
-"paketti tai käännä aMule käyttäen parametria --enable-webserver ja suorita "
-"make install"
+"\tTodennäköisimmin tämä johtuu siitä että olet palomuurin tai reitittimen "
+"takana"
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tLisätietoa http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Tuntematon palvelintieto vastaanotettu! - liian lyhyt"
 
-#: src/amule.cpp:937
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Ei voitu sitoa portteja annettuun osoitteeseen: %s"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Vastaanotettiin %d uusi palvelin"
+msgstr[1] "Vastaanotettiin %d uutta palvelinta"
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Palvelinlista tallennettu."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Palvelin hylkäsi viimeisimmän komennon"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Portti %u ei ole saatavilla. Sinulle annetaan LowID\n"
+msgid "Bogus packet received from server: %s"
+msgstr "Virheellinen paketti saatu palvelimelta: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Odottamaton virhe käsiteltäessä pakettia palvelimelta: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Ei voitu luoda DNS-selvityssäiettä kohteeseen %s yhdistämiseen"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "Palvelin IP %s (%s) on suodatettu. Ei yhdistetä."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "käyttää protokollan kätkentää."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Yhdistetään %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Ei voitu selvittää dns-nimeä palvelimelle %s: Ei voida yhdistää!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Palvelinta ei lisätty: IP:tä tai verkkonimeä ei annettu."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Palvelinta ei lisätty: Epäkelpo palvelinportti."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "eD2k-tilanne:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kademlian tilanne:"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "Lähiverkkokäyttö"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Käynnissä"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Tila:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Yhteyden tila:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Palomuurattu - avaa TCP-portti %d reitittimestä tai palomuurista"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "UDP-yhteyden tila:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Palomuurattu - avaa UDP-portti %d reitittimestä tai palomuurista"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Palomuurattu tilanne: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Kaveria ei vaadita - TCP-portti auki"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Kaveria ei vaadita - UDP-portti auki"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Ei kaveria"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Yhdistetään kaveriin"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Yhdistetty kaveriin osoitteessa %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Indeksoidut lähteet:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Indeksoidut avainsanat:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Indeksoidut huomautukset:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Indeksoitu kuorma:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Keskimäärin käyttäjiä:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Keskimäärin tiedostoja:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Ei käynnissä"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Lisään tiedoston %s jaettaviin"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Löydetty %i tunnettu jaettu tiedosto"
+msgstr[1] "Löydetty %i tunnettua jaettua tiedostoa"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Löydetty %i tunnettu jaettu tiedosto, %i tuntematonta"
+msgstr[1] "Löydetty %i tunnettua jaettua tiedostoa, %i tuntematonta"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "VIRHE: Yritettiin jakaa %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Jaettua kansiota ei löytynyt, hypätään yli: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Jaettavia tiedostoja ei löytynyt kansiosta: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Käyttäjänimi"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Latausnopeus"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Lähetysnopeus"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Saatavilla olevat osat"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+msgid "Upload Status"
+msgstr "Lähetyksen tilanne"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Latauksen tilanne"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Alkuperä"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Paikallinen tiedoston nimi"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+msgid "Shares File List"
+msgstr "Jaettujen tiedostojen lista"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Pyynnöt"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Hyväksytyt pyynnöt"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Siirretty data"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Jakosuhde"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Hankitut osat"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Täysiä kopioita"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Kansiopolku"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Lisää kommentti/luokitus"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Muuta kommenttia/luokitusta"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Uudelleennimeä"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Lisää tiedostot kokoelmassa siirtolistalle"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Kopioi magnet-&URI leikepöydälle"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Kopioi eD2k-linkki työpöydälle (Lähde)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Kopioi eD2k-linkki leikepöydälle (Lähde) (Kryptaustiedoilla)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Kopioi eD2k-linkki leikepöydälle (Verkkonimi)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr "Kopioi eD2k-linkki leikepöydälle (Verkkonimi) (Kyptaustiedoilla)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Kopioi eD2k-linkki leikepöydälle (&AICH-tiedot)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Tarvitset HighID:een luodaksesi voimassa olevan lähdelinkin"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Jaetut tiedostot (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[Osatiedosto]"
+
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Tiedoston nimi etäpäässä"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Lähetetty data (Sessiossa (Yhteensä)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Otsikkotietoja yhteensä (Paketteja): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Tiedostopyyntöotsikkoja (Paketteja): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Lähdevaihdon otsikkoja (Paketteja): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Palvelimen otsikkoja (Paketteja): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Kad-otsikkoja (Paketteja): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Kryptauksen otsikkoja (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Lähetyksiä käynnissä: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Lähetyksiä odottamassa: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Onnistuneita lähetyksiä yhteensä: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Epäonnistuneita lähetyksiä yhteensä: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Keskimääräinen lähetysaika: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Ladattu data (Sessiossa (Yhteensä)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Lähteitä löytynyt: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Latauksia käynnissä (paloja): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Session jakosuhde lähetys:lataus (Yhteensä): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Keskimääräinen latausnopeus (Sessiossa): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Keskimääräinen lähetysnopeus (Sessiossa): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Suurin latausnopeus (Sessiossa): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Suurin lähetysnopeus (Sessiossa): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Uudelleenyhdistämisiä: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Aikaa ensimmäisestä siirrosta: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Yhdistetty palvelimeen: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Aktiivisia yhteyksiä (arvio): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Maksimimäärä yhteyksiä saavutettu: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Yhteyksiä keskimäärin (arvio): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Yhteyksiä enimmillään (arvio): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Asiakkaat"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Tuntematon: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Suodatettu: %s"
 
-#: src/amule.cpp:970
+#: src/Statistics.cpp:793
 #, c-format
+msgid "Banned: %s"
+msgstr "Estetty: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Yhteensä: %i Tunnettuja: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Toimivia palvelimia: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Toimimattomia palvelimia: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Yhteensä: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Poistettuja palvelimia: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Suodatettuja palvelimia: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Käyttäjiä toimivilla palvelimilla: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Tiedostoja toimivilla palvelimilla: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Käyttäjiä yhteensä: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Tiedostoja yhteensä: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Palvelimien käyttö: %.2f% %"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Jaettuja tiedostoja: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Jaettujen tiedostojen yhteenlaskettu koko: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Keskimääräinen tiedostokoko: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Käyttöjärjestelmä"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Ei vastaanotettu"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktiiviset yhteydet: (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Ei saatavissa"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Ei koskaan"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Komento '%s' prosessinumerolla '%d' on suoritettu paluukoodilla '%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Suorita <str> ja poistu."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Virheellinen IP-muoto. Käytä xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Portti %u ei ole saatavilla!\n"
-"\n"
-"Tämä tarkoittaa että sinulle annetaan LowID.\n"
-"\n"
-"Tarkista yhteytesi varmistaaksesi että portti on avoinna sekä ulos että "
-"sisään."
+"Tälle komennolle on annettava parametri. Kelvollisia ovat: 'all', "
+"tiedostonimi, tai numero.\n"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Online-Signeeraustiedoston luonti epäonnistui"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Käsittelee tarkisteen mukaan: "
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "aMulen Online-Signeeraustiedoston luonti epäonnistui"
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Käsittelee tiedostonimen mukaan: "
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
-"Valittu maa-asetus ei näytä olevan asennettuna järjestelmääsi. (Huom: Yritän "
-"asettaa sen kuitenkin)"
+"Tälle komennolle on annettava parametri. Kelvollisia ovat: "
+"tiedostotarkiste.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Ei ole kelvollinen numero\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Tarkiste ei ole kelvollinen (pituuden on oltava tasan 32 merkkiä)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Pyyntö ei onnistunut, tuntematon virhe."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Toiminto onnistui."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Tämä on ensimmäinen kerta kun käynnistät aMule %s"
+msgid "Request failed with the following error: %s"
+msgstr "Pyyntö epäonnistui virheeseen: %s"
 
-#: src/amule.cpp:1310
-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/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Asiakkaiden IP-suodatus on %s.\n"
 
-#: src/amule.cpp:1311
-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"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "POIS PÄÄLTÄ"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr ""
-"tai tapa koiraasi. Mutta sen *pitäisi* olla silti turvallinen käyttää.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "PÄÄLLÄ"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Palvelimien IP-suodatus on %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Nykyinen IP-suodatustaso on %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Kaistarajoitukset: Ylös: %u KB/s, Alas: %u KB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Yhdistetty %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Yhdistän"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "palomuurattu"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
-msgstr "Seuraavat asetukset on muutettu tähän julkaisuun turvallisuussyistä:\n"
+"\n"
+"Download:\t%s"
+msgstr ""
+"\n"
+"Lataus:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Lisätty protokollan kätkemisen tuki saapuville sekä lähteville "
-"yhteyksille.\n"
+"Lähetys:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Estetty palvelinlistan päivittäminen muilta palvelimilta ja asiakkailta.\n"
+"Asiakkaita jonossa:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Saadaksesi lisätietoa näiden muutosten syistä, etsi\n"
-"aMulen wikistä osoitteessa http://wiki.amule.org \"fake servers\"-tietoa.\n"
-"On tärkeää että puhdistat palvelinlistaltasi huijauspalvelimet jotta aMule "
-"toimii oikein."
+"Lähteitä yhteensä:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Hakutuloksia: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Haun edistyminen: %u %% \n"
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Haun edistyminen ei ole tiedossa"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Palvelin lähetti tunnistamattoman vastauksen, komentosana = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Näytä tilannetiedot lyhyesti."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Näyttää yhteyden tilan, nykyiset lähetys-/latausnopeudet, jne.\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Näytä täydet tilastotiedot."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Tälle komennolle voidaan antaa valinnaisesti parametrina luku väliltä 0-"
+"255,\n"
+"joka määrää kuinka monta merkintää asiakkaiden versiopuusta näytetään.\n"
+"Luku 0 tai ei parametria tarkoittaa rajoittamattomasti.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Esimerkki: 'statistics 5' näyttää vain viisi suosituinta versiota kustakin "
+"asiakastyypistä.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Sammuta aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
+"Sulje etäsuorituksessa oleva ydin (amule/amuled).\n"
+"Tämä sulkee myös tekstikäyttöliittymän, koska se on käyttökelvoton ilman\n"
+"suoritettavaa ydintä.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Lataa uudelleen annetun kohteen."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Lataa uudelleen lista jaetuista tiedostoista."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "Lataa uudelleen IP-suodatustaulukko."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Lataa nykyinen IP-suodatustaulukko uudelleen."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "Päivittää IP-suodatustaulukon URLista."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "Mikäli URL jätetään pois, käytetään URLia asetuksista."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Yhdistä verkkoon."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Tämä yhdistää kaikkiin verkkoihin jotka on sallittu asetuksista.\n"
+"Voit myös antaa palvelimen muodossa IP:Portti yhdistääksesi vain\n"
+"kyseiselle palvelimelle. IP:n on oltava pisteillä erotettu IPv4-numero\n"
+"tai DNS-nimi."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Yhdistä vain eD2k:hon."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Yhdistä vain Kadiin."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Katkaise yhteys verkkoon."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Tämä katkaisee yhteyden kaikkiin yhdistettyihin verkkoihin.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Katkaise vain eD2k-yhteys."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Katkaise vain Kad-yhteys."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Lisää eD2k- tai magnet-linkin ytimelle."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"Lisättävä eD2k-linkki voi olla:\n"
+"*) tiedostolinkki (ed2k://|file|...), ja se lisätään latauslistalle,\n"
+"*) palvelinlinkki (ed2k://|server|...), ja se lisätään palvelinlistalle,\n"
+"*) tai palvelinlistalinkki, ja kaikki palvelimet listalta lisätään\n"
+"   palvelinlistalle.\n"
 "\n"
-"Lisäksi, selaimen asetukset on nollattu järjestelmän oletukseen. Ole hyvä ja "
-"konfiguroi selaimen asetukset uudelleen mikäli tarpeellista.\n"
+"Magnet-linkin on sisällettävä eD2k-tarkiste ja tiedoston pituus.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Aseta haluamasi asetukset."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "Aseta IP-suodatuksen asetukset."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Kytke IP-suodatus päälle sekä asiakkaille että palvelimille."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Kytke IP-suodatus pois päältä sekä asiakkailta että palvelimilta."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Salli/estä asiakkaiden IP-suodatus."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Kytke IP-suodatus päälle asiakkaille."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Kytke IP-suodatus pois päältä asiakkailta."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Salli/estä palvelinten IP-suodatus."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Kytke IP-suodatus päälle palvelimille."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Kytke IP-suodatus pois päältä palvelimilta."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Valitse IP-suodatuksen taso."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Lisätietoa, tukea ja uudet julkaisut löytyvät kotisivuiltamme osoitteessa\n"
+"Sallitut suodatustasot ovat välillä 0-255 oletusarvon (myös lähtöarvon)\n"
+"ollessa 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Aseta kaistankäytön rajoitukset."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
-"http://www.aMule.org, tai IRC-kanavaltamme #aMule palvelimella irc.freenode."
-"net (englanniksi).\n"
+"Näille komennoille annettujen arvojen on oltava kilotavuja sekunnissa.\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Voit vapaasti raportoida bugeista osoitteessa http://forum.amule.org"
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Aseta lähetyskaistan raja."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Aseta latauskaistan raja."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Näytä asetuksen arvo."
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "Hae IP-suodatuksen asetukset."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Hae IP-suodatuksen tila sekä asiakkaille että palvelimille."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Hae IP-suodatuksen tila asiakkaille."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Hae IP-suodatuksen tila palvelimille."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "Hae IP-suodatuksen taso."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Hae kaistankäytön rajat."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Suorittaa haun"
+
+#: src/TextClient.cpp:914
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"Online-Signeeraukselle asettamasi kansio ei ole kelvollinen!\n"
-" Online-Signeeraus kytketään pois päältä kunnes korjaat asian asetuksista."
+"Haun tyyppi on annettava:\n"
+"    GLOBAL (kaikkialta)\n"
+"    LOCAL (paikallinen)\n"
+"    KAD (vain kadista)\n"
+"Esimerkki: 'search kad tiedosto' suorittaa kad-haun nimellä \"tiedosto\".\n"
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Levytilan esivaraus tiedostolle '%s' epäonnistui: %s"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Suorittaa haun kaikkialta."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "VIRHE: Lokitiedostoa ei voida avata"
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Suorittaa haun paikallisesti"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "VAROITUS: Lokitiedosto on tyhjä. Jotain on pielessä."
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Suorittaa kad-haun"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Loki nollattiin"
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Näyttää viimeisimmän haun tulokset."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Näyttää edellisen haun tulokset.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Näyttää haun edistymisen."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Näyttää haun edistymisen.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Aloittaa tiedoston lataamisen"
+
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
+"Tiedoston numero viimeisimmästä hausta on annettava.\n"
+"Esimerkki: 'download 12' aloittaa viimeisen haun tiedoston numero 12 "
+"latauksen.\n"
+
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Tauota lataus."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Jatka latausta."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Peruuta lataus."
 
-#: src/amule.cpp:1826
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Aseta latauksen tärkeys."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr ""
+"Aseta tärkeys lataukselle, joko Alhainen, Normaali, Korkea tai "
+"Automaattinen.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Aseta tärkeys alhaiseksi."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Aseta tärkeys normaaliksi."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Aseta tärkeys korkeaksi."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Aseta tärkeys automaattiseksi."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Näytä jonot/listaukset."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Näyttää lähetys/latausjonon, palvelinlistan tai jaettujen tiedostojen "
+"listan.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Näytä lähetysjono."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Näytä latausjono."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Näytä loki."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Näytä palvelinlista."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Nollaa loki."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Palvelimen viesti: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Vanhentunut komento, käytä sen sijaan '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Yhteyspisteiden listan lataus epäonnistui."
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Tämä on vanhentunut komento ja se voidaan poistaa tulevaisuudessa.\n"
+"Käytä sen sijaan '%s'.\n"
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Ladatun versiotarkistustiedoston avaus epäonnistui"
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMule tekstiasiakas"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Turmeltunut versiotarkistustiedosto"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Muunnetaan vanhat AICH-tarkistejoukot '%s' 64-bittisiksi '%s'."
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Käytät vanhentunutta versiota aMulesta!"
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr ""
+"VAROITUS: Tiedostonimi '%s' ei kelpaa ja tiedosto uudelleennimettiin '%s'."
 
-#: src/amule.cpp:1907
+#: src/ThreadTasks.cpp:454
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Tämän aMulen versio on %i.%i.%i ja uusin versio on %li.%li.%li"
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "VAROITUS: Tiedosto '%s' on jo olemassa, uusi tiedosto nimettiin '%s'."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Uusin version löytyy aina osoitteesta http://www.amule.org"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Oletko varma että haluat perua ja poistaa kaikki tiedostot tässä luokassa?"
+
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Vaaditaan vahvistus"
+
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "Luokittelujen maksimimäärä on 99."
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "Liian monta luokkaa!"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Kaikki muut"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Valitse suodatin"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Lisää luokka"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Muokkaa luokkaa"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Poista luokka"
 
-#: src/amule.cpp:1911
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "VAROITUS: aMulesi versio on vanhentunut: %i.%i.%i < %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+"Tiedostoa '%s' ei voitu avata, poistetaan jaettujen tiedostojen listalta."
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "aMulesi on uusinta versiota."
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Tarkistejoukkoa pyydettiin tuntemattomalle tiedostolle: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Versiotarkistustiedoston lataus epäonnistui"
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
+msgstr "Jatketaan tiedoston %s lähetyksiä"
 
-#: src/amule.cpp:2025
+#: src/UploadQueue.cpp:613
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Käyttäjiä: %s | Tiedostoja: %s"
+msgid "Suspending upload of file: %s"
+msgstr "Keskeytetään tiedoston %s lähetys"
 
-#: src/amule.cpp:2026
+#: src/UserEvents.cpp:138
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Käyttäjiä: E: %s K: %s | Tiedostoja: E: %s K: %s"
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Komennon '%s' suoritus epäonnistui tapahtuman '%s' yhteydessä."
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Ei valittuja verkkoja"
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Lataus valmistunut"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Koko polku tiedostoon."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Tiedoston nimi ilman polkua."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "Tiedoston e2dk-tarkiste."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Tiedoston koko tavuina."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Kumulatiivinen latausaika."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Uusi keskustelu aloitettu"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Viestin lähettäjä."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Levytila loppu"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Levyosio."
 
-#: src/amule.cpp:2102
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Virhe viimeistellessä"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Yhdistetty %s %s"
+msgid "Processing file number %u: %s"
+msgstr "Käsittelee tiedostoa numero %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Olet pyytänyt osatarkisteita (Vain tiedostoille jotka ovat > 9.5 MB)"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Connecting to %s"
-msgstr "Yhdistän %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Tiedostoa ei ole !\n"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "eD2k-yhteys katkaistu"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "\"aLinkCreator, aMule eD2k-linkkien tekijä"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Käynnistettiin Kad."
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Tervetuloa!"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Pysäytettiin Kad."
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Syöteparametrit"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Yhdistetty Kadiin (ok)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Tiedostosta Tarkiste"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Yhdistetty Kadiin (palomuurattu)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Lisää Valinnaisia URLeja tälle tiedostolle"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Yhteys Kadiin katkaistu"
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Syötä tähän tiedosto josta haluat laskea eD2k-linkin"
 
-#: src/amule.cpp:2191
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
-"Kad-verkkoa ei voida käyttää mikäli UDP-portti on estetty asetuksissa, ei "
-"käynnistetä."
+"Syötä tähän url jonka haluat lisätä eD2k-linkkiin: Lisää / perään jotta "
+"aLinkCreator voi lisätä tiedoston nimen"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kad-verkko estetty asetuksissa, ei yhdistetä."
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Poista"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Kaverilistatiedostoa 'emfriends.met' ei saatu avattua luettavaksi!"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Luo linkki osatarkisteilla"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
 msgstr ""
-"Kaverilistatiedostoa 'emfriends.met' ei saatu avattua kirjoitettavaksi!"
+"Auttaa levittämään uusia ja harvinaisia tiedostoja nopeammin, kustannuksena "
+"linkin koon kasvu"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4-Tiedostotarkiste"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k-tiedostotarkiste"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k-linkki"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Tallenna"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Kopioi leikepöydälle"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Avaa"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Avaa tiedosto laskeaksesi sen eD2k-linkin"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Kopioi laskettu eD2k-linkki leikepöydälle"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Tallenna nimellä"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Tallenna laskettu eD2k-linkki tiedostoon"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Tietoja aLinkCreatorista"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Valitse tiedosto josta haluat laskea eD2k-linkin"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Leikepöytää ei voitu avata"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Toistaiseksi ei mitään kopioitavaa !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Valitse tiedosto lasketulle eD2k-linkille"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Ei voitu avata "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Ole hyvä ja syötä ei-tyhjä tiedoston nimi"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Toistaiseksi ei mitään tallennettavaa !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, aMule eD2k-linkkien tekijä\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Bittikartat osoitteista http://www.everaldo.com, http://www.icomania.com\n"
+"ja http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Jaetaan GPL:n alaisena"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Laskee tarkistetta..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator on toiminnassa"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Lasken MD4-tarkistetta..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Lasken eD2k-tarkisteita..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Peruutettu !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
+#, c-format
+msgid "Done in %.2f s"
+msgstr "Valmis %.2f sekunnissa"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Olet jo lisännyt tämän URLin !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Ole hyvä ja syötä ei-tyhjä URL"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ei voida avata %s"
+
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i päivä(ä) %i tunti(a) %i minuutti(a) %i sekunti(a)"
+
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uvrk %02ut %02umin %02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02ut %02umin %02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, aMulen Online-Tilastotiedot"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Suurin latausnopeus wxCasin käynnistämisestä lähtien"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Suurin latausnopeus edellisten wxCasin ajokertojen aikana"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Järjestelmä"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Pysäytä Automaattinen Päivitys"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Tallenna Online-Tilastotietokuva"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Tulosta Online-Tilastotietokuva"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Asetus"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Tietoja wxCasista"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Aloita Automaattinen Päivitys"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Automaattinen Päivitys pysäytetty"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Automaattinen Päivitys aloitettu"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Tallenna Tilastokuva"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMulen Online-Tilastotiedot"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
+msgstr ""
+"Tulostamisessa oli ongelma.\n"
+"Kenties tulostin ei ole asennettu oikein?"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Tulostus"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, aMulen OnLine Signeeraus-Tilastotiedot\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pohjautuu CAS:iin jonka on tehnyt Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Jaetaan GPL:n alaisena"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oi Oi, aMule ei ole käynnissä..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule on käynnissä"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule on käynnissä, mutta ei yhdistettynä"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule yhdistää..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oi Oi, aMulen tila on tuntematon..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " on ollut käynnissä "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " on pysäytetty !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " ei ole yhdistetty !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " on yhdistämässä..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " on tekemässä jotain outoa, tarkista se !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " on yhdistetty: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "pois päältä"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " palvelimella "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " käyttäen "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Yhteensä Ladattu: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Lähetetty: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Istunnossa Ladattu: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Lataus: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " KB/s, Lähetys: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " KB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Jako: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " tiedosto(a), Asiakkaita jonossa: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Aika: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " hetkellä "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Järjestelmän Kuormituskeskiarvo (1-5-15 min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Järjestelmä päällä: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Tiedoston amulesig.dat sisältävä kansio"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Syötä tähän kansio jossa on amulesig.dat-tiedostosi"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Päivitysväli sekunteina"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Luo tilastokuva joka päivityksen yhteydessä"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Syötä tähän kansio johon haluat tilastokuvan luotavan"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Lähetä tilastokuvasi toistuvasti FTP-palvelimelle"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP-osoite"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP-kansiopolku"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Syötä tähän FTP-palvelimen osoite"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "Syötä tähän kansio FTP-palvelimella mihin tilastokuvasi tallennetaan"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Käyttäjänimi"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Syötä tähän käyttäjänimi jota käytät kirjautuessasi FTP-palvelimelle"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Syötä tähän salasana jota käytät kirjautuessasi FTP-palvelimelle"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "FTP-päivityksien väli minuuteissa"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Tarkista oikeellisuus"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Kansio joka sisältää signeeraustiedostosi"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Kansio mihin luodaan tilastokuva"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Lataa mallin <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Web-palvelimen HTTP-portti"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Käytä UPnP-portinohjausta web-palvelimen portissa"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP-portti"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Käytä gzip-pakkausta"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Täyden käyttöoikeuden salasana web-palvelimelle"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Vieraan salasana web-palvelimelle"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Salli vieraskäyttö"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Estä vieraskäyttö"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Hae/tallenna web-palvelimen asetukset etä-aMulesta/een"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMulen asetustiedoston polku. ÄLÄ KÄYTÄ SUORAAN!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Poista PHP-tulkki käytöstä (vanhentunut)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Uudelleenkoosta PHP-sivut joka pyynnöllä"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule Web-Palvelin"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "web-asiakasyhteys hyväksytty\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "VIRHE: Web-asiakasyhteyttä ei voitu hyväksyä\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Pyyntö ei onnistunut, virhe: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Indeksitiedostoa ei löydetty: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Sessio vanhentunut - pyydetään kirjautumista\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sessio kunnossa, kirjautuneena\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sessio kunnossa, ei kirjautuneena\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Ei avattua sessiota - tulee pyytämään kirjautumista\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Sessio luotu - pyytää kirjautumista\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Käsittelee pyyntöä [alkuperäinen]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Salasanaa ei annettu, kirjautumista ei sallita"
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Tarkistaa salasanaa\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Salasanatarkiste ei kelpaa\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Salasana hyväksytty\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Virheellinen salasana\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Et antanut salasanaa. Tyhjä salasana ei ole sallittu.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Uloskirjautumista pyydetty\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Käsittelee pyyntöä [uudelleenohjattu]: "
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Albania"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Latauksen tilanne"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Päivitysviive: %d sekunti"
+#~ msgstr[1] "Päivitysviive: %d sekuntia"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr ""
+#~ "Kommentit ja luokitukset eivät ole vielä tuettuja graafisessa "
+#~ "etäkäyttöliittymässä"
+
+#~ msgid "Transferring"
+#~ msgstr "Siirtää"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "Jonossa: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "Jonossa: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "Jonossa"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "KESKENERÄINEN - haun edistymisen näyttö"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Lasketaan MD4- sekä AICH-tarkistetta tiedostolle %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Lasketaan MD4-tarkistetta tiedostolle %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Lasketaan AICH-tarkistetta tiedostolle %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "VAROITUS: Alkuperäistä '%s' ei voitu poistaa varmuuskopion valmistuttua"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "VAROITUS: Ei voitu poistaa %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (Jono: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Luokitus (yhteensä):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Yritä siirtää kokonaisia paloja lähetettäessä"
+
+#~ msgid "Networks window"
+#~ msgstr "Verkkoikkuna"
+
+#~ msgid "Searches window"
+#~ msgstr "Hakujen ikkuna"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Lataa"
+
+#~ msgid "Shared files window"
+#~ msgstr "Jaettujen tiedostojen ikkuna"
+
+#~ msgid "Messages window"
+#~ msgstr "Viestien ikkuna"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Tilastokuvaajien ikkuna"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Asetuksien säätöikkuna"
+
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Tehtäväpalkin kuvake katosi, yritän uudelleenluoda..."
+
+#~ msgid "Transfers"
+#~ msgstr "Siirrot"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Siirrettävien tiedostojen ikkuna"
+
+#~ msgid "Unban"
+#~ msgstr "Salli"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Näytä lähetykset"
+
+#~ msgid "Show Queue"
+#~ msgstr "Näytä jono"
+
+#~ msgid "Select View"
+#~ msgstr "Valitse näkymä"
+
+#~ msgid "Client Software"
+#~ msgstr "Asiakasohjelma"
+
+#~ msgid "Waited"
+#~ msgstr "Odottanut"
+
+#~ msgid "Upload Time"
+#~ msgstr "Lähetysaika"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Lähetetty/vastaanotettu"
+
+#~ msgid "Remote Status"
+#~ msgstr "Etäpään tilanne"
+
+#~ msgid "File Priority"
+#~ msgstr "Tiedoston tärkeys"
+
+#~ msgid "Score"
+#~ msgstr "Pisteet"
+
+#~ msgid "Asked"
+#~ msgstr "Kysytty"
+
+#~ msgid "Last Seen"
+#~ msgstr "Viimeksi nähty"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Saapunut jonoon"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Lähetetty"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Ladattu"
+
+#~ msgid "Userhash"
+#~ msgstr "Käyttäjätarkiste"
+
+#~ msgid "Encrypted"
+#~ msgstr "Salattu"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "Avattiin %d lippukuvaa."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Näytä lähetykset / lähetysjono"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Asiakkaita jonossa :"
+
+#~ msgid "Current Session"
+#~ msgstr "Nykyinen sessio"
+
+#~ msgid "Total"
+#~ msgstr "Yhteensä"
+
+#~ msgid "Requested :"
+#~ msgstr "Pyydetty :"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Luo varmuuskopio esikatseluun"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Siirrettävien tiedostojen ikkuna"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Käyttäjiä yhteensä: %s | Tiedostoja yhteensä: %s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "HTTP-lataussäie käynnistetty"
+
+#~ msgid "Download size not received, downloading until connection is closed"
+#~ msgstr "Latauksen kokoa ei saatu, ladataan kunnes yhteys suljetaan"
+
+#~ msgid "Download size: %i"
+#~ msgstr "Latauksen koko: %i"
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "HTTP-lataussäie päättyi"
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Verkkonimi: %s:%i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Vastaus: %i (Virhe: %i)"
+
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "VAROITUS: Tyhjä vastaus yhteyttä muodostaessa"
+
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "VIRHE: Uudelleenohjauksen koodi vastaanotettu ilman URLia"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr ""
+#~ "CIP2Country::CIP2Country(): Maatietojen avaaminen epäonnistui kohteesta  "

aMule-2.2.6.tar.bz2/po/fr.po -> aMule-2.3.1.tar.bz2/po/fr.po Changed

@@ -1,1337 +1,1181 @@
-# translation of fr.po to Español
-# Copyright (C) 2005-2006, 2007, 2008Free Software Foundation, Inc.
-# This file is distributed under the same license as the new_fr package.
+# aMule i18n resource file.
+# Copyright (C) 2004 - 2011 aMule Team
+# This file is distributed under the same license as the aMule package.
 #
+# Translation of aMule to French
 #
 # ThePolish <thepolish@amule.org>, 2005.
 # kaouete <kaouete@crazydwarves.org>, 2005, 2006.
 # kaouete <kaouete@crazydwarves.org>, 2006.
 # Guillaume <guilo19@free.fr>, 2007.
 # Carlos Diaz <cskyline@gmail.com>, 2008.
+# Youpla <Youpla@boum.fr>, 2008.
+# Olivier Sannier <obones att altern dott org>, 2009, 2010.
+# Dylan Aïssi <bob.dybian@gmail.com>, 2008 - 2011.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2008-12-09 13:25+0100\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
+"PO-Revision-Date: 2011-11-09 18:49+0100\n"
 "Last-Translator: Dylan Aïssi <bob.dybian@gmail.com>\n"
 "Language-Team: Français\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: KBabel 1.11.4\n"
-"X-Poedit-Language: French\n"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Vous devez entrer un mot de passe non vide."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Mot de passe invalide, ce n'est pas un hachage MD5 !"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Erreur de connexion"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "Échec de connexion EC. Réponse vide."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Connexion externe: Accès refusé car:"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Connexion externe: Accès refusé"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Connexion externe: Mauvaise réponse du serveur. Connexion coupé."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Succès ! Connexion établie à aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Succès ! Connexion établie."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Hachage"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Ajouter un ami"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Finalisation"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Vous devez entrer une IP et un port valides !"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Terminé"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Information"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "En pause"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Le hachage utilisateur spécifié est invalide !"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Erroné"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Échec de l'ouverture du fichier ED2KLinks."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "En téléchargement"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"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/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "En attente"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Et maintenant on quitte l'application principale…"
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Création des hachages MD4 et AICH démarrée pour le fichier: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Interruption de l'instance amuleweb avec le pid '%ld' …"
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Création du hachage MD4 démarrée pour le fichier: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Mise à mort de l'instance amuleweb avec le pid '%ld' …"
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Création du hachage AICH démarrée pour le fichier: %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Échec"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Conversion des anciens hashsets AICH en '%s' vers 64b en '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit : Arrêt du noyau."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr ""
-"AVERTISSEMENT : Le nom de fichier '%s' est invalide et a été renommé en '%s'."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "Fermeture d'aMule terminée."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr ""
-"AVERTISSEMENT : Le fichier '%s' existe déjà, le nouveau fichier a été "
-"renommé en '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Résultats du débogage de la mémoire pour la sortie d'aMule :"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
 msgstr ""
-"AVERTISSEMENT : Suppression du fichier '%s' original après la création de la "
-"sauvegarde"
+"\n"
+"Configuration EC"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "AVERTISSEMENT : Échec de la suppression de %s"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Mot de passe renseigné et connexions externes activées."
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Échec de la réception des fichiers partagés de l'utilisateur '%s'"
-
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Inconnu"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "AVERTISSEMENT"
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Fausse version d'eMule %#x)"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Faux eMule)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Infos"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Faux eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Vous n'avez pas de serveurs dans votre liste de serveurs.\n"
+"Voulez vous qu'aMule télécharge une nouvelle liste maintenant ?"
 
-#: src/BaseClient.cpp:1790
-#, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (basé sur eMule v0.%u)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Téléchargement de la liste de serveurs."
 
-#: src/BaseClient.cpp:1960
+#: src/amule.cpp:654
 #, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Pseudo : %s ID : %u"
+msgid "web server running on pid %d"
+msgstr "serveur web s'exécutant avec le pid %d"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Demandé: %s\n"
+#: src/amule.cpp:658
+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 ""
+"Vous avez demandé à activer le serveur web au démarrage, mais l'exécutable "
+"amuleweb n'a pas pu être lancé. Veuillez installer le paquet contenant le "
+"serveur web aMule, ou compilez aMule en utilisant --enable-webserver et "
+"exécutez make install"
+
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "ERREUR"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statistiques des fichiers pour cette session: %d requête acceptée sur %d, %s "
-"transférés\n"
-msgstr[1] ""
-"Statistiques des fichiers pour cette session: %d requêtes acceptées sur %d, %"
-"s transférées\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Impossible de lier les ports à l'adresse spécifiée : %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statistiques des fichiers pour toutes les sessions: %d requête acceptée sur %"
-"d, %s transférés\n"
-msgstr[1] ""
-"Statistiques des fichiers pour toutes les sessions: %d requêtes acceptées "
-"sur %d, %s transférées\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Fichier demandé inconnu"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Le port %u n'est pas disponible. Vous serez LowID\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Le client %s sur IP:Port %s:%d utilisant %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Nom d'utilisateur"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Le port %u n'est pas disponible !\n"
+"\n"
+"Ceci signifie que vous serez LowID.\n"
+"\n"
+"Vérifiez votre réseau pour être sûr que le port est ouvert en sortie et en "
+"entrée."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Amis"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Échec de la création du fichier OnlineSig"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Afficher les &Détails"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Échec de la création du fichier aMule OnlineSig"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Ajouter un ami"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"La localisation choisie semble ne pas être installer sur votre machine. "
+"(Note : Je tente de la forcer quant même)"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Supprimer l'Ami"
+#: src/amule.cpp:1040
+#, 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/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Envoyer un &Message"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Cette version est une version de test, mis à jour quotidienne, et\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Voir les fichiers"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr ""
+"nous ne fournissons aucune garantie que cela n'endommagera rien, brûlera "
+"votre maison,\n"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Établissement d'un Slot Ami"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"ou tuera votre chien. Mais ça *devrait* être à peu près sûr quand-même.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Êtes-vous sûr de vouloir supprimer l' ami sélectionné ?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Plus d'informations, de l'aide et de nouvelles versions peuvent être "
+"trouvées sur notre page web,\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Êtes-vous sûr de vouloir supprimer les amis sélectionnés ?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+" www.aMule.org, ou sur notre canal IRC : #aMule sur irc.freenode.net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Annuler"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Ne vous gênez pas pour reporter tout bogue sur http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Vous n'êtes pas autorisé à établir plus d'un slot ami.\n"
-" Seul un slot a été attribué."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Sélection multiple"
+"Le répertoire choisi pour les fichiers de signature en ligne est INVALIDE !\n"
+"La signature en ligne sera DÉSACTIVÉE jusqu'à ce que cela soit corrigé dans "
+"les préférences."
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Téléchargement terminé"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Nom du serveur signalé"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Le chemin complet vers le fichier."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Erreur lors de la réserve d'espace pour le fichier '%s' : %s"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Le nom du fichier sans la partie répertoire."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "ERREUR : impossible d'ouvrir le fichier journal"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "Le hachage eD2k du fichier."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "AVERTISSEMENT : le fichier journal est vide. Quelque chose ne va pas."
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "La taille du fichier en octets."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Le journal a été effacé"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Durée d'activité de téléchargement cumulée."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "ServerMessage : %s"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Nouvelle session de chat démarrée"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "Saut du téléchargement de %s, car le fichier demandé n'est pas récent."
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Expéditeur du message."
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Échec du téléchargement de la liste des nœuds."
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Espace insuffisant"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Échec de l'ouverture du fichier de vérification de version téléchargé"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Partition du disque."
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Fichier de vérification de version corrompu"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Erreur à la complétion"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Vous utilisez une version obsolète d'aMule !"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Nom du fichier"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr ""
+"Votre version d'aMule est %i.%i.%i et la dernière version est %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Taille"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr ""
+"La dernière version peut toujours être trouvée sur http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Type"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr ""
+"AVERTISSEMENT : votre version d'aMuled est obsolète : %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Priorité"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Votre version d'aMule est à jour."
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "ID du fichier"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Échec du téléchargement du fichier de vérification de version"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Demandes"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Utilisateurs : %s | Fichiers : %s"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Demandes acceptées"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Utilisateurs : E : %s K : %s | Fichiers : E : %s K : %s"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Données transférées"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Aucun réseau sélectionné"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Taux de partage"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "avec un LowID"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Parties obtenues"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "avec un HighID"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Sources complètes"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Connecté à %s %s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Chemin du répertoire"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Connexion à %s"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Fichiers partagés"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Déconnecté de eD2k"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Très basse"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad démarré."
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Basse"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad arrêté."
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normale"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Connecté à Kad (OK)"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Haute"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Connecté à Kad (pare-feu)"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Très haute"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Déconnecté de Kad"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Release"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Le réseau Kad ne peut être utilisé si le port UDP est désactivé dans les "
+"préférences, pas de démarrage."
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Auto"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Le réseau Kad est désactivé dans les préférences, pas de connexion."
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Ajouter un Commentaire/Note"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"ERREUR : le démon aMule ne peut être utilisé quand les connexions externes "
+"sont désactivées. Pour activer les Connexions Externes, utilisez soit un "
+"aMule normal, démarrez amuled avec l'option --ec-config ou passez la clé "
+"\"AcceptExternalConnections\" à 1 dans le fichier ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Éditer un Commentaire/Note"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"ERREUR : Un mot de passe valide est requis pour utiliser les connexions "
+"externes, et le démon aMule ne peut pas être utilisé sans connexions "
+"externes. Pour exécuter le démon aMule, vous devez indiquer une valeur "
+"appropriée dans le champ \"Mot de passe EC\" dans le fichier ~/.aMule/amule."
+"conf. Lancez amuled avec le flag --ec-config pour affecter le mot de passe. "
+"Plus d'information est disponible sur http://wiki.amule.org"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: OnInit - démarrage du timer"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: passage en arrière plan - à bientôt"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Impossible de créer le fichier Pid"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Renommer"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "Erreur : %s"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Ajouter des fichiers de la collection à la liste de transferts."
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Ceci est aMule %s basé sur eMule."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Copier le &lien magnétique dans le presse-papiers"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Tourne sur %s"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Copier le &lien eD2k dans le presse-papier"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Visitez http://www.amule.org pour vérifier si une nouvelle version est "
+"disponible."
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Copier le lien eD2k dans le presse-papier (&Source)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ERREUR FATALE : Échec de la création du minuteur"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr ""
-"Copier le lien eD2k dans le presse-papier (Source) (&Avec les options de "
-"chiffrement)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Contrôle à distance d'aMule "
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Copier le lien eD2k dans le presse-papier (Nom de l'&hôte)"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Snapshot :"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
-"Copier le lien eD2k dans le presse-papier (Nom de l'hôte) (Avec les options "
-"de &chiffrement)"
+"Client P2P multiplateforme basé sur eMule \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Copier le lien eD2k dans le presse-papier (Info &AICH)"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Site web : http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Copier le rapport dans le presse papier"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Forum : http://forum.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:504
 msgid ""
-"Feedback from: %s (%s)\n"
+"FAQ: http://wiki.amule.org \n"
 "\n"
 msgstr ""
-"Retour de : %s (%s)\n"
+"FAQ : http://wiki.amule.org \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Vous devez être en HighID pour créer un lien valide"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Contact: admin@amule.org (problèmes administratifs) \n"
 
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "AVERTISSEMENT"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Fichiers partagés (%i)"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Une partie d'aMule est basée sur \n"
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[Fichier .part]"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia : Routage peer-to-peer basé sur la métrique XOR.\n"
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Entrez un nouveau nom pour ce fichier :"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Message"
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Renommer"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "boîte de dialogue aMule détruite"
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Reprise des envois du fichier : %s"
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Pause des envois du fichier : %s"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Connexion en cours"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "client texte aMule"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k : Connexion en cours"
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia : le mot recherché est trop court"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k : Déconnecté"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "%u contact Kad lu"
-msgstr[1] "%u contacts Kad lus"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad : Derrière un pare-feu"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Seulement %d contact Kad disponible, nodes.dat non écrit"
-msgstr[1] "Seulement %d contacts Kad disponible, nodes.dat non écrit"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad : Connecté"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "%d contact Kad écrit"
-msgstr[1] "%d contacts Kad écrits"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad : Connexion en cours"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ERREUR : Impossible d'écouter le port TCP."
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad : Coupé"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "connexion du client web acceptée\n"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Annuler"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ERREUR : impossible d'accepter  la connexion du client web\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Stopper les essais de connexions en cours"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "La requête a échouée avec le message d'erreur suivant. %s."
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Déconnecter"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "La requête a échouée avec une erreur inconnue."
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Se déconnecter des réseaux actuellement connectés"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Fichier d'index non trouvé"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Se connecter"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "La session a expirée - demande de l'identifiant\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Se connecter aux réseaux actuellement activés"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Session correcte, identifié\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "E : %.1f(%.1f) | R : %.1f(%.1f)"
 
-# verifier les trucs rapport au webserver
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Session correcte, non identifié\n"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "E : %.1f | R : %.1f"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Pas de session ouverte - l'identifiant va être demandé\n"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Connecté)"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Session crée - demande de l'identifiant\n"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Déconnecté)"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Requête en cours [originale] : "
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Voulez-vous vraiment quitter %s ?"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Vérification du mot de passe\n"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Confirmation de sortie"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Hachage du mot de passe invalide\n"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Commande de lancement :"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Mot de passe correct\n"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- défaut -"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Mauvais mot de passe\n"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Le répertoire de thèmes '%s' n'existe pas"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
-"Vous n'avez pas entré de mot de passe. Les mots de passe vides ne sont pas "
-"autorisés.\n"
+"AVERTISSEMENT : Impossible d'ouvrir le fichier thème '%s' pour la lecture"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Déconnexion demandée\n"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Réseaux"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Requête en cours [redirigée] :"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Fenêtre des réseaux"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Charge le template <str>"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Recherches"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Port HTTP du serveur Web"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Fenêtre de Recherche"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Utiliser la redirection de port UPnP sur le port du serveur web"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Téléchargements"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Port UPnP"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Fenêtre des Téléchargements"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Utiliser la compression gzip"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Fichiers partagés"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Mot de passe du serveur web pour l'accès total"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Fenêtre des Fichiers Partagés"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Mot de passe du serveur web pour l'accès invité"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Messages"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Autoriser l'accès invité"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Fenêtre des Messages"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Interdire l'accès invité"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistiques"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr ""
-"Charger/sauver la configuration du serveur web à partir de/ pour l'aMule "
-"distant"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Fenêtre des Statistiques"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr ""
-"Chemin du fichier de configuration d'aMule. NE PAS UTILISER DIRECTEMENT !"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Préférences"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Désactiver l'interpréteur PHP (obsolète)"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Fenêtre des Préférences"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Recompiler les pages PHP à chaque requête"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importer"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Serveur Web d'aMule"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "L'outil d'importation de fichier .part"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Non disponible"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "À propos"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Jamais"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "À propos/Aide"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Téléchargement..."
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Réseau eD2k"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Réseau Kad"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "%d octets attendus, mais %d octets téléchargés"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Pas de réseau"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Préférences"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "Contrôle à distance d'aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Répertoire contenant le fichier amulesig.dat"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Parcourir"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Erreur Fatale : Échec de la création du minuteur noyau"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Entrer ici le répertoire contenant le fichier amulesig.dat"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Connexion distante à aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Intervalle de rafraîchissement en secondes"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Erreur Fatale : Échec de la création du minuteur d'interrogation"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Départ vers la boucle d'événement…"
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Connexion…"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Générer une image des statistiques en ligne à chaque rafraîchissement"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "La connexion a échouée "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Entrer ici le répertoire où générer l'image des statistiques en ligne"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Gestionnaire d'événement GUI EC distant"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Descendant"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr ""
-"Envoi périodique de l'image des statistiques en ligne sur un serveur FTP"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Connexion échoué. Impossible de se connecter à %s : %d\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "URL du FTP"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Connexion fermée - aMule s'est probablement arrêté."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Chemin du FTP"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Prêt"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Entrer ici l'URL du serveur FTP"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Tous"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
-"Entrer ici le répertoire du serveur FTP où envoyer l'image des statistiques "
-"en ligne"
+"Impossible de créer le répertoire '%s' pour la catégorie '%s', on garde le "
+"répertoire '%s'."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Utilisateur"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Mot de passe"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Inconnu"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Entrer ici l'identifiant pour se connecter au serveur FTP"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Échec de la réception des fichiers partagés de l'utilisateur '%s'"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Entrer ici le mot de passe pour se connecter au serveur FTP"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Recherche d'un pote pour une connexion lowid"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Intervalle d'envoi de l'image des statistiques en ligne en minutes"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Fausse version d'eMule %#x)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Valider"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Faux eMule)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Répertoire contenant le fichier de signature"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Faux eMule)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Répertoire où générer l'image des statistiques en ligne"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (basé sur eMule v0.%u)"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/BaseClient.cpp:2027
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i jour(s) %i heure(s) %i min %i s"
+msgid "NickName: %s ID: %u"
+msgstr "Pseudo : %s ID : %u"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, statistiques en ligne d'aMule"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Demandé : %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Bienvenue !"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statistiques des fichiers pour cette session : %d requête acceptée sur %d, %"
+"s transférés\n"
+msgstr[1] ""
+"Statistiques des fichiers pour cette session : %d requêtes acceptées sur %d, "
+"%s transférées\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statistiques des fichiers pour toutes les sessions : %d requête acceptée sur "
+"%d, %s transférés\n"
+msgstr[1] ""
+"Statistiques des fichiers pour toutes les sessions : %d requêtes acceptées "
+"sur %d, %s transférées\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Vitesse de réception Max atteinte depuis de démarrage de wxCas"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Fichier demandé inconnu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr ""
-"Vitesse de réception Max atteinte lors des précédentes exécutions de wxCas"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Message filtré de '%s' (IP : %s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Réinitialiser"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nouveau message de '%s' (IP : %s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Système"
+#: src/BaseClient.cpp:2899
+#, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr ""
+"L'utilisateur %s (%u) a demandé votre liste de fichier partagés pour le "
+"répertoire inexistant '%s' -> ignoré"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Arrêter le rafraîchissement automatique"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "AVERTISSEMENT : %s n'a pas pu être ouvert."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Sauvegarder l'image des statistiques en ligne"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+"AVERTISSEMENT : Annulation de la liste des fichiers corrompus, elle contient "
+"des entêtes invalides."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Imprimer une image des statistiques en ligne"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Erreur d'E/S lors de la lecture du fichier %s : %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Préférences"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Erreur lors de la sauvegarde du fichier %s : %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "À propos de wxCas"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Entrer le Captcha"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Démarrer le rafraîchissement automatique"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Catégorie"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Rafraîchissement automatique stoppé"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nouvelle Catégorie"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Rafraîchissement automatique démarré"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Choisissez un répertoire pour les fichiers entrants"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Sauvegarder l'image des statistiques en ligne"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Vous devez indiquer un nom pour cette catégorie !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Statistiques en ligne d'aMule"
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Vous devez indiquer un chemin pour cette catégorie !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/CatDialog.cpp:162
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
-"L'impression a rencontré un problème.\n"
-"Peut-être votre imprimante n'est-elle pas configurée correctement ?"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Impression en cours"
+"Échec de la création du répertoire de réception pour cette catégorie. "
+"Veuillez indiquer un chemin valide !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"wxCas, Statistiques en Ligne d'aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Basé sur CAS de Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distribué sous licence GPL"
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Début de la session de chat : %s (%s : %u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, aMule n'est pas lancé..."
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Connecté au Client ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule fonctionne"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Connexion au Client ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule fonctionne, mais est déconnecté"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Échec de la connexion au client / Connexion perdue ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule se connecte..."
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
+"*** Vous avez passé la vérification captcha et l'utilisateur a reçu votre "
+"message. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh Oh, l'état d'aMule est inconnu..."
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** Votre réponse captcha était fausse et votre message a été ignoré. Vous "
+"pouvez demander un nouveau captcha par l'envoi d'un nouveau message. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Discussion"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " tourne depuis "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Fermer l'onglet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " est arrêté !"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Fermer tous les onglets"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " n'est pas connecté !"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Fermer les autres onglets"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " se connecte..."
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Ajouter aux amis"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " est en train de faire des trucs bizarres, à vérifier !"
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Fichier de Crédits chargé, il y a %u client connu"
+msgstr[1] "Fichier de Crédits chargé, il y a %u clients connus"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " est connecté à "
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Crédits expirés pour %u client !"
+msgstr[1] " - Crédits expirés pour %u clients !"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad : "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Pas de fichier 'cryptkey.dat' trouvé, création."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Détails du client"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "derrière un pare-feu"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LowID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "éteint"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " est sur "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Activé"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " avec "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Supporté"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Réception totale : "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Non supporté"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Émission : "
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Désactivé"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Réception durant la session : "
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Connecté"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Réception : "
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Déconnecté"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " Ko/s, Émission : "
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
+msgstr "%.1f Ko/s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " Ko/s"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Incomplet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Partage : "
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Mauvais garçon"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " fichier(s), clients en attente : "
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Vérification - OK"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Temps :"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Non disponible"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f Ko/s"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " sur "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Charge moyenne du système (1-5-15 min) : "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Le système fonctionne depuis : "
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr ""
+"L'utilisateur %s (%u) a demandé votre liste de fichier partagés -> Accepté"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uJ %02uh %02umin %02us"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+"L'utilisateur %s (%u) a demandé votre liste de fichier partagés -> Refusé"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"L'utilisateur %s (%u) a demandé votre liste de dossiers partagés -> Accepté"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+"L'utilisateur %s (%u) a demandé votre liste de dossiers partagés -> Refusé"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "%02us"
-msgstr "%02us"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
-
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LowID"
-
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Non connecté"
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
+msgstr ""
+"L'utilisateur %s (%u) a demandé votre liste de fichier partagés pour le "
+"répertoire '%s' -> accepté"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
+#: src/ClientTCPSocket.cpp:933
 #, c-format
-msgid "%.0f B"
-msgstr "%.0f o"
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr ""
+"L'utilisateur %s (%u) a demandé votre liste de fichier partagés pour le "
+"répertoire '%s' -> refusé"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:952
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f Ko"
+msgid "User %s (%u) shares directory '%s'"
+msgstr "L'utilisateur %s (%u) partage le répertoire '%s'"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:967
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f Mo"
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr ""
+"L'utilisateur %s (%u) a envoyé une liste de fichier partagés non demandée."
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:982
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f Go"
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr ""
+"L'utilisateur %s (%u) a envoyé la liste des fichiers partagés pour le "
+"répertoire '%s'"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:989
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f To"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Annulé !"
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr ""
+"L'utilisateur %s (%u) a terminé d'envoyer la liste liste des fichiers "
+"partagés"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:994
 #, c-format
-msgid "Unable to open %s"
-msgstr "Impossible d'ouvrir %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Paramètres d'entrée"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Fichier à hacher"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Ajouter des URLs optionnelles pour ce fichier"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Entrez ici le fichier dont vous voulez calculer le lien eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
-"Entrez ici l'URL que vous voulez ajouter au lien eD2k: Ajouter / à la fin "
-"pour permettre à aLinkCreator d'ajouter le nom du fichier actuel"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Ajouter"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Enlever"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Effacer"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Créer le lien avec les hachages partiels"
+"L'utilisateur %s (%u) a envoyé une liste de fichier partagés non voulue"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
-"Aide à retrouver les fichiers rares et nouveaux au prix d'un lien de plus "
-"grande longueur"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Hachage MD4 du fichier"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "Hachage eD2K du fichier"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "Lien eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Démarrer"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Sauvegarder"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Copier dans le presse-papiers"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Quitter"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Ouvrir"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Ouvrir un fichier pour traiter le lien eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Copier"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Copier le lien eD2k calculé dans le presse-papier"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Enregistrer sous"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Sauver le lien eD2k calculé dans un fichier"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "À propos"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "A propos d'aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Sélectionnez le fichier dont vous voulez calculé le lien eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Impossible d'ouvrir le presse-papiers"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Rien à copier pour l'instant !"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Sélectionnez le fichier de votre lien eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Impossible d'ouvrir "
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Entrez un nom de fichier non vide s'il vous plaît"
+"L'utilisateur %s (%u) a refusé l'accès à la liste des répertoires/fichiers "
+"partagés"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Rien à sauvegarder pour l'instant !"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Commentaires sur le fichier"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"aLinkCreator, le créateur de lien eD2k d'aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps de http://www.everaldo.com et http://www.icomania.com\n"
-"et http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributé sous GPL"
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Nom d'utilisateur"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Hachage en cours..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Nom du fichier"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator est en train de travailler pour vous"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Évaluation"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Calcul du hachage MD4..."
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Commentaire"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Calcul des hachages eD2k..."
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Pas de commentaire"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Done in %.2f s"
-msgstr "Effectué en %.2f s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Vous avez déjà ajouté cette URL !"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Entrez une URL non vide s'il vous plaît"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u commentaire"
+msgstr[1] "%u commentaires"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Traitement du fichier numéro %u : %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
-"Vous avez demandé les hachages partiels (Seulement utilisés pour des "
-"fichiers dont la tailles est > 9.5 Mo)"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:83
-#, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Fichier inexistant !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, le créateur de lien eD2k d'aMule"
+"Clients bannis %s pour l'envoi %s de données corrompues de %s total pour le "
+"fichier '%s'"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1345,30 +1189,56 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Haute]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Connexion en cours"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Très basse"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Basse"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normale"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Haute"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Très haute"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Release"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Demande en cours"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Connexion via le serveur"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "File d'attente pleine"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "En attente"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
 msgstr "En téléchargement"
 
 #: src/DataToText.cpp:66
@@ -1395,8 +1265,7 @@
 msgid "Too many Kad connections"
 msgstr "Trop de connexions Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Banni"
 
@@ -1428,8 +1297,8 @@
 msgid "Remote Server"
 msgstr "Serveur Distant"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1447,14 +1316,14 @@
 
 #: src/DataToText.cpp:134
 msgid "Source Seeds"
-msgstr "Sources Seeds"
+msgstr "Source Seeds"
 
 #: src/DataToText.cpp:135
 msgid "Search Result"
-msgstr "Résultats de la Recherche"
+msgstr "Résultat de la recherche"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Terminé"
 
@@ -1464,7 +1333,7 @@
 
 #: src/DataToText.cpp:147
 msgid "ERROR: Out of diskspace"
-msgstr "ERREUR : Dépassement de l'espace disque disponible"
+msgstr "ERREUR : Plus d'espace disque"
 
 #: src/DataToText.cpp:148
 msgid "ERROR: Partmet not found"
@@ -1472,13 +1341,13 @@
 
 #: src/DataToText.cpp:149
 msgid "ERROR: IO error!"
-msgstr "ERREUR : erreur IO !"
+msgstr "ERREUR : Erreur E/S !"
 
 #: src/DataToText.cpp:150
 msgid "ERROR: Failed!"
 msgstr "ERREUR : Échec !"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "Mis en file d'attente"
 
@@ -1490,3188 +1359,1428 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Format de fichier temp inconnu ou mauvais."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Défaut du Système"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albanais"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabe"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturien"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Basque"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgare"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Catalan"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Chinois (Simplifié)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Chinois (Traditionnel)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Croate"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Tchèque"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Danois"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Hollandais"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Anglais (U.K.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estonien"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finlandais"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Français"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galicien"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Allemand"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Grec"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hébreux"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Hongrois"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italien"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italien (Suisse)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japonais"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Partie"
 
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Coréen"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lituanien"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvégien (Nynorsk)"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Taille"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polonais"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Reçu"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugais"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Vitesse"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugais (Brésilien)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Progression"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Russe"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Sources"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Slovène"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Priorité"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Espagnol"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Statut"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Suédois"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Temps restant"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turque"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Vu complet pour la dernière fois"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ukrainien"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Dernière réception"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Impossible de déterminer le navigateur sélectionné !"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Êtes-vous sûr de vouloir supprimer le fichier sélectionné ?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"Le port TCP ne peut pas dépasser 65532 car le socket UDP du serveur sera à "
-"TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Êtes-vous sûr de vouloir supprimer les fichiers sélectionnés ?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Le port par défaut sera utilisé (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Nom du serveur"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adresse"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Description"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Temps de réponse"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Utilisateurs"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Fichiers"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Échec"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Statique"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Version"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Vous êtes connecté au serveur que vous tentez de supprimer. Déconnectez-vous "
-"d'abord s'il  vous plaît . Le serveur n'a PAS été supprimé."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Infos"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Nom inconnu)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Êtes-vous sûr de vouloir supprimer le serveur statique %s"
+"Retour de : %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Oui"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Non"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Stop"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Échec de l'ouverture de '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pause"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Serveurs (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Reprise"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Serveurs"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "E&ffacer terminés"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Connexion au serveur"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Mettre tous les A4AF sur ce fichier immédiatement"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Marquer le serveur comme statique"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Mettre tous les A4AF sur ce fichier (Auto)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Marquer le serveur comme non statique"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Mettre tous les A4AF sur n'importe quel autre fichier immédiatement"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Marquer le(s) serveur(s) comme statique(s)"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Options avancées"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Marquer le(s) serveur(s) comme non statique(s)"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Prévisualisation"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Enlever le serveur"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Afficher les &Détails"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Enlever les serveurs"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Afficher tous les commentaires"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Supprimer tous les serveurs"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Copier le lien magnétique dans le presse-papiers"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Copie le lien eD2k dans le presse-papier"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Copier le &lien eD2k dans le presse-papiers"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Copie les liens eD2k dans le presse-papier"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Copier le rapport dans le presse-papiers"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Re-connexion au serveur"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "Dissocier"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Êtes -vous sûr de vouloir supprimer tout les serveurs ?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Associer à une catégorie"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Êtes -vous sûr de vouloir supprimer le serveurs sélectionné ?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Ouvrir le fichier"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Êtes -vous sûr de vouloir supprimer les serveurs sélectionnés ?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Entrez un nouveau nom pour ce fichier :"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Désactivé [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Renommer"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Ceci est aMule %s basé sur eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H : %M : %S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Tourne sur %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Visitez http://www.amule.org pour vérifier si une nouvelle version est "
-"disponible."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ERREUR FATALE : Échec de la création du Minuteur"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Contrôle à distance d'aMule "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Snapshot :"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Client p2p 'multiplate-forme' basé sur eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr "Site web : http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr "Forum : http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-"FAQ : http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Contact : admin@amule.org (problèmes administratifs) \n"
+msgid "Downloads (%i)"
+msgstr "Téléchargements (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Une partie d'aMule est basée sur \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia : Routage peer-to-peer basé sur la métrique XOR.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Message"
+"Pour éviter que cet avertissement apparaisse avec chaque prévisualisation,\n"
+"indiquez votre lecteur vidéo préféré dans les préférences (mplayer par "
+"défaut)."
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k : Connexion"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k : Déconnecté"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad : Derrière un pare-feu"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad : Connecté"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad : Connexion en cours"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad : Coupé"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Stopper les essais de connexions en cours"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Déconnecter"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Se déconnecter des réseaux actuellement connectés"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Se connecter"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Se connecter aux réseaux actuellement activés"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "E : %.1f(%.1f) | R : %.1f(%.1f)"
-
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "E : %.1f | R : %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Aperçu"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Connecté)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr ""
+"ERREUR : Échec de l'exécution du lecteur multimédia externe ! Commande : '%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Déconnecté)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Voulez-vous vraiment quitter aMule ?"
+msgid "Saving PartFile %u of %u"
+msgstr "Enregistrement du fichier .part %u sur %u"
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Confirmation en sortie"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Tous les fichiers .part ont été enregistrés."
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Le répertoire de skins '%s' n'existe pas"
+msgid "Loading temp files from %s."
+msgstr "Chargement des fichiers temporaires depuis %s."
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "AVERTISSEMENT : Impossible de lire le fichier skin '%s'"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Réseaux"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Fenêtre des réseaux"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Recherches"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Fenêtre des recherches"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Transferts"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Fenêtre des transferts de fichiers"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Fichiers partagés"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Fenêtre des fichiers partagés"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Messages"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Fenêtre des messages"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistiques"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Fenêtre des statistiques graphiques"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Fenêtre des préférences"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importer"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "L'outil d'importation de fichier .part"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "À propos/Aide"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "Réseau eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Réseau Kad"
+msgid "Loading PartFile %u of %u"
+msgstr "Chargement du fichier .part %u sur %u"
 
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Pas de réseau"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Général"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Connexion"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Répertoires"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Serveurs"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Sécurité"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Interface"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filtres"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Contrôles à distance"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Signature en ligne"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Avancés"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Évènements"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Débogage"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Manuel"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"aMule doit être redémarré pour activer ces changements :\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- Port TCP changé.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- Port UDP changé.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"Votre liste de mise à jour automatique est vide.\n"
-"'La mise à jour automatique de la liste des serveurs va être désactivé."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Vous avez activé les connexions externes mais vous n'avez pas spécifié de "
-"mot de passe valide.\n"
-"Les connexions externes ne pourront pas être activées tant qu'un mot de "
-"passe valide n'est pas spécifié."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Langue changé.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Dossier temporaire changé.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- Réseau ED2K activé.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "E : 0.0 | R : 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Les deux réseaux eD2k et Kad sont désactivés.\n"
-"Vous ne serez pas connecté tant que vous n'activez pas l'un des deux réseaux."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad ne démarrera pas si votre port UDP est désactivé.\n"
-"Activez le port UDP ou désactivez Kad."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"Vous devez redémarrer aMule maintenant.\n"
-"Si vous ne le faites pas, ne vous plaignez pas si des bogues interviennent.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Votre liste de mise à jour auto des serveurs est vide.\n"
-"Entrez s'il vous plaît au moins une URL qui pointe sur un fichier server.met "
-"valide.\n"
-"Cliquer sur le bouton \"Liste\" à coté de cette case d'option pour entrer "
-"une URL."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Fichiers temporaires"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Fichiers réceptionnés"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Signatures en ligne"
+"ERREUR : Échec du chargement du fichier de récupération. Recherchez une "
+"solution de récupération du .part.met sur http://forum.amule.org."
 
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Choisir un dossier pour %s"
-
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Chercher un lecteur vidéo"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Tous les fichiers .part ont été chargés."
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Choisir un navigateur"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Pas de fichiers .part trouvés"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Exécutable%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Éditer la liste des serveurs"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "%u fichier .part trouvé"
+msgstr[1] "%u fichiers .part trouvés"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Ajoutez ci-dessous des URL pour télécharger des fichiers server.met.\n"
-"Seulement une URL par ligne."
+"Le système de fichiers pour le répertoire Temp ne peut pas traiter des "
+"grands fichiers."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Délais de rafraîchissement : %d seconde"
-msgstr[1] "Délais de rafraîchissement : %d secondes"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"Le système de fichiers pour le répertoire Incoming ne peut pas traiter des "
+"grands fichiers."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Temps pour le graphe des moyennes : %d minute"
-msgstr[1] "Temps pour le graphe des moyennes : %d minutes"
+msgid "Downloading %s"
+msgstr "Téléchargement de %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Échelle du graphe des connexions : %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Vous êtes déjà en train de télécharger le fichier '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Délai de rafraîchissement : %d seconde"
-msgstr[1] "Délai de rafraîchissement : %d secondes"
+msgid "You already have the file '%s'"
+msgstr "Vous avez déjà le fichier '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Taille du tampon de fichiers : %d octet"
-msgstr[1] "Taille du tampon de fichiers : %d octets"
+msgid "You are already trying to download the file %s"
+msgstr "Vous êtes déjà en train de télécharger le fichier %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Taille de la fille d'attente d'émission : %d client"
-msgstr[1] "Taille de la fille d'attente d'émission : %d clients"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Impossible de convertir le lien magnétique en eD2k : %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Intervalle de rafraîchissement de la connexion serveur : %d minute"
-msgstr[1] "Intervalle de rafraîchissement de la connexion serveur : %d minutes"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Intervalle de rafraîchissement de la connexion serveur: Désactivé"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Port UDP pour les requêtes serveurs étendues (TCP+3) :"
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "désactiver"
+msgid "Unknown protocol of link: %s"
+msgstr "Protocole de lien inconnu : %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Exécuter la commande lors de l'évènement '%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Activer l'exécution de la commande sur le noyau"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Commande du noyau:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Activer l'exécution de la commande sur l'interface graphique"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Commande de l'interface graphique:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Les variables suivantes seront remplacées"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Lien eD2k invalide ! ERREUR : %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Tentative d'accès non autorisé: connexion fermée."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "Le client a envoyé un paquet après l'échec d'authentification."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Connexion externe fermée."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr ""
-"Les connexions externes (EC) sont désactivées car le mot de passe est vide!"
+"Les connexions externes sont désactivées car le mot de passe est vide !"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr ""
-"Les connexions externes (EC) sont désactivées dans le fichier de "
-"configuration"
+"Les connexions externes sont désactivées dans le fichier de configuration"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
-msgstr "Nouvelle connexion externe (EC) acceptée"
+msgstr "Nouvelle connexion externe acceptée"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
-msgstr "ERREUR : impossible d'accepter une nouvelle connexion"
+msgstr "ERREUR : impossible d'accepter une nouvelle connexion externe"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
-"Connexion externe refusée car le mot de passe est vide dans les Préférences !"
+"Connexion externe refusée car le mot de passe est vide dans les préférences !"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Connexion au client : %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Version inconnue"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
 msgstr ""
-"ID de version  de EC incorrecte, Il peut y avoir des incompatibilités entre "
-"les binaires. Utilisez un noyau et un client distant du même snapshot."
+"ID de version de EC incorrecte, Il peut y avoir des incompatibilités entre "
+"les binaires. Utilisez un noyau et un client distant de la même version."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"Vous ne pouvez pas connecter une version stable depuis une version SVN "
-"arbitraire ! *pfff* un crash potentiel a été évité"
-
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "L'authentification a échouée."
+"Vous ne pouvez pas connecter une version stable depuis une version de "
+"développement! *pfff* un crash potentiel a été évité"
 
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Version du protocole invalide."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
-msgstr "Le tag de version du protocole est manquant."
+msgstr "L'étiquette de la version du protocole est manquante."
+
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+"Authentification échoué : hachage spécifié comme mot de passe invalide."
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Authentification échoué : mot de passe erroné."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Authentification échoué : mot de passe manquant."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
-msgstr "Requête invalide, vous devriez vous authentifier d'abord."
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
+msgstr "Requête invalide, veuillez vous authentifier d'abord."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
-msgstr "Accès accepté."
+msgstr "Accès autorisé."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Envoi du message d'erreur \"%s\" au client."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Tentative d'accès non autorisé de %s. Connexion fermée."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
-"Échec de la commande PartFile à distance: Hachage du fichier non trouvé: %s"
+"Échec de la commande du fichier .part à distance : Hachage du fichier non "
+"trouvé : %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Hachage du fichier non trouvé : %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "ARGH ! Erreur de traitement de l'OpCode !"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Serveur non ajouté"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "serveur non trouvé : %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "il faut définir le serveur à supprimer"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
-msgstr "eD2k est désactivé dans es préférences."
+msgstr "eD2k est désactivé dans les préférences"
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Recherche en cours. Résultats dans un moment !"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Une recherche Web par une interface distante n'a aucun sens."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad est désactivé dans les préférences."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
-msgstr "Pas de points pour le graphe."
+msgstr "Pas de points pour le graphique."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Votre client n'est pas configuré pour ce niveau de détails."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Connexion externe : fermeture demandée"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Arrêt déjà en cours."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
-msgstr "ExternalConn : ajout du lien '%s'."
+msgstr "ConnExt : ajout du lien '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Lien invalide ou déjà dans la liste."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Fichier non trouvé."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Nom de fichier invalide."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Impossible de renommer le fichier."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad est désactivé dans les préférences."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
-msgstr "Déjà connecter à eD2k."
+msgstr "Déjà connecté à eD2k."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
-msgstr "Connexion à eD2k..."
+msgstr "Connexion à eD2k…"
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Déjà connecté à Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
-msgstr "Connexion à Kad..."
+msgstr "Connexion à Kad…"
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Tout les réseaux sont désactivés."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
-msgstr "Déconnexion de eD2k..."
+msgstr "Déconnecté de eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Déconnecté de Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
-msgstr "Connexion externe : opcode invalide reçu: %#x"
+msgstr "Connexion externe : opcode reçu invalide : %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "opcode invalide (mauvaise version de protocole ? )"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Échec dans l'ouverture du fichier (%s), suppression de la liste des fichiers "
-"partagés."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Requête d'un hashset pour le fichier inconnu : %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "La commande '%s' avec le PID '%d' s'est terminée avec le code '%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Serveur non ajouté : Pas d'IP ni de nom d'hôte donné."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Serveur non ajouté : Port serveur invalide."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Statut eD2k :"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Connecté"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP : Port"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Statut de Kademlia :"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "En marche"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Statut :"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Déconnecté"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "État de la connexion :"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Derrière un pare-feu"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "État du pare-feu : "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Connecté au pote"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Pas de pote"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Nombre moyen d'utilisateurs :"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Nombre moyen de fichiers :"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "À l'arrêt"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Uptime: %s"
-msgstr "Tourne depuis : %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Transfert"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Émission"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Données Émises (Session (Total)) : %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Bande Passante Supplémentaire Utilisée au Total (Paquets) : %s"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Extension '%s' inconnue pour la commande '%s'.\n"
 
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Bande Passante Supplémentaire par les Requêtes Fichiers (Paquets) : %s"
+msgid "Unknown command '%s'.\n"
+msgstr "Commande '%s' inconnue\n"
 
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
-"Bande Passante Supplémentaire par les Échanges de Sources (Paquets) : %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Bande Passante Supplémentaire par les Serveur (Paquets) : %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Bande Passante Supplémentaire par Kad (Paquets) : %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Overhead crypt (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Envois Actifs : %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Envois en Attente : %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Sessions d'envois réussies au total : %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Sessions d'envois qui ont échouées au total : %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Temps d'envois moyen : %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Téléchargements"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Données Reçues (Session (Total)) : %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Sources Trouvées : %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Téléchargements Actifs (parties) : %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Rapport UL:DL pour la Session (Total) : %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Taux de téléchargement moyen (Session) : %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Taux d'envoi moyen (Session) : %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Taux de téléchargement maximal (Session) : %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Taux d'envoi maximal (Session) : %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Nombre de Reconnexions : %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Temps Depuis le Premier Transfert : %s"
+"\n"
+"Cette commande ne prend pas d'argument.\n"
 
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Connecté au serveur depuis : %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Cette commande nécessite un argument.\n"
 
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Connexions Actives (estimation) : %i"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Cette commande est incomplète, vous devez utilisez une des extensions ci-"
+"dessous.\n"
 
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Limite du nombre Max de Connexion Atteinte : %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Extensions disponibles :\n"
 
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Connexions en Moyenne (estimation) : %g"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Commandes disponibles :\n"
 
-#: src/Statistics.cpp:700
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Maximum de connexions (estimation) : %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Clients"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Toutes les commandes sont insensibles à la casse.\n"
+"Tapez '%s <command>' pour avoir des informations détaillées sur <command>.\n"
 
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrés"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Quitte l'application."
 
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Total : %i Connus : %i"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Montrer l'aide."
 
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Serveurs en fonctionnement : %i"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Pour avoir de l'aide sur une commande, tapez 'help <command>'.\n"
+"Pour avoir la liste complète des commandes, tapez 'help'.\n"
 
-#: src/Statistics.cpp:716
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Failed Servers: %i"
-msgstr "Serveurs non-connectés : %i"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Utilisez '%s' pour la liste des commandes\n"
+"\n"
 
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Total : %s"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Erreur de syntaxe !"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Serveurs Supprimés : %s"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+"Erreur durant le traitement de la commande - Cela ne devrait jamais "
+"arriver ! Rapportez le bogue, s'il vous plaît\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Serveurs Filtrés : %s"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Cette commande ne devrait pas avoir de paramètres."
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Utilisateurs sur les serveurs en fonctionnement : %llu"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Cette commande nécessite un paramètre."
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Fichiers sur les serveurs en fonctionnement : %llu"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Argument invalide."
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Utilisateurs au Total : %llu"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Cette commande est incomplète."
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "Total Files: %llu"
-msgstr "Fichiers au Total : %llu"
+msgid "Type '%s' to get more help.\n"
+msgstr "Tapez '%s' pour avoir plus d'aide.\n"
 
-#: src/Statistics.cpp:724
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Occupation du Serveur : %.2f%%"
+msgid "This is %s %s %s\n"
+msgstr "C'est %s %s %s\n"
 
-#: src/Statistics.cpp:728
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Nombre de Fichiers Partagés : %s"
+msgid "This is %s %s\n"
+msgstr "C'est %s %s\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Taille totale des Fichiers Partagés : %s"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
+msgstr ""
+"\n"
+"Création du client en cours…\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Average file size: %s"
-msgstr "Taille moyenne des fichiers : %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Système d'Exploitation"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Non reçu"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Couper"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Coller"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Tout sélectionner"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
+msgstr ""
+"\n"
+"Ok, fin de %s…\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Une recherche Kad ne peut pas être faite si Kad n'est pas lancé"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
+"Connexion impossible sans mot de passe.\n"
+"Vous devez spécifier un mot de passe, soit dans le fichier de configuration, "
+"soit sur la ligne de commande ; ou l'entrer lorsque l'on vous le demande.\n"
+"\n"
+"Fin d'exécution…\n"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "La recherche eD2k ne peut être effectué si eD2k n'est pas connecté"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Montre ce texte d'aide."
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Erreur imprévue lors de la tentative de recherche Kad : "
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Hôte où aMule tourne. (défaut : localhost)"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Message filtré de '%s' (IP : %s)"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Port d'aMule pour les connexions externes. (défaut : 4712)"
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nouveau message de '%s' (IP : %s)"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Mot de passe pour les connexions externes."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr ""
-"L'utilisateur %s (%u) a demandé votre liste de fichier partagés -> Accepté"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Configuration lue depuis le fichier."
 
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr ""
-"L'utilisateur %s (%u) a demandé votre liste de fichier partagés -> Refusé"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Ne pas afficher de sortie sur stdout."
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"L'utilisateur %s (%u) a demandé votre liste de dossiers partagés -> Accepté"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Mode bavard - montre aussi les messages de débogage."
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr ""
-"L'utilisateur %s (%u) a demandé votre liste de dossiers partagés -> Refusé"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Change la localisation du programme (langue)."
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
 msgstr ""
-"L'utilisateur %s (%u) a demandé votre liste de fichier partagés pour le "
-"répertoire %s -> accepté"
+"Écrit les options de la ligne de commande dans le fichier de configuration."
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
 msgstr ""
-"L'utilisateur %s (%u) a demandé votre liste de fichier partagés pour le "
-"répertoire %s -> refusé"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "L'utilisateur %s (%u) partage le répertoire %s"
+"Créé le fichier de configuration à partir du fichier de configuration "
+"d'aMule."
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr ""
-"L'utilisateur %s (%u) a envoyé une liste de fichier partagés non demandée."
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Affiche la version du programme."
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr ""
-"L'utilisateur %s (%u) a envoyé la liste des fichiers partagés pour le "
-"répertoire %s"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Détails du fichier"
 
-#: src/ClientTCPSocket.cpp:1032
+#: src/FileDetailDialog.cpp:113
 #, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr ""
-"L'utilisateur %s (%u) a terminé d'envoyer la liste liste des fichiers "
-"partagés"
+msgid "%.1f%% done"
+msgstr "%.1f%% fait"
 
-#: src/ClientTCPSocket.cpp:1037
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr ""
-"L'utilisateur %s (%u) a envoyé une liste de fichier partagés non voulue"
+msgid "%.2f kB/s"
+msgstr "%.2f Ko/s"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
-"L'utilisateur %s (%u) a refusé l'accès à la liste des répertoires/fichiers "
-"partagés"
-
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Noeuds (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "IP invalide pour le bootstrap"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Port invalide pour le bootstrap"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Remplir tous les champs requis s'il vous plaît"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Êtes-vous sûr de vouloir télécharger en nouveau fichier nodes.dat?\n"
+"Échec de l'ouverture du fichier de la liste d'amis 'emfriends.met' pour la "
+"lecture !"
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
-"Le faire supprimera les nœuds actuels et redémarrera la connexion à Kademlia."
+"Échec de l'ouverture du fichier de la liste d'amis 'emfriends.met' pour "
+"l'écriture !"
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Continuer ?"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "CRITIQUE - Pas de client dans StartChatSession"
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "ERREUR : "
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Amis"
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "AVERTISSEMENT : "
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Afficher les &Détails"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
 msgstr "Ajouter un ami"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Vous devez entrer une adresse IP valide et un port !"
-
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Information"
-
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Le Hachage utilisateur spécifié est invalide !"
-
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Sources"
-
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Fichier"
-
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Réception"
-
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Catégorie"
-
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Principal"
-
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Télécharger dans la catégorie"
-
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Recherche des fichiers connexes (eD2k, serveur local)"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Supprimer l'Ami"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Marquer comme fichier connu"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Envoyer un &Message"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Connexion distante à aMule"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Voir les fichiers"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "La connexion a échouée "
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Établissement d'un Slot Ami"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "ERREUR"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Êtes-vous sûr de vouloir supprimer l'ami sélectionné ?"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Échec de la connexion. Impossible de se connecter à %s:%d\n"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Êtes-vous sûr de vouloir supprimer les amis sélectionnés ?"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
 msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
-"AVERTISSEMENT : Vous ne pouvez vous ajouter comme source pour un lien eD2k "
-"lorsque vous avez un lowid."
-
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Utilisateurs : E : %s K : %s | Fichiers E : %s K : %s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Tous"
-
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Utilisateurs au total : %s | Fichiers au total : %s"
-
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Reçu"
-
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Vitesse"
-
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Progression"
-
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Statut"
-
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Temps restant"
-
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Vu complet pour la dernière fois"
-
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Dernière réception"
-
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Êtes-vous sûr de vouloir supprimer le fichier sélectionné ?"
+"Vous n'êtes pas autorisé à établir plus d'un slot ami.\n"
+" Seul un slot a été attribué."
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Êtes-vous sûr de vouloir supprimer les fichiers sélectionnés ?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Sélection multiple"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Envoyer un message à l'utilisateur"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Message à envoyer :"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Stop"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pause"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Reprise"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "E&ffacer terminés"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Mettre tous les A4AF sur ce fichier immédiatement"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Mettre tous les A4AF sur ce fichier (Auto)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Mettre tous les A4AF sur n'importe quel autre fichier immédiatement"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Options avancées"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Prévisualisation"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Afficher &Détails"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Afficher tous les commentaires"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Copier le lien magnétique dans le presse-papiers."
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "Désassocier"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Associer à une catégorie"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Ouvrir le fichier"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Supprimer des amis"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Ajouter aux amis"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Envoyer un message"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Échanger vers ce fichier"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "Ko/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H : %M : %S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
-msgstr "QR : %u (%i)"
+msgid "On Queue: %u (%i)"
+msgstr "En attente : %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Demander un autre fichier"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Téléchargements (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Pour empêcher cet avertissement à chaque prévisualisation\n"
-"veuillez sélectionner votre lecteur vidéo préféré dans les préférences "
-"(mplayer est le lecteur par défaut)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Aperçu"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr ""
-"ERREUR : Échec de l'exécution du lecteur multimédia externe ! Commande : '%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "Erreur : Échec de la création du fichier .part)"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Tentative de chargement de la sauvegarde du fichier met depuis %s"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ERREUR : Échec de l'ouverture du fichier part.met : %s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ERREUR : le fichier part.met a une taille nulle : %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ERREUR : fileversion invalide pour part.met : %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"ERREUR : %s (%s) est corrompu (mauvais tagcount), impossible de charger le "
-"fichier."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Tentative de récupération d'infos du fichier..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr ""
-"Récupération du fichier anonyme - Essai de récupération sous le nom "
-"RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Récupération de toutes les infos du fichier :D - Essayons de les utiliser..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Impossible de récupérer les infos du fichier :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Échec de l'ouverture de %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "AVERTISSEMENT : %s est peut être corrompu (%i)"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Attente d'un slot d'émission"
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "ERREUR lors de la sauvegarde du fichier .part : %s (%s ==> %s)"
+msgid "On Queue: %u"
+msgstr "En attente : %u"
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Impossible de récupérer la taille de '%s' - utilisation du fichier %s."
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Émission en cours"
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' est apparemment de taille nulle - Utilisation du fichier %s."
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Aucun"
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Échec de la sauvegarde du fichier part.met.seeds pour %s"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Non"
 
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "%i source seed sauvegardé pour le fichier .part : %s (%s)"
-msgstr[1] "%i source seeds sauvegardés pour le fichier .part : %s (%s)"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Oui"
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Le fichier .part %s (%s) n'a pas de fichier seeds"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Téléchargement…"
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Le fichier .part %s (%s) a un fichier seeds vide"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "Téléchargement HTTP annulé"
 
-#: src/PartFile.cpp:1118
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgid "Unable to create destination file %s for download!"
 msgstr ""
-"Erreur lors de la lecture de fichier seeds du fichier .part (%s - %s) : %s"
-
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Une partie corrompue trouvée (%d) dans %d parties du fichier %s - "
-"FileResultHash |%s| FileHash |%s|"
-msgstr[1] ""
-"Une partie corrompue trouvée (%d) dans %d partie du .part %s - "
-"FileResultHash |%s| FileHash |%s|"
+"Impossible de créer le fichier de destination %s pour le téléchargement!"
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Partie complète (%i) trouvée dans %s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Re-hachage de %s terminé"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "L'URL de téléchargement ne peut pas être vide"
 
-#: src/PartFile.cpp:2239
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Erreur inattendue en achevant %s. Le fichier est en pause"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "L'URL %s retourne : %i - Erreur (%i)!"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Téléchargement terminé : %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Erreur critique lors de l'écriture du fichier téléchargé"
 
-#: src/PartFile.cpp:2323
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Deleting file: %s"
-msgstr "Fichier supprimé : %s"
+msgid "Downloaded %d bytes"
+msgstr "%d octets téléchargés"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"AVERTISSEMENT : Impossible de hacher la partie télécharger - hashset "
-"incomplet pour '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "%d octets attendus, mais %d octets téléchargés"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"ERREUR: Impossible de hacher la partie télécharger - hashset incomplet (%s). "
-"Cela ne devrait jamais arriver"
+"URL invalide pour le téléchargement HTTP ou la redirection HTTP (avez-vous "
+"oublié 'http://' ?)"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr ""
-"AVERTISSEMENT : Pas assez d'espace disque disponible ! Mise en pause du "
-"fichier : %s"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "impossible de se connecter au serveur de téléchargement HTTP"
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "La partie téléchargée %i est corrompue dans le fichier : %s"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Réponse invalide du serveur de téléchargement HTTP"
 
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH : Partie corrompue %i récupérée pour %s -> Octets sauvés: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "En cours d'allocation"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Espace disque insuffisant"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Arrêté"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Téléchargé"
-
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "Erreur : Impossible d'ouvrir fichier .part : '%s'"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Télécharger un nouveau fichier GeoIP.dat à partir de %s"
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "AVERTISSEMENT : Impossible d'ouvrir known.met"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "Échec du téléchargement du fichier GeoIP.dat, mise à jour annulée."
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr ""
-"AVERTISSEMENT : La liste Knownfile est corrompu, elle contient des entêtes "
-"invalides."
-
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Erreur d'entrée-sortie lors de la lecture du fichier known.met : %s"
+msgid "Failed to remove %s file, aborting update."
+msgstr "Impossible de supprimer le fichier %s, abandon de la mise à jour."
 
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Erreur lors de la sauvegarde du fichier known.met : %s"
+msgid "Failed to rename %s file, aborting update."
+msgstr "Impossible de renommer le fichier %s, abandon de la mise à jour."
 
-#: src/SharedFileList.cpp:352
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "%i fichier partagé connu trouvé"
-msgstr[1] "%i fichiers partagés connus trouvés"
+msgid "Successfully updated %s"
+msgstr "Mise à jour réussite de %s"
 
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "%i fichier partagé connu trouvé, %i inconnu"
-msgstr[1] "%i fichiers partagés connus trouvés, %i inconnus"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Erreur lors de la mise à jour de GeoIP.dat"
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ERREUR : Tentative de partager %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Commentaires du fichier"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Évaluation"
+msgid "Failed to download %s from %s"
+msgstr "Échec du téléchargement %s de %s"
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Commentaire"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Pas de commentaire"
-
-#: src/CommentDialogLst.cpp:104
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u commentaire"
-msgstr[1] "%u commentaires"
+msgid "Failed to load country data for '%s'."
+msgstr "Échec du chargement des données des pays pour '%s'."
 
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Échec de la connexion aux serveurs brouillés listés. Nouvel essai sans "
-"brouillage."
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Chargements des filtres IP 'ipfilter.dat' et 'ipfilter_static.dat'."
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Échec de la connexion aux serveurs listés : nouvel essai."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "Réseau eD2K désactiver dans les préférences, non connecté."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Aucun serveurs valides trouvé dans la liste auquel se connecté."
-
-#: src/ServerConnect.cpp:187
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Connecté à %s (%s : %i)"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "Échec du chargement de fichier ipfilter.dat '%s', format inconnu."
 
-#: src/ServerConnect.cpp:263
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Connexion établie sur : %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
-"Erreur fatale lors de la tentative de connexion. la connexion Internet est "
-"probablement inactive"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Connexion à %s (%s : %i) perdue"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s : %i) semble être indisponible."
-
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s : %i) semble être plein."
+"Échec du chargement de fichier ipfilter.dat '%s', ne peut pas ouvrir le "
+"fichier."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] ""
-"Nouvelle tentative de connexion automatique au serveur dans %d seconde"
-msgstr[1] ""
-"Nouvelle tentative de connexion automatique au serveur dans %d secondes"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Connexion perdue"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "%u rang d'IP chargé depuis '%s'. "
+msgstr[1] "%u rangs d'IP chargés depuis '%s'. "
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Échec de la connexion à %s (%s : %i)."
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ERREUR : Socket invalide lors de la vérification du délai"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u ligne mal-formée a été mise de coté."
+msgstr[1] "%u lignes mal-formées ont été mises de coté."
 
-#: src/ServerConnect.cpp:460
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Délai d'attente de la connexion à %s (%s : %i) dépassé."
-
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
-"ERREUR: Impossible de charger le fichier de sauvegarde. Recherchez une "
-"solution pour récupérer le fichier .part.met sur http://forum.amule.org"
+"Impossible de renommer le nouveau fichier %s, abandon de la mise à jour."
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Pas de fichiers .part trouvés"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "%u fichier .part trouvé"
-msgstr[1] "%u fichiers .part trouvés"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
-"Le système de fichiers pour le répertoire Temp ne peut pas traiter des "
-"grands fichiers."
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "IP filter est prêt"
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Le système de fichiers pour le répertoire Incoming ne peut pas traiter des "
-"grands fichiers."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Téléchargement de %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Vous êtes déjà en train de télécharger le fichier '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Vous avez déjà le fichier '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Vous êtes déjà en train de télécharger le fichier %s"
+"Amorçage depuis\n"
+"les clients connus"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Impossible de convertir le lien magnétique en lien eD2k: %s"
+msgid "Nodes (%u)"
+msgstr "Nœuds (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Protocole de lien inconnu : %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "IP invalide pour l'amorçage"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Lien eD2k invalide ! ERREUR : %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Port invalide pour l'amorçage"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Exécute <str> et quitte."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Veuillez remplir tous les champs requis"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Format d'IP invalide. utiliser xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Êtes-vous sûr de vouloir télécharger un nouveau fichier nodes.dat?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Cette commande nécessite un argument. Arguments valides : 'all', nom de "
-"fichier ou un nombre.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Traitement par hachage :"
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Traitement par nom de fichier :"
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr ""
-"Cette commande nécessite un argument. Arguments valides : un hachage de "
-"fichier.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Nombre invalide\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Ce n'est pas un hachage valide (la longueur devrait être exactement 32 "
-"caractères)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "L'opération s'est déroulée avec succès."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "La requête à échouée avec l'erreur suivante : %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Statut du filtrage IP pour les clients : %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "Arrêt"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "Marche"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Statut du filtrage IP pour les serveurs : %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Le niveau d'IPFilter actuel est %d.\n"
+"Le faire supprimera les nœuds actuels et redémarrera la connexion à Kademlia."
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr ""
-"Limites de la bande passante : Montante : %u kB/s, Descendante : %u kB/s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Continuer ?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia : le mot recherché est trop court"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Connecté à %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "avec un LowID"
+msgid "Keyword for search: %s"
+msgstr "Mot clé de recherche : %s"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "avec un HighID"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Connexion en cours"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Non connecté"
-
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
-"\n"
-"Réception : \t%s"
+"Kademlia : le mot-clé de la recherche est toujours dans la liste de "
+"recherche :"
 
-#: src/TextClient.cpp:726
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Upload:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Émission : \t%s"
+"Impossible de lire le fichier nodes.dat - trop vieux. Cette version (0) "
+"n'est plus supporté."
 
-#: src/TextClient.cpp:729
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Clients dans la file d'attente : \t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "%u contact Kad lu"
+msgstr[1] "%u contacts Kad lus"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Nombre total de sources : \t%d\n"
+"Aucun contacts trouvé, veuillez lancer l'amorçage, ou télécharger un fichier "
+"nodes.dat."
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Nombres de résultats de la recherche : %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "A FAIRE - montrer la progression d'une recherche"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Seulement %d contact Kad disponible, nodes.dat non écrit"
+msgstr[1] "Seulement %d contacts Kad disponible, nodes.dat non écrit"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Réponse inconnue reçue du serveur, OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Montrer de courtes informations sur le statut."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr ""
-"Montrer le statut de la connexion, vitesses d'émission/réception, etc.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Montrer l'arbre des statistiques complet."
-
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Accessoirement, un nombre entre 0 et 255 peut être passé comme argument à "
-"cette\n"
-"commande, ce qui limitera le nombre de réponse par sous-arbre de versions "
-"des clients\n"
-"affichés. Passer 0 ou ne rien mettre signifie 'illimité'.\n"
-"\n"
-"Exemple: 'statistics 5' montrera seulement les 5 premières versions pour "
-"chaque type de client.\n"
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Fermer aMule."
-
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Fermez le noyau de fonctionnement à distance (amule/amuled).\n"
-"Cela fermera aussi le client, car il est inutilisable sans\n"
-"le fonctionnement du noyau.\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Recharge l'objet donné."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "%d contact Kad écrit"
+msgstr[1] "%d contacts Kad écrits"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Recharge la liste des fichiers partagés."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Nom de fichier"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Recharge la table IPFilter depuis le fichier."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Taille du fichier"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Se connecter au réseau."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Ratio de partage"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"Ceci va vous connecter à tout les réseaux activés dans les Préférences.\n"
-"Vous pouvez aussi spécifier une adresse de serveur de la forme IP : Port, "
-"pour se connecter\n"
-"seulement à ce serveur. L'IP doit être une IPv4 décimal,\n"
-"ou un nom DNS pouvant être résolu."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Émis"
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Connecter à eD2k seulement."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Demandé"
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Se connecter seulement à Kad."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Accepté"
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Se déconnecter du réseau."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Sources complètes"
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Ceci vous déconnectera de tous les réseaux auxquels vous êtes actuellement "
-"connecté.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Déconnecter de eD2k seulement."
+"AVERTISSEMENT : La liste de fichiers connus est corrompue, elle contient des "
+"entêtes invalides."
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Se déconnecter seulement de Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Ajouter un lien eD2k ou un lien magnétique au noyau."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"Le lien eD2k à ajouter peut être:\n"
-"*) un lien d'un fichier (ed2k://|file|...), il sera ajouté à la liste des "
-"fichiers à télécharger,\n"
-"*) un lien d'un serveur (ed2k://|server|...), il sera ajouté à la liste des "
-"serveurs,\n"
-"*) ou un lien d'une liste de serveurs, dans ce cas tout les serveurs de la "
-"liste seront ajouté à\n"
-"   liste des serveurs.\n"
-"\n"
-"Le lien magnétique doit contenir le hachage eD2k et la longueur du fichier.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Changer une valeur des préférences."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Changer une préférence IPFilter."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Activer le filtrage IP pour les clients et les serveurs."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Désactiver le filtrage IP pour les clients et les serveurs."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Activer/Désactiver le filtrage IP pour les clients."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Activer le filtrage IP pour les clients."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Désactiver le filtrage IP pour les clients."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Activer/Désactiver le filtrage IP pour les serveurs."
+"Échec du chargement de l'entrée dans la liste des fichiers connus, le "
+"fichier est peut être corrompu"
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Activer le filtrage IP pour les serveurs."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Désactiver le filtrage IP pour les serveurs."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Choisir le niveau de filtrage IP."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Les niveaux de filtrage valides sont compris entre 0 et 255, la valeur par "
-"défaut (initiale)\n"
-" est 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Changer les limites de bande passante."
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "La valeur passée à ces commandes doit être en kilo-octets/s.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Changer la limite de bande passante en émission."
-
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Changer la limite de bande passante en réception."
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Afficher une valeur des préférences."
+"Entrée invalide dans la liste des fichiers connus, le fichier est peut être "
+"corrompu :"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Voir les préférences d'IPFilter."
+#: src/libs/common/Format.cpp:307
+#, c-format
+msgid "Unknown error %d"
+msgstr "Erreur inconnue %d"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Voir le statut d'IPFilter concernant les clients et les serveurs."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Impossible d'obtenir la description d'erreur pour l'erreur %d"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Voir le statut d'IPFilter concernant les clients uniquement."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Hachage"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Voir le statut d'IPFilter concernant les serveurs uniquement."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Finalisation"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Voir le niveau d'IPFilter."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Terminé"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Voir les limites de bande passante."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "En pause"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Lance une recherche."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Erroné"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"Un type de recherche doit être spécifié en donnant le type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Exemple: 'recherche fichier kad' exécutera une recherche kad pour \"fichier"
-"\".\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "En attente"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Exécute une recherche globale."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Vous devez entrer un mot de passe non vide."
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Exécute une recherche locale."
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Exécute une recherche Kad."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Mot de passe invalide, ce n'est pas un hachage MD5 !"
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Montre les résultats de la dernière recherche."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Erreur de connexion"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Retourne les résultats de la recherche précédente.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "La connexion EC a échoué. Réponse vide."
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Affiche la progression de la recherche."
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "Connexion externe : Mauvaise réponse, échange raté. Connexion fermée."
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Affiche la progression de la recherche.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Succès ! Connexion établie à aMule "
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Démarrer le téléchargement du fichier."
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Succès ! Connexion établie."
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Le rang du fichier de la dernière recherche doit être donné.\n"
-"Exemple: 'download 12' va télécharger le douzième fichier de la précédente "
-"recherche.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Connexion externe : Accès refusé car :"
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Mettre le téléchargement en pause."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Connexion externe : Échange raté."
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Reprendre le téléchargement."
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "ListenSocket : OK."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Annuler le téléchargement."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "ERREUR : Le port TCP n'a pas pu être mis en écoute."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Régler la priorité de téléchargement."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "ERREUR : "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr ""
-"Passer la priorité d'un téléchargement en Basse, Normale, Haute, ou Auto.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "AVERTISSEMENT : "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Passer en priorité basse."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Fermer"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Passer en priorité normale."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Couper"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Passer en priorité haute."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Copier"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Passer en priorité auto."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Coller"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Montrer les files d'attente/listes."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Effacer"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Montre la file d'attente des envois/réception, la liste des serveurs ou la "
-"liste de fichiers partagés.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Tout sélectionner"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Montrer la file d'attente des envois."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "Ko/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Montrer la file d'attente des réceptions."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Pas de limite"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Montrer le journal."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Menu aMule"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Montrer la liste des serveurs."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Limites de vitesse :"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Effacer le journal."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "Émission : Aucune"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Commande obsolète, utilisez '%s' à la place."
+msgid "UL: %u"
+msgstr "Émission : %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"C'est une commande est obsolète, et pourrait être supprimée dans le futur.\n"
-"Utilisez '%s' à la place.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "Réception : Aucune"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ERREUR : %s (%s) - %s"
+msgid "DL: %u"
+msgstr "Réception : %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "AVERTISSEMENT : %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Vitesse de téléchargement : %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Nouvel ID client : %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "AVERTISSEMENT : Vous avez reçu un Low-ID !"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr ""
-"\tLa raison la plus probable est que vous êtes derrière un pare-feu ou un "
-"router."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tPour plus d'informations, consultez http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Vitesse d'émission : %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Info serveur inconnu reçue ! - trop court"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Informations Client"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "%d nouveau serveur reçu"
-msgstr[1] "%d nouveaux serveurs reçus"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Sauvegarde de la liste des serveurs terminée."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Le serveur a rejeté la dernière commande"
+msgid "Nickname: %s"
+msgstr "Pseudo : %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Faux paquet reçu depuis le serveur : %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Aucun pseudo sélectionné !"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr ""
-"Erreur non-prise en compte lors du traitement du paquet reçu du serveur : %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID Client : "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Ne peut créer de thread pour la résolution DNS pour se connecter à %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Non connecté"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "L'IP du serveur %s (%s) est filtrée. Pas de connexion."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Nom du serveur : "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "utilisation du brouillage de protocole"
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP du serveur : "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Connexion à %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Non connecté"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr ""
-"Ne peut résoudre le nom DNS pour le serveur %s : Impossible de se connecter !"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr ""
-"CIP2Country::CIP2Country(): Impossible de charger les informations de pays "
-"depuis "
+msgid "IP: %s"
+msgstr "IP : %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "%d image de drapeau chargée."
-msgstr[1] "%d images de drapeau chargées."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Êtes-vous sûre de vouloir annuler et supprimer tous les fichiers de cette "
-"catégorie ?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Confirmation requise"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Tous les autres"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Incomplet"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Actif"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Vidéo"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Audio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Archive"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Images CD"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Images"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Texte"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Sélectionner un filtre"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Ajouter une catégorie"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Éditer une catégorie"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Supprimer une catégorie"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Nom de fichier"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Taille du fichier"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Ratio de partage"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Émis"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Demandé"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Accepté"
+msgid "TCP port: %d"
+msgstr "Port TCP : %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Sources complètes"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "Port TCP : Non prêt"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Importation %s : %s"
+msgid "UDP port: %d"
+msgstr "Port UDP : %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Lecture du répertoire temporaire"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "Port UDP : Non prêt"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr ""
-"Récupération des informations de base depuis le téléchargement dans un "
-"fichier"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Signature En Ligne : Activée"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Création du fichier de destination"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Signature En Ligne : Désactivée"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr ""
-"Chargement des données depuis un ancien fichier de téléchargement (%u de %u)"
+msgid "Uptime: %s"
+msgstr "Temps de fonctionnement : %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr ""
-"Sauvegarde du bloc de données dans un nouveau fichier de téléchargement "
-"unique (%u de %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Récupérations des informations du fichier de téléchargement source"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Ajout du téléchargement et sauvegarde du nouveau fichier .part"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importer les fichiers .port"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "État"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Hachage du fichier"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "En attente..."
+msgid "Shared files: %d"
+msgstr "Fichiers partagés : %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disque : %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Choisissez un dossier où chercher les téléchargements temporaires ! (les "
-"sous-dossiers seront inclus)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"Voulez-vous que les fichiers sources de l'importation réussie du "
-"téléchargement soient supprimées ?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Supprimer les sources ?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "octet"
-msgstr[1] "octets"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "ko"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "Mo"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "Go"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "To"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "octet/sec"
-msgstr[1] "octets/sec"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "Mo/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "s"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "min"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "heures"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Jours"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Vidéos"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Archives"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Textes"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programmes"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Tous"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Non évalué"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Invalide / Corrompu / Contrefaçon"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Mauvais"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Assez bon"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Bon"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Excellent"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "Tous"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "tous les autres"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Chargement des filtres IP 'ipfilter.dat' et 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Clients en attente : %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Échec du chargement de fichier ipfilter.dat '%s', format inconnu."
+msgid "Total DL: %s"
+msgstr "Reçu au total : %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Échec du chargement de fichier ipfilter.dat '%s', ne peut pas ouvrir le "
-"fichier."
+msgid "Total UL: %s"
+msgstr "Émis au total : %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "%u rang d'IP chargé depuis '%s'. "
-msgstr[1] "%u rangs d'IP chargés depuis '%s'. "
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Limite d'émission"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u ligne mal formée a été mise de coté."
-msgstr[1] "%u lignes malformées ont été mises de coté."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Limite de téléchargement"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Connexions actives (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Cacher aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Détails du fichier"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Afficher aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% fait"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Quitter"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
-msgstr "Lien eD2k : "
+msgstr "Lien eD2k :"
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Envoyer"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
-"Cliquez ici pour ajouter le lien eD2k dans le contrôle de texte à votre "
-"liste de téléchargement."
+"Cliquez ici pour ajouter le lien eD2k dans le contrôle de texte à votre file "
+"de téléchargement."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr ""
-"Les évènements sont affichés ici. Pour une liste complète des évènements, "
-"reportez à la fenêtre du journal de l'onglet Serveur."
+"Les événements sont affichés ici. Pour une liste complète des évènements, "
+"reportez-vous à la fenêtre journal de l'onglet Serveur."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
-msgstr "Chargement en cours..."
+msgstr "Chargement…"
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
-msgstr "Nombre d'utilisateur du serveur auquel vous êtes connecté..."
+msgstr "Nombre d'utilisateur du serveur auquel vous êtes connecté…"
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Utilisateurs : 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr ""
-"Utilisateurs connectés au serveur courant et une estimation du nombre total "
+"Utilisateurs connectés au serveur actuel et une estimation du nombre total "
 "d'utilisateurs."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "E : 0.0 | R : 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
 msgstr ""
-"Taux moyen d'émission et de réception courants. S'il est présent, le chiffre "
-"entre parenthèses indique la bande passante supplémentaire utilisée par les "
-"connexions aux clients."
+"Taux moyen d'émission et de réception actuelles. S'il est présent, le "
+"chiffre entre parenthèses indique la surcharge dût à la communication du "
+"client."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4683,1191 +2792,1165 @@
 "vous êtes en LowID (pare-feu), et des flèches vertes que vous êtes en HighID "
 "(le type de connexion optimal)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
-msgstr "Non connecté..."
+msgstr "Non connecté…"
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Serveur connecté."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Type"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Hachage du fichier"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Paramètres étendus"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtrage"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Type de fichier"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Tous"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Archives"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Audio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Images CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Images"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programmes"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Textes"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Vidéos"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Extension"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Taille Minimum"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Octets"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "Ko"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "Mo"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "Go"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Taille Maximum"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Disponibilité"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filtre :"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Filtrer les résultats"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Inverser les résultats"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Masquer les fichiers connus"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Démarrer"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Plus"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
-msgstr ""
-"Rechercher plus de résultats sur eD2k. Non prise en charge par Kad "
-"actuellement."
+msgstr "Recherche plus de résultats sur eD2k. Toujours non supporté par Kad."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Arrêter"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Réception"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Réinitialiser les Champs"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Résultats"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Effacer les téléchargements terminés"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Affiche l'émission / la file d'attente d'émission"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Clients dans la file d'attente :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Envoyer"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Envoie le message spécifié."
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Sources du fichier :"
 
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Fermer"
-
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Ferme cette session de Chat."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Général"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Nom complet :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/A"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "Fichier .met :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Hachage :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Taille du fichier :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
-msgstr "Statut :"
+msgstr "Statut du fichier .part :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Vu complet pour la dernière fois :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Transfert"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Sources trouvées :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Sources en transfert :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Nombre de fichier .part :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Disponibles :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Taux de transfert :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Temps de téléchargement actif : "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Transféré :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Taille reçue :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
-msgstr "Traitement intelligent des corruptions (I.C.H.)"
+msgstr "Gestion Intelligente de la Corruption (I.C.H.)"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Perdus par corruption :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Gagné avec la compression :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Paquets sauvés par l'I.C.H :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Noms des fichiers"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Récupérer le nom"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Nettoyage"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Appliquer"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
-msgstr "Ok"
+msgstr "OK"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 "Commenter/Noter le fichier (Ce texte sera visible par tout les utilisateurs)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Pour un film vous pouvez donner sa durée, son histoire, sa langue...\n"
-"et s'il s'agit d'un faux, vous pouvez le dire aux autre utilisateurs d'aMule."
+"Pour un film vous pouvez indiquer sa durée, l'histoire, la langue…\\n\\net "
+"s'il s'agit d'un faux, vous pouvez prévenir les autres utilisateurs d'aMule."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Qualité du fichier"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Non évalué"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Invalide / Corrompu / Contrefaçon"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Mauvais"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Assez bon"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Bon"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Excellent"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Choisissez une évaluation pour le fichier ou avertissez les autres "
-"utilisateurs qu'il est invalide..."
+"utilisateurs qu'il est invalide…"
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Rafraîchir"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
-msgstr "En téléchargement, veuillez patienter..."
+msgstr "En téléchargement, veuillez patienter…"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Taille inconnue"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Informations Requises"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "Adresse IP :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Port :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Renseignements complémentaires"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Nom d'utilisateur :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Hachage de l'utilisateur :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Recharge vos fichiers partagés"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Session courante"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Total"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Demandé :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Envois actifs :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Ajouter"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Vitesse de réception"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
-msgstr "Courant"
+msgstr "Actuelle"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
-msgstr "Moyenne en fonctionnement"
+msgstr "Moyenne totale"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Moyenne de la session"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Vitesse d'émission"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Connexions"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Téléchargements actifs"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Connexions actives (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Envois actifs"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Statistiques"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Hachage de l'utilisateur :"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Logiciel client :"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Version du client :"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "Adresse IP :"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID Utilisateur :"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP du serveur :"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Nom du serveur :"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Obfuscation :"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad :"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Transferts avec le client"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Requête actuelle :"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
-msgstr "Vitesse d'émission moyenne :"
+msgstr "Vitesse moyenne d'émission :"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
-msgstr "Vitesse de réception moyenne :"
+msgstr "Vitesse moyenne de réception :"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Envoyé (session) :"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Reçu (session) :"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Envoyé (total) :"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Reçu (total) :"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Scores"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
-msgstr "Modificateur DL/UP :"
+msgstr "Modificateur R/E :"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Identification sécurisée :"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Score (total) :"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Rang dans la file d'attente :"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Score de la file d'attente :"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Pseudo"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - La Mule Linux"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - La Mule multiplateforme"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 "Ceci est le nom que verront les autres utilisateurs lorsqu'ils se "
 "connecteront à vous."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Langue"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Langue : "
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Délai avant l'apparition des infobulles."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Ceci spécifie la langue utilisée dans les commandes."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Options diverses"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Vérifier les nouvelles versions au démarrage"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Si vous activer ceci, aMule vérifiera si de nouvelles versions sont "
 "disponibles au démarrage"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Démarrer minimisé"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Activer ceci minimise immédiatement aMule lors de son lancement."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Confirmation en quittant"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Active la confirmation de sortie d'aMule."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "Confirmation de fermeture d'aMule."
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr "Cacher la fenêtre de l'application lorsque le bouton Fermer est pressé"
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Activer l'icône de barre des tâches"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Ceci Active/Désactive l'icône de barre des tâches."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Icône de réduction en zone de notification"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr ""
-"Activer ceci va faire minimiser aMule dans la boîte à miniatures plutôt que "
-"dans la barre des taches."
+"Activer ceci, va minimiser aMule dans la barre d'état système plutôt que "
+"dans la barre des tâches."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Délais d'apparition des info-bulles en secondes"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Délai d'affichage des info-bulles :"
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "secondes"
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Délai avant l'apparition des info-bulles."
-
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Sélection du navigateur"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Système par Défaut"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Sélectionnez votre navigateur ici"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Navigateur personnalisé :"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Entrer ici le nom de votre navigateur. Pour utiliser un navigateur "
-"personnalisé, choisissez Personnalisé dans le menu déroulant ci-contre."
+"Indiquez le nom de votre navigateur ici. Laissez ce champ vide pour utiliser "
+"le navigateur par défaut du système."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Parcourir"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Ouvrir si possible dans un nouvel onglet"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Ouvrir, lorsque c'est possible, la page Web dans un nouvel onglet plutôt que "
 "dans une nouvelle page"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Lecteur vidéo"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Créer une sauvegarde pour la prévisualisation"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Limites de la bande passante"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Émission"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
-msgstr "Allocation des slots Amis"
+msgstr "Attribution de slot"
+
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Ports"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Port TCP standard du client :"
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Port TCP standard"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
-msgstr "Il s'agit du port standard eD2k et il ne peut être désactivé."
+msgstr "Ceci est le port eD2k standard et ne peut pas être activé."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Port UDP étendu du client :"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "Port UDP pour les requêtes des serveurs (TCP+3) :"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Port UDP étendu (recherche Kad / globale)"
+
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
-"Ce port UDP est utilisé pour les requêtes étendues eD2k et par le réseau Kad"
+"Ce port UDP est utilisé pour les requêtes eD2k étendues et pour le réseau Kad"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "désactiver"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Activer UPnP pour la redirection de port du routeur"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Lier l'Adresse"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Port UDP pour les requêtes serveurs étendues (TCP+3) : 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Nombre maximum de sources par fichier"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "Port TCP UPnP (Facultatif) :"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Limite du disque"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Lier l'adresse locale à une IP (vide pour toutes) :"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Limites de connections"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Nombre maximum de connexions"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Utilisateurs avancés uniquement : Si vous avez plusieurs interfaces réseau, "
+"entrez l'adresse de l'interface à laquelle aMule doit être lié."
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Sources maximales par fichier téléchargé :"
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Connexions simultanées maximales :"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Activer l'UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Port TCP pour l'UPnP :"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Se connecter automatiquement au démarrage"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Reconnecter en cas de déconnexion"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Montrer la bande passante supplémentaire utilisée"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Options du serveur"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Supprimer les serveurs inactifs après"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "essais"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
-msgstr "Mise à jour de la liste des serveurs au démarrage"
+msgstr "Mise à jour automatique de la liste des serveurs au démarrage"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Liste"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
-msgstr "Mettre à jour la liste des serveurs lors de la connexion à un serveur"
+msgstr "Mise à jour de la liste des serveurs dès la connexion à un serveur"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
-msgstr "Mettre à jour la liste des serveurs lors de la connexion à un client"
+msgstr "Mise à jour de la liste des serveurs dès la connexion d'un client"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Utiliser le système de priorité"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Utiliser la vérification du LowID à la connexion"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Connexion sûre"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Se connecter automatiquement seulement sur les serveurs statiques"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Mettre les serveurs ajoutés manuellement en priorité haute"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. actif"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH fait confiance à tous les Hash (non recommandé)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Gestion Intelligente de la Corruption (I.C.H.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Activer"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "I.C.H. avancée se fie aux hachages (non recommandé)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Ajouter les fichiers à télécharger en mode Pause"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Ajouter les fichiers à télécharger en priorité automatique"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Essayer de télécharger la première et la dernière partie en premier"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Ajouter les nouveaux fichiers partagés en priorité automatique"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Essayer de transmettre des parties complètes pour tous les envois"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Démarrer le fichier en Pause suivant quand un se termine"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Démarrer le prochain fichier en pause lorsqu'un fichier se termine"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "De la même catégorie"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Sauver 10 sources pour les fichiers rares (< 20 sources)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "Dans l'ordre alphabétique"
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Espace disque"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Réserver de l'espace disque pour les nouveaux fichiers"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Vérifier l'espace du disque"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
+"Réserve de l'espace du disque pour les nouveaux fichiers, réduisant ainsi la "
+"fragmentation"
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Sélectionner si vous désirer qu'aMule vérifie l'espace de votre disque"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Stoppe les téléchargements lorsque l'espace disponible est atteint"
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Espace disque minimale :"
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr ""
+"Sélectionnez ceci si vous souhaitez qu'aMule vérifie votre espace disque"
 
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "Entrez ici l'espace disque minimum désiré."
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "Réserver de la mémoire pour les nouveaux fichiers"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Sauver 10 sources pour les fichiers rares (< 20 sources)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
-"Réserve de la mémoire (en disque) pour un nouveau fichier, ceci réduit la "
-"fragmentation"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Émission"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Ajouter les nouveaux fichiers partagés en priorité automatique"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Incoming"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Temporaire"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Partagé"
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Dossier de destination des téléchargements"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Dossier des fichiers de téléchargements temporaires"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Dossiers partagés"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Clic droit sur l'icône du répertoire pour un partage récursif)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Partager les fichiers cachés"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Graphiques"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Délais de rafraîchissement : 5 s"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Temps pour la courbe de la moyenne : 100 min"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Échelle du graphique des connexions : 100 "
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Sélectionner les couleurs des statistiques"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Échelle des graphiques de réception :"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Échelle des graphiques d'envoi :"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Couleurs : "
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Fond"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Quadrillage"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
-msgstr "Téléchargement courant"
+msgstr "Téléchargement actuel"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
-msgstr "Téléchargement total moyen"
+msgstr "Téléchargement moyen total"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Téléchargement moyen sur la session"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
-msgstr "Envoi courant"
+msgstr "Envoi actuel"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
-msgstr "Envoi total moyen"
+msgstr "Envoi moyen total"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Envoi moyen sur la session"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Connexions actives"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Barre de vitesse dans l'icône de barre des tâches"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Nœuds Kad actuels"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
-msgstr "Nœuds Kad en fonctionnement"
+msgstr "Nœuds Kad total"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Nœuds Kad pour la session"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Sélectionner"
 
-#: src/muuli_wdr.cpp:2214
-msgid "Number of Client Versions shown (0=unlimited)"
-msgstr "Nombre de versions de client à montrer (0=illimité)"
-
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Capacités de la ligne"
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Arbre"
 
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr ""
-"Note : Ces valeurs sont seulement\n"
-"utilisées pour les statistiques."
+#: src/muuli_wdr.cpp:2000
+msgid "Number of Client Versions shown (0=unlimited)"
+msgstr "Nombre de versions client affichées (0=illimité)"
 
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! AVERTISSEMENT !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Ne changez pas ces réglages à moins de savoir\n"
-"ce que vous faites, vous pourriez facilement\n"
-"faire empirer les choses.\n"
-"\n"
-"aMule fonctionnera bien en ne modifiant pas\n"
-"ces réglages."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Paramètres avancés"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
-msgstr "Nombre maximum de nouvelles connexions / 5 s"
+msgstr "Nombre maximum de nouvelles connexions / 5 secs"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Taille du fichier de tampon : 240000 octets"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Taille de la file d'attente d'envoi : 5000 clients"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervalle de rafraîchissement de la connexion serveur : Désactivé"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Progression de la file d'attente des téléchargements"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Afficher le pourcentage"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Afficher la barre de progression "
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Style de la barre de progression"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Désactiver la mise en veille programmé de l'ordinateur"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Thème à utiliser :"
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Afficher le \"Gestionnaire rapide de lien eD2k \" dans chaque fenêtre."
+
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
+msgstr "Afficher des infos supplémentaires sur les onglets des catégories"
 
-#: src/muuli_wdr.cpp:2351
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
+msgstr "Afficher la version de l'application dans le titre"
+
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Afficher les taux de transfert dans la barre de titre"
+
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Avant le nom de l'application"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Après le nom de l'application"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Afficher la surcharge de la bande passante"
+
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Orientation de la barre d'outils verticale"
+
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "Voir les drapeaux des pays pour les clients"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Fichiers à télécharger en file d'attente"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Afficher le pourcentage de progression"
+
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Afficher la bar de progression"
+
+#: src/muuli_wdr.cpp:2144
 msgid "Flat"
 msgstr "Plat"
 
-#: src/muuli_wdr.cpp:2354
+#: src/muuli_wdr.cpp:2150
 msgid "Round"
 msgstr "Relief"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Support des thèmes"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Activer le support des skins."
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Skin :"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- aucun skin disponible -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Tri des colonnes"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Triage automatique des fichiers (augmente la charge du CPU)"
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr ""
-"Trier automatiquement les fichiers dans la file d'attente de téléchargements "
-"(gourmand en CPU)"
-
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp:2157
 msgid "aMule will sort the columns in your download list automatically"
 msgstr ""
 "aMule triera automatiquement les colonnes dans votre liste de téléchargements"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Paramètres avancés de l'interface graphique"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Affichage rapide du gestionnaire de lien eD2k"
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "Paramètres de Connexion Externe"
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
-msgstr "Afficher des infos supplémentaires sur les onglets des catégories"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "Accepter les connexions externes"
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "Afficher les taux de transfert dans la barre de titre"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP de l'interface d'écoute :"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Orientation de la barre d'outils verticale"
+#: src/muuli_wdr.cpp:2190
+msgid ""
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
+msgstr ""
+"Entrer ici une adresse IP valide dans le format a.b.c.d pour l'interface "
+"d'écoute EC. Un champs vide ou 0.0.0.0 signifiera toutes les interfaces."
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Montrer le numéro du fichier .part avant le nom du fichier."
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "Port TCP :"
+
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
+msgstr "Activer la redirection de ports en UPnP sur le port EC"
+
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Mot de passe"
 
-#: src/muuli_wdr.cpp:2434
+#: src/muuli_wdr.cpp:2221
 msgid "Web server parameters"
 msgstr "Paramètres du serveur Web"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Démarrer amuleweb au lancement"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Port du serveur Web"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Activer la redirection du port UPnP sur le port du serveur web"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Port TCP UPnP du serveur Web"
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Démarrer le serveur web au démarrage"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Intervalle de rafraîchissement (en secondes)"
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Template web"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Activer la compression Gzip"
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Mot de passe administrateur"
 
-#: src/muuli_wdr.cpp:2477
+#: src/muuli_wdr.cpp:2243
 msgid "Enable Low rights User"
 msgstr "Activer l'accès utilisateur sans privilèges"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Mot de passe administrateur"
-
-#: src/muuli_wdr.cpp:2490
+#: src/muuli_wdr.cpp:2249
 msgid "Low rights password"
 msgstr "Mot de passe sans privilèges"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Template web"
-
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "Paramètres de connexion externe (EC)"
-
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "Accepter les connexions externes"
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Activer la redirection de port UPnP sur le port du serveur web"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"Adresse IP des interfaces clientes\n"
-"(vide si aucune)"
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Port TCP UPnP du serveur web (Facultatif)"
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
-msgstr ""
-"Entrer ici une adresse IP valide dans le format a.b.c.d pour l'interface "
-"d'écoute EC. Un champs vide ou 0.0.0.0 signifiera toutes les interfaces."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Intervalle de rafraîchissement (en secondes)"
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Port TCP"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Activer la compression Gzip"
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
-msgstr "Activer la redirection de ports en UPnP sur le port EC"
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr ""
-"Cliquez ici pour appliquer tous les changements effectués dans les "
+"Cliquer ici pour appliquer tous les changements effectués dans les "
 "Préférences."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Annule tous les changements effectués dans les Préférences."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Titre :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Commentaire :"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Répertoire entrant :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Changer la priorité des nouveaux fichiers assignés :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "Ne rien changer"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Choisir la couleur pour cette Catégorie (actuellement sélectionnée) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Afficher le message de bienvenue du serveur à la connexion..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Infos Serveur"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Réinitialiser"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
-msgstr "Cliquez ici pour effacer le journal."
+msgstr "Cliquer ici pour effacer le journal."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Journal d'aMule"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
-"Cliquez ici pour mettre à jour la liste des serveurs à partir de l'URL..."
+"Cliquer ici pour mettre à jour la liste des serveurs à partir de l'URL…"
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
-msgstr "Liste de Serveur"
+msgstr "Liste des serveurs"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5875,44 +3958,56 @@
 "Entrer l'URL d'un fichier server.met et presser le bouton à gauche pour "
 "rafraîchir la liste des serveurs connus."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
-msgstr "Ajouter un serveur manuellement: Nom"
+msgstr "Ajouter un serveur manuellement : Nom"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Entrer ici le nom du nouveau serveur"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP : Port"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Entrer ici l'adresse IP du serveur, avec le format x.x.x.x."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Entrer ici le port du serveur."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
-msgstr "Ajouter manuellement un serveur (remplir les champs à gauche avant)..."
+msgstr "Ajouter manuellement un serveur (remplir les champs à gauche avant)…"
+
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Journal d'aMule"
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Infos Serveur"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "Infos ED2K"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Infos Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
-"Cliquer sur le bouton pour mettre à jour la liste des nœuds depuis l'URL..."
+"Cliquer sur le bouton pour mettre à jour la liste des nœuds depuis l'URL…"
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
-msgstr "Noeuds (0)"
+msgstr "Nœuds (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5920,61 +4015,67 @@
 "Entrer l'URL d'un fichier nodes.dat ici et presser le bouton à gauche pour "
 "mettre à jour la liste des nœuds connus."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Statistiques des nœuds"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
-msgstr "Bootstrap"
+msgstr "Amorçage"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
-msgstr "Nouveau noeud"
+msgstr "Nouveau nœud"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP :"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Port :"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Boostrap depuis\n"
-"les clients connus"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Amorçage depuis les clients connus"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Déconnecter Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "Info eD2k"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Utiliser l'Identification Utilisateur Sécurisée (SUI)"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Il est recommandé d'activer cette option. Vous ne recevrez pas de crédits si "
+"SUI n'est pas activé."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Brouillage de protocole"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Supporter le brouillage de protocole"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
-msgstr "Cette option a activé le brouillage de protocole, "
+msgstr ""
+"Cette option active le brouillage de protocole, cela permet à aMule "
+"d'accepter les connexions brouillées des autres clients."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Utiliser le brouillage pour les connections sortantes"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5982,98 +4083,94 @@
 "Avec cette option, aMule utilise le brouillage de protocole lors des "
 "connections aux autres clients/serveurs."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Accepter seulement les connections brouillées."
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
 msgstr ""
-"Avec cette option, aMule n'accepte que les connections brouillées: Vous "
-"aurez moins de sources, mais tout votre trafic sera brouillé."
-
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Options des fichiers"
+"Avec cette option, aMule n'accepte que les connections brouillées. Vous "
+"aurez moins de sources, mais tout votre trafic sera brouillé"
 
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Tout le monde"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Personne"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Qui peut voir votre liste de fichiers partagés :"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Qui peut voir mes fichiers partagés :"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Indique qui peut voir votre liste de fichiers partagés."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Filtrage des IP"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
-msgstr "Filtrage des clients."
+msgstr "Filtrage des clients"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Activer le filtrage des clients selon les IP contenues dans le fichier ~/."
 "aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
-msgstr "Filtrage des serveurs."
+msgstr "Filtrage des serveurs"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Active le filtrage des serveurs selon les IP contenues dans le fichier ~/."
 "aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Recharger la liste"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 "Recharge la liste des IP à filtrer à partir du fichier ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL :"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Mettre à jour maintenant"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Mise à jour d' IPFilter au démarrage"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Niveau de filtrage :"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Toujours filtrer les IPs LAN"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Prise en charge paranoïaque des IPs qui ne se correspondent pas"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6081,11 +4178,11 @@
 "Rejette le paquet si l'IP du client est différente de l'ip d'où le paquet "
 "est envoyé. A utiliser avec prudence."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Utiliser un ipfilter.dat système si disponible"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -6093,23 +4190,11 @@
 "S'il n'y a pas de fichier ipfilter.dat local, autoriser l'utilisation d'un "
 "fichier ipfilter système."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Utiliser l'identification utilisateur sécurisée (SUI)"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Il est recommandé d'activer cette option. Vous ne recevrez pas de crédits si "
-"SUI n'est pas activé."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
-msgstr "Activer Online-Signature"
+msgstr "Activer la Signature En Ligne"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6117,854 +4202,1329 @@
 "Active l'écriture du fichier de signature en ligne, qui peut-être utilisé "
 "par des applications extérieurs pour créer des signatures, etc."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Fréquence de mise à jour (Secondes) :"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 "Change la fréquence des mises à jour de la signature en ligne (en secondes)."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Répertoire du fichier Online Signature :"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Sauver le fichier de signature en ligne dans :"
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "Cliquer ici pour sélectionner le répertoire contenant le fichier de "
 "signature en ligne."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Activer/Désactiver"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
-msgstr "Filtrer les messages entrant (sauf le Chat en cours) :"
-
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Options de filtrage :"
+msgstr "Filtrer les messages entrant (sauf la discussion en cours) :"
 
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtrer tous les messages"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtrer les messages des gens qui ne sont pas sur votre liste d'amis"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtrer les messages des clients inconnus"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrer les messages contenant (utiliser ',' comme séparateur) :"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
-"ajouter ici les mots qu'aMule doit filtrer : bloquage des messages les "
+"ajouter ici les mots qu'aMule doit filtrer : blocage des messages les "
 "contenant"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Afficher les messages reçus dans le journal"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Commentaires"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrer les commentaires contenant (utiliser ',' comme séparateur) :"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Connexion automatique au serveur sans proxy"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Activer l'authentification"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Active/Désactive l'authentification par nom d'utilisateur/mot de passe"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Nom d'utilisateur :"
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Nom d'utilisateur pour se connecter au proxy"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Mot de passe :"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Mot de passe pour se connecter au proxy"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Activer le Proxy"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Active/Désactive le support proxy"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Type de proxy :"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Type de proxy auquel vous êtes connecté"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Hôte du proxy :"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Nom de l'hôte du proxy"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Port du proxy :"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Numéro du port du proxy"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Authentification"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Activer l'authentification"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Active/Désactive l'authentification par nom d'utilisateur/mot de passe"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Nom d'utilisateur pour se connecter au proxy"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Mot de passe :"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Mot de passe pour se connecter au proxy"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Connexion automatique au serveur sans proxy"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Se connecter à :"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Connexion distante à aMule"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Se rappeler de ces réglages"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
-msgstr "Activer le logging du mode de debogage bavard."
+msgstr "Activer l'historique du mode de débogage bavard."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Catégories des messages :"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "En attente…"
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Ajouter des fichier à importer"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
-msgstr "Réessayer avec celui sélectionné"
+msgstr "Réessayer avec la sélection"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
-msgstr "Supprimer celui sélectionné"
+msgstr "Supprimer la sélection"
+
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr "Types d'événements"
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+"Statistiques et clients en attente pour le(s) fichier(s) sélectionné(s) : "
+"Session / Tous les temps"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Envois Actifs"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "Pourcentage du total de fichiers"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Types d'évènements"
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Tous les fichiers"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Fichiers sélectionnés"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Envois actifs seulement"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Afficher les clients pour"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Recharger :"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Recharge vos fichiers partagés"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Envoyer"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Envoie le message spécifié."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Ferme cette session de discussion."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Se connecter à n'importe quel serveur et/ou Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Fenêtre des réseaux"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Fichiers partagés"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Fenêtre de Recherche"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Désactivé [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Fenêtre des Transferts"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "octet"
+msgstr[1] "octets"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Fenêtre des Fichiers Partagés"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "ko"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Fenêtre des Messages"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "To"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Fenêtre des Statistiques"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Fenêtre des Préférences"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nouvelle Catégorie"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Choisissez un répertoire pour les fichiers entrants"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Vous devez indiquer un nom pour cette catégorie !"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "octet/sec"
+msgstr[1] "octets/sec"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Vous devez indiquer un chemin pour cette catégorie !"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "Mo/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"Échec de la création du répertoire de réception pour cette catégorie. "
-"Indiquez un chemin valide s'il vous plaît !"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "s"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "min"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "heures"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Jours"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "Tous"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "tous les autres"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Incomplet"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Arrêté"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Vidéo"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Archive"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Texte"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Actif"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Extension '%s' inconnue pour la commande '%s'.\n"
+msgid "Using config dir: %s"
+msgstr "Utilisation du répertoire de config : %s"
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Attente de la mort du processus de conversion du fichier .part…"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Commande '%s' inconnue\n"
+msgid "Importing %s: %s"
+msgstr "Importation %s : %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Lecture du répertoire temporaire"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
 msgstr ""
-"\n"
-"Cette commande ne prend pas d'argument.\n"
+"Récupération des informations de base depuis le téléchargement dans un "
+"fichier"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Création du fichier de destination"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
 msgstr ""
-"\n"
-"Cette commande nécessite un argument.\n"
+"Chargement des données depuis un ancien fichier de téléchargement (%u de %u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr ""
+"Sauvegarde du bloc de données dans un nouveau fichier de téléchargement "
+"unique (%u de %u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Récupérations des informations du fichier de téléchargement source"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Ajout du téléchargement et sauvegarde du nouveau fichier .part"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Importer les fichiers .part"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "État"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Hachage du fichier"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Disque : %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Cette commande est incomplète, vous devez utilisez une des extensions ci-"
-"dessous.\n"
+"Choisissez un dossier où chercher les téléchargements temporaires ! (les "
+"sous-dossiers seront inclus)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Extensions disponibles :\n"
+"Voulez-vous que les fichiers sources d'une importation de téléchargement "
+"réussie soient supprimées ?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Commandes disponibles :\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Supprimer les sources ?"
+
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "Erreur : Impossible de créer le fichier .part"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Tentative de chargement de la sauvegarde du fichier met depuis %s"
+
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "ERREUR : Échec de l'ouverture du fichier part.met : %s ==> %s"
+
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "ERREUR : Le fichier part.met est de taille nulle : %s ==> %s"
+
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "ERREUR : Version du fichier part.met invalide: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"\n"
-"Toutes les commandes sont insensibles à la casse.\n"
-"Tapez '%s <command>' pour avoir des informations détaillées sur <command>.\n"
+"Erreur : %s (%s) est corrompu (mauvaises étiquettes : %s), impossible de "
+"charger le fichier."
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Quitte l'application."
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+msgstr ""
+"ERREUR : %s (%s) est corrompue (tagcount erroné), impossible de charger le "
+"fichier."
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Montrer l'aide."
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Tentative de récupération des infos du fichier…"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr ""
+"Récupération du fichier anonyme - Essai de récupération sous le nom "
+"RecoveredFile.dat"
+
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+"Récupération de toutes les infos du fichier :D - Essayons de les utiliser…"
+
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Impossible de récupérer les infos du fichier :("
+
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Échec de l'ouverture de %s (%s)"
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "AVERTISSEMENT :  %s a pu être corrompu (%i)"
+
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "ERREUR lors de la sauvegarde du fichier .part : %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "Erreur d'E/S lors de la sauvegarde du fichier .part :"
+
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Impossible de récupérer la taille de '%s' - utilisation du fichier %s."
+
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' est apparemment de taille nulle - Utilisation du fichier %s."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Échec de la sauvegarde du fichier part.met.seeds pour %s"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "%i source seed sauvegardé pour le fichier .part : %s (%s)"
+msgstr[1] "%i source seeds sauvegardés pour le fichier .part : %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Le fichier .part %s (%s) n'a pas de fichier seeds"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Le fichier .part %s (%s) a un fichier seeds vide"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr ""
+"Erreur lors de la lecture du fichier seeds du fichier .part (%s - %s) : %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Une partie corrompue trouvée (%d) dans %d parties du fichier %s - "
+"FileResultHash |%s| FileHash |%s|"
+msgstr[1] ""
+"Une partie corrompue trouvée (%d) dans %d partie du .part %s - "
+"FileResultHash |%s| FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Partie complète (%i) trouvée dans %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Ré-hachage de %s terminé"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Erreur inattendue lors de la finalisation de %s. Fichier mis en pause"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Téléchargement terminé : %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Fichier supprimé : %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"Pour avoir de l'aide sur une commande, tapez 'help <command>'.\n"
-"Pour avoir la liste complète des commandes, tapez 'help'.\n"
+"AVERTISSEMENT : Impossible de calculer le hachage de la partie téléchargée. "
+"Ensemble de hachage incomplet pour '%s'"
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Utilisez '%s' pour la liste des commandes\n"
-"\n"
+"ERREUR : Impossible de calculer le hachage de la partie téléchargée - "
+"Ensemble de hachage incomplet pour (%s). Ceci ne devrait jamais arriver"
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Erreur de syntaxe !"
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
+msgid ""
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
+msgstr ""
+"EOF lors du hachage du fichier .part téléchargé %u avec une longueur %u (max "
+"%u) du fichier .part '%s' avec une longueur %u : %s"
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
-"Erreur durant le traitement de la commande - Cela ne devrait jamais "
-"arriver ! Rapportez le bogue, s'il vous plaît\n"
+"AVERTISSEMENT : Pas assez d'espace disque disponible ! Mise en pause du "
+"fichier : %s"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Cette commande ne devrait pas avoir de paramètres."
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "La partie téléchargée %i est corrompue dans le fichier : %s"
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Cette commande nécessite un paramètre."
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH : Partie corrompue %i récupérée pour %s -> Octets sauvés : %s"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Argument invalide."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "En cours d'allocation"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Cette commande est incomplète."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Espace disque insuffisant"
+
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Téléchargé"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:4003
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Tapez '%s' pour avoir plus d'aide.\n"
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "ERREUR : Impossible d'ouvrir fichier .part : '%s'"
+
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Système par défaut"
+
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albanais"
+
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabe"
+
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturien"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Basque"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgare"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Catalan"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Chinois (Simplifié)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Chinois (Traditionnel)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Croate"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Tchèque"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Danois"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Hollandais"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Anglais (U.K.)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estonien"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finlandais"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Français"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galicien"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Allemand"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Grec"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hébreux"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Hongrois"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italien"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italien (Suisse)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japonais"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Coréen"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lituanien"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvégien (Nynorsk)"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polonais"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugais"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugais (Brésilien)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Russe"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Slovène"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Espagnol"
 
-#: src/ExternalConnector.cpp:362
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Suédois"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turque"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ukrainien"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Changer de Langue"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr "Il n'y a pas de traductions installés pour aMule"
+
+#: src/Preferences.cpp:771
+msgid "No languages available"
+msgstr "Pas de langues disponibles"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "pas d'option disponible"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Catégorie invalide trouvée, on passe"
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
+"Le port TCP ne peut pas dépasser 65532 car le socket UDP du serveur sera à "
+"TCP+3"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Cette version est %s %s %s\n"
+msgid "Default port will be used (%d)"
+msgstr "Le port par défaut sera utilisé (%d)"
 
-#: src/ExternalConnector.cpp:364
+#: src/Preferences.cpp:1790
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Cette version est %s %s\n"
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Abandon d'un répertoire partagé inexistant : %s"
+
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Connexion"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Répertoires"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Serveurs"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Fichiers"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Sécurité"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Interface"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Filtres"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Contrôles à distance"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Signature en ligne"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Avancé"
 
-#: src/ExternalConnector.cpp:395
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Événements"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Débogage"
+
+#: src/PrefsUnifiedDlg.cpp:249
 msgid ""
-"\n"
-"Creating client...\n"
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
-"\n"
-"Création du client en cours...\n"
+"Les variables suivantes seront remplacées : \n"
+"    %PARTFILE - chemin complet vers le fichier\n"
+"    %PARTNAME - nom du fichier seulement"
 
-#: src/ExternalConnector.cpp:418
-#, c-format
+#: src/PrefsUnifiedDlg.cpp:289
 msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
 "\n"
-"Ok, exiting %s...\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
 msgstr ""
+"Ne changez pas ces réglages à moins de savoir\n"
+"ce que vous faites, vous pourriez facilement\n"
+"faire empirer les choses.\n"
 "\n"
-"Ok, fin de %s...\n"
+"aMule fonctionnera bien en ne modifiant pas\n"
+"ces réglages."
 
-#: src/ExternalConnector.cpp:424
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Échec à la connexion de Cfg au widget avec l'ID %d et la clé %s"
+
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
+"Échec du transfert de données depuis Cfg vers le widget avec l'ID %d et la "
+"clé %s"
+
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Type de proxy auquel vous êtes connecté"
+
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
+"Échec du transfert de données depuis le widget vers Cfg avec l'ID %d et la "
+"clé %s"
+
+#: src/PrefsUnifiedDlg.cpp:589
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
+"aMule must be restarted to enable these changes:\n"
 "\n"
-"Exiting...\n"
 msgstr ""
-"Connexion impossible sans mot de passe.\n"
-"Vous devez spécifier un mot de passe, soit dans le fichier de configuration, "
-"soit sur la ligne de commande ; ou l'entrer lorsque l'on vous le demande.\n"
+"aMule doit être redémarré pour activer ces changements : \n"
 "\n"
-"Fin d'exécution...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Montre ce texte d'aide."
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- Port TCP changé.\n"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Hôte où aMule fonctionne. (défaut : localhost)"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- Port UDP changé.\n"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Port d'aMule pour les connexions externes (EC). (défaut : 4712)"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- Port de connexion externe changé.\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- Consentement de connexion externe changé.\n"
+
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- Interface de connexion externe changé.\n"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Mot de passe pour les connexions externes (EC)."
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"Votre liste de serveur pour la mise à jour automatique est vide.\n"
+"'Mise à jour automatique au démarrage de la liste des serveurs' va être "
+"désactivée."
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Configuration lue depuis le fichier."
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Vous avez activé les connexions externes mais vous n'avez pas spécifié de "
+"mot de passe valide.\n"
+"Les connexions externes ne pourront pas être activées tant qu'un mot de "
+"passe valide n'est pas spécifié."
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Ne pas afficher de sortie sur stdout."
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Langue changé.\n"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Mode bavard - montre aussi les messages de debogage."
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Dossier temporaire changé.\n"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Change la locale du programme (langue)."
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- Réseau ED2K activé.\n"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
 msgstr ""
-"Écrit les options de la ligne de commande dans le fichier de configuration."
+"Les réseaux eD2k et Kad sont désactivés.\n"
+"Vous ne pourrez pas vous connecter tant que vous n'activerez pas au moins "
+"l'un des deux."
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
 msgstr ""
-"Créé le fichier de configuration à partir du fichier de configuration "
-"d'aMule."
+"Kad ne démarrera pas si votre port UDP est désactivé.\n"
+"Activez le port UDP ou désactivez Kad."
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Affiche la version du programme."
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Vous DEVEZ redémarrer aMule maintenant.\n"
+"Si vous ne le faites pas, ne vous plaignez pas si des bogues surviennent.\n"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Fichier de Crédits chargé, il y a %u client connu"
-msgstr[1] "Fichier de Crédits chargé, il y a %u clients connus"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Votre liste de mise à jour auto des serveurs est vide.\n"
+"Entrez s'il vous plaît au moins une URL qui pointe sur un fichier server.met "
+"valide.\n"
+"Cliquez sur le bouton \"Liste\" à coté de cette case pour entrer une URL."
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Crédits expirés pour %u client !"
-msgstr[1] " - Crédits expirés pour %u clients !"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Fichiers temporaires"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Pas de fichier 'cryptkey.dat' trouvé, création."
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Fichiers réceptionnés"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"ERREUR: le daemon aMule ne peut être utilisé quand les connexions externes "
-"dont désactivées. Pour activer les Connexions Externes, utilisez soit un "
-"aMule normal, démarrez amuled avec l'option --ec-config ou passez la clé "
-"\"AcceptExternalConnections\" à 1 dans le fichier ~/.aMule/amule.conf"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Signatures En Ligne"
 
-#: src/amuled.cpp:750
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "ERROR: %s"
-msgstr "Erreur : %s"
+msgid "Choose a folder for %s"
+msgstr "Choisir un dossier pour %s"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Débannir"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Afficher les envois"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Montrer la file d'attente"
-
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Afficher les clients"
-
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Sélectionner la vue"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Programme du client"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Attendu"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Temps d'émission"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Émission/Réception"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "État distant"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR : %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Priorité du fichier"
-
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Score"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Chercher un lecteur vidéo"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Demandé"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Choisir un navigateur"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Vu pour la dernière fois"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Placé en file d'attente"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "Exécutable%s"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "État de l'émission"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Éditer la liste des serveurs"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Transféré"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Ajoutez ci-dessous des URL pour télécharger des fichiers server.met.\n"
+"Seulement une URL par ligne."
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "État de la réception"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Délais de rafraîchissement : %d seconde"
+msgstr[1] "Délais de rafraîchissement : %d secondes"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Reçus"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Hachage de l'utilisateur"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Chiffré"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Cacher les fichiers partagés."
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Temps pour le graphe des moyennes : %d minute"
+msgstr[1] "Temps pour le graphe des moyennes : %d minutes"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Détails du client"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Échelle du graphique des connexions : %d"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Activé"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Taille du tampon de fichiers : %d octet"
+msgstr[1] "Taille du tampon de fichiers : %d octets"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Supporté"
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Taille de la fille d'attente d'émission : %d client"
+msgstr[1] "Taille de la fille d'attente d'émission : %d clients"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Non supporté"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Intervalle de rafraîchissement de la connexion serveur : %d minute"
+msgstr[1] "Intervalle de rafraîchissement de la connexion serveur : %d minutes"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Désactivé"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Intervalle de rafraîchissement de la connexion serveur : Désactivé"
+
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "désactivé"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f Ko/s"
+msgid "Execute command on '%s' event"
+msgstr "Exécuter la commande lors de l'événement '%s'"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Incomplet"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Activer l'exécution de la commande sur le noyau"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Mauvais garçon"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Commande du noyau :"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Vérification - OK"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Activer l'exécution de la commande sur l'interface graphique"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Non disponible"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Commande de l'interface graphique :"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR : %u)"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Les variables suivantes seront remplacées :"
 
-#: src/SearchDlg.cpp:527
+#: src/SearchDlg.cpp:506
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 "La taille minimum doit être inférieur à la taille maximum. Taille maximum "
 "ignorée."
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
 msgid "Search warning"
 msgstr "Avertissement dans la recherche"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Pas de limite"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Principal"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Menu aMule"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Une recherche Kad ne peut pas être faite si Kad n'est pas lancé"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Vitesse limites:"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "La recherche eD2k ne peut être établie si eD2k n'est pas connecté"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "Émission : Aucune"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Erreur imprévue lors de la tentative de recherche Kad : "
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "Émission : %u"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "ID du fichier"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "Réception : Aucune"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Fichier"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "Réception : %u"
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Télécharger dans la catégorie"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/SearchListCtrl.cpp:639
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Vitesse de téléchargement : %.1f"
+msgid "Get %s for this file"
+msgstr "Obtenir %s pour ce fichier"
 
-#: src/MuleTrayIcon.cpp:370
-#, c-format
-msgid "Upload speed: %.1f"
-msgstr "Vitesse d'envoi : %.1f"
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Chercher les fichiers liés (eD2k, serveur local)"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Informations Client"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Marquer comme fichier connu"
 
-#: src/MuleTrayIcon.cpp:380
-#, c-format
-msgid "Nickname: %s"
-msgstr "Pseudo : %s"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Copier le lien eD2k dans le presse-papiers"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Aucun pseudo sélectionné !"
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Annulé"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Nouveau"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID Client : "
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Échec de la connexion aux serveurs brouillés listés. Nouvel essai sans "
+"brouillage."
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Nom du serveur : "
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Échec de la connexion aux serveurs listés. Nouvel essai."
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP du serveur : "
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "Le réseau e2Dk est désactivé dans les préférences, pas de connexion."
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP : %s"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
+"Aucun serveur valide auquel se connecter n'a été trouvé dans la liste des "
+"serveurs"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "TCP port: %d"
-msgstr "Port TCP : %d"
-
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "Port TCP : Pas prêt"
+msgid "Connected to %s (%s:%i)"
+msgstr "Connecté à %s (%s : %i)"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/ServerConnect.cpp:274
 #, c-format
-msgid "UDP port: %d"
-msgstr "Port UDP : %d"
-
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "Port UDP : Pas prêt"
-
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Online Signature : activée"
+msgid "Connection established on: %s"
+msgstr "Connexion établie sur : %s"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Online Signature : désactivée"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Erreur fatale lors de la tentative de connexion. La connexion Internet est "
+"probablement coupée"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/ServerConnect.cpp:350
 #, c-format
-msgid "Shared files: %d"
-msgstr "Fichiers partagés : %d"
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Connexion à %s (%s : %i) perdue"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/ServerConnect.cpp:360
 #, c-format
-msgid "Queued clients: %d"
-msgstr "Clients en file d'attente : %d"
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s : %i) semble être indisponible."
 
-#: src/MuleTrayIcon.cpp:476
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Total DL: %s"
-msgstr "Reçu au total : %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s : %i) semble être plein."
 
-#: src/MuleTrayIcon.cpp:483
+#: src/ServerConnect.cpp:392
 #, c-format
-msgid "Total UL: %s"
-msgstr "Émis au total : %s"
-
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Vitesse limite d'envoi"
-
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Vitesse limite de téléchargement "
-
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Cacher aMule"
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] ""
+"Nouvelle tentative de connexion automatique au serveur dans %d seconde"
+msgstr[1] ""
+"Nouvelle tentative de connexion automatique au serveur dans %d secondes"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Afficher aMule"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Connexion perdue"
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:419
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Début de la session de chat : %s (%s : %u) - %s %s"
-
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Connecté au Client ***"
-
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Connexion au Client ***"
-
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Échec de la connexion au client / Connexion perdue ***"
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Échec de la connexion à %s (%s : %i)."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Fermer l'onglet"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "ERREUR : Socket invalide lors de la vérification du délai"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Fermer tous les onglets"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Délai d'attente de la connexion à %s (%s : %i) dépassé."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Fermer les autres onglets"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Réception d'un résultat DNS en retard, on jette."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Chargement du fichier server.met : %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Le fichier server.net est introuvable !"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Échec du chargement de fichier server.met '%s', format inconnu."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Échec de l'ouverture du fichier server.met !"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
-"Le fichier server.met est corrompu, un tag de version invalide à été "
-"trouvé : 0x%x, taille %i"
+"Le fichier server.met est corrompu, une étiquette invalide de version "
+"invalide à été trouvé : 0x%x, taille %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "%i serveur trouvé dans server.met"
 msgstr[1] "%i serveurs trouvés dans server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d serveur ajouté"
 msgstr[1] "%d serveurs ajoutés"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Erreur : le fichier 'server.met' est corrompu :"
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "Erreur d'E/S lors de la lecture de 'server.met' :"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Serveur non ajouté : [%s : %d] n'a pas un port valide."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Serveur non ajouté : l'IP de [%s : %d] a été filtrée ou est invalide."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Serveur non ajouté : un serveur avec une IP : Port [%s : %d] correspondant a "
 "été trouvée dans la liste."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Serveur ajouté : serveur à [%s : %d] utilisant le nom '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6972,50 +5532,57 @@
 "Vous êtes connecté au serveur que vous tentez de supprimer. Déconnectez-vous "
 "d'abord s'il vous plaît."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Échec de l'ouverture de '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Échec de l'enregistrement de server.met !"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "URL invalide"
 
-#: src/ServerList.cpp:805
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Finished to download the server list from %s"
+msgid "Finished downloading the server list from %s"
 msgstr "Téléchargement terminé de la liste de serveur depuis %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Échec du téléchargement de la liste des serveurs depuis %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
 msgstr ""
-"Aucune liste d'adresse de serveurs trouvé dans 'addresses.dat'. S’il vous "
-"plaît coller une liste valide d'adresse de serveurs dans ce fichier pour la "
-"mise à jour automatique de votre liste de serveurs"
+"Aucune entrée trouvée d'adresses de liste de serveurs dans 'addresses.dat'. "
+"Veuillez coller une liste de serveurs valide dans ce fichier afin de mettre "
+"à jour automatiquement votre liste de serveurs."
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Démarre le téléchargement de la liste de serveur depuis %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
-"AVERTISSEMENT : l'URL spécifié pour la mise à jour automatique des serveurs "
-"est invalide: %s"
+"AVERTISSEMENT : URL invalide indiquée pour la mise à jour automatique des "
+"serveurs : %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
-msgstr "Pas d'URL valide pour l'auto-update des serveurs dans adresses.dat"
+msgstr ""
+"Pas d'URL valide pour la mise à jour automatique des serveurs dans adresses."
+"dat "
+
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Échec du téléchargement de la liste des serveurs depuis %s"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -7023,324 +5590,2392 @@
 "Le serveur local est filtré par les filtres IP, reconnexion à un autre "
 "serveur !"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Échec de l'exécution de la commande `%s' lors de l'évènement `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Nom du serveur"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Adresse"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Port"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Description"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Temps de réponse"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Utilisateurs"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Statique"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Version"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"La langue à été remise par Défaut à cause d'un changement dans la "
-"configuration. Désolé."
+"Vous êtes connecté au serveur que vous tentez de supprimer. Déconnectez-vous "
+"d'abord s'il  vous plaît . Le serveur n'a PAS été supprimé."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Nom inconnu)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Êtes-vous sûr de vouloir supprimer le serveur statique %s"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Serveurs (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Serveur"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Connexion au serveur"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Marquer le serveur comme statique"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Marquer le serveur comme non statique"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Marquer les serveurs comme statiques"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Marquer les serveurs comme non statiques"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Supprimer le serveur"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Supprimer les serveurs"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Supprimer tous les serveurs"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Copier les liens eD2k dans le presse-papiers"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Reconnexion au serveur"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Êtes-vous sûr de vouloir supprimer tout les serveurs ?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Êtes-vous sûr de vouloir supprimer le serveur sélectionné ?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Êtes-vous sûr de vouloir supprimer les serveurs sélectionnés ?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "ERREUR : %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "AVERTISSEMENT : %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Nouvel ID client : %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "AVERTISSEMENT : Vous avez reçu un Low-ID !"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
-"Vous n'avez pas de serveurs dans votre liste de serveurs.\n"
-"Voulez vous qu'aMule télécharge une nouvelle liste maintenant ?"
+"\tLa raison la plus probable est que vous êtes derrière un pare-feu ou un "
+"router."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Téléchargement de la liste de serveurs."
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tPour plus d'informations, consultez http://wiki.amule.org"
 
-#: src/amule.cpp:846
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Info serveur inconnue reçue ! - trop court"
+
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "web server running on pid %d"
-msgstr "serveur web fonctionnant sur pid %d"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "%d nouveau serveur reçu"
+msgstr[1] "%d nouveaux serveurs reçus"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Sauvegarde de la liste des serveurs terminée."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Le serveur a rejeté la dernière commande"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Faux paquet reçu depuis le serveur : %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
-"Vous avez demandé à démarrer le serveur Web au démarrage, mais le binaire "
-"amuleweb ne peut pas être exécutée. S’il vous plaît installer le paquet "
-"contenant le serveur web amule, ou compiler amule en utilisant --enable-"
-"webserver et exécutez make install"
+"Erreur non-prise en compte lors du traitement du paquet reçu du serveur : %s"
 
-#: src/amule.cpp:937
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Impossible de lier les ports à l'adresse spécifiée : %s"
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr ""
+"Ne peut créer de processus pour la résolution DNS pour se connecter à %s"
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:725
 #, 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"
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "L'IP du serveur %s (%s) est filtrée. Pas de connexion."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "utilisation du brouillage de protocole"
 
-#: src/amule.cpp:970
+#: src/ServerSocket.cpp:744
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Connexion à %s (%s - %s : %i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
-"Le port %u n'est pas disponible !\n"
-"\n"
-"Ceci signifie que vous serez LowID.\n"
-"\n"
-"Vérifiez votre réseau pour être sûr que le port est ouvert en sortie et en "
-"entrée."
+"Ne peut résoudre le nom DNS pour le serveur %s : Impossible de se connecter !"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Échec de la création du fichier OnlineSig"
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Serveur non ajouté : Pas d'IP ni de nom d'hôte donné."
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Échec de la création du fichier aMule OnlineSig"
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Serveur non ajouté : Port du serveur invalide."
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Statut eD2k :"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Statut de Kademlia :"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "Exécution en mode LAN"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "En marche"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Statut :"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "État de la connexion :"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
-"La localisation choisie semble ne pas être installer sur votre machine. "
-"(Note : Je tente de la forcer quant même)"
+"Derrière un pare-feu - Ouvrez le port TCP %d sur votre routeur ou pare-feu"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "État de la connexion UDP :"
 
-#: src/amule.cpp:1308
+#: src/ServerWnd.cpp:219
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "C'est la première fois que vous lancez aMule %s"
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr ""
+"Derrière un pare-feu - Ouvrez le port UDP %d sur votre routeur ou pare-feu"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Cette version est une version de test, mis à jour quotidienne, et\n"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "État du pare-feu : "
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Pas de pote requis - port TCP ouvert"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Pas de pote requis - port UDP ouvert"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Pas de pote"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Connexion au pote"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Connecté au pote à %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Sources indexées :"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Mots clés indexés :"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Notes indexées :"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Charge indexée :"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Nombre moyen d'utilisateurs :"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Nombre moyen de fichiers :"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "À l'arrêt"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Ajout du fichier %s aux partages"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "%i fichier partagé connu trouvé"
+msgstr[1] "%i fichiers partagés connus trouvés"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "%i fichier partagé connu trouvé, %i inconnu"
+msgstr[1] "%i fichiers partagés connus trouvés, %i inconnus"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "ERREUR : Tentative de partage %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Répertoire partagé non trouvé, on passe : %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Aucun fichier partageable trouvé dans le répertoire : %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Nom d'Utilisateur"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Vitesse de Réception"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Vitesse d'Émission"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Parties Disponibles"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+msgid "Upload Status"
+msgstr "État de l'émission"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "État de la réception"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Origine"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Nom du fichier local"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+msgid "Shares File List"
+msgstr "Partage de la liste des fichiers"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Demandes"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Demandes acceptées"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Données transférées"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Taux de partage"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Parties obtenues"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Sources complètes"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Chemin du répertoire"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Ajouter un Commentaire/Note"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Éditer un Commentaire/Note"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Renommer"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Ajouter des fichiers de la collection à la liste de transferts"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Copier le &lien magnétique dans le presse-papiers"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Copier le lien eD2k dans le presse-papiers (&Source)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
-"nous ne fournissons aucune garantie que cela n'endommagera rien, brûlera "
-"votre maison,\n"
+"Copier le lien eD2k dans le presse-papiers (Source) (Avec &options de "
+"chiffrage)"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Copier le lien eD2k dans le presse-papiers (Nom d'&hôte)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+"Copier le lien eD2k dans le presse-papiers (Nom d'hôte) (Avec options de "
+"&chiffrage)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Copier le lien eD2k dans le presse-papiers (Info &AICH)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Vous devez être en HighID pour créer un lien valide"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Fichiers partagés (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[Fichier .part]"
+
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Nom du fichier à distance"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Données Émises (Session (Total)) : %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Surcharge Totale (Paquets) : %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Surcharge Requête Fichier (Paquets) : %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Surcharge Échange de Source (Paquets) : %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Surcharge Serveur (Paquets) : %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Surcharge Kad (Paquets) : %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Surcharge Crypt (UDP) : %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Envois Actifs : %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Envois en Attente : %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Sessions d'envois réussies au total : %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Sessions d'envois qui ont échouées au total : %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Temps d'envois moyen : %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Données Reçues (Session (Total)) : %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Sources Trouvées : %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Téléchargements Actifs (parties) : %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Rapport UL : DL pour la Session (Total) : %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Vitesse moyenne de réception (Session) : %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Vitesse moyenne d'envoi (Session) : %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Vitesse maximale de réception (Session) : %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Vitesse maximale d'émission (Session) : %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Reconnexions : %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Temps depuis le premier transfert : %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Connecté au serveur depuis : %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Connexions actives (estimation) : %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Limite max de connexion atteinte : %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Moyenne de connexions (estimation) : %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Pics de connexions (estimation) : %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Clients"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Inconnu : %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Filtré : %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Banni : %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Total : %i Connus : %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Serveurs en fonctionnement : %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Serveurs non-connectés : %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Total : %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Serveurs supprimés : %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Serveurs filtrés : %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Utilisateurs sur les serveurs en fonctionnement : %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Fichiers sur les serveurs en fonctionnement : %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Total des utilisateurs : %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Total des fichiers : %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Occupation du Serveur : %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Nombre de Fichiers Partagés : %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Taille totale des Fichiers Partagés : %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Taille moyenne des fichiers : %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Système d'Exploitation"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Non reçu"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Connexions actives (1 : %u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Non disponible"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Jamais"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "La commande '%s' avec le PID '%d' s'est terminée avec le code '%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Exécute <str> et quitte."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Format d'IP invalide. utiliser xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
+msgid ""
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
+msgstr ""
+"Cette commande nécessite un argument. Arguments valides : 'all', nom de "
+"fichier ou un nombre.\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Traitement par hachage :"
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Traitement par nom de fichier :"
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
-"ou tuera votre chien. Mais ça *devrait* être à peu près sûr quand même.\n"
+"Cette commande nécessite un argument. Arguments valides : un hachage de "
+"fichier.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Nombre invalide\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr ""
+"Ce n'est pas un hachage valide (la longueur devrait être exactement 32 "
+"caractères)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "La requête a échouée avec une erreur inconnue."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "L'opération s'est déroulée avec succès."
+
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
+msgstr "La requête à échouée avec l'erreur suivante : %s"
+
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Statut du filtrage IP pour les clients : %s.\n"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "Arrêt"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "Marche"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Le filtrage IP pour les serveurs est %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Le niveau actuel d'IPFilter est %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Limites de la bande passante : E : %u ko/s, R : %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Connecté à %s %s %s"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Connexion en cours"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "derrière un pare-feu"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "OK"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"Les options suivantes ont été changées  dans cette version pour des raisons "
-"de sécurité :\n"
+"\n"
+"Réception : \t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Activation du brouillage de protocole pour les connections entrantes et "
-"sortantes.\n"
+"Émission : \t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Désactivation de la mise à jour de la liste de serveurs depuis les autres "
-"serveurs ou les clients.\n"
+"Clients dans la file d'attente : \t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Pour plus d'informations sur les raisons de ces changements, cherchez \n"
-"dans le wiki d'aMule à \"fake servers\" sur http://wiki.amule.org\n"
-"Il est important que vous enleviez les serveurs 'bidons' de votre liste de "
-"serveurs pour qu'aMule fonctionne correctement."
+"Nombre total de sources : \t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Nombres de résultats de la recherche : %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Progrès de la recherche : %u %% \n"
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Progrès de la recherche indisponibles"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Réponse inconnue reçue du serveur, OpCode = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Montrer de courtes informations sur le statut."
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr ""
+"Montrer le statut de la connexion, vitesses d'émission/réception, etc.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Montrer l'arbre des statistiques complet."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Accessoirement, un nombre entre 0 et 255 peut être passé comme argument à "
+"cette\n"
+"commande, ce qui limitera le nombre de réponse par sous-arbre de versions "
+"des clients\n"
+"affichés. Passer 0 ou ne rien mettre signifie 'illimité'.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Exemple: 'statistics 5' montrera seulement les 5 premières versions pour "
+"chaque type de client.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Fermer aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Arrêter le noyau distant actif (amule/amuled).\n"
+"Ceci coupera aussi le clien texte, puisqu'il est\n"
+"inutilisable sans noyau actif.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Recharge l'objet donné."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Recharge la liste des fichiers partagés."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "Recharge la table de filtrage d'IP."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Recharge la table actuelle de filtrage d'IP."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "Mise à jour de la table de filtrage d'IP depuis l'URL."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "Si l'URL est omis l'URL des préférences est utilisé."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Se connecter au réseau."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
+"Ceci va vous connecter à tout les réseaux activés dans les Préférences.\n"
+"Vous pouvez aussi spécifier une adresse de serveur de la forme IP : Port, "
+"pour se connecter\n"
+"seulement à ce serveur. L'IP doit être une IPv4 décimal,\n"
+"ou un nom DNS pouvant être résolu."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Se connecter à eD2k uniquement."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Se connecter à Kad uniquement."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Se déconnecter du réseau."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr ""
+"Ceci vous déconnectera de tous les réseaux auxquels vous êtes actuellement "
+"connecté.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Se déconnecter de eD2k uniquement."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Se déconnecter de Kad uniquement."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Ajoute un lien eD2k ou magnétique au noyau."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"Le lien eD2k à ajouter peut être :\n"
+"*) un lien fichier (ed2k://|fichier|…), il sera ajouté à la file de "
+"téléchargement,\n"
+"*) un lien serveur (ed2k://|serveur|…), il sera ajouté à la liste des "
+"serveurs,\n"
+"*) ou un lien de liste de serveurs, dans ce cas tous les serveurs dans la "
+"liste\n"
+"   seront ajoutés à la liste des serveurs.\n"
 "\n"
-"De plus, la configuration du navigateur a été réinitialisé lors du Système "
-"par défaut. Veuillez reconfigurer les options du navigateur si besoin.\n"
+"Le lien magnétique devra contenir le hachage eD2k et la taille du fichier.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Définir une valeur de préférence."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "Définir les préférences de filtrage d'IP."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Activer le filtrage IP pour les clients et les serveurs."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Désactiver le filtrage IP pour les clients et les serveurs."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Activer/Désactiver le filtrage IP pour les clients."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Activer le filtrage IP pour les clients."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Désactiver le filtrage IP pour les clients."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Activer/Désactiver le filtrage IP pour les serveurs."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Activer le filtrage IP pour les serveurs."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Désactiver le filtrage IP pour les serveurs."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Choisir le niveau de filtrage IP."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Plus d'informations, de l'aide et de nouvelles versions peuvent être trouvés "
-"sur notre page web,\n"
+"Les niveaux de filtrage valides sont compris entre 0 et 255, la valeur par "
+"défaut (initiale)\n"
+"est 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Définir les limites de bande passante."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "La valeur passée à ces commandes doit être en kilo-octets/s.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Définir la limite de bande passante en émission."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Définir la limite de bande passante en réception."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Obtenir et afficher une valeur de préférence."
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "Obtenir les préférences de filtrage IP."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Obtenir le statut du filtrage d'IP pour les clients et les serveurs."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Obtenir le statut du filtrage d'IP pour les clients seulement."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Obtenir le statut du filtrage d'IP pour les serveurs seulement."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "Obtenir le niveau de filtrage IP."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Obtenir les limites de bande passante."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Effectuer une recherche"
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-" www.aMule.org, ou sur notre canal IRC : #aMule sur irc.freenode.net.\n"
+"Un type de recherche doit être spécifié en donnant le type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Exemple: 'recherche fichier kad' exécutera une recherche kad pour \"fichier"
+"\".\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Ne vous gênez pas pour reporter tout bogue sur http://forum.amule.org"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Effectuer une recherche globale"
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Effectuer une recherche locale"
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Effectuer une recherche Kad"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Montre les résultats de la dernière recherche."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Retourne les résultats de la précédente recherche.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Affiche la progression de la recherche."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Affiche la progression de la recherche.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Démarrer le téléchargement du fichier."
+
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"Le répertoire choisi pour les fichiers de signature en ligne est INVALIDE !\n"
-"La signature en ligne sera DÉSACTIVÉE jusqu'à ce que cela soit corrigé dans "
-"les préférences."
+"Le rang du fichier de la dernière recherche doit être donné.\n"
+"Exemple: 'download 12' va télécharger le douzième fichier de la précédente "
+"recherche.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Mettre le téléchargement en pause."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Reprendre le téléchargement."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Annuler le téléchargement."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Régler la priorité de téléchargement."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr ""
+"Passer la priorité d'un téléchargement en Basse, Normale, Haute, ou Auto.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Passer en priorité basse."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Passer en priorité normale."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Passer en priorité haute."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Passer en priorité auto."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Montrer les files d'attente/listes."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Montrer la file d'attente des envois/réceptions, la liste des serveurs ou la "
+"liste des fichiers partagés.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Montrer la file d'attente des envois."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Montrer la file d'attente des réceptions."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Montrer le journal."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Montrer la liste des serveurs."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Effacer le journal."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Erreur lors de la réserve d'espace pour le fichier '%s' : %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Commande obsolète, utilisez '%s' à la place."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "ERREUR : impossible d'ouvrir le fichier journal"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"C'est une commande est obsolète, et pourrait être supprimée dans le futur.\n"
+"Utilisez '%s' à la place.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "AVERTISSEMENT : le fichier journal est vide. Quelque chose ne va pas."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "client texte aMule"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Le journal a été effacé"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Conversion des anciens hashsets AICH en '%s' vers 64b en '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "ServerMessage : %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr ""
+"AVERTISSEMENT : Le nom de fichier '%s' est invalide et a été renommé en '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Échec du téléchargement de la liste des nœuds."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"AVERTISSEMENT : Le fichier '%s' existe déjà, le nouveau fichier a été "
+"renommé en '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Échec de l'ouverture du fichier de vérification de version téléchargé"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Êtes-vous sûre de vouloir annuler et supprimer tous les fichiers de cette "
+"catégorie ?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Fichier de vérification de version corrompu"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Confirmation requise"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Vous utilisez une version obsolète d'aMule !"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "Seulement 99 catégories sont prises en charge."
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "Trop de catégories !"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Tous les autres"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Sélectionner un filtre"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Ajouter une catégorie"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Éditer une catégorie"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Supprimer une catégorie"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
 msgstr ""
-"Votre version d'aMule est %i.%i.%i et la dernière version est %li.%li.%li"
+"Échec dans l'ouverture du fichier (%s), suppression de la liste des fichiers "
+"partagés."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Requête d'un hashset pour le fichier inconnu : %s"
+
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
+msgstr "Reprise des envois du fichier : %s"
+
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Pause des envois du fichier : %s"
+
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Échec de l'exécution de la commande `%s' lors de l'événement `%s'."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Téléchargement terminé"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Le chemin complet vers le fichier."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Le nom du fichier sans la partie répertoire."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "Le hachage eD2k du fichier."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "La taille du fichier en octets."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Durée d'activité de téléchargement cumulée."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Nouvelle session de chat démarrée"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Expéditeur du message."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Espace insuffisant"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Partition du disque."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Erreur à la complétion"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
+msgstr "Traitement du fichier numéro %u : %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
-"La dernière version peut toujours être trouvée sur http://www.amule.org"
+"Vous avez demandé les hachages partiels (Seulement utilisés pour des "
+"fichiers dont les tailles sont > 9.5 Mo)"
 
-#: src/amule.cpp:1911
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Fichier inexistant !\n"
+
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, le créateur de liens d'aMule"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Bienvenue !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Paramètres d'entrée"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Fichier à hacher"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Ajouter des URLs optionnelles pour ce fichier"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Indiquez ici le fichier pour qui vous voulez calculer le lien eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
-"AVERTISSEMENT : Votre version d'aMuled n'est pas à jour: %i.%i.%i < %li.%li.%"
-"li"
+"Indiquez ici l'URL que vous voulez ajouter au lien eD2k : Ajoutez / à la fin "
+"pour indiquer à aLinkCreator d'ajouter le nom du fichier actuel"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Votre copie d'aMule est à jour."
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Enlever"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Échec du téléchargement du fichier de vérification de version"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Créer le lien avec les hachages partiels"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Aide à retrouver les fichiers rares et nouveaux au prix d'un lien de plus "
+"grande longueur"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Hachage MD4 du fichier"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "Hachage eD2k du fichier"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "Lien eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Sauvegarder"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Copier dans le presse-papiers"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Ouvrir"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Ouvrir un fichier pour calculer son lien eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Copie du lien eD2k calculé dans le presse-papiers"
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Enregistrer sous"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Conversion du lien eD2k calculé en fichier"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "A propos d'aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Sélectionnez le fichier auquel vous souhaitez calculer le lien eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Impossible d'ouvrir le presse-papiers"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Rien à copier pour l'instant !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Sélectionnez le fichier vers votre lien eD2k calculé"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Impossible d'ouvrir "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Veuillez entrer un nom de fichier non vide"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Rien à sauvegarder pour l'instant !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, le créateur de liens d'aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps de http://www.everaldo.com et http://www.icomania.com\n"
+"et http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distribué sous licence GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Hachage en cours…"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator fonctionne pour vous"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Calcul du hachage MD4…"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Calcul des hachages eD2k…"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Annulé !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Utilisateurs : %s | Fichiers : %s"
+msgid "Done in %.2f s"
+msgstr "Effectué en %.2f s"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Vous avez déjà ajouté cette URL !"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Entrez une URL non vide s'il vous plaît"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Utilisateurs : E : %s K : %s | Fichiers : E : %s K : %s"
+msgid "Unable to open %s"
+msgstr "Impossible d'ouvrir %s"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Aucun réseau sélectionné"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i jour(s) %i heure(s) %i min %i s"
 
-#: src/amule.cpp:2102
+#: src/utils/wxCas/src/onlinesig.cpp:234
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Connecté à %s %s"
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uJ %02uh %02umin %02us"
 
-#: src/amule.cpp:2105
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "Connecting to %s"
-msgstr "Connexion à %s"
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Déconnecté de eD2K"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad démarré."
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad arrêté."
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f o"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Connecté à Kad (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f Ko"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Connecté à Kad (pare-feu)"
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f Mo"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Déconnecté de Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f Go"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f To"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, statistiques en ligne d'aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Vitesse de réception Max atteinte depuis de démarrage de wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr ""
+"Vitesse de réception Max atteinte lors des précédentes exécutions de wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Système"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Arrêter le rafraîchissement automatique"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Sauvegarder l'image des statistiques en ligne"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Imprimer une image des statistiques en ligne"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Préférences"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "À propos de wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Démarrer le rafraîchissement automatique"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Rafraîchissement automatique stoppé"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Rafraîchissement automatique démarré"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Sauvegarder l'image des statistiques en ligne"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Statistiques en ligne d'aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Le réseau Kad ne peut être utilisé si le port UDP est désactivé dans les "
-"préférences, pas de démarrage."
+"L'impression a rencontré un problème.\n"
+"Peut-être votre imprimante n'est-elle pas configurée correctement ?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Le réseau Kad est désactivé dans les préférences, pas de connexion."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Impression en cours"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Impossible de lire le fichier de la liste d'amis 'emfriends.met'"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, Statistiques en Ligne d'aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Basé sur CAS de Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distribué sous licence GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Impossible d'écrire dans le fichier de la liste d'amis 'emfriends.met'"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh Oh, aMule n'est pas lancé…"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule fonctionne"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule est lancé, mais est déconnecté"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule se connecte…"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh Oh, l'état d'aMule est inconnu…"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " tourne depuis "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " est arrêté !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " n'est pas connecté !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " se connecte…"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " est en train de faire des trucs bizarres, à vérifier !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " est connecté à "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad : "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "éteint"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " est sur "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " avec "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Réception totale : "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Émission : "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Réception durant la session : "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Réception : "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " Ko/s, Émission : "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " Ko/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Partage : "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " fichier(s), clients en attente : "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Temps :"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " sur "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Charge moyenne du système (1-5-15 min) : "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Le système fonctionne depuis : "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Répertoire contenant le fichier amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Entrer ici le répertoire contenant le fichier amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Intervalle de rafraîchissement en secondes"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Générer une image des statistiques en ligne à chaque rafraîchissement"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Entrer ici le répertoire où générer l'image des statistiques en ligne"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr ""
+"Envoi périodique de l'image des statistiques en ligne sur un serveur FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "URL du FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Chemin du FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Entrer ici l'URL du serveur FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr ""
+"Entrer ici le répertoire du serveur FTP où envoyer l'image des statistiques "
+"en ligne"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Utilisateur"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Entrer ici l'identifiant pour se connecter au serveur FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Entrer ici le mot de passe pour se connecter au serveur FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Intervalle d'envoi de l'image des statistiques en ligne en minutes"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Valider"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Répertoire contenant le fichier de signature"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Répertoire où générer l'image des statistiques en ligne"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Charge le template <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Port HTTP du serveur Web"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Utiliser la redirection de port UPnP sur le port du serveur web"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Port UPnP"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Utiliser la compression gzip"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Mot de passe d'accès total pour le serveur web"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Mot de passe invité pour le serveur web"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Autoriser l'accès invité"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Interdire l'accès invité"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr ""
+"Charger/sauvegarder les paramètres du serveur web depuis/vers un aMule "
+"distant"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr ""
+"Chemin du fichier de configuration d'aMule. NE PAS UTILISER DIRECTEMENT !"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Désactiver l'interpréteur PHP (obsolète)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Recompiler les pages PHP à chaque requête"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Serveur Web d'aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "connexion du client web acceptée\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "ERREUR : impossible d'accepter la connexion au client web\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "La requête a échouée avec le message d'erreur suivant: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Fichier d'index non trouvé:"
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "La session a expirée - demande de l'identifiant\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Session correcte, identifié\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Session correcte, non identifié\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Pas de session ouverte - l'identifiant va être demandé\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Session crée - demande de l'identifiant\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Requête en cours [originale] : "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Pas de mot de passe indiqué, il ne sera pas possible de se connecter"
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Vérification du mot de passe\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Hachage du mot de passe invalide\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Mot de passe correct\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Mauvais mot de passe\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr ""
+"Vous n'avez pas entré de mot de passe. Les mots de passe vides ne sont pas "
+"autorisés.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Déconnexion demandée\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Requête en cours [redirigée] :"
+
+#~ msgid "Romanian"
+#~ msgstr "Roumain"
+
+#~ msgid "Download status"
+#~ msgstr "État de la réception"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "…"
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Délai de rafraîchissement : %d seconde"
+#~ msgstr[1] "Délai de rafraîchissement : %d secondes"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr ""
+#~ "Les commentaires et les classements ne sont pas encore supportés sur "
+#~ "l'IHM distante"
+
+#~ msgid "Transferring"
+#~ msgstr "En téléchargement"
+
+#~ msgid "QR: ???"
+#~ msgstr "QR: ???"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR : %u"
+
+#~ msgid "Only files currently uploading"
+#~ msgstr "Seulement les fichiers en cours d'émission"
+
+#~ msgid "Queue Rank"
+#~ msgstr "Rang dans la file d'attente"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "A FAIRE - montrer la progression d'une recherche"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr ""
+#~ "Démarrage de la création des hachages MD4 et AICH pour le fichier : %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Démarrage de la création du hachage MD4 pour le fichier : %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Démarrage de la création du hachage AICH pour le fichier : %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "AVERTISSEMENT : Suppression du fichier '%s' original après la création de "
+#~ "la sauvegarde"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "AVERTISSEMENT : Échec de la suppression de %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR : %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Score (total) :"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Essayer de transférer des parties complètes pour tous les envois"
+
+#~ msgid "Networks window"
+#~ msgstr "Fenêtre des Réseaux"
+
+#~ msgid "Searches window"
+#~ msgstr "Fenêtres de recherches"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "En téléchargement"
+
+#~ msgid "Shared files window"
+#~ msgstr "Fenêtre des fichiers partagés"
+
+#~ msgid "Messages window"
+#~ msgstr "Fenêtre des messages"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Fenêtre du graphique des statistiques"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Fenêtre des paramètres des préférences"
+
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Icône de notification perdue, on essaye de la recréer..."
+
+#~ msgid "Transfers"
+#~ msgstr "Transferts"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Fenêtre de transferts de fichiers"
+
+#~ msgid "Unban"
+#~ msgstr "Débannir"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Afficher les envois"
+
+#~ msgid "Show Queue"
+#~ msgstr "Montrer la file d'attente"
+
+#~ msgid "Select View"
+#~ msgstr "Sélectionner la vue"
+
+#~ msgid "Client Software"
+#~ msgstr "Programme du client"
+
+#~ msgid "Waited"
+#~ msgstr "Attendu"
+
+#~ msgid "Upload Time"
+#~ msgstr "Temps d'émission"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Émission/Réception"
+
+#~ msgid "Remote Status"
+#~ msgstr "État distant"
+
+#~ msgid "File Priority"
+#~ msgstr "Priorité du fichier"
+
+#~ msgid "Score"
+#~ msgstr "Score"
+
+#~ msgid "Asked"
+#~ msgstr "Demandé"
+
+#~ msgid "Last Seen"
+#~ msgstr "Vu pour la dernière fois"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Placé en file d'attente"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Transféré"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Reçus"
+
+#~ msgid "Userhash"
+#~ msgstr "Hachage de l'utilisateur"
+
+#~ msgid "Encrypted"
+#~ msgstr "Chiffré"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "%d images de drapeaux chargées."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Affiche l'émission / la file d'attente d'émission"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Clients dans la file d'attente :"
+
+#~ msgid "Current Session"
+#~ msgstr "Session courante"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Requested :"
+#~ msgstr "Demandé :"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Créer une sauvegarde pour la prévisualisation"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Fenêtre des Transferts"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Utilisateurs au total : %s | Fichiers au total : %s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "Processus de téléchargement HTTP démarré"
+
+#~ msgid "Download size not received, downloading until connection is closed"
+#~ msgstr ""
+#~ "Taille à télécharger non reçue, téléchargement jusqu'à ce que la "
+#~ "connexion soit fermée"
+
+#~ msgid "Download size: %i"
+#~ msgstr "Taille du téléchargement : %i"
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "Processus de téléchargement HTTP terminé"
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Hôte : %s : %i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Réponse : %i (Erreur : %i)"
+
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "AVERTISSEMENT : Réponse vide à la création du flux"
+
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "ERREUR : Code de redirection reçu sans URL"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr ""
+#~ "CIP2Country::CIP2Country(): Impossible de charger les informations de "
+#~ "pays depuis "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Voir le niveau d'IPFilter."
+
+#~ msgid "Makes a search."
+#~ msgstr "Lance une recherche."
+
+#~ msgid "Killed!"
+#~ msgstr "Mis à mort !"
+
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Utilisation de amuleweb dans '%s'"
+
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Fermeture d'aMule..."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Les options suivantes ont été changées  dans cette version pour des "
+#~ "raisons de sécurité :\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Activation du brouillage de protocole pour les connections entrantes et "
+#~ "sortantes.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Désactivation de la mise à jour de la liste de serveurs depuis les "
+#~ "autres serveurs ou les clients.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Pour plus d'informations sur les raisons de ces changements, cherchez \n"
+#~ "dans le wiki d'aMule à \"fake servers\" sur http://wiki.amule.org\n"
+#~ "Il est important que vous enleviez les serveurs 'bidons' de votre liste "
+#~ "de serveurs pour qu'aMule fonctionne correctement."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "En complément, les paramètres du navigateur ont été réinitialisés aux "
+#~ "valeurs systèmes par défaut. Veuillez à nouveau indiquer vous options de "
+#~ "navigateur si besoin.\n"
 
 #~ msgid "Fetching status..."
-#~ msgstr "Récupération du statut..."
+#~ msgstr "Récupération du statut…"
+
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Utilisateurs : E : %s K : %s | Fichiers E : %s K : %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Le client %s sur IP : Port %s : %d utilisant %s %s %s"
 
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() returned NULL"
 
+#~ msgid "Firewalled"
+#~ msgstr "Derrière un pare-feu"
+
+#~ msgid "Download new GeoIP.dat from "
+#~ msgstr "Télécharger un nouveau GeoIP.dat à partir de "
+
+#~ msgid "Failed to download GeoIP.dat from "
+#~ msgstr "Impossible de télécharger GeoIP.dat à partir de "
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "%d image de drapeau chargée."
+#~ msgstr[1] "%d images de drapeau chargées."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr ""
+#~ "Le fichier %s est trop gros pour le Donkey : le maximum permis est de 4 "
+#~ "Go."
+
+#~ msgid "User:"
+#~ msgstr "Utilisateur :"
+
+#~ msgid "System:"
+#~ msgstr "Système :"
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Pas de prise en charge pour ce type d'image."
+
+#~ msgid "File was not saved"
+#~ msgstr "Le fichier n'a pas été sauvegardé"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr ""
+#~ "Échec de la connexion. Impossible de se connecter à l'hôte spécifié\n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov <petar@post.harvard.edu>\n"
+#~ msgstr " Copyright (C) 2002 Petar Maymounkov <petar@post.harvard.edu>\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "Filtre des messages"
 
@@ -7348,18 +7983,193 @@
 #~ msgstr "Réglages graphiques"
 
 #~ msgid "Core Tweaks"
-#~ msgstr "Réglages centraux"
+#~ msgstr "Tweaks centraux"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Pas de prise en charge pour ce type d'image."
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Délais d'apparition des info-bulles en secondes"
 
-#~ msgid "File was not saved"
-#~ msgstr "Le fichier n'a pas été sauvegardé"
+#~ msgid "Show part file number before file name"
+#~ msgstr "Montrer le numéro du fichier .part avant le nom du fichier."
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgid "Skin Support"
+#~ msgstr "Support des thèmes"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- aucun skin disponible -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Répertoire du fichier Online Signature :"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Options de filtrage :"
+
+#~ msgid "UDP port for extended server requests (TCP+3):"
+#~ msgstr "Port UDP pour les requêtes étendues (TCP+3)"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Capacités de la ligne"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
 #~ msgstr ""
-#~ "Le fichier %s est trop gros pour le Donkey : le maximum permis est de 4 "
-#~ "Go."
+#~ "Note: ces valeurs sont seulement\n"
+#~ "utilisées pour les statistiques."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Port TCP standard du client:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Port UDP étendu du client:"
+
+#~ msgid "Bind Address"
+#~ msgstr "Lier l'Adresse"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "Port UDP pour les requêtes serveurs étendues (TCP+3) : 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Nombre maximum de sources par fichier"
+
+#~ msgid "Connection limits"
+#~ msgstr "Limites de connexion"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Universal Plug and Play"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "Activer l'UPnP"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "Port TCP pour l'UPnP:"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Démarrer le fichier en Pause suivant quand un se termine"
+
+#~ msgid "Check disk space"
+#~ msgstr "Vérifier l'espace disque"
+
+#~ msgid "Min disk space:"
+#~ msgstr "Espace disque minimum :"
+
+#~ msgid "Incoming"
+#~ msgstr "Entrant"
+
+#~ msgid "Temporary"
+#~ msgstr "Temporaire"
+
+#~ msgid "Shared"
+#~ msgstr "Partagé"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Sélectionner les couleurs des statistiques"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Progression de la file d'attente des téléchargements"
+
+#~ msgid "Show percentage"
+#~ msgstr "Afficher le pourcentage"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Afficher la barre de progression "
+
+#~ msgid "Enable skin support "
+#~ msgstr "Activer le support des skins."
+
+#~ msgid "Skin:"
+#~ msgstr "Skin:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr ""
+#~ "Trier automatiquement les fichiers dans la file d'attente de "
+#~ "téléchargements (gourmand en CPU)"
+
+#~ msgid "Show Fast eD2k Links Handler"
+#~ msgstr "Afficher le gestionnaire de liens eD2k rapides"
+
+#~ msgid "Web server port"
+#~ msgstr "Port du serveur Web"
+
+#~ msgid "Enable UPnP port forwarding on the web server port"
+#~ msgstr "Activer le forwarding de port UPnP sur le port du serveur web"
+
+#~ msgid "Web server UPnP TCP port"
+#~ msgstr "Port TCP UPnP du serveur web"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "Adrese IP des interfaces clientes\n"
+#~ "(vide si aucune)"
+
+#~ msgid "TCP port"
+#~ msgstr "Port TCP"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Qui peut voir votre liste de fichiers partagés :"
+
+#~ msgid "Event types"
+#~ msgstr "Types d'évenements"
+
+#~ msgid "ERROR: can not accept web client connection\n"
+#~ msgstr "ERREUR : la connexion du client web ne peut pas être accepté\n"
+
+#~ msgid ""
+#~ "Your Auto-update server list is empty.\n"
+#~ "'Auto-update server list at startup will be disabled."
+#~ msgstr ""
+#~ "Votre liste de serveurs de mise à jour automatique est vide.\n"
+#~ "'La mise à jour automatique au démarrage de la liste des serveurs sera "
+#~ "désactivée."
+
+#~ msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "ERREUR : Version du fichier part.met invalide : %s ==> %s"
+
+#~ msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#~ msgstr ""
+#~ "AVERTISSEMENT : Liste des fichiers connus corrompue, en-tête invalide."
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "Active la confirmation de sortie d'aMule."
+
+#~ msgid "Bandwith limits"
+#~ msgstr "Limites de bande passante"
+
+#~ msgid "This UDP port is used for extended ed2k requests and Kad network"
+#~ msgstr ""
+#~ "Ce port UDP sera utilisé pour les demandes étendues des réseaux ed2k et "
+#~ "Kad"
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Montrer la bande passante supplémentaire utilisée"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. actif"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICH fait confiance à tous les Hash (non recommandé)"
+
+#~ msgid "Disk space"
+#~ msgstr "Espace disque"
+
+#~ msgid "Create Backup for preview"
+#~ msgstr "Créer une sauvegarde pour la prévisualisation"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Paramètres avancés"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Style de la barre de progression"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Tri des colonnes"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Paramètres avancés de l'interface graphique"
+
+#~ msgid "File Options"
+#~ msgstr "Options des fichiers"
 
 #~ msgid "Status text"
 #~ msgstr "Texte de statut"
@@ -7367,18 +8177,134 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "Popup d'état"
 
-#~ msgid "Please wait... "
-#~ msgstr "Patientez s'il vous plaît... "
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Client p2p 'All-Platform' basé sur eMule \n"
+#~ "\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr "Site web : http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr "Forum : http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ "FAQ : http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " Contact : admin@amule.org (problèmes administratiFs) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr " Des parties de aMule sont basées sur \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " Copyright (C) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "Pour un film vous pouvez donner sa durée, son histoire, sa langue...\n"
+#~ "et si c'est un Fake, vous pouvez le aux autre utilisateurs d'aMule."
+
+#~ msgid "Misc Options"
+#~ msgstr "Options diverses"
+
+#~ msgid "Server Options"
+#~ msgstr "Options du serveur"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Afficher le message de bienvenue du serveur à la connexion..."
+
+#~ msgid "eD2k Info"
+#~ msgstr "Info eD2k"
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Activer/Désactiver"
+
+#~ msgid "Authentication"
+#~ msgstr "Authentification"
+
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Impossible de déterminer le navigateur sélectionné!"
+
+#~ msgid "User Defined"
+#~ msgstr "Manuel"
 
 #~ msgid "General Settings"
 #~ msgstr "Paramètres généraux"
 
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - La Mule Linux"
+
+#~ msgid "System Default"
+#~ msgstr "Par défaut"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Sélectionnez votre navigateur ici"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Navigateur personnalisé :"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Entrer ici le nom de votre navigateur. Pour utiliser un navigateur "
+#~ "personnalisé, choisissez Personnalisé dans le menu déroulant ci-contre."
+
+#~ msgid "Max Connections"
+#~ msgstr "Nombre maximum de connexions"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "Réglages IHM avancés"
 
 #~ msgid "Remote Control"
 #~ msgstr "Contrôles à distance"
 
+#~ msgid "Please wait... "
+#~ msgstr "Patientez s'il vous plaît... "
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "Impossible de déterminer la commande pour lancer votre navigateur."
 
@@ -7423,7 +8349,7 @@
 #~ msgstr "Attention"
 
 #~ msgid "Error: Could not listen to TCP port."
-#~ msgstr "Erreur: Écoute sur le port TCP impossible."
+#~ msgstr "ERREUR : Écoute sur le port TCP impossible."
 
 #~ msgid "Error: can not accept web client connection\n"
 #~ msgstr "Erreur : impossible d'accepter la connexion du client web\n"
@@ -7503,9 +8429,6 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "Copier les liens ed2k dans le presse-papiers"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "Erreur Fatale : échec de la création du minuteur"
-
 #~ msgid "ED2K: Connecting"
 #~ msgstr "ED2K : Connexion en cours"
 
@@ -7536,7 +8459,7 @@
 #~ msgstr "Éditer la liste des serveurs"
 
 #~ msgid "Error: couldn't accept a new external connection"
-#~ msgstr "ERREUR: impossible d'accepter une nouvelle connexion externe"
+#~ msgstr "ERREUR : impossible d'accepter une nouvelle connexion externe"
 
 #~ msgid "ED2K is disabled in preferences."
 #~ msgstr "ED2K est desactivé dans les préférences."
@@ -7616,11 +8539,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "Erreur : Version du fichier part.met invalide: %s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr ""
-#~ "Erreur : %s (%s) est corrompu (mauvais tagcount), impossible charger le "
-#~ "fichier."
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "Attention : %s est peut-être corrompu (%i)"
 
@@ -7639,7 +8557,7 @@
 #~ "Error: Unable to hash downloaded part - hashset incomplete (%s). This "
 #~ "should never happen"
 #~ msgstr ""
-#~ "Erreur: Impossible de hacher la partie téléchargée - hashset incomplet (%"
+#~ "ERREUR : Impossible de hacher la partie téléchargée - hashset incomplet (%"
 #~ "s). Ceci ne devrait jamais arriver"
 
 #~ msgid "Insufficient Diskspace"

aMule-2.2.6.tar.bz2/po/gl.po -> aMule-2.3.1.tar.bz2/po/gl.po Changed

@@ -1,4 +1,4 @@
-# translation of aMule to Galego
+# translation of gl.po to Galego
 # This file is distributed under the same license as the aMule package.
 #
 # Nota para traductores:
@@ -8,19 +8,20 @@
 # a UTF-8:
 # 	msgconv -t UTF-8 gl.po > gl.po.new && mv gl.po.new gl.po
 # Onde gl.po é o ficheiro que estades a traducir.
+# Copyright (c) 2003-2011 aMule Team.
 #
 # Josemari Rodríguez Gutiérrez <thorerocs@hotmail.com>, 2004.
 # Ignacio Casal Quinteiro <nacho.resa@gmail.com>, 2005, 2006.
 # Ignacio Casal Quinteiro <icq@cvs.gnome.org>, 2007.
-# Festor Wailon Dacoba <festor90@gmail.com>, 2007, 2008, 2009.
+# Festor Wailon Dacoba <festor90@gmail.com>, 2007, 2008.
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: aMule\n"
+"Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-03-04 22:12+0100\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
@@ -29,1308 +30,1140 @@
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Galician\n"
-"X-Poedit-Country: SPAIN\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Debe especificar un contrasinal non baleiro."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Contrasinal inválido, sen un hash MD5!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Erro de conexión"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "Errada conexión EC. Resposta baleira."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Conexión externa: Acceso denegado debido a:"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Conexión externa: Acceso denegado"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Conexión externa: Mala resposta do servidor. Conexión pechada."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Éxisto! Conexión establecida en aMule"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Éxito! Conexión establecida."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Hasheando"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Engadir un amigo"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Completando"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Tes que introducir un porto e unha ip válidos"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Completado"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Información"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Pausado"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "O hash de usuario especificado non é válido!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Erróneo"
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Non se pode abrir %s (%s)"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Descargando"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"AVISO: Non podes engadirte a ti mesmo como unha fonte para un enlace eD2k "
+"tendo ID baixa."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Agardando"
+#: src/amule.cpp:239
+#, fuzzy
+msgid "Now, exiting main app..."
+msgstr ""
+"\n"
+"OK, saíndo de %s...\n"
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Creando hash AICH e MD4 para o ficheiro: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Creando hash MD4 para o ficheiro: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Creando hash AICH para o ficheiro: %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Erro"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Convertendo conxuntos hash AICH antigos en '%s' a 64b en '%s'"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr ""
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "AVISO: O nome do ficheiro '%s' é inválido e foi renomeado a '%s'."
+#: src/amule.cpp:335
+#, fuzzy
+msgid "aMule shutdown completed."
+msgstr "Descarga rematada"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
 msgstr ""
-"AVISO: O ficheiro '%s' xa existe, un ficheiro novo foi renomeado a '%s'."
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr ""
-"AVISO: Non se puido eliminar o '%s' orixinal despois de crear a copia de "
-"seguranza"
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "Confirmación de saída"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "AVISO: Fallou ao eliminar %s"
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "Nova conexión externa aceptada"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Erro ao recupera-los ficheiros compartidos do usuario '%s'"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "AVISO"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Descoñecido"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Fake eMule versión %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Información"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Fake eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Non ten ningún servidor na lista de servidores.\n"
+"Quere que aMule descargue unha nova lista agora?"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Fake eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Descargar lista de servidores"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (basado en eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr "servidor web executándose con pid: %d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Alcume: %s ID: %u"
+#: src/amule.cpp:658
+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 ""
+"Solicitaches executar o servidor web ó inicio pero non se puido executar o "
+"binario amuleweb. Por favor instale o paquete que conteña o servidor web do "
+"aMule ou compile o aMule empregando o parámetro --enable-webserver e logo "
+"execute o make install"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Petición: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "ERRO"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Estatísticas do ficheiro para esta sesión: Aceptada %d de %d peticións; %s "
-"transferida\n"
-msgstr[1] ""
-"Estatísticas do ficheiro para esta sesión: Aceptadas %d de %d peticións; %s "
-"transferidas\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "No se puido vincular os portos a dirección especificada: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Estatísticas do ficheiro para todas as sesións: Aceptada %d de %d peticións; "
-"%s transferida\n"
-msgstr[1] ""
-"Estatísticas do ficheiro para todas as sesións: Aceptadas %d de %d "
-"peticións; %s transferidas\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Petición dun ficheiro descoñecido"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Porto %u non está dispoñible . Tes IDBAIXA\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Cliente %s en IP: Porto %s:%d usando %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Nome de usuario"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Amigos"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Ver &Detalles"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Engadir un amigo"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Borrar amigo"
-
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Enviar &Mensaxe"
-
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Ver ficheiros"
-
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Establecer ranura de amigo"
-
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Estás seguro de que queres borrar o amigo/a seleccionado?"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Porto %u non está dispoñible!!\n"
+"\n"
+"Isto significa que terás IDBAIXA \n"
+"\n"
+"Comproba túa rede para cerciorarse de que o porto está aberto para a entrada "
+"e saída."
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Estás seguro de que queres borrar os amigos/as seleccionados?"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Fallou ao crear o ficheiro OnlineSig"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Cancelar"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Fallou ao crear o ficheiro de aMule OnlineSig"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1031
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
 msgstr ""
-"Non está permitindo establecer máis dun espazo de amigo.\n"
-" Só un espazo foi asignado."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Selección múltiple"
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Descarga rematada"
+"O idioma seleccionado non parece estar instalado. (Nota: Tentarei poñelo de "
+"todos modos)"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "A ruta completa ao ficheiro."
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "Esta é a primeira vez inicia aMule %s"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "O nome do ficheiro sen a ruta."
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Esta versión é unha versión en proba, actualizada, e\n"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "O hash eD2k do arquivo."
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr "non damos garantía se rompese algo, quime a túa casa,\n"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "O tamaño do ficheiro en bytes."
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "ou mate o seu can. Pero debería salvalo de todas formas.\n"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Tempo de actividade de descarga acomulativo."
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Máis información, soporte  e novas actualizacións pódelas atopar na nosa "
+"páxina,\n"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Nova sesión de chat comezada"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"en www.aMule.org, ou na nosa canle de IRC #aMule en irc.freenode.net.\n"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Mensaxe remitente."
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Podes reportar algúns bugs a http://forum.amule.org"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Fora de espazo"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
+msgstr ""
+"O cartafol que especificou de Sinatura Online non é válido!\n"
+"A Sinatura Online foi deshabilitada ata que o arregle en preferencias."
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Partición do disco."
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "Nome do servidor :"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Erro ao completar"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "A reserva do espazo no disco duro para o arquivo '%s' fallou: %s"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Nome do arquivo"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "ERRO: non se pode abrir o ficheiro de rexistro"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Tamaño"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "AVISO: o ficheiro de rexistro está baleiro. Algo está mal."
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tipo"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "O rexistro foi borrado"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioridade"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Mensaxe de servidor: %s"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "IDFicheiro"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Peticións"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Fallou ao descargar a lista de nodos."
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Peticións aceptadas"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Fallou ao abrir o ficheiro de comprobación de versión descargado"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Datos transferidos"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Ficheiro de comprobación de versión corrupto"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Media de compartido"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Está usando unha versión de aMule non actualizada!"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Partes obtidas"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "A súa versión de aMule é %i.%i.%i e a última versión é %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Fontes completas"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Pode obter a última versión de aMule en http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Ruta de directorio"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr ""
+"AVISO: A súa versión de aMule está desactualizada: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Ficheiros compartidos"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Súa copia de aMule está actualizada."
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Moi baixo"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Fallou ao descargar o ficheiro de comprobación de versión"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Baixo"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Usuarios: %s | Arquivos: %s"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normal"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Usuarios: E: %s K: %s | Arquivos: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Alto"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Sen redes seleccionadas"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Moi alto"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "con IDbaixa"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Lanzamento"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "con ID alta"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Automático"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Conectado a %s %s"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Engadir Comentario/Calificación"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Conectando a %s"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Editar Comentario/Calificación"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Desconectado do eD2k"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Renomear"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad iniciado."
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Engadir os ficheiros en colección á lista de tranferencia"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad detido."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Copiar a &URI magnética ao portapapeis"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Conectado a Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Copiar eD2k &enlace ó portapapeis"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Conectado a Kad (cortafogos)"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Copiar enlace eD2k ó portapapeis (&Fonte)"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Desconectado de Kad"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
 msgstr ""
-"Copiar enlace eD2k ó portapapeis (&Fonte) (&Con opcións de encriptación)"
+"A rede Kad non pode ser usada se o porto UDP está desactivado nas "
+"preferencias, non iniciado."
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Copiar enlace eD2k ó portapapeis (&Nome do host)"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "A rede Kad está desactivada nas preferencias, non conectado."
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuled.cpp:560
+#, fuzzy
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
 msgstr ""
-"Copiar enlace eD2k ó portapapeis (&Nome do host) (Con opcións de "
-"&encriptación)"
-
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Copiar enlace eD2k ó portapapeis (&AICH info)"
-
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Copiar resposta ao portapapeis"
+"ERRO: o daemon de aMule non se pode usar cando están desactivadas as "
+"conexións externas. Para activar as Conexións Externas, use un aMule normal, "
+"inicie amuled coa opción --ec-config ou estableza a clave "
+"\"AcceptExternalConnections\" a 1 no ficheiro ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuled.cpp:563
 msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
 msgstr ""
-"Reacción de : %s (%s)\n"
-"\n"
-
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Necesitas ter IDALTA para crear un enlace de fonte válido"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "AVISO"
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Ficheiros compartidos (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[PartFile]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Introducir un novo nome para este ficheiro:"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Renomear o ficheiro"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr ""
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Resumindo subidas de ficheiro: %s"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr ""
 
-#: src/UploadQueue.cpp:520
+#: src/amuled.cpp:711
 #, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Suspendendo subida de ficheiro: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "Cliente texto do aMule"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: palabra de busca demasiado corta"
+msgid "ERROR: %s"
+msgstr "ERRO: %s"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
+#: src/amuleDlg.cpp:238
 #, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Lido %u contacto Kad"
-msgstr[1] "Lidos %u contactos Kad"
+msgid "This is aMule %s based on eMule."
+msgstr "Este é aMule %s basado en eMule"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
+#: src/amuleDlg.cpp:240
 #, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Só dispoñible %d contacto Kad, non se escribiu no nodes.dat"
-msgstr[1] "Só dispoñibles %d contactos Kad, non se escribiu no nodes.dat"
+msgid "Running on %s"
+msgstr "Executando en %s"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Escribio %d contacto Kad"
-msgstr[1] "Escribio %d contactos Kad"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr "Visita http://www.amule.org por se existe algunha nova versión."
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ERRO: Non se puido escoitar o porto TCP."
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ERRO GRAVE: Non se puido crear o temporizador"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "conexión do cliente web aceptada\n"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "control remoto de aMule"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ERRO: non se pode aceptar a conexión do cliente web\n"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Foto instantánea:"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Petición fallida co seguinte erro: %s."
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"cliente 'Multi-Plataforma' p2p baseado no eMule \n"
+"\n"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Petición fallida cun erro descoñecido."
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Páxina web: http://www.amule.org \n"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Ficheiro índice non atopado: "
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Foro: http://forum.amule.org \n"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Sesión expirada - petición de conexión\n"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sesión aceptada, conectado\n"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Contactar: admin@amule.org (asuntos administrativos) \n"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sesión aceptada, non conectado\n"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Ningunha sesión aberta - petición de conexión\n"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Parte do aMule está baseado en \n"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Sesión creada - petición de conexión\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Peer-to-peer enrutamiento baseado na métrica XOR.\n"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Procesando petición [orixinal]: "
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Comprobando contrasinal\n"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Contrasinal hash inválido\n"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Mensaxe"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Contrasinal aceptado\n"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Contrasinal erróneo\n"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Conectando"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr ""
-"Non introduciches ningún contrasinal. Un contrasinal en branco non está "
-"permitido.\n"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Conectando"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Desconexión solicitada\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Desconectado"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Procesando solicitude [redirixida]: "
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Cortafogos"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Cargar modelo <str>"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Conectado"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Porto HTTP servidor Web"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Conectando"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Uso da redirección de portos UPnP no porto do servidor web"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Off"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Porto UPnP"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Usar compresión gzip"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Deter a tentativa actual de conexión"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Contrasinal de acceso total para o servidor web"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Desconectado"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Contrasinal de invitado para o servidor web"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Desconectar da rede."
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Permitir acceso de invitado"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Conectar"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Denegar acceso de invitado"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Conectar á rede."
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Cargar/gardar a configuración do servidor web dende/a aMule remoto"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Su: %.1f(%.1f) | Ba: %.1f(%.1f))"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Ruta do ficheiro de configuración de aMule. NON USAR DIRECTAMENTE!"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Su: %.1f | Ba: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Desactivar intérprete PHP (obsoleto)"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Conectado)"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Recompila páxinas PHP para outra petición"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Desconectado)"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Servidor Web aMule"
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "¿Desexar saír de aMule?"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Non dispoñible"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Confirmación de saída"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Nunca"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr ""
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Descargando..."
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr ""
 
-#: src/HTTPDownload.cpp:75
+#: src/amuleDlg.cpp:1232
 #, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+msgid "Skin directory '%s' does not exist"
+msgstr "O directorio de temas '%s' non existe"
 
-#: src/HTTPDownload.cpp:239
+#: src/amuleDlg.cpp:1237
 #, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr ""
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Preferencias"
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "AVISO: Non se pode abrir o arquivo das peles '%s' para leer"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Directorio que contén o ficheiro amulesig.dat"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Redes"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Navegador"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Fiestra de Redes"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Introduza aquí o directorio onde está teu ficheiro amulesig.dat"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Buscas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Intervalo de refresco en segundos"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Fiestra de buscas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Xerar un ficheiro de estatísticas sempre que se actualice"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Descargas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Introduza aquí o directorio onde quere xerar a imaxe de estatísticas"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Descargando"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Sube periodicamente túa imaxe de estatísticas ao servidor FTP"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Compartidos"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "Url FTP"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Fiestra de ficheiros compartidos"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Ruta FTP"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Mensaxes"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Introduza aquí a URL do seu servidor FTP"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Fiestra de mensaxes"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
-"Introduza aquí o directorio onde poñer a súa imaxe de estatísticas no "
-"servidor FTP"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Estatísticas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Usuario"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Fiestra de gráficos de estatísticas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Contrasinal"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Preferencias"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Introduza aquí o nome de Usuario para conectarse a teu servidor FTP"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Fiestra de preferencias"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr ""
-"Introduza aquí o contrasinal de Usuario para conectarse a teu servidor FTP"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Intervalo de actualización de FTP en minutos"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "A ferramenta para importar ficheiros part"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Validado"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Acerca de"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "O cartafol que contén teu ficheiro de sinatura"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Acerca de/Axuda"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Cartafol onde se xenera a imaxe de estatísticas"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "rede eD2k"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
-#, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i día(s) %i hora(s) %i min %i s"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Red Kad"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, Estatísticas aMule en liña"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Sin red"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Benvido!"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
 msgid "aMule"
 msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Máximo índice de DE desde que wxCas está executándose"
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Erro fatal: Erro ao crear temporizador"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Máximo índice DE absoluto durante execucións anteriores de wxCas"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Connectar a amule remoto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Reaxustar"
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Erro fatal: Erro ao crear temporizador"
+
+#: src/amule-remote-gui.cpp:268
+#, fuzzy
+msgid "Going to event loop..."
+msgstr "Tentando recuperar info de ficheiro..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistema"
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "Conectando"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Deter auto recargar"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Fallou a conexión"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Gardar imaxe de estatísticas en liña"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Imprimir imaxe de estatísticas en liña"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Preferencias"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Acerca de wxCas"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Iniciar auto recargar"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Auto recarga detida"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Todo"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Auto recarga iniciada"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Gardar imaxe de estatísticas"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Descoñecido"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Estatísticas aMule en liña"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Erro ao recupera-los ficheiros compartidos do usuario '%s'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
 msgstr ""
-"Houbo un problema imprimindo.\n"
-"Tal vez túa impresora actual non esté configurada?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Imprimindo"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Fake eMule versión %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"wxCas, Estatística de sinatura en liña de aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Basado en CAS por Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distribuido baixo GPL"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Fake eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, non se está executando aMule..."
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Fake eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule está iniciado"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (basado en eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule estase executando, pero está desconectado"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Alcume: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule está conectando..."
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Petición: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh Oh, estado de aMule descoñecido..."
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Estatísticas do ficheiro para esta sesión: Aceptada %d de %d peticións; %s "
+"transferida\n"
+msgstr[1] ""
+"Estatísticas do ficheiro para esta sesión: Aceptadas %d de %d peticións; %s "
+"transferidas\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Estatísticas do ficheiro para todas as sesións: Aceptada %d de %d peticións; "
+"%s transferida\n"
+msgstr[1] ""
+"Estatísticas do ficheiro para todas as sesións: Aceptadas %d de %d "
+"peticións; %s transferidas\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " foi executado durante "
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Petición dun ficheiro descoñecido"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " está detido !"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Mensaxe filtrada de '%s' (IP: %s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " non está conectado!"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nova mensaxe de '%s' (IP: %s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " está conectando..."
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr ""
+"O usuario %s (%u) pediu a súa lista de ficheiros compartidos do directorio %"
+"s -> denegado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " pasou algo estraño, compróbao !"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, fuzzy, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "AVISO: non se puido abrir o known.met."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " está conectado a "
+#: src/CanceledFileList.cpp:61
+#, fuzzy
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+"AVISO: lista de coñecidos (knownfile) corrupta, a cabeceira non é correcta."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Erro de ES lendo o ficheiro known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "aceptar"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Erro gardando o ficheiro known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "cortafogos"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "apagar"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Categoría"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " conectado"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nova categoría"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr "con "
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Escolla un cartafol para os ficheiros entrantes"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Total descargado: "
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Debe especificar un nome para a categoría!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Subido: "
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Debe especificar unha ruta para a categoría!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Descarga de sesión: "
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Erro ao crear o directorio incoming da categoría. Por favor especifique unha "
+"ruta correcta!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Descargado: "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Sesión de chat iniciada: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Subido: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Conectado ao cliente ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Conectando ao cliente ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Compartindo: "
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Erro ao conectar ao cliente / Conexión perdida ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " ficheiro(s), Clientes en cola: "
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Tempo: "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " en "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Pechar solapa"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Media de carga de sistema (1-5-15 min): "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Pechar todas as solapas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Tempo de execución do sistema: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Pechar outras solapas"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02umin %02us"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Engadir a amigos"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/ClientCreditsList.cpp:158
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Ficheiro de créditos cargado, %u cliente coñecido"
+msgstr[1] "Ficheiro de créditos cargado, %u cliente coñecidos"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
+#: src/ClientCreditsList.cpp:161
 #, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Expiraron os créditos de %u cliente!"
+msgstr[1] " - Expiraron os créditos de %u clientes!"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
-#, c-format
-msgid "%02us"
-msgstr "%02us"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Non se atopou o ficheiro 'cryptkey.dat', creando."
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "IDalta"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Detalles do cliente"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
 msgid "LowID"
 msgstr "IDbaixa"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Non conectado"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "IDalta"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Habilitado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Soportado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Non soportado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Deshabilitado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Conectado"
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Cancelado !"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Desconectado"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "Unable to open %s"
-msgstr "Non se pode abrir %s"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Parámetros de entrada"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Incompleto"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Ficheiro a hashear"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Rapaz malo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Engadir URLs opcionais para este ficheiro"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Verificado - OK"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Introduce aquí o arquivo do cal desexes calcular o enlace eD2k"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Non dispoñible"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
-"Introduce aquí a URL da cal desexes calcular o enlace eD2k: Engade o "
-"caracter / ó final para permitir o aLinkCreator engadir o nome de arquivo "
-"actual"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Engadir"
+"O usuario %s (%u) solicitou a túa lista de ficheiros compartidos -> Aceptado"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Eliminar"
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+"O usuario %s (%u) solicitou a túa lista de ficheiros compartidos -> Denegado"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Limpar"
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"O usuario %s (%u) solicitou a túa lista de cartafoles compartidos -> Aceptado"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Crear ligazón con codificacións de partes"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+"O usuario %s (%u) solicitou a túa lista de cartafoles compartidos -> Denegado"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Axuda para separar ficheiros novos e raros máis rapidamente, o coste será un "
-"tamaño de ligazón maior"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Ficheiro Hash MD4"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "Hash do arquivo eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k link"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Comezar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Gardar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Copiar ao portapapeis"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Saír"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Abrir"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Abrir un arquivo para calcular o seu enlace eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Copiar o enlace eD2k calculado ó portapapeis"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Gardar como"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Gardar o enlace eD2k calculado nun arquivo"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Acerca de"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Acerca do aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Selecciona o arquivo do cal desexes calcular o enlace eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Non se pode abrir o portapapeis"
+"O usuario %s (%u) solicitou a túa lista de ficheiros compartidos do "
+"directorio %s -> aceptado"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Nada para copiar agora !"
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr ""
+"O usuario %s (%u) pediu a súa lista de ficheiros compartidos do directorio %"
+"s -> denegado"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Selecciona o arquivo para o enlace eD2k calculado"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "O usuario %s (%u) directorios compartidos %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Non se pode abrir"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr ""
+"O usuario %s (%u) enviou unha lista de directorios compartidos non desexada."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Por favor introduza un nome de ficheiro non baleiro"
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr ""
+"O usuario %s (%u) enviou a súa lista de ficheiros compartidos ao cartafol %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Nada para gardar agora !"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr ""
+"O usuario %s (%u) rematou de enviar a súa lista de ficheiros compartidos"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
-"aLinkCreator, o creador de enlaces eD2k do aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Imaxes dende http://www.everaldo.com e http://www.icomania.com\n"
-"e http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distribuido baixo a licenza GPL"
+"O usuario %s (%u) enviou unha lista de ficheiros compartidos non deseada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Hasheando..."
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr ""
+"Usuario %s (%u) denegou o acceso á lista de ficheiros/cartafoles compartidos "
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator está a traballar para ti"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Comentarios do arquivo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Procesando Hash MD4..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Nome de usuario"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Procesando Hashes eD2k..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Nome do arquivo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Feito en %.2f s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Valoración"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Xa ten engadida esta URL !"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Comentario"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Por favor, introduza unha URL non baleira"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Sen comentarios"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Procesando número de ficheiro %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Preguntou por hashes de partes (Só usado por ficheiros > 9.5 MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u comentario"
+msgstr[1] "%u comentarios"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Non existe o ficheiro!\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, o creador de enlaces eD2k do aMule"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1344,31 +1177,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Al]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Conectando"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Moi baixo"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Baixo"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normal"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Alto"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Moi alto"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Lanzamento"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Preguntando"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Conectando vía servidor"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Cola chea"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "En cola"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Transferindo"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Descargando"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1380,7 +1239,7 @@
 
 #: src/DataToText.cpp:68
 msgid "Cannot connect LowID to LowID"
-msgstr "Non se pode realiza a conexión IDbaixa con IDbaixa"
+msgstr "Non se pode realiza-la conexión IDbaixa con IDbaixa"
 
 #: src/DataToText.cpp:69
 msgid "Too many connections"
@@ -1394,8 +1253,7 @@
 msgid "Too many Kad connections"
 msgstr "Demasiadas conexións Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Vetado"
 
@@ -1427,8 +1285,8 @@
 msgid "Remote Server"
 msgstr "Servidor remoto"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1450,10 +1308,10 @@
 
 #: src/DataToText.cpp:135
 msgid "Search Result"
-msgstr "Resultados da búsqueda"
+msgstr "Resultado da b"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Completado"
 
@@ -1477,7 +1335,7 @@
 msgid "ERROR: Failed!"
 msgstr "ERRO: Non se puido realizar a acción!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "En cola"
 
@@ -1489,873 +1347,307 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Formato de ficheiro temp incorrecto ou descoñecido."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Por defecto"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albanés"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Árabe"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturiano"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Euskera"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Búlgaro"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Catalán"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Chinés (Simplificado)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Chinés (Tradicional)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Croata"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Checo"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Danés"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Holandés"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Inglés (R. U.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estonio"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finlandés"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Francés"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galego"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Alemán"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Grego"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hebreo"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Húngaro"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italiano (Suizo)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Xaponés"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Coreano"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lituano"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Noruego (Nynorsk)"
-
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polaco"
-
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugués"
-
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugués (Brasileiro)"
-
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Ruso"
-
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Esloveno"
-
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Castelán"
-
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Sueco"
-
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turco"
-
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ucraniano"
-
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Imposible determinar o navegador seleccionado!"
-
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"O porto TCP non pode ser máis alto que 65532 debido a que o socket do "
-"servidor UDP está sendo TCP+3"
-
-#: src/Preferences.cpp:1681
-#, c-format
-msgid "Default port will be used (%d)"
-msgstr "Empregarase o porto predeterminado (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Nome do servidor"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Enderezo"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Porto"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Descrición"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Usuarios"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Ficheiros"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Erro"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Estático"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versión"
-
-#: src/ServerListCtrl.cpp:144
-msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
-"Está conectado ao servidor que tenta borrar. Por favor desconéctese "
-"primeiro. O servidor NON foi borrado."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Información"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Nome descoñecido)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "¿Estas seguro de que queres borrar o servidor estático %s?"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Si"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Non"
-
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Erro ao abrir '%s'"
-
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Servidores (%i)"
-
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Servidor"
-
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Conectar ao servidor"
-
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Marcar servidor como estático"
-
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Marcar servidor como non estático"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Marcar servidores como estáticos"
-
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Marcar servidores como non estáticos"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Tamaño"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Borrar servidor"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Transferido"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Borrar servidores"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Velocidade"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Borrar todos os servidores"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Progreso"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Copiar o enlace eD2k ó portapapeis"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Fontes"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Copia os enlaces eD2k ó portapapeis"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioridade"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Reconectar ao servidor"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Estado"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "¿Estas seguro de que queres borrar todos os servidores?"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Tempo para rematar"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "¿Estás seguro de que queres borrar o servidor seleccionado(s)?"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Última vez visto completo"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "¿Estás seguro de que queres borrar os servidores seleccionados?"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Última recepción"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Desactivado [%s]"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "¿Estás seguro de que queres borrar o ficheiro seleccionado?"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Este é aMule %s basado en eMule"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "¿Estás seguro de que queres borrar os ficheiros seleccionados?"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Running on %s"
-msgstr "Executando en %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr "Visita http://www.amule.org por se existe algunha nova versión."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ERRO GRAVE: Non se puido crear o temporizador"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "control remoto de aMule"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Foto instantánea:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Cliente p2p multiplataforma baseado no eMule\n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Páxina web: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Foro: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Contacto: admin@amule.org (asuntos de administración) \n"
-
-#: src/amuleDlg.cpp:469
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
+"Feedback from: %s (%s)\n"
 "\n"
 msgstr ""
-" Copyright (C) 2003-2009 aMule Team \n"
+"Reacción de : %s (%s)\n"
 "\n"
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr "Parte do aMule baséase en \n"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Automático"
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Peer-to-peer enrutamiento baseado na métrica XOR.\n"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Deter"
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Mensaxe"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pausa"
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Conectando"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "Continua&R"
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Desconectado"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "&limpeza completada"
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Cortafogos"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Pasar todas as A4AF a este ficheiro agora"
 
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Conectado"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Pasar todas as A4AF a este ficheiro (Automático)"
 
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Conectando"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Pasar todas as A4AF a outro ficheiro agora"
 
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Off"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Opcións extendidas"
 
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Deter a tentativa actual de conexión"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Previsualizar"
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Desconectado"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Mirar &detalles do ficheiro"
 
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Desconectar da rede."
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Ver todo-los comentarios"
 
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Conectar"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Copiar a URI magnética ao portapapeis"
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Conectar á rede."
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Copiar eD2k &enlace ó portapapeis"
 
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Su: %.1f(%.1f) | Ba: %.1f(%.1f))"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Copiar resposta ao portapapeis"
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Su: %.1f | Ba: %.1f"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "sen asignar"
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Conectado)"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Asignar a categoría"
 
-#: src/amuleDlg.cpp:836
-#, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Desconectado)"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "Abri-lo arquiv&O"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "¿Desexar saír de aMule?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Introducir un novo nome para este ficheiro:"
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Confirmación de saída"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Renomear o ficheiro"
 
-#: src/amuleDlg.cpp:1182
-#, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "O directorio de temas '%s' non existe"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "AVISO: Non se pode abrir o arquivo das peles '%s' para leer"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Redes"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Fiestra de redes"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Buscas"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Fiestra de búsquedas"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Transferencias"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Fiestra de transferencia de arquivos"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Compartidos"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Fiestra de arquivos compartidos"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Mensaxes"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Fiestra de mensaxes"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Fiestra del gráfico de las estadísticas"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Fiestra da configuración das preferencias"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importar"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "A ferramenta para importar ficheiros part"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Acerca de/Axuda"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "rede eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Red Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Sin red"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Xeral"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Conexión"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Directorios"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Servidores"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Seguranza"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Interface"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filtros:"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Controles remotos"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Sinatura Online"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Eventos"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Depurando"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Definido polo usuario"
+msgid "Downloads (%i)"
+msgstr "Descargas (%i)"
 
-#: src/PrefsUnifiedDlg.cpp:539
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-"aMule debe ser reiniciado para activar estes trocos:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- Porto TCP cambiado.\n"
+"Para evitar a aparición deste aviso en cada vista previa,\n"
+"establece o teu reproductor de vídeo nas preferencias (mplayer por defecto)."
 
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- Porto UDP cambiado.\n"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Previsualizar ficheiro"
 
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+#: src/DownloadListCtrl.cpp:1461
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
 msgstr ""
-"A tua lista auto-actualizable dos servidores esta baleira.\n"
-"A lista dos servidores auto-actualizable ó inicio será desactivada."
+"ERRO: Non se pode executar o reproductor multimedia externo! Comando: `%s'"
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
 msgstr ""
-"Tes activado conexións externas pero non ten especificado un contrasinal.\n"
-"Conexións externas non poden ser activadas a non ser que especifique un "
-"contrasinal válido."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Idioma cambiado.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Cartafol temporal cambiado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- Red ED2K habilitada.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Subida: 0.0 | Baixada: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
-"eD2k e Kad están desactivados.\n"
-"Non poderás conectarte ata activar ó menos un deles."
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad non se iniciará se non está activado o porto UDP.\n"
-"Activar o porto UDP ou desactivar Kad."
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "Cargando ficheiro server.met: %s"
 
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"Debe reiniciar o aMule agora.\n"
-"Se non o reinicia ahora, algo malo pode suceder.\n"
+#: src/DownloadQueue.cpp:132
+#, fuzzy, c-format
+msgid "Loading PartFile %u of %u"
+msgstr "Cargando datos desde a antiga descarga do ficheiro (%u de %u)"
 
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Túa auto-actualización da lista de servidores está en branco.\n"
-"Por favor completa ao menos unha URL para sinalar un ficheiro server.met.\n"
-"Prema no botón \"Lista\" para introducir unha URL."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Ficheiros temporais"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Ficheiros entrantes"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Sinaturas Online"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Escolla un cartafol para %s"
+"ERRO: Non se puido cargar o arquivo de copia de seguridade. Busca en http://"
+"forum.amule.org para encontrar solución de recuperación de arquivos part.met."
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Atopar o reproductor de vídeo"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Selecione o navegador"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Non se atoparon ficheiros .part"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Executable%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Editar a lista dos servidores"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Atopados %u ficheiro part"
+msgstr[1] "Atopados %u ficheiros part"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Engadir aquí unha URL para descargar unha lista server.met.\n"
-"Só unha url nesta liña"
+"O sistema de arquivos do directorio temporal non soporta arquivos grandes."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Periodo de actualización: %d seg"
-msgstr[1] "Periodo de actualización: %d segs"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"O sistema de arquivos do directorio de descarga non soporta arquivos grandes."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Tempo medio de gráfico: %d min"
-msgstr[1] "Tempo medio de gráfico: %d mins"
+msgid "Downloading %s"
+msgstr "Descargando %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Escala gráfica de conexións: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Xa estas intentando descargar o ficheiro '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Frecuencia de actualización: %d seg"
-msgstr[1] "Frecuencia de actualización: %d segs"
+msgid "You already have the file '%s'"
+msgstr "Xa tes o ficheiro '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Tamaño do ficheiro búfer %d byte"
-msgstr[1] "Tamaño do ficheiro búfer %d bytes"
+msgid "You are already trying to download the file %s"
+msgstr "Xa estas intentando descargar este ficheiro %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Tamaño da cola de subida %d cliente"
-msgstr[1] "Tamaño da cola de subida %d clientes"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Non se puido convertir o enlace magnet a eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Intervalo de refresco da conexion ao servidor: %d minuto"
-msgstr[1] "Intervalo de refresco da conexion ao servidor: %d minutos"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Intervalo de refresco da conexion ao servidor. Desactivada"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Porto UDP para peticións extendidas ao servidor (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "deshabilitado"
+msgid "Unknown protocol of link: %s"
+msgstr "Protocolo descoñecido da ligazón: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Executar comando no evento `%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Activar execución de comando no núcleo"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Comando do núcleo:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Activar execución de comando no GUI"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Comando de GUI:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "As seguintes variables serán reemprazadas:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Enlace eD2k inválido! ERRO: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Intento de acceso non autorizado. Conexión pechada."
+#: src/ExternalConn.cpp:260
+#, fuzzy
+msgid "Client sent packet after authentication failed."
+msgstr "Fallou a autenticación."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Conexión externa pechada."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Conexión externas desactivadas debido a un contrasinal baleiro!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Conexións externas desactivadas no ficheiro de configuración"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Nova conexión externa aceptada"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERRO: non se puido aceptar unha nova conexión externa"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "Conexión externa refusada debido a un contrasinal baleiro nas preferencias!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Conectando ao cliente: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Versión descoñecida"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2363,2230 +1655,1062 @@
 "EC incorrecto na ID de versión, debe haber unha incompatibilidade. Usa "
 "núcleo e remoto da mesma versión."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 "Non pode conectarse a una versión estable dende una versión SVN arbitraría! "
 "Prevido posible crash"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Fallou a autenticación."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Versión de protocolo inválido."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Marcador de versión de protocolo inexistente."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "Fallou a autenticación."
+
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "Fallou a autenticación."
+
+#: src/ExternalConn.cpp:516
+#, fuzzy
+msgid "Invalid request, please authenticate first."
 msgstr "Resposta inválida, debería autenticarse primeiro."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Acceso concedido."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, fuzzy, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Filtrar mensaxes de clientes descoñecidos"
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Intento de acceso non autorizado. Conexión pechada."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Fallou o comando remoto PartFile: Ficheiro hash non atopado: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Ficheiro hash non atopado: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! Erro de proceso de OpCode!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Servidor non engadido"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "servidor non atopado: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "necesita definir o servidor que se vai a eliminar"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k está deshabilitado nas preferencias."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Busca en progreso. Resultado obtidos en breve!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Buscador web da interface remota non fai sensible."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad está desactivado nas preferencias."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Sen puntos para gráfica."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Seu cliente non está configurado para este nivel de detalle."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Conexión externa: apagado solicitado"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Xa está apagando."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Conexión externa: engadindo ligazón '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Ligazón inválido ou xa está na lista."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Ficheiro non atopado."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Nome de ficheiro inválido."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Imposible renomear o ficheiro."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad está desactivado nas preferencias."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Xa estás conectado o eD2k."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Conectado o eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Xa está conectado a Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Conectando a Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Tódalas redes están desactivadas."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Desconectado do eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Desconectado de Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Conexión externa: recibido código de operación inválido: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "opcode inválido (versión de protocolo inválido?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Fallou ao abrir o ficheiro (%s), eliminando da lista de ficheiros "
-"compartidos."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Petición hashset para un ficheiro descoñecido: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Comando `%s' con pid `%d' rematou con código de estado `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Servidor non engadido: Non se especificou IP ou nome de servidor."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Servidor non engadido: Porto de servidor especificado inválido."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Estado do eD2k:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Conectado"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Porto"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Estado Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Executando"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Estado:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Desconectado"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Estado de conexión:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Cortafogos"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "Ok"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Estado do cortafogos:"
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Conectado a amigo"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Non amigo"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Media de usuarios:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Media de ficheiros:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Non executando"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Tempo de execución: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Transferencias"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Subidas"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Datos subidos (Sesión (Total)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Overhead total (Paquetes ): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Petición de ficheiro Overhead (Paquetes): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Intercambio de fontes Overhead (Paquetes): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Servidores Overhead (Paquetes): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Overhead Kad (Paquetes ): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Cripta xerais (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Subidas activas: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Subidas agardando: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Sesión de subidas totais rematadas: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Total de subidas erradas na sesión: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Tempo medio de subida: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Descargas"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Datos descargados (Sesión (Total)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Fontes atopadas: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Descargas activas (pedazos): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Índice SU:BA Sesión (Total): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Velocidade media de baixada (Sesión): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Velocidade media de subida (Sesión): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Velocidade máxima de baixada (Sesión): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Velocidade máxima de subida (Sesión): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Reconexións: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Tempo dende a primeira tranferencia: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Conectado ao servidor dende: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Conexións activas (estimadas): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Límite máximo de conexións rechazado: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Media de conexións (estimado): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Pico de conexións (estimado): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Clientes"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrado"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Total:%i Coñecido: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Servidores activos: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Servidores caídos: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Total: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Servidores borrados: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Servidores filtrados: %s"
-
-#: src/Statistics.cpp:720
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Usuarios en servidores activos: %llu"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Extensión descoñecida '%s' para o comando '%s'.\n"
 
-#: src/Statistics.cpp:721
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Ficheiros nos servidores activos: %llu"
+msgid "Unknown command '%s'.\n"
+msgstr "Comando descoñecido '%s'.\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Usuarios totais: %llu"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Este comando non pode ter un argumento.\n"
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "Ficheiros totais: %llu"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Este comando deber ter un argumento.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Ocupación do servidor: %.2f%%"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Este comando está incompleto, debe usar unha das extensión de abaixo.\n"
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Número de ficheiros compartidos: %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Extensións dispoñibles:\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Tamaño total dos ficheiros compartidos: %s"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Comandos dispoñibles:\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Average file size: %s"
-msgstr "Tamaño medio de arquivo: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Sistema operativo"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Non recibido"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Pegar"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Seleccionar todo"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "A busca de Kad non pode ser feita se non está executando Kad"
-
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
-"Non se poido realizar unha procura no eD2k se non se está conectado o eD2k"
-
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Erro inesperado tentando buscar en Kad:"
+"\n"
+"Todos os comandos son sensibles ás maiúsculas\n"
+"Escriba '%s <command>' para obter información detallada do <comando>.\n"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Mensaxe filtrada de '%s' (IP: %s)"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Saír da aplicación."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nova mensaxe de '%s' (IP: %s)"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Mostrar axuda."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
-"O usuario %s (%u) solicitou a túa lista de ficheiros compartidos -> Aceptado"
+"Para obter axuda dun comando, teclee 'help <comando>'.\n"
+"Para obter a lista completa de comandos, teclee 'help'.\n"
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
-"O usuario %s (%u) solicitou a túa lista de ficheiros compartidos -> Denegado"
+"\n"
+"Usa '%s' para lista de comandos\n"
+"\n"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"O usuario %s (%u) solicitou a túa lista de cartafoles compartidos -> Aceptado"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Erro de sintase!"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
-"O usuario %s (%u) solicitou a túa lista de cartafoles compartidos -> Denegado"
+"Erro procesando o comando - isto non debería pasar! Por favor, reporte o "
+"bug\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"O usuario %s (%u) solicitou a túa lista de ficheiros compartidos do "
-"directorio %s -> aceptado"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Este comando non debería ter ningún parámetro."
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"O usuario %s (%u) pediu a súa lista de ficheiros compartidos do directorio %"
-"s -> denegado"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Este comando debe ter un parámetro."
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "O usuario %s (%u) directorios compartidos %s"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Argumento inválido."
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr ""
-"O usuario %s (%u) enviou unha lista de directorios compartidos non desexada."
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Isto é un comando incompleto."
 
-#: src/ClientTCPSocket.cpp:1025
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr ""
-"O usuario %s (%u) enviou a súa lista de ficheiros compartidos ao cartafol %s"
+msgid "Type '%s' to get more help.\n"
+msgstr "Teclee '%s' para obter máis axuda.\n"
 
-#: src/ClientTCPSocket.cpp:1032
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr ""
-"O usuario %s (%u) rematou de enviar a súa lista de ficheiros compartidos"
+msgid "This is %s %s %s\n"
+msgstr "Isto é %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1037
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr ""
-"O usuario %s (%u) enviou unha lista de ficheiros compartidos non deseada"
+msgid "This is %s %s\n"
+msgstr "Isto é %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
-"Usuario %s (%u) denegou o acceso á lista de ficheiros/cartafoles compartidos "
+"\n"
+"Creando cliente...\n"
 
-#: src/KadDlg.cpp:132
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Nodes (%u)"
-msgstr "Nodos (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Ip inválida ao bootstrap"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Porto inválido ao bootstrap"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Por favor encha todos os campos requeridos"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Estas seguro de que queres descargar un ficheiro nodes.dat novo?\n"
-
-#: src/KadDlg.cpp:197
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Facendo isto borrarás os teus nodos actuais e reiniciarás a conexión "
-"Kademlia."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Continuar?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "ERRO: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "AVISO: "
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Engadir un amigo"
+"\n"
+"OK, saíndo de %s...\n"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Tes que introducir un porto e unha ip válidos"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
+"Non se pode conectar cun contrasinal baleiro.\n"
+"Debe especificar un contrasinal nun ficheiro de configuración\n"
+"ou nunha liña de comando, ou introducir un cando se pregunte.\n"
+"\n"
+"Saíndo...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Información"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Mostrar este texto de axuda."
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "O hash de usuario especificado non é válido!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Anfitrión onde estase executando aMule. (por defecto: localhost)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Fontes"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Porto de aMule para conexión externa. (por defecto: 4712)"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Ficheiro"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Contrasinal para conexión externa."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Descarga"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Ler configuración do ficheiro."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Categoría"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Non imprimir ningunha saída a stdout."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Principal"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Estar difuso - mostrar as mensaxes de depuración."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Descargar en categoría"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Establecer locale de programa (lingua)."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Procurar arquivos relacionados (eD2k, búsqueda local)"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Escribir opcións da liña de comando ao ficheiro de configuración."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Marcar o arquivo como coñecido"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr ""
+"Crear ficheiro de configuración basado no ficheiro de configuración de aMule."
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Connectar a amule remoto"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Imprimir versión de programa."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Fallou a conexión"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Detalles do ficheiro"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "ERRO"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% feito"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Conexión fallida. Non se puido conectar a %s:%d\n"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
-"AVISO: Non podes engadirte a ti mesmo como unha fonte para un enlace eD2k "
-"tendo ID baixa."
+"¡ No se puido abrir o arquivo de amigos 'emfriends.met' para a súa lectura !"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Usuarios: E: %s K: %s | Ficheiros E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+"¡ No se puido abrir o arquivo de amigos 'emfriends.met' para a súa "
+"escritura !"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Todo"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr ""
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Usuarios totais: %s | Ficheiros totais: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Amigos"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Transferido"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Ver &Detalles"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Velocidade"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Engadir un amigo"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Progreso"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Borrar amigo"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Estado"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Enviar &Mensaxe"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Tempo para rematar"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Ver ficheiros"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Última vez visto completo"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Establecer ranura de amigo"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Última recepción"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Estás seguro de que queres borrar o amigo/a seleccionado?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "¿Estás seguro de que queres borrar o ficheiro seleccionado?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Estás seguro de que queres borrar os amigos/as seleccionados?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "¿Estás seguro de que queres borrar os ficheiros seleccionados?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Non está permitindo establecer máis dun espazo de amigo.\n"
+" Só un espazo foi asignado."
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Selección múltiple"
+
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Enviar mensaxe a usuario"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Mensaxes a enviar:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Deter"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pausa"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "Continua&R"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "&limpeza completada"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Pasar todas as A4AF a este ficheiro agora"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Pasar todas as A4AF a este ficheiro (Automático)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Pasar todas as A4AF a outro ficheiro agora"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Opcións extendidas"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Previsualizar"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Mirar &detalles do ficheiro"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Ver todo-los comentarios"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Copiar a URI magnética ao portapapeis"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "sen asignar"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Asignar a categoría"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "Abri-lo arquiv&O"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Eliminar de amigos"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Engadir a amigos"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Enviar mensaxe"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Intercambiar este ficheiro"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "Kb/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Preguntando por outro ficheiro"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Descargas (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Para evitar a aparición deste aviso en cada vista previa,\n"
-"establece o teu reproductor de vídeo nas preferencias (mplayer por defecto)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Previsualizar ficheiro"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Subidas agardando: %s"
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr ""
-"ERRO: Non se pode executar o reproductor multimedia externo! Comando: `%s'"
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "En cola"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "ERRO: -Non se pode crear o ficheiro part)"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Subir"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Tentando cargar a copia de seguranza do ficheiro met desde %s"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Ningún"
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ERRO: Non se puido abrir o arquivo part.met: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Non"
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ERRO: o arquivo part.met ten tamaño 0: %s ===> %s"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Si"
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ERRO: Arquivo part.met inválido versión do arquivo: %s ==> %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Descargando..."
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
-"ERRO: %s (%s) está corrupto (conta de etiquetas errónea), imposible cargar o "
-"arquivo."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Tentando recuperar info de ficheiro..."
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "Recuperando ficheiro sen nome - recuperareino como RecoveredFile.dat"
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "AVISO: Non se pode abrir o arquivo das peles '%s' para leer"
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
-"Recuperada toda a info dispoñible do ficheiro :D - Tentando empregala..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Imposible recuperar info de ficheiro :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Non se pode abrir %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "AVISO: %s pode estar corrupto (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "ERRO ao gardar o ficheiro part: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Imposible recuperar a duración de '%s' - empregando o arquivo %s ."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' ten tamaño 0 - empregando ficheiro %s."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Erro ao gardar o ficheiro part.met.seeds por %s"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Gardadas %i fonte seeds para o ficheiro part: %s (%s)"
-msgstr[1] "Gardadas %i fontes seeds para o ficheiro part: %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "O ficheiro part %s (%s) non ten ficheiro seeds"
-
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "O ficheiro part %s (%s) ten un ficheiro seed baleiro"
-
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Erro lendo o ficheiro seed do ficheiro part (%s - %s): %s"
-
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Parte corrupta atopada (%d) en %d ficheiro part %s - FileResultHash |%s| "
-"FileHash |%s|"
-msgstr[1] ""
-"Parte corrupta atopada (%d) en %d ficheiros part %s - FileResultHash |%s| "
-"FileHash |%s|"
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Parte (%i) completada atopada en %s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Rematado de rehashear %s"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Erro non esperado mentres completábase %s. Arquivo pausado"
-
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Descarga rematada: %s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Eliminando ficheiro: %s"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
-"ERRO: Non se puido crear o hash da parte baixada, conxunto de hashes non "
-"completo para '%s'"
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
-"ERRO: Non se puido crear o hash da parte baixada, conxunto de hashes non "
-"completo (%s). Isto non debería ocorrer nunca"
-
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "AVISO: Non hai suficiente espazo libre en disco! Pausando ficheiro: %s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Part descargado %i é corrupto no ficheiro: %s"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Part corrupto recuperado %i para %s -> Bytes gardados: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Reservando"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Espazo no disco insuficiente"
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Parado"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
 msgstr "Descargado"
 
-#: src/PartFile.cpp:4167
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ERRO: Fallou ó abrir o partfile '%s'"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "AVISO: non se puido abrir o known.met."
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
-"AVISO: lista de coñecidos (knownfile) corrupta, a cabeceira non é correcta."
-
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Erro de ES lendo o ficheiro known.met: %s"
-
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Erro gardando o ficheiro known.met: %s"
-
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Atopados %i ficheiro compartidos"
-msgstr[1] "Atopados %i ficheiros compartidos"
-
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Atopados %i ficheiro compartidos, %i descoñecido"
-msgstr[1] "Atopados %i ficheiros compartidos, %i descoñecidos"
-
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ERRO: Intento de compartir %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Comentarios do arquivo"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Valoración"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Comentario"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Sen comentarios"
-
-#: src/CommentDialogLst.cpp:104
-#, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u comentario"
-msgstr[1] "%u comentarios"
 
-#: src/ServerConnect.cpp:69
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"Fallou ao conectar a todos os servidores ofuscados listados. Tentándoo de "
-"novo sen ofuscación."
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Erro ao conectar a todos os servidores."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "Protocolo eD2k deshabilitado nas preferencias, non se conecta."
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Reconectar ao servidor"
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
-"Non se atoparon servidores válidos para conectar na lista dos servidores"
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Conectar a %s (%s:%i)"
-
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Conexión establecida en: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr "Erro fatal conectando. A conexión a internet podría estar desactivada"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Conexión perdida con %s (%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) parece estar caido."
 
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) parece estar cheo."
-
-#: src/ServerConnect.cpp:381
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Reintentarase a conexión automática ao servidor en %d segundos"
-msgstr[1] "Reintentarase a conexión automática ao servidor en %d segundo"
+msgid "Download new GeoIP.dat from %s"
+msgstr ""
 
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Conexión perdida"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr ""
 
-#: src/ServerConnect.cpp:408
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Conectando a %s (%s:%i) fallou."
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ERRO: Socket inválido ó comprobar o timeout"
+msgid "Failed to remove %s file, aborting update."
+msgstr ""
 
-#: src/ServerConnect.cpp:460
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Tentando conectar a %s (%s:%i) fora de tempo."
-
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
-"ERRO: Non se puido cargar o arquivo de copia de seguridade. Busca en http://"
-"forum.amule.org para encontrar solución de recuperación de arquivos part.met."
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Non se atoparon ficheiros .part"
-
-#: src/DownloadQueue.cpp:171
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Atopados %u ficheiro part"
-msgstr[1] "Atopados %u ficheiros part"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
+msgid "Successfully updated %s"
 msgstr ""
-"O sistema de arquivos do directorio temporal non soporta arquivos grandes."
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
-"O sistema de arquivos do directorio de descarga non soporta arquivos grandes."
 
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Descargando %s"
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Erro ao decarga-la lista de servidores dende %s"
 
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Xa estas intentando descargar o ficheiro '%s'"
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Erro ao decarga-la lista de servidores dende %s"
 
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Xa tes o ficheiro '%s'"
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Cargando filtrados de IP 'ipfilter.dat' e 'ipfilter_static.dat'."
 
-#: src/DownloadQueue.cpp:364
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Xa estas intentando descargar este ficheiro %s"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr ""
+"Fallou ao cargar o ficheiro ipfilter.dat '%s', atopado formato descoñecido."
 
-#: src/DownloadQueue.cpp:1299
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Non se puido convertir o enlace magnet a eD2k: %s"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr ""
+"Fallou ao cargar o ficheiro ipfilter.dat '%s', non se puido abrir o ficheiro."
 
-#: src/DownloadQueue.cpp:1307
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Protocolo descoñecido da ligazón: %s"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Cargados %u rango de IP de '%s'."
+msgstr[1] "Cargados %u rangos de IP de '%s'."
 
-#: src/DownloadQueue.cpp:1328
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Enlace eD2k inválido! ERRO: %s"
-
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Executar <str> e saír."
-
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Formato de IP inválido. Usar xxx.xxx.xxx.xxx:xxxx\n"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u liña malformada foi descartada."
+msgstr[1] "%u liñas malformadas foron descartadas."
 
-#: src/TextClient.cpp:309
-msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+#: src/IPFilter.cpp:503
+#, c-format
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
-"Este comando precisa dun argumento. Argumentos válidos: 'all', nome dun "
-"ficheiro ou un número.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Procesando hash:"
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Procesando nome de ficheiro:"
 
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
-"Este comando precisa dun argumento. Argumentos válidos: un arquivo hash.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Non é un número válido\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Hash inválido (a lonxitude debería ser exactamente 32 caracteres)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "A operación tivo éxito."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Petición fallida co seguinte erro: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "O filtrado de IP para clientes é %s\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "Apagado"
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "Acendido"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "O filtrado de IP para servidores é %s.\n"
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
+msgstr "Clientes coñecidosde Bootstrap"
 
-#: src/TextClient.cpp:664
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "O nivel de filtrado de IP actual é %d.\n"
+msgid "Nodes (%u)"
+msgstr "Nodos (%u)"
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Límites de ancho de banda: Subida: %u kB/s, Baixada: %u kB/s\n"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Ip inválida ao bootstrap"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Porto inválido ao bootstrap"
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "Conectado a %s %s %s"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Por favor encha todos os campos requeridos"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "con IDbaixa"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Estas seguro de que queres descargar un ficheiro nodes.dat novo?\n"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "con ID alta"
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr ""
+"Facendo isto borrarás os teus nodos actuais e reiniciarás a conexión "
+"Kademlia."
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Conectando"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Continuar?"
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Non conectado"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: palabra de busca demasiado corta"
 
-#: src/TextClient.cpp:723
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+msgid "Keyword for search: %s"
 msgstr ""
-"\n"
-"Descarga: \t%s"
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"Subido:\t%s"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: A palabra buscada xa está na lista de búsqueda:"
 
-#: src/TextClient.cpp:729
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Clientes en cola:\t%d\n"
 
-#: src/TextClient.cpp:732
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Lido %u contacto Kad"
+msgstr[1] "Lidos %u contactos Kad"
+
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Fontes totais:\t%d\n"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Número de resultados de busca: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "POR FACER - mostrar o progreso dunha busca"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Recibida unha resposta descoñecida desde o servidor, OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Mostrar información de estado corta."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Mostrar estado de conexión, velocidade subida/descarga actual, etc.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Mostrar árbore de estatísticas completa."
-
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Opcionalmente, un número entre 0-255 pode ser un argumento deste comando,\n"
-"o cal di cántas entradas da árbore de versión de cliente deberían "
-"mostrarse.\n"
-"Con 0 ou sen valor significa 'sen límite'.\n"
-"\n"
-"Exemplo: 'statistics 5' mostrará só as 5 versións que máis se repitan de "
-"calquer cliente.\n"
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Apagar o aMule."
-
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Rematar o núcleo remoto (amule/amuled) en funcionamiento.\n"
-"Isto rematará tamén o cliente en modo texto, xa que non se pode\n"
-"empregar sen un núcleo en funcionamiento.\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Recargar o obxecto dado."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Escribio %d contacto Kad"
+msgstr[1] "Escribio %d contactos Kad"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Recarga a lista de ficheiros compartidos."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Nome de ficheiro"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Recargar a táboa de filtrado de IP desde ficheiro."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Tamaño do arquivo"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Conectar á rede."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Relación subida/baixada"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"Isto conectará a todas as redes que estén habilitadas en opcións.\n"
-"Opcionalmente tamén podes especificar un servidor de forma IP:Porto, para\n"
-"conectar a ese servidor soamente. A IP debe ser un enderezo IPv4,\n"
-"ou un nome DNS."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Subido"
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Conectar só ó eD2k."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Solicitado"
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Conectar só a Kad."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Aceptado"
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Desconectado da rede."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Fontes completas"
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Isto desconectaralle de todas as redes nas que está actualmente conectado.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Desconectar só do eD2k."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Desconectar só de Kad."
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Engade un enlace eD2k o magnet ó núcleo."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"O enlace eD2k a engadir pode ser:\n"
-"*) un enlace a un arquivo (ed2k://|file|...), se engadirá á cola das "
-"descargas,\n"
-"*) un enlace a un servidor (ed2k://|server|...), se engadirá á lista dos "
-"servidores,\n"
-"*) ou un enlace a unha lista de servidores, neste caso, todos os servidores "
-"da lista\n"
-"se engadirán á lista dos servidores.\n"
-"\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Establecer un valor de preferencia."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Establecer opcións de filtrado de IP."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Activar o filtrado de IP para clientes e servidores."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Desactivar o filtrado de IP para clientes e servidores."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Activar/Desactivar filtrado de IP para clientes."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Activar filtrado de IP para clientes."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Desactivar filtrado de IP para clientes."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Activar/Desactivar filtrado de IP para servidores."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Activar filtrado de IP para servidores."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Desactivar filtrado de IP para servidores."
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Seleccionar nivel de filtrado de IP"
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Niveis válidos no filtro 0-255, e o valor por defecto (inicial)\n"
-"é 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Establecer límite de ancho de banda."
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "O valor dado a estos comandos ha ser en kilobytes/sec.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Establecer límite de ancho de banda de subida."
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Establece o límite de ancho de banda de descarga."
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Obter e mostrar un valor de opcións."
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Versión descoñecida"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Obter opcións de filtrado de IP."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "AVISO: Non se pode abrir o arquivo das peles '%s' para leer"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Obter o estado do filtro de IP para clientes e servidores."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Hasheando"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Obter o estado do filtro de IP só para clientes."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Completando"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Obter o estado do filtro de IP só para servidores."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Completado"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Obter nivel de filtrado de IP."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Pausado"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Obter límite de ancho de banda."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Erróneo"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Facer unha busca."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Agardando"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"Un tipo de busca ten que ser especificado dando o tipo:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Exemplo: 'search kad ficheiro' executará unha busca kad para \"ficheiro\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Debe especificar un contrasinal non baleiro."
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Executar unha busca global."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Contrasinal inválido, sen un hash MD5!"
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Executar unha busca global"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Erro de conexión"
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Executar unha busca de kad"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "Errada conexión EC. Resposta baleira."
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Mostrar os resultados da última busca."
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "Conexión externa: Mala resposta do servidor. Conexión pechada."
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Devolve o resultado da busca anterior.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Éxisto! Conexión establecida en aMule"
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Mostralo progreso dunha procura."
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Éxito! Conexión establecida."
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Mostralo progreso dunha procura.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Conexión externa: Acceso denegado debido a:"
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Comezar descargando un ficheiro"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "Conexión externa: Acceso denegado"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
-"O número dun ficheiro da última busca tense que dar.\n"
-"Exemplo: 'download 12' iniciará a descarga do ficheiro co número 12 da busca "
-"a busca anterior.\n"
-
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Pausar descarga."
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Continuar descarga."
-
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Cancelar descarga."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "ERRO: Non se puido escoitar o porto TCP."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Establecer a prioridade da descarga."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "ERRO: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr ""
-"Establecer a prioridade dunha descarga a Baixa, Normal, Alta ou Auto.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "AVISO: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Establecer a prioridade a baixa."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Pechar"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Establecer a prioridade a normal."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Cortar"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Establecer a prioridade a alta."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Copiar"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Establecer a prioridade a auto."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Pegar"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Mostrar colas/listas."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Limpar"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Mostrar cola subida/descarga, lista de servidores ou lista de ficheiro "
-"compartidos.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Seleccionar todo"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Mostrar cola de subida."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "Kb/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Mostrar cola de descarga."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Ilimitado"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Mostrar rexistro."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Menú aMule"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Mostrar lista de servidores."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Límites de velocidade:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Reiniciar rexistro."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "SU: Ningunha"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Comando obsoleto, emprege '%s' no seu lugar."
+msgid "UL: %u"
+msgstr "UL: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Este comando quedou obsoleto e probablemente sexa eliminado nun futuro.\n"
-"Emprege '%s' en lugar dese.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DE: Ningunha"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ERRO: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "DE: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "AVISO: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Velocidade de baixada: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "A nova IDcliente é %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "ATENCIÓN: ¡Reciviches ID-Baixa!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tIsto sucede porque está detrás dun cortafogos ou dun router."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tPara máis información, por favor ves a http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Velocidade de subida: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Información recibida do servidor descoñecida! - demasiado corta"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Información de cliente"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Recibido %d novo servidor"
-msgstr[1] "Recibidos %d novos servidores"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Gardado completo da lista de servidores."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Servidor rexeitou o último comando"
+msgid "Nickname: %s"
+msgstr "Alcume: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Paquete bogus recibido do servidor: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Non seleccionou un alcume!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Erro ao procesar o paquete desde o servidor: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID de cliente: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Non se pode crear o fío da DNS para conectar a %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Non conectado"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "IP de servidor %s (%s) está filtrada. Non conectará."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Nome do servidor: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "usando ofuscación de protocolo."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP de servidor :"
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Conectando a %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Non conectado"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Non se puido aclarar a dns para o servidor %s: Imposible conectar!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Fallou ao cargar o dato do país desde"
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Cargada %d imaxe de bandeiras."
-msgstr[1] "Cargadas %d imaxes de bandeiras."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr "Estás seguro de cancelar e borrar todos os ficheiros desta categoría?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Confirmación requerida"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Todo o demais"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Incompleto"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Activo"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Vídeo"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Audio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Arquivo"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Imaxe de CD"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Imaxes"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Texto"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Selecione o filtro de visionado"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Engadir categoría"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Editar categoría"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Borrar categoría"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Nome de ficheiro"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Tamaño do arquivo"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Relación subida/baixada"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Subido"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Solicitado"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Aceptado"
+msgid "TCP port: %d"
+msgstr "Porto TCP:  %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Fontes completas"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "Porto TCP: Non está listo aínda"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Importando %s: %s"
+msgid "UDP port: %d"
+msgstr "Porto UDP: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Lendo cartafol temporal"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "Porto UDP: Non está listo aínda"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Obtendo información básica de ficheiro info de descarga"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Sinatura Online: Activada"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Creando ficheiro de destino"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Sinatura Online: Desactivada"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Cargando datos desde a antiga descarga do ficheiro (%u de %u)"
+msgid "Uptime: %s"
+msgstr "Tempo de execución: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Gardando bloque de datos dun novo ficheiro de descarga (%u de %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Obtendo información do ficheiro fonte de descarga"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Engadindo descarga e gardando novo ficheiro part"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importar ficheiros part"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Estado"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Hash de ficheiro"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Agardando..."
+msgid "Shared files: %d"
+msgstr "Arquivos compartidos: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disco: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Por favor escolla un cartafol para buscar descargas temporais! "
-"(subcartafoles serán incluidos)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"Quere que os ficheiros fonte dunha descarga importada satisfactoriamente "
-"sexan borrados?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Borrar fontes?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/seg"
-msgstr[1] "bytes/seg"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "segundos"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "minutos"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "horas"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Días"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Vídeos"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Arquivos"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Textos"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programas"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Calquera"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Non evaluada"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Inválido / Corrupto / Falsificación"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Pobre"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Aceptable"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Boa"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Excelente"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "todo"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "todo o demais"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Cargando filtrados de IP 'ipfilter.dat' e 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Clientes na cola: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr ""
-"Fallou ao cargar o ficheiro ipfilter.dat '%s', atopado formato descoñecido."
+msgid "Total DL: %s"
+msgstr "Total DE: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Fallou ao cargar o ficheiro ipfilter.dat '%s', non se puido abrir o ficheiro."
+msgid "Total UL: %s"
+msgstr "Total SU: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Cargados %u rango de IP de '%s'."
-msgstr[1] "Cargados %u rangos de IP de '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Límite de subida"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u liña malformada foi descartada."
-msgstr[1] "%u liñas malformadas foron descartadas."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Límite de descarga"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Conexións activas (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Ocultar aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Detalles do ficheiro"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Mostrar aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% feito"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Saír"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "Enlace eD2k:"
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Enviar"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Fai Click aquí para engadir o enlace eD2k da entrada de texto de control á "
 "cola das descargas."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4594,19 +2718,19 @@
 "Os eventos amósanse aquí. Para unha lista completa de eventos, ves ao "
 "rexistro, da solapa de servidores."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Cargando..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Número de usuarios conectado ao mesmo servidor ca ti ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Usuarios: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4615,6 +2739,10 @@
 "usuarios."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Subida: 0.0 | Baixada: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4622,7 +2750,7 @@
 "Índice actual de subidas e descargas. Se está activado os números signfican "
 "os gastos indirectos na comunicación do cliente."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4634,1107 +2762,1045 @@
 "Baixa (detrás de cortafogos) e frechas verdes significan que tes ID-Alta (O "
 "tipo de conexión óptima)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Non conectado ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Non estás conectado a un servidor"
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Busca"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tipo"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Ficheiro Hash"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Parámetros extendidos"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtrado"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Tipo de ficheiro"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Calquera"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Arquivos"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Audio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Imaxe de CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Imaxes"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programas"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Textos"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Vídeos"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Extensión"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Tamaño mín"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Tamaño máx"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Dispoñibilidade"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filtrado:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Resultados do filtro"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Invertir resultado"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Agochar ficheiros coñecidos"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Comezar"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Máis"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Procura máis resultados no eD2k. Non soportado polo Kad aínda."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Deter"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Descarga"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Reiniciar campos"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Resultados"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Limpar descargas completadas"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Mostrar Subida / Cola de subida"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Clientes en cola :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Enviar"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Enviar a mensaxe especificada."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Pechar"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Fontes completas"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Pechar esta sesión de chat."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Xeral"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Nome completo"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/A"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "Ficheiro-met:"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Hash :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Tamaño do ficheiro:"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Estado do ficheiro part:"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Última vez visto completo:"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Transferencias"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Fontes atopadas:"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Fontes transferindo:"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Número de partes:"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Dispoñible:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Fluxo de datos:"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Tempo Descarga Activa:"
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Transferido:"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Tamaño completado:"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Xestión intelixente de corrupción"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Perdido por corrupción:"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Gañado por compresión:"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Paquetes salvados por I.C.H. :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Nomes de ficheiro "
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Tomar"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Limpar"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Aceptar"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 "Comentario/Calificación do ficheiro (O texto mostrarase a todos os usuarios)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Para unha película, podes poñer a súa duración, descrición, o idioma ...\n"
-"e se é unha falsificación, podes informar aos demais usuarios de aMule."
+"Para un film vostede pode dicir que é largo, a súa historia, o idioma ...\\n"
+"\\ne se é un arquivo falso (fake), pode advertir ós outros usuarios do aMule."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Calificación de ficheiro"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Non evaluada"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Inválido / Corrupto / Falsificación"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Pobre"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Aceptable"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Boa"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Excelente"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Escoller a calificación do ficheiro ou advertir a outros usuarios se non é "
 "válido ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Descargando, agarde por favor ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Tamaño descoñecido"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Información requerida"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "Enderezo IP :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Porto :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Nome de usuario :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Hash do usuario :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Recargar os seus ficheiros compartidos"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Sesión actual"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Total"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Petición :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Subidas activas :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Engadir"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Velocidade de descarga"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Actual"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Media de execución"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Media de sesión"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Velocidade de subida"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Conexións"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Descargas activas"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Conexión activas (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Subidas activas"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Árbore de estatísticas"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Hash do usuario :"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Software de cliente :"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Versión de cliente :"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "Enderezo IP :"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID do usuario :"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP de servidor :"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Nome do servidor :"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Obfuscación:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Transferencias ao cliente"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Peticións actuais:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Índice medio de subida :"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Índice medio de descarga :"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Subido (sesión) :"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Descargado (sesión) :"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Subido (total) :"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Descargado (total):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Resultados"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Modificador DE/SU :"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Identidade segura:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Calificación (total) :"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "En cola"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Puntuación cola:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Alcume"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - a Mula de Linux"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - O Mule multi-plataforma"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 "Este é o nome que os outros usuarios verán cando se esté conectando a "
 "vostede."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Idioma"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "O retardo antes de mostrar as mensaxes emerxentes."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Isto especifica a linguaxe empregada nos controles."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Opcións varias"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Comprobar se hai unha nova versión ao iniciar"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Activando isto, fará que aMule comprobe se hai unha nova versión ao inicio"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Iniciar minimizado"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Activando isto, fai que aMule minimícese ao inicio."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Preguntar ao saír"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Fai que aMule pregunte antes de saír."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Activar icona de bandexa"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 "Isto Activa/Desactiva a icona da bandexa de sistema (ou barra de tarefas)."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Minimizar á icona da bandexa"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr ""
 "Activando isto aMule minimizarase na bandexa do sistema, na barra de tarefas."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Retardo das mensaxes emerxentes en segs"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "O retardo antes de mostrar as mensaxes emerxentes."
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Configuración por defecto do sistema"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Seleccione seu navegador aquí"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Navegador personalizado:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Introduza o nome do seu navegador. Para usar un navegador persoal, "
-"seleccione personalizado no menú de arriba."
+"Introduza o nome do seu navegador aquí. Deixe o campo valeiro para empregar "
+"o navegador por defecto do sistema."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Navegador"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Abrir nunha nova solapa se é posible"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Abrir cando sexa posible, a páxina web nunha nova solapa en lugar dunha nova "
 "fiestra"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Reproductor de vídeo"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Crear copia de seguridade para previsualizar"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr "Ancho de banda"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Subir"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Asinación de slots"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Porto do cliente TCP estándar:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Este é o puerto eD2k estándar e non pode ser deshabilitado"
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Porto UDP extendido do cliente:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
-"Este porto UDP emprégase para peticiones extendidas das redes eD2k e Kad"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "desactivado"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Enderezo de ligazón"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Porto UDP para peticións extendidas ao servidor (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Máximo de fontes por ficheiro"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Límite superior"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Límites de conexión"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Conexións máximas"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Plug and Play universal"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Activar UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Porto TCP UPnP:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Autoconectar ao inicio"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Reconectar ao perder a conexión"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Mostrar ancho de banda excedente"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Opcións do servidor"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Eliminar servidores caídos tras"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "reintentos"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Auto-actualizar lista de serividores ó comezar"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Actualizar a lista de servidores o conectar a un servidor"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Actualizar a lista de servidores cando un cliente se conecta"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Usar sistema de prioridades"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Control intelixente de IDBaixa ao conectar"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Conexión segura"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Autoconectar só a Servidores fixos"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Asinar alta prioridade aos servidores engadidos manualmente"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "Activar I.C.H."
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH confía en todos os hash (non recomendado)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Engadir ficheiros para descargar en modo pausado"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Engadir novos ficheiros compartidos con auto prioridade"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Tentar descargar antes a primeira e última parte"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Engadir novas descargas con auto prioridade"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Tentar transferir partes completas en todas as subidas"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Descargar seguinte ficheiro pausado cando se complete outro"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Da mesma categoría"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Gardar 10 fontes en ficheiros raros (< 20 fontes)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Espazo no disco"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Reserva de espazo para os novos arquivos"
+
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
+"Para os novos arquivos a reserva de espazo no disco duro para o arquivo "
+"enteiro reduce a fragmentación"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Comprobar espazo no disco"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2058
+#: src/muuli_wdr.cpp:1819
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 "Selecciona esta opción se queres que o aMule comprobe o espazo no disco"
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Espazo mínimo no disco:"
-
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "Introduza o espazo mínimo de disco desexado."
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "Reserva de espazo para os novos arquivos"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Gardar 10 fontes en ficheiros raros (< 20 fontes)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Subidas"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Engadir novas descargas con auto prioridade"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
-"Para os novos arquivos a reserva de espazo no disco duro para o arquivo "
-"enteiro reduce a fragmentación"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Directorio entrante"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Directorio temporal"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Compartido"
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 "(Click co botón dereito na icona do cartafol para compartir recursivamente)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Compartir ficheiros ocultos"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Intervalo de actualización: 5 segs"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Tempo de promedio do gráfico: 100 min"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Escala do gráfico das conexións: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Seleccionar cores das estatísticas"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Fondo"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Enreixado"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Actual descarga"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Promedio descarga en execución"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Promedio descarga en sesión"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Actual subida"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Promedio subida en execución"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Promedio subida en sesión"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Conexións activas"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Barra de velocidade da icona da bandexa do sistema"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Nodos-kad actuais"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Nodo-kad executándose"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Sesión de nodos-kad"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Número de versións de cliente amosadas (0=ilimitado)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Capacidade de liña"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Nota: Estos valores só se empregan para as estadísticas."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "ADVERTENCIA !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Non cambie estos parámetros a menos que saiba\n"
-"o que está facendo, do contrario pode\n"
-"facer que aMule funcione peor.\n"
-"\n"
-"aMule funcionará ben sen que cambie ningún\n"
-"destes parámetros."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Opcións avanzadas"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Novas conexións máx. / 5 segs"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Tamaño do búfer de ficheiro: 240000 bytes"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Tamaño cola de espera: 5000 clientes"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervalo de actualización de conexión ao servidor: Desactivado"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Progreso dos ficheiros da lista de descarga"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Mostrar porcentaxe"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Mostrar barra de progreso"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Estilo da barra de progreso"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Plano"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "3D"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Soporte para peles"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Activar soporte de temas"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Tema:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- sen temas dispoñilbes -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Ordenación de columna"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
-"Ordenar automaticamente ficheiros na cola de descarga (Alto gasto de CPU)"
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule ordenará as columnas no súa lista de descargas automaticamente"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Varios Tweaks Gui"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Mostrar xestión rápida de enlaces eD2k"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Mostrar info extendida nos solapas das categorías"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Mostrar índices de transferencia no título"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "Mostrar índices de transferencia no título"
 
-#: src/muuli_wdr.cpp:2412
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2124
 msgid "Vertical toolbar orientation"
 msgstr "Orientación vertical da barra de ferramentas"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Mostrar o número da parte do ficheiro antes do nome do ficheiro"
-
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Parámentros do servidor Web"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Executar amuleweb ao inicio"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Porto servidor Web"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Habilitar redirección do porto UPnP  no porto do servidor web"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Porto TCP UPnP do servidor Web"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Tempo de actualización de páxina (en segs)"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Activar compresión Gzip"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Activar invitado"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Plano"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Contrasinal administrador"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "3D"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Contrasinal invitado"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Modelo Web"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "aMule ordenará as columnas no súa lista de descargas automaticamente"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Parámetros de conexión externa"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Aceptar conexións externas"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
-"IP da interface que está escoitando\n"
-"(baleiro para calquera)"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5742,75 +3808,116 @@
 "Introduza aquí unha ip válida no formato a.b.c.d para a interface de escoita "
 "EC. Un campo baleiro ou 0.0.0.0 significará calquera interface."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Porto TCP"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Activar o seguimento do porto UPnP no porto EC"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Contrasinal"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Parámentros do servidor Web"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Modelo Web"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Contrasinal administrador"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Activar invitado"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Contrasinal invitado"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Tempo de actualización de páxina (en segs)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Activar compresión Gzip"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "Ok"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Aplicar calquer troco feito nas preferencias."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Reinicar calquer troco feito nas preferencias."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Título :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Comentario:"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Dir entrante :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Cambiar prioridade a novos ficheiros asinados :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "Non cambiar"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Seleccionar cor para esta categoría (seleccionada) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Mostrar motd do servidor cando estés conectado ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Info de servidor"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Reaxustar"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Premer este botón para reiniciar o rexistro."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Rexistro de aMule"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Premer neste botón para actualizar a lista de servidores desde URL ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Lista de servidores"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5818,43 +3925,55 @@
 "Introduza a url nun ficheiro server.met e prema o botón da esquerda para "
 "actualizar a lista de servidores coñecidos."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Engadir servidor manualmente: Nome"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Introduce o nome do novo servidor aquí"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Porto"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Introduce a IP do servidor aquí, usando o formato x.x.x.x."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Introduce o porto do servidor aquí."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Engadir servidor manualmente (encha os campos) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Rexistro de aMule"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Info de servidor"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "Info ED2K"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Info Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Premer neste botón para actualizar a lista de nodos desde URL ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nodos (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5862,49 +3981,56 @@
 "Introduza aquí a url ao ficheiro nodes.dat e prema o botón da esquerda, para "
 "actualizar a lista de nodos coñecidos."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Estatísticas de nodos"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Bootstrap"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Novo nodo"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Porto:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+#, fuzzy
+msgid "Bootstrap from known clients"
 msgstr "Clientes coñecidosde Bootstrap"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Desconectado de Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "Información eD2k"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Empregar a Indentificación Segura do Usuario"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Aconséllase habilitar esta opción. Non recibirá créditos se o SUI "
+"(Indentificación Segura do Usuario) non se habilitou."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Ofuscación de protocolo"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Soporte para ofuscación de protocolo"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5912,11 +4038,11 @@
 "Esta opción activa a ofuscación de protocolo, e permite a aMule aceptar "
 "conexións ofuscadas doutros clientes."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Usar ofuscación para conexións saíntes"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5924,11 +4050,11 @@
 "Esta opción fai que aMule use ofuscación de protocolo cando se conectan "
 "outros clientes/servidores."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Aceptar só conexións ofuscadas"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5936,86 +4062,82 @@
 "Esta opción fai que aMule só acepte conexións ofuscadas. Terá menos fontes, "
 "pero todo o teu tráfico será ofuscado"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Opcións de ficheiro"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Todos"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Ningún"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Quen pode ver os ficheiros compartidos:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Seleccione quen pode solicitar ver a lista de ficheiros compartidos."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Filtrado de IPs"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtrar clientes"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Activar filtrado das IPs de cliente definidas no ficheiro ~/.aMule/ipfilter."
 "dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtrar servidores"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Activar filtrado das IPs de servidores definidas no ficheiro ~/.aMule/"
 "ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Recargar lista"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 "Recargar a lista de filtrado de IPs desde o ficheiro ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Actualizar agora"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Auto-actualizar o filtrado de IPs ao inicio"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Nivel de filtrado:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Filtrar sempre IPs LAN"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Xestión paranoica de IPs non coincidintes"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6023,11 +4145,11 @@
 "Rexeitar o paquete se a ip do cliente é distinta da ip de onde se recibe o "
 "paquete. Usar con coidado."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Empregar un ipfilter.dat global se está dispoñible"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -6035,23 +4157,11 @@
 "De non atopar un arquivo ipfilter.dat para o usuario, permitir o emprego dun "
 "ipfilter global."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Empregar a Indentificación Segura do Usuario"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Aconséllase habilitar esta opción. Non recibirá créditos se o SUI "
-"(Indentificación Segura do Usuario) non se habilitou."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Activar Sinatura Online"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6059,850 +4169,1315 @@
 "Habilitar a escritura de ficheiros do SO, sóese usar para crear sinaturas "
 "para aplicacións externas."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Frecuencia de actualización (Segs):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 "Cambiar a frecuencia (en segundos) da actualización da sinatura online."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Directorio de Sinatura Online:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "Premer aquí para seleccionar o directorio que contén os ficheiros de "
 "sinaturas online"
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Desactivar/Activar"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtrar mensaxes entrantes (excepto conversación actual):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Opcións de filtrado:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtrar todas as mensaxes"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtrar mensaxes de xente que non está na túa lista de amigos"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtrar mensaxes de clientes descoñecidos"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrar mensaxes que conteñen (usa ',' como separador):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "engade aquí as palabras que amule debe filtrar e bloquear mensaxes incluídas"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Comentarios"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrar comentarios que conteñan (empregre ',' coma separador):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Conexión de servidor automática sen proxy"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Activar autenticación"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Activar/desactivar autenticación de nome de usuario/contrasinal"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr ""
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "O nome de usuario a usar para conectar ao proxy"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Contrasinal:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "O contrasinal a empregar para conectar ao proxy"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Activar proxy"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Activar/desactivar soporte de proxy"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Tipo de proxy:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "O tipo de proxy ao que estase conectando"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Anfitrión de proxy:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "O nome do anfitrión do proxy"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Porto do proxy:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "O porto do proxy"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Autenticación"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Activar autenticación"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Activar/desactivar autenticación de nome de usuario/contrasinal"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "O nome de usuario a usar para conectar ao proxy"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Contrasinal:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "O contrasinal a empregar para conectar ao proxy"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Conexión de servidor automática sen proxy"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Conectar a:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Conectar a amule remoto"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Nome de usuario"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Recordar esas opcións"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Activar Depuración-rexistro difuso."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Categorías de mensaxe:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Agardando..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Engadir importes"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Reintentar seleccionado"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Borrar seleccionado"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Tipos de evento"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Subidas activas :"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Oculta os archivos compartidos"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Selecione o filtro de visionado"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Subidas activas"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Mostrar clientes"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Recargar lista"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Recargar os seus ficheiros compartidos"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Enviar"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Enviar a mensaxe especificada."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Pechar esta sesión de chat."
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Conectar a calquera servidor e/ou Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Fiestra de Redes"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Ficheiros compartidos"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Fiestra de buscas"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Desactivado [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Fiestra de transferencias de ficheiros"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Fiestra de ficheiros compartidos"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Fiestra de mensaxes"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Fiestra de gráficos de estatísticas"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Fiestra de preferencias"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nova categoría"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Escolla un cartafol para os ficheiros entrantes"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Debe especificar un nome para a categoría!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/seg"
+msgstr[1] "bytes/seg"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Debe especificar unha ruta para a categoría!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "segundos"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "minutos"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "horas"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Días"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "todo"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "todo o demais"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Incompleto"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Parado"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Vídeo"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Arquivo"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Texto"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Activo"
+
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
 msgstr ""
-"Erro ao crear o directorio incoming da categoría. Por favor especifique unha "
-"ruta correcta!"
 
-#: src/ExternalConnector.cpp:141
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr ""
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Extensión descoñecida '%s' para o comando '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Importando %s: %s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Lendo cartafol temporal"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Obtendo información básica de ficheiro info de descarga"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Creando ficheiro de destino"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Comando descoñecido '%s'.\n"
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Cargando datos desde a antiga descarga do ficheiro (%u de %u)"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Este comando non pode ter un argumento.\n"
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Gardando bloque de datos dun novo ficheiro de descarga (%u de %u)"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Este comando deber ter un argumento.\n"
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Obtendo información do ficheiro fonte de descarga"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Engadindo descarga e gardando novo ficheiro part"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Importar ficheiros part"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Estado"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Hash de ficheiro"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Disco: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Este comando está incompleto, debe usar unha das extensión de abaixo.\n"
+"Por favor escolla un cartafol para buscar descargas temporais! "
+"(subcartafoles serán incluidos)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Extensións dispoñibles:\n"
+"Quere que os ficheiros fonte dunha descarga importada satisfactoriamente "
+"sexan borrados?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Comandos dispoñibles:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Borrar fontes?"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "ERRO: -Non se pode crear o ficheiro part)"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Todos os comandos son sensibles ás maiúsculas\n"
-"Escriba '%s <command>' para obter información detallada do <comando>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Tentando cargar a copia de seguranza do ficheiro met desde %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Saír da aplicación."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "ERRO: Non se puido abrir o arquivo part.met: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Mostrar axuda."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "ERRO: o arquivo part.met ten tamaño 0: %s ===> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
-"Para obter axuda dun comando, teclee 'help <comando>'.\n"
-"Para obter a lista completa de comandos, teclee 'help'.\n"
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr ""
+"Erro: %s (%s) está corrupto (marca de contador errónea), imposible cargar o "
+"ficheiro."
+
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Usa '%s' para lista de comandos\n"
-"\n"
+"ERRO: %s (%s) está corrupto (conta de etiquetas errónea), imposible cargar o "
+"arquivo."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Erro de sintase!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Tentando recuperar info de ficheiro..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "Recuperando ficheiro sen nome - recuperareino como RecoveredFile.dat"
+
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
-"Erro procesando o comando - isto non debería pasar! Por favor, reporte o "
-"bug\n"
+"Recuperada toda a info dispoñible do ficheiro :D - Tentando empregala..."
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Este comando non debería ter ningún parámetro."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Imposible recuperar info de ficheiro :("
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Este comando debe ter un parámetro."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Non se pode abrir %s (%s)"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Argumento inválido."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "AVISO: %s pode estar corrupto (%i)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Isto é un comando incompleto."
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "ERRO ao gardar o ficheiro part: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "ERRO ao gardar o ficheiro part: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:917
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Teclee '%s' para obter máis axuda.\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Imposible recuperar a duración de '%s' - empregando o arquivo %s ."
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Isto é %s %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' ten tamaño 0 - empregando ficheiro %s."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:994
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Isto é %s %s\n"
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Erro ao gardar o ficheiro part.met.seeds por %s"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Gardadas %i fonte seeds para o ficheiro part: %s (%s)"
+msgstr[1] "Gardadas %i fontes seeds para o ficheiro part: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "O ficheiro part %s (%s) non ten ficheiro seeds"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "O ficheiro part %s (%s) ten un ficheiro seed baleiro"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Erro lendo o ficheiro seed do ficheiro part (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Parte corrupta atopada (%d) en %d ficheiro part %s - FileResultHash |%s| "
+"FileHash |%s|"
+msgstr[1] ""
+"Parte corrupta atopada (%d) en %d ficheiros part %s - FileResultHash |%s| "
+"FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Parte (%i) completada atopada en %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Rematado de rehashear %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Erro non esperado mentres completábase %s. Arquivo pausado"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Descarga rematada: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Eliminando ficheiro: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Creando cliente...\n"
+"ERRO: Non se puido crear o hash da parte baixada, conxunto de hashes non "
+"completo para '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"OK, saíndo de %s...\n"
+"ERRO: Non se puido crear o hash da parte baixada, conxunto de hashes non "
+"completo (%s). Isto non debería ocorrer nunca"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Non se pode conectar cun contrasinal baleiro.\n"
-"Debe especificar un contrasinal nun ficheiro de configuración\n"
-"ou nunha liña de comando, ou introducir un cando se pregunte.\n"
-"\n"
-"Saíndo...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Mostrar este texto de axuda."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "AVISO: Non hai suficiente espazo libre en disco! Pausando ficheiro: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Anfitrión onde estase executando aMule. (por defecto: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Part descargado %i é corrupto no ficheiro: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Porto de aMule para conexión externa. (por defecto: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Part corrupto recuperado %i para %s -> Bytes gardados: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Contrasinal para conexión externa."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Reservando"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Ler configuración do ficheiro."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Espazo no disco insuficiente"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Non imprimir ningunha saída a stdout."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Descargado"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Estar difuso - mostrar as mensaxes de depuración."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "ERRO: Fallou ó abrir o partfile '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Establecer locale de programa (lingua)."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Por defecto"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Escribir opcións da liña de comando ao ficheiro de configuración."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albanés"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr ""
-"Crear ficheiro de configuración basado no ficheiro de configuración de aMule."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Árabe"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Imprimir versión de programa."
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "Estonio"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Ficheiro de créditos cargado, %u cliente coñecido"
-msgstr[1] "Ficheiro de créditos cargado, %u cliente coñecidos"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Euskera"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Expiraron os créditos de %u cliente!"
-msgstr[1] " - Expiraron os créditos de %u clientes!"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Búlgaro"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Non se atopou o ficheiro 'cryptkey.dat', creando."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Catalán"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"ERRO: o daemon de aMule non se pode usar cando están desactivadas as "
-"conexións externas. Para activar as Conexións Externas, use un aMule normal, "
-"inicie amuled coa opción --ec-config ou estableza a clave "
-"\"AcceptExternalConnections\" a 1 no ficheiro ~/.aMule/amule.conf"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Chinés (Simplificado)"
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "ERRO: %s"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Chinés (Tradicional)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Desvetado"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Ver Subidas"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Ver cola"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Croata"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Mostrar clientes"
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Checo"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Selecione ver"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Software do cliente"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Danés"
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Agardando"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Holandés"
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Tempo de subida"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Inglés (R. U.)"
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Subida/Descarga"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estonio"
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Estado remoto"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finlandés"
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Francés"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Prioridade do ficheiro"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galego"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Puntuación"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Alemán"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Pedido"
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Grego"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Última vez visto"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebreo"
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Entrada en cola"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Húngaro"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Estado de subida"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italiano"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Subido"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italiano (Suizo)"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Estado de descarga"
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Xaponés"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Descargado"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Coreano"
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Hash do usuario"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Cifrado"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lituano"
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Oculta os archivos compartidos"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Noruego (Nynorsk)"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Detalles do cliente"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polaco"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Habilitado"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugués"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Soportado"
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugués (Brasileiro)"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Non soportado"
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Ruso"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Deshabilitado"
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Esloveno"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Castelán"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Incompleto"
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Sueco"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Rapaz malo"
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turco"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Verificado - OK"
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Idioma"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
+
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
 msgstr "Non dispoñible"
 
-#: src/ClientDetailDialog.cpp:215
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "Non hay opcións disponibles"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
+"O porto TCP non pode ser máis alto que 65532 debido a que o socket do "
+"servidor UDP está sendo TCP+3"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+msgid "Default port will be used (%d)"
+msgstr "Empregarase o porto predeterminado (%d)"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
 msgstr ""
-"O tamaño mínimo debe ser máis pequeno que o máximo. Tamaño máximo ignorado."
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Aviso de busca"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Conexión"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Ilimitado"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Directorios"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Menú aMule"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Servidores"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Límites de velocidade:"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Ficheiros"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "SU: Ningunha"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Seguranza"
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "UL: %u"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DE: Ningunha"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "DE: %u"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Controles remotos"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Sinatura Online"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Eventos"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Depurando"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Non cambie estos parámetros a menos que saiba\n"
+"o que está facendo, do contrario pode\n"
+"facer que aMule funcione peor.\n"
+"\n"
+"aMule funcionará ben sen que cambie ningún\n"
+"destes parámetros."
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Velocidade de baixada: %.1f"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Velocidade de subida: %.1f"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Información de cliente"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "O tipo de proxy ao que estase conectando"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:534
 #, c-format
-msgid "Nickname: %s"
-msgstr "Alcume: %s"
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Non seleccionou un alcume!"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"aMule debe ser reiniciado para activar estes trocos:\n"
+"\n"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID de cliente: "
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- Porto TCP cambiado.\n"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Nome do servidor: "
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- Porto UDP cambiado.\n"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP de servidor :"
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Conexión externa pechada."
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Nova conexión externa aceptada"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Conexión externa pechada."
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Tes activado conexións externas pero non ten especificado un contrasinal.\n"
+"Conexións externas non poden ser activadas a non ser que especifique un "
+"contrasinal válido."
+
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Idioma cambiado.\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Cartafol temporal cambiado.\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+#, fuzzy
+msgid "- ED2K network enabled.\n"
+msgstr "Tódalas redes están desactivadas."
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"eD2k e Kad están desactivados.\n"
+"Non poderás conectarte ata activar ó menos un deles."
+
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad non se iniciará se non está activado o porto UDP.\n"
+"Activar o porto UDP ou desactivar Kad."
+
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Debe reiniciar o aMule agora.\n"
+"Se non o reinicia ahora, algo malo pode suceder.\n"
+
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Túa auto-actualización da lista de servidores está en branco.\n"
+"Por favor completa ao menos unha URL para sinalar un ficheiro server.met.\n"
+"Prema no botón \"Lista\" para introducir unha URL."
+
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Ficheiros temporais"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Ficheiros entrantes"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Sinaturas Online"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "TCP port: %d"
-msgstr "Porto TCP:  %d"
+msgid "Choose a folder for %s"
+msgstr "Escolla un cartafol para %s"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "Porto TCP: Non está listo aínda"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Atopar o reproductor de vídeo"
+
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Selecione o navegador"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "UDP port: %d"
-msgstr "Porto UDP: %d"
+msgid "Executable%s"
+msgstr "Executable%s"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "Porto UDP: Non está listo aínda"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Editar a lista dos servidores"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Sinatura Online: Activada"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Engadir aquí unha URL para descargar unha lista server.met.\n"
+"Só unha url nesta liña"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Sinatura Online: Desactivada"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Periodo de actualización: %d seg"
+msgstr[1] "Periodo de actualización: %d segs"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "Shared files: %d"
-msgstr "Arquivos compartidos: %d"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Tempo medio de gráfico: %d min"
+msgstr[1] "Tempo medio de gráfico: %d mins"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/PrefsUnifiedDlg.cpp:1127
 #, c-format
-msgid "Queued clients: %d"
-msgstr "Clientes na cola: %d"
+msgid "Connections Graph Scale: %d"
+msgstr "Escala gráfica de conexións: %d"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "Total DL: %s"
-msgstr "Total DE: %s"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Tamaño do ficheiro búfer %d byte"
+msgstr[1] "Tamaño do ficheiro búfer %d bytes"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Total UL: %s"
-msgstr "Total SU: %s"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Tamaño da cola de subida %d cliente"
+msgstr[1] "Tamaño da cola de subida %d clientes"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Límite de subida"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Intervalo de refresco da conexion ao servidor: %d minuto"
+msgstr[1] "Intervalo de refresco da conexion ao servidor: %d minutos"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Límite de descarga"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Intervalo de refresco da conexion ao servidor. Desactivada"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Ocultar aMule"
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "desactivado"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Mostrar aMule"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "Executar comando no evento `%s'"
+
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Activar execución de comando no núcleo"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Comando do núcleo:"
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Activar execución de comando no GUI"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Comando de GUI:"
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "As seguintes variables serán reemprazadas:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+"O tamaño mínimo debe ser máis pequeno que o máximo. Tamaño máximo ignorado."
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Aviso de busca"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Principal"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "A busca de Kad non pode ser feita se non está executando Kad"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr ""
+"Non se poido realizar unha procura no eD2k se non se está conectado o eD2k"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Erro inesperado tentando buscar en Kad:"
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "IDFicheiro"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Ficheiro"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Descargar en categoría"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Engadir URLs opcionais para este ficheiro"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Procurar arquivos relacionados (eD2k, búsqueda local)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Marcar o arquivo como coñecido"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Copiar o enlace eD2k ó portapapeis"
+
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Cancelar"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr ""
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Fallou ao conectar a todos os servidores ofuscados listados. Tentándoo de "
+"novo sen ofuscación."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Erro ao conectar a todos os servidores."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "Protocolo eD2k deshabilitado nas preferencias, non se conecta."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
+"Non se atoparon servidores válidos para conectar na lista dos servidores"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Sesión de chat iniciada: %s (%s:%u) - %s %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Conectar a %s (%s:%i)"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Conectado ao cliente ***"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Conexión establecida en: %s"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Conectando ao cliente ***"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr "Erro fatal conectando. A conexión a internet podría estar desactivada"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Erro ao conectar ao cliente / Conexión perdida ***"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Conexión perdida con %s (%s:%i)"
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Pechar solapa"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) parece estar caido."
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Pechar todas as solapas"
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) parece estar cheo."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Pechar outras solapas"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Reintentarase a conexión automática ao servidor en %d segundos"
+msgstr[1] "Reintentarase a conexión automática ao servidor en %d segundo"
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Conexión perdida"
+
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Conectando a %s (%s:%i) fallou."
+
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "ERRO: Socket inválido ó comprobar o timeout"
+
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Tentando conectar a %s (%s:%i) fora de tempo."
+
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr ""
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Cargando ficheiro server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Ficheiro server.met non atopado!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Fallou ao cargar o ficheiro server.met '%s', atopouse formato descoñecido."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Erro ao abrir server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Ficheiro server.met corrupto, atopada marca de versión inválida: 0x%x, "
 "tamaño %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "%i servidor atopado no server.met"
 msgstr[1] "%i servidores atopados no server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d servidor engadido"
 msgstr[1] "%d servidores engadidos"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "Erro de ES lendo o ficheiro known.met: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Servidor non engadido: [%s:%d] non especifica un porto válido."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Servidor non engadido: A IP de [%s:%d] está filtrada ou é inválida."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Servidor non engadido: Servidor con IP:Porto [%s:%d] coincidinte atopado na "
 "lista."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Servidor engadido: Servidor [%s:%d] empregando o nome '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6910,25 +5485,25 @@
 "Estás conectado ao servidor que tenta borrar. Por favor desconéctese "
 "primeiro."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Erro ao abrir '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Erro ao gardar o ficheiro server.met"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Url inválida"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
 msgstr "Finalizando a descarga da lista dos servidores de %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Erro ao decarga a lista de servidores dende %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6937,23 +5512,28 @@
 "pega unha lista de servidores válida neste arquivo para poder actualizar de "
 "forma automática a lista de servidores."
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Descargando lista dos servidores de %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
-"AVISO: especificada unha URL inválida para a actualización automática de "
+"AVISO: especificada unha URL inválida para la actualización automática de "
 "servidores : %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Erro en addresses.dat, server.met da url de auto descarga inválido"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Erro ao decarga-la lista de servidores dende %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -6961,311 +5541,3317 @@
 "O servidor local está filtrado por IPFilters, reconectando a un servidor "
 "diferente!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Fallou ao executar o comando `%s' no evento `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Nome do servidor"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Enderezo"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Porto"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Descrición"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Usuarios"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Estático"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versión"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"O seu locale cambiou ao predeterminado do sistema debido a un troco na "
-"configuración. Síntoo."
+"Está conectado ao servidor que tenta borrar. Por favor desconéctese "
+"primeiro. O servidor NON foi borrado."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Nome descoñecido)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "¿Estas seguro de que queres borrar o servidor estático %s?"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Servidores (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Servidor"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Conectar ao servidor"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Marcar servidor como estático"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Marcar servidor como non estático"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Marcar servidores como estáticos"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Marcar servidores como non estáticos"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Borrar servidor"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Borrar servidores"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Borrar todos os servidores"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Copia os enlaces eD2k ó portapapeis"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Reconectar ao servidor"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "¿Estas seguro de que queres borrar todos os servidores?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "¿Estás seguro de que queres borrar o servidor seleccionado(s)?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "¿Estás seguro de que queres borrar os servidores seleccionados?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "ERRO: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "AVISO: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "A nova IDcliente é %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "ATENCIÓN: ¡Reciviches ID-Baixa!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tIsto sucede porque está detrás dun cortafogos ou dun router."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tPara máis información, por favor ves a http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Información recibida do servidor descoñecida! - demasiado corta"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Recibido %d novo servidor"
+msgstr[1] "Recibidos %d novos servidores"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Gardado completo da lista de servidores."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Servidor rexeitou o último comando"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Paquete bogus recibido do servidor: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Erro ao procesar o paquete desde o servidor: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Non se pode crear o fío da DNS para conectar a %s"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "IP de servidor %s (%s) está filtrada. Non conectará."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "usando ofuscación de protocolo."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Conectando a %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Non se puido aclarar a dns para o servidor %s: Imposible conectar!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Servidor non engadido: Non se especificou IP ou nome de servidor."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Servidor non engadido: Porto de servidor especificado inválido."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Estado do eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Estado Kademlia:"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "Executando en %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Executando"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Estado:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Estado de conexión:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
-"Non ten ningún servidor na lista de servidores.\n"
-"Quere que aMule descargue unha nova lista agora?"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Descargar lista de servidores"
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "Estado de conexión:"
 
-#: src/amule.cpp:846
+#: src/ServerWnd.cpp:219
 #, c-format
-msgid "web server running on pid %d"
-msgstr "servidor web executándose con pid: %d"
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr ""
 
-#: src/amule.cpp:850
-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"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Estado do cortafogos:"
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
 msgstr ""
-"Solicitaches executar o servidor web ó inicio pero non se puido executar o "
-"binario amuleweb. Por favor instale o paquete que conteña o servidor web do "
-"aMule ou compile o aMule empregando o parámetro --enable-webserver e logo "
-"execute o make install"
 
-#: src/amule.cpp:937
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Non amigo"
+
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "Conectado a amigo"
+
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "Conectado a amigo"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "Fontes atopadas:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr ""
+
+#: src/ServerWnd.cpp:254
+#, fuzzy
+msgid "Indexed notes:"
+msgstr "Ficheiro índice non atopado: "
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr ""
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Media de usuarios:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Media de ficheiros:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Non executando"
+
+#: src/SharedFileList.cpp:332
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "No se puido vincular os portos a dirección especificada: %s"
+msgid "Adding file %s to shares"
+msgstr ""
 
-#: src/amule.cpp:964
+#: src/SharedFileList.cpp:371
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Porto %u non está dispoñible . Tes IDBAIXA\n"
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Atopados %i ficheiro compartidos"
+msgstr[1] "Atopados %i ficheiros compartidos"
 
-#: src/amule.cpp:970
+#: src/SharedFileList.cpp:377
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Atopados %i ficheiro compartidos, %i descoñecido"
+msgstr[1] "Atopados %i ficheiros compartidos, %i descoñecidos"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "ERRO: Intento de compartir %s"
+
+#: src/SharedFileList.cpp:410
+#, fuzzy, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "servidor non atopado: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
 msgstr ""
-"Porto %u non está dispoñible!!\n"
-"\n"
-"Isto significa que terás IDBAIXA \n"
-"\n"
-"Comproba túa rede para cerciorarse de que o porto está aberto para a entrada "
-"e saída."
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Fallou ao crear o ficheiro OnlineSig"
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Nome de usuario"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Fallou ao crear o ficheiro de aMule OnlineSig"
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Velocidade de descarga"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Velocidade de subida"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Dispoñible:"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Estado de subida"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Estado de descarga"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Nome do arquivo"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Ficheiros compartidos"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Peticións"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Peticións aceptadas"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Datos transferidos"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Media de compartido"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Partes obtidas"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Fontes completas"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Ruta de directorio"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Engadir Comentario/Calificación"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Editar Comentario/Calificación"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Renomear"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Engadir os ficheiros en colección á lista de tranferencia"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Copiar a &URI magnética ao portapapeis"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Copiar enlace eD2k ó portapapeis (&Fonte)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr ""
+"Copiar enlace eD2k ó portapapeis (&Fonte) (&Con opcións de encriptación)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Copiar enlace eD2k ó portapapeis (&Nome do host)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+"Copiar enlace eD2k ó portapapeis (&Nome do host) (Con opcións de "
+"&encriptación)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Copiar enlace eD2k ó portapapeis (&AICH info)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Necesitas ter IDALTA para crear un enlace de fonte válido"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Ficheiros compartidos (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[PartFile]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Nome do arquivo"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Datos subidos (Sesión (Total)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Overhead total (Paquetes ): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Petición de ficheiro Overhead (Paquetes): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Intercambio de fontes Overhead (Paquetes): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Servidores Overhead (Paquetes): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Overhead Kad (Paquetes ): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Cripta xerais (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Subidas activas: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Subidas agardando: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Sesión de subidas totais rematadas: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Total de subidas erradas na sesión: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Tempo medio de subida: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Datos descargados (Sesión (Total)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Fontes atopadas: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Descargas activas (pedazos): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Índice SU:BA Sesión (Total): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Velocidade media de baixada (Sesión): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Velocidade media de subida (Sesión): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Velocidade máxima de baixada (Sesión): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Velocidade máxima de subida (Sesión): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Reconexións: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Tempo dende a primeira tranferencia: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Conectado ao servidor dende: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Conexións activas (estimadas): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Límite máximo de conexións rechazado: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Media de conexións (estimado): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Pico de conexións (estimado): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Clientes"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "Tamaño descoñecido"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "Filtrado"
+
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "Vetado"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Total:%i Coñecido: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Servidores activos: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Servidores caídos: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Total: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Servidores borrados: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Servidores filtrados: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Usuarios en servidores activos: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Ficheiros nos servidores activos: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Usuarios totais: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Ficheiros totais: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Ocupación do servidor: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Número de ficheiros compartidos: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Tamaño total dos ficheiros compartidos: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Tamaño medio de arquivo: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Sistema operativo"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Non recibido"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Conexións activas (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Non dispoñible"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Nunca"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Comando `%s' con pid `%d' rematou con código de estado `%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Executar <str> e saír."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Formato de IP inválido. Usar xxx.xxx.xxx.xxx:xxxx\n"
 
-#: src/amule.cpp:1299
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"O idioma seleccionado non parece estar instalado. (Nota: Tentarei poñelo de "
-"todos modos)"
+"Este comando precisa dun argumento. Argumentos válidos: 'all', nome dun "
+"ficheiro ou un número.\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Procesando hash:"
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Procesando nome de ficheiro:"
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr ""
+"Este comando precisa dun argumento. Argumentos válidos: un arquivo hash.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Non é un número válido\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Hash inválido (a lonxitude debería ser exactamente 32 caracteres)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Petición fallida cun erro descoñecido."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "A operación tivo éxito."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Esta é a primeira vez inicia aMule %s"
+msgid "Request failed with the following error: %s"
+msgstr "Petición fallida co seguinte erro: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Esta versión é unha versión en proba, actualizada, e\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "O filtrado de IP para clientes é %s\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "non damos garantía se rompese algo, quime a túa casa,\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "Apagado"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "ou mate o seu can. Pero debería salvalo de todas formas.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "Acendido"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "O filtrado de IP para servidores é %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "O nivel de filtrado de IP actual é %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Límites de ancho de banda: Subida: %u kB/s, Baixada: %u kB/s\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Conectado a %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Conectando"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "cortafogos"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "aceptar"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"As seguintes opcións foros cambiadas nesta versión por razóns de "
-"seguridade:\n"
+"\n"
+"Descarga: \t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Activada o soporte de ofusación de protocolo para conexións entrantes e "
-"saíntes.\n"
+"Subido:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Desactivada a actualización da lista de servidores desde outro cliente ou "
-"servidores.\n"
+"Clientes en cola:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Para máis información da razón destes cambios, busque información\n"
-" de \"fake servers\" na wiki de aMule http://wiki.amule.org.\n"
-"É importante que limpe calquer servidor falso da súa lista de servidores "
-"para que aMule funcione correctamente."
+"Fontes totais:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Número de resultados de busca: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr ""
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Recibida unha resposta descoñecida desde o servidor, OpCode = %#x."
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Mostrar información de estado corta."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Mostrar estado de conexión, velocidade subida/descarga actual, etc.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Mostrar árbore de estatísticas completa."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Opcionalmente, un número entre 0-255 pode ser un argumento deste comando,\n"
+"o cal di cántas entradas da árbore de versión de cliente deberían "
+"mostrarse.\n"
+"Con 0 ou sen valor significa 'sen límite'.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Exemplo: 'statistics 5' mostrará só as 5 versións que máis se repitan de "
+"calquer cliente.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Apagar o aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Rematar o núcleo remoto (amule/amuled) en funcionamiento.\n"
+"Isto rematará tamén o cliente en modo texto, xa que non se pode\n"
+"empregar sen un núcleo en funcionamiento.\n"
+
+#: src/TextClient.cpp:859
+#, fuzzy
+msgid "Reload the given object."
+msgstr "Recargar o obxecto dado."
+
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
+msgstr "Recarga a lista de ficheiros compartidos."
+
+#: src/TextClient.cpp:862
+#, fuzzy
+msgid "Reload IP filtering table."
+msgstr "Recargar a táboa de filtrado de IP desde ficheiro."
+
+#: src/TextClient.cpp:863
+#, fuzzy
+msgid "Reload current IP filtering table."
+msgstr "Seleccionar nivel de filtrado de IP"
+
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "Recargar a táboa de filtrado de IP desde ficheiro."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Conectar á rede."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Isto conectará a todas as redes que estén habilitadas en opcións.\n"
+"Opcionalmente tamén podes especificar un servidor de forma IP:Porto, para\n"
+"conectar a ese servidor soamente. A IP debe ser un enderezo IPv4,\n"
+"ou un nome DNS."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Conectar só ó eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Conectar só a Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Desconectado da rede."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr ""
+"Isto desconectaralle de todas as redes nas que está actualmente conectado.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Desconectar só do eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Desconectar só de Kad."
+
+#: src/TextClient.cpp:877
+#, fuzzy
+msgid "Add an eD2k or magnet link to core."
+msgstr "Engade un enlace eD2k o magnet ó núcleo."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"O enlace eD2k a engadir pode ser:\n"
+"*) un enlace a un arquivo (ed2k://|file|...), se engadirá á cola das "
+"descargas,\n"
+"*) un enlace a un servidor (ed2k://|server|...), se engadirá á lista dos "
+"servidores,\n"
+"*) ou un enlace a unha lista de servidores, neste caso, todos os servidores "
+"da lista\n"
+"se engadirán á lista dos servidores.\n"
 "\n"
-"Ademais, a configuración do navegador foi restablecida á configuración por "
-"defecto do sistema. Por favor configure as opción do seu navegador de novo "
-"se é preciso.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Establecer un valor de preferencia."
+
+#: src/TextClient.cpp:883
+#, fuzzy
+msgid "Set IP filtering preferences."
+msgstr "Establecer opcións de filtrado de IP."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Activar o filtrado de IP para clientes e servidores."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Desactivar o filtrado de IP para clientes e servidores."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Activar/Desactivar filtrado de IP para clientes."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Activar filtrado de IP para clientes."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Desactivar filtrado de IP para clientes."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Activar/Desactivar filtrado de IP para servidores."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Activar filtrado de IP para servidores."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Desactivar filtrado de IP para servidores."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Seleccionar nivel de filtrado de IP"
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Máis información, soporte  e novas actualizacións pódelas atopar na nosa "
-"páxina,\n"
+"Niveis válidos no filtro 0-255, e o valor por defecto (inicial)\n"
+"é 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Establecer límite de ancho de banda."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "O valor dado a estos comandos ha ser en kilobytes/sec.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Establecer límite de ancho de banda de subida."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Establece o límite de ancho de banda de descarga."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Obter e mostrar un valor de opcións."
+
+#: src/TextClient.cpp:905
+#, fuzzy
+msgid "Get IP filtering preferences."
+msgstr "Obter opcións de filtrado de IP."
+
+#: src/TextClient.cpp:906
+#, fuzzy
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Obter o estado do filtro de IP para clientes e servidores."
+
+#: src/TextClient.cpp:907
+#, fuzzy
+msgid "Get IP filtering state for clients only."
+msgstr "Obter o estado do filtro de IP só para clientes."
+
+#: src/TextClient.cpp:908
+#, fuzzy
+msgid "Get IP filtering state for servers only."
+msgstr "Obter o estado do filtro de IP só para servidores."
+
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "Seleccionar nivel de filtrado de IP"
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Obter límite de ancho de banda."
+
+#: src/TextClient.cpp:913
+#, fuzzy
+msgid "Execute a search."
+msgstr "Executar unha busca de kad"
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"en www.aMule.org, ou na nosa canle de IRC #aMule en irc.freenode.net.\n"
+"Un tipo de busca ten que ser especificado dando o tipo:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Exemplo: 'search kad ficheiro' executará unha busca kad para \"ficheiro\".\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Podes reportar algúns bugs a http://forum.amule.org"
+#: src/TextClient.cpp:915
+#, fuzzy
+msgid "Execute a global search."
+msgstr "Executar unha busca global."
+
+#: src/TextClient.cpp:916
+#, fuzzy
+msgid "Execute a local search"
+msgstr "Executar unha busca global"
+
+#: src/TextClient.cpp:917
+#, fuzzy
+msgid "Execute a kad search"
+msgstr "Executar unha busca de kad"
+
+#: src/TextClient.cpp:919
+#, fuzzy
+msgid "Show the results of the last search."
+msgstr "Mostrar os resultados da última busca."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:920
+#, fuzzy
+msgid "Return the results of the previous search.\n"
+msgstr "Devolve o resultado da busca anterior.\n"
+
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "Mostralo progreso dunha procura."
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "Mostralo progreso dunha procura.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Comezar descargando un ficheiro"
+
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"O cartafol que especificou de Sinatura Online non é válido!\n"
-"A Sinatura Online foi deshabilitada ata que o arregle en preferencias."
+"O número dun ficheiro da última busca tense que dar.\n"
+"Exemplo: 'download 12' iniciará a descarga do ficheiro co número 12 da busca "
+"a busca anterior.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Pausar descarga."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Continuar descarga."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Cancelar descarga."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Establecer a prioridade da descarga."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr ""
+"Establecer a prioridade dunha descarga a Baixa, Normal, Alta ou Auto.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Establecer a prioridade a baixa."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Establecer a prioridade a normal."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Establecer a prioridade a alta."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Establecer a prioridade a auto."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Mostrar colas/listas."
+
+#: src/TextClient.cpp:950
+#, fuzzy
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Mostrar cola subida/descarga, lista de servidores ou lista de ficheiro "
+"compartidos.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Mostrar cola de subida."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Mostrar cola de descarga."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Mostrar rexistro."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Mostrar lista de servidores."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Reiniciar rexistro."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "A reserva do espazo no disco duro para o arquivo '%s' fallou: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Comando obsoleto, emprege '%s' no seu lugar."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "ERRO: non se pode abrir o ficheiro de rexistro"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Este comando quedou obsoleto e probablemente sexa eliminado nun futuro.\n"
+"Emprege '%s' en lugar dese.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "AVISO: o ficheiro de rexistro está baleiro. Algo está mal."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Cliente texto do aMule"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "O rexistro foi borrado"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Convertendo conxuntos hash AICH antigos en '%s' a 64b en '%s'"
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Mensaxe de servidor: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "AVISO: O nome do ficheiro '%s' é inválido e foi renomeado a '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Fallou ao descargar a lista de nodos."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"AVISO: O ficheiro '%s' xa existe, un ficheiro novo foi renomeado a '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Fallou ao abrir o ficheiro de comprobación de versión descargado"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr "Estás seguro de cancelar e borrar todos os ficheiros desta categoría?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Ficheiro de comprobación de versión corrupto"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Confirmación requerida"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Está usando unha versión de aMule non actualizada!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
+
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Demasiadas conexións"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Todo o demais"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Selecione o filtro de visionado"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Engadir categoría"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Editar categoría"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Borrar categoría"
 
-#: src/amule.cpp:1907
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "A súa versión de aMule é %i.%i.%i e a última versión é %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+"Fallou ao abrir o ficheiro (%s), eliminando da lista de ficheiros "
+"compartidos."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Pode obter a última versión de aMule en http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Petición hashset para un ficheiro descoñecido: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Resumindo subidas de ficheiro: %s"
+
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Suspendendo subida de ficheiro: %s"
+
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Fallou ao executar o comando `%s' no evento `%s'."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Descarga rematada"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "A ruta completa ao ficheiro."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "O nome do ficheiro sen a ruta."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "O hash eD2k do arquivo."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "O tamaño do ficheiro en bytes."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Tempo de actividade de descarga acomulativo."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Nova sesión de chat comezada"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Mensaxe remitente."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Fora de espazo"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Partición do disco."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Erro ao completar"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
+msgstr "Procesando número de ficheiro %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Preguntou por hashes de partes (Só usado por ficheiros > 9.5 MB)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
+#, c-format
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Non existe o ficheiro!\n"
+
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, o creador de enlaces eD2k do aMule"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Benvido!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Parámetros de entrada"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Ficheiro a hashear"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Engadir URLs opcionais para este ficheiro"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Introduce aquí o arquivo do cal desexes calcular o enlace eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
-"AVISO: A súa versión de aMule está desactualizada: %i.%i.%i < %li.%li.%li"
+"Introduce aquí a URL da cal desexes calcular o enlace eD2k: Engade o "
+"caracter / ó final para permitir o aLinkCreator engadir o nome de arquivo "
+"actual"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Súa copia de aMule está actualizada."
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Eliminar"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Fallou ao descargar o ficheiro de comprobación de versión"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Crear ligazón con codificacións de partes"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Axuda para separar ficheiros novos e raros máis rapidamente, o coste será un "
+"tamaño de ligazón maior"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Ficheiro Hash MD4"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "Hash do arquivo eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k link"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Gardar"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Copiar ao portapapeis"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Abrir un arquivo para calcular o seu enlace eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Copiar o enlace eD2k calculado ó portapapeis"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Gardar o enlace eD2k calculado nun arquivo"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Acerca do aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Selecciona o arquivo do cal desexes calcular o enlace eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Nada para copiar agora !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Selecciona o arquivo para o enlace eD2k calculado"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Non se pode abrir"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Por favor introduza un nome de ficheiro non baleiro"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Nada para gardar agora !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, o creador de enlaces eD2k do aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Imaxes dende http://www.everaldo.com e http://www.icomania.com\n"
+"e http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distribuido baixo a licenza GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Hasheando..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Cancelado !"
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Usuarios: %s | Arquivos: %s"
+msgid "Done in %.2f s"
+msgstr "Feito en %.2f s"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Xa ten engadida esta URL !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Por favor, introduza unha URL non baleira"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Usuarios: E: %s K: %s | Arquivos: E: %s K: %s"
+msgid "Unable to open %s"
+msgstr "Non se pode abrir %s"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Sen redes seleccionadas"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i día(s) %i hora(s) %i min %i s"
 
-#: src/amule.cpp:2102
+#: src/utils/wxCas/src/onlinesig.cpp:234
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Conectado a %s %s"
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
 
-#: src/amule.cpp:2105
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "Connecting to %s"
-msgstr "Conectando a %s"
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Desconectado do eD2k"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad iniciado."
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad detido."
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Conectado a Kad (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Conectado a Kad (cortafogos)"
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Desconectado de Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, Estatísticas aMule en liña"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Máximo índice de DE desde que wxCas está executándose"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Máximo índice DE absoluto durante execucións anteriores de wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistema"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Deter auto recargar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Gardar imaxe de estatísticas en liña"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Imprimir imaxe de estatísticas en liña"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Preferencias"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Acerca de wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Iniciar auto recargar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Auto recarga detida"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Auto recarga iniciada"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Gardar imaxe de estatísticas"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Estatísticas aMule en liña"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"A rede Kad non pode ser usada se o porto UDP está desactivado nas "
-"preferencias, non iniciado."
+"Houbo un problema imprimindo.\n"
+"Tal vez túa impresora actual non esté configurada?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "A rede Kad está desactivada nas preferencias, non conectado."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Imprimindo"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
-"¡ No se puido abrir o arquivo de amigos 'emfriends.met' para a súa lectura !"
+"wxCas, Estatística de sinatura en liña de aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Basado en CAS por Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distribuido baixo GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh Oh, non se está executando aMule..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule está iniciado"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule estase executando, pero está desconectado"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule está conectando..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh Oh, estado de aMule descoñecido..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " foi executado durante "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " está detido !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " non está conectado!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " está conectando..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " pasou algo estraño, compróbao !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " está conectado a "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "apagar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " conectado"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr "con "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Total descargado: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Subido: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Descarga de sesión: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Descargado: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Subido: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Compartindo: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " ficheiro(s), Clientes en cola: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Tempo: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " en "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Media de carga de sistema (1-5-15 min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Tempo de execución do sistema: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Directorio que contén o ficheiro amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Introduza aquí o directorio onde está teu ficheiro amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Intervalo de refresco en segundos"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Xerar un ficheiro de estatísticas sempre que se actualice"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Introduza aquí o directorio onde quere xerar a imaxe de estatísticas"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Sube periodicamente túa imaxe de estatísticas ao servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "Url FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Ruta FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Introduza aquí a URL do seu servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
-"¡ No se puido abrir o arquivo de amigos 'emfriends.met' para a súa "
-"escritura !"
+"Introduza aquí o directorio onde poñer a súa imaxe de estatísticas no "
+"servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Usuario"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Introduza aquí o nome de Usuario para conectarse a teu servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr ""
+"Introduza aquí o contrasinal de Usuario para conectarse a teu servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Intervalo de actualización de FTP en minutos"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Validado"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "O cartafol que contén teu ficheiro de sinatura"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Cartafol onde se xenera a imaxe de estatísticas"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Cargar modelo <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Porto HTTP servidor Web"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Uso da redirección de portos UPnP no porto do servidor web"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Porto UPnP"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Usar compresión gzip"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Contrasinal de acceso total para o servidor web"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Contrasinal de invitado para o servidor web"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Permitir acceso de invitado"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Denegar acceso de invitado"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Cargar/gardar a configuración do servidor web dende/a aMule remoto"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Ruta do ficheiro de configuración de aMule. NON USAR DIRECTAMENTE!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Desactivar intérprete PHP (obsoleto)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Recompila páxinas PHP para outra petición"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Servidor Web aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "conexión do cliente web aceptada\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Petición fallida co seguinte erro: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Ficheiro índice non atopado: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Sesión expirada - petición de conexión\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sesión aceptada, conectado\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sesión aceptada, non conectado\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Ningunha sesión aberta - petición de conexión\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Sesión creada - petición de conexión\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Procesando petición [orixinal]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Comprobando contrasinal\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Contrasinal hash inválido\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Contrasinal aceptado\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Contrasinal erróneo\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr ""
+"Non introduciches ningún contrasinal. Un contrasinal en branco non está "
+"permitido.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Desconexión solicitada\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Procesando solicitude [redirixida]: "
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Albanés"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Estado de descarga"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Frecuencia de actualización: %d seg"
+#~ msgstr[1] "Frecuencia de actualización: %d segs"
+
+#~ msgid "Transferring"
+#~ msgstr "Transferindo"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "QR: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "En cola"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "POR FACER - mostrar o progreso dunha busca"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Creando hash AICH e MD4 para o ficheiro: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Creando hash MD4 para o ficheiro: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Creando hash AICH para o ficheiro: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "AVISO: Non se puido eliminar o '%s' orixinal despois de crear a copia de "
+#~ "seguranza"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "AVISO: Fallou ao eliminar %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Calificación (total) :"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Tentar transferir partes completas en todas as subidas"
+
+#~ msgid "Networks window"
+#~ msgstr "Fiestra de redes"
+
+#~ msgid "Searches window"
+#~ msgstr "Fiestra de búsquedas"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Descargando"
+
+#~ msgid "Shared files window"
+#~ msgstr "Fiestra de arquivos compartidos"
+
+#~ msgid "Messages window"
+#~ msgstr "Fiestra de mensaxes"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Fiestra del gráfico de las estadísticas"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Fiestra da configuración das preferencias"
+
+#~ msgid "Transfers"
+#~ msgstr "Transferencias"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Fiestra de transferencia de arquivos"
+
+#~ msgid "Unban"
+#~ msgstr "Desvetado"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Ver Subidas"
+
+#~ msgid "Show Queue"
+#~ msgstr "Ver cola"
+
+#~ msgid "Select View"
+#~ msgstr "Selecione ver"
+
+#~ msgid "Client Software"
+#~ msgstr "Software do cliente"
+
+#~ msgid "Waited"
+#~ msgstr "Agardando"
+
+#~ msgid "Upload Time"
+#~ msgstr "Tempo de subida"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Subida/Descarga"
+
+#~ msgid "Remote Status"
+#~ msgstr "Estado remoto"
+
+#~ msgid "File Priority"
+#~ msgstr "Prioridade do ficheiro"
+
+#~ msgid "Score"
+#~ msgstr "Puntuación"
+
+#~ msgid "Asked"
+#~ msgstr "Pedido"
+
+#~ msgid "Last Seen"
+#~ msgstr "Última vez visto"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Entrada en cola"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Subido"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Descargado"
+
+#~ msgid "Userhash"
+#~ msgstr "Hash do usuario"
+
+#~ msgid "Encrypted"
+#~ msgstr "Cifrado"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Mostrar Subida / Cola de subida"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Clientes en cola :"
+
+#~ msgid "Current Session"
+#~ msgstr "Sesión actual"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Requested :"
+#~ msgstr "Petición :"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Fiestra de transferencias de ficheiros"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Usuarios totais: %s | Ficheiros totais: %s"
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Descargas (%i)"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr ""
+#~ "AVISO: Non se puido eliminar o '%s' orixinal despois de crear a copia de "
+#~ "seguranza"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country(): Fallou ao cargar o dato do país desde"
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Obter nivel de filtrado de IP."
+
+#~ msgid "Makes a search."
+#~ msgstr "Facer unha busca."
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Erro"
+
+#, fuzzy
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Executar amuleweb ao inicio"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Apagar o aMule."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "As seguintes opcións foros cambiadas nesta versión por razóns de "
+#~ "seguridade:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Activada o soporte de ofusación de protocolo para conexións entrantes e "
+#~ "saíntes.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Desactivada a actualización da lista de servidores desde outro cliente "
+#~ "ou servidores.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Para máis información da razón destes cambios, busque información\n"
+#~ " de \"fake servers\" na wiki de aMule http://wiki.amule.org.\n"
+#~ "É importante que limpe calquer servidor falso da súa lista de servidores "
+#~ "para que aMule funcione correctamente."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Adicionalmente, has opción do navegador foron reiniciadas as por defecto "
+#~ "no sistema. Por favor configure as opción do seu navegador de novo se "
+#~ "fora preciso.\n"
+
+#~ msgid "Fetching status..."
+#~ msgstr "Obtendo estado..."
+
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Usuarios: E: %s K: %s | Ficheiros E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Cliente %s en IP: Porto %s:%d usando %s %s %s"
+
+#~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
+#~ msgstr "theApp->serverlist->GetServerByAddress() devolveu NULL"
+
+#~ msgid "Firewalled"
+#~ msgstr "Cortafogos"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "Cargada %d imaxe de bandeiras."
+#~ msgstr[1] "Cargadas %d imaxes de bandeiras."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr ""
+#~ "O ficheiro %s é demasiado grande para o Donkey: o máximo permitido é 4 GB."
+
+#~ msgid "User:"
+#~ msgstr "Usuario:"
+
+#~ msgid "System:"
+#~ msgstr "Sistema:"
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Sen asociar este tipo de ficheiro."
+
+#~ msgid "File was not saved"
+#~ msgstr "O ficheiro non foi gardado"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr "Conexión fallida. Non se puido conectar ao anfitrión especificado\n"
+
+#~ msgid ""
+#~ "Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+
+#~ msgid "Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr "Copyright (C) 2002 Petar Maymounkov\n"
+
+#~ msgid "Message Filter"
+#~ msgstr "Filtro de mensaxe"
+
+#~ msgid "Gui Tweaks"
+#~ msgstr "Tweaks Gui"
+
+#~ msgid "Core Tweaks"
+#~ msgstr "Tweaks núcleo"
+
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Retardo das mensaxes emerxentes en segs"
+
+#~ msgid "Show part file number before file name"
+#~ msgstr "Mostrar o número da parte do ficheiro antes do nome do ficheiro"
+
+#~ msgid "Skin Support"
+#~ msgstr "Soporte para peles"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- sen temas dispoñilbes -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Directorio de Sinatura Online:"
+
+#~ msgid "Show messages in log"
+#~ msgstr "Amosar mensaxes no rexistro (log)"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Opcións de filtrado:"
+
+#~ msgid "UDP port for extended server requests (TCP+3):"
+#~ msgstr "Porto UDP para peticións extendidas ó servidor (TCP+3):"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Capacidade de liña"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
+#~ msgstr ""
+#~ "Nota: Estos valores sólo\n"
+#~ " se usan para las estadísticas."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Porto do cliente TCP estándar:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Porto UDP extendido do cliente:"
+
+#~ msgid "Bind Address"
+#~ msgstr "Enderezo de ligazón"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "Porto UDP para peticións extendidas ao servidor (TCP+3): 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Máximo de fontes por ficheiro"
+
+#~ msgid "Connection limits"
+#~ msgstr "Límites de conexión"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Plug and Play universal"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "Activar UPnP"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "Porto TCP UPnP:"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Descargar seguinte ficheiro pausado cando se complete outro"
+
+#~ msgid "Check disk space"
+#~ msgstr "Comprobar espazo no disco"
+
+#~ msgid "Min disk space:"
+#~ msgstr "Espazo mínimo no disco:"
+
+#~ msgid "Incoming"
+#~ msgstr "Directorio entrante"
+
+#~ msgid "Temporary"
+#~ msgstr "Directorio temporal"
+
+#~ msgid "Shared"
+#~ msgstr "Compartido"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Seleccionar cores das estatísticas"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Progreso dos ficheiros da lista de descarga"
+
+#~ msgid "Show percentage"
+#~ msgstr "Mostrar porcentaxe"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Mostrar barra de progreso"
+
+#~ msgid "Enable skin support "
+#~ msgstr "Activar soporte de temas"
+
+#~ msgid "Skin:"
+#~ msgstr "Tema:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr ""
+#~ "Ordenar automaticamente ficheiros na cola de descarga (Alto gasto de CPU)"
+
+#~ msgid "Show Fast eD2k Links Handler"
+#~ msgstr "Mostrar xestión rápida de enlaces eD2k"
+
+#~ msgid "Web server port"
+#~ msgstr "Porto servidor Web"
+
+#~ msgid "Enable UPnP port forwarding on the web server port"
+#~ msgstr "Habilitar redirección do porto UPnP  no porto do servidor web"
+
+#~ msgid "Web server UPnP TCP port"
+#~ msgstr "Porto TCP UPnP do servidor Web"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "IP da interface que está escoitando\n"
+#~ "(baleiro para calquera)"
+
+#~ msgid "TCP port"
+#~ msgstr "Porto TCP"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Quen pode ver os ficheiros compartidos:"
+
+#~ msgid "Event types"
+#~ msgstr "Tipos de evento"
+
+#~ msgid "ERROR: can not accept web client connection\n"
+#~ msgstr "ERRO: non se pode aceptar a conexión do cliente web\n"
+
+#~ msgid ""
+#~ "Your Auto-update server list is empty.\n"
+#~ "'Auto-update server list at startup will be disabled."
+#~ msgstr ""
+#~ "A tua lista auto-actualizable dos servidores esta baleira.\n"
+#~ "A lista dos servidores auto-actualizable ó inicio será desactivada."
+
+#~ msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "ERRO: Arquivo part.met inválido versión do arquivo: %s ==> %s"
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "Fai que aMule pregunte antes de saír."
+
+#~ msgid "Bandwith limits"
+#~ msgstr "Ancho de banda"
+
+#~ msgid "This UDP port is used for extended ed2k requests and Kad network"
+#~ msgstr ""
+#~ "Este porto UDP emprégase para peticiones extendidas das redes eD2k e Kad"
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Mostrar ancho de banda excedente"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "Activar I.C.H."
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICH confía en todos os hash (non recomendado)"
+
+#~ msgid "Disk space"
+#~ msgstr "Espazo no disco"
+
+#~ msgid "Create Backup for preview"
+#~ msgstr "Crear copia de seguridade para previsualizar"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Opcións avanzadas"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Estilo da barra de progreso"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Ordenación de columna"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Varios Tweaks Gui"
+
+#~ msgid "File Options"
+#~ msgstr "Opcións de ficheiro"
+
+#~ msgid "Status text"
+#~ msgstr "Estado do texto"
+
+#~ msgid "Pop-up status text"
+#~ msgstr "Estado da mensaxe emerxente"
+
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Cliente p2p multiplataforma baseado no eMule\n"
+#~ "\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr " Páxina web: http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr " Foro: http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " Contacto: admin@amule.org (asuntos de administración) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr "Parte do aMule baséase en \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " Copyright (C) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "Para unha película, podes poñer a súa duración, descrición, o idioma ...\n"
+#~ "e se é unha falsificación, podes informar aos demais usuarios de aMule."
+
+#~ msgid "Misc Options"
+#~ msgstr "Opcións varias"
+
+#~ msgid "Server Options"
+#~ msgstr "Opcións do servidor"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Mostrar motd do servidor cando estés conectado ..."
+
+#~ msgid "eD2k Info"
+#~ msgstr "Información eD2k"
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Desactivar/Activar"
+
+#~ msgid "Authentication"
+#~ msgstr "Autenticación"
+
+#~ msgid "General Settings"
+#~ msgstr "Opcións xerais"
+
+#~ msgid "Hard limit"
+#~ msgstr "Límite superior"
+
+#~ msgid "Max Connections"
+#~ msgstr "Conexións máximas"
+
+#~ msgid "GUI Tweaks"
+#~ msgstr "Tweaks GUI"
+
+#~ msgid "Remote Control"
+#~ msgstr "Control remota"
+
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Imposible determinar o navegador seleccionado!"
+
+#~ msgid "User Defined"
+#~ msgstr "Definido polo usuario"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - a Mula de Linux"
+
+#~ msgid "System Default"
+#~ msgstr "Configuración por defecto do sistema"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Seleccione seu navegador aquí"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Navegador personalizado:"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Introduza o nome do seu navegador. Para usar un navegador persoal, "
+#~ "seleccione personalizado no menú de arriba."
+
+#~ msgid "Please wait... "
+#~ msgstr "Por favor agarde... "
+
+#~ msgid ""
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed."
+#~ msgstr ""
+#~ "Ademais, a configuración do navegador foi restablecida á configuración "
+#~ "por defecto do sistema. Por favor configure as opción do seu navegador de "
+#~ "novo se é preciso."
+
+#~ msgid "Could not determine the command for running the browser."
+#~ msgstr "Non se puido determinar o comando para executar o navegador."
+
+#~ msgid "EC Connection Failed. Empty reply."
+#~ msgstr "Conexión EC fallida. Resposta baleira."
+
+#~ msgid "ExternalConn: Access denied because: "
+#~ msgstr "ExternalConn: Acceso denegado porque: "
+
+#~ msgid "ExternalConn: Access denied"
+#~ msgstr "ExternalConn: Acceso denegado"
+
+#~ msgid "ExternalConn: Bad reply from server. Connection closed."
+#~ msgstr "ExternalConn: Resposta do servidor mala. Conexión pechada."
+
+#~ msgid "The ed2k hash of the file."
+#~ msgstr "O hash ed2k do ficheiro."
+
+#~ msgid "Copy ED2k &link to clipboard"
+#~ msgstr "Copiar ED2K en&lace o suxeitapapeis"
+
+#~ msgid "Copy ED2k link to clipboard (&Source)"
+#~ msgstr "Copiar enlace ED2K ao portapapeis (fonte&S)"
+
+#~ msgid "Copy ED2k link to clipboard (Source) (&With Crypt options)"
+#~ msgstr ""
+#~ "Copiar ligazón ED2k ao portapapeis (Fonte) (&Con opcións de cifrado)"
+
+#~ msgid "Copy ED2k link to clipboard (&Hostname)"
+#~ msgstr "Copiar ligazón ED2k ao portapapeis (Nome do &host)"
+
+#~ msgid "Copy ED2k link to clipboard (Hostname) (With &Crypt options)"
+#~ msgstr ""
+#~ "Copiar ligazón ED2k ao portapapeis (Nome do host) (Con opcións de "
+#~ "&cifrado)"
+
+#~ msgid "Copy ED2k link to clipboard (&AICH info)"
+#~ msgstr "Copiar ED2K enlace o suxeitapapeis (&AICH info)"
+
+#~ msgid "Warning"
+#~ msgstr "Aviso"
+
+#~ msgid "Error: Could not listen to TCP port."
+#~ msgstr "Erro: Non se puido escoitar o porto TCP."
+
+#~ msgid "Error: can not accept web client connection\n"
+#~ msgstr "Error: no se pode acceptar conexións do cliente web\n"
+
+#~ msgid "Webserver HTTP port"
+#~ msgstr "Porto HTTP do servidor Web"
+
+#~ msgid "Use UPnP port forwarding on webserver port"
+#~ msgstr "Usar seguimento do porto UPnP no porto do servidor web"
+
+#~ msgid "Full access password for webserver"
+#~ msgstr "Contrasinal de acceso completo para servidor web"
+
+#~ msgid "Guest password for webserver"
+#~ msgstr "Contrasinal de invitado para servidor web"
+
+#~ msgid "Load/save webserver settings from/to remote aMule"
+#~ msgstr "Cargar/gardar opcións do servidor web desde/a aMule remoto"
+
+#~ msgid "Enter here the file you want to compute the Ed2k link"
+#~ msgstr "Introduza aquí o ficheiro que queira codificar como enlace Ed2k"
+
+#~ msgid ""
+#~ "Enter here the URL you want to add to the Ed2k link: Add / at the end to "
+#~ "let aLinkCreator append the current file name"
+#~ msgstr ""
+#~ "Introduza aquí a URL que queira engadir ao ligazón Ed2k: Engade / ao "
+#~ "final, para deixar a aLinkCreator continuar co actual nome de ficheiro"
+
+#~ msgid "Ed2k File Hash"
+#~ msgstr "Ficheiro Hash ed2k"
+
+#~ msgid "Ed2k link"
+#~ msgstr "Ligazón ed2k"
+
+#~ msgid "Open a file to compute its ed2k link"
+#~ msgstr "Abre un ficheiro para crear un ligazón ed2k"
+
+#~ msgid "Copy computed ed2k link to clipboard"
+#~ msgstr "Copiar enlace ED2K creado ao portapapeis"
+
+#~ msgid "Save computed ed2k link to file"
+#~ msgstr "Gardar un ligazón ed2k creado a un ficheiro"
+
+#~ msgid "Select the file you want to compute the ed2k link"
+#~ msgstr "Selecciona o ficheiro do cal quere crear un ligazón ed2k"
+
+#~ msgid "Select the file to your computed ed2k link"
+#~ msgstr "Selecciona o ficheiro ao ligazón ed2k creado"
+
+#~ msgid ""
+#~ "aLinkCreator, the aMule ed2k link creator\n"
+#~ "\n"
+#~ "(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+#~ "\n"
+#~ "Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+#~ "and http://jimmac.musichall.cz/ikony.php3\n"
+#~ "\n"
+#~ "Distributed under GPL"
+#~ msgstr ""
+#~ "aLinkCreator, o creador de enlaces ed2k de aMule\n"
+#~ "\n"
+#~ "(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+#~ "\n"
+#~ "Pixmaps de http://www.everaldo.com e http://www.icomania.com\n"
+#~ "e http://jimmac.musichall.cz/ikony.php3\n"
+#~ "\n"
+#~ "Distribuido baixo GPL"
+
+#~ msgid "aLinkCreator, the aMule ed2k link creator"
+#~ msgstr "aLinkCreator, o creador de ligazóns ed2k de aMule"
+
+#~ msgid "Copy ED2k link to clipboard"
+#~ msgstr "Copiar enlace ED2K ao portapapeis"
+
+#~ msgid "Copy ED2k links to clipboard"
+#~ msgstr "Copiar enlace ED2K ao portapapeis"
+
+#~ msgid "ED2K: Connecting"
+#~ msgstr "ED2K: Conectando"
+
+#~ msgid "ED2K: Disconnected"
+#~ msgstr "ED2K: Desconectado"
+
+#~ msgid "Warning: Unable to open skin file '%s' for read"
+#~ msgstr "Aviso: Imposible abrir o ficheiro de tema '%s' para lectura"
+
+#~ msgid "ed2k network"
+#~ msgstr "Red ed2k"
+
+#~ msgid ""
+#~ "Your Auto-update servers list is in blank.\n"
+#~ "'Auto-update serverlist at startup' will be disabled."
+#~ msgstr ""
+#~ "Túa auto-actualización da lista de servidores está en branco.\n"
+#~ "'Auto-actualizar lista de servidores ao iniciar' deshabilitarase."
+
+#~ msgid ""
+#~ "Both ED2K and Kad network are disabled.\n"
+#~ "You won't be able to connect until you enable at least one of them."
+#~ msgstr ""
+#~ "As redes ED2K e Kas están desactivadas.\n"
+#~ "Non poderá conectar a non ser que active algunha delas."
+
+#~ msgid "Edit Serverlist"
+#~ msgstr "Editar lista de servidores"
+
+#~ msgid "Error: couldn't accept a new external connection"
+#~ msgstr "Erro: non se puido aceptar unha nova conexión externa"
+
+#~ msgid "ED2K is disabled in preferences."
+#~ msgstr "ED2K está desactivado nas preferencias."
+
+#~ msgid "ExternalConn: shutdown requested"
+#~ msgstr "Conexión externa: apagado solicitado"
+
+#~ msgid "Already connected to ED2K."
+#~ msgstr "Xa está conectado a ED2K."
+
+#~ msgid "Connecting to ED2K..."
+#~ msgstr "Conectando a ED2K..."
+
+#~ msgid "Disconnected from ED2K."
+#~ msgstr "Desconectado de ED2K."
+
+#~ msgid "ExternalConn: invalid opcode received: %#x"
+#~ msgstr "Conexión externa: recibido opcode inválido: %#x"
+
+#~ msgid "ED2K Status:"
+#~ msgstr "Estado ED2K:"
+
+#~ msgid "Average Downloadrate (Session): %s"
+#~ msgstr "Velocidade media de descarga (Sesión): %s"
+
+#~ msgid "Average Uploadrate (Session): %s"
+#~ msgstr "Velocidade media de subida (Sesión): %s"
+
+#~ msgid "Max Downloadrate (Session): %s"
+#~ msgstr "Velocidade de descarga máxima (Sesión): %s"
+
+#~ msgid "Max Uploadrate (Session): %s"
+#~ msgstr "Velocidade de subida máxima (Sesión): %s"
+
+#~ msgid "Average filesize: %s"
+#~ msgstr "Tamaño medio dos ficheiros: %s"
+
+#~ msgid "ED2K search can't be done if ED2K is not connected"
+#~ msgstr "A busca ED2K non pode ser feita se non está conectado a ED2K"
+
+#~ msgid "Error: "
+#~ msgstr "Erro: "
+
+#~ msgid "Warning: "
+#~ msgstr "Aviso: "
+
+#~ msgid "Search related files (ED2k, local server)"
+#~ msgstr "Buscar ficheiros similares (ED2k, servidor local)"
+
+#~ msgid "Error"
+#~ msgstr "Erro"
+
+#~ msgid ""
+#~ "WARNING: You can't add yourself as a source for a ed2k link while being "
+#~ "lowid."
+#~ msgstr ""
+#~ "AVISO: Non pode engadir a si mesmo como unha fonte para unha ligazón ed2k "
+#~ "mentras teña id baixa."
+
+#~ msgid ""
+#~ "Please set your preferred video player on preferences.\n"
+#~ "Meanwhile, aMule will attempt to use mplayer and you will get this "
+#~ "warning on every preview"
+#~ msgstr ""
+#~ "Por favor estableza o seu reproductor de vídeo preferido nas "
+#~ "preferencias.\n"
+#~ "Entretanto, aMule tentará empregar o mplayer e recibirá este aviso en "
+#~ "todas as previsualizacións"
+
+#~ msgid "Error: Failed to open part.met file: %s ==> %s"
+#~ msgstr "Erro: Non se pode abri-lo ficheiro part.met: %s => %s"
+
+#~ msgid "Error: part.met file is 0 size: %s ==> %s"
+#~ msgstr "Erro: o tamaño do ficheiro part.met é 0: %s ==> %s"
+
+#~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "Erro: Versión de ficheiro part.met inválida: %s ==> %s"
+
+#~ msgid "Warning: %s might be corrupted (%i)"
+#~ msgstr "Perigo: %s pode estar corrupto (%i)"
+
+#~ msgid "Unexpected file error while completing %s. File paused"
+#~ msgstr "Erro inesperado ao completar o ficheiro %s. Ficheiro pausado"
+
+#~ msgid ""
+#~ "Warning: Unable to hash downloaded part - hashset incomplete for '%s'"
+#~ msgstr ""
+#~ "Perigo: Non se pode hashear o part descargado - hahset incompleto para '%"
+#~ "s'"
+
+#~ msgid ""
+#~ "Error: Unable to hash downloaded part - hashset incomplete (%s). This "
+#~ "should never happen"
+#~ msgstr ""
+#~ "Erro:  Non se puido hashear o part descargado - hahset incompleto (%s) - "
+#~ "Isto non debe pasar nunca"
+
+#~ msgid "Insufficient Diskspace"
+#~ msgstr "Espazo en disco insuficiente"
+
+#~ msgid "Warning: known.met cannot be opened."
+#~ msgstr "Aviso: non se pode abrir known.met."
+
+#~ msgid "Warning: Knownfile list corrupted, contains invalid header."
+#~ msgstr ""
+#~ "Aviso: Lista de ficheiros coñecidos corrupta, contén cabeceira inválida."
+
+#~ msgid "ERROR! Attempted to share %s"
+#~ msgstr "ERRO! Tentando compartir %s"
+
+#~ msgid "ED2K network disabled on preferences, not connecting."
+#~ msgstr "Rede ED2K desactivada nas preferencias, non conectando."
+
+#~ msgid "No valid servers to connect in serverlist found"
+#~ msgstr "Non hai servidores válidos na lista de servidores"
+
+#~ msgid "Error: Socket invalid at timeoutcheck"
+#~ msgstr "Erro: Socket inválido ao comprobar timeout"
+
+#~ msgid ""
+#~ "Error: Failed to load backup file. Search http://forum.amule.org for ."
+#~ "part.met recovery solutions."
+#~ msgstr ""
+#~ "Error: Imposible cargar o arquivo de respaldo. Procure no http://forum."
+#~ "amule.org solucións de recuperación de arquivos .part.met"
+
+#~ msgid "Cannot convert magnet link to ed2k: %s"
+#~ msgstr "Non se pode converter a ligazón magnética a ed2k: %s"
+
+#~ msgid "Invalid ed2k link! Error: %s"
+#~ msgstr "Ligazón ed2k inválido! Erro: %s"
+
+#~ msgid "Bandwidth Limits: Up: %u kB/s, Down: %u kB/s.\n"
+#~ msgstr "Límite de ancho de banda: SU: %u kB/s, DE: %u kB/s.\n"
+
+#~ msgid "Shutdown aMule."
+#~ msgstr "Apaga aMule."
+
+#~ msgid ""
+#~ "Shutdown the remote running core (amule/amuled).\n"
+#~ "This will also shut down the text client, since it is unusable without a\n"
+#~ "running core.\n"
+#~ msgstr ""
+#~ "Pechar o núcleo remoto de execución (amule/amuled).\n"
+#~ "Isto tamén pechará o cliente de texto, isto non fará nada se non hai\n"
+#~ "un núcleo en execución.\n"
+
+#~ msgid "Connect to ED2K only."
+#~ msgstr "Conectar só a ED2K."
+
+#~ msgid "Disconnect from ED2K only."
+#~ msgstr "Desconectar só de ED2K."
+
+#~ msgid "Adds an ed2k or magnet link to core."
+#~ msgstr "Engade un ed2k ou unha ligazón magnética ao núcleo."
+
+#~ msgid ""
+#~ "The ed2k link to be added can be:\n"
+#~ "*) a file link (ed2k://|file|...), it will be added to the download "
+#~ "queue,\n"
+#~ "*) a server link (ed2k://|server|...), it will be added to the server "
+#~ "list,\n"
+#~ "*) or a serverlist link, in which case all servers in the list will be "
+#~ "added to the\n"
+#~ "   server list.\n"
+#~ "\n"
+#~ "The magnet link must contain the ed2k hash and file length.\n"
+#~ msgstr ""
+#~ "A ligazón edk2 a engadir pode ser:\n"
+#~ "*) unha ligazón de ficheiro (ed2k://|file|...), será engadido na cola de "
+#~ "descarga,\n"
+#~ "*) unha ligazón de servidor (ed2k://|server|...), será engadido á lista "
+#~ "de servidores,\n"
+#~ "*) ou unha ligazón de lista de servidores, no que todos os servidores na "
+#~ "lista serán\n"
+#~ "   á lista de servidores.\n"
+#~ "\n"
+#~ "A ligazón magnética debe conter o hash ed2k e a lonxitude do ficheiro.\n"
+
+#~ msgid "Deprecated command, now '%s'."
+#~ msgstr "Comando obsoleto, empregue agora '%s'."
+
+#~ msgid "Error: %s (%s) - %s"
+#~ msgstr "Erro: %s (%s) - %s"
+
+#~ msgid "Warning: %s (%s) - %s"
+#~ msgstr "Aviso: %s (%s) - %s"
+
+#~ msgid "Error: Out of diskspace"
+#~ msgstr "Erro: Disco cheo"
+
+#~ msgid "Error: Partmet not found"
+#~ msgstr "Erro: Partmet non atopado"
+
+#~ msgid "Error: IO error!"
+#~ msgstr "Erro: Erro ES!"
+
+#~ msgid "Error: Failed!"
+#~ msgstr "Erro: Fallou!"
+
+#~ msgid "ED2K Link: "
+#~ msgstr "Ligazón ED2K: "
+
+#~ msgid ""
+#~ "Click here to add the ed2k link in the text control to your download "
+#~ "queue."
+#~ msgstr "Prema aquí para engadir un ligazón ed2k na túa cola de descargas."
+
+#~ msgid "Searches for more results on ED2K. Not supported for Kad yet."
+#~ msgstr "Procurar máis resultados en ED2K. Non soportado todavía por Kad."
+
+#~ msgid "0"
+#~ msgstr "0"
+
+#~ msgid "Bandwith Limits"
+#~ msgstr "Límite de ancho de banda"
+
+#~ msgid "This is the standard ED2K port and cannot be disabled."
+#~ msgstr "Este é o porto estándar ED2K e non pode ser deshabilitado."
+
+#~ msgid "This UDP port is used for extended Ed2K requests and Kad network"
+#~ msgstr ""
+#~ "Este porto UDP é usado para extender as peticións ED2K e a rede Kad."
+
+#~ msgid "Hard Limit"
+#~ msgstr "Límite máximo"
+
+#~ msgid "Connection Limits"
+#~ msgstr "Límite de conexións"
+
+#~ msgid "Auto-update serverlist at startup"
+#~ msgstr "Actualizar automaticamente a lista de servidores ao inicio"
+
+#~ msgid "Update serverlist when connecting to a server"
+#~ msgstr "Actualizar a lista de servidores ao conectar a un servidor"
+
+#~ msgid "Update serverlist when a client connect"
+#~ msgstr "Actualizar lista de servidores ao conectar a un cliente"
+
+#~ msgid "Disk Space"
+#~ msgstr "Espazo en disco"
+
+#~ msgid "Check Disk Space"
+#~ msgstr "Comprobar espazo en disco"
+
+#~ msgid "Select this if you want aMule to check your Disk Space"
+#~ msgstr "Seleccione isto se queres que aMule comprobe teu espazo en disco"
+
+#~ msgid "Min Disk Space:"
+#~ msgstr "Espazo en disco mínimo:"
+
+#~ msgid "Incoming Directory :"
+#~ msgstr "Directorio entrante :"
+
+#~ msgid "Temporary Directory :"
+#~ msgstr "Directorio temporal :"
+
+#~ msgid "Shared Directories"
+#~ msgstr "Directorios compartidos"
+
+#~ msgid "Create Backup to preview"
+#~ msgstr "Crear copia de seguranza para previsualizar"
+
+#~ msgid "Show Fast ED2K Links Handler"
+#~ msgstr "Mostrar xestión rápida de ligazóns ED2K"
+
+#~ msgid "Webserver Parameters"
+#~ msgstr "Parámetros do servidor web"
+
+#~ msgid "Webserver port"
+#~ msgstr "Porto do servidor web"
+
+#~ msgid "Enable UPnP port forwarding on the Webserver port"
+#~ msgstr "Activar o seguimento do porto UPnP no porto do servidor web"
+
+#~ msgid "Webserver UPnP TCP port"
+#~ msgstr "Porto Tcp UPnP do servidor web"
+
+#~ msgid "Serverlist"
+#~ msgstr "Lista de servidores"
+
+#~ msgid "Manual Server Add : Name"
+#~ msgstr "Engadir servidor manualmente: Nome"
+
+#~ msgid "No One"
+#~ msgstr "Ninguén"
+
+#~ msgid "Speed Limits:"
+#~ msgstr "Límite de velocidade: "
+
+#~ msgid "Download Speed: %.1f"
+#~ msgstr "Velocidade de descarga: %.1f"
+
+#~ msgid "Upload Speed: %.1f"
+#~ msgstr "Velocidade de subida: %.1f"
+
+#~ msgid "TCP Port: %d"
+#~ msgstr "Porto TCP: %d"
+
+#~ msgid "TCP Port: Not Ready"
+#~ msgstr "Porto TCP: Non está listo"
+
+#~ msgid "UDP Port: %d"
+#~ msgstr "Porto UDP: %d"
+
+#~ msgid "UDP Port: Not Ready"
+#~ msgstr "Porto UDP: Non está listo"
+
+#~ msgid "Shared Files: %d"
+#~ msgstr "Ficheiros compartidos: %d"
+
+#~ msgid "Queued Clients: %d"
+#~ msgstr "Clientes en cola: %d"
+
+#~ msgid "Upload Limit"
+#~ msgstr "Límite de subida"
+
+#~ msgid "Download Limit"
+#~ msgstr "Límite de descarga"
+
+#~ msgid ""
+#~ "No serverlist address entry in 'addresses.dat' found. Please paste a "
+#~ "valid serverlist address into this file in order to auto-update your "
+#~ "serverlist"
+#~ msgstr ""
+#~ "Non hai lista de servidores no ficheiro 'addresses.dat': Por favor copie "
+#~ "un enderezo válido neste ficheiro para auto-actualizar a súa lista de "
+#~ "servidores"
+
+#~ msgid "Warning, invalid URL specified for auto-updating of servers: %s"
+#~ msgstr ""
+#~ "Aviso, URL especificada para auto-actualización de servidores, inválida: %"
+#~ "s"
+
+#~ msgid "webserver running on pid %d"
+#~ msgstr "servidor web executándose no pid %d"
+
+#~ msgid ""
+#~ "You requested to run webserver from startup, but the amuleweb binary "
+#~ "cannot be run. Please install the package containing aMule webserver, or "
+#~ "compile aMule using --enable-webserver and run make install"
+#~ msgstr ""
+#~ "Solicitou executar webserver ao inicio, pero non se pode executar o "
+#~ "binario amuleweb. Por favor instale o paquete que conteña o aMule "
+#~ "webserver, ou compile aMule usando --enable-webserver e execute make "
+#~ "install"
+
+#~ msgid "Disconnected from ED2K"
+#~ msgstr "Desconectado de ED2K"
+
+#~ msgid "Failed to open friendlist file 'emfriends.met' for reading!"
+#~ msgstr ""
+#~ "Fallou ao abrir o ficheiro de lista de amigos 'emfriends.met' para ler!"
+
+#~ msgid "Failed to open friendlist file 'emfriends.met' for writing!"
+#~ msgstr ""
+#~ "Fallou ao abrir o ficheiro da lista de amigos 'emfriends.met' para "
+#~ "escribir!"
+
+#~ msgid "ERROR: Failed to open partfile)"
+#~ msgstr "ERRO: -Non se pode abrir o ficheiro part)"
+
+#~ msgid "Mb"
+#~ msgstr "Mb"
+
+#~ msgid "Can't create web socket thread\n"
+#~ msgstr "Imposible crear un socket web\n"
+
+#~ msgid "Web Server: Started\n"
+#~ msgstr "Servidor Web: Iniciado\n"
+
+#~ msgid "Not Supported"
+#~ msgstr "Non soportado"
+
+#~ msgid "LowID: %u (%.2f%% Total %.2f%% Known)"
+#~ msgstr "IDBaixa: %u (%.2f%% Total %.2f%% Coñecido)"
+
+#~ msgid "SecIdent On/Off: %u (%.2f%%) : %u (%.2f%%)"
+#~ msgstr "IdentSeg On/Off: %u (%.2f%%) : %u (%.2f%%)"
+
+#~ msgid "Browse wav"
+#~ msgstr "Examinar wav"
+
+#~ msgid "File wav (*.wav)|*.wav||"
+#~ msgstr "Ficheiro wav (*.wav)|*.wav||"
+
+#~ msgid "No comment(s)"
+#~ msgstr "Sen comentario(s)"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ "only used for statistics."
+#~ msgstr ""
+#~ "Nota: Estes valores só\n"
+#~ "se empregaran para as estadísticas"
+
+#~ msgid "Notifications"
+#~ msgstr "Notificacións"
+
+#~ msgid "Messages popup"
+#~ msgstr "Mensaxes emerxentes"
+
+#~ msgid "Use sound"
+#~ msgstr "Usar son"
+
+#~ msgid "Pop out when :"
+#~ msgstr "Notificar cando :"
+
+#~ msgid "New entry on log"
+#~ msgstr "Nova entrada no rexistro"
+
+#~ msgid "Starts a new chat session"
+#~ msgstr "Iniciar unha nova sesión de chat"
+
+#~ msgid "A new chat message is received"
+#~ msgstr "Recíbese unha nova mensaxe de chat"
+
+#~ msgid "A download is added or finished"
+#~ msgstr "Engádese ou remátase unha descarga"
+
+#~ msgid "New aMule version detected"
+#~ msgstr "Nova versión de aMule detectada"
+
+#~ msgid "Urgent OOD, serverconnection lost"
+#~ msgstr "OOD urxente, perdida conexión co servidor"
+
+#~ msgid "Notify by Mail"
+#~ msgstr "Notificar por correo"
+
+#~ msgid "Send an Email when transfer complete."
+#~ msgstr "Enviar un correo electrónico cando se completa unha transferencia."
+
+#~ msgid "SMTP server :"
+#~ msgstr "Servidor SMTP :"
+
+#~ msgid "Email Address :"
+#~ msgstr "Correo electrónico :"
+
+#~ msgid ":"
+#~ msgstr ":"
+
+#~ msgid ""
+#~ "The selected locale seems not to be installed on your box\n"
+#~ "You must generate it to use this language.\n"
+#~ "A good start on linux systems is the file /etc/locale.gen and the package "
+#~ "'locales'\n"
+#~ "Good luck!\n"
+#~ "(Note: I'll try to set it anyway)"
+#~ msgstr ""
+#~ "O idioma seleccionado non parece estar instalado\n"
+#~ "Debe xeralo para usar esta linguaxe.\n"
+#~ "Un bo comezo en sistemas linux é o ficheiro /etc/locale.gen e o paquete "
+#~ "'locales'\n"
+#~ "Boa sorte!\n"
+#~ "(Nota: Tentarei arreglalo de todas formas)"
+
+#~ msgid "Never show this again"
+#~ msgstr "Non mostrar outra vez"
+
+#~ msgid "Enable/Disable"
+#~ msgstr "Activar/Desactivar"

aMule-2.2.6.tar.bz2/po/he.po -> aMule-2.3.1.tar.bz2/po/he.po Changed

@@ -1,5 +1,4 @@
 # Hebrew translations for amule package.
-# Copyright (C) 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the amule package.
 # <kpeace1@gmail.com>, 2008.
 # <kpeace1@gmail.com>, 2008.
@@ -9,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: amule 2.20\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
 "PO-Revision-Date: 2008-04-11 00:21+0300\n"
 "Last-Translator: Peace Kramer <kpeace1@gmail.com>\n"
 "Language-Team: Hebrew\n"
@@ -18,1272 +17,1074 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "אתה חייב לציין סיסמא שאינה רקה."
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "הוסף חבר"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "סיסמא לא תקינה היא איננה מגובבת בפורמט MD5"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "הזנת כתובת IP ומבואה תקינים!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "החיבור נכשל"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "מידע"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr ""
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "גיבוב-המשתמש הספציפי אינו תקף!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr ""
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "פתיחת הקובץ %s·(%s נכשלה"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "הצלחה!נפתח חיבור ל aMule."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "הצלחה!נפתח חיבור ."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "מגבב"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "מסיים"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "סיים"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "הושהה"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "שגוי"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "מוריד מהרשת"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "ממתין"
-
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "מתחיל לייצר מחרוזת גיבוב באמצעות MD4 ובאמצעות AICH עבור הקובץ: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "מתחיל לייצר מחרוזת גיבוב באמצעות MD4עבור הקובץ:%s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "מתחיל לייצר מחרוזת גיבוב באמצעות AICH עבור הקובץ:%s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "נכשל"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "ממיר את קבוצת הגיבובים בפורמט AICH עבור '%s' ל 64b עבור '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr ""
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "אזהרה: שם הקובץ '%s' אינו חוקי והוא נקרא מחדש בשם '%s'."
+#: src/amule.cpp:335
+#, fuzzy
+msgid "aMule shutdown completed."
+msgstr "הורדה הסתיימה"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "אזהרה: הקובץ '%s' כבר קיים. שם הקובץ החדש שונה ל '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr ""
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "אזהרה: לא ניתן להסיר את '%s' המקורי לאחר שנוצר גיבוי."
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "אישרור יצאיה"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "אזהרה: הניסיון למחוק/להסיר את '%s' נכשל."
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "גישה חיצונית חדשה התקבלה"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "הניסיון לקבל את רשימת הקבצים המשותפים מהמשתמש '%s' כשלה."
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "אזהרה"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "לא ידוע"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr "(חיקוי אימיול בגרסת %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "מידע"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr "(חיקוי אימיול)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "אקס-מיול (חיקוי אימיול)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr ""
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.איקס (מבוסס על אימיול בגרסת 0.%u)"
+msgid "web server running on pid %d"
+msgstr ""
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "כינוי:%s מ\"ז: %u"
+#: src/amule.cpp:658
+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/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "בוּקַש: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr ""
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not bind ports to the specified address: %s"
+msgstr ""
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "בקשה עבור קובץ לא ידוע"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr ""
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "לקוח %s ב כתובת:מבואה %s:%d משתמש ב %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "שם משתמש"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "חברים"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "הצג &פרטים"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "הוסף חבר"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "הסר חבר"
-
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "שלך &הודעה"
-
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "הצג קבצים"
-
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "הוקמה משבצת \"חבר\""
-
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "האם אתה בטוח שאתה רוצה להסיר את החבר שבחרת?"
-
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "האם אתה בטוח שאתה רוצה להסיר את החברים שבחרת?"
-
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "ביטול"
-
-#: src/FriendListCtrl.cpp:359
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
 msgstr ""
-"אתה לא רשאי להגידר יותר ממשצת \"חבר\" אחת.\n"
-"רק משבצת אחת הוגדרה."
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "בחירה מרובה."
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "הורדה הסתיימה"
-
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "הנתיב המלא לקובץ"
-
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "שם הקובץ ללא הנתיב."
-
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "גודל הקובץ בבתים."
-
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "זמן מצטבר של פעולת הורדה."
-
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "צ'אט חדש החל."
-
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "שולח ההודעה"
-
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "נגמר המקום"
-
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "מחיצת דיסק."
-
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "שגיאה בעת הסיום."
-
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "שם קובץ"
-
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "גודל"
-
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "סוג/טיפוס"
-
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "עדיפות"
-
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "מ\"ז של קובץ"
-
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "בקשות"
-
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "בקשות שהתקבלו"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "מידע שנשנלח"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "יחס שיתוף"
-
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "חלקים שהושגו"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "מקורות שלמים"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "נתיב תיקייה"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "קבצים משותפים"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "מאוד נמוך"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "נמוך"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "רגיל"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "גבוה"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "מאוד גבוה"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "שחרור"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "תרגיש חופשי לדוואח על כל שגיאה ל http://forum.amule.org"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "אוטמטי"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "הוסף תגובה/דירוג"
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "שם שרת:"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "ערוך תגובה/דירוג"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "שנה שם"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "שגיאה: לא יכול לפתוח קובץ יומן."
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "הוסף קבצים שבאסופה לרשימת המשלוח"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "העתק מגנט &URI ללוח"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "היומן אופס."
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "העתק משוב ללוח"
-
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
+#: src/amule.cpp:1613
 #, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "אתה צריך מ\"ז גבוה (HighID) כדי לחןר קישור-מקור תקף"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "אזהרה"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:451
+#: src/amule.cpp:1616
 #, c-format
-msgid "Shared Files (%i)"
-msgstr "קבצים משותפים (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[קובץ-חלקים]"
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "הכנס שם חדש עבור קובץ זה"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "שינוי שם לקובץ"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr ""
 
-#: src/UploadQueue.cpp:511
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
 #, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "ממשיך את העלאה של קובץ: %s"
+msgid "Users: %s | Files: %s"
+msgstr ""
 
-#: src/UploadQueue.cpp:520
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
 #, c-format
-msgid "Suspending upload of file: %s"
-msgstr "משהה את העלאה של קובץ: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "לקוח טסטואלי של אֵימיול"
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "קאדימליה: מילת חיפוש קצרה מדי"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, fuzzy, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "קרא %u יוצרי קשר ל קאד"
-msgstr[1] "קרא %u יוצרי קשר ל קאד"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "עם מ\"ז נמוך (LowID)"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-msgstr[1] ""
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "עם מ\"ז גבוהה (HighID)"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
+#: src/amule.cpp:1867
 #, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
+msgid "Connected to %s %s"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "הבקשה נכשלה עם השגיאות הבאות: %s."
-
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "הבקשה נכשלה עם שגיאה לא ידועה"
-
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "קובץ האינדקס לא נמצא"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "קאד התחיל."
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "פג התוקף של החיבור - מבקש התחברות מחדש\n"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "קאד נעצר."
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "התחברות הצליחה - מחובר\n"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "קאד מחובר (בסדר)"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "התחברות הצליחה, לא מזוהה\n"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "קאד מחובר (מאחורי חומת אש)"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "לא נפתחה התחברות - הולך לבקש להזדהות\n"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "מנותק מקאד."
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "נוצרה התחברות מבקש להזדהות\n"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr "אי אפשר להשתמש ברשת הקאד אם מוואת UDP מבוטלת בהעדפות, לא התחיל."
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "מעבד בקשה [מקורי]: "
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "קאד מבוטל בהעדפות, לא מתחבר."
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "בודק סיסמא\n"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "גיבוב הסיסמא אינו תקף\n"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "הסיסמא בסדר\n"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "סיסמא שגויה\n"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "לא הזנת סיסמא. סיסמאות ריקות אינם קבילות.\n"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "ב‏‎ֻקְשַה התנתקות\n"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "מעבד בקשה [הופנתה מחדש]: "
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "זהו אֵימיול %s המבוסס על אִמיול"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "טוען תבנית<מחרוזת>"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "פועל על %s"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr ""
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr "בקר ב http://www.amule.org כדי לבדוק האם ישנה גירסה חדישה זמינה."
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "מבואת UPnP"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "אימיול שלט רחוק"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "השמתש בדחיסת gzip"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "צילום:"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "אפשר גישה לאורחים"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "מנע גישה מאורחים"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "נתיב קובץ ההגדרות של אימיול. לא לשימוש בצורה ישירה!!"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "נטרל מפענח PHP (מיושן-מבוטל)"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "הדר מחדש דפי PHP לאחר כל בקשה"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "קאדימליה: תקשורת עמית לעמית מנותבת המבוסס על ה XOR המטרי.\n"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "שרת אימיול רשתי"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "לא זמין"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr ""
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "אף פעם"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "הודעה"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "מוריד מהרשת..."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr ""
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "מתחבר"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "העדפות"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "תקיה המכילה את הקובץ amulesig.dat"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "דפדף"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "קאד: חסום חומתאש"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "הכנס כאן את התקייה היכן שהקובץ amulesig.dat נמצא"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "קאד: מחובר"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "קצב מרווח הרענון בשניות"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "קאד: מתחבר"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "צור תמונת סטאטוס בכל ארוע רענון"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "קאד: מכובה"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "הכנס כאן את התקיה שבה אתה רוצה ליצור את תמונת הסטטוס"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "ביטול"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "העלה בתקופתיות את תמונת הסטטוס לשרת FTP"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "הפסק את ניסיונות ההתחברות הנוכחיים"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "כתובת URL של FTP"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "מנותק"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "נתיב FTP"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "התנתק מהרשתות שאליהם אתה מחובר כעת"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "הכנס כאן את כתובת ה URL של שרת ה FTP"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "התחבר"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "הכנס כאן את נתיב הספריה שבה אתה שם את תמונת הסטטוס על שרת ה FTP"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "התחבר לרשתות שמאופשרות כרגע"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "משתמש"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "מעלה: %.1f(%.1f) | מוריד: %.1f(%.1f)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "סיסמא"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "מעלה: %.1f | מוריד: %.1f"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "הכנס כאן את שם המשתמש שאיתו תתחבר לשרת ה FTP"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "אימיול (%s | מחובר)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "הכנס את סיסמת הזיהוי להתחברות לשרת ה FTP"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "אימיול (%s | מנותק)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "קצב עדכון התקופתי של ה FTP בדקות"
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "האם אתה באמת רוצה לצאת מאימיול?"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "אַמת"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "אישרור יצאיה"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "תיקיה המכילה את קובץ החתימה שלך"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "תיקיה שבה יווצרו תמונות הסטאטוס"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amuleDlg.cpp:1232
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "ימים - %i, שעות -%i, דקות - %i, שניות - %i"
+msgid "Skin directory '%s' does not exist"
+msgstr "ספריית הסקינים '%s' לא קיימת"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "סטטיסטיקות מקוונות של אימיול - wxCas"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "ברוכים הבאים!"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "רשתות"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "אֵימיול"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "חלון הרשתות"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "קצב הורדה מקסימלי מאז ש wxCas החל לפעול"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "חיפושים"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "קצב הורדה מקסימלי אבסלוטי בעת הפעלות קודמות של wxCas"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "חלון החיפושים"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "אתחל מחדש"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "הורדות"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "מערכת"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "מוריד מהרשת"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "עצור רענון אוטומטי"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "שמור תמונה סטטיסטית מקוונת"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "חלון הקבצים המשותפים"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "הדפס תמונה סטטיסטית מקוונת"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "הודעות"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "הגדרת העדפות"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "חלון ההודעות"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "אודות wxCas"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "סטטיסטיקות"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "החל רענון אוטומטי"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "חלון גרפי הסטטיסטיקה"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "רענון אוטמטי נעצר"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "העדפות"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "רענון אוטמטי התחיל"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "חלון הגדרת ההעדפות"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "שמור תמונה סטטיסטית"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "ייבא"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "סטטיסטיקות מקוונות של אימיול"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "כלי הייבא עבור קובץ-החלקים"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
-"ישנה בעייה בהדפסה.\n"
-"האם המדפסת הנוכחית שלך מוגדרת בצורה נכונה?"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "אודות"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "מדפיס"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "אודות/עזרה"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
 msgstr ""
-"סטטיסטיקות חתימות מקוונת של אימיול - wxCasn\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"מבוסס על CAS שנותר על ידי Pedro·de·Oliveira·<falso@rdk.homeip.net>\n"
-"\n"
-"מופץ תחת רשיון GPL"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "או או.. אימיול לא פועל..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "אימיול פועל"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "אמיול פועל אך אינו מחובר"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "אימיול מתחבר..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "או או... המצב של אימיול אינו ידוע..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "אֵימיול "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " פועל במשך "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " הופסק !"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " אינו מחובר !"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " מתחבר..."
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " עושה משהו מוזר, תבדוק את זה!"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "אֵימיול"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " מחובר ל "
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "שגיאה סופנית: יצירת קוצב-זמן נכשלה"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " קאד: "
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "התחבר לאימיול מרוחק"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "בסדר"
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "שגיאה סופנית: יצירת קוצב-זמן נכשלה"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "חסום-חומתאש"
+#: src/amule-remote-gui.cpp:268
+#, fuzzy
+msgid "Going to event loop..."
+msgstr "מנסה לשחזר את המידע של הקובץ"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "מכובה"
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "מתחבר"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " דלוק "
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "התחברות נכשלה "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " עם "
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "סכום כולל של הורדות: "
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", הועלה: "
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "הורד בהחתברות הנוכחית: "
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "מוריד: "
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " ק\"ב/ש, העלאה: "
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "הכול"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " ק\"ב/ש"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "משתף: "
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "לא ידוע"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " קבצ(ים), לקוחות בתור: "
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "הניסיון לקבל את רשימת הקבצים המשותפים מהמשתמש '%s' כשלה."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "זמן: "
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/BaseClient.cpp:1802
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f ק\"ב/ש"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " דלוק "
+msgid " (Fake eMule version %#x)"
+msgstr "(חיקוי אימיול בגרסת %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "עומס ממוצע של המערכת ( 1-5-15 דקות): "
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr "(חיקוי אימיול)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "משך הפעולה של המערכת:"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "אקס-מיול (חיקוי אימיול)"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
+#: src/BaseClient.cpp:1854
 #, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uימים %02uשעות %02uדקות %02uשניות"
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.איקס (מבוסס על אימיול בגרסת 0.%u)"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/BaseClient.cpp:2027
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uשעות %02uדקות %02uשניות"
+msgid "NickName: %s ID: %u"
+msgstr "כינוי:%s מ\"ז: %u"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
+#: src/BaseClient.cpp:2029
 #, c-format
-msgid "%02umin %02us"
-msgstr "%02uדקות %02uשניות"
+msgid "Requested: %s\n"
+msgstr "בוּקַש: %s\n"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/BaseClient.cpp:2031
 #, c-format
-msgid "%02us"
-msgstr "%02uשניות"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "מ\"ז גבוה (HighID)"
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "מ\"ז נמוך (LowID)"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "מנותק"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "בקשה עבור קובץ לא ידוע"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
+#: src/BaseClient.cpp:2700
 #, c-format
-msgid "%.0f B"
-msgstr "%.0f בתים"
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "סוננה הודעה מ '%s'·(IP:%s)"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/BaseClient.cpp:2807
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f ק\"ב"
+msgid "New message from '%s' (IP:%s)"
+msgstr "הודעה חדשה מ '%s'·(IP:%s)"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f מ\"ב"
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך בתקייה %s -> נדחה"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f ג\"ב"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, fuzzy, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "אזהרה: לא ניתן לפתוח את הקובץ known.met."
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
-msgstr "%.2f ט\"ב"
+#: src/CanceledFileList.cpp:61
+#, fuzzy
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr "אזהרה: רשימת הקבצים-המכורים פגומה, מכילה כותר פגום."
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "בוטל !"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "שגיאת קריאה/כתיבה תוך כדי הקובץ known.met: %s"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
-#, c-format
-msgid "Unable to open %s"
-msgstr "לא מצליח לפתוח את %s"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "שגיאה במהלך שמירת הקובץ known.met: %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "פרמטרים להזנה"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "גיבוב קובץ"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "קטיגוריה"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "הוסף כתובות URL אופתינליות לקובץ זה"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr ""
+
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr ""
+
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/CatDialog.cpp:162
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "הוסף"
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "הסר"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "נקה"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "צור קישור עם חלקי הגיבובים"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ChatSelector.cpp:335
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
-msgstr "עזור להפיץ קבצים חדשים ונדירים יותר מהר, במחיר קידור יותר גדול"
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "קובץ גיבובי MD4"
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "התחל"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "שמור"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "העתק ללוח"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "הוסף לחברים"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "יציאה"
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "העתק"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "מ\"ז נמוך (LowID)"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "מ\"ז גבוה (HighID)"
+
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-#, fuzzy
-msgid "Save as"
-msgstr "שמור"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "אודות"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "אודות aLinkCreator"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "מחובר"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "מנותק"
+
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-#, fuzzy
-msgid "Can't open the clipboard"
-msgstr "העתק ללוח"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "אין שום דבר להעתיק נכון לעכשיו !"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "לא הצליך לפתוח את "
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "בבקשה תכניס שם קובץ שאינו ריק"
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך -> אושר"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "שום דבר לשמור עכשיו !"
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך -> נדחה"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "המשתמש %s (%u) ביקש את רשימת התקיות המשותפים שלך -> אושר"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "מגבב..."
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "המשתמש %s (%u) ביקש את רשימת התקיות המשותפים שלך -> נדחה"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr ""
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
+msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך בתקיה %s -> אושר"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr ""
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך בתקייה %s -> נדחה"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr ""
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "משתמש %s·(%u) משתף את התקייה %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/ClientTCPSocket.cpp:967
 #, c-format
-msgid "Done in %.2f s"
-msgstr "הסתיים ב %.2f שניות"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "כבר הוספת את כתובת URL הזאת !"
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "משתמש %s·(%u) שלח רשימת תקיות משותף בלי שהתבקש."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "בבקשה תכניס כתובת URL שאינה ריקה"
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "משתמש %s (%u) שלח רשימה של קבצים משותפים עבור הספריה %s"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/ClientTCPSocket.cpp:989
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "מעבד קובץ מס. %u: %s"
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "משתמש %s (%u) סיים לשלוח את רשימת הקבצים המשותפים"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "ביקשת גיבובים עבור חלקים (בשימוש רק עבור קבצים > 9.5 מ\"ב"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "משתמש %s·(%u) שלח רשימה של קבצים משותפים מבלי שהתבקש"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/ClientTCPSocket.cpp:1006
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "קובץ %s אינו קיים!\n"
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr "משתמש %s (%u) שלל גישה לרשימת הקבצים/תקיות שלו"
 
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "הערות על הקובץ"
+
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "שם משתמש"
+
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "שם קובץ"
+
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "דרוג"
+
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "הערה"
+
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "אין הערות"
+
+#: src/CommentDialogLst.cpp:105
+#, fuzzy, c-format
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u הערה"
+msgstr[1] "%u הערה"
+
+#: src/CorruptionBlackBox.cpp:227
+#, c-format
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
 #: src/DataToText.cpp:37
@@ -1298,31 +1099,57 @@
 msgid "Auto [Hi]"
 msgstr "אוטומטי [גבוה]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "מתחבר"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "מאוד נמוך"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "נמוך"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "רגיל"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "גבוה"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "מאוד גבוה"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "שחרור"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "מבקש"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "מתחבר דרך השרת"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "התור מלא"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "על התור"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "מעביר"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "מוריד מהרשת"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1348,8 +1175,7 @@
 msgid "Too many Kad connections"
 msgstr "יותר מדי חיבורי קאד"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "חסום"
 
@@ -1381,8 +1207,8 @@
 msgid "Remote Server"
 msgstr "שרת מרוחק"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "קאד"
 
@@ -1403,12 +1229,11 @@
 msgstr "מזריעי מקורות"
 
 #: src/DataToText.cpp:135
-#, fuzzy
 msgid "Search Result"
-msgstr "חיפושים"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "הסתיים"
 
@@ -1432,7 +1257,7 @@
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "נכנס לתור"
 
@@ -1444,869 +1269,297 @@
 msgid "Unknown or bad tempfile format."
 msgstr "פורמט הקובץ הזמני לא מוכר או  פגום"
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "ברירת מחדל של המערכת"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "אלבני"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "ערבית"
-
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "אסטונית"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "בסקית"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "בולגרית"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "קטלונית"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "סינית (מופשטת)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "סינית (מסורתית)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "קרואטית"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "צ'כית"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "דנית"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "הולנדית"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "אנגלית (בריטית)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "אסטונית"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "פינית"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "צרפתית"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "גאלית"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "גרמנית"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "יוונית"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
 
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "הונגרית"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "איטלקית"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "איטלקית (שוויצרית)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "יפנית"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "קוראינית"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "ליטאית"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "גודל"
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "נורבגית (Nynorsk)"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "הועברו"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "פונלית"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "מהירות"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "פורטגזית"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "התקדמות"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "פורטגזית (ברזילאית)"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "מקורות"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "רוסית"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "עדיפות"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "סלובקית"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "מצב"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "ספרדית"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "זמן שנשאר"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "שוודית"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "פעם אחרונה שנראה שלם"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "טורקית"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "פעם אחרונה שנתקבל"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "האם אתה בטוח שברצונך למחוק את הקובץ שנבחר?"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "לא ניתן לזהות את הדפדפן הנבחר!"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "האם אתה בטוח שברצונל ךמחוק את הקבצים שנבחרו?"
 
-#: src/Preferences.cpp:1680
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
+#, c-format
 msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"מבואת ה TCP אינה יכולה להיות גבוהה יותר מ 65532 מאחר שמבואת ה UDP של השרת "
-"היא מבואת ה TCP +3"
-
-#: src/Preferences.cpp:1681
-#, c-format
-msgid "Default port will be used (%d)"
-msgstr "נשתמש במבואה שבברירת מחדך (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "שם שרת"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "כתובת"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "מבואה"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "תיאור"
 
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "פינג"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "משתמשים"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "קבצים"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "אוטמטי"
 
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "נכשל"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&עצור"
 
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "קבוע"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&השהה"
 
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "גירסא"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&המשך"
 
-#: src/ServerListCtrl.cpp:144
-msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
-msgstr "אתה מחובר לשרת אותו אתה מנסה למחוק. בבקשה קודםתתנתק. השרת לא נמחק!"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "נ&קה מה שהסתיים"
 
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "מידע"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "החלף כל A4AF לקובץ הזה עכשיו"
 
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(שם לא ידוע)"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "החלף כל A4AF לקובץ הזה (אוטומטי)"
 
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "האם אתה בטוח שאתה רוצה למחוק את השרת הקבוע %s"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "החלף את כל ה A4AF לכל קובץ אחר, עכשיו"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "כן"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "אפשרויות מורחבות"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "לא"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "תקדימון"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "נכשל בפתיחת '%s'"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "הראה &פרטי קבצים"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "שרתים (%i)"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "הראה את כל ההערות"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "שרת"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "העתק מגנט URI ללוח"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "מחובר לשרת"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "סמן שרת בתור קבוע"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "העתק משוב ללוח"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "סמן שרת בתור לא קבוע"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "לא מיוחס"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "סמן שרתים בתור קבועים"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "ייחס לקטיגוריה"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "סמן שרתים בתור כאלה שאינם קבועים"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&תפתח את הקובץ"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "הסר שרת"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "הכנס שם חדש עבור קובץ זה"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "הסר שרתים"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "שינוי שם לקובץ"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "הסר את כל השרתים"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d·%H:%M:%S"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr ""
+#: src/DownloadListCtrl.cpp:1268
+#, c-format
+msgid "Downloads (%i)"
+msgstr "הורדות (%i)"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
+#: src/DownloadListCtrl.cpp:1412
+msgid ""
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "התחבר מחדש לשרת"
-
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "האם אתה בטוח שאתה מעוניין למחוק את כל השרתים?"
-
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "האם אתה בטוח שאתה מעוניין למחוק את כל השרת המסומן?"
-
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "האם אתה בטוח שאתה מעוניין למחוק את כל השרתים המסומנים?"
-
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "נוטרל [%s]"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "תקדימון לקובץ"
 
-#: src/amuleDlg.cpp:210
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "זהו אֵימיול %s המבוסס על אִמיול"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "שגיאה: הרצת נגן הסרטים נכשלה! הפקודה: '%s'"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "Running on %s"
-msgstr "פועל על %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr "בקר ב http://www.amule.org כדי לבדוק האם ישנה גירסה חדישה זמינה."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
+msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "אימיול שלט רחוק"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "צילום:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
-"לקוח p2p2 הפועל ב 'כל פלטפורמה' ומבוסס כל אִימיול \n"
-"\n"
 
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " אתר הבית: http://www.amule.org \n"
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "קורא את הספרייה הזמנית"
 
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " פורום: http://forum.amule.org \n"
+#: src/DownloadQueue.cpp:132
+#, fuzzy, c-format
+msgid "Loading PartFile %u of %u"
+msgstr "טוען מידע מקובץ הורדות ישן (%u·מ·%u)"
 
-#: src/amuleDlg.cpp:467
+#: src/DownloadQueue.cpp:154
 msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-" שאלות נפוצות: http://wiki.amule.org \n"
-"\n"
 
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " יצירת קשר: admin@amule.org (נושאים מנהליים) \n"
-
-#: src/amuleDlg.cpp:469
-msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
-"זכוייות יוצרים (C) 2003-2009 צוות אימיול \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " חלק מאֵימיול מבוסס על \n"
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "קאדימליה: תקשורת עמית לעמית מנותבת המבוסס על ה XOR המטרי.\n"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "לא נמצא קובץ-חלקים."
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " זכויות יוצרים (C)·2002·Petar·Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "הודעה"
+#: src/DownloadQueue.cpp:168
+#, fuzzy, c-format
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "נמצא %u קובץ-חלקים"
+msgstr[1] "נמצא %u קובץ-חלקים"
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "קאד: חסום חומתאש"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "קאד: מחובר"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "קאד: מתחבר"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "קאד: מכובה"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "הפסק את ניסיונות ההתחברות הנוכחיים"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "מנותק"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "התנתק מהרשתות שאליהם אתה מחובר כעת"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "התחבר"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "התחבר לרשתות שמאופשרות כרגע"
-
-#: src/amuleDlg.cpp:810
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "מעלה: %.1f(%.1f) | מוריד: %.1f(%.1f)"
-
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "מעלה: %.1f | מוריד: %.1f"
+msgid "Downloading %s"
+msgstr "מוריד %s"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "אימיול (%s | מחובר)"
+msgid "You are already trying to download the file '%s'"
+msgstr "אתה כבר מנסה להוריד את הקובץ '%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "אימיול (%s | מנותק)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "האם אתה באמת רוצה לצאת מאימיול?"
-
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "אישרור יצאיה"
+msgid "You already have the file '%s'"
+msgstr "כבר יש לך את הקובץ '%s'"
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "ספריית הסקינים '%s' לא קיימת"
+msgid "You are already trying to download the file %s"
+msgstr "אתה כבר מנסה להוריד את הקובץ %s"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr ""
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "רשתות"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "חיפושים"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "העברות"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "הודעות"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "סטטיסטיקות"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "ייבא"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "כלי הייבא עבור קובץ-החלקים"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "אודות/עזרה"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr ""
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr ""
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "כללי"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "חיבור"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "מלונים"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "שרתים"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "אבטחה"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "פרוקסי"
-
-#: src/PrefsUnifiedDlg.cpp:177
-#, fuzzy
-msgid "Filters"
-msgstr "מסנן:"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "שליטה מרחוק"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "חתימה מקוונת"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "ארועים"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "ניפוי שגיאות"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "הגדרות משתמש"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"אימיול חייב להיות מאותחל מחדש על מנת לאפשר את השינויים הללו:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- מבואת TCP שונתה \n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- מבואת UDP שונתה \n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"אתה אפשרת חיבוריים חיצוניים אבל לא הזנת סיסמא תקיפה.\n"
-"חיבורים חיצוניים לא יאופשרו אלא אם כן תוזן סיסמא תקיפה."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- השפה שונתה.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- הפסרייה הזמנית שונתה.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-#, fuzzy
-msgid "- ED2K network enabled.\n"
-msgstr "כל הרשתות מנוטרלות."
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "מעלה:0.0 | מוריד 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"קאד לא יתחיל אם מבואת ה UDB מנוטרלת.\n"
-"תאפשר את מבואת ה UDP או שתנטרל את קאד."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"אתה חייב לאתחל את אימיול עכשיו!\n"
-"אם לא תאתחל את אימיול עכשיו אל תתלונן אם משהו רע יקרה.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
-"רשימת השרתים המתעדכנת אוטומטית, ריקה.\n"
-"בבקשה תכניס לפחות כתובת URL אחת שתצביע לקובץ server.met תקף.\n"
-"לחץ על הכפתור \"רשימה\" שליד הצ'קבוקס הזה כדי להכניס בתובת URL."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "קבצים זמניים"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "קבצים נכנסים"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "חתימה מקוונת"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "בחר תיקייה עבור %s"
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "חפש נגן סרטים"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "בחר דפדפן"
-
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Executable%s"
-msgstr "קובץ הרצה %s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
-msgstr ""
-"הוסף כאן כתובות URL שמהם ניתן להוריד קבצי server.met.\n"
-"רק כתובת אחת בכל שורה."
-
-#: src/PrefsUnifiedDlg.cpp:1031
-#, fuzzy, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "השהיית עדון: %d שניות"
-msgstr[1] "השהיית עדון: %d שניות"
-
-#: src/PrefsUnifiedDlg.cpp:1038
-#, fuzzy, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "זמן עבור גרף הממוצע: %d דקות"
-msgstr[1] "זמן עבור גרף הממוצע: %d דקות"
+msgid "Unknown protocol of link: %s"
+msgstr "פרוטקול לא ידוע עבור קישור: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "סקאלאת גרף החיבורים: %d"
-
-#: src/PrefsUnifiedDlg.cpp:1050
-#, fuzzy, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "השהיית עדכון: %d שניות"
-msgstr[1] "השהיית עדכון: %d שניות"
-
-#: src/PrefsUnifiedDlg.cpp:1056
-#, fuzzy, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "גודל זיכרון זמני לקובץ: %d בתים"
-msgstr[1] "גודל זיכרון זמני לקובץ: %d בתים"
-
-#: src/PrefsUnifiedDlg.cpp:1062
-#, fuzzy, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "גודל תור ההאלעות: %d לקוחות"
-msgstr[1] "גודל תור ההאלעות: %d לקוחות"
-
-#: src/PrefsUnifiedDlg.cpp:1069
-#, fuzzy, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "רענון חיבור לשרת כל: %d דקות"
-msgstr[1] "רענון חיבור לשרת כל: %d דקות"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "רענון חיבור לשרת: מנוטרל"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
+msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1118
+#: src/ExternalConn.cpp:260
 #, fuzzy
-msgid "disabled"
-msgstr "נוטרל [%s]"
-
-#: src/PrefsUnifiedDlg.cpp:1138
-#, c-format
-msgid "Execute command on `%s' event"
-msgstr "בצע פקודה בעת ארוע '%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "אפשר הרצת פקודות על הליבה"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "פקודת ליבה:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "אפשר ביצוע פקודות על ממשק גרפי"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "פקודת ממשק גרפי:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "המשתנים הבאים יוחלפו:"
-
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "ניסיון גישה שאינו מורשה. החיבור נסגר."
+msgid "Client sent packet after authentication failed."
+msgstr "זיהוי נכשל"
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "חיבור חיצוני נסגר."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "גישה חיצונית מנוטרלת מאחר שהסיסמא ריקה!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "גישה מרוחקת מנוטרלת בקובץ ההגדרות"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "גישה חיצונית חדשה התקבלה"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "גישה מרחוק נכשלה עקב סיסמא ריקה בהעדפות!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "מחבר לקוח:%s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "גירסה לא ידועה"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2314,2186 +1567,1054 @@
 "גירסת EC לא נכונה, יתכן ויש אי התאמה בינארית. השתמש בליבה ובלקוח חיצוני "
 "מאותו תצלום (גירסה)."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 "אתה לא להתחבר לגרסה ששוחררה מSVN (כלי לניהול גרסאות תוכנה) ! *נאנח* ייתכן "
 "והתרסקות של התוכנה נמנעה"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "זיהוי נכשל"
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "גרסת פרוטוקל לא תקפה."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "חסר התווית של גרסת הפרוטוקול."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "זיהוי נכשל"
+
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "זיהוי נכשל"
+
+#: src/ExternalConn.cpp:516
+#, fuzzy
+msgid "Invalid request, please authenticate first."
 msgstr "בקשה לא תקפה, כדאי שקודם תאמת."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "גישה אושרה."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr ""
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "ניסיון גישה שאינו מורשה. החיבור נסגר."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "פקודת קובץ-חלקים מרוחקת מכשלה: גיבוב הקובץ לא נמצא: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "גיבוב הקובץ לא מצא: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "אופס! שגיאה בעיבוד קוד-פעולה!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "השרת לא התווסף"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "לא נמצא השרת: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "צריך להגדיר שרת כדי להסירו"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "חיפוש פועל כרגע. ייבא מחדש תוצאות בעוד רגע!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "לא הגיוני לבצע חיפוש-רשתי מתוך ממשק מרוחק."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "קאד מנוטרל בתוך ההעדפות."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "אין נקודות עבור הגרף."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "הלקוח שלך אינו מוגדר עבור הרמה הזאת של פרטים."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "כבר בתהליך כיבוי."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "חיבור-חיצוני: מוסיף קישור '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "קישור לא תקף או שכבר נמצא ברשימה."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "קובץ לא נמצא."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "שם קובץ לא תכף."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "לא מצליח לשנות את השם של הקובץ."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "קאד מנוטרל בתוך ההעדפות."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "כבר מחובר לקאד."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "מתחבר לקאד..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "כל הרשתות מנוטרלות."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "מתנתק מקאד."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "קוד-פעולה לא תקף (גרסת פרוטקול שגויה?)"
 
-#: src/UploadClient.cpp:273
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr "נכשל בפתיחת הקובץ (%s), מסיר מרשימת הקבצים המשותפים."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "התבקשה קבוצת הגיבובים של קובץ לא ידוע: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "פקודת '%s עם pid '%d' סיים עם קוד סטטוס '%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "שרת לא התווסף: לא צויין שם שרת או כתובת אי.פי."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "שרת לא התווסף: צוינה מבואה לא תקפה."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
+msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "מחובר"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "אי.פי.:מבואה"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "מ\"ז"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "סטטוס קאדימליה:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "פועל"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "סטאטוס:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "מנותק"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "מצב חיבור:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "חסום חומת אש"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "בסדר"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "מצב חומת אש: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "מחובר לחבר"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "אין חבר"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "ממוצע משתמשים:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "ממוצע קבצים:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "לא פועל"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Uptime: %s"
-msgstr "זמן פעולה: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "מעביר"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "ההעלאות"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "מידע שהועלה (התחברות נוכחית(סכום כולל)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "סכום כולל של התקורה (חבילות): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "תקורת בקשות קבצים (חבילות): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "תקורת החלפת מקורות (חבילות): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "תקורת השרת (חבילות): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "תקורת קאד (חבילות): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
+msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "האלעות פעילות: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "העלאות בהמתנה: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "סכום כולל של האלעות מוצלחות: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "סכות כולל של העלאות שנשכשלו: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "זמן האלעה ממוצע: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "הורדות"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "הורדת מידע (התחברות נוכחית (סכום כולל)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "מקורות שנמצאו: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "הורדות פעילות (נתחים): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "יחס העלאה:הורדה בהתחברות נוכחית (סכום כולל): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
 
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
 
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
 msgstr ""
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "התחברויות מחדש: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "זמן מאז העברה הראשונה: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "מחובר לשרת מאז: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "חיבורים פעילים (משוער): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "גבול מקסימלי של התחברויות הושג: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "חיבורים בממוצע (משוער): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "שיא החיבורים (משוער): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "לקוחות"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "מסוננים"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "סכום כולל: %i מוכר: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "שרתים פעילים: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "שרתים שנכשלו: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "סכום כולל: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "שרתים שנמחקו: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "שרתים שסוננו: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "משתמשים על שרתים פעילים: %llu"
-
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "קבצים על שרתים פעילים: %llu"
-
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "סכום כולל של משתמשים: %llu"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr ""
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Total Files: %llu"
-msgstr "סכום כולל של קבצים: %llu"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "תעסוקת שרתים: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr ""
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "מספר קבצים משותפים: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr ""
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "גודל כולל של קבצים משותפים: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
 
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "מערכת הפעלה"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "לא התקבל"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "גזור"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "הדבק"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "בחר הכל"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "לא יכול להתבצע חיפוש באמצעות קאד אם קאד לא פועל"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr ""
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "שגיאה לא צפויה בעת ניסיון ביצוע חיפוש ב קאד: "
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr ""
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "סוננה הודעה מ '%s'·(IP:%s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr ""
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "הודעה חדשה מ '%s'·(IP:%s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr ""
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך -> אושר"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr ""
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך -> נדחה"
+msgid "Type '%s' to get more help.\n"
+msgstr ""
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "המשתמש %s (%u) ביקש את רשימת התקיות המשותפים שלך -> אושר"
+msgid "This is %s %s %s\n"
+msgstr ""
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "המשתמש %s (%u) ביקש את רשימת התקיות המשותפים שלך -> נדחה"
+msgid "This is %s %s\n"
+msgstr ""
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך בתקיה %s -> אושר"
-
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr "המשתמש %s (%u) ביקש את רשימת הקבצים המשותפים שלך בתקייה %s -> נדחה"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "משתמש %s·(%u) משתף את התקייה %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "משתמש %s·(%u) שלח רשימת תקיות משותף בלי שהתבקש."
-
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "משתמש %s (%u) שלח רשימה של קבצים משותפים עבור הספריה %s"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "משתמש %s (%u) סיים לשלוח את רשימת הקבצים המשותפים"
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "משתמש %s·(%u) שלח רשימה של קבצים משותפים מבלי שהתבקש"
-
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr "משתמש %s (%u) שלל גישה לרשימת הקבצים/תקיות שלו"
+"\n"
+"Creating client...\n"
+msgstr ""
 
-#: src/KadDlg.cpp:132
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Nodes (%u)"
-msgstr "צמתים (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "כתובת IP לא חוקית על מנת לבצע אתחול"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "מבואה לא תקפה על מנת לבצע אתחול"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "אנא מלא את כל השדות כפי שנדרש"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "האם את בטוח שברצונח להוריד קובץ nodes.dat חדש?\n"
-
-#: src/KadDlg.cpp:197
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
-msgstr "ביצוע פעולה זו תסיר את כל הצמתים הקחחצחם ןתאתחל את חיבור הקאדימליה."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "להמשיך?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "הוסף חבר"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr ""
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "הזנת כתובת IP ומבואה תקינים!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr ""
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "מידע"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr ""
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "גיבוב-המשתמש הספציפי אינו תקף!"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "מקורות"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "קובץ"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "הורדה"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "קטיגוריה"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "ראשי"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "הורדה בקטיגוריה"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr ""
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "סמן בתור קובץ מוכר"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "פרטי הקובץ"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "התחבר לאימיול מרוחק"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% הושלם"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "התחברות נכשלה "
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
+msgstr "%.2f ק\"ב/ש"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "משתמשים: ed2k -> %s קאד -> %s | קבצים: ed2k -> %s קאד -> %s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "הכול"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "חברים"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "סה\"כ משתמשים: %s | סה\"כ קבצים: %s"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "הצג &פרטים"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "הועברו"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "הוסף חבר"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "מהירות"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "הסר חבר"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "התקדמות"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "שלך &הודעה"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "מצב"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "הצג קבצים"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "זמן שנשאר"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "הוקמה משבצת \"חבר\""
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "פעם אחרונה שנראה שלם"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "האם אתה בטוח שאתה רוצה להסיר את החבר שבחרת?"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "פעם אחרונה שנתקבל"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "האם אתה בטוח שאתה רוצה להסיר את החברים שבחרת?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "האם אתה בטוח שברצונך למחוק את הקובץ שנבחר?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"אתה לא רשאי להגידר יותר ממשצת \"חבר\" אחת.\n"
+"רק משבצת אחת הוגדרה."
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "האם אתה בטוח שברצונל ךמחוק את הקבצים שנבחרו?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "בחירה מרובה."
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "שלח הודעה למשתמש"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "הודה שתשלח:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&עצור"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&השהה"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&המשך"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "נ&קה מה שהסתיים"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "החלף כל A4AF לקובץ הזה עכשיו"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "החלף כל A4AF לקובץ הזה (אוטומטי)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "החלף את כל ה A4AF לכל קובץ אחר, עכשיו"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "אפשרויות מורחבות"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "תקדימון"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "הראה &פרטי קבצים"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "הראה את כל ההערות"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "העתק מגנט URI ללוח"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "לא מיוחס"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "ייחס לקטיגוריה"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&תפתח את הקובץ"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "הסר מחברים"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "הוסף לחברים"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "שלך הודעה"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "החלף לקובץ זה"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "ק\"ב/ש"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d·%H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "QR:·%u·(%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "התקבלה בקשה עבור קובץ אחר"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "הורדות (%i)"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "העלאות בהמתנה: %s"
 
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "על התור"
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "תקדימון לקובץ"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "ההעלאות"
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "שגיאה: הרצת נגן הסרטים נכשלה! הפקודה: '%s'"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "לא"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "שגיאה: יצירת קובץ-החלקים נכשלה)"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "לא"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "מנסה לטעון גיבוי של קובץ ה met מ %s"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "כן"
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr ""
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "מוריד מהרשת..."
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr ""
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "אזהרה: לא ניתן לפתוח את קובץ הסקין '%s' לקריאה"
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "מנסה לשחזר את המידע של הקובץ"
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "משחזר קובץ ללא שם - אנסה לשחזר את זה בתור RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "כל המידע הנגיש על הקבצים שוחזר :-) - מנסה להשתמש בזה..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "לא ניתן לשחזר את המידע אודות הקובץ :("
-
-#: src/PartFile.cpp:660
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Failed to open %s (%s)"
-msgstr "פתיחת הקובץ %s·(%s נכשלה"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "שגיאה במהלך השמירה של קובץ-החלקים %s (%s·==>·%s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "לא ניתן לחלץ את האורך של '%s' - משתמש בקובץ %s."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "משום מה האורך של '%s' הוא 0 - משתמש בקןבץ %s."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "שמירת part.met.seeds נכשלה עבור הקובץ %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr ""
 
-#: src/PartFile.cpp:1024
+#: src/HTTPDownload.cpp:275
 #, fuzzy, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "נשמרו %i מקורות הזרעה עהור קובץ-החלקים: %s (%s)"
-msgstr[1] "נשמרו %i מקורות הזרעה עהור קובץ-החלקים: %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "לקובץ החלקים %s (%s) אין קובץ הזרעה."
-
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "לקובץ-החלקים %s(%s) יש קובץ הזרעה לא חוקי."
+msgid "Downloaded %d bytes"
+msgstr "מוריד %s"
 
-#: src/PartFile.cpp:1118
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "שגיאה בקריאת קובץ ההזרעה של קובץ החלקים (%s·-·%s):·%s"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr ""
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "נמצא חלק שהושלם (%i) בתוך %s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "הסתיים הגיבוב מחדש של %s"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "הסתיימה ההורדה של: %s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "מוחק את הקובץ: %s"
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "התחבר מחדש לשרת"
 
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
 
-#: src/PartFile.cpp:2389
+#: src/IP2Country.cpp:100
 #, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "אזהרה. אין מספיק שטח דיסק פנוי! משהה את הקובץ %s"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr ""
 
-#: src/PartFile.cpp:3171
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "החלק %i שירד מתוך הקובץ %s פגום"
+msgid "Failed to remove %s file, aborting update."
+msgstr ""
 
-#: src/PartFile.cpp:3214
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: תוקן החלק הפגום %i עבור %s -< בתים שנמשרו: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
+#, c-format
+msgid "Successfully updated %s"
 msgstr ""
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "נעצר"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
 
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr ""
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "פתיחת הקובץ %s·(%s נכשלה"
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr ""
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "CIP2Country::CIP2Country(): לא הצליח לטעון מידע עבור המדינה מ "
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr ""
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "טוען את מסנני ה IP 'ipfilter.dat' ואת 'ipfilter_static.dat'."
 
-#: src/KnownFileList.cpp:112
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "שגיאת קריאה/כתיבה תוך כדי הקובץ known.met: %s"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "טעינת קובץ מסננים עם סיומת '.dat' '%s', נכשלה. פורמט הקובץ לא ידוע."
 
-#: src/KnownFileList.cpp:158
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "שגיאה במהלך שמירת הקובץ known.met: %s"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "טעינת קובץ מסננים עם סיומת '.dat' '%s', נכשלה. לא ניתן לפתוח את הקובץ."
 
-#: src/SharedFileList.cpp:352
+#: src/IPFilter.cpp:329
 #, fuzzy, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "נמצא %i קובץ משותף מוכר"
-msgstr[1] "נמצא %i קובץ משותף מוכר"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "טוען %u טווח - IP מ '%s'."
+msgstr[1] "טוען %u טווח - IP מ '%s'."
 
-#: src/SharedFileList.cpp:358
+#: src/IPFilter.cpp:331
 #, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "נמצא %i שידוע שהם משותפים, %i לא ידועים"
-msgstr[1] "נמצא %i שידוע שהם משותפים, %i לא ידועים"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "נזרקה השורה המעוותת %u"
+msgstr[1] "נזרקה השורה המעוותת %u"
 
-#: src/SharedFileList.cpp:367
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "ERROR: Attempted to share %s"
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "הערות על הקובץ"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "דרוג"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "הערה"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "אין הערות"
-
-#: src/CommentDialogLst.cpp:104
-#, fuzzy, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u הערה"
-msgstr[1] "%u הערה"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr "החיבור לשרתים המבלבלים שברשימה כשל, מבצע מעבר נוסף ללא השרתים המבלבלים"
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "ההתחברות לכל השרתים הרשומים כשלה, מבצע מעבר נוסף."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
 msgstr ""
 
-#: src/ServerConnect.cpp:187
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "מחובר ל %s·(%s:%i)"
+msgid "Nodes (%u)"
+msgstr "צמתים (%u)"
 
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "חיבור הוקם ל: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "כתובת IP לא חוקית על מנת לבצע אתחול"
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr "כשל חמור בעת הניסיון להתחבר. יתכן והתקשורת למרשתת לא מקוונת."
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "מבואה לא תקפה על מנת לבצע אתחול"
 
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "אבד התקשורת ל %s·(%s:%i)"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "אנא מלא את כל השדות כפי שנדרש"
 
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "נראה כאלו ש %s·(%s:%i) מת."
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "האם את בטוח שברצונח להוריד קובץ nodes.dat חדש?\n"
 
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "נראה כאלו ש %s·(%s:%i) מלא."
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr "ביצוע פעולה זו תסיר את כל הצמתים הקחחצחם ןתאתחל את חיבור הקאדימליה."
 
-#: src/ServerConnect.cpp:381
-#, fuzzy, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "התחברות אוטומטית לשרת ינוסה שוב תוך %d שניות"
-msgstr[1] "התחברות אוטומטית לשרת ינוסה שוב תוך %d שניות"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "להמשיך?"
 
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "החיבור אבד."
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "קאדימליה: מילת חיפוש קצרה מדי"
 
-#: src/ServerConnect.cpp:408
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "ההתחברות ל %s·(%s:%i) כשלה"
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
+msgid "Keyword for search: %s"
 msgstr ""
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "פג הזמן עבור ניסיון ההתחברות ל %s·(%s:%i)"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr ""
 
-#: src/DownloadQueue.cpp:154
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "לא נמצא קובץ-חלקים."
-
-#: src/DownloadQueue.cpp:171
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, fuzzy, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "נמצא %u קובץ-חלקים"
-msgstr[1] "נמצא %u קובץ-חלקים"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "קרא %u יוצרי קשר ל קאד"
+msgstr[1] "קרא %u יוצרי קשר ל קאד"
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/DownloadQueue.cpp:339
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Downloading %s"
-msgstr "מוריד %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "אתה כבר מנסה להוריד את הקובץ '%s'"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/DownloadQueue.cpp:359
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "You already have the file '%s'"
-msgstr "כבר יש לך את הקובץ '%s'"
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "אתה כבר מנסה להוריד את הקובץ %s"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "שם הקובץ"
 
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+#: src/KnownFile.cpp:1545
+msgid "File size"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "פרוטקול לא ידוע עבור קישור: %s"
-
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
 msgstr ""
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "הרץ <str> וצא."
-
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "פורמט IP לא חוקי. התמש ב xxx.xxx.xxx.xxx:xxxx\n"
-
-#: src/TextClient.cpp:309
-msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
 msgstr ""
-"הפקודה הזאת דורשת ארגומנט. ארגומנט חוקי יכול להיות: 'all' שם קובץ או מספר.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "מעבד על פי גיבוב: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "מעבד על פי שם קובץ: "
 
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr "פקודה זאת דורשת ארגומנט. ארגומנט חוקי: גיבוב של קובץ.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "לא מספר חוקי\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "לא גיבוב חוקי (האורך חייב להיות בדיוק 32 תווים)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "הפעולה הסתיימה בהצלחה."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "הבקשה נכשלה עם השגיאה הבאה: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "סינון IP עבור לקוחות הוא %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "מכובה"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "דלוק"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "סינון IP עבור שרתים הוא %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "רמת סינום IP נוכחית היא %d.\n"
-
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
 msgstr ""
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
 msgstr ""
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "מחובר ל %s·%s·%s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "עם מ\"ז נמוך (LowID)"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "עם מ\"ז גבוהה (HighID)"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "מתחבר עכשיו"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "לא מחובר"
-
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
 msgstr ""
-"\n"
-"הורדה:\t%s"
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"\n"
-"העלאה:\t%s"
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"\n"
-"לקוחות בתור:\t%d\n"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"\n"
-"סה\"כ מקורות:\t%d\n"
 
-#: src/TextClient.cpp:809
-#, c-format
-msgid "Number of search results: %i\n"
-msgstr "מספר תוצאות חיפוש: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "לביצוע - הראה התקדמות של חיפוש"
-
-#: src/TextClient.cpp:828
-#, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "התקבלה תשובה לא מוכרת מהשרת, קוד-פעולה = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "הראה מידעה על מצב בקיצור."
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "גירסה לא ידועה"
 
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "הראה מצב חיבורים, מהירות הורדה/האלכה נוכחיים וכו'.\n"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "אזהרה: לא ניתן לפתוח את קובץ הסקין '%s' לקריאה"
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "הראה את עץ הסטטיסטיקה המלא."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "מגבב"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"אופציונלי, מספר בתווך 0-255 יכול להשלח בתור ארגומנט\n"
-"לפקודה זו האומרת כמה רשומות של תתי העצים של גירסת הלקוח יראו.\n"
-"העברה של 0 או דילוג תתפרש בתור \"ללא הגבלה\".\n"
-"\n"
-"דוגמא: 'statistics·5' יראה רק את חמשת הגרסאות הראשונים עבור כל סוג לקוח.\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "מסיים"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "סיים"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "הושהה"
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "טוען מחדש את האובייקט הנתון."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "שגוי"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "טוען מחדש את רשימת הקבצים המשותפים."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "ממתין"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "טוען מחדש את טבלת סינון ה IP מהקובץ."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "אתה חייב לציין סיסמא שאינה רקה."
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "התחבר לרשת."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "סיסמא לא תקינה היא איננה מגובבת בפורמט MD5"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"פעולה זו תחבר אותך לכל הרשתות שמאופשרות בהעדפות.\n"
-"את יכול גם, בצורה אופציונלית, לציין שרת בתצורה של IP:מבואה כדי להתחבר אל\n"
-"שרת זה בלבד. ה IP חייב להיות ארבעה מספרים מופרדים בנקודות בפורמט IPv4, \n"
-"או שם שרת שניתן להמירו ל IP."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "החיבור נכשל"
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "התחבר רק לקאד."
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "ExternalConn: (התחברות חיצונית) תשובה לא טובה מהשרת. החיבור נסגר. ."
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "התנתק מהרשת."
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "הצלחה!נפתח חיבור ל aMule."
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "פעולה זו תנתק את כל הרשתות המחוברות.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "הצלחה!נפתח חיבור ."
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "התנתק רק מ קאד."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "חיבור חיצוני נסגר."
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "הגדר ערך מועדף."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "הגדר העדפת מסנן IP."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "הדלק סינון IP הן עבור הלקוחות והן עבור השרתים."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "כבה סינון IP הן עבור הלקוחות והן עבור השרתים."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "אפשר/נטרל סינון IP עבור לקוחות."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "הדלק סינון IP עבור לקוחות."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "כבה סינון IP עבור לקוחות."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "אפשר/נטרל סינון IP עבור שרתים."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "הדלק סינון IP עבור שרתים."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "כבה סינון IP עבור שרתים."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "בחר את אמת סינון הIP."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
 msgstr ""
-"רמות סינון תקפים המ בתווך של 0-255, ברירת המחדשל (ערך התחלתי)\n"
-"הוא 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "קבע תיחום רוחב פס."
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "הערך שמועבר לפקודות אלו חייב להיות ביחידות של ק\"ב/ש.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "קבע מגבלת רוחב פס בהעלאה."
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "קבע מגבלת רוחב פס בהורדה."
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "שלוף ותציג ערך של העדפה."
-
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "שלוף העדפה עבור סינון IP."
-
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "שלוף העדפה עבור סינון IP עבור השרתים והלקוחות."
-
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "שלוף העדפה עבור סינון IP רק עבור הלקוחות."
-
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "שלוף העדפה עבור סינון IP רק עבור השרתים."
-
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "שלוף רמת סינון ה IP."
-
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "שלוף הגבלת רוחב הפס."
-
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "מבצע חיפוש."
-
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
 msgstr ""
-"סוג חיפוש חייב להיות מצוין:\n"
-"    GLOBAL (גלובלי)\n"
-"    LOCAL (מקומי)\n"
-"    KAD (קאד)\n"
-"דוגמה: 'search·kad·file' יבצע חיפוש באמצעות קאד עבור הקובץ \"file\".\n"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "הרץ חיפוש גלובלי."
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "הרץ חיפוש מקומי"
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "סגור"
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "הרץ חיפוש בקאדימליה"
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "גזור"
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "הראה את התוצאות של החיפוש האחרון."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "העתק"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "מחזירת את התוצאות של החיפוש האחרון.\n"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "הדבק"
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "מראה את התקדמות החיפוש."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "נקה"
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "מראה התקדמות של חיפוש.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "בחר הכל"
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "התחל בהורדת קובץ"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "ק\"ב/ש"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
 msgstr ""
-"מספר הקובץ מהחיפוש האחרון חייב להמסר.\n"
-"דוגמה: 'download·12'· יתחיל להוריד את קובץ מספר 12 מהחיפוש האחרון.\n"
-
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "השהה הורדה."
-
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "המשך הורדה."
-
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "בטל הורדה."
-
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "קבע את העדיפות של ההורדה."
-
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "קבע את עדיפות ההורדה ל נמוך, נורמלי, גבוה או אוטומטי.\n"
-
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "קבע את העדיפות ל 'נמוך'."
-
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "קבע את העדיפות ל 'נורמלי'."
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "קבע את העדיפות ל 'גבוה'."
-
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "קבע את העדיפות ל 'אוטומטי'."
-
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "הראה תורים/רשימות."
-
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr "הראה תורים של הרודות/העלאות, רשימת שרתים או רשימת קבצים משותפים.\n"
-
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "הראה צור העלאות"
-
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "הראה את תור ההורדות."
-
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "הראה יומן."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr ""
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "הראה את רשימת השרתים."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr ""
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "אפס את הימון."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr ""
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
+msgid "UL: %u"
 msgstr ""
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
 msgstr ""
-"זאת פקודה מיושנת ועלולה להתבטל בעתיד.\n"
-"השתמש ב '%s' במקומה.\n"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
+msgid "DL: %u"
 msgstr ""
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
+msgid "Download speed: %.1f"
 msgstr ""
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "מ\"ז החדש ללקוח הוא %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "אזהרה: קיבלת מ\"ז נמוך (Low-ID)!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\t רוב הסיכויים שזה מאחר ואתה נמצא מאחור חומתאש או נתב."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tעבור מידע נוסף פנה ל http://wiki.amule.org"
-
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "התקבל מידע על שרת, שהמידע לא ידוע! - קצר מדי"
+msgid "Upload speed: %.1f"
+msgstr ""
 
-#: src/ServerSocket.cpp:539
-#, fuzzy, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "התקבל %d שרת חדש"
-msgstr[1] "התקבל %d שרת חדש"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr ""
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "שמירת רשימת השרתים הסתיימה."
+#: src/MuleTrayIcon.cpp:330
+#, c-format
+msgid "Nickname: %s"
+msgstr ""
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "השרת דחה את הפקודה האחרונה."
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr ""
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "חבילה מדומה התקבלב משרת: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr ""
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "שגיה לא מטופלת בעת עיבוד החבילה שתקלה מהשרת: %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "לא מחובר"
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "לא יכול ליצור תהליכון לפענוח ה DNS כדי להתחבר ל %s"
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr ""
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "כתובת ה IP ak var, %s·(%s) מסוננת,  לא מתחבר."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr ""
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "משתמש בערפול פרוטקול."
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "מנותק"
 
-#: src/ServerSocket.cpp:748
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "מחבר ל %s·(%s·-·%s:%i)·%s"
+msgid "IP: %s"
+msgstr ""
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "לא יכול לפענח כתובת השרת של %s באמצעות DNS: לא יכול להתחבר!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): לא הצליח לטעון מידע עבור המדינה מ "
-
-#: src/IP2Country.cpp:105
-#, fuzzy, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "טוען %d תמונת דגל."
-msgstr[1] "טוען %d תמונת דגל."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr "האם אתה בטוח שברצונך לבטל ולמחוק את כל הקבצים שבקטגוריה זו?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "זקוק לאישור."
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "כל האחרים"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "חלקי"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "פןעל"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "ווידאו"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "אודיו"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "ארכיב"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "אימג' של סי.די."
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "תמונות"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "טקסט"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "בחר מסנן תצוגה"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "הוסף קטיגוריה"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "ערוך קטיגוריה"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "הסר קטיגוריה"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "שם הקובץ"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
+msgid "TCP port: %d"
 msgstr ""
 
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
+#: src/MuleTrayIcon.cpp:385
+#, c-format
+msgid "UDP port: %d"
 msgstr ""
 
-#: src/KnownFile.cpp:1363
-msgid "Requested"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
 msgstr ""
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
 msgstr ""
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Importing %s: %s"
-msgstr "מייבא %s:·%s"
-
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "קורא את הספרייה הזמנית"
-
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "מחלץ מידע בסיסי מקובץ מידע ההורדות"
-
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "יוצר קובץ יעד"
-
-#: src/PartFileConvert.cpp:331
-#, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "טוען מידע מקובץ הורדות ישן (%u·מ·%u)"
+msgid "Uptime: %s"
+msgstr "זמן פעולה: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "שומר את בלוק המידע לתוך קובץ הורדות יחיד (%u·מ·%u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "מחלץ את מידע הקובץ-המורד מהמקור"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "מוסיף הורדה ושומר קובץ-חלקים"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "ייבא קבצי-חלקים"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "מצב"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "גיבוב-קובץ"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "ממתין..."
+msgid "Shared files: %d"
+msgstr ""
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (דיסק: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr "נא לבחור תקייה לחפש קבצים זמניים שהורדו! (תתי תיקיות יכללו בחיפוש)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "האם אתה רוצה שקבצי המקורות של הורדות מוצלחות שיובאו, ימחקו?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "הסר מקור?"
-
-#: src/OtherFunctions.cpp:112
-#, fuzzy
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "בית"
-msgstr[1] "בית"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "ק\"ב"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "מ\"ב"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "ג\"ב"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "ט\"ב"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "קילו"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "מגה"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "גיגה"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "טרה"
-
-#: src/OtherFunctions.cpp:143
-#, fuzzy
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "בייט/שניה"
-msgstr[1] "בייט/שניה"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "מ\"ב/ש"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "שניות"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "דקות"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "שעות"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "ימים"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "סרטים"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "ארכיבים"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "טקסט"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "תוכניות"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "כל דבר"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "לא מדורג"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "לא תקף / פגום / מזויף"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "דל"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "ממוצע"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "טוב"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "מצויין"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "הכול"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "כל האחרים"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "טוען את מסנני ה IP 'ipfilter.dat' ואת 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr ""
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "טעינת קובץ מסננים עם סיומת '.dat' '%s', נכשלה. פורמט הקובץ לא ידוע."
+msgid "Total DL: %s"
+msgstr ""
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "טעינת קובץ מסננים עם סיומת '.dat' '%s', נכשלה. לא ניתן לפתוח את הקובץ."
+msgid "Total UL: %s"
+msgstr ""
 
-#: src/IPFilter.cpp:331
-#, fuzzy, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "טוען %u טווח - IP מ '%s'."
-msgstr[1] "טוען %u טווח - IP מ '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr ""
 
-#: src/IPFilter.cpp:333
-#, fuzzy, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "נזרקה השורה המעוותת %u"
-msgstr[1] "נזרקה השורה המעוותת %u"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr ""
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "כישורים פעילים (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr ""
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "פרטי הקובץ"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr ""
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% הושלם"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "יציאה"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "שלח"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr ""
 "ארועים מופיעים כאן. בשביל רשימת האירועים המלאה, הסתכלו ביומן שבלשונית השרתים."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "טוען ..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "מספר המשתמשים בשרת שאיליו התחברת ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "משתמשים: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr "משתמשים שמחוברים לשרת הנוכחי ומספר מעורך של כלל המשתמשים."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "מעלה:0.0 | מוריד 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4501,7 +2622,7 @@
 "הממוצע הנוכחי של קצב העלאה וההורדה. אם זה מאופשר, המספר שבסוגריים מסמנים את "
 "התקורה של התקשורת של הלקוח."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4512,2507 +2633,4818 @@
 "צהוב מסמל שיש לך מ\"ז נמוך (LowID) (חסום חומתאש) וחץ ירוק מסמן שיש לך מ\"ז "
 "גבוהה (HighID) (תצורת החיבור האופטימלית)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "לא מחובר ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "שרת מחובר נוכחי."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "חיפוש"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "שם:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "סוג/טיפוס"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "מקומי"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "גלובלי"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "גיבוב-קובץ"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "פרמטרים מורחבים"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "מסנן"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "סוג קובץ"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "כל דבר"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "ארכיבים"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "אודיו"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "אימג' של סי.די."
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "תמונות"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "תוכניות"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "טקסט"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "סרטים"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "סיומת"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "גודל מנימלי"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "בתים"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "ק\"ב"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "מ\"ב"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "ג\"ב"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "גודל מקסימלי"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "זמינות"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "מסנן:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "תוצאות מסנן"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "הפוך תוצאות"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "החבא קבצים מוכרים"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "התחל"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "עוד"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "עצור"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "הורדה"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "אפס שדות"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "תוצאות"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "מנקה הורדות שהושלמו"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "מראה תור האלעה / למעלה "
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "לקוחות בתור :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "שלח"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "שולח את ההודעה המצויינת."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "סגור"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "מקורות שנמצאו :"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "סגור את הצ'אט הנוכחי."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "כללי"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "שם מלא :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "ל\"ת"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "קובץ-met :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "גיבוב :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "גודל קובץ :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "מצב קובץ-חלקים :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "נראה שלם בפעם האחרונה :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "מעביר"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "מקורות שנמצאו :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "מעביר מקורות :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "ספירת קובץ-חלקים :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "זמין :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "קצב מידע :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "זמן הורדה פעיל: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "הועבר :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "כמות שהושלמה :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "תפעול מתוחכם של פגמים"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "אבד עקב פגם :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "רווח באמצעות כיווץ :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "חבילות שנשמרו ע\"י I.C.H.·:"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "שמות קבצים"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "השתלטות"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "ניקוי"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "ישם"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "בסדר"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "תגיב/תדרג קובץ (הטקבט יהיה זמין לכל המשתמשים)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"עבור סרט אתה יכול לציין את האורך, העלילה, השפה ...\n"
-"ואם זה זיוף, אתה יכול לספר את זה לשאר משתמשי אימיול."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "איכות הקובץ"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "לא מדורג"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "לא תקף / פגום / מזויף"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "דל"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "ממוצע"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "טוב"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "מצויין"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "תבחר את דרוג הקובץ או תתריע למשתמשים אם הקובץ אינו תקף ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "רענן"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "מוריד, אנא המתן ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "גודל לא ידוע"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "נדרש מידע"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "כתובת IP :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "מבואה :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "מידע נוסף"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "שם משתמש :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "גיבוב משתשמ :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "טען מחדש את הקבצים המשותפים שלך"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "הרצה נוכחית"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "סה\"כ"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "בֻקַש :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "העלאות פעילים :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "הוסף"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "מהירות הורדה"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "נוכחיים"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "ממוצע רץ"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "ממוצע ההרצה הנוכחית"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "מהירות-העלאה"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "חיבורים"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "הורדות פעילות"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "חיבורים פעילים (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "העלאות פעילים"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "עץ סטטיסטיקה"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "שם משתמש:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "גיבוב קובץ:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "תוכנת לקוח:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "גרסת לקוח:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "כתובת IP:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "מ\"ז משתמש:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "כתובת IP של השרת:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "שם שרת:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "העברות ללקוח"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "בקשה נוכחית:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "קצב העלאה ממוצע:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "קצב הורדה ממוצע:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "הועלה (הרצה נוכחית):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "ירד (הרצה נוכחית):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "הועלה (סה\"כ):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "ירד (סה\"כ):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "ציונים"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr ""
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "נכנס לתור"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "דפדף"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1796
-msgid "This is the standard eD2k port and cannot be disabled."
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
+#: src/muuli_wdr.cpp:1611
+msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
-
-#: src/muuli_wdr.cpp:1886
-msgid "Kademlia"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
+#: src/muuli_wdr.cpp:1676
+msgid "Kademlia"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr ""
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "ההעלאות"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2214
-msgid "Number of Client Versions shown (0=unlimited)"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
+#: src/muuli_wdr.cpp:2000
+msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
+#: src/muuli_wdr.cpp:2190
+msgid ""
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr ""
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "סיסמא"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
-msgstr ""
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "בסדר"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr ""
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
-msgstr ""
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
+msgstr "- מבואת UDP שונתה \n"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr ""
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr ""
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "אתחל מחדש"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr ""
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "אי.פי.:מבואה"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3339
-msgid "Enable Proxy"
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3340
-msgid "Enable/disable proxy support"
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3345
-msgid "Proxy type:"
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
+#: src/muuli_wdr.cpp:3050
+msgid "Enable Proxy"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3051
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3056
+msgid "Proxy type:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
+#: src/muuli_wdr.cpp:3101
+msgid "Connect to:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
+#: src/muuli_wdr.cpp:3115
+msgid "Login to remote amule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
+#: src/muuli_wdr.cpp:3120
+msgid "User name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
+#: src/muuli_wdr.cpp:3137
+msgid "Remember those settings"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
+#: src/muuli_wdr.cpp:3166
+msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
+#: src/muuli_wdr.cpp:3169
+msgid "Message Categories:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr ""
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "ממתין..."
 
-#: src/muuli_wdr.cpp:3424
-msgid "Connect to:"
+#: src/muuli_wdr.cpp:3222
+msgid "Add imports"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3438
-msgid "Login to remote amule"
+#: src/muuli_wdr.cpp:3226
+msgid "Retry selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3443
-msgid "User name"
+#: src/muuli_wdr.cpp:3229
+msgid "Remove selected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3460
-msgid "Remember those settings"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3492
-msgid "Enable Verbose Debug-Logging."
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3497
-msgid "Message Categories:"
-msgstr ""
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "העלאות פעילים :"
 
-#: src/muuli_wdr.cpp:3550
-msgid "Add imports"
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3554
-msgid "Retry selected"
-msgstr ""
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "קבצים משותפים"
 
-#: src/muuli_wdr.cpp:3557
-msgid "Remove selected"
-msgstr ""
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "בחר מסנן תצוגה"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "העלאות פעילים"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "לקוחות"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "טען מחדש את הקבצים המשותפים שלך"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "שלח"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "שולח את ההודעה המצויינת."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "סגור את הצ'אט הנוכחי."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "חלון הרשתות"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "קבצים משותפים"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "חלון החיפושים"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "נוטרל [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "חלון העברות הקבצים"
+#: src/OtherFunctions.cpp:106
+#, fuzzy
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "בית"
+msgstr[1] "בית"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "חלון הקבצים המשותפים"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "ק\"ב"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "חלון ההודעות"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "ט\"ב"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "חלון גרפי הסטטיסטיקה"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "קילו"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "חלון הגדרת ההעדפות"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "מגה"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr ""
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "גיגה"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr ""
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "טרה"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
+#: src/OtherFunctions.cpp:137
+#, fuzzy
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "בייט/שניה"
+msgstr[1] "בייט/שניה"
+
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "מ\"ב/ש"
+
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "שניות"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "דקות"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "שעות"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "ימים"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "הכול"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "כל האחרים"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "חלקי"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "נעצר"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "ווידאו"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "ארכיב"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "טקסט"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "פןעל"
+
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
 msgstr ""
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/CatDialog.cpp:159
+#: src/PartFileConvert.cpp:200
+#, c-format
+msgid "Importing %s: %s"
+msgstr "מייבא %s:·%s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "קורא את הספרייה הזמנית"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "מחלץ מידע בסיסי מקובץ מידע ההורדות"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "יוצר קובץ יעד"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "טוען מידע מקובץ הורדות ישן (%u·מ·%u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "שומר את בלוק המידע לתוך קובץ הורדות יחיד (%u·מ·%u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "מחלץ את מידע הקובץ-המורד מהמקור"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "מוסיף הורדה ושומר קובץ-חלקים"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "ייבא קבצי-חלקים"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "מצב"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "גיבוב-קובץ"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (דיסק: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
+msgstr "נא לבחור תקייה לחפש קבצים זמניים שהורדו! (תתי תיקיות יכללו בחיפוש)"
+
+#: src/PartFileConvertDlg.cpp:198
+msgid ""
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "האם אתה רוצה שקבצי המקורות של הורדות מוצלחות שיובאו, ימחקו?"
+
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "הסר מקור?"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "שגיאה: יצירת קובץ-החלקים נכשלה)"
+
+#: src/PartFile.cpp:336
+#, c-format
+msgid "Trying to load backup of met-file from %s"
+msgstr "מנסה לטעון גיבוי של קובץ ה met מ %s"
+
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:141
+#: src/PartFile.cpp:349
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFile.cpp:360
 #, c-format
-msgid "Unknown command '%s'.\n"
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr "שגיאה: %s (%s) פגום (מספר-תווית שגוי) לא יכול לטעון קובץ."
+
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "מנסה לשחזר את המידע של הקובץ"
+
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "משחזר קובץ ללא שם - אנסה לשחזר את זה בתור RecoveredFile.dat"
+
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "כל המידע הנגיש על הקבצים שוחזר :-) - מנסה להשתמש בזה..."
+
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "לא ניתן לשחזר את המידע אודות הקובץ :("
+
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "פתיחת הקובץ %s·(%s נכשלה"
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "שגיאה במהלך השמירה של קובץ-החלקים %s (%s·==>·%s)"
+
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "שגיאה במהלך השמירה של קובץ-החלקים %s (%s·==>·%s)"
+
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "לא ניתן לחלץ את האורך של '%s' - משתמש בקובץ %s."
+
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "משום מה האורך של '%s' הוא 0 - משתמש בקןבץ %s."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "שמירת part.met.seeds נכשלה עבור הקובץ %s"
+
+#: src/PartFile.cpp:1020
+#, fuzzy, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "נשמרו %i מקורות הזרעה עהור קובץ-החלקים: %s (%s)"
+msgstr[1] "נשמרו %i מקורות הזרעה עהור קובץ-החלקים: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "לקובץ החלקים %s (%s) אין קובץ הזרעה."
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "לקובץ-החלקים %s(%s) יש קובץ הזרעה לא חוקי."
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "שגיאה בקריאת קובץ ההזרעה של קובץ החלקים (%s·-·%s):·%s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "נמצא חלק שהושלם (%i) בתוך %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "הסתיים הגיבוב מחדש של %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "הסתיימה ההורדה של: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "מוחק את הקובץ: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
+#: src/PartFile.cpp:2292
+#, c-format
+msgid ""
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
 #, c-format
 msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "אזהרה. אין מספיק שטח דיסק פנוי! משהה את הקובץ %s"
+
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "החלק %i שירד מתוך הקובץ %s פגום"
+
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: תוקן החלק הפגום %i עבור %s -< בתים שנמשרו: %s"
+
+#: src/PartFile.cpp:3695
+msgid "Allocating"
 msgstr ""
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
 msgstr ""
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
 msgstr ""
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:4003
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "ברירת מחדל של המערכת"
+
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "אלבני"
+
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "ערבית"
+
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "אסטונית"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "בסקית"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "בולגרית"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "קטלונית"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "סינית (מופשטת)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "סינית (מסורתית)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "קרואטית"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "צ'כית"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "דנית"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "הולנדית"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "אנגלית (בריטית)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "אסטונית"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "פינית"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "צרפתית"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "גאלית"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "גרמנית"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "יוונית"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
 msgstr ""
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "הונגרית"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "איטלקית"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "איטלקית (שוויצרית)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "יפנית"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "קוראינית"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "ליטאית"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "נורבגית (Nynorsk)"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "פונלית"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "פורטגזית"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "פורטגזית (ברזילאית)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "רוסית"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "סלובקית"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "ספרדית"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "שוודית"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "טורקית"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
 msgstr ""
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
+#: src/Preferences.cpp:728
+msgid "Change Language"
 msgstr ""
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
 msgstr ""
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "לא זמין"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
 msgstr ""
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/ExternalConnector.cpp:297
-#, c-format
-msgid "Type '%s' to get more help.\n"
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
+"מבואת ה TCP אינה יכולה להיות גבוהה יותר מ 65532 מאחר שמבואת ה UDP של השרת "
+"היא מבואת ה TCP +3"
 
-#: src/ExternalConnector.cpp:362
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr ""
+msgid "Default port will be used (%d)"
+msgstr "נשתמש במבואה שבברירת מחדך (%d)"
 
-#: src/ExternalConnector.cpp:364
+#: src/Preferences.cpp:1790
 #, c-format
-msgid "This is %s %s\n"
+msgid "Dropping non-existing shared directory: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:395
-msgid ""
-"\n"
-"Creating client...\n"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "חיבור"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "מלונים"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "שרתים"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "קבצים"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "אבטחה"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
 msgstr ""
 
-#: src/ExternalConnector.cpp:418
-#, c-format
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "פרוקסי"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "שליטה מרחוק"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "חתימה מקוונת"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "ארועים"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "ניפוי שגיאות"
+
+#: src/PrefsUnifiedDlg.cpp:249
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
 
-#: src/ExternalConnector.cpp:424
+#: src/PrefsUnifiedDlg.cpp:289
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
 "\n"
-"Exiting...\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
 msgstr ""
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
 msgstr ""
+"אימיול חייב להיות מאותחל מחדש על מנת לאפשר את השינויים הללו:\n"
+"\n"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- מבואת TCP שונתה \n"
+
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- מבואת UDP שונתה \n"
+
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "חיבור חיצוני נסגר."
+
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "גישה חיצונית חדשה התקבלה"
+
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "חיבור חיצוני נסגר."
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
 msgstr ""
+"אתה אפשרת חיבוריים חיצוניים אבל לא הזנת סיסמא תקיפה.\n"
+"חיבורים חיצוניים לא יאופשרו אלא אם כן תוזן סיסמא תקיפה."
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- השפה שונתה.\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- הפסרייה הזמנית שונתה.\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+#, fuzzy
+msgid "- ED2K network enabled.\n"
+msgstr "כל הרשתות מנוטרלות."
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
 msgstr ""
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
 msgstr ""
+"קאד לא יתחיל אם מבואת ה UDB מנוטרלת.\n"
+"תאפשר את מבואת ה UDP או שתנטרל את קאד."
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
+"\n"
+"אתה חייב לאתחל את אימיול עכשיו!\n"
+"אם לא תאתחל את אימיול עכשיו אל תתלונן אם משהו רע יקרה.\n"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
 msgstr ""
+"רשימת השרתים המתעדכנת אוטומטית, ריקה.\n"
+"בבקשה תכניס לפחות כתובת URL אחת שתצביע לקובץ server.met תקף.\n"
+"לחץ על הכפתור \"רשימה\" שליד הצ'קבוקס הזה כדי להכניס בתובת URL."
+
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "קבצים זמניים"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "קבצים נכנסים"
 
-#: src/ClientCreditsList.cpp:168
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "חתימה מקוונת"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Choose a folder for %s"
+msgstr "בחר תיקייה עבור %s"
+
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "חפש נגן סרטים"
 
-#: src/ClientCreditsList.cpp:171
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "בחר דפדפן"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Executable%s"
+msgstr "קובץ הרצה %s"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
 msgstr ""
 
-#: src/amuled.cpp:594
+#: src/PrefsUnifiedDlg.cpp:1055
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
 msgstr ""
+"הוסף כאן כתובות URL שמהם ניתן להוריד קבצי server.met.\n"
+"רק כתובת אחת בכל שורה."
+
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, fuzzy, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "השהיית עדון: %d שניות"
+msgstr[1] "השהיית עדון: %d שניות"
 
-#: src/amuled.cpp:750
+#: src/PrefsUnifiedDlg.cpp:1121
+#, fuzzy, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "זמן עבור גרף הממוצע: %d דקות"
+msgstr[1] "זמן עבור גרף הממוצע: %d דקות"
+
+#: src/PrefsUnifiedDlg.cpp:1127
 #, c-format
-msgid "ERROR: %s"
-msgstr ""
+msgid "Connections Graph Scale: %d"
+msgstr "סקאלאת גרף החיבורים: %d"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr ""
+#: src/PrefsUnifiedDlg.cpp:1139
+#, fuzzy, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "גודל זיכרון זמני לקובץ: %d בתים"
+msgstr[1] "גודל זיכרון זמני לקובץ: %d בתים"
 
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr ""
+#: src/PrefsUnifiedDlg.cpp:1145
+#, fuzzy, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "גודל תור ההאלעות: %d לקוחות"
+msgstr[1] "גודל תור ההאלעות: %d לקוחות"
+
+#: src/PrefsUnifiedDlg.cpp:1152
+#, fuzzy, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "רענון חיבור לשרת כל: %d דקות"
+msgstr[1] "רענון חיבור לשרת כל: %d דקות"
+
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "רענון חיבור לשרת: מנוטרל"
 
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "נוטרל [%s]"
+
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "בצע פקודה בעת ארוע '%s'"
+
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "אפשר הרצת פקודות על הליבה"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "פקודת ליבה:"
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "אפשר ביצוע פקודות על ממשק גרפי"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "פקודת ממשק גרפי:"
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "המשתנים הבאים יוחלפו:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "ראשי"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "לא יכול להתבצע חיפוש באמצעות קאד אם קאד לא פועל"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "שגיאה לא צפויה בעת ניסיון ביצוע חיפוש ב קאד: "
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "מ\"ז של קובץ"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "קובץ"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "הורדה בקטיגוריה"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "הוסף כתובות URL אופתינליות לקובץ זה"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "סמן בתור קובץ מוכר"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "ביטול"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr "החיבור לשרתים המבלבלים שברשימה כשל, מבצע מעבר נוסף ללא השרתים המבלבלים"
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "ההתחברות לכל השרתים הרשומים כשלה, מבצע מעבר נוסף."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:699
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "QR: %u"
-msgstr ""
+msgid "Connected to %s (%s:%i)"
+msgstr "מחובר ל %s·(%s:%i)"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr ""
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "חיבור הוקם ל: %s"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr ""
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr "כשל חמור בעת הניסיון להתחבר. יתכן והתקשורת למרשתת לא מקוונת."
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr ""
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "אבד התקשורת ל %s·(%s:%i)"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr ""
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "נראה כאלו ש %s·(%s:%i) מת."
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr ""
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr "נראה כאלו ש %s·(%s:%i) מלא."
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr ""
+#: src/ServerConnect.cpp:392
+#, fuzzy, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "התחברות אוטומטית לשרת ינוסה שוב תוך %d שניות"
+msgstr[1] "התחברות אוטומטית לשרת ינוסה שוב תוך %d שניות"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr ""
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "החיבור אבד."
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr ""
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "ההתחברות ל %s·(%s:%i) כשלה"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr ""
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "פג הזמן עבור ניסיון ההתחברות ל %s·(%s:%i)"
 
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
+#: src/ServerList.cpp:88
+#, c-format
+msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
+#: src/ServerList.cpp:93
+msgid "Server.met file not found!"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
+#: src/ServerList.cpp:101
+#, c-format
+msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
+#: src/ServerList.cpp:107
+msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
+#: src/ServerList.cpp:118
+#, c-format
+msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
+#: src/ServerList.cpp:173
+#, c-format
+msgid "%i server in server.met found"
+msgid_plural "%i servers in server.met found"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ServerList.cpp:175
+#, c-format
+msgid "%d server added"
+msgid_plural "%d servers added"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "שגיאת קריאה/כתיבה תוך כדי הקובץ known.met: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
-msgid "%.1f kB/s"
+msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
+#: src/ServerList.cpp:213
+#, c-format
+msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
+#: src/ServerList.cpp:232
+#, c-format
+msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
+#: src/ServerList.cpp:250
+#, c-format
+msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/ServerList.cpp:345
+msgid ""
+"You are connected to the server you are trying to delete. please disconnect "
+"first."
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:215
+#: src/ServerList.cpp:517
 #, c-format
-msgid "%u (QR: %u)"
-msgstr ""
+msgid "Failed to open '%s'"
+msgstr "נכשל בפתיחת '%s'"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/ServerList.cpp:685
+msgid "Failed to save server.met!"
 msgstr ""
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
+#: src/ServerList.cpp:832
+msgid "Invalid URL"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
+msgstr "הסתיימה ההורדה של: %s"
+
+#: src/ServerList.cpp:869
+msgid ""
+"No server list address entry in 'addresses.dat' found. Please paste a valid "
+"server list address into this file in order to auto-update your server list"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
+#: src/ServerList.cpp:882
+#, c-format
+msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
+#: src/ServerList.cpp:891
+#, c-format
+msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
+#: src/ServerList.cpp:895
+msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:354
+#: src/ServerList.cpp:911
 #, c-format
-msgid "UL: %u"
+msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
+#: src/ServerList.cpp:985
+msgid ""
+"Local server is filtered by the IPFilters, reconnecting to a different "
+"server!"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:364
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "שם שרת"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "כתובת"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "מבואה"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "תיאור"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "פינג"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "משתמשים"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "קבוע"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "גירסא"
+
+#: src/ServerListCtrl.cpp:148
+msgid ""
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
+msgstr "אתה מחובר לשרת אותו אתה מנסה למחוק. בבקשה קודםתתנתק. השרת לא נמחק!"
+
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(שם לא ידוע)"
+
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "DL: %u"
-msgstr ""
+msgid "Are you sure you want to delete the static server %s"
+msgstr "האם אתה בטוח שאתה רוצה למחוק את השרת הקבוע %s"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/ServerListCtrl.cpp:347
 #, c-format
-msgid "Download speed: %.1f"
+msgid "Servers (%i)"
+msgstr "שרתים (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "שרת"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "מחובר לשרת"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "סמן שרת בתור קבוע"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "סמן שרת בתור לא קבוע"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "סמן שרתים בתור קבועים"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "סמן שרתים בתור כאלה שאינם קבועים"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "הסר שרת"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "הסר שרתים"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "הסר את כל השרתים"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "התחבר מחדש לשרת"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "האם אתה בטוח שאתה מעוניין למחוק את כל השרתים?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "האם אתה בטוח שאתה מעוניין למחוק את כל השרת המסומן?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "האם אתה בטוח שאתה מעוניין למחוק את כל השרתים המסומנים?"
+
+#: src/ServerSocket.cpp:259
 #, c-format
-msgid "Upload speed: %.1f"
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
+#: src/ServerSocket.cpp:413
 #, c-format
-msgid "Nickname: %s"
-msgstr ""
+msgid "New clientid is %u"
+msgstr "מ\"ז החדש ללקוח הוא %u"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr ""
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "אזהרה: קיבלת מ\"ז נמוך (Low-ID)!"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr ""
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\t רוב הסיכויים שזה מאחר ואתה נמצא מאחור חומתאש או נתב."
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr ""
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tעבור מידע נוסף פנה ל http://wiki.amule.org"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr ""
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "התקבל מידע על שרת, שהמידע לא ידוע! - קצר מדי"
+
+#: src/ServerSocket.cpp:535
+#, fuzzy, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "התקבל %d שרת חדש"
+msgstr[1] "התקבל %d שרת חדש"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "שמירת רשימת השרתים הסתיימה."
 
-#: src/MuleTrayIcon.cpp:416
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "השרת דחה את הפקודה האחרונה."
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
 #, c-format
-msgid "IP: %s"
-msgstr ""
+msgid "Bogus packet received from server: %s"
+msgstr "חבילה מדומה התקבלב משרת: %s"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/ServerSocket.cpp:600
 #, c-format
-msgid "TCP port: %d"
-msgstr ""
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "שגיה לא מטופלת בעת עיבוד החבילה שתקלה מהשרת: %s"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr ""
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "לא יכול ליצור תהליכון לפענוח ה DNS כדי להתחבר ל %s"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/ServerSocket.cpp:725
 #, c-format
-msgid "UDP port: %d"
-msgstr ""
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "כתובת ה IP ak var, %s·(%s) מסוננת,  לא מתחבר."
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr ""
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "משתמש בערפול פרוטקול."
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr ""
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "מחבר ל %s·(%s·-·%s:%i)·%s"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "לא יכול לפענח כתובת השרת של %s באמצעות DNS: לא יכול להתחבר!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "שרת לא התווסף: לא צויין שם שרת או כתובת אי.פי."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "שרת לא התווסף: צוינה מבואה לא תקפה."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:463
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "מ\"ז"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "סטטוס קאדימליה:"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "פועל על %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "פועל"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "סטאטוס:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "מצב חיבור:"
+
+#: src/ServerWnd.cpp:214
 #, c-format
-msgid "Shared files: %d"
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:469
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "מצב חיבור:"
+
+#: src/ServerWnd.cpp:219
 #, c-format
-msgid "Queued clients: %d"
+msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "מצב חומת אש: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:483
-#, c-format
-msgid "Total UL: %s"
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "אין חבר"
+
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "מחובר לחבר"
+
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "מחובר לחבר"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "מקורות שנמצאו :"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
+#: src/ServerWnd.cpp:254
+#, fuzzy
+msgid "Indexed notes:"
+msgstr "קובץ האינדקס לא נמצא"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "ממוצע משתמשים:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "ממוצע קבצים:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "לא פועל"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
+#: src/SharedFileList.cpp:371
+#, fuzzy, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "נמצא %i קובץ משותף מוכר"
+msgstr[1] "נמצא %i קובץ משותף מוכר"
+
+#: src/SharedFileList.cpp:377
+#, fuzzy, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "נמצא %i שידוע שהם משותפים, %i לא ידועים"
+msgstr[1] "נמצא %i שידוע שהם משותפים, %i לא ידועים"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/ChatSelector.cpp:127
+#: src/SharedFileList.cpp:410
+#, fuzzy, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "לא נמצא השרת: %s"
+
+#: src/SharedFileList.cpp:480
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgid "No shareable files found in directory: %s"
 msgstr ""
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "שם משתמש"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "מהירות הורדה"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "מהירות-העלאה"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "זמין :"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "ההעלאות"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#, fuzzy
+msgid "Download Status"
+msgstr "הורדות"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
 msgstr ""
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "שם קובץ"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "קבצים משותפים"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "בקשות"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "בקשות שהתקבלו"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "מידע שנשנלח"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "יחס שיתוף"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "חלקים שהושגו"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "מקורות שלמים"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "נתיב תיקייה"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "הוסף תגובה/דירוג"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "ערוך תגובה/דירוג"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "שנה שם"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "הוסף קבצים שבאסופה לרשימת המשלוח"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "העתק מגנט &URI ללוח"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/ServerList.cpp:84
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "אתה צריך מ\"ז גבוה (HighID) כדי לחןר קישור-מקור תקף"
+
+#: src/SharedFilesCtrl.cpp:461
 #, c-format
-msgid "Loading server.met file: %s"
+msgid "Shared Files (%i)"
+msgstr "קבצים משותפים (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[קובץ-חלקים]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "שם קובץ"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "מידע שהועלה (התחברות נוכחית(סכום כולל)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "סכום כולל של התקורה (חבילות): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "תקורת בקשות קבצים (חבילות): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "תקורת החלפת מקורות (חבילות): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "תקורת השרת (חבילות): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "תקורת קאד (חבילות): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/ServerList.cpp:89
-msgid "Server.met file not found!"
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "האלעות פעילות: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "העלאות בהמתנה: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "סכום כולל של האלעות מוצלחות: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "סכות כולל של העלאות שנשכשלו: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "זמן האלעה ממוצע: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "הורדת מידע (התחברות נוכחית (סכום כולל)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "מקורות שנמצאו: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "הורדות פעילות (נתחים): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "יחס העלאה:הורדה בהתחברות נוכחית (סכום כולל): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/ServerList.cpp:97
+#: src/Statistics.cpp:773
 #, c-format
-msgid "Failed to load server.met file '%s', unknown format encountered."
+msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/ServerList.cpp:103
-msgid "Failed to open server.met!"
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/ServerList.cpp:114
+#: src/Statistics.cpp:775
 #, c-format
-msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
+msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/ServerList.cpp:169
+#: src/Statistics.cpp:776
 #, c-format
-msgid "%i server in server.met found"
-msgid_plural "%i servers in server.met found"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Reconnects: %i"
+msgstr "התחברויות מחדש: %i"
 
-#: src/ServerList.cpp:171
+#: src/Statistics.cpp:777
 #, c-format
-msgid "%d server added"
-msgid_plural "%d servers added"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Time Since First Transfer: %s"
+msgstr "זמן מאז העברה הראשונה: %s"
 
-#: src/ServerList.cpp:192
+#: src/Statistics.cpp:778
 #, c-format
-msgid "Server not added: [%s:%d] does not specify a valid port."
-msgstr ""
+msgid "Connected To Server Since: %s"
+msgstr "מחובר לשרת מאז: %s"
 
-#: src/ServerList.cpp:208
+#: src/Statistics.cpp:779
 #, c-format
-msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
-msgstr ""
+msgid "Active Connections (estimate): %i"
+msgstr "חיבורים פעילים (משוער): %i"
 
-#: src/ServerList.cpp:228
+#: src/Statistics.cpp:780
 #, c-format
-msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
-msgstr ""
+msgid "Max Connection Limit Reached: %s"
+msgstr "גבול מקסימלי של התחברויות הושג: %s"
 
-#: src/ServerList.cpp:247
+#: src/Statistics.cpp:781
 #, c-format
-msgid "Server added: Server at [%s:%d] using the name '%s'."
+msgid "Average Connections (estimate): %g"
+msgstr "חיבורים בממוצע (משוער): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "שיא החיבורים (משוער): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "לקוחות"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "גודל לא ידוע"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "מסוננים"
+
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "חסום"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "סכום כולל: %i מוכר: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "שרתים פעילים: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "שרתים שנכשלו: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "סכום כולל: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "שרתים שנמחקו: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "שרתים שסוננו: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "משתמשים על שרתים פעילים: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "קבצים על שרתים פעילים: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "סכום כולל של משתמשים: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "סכום כולל של קבצים: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "תעסוקת שרתים: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "מספר קבצים משותפים: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "גודל כולל של קבצים משותפים: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
 msgstr ""
 
-#: src/ServerList.cpp:342
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "מערכת הפעלה"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "לא התקבל"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "כישורים פעילים (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "לא זמין"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "אף פעם"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "פקודת '%s עם pid '%d' סיים עם קוד סטטוס '%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "הרץ <str> וצא."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "פורמט IP לא חוקי. התמש ב xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"You are connected to the server you are trying to delete. please disconnect "
-"first."
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
+"הפקודה הזאת דורשת ארגומנט. ארגומנט חוקי יכול להיות: 'all' שם קובץ או מספר.\n"
 
-#: src/ServerList.cpp:629
-msgid "Failed to save server.met!"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "מעבד על פי גיבוב: "
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "מעבד על פי שם קובץ: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr "פקודה זאת דורשת ארגומנט. ארגומנט חוקי: גיבוב של קובץ.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "לא מספר חוקי\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "לא גיבוב חוקי (האורך חייב להיות בדיוק 32 תווים)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "הבקשה נכשלה עם שגיאה לא ידועה"
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "הפעולה הסתיימה בהצלחה."
+
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
+msgstr "הבקשה נכשלה עם השגיאה הבאה: %s"
+
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "סינון IP עבור לקוחות הוא %s.\n"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "מכובה"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "דלוק"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "סינון IP עבור שרתים הוא %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "רמת סינום IP נוכחית היא %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
 msgstr ""
 
-#: src/ServerList.cpp:782
-msgid "Invalid URL"
+#: src/TextClient.cpp:699
+msgid "eD2k"
 msgstr ""
 
-#: src/ServerList.cpp:805
+#: src/TextClient.cpp:704
 #, c-format
-msgid "Finished to download the server list from %s"
-msgstr ""
+msgid "Connected to %s %s %s"
+msgstr "מחובר ל %s·%s·%s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "מתחבר עכשיו"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "חסום-חומתאש"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "בסדר"
+
+#: src/TextClient.cpp:734
 #, c-format
-msgid "Failed to download the server list from %s"
+msgid ""
+"\n"
+"Download:\t%s"
 msgstr ""
+"\n"
+"הורדה:\t%s"
 
-#: src/ServerList.cpp:818
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
-"No server list address entry in 'addresses.dat' found. Please paste a valid "
-"server list address into this file in order to auto-update your server list"
+"\n"
+"Upload:\t%s"
 msgstr ""
+"\n"
+"העלאה:\t%s"
 
-#: src/ServerList.cpp:831
+#: src/TextClient.cpp:740
 #, c-format
-msgid "Start downloading server list from %s"
+msgid ""
+"\n"
+"Clients in queue:\t%d\n"
 msgstr ""
+"\n"
+"לקוחות בתור:\t%d\n"
 
-#: src/ServerList.cpp:840
+#: src/TextClient.cpp:743
 #, c-format
-msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
+msgid ""
+"\n"
+"Total sources:\t%d\n"
 msgstr ""
+"\n"
+"סה\"כ מקורות:\t%d\n"
 
-#: src/ServerList.cpp:844
-msgid "No valid server.met auto-download url on addresses.dat"
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "מספר תוצאות חיפוש: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
 msgstr ""
 
-#: src/ServerList.cpp:937
-msgid ""
-"Local server is filtered by the IPFilters, reconnecting to a different "
-"server!"
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
 msgstr ""
 
-#: src/UserEvents.cpp:132
+#: src/TextClient.cpp:837
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr ""
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "התקבלה תשובה לא מוכרת מהשרת, קוד-פעולה = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "הראה מידעה על מצב בקיצור."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "הראה מצב חיבורים, מהירות הורדה/האלכה נוכחיים וכו'.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "הראה את עץ הסטטיסטיקה המלא."
 
-#: src/amule.cpp:703
+#: src/TextClient.cpp:854
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
+"\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
 msgstr ""
+"אופציונלי, מספר בתווך 0-255 יכול להשלח בתור ארגומנט\n"
+"לפקודה זו האומרת כמה רשומות של תתי העצים של גירסת הלקוח יראו.\n"
+"העברה של 0 או דילוג תתפרש בתור \"ללא הגבלה\".\n"
+"\n"
+"דוגמא: 'statistics·5' יראה רק את חמשת הגרסאות הראשונים עבור כל סוג לקוח.\n"
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
 msgstr ""
 
-#: src/amule.cpp:787
-msgid "Server list download"
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
 
-#: src/amule.cpp:846
-#, c-format
-msgid "web server running on pid %d"
+#: src/TextClient.cpp:859
+#, fuzzy
+msgid "Reload the given object."
+msgstr "טוען מחדש את האובייקט הנתון."
+
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
+msgstr "טוען מחדש את רשימת הקבצים המשותפים."
+
+#: src/TextClient.cpp:862
+#, fuzzy
+msgid "Reload IP filtering table."
+msgstr "טוען מחדש את טבלת סינון ה IP מהקובץ."
+
+#: src/TextClient.cpp:863
+#, fuzzy
+msgid "Reload current IP filtering table."
+msgstr "בחר את אמת סינון הIP."
+
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "טוען מחדש את טבלת סינון ה IP מהקובץ."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/amule.cpp:850
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "התחבר לרשת."
+
+#: src/TextClient.cpp:868
 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"
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
+"פעולה זו תחבר אותך לכל הרשתות שמאופשרות בהעדפות.\n"
+"את יכול גם, בצורה אופציונלית, לציין שרת בתצורה של IP:מבואה כדי להתחבר אל\n"
+"שרת זה בלבד. ה IP חייב להיות ארבעה מספרים מופרדים בנקודות בפורמט IPv4, \n"
+"או שם שרת שניתן להמירו ל IP."
 
-#: src/amule.cpp:937
-#, c-format
-msgid "Could not bind ports to the specified address: %s"
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/amule.cpp:964
-#, c-format
-msgid "Port %u is not available. You will be LOWID\n"
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "התחבר רק לקאד."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "התנתק מהרשת."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "פעולה זו תנתק את כל הרשתות המחוברות.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/amule.cpp:970
-#, c-format
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "התנתק רק מ קאד."
+
+#: src/TextClient.cpp:877
+#, fuzzy
+msgid "Add an eD2k or magnet link to core."
+msgstr "מוסיף קישור ed2k או מגנט לליבה."
+
+#: src/TextClient.cpp:878
 msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
-"Check your network to make sure the port is open for output and input."
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "הגדר ערך מועדף."
+
+#: src/TextClient.cpp:883
+#, fuzzy
+msgid "Set IP filtering preferences."
+msgstr "הגדר העדפת מסנן IP."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "הדלק סינון IP הן עבור הלקוחות והן עבור השרתים."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "כבה סינון IP הן עבור הלקוחות והן עבור השרתים."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "אפשר/נטרל סינון IP עבור לקוחות."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "הדלק סינון IP עבור לקוחות."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "כבה סינון IP עבור לקוחות."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "אפשר/נטרל סינון IP עבור שרתים."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "הדלק סינון IP עבור שרתים."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "כבה סינון IP עבור שרתים."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "בחר את אמת סינון הIP."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
+"רמות סינון תקפים המ בתווך של 0-255, ברירת המחדשל (ערך התחלתי)\n"
+"הוא 127.\n"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "קבע תיחום רוחב פס."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "הערך שמועבר לפקודות אלו חייב להיות ביחידות של ק\"ב/ש.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "קבע מגבלת רוחב פס בהעלאה."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "קבע מגבלת רוחב פס בהורדה."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "שלוף ותציג ערך של העדפה."
+
+#: src/TextClient.cpp:905
+#, fuzzy
+msgid "Get IP filtering preferences."
+msgstr "שלוף העדפה עבור סינון IP."
+
+#: src/TextClient.cpp:906
+#, fuzzy
+msgid "Get IP filtering state for both clients and servers."
+msgstr "שלוף העדפה עבור סינון IP עבור השרתים והלקוחות."
+
+#: src/TextClient.cpp:907
+#, fuzzy
+msgid "Get IP filtering state for clients only."
+msgstr "שלוף העדפה עבור סינון IP רק עבור הלקוחות."
+
+#: src/TextClient.cpp:908
+#, fuzzy
+msgid "Get IP filtering state for servers only."
+msgstr "שלוף העדפה עבור סינון IP רק עבור השרתים."
+
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "בחר את אמת סינון הIP."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "שלוף הגבלת רוחב הפס."
+
+#: src/TextClient.cpp:913
+#, fuzzy
+msgid "Execute a search."
+msgstr "הרץ חיפוש בקאדימליה"
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
+"סוג חיפוש חייב להיות מצוין:\n"
+"    GLOBAL (גלובלי)\n"
+"    LOCAL (מקומי)\n"
+"    KAD (קאד)\n"
+"דוגמה: 'search·kad·file' יבצע חיפוש באמצעות קאד עבור הקובץ \"file\".\n"
+
+#: src/TextClient.cpp:915
+#, fuzzy
+msgid "Execute a global search."
+msgstr "הרץ חיפוש גלובלי."
+
+#: src/TextClient.cpp:916
+#, fuzzy
+msgid "Execute a local search"
+msgstr "הרץ חיפוש מקומי"
+
+#: src/TextClient.cpp:917
+#, fuzzy
+msgid "Execute a kad search"
+msgstr "הרץ חיפוש בקאדימליה"
 
-#: src/amule.cpp:1299
+#: src/TextClient.cpp:919
+#, fuzzy
+msgid "Show the results of the last search."
+msgstr "הראה את התוצאות של החיפוש האחרון."
+
+#: src/TextClient.cpp:920
+#, fuzzy
+msgid "Return the results of the previous search.\n"
+msgstr "מחזירת את התוצאות של החיפוש האחרון.\n"
+
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "מראה את התקדמות החיפוש."
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "מראה התקדמות של חיפוש.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "התחל בהורדת קובץ"
+
+#: src/TextClient.cpp:926
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
+"מספר הקובץ מהחיפוש האחרון חייב להמסר.\n"
+"דוגמה: 'download·12'· יתחיל להוריד את קובץ מספר 12 מהחיפוש האחרון.\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "השהה הורדה."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "המשך הורדה."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "בטל הורדה."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "קבע את העדיפות של ההורדה."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "קבע את עדיפות ההורדה ל נמוך, נורמלי, גבוה או אוטומטי.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "קבע את העדיפות ל 'נמוך'."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "קבע את העדיפות ל 'נורמלי'."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "קבע את העדיפות ל 'גבוה'."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "קבע את העדיפות ל 'אוטומטי'."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "הראה תורים/רשימות."
+
+#: src/TextClient.cpp:950
+#, fuzzy
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr "הראה תורים של הרודות/העלאות, רשימת שרתים או רשימת קבצים משותפים.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "הראה צור העלאות"
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "הראה את תור ההורדות."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "הראה יומן."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "הראה את רשימת השרתים."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "אפס את הימון."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "This is the first time you run aMule %s"
+msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
 msgstr ""
+"זאת פקודה מיושנת ועלולה להתבטל בעתיד.\n"
+"השתמש ב '%s' במקומה.\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "לקוח טסטואלי של אֵימיול"
+
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "ממיר את קבוצת הגיבובים בפורמט AICH עבור '%s' ל 64b עבור '%s'."
+
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "אזהרה: שם הקובץ '%s' אינו חוקי והוא נקרא מחדש בשם '%s'."
+
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "אזהרה: הקובץ '%s' כבר קיים. שם הקובץ החדש שונה ל '%s'."
+
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr "האם אתה בטוח שברצונך לבטל ולמחוק את כל הקבצים שבקטגוריה זו?"
+
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "זקוק לאישור."
+
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "יותר מדי חיבורים"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "כל האחרים"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "בחר מסנן תצוגה"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "הוסף קטיגוריה"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "ערוך קטיגוריה"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "הסר קטיגוריה"
+
+#: src/UploadClient.cpp:240
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "נכשל בפתיחת הקובץ (%s), מסיר מרשימת הקבצים המשותפים."
+
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "התבקשה קבוצת הגיבובים של קובץ לא ידוע: %s"
+
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
+msgstr "ממשיך את העלאה של קובץ: %s"
+
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "משהה את העלאה של קובץ: %s"
+
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
 msgstr ""
 
-#: src/amule.cpp:1316
-msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "הורדה הסתיימה"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "הנתיב המלא לקובץ"
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "שם הקובץ ללא הנתיב."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/amule.cpp:1317
-msgid ""
-"\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "גודל הקובץ בבתים."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "זמן מצטבר של פעולת הורדה."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "צ'אט חדש החל."
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "שולח ההודעה"
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "נגמר המקום"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "מחיצת דיסק."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "שגיאה בעת הסיום."
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
+msgstr "מעבד קובץ מס. %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "ביקשת גיבובים עבור חלקים (בשימוש רק עבור קבצים > 9.5 מ\"ב"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
+#, c-format
+msgid "%s ---> Non existant file !\n"
+msgstr "קובץ %s אינו קיים!\n"
+
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/amule.cpp:1318
-msgid ""
-"\n"
-"* Disabled updating the server list from other server and clients.\n"
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "ברוכים הבאים!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "פרמטרים להזנה"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "גיבוב קובץ"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "הוסף כתובות URL אופתינליות לקובץ זה"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/amule.cpp:1319
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
 msgid ""
-"\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
 
-#: src/amule.cpp:1320
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "הסר"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "צור קישור עם חלקי הגיבובים"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
 msgid ""
-"\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
-msgstr ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr "עזור להפיץ קבצים חדשים ונדירים יותר מהר, במחיר קידור יותר גדול"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "קובץ גיבובי MD4"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
 msgstr ""
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
 msgstr ""
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "תרגיש חופשי לדוואח על כל שגיאה ל http://forum.amule.org"
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "שמור"
 
-#: src/amule.cpp:1341
-msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "העתק ללוח"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
 msgstr ""
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "שגיאה: לא יכול לפתוח קובץ יומן."
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr ""
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
 msgstr ""
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "היומן אופס."
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr ""
 
-#: src/amule.cpp:1826
-#, c-format
-msgid "ServerMessage: %s"
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "אודות aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "אין שום דבר להעתיק נכון לעכשיו !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "לא הצליך לפתוח את "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "בבקשה תכניס שם קובץ שאינו ריק"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "שום דבר לשמור עכשיו !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "מגבב..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/amule.cpp:1907
-#, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/amule.cpp:1911
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "בוטל !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgid "Done in %.2f s"
+msgstr "הסתיים ב %.2f שניות"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "כבר הוספת את כתובת URL הזאת !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "בבקשה תכניס כתובת URL שאינה ריקה"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#, c-format
+msgid "Unable to open %s"
+msgstr "לא מצליח לפתוח את %s"
+
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "ימים - %i, שעות -%i, דקות - %i, שניות - %i"
+
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uימים %02uשעות %02uדקות %02uשניות"
+
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uשעות %02uדקות %02uשניות"
+
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02uדקות %02uשניות"
+
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02uשניות"
+
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f בתים"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f ק\"ב"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f מ\"ב"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f ג\"ב"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f ט\"ב"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "סטטיסטיקות מקוונות של אימיול - wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "קצב הורדה מקסימלי מאז ש wxCas החל לפעול"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "קצב הורדה מקסימלי אבסלוטי בעת הפעלות קודמות של wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "מערכת"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "עצור רענון אוטומטי"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "שמור תמונה סטטיסטית מקוונת"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "הדפס תמונה סטטיסטית מקוונת"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "הגדרת העדפות"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "אודות wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "החל רענון אוטומטי"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "רענון אוטמטי נעצר"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "רענון אוטמטי התחיל"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "שמור תמונה סטטיסטית"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "סטטיסטיקות מקוונות של אימיול"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
+"ישנה בעייה בהדפסה.\n"
+"האם המדפסת הנוכחית שלך מוגדרת בצורה נכונה?"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "מדפיס"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
+"סטטיסטיקות חתימות מקוונת של אימיול - wxCasn\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"מבוסס על CAS שנותר על ידי Pedro·de·Oliveira·<falso@rdk.homeip.net>\n"
+"\n"
+"מופץ תחת רשיון GPL"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "או או.. אימיול לא פועל..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "אימיול פועל"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "אמיול פועל אך אינו מחובר"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "אימיול מתחבר..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "או או... המצב של אימיול אינו ידוע..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "אֵימיול "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " פועל במשך "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " הופסק !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " אינו מחובר !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " מתחבר..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " עושה משהו מוזר, תבדוק את זה!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " מחובר ל "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " קאד: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "מכובה"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " דלוק "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " עם "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "סכום כולל של הורדות: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", הועלה: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "הורד בהחתברות הנוכחית: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "מוריד: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " ק\"ב/ש, העלאה: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " ק\"ב/ש"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "משתף: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " קבצ(ים), לקוחות בתור: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "זמן: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " דלוק "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "עומס ממוצע של המערכת ( 1-5-15 דקות): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "משך הפעולה של המערכת:"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "תקיה המכילה את הקובץ amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "הכנס כאן את התקייה היכן שהקובץ amulesig.dat נמצא"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "קצב מרווח הרענון בשניות"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "צור תמונת סטאטוס בכל ארוע רענון"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "הכנס כאן את התקיה שבה אתה רוצה ליצור את תמונת הסטטוס"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "העלה בתקופתיות את תמונת הסטטוס לשרת FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "כתובת URL של FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "נתיב FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "הכנס כאן את כתובת ה URL של שרת ה FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "הכנס כאן את נתיב הספריה שבה אתה שם את תמונת הסטטוס על שרת ה FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "משתמש"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "הכנס כאן את שם המשתמש שאיתו תתחבר לשרת ה FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "הכנס את סיסמת הזיהוי להתחברות לשרת ה FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "קצב עדכון התקופתי של ה FTP בדקות"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "אַמת"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "תיקיה המכילה את קובץ החתימה שלך"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "תיקיה שבה יווצרו תמונות הסטאטוס"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "טוען תבנית<מחרוזת>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
 msgstr ""
 
-#: src/amule.cpp:2025
-#, c-format
-msgid "Users: %s | Files: %s"
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/amule.cpp:2026
-#, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "מבואת UPnP"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "השמתש בדחיסת gzip"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
 msgstr ""
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
 msgstr ""
 
-#: src/amule.cpp:2102
-#, c-format
-msgid "Connected to %s %s"
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "אפשר גישה לאורחים"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "מנע גישה מאורחים"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/amule.cpp:2105
-#, c-format
-msgid "Connecting to %s"
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "נתיב קובץ ההגדרות של אימיול. לא לשימוש בצורה ישירה!!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "נטרל מפענח PHP (מיושן-מבוטל)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "הדר מחדש דפי PHP לאחר כל בקשה"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "שרת אימיול רשתי"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "קאד התחיל."
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "הבקשה נכשלה עם השגיאות הבאות: %s."
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "קאד נעצר."
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "קובץ האינדקס לא נמצא"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "קאד מחובר (בסדר)"
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "פג התוקף של החיבור - מבקש התחברות מחדש\n"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "קאד מחובר (מאחורי חומת אש)"
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "התחברות הצליחה - מחובר\n"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "מנותק מקאד."
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "התחברות הצליחה, לא מזוהה\n"
 
-#: src/amule.cpp:2191
-msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
-msgstr "אי אפשר להשתמש ברשת הקאד אם מוואת UDP מבוטלת בהעדפות, לא התחיל."
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "לא נפתחה התחברות - הולך לבקש להזדהות\n"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "קאד מבוטל בהעדפות, לא מתחבר."
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "נוצרה התחברות מבקש להזדהות\n"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr ""
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "מעבד בקשה [מקורי]: "
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
 msgstr ""
 
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "בודק סיסמא\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "גיבוב הסיסמא אינו תקף\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "הסיסמא בסדר\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "סיסמא שגויה\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "לא הזנת סיסמא. סיסמאות ריקות אינם קבילות.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "ב‏‎ֻקְשַה התנתקות\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "מעבד בקשה [הופנתה מחדש]: "
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "אלבני"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "הורדות"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#, fuzzy
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "השהיית עדכון: %d שניות"
+#~ msgstr[1] "השהיית עדכון: %d שניות"
+
+#~ msgid "Transferring"
+#~ msgstr "מעביר"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "נכנס לתור"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "לביצוע - הראה התקדמות של חיפוש"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "מתחיל לייצר מחרוזת גיבוב באמצעות MD4 ובאמצעות AICH עבור הקובץ: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "מתחיל לייצר מחרוזת גיבוב באמצעות MD4עבור הקובץ:%s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "מתחיל לייצר מחרוזת גיבוב באמצעות AICH עבור הקובץ:%s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr "אזהרה: לא ניתן להסיר את '%s' המקורי לאחר שנוצר גיבוי."
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "אזהרה: הניסיון למחוק/להסיר את '%s' נכשל."
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "מוריד מהרשת"
+
+#~ msgid "Transfers"
+#~ msgstr "העברות"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "מראה תור האלעה / למעלה "
+
+#~ msgid "Clients on queue :"
+#~ msgstr "לקוחות בתור :"
+
+#~ msgid "Current Session"
+#~ msgstr "הרצה נוכחית"
+
+#~ msgid "Total"
+#~ msgstr "סה\"כ"
+
+#~ msgid "Requested :"
+#~ msgstr "בֻקַש :"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "חלון העברות הקבצים"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "סה\"כ משתמשים: %s | סה\"כ קבצים: %s"
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "הורדות (%i)"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "אזהרה: לא ניתן להסיר את '%s' המקורי לאחר שנוצר גיבוי."
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "שלוף רמת סינון ה IP."
+
+#~ msgid "Makes a search."
+#~ msgstr "מבצע חיפוש."
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "נכשל"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "כבה את אימיול."
+
 #~ msgid "Fetching status..."
 #~ msgstr "מביא את נתוני המצב..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "משתמשים: ed2k -> %s קאד -> %s | קבצים: ed2k -> %s קאד -> %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "לקוח %s ב כתובת:מבואה %s:%d משתמש ב %s %s %s"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "האפליקציה->רשית השרתים->קבל־שרת־באמצעות־כתובת() מחזיר כלום"
 
-#~ msgid "Message Filter"
-#~ msgstr "מסנן הודעות"
+#~ msgid "Firewalled"
+#~ msgstr "חסום חומת אש"
 
-#~ msgid "Gui Tweaks"
-#~ msgstr "כיולי המנשק הגרפי"
+#, fuzzy
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "טוען %d תמונת דגל."
+#~ msgstr[1] "טוען %d תמונת דגל."
 
-#~ msgid "Core Tweaks"
-#~ msgstr "כיולי ליבה"
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr ""
+#~ "הקובץ %s גדול מדי עבור ה\"חמור\": גודל קובץ מקסימלי שמותר זה 4 ג\"ב."
 
 #~ msgid "No handler for this file type."
 #~ msgstr "אין 'מאחז' עבור סוג קובץ זה"
@@ -7020,9 +7452,14 @@
 #~ msgid "File was not saved"
 #~ msgstr "קובץ לא נשמר"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
-#~ msgstr ""
-#~ "הקובץ %s גדול מדי עבור ה\"חמור\": גודל קובץ מקסימלי שמותר זה 4 ג\"ב."
+#~ msgid "Message Filter"
+#~ msgstr "מסנן הודעות"
+
+#~ msgid "Gui Tweaks"
+#~ msgstr "כיולי המנשק הגרפי"
+
+#~ msgid "Core Tweaks"
+#~ msgstr "כיולי ליבה"
 
 #~ msgid "Status text"
 #~ msgstr "טקסט סטאטוס"
@@ -7030,6 +7467,58 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "טקסט מצב שמופיע"
 
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr ""
+#~ "לקוח p2p2 הפועל ב 'כל פלטפורמה' ומבוסס כל אִימיול \n"
+#~ "\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr " אתר הבית: http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr " פורום: http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ " שאלות נפוצות: http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " יצירת קשר: admin@amule.org (נושאים מנהליים) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ "זכוייות יוצרים (C) 2003-2008 צוות אימיול \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr " חלק מאֵימיול מבוסס על \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " זכויות יוצרים (C)·2002·Petar·Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "עבור סרט אתה יכול לציין את האורך, העלילה, השפה ...\n"
+#~ "ואם זה זיוף, אתה יכול לספר את זה לשאר משתמשי אימיול."
+
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "לא ניתן לזהות את הדפדפן הנבחר!"
+
+#~ msgid "User Defined"
+#~ msgstr "הגדרות משתמש"
+
 #~ msgid "Please wait... "
 #~ msgstr "אנא המתן... "
 
@@ -7045,9 +7534,6 @@
 #~ msgid "ExternalConn: Access denied"
 #~ msgstr "ExternalConn: (התחברות חיצונית) הגישה נאסרה ."
 
-#~ msgid "ExternalConn: Bad reply from server. Connection closed."
-#~ msgstr "ExternalConn: (התחברות חיצונית) תשובה לא טובה מהשרת. החיבור נסגר. ."
-
 #~ msgid "The ed2k hash of the file."
 #~ msgstr "מחרוזת גיבוב ה ed2k של הקובץ"
 
@@ -7149,18 +7635,12 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "העתק קישורי ED2k ללוח"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "שגיאה סופנית: יצירת קוצב-זמן נכשלה"
-
 #~ msgid "ED2K: Connecting"
 #~ msgstr "ED2K: מתחבר"
 
 #~ msgid "ED2K: Disconnected"
 #~ msgstr "ED2K: מנותק"
 
-#~ msgid "Warning: Unable to open skin file '%s' for read"
-#~ msgstr "אזהרה: לא ניתן לפתוח את קובץ הסקין '%s' לקריאה"
-
 #~ msgid ""
 #~ "Your Auto-update servers list is in blank.\n"
 #~ "'Auto-update serverlist at startup' will be disabled."
@@ -7257,9 +7737,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "שגיאה: גרסת הקובץ part.met אינה תקפה: %s·==>·%s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr "שגיאה: %s (%s) פגום (מספר-תווית שגוי) לא יכול לטעון קובץ."
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "אזהרה: %s עלול להיות פגום (%i)"
 
@@ -7281,12 +7758,6 @@
 #~ msgid "Insufficient Diskspace"
 #~ msgstr "חסר שטח דיסק"
 
-#~ msgid "Warning: known.met cannot be opened."
-#~ msgstr "אזהרה: לא ניתן לפתוח את הקובץ known.met."
-
-#~ msgid "Warning: Knownfile list corrupted, contains invalid header."
-#~ msgstr "אזהרה: רשימת הקבצים-המכורים פגומה, מכילה כותר פגום."
-
 #~ msgid "ERROR! Attempted to share %s"
 #~ msgstr "שגיאה! ניסיון לשתפ את %s"
 
@@ -7315,9 +7786,6 @@
 #~ msgid "Bandwidth Limits: Up: %u kB/s, Down: %u kB/s.\n"
 #~ msgstr "גבולות רוחב הפס: העלאה: %u ק\"ב/ש, הורדה: %u ק\"ב/ש.\n"
 
-#~ msgid "Shutdown aMule."
-#~ msgstr "כבה את אימיול."
-
 #~ msgid ""
 #~ "Shutdown the remote running core (amule/amuled).\n"
 #~ "This will also shut down the text client, since it is unusable without a\n"
@@ -7333,9 +7801,6 @@
 #~ msgid "Disconnect from ED2K only."
 #~ msgstr "התנתק רק מ ED2K."
 
-#~ msgid "Adds an ed2k or magnet link to core."
-#~ msgstr "מוסיף קישור ed2k או מגנט לליבה."
-
 #~ msgid ""
 #~ "The ed2k link to be added can be:\n"
 #~ "*) a file link (ed2k://|file|...), it will be added to the download "

aMule-2.2.6.tar.bz2/po/hr.po -> aMule-2.3.1.tar.bz2/po/hr.po Changed

@@ -1,5 +1,5 @@
 # aMule i18n resource file.
-# Copyright (C) 2004 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the PACKAGE package.
 # Kry <elkry@users.sourceforge.net>, 2004.
 #
@@ -7,1277 +7,1096 @@
 msgstr ""
 "Project-Id-Version: aMule CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr ""
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr ""
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Dodaj prijatelja"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr ""
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Ukucaj vazecu IP adresu i port!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Hashing"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Zavrsavanje"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Zavrseno"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Pausirano"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Sa greskom"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Downloading"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Cekanje"
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Neuspjelo otvaranje %s (%s)"
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
 
-#: src/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
 msgstr ""
 
-#: src/ThreadTasks.cpp:141
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create AICH hash for file: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/ThreadTasks.cpp:350
+#: src/amule.cpp:261
 #, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr ""
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Neuspjesno"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
 msgstr ""
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr ""
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "Potvrda izlaza"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Nepoznat"
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "Nova vanjska veza prihvacena\n"
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
 msgstr ""
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
 msgstr ""
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr ""
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1790
-#, c-format
-msgid "1.x (based on eMule v0.%u)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
 msgstr ""
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
+#: src/amule.cpp:581
+msgid "Server list download"
 msgstr ""
 
-#: src/BaseClient.cpp:1962
-#, fuzzy, c-format
-msgid "Requested: %s\n"
-msgstr "Zahtijevan:"
-
-#: src/BaseClient.cpp:1964
-#, fuzzy, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Fajl statistike za ovu misiju: Prihvaceno %d od %d zahtjeva, %s preneseno\n"
-msgstr[1] ""
-"Fajl statistike za ovu misiju: Prihvaceno %d od %d zahtjeva, %s preneseno\n"
-
-#: src/BaseClient.cpp:1967
-#, fuzzy, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Fajl statistike za ovu misiju: Prihvaceno %d od %d zahtjeva, %s preneseno\n"
-msgstr[1] ""
-"Fajl statistike za ovu misiju: Prihvaceno %d od %d zahtjeva, %s preneseno\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Zatrazen nepoznat fajl"
-
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:654
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
+msgid "web server running on pid %d"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Ime korisnika"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Prijatelji"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Pokazi &Detalje"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Dodaj prijatelja"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Odstrani prijatelja"
-
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Posalji &Poruku"
-
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Ugledaj fajlove"
-
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Uspostavi slot zu prijatelja"
-
-#: src/FriendListCtrl.cpp:273
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Da li zaist zelis otkazati i obrisati ove fajlove ?\n"
-
-#: src/FriendListCtrl.cpp:275
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Da li zaist zelis otkazati i obrisati ove fajlove ?\n"
-
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Otkaz"
-
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:658
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
-msgstr ""
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
+"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/UserEvents.h:60
-msgid "Download completed"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
 msgstr ""
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
+#: src/amule.cpp:741
+#, c-format
+msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
+#: src/amule.cpp:768
+#, c-format
+msgid "Port %u is not available. You will be LOWID\n"
 msgstr ""
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
+#: src/amule.cpp:774
+#, c-format
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
 msgstr ""
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
 msgstr ""
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
 msgstr ""
 
-#: src/UserEvents.h:87
-msgid "Message sender."
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
 msgstr ""
 
-#: src/UserEvents.h:92
-msgid "Out of space"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
 msgstr ""
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
+#: src/amule.cpp:1043
+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/UserEvents.h:100
-msgid "Error on completion"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Ime fajla"
-
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Velicina"
-
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tip"
-
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioritet"
-
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "FileID"
-
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Zahtjevi"
-
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Prihvaceni zahtjevi"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Podatak transfera"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Dobiveni dijelovi"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Dijeljeni fajlovi"
-
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Vrlo nizak"
-
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Nisko"
-
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normalan"
-
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Visoko"
-
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Vrlo visok"
-
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Automatski"
-
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr ""
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "Ime servera :"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Preimenovanje"
-
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
+#: src/amule.cpp:1613
 #, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Za ispravan izvorni link, potrebna je HIGH ID"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:451
+#: src/amule.cpp:1616
 #, c-format
-msgid "Shared Files (%i)"
-msgstr "Dijeljeni fajlovi (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
 msgstr ""
 
-#: src/UploadQueue.cpp:511
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
 #, c-format
-msgid "Resuming uploads of file: %s"
+msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/UploadQueue.cpp:520
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
 #, c-format
-msgid "Suspending upload of file: %s"
-msgstr ""
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr ""
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:374
+#: src/amule.cpp:1867
 #, c-format
-msgid "Request failed with the following error: %s."
+msgid "Connected to %s %s"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
+#: src/amule.cpp:1879
+msgid "Kad started."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
 msgstr ""
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
 msgstr ""
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
 msgstr ""
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Downloading..."
-
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
 msgstr ""
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Opcije"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Spajanje"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Pretrazi :"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr ""
+#: src/amuleDlg.cpp:719
+#, fuzzy
+msgid "Kad: Connected"
+msgstr "Veza uspostavljena"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr ""
+#: src/amuleDlg.cpp:724
+#, fuzzy
+msgid "Kad: Connecting"
+msgstr "Spajanje"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr ""
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Otkaz"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr ""
+#: src/amuleDlg.cpp:775
+#, fuzzy
+msgid "Stop the current connection attempts"
+msgstr "Zaustavlja trenutne pokusaje uspostavljanja veze"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr ""
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Prekinuti vezu"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
+#: src/amuleDlg.cpp:781
+#, fuzzy
+msgid "Disconnect from the currently connected networks"
+msgstr "Prekinuti vezu sa sadasnjim serverom"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr ""
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Uspostavi vezu"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr ""
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Gore: %.1f(%.1f) | Dole: %.1f(%.1f)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr ""
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Gore: %.1f | Dole: %.1f"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr ""
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Da li zaista zelite iskljuciti aMule?"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr ""
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Potvrda izlaza"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
-#, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Ponistenje"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr ""
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Pretrage"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr ""
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Prozor pretraga"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr ""
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Downloads"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr ""
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Downloading"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr ""
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Prozor dijeljenih fajlova"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr ""
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Poruke"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr ""
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Prozor poruka"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr ""
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistike"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr ""
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Prozor grafova statistike"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr ""
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Opcije"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Prozor postavke opcija"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
+#: src/amuleDlg.cpp:1489
+msgid "No network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr ""
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Fatalna greska: Neuspjesno stvaranje tajmera"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr ""
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Fatalna greska: Neuspjesno stvaranje tajmera"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr ""
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "Spajanje"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr ""
+#: src/amule-remote-gui.cpp:407
+#, fuzzy
+msgid "Ready"
+msgstr "Ponovno ucitati"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr ""
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Nepoznat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
+#: src/BaseClient.cpp:1590
 #, fuzzy
-msgid " kB/s"
-msgstr "kB/s"
+msgid "Searching buddy for lowid connection"
+msgstr "ceka na spajanje..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/BaseClient.cpp:1854
 #, c-format
-msgid "%.2f kB/s"
+msgid "1.x (based on eMule v0.%u)"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr ""
+#: src/BaseClient.cpp:2029
+#, fuzzy, c-format
+msgid "Requested: %s\n"
+msgstr "Zahtijevan:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr ""
+#: src/BaseClient.cpp:2031
+#, fuzzy, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Fajl statistike za ovu misiju: Prihvaceno %d od %d zahtjeva, %s preneseno\n"
+msgstr[1] ""
+"Fajl statistike za ovu misiju: Prihvaceno %d od %d zahtjeva, %s preneseno\n"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
+#: src/BaseClient.cpp:2034
+#, fuzzy, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Fajl statistike za ovu misiju: Prihvaceno %d od %d zahtjeva, %s preneseno\n"
+msgstr[1] ""
+"Fajl statistike za ovu misiju: Prihvaceno %d od %d zahtjeva, %s preneseno\n"
+
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Zatrazen nepoznat fajl"
+
+#: src/BaseClient.cpp:2700
 #, c-format
-msgid "%02uD %02uh %02umin %02us"
+msgid "Message filtered from '%s' (IP:%s)"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/BaseClient.cpp:2807
 #, c-format
-msgid "%02uh %02umin %02us"
+msgid "New message from '%s' (IP:%s)"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
+"Korisnik %s (%u) ja zahtio tvoju listu dijeljenih fajlova za direktorij %s -"
+"> %s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
 #, c-format
-msgid "%02us"
+msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LowID"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Neocekivana fajl greska prilikom pisanja %s : %s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Veza nije uspostavljena"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Greska prilikom spajanja sa %s (%s:%i): %d"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr ""
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategorija"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
+#: src/CatDialog.cpp:87
+msgid "New Category"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
-#, c-format
-msgid "%.2f GB"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Izaberi mapu (folder) za dolazece fajlove"
+
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-#, fuzzy
-msgid "Cancelled !"
-msgstr "Otkaz"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ChatSelector.cpp:129
 #, c-format
-msgid "Unable to open %s"
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/ChatSelector.cpp:336
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Ocisti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr ""
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Zatvori oznaku"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
-msgstr ""
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Zatvori sve oznake"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr ""
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Zatvori druge oznake"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr ""
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Primi u prijatelje"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr ""
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Start"
+#: src/ClientCreditsList.cpp:161
+#, fuzzy, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] "Krediti istekli!"
+msgstr[1] "Krediti istekli!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr ""
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Detalji klienta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Izlaz"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LowID"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr ""
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Veza uspostavljena"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr ""
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Prekinuta veza"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr ""
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Nedovrseno"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-#, fuzzy
-msgid "Can't open the clipboard"
-msgstr "Kopiraj ED2k link u klipbord"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Los decko"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Priznat - OK"
+
+#: src/ClientRef.cpp:203
+msgid "Not Available"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
 msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
+"Korisnik %s (%u) ja zahtio tvoju listu dijeljenih fajlova za direktorij %s -"
+"> %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
+"Korisnik %s (%u) ja zahtio tvoju listu dijeljenih fajlova za direktorij %s -"
+"> %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr ""
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Korisnik %s (%u) dijeli direktorije %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr ""
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "Korisnik %s (%u) je poslao listu dijeljenih fajlova za direktorij %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/ClientTCPSocket.cpp:989
 #, c-format
-msgid "Done in %.2f s"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr ""
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Korisnik %s (%u) ja zavrsio slanje liste dijeljenih fajlova"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr ""
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Korisnik %s (%u) ja zavrsio slanje nezeljene liste dijeljenih fajlova"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/ClientTCPSocket.cpp:1006
 #, c-format
-msgid "Processing file number %u: %s"
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr ""
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Komentari fajla"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
-#, c-format
-msgid "%s ---> Non existant file !\n"
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Ime korisnika"
+
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Ime fajla"
+
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Ocjena"
+
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Bez komentara"
+
+#: src/CommentDialogLst.cpp:105
+#, fuzzy, c-format
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "Bez komentara"
+msgstr[1] "Bez komentara"
+
+#: src/CorruptionBlackBox.cpp:227
+#, c-format
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
 #: src/DataToText.cpp:37
@@ -1292,31 +1111,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Vi]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Spajanje"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Vrlo nizak"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Nisko"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normalan"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Visoko"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Vrlo visok"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr ""
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Pita"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Spaja preko servera"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Pun red cekanja"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "U redu cekanja"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Prenosi"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Downloading"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1342,8 +1187,7 @@
 msgid "Too many Kad connections"
 msgstr ""
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Zabranjen"
 
@@ -1375,8 +1219,8 @@
 msgid "Remote Server"
 msgstr ""
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr ""
 
@@ -1397,12 +1241,11 @@
 msgstr ""
 
 #: src/DataToText.cpp:135
-#, fuzzy
 msgid "Search Result"
-msgstr "Pretrage"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Zavrseno"
 
@@ -1426,7 +1269,7 @@
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr ""
 
@@ -1438,5526 +1281,6148 @@
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Standard sistema"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
 
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabic"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Velicina"
 
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "Estonian"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Transferirano"
 
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Basque"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Brzina"
 
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgarian"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Napredak"
 
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Catalan"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Izvori"
 
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioritet"
 
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Status"
 
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Preostalo vrijeme"
 
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr ""
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Posljednji put vidjen kompletno"
 
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Danish"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Posljedni prijem"
 
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Dutch"
+#: src/DownloadListCtrl.cpp:411
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Da li zaist zelis otkazati i obrisati ove fajlove ?\n"
 
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:413
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Da li zaist zelis otkazati i obrisati ove fajlove ?\n"
 
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estonian"
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
 
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finnish"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Automatski"
 
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "French"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Stop"
 
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr ""
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pauza"
 
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "German"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Nastavak"
 
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr ""
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "O&dstrani zavrsene fajlove"
 
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr ""
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Primijeni sve A4AF ovom fajlu"
 
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Hungarian"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Primijeni sve A4AF ovom fajlu (Automatski)"
 
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italian"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Primijeni sve A4AF nekom drugom fajlu"
 
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Prosirene opcije"
 
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr ""
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Preuvid"
 
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Korean"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Pokazi &detalje fajla"
 
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lithuanian"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Pokazi sve kommentare"
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polish"
-
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portuguese"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr ""
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Russian"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "neodredjeno"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Odredi u kategoriju"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Spanish"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Otvori fajl"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
 msgstr ""
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
 msgstr ""
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
 msgstr ""
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr ""
+#: src/DownloadListCtrl.cpp:1268
+#, c-format
+msgid "Downloads (%i)"
+msgstr "Downloads (%i)"
 
-#: src/Preferences.cpp:1680
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
 
-#: src/Preferences.cpp:1681
-#, c-format
-msgid "Default port will be used (%d)"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Ime servera"
+#: src/DownloadListCtrl.cpp:1461
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Opis"
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "Zahtjev dijeljenih fajlova od '%s'"
 
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
+#: src/DownloadQueue.cpp:132
+#, c-format
+msgid "Loading PartFile %u of %u"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Korisnici"
+#: src/DownloadQueue.cpp:154
+msgid ""
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Fajlovi"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Neuspjesno"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Nisu nadjeni nikakvi poceti fajlovi"
 
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Staticni"
+#: src/DownloadQueue.cpp:168
+#, fuzzy, c-format
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Nadjeno %i pocetih fajlova"
+msgstr[1] "Nadjeno %i pocetih fajlova"
 
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:144
-msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
+#: src/DownloadQueue.cpp:374
+#, c-format
+msgid "Downloading %s"
+msgstr "Downloading %s"
 
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
+#: src/DownloadQueue.cpp:382
+#, c-format
+msgid "You are already trying to download the file '%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:149
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Are you sure you want to delete the static server %s"
+msgid "You already have the file '%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Da"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Ne"
+#: src/DownloadQueue.cpp:399
+#, c-format
+msgid "You are already trying to download the file %s"
+msgstr "Vec pokusavate downloadovati fajl %s"
 
-#: src/ServerListCtrl.cpp:346
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Failed to open '%s'"
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:369
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Servers (%i)"
-msgstr "Serveri (%i)"
+msgid "Unknown protocol of link: %s"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Server"
+#: src/DownloadQueue.cpp:1430
+#, c-format
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
+#: src/ExternalConn.cpp:278
+msgid "External connection closed."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
+#: src/ExternalConn.cpp:317
+msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
+#: src/ExternalConn.cpp:340
+msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
+#: src/ExternalConn.cpp:400
+msgid "New external connection accepted"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Odstrani servera"
+#: src/ExternalConn.cpp:403
+msgid "ERROR: couldn't accept a new external connection"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:440
-#, fuzzy
-msgid "Remove servers"
-msgstr "Odstrani servera"
+#: src/ExternalConn.cpp:421
+msgid "External connection refused due to empty password in preferences!"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Odstrani sve servere"
+#: src/ExternalConn.cpp:430
+#, c-format
+msgid "Connecting client: %s %s"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
+#: src/ExternalConn.cpp:432
+msgid "Unknown version"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
+#: src/ExternalConn.cpp:442
+msgid ""
+"Incorrect EC version ID, there might be binary incompatibility. Use core and "
+"remote from same snapshot."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
+#: src/ExternalConn.cpp:447
+msgid ""
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
+#: src/ExternalConn.cpp:475
+msgid "Invalid protocol version."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:570
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Da li zaist zelis otkazati i obrisati ove fajlove ?\n"
+#: src/ExternalConn.cpp:480
+msgid "Missing protocol version tag."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:572
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Da li zaist zelis otkazati i obrisati ove fajlove ?\n"
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Onemoguceno [%s]"
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr ""
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/amuleDlg.cpp:212
-#, c-format
-msgid "Running on %s"
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr ""
 
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
+#: src/ExternalConn.cpp:521
+msgid "Access granted."
 msgstr ""
 
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
 msgstr ""
 
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
 msgstr ""
 
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
+#: src/ExternalConn.cpp:799
+#, c-format
+msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/ExternalConn.cpp:801
+#, c-format
+msgid "FileHash not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
+msgid "OOPS! OpCode processing error!"
 msgstr ""
 
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
+#: src/ExternalConn.cpp:876
+msgid "Server not added"
 msgstr ""
 
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
+#: src/ExternalConn.cpp:894
+#, c-format
+msgid "server not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
+#: src/ExternalConn.cpp:910
+msgid "need to define server to be removed"
 msgstr ""
 
-#: src/amuleDlg.cpp:469
-msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+#: src/ExternalConn.cpp:924
+msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
+#: src/ExternalConn.cpp:1102
+msgid "Search in progress. Refetch results in a moment!"
 msgstr ""
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/ExternalConn.cpp:1108
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#: src/ExternalConn.cpp:1306
+msgid "No points for graph."
 msgstr ""
 
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
+#: src/ExternalConn.cpp:1315
+msgid "Your client is not configured for this detail level."
 msgstr ""
 
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
+#: src/ExternalConn.cpp:1342
+msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
+#: src/ExternalConn.cpp:1354
+msgid "Already shutting down."
 msgstr ""
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
+#: src/ExternalConn.cpp:1366
+#, c-format
+msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
+#: src/ExternalConn.cpp:1372
+msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/amuleDlg.cpp:696
-#, fuzzy
-msgid "Kad: Connected"
-msgstr "Veza uspostavljena"
+#: src/ExternalConn.cpp:1442
+msgid "File not found."
+msgstr ""
 
-#: src/amuleDlg.cpp:701
-#, fuzzy
-msgid "Kad: Connecting"
-msgstr "Spajanje"
+#: src/ExternalConn.cpp:1447
+msgid "Invalid file name."
+msgstr ""
 
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
+#: src/ExternalConn.cpp:1455
+msgid "Unable to rename file."
 msgstr ""
 
-#: src/amuleDlg.cpp:752
-#, fuzzy
-msgid "Stop the current connection attempts"
-msgstr "Zaustavlja trenutne pokusaje uspostavljanja veze"
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr ""
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Prekinuti vezu"
+#: src/ExternalConn.cpp:1790
+msgid "Already connected to eD2k."
+msgstr ""
 
-#: src/amuleDlg.cpp:758
-#, fuzzy
-msgid "Disconnect from the currently connected networks"
-msgstr "Prekinuti vezu sa sadasnjim serverom"
+#: src/ExternalConn.cpp:1793
+msgid "Connecting to eD2k..."
+msgstr ""
 
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Uspostavi vezu"
+#: src/ExternalConn.cpp:1801
+msgid "Already connected to Kad."
+msgstr ""
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
+#: src/ExternalConn.cpp:1804
+msgid "Connecting to Kad..."
 msgstr ""
 
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Gore: %.1f(%.1f) | Dole: %.1f(%.1f)"
+#: src/ExternalConn.cpp:1811
+msgid "All networks are disabled."
+msgstr ""
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Gore: %.1f | Dole: %.1f"
+#: src/ExternalConn.cpp:1819
+msgid "Disconnected from eD2k."
+msgstr ""
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
+#: src/ExternalConn.cpp:1823
+msgid "Disconnected from Kad."
 msgstr ""
 
-#: src/amuleDlg.cpp:836
+#: src/ExternalConn.cpp:1832
 #, c-format
-msgid "aMule (%s | Disconnected)"
+msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Da li zaista zelite iskljuciti aMule?"
-
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Potvrda izlaza"
+#: src/ExternalConn.cpp:1835
+msgid "Invalid opcode (wrong protocol version?)"
+msgstr ""
 
-#: src/amuleDlg.cpp:1182
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Skin directory '%s' does not exist"
+msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1187
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
+msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Pretrage"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Transferi"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
+#: src/ExternalConnector.cpp:186
+#, c-format
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Poruke"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr ""
 
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
 msgstr ""
 
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistike"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
 
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
+#: src/ExternalConnector.cpp:248
+#, c-format
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
 msgstr ""
 
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
 msgstr ""
 
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
 msgstr ""
 
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
 msgstr ""
 
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
 msgstr ""
 
-#: src/amuleDlg.cpp:1468
-msgid "No network"
+#: src/ExternalConnector.cpp:302
+#, c-format
+msgid "Type '%s' to get more help.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Glavni"
+#: src/ExternalConnector.cpp:357
+#, c-format
+msgid "This is %s %s %s\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Veza"
+#: src/ExternalConnector.cpp:359
+#, c-format
+msgid "This is %s %s\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Direktoriji"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Serveri"
+#: src/ExternalConnector.cpp:414
+#, c-format
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:177
-#, fuzzy
-msgid "Filters"
-msgstr "Fajlovi"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Daljinsko upravljanje"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+#: src/FileDetailDialog.cpp:113
+#, c-format
+msgid "%.1f%% done"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Up: 0.0 | Down: 0.0"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Prijatelji"
 
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Pokazi &Detalje"
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Dodaj prijatelja"
 
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Odstrani prijatelja"
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
-msgstr ""
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Posalji &Poruku"
 
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr ""
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Ugledaj fajlove"
 
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Uspostavi slot zu prijatelja"
+
+#: src/FriendListCtrl.cpp:169
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Da li zaist zelis otkazati i obrisati ove fajlove ?\n"
+
+#: src/FriendListCtrl.cpp:171
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Da li zaist zelis otkazati i obrisati ove fajlove ?\n"
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
+#: src/GenericClientListCtrl.cpp:547
+msgid "Send message to user"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Potrazi videoplejer"
+#: src/GenericClientListCtrl.cpp:548
+msgid "Message to send:"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
+#: src/GenericClientListCtrl.cpp:587
+msgid "Remove from friends"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:950
-#, c-format
-msgid "Executable%s"
+#: src/GenericClientListCtrl.cpp:598
+msgid "Send message"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
+#: src/GenericClientListCtrl.cpp:600
+msgid "Swap to this file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/GenericClientListCtrl.cpp:943
+msgid "A4AF"
 msgstr ""
-"Dodaj ovdje URLs da dobijes server.met fajlove. \n"
-"Samo jedna URL po liniji."
 
-#: src/PrefsUnifiedDlg.cpp:1031
+#: src/GenericClientListCtrl.cpp:995
 #, fuzzy, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Obnovi kasnjenje : 5 sekundi"
-msgstr[1] "Obnovi kasnjenje : 5 sekundi"
+msgid "On Queue: %u (%i)"
+msgstr "U redu cekanja"
 
-#: src/PrefsUnifiedDlg.cpp:1038
-#, fuzzy, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Vrijeme za prosjecni graf: 100 minuta"
-msgstr[1] "Vrijeme za prosjecni graf: 100 minuta"
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
+msgid "Asked for another file"
+msgstr "Upitao za drugi fajl"
 
-#: src/PrefsUnifiedDlg.cpp:1044
-#, c-format
-msgid "Connections Graph Scale: %d"
-msgstr ""
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Uploadovi na cekanju: %i"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/GenericClientListCtrl.cpp:1026
 #, fuzzy, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Obnovi kasnjenje : 5 sekundi"
-msgstr[1] "Obnovi kasnjenje : 5 sekundi"
+msgid "On Queue: %u"
+msgstr "U redu cekanja"
 
-#: src/PrefsUnifiedDlg.cpp:1056
-#, fuzzy, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Velicina fajl buffera %i bytes"
-msgstr[1] "Velicina fajl buffera %i bytes"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Upload"
 
-#: src/PrefsUnifiedDlg.cpp:1062
-#, fuzzy, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Duzina liste cekanja %i klienata"
-msgstr[1] "Duzina liste cekanja %i klienata"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Niko"
 
-#: src/PrefsUnifiedDlg.cpp:1069
-#, fuzzy, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Interval obnavljanja veze servera %i minuta"
-msgstr[1] "Interval obnavljanja veze servera %i minuta"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Ne"
 
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Interval obnavljanja veze servera: onemoguceno"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Da"
 
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr ""
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Downloading..."
 
-#: src/PrefsUnifiedDlg.cpp:1118
+#: src/HTTPDownload.cpp:109
 #, fuzzy
-msgid "disabled"
-msgstr "onemoguci"
+msgid "HTTP download cancelled"
+msgstr "Istinska sirina pojasa downloada"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Execute command on `%s' event"
+msgid "Unable to create destination file %s for download!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
+#: src/HTTPDownload.cpp:233
+#, c-format
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr ""
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
+msgstr "Downloaded:"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
+#: src/HTTPDownload.cpp:279
+#, c-format
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
 
-#: src/ExternalConn.cpp:116
-msgid "External connection closed."
+#: src/HTTPDownload.cpp:336
+msgid ""
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
 
-#: src/ExternalConn.cpp:143
-msgid "External connections disabled due to empty password!"
-msgstr ""
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Nisi povezan sa serverom!"
 
-#: src/ExternalConn.cpp:168
-msgid "External connections disabled in config file"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
 
-#: src/ExternalConn.cpp:217
-msgid "New external connection accepted"
+#: src/IP2Country.cpp:100
+#, c-format
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:220
-msgid "ERROR: couldn't accept a new external connection"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:239
-msgid "External connection refused due to empty password in preferences!"
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
+#, c-format
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:249
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Connecting client: %s %s"
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:251
-msgid "Unknown version"
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
+#, c-format
+msgid "Successfully updated %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:262
-msgid ""
-"Incorrect EC version ID, there might be binary incompatibility. Use core and "
-"remote from same snapshot."
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
 
-#: src/ExternalConn.cpp:267
-msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
-msgstr ""
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Neuspio download serverliste od %s"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr ""
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Neuspjesno citanje kreditnog fajla"
 
-#: src/ExternalConn.cpp:292
-msgid "Invalid protocol version."
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/ExternalConn.cpp:296
-msgid "Missing protocol version tag."
+#: src/IPFilter.cpp:299
+#, c-format
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/IPFilter.cpp:325
+#, c-format
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/ExternalConn.cpp:306
-msgid "Access granted."
-msgstr ""
+#: src/IPFilter.cpp:329
+#, c-format
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:564
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Remote PartFile command failed: FileHash not found: %s"
-msgstr ""
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:566
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "FileHash not found: %s"
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
-msgid "OOPS! OpCode processing error!"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
 
-#: src/ExternalConn.cpp:659
-msgid "Server not added"
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
 msgstr ""
 
-#: src/ExternalConn.cpp:677
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "server not found: %s"
+msgid "Nodes (%u)"
 msgstr ""
 
-#: src/ExternalConn.cpp:693
-msgid "need to define server to be removed"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/ExternalConn.cpp:707
-msgid "eD2k is disabled in preferences."
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/ExternalConn.cpp:803
-msgid "Search in progress. Refetch results in a moment!"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
 msgstr ""
 
-#: src/ExternalConn.cpp:808
-msgid "WebSearch from remote interface makes no sense."
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/ExternalConn.cpp:1020
-msgid "No points for graph."
+#: src/KadDlg.cpp:213
+msgid "Continue?"
 msgstr ""
 
-#: src/ExternalConn.cpp:1029
-msgid "Your client is not configured for this detail level."
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
 msgstr ""
 
-#: src/ExternalConn.cpp:1057
-msgid "External Connection: shutdown requested"
+#: src/kademlia/kademlia/SearchManager.cpp:133
+#, c-format
+msgid "Keyword for search: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1069
-msgid "Already shutting down."
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1077
-#, c-format
-msgid "ExternalConn: adding link '%s'."
+#: src/kademlia/routing/RoutingZone.cpp:172
+msgid ""
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
 
-#: src/ExternalConn.cpp:1083
-msgid "Invalid link or already on list."
-msgstr ""
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
+#, c-format
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:1168
-msgid "File not found."
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/ExternalConn.cpp:1173
-msgid "Invalid file name."
-msgstr ""
+#: src/kademlia/routing/RoutingZone.cpp:307
+#, c-format
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:1181
-msgid "Unable to rename file."
-msgstr ""
+#: src/kademlia/routing/RoutingZone.cpp:338
+#, c-format
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:1405
-msgid "Already connected to eD2k."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
 msgstr ""
 
-#: src/ExternalConn.cpp:1408
-msgid "Connecting to eD2k..."
+#: src/KnownFile.cpp:1545
+msgid "File size"
 msgstr ""
 
-#: src/ExternalConn.cpp:1416
-msgid "Already connected to Kad."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
 msgstr ""
 
-#: src/ExternalConn.cpp:1419
-msgid "Connecting to Kad..."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
 msgstr ""
 
-#: src/ExternalConn.cpp:1424
-msgid "All networks are disabled."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1432
-msgid "Disconnected from eD2k."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:1436
-msgid "Disconnected from Kad."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
 msgstr ""
 
-#: src/ExternalConn.cpp:1444
-#, c-format
-msgid "External Connection: invalid opcode received: %#x"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/ExternalConn.cpp:1447
-msgid "Invalid opcode (wrong protocol version?)"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr ""
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Nepoznat: %i"
 
-#: src/TerminationProcess.cpp:48
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
 #, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
+msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Hashing"
 
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Zavrsavanje"
 
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr ""
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Zavrseno"
 
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Veza uspostavljena"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Pausirano"
 
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Port"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Sa greskom"
 
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Cekanje"
 
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
 msgstr ""
 
-#: src/ServerWnd.cpp:208
-msgid "Running"
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
 msgstr ""
 
-#: src/ServerWnd.cpp:214
-msgid "Status:"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
 msgstr ""
 
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Prekinuta veza"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
 msgstr ""
 
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
 
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr ""
 
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "Parametri za spoljasnju vezu"
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
 msgstr ""
 
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
 msgstr ""
 
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Vrijeme korisnika: %s"
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Zatvori"
 
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Transfer"
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr ""
 
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Uploadovi"
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr ""
 
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
 msgstr ""
 
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Ocisti"
+
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
 msgstr ""
 
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
+
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Bezkrajno"
+
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule izbor u koritu"
+
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
 msgstr ""
 
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
 msgstr ""
 
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Server Overhead (Packets): %s"
+msgid "UL: %u"
 msgstr ""
 
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
 msgstr ""
 
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "Crypt overhead (UDP): %s"
+msgid "DL: %u"
 msgstr ""
 
-#: src/Statistics.cpp:662
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "Active Uploads: %s"
+msgid "Download speed: %.1f"
 msgstr ""
 
-#: src/Statistics.cpp:663
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "Waiting Uploads: %s"
+msgid "Upload speed: %.1f"
 msgstr ""
 
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
 msgstr ""
 
-#: src/Statistics.cpp:665
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Total failed upload sessions: %s"
+msgid "Nickname: %s"
 msgstr ""
 
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Prosjecno vrijeme uploada: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr ""
 
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Downloads"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "KlientID: "
 
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
 msgstr ""
 
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr ""
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Ime servera:"
 
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr ""
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "ServerIP: "
+
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Veza nije uspostavljena"
 
-#: src/Statistics.cpp:686
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Session UL:DL Ratio (Total): %s"
+msgid "IP: %s"
 msgstr ""
 
-#: src/Statistics.cpp:689
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Average download rate (Session): %s"
+msgid "TCP port: %d"
 msgstr ""
 
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/Statistics.cpp:691
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Max download rate (Session): %s"
+msgid "UDP port: %d"
 msgstr ""
 
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Ponovno vezan: %i"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Online potpis: Omogucen"
 
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Vriejme od prvog transfera: %s"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Online potpis: Onemogucen"
 
-#: src/Statistics.cpp:695
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Spojen sa serverom vec: %s"
+msgid "Uptime: %s"
+msgstr "Vrijeme korisnika: %s"
 
-#: src/Statistics.cpp:696
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Active Connections (estimate): %i"
+msgid "Shared files: %d"
 msgstr ""
 
-#: src/Statistics.cpp:697
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "Max Connection Limit Reached: %s"
+msgid "Queued clients: %d"
 msgstr ""
 
-#: src/Statistics.cpp:698
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Average Connections (estimate): %g"
+msgid "Total DL: %s"
 msgstr ""
 
-#: src/Statistics.cpp:700
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Peak Connections (estimate): %i"
+msgid "Total UL: %s"
 msgstr ""
 
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Klienti"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
 msgstr ""
 
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
 msgstr ""
 
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
 msgstr ""
 
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
 msgstr ""
 
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr ""
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Izlaz"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
+#: src/muuli_wdr.cpp:75
+msgid "eD2k Link: "
 msgstr ""
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr ""
+#: src/muuli_wdr.cpp:82
+msgid "Commit"
+msgstr "Izvrsi"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
+#: src/muuli_wdr.cpp:83
+msgid ""
+"Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
+#: src/muuli_wdr.cpp:91
+msgid ""
+"Events are displayed here. For a complete list of events, refer to the log "
+"in the Servers-tab."
 msgstr ""
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr ""
+#: src/muuli_wdr.cpp:94
+msgid "Loading ..."
+msgstr "Ucitava..."
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr ""
+#: src/muuli_wdr.cpp:102
+msgid "Number of users on the server you are connected to ..."
+msgstr "Broj korisnika na serveru sa kojim si spojen..."
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Zauzetost servera: %.2f%%"
+#: src/muuli_wdr.cpp:105
+msgid "Users: 0"
+msgstr "Korisnika: 0"
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
+#: src/muuli_wdr.cpp:106
+msgid ""
+"Users connected to the current server and an estimate of the total number of "
+"users."
 msgstr ""
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Ukupna velicina dijeljenih fajlova: %s"
+#: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Up: 0.0 | Down: 0.0"
 
-#: src/Statistics.cpp:731
-#, c-format
-msgid "Average file size: %s"
+#: src/muuli_wdr.cpp:118
+msgid ""
+"Current average upload and download rates. If enabled the numbers in the "
+"braces signify the overhead from client communication."
 msgstr ""
 
-#: src/Statistics.cpp:872
-msgid "Operating System"
+#: src/muuli_wdr.cpp:126
+msgid ""
+"Displays the connected status and active transfers. Red arrows signifies "
+"that you are currently not connected, yellow arrows signify that you have "
+"low ID (firewalled) and green arrows signify that you have high ID (The "
+"optimal connection type)."
 msgstr ""
 
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr ""
+#: src/muuli_wdr.cpp:130
+msgid "Not Connected ..."
+msgstr "Ne povezan..."
 
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
+#: src/muuli_wdr.cpp:131
+msgid "Currently connected server."
 msgstr ""
 
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr ""
+#: src/muuli_wdr.cpp:177
+msgid "Search"
+msgstr "Pretraga"
 
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
+#: src/muuli_wdr.cpp:183
+msgid "Name:"
 msgstr ""
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr ""
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tip"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
+msgid "Local"
 msgstr ""
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
+#: src/muuli_wdr.cpp:197
+msgid "Global"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
+#: src/muuli_wdr.cpp:199
+msgid "FileHash"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
+#: src/muuli_wdr.cpp:207
+msgid "Extended Parameters"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#: src/muuli_wdr.cpp:213
+msgid "Filtering"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+#: src/muuli_wdr.cpp:224
+msgid "File Type"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Bilo koja"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr ""
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Arhiva"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Audio"
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD_Imidz"
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Korisnik %s (%u) dijeli direktorije %s"
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Slike"
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programi"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "Korisnik %s (%u) je poslao listu dijeljenih fajlova za direktorij %s"
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Videa"
 
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Korisnik %s (%u) ja zavrsio slanje liste dijeljenih fajlova"
+#: src/muuli_wdr.cpp:254
+msgid "Extension"
+msgstr "Ekstenzija"
 
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Korisnik %s (%u) ja zavrsio slanje nezeljene liste dijeljenih fajlova"
+#: src/muuli_wdr.cpp:260
+msgid "Min Size"
+msgstr "Minimalna velicina"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr ""
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+msgid "Bytes"
+msgstr "Bytes"
 
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr ""
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
+msgid "KB"
+msgstr "KB"
 
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
+msgid "Max Size"
+msgstr "Maksimalna velicina"
+
+#: src/muuli_wdr.cpp:306
+msgid "Availability"
 msgstr ""
 
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
+#: src/muuli_wdr.cpp:319
+msgid "Filter:"
 msgstr ""
 
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
+#: src/muuli_wdr.cpp:328
+msgid "Filter Results"
 msgstr ""
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
+#: src/muuli_wdr.cpp:334
+msgid "Invert Result"
 msgstr ""
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+#: src/muuli_wdr.cpp:340
+msgid "Hide Known Files"
 msgstr ""
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Start"
+
+#: src/muuli_wdr.cpp:356
+msgid "More"
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
+#: src/muuli_wdr.cpp:357
+msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
+#: src/muuli_wdr.cpp:364
+msgid "Stop"
 msgstr ""
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Dodaj prijatelja"
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Download"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Ukucaj vazecu IP adresu i port!"
+#: src/muuli_wdr.cpp:378
+msgid "Reset Fields"
+msgstr ""
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
+#: src/muuli_wdr.cpp:393
+msgid "Results"
 msgstr ""
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
+#: src/muuli_wdr.cpp:422
+msgid "Clears completed downloads"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Izvori"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Nadjeni izvori :"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Fajl"
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Glavni"
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Download"
+#: src/muuli_wdr.cpp:525
+msgid "Full Name :"
+msgstr "Puno ime :"
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategorija"
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
+msgid "N/A"
+msgstr "N/A"
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr ""
+#: src/muuli_wdr.cpp:536
+msgid "met-File :"
+msgstr "met-fajl :"
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr ""
+#: src/muuli_wdr.cpp:547
+msgid "Hash :"
+msgstr "Hash :"
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr ""
+#: src/muuli_wdr.cpp:562
+msgid "Filesize :"
+msgstr "Velicina fajla :"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr ""
+#: src/muuli_wdr.cpp:573
+msgid "Partfilestatus :"
+msgstr "Status pocetog fajla :"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr ""
+#: src/muuli_wdr.cpp:584
+msgid "Last seen complete :"
+msgstr "Posljednji put vidjen kompletno :"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr ""
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Transfer"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr ""
+#: src/muuli_wdr.cpp:606
+msgid "Found Sources :"
+msgstr "Nadjeni izvori :"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
+#: src/muuli_wdr.cpp:617
+msgid "Transferring Sources :"
+msgstr "Izvori koji transferuju :"
+
+#: src/muuli_wdr.cpp:628
+msgid "Filepart-Count :"
+msgstr "Broj pocetog fajla :"
+
+#: src/muuli_wdr.cpp:639
+msgid "Available :"
+msgstr "Dostupnost :"
+
+#: src/muuli_wdr.cpp:650
+msgid "Datarate :"
+msgstr "Podatak rate :"
+
+#: src/muuli_wdr.cpp:661
+msgid "Download Active Time: "
 msgstr ""
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/muuli_wdr.cpp:672
+msgid "Transferred :"
+msgstr "Prenijeto :"
+
+#: src/muuli_wdr.cpp:683
+msgid "Completed Size :"
+msgstr "Zavrsna velicina :"
+
+#: src/muuli_wdr.cpp:710
+msgid "Intelligent Corruption Handling"
+msgstr "Rukovanje inteligentne korupcije (I.C.H.)"
+
+#: src/muuli_wdr.cpp:719
+msgid "Lost to corruption :"
+msgstr "Izgubljeno zbog korupcije :"
+
+#: src/muuli_wdr.cpp:730
+msgid "Gained by compression :"
+msgstr "Steceno kompresijom :"
+
+#: src/muuli_wdr.cpp:741
+msgid "Packages saved by I.C.H. :"
+msgstr "Paketi spaseni kroz I.C.H. :"
+
+#: src/muuli_wdr.cpp:754
+msgid "File Names"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#: src/muuli_wdr.cpp:763
+msgid "Takeover"
+msgstr "Preuzimanje"
+
+#: src/muuli_wdr.cpp:773
+msgid "Cleanup"
+msgstr "Ciscenje"
+
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
+msgid "Apply"
+msgstr "Primijeni"
+
+#: src/muuli_wdr.cpp:798
+msgid "Ok"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
+#: src/muuli_wdr.cpp:823
+msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
+#: src/muuli_wdr.cpp:829
+msgid ""
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Transferirano"
+#: src/muuli_wdr.cpp:841
+msgid "File Quality"
+msgstr "Kvalitet fajla"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Brzina"
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Bez ocjene"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Napredak"
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Neispravan / Koruptan / Falsifikat"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Status"
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Los"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Preostalo vrijeme"
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Vrlo dobar"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Posljednji put vidjen kompletno"
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Dobar"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Posljedni prijem"
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Odlican"
 
-#: src/DownloadListCtrl.cpp:581
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Da li zaist zelis otkazati i obrisati ove fajlove ?\n"
+#: src/muuli_wdr.cpp:854
+msgid "Choose the file rating or advice users if the file is invalid ..."
+msgstr "Izaberi ocjenu fajla ili savjet korisnika ako je fajl neispravan ..."
 
-#: src/DownloadListCtrl.cpp:583
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Da li zaist zelis otkazati i obrisati ove fajlove ?\n"
+#: src/muuli_wdr.cpp:898
+msgid "Refresh"
+msgstr "Obnovi"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
-msgid "Send message to user"
-msgstr ""
+#: src/muuli_wdr.cpp:925
+msgid "Downloading, please wait ..."
+msgstr "Downoading, molim strpljenje ..."
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
-msgid "Message to send:"
+#: src/muuli_wdr.cpp:931
+msgid "Unknown size"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Stop"
+#: src/muuli_wdr.cpp:955
+msgid "Required Information"
+msgstr "Trazene informacije"
 
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pauza"
+#: src/muuli_wdr.cpp:960
+msgid "IP Address :"
+msgstr "IP adresa:"
 
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Nastavak"
+#: src/muuli_wdr.cpp:966
+msgid "Port :"
+msgstr "Port :"
 
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "O&dstrani zavrsene fajlove"
+#: src/muuli_wdr.cpp:976
+msgid "Additional Information"
+msgstr "Dodatne informacije"
 
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Primijeni sve A4AF ovom fajlu"
+#: src/muuli_wdr.cpp:981
+msgid "Username :"
+msgstr "Ime korisnika :"
 
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Primijeni sve A4AF ovom fajlu (Automatski)"
+#: src/muuli_wdr.cpp:987
+msgid "Userhash :"
+msgstr "Hash korisnika :"
 
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Primijeni sve A4AF nekom drugom fajlu"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Dodaj"
 
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Prosirene opcije"
+#: src/muuli_wdr.cpp:1046
+msgid "Download-Speed"
+msgstr "Brzina downloada"
 
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Preuvid"
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
+msgid "Current"
+msgstr "Trenutno"
 
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Pokazi &detalje fajla"
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
+msgid "Running average"
+msgstr "Prosjek rada"
 
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Pokazi sve kommentare"
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
+msgid "Session average"
+msgstr "Prosjek misije"
 
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
+#: src/muuli_wdr.cpp:1095
+msgid "Upload-Speed"
+msgstr "Brzina uploada"
+
+#: src/muuli_wdr.cpp:1144
+msgid "Connections"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "neodredjeno"
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
+msgid "Active downloads"
+msgstr "Aktivni downloadovi"
 
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Odredi u kategoriju"
+#: src/muuli_wdr.cpp:1173
+msgid "Active connections (1:1)"
+msgstr "Aktivne veze (1:1)"
 
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Otvori fajl"
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
+msgid "Active uploads"
+msgstr "Aktivni uploadovi"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Remove from friends"
-msgstr ""
+#: src/muuli_wdr.cpp:1193
+msgid "Statistics Tree"
+msgstr "Drvo statistike"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Primi u prijatelje"
+#: src/muuli_wdr.cpp:1223
+msgid "Username:"
+msgstr "Ime korisnika:"
 
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
-msgid "Send message"
+#: src/muuli_wdr.cpp:1226
+msgid "Userhash:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1017
-msgid "Swap to this file"
+#: src/muuli_wdr.cpp:1249
+msgid "Client software:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
+#: src/muuli_wdr.cpp:1258
+msgid "Client version:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1657
-msgid "A4AF"
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
+msgid "IP address:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/muuli_wdr.cpp:1274
+msgid "User ID:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:1721
-msgid "Asked for another file"
-msgstr "Upitao za drugi fajl"
-
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Downloads (%i)"
+#: src/muuli_wdr.cpp:1281
+msgid "Server IP:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
+#: src/muuli_wdr.cpp:1290
+msgid "Server name:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
+#: src/muuli_wdr.cpp:1297
+msgid "Obfuscation:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+#: src/muuli_wdr.cpp:1306
+msgid "Kad:"
 msgstr ""
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "GRESKA: neuspjesno stvaranje zapocetog fajla)"
+#: src/muuli_wdr.cpp:1317
+msgid "Transfers to client"
+msgstr ""
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
+#: src/muuli_wdr.cpp:1322
+msgid "Current request:"
 msgstr ""
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
+#: src/muuli_wdr.cpp:1335
+msgid "Average upload rate:"
 msgstr ""
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
+#: src/muuli_wdr.cpp:1344
+msgid "Average download rate:"
 msgstr ""
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#: src/muuli_wdr.cpp:1351
+msgid "Uploaded (session):"
 msgstr ""
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/muuli_wdr.cpp:1360
+msgid "Downloaded (session):"
 msgstr ""
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
+#: src/muuli_wdr.cpp:1367
+msgid "Uploaded (total):"
 msgstr ""
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/muuli_wdr.cpp:1376
+msgid "Downloaded (total):"
 msgstr ""
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
+#: src/muuli_wdr.cpp:1387
+msgid "Scores"
+msgstr "Rezultati"
+
+#: src/muuli_wdr.cpp:1394
+msgid "DL/UP modifier:"
 msgstr ""
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
+#: src/muuli_wdr.cpp:1403
+msgid "Secure ident:"
 msgstr ""
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Neuspjelo otvaranje %s (%s)"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "Pun red cekanja"
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
+#: src/muuli_wdr.cpp:1419
+msgid "Queue score:"
 msgstr ""
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr ""
+#: src/muuli_wdr.cpp:1448
+msgid "Nick"
+msgstr "Nadimak"
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
 msgstr ""
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
+#: src/muuli_wdr.cpp:1452
+msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Neuspjesno spasavanje part.met.seeds fajla za %s"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr ""
 
-#: src/PartFile.cpp:1024
-#, fuzzy, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Spaseni %i seeds izvora za poceti fajl: %s (%s)"
-msgstr[1] "Spaseni %i seeds izvora za poceti fajl: %s (%s)"
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr ""
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Poceti fajl %s (%s) nema seesd fajlova"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
+msgstr ""
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
+#: src/muuli_wdr.cpp:1471
+msgid "Check for new version at startup"
 msgstr ""
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
+#: src/muuli_wdr.cpp:1472
+msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, fuzzy, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Nadjen koruptan dio (%i) u %i pocetom fajlu %s - FileResultHash |%s| "
-"FileHash |%s|"
-msgstr[1] ""
-"Nadjen koruptan dio (%i) u %i pocetom fajlu %s - FileResultHash |%s| "
-"FileHash |%s|"
+#: src/muuli_wdr.cpp:1475
+msgid "Start minimized"
+msgstr "Pocni minimiran"
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
+#: src/muuli_wdr.cpp:1476
+msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Zavrseno rehashing %s"
+#: src/muuli_wdr.cpp:1479
+msgid "Prompt on exit"
+msgstr "Pitanje pri napustanju"
 
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
+#: src/muuli_wdr.cpp:1487
+msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/muuli_wdr.cpp:1488
+msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+#: src/muuli_wdr.cpp:1491
+msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+#: src/muuli_wdr.cpp:1492
+msgid ""
+"Enabling this will make aMule minimize to the System Tray, rather than the "
+"taskbar."
 msgstr ""
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
 msgstr ""
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
+#: src/muuli_wdr.cpp:1511
+msgid "Browser Selection"
 msgstr ""
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
+#: src/muuli_wdr.cpp:1517
+msgid ""
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Stopirano"
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Pretrazi :"
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/muuli_wdr.cpp:1525
+msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
+#: src/muuli_wdr.cpp:1527
+msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr ""
+#: src/muuli_wdr.cpp:1532
+msgid "Video Player"
+msgstr "Video Plejer"
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr ""
 
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
+#: src/muuli_wdr.cpp:1579
+msgid "Upload"
+msgstr "Upload"
+
+#: src/muuli_wdr.cpp:1588
+msgid "Slot Allocation"
+msgstr "Alokacija slota"
+
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
 msgstr ""
 
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
 msgstr ""
 
-#: src/SharedFileList.cpp:352
-#, fuzzy, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Pronadjeno %i poznatih dijeljenih fajlova"
-msgstr[1] "Pronadjeno %i poznatih dijeljenih fajlova"
+#: src/muuli_wdr.cpp:1611
+msgid "This is the standard eD2k port and cannot be disabled."
+msgstr ""
 
-#: src/SharedFileList.cpp:358
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Pronadjeno %i poznatih dijeljenih fajlova, %i nepoznatih"
-msgstr[1] "Pronadjeno %i poznatih dijeljenih fajlova, %i nepoznatih"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr ""
 
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Komentari fajla"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
 
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Ocjena"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr ""
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Bez komentara"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr ""
 
-#: src/CommentDialogLst.cpp:104
-#, fuzzy, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "Bez komentara"
-msgstr[1] "Bez komentara"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr ""
 
-#: src/ServerConnect.cpp:69
+#: src/muuli_wdr.cpp:1649
 msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
 msgstr ""
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Neuspjesno spajanje sa svim serverima u list. Pocinje iznova."
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr ""
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+#: src/muuli_wdr.cpp:1676
+msgid "Kademlia"
 msgstr ""
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Spojen sa %s (%s:%i)"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr ""
 
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Uspostavljena veza sa: %s"
+#: src/muuli_wdr.cpp:1689
+msgid "Autoconnect on startup"
+msgstr "Autospajanje pri startu"
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr ""
-"Fatalna greska prilikom pokusaja spajanja. Veza interneta je moguce prekinuta"
+#: src/muuli_wdr.cpp:1692
+msgid "Reconnect on loss"
+msgstr "Ponovni spoj kod gubitka veze"
 
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Izgubljena veza sa %s (%s:%i)"
+#: src/muuli_wdr.cpp:1716
+msgid "Remove dead server after"
+msgstr "Otstrani mrtve servere nakon"
 
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) je mrtav"
+#: src/muuli_wdr.cpp:1722
+msgid "retries"
+msgstr "pokusaja"
 
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
+#: src/muuli_wdr.cpp:1729
+msgid "Auto-update server list at startup"
 msgstr ""
 
-#: src/ServerConnect.cpp:381
-#, fuzzy, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Automatsko spajanje sa serverom ce ponovo poceti za %d sekundi"
-msgstr[1] "Automatsko spajanje sa serverom ce ponovo poceti za %d sekundi"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Izgubljena veza"
+#: src/muuli_wdr.cpp:1732
+msgid "List"
+msgstr "Lista"
 
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
+#: src/muuli_wdr.cpp:1737
+msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
+#: src/muuli_wdr.cpp:1740
+msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr ""
+#: src/muuli_wdr.cpp:1743
+msgid "Use priority system"
+msgstr "Koristi sistem prioriteta"
 
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
+#: src/muuli_wdr.cpp:1747
+msgid "Use smart LowID check on connect"
+msgstr "Koristi pametnu LowID provjeru pri vezanju"
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Nisu nadjeni nikakvi poceti fajlovi"
+#: src/muuli_wdr.cpp:1751
+msgid "Safe connect"
+msgstr "Sigurno povezivanje"
 
-#: src/DownloadQueue.cpp:171
-#, fuzzy, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Nadjeno %i pocetih fajlova"
-msgstr[1] "Nadjeno %i pocetih fajlova"
+#: src/muuli_wdr.cpp:1755
+msgid "Autoconnect to servers in static list only"
+msgstr "Autopovezivanje samo sa serverima iz staticne liste"
 
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
+#: src/muuli_wdr.cpp:1758
+msgid "Set manually added servers to High Priority"
+msgstr "Postavi rucno dodate servere na visoki prioritet"
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
 msgstr ""
 
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Downloading %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
 msgstr ""
 
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
 msgstr ""
 
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Vec pokusavate downloadovati fajl %s"
+#: src/muuli_wdr.cpp:1791
+msgid "Add files to download in pause mode"
+msgstr "Dodaj nove fajlove u stanju pauze"
 
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
+#: src/muuli_wdr.cpp:1794
+msgid "Add files to download with auto priority"
+msgstr "Dodaj nove fajlove sa auto prioritetom"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
+#: src/muuli_wdr.cpp:1797
+msgid "Try to download first and last chunks first"
+msgstr "Pokusaj prvo downloadovati pocetni i zavrsni chunk "
+
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
+#: src/muuli_wdr.cpp:1805
+msgid "From the same category"
 msgstr ""
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
 msgstr ""
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/TextClient.cpp:309
+#: src/muuli_wdr.cpp:1812
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
 msgstr ""
 
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
 msgstr ""
 
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr ""
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Uploadovi"
 
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr ""
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Dodaj nove dijeljene fajlove sa auto prioritetom"
 
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
 
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
+#: src/muuli_wdr.cpp:1884
+msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
+#: src/muuli_wdr.cpp:1891
+msgid "Share hidden files"
 msgstr ""
 
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr ""
+#: src/muuli_wdr.cpp:1911
+msgid "Graphs"
+msgstr "Grafovi"
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
+msgid "Update delay : 5 secs"
+msgstr "Obnovi kasnjenje : 5 sekundi"
+
+#: src/muuli_wdr.cpp:1920
+msgid "Time for average graph: 100 mins"
+msgstr "Vrijeme za prosjecni graf: 100 minuta"
+
+#: src/muuli_wdr.cpp:1926
+msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
 msgstr ""
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
 msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
 msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
+#: src/muuli_wdr.cpp:1963
+msgid "Background"
+msgstr "Pozadina"
+
+#: src/muuli_wdr.cpp:1964
+msgid "Grid"
+msgstr "Mreza"
+
+#: src/muuli_wdr.cpp:1965
+msgid "Download current"
+msgstr "Trenutni download"
+
+#: src/muuli_wdr.cpp:1966
+msgid "Download running average"
+msgstr "Prosjek tekuceg downloada"
+
+#: src/muuli_wdr.cpp:1967
+msgid "Download session average"
+msgstr "Prosjek downloada misije"
+
+#: src/muuli_wdr.cpp:1968
+msgid "Upload current"
+msgstr "Trenutni upload"
+
+#: src/muuli_wdr.cpp:1969
+msgid "Upload running average"
+msgstr "Prosjek tekuceg uploada"
+
+#: src/muuli_wdr.cpp:1970
+msgid "Upload session average"
+msgstr "Prosjek uploada misije"
+
+#: src/muuli_wdr.cpp:1971
+msgid "Active connections"
+msgstr "Aktivne veze"
+
+#: src/muuli_wdr.cpp:1974
+msgid "Systray Icon Speedbar"
+msgstr "poluga brzine prikazana u sistemskom koritu"
+
+#: src/muuli_wdr.cpp:1975
+msgid "Kad-nodes current"
 msgstr ""
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
+#: src/muuli_wdr.cpp:1976
+msgid "Kad-nodes running"
 msgstr ""
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
+#: src/muuli_wdr.cpp:1977
+msgid "Kad-nodes session"
 msgstr ""
 
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
+msgid "Select"
+msgstr "Izaberi"
+
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
 msgstr ""
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/muuli_wdr.cpp:2000
+msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+#: src/muuli_wdr.cpp:2028
+msgid "!!! WARNING !!!"
+msgstr "!!! UPOZORENJE !!!"
+
+#: src/muuli_wdr.cpp:2042
+msgid "Max new connections / 5 secs"
+msgstr "Maksimalne veze u / 5 sekundi"
+
+#: src/muuli_wdr.cpp:2048
+msgid "File Buffer Size: 240000 bytes"
+msgstr "Fajl Buffer velicina: 240000 bytes"
+
+#: src/muuli_wdr.cpp:2054
+msgid "Upload Queue Size: 5000 clients"
+msgstr "Duzina reda cekanja: 5000 klienta"
+
+#: src/muuli_wdr.cpp:2060
+msgid "Server connection refresh interval: Disable"
+msgstr "Interval obnavljanja veze servera: onemoguceno"
+
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
 msgstr ""
 
-#: src/TextClient.cpp:809
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/TextClient.cpp:828
-#, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Pokazi transfer rate u naslovu"
+
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Pokazi transfer rate u naslovu"
+
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
 msgstr ""
 
-#: src/TextClient.cpp:841
-msgid "Show short status information."
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
 msgstr ""
 
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
 msgstr ""
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
 msgstr ""
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
 msgstr ""
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
 msgstr ""
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Pljosnata"
+
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Obla"
+
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
 msgstr ""
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
 msgstr ""
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "Parametri za spoljasnju vezu"
+
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "Prihvati spoljasnje veze"
+
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/TextClient.cpp:855
+#: src/muuli_wdr.cpp:2190
 msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
 msgstr ""
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
 msgstr ""
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
 msgstr ""
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
 msgstr ""
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
 msgstr ""
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
 msgstr ""
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr ""
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Sifra za puna prava"
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
-msgstr ""
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Odobri korisnicima sa manje prava"
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr ""
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Sifra za manje prava"
 
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr ""
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Vrijeme obnove stranice (u sekundama)"
 
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr ""
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Odobri Gzip kompresiju"
 
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr ""
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
 
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
+#: src/muuli_wdr.cpp:2326
+msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
+#: src/muuli_wdr.cpp:2330
+msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr ""
+#: src/muuli_wdr.cpp:2354
+msgid "Title :"
+msgstr "Naziv :"
 
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
+#: src/muuli_wdr.cpp:2364
+msgid "Comment :"
+msgstr "Komentar:"
+
+#: src/muuli_wdr.cpp:2374
+msgid "Incoming Dir :"
+msgstr "Prijemni direktorij :"
+
+#: src/muuli_wdr.cpp:2387
+msgid "Change priority for new assigned files :"
+msgstr "Promijeni prioritet za nove fajlove :"
+
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
+msgstr "Ne mijenjaj"
+
+#: src/muuli_wdr.cpp:2406
+msgid "Select color for this Category (currently selected) :"
+msgstr "Izaberi boju za ovu kategoriju (trenutno izabrana) :"
+
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Ponistenje"
+
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
+msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
+#: src/muuli_wdr.cpp:2528
+msgid "Click on this button to update the servers list from URL ..."
+msgstr "Klikni ovdje da obnovis listu servera sa URL ..."
+
+#: src/muuli_wdr.cpp:2532
+msgid "Server list"
 msgstr ""
 
-#: src/TextClient.cpp:880
+#: src/muuli_wdr.cpp:2537
 msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+"Enter the url to a server.met file here and press the button to the left to "
+"update the list of known servers."
 msgstr ""
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
+#: src/muuli_wdr.cpp:2544
+msgid "Add server manually: Name"
 msgstr ""
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
+#: src/muuli_wdr.cpp:2548
+msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr ""
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Port"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
+#: src/muuli_wdr.cpp:2555
+msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
+#: src/muuli_wdr.cpp:2562
+msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr ""
+#: src/muuli_wdr.cpp:2566
+msgid "Add manually a server (fill fields to the left before) ..."
+msgstr "Dodaj servera rucno (prije ispuni polja lijevo) ..."
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr ""
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule Log"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr ""
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Lista servera"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
+#: src/muuli_wdr.cpp:2612
+msgid "ED2K Info"
 msgstr ""
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
+#: src/muuli_wdr.cpp:2616
+msgid "Kad Info"
 msgstr ""
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
+#: src/muuli_wdr.cpp:2645
+msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
+#: src/muuli_wdr.cpp:2649
+msgid "Nodes (0)"
 msgstr ""
 
-#: src/TextClient.cpp:901
+#: src/muuli_wdr.cpp:2654
 msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+"Enter the url to a nodes.dat file here and press the button to the left to "
+"update the list of known nodes."
 msgstr ""
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
+#: src/muuli_wdr.cpp:2659
+msgid "Nodes stats"
 msgstr ""
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
+#: src/muuli_wdr.cpp:2710
+msgid "Bootstrap"
 msgstr ""
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
+#: src/muuli_wdr.cpp:2713
+msgid "New node"
 msgstr ""
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
+#: src/muuli_wdr.cpp:2718
+msgid "IP:"
 msgstr ""
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
+#: src/muuli_wdr.cpp:2747
+msgid "Port:"
 msgstr ""
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
 msgstr ""
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
+#: src/muuli_wdr.cpp:2768
+msgid "Disconnect Kad"
 msgstr ""
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/TextClient.cpp:913
+#: src/muuli_wdr.cpp:2808
 msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
 msgstr ""
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
+#: src/muuli_wdr.cpp:2811
+msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
+#: src/muuli_wdr.cpp:2814
+msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
+#: src/muuli_wdr.cpp:2816
+msgid ""
+"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
+"connections from other clients."
 msgstr ""
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
+#: src/muuli_wdr.cpp:2819
+msgid "Use obfuscation for outgoing connections"
 msgstr ""
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+#: src/muuli_wdr.cpp:2821
+msgid ""
+"This option makes aMule use Protocol Obfuscation when connecting other "
+"clients/servers."
 msgstr ""
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
+#: src/muuli_wdr.cpp:2824
+msgid "Accept only obfuscated connections"
 msgstr ""
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
+#: src/muuli_wdr.cpp:2825
+msgid ""
+"This option makes aMule only accept obfuscated connections. You will have "
+"less sources, but all your traffic will be obfuscated"
 msgstr ""
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr ""
+#: src/muuli_wdr.cpp:2832
+msgid "Everybody"
+msgstr "Svi"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
+#: src/muuli_wdr.cpp:2834
+msgid "No one"
 msgstr ""
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
 msgstr ""
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
+#: src/muuli_wdr.cpp:2837
+msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
+#: src/muuli_wdr.cpp:2840
+msgid "IP-Filtering"
 msgstr ""
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
+#: src/muuli_wdr.cpp:2847
+msgid "Filter clients"
 msgstr ""
 
-#: src/TextClient.cpp:940
-msgid "Show log."
+#: src/muuli_wdr.cpp:2849
+msgid ""
+"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
+#: src/muuli_wdr.cpp:2852
+msgid "Filter servers"
 msgstr ""
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
+#: src/muuli_wdr.cpp:2854
+msgid ""
+"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Deprecated command, use '%s' instead."
+#: src/muuli_wdr.cpp:2861
+msgid "Reload List"
 msgstr ""
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
+#: src/muuli_wdr.cpp:2862
+msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/ServerSocket.cpp:259
-#, c-format
-msgid "ERROR: %s (%s) - %s"
+#: src/muuli_wdr.cpp:2870
+msgid "URL:"
 msgstr ""
 
-#: src/ServerSocket.cpp:274
-#, c-format
-msgid "WARNING: %s (%s) - %s"
+#: src/muuli_wdr.cpp:2876
+msgid "Update now"
 msgstr ""
 
-#: src/ServerSocket.cpp:417
-#, c-format
-msgid "New clientid is %u"
-msgstr "Novi klientID je %u"
+#: src/muuli_wdr.cpp:2881
+msgid "Auto-update ipfilter at startup"
+msgstr ""
 
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
+#: src/muuli_wdr.cpp:2886
+msgid "Filtering Level:"
 msgstr ""
 
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
+#: src/muuli_wdr.cpp:2896
+msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
+#: src/muuli_wdr.cpp:2900
+msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
+#: src/muuli_wdr.cpp:2902
+msgid ""
+"Rejects packet if the client ip is different from the ip where the packet is "
+"received from. Use with caution."
 msgstr ""
 
-#: src/ServerSocket.cpp:539
-#, fuzzy, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Primljeno %d novih servera"
-msgstr[1] "Primljeno %d novih servera"
+#: src/muuli_wdr.cpp:2905
+msgid "Use system-wide ipfilter.dat if available"
+msgstr ""
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
+#: src/muuli_wdr.cpp:2906
+msgid ""
+"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
+"file."
 msgstr ""
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Server je odbio posljednju komandu"
+#: src/muuli_wdr.cpp:2925
+msgid "Enable Online-Signature"
+msgstr "Omoguci online potpis"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
+#: src/muuli_wdr.cpp:2927
+msgid ""
+"Enables the writing of the OS file, which can be used by external apps to "
+"create signatures and the like."
 msgstr ""
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
+#: src/muuli_wdr.cpp:2932
+msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
+#: src/muuli_wdr.cpp:2936
+msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
 msgstr ""
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
+#: src/muuli_wdr.cpp:2952
+msgid ""
+"Click here to select the directory containing the the Online Signature files."
 msgstr ""
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
+#: src/muuli_wdr.cpp:2974
+msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/ServerSocket.cpp:760
-#, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
+#: src/muuli_wdr.cpp:2977
+msgid "Filter all messages"
 msgstr ""
 
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#: src/muuli_wdr.cpp:2980
+msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/IP2Country.cpp:105
-#, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
+#: src/muuli_wdr.cpp:2983
+msgid "Filter messages from unknown clients"
 msgstr ""
-"Da li zaista zelite da ponistite i obrisete sve fajlove u ovoj kategoriji?"
 
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Potrebna potvrda"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
+#: src/muuli_wdr.cpp:2986
+msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Nedovrseno"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
+msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Video"
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
 
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Audio"
+#: src/muuli_wdr.cpp:2998
+msgid "Comments"
+msgstr ""
 
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Arhiva"
+#: src/muuli_wdr.cpp:3001
+msgid "Filter comments containing (use ',' as separator):"
+msgstr ""
 
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD_Imidz"
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr ""
 
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Slike"
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr ""
 
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Tekst"
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr ""
 
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Izaberi filter za gledanje"
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr ""
 
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Dodaj kategoriju"
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr ""
 
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Editiraj kategoriju"
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr ""
 
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Odstrani kategoriju"
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr ""
 
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
+#: src/muuli_wdr.cpp:3050
+msgid "Enable Proxy"
 msgstr ""
 
-#: src/KnownFile.cpp:1360
-msgid "File size"
+#: src/muuli_wdr.cpp:3051
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
+#: src/muuli_wdr.cpp:3056
+msgid "Proxy type:"
 msgstr ""
 
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
+#: src/muuli_wdr.cpp:3069
+msgid "Proxy host:"
 msgstr ""
 
-#: src/KnownFile.cpp:1363
-msgid "Requested"
+#: src/muuli_wdr.cpp:3073
+msgid "The proxy host name"
 msgstr ""
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
+#: src/muuli_wdr.cpp:3076
+msgid "Proxy port:"
 msgstr ""
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
+#: src/muuli_wdr.cpp:3080
+msgid "The proxy port"
 msgstr ""
 
-#: src/PartFileConvert.cpp:208
-#, c-format
-msgid "Importing %s: %s"
+#: src/muuli_wdr.cpp:3101
+msgid "Connect to:"
 msgstr ""
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
+#: src/muuli_wdr.cpp:3115
+msgid "Login to remote amule"
 msgstr ""
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
+#: src/muuli_wdr.cpp:3120
+msgid "User name"
 msgstr ""
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
+#: src/muuli_wdr.cpp:3137
+msgid "Remember those settings"
 msgstr ""
 
-#: src/PartFileConvert.cpp:331
-#, c-format
-msgid "Loading data from old download file (%u of %u)"
+#: src/muuli_wdr.cpp:3166
+msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/PartFileConvert.cpp:351
-#, c-format
-msgid "Saving data block into new single download file (%u of %u)"
+#: src/muuli_wdr.cpp:3169
+msgid "Message Categories:"
 msgstr ""
 
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Ceka ..."
+
+#: src/muuli_wdr.cpp:3222
+msgid "Add imports"
 msgstr ""
 
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
+#: src/muuli_wdr.cpp:3226
+msgid "Retry selected"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
+#: src/muuli_wdr.cpp:3229
+msgid "Remove selected"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Ceka ..."
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Aktivni uploadovi :"
 
-#: src/PartFileConvertDlg.cpp:176
-#, c-format
-msgid "%s (Disk: %s)"
+#: src/muuli_wdr.cpp:3368
+#, fuzzy
+msgid "Percent of total files"
+msgstr "Ukupni fajlovi"
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Dijeljeni fajlovi"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Izaberi filter za gledanje"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Aktivni uploadovi"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Pokazi liste"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Ponovno ucitati"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Posalji"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
+#: src/muuli_wdr.cpp:3527
+msgid "Connect to any server and/or Kad"
 msgstr ""
 
-#: src/OtherFunctions.cpp:112
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Dijeljeni fajlovi"
+
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Onemoguceno [%s]"
+
+#: src/OtherFunctions.cpp:106
 #, fuzzy
 msgid "byte"
 msgid_plural "bytes"
 msgstr[0] "Bytes"
 msgstr[1] "Bytes"
 
-#: src/OtherFunctions.cpp:114
+#: src/OtherFunctions.cpp:108
 msgid "kB"
 msgstr ""
 
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
+#: src/OtherFunctions.cpp:114
 msgid "TB"
 msgstr "TB"
 
-#: src/OtherFunctions.cpp:130
+#: src/OtherFunctions.cpp:124
 msgid "k"
 msgstr ""
 
-#: src/OtherFunctions.cpp:132
+#: src/OtherFunctions.cpp:126
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:134
+#: src/OtherFunctions.cpp:128
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:136
+#: src/OtherFunctions.cpp:130
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:143
+#: src/OtherFunctions.cpp:137
 #, fuzzy
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr[0] "kBytes/sec"
 msgstr[1] "kBytes/sec"
 
-#: src/OtherFunctions.cpp:147
+#: src/OtherFunctions.cpp:141
 msgid "MB/s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
 msgid "secs"
 msgstr "sekundi"
 
-#: src/OtherFunctions.cpp:170
+#: src/OtherFunctions.cpp:157
 msgid "mins"
 msgstr "minuta"
 
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
 msgid "hours"
 msgstr ""
 
-#: src/OtherFunctions.cpp:185
+#: src/OtherFunctions.cpp:163
 msgid "Days"
 msgstr ""
 
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Videa"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Arhiva"
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "svi"
 
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr ""
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "svi drugi"
 
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programi"
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Nedovrseno"
 
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Bilo koja"
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Stopirano"
 
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Bez ocjene"
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Video"
 
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Neispravan / Koruptan / Falsifikat"
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Arhiva"
 
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Los"
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Tekst"
 
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Vrlo dobar"
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr ""
 
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Dobar"
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Odlican"
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr ""
 
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "svi"
+#: src/PartFileConvert.cpp:200
+#, c-format
+msgid "Importing %s: %s"
+msgstr ""
 
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "svi drugi"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr ""
 
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
 msgstr ""
 
-#: src/IPFilter.cpp:285
-#, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
 msgstr ""
 
-#: src/IPFilter.cpp:326
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgid "Loading data from old download file (%u of %u)"
 msgstr ""
 
-#: src/IPFilter.cpp:331
+#: src/PartFileConvert.cpp:347
 #, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] ""
-msgstr[1] ""
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr ""
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] ""
-msgstr[1] ""
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr ""
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktivne veze (1:%u)"
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr ""
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
 msgstr ""
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
 msgstr ""
 
-#: src/muuli_wdr.cpp:73
-msgid "eD2k Link: "
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
 msgstr ""
 
-#: src/muuli_wdr.cpp:80
-msgid "Commit"
-msgstr "Izvrsi"
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:81
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"Click here to add the eD2k link in the text control to your download queue."
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"Events are displayed here. For a complete list of events, refer to the log "
-"in the Servers-tab."
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:92
-msgid "Loading ..."
-msgstr "Ucitava..."
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr ""
 
-#: src/muuli_wdr.cpp:101
-msgid "Number of users on the server you are connected to ..."
-msgstr "Broj korisnika na serveru sa kojim si spojen..."
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "GRESKA: neuspjesno stvaranje zapocetog fajla)"
 
-#: src/muuli_wdr.cpp:104
-msgid "Users: 0"
-msgstr "Korisnika: 0"
+#: src/PartFile.cpp:336
+#, c-format
+msgid "Trying to load backup of met-file from %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:105
-msgid ""
-"Users connected to the current server and an estimate of the total number of "
-"users."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:117
-msgid ""
-"Current average upload and download rates. If enabled the numbers in the "
-"braces signify the overhead from client communication."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:125
-msgid ""
-"Displays the connected status and active transfers. Red arrows signifies "
-"that you are currently not connected, yellow arrows signify that you have "
-"low ID (firewalled) and green arrows signify that you have high ID (The "
-"optimal connection type)."
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:129
-msgid "Not Connected ..."
-msgstr "Ne povezan..."
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr "Greska: fajl known.met je koruptan, nemoguce citati poznate fajlove"
 
-#: src/muuli_wdr.cpp:130
-msgid "Currently connected server."
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:176
-msgid "Search"
-msgstr "Pretraga"
-
-#: src/muuli_wdr.cpp:182
-msgid "Name:"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
-msgid "Local"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:196
-msgid "Global"
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:198
-msgid "FileHash"
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
 msgstr ""
 
-#: src/muuli_wdr.cpp:206
-msgid "Extended Parameters"
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Neuspjelo otvaranje %s (%s)"
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:212
-msgid "Filtering"
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
-msgid "File Type"
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "GRESKA kod spasavanja pocetog fajla: %s (%s => %s)"
+
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:253
-msgid "Extension"
-msgstr "Ekstenzija"
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr ""
 
-#: src/muuli_wdr.cpp:259
-msgid "Min Size"
-msgstr "Minimalna velicina"
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Neuspjesno spasavanje part.met.seeds fajla za %s"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
-msgid "Bytes"
-msgstr "Bytes"
+#: src/PartFile.cpp:1020
+#, fuzzy, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Spaseni %i seeds izvora za poceti fajl: %s (%s)"
+msgstr[1] "Spaseni %i seeds izvora za poceti fajl: %s (%s)"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
-msgid "KB"
-msgstr "KB"
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Poceti fajl %s (%s) nema seesd fajlova"
 
-#: src/muuli_wdr.cpp:282
-msgid "Max Size"
-msgstr "Maksimalna velicina"
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr ""
 
-#: src/muuli_wdr.cpp:305
-msgid "Availability"
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:318
-msgid "Filter:"
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, fuzzy, c-format
+msgid ""
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Nadjen koruptan dio (%i) u %i pocetom fajlu %s - FileResultHash |%s| "
+"FileHash |%s|"
+msgstr[1] ""
+"Nadjen koruptan dio (%i) u %i pocetom fajlu %s - FileResultHash |%s| "
+"FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:327
-msgid "Filter Results"
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Zavrseno rehashing %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/muuli_wdr.cpp:333
-msgid "Invert Result"
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:339
-msgid "Hide Known Files"
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:355
-msgid "More"
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
 
-#: src/muuli_wdr.cpp:356
-msgid "Searches for more results on eD2k. Not supported for Kad yet."
+#: src/PartFile.cpp:2292
+#, c-format
+msgid ""
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
 
-#: src/muuli_wdr.cpp:363
-msgid "Stop"
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
+msgid ""
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:377
-msgid "Reset Fields"
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:392
-msgid "Results"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:428
-msgid "Clears completed downloads"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Klienti na cekanju :"
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr ""
 
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Posalji"
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr ""
 
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
 msgstr ""
 
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Zatvori"
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Standard sistema"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
+#: src/Preferences.cpp:631
+msgid "Albanian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:575
-msgid "Full Name :"
-msgstr "Puno ime :"
-
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
-msgid "N/A"
-msgstr "N/A"
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabic"
 
-#: src/muuli_wdr.cpp:586
-msgid "met-File :"
-msgstr "met-fajl :"
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "Estonian"
 
-#: src/muuli_wdr.cpp:597
-msgid "Hash :"
-msgstr "Hash :"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Basque"
 
-#: src/muuli_wdr.cpp:612
-msgid "Filesize :"
-msgstr "Velicina fajla :"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgarian"
 
-#: src/muuli_wdr.cpp:623
-msgid "Partfilestatus :"
-msgstr "Status pocetog fajla :"
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Catalan"
 
-#: src/muuli_wdr.cpp:634
-msgid "Last seen complete :"
-msgstr "Posljednji put vidjen kompletno :"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:656
-msgid "Found Sources :"
-msgstr "Nadjeni izvori :"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:667
-msgid "Transferring Sources :"
-msgstr "Izvori koji transferuju :"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr ""
 
-#: src/muuli_wdr.cpp:678
-msgid "Filepart-Count :"
-msgstr "Broj pocetog fajla :"
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr ""
 
-#: src/muuli_wdr.cpp:689
-msgid "Available :"
-msgstr "Dostupnost :"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Danish"
 
-#: src/muuli_wdr.cpp:700
-msgid "Datarate :"
-msgstr "Podatak rate :"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Dutch"
 
-#: src/muuli_wdr.cpp:711
-msgid "Download Active Time: "
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
-msgid "Transferred :"
-msgstr "Prenijeto :"
-
-#: src/muuli_wdr.cpp:733
-msgid "Completed Size :"
-msgstr "Zavrsna velicina :"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estonian"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
-msgid "Intelligent Corruption Handling"
-msgstr "Rukovanje inteligentne korupcije (I.C.H.)"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finnish"
 
-#: src/muuli_wdr.cpp:769
-msgid "Lost to corruption :"
-msgstr "Izgubljeno zbog korupcije :"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "French"
 
-#: src/muuli_wdr.cpp:780
-msgid "Gained by compression :"
-msgstr "Steceno kompresijom :"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr ""
 
-#: src/muuli_wdr.cpp:791
-msgid "Packages saved by I.C.H. :"
-msgstr "Paketi spaseni kroz I.C.H. :"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "German"
 
-#: src/muuli_wdr.cpp:811
-msgid "File Names"
+#: src/Preferences.cpp:649
+msgid "Greek"
 msgstr ""
 
-#: src/muuli_wdr.cpp:825
-msgid "Takeover"
-msgstr "Preuzimanje"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr ""
 
-#: src/muuli_wdr.cpp:835
-msgid "Cleanup"
-msgstr "Ciscenje"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Hungarian"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
-msgid "Apply"
-msgstr "Primijeni"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italian"
 
-#: src/muuli_wdr.cpp:854
-msgid "Ok"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:883
-msgid "Comment/Rate file (Text will be visible to all users)"
+#: src/Preferences.cpp:654
+msgid "Japanese"
 msgstr ""
 
-#: src/muuli_wdr.cpp:897
-msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Korean"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lithuanian"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
 msgstr ""
-"Za film mozes opisati njegovu duzinu, pricu, jezik ... \n"
-"i da li je falsifikat i to ovim putem reci drugim korisnicima aMule."
 
-#: src/muuli_wdr.cpp:905
-msgid "File Quality"
-msgstr "Kvalitet fajla"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polish"
 
-#: src/muuli_wdr.cpp:920
-msgid "Choose the file rating or advice users if the file is invalid ..."
-msgstr "Izaberi ocjenu fajla ili savjet korisnika ako je fajl neispravan ..."
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portuguese"
 
-#: src/muuli_wdr.cpp:964
-msgid "Refresh"
-msgstr "Obnovi"
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:991
-msgid "Downloading, please wait ..."
-msgstr "Downoading, molim strpljenje ..."
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Russian"
 
-#: src/muuli_wdr.cpp:997
-msgid "Unknown size"
+#: src/Preferences.cpp:662
+msgid "Slovenian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1021
-msgid "Required Information"
-msgstr "Trazene informacije"
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Spanish"
 
-#: src/muuli_wdr.cpp:1026
-msgid "IP Address :"
-msgstr "IP adresa:"
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1032
-msgid "Port :"
-msgstr "Port :"
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1042
-msgid "Additional Information"
-msgstr "Dodatne informacije"
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1047
-msgid "Username :"
-msgstr "Ime korisnika :"
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Jezik"
 
-#: src/muuli_wdr.cpp:1053
-msgid "Userhash :"
-msgstr "Hash korisnika :"
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
+#: src/Preferences.cpp:771
+msgid "No languages available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Trenutna misija"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Ukupno"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Zahtjevano :"
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Aktivni uploadovi :"
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1206
-msgid "Download-Speed"
-msgstr "Brzina downloada"
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
-msgid "Current"
-msgstr "Trenutno"
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
-msgid "Running average"
-msgstr "Prosjek rada"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
-msgid "Session average"
-msgstr "Prosjek misije"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Veza"
 
-#: src/muuli_wdr.cpp:1255
-msgid "Upload-Speed"
-msgstr "Brzina uploada"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Direktoriji"
 
-#: src/muuli_wdr.cpp:1304
-msgid "Connections"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Serveri"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Fajlovi"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
-msgid "Active downloads"
-msgstr "Aktivni downloadovi"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1333
-msgid "Active connections (1:1)"
-msgstr "Aktivne veze (1:1)"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
-msgid "Active uploads"
-msgstr "Aktivni uploadovi"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
-msgid "Statistics Tree"
-msgstr "Drvo statistike"
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Daljinsko upravljanje"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
-msgid "Username:"
-msgstr "Ime korisnika:"
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1386
-msgid "Userhash:"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1409
-msgid "Client software:"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1418
-msgid "Client version:"
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1425
-msgid "IP address:"
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1434
-msgid "User ID:"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
 msgstr ""
+"Ne mijenjaj ove opcije ako ne znas\n"
+"sta radis, jer time mozes lako pogorsati\n"
+"svoje stanje.\n"
+"\n"
+"aMule ce raditi dobro iako ne promijenis\n"
+"nista od ovih opcija."
 
-#: src/muuli_wdr.cpp:1441
-msgid "Server IP:"
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1450
-msgid "Server name:"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1457
-msgid "Obfuscation:"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1466
-msgid "Kad:"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1477
-msgid "Transfers to client"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1482
-msgid "Current request:"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1495
-msgid "Average upload rate:"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1504
-msgid "Average download rate:"
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Parametri za spoljasnju vezu"
+
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Parametri za spoljasnju vezu"
+
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Parametri za spoljasnju vezu"
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1511
-msgid "Uploaded (session):"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1520
-msgid "Downloaded (session):"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1527
-msgid "Uploaded (total):"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1536
-msgid "Downloaded (total):"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1547
-msgid "Scores"
-msgstr "Rezultati"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1554
-msgid "DL/UP modifier:"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Secure ident:"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1579
-msgid "Queue score:"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1610
-msgid "Nick"
-msgstr "Nadimak"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - the Linux Mule"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1614
-msgid "This is the name that other users will see when connecting to you."
+#: src/PrefsUnifiedDlg.cpp:1003
+#, c-format
+msgid "Choose a folder for %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Jezik"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Potrazi videoplejer"
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Razne mogucnosti"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1634
-msgid "Check for new version at startup"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1635
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
 msgstr ""
+"Dodaj ovdje URLs da dobijes server.met fajlove. \n"
+"Samo jedna URL po liniji."
 
-#: src/muuli_wdr.cpp:1638
-msgid "Start minimized"
-msgstr "Pocni minimiran"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, fuzzy, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Obnovi kasnjenje : 5 sekundi"
+msgstr[1] "Obnovi kasnjenje : 5 sekundi"
 
-#: src/muuli_wdr.cpp:1639
-msgid "Enabling this makes aMule minimize itself upon start."
+#: src/PrefsUnifiedDlg.cpp:1121
+#, fuzzy, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Vrijeme za prosjecni graf: 100 minuta"
+msgstr[1] "Vrijeme za prosjecni graf: 100 minuta"
+
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
-msgid "Prompt on exit"
-msgstr "Pitanje pri napustanju"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, fuzzy, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Velicina fajl buffera %i bytes"
+msgstr[1] "Velicina fajl buffera %i bytes"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr ""
+#: src/PrefsUnifiedDlg.cpp:1145
+#, fuzzy, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Duzina liste cekanja %i klienata"
+msgstr[1] "Duzina liste cekanja %i klienata"
 
-#: src/muuli_wdr.cpp:1647
-msgid "Enable Tray Icon"
-msgstr ""
+#: src/PrefsUnifiedDlg.cpp:1152
+#, fuzzy, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Interval obnavljanja veze servera %i minuta"
+msgstr[1] "Interval obnavljanja veze servera %i minuta"
 
-#: src/muuli_wdr.cpp:1648
-msgid "This Enables/Disables the system tray (or taskbar) icon."
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Interval obnavljanja veze servera: onemoguceno"
+
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "onemoguci"
+
+#: src/PrefsUnifiedDlg.cpp:1222
+#, c-format
+msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1651
-msgid "Minimize to Tray Icon"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1652
-msgid ""
-"Enabling this will make aMule minimize to the System Tray, rather than the "
-"taskbar."
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
-msgid "Browser Selection"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "FileID"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Fajl"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Upitao za drugi fajl"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Otkaz"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/ServerConnect.cpp:74
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1705
-msgid "Open in new tab if possible"
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Neuspjesno spajanje sa svim serverima u list. Pocinje iznova."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1707
-msgid "Open the web page in a new tab instead of in a new window when possible"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1712
-msgid "Video Player"
-msgstr "Video Plejer"
+#: src/ServerConnect.cpp:198
+#, c-format
+msgid "Connected to %s (%s:%i)"
+msgstr "Spojen sa %s (%s:%i)"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr ""
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Uspostavljena veza sa: %s"
 
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
+"Fatalna greska prilikom pokusaja spajanja. Veza interneta je moguce prekinuta"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
-msgid "Upload"
-msgstr "Upload"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Izgubljena veza sa %s (%s:%i)"
 
-#: src/muuli_wdr.cpp:1775
-msgid "Slot Allocation"
-msgstr "Alokacija slota"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) je mrtav"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1796
-msgid "This is the standard eD2k port and cannot be disabled."
+#: src/ServerConnect.cpp:392
+#, fuzzy, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Automatsko spajanje sa serverom ce ponovo poceti za %d sekundi"
+msgstr[1] "Automatsko spajanje sa serverom ce ponovo poceti za %d sekundi"
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Izgubljena veza"
+
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "onemoguci"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
+#: src/ServerList.cpp:88
+#, c-format
+msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
+#: src/ServerList.cpp:93
+msgid "Server.met file not found!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Maksimalni izvor po fajlu"
+#: src/ServerList.cpp:101
+#, c-format
+msgid "Failed to load server.met file '%s', unknown format encountered."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
+#: src/ServerList.cpp:107
+msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/ServerList.cpp:118
+#, c-format
+msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Maksimalne veze"
+#: src/ServerList.cpp:173
+#, fuzzy, c-format
+msgid "%i server in server.met found"
+msgid_plural "%i servers in server.met found"
+msgstr[0] "%i servera pronadjeno u server.met"
+msgstr[1] "%i servera pronadjeno u server.met"
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
+#: src/ServerList.cpp:175
+#, fuzzy, c-format
+msgid "%d server added"
+msgid_plural "%d servers added"
+msgstr[0] "%d servera dodato"
+msgstr[1] "%d servera dodato"
+
+#: src/ServerList.cpp:178
+#, fuzzy
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Greska: fajl server.met je koruptan"
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "Neocekivana fajl greska prilikom pisanja %s : %s"
+
+#: src/ServerList.cpp:195
+#, c-format
+msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1886
-msgid "Kademlia"
+#: src/ServerList.cpp:213
+#, c-format
+msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
+#: src/ServerList.cpp:232
+#, c-format
+msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
+#: src/ServerList.cpp:250
+#, c-format
+msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
+#: src/ServerList.cpp:345
+msgid ""
+"You are connected to the server you are trying to delete. please disconnect "
+"first."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1913
-msgid "Autoconnect on startup"
-msgstr "Autospajanje pri startu"
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1916
-msgid "Reconnect on loss"
-msgstr "Ponovni spoj kod gubitka veze"
+#: src/ServerList.cpp:685
+msgid "Failed to save server.met!"
+msgstr "Neuspjelo spasavanje server.met!"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Pokazi sirinu pojasa overheada"
+#: src/ServerList.cpp:832
+msgid "Invalid URL"
+msgstr "Neispravna URL"
 
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr ""
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
+msgstr "Neuspio download serverliste od %s"
 
-#: src/muuli_wdr.cpp:1947
-msgid "Remove dead server after"
-msgstr "Otstrani mrtve servere nakon"
+#: src/ServerList.cpp:869
+msgid ""
+"No server list address entry in 'addresses.dat' found. Please paste a valid "
+"server list address into this file in order to auto-update your server list"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1953
-msgid "retries"
-msgstr "pokusaja"
+#: src/ServerList.cpp:882
+#, c-format
+msgid "Start downloading server list from %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1960
-msgid "Auto-update server list at startup"
+#: src/ServerList.cpp:891
+#, c-format
+msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1963
-msgid "List"
-msgstr "Lista"
+#: src/ServerList.cpp:895
+msgid "No valid server.met auto-download url on addresses.dat"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1968
-msgid "Update server list when connecting to a server"
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1971
-msgid "Update server list when a client connects"
+#: src/ServerList.cpp:985
+msgid ""
+"Local server is filtered by the IPFilters, reconnecting to a different "
+"server!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1974
-msgid "Use priority system"
-msgstr "Koristi sistem prioriteta"
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Ime servera"
 
-#: src/muuli_wdr.cpp:1978
-msgid "Use smart LowID check on connect"
-msgstr "Koristi pametnu LowID provjeru pri vezanju"
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1982
-msgid "Safe connect"
-msgstr "Sigurno povezivanje"
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Port"
 
-#: src/muuli_wdr.cpp:1986
-msgid "Autoconnect to servers in static list only"
-msgstr "Autopovezivanje samo sa serverima iz staticne liste"
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Opis"
 
-#: src/muuli_wdr.cpp:1989
-msgid "Set manually added servers to High Priority"
-msgstr "Postavi rucno dodate servere na visoki prioritet"
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Korisnici"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. aktiviran"
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Staticni"
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2024
-msgid "Add files to download in pause mode"
-msgstr "Dodaj nove fajlove u stanju pauze"
+#: src/ServerListCtrl.cpp:148
+msgid ""
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2027
-msgid "Add files to download with auto priority"
-msgstr "Dodaj nove fajlove sa auto prioritetom"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Try to download first and last chunks first"
-msgstr "Pokusaj prvo downloadovati pocetni i zavrsni chunk "
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Dodaj nove dijeljene fajlove sa auto prioritetom"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Serveri (%i)"
 
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Pokusaj uploadovati kompletne chunks"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Nastavi iduci pauziran fajl cim je jedan fajl gotov"
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Server"
 
-#: src/muuli_wdr.cpp:2045
-msgid "From the same category"
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Odstrani servera"
+
+#: src/ServerListCtrl.cpp:419
+#, fuzzy
+msgid "Remove servers"
+msgstr "Odstrani servera"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Odstrani sve servere"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
+#: src/ServerListCtrl.cpp:541
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Da li zaist zelis otkazati i obrisati ove fajlove ?\n"
+
+#: src/ServerListCtrl.cpp:543
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Da li zaist zelis otkazati i obrisati ove fajlove ?\n"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Novi klientID je %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2122
-msgid "(Right click on folder icon for recursive share)"
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2129
-msgid "Share hidden files"
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2149
-msgid "Graphs"
-msgstr "Grafovi"
+#: src/ServerSocket.cpp:535
+#, fuzzy, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Primljeno %d novih servera"
+msgstr[1] "Primljeno %d novih servera"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
-msgid "Update delay : 5 secs"
-msgstr "Obnovi kasnjenje : 5 sekundi"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2158
-msgid "Time for average graph: 100 mins"
-msgstr "Vrijeme za prosjecni graf: 100 minuta"
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Server je odbio posljednju komandu"
 
-#: src/muuli_wdr.cpp:2164
-msgid "Connections Graph Scale: 100 "
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Izaberi boje statistike"
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2177
-msgid "Background"
-msgstr "Pozadina"
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2178
-msgid "Grid"
-msgstr "Mreza"
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2179
-msgid "Download current"
-msgstr "Trenutni download"
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2180
-msgid "Download running average"
-msgstr "Prosjek tekuceg downloada"
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2181
-msgid "Download session average"
-msgstr "Prosjek downloada misije"
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2182
-msgid "Upload current"
-msgstr "Trenutni upload"
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2183
-msgid "Upload running average"
-msgstr "Prosjek tekuceg uploada"
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2184
-msgid "Upload session average"
-msgstr "Prosjek uploada misije"
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2185
-msgid "Active connections"
-msgstr "Aktivne veze"
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
 
-#: src/muuli_wdr.cpp:2188
-msgid "Systray Icon Speedbar"
-msgstr "poluga brzine prikazana u sistemskom koritu"
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2189
-msgid "Kad-nodes current"
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2190
-msgid "Kad-nodes running"
+#: src/ServerWnd.cpp:206
+msgid "Running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2191
-msgid "Kad-nodes session"
+#: src/ServerWnd.cpp:209
+msgid "Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
-msgid "Select"
-msgstr "Izaberi"
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2214
-msgid "Number of Client Versions shown (0=unlimited)"
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Kapacitet linije"
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "Vrh broja veza (procjena)"
 
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2272
-msgid "!!! WARNING !!!"
-msgstr "!!! UPOZORENJE !!!"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
 msgstr ""
-"Ne mijenjaj ove opcije ako ne znas\n"
-"sta radis, jer time mozes lako pogorsati\n"
-"svoje stanje.\n"
-"\n"
-"aMule ce raditi dobro iako ne promijenis\n"
-"nista od ovih opcija."
 
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Max new connections / 5 secs"
-msgstr "Maksimalne veze u / 5 sekundi"
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2294
-msgid "File Buffer Size: 240000 bytes"
-msgstr "Fajl Buffer velicina: 240000 bytes"
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "Spajanje"
 
-#: src/muuli_wdr.cpp:2300
-msgid "Upload Queue Size: 5000 clients"
-msgstr "Duzina reda cekanja: 5000 klienta"
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "Spojen sa %s (%s:%i)"
 
-#: src/muuli_wdr.cpp:2306
-msgid "Server connection refresh interval: Disable"
-msgstr "Interval obnavljanja veze servera: onemoguceno"
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "Nadjeni izvori :"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Napredak fajlova u redu cekanja"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Pokazi procente"
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Pokazi polugu napretka"
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Vrsta poluge napredka"
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Pljosnata"
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Obla"
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
+#: src/SharedFileList.cpp:371
+#, fuzzy, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Pronadjeno %i poznatih dijeljenih fajlova"
+msgstr[1] "Pronadjeno %i poznatih dijeljenih fajlova"
+
+#: src/SharedFileList.cpp:377
+#, fuzzy, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Pronadjeno %i poznatih dijeljenih fajlova, %i nepoznatih"
+msgstr[1] "Pronadjeno %i poznatih dijeljenih fajlova, %i nepoznatih"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Ime korisnika"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Brzina downloada"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Brzina uploada"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Dostupnost :"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Uploadovi"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+#, fuzzy
+msgid "Download Status"
+msgstr "Downloads"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Ime fajla"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Dijeljeni fajlovi"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Zahtjevi"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Prihvaceni zahtjevi"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Podatak transfera"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Vershiedene GUI Tweaks"
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Dobiveni dijelovi"
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "Pokazi transfer rate u naslovu"
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Preimenovanje"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Vrijeme obnove stranice (u sekundama)"
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Odobri Gzip kompresiju"
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Za ispravan izvorni link, potrebna je HIGH ID"
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Odobri korisnicima sa manje prava"
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Dijeljeni fajlovi (%i)"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Sifra za puna prava"
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Sifra za manje prava"
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Ime fajla"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "Parametri za spoljasnju vezu"
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "Prihvati spoljasnje veze"
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2583
-msgid "Click here to apply any changes made to the preferences."
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2587
-msgid "Reset any changes made to the preferences."
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2611
-msgid "Title :"
-msgstr "Naziv :"
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2621
-msgid "Comment :"
-msgstr "Komentar:"
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2631
-msgid "Incoming Dir :"
-msgstr "Prijemni direktorij :"
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Prosjecno vrijeme uploada: %s"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2644
-msgid "Change priority for new assigned files :"
-msgstr "Promijeni prioritet za nove fajlove :"
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
-msgstr "Ne mijenjaj"
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2663
-msgid "Select color for this Category (currently selected) :"
-msgstr "Izaberi boju za ovu kategoriju (trenutno izabrana) :"
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Pokazi server motd kad je povezan ..."
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Lista servera"
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
-msgid "Click this button to reset the log."
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule Log"
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2806
-msgid "Click on this button to update the servers list from URL ..."
-msgstr "Klikni ovdje da obnovis listu servera sa URL ..."
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Ponovno vezan: %i"
 
-#: src/muuli_wdr.cpp:2810
-msgid "Server list"
-msgstr ""
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Vriejme od prvog transfera: %s"
 
-#: src/muuli_wdr.cpp:2815
-msgid ""
-"Enter the url to a server.met file here and press the button to the left to "
-"update the list of known servers."
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Spojen sa serverom vec: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2822
-msgid "Add server manually: Name"
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2826
-msgid "Enter the name of the new server here"
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2833
-msgid "Enter the IP of the server here, using the x.x.x.x format."
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2840
-msgid "Enter the port of the server here."
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Klienti"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "Nepoznat: %i"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "Filtrirani: %i"
+
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "Zabranjen"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2844
-msgid "Add manually a server (fill fields to the left before) ..."
-msgstr "Dodaj servera rucno (prije ispuni polja lijevo) ..."
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2890
-msgid "ED2K Info"
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
-msgid "Kad Info"
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2923
-msgid "Click on this button to update the nodes list from URL ..."
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2927
-msgid "Nodes (0)"
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2932
-msgid ""
-"Enter the url to a nodes.dat file here and press the button to the left to "
-"update the list of known nodes."
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2937
-msgid "Nodes stats"
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2988
-msgid "Bootstrap"
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2991
-msgid "New node"
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2996
-msgid "IP:"
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Zauzetost servera: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3025
-msgid "Port:"
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Ukupna velicina dijeljenih fajlova: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/Statistics.cpp:955
+msgid "Operating System"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3048
-msgid "Disconnect Kad"
+#: src/Statistics.cpp:980
+msgid "Not Received"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktivne veze (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3096
-msgid "Protocol Obfuscation"
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3099
-msgid "Support Protocol Obfuscation"
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3101
-msgid ""
-"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
-"connections from other clients."
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3104
-msgid "Use obfuscation for outgoing connections"
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3106
+#: src/TextClient.cpp:323
 msgid ""
-"This option makes aMule use Protocol Obfuscation when connecting other "
-"clients/servers."
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3109
-msgid "Accept only obfuscated connections"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:3110
-msgid ""
-"This option makes aMule only accept obfuscated connections. You will have "
-"less sources, but all your traffic will be obfuscated"
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3120
-msgid "Everybody"
-msgstr "Svi"
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3122
-msgid "No one"
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3125
-msgid "Select who can request to view a list of your shared files."
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3130
-msgid "IP-Filtering"
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3137
-msgid "Filter clients"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3139
-msgid ""
-"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3142
-msgid "Filter servers"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3144
-msgid ""
-"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3151
-msgid "Reload List"
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3152
-msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3160
-msgid "URL:"
+#: src/TextClient.cpp:699
+msgid "eD2k"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3166
-msgid "Update now"
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3171
-msgid "Auto-update ipfilter at startup"
+#: src/TextClient.cpp:710
+msgid "Now connecting"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3176
-msgid "Filtering Level:"
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3186
-msgid "Always filter LAN IPs"
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3190
-msgid "Paranoid handling of non-matching IPs"
+#: src/TextClient.cpp:734
+#, c-format
+msgid ""
+"\n"
+"Download:\t%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3192
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
-"Rejects packet if the client ip is different from the ip where the packet is "
-"received from. Use with caution."
+"\n"
+"Upload:\t%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3195
-msgid "Use system-wide ipfilter.dat if available"
+#: src/TextClient.cpp:740
+#, c-format
+msgid ""
+"\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3196
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
-"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
-"file."
+"\n"
+"Total sources:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3223
-msgid "Enable Online-Signature"
-msgstr "Omoguci online potpis"
+#: src/TextClient.cpp:832
+#, fuzzy
+msgid "Search progress not available"
+msgstr "%s Nije dostupan"
 
-#: src/muuli_wdr.cpp:3225
-msgid ""
-"Enables the writing of the OS file, which can be used by external apps to "
-"create signatures and the like."
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3230
-msgid "Update Frequency (Secs):"
+#: src/TextClient.cpp:850
+msgid "Show short status information."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3234
-msgid "Change the frequency (in seconds) of Online Signature updates."
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/TextClient.cpp:854
 msgid ""
-"Click here to select the directory containing the the Online Signature files."
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
+"\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3271
-msgid "Filter incoming messages (except current chat):"
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3277
-msgid "Filter all messages"
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3280
-msgid "Filter messages from people not on your friend list"
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3283
-msgid "Filter messages from unknown clients"
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3286
-msgid "Filter messages containing (use ',' as separator):"
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
-msgid "add here the words amule should filter and block messages including it"
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3302
-msgid "Comments"
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3310
-msgid "Filter comments containing (use ',' as separator):"
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3339
-msgid "Enable Proxy"
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3340
-msgid "Enable/disable proxy support"
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3345
-msgid "Proxy type:"
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
+"\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3359
-msgid "Proxy host:"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3363
-msgid "The proxy host name"
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3366
-msgid "Proxy port:"
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3370
-msgid "The proxy port"
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3424
-msgid "Connect to:"
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3438
-msgid "Login to remote amule"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3443
-msgid "User name"
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3460
-msgid "Remember those settings"
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3492
-msgid "Enable Verbose Debug-Logging."
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3497
-msgid "Message Categories:"
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3550
-msgid "Add imports"
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3554
-msgid "Retry selected"
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3557
-msgid "Remove selected"
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3668
-msgid "Connect to any server and/or Kad"
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Prozor pretraga"
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr ""
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Prozor transfera fajlova"
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Prozor dijeljenih fajlova"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr ""
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Prozor poruka"
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Prozor grafova statistike"
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Prozor postavke opcija"
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr ""
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
 msgstr ""
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Izaberi mapu (folder) za dolazece fajlove"
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "Pokazi polugu napretka"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr ""
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "Pokazi polugu napretka"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
 msgstr ""
 
-#: src/CatDialog.cpp:159
+#: src/TextClient.cpp:926
 msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:141
-#, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
+#: src/TextClient.cpp:933
+msgid "Pause download."
 msgstr ""
 
-#: src/ExternalConnector.cpp:143
-#, c-format
-msgid "Unknown command '%s'.\n"
+#: src/TextClient.cpp:936
+msgid "Resume download."
 msgstr ""
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/TextClient.cpp:939
+msgid "Cancel download."
 msgstr ""
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/TextClient.cpp:942
+msgid "Set download priority."
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
-msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
 msgstr ""
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
 msgstr ""
 
-#: src/ExternalConnector.cpp:185
-#, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
 msgstr ""
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
 msgstr ""
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
 msgstr ""
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:243
-#, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
 msgstr ""
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
+#: src/TextClient.cpp:952
+msgid "Show download queue."
 msgstr ""
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/TextClient.cpp:953
+msgid "Show log."
 msgstr ""
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
+#: src/TextClient.cpp:954
+msgid "Show servers list."
 msgstr ""
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
+#: src/TextClient.cpp:957
+msgid "Reset log."
 msgstr ""
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
+#: src/TextClient.cpp:964
+#, c-format
+msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:297
-#, c-format
-msgid "Type '%s' to get more help.\n"
+#: src/TextClient.h:60
+msgid "aMule text client"
 msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/ThreadTasks.cpp:363
 #, c-format
-msgid "This is %s %s %s\n"
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:364
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "This is %s %s\n"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:395
-msgid ""
-"\n"
-"Creating client...\n"
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:418
-#, c-format
-msgid ""
-"\n"
-"Ok, exiting %s...\n"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr ""
+"Da li zaista zelite da ponistite i obrisete sve fajlove u ovoj kategoriji?"
 
-#: src/ExternalConnector.cpp:424
-msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Potrebna potvrda"
+
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Previse konekcija"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
 msgstr ""
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Izaberi filter za gledanje"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Dodaj kategoriju"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Editiraj kategoriju"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Odstrani kategoriju"
+
+#: src/UploadClient.cpp:240
+#, c-format
+msgid "Failed to open file (%s), removing from list of shared files."
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
 msgstr ""
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
 msgstr ""
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
+#: src/UserEvents.h:60
+msgid "Download completed"
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
 msgstr ""
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] ""
-msgstr[1] ""
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr ""
 
-#: src/ClientCreditsList.cpp:171
-#, fuzzy, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] "Krediti istekli!"
-msgstr[1] "Krediti istekli!"
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr ""
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
+#: src/UserEvents.h:87
+msgid "Message sender."
 msgstr ""
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+#: src/UserEvents.h:92
+msgid "Out of space"
 msgstr ""
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
+#: src/UserEvents.h:95
+msgid "Disk partition."
 msgstr ""
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Dozvoli"
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Pokazi uploadove"
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Pokazi red cekanja"
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
+#: src/utils/aLinkCreator/src/alcc.cpp:95
+#, c-format
+msgid "%s ---> Non existant file !\n"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Cekao"
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Vriejeme uploada"
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Prioritet fajla"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Rezultat"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Upitan"
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Posljednji put vidjen"
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Usao u red cekanja"
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Detalji klienta"
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Nedovrseno"
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Los decko"
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Priznat - OK"
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
 msgstr ""
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Bezkrajno"
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule izbor u koritu"
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+#, fuzzy
+msgid "Cancelled !"
+msgstr "Otkaz"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
+#, c-format
+msgid "Done in %.2f s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#, c-format
+msgid "Unable to open %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:364
+#: src/utils/wxCas/src/linuxmon.cpp:86
 #, c-format
-msgid "DL: %u"
+msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:368
+#: src/utils/wxCas/src/onlinesig.cpp:234
 #, c-format
-msgid "Download speed: %.1f"
+msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "Upload speed: %.1f"
+msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
+#: src/utils/wxCas/src/onlinesig.cpp:240
 #, c-format
-msgid "Nickname: %s"
+msgid "%02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "KlientID: "
-
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Ime servera:"
-
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "ServerIP: "
-
-#: src/MuleTrayIcon.cpp:416
+#: src/utils/wxCas/src/onlinesig.cpp:342
 #, c-format
-msgid "IP: %s"
+msgid "%.2f KB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:425
+#: src/utils/wxCas/src/onlinesig.cpp:345
 #, c-format
-msgid "TCP port: %d"
+msgid "%.2f MB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:436
+#: src/utils/wxCas/src/onlinesig.cpp:351
 #, c-format
-msgid "UDP port: %d"
+msgid "%.2f TB"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Online potpis: Omogucen"
-
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Online potpis: Onemogucen"
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:483
-#, c-format
-msgid "Total UL: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/ChatSelector.cpp:127
-#, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
 msgstr ""
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
 msgstr ""
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Zatvori oznaku"
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
+msgstr ""
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Zatvori sve oznake"
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr ""
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Zatvori druge oznake"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
 
-#: src/ServerList.cpp:84
-#, c-format
-msgid "Loading server.met file: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
 msgstr ""
 
-#: src/ServerList.cpp:89
-msgid "Server.met file not found!"
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
 msgstr ""
 
-#: src/ServerList.cpp:97
-#, c-format
-msgid "Failed to load server.met file '%s', unknown format encountered."
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
 msgstr ""
 
-#: src/ServerList.cpp:103
-msgid "Failed to open server.met!"
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
 msgstr ""
 
-#: src/ServerList.cpp:114
-#, c-format
-msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
 msgstr ""
 
-#: src/ServerList.cpp:169
-#, fuzzy, c-format
-msgid "%i server in server.met found"
-msgid_plural "%i servers in server.met found"
-msgstr[0] "%i servera pronadjeno u server.met"
-msgstr[1] "%i servera pronadjeno u server.met"
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
 
-#: src/ServerList.cpp:171
-#, fuzzy, c-format
-msgid "%d server added"
-msgid_plural "%d servers added"
-msgstr[0] "%d servera dodato"
-msgstr[1] "%d servera dodato"
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr ""
 
-#: src/ServerList.cpp:192
-#, c-format
-msgid "Server not added: [%s:%d] does not specify a valid port."
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
 msgstr ""
 
-#: src/ServerList.cpp:208
-#, c-format
-msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
 msgstr ""
 
-#: src/ServerList.cpp:228
-#, c-format
-msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
 msgstr ""
 
-#: src/ServerList.cpp:247
-#, c-format
-msgid "Server added: Server at [%s:%d] using the name '%s'."
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
 msgstr ""
 
-#: src/ServerList.cpp:342
-msgid ""
-"You are connected to the server you are trying to delete. please disconnect "
-"first."
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
 msgstr ""
 
-#: src/ServerList.cpp:629
-msgid "Failed to save server.met!"
-msgstr "Neuspjelo spasavanje server.met!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr ""
 
-#: src/ServerList.cpp:782
-msgid "Invalid URL"
-msgstr "Neispravna URL"
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr ""
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
 msgstr ""
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
 msgstr ""
 
-#: src/ServerList.cpp:818
-msgid ""
-"No server list address entry in 'addresses.dat' found. Please paste a valid "
-"server list address into this file in order to auto-update your server list"
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
 msgstr ""
 
-#: src/ServerList.cpp:831
-#, c-format
-msgid "Start downloading server list from %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
 msgstr ""
 
-#: src/ServerList.cpp:840
-#, c-format
-msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
 msgstr ""
 
-#: src/ServerList.cpp:844
-msgid "No valid server.met auto-download url on addresses.dat"
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
 msgstr ""
 
-#: src/ServerList.cpp:937
-msgid ""
-"Local server is filtered by the IPFilters, reconnecting to a different "
-"server!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
 msgstr ""
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+#, fuzzy
+msgid " kB/s"
+msgstr "kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
 msgstr ""
 
-#: src/amule.cpp:703
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
 msgstr ""
 
-#: src/amule.cpp:787
-msgid "Server list download"
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
 msgstr ""
 
-#: src/amule.cpp:846
-#, c-format
-msgid "web server running on pid %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/amule.cpp:850
-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"
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
 msgstr ""
 
-#: src/amule.cpp:937
-#, c-format
-msgid "Could not bind ports to the specified address: %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
 msgstr ""
 
-#: src/amule.cpp:964
-#, c-format
-msgid "Port %u is not available. You will be LOWID\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
 msgstr ""
 
-#: src/amule.cpp:970
-#, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
 msgstr ""
 
-#: src/amule.cpp:1308
-#, c-format
-msgid "This is the first time you run aMule %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
 msgstr ""
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
 msgstr ""
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
 msgstr ""
-"ne dajemo nikakvu garanciju da nece nista unistiti, tvoju kucu zapaliti, \n"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/amule.cpp:1316
-msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
 msgstr ""
 
-#: src/amule.cpp:1317
-msgid ""
-"\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1318
-msgid ""
-"\n"
-"* Disabled updating the server list from other server and clients.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/amule.cpp:1319
-msgid ""
-"\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/amule.cpp:1320
-msgid ""
-"\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
 msgstr ""
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
 msgstr ""
 
-#: src/amule.cpp:1341
-msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
 msgstr ""
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
 msgstr ""
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
 msgstr ""
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
 msgstr ""
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
 msgstr ""
 
-#: src/amule.cpp:1826
-#, c-format
-msgid "ServerMessage: %s"
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
 msgstr ""
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
 msgstr ""
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
 msgstr ""
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
 msgstr ""
 
-#: src/amule.cpp:1907
-#, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
 msgstr ""
 
-#: src/amule.cpp:1911
-#, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
 msgstr ""
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
 msgstr ""
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/amule.cpp:2025
+#: src/webserver/src/WebServer.cpp:370
 #, c-format
-msgid "Users: %s | Files: %s"
+msgid "Request failed with the following error: %s."
 msgstr ""
 
-#: src/amule.cpp:2026
-#, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
 msgstr ""
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
 msgstr ""
 
-#: src/amule.cpp:2102
-#, c-format
-msgid "Connected to %s %s"
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
 msgstr ""
 
-#: src/amule.cpp:2105
-#, c-format
-msgid "Connecting to %s"
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/amule.cpp:2114
-msgid "Kad started."
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
 msgstr ""
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
 msgstr ""
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
 msgstr ""
 
-#: src/amule.cpp:2191
-msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
 msgstr ""
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
 msgstr ""
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
 msgstr ""
 
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr ""
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Estonian"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Downloads"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#, fuzzy
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Obnovi kasnjenje : 5 sekundi"
+#~ msgstr[1] "Obnovi kasnjenje : 5 sekundi"
+
+#~ msgid "Transferring"
+#~ msgstr "Prenosi"
+
+#, fuzzy
+#~ msgid "Only files currently uploading"
+#~ msgstr "Trenutno downloading :"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "Pun red cekanja"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Pokusaj uploadovati kompletne chunks"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Downloading"
+
+#~ msgid "Transfers"
+#~ msgstr "Transferi"
+
+#~ msgid "Unban"
+#~ msgstr "Dozvoli"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Pokazi uploadove"
+
+#~ msgid "Show Queue"
+#~ msgstr "Pokazi red cekanja"
+
+#~ msgid "Waited"
+#~ msgstr "Cekao"
+
+#~ msgid "Upload Time"
+#~ msgstr "Vriejeme uploada"
+
+#~ msgid "File Priority"
+#~ msgstr "Prioritet fajla"
+
+#~ msgid "Score"
+#~ msgstr "Rezultat"
+
+#~ msgid "Asked"
+#~ msgstr "Upitan"
+
+#~ msgid "Last Seen"
+#~ msgstr "Posljednji put vidjen"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Usao u red cekanja"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Klienti na cekanju :"
+
+#~ msgid "Current Session"
+#~ msgstr "Trenutna misija"
+
+#~ msgid "Total"
+#~ msgstr "Ukupno"
+
+#~ msgid "Requested :"
+#~ msgstr "Zahtjevano :"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Prozor transfera fajlova"
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Downloads (%i)"
+
+#, fuzzy
+#~ msgid "HTTP download thread ended"
+#~ msgstr "Istinska sirina pojasa downloada"
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Neuspjesno"
+
 #~ msgid "Gui Tweaks"
 #~ msgstr "Gui Tweaks"
 
+#~ msgid "Line Capacities"
+#~ msgstr "Kapacitet linije"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Maksimalni izvor po fajlu"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Nastavi iduci pauziran fajl cim je jedan fajl gotov"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Izaberi boje statistike"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Napredak fajlova u redu cekanja"
+
+#~ msgid "Show percentage"
+#~ msgstr "Pokazi procente"
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Pokazi sirinu pojasa overheada"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. aktiviran"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Vrsta poluge napredka"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Vershiedene GUI Tweaks"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "Za film mozes opisati njegovu duzinu, pricu, jezik ... \n"
+#~ "i da li je falsifikat i to ovim putem reci drugim korisnicima aMule."
+
+#~ msgid "Misc Options"
+#~ msgstr "Razne mogucnosti"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Pokazi server motd kad je povezan ..."
+
+#~ msgid "Max Connections"
+#~ msgstr "Maksimalne veze"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - the Linux Mule"
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "Nije utvrdjena komanda za rad brausera."
 
@@ -6967,13 +7432,13 @@
 #~ msgid "Copy ED2k link to clipboard (&Source)"
 #~ msgstr "Kopiraj ed2k &linkove u klipbord (&Source)"
 
+#~ msgid "Copy ED2k link to clipboard"
+#~ msgstr "Kopiraj ED2k link u klipbord"
+
 #, fuzzy
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "Kopiraj ED2k link u klipbord"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "Fatalna greska: Neuspjesno stvaranje tajmera"
-
 #, fuzzy
 #~ msgid "ED2K: Connecting"
 #~ msgstr "Spajanje"
@@ -7055,9 +7520,6 @@
 #~ msgid "Manual Server Add : Name"
 #~ msgstr "Rucni dodatak servera : Ime"
 
-#~ msgid "No One"
-#~ msgstr "Niko"
-
 #~ msgid "TCP Port: Not Ready"
 #~ msgstr "TCP Port: Nije spreman"
 
@@ -7281,9 +7743,6 @@
 #~ msgid "Connect to any server"
 #~ msgstr "Spoji sa bilo kojim serverom"
 
-#~ msgid "You are not connected to a server!"
-#~ msgstr "Nisi povezan sa serverom!"
-
 #~ msgid "This ed2k link is invalid (%s)"
 #~ msgstr "Ovaj ed2k link nije vazeci (%s)"
 
@@ -7302,9 +7761,6 @@
 #~ msgid "Unable to retrieve shared files from '%s'"
 #~ msgstr "Neuspjesan prikaz dijeljenjih fajlova od '%s'"
 
-#~ msgid "Requesting shared files from '%s'"
-#~ msgstr "Zahtjev dijeljenih fajlova od '%s'"
-
 #~ msgid "Requesting shared files from user %s (%u) is already in progress"
 #~ msgstr "Zahtjev dijeljenih fajlova od korisnika %s (%u) je vec u toku"
 
@@ -7359,9 +7815,6 @@
 #~ msgid "*** Disconnected"
 #~ msgstr "*** Veza prekinuta"
 
-#~ msgid "Failed to load creditfile"
-#~ msgstr "Neuspjesno citanje kreditnog fajla"
-
 #~ msgid "Failed to save creditfile"
 #~ msgstr "Neuspjesno spasavanje kreditnog fajla"
 
@@ -7412,9 +7865,6 @@
 #~ msgid "Copy ED2k link to clipboard (&HTML)"
 #~ msgstr "Kopiraj ed2k &linkove u klipbord (&HTML)"
 
-#~ msgid "Show Lists"
-#~ msgstr "Pokazi liste"
-
 #~ msgid "Hide Lists"
 #~ msgstr "Sakrij liste"
 
@@ -7463,9 +7913,6 @@
 #~ msgid "can't write file '%s'"
 #~ msgstr "Ne moze pisati fajl '%s'"
 
-#~ msgid "New external connection accepted\n"
-#~ msgstr "Nova vanjska veza prihvacena\n"
-
 #~ msgid ""
 #~ "Error: couldn't accept a new external connection\n"
 #~ "\n"
@@ -7491,9 +7938,6 @@
 #~ msgid "Loaded ipfilter with %d IP addresses."
 #~ msgstr "Ucitan ipfilter sa %d IP adresa."
 
-#~ msgid "Error: the file known.met is corrupted, unable to load known files"
-#~ msgstr "Greska: fajl known.met je koruptan, nemoguce citati poznate fajlove"
-
 #~ msgid ""
 #~ "Unexpected file error while reading known.met: %s, unable to load known "
 #~ "files"
@@ -7514,11 +7958,6 @@
 #~ msgstr ""
 #~ "Korisnik %s (%u) je zahtio tvoju listu zajednickih direktorija -> %s"
 
-#~ msgid "User %s (%u) requested your sharedfiles-list for directory %s -> %s"
-#~ msgstr ""
-#~ "Korisnik %s (%u) ja zahtio tvoju listu dijeljenih fajlova za direktorij %"
-#~ "s -> %s"
-
 #~ msgid "User %s (%u) denied access to shareddirectories/files-list"
 #~ msgstr "Korisnik %s (%u) ja zabranio dostup liste dijeljenih fajlova"
 
@@ -7564,9 +8003,6 @@
 #~ msgid "Select your connection type here :"
 #~ msgstr "Izaberite vrstu vase veze ovdje:"
 
-#~ msgid "True download bandwidth"
-#~ msgstr "Istinska sirina pojasa downloada"
-
 #~ msgid "True upload bandwidth"
 #~ msgstr "Istinska sirina pojasa uploada"
 
@@ -7648,9 +8084,6 @@
 #~ msgid "("
 #~ msgstr "("
 
-#~ msgid "Reload"
-#~ msgstr "Ponovno ucitati"
-
 #~ msgid "Clientsoftware :"
 #~ msgstr "Klientov software :"
 
@@ -7663,12 +8096,6 @@
 #~ msgid "ID :"
 #~ msgstr "ID :"
 
-#~ msgid "Servername :"
-#~ msgstr "Ime servera :"
-
-#~ msgid "Currently downloading :"
-#~ msgstr "Trenutno downloading :"
-
 #~ msgid "Downloaded (this session) :"
 #~ msgstr "Downloaded (ova misija)"
 
@@ -7901,9 +8328,6 @@
 #~ msgid "Warning: %s might be corrupted"
 #~ msgstr "Upozorenje: %s je moguce koruptan"
 
-#~ msgid "ERROR while saving partfile: %s (%s => %s)"
-#~ msgstr "GRESKA kod spasavanja pocetog fajla: %s (%s => %s)"
-
 #~ msgid ".part file not found"
 #~ msgstr ".part fajl nije nadjen"
 
@@ -7933,9 +8357,6 @@
 #~ msgid "Finished downloading %s :-)"
 #~ msgstr "Zavrsen download %s :-)"
 
-#~ msgid "Downloaded:"
-#~ msgstr "Downloaded:"
-
 #~ msgid "A file with that name already exists, the file has been saved as %s"
 #~ msgstr "Fajl sa istim imenom vec postoji, fajl je spasen pod imenom %s"
 
@@ -7952,9 +8373,6 @@
 #~ msgid "ICH: Recovered corrupted part %i  (%s)"
 #~ msgstr "ICH: Koruptan dio je popravljen %i  (%s)"
 
-#~ msgid "Unexpected file error while writing %s : %s"
-#~ msgstr "Neocekivana fajl greska prilikom pisanja %s : %s"
-
 #~ msgid ""
 #~ "Partfilename: %s\n"
 #~ "Parts: %d , %s: %d (%.1f%%)\n"
@@ -8040,18 +8458,12 @@
 #~ msgid "Unable to retrieve serverlist"
 #~ msgstr "Nije u stanju pronaci server listu"
 
-#~ msgid "Failed to download the serverlist from %s"
-#~ msgstr "Neuspio download serverliste od %s"
-
 #~ msgid "Failed to load server.met!"
 #~ msgstr "Neuspjelo ucitavanje server.met!"
 
 #~ msgid "Invalid versiontag in server.met (0x%i , size %i)!"
 #~ msgstr "Neispravan versiontag u  server.met (0x%i , size %i)!"
 
-#~ msgid "Error: the file server.met is corrupted"
-#~ msgstr "Greska: fajl server.met je koruptan"
-
 #~ msgid "Server added: "
 #~ msgstr "Dodati serveri:"
 
@@ -8082,9 +8494,6 @@
 #~ msgid "Connecting to %s (%s:%i)..."
 #~ msgstr "Spajanje sa %s (%s:%i)..."
 
-#~ msgid "Error while connecting to %s (%s:%i): %d"
-#~ msgstr "Greska prilikom spajanja sa %s (%s:%i): %d"
-
 #~ msgid "Error in serversocket: %s (%s:%i): %u"
 #~ msgstr "Greska u server soketu: %s (%s:%i): %u"
 
@@ -8156,9 +8565,6 @@
 #~ msgid "Refreshing server connection"
 #~ msgstr "Obnavljanje veze servera"
 
-#~ msgid "Filtered: %i"
-#~ msgstr "Filtrirani: %i"
-
 #~ msgid "Uptime: "
 #~ msgstr "Vrijeme korisnika:"
 
@@ -8189,9 +8595,6 @@
 #~ msgid "Active Uploads: %i"
 #~ msgstr "Aktivni uploadovi: %i"
 
-#~ msgid "Waiting Uploads: %i"
-#~ msgstr "Uploadovi na cekanju: %i"
-
 #~ msgid "Total successful upload sessions: %i"
 #~ msgstr "Ukupne uspjesne upload misije: %i"
 
@@ -8213,15 +8616,9 @@
 #~ msgid "waiting for transfer..."
 #~ msgstr "ceka na transfer..."
 
-#~ msgid "waiting for connection..."
-#~ msgstr "ceka na spajanje..."
-
 #~ msgid "Session UL:DL Ratio (Total):"
 #~ msgstr "Odnos UL:DL misije (ukupno):"
 
-#~ msgid "%s Not available"
-#~ msgstr "%s Nije dostupan"
-
 #~ msgid "Number of Shared Files: %i"
 #~ msgstr "Broj dijeljenih fajlova: %i"
 
@@ -8249,9 +8646,6 @@
 #~ msgid "New MLDonkey: %i (%1.1f%%)"
 #~ msgstr "New MLDonkey: %i (%1.1f%%)"
 
-#~ msgid "Unknown: %i"
-#~ msgstr "Nepoznat: %i"
-
 #~ msgid "Working Servers"
 #~ msgstr "Ispravni serveri"
 
@@ -8270,9 +8664,6 @@
 #~ msgid "Total Users"
 #~ msgstr "Ukupno korisnika"
 
-#~ msgid "Total Files"
-#~ msgstr "Ukupni fajlovi"
-
 #~ msgid "Active Connections (estimate)"
 #~ msgstr "Aktivne veze (procjena)"
 
@@ -8282,9 +8673,6 @@
 #~ msgid "Average Connections (estimate)"
 #~ msgstr "Prosjecne veze (procjena)"
 
-#~ msgid "Peak Connections (estimate)"
-#~ msgstr "Vrh broja veza (procjena)"
-
 #~ msgid "Detection Disabled"
 #~ msgstr "Otkrivanje onemoguceno"

aMule-2.2.6.tar.bz2/po/hu.po -> aMule-2.3.1.tar.bz2/po/hu.po Changed

@@ -1,1308 +1,1150 @@
 # aMule i18n resource file
-# Copyright (C) 2007 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the aMule package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-03-06 11:56+0100\n"
-"Last-Translator: Dévai Tamás <devait@vnet.hu>\n"
-"Language-Team:  <LL@li.org>\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
+"PO-Revision-Date: 2011-11-09 01:17+0100\n"
+"Last-Translator: Dévai Tamás <gonosztopi@amule.org>\n"
+"Language-Team: Hungarian <hu@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Hungarian\n"
-"X-Poedit-Country: HUNGARY\n"
-"X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Egy nem üres jelszót kell megadni."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Érvénytelen jelszó, nem egy MD5 hash!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Kapcsolódási hiba"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "EC kapcsolat sikertelen. Üres válasz."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Külső kapcsolat: Hozzáférés megtagadva, mert: "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Külső kapcsolat: Hozzáférés megtagadva"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Külső kapcsolat: Rossz válasz a kiszolgálótól. Kapcsolat lezárva."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Sikerült! Kapcsolat létrejött ezzel: aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Sikerült! Kapcsolat létrejött."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Tördelőalgoritmizálás"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Barát hozzáadása"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Befejezés"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Érvényes IP címet és portot kell megadnod!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Kész"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Információ"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Szüneteltetve"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "A megadott felhasználói azonosító (userhash) érvénytelen!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Hibás"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "ED2KLinks fájl megnyitása sikertelen."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Letöltés alatt"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"FIGYELEM: Nem adhatod magad forrásként egy eD2k hivatkozáshoz amíg alacsony "
+"azonosítód (lowid) van."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Várakozik"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Kilépés a fő alkalmazásból..."
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "MD4 és AICH hash létrehozása a(z) '%s' fájlhoz."
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Az amuleweb instancia - melynek a pid-je '%ld' - bezárása ... "
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "MD4 hash létrehozása a(z) '%s' fájlhoz."
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Az amuleweb instancia - melynek a pid-je '%ld' - kivégzése ... "
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "AICH hash létrehozása a(z) '%s' fájlhoz."
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Sikertelen"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "A régi AICH hashkészlet konvertálása 64b-re '%s'-ből '%s'-be."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: Mag leállítása."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "FIGYELEM: A fájlnév '%s' érvénytelen és '%s'-re lett átnevezve."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "Az aMule leállítása befejezve"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "FIGYELEM: A fájl '%s' már létezik, az új fájl '%s'-re lett nevezve."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Memória debug eredmények az aMule bezárásáról:"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
 msgstr ""
-"FIGYELMEZTETÉS: nem lehetett a(z) '%s' eredeti fájlt törölni a biztonsági "
-"másolat létrehozása után"
+"\n"
+"EC beállítások"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "FIGYELMEZTETÉS: %s fájl törlése sikertelen"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Jelszó beállítva, külső kapcsolatok engedélyezve."
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Megosztott fájlok lehozatala sikertelen a(z) '%s' felhasználótól"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "FIGYELEM"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Ismeretlen"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Hamis eMule %#x verzió)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Infó"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Hamis eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"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/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Hamis eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Kiszolgáló-lista letöltése"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x  (az eMule v0.%u alapján)"
+msgid "web server running on pid %d"
+msgstr "web kiszolgáló fut, pid=%d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Becenév: %s ID: %u"
+#: src/amule.cpp:658
+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 ""
+"A web kiszolgáló indítását kérted induláskor, de az amuleweb program nem "
+"futtatható. Kérlek telepítsd az aMule web kiszolgálót tartalmazó csomagot, "
+"vagy fordítsd az aMule-t a --enable-webserver kapcsolóval és futtasd a make "
+"install parancsot."
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Kért: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "HIBA"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Fájlstatisztika ehhez a folyamathoz: %d kérés elfogadva %d-ből, %s "
-"átmásolva\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Nem tudom a portokat a megadott címhez (%s) rendelni."
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Fájlstatisztika az összes folyamathoz: %d kérés elfogadva %d-ből, %s "
-"átmásolva\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Ismeretlen lekérdezett fájl"
+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/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "A %s kliens a(z) %s:%d IP:Port-on %s %s %s -t használ"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Felhasználói név"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"%u port nem elérhető!\n"
+"\n"
+"Ez azt jelenti, hogy alacsony kliens azonosítót kapsz (LOWID).\n"
+"\n"
+"Ellenőrízd a hálózatodat, hogy megbizonyosodj, hogy a port nyitva van kifelé "
+"és befelé egyaránt."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Barátok"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Online-Aláírás fájl létrehozása sikertelen"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "&Részletek megjelenítése"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Az aMule OnlineAláírás fájl létrehozása sikertelen"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Barát hozzáadása"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"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/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Barát törlése"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "Ez az első alkalom, hogy az aMule %s-t futtatod"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "&Üzenet küldése"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Ez egy teszt verzió, naponta frissítve, és\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Fájlok megtekintése"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr "nem vállalunk garanciát, hogy nem omlik össze, gyújtja fel a házad,\n"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Társ Slot létesítése"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "vagy öli meg a kutyád. *Elvileg* nyugodtan használható.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Tényleg törölni szeretnéd a kiválasztott barátot?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Még több információ, támogatás és új kiadások találhatóak honlapunkon,\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Tényleg törölni szeretnéd a kiválasztott barátokat?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"a www.aMule.org-on, vagy az #aMule IRC csatornánkon az irc.freenode.net-en.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Mégsem"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Nyugodtan jelezz bármilyen hibát a http://forum.amule.org-on"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Nem lehet egynél több barát slot-ot létrehozni.\n"
-"Csak egy slot lett hozzárendelve."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Többszörös kiválasztás"
+"Az Online aláírás fájl könyvtárának megadott hely ÉRVÉNYTELEN!\n"
+" Az OnlineAláírás letiltásra kerül, amíg ki nem javítod azt a beállítások "
+"menüpontban."
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Letöltés befejezve"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Szerver hostname értesítve"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "A fájl teljes elérési útja."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Lemezterület helyfoglalás a '%s' fájl számára sikertelen: %s"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "A fájlnév könyvtár komponens nélkül."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "HIBA: Nem tudom megnyitni a napló fájlt"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "A fájl eD2k hash-e."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "FIGYELEM: a napló üres. Valami nem stimmel."
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Fájlméret bájtokban."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Napló törölve"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Összegzett letöltési aktivitás idő."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "KiszolgálóÜzenet: %s"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Új beszélgetés kezdődött"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "A %s letöltése kihagyva, mert a kívánt fájl nem újabb."
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Üzenetküldő."
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Csomópont-lista letöltése sikertelen."
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Helyhiány"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Nem sikerült megnyitni a letöltött verzió-ellenőrző fájlt"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Lemez partíció."
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Sérült verzió-ellenőrző fájl"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Hiba a befejezésnél"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Az aMule egy elavult verzióját használod!"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Fájlnév"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "A te aMule verziód %i.%i.%i, a legújabb verzió pedig %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Méret"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "A legújabb verzió mindig megtalálható a http://www.amule.org honlapon."
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Típus"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "FIGYELEM: A te aMule verziód elavult: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioritás"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Az aMule verziód naprakész."
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "Fájl ID"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Verzió-ellenőrzés fájl letöltése sikertelen."
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Kérések"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Felhasználók: %s | Fájlok: %s"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Elfogadott kérések"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Felhasználók: E: %s K: %s | Fájlok: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Átmásolt adat"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Nincs hálózat kiválasztva"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Megosztási arány"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "LowID-val"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Megszerzett részek"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "HighID-val"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Teljes források"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Kapcsolódva ehhez %s %s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Könyvtár útvonal"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Kapcsolódás %s-hez"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Megosztott fájlok"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Leválasztva az eD2k-ról"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Nagyon alacsony"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad elindítva."
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Alacsony"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad leállítva."
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normál"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Kapcsolódva a Kad-hoz (rendben)"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Magas"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Kapcsolódva a Kad-hoz (tűzfal mögül)"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Nagyon magas"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Leválasztva a Kad-ról"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Forgalomba helyez"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"A Kad hálózat nem használható, ha az UDP port le van tiltva a "
+"beállításokban, nem indítom."
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Automatikus"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "A Kad hálózat le van tiltva  a beállításokban, nem kapcsolódom."
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Megjegyzés/Értékelés hozzáadása"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"HIBA: az aMule démon nem használható, ha a külső kapcsolatok le vannak "
+"tiltva. A Külső Kapcsolatok engedélyezéséhez használd a normál aMule-t, vagy "
+"indítsd az amuled-t a --ec-config paraméterrel, vagy állítsd az "
+"\"AcceptExternalConnections\" kulcs értékét 1-re a ~/.aMule/amule.conf "
+"fájlban."
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Megjegyzés/Értékelés szerkesztése"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"HIBA: Egy érvényes jelszó szükséges a külső kapcsolatok használatához, és az "
+"aMule démon nem használható külső kapcsolatok nélkül. Az aMule démon "
+"futtatásához, az \"ECPassword\" nevű mezőt a ~/.aMule/amule.conf nevű "
+"fájlban egy megfelelő értékre kell állítanod. Indítsd az amuled-t a --ec-"
+"config paraméterrel, a jelszó beállításához. További információk http://wiki."
+"amule.org alatt találhatóak."
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: OnInit - időzítő indítása"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: háttérbe való hasadás - viszlát"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Pid fájl létrehozása nem lehetséges"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Átnevezés"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "HIBA: %s"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Add a gyűjteményben szereplő fájlokat az átviteli listához"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Ez az aMule %s, az eMule alapján."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Magnet &URI másolása a vágólapra"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "%s-en fut"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "eD2k hivatkozás másolása a vágólapra"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr "Új verzióért látogasd meg a http://www.amule.org oldalt."
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "eD2k hivatkozás másolása a vágólapra (Forrás)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "VÉGZETES HIBA: Időzítő létrehozása sikertelen"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "eD2k hivatkozás másolása a vágólapra (Forrás) (Titkosítási opciókkal)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "aMule távoli vezérlő"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "eD2k hivatkozás másolása a vágólapra (Gazda név)"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Pillanatkép:"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
-"eD2k hivatkozás másolása a vágólapra (Gazda név) (Titkosítási opciókkal)"
+"'Minden-platform' p2p ügyfél az eMule alapján \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "eD2k hivatkozás másolása a vágólapra (AICH infó)"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Honlap: http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Visszajelzés másolása a vágólapra"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Fórum: http://forum.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:504
 msgid ""
-"Feedback from: %s (%s)\n"
+"FAQ: http://wiki.amule.org \n"
 "\n"
 msgstr ""
-"Visszajelzés %s-től (%s):\n"
+"GYIK: http://wiki.amule.org \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Érvényes forráshivatkozáshoz magas azonosító (HighID) szükséges"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "FIGYELEM"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Megosztott fájlok (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[Részfájl]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Írd be az új nevet ennek a fájlnak:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Fájl átnevezés"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Fájl feltöltés folytatása: %s"
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Fájl feltöltés felfüggesztése: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMule szöveges kliens"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: a keresési kulcsszó túl rövid"
-
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "%u Kad kapcsolat beolvasva"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Kapcsolat: admin@amule.org (adminisztratív ügyekben) \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Csak %d Kad kapcsolat elérhető, a nodes.dat fájl nem lett felülírva"
-
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "%d Kad kapcsolat kiírva"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "HIBA: A TCP porton nem lehet hallgatni."
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Az aMule részben a következőn alapul: \n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "web ügyfél kapcsolat elfogadva\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Egyenrangú útvonal-megállapítás a XOR metrika alapján.\n"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "HIBA: nem tudom fogadni a web ügyfél kapcsolatot\n"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Üzenet"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "A kérés sikertelen volt a következő hibával: %s."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "aMule dialógus elpusztítva"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Kérés ismeretlen hibával sikertelen."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Kapcsolódás"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Index fájl nem található: "
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2K: Kapcsolódás"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Munkafolyamat időtúllépés - bejelentkezés kérése\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Szétkapcsolva"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Munkamenet rendben, bejelentkezve\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Tűzfal mögött"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Munkamenet rendben, nincs bejelentkezve\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Csatlakozva"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Nincs munkafolyamat megnyitva - bejelentkezés kérése\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Kapcsolódás"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Munkafolyamat létrehozva - bejelentkezés kérése\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Nincs kapcsolat"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Kérés feldolgozása [eredeti]: "
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Mégsem"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Jelszó ellenőrzése \n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Aktuális kapcsolódási kísérletek leállítása"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Jelszó hash érvénytelen\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Szétkapcsolás"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Jelszó rendben\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Leválaszt az éppen kapcsolódott hálózatokról."
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Hibás jelszó\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Kapcsolatfelvétel"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Nem adtál meg jelszót. Üres jelszó nem megengedett.\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Kapcsolódás a pillanatnyilag engedélyezett hálózatokhoz."
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Kijelentkezés\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Fel: %.1f(%.1f) | Le: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Kérés feldolgozása [átirányított]: "
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Fel: %.1f | Le: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Betölti a(z) <str> sablont"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Kapcsolódva)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Web kiszolgáló HTTP port"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Nincs kapcsolat)"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "UPnP port továbbítás használata a web kiszolgáló porton"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Biztos, hogy ki szeretnél lépni a(z) %s alkalmazásból?"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP port"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Kilépés megerősítése"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Gzip tömörítés használata"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Parancs futtatása: "
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- alapértelmezett -"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Teljes jogú jelszó a web kiszolgálóhoz"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "A(z) '%s' felület könyvtár nem létezik"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Vendég jelszó a web kiszolgálóhoz"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "FIGYELEM: Nem tudom a(z) '%s' felület fáljt megnyitni olvasásra"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Vendég felhasználó engedélyezése"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Hálózatok"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "vendég felhasználó tiltása"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Hálózatok ablaka"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr ""
-"A web kiszolgáló beálításait a távoli aMule-től kéri, illetve oda menti"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Keresések"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMule konfig fájl útvonala. NE HASZNÁLD!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Keresés ablaka"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "PHP feldolgozó letiltása (nem ajánlott)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Letöltések"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "PHP oldalak újrafordítása minden kérésnél"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Letöltések ablaka"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule Web kiszolgáló"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Megosztott fájlok"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Nem elérhető"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Megosztott fájlok ablaka"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Soha"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Üzenetek"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Letöltés..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Üzenetek ablaka"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statisztikák"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "Az elvárt %d bájt helyett %d bájt lett letöltve"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Statisztikai grafikonok ablaka"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "amulesig.dat fájlt tartalmazó könyvtár"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Tulajdonságok beállításának ablaka"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Tallóz"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importálás"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Itt azt a könyvtárat add meg, ahol az amulesig.dat fájl található"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "A részfájl importáló eszköz"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Frissítés gyakorisága mp-ben"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Névjegy"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Statisztikai kép készítése minden frissítés alkalmával"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Névjegy/Súgó"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Itt azt a könyvtárat add meg, ahová a statisztikát akarod elkészíteni"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "eD2k hálózat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Statisztikai kép periódikus feltöltése FTP kiszolgálóra"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Kad hálózat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP Url"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Nincs hálózat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP útvonal"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "aMule távoli vezérlő"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Itt az FTP kiszolgálójának az URL-jét add meg"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "Könyvtár megadása"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Végzetes hiba: a Mag Időzítőjének létrehozása sikertelen"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Felhasználó"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Kapcsolódás a távoli aMule-hez"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Jelszó"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Végzetes hiba: a Lekérdezés Időzítőjének létrehozása sikertelen"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Esemény ciklus megkezdése..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Kapcsolódás..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr ""
-"Itt a felhasználói nevet add meg az FTP kiszolgálóra törénő bejelentkezéshez"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Kapcsolódás sikertelen "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Itt a jelszavad add meg az FTP kiszolgálóra törénő bejelentkezéshez"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Távoli GUI EC esemény kezelő"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Kikapcsolás folyamatban"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "FTP frissítési gyakorisága percekben"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Kapcsolat sikertelen. Kapcsolat felvétel %s:%d-el nem lehetséges\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Mentés"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Kapcsolat megszünt - aMule valószínüleg befejeződött."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Aláírás fájlt tartalmazó könyvtár"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Készen"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "A statisztika készítésének könyvtára"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Mind"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:631
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i nap %i óra %i perc %i mp"
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, aMule Online Statisztikák"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Üdvözöljük!"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule "
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
+"A '%s' könyvtár létrehozása a '%s' kategóriához nem lehetséges, a '%s' "
+"könyvtár megtartva."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Legmagasabb letöltési arány a wxCas futása óta"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Ismeretlen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Abszolút legmagasabb letöltési arány a wxCas előző futása alatt"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Megosztott fájlok lehozatala sikertelen a(z) '%s' felhasználótól"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Töröl"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Pajtás keresése lowid kapcsolatra"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Rendszer"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Hamis eMule %#x verzió)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Automatikus frissítés leállítása"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Hamis eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Online statisztikák mentése"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Hamis eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Online statisztikák nyomtatása"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x  (az eMule v0.%u alapján)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Tulajdonságok beállítása"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Becenév: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "wxCas Névjegy"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Kért: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Automatikus frissítés elindítása"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Fájlstatisztika ehhez a folyamathoz: %d kérés elfogadva %d-ből, %s "
+"átmásolva\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Automatikus frissítés leállítva"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Fájlstatisztika az összes folyamathoz: %d kérés elfogadva %d-ből, %s "
+"átmásolva\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Automatikus frissítés elindítva"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Ismeretlen lekérdezett fájl"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Statisztikák mentése"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Üzenet kiszűrve '%s'-től (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMule online statisztikák"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Új üzenet '%s'-től (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/BaseClient.cpp:2899
+#, c-format
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"Nyomtatási probléma történt.\n"
-"Lehet, hogy a nyomtatód nincs helyesen beállítva?"
+"A(z) %s (%u) felhasználó lekérdezte a nem létező '%s' könyvtárban megosztott "
+"fájljaid listájá -> Mellőzve"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Nyomtatás"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "FIGYELEM: %s nem nyitható meg."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
-"wxCas, aMule OnLine Aláírás Statisztikák\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pedro de Oliveira <falso@rdk.homeip.net> által készített CAS alapokon\n"
-"\n"
-"Distributed under GPL"
+"FIGYELEM: A megszakított fájlok listája sérült, érvénytelen fejlécet "
+"tartalmaz."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Ó ó, az aMule nem fut..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule fut"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "Az aMule fut, de nincs kapcsolódva"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "IO hiba a %s fájl olvasása közben: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule kapcsolódása folyamatban..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Hiba a %s fájl mentése közben: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Ó-Ó, az aMule állapota ismeretlen..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Captcha megadása"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategória"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " fut "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Új kategória"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " megállt !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Könyvtár kiválasztása az érkező fájloknak"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " nincs kapcsolódva !"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Meg kell adnod a kategória nevét!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " kapcsolódás folyamatban ..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Meg kell adnod a kategória elérési útvonalát!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " valami különös történik, ellenőrízd !"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Bejövő könyvtár létrehozása sikertelen a kategóriához. Kérlek érvényes "
+"elérési utat adj meg!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " kapcsolódva ehhez: "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Csevegési folyamat elindítva: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Connected to Client ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "rendben"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Kapcsolódás a klienshez ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "tűzfal mögül"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Kapcsolódás sikertelen / Kapcsolat elveszítve ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "nincs"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
+"*** A captcha vizsgálaton túlestél és a felhasználó megkapta az üzenetet. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " csatlakozva ehhez "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** A megadott captcha hibás volt, így az üzenet nem lett tudomásul véve. "
+"Egy új üzenet küldésével újabb captcha-t kérhetsz. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " ezzel "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Csevegés"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Összes letöltés: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Fül bezárása"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Feltöltés: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Az összes fül bezárása"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Szakasz letöltés: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "A többi fül bezárása"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Letöltés: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Hozzáadás a barátokhoz"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Feltöltés: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Kredit fájl betöltve, %u kliens ismert"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - %u kliens kreditérvényessége lejárt!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Megosztva: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "A 'cryptkey.dat' fájlt nem találom, létrehozok egyet."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " fájl(ok), Várólistás kliensek száma: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Kliens részletei"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Idő: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LowID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " IP címen "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Engedélyezve"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Rendszer betöltési átlag (1-5-15 perc): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Támogatott"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "A rendszer aktivitási ideje (uptime): "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Nem támogatott"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02un %02uó %02uperc %02ump"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Letiltva"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uó %02uperc %02ump"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Csatlakozva"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02uperc %02ump"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Szétkapcsolva"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02ump"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Befejezetlen"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LowID"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Rossz fiú"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Nincs kapcsolódva"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Hitelesítés - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Nem elérhető"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr ""
+"A(z) %s (%u) felhasználó lekérdezte a megosztott fájlok listáját -> Elfogadva"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+"A(z) %s (%u) felhasználó lekérdezte a megosztott fájlok listáját -> "
+"Megtagadva"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"A(z) %s (%u) felhasználó lekérdezte megosztott könyvtáraid listáját -> "
+"Elfogadva"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Megszakítva !"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+"A(z) %s (%u) felhasználó lekérdezte megosztott könyvtáraid listáját -> "
+"Megtagadva"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "Unable to open %s"
-msgstr "%s-t nem lehet megnyitni"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Bemeneti paraméterek"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Fájl tördelőalgoritmizálása"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "URL(ek) hozzáadása ehhez a fájlhoz (nem kötelező)"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Itt azt a fájlt add meg, amelyhez eD2k hivatkozást akarsz generálni"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Itt add meg az URL-t amit az eD2k hivatkozáshoz szeretnél adni; ha a "
-"végére / jelet teszel, az aLinkCreator automatikusan hozzáfűzi az aktuális "
-"fájlnevet."
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Hozzáad"
+"A(z) %s (%u) felhasználó lekérdezte a '%s' könyvtárban megosztott fájljaid "
+"listáját -> elfogadva"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Eltávolít"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Törlés"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Hivatkozás készítése rész-hash-ekkel"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Új és ritka fájlokat segít gyorsabban elterjeszteni megnövelt "
-"hivatkozásméret segítségével"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4 fájl hash"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k fájl hash"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k hivatkozás"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Indít"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Ment"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Másolás a vágólapra"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Kilépés"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Megnyitás"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Fájl megnyitása, amire eD2k hivatkozást kell készíteni"
+"A(z) %s (%u) felhasználó lekérdezte a '%s' könyvtárban megosztott fájljaid "
+"listáját -> megtagadva"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Másolás"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "A számított eD2k hivatkozás másolása a vágólapra"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Mentés másként"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "A számított eD2k hivatkozás mentése fájlba"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Névjegy"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "aLinkCreator Névjegy"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Válaszd ki a fájlt, hogy kiszámíttasd az eD2k hivatkozását"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Nem tudom megnyitni a vágólapot"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Nem került másolásra semmi !"
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "A(z) %s (%u) felhasználó megosztja a '%s' könyvtárat"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Válaszd ki a fájlt a számított eD2k hivatkozásodnak"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "A(z) %s (%u) felhasználó kéretlen megosztott könyvtárakat küldött."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Nem lehet megnyitni"
+#: src/ClientTCPSocket.cpp:982
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr ""
+"A(z) %s (%u) felhasználó elküldte megosztott fájljai listáját a '%s' "
+"könyvtárhoz"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Kérlek, ne üres fájlnevet adj meg"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr ""
+"A(z) %s (%u) felhasználó befejezte megosztottfájl-listájának elküldését"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Nem került mentésre semmi !"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "A(z) %s (%u) felhasználó kéretlen megosztottfájl-listát küldött"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
-"aLinkCreator, az aMule eD2k hivatkozás készítője\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Képek: http://www.everaldo.com, http://www.icomania.com\n"
-"és http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"GPL alatt terjesztve"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Tördelőalgoritmizálás..."
+"A(z) %s (%u) felhasználó megtagadta a megosztott könytár/fájl listájához "
+"történő hozzáférést"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "Az aLinkCreator dolgozik"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Fájl megjegyzés"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "MD4 hash számítása..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Felhasználói név"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "eD2k hash-ek számítása..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Fájlnév"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Elkészült  %.2f mp alatt"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Értékelés"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Ezt az URL-t már felvette a letöltési listába !"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Megjegyzés"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Kérlek, ne üres URL-t adj meg "
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Nincs megjegyzés"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "%u fájl számának feldolgozása: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Rész-hash-eket kért (Csak 9.5 MB fájlméret fölött lehet használni)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u megjegyzés"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Nem létező fájl !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, az aMule eD2k hivatkozás készítője"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"Kliens %s kitiltva az összesen %s adatból %s hibás adat küldése miatt a '%s' "
+"fájlt illetően."
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1316,31 +1158,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Ma]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Kapcsolódás"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Nagyon alacsony"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Alacsony"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normál"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Magas"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Nagyon magas"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Forgalomba helyez"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Engedély kérése"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Kapcsolódás a kiszolgálón keresztül"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Várólista betelt"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "Várólistások"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Átvitel"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Letöltés alatt"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1366,8 +1234,7 @@
 msgid "Too many Kad connections"
 msgstr "Túl sok Kad kapcsolat"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Kitiltott"
 
@@ -1399,8 +1266,8 @@
 msgid "Remote Server"
 msgstr "Távoli kiszolgáló"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1422,10 +1289,10 @@
 
 #: src/DataToText.cpp:135
 msgid "Search Result"
-msgstr "Keresés eredmény"
+msgstr "Keresés eredménye"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Befejezett"
 
@@ -1449,7 +1316,7 @@
 msgid "ERROR: Failed!"
 msgstr "HIBA: Sikertelen!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "Várólistán"
 
@@ -1461,865 +1328,305 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Ismeretlen vagy rossz ideiglenes-fájl formátum."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Alapértelmezett"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albán"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arab"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asztúriai"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Baszk"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bolgár"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Katalán"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Kínai (egyszerűsített)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Kínai (hagyományos)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Horvát"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Cseh"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Dán"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Holland"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Angol (Egyesült Királyság)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Észt"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finn"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Rész"
 
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Francia"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Gall"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Német"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Görög"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Héber"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Magyar"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Olasz"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Olasz (Svájci)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japán"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Koreai"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Litván"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvég (Nynorsk)"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Méret"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Lengyel"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Átmásolva"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugál"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Sebesség"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugál (Brazíliai)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Folyamatjelző"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Orosz"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Források"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Szlovén"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioritás"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Spanyol"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Állapot"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Svéd"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Hátralévő idő"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Török"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Utoljára teljesnek látott"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ukrán"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Utoljára fogadott"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Nem tudom meghatározni a kiválasztott böngészőt!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Biztos, hogy törlöd a kiválasztott fájlt?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"A TCP port nem lehet magasabb 65532-nél, mert a kiszolgáló UDP port = TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Biztos, hogy törlöd a kiválasztott fájlokat?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Alapértelmezett port lesz használva (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Kiszolgáló neve"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "IP-cím"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Leírás"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Felhasználók"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Fájlok"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Sikertelen"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Állandó"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Verzió"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Olyan kiszolgálót próbál törölni, amelyikhez csatlakozva van. Kérém először "
-"válassza le. A kiszolgáló NEM került törlésre."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Infó"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Ismeretlen név)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Biztos, hogy törlöd az állandó %s kiszolgálót"
+"Visszajelzés %s-től (%s):\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Igen"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Automatikus"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Nem"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Állj"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Nem sikerült megnyitni a '%s'-t"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Szüneteltet"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Kiszolgálók száma (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Folytatás"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Kiszolgáló"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "Befejezettek &eltávolítása"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Kapcsolódás a kiszolgálóhoz"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Összes A4AF cseréje ehhez a fájhoz most"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Kiszolgáló megjelölése állandóként"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Összes A4AF cseréje ehhez a fájhoz most (Automatikusan)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Kiszolgáló megjelölése nem állandóként"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Összes A4AF cseréje a többi fájhoz most"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Kiszolgálók megjelölése állandóként"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Kibővített beállítások"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Kiszolgálók megjelölése nem állandóként"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Előnézet"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Kiszolgáló eltávolítása"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Fájl &részleteinek megjelenítése"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Kiszolgálók eltávolítása"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Összes megjegyzés megjelenítése"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Összes kiszolgáló eltávolítása"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Magnet URI másolása a vágólapra"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
 msgstr "eD2k hivatkozás másolása a vágólapra"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "eD2k hivatkozások másolása a vágólapra"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Visszajelzés másolása a vágólapra"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Újracsatlakozás a kiszolgálóhoz"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "hozzárendelés megszüntetése"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Biztos, hogy törlöd az összes kiszolgálót?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Hozzárendelés kategórához"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Biztos, hogy törlöd a kiválasztott kiszolgálót?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "Fájl &megnyitása"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Biztos, hogy törlöd a kiválasztott kiszolgálókat?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Írd be az új nevet ennek a fájlnak:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Tiltva [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Fájl átnevezés"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Ez az aMule %s, az eMule alapján."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y.%m.%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "%s-en fut"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr "Új verzióért látogasd meg a http://www.amule.org oldalt."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "VÉGZETES HIBA: Időzítő létrehozása sikertelen"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMule távoli vezérlő"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Pillanatkép:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" 'Minden-platform' p2p ügyfél az eMule alapján \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Honlap: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Fórum: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" GYIK: http://wiki.amule.org\n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Kapcsolat: admin@amule.org (adminisztratív ügyek) \n"
+msgid "Downloads (%i)"
+msgstr "Letöltések (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Az aMule részben a következőn alapul: \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Egyenrangú útvonal-megállapítás a XOR metrika alapján.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Üzenet"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2K: Kapcsolódás"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Szétkapcsolva"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Tűzfal mögött"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Csatlakozva"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Kapcsolódás"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Nincs kapcsolat"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Aktuális kapcsolódási kísérletek leállítása"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Szétkapcsolás"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Leválaszt az éppen kapcsolódott hálózatokról."
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Kapcsolatfelvétel"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Kapcsolódás a pillanatnyilag engedélyezett hálózatokhoz."
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Fel: %.1f(%.1f) | Le: %.1f(%.1f)"
+"Állítsd be a kedvenc videó-lejátszódat a beállításoknál,\n"
+" hogy ezt a figyemeztetést ne kapd minden előnézetnél (alapértelmezett az "
+"mplayer)."
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Fel: %.1f | Le: %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Fájl előnézet"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Kapcsolódva)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "HIBA: Külső média-lejátszó indítása sikertelen! Parancs: `%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Nincs kapcsolat)"
+msgid "Saving PartFile %u of %u"
+msgstr "PartFile mentése %u a(z) %u-ból"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Biztos, hogy ki akarsz lépni az aMule-ból?"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Az összes PartFile kimentve."
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Kilépés megerősítése"
-
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "A(z) '%s' felület könyvtár nem létezik"
+msgid "Loading temp files from %s."
+msgstr "Temp fájlok betöltése %s-ról."
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "FIGYELEM: Nem tudom a(z) '%s' felület fáljt megnyitni olvasásra"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Hálózatok"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Hálózatok ablak"
+msgid "Loading PartFile %u of %u"
+msgstr "PartFile betöltése %u a(z) %u-ből"
 
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Keresések"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Keresések ablak"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Átvitelek"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Fájl átvitelek ablak"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Megosztott fájlok"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Megosztott fájlok ablak"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Üzenetek"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Üzenetek ablak"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statisztikák"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Statisztika grafikon ablak"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Beállítások ablak"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importálás"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "A részfájl importáló eszköz"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Névjegy/Súgó"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "eD2k hálózat"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Kad hálózat"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Nincs hálózat"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Általános"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Csatlakozás"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Mappák"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Kiszolgálók"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Biztonság"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Felület"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Szűrők"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Távoli elérés"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Online aláírás"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Haladó"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Események"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Hibakeresés"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Felhasználó által megadott"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"Újra kell indítani az aMule-t, hogy az alábbi változás(ok) érvénybe lépjen"
-"(ek):\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP port megváltozott.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP port megváltozott.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"Az automatikusan frissített kiszolgáló lista üres.\n"
-"A 'kiszolgáló lista automatikus frissítése induláskor' letiltva."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Engedélyezted a távoli elérést, de nem adtál meg jelszót.\n"
-"A távoli elérés nem használható érvényes jelszó nélkül."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Nyelv megváltozott.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Ideiglenes mappa megváltozott.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- ED2K hálózat engedélyezve.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Fel: 0.0 | Le: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Az eD2k és a Kad hálózat is le van tiltva.\n"
-"Nem fogsz tudni kapcsolódni, amíg legalább az egyiket nem engedélyezed."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"A Kad nem fog elindulni, ha az UDP portod le van tiltva.\n"
-"Engedélyezd az UDP portot vagy tiltsd le a Kad-ot."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"Most újra KELL indítanod az aMule-t.\n"
-"Ha nem indítod újra most, ne panaszkodj, ha bármi rossz történik.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Az automatikusan frissített kiszolgáló lista üres.\n"
-"Kérlek adj meg legalább egy URL-t, ami érvényes server.met fájlra mutat .\n"
-"Az URL megadásához klikkelj a \"Lista\" gombra ezen checkbox mellett."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "az Ideiglenes fájloknak"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Bejövő fájlok"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "az Online aláírásnak"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Válassz egy mappát a %s-nek"
+"HIBA: A biztonsági mentés betöltése sikertelen. Keressen a http://forum."
+"amule.org oldalon .part.met visszaállítási lehetőségeket."
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Böngészés a videolejátszóhoz"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Az összes PartFile betöltve."
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Válaszd ki a böngésződet"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Nem található .part fájl"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Futtatható%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Kiszolgáló lista szerkesztése"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "%u .part fájlt találtam"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"URL-ek felvétele a server.met fájl letöltéséhez.\n"
-"Egy sorba csak egy URL."
+"Az ideiglenes fájlok könyvtárának fájlrendszere nem tudja kezelni a nagy "
+"fájlokat."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Frissítés késleltetése: %d másodperc"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"A bejövő fájlok könyvtárának fájlrendszere nem tudja kezelni a nagy fájlokat."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Grafikon átlagos ideje: %d perc"
+msgid "Downloading %s"
+msgstr "Letöltés %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Kapcsolatok grafikon-skálája: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Már megkísérelted a(z) '%s' fájlt letölteni"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Frissítés késleltetése: %d másodperc"
+msgid "You already have the file '%s'"
+msgstr "Már megvan ez a fájl: '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Fájl buffer méret: %d bájt"
+msgid "You are already trying to download the file %s"
+msgstr "Már próbálod letölteni a(z) '%s' fájlt."
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Feltöltési várólista nagysága: %d kliens"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "A magnet hivatkozás nem konvertálható eD2k-ra: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Kiszolgáló kapcsolat frissítési gyakorisága: %d perc"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Kiszolgáló kapcsolat frissítési gyakorisága: Tiltva"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "UDP port a bővített kiszolgáló kéréseknek (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "letiltva"
+msgid "Unknown protocol of link: %s"
+msgstr "A következő hivatkozás protokollja ismeretlen: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Parancs végrehajtása a(z) '%s' eseménynél"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Parancs futtatása a magon"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Mag parancs:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Parancs futtatása a grafikus felületen"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "GUI parancs:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "A következő változók lesznek behelyettesítve:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Érvénytelen eD2k hivatkozás! HIBA: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Jogosulatlan hozzáférési kísérlet. Kapcsolat lezárva."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "Kliens csomagot küldött sikertelen hitelesítést követően."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Külső kapcsolat lezárva."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "A külső kapcsolatok letiltásra kerültek üres jelszó miatt!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "A külső kapcsolatok le vannak tiltva konfig fájlban"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Új külső kapcsolat elfogadva"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "HIBA: nem tudtam fogadni egy új külső kapcsolatot"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Külső kapcsolat elutasítva, üres jelszó a beállításokban!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Kapcsolódó kliens: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Ismeretlen verzió"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2327,2228 +1634,1057 @@
 "Helytelen EC verzió azonosító, összeférhetetlenség lehetséges. A fő- és a "
 "távoli programot ugyanabból a pillanatképből használd."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"Nem kapcsolódhatsz egy kiadott változathoz akármilyen SVN változattal! "
-"*sóhaj* lehetséges összeomlás megelőzve"
+"Nem kapcsolódhatsz egy kiadott verzióhoz egy tetszőleges fejlesztés alatti "
+"verzióval! *sóhaj* lehetséges összeomlás megelőzve"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Hitelesítés sikertelen."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Érvénytelen protokoll verzió."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Hiányzó protokoll verzió azonosító."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
-msgstr "Érvénytelen kérés, először hitelesítened kellene."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr "Hitelesítés sikertelen: az EC jelszóként megadott hash érvénytelen."
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Hitelesítés sikertelen: rossz jelszó."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Hitelesítés sikertelen: hiányzó jelszó."
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
+msgstr "Érvénytelen kérés, először hitelesíteni kell."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Hozzáférés elfogadva."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Hibaüzenet elküldve a \"%s\" klienshez."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Jogosulatlan hozzáférési kísérlet %s részéről. Kapcsolat lezárva."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Távoli PartFile parancs sikertelen: nem található FileHash: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "FileHash nem található: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "Hoppá! Opkód feldolgozási hiba!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Kiszolgáló nem lett hozzáadva"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "kiszolgáló nem található: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "ki kell jelölnöd a kiszolgálót az eltávolításhoz"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "Az eD2k le van tiltva a beállításokban."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Keresés folyamatban. Kérdezze le az eredményeket egy rövid idő múlva!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Webes keresésnek a távoli felületről nincs értelme."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "A Kad le van tiltva a beállításokban."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Nincsenek pontok a grafikonhoz."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "A kliensed nincs beállítva ehhez a részletességi szinthez."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Külső kapcsolat: leállítás kérve"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Kikapcsolás folyamatban."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: hivatkozás hozzáadása: '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Érvénytelen hivatkozás, vagy már rajta van a listán."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Fájl nem található."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Érvénytelen fájl név."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Nem tudom átnevezni a fájlt."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "A Kad le van tiltva a beállításokban."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Már csatlakozva az eD2k-hoz."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Kapcsolódás az eD2k-hoz..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Már kapcsolódva a Kad-hoz."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Kapcsolódás a Kad-hoz..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Minden hálózat le van tiltva."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Leválasztva az eD2k-ról."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Leválasztva a Kad-ról."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Külső kapcsolat: érvénytelen opcode: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Érvénytelen opcode (rossz protokoll verzió?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Nem sikerült megnyitni a fájlt (%s), eltávolítom a megosztott fájlok "
-"listájáról."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Hash-készlet kérés az ismeretlen %s fájlhoz"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "A parancs `%s' (pid=%d) befejeződött `%d' állapotkóddal."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Kiszolgáló nem lett hozzáadva: IP vagy host név nincs megadva."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Kiszolgáló nem lett hozzáadva: Érvénytelen kiszolgáló-port."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "eD2k állapot:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Csatlakozva"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Port"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kademlia állapot:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Fut"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Állapot:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Szétkapcsolva"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Kapcsolat állapota:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Tűzfal mögött"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Tűzfal állapot: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Pajtáshoz kapcsolódva"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Nincs pajtás"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Átlagos felhasználószám:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Átlagos fájlszám:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "nem fut"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Aktivitási idő: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Átvitel"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Feltöltések"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Feltöltött adatok (folyamat (összesen)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Összes többletterhelés (csomagok): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Fájlkérés többletterhelése (csomagok): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Forrásváltás többletterhelése (csomagok): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Kiszolgáló többletterhelése (csomagok): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Kad többletterhelés (csomagok): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Titkosítás többletterhelés (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Aktív feltöltések: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Várakozó feltöltések: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Összes sikeres feltöltési folyamat: %s"
-
-#: src/Statistics.cpp:665
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Összes sikertelen feltöltési folyamat: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Átlagos feltöltési idő: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Letöltések"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Letöltött adatok (folyamat (összesen)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Forrás találatok: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Aktív letöltések száma (adatelemek): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Fel:Le töltési folyamat aránya (összesen): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Átlagos letöltési arány (folyamat): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Átlagos feltöltési arány (folyamat): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Maximum letöltési arány (folyamat): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Maximum feltöltési arány (folyamat): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Újrakapcsolódások: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Első átvitel óta eltelt idő: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Kiszolgálóhoz kapcsolódva: %s óta"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Aktív kapcsolatok száma (becsült): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Max kapcsolódási korlát elérve: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Kapcsolatok átlagos száma (becsült): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Legtöbb kapcsolat (becsült): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Kliensek"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Kiszűrve"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Összesen: %i Ismert: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Működő kiszolgálók: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Sikertelen kiszolgálók: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Összes: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Törölt kiszolgálók: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Kiszűrt kiszolgálók: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Felhasználók száma a működő kiszolgálókon: %llu"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Ismeretlen bővítmény '%s' a '%s' parancshoz.\n"
 
-#: src/Statistics.cpp:721
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Fájlok a működő kiszolgálókon: %llu"
+msgid "Unknown command '%s'.\n"
+msgstr "Ismeretlen parancs: '%s'.\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Összes felhasználó: %llu"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Ennek a parancsnak nem lehet argumentuma.\n"
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "Összes fájl: %llu"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Ennek a parancsnak kötelező az argumentum.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Kiszolgáló leterheltség: %.2f%%"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Ez a parancs nem teljes, az alábbi bővítmények valamelyikét kell "
+"használnod.\n"
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Megosztott fájlok száma: %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Elérhető bővítések:\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Megosztott fájlok teljes mérete: %s"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Elérhető parancsok:\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Average file size: %s"
-msgstr "Átlagos fájlméret: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Operációs rendszer"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Nem fogadott"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Kivágás"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Beillesztés"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Mindent kijelöl"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad keresést nem lehet végrehajtani ha a Kad nem fut"
-
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "eD2k keresést nem lehet végrehajtani, ha nincs kapcsolódva az eD2k-hoz"
-
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Nem várt hiba amíg a Kad kereséssel próbálkoztam: "
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Minden parancs érzéketlen a kis-/nagybetűkre.\n"
+"Ha részletes infót akarsz egy <parancs>-ról, add ki a '%s <parancs>' "
+"parancsot.\n"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Üzenet kiszűrve '%s'-től (IP:%s)"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Kilép az alkalmazásból."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Új üzenet '%s'-től (IP:%s)"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Súgó megjelenítése."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
-"A(z) %s (%u) felhasználó lekérdezte a megosztott fájlok listáját -> Elfogadva"
+"Ha egy parancsról kérsz súgót, használd a 'help <parancs>'-ot.\n"
+"A teljes parancslistához használd a 'help'-et.\n"
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
-"A(z) %s (%u) felhasználó lekérdezte a megosztott fájlok listáját -> "
-"Megtagadva"
+"\n"
+"A parancslistához használd a '%s'-et\n"
+"\n"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"A(z) %s (%u) felhasználó lekérdezte megosztott könyvtáraid listáját -> "
-"Elfogadva"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Szintaktikai hiba!"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
-"A(z) %s (%u) felhasználó lekérdezte megosztott könyvtáraid listáját -> "
-"Megtagadva"
+"Hiba a parancs feldolgozásában - soha sem kellene előfordulnia! Kérlek, "
+"küldd el a hibajelentést\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"A(z) %s (%u) felhasználó lekérdezte a megosztott fájlok listáját a %s "
-"könyvtárban -> elfogadva"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Ennek a parancsnak nem kellene paraméterének lennie."
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"A(z) %s (%u) felhasználó lekérdezte a  megosztott fájljok listáját a %s "
-"könyvtárban -> megtagadva"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Ennek a parancsnak kötelező paramétert adni."
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "A(z) %s (%u) felhasználó megosztja a %s könyvtárat"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Érvénytelen paraméter."
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "A(z) %s (%u) felhasználó kéretlen megosztott könyvtárakat küldött."
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Ez a parancs így nem teljes."
 
-#: src/ClientTCPSocket.cpp:1025
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr ""
-"A(z) %s (%u) felhasználó elküldte megosztott fájljok listáját a %s "
-"könyvtárhoz"
+msgid "Type '%s' to get more help.\n"
+msgstr "A '%s' paranccsal kaphatsz bővebb segítséget.\n"
 
-#: src/ClientTCPSocket.cpp:1032
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr ""
-"A(z) %s (%u) felhasználó befejezte megosztottfájl-listájának elküldését"
+msgid "This is %s %s %s\n"
+msgstr "Ez a(z) %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1037
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "A(z) %s (%u) felhasználó kéretlen megosztottfájl-listát küldött"
+msgid "This is %s %s\n"
+msgstr "Ez a(z) %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
-"A(z) %s (%u) felhasználó megtagadta a megosztott könytár/fájl listájához "
-"történő hozzáférést"
+"\n"
+"Kliens létrehozása...\n"
 
-#: src/KadDlg.cpp:132
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Nodes (%u)"
-msgstr "Csomópontok (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Érvénytelen IP a rendszerindításhoz"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Érvénytelen port a rendszerindításhoz"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Kérlek töltsd ki az összes kötelező mezőt"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Biztos, hogy le akarsz tölteni egy új nodes.dat fájlt?\n"
-
-#: src/KadDlg.cpp:197
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Ezzel eltávolítod az aktuális csomópontokat és újraindul a Kademlia "
-"kapcsolat."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Folytassuk?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "HIBA: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "FIGYELEM: "
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Barát hozzáadása"
+"\n"
+"Ok, kilépés a %s-ből...\n"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Érvényes IP címet és portot kell megadnod!"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
+"Jelszó nélkül nem lehet csatlakozni.\n"
+"Meg kell adnia egy jelszót vagy a konfig fájlban,\n"
+"vagy a parancssorban, vagy beírni amikor kérem.\n"
+"\n"
+"Kilépés...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Információ"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "E súgó megjelenítése."
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "A megadott felhasználói azonosító (userhash) érvénytelen!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Host, ahol az aMule fut (alap: localhost)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Források"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Az aMule Távoli Elérés portja (alap: 4712)"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Fájl"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Külső kapcsolat jelszava."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Letöltés"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Konfiguráció betöltése fájlból."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategória"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Nem ír ki semmit a szabvány kimenetre."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Alap"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Legyen bőbeszédű - mutassa a hibakeresési üzeneteket is."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Letöltés kategóriába"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Beállítja a program nyelvét."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Kapcsolódó fájlok keresése (eD2k, helyi kiszolgáló)"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "A parancssori opciók konfig fájlba írása."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Ismertként megjelölés"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Konfig fájl létrehozása az aMule konfig fájlja alapján."
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Kapcsolódás a távoli aMule-hez"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "A program verziójának kiírása."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Kapcsolódás sikertelen "
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Fájl részletei"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "HIBA"
+#: src/FileDetailDialog.cpp:113
+#, c-format
+msgid "%.1f%% done"
+msgstr "%.1f%% kész"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Kapcsolódás sikertelen. Nem lehet kapcsolódni a %s:%d-hez.\n"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
-"FIGYELEM: Nem adhatod magad forrásként egy eD2k hivatkozáshoz amíg alacsony "
-"azonosítód (lowid) van."
+"A barátokat tartalmazó emfriends.dat fájl olvasásra megnyitása sikertelen!"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Felhasználók: E: %s K: %s | Fájlok: E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+"A barátokat tartalmazó emfriends.dat fájl írásra megnyitása sikertelen!"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Mind"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "KRITIKUS - nincsen kliens a StartChatSession-en"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Összes felhasználó: %s | Összes fájl: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Barátok"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Átmásolva"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "&Részletek megjelenítése"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Sebesség"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Barát hozzáadása"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Folyamatjelző"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Barát törlése"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Állapot"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "&Üzenet küldése"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Hátralévő idő"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Fájlok megtekintése"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Utoljára teljesnek látott"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Társ Slot létesítése"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Utoljára fogadott"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Tényleg törölni szeretnéd a kiválasztott barátot?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Biztos, hogy törlöd a kiválasztott fájlt?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Tényleg törölni szeretnéd a kiválasztott barátokat?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Biztos, hogy törlöd a kiválasztott fájlokat?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Nem lehet egynél több barát slot-ot létrehozni.\n"
+"Csak egy slot lett hozzárendelve."
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Többszörös kiválasztás"
+
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Üzenet küldése ennek a személynek"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Küldendő üzenet:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Állj"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Szüneteltet"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Folytatás"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "Befejezettek &eltávolítása"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Összes A4AF cseréje ehhez a fájhoz most"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Összes A4AF cseréje ehhez a fájhoz most (Automatikusan)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Összes A4AF cseréje a többi fájhoz most"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Kibővített beállítások"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Előnézet"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Fájl &részleteinek megjelenítése"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Összes megjegyzés megjelenítése"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Magnet URI másolása a vágólapra"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "hozzárendelés megszüntetése"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Hozzárendelés kategórához"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "Fájl &megnyitása"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Eltávolítás a barátok közül"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Hozzáadás a barátokhoz"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Üzenet küldése"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Csere ehhez a fájlhoz"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y.%m.%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
-msgstr "QR: %u (%i)"
+msgid "On Queue: %u (%i)"
+msgstr "Várólistán: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Másik fájl kérve"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Letöltések (%i)"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Várakozás feltöltési slot-ra"
 
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Állítsd be a kedvenc videó-lejátszódat a beállításoknál,\n"
-" hogy ezt a figyemeztetést ne kapd minden előnézetnél (alapértelmezett az "
-"mplayer)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Fájl előnézet"
-
-#: src/DownloadListCtrl.cpp:2320
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "HIBA: Külső média-lejátszó indítása sikertelen! Parancs: `%s'"
+msgid "On Queue: %u"
+msgstr "Várólistán: %u"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "HIBA: Részfájl létrehozása sikertelen)"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Feltöltés alatt"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Megpróbálom betölteni a met-fájl biztonsági másolatát a %s-ből"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "HIBA: part.met fálj megnyitása sikertelen: %s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "HIBA: A part.met fájl 0 méretű: %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "HIBA: Érvénytelen part.met fájl változat: %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr "HIBA: %s (%s) sérült (hibás tag szám), nem lehet betölteni a fájlt."
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Egyik sem"
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Fájl infó helyreállításának megkísérlése..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr ""
-"Névtelen fájl helyreállítása - helyreállítás megkísérlése RecoveredFile.dat "
-"néven"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Összes elérhető fájl infó helyreállítva :D - használatának megkísérlése..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Fájl infó helyreállítása nem lehetséges :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "A(z) %s (%s) megnyitása sikertelen"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "FIGYELEM: %s lehet, hogy sérült (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "HIBA a fájlrész mentésénél: %s (%s ==> %s)"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Nem"
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Nem tudom megállapítani a '%s' hosszát - a %s fájlt használom."
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Igen"
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' valahogy 0 méretű - a %s fájlt használom."
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Letöltés..."
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "A %s. part.met.seeds fájl mentése sikertelen"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "HTTP letöltés megszakítva"
 
-#: src/PartFile.cpp:1024
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "%i forrás elmentve a részfájlnak: %s (%s)"
+msgid "Unable to create destination file %s for download!"
+msgstr "A letöltéshez szükséges %s célfájl létrehozása sikertelen!"
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "A(z) %s (%s) részfájlnak nincs seeds fájlja"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "A letöltendő URL nem lehet üres"
 
-#: src/PartFile.cpp:1062
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "A(z) %s (%s) részfájlnak üres a seeds fájlja"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "Az %s URL válasza: %i - Hiba (%i)!"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Hiba a részfájl forrás-fájljának olvasása közben (%s - %s): %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Súlyos hiba a letöltött fájl írásakor"
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Sérült részt (%d) találtam a %d részű %s fájlban - FileResultHash |%s| "
-"FileHash |%s|"
+msgid "Downloaded %d bytes"
+msgstr "%d bájt letöltve"
 
-#: src/PartFile.cpp:1181
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "(%i) befejezett fájlrészt találtam a(z) %s fájlban"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "%s újrahash-elése befejeződött"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Váratlan hiba a %s fájl befejezése közben. A fájl szüneteltetve."
-
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Letöltés befejeződött: %s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Fájl törlése: %s"
-
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"FIGYELEM: Nem tudom a letöltött részt hash-elni - hash-készlet a(z) '%s'-hez "
-"hiányos"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Az elvárt %d bájt helyett %d bájt lett letöltve"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"HIBA: Nem tudom a letöltött részt hash-elni - hash-készlet hiányos (%s). Nem "
-"volna szabad előfordulnia"
-
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "FIGYELEM: Nincs elég szabad hely a lemezen! Fájl szüneteltetése: %s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "A %i. letöltött fájlrész sérült a %s fájlban"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: %i. sérült rész helyreállítva a '%s'-hez -> megmentett bájtok: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Helyfoglalás"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Elégtelen lemezterület"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Megállítva"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Letöltve"
-
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "HIBA: A(z) '%s' részfájl megnyitása sikertelen."
+"Érvénytelen URL a HTTP letöltéshez, vagy a HTTP továbbításhoz (elfelejtetted "
+"a 'http://'-t ?)"
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "FIGYELEM: known.met nem nyitható meg."
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "A HTTP letöltési szerverhez való kapcsolódás sikertelen"
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr ""
-"FIGYELEM: Az ismert fájlok listája sérült, érvénytelen fejlécet tartalmaz."
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Érvénytelen válasz a HTTP letöltési szervertől"
 
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "IO hiba a known.met fájl olvasása közben: %s"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Új GeoIP.dat letöltés %s-ról"
 
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Hiba a known.met fájl mentése közben: %s"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "GeoIP.dat fájl letöltése sikertelen, frissítés félbeszakítása."
 
-#: src/SharedFileList.cpp:352
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "%i ismert megosztott fájlt találtam"
+msgid "Failed to remove %s file, aborting update."
+msgstr "%s fájl törlése sikertelen, frissítés megszakítása."
 
-#: src/SharedFileList.cpp:358
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "%i ismert és %i ismeretlen megosztott fájlt találtam"
+msgid "Failed to rename %s file, aborting update."
+msgstr "%s fájl átnevezése sikertelen, frissítés megszakítása."
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "HIBA: Megpróbáltuk megosztani a(z) %s-t"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Fájl megjegyzés"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Értékelés"
+msgid "Successfully updated %s"
+msgstr "%s frissítése sikerrel járt."
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Megjegyzés"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Nincs megjegyzés"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Hiba a GeoIP.dat frissítése közben."
 
-#: src/CommentDialogLst.cpp:104
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u megjegyzés"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Az összes felsorolt zavart kiszolgálóval sikertelen a kapcsolatfelvétel. "
-"Újra próbálkozom zavarás nélkül."
+msgid "Failed to download %s from %s"
+msgstr "%s letöltése %s-től sikertelen"
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr ""
-"Az összes felsorolt kiszolgálóval történő kapcsolatfelvétel sikertelen. Újra "
-"próbálkozom."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "Az eD2k hálózat le van tiltva a beállításokban, nem kapcsolódom."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr ""
-"A kiszolgáló listában nem található érvényes kiszolgáló, amelyhez "
-"csatlakozni lehetne."
-
-#: src/ServerConnect.cpp:187
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Kapcsolódva %s-hez (%s:%i)"
+msgid "Failed to load country data for '%s'."
+msgstr "'%s' ország adatainak betöltése sikertelen."
 
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Kapcsolat létrejött a %s-vel"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr ""
-"Végzetes hiba kapcsolatfelvétel közben. Lehet, hogy megszakadt az Internet "
-"kapcsolat"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "IP-szűrők 'ipfilter.dat' és 'ipfilter_static.dat' betöltése."
 
-#: src/ServerConnect.cpp:339
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Megszakadt a kapcsolat %s-vel (%s:%i)"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "ipfilter.dat fájl '%s' betöltése sikertelen, ismeretlen formátum."
 
-#: src/ServerConnect.cpp:349
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "A %s (%s:%i) halottnak tűnik."
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "ipfilter.dat fájl '%s' betöltése sikertelen, nem nyitható meg a fájl."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "A %s (%s:%i) úgy látszik megtelt."
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "%u IP-tartomány '%s'-ból betöltve."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Automatikus kapcsolódás a kiszolgálóhoz %d másodperc múlva"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Kapcsolat megszakadt"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u hibás sor lett eldobva."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Kapcsolódás %s-hez (%s:%i) sikertelen."
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Új %s fájl átnevezése sikertelen, frissítés megszakítása."
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "HIBA: A socket érvénytelen az időtúllépés-ellenőrzés során"
-
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Kapcsolódási kísérlet %s-hez (%s:%i): időtúllépés."
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "IP szűrő készen áll"
 
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-"HIBA: A biztonsági mentés betöltése sikertelen. Keressen a http://forum."
-"amule.org oldalon .part.met visszaállítási lehetőségeket."
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Nem található .part fájl"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "%u .part fájlt találtam"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
-"Az ideiglenes fájlok könyvtárának fájlrendszere nem tudja kezelni a nagy "
-"fájlokat."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"A bejövő fájlok könyvtárának fájlrendszere nem tudja kezelni a nagy fájlokat."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Letöltés %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Már megkísérelted a(z) '%s' fájlt letölteni"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Már megvan ez a fájl: '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Már próbálod letölteni a(z) '%s' fájlt."
+"Indítás ismert \n"
+"kliensektől"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "A magnet hivatkozás nem konvertálható eD2k-ra: %s"
+msgid "Nodes (%u)"
+msgstr "Csomópontok (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "A következő hivatkozás protokollja ismeretlen: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Érvénytelen IP a rendszerindításhoz"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Érvénytelen eD2k hivatkozás! HIBA: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Érvénytelen port a rendszerindításhoz"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Végrehajtja az <str>-t és kilép."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Kérlek töltsd ki az összes kötelező mezőt"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Érvénytelen IP cím formátum. Így használd: xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Biztos, hogy le akarsz tölteni egy új nodes.dat fájlt?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Ez a parancs argumentumot igényel. Érvényes argumentumok: 'all', fájlnév "
-"vagy egy szám.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Feldolgozás hash alapján: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Feldolgozás fájlnév alapján: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Ennek a parancsnak szüksége van egy argumentumra. Érvényes argumentumok: egy "
-"fájl hash.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Érvénytelen szám\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Nem érvényes hash (a hossza pontosan 32 karakter kell legyen)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "A művelet sikeres volt."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "A kérés sikertelen volt a következő hibával: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Kliens IP szűrés %s van kapcsolva.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "KI"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "BE"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Kiszolgáló IP szűrés %s van kapcsolva.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "IP szűrő szintje jelenleg %d.\n"
+"Ezzel eltávolítod az aktuális csomópontokat és újraindul a Kademlia "
+"kapcsolat."
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Sávszélesség korlátok: Fel: %u kB/s, Le: %u kB/s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Folytassuk?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: a keresési kulcsszó túl rövid"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Kapcsolódva %s-hez %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "LowID-val"
+msgid "Keyword for search: %s"
+msgstr "Kulcsszó a kereséshez: %s"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "HighID-val"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: A keresési kulcsszó már a keresési listán: "
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Kapcsolódás folyamatban"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Nincs kapcsolódva"
-
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
-msgstr ""
-"\n"
-"Letöltés:\t%s"
-
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Feltöltés:\t%s"
+"A nodes.dat fájl olvasása sikertelen volt - túl régi. Ez a verzió (0) már "
+"nincs támogatva."
 
-#: src/TextClient.cpp:729
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Várólistás kliensek száma:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "%u Kad kapcsolat beolvasva"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Összes forrás:\t%d\n"
+"Nincsenek kontaktusok, indítsd el a betöltési folyamatot, vagy tölts le "
+"magad egy nodes.dat fájlt."
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Keresés eredményeinek száma: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "Tennivaló - keresés állapotának megjelenítése"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Csak %d Kad kapcsolat elérhető, a nodes.dat fájl nem lett felülírva"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Ismeretlen válasz érkezett a kiszolgálótól, OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Rövid állapot információ megjelenítése."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr ""
-"Megjeleníti a kapcsolat állapotát, aktuális fel/letöltési sebességet, stb.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Megjeleníti a teljes statisztika fát."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "%d Kad kapcsolat kiírva"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Opcionálisan egy szám a 0-255 intervallumban megadható paraméterként ennek "
-"a\n"
-"parancsnak, ami megmondja, hány elemet jelenítsen meg az ügyfél verzók "
-"közül.\n"
-"Nullát megadva vagy elhagyva a paramétert, a jelentése \"bármennyit\".\n"
-"\n"
-"Példa: 'statistics 5' csak a leggyakoribb 5 verziót mutatja minden ügyfél\n"
-"típusból.\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Fájl név"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Az aMule leállítása."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Fájl méret"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"A távoli mag (amule/amuled) leállítása.\n"
-"Ez a szöveges klienst is le fogja állítani,\n"
-"hiszen az használhatatlan futó mag nélkül.\n"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Megosztási arány"
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Újratölti a megadott objektumot."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Feltöltve"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "A megosztott fájlok listáját frissíti."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Kért"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "IP szűrő tábla újratöltése fájlból."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Elfogadott"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Kapcsolódás a hálózathoz."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Teljes források"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Kapcsolódás minden hálózathoz, ami engedélyezve van a beállításokban.\n"
-"Opcionálisan megadható egy kiszolgáló cím IP:Port formában, ekkor csak ahhoz "
-"a\n"
-"kiszolgálóhoz kapcsolódik. Az IP-nek egy egy hagyományos IPv4 címnek, vagy "
-"egy\n"
-"érvényes DNS névnek kell lennie."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Kacsolódás csak az eD2k-hoz."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Kapcsolódás csak a Kad-hoz."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Leválaszt a hálózatról."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Ez leválaszt minden jelenleg kapcsolódott hálózatról.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Leválasztás csak az eD2k-ról."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Csak a Kad-ról választ le."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Egy eD2k vagy magnet hivatkozás hozzáadása."
+"FIGYELEM: Az ismert fájlok listája sérült, érvénytelen fejlécet tartalmaz."
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"A hozzáadandó eD2k hivatkozás lehet:\n"
-"*) egy fájl hivatkozás (ed2k://|file|...), ami a letöltési listához adódik,\n"
-"*) egy kiszolgáló hivatkozás (ed2k://|server|...), ami a kiszolgáló "
-"listához\n"
-"   adódik,\n"
-"*) vagy egy kiszolgáló-lista hivatkozás, ekkor minden kiszolgáló a listáról "
-"a\n"
-"   kiszolgáló listához adódik.\n"
-"\n"
-"A magnet hivatkozásnak tartalmaznia kell az eD2k hash-t és a fájl hosszát.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Beállítások megváltozatása."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "IP szűrő beállítások módosítása."
+"Bejegyzés betöltése az ismert fájlok listájából sikertelen, hiba lehet a "
+"fájlban"
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "IP szűrés bekapcsolása mind a kliensek, mind a kiszolgálók részére."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "IP szűrés kikapcsolása mind a kliensek, mind a kiszolgálók részére."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Engedélyezi/Letiltja a kliensek IP szűrését."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Kliens IP szűrés bekapcsolása."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Kliens IP szűrés kikapcsolása."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Engedélyezi/Letiltja a kiszolgálók IP szűrését."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Kiszolgáló IP szűrés bekapcsolása."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Kiszolgáló IP szűrés kikapcsolása."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "IP szűrési szint kiválasztása."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Az érvényes szűrési szintek a 0-255 tartományban vannak, és az "
-"alapértelmezett\n"
-"értéke 127.\n"
+"Érvénytelen bejegyzés az ismert fájlok listájában, hiba lehet a fájlban: "
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Sávszélességi korlátok beállítása."
+#: src/libs/common/Format.cpp:307
+#, c-format
+msgid "Unknown error %d"
+msgstr "Ismeretlen hiba %d"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "Az ezeknek a parancsoknak adott érték kilobájt/mp-ben kell legyen.\n"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
+msgstr "A %d hiba leírásának lekérése sikertelen"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Feltöltési sávszélesség beállítása."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Tördelőalgoritmizálás"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Letöltési sávszélesség beállítása."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Befejezés"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Beállítási értékek megjelenítése."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Kész"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "IP szűrő beállítások megjelenítése."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Szüneteltetve"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Az IP szűrő állapotának lekérdezése ügyfelekre és kiszolgálókra."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Hibás"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "IP szűrő állapotának megjelenítése csak ügyfelekre."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Várakozik"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "IP szűrő állapotának megjelenítése csak kiszolgálókra."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Egy nem üres jelszót kell megadni."
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "IP szűrő szintjének megjelenítése."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Érvénytelen jelszó, nem egy MD5 hash!"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Sávszélességi korlátok megtekintése."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Kapcsolódási hiba"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Keresést végez."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "EC kapcsolat sikertelen. Üres válasz."
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
-"A keresés típusát meg kell adni:\n"
-"    GLOBAL (globális)\n"
-"    LOCAL (helyi)\n"
-"    KAD (kad)\n"
-"Például: 'search kad fájl' egy kad keresést fog indítani a \"fájl\"-ra.\n"
+"Külső kapcsolat: Rossz válasz, kézfogás sikertelen. Kapcsolat megszüntetve."
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Globális keresést végez."
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Helyi keresést végez."
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Keresés a Kad hálózaton."
-
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Az utolsó keresés eredményeinek megjelenítése."
-
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Az előző keresés eredményeit adja vissza.\n"
-
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Egy keresés állapotát jeleníti meg."
-
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Egy keresés állapotát jeleníti meg.\n"
-
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Fájl letöltése."
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Sikerült! Kapcsolat létrejött ezzel: aMule "
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Az utolsó keresésből a fájl sorszámát kell megadni.\n"
-"Pl: 'download 12' az előző keresésből a 12-es sorszámú fájlt fogja "
-"letölteni.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Sikerült! Kapcsolat létrejött."
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Letöltés szüneteltetése."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Külső kapcsolat: Hozzáférés megtagadva, mert: "
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Letöltés folytatása."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Külső kapcsolat: Kézfogás sikertelen."
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "ListenSocket: rendben."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Letöltés megszakítása."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "HIBA: A TCP porton nem lehet hallgatni."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Letöltési prioritás beállítása."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "HIBA: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Alacsony, normál, magas vagy automatikus prioritást állít be.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "FIGYELEM: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Alacsony prioritás beállítása."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Bezár"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Normál prioritás beállítása."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Kivágás"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Magas prioritás beállítása."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Másolás"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Automatikus prioritás beállítása."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Beillesztés"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Várósorok/listák megmutatása."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Törlés"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Megjeleníti a feltöltési/letöltési várósort, kiszolgáló listát vagy a "
-"megosztott fájlok listáját.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Mindent kijelöl"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Feltöltési várósor megmutatása."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Letöltési várósor megmutatása."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Korlátlan"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Napló megjelenítése."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule Tálca menü"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Kiszolgáló-lista megmutatása."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Sebesség korlátok:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Napló törlése."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "Fel: nincs"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Elavult parancs, használd a(z) '%s'-t helyette."
+msgid "UL: %u"
+msgstr "Fel: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Ez egy elavult parancs és a jövőben eltávolításra kerülhet.\n"
-"Használd a '%s'-t helyette.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "Le: nincs"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "HIBA: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "Le: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "FIGYELEM: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Letöltési sebesség: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Az új ügyfélazonosító %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "FIGYELEM: Alacsony azonosítót (LowID) kaptál!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tLegvalószínűbb oka az lehet, hogy tűzfal vagy router mögött vagy."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr ""
-"\tTovábbi információért, kérlek látogasd meg a http://wiki.amule.org-ot"
+msgid "Upload speed: %.1f"
+msgstr "Feltöltési sebesség: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Ismeretlen kiszolgáló infó fogadva! - túl rövid"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Kliens információk"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "%d új kiszolgáló fogadva"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Kiszolgáló-lista mentése kész."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "A kiszolgáló visszautasította az utolsó parancsot"
+msgid "Nickname: %s"
+msgstr "Becenév: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Hibás csomag érkezett a kiszolgálótól: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Nem lett Becenév kiválasztva!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Kezeletlen hiba a kiszolgálóról történő adatok feldolgozásánál: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "KliensID: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "A DNS feloldó szálat nem lehet létrehozni a %s-hez való kapcsolódáshoz"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Nincs kapcsolódva"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "A %s IP-jű kiszolgáló (%s) ki van szűrve. Nem kapcsolódom."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Kiszolgáló Név: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "protokoll zavarással."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "Kiszolgáló IP: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Kapcsolódás %s-hez (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Nincs kapcsolódva"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Nem tudom a DNS-t feloldani a %s kiszolgálóhoz: Nem tudok kapcsolódni!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr ""
-"CIP2Country::CIP2Country(): Sikertelen az ország adatok beolvasása innen: "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "%d zászló kép betöltve."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Biztos benne, hogy megszakítja a letöltéseket és töröl minden fájlt ebből a "
-"kategóriából?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Megerősítés szükséges"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Összes egyéb"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Befejezetlen"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Aktív"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Film"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Zene"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Archívált"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD-Image"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Képek"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Szöveg"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Válassz nézetet"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Új kategória"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Kategória szerkesztése"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Kategória törlése"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Fájl név"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Fájl méret"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Megosztási arány"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Feltöltve"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Kért"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Elfogadott"
+msgid "TCP port: %d"
+msgstr "TCP port: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Teljes források"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP port: Nem áll készen"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "%s importálása: %s"
+msgid "UDP port: %d"
+msgstr "UDP port: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Ideiglenes mappa olvasása"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UDP port: Nem áll készen"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Alapvető információk megszerzése a letöltési infó fájlból"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Online Aláírás: Engedélyezve"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Célfájl létrehozása"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Online Aláírás: Letiltva"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Adat töltése a régi letöltési fájlból (%u a(z) %u-ből)"
+msgid "Uptime: %s"
+msgstr "Aktivitási idő: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Adat blokk mentése az új letöltési fájlba (%u a(z) %u-ből)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Forrás letöltési fájl információ megszerzése"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Új letöltés hozzáadása és az új részfájl mentése"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Részfájlok importálása"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Állapot"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Fájl Hash"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Várakozás..."
+msgid "Shared files: %d"
+msgstr "Megosztott fájlok: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Lemezen: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Válassz egy mappát ahol ideiglenes letöltéseket fogok keresni! (az "
-"almappákban is)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "Töröljem a sikeresen importált letöltések forrásait?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Források eltávolítása?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "bájt"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "bájt/mp"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/mp"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "mp"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "perc"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "óra"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "nap"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Filmek"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Archívált fájlok"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Dokumentumok"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programok"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Akármelyik"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Nincs értékelve"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Érvénytelen / Sérült / Hamis"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Gyenge"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Korrekt"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Jó"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Kitűnő"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "mind"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "összes egyéb"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "IP-szűrők 'ipfilter.dat' és 'ipfilter_static.dat' betöltése."
+msgid "Queued clients: %d"
+msgstr "Várólistás ügyfelek: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "ipfilter.dat fájl '%s' betöltése sikertelen, ismeretlen formátum."
+msgid "Total DL: %s"
+msgstr "Összes letöltés: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "ipfilter.dat fájl '%s' betöltése sikertelen, nem nyitható meg a fájl."
+msgid "Total UL: %s"
+msgstr "Összes feltöltés: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "%u IP-tartomány '%s'-ból betöltve."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Feltöltési korlát"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u hibás sor lett eldobva."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Letöltési korlát"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktív kapcsolatok (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "aMule elrejtése"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Fájl részletei"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "aMule megjelenítése"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% kész"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Kilépés"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "eD2k hivatkozás: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Végrehajt"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Kattints ide, hogy a szövegbeviteli mezőben található eD2k hivatkozást "
 "hozzáadd a letöltési sorhoz."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4556,19 +2692,19 @@
 "Itt kerülnek megjelenítésre az események. A teljes eseménylistáért nézd meg "
 "a naplót a kiszolgáló-fülön."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Betöltés..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Felhasználók száma azon a kiszolgálón, amelyre kapcsolódott ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Felhasználók: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4577,6 +2713,10 @@
 "összes felhasználó számát illetően."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Fel: 0.0 | Le: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4584,7 +2724,7 @@
 "Aktuális feltöltési és letöltési arány átlaga. Ha engedélyezed, kapcsos "
 "zárójelben jeleníti meg a kliens-kommunikáció többletterhelését."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4596,519 +2736,574 @@
 "alacsony ID-d van (tűzfali) és a zöld nyilak pedig, hogy magas ID-d van "
 "(optimális kapcsolódási típus)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Nincs csatlakozva ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Jelenleg csatlakozott kiszolgáló."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Keresés"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Név:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Típus"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Helyi"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Globális"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "FileHash"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Kibővített paraméterek"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Szűrés"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Fájltípus"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Akármelyik"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Archívált fájlok"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Zene"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD-Image"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Képek"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programok"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Dokumentumok"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Filmek"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Kiterjesztés"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Min. méret"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "bájt"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Max. méret"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Elérhetőség"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Szűrő:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Eredmények szűrése"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Eredmény megfordítása"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Ismert fájlok elrejtése"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Indít"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Több"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Több találatot keres az eD2k-n. Kad-on még nem támogatott."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Leállít"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Letöltés"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Mezők törlése"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Eredmények"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Befejeződött letöltések törlése"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Feltöltési lista / Várólista megjelenítése"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Várólistás kliensek száma :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Küldés"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Megadott üzenet küldése."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Bezár"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Fájl források:"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Csevegési folyamat bezárása."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Általános"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Teljes név :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/A"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "met-fájl :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Tördelőalgoritmus (hash) :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Fájlméret :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Fájlrész állapot :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Utoljára teljesnek látott :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Átvitel"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Forrás találatok :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Átviteli források :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Fájlrész-számláló :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Elérhető :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Adatráta :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Aktív letöltési idő: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Átmásolva :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Teljes méret :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligens Sérülés Kezelés"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Sérülés miatt elveszett :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Tömörítéssel nyert :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "I.S.K.-val megmentett csomagok :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Fájl nevek"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Átvétel"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Kitisztítás"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Alkalmaz"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 "Megjegyzés/Értékelés ehhez a fájlhoz (ezt az összes felhasználó látni fogja)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Megadhatod egy film hosszát, történetét, nyelvét ...\n"
-"és ha a fájl hamisítvány, akkor elmondhatod ezt a többi aMule felhasználónak."
+"Megadhatod egy film hosszát, történetét, nyelvét...\\n\\nés ha a fájl hamis, "
+"elmondhatod ezt a többi aMule felhasználónak."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Fájl minősítése"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Nincs értékelve"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Érvénytelen / Sérült / Hamis"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Gyenge"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Korrekt"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Jó"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Kitűnő"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Értékeld a fájlt minőségét vagy adj tanácsot a többi felhasználónak, ha a "
 "fájl érvénytelen ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Frissít"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Letöltés folyamatban, kis türelmet ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Ismeretlen méret"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Kötelező adatok"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP-cím :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Port :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Kiegészítő adatok"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "User név :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Userhash :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Megosztott fájlok frissítése"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Aktuális folyamat"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Összesen"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Lekérdezve :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Aktív feltöltések száma :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Hozzáad"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Letöltési sebesség"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Aktuális"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Futásátlag"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Munkafolyamatok átlaga"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Feltöltési sebesség"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Kapcsolatok"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Aktív letöltések"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Aktív kapcsolatok (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Aktív feltöltések"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
-msgstr "Statisztika Fa"
+msgstr "Statisztika fa"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Felhasználó neve:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Felhasználói hash:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Kliensszoftver:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Kliensverzió:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP-cím:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "Felhasználó ID:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "Kiszolgáló IP:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Kiszolgáló neve:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Zavarás:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Átvitel a kliensnek"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Aktuális kérés:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Átlagos feltöltési arány:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Átlagos letöltési arány:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Feltöltve (ebben a szakaszban):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Letöltve (ebben a szakaszban):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Feltöltve (összesen):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Letöltve (összesen):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Eredmények"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Le/Fel módosító:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Biztonsági azonosító:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Értékelés (összes):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Várólista helyezés:"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Feltöltési várólista pontszám:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Becenév"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - a linuxos Mule"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - a multi-platform Mule"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 "Ezt a nevet fogja a többi felhasználó látni, amikor kapcsolódnak hozzád."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Nyelv"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Nyelv: "
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Késleltetés a tool-tippek előtt."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Ez határozza meg a nyelvet, amelyet az irányításhoz használ."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Egyéb beállítások"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Indításkor új verzió keresése"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr "Engedélyezve indításnál az aMule új verziót fog keresni."
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Indítás minimalizálva"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Engedélyezve indításnál minimalizálni fogja magát az aMule."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Figyelmeztetés kilépéskor"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
 msgstr "Figyelmeztessen az aMule bezárása előtt."
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr "Az alkalmazás ablakának elrejtése a bezárás gomb megnyomásakor"
+
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Tálca ikon engedélyezése"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Ez engedélyezi/tiltja a tálca ikont."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Minimalizálás a rendszer tálcára"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5116,659 +3311,582 @@
 "Engedélyezve az aMule a rendszer tálcára fogja magát minimalizálni a tálca "
 "helyett."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Tooltip késleltetése mp-ben"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Szóbuborék késési idő: "
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "másodperc"
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Késleltetés a tool-tippek előtt."
-
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Böngésző kiválasztása"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Rendszer alapértelmezett"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Válaszd ki a böngésződet"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Egyéni böngésző:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Itt add meg a böngésződ nevét. Egyéni böngésző esetén, válaszd az Egyéni "
-"menüelemet a lenyíló menü felett."
+"Írd ide a böngésződ nevét. Hagyd üresen, hogy a rendszer alapértelmezett "
+"böngészőjéhez."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Tallóz"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Megnyitás új fülön, ha lehetséges"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Weboldal megnyitása új fülön új ablak helyett, ha lehetséges"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Videólejátszó"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Másolat készítése előnézethez"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Sávszélesség korlátok"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Slot kiosztás"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Szabvány kliens TCP port:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Portok"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Szabvány TCP port "
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Ez a szabvány eD2k port és nem lehet letiltani."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Bővített kliens UDP port:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "UDP port a kiszolgáló kérésekhez (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr "Ezt az UDP portot bővített eD2k kérések és a Kad hálózat használja"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Bővített UDP port (Kad / globális keresés) "
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "letilt"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr "Ezt az UDP portot a bővített eD2k kérések és a Kad hálózat használja"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Kötési cím"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "UDP port a bővített kiszolgáló kéréseknek (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Max forrás / fájl"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "UPnP engedélyezése a router port továbbításhoz"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Felső korlát"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnP TCP port (nem kötelező):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Kapcsolat korlátok"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Max kapcsolatok"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Lokális cím IP-hez csatolása (mindet ha üres):"
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Csak haladó felhasználóknak: Ha több hálózati kártyád van, írd ide a címet, "
+"amelyhez az aMule kötve legyen."
+
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Max források letöltési fájlonként:"
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Max egyidejű kapcsolatok:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "UPnP engedélyezése"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP TCP Port:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Automatikus kapcsolódás induláskor"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Kapcsolódás megismétlése megszakadt kapcsolat esetén"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Sávszélesség többletterhelésének mutatása"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Kiszolgáló beállításai"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Halott kiszolgálók eltávolítása"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "próbálkozás után"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Kiszolgáló lista automatikus frissítése indításkor"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Kiszolgáló lista frissítése kiszolgálóhoz való kapcsolódáskor"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Kiszolgáló lista frissítése amikor egy ügyfél kapcsolódik"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Prioritási rendszer használata"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Intelligens LowID ellenőrzés használata kapcsolódáskor"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Biztonságos kapcsolódás"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Automatikus kapcsolódás kizárólag az állandó kiszolgálókhoz"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "A kézileg hozzáadott kiszolgálók Magas Prioritással történő felvétele"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. aktív"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH bízzon meg minden hash-ben (nem ajánlott)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Intelligens Sérülés Kezelő (I.S.K.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Engedélyezés"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Feljett I.S.K. megbízzon minden hash-ben (nem ajánlott)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Fájlok felvétele szüneteltetett módban"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Új letöltések felvétele automatikus prioritással"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Előszőr az első és utolsó adatelemet próbálja meg letölteni"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Új megosztott fájl felvétele automatikus prioritással"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Próbálj meg teljes adatelemet feltölteni"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr ""
-"Következő szüneteltetett fájl indítása, ha egy fájl letöltése befejeződött"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Következő szüneteltetett fájl indítása amikor egy letöltés befejeződik"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Ugyanabból a kategóriából"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Mentsen el 10 forrást ritka fájloknál (< 20 forrás)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "Betűrendi sorrendben"
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Lemezterület"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Lemezterület helyfogalalás az új fájloknak"
+
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
+"Az új fájlok számára előre lefoglalja a lemezterületet, így csökkentve a "
+"töredezettséget"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Szabad lemezterület ellenőrzése"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Letöltések megállítása amikor a szabad hely kevesebb mint "
 
-#: src/muuli_wdr.cpp:2058
+#: src/muuli_wdr.cpp:1819
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 "Jelöld be, ha azt szeretnéd, hogy az aMule ellenőrizze a szabad "
 "lemezterületet"
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Minimum szabad hely:"
-
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "Add meg a kívánt min. szabad lemezterületet."
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "Lemezterület helyfogalalás az új fájloknak"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Mentsen el 10 forrást ritka fájloknál (< 20 forrás)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
-"Az új fájlok számára előre lefoglalja a lemezterületet, így csökkentve a "
-"töredezettséget"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Feltöltések"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Bejövő"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Ideiglenes"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Megosztott"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Új megosztott fájl felvétele automatikus prioritással"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Célkönyvtár a letöltéseknek"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Könyvtár az ideiglenes letöltési fájloknak"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Megosztott mappák"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Jobb klikk az mappa ikonra az összes alatta levő mappát is megosztja)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Rejtett fájlok megosztása"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Grafikonok"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Frissítés késleltetés: 5 mp"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Grafikon átlagos ideje: 100 perc"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Kapcsolatok grafikon skálája: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Válaszd ki a statisztikák színeit"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Letöltési grafikon méretaránya:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Feltöltési grafikon méretaránya:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Színek: "
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Háttér"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Rács"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Aktuális letöltés"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Letöltési futás átlaga"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Letöltési folyamatok átlaga"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Aktuális feltöltés"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Feltöltési futás átlaga"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Feltöltési folyamatok átlaga"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Aktív kapcsolatok"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Sebességmérő a rendszertálcán"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Kad-csomópontok aktuális"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Kad-csomópontok futó"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Kad-csomópontok folyamat"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Kiválaszt"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Fa"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Megjelenített ügyfél verziók száma (0=mind)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Sávok kapacitása"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Megjegyzés: Ezek az értékek csak a statisztikákhoz kellenek."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! FIGYELEM !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Ne változtasd meg ezeket a beállításokat, csak akkor,\n"
-"ha tudod, mit csinálsz, ellenkező esetben könnyen\n"
-"elronthatod a dolgokat.\n"
-"\n"
-"Ezen beállítások módosítása nélkül is remekül fog\n"
-"működni az aMule."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Haladó beállítások"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Max új kapcsolat / 5 mp"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Fájl buffer méret: 240000 bájt"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Feltöltők várólistájának nagysága: 5000 kliens"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Kiszolgáló kapcsolat frissítési gyakorisága: Tiltva"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Letöltési folyamatjelző"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Százalék megjelenítése"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Folyamatjelző megjelenítése"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Folyamatjelző stílus"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Számítógép időzített készenléti állapotának hatástalanítása"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Használt felület: "
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "A \"Gyors eD2k hivatkozás kezelő\" mutatása minden ablakban."
+
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
+msgstr "Kibővített infók megjelenítése a kategória füleken"
+
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
+msgstr "Az alkalmazás verziójának megjelenítése a címsorban"
+
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Átviteli ráták megjelenítése a címsorban"
+
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Az alkalmazás neve előtt"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Az alkalmazás neve után"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Többletterhelés sávszélességének mutatása"
+
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Függőleges eszköztár elrendezés"
+
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "Kliensek országzászlajainak megjelenítése"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Letöltendő fájlok várakozási sora"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Százalékos arány mutatása"
+
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Folyamatjelző csík mutatása"
 
-#: src/muuli_wdr.cpp:2351
+#: src/muuli_wdr.cpp:2144
 msgid "Flat"
 msgstr "Lapos"
 
-#: src/muuli_wdr.cpp:2354
+#: src/muuli_wdr.cpp:2150
 msgid "Round"
 msgstr "Gömbölyű"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Téma támogatás"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Felület támogatás engedélyezése"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Felület:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- nincs elérhető felület -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Oszlop rendezés"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Automatikus rendezése a fájloknak a letöltési listában (erős CPU)"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Fájlok automatikus rendezése (erős CPU)"
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp:2157
 msgid "aMule will sort the columns in your download list automatically"
 msgstr ""
 "Az aMule automatikusan rendezni fogja az oszlopokat a letöltési listádban"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Egyéb Gui finomhagolások"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Mutassa a gyors eD2k hivatkozás kezelőt"
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "Külső kapcsolatok jellemzői"
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
-msgstr "Kibővített infók megjelenítése a kategória füleken"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "Külső kapcsolat elfogadása"
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "Átviteli ráták megjelenítése a címsorban"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "Hallgató interfész IP-je:"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Függőleges eszköztár elrendezés"
+#: src/muuli_wdr.cpp:2190
+msgid ""
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
+msgstr ""
+"Adjon meg itt egy érvényes IP címet a.b.c.d formában az EC hallgató "
+"interfésznek. Üres mező vagy 0.0.0.0 jelentése: bármelyik interfész."
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Mutassa a részfájl számát a neve előtt"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "TCP port:"
 
-#: src/muuli_wdr.cpp:2434
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
+msgstr "UPnP port továbbítás engedélyezése az EC porton"
+
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Jelszó"
+
+#: src/muuli_wdr.cpp:2221
 msgid "Web server parameters"
 msgstr "Web kiszolgáló paraméterek"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Webkiszolgáló futtatása indításakor"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Web kiszolgáló port"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "UPnP port továbbítás engedélyezése a web kiszolgáló portján"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Web kiszolgáló UPnP TCP port"
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Webkiszolgáló indítása induláskor"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Oldal frissítésének időzítése (mp múlva)"
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Web minta"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Gzip tömörítés engedélyezése"
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Admin jelszó"
 
-#: src/muuli_wdr.cpp:2477
+#: src/muuli_wdr.cpp:2243
 msgid "Enable Low rights User"
 msgstr "Vendég felhasználó engedélyezése"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Admin jelszó"
-
-#: src/muuli_wdr.cpp:2490
+#: src/muuli_wdr.cpp:2249
 msgid "Low rights password"
 msgstr "Vendég jelszó"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Web minta"
-
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "Külső kapcsolatok jellemzői"
-
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "Külső kapcsolat elfogadása"
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "A web kiszolgáló port UPnP továbbításának engedélyezése"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"A hallgató interfész IP-je\n"
-"(üres = bármi)"
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Web szerver UPnP TCP port (nem kötelező)"
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
-msgstr ""
-"Adjon meg itt egy érvényes IP címet a.b.c.d formában az EC hallgató "
-"interfésznek. Üres mező vagy 0.0.0.0 jelentése: bármelyik interfész."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Oldal frissítésének időzítése (mp múlva)"
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP port"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Gzip tömörítés engedélyezése"
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
-msgstr "UPnP port továbbítás engedélyezése az EC porton"
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Kattints ide a beállítási módosítások alkalmazásához."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Beállítási módosítások figyelmen kívül hagyása."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Cím :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Megjegyzés:"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Bejövő Mappa :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "Tallóz"
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Újonnan hozzárendelt fájlok prioritásának változtatása :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "Ne változzon"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Válassz színt ehhez a kategóriához (jelenleg kiválasztva) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "A nap kiszolgáló üzenetének megjelenítése kapcsolódáskor ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Kiszolgáló Infó"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Töröl"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Kattints erre a gombra a logfájl visszaállításához."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule Napló"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Kattints erre a gombra a kiszolgálólista frissítéséhez  ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Kiszolgálók listája"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5776,43 +3894,55 @@
 "Adj meg egy címet a server.met fájlhoz és nyomd meg a baloldali gombot az "
 "ismert kiszolgálók listájának frissítéséhez."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Kiszolgáló hozzáadása kézzel: Név"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Add meg az új kiszolgáló nevét"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Port"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Itt add meg a kiszolgálók IP-jét, használd az x.x.x.x formát."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Add meg a kiszolgáló portját."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Kiszolgáló felvétel kézzel (töltsd ki a baloldali mezőket először) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule Napló"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Kiszolgáló Infó"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "ED2K infó"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad infó"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Kattints erre a gombra a csomópont-lista frissítéséhez URL-ből ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Csomópontok (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5820,51 +3950,55 @@
 "Adj meg egy címet a nodes.dat fájlhoz és nyomd meg a baloldali gombot az "
 "ismert csomópontok listájának frissítéséhez."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Csomópont statisztikák"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Rendszerbetöltés"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Új csomópont (node)"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Port:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Indítás ismert \n"
-"kliensektől"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Indítás ismert kliensektől"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Leválasztás a Kad-ról"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2k infó"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Biztonságos azonosítás használata"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Ajánlott ezt az opciót engedélyezni. Nem fogsz kreditet kapni, ha nincs "
+"engedélyezve."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Protokoll zavarás"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Protokoll zavarás támogatása"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5872,11 +4006,11 @@
 "Ez az opció engedélyezi a protokoll zavarást, és az aMule elfogad zavart "
 "kapcsolatokat más ügyfelektől."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Kimenő kapcsolatok zavarása"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5884,11 +4018,11 @@
 "Ez az opció engedélyezi a protokoll zavarást, amikor más ügyfelekhez/"
 "kiszolgálókhoz kapcsolódik az aMule."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Csak zavart kapcsolatok elfogadása"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5896,84 +4030,80 @@
 "Ezen opció hatására az aMule csak zavart kapcsolatokat fog elfogadni. "
 "Kevesebb forrásod lesz, de a teljes forgalom zavart lesz"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Fájl beállítások"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Mindenki"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Senki"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Kik láthatják a megosztott fájlokat:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Ki láthatja a megosztott fájljaimat:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Válaszd ki, hogy kik kérdezhetik le megosztott fájlaid listáját."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP-szűrés"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Kliensek szűrése"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "A ~/.aMule/ipfilter.dat állományban IP-jű kliensek szűrésének engedélyezése."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Kiszolgálók szűrése"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "A ~/.aMule/ipfilter.dat állományban IP-jű kiszolgálók szűrésének "
 "engedélyezése."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Lista újratöltése"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
-msgstr "IP-k listájának újratöltése az ~/.aMule/ipfilter.dat fájlból"
+msgstr "IP-k listájának újratöltése a ~/.aMule/ipfilter.dat fájlból"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Frissítés most"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "IP szűrő automatikus letöltése indításkor"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Szűrési szint:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Mindig szűrje ki a LAN IP-ket"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "A nem-megegyező IP-k paranoid kezelése"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -5981,11 +4111,11 @@
 "Eldobja a csomagot, ha a kliens IP különbözik az IP-től, ahonnan a csomag "
 "jött. Óvatosan használd."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Rendszer-szintű ipfilter.dat használatának engedélyezése"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -5993,23 +4123,11 @@
 "Ha nem talál helyi ipfilter.dat-ot, akkor a rendszerszintű IP szűrő állomány "
 "használatát engedi."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Biztonságos azonosítás használata"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Ajánlott ezt az opciót engedélyezni. Nem fogsz kreditet kapni, ha nincs "
-"engedélyezve."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Online-aláírás engedélyezése"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6017,848 +4135,1292 @@
 "Az online-aláírás fájl írásának engedélyezése, amit külső alkalmazások "
 "használhatnak fel aláírások létrehozásához és így tovább."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Frissítési gyakoriság (mp):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Online aláírás frissítési gyakoriságának módosítása (mp-ben)."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Online aláírás könyvtára:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Online aláírási fájl kimentési helye:"
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr "Kattints ide az online aláírást tartalmazó könyvtár kiválasztásához."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Tiltás/Engedélyezés"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Bejövő üzenetek kiszűrése (kivéve az aktuális csevegés):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Szűrő beállítások:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Összes üzenet szűrése"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Barát listában nem szereplőktől érkező üzenetek kiszűrése"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Ismeretlen kliensektől érkező üzenetek kiszűrése"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 "A következő(ke)t tartalmazó üzenetek kiszűrése (elválasztónak ','-t "
 "használj):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "Azon szavak felvétele, amelyeket az amule-nak ki kellene szűrni és blokkolni "
 "az ezeket tartalmazó üzneteket"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "A kapott üzenetek megjelenítése a naplóban"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Megjegyzések"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Megjegyzések kiszűrése, melyek tartalmazzák (',' az elválasztó):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Automatikus kiszolgáló kapcsolat proxy nélkül"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Hitelesítés engedélyezése"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Felhasználói név/jelszó hitelesítés engedélyezése/tiltása"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Felhasználói név: "
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Felhasználói név a proxy kapcsolathoz"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Jelszó:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Jelszó a proxy kapcsolathoz"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Proxy engedélyezése"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Proxy támogatás engedélyezése/tiltása"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Proxy típusa:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "A proxy típusa amihez kapcsolódsz"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Proxy host:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "A proxy host neve"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Proxy port:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "A proxy port"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Hitelesítés"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Hitelesítés engedélyezése"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Felhasználói név/jelszó hitelesítés engedélyezése/tiltása"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Felhasználói név a proxy kapcsolathoz"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Jelszó:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Jelszó a proxy kapcsolathoz"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Automatikus kiszolgáló kapcsolat proxy nélkül"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Kapcsolódás ehhez:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Bejeletkezés a távoli amule-ra"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Felhasználói név"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Emlékezzen ezekre a beállításokra"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Bőbeszédű hiba-naplózás engedélyezése"
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Üzenet kategóriák:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Várakozás..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Importálandók hozzáadása"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Kijelöltek újrapróbálása"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Kijelöltek eltávolítása"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "Esemény típusok"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+"Statisztikák és várakozó kliensek a kiválasztott fájl(ok)hoz: Folyamat / "
+"Valaha"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Aktív feltöltések"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "Összes fájl százalékaként"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Összes fájl"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Kiválasztott fájlok"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Csak aktív feltöltések"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Kliensek megjelenítése ehhez:"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Újratöltés:"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Megosztott fájlok frissítése"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Küldés"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Megadott üzenet küldése."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Csevegési folyamat bezárása."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Kapcsolódás bármelyik kiszolgálóhoz és/vagy a Kad-hoz"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Hálózatok ablaka"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Megosztott fájlok"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Keresés ablaka"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Tiltva [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Fájlátvitel ablaka"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "bájt"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Megosztott fájlok ablaka"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Üzenetek ablaka"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Statisztikai grafikonok ablaka"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Tulajdonságok beállításának ablaka"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Új kategória"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Könyvtár kiválasztása az érkező fájloknak"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Meg kell adnod a kategória nevét!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "bájt/mp"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Meg kell adnod a kategória elérési útvonalát!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/mp"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"Bejövő könyvtár létrehozása sikertelen a kategóriához. Kérlek érvényes "
-"elérési utat adj meg!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "mp"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "perc"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "óra"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "nap"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "mind"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "összes egyéb"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Befejezetlen"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Megállítva"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Film"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Archívált"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Szöveg"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Aktív"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Ismeretlen bővítmény '%s' a '%s' parancshoz.\n"
+msgid "Using config dir: %s"
+msgstr "Konfigurációk könyvtára: %s"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Várakozás a partfile kovertáló thread befejeztére..."
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Ismeretlen parancs: '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "%s importálása: %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Ennek a parancsnak nem lehet argumentuma.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Ideiglenes mappa olvasása"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Ennek a parancsnak kötelező az argumentum.\n"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Alapvető információk megszerzése a letöltési infó fájlból"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Célfájl létrehozása"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Adat töltése a régi letöltési fájlból (%u a(z) %u-ből)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Adat blokk mentése az új letöltési fájlba (%u a(z) %u-ből)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Forrás letöltési fájl információ megszerzése"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Új letöltés hozzáadása és az új részfájl mentése"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Részfájlok importálása"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Állapot"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Fájl Hash"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Lemezen: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Ez a parancs nem teljes, az alábbi bővítmények valamelyikét kell "
-"használnod.\n"
+"Válassz egy mappát ahol ideiglenes letöltéseket fogok keresni! (az "
+"almappákban is)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
-"\n"
-"Elérhető bővítések:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "Töröljem a sikeresen importált letöltések forrásait?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Elérhető parancsok:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Források eltávolítása?"
+
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "HIBA: Részfájl létrehozása sikertelen"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Minden parancs érzéketlen a kis-/nagybetűkre.\n"
-"Ha részletes infót akarsz egy <parancs>-ról, add ki a '%s <parancs>' "
-"parancsot.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Megpróbálom betölteni a met-fájl biztonsági másolatát a %s-ből"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Kilép az alkalmazásból."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "HIBA: part.met fálj megnyitása sikertelen: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Súgó megjelenítése."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "HIBA: A part.met fájl 0 méretű: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
-msgstr ""
-"Ha egy parancsról kérsz súgót, használd a 'help <parancs>'-ot.\n"
-"A teljes parancslistához használd a 'help'-et.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "HIBA: Érvénytelen .part.met fájl változat: %s ==> %s"
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:595
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"\n"
-"A parancslistához használd a '%s'-et\n"
-"\n"
+"Hiba: %s (%s) sérült (rossz tagek: %s), a fájl betöltése nem lehetséges."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Szintaktikai hiba!"
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+msgstr "HIBA: %s (%s) sérült (hibás tag szám), nem lehet betölteni a fájlt."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Fájl infó helyreállításának megkísérlése..."
+
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"Hiba a parancs feldolgozásában - soha sem kellene előfordulnia! Kérlek, "
-"küldd el a hibajelentést\n"
+"Névtelen fájl helyreállítása - helyreállítás megkísérlése RecoveredFile.dat "
+"néven"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Ennek a parancsnak nem kellene paraméterének lennie."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+"Összes elérhető fájl infó helyreállítva :D - használatának megkísérlése..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Ennek a parancsnak kötelező paramétert adni."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Fájl infó helyreállítása nem lehetséges :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Érvénytelen paraméter."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "A(z) %s (%s) megnyitása sikertelen"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Ez a parancs így nem teljes."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "FIGYELEM: %s lehet, hogy sérült (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "A '%s' paranccsal kaphatsz bővebb segítséget.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "HIBA a fájlrész mentésénél: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "Adatforgalmi hiba a partfile mentésekor: "
+
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Ez a(z) %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Nem tudom megállapítani a '%s' hosszát - a %s fájlt használom."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Ez a(z) %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' valahogy 0 méretű - a %s fájlt használom."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "A %s. part.met.seeds fájl mentése sikertelen"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "%i forrás elmentve a részfájlnak: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "A(z) %s (%s) részfájlnak nincs seeds fájlja"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "A(z) %s (%s) részfájlnak üres a seeds fájlja"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Hiba a részfájl forrás-fájljának olvasása közben (%s - %s): %s"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Sérült részt (%d) találtam a %d részű %s fájlban - FileResultHash |%s| "
+"FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "(%i) befejezett fájlrészt találtam a(z) %s fájlban"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "%s újra algoritmizálása befejeződött"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Váratlan hiba a %s fájl befejezése közben. A fájl szüneteltetve."
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Letöltés befejeződött: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Fájl törlése: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Kliens létrehozása...\n"
+"FIGYELEM: Nem tudom a letöltött részt hash-elni - hash-készlet a(z) '%s'-hez "
+"hiányos"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Ok, kilépés a %s-ből...\n"
+"HIBA: Nem tudom a letöltött részt hash-elni - hash-készlet hiányos (%s). Nem "
+"volna szabad előfordulnia"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Jelszó nélkül nem lehet csatlakozni.\n"
-"Meg kell adnia egy jelszót vagy a konfig fájlban,\n"
-"vagy a parancssorban, vagy beírni amikor kérem.\n"
-"\n"
-"Kilépés...\n"
+"EOF hiba tördelőalgoritmizáláskor a %u. letöltött résznél, amely %u (max %u) "
+"hosszú és a(z) '%s' részfájlhoz tartozik, amely %u hosszú: %s"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "E súgó megjelenítése."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "FIGYELEM: Nincs elég szabad hely a lemezen! Fájl szüneteltetése: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Host, ahol az aMule fut (alap: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "A %i. letöltött fájlrész sérült a %s fájlban"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Az aMule Távoli Elérés portja (alap: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: %i. sérült rész helyreállítva a '%s'-hez -> megmentett bájtok: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Külső kapcsolat jelszava."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Helyfoglalás"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Konfiguráció betöltése fájlból."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Elégtelen lemezterület"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Nem ír ki semmit a szabvány kimenetre."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Letöltve"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Legyen bőbeszédű - mutassa a hibakeresési üzeneteket is."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "HIBA: A(z) '%s' részfájl megnyitása sikertelen."
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Beállítja a program nyelvét."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Alapértelmezett"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "A parancssori opciók konfig fájlba írása."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albán"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Konfig fájl létrehozása az aMule konfig fájlja alapján."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arab"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "A program verziójának kiírása."
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asztúriai"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Kredit fájl betöltve, %u kliens ismert"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Baszk"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - %u kliens kreditérvényessége lejárt!"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bolgár"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "A 'cryptkey.dat' fájlt nem találom, létrehozok egyet."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Katalán"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Kínai (egyszerűsített)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Kínai (hagyományos)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Horvát"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Cseh"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Dán"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Holland"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Angol (Egyesült Királyság)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Észt"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finn"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Francia"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Gall"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Német"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Görög"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Héber"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Magyar"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Olasz"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Olasz (Svájci)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japán"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Koreai"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Litván"
 
-#: src/amuled.cpp:594
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvég (Nynorsk)"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Lengyel"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugál"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugál (Brazíliai)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Orosz"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Szlovén"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Spanyol"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Svéd"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Török"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ukrán"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Nyelv megváltoztatása"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr "Nincsenek fordítások telepítve az aMule-hez"
+
+#: src/Preferences.cpp:771
+msgid "No languages available"
+msgstr "Nincs elérhető nyelv"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "nincs elérhető opció"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Érvénytelen kategória találva, mellőzés"
+
+#: src/Preferences.cpp:1766
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
-"HIBA: az aMule démon nem használható, ha a külső kapcsolatok le vannak "
-"tiltva. A Külső Kapcsolatok engedélyezéséhez használd a normál aMule-t, vagy "
-"indítsd az amuled-t a --ec-config opcióval, vagy állítsd az "
-"\"AcceptExternalConnections\" kulcs értékét 1-re a ~/.aMule/amule.conf "
-"fájlban."
+"A TCP port nem lehet magasabb 65532-nél, mert a kiszolgáló UDP port = TCP+3"
 
-#: src/amuled.cpp:750
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "ERROR: %s"
-msgstr "HIBA: %s"
+msgid "Default port will be used (%d)"
+msgstr "Alapértelmezett port lesz használva (%d)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Kitiltás megszüntetése"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Nem létező megosztott könyvtár kihagyása: %s"
 
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Feltöltések megjelenítése"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Csatlakozás"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Mappák"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Kiszolgálók"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Fájlok"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Biztonság"
 
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Várakozók megjelenítése"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Felület"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Kliensek megjelenítése"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Nézet kiválasztása"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Szűrők"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Távoli elérés"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Online aláírás"
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Kliens szoftver"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Haladó"
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Várakozott"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Események"
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Feltöltési idő"
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Hibakeresés"
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Feltöltés/Letöltés"
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+"A következő változók helyettesítve lesznek:\n"
+"    %PARTFILE - teljes út a fájlhoz\n"
+"    %PARTNAME - csak a fájl neve"
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Távoli állapot"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Ne változtasd meg ezeket a beállításokat, csak akkor,\n"
+"ha tudod, mit csinálsz, ellenkező esetben könnyen\n"
+"elronthatod a dolgokat.\n"
+"\n"
+"Ezen beállítások módosítása nélkül is remekül fog\n"
+"működni az aMule."
 
-#: src/ClientListCtrl.cpp:699
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Cfg csatolása a widget-hez (ID-je: %d, kulcsa: %s) sikertelen"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Fájl prioritás"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr "Adatátvitel a Cfg-ből a Widget-be (ID-je: %d, kulcsa: %s) sikertelen."
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Pontszám"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "A proxy típusa amihez kapcsolódsz"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Kérve"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr "Adatátvitel a Widget-ből a Cfg-be (ID-je: %d, kulcsa: %s) sikertelen."
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Utoljára látott"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"Újra kell indítani az aMule-t, hogy az alábbi változás(ok) érvénybe lépjen"
+"(ek):\n"
+"\n"
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Várólistára bejegyezve"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP port megváltozott.\n"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Feltöltési állapot"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP port megváltozott.\n"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Feltöltött"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- Külső kapcsolat port megváltoztatva.\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- Külső kapcsolat elfogadása megváltoztatva.\n"
+
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- Külső kapcsolat interfész megváltoztatva.\n"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Letöltési állapot"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"Az automatikusan frissített kiszolgálóü lista üres.\n"
+"A 'kiszolgáló lista automatikus frissítése induláskor' letiltva."
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Letöltött"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Userhash"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Titkosított"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Megosztott fájlok elrejtése"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Engedélyezted a távoli elérést, de nem adtál meg jelszót.\n"
+"A távoli elérés nem használható érvényes jelszó nélkül."
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Kliens részletei"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Nyelv megváltozott.\n"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Engedélyezve"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Ideiglenes mappa megváltozott.\n"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Támogatott"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- ED2K hálózat engedélyezve.\n"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Nem támogatott"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Az eD2k és a Kad hálózat is le van tiltva.\n"
+"Nem fogsz tudni kapcsolódni, amíg legalább az egyiket nem engedélyezed."
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Letiltva"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"A Kad nem fog elindulni, ha az UDP portod le van tiltva.\n"
+"Engedélyezd az UDP portot vagy tiltsd le a Kad-ot."
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Most újra KELL indítanod az aMule-t.\n"
+"Ha nem indítod újra most, ne panaszkodj, ha bármi rossz történik.\n"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Befejezetlen"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Az automatikusan frissített kiszolgáló lista üres.\n"
+"Kérlek adj meg legalább egy URL-t, ami érvényes server.met fájlra mutat .\n"
+"Az URL megadásához klikkelj a \"Lista\" gombra ezen checkbox mellett."
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Rossz fiú"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "az Ideiglenes fájloknak"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Hitelesítés - OK"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Bejövő fájlok"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Nem elérhető"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "az Online aláírásnak"
 
-#: src/ClientDetailDialog.cpp:215
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+msgid "Choose a folder for %s"
+msgstr "Válassz egy mappát a %s-nek"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr ""
-"A minimum méretnek kisebbnek kell lennie a maximum méretnél. Maximum méret "
-"figyelmen kívül hagyva."
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Böngészés a videolejátszóhoz"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Keresési figyelmeztetés"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Válaszd ki a böngésződet"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Korlátlan"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "Futtatható%s"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule Tálca menü"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Kiszolgáló lista szerkesztése"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Sebesség korlátok:"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"URL-ek felvétele a server.met fájl letöltéséhez.\n"
+"Egy sorba csak egy URL."
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "Fel: nincs"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Frissítés késleltetése: %d másodperc"
 
-#: src/MuleTrayIcon.cpp:354
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "UL: %u"
-msgstr "Fel: %u"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Grafikon átlagos ideje: %d perc"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "Le: nincs"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Kapcsolatok grafikon-skálája: %d"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "DL: %u"
-msgstr "Le: %u"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Fájl buffer méret: %d bájt"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Letöltési sebesség: %.1f"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Feltöltési várólista nagysága: %d kliens"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Feltöltési sebesség: %.1f"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Kiszolgáló kapcsolat frissítési gyakorisága: %d perc"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Kliens információk"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Kiszolgáló kapcsolat frissítési gyakorisága: Tiltva"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "letiltva"
+
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "Nickname: %s"
-msgstr "Becenév: %s"
+msgid "Execute command on '%s' event"
+msgstr "Parancs végrehajtása a(z) '%s' eseménynél"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Nem lett Becenév kiválasztva!"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Parancs futtatása a magon"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "KliensID: "
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Mag parancs:"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Kiszolgáló Név: "
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Parancs futtatása a grafikus felületen"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "Kiszolgáló IP: "
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "GUI parancs:"
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "A következő változók lesznek behelyettesítve:"
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
-msgstr "TCP port: %d"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+"A minimum méretnek kisebbnek kell lennie a maximum méretnél. Maximum méret "
+"figyelmen kívül hagyva."
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "TCP port: Nem áll készen"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Keresési figyelmeztetés"
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
-msgstr "UDP port: %d"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Alap"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "UDP port: Nem áll készen"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad keresést nem lehet végrehajtani ha a Kad nem fut"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Online Aláírás: Engedélyezve"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "eD2k keresést nem lehet végrehajtani, ha nincs kapcsolódva az eD2k-hoz"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Online Aláírás: Letiltva"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Nem várt hiba amíg a Kad kereséssel próbálkoztam: "
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
-msgstr "Megosztott fájlok: %d"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "Fájl ID"
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
-msgstr "Várólistás ügyfelek: %d"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Fájl"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Letöltés kategóriába"
+
+#: src/SearchListCtrl.cpp:639
 #, c-format
-msgid "Total DL: %s"
-msgstr "Összes letöltés: %s"
+msgid "Get %s for this file"
+msgstr "%s lekérése ehez a fájlhoz"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Kapcsolódó fájlok keresése (eD2k, helyi kiszolgáló)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Ismertként megjelölés"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "eD2k hivatkozás másolása a vágólapra"
+
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Megszakítva"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Új"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Az összes felsorolt zavart kiszolgálóval sikertelen a kapcsolatfelvétel. "
+"Újra próbálkozom zavarás nélkül."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"Az összes felsorolt kiszolgálóval történő kapcsolatfelvétel sikertelen. Újra "
+"próbálkozom."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "Az eD2k hálózat le van tiltva a beállításokban, nem kapcsolódom."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
+"A kiszolgáló listában nem található érvényes kiszolgáló, amelyhez "
+"csatlakozni lehetne."
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "Összes feltöltés: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Kapcsolódva %s-hez (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Feltöltési korlát"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Kapcsolat létrejött a %s-vel"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Letöltési korlát"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Végzetes hiba kapcsolatfelvétel közben. Lehet, hogy megszakadt az Internet "
+"kapcsolat"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "aMule elrejtése"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Megszakadt a kapcsolat %s-vel (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "aMule megjelenítése"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "A %s (%s:%i) halottnak tűnik."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Csevegési folyamat elindítva: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "A %s (%s:%i) úgy látszik megtelt."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Connected to Client ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Automatikus kapcsolódás a kiszolgálóhoz %d másodperc múlva"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Kapcsolódás a klienshez ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Kapcsolat megszakadt"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Kapcsolódás sikertelen / Kapcsolat elveszítve ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Kapcsolódás %s-hez (%s:%i) sikertelen."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Fül bezárása"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "HIBA: A socket érvénytelen az időtúllépés-ellenőrzés során"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Az összes fül bezárása"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Kapcsolódási kísérlet %s-hez (%s:%i): időtúllépés."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "A többi fül bezárása"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Elkésett válasz érkezett egy DNS tudakozáshoz, figyelmen kívül hagyva."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "server.met fájl betöltése: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Server.met fájl nem található!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "server.met fájl '%s' betöltése sikertelen: ismeretlen formátum."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "A server.met megnyitása sikertelen!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "server.met fájl sérült, érvénytelen verzió-tag: 0x%x, mérete %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "%i kiszolgálót találtam a server.met fájlban"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d kiszolgáló hozzáadva"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Hiba: a 'server.met' fájl sérült: "
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "IO hiba a 'server.met' fájl olvasása közben: "
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Kiszolgáló nem lett hozzádva: [%s:%d] nem egy érvényes port."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr ""
 "Kiszolgáló nem lett hozzáadva: Az IP címe [%s:%d]-nek ki van szűrve vagy "
 "érvénytelen."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Kiszolgáló nem lett hozzáadva: Ezzel az IP:Port-tal [%s:%d] már van "
 "kiszolgáló a listában."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Kiszolgáló hozzáadva: Kiszolgáló [%s:%d] '%s' néven."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6866,25 +5428,25 @@
 "Olyan kiszolgálót próbál törölni, amelyikhez csatlakozva van. Kérém először "
 "válassza le."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Nem sikerült megnyitni a '%s'-t"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "A server.met mentése sikertelen!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Érvénytelen URL"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
-msgstr "Kiszolgáló lista letöltése %s-ről befejeződött."
-
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Kiszolgáló lista letöltése sikertelen %s-ről"
+msgid "Finished downloading the server list from %s"
+msgstr "Kiszolgáló lista letöltése %s-ről befejeződött"
 
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6893,24 +5455,29 @@
 "Kérlek írj be egy érvényes kiszolgáló-lista címet ebbe a fájlba, hogy "
 "automatikusan tudjam frissíteni a kiszolgáló listát."
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Kiszolgáló lista letöltése %s-ről megkezdve."
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "FIGYELEM: érvénytelen URL megadva a kiszolgálók automatikus frissítéséhez: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 "Nincs érvényes url a server.met fájl automatikus letöltéséhez az addresses."
 "dat fájlban"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Kiszolgáló lista letöltése sikertelen %s-ről"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -6918,316 +5485,2361 @@
 "A helyi kiszolgálót kiszűrte az IP-szűrő, újracsatlakozom egy másik "
 "kiszolgálóhoz!"
 
-#: src/UserEvents.cpp:132
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Kiszolgáló neve"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "IP-cím"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Port"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Leírás"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Felhasználók"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Állandó"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Verzió"
+
+#: src/ServerListCtrl.cpp:148
+msgid ""
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
+msgstr ""
+"Olyan kiszolgálót próbál törölni, amelyikhez csatlakozva van. Kérém először "
+"válassza le. A kiszolgáló NEM került törlésre."
+
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Ismeretlen név)"
+
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Biztos, hogy törlöd az állandó %s kiszolgálót"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Kiszolgálók száma (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Kiszolgáló"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Kapcsolódás a kiszolgálóhoz"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Kiszolgáló megjelölése állandóként"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Kiszolgáló megjelölése nem állandóként"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Kiszolgálók megjelölése állandóként"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Kiszolgálók megjelölése nem állandóként"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Kiszolgáló eltávolítása"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Kiszolgálók eltávolítása"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Összes kiszolgáló eltávolítása"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "eD2k hivatkozások másolása a vágólapra"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Újracsatlakozás a kiszolgálóhoz"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Biztos, hogy törlöd az összes kiszolgálót?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Biztos, hogy törlöd a kiválasztott kiszolgálót?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Biztos, hogy törlöd a kiválasztott kiszolgálókat?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "HIBA: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "FIGYELEM: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Az új ügyfélazonosító %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "FIGYELEM: Alacsony azonosítót (LowID) kaptál!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tLegvalószínűbb oka az lehet, hogy tűzfal vagy router mögött vagy."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
 msgstr ""
-"A(z) '%s' parancsot a(z) '%s' esemény kapcsán nem sikerült végrehajtani."
+"\tTovábbi információért, kérlek látogasd meg a http://wiki.amule.org-ot"
 
-#: src/amule.cpp:703
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Ismeretlen kiszolgáló infó fogadva! - túl rövid"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "%d új kiszolgáló fogadva"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Kiszolgáló-lista mentése kész."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "A kiszolgáló visszautasította az utolsó parancsot"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Hibás csomag érkezett a kiszolgálótól: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Kezeletlen hiba a kiszolgálóról történő adatok feldolgozásánál: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "A DNS feloldó szálat nem lehet létrehozni a %s-hez való kapcsolódáshoz"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "A %s IP-jű kiszolgáló (%s) ki van szűrve. Nem kapcsolódom."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "protokoll zavarással."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Kapcsolódás %s-hez (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Nem tudom a DNS-t feloldani a %s kiszolgálóhoz: Nem tudok kapcsolódni!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Kiszolgáló nem lett hozzáadva: IP vagy host név nincs megadva."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Kiszolgáló nem lett hozzáadva: Érvénytelen kiszolgáló-port."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "eD2k állapot:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kademlia állapot:"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "LAN módban működik"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Fut"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Állapot:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Kapcsolat állapota:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
-"Nyelvi beállításaid a egy konfigurációs változás miatt az alapértelmezettre "
-"lett átállítva. Bocs."
+"Tűzfal által levédve - nyisd meg a %d. TCP port-ot a routereden vagy a "
+"tűzfaladon"
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "UDP Kapcsolat Állapota:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
-"Nincs egyetlen kiszolgáló sem a kiszolgáló-listádban.\n"
-"Szeretnéd, hogy az aMule letöltsön egy új listát most?"
+"Tűzfal által levédve - nyisd meg a %d. UDP port-ot a routereden vagy a "
+"tűzfaladon"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Kiszolgáló-lista letöltése"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Tűzfal állapot: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Nincs szükség pajtásra - TCP port nyitva"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Nincs szükség pajtásra - UDP port nyitva"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Nincs pajtás"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Kapcsolódás a pajtáshoz"
 
-#: src/amule.cpp:846
+#: src/ServerWnd.cpp:240
 #, c-format
-msgid "web server running on pid %d"
-msgstr "web kiszolgáló fut, pid=%d"
+msgid "Connected to buddy at %s"
+msgstr "Pajtáshoz kapcsolódva %s-on"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Indexelt források:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Indexelt kulcsszavak:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Indexelt jegyzetek:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Indexelt terhelés:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Átlagos felhasználószám:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Átlagos fájlszám:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "nem fut"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Fájl %s hozzáadása a megosztásokhoz"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "%i ismert megosztott fájlt találtam"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "%i ismert és %i ismeretlen megosztott fájlt találtam"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "HIBA: Megpróbáltuk megosztani a(z) %s-t"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Megosztott könyvtár nem található, mellőzve: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Nincsen megosztott fájl ebben a könyvtárban: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Felhasználói név"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Letöltési sebesség"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Feltöltési sebesség"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Elérhető részek"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+msgid "Upload Status"
+msgstr "Feltöltési állapot"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Letöltési állapot"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Eredet"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Helyi fájlnév"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+msgid "Shares File List"
+msgstr "Fájl lista megosztása"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Kérések"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Elfogadott kérések"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Átmásolt adat"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Megosztási arány"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Megszerzett részek"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Teljes források"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Könyvtár útvonal"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Megjegyzés/Értékelés hozzáadása"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Megjegyzés/Értékelés szerkesztése"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Átnevezés"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Add a gyűjteményben szereplő fájlokat az átviteli listához"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Magnet &URI másolása a vágólapra"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "eD2k hivatkozás másolása a vágólapra (Forrás)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "eD2k hivatkozás másolása a vágólapra (Forrás) (Titkosítási opciókkal)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "eD2k hivatkozás másolása a vágólapra (Gazda név)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
-"A web kiszolgáló indítását kérted induláskor, de az amuleweb program nem "
-"futtatható. Kérlek telepítsd az aMule web kiszolgálót tartalmazó csomagot, "
-"vagy fordítsd az aMule-t a --enable-webserver kapcsolóval és futtasd a make "
-"install parancsot."
+"eD2k hivatkozás másolása a vágólapra (Gazda név) (Titkosítási opciókkal)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "eD2k hivatkozás másolása a vágólapra (AICH infó)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Érvényes forráshivatkozáshoz magas azonosító (HighID) szükséges"
 
-#: src/amule.cpp:937
+#: src/SharedFilesCtrl.cpp:461
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Nem tudom a portokat a megadott címhez (%s) rendelni."
+msgid "Shared Files (%i)"
+msgstr "Megosztott fájlok (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[Részfájl]"
 
-#: src/amule.cpp:964
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Távoli fájlnév"
+
+#: src/Statistics.cpp:732
 #, 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"
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Feltöltött adatok (folyamat (összesen)): %s"
 
-#: src/amule.cpp:970
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Total Overhead (Packets): %s"
+msgstr "Összes többletterhelés (csomagok): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Fájlkérés többletterhelése (csomagok): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Forrásváltás többletterhelése (csomagok): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Kiszolgáló többletterhelése (csomagok): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Kad többletterhelés (csomagok): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Titkosítás többletterhelés (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Aktív feltöltések: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Várakozó feltöltések: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Összes sikeres feltöltési folyamat: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Összes sikertelen feltöltési folyamat: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Átlagos feltöltési idő: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Letöltött adatok (folyamat (összesen)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Forrás találatok: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Aktív letöltések száma (adatelemek): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Fel:Le töltési folyamat aránya (összesen): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Átlagos letöltési arány (folyamat): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Átlagos feltöltési arány (folyamat): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Maximum letöltési arány (folyamat): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Maximum feltöltési arány (folyamat): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Újrakapcsolódások: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Első átvitel óta eltelt idő: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Kiszolgálóhoz kapcsolódva: %s óta"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Aktív kapcsolatok száma (becsült): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Max kapcsolódási korlát elérve: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Kapcsolatok átlagos száma (becsült): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Legtöbb kapcsolat (becsült): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Kliensek"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Ismeretlen: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Kiszűrve: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Kitiltott: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Összesen: %i Ismert: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Működő kiszolgálók: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Sikertelen kiszolgálók: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Összes: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Törölt kiszolgálók: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Kiszűrt kiszolgálók: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Felhasználók száma a működő kiszolgálókon: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Fájlok a működő kiszolgálókon: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Összes felhasználó: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Összes fájl: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Kiszolgáló leterheltség: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Megosztott fájlok száma: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Megosztott fájlok teljes mérete: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Átlagos fájlméret: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Operációs rendszer"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Nem fogadott"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktív kapcsolatok (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Nem elérhető"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Soha"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
-"%u port nem elérhető!\n"
-"\n"
-"Ez azt jelenti, hogy alacsony kliens azonosítót kapsz (LOWID).\n"
-"\n"
-"Ellenőrízd a hálózatodat, hogy megbizonyosodj, hogy a port nyitva van kifelé "
-"és befelé egyaránt."
+"A '%s' parancs - melynek pid-je '%d' - befejeződési állapotkódja '%d' volt."
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Online-Aláírás fájl létrehozása sikertelen"
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Végrehajtja az <str>-t és kilép."
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Az aMule OnlineAláírás fájl létrehozása sikertelen"
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Érvénytelen IP cím formátum. Így használd: xxx.xxx.xxx.xxx:xxxx\n"
 
-#: src/amule.cpp:1299
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"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)"
+"Ez a parancs argumentumot igényel. Érvényes argumentumok: 'all', fájlnév "
+"vagy egy szám.\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Feldolgozás hash alapján: "
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Feldolgozás fájlnév alapján: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr ""
+"Ennek a parancsnak szüksége van egy argumentumra. Érvényes argumentumok: egy "
+"fájl hash.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Érvénytelen szám\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Nem érvényes hash (a hossza pontosan 32 karakter kell legyen)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Kérés ismeretlen hibával sikertelen."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "A művelet sikeres volt."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Ez az első alkalom, hogy az aMule %s-t futtatod"
+msgid "Request failed with the following error: %s"
+msgstr "A kérés sikertelen volt a következő hibával: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Ez egy teszt verzió, naponta frissítve, és\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Kliens IP szűrés %s van kapcsolva.\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "nem vállalunk garanciát, hogy nem omlik össze, gyújtja fel a házad,\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "KI"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "vagy öli meg a kutyád. *Elvileg* nyugodtan használható.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "BE"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Kiszolgáló IP szűrés %s van kapcsolva.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "IP szűrő szintje jelenleg %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Sávszélesség korlátok: Fel: %u kB/s, Le: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Kapcsolódva %s-hez %s %s"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Kapcsolódás folyamatban"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "tűzfal mögül"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "rendben"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
-msgstr "Az alábbiak változtak meg ebben a kiadásban biztonsági okok miatt:\n"
+"\n"
+"Download:\t%s"
+msgstr ""
+"\n"
+"Letöltés:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Protokoll titkosítás engedélyezve a bejövő és kimenő kapcsolatokra.\n"
+"Feltöltés:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Kiszolgáló-lista frissítése letiltva más ügyfelektől és kiszolgálóktól.\n"
+"Várólistás kliensek száma:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Több információért ezekről a változásokról keress az aMule wiki-ben\n"
-" a http://wiki.amule.org oldalon információt a hamis kiszolgálókról (\"fake "
-"servers\").\n"
-"Fontos, hogy minden hamis kiszolgálót törölj a kiszolgáló-listádról, hagy az "
-"aMule rendesen működjön."
+"Összes forrás:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Keresés eredményeinek száma: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Keresés haladása: %u %% \n"
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Keresés haladása nem elérhető"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Ismeretlen válasz érkezett a kiszolgálótól, OpCode = %#x."
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Rövid állapot információ megjelenítése."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr ""
+"Megjeleníti a kapcsolat állapotát, aktuális fel/letöltési sebességet, stb.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Megjeleníti a teljes statisztika fát."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Opcionálisan egy szám a 0-255 intervallumban megadható paraméterként ennek "
+"a\n"
+"parancsnak, ami megmondja, hány elemet jelenítsen meg az ügyfél verzók "
+"közül.\n"
+"Nullát megadva vagy elhagyva a paramétert, a jelentése \"bármennyit\".\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Példa: 'statistics 5' csak a leggyakoribb 5 verziót mutatja minden ügyfél\n"
+"típusból.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Az aMule leállítása."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
+"A távoli mag (amule/amuled) leállítása.\n"
+"Ez a szöveges klienst is le fogja állítani,\n"
+"hiszen az használhatatlan futó mag nélkül.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "A megadott objektum újratöltése."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "A megosztott fájlok listájának újratöltése."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "Az IP szűrő tábla újratöltése."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Az aktuális IP szűrő tábla újratöltése."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "IP szűrő tábla frissítése URL-ról."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "Ha nincs megadva URL, a beállításokban megadott URL lesz használva."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Kapcsolódás a hálózathoz."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Kapcsolódás minden hálózathoz, ami engedélyezve van a beállításokban.\n"
+"Opcionálisan megadható egy kiszolgáló cím IP:Port formában, ekkor csak ahhoz "
+"a\n"
+"kiszolgálóhoz kapcsolódik. Az IP-nek egy egy hagyományos IPv4 címnek, vagy "
+"egy\n"
+"érvényes DNS névnek kell lennie."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Kacsolódás csak az eD2k-hoz."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Kapcsolódás csak a Kad-hoz."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Leválaszt a hálózatról."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Ez leválaszt minden jelenleg kapcsolódott hálózatról.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Leválasztás csak az eD2k-ról."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Csak a Kad-ról választ le."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Egy eD2k vagy magnet hivatkozás hozzáadása a maghoz."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"A hozzáadandó eD2k hivatkozás lehet:\n"
+"*) egy fájl hivatkozás (ed2k://|file|...), ami a letöltési listához adódik,\n"
+"*) egy kiszolgáló hivatkozás (ed2k://|server|...), ami a kiszolgáló "
+"listához\n"
+"   adódik,\n"
+"*) vagy egy kiszolgáló-lista hivatkozás, ekkor minden kiszolgáló a listáról "
+"a\n"
+"   kiszolgáló listához adódik.\n"
 "\n"
-"Ezen felül, a böngésző beállítások is vissza lettek állítva a rendszer "
-"alpértelmezettre. Kérlek állítsd be újra a böngészőt, ha szükséges.\n"
+"A magnet hivatkozásnak tartalmaznia kell az eD2k hash-t és a fájl hosszát.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Egy beállítási érték megadása."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "IP szűrő beállítások megadása."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "IP szűrés bekapcsolása mind a kliensek, mind a kiszolgálók részére."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "IP szűrés kikapcsolása mind a kliensek, mind a kiszolgálók részére."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Engedélyezi/Letiltja a kliensek IP szűrését."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Kliens IP szűrés bekapcsolása."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Kliens IP szűrés kikapcsolása."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Engedélyezi/Letiltja a kiszolgálók IP szűrését."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Kiszolgáló IP szűrés bekapcsolása."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Kiszolgáló IP szűrés kikapcsolása."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "IP szűrési szint kiválasztása."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Még több információ, támogatás és új kiadások találhatóak honlapunkon,\n"
+"Az érvényes szűrési szintek a 0-255 tartományban vannak, és az "
+"alapértelmezett\n"
+"értéke 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Sávszélességi korlátok beállítása."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "Az ezeknek a parancsoknak adott érték kilobájt/mp-ben kell legyen.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Feltöltési sávszélesség beállítása."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Letöltési sávszélesség beállítása."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Beállítási értékek megjelenítése."
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "IP szűrő beállítások lekérdezése."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Az IP szűrő állapotának lekérdezése ügyfelek és kiszolgálók számára."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "IP szűrő állapotának lekérdezése csak ügyfeleknek."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "IP szűrő állapotának lekérdezése csak kiszolgálóknak."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "IP szűrési szint lekérdezése."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Sávszélességi korlátok megtekintése."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Keresés végrehajtása."
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"a www.aMule.org-on, vagy az #aMule IRC csatornánkon az irc.freenode.net-en.\n"
+"A keresés típusát meg kell adni:\n"
+"    GLOBAL (globális)\n"
+"    LOCAL (helyi)\n"
+"    KAD (kad)\n"
+"Például: 'search kad fájl' egy kad keresést fog indítani a \"fájl\"-ra.\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Nyugodtan jelezz bármilyen hibát a http://forum.amule.org-on"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Globális keresés végrehajtása."
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Helyi keresés végrehajtása."
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Kad hálózaton való keresés végrehajtása."
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Az utolsó keresés eredményeinek megjelenítése."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Az előző keresés eredményeinek visszaadása.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Egy keresés állapotának megjelenítése."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Egy keresés állapotának megjelenítése.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Fájl letöltése."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"Az Online aláírás fájl könyvtárának megadott hely ÉRVÉNYTELEN!\n"
-" Az OnlineAláírás letiltásra kerül, amíg ki nem javítod azt a beállítások "
-"menüpontban."
+"Az utolsó keresésből a fájl sorszámát kell megadni.\n"
+"Pl: 'download 12' az előző keresésből a 12-es sorszámú fájlt fogja "
+"letölteni.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Letöltés szüneteltetése."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Letöltés folytatása."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Letöltés megszakítása."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Letöltési prioritás beállítása."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Alacsony, normál, magas vagy automatikus prioritást állít be.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Alacsony prioritás beállítása."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Normál prioritás beállítása."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Magas prioritás beállítása."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Automatikus prioritás beállítása."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Várósorok/listák megmutatása."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Feltöltési/letöltési várósor, kiszolgáló lista vagy a megosztott fájlok "
+"listájának megjelenítése.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Feltöltési várósor megmutatása."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Letöltési várósor megmutatása."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Napló megjelenítése."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Kiszolgáló-lista megmutatása."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Napló törlése."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Lemezterület helyfoglalás a '%s' fájl számára sikertelen: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Elavult parancs, használd a(z) '%s'-t helyette."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "HIBA: Nem tudom megnyitni a napló fájlt"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Ez egy elavult parancs és a jövőben eltávolításra kerülhet.\n"
+"Használd a '%s'-t helyette.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "FIGYELEM: a napló üres. Valami nem stimmel."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMule szöveges kliens"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Napló törölve"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "A régi AICH hashkészlet konvertálása 64b-re '%s'-ből '%s'-be."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "KiszolgálóÜzenet: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "FIGYELEM: A fájlnév '%s' érvénytelen és '%s'-re lett átnevezve."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Csomópont-lista letöltése sikertelen."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "FIGYELEM: A fájl '%s' már létezik, az új fájl '%s'-re lett nevezve."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Nem sikerült megnyitni a letöltött verzió-ellenőrző fájlt"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Biztos benne, hogy megszakítja a letöltéseket és töröl minden fájlt ebből a "
+"kategóriából?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Sérült verzió-ellenőrző fájl"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Megerősítés szükséges"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Az aMule egy elavult verzióját használod!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "Csak 99 kategória támogatott."
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "Túl sok kategória!"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Összes egyéb"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Válassz nézetet"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Új kategória"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Kategória szerkesztése"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Kategória törlése"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "A te aMule verziód %i.%i.%i, a legújabb verzió pedig %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+"Nem sikerült megnyitni a fájlt (%s), eltávolítom a megosztott fájlok "
+"listájáról."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "A legújabb verzió mindig megtalálható a http://www.amule.org honlapon."
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Hash-készlet kérés az ismeretlen %s fájlhoz"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "FIGYELEM: A te aMule verziód elavult: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Fájl feltöltés folytatása: %s"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Az aMule verziód naprakész."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Fájl feltöltés felfüggesztése: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Verzió-ellenőrzés fájl letöltése sikertelen."
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr ""
+"A(z) '%s' parancsot a(z) '%s' esemény kapcsán nem sikerült végrehajtani."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Letöltés befejezve"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "A fájl teljes elérési útja."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "A fájlnév könyvtár komponens nélkül."
 
-#: src/amule.cpp:2025
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "A fájl eD2k hash-e."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Fájlméret bájtokban."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Összegzett letöltési aktivitás idő."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Új beszélgetés kezdődött"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Üzenetküldő."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Helyhiány"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Lemez partíció."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Hiba a befejezésnél"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Felhasználók: %s | Fájlok: %s"
+msgid "Processing file number %u: %s"
+msgstr "%u fájl számának feldolgozása: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Rész-hash-eket kért (Csak 9.5 MB fájlméret fölött lehet használni)"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Felhasználók: E: %s K: %s | Fájlok: E: %s K: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Nem létező fájl !\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Nincs hálózat kiválasztva"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, az aMule eD2k hivatkozás készítője"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Üdvözöljük!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Bemeneti paraméterek"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Fájl tördelőalgoritmizálása"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "URL(ek) hozzáadása ehhez a fájlhoz (nem kötelező)"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Itt azt a fájlt add meg, amelyhez eD2k hivatkozást akarsz generálni"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Itt add meg az URL-t amit az eD2k hivatkozáshoz szeretnél adni; ha a "
+"végére / jelet teszel, az aLinkCreator automatikusan hozzáfűzi az aktuális "
+"fájlnevet."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Eltávolít"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Hivatkozás készítése rész-hash-ekkel"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Új és ritka fájlokat segít gyorsabban elterjeszteni megnövelt "
+"hivatkozásméret segítségével"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4 fájl hash"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k fájl hash"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k hivatkozás"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Ment"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Másolás a vágólapra"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Megnyitás"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Fájl megnyitása, amire eD2k hivatkozást kell készíteni"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "A számított eD2k hivatkozás másolása a vágólapra"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Mentés másként"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "A számított eD2k hivatkozás mentése fájlba"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "aLinkCreator Névjegy"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Válaszd ki a fájlt, hogy kiszámíttasd az eD2k hivatkozását"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Nem tudom megnyitni a vágólapot"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Nem került másolásra semmi !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Válaszd ki a fájlt a számított eD2k hivatkozásodnak"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Nem lehet megnyitni"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Kérlek, ne üres fájlnevet adj meg"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Nem került mentésre semmi !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, az aMule eD2k hivatkozás készítője\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Képek: http://www.everaldo.com, http://www.icomania.com\n"
+"és http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"GPL alatt terjesztve"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Tördelőalgoritmizálás..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "Az aLinkCreator dolgozik"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "MD4 hash számítása..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "eD2k hash-ek számítása..."
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Megszakítva !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Kapcsolódva ehhez %s %s"
+msgid "Done in %.2f s"
+msgstr "Elkészült  %.2f mp alatt"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Ezt az URL-t már felvette a letöltési listába !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Kérlek, ne üres URL-t adj meg "
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "Kapcsolódás %s-hez"
+msgid "Unable to open %s"
+msgstr "%s-t nem lehet megnyitni"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Leválasztva az eD2k-ról"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i nap %i óra %i perc %i mp"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad elindítva."
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02un %02uó %02uperc %02ump"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad leállítva."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uó %02uperc %02ump"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Kapcsolódva a Kad-hoz (rendben)"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02uperc %02ump"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Kapcsolódva a Kad-hoz (tűzfal mögül)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02ump"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Leválasztva a Kad-ról"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, aMule Online Statisztikák"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Legmagasabb letöltési arány a wxCas futása óta"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Abszolút legmagasabb letöltési arány a wxCas előző futása alatt"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Rendszer"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Automatikus frissítés leállítása"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Online statisztikák mentése"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Online statisztikák nyomtatása"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Tulajdonságok beállítása"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "wxCas Névjegy"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Automatikus frissítés elindítása"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Automatikus frissítés leállítva"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Automatikus frissítés elindítva"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Statisztikák mentése"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMule online statisztikák"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"A Kad hálózat nem használható, ha az UDP port le van tiltva a "
-"beállításokban, nem indítom."
+"Nyomtatási probléma történt.\n"
+"Lehet, hogy a nyomtatód nincs helyesen beállítva?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "A Kad hálózat le van tiltva  a beállításokban, nem kapcsolódom."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Nyomtatás"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
-"A barátokat tartalmazó emfriends.dat fájl olvasásra megnyitása sikertelen!"
+"wxCas, aMule OnLine Aláírás Statisztikák\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pedro de Oliveira <falso@rdk.homeip.net> által készített CAS alapokon\n"
+"\n"
+"Distributed under GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Ó ó, az aMule nem fut..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule fut"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "Az aMule fut, de nincs kapcsolódva"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule kapcsolódása folyamatban..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Ó-Ó, az aMule állapota ismeretlen..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " fut "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " megállt !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " nincs kapcsolódva !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " kapcsolódás folyamatban ..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " valami különös történik, ellenőrízd !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " kapcsolódva ehhez: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "nincs"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " csatlakozva ehhez "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " ezzel "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Összes letöltés: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Feltöltés: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Szakasz letöltés: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Letöltés: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Feltöltés: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Megosztva: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " fájl(ok), Várólistás kliensek száma: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Idő: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " IP címen "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Rendszer betöltési átlag (1-5-15 perc): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "A rendszer aktivitási ideje (uptime): "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "amulesig.dat fájlt tartalmazó könyvtár"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Itt azt a könyvtárat add meg, ahol az amulesig.dat fájl található"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Frissítés gyakorisága mp-ben"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Statisztikai kép készítése minden frissítés alkalmával"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Itt azt a könyvtárat add meg, ahová a statisztikát akarod elkészíteni"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Statisztikai kép periódikus feltöltése FTP kiszolgálóra"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP Url"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP útvonal"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Itt az FTP kiszolgálójának az URL-jét add meg"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "Könyvtár megadása"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Felhasználó"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
 msgstr ""
-"A barátokat tartalmazó emfriends.dat fájl írásra megnyitása sikertelen!"
+"Itt a felhasználói nevet add meg az FTP kiszolgálóra törénő bejelentkezéshez"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Itt a jelszavad add meg az FTP kiszolgálóra törénő bejelentkezéshez"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "FTP frissítési gyakorisága percekben"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Mentés"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Aláírás fájlt tartalmazó könyvtár"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "A statisztika készítésének könyvtára"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Betölti a(z) <str> sablont"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Web kiszolgáló HTTP port"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "UPnP port továbbítás használata a web kiszolgáló porton"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP port"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Gzip tömörítés használata"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Teljes jogú jelszó a web kiszolgálóhoz"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Vendég jelszó a web kiszolgálóhoz"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Vendég felhasználó engedélyezése"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "vendég felhasználó tiltása"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr ""
+"A web kiszolgáló beálításait a távoli aMule-től kéri, illetve oda menti"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMule konfig fájl útvonala. NE HASZNÁLD!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "PHP feldolgozó letiltása (nem ajánlott)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "PHP oldalak újrafordítása minden kérésnél"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule Web kiszolgáló"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "web ügyfél kapcsolat elfogadva\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "HIBA: nem tudom fogadni a web ügyfél kapcsolatot\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "A kérés sikertelen volt a következő hibával: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Index fájl nem található: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Munkafolyamat időtúllépés - bejelentkezés kérése\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Munkamenet rendben, bejelentkezve\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Munkamenet rendben, nincs bejelentkezve\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Nincs munkafolyamat megnyitva - bejelentkezés kérése\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Munkafolyamat létrehozva - bejelentkezés kérése\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Kérés feldolgozása [eredeti]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Nincsen megadva jelszó, bejelentkezés nem lesz engedélyezve."
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Jelszó ellenőrzése\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Jelszó hash érvénytelen\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Jelszó rendben\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Hibás jelszó\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Nem adtál meg jelszót. Üres jelszó nem megengedett.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Kijelentkezés\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Kérés feldolgozása [átirányított]: "
+
+#~ msgid "Romanian"
+#~ msgstr "Román"
+
+#~ msgid "Download status"
+#~ msgstr "Letöltési állapot"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "Tallóz"
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Frissítés késleltetése: %d másodperc"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr ""
+#~ "Kommentárok és értékelések jelenleg nincsenek támogatva a távoli GUI-ban"
+
+#~ msgid "Transferring"
+#~ msgstr "Átvitel"
+
+#~ msgid "QR: ???"
+#~ msgstr "QR: ???"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#~ msgid "Only files currently uploading"
+#~ msgstr "Csak feltöltés alatt álló fájlokat"
+
+#~ msgid "Queue Rank"
+#~ msgstr "Várólista helyezés"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "Tennivaló - keresés állapotának megjelenítése"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "MD4 és AICH hash létrehozása a(z) '%s' fájlhoz."
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "MD4 hash létrehozása a(z) '%s' fájlhoz."
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "AICH hash létrehozása a(z) '%s' fájlhoz."
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "FIGYELMEZTETÉS: nem lehetett a(z) '%s' eredeti fájlt törölni a biztonsági "
+#~ "másolat létrehozása után"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "FIGYELMEZTETÉS: %s fájl törlése sikertelen"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid ""
+#~ "You cannot connect to a release version from an arbitrary SVN version! "
+#~ "*sigh* possible crash prevented"
+#~ msgstr ""
+#~ "Nem kapcsolódhatsz egy kiadott változathoz akármilyen SVN változattal! "
+#~ "*sóhaj* lehetséges összeomlás megelőzve"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Értékelés (összes):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Próbálj meg teljes adatelemet feltölteni"
+
+#~ msgid "Networks window"
+#~ msgstr "Hálózatok ablak"
+
+#~ msgid "Searches window"
+#~ msgstr "Keresések ablak"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Letöltés alatt"
+
+#~ msgid "Shared files window"
+#~ msgstr "Megosztott fájlok ablak"
+
+#~ msgid "Messages window"
+#~ msgstr "Üzenetek ablak"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Statisztika grafikon ablak"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Beállítások ablak"
+
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Tálca-jelkép elveszett, újrakészítés megkisérlése ..."
+
+#~ msgid "Transfers"
+#~ msgstr "Átvitelek"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Fájl átvitelek ablak"
+
+#~ msgid "Unban"
+#~ msgstr "Kitiltás megszüntetése"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Feltöltések megjelenítése"
+
+#~ msgid "Show Queue"
+#~ msgstr "Várakozók megjelenítése"
+
+#~ msgid "Select View"
+#~ msgstr "Nézet kiválasztása"
+
+#~ msgid "Client Software"
+#~ msgstr "Kliens szoftver"
+
+#~ msgid "Waited"
+#~ msgstr "Várakozott"
+
+#~ msgid "Upload Time"
+#~ msgstr "Feltöltési idő"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Feltöltés/Letöltés"
+
+#~ msgid "Remote Status"
+#~ msgstr "Távoli állapot"
+
+#~ msgid "File Priority"
+#~ msgstr "Fájl prioritás"
+
+#~ msgid "Score"
+#~ msgstr "Pontszám"
+
+#~ msgid "Asked"
+#~ msgstr "Kérve"
+
+#~ msgid "Last Seen"
+#~ msgstr "Utoljára látott"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Várólistára bejegyezve"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Feltöltött"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Letöltött"
+
+#~ msgid "Userhash"
+#~ msgstr "Userhash"
+
+#~ msgid "Encrypted"
+#~ msgstr "Titkosított"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "%d darab zászló képe betöltve."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Feltöltési lista / Várólista megjelenítése"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Várólistás kliensek száma :"
+
+#~ msgid "Current Session"
+#~ msgstr "Aktuális folyamat"
+
+#~ msgid "Total"
+#~ msgstr "Összesen"
+
+#~ msgid "Requested :"
+#~ msgstr "Lekérdezve :"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Másolat készítése előnézethez"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Fájlátvitel ablaka"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Összes felhasználó: %s | Összes fájl: %s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "HTTP letöltési szál elindítva"
+
+#~ msgid "Download size not received, downloading until connection is closed"
+#~ msgstr "Letöltés mérete nem érkezett meg, letöltés amíg a kapcsolat lezárul"
+
+#~ msgid "Download size: %i"
+#~ msgstr "Letöltési méret: %i"
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "HTTP letöltési szál befejeződött"
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Gazda: %s:%i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Válasz: %i (Hiba: %i)"
+
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "FIGYELMEZTETÉS: Üres válasz az adatár létrehozásakor"
+
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "HIBA: Átterelési kód érkezett URL nélkül"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr ""
+#~ "CIP2Country::CIP2Country(): Sikertelen az ország adatok beolvasása innen: "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "IP szűrő szintjének megjelenítése."
+
+#~ msgid "Makes a search."
+#~ msgstr "Keresést végez."
+
+#~ msgid "Killed!"
+#~ msgstr "Kivégezve!"
+
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "amuleweb használata '%s'-ben."
+
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Az aMule leállítása..."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Az alábbiak változtak meg ebben a kiadásban biztonsági okok miatt:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Protokoll titkosítás engedélyezve a bejövő és kimenő kapcsolatokra.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Kiszolgáló-lista frissítése letiltva más ügyfelektől és "
+#~ "kiszolgálóktól.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Több információért ezekről a változásokról keress az aMule wiki-ben\n"
+#~ " a http://wiki.amule.org oldalon információt a hamis kiszolgálókról "
+#~ "(\"fake servers\").\n"
+#~ "Fontos, hogy minden hamis kiszolgálót törölj a kiszolgáló-listádról, hagy "
+#~ "az aMule rendesen működjön."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Ezenkívül a böngésző beállítások is vissza lettek állítva a rendszer "
+#~ "alapértelmezett böngészőre. Kérlek állítsd be újra a böngésző "
+#~ "beállításaidat, ha szükséges.\n"
 
 #~ msgid "Fetching status..."
 #~ msgstr "Állapot gyűjtése..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Felhasználók: E: %s K: %s | Fájlok: E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "A %s kliens a(z) %s:%d IP:Port-on %s %s %s -t használ"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() NULL-t adott vissza"
 
+#~ msgid "Firewalled"
+#~ msgstr "Tűzfal mögött"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "%d zászló kép betöltve."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr ""
+#~ "A(z) %s fájl túlságosan nagy a Donkey számára: max 4 GB engedélyezett."
+
+#~ msgid "User:"
+#~ msgstr "Felhasználó:"
+
+#~ msgid "System:"
+#~ msgstr "Rendszer:"
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Ehhez a fájl típushoz nincs hozzátársítva alkalmazás."
+
+#~ msgid "File was not saved"
+#~ msgstr "A fájl nem lett mentve"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr "Kapcsolódás sikertelen. A megadott host-ra nem lehet kapcsolódni\n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov <petar@post.harvard.edu>\n"
+#~ msgstr " Copyright (C) 2002 Petar Maymounkov <petar@post.harvard.edu>\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "Üzenetszűrő"
 
@@ -7237,15 +7849,184 @@
 #~ msgid "Core Tweaks"
 #~ msgstr "Alapvető finomhangolások"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Ehhez a fájl típushoz nincs hozzátársítva alkalmazás."
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Tooltip késleltetése mp-ben"
 
-#~ msgid "File was not saved"
-#~ msgstr "A fájl nem lett mentve"
+#~ msgid "Show part file number before file name"
+#~ msgstr "Mutassa a részfájl számát a neve előtt"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgid "Skin Support"
+#~ msgstr "Téma támogatás"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- nincs elérhető felület -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Online aláírás könyvtára:"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Szűrő beállítások:"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Sávok kapacitása"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
 #~ msgstr ""
-#~ "A(z) %s fájl túlságosan nagy a Donkey számára: max 4 GB engedélyezett."
+#~ "Megjegyzés: Ezek az értékek\n"
+#~ " csak a statisztikákhoz kellenek."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Szabvány kliens TCP port:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Bővített kliens UDP port:"
+
+#~ msgid "Bind Address"
+#~ msgstr "Kötési cím"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "UDP port a bővített kiszolgáló kéréseknek (TCP+3): 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Max forrás / fájl"
+
+#~ msgid "Connection limits"
+#~ msgstr "Kapcsolat korlátok"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Universal Plug and Play"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "UPnP engedélyezése"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "UPnP TCP Port:"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr ""
+#~ "Következő szüneteltetett fájl indítása, ha egy fájl letöltése befejeződött"
+
+#~ msgid "Check disk space"
+#~ msgstr "Szabad lemezterület ellenőrzése"
+
+#~ msgid "Min disk space:"
+#~ msgstr "Minimum szabad hely:"
+
+#~ msgid "Incoming"
+#~ msgstr "Bejövő"
+
+#~ msgid "Temporary"
+#~ msgstr "Ideiglenes"
+
+#~ msgid "Shared"
+#~ msgstr "Megosztott"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Válaszd ki a statisztikák színeit"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Letöltési folyamatjelző"
+
+#~ msgid "Show percentage"
+#~ msgstr "Százalék megjelenítése"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Folyamatjelző megjelenítése"
+
+#~ msgid "Enable skin support "
+#~ msgstr "Felület támogatás engedélyezése"
+
+#~ msgid "Skin:"
+#~ msgstr "Felület:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "Automatikus rendezése a fájloknak a letöltési listában (erős CPU)"
+
+#~ msgid "Show Fast eD2k Links Handler"
+#~ msgstr "Mutassa a gyors eD2k hivatkozás kezelőt"
+
+#~ msgid "Web server port"
+#~ msgstr "Web kiszolgáló port"
+
+#~ msgid "Enable UPnP port forwarding on the web server port"
+#~ msgstr "UPnP port továbbítás engedélyezése a web kiszolgáló portján"
+
+#~ msgid "Web server UPnP TCP port"
+#~ msgstr "Web kiszolgáló UPnP TCP port"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "A hallgató interfész IP-je\n"
+#~ "(üres = bármi)"
+
+#~ msgid "TCP port"
+#~ msgstr "TCP port"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Kik láthatják a megosztott fájlokat:"
+
+#~ msgid "Event types"
+#~ msgstr "Esemény típusok"
+
+#~ msgid "ERROR: can not accept web client connection\n"
+#~ msgstr "HIBA: nem tudom fogadni a web ügyfél kapcsolatot\n"
+
+#~ msgid ""
+#~ "Your Auto-update server list is empty.\n"
+#~ "'Auto-update server list at startup will be disabled."
+#~ msgstr ""
+#~ "Az automatikusan frissített kiszolgáló lista üres.\n"
+#~ "A 'kiszolgáló lista automatikus frissítése induláskor' letiltva."
+
+#~ msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "HIBA: Érvénytelen part.met fájl változat: %s ==> %s"
+
+#~ msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#~ msgstr ""
+#~ "FIGYELEM: Az ismert fájlok listája sérült, érvénytelen fejlécet tartalmaz."
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "Figyelmeztessen az aMule bezárása előtt."
+
+#~ msgid "Bandwith limits"
+#~ msgstr "Sávszélesség korlátok"
+
+#~ msgid "This UDP port is used for extended ed2k requests and Kad network"
+#~ msgstr "Ezt az UDP portot bővített eD2k kérések és a Kad hálózat használja"
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Sávszélesség többletterhelésének mutatása"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. aktív"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICH bízzon meg minden hash-ben (nem ajánlott)"
+
+#~ msgid "Disk space"
+#~ msgstr "Lemezterület"
+
+#~ msgid "Create Backup for preview"
+#~ msgstr "Másolat készítése előnézethez"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Haladó beállítások"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Folyamatjelző stílus"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Oszlop rendezés"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Egyéb Gui finomhagolások"
+
+#~ msgid "File Options"
+#~ msgstr "Fájl beállítások"
 
 #~ msgid "Status text"
 #~ msgstr "Állapot"
@@ -7253,18 +8034,138 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "Állapot felugró ablakban"
 
-#~ msgid "Please wait... "
-#~ msgstr "Kis türelmet..."
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr ""
+#~ " 'Minden-platform' p2p ügyfél az eMule alapján \n"
+#~ "\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr " Honlap: http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr " Fórum: http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ " GYIK: http://wiki.amule.org\n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " Kapcsolat: admin@amule.org (adminisztratív ügyek) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr " Az aMule részben a következőn alapul: \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " Copyright (C) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "Megadhatod egy film hosszát, történetét, nyelvét ...\n"
+#~ "és ha a fájl hamisítvány, akkor elmondhatod ezt a többi aMule "
+#~ "felhasználónak."
+
+#~ msgid "Misc Options"
+#~ msgstr "Egyéb beállítások"
+
+#~ msgid "Server Options"
+#~ msgstr "Kiszolgáló beállításai"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "A nap kiszolgáló üzenetének megjelenítése kapcsolódáskor ..."
+
+#~ msgid "eD2k Info"
+#~ msgstr "eD2k infó"
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Tiltás/Engedélyezés"
+
+#~ msgid "Authentication"
+#~ msgstr "Hitelesítés"
 
 #~ msgid "General Settings"
 #~ msgstr "Általános beállítások"
 
+#~ msgid "Hard limit"
+#~ msgstr "Felső korlát"
+
+#~ msgid "Max Connections"
+#~ msgstr "Max kapcsolatok"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "Gui finomhangolások"
 
 #~ msgid "Remote Control"
 #~ msgstr "Távoli elérés"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Nem tudom meghatározni a kiválasztott böngészőt!"
+
+#~ msgid "User Defined"
+#~ msgstr "Felhasználó által megadott"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - a linuxos Mule"
+
+#~ msgid "System Default"
+#~ msgstr "Rendszer alapértelmezett"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Válaszd ki a böngésződet"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Egyéni böngésző:"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Itt add meg a böngésződ nevét. Egyéni böngésző esetén, válaszd az Egyéni "
+#~ "menüelemet a lenyíló menü felett."
+
+#~ msgid "Please wait... "
+#~ msgstr "Kis türelmet..."
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "Nem tudom megállapítani a parancsot a böngésző futtatásához."
 
@@ -7388,9 +8289,6 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "ED2k linkek másolása a vágólapra"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "Végzetes hiba: Időzítő létrehozása sikertelen"
-
 #~ msgid "ED2K: Connecting"
 #~ msgstr "ED2K: Kapcsolódás"
 
@@ -7499,10 +8397,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "Hiba: Érvénytelen part.met fájlverzió: %s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr ""
-#~ "Hiba: %s (%s) sérült (rossz tag szám), a fájl betöltése nem lehetséges."
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "Figyelmeztetés: %s lehet, hogy sérült (%i)"
 
@@ -7959,13 +8853,6 @@
 #~ msgid "Waiting for subprocess termination failed"
 #~ msgstr "Al-folyamat befejezésére várakozás sikertelen"
 
-#~ msgid ""
-#~ "You cannot connect to a release version from an arbitrary CVS version! "
-#~ "*sigh* possible crash prevented"
-#~ msgstr ""
-#~ "Nem kapcsolódhatsz egy kiadott verzióhoz egy tetszőleges CVS verzióval! "
-#~ "*sóhaj* lehetséges összeomlás megelőzve"
-
 #~ msgid "doesn't work"
 #~ msgstr "nem működik"
 
@@ -7997,7 +8884,7 @@
 #~ " FAQ: http://wiki.amule.org \n"
 #~ "\n"
 #~ " Contact: admin@amule.org (administrative issues) \n"
-#~ " Copyright (C) 2003-2009 aMule Team \n"
+#~ " Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
 #~ " Part of aMule is based on \n"
 #~ " Kademlia: Peer-to-peer routing based on the XOR metric.\n"
@@ -8011,7 +8898,7 @@
 #~ "GYIK: http://wiki.amule.org \n"
 #~ "\n"
 #~ "Kapcsolat: admin@amule.org (adminisztratív ügyek) \n"
-#~ "Copyright (C) 2003-2009 aMule Team \n"
+#~ "Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
 #~ "Az aMule részben ez alapján \n"
 #~ "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
@@ -8021,9 +8908,6 @@
 #~ msgid "WARNING: You have recieved Low-ID!"
 #~ msgstr "FIGYELMEZTETÉS: Low-ID-t kaptál!"
 
-#~ msgid "Syncronization thread started."
-#~ msgstr "Szinkronizációs szál elindítva."
-
 #, fuzzy
 #~ msgid "Masterhashes of known files have been loaded."
 #~ msgstr "AICH szál: Mester hash-ek az ismert fájlokhoz betöltve."
@@ -8052,9 +8936,6 @@
 #~ msgid "Source Dropping"
 #~ msgstr "Forrás-kihagyás"
 
-#~ msgid "Keep sources"
-#~ msgstr "Források megtartása"
-
 #~ msgid "Drop sources"
 #~ msgstr "Források kihagyása"
 
@@ -8175,9 +9056,6 @@
 #~ "Engedélyezve a tálca helyett a rendszertálcára fogja minimalizálni az "
 #~ "aMule-t."
 
-#~ msgid "Unable to open skin file: %s"
-#~ msgstr "Nem lehet megnyitni a téma fájlt: %s"
-
 #~ msgid "Browse skin file"
 #~ msgstr "Skin fájlok böngészése"
 
@@ -8200,9 +9078,6 @@
 #~ msgid "Skin file %s does not exist - loading defaults"
 #~ msgstr "Téma fájl %s nem létezik - alapértelmezés betöltése"
 
-#~ msgid "IPFilter is %s.\n"
-#~ msgstr "IP szűrő %s.\n"
-
 #, fuzzy
 #~ msgid "Turn IP filtering on."
 #~ msgstr "IP-szűrés"
@@ -8235,10 +9110,6 @@
 #~ msgid "Enable command execution"
 #~ msgstr "Hitelesítés engedélyezése"
 
-#, fuzzy
-#~ msgid "Command:"
-#~ msgstr "Parancs: %s"
-
 #~ msgid "Socks5"
 #~ msgstr "Socks5"
 
@@ -8268,13 +9139,6 @@
 #~ msgid "WARNING: Failed to delete %s.seeds"
 #~ msgstr "FIGYELMEZTETÉS: %s.seeds törlése sikertelen"
 
-#~ msgid ""
-#~ "Downloaded:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Letöltve:\n"
-#~ "%s"
-
 #~ msgid "\tStopped"
 #~ msgstr "\tMegállítva"
 
@@ -8478,9 +9342,6 @@
 #~ "Nem tudtam megnyitni a megosztott fájlt (%s), megosztott fájlok "
 #~ "listájának újraellenőrzése."
 
-#~ msgid "You are not connected to a server!"
-#~ msgstr "Nem vagy csatlakozva kiszolgálóhoz!"
-
 #, fuzzy
 #~ msgid "Client requests invalid %u "
 #~ msgstr "A kliens érvénytelen %u."
@@ -8612,9 +9473,6 @@
 #~ msgid "CListenSocket: Cannot create thread"
 #~ msgstr "CListenSocket: szál létrehozása sikertelen"
 
-#~ msgid "CListenSocket: Destroying"
-#~ msgstr "CListenSocket: Törlés"
-
 #~ msgid "CSocketGlobalThread: Call to Create failed"
 #~ msgstr "CSocketGlobalThread: Create meghívása sikertelen"
 
@@ -8753,9 +9611,6 @@
 #~ msgstr ""
 #~ "Érvénytelen verzió azonosító a server.met fájlban (0x%x , %i méret)!"
 
-#~ msgid "Error: the file server.met is corrupted"
-#~ msgstr "Hiba: a server.met fájl sérült"
-
 #~ msgid "CServerSocketHandler: can not create my thread"
 #~ msgstr "CServerSocketHandler: nem lehet saját szálat létrehozni"
 
@@ -8775,9 +9630,6 @@
 #~ msgid "waiting for transfer..."
 #~ msgstr "várakozás az átvitelre..."
 
-#~ msgid "Waiting for connection..."
-#~ msgstr "Várakozás a kapcsolatra..."
-
 #~ msgid "Max Connection Limit Reached: Never"
 #~ msgstr "Max kapcsolódási korlát elérve: Soha"
 
@@ -9049,9 +9901,6 @@
 #~ msgid "Clear Completed"
 #~ msgstr "Befejezettek eltávolítása"
 
-#~ msgid "Download Selected"
-#~ msgstr "Kijelölt(ek) letöltése"
-
 #~ msgid "Time"
 #~ msgstr "Idő"
 
@@ -9117,15 +9966,9 @@
 #~ msgid "In the graph, each pixel represents"
 #~ msgstr "A grafikonban minden képpont"
 
-#~ msgid "seconds"
-#~ msgstr "másodperc"
-
 #~ msgid "Enter your password here"
 #~ msgstr "Add meg a jelszavad"
 
-#~ msgid "Login Now"
-#~ msgstr "Bejelentkezés"
-
 #~ msgid "Connected "
 #~ msgstr "Csatlakozva"

aMule-2.2.6.tar.bz2/po/it.po -> aMule-2.3.1.tar.bz2/po/it.po Changed

@@ -1,4 +1,4 @@
-# translation of it_prerelease.po to
+# translation of it_new.po to
 # Kry <elkry@users.sourceforge.net>, 2004,2005.
 # ilbuio <ilbuio.bnf@iol.it>, 2004,2005.
 # AnonimoVeneziano <voloterreno@tin.it>, 2004.
@@ -7,20 +7,24 @@
 # Vincenzo Reale <smart2128@baslug.org>, 2007.
 # Giuseppe Bilotta <giuseppe.bilotta@gmail.com>, 2007.
 # rik <rik_kornellatyahoo.com>, 2008.
+# briga <brigabrigante@yahoo.com> 2009.
+# Giuliano Manzitti <giuliano1979@hotmail.com> 2010.
+# translation of it-cvs_beta.po to
+# translation of it-cvs.po to
 # translation of it2.po to
 # translation of it.po to
 # Italian language translation
 # translation of source_strings.po to
 # aMule i18n resource file.
-# Copyright (C) 2004,2005 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the aMule package.
 msgid ""
 msgstr ""
-"Project-Id-Version: it_prerelease\n"
+"Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-03-04 22:29+0100\n"
-"Last-Translator: Simon Calimani <scalimani@hotmail.com>\n"
+"POT-Creation-Date: 2011-11-11 21:59+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,1343 +34,1211 @@
 "X-Poedit-Country: ITALY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Devi specificare una password non vuota."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Password non valida, non è un hash MD5!"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Aggiungi amico"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Connessione non riuscita"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Inserire un indirizzo IP e una porta validi!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "Connessione EC fallita. Risposta vuota."
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Informazione"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Connessione esterna: Accesso negato a causa di: "
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "L'hash utente specificato non è valido!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Connessione esterna: Accesso negato"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Impossibile aprire il file ED2Links."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
-"Connessione Esterna: risposta non valida dal server. Connessione chiusa."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Fatto! Connessione stabilita con aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Fatto! Connessione stabilita."
+"ATTENZIONE: non è possibile aggiungere te stesso come fonte di un link eD2k "
+"finché avrai un ID basso."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Hashing in corso"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Completamento in corso"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Completo"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "In pausa"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Errato"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Scaricamento in corso"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "In attesa"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Uscita dall'applicazione..."
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Creo gli hash MD4 e AICH del file %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Sto terminando l'istanza di amuleweb con pid `%ld' ... "
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Creazione dell'hash MD4 per il file %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Sto terminando l'istanza di amuleweb con pid `%ld' ... "
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Creazione dell'hash AICH per il file %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Fallito"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Conversione dei vecchi hashset AICH in '%s' a 64b: '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: Chiusura core."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr ""
-"ATTENZIONE: '%s' non è un nome di file valido ed è stato rinominato in '%s'."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "Chiusura di aMule completa."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr ""
-"ATTENZIONE: il file '%s' esiste già, il nuovo file sarà rinominato in '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Risultati del debug della memoria per l'uscita da aMule:"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
 msgstr ""
-"ATTENZIONE: impossibile rimuovere l'originale '%s' dopo aver creato il backup"
+"\n"
+"Configurazione EC"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "ATTENZIONE: impossibile eliminare %s"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Password stabilita, connessioni esterne abilitate."
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Impossibile ricevere i file condivisi dall'utente '%s'"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "ATTENZIONE"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Sconosciuto"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Le tue impostazioni di localizzazione sono state impostate a quelle "
+"predefinite dal sistema in conseguenza al cambio di configurazione. "
+"Spiacente."
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (eMule falso versione %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (eMule falso)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Non hai alcun server nella lista dei server.\n"
+"Vuoi che aMule scarichi una lista ora?"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (falso eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Scaricamento della lista server"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (basato su eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr "web server in esecuzione su pid %d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Soprannome: %s ID: %u"
+#: src/amule.cpp:658
+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 ""
+"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/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Richiesto: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "ERRORE"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statistiche file per questa sessione: Accettata %d di %d richiesta %s "
-"trasferito\n"
-msgstr[1] ""
-"Statistiche file per questa sessione: Accettate %d di %d richieste, %s "
-"trasferiti\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Impossibile aprire le porte sull'indirizzo specificato: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statistiche file per tutte le sezioni: Accettata %d di %d richiesta, %s "
-"trasferita\n"
-msgstr[1] ""
-"Statistiche file per tutte le sezioni: accettate %d di %d richieste, %s "
-"trasferite\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Richiesto file sconosciuto"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "La porta %u non è disponibile. Otterrai un ID basso\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Il client %s con IP:Porta %s:%d utilizza %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Nome utente"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"La porta %u non è disponibile!\n"
+"\n"
+"Otterrai un ID basso.\n"
+"\n"
+"Controlla le impostazioni di rete e verifica che la porta sia aperta in "
+"ingresso e in uscita."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Amici"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Impossibile creare il file per la firma in linea"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Mostra &dettagli"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Impossibile creare il file per la firma in linea di aMule"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Aggiungi un amico"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"L'impostazione locale selezionata non sembra essere installata sul tuo "
+"computer (si tenterà ad impostarla in ogni caso)"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Rimuovi Amico"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "È la prima che volta che avvii aMule %s"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Invia &Messaggio"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Questa è una versione di prova, aggiornata quotidianamente, e\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Visualizza File"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr "non garantiamo che essa non distrugga qualcosa, bruci la tua casa,\n"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Crea slot amico"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "o uccida il tuo cane. Ma *dovrebbe* essere comunque sicura.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Sei sicuro di voler eliminare l'amico selezionato?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Altre informazioni, supporto e nuove versioni possono essere trovate nella "
+"nostra homepage,\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Sei sicuro di voler eliminare gli amici selezionati?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "www.aMule.org, o nel nostro canale IRC #aMule su irc.freenode.net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Annulla"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Segnalare ogni bug su http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Non puoi assegnare più di uno slot amico.\n"
-"Soltanto uno slot è stato assegnato."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Selezione multipla"
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Scaricamento completato"
-
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Il percorso completo del file."
-
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Il nome del file senza la parte del percorso."
+"La cartella scelta per contenere il file di firma in linea non è valida!\n"
+"La firma in linea sarà pertanto disabilitata fino a quando il problema non "
+"sarà stato risolto attraverso il pannello delle preferenze."
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "L'hash eD2k del file."
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Notificato il server hostname"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "La dimensione del file in bytes."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Preallocazione spazio su disco per il file '%s' fallita: %s"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Tempo cumulativo di attività di scaricamento."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "ERRORE: non posso aprire il file di log"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Nuova sessione di conversazione iniziata"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "ERRORE: il file di log è vuoto. Qualcosa non va."
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Mittente del messaggio."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Il file di log è stato cancellato"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Spazio esaurito"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Messaggio del server: %s"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Partizione disco."
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "Download saltato di %s, poichè il file richiesto non è il più recente."
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Errore nel completamento"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Impossibile scaricare la lista dei nodi."
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Nome file"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Impossibile aprire il file per il controllo della versione scaricato"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Dimensione"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "File per il controllo della versione danneggiato"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tipo"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Stai usando una versione non aggiornata di aMule!"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Priorità"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "La tua versione di aMule e' la %i.%i.%i e l'ultima è la %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "ID File"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "L'ultima versione è sempre disponibile su http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Richieste"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr ""
+"ATTENZIONE: La tua versione di aMuled e' obsoleta: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Richieste Accettate"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "La tua copia di aMule è aggiornata."
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Dati Trasferiti"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Impossibile scaricare il file per il controllo della versione"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Rapporto Di Condivisione"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Utenti: %s | File: %s"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Parti Ricevute"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Utenti: E: %s K: %s | File: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Fonti Complete"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Nessuna rete selezionata"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Percorso cartella"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "con ID basso"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "File Condivisi"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "con ID alto"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Molto Bassa"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Connesso a %s %s"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Bassa"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Connessione in corso a %s"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normale"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Disconnesso dalla rete eD2k"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Alta"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad avviato."
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Molto Alta"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad arrestato."
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Rilascio"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Connesso alla rete Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Automatica"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Connesso alla rete Kad (firewalled)"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Aggiungi Commento/Giudizio"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Disconnesso dalla rete Kad"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Modifica Commento/Giudizio"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"La rete Kad non può essere utilizzata se la porta UDP è disattivata dalle "
+"opzioni."
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Rinomina"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Rete Kad disattivata dalle opzioni, non mi connetto."
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Aggiungi i file della collezione alla lista dei trasferimenti"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"ERRORE: il demone di aMule non può essere usato se le connessioni esterne "
+"sono disattivate. Per abilitare le connessioni esterne, puoi usare un aMule "
+"normale, far partire amuled con l'opzione --ec-config o impostare la voce "
+"\"AcceptExternalConnections\" a 1 nel file ~/.aMule/amule.conf"
+
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"ERRORE: Una password valida è richiesta per utilizzare connessioni esterne, "
+"ed il demone aMule non può essere usato senza connessioni esterne. Per "
+"lanciare il demone di aMule devi impostare il campo \"ECPassword\" nel file "
+"~/.aMule/amule.conf con un valore appropriato. Esegui amuled con il flag --"
+"ec-config per impostare la password. Per maggiori informazioni http://wiki."
+"amule.org"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: OnInit - Timer d'avvio"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: forzato in background - arrivederci"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Impossibile creare il file Pid"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Copia magnete &URI negli appunti"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "ERRORE: %s"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Copia &link eD2k negli appunti"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Questo è aMule %s basato su eMule."
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Copia link eD2k negli appunti (&Sorgente)"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "In esecuzione su %s"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
 msgstr ""
-"Copia il collegamento eD2k negli appunti (Sorgente) (&Con opzioni di "
-"Cifratura)"
-
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Copia il collegamento eD2k negli appunti (&Nome host)"
+"Visita http://www.amule.org per sapere se è disponibile una nuova versione."
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr ""
-"Copia il collegamento eD2k negli appunti (Nome host) (Con opzioni di "
-"&Cifratura)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ERRORE FATALE: Creazione Timer fallita"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Copia il collegamento eD2k negli appunti (&AICH info)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Controllo remoto di aMule "
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Copia il feedback negli appunti"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Snapshot:"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:501
 msgid ""
-"Feedback from: %s (%s)\n"
+"'All-Platform' p2p client based on eMule \n"
 "\n"
 msgstr ""
-"Feedback da: %s (%s)\n"
+"Client p2p multipiattaforma basato su eMule \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Hai bisogno di un ID alto per creare un collegamento sorgente valido"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "ATTENZIONE"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "File Condivisi (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "File in scaricamento"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Inserisci un nuovo nome per questo file:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Rinomina file"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Sito web: http://www.amule.org \n"
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Ripristino invio del file: %s"
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Sospensione invio del file in corso: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "Client testuale aMule"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: chiave di ricerca troppo corta"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Forum: http://forum.amule.org \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Letto %u contatto Kad"
-msgstr[1] "Letti %u contatti Kad"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Solo %d contatto Kad disponibile, nodes.dat non scritto"
-msgstr[1] "Solo %d contatti Kad disponibili, nodes.dat non scritto"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Contatti: admin@amule.org (questioni amministrative) \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Scritto %d contatto Kad"
-msgstr[1] "Scritti %d contatti Kad"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ERRORE: Impossibile mettersi in ascolto sulla porta TCP."
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Parte di aMule è basata su \n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "connessione client web accettata\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Peer-to-peer routing basato sulla metrica XOR.\n"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ERRORE: impossibile accettare la connessione web client\n"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Messaggio"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Richiesta non riuscita per l'errore seguente: %s."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "Finestra di aMule distrutta"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Richiesta non riuscita con errore sconosciuto."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Connessione in corso"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "File indice non trovato: "
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Connessione in corso"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Sessione scaduta - accesso richiesto\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Disconnesso"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sessione valida, utente registrato\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Firewalled"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sessione valida, accesso non effettuato\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Connesso"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Nessuna sessione aperta - richiesta di accesso\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Connessione in corso"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Sessione creata - richiesta di accesso\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Spento"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Elaborazione richiesta [originale]: "
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Annulla"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Verifica password\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Ferma i tentativi di connessione in corso"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Hash della password non valido\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Disconnetti"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Password valida\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Disconnettiti dalla rete"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Password errata\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Connetti"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr ""
-"Non hai inserito alcuna password e le password vuote non sono ammesse.\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Connettiti alle rete"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Disconnessone richiesta\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Elaborazione richiesta [rediretta]: "
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Up: %.1f | Down: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Carica modello <str>"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Connesso)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Web server porta HTTP"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Disconnesso)"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Utilizza l'inoltro della porta UPnP sulla porta del server web"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Vuoi veramente uscire da %s?"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Porta UPnP"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Chiedi conferma prima di uscire"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Utilizza compressione gzip"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Comando di avvio:"
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- predefinita -"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Password per l'accesso pieno al web server"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "La cartella delle skin '%s' non esiste"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Password per l'accesso Guest al web server"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "ATTENZIONE: impossibile aprire in lettura il file '%s' della skin"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Permetti l'accesso guest"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Reti"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Vieta l'accesso ospite"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Finestra reti"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Carica/salva le impostazioni del server web da/su aMule remoto"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Ricerca"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr ""
-"Percorso del file di configurazione di aMule. NON UTILIZZARE DIRETTAMENTE!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Finestra ricerche"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Disabilita interprete PHP (deprecato)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Download"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Ricompila pagine PHP ad ogni richiesta"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Finestra Downloads"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Server web di aMule "
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "File condivisi"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Non disponibile"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Finestra file condivisi"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Mai"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Messaggi"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Scaricamento in corso..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Finestra messaggi"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistiche"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "Scaricati %d bytes invece dei %d attesi"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Finestra grafici e statistiche"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Cartella contenente il file amulesig.dat"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Finestra Preferenze"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Sfoglia"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importazione"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Inserire la cartella contenente il file amulesig.dat"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Strumento per l'importazione dei partfile"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Intervallo di aggiornamento in secondi"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Informazioni"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Genera un'immagine delle statistiche ad ogni aggiornamento"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Informazioni/Aiuto"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Inserire la cartella nella quale generare l'immagine delle statistiche"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "rete eD2k"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Carica periodicamente l'immagine delle statistiche sul server FTP"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Rete Kad"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "URL FTP"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Nessuna rete"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Percorso FTP"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "Controllo remoto di aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Inserire qui l'URL del tuo server FTP"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "Inserire la directory del server FTP nella quale copiare l'immagine"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "ERRORE FATALE: Creazione del Timer principale fallita"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Utente"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Connessione ad aMule remoto"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Password"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "ERRORE FATALE: Creazione del Timer di interrogazione fallita"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Ciclo evento..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Connessione in corso..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Inserisci il nome utente per accedere al server FTP"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Connessione fallita "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Inserisci la password per accedere al server FTP"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Gestore eventi GUI EC remota"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Qualcosa è andato storto"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Intervallo di aggiornamento FTP in minuti"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Connessione Fallita. Impossibile connettersi a %s:%d\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Verifica"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Connessione persa - aMule verrà chiuso."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Cartella contenente il file di firma"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Pronto"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Cartella nella quale generare l'immagine"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Tutto"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:631
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i giorno/i %i ora/e %i minuto/i %i secondo/i"
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, statistiche in linea di aMule"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Benvenuto!"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
+"Impossibile creare la directory '%s' per la categoria '%s', verrà mantenuta "
+"la directory '%s'."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Velocità di DL massima da quando wxCas è attivo"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Sconosciuto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Velocità di DL massima nelle precedenti sessioni di wxCas"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Impossibile ricevere i file condivisi dall'utente '%s'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Pulisci"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Ricerca amico per connessione con ID basso"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistema"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (falso eMule versione %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Interrompi ricaricamento automatico"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (falso eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Salva immagine statistiche in linea"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (falso eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Stampa immagine statistiche in linea"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (basato su eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Impostazione preferenze"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Nickname: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Riguardo A wxCas"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Richiesto: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Avvia aggiornamento automatico"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statistiche file per questa sessione: Accettata %d di %d richiesta %s "
+"trasferito\n"
+msgstr[1] ""
+"Statistiche file per questa sessione: Accettate %d di %d richieste, %s "
+"trasferiti\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Aggiornamento automatico interrotto"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statistiche file per tutte le sezioni: Accettata %d di %d richiesta, %s "
+"trasferita\n"
+msgstr[1] ""
+"Statistiche file per tutte le sezioni: accettate %d di %d richieste, %s "
+"trasferite\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Aggiornamento automatico avviato"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Richiesto file sconosciuto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Salva immagine statistiche"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Messaggio da '%s' (IP:%s) filtrato"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Statistiche in linea di aMule"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nuovo messaggio da '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/BaseClient.cpp:2899
+#, c-format
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"C'è stato un problema durante la stampa.\n"
-"La stampante potrebbe non essere impostata correttamente?"
+"L'utente %s (%u) ha richiesto la lista dei file condivisi per una cartella "
+"inesistente '%s' -> richiesta ignorata"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Stampa in corso"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "ATTENZIONE: %s non può essere aperto."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
-"wxCas, Statistiche Di Firma In Linea Di aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Basato su CAS di Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distribuito con licenza GPL"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, aMule non è in esecuzione..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule è in esecuzione"
+"ATTENZIONE: la lista dei file conosciuti è danneggiata, contiene "
+"un'intestazione non valida."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule è in esecuzione, ma è disconnesso"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Errore IO durante la lettura del file %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule si sta connettendo..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Errore nel salvataggio del file %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh oh, stato di aMule sconosciuto..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Inserisci Captcha"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Categoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr "è stato in funzione per "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nuova categoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " è fermo !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Scegli una cartella per i file scaricati"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " non è connesso !"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Devi specificare un nome per la categoria!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " si sta connettendo..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Devi specificare un percorso per la categoria!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " sta facendo qualcosa di strano, controllare!"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Impossibile creare una cartella per i file in ingresso per questa categoria. "
+"Specifica un percorso valido!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " è connesso a "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Sessione di chat iniziata: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Connesso al client ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Connessione al client in corso ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "firewalled"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Impossibile connettersi al client / Connessione persa ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "inattivo"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
+"*** Hai superato il controllo captcha e l'utente ha ricevuto il tuo "
+"messaggio. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " è attivo "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** La tua risposta al captcha era errata ed il tuo messaggio è stato "
+"ignorato. Puoi richiedere un nuovo captcha inviando un nuovo messaggio. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " con "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Chat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Scaricamento complessivo: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Chiudi scheda"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Caricamento: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Chiudi tutte le schede"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Scaricamento Della Sessione: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Chiudi le altre schede"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Scaricamento: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Inserisci tra gli amici"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr "kB/s, Caricamento: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Il file dei crediti è stato caricato, %u client conosciuto"
+msgstr[1] "Il file dei crediti è stato caricato, %u client conosciuti"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Crediti scaduti per %u client!"
+msgstr[1] " - Crediti scaduti per %u client!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Condivisione: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr ""
+"Non è stato trovato il file 'cryptkey.dat', creazione del file in corso."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr "file, Client in coda: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Dettagli client"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Tempo: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "ID basso"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "ID alto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr "attivo "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Attivato"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Carico medio del sistema (1-5-15 min): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Supportato"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Uptime del sistema: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Non supportato"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uG %02uore %02umin %02usec"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Disattivato"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uore %02umin %02usec"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Connesso"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02usec"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Disconnesso"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02us"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "ID alto"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Non completo"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "ID basso"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Cattivo"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Non Connesso"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Verificata - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Non disponibile"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr ""
+"L'utente %s (%u) ha richiesto la lista dei file condivisi -> richiesta "
+"accettata"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+"L'utente %s (%u) ha richiesto la lista dei file condivisi -> richiesta negata"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"L'utente %s (%u) ha richiesto la lista delle cartelle condivise -> richiesta "
+"accettata"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Annullato !"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+"L'utente %s (%u) ha richiesto la lista delle cartelle condivise -> richiesta "
+"negata"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "Unable to open %s"
-msgstr "Non è stato possibile aprire %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Parametri di ingresso"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "File da Esaminare"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Aggiungi URL per questo file"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Inserisci qui il file di cui vuoi creare il collegamento eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Inserisci qui l'URL che vuoi aggiungere al collegamento eD2k: Aggiungi / "
-"alla fine per permettere a aLinkCreator di aggiungere l'attuale nome del file"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Aggiungi"
+"L'utente %s (%u) ha richiesto la lista dei file condivisi nella cartella '%"
+"s' -> richiesta accettata"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Pulisci"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Crea collegamento con hash delle parti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Aiuta a diffondere più in fretta i file nuovi e rari, al costo di una "
-"connessione più lunga"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Hash MD4"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "Hash del File eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "Collegamento eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Inizia"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Salva"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Copia negli appunti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Esci"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Apri"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Apri un file per generare il suo collegamento eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Copia"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Copia il collegamento eD2k generato negli appunti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Salva come"
+"L'utente %s (%u) ha richiesto la lista dei file condivisi nella cartella '%"
+"s' -> richiesta negata"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Salva su file il collegamento eD2k generato"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Riguardo A"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Informazioni su aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Seleziona il file di cui vuoi creare il link eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Impossibile aprire gli appunti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Non c'è niente da copiare per ora!"
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "L'utente %s (%u) condivide la cartella '%s'"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Seleziona il file di cui vuoi generare il link eD2k"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr ""
+"L'utente %s (%u) ha inviato una lista delle cartelle condivise non richiesta."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Impossibile aprire "
+#: src/ClientTCPSocket.cpp:982
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr ""
+"L'utente %s (%u) ha inviato la lista dei file condivisi nella cartella '%s'"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Inserire un nome file non vuoto"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "L'utente %s (%u) ha finito di inviare la lista dei file condivisi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Non c'è niente da salvare per adesso !"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "L'utente %s (%u) ha inviato una lista di file condivisi non richiesta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
-"aLinkCreator, il creatore di collegamenti eD2k per aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps da http://www.everaldo.com e http://www.icomania.com\n"
-"e http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distribuito sotto licenza GPL"
+"L'utente %s (%u) ha negato l'accesso alla lista dei file e delle cartelle "
+"condivise"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Hashing..."
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator sta lavorando per te"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Commenti file"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Calcolo degli Hash MD4..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Nome utente"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Calcolo degli Hash eD2k..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Nome file"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Eseguito in %.2f s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Giudizio"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Hai già aggiunto questo URL!"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Commento"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Inserire un URL non vuoto"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Nessun commento"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Elaborazione del file numero %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Hai richiesto l'hash delle parti (solo per file > 9.5 MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u commento"
+msgstr[1] "%u commenti"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> File inesistente!\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, il creatore di collegamenti eD2k per aMule"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"Client %s bannato per aver spedito %s dati corrotti di %s totali, per il "
+"file '%s'"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
-msgstr "Automatica [Bassa]"
+msgstr "Auto [Bassa]"
 
 #: src/DataToText.cpp:38
-#, fuzzy
 msgid "Auto [No]"
-msgstr "Automatica [Bassa]"
+msgstr "Auto [No]"
 
 #: src/DataToText.cpp:39
 msgid "Auto [Hi]"
-msgstr "Automatica [Alta]"
+msgstr "Auto [Alta]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Connessione in corso"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Molto bassa"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Bassa"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normale"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Alta"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Molto alta"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Release"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Richiesta in corso"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Connessione in corso attraverso il server"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
-msgstr "Coda Piena"
+msgstr "Coda piena"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
-msgstr "In Coda"
+msgstr "In coda"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Trasferimento in corso"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Download in corso"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1386,14 +1258,13 @@
 
 #: src/DataToText.cpp:71
 msgid "Connecting via Kad"
-msgstr "Connessione attraverso Kad in corso"
+msgstr "Connessione via Kad"
 
 #: src/DataToText.cpp:72
 msgid "Too many Kad connections"
 msgstr "Troppe connessioni Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Bannati"
 
@@ -1403,7 +1274,7 @@
 
 #: src/DataToText.cpp:75
 msgid "Remote Queue Full"
-msgstr "Coda Remota Piena"
+msgstr "Coda piena"
 
 #: src/DataToText.cpp:105
 msgid "Old MLDonkey"
@@ -1415,24 +1286,24 @@
 
 #: src/DataToText.cpp:118
 msgid "eMule Compatible"
-msgstr "Compatibile Con eMule"
+msgstr "eMule compatibile"
 
 #: src/DataToText.cpp:128
 msgid "Local Server"
-msgstr "Server Locale"
+msgstr "Server locale"
 
 #: src/DataToText.cpp:129
 msgid "Remote Server"
-msgstr "Server Remoto"
+msgstr "Server remoto"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
 #: src/DataToText.cpp:131
 msgid "Source Exchange"
-msgstr "Scambio Fonti"
+msgstr "Scambio fonti"
 
 #: src/DataToText.cpp:132
 msgid "Passive"
@@ -1448,10 +1319,10 @@
 
 #: src/DataToText.cpp:135
 msgid "Search Result"
-msgstr "Risultati Ricerca"
+msgstr "Risultato della Ricerca"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Completati"
 
@@ -1475,3176 +1346,1424 @@
 msgid "ERROR: Failed!"
 msgstr "ERROR: Fallito!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "In coda"
 
 #: src/DataToText.cpp:152
 msgid "Already downloading"
-msgstr "Scaricamento già in corso"
+msgstr "Download già in corso"
 
 #: src/DataToText.cpp:153
 msgid "Unknown or bad tempfile format."
 msgstr "Formato del file temp sconosciuto o errato."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Predefinita di sistema"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albanese"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabo"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturiano"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Basco"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgaro"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Catalano"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Cinese (Semplificato)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Cinese (Tradizionale)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Croato"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Ceco"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Danese"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Olandese"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Inglese (U.K.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estone"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finlandese"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Francese"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galiziano"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Tedesco"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Greco"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Ebraico"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Ungherese"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italiano (Svizzero)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Giapponese"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Coreano"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Parte"
 
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lituano"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvegese (Nynorsk)"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Dimensione"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polacco"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Trasferiti"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portoghese"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Velocità"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portoghese (brasiliano)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Avanzamento"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Russo"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Fonti"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Sloveno"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Priorità"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Spagnolo"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Stato"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Svedese"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Tempo rimanente"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turco"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Ultima fonte completa vista"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ucraino"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Ultima ricezione"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Impossibile determinare il browser selezionato!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Sei sicuri di voler eliminare il file selezionato?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"La porta TCP non può essere superiore a 65532 perché il socket UDP è fissato "
-"a TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Sei sicuro di volere eliminare i file selezionati?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Sarà utilizzata la porta predefinita (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Nome server"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Indirizzo"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Porta"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Descrizione"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Utenti"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "File"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Fallito"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Statico"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versione"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Sei connesso al server che stai cercando di eliminare. Disconnettiti prima. "
-"Il server NON è stato eliminato."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(nome sconosciuto)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Sei sicuro di voler eliminare il server statico %s?"
+"Feedback da: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Sì"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "No"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "Fer&ma"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Non è stato possibile aprire '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pausa"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Server (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Continua"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Server"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "&Rimuovi file completati"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Connetti al server"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Sposta ogni A4AF su questo file"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Segna il server come statico"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Sposta ogni A4AF su questo file (Auto)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Segna il server come non statico"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Sposta ogni A4AF sugli altri file"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Segna i server come statici"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Opzioni avanzate"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Segna i server come non statici"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Anteprima"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Rimuovi il server"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Mostra &dettagli file"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Rimuovi i server"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Mostra tutti i commenti"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Rimuovi tutti i server"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Copia URI magnet negli appunti"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Copia il collegamento eD2k negli appunti"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Copia eD2k &link negli appunti"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Copia il collegamento eD2k negli appunti"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Copia feedback negli appunti"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Riconnetti al server"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "rimuovi"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Sei sicuro di voler eliminare tutti i server?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Assegna a categoria"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Sei sicuro di voler eliminare il server selezionato?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Apri file"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Sei sicuro di voler eliminare i server selezionati?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Inserisci un nuovo nome per questo file:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Disabilitato [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Rinomina file"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Questo è aMule %s basato su eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "In esecuzione su %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Visita http://www.amule.org per sapere se è disponibile una nuova versione."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ERRORE FATALE: Creazione Timer fallita"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Controllo remoto di aMule "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Snapshot:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" Client p2p multipiattaforma basato su eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Sito Web: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Forum: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Contatti: admin@amule.org (questioni amministrative) \n"
+msgid "Downloads (%i)"
+msgstr "Download (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Parte di aMule è basata su \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr " Kademlia: Peer-to-peer routing basato sulla metrica XOR.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Messaggio"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Connessione in corso"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Disconnesso"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Firewalled"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Connesso"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Connessione in corso"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Spento"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Ferma i tentativi di connessione in corso"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Disconnetti"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Disconnettiti dalle reti connesse attualmente"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Connetti"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Connettiti alle reti abilitate attualmente"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Caricamento: %.1f(%.1f) | Scaricamento: %.1f(%.1f)"
+"Per prevenire questo avviso ad ogni anteprima, \n"
+"seleziona nelle preferenze il tuo riproduttore video preferito (di default è "
+"mplayer)."
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Caricamento: %.1f | Scaricamento: %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Anteprima"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Connesso)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr ""
+"ERRORE: Impossibile eseguire il lettore multimediale esterno! Comando: `%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Disconnesso)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Vuoi veramente uscire da aMule?"
+msgid "Saving PartFile %u of %u"
+msgstr "Salvataggio PartFile %u di %u"
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Chiedi conferma prima di uscire"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Tutti i Partfile salvati."
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "La cartella delle skin '%s' non esiste"
+msgid "Loading temp files from %s."
+msgstr "Caricamento file incompleto da: %s"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr ""
-"ATTENZIONE: Non è stato possibile aprire in lettura il file '%s' della skin"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Reti"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Finestra delle reti"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Ricerche"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Finestra delle ricerche"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Trasferimenti"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Finestra dei trasferimenti"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "File condivisi"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Finestra dei file condivisi"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Messaggi"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Finestra dei messaggi"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistiche"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Finestra delle statistiche"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Finestra delle preferenze"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importazione"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Strumento per l'importazione dei partfile"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Informazioni/Aiuto"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "rete eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Rete Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Nessuna rete"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Generale"
+msgid "Loading PartFile %u of %u"
+msgstr "Caricamento file incompleto %u di %u"
 
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Connessione"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Cartelle"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Server"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Sicurezza"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Interfaccia"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filtri"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Controlli Remoti"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Firma In Linea"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Avanzate"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Eventi"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Debug"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Definito dall'utente"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"aMule deve essere riavviato per rendere effettive queste modifiche:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- Modifica della porta TCP.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- Porta UDP cambiata.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"La tua lista degli aggiornamenti automatici dei server è vuota.\n"
-" L'aggiornamento automatico all'avvio sarà disattivato."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Hai abilitato le connessioni esterne senza però specificare una password.\n"
-"Le connessioni esterne non possono essere abilitate a meno che tu non scelga "
-"una password valida."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Lingua cambiata.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Cartella temporanea cambiata.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- Rete ED2K abilitata. \n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Caricamento: 0.0 | Scaricamento: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Entrambe le reti eD2k e Kad sono disattivate.\n"
-"Non potrai connetterti finché non ne abiliterai almeno una."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad non può partire se la porta UDP è disabilitata.\n"
-"Abilitala o disabilita Kad."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"DEVI riavviare aMule adesso.\n"
-"Se non lo fai, non lamentarti se succede qualcosa di strano.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"La tua lista di aggiornamento automatico dei server è vuota.\n"
-"Inserisci l'URL di almeno un server valido nel file server.met.\n"
-"Fai clic sul pulsante \"Lista\" per inserire l'URL."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "File temporanei"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "File completi"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Firme in linea"
+"ERRORE: Impossibile caricare il file di backup. Cerca su http://forum.amule."
+"org come recuperare i file .part.met."
 
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Scegli una cartella per %s"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Tutti i PartFile caricati."
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Sfoglia per trovare un riproduttore video"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Scegli il browser"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Non è stato trovato alcun file incompleto"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Eseguibile%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Modifica la lista dei server"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Trovato %u file parziale"
+msgstr[1] "Trovati %u file parziali"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Inserisci l'URL da cui scaricare il file server.met.\n"
-"Solo un URL per riga."
+"Il filesystem per la cartella Temp non può gestire file di grandi dimensioni."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Intervallo aggiornamento: %d secondo"
-msgstr[1] "Intervallo aggiornamento: %d secondi"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"Il filesytem per la cartella Incoming non può gestire file di grandi "
+"dimensioni."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Intervallo grafico della media: %d minuto"
-msgstr[1] "Intervallo grafico della media: %d minuti"
+msgid "Downloading %s"
+msgstr "Download di %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Scala grafico delle connessioni: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Stai già cercando di scaricare il file '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Intervallo di aggiornamento : %d secondo"
-msgstr[1] "Intervallo di aggiornamento : %d secondi"
+msgid "You already have the file '%s'"
+msgstr "Hai già il file '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Dimensione buffer file: %d byte"
-msgstr[1] "Dimensione buffer file: %d bytes"
+msgid "You are already trying to download the file %s"
+msgstr "Stai già cercando di scaricare il file '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Dimensione coda caricamento: %d client"
-msgstr[1] "Dimensione coda caricamento: %d client"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Non posso convertire il magnet link a eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Intervallo aggiornamento connessione ai server: %d minuto"
-msgstr[1] "Intervallo aggiornamento connessione ai server: %d minuti"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Intervallo aggiornamento connessione ai server: disabilitato"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Porta UDP per le richieste estese al server (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "disabilitata"
+msgid "Unknown protocol of link: %s"
+msgstr "Protocollo del link %s sconosciuto"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Esegui comando se si verifica l'evento '%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Abilita l'esecuzione del comando sul core"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Comando Core:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Abilita l'esecuzione del comando sulla GUI"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Comando GUI:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Le seguenti variabili saranno sostituite:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Collegamento eD2k invalido! ERRORE: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Tentativo di accesso non autorizzato. Connessione chiusa."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr ""
+"Il clienti ha inviato un pacchetto dopo che l'autenticazione non è riuscita."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Connessione esterna chiusa."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Connessioni esterne disabilitate perché la password è vuota!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Connessioni esterne disabilitate nel file di configurazione"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Accettata nuova connessione esterna"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERRORE: impossibile accettare una nuova connessione esterna"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "Connessione esterna rifiutata perché la password nelle preferenze è vuota!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Connessione al client: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Versione sconosciuta"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
 msgstr ""
 "ID della versione EC non corretto, potrebbe esserci un'incompatibilità "
-"binaria. Utilizzare core e client remoto dello stesso snapshot."
+"binaria. Usare core e client remoto dello stesso snapshot."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 "Non puoi connetterti a una versione definitiva da una versione SVN "
 "arbitraria! *sigh* possibile crash evitato"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Autenticazione non riuscita."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Versione protocollo non valida."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Tag versione di protocollo mancante."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+"Autenticazione fallita: l'hash specificato come password EC non è valido."
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Autenticazione fallita: password errata."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Autenticazione fallita: devi inserire la password."
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr "Richiesta non valida, prima devi autenticarti."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Accesso consentito."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Invia il messaggio di errore \"%s\" al client."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Tentativo di accesso non autorizzato da %s. Connessione chiusa."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Comando Partfile remoto fallito: hash del file non trovato: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Hash del file non trovato: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! errore nel processare l'opcode!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Server non aggiunto"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "server non trovato: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "è necessario definire il server da rimuovere"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k è disabilitato nelle preferenze."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Ricerca in corso. Risultati in arrivo!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
-msgstr "Non ha senso utilizzare la ricerca Web da interfaccia remota."
-
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "La rete Kad è disabilitata nelle preferenze."
+msgstr "Non ha senso usare la ricerca Web da interfaccia remota."
 
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Niente punti per il grafico."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Il tuo client non è configurato per questo livello di dettaglio."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
-msgstr "Connessione esterna: richiesto l'arresto"
+msgstr "Connessione Esterna: richiesto l'arresto"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Sto già uscendo."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: aggiungo il collegamento '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Collegamento non valido o già nella lista."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "File non trovato."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Nome file non valido."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Impossibile rinominare il file."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "La rete Kad è disabilitata nelle Preferenze."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "eD2k è già connesso."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Connessione alla rete eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Già connesso alla rete Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Connessione alla rete Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Tutte le reti sono disabilitate."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Disconnesso dalla rete eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Disconnesso dalla rete Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
-msgstr "Connessione esterna: ricevuto un opcode invalido: %#x"
+msgstr "Connessione Esterna: ricevuto un opcode invalido: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Opcode non valido (versione errata del protocollo?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Impossibile aprire il file (%s), rimosso dalla lista dei file condivisi."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Hashset richiesto per il file sconosciuto: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Il programma `%s' con pid `%d' e' terminato uscendo con stato `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Server non aggiunto: non è stato specificato l'IP o il nome dell'host."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Server non aggiunto: porta del server specificata non valida."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Stato eD2k:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Connesso"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Porta"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Stato Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Attivo"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Stato:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Disconnesso"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Stato connessione:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Firewalled"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Stato firewalled: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Connesso all'amico"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Nessun amico"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Utenti medi:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "File medi:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Non attivo"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Uptime: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Trasferimento"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Upload"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Dati inviati (sessione (totale)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Overhead totale (pacchetti): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Overhead per richieste file (pacchetti): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Overhead per scambio fonti (pacchetti): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Overhead server (pacchetti): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Overhead Kad (pacchetti): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Crypt overhead (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Upload attivi: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Upload in attesa: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Totale sessioni di upload riuscite: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Totale sessioni di upload fallite: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Tempo upload medio: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Scaricamenti"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Dati scaricati (sessione (totale)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Fonti trovate: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Scaricamenti attivi (parti): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Rapporto UL:DL sessione (totale): %s"
-
-#: src/Statistics.cpp:689
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Velocità di scaricamento media (Sessione): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Velocità d'invio media (Sessione): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Velocità di scaricamento massima (Sessione): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Velocità d'invio massima (Sessione): %s"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Estensione '%s' sconosciuta per il comando '%s'.\n"
 
-#: src/Statistics.cpp:693
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Reconnects: %i"
-msgstr "Riconnessioni: %i"
+msgid "Unknown command '%s'.\n"
+msgstr "Comando sconosciuto '%s'.\n"
 
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Tempo dal primo trasferimento: %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Questo comando non può avere un argomento.\n"
 
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Connesso al server da: %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Questo comando richiede un argomento.\n"
 
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Connessioni attive (stima): %i"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Questo comando è incompleto, devi usare una delle estensioni qui riportate.\n"
 
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Limite massimo connessioni raggiunto: %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Estensioni disponibili:\n"
 
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Connessioni medie (stima): %g"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Comandi disponibili:\n"
 
-#: src/Statistics.cpp:700
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Picco connessioni (stima): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Client"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Tutti i comandi possono essere digitati in maiuscolo e minuscolo.\n"
+"Scrivi '%s <comando>' per avere informazioni dettagliate su un <comando>.\n"
 
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrati"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Esce dall'applicazione."
 
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Totale: %i Conosciuti: %i"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Mostra aiuto."
 
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Server attivi: %i"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Per avere aiuto su un comando, digitare 'help <comando>'.\n"
+"Per avere la lista completa dei comandi, digitare 'help'.\n"
 
-#: src/Statistics.cpp:716
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Failed Servers: %i"
-msgstr "Server falliti: %i"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Usa '%s' per la lista dei comandi\n"
+"\n"
 
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Totale: %s"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Errore di sintassi!"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Server rimossi: %s"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+"Errore nell'eseguire il comando - ciò non dovrebbe mai accadere! Segnala il "
+"bug\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Server filtrati: %s"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Questo comando non deve avere parametri."
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Utenti su server attivi: %llu"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Questo comando richiede un parametro."
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "File su server attivi: %llu"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Argomento non valido."
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Utenti totali: %llu"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Questo comando è incompleto."
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "Total Files: %llu"
-msgstr "File totali: %llu"
+msgid "Type '%s' to get more help.\n"
+msgstr "Digita '%s' per avere altro aiuto.\n"
 
-#: src/Statistics.cpp:724
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Occupazione server: %.2f%%"
+msgid "This is %s %s %s\n"
+msgstr "Questo è %s %s %s\n"
 
-#: src/Statistics.cpp:728
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Numero di file condivisi: %s"
+msgid "This is %s %s\n"
+msgstr "Questo è %s %s\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Dimensione totale file condivisi: %s"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
+msgstr ""
+"\n"
+"Creazione del client in corso...\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Average file size: %s"
-msgstr "Dimensione media del file: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Sistema operativo"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Non ricevuto"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Taglia"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Incolla"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Seleziona tutto"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Impossibile effettuare una ricerca sulla rete Kad senza esserci connessi"
+"\n"
+"Ok, uscita in corso da %s...\n"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"La ricerca eD2k non può essere effettuata finché non sei connesso alla rete "
-"eD2k"
+"Non posso connettermi con una password vuota.\n"
+"Devi specificare una password nel file di configurazione oppure\n"
+"nella linea di comando, o inserirne una quando richiesto.\n"
+"\n"
+"Sto uscendo...\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Errore imprevisto durante la ricerca su Kad: "
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Mostra questo suggerimento."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Messaggio da '%s' (IP:%s) filtrato"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Host su cui aMule è in esecuzione (default: localhost)"
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nuovo messaggio da '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Porta di aMule per le connessioni esterne (default: 4712)"
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr ""
-"L'utente %s (%u) ha richiesto la lista dei file condivisi -> richiesta "
-"accettata"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Password connessioni esterne."
 
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr ""
-"L'utente %s (%u) ha richiesto la lista dei file condivisi -> richiesta negata"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Leggi la configurazione da file."
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"L'utente %s (%u) ha richiesto la lista delle cartelle condivise -> richiesta "
-"accettata"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Non stampare output sullo stdout."
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr ""
-"L'utente %s (%u) ha richiesto la lista delle cartelle condivise -> richiesta "
-"negata"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Verboso - mostra anche i messaggi di debug."
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"L'utente %s (%u) ha richiesto la lista dei file condivisi nella cartella %s -"
-"> richiesta accettata"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Imposta il locale del programma (lingua)."
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"L'utente %s (%u) ha richiesto la lista dei file condivisi nella cartella %s -"
-"> richiesta negata"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Salva le opzioni linea di comando nel file di configurazione."
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "L'utente %s (%u) condivide la cartella %s"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Crea un file di configurazione basato su quello di aMule."
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr ""
-"L'utente %s (%u) ha inviato una lista delle cartelle condivise non richiesta."
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Mostra la versione del programma."
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr ""
-"L'utente %s (%u) ha inviato la lista dei file condivisi nella cartella %s"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Dettagli file"
 
-#: src/ClientTCPSocket.cpp:1032
+#: src/FileDetailDialog.cpp:113
 #, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "L'utente %s (%u) ha finito di inviare la lista dei file condivisi"
+msgid "%.1f%% done"
+msgstr "%.1f%% completato"
 
-#: src/ClientTCPSocket.cpp:1037
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "L'utente %s (%u) ha inviato una lista di file condivisi non richiesta"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
-"L'utente %s (%u) ha negato l'accesso alla lista dei file e cartellecondivisi"
-
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Nodi (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "IP non valido per il bootstrap"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Porta non valida per il bootstrap"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Completa tutti i campi obbligatori"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Sei sicuro di voler scaricare un nuovo file nodes.dat?\n"
+"Impossibile aprire in lettura il file della lista degli amici 'emfriend.met'!"
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
-"Così facendo, rimuoverai i nodi attuali e riavvierai la connessione Kademlia."
+"Impossibile aprire in scrittura il file della lista degli amici 'emfriend."
+"met'!"
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Continuare?"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "CRITICO - nessun client in StartChatSession"
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "ERRORE: "
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Amici"
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "ATTENZIONE: "
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Mostra &dettagli"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
 msgstr "Aggiungi amico"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Inserire un indirizzo IP e una porta validi!"
-
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informazione"
-
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "L'hash utente specificato non è valido!"
-
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Fonti"
-
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "File"
-
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Scaricamento"
-
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Categoria"
-
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Principale"
-
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Scaricamento nella categoria"
-
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Cerca file correlati (eD2k, server locale)"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Rimuovi amico"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Segna come file conosciuto"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Invia &messaggio"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Connessione ad aMule remoto"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Visualizza file"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Connessione fallita "
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Crea slot amico"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "ERRORE"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Sei sicuro di voler eliminare l'amico selezionato?"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Connessione fallita. Impossibile connettersi a %s:%d\n"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Sei sicuro di voler eliminare gli amici selezionati?"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
 msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
-"ATTENZIONE: non è possibile aggiungere te stesso come fonte di un "
-"collegamento eD2k finché avrai un ID basso."
-
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Utenti: E: %s K: %s | File E: %s K: %s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Tutto"
-
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Utenti totali: %s | File totali: %s"
-
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Trasferiti"
-
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Velocità"
-
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Avanzamento"
-
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Stato"
-
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Tempo rimanente"
-
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Ultima fonte completa vista"
-
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Ultima ricezione"
-
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Sei sicuri di voler eliminare il file selezionato?"
+"Non puoi assegnare più di uno slot amico.\n"
+"Assegnato un solo slot."
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Sei sicuro di voler rimuovere i file selezionati?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Selezione multipla"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
-msgstr "Invia un messaggio all'utente"
+msgstr "Invia messaggio all'utente"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Messaggio da inviare:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "Inter&rompi"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "Metti in &pausa"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Continua"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "&Rimuovi file completati"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Sposta ogni A4AF su questo file"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Sposta ogni A4AF su questo file (Auto)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Sposta ogni A4AF sugli altri file"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Opzioni avanzate"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Anteprima"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Mostra &dettagli file"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Mostra tutti i commenti"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Copia URI magnet negli appunti"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "rimuovi"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Assegna a categoria"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Apri file"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Elimina dagli amici"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Inserisci tra gli amici"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Invia messaggio"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
-msgstr "Trasferisci su questo file"
-
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
+msgstr "Sposta su questo file"
 
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
-msgstr "QR: %u (%i)"
+msgid "On Queue: %u (%i)"
+msgstr "In coda: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Altro file richiesto"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Scaricamenti (%i)"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Upload in attesa:"
 
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Per prevenire questo avviso ad ogni anteprima, \n"
-"seleziona nelle preferenze il tuo riproduttore video preferito (di default è "
-"mplayer)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Anteprima del file"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr ""
-"ERRORE: Impossibile eseguire il lettore multimediale esterno! Comando: `%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "ERRORE: impossibile creare il file .part)"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Caricamento del backup del file met da %s"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ERRORE: Apertura del file part.met fallita: %s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ERRORE: la dimensione del file part.met è 0: %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ERRORE: La versione del file part.met non è valida: %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"ERRORE: %s (%s) è corrotto (computo dell'etichetta errato), impossibile "
-"caricare il file."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Tentativo di recupero informazioni sul file..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr ""
-"Recupero file senza nome - tentativo di recupero come RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Recuperate tutte le informazioni disponibili :D - Tentativo di utilizzo in "
-"corso..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Impossibile recuperare le informazioni sul file :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Impossibile aprire %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "ATTENZIONE: %s potrebbe essere corrotto (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "Errore durante il salvataggio del file incompleto: %s (%s ==> %s)"
+msgid "On Queue: %u"
+msgstr "In coda: %u"
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr ""
-"Non è possibile recuperare la lunghezza di '%s' - utilizzando il file %s."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' è per qualche motivo di dimensione 0 - uso il file %s."
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Caricamento"
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Impossibile salvare il file part.met.seeds per %s"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Salvata %i fonte per il file incompleto: %s (%s)"
-msgstr[1] "Salvate %i fonti per il file incompleto: %s (%s)"
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Nessuno"
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Il file incompleto %s (%s) non ha file delle fonti"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "No"
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Il file incompleto %s (%s) ha un file delle fonti vuoto"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Sì"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Errore nella lettura del file delle fonti del partfile (%s - %s): %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Scaricamento in corso..."
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Trovata parte danneggiata (%d) in %d parte %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[1] ""
-"Trovata parte danneggiata (%d) in %d parti %s - FileResultHash |%s| FileHash "
-"|%s|"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "Download HTTP cancellato"
 
-#: src/PartFile.cpp:1181
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Trovata parte completata (%i) in %s"
+msgid "Unable to create destination file %s for download!"
+msgstr "Impossibile creare il file di destinazione %s per il download!"
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Nuovo hashing completato %s"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "L'URL per scaricare non può essere vuoto."
 
-#: src/PartFile.cpp:2239
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Errore imprevisto durante il completamento di %s. File in pausa."
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "L'URL %s ha risposto: %i - Errore (%i)!"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Download completato: %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Errore critico durante la scrittura del file scaricato."
 
-#: src/PartFile.cpp:2323
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Deleting file: %s"
-msgstr "Cancellazione file: %s"
+msgid "Downloaded %d bytes"
+msgstr "Scaricato %d bytes"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"ATTENZIONE: impossibile creare l'hash del file parziale - hashset incompleto "
-"per '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Scaricati %d bytes invece dei %d attesi"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"ERRORE: Impossibile creare l'hash del file parziale - hashset incompleto (%"
-"s). Ciò non dovrebbe mai accadere"
+"URL non valido per il download o il redirect HTTP (hai inserito 'http://' ?)"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr ""
-"ATTENZIONE: non c'è abbastanza spazio libero su disco! Metto in pausa il "
-"file: %s"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "Impossibile connettersi al server HTTP"
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "La parte di file scaricata %i è danneggiata in: %s"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Risposta non valida dal server HTTP"
 
-#: src/PartFile.cpp:3214
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: recuperata parte danneggiata %i in %s -> risparmiati byte: %s"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Scarico il nuovo GeoIP.dat da %s"
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Allocando"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "Errore nello scaricare GeoIP.dat, interrompo l'aggiornamento."
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Spazio su disco insufficiente"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Fermo"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Scaricato"
-
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ERRORE: Apertura file parziale fallita '%s'"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "ATTENZIONE: known.met non può essere aperto."
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr ""
-"ATTENZIONE: la lista dei file conosciuti è corrotta, contiene "
-"un'intestazione non valida."
+msgid "Failed to remove %s file, aborting update."
+msgstr "Impossibile rimuovere il file %s, aggiornamento interrotto."
 
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Errore IO durante la lettura del file known.met: %s"
+msgid "Failed to rename %s file, aborting update."
+msgstr "Impossibile rinominare il nuovo file %s, aggiornamento interrotto."
 
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Errore nel salvataggio del file known.met: %s"
+msgid "Successfully updated %s"
+msgstr "%s aggiornato con successo"
 
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Trovati %i file condiviso conosciuto"
-msgstr[1] "Trovati %i file condivisi conosciuti"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Errore durante l'aggiornamento di GeoIP.dat"
 
-#: src/SharedFileList.cpp:358
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Trovato %i file conosciuto, %i sconosciuto"
-msgstr[1] "Trovati %i file condivisi conosciuti, %i sconosciuti"
+msgid "Failed to download %s from %s"
+msgstr "Impossibile scaricare %s da %s"
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ERRORE: Tentativo di condividere %s"
+msgid "Failed to load country data for '%s'."
+msgstr "Impossibile caricare dati locali da '%s'."
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Commenti file"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Giudizio"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Commento"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Nessun commento"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Caricamento filtri IP da 'ipfilter.dat' e 'ipfilter_static.dat'."
 
-#: src/CommentDialogLst.cpp:104
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u commento"
-msgstr[1] "%u commenti"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Impossibile collegarsi ai server con offuscamento di protocollo. Ci riprovo "
-"senza offuscamento."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr ""
-"Impossibile connettersi a tutti i server in lista. Procedo con un altro "
-"tentativo."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "La rete eD2k è disabilitata nelle preferenze, non mi connetto."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
-"Nella lista dei server non è stato trovato un server valido a cui connettersi"
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Connesso a %s (%s:%i)"
+"Impossibile caricare il file ipfilter.dat '%s', trovato formato sconosciuto."
 
-#: src/ServerConnect.cpp:263
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Connessione stabilita con: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
-"Errore grave durante il tentativo di connessione. La connessione a Internet "
-"potrebbe non essere attiva"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Persa connessione a %s (%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) sembra non essere attivo."
+"Impossibile caricare il file ipfilter.dat '%s', impossibile aprire il file."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) sembra essere pieno."
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Caricato %u intervallo di IP da '%s'."
+msgstr[1] "Caricati %u intervalli di IP da '%s'."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Riconnessione automatica al server tra %d secondo"
-msgstr[1] "Riconnessione automatica al server tra %d secondi"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Connessione persa"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u riga non valida è stata scartata."
+msgstr[1] "%u righe non valide sono state scartate."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Connessione a %s (%s:%i) non riuscita."
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Impossibile rinominare il nuovo file %s,  aggiornamento interrotto."
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ERRORE: Nessun Socket valido trovato entro il tempo massimo"
-
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Connessione a %s (%s:%i) non riuscita per time-out."
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "Filtro IP pronto"
 
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-"ERRORE: Impossibile caricare il file di backup. Cerca su http://forum.amule."
-"org come recuperare i file .part.met."
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Non è stato trovato alcun file incompleto"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Trovato %u file parziale"
-msgstr[1] "Trovati %u file parziali"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
-"Il filesystem per la cartella Temp non può gestire file di grandi dimensioni."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Il filesytem per la cartella Incoming non può gestire file di grandi "
-"dimensioni."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Scaricamento di di %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Stai già cercando di scaricare il file '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Hai già il file '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Stai già cercando di scaricare il file '%s'"
+"Bootstrap da\n"
+"client noti"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Non è stato possibile convertire il collegamento magnete in eD2k: %s"
+msgid "Nodes (%u)"
+msgstr "Nodi (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Protocollo del collegamento %s sconosciuto"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "IP non valido per il bootstrap"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Collegamento eD2k invalido! ERRORE: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Porta non valida per il bootstrap"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Esegui <str> e esci."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Completa tutti i campi obbligatori"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Formato IP non valido. Utilizza xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Sei sicuro di voler scaricare un nuovo file nodes.dat?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Questo comando richiede un argomento. Argomenti validi sono: 'all', nome del "
-"file, o un numero.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Elaborazione dell'hash in: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Elaborazione in base al nome del file in corso: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Questo comando richiede un argomento. Argomenti validi: un file hash.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Non è un numero valido\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Non è un hash valido (la lunghezza deve essere di 32 caratteri)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Operazione conclusa con successo."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Richiesta fallita con il seguente errore: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Filtraggio IP per i client: %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "OFF"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "ON"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Filtraggio IP per i server: %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Il livello IPFilter attuale è %d\n"
+"Così facendo, rimuoverai i nodi attuali e riavvierai la connessione Kademlia."
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Limiti di banda: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Continuare?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: chiave di ricerca troppo corta"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Connesso a %s %s %s"
+msgid "Keyword for search: %s"
+msgstr "Keyword per la ricerca: %s"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "con ID basso"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: la chiave di ricerca è già nella lista: "
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "con ID alto"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Connessione in corso"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Non connesso"
-
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Download:\t%s"
+"Impossibile leggere il file nodes.dat - versione troppo vecchia. Questa "
+"versione (0) non è più supportata."
 
-#: src/TextClient.cpp:726
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"Upload:\t%s"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Letto %u contatto Kad"
+msgstr[1] "Letti %u contatti Kad"
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Client in coda:\t%d\n"
+"Nessun contatto trovato, fai un bootstrap, oppure scarica un file nodes.dat."
 
-#: src/TextClient.cpp:732
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
-msgstr ""
-"\n"
-"Fonti totali:\t%d\n"
-
-#: src/TextClient.cpp:809
-#, c-format
-msgid "Number of search results: %i\n"
-msgstr "Totale risultati della ricerca: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - visualizzare l'avanzamento della ricerca"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "C'è solo %d contatto Kad disponibile, non scrivo il file nodes.dat"
+msgstr[1] ""
+"Ci sono solo %d contatti Kad disponibili, non scrivo il file nodes.dat"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Ricevuta risposta sconosciuta dal server, OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Mostra informazione sullo stato."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr ""
-"Mostra stato connessione, velocità di upload e download attuali, etc.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Mostra le statistiche complete."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Scritto %d contatto Kad"
+msgstr[1] "Scritti %d contatti Kad"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Opzionalmente, un numero compreso tra 0 e 255 può essere passato come "
-"argomento a questo\n"
-"comando, per indicare quante versioni mostrare nel sottoalbero dei client. 0 "
-"oppure\n"
-"nessun numero significa 'infinite'.\n"
-"Esempio: 'statistics 5' mostrerà solo le cinque versioni più diffuse per "
-"ogni tipo di client.\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Nome file"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Chiudi aMule."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Dimensione file"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Arresta il core remoto attualmente in funzione (amule/amuled).\n"
-"Ciò interromperà anche il client testuale, dal momento che è inutilizzabile "
-"senza un\n"
-"core in esecuzione.\n"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Rapporto condivisione"
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Ricarica l'oggetto fornito."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Inviato"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Ricarica la lista dei file condivisi."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Richiesto"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Ricarica il filtro IP da file."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Accettato"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Connessione al network."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Fonti complete"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Questo connetterà aMule a tutte le reti attualmente abilitate nelle "
-"Preferenze.\n"
-"E' anche possibile specificare l'indirizzo IP, nella forma IP:Porta, di un "
-"server e\n"
-"connettersi solamente a quello. Si può utilizzare un indirizzo IPv4 oppure\n"
-"un nome risolvibile da un server DNS."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Connettiti solo alla rete eD2k."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Connetti solo alla rete Kad."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Disconnetti dalla rete."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Questo disconnetterà aMule da tutte le reti attive.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Disconnettiti solo dalla rete eD2k."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Disconnetti solo dalla rete Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Aggiungi un link eD2k o un magnet link al core."
+"ATTENZIONE: la lista dei file conosciuti è danneggiata, contiene "
+"un'intestazione non valida."
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"Il collegamento eD2k da aggiungere può essere:\n"
-"*) un collegamento a un file (ed2k://|file|...), il quale sarà aggiunto ai "
-"download in attesa,\n"
-"*) un collegamento a un server (ed2k://|server|...), il quale sarà aggiunto "
-"alla lista dei server,\n"
-"*) o un collegamento ad una lista server, in questo caso tutti i server "
-"elencati saranno aggiunti alla\n"
-"lista dei server.\n"
-"\n"
-"Il collegamento magnete deve contenere l'hash eD2k e la lunghezza del file.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Imposta un valore delle preferenze."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Imposta le preferenze del Filtro IP."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Attiva il filtro IP per client e server."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Disattiva il filtro IP per client e server."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Abilita/Disabilita il filtro IP per i client."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Attiva il filtro IP per i client."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Disattiva il filtro IP per i client."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Attiva/Disabilita il filtro IP per i server."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Attiva il filtro IP per i server."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Disabilita il filtro IP per i server."
+"Impossibile caricare la voce nella lista di file conosciuti, il file "
+"potrebbe essere corrotto:"
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Seleziona il livello del filtraggio degli IP."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"I livelli di filtraggio validi vanno da 0 a 255 e il default (iniziale)\n"
-"è 127.\n"
+"Voce non valida nella lista di file conosciuti, il file potrebbe essere "
+"corrotto:"
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Imposta limiti di banda."
+#: src/libs/common/Format.cpp:307
+#, c-format
+msgid "Unknown error %d"
+msgstr "Errore sconosciuto %d"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr ""
-"Il valore fornito a questi comandi deve essere in kilobyte al secondo.\n"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Impossibile avere una descrizione per l'errore %d"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Imposta limiti di banda per il caricamento."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Hashing in corso"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Imposta limiti di banda per lo scaricamento."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "In completamento"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Ottieni e mostra un valore delle preferenze."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Completo"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Visualizza impostazioni del filtro IP."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "In pausa"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Ottieni stato del filtro IP per client e server."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Errato"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Ottieni stato del filtro IP per i client."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "In attesa"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Ottieni stato del filtro IP per i server."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Devi specificare una password non vuota."
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Visualizza livello del filtro IP."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Password non valida, non è un hash MD5!"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Visualizza limita di banda."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Connessione non riuscita"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Effettua una ricerca."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "Connessione EC fallita. Risposta vuota."
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
-"E' necessario specificare il TIPO della ricerca che può essere:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Esempio: 'search kad file' cercherà \"file\" nella rete Kad.\n"
-
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Effettua una ricerca globale."
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Effettua una ricerca locale"
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Effettua una ricerca su Kad"
-
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Mostra risultati dell'ultima ricerca."
-
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Rende i risultati della ricerca precedente.\n"
-
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Mostra lo stato d'avanzamento della ricerca."
+"Connessione Esterna: risposta non valida dal server. Connessione chiusa."
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Mostra lo stato d'avanzamento della ricerca.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Fatto! Connessione stabilita con aMule "
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Avvia lo scaricamento di un file"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Fatto! Connessione stabilita."
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Bisogna fornire il numero del file relativo all'ultima ricerca.\n"
-"Esempio: 'scaricamento 12' aggiungerà alla coda degli scaricamenti il file "
-"col numero 12 trovato dall'ultima ricerca.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Connessione Esterna: Accesso negato a causa di: "
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Metti lo scaricamento in pausa."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Connessione Esterna: errore di negoziazione."
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Riprendi scaricamento."
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "ListenSocket: Ok."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Annulla scaricamento."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "ERRORE: Impossibile mettersi in ascolto sulla porta TCP."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Imposta priorità del download."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "ERRORE: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr ""
-"Imposta la priorità dello scaricamento a Bassa, Normale, Alta o Automatica.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "ATTENZIONE: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Imposta priorità a Bassa."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Chiudi"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Imposta priorità a Normale."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Taglia"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Imposta priorità a Alta."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Copia"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Imposta priorità a Automatica."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Incolla"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Mostra code/liste."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Pulisci"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Mostra la coda di caricamenti/scaricamenti, la lista dei server o la lista "
-"dei file condivisi.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Seleziona tutto"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Mostra la coda di upload."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Mostra la coda degli scaricamenti."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Illimitato"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Mostra registro."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Menu di aMule nel systray"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Mostra la lista dei server."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Limiti velocità:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Azzera registro."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "UL: nessuno"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Comando obsoleto, al suo posto utilizza '%s'."
+msgid "UL: %u"
+msgstr "UL: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Questo è un comando obsoleto, e in futuro potrebbe essere rimosso.\n"
-"Al suo posto utilizza '%s'.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DL: nessuno"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ERRORE: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "DL: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "ATTENZIONE: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Velocità di scaricamento: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Il nuovo clientID è %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "ATTENZIONE: hai ricevuto un ID basso!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tProbabilmente perché il tuo pc è dietro un firewall o router."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tPer altre informazioni visita http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Velocità d'invio: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Ricevute informazioni sconosciute dal server! - troppo corto"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Informazioni client"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Ricevuto %d nuovo server"
-msgstr[1] "Ricevuti %d nuovi server"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Salvataggio della lista dei server completato."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Il server ha rifiutato l'ultimo comando"
+msgid "Nickname: %s"
+msgstr "Nickname: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Pacchetto bogus ricevuto dal server: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Nessun nickname selezionato!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Errore non gestito durante l'elaborazione del pacchetto dal server: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID Client: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr ""
-"Non è possibile creare un thread per risolvere il DNS per connettersi a %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Non connesso"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "L'ip del server %s (%s) è filtrato. Connessione bloccata."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Nome server: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "utilizzo offuscamento del protocollo."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP server: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Connessione a %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Non connesso"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr ""
-"Non è possibile risolvere il DNS per il server %s: impossibile connettersi!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Impossibile ottenere i dati sul Paese da "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Caricato %d flag bitmap."
-msgstr[1] "Caricati %d flag bitmap."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Sei sicuro di voler interrompere e rimuovere tutti i file contenuti in "
-"questa categoria?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Conferma richiesta"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Tutto il resto"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Incompleti"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Attivo"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Video"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Audio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Archivi"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Immagini CD"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Immagini"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Testo"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Seleziona filtro di visualizzazione"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Aggiungi categoria"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Modifica categoria"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Elimina categoria"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Nome file"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Dimensione file"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Rapporto di condivisione"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Inviato"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Richiesto"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Accettato"
+msgid "TCP port: %d"
+msgstr "Porta TCP: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Fonti complete"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "Porta TCP: Non disponibile"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Importazione %s: %s"
+msgid "UDP port: %d"
+msgstr "Porta UDP: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Lettura cartella dei file temporanei"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "Porta UDP: Non disponibile"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr ""
-"Recupero informazioni di base dal file di informazioni dello scaricamento"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Firma in linea: abilitata"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Creazione file di destinazione"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Firma in linea: disabilitata"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Caricamento dati da vecchio file in download (%u su %u)"
+msgid "Uptime: %s"
+msgstr "Uptime: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Salvataggio blocchi di dati in un singolo file (%u su %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Recupero informazioni fonti e file in scaricamento in corso"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Aggiunta download e salvataggio nuovo partfile in corso"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importa partfile"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Stato"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Filehash"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "In attesa..."
+msgid "Shared files: %d"
+msgstr "File condivisi: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disco: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Scegli una cartella in cui cercare download temporanei! (le sottocartelle "
-"saranno incluse)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"Vuoi che le fonti per gli scaricamenti importati con successo siano "
-"eliminate?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Rimuovere le fonti?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "byte"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/s"
-msgstr[1] "bytes/sec"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "sec"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "min"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "ore"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "giorni"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Video"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Archivi"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Testi"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programmi"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Qualsiasi"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Senza voto"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Non valido / Danneggiato / Falso"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Mediocre"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Discreto"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Buono"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Eccellente"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "tutti"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "tutti gli altri"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Carico i filtri IP da 'ipfilter.dat' e 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Client in attesa: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr ""
-"Impossibile caricare il file ipfilter.dat '%s', trovato formato sconosciuto."
+msgid "Total DL: %s"
+msgstr "DL totale: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Impossibile caricare il file ipfilter.dat '%s', impossibile aprire il file."
+msgid "Total UL: %s"
+msgstr "UL totale: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Caricato %u intervallo di IP da '%s'."
-msgstr[1] "Caricati %u intervalli di IP da '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Limite di invio"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u riga non valida è stata scartata."
-msgstr[1] "%u righe non valide sono state scartate."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Limite di scaricamento"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Connessioni attive (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Nascondi aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Dettagli file"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Mostra aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% completato"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Esci"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
-msgstr "Collegamento eD2k: "
+msgstr "eD2k Link: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Invia"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
-"Clicca qui per aggiungere il collegamento eD2k dalla casella di testo agli "
-"scaricamenti in attesa."
+"Clicca qui per aggiungere il link eD2k dalla casella di testo ai download in "
+"attesa."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr ""
 "Gli eventi sono visualizzati qui. Per la lista completa, controllare il log "
-"nella scheda dei server."
+"nella scheda dei Server."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Caricamento in corso..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Numero di utenti presenti sul server al quale sei connesso..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Utenti: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr "Utenti connessi al server attuale e stima del numero totale di utenti."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Up: 0.0 | Down: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
 msgstr ""
-"Medie attuali di caricamento e scaricamento. Se l'opzione è stata abilitata "
-"i numeri tra parentesi indicano l'overhead dovuto alla comunicazione tra "
-"client."
+"Medie attuali di upload e download. Se l'opzione è stata abilitata i numeri "
+"tra parentesi indicano l'overhead dovuto alla comunicazione tra client."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4656,814 +2775,797 @@
 "che hai un ID basso (probabilmente il tuo pc è dietro un firewall) e le "
 "frecce verdi indicano che hai un ID alto (la miglior connessione possibile)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Non connesso..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
-msgstr "Server connesso correntemente."
+msgstr "Server attualmente connesso."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Cerca"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tipo"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Locale"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Globale"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "FileHash"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Parametri avanzati"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtraggio"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Tipo file"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Qualsiasi"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Archivi"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Audio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Immagini CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Immagini"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programmi"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Testi"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Video"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Estensione"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Dimensione minima"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Byte"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Dimensione massima"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Disponibilità"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Filtra risultati"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Inverti risultati"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Nascondi file conosciuti"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Inizia"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Ancora"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Cerca più risultati su eD2k: Non ancora supportato da Kad."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
-msgstr "Interrompi"
+msgstr "Ferma"
+
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Download"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Azzera campi"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Risultati"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
-msgstr "Rimuovi scaricamenti completati"
+msgstr "Rimuovi download completati"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Mostra Caricamenti / Coda Caricamenti / Client"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "File sorgente:"
 
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Client in coda:"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Invia"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Invia il messaggio specificato."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Chiudi"
-
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Chiudi questa sessione di conversazione."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Generale"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Nome completo:"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/D"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
-msgstr "File met :"
+msgstr "File met:"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
-msgstr "Hash :"
+msgstr "Hash:"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
-msgstr "Dimensione file :"
+msgstr "Dimensione file:"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
-msgstr "Stato file part :"
+msgstr "Stato file part:"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
-msgstr "Ultima volta visto completo :"
+msgstr "Ultima volta visto completo:"
+
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Trasferimento"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
-msgstr "Fonti trovate :"
+msgstr "Fonti trovate:"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
-msgstr "Fonti in trasferimento :"
+msgstr "Fonti in trasferimento:"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
-msgstr "Numero parti :"
+msgstr "Numero parti:"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
-msgstr "Disponibili :"
+msgstr "Disponibili:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Velocità:"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
-msgstr "Tempo attivo di scaricamento: "
+msgstr "Download Active Time: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
-msgstr "Trasferiti :"
+msgstr "Trasferiti:"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
-msgstr "Dimensione completata :"
+msgstr "Completati:"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
-msgstr "Gestione di corruzione intelligente"
+msgstr "Intelligent Corruption Handling"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Perdita per corruzione:"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
-msgstr "Guadagno per compressione :"
+msgstr "Guadagno per compressione:"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
-msgstr "Pacchetti recuperati da I.C.H. :"
+msgstr "Pacchetti recuperati da ICH:"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Nomi file"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Sovrascrivi"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Pulisci"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Applica"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
-msgstr "Commenta/Giudica il file (Il testo sarà visibile da tutti gli utenti)"
+msgstr "Commenta/Giudica il file (il testo sarà visibile a tutti gli utenti)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Per un film puoi indicare la lunghezza, la trama, la lingua ...\n"
-"e se è un falso puoi farlo presente agli altri utenti di aMule."
+"Per un film puoi specificare la durata, la trama, la lingua ...\\n\\ne se è "
+"un falso, puoi avvisare gli altri utenti di aMule."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Qualità file"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Senza voto"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Non valido / Danneggiato / Falso"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Mediocre"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Discreto"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Buono"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Eccellente"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Giudica il file o avvisa gli altri utenti se il file non è quello corretto..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
-msgstr "Scaricamento in corso, attendere..."
+msgstr "Download in corso, attendere..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Dimensione sconosciuta"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Informazioni richieste"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
-msgstr "Indirizzo IP :"
+msgstr "Indirizzo IP:"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
-msgstr "Porta :"
+msgstr "Porta:"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
-msgstr "Informazioni Aggiuntive"
+msgstr "Informazioni aggiuntive"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
-msgstr "Nome utente :"
+msgstr "Nome utente:"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Hash utente:"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Ricarica file condivisi"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Sessione corrente"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Totale"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Richiesto :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Caricamenti attivi :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Aggiungi"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
-msgstr "Velocità Scaricamento"
+msgstr "Velocità download"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Corrente"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Media attuale"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Media sessione"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
-msgstr "Velocità caricamento"
+msgstr "Velocità upload"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Connessioni"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
-msgstr "Scaricamenti attivi"
+msgstr "Download attivi"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Connessioni attive (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Upload attivi"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Albero statistiche"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Nome utente:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Hash utente:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Software client:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Versione client:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "Indirizzo IP:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP server:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Nome server:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Offuscamento:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Trasferimenti al client"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
-msgstr "Richiesta corrente:"
+msgstr "Richiesta attuale:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
-msgstr "Velocità media di caricamento:"
+msgstr "Velocità media upload:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
-msgstr "Velocità media di scaricamento:"
+msgstr "Velocità media download:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
-msgstr "Caricati (sessione):"
+msgstr "Inviati nella sessione:"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
-msgstr "Scaricati (sessione):"
+msgstr "Scaricati nella sessione:"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
-msgstr "Caricati (totale):"
+msgstr "Inviati in totale:"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
-msgstr "Scaricati (totale):"
+msgstr "Scaricati in totale:"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Punteggi"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Modificatore DL/UL:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Identificazione sicura:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Giudizio (totale):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Punteggio in coda:"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Punteggio in coda:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Nick"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - il Mulo Per Linux"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - il Mulo multipiattaforma"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 "Questo è il nome che gli altri utenti visualizzeranno quando saranno "
 "connessi a te."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Lingua"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Lingua: "
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
-msgstr "Ciò specifica la lingua utilizzata nei controlli."
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Intervallo di tempo prima che vengano mostrati i suggerimenti."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Altre opzioni"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
+msgstr "Scelta della lingua utilizzata."
 
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Verifica la disponibilità di nuove versioni all'avvio"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Abilitare questa opzione farà sì che aMule all'avvio verifichi la "
 "disponibilità di nuove versioni"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Avvia ridotto ad icona"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 "Abilitando questa opzione, aMule si minimizzerà automaticamente all'avvio."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Chiedi conferma prima di uscire"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Fa sì che aMule chieda conferma prima di uscire."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "Fa in modo che aMule chieda conferma prima di uscire."
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr "Nascondi la finestra quando il pulsante di chiusura è premuto."
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
-msgstr "Abilita Icona Nella Barra Di Sistema"
+msgstr "Abilita icona nel systray"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
-"Questo Abilita/Disabilita l'icona nella barra di sistema o nella barra delle "
+"Abilita o disabilita l'icona nella system tray o nella barra delle "
 "applicazioni."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
-msgstr "Minimizza nell'area di notifica"
+msgstr "Icona per la system tray"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr ""
-"Abilitando questa opzione aMule verrà minimizzato nell'area di notifica "
-"invece che nella barra delle applicazioni."
+"Abilitando questa opzione aMule verrà minimizzato nella system tray invece "
+"che nella barra delle applicazioni."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Ritardo dei suggerimenti in secondi"
-
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Intervallo di tempo prima che vengano mostrati i suggerimenti."
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Ritardo dei suggerimenti: "
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "secondi"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
-msgstr "Selezione Del Browser"
-
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Predefinito di Sistema"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Seleziona il tuo browser"
+msgstr "Selezione browser"
 
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Browser personalizzato:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Inserisci il nome del tuo browser. Per utilizzare un browser differente, "
-"seleziona Browser personalizzato dal menu a tendina."
+"Inserisci qui il nome del tuo browser. Lascia vuoto questo campo per "
+"utilizzare il browser di sistema predefinito."
+
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Sfoglia"
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Apri in una nuova scheda se possibile"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Se possibile, apri la pagina web in una nuova scheda invece che in una nuova "
 "finestra"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Riproduttore video"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Crea una Copia Di Backup per l'anteprima"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Limiti di banda"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Allocazione slot"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Porta TCP standard del client:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Porte"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Porta TCP standard"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Questa è la porta standard eD2k e non può essere disabilitata."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Porta UDP avanzata del client:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "Porta UDP per le richieste al server (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Porta UDP estesa (Kad / ricerca globale) "
+
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
-"Questa porta UDP è utilizzata per le richieste eD2k estese e per la rete Kad."
+"Questa porta UDP è utilizzata per le richieste estese eD2k e per la rete Kad"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "disabilita"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Abiita l'UPnP per il port forwarding del router"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Bind Address"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Porta UDP per le richieste estese del server (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Fonti massime per file"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "Porta UPnP TCP (Facoltativo):"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Limite massimo"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Lega l'indirizzo locale all'IP (vuoto per qualsiasi):"
+
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Solo per utenti esperti: Se hai interfacce di rete multiple, inserisci "
+"l'indirizzo dell'interfaccia che aMule dovrà utilizzare."
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Limiti di connessione"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Connessioni Massime"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Fonti massime per file in scaricamento:"
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Connessioni massime simultanee:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Abilita UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Porta TCP per UPnP:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ed2k"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Connetti automaticamente all'avvio"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
-msgstr "Riconnetti dopo perdita della connessione"
+msgstr "Riconnetti dopo perdita connessione"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Mostra overhead banda"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Opzioni server"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Rimuovi server inattivi dopo"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "tentativi"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Aggiorna la lista server all'avvio"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Aggiorna la lista server quando ti connetti a un server"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Aggiorna la lista server quando ti connetti a un client"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
-msgstr "Utilizza sistema di priorità"
+msgstr "Usa sistema di priorità"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
-msgstr "Utilizza controllo intelligente dell'ID basso in fase di connessione"
+msgstr "Usa controllo intelligente dell'ID basso in fase di connessione"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Connessione sicura"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Connetti automaticamente solo ai server statici"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Assegna priorità alta ai server aggiunti manualmente"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. attivo"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH si fida di ogni hash (sconsigliato)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Trattamento intelligente dei file corrotti (I.C.H.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Abilita"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "L'I.C.H. avanzato si fida di ogni hash (sconsigliato)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Aggiungi i nuovi file da scaricare mettendoli in pausa"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Aggiungi i nuovi file da scaricare con priorità automatica"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Cerca di scaricare prima la parte iniziale e finale del file"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Assegna priorità automatica ai nuovi file condivisi"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Cerca di trasferire parti complete per ogni upload"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Avvia un file in pausa quando un altro file è stato completato"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Scarica il prossimo file in pausa quando un altro è completato"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Della stessa categoria"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Salva 10 fonti per i file rari (meno di 20 fonti)"
-
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Spazio su disco"
-
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Controlla lo spazio su disco"
-
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Selezionalo se vuoi che aMule controlli il tuo spazio su disco"
-
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Spazio su disco minimo:"
-
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
-msgstr "Inserire lo spazio disco minimo desiderato."
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "In ordine alfabetico"
 
-#: src/muuli_wdr.cpp:2077
+#: src/muuli_wdr.cpp:1811
 msgid "Preallocate disk space for new files"
 msgstr "Prealloca lo spazio su disco per i nuovi file"
 
-#: src/muuli_wdr.cpp:2078
+#: src/muuli_wdr.cpp:1812
 msgid ""
 "For new files preallocates disk space for the whole file, thus reduces "
 "fragmentation"
@@ -5471,293 +3573,248 @@
 "Per i nuovi file prealloca lo spazio su disco per l'intero file, in questo "
 "modo si riduce la frammentazione"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "In arrivo"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Temporanea"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Condivisi"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Interrompi i download quando termina lo spazio su disco "
+
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Selezionalo se vuoi che aMule controlli il tuo spazio su disco"
+
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
+msgstr "Inserire lo spazio disco minimo desiderato."
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Salva 10 fonti per i file rari (< 20 fonti)"
+
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Upload"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Assegna priorità automatica ai nuovi file condivisi"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Cartella di destinazione per i file scaricati"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Cartella per i file temporanei"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Cartelle condivise"
+
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 "(fai clic con il tasto destro sulle icone per condividere ricorsivamente)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Condividi file nascosti"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Grafici"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
-msgstr "Intervallo di aggiornamento : 5 secondi"
+msgstr "Intervallo di aggiornamento: 5 secondi"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Intervallo grafico valori medi: 100 minuti"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Scala grafico connessioni: 100 "
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Seleziona colori delle statistiche"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Scala grafico di scaricamento:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Scala grafico d'invio:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Colori: "
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Sfondo"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Griglia"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
-msgstr "Scaricamento corrente"
+msgstr "Download attuale"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
-msgstr "Media scaricamento in corso"
+msgstr "Media download in corso"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
-msgstr "Media sessione di scaricamento"
+msgstr "Media sessione di download"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Upload attuale"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
-msgstr "Media caricamento in corso"
+msgstr "Media upload in corso"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
-msgstr "Media sessione di caricamento"
+msgstr "Media sessione di upload"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Connessioni attive"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
-msgstr "Barra della velocità nell'icona della barra di sistema"
+msgstr "Barra della velocità nell'icona systray"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
-msgstr "Nodi Kad correnti"
+msgstr "Nodi Kad attuali"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Nodi Kad attivi"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Nodi Kad nella sessione"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Albero"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Numero di versioni di client visualizzate (0=illimitate)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Capacità linea"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Nota: Questi valori sono utilizzati solamente nelle statistiche."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! ATTENZIONE !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Non modificare queste impostazioni se non sai\n"
-"esattamente cosa stai facendo: potresti ottenere\n"
-"effetti indesiderati.\n"
-"\n"
-"aMule funzionerà anche senza modificare questi parametri."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Impostazioni avanzate"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Numero massimo nuove connessioni / 5 secondi"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Dimensione buffer file: 240000 byte"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Dimensione coda upload: 5000 client"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervallo aggiornamento connessione al server: disabilitato"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Avanzamento coda scaricamento"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Mostra percentuale"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Mostra barra di avanzamento"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Stile barra di avanzamento"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Piatta"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Arrotondata"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Supporto skin"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Abilita il supporto per le skin"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Skin:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- nessuna skin disponibile -"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Disabilita la modalità standby a tempo"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Skin da usare: "
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Mostra il \"Gestore rapido dei collegamenti eD2k\" in ogni finestra."
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Ordinamento colonne"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr ""
-"Ordina automaticamente i file in scaricamento (elevato utilizzo della CPU)"
-
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr ""
-"aMule ordinerà automaticamente le colonne nella lista degli scaricamenti"
-
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Tweak GUI vari"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Mostra il gestore rapido dei Link eD2k"
-
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Mostra informazioni estese sulle schede delle categorie"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
+msgstr "Mostra versione dell'applicazione nella barra del titolo"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "Mostra velocità di trasferimento nella barra del titolo"
 
-#: src/muuli_wdr.cpp:2412
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Prima del nome dell'applicazione"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Dopo il nome dell'applicazione"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Mostra l'overhead di banda"
+
+#: src/muuli_wdr.cpp:2124
 msgid "Vertical toolbar orientation"
 msgstr "Orientamento verticale della barra degli strumenti"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Visualizza il numero del partfile prima del nome del file"
-
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Parametri web server"
-
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Lancia amuleweb all'avvio"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Porta web server"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Abilita il port forwarding UPnP sulla porta del web server"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Porta UPnP TCP del web server"
-
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Intervallo di aggiornamento pagina (in sec)"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "Mostra la nazionalità per client"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Scaricamento dei File in Coda"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Mostra la percentuale di avanzamento"
+
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Mostra la barra di avanzamento"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Abilita compressione gzip"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Piatta"
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Abilita utente con diritti limitati"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Arrotondata"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Password per diritti completi"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Ordina automaticamente i file (uso elevato della CPU)"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Password per diritti limitati"
-
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Modello web"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "aMule ordinerà automaticamente le colonne nella lista dei download"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Parametri connessioni esterne"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Accetta connessioni esterne"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"IP dell'interfaccia in ascolto\n"
-"(o vuoto per qualunque ip)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP dell'interfaccia di ascolto:"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5765,75 +3822,115 @@
 "Inserisci un IP valido nel formato a.b.c.d per l'interfaccia di ascolto EC. "
 "Lasciare il campo vuoto o inserire 0.0.0.0 significa qualsiasi interfaccia."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Porta TCP"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "Porta TCP:"
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Abilita il port forwarding UPnP sulla porta EC"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Password"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Parametri del server web"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Lancia il webserver all'avvio"
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Modello web"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Password per diritti completi"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Abilita utente con diritti limitati"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Password per diritti limitati"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Abilita il port forwarding UPnP sulla porta del server web"
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Porta TCP UPnP del server web (Facoltativo)"
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Intervallo di aggiornamento pagina (in sec)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Abilita compressione gzip"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Fai clic qui per applicare le modifiche apportate alle impostazioni."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Annulla ogni modifica alle preferenze."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Titolo:"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Commento:"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Cartella file scaricati:"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Cambia priorità per i nuovi file assegnati:"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "Non cambiare"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Seleziona colore per questa categoria (attualmente selezionata):"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Mostra motd del server alla connessione..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Informazioni server"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Pulisci"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Fai clic su questo pulsante per cancellare il log."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Log di aMule"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Fai clic qui per aggiornare la lista dei server dall'indirizzo..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Lista server"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5841,44 +3938,56 @@
 "Inserisci l'url di un file server.met e premi il pulsante a sinistra per "
 "aggiornare la lista dei server conosciuti."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Aggiungi un server manualmente: Nome"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Inserisci qui il nome di un nuovo server"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Porta"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Inserisci qui l'IP del server, nel formato x.x.x.x."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Inserisci qui la porta del server."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Aggiungi server (riempi campi a sinistra)..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Log di aMule"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Informazioni server"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "Informazioni ed2k"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Informazioni Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 "Fai clic su questo pulsante per aggiornare la lista dei nodi da un URL..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nodi (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5886,51 +3995,55 @@
 "Inserisci l'URL di un file nodes.dat e premi il pulsante a sinistra per "
 "aggiornare la lista dei nodi conosciuti."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Statistiche nodi"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Bootstrap"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Nuovo nodo"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bootstrap da\n"
-"client noti"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Bootstrap da client noti"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Disconnetti rete Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "Informazioni eD2k"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Usa l'Identificazione Sicura Utente"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"E' consigliato attivare questa opzione. Non riceverai crediti se l'ISU non è "
+"abilitata."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Offuscamento del protocollo"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Supporta offuscamento del protocollo"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5938,11 +4051,11 @@
 "Questa opzione abilita l'offuscamento del protocollo, e fa sì che aMule "
 "accetti connessioni offuscate dagli altri client."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Utilizza offuscamento per le connessioni in uscita"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5950,11 +4063,11 @@
 "Questa opzione fa sì che aMule utilizzi l'offuscamento del protocollo quando "
 "si collega ad altri client/server."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Accetta SOLO connessioni offuscate"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5962,82 +4075,78 @@
 "Attivando questa opzione aMule accetterà solo connessioni offuscate. Avrai "
 "meno fonti, ma tutto il tuo traffico sarà offuscato"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Opzioni file"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Chiunque"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Nessuno"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Chi può vedere i file condivisi:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Chi può vedere i miei file condivisi:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 "Seleziona chi può richiedere di vedere la lista dei tuoi file condivisi."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Filtraggio IP"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtra i client"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Filtra i client in base agli ip contenuti in ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtra i server"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Filtra i server in base agli ip contenuti in ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Ricarica lista"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Ricarica lista degli IP da filtrare dal file ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Aggiorna ora"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Aggiorna ipfilter all'avvio"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Livello filtraggio:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Filtra sempre gli IP di una LAN"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Gestione paranoica degli IP non corrispondenti"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6045,11 +4154,11 @@
 "Rifiuta pacchetto se l'IP del Client è diverso dall'IP da cui arriva il "
 "pacchetto. Utilizzare con cautela."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
-msgstr "Utilizza l'ipfilter.dat di sistema se disponibile"
+msgstr "Usa l'ipfilter.dat di sistema se disponibile"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -6057,902 +4166,1350 @@
 "Se un file ipfilter.dat locale non viene trovato, consenti l'utilizzo del "
 "file ipfilter.dat di sistema."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Utilizzaa l'identificazione sicura utente"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"È consigliato attivare questa opzione. Non riceverai crediti se l'ISU non è "
-"abilitata."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Abilita firma in linea"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
 msgstr ""
-"Abilita la scrittura del file OS che può essere utilizzato da applicazioni "
+"Abilita la scrittura del file OS che può essere usato da applicazioni "
 "esterne per creare firme e simili."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Frequenza di aggiornamento (secondi):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 "Cambia la frequenza (in secondi) degli aggiornamenti della firma in linea."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Cartella firma in linea:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Salva la firma in linea in: "
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "Fai clic qui per selezionare la cartella che contiene i file di firma in "
 "linea."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Disabilita/Abilita"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtra messaggi in arrivo (tranne per la chat in corso):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Opzioni filtro:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtra tutti i messaggi"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtra i messaggi da utenti che non sono nella tua lista degli amici"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtra i messaggi da client sconosciuti"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
-msgstr "Filtra i messaggi che contengono (utilizza ',' come separatore):"
+msgstr "Filtra i messaggi che contengono (usa ',' come separatore):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "aggiungi qui le parole che aMule filtrerà rimuovendo i messaggi che le "
 "contengono"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Mostra nel log i messaggi ricevuti"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Commenti"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
-msgstr "Filtra i commenti che contengono (utilizza ',' come separatore):"
+msgstr "Filtra i commenti che contengono (usa ',' come separatore):"
+
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Connessione automatica al server senza proxy"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Abilita autenticazione"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Abilita o disabilita l'autenticazione con nome utente e password"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Nome utente: "
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Il nome utente utilizzato per la connessione al proxy"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Password:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "La password usata per la connessione al proxy"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Abilita proxy"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Abilita o disabilita il supporto proxy"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Tipo proxy:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Il tipo di proxy a cui ti stai connettendo"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Indirizzo proxy:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Il nome host del proxy"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Porta proxy:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "La porta del proxy"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Autenticazione"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Abilita autenticazione"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Abilita o disabilita l'autenticazione con nome utente e password"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Il nome utente utilizzato per la connessione al proxy"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Password:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "La password utilizzata per la connessione al proxy"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Connessione automatica al server senza proxy"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Connetti a:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Login su aMule remoto"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Nome utente"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Ricorda impostazioni"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Abilita il log dettagliato dei messaggi di debug."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Categorie messaggi:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "In attesa..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
-msgstr "Aggiungi importazioni"
+msgstr "Aggiunge importazioni"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Riprova selezionati"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Rimuovi selezionati"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Tipi di eventi"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr "Tipi di evento"
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+"Statistiche e client in coda per i(l) file selezionati(o) : Sessione / Totale"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Upload attivi"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "Percentuale di file totali"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Tutti i file"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Seleziona files"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Solo upload attivi"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Mostra client per"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Ricarica lista:"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Ricarica file condivisi"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Invia"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Invia messaggio specificato."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Chiude questa sessione di chat."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Connetti a qualsiasi server e/o a Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Finestra Reti"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "File condivisi"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Finestra Ricerche"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Disabilitato [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Finestra Trasferimenti File"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Finestra File Condivisi"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Finestra messaggi"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Finestra grafici e statistiche"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Finestra Impostazioni Preferenze"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nuova categoria"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Scegli una cartella per i file scaricati"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Devi specificare un nome per la categoria!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/s"
+msgstr[1] "bytes/sec"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Devi specificare un percorso per la categoria!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "sec"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "min"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "ore"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "giorni"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "tutti"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "tutti gli altri"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Incompleti"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Fermo"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Video"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Archivi"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Testo"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Attivo"
+
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
+msgstr "Directory di configurazione in uso: %s"
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
 msgstr ""
-"Impossibile creare una cartella per i file in ingresso per questa categoria. "
-"Specifica un percorso valido!"
+"In attesa della fine del processo di conversione del file incompleto..."
 
-#: src/ExternalConnector.cpp:141
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Estensione '%s' sconosciuta per il comando '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Importazione %s: %s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Lettura cartella dei file temporanei"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Recupero informazioni di base dal file info del download"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Creazione file di destinazione"
+
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Comando sconosciuto '%s'.\n"
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Caricamento dati da vecchio file in download (%u su %u)"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Questo comando non può avere un argomento.\n"
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Salvataggio blocchi di dati in un singolo file (%u su %u)"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Questo comando deve avere un argomento.\n"
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Recupero informazioni fonti e file in download in corso"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Aggiunta download e salvataggio nuovo partfile in corso"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Importa partfile"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Stato"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Filehash"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Disco: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Questo comando è incompleto, devi utilizzare una delle estensioni qui sotto "
-"riportate.\n"
+"Scegli una cartella in cui cercare download temporanei! (le sottocartelle "
+"saranno incluse)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Estensioni disponibili:\n"
+"Vuoi che le fonti per i download importati con successo siano eliminate?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Comandi disponibili:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Rimuovere le fonti?"
+
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "ERRORE: impossibile creare il file .part"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Tutti i comandi possono essere digitati in maiuscolo e minuscolo.\n"
-"Scrivi '%s <comando>' per avere informazioni dettagliate su un <comando>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Caricamento del backup del file met da %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Esce dall'applicazione."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "ERRORE: Apertura del file part.met fallita: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Mostra aiuto."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "ERRORE: la dimensione del file part.met è 0: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "ERRORE: Versione del file part.met invalida: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Per avere aiuto su un comando, digitare 'help <comando>'.\n"
-"Per avere la lista completa dei comandi, digitare 'help'.\n"
+"ERRORE: %s (%s) è corrotto (computo delle etichette errate: %s), impossibile "
+"caricare il file."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Utilizza '%s' per la lista dei comandi\n"
-"\n"
+"ERRORE: %s (%s) è corrotto (computo dell'etichetta errato), impossibile "
+"caricare il file."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Errore di sintassi!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Tentativo di recupero informazioni sul file..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"Errore nell'eseguire il comando - ciò non dovrebbe mai accadere! Segnala il "
-"bug\n"
+"Recupero file senza nome - tentativo di recupero come RecoveredFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Questo comando non deve avere parametri."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+"Recuperate tutte le informazioni disponibili :D - Tentativo di utilizzo in "
+"corso..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Questo comando richiede un parametro."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Impossibile recuperare le informazioni sul file :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Argomento non valido."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Impossibile aprire %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Questo comando è incompleto."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "ATTENZIONE: %s potrebbe essere corrotto (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Digita '%s' per avere altro aiuto.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "Errore durante il salvataggio del file incompleto: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "Errore durante il salvataggio del file incompleto:"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Questo è %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr ""
+"Non è possibile recuperare la lunghezza di '%s' - utilizzando il file %s."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Questo è %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' è per qualche motivo di dimensione 0 - uso il file %s."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Impossibile salvare il file part.met.seeds per %s"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Salvata %i fonte per il file incompleto: %s (%s)"
+msgstr[1] "Salvate %i fonti per il file incompleto: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Il file incompleto %s (%s) non ha file delle fonti"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Il file incompleto %s (%s) ha un file delle fonti vuoto"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Errore nella lettura del file delle fonti del partfile (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Trovata parte danneggiata (%d) in %d parte %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[1] ""
+"Trovata parte danneggiata (%d) in %d parti %s - FileResultHash |%s| FileHash "
+"|%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Trovata parte completata (%i) in %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Nuovo hashing completato %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Errore imprevisto durante il completamento di %s. File in pausa."
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Download completato: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Cancellazione file: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Creazione del client in corso...\n"
+"ATTENZIONE: impossibile creare l'hash del file parziale - hashset incompleto "
+"per '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Ok, uscita da %s in corso...\n"
+"ERRORE: Impossibile creare l'hash del file parziale - hashset incompleto (%"
+"s). Ciò non dovrebbe mai accadere"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Non posso connettermi con una password vuota.\n"
-"Devi specificare una password nel file di configurazione oppure\n"
-"nella linea di comando, o inserirne una quando richiesto.\n"
-"\n"
-"Uscita in corso...\n"
+"EOF durante l'hashing della parte %u scaricata con lunghezza %u (max %u) del "
+"partfile '%s' con lunghezza %u: %s"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Mostra questo suggerimento."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr ""
+"ATTENZIONE: non c'è abbastanza spazio libero su disco! Metto in pausa il "
+"file: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Host su cui aMule è in esecuzione (default: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "La parte di file scaricata %i è danneggiata in: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Porta di aMule per le connessioni esterne (default: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: recuperata parte danneggiata %i in %s -> risparmiati byte: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Password connessioni esterne."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Allocando"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Leggi la configurazione da file."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Spazio su disco insufficiente"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Non stampare output sullo stdout."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Scaricato"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Sii prolisso - mostra anche i messaggi di debug."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "ERRORE: Apertura file parziale fallita '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Imposta il locale del programma (lingua)."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Predefinita di sistema"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Salva le opzioni linea di comando nel file di configurazione."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albanese"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Crea un file di configurazione basato su quello di aMule."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabo"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Mostra la versione del programma."
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturiano"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Basco"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgaro"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Catalano"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Cinese (semplificato)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Cinese (tradizionale)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Croato"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Ceco"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Danese"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Olandese"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Inglese (U.K.)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estone"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finlandese"
 
-#: src/ClientCreditsList.cpp:168
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Francese"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galiziano"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Tedesco"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Greco"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Ebraico"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Ungherese"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italiano"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italiano (Svizzera)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Giapponese"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Coreano"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvegese (Nynorsk)"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polacco"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portoghese"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portoghese (brasiliano)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Russo"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Sloveno"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Spagnolo"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Svedese"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turco"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ucraino"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Lingua"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr "Non ci sono traduzioni installate per aMule"
+
+#: src/Preferences.cpp:771
+msgid "No languages available"
+msgstr "Nessuna lingua disponibile"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "nessuna opzione disponibile"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Trovata categoria non valida, ignorata"
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
+"La porta TCP non può essere superiore a 65532 perché il socket UDP è fissato "
+"a TCP+3"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Il file dei crediti è stato caricato, %u client conosciuto"
-msgstr[1] "Il file dei crediti è stato caricato, %u client conosciuti"
+msgid "Default port will be used (%d)"
+msgstr "Sarà usata la porta di predefinita (%d)"
 
-#: src/ClientCreditsList.cpp:171
+#: src/Preferences.cpp:1790
 #, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Crediti scaduti per %u client!"
-msgstr[1] " - Crediti scaduti per %u client!"
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Scartando le cartelle condivise non esistenti: %s"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Connessione"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Cartelle"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Server"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "File"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Sicurezza"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Interfaccia"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Filtri"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Controlli remoti"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Firma in linea"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Avanzato"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Eventi"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Debug"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
-"Non è stato trovato il file 'cryptkey.dat', creazione del file in corso."
+"Le seguenti variabili saranno sostituite:\n"
+"    %PARTFILE - percorso completo del file\n"
+"    %PARTNAME - solamente il nome del file"
 
-#: src/amuled.cpp:594
+#: src/PrefsUnifiedDlg.cpp:289
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
 msgstr ""
-"ERRORE: il demone di aMule non può essere utilizzato se le connessioni "
-"esterne sono disattivate. Per abilitare le connessioni esterne, puoi "
-"utilizzare un aMule normale, far partire amuled con l'opzione --ec-config o "
-"impostare la voce \"AcceptExternalConnections\" a 1 nel file ~/.aMule/amule."
-"conf"
+"Non modificare queste impostazioni se non sai\n"
+"esattamente cosa stai facendo: potresti ottenere\n"
+"effetti indesiderati.\n"
+"\n"
+"aMule funzionerà anche senza modificare questi parametri."
 
-#: src/amuled.cpp:750
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "ERROR: %s"
-msgstr "ERRORE: %s"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Insuccesso nel collegare Cfg al widget con ID %d e chiave %s"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Rimuovi ban"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Mostra Caricamenti"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Mostra Coda"
-
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Mostra client"
-
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Seleziona Visuale"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Software Client"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Atteso"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Tempo Di Caricamento"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Caricamento/Scaricamento"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Stato Remoto"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Priorità File"
-
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Punteggio"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr "Insuccesso nel trasferire dati da Cfg al widget con ID %d e chiave %s"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Richiesto"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Il tipo di proxy a cui ti stai connettendo"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Ultima Volta Visto"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Inserito In Coda"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr "Insuccesso nel trasferire dati dal widget al Cfg con ID %d e chiave %s"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Stato Caricamento"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"aMule deve essere riavviato per rendere effettive queste modifiche:\n"
+"\n"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Inviati"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- Modifica della porta TCP.\n"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Stato Scaricamento"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- Modifica della porta UDP.\n"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Ricevuti"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- Porta della connessione esterna modificata. \n"
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Hash utente"
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- Accetta connessione esterna modificata. \n"
 
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Cifrato"
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- Interfaccia connessione esterna modificata. \n"
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Non mostrare file condivisi"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"La tua lista dei server per l'aggiornamento automatico è vuota.\n"
+"L'aggiornamento automatico all'avvio della lista dei server sarà disattivato."
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Dettagli client"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Hai abilitato le connessioni esterne senza però specificare una password.\n"
+"Le connessioni esterne non possono essere abilitate a meno che tu non scelga "
+"una password valida."
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Abilitato"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Modifica della lingua.\n"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Supportato"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Modifica della cartella Temp.\n"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Non supportato"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- Rete ED2K abilitata.\n"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Disabilitato"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Entrambe le reti eD2k e Kad sono disattivate.\n"
+"Non potrai connetterti finché non ne abiliterai almeno una."
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad non può partire se la porta UDP è disabilitata.\n"
+"Abilitala o disabilita Kad."
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Non completo"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"DEVI riavviare aMule ADESSO.\n"
+"Se non lo fai, non lamentarti se succede qualcosa di strano.\n"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Cattivo"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"La tua lista di aggiornamento automatico dei server è vuota.\n"
+"Inserisci l'URL di almeno un server valido nel file server.met.\n"
+"Fai clic sul pulsante \"Lista\" per inserire l'URL."
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Verificata - OK"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "File temporanei"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Non disponibile"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "File completi"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Firme in linea"
 
-#: src/ClientDetailDialog.cpp:215
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+msgid "Choose a folder for %s"
+msgstr "Scegli una cartella per i %s"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr ""
-"La dimensione minima deve essere più piccola della dimensione massima. La "
-"dimensione massima è stata ignorata."
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Sfoglia per trovare un riproduttore video"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Avviso di ricerca"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Scegli browser"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Illimitato"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "Eseguibile%s"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Menu di aMule nella barra di sistema"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Modifica la lista dei server"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Limiti di velocità:"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Inserisci l'URL da cui scaricare il file server.met.\n"
+"Solo un URL per riga."
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "UL: Niente"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Intervallo aggiornamento: %d secondo"
+msgstr[1] "Intervallo aggiornamento: %d secondi"
 
-#: src/MuleTrayIcon.cpp:354
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "UL: %u"
-msgstr "UL: %u"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Intervallo grafico della media: %d minuto"
+msgstr[1] "Intervallo grafico della media: %d minuti"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DL: Niente"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Scala grafico delle connessioni: %d"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "DL: %u"
-msgstr "DL: %u"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Dimensione buffer file: %d byte"
+msgstr[1] "Dimensione buffer file: %d bytes"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Velocità di scaricamento: %.1f"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Dimensione coda upload: %d client"
+msgstr[1] "Dimensione coda upload: %d client"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Velocità di caricamento: %.1f"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Intervallo aggiornamento connessione ai server: %d minuto"
+msgstr[1] "Intervallo aggiornamento connessione ai server: %d minuti"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Informazioni Sul Client"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Intervallo aggiornamento connessione ai server: disabilitato"
+
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "disattivato"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "Nickname: %s"
-msgstr "Soprannome: %s"
+msgid "Execute command on '%s' event"
+msgstr "Esegui comando se si verifica l'evento '%s'"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Nessun Soprannome Selezionato!"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Abilita l'esecuzione del comando sul core"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID Client: "
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Comando Core:"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Nome Server: "
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Abilita l'esecuzione del comando sulla GUI"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP server: "
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Comando GUI:"
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Le seguenti variabili saranno sostituite:"
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
-msgstr "Porta TCP: %d"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr "Min size deve essere più piccola di max size. Ignoro max size."
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "Porta TCP: Non disponibile"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Avviso di ricerca"
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
-msgstr "Porta UDP: %d"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Principale"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "Porta UDP: Non disponibile"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr ""
+"Impossibile effettuare una ricerca sulla rete Kad senza esserci connessi"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Firma in linea: abilitata"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr ""
+"La ricerca eD2k non può essere effettuata finché non sei connesso alla rete "
+"eD2k"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Firma in linea: disabilitata"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Errore imprevisto durante la ricerca su Kad: "
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
-msgstr "File condivisi: %d"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "ID File"
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
-msgstr "Client in attesa: %d"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "File"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Download nella categoria"
+
+#: src/SearchListCtrl.cpp:639
 #, c-format
-msgid "Total DL: %s"
-msgstr "DL complessivo: %s"
+msgid "Get %s for this file"
+msgstr "Ottieni %s per questo file"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Cerca file correlati (eD2k, server locale)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Segna come file conosciuto"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Copia il collegamento eD2k negli appunti"
+
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Annulla"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Nuovo"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Impossibile stabilire una connessione offuscata con tutti i server elencati. "
+"Ci riprovo senza offuscamento."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"Impossibile connettersi a tutti i server in lista. Procedo con un altro "
+"tentativo."
 
-#: src/MuleTrayIcon.cpp:483
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "La rete eD2k è disabilitata nelle preferenze, non mi connetto."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
+"Nella lista dei server non è stato trovato un server valido a cui connettersi"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "UL complessivo: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Connesso a %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Limite di caricamento"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Connessione stabilita con: %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Limite di scaricamento"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Errore grave durante il tentativo di connessione. La connessione a Internet "
+"potrebbe non essere attiva"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Nascondi aMule"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Persa connessione a %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Mostra aMule"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) sembra non essere attivo."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Sessione di chat iniziata: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) sembra essere pieno."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Connesso al client ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Riconnessione automatica al server tra %d secondo"
+msgstr[1] "Riconnessione automatica al server tra %d secondi"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Connessione al client in corso ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Connessione persa"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Impossibile connettersi al client / Connessione persa ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Connessione a %s (%s:%i) non riuscita."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Chiudi scheda"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "ERRORE: Nessun Socket valido trovato entro il tempo massimo"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Chiudi tutte le schede"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Connessione a %s (%s:%i) non riuscita per time-out."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Chiudi le altre schede"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Risultato ricerca DNS ricevuto in ritardo, ignoro."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Caricamento file server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "File server.met non trovato!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Impossibile caricare il file server.met '%s', trovato formato sconosciuto."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Impossibile aprire il file server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
-"file Server.met corrotto, trovato tag di versione non valido: 0x%x, "
-"dimensione %i"
+"Server.met corrotto, trovato tag di versione non valido: 0x%x, dimensione %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "Trovato %i server nel file server.met"
 msgstr[1] "Trovati %i server nel file server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "Aggiunto %d server"
 msgstr[1] "Aggiunti %d server"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Errore: il file 'server.met' è corrotto:"
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "Errore IO durante la lettura del file 'server.met':"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Server non aggiunto: [%s:%d] non specifica una porta valida."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Server non aggiunto: l'IP di [%s:%d] è filtrato o non valido."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Server non aggiunto: server con corrispondente IP:Porta [%s:%d] trovato "
 "nella lista."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Server aggiunto: server [%s:%d] con il nome '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr "Sei connesso al server che vuoi eliminare. Disconnettiti prima."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Impossibile aprire '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Impossibile salvare il file server.met!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "URL non valido"
 
-#: src/ServerList.cpp:805
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Finished to download the server list from %s"
-msgstr "Terminato lo scaricamento della lista dei server da %s"
-
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Impossibile scaricare la lista dei server da %s"
+msgid "Finished downloading the server list from %s"
+msgstr "Terminato il download della lista dei server da %s"
 
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6961,340 +5518,2350 @@
 "indirizzo che contenga la lista di server in questo file in modo da poter "
 "aggiornare automaticamente la lista"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
-msgstr "Avvia lo scaricamento della lista dei server da %s"
+msgstr "Inizia il download della lista dei server da %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "ATTENZIONE: hai specificato un URL non valido per l'aggiornamento automatico "
 "dei server: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Nessun URL di file server.met valido in addresses.dat"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Impossibile scaricare la lista dei server da %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr ""
 "Il server locale è filtrato dal filtro IP, mi connetto a un altro server!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Impossibile eseguire il comando `%s' per l'evento `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Nome server"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Indirizzo"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Porta"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Descrizione"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Utenti"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Statico"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versione"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Le tue impostazioni di localizzazione sono state impostate a quelle "
-"predefinite dal sistema in conseguenza al cambio di configurazione. "
-"Spiacente."
+"Sei connesso al server che stai cercando di eliminare. Disconnettiti prima. "
+"Il server NON è stato eliminato."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(nome sconosciuto)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Sei sicuro di voler eliminare il server statico %s?"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Server (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Server"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Connetti al server"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Segna il server come statico"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Segna il server come non statico"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Segna i server come statici"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Segna i server come non statici"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Rimuovi il server"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Rimuovi i server"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Rimuovi tutti i server"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Copia il collegamento eD2k negli appunti"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Riconnetti al server"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Sei sicuro di voler eliminare tutti i server?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Sei sicuro di voler eliminare il server selezionato?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Sei sicuro di voler eliminare i server selezionati?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "ERRORE: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "ATTENZIONE: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Il nuovo clientID è %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "ATTENZIONE: hai ricevuto un ID basso!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tProbabilmente perché il tuo pc è dietro un firewall o router."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tPer altre informazioni visita http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Ricevute informazioni sconosciute dal server! - troppo corto"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Ricevuto %d nuovo server"
+msgstr[1] "Ricevuti %d nuovi server"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Salvataggio della lista dei server completato."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Il server ha rifiutato l'ultimo comando"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Pacchetto bogus ricevuto dal server: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Errore non gestito durante l'elaborazione del pacchetto dal server: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
-"Non hai alcun server nella lista dei server.\n"
-"Vuoi che aMule scarichi una lista ora?"
+"Non è possibile creare un thread per risolvere il DNS per connettersi a %s"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Scaricamento della lista server"
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "L'ip del server %s (%s) è filtrato. Connessione bloccata."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "utilizzo offuscamento del protocollo."
 
-#: src/amule.cpp:846
+#: src/ServerSocket.cpp:744
 #, c-format
-msgid "web server running on pid %d"
-msgstr "web server in esecuzione su pid %d"
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Connessione a %s (%s - %s:%i) %s"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
-"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"
+"Non è possibile risolvere il DNS per il server %s: impossibile connettersi!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Server non aggiunto: non è stato specificato l'IP o il nome dell'host."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Server non aggiunto: porta del server specificata non valida."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Stato eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Stato Kademlia:"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "Esecuzione in modalità LAN"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Attivo"
 
-#: src/amule.cpp:937
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Stato:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Stato connessione:"
+
+#: src/ServerWnd.cpp:214
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Impossibile aprire le porte sull'indirizzo specificato: %s"
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Firewalled - apri la porta TCP %d nel tuo router o firewall"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "Stato connessione UDP:"
 
-#: src/amule.cpp:964
+#: src/ServerWnd.cpp:219
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "La porta %u non è disponibile. Otterrai un ID basso\n"
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Firewalled - apri la porta UDP %d nel tuo router o firewall"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Stato firewalled: "
 
-#: src/amule.cpp:970
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Nessun amico richiesto - porta TCP aperta"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Nessun amico richiesto - porta UDP aperta"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Nessun amico"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "In connessione all'amico"
+
+#: src/ServerWnd.cpp:240
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Connected to buddy at %s"
+msgstr "Connesso all'amico a %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Sorgenti indicizzate:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Parole chiave indicizzate"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Note indicizzate:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Utilizzo indicizzato:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Utenti medi:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "File medi:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Non attivo"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Aggiungo il file %s alle condivisioni"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Trovati %i file condiviso conosciuto"
+msgstr[1] "Trovati %i file condivisi conosciuti"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Trovato %i file conosciuto, %i sconosciuto"
+msgstr[1] "Trovati %i file condivisi conosciuti, %i sconosciuti"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "ERRORE: Tentativo di condividere %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Cartella condivisa non trovata, ignoro: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Nessun file condivisibile trovato nella cartella: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Nome utente"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Velocità download"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Velocità upload"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Parti disponibili"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+msgid "Upload Status"
+msgstr "Stato upload"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Stato download"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Origine"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Nome file locale"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+msgid "Shares File List"
+msgstr "Lista file condivisi"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Richieste"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Richieste accettate"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Dati trasferiti"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Rapporto di condivisione"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Parti ricevute"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Fonti complete"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Percorso cartella"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Aggiungi commento/giudizio"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Modifica commento/giudizio"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Rinomina"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Aggiungi i file della collezione alla lista dei trasferimenti"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Copia &URI magnet negli appunti"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Copia eD2k &link negli appunti (&Source)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Copia eD2k &link negli appunti (Source) (&With Crypt options)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Copia il collegamento eD2k negli appunti (&Hostname)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
-"La porta %u non è disponibile!\n"
-"\n"
-"Otterrai un ID basso.\n"
-"\n"
-"Controlla le impostazioni di rete e verifica che la porta sia aperta in "
-"ingresso e in uscita."
+"Copia il collegamento eD2k negli appunti (Hostname) (With &Crypt options)"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Impossibile creare il file per la firma in linea"
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Copia il collegamento eD2k negli appunti (&AICH info)"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Impossibile creare il file per la firma in linea di aMule"
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Hai bisogno di un ID alto per creare un sourcelink valido"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "File condivisi (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "File in scaricamento"
+
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Nome file remoto"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Dati inviati (sessione (totale)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Overhead totale (pacchetti): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Overhead per richieste file (pacchetti): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Overhead per scambio fonti (pacchetti): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Overhead server (pacchetti): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Overhead Kad (pacchetti): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Crypt overhead (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Upload attivi: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Upload in attesa: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Totale sessioni di upload riuscite: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Totale sessioni di upload fallite: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Tempo upload medio: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Dati scaricati (sessione (totale)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Fonti trovate: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Download attivi (parti): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Rapporto UL:DL sessione (totale): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Velocità di scaricamento media (Sessione): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Velocità d'invio media (Sessione): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Velocità di scaricamento massima (Sessione): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Velocità d'invio massima (Sessione): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Riconnessioni: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Tempo dal primo trasferimento: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Connesso al server da: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Connessioni attive (stima): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Limite massimo connessioni raggiunto: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Connessioni medie (stima): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Picco connessioni (stima): %i"
 
-#: src/amule.cpp:1299
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Client"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Sconosciuti: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Filtrati: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Bannati: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Totale: %i Conosciuti: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Server attivi: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Server falliti: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Totale: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Server rimossi: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Server filtrati: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Utenti su server attivi: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "File su server attivi: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Utenti totali: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "File totali: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Occupazione server: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Numero di file condivisi: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Dimensione totale file condivisi: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Dimensione media del file: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Sistema operativo"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Non ricevuto"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Connessioni attive (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Non disponibile"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Mai"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Il programma `%s' con pid `%d' e' terminato con stato `%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Esegui <str> e esci."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Formato IP non valido. Usa xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"L'impostazione locale selezionata non sembra essere installata sul tuo "
-"computer (si tenterà ad impostarla in ogni caso)"
+"Questo comando richiede un argomento. Argomenti validi sono: 'all', nome "
+"file, or un numero.\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Elaborazione dell' hash: "
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Elaborazione del file: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr ""
+"Questo comando richiede un argomento. Argomenti validi: un file hash.\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Non è un numero valido\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Non è un hash valido (la lunghezza deve essere di 32 caratteri)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Richiesta non riuscita con errore sconosciuto."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Operazione conclusa con successo."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "È la prima che volta che avvii aMule %s"
+msgid "Request failed with the following error: %s"
+msgstr "Richiesta fallita con il seguente errore: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Questa è una versione di prova, aggiornata quotidianamente, e\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Filtraggio IP per i client: %s.\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "non garantiamo che essa non distrugga qualcosa, bruci la tua casa,\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "OFF"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "o uccida il tuo cane. Ma *dovrebbe* essere comunque sicura.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "ON"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Filtraggio IP per i server: %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Il livello IPFilter attuale è %d\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Limiti di banda: Up: %u kB/s, Down: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Connesso a %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Connessione in corso"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "firewalled"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"Le seguenti opzioni sono state modificate in questa release per motivi di "
-"sicurezza:\n"
+"\n"
+"Download:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Attiva il supporto dell'Offuscamento Del Protocollo per connessioni in "
-"ingresso e in uscita.\n"
+"Upload:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Disattivato l'aggiornamento automatico della serverlist dagli altri client "
-"e server.\n"
+"Client in coda:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Per ulteriori informazioni sui motivi di queste modifiche, vedere il\n"
-" wiki di aMule su http://wiki.amule.org alla voce \"fake servers\".\n"
-"È importante eliminare tutti i fake server dalla tua lista perché aMule "
-"funzioni correttamente."
+"Fonti totali:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Totale risultati della ricerca: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Avanzamento ricerca: %u %% \n"
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Avanzamento ricerca non disponibile"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Ricevuta risposta sconosciuta dal server, OpCode = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Mostra informazione sullo stato."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr ""
+"Mostra stato connessione, velocità di upload e download attuali, etc.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Mostra le statistiche complete."
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Opzionalmente, un numero compreso tra 0 e 255 può essere passato come "
+"argomento a questo\n"
+"comando, per indicare quante versioni mostrare nel sottoalbero dei client. 0 "
+"oppure\n"
+"nessun numero significa 'infinite'.\n"
+"Esempio: 'statistics 5' mostrerà solo le cinque versioni più diffuse per "
+"ogni tipo di client.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Arresta aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Arresta il core remoto attualmente in funzione (amule/amuled).\n"
+"Ciò interromperà anche il client testuale, dal momento che è inutilizzabile "
+"senza un\n"
+"core in esecuzione.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Ricarica l'oggetto."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Ricarica la lista dei file condivisi."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "Ricarica il filtro IP da file."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Seleziona il livello del filtraggio degli IP."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "Ricarica il filtro IP da file."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "Se l'URL è omesso verrà utilizzato quello inserito nelle Preferenze."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Connessione al network."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
+"Questo connetterà aMule a tutte le reti attualmente abilitate nelle "
+"Preferenze.\n"
+"E' anche possibile specificare l'indirizzo IP, nella forma IP:Porta, di un "
+"server e\n"
+"connettersi solamente a quello. Si può utilizzare un indirizzo IPv4 oppure\n"
+"un nome risolvibile da un server DNS."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Connettiti solo alla rete eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Connetti solo alla rete Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Disconnetti dalla rete."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Questo disconnetterà aMule da tutte le reti attive.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Disconnettiti solo dalla rete eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Disconnetti solo dalla rete Kad."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Aggiungi un link eD2k o un magnet link al core."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"Il link eD2k da aggiungere può essere:\n"
+"*) un collegamento a un file (ed2k://|file|...), il quale sarà aggiunto ai "
+"download in attesa,\n"
+"*) un collegamento a un server (ed2k://|server|...), il quale sarà aggiunto "
+"alla lista dei server,\n"
+"*) o un collegamento ad una lista server, in questo caso tutti i server "
+"elencati saranno aggiunti alla\n"
+"lista dei server.\n"
 "\n"
-"Inoltre, le impostazioni del browser sono state riportate ai valori "
-"predefiniti di sistema.Se necessario, configura nuovamente le opzioni del "
-"browser.\n"
+"Il magnet link deve contenere l'hash eD2k e la lunghezza del file.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Imposta un valore delle preferenze."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "Imposta le preferenze del Filtro IP."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Attiva il filtro IP per client e server."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Disattiva il filtro IP per client e server."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Attiva/Disabilita il filtro IP per i client."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Attiva il filtro IP per i client."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Disattiva il filtro IP per i client."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Attiva/Disabilita il filtro IP per i server."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Attiva il filtro IP per i server."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Disabilita il filtro IP per i server."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Seleziona il livello del filtraggio degli IP."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Altre informazioni, supporto e nuove versioni possono essere trovate nella "
-"nostra homepage,\n"
+"I livelli di filtraggio validi vanno da 0 a 255 e il default (iniziale)\n"
+"è 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "www.aMule.org, o nel nostro canale IRC #aMule su irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Imposta limiti di banda."
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Segnalare ogni bug su http://forum.amule.org"
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr ""
+"Il valore fornito a questi comandi deve essere in kilobyte al secondo.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Imposta limiti di banda per l'upload."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Imposta limiti di banda per il download."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Visualizza un'impostazione delle preferenze."
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "Visualizza impostazioni del filtro IP."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Ottieni stato del filtro IP per client e server."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Ottieni stato del filtro IP per i client."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Ottieni stato del filtro IP per i server."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "Seleziona il livello del filtraggio degli IP."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Visualizza limita di banda."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Effettua una ricerca."
+
+#: src/TextClient.cpp:914
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"La cartella scelta per contenere il file di firma in linea non è valida!\n"
-"La firma in linea sarà pertanto disabilitata fino a quando il problema non "
-"sarà stato risolto attraverso il pannello delle preferenze."
+"E' necessario specificare il TIPO della ricerca che può essere:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Esempio: 'search kad file' cercherà \"file\" nella rete Kad.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Effettua una ricerca globale."
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Effettua una ricerca locale"
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Effettua una ricerca sulla rete Kad"
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Mostra risultati dell'ultima ricerca."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Restituisce i risultati della ricerca precedente.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Mostra lo stato d'avanzamento della ricerca."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Mostra lo stato d'avanzamento della ricerca.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Scarica un file"
+
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
+"Bisogna fornire il numero del file relativo all'ultima ricerca.\n"
+"Esempio: 'download 12' aggiungerà alla coda dei download il file col numero "
+"12 trovato dall'ultima ricerca.\n"
+
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Metti il download in pausa."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Riavvia download."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Annulla download."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Imposta priorità del download."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Imposta la priorità del download a Bassa, Normale, Alta o Auto.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Imposta priorità a Bassa."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Imposta priorità a Normale."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Imposta priorità a Alta."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Imposta priorità a Auto."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Mostra code/liste."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Mostra la coda di upload/download, la lista dei server o la lista dei file "
+"condivisi.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Mostra la coda di upload."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Mostra la coda di download."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Mostra log."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Mostra la lista dei server."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Cancella log."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Preallocazione spazio su disco per il file '%s' fallita: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Comando obsoleto, al suo posto usa '%s'."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "ERRORE: non posso aprire il file di log"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Questo è un comando obsoleto, e in futuro potrebbe essere rimosso.\n"
+"Al suo posto usa '%s'.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "ERRORE: il file di log è vuoto. Qualcosa non va."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Client testuale aMule"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Il file di log è stato azzerato"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Conversione dei vecchi hashset AICH in '%s' a 64b: '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Messaggio del server: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr ""
+"ATTENZIONE: '%s' non è un nome di file valido ed è stato rinominato in '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Impossibile scaricare la lista dei nodi."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"ATTENZIONE: il file '%s' esiste già, il nuovo file sarà rinominato in '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Impossibile aprire il file per il controllo della versione scaricato"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Sei sicuro di voler interrompere e rimuovere tutti i file contenuti in "
+"questa categoria?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "File per il controllo della versione danneggiato"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Conferma richiesta"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Stai utilizzando una versione non aggiornata di aMule!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "Solo 99 categorie sono accettate."
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "Troppe categorie!"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Tutto il resto"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Seleziona filtro di visualizzazione"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Aggiungi categoria"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Modifica categoria"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Elimina categoria"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "La tua versione di aMule è la %i.%i.%i e l'ultima è la %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+"Impossibile aprire il file (%s), rimosso dalla lista dei file condivisi."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "L'ultima versione è sempre disponibile su http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Hashset richiesto per il file sconosciuto: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Ripristino invio del file: %s"
+
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Sospensione invio del file: %s"
+
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Impossibile eseguire il comando `%s' per l'evento `%s'."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Download completato"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Il percorso completo del file."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Il nome del file senza la parte del percorso."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "L'hash eD2k del file."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "La dimensione del file in bytes."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Tempo cumulativo di download."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Nuova sessione chat iniziata"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Mittente del messaggio."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Spazio esaurito"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Partizione disco."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Errore nel completamento"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
+msgstr "Elaborazione del file numero %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Hai richiesto l'hash delle parti (solo per file > 9.5 MB)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
+#, c-format
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> File inesistente!\n"
+
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, il creatore di link eD2k per aMule"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Benvenuto!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Parametri di ingresso"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "File da esaminare"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Aggiungi URL per questo file"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Inserisci qui il file di cui vuoi creare il collegamento eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
-"ATTENZIONE: La tua versione di aMuled è obsoleta: %i.%i.%i < %li.%li.%li"
+"Inserisci qui l'URL che vuoi aggiungere al collegamento eD2k: Aggiungi / "
+"alla fine per permettere a aLinkCreator di aggiungere l'attuale nome del file"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "La tua copia di aMule è aggiornata."
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Rimuovi"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Impossibile scaricare il file per il controllo della versione"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Crea collegamento con hash delle parti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Aiuta a diffondere più in fretta i file nuovi e rari, al costo di una "
+"connessione più lunga"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Hash del File MD4"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "Hash del File eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "Collegamento eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Salva"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Copia negli appunti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Apri"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Apri un file per generare il suo link eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Copia il link eD2k generato negli appunti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Salva come"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Salva su file il link eD2k generato"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Informazioni su aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Seleziona il file di cui vuoi creare il link eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Non posso aprire gli appunti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Non c'è niente da copiare per ora!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Seleziona il file di cui vuoi generare il link eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Impossibile aprire "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Inserire un nome file non vuoto"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Non c'è niente da salvare per ora!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, il creatore di link eD2k per aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps da http://www.everaldo.com e http://www.icomania.com\n"
+"e http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distribuito sotto licenza GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Hashing..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator sta lavorando per voi"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Calcolo Hash MD4 in corso..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Calcolo Hash eD2k in corso..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Annullato !"
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Utenti: %s | File: %s"
+msgid "Done in %.2f s"
+msgstr "Eseguito in %.2f s"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Hai già aggiunto questo URL!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Inserire un URL non vuoto"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Utenti: E: %s K: %s | File: E: %s K: %s"
+msgid "Unable to open %s"
+msgstr "Impossibile aprire %s"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Nessuna rete selezionata"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i giorno(i) %i ora(e) %i minuto(i) %i s"
 
-#: src/amule.cpp:2102
+#: src/utils/wxCas/src/onlinesig.cpp:234
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Connesso a %s %s"
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uG %02uore %02umin %02usec"
 
-#: src/amule.cpp:2105
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "Connecting to %s"
-msgstr "Connessione in corso a %s"
+msgid "%02uh %02umin %02us"
+msgstr "%02uore %02umin %02usec"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Disconnesso dalla rete eD2k"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02usec"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad avviato."
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad interrotto."
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Connesso alla rete Kad (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Connesso alla rete Kad (firewalled)"
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Disconnesso dalla rete Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, statistiche in linea di aMule"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Velocità di DL massima da quando wxCas è attivo"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Velocità di DL massima nelle precedenti sessioni di wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistema"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Ferma aggiornamento automatico"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Salva immagine statistiche in linea"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Stampa immagine statistiche in linea"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Preferenze"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Informazioni su wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Avvia aggiornamento automatico"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Aggiornamento automatico fermato"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Aggiornamento automatico avviato"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Salva immagine statistiche"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Statistiche in linea di aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"La rete Kad non può essere utilizzata se la porta UDP è disattivata dalle "
-"opzioni."
+"C'è stato un problema durante la stampa.\n"
+"La stampante potrebbe non essere impostata correttamente?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Rete Kad disattivata dalle opzioni, non mi connetto."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Stampa in corso"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
-"Impossibile aprire in lettura il file della lista degli amici 'emfriend.met'!"
+"wxCas, Statistiche di firma in linea di aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Basato su CAS di Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distribuito con licenza GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh Oh, aMule non è in esecuzione..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule è in funzione"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule è in esecuzione, ma è disconnesso"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule si sta connettendo..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh oh, stato di aMule sconosciuto..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr "è stato in funzione per "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " è fermo !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " non è connesso !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " si sta connettendo..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " sta facendo qualcosa di strano, controllare!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " è connesso a "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "inattivo"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " è attivo "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " con "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Download totale: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Upload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Download sessione: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Download: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Upload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Condivisione: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " file, client in coda: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Tempo: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " attivo "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Carico medio del sistema (1-5-15 min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Uptime del sistema: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Cartella contenente il file amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Inserire la cartella contenente il file amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Intervallo di aggiornamento in secondi"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Genera un'immagine delle statistiche ad ogni aggiornamento"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Inserire la cartella nella quale generare l'immagine delle statistiche"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Carica periodicamente l'immagine delle statistiche sul server FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "URL FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Percorso FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Inserire URL del tuo server FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "Inserire la directory del server FTP nella quale copiare l'immagine"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Utente"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Inserisci il nome utente per accedere al server FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Inserisci la password per accedere al server FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Intervallo di aggiornamento FTP in minuti"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Verifica"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Cartella contenente il file di firma"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Cartella nella quale generare l'immagine"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Carica modello <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Web server porta HTTP"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Usa l'UPnP port forwarding sulla porta del server web"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Porta UPnP"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Usa compressione gzip"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Password per l'accesso pieno al web server"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Password per l'accesso Guest al web server"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Permetti l'accesso guest"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Vieta l'accesso guest"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Carica/salva le impostazioni del web server da/su l'aMule remoto"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Percorso del file di configurazione di aMule. Non usare direttamente!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Disabilita interprete PHP (deprecato)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Ricompila pagine PHP ad ogni richiesta"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Server web di aMule "
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "connessione web client accettata\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "ERRORE: impossibile accettare la connessione del client web\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Richiesta non riuscita per l'errore: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "File indice non trovato: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Sessione scaduta - accesso richiesto\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sessione valida, utente registrato\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sessione valida, utente registrato\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Nessuna sessione aperta - richiesta di accesso\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Sessione creata - richiesta di accesso\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Elaborazione richiesta [originale]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Nessuna password specificata, login fallito."
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Verifica password\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Hash della password non valido\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Password valida\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Password errata\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
-"Impossibile aprire in scrittura il file della lista degli amici 'emfriend."
-"met'!"
+"Non hai inserito alcuna password e le password vuote non sono ammesse.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Disconnessone richiesta\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Elaborazione richiesta [rediretta]: "
+
+#~ msgid "Romanian"
+#~ msgstr "Rumeno"
+
+#~ msgid "Download status"
+#~ msgstr "Stato download"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Intervallo aggiornamento : %d secondo"
+#~ msgstr[1] "Intervallo aggiornamento : %d secondi"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr ""
+#~ "I Commenti e i Ratings non sono ancora supportati nell'interfaccia remota."
+
+#~ msgid "Transferring"
+#~ msgstr "Trasferimento"
+
+#~ msgid "QR: ???"
+#~ msgstr "QR: ???"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#~ msgid "Only files currently uploading"
+#~ msgstr "Solo file attualmente in caricamento"
+
+#~ msgid "Queue Rank"
+#~ msgstr "Punteggio in coda"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - visualizzare l'avanzamento della ricerca"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Creo gli hash MD4 e AICH del file %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Creazione dell'hash MD4 per il file %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Creazione dell'hash AICH per il file %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "ATTENZIONE: impossibile rimuovere l'originale '%s' dopo aver creato il "
+#~ "backup"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "ATTENZIONE: impossibile eliminare %s"
+
+#~ msgid "%u"
+#~ msgstr "%u"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Giudizio (totale):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Cerca di trasferire parti complete per ogni upload"
+
+#~ msgid "Networks window"
+#~ msgstr "Finestra delle reti"
+
+#~ msgid "Searches window"
+#~ msgstr "Finestra delle ricerche"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Download in corso"
+
+#~ msgid "Shared files window"
+#~ msgstr "Finestra dei file condivisi"
+
+#~ msgid "Messages window"
+#~ msgstr "Finestra dei messaggi"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Finestra delle statistiche"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Finestra delle preferenze"
+
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Icona nella traybar persa, tentativo di ricrearla ..."
+
+#~ msgid "Transfers"
+#~ msgstr "Trasferimenti"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Finestra dei trasferimenti"
+
+#~ msgid "Unban"
+#~ msgstr "Rimuovi ban"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Mostra upload"
+
+#~ msgid "Show Queue"
+#~ msgstr "Mostra coda"
+
+#~ msgid "Select View"
+#~ msgstr "Seleziona visuale"
+
+#~ msgid "Client Software"
+#~ msgstr "Software client"
+
+#~ msgid "Waited"
+#~ msgstr "Atteso"
+
+#~ msgid "Upload Time"
+#~ msgstr "Tempo upload"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Upload/Download"
+
+#~ msgid "Remote Status"
+#~ msgstr "Stato remoto"
+
+#~ msgid "File Priority"
+#~ msgstr "Priorità file"
+
+#~ msgid "Score"
+#~ msgstr "Punteggio"
+
+#~ msgid "Asked"
+#~ msgstr "Richiesto"
+
+#~ msgid "Last Seen"
+#~ msgstr "Ultima volta visto"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Aggiunto in coda"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Inviati"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Ricevuti"
+
+#~ msgid "Userhash"
+#~ msgstr "Hash utente"
+
+#~ msgid "Encrypted"
+#~ msgstr "Cifrato"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "Caricati %d flag bitmap."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Mostra Upload / Coda Upload"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Client in coda:"
+
+#~ msgid "Current Session"
+#~ msgstr "Sessione corrente"
+
+#~ msgid "Total"
+#~ msgstr "Totale"
+
+#~ msgid "Requested :"
+#~ msgstr "Richiesto:"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Crea una copia per l'anteprima"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Finestra trasferimenti"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Utenti totali: %s | File totali: %s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "Processo di download HTTP avviato"
+
+#~ msgid "Download size: %i"
+#~ msgstr "Dimensioni download (%i)"
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "Processo di download HTTP terminato"
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Host: %s:%i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Risposta: %i (Errore: %i)"
+
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "ATTENZIONE: Errore nella creazione del flusso"
+
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "ERRORE: Codice di reindirizzamento ricevuto senza URL"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr ""
+#~ "CIP2Country::CIP2Country(): Impossibile ottenere i dati sul Paese da "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Visualizza livello del filtro IP."
+
+#~ msgid "Makes a search."
+#~ msgstr "Effettua una ricerca."
+
+#~ msgid "Killed!"
+#~ msgstr "Terminato!"
+
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Utilizzando amuleweb in '%s'."
+
+#~ msgid "Shutting down aMule..."
+#~ msgstr "aMule in chiusura..."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Le seguenti opzioni sono state modificate in questa release per motivi di "
+#~ "sicurezza:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Attiva Offuscamento del protocollo per connessioni in ingresso e in "
+#~ "uscita.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Disattivato l'aggiornamento automatico della serverlist dagli altri "
+#~ "client e server.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Per ulteriori informazioni sui motivi di queste modifiche, vedere il\n"
+#~ " wiki di aMule su http://wiki.amule.org alla voce \"fake servers\".\n"
+#~ "È importante eliminare tutti i fake server dalla tua lista perché aMule "
+#~ "funzioni correttamente."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "In aggiunta, le impostazioni del browser son state riportate a quelle "
+#~ "predefinite di sistema. Se lo desideri, riconfigura le opzioni del tuo "
+#~ "browser\n"
 
 #~ msgid "Fetching status..."
 #~ msgstr "Verifica stato..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Utenti: E: %s K: %s | File E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Client %s con IP:Porta %s:%d utilizza %s %s %s"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() ha restituito NULL"
+
+#~ msgid "Firewalled"
+#~ msgstr "Firewalled"

aMule-2.2.6.tar.bz2/po/it_CH.po -> aMule-2.3.1.tar.bz2/po/it_CH.po Changed

@@ -8,14 +8,14 @@
 # translation of it_CH.po to Italian
 # translation of source_strings.po to
 # aMule i18n resource file.
-# Copyright (C) 2004,2005 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the PACKAGE package.
 msgid ""
 msgstr ""
 "Project-Id-Version: it_CH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-08-19 12:06+0100\n"
+"POT-Creation-Date: 2011-11-11 21:59+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"
 "MIME-Version: 1.0\n"
@@ -26,1300 +26,1137 @@
 "X-Poedit-Country: ITALY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Devi specificare una password non vuota."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Password non valida, non e' un hash MD5!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Connessione fallita"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "Connessione EC fallita. Risposta vuota."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Connessione esterna: accesso negato perche':"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Connessione esterna: accesso negato"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Connessione esterna: Risposta errata dal server. Connessione chiusa."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Fatto! Connessione stabilita con aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Fatto! Connessione stabilita"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Hashing in corso"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "In completamento"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Aggiungi amico"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Completo"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Inserire un indirizzo IP e una porta validi!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "In pausa"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Informazione"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Errato"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "L'hash utente specificato non e' valido!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Download in corso"
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Impossibile aprire %s (%s)"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "In attesa"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Creo gli hash MD4 e AICH del file %s"
+#: src/amule.cpp:239
+#, fuzzy
+msgid "Now, exiting main app..."
+msgstr ""
+"\n"
+"Ok, uscita in corso da %s...\n"
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Creo l'hash MD4 del file %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:141
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Creo l'hash AICH del file %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Conversione dei vecchi hashset AICH in '%s' a 64b: '%s'."
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Fallito"
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
 msgstr ""
-"ATTENZIONE: '%s' non e' un nome di file valido ed e' stato rinominato in '%"
-"s'."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "ATTENZIONE: Esiste gia' un file col nome '%s', rinomino in '%s'."
+#: src/amule.cpp:335
+#, fuzzy
+msgid "aMule shutdown completed."
+msgstr "Download completato"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
 msgstr ""
-"ATTENZIONE: non e' possibile rimuovere l'originale '%s' dopo aver creato il "
-"backup"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "ATTENZIONE: impossibile cancellare %s"
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "Chiedi conferma prima di uscire"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Impossibile ricevere i file condivisi dall'utente '%s'"
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "Accettata nuova connessione esterna"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Sconosciuto"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "ATTENZIONE"
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (falso eMule versione %#x)"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"Le tue impostazioni di localizzazione sono state impostate a quelle "
+"predefinite dal sistema in conseguenza al cambio di configurazione. "
+"Spiacente."
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (falso eMule)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (falso eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Non hai alcun server nella lista dei server.\n"
+"Vuoi che aMule scarichi una lista ora?"
 
-#: src/BaseClient.cpp:1790
-#, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (basato su eMule v0.%u)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Server list download"
 
-#: src/BaseClient.cpp:1960
+#: src/amule.cpp:654
 #, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Nickname: %s ID: %u"
+msgid "web server running on pid %d"
+msgstr ""
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Richiesto: %s\n"
+#: src/amule.cpp:658
+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/BaseClient.cpp:1964
-#, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statistiche file per questa sessione: accettata %d di %d richiesta, %s "
-"trasferita\n"
-msgstr[1] ""
-"Statistiche file per questa sessione: accettate %d di %d richieste, %s "
-"trasferite\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr ""
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statistiche file per tutte le sessioni: accettata %d di %d richiesta, %s "
-"trasferita\n"
-msgstr[1] ""
-"Statistiche file per tutte le sessioni: accettate %d di %d richieste, %s "
-"trasferite\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Richiesto file sconosciuto"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Impossibile associare porte all'indirizzo specificato: %s"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:768
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Client %s con IP:Porta %s:%d utilizza %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Nome utente"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Amici"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Mostra &Dettagli"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Aggiungi amico"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Rimuovi amico"
-
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Invia &Messaggio"
-
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Visualizza file"
-
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Crea slot amico"
-
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Sei sicuro di voler cancellare l'amico selezionato?"
-
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Sei sicuro di voler cancellare gli amici selezionati?"
-
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Annulla"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "La porta %u non e' disponibile. Otterrai un LowID\n"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:774
+#, c-format
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
 msgstr ""
-"Non puoi assegnare piu' di uno slot amico.\n"
-"Assegnato un solo slot"
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Selezione multipla"
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Download completato"
-
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Il percorso completo del file."
-
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Il nome del file senza la parte del percorso."
+"La porta %u non e' disponibile!\n"
+"\n"
+"Otterrai un LowID\n"
+"\n"
+"Controlla le impostazioni di rete e verifica che la porta sia aperta in "
+"ingresso e in uscita."
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "Hash eD2k del file"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Impossibile creare il file per la firma online"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "La dimensione del file in bytes."
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Impossibile creare il file per la firma online di aMule"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Tempo cumulativo di download."
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"L'impostazione locale selezionata non sembra essere installata sul tuo "
+"computer (si tentera' ad impostarla in ogni caso)"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Nuova sessione di chat iniziata"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "e' la prima che volta che avvii aMule %s"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Mittente del messaggio."
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Questa e' una versione di prova, aggiornata quotidianamente, e\n"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Spazio esaurito"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr "non garantiamo che essa non distrugga qualcosa, bruci la tua casa,\n"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Partizione disco."
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "o uccida il tuo cane. Ma *dovrebbe* essere comunque sicura.\n"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Errore nel completamento"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Altre informazioni, supporto e nuove versioni possono essere trovate nella "
+"nostra homepage,\n"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Nome file"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "www.aMule.org, o nel nostro canale IRC #aMule su irc.freenode.net.\n"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Dimensione"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Riportate ogni bug su http://forum.amule.org"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tipo"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
+msgstr ""
+"La directory scelta per contenere il file di firma online e' invalida!\n"
+"La firma online verra' pertanto disabilitata fino a quando il problema non "
+"sara' stato risolto attraverso il pannello delle preferenze."
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Priorita'"
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "Nome server:"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "ID File"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Richieste"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "ERRORE: non posso aprire il file di log"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Richieste accettate"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "ERRORE: il file di log e' vuoto. Qualcosa non va"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Dati trasferiti"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Il file di log e' stato cancellato"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Percentuale Condivisione"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Messaggio del server: %s"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Parti ricevute"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Fonti complete"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Impossibile scaricare la lista dei nodi."
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Percorso directory"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Impossibile aprire il file per il controllo della versione scaricato"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "File condivisi"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "File per il controllo della versione corrotto"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Molto bassa"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Stai usando una versione non aggiornata di aMule!"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Bassa"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "La tua versione di aMule e' la %i.%i.%i e l'ultima e' la %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normale"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "L'ultima versione e' sempre disponibile su http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Alta"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr ""
+"ATTENZIONE: La tua versione di aMuled e' obsoleta: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Molto alta"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "La tua copia di aMule e' aggiornata"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Release"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Impossibile scaricare il file per il controllo della versione"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Auto"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Utenti: %s | Files: %s"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Aggiungi commento/giudizio"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Utenti: E: %s K: %s | Files: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Modifica commento/giudizio"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Nessuna rete selezionata"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Rinomina"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "con LowID"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Aggiungi i files della collection alla lista dei trasferimenti"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "con HighID"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Copia &URI magnet negli appunti"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Connesso a %s %s"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Copia &link eD2k negli appunti"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Connessione in corso a %s"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Copia link eD2k negli appunti (&Sorgente)"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Copia link eD2k negli appunti (Sorgente) (&W con opzioni di cifratura)"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad avviato."
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Copia link eD2k negli appunti (Nome &Host)"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad arrestato."
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr "Copia link eD2k negli appunti (Nome Host) (Con opzioni di &cifratura)"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Connesso alla rete Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Copia link eD2k negli appunti (info &AICH)"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Connesso alla rete Kad (firewalled)"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Copia feedback negli appunti"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Disconnesso dalla rete Kad"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amule.cpp:1960
 msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
 msgstr ""
-"Feedback da: %s (%s)\n"
-"\n"
-
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Hai bisogno di un HighID per creare un sourcelink valido"
+"La rete Kad non puo' essere utilizzata se la porta UDP e' disattivata dalle "
+"opzioni."
 
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "ATTENZIONE"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Rete Kad disattivata dalle opzioni, non mi connetto."
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "File condivisi (%i)"
+#: src/amuled.cpp:560
+#, fuzzy
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"ERRORE: il demone di aMule non puo' essere usato se le connessioni esterne "
+"sono disattivate. Per abilitare le connessioni esterne, puoi usare un aMule "
+"normale, far partire amuled con l'opzione --ec-config o impostare la voce "
+"\"AcceptExternalConnections\" a 1 nel file ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "File in download"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Inserisci un nuovo nome per questo file:"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Rinomina file"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr ""
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Ripristino upload del file: %s"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr ""
 
-#: src/UploadQueue.cpp:520
+#: src/amuled.cpp:711
 #, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Sospensione upload del file: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "Client testuale aMule"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: chiave di ricerca troppo corta"
+msgid "ERROR: %s"
+msgstr "ERRORE: %s"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
+#: src/amuleDlg.cpp:238
 #, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Letto %u contatto Kad"
-msgstr[1] "Letti %u contatti Kad"
+msgid "This is aMule %s based on eMule."
+msgstr "Questo e' aMule %s basato su eMule"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
+#: src/amuleDlg.cpp:240
 #, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Solo %d contatto Kad disponibile, nodes.dat non scritto"
-msgstr[1] "Solo %d contatti Kad disponibili, nodes.dat non scritto"
+msgid "Running on %s"
+msgstr "In esecuzione su %s"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Scritto %d contatto Kad"
-msgstr[1] "Scritti %d contatti Kad"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Visita http://www.amule.org per sapere se e' disponibile una nuova versione"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ERRORE: Non posso ascoltare sulla porta TCP."
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ERRORE FATALE: Creazione Timer fallita"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "connessione web client accettata\n"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Controllo remoto di aMule "
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ERRORE: non posso accettare la connessione web client\n"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Snapshot:"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Richiesta fallita per l'errore: %s"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Richiesta fallita con errore sconosciuto"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "File indice non trovato: "
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Sessione scaduta - login richiesto\n"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sessione valida, utente loggato\n"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sessione valida, utente loggato\n"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Nessuna sessione aperta - richiesta login\n"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Sessione creata - richiesta login\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Routing peer-to-peer basato sulla metrica XOR.\n"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Elaborazione richiesta [originale]:"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Verifica password\n"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Hash della password non valido\n"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Messaggio"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Password valida\n"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Password errata\n"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Connessione in corso"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr ""
-"Non hai inserito alcuna password e le password vuote non sono ammesse.\n"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Connessione in corso"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Logout richiesto\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Connesso"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Elaborazione richiesta [rediretta]:"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Con Firewall"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Carica modello <str>"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Connesso"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Porta HTTP del server web"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Connessione in corso"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Usa inoltro porta UPnP sulla porta del web server"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Spento"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Porta UPnP"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Annulla"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Usa compressione gzip"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Ferma i tentativi di connessione in corso"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Password accesso completo per web server"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Disconnetti"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Password ospite per web server"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Disconnetti dalla reti attualmente connesse"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Permetti l'accesso guest"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Connetti"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Vieta l'accesso guest"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Connetti alle reti attualmente abilitate"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Carica/salva impostazioni web server da/verso aMule remoto"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Percorso del file di configurazione di aMule. Non usare direttamente!"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Up: %.1f | Down: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Disabilita interprete PHP (deprecato)"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Connesso)"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Ricompila pagine PHP ad ogni richiesta"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Disconnesso)"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule Web Server"
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Vuoi veramente uscire da aMule?"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Non disponibile"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Chiedi conferma prima di uscire"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Mai"
+#: src/amuleDlg.cpp:1173
+#, fuzzy
+msgid "Launch Command: "
+msgstr "Comando: %s"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Scaricamento in corso..."
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr ""
 
-#: src/HTTPDownload.cpp:75
+#: src/amuleDlg.cpp:1232
 #, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+msgid "Skin directory '%s' does not exist"
+msgstr "La directory delle skin '%s' non esiste"
 
-#: src/HTTPDownload.cpp:239
+#: src/amuleDlg.cpp:1237
 #, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "Attesi %d bytes, ma scaricati %d bytes"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Preferenze"
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "ATTENZIONE: Impossibile aprire il file della skin '%s' in lettura"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Directory contenente il file amulesig.dat"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Reti"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Sfoglia"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Finestra reti"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Inserire la directory contentente il file amulesig.dat"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Ricerca"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Intervallo di aggiornamento in secondi"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Finestra ricerche"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Genera un'immagine delle statistiche ad ogni aggiornamento"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Download"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr ""
-"Inserire la directory nella quale generare l'immagine delle statistiche"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Download in corso"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Carica periodicamente l'immagine delle statistiche sul server FTP"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Files condivisi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "URL FTP"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Finestra file condivisi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Percorso FTP"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Messaggi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Inserire URL del tuo server FTP"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Finestra messaggi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "Inserire la directory del server FTP nella quale copiare l'immagine"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistiche"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Utente"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Finestra grafici e statistiche"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Password"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Preferenze"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Inserire username per il login nel server FTP"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Finestra Impostazione preferenze"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Inserire password per il login nel server FTP"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importazione"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Intervallo di aggiornamento FTP in minuti"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Strumento per l'importazione dei partfile"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Verifica"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Informazioni"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Directory contenente il file di firma"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Informazioni/Aiuto"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Directory nella quale generare l'immagine"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Rete eD2k"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
-#, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i giorno(i) %i ora(e) %i minuto(i) %i s"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "rete Kad"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, statistiche online di aMule"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "nessuna rete"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Benvenuto!"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
 msgid "aMule"
 msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Velocita' di DL massima da quando wxCas e' attivo"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Velocita' di DL massima nelle precedenti sessioni di wxCas"
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "ERRORE FATALE: impossibile creare il timer"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Pulisci"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistema"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Ferma aggiornamento automatico"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Connessione ad aMule remoto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Salva immagine statistiche online"
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "ERRORE FATALE: impossibile creare il timer"
+
+#: src/amule-remote-gui.cpp:268
+#, fuzzy
+msgid "Going to event loop..."
+msgstr "Tentativo di recupero informazioni sul file..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Stampa immagine statistiche online"
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "Connessione in corso"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Preferenze"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Connessione fallita "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Informazioni su wxCas"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Avvia aggiornamento automatico"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Aggiornamento automatico fermato"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Aggiornamento automatico avviato"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Salva immagine statistiche"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Statistiche online aMule"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Tutto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
-"C'e' stato un problema durante la stampa.\n"
-"La stampante potrebbe non essere impostata correttamente?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Stampa in corso"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Sconosciuto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Impossibile ricevere i file condivisi dall'utente '%s'"
+
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
 msgstr ""
-"wxCas, Firma Online Statistiche aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Basato su CAS di Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distribuito con licenza GPL"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, aMule non e' in esecuzione..."
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (falso eMule versione %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule e' in funzione"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (falso eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule e' in esecuzione, ma e' disconnesso"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (falso eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule si sta connettendo..."
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (basato su eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh oh, stato di aMule sconosciuto..."
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Nickname: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Richiesto: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr "e' stato in funzione per "
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statistiche file per questa sessione: accettata %d di %d richiesta, %s "
+"trasferita\n"
+msgstr[1] ""
+"Statistiche file per questa sessione: accettate %d di %d richieste, %s "
+"trasferite\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " e' fermo !"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statistiche file per tutte le sessioni: accettata %d di %d richiesta, %s "
+"trasferita\n"
+msgstr[1] ""
+"Statistiche file per tutte le sessioni: accettate %d di %d richieste, %s "
+"trasferite\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " non e' connesso !"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Richiesto file sconosciuto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " si sta connettendo..."
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Messaggio da '%s' (IP:%s) filtrato"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " sta facendo qualcosa di strano, controllare!"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nuovo messaggio da '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " e' connesso a "
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr ""
+"L'utente %s (%u) ha richiesto la lista dei file condivisi nella directory %s "
+"-> richiesta negata"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, fuzzy, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "Attenzione: impossibile aprire known.met."
+
+#: src/CanceledFileList.cpp:61
+#, fuzzy
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+"Attenzione: lista dei files conosciuti corrotta, potrebbe contenere un "
+"header non valido."
+
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Errore IO durante la lettura del file known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Errore nel salvataggio del file known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "firewalled"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "off"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Categoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " e' attivo "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nuova categoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr "con "
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Scegli una directory per i file scaricati"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Download totale: "
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Devi specificare un nome per la categoria!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Upload: "
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Devi specificare un percorso per la categoria!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Download sessione: "
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Impossibile creare una directory per i file in ingresso per questa "
+"categoria. Specifica un percorso valido!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Download: "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Sessione di chat iniziata: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr "kB/s, Upload: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Connesso al client ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Connessione al client in corso ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Condivisione: "
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Impossibile connettersi al client / Connessione persa ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr "file, client in coda: "
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Tempo: "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr "attivo "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Chiudi tab"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Carico medio del sistema (1-5-15 min): "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Chiudi tutti i tab"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Uptime del sistema: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Chiudi altri tab"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uG %02uore %02umin %02usec"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Inserisci tra gli amici"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/ClientCreditsList.cpp:158
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uore %02umin %02usec"
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Il file dei crediti e' stato caricato, %u client conosciuto"
+msgstr[1] "Il file dei crediti e' stato caricato, %u client conosciuti"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
+#: src/ClientCreditsList.cpp:161
 #, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02usec"
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Crediti scaduti per %u client!"
+msgstr[1] " - Crediti scaduti per %u clients!"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
-#, c-format
-msgid "%02us"
-msgstr "%02us"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr ""
+"Non e' stato trovato il file 'cryptkey.dat', creazione del file in corso."
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Dettagli client"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
 msgid "LowID"
 msgstr "LowID"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Non connesso"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Abilitato"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Supportato"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Non supportato"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Disabilitato"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Connesso"
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Annullato!"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Disconnesso"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "Unable to open %s"
-msgstr "Impossibile aprire %s"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Parametri di ingresso"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Non completo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "File da esaminare"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Cattivo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Aggiungi URL per questo file"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Verificata - OK"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Inserisci qui il file del quale vuoi calcolare il link eD2k"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Non disponibile"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
-"Inserisci qui l'URL che vuoi aggiungere al link eD2k: Aggiungi / alla fine "
-"per far si' che aLinkCreator aggiunga il nome del file corrente"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Aggiungi"
+"L'utente %s (%u) ha richiesto la lista dei file condivisi -> richiesta "
+"accettata"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Rimuovi"
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+"L'utente %s (%u) ha richiesto la lista dei file condivisi -> richiesta negata"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Pulisci"
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"L'utente %s (%u) ha richiesto la lista delle directory condivise -> "
+"richiesta accettata"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Crea link con hash delle parti"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+"L'utente %s (%u) ha richiesto la lista delle directory condivise -> "
+"richiesta negata"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Aiuta a diffondere piu' in fretta i file nuovi e rari, al costo di una "
-"connessione piu' lunga"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Hash MD4"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "Hash eD2k del file"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "link eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Inizia"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Salva"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Copia negli appunti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Esci"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Apri"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Apri un file per calcolarne il link eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Copia"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Copia il link eD2k calcolato negli appunti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Salva come"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Salva il link eD2k calcolato in un file"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Informazioni"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Informazioni su aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Seleziona il file del quale vuoi calcolare il link eD2k"
+"L'utente %s (%u) ha richiesto la lista dei file condivisi nella directory %s "
+"-> richiesta accettata"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Non posso aprire gli appunti"
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr ""
+"L'utente %s (%u) ha richiesto la lista dei file condivisi nella directory %s "
+"-> richiesta negata"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Non c'e' niente da copiare per ora!"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "L'utente %s (%u) condivide la directory %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Seleziona il file del link eD2k calcolato"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr ""
+"L'utente %s (%u) ha inviato una lista delle directory condivise non "
+"richiesta."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Impossibile aprire "
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr ""
+"L'utente %s (%u) ha inviato la lista dei file condivisi nella directory %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Inserire un nome file non vuoto"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "L'utente %s (%u) ha finito di inviare la lista dei file condivisi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Non c'e' niente da salvare per ora!"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "L'utente %s (%u) ha inviato una lista di file condivisi non richiesta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
-"aLinkCreator, il creatore di link eD2k di aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps da http://www.everaldo.com e http://www.icomania.com\n"
-"e http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distribuito sotto GPL"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Hashing..."
+"L'utente %s (%u) ha negato l'accesso alla lista dei file e directory "
+"condivisi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator sta lavorando per te"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Commenti file"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Calcolo Hash MD4..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Nome utente"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Calcolo Hash eD2k"
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Nome file"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Eseguito in %.2f s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Giudizio"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Hai gia' aggiunto questo URL!"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Commento"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Inserire un URL non vuoto"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Nessun commento"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Elaborazione del file numero %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Hai richiesto l'hash delle parti (solo per file > 9.5 MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u commento"
+msgstr[1] "%u commenti"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> File inesistente!\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, il creatore di link eD2k di aMule"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1333,31 +1170,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Alta]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Connessione in corso"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Molto bassa"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Bassa"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normale"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Alta"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Molto alta"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Release"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Richiesta in corso"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Connessione in corso attraverso il server"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Coda piena"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "In coda"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Trasferimento"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Download in corso"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1383,8 +1246,7 @@
 msgid "Too many Kad connections"
 msgstr "Troppe connessioni Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Bannati"
 
@@ -1416,8 +1278,8 @@
 msgid "Remote Server"
 msgstr "Server remoto"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1439,10 +1301,10 @@
 
 #: src/DataToText.cpp:135
 msgid "Search Result"
-msgstr "Risultato della ricerca"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Completati"
 
@@ -1452,21 +1314,21 @@
 
 #: src/DataToText.cpp:147
 msgid "ERROR: Out of diskspace"
-msgstr "ERRORE: Spazio su disco esaurito"
+msgstr ""
 
 #: src/DataToText.cpp:148
 msgid "ERROR: Partmet not found"
-msgstr "ERRORE: Partmet non trovato"
+msgstr ""
 
 #: src/DataToText.cpp:149
 msgid "ERROR: IO error!"
-msgstr "ERRORE: errore IO!"
+msgstr ""
 
 #: src/DataToText.cpp:150
 msgid "ERROR: Failed!"
-msgstr "ERRORE: Fallito!"
+msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "In coda"
 
@@ -1478,874 +1340,300 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Formato del file temp sconosciuto o errato."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Predefinita di sistema"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albanese"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabo"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturiano"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Basco"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgaro"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Catalano"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Cinese (semplificato)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Cinese (tradizionale)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Croato"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Ceco"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Danese"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Olandese"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Inglese (U.K.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estone"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finlandese"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Francese"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galiziano"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Tedesco"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Greco"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Ebraico"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Ungherese"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italiano (Svizzera)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Giapponese"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Coreano"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lituano"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvegese"
-
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polacco"
-
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portoghese"
-
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portoghese (brasiliano)"
-
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Russo"
-
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Sloveno"
-
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Spagnolo"
-
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Svedese"
-
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turco"
-
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ucraino"
-
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Impossibile determinare il browser selezionato!"
-
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"La porta TCP non puo' essere superiore a 65532 perche' il socket UDP e' "
-"fissato a TCP+3"
-
-#: src/Preferences.cpp:1681
-#, c-format
-msgid "Default port will be used (%d)"
-msgstr "Verra' usata la porta di default (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Nome server"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Indirizzo"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Porta"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Descrizione"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Utenti"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "File"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Fallito"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Statico"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versione"
-
-#: src/ServerListCtrl.cpp:144
-msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
-"Sei connesso al server che stai cercando di cancellare. Disconnettiti prima. "
-"Il server NON e' stato cancellato"
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(nome sconosciuto)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Sei sicuro di voler cancellare il server statico %s?"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Si'"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "No"
-
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Impossibile aprire '%s'"
-
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Server (%i)"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Server"
-
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Connesso al server"
-
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Marca il server come statico"
-
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Marca il server come non statico"
-
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Marca i servers come statici"
-
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Marca i servers come non statici"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Dimensione"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Rimuovi server"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Trasferiti"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Rimuovi servers"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Velocita'"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Elimina tutti i server"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Avanzamento"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Copia il link eD2k negli appunti"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Fonti"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Copia i link eD2k negli appunti"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Priorita'"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Riconnetti al server"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Stato"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Sei sicuro di voler cancellare tutti i server?"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Tempo rimanente"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Sei sicuro di voler cancellare il server selezionato?"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Ultima fonte completa vista"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Sei sicuro di voler cancellare i server selezionati?"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Ultima ricezione"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Disabilitato [%s]"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Sei sicuro di voler cancellare il file selezionato?"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Questo e' aMule %s basato su eMule"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Sei sicuro di voler cancellare i files selezionati?"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Running on %s"
-msgstr "In esecuzione su %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Visita http://www.amule.org per sapere se e' disponibile una nuova versione"
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ERRORE FATALE: Creazione Timer fallita"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Controllo remoto di aMule "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Snapshot:"
-
-#: src/amuleDlg.cpp:464
 msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Client p2p 'All-Platform' basato su eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr "Sito web: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr "Forum: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr "Contatto: admin@amule.org (problemi amministrativi) \n"
-
-#: src/amuleDlg.cpp:469
-msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
+"Feedback from: %s (%s)\n"
 "\n"
 msgstr ""
-"Copyright (C) 2003-2009 aMule Team \n"
+"Feedback da: %s (%s)\n"
 "\n"
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Parte di aMule e' basata su \n"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Routing peer-to-peer basato sulla metrica XOR.\n"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Stop"
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Messaggio"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pausa"
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Connessione"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Continua"
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Disconnesso"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "&Rimuovi file completati"
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Con Firewall"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Sposta ogni A4AF su questo file"
 
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Connesso"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Sposta ogni A4AF su questo file (Auto)"
 
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Connessione in corso"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Sposta ogni A4AF sugli altri file"
 
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Spento"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Opzioni avanzate"
 
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Ferma i tentativi di connessione in corso"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Anteprima"
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Disconnetti"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Mostra &dettagli file"
 
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Disconnetti dalla reti attualmente connesse"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Mostra tutti i commenti"
 
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Connetti"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Copia URI magnet negli appunti"
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Connetti alle reti attualmente abilitate"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Copia il &link eD2k negli appunti"
 
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Copia feedback negli appunti"
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Up: %.1f | Down: %.1f"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "rimuovi"
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Connesso)"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Assegna a categoria"
 
-#: src/amuleDlg.cpp:836
-#, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Disconnesso)"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Apri file"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Vuoi veramente uscire da aMule?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Inserisci un nuovo nome per questo file:"
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Chiedi conferma prima di uscire"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Rinomina file"
 
-#: src/amuleDlg.cpp:1182
-#, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "La directory delle skin '%s' non esiste"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "ATTENZIONE: Non posso aprire il file della skin '%s' in lettura"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Reti"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Finestra Reti"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Ricerca"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Finestra Ricerche"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Trasferimenti"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Finestra Trasferimenti"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Files Condivisi"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Finestra files condivisi"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Messaggi"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Finestra Messaggi"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistiche"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Finestra Grafico Statistiche"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Finestra Impostazioni"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importazione"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Strumento per l'importazione dei partfile"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Informazioni/Aiuto"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "rete eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "rete Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "nessuna rete"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Generale"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Connessione"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Directory"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Server"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Sicurezza"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Interfaccia"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filtri"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Controlli remoti"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Firma Online"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Avanzate"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Eventi"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Debug"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Definito dall'utente"
+msgid "Downloads (%i)"
+msgstr "Download (%i)"
 
-#: src/PrefsUnifiedDlg.cpp:539
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-"aMule deve essere riavviato per rendere effettive queste modifiche:\n"
-"\n"
 
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- Modifica della porta TCP.\n"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Anteprima"
 
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- Modifica della porta UDP.\n"
+#: src/DownloadListCtrl.cpp:1461
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "ERRORE: impossibile eseguire il media player esterno! Comando: '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
 msgstr ""
-"La tua lista server auto-aggiornante e' vuota.\n"
-"'Aggiornamento della lista server all'avvio disabilitato"
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
-"Hai abilitato le connessioni esterne senza pero' specificare una password.\n"
-"Le connessioni esterne non possono essere abilitate a meno che tu non scelga "
-"una password valida"
 
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Modifica della lingua.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Modifica della cartella Temp.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- Rete ED2K abilitata.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Up: 0.0 | Down: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Entrambi le reti eD2k e Kad sono disabilitate.\n"
-"Non sarai in grado di connetterti finche' non ne abiliterai almeno una."
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "Caricamento file server.met: %s"
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad non puo' partire se la porta UDP e' disabilitata.\n"
-"Abilitala o disabilita Kad."
+#: src/DownloadQueue.cpp:132
+#, fuzzy, c-format
+msgid "Loading PartFile %u of %u"
+msgstr "Caricamento dati da vecchio file in download (%u su %u)"
 
-#: src/PrefsUnifiedDlg.cpp:669
+#: src/DownloadQueue.cpp:154
 msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"\n"
-"DEVI riavviare aMule ADESSO.\n"
-"Se non lo fai, non lamentarti se succede qualcosa di brutto.\n"
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
-"La tua lista di aggiornamento automatico dei server e' vuota.\n"
-"Inserisci l'URL di almeno un server valido nel file server.met.\n"
-"Clicca sul pulsante \"Lista\" per inserire l'URL"
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "File temporanei"
 
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "File completi"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Firme online"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Scegli una directory per i %s"
-
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Sfoglia per trovare un riproduttore video"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Scegli browser"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Non e' stato trovato alcun file incompleto"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Eseguibile%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Modifica lista server"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Trovato %u file part."
+msgstr[1] "Trovati %u files part."
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Inserisci l'URL da cui scaricare il file server.met.\n"
-"Solo un URL per riga"
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Intervallo aggiornamento: %d secondo"
-msgstr[1] "Intervallo aggiornamento: %d secondi"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Intervallo grafico della media: %d minuto"
-msgstr[1] "Intervallo grafico della media: %d minuti"
+msgid "Downloading %s"
+msgstr "Download di %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Scala grafico delle connessioni: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Stai gia' cercando di scaricare il file '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Intervallo aggiornamento: %d secondo"
-msgstr[1] "Intervallo aggiornamento: %d secondi"
+msgid "You already have the file '%s'"
+msgstr "Hai gia' il file '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Dimensione buffer file: %d byte"
-msgstr[1] "Dimensione buffer file: %d bytes"
+msgid "You are already trying to download the file %s"
+msgstr "Stai gia' cercando di scaricare il file '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Dimensione coda upload: %d client"
-msgstr[1] "Dimensione coda upload: %d clients"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Intervallo aggiornamento connessione ai server: %d minuto"
-msgstr[1] "Intervallo aggiornamento connessione ai server: %d minuti"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Intervallo aggiornamento connessione ai server: disabilitato"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Porta UDP per le richieste estese del server (TCP+3):"
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "disabilitato"
+msgid "Unknown protocol of link: %s"
+msgstr "Protocollo del link %s sconosciuto"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Esegui comando se si verifica l'evento '%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Abilita l'esecuzione del comando sul core"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Comando Core:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Abilita l'esecuzione del comando sulla GUI"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Comando GUI:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Le seguenti variabili saranno sostituite:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr ""
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Tentativo di accesso non autorizzato. Connessione chiusa."
+#: src/ExternalConn.cpp:260
+#, fuzzy
+msgid "Client sent packet after authentication failed."
+msgstr "Autenticazione fallita"
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Connessione esterna chiusa"
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Connessioni esterne disabilitate perche' la password e' vuota!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Connessioni esterne disabilitate nel file di configurazione"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Accettata nuova connessione esterna"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERRORE: non posso accettare una nuova connessione esterna"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "Connessione esterna rifiutata perche' la password nelle preferenze e' vuota!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Connessione al client: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Versione sconosciuta"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2353,2244 +1641,1059 @@
 "ID della versione EC non corretto, potrebbe esserci un'incompatibilita' "
 "binaria. Usare core e client remoto dello stesso snapshot."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"Non puoi collegarti ad una versione ufficiale usando una versione SVN "
-"arbitraria! *sigh* prevenuto possibile crash"
+"Non puoi connetterti a una versione finale da una versione CVS qualsiasi! "
+"*sigh* possibile crash evitato"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Autenticazione fallita"
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Versione protocollo non valida"
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Tag versione di protocollo mancante"
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "Autenticazione fallita"
+
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "Autenticazione fallita"
+
+#: src/ExternalConn.cpp:516
+#, fuzzy
+msgid "Invalid request, please authenticate first."
 msgstr "Richiesta non valida, prima devi autenticarti"
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Accesso consentito"
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, fuzzy, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Filtra i messaggi da client sconosciuti"
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Tentativo di accesso non autorizzato. Connessione chiusa."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Comando Partfile remoto fallito: hash del file non trovato: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Hash del file non trovato: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! errore nel processare l'opcode!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Server non aggiunto"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "server non trovato: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "e' necessario definire Il server da rimuovere"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
-msgstr "eD2k disabilitato nelle preferenze."
+msgstr "eD2k è disabilitata nelle preferenze."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Ricerca in corso. Risultati in arrivo!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Non ha senso usare la ricerca Web da interfaccia remota."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "La rete Kad e' disabilitata nelle Preferenze."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Niente punti per il grafico."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Il tuo client non e' configurato per questo livello di dettaglio."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
-msgstr "Connessione Esterna: spegnimento richiesto"
+msgstr ""
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Sto gia' uscendo."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: aggiungo il link '%s'"
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Link non valido o gia' nella lista."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "File non trovato."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Nome file non valido."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Impossibile rinominare il file."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "La rete Kad e' disabilitata nelle Preferenze."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
-msgstr "Gia' connesso alla rete eD2k."
+msgstr ""
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
-msgstr "Connessione alla rete eD2k..."
+msgstr ""
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Gia' connesso alla rete Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Connessione alla rete Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Tutte le reti sono disabilitate."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
-msgstr "Disconnesso dalla rete eD2k."
+msgstr ""
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Disconnesso dalla rete Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
-msgstr "Connessione Esterna: ricevuto opcode non valido: %#x"
+msgstr ""
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Opcode non valido (versione errata del protocollo?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Impossibile aprire il file (%s), rimosso dalla lista dei file condivisi."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Hashset richiesto per il file sconosciuto: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Il programma `%s' con pid `%d' e' terminato uscendo con status `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Server non aggiunto: non e' stato specificato l'IP o il nome dell'host"
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Server non aggiunto: porta del server specificata non valida"
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Status eD2k:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Connesso"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Porta"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Stato Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Attivo"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Stato:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Disconnesso"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Stato connessione:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Firewalled"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Stato firewalled: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Connesso all'amico"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Nessun amico"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Utenti medi:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "File medi:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Non attivo"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Uptime: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Trasferimento"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Upload"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Dati inviati (sessione (totale)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Overhead totale (pacchetti): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Overhead per richieste file (pacchetti): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Overhead per scambio fonti (pacchetti): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Overhead server (pacchetti): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Overhead Kad (pacchetti): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Overhead cifratura (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Upload attivi: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Upload in attesa: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Totale sessioni di upload riuscite: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Totale sessioni di upload fallite: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Tempo upload medio: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Download"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Dati scaricati (sessione (totale)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Fonti trovate: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Download attivi (parti): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Rapporto UL:DL sessione (totale): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Velocita' media download (Sessione): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Velocita' media upload (Sessione): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Velocita' massima download (Sessione): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Velocita' massima upload (Sessione): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Riconnessioni: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Tempo dal primo trasferimento: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Connesso al server da: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Connessioni attive (stima): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Limite massimo connessioni raggiunto: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Connessioni medie (stima): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Picco connessioni (stima): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Client"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrati"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Totale: %i Conosciuti: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Server attivi: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Server falliti: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Totale: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Server rimossi: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Server filtrati: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Utenti su server attivi: %llu"
-
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "File su server attivi: %llu"
-
-#: src/Statistics.cpp:722
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Total Users: %llu"
-msgstr "Utenti totali: %llu"
-
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "File totali: %llu"
-
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Occupazione server: %.2f%%"
-
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Numero di file condivisi: %s"
-
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Dimensione totale file condivisi: %s"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Estensione '%s' sconosciuta per il comando '%s'.\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Average file size: %s"
-msgstr "Dimensione media file: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Sistema operativo"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Non ricevuto"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Taglia"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Incolla"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Seleziona tutto"
+msgid "Unknown command '%s'.\n"
+msgstr "Comando sconosciuto '%s'.\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
-"Impossibile effettuare una ricerca sulla rete Kad senza esserci connessi"
+"\n"
+"Questo comando non puo' avere un argomento.\n"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
-"La ricerca eD2k non puo' essere eseguita se la rete eD2k non e' connessa"
+"\n"
+"Questo comando richiede un argomento.\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Errore imprevisto durante la ricerca su Kad: "
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Questo comando e' incompleto, devi usare una delle estensioni qui "
+"riportate.\n"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Messaggio da '%s' (IP:%s) filtrato"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Estensioni disponibili:\n"
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nuovo messaggio da '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Comandi disponibili:\n"
 
-#: src/ClientTCPSocket.cpp:821
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
-"L'utente %s (%u) ha richiesto la lista dei file condivisi -> richiesta "
-"accettata"
+"\n"
+"Tutti i comandi possono essere digitati in maiuscolo o minuscolo.\n"
+"Digitare '%s <comando>' per avere informazioni dettagliate su <comando>.\n"
 
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr ""
-"L'utente %s (%u) ha richiesto la lista dei file condivisi -> richiesta negata"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Esce dall'applicazione."
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"L'utente %s (%u) ha richiesto la lista delle directory condivise -> "
-"richiesta accettata"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Mostra aiuto."
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
-"L'utente %s (%u) ha richiesto la lista delle directory condivise -> "
-"richiesta negata"
+"Per avere aiuto su un comando, digitare 'help <comando>'.\n"
+"Per avere la lista completa dei comandi, digitare 'help'.\n"
 
-#: src/ClientTCPSocket.cpp:939
+#: src/ExternalConnector.cpp:248
 #, c-format
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
-"L'utente %s (%u) ha richiesto la lista dei file condivisi nella directory %s "
-"-> richiesta accettata"
+"\n"
+"Usa '%s' per la lista dei comandi\n"
+"\n"
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Errore di sintassi!"
+
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
-"L'utente %s (%u) ha richiesto la lista dei file condivisi nella directory %s "
-"-> richiesta negata"
+"Errore nell'eseguire il comando - cio' non dovrebbe mai accadere! Per "
+"favore, segnala il bug\n"
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "L'utente %s (%u) condivide la directory %s"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Questo comando non deve avere parametri."
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr ""
-"L'utente %s (%u) ha inviato una lista delle directory condivise non "
-"richiesta."
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Questo comando richiede un parametro."
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr ""
-"L'utente %s (%u) ha inviato la lista dei file condivisi nella directory %s"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Argomento non valido."
 
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "L'utente %s (%u) ha finito di inviare la lista dei file condivisi"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Questo comando e' incompleto."
 
-#: src/ClientTCPSocket.cpp:1037
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "L'utente %s (%u) ha inviato una lista di file condivisi non richiesta"
+msgid "Type '%s' to get more help.\n"
+msgstr "Digita '%s' per avere altro aiuto.\n"
 
-#: src/ClientTCPSocket.cpp:1049
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr ""
-"L'utente %s (%u) ha negato l'accesso alla lista dei file e directory "
-"condivisi"
+msgid "This is %s %s %s\n"
+msgstr "Questo e' %s %s %s\n"
 
-#: src/KadDlg.cpp:132
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "Nodes (%u)"
-msgstr "Nodi (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "IP non valido per il bootstrap"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Porta non valida per il bootstrap"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Completa tutti i campi obbligatori"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Sei sicuro di voler scaricare un nuovo file nodes.dat?\n"
+msgid "This is %s %s\n"
+msgstr "Questo e' %s %s\n"
 
-#: src/KadDlg.cpp:197
+#: src/ExternalConnector.cpp:390
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"\n"
+"Creating client...\n"
 msgstr ""
-"Cosi' facendo, rimuoverai i nodi attuali e riavvierai la connessione "
-"Kademlia."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Continuare?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "ERRORE:"
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "ATTENZIONE:"
+"\n"
+"Creazione del client in corso...\n"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Aggiungi amico"
+#: src/ExternalConnector.cpp:414
+#, c-format
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
+msgstr ""
+"\n"
+"Ok, uscita in corso da %s...\n"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Inserire un indirizzo IP e una porta validi!"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
+"Non posso connettermi con una password vuota.\n"
+"Devi specificare una password nel file di configurazione oppure\n"
+"nella linea di comando, o inserirne una quando richiesto.\n"
+"\n"
+"Sto uscendo...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informazione"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Mostra questo suggerimento"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "L'hash utente specificato non e' valido!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Host su cui aMule e' in esecuzione (default: localhost)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Fonti"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Porta di aMule per le connessioni esterne (default: 4712)"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "File"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Password connessioni esterne"
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Download"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Leggi la configurazione da file"
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Categoria"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Non stampare output sullo stdout"
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Principale"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Verboso - mostra anche i messaggi di debug"
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Download nella categoria"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Imposta la localizzazione (lingua) del programma"
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Ricerca file collegati (eD2k, server locale)"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Salva le opzioni linea di comando nel file di configurazione"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Segna come file conosciuto"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Crea un file di configurazione basato su quello di aMule"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Connessione ad aMule remoto"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Mostra la versione del programma"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Connessione fallita "
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Dettagli file"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "ERRORE"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% completato"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Connessione fallita. Impossibile connettersi a %s:%d\n"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
-"ATTENZIONE: Non puoi aggiungere te stesso come sorgente per un link eD2k se "
-"hai un lowid."
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Utenti: E: %s K: %s | File E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Tutto"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr ""
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Utenti totali: %s | File totali: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Amici"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Trasferiti"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Mostra &Dettagli"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Velocita'"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Aggiungi amico"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Avanzamento"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Rimuovi amico"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Stato"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Invia &Messaggio"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Tempo rimanente"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Visualizza file"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Ultima fonte completa vista"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Crea slot amico"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Ultima ricezione"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Sei sicuro di voler cancellare l'amico selezionato?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Sei sicuro di voler cancellare il file selezionato?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Sei sicuro di voler cancellare gli amici selezionati?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Sei sicuro di voler cancellare i files selezionati?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Non puoi assegnare piu' di uno slot amico.\n"
+"Assegnato un solo slot"
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Selezione multipla"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Invia messaggio all'utente"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Messaggio da inviare:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Stop"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pausa"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Continua"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "&Rimuovi file completati"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Sposta ogni A4AF su questo file"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Sposta ogni A4AF su questo file (Auto)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Sposta ogni A4AF sugli altri file"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Opzioni avanzate"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Anteprima"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Mostra &dettagli file"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Mostra tutti i commenti"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Copia URI magnet negli appunti"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "rimuovi"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Assegna a categoria"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Apri file"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Elimina dagli amici"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Inserisci tra gli amici"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Invia messaggio"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Sposta su questo file"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Altro file richiesto"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Download (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Per evitare che venga mostrato questo avviso in tutte le anteprime,\n"
-"imposta il tuo player preferito nelle preferenze (mplayer e' il predefinito)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Anteprima"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Upload in attesa: %s"
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ERRORE: impossibile eseguire il media player esterno! Comando: '%s'"
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "In coda"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "ERRORE: impossibile creare il file .part)"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Upload"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Caricamento del backup del file met da %s"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Nessuno"
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ERRORE: apertura file part.met fallita: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "No"
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ERRORE: il file part.met e' di dimensione 0: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Si'"
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ERRORE: Versione file part.met non valida: %s ==> %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Scaricamento in corso..."
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
-"ERRORE: %s (%s) e' corrotto (tagcount errato), non posso caricare il file."
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Tentativo di recupero informazioni sul file..."
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "ATTENZIONE: Impossibile aprire il file della skin '%s' in lettura"
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
-"Recupero file senza nome - tentativo di recupero come RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Recuperate tutte le informazioni disponibili :D - Tentativo di utilizzo in "
-"corso..."
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Impossibile recuperare le informazioni sul file :("
-
-#: src/PartFile.cpp:660
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Impossibile aprire %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "ATTENZIONE: %s potrebbe essere corrotto (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "Errore durante il salvataggio del file incompleto: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Non posso ottenere la lunghezza di '%s' - sto usando il file %s"
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' e' per qualche motivo di dimensione 0 - uso il file %s"
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Impossibile salvare il file part.met.seeds per %s"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Salvata %i fonte per il file incompleto: %s (%s)"
-msgstr[1] "Salvate %i fonti per il file incompleto: %s (%s)"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr ""
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Il file incompleto %s (%s) non ha file seeds"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr ""
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Il file incompleto %s (%s) ha un file delle fonti vuoto"
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
+msgstr "Scaricato"
 
-#: src/PartFile.cpp:1118
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Errore nella lettura del file delle fonti del partfile (%s - %s): %s"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr ""
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Trovata parte corrotta (%d) in %d parte %s - FileResultHash |%s| FileHash |%"
-"s|"
-msgstr[1] ""
-"Trovata parte corrotta (%d) in %d parti %s - FileResultHash |%s| FileHash |%"
-"s|"
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Trovata parte completata (%i) in %s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Nuovo hashing completato %s"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Errore inatteso durante il completamento di %s. File in pausa"
-
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Download completato: %s"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
+msgstr ""
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Cancellazione file: %s"
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Riconnetti al server"
 
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
-"ATTENZIONE: impossibile creare l'hash della parte - hashset incompleto per '%"
-"s'"
 
-#: src/PartFile.cpp:2389
+#: src/IP2Country.cpp:100
 #, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
-"ATTENZIONE: impossibile creare l'hash della parte - hashset incompleto (%s). "
-"Questo non dovrebbe mai accadere"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
-"ATTENZIONE: non c'e' abbastanza spazio libero su disco! Metto in pausa il "
-"file: %s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "La parte di file scaricata %i e' corrotta in: %s"
 
-#: src/PartFile.cpp:3214
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: recuperata parte corrotta %i in %s -> risparmiati byte: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Allocazione"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Spazio su disco insufficiente"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Fermo"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Scaricato"
-
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ERRORE: Apertura partfile '%s' fallita"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "ATTENZIONE: known.met non puo' essere aperto."
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
-"ATTENZIONE: Lista file conosciuti corrotta, contiene intestazione non valida."
-
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Errore IO durante la lettura del file known.met: %s"
-
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Errore nel salvataggio del file known.met: %s"
-
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Trovato %i file condiviso conosciuto"
-msgstr[1] "Trovati %i files condivisi conosciuti"
-
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Trovato %i file condiviso conosciuto, %i sconosciuto"
-msgstr[1] "Trovati %i files condivisi conosciuti, %i sconosciuti"
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ERRORE: Tentativo di condividere %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Commenti file"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Giudizio"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Commento"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Nessun commento"
+msgid "Failed to rename %s file, aborting update."
+msgstr ""
 
-#: src/CommentDialogLst.cpp:104
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u commento"
-msgstr[1] "%u commenti"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+msgid "Successfully updated %s"
 msgstr ""
-"Impossibile collegarsi ai server con offuscamento di protocollo. Ci riprovo "
-"senza offuscamento."
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
-"Impossibile connettersi a tutti i server in lista. Procedo con un altro "
-"tentativo"
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "Rete eD2k disabilitata nelle preferenze, non si sta collegando."
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Impossibile scaricare la lista dei server da %s"
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Nessun server valido al quale connettersi nella server list"
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Impossibile scaricare la lista dei server da %s"
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Connesso a %s (%s:%i)"
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Carico i filtri IP da 'ipfilter.dat' e 'ipfilter_static.dat'."
 
-#: src/ServerConnect.cpp:263
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Connessione stabilita con: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
-"Errore fatale durante il tentativo di connessione. La connessione a internet "
-"potrebbe non essere attiva"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Persa connessione a %s (%s:%i)"
+"Impossibile caricare il file ipfilter.dat '%s', trovato formato sconosciuto."
 
-#: src/ServerConnect.cpp:349
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) sembra essere morto"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr ""
+"Impossibile caricare il file ipfilter.dat '%s', impossibile aprire il file."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) sembra essere pieno"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Caricato %u intervallo di IP da '%s'."
+msgstr[1] "Caricati %u intervalli di IP da '%s'."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Riconnessione automatica al server tra %d secondo"
-msgstr[1] "Riconnessione automatica al server tra %d secondi"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Connessione persa"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u riga non valida e' stata scartata."
+msgstr[1] "%u righe non valide sono state scartate."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Connessione a %s (%s:%i) fallita"
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ERRORE: Socket non valido trovato alla verifica"
+msgid "Failed to rename new %s file, aborting update."
+msgstr ""
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Connessione a %s (%s:%i) fallita per time-out"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr ""
 
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"ERRORE: Caricamento file di backup fallito. Ricerca su http://forum.amule."
-"org per il recupero di files .part.met"
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Non e' stato trovato alcun file incompleto"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Trovato %u file part."
-msgstr[1] "Trovati %u files part."
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr "Il file system della directory Temp non puo' gestire files grandi."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr "Il file system della directory Incoming non puo' gestire files grandi."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Download di %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Stai gia' cercando di scaricare il file '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Hai gia' il file '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Stai gia' cercando di scaricare il file '%s'"
+"Bootstrap da\n"
+"client noti"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Non posso convertire il link magnet in eD2k: %s"
+msgid "Nodes (%u)"
+msgstr "Nodi (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Protocollo del link %s sconosciuto"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "IP non valido per il bootstrap"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Link eD2k non valido! ERRORE: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Porta non valida per il bootstrap"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Esegui <str> e esci"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Completa tutti i campi obbligatori"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Formato IP non valido. Usa xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Sei sicuro di voler scaricare un nuovo file nodes.dat?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Questo comando necessita di un argomento. Argomenti validi: 'all', nome del "
-"file oppure un numero.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Elaborazione in base all'hash:"
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Elaborazione in base al nome del file:"
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Questo comando necessita di un argomento. Argomenti validi: l'hash di un "
-"file.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Non e' un numero valido\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Non e' un hash valido (la lunghezza deve essere di 32 caratteri)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Operazione conclusa con successo"
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Richiesta fallita con il seguente errore: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Filtraggio IP per i client: %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "OFF"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "ON"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Filtraggio IP per i server: %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Il livello IPFilter attuale e' %d\n"
-
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Limiti di banda: Up: %u kB/s, Down: %u kB/s.\n"
-
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
-
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "Connesso a %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "con LowID"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "con HighID"
+"Cosi' facendo, rimuoverai i nodi attuali e riavvierai la connessione "
+"Kademlia."
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Connessione in corso"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Continuare?"
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Non connesso"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: chiave di ricerca troppo corta"
 
-#: src/TextClient.cpp:723
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+msgid "Keyword for search: %s"
 msgstr ""
-"\n"
-"Download:\t%s"
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
-"\n"
-"Upload:\t%s"
 
-#: src/TextClient.cpp:729
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Client in coda:\t%d\n"
 
-#: src/TextClient.cpp:732
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Letto %u contatto Kad"
+msgstr[1] "Letti %u contatti Kad"
+
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Fonti totali:\t%d\n"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Totale risultati della ricerca: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - visualizzare il progresso della ricerca"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Ricevuta risposta sconosciuta dal server, OpCode = %#x"
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Mostra informazione sullo stato."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr ""
-"Mostra stato connessione, velocita' di upload e download attuali, etc.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Mostra le statistiche complete."
-
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Opzionalmente, un numero compreso tra 0 e 255 puo' essere passato come "
-"argomento a questo\n"
-"comando, per indicare quante versioni mostrare nel sottoalbero dei client. 0 "
-"oppure\n"
-"nessun numero significa 'infinite'.\n"
-"Esempio: 'statistics 5' mostrera' solo le cinque versioni piu' diffuse per "
-"ogni tipo di client.\n"
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Chiudi aMule."
-
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Chiudi il core remoto in esecuzione (amule/amuled).\n"
-"Questo chiudera' anche il client testuale, visto che non e' utilizzabile "
-"senza\n"
-"un core in esecuzione.\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Ricarica l'oggetto."
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Ricarica la lista dei file condivisi."
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Ricarica il filtro IP da file."
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Connessione al network."
-
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"Questo connettera' aMule a tutte le reti attualmente abilitate nelle "
-"Preferenze.\n"
-"E' anche possibile specificare l'indirizzo IP, nella forma IP:Porta, di un "
-"server e\n"
-"connettersi solamente a quello. Si puo' utilizzare un indirizzo IPv4 oppure\n"
-"un nome risolvibile da un server DNS."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Scritto %d contatto Kad"
+msgstr[1] "Scritti %d contatti Kad"
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Connetti solo a eD2k."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Nome file"
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Connetti solo alla rete Kad."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Dimensione"
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Disconnetti dalla rete."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Rapporto di condivisione"
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Questo disconnettera' aMule da tutte le reti attive.\n"
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Inviato"
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Disconnetti solo eD2k."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Richiesto"
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Disconnetti solo dalla rete Kad."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Accettato"
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Aggiungi un link eD2k o magnet al core."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Sorgenti complete"
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Il link eD2k da aggiungere puo' essere:\n"
-"\"*) un link a un file (ed2k://|file|...), che sara' aggiunto alla coda di "
-"download,\n"
-"*) un link a un server (ed2k://|server|...), che sara' aggiunto alla lista "
-"dei server,\n"
-"*) o un link ad una lista server, nel quale caso tutti i server elencati "
-"saranno aggiunti alla\n"
-"lista dei server.\n"
-"\n"
-"Il link magnet deve contenere l'hash eD2k e la lunghezza del file.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Imposta un valore delle preferenze."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Imposta le preferenze del Filtro IP."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Attiva il filtro IP per client e server."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Disattiva il filtro IP per client e server."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Attiva/Disabilita il filtro IP per i client."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Attiva il filtro IP per i client."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Disattiva il filtro IP per i client."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Attiva/Disabilita il filtro IP per i server."
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Attiva il filtro IP per i server."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Disabilita il filtro IP per i server."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Seleziona il livello del filtraggio degli IP."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"I livelli di filtraggio validi vanno da 0 a 255 e il default (iniziale)\n"
-"e' 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Imposta limiti di banda."
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Il valore fornito a questi comandi deve essere in kilobyte al secondo.\n"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Imposta limiti di banda per l'upload."
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Versione sconosciuta"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Imposta limiti di banda per il download."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "ATTENZIONE: Impossibile aprire il file della skin '%s' in lettura"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Visualizza un'impostazione delle preferenze."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Hashing in corso"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Visualizza impostazioni Filtro IP."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "In completamento"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Ottieni stato dell'IPFilter per client e server."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Completo"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Ottieni stato dell'IPFilter per i client."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "In pausa"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Ottieni stato dell'IPFilter per i server."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Errato"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Visualizza livello Filtro IP."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "In attesa"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Visualizza limita di banda."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Devi specificare una password non vuota."
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Effettua una ricerca."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Password non valida, non e' un hash MD5!"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"E' necessario specificare il TIPO della ricerca che puo' essere:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Esempio: 'search kad file' cerchera' \"file\" nella rete Kad.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Connessione fallita"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Effettua una ricerca globale."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "Connessione EC fallita. Risposta vuota."
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Effettua una ricerca locale"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "Connessione esterna: Risposta errata dal server. Connessione chiusa."
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Effettua una ricerca su Kad"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Fatto! Connessione stabilita con aMule "
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Mostra risultati dell'ultima ricerca."
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Fatto! Connessione stabilita"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Rende i risultati della ricerca precedente.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Connessione esterna: Accesso negato perché:"
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Mostra il progresso della ricerca."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "Connessione esterna: Accesso negato"
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Mostra il progresso della ricerca.\n"
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr ""
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Scarica un file"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "ERRORE: Non posso ricevere dalla porta TCP."
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
 msgstr ""
-"Bisogna fornire il numero del file relativo all'ultima ricerca.\n"
-"Esempio: 'download 12' aggiungera' alla coda dei download il file col numero "
-"12 trovato dall'ultima ricerca.\n"
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Metti il download in pausa."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr ""
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Riavvia download."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Chiudi"
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Cancella download."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Taglia"
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Imposta priorita' del download."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Copia"
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Imposta la priorita' del download a Bassa, Normale, Alta o Auto.\n"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Incolla"
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Imposta priorita' del download.a Bassa."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Pulisci"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Imposta priorita' del download.a Normale."
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Seleziona tutto"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Imposta priorita' del download.a Alta."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Imposta priorita' del download.a Auto."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Illimitato"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Mostra code/liste."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Menu nel systray"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
 msgstr ""
-"Mostra la coda di upload/download, la lista dei server o la lista dei file "
-"condivisi.\n"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Mostra la coda di upload."
-
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Mostra la coda di download."
-
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Mostra log."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "UL: nessuno"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Mostra la lista dei server."
+#: src/MuleTrayIcon.cpp:304
+#, c-format
+msgid "UL: %u"
+msgstr "UL: %u"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Cancella log."
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DL: nessuno"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Comando deprecato, usa '%s' al suo posto."
+msgid "DL: %u"
+msgstr "DL: %u"
 
-#: src/TextClient.cpp:952
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
+msgid "Download speed: %.1f"
 msgstr ""
-"Questo e' un comando deprecato, e potrebbe essere rimosso in futuro.\n"
-"Usa '%s' al suo posto.\n"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ERRORE: %s (%s) - %s"
+msgid "Upload speed: %.1f"
+msgstr ""
 
-#: src/ServerSocket.cpp:274
-#, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "ATTENZIONE: %s (%s) - %s"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Informazioni client"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "New clientid is %u"
-msgstr "Il nuovo clientID e' %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "ATTENZIONE: Hai ricevuto un ID Basso!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tProbabilmente perche' il tuo pc e' dietro un firewall o router."
+msgid "Nickname: %s"
+msgstr "Nickname: %s"
 
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tPer altre informazioni visita http://wiki.amule.org"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Nessun nickname selezionato!"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Ricevute informazioni sconosciute dal server! - troppo corto"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID Client: "
 
-#: src/ServerSocket.cpp:539
-#, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Ricevuto %d nuovo server"
-msgstr[1] "Ricevuti %d nuovi servers"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Non connesso"
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Salvataggio della lista dei server completato"
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Nome server: "
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Il server ha rifiutato l'ultimo comando"
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP server: "
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Pacchetto bogus ricevuto dal server: %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Non connesso"
 
-#: src/ServerSocket.cpp:607
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Errore non gestito durante l'elaborazione del pacchetto dal server: %s"
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
+msgid "TCP port: %d"
 msgstr ""
-"Non e' possibile creare un thread per risolvere il DNS per connettersi a %s"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "L'ip del server %s (%s) e' filtrato. Connessione bloccata."
-
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "utilizzo offuscamento del protocollo."
-
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Connessione a %s (%s - %s:%i) %s"
-
-#: src/ServerSocket.cpp:760
-#, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
 msgstr ""
-"Non e' possibile risolvere il DNS per il server %s: impossibile connettersi!"
 
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Impossibile ottenere i dati sul Paese da "
-
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Caricato %d flag bitmap."
-msgstr[1] "Caricati %d flag bitmaps."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgid "UDP port: %d"
 msgstr ""
-"Sei sicuro di voler interrompere e rimuovere tutti i file contenuti in "
-"questa categoria?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Conferma richiesta"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Tutto il resto"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Incompleti"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Attivo"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Video"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Audio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Archivi"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Immagini CD"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Immagini"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Testo"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Seleziona filtro di visualizzazione"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Aggiungi categoria"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Modifica categoria"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Elimina categoria"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Nome file"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Dimensione"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Rapporto di condivisione"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Inviato"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Richiesto"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Accettato"
-
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Sorgenti complete"
-
-#: src/PartFileConvert.cpp:208
-#, c-format
-msgid "Importing %s: %s"
-msgstr "Importazione %s: %s"
-
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Lettura directory dei file temporanei"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Recupero informazioni di base dal file info del download"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr ""
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Creazione file di destinazione"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Firma online: abilitata"
 
-#: src/PartFileConvert.cpp:331
-#, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Caricamento dati da vecchio file in download (%u su %u)"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Firma online: disabilitata"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Salvataggio blocchi di dati in un singolo file (%u su %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Recupero informazioni fonti e file in download in corso"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Aggiunta download e salvataggio nuovo partfile in corso"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importa partfile"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Stato"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Filehash"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "In attesa..."
+msgid "Uptime: %s"
+msgstr "Uptime: %s"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disco: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Scegli una directory in cui cercare download temporanei! (le sottodirectory "
-"saranno incluse)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
+msgid "Shared files: %d"
 msgstr ""
-"Vuoi che le fonti per i download importati con successo siano cancellate?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Rimuovi fonti?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
 
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/s"
-msgstr[1] "bytes/s"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "sec"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "min"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "ore"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "giorni"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Video"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Archivi"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Testi"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programmi"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Qualsiasi"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Senza voto"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Non valido / Corrotto / Falso"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Mediocre"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Discreto"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Buono"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Eccellente"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "tutti"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "tutti gli altri"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Carico i filtri IP da 'ipfilter.dat' e 'ipfilter_static.dat'."
-
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgid "Queued clients: %d"
 msgstr ""
-"Impossibile caricare il file ipfilter.dat '%s', trovato formato sconosciuto."
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Impossibile caricare il file ipfilter.dat '%s', impossibile aprire il file."
+msgid "Total DL: %s"
+msgstr "DL totale: %s"
 
-#: src/IPFilter.cpp:331
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Caricato %u intervallo di IP da '%s'."
-msgstr[1] "Caricati %u intervalli di IP da '%s'."
+msgid "Total UL: %s"
+msgstr "UL totale: %s"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u riga non valida e' stata scartata."
-msgstr[1] "%u righe non valide sono state scartate."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr ""
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Connessioni attive (1:%u)"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr ""
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Dettagli file"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Nascondi"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% completato"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Mostra"
 
-#: src/muuli_wdr.cpp:73
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Esci"
+
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
-msgstr "Link eD2k:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Invia"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
-"Clicca qui per aggiungere il link eD2k dalla casella di testo alla coda di "
-"download."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4598,25 +2701,29 @@
 "Gli eventi sono visualizzati qui. Per la lista completa, controllare il log "
 "nella tab dei Server"
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Caricamento in corso..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Numero di utenti presenti sul server al quale sei connesso..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Utenti: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr "Utenti connessi al server attuale e stima del numero totale di utenti"
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Up: 0.0 | Down: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4624,7 +2731,7 @@
 "Medie attuali di upload e download. Se l'opzione e' stata abilitata i numeri "
 "tra parentesi indicano l'overhead dovuto alla comunicazione tra client"
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4636,524 +2743,579 @@
 "che hai un LowID (probabilmente il tuo pc e' diestro un firewall) e le "
 "frecce verdi indicano che hai un HighID (la miglior connessione possibile)"
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Non connesso..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Server attualmente connesso"
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Cerca"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tipo"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Locale"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Globale"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "FileHash"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Parametri avanzati"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtraggio"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Tipo file"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Qualsiasi"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Archivi"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Audio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Immagini CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Immagini"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programmi"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Testi"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Video"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Estensione"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Dimensione minima"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Dimensione massima"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Disponibilita'"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Filtra risultati"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Inverti risultati"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Nascondi file conosciuti"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Inizia"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Ancora"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
-msgstr "Ricerca maggiori risultati su eD2k. Ancora non supportato per Kad."
+msgstr ""
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Ferma"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Download"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Azzera campi"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Risultati"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Rimuovi download completati"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Mostra Upload / Coda Upload / Client"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Client in coda:"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Invia"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Invia messaggio specificato"
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Chiudi"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Sorgenti complete"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Chiude questa sessione di chat"
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Generale"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Nome completo:"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/D"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "File met:"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Hash:"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Dimensione file:"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Stato file part:"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Ultima volta visto completo:"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Trasferimento"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Fonti trovate:"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Fonti in trasferimento:"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Numero parti:"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Disponibili:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Velocita':"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Download Active Time: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Trasferiti:"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Completati:"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligent Corruption Handling"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Perdita per corruzione:"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Guadagno per compressione:"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Pacchetti recuperati da ICH:"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Nomi file"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Sovrascrivi"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Pulisci"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Applica"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Commenta/Giudica il file (il testo sara' visibile a tutti gli utenti)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Per un film puoi indicare la lunghezza, la trama, la lingua...\n"
-"e, se e' un falso, puoi farlo presente agli altri utenti di aMule"
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Qualita' file"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Senza voto"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Non valido / Corrotto / Falso"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Mediocre"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Discreto"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Buono"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Eccellente"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Giudica il file o avvisa gli altri utenti se il file non e' quello "
 "corretto..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Aggiorna"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Download in corso, attendere prego..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Dimensione sconosciuta"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Informazioni richieste"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "Indirizzo IP:"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Porta:"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Informazioni aggiuntive"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Nome utente:"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Hash utente:"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Ricarica file condivisi"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Sessione corrente"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Totale"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Richiesto:"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Upload attivi:"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Aggiungi"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Velocita' download"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Corrente"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Media attuale"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Media sessione"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Velocita' upload"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Connessioni"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Download attivi"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Connessioni attive (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Upload attivi"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Albero statistiche"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Nome utente:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Hash utente:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Software client:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Versione client:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "Indirizzo IP:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP server:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Nome server:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Offuscamento:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Trasferimenti al client"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Richiesta attuale:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Velocita' media upload:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Velocita' media download:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Inviati nella sessione:"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Scaricati nella sessione:"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Inviati in totale:"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Scaricati in totale:"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Punteggi"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Modificatore DL/UL:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Identificazione sicura"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Giudizio (totale):"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "In coda"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Punteggio in coda:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Nick"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - il Mulo per Linux"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 "Questo e' il nome che gli altri utenti visualizzeranno quando saranno "
 "connessi con te"
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Lingua"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Intervallo di tempo prima che vengano mostrati i popup"
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Scelta della lingua utilizzata"
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Altre opzioni"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Verifica la disponibilita' di nuove versioni all'avvio"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Abilitare questa opzione fara' si' che aMule all'avvio verifichi la "
 "disponibilita' di nuove versioni"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Avvia ridotto ad icona"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 "Abilitando questa opzione, aMule si minimizzera' automaticamente all'avvio"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Chiedi conferma prima di uscire"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Fa si' che aMule chieda conferma prima di uscire"
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Abilita icona nel systray"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 "Abilita o disabilita l'icona nella system tray o nella barra delle "
 "applicazioni"
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Icona per la System Tray"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5161,580 +3323,460 @@
 "Abilitando questa opzione aMule verra' minimizzato nella System Tray invece "
 "che nella barra delle applicazioni"
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Ritardo dei popup in secondi"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Intervallo di tempo prima che vengano mostrati i popup"
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Selezione browser:"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Predefinito di sistema"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Seleziona il tuo browser"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Browser personalizzato:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Inserisci il nome del tuo browser. Per usare un browser diverso, seleziona "
-"Browser Personalizzato nel menu"
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Sfoglia"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Apri in un nuovo tab se possibile"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Se possibile, apri la pagina web in un nuovo tab invece che in una nuova "
 "finestra"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Riproduttore video"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Crea backup per anteprima"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr "Limiti di banda"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Allocazione slot"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Porta TCP standard del client:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
-msgstr "Questa e' la porta standard eD2k e non puo' essere disabilitata."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Porta UDP avanzata del client:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr "Questa porta UDP e' usata per richieste eD2k estese e per la rete Kad"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "disabilita"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Bind Address"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Porta UDP per le richieste estese del server (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Fonti massime per file"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Limite massimo"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Limite connessione"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Connessioni massime"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ed2k"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Attiva UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Porta TCP per UPnP:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ed2k"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Connetti automaticamente all'avvio"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Riconnetti dopo perdita connessione"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Mostra overhead banda"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Opzioni server"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Rimuovi server inattivi dopo"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "tentativi"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
-msgstr "Auto-aggiorna lista server all'avvio"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
-msgstr "Aggiorna lista server quando connetti a un server"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
-msgstr "Aggiorna lista server quando si connette un client"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Usa sistema di priorita'"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Usa controllo intelligente del LowID in fase di connessione"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Connessione sicura"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Connetti automaticamente solo ai server statici"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Assegna priorita' alta ai server aggiunti manualmente"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "ICH attivo"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH si fida di ogni hash (sconsigliato)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Aggiungi i nuovi file da scaricare mettendoli in pausa"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Aggiungi i nuovi file da scaricare con priorita' automatica"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Cerca di scaricare prima la parte iniziale e finale del file"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Assegna priorita' automatica ai nuovi file condivisi"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Cerca di trasferire parti complete per ogni upload"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Avvia un file in pausa quando un altro file e' stato completato"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Della stessa categoria"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Salva 10 fonti per i file rari (< 20 fonti)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Spazio su disco"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Verifica spazio su disco"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2058
+#: src/muuli_wdr.cpp:1819
 msgid "Select this if you want aMule to check your disk space"
-msgstr "Seleziona questo se vuoi che aMule verifichi lo spazio su disco"
-
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Spazio su disco minimo:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "Inserire lo spazio disco minimo desiderato"
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "Prealloca spazio su disco per i nuovi files"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Salva 10 fonti per i file rari (< 20 fonti)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Upload"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Assegna priorita' automatica ai nuovi file condivisi"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
 msgstr ""
-"Per i nuovi files prealloca lo spazio per l'intero file, cosi' da ridurre la "
-"frammentazione"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Incoming"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Temporanea"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Condivisa"
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(clicca col tasto destro sulle icone per condividere ricorsivamente)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Condividi file nascosti"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Grafici"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Intervallo di aggiornamento: 5 secondi"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Intervallo grafico valori medi: 100 minuti"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Scala grafico connessioni: 100 "
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Seleziona colori statistiche"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Sfondo"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Griglia"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Download corrente"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Media download in corso"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Media sessione di download"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Upload corrente"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Media upload in corso"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Media sessione di upload"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Connessioni attive"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Barra della velocita' nell'icona systray"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Nodi Kad attuali"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Nodi Kad attivi"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Nodi Kad nella sessione"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Seleziona"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Numero di versioni di client visualizzate (0=illimitate)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Capacita' linea"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Nota: questi valori sono usati solo nelle statistiche."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! ATTENZIONE !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Non modificate queste impostazioni se non sapete\n"
-"esattamente cosa state facendo: potreste ottenere\n"
-"effetti indesiderati.\n"
-"\n"
-"aMule funzionera' anche senza modificare questi parametri."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Impostazioni avanzate"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Numero massimo nuove connessioni / 5 secondi"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Dimensione buffer file: 240000 bytes"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Dimensione coda upload: 5000 client"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervallo aggiornamento connessione al server: disabilitato"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Avanzamento coda download"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Mostra percentuale"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Mostra barra di avanzamento"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Stile barra di avanzamento"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Piatta"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Arrotondata"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Supporto skin"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Abilita il supporto per le Skin"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Skin:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- nessuna skin disponibile -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Ordinamento colonne"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Ordina automaticamente i file in download (elevato uso CPU)"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule ordinera' automaticamente le colonne nella lista dei download"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Tweaks GUI vari"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Mostra Gestore Veloce Link eD2k"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Mosta informazioni estese sulle schede delle categorie"
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
 msgstr "Mostra velocita' di trasferimento nella barra del titolo"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Orientamento verticale della barra degli strumenti"
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Mostra velocita' di trasferimento nella barra del titolo"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Visualizza il numero del partfile prima del nome del file"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Parametri server web"
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Lancia amuleweb all'avvio"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Porta server web"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Orientamento verticale della barra degli strumenti"
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Abilita inoltro porte UPnP sulla porta del server web"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Porta TCP UPnP del web server"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Intervallo di aggiornamento pagina (in sec)"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Abilita compressione gzip"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Abilita utente con diritti limitati"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Piatta"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Password per diritti completi"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Arrotondata"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Password per diritti limitati"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Web template"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "aMule ordinera' automaticamente le colonne nella lista dei download"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Parametri connessioni esterne"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Accetta connessioni esterne"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
-"IP dell'interfaccia in ascolto\n"
-"(o vuoto per qualunque ip)"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5742,75 +3784,116 @@
 "Inserisci un IP valido nel formato a.b.c.d per l'interfaccia di ascolto EC. "
 "Lasciare il campo vuoto oinserire 0.0.0.0 significa qualsiasi interfaccia."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Porta TCP"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Abilita il port forwarding UPnP sulla porta EC"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Password"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Web template"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Password per diritti completi"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Abilita utente con diritti limitati"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Password per diritti limitati"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Intervallo di aggiornamento pagina (in sec)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Abilita compressione gzip"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Clicca qui per applicare le modifiche apportate alle impostazioni"
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Annulla ogni modifica alle preferenze"
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Titolo:"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Commento:"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Directory file scaricati:"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Cambia priorita' per i nuovi files assegnati:"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "Non cambiare"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Seleziona colore per questa categoria (attualmente selezionata):"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Mostra motd del server alla connessione..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Informazioni server"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Pulisci"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Clicca su questo pulsante per cancellare il log"
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Log di aMule"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Clicca qui per aggiornare la lista dei server dall'indirizzo..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
-msgstr "Lista server"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5818,44 +3901,56 @@
 "Inserisci l'url di un file server.met e premi il pulsante a sinistra per "
 "aggiornare la lista dei server conosciuti"
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
-msgstr "Aggiungi server manualmente: Nome"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Inserisci qui il nome di un nuovo server"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Porta"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Inserisci qui l'IP del server, nel formato x.x.x.x"
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Inserisci qui la porta del server"
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Aggiungi server (riempi campi a sinistra)..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Log di aMule"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Informazioni server"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "Informazioni ed2k"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Informazioni Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 "Clicca su questo pulsante per aggiornare la lista dei nodi da un URL..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nodi (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5863,51 +3958,58 @@
 "Inserisci l'URL di un file nodes.dat e premi il pulsante a sinistra per "
 "aggiornare la lista dei nodi conosciuti."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Statistiche nodi"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Bootstrap"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Nuovo nodo"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+#, fuzzy
+msgid "Bootstrap from known clients"
 msgstr ""
 "Bootstrap da\n"
 "client noti"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Disconnetti rete Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "Info eD2k"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Utilizza la Secure User Identification"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"E' raccomandato abilitare questa opzione. Non riceverai crediti se la SUI "
+"non è abilitata."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Offuscamento del Protocollo"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Supporta Offuscamento del Protocollo"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5915,11 +4017,11 @@
 "Questa opzione abilita l'Offuscamento del Protocollo, e fa si che aMule "
 "accetti connessioni offuscate dagli altri client."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Utilizza offuscamento per le connessioni in uscita"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5927,11 +4029,11 @@
 "Questa opzione fa si che aMule utilizzi l'offuscamento del protocollo quando "
 "si collega ad altri client/server."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Accetta SOLO connessioni offuscate"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5939,82 +4041,78 @@
 "Attivando questa opzione aMule accettera' solo connessioni offuscate. Avrai "
 "meno fonti, ma tutto il tuo traffico sara' offuscato"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Opzioni file"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Chiunque"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
-msgstr "Nessuno"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Chi puo' vedere i file condivisi:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr ""
 "Seleziona chi puo' richiedere di vedere la lista dei tuoi file condivisi"
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Filtraggio IP"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtra i client"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Filtra i client in base agli ip contenuti in ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtra i server"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "Filtra i server in base agli ip contenuti in ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Ricarica lista"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Ricarica lista degli IP da filtrare dal file ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Aggiorna ora"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Aggiorna ipfilter all'avvio"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Livello filtraggio:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Filtra sempre gli IP di una LAN"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Gestione paranoica degli IP 'non-matching'"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6022,11 +4120,11 @@
 "Rifiuta pacchetto se l'IP del Client e' diverso dall'IP da cui arriva il "
 "pacchetto. Utilizzare con cautela."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Utilizza il file ipfilter.dat di sistema se disponibile"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -6034,23 +4132,11 @@
 "Se non esiste un file ipfilter.dat locale, consenti utilizzo di un file "
 "ipfilter.dat di sistema"
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Utilizza la Secure User Identification"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"E' raccomandato abilitare questa opzione. Non riceverai crediti se la SUI "
-"non e' abilitata."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Abilita firma online"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6058,1215 +4144,3706 @@
 "Abilita la scrittura del file OS che puo' essere usato da applicazioni "
 "esterne per creare firme e simili"
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Frequenza di aggiornamento (secondi):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 "Cambia la frequenza (in secondi) degli aggiornamenti della firma online"
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Directory firma online:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "Clicca qui per selezionare la directory che contiene i file di firma online"
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Disabilita/Abilita"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtra messaggi in arrivo (tranne per la chat in corso):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Opzioni filtro:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtra tutti i messaggi"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtra i messaggi da utenti che non sono nella tua lista degli amici"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtra i messaggi da client sconosciuti"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtra i messaggi che contengono (usa ',' come separatore):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "aggiungi qui le parole che aMule filtrera' rimuovendo i messaggi che le "
 "contengono"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Commenti"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtra i commenti contenenti (usa ',' come separatore):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Connessione automatica al server senza proxy"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Abilita autenticazione"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Abilita o disabilita l'autenticazione con username e password"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr ""
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Username utilizzato per la connessione al proxy"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Password:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "La password usata per la connessione al proxy"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Abilita proxy"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Abilita o disabilita il supporto proxy"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Tipo proxy:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Il tipo di proxy a cui ti stai connettendo"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Indirizzo proxy:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Il nome host del proxy"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Porta proxy:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "La porta del proxy"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Autenticazione"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Abilita autenticazione"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Abilita o disabilita l'autenticazione con username e password"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Username utilizzato per la connessione al proxy"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Password:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "La password usata per la connessione al proxy"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Connessione automatica al server senza proxy"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Connetti a:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Login su aMule remoto"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Nome utente"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Ricorda impostazioni"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Abilita il log dettagliato dei messaggi di debug"
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Categorie messaggi:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "In attesa..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Aggiunge importazioni"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Riprova selezionati"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Rimuvi selezionati"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Tipi di Eventi"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Upload attivi:"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Non mostrare file condivisi"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Seleziona filtro di visualizzazione"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Upload attivi"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Mostra client"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Ricarica lista"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Ricarica file condivisi"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Invia"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Invia messaggio specificato"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Chiude questa sessione di chat"
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Connetti a qualsiasi server e/o a Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Finestra reti"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "File condivisi"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Finestra ricerche"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Disabilitato [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Finestra trasferimenti"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Finestra file condivisi"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Finestra messaggi"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Finestra grafici e statistiche"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Finestra Impostazione preferenze"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nuova categoria"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Scegli una directory per i file scaricati"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Devi specificare un nome per la categoria!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/s"
+msgstr[1] "bytes/s"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Devi specificare un percorso per la categoria!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "sec"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "min"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "ore"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "giorni"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "tutti"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "tutti gli altri"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Incompleti"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Fermo"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Video"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Archivi"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Testo"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Attivo"
+
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
 msgstr ""
-"Impossibile creare una directory per i file in ingresso per questa "
-"categoria. Specifica un percorso valido!"
 
-#: src/ExternalConnector.cpp:141
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Estensione '%s' sconosciuta per il comando '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Importazione %s: %s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Lettura directory dei file temporanei"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Recupero informazioni di base dal file info del download"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Creazione file di destinazione"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Comando sconosciuto '%s'.\n"
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Caricamento dati da vecchio file in download (%u su %u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Salvataggio blocchi di dati in un singolo file (%u su %u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Recupero informazioni fonti e file in download in corso"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Aggiunta download e salvataggio nuovo partfile in corso"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Importa partfile"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Stato"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Filehash"
 
-#: src/ExternalConnector.cpp:155
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Disco: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command cannot have an argument.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Questo comando non puo' avere un argomento.\n"
+"Scegli una directory in cui cercare download temporanei! (le sottodirectory "
+"saranno incluse)"
 
-#: src/ExternalConnector.cpp:157
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"This command must have an argument.\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Questo comando richiede un argomento.\n"
+"Vuoi che le fonti per i download importati con successo siano cancellate?"
 
-#: src/ExternalConnector.cpp:160
-msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Rimuovi fonti?"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "ERRORE: impossibile creare il file .part)"
+
+#: src/PartFile.cpp:336
+#, c-format
+msgid "Trying to load backup of met-file from %s"
+msgstr "Caricamento del backup del file met da %s"
+
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
-"\n"
-"Questo comando e' incompleto, devi usare una delle estensioni qui "
-"riportate.\n"
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
-"\n"
-"Estensioni disponibili:\n"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Comandi disponibili:\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr ""
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr ""
+"ERRORE: %s (%s) e' corrotto (tagcount non corretto), impossibile caricare il "
+"file."
+
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Tutti i comandi possono essere digitati in maiuscolo o minuscolo.\n"
-"Digitare '%s <comando>' per avere informazioni dettagliate su <comando>.\n"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Esce dall'applicazione."
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Tentativo di recupero informazioni sul file..."
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Mostra aiuto."
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr ""
+"Recupero file senza nome - tentativo di recupero come RecoveredFile.dat"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
-"Per avere aiuto su un comando, digitare 'help <comando>'.\n"
-"Per avere la lista completa dei comandi, digitare 'help'.\n"
+"Recuperate tutte le informazioni disponibili :D - Tentativo di utilizzo in "
+"corso..."
+
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Impossibile recuperare le informazioni sul file :("
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:665
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "Failed to open %s (%s)"
+msgstr "Impossibile aprire %s (%s)"
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
-"\n"
-"Usa '%s' per la lista dei comandi\n"
-"\n"
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Errore di sintassi!"
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "Errore durante il salvataggio del file incompleto: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr ""
-"Errore nell'eseguire il comando - cio' non dovrebbe mai accadere! Per "
-"favore, segnala il bug\n"
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "Errore durante il salvataggio del file incompleto: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Questo comando non deve avere parametri."
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Non posso ottenere la lunghezza di '%s' - sto usando il file %s"
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Questo comando richiede un parametro."
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' e' per qualche motivo di dimensione 0 - uso il file %s"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Argomento non valido."
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Impossibile salvare il file part.met.seeds per %s"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Questo comando e' incompleto."
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Salvata %i fonte per il file incompleto: %s (%s)"
+msgstr[1] "Salvate %i fonti per il file incompleto: %s (%s)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:1049
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Digita '%s' per avere altro aiuto.\n"
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Il file incompleto %s (%s) non ha file seeds"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:1058
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Questo e' %s %s %s\n"
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Il file incompleto %s (%s) ha un file delle fonti vuoto"
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:1114
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Questo e' %s %s\n"
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Errore nella lettura del file delle fonti del partfile (%s - %s): %s"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Trovata parte corrotta (%d) in %d parte %s - FileResultHash |%s| FileHash |%"
+"s|"
+msgstr[1] ""
+"Trovata parte corrotta (%d) in %d parti %s - FileResultHash |%s| FileHash |%"
+"s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Trovata parte completata (%i) in %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Nuovo hashing completato %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
-"\n"
-"Creazione del client in corso...\n"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Download completato: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Cancellazione file: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr ""
+
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Ok, uscita in corso da %s...\n"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Non posso connettermi con una password vuota.\n"
-"Devi specificare una password nel file di configurazione oppure\n"
-"nella linea di comando, o inserirne una quando richiesto.\n"
-"\n"
-"Sto uscendo...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Mostra questo suggerimento"
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr ""
+"ATTENZIONE: non c'e' abbastanza spazio libero su disco! Metto in pausa il "
+"file: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Host su cui aMule e' in esecuzione (default: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "La parte di file scaricata %i e' corrotta in: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Porta di aMule per le connessioni esterne (default: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: recuperata parte corrotta %i in %s -> risparmiati byte: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Password connessioni esterne"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr ""
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Leggi la configurazione da file"
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr ""
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Non stampare output sullo stdout"
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Scaricato"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Verboso - mostra anche i messaggi di debug"
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr ""
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Imposta la localizzazione (lingua) del programma"
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Predefinita di sistema"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Salva le opzioni linea di comando nel file di configurazione"
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albanese"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Crea un file di configurazione basato su quello di aMule"
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabo"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Mostra la versione del programma"
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "Estone"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Basco"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgaro"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Catalano"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Cinese (semplificato)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Cinese (tradizionale)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Croato"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Ceco"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Danese"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Olandese"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Inglese (U.K.)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estone"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finlandese"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Francese"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galiziano"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Tedesco"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Greco"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Ebraico"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Ungherese"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italiano"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italiano (Svizzera)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Giapponese"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Coreano"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvegese"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polacco"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portoghese"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portoghese (brasiliano)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Russo"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Sloveno"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Spagnolo"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Svedese"
 
-#: src/ClientCreditsList.cpp:168
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turco"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr ""
+
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Lingua"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
+
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "Non disponibile"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr ""
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
+"La porta TCP non puo' essere superiore a 65532 perche' il socket UDP e' "
+"fissato a TCP+3"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Il file dei crediti e' stato caricato, %u client conosciuto"
-msgstr[1] "Il file dei crediti e' stato caricato, %u client conosciuti"
+msgid "Default port will be used (%d)"
+msgstr "Verra' usata la porta di default (%d)"
 
-#: src/ClientCreditsList.cpp:171
+#: src/Preferences.cpp:1790
 #, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Crediti scaduti per %u client!"
-msgstr[1] " - Crediti scaduti per %u clients!"
+msgid "Dropping non-existing shared directory: %s"
+msgstr ""
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Connessione"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Directory"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Server"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "File"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Sicurezza"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
 msgstr ""
-"Non e' stato trovato il file 'cryptkey.dat', creazione del file in corso."
 
-#: src/amuled.cpp:594
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Controlli remoti"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Firma Online"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Eventi"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Debug"
+
+#: src/PrefsUnifiedDlg.cpp:249
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
-"ERRORE: il demone di aMule non puo' essere usato se le connessioni esterne "
-"sono disattivate. Per abilitare le connessioni esterne, puoi usare un aMule "
-"normale, far partire amuled con l'opzione --ec-config o impostare la voce "
-"\"AcceptExternalConnections\" a 1 nel file ~/.aMule/amule.conf"
 
-#: src/amuled.cpp:750
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Non modificate queste impostazioni se non sapete\n"
+"esattamente cosa state facendo: potreste ottenere\n"
+"effetti indesiderati.\n"
+"\n"
+"aMule funzionera' anche senza modificare questi parametri."
+
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "ERROR: %s"
-msgstr "ERRORE: %s"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Rimuovi ban"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Mostra upload"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Mostra coda"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Mostra client"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Il tipo di proxy a cui ti stai connettendo"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Seleziona visuale"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Software client"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Atteso"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Tempo upload"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Upload/Download"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Stato remoto"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Priorita' file"
-
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Punteggio"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Richiesto"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"aMule deve essere riavviato per rendere effettive queste modifiche:\n"
+"\n"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Ultima volta visto"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Aggiunto in coda"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- Modifica della porta TCP.\n"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Stato upload"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- Modifica della porta UDP.\n"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Inviati"
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Connessione esterna chiusa"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Stato download"
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Accettata nuova connessione esterna"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Ricevuti"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Hash utente"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Crittato"
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Connessione esterna chiusa"
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Non mostrare file condivisi"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Dettagli client"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Hai abilitato le connessioni esterne senza pero' specificare una password.\n"
+"Le connessioni esterne non possono essere abilitate a meno che tu non scelga "
+"una password valida"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Abilitato"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Modifica della lingua.\n"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Supportato"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Modifica della cartella Temp.\n"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Non supportato"
+#: src/PrefsUnifiedDlg.cpp:652
+#, fuzzy
+msgid "- ED2K network enabled.\n"
+msgstr "Tutte le reti sono disabilitate."
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Disabilitato"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Le reti eD2k e Kad sono entrambe disabilitate.\n"
+"Non potrai connetterti finché non ne abiliterai almeno una."
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad non puo' partire se la porta UDP e' disabilitata.\n"
+"Abilitala o disabilita Kad."
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Non completo"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"DEVI riavviare aMule ADESSO.\n"
+"Se non lo fai, non lamentarti se succede qualcosa di brutto.\n"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Cattivo"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"La tua lista di aggiornamento automatico dei server e' vuota.\n"
+"Inserisci l'URL di almeno un server valido nel file server.met.\n"
+"Clicca sul pulsante \"Lista\" per inserire l'URL"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Verificata - OK"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "File temporanei"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Non disponibile"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "File completi"
 
-#: src/ClientDetailDialog.cpp:215
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Firme online"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+msgid "Choose a folder for %s"
+msgstr "Scegli una directory per i %s"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr "Min size deve essere piu' piccola di max size. Ignoro max size."
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Sfoglia per trovare un riproduttore video"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Search warning"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Scegli browser"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Illimitato"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "Eseguibile%s"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Menu nel systray"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Modifica la lista dei server"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Limiti di velocita':"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Inserisci l'URL da cui scaricare il file server.met.\n"
+"Solo un URL per riga"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "UL: nessuno"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Intervallo aggiornamento: %d secondo"
+msgstr[1] "Intervallo aggiornamento: %d secondi"
 
-#: src/MuleTrayIcon.cpp:354
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "UL: %u"
-msgstr "UL: %u"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Intervallo grafico della media: %d minuto"
+msgstr[1] "Intervallo grafico della media: %d minuti"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DL: nessuno"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Scala grafico delle connessioni: %d"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "DL: %u"
-msgstr "DL: %u"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Dimensione buffer file: %d byte"
+msgstr[1] "Dimensione buffer file: %d bytes"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Velocita' Download: %.1f"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Dimensione coda upload: %d client"
+msgstr[1] "Dimensione coda upload: %d clients"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Velocita' Upload: %.1f"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Intervallo aggiornamento connessione ai server: %d minuto"
+msgstr[1] "Intervallo aggiornamento connessione ai server: %d minuti"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Informazioni client"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Intervallo aggiornamento connessione ai server: disabilitato"
 
-#: src/MuleTrayIcon.cpp:380
-#, c-format
-msgid "Nickname: %s"
-msgstr "Nickname: %s"
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "disabilita"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Nessun nickname selezionato!"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "Esegui comando se si verifica l'evento '%s'"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID Client: "
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Abilita l'esecuzione del comando sul core"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Nome server: "
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Comando Core:"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP server: "
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Abilita l'esecuzione del comando sulla GUI"
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Comando GUI:"
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
-msgstr "Porta TCP: %d"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Le seguenti variabili saranno sostituite:"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "Porta TCP: Non pronta"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr "Min size deve essere piu' piccola di max size. Ignoro max size."
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
-msgstr "Porta UDP: %d"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Search warning"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "Porta UDP: Non pronta"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Principale"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Firma online: abilitata"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr ""
+"Impossibile effettuare una ricerca sulla rete Kad senza esserci connessi"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Firma online: disabilitata"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
-msgstr "File condivisi: %d"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Errore imprevisto durante la ricerca su Kad: "
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
-msgstr "Clients in coda: %d"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "ID File"
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
-msgstr "DL totale: %s"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "File"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Download nella categoria"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Aggiungi URL per questo file"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr ""
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Segna come file conosciuto"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Copia il link eD2k negli appunti"
+
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Annulla"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr ""
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Impossibile collegarsi ai server con offuscamento di protocollo. Ci riprovo "
+"senza offuscamento."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"Impossibile connettersi a tutti i server in lista. Procedo con un altro "
+"tentativo"
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:483
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "UL totale: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Connesso a %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Limite upload"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Connessione stabilita con: %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Limite Download"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Errore fatale durante il tentativo di connessione. La connessione a internet "
+"potrebbe non essere attiva"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Nascondi"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Persa connessione a %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Mostra"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) sembra essere morto"
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Sessione di chat iniziata: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) sembra essere pieno"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Connesso al client ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Riconnessione automatica al server tra %d secondo"
+msgstr[1] "Riconnessione automatica al server tra %d secondi"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Connessione al client in corso ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Connessione persa"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Impossibile connettersi al client / Connessione persa ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Connessione a %s (%s:%i) fallita"
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Chiudi tab"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr ""
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Chiudi tutti i tab"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Connessione a %s (%s:%i) fallita per time-out"
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Chiudi altri tab"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr ""
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Caricamento file server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "File server.met non trovato!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Impossibile caricare il file server.met '%s', trovato formato sconosciuto."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Impossibile aprire il file server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Server.met corrotto, trovato tag di versione non valido: 0x%x, dimensione %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "Trovato %i server nel file server.met"
 msgstr[1] "Trovati %i servers nel file server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "Aggiunto %d server"
 msgstr[1] "Aggiunti %d servers"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "Errore IO durante la lettura del file known.met: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Server non aggiunto: [%s:%d] non specifica una porta valida"
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Server non aggiunto: l'IP di [%s:%d] e' filtrato o non valido"
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Server non aggiunto: server con corrispondente IP:Porta [%s:%d] trovato "
 "nella lista"
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Server aggiunto: server [%s:%d] con il nome '%s'"
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr "Sei connesso al server che vuoi cancellare. Disconnettiti prima"
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Impossibile aprire '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Impossibile salvare il file server.met!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "URL non valido"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
 msgstr "Completato scaricamento lista server da %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Impossibile scaricare la lista dei server da %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
 msgstr ""
-"Nessun indirizzo di una lista server nel file 'addresses.dat'. Copia un "
-"indirizzo di una lista server in questo file per poter aggiornare "
-"automaticamente la lista"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Iniziato scaricamento lista server da %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
-"ATTENZIONE: URL non valido specificato per l'aggiornamento dei servers: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Nessun URL di file server.met valido in addresses.dat"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Impossibile scaricare la lista dei server da %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr ""
 "Il server locale e' filtrato da IPFilter, mi connetto ad un altro server!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Impossibile eseguire il comando `%s' per l'evento `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Nome server"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Indirizzo"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Porta"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Descrizione"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Utenti"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Statico"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versione"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Le tue impostazioni di localizzazione sono state impostate a quelle "
-"predefinite dal sistema in conseguenza al cambio di configurazione. "
-"Spiacente."
+"Sei connesso al server che stai cercando di cancellare. Disconnettiti prima. "
+"Il server NON e' stato cancellato"
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(nome sconosciuto)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Sei sicuro di voler cancellare il server statico %s?"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Server (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Server"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Connesso al server"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Marca il server come statico"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Marca il server come non statico"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Marca i servers come statici"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Marca i servers come non statici"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Rimuovi server"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Rimuovi servers"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Elimina tutti i server"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Copia i link eD2k negli appunti"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Riconnetti al server"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Sei sicuro di voler cancellare tutti i server?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Sei sicuro di voler cancellare il server selezionato?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Sei sicuro di voler cancellare i server selezionati?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
-"Non hai alcun server nella lista dei server.\n"
-"Vuoi che aMule scarichi una lista ora?"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Server list download"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr ""
 
-#: src/amule.cpp:846
+#: src/ServerSocket.cpp:413
 #, c-format
-msgid "web server running on pid %d"
-msgstr "Server web in esecuzione con pid %d"
+msgid "New clientid is %u"
+msgstr "Il nuovo clientID e' %u"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "ATTENZIONE: Hai ricevuto un ID Basso!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tProbabilmente perche' il tuo pc e' dietro un firewall o router."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tPer altre informazioni visita http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Ricevute informazioni sconosciute dal server! - troppo corto"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Ricevuto %d nuovo server"
+msgstr[1] "Ricevuti %d nuovi servers"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Salvataggio della lista dei server completato"
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Il server ha rifiutato l'ultimo comando"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Pacchetto bogus ricevuto dal server: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Errore non gestito durante l'elaborazione del pacchetto dal server: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
-"Hai richiesto di eseguire il server web all'avvio, ma amuleweb non puo' "
-"essere eseguito. Per favore installa il pacchetto contenente il server web "
-"di aMule, o compila aMule usando --enable-webserver ed esegui make install"
+"Non e' possibile creare un thread per risolvere il DNS per connettersi a %s"
 
-#: src/amule.cpp:937
+#: src/ServerSocket.cpp:725
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Impossibile associare porte all'indirizzo specificato: %s"
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "L'ip del server %s (%s) e' filtrato. Connessione bloccata."
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "utilizzo offuscamento del protocollo."
+
+#: src/ServerSocket.cpp:744
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "La porta %u non e' disponibile. Otterrai un LowID\n"
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Connessione a %s (%s - %s:%i) %s"
 
-#: src/amule.cpp:970
+#: src/ServerSocket.cpp:757
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
-"La porta %u non e' disponibile!\n"
-"\n"
-"Otterrai un LowID\n"
-"\n"
-"Controlla le impostazioni di rete e verifica che la porta sia aperta in "
-"ingresso e in uscita."
+"Non e' possibile risolvere il DNS per il server %s: impossibile connettersi!"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Impossibile creare il file per la firma online"
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Server non aggiunto: non e' stato specificato l'IP o il nome dell'host"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Impossibile creare il file per la firma online di aMule"
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Server non aggiunto: porta del server specificata non valida"
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
 msgstr ""
-"L'impostazione locale selezionata non sembra essere installata sul tuo "
-"computer (si tentera' ad impostarla in ogni caso)"
 
-#: src/amule.cpp:1308
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Stato Kademlia:"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "In esecuzione su %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Attivo"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Stato:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Stato connessione:"
+
+#: src/ServerWnd.cpp:214
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "e' la prima che volta che avvii aMule %s"
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr ""
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Questa e' una versione di prova, aggiornata quotidianamente, e\n"
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "Stato connessione:"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "non garantiamo che essa non distrugga qualcosa, bruci la tua casa,\n"
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr ""
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "o uccida il tuo cane. Ma *dovrebbe* essere comunque sicura.\n"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Stato firewalled: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr ""
 
-#: src/amule.cpp:1316
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Nessun amico"
+
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "Connesso all'amico"
+
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "Connesso all'amico"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "Mantieni fonti"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr ""
+
+#: src/ServerWnd.cpp:254
+#, fuzzy
+msgid "Indexed notes:"
+msgstr "File indice non trovato: "
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr ""
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Utenti medi:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "File medi:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Non attivo"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr ""
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Trovato %i file condiviso conosciuto"
+msgstr[1] "Trovati %i files condivisi conosciuti"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Trovato %i file condiviso conosciuto, %i sconosciuto"
+msgstr[1] "Trovati %i files condivisi conosciuti, %i sconosciuti"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr ""
+
+#: src/SharedFileList.cpp:410
+#, fuzzy, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "server non trovato: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Nome utente"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Velocita' download"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Velocita' upload"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Disponibili:"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Stato upload"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Stato download"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Nome file"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "File condivisi"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Richieste"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Richieste accettate"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Dati trasferiti"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Percentuale Condivisione"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Parti ricevute"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Fonti complete"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Percorso directory"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Aggiungi commento/giudizio"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Modifica commento/giudizio"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Rinomina"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Aggiungi i files della collection alla lista dei trasferimenti"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Copia &URI magnet negli appunti"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Copia il link eD2k negli appunti (&Sorgente)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr ""
+"Copia il link eD2k negli appunti (Sorgente) (&Con opzioni di crittatura)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Copia il link eD2k negli appunti (&Nome host)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+"Copia il link eD2k negli appunti (Nome host) (Con &opzioni di crittatura)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Copia il link eD2k negli appunti (informazioni &AICH)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Hai bisogno di un HighID per creare un sourcelink valido"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "File condivisi (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "File in download"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Nome file"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Dati inviati (sessione (totale)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Overhead totale (pacchetti): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Overhead per richieste file (pacchetti): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Overhead per scambio fonti (pacchetti): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Overhead server (pacchetti): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Overhead Kad (pacchetti): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr ""
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Upload attivi: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Upload in attesa: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Totale sessioni di upload riuscite: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Totale sessioni di upload fallite: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Tempo upload medio: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Dati scaricati (sessione (totale)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Fonti trovate: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Download attivi (parti): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Rapporto UL:DL sessione (totale): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Riconnessioni: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Tempo dal primo trasferimento: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Connesso al server da: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Connessioni attive (stima): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Limite massimo connessioni raggiunto: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Connessioni medie (stima): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Picco connessioni (stima): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Client"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "Dimensione sconosciuta"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "Filtrati"
+
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "Bannati"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Totale: %i Conosciuti: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Server attivi: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Server falliti: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Totale: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Server rimossi: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Server filtrati: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Utenti su server attivi: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "File su server attivi: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Utenti totali: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "File totali: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Occupazione server: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Numero di file condivisi: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Dimensione totale file condivisi: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr ""
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Sistema operativo"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Non ricevuto"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Connessioni attive (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Non disponibile"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Mai"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Il programma `%s' con pid `%d' e' terminato uscendo con status `%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Esegui <str> e esci"
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Formato IP non valido. Usa xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Le seguenti opzioni sono state modificate in questa release per motivi di "
-"sicurezza:\n"
+"Questo comando necessita di un argomento. Argomenti validi: 'all', nome del "
+"file oppure un numero.\n"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Elaborazione in base all'hash:"
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Elaborazione in base al nome del file:"
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr ""
+"Questo comando necessita di un argomento. Argomenti validi: l'hash di un "
+"file.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Non e' un numero valido\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Non e' un hash valido (la lunghezza deve essere di 32 caratteri)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Richiesta fallita con errore sconosciuto"
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Operazione conclusa con successo"
+
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
+msgstr "Richiesta fallita con il seguente errore: %s"
+
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Filtraggio IP per i client: %s.\n"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "OFF"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "ON"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Filtraggio IP per i server: %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Il livello IPFilter attuale e' %d\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr ""
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr ""
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Connesso a %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Connessione in corso"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "firewalled"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Download:\t%s"
 msgstr ""
 "\n"
-"* Attiva Offuscamento del Protocollo per connessioni in ingresso e in "
-"uscita.\n"
+"Download:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Disattivato l'aggiornamento automatico della serverlist dagli altri client "
-"e server.\n"
+"Upload:\t%s"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"Per ulteriori informazioni sui motivi di queste modifiche, vedere il\n"
-" wiki di aMule su http://wiki.amule.org alla voce \"fake servers\".\n"
-"E' importante eliminare tutti i fake server dalla tua lista perche' aMule "
-"funzioni correttamente."
+"Client in coda:\t%d\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
+"Total sources:\t%d\n"
+msgstr ""
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Fonti totali:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Totale risultati della ricerca: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
 msgstr ""
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Ricevuta risposta sconosciuta dal server, OpCode = %#x"
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Mostra informazione sullo stato."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr ""
+"Mostra stato connessione, velocita' di upload e download attuali, etc.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Mostra le statistiche complete."
+
+#: src/TextClient.cpp:854
+msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Opzionalmente, un numero compreso tra 0 e 255 puo' essere passato come "
+"argomento a questo\n"
+"comando, per indicare quante versioni mostrare nel sottoalbero dei client. 0 "
+"oppure\n"
+"nessun numero significa 'infinite'.\n"
+"Esempio: 'statistics 5' mostrera' solo le cinque versioni piu' diffuse per "
+"ogni tipo di client.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr ""
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+
+#: src/TextClient.cpp:859
+#, fuzzy
+msgid "Reload the given object."
+msgstr "Ricarica l'oggetto."
+
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
+msgstr "Ricarica la lista dei file condivisi."
+
+#: src/TextClient.cpp:862
+#, fuzzy
+msgid "Reload IP filtering table."
+msgstr "Ricarica il filtro IP da file."
+
+#: src/TextClient.cpp:863
+#, fuzzy
+msgid "Reload current IP filtering table."
+msgstr "Seleziona il livello del filtraggio degli IP."
+
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "Ricarica il filtro IP da file."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr ""
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Connessione al network."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Questo connettera' aMule a tutte le reti attualmente abilitate nelle "
+"Preferenze.\n"
+"E' anche possibile specificare l'indirizzo IP, nella forma IP:Porta, di un "
+"server e\n"
+"connettersi solamente a quello. Si puo' utilizzare un indirizzo IPv4 oppure\n"
+"un nome risolvibile da un server DNS."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr ""
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Connetti solo alla rete Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Disconnetti dalla rete."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Questo disconnettera' aMule da tutte le reti attive.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr ""
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Disconnetti solo dalla rete Kad."
+
+#: src/TextClient.cpp:877
+#, fuzzy
+msgid "Add an eD2k or magnet link to core."
+msgstr "Aggiungi un link ed2k o magnet al core."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
-"Inoltre, le impostazioni del browser sono state ripristinate alle "
-"predefinite di sistema. Per favore configura di nuovo le opzioni del tuo "
-"browser se necessario.\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Imposta un valore delle preferenze."
+
+#: src/TextClient.cpp:883
+#, fuzzy
+msgid "Set IP filtering preferences."
+msgstr "Imposta le preferenze del Filtro IP."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Attiva il filtro IP per client e server."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Disattiva il filtro IP per client e server."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Attiva/Disabilita il filtro IP per i client."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Attiva il filtro IP per i client."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Disattiva il filtro IP per i client."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Attiva/Disabilita il filtro IP per i server."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Attiva il filtro IP per i server."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Disabilita il filtro IP per i server."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Seleziona il livello del filtraggio degli IP."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Altre informazioni, supporto e nuove versioni possono essere trovate nella "
-"nostra homepage,\n"
+"I livelli di filtraggio validi vanno da 0 a 255 e il default (iniziale)\n"
+"e' 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "www.aMule.org, o nel nostro canale IRC #aMule su irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Imposta limiti di banda."
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Riportate ogni bug su http://forum.amule.org"
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr ""
+"Il valore fornito a questi comandi deve essere in kilobyte al secondo.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Imposta limiti di banda per l'upload."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Imposta limiti di banda per il download."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Visualizza un'impostazione delle preferenze."
+
+#: src/TextClient.cpp:905
+#, fuzzy
+msgid "Get IP filtering preferences."
+msgstr "Visualizza impostazioni Filtro IP."
+
+#: src/TextClient.cpp:906
+#, fuzzy
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Ottieni stato dell'IPFilter per client e server."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:907
+#, fuzzy
+msgid "Get IP filtering state for clients only."
+msgstr "Ottieni stato dell'IPFilter per i client."
+
+#: src/TextClient.cpp:908
+#, fuzzy
+msgid "Get IP filtering state for servers only."
+msgstr "Ottieni stato dell'IPFilter per i server."
+
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "Seleziona il livello del filtraggio degli IP."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Visualizza limita di banda."
+
+#: src/TextClient.cpp:913
+#, fuzzy
+msgid "Execute a search."
+msgstr "Effettua una ricerca su Kad"
+
+#: src/TextClient.cpp:914
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"La directory scelta per contenere il file di firma online e' invalida!\n"
-"La firma online verra' pertanto disabilitata fino a quando il problema non "
-"sara' stato risolto attraverso il pannello delle preferenze."
+"E' necessario specificare il TIPO della ricerca che puo' essere:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Esempio: 'search kad file' cerchera' \"file\" nella rete Kad.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:915
+#, fuzzy
+msgid "Execute a global search."
+msgstr "Effettua una ricerca globale."
+
+#: src/TextClient.cpp:916
+#, fuzzy
+msgid "Execute a local search"
+msgstr "Effettua una ricerca locale"
+
+#: src/TextClient.cpp:917
+#, fuzzy
+msgid "Execute a kad search"
+msgstr "Effettua una ricerca su Kad"
+
+#: src/TextClient.cpp:919
+#, fuzzy
+msgid "Show the results of the last search."
+msgstr "Mostra risultati dell'ultima ricerca."
+
+#: src/TextClient.cpp:920
+#, fuzzy
+msgid "Return the results of the previous search.\n"
+msgstr "Rende i risultati della ricerca precedente.\n"
+
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "Mostra il progresso della ricerca."
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "Mostra il progresso della ricerca.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Scarica un file"
+
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
+"Bisogna fornire il numero del file relativo all'ultima ricerca.\n"
+"Esempio: 'download 12' aggiungera' alla coda dei download il file col numero "
+"12 trovato dall'ultima ricerca.\n"
+
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Metti il download in pausa."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Riavvia download."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Cancella download."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Imposta priorita' del download."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Imposta la priorita' del download a Bassa, Normale, Alta o Auto.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Imposta priorita' del download.a Bassa."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Imposta priorita' del download.a Normale."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Imposta priorita' del download.a Alta."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Imposta priorita' del download.a Auto."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Mostra code/liste."
+
+#: src/TextClient.cpp:950
+#, fuzzy
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Mostra la coda di upload/download, la lista dei server o la lista dei file "
+"condivisi.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Mostra la coda di upload."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Mostra la coda di download."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Mostra log."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Mostra la lista dei server."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Cancella log."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Preallocazione spazio su disco per il file '%s' fallita: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr ""
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "ERRORE: non posso aprire il file di log"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Questo è un comando deprecato, e potrebbe essere rimosso in futuro.\n"
+"Usa '%s' al suo posto.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "ERRORE: il file di log e' vuoto. Qualcosa non va"
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Client testuale aMule"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Il file di log e' stato cancellato"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Conversione dei vecchi hashset AICH in '%s' a 64b: '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Messaggio del server: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr ""
+"ATTENZIONE: '%s' non e' un nome di file valido ed e' stato rinominato in '%"
+"s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Impossibile scaricare la lista dei nodi."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "ATTENZIONE: Esiste gia' un file col nome '%s', rinomino in '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Impossibile aprire il file per il controllo della versione scaricato"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Sei sicuro di voler interrompere e rimuovere tutti i file contenuti in "
+"questa categoria?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "File per il controllo della versione corrotto"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Conferma richiesta"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Stai usando una versione non aggiornata di aMule!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
+
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Troppe connessioni"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Tutto il resto"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Seleziona filtro di visualizzazione"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Aggiungi categoria"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Modifica categoria"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Elimina categoria"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "La tua versione di aMule e' la %i.%i.%i e l'ultima e' la %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+"Impossibile aprire il file (%s), rimosso dalla lista dei file condivisi."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "L'ultima versione e' sempre disponibile su http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Hashset richiesto per il file sconosciuto: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Ripristino upload del file: %s"
+
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Sospensione upload del file: %s"
+
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Impossibile eseguire il comando `%s' per l'evento `%s'."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Download completato"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Il percorso completo del file."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Il nome del file senza la parte del percorso."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "L'hash eD2k del file."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "La dimensione del file in bytes."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Tempo cumulativo di download."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Nuova sessione di chat iniziata"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Mittente del messaggio."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Spazio esaurito"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Partizione disco."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Errore nel completamento"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
+msgstr "Elaborazione del file numero %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Hai richiesto l'hash delle parti (solo per file > 9.5 MB)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
+#, c-format
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> File inesistente!\n"
+
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, il creatore di link eD2k di aMule"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Benvenuto!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Parametri di ingresso"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "File da esaminare"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Aggiungi URL per questo file"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Inserisci il file del quale calcolare il link eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
-"ATTENZIONE: La tua versione di aMuled e' obsoleta: %i.%i.%i < %li.%li.%li"
+"Inserisci qui l'URL che vuoi aggiungere al link eD2k: Aggiungi / alla fine "
+"per fare in modo che aLinkCreator aggiunga il nome del file corrente"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "La tua copia di aMule e' aggiornata"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Rimuovi"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Impossibile scaricare il file per il controllo della versione"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Crea link con hash delle parti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Aiuta a diffondere piu' in fretta i file nuovi e rari, al costo di una "
+"connessione piu' lunga"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Hash MD4"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "Hash eD2k del file"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "link eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Salva"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Copia negli appunti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Apri un file per calcolarne il link eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Copia il link eD2k calcolato negli appunti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Salva il link eD2k calcolato in un file"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Informazioni su aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Seleziona il file del quale calcolare il link eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Non c'e' niente da copiare per ora!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Seleziona il file del tuo link eD2k calcolato"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Impossibile aprire "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Inserire un nome file non vuoto"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Non c'e' niente da salvare per ora!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, il creatore di link eD2k di aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps da http://www.everaldo.com e http://www.icomania.com\n"
+"e http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distribuito sotto licenza GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Hashing..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr ""
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Annullato!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Utenti: %s | Files: %s"
+msgid "Done in %.2f s"
+msgstr "Eseguito in %.2f s"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Hai gia' aggiunto questo URL!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Inserire un URL non vuoto"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Utenti: E: %s K: %s | Files: E: %s K: %s"
+msgid "Unable to open %s"
+msgstr "Impossibile aprire %s"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Nessuna rete selezionata"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i giorno(i) %i ora(e) %i minuto(i) %i s"
 
-#: src/amule.cpp:2102
+#: src/utils/wxCas/src/onlinesig.cpp:234
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Connesso a %s %s"
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uG %02uore %02umin %02usec"
 
-#: src/amule.cpp:2105
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "Connecting to %s"
-msgstr "Connessione in corso a %s"
+msgid "%02uh %02umin %02us"
+msgstr "%02uore %02umin %02usec"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Disconnesso da eD2k"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02usec"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad avviato."
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad arrestato."
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Connesso alla rete Kad (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Connesso alla rete Kad (firewalled)"
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Disconnesso dalla rete Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, statistiche online di aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Velocita' di DL massima da quando wxCas e' attivo"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Velocita' di DL massima nelle precedenti sessioni di wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistema"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Ferma aggiornamento automatico"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Salva immagine statistiche online"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Stampa immagine statistiche online"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Preferenze"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Informazioni su wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Avvia aggiornamento automatico"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Aggiornamento automatico fermato"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Aggiornamento automatico avviato"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Salva immagine statistiche"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Statistiche online aMule"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"La rete Kad non puo' essere utilizzata se la porta UDP e' disattivata dalle "
-"opzioni."
+"C'e' stato un problema durante la stampa.\n"
+"La stampante potrebbe non essere impostata correttamente?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Rete Kad disattivata dalle opzioni, non mi connetto."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Stampa in corso"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Fallimento apertura file lista amici 'emfriends.met' in lettura!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, Firma Online Statistiche aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Basato su CAS di Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distribuito con licenza GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Fallimento apertura file lista amici 'emfriends.met' in scrittura!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh Oh, aMule non e' in esecuzione..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule e' in funzione"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule e' in esecuzione, ma e' disconnesso"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule si sta connettendo..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh oh, stato di aMule sconosciuto..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr "e' stato in funzione per "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " e' fermo !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " non e' connesso !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " si sta connettendo..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " sta facendo qualcosa di strano, controllare!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " e' connesso a "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "off"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " e' attivo "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr "con "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Download totale: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Upload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Download sessione: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Download: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr "kB/s, Upload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Condivisione: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr "file, client in coda: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Tempo: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr "attivo "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Carico medio del sistema (1-5-15 min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Uptime del sistema: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Directory contenente il file amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Inserire la directory contentente il file amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Intervallo di aggiornamento in secondi"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Genera un'immagine delle statistiche ad ogni aggiornamento"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr ""
+"Inserire la directory nella quale generare l'immagine delle statistiche"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Carica periodicamente l'immagine delle statistiche sul server FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "URL FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Percorso FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Inserire URL del tuo server FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "Inserire la directory del server FTP nella quale copiare l'immagine"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Utente"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Inserire username per il login nel server FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Inserire password per il login nel server FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Intervallo di aggiornamento FTP in minuti"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Verifica"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Directory contenente il file di firma"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Directory nella quale generare l'immagine"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Carica modello <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Porta HTTP del server web"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Usa istradamento UPnP sulla porta del server web"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Porta UPnP"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Usa compressione gzip"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Password per accesso totale al server web"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Password ospite del server web"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Permetti l'accesso guest"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Vieta l'accesso guest"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Carica/salva le impostazioni del server web da/su aMule remoto"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Percorso del file di configurazione di aMule. Non usare direttamente!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Disabilita interprete PHP (deprecato)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Ricompila pagine PHP ad ogni richiesta"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule Web Server"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "connessione web client accettata\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Richiesta fallita per l'errore: %s"
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "File indice non trovato: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Sessione scaduta - login richiesto\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sessione valida, utente loggato\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sessione valida, utente loggato\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Nessuna sessione aperta - richiesta login\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Sessione creata - richiesta login\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Elaborazione richiesta [originale]:"
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Verifica password\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Hash della password non valido\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Password valida\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Password errata\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr ""
+"Non hai inserito alcuna password e le password vuote non sono ammesse.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Logout richiesto\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Elaborazione richiesta [rediretta]:"
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Albanese"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Stato download"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Intervallo aggiornamento: %d secondo"
+#~ msgstr[1] "Intervallo aggiornamento: %d secondi"
+
+#~ msgid "Transferring"
+#~ msgstr "Trasferimento"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "QR: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "In coda"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - visualizzare il progresso della ricerca"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Creo gli hash MD4 e AICH del file %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Creo l'hash MD4 del file %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Creo l'hash AICH del file %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "ATTENZIONE: non e' possibile rimuovere l'originale '%s' dopo aver creato "
+#~ "il backup"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "ATTENZIONE: impossibile cancellare %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid ""
+#~ "You cannot connect to a release version from an arbitrary SVN version! "
+#~ "*sigh* possible crash prevented"
+#~ msgstr ""
+#~ "Non puoi collegarti ad una versione ufficiale usando una versione SVN "
+#~ "arbitraria! *sigh* prevenuto possibile crash"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Giudizio (totale):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Cerca di trasferire parti complete per ogni upload"
+
+#~ msgid "Networks window"
+#~ msgstr "Finestra Reti"
+
+#~ msgid "Searches window"
+#~ msgstr "Finestra Ricerche"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Download in corso"
+
+#~ msgid "Shared files window"
+#~ msgstr "Finestra files condivisi"
+
+#~ msgid "Messages window"
+#~ msgstr "Finestra Messaggi"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Finestra Statistiche"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Finestra Impostazioni"
+
+#~ msgid "Transfers"
+#~ msgstr "Trasferimenti"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Finestra Trasferimenti"
+
+#~ msgid "Unban"
+#~ msgstr "Rimuovi ban"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Mostra upload"
+
+#~ msgid "Show Queue"
+#~ msgstr "Mostra coda"
+
+#~ msgid "Select View"
+#~ msgstr "Seleziona visuale"
+
+#~ msgid "Client Software"
+#~ msgstr "Software client"
+
+#~ msgid "Waited"
+#~ msgstr "Atteso"
+
+#~ msgid "Upload Time"
+#~ msgstr "Tempo upload"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Upload/Download"
+
+#~ msgid "Remote Status"
+#~ msgstr "Stato remoto"
+
+#~ msgid "File Priority"
+#~ msgstr "Priorita' file"
+
+#~ msgid "Score"
+#~ msgstr "Punteggio"
+
+#~ msgid "Asked"
+#~ msgstr "Richiesto"
+
+#~ msgid "Last Seen"
+#~ msgstr "Ultima volta visto"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Aggiunto in coda"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Inviati"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Ricevuti"
+
+#~ msgid "Userhash"
+#~ msgstr "Hash utente"
+
+#~ msgid "Encrypted"
+#~ msgstr "Crittato"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Mostra Upload / Coda Upload / Client"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Client in coda:"
+
+#~ msgid "Current Session"
+#~ msgstr "Sessione corrente"
+
+#~ msgid "Total"
+#~ msgstr "Totale"
+
+#~ msgid "Requested :"
+#~ msgstr "Richiesto:"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Finestra trasferimenti"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Utenti totali: %s | File totali: %s"
+
+#, fuzzy
+#~ msgid "HTTP download thread started"
+#~ msgstr "Thread di sincronizzazione avviato."
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Download (%i)"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr ""
+#~ "ATTENZIONE: non e' possibile rimuovere l'originale '%s' dopo aver creato "
+#~ "il backup"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr ""
+#~ "CIP2Country::CIP2Country(): Impossibile ottenere i dati sul Paese da "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Visualizza livello Filtro IP."
+
+#~ msgid "Makes a search."
+#~ msgstr "Effettua una ricerca."
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Fallito"
+
+#, fuzzy
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Lancia amuleweb all'avvio"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Chiudi aMule."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Le seguenti opzioni sono state modificate in questa release per motivi di "
+#~ "sicurezza:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Attiva Offuscamento del Protocollo per connessioni in ingresso e in "
+#~ "uscita.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Disattivato l'aggiornamento automatico della serverlist dagli altri "
+#~ "client e server.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Per ulteriori informazioni sui motivi di queste modifiche, vedere il\n"
+#~ " wiki di aMule su http://wiki.amule.org alla voce \"fake servers\".\n"
+#~ "E' importante eliminare tutti i fake server dalla tua lista perche' aMule "
+#~ "funzioni correttamente."
 
 #~ msgid "Fetching status..."
 #~ msgstr "Verifica status..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Utenti: E: %s K: %s | File E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Client %s con IP:Porta %s:%d utilizza %s %s %s"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() ha reso NULL"
 
+#~ msgid "Firewalled"
+#~ msgstr "Firewalled"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "Caricato %d flag bitmap."
+#~ msgstr[1] "Caricati %d flag bitmaps."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr ""
+#~ "Il file %s e' troppo grande per il network eDonkey: dimensione massima 4 "
+#~ "GB"
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Nessun gestore per questo tipo di file"
+
+#~ msgid "File was not saved"
+#~ msgstr "Il file non e' stato salvato"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr "Connessione fallita. Impossibile connettersi all'host specificato\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "Filtro messaggi"
 
@@ -7276,16 +7853,134 @@
 #~ msgid "Core Tweaks"
 #~ msgstr "Tweaks programma"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Nessun gestore per questo tipo di file"
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Ritardo dei popup in secondi"
 
-#~ msgid "File was not saved"
-#~ msgstr "Il file non e' stato salvato"
+#~ msgid "Show part file number before file name"
+#~ msgstr "Visualizza il numero del partfile prima del nome del file"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgid "Skin Support"
+#~ msgstr "Supporto skin"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- nessuna skin disponibile -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Directory firma online:"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Opzioni filtro:"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Capacita' linea"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
 #~ msgstr ""
-#~ "Il file %s e' troppo grande per il network eDonkey: dimensione massima 4 "
-#~ "GB"
+#~ "Nota: questi valori sono\n"
+#~ "usati solo nelle statistiche"
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Porta TCP standard del client:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Porta UDP avanzata del client:"
+
+#~ msgid "Bind Address"
+#~ msgstr "Bind Address"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "Porta UDP per le richieste estese del server (TCP+3): 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Fonti massime per file"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Universal Plug and Play"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "Attiva UPnP"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "Porta TCP per UPnP:"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Avvia un file in pausa quando un altro file e' stato completato"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Seleziona colori statistiche"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Avanzamento coda download"
+
+#~ msgid "Show percentage"
+#~ msgstr "Mostra percentuale"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Mostra barra di avanzamento"
+
+#~ msgid "Enable skin support "
+#~ msgstr "Abilita il supporto per le Skin"
+
+#~ msgid "Skin:"
+#~ msgstr "Skin:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "Ordina automaticamente i file in download (elevato uso CPU)"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "IP dell'interfaccia in ascolto\n"
+#~ "(o vuoto per qualunque ip)"
+
+#~ msgid "TCP port"
+#~ msgstr "Porta TCP"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Chi puo' vedere i file condivisi:"
+
+#~ msgid "Event types"
+#~ msgstr "Tipi di Eventi"
+
+#~ msgid "ERROR: can not accept web client connection\n"
+#~ msgstr "ERRORE: non posso accettare la connessione da client web\n"
+
+#~ msgid ""
+#~ "Your Auto-update server list is empty.\n"
+#~ "'Auto-update server list at startup will be disabled."
+#~ msgstr ""
+#~ "La tua lista server auto-aggiornante è vuota.\n"
+#~ "'L'auto-aggiornamento della lista server all'avvio sarà disabilitato."
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "Fa si' che aMule chieda conferma prima di uscire"
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Mostra overhead banda"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "ICH attivo"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICH si fida di ogni hash (sconsigliato)"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Impostazioni avanzate"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Stile barra di avanzamento"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Ordinamento colonne"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Tweaks GUI vari"
+
+#~ msgid "File Options"
+#~ msgstr "Opzioni file"
 
 #~ msgid "Status text"
 #~ msgstr "Messaggio di status"
@@ -7293,18 +7988,128 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "Apri pop-up"
 
-#~ msgid "Please wait... "
-#~ msgstr "Attendere... "
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Client p2p 'All-Platform' basato su eMule \n"
+#~ "\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr "Sito web: http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr "Forum: http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr "Contatto: admin@amule.org (problemi amministrativi) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr " Parte di aMule è basata su \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " Copyright (C) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "Per un film puoi indicare la lunghezza, la trama, la lingua...\n"
+#~ "e, se e' un falso, puoi farlo presente agli altri utenti di aMule"
+
+#~ msgid "Misc Options"
+#~ msgstr "Altre opzioni"
+
+#~ msgid "Server Options"
+#~ msgstr "Opzioni server"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Mostra motd del server alla connessione..."
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Disabilita/Abilita"
+
+#~ msgid "Authentication"
+#~ msgstr "Autenticazione"
 
 #~ msgid "General Settings"
 #~ msgstr "Impostazioni generali"
 
+#~ msgid "Max Connections"
+#~ msgstr "Connessioni massime"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "Tweaks GUI"
 
 #~ msgid "Remote Control"
 #~ msgstr "Controlli remoti"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Impossibile determinare il browser selezionato!"
+
+#~ msgid "User Defined"
+#~ msgstr "Definito dall'utente"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - il Mulo per Linux"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Seleziona il tuo browser"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Browser personalizzato:"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Inserisci il nome del tuo browser. Per usare un browser diverso, "
+#~ "seleziona Browser Personalizzato nel menu"
+
+#~ msgid "Please wait... "
+#~ msgstr "Attendere... "
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "Non e' possibile trovare il comando per lanciare il browser"
 
@@ -7424,9 +8229,6 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "Copia link ED2k negli appunti"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "ERRORE FATALE: impossibile creare il timer"
-
 #~ msgid "ED2K: Connecting"
 #~ msgstr "ED2k: Connessione in corso"
 
@@ -7536,11 +8338,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "ERRORE: versione del file part.met non valida: %s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr ""
-#~ "ERRORE: %s (%s) e' corrotto (tagcount non corretto), impossibile caricare "
-#~ "il file."
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "ATTENZIONE: %s potrebbe essere corrotto (%i)"
 
@@ -7565,14 +8362,6 @@
 #~ msgid "Insufficient Diskspace"
 #~ msgstr "Spazio su disco insufficiente"
 
-#~ msgid "Warning: known.met cannot be opened."
-#~ msgstr "Attenzione: impossibile aprire known.met."
-
-#~ msgid "Warning: Knownfile list corrupted, contains invalid header."
-#~ msgstr ""
-#~ "Attenzione: lista dei files conosciuti corrotta, potrebbe contenere un "
-#~ "header non valido."
-
 #~ msgid "ERROR! Attempted to share %s"
 #~ msgstr "ERRORE! Tentativo di condividere %s"
 
@@ -7603,9 +8392,6 @@
 #~ msgid "Bandwidth Limits: Up: %u kB/s, Down: %u kB/s.\n"
 #~ msgstr "Limit di banda: Up: %u kB/s, Down: %u kB/s\n"
 
-#~ msgid "Shutdown aMule."
-#~ msgstr "Chiudi aMule."
-
 #~ msgid ""
 #~ "Shutdown the remote running core (amule/amuled).\n"
 #~ "This will also shut down the text client, since it is unusable without a\n"
@@ -7621,9 +8407,6 @@
 #~ msgid "Disconnect from ED2K only."
 #~ msgstr "Disconnetti solo dalla rete ed2k."
 
-#~ msgid "Adds an ed2k or magnet link to core."
-#~ msgstr "Aggiungi un link ed2k o magnet al core."
-
 #~ msgid ""
 #~ "The ed2k link to be added can be:\n"
 #~ "*) a file link (ed2k://|file|...), it will be added to the download "
@@ -7753,9 +8536,6 @@
 #~ msgid "Manual Server Add : Name"
 #~ msgstr "Aggiungi server: nome"
 
-#~ msgid "No One"
-#~ msgstr "Nessuno"
-
 #~ msgid "Speed Limits:"
 #~ msgstr "Limiti di velocita':"
 
@@ -7978,9 +8758,6 @@
 #~ msgid "Client request is invalid! %i / %i"
 #~ msgstr "La richiesta del client non e' valida! %i / %i"
 
-#~ msgid "Command: %s"
-#~ msgstr "Comando: %s"
-
 #~ msgid "Unable to open %s file - using %s file."
 #~ msgstr "Impossibile aprire il file %s - uso il file %s"
 
@@ -7997,13 +8774,6 @@
 #~ msgid "Waiting for subprocess termination failed"
 #~ msgstr "Attesa del termine del sottoprocesso fallita"
 
-#~ msgid ""
-#~ "You cannot connect to a release version from an arbitrary CVS version! "
-#~ "*sigh* possible crash prevented"
-#~ msgstr ""
-#~ "Non puoi connetterti a una versione finale da una versione CVS qualsiasi! "
-#~ "*sigh* possibile crash evitato"
-
 #~ msgid "doesn't work"
 #~ msgstr "non funziona"
 
@@ -8036,7 +8806,7 @@
 #~ " FAQ: http://wiki.amule.org \n"
 #~ "\n"
 #~ " Contact: admin@amule.org (administrative issues) \n"
-#~ " Copyright (C) 2003-2009 aMule Team \n"
+#~ " Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
 #~ " Part of aMule is based on \n"
 #~ " Kademlia: Peer-to-peer routing based on the XOR metric.\n"
@@ -8050,7 +8820,7 @@
 #~ " Domande Frequenti: http://wiki.amule.org \n"
 #~ "\n"
 #~ " Contatti: admin@amule.org (administrative issues) \n"
-#~ " Copyright (C) 2003-2009 aMule Team \n"
+#~ " Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
 #~ " Una Parte di aMule si basa su \n"
 #~ " Kademlia: Peer-to-peer routing based on the XOR metric.\n"
@@ -8161,9 +8931,6 @@
 #~ "Questo comando e' deprecato e in futuro potrebbe essere rimosso.\n"
 #~ "Usare 'Set BwLimit Down' al suo posto.\n"
 
-#~ msgid "Syncronization thread started."
-#~ msgstr "Thread di sincronizzazione avviato."
-
 #~ msgid "Masterhashes of known files have been loaded."
 #~ msgstr "Caricati i masterhash dei file conosciuti."
 
@@ -8225,9 +8992,6 @@
 #~ msgid "Source Dropping"
 #~ msgstr "Gestione fonti"
 
-#~ msgid "Keep sources"
-#~ msgstr "Mantieni fonti"
-
 #~ msgid "Drop sources"
 #~ msgstr "Rilascia fonti"

aMule-2.2.6.tar.bz2/po/ja.po -> aMule-2.3.1.tar.bz2/po/ja.po Changed

@@ -1,5 +1,4 @@
 # Japanese translations for PACKAGE package.
-# Copyright (C) 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 #  <aikishugyo@gmail.com>, 2007.
 #
@@ -7,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
 "PO-Revision-Date: 2008-05-31 01:09+0900\n"
 "Last-Translator: \n"
 "Language-Team: Japanese\n"
@@ -16,1274 +15,1117 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "空のパスワードは無効です。"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "仲間を追加する"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "不正なパスワード、 MD5ハッシュではありません！"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "正当なIPとポートを入力しなければなりません！"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "接続に失敗しました"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "情報"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr ""
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "指定されたユーザハッシュは不正です！"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr ""
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "%s（%s）を開くことはできませんでした"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
+#: src/amule.cpp:239
+#, fuzzy
+msgid "Now, exiting main app..."
 msgstr ""
+"\n"
+"OK、%s を終了中です…\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "成功です！aMuleへの接続を確立しました "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "成功です！接続を確立しました。"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "ハッシュ中"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "完了中"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "完了"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "停止"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "エラーあり"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "ダウンロード"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "待機"
-
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "ファイル %s のMD4とAICHハッシュを作成しています"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "ファイル %s のMD4ハッシュを作成しています"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "ファイル %s のAICHハッシュを作成しています"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "失敗しました"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "'%s' の古いAICHハッシュセットを '%s' の64bに変換中です。"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr ""
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "警告：ファイル名 '%s' は無効です。'%s' に改名されました。"
+#: src/amule.cpp:335
+#, fuzzy
+msgid "aMule shutdown completed."
+msgstr "ダウンロード完了"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
 msgstr ""
-"警告：ファイル '%s' は既に存在します。新しいファイルを '%s' に改名しました。"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "警告：バックアップ後、元の '%s' を削除することができませんでした"
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "終了の確認"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "警告： %s を削除することができませんでした"
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "新しい外部接続を認められました"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "ユーザ '%s' から共有ファイルを取得することができませんでした"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "警告"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "不明"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"申し訳ありませんが、設定の変更を行ったため、あなたのロケールはシステム標準に"
+"変更されました。"
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr "（偽のeMuleバージョン %#x）"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "情報"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr "（偽のeMule）"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"サーバリストにはサーバが一つも入っていません。今aMuleに新しいサーバリストをダ"
+"ウンロードしますか？"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule（偽のeMule）"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "サーバリストのダウンロード"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x（eMule v0.%u に基づいています）"
+msgid "web server running on pid %d"
+msgstr ""
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "NickName: %s ID: %u"
+#: src/amule.cpp:658
+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/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "要求：%s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr ""
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"当セッションのファイル統計： %d / %d の要求を受け入れ、%s 転送された\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "指定したアドレスにポートをバインドできませんでした: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"全セッションのファイル統計： %d / %d の要求を受け入れ、%s 転送された\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "不明なファイルが要求されました"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "ポート%uは利用できません。あなたにはLOWIDが与えられます\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "クライアント %s がIP：ポート %s:%d にいて、  %s %s %s を使用しています"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "ユーザ名"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "友達"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "詳細を表示(&D)"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "友達を追加する"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "友達を削除する"
-
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "送信 &Message"
-
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "ファイルを見る"
-
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "友達スロットを設立する"
-
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "選択された友達を削除しますか？"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"ポート%uは利用できません\n"
+"\n"
+"したがって、あなたにはLOWIDが与えられます\n"
+"\n"
+"ネットワークを調べ、ポートが入出力に対して開いているか確認してください。"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "選択された友達を削除しますか？"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "オンライン証明ファイルの生成に失敗しました"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "キャンセル"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "aMuleのオンライン証明ファイルの生成に失敗しました"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1031
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
-msgstr "スロットが一つのみ提供されました。"
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"選択したロケールはあなたのシステムにインストールされていないようです。（注"
+"意：いずれにせよ設定を試みます）"
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "複数選択"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "初めてaMule %sを起動しています"
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "ダウンロード完了"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "このバージョンはテスト・バージョンで、毎日更新されているものです。\n"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "ファイルのフルパス。"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr ""
+"あなたに損害を与えないということは保証できません。家を焼いてしまうかも知れな"
+"いし、\n"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "パス部分を除いたファイルの名前。"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"犬を殺してしまうかも知れません。しかし、安全に使用できる「はず」です。\n"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
 msgstr ""
+"私たちのホームページwww.aMule.org、またはIRCチャネルirc.freenode.netの#aMule"
+"には、\n"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "ファイルのサイズ（バイト）。"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "詳細な情報、サポートや新しいリリースがあります。\n"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "累計ダウンロード活動時間"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "バグはhttp://forum.amule.orgに気楽に報告してください"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "新しいチャットセッションの開始"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
+msgstr ""
+"あなたが指定したオンライン証明ファイルのフォルダは不正です！\n"
+"設定で訂正するまでオンライン証明を無効にします。"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "メッセージ送信者。"
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "サーバ名："
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "空き容量不足"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "ファイル '%s' のディスク領域の事前確保が失敗しました: %s"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "ディスク・パーティション。"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "エラー：ログファイルを開くことはできません"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "完了中にエラー"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "注意：ログファイルは空です。何かがおかしいです。"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "ファイル名"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "ログはリセットされました"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "サイズ"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "サーバ・メッセージ：%s"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "タイプ"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "優先度"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "ノード・リストをダウンロードのに失敗しました。"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "ファイルID"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "ダウンロードされたバージョン確認ファイルを開くのに失敗しました。"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "要求"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "破損されたバージョン確認ファイル"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "認められた要求"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "あなたは古いバージョンのaMuleを使用しています！"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "転送されたデータ"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "あなたのaMuleバージョンは%i.%i.%iで、最新バージョンは%li.%li.%liです"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "共有比"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "最新バージョンはいつもhttp://www.amule.orgにあります"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "得られた部分"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr ""
+"警告：あなたのaMuledバージョンは古くなっています：%i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "完成したソース"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "あなたのaMuleは最新のバージョンです。"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "ディレクトリパス"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "バージョン確認ファイルのダウンロードに失敗しました"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "共有ファイル"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "ユーザ: %s | ファイル: %s"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "非常に低い"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "ユーザ: E: %s K: %s | ファイル: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "低い"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "ネットワークが選択されていません"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "普通"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "LowIDを持っています"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "高い"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "HighIDを持っています"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "非常に高い"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "接続しています：%s %s"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "離す"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "%sに接続中です"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "自動"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "コメントおよび評価を追加する"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kadを開始しました。"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "コメントおよび評価を編集する"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kadを中止しました。"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "改名する"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Kadに接続しています（OK）"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "コレクションに存在するファイルを転送リストに追加する"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Kadに接続しています（ファイアウォール）"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "マグネット &URI をクリップボードにコピーする"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Kadから切断しています"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
 msgstr ""
+"UDPポートが設定で無効にされていると、Kadネットワークを使用できないため、開始"
+"しません。"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr ""
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Kadネットワークは設定で無効にされているため、接続はしません。"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amuled.cpp:560
+#, fuzzy
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
 msgstr ""
+"エラー：外部接続が無効にされている時にはaMuleのデーモンは使用できません。外部"
+"接続を有効にするには、普通のaMuleを使用するか、あるいはamuledをオプション--"
+"ec-configで起動させるか、あるいはファイル~/.aMule/amule.confの中でキー"
+"\"AcceptExternalConnections\"を１に設定してください。"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "フィードバックをクリップボードにコピーする"
-
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
 msgstr ""
-"フィードバック:%s (%s)\n"
-"\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "有効なソースリンクを作るにはHighIDが必要です"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "警告"
-
-#: src/SharedFilesCtrl.cpp:451
+#: src/amuled.cpp:711
 #, c-format
-msgid "Shared Files (%i)"
-msgstr "共有ファイル（%i）"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[部分ファイル]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "このファイルの新しい名前を入力してください："
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "ファイルの改名"
+msgid "ERROR: %s"
+msgstr "エラー： %s"
 
-#: src/UploadQueue.cpp:511
+#: src/amuleDlg.cpp:238
 #, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "ファイル %s のアップロードを再開します"
+msgid "This is aMule %s based on eMule."
+msgstr "これはeMuleに基づいたaMule %s です。"
 
-#: src/UploadQueue.cpp:520
+#: src/amuleDlg.cpp:240
 #, c-format
-msgid "Suspending upload of file: %s"
-msgstr "ファイル %s のアップロードを一時停止します"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMuleテキストクライアント"
+msgid "Running on %s"
+msgstr "%s に起動しています"
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: 検索キーワードが短すぎます"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr "新しいバージョンの確認はhttp://www.amule.orgで。"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "%u 個のKadコンタクトを読み込みました"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "aMuleリモート制御"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "%d個のKadコンタクトを書き込みました"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "スナップショット："
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "ウェブクライアント接続が受け入れられました\n"
-
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "次のエラーによって要求が失敗しました： %s。"
-
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "不明なエラーによって要求が失敗しました。"
-
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "インデックスファイルが見付かりませんでした： "
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "セッション有効期限が切れました - ログインを要求しています\n"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "セッションOK、ログインしています\n"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "セッションOK、ログインしていません\n"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "セッションが開いていません - ログインを要求します\n"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "セッションを作成しました - ログインを要求しています\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademliaに基づいています：XORトリックに基づいたP2Pルーティング。\n"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "要求を処理中です [original]: "
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "パスワードをチェック中です\n"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "パスワードのハッシュが無効です\n"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "メッセージ"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "パスワードOKです\n"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "パスワードが正しくありません\n"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "接続中"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "パスワードを入力しませんでした。空のパスワードは許可されていません。\n"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "ログアウトが要求されました\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "要求を処理中です [変更しました]： "
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: ファイアウォールされています"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "テンプレート <str> をロードします"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: 接続"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr ""
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: 接続中"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr ""
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: オフ"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnPポート"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "キャンセル"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "gzip圧縮を使用する"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "現在の接続試行を中止する"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr ""
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "切断する"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr ""
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "ネットワークから切断します。"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "ゲストアクセスを許可する"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "接続する"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "ゲストアクセスを拒否する"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "ネットワークへ接続します。"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr ""
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "アップ： %.1f(%.1f) | ダウン： %.1f(%.1f)"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMuleの設定ファイルパス。注意：直接使用しないでください！"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "アップ： %.1f | ダウン： %.1f"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "PHPインタープリタを無効にする（非推奨）"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | 接続しています)"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "各要求ごとにPHPページを再コンパイルする"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | 切断しています)"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMuleウェブサーバ"
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "本当にaMuleを終了しますか？"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "利用不可"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "終了の確認"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "記録なし"
+#: src/amuleDlg.cpp:1173
+#, fuzzy
+msgid "Launch Command: "
+msgstr "コマンド： %s"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "ダウンロード中…"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr ""
 
-#: src/HTTPDownload.cpp:75
+#: src/amuleDlg.cpp:1232
 #, c-format
-msgid "( %s / %s )"
-msgstr "（ %s / %s）"
+msgid "Skin directory '%s' does not exist"
+msgstr "スキンディレクトリ '%s' は存在しません"
 
-#: src/HTTPDownload.cpp:239
+#: src/amuleDlg.cpp:1237
 #, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
+msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "設定"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "amulesig.datファイルの入っているディレクトリ"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "ネットワーク"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "閲覧"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "ネットワークウィンドウ"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "amulesig.datファイルが入っているディレクトリをここに入力してください"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "検索"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "リフレッシュレート間隔（秒）"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "検索ウィンドウ"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "各リフレッシュイベントで統計イメージを生成する"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "ダウンロード数"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "統計イメージを生成したいディレクトリをここに入力してください"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "ダウンロード"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "統計イメージを定期的にFTPサーバへアップロードする"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTPのUrl"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "共有ファイルウィンドウ"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTPのパース"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "メッセージ"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "FTPサーバのURLをここに入力してください"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "メッセージウィンドウ"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "統計イメージを置きたいFTPサーバのディレクトリをここに入力してください"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "統計"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "ユーザ"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "統計グラフウィインドウ"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "パスワード"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "設定"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "FTPサーバのログインに使うユーザ名をここに入力してください"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "個人設定ウィンドウ"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "FTPサーバのログインに使うパスワードをここに入力してください"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "インポート"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "FTPアップデートレート間隔（分）"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "部分ファイルをインポートするためのツール"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "実証"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "情報"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "署名ファイルが入っているフォルダ"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "ソフトウェア情報／ヘルプ"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "統計イメージを生成するフォルダ"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
-#, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i 日 %i 時間 %i 分 %i 秒"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Kadネットワーク"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas、aMuleのオンライン統計"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "ネットワークなし"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "ようこそ！"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
 msgid "aMule"
 msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "wxCasの起動以来の最大DL速度"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "前のwxCas起動を含めて記憶した最大DL速度"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "リセット"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "システム"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "オートリフレッシュを中止する"
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "致命的なエラー：タイマを生成できませんでした"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "オンライン統計イメージを保存する"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "リモートamuleへ接続する"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "オンライン統計イメージを印刷する"
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "致命的なエラー：タイマを生成できませんでした"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "設定"
+#: src/amule-remote-gui.cpp:268
+#, fuzzy
+msgid "Going to event loop..."
+msgstr "ファイル情報を回復しようとしています…"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "wxCasについて"
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "接続中"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "オートリフレッシュを開始する"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "接続に失敗しました "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "オートリフレッシュを中止しました"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "オートリフレッシュを開始しました"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "統計イメージを保存する"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMuleのオンライン統計"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
 msgstr ""
-"印刷中に問題が発生しました。\n"
-"選択されたプリンタの設定に異常がありませんか？"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "印刷中です"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "全て"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
-"wxCas、aMuleのオンライン署名統計\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pedro de Oliveira <falso@rdk.homeip.net>のCASに基づいています\n"
-"\n"
-"GPLの元で配布されます"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "aMuleは動作していません…"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMuleは動作しています"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "不明"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMuleは動作していますが接続はしていません"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "ユーザ '%s' から共有ファイルを取得することができませんでした"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMuleは接続中です…"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "aMuleのステータスは不明です…"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr "（偽のeMuleバージョン %#x）"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr "（偽のeMule）"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " の動作時間は "
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule（偽のeMule）"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " は停止しています！"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x（eMule v0.%u に基づいています）"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " は接続していません！"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "NickName: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " は接続中です…"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "要求：%s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " の挙動が変です。チェックしてください！"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"当セッションのファイル統計： %d / %d の要求を受け入れ、%s 転送された\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " は次のものに接続しています： "
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"全セッションのファイル統計： %d / %d の要求を受け入れ、%s 転送された\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kas: "
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "不明なファイルが要求されました"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "%s（IP：%s）からのメッセージがフィルタされました"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "ファイアウォールされています"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "%s（IP：%s）から新しいメッセージが届きました"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "オフ"
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr ""
+"ユーザ %s（%u）はあなたのディレクトリ %s の共有ファイル・リストを要求しまし"
+"た -> 拒否しました"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " はオンです "
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, fuzzy, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "警告：known.metを開くことはできません。"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " とともに "
+#: src/CanceledFileList.cpp:61
+#, fuzzy
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr "警告：Knownfileリストは破損され、不正なヘッダーが含まれています。"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "合計ダウンロード： "
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "known.metファイル%sを読む時にIOエラーが発生しました"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr "、 アップロード： "
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "known.metファイル%sを保存する時にIOエラーが発生しました"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "セッションダウンロード： "
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "ダウンロード： "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "カテゴリ"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s、アップロード： "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "新しいカテゴリ"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "受信ファイルのフォルダを選択する"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "共有： "
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "カテゴリに名前を与えなければなりません！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " ファイル、キュー中のクライアント： "
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "カテゴリにパスを与えなければなりません！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "時間： "
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"カテゴリに受信ディレクトリを生成するのに失敗しました。正当なパスを指示してく"
+"ださい！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/ChatSelector.cpp:129
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " オン "
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "チャット・セションを開始しました：%s（%s：%u）-%s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "システムロード平均 （1-5-15分）： "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** クライアントに接続しています ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "システム動作時間： "
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** クライアントに接続中です ***"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02umin %02us"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** クライアントに接続に失敗しました／接続を失いました ***"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
-#, c-format
-msgid "%02us"
-msgstr "%02us"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "タブを閉める"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LowID"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "全てのタブを閉める"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "接続されていません"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "他のタブを閉める"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "仲間リストに追加する"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientCreditsList.cpp:158
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "クレジット・ファイルをロードしました。%u個のクライアントが既知です"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientCreditsList.cpp:161
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - %u個のクライアントのクレジット期限が満了しました！"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "'cryptkey.dat'が見つかりませんでした。生成します。"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "クライアントの詳細"
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "キャンセルされました！"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LowID"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
-#, c-format
-msgid "Unable to open %s"
-msgstr "%s を開くことができません"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "入力パラメタ"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "有効"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "ハッシュをするファイル"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "サポート"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "このファイルにオプショナルURLを追加する"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "非サポート"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr ""
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "無効"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
-msgstr ""
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "接続"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "追加"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "切断"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "削除"
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "クリア"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "不完全です"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "パートハッシュでリンクを生成する"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "悪意の相手"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
-msgstr ""
-"リンクサイズが大きくなるかわりに、新しくて珍しいファイルの配布を速くする"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "検証されています"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4ファイルハッシュ"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "利用不可能です"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
+"ユーザ %s（%u）はあなたの共有ファイル・リストを要求しました -> 許可しました"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
+"ユーザ %s（%u）はあなたの共有ファイル・リストを要求しました -> 拒否しました"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "開始"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "保存する"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "クリップボードへコピーする"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "終了"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-#, fuzzy
-msgid "Open"
-msgstr "Opera"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
+"ユーザ %s（%u）はあなたの共有ディレクトリ・リストを要求しました -> 許可しまし"
+"た"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "コピー"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
+"ユーザ %s（%u）はあなたの共有ディレクトリ・リストを要求しました -> 拒否しまし"
+"た"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-#, fuzzy
-msgid "Save as"
-msgstr "保存する"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
+"ユーザ %s（%u）はあなたのディレクトリ %s の共有ファイル・リストを要求しまし"
+"た -> 許可しました"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "情報"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "aLinkCreatorについて"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
+"ユーザ %s（%u）はあなたのディレクトリ %s の共有ファイル・リストを要求しまし"
+"た -> 拒否しました"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-#, fuzzy
-msgid "Can't open the clipboard"
-msgstr "クリップボードへコピーする"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "現在コピーできる物がありません！"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "ユーザ %s（%u）は %s のディレクトリを共有しています"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr ""
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "ユーザ %s（%u）は要求されていない共有ディレクトリを送りました。"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "開くことができません： "
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "ユーザ %s（%u）はディレクトリ %s の共有ファイル・リストを送りました。"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "空でないファイル名を入力してください"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "ユーザ %s（%u）は共有ファイル・リストの送信を終了しました"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "現在保存できるものがありません！"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "ユーザ %s（%u）は無用の共有ファイル・リストを送りました。"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
+"ユーザ %s（%u）は共有ファイルまたはディレクトリ・リストへのアクセスを拒否しま"
+"した。"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "ハッシュ中…"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr ""
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "ファイル・コメント"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr ""
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "ユーザ名"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr ""
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "ファイル名"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr " %.2f 秒で完了しました"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "評価"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "このURLはもう追加しました！"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "コメント"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "空でないURLを入力してください"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "コメントがありません"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "ファイル %u: %s 番を処理中です"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr ""
-"パートハッシュを要求しました（9.5MB以上のファイルサイズのみに使用されます）"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u個のコメントがあります"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> このファイルは存在していません！\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
 #: src/DataToText.cpp:37
@@ -1298,31 +1140,57 @@
 msgid "Auto [Hi]"
 msgstr "オート [Hi]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "接続中"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "非常に低い"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "低い"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "普通"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "高い"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "非常に高い"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "離す"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "要求中"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "サーバ経由に接続中"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "キューが一杯"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "キューに入っています"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "転送中"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "ダウンロード"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1348,8 +1216,7 @@
 msgid "Too many Kad connections"
 msgstr "Kad接続が多すぎます"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "接続禁止"
 
@@ -1381,8 +1248,8 @@
 msgid "Remote Server"
 msgstr "リモートサーバ"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1403,12 +1270,11 @@
 msgstr "ソースシード"
 
 #: src/DataToText.cpp:135
-#, fuzzy
 msgid "Search Result"
-msgstr "検索"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "完成された数"
 
@@ -1432,7 +1298,7 @@
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "キューに追加しました"
 
@@ -1444,864 +1310,302 @@
 msgid "Unknown or bad tempfile format."
 msgstr "不明な、または不利なtempfileフォーマット。"
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "システムの標準設定"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "アルバニア語"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "アラブ語"
-
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "エストニア語"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "バスク語"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "ブルガリア語"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "カタロニア語"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "中国語（簡体字）"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "中国語（繁体字）"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "クロアチア語"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "チェコ語"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "デンマーク語"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "オランダ語"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "英語（U.K.）"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "エストニア語"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "フィンランド語"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "フランス語"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "ガリシア語"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "ドイツ語"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "ギリシア語"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "ヘブライ語"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "ハンガリー語"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "イタリア語"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "イタリア語（スイス）"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "日本語"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "韓国語"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "リトアニア語"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "ルウェー語"
-
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "ポーランド語"
-
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "ポルトガル語"
-
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "ポルトガル語（ブラジル）"
-
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "ロシア語"
-
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "スロベニア語"
-
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "スペイン語"
-
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "スウェーデン語"
-
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "トルコ語"
-
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "選択されたブラウザが見付かりません！"
-
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"サーバのUDPソケトがTCP+3であるためTCPポートを65532以上には設定できません"
-
-#: src/Preferences.cpp:1681
-#, c-format
-msgid "Default port will be used (%d)"
-msgstr "デフォルトポートを使用します (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "サーバ名"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "アドレス"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "ポート"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "説明"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "ユーザ"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "ファイル"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "失敗しました"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "スタティック"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "バージョン"
-
-#: src/ServerListCtrl.cpp:144
-msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
-msgstr ""
-"接続中のサーバを削除しようとしています。先に切断してください。 このサーバは削"
-"除されませんでした。"
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "情報"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "（不明な名前）"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "スタティックサーバ %s を本当に削除しますか？"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "はい"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "いいえ"
-
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "'%s'を開くことができませんでした"
-
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "サーバ （%i）"
-
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "サーバ"
-
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "サーバへ接続する"
-
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "サーバをスタティックとしてマークする"
-
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "サーバを非スタティックとしてマークする"
-
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "サーバをスタティックとしてマークする"
-
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "サーバを非スタティックとしてマークする"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "サイズ"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "サーバを削除する"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "転送済み"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "サーバを削除する"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "スピード"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "全てのサーバを削除する"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "進捗状況"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr ""
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "ソース数"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr ""
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "優先度"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "サーバへ再接続する"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "ステータス"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "全てのサーバを本当に削除しますか？"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "残り時間"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "全ての選択されたサーバを本当に削除しますか？"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "最後に全部分を確認した時刻"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "全ての選択されたサーバを本当に削除しますか？"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "最後に受信した時刻"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "使用不可能 [%s]"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "本当に選択されたファイルを削除しますか？"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "これはeMuleに基づいたaMule %s です。"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "本当に選択されたファイルを削除しますか？"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Running on %s"
-msgstr "%s に起動しています"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr "新しいバージョンの確認はhttp://www.amule.orgで。"
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr ""
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMuleリモート制御"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "スナップショット："
-
-#: src/amuleDlg.cpp:464
 msgid ""
-" 'All-Platform' p2p client based on eMule \n"
+"Feedback from: %s (%s)\n"
 "\n"
 msgstr ""
-" eMuleに基づいた'全プラットフォーム'P2Pクライアントです\n"
+"フィードバック:%s (%s)\n"
 "\n"
 
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " ウェブサイト：http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " フォーラム：http://forum.amule.org \n"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "自動"
 
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" よくある質問：http://wiki.amule.org \n"
-"\n"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "中止する(&S)"
 
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " 問い合わせ：admin@amule.org（事務的関係） \n"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "停止する(&P)"
 
-#: src/amuleDlg.cpp:469
-msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-msgstr ""
-"  著作権2003-2009、aMuleのチーム\n"
-"\n"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "再開する(&R)"
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr "aMuleのある部分は\n"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "完了したものをクリアする(&L)"
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademliaに基づいています：XORトリックに基づいたP2Pルーティング。\n"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "すぐにこのファイルの全てのA4AFを交換する"
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " 著作権2002、Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "メッセージ"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "このファイルの全てのA4AFを交換する（オート）"
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr ""
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "このファイル以外の全てのA4AFを交換する"
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr ""
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "拡張オプション"
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: ファイアウォールされています"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "プレビュー"
 
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: 接続"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "ファイルの詳細(&D)"
 
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: 接続中"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "全てのコメントを表示"
 
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: オフ"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "マグネットURIをクリップボードへコピーする"
 
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "現在の接続試行を中止する"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr ""
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "切断する"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "フィードバックをクリップボードにコピーする"
 
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "ネットワークから切断します。"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "割り当てない"
 
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "接続する"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "カテゴリに割り当てる"
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "ネットワークへ接続します。"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "ファイルを開く(&O)"
 
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "アップ： %.1f(%.1f) | ダウン： %.1f(%.1f)"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "このファイルの新しい名前を入力してください："
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "アップ： %.1f | ダウン： %.1f"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "ファイルの改名"
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | 接続しています)"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | 切断しています)"
+msgid "Downloads (%i)"
+msgstr "ダウンロード数（%i）"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "本当にaMuleを終了しますか？"
+#: src/DownloadListCtrl.cpp:1412
+msgid ""
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
+msgstr ""
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "終了の確認"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "ファイル・プレビュー"
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "スキンディレクトリ '%s' は存在しません"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "エラー：外部メディア・プレイヤーを実行できませんでした！コマンド: `%s'"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr ""
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "ネットワーク"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "検索"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "転送"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "メッセージ"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "統計"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "インポート"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "部分ファイルをインポートするためのツール"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "ソフトウェア情報／ヘルプ"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr ""
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Kadネットワーク"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "ネットワークなし"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "一般"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "接続"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "ディレクトリ"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "サーバ数"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "セキュリティ"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
+msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "プロクシ"
-
-#: src/PrefsUnifiedDlg.cpp:177
-#, fuzzy
-msgid "Filters"
-msgstr "フィルタ："
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "リモート制御"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "オンライン署名"
-
-#: src/PrefsUnifiedDlg.cpp:180
-#, fuzzy
-msgid "Advanced"
-msgstr "詳細な設定"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "イベント"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "デバッグ"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "ユーザ定義"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr "この変更点を有効するにはaMuleを再起動しなければなりません：\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCPポートを変更しました。\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDPポートを変更しました。\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"外部接続を有効にしましたがパスワードを設定していません。\n"
-"有効なパスワードを設定しないと外部接続を可能できません。"
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- 言語を変更しました。\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- 一時フォルダを変更しました。\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-#, fuzzy
-msgid "- ED2K network enabled.\n"
-msgstr "全てのネットワークが無効になっています。"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "アップ： 0.0 | ダウン： 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "server.metファイルをロード中です：%s"
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"UDPポートが無効になっているとKadは開始できません。\n"
-"UDPポートを有効にするか、またはKadを無効にしてください。"
+#: src/DownloadQueue.cpp:132
+#, fuzzy, c-format
+msgid "Loading PartFile %u of %u"
+msgstr "古いダウンロード・ファイル（%uから%u）からデータをロード中です"
 
-#: src/PrefsUnifiedDlg.cpp:669
+#: src/DownloadQueue.cpp:154
 msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"\n"
-"必ず早急にaMuleを再起動してください。\n"
-"今すぐに再起動しなければ、挙動がおかしくなる可能性があります。\n"
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
-"オートアップデートサーバリストが空です。\n"
-"せめて一つのURLを入力して、有効なserver.metファイルを指定してください。\n"
-"このチェックボクスの近くの\"表\"ボタンをクリックして、URLを入力してください。"
 
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "一時ファイル"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "受信ファイル"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "オンライン署名"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr " %s のためのフォルダを選択する"
-
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "ビデオプレイヤーを選択する"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "ブラウザを選択する"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "部分ファイルは見つかりませんでした"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "実行ファイル%s"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "%u個の部分ファイルが見つかりました"
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
+"一時ディレクトリがあるファイルシステムは大きなファイルを扱うことができませ"
+"ん。"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
-"server.metファイルをダウンロードするURLをここに追加してください。\n"
-"一行にひとつのURLのみです。"
+"受信ディレクトリがあるファイルシステムは大きなファイルを扱うことができませ"
+"ん。"
 
-#: src/PrefsUnifiedDlg.cpp:1031
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "アップデート遅延時間： %d 秒"
+msgid "Downloading %s"
+msgstr "%sをダウンロード中です"
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "平均グラフの時間： %d 分"
+msgid "You are already trying to download the file '%s'"
+msgstr "あなたはすでにファイル'%s'をダウンロードしようとしています"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "接続グラフスケール： %d"
+msgid "You already have the file '%s'"
+msgstr "あなたはすでにファイル'%s'を持っています"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "アップデート遅延時間： %d 秒"
+msgid "You are already trying to download the file %s"
+msgstr "あなたはすでにファイル%sをダウンロードしようとしています"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "ファイルバッファサイズ： %d バイト"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "アップロードキューサイズ： %d クライアント"
+msgid "Unknown protocol of link: %s"
+msgstr "リンクの不明なプロトコル：%s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "サーバ接続リフレッシュ遅延時間： %d 分"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "サーバ接続リフレッシュ遅延時間： 無効"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-#, fuzzy
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "延長サーバ・リクエストのUDPポート（TCP+3）： 4665"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1118
+#: src/ExternalConn.cpp:260
 #, fuzzy
-msgid "disabled"
-msgstr "無効にする"
-
-#: src/PrefsUnifiedDlg.cpp:1138
-#, c-format
-msgid "Execute command on `%s' event"
-msgstr " `%s' イベントにコマンドを実行する"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "コアにコマンドを実行することを有効にする"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "コアコマンド："
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "GUIにコマンドを実行することを有効にする"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "GUIコマンド："
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "次の変数は置換されます："
-
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "不正アクセスの試みがなされました。接続は閉じました。"
+msgid "Client sent packet after authentication failed."
+msgstr "認証に失敗しました。"
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "外部接続は終了しました。"
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "外部接続は空パスワードのため無効にしました！"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "外部接続を設定ファイルに無効しました"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "新しい外部接続を認められました"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "個人設定に空欄のパスワードがあるため、外部接続を拒否しました！"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "クライアントを接続中： %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "不明なバージョン"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2309,2191 +1613,1053 @@
 "間違ったECバージョンID。バイナリ不互換性の可能性があります。同じスナップ"
 "ショットの コアとリモートを使用してください。"
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"クラッシュを防ぐため、SVNバージョンからリリースバージョンへの接続はできませ"
-"ん！"
+"任意CVSバージョンからリリースバージョンに接続はできません！ *ハァ…*起こり得る"
+"クラッシュを予防しました"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "認証に失敗しました。"
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "無効なプロトコルバージョン。"
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "プロトコルバージョンタグがありません。"
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "認証に失敗しました。"
+
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "認証に失敗しました。"
+
+#: src/ExternalConn.cpp:516
+#, fuzzy
+msgid "Invalid request, please authenticate first."
 msgstr "無効なリクエストです。先に認証をしてください。"
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "アクセスを認められました。"
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, fuzzy, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "知らないクライアントからのメッセージをフィルタする"
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "不正アクセスの試みがなされました。接続は閉じました。"
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 "リモート部分ファイルコマンドが失敗しました：ファイルハッシュは見付かりません"
 "でした： %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "ファイルハッシュは見付かりませんでした： %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "あら！OpCode処理エラーが発生しました！"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "サーバは追加しませんでした"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "サーバは見付かりませんでした： %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "削除したいサーバを定義しなければなりません"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "検索中です。あと少しで結果をもう一度取ってきます！"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "リモートインタフェイスからWebSearchする意味がありません。"
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kadは個人設定に無効されています。"
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "グラフを表示するための点がありません。"
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "あなたのクライアントはこの詳細段階には設定されていません。"
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "既にシャットダウン中です。"
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn：次のリンクを追加中です： '%s'。"
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "不正なリンク、またはリンクがすでにリストに入っています。"
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "ファイルは見付かりませんでした。"
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "不正なファイル名。"
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "ファイルを改名できません。"
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kadは個人設定に無効されています。"
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "すでにKadに接続しています。"
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Kadに接続中です…"
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "全てのネットワークが無効になっています。"
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Kadから切断しています。"
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "不正なOpCode（プロトコルバージョンが違いますか？）"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"ファイル（%s）を開くことができませんでした。共有ファイルのリストから外しま"
-"す。"
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "不明なファイルのハッシュセットが要求されました： %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr ""
-"PID `%2$d' のコマンド  `%1$s' がステータスコード  `%3$d' で終了しました。"
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr ""
-"サーバは追加しませんでした：IPまたはホスト名は指示されていませんでした。"
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "サーバは追加しませんでした：不正なサーバ・ポートが指示されました。"
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr ""
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "接続"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:ポート"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kademliaのステータス："
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "走っています"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "ステータス："
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "切断"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "接続状況："
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "ファイアワォールされています"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "ファイアワォールされた状況："
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "仲間と接続しています"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "仲間がありません"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "平均のユーザ数："
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "平均のファイル数："
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "動作していません"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "動作時間： %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "転送"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "アップロード数"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "アップロードされたデータ（セッション合計）： %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "合計オーバヘッド（パケット数）： %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "ファイル要求のオーバヘッド（パケット数）： %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "ソース交換のオーバヘッド（パケット数）： %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "サーバのオーバヘッド（パケット数）： %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Kadのオーバヘッド（パケット数）： %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "暗号化オーバーヘッド (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "アクティブなアップロード数： %s"
-
-#: src/Statistics.cpp:663
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Waiting Uploads: %s"
-msgstr "待機中のアップロード数： %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "成功したアップロードセッションの合計： %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "失敗したアップロードセッションの合計： %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "平均アップロード時間： %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "ダウンロード数"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "ダウンロードされたデータ（セッション合計）： %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "見付かったソース： %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "アクティブなダウンロード数（塊数）： %s"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "'%s'コマンドに不明な拡張子'%s'。\n"
 
-#: src/Statistics.cpp:686
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "セッションの合計UL/DL比： %s"
+msgid "Unknown command '%s'.\n"
+msgstr "不明なコマンド'%s'。\n"
 
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
+"\n"
+"このコマンドには引数は認められていません。\n"
 
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
+"\n"
+"このコマンドには引数が必要です。\n"
 
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
+"\n"
+"このコマンドは不完全です。下記から拡張をひとつ選択してください。\n"
 
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
 msgstr ""
+"\n"
+"利用可能な拡張：\n"
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "再接続数： %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "最初の転送からの経過時間： %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "サーバへの接続時刻： %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "アクティブな接続数（推測）： %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "最大接続数への到達： %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "平均接続数（推測）： %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "ピーク接続数（推測）： %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "クライアント数"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "フィルタされた数"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "合計： %i 既知： %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "動作サーバ数： %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "失敗したサーバ数： %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "合計： %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "削除されたサーバ数： %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "フィルタされたサーバ数： %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "動作サーバのユーザ数： %llu"
-
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "動作サーバのファイル数： %llu"
-
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "ユーザ合計： %llu"
-
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "ファイル合計： %llu"
-
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "サーバ占有： %.2f%%"
-
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "共有ファイル数： %s"
-
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "共有ファイルの合計サイズ： %s"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "利用可能なコマンド：\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Average file size: %s"
-msgstr ""
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "オペレーティング・システム"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "受信していません"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "カット"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "ペースト"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "全ての選択"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kadが走っていない中にはKadの検索はできません"
-
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
+"\n"
+"すべてのコマンドは大文字と小文字を区別しません。\n"
+"'%s <コマンド>'を入力すると<コマンド>の詳細情報が表示されます。\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Kadを検索する間に不明なエラーが発生しました： "
-
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "%s（IP：%s）からのメッセージがフィルタされました"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "アプリケーションが終了します。"
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "%s（IP：%s）から新しいメッセージが届きました"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "ヘルプを表示します。"
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
-"ユーザ %s（%u）はあなたの共有ファイル・リストを要求しました -> 許可しました"
+"コマンドに対してヘルプを得るためには'help ＜コマンド＞'を入力してください。\n"
+"全てのコマンドのリストを得るためには'help'を入力してください。\n"
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
-"ユーザ %s（%u）はあなたの共有ファイル・リストを要求しました -> 拒否しました"
+"\n"
+"コマンド・リストには'%s'を使用してください\n"
+"\n"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"ユーザ %s（%u）はあなたの共有ディレクトリ・リストを要求しました -> 許可しまし"
-"た"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "シンタックス・エラー！"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
-"ユーザ %s（%u）はあなたの共有ディレクトリ・リストを要求しました -> 拒否しまし"
-"た"
+"コマンドを処理する時にエラーが発生しました。これはありえない！バッグをリポー"
+"トしてください\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"ユーザ %s（%u）はあなたのディレクトリ %s の共有ファイル・リストを要求しまし"
-"た -> 許可しました"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "このコマンドには引数が認められていません。"
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"ユーザ %s（%u）はあなたのディレクトリ %s の共有ファイル・リストを要求しまし"
-"た -> 拒否しました"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "このコマンドには引数が不可欠です。"
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "ユーザ %s（%u）は %s のディレクトリを共有しています"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "引数が不正です。"
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "ユーザ %s（%u）は要求されていない共有ディレクトリを送りました。"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "このコマンドは不完全です。"
 
-#: src/ClientTCPSocket.cpp:1025
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "ユーザ %s（%u）はディレクトリ %s の共有ファイル・リストを送りました。"
+msgid "Type '%s' to get more help.\n"
+msgstr "'%s'を入力して、ヘルプを得てください。\n"
 
-#: src/ClientTCPSocket.cpp:1032
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "ユーザ %s（%u）は共有ファイル・リストの送信を終了しました"
+msgid "This is %s %s %s\n"
+msgstr "これは %s %s %s　です\n"
 
-#: src/ClientTCPSocket.cpp:1037
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "ユーザ %s（%u）は無用の共有ファイル・リストを送りました。"
+msgid "This is %s %s\n"
+msgstr "これは %s %s　です\n"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
-"ユーザ %s（%u）は共有ファイルまたはディレクトリ・リストへのアクセスを拒否しま"
-"した。"
+"\n"
+"クライアントを生成中です…\n"
 
-#: src/KadDlg.cpp:132
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Nodes (%u)"
-msgstr "ノード数（%u）"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "ブートストラップするためには正しくないIPです"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "ブートストラップするためには正しくないポートです"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "必要なフィールドをすべて入力してください"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "本当に新しいnodes.datファイルをダウンロードしますか？\n"
-
-#: src/KadDlg.cpp:197
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
-msgstr "そうすると、現在のノードがなくなり、Kademliaへの接続も初期化されます。"
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "続けますか？"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
+"\n"
+"OK、%s を終了中です…\n"
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
+"空のパスワードでは接続できません。\n"
+"パスワードは設定ファイル、またはコマンド・ラインで指定するか、\n"
+"あるいは聞かれた時に入力しなければなりません。\n"
+"\n"
+"終了中です…\n"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "仲間を追加する"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "このヘルプ・テキストを表示する。"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "正当なIPとポートを入力しなければなりません！"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "aMuleが起動しているホストです。（デフォルト：localhost）"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "情報"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "aMuleの外接続用のポート。（デフォルト：4712）"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "指定されたユーザハッシュは不正です！"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "外接続用のパスワード。"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "ソース数"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "設定をファイルから読み込む。"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "ファイル"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "アウトプットをstdoutにプリンとしないように。"
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "ダウンロード"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "冗長にして：デバッグ・メッセージも表示する。"
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "カテゴリ"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "プログラム・ロカールを設定する（言語）。"
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "メイン"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "コマンド・ライン・オプションを設定ファイルに書き込む。"
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "カテゴリにダウンロードする"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "aMuleの設定ファイルを元に設定ファイルを生成する。"
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr ""
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "プログラム・バージョンをプリンとする。"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "既知ファイルとしてマークする"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "ファイルの詳細"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "リモートamuleへ接続する"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%%終わりました"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "接続に失敗しました "
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, fuzzy, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "接続に失敗しました。指示されたホストには接続はできませんでし。\n"
-
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "ユーザ： E: %s K: %s | ファイル E: %s K: %s"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr ""
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "全て"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "友達"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "ユーザ合計： %s | ファイル合計： %s"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "詳細を表示(&D)"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "転送済み"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "友達を追加する"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "スピード"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "友達を削除する"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "進捗状況"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "送信 &Message"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "ステータス"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "ファイルを見る"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "残り時間"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "友達スロットを設立する"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "最後に全部分を確認した時刻"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "選択された友達を削除しますか？"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "最後に受信した時刻"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "選択された友達を削除しますか？"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "本当に選択されたファイルを削除しますか？"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr "スロットが一つのみ提供されました。"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "本当に選択されたファイルを削除しますか？"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "複数選択"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "ユーザへメッセージを送る"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "メッセージ："
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "中止する(&S)"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "停止する(&P)"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "再開する(&R)"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "完了したものをクリアする(&L)"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "すぐにこのファイルの全てのA4AFを交換する"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "このファイルの全てのA4AFを交換する（オート）"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "このファイル以外の全てのA4AFを交換する"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "拡張オプション"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "プレビュー"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "ファイルの詳細(&D)"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "全てのコメントを表示"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "マグネットURIをクリップボードへコピーする"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "割り当てない"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "カテゴリに割り当てる"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "ファイルを開く(&O)"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "仲間リストから外す"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "仲間リストに追加する"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "メッセージを送る"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "このファイルへ交換する"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "他のファイルを頼みました"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "ダウンロード数（%i）"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "待機中のアップロード数： %s"
 
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "キューに入っています"
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "ファイル・プレビュー"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "アップロード"
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "エラー：外部メディア・プレイヤーを実行できませんでした！コマンド: `%s'"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "誰も許可しない"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "エラー：部分ファイルを作成できませんでした！"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "いいえ"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "metファイルのバックアップを%sからロードしようとしています"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "はい"
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr ""
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "ダウンロード中…"
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr ""
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "注意： スキンファイル '%s' を読むために開けませんでした"
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "ファイル情報を回復しようとしています…"
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "無名なファイルを回復中です：RecoveredFile.datとして回復しようとします"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "得られる全てのファイル情報を回復しました：使用しようとしています…"
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "残念ながら、ファイル情報を回復できませんでした。"
-
-#: src/PartFile.cpp:660
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Failed to open %s (%s)"
-msgstr "%s（%s）を開くことはできませんでした"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "部分ファイル%s（%s ==> %s）の保存中にエラーが発生しました"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "'%s'の長さを読み込むことができませんでした。%sファイルを使用します。"
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "どうか、'%s'はゼロ・サイズです：%sファイルを使用しています。"
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "%sのためのpart.met.seedsファイルは保存できませんでした"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "%i個のソース・シードを次の部分ファイルに保存しました：%s（%s）"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "部分ファイル%s（%s）にはシード・ファイルはありません"
-
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "部分ファイル%s（%s）のシード・ファイルは空です"
-
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
-"部分ファイルのシード・ファイルを読む時にエラーが発生しました：（%s - %s）%s"
-
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"破損されている部分（%d）が%d部分、ファイル%sに見つかりました：FileResultHash "
-"|%s| FileHash |%s|"
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "完成した部分（%i）が%sに見つかりました"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "%sの再ハッシュを終了しました"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr ""
-
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "ダウンロードが終了しました：%s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "ファイルを削除します：%s"
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
+msgstr "ダウンロード済み"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "注意：ディスク容量が足りません！ファイルを停止します：%s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "ダウンロードした部分%i（ファイル：%s）は破損されています"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr ""
-"ICH：破損された部分%i（%sのため）を回復しました→：%s バイトを保存しました"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "領域確保中"
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "サーバへ再接続する"
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "中断しています"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "ダウンロード済み"
-
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "エラー: 部分ファイル '%s' が開けませんでした"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
 
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "known.metファイル%sを読む時にIOエラーが発生しました"
-
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "known.metファイル%sを保存する時にIOエラーが発生しました"
-
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "%i個の既知の共有ファイルが見つかりました"
-
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "%i個の既知、%i個の未知の共有ファイルが見つかりました"
-
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "ファイル・コメント"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "評価"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "コメント"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "コメントがありません"
-
-#: src/CommentDialogLst.cpp:104
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u個のコメントがあります"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"難読化されたすべてのサーバへの接続に失敗しました。難読化せずにもう一度試みま"
-"す。"
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "リストされたすべてのサーバへの接続に失敗しました。もう一度試行します。"
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr ""
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/ServerConnect.cpp:187
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "%s（%s：%i）に接続しています"
-
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr " %s に接続を確立しました"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Successfully updated %s"
 msgstr ""
-"接続中に致命的なエラーが発生しました。インターネット接続がダウンしている恐れ"
-"があります。"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "%s（%s：%i）の接続を失いました"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s（%s：%i）は応答しないようです。"
-
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s（%s：%i）は一杯のようです。"
-
-#: src/ServerConnect.cpp:381
-#, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "自動的なサーバへの接続は、あと%d秒で再試行します"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "接続を失いました"
-
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "%s（%s：%i）の接続に失敗しました。"
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "%s（%s：%i）の接続の試しがタイムアウトました。"
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "サーバリストを%sからダウンロードするのに失敗しました"
 
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "サーバリストを%sからダウンロードするのに失敗しました"
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "部分ファイルは見つかりませんでした"
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "IPフィルタ'ipfilter.dat'と'ipfilterstatic.dat'をロード中です。"
 
-#: src/DownloadQueue.cpp:171
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "%u個の部分ファイルが見つかりました"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
-"一時ディレクトリがあるファイルシステムは大きなファイルを扱うことができませ"
-"ん。"
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
-"受信ディレクトリがあるファイルシステムは大きなファイルを扱うことができませ"
-"ん。"
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "%sをダウンロード中です"
+"'ipfilter.dat'ファイル'%s'のロードに失敗しました：不明なファイル・フォーマッ"
+"トに出会いました。"
 
-#: src/DownloadQueue.cpp:347
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "あなたはすでにファイル'%s'をダウンロードしようとしています"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr ""
+"'ipfilter.dat'ファイル'%s'のロードに失敗しました：不明なファイルを開くことは"
+"できませんでした。"
 
-#: src/DownloadQueue.cpp:359
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "You already have the file '%s'"
-msgstr "あなたはすでにファイル'%s'を持っています"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "%u個のIPレンジを'%s'からロードしました。"
 
-#: src/DownloadQueue.cpp:364
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "You are already trying to download the file %s"
-msgstr "あなたはすでにファイル%sをダウンロードしようとしています"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "不正な形式の行を %u 個破棄しました。"
 
-#: src/DownloadQueue.cpp:1299
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "リンクの不明なプロトコル：%s"
-
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "<str>を実行してから終了する。"
-
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "不正なIPフォーマット。xx.xxx.xxx.xxx:xxxxを使用ください\n"
-
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:86
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"このコマンドには引数が必要です。有効な引数：'all'、ファイル名、または数字。\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "ハッシュで処理しています: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "ファイル名で処理しています: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr "このコマンドには引数が必要です。有効な引数：ファイルのハッシュ。\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "正当な数字ではありません\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "正当なハッシュではありません（長さは丁度32半角文字あるべきです）\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "オペレーションは成功しました。"
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "リクエストは次のエラーで失敗しました：%s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "クライアントのIPフィルタリングは%sです。\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "オフ"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "オン"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "サーバのIPフィルタリングは%sです。\n"
+"既知のクライアントから\n"
+"ブートストラップする"
 
-#: src/TextClient.cpp:664
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "現在のIPフィルタ段階は%dです。\n"
+msgid "Nodes (%u)"
+msgstr "ノード数（%u）"
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr ""
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "ブートストラップするためには正しくないIPです"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr ""
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "ブートストラップするためには正しくないポートです"
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "%s %s %sに接続されています"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "必要なフィールドをすべて入力してください"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "LowIDを持っています"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "本当に新しいnodes.datファイルをダウンロードしますか？\n"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "HighIDを持っています"
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr "そうすると、現在のノードがなくなり、Kademliaへの接続も初期化されます。"
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "只今接続中です"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "続けますか？"
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "切断しています"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: 検索キーワードが短すぎます"
 
-#: src/TextClient.cpp:723
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+msgid "Keyword for search: %s"
 msgstr ""
-"\n"
-"ダウンロード数：\t%s"
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
-"\n"
-"アップロード数：\t%s"
 
-#: src/TextClient.cpp:729
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"キューに入っているクライアント数：\t%d\n"
 
-#: src/TextClient.cpp:732
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "%u 個のKadコンタクトを読み込みました"
+
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"合計ソース数：\t%d\n"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "検索結果数：%i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "まだ実現されていない：検索結果の進捗を表示する"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "サーバから不明な返事が届きまして、OpCodeは%#xです。"
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "短い状態情報を表示する"
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "コ接続状態、現在のアップロード／ダウンロード速度等を表示する。\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "詳細な統計ツリーを表示する。"
-
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"オプションとして、, 数0〜255を引数としてこのコマンドに渡すことができます。\n"
-"こういう風に、クライアント・バージョン・サブツリーの表示したいエントリー数を"
-"指示できます。\n"
-"ゼロ、または空欄の引数は'無制限'の意味を示します。\n"
-"\n"
-"例： 'statistics 5'は各クライアントの一番上の５つのバージョンしか表示しませ"
-"ん。\n"
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr ""
-
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "指示されたオブジェクトを再ロードします。"
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "共有ファイル・リストを再ロードします。"
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "指示されたIPフィルタ・テーブルをファイルから再ロードします。"
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "ネットワークへ接続します。"
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "%d個のKadコンタクトを書き込みました"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"これで個人設定に有効になっている全てのネットワークへ接続します。\n"
-"オプションとして、一つのサーバのみに接続したいなら、そのサーバのアドレスを"
-"「IP：ポート」\n"
-"形で指示できます。IPアドレスはIPv4形のドット10進数字、或いは解決できる\n"
-"DNS名として指示しなければなりません。"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "ファイル名"
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr ""
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "ファイルサイズ"
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Kadのみに接続します。"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "共有比"
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "ネットワークから切断します。"
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "アップロード済み"
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "これで現在に接続している全てのネットワークから切断します。\n"
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "要求済み"
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr ""
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "受付済み"
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Kadのみから切断します。"
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "ソース完了"
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "個人設定の値を設定してください。"
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "IPFilterを設定してください。"
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "クライアントとサーバの両方のIPフィルタリングをオンします。"
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "クライアントとサーバの両方のIPフィルタリングをオフします。"
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "クライアントのフィルタリングを有効／無効します。"
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "クライアントのフィルタリングをオンします。"
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "クライアントのフィルタリングをオフします。"
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "サーバのフィルタリングを有効／無効します。"
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "サーバのフィルタリングをオンします。"
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "サーバのフィルタリングをオフします。"
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "IPフィルタリング段階を選択してください。"
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"有効なフィルタリング段階は0〜255の間で、\n"
-"デフォルト値は127です。\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "帯域制限を設定します。"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "このコマンドの引数の値は毎秒のキロバイトです。\n"
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "不明なバージョン"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "アップロード・帯域幅の制限を設定します。"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "注意： スキンファイル '%s' を読むために開けませんでした"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "ダウンロード・帯域幅の制限を設定します。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "ハッシュ中"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "個人設定の値を取ってきて、表示します。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "完了中"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "IPFilterの個人設定の値を取ってきます。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "完了"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "クライアントとサーバの両方のIPFilter状況を取ってきます。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "停止"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "クライアントのみのIPFilter状況を取ってきます。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "エラーあり"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "サーバのみのIPFilter状況を取ってきます。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "待機"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "IPFilter段階を取ってきます。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "空のパスワードは無効です。"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "帯域制限の値を取ってきます。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "不正なパスワード、 MD5ハッシュではありません！"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "検索を実行します。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "接続に失敗しました"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
 msgstr ""
-"検索（search）の種類を下記から選択してください：\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"例：'search kad file'はkadで\"file\"を検索します。\n"
-
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "グローバル検索（GLOBAL）を実行します。"
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "ローカル検索（LOCAL）を実行します"
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Kadを検索します"
-
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "最後の検索の結果を表示します。"
-
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "以前の検索の結果を回答します。\n"
-
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "検索の進捗を表示します。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "ExternalConn: サーバーからの応答が不正です。接続を閉じました。"
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "検索の進捗を表示します。\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "成功です！aMuleへの接続を確立しました "
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "ファイルのダウンロードを開始します"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "成功です！接続を確立しました。"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
 msgstr ""
-"以前の検索からファイル番号を選んで指定しなければなりません。\n"
-"例： 'download 12'は以前の検索結果で12として指定されたファイルのダウンロード"
-"を開始します。\n"
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "ダウンロードを停止します。"
-
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "ダウンロードを再開します。"
-
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "ダウンロードをキャンセルします。"
-
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "ダウンロードのプライオリティーを設定します。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "外接続用のパスワード。"
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
-"ダウンロードのプライオリティーを低い（Low）、普通（Normal）、高い（High）、ま"
-"たはオート（Auto）に設定します。\n"
-
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "プライオリティーを低いに設定します。"
-
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "プライオリティーを普通に設定します。"
-
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "プライオリティーを高いに設定します。"
-
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "プライオリティーをオートに設定します。"
-
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "キュー／リストを表示します。"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
 msgstr ""
-"アップロード／ダウンロードキュー、サーバ・リスト、または共有リストを表示しま"
-"す。\n"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "アップロードキューを表示します。"
-
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "ダウンロードキューを表示します。"
-
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "ログを表示します。"
-
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "サーバ・リストを表示します。"
-
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "ログを再初期化します。"
-
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Deprecated command, use '%s' instead."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
 msgstr ""
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
 msgstr ""
-"これは廃止予定のコマンドで、将来に存在がなくなる可能性が高いです。\n"
-"代わりに'%s'を使用してください。\n"
 
-#: src/ServerSocket.cpp:259
-#, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr ""
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "閉じる"
 
-#: src/ServerSocket.cpp:274
-#, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr ""
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "カット"
 
-#: src/ServerSocket.cpp:417
-#, c-format
-msgid "New clientid is %u"
-msgstr "新しいclientidは%uです"
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "コピー"
 
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "注意：あなたはLow-IDを得られました！"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "ペースト"
 
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\t恐らくパソコンがファイラウォールやルータの裏にあるのが原因です。"
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "クリア"
 
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\t詳しい情報にはhttp://wiki.amule.orgを参考してください"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "全ての選択"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "不明なサーバ情報を受信しました！理由：短しぎます"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/ServerSocket.cpp:539
-#, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "%d個の新しいサーバを受信しました"
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "無制限"
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "サーバ・リストの保存を終了しました。"
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMuleのトレイ・メニュー"
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "サーバは最後のコマンドを断りました"
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr ""
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "サーバ%sから偽造のパケットが届きました"
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "UL：無制限"
 
-#: src/ServerSocket.cpp:607
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "サーバ%sのパケットを処理する時に未処理例外エラーが発生しました"
+msgid "UL: %u"
+msgstr "UL：%u"
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "%sに接続するためのDNS解決スレッドを作成せきません。"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DL：無制限"
 
-#: src/ServerSocket.cpp:729
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "IPアドレス%sのサーバ%sはフィルタリングされています。接続はしません。"
-
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "難読化プロトコルを使用しています。"
+msgid "DL: %u"
+msgstr "DL：%u"
 
-#: src/ServerSocket.cpp:748
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "%s（%s - %s：%i）%sへ接続中です。"
+msgid "Download speed: %.1f"
+msgstr ""
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "%sに接続するためのDNSは解決できませんでした：接続はできません！"
+msgid "Upload speed: %.1f"
+msgstr ""
 
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country()：次から国データはロードできませんでした："
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "クライアント情報"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "%d個の国旗ビットマップをロードしました。"
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr "本当にこのカテゴリの全てのファイルをキャンセルして削除しますか？"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "確認が必要です"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "他の全て"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "未完成"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "アクティブ"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "ビデオ"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "オーディオ"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "アーカイブ"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CDイメージ"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "画像"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "テキスト"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "ビュー・フィルタを選択してください"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "カテゴリを追加します"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "カテゴリを編集します"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "カテゴリを削除します"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "ファイル名"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "ファイルサイズ"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "共有比"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "アップロード済み"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "要求済み"
+msgid "Nickname: %s"
+msgstr "あだ名：%s"
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "受付済み"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "あだ名が選択されていません！"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "ソース完了"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "クライアントID："
 
-#: src/PartFileConvert.cpp:208
-#, c-format
-msgid "Importing %s: %s"
-msgstr "%s：%sをインポートします"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "切断しています"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "一時フォルダを読み中です"
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "サーバ名："
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "基本情報をダウンロード情報ファイルから取ってきます"
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "サーバIP："
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "当てファイルを作成中です"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "接続されていません"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "古いダウンロード・ファイル（%uから%u）からデータをロード中です"
+msgid "IP: %s"
+msgstr "IP：%s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
+msgid "TCP port: %d"
 msgstr ""
-"データ・ブロックを一つの新しいダウンロード・ファイル（%uから%u）に纏め中です"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "ソース・ダウンロードファイル情報を取ってきます"
 
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "ダウンロードを追加して、新しい部分ファイルを保存中です"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "部分ファイルをインポートをします"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "状況"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "ファイル・ハッシュ"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "待機中…"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr ""
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s（ディスク：%s）"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
+msgid "UDP port: %d"
 msgstr ""
-"一時ダウンロードを検索するフォルダを選択してください（サブフォルダは含まれま"
-"す）"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "成功にインポートしたダウンロードのソース・ファイルを削除しますか？"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "ソースを削除しますか？"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "バイト"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
 
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "B/s"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "秒"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "分"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "時間"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "日"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "ビデオ"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "アーカイブ"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "テキスト"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "プログラム"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "すべて"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "評価されていません"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "不正／損被／偽造"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "悪い"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "悪くない"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "良い"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "優秀"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr ""
 
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "全て"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "オンライン証明：有効です"
 
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "他の全て"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "オンライン証明：無効です"
 
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "IPフィルタ'ipfilter.dat'と'ipfilterstatic.dat'をロード中です。"
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
+#, c-format
+msgid "Uptime: %s"
+msgstr "動作時間： %s"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgid "Shared files: %d"
 msgstr ""
-"'ipfilter.dat'ファイル'%s'のロードに失敗しました：不明なファイル・フォーマッ"
-"トに出会いました。"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgid "Queued clients: %d"
 msgstr ""
-"'ipfilter.dat'ファイル'%s'のロードに失敗しました：不明なファイルを開くことは"
-"できませんでした。"
 
-#: src/IPFilter.cpp:331
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "%u個のIPレンジを'%s'からロードしました。"
+msgid "Total DL: %s"
+msgstr "DLの合計：%s"
 
-#: src/IPFilter.cpp:333
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "不正な形式の行を %u 個破棄しました。"
+msgid "Total UL: %s"
+msgstr "ULの合計：%s"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "アクティブな接続（1:%u）"
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr ""
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "ファイルの詳細"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr ""
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%%終わりました"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "aMuleを隠す"
 
-#: src/muuli_wdr.cpp:73
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "aMuleを表示する"
+
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "終了"
+
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "コミット"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4501,25 +2667,29 @@
 "イベントはここに表示されます。イベントの全てのリストにはサーバ・タブに存在す"
 "るログを参考してください。"
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "ロード中…"
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "接続中のサーバのユーザ数…"
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "ユーザ：0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr "現在接続中のサーバのユーザ数と合計ユーザ数の推測。"
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "アップ： 0.0 | ダウン： 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4527,7 +2697,7 @@
 "現在の平均アップロード・ダウンロード速度。有効であれば、ブレースに囲まれてい"
 "る数字はクライアント・コミュニケーションのオーバヘッドを意味します。"
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4538,519 +2708,574 @@
 "味します。黄色の矢印はlow ID（ファイアウォールされている）を意味します。緑色"
 "の矢印はhigh ID（最善の接続）を意味します。"
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "切断しています…"
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "現在接続しているサーバ。"
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "検索"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "名前："
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "タイプ"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "ローカル"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "グローバル"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "ファイル・ハッシュ"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "拡張パラメタ"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "フィルタリング"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "フィルタの種類"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "すべて"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "アーカイブ"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "オーディオ"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CDイメージ"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "画像"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "プログラム"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "テキスト"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "ビデオ"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "拡張子"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "最小サイズ"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "B"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "最大サイズ"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "入手可能範囲"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "フィルタ："
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "フィルタの結果"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "結果を反転する"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "既知のファイルを隠す"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "開始"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "もっと"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "中止"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "ダウンロード"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "フィールドをリセット"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "結果"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "完成したダウンロードをクリアします"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "アップロード／アップキューを表示します"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "キューに入っているクライアント："
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "送信する"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "指示するメッセージを送信します。"
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "閉じる"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "ソース完了"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "チャット・セションを閉じます。"
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "一般"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "完全名："
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "非適用"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "metファイル："
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "ハッシュ："
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "ファイル・サイズ："
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "部分ファイルの状態："
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "最後に完全として見た時間："
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "転送"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "見つかったソース："
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "転送中のソース："
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "ファイル部分の数："
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "入手可能数："
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "データ・レート："
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "ダウンロードのアクティブ時間："
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "転送済み："
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "完全サイズ："
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "I.C.H.（知的破損処理）"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "破損による損失："
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "圧縮による獲得："
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "I.C.H.に救済されたパケット："
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "ファイル名"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "引き継ぐ"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "クリーンアップ"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "適用"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 "ファイルへのコメントまたは評価を書き込んでください（テキストは全ユーザが見る"
 "ことができます）"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"映画なら、長さ、課題、言語等を説明できます…\n"
-"万が一偽造なら、それもaMuleの他のユーザに伝えることができます。"
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "ファイルの質"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "評価されていません"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "不正／損被／偽造"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "悪い"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "悪くない"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "良い"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "優秀"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "ファイルの評価を選択するか、または偽造の注意を他のユーザに伝えてください…"
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "リフレッシュする"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "ダウンロード中です。しばらくお待ちください…"
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "サイズが不明です"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "不可欠な情報"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IPアドレス："
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "ポート："
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "追加情報"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "ユーザ名："
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "ユーザ・ハッシュ："
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "共有ファイルを再ロードする"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "現在のセッション"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "合計"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "要求数："
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "アクティブなアップロード数："
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "追加"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "ダウンロード速度："
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "現在"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "移動平均"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "セッション平均"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "アップロード速度"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "接続数"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "アクティブなダウンロード数"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "アクティブな接続（1:1）"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "アクティブなアップロード数"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "統計木"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "ユーザ名："
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "ユーザ・ハッシュ："
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "クライアント・ソフトウェア："
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "クライアント・バージョン："
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IPアドレス："
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ユーザID："
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "サーバIP："
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "サーバ名："
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "難読化:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "クライアントへの転送数"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "現在の要求："
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "平均アップロード速度："
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "平均ダウンロード速度："
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "アップロード（セッション）："
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "ダウンロード（セッション）："
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "アップロード（合計）："
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "ダウンロード（合計）："
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "スコア"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "DL/UP変更："
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "セキュア認証："
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "評価（合計）："
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "キューに追加しました"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "キュースコア："
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "ニックネーム"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - Linux Mule"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "接続してくるユーザはこの名前を見ることになります。"
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "言語"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "ツールチップを表示するまでの遅延時間。"
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "コントロールに使う言語をここで指定します。"
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "その他のオプション"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "起動時に新バージョンを確認する"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "これを有効にするとaMuleはスタートアップの時に新バージョンをチェックする"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "起動時に最小化にする"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "これを有効にするとaMuleは起動時に最小化する。"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "終了時に確認する"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "aMuleが終了する時に確認します。"
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "トレイ・アイコンを有効にする"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "システム・トレイ、またはタスク・バーのアイコンを有効／無効にします。"
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "最小化時にトレイ・アイコンに入れる"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5058,585 +3283,461 @@
 "これを有効にするとaMuleはタスク・バーの代わりにシステム・トレイに最小化しま"
 "す。"
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "ツールチップ遅延時間（秒）"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "ツールチップを表示するまでの遅延時間。"
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "ブラウザ選択"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "こちらで自分のブラウザを選択してください"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "ユーザ定義のブラウザ："
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"選択したいブラウザの名前をここに入力してください。ユーザ定義のブラウザを利用"
-"するには、個人設定のメニュー・アイテムをドロップ・ダウン・メニューから選択し"
-"てください。"
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "閲覧"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "可能ならば新しいタブで開く"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "可能なら、ウェブ・ページを新しいウインドウではなくて新しいタブで開きます"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "ビデオ・プレイヤー"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "アップロード"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "スロット割り当て"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "標準クライアントTCPポート："
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "延長クライアントUDPポート："
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "無効にする"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
+
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "アドレスをバインドする"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "延長サーバ・リクエストのUDPポート（TCP+3）： 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "ファイルごとの最大ソース数"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "最大の接続数"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "ユニバーサル・プラグ・アンド・プレイ"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "UPnPを有効にする"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnPのTCPポート："
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "スタートアップに自動接続する"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "接続を失う時に再接続する"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "オーバヘッドの帯域幅を表示する"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "サーバのオプション"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "再試行後、応答のないサーバを削除する。再試行回数："
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "回"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "リスト"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "優先度システムを使用する"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "接続の時にLowIDチェックを使用する"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "安全接続"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "スタティック・リストに含まれているサーバのみに自動接続する"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "手動で追加したサーバを高い優先度に設定する"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H.を有効にする"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICHはすべてのハッシュを信頼する（非推奨）"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "ダウンロードファイルを停止モードで追加する"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "ダウンロードファイルを優先度を自動にして追加する"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "最初と最後のチャンクを先にダウンロードしようとする"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "新しい共有ファイルを自動優先度として追加する"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "すべてのアップロードにフル・チャンクを転送しようとする"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "ファイルが完了されたらすぐに次の停止されたファイルを始める"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "同じカテゴリから"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "珍しいファイルには10ソースを保存する（<20ソース）"
-
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "新しいファイルのためのディスク領域を事前に確保する"
+
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
 msgstr ""
+"新しいファイルのためにファイル全体が格納できるディスク領域を事前に確保し、断"
+"片化を防ぎます。"
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "望ましい最小のディスク領域をここに入力してください。"
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "新しいファイルのためのディスク領域を事前に確保する"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "珍しいファイルには10ソースを保存する（<20ソース）"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
-"新しいファイルのためにファイル全体が格納できるディスク領域を事前に確保し、断"
-"片化を防ぎます。"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "アップロード数"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "新しい共有ファイルを自動優先度として追加する"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "（再帰的に共有するにはフォルダ・アイコンを右クリックしてください）"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "隠れたファイルを共有する"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "グラフ"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "アップデート延期：５秒"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "平均グラフの時間：１００分"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "接続数のグラフスケール：１００"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "統計の色を選択する"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr ""
+
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "背景"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "グリッド"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "ダウンロード現在"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "ダウンロード移動平均"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "ダウンロードセッション平均"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "アップロード現在"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "アップロード移動平均"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "アップロードセッション平均"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "アクティブ接続数"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "システム・トレイ・アイコン・スピードバー"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "現在のKadノード数"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "動作中のKadノード数"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "セッションのKadノード数"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "選択"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "表示されているクライアントのバージョン数（0＝無制限）"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "ライン収容"
-
-#: src/muuli_wdr.cpp:2249
-#, fuzzy
-msgid "Note: These values are only used for statistics."
-msgstr ""
-"注意：この値は統計にしか\n"
-"使われていません。"
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "！！！注意！！！"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"この設定は、詳しい知識を持っていなければ変更しない\n"
-"方が良いです。変更すれば状況が悪くなる恐れが\n"
-"高いです。\n"
-"\n"
-"この設定を変更しなくてもaMuleはうまく動いて\n"
-"います。"
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "詳細な設定"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "最大の新しい接続数（5秒ごと）"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "ファイル・バファー・サイズ：240000バイト"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "アップロードキューサイズ：5000クライアント"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "サーバ接続のリフレッシュ空間：無効にする"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "ダウンロードキューにあるファイルの進捗"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "パーセンテージを表示する"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "進捗バーを表示する"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "進捗バーのスタイル"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "フラット"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "ラウンド"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "スキンのサポート"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "スキンのサポートを有効にする"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "スキン："
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- スキンがありません -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "コラムのソーティング"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
-"ダウンロードキューにあるファイルを自動ソーティングする（CPUを強く使用する）"
-
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMuleはダウンロードリストの列を自動的にソートする"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "雑なGUIの調整"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "延長情報をカテゴリ・タブで表示する"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "タイトルに転送速度を表示する"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "タイトルに転送速度を表示する"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "垂直ツールバー"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "ファイル名の前に部分ファイル番号を表示する"
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "スタートアップの時にamulewebを起動する"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "垂直ツールバー"
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "ページのリフレッシュ間隔（秒単位）"
-
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "gzip圧縮を有効にする"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "低権限ユーザを有効にする"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "フラット"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "全権限パスワード"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "ラウンド"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "低権限パスワード"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "ウェブテンプレート"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "aMuleはダウンロードリストの列を自動的にソートする"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "外部接続のパラメタ"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "外部接続を許可にする"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
-"聞いているインターフェイスのIPアドレス\n"
-"（空にすると任意）"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5645,75 +3746,116 @@
 "入力してください。空のフィールド、または0.0.0.0は任意のインターフェイスを意味"
 "します。"
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCPポート"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "ECポートでUPnPポート転送を有効にする"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "パスワード"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "ウェブテンプレート"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "全権限パスワード"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "低権限ユーザを有効にする"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "低権限パスワード"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "ページのリフレッシュ間隔（秒単位）"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "gzip圧縮を有効にする"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "設定の変更をすべて適用します。"
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "設定の変更を全てリセットする"
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "タイトル："
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "コメント："
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "受信ディレクトリ："
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "新しく割り当てられたファイルの優先度を変更する："
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "変更しない"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "このカテゴリの色を選択する（現在選択中）："
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "接続の時にサーバのmotd（今日のメッセージ）を表示する..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "サーバ情報"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "リセット"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "このボタンをクリックするとログのリセットが行います。"
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMuleのログ"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "このボタンをクリックするとサーバ・リストはURLから最新化する..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5721,43 +3863,55 @@
 "server.metファイルへのURLをここに入力してから左側のボタンをクリックすると、既"
 "知のサーバのリストがアップデートされます。"
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "新しいサーバの名前をここに入力してください"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:ポート"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "x.x.x.xフォーマットでサーバのIPアドレスを入力してください。"
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "サーバのポートをここに入力してください。"
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "手動でサーバを追加する（先に左側のフィールドを入力してください）..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMuleのログ"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "サーバ情報"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "ED2K情報"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad情報"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "このボタンをクリックするとノード・リストをURLからアップデートします..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "ノード数（0）"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5765,51 +3919,58 @@
 "ここにnodes.datファイルへのURLを入力してから左側のボタンをクリックすると、既"
 "知のノード・リストをアップデートします。"
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "ノードの統計"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "ブートストラップ"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "新しいノード"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP："
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "ポート："
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+#, fuzzy
+msgid "Bootstrap from known clients"
 msgstr ""
 "既知のクライアントから\n"
 "ブートストラップする"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Kadを切断する"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "セキュア・ユーザ保証（SUI）を使用する"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
 msgstr ""
+"このオプションを有効にするのは推奨されます。SUIが有効でないとあなたはクレジッ"
+"トを得られません。"
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "プロトコルを難読化する"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "プロトコルの難読化を有効にする"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5817,11 +3978,11 @@
 "このオプションによってプロトコルの難読化を有効にできます。そうすると、aMuleは"
 "他のクライアントからの難読化された接続を受け入れられます。"
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "外方向の接続に難読化を使用する"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5829,11 +3990,11 @@
 "このオプションによって、aMuleは他のサーバまたはクライアントに接続する時にプロ"
 "トコル難読化を使用します。"
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "難読化された接続のみを受信する"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5841,87 +4002,83 @@
 "このオプションによって、aMuleは難読化された接続のみを受信します。ソース数が減"
 "りますが、トラフィックが全て難読化されます。"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "ファイル・オプション"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "全員"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "共有ファイルの閲覧を許可する："
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "あなたの共有ファイル・リストを要求できるユーザを選択してください。"
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IPフィルタリング"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "クライアントをフィルタする"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "~/.aMule/ipfilter.datに登録されちるクライアントIPにフィルタリングをかけること"
 "を有効にします。"
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "サーバをフィルタする"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "~/.aMule/ipfilter.datに登録されちるサーバIPにフィルタリングをかけることを有効"
 "にします。"
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "リストを再ロードする"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 "フィルタリングをかける目標のIPリストを~/.aMule/ipfilter.datから再ロードをしま"
 "す。"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL："
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "只今アップデートする"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "スタートアップの時にipfilterを自動アップデートする"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "フィルタリング段階："
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "いつもLANのIPにフィルタリングをかける"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "適合しないIPを被害妄想的に扱う"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -5929,11 +4086,11 @@
 "クライアントIPがパケットがもともと受信されたIPと違いますとパケットを拒否しま"
 "す。使用するに気をつけてください。"
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "提供されていれば、全システム応用のipfilter.datファイルを使用する"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -5941,23 +4098,11 @@
 "ローカルなipfilter.datファイルが見つからなければ、全システム応用のipfilter."
 "datファイルを使用可能します。"
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "セキュア・ユーザ保証（SUI）を使用する"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"このオプションを有効にするのは推奨されます。SUIが有効でないとあなたはクレジッ"
-"トを得られません。"
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "オンライン証明を有効にする"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -5965,1196 +4110,3630 @@
 "OSファイルの書き込みを有効にします。このファイルは外のアプリケーションに証明"
 "等を作成するためにを使用されます。"
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "アップデート頻度（秒単位）"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "オンライン証明アップデート頻度（秒単位）を変化します。"
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "オンライン証明ディレクトリ："
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "ここをクリックするとオンライン証明ファイルが入っているディレクトリを選択でき"
 "ます。"
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "無効／有効"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "受信メッセージをフィルタする（現在のチャットを除く）："
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "フィルタ・オプション："
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "全てのメッセージをフィルタする"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "友達リストの入っていない方々からのメッセージをフィルタする"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "知らないクライアントからのメッセージをフィルタする"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "次のストリングが入っているメッセージをフィルタする（','で区分する）："
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "amuleがメッセージ・フィルタ／ブロックの目標にする言葉をここに追加してください"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "コメント"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "次のストリングが入っていコメントをフィルタする（','で区分する）："
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "プロクシー無しの自動的なサーバ接続"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "認証を有効にする"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "ユーザ名／パスワード認証を有効／無効にする"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr ""
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "プロクシーに接続に使うユーザ名"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "パスワード："
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "プロクシーに接続に使うパスワード"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "プロクシを有効にする"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "プロクシ・サポートを有効／無効にする"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "プロクシの種類："
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "接続するプロクシーの種類"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "プロクシー・ホスト："
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "プロクシー・ホスト名："
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "プロクシー・ポート："
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "プロクシーのポート"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "認証"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "認証を有効にする"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "ユーザ名／パスワード認証を有効／無効にする"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "プロクシーに接続に使うユーザ名"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "パスワード："
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "プロクシーに接続に使うパスワード"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "プロクシー無しの自動的なサーバ接続"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "次に接続する："
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "リモートamuleにログインする"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "ユーザ名"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "設定を記憶する"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "冗長なデバッグ・ロギングを有効にする"
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "メッセージのカテゴリ："
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "待機中…"
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "インポートを追加する"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "選択したものを再試行"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "選択したものを破棄"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "イベントの種類"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "アクティブなアップロード数："
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "共有ファイルを隠す"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "ビュー・フィルタを選択してください"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "アクティブなアップロード数"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "クライアントを表示する"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "リストを再ロードする"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "共有ファイルを再ロードする"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "送信する"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "指示するメッセージを送信します。"
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "チャット・セションを閉じます。"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "すべてのサーバ、もしくはKadに接続する"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "ネットワークウィンドウ"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "共有ファイル"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "検索ウィンドウ"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "使用不可能 [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "ファイル転送ウィンドウ"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "バイト"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "共有ファイルウィンドウ"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "メッセージウィンドウ"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "統計グラフウィインドウ"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "個人設定ウィンドウ"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "新しいカテゴリ"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "受信ファイルのフォルダを選択する"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "カテゴリに名前を与えなければなりません！"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "B/s"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "カテゴリにパスを与えなければなりません！"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "秒"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "分"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "時間"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "日"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "全て"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "他の全て"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "未完成"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "中断しています"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "ビデオ"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "アーカイブ"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "テキスト"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "アクティブ"
+
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
 msgstr ""
-"カテゴリに受信ディレクトリを生成するのに失敗しました。正当なパスを指示してく"
-"ださい！"
 
-#: src/ExternalConnector.cpp:141
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "'%s'コマンドに不明な拡張子'%s'。\n"
+msgid "Importing %s: %s"
+msgstr "%s：%sをインポートします"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "一時フォルダを読み中です"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "基本情報をダウンロード情報ファイルから取ってきます"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "当てファイルを作成中です"
+
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "不明なコマンド'%s'。\n"
+msgid "Loading data from old download file (%u of %u)"
+msgstr "古いダウンロード・ファイル（%uから%u）からデータをロード中です"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
-"\n"
-"このコマンドには引数は認められていません。\n"
+"データ・ブロックを一つの新しいダウンロード・ファイル（%uから%u）に纏め中です"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"このコマンドには引数が必要です。\n"
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "ソース・ダウンロードファイル情報を取ってきます"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "ダウンロードを追加して、新しい部分ファイルを保存中です"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "部分ファイルをインポートをします"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "状況"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "ファイル・ハッシュ"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s（ディスク：%s）"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"このコマンドは不完全です。下記から拡張をひとつ選択してください。\n"
+"一時ダウンロードを検索するフォルダを選択してください（サブフォルダは含まれま"
+"す）"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
-"\n"
-"利用可能な拡張：\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "成功にインポートしたダウンロードのソース・ファイルを削除しますか？"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "利用可能なコマンド：\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "ソースを削除しますか？"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "エラー：部分ファイルを作成できませんでした！"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "metファイルのバックアップを%sからロードしようとしています"
+
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
-"\n"
-"すべてのコマンドは大文字と小文字を区別しません。\n"
-"'%s <コマンド>'を入力すると<コマンド>の詳細情報が表示されます。\n"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "アプリケーションが終了します。"
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr ""
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "ヘルプを表示します。"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr ""
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"コマンドに対してヘルプを得るためには'help ＜コマンド＞'を入力してください。\n"
-"全てのコマンドのリストを得るためには'help'を入力してください。\n"
+"エラー： %s（%s）は破損されて（tagcountが間違っています）、ファイルはロード出"
+"来ません。"
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"コマンド・リストには'%s'を使用してください\n"
-"\n"
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "シンタックス・エラー！"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "ファイル情報を回復しようとしています…"
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "無名なファイルを回復中です：RecoveredFile.datとして回復しようとします"
+
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "得られる全てのファイル情報を回復しました：使用しようとしています…"
+
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "残念ながら、ファイル情報を回復できませんでした。"
+
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "%s（%s）を開くことはできませんでした"
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
-"コマンドを処理する時にエラーが発生しました。これはありえない！バッグをリポー"
-"トしてください\n"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "このコマンドには引数が認められていません。"
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "部分ファイル%s（%s ==> %s）の保存中にエラーが発生しました"
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "このコマンドには引数が不可欠です。"
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "部分ファイル%s（%s ==> %s）の保存中にエラーが発生しました"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "引数が不正です。"
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "'%s'の長さを読み込むことができませんでした。%sファイルを使用します。"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "このコマンドは不完全です。"
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "どうか、'%s'はゼロ・サイズです：%sファイルを使用しています。"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:994
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "'%s'を入力して、ヘルプを得てください。\n"
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "%sのためのpart.met.seedsファイルは保存できませんでした"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:1020
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "これは %s %s %s　です\n"
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "%i個のソース・シードを次の部分ファイルに保存しました：%s（%s）"
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:1049
 #, c-format
-msgid "This is %s %s\n"
-msgstr "これは %s %s　です\n"
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "部分ファイル%s（%s）にはシード・ファイルはありません"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "部分ファイル%s（%s）のシード・ファイルは空です"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr ""
+"部分ファイルのシード・ファイルを読む時にエラーが発生しました：（%s - %s）%s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"破損されている部分（%d）が%d部分、ファイル%sに見つかりました：FileResultHash "
+"|%s| FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "完成した部分（%i）が%sに見つかりました"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "%sの再ハッシュを終了しました"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr ""
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "ダウンロードが終了しました：%s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "ファイルを削除します：%s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"クライアントを生成中です…\n"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"OK、%s を終了中です…\n"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"空のパスワードでは接続できません。\n"
-"パスワードは設定ファイル、またはコマンド・ラインで指定するか、\n"
-"あるいは聞かれた時に入力しなければなりません。\n"
-"\n"
-"終了中です…\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "このヘルプ・テキストを表示する。"
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "注意：ディスク容量が足りません！ファイルを停止します：%s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "aMuleが起動しているホストです。（デフォルト：localhost）"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "ダウンロードした部分%i（ファイル：%s）は破損されています"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "aMuleの外接続用のポート。（デフォルト：4712）"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr ""
+"ICH：破損された部分%i（%sのため）を回復しました→：%s バイトを保存しました"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "外接続用のパスワード。"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "領域確保中"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "設定をファイルから読み込む。"
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr ""
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "アウトプットをstdoutにプリンとしないように。"
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "ダウンロード済み"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "冗長にして：デバッグ・メッセージも表示する。"
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "エラー: 部分ファイル '%s' が開けませんでした"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "プログラム・ロカールを設定する（言語）。"
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "システムの標準設定"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "コマンド・ライン・オプションを設定ファイルに書き込む。"
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "アルバニア語"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "aMuleの設定ファイルを元に設定ファイルを生成する。"
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "アラブ語"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "プログラム・バージョンをプリンとする。"
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "エストニア語"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "クレジット・ファイルをロードしました。%u個のクライアントが既知です"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "バスク語"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - %u個のクライアントのクレジット期限が満了しました！"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "ブルガリア語"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "'cryptkey.dat'が見つかりませんでした。生成します。"
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "カタロニア語"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"エラー：外部接続が無効にされている時にはaMuleのデーモンは使用できません。外部"
-"接続を有効にするには、普通のaMuleを使用するか、あるいはamuledをオプション--"
-"ec-configで起動させるか、あるいはファイル~/.aMule/amule.confの中でキー"
-"\"AcceptExternalConnections\"を１に設定してください。"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "中国語（簡体字）"
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "エラー： %s"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "中国語（繁体字）"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "接続禁止を解除する"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "アップロードを表示する"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "キューを表示する"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "クロアチア語"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "クライアントを表示する"
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "チェコ語"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "表示モードを選択する"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "クライアント・ソフトウエア"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "待機時間"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "アップロード時間"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "アップロード／ダウンロード"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "リモートの状態"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR：%u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "ファイルの優先度"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "デンマーク語"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "スコア"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "オランダ語"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "聞かれた"
-
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "最後に確認した時間"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "キューに入った時間"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "英語（U.K.）"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "アップロードの状態"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "エストニア語"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "フィンランド語"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "アップに転送された"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "フランス語"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "ダウンロードの状態"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "ガリシア語"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "ダウンに転送された"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "ユーザ・ハッシュ"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "暗号化された"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "ドイツ語"
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "共有ファイルを隠す"
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "ギリシア語"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "クライアントの詳細"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "ヘブライ語"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "有効"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "ハンガリー語"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "サポート"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "イタリア語"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "非サポート"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "イタリア語（スイス）"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "無効"
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "日本語"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "韓国語"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "不完全です"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "リトアニア語"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "悪意の相手"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "ルウェー語"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "検証されています"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "ポーランド語"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "利用不可能です"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "ポルトガル語"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR：%u)"
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "ポルトガル語（ブラジル）"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "ロシア語"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "スロベニア語"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "スペイン語"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "スウェーデン語"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "トルコ語"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
 msgstr ""
-"最小サイズは最大サイズより小さくなければなりません。最大サイズを無視します。"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "検索の注意"
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "言語"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "無制限"
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMuleのトレイ・メニュー"
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "利用不可"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
+#: src/Preferences.cpp:902
+msgid "no options available"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "UL：無制限"
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "UL：%u"
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
+"サーバのUDPソケトがTCP+3であるためTCPポートを65532以上には設定できません"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DL：無制限"
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
+msgstr "デフォルトポートを使用します (%d)"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/Preferences.cpp:1790
 #, c-format
-msgid "DL: %u"
-msgstr "DL：%u"
+msgid "Dropping non-existing shared directory: %s"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "接続"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "ディレクトリ"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "サーバ数"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "ファイル"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "セキュリティ"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "プロクシ"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "リモート制御"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "オンライン署名"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "イベント"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "デバッグ"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"この設定は、詳しい知識を持っていなければ変更しない\n"
+"方が良いです。変更すれば状況が悪くなる恐れが\n"
+"高いです。\n"
+"\n"
+"この設定を変更しなくてもaMuleはうまく動いて\n"
+"います。"
+
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "Download speed: %.1f"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "Upload speed: %.1f"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "クライアント情報"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "接続するプロクシーの種類"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:534
 #, c-format
-msgid "Nickname: %s"
-msgstr "あだ名：%s"
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "あだ名が選択されていません！"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr "この変更点を有効するにはaMuleを再起動しなければなりません：\n"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "クライアントID："
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCPポートを変更しました。\n"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "サーバ名："
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDPポートを変更しました。\n"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "サーバIP："
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "外部接続は終了しました。"
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP：%s"
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "新しい外部接続を認められました"
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "外部接続は終了しました。"
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
 msgstr ""
+"外部接続を有効にしましたがパスワードを設定していません。\n"
+"有効なパスワードを設定しないと外部接続を可能できません。"
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- 言語を変更しました。\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- 一時フォルダを変更しました。\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+#, fuzzy
+msgid "- ED2K network enabled.\n"
+msgstr "全てのネットワークが無効になっています。"
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
 msgstr ""
+"UDPポートが無効になっているとKadは開始できません。\n"
+"UDPポートを有効にするか、またはKadを無効にしてください。"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "オンライン証明：有効です"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"必ず早急にaMuleを再起動してください。\n"
+"今すぐに再起動しなければ、挙動がおかしくなる可能性があります。\n"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "オンライン証明：無効です"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"オートアップデートサーバリストが空です。\n"
+"せめて一つのURLを入力して、有効なserver.metファイルを指定してください。\n"
+"このチェックボクスの近くの\"表\"ボタンをクリックして、URLを入力してください。"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "一時ファイル"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "受信ファイル"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "オンライン署名"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "Shared files: %d"
-msgstr ""
+msgid "Choose a folder for %s"
+msgstr " %s のためのフォルダを選択する"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "ビデオプレイヤーを選択する"
+
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "ブラウザを選択する"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "Queued clients: %d"
+msgid "Executable%s"
+msgstr "実行ファイル%s"
+
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
 msgstr ""
+"server.metファイルをダウンロードするURLをここに追加してください。\n"
+"一行にひとつのURLのみです。"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
 #, c-format
-msgid "Total DL: %s"
-msgstr "DLの合計：%s"
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "アップデート遅延時間： %d 秒"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "Total UL: %s"
-msgstr "ULの合計：%s"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "平均グラフの時間： %d 分"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "接続グラフスケール： %d"
+
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "ファイルバッファサイズ： %d バイト"
+
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "アップロードキューサイズ： %d クライアント"
+
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "サーバ接続リフレッシュ遅延時間： %d 分"
+
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "サーバ接続リフレッシュ遅延時間： 無効"
+
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "無効にする"
+
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr " `%s' イベントにコマンドを実行する"
+
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "コアにコマンドを実行することを有効にする"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "コアコマンド："
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "GUIにコマンドを実行することを有効にする"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "GUIコマンド："
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "次の変数は置換されます："
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
+"最小サイズは最大サイズより小さくなければなりません。最大サイズを無視します。"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "検索の注意"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "メイン"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kadが走っていない中にはKadの検索はできません"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "aMuleを隠す"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Kadを検索する間に不明なエラーが発生しました： "
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "aMuleを表示する"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "ファイルID"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "ファイル"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "カテゴリにダウンロードする"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "このファイルにオプショナルURLを追加する"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr ""
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "既知ファイルとしてマークする"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr ""
+
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "キャンセル"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr ""
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"難読化されたすべてのサーバへの接続に失敗しました。難読化せずにもう一度試みま"
+"す。"
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "リストされたすべてのサーバへの接続に失敗しました。もう一度試行します。"
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr ""
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "チャット・セションを開始しました：%s（%s：%u）-%s %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "%s（%s：%i）に接続しています"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** クライアントに接続しています ***"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr " %s に接続を確立しました"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** クライアントに接続中です ***"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"接続中に致命的なエラーが発生しました。インターネット接続がダウンしている恐れ"
+"があります。"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** クライアントに接続に失敗しました／接続を失いました ***"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "%s（%s：%i）の接続を失いました"
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "タブを閉める"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s（%s：%i）は応答しないようです。"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "全てのタブを閉める"
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s（%s：%i）は一杯のようです。"
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "他のタブを閉める"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "自動的なサーバへの接続は、あと%d秒で再試行します"
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "接続を失いました"
+
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "%s（%s：%i）の接続に失敗しました。"
+
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr ""
+
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "%s（%s：%i）の接続の試しがタイムアウトました。"
 
-#: src/ServerList.cpp:84
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr ""
+
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "server.metファイルをロード中です：%s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Server.metファイルは見つかりませんでした！"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "server.metファイル'%s'をロードに失敗しました。不明なフォーマットが原因です。"
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "server.metを開くのに失敗しました！"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "server.metファイルは破損しています。不正なバージョン・タグが見つかりました："
 "0x%x、サイズ %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "server.metに%i個のサーバが見つかりました"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d個のサーバが追加されました"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "known.metファイル%sを読む時にIOエラーが発生しました"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "サーバは追加されていません：[%s:%d]は正当なポートを指示していません。"
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr ""
 "サーバは追加されていません：[%s:%d]はフィルタされているか、または不正です。"
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "サーバは追加されていません：同じ[%s:%d]のIP:ポートはリストに見つかりました。"
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "サーバは追加されました：[%s:%d]は'%s'という名前を使用しています。"
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr ""
 "削除しようとするサーバには現在接続しています。先に切断を行ってください。"
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "'%s'を開くことができませんでした"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "server.metを保存するのに失敗しました！"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "不正なURL"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
 msgstr "サーバリストを%sからダウンロードするのを完了しました"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "サーバリストを%sからダウンロードするのに失敗しました"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
 msgstr ""
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "サーバリストを%sからダウンロードするのを開始する"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "addresses.datに、正しいserver.metの自動ダウンロードURLがありません。"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "サーバリストを%sからダウンロードするのに失敗しました"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr ""
 "ローカル・サーバはIPFiltersにフィルタされているため、違うサーバに接続します！"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "イベント'%2$s'にコマンド'%1$s'を起動できませんでした。"
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "サーバ名"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "アドレス"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "ポート"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "説明"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "ユーザ"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "スタティック"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "バージョン"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"申し訳ありませんが、設定の変更を行ったため、あなたのロケールはシステム標準に"
-"変更されました。"
+"接続中のサーバを削除しようとしています。先に切断してください。 このサーバは削"
+"除されませんでした。"
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "（不明な名前）"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "スタティックサーバ %s を本当に削除しますか？"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "サーバ （%i）"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "サーバ"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "サーバへ接続する"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "サーバをスタティックとしてマークする"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "サーバを非スタティックとしてマークする"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "サーバをスタティックとしてマークする"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "サーバを非スタティックとしてマークする"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "サーバを削除する"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "サーバを削除する"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "全てのサーバを削除する"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
 msgstr ""
-"サーバリストにはサーバが一つも入っていません。今aMuleに新しいサーバリストをダ"
-"ウンロードしますか？"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "サーバリストのダウンロード"
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "サーバへ再接続する"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "全てのサーバを本当に削除しますか？"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "全ての選択されたサーバを本当に削除しますか？"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "全ての選択されたサーバを本当に削除しますか？"
+
+#: src/ServerSocket.cpp:259
 #, c-format
-msgid "web server running on pid %d"
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/amule.cpp:937
+#: src/ServerSocket.cpp:413
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "指定したアドレスにポートをバインドできませんでした: %s"
+msgid "New clientid is %u"
+msgstr "新しいclientidは%uです"
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "注意：あなたはLow-IDを得られました！"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\t恐らくパソコンがファイラウォールやルータの裏にあるのが原因です。"
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\t詳しい情報にはhttp://wiki.amule.orgを参考してください"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "不明なサーバ情報を受信しました！理由：短しぎます"
+
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "ポート%uは利用できません。あなたにはLOWIDが与えられます\n"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "%d個の新しいサーバを受信しました"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "サーバ・リストの保存を終了しました。"
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "サーバは最後のコマンドを断りました"
 
-#: src/amule.cpp:970
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Bogus packet received from server: %s"
+msgstr "サーバ%sから偽造のパケットが届きました"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "サーバ%sのパケットを処理する時に未処理例外エラーが発生しました"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "%sに接続するためのDNS解決スレッドを作成せきません。"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "IPアドレス%sのサーバ%sはフィルタリングされています。接続はしません。"
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "難読化プロトコルを使用しています。"
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "%s（%s - %s：%i）%sへ接続中です。"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "%sに接続するためのDNSは解決できませんでした：接続はできません！"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
 msgstr ""
-"ポート%uは利用できません\n"
-"\n"
-"したがって、あなたにはLOWIDが与えられます\n"
-"\n"
-"ネットワークを調べ、ポートが入出力に対して開いているか確認してください。"
+"サーバは追加しませんでした：IPまたはホスト名は指示されていませんでした。"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "オンライン証明ファイルの生成に失敗しました"
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "サーバは追加しませんでした：不正なサーバ・ポートが指示されました。"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "aMuleのオンライン証明ファイルの生成に失敗しました"
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr ""
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kademliaのステータス："
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "%s に起動しています"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "走っています"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "ステータス："
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "接続状況："
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr ""
+
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "接続状況："
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr ""
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "ファイアワォールされた状況："
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "仲間がありません"
+
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "仲間と接続しています"
+
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "仲間と接続しています"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "見つかったソース："
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr ""
+
+#: src/ServerWnd.cpp:254
+#, fuzzy
+msgid "Indexed notes:"
+msgstr "インデックスファイルが見付かりませんでした： "
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr ""
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "平均のユーザ数："
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "平均のファイル数："
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "動作していません"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr ""
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "%i個の既知の共有ファイルが見つかりました"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "%i個の既知、%i個の未知の共有ファイルが見つかりました"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr ""
+
+#: src/SharedFileList.cpp:410
+#, fuzzy, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "サーバは見付かりませんでした： %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "ユーザ名"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "ダウンロード速度："
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "アップロード速度"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "入手可能数："
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "アップロードの状態"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "ダウンロードの状態"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "ファイル名"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "共有ファイル"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "要求"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "認められた要求"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "転送されたデータ"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "共有比"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "得られた部分"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "完成したソース"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "ディレクトリパス"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "コメントおよび評価を追加する"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "コメントおよび評価を編集する"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "改名する"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "コレクションに存在するファイルを転送リストに追加する"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "マグネット &URI をクリップボードにコピーする"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "有効なソースリンクを作るにはHighIDが必要です"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "共有ファイル（%i）"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[部分ファイル]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "ファイル名"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "アップロードされたデータ（セッション合計）： %s"
 
-#: src/amule.cpp:1299
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "合計オーバヘッド（パケット数）： %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "ファイル要求のオーバヘッド（パケット数）： %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "ソース交換のオーバヘッド（パケット数）： %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "サーバのオーバヘッド（パケット数）： %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Kadのオーバヘッド（パケット数）： %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "暗号化オーバーヘッド (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "アクティブなアップロード数： %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "待機中のアップロード数： %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "成功したアップロードセッションの合計： %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "失敗したアップロードセッションの合計： %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "平均アップロード時間： %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "ダウンロードされたデータ（セッション合計）： %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "見付かったソース： %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "アクティブなダウンロード数（塊数）： %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "セッションの合計UL/DL比： %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "再接続数： %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "最初の転送からの経過時間： %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "サーバへの接続時刻： %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "アクティブな接続数（推測）： %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "最大接続数への到達： %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "平均接続数（推測）： %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "ピーク接続数（推測）： %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "クライアント数"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "サイズが不明です"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "フィルタされた数"
+
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "接続禁止"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "合計： %i 既知： %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "動作サーバ数： %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "失敗したサーバ数： %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "合計： %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "削除されたサーバ数： %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "フィルタされたサーバ数： %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "動作サーバのユーザ数： %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "動作サーバのファイル数： %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "ユーザ合計： %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "ファイル合計： %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "サーバ占有： %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "共有ファイル数： %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "共有ファイルの合計サイズ： %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr ""
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "オペレーティング・システム"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "受信していません"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "アクティブな接続（1:%u）"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "利用不可"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "記録なし"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr ""
+"PID `%2$d' のコマンド  `%1$s' がステータスコード  `%3$d' で終了しました。"
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "<str>を実行してから終了する。"
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "不正なIPフォーマット。xx.xxx.xxx.xxx:xxxxを使用ください\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"選択したロケールはあなたのシステムにインストールされていないようです。（注"
-"意：いずれにせよ設定を試みます）"
+"このコマンドには引数が必要です。有効な引数：'all'、ファイル名、または数字。\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "ハッシュで処理しています: "
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "ファイル名で処理しています: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr "このコマンドには引数が必要です。有効な引数：ファイルのハッシュ。\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "正当な数字ではありません\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "正当なハッシュではありません（長さは丁度32半角文字あるべきです）\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "不明なエラーによって要求が失敗しました。"
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "オペレーションは成功しました。"
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "初めてaMule %sを起動しています"
+msgid "Request failed with the following error: %s"
+msgstr "リクエストは次のエラーで失敗しました：%s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "このバージョンはテスト・バージョンで、毎日更新されているものです。\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "クライアントのIPフィルタリングは%sです。\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "オフ"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "オン"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "サーバのIPフィルタリングは%sです。\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "現在のIPフィルタ段階は%dです。\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
 msgstr ""
-"あなたに損害を与えないということは保証できません。家を焼いてしまうかも知れな"
-"いし、\n"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/TextClient.cpp:699
+msgid "eD2k"
 msgstr ""
-"犬を殺してしまうかも知れません。しかし、安全に使用できる「はず」です。\n"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "%s %s %sに接続されています"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "只今接続中です"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "ファイアウォールされています"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"次のオプションは、セキュリティーのために今回のリリースで変更されました：\n"
+"\n"
+"ダウンロード数：\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* プロトコル難読化を、受信・発信両方の接続に対して有効にしました。\n"
+"アップロード数：\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* サーバリストを他のサーバやクライアントから更新することを無効にしました。\n"
+"キューに入っているクライアント数：\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"この変更についての詳しい情報はaMuleのwiki、すなわち\n"
-"http://wiki.amule.orgを\"fake servers\"に対して検索してください。\n"
-"aMuleが正しく動作するため、サーバリストから全ての偽サーバを消すことが重要で"
-"す。"
+"合計ソース数：\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "検索結果数：%i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr ""
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "サーバから不明な返事が届きまして、OpCodeは%#xです。"
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "短い状態情報を表示する"
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "コ接続状態、現在のアップロード／ダウンロード速度等を表示する。\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "詳細な統計ツリーを表示する。"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"オプションとして、, 数0〜255を引数としてこのコマンドに渡すことができます。\n"
+"こういう風に、クライアント・バージョン・サブツリーの表示したいエントリー数を"
+"指示できます。\n"
+"ゼロ、または空欄の引数は'無制限'の意味を示します。\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"例： 'statistics 5'は各クライアントの一番上の５つのバージョンしか表示しませ"
+"ん。\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
 msgstr ""
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
-"私たちのホームページwww.aMule.org、またはIRCチャネルirc.freenode.netの#aMule"
-"には、\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "詳細な情報、サポートや新しいリリースがあります。\n"
+#: src/TextClient.cpp:859
+#, fuzzy
+msgid "Reload the given object."
+msgstr "指示されたオブジェクトを再ロードします。"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "バグはhttp://forum.amule.orgに気楽に報告してください"
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
+msgstr "共有ファイル・リストを再ロードします。"
+
+#: src/TextClient.cpp:862
+#, fuzzy
+msgid "Reload IP filtering table."
+msgstr "指示されたIPフィルタ・テーブルをファイルから再ロードします。"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:863
+#, fuzzy
+msgid "Reload current IP filtering table."
+msgstr "IPフィルタリング段階を選択してください。"
+
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "指示されたIPフィルタ・テーブルをファイルから再ロードします。"
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr ""
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "ネットワークへ接続します。"
+
+#: src/TextClient.cpp:868
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
-"あなたが指定したオンライン証明ファイルのフォルダは不正です！\n"
-"設定で訂正するまでオンライン証明を無効にします。"
+"これで個人設定に有効になっている全てのネットワークへ接続します。\n"
+"オプションとして、一つのサーバのみに接続したいなら、そのサーバのアドレスを"
+"「IP：ポート」\n"
+"形で指示できます。IPアドレスはIPv4形のドット10進数字、或いは解決できる\n"
+"DNS名として指示しなければなりません。"
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "ファイル '%s' のディスク領域の事前確保が失敗しました: %s"
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr ""
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "エラー：ログファイルを開くことはできません"
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Kadのみに接続します。"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "注意：ログファイルは空です。何かがおかしいです。"
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "ネットワークから切断します。"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "ログはリセットされました"
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "これで現在に接続している全てのネットワークから切断します。\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr ""
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Kadのみから切断します。"
 
-#: src/amule.cpp:1826
+#: src/TextClient.cpp:877
+#, fuzzy
+msgid "Add an eD2k or magnet link to core."
+msgstr "コアにED2K、またはマグネット・リンクを追加します。"
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
+"\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "個人設定の値を設定してください。"
+
+#: src/TextClient.cpp:883
+#, fuzzy
+msgid "Set IP filtering preferences."
+msgstr "IPFilterを設定してください。"
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "クライアントとサーバの両方のIPフィルタリングをオンします。"
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "クライアントとサーバの両方のIPフィルタリングをオフします。"
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "クライアントのフィルタリングを有効／無効します。"
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "クライアントのフィルタリングをオンします。"
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "クライアントのフィルタリングをオフします。"
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "サーバのフィルタリングを有効／無効します。"
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "サーバのフィルタリングをオンします。"
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "サーバのフィルタリングをオフします。"
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "IPフィルタリング段階を選択してください。"
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
+msgstr ""
+"有効なフィルタリング段階は0〜255の間で、\n"
+"デフォルト値は127です。\n"
+
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "帯域制限を設定します。"
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "このコマンドの引数の値は毎秒のキロバイトです。\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "アップロード・帯域幅の制限を設定します。"
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "ダウンロード・帯域幅の制限を設定します。"
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "個人設定の値を取ってきて、表示します。"
+
+#: src/TextClient.cpp:905
+#, fuzzy
+msgid "Get IP filtering preferences."
+msgstr "IPFilterの個人設定の値を取ってきます。"
+
+#: src/TextClient.cpp:906
+#, fuzzy
+msgid "Get IP filtering state for both clients and servers."
+msgstr "クライアントとサーバの両方のIPFilter状況を取ってきます。"
+
+#: src/TextClient.cpp:907
+#, fuzzy
+msgid "Get IP filtering state for clients only."
+msgstr "クライアントのみのIPFilter状況を取ってきます。"
+
+#: src/TextClient.cpp:908
+#, fuzzy
+msgid "Get IP filtering state for servers only."
+msgstr "サーバのみのIPFilter状況を取ってきます。"
+
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "IPフィルタリング段階を選択してください。"
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "帯域制限の値を取ってきます。"
+
+#: src/TextClient.cpp:913
+#, fuzzy
+msgid "Execute a search."
+msgstr "Kadを検索します"
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
+msgstr ""
+"検索（search）の種類を下記から選択してください：\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"例：'search kad file'はkadで\"file\"を検索します。\n"
+
+#: src/TextClient.cpp:915
+#, fuzzy
+msgid "Execute a global search."
+msgstr "グローバル検索（GLOBAL）を実行します。"
+
+#: src/TextClient.cpp:916
+#, fuzzy
+msgid "Execute a local search"
+msgstr "ローカル検索（LOCAL）を実行します"
+
+#: src/TextClient.cpp:917
+#, fuzzy
+msgid "Execute a kad search"
+msgstr "Kadを検索します"
+
+#: src/TextClient.cpp:919
+#, fuzzy
+msgid "Show the results of the last search."
+msgstr "最後の検索の結果を表示します。"
+
+#: src/TextClient.cpp:920
+#, fuzzy
+msgid "Return the results of the previous search.\n"
+msgstr "以前の検索の結果を回答します。\n"
+
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "検索の進捗を表示します。"
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "検索の進捗を表示します。\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "ファイルのダウンロードを開始します"
+
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
+"以前の検索からファイル番号を選んで指定しなければなりません。\n"
+"例： 'download 12'は以前の検索結果で12として指定されたファイルのダウンロード"
+"を開始します。\n"
+
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "ダウンロードを停止します。"
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "ダウンロードを再開します。"
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "ダウンロードをキャンセルします。"
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "ダウンロードのプライオリティーを設定します。"
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr ""
+"ダウンロードのプライオリティーを低い（Low）、普通（Normal）、高い（High）、ま"
+"たはオート（Auto）に設定します。\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "プライオリティーを低いに設定します。"
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "プライオリティーを普通に設定します。"
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "プライオリティーを高いに設定します。"
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "プライオリティーをオートに設定します。"
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "キュー／リストを表示します。"
+
+#: src/TextClient.cpp:950
+#, fuzzy
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"アップロード／ダウンロードキュー、サーバ・リスト、または共有リストを表示しま"
+"す。\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "アップロードキューを表示します。"
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "ダウンロードキューを表示します。"
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "ログを表示します。"
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "サーバ・リストを表示します。"
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "ログを再初期化します。"
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "サーバ・メッセージ：%s"
+msgid "Deprecated command, use '%s' instead."
+msgstr ""
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "ノード・リストをダウンロードのに失敗しました。"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"これは廃止予定のコマンドで、将来に存在がなくなる可能性が高いです。\n"
+"代わりに'%s'を使用してください。\n"
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "ダウンロードされたバージョン確認ファイルを開くのに失敗しました。"
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMuleテキストクライアント"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "破損されたバージョン確認ファイル"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "'%s' の古いAICHハッシュセットを '%s' の64bに変換中です。"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "あなたは古いバージョンのaMuleを使用しています！"
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "警告：ファイル名 '%s' は無効です。'%s' に改名されました。"
 
-#: src/amule.cpp:1907
+#: src/ThreadTasks.cpp:454
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "あなたのaMuleバージョンは%i.%i.%iで、最新バージョンは%li.%li.%liです"
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"警告：ファイル '%s' は既に存在します。新しいファイルを '%s' に改名しました。"
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "最新バージョンはいつもhttp://www.amule.orgにあります"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr "本当にこのカテゴリの全てのファイルをキャンセルして削除しますか？"
+
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "確認が必要です"
+
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
+
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "接続が多すぎます"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "他の全て"
 
-#: src/amule.cpp:1911
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "ビュー・フィルタを選択してください"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "カテゴリを追加します"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "カテゴリを編集します"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "カテゴリを削除します"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
 msgstr ""
-"警告：あなたのaMuledバージョンは古くなっています：%i.%i.%i < %li.%li.%li"
+"ファイル（%s）を開くことができませんでした。共有ファイルのリストから外しま"
+"す。"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "あなたのaMuleは最新のバージョンです。"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "不明なファイルのハッシュセットが要求されました： %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "バージョン確認ファイルのダウンロードに失敗しました"
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
+msgstr "ファイル %s のアップロードを再開します"
 
-#: src/amule.cpp:2025
+#: src/UploadQueue.cpp:613
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "ユーザ: %s | ファイル: %s"
+msgid "Suspending upload of file: %s"
+msgstr "ファイル %s のアップロードを一時停止します"
 
-#: src/amule.cpp:2026
+#: src/UserEvents.cpp:138
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "ユーザ: E: %s K: %s | ファイル: E: %s K: %s"
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "イベント'%2$s'にコマンド'%1$s'を起動できませんでした。"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "ネットワークが選択されていません"
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "ダウンロード完了"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "ファイルのフルパス。"
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "パス部分を除いたファイルの名前。"
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr ""
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "ファイルのサイズ（バイト）。"
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "累計ダウンロード活動時間"
 
-#: src/amule.cpp:2102
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "新しいチャットセッションの開始"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "メッセージ送信者。"
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "空き容量不足"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "ディスク・パーティション。"
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "完了中にエラー"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Connected to %s %s"
-msgstr "接続しています：%s %s"
+msgid "Processing file number %u: %s"
+msgstr "ファイル %u: %s 番を処理中です"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr ""
+"パートハッシュを要求しました（9.5MB以上のファイルサイズのみに使用されます）"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Connecting to %s"
-msgstr "%sに接続中です"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> このファイルは存在していません！\n"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kadを開始しました。"
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "ようこそ！"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kadを中止しました。"
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "入力パラメタ"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Kadに接続しています（OK）"
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "ハッシュをするファイル"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Kadに接続しています（ファイアウォール）"
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "このファイルにオプショナルURLを追加する"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Kadから切断しています"
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr ""
 
-#: src/amule.cpp:2191
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
-"UDPポートが設定で無効にされていると、Kadネットワークを使用できないため、開始"
-"しません。"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kadネットワークは設定で無効にされているため、接続はしません。"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "削除"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "パートハッシュでリンクを生成する"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
 msgstr ""
+"リンクサイズが大きくなるかわりに、新しくて珍しいファイルの配布を速くする"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4ファイルハッシュ"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "保存する"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "クリップボードへコピーする"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "aLinkCreatorについて"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "現在コピーできる物がありません！"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "開くことができません： "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "空でないファイル名を入力してください"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "現在保存できるものがありません！"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "ハッシュ中…"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
 msgstr ""
 
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "キャンセルされました！"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
+#, c-format
+msgid "Done in %.2f s"
+msgstr " %.2f 秒で完了しました"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "このURLはもう追加しました！"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "空でないURLを入力してください"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s を開くことができません"
+
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i 日 %i 時間 %i 分 %i 秒"
+
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas、aMuleのオンライン統計"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "wxCasの起動以来の最大DL速度"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "前のwxCas起動を含めて記憶した最大DL速度"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "システム"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "オートリフレッシュを中止する"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "オンライン統計イメージを保存する"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "オンライン統計イメージを印刷する"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "設定"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "wxCasについて"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "オートリフレッシュを開始する"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "オートリフレッシュを中止しました"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "オートリフレッシュを開始しました"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "統計イメージを保存する"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMuleのオンライン統計"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
+msgstr ""
+"印刷中に問題が発生しました。\n"
+"選択されたプリンタの設定に異常がありませんか？"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "印刷中です"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas、aMuleのオンライン署名統計\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pedro de Oliveira <falso@rdk.homeip.net>のCASに基づいています\n"
+"\n"
+"GPLの元で配布されます"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "aMuleは動作していません…"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMuleは動作しています"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMuleは動作していますが接続はしていません"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMuleは接続中です…"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "aMuleのステータスは不明です…"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " の動作時間は "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " は停止しています！"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " は接続していません！"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " は接続中です…"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " の挙動が変です。チェックしてください！"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " は次のものに接続しています： "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kas: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "オフ"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " はオンです "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " とともに "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "合計ダウンロード： "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr "、 アップロード： "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "セッションダウンロード： "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "ダウンロード： "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s、アップロード： "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "共有： "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " ファイル、キュー中のクライアント： "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "時間： "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " オン "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "システムロード平均 （1-5-15分）： "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "システム動作時間： "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "amulesig.datファイルの入っているディレクトリ"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "amulesig.datファイルが入っているディレクトリをここに入力してください"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "リフレッシュレート間隔（秒）"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "各リフレッシュイベントで統計イメージを生成する"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "統計イメージを生成したいディレクトリをここに入力してください"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "統計イメージを定期的にFTPサーバへアップロードする"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTPのUrl"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTPのパース"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "FTPサーバのURLをここに入力してください"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "統計イメージを置きたいFTPサーバのディレクトリをここに入力してください"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "ユーザ"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "FTPサーバのログインに使うユーザ名をここに入力してください"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "FTPサーバのログインに使うパスワードをここに入力してください"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "FTPアップデートレート間隔（分）"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "実証"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "署名ファイルが入っているフォルダ"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "統計イメージを生成するフォルダ"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "テンプレート <str> をロードします"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnPポート"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "gzip圧縮を使用する"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "ゲストアクセスを許可する"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "ゲストアクセスを拒否する"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMuleの設定ファイルパス。注意：直接使用しないでください！"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "PHPインタープリタを無効にする（非推奨）"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "各要求ごとにPHPページを再コンパイルする"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMuleウェブサーバ"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "ウェブクライアント接続が受け入れられました\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "次のエラーによって要求が失敗しました： %s。"
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "インデックスファイルが見付かりませんでした： "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "セッション有効期限が切れました - ログインを要求しています\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "セッションOK、ログインしています\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "セッションOK、ログインしていません\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "セッションが開いていません - ログインを要求します\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "セッションを作成しました - ログインを要求しています\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "要求を処理中です [original]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "パスワードをチェック中です\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "パスワードのハッシュが無効です\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "パスワードOKです\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "パスワードが正しくありません\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "パスワードを入力しませんでした。空のパスワードは許可されていません。\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "ログアウトが要求されました\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "要求を処理中です [変更しました]： "
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "アルバニア語"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "ダウンロードの状態"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "（ %s / %s）"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "アップデート遅延時間： %d 秒"
+
+#~ msgid "Transferring"
+#~ msgstr "転送中"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "QR：%u"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR：%u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "キューに追加しました"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "まだ実現されていない：検索結果の進捗を表示する"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "ファイル %s のMD4とAICHハッシュを作成しています"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "ファイル %s のMD4ハッシュを作成しています"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "ファイル %s のAICHハッシュを作成しています"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr "警告：バックアップ後、元の '%s' を削除することができませんでした"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "警告： %s を削除することができませんでした"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR：%u)"
+
+#~ msgid ""
+#~ "You cannot connect to a release version from an arbitrary SVN version! "
+#~ "*sigh* possible crash prevented"
+#~ msgstr ""
+#~ "クラッシュを防ぐため、SVNバージョンからリリースバージョンへの接続はできま"
+#~ "せん！"
+
+#~ msgid "Rating (total):"
+#~ msgstr "評価（合計）："
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "すべてのアップロードにフル・チャンクを転送しようとする"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "ダウンロード"
+
+#~ msgid "Transfers"
+#~ msgstr "転送"
+
+#~ msgid "Unban"
+#~ msgstr "接続禁止を解除する"
+
+#~ msgid "Show Uploads"
+#~ msgstr "アップロードを表示する"
+
+#~ msgid "Show Queue"
+#~ msgstr "キューを表示する"
+
+#~ msgid "Select View"
+#~ msgstr "表示モードを選択する"
+
+#~ msgid "Client Software"
+#~ msgstr "クライアント・ソフトウエア"
+
+#~ msgid "Waited"
+#~ msgstr "待機時間"
+
+#~ msgid "Upload Time"
+#~ msgstr "アップロード時間"
+
+#~ msgid "Upload/Download"
+#~ msgstr "アップロード／ダウンロード"
+
+#~ msgid "Remote Status"
+#~ msgstr "リモートの状態"
+
+#~ msgid "File Priority"
+#~ msgstr "ファイルの優先度"
+
+#~ msgid "Score"
+#~ msgstr "スコア"
+
+#~ msgid "Asked"
+#~ msgstr "聞かれた"
+
+#~ msgid "Last Seen"
+#~ msgstr "最後に確認した時間"
+
+#~ msgid "Entered Queue"
+#~ msgstr "キューに入った時間"
+
+#~ msgid "Transferred Up"
+#~ msgstr "アップに転送された"
+
+#~ msgid "Transferred Down"
+#~ msgstr "ダウンに転送された"
+
+#~ msgid "Userhash"
+#~ msgstr "ユーザ・ハッシュ"
+
+#~ msgid "Encrypted"
+#~ msgstr "暗号化された"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "アップロード／アップキューを表示します"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "キューに入っているクライアント："
+
+#~ msgid "Current Session"
+#~ msgstr "現在のセッション"
+
+#~ msgid "Total"
+#~ msgstr "合計"
+
+#~ msgid "Requested :"
+#~ msgstr "要求数："
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "ファイル転送ウィンドウ"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "ユーザ合計： %s | ファイル合計： %s"
+
+#, fuzzy
+#~ msgid "HTTP download thread started"
+#~ msgstr "同期化スレドを始めました。"
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "ダウンロード数（%i）"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "警告：バックアップ後、元の '%s' を削除することができませんでした"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr ""
+#~ "CIP2Country::CIP2Country()：次から国データはロードできませんでした："
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "IPFilter段階を取ってきます。"
+
+#~ msgid "Makes a search."
+#~ msgstr "検索を実行します。"
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "失敗しました"
+
+#, fuzzy
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "スタートアップの時にamulewebを起動する"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "aMuleを終了します。"
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "次のオプションは、セキュリティーのために今回のリリースで変更されました：\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* プロトコル難読化を、受信・発信両方の接続に対して有効にしました。\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* サーバリストを他のサーバやクライアントから更新することを無効にしまし"
+#~ "た。\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "この変更についての詳しい情報はaMuleのwiki、すなわち\n"
+#~ "http://wiki.amule.orgを\"fake servers\"に対して検索してください。\n"
+#~ "aMuleが正しく動作するため、サーバリストから全ての偽サーバを消すことが重要"
+#~ "です。"
+
 #~ msgid "Fetching status..."
 #~ msgstr "状態を取ってきています…"
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "ユーザ： E: %s K: %s | ファイル E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr ""
+#~ "クライアント %s がIP：ポート %s:%d にいて、  %s %s %s を使用しています"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress()はNULLを回答しました"
 
+#~ msgid "Firewalled"
+#~ msgstr "ファイアワォールされています"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "%d個の国旗ビットマップをロードしました。"
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr "ファイル %s はDonkeyにとって大きすぎます：最大許可サイズは4GBです。"
+
+#~ msgid "No handler for this file type."
+#~ msgstr "このファイルタイプのハンドラがありません。"
+
+#~ msgid "File was not saved"
+#~ msgstr "ファイルは保存されませんでした"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr "接続に失敗しました。指示されたホストには接続はできませんでし。\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "メッセージフィルタ"
 
@@ -7164,14 +7743,126 @@
 #~ msgid "Core Tweaks"
 #~ msgstr "コア設定"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "このファイルタイプのハンドラがありません。"
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "ツールチップ遅延時間（秒）"
 
-#~ msgid "File was not saved"
-#~ msgstr "ファイルは保存されませんでした"
+#~ msgid "Show part file number before file name"
+#~ msgstr "ファイル名の前に部分ファイル番号を表示する"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
-#~ msgstr "ファイル %s はDonkeyにとって大きすぎます：最大許可サイズは4GBです。"
+#~ msgid "Skin Support"
+#~ msgstr "スキンのサポート"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- スキンがありません -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "オンライン証明ディレクトリ："
+
+#~ msgid "Filtering Options:"
+#~ msgstr "フィルタ・オプション："
+
+#~ msgid "Line Capacities"
+#~ msgstr "ライン収容"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
+#~ msgstr ""
+#~ "注意：この値は統計にしか\n"
+#~ "使われていません。"
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "標準クライアントTCPポート："
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "延長クライアントUDPポート："
+
+#~ msgid "Bind Address"
+#~ msgstr "アドレスをバインドする"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "延長サーバ・リクエストのUDPポート（TCP+3）： 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "ファイルごとの最大ソース数"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "ユニバーサル・プラグ・アンド・プレイ"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "UPnPを有効にする"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "UPnPのTCPポート："
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "ファイルが完了されたらすぐに次の停止されたファイルを始める"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "統計の色を選択する"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "ダウンロードキューにあるファイルの進捗"
+
+#~ msgid "Show percentage"
+#~ msgstr "パーセンテージを表示する"
+
+#~ msgid "Show progressbar "
+#~ msgstr "進捗バーを表示する"
+
+#~ msgid "Enable skin support "
+#~ msgstr "スキンのサポートを有効にする"
+
+#~ msgid "Skin:"
+#~ msgstr "スキン："
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr ""
+#~ "ダウンロードキューにあるファイルを自動ソーティングする（CPUを強く使用す"
+#~ "る）"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "聞いているインターフェイスのIPアドレス\n"
+#~ "（空にすると任意）"
+
+#~ msgid "TCP port"
+#~ msgstr "TCPポート"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "共有ファイルの閲覧を許可する："
+
+#~ msgid "Event types"
+#~ msgstr "イベントの種類"
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "aMuleが終了する時に確認します。"
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "オーバヘッドの帯域幅を表示する"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H.を有効にする"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICHはすべてのハッシュを信頼する（非推奨）"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "詳細な設定"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "進捗バーのスタイル"
+
+#~ msgid "Column Sorting"
+#~ msgstr "コラムのソーティング"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "雑なGUIの調整"
+
+#~ msgid "File Options"
+#~ msgstr "ファイル・オプション"
 
 #~ msgid "Status text"
 #~ msgstr "ステータステキスト"
@@ -7179,18 +7870,129 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "ポップアップ状態テキスト"
 
-#~ msgid "Please wait... "
-#~ msgstr "お待ちください…"
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr ""
+#~ " eMuleに基づいた'全プラットフォーム'P2Pクライアントです\n"
+#~ "\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr " ウェブサイト：http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr " フォーラム：http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ " よくある質問：http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " 問い合わせ：admin@amule.org（事務的関係） \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ "  著作権2003-2008、aMuleのチーム\n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr "aMuleのある部分は\n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " 著作権2002、Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "映画なら、長さ、課題、言語等を説明できます…\n"
+#~ "万が一偽造なら、それもaMuleの他のユーザに伝えることができます。"
+
+#~ msgid "Misc Options"
+#~ msgstr "その他のオプション"
+
+#~ msgid "Server Options"
+#~ msgstr "サーバのオプション"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "接続の時にサーバのmotd（今日のメッセージ）を表示する..."
+
+#~ msgid "Disable/Enable"
+#~ msgstr "無効／有効"
+
+#~ msgid "Authentication"
+#~ msgstr "認証"
 
 #~ msgid "General Settings"
 #~ msgstr "一般設定："
 
+#~ msgid "Max Connections"
+#~ msgstr "最大の接続数"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "GUIの調整"
 
 #~ msgid "Remote Control"
 #~ msgstr "リモート制御"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "選択されたブラウザが見付かりません！"
+
+#~ msgid "User Defined"
+#~ msgstr "ユーザ定義"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - Linux Mule"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "こちらで自分のブラウザを選択してください"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "ユーザ定義のブラウザ："
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "選択したいブラウザの名前をここに入力してください。ユーザ定義のブラウザを利"
+#~ "用するには、個人設定のメニュー・アイテムをドロップ・ダウン・メニューから選"
+#~ "択してください。"
+
+#~ msgid "Please wait... "
+#~ msgstr "お待ちください…"
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "ブラウザを起動させるコマンドを見付けられませんでした。"
 
@@ -7203,9 +8005,6 @@
 #~ msgid "ExternalConn: Access denied"
 #~ msgstr "ExternalConn: アクセスは拒否されました"
 
-#~ msgid "ExternalConn: Bad reply from server. Connection closed."
-#~ msgstr "ExternalConn: サーバーからの応答が不正です。接続を閉じました。"
-
 #~ msgid "The ed2k hash of the file."
 #~ msgstr "ファイルのed2kハッシュ。"
 
@@ -7314,18 +8113,12 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "ED2kリンクをクリップボードへコピーする"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "致命的なエラー：タイマを生成できませんでした"
-
 #~ msgid "ED2K: Connecting"
 #~ msgstr "ED2K: 接続中"
 
 #~ msgid "ED2K: Disconnected"
 #~ msgstr "ED2K: 切断"
 
-#~ msgid "Warning: Unable to open skin file '%s' for read"
-#~ msgstr "注意： スキンファイル '%s' を読むために開けませんでした"
-
 #~ msgid "ed2k network"
 #~ msgstr "ed2kネットワーク"
 
@@ -7426,11 +8219,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "エラー：不正なpart.metファイル・バージョン： %s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr ""
-#~ "エラー： %s（%s）は破損されて（tagcountが間違っています）、ファイルはロー"
-#~ "ド出来ません。"
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "注意：%sは破損されている恐れがあります（%i）"
 
@@ -7454,12 +8242,6 @@
 #~ msgid "Insufficient Diskspace"
 #~ msgstr "ディスク容量不足"
 
-#~ msgid "Warning: known.met cannot be opened."
-#~ msgstr "警告：known.metを開くことはできません。"
-
-#~ msgid "Warning: Knownfile list corrupted, contains invalid header."
-#~ msgstr "警告：Knownfileリストは破損され、不正なヘッダーが含まれています。"
-
 #~ msgid "ERROR! Attempted to share %s"
 #~ msgstr "エラー：%sを共有しようとしました"
 
@@ -7488,9 +8270,6 @@
 #~ msgid "Bandwidth Limits: Up: %u kB/s, Down: %u kB/s.\n"
 #~ msgstr "帯域制限：アップ：毎秒%u kB/s、ダウン：%u kB/s。\n"
 
-#~ msgid "Shutdown aMule."
-#~ msgstr "aMuleを終了します。"
-
 #~ msgid ""
 #~ "Shutdown the remote running core (amule/amuled).\n"
 #~ "This will also shut down the text client, since it is unusable without a\n"
@@ -7507,9 +8286,6 @@
 #~ msgid "Disconnect from ED2K only."
 #~ msgstr "ED2Kのみから切断します。"
 
-#~ msgid "Adds an ed2k or magnet link to core."
-#~ msgstr "コアにED2K、またはマグネット・リンクを追加します。"
-
 #~ msgid ""
 #~ "The ed2k link to be added can be:\n"
 #~ "*) a file link (ed2k://|file|...), it will be added to the download "
@@ -7639,9 +8415,6 @@
 #~ msgid "Manual Server Add : Name"
 #~ msgstr "手動でサーバを追加する：名前"
 
-#~ msgid "No One"
-#~ msgstr "誰も許可しない"
-
 #~ msgid "Speed Limits:"
 #~ msgstr "速度制限："
 
@@ -7860,9 +8633,6 @@
 #~ msgid "Client request is invalid! %i / %i"
 #~ msgstr "クライアントの要求が不正です！ %i / %i"
 
-#~ msgid "Command: %s"
-#~ msgstr "コマンド： %s"
-
 #~ msgid "Unable to open %s file - using %s file."
 #~ msgstr "%sファイルを開くことはできません：%sファイルを使用しています。"
 
@@ -7879,13 +8649,6 @@
 #~ msgid "Waiting for subprocess termination failed"
 #~ msgstr "サブ・プロセスの終了を待つのに失敗しました。"
 
-#~ msgid ""
-#~ "You cannot connect to a release version from an arbitrary CVS version! "
-#~ "*sigh* possible crash prevented"
-#~ msgstr ""
-#~ "任意CVSバージョンからリリースバージョンに接続はできません！ *ハァ…*起こり"
-#~ "得るクラッシュを予防しました"
-
 #~ msgid "doesn't work"
 #~ msgstr "働きません"
 
@@ -7921,7 +8684,7 @@
 #~ " FAQ: http://wiki.amule.org \n"
 #~ "\n"
 #~ " Contact: admin@amule.org (administrative issues) \n"
-#~ " Copyright (C) 2003-2009 aMule Team \n"
+#~ " Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
 #~ " Part of aMule is based on \n"
 #~ " Kademlia: Peer-to-peer routing based on the XOR metric.\n"
@@ -7935,7 +8698,7 @@
 #~ " FAQ：http://wiki.amule.org \n"
 #~ "\n"
 #~ " コンタクト：admin@amule.org（事務的関係） \n"
-#~ " 著作権 (C) 2003-2009 aMuleチーム \n"
+#~ " 著作権 (C) 2003-2008 aMuleチーム \n"
 #~ "\n"
 #~ " aMuleの一部は \n"
 #~ " Kademliaにづずいてます： XORメトリクに基づいたPeer-to-peerルーティン"
@@ -8036,9 +8799,6 @@
 #~ "廃止予定のコマンドで、将来に存在しない可能性が高いです。\n"
 #~ "代わりに、'Set BwLimits Down'を使ってください。\n"
 
-#~ msgid "Syncronization thread started."
-#~ msgstr "同期化スレドを始めました。"
-
 #~ msgid "Masterhashes of known files have been loaded."
 #~ msgstr "既知のファイルのマースタハッシュはロードされました。"

aMule-2.2.6.tar.bz2/po/ko_KR.po -> aMule-2.3.1.tar.bz2/po/ko_KR.po Changed

@@ -1,5 +1,4 @@
 # Translation of amule interface to Korean
-# Copyright (C) 2005-2006Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 # Lee, Eun-ho <hoenny@daum.net>, 2005.
 # Hyunju Kang <rexington@gmail.com>. 2007.
@@ -7,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: ko_KR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
@@ -17,1289 +16,1115 @@
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-Language: Korean\n"
 "X-Poedit-Country: KOREA, REPUBLIC OF\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "반드시 암호를 설정해야 합니다."
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "친구 추가"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "잘못된 패스워드, MD5 해시가 아닙니다."
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "정확한 IP와 포트를 입력하세요!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "연결 실패"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "정보"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr ""
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "설정된 사용자 해시가 옳바르지 않습니다!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr ""
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "%s(%s)을 열지 못했습니다."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
+#: src/amule.cpp:239
+#, fuzzy
+msgid "Now, exiting main app..."
 msgstr ""
+"\n"
+"좋아, 나가는중 %s...\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "성공! 어뮬에 연결 되었습니다 "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "성공! 연결이 되었습니다."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "해시중"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "완료중"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "완료"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "중지됨"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "오류투성이"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "받는중"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "대기중"
-
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "다음 파일에 대해 MD4 및 AICH 해시를 만듭니다: %s"
-
-#: src/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "다음 파일에 대해 MD4 해시를 만듭니다: %s"
-
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "다음 파일에 대해 AICH 해시를 만듭니다: %s"
-
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "'%s'의 낡은 AICH 해시셋을 64b로 '%s'에 변환합니다."
-
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "경고: 파일 이름 '%s'는 유효하지 않으며 '%s'로 변경되었습니다."
-
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "경고: 파일 이름 '%s'는 이미 존재하며, 새 파일은 '%s'로 변경되었습니다."
-
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "경고: 백업을 생성한 후 원본 '%s'를 제거할수 없습니다."
-
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "경고: %s를 삭제하지 못했습니다."
-
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "사용자 %s로부터 공유파일을 찾지 못했습니다."
-
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "알수없는"
-
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (가짜 이뮬 버젼 %#x)"
-
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (가짜 이뮬)"
-
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "엑스뮬(가짜 이뮬)"
-
-#: src/BaseClient.cpp:1790
-#, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (이뮬 v0.%u 기반)"
-
-#: src/BaseClient.cpp:1960
+#: src/amule.cpp:258
 #, c-format
-msgid "NickName: %s ID: %u"
-msgstr "별명: %s 아이디: %u"
-
-#: src/BaseClient.cpp:1962
-#, fuzzy, c-format
-msgid "Requested: %s\n"
-msgstr "요청됨:"
-
-#: src/BaseClient.cpp:1964
-#, fuzzy, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"이 세션의 파일상태: %d가 수락되었습니다.(%d 요청의) %s에게 전달되었습니다.\n"
-msgstr[1] ""
-"이 세션의 파일상태: %d가 수락되었습니다.(%d 요청의) %s에게 전달되었습니다.\n"
-
-#: src/BaseClient.cpp:1967
-#, fuzzy, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"모든 세션의 파일상태: %d가 수락되었습니다.(%d 요청의) %s에게 전달되었습니"
-"다.\n"
-msgstr[1] ""
-"모든 세션의 파일상태: %d가 수락되었습니다.(%d 요청의) %s에게 전달되었습니"
-"다.\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "알 수 없는 파일이 요청되었습니다."
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:261
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "클라이언트 %s, IP:포트 %s:%d, %s %s %s 사용"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "사용자이름"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "친구"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "상세히 보기(&D)"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "친구 추가"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "친구 제거"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "실패"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "메시지 보내기(&M)"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "파일 보기"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr ""
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "친구 칸으로 확정함"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr ""
 
-#: src/FriendListCtrl.cpp:273
+#: src/amule.cpp:435
 #, fuzzy
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "선택한 친구들을 삭제하시겠습니까?"
+msgid ""
+"\n"
+"EC configuration"
+msgstr "종료 확인"
 
-#: src/FriendListCtrl.cpp:275
+#: src/amule.cpp:438
 #, fuzzy
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "선택한 친구들을 삭제하시겠습니까?"
+msgid "Password set and external connections enabled."
+msgstr "새로운 외부연결이 승인되었습니다."
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "취소"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "경고"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:495
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
 msgstr ""
-"하나 이상의 친구칸으로 설정이 허락되지않습니다\n"
-"단지 하나의 칸만 가능합니다."
+"지역정보(로케일)가 설정 변경으로 인해 시스템 기본값으로 변경되었습니다. 죄송"
+"합니다."
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "다중 선택"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "정보"
 
-#: src/UserEvents.h:60
-msgid "Download completed"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
 msgstr ""
+"서버 목록에 서버가 없습니다.\n"
+"새로운 서버목록을 내려 받으시겠습니까?"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr ""
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "서버 목록 내려받기"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
+#: src/amule.cpp:654
+#, c-format
+msgid "web server running on pid %d"
 msgstr ""
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
+#: src/amule.cpp:658
+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/UserEvents.h:75
-msgid "The size of the file in bytes."
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
 msgstr ""
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
+#: src/amule.cpp:741
+#, c-format
+msgid "Could not bind ports to the specified address: %s"
 msgstr ""
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr ""
+#: src/amule.cpp:768
+#, c-format
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "포트 %u는 사용할 수 없습니다. 낮은아이디를 가질것입니다.\n"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
+#: src/amule.cpp:774
+#, c-format
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
 msgstr ""
+"포트 %u는 사용할수 없습니다!\n"
+"\n"
+"이것은 낮은아이디를 가질것이라는걸 의미합니다.\n"
+"\n"
+"나가고 들어오는것에 대해 포트가 열려있는지 통신망을 체크하세요. "
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr ""
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "온라인서명 파일을 생성하지 못함"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr ""
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "어뮬 온라인서명 파일을 생성하지 못함"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
 msgstr ""
+"컴퓨터에 선택한 지역정보(로케일)가 설치 않된것 같습니다. (주의: 어쨌든 설정하"
+"겠습니다)"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "파일 이름"
-
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "크기"
-
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "종류"
-
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "우선권"
-
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "파일아이디"
-
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "요청"
-
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "허락된 요청"
-
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "전송된 크기"
-
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "공유 비율"
-
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "획득한 부분"
-
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "완료된 자료"
-
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "폴더 경로"
-
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "공유 파일"
-
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "매우 낮음"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "이번에 어뮬 %s를 처음 실행했습니다."
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "낮음"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "이 버전은 테스트 버젼으로, 매일 업데이트되며, \n"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "보통"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr "이 프로그램이 어느 것도 부수지 않는다고, 집을 태우지 않는다고, 혹은 \n"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "높음"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"개를 죽이지 않는다고 보장하지 않습니다. 그렇지만 안전하게 사용할 수 있을 것입"
+"니다.\n"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "매우높음"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"더 많은 정보, 지원, 새 릴리즈는 홈페이지 www.amule.org, 또는 IRC 채널\n"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "개방"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "(irc.freenode.net의 #aMule)에서 찾을 수 있습니다.\n"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "자동"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "버그는 http://forum.amule.org로 보고해 주십시오."
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "의견/등급 추가"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
+msgstr ""
+"지정한 온라인 서명 파일을 위한 폴더가 유효하지 않습니다.\n"
+" 온라인 서명은 환경설정에서 수정될 때까지 비활성화 됩니다."
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "의견/등급 편집"
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "서버 이름:"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "이름변경"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "컬렉션내의 파일을 전송목록에 추가"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "오류: 로그파일을 열 수 없음"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "magnet URI를 클립보드로 복사(&U)"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "경고: 로그파일이 비어있습니다. 뭔가 잘못되어 있습니다."
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr ""
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "로그가 초기화되었습니다."
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr ""
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "서버메시지: %s"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr ""
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "노드 목록을 내려받지 못했습니다."
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr ""
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "내려받은 버젼 검사 파일을 열지 못했습니다."
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr ""
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "손상된 버젼 검사 파일"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "반응을 클립보드에 복사"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "오래된 어뮬 버젼을 사용하고 있습니다!"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
+#: src/amule.cpp:1613
 #, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr ""
-
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "유효한 자료 링크를 만들기 위해서 높은아이디가 필요합니다."
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "어뮬 버젼은 %i.%i.%i이며 최신 버젼은 %li.%li.%li입니다."
 
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "경고"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "최신 버젼은 항상 http://www.amule.org 에서 찾을 수 있습니다."
 
-#: src/SharedFilesCtrl.cpp:451
+#: src/amule.cpp:1616
 #, c-format
-msgid "Shared Files (%i)"
-msgstr "공유된 파일(%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[부분 파일]"
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "경고: 어뮬 버젼은 오래되었습니다: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "새이름 넣으세요:"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "어뮬은 최신 버전입니다."
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "파일 이름변경"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "버젼 검사 파일을 내려받지 못했습니다."
 
-#: src/UploadQueue.cpp:511
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
 #, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "파일의 올려주기를 재시작합니다: %s"
+msgid "Users: %s | Files: %s"
+msgstr ""
 
-#: src/UploadQueue.cpp:520
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
 #, c-format
-msgid "Suspending upload of file: %s"
-msgstr "파일의 올려주기를 정지합니다: %s"
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr ""
 
-#: src/TextClient.h:60
-msgid "aMule text client"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
 msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "카뎀리아: 검색어가 너무 짧습니다."
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "낮은아이디로"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, fuzzy, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "%u개의 Kad 접속을 읽었음"
-msgstr[1] "%u개의 Kad 접속을 읽었음"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "높은아이디로"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
+#: src/amule.cpp:1867
 #, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Connected to %s %s"
+msgstr "%s %s에 연결되었음"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
+#: src/amule.cpp:1870
 #, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Connecting to %s"
+msgstr "%s에 연결중"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr ""
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad를 시작했습니다."
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr ""
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad를 멈췄습니다."
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "다음과 같은 오류로 요청 실패함: %s."
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Kad에 연결됨 (양호)"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "알 수 없는 오류로 요청이 실패함."
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Kad에 연결됨 (방화벽)"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "인덱스 파일을 찾을 수 없음:"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Kad로부터 연결이 끊김"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "세션이 만료됨 - 로그인 요청중\n"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Kad 네트워크는 UDP 포트가 비활성될 시 사용할 수 없으며, 따라서 시작하지 않습"
+"니다."
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "세션 확인, 로그인 됨\n"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Kad 네트워크가 환경설정에서 비활성되어, 연결하지 않습니다."
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "세션 확인, 로그인 안됨\n"
+#: src/amuled.cpp:560
+#, fuzzy
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"오류: 외부연결이 비활성화일때 어뮬 데몬은 사용할 수 없습니다. 외부연결을 활성"
+"화하기 위해서는 --ec-config를 사용하여 시작하거나 ~/.aMule/amule.conf 파일내"
+"에 \"AcceptExternalConnections\" 키를 1로 설정하여야 합니다."
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "열린 세션 없음 - 로그인을 요청할 것임\n"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "세션이 생성됨 - 로그인 요청중\n"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "요청 처리중 [원본]: "
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "암호를 검사중\n"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "암호 해시가 유효하지 않음\n"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "오류: %s"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "암호 맞음\n"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "이 어뮬 %s는 이뮬 기반으로 되어있습니다."
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "암호 틀림\n"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "%s에 동작중"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "암호를 입력하지 않았습니다. 빈암호는 사용할수 없습니다.\n"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr "http://www.amule.org에 방문하셔서 새로운버젼이 있는지 확인하십시오."
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "로그아웃이 요청됨\n"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "요청 처리중[redirected]: "
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "어뮬 원격제어"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "템플릿<str>을 읽음"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "스냅삿"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP 포트"
-
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "gzip 압축 사용"
-
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "손님 접근 허가"
-
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "손님 접근 금지"
-
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "어뮬 설정 파일 경로. DO NOT USE DIRECTLY!"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "PHP 해석자를 (권장되지 않는) 사용않함"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "각 요청의 PHP 페이지를 재컴파일함"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "어뮬 웹 서버"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "유효하지 않음"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr ""
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "결코"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "메시지"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "내려받기중..."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr ""
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "연결중"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "환경설정"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "amulesig.dat 파일을 포함한 폴더"
+#: src/amuleDlg.cpp:715
+#, fuzzy
+msgid "Kad: Firewalled"
+msgstr "방화벽"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "탐색"
+#: src/amuleDlg.cpp:719
+#, fuzzy
+msgid "Kad: Connected"
+msgstr "연결됨"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "amulesig.dat 파일이 있는 폴더를 이곳에 입력하세요."
+#: src/amuleDlg.cpp:724
+#, fuzzy
+msgid "Kad: Connecting"
+msgstr "연결중"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "갱신율 초당 간격"
+#: src/amuleDlg.cpp:728
+#, fuzzy
+msgid "Kad: Off"
+msgstr " Kad: "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "매회 갱신할 때 통계 이미지를 생성합니다."
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "취소"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "통계 이미지를 생성하는것을 원하는 장소 폴더를 이곳에 입력하세요."
+#: src/amuleDlg.cpp:775
+#, fuzzy
+msgid "Stop the current connection attempts"
+msgstr "현재 연결시도를 멈춤"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "FTP 서버의 통계 이미지를 정기적으로 올려줍니다."
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "연결 끊기"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP Url"
+#: src/amuleDlg.cpp:781
+#, fuzzy
+msgid "Disconnect from the currently connected networks"
+msgstr "통신망으로부터 연결을 끊습니다."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP 경로"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "연결"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "FTP 서버의 URL을 이곳에 입력하세요."
+#: src/amuleDlg.cpp:787
+#, fuzzy
+msgid "Connect to the currently enabled networks"
+msgstr "통신망에 연결합니다."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "FTP 서버에 통계 이미지가 위치할 폴더를 이곳에 입력하세요."
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "올려주기: %.1f(%.1f) | 내려받기: %.1f(%.1f)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "사용자"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "올려주기: %.1f | 내려받기: %.1f"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "암호"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "어뮬 (%s | 연결됨)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "FTP 서버로 로그인하기 위한 사용자이름을 이곳에 입력하세요."
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "어뮬 (%s | 끊김)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "FTP 서버로 로그인하기 위한 암호를 이곳에 입력하세요."
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "어뮬을 종료하시겠습니까?"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "FTP 갱신율 분당 간격"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "종료 확인"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "유효합니다"
+#: src/amuleDlg.cpp:1173
+#, fuzzy
+msgid "Launch Command: "
+msgstr "명령: %s"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "서명 파일이 있는 폴더"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "통계 이미지를 생성하는곳의 폴더"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "외형 폴더 '%s'가 없습니다."
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amuleDlg.cpp:1237
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i 일 %i 시간 %i 분 %i 초"
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, 어뮬 온라인 통계"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "통신망"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "환영합니다!"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "통신망 창"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "어뮬"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "검색"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "wxCas 현재 실행시 최대 내려받기 속도"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "검색 창"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "wxCas 이전 실행시부터 절대적 최대 내려받기 속도"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "내려받기"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "초기화"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "받는중"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "시스템"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "자동갱신 멈춤"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "공유 파일 창"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "온라인 정적그림을 저장"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "메시지"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "온라인 정적그림을 프린트"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "메시지 창"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "환경 설정"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "통계"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "wxCas에 대하여"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "통계 그래프 창"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "자동갱신을 시작"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "환경설정"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "자동갱신을 멈춤"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "환경 설정 창"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "자동갱신이 시작됨"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "가져오기"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "통계 이미지를 저장"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "부분파일 가져오기 도구"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "어뮬 온라인 통계"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "정보"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "정보/도움"
+
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
 msgstr ""
-"프린트하는데 문제가 있습니다.\n"
-"혹시 현재 프린터가 올바로 설정되지 않았나요?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "프린트함"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
 msgstr ""
-"wxCas, 어뮬 온라인 서명 통계\n"
-"\n"
-"(c) 2004 더폴리시 <theplosh@vipmail.ru>\n"
-"\n"
-"페드로 드 올리베이라 <falso@rdk.homeip.net>의 CAS에 기본을 두고있습니다.\n"
-"\n"
-"GPL로 배포합니다."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "어어, 어뮬이 실행중이 아닙니다..."
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "어뮬은 실행중입니다."
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "어뮬"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "어뮬은 실행중이나 연결이 끊겨 있습니다."
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "치명적 오류: 타이머 생성 실패"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "어뮬은 연결중..."
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "원격 어뮬에 연결함"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "어어, 어뮬의 상태는 알수없음..."
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "치명적 오류: 타이머 생성 실패"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "어뮬 "
+#: src/amule-remote-gui.cpp:268
+#, fuzzy
+msgid "Going to event loop..."
+msgstr "파일 정보를 복구하려고 하고있습니다..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " 위해 실행되고있는 "
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "연결중"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " 은 멈추어져 있습니다."
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "연결 실패"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " 은 연결되지 않았습니다."
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " 은 연결중..."
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " 무엇인가 이상하게 동작하고 있음, 확인 요망!"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " 는 다음으로 연결중: "
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "확인"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "전부"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "방화벽됨"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "끔"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "알수없는"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr "켜졌습니다."
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "사용자 %s로부터 공유파일을 찾지 못했습니다."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-#, fuzzy
-msgid " with "
-msgstr "] with "
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "전체 내려받기: "
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (가짜 이뮬 버젼 %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", 올려주기: "
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (가짜 이뮬)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "내려받기 세션: "
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "엑스뮬(가짜 이뮬)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "내려받기: "
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (이뮬 v0.%u 기반)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr "올려주기, kB/s: "
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "별명: %s 아이디: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-#, fuzzy
-msgid " kB/s"
-msgstr "kB/s"
+#: src/BaseClient.cpp:2029
+#, fuzzy, c-format
+msgid "Requested: %s\n"
+msgstr "요청됨:"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "공유함: "
+#: src/BaseClient.cpp:2031
+#, fuzzy, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"이 세션의 파일상태: %d가 수락되었습니다.(%d 요청의) %s에게 전달되었습니다.\n"
+msgstr[1] ""
+"이 세션의 파일상태: %d가 수락되었습니다.(%d 요청의) %s에게 전달되었습니다.\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr "대기열에있는 파일, 클라이언트: "
+#: src/BaseClient.cpp:2034
+#, fuzzy, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"모든 세션의 파일상태: %d가 수락되었습니다.(%d 요청의) %s에게 전달되었습니"
+"다.\n"
+msgstr[1] ""
+"모든 세션의 파일상태: %d가 수락되었습니다.(%d 요청의) %s에게 전달되었습니"
+"다.\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "시간:"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "알 수 없는 파일이 요청되었습니다."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/BaseClient.cpp:2700
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr "켬"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "시스템 부하 평균 (1-5-15 분): "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "시스템 연속 작동 시간: "
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "'%s'로부터 차단된 메시지 (IP:%s)"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
+#: src/BaseClient.cpp:2807
 #, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02u일 %02u시 %02u분 %02u초"
+msgid "New message from '%s' (IP:%s)"
+msgstr "'%s'로부터 새로운 메시지 (IP:%s)"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02u시 %02u분 %02u초"
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr "사용자 %s(%u)가 폴더 %s의 공유파일 목록을 요청합니다. -> 거부됨"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02u분 %02u초"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, fuzzy, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "경고: known.met을 열 수 없습니다."
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
-#, c-format
-msgid "%02us"
-msgstr "%02u초"
+#: src/CanceledFileList.cpp:61
+#, fuzzy
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+"경고: 알려진파일 목록이 손상됨, 유효하지 않는 머리말을 포함하고 있습니다."
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "높은아이디"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "known.met 파일을 읽는동안 입출력 오류: %s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "낮은아이디"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "known.met 파일을 저장하는 동안 오류: %s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "아직 연결되지 않았습니다."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "분류"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "새로운 분류"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "저장할 폴더를 선택"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "분류 이름을 정하세요."
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "분류 경로를 정하세요"
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-#, fuzzy
-msgid "Cancelled !"
-msgstr "취소됨!"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr "분류를 저장할 폴더를 생성하지 못했습니다. 유효한 경로를 지정하세요."
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ChatSelector.cpp:129
 #, c-format
-msgid "Unable to open %s"
-msgstr "%s를 열수없음."
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "채팅세션이 시작됨: %s (%s:%u) - %s %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "설정값 입력"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "***클라이언트에 연결되었습니다***"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "파일을 해시"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "***클라이언트에 연결중입니다***"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "이 파일의 추가주소를 더합니다."
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "***클라이언트에 연결하지 못했습니다 / 연결이 끊어졌습니다***"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/ChatSelector.cpp:336
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "추가"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "삭제"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "깨끗이"
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "탭 닫기"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "부분해시의 링크를 생성합니다."
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "모든 탭 닫기"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
-msgstr ""
-"링크의 크기를 증가시키는 대신 새 파일 및 희귀한 파일을 빠르게 퍼지는 데에 도"
-"움을 줍니다."
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "다른 탭 닫기"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "md4 파일 해시"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "친구에 추가"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr ""
+#: src/ClientCreditsList.cpp:158
+#, fuzzy, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "신용 파일을 읽었습니다. %u 클라이언트가 인식되었습니다."
+msgstr[1] "신용 파일을 읽었습니다. %u 클라이언트가 인식되었습니다."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr ""
+#: src/ClientCreditsList.cpp:161
+#, fuzzy, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] "%u 클라이언트에 대한 신용이 만료되었습니다."
+msgstr[1] "%u 클라이언트에 대한 신용이 만료되었습니다."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "시작"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "'cryptkey.dat' 파일을 찾을 수 없습니다. 생성합니다."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "저장"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "클라이언트 세부내역"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "클립보드로 복사"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "낮은아이디"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "종료"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "높은아이디"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-#, fuzzy
-msgid "Open"
-msgstr "오페라"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "복사"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-#, fuzzy
-msgid "Save as"
-msgstr "저장"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "연결됨"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr ""
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "연결이 끊김"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "정보"
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "aLinkCreator에 대하여"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "완료되지 않음"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr ""
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "나쁜 사람"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-#, fuzzy
-msgid "Can't open the clipboard"
-msgstr "클립보드로 복사"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "인증됨"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "지금 복사할것은 아무것도 없습니다!"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "불가능"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr ""
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "사용자 %s(%u)가 공유파일 목록을 요청합니다. -> 허락됨"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "열수 없음"
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "사용자 %s(%u)가 공유파일 목록을 요청합니다. -> 거부됨"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "제발, 파일이름을 비우지 마세요."
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "사용자 %s(%u)가 공유폴더 목록을 요청합니다. -> 허락함"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "지금 저장한것은 없습니다!"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "사용자 %s(%u)가 공유폴더 목록을 요청합니다. -> 거부됨"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
 msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
+msgstr "사용자 %s(%u)가 폴더 %s의 공유파일 목록을 요청합니다. -> 허락됨"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "해시중..."
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr "사용자 %s(%u)가 폴더 %s의 공유파일 목록을 요청합니다. -> 거부됨"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr ""
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "사용자 %s (%u)는 %s 폴더를 공유하고있습니다."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr ""
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "사용자 %s (%u)는 공유폴더를 요청하지 않았습니다."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr ""
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "사용자 %s (%u)는 %s 폴더의 공유파일 목록을 보냅니다."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/ClientTCPSocket.cpp:989
 #, c-format
-msgid "Done in %.2f s"
-msgstr "%.2f 초만에 완료"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "이미 이 주소가 추가되어 있습니다!"
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "사용자 %s (%u)는 공유파일 목록 전송을 마쳤습니다."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "주소를 비우지 마세요."
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "사용자 %s (%u)는 공유파일 목록을 원하지않습니다."
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/ClientTCPSocket.cpp:1006
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "파일숫자 %u 처리: %s"
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr "사용자 %s (%u)는 공유파일이나 공유폴더 목록에 접근하는것을 거부합니다."
 
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "부분 해시를 요청했습니다. (오직 파일크기가 9.5 MB 보다 클때 사용)"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "파일 의견"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
-#, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> 존재하는 파일이 없음!\n"
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "사용자이름"
 
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "파일 이름"
+
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "등급"
+
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "의견"
+
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "의견이 없음"
+
+#: src/CommentDialogLst.cpp:105
+#, fuzzy, c-format
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%s 의견"
+msgstr[1] "%s 의견"
+
+#: src/CorruptionBlackBox.cpp:227
+#, c-format
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
 #: src/DataToText.cpp:37
@@ -1314,31 +1139,57 @@
 msgid "Auto [Hi]"
 msgstr "자동[높음]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "연결중"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "매우 낮음"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "낮음"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "보통"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "높음"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "매우높음"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "개방"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "요청"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "서버를 경유하여 연결중"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "대기열이 가득참"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "대기열에"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "전송중"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "받는중"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1364,8 +1215,7 @@
 msgid "Too many Kad connections"
 msgstr "매우 많은 Kad 연결"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "퇴장됨"
 
@@ -1397,8 +1247,8 @@
 msgid "Remote Server"
 msgstr "원격 서버"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1419,12 +1269,11 @@
 msgstr "자료 핵"
 
 #: src/DataToText.cpp:135
-#, fuzzy
 msgid "Search Result"
-msgstr "검색"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "완료됨"
 
@@ -1448,7 +1297,7 @@
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "대기열에 있음"
 
@@ -1460,881 +1309,299 @@
 msgid "Unknown or bad tempfile format."
 msgstr "알수없거나 나쁜 임시 파일 형식입니다."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "기본 설정"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
 
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "아랍어"
-
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "에스토니아어"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "바스크어"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "불가리아어"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "카탈로니아어"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "중국어(간체)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "중국어(번체)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "크로티아어"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr ""
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "덴마크어"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "네델란드어"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "영어(영국)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "에스토니아어"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "필란드어"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "프랑스어"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "갈리시아어"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "독일어"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr ""
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr ""
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "헝가리어"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "이탈리아어"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "이탈리아어(스위스)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr ""
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "한국어"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr ""
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr ""
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "크기"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "폴란드어"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "전송됨"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "포르투갈어"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "속도"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "포르투갈어(브라질)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "진척"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "러시아어"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "자료"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "슬로베니아어"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "우선권"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "스페인어"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "상태"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr ""
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "남은 시간"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "터키어"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "최종 완료"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "최종 받음"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "선택된 브라우저를 판단할수 없습니다!"
+#: src/DownloadListCtrl.cpp:411
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "선택된파일을 지우시겠습니까?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"서버 UDP 소켓이 TCP+3이 되기위해서 TCP 포트가 65532보다 커서는 안됩니다."
+#: src/DownloadListCtrl.cpp:413
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "선택된파일을 지우시겠습니까?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "기본 포트가 사용될 것입니다.(%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "서버 이름"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "주소"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "포트"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "설명"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "핑"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "사용자"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "파일"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "실패"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "정적"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "버젼"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"삭제하려는 서버에 연결되어 있습니다. 먼저 연결을 끊으세요. 서버는 삭제되지 않"
-"습니다."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "정보"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(알수없는 이름)"
 
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "정적 서버 %s를 삭제하시겠습니까?"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "예"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "자동"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "아니오"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "멈춤(&S)"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "'%s'을(를) 열지 못했습니다."
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "중지(&P)"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "서버 (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "계속(&R)"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "서버"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "완료된것 정리(&l)"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "서버에 연결함"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "모든 A4AF를 이 파일로 바꿈"
 
-#: src/ServerListCtrl.cpp:428
-#, fuzzy
-msgid "Mark server as static"
-msgstr "정적인 서버를 만듦"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "모든 A4AF를 이 파일로 바꿈 (자동)"
 
-#: src/ServerListCtrl.cpp:429
-#, fuzzy
-msgid "Mark server as non-static"
-msgstr "비정적인 서버를 만듦"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "모든 A4AF를 다른 파일로 바꿈"
 
-#: src/ServerListCtrl.cpp:431
-#, fuzzy
-msgid "Mark servers as static"
-msgstr "정적인 서버를 만듦"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "확장 옵션"
 
-#: src/ServerListCtrl.cpp:432
-#, fuzzy
-msgid "Mark servers as non-static"
-msgstr "비정적인 서버를 만듦"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "미리보기"
 
-#: src/ServerListCtrl.cpp:438
-#, fuzzy
-msgid "Remove server"
-msgstr "서버를 삭제"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "파일 상세 보기(&d)"
 
-#: src/ServerListCtrl.cpp:440
-#, fuzzy
-msgid "Remove servers"
-msgstr "서버를 삭제"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "모든 의견 보기"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "모든 서버를 삭제"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "magnet URI를 클립보드로 복사"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr ""
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "반응을 클립보드에 복사"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "서버에 재접속"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "할당되지않은"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "모든 서버를 삭제하시겠습니까?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "분류로 할당"
 
-#: src/ServerListCtrl.cpp:570
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "선택된 서버를 삭제하시겠습니까?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "파일 열기(&O)"
 
-#: src/ServerListCtrl.cpp:572
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "선택된 서버를 삭제하시겠습니까?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "새이름 넣으세요:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "비활성화 [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "파일 이름변경"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "이 어뮬 %s는 이뮬 기반으로 되어있습니다."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "%s에 동작중"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr "http://www.amule.org에 방문하셔서 새로운버젼이 있는지 확인하십시오."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr ""
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "어뮬 원격제어"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "스냅삿"
+msgid "Downloads (%i)"
+msgstr "내려받기 (%i)"
 
-#: src/amuleDlg.cpp:464
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
 
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr ""
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "미리보기"
 
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr ""
+#: src/DownloadListCtrl.cpp:1461
+#, fuzzy, c-format
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "오류: 외부 재생기를 실행하지 못했습니다."
 
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/amuleDlg.cpp:469
-msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-msgstr ""
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "server.met 파일을 읽음: %s"
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr ""
+#: src/DownloadQueue.cpp:132
+#, fuzzy, c-format
+msgid "Loading PartFile %u of %u"
+msgstr "오래된 내려받은 파일로부터 데이터를 읽어들임 (%u (%u의))"
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/DownloadQueue.cpp:154
+msgid ""
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr ""
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "부분파일을 찾을 수 없음"
 
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "메시지"
+#: src/DownloadQueue.cpp:168
+#, fuzzy, c-format
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "%u 부분파일을 찾았음"
+msgstr[1] "%u 부분파일을 찾았음"
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/amuleDlg.cpp:692
-#, fuzzy
-msgid "Kad: Firewalled"
-msgstr "방화벽"
-
-#: src/amuleDlg.cpp:696
-#, fuzzy
-msgid "Kad: Connected"
-msgstr "연결됨"
-
-#: src/amuleDlg.cpp:701
-#, fuzzy
-msgid "Kad: Connecting"
-msgstr "연결중"
-
-#: src/amuleDlg.cpp:705
-#, fuzzy
-msgid "Kad: Off"
-msgstr " Kad: "
-
-#: src/amuleDlg.cpp:752
-#, fuzzy
-msgid "Stop the current connection attempts"
-msgstr "현재 연결시도를 멈춤"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "연결 끊기"
-
-#: src/amuleDlg.cpp:758
-#, fuzzy
-msgid "Disconnect from the currently connected networks"
-msgstr "통신망으로부터 연결을 끊습니다."
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "연결"
-
-#: src/amuleDlg.cpp:764
-#, fuzzy
-msgid "Connect to the currently enabled networks"
-msgstr "통신망에 연결합니다."
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "올려주기: %.1f(%.1f) | 내려받기: %.1f(%.1f)"
-
-#: src/amuleDlg.cpp:812
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "올려주기: %.1f | 내려받기: %.1f"
+msgid "Downloading %s"
+msgstr "내려받기 %s"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "어뮬 (%s | 연결됨)"
+msgid "You are already trying to download the file '%s'"
+msgstr "이미 '%s' 파일을 내려받으려고 하고있음"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "어뮬 (%s | 끊김)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "어뮬을 종료하시겠습니까?"
-
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "종료 확인"
+msgid "You already have the file '%s'"
+msgstr "이미 %s 파일을 가지고 있음"
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "외형 폴더 '%s'가 없습니다."
+msgid "You are already trying to download the file %s"
+msgstr "이미 %s 파일을 내려받으려고 하고있음"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr ""
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "통신망"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "검색"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "전송"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "메시지"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "통계"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "가져오기"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "부분파일 가져오기 도구"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "정보/도움"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr ""
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr ""
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "일반"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "연결"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "폴더"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "서버"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "보안"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "프록시"
-
-#: src/PrefsUnifiedDlg.cpp:177
-#, fuzzy
-msgid "Filters"
-msgstr "필터:"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "원격 조정"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "온라인 서명"
-
-#: src/PrefsUnifiedDlg.cpp:180
-#, fuzzy
-msgid "Advanced"
-msgstr "고급 설정"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "사건들"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "디버깅"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "사용자 설정"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"변경사항을 활성화 하기위해 어뮬을 재시작해야 합니다:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP 포트가 변경되었습니다.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP 포트가 변경되었습니다.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"외부연결이 횔성화되어 있지만, 암호를 설정하지 않았습니다.\n"
-"외부연결은 유효한 암호가 설정되기전까지 활성화되지 않습니다."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- 언어가 변경되었습니다.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- 임시 폴더가 변경되었습니다.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-#, fuzzy
-msgid "- ED2K network enabled.\n"
-msgstr "모든 통신망을 사용할수 없습니다."
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "올려주기: 0.0 | 내려받기: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"UDP 포트가 비활성화되어 있으면 Kad는 시작하지 않을 것입니다.\n"
-"UDP 포트를 활성화시키거나 Kad를 비활성화시키십시오."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"지금 바로 어뮬을 재시작해야 합니다.\n"
-"만일 재시작하지 않는다면, 나쁜 일이 일어나도 불평하지 마십시오.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+msgid "Cannot convert magnet link to eD2k: %s"
 msgstr ""
-"자동갱신 서버 목록이 비어있습니다.\n"
-"적어도 한개의 유효한 server.met파일을 가르키는 URL을 적으세요.\n"
-"URL을 입력하려면 채크박스 옆의 \"목록\"버튼을 클릭하세요."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "임시 파일"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "내려받은 파일"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "온라인 서명"
 
-#: src/PrefsUnifiedDlg.cpp:920
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Choose a folder for %s"
-msgstr "%s하기 위한 폴더를 선택하세요."
-
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "비디오재생을 위한 브라우즈"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "브라우저 선택"
+msgid "Unknown protocol of link: %s"
+msgstr "링크의 알려지지 않은 프로토콜: %s"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Executable%s"
-msgstr "실행할수 있는 %s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
-"server.met파일을 내려받을 URL을 추가하세요.\n"
-"각 행에 오직 하나의 URL을 넣으세요."
-
-#: src/PrefsUnifiedDlg.cpp:1031
-#, fuzzy, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "갱신 지연: %d 초"
-msgstr[1] "갱신 지연: %d 초"
-
-#: src/PrefsUnifiedDlg.cpp:1038
-#, fuzzy, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "평균 그래프 시간: %d 분"
-msgstr[1] "평균 그래프 시간: %d 분"
-
-#: src/PrefsUnifiedDlg.cpp:1044
-#, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "연결 그래프 크기: %d"
-
-#: src/PrefsUnifiedDlg.cpp:1050
-#, fuzzy, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "갱신 지연: %d 초"
-msgstr[1] "갱신 지연: %d 초"
-
-#: src/PrefsUnifiedDlg.cpp:1056
-#, fuzzy, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "파일 버퍼 크기: %d 바이트"
-msgstr[1] "파일 버퍼 크기: %d 바이트"
-
-#: src/PrefsUnifiedDlg.cpp:1062
-#, fuzzy, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "올려주기 대기열 크기: %d 클라이언트"
-msgstr[1] "올려주기 대기열 크기: %d 클라이언트"
-
-#: src/PrefsUnifiedDlg.cpp:1069
-#, fuzzy, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "서버 연결 갱신 주기: %d 분"
-msgstr[1] "서버 연결 갱신 주기: %d 분"
 
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "서버 연결 갱신 주기: 비활성화"
-
-#: src/PrefsUnifiedDlg.cpp:1114
+#: src/ExternalConn.cpp:260
 #, fuzzy
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "확장된 서버 요청을 위한 UDP 포트 (TCP+3): 4665"
-
-#: src/PrefsUnifiedDlg.cpp:1118
-#, fuzzy
-msgid "disabled"
-msgstr "비활성화"
-
-#: src/PrefsUnifiedDlg.cpp:1138
-#, c-format
-msgid "Execute command on `%s' event"
-msgstr "`%s' 사건에 명령을 실행"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "코어에 명령 실행 활성화"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "코어 명령어:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "GUI에 명령 실행 활성화"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "GUI 명령어:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "다음 변수들은 교체됩니다.:"
-
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "허락되지않은 접속입니다. 연결이 끊깁니다."
+msgid "Client sent packet after authentication failed."
+msgstr "인증에 실패했습니다."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "외부연결 끊겼습니다."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "빈암호 때문에 외부연결이 불가능합니다."
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "이 환경설정에서 외부연결은 불가능합니다."
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "새로운 외부연결이 승인되었습니다."
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "환경설정의 빈암호로 인해 외부연결이 거부되었습니다."
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "연결중인 클라이언트: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "알수없는 버젼"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2342,2170 +1609,1058 @@
 "불확실한 외부연결 버젼 아이디, 이것은 바이너리와 호환되지 않습니다. 동일한 스"
 "냅삿으로부터 코어와 원격을 사용하세요."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
+"비정식 CVS 버젼으로부터 릴리즈된 버젼에 연결할수없습니다! *휴우* 있을 수 있었"
+"던 충돌을 막았습니다."
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "인증에 실패했습니다."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "유효하지 않은 프로토콜 버젼입니다"
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "프로토콜 버젼 태그 없음"
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "인증에 실패했습니다."
+
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "인증에 실패했습니다."
+
+#: src/ExternalConn.cpp:516
+#, fuzzy
+msgid "Invalid request, please authenticate first."
 msgstr "유효하지않은 요청, 먼저 인증을 하세요."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "접근 허가되었습니다."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, fuzzy, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "알 수 없는 클라이언트로부터 메시지를 차단"
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "허락되지않은 접속입니다. 연결이 끊깁니다."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "원격 부분파일 명령 실패: 파일해시를 찾을 수 없음: %s "
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "파일해시를 찾을 수 없음: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "이런! 명령코드 처리 오류!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "서버가 추가되지 않음"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "서버가 발견되지 않음: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "제거할 서버의 정의가 필요합니다."
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "검색중입니다. 금방 결과를 다시 가져옵니다."
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "원격 인터페이스로부터 웹검색은 좋지않은 선택입니다."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad는 환경설정에서 비활성화되어 있습니다."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "그래프가 비어있음."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "클라이언트는 세부 수준이 구성되지 않았습니다."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "이미 종료하는중입니다."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "외부연결: '%s' 링크를 추가합니다."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "유효하지 않은 링크거나 이미 목록에 존재합니다."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "파일을 찾을 수 없습니다."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "유효하지 않은 파일 이름입니다."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "파일이름을 변경할 수 없습니다."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad는 환경설정에서 비활성화되어 있습니다."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "이미 Kad에 연결되었습니다."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Kad에 연결중..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "모든 통신망을 사용할수 없습니다."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Kad로부터 연결이 끊겼습니다."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "유효하지 않은 실행코드(잘못된 프로토콜 버젼?)"
 
-#: src/UploadClient.cpp:273
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr "파일 (%s)을 열수없어 공유 파일 목록으로부터 제거합니다."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "알수 없는 파일의 해시설정이 요청되었습니다: %s"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "알수없는 확장 '%s' ('%s'명령에 대해)\n"
 
-#: src/TerminationProcess.cpp:48
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "`%s' 명령(pid `%d')은 상태코드 `%d'로 종료되었습니다."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "서버 추가되지 않음: IP나 호스트이름이 지정되지 않았습니다."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "서버 추가되지 않음: 유효하지 않는 서버 포트가 지정되었습니다."
+msgid "Unknown command '%s'.\n"
+msgstr "알수없는 명령 '%s' \n"
 
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
+"\n"
+"이 명령은 인수를 가질 수 없습니다.\n"
 
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "연결됨"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:포트"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "아이디"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "카뎀리아 상태:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "동작중"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "상태:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "연결이 끊김"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "연결 상태:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "방화벽"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "확인"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "방화벽 상태:"
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "친구에게 접속함"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "친구가 없음"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "평균 사용자:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "평균 파일:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "동작되지 않음"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "올려주기 시간: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "전송"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "올려주기"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "올려준 데이터 (세션 (전체)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "전체 추가자원 (패킷): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "파일 요청 추가자원 (패킷): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "자료 교환 추가자원 (패킷): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "서버 추가자원 (패킷): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Kad 추가자원(패킷): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
+"\n"
+"이 명령은 반드시 인수가 있어야 합니다.\n"
 
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "활성화된 올려주기: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "대기중인 올려주기: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "성공적인 전체 올려주기 세션 : %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "실패한 전체 올려주기 세션: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "평균 올려주기 시간: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "내려받기"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "내려받은 데이터 (세션 (전체)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "발견된 자료: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "활성화된 내려받기 (큰 부분): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "세션 올려주기:내려받기 비율 (전체): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
+"\n"
+"이 명령은 불완전합니다. 반드시 아래의 확장중 하나를 사용해야 합니다.\n"
 
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
 msgstr ""
+"\n"
+"가능한 확장:\n"
 
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr ""
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "가능한 명령:\n"
 
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
+#: src/ExternalConnector.cpp:186
+#, fuzzy, c-format
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
+"\n"
+"모든 명령은 대소문자를 구분하지 않습니다.\n"
+"<명령어>에 대한 자세한 정보를 얻으려면 'help <명령어>'를 입력하세요.\n"
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "재접속: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "첫 전송으로부터 시간: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "다음으로부터 서버에 연결됨: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "활성화된 연결 (평가): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "최대 연결 제한 접근함: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "평균 연결 (평가): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "최대 연결 (평가): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "클라이언트"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "차단됨"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "전체: %i 알려진: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "동작중인 서버: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "실패한 서버: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "전체: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "삭제된 서버: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "차단된 서버: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "동작중인 서버의 사용자: %llu"
-
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "동작중인 서버의 파일: %llu"
-
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "전체 사용자: %llu"
-
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "전체 파일: %llu"
-
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "서버 할당: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "응용프로그램에서 나감."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "공유된 파일의 수: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "도움말을 보여줍니다."
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "공유파일의 전체 크기: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"명령어에 대한 도움말은, 'help <명령어>'를 입력하세요.\n"
+"모든 명령어 목록을 보려면, 'help'를 입력하세요.\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
+"\n"
+"명령 목록을 위해 %s를 사용합니다.\n"
+"\n"
 
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "운영체제"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "받은게 없음"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "자르기"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "붙이기"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "모두 선택"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad를 실행 중이 아니면 Kad 검색을 할 수 없습니다."
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "문법 오류!"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr ""
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr "명령 처리에 오류 발생 - 일어나면 안 됩니다! 버그 리포트를 하세요\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Kad 검색 시도 중에 예기치 못한 에러: "
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "이 명령은 어떤 변수도 필요하지 않습니다."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "'%s'로부터 차단된 메시지 (IP:%s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "이 명령은 반드시 변수가 있어야 합니다."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "'%s'로부터 새로운 메시지 (IP:%s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "유효하지 않은 인수입니다."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "사용자 %s(%u)가 공유파일 목록을 요청합니다. -> 허락됨"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "불완전한 명령입니다."
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "사용자 %s(%u)가 공유파일 목록을 요청합니다. -> 거부됨"
+msgid "Type '%s' to get more help.\n"
+msgstr "더 많은 도움말을 위해서는 '%s'를 입력하세요.\n"
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "사용자 %s(%u)가 공유폴더 목록을 요청합니다. -> 허락함"
+msgid "This is %s %s %s\n"
+msgstr "이것은 %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "사용자 %s(%u)가 공유폴더 목록을 요청합니다. -> 거부됨"
+msgid "This is %s %s\n"
+msgstr "이것은 %s %s\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr "사용자 %s(%u)가 폴더 %s의 공유파일 목록을 요청합니다. -> 허락됨"
-
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr "사용자 %s(%u)가 폴더 %s의 공유파일 목록을 요청합니다. -> 거부됨"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "사용자 %s (%u)는 %s 폴더를 공유하고있습니다."
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "사용자 %s (%u)는 공유폴더를 요청하지 않았습니다."
-
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "사용자 %s (%u)는 %s 폴더의 공유파일 목록을 보냅니다."
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "사용자 %s (%u)는 공유파일 목록 전송을 마쳤습니다."
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "사용자 %s (%u)는 공유파일 목록을 원하지않습니다."
-
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr "사용자 %s (%u)는 공유파일이나 공유폴더 목록에 접근하는것을 거부합니다."
+"\n"
+"Creating client...\n"
+msgstr ""
+"\n"
+"클라이언트 생성중...\n"
 
-#: src/KadDlg.cpp:132
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Nodes (%u)"
-msgstr "노드 (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "초기적재에 유효하지 않은 IP"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "초기적재에 유효하지 않은 포트"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "모든 항목을 채워주세요."
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "새로운 nodes.dat파일을 내려받으시겠습니까?\n"
-
-#: src/KadDlg.cpp:197
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
-msgstr "현재노드는 제거되고 카뎀리아 연결이 다시 시작됩니다."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "계속할까요?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
+"\n"
+"좋아, 나가는중 %s...\n"
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
+"빈 암호로 연결할수 없습니다.\n"
+"설정 파일에 암호를 정하거나 \n"
+"또는 명령줄이나 요청시에 입력해야 합니다.\n"
+"\n"
+"종료중...\n"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "친구 추가"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "이 도움말을 보여줍니다."
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "정확한 IP와 포트를 입력하세요!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "어뮬이 실행중인 호스트. (기본: localhost)"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "정보"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "외부연결을 위한 어뮬 포트. (기본: 4712)"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "설정된 사용자 해시가 옳바르지 않습니다!"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "외부연결 암호"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "자료"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "파일로부터 환경설정을 읽습니다."
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "파일"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "표준출력으로는 어떤 출력도 하지 않습니다."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "내려받기"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "상세하게 - 디버그 메시지도 보여줍니다."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "분류"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "프로그램 지역정보 (로케일, 언어)를 설정합니다."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "주"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "명령줄 설정을 환경설정 파일에 기록합니다."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "분류내 내려받기"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "어뮬의 설정 파일에 기초하여 설정 파일을 생성합니다."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr ""
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "프로그램 버전을 출력합니다."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr ""
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "파일 세부내역"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "원격 어뮬에 연결함"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% 완료"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "연결 실패"
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, fuzzy, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "연결 실패. 특정 호스트에 연결할 수 없습니다\n"
-
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "사용자: E: %s K: %s | 파일 E: %s K: %s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "전부"
-
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "전체 사용자: %s | 전체 파일: %s"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "전송됨"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "친구"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "속도"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "상세히 보기(&D)"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "진척"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "친구 추가"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "상태"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "친구 제거"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "남은 시간"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "메시지 보내기(&M)"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "최종 완료"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "파일 보기"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "최종 받음"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "친구 칸으로 확정함"
 
-#: src/DownloadListCtrl.cpp:581
+#: src/FriendListCtrl.cpp:169
 #, fuzzy
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "선택된파일을 지우시겠습니까?"
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "선택한 친구들을 삭제하시겠습니까?"
 
-#: src/DownloadListCtrl.cpp:583
+#: src/FriendListCtrl.cpp:171
 #, fuzzy
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "선택된파일을 지우시겠습니까?"
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "선택한 친구들을 삭제하시겠습니까?"
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"하나 이상의 친구칸으로 설정이 허락되지않습니다\n"
+"단지 하나의 칸만 가능합니다."
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "다중 선택"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "사용자에게 메시지를 보내기"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "보낼 메시지:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "멈춤(&S)"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "중지(&P)"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "계속(&R)"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "완료된것 정리(&l)"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "모든 A4AF를 이 파일로 바꿈"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "모든 A4AF를 이 파일로 바꿈 (자동)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "모든 A4AF를 다른 파일로 바꿈"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "확장 옵션"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "미리보기"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "파일 상세 보기(&d)"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "모든 의견 보기"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "magnet URI를 클립보드로 복사"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "할당되지않은"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "분류로 할당"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "파일 열기(&O)"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "친구에서 삭제"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "친구에 추가"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "메시지 보내기"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "파일을 교환"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "다른 파일을 요청"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "내려받기 (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "미리보기"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "대기중인 올려주기: %s"
 
-#: src/DownloadListCtrl.cpp:2320
+#: src/GenericClientListCtrl.cpp:1026
 #, fuzzy, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "오류: 외부 재생기를 실행하지 못했습니다."
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "오류: 부분파일을 생성하지 못했습니다.)"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "%s로부터 met파일의 백업을 읽을려고 합니다."
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr ""
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr ""
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr ""
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "파일 정보를 복구하려고 하고있습니다..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "이름없는 파일을 복구합니다. - RecoveredFile.dat로 복구합니다."
+msgid "On Queue: %u"
+msgstr "대기열에"
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "모든 가능한 파일정보를 복구되었습니다. :D - 사용해 보세요..."
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "올려주기"
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "파일정보 복구가 불가능합니다. :("
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "아무도"
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "%s(%s)을 열지 못했습니다."
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "아니오"
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr ""
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "예"
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "부분파일을 저장하는 동안에 오류: %s (%s ==> %s)"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "내려받기중..."
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s'은 어찌된일인지 크기가 0입니다. - %s 파일을 사용합니다."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "%s에 대한 part.met.seeds 파일을 저장하지 못했습니다."
-
-#: src/PartFile.cpp:1024
+#: src/HTTPDownload.cpp:205
 #, fuzzy, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "부분파일을 위해 %i 자료핵심을 저장되었습니다: %s(%s)"
-msgstr[1] "부분파일을 위해 %i 자료핵심을 저장되었습니다: %s(%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "부분파일 %s(%s)은 핵심파일을 가지고 있지 않습니다."
-
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "부분파일 %s(%s)은 빈 핵심파일을 가지고 있습니다."
-
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "부분파일의 핵심파일(%s - %s)을 읽는중 오류: %s"
-
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, fuzzy, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"손상된 부분(%d)이 발견되었습니다. (%d부분 파일 %s에 있는) - 파일해시결과 |%"
-"s| 파일해시 |%s|"
-msgstr[1] ""
-"손상된 부분(%d)이 발견되었습니다. (%d부분 파일 %s에 있는) - 파일해시결과 |%"
-"s| 파일해시 |%s|"
+msgid "Unable to create destination file %s for download!"
+msgstr "경고: 외형 파일 '%s'(을)를 읽을 수 없습니다."
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "완료된 부분(%i)이 발견되었습니다.  (%s에 있는)"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "%s의 재해시가 완료되었습니다."
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/PartFile.cpp:2266
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Finished downloading: %s"
-msgstr "내려받기 완료: %s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "파일 삭제: %s"
-
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "경고: 충분한 디스크공간이 없습니다! 파일 정지: %s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "%i 부분 내려받기는 파일이 손상되었습니다: %s"
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
+msgstr "내려받기 %s"
 
-#: src/PartFile.cpp:3214
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: 손상된 부분 %i를 복구했습니다. (%s의) -> 저장된 바이트: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
+#: src/HTTPDownload.cpp:336
+msgid ""
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "멈춤"
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "서버에 재접속"
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
 
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr ""
-
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "known.met 파일을 읽는동안 입출력 오류: %s"
-
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "known.met 파일을 저장하는 동안 오류: %s"
-
-#: src/SharedFileList.cpp:352
-#, fuzzy, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "알려진 공유 파일 %i개를 찾았음"
-msgstr[1] "알려진 공유 파일 %i개를 찾았음"
-
-#: src/SharedFileList.cpp:358
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "알려진 공유 파일 %i개, 알수없는 %i개를 찾았음 "
-msgstr[1] "알려진 공유 파일 %i개, 알수없는 %i개를 찾았음 "
-
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr ""
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "파일 의견"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "등급"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "의견"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "의견이 없음"
-
-#: src/CommentDialogLst.cpp:104
-#, fuzzy, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%s 의견"
-msgstr[1] "%s 의견"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr "난독화된 서버들로의 연결이 모두 실패했습니다. 난독화없이 진행합니다."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "모든 서버 목록에 접속하지 못했습니다. 다른 서버를 만드세요."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr ""
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/ServerConnect.cpp:187
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "%s (%s:%i)에 연결되었습니다."
-
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "다음에 연결이 되었습니다: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
-"연결하는 동안 치명적 오류가 발생하였습니다. 인터넷 연결이 끊긴것 같습니다."
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "%s(%s:%i)에 연결이 끊김."
 
-#: src/ServerConnect.cpp:349
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s(%s:%i)가 죽은것 같습니다."
-
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s(%s:%i)가 가득찬것 같습니다."
-
-#: src/ServerConnect.cpp:381
-#, fuzzy, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "%d 초후에 서버로 자동 접속을 재시도"
-msgstr[1] "%d 초후에 서버로 자동 접속을 재시도"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "연결 끊김"
-
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "%s(%s:%i)에 연결하지 못했습니다."
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
+msgid "Successfully updated %s"
 msgstr ""
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "%s(%s:%i)에 접속을 시도하는데 시간이 지났습니다."
-
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "부분파일을 찾을 수 없음"
-
-#: src/DownloadQueue.cpp:171
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, fuzzy, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "%u 부분파일을 찾았음"
-msgstr[1] "%u 부분파일을 찾았음"
+msgid "Failed to download %s from %s"
+msgstr "%s로부터 서버 목록를 내려받지 못함"
 
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "%s로부터 서버 목록를 내려받지 못함"
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr ""
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "'ipfilter.dat' 와 'ipfilter_static.dat'의 IP 차단을 읽어옵니다."
 
-#: src/DownloadQueue.cpp:339
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Downloading %s"
-msgstr "내려받기 %s"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "ipfilter.dat 파일 '%s'을 읽지 못했습니다. 알 수 없는 형식입니다."
 
-#: src/DownloadQueue.cpp:347
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "이미 '%s' 파일을 내려받으려고 하고있음"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "ipfilter.dat 파일 '%s'을 읽지 못했습니다, 파일을 열 수 없습니다."
 
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "이미 %s 파일을 가지고 있음"
+#: src/IPFilter.cpp:329
+#, fuzzy, c-format
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] ""
+"%u 개의 IP 범위를 '%s'로부터 읽었습니다. %u 개의 잘못된 줄은 무시했습니다."
+msgstr[1] ""
+"%u 개의 IP 범위를 '%s'로부터 읽었습니다. %u 개의 잘못된 줄은 무시했습니다."
 
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "이미 %s 파일을 내려받으려고 하고있음"
+#: src/IPFilter.cpp:331
+#, fuzzy, c-format
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] ""
+"%u 개의 IP 범위를 '%s'로부터 읽었습니다. %u 개의 잘못된 줄은 무시했습니다."
+msgstr[1] ""
+"%u 개의 IP 범위를 '%s'로부터 읽었습니다. %u 개의 잘못된 줄은 무시했습니다."
 
-#: src/DownloadQueue.cpp:1299
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "링크의 알려지지 않은 프로토콜: %s"
-
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "<str>을 실행하고 종료합니다."
-
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "유효하지 않은 IP 형식. xxx.xxx.xxx.xxx:xxxx를 사용하세요.\n"
-
-#: src/TextClient.cpp:309
-#, fuzzy
+#: src/KadDlg.cpp:86
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr "이 명령은 인수를 필요로합니다. 유효한 인수: 'all' 또는 숫자\n"
-
-#: src/TextClient.cpp:347
-#, fuzzy
-msgid "Processing by hash: "
-msgstr "파일숫자 %u 처리: %s"
-
-#: src/TextClient.cpp:362
-#, fuzzy
-msgid "Processing by filename: "
-msgstr "파일숫자 %u 처리: %s"
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Bootstrap from \n"
+"known clients"
 msgstr ""
+"알려진 클라이언트로부터 \n"
+"초기적재"
 
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "유효한 숫자가 아님\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "유효한 해시가 아님 (길이는 정확히 32자여야 함)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "동작이 성공했습니다."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "다음과 같은 오류로 요청이 실패: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "클라이언트에 대한 IP 차단 %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "끔"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "켬"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "서버에 대한 IP 차단 %s.\n"
-
-#: src/TextClient.cpp:664
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "현재 IP 차단 수준은 %d입니다.\n"
+msgid "Nodes (%u)"
+msgstr "노드 (%u)"
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr ""
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "초기적재에 유효하지 않은 IP"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr ""
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "초기적재에 유효하지 않은 포트"
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "%s %s %s에 연결됨"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "모든 항목을 채워주세요."
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "낮은아이디로"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "새로운 nodes.dat파일을 내려받으시겠습니까?\n"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "높은아이디로"
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr "현재노드는 제거되고 카뎀리아 연결이 다시 시작됩니다."
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "지금 연결중"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "계속할까요?"
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "연결 안됨"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "카뎀리아: 검색어가 너무 짧습니다."
 
-#: src/TextClient.cpp:723
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+msgid "Keyword for search: %s"
 msgstr ""
-"\n"
-"내려받기:\t%s"
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
-"\n"
-"올려주기:\t%s"
 
-#: src/TextClient.cpp:729
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"대기열의 클라이언트:/t %d\n"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
+#, fuzzy, c-format
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "%u개의 Kad 접속을 읽었음"
+msgstr[1] "%u개의 Kad 접속을 읽었음"
+
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"전체 자료:\t% d\n"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "검색된 결과 갯수: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - 검색의 진행을 보여줌"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "서버로부터 알수없는 반응을 수신했습니다. 실행코드 =  %#x"
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "간단한 상태 정보를 보여줍니다."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "연결 상태를 보여줌, 현재 올려주기/내려받기 속도, 기타.\n"
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "전체 통계 구조도를 보여줍니다."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "파일 이름"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
+#: src/KnownFile.cpp:1545
+msgid "File size"
 msgstr ""
-"부가적으로, 0-255 범위에 있는 숫자를 이 명령의 인수로 넘길 수 있으며,\n"
-"얼마나 많은 항목을 클라이언트 버젼 하위구조에 보여줄 것인지 결정합니다.\n"
-"0이나 생략은 '무제한'을 뜻합니다..\n"
-"예: 'statistics 5'는 각 클라이언트 종류의 상위 5가지 버전만 보여줍니다.\n"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
 msgstr ""
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
 msgstr ""
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "주어진 대상을 다시 읽어들입니다."
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "공유된 파일 목록을 다시 읽어들입니다."
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "파일로부터 IP 차단 테이블을 다시 읽어들입니다."
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "통신망에 연결합니다."
-
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
 msgstr ""
-"설정되어 있는 가능한 모든 통신망에 연결할 것입니다.\n"
-"또한, 부가적으로 연결할 서버를 IP:포트 형식으로 지정할수 있습니다.\n"
-"IP는 점과 십진수의 IPv4 주소이거나, 해석 할 수 있는 DNS이름 이어야 합니다.\n"
-" "
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
 msgstr ""
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Kad에만 연결합니다."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "통신망으로부터 연결을 끊습니다."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "현재 연결되어있는 모든 통신망으로부터 연결을 끊습니다.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
 msgstr ""
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Kad에서만 연결을 끊습니다."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "설정값을 정합니다."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "IP 차단 설정을 합니다."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "클라이언트와 서버에 IP 차단을 사용합니다."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "클라이언트와 서버에 IP 차단을 사용하지 않습니다."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "클라이언트에 IP 차단을 활성/비활성화 합니다."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "클라이언트에 IP 차단을 사용합니다."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "클라이언트에 IP 차단을 사용하지 않습니다."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "서버에 IP 차단을 활성화/비활성화 합니다."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "서버에 IP 차단을 사용합니다."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "서버에 IP 차단을 사용하지 않습니다."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "IP 차단 수준을 선택합니다."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"유효한 차단 수준은 0-255범위여야 하고, 기본(초기)값은\n"
-"127입니다.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "대역폭 제한 설정합니다."
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "이 명령에 주어지는 값은 킬로바이트/초 이어야 합니다..\n"
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "알수없는 버젼"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "올려주기 대역폭 제한 설정합니다."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "경고: 외형 파일 '%s'(을)를 읽을 수 없습니다."
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "내려받기 대역폭 제한 설정합니다."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "해시중"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "설정값 가져와 보여줍니다."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "완료중"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "IP 차단 설정을 가져옵니다."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "완료"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "서버와 클라이언트에서 IP 차단 상태를 가져옵니다."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "중지됨"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "클라이언트에서만 IP 차단 상태를 가져옵니다."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "오류투성이"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "서버에서만 IP 차단 상태를 가져옵니다."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "대기중"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "IP 차단 수준을 가져옵니다."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "반드시 암호를 설정해야 합니다."
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "대역폭 제한 가져옵니다."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "잘못된 패스워드, MD5 해시가 아닙니다."
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "검색을 합니다."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "연결 실패"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
 msgstr ""
-"검색의 종류는 다음중에서 정의되어야 합니다:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"예: 'search kad file'은 \"file\"에대해 kad 검색을 실행합니다.\n"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "광역 검색을 수행합니다."
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "외부연결: 서버 응답 불량. 연결이 끊겼습니다."
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "지역 검색을 수행합니다."
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "성공! 어뮬에 연결 되었습니다 "
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Kad 검색을 수행합니다."
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "성공! 연결이 되었습니다."
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "마지막 검색의 결과를 보여줍니다."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr ""
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "이전 검색의 결과로 돌아갑니다.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "외부연결 암호"
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "파일의 내려받기를 시작"
-
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
 msgstr ""
-"마지막 검색으로부터 파일의 번호가 부여됩니다.\n"
-"예: 'download 12' 는 이전 검색에서 12번 번호를 가진 파일의 내려받기를 시작합"
-"니다.\n"
-
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "내려받기를 정지합니다."
-
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "내려받기를 재시작합니다."
-
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "내려받기를 취소합니다."
-
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "내려받기의 우선순위를 설정합니다."
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "내려받기의 우선순위를 낮음, 보통, 높음 또는 자동으로 설정합니다.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr ""
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "우선순위를 낮음으로 설정합니다."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "닫기"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "우선순위를 보통으로 설정합니다."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "자르기"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "우선순위를 높음으로 설정합니다."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "복사"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "우선순위를 자동으로 설정합니다."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "붙이기"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "대기열/목록 보여줍니다."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "깨끗이"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr "올려주기/내려받기 대기열, 서버 목록이나 공유된 파일 목록 보여줍니다.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "모두 선택"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "올려주기 대기열을 보여줍니다."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "내려받기 대기열을 보여줍니다."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "무제한"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "로그를 보여줍니다."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "어뮬 트레이 메뉴"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "서버 목록 보여줍니다."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr ""
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "로그를 초기화합니다."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "올려주기: 없음"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr ""
+msgid "UL: %u"
+msgstr "올려주기: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "내려받기: 없음"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr ""
+msgid "DL: %u"
+msgstr "내려받기: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
+msgid "Download speed: %.1f"
 msgstr ""
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "새로운 클라이어트 아이디는 %u임"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
+msgid "Upload speed: %.1f"
 msgstr ""
 
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\t이러한 대부분의 이유는 방화벽이나 라우터때문입니다."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\t더 많은 정보는 http://wiki.amule.org을 참조하세요."
-
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "알수없는 서버 정보를 받았습니다! - 매우 짧음"
-
-#: src/ServerSocket.cpp:539
-#, fuzzy, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "새로운 서버 %d개를 받음"
-msgstr[1] "새로운 서버 %d개를 받음"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "클라이언트 정보"
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "서버목록 저장이 완료되었습니다."
+#: src/MuleTrayIcon.cpp:330
+#, c-format
+msgid "Nickname: %s"
+msgstr "별명: %s"
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "서버가 마지막 명령을 거부함"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "별명이 선택되지 않음!"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "가짜 패킷을 서버로부터 받았습니다: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "클라이언트 아이디: "
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "서버로부터 패킷을 처리하는동안 조치할수 없는 오류가 생겼습니다: %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "연결 안됨"
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "%s에 연결하기 위한 DNS 해석 쓰레드를 만들수 없음"
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "서버 이름: "
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "서버 IP %s(%s)가 차단되었습니다. 연결할수 없습니다."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "서버 IP: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "프로토콜 난독화를 사용합니다."
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "아직 연결되지 않았습니다."
 
-#: src/ServerSocket.cpp:748
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "%s (%s - %s:%i) %s에 연결합니다."
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "%s 서버에 대한 DNS를 해석 할 수 없음: 연결할수 없습니다!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): 국가 정보를 읽을 수 없습니다."
-
-#: src/IP2Country.cpp:105
-#, fuzzy, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Loaded %d flag bitmaps."
-msgstr[1] "Loaded %d flag bitmaps."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr "이 분류에 있는 모든 파일을 취소하고 삭제하시겠습니까?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "확인이 요청됨"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "다른 전부"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "내려받음"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "활성화"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "비디오"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "음악"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "압축"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD이미지"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "그림"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "문자"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "보기 필터 선택"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "분류 추가"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "분류 수정"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "분류 삭제"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "파일 이름"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr ""
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr ""
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
+msgid "TCP port: %d"
 msgstr ""
 
-#: src/KnownFile.cpp:1363
-msgid "Requested"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
+#: src/MuleTrayIcon.cpp:385
+#, c-format
+msgid "UDP port: %d"
 msgstr ""
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/PartFileConvert.cpp:208
-#, c-format
-msgid "Importing %s: %s"
-msgstr "가져오는중 %s: %s"
-
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "임시 폴더를 읽는중"
-
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "내려받은 정보 파일로부터 기본적인 정보를 재생"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "온라인 서명: 활성화"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "대상 파일을 생성"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "온라인 서명: 비활성화"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "오래된 내려받은 파일로부터 데이터를 읽어들임 (%u (%u의))"
+msgid "Uptime: %s"
+msgstr "올려주기 시간: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "데이터 블럭을 새 내려받은 파일로 저장 (%u (%u의))"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "내려받은 파일 정보 자료를 재생"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "내려받기에 추가하고 새 부분파일을 저장"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "부분파일 가져오기"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "상태"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "파일 해시"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "대기중..."
+msgid "Shared files: %d"
+msgstr ""
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s(디스크: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr "임시 내려받기를 위해 검색할 폴더를 선택하세요! (하위 폴더 포함)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "성공적으로 가져온 내려받기 파일을 삭제하겠습니까?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "자료를 삭제하겠습니까?"
-
-#: src/OtherFunctions.cpp:112
-#, fuzzy
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "bytes"
-msgstr[1] "bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-#, fuzzy
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "bytes/s"
-msgstr[1] "bytes/s"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "초"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "분"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "시"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "일"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "동영상"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "압축"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "문장"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "프로그램"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "어떤"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "선택되지 않은"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "유효하지않은 / 손상된 / 가짜"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "나쁜"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "그저그런"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "좋은"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "아주좋은"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "전부"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "다른 모두"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "'ipfilter.dat' 와 'ipfilter_static.dat'의 IP 차단을 읽어옵니다."
+msgid "Queued clients: %d"
+msgstr ""
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "ipfilter.dat 파일 '%s'을 읽지 못했습니다. 알 수 없는 형식입니다."
+msgid "Total DL: %s"
+msgstr "전체 내려받기: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "ipfilter.dat 파일 '%s'을 읽지 못했습니다, 파일을 열 수 없습니다."
+msgid "Total UL: %s"
+msgstr "전체 올려주기: %s"
 
-#: src/IPFilter.cpp:331
-#, fuzzy, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] ""
-"%u 개의 IP 범위를 '%s'로부터 읽었습니다. %u 개의 잘못된 줄은 무시했습니다."
-msgstr[1] ""
-"%u 개의 IP 범위를 '%s'로부터 읽었습니다. %u 개의 잘못된 줄은 무시했습니다."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr ""
 
-#: src/IPFilter.cpp:333
-#, fuzzy, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] ""
-"%u 개의 IP 범위를 '%s'로부터 읽었습니다. %u 개의 잘못된 줄은 무시했습니다."
-msgstr[1] ""
-"%u 개의 IP 범위를 '%s'로부터 읽었습니다. %u 개의 잘못된 줄은 무시했습니다."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr ""
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "활성화된 연결 (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "어뮬 숨기기"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "파일 세부내역"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "어뮬 보이기"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% 완료"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "종료"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "확정"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4513,25 +2668,29 @@
 "사건은 이곳에 보여집니다. 사건 목록의 전체를 보기위해 서버텝에 있는 로그파일"
 "을 참조하세요"
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "읽는중..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "접속되어있는 서버의 사용자 수는..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "사용자: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr "현재 서버에 연결된 사용자들과 총 사용자수를 측정합니다."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "올려주기: 0.0 | 내려받기: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4539,7 +2698,7 @@
 "현재 올려주기와 내려받기 비율을 평균합니다. 가능하다면 괄호안의 수는 클라이언"
 "트 통신으로부터의 추가자원을 의미합니다."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4550,1096 +2709,1029 @@
 "미하며, 노란 화살은 낮은아이디(방화벽)를 가지고 있다는 의미이고, 초록 화살은 "
 "높은아이디(최적의 연결 형태)를 가지고 있다는 의미입니다."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "연결안됨..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "현재 서버에 연결되었습니다."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "검색"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "이름:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "종류"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "지역"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "광역"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "파일해시"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "확장 변수"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "필터링"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "파일 종류"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "어떤"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "압축"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "음악"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD이미지"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "그림"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "프로그램"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "문장"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "동영상"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "확장자"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "최소 크기"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "바이트"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "최대 크기"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "유효성"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "필터:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "필터링 결과"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "반전 결과"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "알려진 파일을 숨김"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "시작"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "추가"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "멈춤"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "내려받기"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "항목 초기화"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "결과"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "완료된 내려받기 정리"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "올려주기 / 올려주기 대기열 보이기"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "대기열속의 클라이언트 :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "보내기"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "지정된 메시지를 보냅니다."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "닫기"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "자료 유지"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "이 채팅세션을 닫습니다."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "일반"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "전체 이름 :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "없음"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "메타파일 :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "해시"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "파일 크기 :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "부분파일 상태 :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "마지막 부분이 완료 :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "전송"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "찾은 자료 :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "전송된 자료 :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "부분파일 카운트 :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "가능함 :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "데이터율 :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "내려받기 활성화 시간: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "전송됨 :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "완료된 크기 :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "현명한 오류처리"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "오류로 잃어버림 :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "압축으로 얻음 :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "I.C.H에의해 저장된 패키지 :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "파일 이름"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "인계"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "정돈"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "적용"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "확인"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "파일에 대한 의견/등급(내용은 모든 사용자가 볼 수 있습니다.)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"영화의 상영시간, 줄거리, 언어등을 말할수 있습니다.\n"
-"만약 가짜 파일이라면 다른 어뮬 사용자에게 알려줄 수 있습니다."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "파일 품질"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "선택되지 않은"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "유효하지않은 / 손상된 / 가짜"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "나쁜"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "그저그런"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "좋은"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "아주좋은"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "만약 파일이 유용하지 않으면 파일 품질을 선택하거나 사용자에게 충고하세요."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "새롭게하다"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "내려받는중. 잠시만 기다려주세요..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "알수없는 크기"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "요구된 정보"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP 주소 :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "포트 :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "추가적 정보"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "사용자 이름 :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "사용자 해시 :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "공유된 파일을 다시 읽어들임"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "현재 세션"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "전체"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "요청됨 :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "활성화된 올려주기 :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "추가"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "내려받기 속도"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "현재"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "동작중 평균"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "세션 평균"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "올려주기 속도"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "연결"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "활성화된 내려받기"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "활성화된 연결 (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "활성화된 올려주기"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "통계 트리"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "사용자 이름:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "사용자 해시:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "클라이언트 소프트웨어:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "클라이언트 버전:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP 주소:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "사용자 아이디:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "서버 IP:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "서버 이름:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "클라이언트에 전송"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "현재 요청:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "평균 올려주기율:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "평균 내려받기율:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "올려주기 (세션)"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "내려받기 (세션)"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "올려주기 (전체)"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "내려받기 (전체)"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "점수"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "내려받기/올려주기 변경자:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "안전한 인증:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "평가 (전체)"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "대기열에 있음"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "대기열 점수:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "별명"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.amule.org - 리눅스 뮬"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "이것은 접속했을때 다른 사용자가 볼 수 있는 이름입니다."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "언어"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "도구도움이 보여주기 이전의 지연시간."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "컨트롤에서 사용하는 언어를 설정합니다."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "기타 설정"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "시작할때 새 버젼이 있는지 확인"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "이것을 활성화하면 어뮬은 시작할때마다 새로운 버젼이 있는지 확인할것 입니다."
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "최소화된 시작"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "이것은 어뮬을 시작할때 최소화를 가능하게 합니다."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "종료시 확인창"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "종료하기 전에 확인창을 보여줍니다."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "트레이아이콘 활성화"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "이것은 시스템 트레이(혹은 작업표시줄) 아이콘을 활성화/비활성화 합니다."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "트레이 아이콘으로 최소화"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr "어뮬을 작업표시줄보다 시스템 트레이로 최소화 하도록 합니다."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "도구도움의 지연 시간 (초)"
-
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "도구도움이 보여주기 이전의 지연시간."
-
-#: src/muuli_wdr.cpp:1669
-msgid "Browser Selection"
-msgstr "브라우저 선택"
-
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "컨커러"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "모질라"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "불여우"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "불사조"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "오페라"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "넷스케이프"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "갈레온"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "에피파니"
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
+#: src/muuli_wdr.cpp:1511
+msgid "Browser Selection"
 msgstr "브라우저 선택"
 
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "특정 브라우저:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"브라우저 이름을 입력하세요. 특정 브라우저를 사용하기 위해서는 위의 메뉴중에"
-"서'특정 브라우저'를 선택하세요."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "탐색"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "가능하면 새로운 탭을 생성함"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "가능하면 새로운 창을 여는것 대신 새로운 탭을 생성합니다."
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "비디오 재생기"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "올려주기"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "칸 배분"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "표준 클라이언트 TCP 포트:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "확장된 클라이언트 UDP 포트:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "비활성화"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "확장된 서버 요청을 위한 UDP 포트 (TCP+3): 4665"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "파일당 최대자료수"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "최대 연결"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2k"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "카뎀리아"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "UPnP 활성화"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP TCP 포트:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2k"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "시작시 자동연결"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "끊겼을시 재연결"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "추가자원 대역폭을 보여줌"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "서버 선택사항"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "죽은서버 제거"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "재시도"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "목록"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "우선순위 시스템을 사용"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "연결할때 현명한 낮은아이디 검사를 사용"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "안전한 연결"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "정적목록내의 서버에만 연결"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "수동으로 추가된 서버에 높은 우선권 부여"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. 활성화"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH가 모든 해시를 신뢰 (추천안함)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "멈춤 상태로 내려받기에 파일 추가"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "자동 우선권으로 내려받기에 파일 추가"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "처음과 마지막 부분을 먼저 내려받음"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "자동 우선권으로 새로운 공유파일을 추가"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "모든 올려주기에 전체부분 전송을 시도"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "파일이 완료되었을때 멈춤상태인 다음파일을 시작"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "동일한 분류로부터"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "희귀한 파일인 경우 10개의 자료 저장 (<20 자료)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "원하는 최소한의 디스크공간을 입력하세요."
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr ""
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "희귀한 파일인 경우 10개의 자료 저장 (<20 자료)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "올려주기"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "자동 우선권으로 새로운 공유파일을 추가"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(하위폴더 전체를 공유하려면 폴더 아이콘상에서 오른쪽 버튼을 클릭)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "숨은파일 공유"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "그래프"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "갱신 지연 : 5 초"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "평균 그래프 시간 : 100 분"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "연결 그래프 크기 : 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "통계색 선택"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr ""
+
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "바탕"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "눈금"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "현재 내려받기"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "내려받기 운용 평균"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "내려받기 세션 평균"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "현재 올려주기"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "올려주기 운용 평균"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "올려주기 세션 평균"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "활성화된 연결"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "시스템트레이 아이콘 속도바"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "현재 Kad-노드"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Kad-노드 운용"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Kad-노드 세션"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "선택"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "표시될 클라이언트 버젼의 수 (0=무제한)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "라인 용량"
-
-#: src/muuli_wdr.cpp:2249
-#, fuzzy
-msgid "Note: These values are only used for statistics."
-msgstr ""
-"알림: 이 값은 오직\n"
-" 통계 목적으로 사용함."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! 경고 !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"당신이 무엇을 하는지 알때까지 이 설정들을 바꾸지 마세요.\n"
-"당신 스스로 문제를 만들기 쉽습니다.\n"
-"\n"
-"\n"
-"이 설정들을 조정하지 않아도\n"
-"어뮬은 잘 동작할 것입니다."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "고급 설정"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "최대 새연결 / 5 초"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "파일 버퍼 크기: 240000 바이트"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "올려주기 대기열 크기: 5000 클라이언트"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "서버 연결 갱신 간격: 사용않함"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "내려받기 대기열 파일 진행"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "퍼센트로 보기"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "진행바로 보기"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "진행바 모양"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "평평한"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "둥근"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "외형 지원"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "외형지원 활성화"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "외형:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- 가능한 외형이 없음 -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "열 정렬"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "내려받기 대기열 자동 정렬 (높은 CPU)"
-
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "어뮬은 내려받는 목록의 항목을 자동으로 정렬합니다."
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "기타 GUI 조정"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "분류탭의 확장된 정보를 보여줌"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "제목에 전송률을 보여줌"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "제목에 전송률을 보여줌"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "수직방향 툴바"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "파일이름 앞에 부분파일 번호를 보여줌"
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "시작시 어뮬웹 구동"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "수직방향 툴바"
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "페이지를 갱신 시간 (초)"
-
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Gzip압축을 활성화"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "낮은권한 사용자 활성화"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "평평한"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "모든 권한 암호"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "둥근"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "낮은 권한 암호"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "웹 템플릿"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "어뮬은 내려받는 목록의 항목을 자동으로 정렬합니다."
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "외부연결 설정"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "외부연결 받아들임"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
-"수신대기 인터페이스의 IP\n"
-"(모두를 위해서는 비움)"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5647,75 +3739,116 @@
 "수신대기 외부연결 인터페이스에 a.b.c.d 형식의 유효한 IP를 입력하세요. 항목이 "
 "비었거나 0.0.0.0이면 모든 인터페이스를 의미합니다."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP 포트"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "외부연결 포트에 UPnP 포트포워딩 활성화"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "암호"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "웹 템플릿"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "모든 권한 암호"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "낮은권한 사용자 활성화"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "낮은 권한 암호"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "페이지를 갱신 시간 (초)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Gzip압축을 활성화"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "확인"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "환경설정으로 바꾼것을 적용하려면 이곳을 클릭하세요."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "환경설정으로 바꾼것을 초기화합니다."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "제목 :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "의견 :"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "내려받는 폴더 :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "새롭게 할당된 파일의 우선권를 바꿉니다. :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "변경 않음"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "이 분류의 색을 선택 (일반적으로 선택된) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "연결되었을때 서버 motd를 보여줌..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "서버 정보"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "초기화"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "로그를 초기화하려면 이 버튼을 클릭하세요."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "어뮬 로그"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "URL로부터 서버 목록을 갱신하려면 이 버튼을 클릭..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5723,43 +3856,55 @@
 "알려진 서버의 목록을 갱신하기 위해서는 이곳에 server.met파일의 url을 입력하"
 "고 왼쪽편의 버튼을 누르세요."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "새로운 서버의 이름을 입력하세요."
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:포트"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "x.x.x.x형식으로 서버의 IP를 이곳에 입력하세요."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "서버의 포트를 이곳에 입력하세요."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "서버 수동 추가 (미리 왼쪽 부분을 채울 것) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "어뮬 로그"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "서버 정보"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "ED2k 정보"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad 정보"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "URL로부터 노드를 갱신하려면 이 버튼을 클릭..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "노드 (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5767,51 +3912,56 @@
 "알려진 노드의 목록을 갱신하기 위해서는 이곳에 nodes.dat파일의 url을 입력하고 "
 "왼쪽편의 버튼을 누르세요."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "노드 상태"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "초기적재"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "새로운 노드"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "포트:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+#, fuzzy
+msgid "Bootstrap from known clients"
 msgstr ""
 "알려진 클라이언트로부터 \n"
 "초기적재"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Kad 끊김"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "프로토콜 난독화"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "프로토콜 난독화 지원"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5819,11 +3969,11 @@
 "이 선택은 프로토콜 난독화를 활성화하며, 어뮬이 다른 클라이언트로부터 난독화"
 "된 연결을 받아들이도록 합니다. "
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "나가는 연결에 난독화 사용"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5831,11 +3981,11 @@
 "이 선택은 어뮬이 다른 서버나 클라이언트에 연결할때 프로토콜 난독화를 사용하"
 "게 합니다."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "난독화된 연결만 받음"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5843,81 +3993,77 @@
 "이 선택은 어뮬이 난독화된 연결만 받아들이도록 합니다. 더 작은 자료를 가지지"
 "만 자료교환은 난독화됩니다."
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "파일 설정"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "모두"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "공유 파일을 볼 수 있는 사람:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "공유 파일 목록 보기를 요청할 수 있는 사람을 선택하세요."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP 차단"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "클라이언트 차단"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "~/.aMule/ipfilter.dat에 기록된 클라이언트 IP의 차단을 활성화합니다."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "서버 차단"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "~/.aMule/ipfilter.dat에 기록된 서버 IP의 차단을 활성화합니다."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "목록 다시읽기"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "~/.aMule/ipfilter.dat 파일에서 차단할 IP의 목록을 다시 읽음"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "지금 갱신"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "시작시 IP차단을 자동 갱신"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "차단 수준:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "랜 IP를 항상 차단"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -5925,31 +4071,21 @@
 "클라이언트 IP가 패킷이 수신된 IP와 다르면 패킷을 거부합니다. 조심해서 사용하"
 "세요."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "온라인서명을 활성화"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -5957,1180 +4093,3624 @@
 "서명을 생성할 수 있는 외부 응용프로그램에 의해 사용될 수 있는 운영체제 파일"
 "의 기록을 활성화합니다."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "갱신 주기(초)"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "온라인 서명 갱신 주기(초)를 바꿉니다."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "온라인 서명 폴더:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr "온라인서명 파일을 포함하는 폴더를 선택하려면 클릭하세요."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "비활성화/활성화"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "받는 메시지 차단(현재 채팅은 제외)"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "차단 설정:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "모든 메시지를 차단"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "친구 목록에 없는 사람으로부터 메시지를 차단"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "알 수 없는 클라이언트로부터 메시지를 차단"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "다음 내용이 포함된 메시지를 차단 (쉼표로 분리):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr "이곳에 어뮬이 차단하고 막을 메시지에 포함될 단어를 추가하세요."
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "의견들"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "프록시 없이 서버에 자동으로 연결"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "인증 활성화"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "사용자이름/암호 인증을 활성화/비활성화"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr ""
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "프록시에 접속하기 위한 사용자이름"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "암호:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "프록시에 접속하기 위한 암호"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "프록시 활성화"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "프록시지원을 활성화/비활성화"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "프록시 종류:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "연결하고 있는 프록시 타입"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "프록시 호스트:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "프록시 호스트 이름"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "프록시 포트:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "프록시 포트"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "인증"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "인증 활성화"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "사용자이름/암호 인증을 활성화/비활성화"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "프록시에 접속하기 위한 사용자이름"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "암호:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "프록시에 접속하기 위한 암호"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "프록시 없이 서버에 자동으로 연결"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "연결함:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "원격 어뮬에 로그인"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "사용자이름"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "설정을 기억"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "상세한 디버그-로깅 활성화"
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "메시지 분류:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "대기중..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "가져오기 추가"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "선택된 것을 재시도"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "선택된 것을 삭제"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "사건 종류"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "활성화된 올려주기 :"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "공유된 파일을 숨김"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "보기 필터 선택"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "활성화된 올려주기"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "클라이언트 보기"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "목록 다시읽기"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "공유된 파일을 다시 읽어들임"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "보내기"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "지정된 메시지를 보냅니다."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "이 채팅세션을 닫습니다."
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "서버 혹은 Kad에 연결"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "통신망 창"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "공유 파일"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "검색 창"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "비활성화 [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "파일 전송 창"
+#: src/OtherFunctions.cpp:106
+#, fuzzy
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "bytes"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "공유 파일 창"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "메시지 창"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "통계 그래프 창"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "환경 설정 창"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "새로운 분류"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "저장할 폴더를 선택"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "분류 이름을 정하세요."
+#: src/OtherFunctions.cpp:137
+#, fuzzy
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "bytes/s"
+msgstr[1] "bytes/s"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "분류 경로를 정하세요"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr "분류를 저장할 폴더를 생성하지 못했습니다. 유효한 경로를 지정하세요."
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "초"
 
-#: src/ExternalConnector.cpp:141
-#, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "알수없는 확장 '%s' ('%s'명령에 대해)\n"
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "분"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "시"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "일"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "전부"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "다른 모두"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "내려받음"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "멈춤"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "비디오"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "압축"
 
-#: src/ExternalConnector.cpp:143
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "문자"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "활성화"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "알수없는 명령 '%s' \n"
+msgid "Using config dir: %s"
+msgstr ""
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
 msgstr ""
-"\n"
-"이 명령은 인수를 가질 수 없습니다.\n"
 
-#: src/ExternalConnector.cpp:157
+#: src/PartFileConvert.cpp:200
+#, c-format
+msgid "Importing %s: %s"
+msgstr "가져오는중 %s: %s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "임시 폴더를 읽는중"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "내려받은 정보 파일로부터 기본적인 정보를 재생"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "대상 파일을 생성"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "오래된 내려받은 파일로부터 데이터를 읽어들임 (%u (%u의))"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "데이터 블럭을 새 내려받은 파일로 저장 (%u (%u의))"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "내려받은 파일 정보 자료를 재생"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "내려받기에 추가하고 새 부분파일을 저장"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "부분파일 가져오기"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "상태"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "파일 해시"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s(디스크: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"이 명령은 반드시 인수가 있어야 합니다.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
+msgstr "임시 내려받기를 위해 검색할 폴더를 선택하세요! (하위 폴더 포함)"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "성공적으로 가져온 내려받기 파일을 삭제하겠습니까?"
+
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "자료를 삭제하겠습니까?"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "오류: 부분파일을 생성하지 못했습니다.)"
+
+#: src/PartFile.cpp:336
+#, c-format
+msgid "Trying to load backup of met-file from %s"
+msgstr "%s로부터 met파일의 백업을 읽을려고 합니다."
+
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
-"\n"
-"이 명령은 불완전합니다. 반드시 아래의 확장중 하나를 사용해야 합니다.\n"
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
 msgstr ""
-"\n"
-"가능한 확장:\n"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "가능한 명령:\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr ""
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:595
 #, fuzzy, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"\n"
-"모든 명령은 대소문자를 구분하지 않습니다.\n"
-"<명령어>에 대한 자세한 정보를 얻으려면 'help <명령어>'를 입력하세요.\n"
+"오류: %s(%s)은 손상되었습니다. (잘못된 꼬리계수), 파일을 읽을수 없습니다."
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "응용프로그램에서 나감."
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+msgstr ""
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "도움말을 보여줍니다."
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "파일 정보를 복구하려고 하고있습니다..."
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
-msgstr ""
-"명령어에 대한 도움말은, 'help <명령어>'를 입력하세요.\n"
-"모든 명령어 목록을 보려면, 'help'를 입력하세요.\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "이름없는 파일을 복구합니다. - RecoveredFile.dat로 복구합니다."
+
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "모든 가능한 파일정보를 복구되었습니다. :D - 사용해 보세요..."
+
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "파일정보 복구가 불가능합니다. :("
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:665
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "Failed to open %s (%s)"
+msgstr "%s(%s)을 열지 못했습니다."
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
-"\n"
-"명령 목록을 위해 %s를 사용합니다.\n"
-"\n"
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "문법 오류!"
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "부분파일을 저장하는 동안에 오류: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr "명령 처리에 오류 발생 - 일어나면 안 됩니다! 버그 리포트를 하세요\n"
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "부분파일을 저장하는 동안에 오류: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "이 명령은 어떤 변수도 필요하지 않습니다."
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr ""
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "이 명령은 반드시 변수가 있어야 합니다."
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s'은 어찌된일인지 크기가 0입니다. - %s 파일을 사용합니다."
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "유효하지 않은 인수입니다."
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "%s에 대한 part.met.seeds 파일을 저장하지 못했습니다."
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "불완전한 명령입니다."
+#: src/PartFile.cpp:1020
+#, fuzzy, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "부분파일을 위해 %i 자료핵심을 저장되었습니다: %s(%s)"
+msgstr[1] "부분파일을 위해 %i 자료핵심을 저장되었습니다: %s(%s)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:1049
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "더 많은 도움말을 위해서는 '%s'를 입력하세요.\n"
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "부분파일 %s(%s)은 핵심파일을 가지고 있지 않습니다."
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:1058
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "이것은 %s %s %s\n"
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "부분파일 %s(%s)은 빈 핵심파일을 가지고 있습니다."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:1114
 #, c-format
-msgid "This is %s %s\n"
-msgstr "이것은 %s %s\n"
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "부분파일의 핵심파일(%s - %s)을 읽는중 오류: %s"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"손상된 부분(%d)이 발견되었습니다. (%d부분 파일 %s에 있는) - 파일해시결과 |%"
+"s| 파일해시 |%s|"
+msgstr[1] ""
+"손상된 부분(%d)이 발견되었습니다. (%d부분 파일 %s에 있는) - 파일해시결과 |%"
+"s| 파일해시 |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "완료된 부분(%i)이 발견되었습니다.  (%s에 있는)"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "%s의 재해시가 완료되었습니다."
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
-"\n"
-"클라이언트 생성중...\n"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "내려받기 완료: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "파일 삭제: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr ""
+
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"좋아, 나가는중 %s...\n"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"빈 암호로 연결할수 없습니다.\n"
-"설정 파일에 암호를 정하거나 \n"
-"또는 명령줄이나 요청시에 입력해야 합니다.\n"
-"\n"
-"종료중...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "이 도움말을 보여줍니다."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "경고: 충분한 디스크공간이 없습니다! 파일 정지: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "어뮬이 실행중인 호스트. (기본: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "%i 부분 내려받기는 파일이 손상되었습니다: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "외부연결을 위한 어뮬 포트. (기본: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: 손상된 부분 %i를 복구했습니다. (%s의) -> 저장된 바이트: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "외부연결 암호"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr ""
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "파일로부터 환경설정을 읽습니다."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr ""
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "표준출력으로는 어떤 출력도 하지 않습니다."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr ""
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "상세하게 - 디버그 메시지도 보여줍니다."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr ""
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "프로그램 지역정보 (로케일, 언어)를 설정합니다."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "기본 설정"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "명령줄 설정을 환경설정 파일에 기록합니다."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr ""
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "어뮬의 설정 파일에 기초하여 설정 파일을 생성합니다."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "아랍어"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "프로그램 버전을 출력합니다."
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "에스토니아어"
 
-#: src/ClientCreditsList.cpp:168
-#, fuzzy, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "신용 파일을 읽었습니다. %u 클라이언트가 인식되었습니다."
-msgstr[1] "신용 파일을 읽었습니다. %u 클라이언트가 인식되었습니다."
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "바스크어"
 
-#: src/ClientCreditsList.cpp:171
-#, fuzzy, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] "%u 클라이언트에 대한 신용이 만료되었습니다."
-msgstr[1] "%u 클라이언트에 대한 신용이 만료되었습니다."
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "불가리아어"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "'cryptkey.dat' 파일을 찾을 수 없습니다. 생성합니다."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "카탈로니아어"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "중국어(간체)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "중국어(번체)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "크로티아어"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
 msgstr ""
-"오류: 외부연결이 비활성화일때 어뮬 데몬은 사용할 수 없습니다. 외부연결을 활성"
-"화하기 위해서는 --ec-config를 사용하여 시작하거나 ~/.aMule/amule.conf 파일내"
-"에 \"AcceptExternalConnections\" 키를 1로 설정하여야 합니다."
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "오류: %s"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "덴마크어"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "폐기"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "올려주기 보기"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "대기열 보기"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "네델란드어"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "클라이언트 보기"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "영어(영국)"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "보기 선택"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "클라이언트 소프트웨어"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "대기됨"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "올려주기 시간"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "올려주기/내려받기"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "원격 상태"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "파일 우선권"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "에스토니아어"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "점수"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "필란드어"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "요청됨"
-
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "마지막으로 보임"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "입력된 대기열"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "프랑스어"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "올려주기 상태"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "갈리시아어"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "위로 이양하기"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "독일어"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "내려받기 상태"
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "아래로 이양하기"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "사용자 해시"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "암호화됨"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "공유된 파일을 숨김"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "헝가리어"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "클라이언트 세부내역"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "이탈리아어"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "이탈리아어(스위스)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "한국어"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "폴란드어"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "포르투갈어"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "포르투갈어(브라질)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "러시아어"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "슬로베니아어"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "스페인어"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr ""
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "터키어"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr ""
+
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "언어"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
+
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "유효하지 않음"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
+"서버 UDP 소켓이 TCP+3이 되기위해서 TCP 포트가 65532보다 커서는 안됩니다."
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "Default port will be used (%d)"
+msgstr "기본 포트가 사용될 것입니다.(%d)"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "완료되지 않음"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "나쁜 사람"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "연결"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "인증됨"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "폴더"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "불가능"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "서버"
 
-#: src/ClientDetailDialog.cpp:215
-#, fuzzy, c-format
-msgid "%u (QR: %u)"
-msgstr "QR: %u"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "파일"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr "최소 크기가 최대 크기보다 작아야 합니다. 최대 크기는 무시됩니다.."
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "보안"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "검색 경고"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "무제한"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "프록시"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "어뮬 트레이 메뉴"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "원격 조정"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "온라인 서명"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "올려주기: 없음"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "사건들"
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "올려주기: %u"
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "디버깅"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "내려받기: 없음"
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "내려받기: %u"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"당신이 무엇을 하는지 알때까지 이 설정들을 바꾸지 마세요.\n"
+"당신 스스로 문제를 만들기 쉽습니다.\n"
+"\n"
+"\n"
+"이 설정들을 조정하지 않아도\n"
+"어뮬은 잘 동작할 것입니다."
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "Download speed: %.1f"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "Upload speed: %.1f"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "클라이언트 정보"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "연결하고 있는 프록시 타입"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:534
 #, c-format
-msgid "Nickname: %s"
-msgstr "별명: %s"
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "별명이 선택되지 않음!"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"변경사항을 활성화 하기위해 어뮬을 재시작해야 합니다:\n"
+"\n"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "클라이언트 아이디: "
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP 포트가 변경되었습니다.\n"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "서버 이름: "
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP 포트가 변경되었습니다.\n"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "서버 IP: "
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "외부연결 끊겼습니다."
+
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "새로운 외부연결이 승인되었습니다."
+
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "외부연결 끊겼습니다."
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"외부연결이 횔성화되어 있지만, 암호를 설정하지 않았습니다.\n"
+"외부연결은 유효한 암호가 설정되기전까지 활성화되지 않습니다."
+
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- 언어가 변경되었습니다.\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- 임시 폴더가 변경되었습니다.\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+#, fuzzy
+msgid "- ED2K network enabled.\n"
+msgstr "모든 통신망을 사용할수 없습니다."
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"UDP 포트가 비활성화되어 있으면 Kad는 시작하지 않을 것입니다.\n"
+"UDP 포트를 활성화시키거나 Kad를 비활성화시키십시오."
+
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"지금 바로 어뮬을 재시작해야 합니다.\n"
+"만일 재시작하지 않는다면, 나쁜 일이 일어나도 불평하지 마십시오.\n"
+
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"자동갱신 서버 목록이 비어있습니다.\n"
+"적어도 한개의 유효한 server.met파일을 가르키는 URL을 적으세요.\n"
+"URL을 입력하려면 채크박스 옆의 \"목록\"버튼을 클릭하세요."
+
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "임시 파일"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "내려받은 파일"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "온라인 서명"
 
-#: src/MuleTrayIcon.cpp:416
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+msgid "Choose a folder for %s"
+msgstr "%s하기 위한 폴더를 선택하세요."
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "비디오재생을 위한 브라우즈"
+
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "브라우저 선택"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "TCP port: %d"
+msgid "Executable%s"
+msgstr "실행할수 있는 %s"
+
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
 msgstr ""
+"server.met파일을 내려받을 URL을 추가하세요.\n"
+"각 행에 오직 하나의 URL을 넣으세요."
+
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, fuzzy, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "갱신 지연: %d 초"
+msgstr[1] "갱신 지연: %d 초"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/PrefsUnifiedDlg.cpp:1121
+#, fuzzy, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "평균 그래프 시간: %d 분"
+msgstr[1] "평균 그래프 시간: %d 분"
+
+#: src/PrefsUnifiedDlg.cpp:1127
 #, c-format
-msgid "UDP port: %d"
+msgid "Connections Graph Scale: %d"
+msgstr "연결 그래프 크기: %d"
+
+#: src/PrefsUnifiedDlg.cpp:1139
+#, fuzzy, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "파일 버퍼 크기: %d 바이트"
+msgstr[1] "파일 버퍼 크기: %d 바이트"
+
+#: src/PrefsUnifiedDlg.cpp:1145
+#, fuzzy, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "올려주기 대기열 크기: %d 클라이언트"
+msgstr[1] "올려주기 대기열 크기: %d 클라이언트"
+
+#: src/PrefsUnifiedDlg.cpp:1152
+#, fuzzy, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "서버 연결 갱신 주기: %d 분"
+msgstr[1] "서버 연결 갱신 주기: %d 분"
+
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "서버 연결 갱신 주기: 비활성화"
+
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "비활성화"
+
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "`%s' 사건에 명령을 실행"
+
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "코어에 명령 실행 활성화"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "코어 명령어:"
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "GUI에 명령 실행 활성화"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "GUI 명령어:"
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "다음 변수들은 교체됩니다.:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr "최소 크기가 최대 크기보다 작아야 합니다. 최대 크기는 무시됩니다.."
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "검색 경고"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "주"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad를 실행 중이 아니면 Kad 검색을 할 수 없습니다."
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Kad 검색 시도 중에 예기치 못한 에러: "
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "파일아이디"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "파일"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "분류내 내려받기"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "이 파일의 추가주소를 더합니다."
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "온라인 서명: 활성화"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "온라인 서명: 비활성화"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "취소"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr "난독화된 서버들로의 연결이 모두 실패했습니다. 난독화없이 진행합니다."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "모든 서버 목록에 접속하지 못했습니다. 다른 서버를 만드세요."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
-msgstr "전체 내려받기: %s"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:483
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "전체 올려주기: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "%s (%s:%i)에 연결되었습니다."
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr ""
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "다음에 연결이 되었습니다: %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
+"연결하는 동안 치명적 오류가 발생하였습니다. 인터넷 연결이 끊긴것 같습니다."
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "어뮬 숨기기"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "%s(%s:%i)에 연결이 끊김."
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "어뮬 보이기"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s(%s:%i)가 죽은것 같습니다."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "채팅세션이 시작됨: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s(%s:%i)가 가득찬것 같습니다."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "***클라이언트에 연결되었습니다***"
+#: src/ServerConnect.cpp:392
+#, fuzzy, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "%d 초후에 서버로 자동 접속을 재시도"
+msgstr[1] "%d 초후에 서버로 자동 접속을 재시도"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "***클라이언트에 연결중입니다***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "연결 끊김"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "***클라이언트에 연결하지 못했습니다 / 연결이 끊어졌습니다***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "%s(%s:%i)에 연결하지 못했습니다."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "탭 닫기"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr ""
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "모든 탭 닫기"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "%s(%s:%i)에 접속을 시도하는데 시간이 지났습니다."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "다른 탭 닫기"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr ""
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "server.met 파일을 읽음: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "server.met 파일을 찾을 수 없습니다.!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "server.met 파일 '%s' 을 읽지 못했습니다. 알 수 없는 형식입니다."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "server.met 파일을 열지 못했습니다!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Server.met 파일이 손상됨, 유효하지 않는 버젼정보를 발견함: 0x%x, size %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, fuzzy, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "server.met에서 %i개의 서버가 발견됨"
 msgstr[1] "server.met에서 %i개의 서버가 발견됨"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, fuzzy, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d 서버가 추가됨"
 msgstr[1] "%d 서버가 추가됨"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "known.met 파일을 읽는동안 입출력 오류: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "서버 추가되지 않음: [%s:%d]은 유효한 포트가 정해지지 않았습니다."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "서버 추가되지 않음: [%s:%d]의 IP가 유효하지 않거나 차단되었습니다."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr "서버 추가되지 않음: IP:포트[%s:%d]와 같은 서버가 목록에 있습니다."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "서버 추가됨: [%s:%d]서버 '%s'이름을 사용"
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr "삭제하려고하는 서버에 접속되어있습니다. 부디 먼저 연결을 끊으세요."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "'%s'을(를) 열지 못했습니다."
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "server.met을 저장하지 못함!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "유효하지 않는 주소입니다."
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
-msgstr ""
-
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
 msgstr "%s로부터 서버 목록를 내려받지 못함"
 
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
 msgstr ""
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "adrresses.dat에 유효한 server.met 자동갱신 주소가 없습니다."
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "%s로부터 서버 목록를 내려받지 못함"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr "지역 서버가 IPFilter에 의해 차단되어, 다른 서버로 재연결 합니다."
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "`%s' 명령을 실행하는데 실패했습니다. (`%s' 사건에대해)"
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "서버 이름"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "주소"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "포트"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "설명"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "핑"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "사용자"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "정적"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "버젼"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"지역정보(로케일)가 설정 변경으로 인해 시스템 기본값으로 변경되었습니다. 죄송"
-"합니다."
+"삭제하려는 서버에 연결되어 있습니다. 먼저 연결을 끊으세요. 서버는 삭제되지 않"
+"습니다."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(알수없는 이름)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "정적 서버 %s를 삭제하시겠습니까?"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "서버 (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "서버"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "서버에 연결함"
+
+#: src/ServerListCtrl.cpp:407
+#, fuzzy
+msgid "Mark server as static"
+msgstr "정적인 서버를 만듦"
+
+#: src/ServerListCtrl.cpp:408
+#, fuzzy
+msgid "Mark server as non-static"
+msgstr "비정적인 서버를 만듦"
+
+#: src/ServerListCtrl.cpp:410
+#, fuzzy
+msgid "Mark servers as static"
+msgstr "정적인 서버를 만듦"
+
+#: src/ServerListCtrl.cpp:411
+#, fuzzy
+msgid "Mark servers as non-static"
+msgstr "비정적인 서버를 만듦"
+
+#: src/ServerListCtrl.cpp:417
+#, fuzzy
+msgid "Remove server"
+msgstr "서버를 삭제"
+
+#: src/ServerListCtrl.cpp:419
+#, fuzzy
+msgid "Remove servers"
+msgstr "서버를 삭제"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "모든 서버를 삭제"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
 msgstr ""
-"서버 목록에 서버가 없습니다.\n"
-"새로운 서버목록을 내려 받으시겠습니까?"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "서버 목록 내려받기"
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "서버에 재접속"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "모든 서버를 삭제하시겠습니까?"
+
+#: src/ServerListCtrl.cpp:541
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "선택된 서버를 삭제하시겠습니까?"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:543
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "선택된 서버를 삭제하시겠습니까?"
+
+#: src/ServerSocket.cpp:259
 #, c-format
-msgid "web server running on pid %d"
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/amule.cpp:937
+#: src/ServerSocket.cpp:413
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
+msgid "New clientid is %u"
+msgstr "새로운 클라이어트 아이디는 %u임"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr ""
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\t이러한 대부분의 이유는 방화벽이나 라우터때문입니다."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\t더 많은 정보는 http://wiki.amule.org을 참조하세요."
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "알수없는 서버 정보를 받았습니다! - 매우 짧음"
+
+#: src/ServerSocket.cpp:535
+#, fuzzy, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "새로운 서버 %d개를 받음"
+msgstr[1] "새로운 서버 %d개를 받음"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "서버목록 저장이 완료되었습니다."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "서버가 마지막 명령을 거부함"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "가짜 패킷을 서버로부터 받았습니다: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "서버로부터 패킷을 처리하는동안 조치할수 없는 오류가 생겼습니다: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "%s에 연결하기 위한 DNS 해석 쓰레드를 만들수 없음"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "서버 IP %s(%s)가 차단되었습니다. 연결할수 없습니다."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "프로토콜 난독화를 사용합니다."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "%s (%s - %s:%i) %s에 연결합니다."
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "%s 서버에 대한 DNS를 해석 할 수 없음: 연결할수 없습니다!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "서버 추가되지 않음: IP나 호스트이름이 지정되지 않았습니다."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "서버 추가되지 않음: 유효하지 않는 서버 포트가 지정되었습니다."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
 msgstr ""
 
-#: src/amule.cpp:964
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "아이디"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "카뎀리아 상태:"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "%s에 동작중"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "동작중"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "상태:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "연결 상태:"
+
+#: src/ServerWnd.cpp:214
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "포트 %u는 사용할 수 없습니다. 낮은아이디를 가질것입니다.\n"
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr ""
 
-#: src/amule.cpp:970
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "연결 상태:"
+
+#: src/ServerWnd.cpp:219
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
-"포트 %u는 사용할수 없습니다!\n"
-"\n"
-"이것은 낮은아이디를 가질것이라는걸 의미합니다.\n"
-"\n"
-"나가고 들어오는것에 대해 포트가 열려있는지 통신망을 체크하세요. "
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "온라인서명 파일을 생성하지 못함"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "방화벽 상태:"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "어뮬 온라인서명 파일을 생성하지 못함"
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "친구가 없음"
+
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "친구에게 접속함"
+
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "친구에게 접속함"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "자료 유지"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr ""
+
+#: src/ServerWnd.cpp:254
+#, fuzzy
+msgid "Indexed notes:"
+msgstr "인덱스 파일을 찾을 수 없음:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr ""
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "평균 사용자:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "평균 파일:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "동작되지 않음"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr ""
+
+#: src/SharedFileList.cpp:371
+#, fuzzy, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "알려진 공유 파일 %i개를 찾았음"
+msgstr[1] "알려진 공유 파일 %i개를 찾았음"
+
+#: src/SharedFileList.cpp:377
+#, fuzzy, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "알려진 공유 파일 %i개, 알수없는 %i개를 찾았음 "
+msgstr[1] "알려진 공유 파일 %i개, 알수없는 %i개를 찾았음 "
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr ""
+
+#: src/SharedFileList.cpp:410
+#, fuzzy, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "서버가 발견되지 않음: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "사용자이름"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "내려받기 속도"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "올려주기 속도"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "가능함 :"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "올려주기 상태"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "내려받기 상태"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "파일 이름"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "공유 파일"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "요청"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "허락된 요청"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "전송된 크기"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "공유 비율"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "획득한 부분"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "완료된 자료"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "폴더 경로"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "의견/등급 추가"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "의견/등급 편집"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "이름변경"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "컬렉션내의 파일을 전송목록에 추가"
 
-#: src/amule.cpp:1299
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "magnet URI를 클립보드로 복사(&U)"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "유효한 자료 링크를 만들기 위해서 높은아이디가 필요합니다."
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "공유된 파일(%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[부분 파일]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "파일 이름"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "올려준 데이터 (세션 (전체)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "전체 추가자원 (패킷): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "파일 요청 추가자원 (패킷): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "자료 교환 추가자원 (패킷): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "서버 추가자원 (패킷): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Kad 추가자원(패킷): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr ""
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "활성화된 올려주기: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "대기중인 올려주기: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "성공적인 전체 올려주기 세션 : %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "실패한 전체 올려주기 세션: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "평균 올려주기 시간: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "내려받은 데이터 (세션 (전체)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "발견된 자료: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "활성화된 내려받기 (큰 부분): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "세션 올려주기:내려받기 비율 (전체): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "재접속: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "첫 전송으로부터 시간: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "다음으로부터 서버에 연결됨: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "활성화된 연결 (평가): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "최대 연결 제한 접근함: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "평균 연결 (평가): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "최대 연결 (평가): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "클라이언트"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "알수없는 크기"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "차단됨"
+
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "퇴장됨"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "전체: %i 알려진: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "동작중인 서버: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "실패한 서버: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "전체: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "삭제된 서버: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "차단된 서버: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "동작중인 서버의 사용자: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "동작중인 서버의 파일: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "전체 사용자: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "전체 파일: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "서버 할당: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "공유된 파일의 수: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "공유파일의 전체 크기: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr ""
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "운영체제"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "받은게 없음"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "활성화된 연결 (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "유효하지 않음"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "결코"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "`%s' 명령(pid `%d')은 상태코드 `%d'로 종료되었습니다."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "<str>을 실행하고 종료합니다."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "유효하지 않은 IP 형식. xxx.xxx.xxx.xxx:xxxx를 사용하세요.\n"
+
+#: src/TextClient.cpp:323
+#, fuzzy
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
+msgstr "이 명령은 인수를 필요로합니다. 유효한 인수: 'all' 또는 숫자\n"
+
+#: src/TextClient.cpp:359
+#, fuzzy
+msgid "Processing by hash: "
+msgstr "파일숫자 %u 처리: %s"
+
+#: src/TextClient.cpp:373
+#, fuzzy
+msgid "Processing by filename: "
+msgstr "파일숫자 %u 처리: %s"
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
-"컴퓨터에 선택한 지역정보(로케일)가 설치 않된것 같습니다. (주의: 어쨌든 설정하"
-"겠습니다)"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "유효한 숫자가 아님\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "유효한 해시가 아님 (길이는 정확히 32자여야 함)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "알 수 없는 오류로 요청이 실패함."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "동작이 성공했습니다."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "이번에 어뮬 %s를 처음 실행했습니다."
+msgid "Request failed with the following error: %s"
+msgstr "다음과 같은 오류로 요청이 실패: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "이 버전은 테스트 버젼으로, 매일 업데이트되며, \n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "클라이언트에 대한 IP 차단 %s.\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "이 프로그램이 어느 것도 부수지 않는다고, 집을 태우지 않는다고, 혹은 \n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "끔"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "켬"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "서버에 대한 IP 차단 %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "현재 IP 차단 수준은 %d입니다.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
 msgstr ""
-"개를 죽이지 않는다고 보장하지 않습니다. 그렇지만 안전하게 사용할 수 있을 것입"
-"니다.\n"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr ""
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "%s %s %s에 연결됨"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "지금 연결중"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "방화벽됨"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "확인"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
-msgstr "다음 선택사항은 보안문제로 인해 이번 배포판에서 변경되었습니다:\n"
+"\n"
+"Download:\t%s"
+msgstr ""
+"\n"
+"내려받기:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* 들어오고 나가는 연결에 프로토콜 난독화가 지원됐습니다.\n"
+"올려주기:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* 다른 서버와 클라이언트로부터 서버목록의 갱신이 불가능합니다.\n"
+"대기열의 클라이언트:/t %d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"이 변경에 대한 더 많은 정보는 어뮬 위키(http://wiki.amule.org)의\n"
-"\"가짜서버(fake servers)\"에서 찾으십시요.\n"
-"어뮬이 잘 실행되기 위해서는 서버목록에서 가짜서버를 제거하는것이 중요합니다."
+"전체 자료:\t% d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "검색된 결과 갯수: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr ""
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "서버로부터 알수없는 반응을 수신했습니다. 실행코드 =  %#x"
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "간단한 상태 정보를 보여줍니다."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "연결 상태를 보여줌, 현재 올려주기/내려받기 속도, 기타.\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "전체 통계 구조도를 보여줍니다."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"부가적으로, 0-255 범위에 있는 숫자를 이 명령의 인수로 넘길 수 있으며,\n"
+"얼마나 많은 항목을 클라이언트 버젼 하위구조에 보여줄 것인지 결정합니다.\n"
+"0이나 생략은 '무제한'을 뜻합니다..\n"
+"예: 'statistics 5'는 각 클라이언트 종류의 상위 5가지 버전만 보여줍니다.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr ""
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+
+#: src/TextClient.cpp:859
+#, fuzzy
+msgid "Reload the given object."
+msgstr "주어진 대상을 다시 읽어들입니다."
+
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
+msgstr "공유된 파일 목록을 다시 읽어들입니다."
+
+#: src/TextClient.cpp:862
+#, fuzzy
+msgid "Reload IP filtering table."
+msgstr "파일로부터 IP 차단 테이블을 다시 읽어들입니다."
+
+#: src/TextClient.cpp:863
+#, fuzzy
+msgid "Reload current IP filtering table."
+msgstr "IP 차단 수준을 선택합니다."
+
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "파일로부터 IP 차단 테이블을 다시 읽어들입니다."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr ""
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "통신망에 연결합니다."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"설정되어 있는 가능한 모든 통신망에 연결할 것입니다.\n"
+"또한, 부가적으로 연결할 서버를 IP:포트 형식으로 지정할수 있습니다.\n"
+"IP는 점과 십진수의 IPv4 주소이거나, 해석 할 수 있는 DNS이름 이어야 합니다.\n"
+" "
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr ""
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Kad에만 연결합니다."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "통신망으로부터 연결을 끊습니다."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "현재 연결되어있는 모든 통신망으로부터 연결을 끊습니다.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr ""
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Kad에서만 연결을 끊습니다."
+
+#: src/TextClient.cpp:877
+#, fuzzy
+msgid "Add an eD2k or magnet link to core."
+msgstr "ed2k 또는 magnet 링크를 코어에 추가합니다."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "설정값을 정합니다."
+
+#: src/TextClient.cpp:883
+#, fuzzy
+msgid "Set IP filtering preferences."
+msgstr "IP 차단 설정을 합니다."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "클라이언트와 서버에 IP 차단을 사용합니다."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "클라이언트와 서버에 IP 차단을 사용하지 않습니다."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "클라이언트에 IP 차단을 활성/비활성화 합니다."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "클라이언트에 IP 차단을 사용합니다."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "클라이언트에 IP 차단을 사용하지 않습니다."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "서버에 IP 차단을 활성화/비활성화 합니다."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "서버에 IP 차단을 사용합니다."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "서버에 IP 차단을 사용하지 않습니다."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "IP 차단 수준을 선택합니다."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"더 많은 정보, 지원, 새 릴리즈는 홈페이지 www.amule.org, 또는 IRC 채널\n"
+"유효한 차단 수준은 0-255범위여야 하고, 기본(초기)값은\n"
+"127입니다.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "(irc.freenode.net의 #aMule)에서 찾을 수 있습니다.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "대역폭 제한 설정합니다."
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "버그는 http://forum.amule.org로 보고해 주십시오."
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "이 명령에 주어지는 값은 킬로바이트/초 이어야 합니다..\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "올려주기 대역폭 제한 설정합니다."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "내려받기 대역폭 제한 설정합니다."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "설정값 가져와 보여줍니다."
+
+#: src/TextClient.cpp:905
+#, fuzzy
+msgid "Get IP filtering preferences."
+msgstr "IP 차단 설정을 가져옵니다."
+
+#: src/TextClient.cpp:906
+#, fuzzy
+msgid "Get IP filtering state for both clients and servers."
+msgstr "서버와 클라이언트에서 IP 차단 상태를 가져옵니다."
+
+#: src/TextClient.cpp:907
+#, fuzzy
+msgid "Get IP filtering state for clients only."
+msgstr "클라이언트에서만 IP 차단 상태를 가져옵니다."
+
+#: src/TextClient.cpp:908
+#, fuzzy
+msgid "Get IP filtering state for servers only."
+msgstr "서버에서만 IP 차단 상태를 가져옵니다."
+
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "IP 차단 수준을 선택합니다."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "대역폭 제한 가져옵니다."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:913
+#, fuzzy
+msgid "Execute a search."
+msgstr "Kad 검색을 수행합니다."
+
+#: src/TextClient.cpp:914
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"지정한 온라인 서명 파일을 위한 폴더가 유효하지 않습니다.\n"
-" 온라인 서명은 환경설정에서 수정될 때까지 비활성화 됩니다."
+"검색의 종류는 다음중에서 정의되어야 합니다:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"예: 'search kad file'은 \"file\"에대해 kad 검색을 실행합니다.\n"
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
+#: src/TextClient.cpp:915
+#, fuzzy
+msgid "Execute a global search."
+msgstr "광역 검색을 수행합니다."
+
+#: src/TextClient.cpp:916
+#, fuzzy
+msgid "Execute a local search"
+msgstr "지역 검색을 수행합니다."
+
+#: src/TextClient.cpp:917
+#, fuzzy
+msgid "Execute a kad search"
+msgstr "Kad 검색을 수행합니다."
+
+#: src/TextClient.cpp:919
+#, fuzzy
+msgid "Show the results of the last search."
+msgstr "마지막 검색의 결과를 보여줍니다."
+
+#: src/TextClient.cpp:920
+#, fuzzy
+msgid "Return the results of the previous search.\n"
+msgstr "이전 검색의 결과로 돌아갑니다.\n"
+
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "검색의 진행을 보여줍니다."
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "검색의 결과를 보여줍니다..\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "파일의 내려받기를 시작"
+
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
+"마지막 검색으로부터 파일의 번호가 부여됩니다.\n"
+"예: 'download 12' 는 이전 검색에서 12번 번호를 가진 파일의 내려받기를 시작합"
+"니다.\n"
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "오류: 로그파일을 열 수 없음"
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "내려받기를 정지합니다."
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "경고: 로그파일이 비어있습니다. 뭔가 잘못되어 있습니다."
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "내려받기를 재시작합니다."
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "로그가 초기화되었습니다."
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "내려받기를 취소합니다."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "내려받기의 우선순위를 설정합니다."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "내려받기의 우선순위를 낮음, 보통, 높음 또는 자동으로 설정합니다.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "우선순위를 낮음으로 설정합니다."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "우선순위를 보통으로 설정합니다."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "우선순위를 높음으로 설정합니다."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "우선순위를 자동으로 설정합니다."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "대기열/목록 보여줍니다."
+
+#: src/TextClient.cpp:950
+#, fuzzy
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr "올려주기/내려받기 대기열, 서버 목록이나 공유된 파일 목록 보여줍니다.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "올려주기 대기열을 보여줍니다."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "내려받기 대기열을 보여줍니다."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "로그를 보여줍니다."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "서버 목록 보여줍니다."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "로그를 초기화합니다."
 
-#: src/amule.cpp:1826
+#: src/TextClient.cpp:964
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "서버메시지: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr ""
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "노드 목록을 내려받지 못했습니다."
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "내려받은 버젼 검사 파일을 열지 못했습니다."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr ""
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "손상된 버젼 검사 파일"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "'%s'의 낡은 AICH 해시셋을 64b로 '%s'에 변환합니다."
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "오래된 어뮬 버젼을 사용하고 있습니다!"
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "경고: 파일 이름 '%s'는 유효하지 않으며 '%s'로 변경되었습니다."
 
-#: src/amule.cpp:1907
+#: src/ThreadTasks.cpp:454
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "어뮬 버젼은 %i.%i.%i이며 최신 버젼은 %li.%li.%li입니다."
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "경고: 파일 이름 '%s'는 이미 존재하며, 새 파일은 '%s'로 변경되었습니다."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "최신 버젼은 항상 http://www.amule.org 에서 찾을 수 있습니다."
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr "이 분류에 있는 모든 파일을 취소하고 삭제하시겠습니까?"
+
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "확인이 요청됨"
+
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
 
-#: src/amule.cpp:1911
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "매우 많은연결"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "다른 전부"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "보기 필터 선택"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "분류 추가"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "분류 수정"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "분류 삭제"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "경고: 어뮬 버젼은 오래되었습니다: %i.%i.%i < %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "파일 (%s)을 열수없어 공유 파일 목록으로부터 제거합니다."
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "어뮬은 최신 버전입니다."
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "알수 없는 파일의 해시설정이 요청되었습니다: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "버젼 검사 파일을 내려받지 못했습니다."
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
+msgstr "파일의 올려주기를 재시작합니다: %s"
 
-#: src/amule.cpp:2025
+#: src/UploadQueue.cpp:613
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr ""
+msgid "Suspending upload of file: %s"
+msgstr "파일의 올려주기를 정지합니다: %s"
 
-#: src/amule.cpp:2026
+#: src/UserEvents.cpp:138
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "`%s' 명령을 실행하는데 실패했습니다. (`%s' 사건에대해)"
+
+#: src/UserEvents.h:60
+msgid "Download completed"
 msgstr ""
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr ""
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr ""
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/amule.cpp:2102
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr ""
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr ""
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr ""
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr ""
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr ""
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr ""
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Connected to %s %s"
-msgstr "%s %s에 연결되었음"
+msgid "Processing file number %u: %s"
+msgstr "파일숫자 %u 처리: %s"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "부분 해시를 요청했습니다. (오직 파일크기가 9.5 MB 보다 클때 사용)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Connecting to %s"
-msgstr "%s에 연결중"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> 존재하는 파일이 없음!\n"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
 msgstr ""
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad를 시작했습니다."
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "환영합니다!"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad를 멈췄습니다."
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "설정값 입력"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Kad에 연결됨 (양호)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "파일을 해시"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Kad에 연결됨 (방화벽)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "이 파일의 추가주소를 더합니다."
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Kad로부터 연결이 끊김"
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr ""
 
-#: src/amule.cpp:2191
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
-"Kad 네트워크는 UDP 포트가 비활성될 시 사용할 수 없으며, 따라서 시작하지 않습"
-"니다."
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kad 네트워크가 환경설정에서 비활성되어, 연결하지 않습니다."
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "삭제"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "부분해시의 링크를 생성합니다."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
 msgstr ""
+"링크의 크기를 증가시키는 대신 새 파일 및 희귀한 파일을 빠르게 퍼지는 데에 도"
+"움을 줍니다."
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "md4 파일 해시"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "저장"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "클립보드로 복사"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
 msgstr ""
 
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "aLinkCreator에 대하여"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "지금 복사할것은 아무것도 없습니다!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "열수 없음"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "제발, 파일이름을 비우지 마세요."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "지금 저장한것은 없습니다!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "해시중..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+#, fuzzy
+msgid "Cancelled !"
+msgstr "취소됨!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
+#, c-format
+msgid "Done in %.2f s"
+msgstr "%.2f 초만에 완료"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "이미 이 주소가 추가되어 있습니다!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "주소를 비우지 마세요."
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#, c-format
+msgid "Unable to open %s"
+msgstr "%s를 열수없음."
+
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i 일 %i 시간 %i 분 %i 초"
+
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02u일 %02u시 %02u분 %02u초"
+
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02u시 %02u분 %02u초"
+
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02u분 %02u초"
+
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02u초"
+
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, 어뮬 온라인 통계"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "wxCas 현재 실행시 최대 내려받기 속도"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "wxCas 이전 실행시부터 절대적 최대 내려받기 속도"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "시스템"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "자동갱신 멈춤"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "온라인 정적그림을 저장"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "온라인 정적그림을 프린트"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "환경 설정"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "wxCas에 대하여"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "자동갱신을 시작"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "자동갱신을 멈춤"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "자동갱신이 시작됨"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "통계 이미지를 저장"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "어뮬 온라인 통계"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
+msgstr ""
+"프린트하는데 문제가 있습니다.\n"
+"혹시 현재 프린터가 올바로 설정되지 않았나요?"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "프린트함"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, 어뮬 온라인 서명 통계\n"
+"\n"
+"(c) 2004 더폴리시 <theplosh@vipmail.ru>\n"
+"\n"
+"페드로 드 올리베이라 <falso@rdk.homeip.net>의 CAS에 기본을 두고있습니다.\n"
+"\n"
+"GPL로 배포합니다."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "어어, 어뮬이 실행중이 아닙니다..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "어뮬은 실행중입니다."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "어뮬은 실행중이나 연결이 끊겨 있습니다."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "어뮬은 연결중..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "어어, 어뮬의 상태는 알수없음..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "어뮬 "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " 위해 실행되고있는 "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " 은 멈추어져 있습니다."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " 은 연결되지 않았습니다."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " 은 연결중..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " 무엇인가 이상하게 동작하고 있음, 확인 요망!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " 는 다음으로 연결중: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "끔"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr "켜졌습니다."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#, fuzzy
+msgid " with "
+msgstr "] with "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "전체 내려받기: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", 올려주기: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "내려받기 세션: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "내려받기: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr "올려주기, kB/s: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+#, fuzzy
+msgid " kB/s"
+msgstr "kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "공유함: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr "대기열에있는 파일, 클라이언트: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "시간:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr "켬"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "시스템 부하 평균 (1-5-15 분): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "시스템 연속 작동 시간: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "amulesig.dat 파일을 포함한 폴더"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "amulesig.dat 파일이 있는 폴더를 이곳에 입력하세요."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "갱신율 초당 간격"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "매회 갱신할 때 통계 이미지를 생성합니다."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "통계 이미지를 생성하는것을 원하는 장소 폴더를 이곳에 입력하세요."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "FTP 서버의 통계 이미지를 정기적으로 올려줍니다."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP Url"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP 경로"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "FTP 서버의 URL을 이곳에 입력하세요."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "FTP 서버에 통계 이미지가 위치할 폴더를 이곳에 입력하세요."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "사용자"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "FTP 서버로 로그인하기 위한 사용자이름을 이곳에 입력하세요."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "FTP 서버로 로그인하기 위한 암호를 이곳에 입력하세요."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "FTP 갱신율 분당 간격"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "유효합니다"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "서명 파일이 있는 폴더"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "통계 이미지를 생성하는곳의 폴더"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "템플릿<str>을 읽음"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP 포트"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "gzip 압축 사용"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "손님 접근 허가"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "손님 접근 금지"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "어뮬 설정 파일 경로. DO NOT USE DIRECTLY!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "PHP 해석자를 (권장되지 않는) 사용않함"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "각 요청의 PHP 페이지를 재컴파일함"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "어뮬 웹 서버"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "다음과 같은 오류로 요청 실패함: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "인덱스 파일을 찾을 수 없음:"
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "세션이 만료됨 - 로그인 요청중\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "세션 확인, 로그인 됨\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "세션 확인, 로그인 안됨\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "열린 세션 없음 - 로그인을 요청할 것임\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "세션이 생성됨 - 로그인 요청중\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "요청 처리중 [원본]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "암호를 검사중\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "암호 해시가 유효하지 않음\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "암호 맞음\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "암호 틀림\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "암호를 입력하지 않았습니다. 빈암호는 사용할수 없습니다.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "로그아웃이 요청됨\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "요청 처리중[redirected]: "
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "크로티아어"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "내려받기 상태"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#, fuzzy
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "갱신 지연: %d 초"
+#~ msgstr[1] "갱신 지연: %d 초"
+
+#~ msgid "Transferring"
+#~ msgstr "전송중"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "QR: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "대기열에 있음"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - 검색의 진행을 보여줌"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "다음 파일에 대해 MD4 및 AICH 해시를 만듭니다: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "다음 파일에 대해 MD4 해시를 만듭니다: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "다음 파일에 대해 AICH 해시를 만듭니다: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr "경고: 백업을 생성한 후 원본 '%s'를 제거할수 없습니다."
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "경고: %s를 삭제하지 못했습니다."
+
+#, fuzzy
+#~ msgid "%u (QR: %u)"
+#~ msgstr "QR: %u"
+
+#~ msgid "Rating (total):"
+#~ msgstr "평가 (전체)"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "모든 올려주기에 전체부분 전송을 시도"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "받는중"
+
+#~ msgid "Transfers"
+#~ msgstr "전송"
+
+#~ msgid "Unban"
+#~ msgstr "폐기"
+
+#~ msgid "Show Uploads"
+#~ msgstr "올려주기 보기"
+
+#~ msgid "Show Queue"
+#~ msgstr "대기열 보기"
+
+#~ msgid "Select View"
+#~ msgstr "보기 선택"
+
+#~ msgid "Client Software"
+#~ msgstr "클라이언트 소프트웨어"
+
+#~ msgid "Waited"
+#~ msgstr "대기됨"
+
+#~ msgid "Upload Time"
+#~ msgstr "올려주기 시간"
+
+#~ msgid "Upload/Download"
+#~ msgstr "올려주기/내려받기"
+
+#~ msgid "Remote Status"
+#~ msgstr "원격 상태"
+
+#~ msgid "File Priority"
+#~ msgstr "파일 우선권"
+
+#~ msgid "Score"
+#~ msgstr "점수"
+
+#~ msgid "Asked"
+#~ msgstr "요청됨"
+
+#~ msgid "Last Seen"
+#~ msgstr "마지막으로 보임"
+
+#~ msgid "Entered Queue"
+#~ msgstr "입력된 대기열"
+
+#~ msgid "Transferred Up"
+#~ msgstr "위로 이양하기"
+
+#~ msgid "Transferred Down"
+#~ msgstr "아래로 이양하기"
+
+#~ msgid "Userhash"
+#~ msgstr "사용자 해시"
+
+#~ msgid "Encrypted"
+#~ msgstr "암호화됨"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "올려주기 / 올려주기 대기열 보이기"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "대기열속의 클라이언트 :"
+
+#~ msgid "Current Session"
+#~ msgstr "현재 세션"
+
+#~ msgid "Total"
+#~ msgstr "전체"
+
+#~ msgid "Requested :"
+#~ msgstr "요청됨 :"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "파일 전송 창"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "전체 사용자: %s | 전체 파일: %s"
+
+#, fuzzy
+#~ msgid "HTTP download thread started"
+#~ msgstr "동기화 스레드가 시작되었습니다."
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "내려받기 (%i)"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "경고: 백업을 생성한 후 원본 '%s'를 제거할수 없습니다."
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country(): 국가 정보를 읽을 수 없습니다."
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "IP 차단 수준을 가져옵니다."
+
+#~ msgid "Makes a search."
+#~ msgstr "검색을 합니다."
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "실패"
+
+#, fuzzy
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "시작시 어뮬웹 구동"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "어뮬 종료."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr "다음 선택사항은 보안문제로 인해 이번 배포판에서 변경되었습니다:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* 들어오고 나가는 연결에 프로토콜 난독화가 지원됐습니다.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* 다른 서버와 클라이언트로부터 서버목록의 갱신이 불가능합니다.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "이 변경에 대한 더 많은 정보는 어뮬 위키(http://wiki.amule.org)의\n"
+#~ "\"가짜서버(fake servers)\"에서 찾으십시요.\n"
+#~ "어뮬이 잘 실행되기 위해서는 서버목록에서 가짜서버를 제거하는것이 중요합니"
+#~ "다."
+
 #~ msgid "Fetching status..."
 #~ msgstr "상태를 받는 중..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "사용자: E: %s K: %s | 파일 E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "클라이언트 %s, IP:포트 %s:%d, %s %s %s 사용"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress()이 NULL값을 반환했습니다."
 
+#~ msgid "Firewalled"
+#~ msgstr "방화벽"
+
+#, fuzzy
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "Loaded %d flag bitmaps."
+#~ msgstr[1] "Loaded %d flag bitmaps."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr "%s 파일은 당나기로 쓰기엔 큽니다: 최대 허용은 4 GB입니다."
+
+#~ msgid "No handler for this file type."
+#~ msgstr "이 파일 종류의 처리기가 없습니다."
+
+#~ msgid "File was not saved"
+#~ msgstr "파일은 저장되지 않았습니다."
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr "연결 실패. 특정 호스트에 연결할 수 없습니다\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "메시지 차단"
 
@@ -7140,14 +7720,121 @@
 #~ msgid "Core Tweaks"
 #~ msgstr "코어 조정"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "이 파일 종류의 처리기가 없습니다."
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "도구도움의 지연 시간 (초)"
 
-#~ msgid "File was not saved"
-#~ msgstr "파일은 저장되지 않았습니다."
+#~ msgid "Show part file number before file name"
+#~ msgstr "파일이름 앞에 부분파일 번호를 보여줌"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
-#~ msgstr "%s 파일은 당나기로 쓰기엔 큽니다: 최대 허용은 4 GB입니다."
+#~ msgid "Skin Support"
+#~ msgstr "외형 지원"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- 가능한 외형이 없음 -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "온라인 서명 폴더:"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "차단 설정:"
+
+#~ msgid "Line Capacities"
+#~ msgstr "라인 용량"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
+#~ msgstr ""
+#~ "알림: 이 값은 오직\n"
+#~ " 통계 목적으로 사용함."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "표준 클라이언트 TCP 포트:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "확장된 클라이언트 UDP 포트:"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "확장된 서버 요청을 위한 UDP 포트 (TCP+3): 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "파일당 최대자료수"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Universal Plug and Play"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "UPnP 활성화"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "UPnP TCP 포트:"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "파일이 완료되었을때 멈춤상태인 다음파일을 시작"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "통계색 선택"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "내려받기 대기열 파일 진행"
+
+#~ msgid "Show percentage"
+#~ msgstr "퍼센트로 보기"
+
+#~ msgid "Show progressbar "
+#~ msgstr "진행바로 보기"
+
+#~ msgid "Enable skin support "
+#~ msgstr "외형지원 활성화"
+
+#~ msgid "Skin:"
+#~ msgstr "외형:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "내려받기 대기열 자동 정렬 (높은 CPU)"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "수신대기 인터페이스의 IP\n"
+#~ "(모두를 위해서는 비움)"
+
+#~ msgid "TCP port"
+#~ msgstr "TCP 포트"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "공유 파일을 볼 수 있는 사람:"
+
+#~ msgid "Event types"
+#~ msgstr "사건 종류"
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "종료하기 전에 확인창을 보여줍니다."
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "추가자원 대역폭을 보여줌"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. 활성화"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICH가 모든 해시를 신뢰 (추천안함)"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "고급 설정"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "진행바 모양"
+
+#~ msgid "Column Sorting"
+#~ msgstr "열 정렬"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "기타 GUI 조정"
+
+#~ msgid "File Options"
+#~ msgstr "파일 설정"
 
 #~ msgid "Status text"
 #~ msgstr "상태 문장"
@@ -7155,18 +7842,89 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "팝업 상태 문장"
 
-#~ msgid "Please wait... "
-#~ msgstr "잠시 기다리세요..."
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "영화의 상영시간, 줄거리, 언어등을 말할수 있습니다.\n"
+#~ "만약 가짜 파일이라면 다른 어뮬 사용자에게 알려줄 수 있습니다."
+
+#~ msgid "Misc Options"
+#~ msgstr "기타 설정"
+
+#~ msgid "Server Options"
+#~ msgstr "서버 선택사항"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "연결되었을때 서버 motd를 보여줌..."
+
+#~ msgid "Disable/Enable"
+#~ msgstr "비활성화/활성화"
+
+#~ msgid "Authentication"
+#~ msgstr "인증"
 
 #~ msgid "General Settings"
 #~ msgstr "일반 설정"
 
+#~ msgid "Max Connections"
+#~ msgstr "최대 연결"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "GUI 조정"
 
 #~ msgid "Remote Control"
 #~ msgstr "원격 조정"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "선택된 브라우저를 판단할수 없습니다!"
+
+#~ msgid "User Defined"
+#~ msgstr "사용자 설정"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.amule.org - 리눅스 뮬"
+
+#~ msgid "Konqueror"
+#~ msgstr "컨커러"
+
+#~ msgid "Mozilla"
+#~ msgstr "모질라"
+
+#~ msgid "Firefox"
+#~ msgstr "불여우"
+
+#~ msgid "Firebird"
+#~ msgstr "불사조"
+
+#~ msgid "Opera"
+#~ msgstr "오페라"
+
+#~ msgid "Netscape"
+#~ msgstr "넷스케이프"
+
+#~ msgid "Galeon"
+#~ msgstr "갈레온"
+
+#~ msgid "Epiphany"
+#~ msgstr "에피파니"
+
+#~ msgid "Select your browser here"
+#~ msgstr "브라우저 선택"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "특정 브라우저:"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "브라우저 이름을 입력하세요. 특정 브라우저를 사용하기 위해서는 위의 메뉴중"
+#~ "에서'특정 브라우저'를 선택하세요."
+
+#~ msgid "Please wait... "
+#~ msgstr "잠시 기다리세요..."
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "기본 브라우저가 선택되지 않았습니다."
 
@@ -7179,9 +7937,6 @@
 #~ msgid "ExternalConn: Access denied"
 #~ msgstr "외부연결: 접근이 거부됨"
 
-#~ msgid "ExternalConn: Bad reply from server. Connection closed."
-#~ msgstr "외부연결: 서버 응답 불량. 연결이 끊겼습니다."
-
 #~ msgid "Copy ED2k &link to clipboard"
 #~ msgstr "ED2k 링크를 클립보드로 복사(&l)"
 
@@ -7281,9 +8036,6 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "클립보드에 ED2k링크를 복사"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "치명적 오류: 타이머 생성 실패"
-
 #, fuzzy
 #~ msgid "ED2K: Connecting"
 #~ msgstr "연결중"
@@ -7292,9 +8044,6 @@
 #~ msgid "ED2K: Disconnected"
 #~ msgstr "연결이 끊김"
 
-#~ msgid "Warning: Unable to open skin file '%s' for read"
-#~ msgstr "경고: 외형 파일 '%s'(을)를 읽을 수 없습니다."
-
 #~ msgid ""
 #~ "Your Auto-update servers list is in blank.\n"
 #~ "'Auto-update serverlist at startup' will be disabled."
@@ -7392,10 +8141,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "오류: 유효하지 않은 part.met 파일버젼: %s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr ""
-#~ "오류: %s(%s)은 손상되었습니다. (잘못된 꼬리계수), 파일을 읽을수 없습니다."
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "경고: %s는 손상되었습니다. (%i)"
 
@@ -7416,13 +8161,6 @@
 #~ msgid "Insufficient Diskspace"
 #~ msgstr "불충분한 디스크공간"
 
-#~ msgid "Warning: known.met cannot be opened."
-#~ msgstr "경고: known.met을 열 수 없습니다."
-
-#~ msgid "Warning: Knownfile list corrupted, contains invalid header."
-#~ msgstr ""
-#~ "경고: 알려진파일 목록이 손상됨, 유효하지 않는 머리말을 포함하고 있습니다."
-
 #~ msgid "ERROR! Attempted to share %s"
 #~ msgstr "오류! %s 공유를 시도"
 
@@ -7444,9 +8182,6 @@
 #~ msgid "Bandwidth Limits: Up: %u kB/s, Down: %u kB/s.\n"
 #~ msgstr "대역폭 제한: 올려주기: %u kB/초, 내려받기: %u kB/초\n"
 
-#~ msgid "Shutdown aMule."
-#~ msgstr "어뮬 종료."
-
 #~ msgid ""
 #~ "Shutdown the remote running core (amule/amuled).\n"
 #~ "This will also shut down the text client, since it is unusable without a\n"
@@ -7462,9 +8197,6 @@
 #~ msgid "Disconnect from ED2K only."
 #~ msgstr "ED2k에서만 연결을 끊습니다."
 
-#~ msgid "Adds an ed2k or magnet link to core."
-#~ msgstr "ed2k 또는 magnet 링크를 코어에 추가합니다."
-
 #~ msgid ""
 #~ "The ed2k link to be added can be:\n"
 #~ "*) a file link (ed2k://|file|...), it will be added to the download "
@@ -7587,9 +8319,6 @@
 #~ msgid "Manual Server Add : Name"
 #~ msgstr "수동 서버추가 : 이름"
 
-#~ msgid "No One"
-#~ msgstr "아무도"
-
 #~ msgid "Speed Limits:"
 #~ msgstr "속도 제한:"
 
@@ -7796,9 +8525,6 @@
 #~ msgid "Client request is invalid! %i / %i"
 #~ msgstr "클라이언트 요청이 유효하지 않습니다. %i / %i"
 
-#~ msgid "Command: %s"
-#~ msgstr "명령: %s"
-
 #~ msgid "Unable to open %s file - using %s file."
 #~ msgstr "%s파일을 열수 없습니다. - %s 파일을 사용합니다."
 
@@ -7815,13 +8541,6 @@
 #~ msgid "Waiting for subprocess termination failed"
 #~ msgstr "부 프로세스 종료 대기에 실패"
 
-#~ msgid ""
-#~ "You cannot connect to a release version from an arbitrary CVS version! "
-#~ "*sigh* possible crash prevented"
-#~ msgstr ""
-#~ "비정식 CVS 버젼으로부터 릴리즈된 버젼에 연결할수없습니다! *휴우* 있을 수 "
-#~ "있었던 충돌을 막았습니다."
-
 #~ msgid "doesn't work"
 #~ msgstr "작동하지 않습니다."
 
@@ -7853,7 +8572,7 @@
 #~ " FAQ: http://wiki.amule.org \n"
 #~ "\n"
 #~ " Contact: admin@amule.org (administrative issues) \n"
-#~ " Copyright (C) 2003-2009 aMule Team \n"
+#~ " Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
 #~ " Part of aMule is based on \n"
 #~ " Kademlia: Peer-to-peer routing based on the XOR metric.\n"
@@ -7867,7 +8586,7 @@
 #~ " 자주하는 질문: http://wiki.amule.org \n"
 #~ "\n"
 #~ " 연락: admin@amule.org (관리상의 문제)  \n"
-#~ " Copyright (C) 2003-2009 aMule Team \n"
+#~ " Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
 #~ " 어뮬의 일부분은 카뎀리아기반입니다. \n"
 #~ " 카뎀리아: XOR 측정 기반으로 개개인을 연결합니다..\n"
@@ -7970,9 +8689,6 @@
 #~ "권장되지 않는 명령어이고, 조만만 제거될것입니다.\n"
 #~ "대신에 'Set BwLimit Down'을 사용하세요.\n"
 
-#~ msgid "Syncronization thread started."
-#~ msgstr "동기화 스레드가 시작되었습니다."
-
 #~ msgid "Masterhashes of known files have been loaded."
 #~ msgstr "알려진 파일의 마스터 해시를 읽었습니다."
 
@@ -8003,12 +8719,6 @@
 #~ msgid ".%d"
 #~ msgstr ".%d"
 
-#~ msgid "Shows the process of a search."
-#~ msgstr "검색의 진행을 보여줍니다."
-
-#~ msgid "Shows the process of a search..\n"
-#~ msgstr "검색의 결과를 보여줍니다..\n"
-
 #~ msgid "Search warning."
 #~ msgstr "검색 경고."
 
@@ -8031,9 +8741,6 @@
 #~ msgid "Source Dropping"
 #~ msgstr "자료 버리기"
 
-#~ msgid "Keep sources"
-#~ msgstr "자료 유지"
-
 #~ msgid "Drop sources"
 #~ msgstr "자료 버림"

aMule-2.2.6.tar.bz2/po/l10n.xsl -> aMule-2.3.1.tar.bz2/po/l10n.xsl Changed

@@ -21,17 +21,20 @@
 			</head>
 			<body>
 				
-				<h1>aMule translation statistics</h1>
+				<h1><xsl:value-of select='@name'/> translation statistics</h1>
 				Statistics generated <xsl:value-of select='@stats_generated' /><br/><br/>
 				<table>
-					<tr><th>Language  </th><th colspan='2'>Translated</th><th colspan='3'>Fuzzy</th><th colspan='3'>Untranslated</th><th colspan='2'>Warnings</th><th colspan='3'>Progress</th></tr>
+					<tr><th>Language  </th><th /><th colspan='2'>Translated</th><th /><th colspan='2'>Fuzzy</th><th /><th colspan='2'>Untranslated</th><th colspan='3'>Warnings</th><th>Progress</th></tr>
 					<xsl:for-each select="lang">
 						<xsl:sort select='@translated' data-type="number" order="descending"/>
 						<tr>
 							<td><a><xsl:attribute name='href'><xsl:value-of select='@code'/>.po</xsl:attribute><xsl:value-of select='@name'/> (<xsl:value-of select='@code'/>)</a></td>
-							<td>| <xsl:value-of select='@translated'/></td><td> ~ <xsl:value-of select="format-number(@translated div ../@strings * 100,'#.##')"/>%</td>
-							<td>| | <xsl:value-of select='@fuzzy'/></td> ~ <td><xsl:value-of select="format-number(@fuzzy div ../@strings * 100,'#.##')"/>%</td>
-							<td>| | <xsl:value-of select='../@strings - (@translated + @fuzzy)'/></td> ~ <td><xsl:value-of select="format-number((../@strings - (@translated + @fuzzy)) div ../@strings * 100,'#.##')"/>%</td>
+							<td>|</td>
+							<td><xsl:value-of select='@translated'/></td><td> ~ <xsl:value-of select="format-number(@translated div ../@strings * 100,'#.##')"/>%</td>
+							<td>| |</td>
+							<td><xsl:value-of select='@fuzzy'/></td><td> ~ <xsl:value-of select="format-number(@fuzzy div ../@strings * 100,'#.##')"/>%</td>
+							<td>| |</td>
+							<td><xsl:value-of select='../@strings - (@translated + @fuzzy)'/></td><td> ~ <xsl:value-of select="format-number((../@strings - (@translated + @fuzzy)) div ../@strings * 100,'#.##')"/>%</td>
 							<td>| |</td>
 							<xsl:choose>
 								<xsl:when test="@warnings = 0">
@@ -43,18 +46,25 @@
 									</td>
 								</xsl:otherwise>
 							</xsl:choose>
-							<td>| </td>
+							<td>|</td>
 						<td>
 							<table class='bargraph'><tr>
 								<xsl:if test="@translated > 0">
 									<td bgcolor='green'><xsl:attribute name='width'><xsl:value-of select='round(@translated div ../@strings * 200)'/>px;</xsl:attribute></td>
 								</xsl:if>
 								<xsl:if test="@fuzzy > 0">
-									<td bgcolor='blue'><xsl:attribute name='width'><xsl:value-of select='round(@fuzzy div ../@strings * 200)'/>px;</xsl:attribute></td>
+									<xsl:choose>
+										<xsl:when test="../@strings - @translated - @fuzzy > 0">
+											<td bgcolor='blue'><xsl:attribute name='width'><xsl:value-of select='round(@fuzzy div ../@strings * 200)'/>px;</xsl:attribute></td>
+										</xsl:when>
+										<xsl:otherwise>
+											<td bgcolor='blue'><xsl:attribute name='width'><xsl:value-of select='200 - round(@translated div ../@strings * 200)'/>px;</xsl:attribute></td>
+										</xsl:otherwise>
+									</xsl:choose>
 								</xsl:if>
 								<xsl:if test="../@strings - @translated - @fuzzy > 0">
-									
-									<td bgcolor='red'></td>
+									<td bgcolor='red'><xsl:attribute name='width'><xsl:value-of select='200 - round(@translated div ../@strings * 200) - round(@fuzzy div ../@strings * 200)'/>px;</xsl:attribute></td>
+									
 								</xsl:if>
 							</tr></table>
 						</td>

aMule-2.2.6.tar.bz2/po/lt.po -> aMule-2.3.1.tar.bz2/po/lt.po Changed

@@ -1,13 +1,12 @@
 # translation of lt.po to Lithuanian
 # Dovydas Sankauskas <laisve@gmail.com>, 2006, 2007, 2008.
 # Dovydas Sankauskas <dovydas@pasaka>, 2006.
-# Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 msgid ""
 msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
@@ -18,1305 +17,1128 @@
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
 "100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Turite įrašyti netuščią slaptažodį."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Klaidingas slaptažodis, ne MD5 maiša!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Ryšio klaida"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "Nepavyko užmegzti išorinio ryšio. Gautas tuščias atsakymas."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Išorinis ryšys: prieiga nesuteikta"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Išorinis ryšys: prieiga nesuteikta"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Išorinis ryšys: neteisingas atsakymas iš serverio. Ryšys nutrauktas."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Pavyko! Užmegztas ryšys su aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Pavyko! Ryšys užmegztas."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Vykdoma maiša"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Įdėti draugą"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Patvirtinama"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Įrašyti IP ir prievadas teisingi!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Baigta"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Informacija"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Pristabdyta"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Nurodyta naudotojo maišos f-ja klaidinga!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Klaidinga"
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Nepavyko atverti %s (%s)"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Atsiunčiama"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"DĖMESIO: jei jūsų ID yra žemas, negalite įdėti savęs prie eD2k nuorodos "
+"šaltinių."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Laukiama"
+#: src/amule.cpp:239
+#, fuzzy
+msgid "Now, exiting main app..."
+msgstr ""
+"\n"
+"Darbas baigiamas %s...\n"
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Pradedamos kurti MD4 ir klaidų taisymo maišos reikšmės failui: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Pradedama kurti MD4 maišos failui: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Pradedama kurti klaidų taisymo maišos reikšmė failui: %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Nepavyko"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
 msgstr ""
-"Senos klaidų taisymo maišos reikšmės keičiamos „%s“ keičiamos 64b „%s“."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr ""
-"Dėmesio: failo pavadinimas %s yra klaidingas, todėl buvo pakeistas į %s."
+#: src/amule.cpp:335
+#, fuzzy
+msgid "aMule shutdown completed."
+msgstr "Atsiuntimas baigtas"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "Dėmesio: failas %s jau yra, naujas failas pervadintas į %s."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr ""
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "Dėmesio: sukūrus atsarginę kopiją nepavyko pašalinti pradinio failo %s"
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "Baigimo patvirtinimas"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "Dėmesio: nepavyko pašalinti %s"
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "Naujas išorinis ryšys priimtas"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Nepavyko gauti dalinamų failų iš vartotojo „%s“"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "DĖMESIO"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Nežinoma"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (neteisinga eMule versija %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Informacija"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (neteisinga eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Serverių sąraše nėra nei vieno serverio.\n"
+"Ar pageidaujate, kad aMule dabar atsiųstų naują sąrašą?"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (neteisinga eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Serverių sąrašo siuntimas"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (paremta eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr "žiniatinklio serverio pid yra %d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Slapyvardis: %s ID: %u"
+#: src/amule.cpp:658
+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 ""
+"Nurodėte paleidus programą paleisti žiniatinklio serverį, bet amuleweb "
+"programos nepavyko paleisti. Įdiekite aMule žiniatinklio programos paketą "
+"arba sukompiliuokite aMule su --enable-webserver parinktimi ir paleiskite "
+"„make install“."
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Paprašė: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "KLAIDA"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Šio seanso failų statistika: priimta %d iš %d prašymo, %s persiųsta\n"
-msgstr[1] ""
-"Šio seanso failų statistika: priimta %d iš %d prašymų, %s persiųsta\n"
-msgstr[2] ""
-"Šio seanso failų statistika: priimta %d iš %d prašymų, %s persiųsta\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Nepavyko susieti prievadų su nurodytu adresu: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Visų seansų failų statistika: priimta %d iš %d prašymo, %s persiųsta\n"
-msgstr[1] ""
-"Visų seansų failų statistika: priimta %d iš %d prašymų, %s persiųsta\n"
-msgstr[2] ""
-"Visų seansų failų statistika: priimta %d iš %d prašymų, %s persiųsta\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Paprašė nežinomo failo"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Prievadas %u neprieinamas. Gavote žemą ID\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Naudotojas %s IP:prievadas %s:%d naudoja %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Vardas"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Draugai"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Rodyti &išsamiau"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Įdėti draugą"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Pašalinti draugą"
-
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Siųsti &žinutę"
-
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Peržiūrėti failus"
-
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Sukurti siuntimo kanalą draugui"
-
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Ar tikrai pašalinti pažymėtą draugą?"
-
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Ar tikrai pašalinti pažymėtus draugus?"
-
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Atšaukti"
-
-#: src/FriendListCtrl.cpp:359
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
 msgstr ""
-"Neleidžiama sukurti daugiau nei vieną siuntimo kanalą draugui.\n"
-"Buvo sukurtas tik vienas kanalas."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Pažymėta keletas"
+"Prievadas %u neprieinamas!\n"
+"\n"
+"Gavote žemą ID.\n"
+"\n"
+"\n"
+"Patikrinkite sistemines tinklo parinktis ir įsitikinkite, kad nurodytas "
+"prievadas atviras tiek išsiuntimui, tiek priėmimui."
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Atsiuntimas baigtas"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Nepavyko sukurti keičiamo parašo failo"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Pilnas kelias iki failo."
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Nepavyko sukurti keičiamo aMule parašo failo"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Failo pavadinimas (be kelio iki jo)."
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"Nurodyta lokalė jūsų kompiuteryje neįdiegta. (Dėmesio: šiaip ar taip vis "
+"tiek pabandysime naudoti nurodytą lokalę)."
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "Failo eD2k maišos reikšmė."
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "aMule paleista pirmą kartą %s"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Failo dydis baitais."
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Ši versija yra darbinė versija, atnaujinama kasdien, ir\n"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Visas atsiuntimo laikas."
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr "todėl negalime garantuoti, kad ji nenulūš, nepadegs namų ar\n"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Pradėtas naujas pokalbis"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "nenumarins šuns. Bet šiaip ar taip ją naudoti turėtų būti saugu.\n"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Žinutės antraštė."
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Daugiau informacijos, pagalbos ir naujausias galutines versijas rasite mūsų\n"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Trūksta laisvos vietos"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"svetainėje www.aMule.org arba IRC kanale #aMule serveryje irc.freenode.net.\n"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Disko skirsnis."
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Nesikuklinkite pranešti rastas klaidas adresu http://forum.amule.org"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Baigiant siųsti failą įvyko klaida"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
+msgstr ""
+"Neteisingai nurodėte keičiamo parašo aplanką!\n"
+"Keičiamas parašas bus išjungtas tol, kol pakeisite parinktis."
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Failo pavadinimas"
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "Serverio pavadinimas:"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Dydis"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Nepavyko paskirti disko vietos failui „%s“: %s"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tipas"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "KLAIDA: nepavyko atverti žurnalo failo"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioritetas"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "DĖMESIO: žurnalas tuščias. Kažkas čia ne taip."
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "Failo ID"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Žurnalas išvalytas"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Prašymai"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Serverio pranešimas: %s"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Patenkinti prašymai"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Persiųsta duomenų"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Nepavyko atsiųsti mazgų sąrašo."
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Dalinimo santykis"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Nepavyko atverti atsiųstos versijos tikrinimo failo"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Gautos dalys"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Sugadintas versijos tikrinimo failas"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Pilni šaltiniai"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Naudojate pasenusią aMule versiją!"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Kelias"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Ši aMule versija yra %i.%i.%i, o naujausia versija yra %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Dalinami failai"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Naujausią versiją bet kada galima atsisiųsti iš http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Labai žemas"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "DĖMESIO: ši aMule versija yra pasenusi: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Žemas"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Naudojate naują aMule versiją."
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normalus"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Nepavyko atsiųsti versijos tikrinimo failo"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Aukštas"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Naudotojai: %s | Failai: %s"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Labai aukštas"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Naudotojai: eD2k: %s Kad: %s | Failai: eD2k: %s Kad: %s"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Leidinys"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Neparinktas joks tinklas"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Automatiškas"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "žemas ID"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Įdėti komentarą/įvertinimą"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "aukštas ID"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Keisti komentarą/įvertinimą"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Prisijungta prie %s %s"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Pervadinti"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Jungiamasi prie %s"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Failus iš kolekcijos įkelti į siuntimo sąrašą"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Atsijungta nuo eD2k"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Kopijuoti magneto &URI į talpyklę"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kademlia paleista."
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Kopijuoti eD2k &nuorodą į talpyklę"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kademlia sustabdyta."
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Kopijuoti eD2k nuorodą į talpyklę (&šaltinį)"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Prisijungta prie Kademlia"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Kopijuoti eD2k nuorodą į talpyklę (šaltinį su ši&fravimo parinktimis)"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Prisijungta prie Kademlia (už ugniasienės)"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Kopijuoti eD2k nuorodą į talpyklę (&kompiuterio pavadinimą)"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Atsijungta nuo Kademlia"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
 msgstr ""
-"Kopijuoti eD2k nuorodą į talpyklę (kompiuterio pavadinimą su šif&ravimo "
-"parinktimis)"
-
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Kopijuoti eD2k nuorodą į talpyklę (&klaidų taisymo informaciją)"
+"Nepavyks prisijungti prie Kademlia tinklo, jei parinktyse yra išjungtas UDP "
+"prievadas."
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Kopijuoti atsakymą į talpyklę"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Kademlia tinklas išjungtas parinktyse, ryšys nebus užmezgamas."
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuled.cpp:560
+#, fuzzy
 msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
 msgstr ""
-"Atsakymas iš: %s (%s)\n"
-"\n"
-
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Norėdami sukurti šaltinio nuorodą, privalote turėti aukštą ID"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "DĖMESIO"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Dalinami failai (%i)"
+"KLAIDA: aMule tarnyba negali būti naudojama jei išoriniai ryšiai yra "
+"išjungti. Norėdami įjungti išorinius ryšius arba naudokite normalią aMule, "
+"arba paleiskite amuled su parametru --ec-config, arba faile ~/.aMule/amule."
+"conf nustatykite parametro „AcceptExternalConnections“ reikšmę lygią 1."
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[Dalių failas]"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Įrašykite naują failo pavadinimą:"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Pervadinti failą"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr ""
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Tęsiame failos siuntimą: %s"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr ""
 
-#: src/UploadQueue.cpp:520
+#: src/amuled.cpp:711
 #, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Nutraukiamas failo siuntimas: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMule tekstinis klientas"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: ieškomas žodis pernelyg trumpas"
+msgid "ERROR: %s"
+msgstr "KLAIDA: %s"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
+#: src/amuleDlg.cpp:238
 #, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Nuskaitytas %u Kad kontaktas"
-msgstr[1] "Nuskaityti %u Kad kontaktai"
-msgstr[2] "Nuskaityta %u Kad kontaktų"
+msgid "This is aMule %s based on eMule."
+msgstr "aMule %s, sukurta eMule pagrindu."
 
-#: src/kademlia/routing/RoutingZone.cpp:297
+#: src/amuleDlg.cpp:240
 #, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgid "Running on %s"
+msgstr "Vykdoma %s sistemoje"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Įrašytas %d Kad kantaktas"
-msgstr[1] "Įrašyti %d Kad kantaktai"
-msgstr[2] "Įrašyta %d Kad kantaktų"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Aplankykite http://www.amule.org ir pasitikrinkite ar nėra naujesnės "
+"versijos."
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "KLAIDA: nepavyko klausytis TCP prievado."
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "KRITINĖ KLAIDA: nepavyko sukurti laiko skaitliuko"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "Priimtas žiniatinklio kliento ryšys\n"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "aMule nuotolinio valdymo pultelis "
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "KLAIDA: nepavyko priimti žiniatinklio kliento ryšio\n"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Ekrano kopija:"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Vykdant užduotį įvyko klaida: %s."
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Vykdant užduotį įvyko nežinoma klaida."
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Indekso failas nerastas: "
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Seansas baigėsi – prašoma prisijungti iš naujo\n"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Seansas pradėtas, priega gauta\n"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Seansas pradėtas, priega negauta\n"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Seansas nepradėtas – bus prašoma prisijungti\n"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Seansas sukurtas – prašoma prisijungti\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: p2p maršrutizavimas, paremtas XOR metrika.\n"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Apdorojamas prašymas [pradinis]: "
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Tikrinamas slaptažodis\n"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Slaptažodžio maišos funkcija neteisinga\n"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Žinutė"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Slaptažodis priimtas\n"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Neteisingas slaptažodis\n"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Jungiamasi"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Neįrašėte slaptažodžio. Tuščias slaptažodis neleidžiamas.\n"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: jungiamasi"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Prašoma atsijungti\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: atsijungta"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Apdorojamas prašymas [persiųstas]: "
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: už ugniasienės"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Įkelti šabloną <str>"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: prisijungta"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Žiniatinklio serverio HTTP prievadas"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: jungiamasi"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "UPnP prievadus persiunti žiniatinklio serverio prievade"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: išjungta"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP prievadas"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Atšaukti"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Naudoti gzip pakavimą"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Nutraukti bandymus prisijungti"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Pilnos prieigos prie žiniatinklio serverio slaptažodis"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Atsijungti"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Svečio prieigos prie žiniatinklio serverio slaptažodis"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Atsijungti nuo pasirinktų tinklų"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Įjungti svečio prieigą"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Prisijungti"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Išjungti svečio prieigą"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Prisijungti prie pasirinktų tinklų"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Įkelti/įrašyti žiniatinklio serverio parinktis iš/į nutolusio aMule"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Išs.: %.1f(%.1f) | Ats.: %.1f(%.1f)"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMule parinkčių failas. NENAUDOKITE TIESIOGIAI!"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Išs.: %.1f | Ats.: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Išjungti PHP interpretatorių (pasenusi)"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | prisijungta)"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Kiekvieną kartą perkompiliuoti PHP puslapius"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | neprisijungta)"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule www serveris"
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Ar tikrai norite baigti darbą su aMule?"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Nėra"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Baigimo patvirtinimas"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Niekada"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr ""
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Atsiunčiama..."
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr ""
 
-#: src/HTTPDownload.cpp:75
+#: src/amuleDlg.cpp:1232
 #, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+msgid "Skin directory '%s' does not exist"
+msgstr "Išvaizdos failų aplankas %s neegzistuoja"
 
-#: src/HTTPDownload.cpp:239
+#: src/amuleDlg.cpp:1237
 #, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr ""
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Parinktys"
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "DĖMESIO: nepavyko atverti temos failo „%s“ skaitymui"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "amulesig.dat failo aplankas"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Tinklas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Naršyti"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Tinklo langas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Įrašykite aplanką, kuriame yra amulesig.dat failas"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Paieška"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Atnaujinimo intervalas sekudėmis"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Paieškos langas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Kurti statistikos grafiką po kiekvieno atnaujinimo"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Siuntimai"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Įrašykite aplanką, kuriame bus kuriamas statistikos grafikas"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Atsiunčiama"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Periodiškai siųsti staitikos grafiką į FTP serverį"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Dalinami failai"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP URL"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Dalinamų failų langas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP kelias"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Žinutės"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Įrašykite FTP serverio adresą"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Žinučių langas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "Įrašykite FTP serverio aplanką, į kurį kelsite statistikos grafiką"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistika"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Vartotojas"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Statistikos grafikų langas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Slaptažodis"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Parinktys"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Įrašykite vartotoją, kuriuo jungsitės prie FTP serverio"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Parinkčių langas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Įrašykite vartotojo, kuriuo jungsitės prie FTP serverio, slaptažodį"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Įkelti"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "FTP atnaujinimo intervalas minutėmis"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Dalinai atsiųstų failų įkėlimo įrankis"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Patvirtinti"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Apie"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Aplankas, kuriame yra parašo failas"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Apie/pagalba"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Aplankas, kuriame kuriamas statistikos grafikas"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "eD2k tinklas"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
-#, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i d. %i val. %i min. %i s"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Kad tinklas"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, aMule dabartinė statistika"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Jokio tinklo"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Sveikiname!"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
 msgid "aMule"
 msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Didžiausia ats. sparta nuo wxCas paleidimo"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Pati didžiausia ats. sparta per praeitus wxCas seasus"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Perkrauti"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistema"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Sustabdyti automatinį atnaujinimą"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Įrašyti dabartinės statistikos grafiką"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Spausdinti dabartinės statistikos grafiką"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Parinktys"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Apie wxCas"
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "KRITINĖ KLAIDA: nepavyko sukurti laiko skaitliuko"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Paleisti automatinį atnaujinimą"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Prisijungti prie nutolusio aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Automatinis atnaujinimas sustabdytas"
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "KRITINĖ KLAIDA: nepavyko sukurti laiko skaitliuko"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Automatinis atnaujinimas paleistas"
+#: src/amule-remote-gui.cpp:268
+#, fuzzy
+msgid "Going to event loop..."
+msgstr "Bandoma atstatyti failo informaciją..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Įrašyti statistikos grafiką"
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "Jungiamasi"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMule dabartinė statistika"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Prisijungti nepavyko"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
 msgstr ""
-"Spausdinant įvyko klaida.\n"
-"Gali būti, kad spausdintuvas nėra tinkamai suderintas."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Spausdinama"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
 msgstr ""
-"wxCas, keičiamo aMule parašo statistika\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Paremta Pedro de Oliveira CAS <falso@rdk.homeip.net>\n"
-"\n"
-"Platinama pagal GPL licenciją"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oi! aMule nepaleista..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule paleista"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule paleista, bet ryšys neužmegztas"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule užmezga ryšį..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oi! aMule būsena nežinoma..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " vykdoma "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " sustabdyta!"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " ryšys neužmegztas!"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " užmezga ryšį..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " elgiasi keistai, prašome patikrinti!"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " užmezgė ryši su "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "gerai"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "ugniasienė"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "išj."
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " įj."
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " su "
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Viskas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Išviso atsiųsta: "
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Išsiųsta: "
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Nežinoma"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Atsiųsta per šį seansą: "
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Nepavyko gauti dalinamų failų iš vartotojo „%s“"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Atsiųsta: "
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Išsiųsta: "
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (neteisinga eMule versija %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (neteisinga eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Dalinamasi: "
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (neteisinga eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " failas(ai), naudotojai eilėje: "
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (paremta eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Trukmė: "
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Slapyvardis: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/BaseClient.cpp:2029
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid "Requested: %s\n"
+msgstr "Paprašė: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " – "
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Šio seanso failų statistika: priimta %d iš %d prašymo, %s persiųsta\n"
+msgstr[1] ""
+"Šio seanso failų statistika: priimta %d iš %d prašymų, %s persiųsta\n"
+msgstr[2] ""
+"Šio seanso failų statistika: priimta %d iš %d prašymų, %s persiųsta\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Vidutinis sistemos apkrovimas (per 1–5–15 min.): "
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Visų seansų failų statistika: priimta %d iš %d prašymo, %s persiųsta\n"
+msgstr[1] ""
+"Visų seansų failų statistika: priimta %d iš %d prašymų, %s persiųsta\n"
+msgstr[2] ""
+"Visų seansų failų statistika: priimta %d iš %d prašymų, %s persiųsta\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Sistemos veikimo trukmė: "
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Paprašė nežinomo failo"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
+#: src/BaseClient.cpp:2700
 #, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02ud %02uv %02um %02us"
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Filtras sulaikė %s žinutę (IP %s)"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/BaseClient.cpp:2807
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uv %02um %02us"
+msgid "New message from '%s' (IP:%s)"
+msgstr "Naują žinutę atsiuntė %s (IP %s)"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02um %02us"
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr ""
+"Naudotojas %s (%u) paprašė dalinamų failų iš aplanko %s sąrašo –> atmesta"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
-#, c-format
-msgid "%02us"
-msgstr "%02us"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, fuzzy, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "DĖMESIO: nepavyko atverti known.met."
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "Aukštas ID"
+#: src/CanceledFileList.cpp:61
+#, fuzzy
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr "DĖMESIO: sugadintas known.met, klaidinga antraštė."
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "Žemas ID"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Nuskaitant known.met failą įvyko IO klaida: %s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Neprisijungta"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Įrašant known.met failą įvyko klaida: %s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategorija"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nauja kategorija"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Nurodykite atsiųstų failų aplanką"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Nurodykite kategorijos pavadinimą!"
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Atšaukta!"
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Nurodykite kategorijos kelią!"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Nepavyko sukurti atsiųstų failų aplanko šiai kategorijai. Nurodykite "
+"teisingą kelią!"
+
+#: src/ChatSelector.cpp:129
 #, c-format
-msgid "Unable to open %s"
-msgstr "Nepavyko atverti %s"
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Pokalbis pradėtas: %s (%s:%u) – %s %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Įvesties parametrai"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Prisijungta prie kliento ***"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Pateikti failo maišos funkciją"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Jungiamasi prie kliento ***"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Šiam failui įdėti papildomus URL"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Nepavyko prisijungti prie kliento arba ryšys nutrūko ***"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Įrašykite failą, kuriam kursite eD2k nuorodą"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/ChatSelector.cpp:336
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
-"Įrašykite URL, kurį pridėsite prie eD2k nuorodos. Gale pridėjus „/“ "
-"aLinkCreator pridės dabartinio failo pavadinimą"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Įdėti"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Pašalinti"
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Užverti kortelę"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Išvalyti"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Užverti visas korteles"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Kurti nuorodas su dalių maišos f-jomis"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Užverti kitas korteles"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
-msgstr "Nauji ir reti failai bus platinamos sparčiau, bet nuoroda taps ilgesnė"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Įdėti į draugus"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4 failo maišos f-ja"
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Kreditų failas įkeltas, rastas %u žinomas klientas"
+msgstr[1] "Kreditų failas įkeltas, rasti %u žinomi klientai"
+msgstr[2] "Kreditų failas įkeltas, rasta %u žinomų klientų"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k failo maišos f-ja"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] "– %u kliento kreditai nebegalioja!"
+msgstr[1] "– %u klientų kreditai nebegalioja!"
+msgstr[2] "– %u klientų kreditai nebegalioja!"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k nuoroda"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Nerasta cryptkey.dat failo. Failas kuriamas."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Pradėti"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Kliento savybės"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Įrašyti"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "Žemas ID"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Kopijuoti į talpyklę"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "Aukštas ID"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Baigti"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Įjungta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-#, fuzzy
-msgid "Open"
-msgstr "Opera"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Palaikoma"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Atverti failą ir apskaičiuoti jo eD2k nuorodą"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Nepalaikoma"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopijuoti"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Išjungta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Kopijuoti apskaičiuotą eD2k nuorodą į talpyklę"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Prisijungta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-#, fuzzy
-msgid "Save as"
-msgstr "Įrašyti"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Neprisijungta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Įrašyti apskaičiuotą eD2k nuorodą į failą"
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Apie"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Neužbaigta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Apie aLinkCreator"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Kenkėjas"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Nurodykite failą, kuriam skaičiuosite eD2k nuorodą"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Praėjo patikrinimą"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-#, fuzzy
-msgid "Can't open the clipboard"
-msgstr "Kopijuoti į talpyklę"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Nepasiekiama"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Kol kas nėra ką kopijuoti!"
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "Naudotojas %s (%u) paprašė dalinamų failų sąrašo –> suteikta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Nurodykite failą apskaičiuotai eD2k nuorodai"
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "Naudotojas %s (%u) paprašė dalinamų failų sąrašo –> atmesta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Nepavyko atverti"
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "Naudotojas %s (%u) paprašė dalinamų aplankų sąrašo –> suteikta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Įrašykite failo pavadinimą"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "Naudotojas %s (%u) paprašė dalinamų aplankų sąrašo –> atmesta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Kol kas nėra ką įrašyti!"
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
+msgstr ""
+"Naudotojas %s (%u) paprašė dalinamų failų iš aplanko %s sąrašo –> suteikta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
 msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"aLinkCreator, aMule eD2k nuorodų kūrimo įrankis\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmap paveiksliukai iš http://www.everaldo.com, http://www.icomania.com\n"
-"ir http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Platinama pagal GPL"
+"Naudotojas %s (%u) paprašė dalinamų failų iš aplanko %s sąrašo –> atmesta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Skaičiuojamos maišos f-jos reikšmės..."
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Naudotojas %s (%u) dalinasi aplanku %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr ""
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Naudotojas %s (%u) atsiuntė neprašytus dalinamų failų aplankus"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
+"Naudotojas %s (%u) atsiuntė neprašytą dalinamų failų sąrašą aplankui %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-#, fuzzy
-msgid "Computing eD2k Hashes..."
-msgstr "Jungiamasi prie eD2k..."
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Naudotojas %s (%u) baigė siųsti dalinamų failų sąrašą"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/ClientTCPSocket.cpp:994
 #, c-format
-msgid "Done in %.2f s"
-msgstr "Atlikta per %.2f s"
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Naudotojas %s (%u) atsiuntė neprašytą dalinamų failų sąrašą"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Šis URL jau įdėtas!"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr ""
+"Naudotojas %s (%u) nesuteikė prieigos prie dalinamų aplankų/failų sąrašo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Įrašykite URL"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Failo komentarai"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
-#, c-format
-msgid "Processing file number %u: %s"
-msgstr "Apdorojamo failo numeris %u: %s"
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Vardas"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr ""
-"Pageidavote dalinių maišos rezultatų (naudojamų tik didesniems nei 9,5 MB "
-"failams)"
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Failo pavadinimas"
+
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Reitingas"
+
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Komentaras"
+
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Komentarų nėra"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s —> tokio failo nėra!\n"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u komentaras"
+msgstr[1] "%u komentarai"
+msgstr[2] "%u komentarų"
 
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, aMule eD2k nuorodų kūrimo įrankis"
+#: src/CorruptionBlackBox.cpp:227
+#, c-format
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1330,31 +1152,57 @@
 msgid "Auto [Hi]"
 msgstr "Automatiškai (aukštas)"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Jungiamasi"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Labai žemas"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Žemas"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normalus"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Aukštas"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Labai aukštas"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Leidinys"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Klausiama"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Jungiamasi per serverį"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Eilė pilna"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "Eilėje"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Siunčiama"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Atsiunčiama"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1380,8 +1228,7 @@
 msgid "Too many Kad connections"
 msgstr "Perdaug Kademlia ryšių"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Užblokuota"
 
@@ -1413,8 +1260,8 @@
 msgid "Remote Server"
 msgstr "Nutolęs serveris"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kademlia"
 
@@ -1435,12 +1282,11 @@
 msgstr "Pilni šaltiniai"
 
 #: src/DataToText.cpp:135
-#, fuzzy
 msgid "Search Result"
-msgstr "Paieška"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Baigtos"
 
@@ -1464,7 +1310,7 @@
 msgid "ERROR: Failed!"
 msgstr "ERROR: nepavyko!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "Eilėje"
 
@@ -1476,887 +1322,306 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Nežinomas arba klaidingas laikino failo formatas."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Numatyta"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albanų"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabų"
-
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "Estų"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Baskų"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgarų"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Katalonų"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Kinų (supaprastinta)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Kinų (tradicinė)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Kroatų"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Čekų"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Danų"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Olandų"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Anglų (DB)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estų"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Suomių"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Prancūzų"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galisijos"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Vokiečių"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Graikų"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Žydų"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Vengrų"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italų"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italų (Šveicarijos)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japonų"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Korėjiečių"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lietuvių"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvegų (naujoji norvegų)"
-
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Lenkų"
-
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugalų"
-
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugalų (Brazilijos)"
-
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Rusų"
-
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Slovėnų"
-
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Ispanų"
-
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Švedų"
-
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turkų"
-
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr ""
-
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Nurodytos naršyklės rasti nepavyko!"
-
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"TCP prievadas negali būti didesnis nei 65532, nes serverio UDP prievadas yra "
-"TCP+3"
-
-#: src/Preferences.cpp:1681
-#, c-format
-msgid "Default port will be used (%d)"
-msgstr "Bus naudojamas numatytas prievadas (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Serverio pavadinimas"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adresas"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Prievadas"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Aprašymas"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping trukmė"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Naudotojų skaičius"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Failai"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Nepavyko"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Statiškas"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versija"
-
-#: src/ServerListCtrl.cpp:144
-msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
-"Prie serverio, kurį norite pašalinti, esate šiuo metu prisijungę. Norėdami "
-"pašalinti serverį, iš pradžių turite atsijungti. Serveris kol kas "
-"nepašalintas."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Informacija"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(pavadinimas nežinomas)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Ar tikrai norite pašalinti šį statišką serverį %s"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Taip"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Ne"
-
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Nepavyko atverti %s"
-
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Serveriai (%i)"
-
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Serveris"
-
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Prisijungti prie serverio"
-
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Pažymėti, kad serveris statiškas"
-
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Pažymėti, kad serveris nestatiškas"
-
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Pažymėti, kad serveriai statiški"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Pažymėti, kad serveriai nestatiški"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Dydis"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Pašalinti serverį"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Persiųsta"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Pašalinti serverius"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Sparta"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Pašalinti visus serverius"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Eiga"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Kopijuoti eD2k nuorodą į talpyklę"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Šaltiniai"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopijuoti eD2k nuorodas į talpyklę"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioritetas"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Prisijungti prie serverio iš naujo"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Būsena"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Ar tikrai norite pašalinti visus serverius?"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Likęs laikas"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Ar tikrai norite pašalinti pažymėtą serverį?"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Paskutinį kartą matyta pilna"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Ar tikrai norite pašalinti pažymėtus serverius?"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Paskutinį kartą siųsta"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Išjungta [%s]"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Ar tikrai norite pašalinti pažymėtą failą?"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "aMule %s, sukurta eMule pagrindu."
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Ar tikrai norite pašalinti pažymėtus failus?"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Running on %s"
-msgstr "Vykdoma %s sistemoje"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Aplankykite http://www.amule.org ir pasitikrinkite ar nėra naujesnės "
-"versijos."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "KRITINĖ KLAIDA: nepavyko sukurti laiko skaitliuko"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMule nuotolinio valdymo pultelis "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Ekrano kopija:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" p2p klientas „visoms sistemoms“, sukurtas eMule pagrindu\n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Svetainė: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Forumas: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Kontaktai: admin@amule.org (administravimo klausimai) \n"
-
-#: src/amuleDlg.cpp:469
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
+"Feedback from: %s (%s)\n"
 "\n"
 msgstr ""
-" Autorinės teisės (C) 2003-2009 aMule komanda \n"
+"Atsakymas iš: %s (%s)\n"
 "\n"
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Dalis aMule programos paremta \n"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Automatiškas"
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: p2p maršrutizavimas, paremtas XOR metrika.\n"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Sustabdyti"
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Autorinės teisės (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Žinutė"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pauzė"
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: jungiamasi"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Tęsti"
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: atsijungta"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "I&švalyti baigtus failus"
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: už ugniasienės"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Visų naudotojų, turinčių šį failą, prašyti šio failo dabar pat"
 
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: prisijungta"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Visų naudotojų, turinčių šį failą, prašyti šio failo automatiškai"
 
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: jungiamasi"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Visų naudotojų, turinčių šį failą, prašyti kito failo"
 
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: išjungta"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Papildomi veiksmai"
 
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Nutraukti bandymus prisijungti"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Peržiūra"
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Atsijungti"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "&Rodyti failo savybes"
 
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Atsijungti nuo pasirinktų tinklų"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Rodyti komentarus"
 
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Prisijungti"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Kopijuoti magneto URI į talpyklę"
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Prisijungti prie pasirinktų tinklų"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Kopijuoti eD2k &nuorodą į talpyklę"
 
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Išs.: %.1f(%.1f) | Ats.: %.1f(%.1f)"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Kopijuoti atsakymą į talpyklę"
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Išs.: %.1f | Ats.: %.1f"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "Nepriskirti niekur"
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | prisijungta)"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Priskirti į kategoriją"
 
-#: src/amuleDlg.cpp:836
-#, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | neprisijungta)"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Atverti failą"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Ar tikrai norite baigti darbą su aMule?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Įrašykite naują failo pavadinimą:"
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Baigimo patvirtinimas"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Pervadinti failą"
 
-#: src/amuleDlg.cpp:1182
-#, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Išvaizdos failų aplankas %s neegzistuoja"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "DĖMESIO: nepavyko atverti temos failo „%s“ skaitymui"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Tinklas"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Tinklo langas"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Paieška"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Paieškos langas"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Siuntimas"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Failų siuntimo langas"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Dalinami failai"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Dalinamų failų langas"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Žinutės"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Žinučių langas"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistika"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Statistikos grafikų langas"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Parinkčių langas"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Įkelti"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Dalinai atsiųstų failų įkėlimo įrankis"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Apie/pagalba"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "eD2k tinklas"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Kad tinklas"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Jokio tinklo"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Bendra"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Kanalas"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Aplankai"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Serveriai"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Saugumas"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Atstovaujantis serveris"
-
-#: src/PrefsUnifiedDlg.cpp:177
-#, fuzzy
-msgid "Filters"
-msgstr "Filtras:"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Nutolęs valdymas"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Keičiamas parašas"
-
-#: src/PrefsUnifiedDlg.cpp:180
-#, fuzzy
-msgid "Advanced"
-msgstr "Sudėtingesnės parinktys"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Įvykiai"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Taisymas"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Nurodyta naudotojo"
+msgid "Downloads (%i)"
+msgstr "Atsiuntimai (%i)"
 
-#: src/PrefsUnifiedDlg.cpp:539
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-"Kad įsigaliotų šie pakeitimai, aMule reikia paleisti iš naujo:\n"
-"\n"
+"Norėdami nebematyti šio įspėjimo kiekvienos peržiūros metu,\n"
+"parinktyse nurodykite pageidaujamą video grotuvą (numatytas yra mplayer)."
 
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "– pakeistas TCP prievadas.\n"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Failo peržiūra"
 
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "– pakeistas UDP prievadas.\n"
+#: src/DownloadListCtrl.cpp:1461
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "KLAIDA: nepavyko paleisti išorinio vaizdo grotuvo! Komanda: „%s“"
 
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
 msgstr ""
-"Automatiškai atnaujinamų servaerių sąrašas tuščias.\n"
-"Parinktis „Automatiškai atnaujinti serverių sąrašą“ bus sišjungta."
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
-"Įjungėte išorinius ryšius, bet parinktyse nenurodėte slaptažodžio.\n"
-"Kol nenurodysite slaptažodžio, išoriniai ryšiai nebus įjungti."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "– kalba pakeista.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "– laikinų failų aplankas pakeistas.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-#, fuzzy
-msgid "- ED2K network enabled.\n"
-msgstr "Visi tinklai išjungti."
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Išs.: 0,0 | Ats.: 0,0"
 
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Tiek eD2k, tiek Kademlia tinklai yra išjungti.\n"
-"Norėdami prisijungti įjunkite bent vieną iš šių tinklų."
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "Įkeliamas server.met failas: %s"
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Nepavyks prisijungti prie Kademlia tinklo, nes išjungtas UDP prievadas.\n"
-"Arba įjunkite UDP prievadą, arba išjunkite Kademlia tinklą."
+#: src/DownloadQueue.cpp:132
+#, fuzzy, c-format
+msgid "Loading PartFile %u of %u"
+msgstr "Įkeliami duomenys iš seno atsiuntimo failo (%u iš %u)"
 
-#: src/PrefsUnifiedDlg.cpp:669
+#: src/DownloadQueue.cpp:154
 msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"\n"
-"Būtina paleisti aMule iš naujo.\n"
-"Jei dabar pat neperleisite aMule, nesiskųskite jei kas nors bus ne taip.\n"
+"KLAIDA: nepavyko įkelti atsarginės kopijos failo. Paieškokite http://forum."
+"amule.org .part.met atstatymo būdų."
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
-"Automatiškai atnaujinamų serverių sąrašas tuščias.\n"
-"Įrašykite bent vieną server.met failo URL.\n"
-"Norėdami įrašyti URL, paspauskite mygtuką „Sąrašas“."
 
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Laikini failai"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Atsiųsti failai"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Keičiami parašai"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Parinkite aplanką %s"
-
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Parinkite video grotuvą"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Parinkite naršyklę"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Nerastas nei vienas dalių failas"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Vykdomas failas %s"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Rastas %u dalių failas"
+msgstr[1] "Rasti %u dalių failai"
+msgstr[2] "Rasta %u dalių failų"
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Keisti serverių sąrašą"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
+msgstr "Laikino aplanko failų sistema nemoka dirbti su dideliais failais."
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
-"Įrašykite server.met failų URL.\n"
-"Vieną URL vienoje eilutėje."
+"Atsiųstų failų aplanko failų sistema nemoka dirbti su dideliais failais."
 
-#: src/PrefsUnifiedDlg.cpp:1031
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Atnaujinimo intervalas: %d s"
-msgstr[1] "Atnaujinimo intervalas: %d s"
-msgstr[2] "Atnaujinimo intervalas: %d s"
+msgid "Downloading %s"
+msgstr "Atsiunčiama %s"
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Vidurkių grafiko trukmė: %d min."
-msgstr[1] "Vidurkių grafiko trukmė: %d min."
-msgstr[2] "Vidurkių grafiko trukmė: %d min."
+msgid "You are already trying to download the file '%s'"
+msgstr "Failas %s jau yra atsiunčiamų failų sąraše"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Ryšių grafiko mastelis: %d"
+msgid "You already have the file '%s'"
+msgstr "Failas %s jau buvo atsiųstas"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Atnaujinimo intervalas: %d s"
-msgstr[1] "Atnaujinimo intervalas: %d s"
-msgstr[2] "Atnaujinimo intervalas: %d s"
+msgid "You are already trying to download the file %s"
+msgstr "Failas %s jau yra atsiunčiamų failų sąraše"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Failų buferio dydis: %d baitas"
-msgstr[1] "Failų buferio dydis: %d baitai"
-msgstr[2] "Failų buferio dydis: %d baitų"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Nepavyko konvertuoti magnet nuorodos į eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Išsiuntimo eilės dydis: %d klientas"
-msgstr[1] "Išsiuntimo eilės dydis: %d klientai"
-msgstr[2] "Išsiuntimo eilės dydis: %d klientų"
+msgid "Unknown protocol of link: %s"
+msgstr "Nežinomas protokolas arba nuoroda: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Serverio ryšio atnaujinimo intervalas: %d min."
-msgstr[1] "Serverio ryšio atnaujinimo intervalas: %d min."
-msgstr[2] "Serverio ryšio atnaujinimo intervalas: %d min."
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Serverio ryšio atnaujinimo intervalas: išjungta"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-#, fuzzy
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "UDP prievadas papildomoms serverio užklausoms (TCP+3): 4665"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Klaidinga eD2k nuoroda! KLAIDA: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1118
+#: src/ExternalConn.cpp:260
 #, fuzzy
-msgid "disabled"
-msgstr "Išjungti"
-
-#: src/PrefsUnifiedDlg.cpp:1138
-#, c-format
-msgid "Execute command on `%s' event"
-msgstr "Įvykus „%s“ įvykiui įvykdyti komandą"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Įjungti komandos vykdymą branduolyje"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Branduolio komanda:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Įjungti komandos vykdymą grafinėje aplinkoje"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Grafinės aplinkos komanda:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Šie kintamieji bus pakeisti:"
-
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Bandymas gauti prieigą. Prieiga nesuteikta, ryšys nutrauktas."
+msgid "Client sent packet after authentication failed."
+msgstr "Patvirtinimas nepavyko."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Išorinis ryšys nutrauktas."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Išoriniai ryšiai atjungti, nes slaptažodis tuščias!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Išoriniai ryšiai atjungti parinkčių faile"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Naujas išorinis ryšys priimtas"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "KLAIDA: nepavyko priimti išorinio ryšio"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "Išorinis ryšys nepriimtas, nes parinktyse nurodytas tuščias slaptažodis!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Jungiasi klientas: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Nežinoma versija"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2365,2253 +1630,1082 @@
 "Programos branduolį ir nutolusią aplinką naudokite kompiliuotą iš tos pačios "
 "pradinio kodo versijos."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 "Nepavyks prie galutinės leidimo versijos prisijungti iš SVN versijos! Ech, "
 "buvo išvengta galimo programos lūžimo"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Patvirtinimas nepavyko."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Neteisinga protokolo versija."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Trūksta protokolo versijos žymės."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "Patvirtinimas nepavyko."
+
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "Patvirtinimas nepavyko."
+
+#: src/ExternalConn.cpp:516
+#, fuzzy
+msgid "Invalid request, please authenticate first."
 msgstr "Klaidingas prašymas, iš pradžių turite būti atpažinti."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Prieiga suteikta."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, fuzzy, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Filtruoti žinutes nuo nežinomų klientų"
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Bandymas gauti prieigą. Prieiga nesuteikta, ryšys nutrauktas."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 "Nutolusio dalinio failo komanda nepavyko. Failo maišos funkcija nerasta: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Failo maišos funkcija nerasta: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "Oi! OpCode vykdymo klaida!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Serveris neįdėtas"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "serveris nerastas: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "Nurodykite serverį, kurį pašalinti"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k išjungtas parinktyse."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Ieškoma. Tuoj bus gauti rezultatai!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "www paieška iš nutolusios programos neturi prasmės."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kademlia išjungta parinktyse."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Grafikui nėra duomenų."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Šis klientas nesuderintas pateikti tiek detalių."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Išorinis ryšys: gautas prašymas išjungti"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Jau išsijungiama."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Išoriniai ryšiai: įdedama nuoroda %s."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Klaidinga nuoroda arba failas sąraše jau yra."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Failas nerastas."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Klaidingas failo pavadinimas."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Nepavyko pervadinti failo."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kademlia išjungta parinktyse."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Prie eD2k jau prisijungta."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Jungiamasi prie eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Prie Kademlia jau prisijungta."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Jungiamsi prie Kademlia..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Visi tinklai išjungti."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Atsijungta nuo eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Atsijungta nuo Kademlia."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Išorinis ryšys: gautas klaidingas opcode: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Klaidingas opcode (bloga protokolo versija?)"
 
-#: src/UploadClient.cpp:273
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Nepavyko atverti failo %s, jis bus pašalintas iš dalinamų failų sąrašo."
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Nežinomas plėtinys %s (komandai %s).\n"
 
-#: src/UploadClient.cpp:718
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Gautas prašymas nežinomo failo maišos f-jai: %s"
+msgid "Unknown command '%s'.\n"
+msgstr "Nežinoma komanda %s.\n"
 
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
-"Komanda „%s“, kurios pid „%d“, baigė darbą pranešdama būsenos kodą „%d“."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Serveris neįdėtas: nenurodytas IP adresas arba mazgo pavadinimas."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Serveris neįdėtas: nurodytas neteisingas serverio prievadas."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "eD2k būsena:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Prisijungta"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:prievadas"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kademlia būsena:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Dirbama"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Būsena:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Neprisijungta"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Ryšio būklė:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Už ugniasienės"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "Gerai"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Ugniasienės būsena:"
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Prisijungta prie draugo"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Nėra draugo"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Naudotojų vidurkis:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Failų vidurkis:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Nepaleista"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Seanso trukmė: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Siuntimas"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Išsiuntimai"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Išsiųsta duomenų (per seansą (iš viso)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Tarnybinis srautas iš viso (paketai): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Tarnybinis srautas failų prašymams (paketai): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Tarnybinis srautas šaltinių apsikeitimui (paketai):%s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Tarnybinis srautas serveriams (paketai): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Kademlia tarnybinis srautas (paketai): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Šifravimo tarnybinis srautas (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Aktyvūs išsiuntimai: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Laukiantys išsiuntimai: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Iš viso sėkmingų išsiuntimų: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Iš viso nepavykusių išsiuntimų: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Vidutiniškai išsiuntimas trunka: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Siuntimai"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Atsiųsta duomenų (per seansą (iš viso)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Rasta šaltinių: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Aktyvūs atsiuntimai (dalys): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Seanso Išs./Ats. santykis (iš viso): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Vidutinė atsiuntimo sparta (seanso): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Vidutinė išsiuntimo sparta (seanso): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Didžiausia atsiuntimo sparta (seanso): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Didžiausia išsiuntimo sparta (seanso): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Ryšis pakartotinai užmegztas: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Pirmą kartą siųsta prieš: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Prisijungta prie serverio prieš: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Aktyvių ryšių skaičius (apytikriai): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Didžiausias leistinas ryšių skaičius pasiektas: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Vidutinis ryšių skaičius (apytikriai): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Daugiausia ryšių (apytikriai): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Naudotojai"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtruota"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Iš viso: %i atpažinta: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Veikiantys serveriai: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Neveikiantys serveriai: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Iš viso: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Pašalinti serveriai: %s"
+"\n"
+"Ši komanda neturi kintamųjų.\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Filtruoti serveriai: %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Šiai komandai reikia kintamojo.\n"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Naudotojų kiekis veikiančiuose serveriuose: %llu"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Ši komanda nebaigta, naudokite vieną iš plėtinių žemiau.\n"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Failų kiekis veikiančiuose serveriuose: %llu"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Galimi plėtiniai:\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Iš viso naudotojų: %llu"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Galimos komandos:\n"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Total Files: %llu"
-msgstr "Iš viso failų: %llu"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Visoms komandoms svarbu raidžių dydis.\n"
+"Įrašę „%s <komanda>“ gausite išsamią informaciją apie <komandą>.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Serverių užimtumas: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Baigti programos darbą."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Dalinamų failų kiekis: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Rodyti pagalbą."
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Bendras dalinamų failų dydis: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Įrašę „help <komanda>“ gausite išsamią informaciją apie <komandą>.\n"
+"Įrašę „help“ gausite pilną komandų sąrašą.\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
-msgstr "Vidutinis failo dydis: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Operacinė sistema"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Negauta"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Iškirpti"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Įterpti"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Pažymėti viską"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Įrašę „%s“ gausite komandų sąrašą\n"
+"\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kademlia paieška negalima, jei nepaleista Kademlia tarnyba"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Sintaksės klaida!"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "eD2k paieška negalima, jei eD2k tarnyba neužmezgė ryšio"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+"Apdorojant komandą įvyko klaida! To neturėjo niekada atsitikti! Prašome "
+"pranešti apie klaidą\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Vykdant Kademlia paiešką įvyko netikėta klaida: "
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Ši komanda negali turėti parametrų."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Filtras sulaikė %s žinutę (IP %s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Ši komanda privalo turėti parametrą."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Naują žinutę atsiuntė %s (IP %s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Klaidingas kintamasis."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "Naudotojas %s (%u) paprašė dalinamų failų sąrašo –> suteikta"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Komanda neužbaigta."
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "Naudotojas %s (%u) paprašė dalinamų failų sąrašo –> atmesta"
+msgid "Type '%s' to get more help.\n"
+msgstr "Įrašę „%s“ gausite išsamesnę pagalbą.\n"
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "Naudotojas %s (%u) paprašė dalinamų aplankų sąrašo –> suteikta"
+msgid "This is %s %s %s\n"
+msgstr "Tai %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "Naudotojas %s (%u) paprašė dalinamų aplankų sąrašo –> atmesta"
+msgid "This is %s %s\n"
+msgstr "Tai %s %s\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"Naudotojas %s (%u) paprašė dalinamų failų iš aplanko %s sąrašo –> suteikta"
-
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"Naudotojas %s (%u) paprašė dalinamų failų iš aplanko %s sąrašo –> atmesta"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Naudotojas %s (%u) dalinasi aplanku %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Naudotojas %s (%u) atsiuntė neprašytus dalinamų failų aplankus"
-
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
+"\n"
+"Creating client...\n"
 msgstr ""
-"Naudotojas %s (%u) atsiuntė neprašytą dalinamų failų sąrašą aplankui %s"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Naudotojas %s (%u) baigė siųsti dalinamų failų sąrašą"
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Naudotojas %s (%u) atsiuntė neprašytą dalinamų failų sąrašą"
+"\n"
+"Kuriamas klientas...\n"
 
-#: src/ClientTCPSocket.cpp:1049
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Naudotojas %s (%u) nesuteikė prieigos prie dalinamų aplankų/failų sąrašo"
-
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Mazgai (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Klaidingas inicializavimo IP"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Klaidingas inicializavimo prievadas"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Prašome užpildyti visus privalomus laukus"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Ar tikrai norite atsisiųsti naują nodes.dat failą?\n"
+"\n"
+"Darbas baigiamas %s...\n"
 
-#: src/KadDlg.cpp:197
+#: src/ExternalConnector.cpp:420
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"Atsiuntus naują node.dat failą bus pašalinti dabartiniai mazgai ir bus iš "
-"naujo prisijungta prie Kademlia tinklo."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Tęsti?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "KLAIDA: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "DĖMESIO: "
+"Nurodžius tuščią slaptažodį prisijungti nepavyks.\n"
+"Nurodykite slaptažodį parinkčių faile,\n"
+"komandų eilutėje arba įrašykite paklausus.\n"
+"\n"
+"Darbas baigiamas...\n"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Įdėti draugą"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Rodyti šį pagalbos tekstą."
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Įrašyti IP ir prievadas teisingi!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Mazgas, kuriame paleista aMule. Numatyta: localhost"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informacija"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "aMule išorinių ryšių prievadas. Numatyta: 4712"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Nurodyta naudotojo maišos f-ja klaidinga!"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Išorinių ryšių slaptažodis."
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Šaltiniai"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Nuskaityti parinktis iš failo."
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Failas"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Nepateikti išvesties į stdout įrenginį."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Atsiųsti"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Rodyti išsamius pranešimus, negi klaidų taisymo pranešimus."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategorija"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Nurodyti programos kalbą."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Pagrindinė"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Komandų eilutės parinktis įrašyti į parinkčių failą."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Atsiunčiamą failą įdėti į kategoriją"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Sukurti parinkčių failą pagal aMule parinkčių failą."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Ieškoti panašių failų (eD2k, vietiniame serveryje)"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Atspausdinti programos versiją."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Pažymėti failą kaip jau žinomą"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Failo savybės"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Prisijungti prie nutolusio aMule"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% baigta"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Prisijungti nepavyko"
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "KLAIDA"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "Nepavyko atverti draugų sąrašo failo „emfriends.met“ skaitymui!"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, fuzzy, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Nepavyko užmegzti ryšio. Prie nurodyto mazgo prisijungti nepavyko\n"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "Nepavyko atverti draugų sąrašo failo „emfriends.met“ rašymui!"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
-"DĖMESIO: jei jūsų ID yra žemas, negalite įdėti savęs prie eD2k nuorodos "
-"šaltinių."
-
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Naudotojai eD2K: %s Kad: %s | Failai eD2K: %s Kad: %s"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Viskas"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Draugai"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Iš viso naudotojų: %s | Iš viso failų: %s"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Rodyti &išsamiau"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Persiųsta"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Įdėti draugą"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Sparta"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Pašalinti draugą"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Eiga"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Siųsti &žinutę"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Būsena"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Peržiūrėti failus"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Likęs laikas"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Sukurti siuntimo kanalą draugui"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Paskutinį kartą matyta pilna"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Ar tikrai pašalinti pažymėtą draugą?"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Paskutinį kartą siųsta"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Ar tikrai pašalinti pažymėtus draugus?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Ar tikrai norite pašalinti pažymėtą failą?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Neleidžiama sukurti daugiau nei vieną siuntimo kanalą draugui.\n"
+"Buvo sukurtas tik vienas kanalas."
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Ar tikrai norite pašalinti pažymėtus failus?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Pažymėta keletas"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Siųsti žinutę naudotojui"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Siųsti žinutę:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Sustabdyti"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pauzė"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Tęsti"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "I&švalyti baigtus failus"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Visų naudotojų, turinčių šį failą, prašyti šio failo dabar pat"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Visų naudotojų, turinčių šį failą, prašyti šio failo automatiškai"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Visų naudotojų, turinčių šį failą, prašyti kito failo"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Papildomi veiksmai"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Peržiūra"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "&Rodyti failo savybes"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Rodyti komentarus"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Kopijuoti magneto URI į talpyklę"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "Nepriskirti niekur"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Priskirti į kategoriją"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Atverti failą"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Pašalinti iš draugų"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Įdėti į draugus"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Siųsti žinutę"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Keisti į šį failą"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "Ats. kitą failą"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "Reitingas: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Atsiunčiamas kitas failas"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Atsiuntimai (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Norėdami nebematyti šio įspėjimo kiekvienos peržiūros metu,\n"
-"parinktyse nurodykite pageidaujamą video grotuvą (numatytas yra mplayer)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Failo peržiūra"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Laukiantys išsiuntimai: %s"
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "KLAIDA: nepavyko paleisti išorinio vaizdo grotuvo! Komanda: „%s“"
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "Eilėje"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "KLAIDA: nepavyko sukurti dalių failo"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Išsiuntimas"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Bandoma įkelti met failo atsarginę kopiją iš %s"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Niekas"
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "KLAIDA: nepavyko atverti part.met failo: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Ne"
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "KLAIDA: part.met failo dydis yra 0: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Taip"
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "KLAIDA: neteisinga part.met failo versija: %s ==> %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Atsiunčiama..."
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
-"KLAIDA: %s (%s) yra sugadintas (blogas žymių skaičius), failo įkelti "
-"nepavyks."
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Bandoma atstatyti failo informaciją..."
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "DĖMESIO: nepavyko atverti temos failo „%s“ skaitymui"
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
-"Atstatomas failas be pavadinimo. Atstačius jis bus pavadintas RecoveredFile."
-"dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "Atstatyta visa įmanoma failo informacija – bandoma naudoti failą..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Nepavyko atstatyti failo informacijos :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Nepavyko atverti %s (%s)"
 
-#: src/PartFile.cpp:708
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "DĖMESIO: %s gali būti sugadintas (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "KLAIDA: įrašant dalių failą įvyko klaida: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Nepavyko apskaičiuoti „%s“ dydžio – naudojamas %s failas."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "%s failo dydis kažkodėl yra 0 – naudojamas %s failas."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Failui %s nepavyko įrašyti part.met.seeds failo"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Įrašytas %i platinantis šaltinis dalių failui %s (%s)"
-msgstr[1] "Įrašyti %i platinantys šaltiniai dalių failui %s (%s)"
-msgstr[2] "Įrašyta %i platinančių šaltinių dalių failui %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Dalių failas %s (%s) neturi platinančių šaltinių failo"
-
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Dalių failo %s (%s) platinančių šaltinių failas yra tuščias"
-
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
-"Nuskaitant dalių failo platinančių šaltinių failą įvyko klaida (%s – %s): %s"
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Aptikta klaidinga dalis (%d) %d dalies faile %s – failo rezultatų maišos f-"
-"ja |%s| failo maišos f-ja |%s|"
-msgstr[1] ""
-"Aptikta klaidinga dalis (%d) %d dalių faile %s – failo rezultatų maišos f-ja "
-"|%s| failo maišos f-ja |%s|"
-msgstr[2] ""
-"Aptikta klaidinga dalis (%d) %d dalių faile %s – failo rezultatų maišos f-ja "
-"|%s| failo maišos f-ja |%s|"
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Aptikta baigta dalis (%i) %s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Baigtas maišos f-jos reikšmės perskaičiavimas %s"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Baigiant siųsti %s įvyko netikėta klaida. Failas pristabdytas"
-
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Atsiųsta: %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr ""
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Šalinamas failas: %s"
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
+msgstr "Atsiųsta"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
-"DĖMESIO: atsiųstai daliai nepavyko apskaičiuoti maišos funkcijos – %s maišos "
-"reikšmės nebaigtos"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"DĖMESIO: atsiųstai daliai nepavyko apskaičiuoti maišos funkcijos – %s maišos "
-"reikšmės nebaigtos. Tokių dalykų neturi būti"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "Dėmesio: diske nepakanka laisvos vietos! Failas pristabdomas: %s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Atsiųsta sugadinta %i dalis: %s"
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Prisijungti prie serverio iš naujo"
 
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
-"Klaidų taisymo įrankis: atstatyta sugadinta dalis %i %s –> išgelbėta %s baitų"
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Paskiriama vieta"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Nepakanka laisvos vietos"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Sustabdyta"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Atsiųsta"
-
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "KLAIDA: nepavyko atverti dalių failo „%s“"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "DĖMESIO: nepavyko atverti known.met."
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr "DĖMESIO: sugadintas known.met, klaidinga antraštė."
-
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Nuskaitant known.met failą įvyko IO klaida: %s"
-
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Įrašant known.met failą įvyko klaida: %s"
+msgid "Download new GeoIP.dat from %s"
+msgstr ""
 
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Aptiktas %i dalinamas failas"
-msgstr[1] "Aptikti %i dalinami failai"
-msgstr[2] "Aptikta %i dalinamų failų"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr ""
 
-#: src/SharedFileList.cpp:358
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Aptiktas %i žinomas dalinamas failai, %i nežinomų"
-msgstr[1] "Aptikti %i žinomi dalinami failai, %i nežinomų"
-msgstr[2] "Aptikta %i žinomų dalinamų failų, %i nežinomų"
+msgid "Failed to remove %s file, aborting update."
+msgstr ""
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "KLAIDA: bandoma dalintis %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Failo komentarai"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Reitingas"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Komentaras"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Komentarų nėra"
+msgid "Failed to rename %s file, aborting update."
+msgstr ""
 
-#: src/CommentDialogLst.cpp:104
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u komentaras"
-msgstr[1] "%u komentarai"
-msgstr[2] "%u komentarų"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+msgid "Successfully updated %s"
 msgstr ""
-"Nepavyko prisijungti nei prie vieno iš slepiamų serverių sąraše. Bandoma dar "
-"kartą neslepiant."
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
-"Nepavyko prisijungti nei prie vieno iš serverių sąraše. Bandoma dar kartą."
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "eD2k tinklas išjungtas parinktyse, nebus jungiamasi."
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Nepavyko iš %s atsiųsti serverių sąrašo"
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Serverių sąraše nerasta tinkamų serverių įrašų"
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Nepavyko iš %s atsiųsti serverių sąrašo"
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Prisijungta prie %s (%s:%i)"
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Įkeliami IP filtrai ipfilter.dat ir ipfilter_static.dat."
 
-#: src/ServerConnect.cpp:263
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Prisijungta: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
-"Bandant prisijungti įvyko kritinė klaida. Gali būti, kad nėra interneto ryšio"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Ryšys nutrūko %s (%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) neatsako, galbūt išjungtas."
+"Nepavyko įkelti ipfilter.dat failo „%s“, nepavyko suprasti failo formato."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) pilnas."
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "Nepavyko įkelti ipfilter.dat failo „%s“, nepavyko atverti failo."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Po %d sekundės bus bandoma prisijungti prie serverio automatiškai"
-msgstr[1] "Po %d sekundžių bus bandoma prisijungti prie serverio automatiškai"
-msgstr[2] "Po %d sekundžių bus bandoma prisijungti prie serverio automatiškai"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Ryšys nutrūko"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Įkeltas %u IP diapazonas iš „%s“."
+msgstr[1] "Įkelti %u IP diapazonai iš „%s“."
+msgstr[2] "Įkelta %u IP diapazonų iš „%s“."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Prisijungti prie %s (%s:%i) nepavyko."
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "KLAIDA: neteisingas lizdas (socket) baigiantis laiko limitui"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u klaidingas įrašas neįkeltas."
+msgstr[1] "%u klaidingi įrašai neįkelti."
+msgstr[2] "%u klaidingų įrašų neįkelta."
 
-#: src/ServerConnect.cpp:460
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Baigėsi bandymo susijungti laikas %s (%s:%i)."
-
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
-"KLAIDA: nepavyko įkelti atsarginės kopijos failo. Paieškokite http://forum."
-"amule.org .part.met atstatymo būdų."
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Nerastas nei vienas dalių failas"
 
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Rastas %u dalių failas"
-msgstr[1] "Rasti %u dalių failai"
-msgstr[2] "Rasta %u dalių failų"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr "Laikino aplanko failų sistema nemoka dirbti su dideliais failais."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
-"Atsiųstų failų aplanko failų sistema nemoka dirbti su dideliais failais."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Atsiunčiama %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Failas %s jau yra atsiunčiamų failų sąraše"
 
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Failas %s jau buvo atsiųstas"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Failas %s jau yra atsiunčiamų failų sąraše"
-
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Nepavyko konvertuoti magnet nuorodos į eD2k: %s"
-
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Nežinomas protokolas arba nuoroda: %s"
-
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Klaidinga eD2k nuoroda! KLAIDA: %s"
-
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Įvykdyti <str> ir baigti darbą."
-
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Neteisingas IP formatas. Naudokite xxx.xxx.xxx.xxx:xxxx formą\n"
-
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:86
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Šiai komandai reikia kintamojo. Tinkami kintamieji: „all“ (viskas), failo "
-"pavadinimas arba skaičius.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Apdorojama pagal maišos f-jos reikšmę: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Apdorojama pagal failo pavadinimą: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Šiai komandai reikia kintamojo. Tinkami kintamieji: failo maišos f-jos "
-"reikšmė.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Neteisingas skaičius\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Neteisinga maišos funkcija (turi būti 32 simbolių dydžio)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Užduotis įvykdyta sėkmingai."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Nepavyko įvykdyti prašymo. Gauta klaida: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "IP klientų filtras %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "Išjungta"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "Įjungta"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "IP serverių filtras %s.\n"
+"Inicializuoti iš \n"
+"žinomų klientų"
 
-#: src/TextClient.cpp:664
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Dabartinis IP filtro lygmuo %d.\n"
+msgid "Nodes (%u)"
+msgstr "Mazgai (%u)"
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Spartos apribojimai: išs: %u kB/s, ats: %u kB/s.\n"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Klaidingas inicializavimo IP"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Klaidingas inicializavimo prievadas"
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "Prisijungta prie %s %s %s"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Prašome užpildyti visus privalomus laukus"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "žemas ID"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Ar tikrai norite atsisiųsti naują nodes.dat failą?\n"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "aukštas ID"
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr ""
+"Atsiuntus naują node.dat failą bus pašalinti dabartiniai mazgai ir bus iš "
+"naujo prisijungta prie Kademlia tinklo."
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Jungiamasi"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Tęsti?"
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Neprisijungta"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: ieškomas žodis pernelyg trumpas"
 
-#: src/TextClient.cpp:723
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+msgid "Keyword for search: %s"
 msgstr ""
-"\n"
-"Atsiuntimai:\t%s"
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
-"\n"
-"Išsiuntimai:\t%s"
 
-#: src/TextClient.cpp:729
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Klientai eilėje:\t%d\n"
 
-#: src/TextClient.cpp:732
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Nuskaitytas %u Kad kontaktas"
+msgstr[1] "Nuskaityti %u Kad kontaktai"
+msgstr[2] "Nuskaityta %u Kad kontaktų"
+
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Iš viso šaltinių:\t%d\n"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Paieškos rezultatų kiekis: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "Planuojama atlikti – rodyti paieškos progreso indikatorių"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Gautas nelauktas atsakymas iš serverio, OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Rodyti trumpą būklės informaciją."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr ""
-"Rodyti ryšio būklę, dabartinę išsiuntimo ir atsiuntimo spartą ir pan.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Rodyti išsamų statistikos medį."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Įrašytas %d Kad kantaktas"
+msgstr[1] "Įrašyti %d Kad kantaktai"
+msgstr[2] "Įrašyta %d Kad kantaktų"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Šiai komandai gali būti duotas kintamasis – skaičius nuo 0 iki 255. Šis \n"
-"kintamasis nurodo kiek klientų programinės įrangos skirtingų versijų "
-"rodyti. \n"
-"Jei kintamojo nėra arba jo reikšmė 0, bus rodomos visos versijos "
-"(neribojama).\n"
-"Pavyzdžiui: „statistics 5“ rodys tik 5 populiariausias kiekvieno tipo "
-"kliento versijas.\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Failo pavadinimas"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Išjungti aMule."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Failo dydis"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Išjungti nutolusį programos branduolį (amule/amuled).\n"
-"Tekstinis klientas taipogi bus išjungtas, nes be branduolio jis neturi "
-"jokios prasmės.\n"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Platinimo santykis"
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Atnaujinti objektą."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Išsiųsta"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Atnaujinti dalinamų failų sąrašą."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Paprašyta"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Atnaujinti IP filtrų sąrašą iš failo."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Priimta"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Prisijungti prie tinklo."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Pilni šaltiniai"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Bus prisijungta prie visų tinklų, kurie įjungti parinktyse.\n"
-"Galite pasirinktinai nurodyti serverio IP adresą ir prievadą naudodami "
-"formą\n"
-"IP:prievadas. Bus prisijungta tik prie nurodyto serverio. IP turi būti "
-"taškais\n"
-"atskirtais dešimtainiais skaičiais užrašytas IPv4 adresas arba DNS srities "
-"pavadinimas."
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Prisijungti tik prie eD2k."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Prisijungti tik prie Kademlia."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Atsijungti nuo tinklo."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Atsijungti nuo visų tinklų, prie kurių šiuo metu prisijungta.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Atsijungti tik nuo eD2k."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Atsijungti tik nuo Kademlia."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Įdėti eD2k arba magneto nuorodą į branduolį."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"Pridedama eD2k nuoroda gali būti:\n"
-"*) failo nuoroda (ed2k://|file|...); ji bus įdėta į atsiuntimų eilę;\n"
-"*) serverio nuoroda (ed2k://|server|...); ji bus įdėta į serverių sąrašą;\n"
-"*) serverių sąrašo nuoroda; šiuo atveju visi nuorodos sąrašo serveriai bus "
-"įdėti į serverių sąrašą.\n"
-"\n"
-"Magneto nuorodoje turi būti eD2k maišos f-jos reikšmė ir failo dydis.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Nurodyti parinkties reikšmę."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Nurodyti IP filtro parinktis."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Įjungti klientų ir serverių IP filtravimą."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Išjungti klientų ir serverių IP filtravimą."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Įj./išj. klientų IP filtravimą."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Įjungti klientų IP filtravimą."
 
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Išjungti klientų IP filtravimą."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Įj./išj. serverių IP filtravimą."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Įjungti serverių IP filtravimą."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Išjungti serverių IP filtravimą."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Nurodyti filtravimo lygmenį."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Filtravimo lygmenys yra skaičiai nuo 0 iki 255.\n"
-"Numatytas lygmuo 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Nurodyti spartos apribojimus."
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "Šioms komandoms reikšmės nurodomos kilobaitais per sekundę.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Nurodyti išsiuntimo spartos apribojimą."
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Nurodyti atsiuntimo spartos apribojimą."
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Pateikti parinkties reikšmę."
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Nežinoma versija"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Pateikti IP filtro parinktis."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "DĖMESIO: nepavyko atverti temos failo „%s“ skaitymui"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Pateikti klientų ir serverių IP filtro būseną."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Vykdoma maiša"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Pateikti tik klientų IP filtro būseną."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Patvirtinama"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Pateikti tik serverių IP filtro būseną."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Baigta"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Pateikti IP filtro lygmenį."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Pristabdyta"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Pateikti spartos apribojimus."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Klaidinga"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Ieškoti."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Laukiama"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"Paieškos tipas turi būti vienas iš:\n"
-"    Global\n"
-"    Local\n"
-"    Kad\n"
-"Pavyzdžiui: „search kad failas“ ieškos „failo“ Kademlia tinkle.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Turite įrašyti netuščią slaptažodį."
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Ieškoti globaliai."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Klaidingas slaptažodis, ne MD5 maiša!"
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Ieškoti vietiniame serveryje"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Ryšio klaida"
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Ieškoti Kademlia tinkle"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "Nepavyko užmegzti išorinio ryšio. Gautas tuščias atsakymas."
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Pateikti paskutinės paieškos rezultatus."
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "Išorinis ryšys: neteisingas atsakymas iš serverio. Ryšys nutrauktas."
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Pateikti ankstesnės paieškos rezultatus.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Pavyko! Užmegztas ryšys su aMule "
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Rodyti paieškos eigą."
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Pavyko! Ryšys užmegztas."
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Rodyti paieškos eigą.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Išorinis ryšys: prieiga nesuteikta"
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Pradėti atsiųsti failą"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "Išorinis ryšys: prieiga nesuteikta"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
-"Nurodykite failo numerį ankstesnės paieškos rezultate.\n"
-"Pavyzdžiui: „atsisiųsti 12“ reikš atsisiųsti failą nr. 12 iš ankstesnės "
-"paieškos rezultato.\n"
-
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Pristabdyti atsiunčiamą failą."
-
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Tęsti failo atsiuntimą."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Atšaukti failo atsiuntimą."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "KLAIDA: nepavyko klausytis TCP prievado."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Nurodyti atsiuntimo prioritetą."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "KLAIDA: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Nurodyti žemą, normalų, aukštą arba automatinį prioritetą.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "DĖMESIO: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Nurodyti žemą prioritetą."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Užverti"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Nurodyti normalų prioritetą."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Iškirpti"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Nurodyti aukštą prioritetą."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Kopijuoti"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Nurodyti automatinį prioritetą."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Įterpti"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Rodyti eiles/sąrašus."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Išvalyti"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Rodyti išsiuntimo/atsiuntimo eilę, serverių sąrašą arba dalinamus failus.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Pažymėti viską"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Rodyti išsiuntimo eilę."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Rodyti atsiuntimo eilę."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Neribojama"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Rodyti žurnalą."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule dėklo meniu"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Rodyti serverių sąrašą."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Spartos apribojimai:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Atstatyti žurnalą."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "Išs.: jokių"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Pasenusi komanda, geriau naudokite „%s“."
+msgid "UL: %u"
+msgstr "Išs.: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Ši komanda pasenusi ir ateityje gali būti pašalinta.\n"
-"Geriau naudokite „%s“.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "Ats.: jokių"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "KLAIDA: %s (%s) – %s"
+msgid "DL: %u"
+msgstr "Ats.: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "DĖMESIO: %s (%s) – %s"
+msgid "Download speed: %.1f"
+msgstr "Atsiuntimo sparta: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Naujas kliento ID yra %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "DĖMESIO: gavote žemą ID!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tLabiausiai tikėtina, kad esate už ugniasienės ar maršrutizatoriaus."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr ""
-"\tNorėdami sužinoti daugiau informacijos apsilankykite http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Išsiuntimo sparta: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Gauta nežinomo serverio informacija per trumpa!"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Kliento informacija"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Aptiktas %d naujas serveris"
-msgstr[1] "Aptikti %d nauji serveriai"
-msgstr[2] "Aptikta %d naujų serverių"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Serverių sąrašo įrašymas baigtas."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Serveris atmetė paskutinę komandą"
+msgid "Nickname: %s"
+msgstr "Slapyvardis: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Iš serverio %s gautas klaidingas paketas"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Slapyvardis nenurodytas!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Apdorojant iš serverio %s gautą paketą įvyko nežinoma klaida"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "Kliento ID: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Prisijungiant prie %s nepavyko sukurti DNS ryšio gijos"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Neprisijungta"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "Serverio IP %s (%s) nepraėjo filtro. Ryšys nebus užmezgamas."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Serverio pavadinimas: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "naudojamas protokolo slėpimas."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "Serverio IP: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Prisijungta prie %s (%s – %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Neprisijungta"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Nepavyko išsiaiškinti serverio %s DNS. Ryšys nebus užmezgamas!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): nepavyko įkelti šalies duomenų iš "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Įkeltas %d vėliavėlių paveiksliukas."
-msgstr[1] "Įkelti %d vėliavėlių paveiksliukai."
-msgstr[2] "Įkelta %d vėliavėlių paveiksliukų."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Ar tikrai norite atšaukti ir pašalinti visus failus šioje kategorijoje?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Reikalaujama patvirtinimo"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Visa kita"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Neužbaigtos"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Aktyvios"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Vaizdo failai"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Garso failai"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Supakuoti failai"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD atvaizdai"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Paveiksliukai"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Teksto failai"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Parinkite filtrą"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Įdėti kategoriją"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Keisti kategoriją"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Pašalinti kategoriją"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Failo pavadinimas"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Failo dydis"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Platinimo santykis"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Išsiųsta"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Paprašyta"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Priimta"
+msgid "TCP port: %d"
+msgstr "TCP prievadas: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Pilni šaltiniai"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP prievadas: neparuošta"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Įkeliama %s: %s"
+msgid "UDP port: %d"
+msgstr "UDP prievadas: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Skaitomas laikinų failų aplankas"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UDP prievadas: neparuošta"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Laukiama pradinės informacijos iš atsiunčiamos informacijos failo"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Keičiamas parašas: įjungta"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Kuriamas paskirties failas"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Keičiamas parašas: išjungta"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Įkeliami duomenys iš seno atsiuntimo failo (%u iš %u)"
+msgid "Uptime: %s"
+msgstr "Seanso trukmė: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Duomenų blokas įrašomas į naują atsiuntimo failą (%u iš %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Laukiama atsiuntimo failo šaltinių informacijos"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Įkeliamas atsiuntimo failas ir įrašomas naujas dalinis failas"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Įkelti dalių failus"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Būklė"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Maišos f-ja"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Laukiama..."
+msgid "Shared files: %d"
+msgstr "Dalinami failai: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (diskas: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Įrašykite aplanką, kuriame ieškoti dalinai atsiųstų failų! Paaplankiai bus "
-"irgi apieškoti."
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "Ar norite, kad sėmingai įkeltų failų pradiniai failai būtų pašalinti?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Pašalinti pradinius failus?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "baitas"
-msgstr[1] "baitai"
-msgstr[2] "baitų"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "baitas/s"
-msgstr[1] "baitai/s"
-msgstr[2] "baitų/s"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "s"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "min."
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "val."
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "dienų"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Vaizdo failai"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Supakuoti failai"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Teksto failai"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programos"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Bet kas"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Nevertinta"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Klaidinga/sugadinta"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Prasta"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Labai gera"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Gera"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Puiki"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "Viskas"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "Visa kita"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Įkeliami IP filtrai ipfilter.dat ir ipfilter_static.dat."
+msgid "Queued clients: %d"
+msgstr "Klientai eilėje: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr ""
-"Nepavyko įkelti ipfilter.dat failo „%s“, nepavyko suprasti failo formato."
+msgid "Total DL: %s"
+msgstr "Iš viso atsiųsta: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "Nepavyko įkelti ipfilter.dat failo „%s“, nepavyko atverti failo."
+msgid "Total UL: %s"
+msgstr "Iš viso išsiųsta: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Įkeltas %u IP diapazonas iš „%s“."
-msgstr[1] "Įkelti %u IP diapazonai iš „%s“."
-msgstr[2] "Įkelta %u IP diapazonų iš „%s“."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Išsiuntimo apribojimas"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u klaidingas įrašas neįkeltas."
-msgstr[1] "%u klaidingi įrašai neįkelti."
-msgstr[2] "%u klaidingų įrašų neįkelta."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Atsiuntimo apribojimas"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktyvūs ryšiai (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Slėpti aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Failo savybės"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Rodyti aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% baigta"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Baigti"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "eD2k nuoroda: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Vykdyti"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Paspauskite norėdami įdėti eD2k nuorodą į teksto valdymą atsiuntimų eilėje."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr "Įvykių žurnalas. Pilną įvykių žurnalą galite rasti Serverių kortelėje."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Įkeliama..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Naudotojų skaičius serveryje, prie kurio prisijungėte..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Naudotojų: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4620,6 +2714,10 @@
 "skaičius."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Išs.: 0,0 | Ats.: 0,0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4627,7 +2725,7 @@
 "Dabartinė vidutinė išsiuntimo ir atsiuntimo sparta. Jei įjungta papildoma "
 "parinktis skaičiai skliausteliuose nurodo išnaudojamą tarnybinį srautą."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4639,522 +2737,576 @@
 "ugniasienės), žalios rodyklės žymi, kad gavote aukštą ID (geriausia ryšio "
 "būklė)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Neprisijungta..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Dabartinis serveris."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Paieška"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Pavadinimas:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tipas"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Vietinis"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Globalus"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Failo maišos f-ja"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Papildomos parinktys"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtrai"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Failo tipas"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Bet kas"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Supakuoti failai"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Garso failai"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD atvaizdai"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Paveiksliukai"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programos"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Teksto failai"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Vaizdo failai"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Plėtinys"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Min dydis"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Baitai"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Maks dydis"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Skaičius"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filtras:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Filtruoti rezultatus"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Apversti filtrą"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Slėpti žinomus failus"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Pradėti"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Daugiau"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 "Ieškos daugiau rezultatų eD2k tinkle. Kademlia tinkle kol kas neveikia."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Sustabdyti"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Atsiųsti"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Atstatyti laukelius"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Paieškos rezultatai"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Pašalinti iš sąrašo jau atsiųstus failus"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Rodyti išsiunčiamus failus arba išsiuntimo eilę"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Naudotojai eilėje:"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Siųsti"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Išsiųsti įrašytą žinutę."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Užverti"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Pilni šaltiniai"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Baigti pokalbį ir užverti pokalbio kortelę."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Bendra"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Pilnas pavadinimas:"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "Nežinoma"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "met failas:"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Maišos f-jos reikšmė:"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Failo dydis:"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Dalinio failo būsena:"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Paskutinį kartą matytas pilnas:"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Siuntimas"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Rasti šaltiniai:"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Siunčiantys šaltiniai:"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Dalių skaičius:"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Pasiekiamos dalys:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Siuntimo sparta:"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Atsiuntimo aktyvi trukmė: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Persiųsta duomenų:"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Atsiųstas kiekis:"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Klaidų taisymo įrankis"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Dėl klaidų prarasta:"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Sutaupyta supakuojant:"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Klaidų taisymo įrankis pataisė paketų:"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Failo pavadinimai"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Pervadinti"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Išvalyti"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Įvykdyti"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Gerai"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Komentuokite ir įvertinkite failą (komentarą matys visi naudotojai)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Jei tai filmas, galite parašyti jo trukmę, siužetą, kokia kalba kalbama...\n"
-"Jei failas sugadintas, galite apie tai pranešti kitiems aMule naudotojams."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Failo kokybė"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Nevertinta"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Klaidinga/sugadinta"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Prasta"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Labai gera"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Gera"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Puiki"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "Įvertinkite failą arba praneškite kitiems, kad failas sugadintas..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Atnaujinti"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Atsiunčiama, prašome palaukti..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Dydis nežinomas"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Būtina informacija"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP adresas:"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Prievadas:"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Papildoma informacija"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Naudotojo vardas:"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Naudotojo maišos f-ja:"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Atnaujinti dalinamų failų sąrašą"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Dabartinis seansas"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Iš viso"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Gauta prašymų:"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Aktyvūs išsiuntimai:"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Įdėti"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Atsiuntimo sparta"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Dabartinė sparta"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Dabartinis vidurkis"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Seanso vidurkis"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Išsiuntimo sparta"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Ryšiai"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Aktyvūs atsiuntimai"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Aktyvūs ryšiai (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Aktyvūs išsiuntimai"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Statistikos duomenų medis"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Naudotojo vardas:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Naudotojo maišos f-ja:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Kliento programinė įranga:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Programinės įrangos versija:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP adresas:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "Naudotojo ID:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "Serverio IP:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Serverio pavadinimas:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Slėpimas:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Siuntimai naudotojui"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Dabartinis prašymas:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Vidutinė išsiuntimo sparta:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Vidutinė atsiuntimo sparta:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Išsiųsta (per šį seansą):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Atsiųsta (per šį seansą):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Išsiųsta (iš viso):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Atsiųsta (iš viso):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Reitingas"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Ats./išs. indeksas:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Saugus identifikatorius:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Reitingas (bendras):"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "Eilėje"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Reitingas eilėje:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Slapyvardis"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org – Linux Mule programa"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Įrašykite vardą, kurį matys kiti su jumis užmezgę ryšį naudotojai."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Kalba"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr ""
+"Kiek sekundžių uždelsti prieš parodant patarimą užvedus pelę ant objekto."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Naudotojo aplinkos kalba."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Įvairios parinktys"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Paleidus programą ieškoti naujesnės versijos"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Įjungus šią parinktį aMule kiekieną kartą paleidus programą patikrins ar "
 "nėra naujesnės programos versijos"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Paleidus nuleisti langą"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 "Jei ši parinktis įjungta, paleidus programą aMule langas bus iškart "
 "nuleistas žemyn."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Klausti prieš baigiant darbą"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
 msgstr ""
-"Įjungus šią parinktį prieš uždarant langą aMule paklaus ar tikrai norite "
-"baigti."
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Įjungti sistemos dėklo ženkliuką"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Ši parinktis įjungia ar išjungia sistemos dėklo ženkliuką."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Sumažinti į sisteminio dėklo ženkliuką"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5162,292 +3314,213 @@
 "Jei ši parinktis įungta, nuleidus aMule langą, programa bus sumažinta į "
 "sistemos dėklo ženkliuką, o ne į programų juostą."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Uždelsti prieš parodant patarimą (sekundėmis)"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
 msgstr ""
-"Kiek sekundžių uždelsti prieš parodant patarimą užvedus pelę ant objekto."
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Naršyklės parintys"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Parinkite naršyklę"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Nurodyta naudotojo:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Naršyklių sąraše nurodykite, kad norite naudoti Naudotojo nurodytą naršyklę "
-"ir įrašykite čia naršyklės pavadinimą."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Naršyti"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Jei įmanoma, atverti naują kortelę"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Įjungus šią parinktį, stengtis nurodytą puslapį atverti naujoje naršyklės "
 "kortelėje, o ne pagrindiniame naršyklės lange"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Vaizdo grotuvas"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Peržiūrai sukurti atsarginę kopiją"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr "Spartos apribojimai"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Išsiuntimas"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Vieno ryšio sparta"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Standartinis TCP prievadas:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Tai standartinis eD2k prievadas. Jis negali būti išjungtas."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Papildomas UDP prievadas:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr "Tai papildomas eD2k užklausų ir Kademlia tinklo prievadas"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "Išjungti"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Susieti adresą"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "UDP prievadas papildomoms serverio užklausoms (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Didžiausias šaltinių skaičius failui"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Griežtas limitas"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Ryšių skaičiaus apribojimai"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Didžiausias ryšių kiekis"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Visuotinis Plug nad Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Įjungti UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP TCP prievadas:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Pradėjus darbą prisijungti automatiškai"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Nutrūkus ryšiui prisijungti vėl"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Rodyti tarnybinį srautą"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Serverių parinktys"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Pašalinti neatsiliepiantį serverį po"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "bandymų"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Automatiškai atnaujinti serverių sąrašą paleidus programą"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Sąrašas"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Atnaujinti serverių sąrašą prisijungus prie serverio"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Atnaujinti serverių sąrašą prisijungus klientui"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Naudoti prioritetų sistemą"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Jungiantis naudoti išmoningą žemo ID tikrinimą"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Saugus jungimasis"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Automatiškai jungtis tik prie serverių iš pastovaus sąrašo"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Naudotojo įdėtiems serveriams nurodyti aukštą prioritetą"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "Įjungti klaidų tikrinimo įrankį"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
 msgstr ""
-"Klaidų tikrinimo įrankis pasitiki visomis maišos funkcijomis "
-"(nerekomenduojama)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Failus į atsiuntimo eilę įdėti pristabdytos būsenos"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Į atsiuntimo eilę įdedamiems failams nurodyti automatinį prioritetą"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Visų pirma bandyti atsiųsti pirmą ir paskutinę failo dalį"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Naujiems dalinamiems failams nurodyti automatinį prioritetą"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Išsiunčiant failus stengtis išsiųsti pilną failo dalį"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Atsiuntus failą pradėti siųsti pristabdytą failą"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Siųsti tos pačios kategorijos failą"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Įrašyti 10 šaltinių retiems failams (mažiau nei 20 šaltinių)"
-
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Disko vieta"
-
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Tikrinti disko vietą"
-
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Įjunkite, jei norite, kad aMule tikrintų laisvą vietą diske"
-
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Laisva vieta diske:"
-
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
-msgstr "Įrašykite kiek diske palikti laisvos vietos."
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2077
+#: src/muuli_wdr.cpp:1811
 msgid "Preallocate disk space for new files"
 msgstr "Naujiems failams paskirti vietą diske"
 
-#: src/muuli_wdr.cpp:2078
+#: src/muuli_wdr.cpp:1812
 msgid ""
 "For new files preallocates disk space for the whole file, thus reduces "
 "fragmentation"
@@ -5455,295 +3528,250 @@
 "Naujiems failams iš anksto paskirti vietą diske visam failui. Taip bus "
 "sumažinta fragmentacija"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Atsiųsti failai"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Laikini failai"
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Įjunkite, jei norite, kad aMule tikrintų laisvą vietą diske"
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Dalinami failai"
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
+msgstr "Įrašykite kiek diske palikti laisvos vietos."
+
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Įrašyti 10 šaltinių retiems failams (mažiau nei 20 šaltinių)"
+
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Išsiuntimai"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Naujiems dalinamiems failams nurodyti automatinį prioritetą"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(spragtelėję dešiniu klavišu dalinsitės ir gilesniais paaplankiais)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Dalintis slepiamais failais"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Grafikai"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Atnaujinimo dažnis: 5 s"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Vidurkių grafiko dydis: 100 min."
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Ryšių grafiko skalė: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Nurodykite grafikų spalvas"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Fonas"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Rėmeliai"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Dabartinė atsiuntimo sparta"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Dabartinis atsiuntimo vidurkis"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Seanso atsiuntimo vidurkis"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Dabartinė išsiuntimo sparta"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Dabartinis išsiuntimo vidurkis"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Seanso išsiuntimo vidurkis"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Aktyvūs ryšiai"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Sistemos dėklo spartos indikatorius"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Dabartiniai Kademlia mazgai"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Kademlia mazgų dabartinis vidurkis"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Kademlia mazgų seanso vidurkis"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Nurodykite spalvą"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Rodomų klientų versijų skaičius (0 – neribojama)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Kanalo talpa"
-
-#: src/muuli_wdr.cpp:2249
-#, fuzzy
-msgid "Note: These values are only used for statistics."
-msgstr ""
-"Dėmesio! Šie duomenys naudojami\n"
-"tik statistikos grafiko brėžimui."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "DĖMESIO!!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Nekeiskite šių parinkčių, nebent gerai žinote \n"
-"ką darote. Neteisingai pakeitę parinktis galite \n"
-"gerokai pasibloginti savo siuntimo spartą.\n"
-"\n"
-"aMule puikiai veikia nieko nepakeitus šiame lange."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Sudėtingesnės parinktys"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Per 5 s užmegzti ne daugiau ryšių, nei nurodyta"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Failo buferio dydis: 240000 baitai"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Išsiuntimo eilė: 5000 klientų"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Serverio ryšio atnaujinimo intervalas: išjungta"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Atsiuntimo eilės progresas"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Rodyti procentus"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Rodyti progreso juostą"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Progreso juostos išvaizda"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Plokščia"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Erdvinė"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Keičiama išvaizda"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Įjungti keičiamas išvaizdas"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Išvaizda:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- išvaizdų nėra -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Stulpelių rūšiavimas"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Automatiškai rūšiuoti failus (apkraunamas procesorius)"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
 msgstr ""
-"Įjungus šią parinktį atsiuntimo eilėje esantys failai bus rūšiuojami "
-"automatiškai"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Įvairios išvaizdos parinktys"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Rodyti greitą eD2k nuorodų mygtuką"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Rodyti papildomą informaciją kategorijų kortelėse"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Rodyti siuntimo spartą failo pavadinime"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "Rodyti siuntimo spartą failo pavadinime"
 
-#: src/muuli_wdr.cpp:2412
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2124
 msgid "Vertical toolbar orientation"
 msgstr "Mygtukus išdėstyti vertikaliai"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Prieš failo pavadinimą rodyti dalinio failo numerį"
-
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Žiniatinklio serverio parinktys"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Paleisti amuleweb pradėjus darbą"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Žiniatinklio serverio prievadas"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Įjungti UPnP prievado persiuntimą žiniatinklio serverio prievade"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Žiniatinklio serverio UPnP TCP prievadas"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Puslapio atnaujinimo periodas (sekundėmis)"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Įjungti Gzip suspaudimą"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Įjungti nepilnos prieigos naudotoją"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Plokščia"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Pilnos prieigos slaptažodis"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Erdvinė"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Nepilnos prieigos slaptažodis"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "www šablonas"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr ""
+"Įjungus šią parinktį atsiuntimo eilėje esantys failai bus rūšiuojami "
+"automatiškai"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Išorinio ryšio parinktys"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Priimti išorinius ryšius"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
-"Klausančio įrenginio IP \n"
-"(jei tuščia – bet koks IP)"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5751,75 +3779,116 @@
 "Įrašykite išorinių ryšių besiklausančio įrenginio IP adresą a.b.c.d forma. "
 "Tuščias laukelis arba adresas 0.0.0.0 reiškia bet kokį įrenginį."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP prievadas"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "EC prievade įjungti UPnP prievadų perdavimą"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Slaptažodis"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Žiniatinklio serverio parinktys"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "www šablonas"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Pilnos prieigos slaptažodis"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Įjungti nepilnos prieigos naudotoją"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Nepilnos prieigos slaptažodis"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Puslapio atnaujinimo periodas (sekundėmis)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Įjungti Gzip suspaudimą"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "Gerai"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Patvirtinti naujai nurodytas parinktis."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Atšaukti bet kokius pakeitimus."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Pavadinimas:"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Komentaras:"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Atsiųstų failų aplankas:"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Keisti naujai priskirtų failų prioritetą:"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "Nekeisti"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Nurodykite dabartinės kategorijos spalvą:"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Užmezgus ryšį su serveriu rodyti serverio pranešimą..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Serverio informacija"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Perkrauti"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Išvalyti įvykių žurnalą."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule žurnalas"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Paspaudę šį mygtuką atnaujinsite serverių sąrašą iš URL..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Serverių sąrašas"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5827,43 +3896,55 @@
 "Įrašykite server.met failo URL ir paspaudę mygtuką kairėje atnaujinsite "
 "serverių sąrašą."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Įdėti serverį rankiniu būdu: pavadinimas"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Įrašykite serverio pavadinimą"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:prievadas"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Įrašykite serverio IP adresą naudodami a.b.c.d formą."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Įrašykite serverio prievadą."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Įdėti serverį (prieš tai užpildykite laukelius kairėje)..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule žurnalas"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Serverio informacija"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "ED2K informacija"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kademlia informacija"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Spragtelėję šį mygtuką atnaujinsite mazgų sąrašą iš URL..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Mazgai (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5871,51 +3952,57 @@
 "Įrašykite nodes.dat failo URL ir paspaudę mygtuką kairėje atnaujinsite mazgų "
 "sąrašą."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Mazgų statistika"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Inicializavimas"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Naujas mazgas"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Prievadas:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+#, fuzzy
+msgid "Bootstrap from known clients"
 msgstr ""
 "Inicializuoti iš \n"
 "žinomų klientų"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Atjungti Kademlia"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2k informacija"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Naudoti saugų kliento atpažinimą"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Rekomenduojama įjungti šią parinktį. Jei išjungsite, negausite kreditų."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Protokolo slėpimas"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Įjungti protokolo slėpimą"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5923,11 +4010,11 @@
 "Ši parinktis įjungia protokolo slėpimą. Tuomet aMule priiminės slepiamus "
 "ryšius iš kitų klientų."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Slėpti išeinančius ryšius"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5935,11 +4022,11 @@
 "Įjungus šią parinktį aMule, jungdamasi prie kitų klientų ar serverių, slėps "
 "išeinančius ryšius."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Priimti tik slepiamus ryšius"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5947,83 +4034,79 @@
 "Įjungus šią parinktį aMule priims tik slepiamus ryšius. Šaltinių bus rasta "
 "mažiau, bet visas srautas bus slepiamas"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Failų parinktys"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Visi"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Niekas"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Kas gali matyti dalinamus failus:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Nurodykite kas gali pamatyti dalinamų failų sąrašą."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP filtravimas"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtruoti klientus"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Įjungti klientų IP adresų filtravimą, aprašytą ~/.aMule/ipfilter.dat faile."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtruoti serverius"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Įjungti serverių IP adresų filtravimą, aprašytą ~/.aMule/ipfilter.dat faile."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Atnaujinti sąrašą"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Atnaujinti IP adresų sąrašą iš ~/.aMule/ipfilter.dat failo"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Atnaujinti dabar"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Automatiškai įkelti IP filtrą paleidus programą"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Filtravimo lygmuo:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Visuomet filtruoti LAN IP adresus"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranojiškai elgtis su neatitikusiais IP adresais"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6031,33 +4114,22 @@
 "Atmesti paketą, jei kliento IP adresas skiriasi nuo paketo šaltinio IP "
 "adreso. Naudoti atsargiai."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Jei įjungtas, naudoti ipfilter.dat failą visoje sistemoje"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
 msgstr ""
 "Jei nėra vietinio ipilter.dat failo, naudoti ipfilter.dat visoje sistemoje."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Naudoti saugų kliento atpažinimą"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Rekomenduojama įjungti šią parinktį. Jei išjungsite, negausite kreditų."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Įjungti keičiamą parašą"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6065,813 +4137,1279 @@
 "Įjungus šią parinktį bus įrašomas keičiamo parašo failas, kurį galite "
 "naudoti kitoje programoje parašų kūrimui ir pan."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Atnaujinimo dažnis (sekundėmis):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Keičiamo parašo atnaujinimo dažnis sekundėmis."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Keičiamo parašo aplankas:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr "Nurodykite aplanką, kuriame yra keičiamo parašo failas."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Įjungti/išjungti"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtruoti gaunamas žinutes (išskyrus dabartinį pokalbį):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Filtravimo parinktys:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtruoti visas žinutes"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtruoti žinutes nuo naudotojų, nesančių draugų sąraše"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtruoti žinutes nuo nežinomų klientų"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtruoti žinutes turinčias tekstą („,“ naudokite kaip skirtuką):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "Įrašykite žodžius, kurių aMule ieškos žinutės tekste ir filtruos žinutę"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Komentarai"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtruoti komentarus, turinčius (atskirkite kableliu):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Automatiškai prijungti serverį be atstovaujančio serverio"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Įjungti autentifikavimą"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Įjungti ar išjungti naudotojo vardo ir slaptažodžio autentifikavimą"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr ""
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Naudotojo vardas prisijungimui prie atstovaujančio serverio"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Slaptažodis:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Slaptažodis prisijungimui prie atstovaujančio serverio"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Įjungti atstovaujančius serverius"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Įjungti ar išjungti atstovaujančius serverius"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Serverio tipas:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Atstovaujančio serverio, prie kurio jungsitės, tipas"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Serverio mazgas:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Atstovaujančio serverio mazgo pavadinimas"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Serverio prievadas:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Atstovaujančio serverio prievadas"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Autentifikavimas"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Įjungti autentifikavimą"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Įjungti ar išjungti naudotojo vardo ir slaptažodžio autentifikavimą"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Naudotojo vardas prisijungimui prie atstovaujančio serverio"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Slaptažodis:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Slaptažodis prisijungimui prie atstovaujančio serverio"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Automatiškai prijungti serverį be atstovaujančio serverio"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Prijungti prie:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Prisijungti prie nutolusios aMule"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Naudotojo vardas"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Įsiminti parinktis"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Įjungti išsamų klaidų taisymo žurnalą."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Žinučių kategorijos:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Laukiama..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Įdėti failus"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Pažymėtas bandyti iš naujo"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Pašalinti pažymėtas"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Įvykių tipai"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Aktyvūs išsiuntimai:"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Slėpti dalinamus failus"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Parinkite filtrą"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Aktyvūs išsiuntimai"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Rodyti klientus"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Atnaujinti sąrašą"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Atnaujinti dalinamų failų sąrašą"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Siųsti"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Išsiųsti įrašytą žinutę."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Baigti pokalbį ir užverti pokalbio kortelę."
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Prisijungti prie bet kurio serverio ir/ar Kademlia tinklo"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Tinklo langas"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Dalinami failai"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Paieškos langas"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Išjungta [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Failų siuntimo langas"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "baitas"
+msgstr[1] "baitai"
+msgstr[2] "baitų"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Dalinamų failų langas"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Žinučių langas"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Statistikos grafikų langas"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Parinkčių langas"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nauja kategorija"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Nurodykite atsiųstų failų aplanką"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Nurodykite kategorijos pavadinimą!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "baitas/s"
+msgstr[1] "baitai/s"
+msgstr[2] "baitų/s"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Nurodykite kategorijos kelią!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "s"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "min."
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "val."
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "dienų"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "Viskas"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "Visa kita"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Neužbaigtos"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Sustabdyta"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Vaizdo failai"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Supakuoti failai"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Teksto failai"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Aktyvios"
+
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
 msgstr ""
-"Nepavyko sukurti atsiųstų failų aplanko šiai kategorijai. Nurodykite "
-"teisingą kelią!"
 
-#: src/ExternalConnector.cpp:141
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Nežinomas plėtinys %s (komandai %s).\n"
+msgid "Importing %s: %s"
+msgstr "Įkeliama %s: %s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Skaitomas laikinų failų aplankas"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Laukiama pradinės informacijos iš atsiunčiamos informacijos failo"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Kuriamas paskirties failas"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Nežinoma komanda %s.\n"
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Įkeliami duomenys iš seno atsiuntimo failo (%u iš %u)"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Ši komanda neturi kintamųjų.\n"
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Duomenų blokas įrašomas į naują atsiuntimo failą (%u iš %u)"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Šiai komandai reikia kintamojo.\n"
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Laukiama atsiuntimo failo šaltinių informacijos"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Įkeliamas atsiuntimo failas ir įrašomas naujas dalinis failas"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Įkelti dalių failus"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Būklė"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Maišos f-ja"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (diskas: %s)"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Ši komanda nebaigta, naudokite vieną iš plėtinių žemiau.\n"
+"Įrašykite aplanką, kuriame ieškoti dalinai atsiųstų failų! Paaplankiai bus "
+"irgi apieškoti."
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
-"\n"
-"Galimi plėtiniai:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "Ar norite, kad sėmingai įkeltų failų pradiniai failai būtų pašalinti?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Galimos komandos:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Pašalinti pradinius failus?"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "KLAIDA: nepavyko sukurti dalių failo"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Visoms komandoms svarbu raidžių dydis.\n"
-"Įrašę „%s <komanda>“ gausite išsamią informaciją apie <komandą>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Bandoma įkelti met failo atsarginę kopiją iš %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Baigti programos darbą."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "KLAIDA: nepavyko atverti part.met failo: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Rodyti pagalbą."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "KLAIDA: part.met failo dydis yra 0: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
-"Įrašę „help <komanda>“ gausite išsamią informaciją apie <komandą>.\n"
-"Įrašę „help“ gausite pilną komandų sąrašą.\n"
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr ""
+"KLAIDA: %s (%s) yra sugadintas (blogas žymių skaičius), failo įkelti "
+"nepavyks."
+
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Įrašę „%s“ gausite komandų sąrašą\n"
-"\n"
+"KLAIDA: %s (%s) yra sugadintas (blogas žymių skaičius), failo įkelti "
+"nepavyks."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Sintaksės klaida!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Bandoma atstatyti failo informaciją..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"Apdorojant komandą įvyko klaida! To neturėjo niekada atsitikti! Prašome "
-"pranešti apie klaidą\n"
+"Atstatomas failas be pavadinimo. Atstačius jis bus pavadintas RecoveredFile."
+"dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Ši komanda negali turėti parametrų."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "Atstatyta visa įmanoma failo informacija – bandoma naudoti failą..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Ši komanda privalo turėti parametrą."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Nepavyko atstatyti failo informacijos :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Klaidingas kintamasis."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Nepavyko atverti %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Komanda neužbaigta."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "DĖMESIO: %s gali būti sugadintas (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Įrašę „%s“ gausite išsamesnę pagalbą.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "KLAIDA: įrašant dalių failą įvyko klaida: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "KLAIDA: įrašant dalių failą įvyko klaida: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Tai %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Nepavyko apskaičiuoti „%s“ dydžio – naudojamas %s failas."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Tai %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "%s failo dydis kažkodėl yra 0 – naudojamas %s failas."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Failui %s nepavyko įrašyti part.met.seeds failo"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Įrašytas %i platinantis šaltinis dalių failui %s (%s)"
+msgstr[1] "Įrašyti %i platinantys šaltiniai dalių failui %s (%s)"
+msgstr[2] "Įrašyta %i platinančių šaltinių dalių failui %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Dalių failas %s (%s) neturi platinančių šaltinių failo"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Dalių failo %s (%s) platinančių šaltinių failas yra tuščias"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr ""
+"Nuskaitant dalių failo platinančių šaltinių failą įvyko klaida (%s – %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Aptikta klaidinga dalis (%d) %d dalies faile %s – failo rezultatų maišos f-"
+"ja |%s| failo maišos f-ja |%s|"
+msgstr[1] ""
+"Aptikta klaidinga dalis (%d) %d dalių faile %s – failo rezultatų maišos f-ja "
+"|%s| failo maišos f-ja |%s|"
+msgstr[2] ""
+"Aptikta klaidinga dalis (%d) %d dalių faile %s – failo rezultatų maišos f-ja "
+"|%s| failo maišos f-ja |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Aptikta baigta dalis (%i) %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Baigtas maišos f-jos reikšmės perskaičiavimas %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Baigiant siųsti %s įvyko netikėta klaida. Failas pristabdytas"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Atsiųsta: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Šalinamas failas: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Kuriamas klientas...\n"
+"DĖMESIO: atsiųstai daliai nepavyko apskaičiuoti maišos funkcijos – %s maišos "
+"reikšmės nebaigtos"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Darbas baigiamas %s...\n"
+"DĖMESIO: atsiųstai daliai nepavyko apskaičiuoti maišos funkcijos – %s maišos "
+"reikšmės nebaigtos. Tokių dalykų neturi būti"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Nurodžius tuščią slaptažodį prisijungti nepavyks.\n"
-"Nurodykite slaptažodį parinkčių faile,\n"
-"komandų eilutėje arba įrašykite paklausus.\n"
-"\n"
-"Darbas baigiamas...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Rodyti šį pagalbos tekstą."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "Dėmesio: diske nepakanka laisvos vietos! Failas pristabdomas: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Mazgas, kuriame paleista aMule. Numatyta: localhost"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Atsiųsta sugadinta %i dalis: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "aMule išorinių ryšių prievadas. Numatyta: 4712"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr ""
+"Klaidų taisymo įrankis: atstatyta sugadinta dalis %i %s –> išgelbėta %s baitų"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Išorinių ryšių slaptažodis."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Paskiriama vieta"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Nuskaityti parinktis iš failo."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Nepakanka laisvos vietos"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Nepateikti išvesties į stdout įrenginį."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Atsiųsta"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Rodyti išsamius pranešimus, negi klaidų taisymo pranešimus."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "KLAIDA: nepavyko atverti dalių failo „%s“"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Nurodyti programos kalbą."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Numatyta"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Komandų eilutės parinktis įrašyti į parinkčių failą."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albanų"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Sukurti parinkčių failą pagal aMule parinkčių failą."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabų"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Atspausdinti programos versiją."
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "Estų"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Kreditų failas įkeltas, rastas %u žinomas klientas"
-msgstr[1] "Kreditų failas įkeltas, rasti %u žinomi klientai"
-msgstr[2] "Kreditų failas įkeltas, rasta %u žinomų klientų"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Baskų"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] "– %u kliento kreditai nebegalioja!"
-msgstr[1] "– %u klientų kreditai nebegalioja!"
-msgstr[2] "– %u klientų kreditai nebegalioja!"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgarų"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Nerasta cryptkey.dat failo. Failas kuriamas."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Katalonų"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"KLAIDA: aMule tarnyba negali būti naudojama jei išoriniai ryšiai yra "
-"išjungti. Norėdami įjungti išorinius ryšius arba naudokite normalią aMule, "
-"arba paleiskite amuled su parametru --ec-config, arba faile ~/.aMule/amule."
-"conf nustatykite parametro „AcceptExternalConnections“ reikšmę lygią 1."
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Kinų (supaprastinta)"
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "KLAIDA: %s"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Kinų (tradicinė)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Atblokuoti"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Rodyti išsiunčiamus failus"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Rodyti laukiančius eilėje"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Kroatų"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Rodyti klientus"
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Čekų"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Parinkti vaizdą"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Programinė įranga"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Laukė"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Išsiuntimo trukmė"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Išsiųsta/Atsiųsta"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Danų"
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Būsena"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Olandų"
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "Eilės reitingas: %u"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Anglų (DB)"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Failo prioritetas"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estų"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Įvertinimas"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Suomių"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Prašė"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Prancūzų"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Paskutinį kartą matytas"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galisijos"
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Atsistojo į eilę"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Vokiečių"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Išsiuntimo būsena"
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Graikų"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Išsiųsta"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Žydų"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Atsiuntimo būsena"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Vengrų"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Atsiųsta"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italų"
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Naudotojo maišos f-ja"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Šifruotas"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italų (Šveicarijos)"
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Slėpti dalinamus failus"
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japonų"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Kliento savybės"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Korėjiečių"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Įjungta"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lietuvių"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Palaikoma"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvegų (naujoji norvegų)"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Nepalaikoma"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Lenkų"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Išjungta"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugalų"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugalų (Brazilijos)"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Neužbaigta"
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Rusų"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Kenkėjas"
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Slovėnų"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Praėjo patikrinimą"
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Ispanų"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Nepasiekiama"
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Švedų"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (Eilės reitingas: %u)"
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turkų"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
 msgstr ""
-"Apatinė dydžio riba turi būti mažesnė už viršutinę dydžio ribą. Įvestos "
-"viršutinės ribos nebus paisoma."
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Dėmesio"
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Kalba"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Neribojama"
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule dėklo meniu"
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "Nėra"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Spartos apribojimai:"
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "Išs.: jokių"
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "Išs.: %u"
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
+"TCP prievadas negali būti didesnis nei 65532, nes serverio UDP prievadas yra "
+"TCP+3"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "Ats.: jokių"
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
+msgstr "Bus naudojamas numatytas prievadas (%d)"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/Preferences.cpp:1790
 #, c-format
-msgid "DL: %u"
-msgstr "Ats.: %u"
+msgid "Dropping non-existing shared directory: %s"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Kanalas"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Aplankai"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Serveriai"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Failai"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Saugumas"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Atstovaujantis serveris"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Nutolęs valdymas"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Keičiamas parašas"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Įvykiai"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Taisymas"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Nekeiskite šių parinkčių, nebent gerai žinote \n"
+"ką darote. Neteisingai pakeitę parinktis galite \n"
+"gerokai pasibloginti savo siuntimo spartą.\n"
+"\n"
+"aMule puikiai veikia nieko nepakeitus šiame lange."
+
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Atsiuntimo sparta: %.1f"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Išsiuntimo sparta: %.1f"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Kliento informacija"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Atstovaujančio serverio, prie kurio jungsitės, tipas"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:534
 #, c-format
-msgid "Nickname: %s"
-msgstr "Slapyvardis: %s"
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Slapyvardis nenurodytas!"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"Kad įsigaliotų šie pakeitimai, aMule reikia paleisti iš naujo:\n"
+"\n"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "Kliento ID: "
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "– pakeistas TCP prievadas.\n"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Serverio pavadinimas: "
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "– pakeistas UDP prievadas.\n"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "Serverio IP: "
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Išorinis ryšys nutrauktas."
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Naujas išorinis ryšys priimtas"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Išorinis ryšys nutrauktas."
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Įjungėte išorinius ryšius, bet parinktyse nenurodėte slaptažodžio.\n"
+"Kol nenurodysite slaptažodžio, išoriniai ryšiai nebus įjungti."
+
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "– kalba pakeista.\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "– laikinų failų aplankas pakeistas.\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+#, fuzzy
+msgid "- ED2K network enabled.\n"
+msgstr "Visi tinklai išjungti."
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Tiek eD2k, tiek Kademlia tinklai yra išjungti.\n"
+"Norėdami prisijungti įjunkite bent vieną iš šių tinklų."
+
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Nepavyks prisijungti prie Kademlia tinklo, nes išjungtas UDP prievadas.\n"
+"Arba įjunkite UDP prievadą, arba išjunkite Kademlia tinklą."
+
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Būtina paleisti aMule iš naujo.\n"
+"Jei dabar pat neperleisite aMule, nesiskųskite jei kas nors bus ne taip.\n"
+
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Automatiškai atnaujinamų serverių sąrašas tuščias.\n"
+"Įrašykite bent vieną server.met failo URL.\n"
+"Norėdami įrašyti URL, paspauskite mygtuką „Sąrašas“."
+
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Laikini failai"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Atsiųsti failai"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Keičiami parašai"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "TCP port: %d"
-msgstr "TCP prievadas: %d"
+msgid "Choose a folder for %s"
+msgstr "Parinkite aplanką %s"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "TCP prievadas: neparuošta"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Parinkite video grotuvą"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Parinkite naršyklę"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "UDP port: %d"
-msgstr "UDP prievadas: %d"
+msgid "Executable%s"
+msgstr "Vykdomas failas %s"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "UDP prievadas: neparuošta"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Keisti serverių sąrašą"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Keičiamas parašas: įjungta"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Įrašykite server.met failų URL.\n"
+"Vieną URL vienoje eilutėje."
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Keičiamas parašas: išjungta"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Atnaujinimo intervalas: %d s"
+msgstr[1] "Atnaujinimo intervalas: %d s"
+msgstr[2] "Atnaujinimo intervalas: %d s"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "Shared files: %d"
-msgstr "Dalinami failai: %d"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Vidurkių grafiko trukmė: %d min."
+msgstr[1] "Vidurkių grafiko trukmė: %d min."
+msgstr[2] "Vidurkių grafiko trukmė: %d min."
 
-#: src/MuleTrayIcon.cpp:469
+#: src/PrefsUnifiedDlg.cpp:1127
 #, c-format
-msgid "Queued clients: %d"
-msgstr "Klientai eilėje: %d"
+msgid "Connections Graph Scale: %d"
+msgstr "Ryšių grafiko mastelis: %d"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "Total DL: %s"
-msgstr "Iš viso atsiųsta: %s"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Failų buferio dydis: %d baitas"
+msgstr[1] "Failų buferio dydis: %d baitai"
+msgstr[2] "Failų buferio dydis: %d baitų"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Total UL: %s"
-msgstr "Iš viso išsiųsta: %s"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Išsiuntimo eilės dydis: %d klientas"
+msgstr[1] "Išsiuntimo eilės dydis: %d klientai"
+msgstr[2] "Išsiuntimo eilės dydis: %d klientų"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Išsiuntimo apribojimas"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Serverio ryšio atnaujinimo intervalas: %d min."
+msgstr[1] "Serverio ryšio atnaujinimo intervalas: %d min."
+msgstr[2] "Serverio ryšio atnaujinimo intervalas: %d min."
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Atsiuntimo apribojimas"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Serverio ryšio atnaujinimo intervalas: išjungta"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Slėpti aMule"
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "Išjungti"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Rodyti aMule"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "Įvykus „%s“ įvykiui įvykdyti komandą"
 
-#: src/ChatSelector.cpp:127
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Įjungti komandos vykdymą branduolyje"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Branduolio komanda:"
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Įjungti komandos vykdymą grafinėje aplinkoje"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Grafinės aplinkos komanda:"
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Šie kintamieji bus pakeisti:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+"Apatinė dydžio riba turi būti mažesnė už viršutinę dydžio ribą. Įvestos "
+"viršutinės ribos nebus paisoma."
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Dėmesio"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Pagrindinė"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kademlia paieška negalima, jei nepaleista Kademlia tarnyba"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "eD2k paieška negalima, jei eD2k tarnyba neužmezgė ryšio"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Vykdant Kademlia paiešką įvyko netikėta klaida: "
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "Failo ID"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Failas"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Atsiunčiamą failą įdėti į kategoriją"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Šiam failui įdėti papildomus URL"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Ieškoti panašių failų (eD2k, vietiniame serveryje)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Pažymėti failą kaip jau žinomą"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Kopijuoti eD2k nuorodą į talpyklę"
+
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Atšaukti"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr ""
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Nepavyko prisijungti nei prie vieno iš slepiamų serverių sąraše. Bandoma dar "
+"kartą neslepiant."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"Nepavyko prisijungti nei prie vieno iš serverių sąraše. Bandoma dar kartą."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "eD2k tinklas išjungtas parinktyse, nebus jungiamasi."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "Serverių sąraše nerasta tinkamų serverių įrašų"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Pokalbis pradėtas: %s (%s:%u) – %s %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Prisijungta prie %s (%s:%i)"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Prisijungta prie kliento ***"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Prisijungta: %s"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Jungiamasi prie kliento ***"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Bandant prisijungti įvyko kritinė klaida. Gali būti, kad nėra interneto ryšio"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Nepavyko prisijungti prie kliento arba ryšys nutrūko ***"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Ryšys nutrūko %s (%s:%i)"
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Užverti kortelę"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) neatsako, galbūt išjungtas."
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Užverti visas korteles"
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) pilnas."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Užverti kitas korteles"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Po %d sekundės bus bandoma prisijungti prie serverio automatiškai"
+msgstr[1] "Po %d sekundžių bus bandoma prisijungti prie serverio automatiškai"
+msgstr[2] "Po %d sekundžių bus bandoma prisijungti prie serverio automatiškai"
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Ryšys nutrūko"
+
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Prisijungti prie %s (%s:%i) nepavyko."
+
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "KLAIDA: neteisingas lizdas (socket) baigiantis laiko limitui"
+
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Baigėsi bandymo susijungti laikas %s (%s:%i)."
+
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr ""
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Įkeliamas server.met failas: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Nepavyko aptikti server.met failo!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Nepavyko įkelti server.met failo %s, aptikto failo formatas nesuprantamas."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Nepavyko atverti failo server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Failas server.met sugadintas, aptiktas klaidingas versijos įrašas: 0x%x, "
 "dydis %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
@@ -6879,7 +5417,7 @@
 msgstr[1] "server.met faile rasti %i serveriai"
 msgstr[2] "server.met faile rasta %i serverių"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
@@ -6887,27 +5425,36 @@
 msgstr[1] "%d serveriai įdėti"
 msgstr[2] "%d serverių įdėta"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "Nuskaitant known.met failą įvyko IO klaida: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Serveris neįdėtas: [%s:%d] nurodytas klaidingas prievadas."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Serveris neįdėtas: [%s:%d] IP adresas klaidingas arba nepraėjo filtro."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr "Serveris neįdėtas: [%s:%d] toks serveris jau yra."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Serveris įdėtas: [%s:%d] pavadinimas %s."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6915,25 +5462,25 @@
 "Prie serverio, kurį norite pašalinti, esate šiuo metu prisijungę. Norėdami "
 "pašalinti serverį, iš pradžių turite atsijungti."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Nepavyko atverti %s"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Nepavyko įrašyti server.met failo!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Klaidingas URL"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
 msgstr "Sėkmingai atsiųstas serverių sąrašas iš %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Nepavyko iš %s atsiųsti serverių sąrašo"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6941,334 +5488,2368 @@
 "Faile „addresses.dat“ nerasta serverių sąrašo įrašų. Norėdami automatiškai "
 "atnaujinti sąrašą į šį failą įkelkite teisingą serverių sąrašo adresą."
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Atsiųsti serverių sąrašą iš %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "DĖMESIO: automatiškam serverių sąrašo atnaujinimui pateiktas neteisingas "
 "URL: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 "Faile addresses.dat nerasta nei vieno teisingo server.met failo automatinio "
 "atsiuntimo URL"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Nepavyko iš %s atsiųsti serverių sąrašo"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr ""
 "Vietinis serveris filtruojamas IP filtro, jungiamasi prie kito serverio!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Nepavyko įvykdyti komandos „%s„ įvykiui „%s“."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Serverio pavadinimas"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Adresas"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Prievadas"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Aprašymas"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping trukmė"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Naudotojų skaičius"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Statiškas"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versija"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Pasikeitus parinktims aplinkos kalba buvo pakeista į sistemoje numatytą "
-"kalbą."
+"Prie serverio, kurį norite pašalinti, esate šiuo metu prisijungę. Norėdami "
+"pašalinti serverį, iš pradžių turite atsijungti. Serveris kol kas "
+"nepašalintas."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(pavadinimas nežinomas)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Ar tikrai norite pašalinti šį statišką serverį %s"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Serveriai (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Serveris"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Prisijungti prie serverio"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Pažymėti, kad serveris statiškas"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Pažymėti, kad serveris nestatiškas"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Pažymėti, kad serveriai statiški"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Pažymėti, kad serveriai nestatiški"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Pašalinti serverį"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Pašalinti serverius"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Pašalinti visus serverius"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopijuoti eD2k nuorodas į talpyklę"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Prisijungti prie serverio iš naujo"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Ar tikrai norite pašalinti visus serverius?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Ar tikrai norite pašalinti pažymėtą serverį?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Ar tikrai norite pašalinti pažymėtus serverius?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "KLAIDA: %s (%s) – %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "DĖMESIO: %s (%s) – %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Naujas kliento ID yra %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "DĖMESIO: gavote žemą ID!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tLabiausiai tikėtina, kad esate už ugniasienės ar maršrutizatoriaus."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
 msgstr ""
-"Serverių sąraše nėra nei vieno serverio.\n"
-"Ar pageidaujate, kad aMule dabar atsiųstų naują sąrašą?"
+"\tNorėdami sužinoti daugiau informacijos apsilankykite http://wiki.amule.org"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Serverių sąrašo siuntimas"
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Gauta nežinomo serverio informacija per trumpa!"
 
-#: src/amule.cpp:846
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "web server running on pid %d"
-msgstr "žiniatinklio serverio pid yra %d"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Aptiktas %d naujas serveris"
+msgstr[1] "Aptikti %d nauji serveriai"
+msgstr[2] "Aptikta %d naujų serverių"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Serverių sąrašo įrašymas baigtas."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Serveris atmetė paskutinę komandą"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Iš serverio %s gautas klaidingas paketas"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Apdorojant iš serverio %s gautą paketą įvyko nežinoma klaida"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Prisijungiant prie %s nepavyko sukurti DNS ryšio gijos"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "Serverio IP %s (%s) nepraėjo filtro. Ryšys nebus užmezgamas."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "naudojamas protokolo slėpimas."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Prisijungta prie %s (%s – %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Nepavyko išsiaiškinti serverio %s DNS. Ryšys nebus užmezgamas!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Serveris neįdėtas: nenurodytas IP adresas arba mazgo pavadinimas."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Serveris neįdėtas: nurodytas neteisingas serverio prievadas."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "eD2k būsena:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kademlia būsena:"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "Vykdoma %s sistemoje"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Dirbama"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Būsena:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Ryšio būklė:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
-"Nurodėte paleidus programą paleisti žiniatinklio serverį, bet amuleweb "
-"programos nepavyko paleisti. Įdiekite aMule žiniatinklio programos paketą "
-"arba sukompiliuokite aMule su --enable-webserver parinktimi ir paleiskite "
-"„make install“."
 
-#: src/amule.cpp:937
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "Ryšio būklė:"
+
+#: src/ServerWnd.cpp:219
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Nepavyko susieti prievadų su nurodytu adresu: %s"
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr ""
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Ugniasienės būsena:"
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Nėra draugo"
+
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "Prisijungta prie draugo"
+
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "Prisijungta prie draugo"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "Rasti šaltiniai:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr ""
+
+#: src/ServerWnd.cpp:254
+#, fuzzy
+msgid "Indexed notes:"
+msgstr "Indekso failas nerastas: "
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr ""
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Naudotojų vidurkis:"
 
-#: src/amule.cpp:964
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Failų vidurkis:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Nepaleista"
+
+#: src/SharedFileList.cpp:332
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Prievadas %u neprieinamas. Gavote žemą ID\n"
+msgid "Adding file %s to shares"
+msgstr ""
 
-#: src/amule.cpp:970
+#: src/SharedFileList.cpp:371
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Aptiktas %i dalinamas failas"
+msgstr[1] "Aptikti %i dalinami failai"
+msgstr[2] "Aptikta %i dalinamų failų"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Aptiktas %i žinomas dalinamas failai, %i nežinomų"
+msgstr[1] "Aptikti %i žinomi dalinami failai, %i nežinomų"
+msgstr[2] "Aptikta %i žinomų dalinamų failų, %i nežinomų"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "KLAIDA: bandoma dalintis %s"
+
+#: src/SharedFileList.cpp:410
+#, fuzzy, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "serveris nerastas: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
 msgstr ""
-"Prievadas %u neprieinamas!\n"
-"\n"
-"Gavote žemą ID.\n"
-"\n"
-"\n"
-"Patikrinkite sistemines tinklo parinktis ir įsitikinkite, kad nurodytas "
-"prievadas atviras tiek išsiuntimui, tiek priėmimui."
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Nepavyko sukurti keičiamo parašo failo"
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Naudotojo vardas"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Nepavyko sukurti keičiamo aMule parašo failo"
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Atsiuntimo sparta"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Išsiuntimo sparta"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Pasiekiamos dalys:"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Išsiuntimo būsena"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Atsiuntimo būsena"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Failo pavadinimas"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Dalinami failai"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Prašymai"
 
-#: src/amule.cpp:1299
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Patenkinti prašymai"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Persiųsta duomenų"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Dalinimo santykis"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Gautos dalys"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Pilni šaltiniai"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Kelias"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Įdėti komentarą/įvertinimą"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Keisti komentarą/įvertinimą"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Pervadinti"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Failus iš kolekcijos įkelti į siuntimo sąrašą"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Kopijuoti magneto &URI į talpyklę"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Kopijuoti eD2k nuorodą į talpyklę (&šaltinį)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Kopijuoti eD2k nuorodą į talpyklę (šaltinį su ši&fravimo parinktimis)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Kopijuoti eD2k nuorodą į talpyklę (&kompiuterio pavadinimą)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+"Kopijuoti eD2k nuorodą į talpyklę (kompiuterio pavadinimą su šif&ravimo "
+"parinktimis)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Kopijuoti eD2k nuorodą į talpyklę (&klaidų taisymo informaciją)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Norėdami sukurti šaltinio nuorodą, privalote turėti aukštą ID"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Dalinami failai (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[Dalių failas]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Failo pavadinimas"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Išsiųsta duomenų (per seansą (iš viso)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Tarnybinis srautas iš viso (paketai): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Tarnybinis srautas failų prašymams (paketai): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Tarnybinis srautas šaltinių apsikeitimui (paketai):%s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Tarnybinis srautas serveriams (paketai): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Kademlia tarnybinis srautas (paketai): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Šifravimo tarnybinis srautas (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Aktyvūs išsiuntimai: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Laukiantys išsiuntimai: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Iš viso sėkmingų išsiuntimų: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Iš viso nepavykusių išsiuntimų: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Vidutiniškai išsiuntimas trunka: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Atsiųsta duomenų (per seansą (iš viso)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Rasta šaltinių: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Aktyvūs atsiuntimai (dalys): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Seanso Išs./Ats. santykis (iš viso): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Vidutinė atsiuntimo sparta (seanso): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Vidutinė išsiuntimo sparta (seanso): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Didžiausia atsiuntimo sparta (seanso): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Didžiausia išsiuntimo sparta (seanso): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Ryšis pakartotinai užmegztas: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Pirmą kartą siųsta prieš: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Prisijungta prie serverio prieš: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Aktyvių ryšių skaičius (apytikriai): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Didžiausias leistinas ryšių skaičius pasiektas: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Vidutinis ryšių skaičius (apytikriai): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Daugiausia ryšių (apytikriai): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Naudotojai"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "Dydis nežinomas"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "Filtruota"
+
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "Užblokuota"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Iš viso: %i atpažinta: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Veikiantys serveriai: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Neveikiantys serveriai: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Iš viso: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Pašalinti serveriai: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Filtruoti serveriai: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Naudotojų kiekis veikiančiuose serveriuose: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Failų kiekis veikiančiuose serveriuose: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Iš viso naudotojų: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Iš viso failų: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Serverių užimtumas: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Dalinamų failų kiekis: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Bendras dalinamų failų dydis: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Vidutinis failo dydis: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Operacinė sistema"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Negauta"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktyvūs ryšiai (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Nėra"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Niekada"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr ""
+"Komanda „%s“, kurios pid „%d“, baigė darbą pranešdama būsenos kodą „%d“."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Įvykdyti <str> ir baigti darbą."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Neteisingas IP formatas. Naudokite xxx.xxx.xxx.xxx:xxxx formą\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Nurodyta lokalė jūsų kompiuteryje neįdiegta. (Dėmesio: šiaip ar taip vis "
-"tiek pabandysime naudoti nurodytą lokalę)."
+"Šiai komandai reikia kintamojo. Tinkami kintamieji: „all“ (viskas), failo "
+"pavadinimas arba skaičius.\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Apdorojama pagal maišos f-jos reikšmę: "
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Apdorojama pagal failo pavadinimą: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr ""
+"Šiai komandai reikia kintamojo. Tinkami kintamieji: failo maišos f-jos "
+"reikšmė.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Neteisingas skaičius\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Neteisinga maišos funkcija (turi būti 32 simbolių dydžio)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Vykdant užduotį įvyko nežinoma klaida."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Užduotis įvykdyta sėkmingai."
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "aMule paleista pirmą kartą %s"
+msgid "Request failed with the following error: %s"
+msgstr "Nepavyko įvykdyti prašymo. Gauta klaida: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Ši versija yra darbinė versija, atnaujinama kasdien, ir\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "IP klientų filtras %s.\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "todėl negalime garantuoti, kad ji nenulūš, nepadegs namų ar\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "Išjungta"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "nenumarins šuns. Bet šiaip ar taip ją naudoti turėtų būti saugu.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "Įjungta"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "IP serverių filtras %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Dabartinis IP filtro lygmuo %d.\n"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Spartos apribojimai: išs: %u kB/s, ats: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Prisijungta prie %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Jungiamasi"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "ugniasienė"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "gerai"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
-msgstr "Šiame leidime šios parinktys buvo pakeistos dėl saugumo sumetimų:\n"
+"\n"
+"Download:\t%s"
+msgstr ""
+"\n"
+"Atsiuntimai:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Įjungtas protokolo slėpimas įeinantiems ir išeinantiems ryšiams.\n"
+"Išsiuntimai:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Išjungtas serverių sąrašo atnaujinimas iš kitų serverių ir klientų.\n"
+"Klientai eilėje:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Norėdami sužinoti daugiau apie šių pasikeitimų priežastis, skaitykite \n"
-"apie „netikrus serverius“ aMule wiki, esančiame adresu http://wiki.amule."
-"org. \n"
-"Kad aMule veiktų korektiškai, labai svarbu, kad pašalintumėte netikrus \n"
-"serverius iš savo serverių sąrašo."
+"Iš viso šaltinių:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Paieškos rezultatų kiekis: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr ""
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Gautas nelauktas atsakymas iš serverio, OpCode = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Rodyti trumpą būklės informaciją."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr ""
+"Rodyti ryšio būklę, dabartinę išsiuntimo ir atsiuntimo spartą ir pan.\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Rodyti išsamų statistikos medį."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Šiai komandai gali būti duotas kintamasis – skaičius nuo 0 iki 255. Šis \n"
+"kintamasis nurodo kiek klientų programinės įrangos skirtingų versijų "
+"rodyti. \n"
+"Jei kintamojo nėra arba jo reikšmė 0, bus rodomos visos versijos "
+"(neribojama).\n"
+"Pavyzdžiui: „statistics 5“ rodys tik 5 populiariausias kiekvieno tipo "
+"kliento versijas.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Išjungti aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Išjungti nutolusį programos branduolį (amule/amuled).\n"
+"Tekstinis klientas taipogi bus išjungtas, nes be branduolio jis neturi "
+"jokios prasmės.\n"
+
+#: src/TextClient.cpp:859
+#, fuzzy
+msgid "Reload the given object."
+msgstr "Atnaujinti objektą."
+
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
+msgstr "Atnaujinti dalinamų failų sąrašą."
+
+#: src/TextClient.cpp:862
+#, fuzzy
+msgid "Reload IP filtering table."
+msgstr "Atnaujinti IP filtrų sąrašą iš failo."
+
+#: src/TextClient.cpp:863
+#, fuzzy
+msgid "Reload current IP filtering table."
+msgstr "Nurodyti filtravimo lygmenį."
+
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "Atnaujinti IP filtrų sąrašą iš failo."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr ""
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Prisijungti prie tinklo."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Bus prisijungta prie visų tinklų, kurie įjungti parinktyse.\n"
+"Galite pasirinktinai nurodyti serverio IP adresą ir prievadą naudodami "
+"formą\n"
+"IP:prievadas. Bus prisijungta tik prie nurodyto serverio. IP turi būti "
+"taškais\n"
+"atskirtais dešimtainiais skaičiais užrašytas IPv4 adresas arba DNS srities "
+"pavadinimas."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Prisijungti tik prie eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Prisijungti tik prie Kademlia."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Atsijungti nuo tinklo."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Atsijungti nuo visų tinklų, prie kurių šiuo metu prisijungta.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Atsijungti tik nuo eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Atsijungti tik nuo Kademlia."
+
+#: src/TextClient.cpp:877
+#, fuzzy
+msgid "Add an eD2k or magnet link to core."
+msgstr "Įdėti eD2k arba magneto nuorodą į branduolį."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
+"Pridedama eD2k nuoroda gali būti:\n"
+"*) failo nuoroda (ed2k://|file|...); ji bus įdėta į atsiuntimų eilę;\n"
+"*) serverio nuoroda (ed2k://|server|...); ji bus įdėta į serverių sąrašą;\n"
+"*) serverių sąrašo nuoroda; šiuo atveju visi nuorodos sąrašo serveriai bus "
+"įdėti į serverių sąrašą.\n"
+"\n"
+"Magneto nuorodoje turi būti eD2k maišos f-jos reikšmė ir failo dydis.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Nurodyti parinkties reikšmę."
+
+#: src/TextClient.cpp:883
+#, fuzzy
+msgid "Set IP filtering preferences."
+msgstr "Nurodyti IP filtro parinktis."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Įjungti klientų ir serverių IP filtravimą."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Išjungti klientų ir serverių IP filtravimą."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Įj./išj. klientų IP filtravimą."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Įjungti klientų IP filtravimą."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Išjungti klientų IP filtravimą."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Įj./išj. serverių IP filtravimą."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Įjungti serverių IP filtravimą."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Išjungti serverių IP filtravimą."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Nurodyti filtravimo lygmenį."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Daugiau informacijos, pagalbos ir naujausias galutines versijas rasite mūsų\n"
+"Filtravimo lygmenys yra skaičiai nuo 0 iki 255.\n"
+"Numatytas lygmuo 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Nurodyti spartos apribojimus."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "Šioms komandoms reikšmės nurodomos kilobaitais per sekundę.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Nurodyti išsiuntimo spartos apribojimą."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Nurodyti atsiuntimo spartos apribojimą."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Pateikti parinkties reikšmę."
+
+#: src/TextClient.cpp:905
+#, fuzzy
+msgid "Get IP filtering preferences."
+msgstr "Pateikti IP filtro parinktis."
+
+#: src/TextClient.cpp:906
+#, fuzzy
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Pateikti klientų ir serverių IP filtro būseną."
+
+#: src/TextClient.cpp:907
+#, fuzzy
+msgid "Get IP filtering state for clients only."
+msgstr "Pateikti tik klientų IP filtro būseną."
+
+#: src/TextClient.cpp:908
+#, fuzzy
+msgid "Get IP filtering state for servers only."
+msgstr "Pateikti tik serverių IP filtro būseną."
+
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "Nurodyti filtravimo lygmenį."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Pateikti spartos apribojimus."
+
+#: src/TextClient.cpp:913
+#, fuzzy
+msgid "Execute a search."
+msgstr "Ieškoti Kademlia tinkle"
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"svetainėje www.aMule.org arba IRC kanale #aMule serveryje irc.freenode.net.\n"
+"Paieškos tipas turi būti vienas iš:\n"
+"    Global\n"
+"    Local\n"
+"    Kad\n"
+"Pavyzdžiui: „search kad failas“ ieškos „failo“ Kademlia tinkle.\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Nesikuklinkite pranešti rastas klaidas adresu http://forum.amule.org"
+#: src/TextClient.cpp:915
+#, fuzzy
+msgid "Execute a global search."
+msgstr "Ieškoti globaliai."
+
+#: src/TextClient.cpp:916
+#, fuzzy
+msgid "Execute a local search"
+msgstr "Ieškoti vietiniame serveryje"
+
+#: src/TextClient.cpp:917
+#, fuzzy
+msgid "Execute a kad search"
+msgstr "Ieškoti Kademlia tinkle"
+
+#: src/TextClient.cpp:919
+#, fuzzy
+msgid "Show the results of the last search."
+msgstr "Pateikti paskutinės paieškos rezultatus."
+
+#: src/TextClient.cpp:920
+#, fuzzy
+msgid "Return the results of the previous search.\n"
+msgstr "Pateikti ankstesnės paieškos rezultatus.\n"
+
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "Rodyti paieškos eigą."
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "Rodyti paieškos eigą.\n"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Pradėti atsiųsti failą"
+
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"Neteisingai nurodėte keičiamo parašo aplanką!\n"
-"Keičiamas parašas bus išjungtas tol, kol pakeisite parinktis."
+"Nurodykite failo numerį ankstesnės paieškos rezultate.\n"
+"Pavyzdžiui: „atsisiųsti 12“ reikš atsisiųsti failą nr. 12 iš ankstesnės "
+"paieškos rezultato.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Pristabdyti atsiunčiamą failą."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Tęsti failo atsiuntimą."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Atšaukti failo atsiuntimą."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Nurodyti atsiuntimo prioritetą."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Nurodyti žemą, normalų, aukštą arba automatinį prioritetą.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Nurodyti žemą prioritetą."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Nurodyti normalų prioritetą."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Nurodyti aukštą prioritetą."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Nurodyti automatinį prioritetą."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Rodyti eiles/sąrašus."
+
+#: src/TextClient.cpp:950
+#, fuzzy
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Rodyti išsiuntimo/atsiuntimo eilę, serverių sąrašą arba dalinamus failus.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Rodyti išsiuntimo eilę."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Rodyti atsiuntimo eilę."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Rodyti žurnalą."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Rodyti serverių sąrašą."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Atstatyti žurnalą."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Nepavyko paskirti disko vietos failui „%s“: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Pasenusi komanda, geriau naudokite „%s“."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "KLAIDA: nepavyko atverti žurnalo failo"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Ši komanda pasenusi ir ateityje gali būti pašalinta.\n"
+"Geriau naudokite „%s“.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "DĖMESIO: žurnalas tuščias. Kažkas čia ne taip."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMule tekstinis klientas"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Žurnalas išvalytas"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr ""
+"Senos klaidų taisymo maišos reikšmės keičiamos „%s“ keičiamos 64b „%s“."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Serverio pranešimas: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr ""
+"Dėmesio: failo pavadinimas %s yra klaidingas, todėl buvo pakeistas į %s."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Nepavyko atsiųsti mazgų sąrašo."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "Dėmesio: failas %s jau yra, naujas failas pervadintas į %s."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Nepavyko atverti atsiųstos versijos tikrinimo failo"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Ar tikrai norite atšaukti ir pašalinti visus failus šioje kategorijoje?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Sugadintas versijos tikrinimo failas"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Reikalaujama patvirtinimo"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Naudojate pasenusią aMule versiją!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Per daug užmegztų ryšių"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Visa kita"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Parinkite filtrą"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Įdėti kategoriją"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Keisti kategoriją"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Pašalinti kategoriją"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Ši aMule versija yra %i.%i.%i, o naujausia versija yra %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+"Nepavyko atverti failo %s, jis bus pašalintas iš dalinamų failų sąrašo."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Naujausią versiją bet kada galima atsisiųsti iš http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Gautas prašymas nežinomo failo maišos f-jai: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "DĖMESIO: ši aMule versija yra pasenusi: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Tęsiame failos siuntimą: %s"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Naudojate naują aMule versiją."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Nutraukiamas failo siuntimas: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Nepavyko atsiųsti versijos tikrinimo failo"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Nepavyko įvykdyti komandos „%s„ įvykiui „%s“."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Atsiuntimas baigtas"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Pilnas kelias iki failo."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Failo pavadinimas (be kelio iki jo)."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "Failo eD2k maišos reikšmė."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Failo dydis baitais."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Visas atsiuntimo laikas."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Pradėtas naujas pokalbis"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Žinutės antraštė."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Trūksta laisvos vietos"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Disko skirsnis."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Baigiant siųsti failą įvyko klaida"
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Naudotojai: %s | Failai: %s"
+msgid "Processing file number %u: %s"
+msgstr "Apdorojamo failo numeris %u: %s"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr ""
+"Pageidavote dalinių maišos rezultatų (naudojamų tik didesniems nei 9,5 MB "
+"failams)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Naudotojai: eD2k: %s Kad: %s | Failai: eD2k: %s Kad: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s —> tokio failo nėra!\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Neparinktas joks tinklas"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, aMule eD2k nuorodų kūrimo įrankis"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Sveikiname!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Įvesties parametrai"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Pateikti failo maišos funkciją"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Šiam failui įdėti papildomus URL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Įrašykite failą, kuriam kursite eD2k nuorodą"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Įrašykite URL, kurį pridėsite prie eD2k nuorodos. Gale pridėjus „/“ "
+"aLinkCreator pridės dabartinio failo pavadinimą"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Pašalinti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Kurti nuorodas su dalių maišos f-jomis"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr "Nauji ir reti failai bus platinamos sparčiau, bet nuoroda taps ilgesnė"
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4 failo maišos f-ja"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k failo maišos f-ja"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k nuoroda"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Įrašyti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Kopijuoti į talpyklę"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Atverti failą ir apskaičiuoti jo eD2k nuorodą"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Kopijuoti apskaičiuotą eD2k nuorodą į talpyklę"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Įrašyti apskaičiuotą eD2k nuorodą į failą"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Apie aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Nurodykite failą, kuriam skaičiuosite eD2k nuorodą"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Kol kas nėra ką kopijuoti!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Nurodykite failą apskaičiuotai eD2k nuorodai"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Nepavyko atverti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Įrašykite failo pavadinimą"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Kol kas nėra ką įrašyti!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, aMule eD2k nuorodų kūrimo įrankis\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmap paveiksliukai iš http://www.everaldo.com, http://www.icomania.com\n"
+"ir http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Platinama pagal GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Skaičiuojamos maišos f-jos reikšmės..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Atšaukta!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Prisijungta prie %s %s"
+msgid "Done in %.2f s"
+msgstr "Atlikta per %.2f s"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Šis URL jau įdėtas!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Įrašykite URL"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "Jungiamasi prie %s"
+msgid "Unable to open %s"
+msgstr "Nepavyko atverti %s"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Atsijungta nuo eD2k"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i d. %i val. %i min. %i s"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kademlia paleista."
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02ud %02uv %02um %02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kademlia sustabdyta."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uv %02um %02us"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Prisijungta prie Kademlia"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02um %02us"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Prisijungta prie Kademlia (už ugniasienės)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Atsijungta nuo Kademlia"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, aMule dabartinė statistika"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Didžiausia ats. sparta nuo wxCas paleidimo"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Pati didžiausia ats. sparta per praeitus wxCas seasus"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistema"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Sustabdyti automatinį atnaujinimą"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Įrašyti dabartinės statistikos grafiką"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Spausdinti dabartinės statistikos grafiką"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Parinktys"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Apie wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Paleisti automatinį atnaujinimą"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Automatinis atnaujinimas sustabdytas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Automatinis atnaujinimas paleistas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Įrašyti statistikos grafiką"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMule dabartinė statistika"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Nepavyks prisijungti prie Kademlia tinklo, jei parinktyse yra išjungtas UDP "
-"prievadas."
+"Spausdinant įvyko klaida.\n"
+"Gali būti, kad spausdintuvas nėra tinkamai suderintas."
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kademlia tinklas išjungtas parinktyse, ryšys nebus užmezgamas."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Spausdinama"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Nepavyko atverti draugų sąrašo failo „emfriends.met“ skaitymui!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, keičiamo aMule parašo statistika\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Paremta Pedro de Oliveira CAS <falso@rdk.homeip.net>\n"
+"\n"
+"Platinama pagal GPL licenciją"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Nepavyko atverti draugų sąrašo failo „emfriends.met“ rašymui!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oi! aMule nepaleista..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule paleista"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule paleista, bet ryšys neužmegztas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule užmezga ryšį..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oi! aMule būsena nežinoma..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " vykdoma "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " sustabdyta!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " ryšys neužmegztas!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " užmezga ryšį..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " elgiasi keistai, prašome patikrinti!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " užmezgė ryši su "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "išj."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " įj."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " su "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Išviso atsiųsta: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Išsiųsta: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Atsiųsta per šį seansą: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Atsiųsta: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Išsiųsta: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Dalinamasi: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " failas(ai), naudotojai eilėje: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Trukmė: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " – "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Vidutinis sistemos apkrovimas (per 1–5–15 min.): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Sistemos veikimo trukmė: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "amulesig.dat failo aplankas"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Įrašykite aplanką, kuriame yra amulesig.dat failas"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Atnaujinimo intervalas sekudėmis"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Kurti statistikos grafiką po kiekvieno atnaujinimo"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Įrašykite aplanką, kuriame bus kuriamas statistikos grafikas"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Periodiškai siųsti staitikos grafiką į FTP serverį"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP URL"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP kelias"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Įrašykite FTP serverio adresą"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "Įrašykite FTP serverio aplanką, į kurį kelsite statistikos grafiką"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Vartotojas"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Įrašykite vartotoją, kuriuo jungsitės prie FTP serverio"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Įrašykite vartotojo, kuriuo jungsitės prie FTP serverio, slaptažodį"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "FTP atnaujinimo intervalas minutėmis"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Patvirtinti"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Aplankas, kuriame yra parašo failas"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Aplankas, kuriame kuriamas statistikos grafikas"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Įkelti šabloną <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Žiniatinklio serverio HTTP prievadas"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "UPnP prievadus persiunti žiniatinklio serverio prievade"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP prievadas"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Naudoti gzip pakavimą"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Pilnos prieigos prie žiniatinklio serverio slaptažodis"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Svečio prieigos prie žiniatinklio serverio slaptažodis"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Įjungti svečio prieigą"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Išjungti svečio prieigą"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Įkelti/įrašyti žiniatinklio serverio parinktis iš/į nutolusio aMule"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMule parinkčių failas. NENAUDOKITE TIESIOGIAI!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Išjungti PHP interpretatorių (pasenusi)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Kiekvieną kartą perkompiliuoti PHP puslapius"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule www serveris"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "Priimtas žiniatinklio kliento ryšys\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Vykdant užduotį įvyko klaida: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Indekso failas nerastas: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Seansas baigėsi – prašoma prisijungti iš naujo\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Seansas pradėtas, priega gauta\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Seansas pradėtas, priega negauta\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Seansas nepradėtas – bus prašoma prisijungti\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Seansas sukurtas – prašoma prisijungti\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Apdorojamas prašymas [pradinis]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Tikrinamas slaptažodis\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Slaptažodžio maišos funkcija neteisinga\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Slaptažodis priimtas\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Neteisingas slaptažodis\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Neįrašėte slaptažodžio. Tuščias slaptažodis neleidžiamas.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Prašoma atsijungti\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Apdorojamas prašymas [persiųstas]: "
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Albanų"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Atsiuntimo būsena"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Atnaujinimo intervalas: %d s"
+#~ msgstr[1] "Atnaujinimo intervalas: %d s"
+#~ msgstr[2] "Atnaujinimo intervalas: %d s"
+
+#~ msgid "Transferring"
+#~ msgstr "Siunčiama"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "Eilės reitingas: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "Eilės reitingas: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "Eilėje"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "Planuojama atlikti – rodyti paieškos progreso indikatorių"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Pradedamos kurti MD4 ir klaidų taisymo maišos reikšmės failui: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Pradedama kurti MD4 maišos failui: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Pradedama kurti klaidų taisymo maišos reikšmė failui: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "Dėmesio: sukūrus atsarginę kopiją nepavyko pašalinti pradinio failo %s"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "Dėmesio: nepavyko pašalinti %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (Eilės reitingas: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Reitingas (bendras):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Išsiunčiant failus stengtis išsiųsti pilną failo dalį"
+
+#~ msgid "Networks window"
+#~ msgstr "Tinklo langas"
+
+#~ msgid "Searches window"
+#~ msgstr "Paieškos langas"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Atsiunčiama"
+
+#~ msgid "Shared files window"
+#~ msgstr "Dalinamų failų langas"
+
+#~ msgid "Messages window"
+#~ msgstr "Žinučių langas"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Statistikos grafikų langas"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Parinkčių langas"
+
+#~ msgid "Transfers"
+#~ msgstr "Siuntimas"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Failų siuntimo langas"
+
+#~ msgid "Unban"
+#~ msgstr "Atblokuoti"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Rodyti išsiunčiamus failus"
+
+#~ msgid "Show Queue"
+#~ msgstr "Rodyti laukiančius eilėje"
+
+#~ msgid "Select View"
+#~ msgstr "Parinkti vaizdą"
+
+#~ msgid "Client Software"
+#~ msgstr "Programinė įranga"
+
+#~ msgid "Waited"
+#~ msgstr "Laukė"
+
+#~ msgid "Upload Time"
+#~ msgstr "Išsiuntimo trukmė"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Išsiųsta/Atsiųsta"
+
+#~ msgid "Remote Status"
+#~ msgstr "Būsena"
+
+#~ msgid "File Priority"
+#~ msgstr "Failo prioritetas"
+
+#~ msgid "Score"
+#~ msgstr "Įvertinimas"
+
+#~ msgid "Asked"
+#~ msgstr "Prašė"
+
+#~ msgid "Last Seen"
+#~ msgstr "Paskutinį kartą matytas"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Atsistojo į eilę"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Išsiųsta"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Atsiųsta"
+
+#~ msgid "Userhash"
+#~ msgstr "Naudotojo maišos f-ja"
+
+#~ msgid "Encrypted"
+#~ msgstr "Šifruotas"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Rodyti išsiunčiamus failus arba išsiuntimo eilę"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Naudotojai eilėje:"
+
+#~ msgid "Current Session"
+#~ msgstr "Dabartinis seansas"
+
+#~ msgid "Total"
+#~ msgstr "Iš viso"
+
+#~ msgid "Requested :"
+#~ msgstr "Gauta prašymų:"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Failų siuntimo langas"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Iš viso naudotojų: %s | Iš viso failų: %s"
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Atsiuntimai (%i)"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr ""
+#~ "Dėmesio: sukūrus atsarginę kopiją nepavyko pašalinti pradinio failo %s"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country(): nepavyko įkelti šalies duomenų iš "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Pateikti IP filtro lygmenį."
+
+#~ msgid "Makes a search."
+#~ msgstr "Ieškoti."
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Nepavyko"
+
+#, fuzzy
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Paleisti amuleweb pradėjus darbą"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Išjungti aMule."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr "Šiame leidime šios parinktys buvo pakeistos dėl saugumo sumetimų:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Įjungtas protokolo slėpimas įeinantiems ir išeinantiems ryšiams.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Išjungtas serverių sąrašo atnaujinimas iš kitų serverių ir klientų.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Norėdami sužinoti daugiau apie šių pasikeitimų priežastis, skaitykite \n"
+#~ "apie „netikrus serverius“ aMule wiki, esančiame adresu http://wiki.amule."
+#~ "org. \n"
+#~ "Kad aMule veiktų korektiškai, labai svarbu, kad pašalintumėte netikrus \n"
+#~ "serverius iš savo serverių sąrašo."
 
 #~ msgid "Fetching status..."
 #~ msgstr "Atsiunčiama būsenos informacija..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Naudotojai eD2K: %s Kad: %s | Failai eD2K: %s Kad: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Naudotojas %s IP:prievadas %s:%d naudoja %s %s %s"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() pateikė NULL"
 
+#~ msgid "Firewalled"
+#~ msgstr "Už ugniasienės"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "Įkeltas %d vėliavėlių paveiksliukas."
+#~ msgstr[1] "Įkelti %d vėliavėlių paveiksliukai."
+#~ msgstr[2] "Įkelta %d vėliavėlių paveiksliukų."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr "failas %s yra per didelis, maksimalus failo dydis yra 4 GB."
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Šiam failų tipui nėra paskirtos programos."
+
+#~ msgid "File was not saved"
+#~ msgstr "Failas nebuvo įrašytas"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr "Nepavyko užmegzti ryšio. Prie nurodyto mazgo prisijungti nepavyko\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "Žinučių filtras"
 
@@ -7278,14 +7859,183 @@
 #~ msgid "Core Tweaks"
 #~ msgstr "Programos branduolio parinktys"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Šiam failų tipui nėra paskirtos programos."
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Uždelsti prieš parodant patarimą (sekundėmis)"
 
-#~ msgid "File was not saved"
-#~ msgstr "Failas nebuvo įrašytas"
+#~ msgid "Show part file number before file name"
+#~ msgstr "Prieš failo pavadinimą rodyti dalinio failo numerį"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
-#~ msgstr "failas %s yra per didelis, maksimalus failo dydis yra 4 GB."
+#~ msgid "Skin Support"
+#~ msgstr "Keičiama išvaizda"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- išvaizdų nėra -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Keičiamo parašo aplankas:"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Filtravimo parinktys:"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Kanalo talpa"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
+#~ msgstr ""
+#~ "Dėmesio! Šie duomenys naudojami\n"
+#~ "tik statistikos grafiko brėžimui."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Standartinis TCP prievadas:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Papildomas UDP prievadas:"
+
+#~ msgid "Bind Address"
+#~ msgstr "Susieti adresą"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "UDP prievadas papildomoms serverio užklausoms (TCP+3): 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Didžiausias šaltinių skaičius failui"
+
+#~ msgid "Connection limits"
+#~ msgstr "Ryšių skaičiaus apribojimai"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Visuotinis Plug nad Play"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "Įjungti UPnP"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "UPnP TCP prievadas:"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Atsiuntus failą pradėti siųsti pristabdytą failą"
+
+#~ msgid "Check disk space"
+#~ msgstr "Tikrinti disko vietą"
+
+#~ msgid "Min disk space:"
+#~ msgstr "Laisva vieta diske:"
+
+#~ msgid "Incoming"
+#~ msgstr "Atsiųsti failai"
+
+#~ msgid "Temporary"
+#~ msgstr "Laikini failai"
+
+#~ msgid "Shared"
+#~ msgstr "Dalinami failai"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Nurodykite grafikų spalvas"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Atsiuntimo eilės progresas"
+
+#~ msgid "Show percentage"
+#~ msgstr "Rodyti procentus"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Rodyti progreso juostą"
+
+#~ msgid "Enable skin support "
+#~ msgstr "Įjungti keičiamas išvaizdas"
+
+#~ msgid "Skin:"
+#~ msgstr "Išvaizda:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "Automatiškai rūšiuoti failus (apkraunamas procesorius)"
+
+#~ msgid "Show Fast eD2k Links Handler"
+#~ msgstr "Rodyti greitą eD2k nuorodų mygtuką"
+
+#~ msgid "Web server port"
+#~ msgstr "Žiniatinklio serverio prievadas"
+
+#~ msgid "Enable UPnP port forwarding on the web server port"
+#~ msgstr "Įjungti UPnP prievado persiuntimą žiniatinklio serverio prievade"
+
+#~ msgid "Web server UPnP TCP port"
+#~ msgstr "Žiniatinklio serverio UPnP TCP prievadas"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "Klausančio įrenginio IP \n"
+#~ "(jei tuščia – bet koks IP)"
+
+#~ msgid "TCP port"
+#~ msgstr "TCP prievadas"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Kas gali matyti dalinamus failus:"
+
+#~ msgid "Event types"
+#~ msgstr "Įvykių tipai"
+
+#~ msgid "ERROR: can not accept web client connection\n"
+#~ msgstr "KLAIDA: nepavyko priimti žiniatinklio kliento ryšio\n"
+
+#~ msgid ""
+#~ "Your Auto-update server list is empty.\n"
+#~ "'Auto-update server list at startup will be disabled."
+#~ msgstr ""
+#~ "Automatiškai atnaujinamų servaerių sąrašas tuščias.\n"
+#~ "Parinktis „Automatiškai atnaujinti serverių sąrašą“ bus sišjungta."
+
+#~ msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "KLAIDA: neteisinga part.met failo versija: %s ==> %s"
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr ""
+#~ "Įjungus šią parinktį prieš uždarant langą aMule paklaus ar tikrai norite "
+#~ "baigti."
+
+#~ msgid "Bandwith limits"
+#~ msgstr "Spartos apribojimai"
+
+#~ msgid "This UDP port is used for extended ed2k requests and Kad network"
+#~ msgstr "Tai papildomas eD2k užklausų ir Kademlia tinklo prievadas"
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Rodyti tarnybinį srautą"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "Įjungti klaidų tikrinimo įrankį"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr ""
+#~ "Klaidų tikrinimo įrankis pasitiki visomis maišos funkcijomis "
+#~ "(nerekomenduojama)"
+
+#~ msgid "Disk space"
+#~ msgstr "Disko vieta"
+
+#~ msgid "Create Backup for preview"
+#~ msgstr "Peržiūrai sukurti atsarginę kopiją"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Sudėtingesnės parinktys"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Progreso juostos išvaizda"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Stulpelių rūšiavimas"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Įvairios išvaizdos parinktys"
+
+#~ msgid "File Options"
+#~ msgstr "Failų parinktys"
 
 #~ msgid "Status text"
 #~ msgstr "Būsenos tekstas"
@@ -7293,17 +8043,134 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "Iššokantis būsenos tekstas"
 
-#~ msgid "Please wait... "
-#~ msgstr "Prašome palaukti... "
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr ""
+#~ " p2p klientas „visoms sistemoms“, sukurtas eMule pagrindu\n"
+#~ "\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr " Svetainė: http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr " Forumas: http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " Kontaktai: admin@amule.org (administravimo klausimai) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ " Autorinės teisės (C) 2003-2008 aMule komanda \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr " Dalis aMule programos paremta \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " Autorinės teisės (C) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "Jei tai filmas, galite parašyti jo trukmę, siužetą, kokia kalba "
+#~ "kalbama...\n"
+#~ "Jei failas sugadintas, galite apie tai pranešti kitiems aMule naudotojams."
+
+#~ msgid "Misc Options"
+#~ msgstr "Įvairios parinktys"
+
+#~ msgid "Server Options"
+#~ msgstr "Serverių parinktys"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Užmezgus ryšį su serveriu rodyti serverio pranešimą..."
+
+#~ msgid "eD2k Info"
+#~ msgstr "eD2k informacija"
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Įjungti/išjungti"
+
+#~ msgid "Authentication"
+#~ msgstr "Autentifikavimas"
 
 #~ msgid "General Settings"
 #~ msgstr "Bendros parinktys"
 
+#~ msgid "Hard limit"
+#~ msgstr "Griežtas limitas"
+
+#~ msgid "Max Connections"
+#~ msgstr "Didžiausias ryšių kiekis"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "Programos išvaizda"
 
 #~ msgid "Remote Control"
 #~ msgstr "Nutolęs valdymas"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Nurodytos naršyklės rasti nepavyko!"
+
+#~ msgid "User Defined"
+#~ msgstr "Nurodyta naudotojo"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org – Linux Mule programa"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Parinkite naršyklę"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Nurodyta naudotojo:"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Naršyklių sąraše nurodykite, kad norite naudoti Naudotojo nurodytą "
+#~ "naršyklę ir įrašykite čia naršyklės pavadinimą."
+
+#~ msgid "Please wait... "
+#~ msgstr "Prašome palaukti... "
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "Nepavyko suprasti naršyklės paleidimo komandos."

aMule-2.2.6.tar.bz2/po/nl.po -> aMule-2.3.1.tar.bz2/po/nl.po Changed

@@ -1,6 +1,6 @@
 # translation of nl.po to Dutch
 # aMule i18n resource file.
-# Copyright (C) 2004 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Kry <elkry@users.sourceforge.net>, 2004.
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-08-19 16:31+0100\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
@@ -21,1306 +21,1135 @@
 "X-Poedit-Language: Dutch\n"
 "X-Poedit-Country: NETHERLANDS\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "U moet een niet-leeg wachtwoord opgeven."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Ongeldig wachtwoord, geen MD5 hash!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Verbindingsfout"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "EV verbinding mislukte. Leeg antwoord."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Externe Verbinding: Toegang geweigerd omdat: "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Externe Verbinding: Toegang geweigerd"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Externe Verbinding: Slecht antwoord van server. Verbinding verbroken."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Succes! Verbinding gemaakt met aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Gelukt! Verbinding gemaakt."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Hashen"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Voeg een Vriend toe"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Voltooien"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "U moet een geldig IP adres en poortnummer invoeren!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Compleet"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Informatie"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Gepauzeerd"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "De aangegeven userhash is niet geldig!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Foutief"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Kon bestand ED2KLinks niet openen."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Downloaden"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"WAARSCHUWING: U kunt uzelf niet toevoegen als bron voor een eD2k link "
+"terwijl u een laag id hebt."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Wachten"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Hoofdapp wordt nu afgesloten..."
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Begonnen met het maken van MD4 en AICH hash voor bestand: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Amuleweb-instantie met pid '%ld' wordt afgesloten ... "
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Begonnen met het maken van MD4 hash voor bestand: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Amuleweb-instantie met pid '%ld' wordt gedood ... "
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Begonnen met het maken van AICH hash voor bestand: %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Mislukt"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Oude AICH hashsets in '%s' worden omgezet in 64b in '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: Kern wordt afgesloten."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr ""
-"WAARSCHUWING: De bestandsnaam '%s' is ongeldig en is gewijzigd in '%s'."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "aMule is afgesloten."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr ""
-"WAARSCHUWING: Het bestand '%s' bestaat al, bestandsnaam van nieuw bestand "
-"gewijzigd in '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Geheugen debug resultaten voor het afsluiten van aMule:"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
 msgstr ""
-"WAARSCHUWING: Kon origineel '%s' niet verwijderen na het maken van backup"
+"\n"
+"EV configuratie"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "WAARSCHUWING: Kon %s niet verwijderen"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Wachtwoord ingesteld en externe verbindingen ingeschakeld."
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Kon gedeelde bestanden niet ontvangen van gebruiker '%s'"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "WAARSCHUWING"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Onbekend"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Nep eMule versie %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Nep eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"U heeft geen servers in de serverlijst.\n"
+"Wilt u dat aMule nu een nieuwe lijst download?"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Nep eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Download van serverlijst"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (gebaseerd op eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr "webserver draait met pid %d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "BijNaam: %s ID: %u"
+#: src/amule.cpp:658
+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 ""
+"U heeft ingesteld om de webserver te starten bij het opstarten, maar "
+"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/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Aangevraagd: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "FOUT"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Bestandsstatistieken voor deze sessie: Geaccepteerd %d van %d aanvraag, %s "
-"overgebracht\n"
-msgstr[1] ""
-"Bestandsstatistieken voor deze sessie: Geaccepteerd %d van %d aanvragen, %s "
-"overgebracht\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Kon geen poorten koppelen aan het opgegeven adres: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Bestandsstatistieken voor alle sessies: Geaccepteerd %d van %d aanvraag, %s "
-"overgebracht\n"
-msgstr[1] ""
-"Bestandsstatistieken voor alle sessies: Geaccepteerd %d van %d aanvragen, %s "
-"overgebracht\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Aangevraagd bestand is onbekend"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Poort %u is niet beschikbaar. U krijgt een LAAG ID\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Client %s op IP:Poort %s:%d gebruikt %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Gebruikersnaam"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Poort %u is niet beschikbaar!\n"
+"\n"
+"Dit betekent dat u een LAAG ID krijgt.\n"
+"\n"
+"Controleer uw netwerk en zorg ervoor dat de poort open is voor in- en "
+"uitgaand verkeer."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Vrienden"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Kon OnlineHandtekening Bestand niet maken"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Laat &Details Zien"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Kon aMule OnlineHandtekening Bestand niet maken"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Voeg een vriend toe"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"De gekozen locale lijkt niet ge?nstalleerd te zijn op uw pc. (Let op: Ik "
+"probeer het toch in te stellen)"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Verwijder Vriend"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "Dit is de eerste keer dat u aMule %s draait"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Verstuur &Message"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Dit is een test versie, dagelijks geupdatet, en\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Bekijk Bestanden"
+#: src/amule.cpp:1043
+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"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Maak Vriendenplaats"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"of uw hond doodt. Maar het *zou* veilig moeten zijn om het te gebruiken.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Weet u zeker dat u de geselecteerde vriend wilt verwijderen?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Meer informatie, ondersteuning en niuwe versies kunnen gevonden worden op "
+"onze homepage,\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Weet u zeker dat u de geselecteerde vrienden wilt verwijderen?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "op www.aMule.org, of op ons IRC kanaal #amule op irc.freenode.net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Annuleren"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Bugs kunt u altijd melden op http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"U kunt maximaal ??n vriendenslot instellen.\n"
-" Slechts één slot is toegekend."
+"De map voor Online Handtekening bestanden die u heeft opgegeven is "
+"ONGELDIG!\n"
+" OnlineSignature is UITGESCHAKELD totdat u dit verbetert in voorkeuren."
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Meerdere selectie"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Server hostnaam geïnformeerd"
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Download voltooid"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Toewijzen schijfruimte voor bestand '%s' mislukt: %s"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Het volledige pad naar het bestand."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "FOUT: kan logbestand niet openen"
 
-# re-check this
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "De naam van het bestand zonder de pad component."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "WAARSCHUWING: logbestand is leeg. Er is iets mis."
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "De eD2k hash van het bestand."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Log is gereset"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "De grootte van het bestand in bytes."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "ServerBericht: %s"
 
-# Recheck last word
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Cumulatieve download activiteitsduur."
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "Download van %s overgeslagen, omdat gevraagd bestand niet nieuwer is."
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Nieuwe chatsessie begonnen"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Kon nodes lijst niet downloaden."
 
-# ambiguous in EN, check translation
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Afzender bericht."
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Kon gedownload versie controle bestand niet openen"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Geen schijfruimte meer"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Beschadigd versie controle bestand"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Schijfpartitie."
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "U gebruikt een verouderde versie van aMule!"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Fout bij completeren"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Uw aMule versie is %i.%i.%i en de nieuwste versie is %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Bestandsnaam"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "De nieuwste versie kan altijd gevonden worden op http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Grootte"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "WAARSCHUWING: Uw aMuled versie is verouderd: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Type"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "U heeft de nieuwste aMule versie."
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioriteit"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Kon versie controle bestand niet downloaden"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "BestandsID"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Gebruikers: %s | Bestanden: %s"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Aanvragen"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Gebruikers: E: %s K: %s | Bestanden: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Geaccepteerde Aanvragen"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Geen netwerken geselecteerd"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Overgebrachte Data"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "met Laag ID"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Deelverhouding"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "met Hoog ID"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Ontvangen Delen"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Verbonden met %s %s"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Complete Bronnen"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Verbinden met %s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Directory Pad"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Verbinding verbroken met eD2K"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Gedeelde Bestanden"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad gestart."
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Heel laag"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad gestopt."
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Laag"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Verbonden met Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normaal"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Verbonden met Kad (firewalled)"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Hoog"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Verbinding met Kad verbroken"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Heel Hoog"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Kad netwerk kan niet gebruikt worden als de UDP poort is uitgeschakeld in "
+"voorkeuren, wordt niet gestart."
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Vrijgeven"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Kad netwerk is uitgeschakeld in voorkeuren, wordt niet mee verbonden."
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Auto"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"FOUT: aMule daemon kan niet gebruikt worden wanneer externe verbindingen "
+"uitgeschakeld zijn. Gebruik, om Externe Verbindingen in te schakelen, of een "
+"normale aMule, start amuled met de optie --ec-config of stel de waarde van "
+"\"AcceptExternalConnections\" in op 1 in het bestand ~/.aMule/amule.conf"
+
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"FOUT: Een geldig wachtwoord is nodig om gebruik te maken van externe "
+"verbindingen, en aMule daemon kan niet gebruikt worden zonder externe "
+"verbindingen. Om aMule daemon to draaien, moet u het veld \"ECPassword\" in "
+"het bestand ~/.aMule/amule.conf een juiste waarde geven. Voer amuled uit met "
+"de vlag --ec-config om het wachtwoord in te stellen. Meer informatie is te "
+"vinden op http://wiki.amule.org"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: OnInit - timer wordt gestart"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: naar de achtergrond - tot ziens"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Kan Pid-Bestand Niet Aanmaken"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Voeg Commentaar/Waardering toe"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "FOUT: %s"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Bewerk Commentaar/Waardering"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Dit is aMule %s gebaseerd op eMule."
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Hernoemen"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Draaiend op %s"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Voeg bestanden in verzameling toe aan overdrachtenlijst"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Bezoek http://www.amule.org om te zien of een nieuwe versie beschikbaar is."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Kopieer magnet &URI naar klembord"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "FATALE FOUT: Kon Timer niet aanmaken"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Kopieer eD2k &link naar klembord"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "aMule controle op afstand "
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Kopieer eD2k link naar klembord (&Source)"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Snapshot:"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Kopieer eD2k link naar klembord (Bron) (&With Crypt options)"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"'Alle-Platformen' p2p client gebaseerd op eMule \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Kopieer eD2k link naar klembord (&Hostnaam)"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Website: http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr "Kopieer eD2k link naar klembord (Hostnaam) (Met &Crypt opties)"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Forum: http://forum.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Kopieer eD2k link naar klembord (&AICH info)"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Kopieer feedback naar klembord"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Contact: admin@amule.org (administratieve zaken) \n"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:506
 msgid ""
-"Feedback from: %s (%s)\n"
+"Copyright (c) 2003-2011 aMule Team \n"
 "\n"
 msgstr ""
-"Feedback van: %s (%s)\n"
+"Copyright (c) 2003-2011 aMule Team \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "U heeft een Hoog ID nodig om een geldige bronlink te maken"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Een deel van aMule is gebaseerd op \n"
 
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "WAARSCHUWING"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Gedeelde Bestanden (%i)"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Bericht"
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[PartBestand]"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "aMule dialoogvenster afgesloten"
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Voer een nieuwe naam voor dit bestand in:"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Aan het verbinden"
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Naam wijzigen"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2K: Verbinden"
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Verder gaan met uploads van bestand: %s"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2K: Verbinding verbroken"
 
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Stoppen van upload van bestand: %s"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Firewalled"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMule tekst client"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Verbonden"
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: zoekwoord te kort"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Verbinden"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "%u Kad contact gelezen"
-msgstr[1] "%u Kad contacten gelezen"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Uitgeschakeld"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Slechts %d Kad contact beschikbaar, nodes.dat niet weggeschreven"
-msgstr[1] "Slechts %d Kad contacten beschikbaar, nodes.dat niet weggeschreven"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Annuleren"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "%d Kad contact geschreven"
-msgstr[1] "%d Kad contacten geschreven"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Beëindig de huidige verbindingspogingen"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "FOUT: Kon niet luisteren op TCP poort"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Verbreek"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "Webclient verbinding geaccepteerd\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Verbreek de huidige verbin"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "FOUT: kan webclient verbinding niet accepteren\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Verbinden"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Aanvraag mislukt met de volgende fout: %s."
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Verbind met de momenteel ingeschakelde netwerken"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Aanvraag mislukt met een onbekende fout."
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Indexbestand niet gevonden: "
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Up: %.1f | Down: %.1f"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Sessie verlopen - login wordt aangevraagd\n"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Verbonden)"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sessie ok, ingelogd\n"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Niet Verbonden)"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sessie ok, niet ingelogd\n"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Wilt u %s echt afsluiten?"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Geen sessie geopend - login wordt aangevraad\n"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Afsluit bevestiging"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Sessie aangemaakt - login wordt aangevraagd\n"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Voer Commando Uit: "
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- standaard -"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Aanvraag wordt verwerkt [origineel]: "
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Skindirectory '%s' bestaat niet"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Controleren van wachtwoord\n"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "WAARSCHUWING: Kon skinbestand '%s' niet openen om te lezen"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Wachtwoordhash ongeldig\n"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Netwerken"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Wachtwoord ok\n"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Netwerken Venster"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Wachtwoord fout\n"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Zoeken"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr ""
-"U heeft geen wachtwoord ingevoerd. Een leeg wachtwoord is niet toegestaan.\n"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Zoekvenster"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Loguit aangevraagd\n"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Downloads"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Aanvraag wordt verwerkt [omgeleid]: "
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Downloadsvenster"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Laadt template <str>"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Gedeelde bestanden"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Webserver HTTP poort"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Gedeelde Bestanden Venster"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Gebruik UPnP port forwarding voor webserverpoort"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Berichten"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP poort"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Berichten Venster"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Gebruik gzip compressie"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistieken"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Wachtwoord voor volledige toegang tot webserver"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Statistieken Venster (Grafieken)"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Gast wachtwoord voor webserver"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Voorkeuren"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Sta gast toegang toe"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Voorkeuren Instellingen Venster"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Weiger gast toegang"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importeer"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Laad/bewaar webserverinstellingen van/naar aMule op afstand"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Het partbestand importeer programma"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMule config bestand pad. NIET DIRECT GEBRUIKEN!"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Over"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Schakel PHP interpreter uit (verouderd)"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Over/Help"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Compileer PHP pagina's opnieuw bij elke aanvraag"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "eD2k netwerk"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule Web Server"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Kad netwerk"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Niet beschikbaar"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Geen netwerk"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Nooit"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "aMule besturing op afstand"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Downloaden..."
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Fatale Fout: Kon Core Timer niet aanmaken"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "%d bytes verwacht, maar %d bytes gedownload"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Verbind met amule op afstand"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Voorkeuren"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Fatale Fout: Kon Poll Timer niet aanmaken"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Naar de gebeurtenislus..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Aan het verbinden..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Directory die het bestand amulesig.dat bevat"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Verbinding mislukt "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Bladeren"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "GUI EV gebeurtenisafhandelaar op afstand"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Wordt afgesloten"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Voer hier de directory in waar uw amulesig.dat bestand is"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Verbinding Mislukt. Kon niet verbinden met %s:%d\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Tijd tussen de verversingen in seconden"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Verbinding verbroken - aMule is waarschijnlijk afgesloten."
+
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Klaar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Genereer een status figuur bij elke verversing"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Alle"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
-"Voer hier de directory in waar u het statistieken figuur wilt laten genereren"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Upload uw status figuur regelmatig naar een FTP server"
+"Kan directory '%s' niet aanmaken voor categorie '%s', directory '%s' wordt "
+"behouden."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP Url"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Onbekend"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP Pad"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Kon gedeelde bestanden niet ontvangen van gebruiker '%s'"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Voer hier de URL in van uw FTP server"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Op zoek naar buddy voor laag id verbinding"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
-"Voer hier de directory in waar uw status figuur op de FTP server moet komen"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Nep eMule versie %#x)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Gebruiker"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Nep eMule)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Wachtwoord"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Nep eMule)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Voer hier de Gebruikersnaam in om in te loggen op uw FTP server"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (gebaseerd op eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Voer hier het Wachtwoord in om in te loggen op uw FTP server"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "BijNaam: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Tijd tussen de FTP updates in minuten"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Aangevraagd: %s\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Controleer"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Bestandsstatistieken voor deze sessie: Geaccepteerd %d van %d aanvraag, %s "
+"overgebracht\n"
+msgstr[1] ""
+"Bestandsstatistieken voor deze sessie: Geaccepteerd %d van %d aanvragen, %s "
+"overgebracht\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Directory die uw handtekening bestand bevat"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Bestandsstatistieken voor alle sessies: Geaccepteerd %d van %d aanvraag, %s "
+"overgebracht\n"
+msgstr[1] ""
+"Bestandsstatistieken voor alle sessies: Geaccepteerd %d van %d aanvragen, %s "
+"overgebracht\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Directory waar het statistieken figuur gegenereerd moet worden"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Aangevraagd bestand is onbekend"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/BaseClient.cpp:2700
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i dag(en) %i u(u)r(en) %i min %i s"
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Bericht van '%s' gefilterd (IP:%s)"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxcas, aMule Online Statistieken"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nieuw bericht van '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Welkom!"
+#: src/BaseClient.cpp:2899
+#, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr ""
+"Gebruiker %s (%u) vroeg uw gedeelde-bestandenlijst van niet-bestaande "
+"directory '%s' op -> Genegeerd"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "WAARSCHUWING: %s kan niet geopend worden."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Maximum DL snelheid sinds wxCas draait"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+"WAARSCHUWING: Geannuleerde-bestandenlijst beschadigd, bevat ongeldige header."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Absolute Maximum DL snelheid tijdens vorige keren dat wxCas draaide"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "IO fout bij het lezen van bestand %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Leegmaken"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Fout bij het bewaren van bestand %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Systeem"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Voer Captcha in"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Stop Auto Verversen"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Categorie"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Bewaar Online Statistieken figuur"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nieuwe Catgorie"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Print Online Statistieken figuur"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Kies een directory voor binnenkomende bestanden"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Voorkeur instellingen"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "U moet een naam opgeven voor de categorie!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Over wxCas"
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "U moet een pad opgeven voor de categorie!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Begin Auto Verversen"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Kon binnenkomende dir niet aanmaken voor categorie. Geef a.u.b. een geldig "
+"pad op!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Auto Verversen gestopt"
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Chat-Sessie Begonnen: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Auto Verversen gestart"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Verbonden met Client ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Bewaar Statistieken FIguur"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Verbinden maken met Client ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMule Online Statistieken"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Kon niet Verbinden met client / Verbinding verbroken ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/ChatSelector.cpp:335
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
 msgstr ""
-"Er was een probleem tijdens het printen.\n"
-"Misschien is uw printer niet goed ingesteld?"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Aan het printen"
+"*** U heeft de captcha controle gehaald en de gebruiker heeft uw bericht "
+"ontvangen. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
+#: src/ChatSelector.cpp:336
 msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
-"wxCas, aMule OnLine Handtekening Statistieken\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Gebaseerd op CAS van Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Verspreid onder de GPL"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh oh, aMule draait niet..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule draait"
+"*** Uw antwoord op de captcha was fout en uw bericht is genegeerd. U kunt "
+"een nieuw captcha aanvragen door een nieuw bericht te sturen. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule draait, maar niet verbonden"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule maakt verbinding..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh Oh, aMule status is onbekend..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Chat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " draait "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Sluit tabblad"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " is gestopt !"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Sluit alle tabbladen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " is niet verbonden !"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Sluit andere tabbladen"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " is aan het verbinden..."
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Voeg toe aan Vrienden"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " doet iets raars, controleer het !"
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Creditfile geladen, %u client is bekend"
+msgstr[1] "Creditfile geladen, %u clients zijn bekend"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " is verbonden met "
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Credits verlopen voor %u client!"
+msgstr[1] " - Credits verlopen voor %u clients!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Geen 'cryptkey.dat' bestand gevonden, wordt aangemaakt."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Client Details"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "firewalled"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "Laag ID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "uit"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "Hoog ID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " is aan "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Ingeschakeld"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " met"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Ondersteund"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Totale Download: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Niet ondersteund"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Upload: "
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Uitgeschakeld"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Sessie Download: "
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Verbonden"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Download: "
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Niet verbonden"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upload: "
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
+msgstr "%.1f KB/s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Niet compleet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Deelt: "
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Slechterik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " bestand(en), Clients in wachtrij: "
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Gecontroleerd - OK"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Tijd: "
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Niet Beschikbaar"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr "aan"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Gemiddelde Systeem Belasting (1-5-15 min): "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Systeem uptime: "
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "Gebruiker %s (%u) vroeg uw gedeelde-bestandenlijst op -> Geaccepteerd"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uu %0umin %02us"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "Gebruiker %s (%u) vroeg uw gedeelde-bestandenlijst op -> Geweigerd"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uu %02umin %02us"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "Gebruiker %s (%u) vroeg uw gedeelde-directorieslijst op -> Toegestaan"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "Gebruiker %s (%u) vroeg uw gedeelde-directorieslijst op -> Geweigerd"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "%02us"
-msgstr "%02us"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "Hoog ID"
-
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "Laag ID"
-
-# msgstr "Verbinden"
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Niet verbonden"
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
+msgstr ""
+"Gebruiker %s (%u) vroeg uw gedeelde-bestandenlijst van directory '%s' op -> "
+"geaccepteerd"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
+#: src/ClientTCPSocket.cpp:933
 #, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr ""
+"Gebruiker %s (%u) vroeg uw gedeelde-bestandenlijst van directory '%s' op -> "
+"geweigerd"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:952
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Gebruiker %s (%u) deelt directory '%s'"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:967
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Gebruiker %s (%u) stuurde niet-opgevraagde gedeelde dirs."
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:982
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "Gebruiker %s (%u) stuurde gedeelde-bestandenlijst van directory '%s'"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:989
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Afgebroken !"
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Gebruiker %s (%u) heeft gedeelde-bestandenlijst gestuurd"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:994
 #, c-format
-msgid "Unable to open %s"
-msgstr "Kon %s niet openen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Invoer parameters"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Bestand om te Hashen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Voeg Optionele URLs toe aan dit bestand"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Voer hier het bestand in waarvan u de eD2k link wilt laten berekenen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
-msgstr ""
-"Voer hier de URL in die u wilt toevoegen aan de eD2k link: Voeg / toe aan "
-"het eind om aLinkCreator de huidige bestandsnaam toe te laten voegen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Toevoegen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Verwijder"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Wissen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Maak link met deel-hashes"
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Gebruiker %s (%u) stuurde ongewild gedeelde-bestandenlijst"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
-"Help om nieuwe en zeldzame bestanden sneller te verspreiden, ten koste van "
-"een verhoogde link grootte"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4 BestandsHash"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k BestandsHash"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k link"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Start"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Opslaan"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Kopieer naar klembord"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Afsluiten"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Open"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Open een bestand om zijn eD2k link te berekenen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopiëren"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Kopieer berekende eD2k link naar klembord"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Opslaan als"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Bewaar berekende eD2k link naar bestand"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Over"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Over aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Selecteer het bestand waarvoor u de eD2k link wilt laten berekenen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Kan het klembord niet openen"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Er is nu niets om te kopiëren !"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Selecteer het bestand voor uw berekende eD2k link"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Kon niet openen "
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Voer a.u.b. een niet lege bestandsnaam in"
+"Gebruiker %s (%u) weigerde toegang tot gedeelde directories/bestanden lijst"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Er is nu niets om te bewaren !"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Bestand Commentaren"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"aLinkCreator, de aMule eD2k link maker\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps van http://www.everaldo.com en http://www.icomania.com\n"
-"en http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Verspreid onder de GPL"
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Gebruikersnaam"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Hashen..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Bestandsnaam"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator werkt voor u"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Waardering"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "MD4 Hash Wordt Berekend..."
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Commentaar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "eD2k Hashes Worden Berekend..."
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Geen commentaren"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Done in %.2f s"
-msgstr "Gedaan in %.2f s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "U heeft deze URL al toegevoegd !"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Voer a.u.b. een niet lege URL in"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u commentaar"
+msgstr[1] "%u commentaren"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Bestand nummer %u wordt verwerkt: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
-"U heeft om deel hashes gevraagd (Alleen gebruikt voor bestanden > 9,5 MB)"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:83
-#, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Niet bestaand bestand !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, de aMule eD2k link maker"
+"Client %s geband voor het sturen van %s beschadigde gegeven van in totaal %s "
+"voor het bestand '%s'"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1334,31 +1163,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Ho]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Aan het verbinden"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Heel laag"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Laag"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normaal"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Hoog"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Heel Hoog"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Vrijgeven"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Vragend"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Verbinden via server"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Wachtrij vol"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "In wachtrij"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Overdragen"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Downloaden"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1384,8 +1239,7 @@
 msgid "Too many Kad connections"
 msgstr "Te veel Kad verbindingen"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Geband"
 
@@ -1417,8 +1271,8 @@
 msgid "Remote Server"
 msgstr "Server op Afstand"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1440,10 +1294,10 @@
 
 #: src/DataToText.cpp:135
 msgid "Search Result"
-msgstr "Zoek Resultaat"
+msgstr "Zoekresultaat"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Compleet"
 
@@ -1467,7 +1321,7 @@
 msgid "ERROR: Failed!"
 msgstr "FOUT: Mislukt!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "In Wachtrij"
 
@@ -1479,873 +1333,305 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Onbekend of fout tempbestand formaat."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Systeem standaard"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albanees"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabisch"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturisch"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Baskisch"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgaars"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Catalaans"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Chinees (Vereenvoudigd)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Chinees (Traditioneel)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Kroatisch"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Tsjechisch"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Deens"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Nederlands"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Engels (V.K.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estonisch"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Fins"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Frans"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Gallisch"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Duits"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Grieks"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hebreeuws"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Hongaars"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italiaans"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Part"
 
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italiaans (Zwitsers)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japans"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Koreaans"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Litouws"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Noors"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Grootte"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Pools"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Overgebracht"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugees"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Snelheid"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugees (Braziliaans)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Voortgang"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Russisch"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Bronnen"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Sloveens"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioriteit"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Spaans"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Status"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Zweeds"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Overgebleven Tijd"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turks"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Laatst Compleet Gezien"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Oekraïens"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Laatste Overdracht"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Kon geselecteerde browser niet bepalen!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Weet u zeker dat u het geselecteerde bestand wilt verwijderen?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"TCP poort kan niet hoger zijn dan 65532 omdat de server UDP poort de TCP "
-"poort + 3 is"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Weet u zeker dat u de geselecteerde bestanden wilt verwijderen?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Standaard poort zal worden gebruikt (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Servernaam"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adres"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Poort"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Beschrijving"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Gebruikers"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Bestanden"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Mislukt"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Statisch"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versie"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"U bent verbonden met een server die u probeert te verwijderen. Verbreek de "
-"verbinding eerst aub. De server is NIET verwijderd."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Onbekende naam)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Weet u zeker dat u de statische server %s wilt verwijderen"
+"Feedback van: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Ja"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Nee"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Stop"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Kon '%s' niet openen"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pauzeer"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Servers (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "Ve&rder gaan"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Server"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "Verwijder comp&lete"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Verbind met server"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Wissel elk A4AF nu uit met dit bestand"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Markeer server als statisch"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Wissel elk A4AF uit met dit bestand (Auto)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Markeer server als niet-statisch"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Wissel elk A4AF nu uit met de andere bestanden"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Markeer servers als statisch"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Uitgebreide Opties"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Markeer servers als niet-statisch"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Voorbeeld"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Verwijder server"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Bekijk &details"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Verwijder servers"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Bekijk alle commentaren"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Verwijder alle servers"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Kopieer magnet URI naar klembord"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Kopieer eD2k link naar klembord"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Kopieer eD2k &link naar klembord"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopieer eD2k links naar klembord"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Kopieer feedback naar klembord"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Verbind opnieuw met server"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "Verwijder toewijzing"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Weet u zeker dat u alle servers wilt verwijderen?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Toewijzen aan catgorie"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Weet u zeker dat u de geselecteerde server wilt verwijderen?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Open het bestand"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Weet u zeker dat u de geselecteerde servers wilt verwijderen?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Voer een nieuwe naam voor dit bestand in:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Uitgeschakeld [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Naam wijzigen"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Dit is aMule %s gebaseerd op eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Draaiend op %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Bezoek http://www.amule.org om te zien of een nieuwe versie beschikbaar is."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "FATALE FOUT: Kon Timer niet aanmaken"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMule controle op afstand "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Snapshot:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" 'Alle-Platformen' p2p client gebaseerd op eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Website: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Forum: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Contact: admin@amule.org (administratieve zaken) \n"
+msgid "Downloads (%i)"
+msgstr "Downloads (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " aMule is gedeeltelijk gebaseerd op \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Bericht"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2K: Verbinden"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2K: Verbinding verbroken"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Firewalled"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Verbonden"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Verbinden"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Uitgeschakeld"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Beëindig de huidige verbindingspogingen"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Verbreek"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Verbreek de huidige verbin"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Verbinden"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Verbind met de momenteel ingeschakelde netwerken"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+"Om deze waarschuwing te voorkomen bij elk voorbeeld\n"
+"dient u uw video afspeelprogramma in te stellen bij voorkeuren (standaard is "
+"mplayer)."
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Up: %.1f | Down: %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Voorbeeld"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Verbonden)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "FOUT: Opstarten externe mediaspeler mislukt! Commando: '%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Niet Verbonden)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Wilt u aMule echt afsluiten?"
+msgid "Saving PartFile %u of %u"
+msgstr "PartBestand %u van %u wordt bewaard"
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Afsluit bevestiging"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Alle PartBestanden Bewaard."
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Skindirectory '%s' bestaat niet"
+msgid "Loading temp files from %s."
+msgstr "Tijdelijke bestanden worden geladen van %s"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "WAARSCHUWING: Kon skinbestand '%s' niet openen om te lezen"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Netwerken"
+msgid "Loading PartFile %u of %u"
+msgstr "PartBestand %u van %u wordt geladen"
 
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Netwerken venster"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Zoeken"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Zoekvenster"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Overdrachten"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Bestands overdrachten venster"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Gedeelde bestanden"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Gedeelde bestanden venster"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Berichten"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Berichtenvenster"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistieken"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Statistiekenvenster (grafieken)"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Voorkeuren instellingen venster"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importeer"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Het partbestand importeer programma"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Over/Help"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "eD2k netwerk"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Kad netwerk"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Geen netwerk"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Algemeen"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Verbinding"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Directories"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Servers"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Beveiliging"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Interface"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filters"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Besturing op Afstand"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Online Handtekening"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Gebeurtenissen"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Debugging"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Handmatig Gekozen"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"aMule moet opnieuw gestart worden om deze veranderingen toe te passen:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP poort veranderd.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP poort veranderd.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"Uw Auto-update serverlijst is leeg.\n"
-"'Auto-update serverlijst bij het opstarten' zal worden uitgeschakeld."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"U hebt externe verbindingen ingeschakeld maar geen wachtwoord ingesteld.\n"
-"Externe verbindingen kunnen niet ingeschakeld worden tenzij een geldig "
-"wachtwoord is ingesteld."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Taal veranderd.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Temp directory veranderd.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- ED2K netwerk ingeschakeld.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Up: 0.0 | Down: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Zowel het eD2K als het Kad netwerk zijn uitgeschakeld.\n"
-"U kun niet verbinden tot u minimaal een netwerk inschakelt."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad zal niet starten als uw UDP poort is uitgeschakeld.\n"
-"Schakel de UDP poort in of schakel Kad uit."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"U MOET aMule nu opnieuw starten.\n"
-"Als u dat niet doet moet u niet klagen als er iets misgaat.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Uw Auto-update servers lijst is leeg.\n"
-"Vul a.u.b. minimaal een URL naar een geldig server.met bestand in.\n"
-"Klik op de knop \"Lijst\" hiernaast om een URL in te voeren."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Tijdelijke bestanden"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Binnenkomende bestanden"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Online Handtekeningen"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Kies een directory voor %s"
+"FOUT: Laden van backupbestand misukt. Zoek op http://forum.amule.org naar ."
+"part.met hersteloplossingen."
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Blader naar videospeler"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Alle PartBestanden Geladen."
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Selecteer browser"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Geen part-bestanden gevonden"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Uitvoerbare%s"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "%u part bestand gevonden"
+msgstr[1] "%u part bestanden gevonden"
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Bewerk serverlijst"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
+msgstr "Bestandssysteem voor Temp directory kan grote bestanden niet verwerken"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+# Translate 'Incoming directory'?
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
-"Voeg hier URL's toe om server.met bestanden te downloaden.\n"
-"Slechts een url per regel."
-
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Update vertraging: %d seconde"
-msgstr[1] "Update vertraging: %d seconden"
+"Bestandssysteem voor Incoming directory kan grote bestanden niet verwerken."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Tijd voor gemiddeldengrafiek: %d minuut"
-msgstr[1] "Tijd voor gemiddeldengrafiek: %d minuten"
+msgid "Downloading %s"
+msgstr "Downloaden van %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Verbindingen Grafiek Schaal: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "U probeert het bestand '%s' al te downloaden"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Update vertraging : %d seconde"
-msgstr[1] "Update vertraging : %d seconden"
+msgid "You already have the file '%s'"
+msgstr "U heeft het bestand '%s' al"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Bestandsbuffer Grootte: %d byte"
-msgstr[1] "Bestandsbuffer Grootte: %d bytes"
+msgid "You are already trying to download the file %s"
+msgstr "U probeert het bestand %s al te downloaden"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Upload Wachtrij Grootte: %d client"
-msgstr[1] "Upload Wachtrij Grootte: %d clients"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Kan magnet-link niet omzetten naar eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Server verbinding verversingsinterval: %d minuut"
-msgstr[1] "Server verbinding verversingsinterval: %d minuten"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Server verbinding verversingstijd: Uitgeschakeld"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "UDP poort voor uitgebreide server aanvragen (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "uitgeschakeld"
+msgid "Unknown protocol of link: %s"
+msgstr "Onbekend protocol in link: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Voer commando uit bij gebeurtenis `%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Schakel uitvoeren van commando's in kern in"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Kern commando:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Schakel uitvoeren van commando's in GUI in"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "GUI commando:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "De volgende variabelen worden vervangen:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Ongeldige eD2k link! FOUT: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Poging tot ongeautoriseerde toegang. Verbinding gesloten."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "Client verstuurde pakket nadat authenticatie mislukte."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Externe verbinding gesloten."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Externe verbindingen uitgeschakeld vanwege leeg wachtwoord!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Externe verbindingen uitgeschakeld in config bestand"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Nieuwe externe verbinding geaccepteerd"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "FOUT: kon nieuwe externe verbinding niet accepteren"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Externe verbinding geweigerd vanwege leeg wachtwoord bij voorkeuren!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Client verbinden: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Onbekende versie"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2353,2227 +1639,1061 @@
 "Incorrecte EV versie ID, mogelijk niet compatible. Gebruik kern en op "
 "afstand van dezelfde snapshot."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"U kunt niet verbinden met een releaseversie van een willekeurige SVN versie! "
-"*zucht* mogelijke crash voorkomen"
-
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Authenticatie mislukt."
+"U kunt niet verbinden met een release versie vanaf een willekeurig "
+"ontwikkelingssnapshot! *zucht* mogelijke crash voorkomen"
 
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Ongeldige protocol versie."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Ontbrekend protocol versielabel."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
-msgstr "Ongeldig verzoek, u moet u eerst authenticeren."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr "Authenticatie mislukt: ongeldige hash opgegeven als EV-wachtwoord."
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Authenticatie mislukt: verkeerd wachtwoord."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Authenticatie mislukt: ontbrekend wachtwoord."
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
+msgstr "Ongeldig verzoek, authenticeer eerst a.u.b."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Toegang verleend."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Foutmelding \"%s\" verzonden naar client."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Poging tot ongeautoriseerde toegang van %s. Verbinding gesloten."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
-"PartBestands commando op afstand mislukt: BestandsHash niet gevonden: %s"
+"PartBestand-commando op afstand mislukt: BestandsHash niet gevonden: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "BestandsHash niet gevonden: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "OEPS! OpCode verwerkingsfout!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Server niet toegevoegd"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "server niet gevonden: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "moet de te verwijderen server defini?ren"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2K is uitgeschakeld in voorkeuren."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Bezig met zoeken. Haal de resultaten op over een momentje!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "WebSearch vanaf afstand is zinloos."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad is uitgeschakeld in voorkeuren."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Geen punten voor grafiek."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Uw client is niet geconfigureerd voor dit niveau van details."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Externe Verbinding: afsluiten aangevraagd"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Al bezig met afsluiten."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExterneVerb: link '%s' wordt toegevoegd."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Ongeldige link of al op de lijst."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Bestand niet gevonden."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Ongeldige bestandsnaam."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Kon naam van bestand niet wijzigen."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad is uitgeschakeld in voorkeuren."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Al verbonden met eD2K."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Aan het verbinden met eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Al verbonden met Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Verbinding met Kad wordt gemaakt..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Alle netwerken zijn uitgeschakeld."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Verbinding met eD2K verbroken."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Verbinding met Kad verbroken."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Externe Verbinding: ongeldige opcode ontvangen: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Ongeldige opcode (verkeerde protocol versie?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Kon bestand niet openen (%s), wordt verwijderd uit de lijst van gedeelde "
-"bestanden."
-
-#: src/UploadClient.cpp:718
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Hashset opgevraagd voor onbekend bestand: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Commando `%s' met pid `%d' is be?indigd met statuscode `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Server niet toegevoegd: Geen IP of hostnaam opgegeven."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Server niet toegevoegd: Ongeldige server-poort opgegeven."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "eD2k Status:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Verbonden"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Poort"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kademlia Status:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Draaiende"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Status:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Niet verbonden"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Verbindingsstatus:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Firewalled"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Firewalled status: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Verbonden met buddy"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Geen buddy"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Gemiddelde Gebruikers:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Gemiddelde Bestanden:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Niet draaiende"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Uptime: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Overdracht"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Uploads"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Geuploade Data (Sessie (Totaal)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Totale Overhead (Pakketten): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Bestand Aanvraag Overhead (Pakketten): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Bron Uitwisseling Overhead (Pakketten): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Server Overhead (Pakketten): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Kad Overhead (Pakketten): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Crypt overhead (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Actieve Uploads: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Wachtende Uploads: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Totaal van succesvolle upload sessies: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Totaal van mislukte upload sessies: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Gemiddelde upload tijd: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Downloads"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Gedownloade Data (Sessie (Totaal)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Gevonden Bronnen: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Actieve Download (blokken): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Sessie UL:DL Verhouding (Totaal): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Gemiddelde downloadsnelheid (Sessie): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Gemiddelde uploadsnelheid (Sessie): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Max downloadsnelheid (Sessie): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Max uploadsnelheid (Sessie): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Hernieuwde verbindingen: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Tijd Sinds Eerste Overdracht: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Verbonden Met Server Sinds: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Actieve Verbindingen (schatting): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Max Verbinding Grens Bereikt: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Gemiddelde Verbindingen (schatting): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Aantal Piek Verbindingen (schatting): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Clients"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Gefilterd"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Totaal: %i Bekend: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Werkende Servers: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Mislukte Servers: %i"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Onbekende extensie '%s' van het '%s' commando.\n"
 
-#: src/Statistics.cpp:717
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Total: %s"
-msgstr "Totaal: %s"
+msgid "Unknown command '%s'.\n"
+msgstr "Onbekend commando '%s'.\n"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Verwijderde Servers: %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Dit commando heeft geen argumenten.\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Gefilterde Servers: %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Dit commando moet een argument hebben.\n"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Gebruikers op Werkende Servers: %llu"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Dit commando is niet compleet, u moet een van onderstaande uitbreidingen "
+"gebruiken.\n"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Bestanden op Werkende Servers: %llu"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Beschikbare uitbreidingen:\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Totaal Gebruikers: %llu"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Beschikbare commando's:\n"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Total Files: %llu"
-msgstr "Totaal Bestanden: %llu"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Alle commandos zijn hoofdlettergevoelig.\n"
+"Type '%s <command>' om gedetailleerde info te krijgen over <command>.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Server Bezetting: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Sluit het programma af."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Aantal Gedeelde Bestanden: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Toon help."
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Totale grootte van Gedeelde Bestanden: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Om help te krijgen over een commando, type 'help <commando>'.\n"
+"Om de volledige commando lijst te krijgen type 'help'.\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
-msgstr "Gemiddelde bestandsgrootte: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Besturingssysteem"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Niet Ontvangen"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Knippen"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Plakken"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Alles Selecteren"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Gebruik '%s' voor commando lijst\n"
+"\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad zoekopdracht kan niet worden uitgevoerd als Kad niet draait"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Syntax fout!"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "eD2K zoekopdracht kan niet worden uitgevoerd als eD2K niet draait"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+"Fout bij het verwerken van commando - zou nooit mogen gebeuren! Rapporteer "
+"deze bug, a.u.b.\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Onverwachte fout bij Kad zoekopdracht: "
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Dit commando heeft geen parameters."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Bericht van '%s' gefilterd (IP:%s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Dit commando moet een parameter hebben."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nieuw bericht van '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Ongeldig argument."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "Gebruiker %s (%u) vroeg uw gedeeldebestanden-lijst op -> Geaccepteerd"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Dit is een incompleet commando."
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "Gebruiker %s (%u) vroeg uw gedeeldebestanden-lijst op -> Geweigerd"
+msgid "Type '%s' to get more help.\n"
+msgstr "Type '%s' voor meer help.\n"
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "Gebruiker %s (%u) vroeg uw gedeeldedirectories-lijst op -> Toegestaan"
+msgid "This is %s %s %s\n"
+msgstr "Dit is %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "Gebruiker %s (%u) vroeg uw gedeeldedirectories-lijst op -> Geweigerd"
+msgid "This is %s %s\n"
+msgstr "Dit is %s %s\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"Gebruiker %s (%u) vroeg uw gedeeldebestanden-lijst van directory %s op -> "
-"geaccepteerd"
-
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+"\n"
+"Creating client...\n"
 msgstr ""
-"Gebruiker %s (%u) vroeg uw gedeeldebestanden-lijst van directory %s op -> "
-"geweigerd"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Gebruiker %s (%u) deelt directory %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Gebruiker %s (%u) stuurde niet-opgevraagde gedeelde dirs."
-
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "Gebruiker %s (%u) stuurde gedeeldebestanden-lijst van directory %s"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Gebruiker %s (%u) heeft gedeeldebestanden-lijst gestuurd"
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Gebruiker %s (%u) stuurde ongewild gedeeldebestanden-lijst"
+"\n"
+"Aanmaken van client...\n"
 
-#: src/ClientTCPSocket.cpp:1049
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Gebruiker %s (%u) weigerde toegang tot gedeelde directories/bestanden lijst"
-
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Nodes (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Ongeldig ip om van te bootstrappen"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Ongeldige poort om van te bootstrappen"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Vul a.u.b. alle benodigde velden in"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Weet u zeker dat u een nieuw nodes.dat bestand wilt downloaden?\n"
+"\n"
+"Ok, %s wordt afgesloten...\n"
 
-#: src/KadDlg.cpp:197
+#: src/ExternalConnector.cpp:420
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"Dat zal uw huidige nodes verwijderen en de Kademlia verbinding opnieuw "
-"starten."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Verder gaan?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "FOUT: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "WAARSCHUWING: "
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Voeg een Vriend toe"
-
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "U moet een geldig IP adres en poortnummer invoeren!"
+"Kan niet verbinden met een leeg wachtwoord.\n"
+"U moet een wachtwoord opgeven in het config bestand\n"
+"of op de commando-regel, of invoeren als daarom gevraagd\n"
+"wordt.\n"
+"\n"
+"Bezig met afsluiten...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informatie"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Toon deze help tekst"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "De aangegeven userhash is niet geldig!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Host waar aMule draait. (standaard: localhost)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Bronnen"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "aMules poort voor Externe Verbindingen. (standaard: 4712)"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Bestand"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Externe Verbinding wachtwoord."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Download"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Lees configuratie uit bestand."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Categorie"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Print geen uitvoer naar stdout."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Standaard"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Wees uitgebreid - toon ook debug berichten."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Download in categorie"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Stelt programma locale (taal) in."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Zoek gelijkwaardige bestanden (eD2k, lokale server)"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Schrijf opties op de opdrachtregel naar config bestand."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Markeer als bekend bestand"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Maakt config bestand gebaseerd op aMules config bestand."
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Verbind met amule op afstand"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Toon programma versie."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Verbinding mislukt "
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Bestandsdetails"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "FOUT"
+#: src/FileDetailDialog.cpp:113
+#, c-format
+msgid "%.1f%% done"
+msgstr "%.1f%% voltooid"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Verbinding Mislukt. Kon niet verbinden met %s:%d\n"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
-msgstr ""
-"WAARSCHUWING: U kunt uzelf niet toevoegen als bron voor een eD2k link "
-"terwijl u een laag id hebt."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "Kon vriendenlijst-bestand 'emfriends.met' niet lezen!"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Gebruikers: E: %s K: %s | Bestanden E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "Kon niet schrijven naar vriendenlijst-bestand 'emfriends.met'!"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Alle"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "KRITIEK - geen client bij StartChatSession"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Totaal Gebruikers: %s | Totaal Bestanden: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Vrienden"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Overgebracht"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Laat &Details Zien"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Snelheid"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Voeg een vriend toe"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Voortgang"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Verwijder Vriend"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Status"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Verstuur &Message"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Overgebleven Tijd"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Bekijk Bestanden"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Laatst Compleet Gezien"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Maak Vriendenslot"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Laatste Overdracht"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Weet u zeker dat u de geselecteerde vriend wilt verwijderen?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Weet u zeker dat u het geselecteerde bestand wilt verwijderen?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Weet u zeker dat u de geselecteerde vrienden wilt verwijderen?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Weet u zeker dat u de geselecteerde bestanden wilt verwijderen?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"U kunt maximaal ??n vriendenslot instellen.\n"
+" Slechts één slot is toegekend."
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Meerdere selectie"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Verstuur bericht naar gebruiker"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Bericht om te versturen:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Stop"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pauzeer"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "Ve&rder gaan"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "Verwijder comp&lete"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Wissel elk A4AF nu uit met dit bestand"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Wissel elk A4AF uit met dit bestand (Auto)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Wissel elk A4AF nu uit met de andere bestanden"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Uitgebreide Opties"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Voorbeeld"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Bekijk &details"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Bekijk alle commentaren"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Kopieer magnet URI naar klembord"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "Verwijder toewijzing"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Toewijzen aan catgorie"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Open het bestand"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Verwijder uit vriendenlijst"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Voeg toe aan Vrienden"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Verstuur bericht"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Wissel uit naar dit bestand"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
-msgstr "QR: %u (%i)"
+msgid "On Queue: %u (%i)"
+msgstr "In Wachtrij: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Al om een ander bestand gevraagd"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Downloads (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Om deze waarschuwing te voorkomen bij elk voorbeeld\n"
-"dient u uw video afspeelprogramma in te stellen bij voorkeuren (standaard is "
-"mplayer)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Voorbeeld"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "FOUT: Opstarten externe mediaspeler mislukt! Commando: '%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "FOUT: Kon part-bestand niet aanmaken)"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Proberen backup van met-bestand te laden van %s"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "FOUT: Kon part.met bestand niet openen: %s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "FOUT: part.met bestand heeft grootte 0: %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "FOUT: Ongeldige part.met bestandsversie: %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"FOUT: %s (%s) is beschadigd (verkeerde tagcount), kan bestand niet laden."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Poging om bestandsinfo te herstellen..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr ""
-"Naamloos bestand herstellen - zal proberen om het te herstellen als "
-"RecoverdFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Alle beschikbare bestands info hersteld :D - Poging om het te gebruiken..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Kon bestands info niet herstellen :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Kon %s (%s) niet openen"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "WAARSCHUWING: %s is mogelijk beschadigd (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "FOUT bij het bewaren van partbestand: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Kon lengte van '%s' niet bepalen - gebruik %s bestand."
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Wachtende op upload slot"
 
-#: src/PartFile.cpp:927
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' heeft grootte 0 - %s bestand wordt gebruikt."
+msgid "On Queue: %u"
+msgstr "In wachtrij: %u"
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Kon bestand part.met.seeds niet bewaren voor %s"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Aan het uploaden"
 
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "%i bron seed voor deelbestand bewaard: %s (%s)"
-msgstr[1] "%i bron seeds voor deelbestand bewaard: %s (%s)"
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Geen"
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Partbestand %s (%s) heeft geen seeds bestand"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Nee"
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Partbestand %s (%s) heeft een leeg seeds bestand"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Ja"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Fout bij het lezen van partbestands seeds bestand (%s - %s): %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Downloaden..."
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Beschadigd deel (%d) gevonden in %d deel bestand %s - FileResultHash |%s| "
-"FileHash |%s|"
-msgstr[1] ""
-"Beschadigd deel (%d) gevonden in %d delen bestand %s - FileResultHash |%s| "
-"FileHash |%s|"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "HTTP download geannuleerd"
 
-#: src/PartFile.cpp:1181
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Compleet deel (%i) gevonden in %s"
+msgid "Unable to create destination file %s for download!"
+msgstr "Kon doelbestand %s voor download niet aanmaken!"
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Klaar met opnieuw hashen %s"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "De URL om te downloaden mag niet leeg zijn"
 
-#: src/PartFile.cpp:2239
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Onverwachte fout tijdens het voltooien van %s. Bestand gepauzeerd"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "De URL %s leverde op: %i - Fout (%i)!"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Klaar met downloaden: %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Kritieke fout bij het schrijven van gedownload bestand"
 
-#: src/PartFile.cpp:2323
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Deleting file: %s"
-msgstr "Verwijderen van bestand: %s"
+msgid "Downloaded %d bytes"
+msgstr "%d bytes gedownload"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"WAARSCHUWING: Kan gedownload deel niet hashen - incomplete hashset voor '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Verwachtte %d bytes, maar %d bytes gedownload"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"FOUT: Kan gedownload deel niet hashen - hashset incompleet (%s). Dit zou "
-"nooit mogen gebeuren"
+"Ongeldige URL voor HTTP download of HTTP redirection (bent u 'http://' "
+"vergeten?"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr ""
-"WAARSCHUWING: Niet voldoende vrije schijfruimte! Pauzeren van bestand: %s"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "Kon niet verbinden met HTTP downloadserver"
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Gedownload deel %i is beschadigd in bestand: %s"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Beschadigd deel %i van %s hersteld -> Bespaarde bytes: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Toewijzen"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Onvoldoende schijfruimte"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Gestopt"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Ongeldig antwoord van HTTP downloadserver"
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Gedownload"
-
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "FOUT: Openen partfile '%s' mislukt"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Download van nieuwe GeoIP.dat van %s"
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "WAARSCHUWING: known.met kan niet geopend worden."
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "Download van bestand GeoIP.dat mislukt, update wordt gestopt."
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr "WAARSCUWING: Knownfile-lijst beschadigd, bevat ongeldige header."
-
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "IO fout bij het lezen van known.met bestand: %s"
+msgid "Failed to remove %s file, aborting update."
+msgstr "Kon bestand %s niet verwijderen, update wordt gestopt."
 
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Fout bij het bewaren van known.met bestand; %s"
+msgid "Failed to rename %s file, aborting update."
+msgstr "Kon bestand %s niet hernoemen, update wordt gestopt."
 
-#: src/SharedFileList.cpp:352
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] " %i bekend gedeeld bestand gevonden"
-msgstr[1] " %i bekende gedeelde bestanden gevonden"
-
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "%i bekend gedeeld bestand gevonden, %i onbekend"
-msgstr[1] "%i bekende gedeelde bestanden gevonden, %i onbekend"
-
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "FOUT: Poging om %s te delen"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Bestand Commentaren"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Waardering"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Commentaar"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Geen commentaren"
-
-#: src/CommentDialogLst.cpp:104
-#, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u commentaar"
-msgstr[1] "%u commentaren"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Kon niet verbinden met een geobfusceerde server. Nogmaals proberen zonder "
-"obfuscatie."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Kon niet verbinden met een server in de lijst. Nogmaals proberen."
+msgid "Successfully updated %s"
+msgstr "%s succesvol geüpdatet"
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "eD2K netwerk is uitgeschakeld in voorkeuren, wordt niet mee verbonden."
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Fout bij het updaten van GeoIP.dat"
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Geen geldige servers om mee te verbinden gevonden in serverlijst"
-
-#: src/ServerConnect.cpp:187
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Verbonden met %s (%s:%i)"
+msgid "Failed to download %s from %s"
+msgstr "Kon %s niet downloaden van %s"
 
-#: src/ServerConnect.cpp:263
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Verbinding gemaakt met: %s"
+msgid "Failed to load country data for '%s'."
+msgstr "Kon landgegevens niet laden voor '%s'."
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr ""
-"Fatale Fout bij het proberen te verbinden. Internet verbinding kan uit zijn"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "IP-filters 'ipfilter.dat' en 'ipfilter_static.dat' worden geladen."
 
-#: src/ServerConnect.cpp:339
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Verbinding verbroken met %s (%s:%i)"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "Kon ipfilter.dat bestand '%s' niet laden, onbekend formaat."
 
-#: src/ServerConnect.cpp:349
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) lijkt dood te zijn."
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "Kon ipfilter.dat bestand '%s' niet laden, kon bestand niet openen."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) lijkt vol te zijn."
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "%u IP-reeks geladen van '%s'."
+msgstr[1] "%u IP-reeksen geladen van '%s'."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] ""
-"Automatische verbinding naar server zal in %d seconde opnieuw proberen"
-msgstr[1] ""
-"Automatische verbinding naar server zal in %d seconden opnieuw proberen"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Verbinding kwijt"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u misvormde regel is genegeerd"
+msgstr[1] "%u misvormde regels zijn genegeerd"
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Verbinden met %s (%s:%i) is mislukt."
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Kon nieuw bestand %s niet hernoemen, update wordt gestopt."
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "FOUT: Socket ongeldig op timeoutcheck"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "IP-filter is klaar"
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Poging tot verbinden met %s (%s:%i) gaf time out."
-
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-"FOUT: Laden van backupbestand misukt. Zoek op http://forum.amule.org naar ."
-"part.met hersteloplossingen."
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Geen part-bestanden gevonden"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "%u part bestand gevonden"
-msgstr[1] "%u part bestanden gevonden"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr "Bestandssysteem voor Temp directory kan grote bestanden niet verwerken"
-
-# Translate 'Incoming directory'?
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Bestandssysteem voor Incoming directory kan grote bestanden niet verwerken."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Downloaden van %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "U probeert het bestand '%s' al te downloaden"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "U heeft het bestand '%s' al"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "U probeert het bestand %s al te downloaden"
+"Bootstrap van \n"
+"bekende clients"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Kan magnet-link niet omzetten naar eD2k: %s"
+msgid "Nodes (%u)"
+msgstr "Nodes (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Onbekend protocol in link: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Ongeldig ip om van te bootstrappen"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Ongeldige eD2k link! FOUT: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Ongeldige poort om van te bootstrappen"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Voer <str> uit en sluit af."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Vul a.u.b. alle benodigde velden in"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Ongeldig IP formaat: Gebruik xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Weet u zeker dat u een nieuw nodes.dat bestand wilt downloaden?\n"
 
-# Translation 'argument'?
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Dit commando heeft een argument nodig. Geldige argumenten: 'all', "
-"bestandsnaam, of een getal.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Verwerken per hash:"
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Verwerken per bestandsnaam"
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Dit commando heeft een argument nodig. Geldige argumenten: een "
-"bestandshash.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Niet een geldig nummer\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Geen geldige hash (lengte moet precies 32 tekens zijn)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Bewerking was succesvol."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Aanvraag mislukte met de volgende fout: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "IP filteren van clients is %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "UIT"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "AAN"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "IP filteren van servers is %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Huidige IPFilter Level is %d.\n"
+"Dat zal uw huidige nodes verwijderen en de Kademlia verbinding opnieuw "
+"starten."
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Bandbreedte grenzen: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Verder gaan?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: zoekwoord te kort"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Verbonden met %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "met Laag ID"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "met Hoog ID"
+msgid "Keyword for search: %s"
+msgstr "Zoekwoord: %s"
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Aan het verbinden"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Niet verbonden"
-
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
-msgstr ""
-"\n"
-"Download:\t%s"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: Zoekwoord staat al op de zoeklijst: "
 
-#: src/TextClient.cpp:726
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Upload:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Upload:\t%s"
+"Kon bestand nodes.dat niet lezen - te oud. Deze versie (0) wordt niet meer "
+"ondersteund."
 
-#: src/TextClient.cpp:729
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Clients in wachtrij:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "%u Kad contact gelezen"
+msgstr[1] "%u Kad contacten gelezen"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Totale Bronnen:\t%d\n"
+"Geen contacten gevonden, bootstrap a.u.b., of download een nodes.dat bestand."
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Aantal zoekresultaten: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - toon voortgang van een zoekopdracht"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Slechts %d Kad contact beschikbaar, nodes.dat niet beschreven"
+msgstr[1] "Slechts %d Kad contacten beschikbaar, nodes.dat niet beschreven"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Ongeldig antwoord van de server ontvangen, OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Toon korte status informatie."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Toon verbindingsstatus, huidige up/download snelheden, etc.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Toon volledige statistieken boom."
-
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Optioneel kan een getal van 0-255 worden meegegeven als argument aan dit\n"
-"commando, wat aangeeft hoeveel ingangen van de client versie subbomen "
-"getoond\n"
-"moeten worden. 0 of weglaten betekent 'onbegrensd'.\n"
-"\n"
-"Voorbeeld: 'statistics 5' toont alleen de bovenste 5 versies van elk client "
-"type.\n"
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Sluit aMule af."
-
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Sluit de kern op afstand (amule/amuled) af.\n"
-"Dit sluit ook de textclient af, omdat die onbruikbaar is zonder een\n"
-"draaiende kern.\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Laadt gegeven object opnieuw."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "%d Kad contact geschreven"
+msgstr[1] "%d Kad contacten geschreven"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Laadt gedeelde bestanden lijst opnieuw."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Bestandsnaam"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Laadt IP Filter tabel opnieuw uit bestand."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Bestandsgrootte"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Verbind met het netwerk."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Deel ratio"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"Dit verbindt met alle netwerken die ingeschakeld zijn in Voorkeuren.\n"
-"U kunt ook een server adres in de vorm IP:Poort specificeren om alleen met "
-"die\n"
-"server te verbinden. Het IP moet een decimaal IPv4 adres met punten zijn,\n"
-"of een DNS naam."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Geüpload"
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Verbind alleen met eD2K."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Aangevraagd"
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Verbind alleen met Kad."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Geaccepteerd"
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Verbreek verbinding met het netwerk."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Complete bronnen"
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Dit verbreekt de verbinding met alle netwerken waarmee nu verbinding is.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Verbreek alleen verbinding met eD2K."
+"WAARSCHUWING: Bekende-bestandenlijst beschadigd, bevat ongeldige header."
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Verbreek alleen verbinding met Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Voegt een eD2k of magnet-link toe aan de kern."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"De toe te voegen eD2k link kan zijn:\n"
-"*) een bestandslink (ed2k://|file|...), het wordt toegevoegd aan de download "
-"wachtrij,\n"
-"*) een serverlink (ed2k://|server|...), het wordt toegevoegd aan de "
-"serverlijst,\n"
-"*) of een serverlijst-link, in dat geval worden alle servers in de lijst "
-"toegevoegd aan de\n"
-"   serverlijst.\n"
-"\n"
-"De magnet-link moet de eD2k hash en bestandsgrootte bevatten.\n"
+"Kon vermelding in bekende-bestandenlijst niet laden, bestand kan beschadigd "
+"zijn"
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Stel een voorkeurswaarde in."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Stel IPFilter voorkeuren in."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Schakel IP filteren van zowel clients als servers in."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Schakel IP filteren van zowel clients als servers uit."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Schakel IP filteren van clients in/uit."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Schakel IP filteren van clients in."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Schakel IP filteren van clients uit."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Schakel IP filteren van servers in/uit."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Schakel IP filteren van servers in."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Schakel IP filteren van servers uit."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Selecteer IP filter niveau."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Geldige filterniveaus zijn in de reeks 0-255, en zijn standaard (initiele)\n"
-"waarde is 127.\n"
+"Ongeldige vermelding in bekende-bestandenlijst, bestand kan beschadigd zijn: "
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Stel bandbreedte grenzen in."
+#: src/libs/common/Format.cpp:307
+#, c-format
+msgid "Unknown error %d"
+msgstr "Onbekende fout %d"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "De waarde gegeven aan deze commando's moet in kilobytes/sec zijn.\n"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Kon foutbeschrijving niet verkrijgen voor fout %d"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Stel upload bandbreedte grens in."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Aan het hashen"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Stel download bandbreedte grens in."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Voltooien"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Verkrijg en toon een voorkeurswaarde."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Compleet"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Verkrijg IPFilter voorkeuren."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Gepauzeerd"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Verkrijg IPFilter status voor zowel clients als servers."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Foutief"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Verkrijg IPFilter status alleen voor clients."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Wachten"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Verkrijg IPFilter status alleen voor servers."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "U moet een niet-leeg wachtwoord opgeven."
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Verkrijg IPFilter niveau."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Ongeldig wachtwoord, geen MD5 hash!"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Verkrijg bandbreedte grenzen."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Verbindingsfout"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Voert een zoekopdracht uit."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "EV verbinding mislukte. Leeg antwoord."
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
-"Een zoektype moet opgegeven worden door het type te geven:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Voorbeeld: 'search kad bestand' voert een kad zoekopdracht uit naar \"bestand"
-"\".\n"
-
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Voert een globale zoekopdracht uit."
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Voert een lokale zoekopdracht uit"
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Voert een kad zoekopdracht uit"
+"Externe Verbinding: Slecht antwoord, handshake mislukt. Verbinding verbroken."
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Toont de resultaten van de laatste zoekopdracht."
-
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Levert de resultaten van de vorige zoekopdracht op.\n"
-
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Toont de voortgang van een zoekopdracht."
-
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Toont de voortgang van een zoekopdracht.\n"
-
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Begin met downloaden van een bestand"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Succes! Verbinding gemaakt met aMule "
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Het nummer van een bestand uit de laatste zoekopdracht moet gegeven worden.\n"
-"Voorbeeld: 'download 12' begint het bestand met nummer 12 uit de vorige "
-"zoekopdracht te downloaden.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Gelukt! Verbinding gemaakt."
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Pauzeer dowload."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Externe Verbinding: Toegang geweigerd omdat: "
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Verder gaan met download."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Externe Verbinding: Handshake mislukt."
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "ListenSocket: Ok."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Download annuleren."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "FOUT: Kon niet luisteren op TCP poort"
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Stel downloadprioriteit in."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "FOUT: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Stel prioriteit van een download in op Laag, Normaal, Hoog of Auto.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "WAARSCHUWING: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Stel prioriteit in op laag."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Sluiten"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Stel prioriteit in op normaal."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Knippen"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Stel prioriteit in op hoog."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Kopiëren"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Stel prioriteit in op auto."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Plakken"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Toon wachtrij/lijsten."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Wissen"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Toont upload/download wachtrij, server lijst of gedeelde bestanden lijst.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Alles Selecteren"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Toon upload wachtrij."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Toon download wachtrij."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Onbegrensd"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Toon log."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule Systeemvak Menu"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Toon servers lijst."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Snelheid grenzen:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Log leegmaken."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "UL: Geen"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Afgekeurd commando, gebruik '%s' in plaats hiervan."
+msgid "UL: %u"
+msgstr "UL: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Dit is een afgekeurd commando, en kan in de toekomst verwijderd worden.\n"
-"Gebruik '%s' in de plaats.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DL: Geen"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "FOUT: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "DL: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "WAARSCHUWING: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Downloadsnelheid: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Nieuwe clientid is %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "WAARSCHUWING: U heeft een laag ID gekregen!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tDit komt waarschijnlijk omdat u achter een firewall of router zit."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tVoor meer informatie, bekijk http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Uploadsnelheid: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Onbekende server info ontvangen! - te kort"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Client Informatie"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "%d nieuwe server ontvangen"
-msgstr[1] "%d nieuwe servers ontvangen"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Bewaren van server-lijst compleet."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Server keurde laatste opdracht af"
+msgid "Nickname: %s"
+msgstr "Bijnaam: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Fout pakket ontvangen van server: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Geen Bijnaam Geselecteerd!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Onafgehandelde fout bij het verwerken van pakket van de server: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ClientID: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Kan DNS thread niet aanmaken voor het verbinden met %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Niet verbonden"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "Server IP %s (%s) is gefilterd.  Wordt niet mee verbonden."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "ServerNaam: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "maakt gebruik van protocol obfuscatie."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "ServerIP: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Verbinding wordt gemaakt met %s (%s - %s:%i) %s"
+# msgstr "Verbinden"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Niet verbonden"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Kan dns niet vinden voor server %s: Kan niet verbinden!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Kon landengegevens niet laden uit "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "%d vlag bitmap geladen"
-msgstr[1] "%d vlag bitmaps geladen"
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Weet u zeker dat u wilt annuleren en alle bestanden in deze categorie "
-"verwijderen?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Bevestiging Nodig"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Alle anderen"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Incompleet"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Actief"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Video"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Geluid"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Archief"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD-Images"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Plaatjes"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Tekst"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Selecteer filter"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Voeg categorie toe"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Bewerk categorie"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Verwijder categorie"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Bestandsnaam"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Bestandsgrootte"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Deel ratio"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Geüpload"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Aangevraagd"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Geaccepteerd"
+msgid "TCP port: %d"
+msgstr "TCP poort: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Complete bronnen"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP poort: Niet gereed"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Bezig met importeren van %s: %s"
+msgid "UDP port: %d"
+msgstr "UDP poort: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Tijdelijke map wordt gelezen"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UDP poort: Niet gereed"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Basisinformatie van download info bestand wordt opgehaald"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Online Handtekening: Ingeschakeld"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Doelbestand wordt aangemaakt"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Online Handtekening: Uitgeschakeld"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Data van oud download bestand wordt geladen (%u van %u)"
+msgid "Uptime: %s"
+msgstr "Uptime: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Data block wordt bewaard in nieuw enkel download bestand (%u van %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Bron downloadbestand informatie wordt opgehaald"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Download wordt toegevoegd en nieuw partbestand bewaard"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importeer deelbestanden"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Status"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Bestandshash"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Wachtend..."
+msgid "Shared files: %d"
+msgstr "Gedeelde bestanden: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Schijf: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Kies a.u.b. een map om te doorzoeken naar tijdelijke downloads! "
-"(onderliggende mappen worden meegenomen)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"Wilt u dat de bron bestanden van succesvol ge?mporteerde bestanden "
-"verwijderd worden?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Verwijder bronnen?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/sec"
-msgstr[1] "bytes/sec"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "seconden"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "minuten"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "uren"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Dagen"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Video's"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Archieven"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Teksten"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programma's"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Alles"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Niet beoordeeld"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Onbruikbaar / Beschadigd / Nep"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Matig"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Redelijk"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Goed"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Uitstekend"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "alle"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "alle anderen"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "IP-filters 'ipfilter.dat' en 'ipfilter_static.dat' worden geladen."
+msgid "Queued clients: %d"
+msgstr "Clients in wachtrij: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Kon ipfilter.dat bestand '%s' niet laden, onbekend formaat."
+msgid "Total DL: %s"
+msgstr "Totaal gedownload: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "Kon ipfilter.dat bestand '%s' niet laden, kon bestand niet openen."
+msgid "Total UL: %s"
+msgstr "Totaal geupload: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "%u IP-reeks geladen van '%s'."
-msgstr[1] "%u IP-reeksen geladen van '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Upload grens"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u misvormde regel is genegeerd"
-msgstr[1] "%u misvormde regels zijn genegeerd"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Download grens"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Actieve verbindingen (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Verberg aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Bestandsdetails"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Toon aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% compleet"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Afsluiten"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "eD2k Link: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Uitvoeren"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Klik hier om de eD2k link in de text control toe te voegen aan uw download "
 "wachtrij."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4581,19 +2701,19 @@
 "Gebeurtenissen worden hier getoond. Voor een complete lijst van "
 "gebeurtenissen, bekijk de log in de Servers-tab."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Laden ..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Aantal gebruikers op de server waar u mee verbonden bent ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Gebruikers: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4602,6 +2722,10 @@
 "aantal gebruikers."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Up: 0.0 | Down: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4609,7 +2733,7 @@
 "Huidige gemiddelde upload en download snelheden. Indien ingeschakeld geven "
 "de getallen tussen haakjes de overhead door client communicatie aan."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4621,520 +2745,575 @@
 "firewall) hebt en groene pijlen geven aan dat u een hoog ID (Het optimale "
 "verbindingstype) hebt."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Niet Verbonden ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Server nu mee verbonden."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Zoeken"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Type"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Lokaal"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Globaal"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "BestandsHash"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Uitgebreide Parameters"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filters"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "BestandsType"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Alles"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Archieven"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Geluid"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD-Images"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Plaatjes"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programma's"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Teksten"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Video's"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Extensie"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Min Grootte"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "kB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Max Grootte"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Beschikbaarheid"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filter:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Filter Resultaat"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Resultaat Omkeren"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Verberg Bekende Bestanden"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Start"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Meer"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Zoekt naar meer resultaten op eD2K. Werkt nog niet voor Kad."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Stop"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Download"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Velden Leegmaken"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Resultaten"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Verwijderd complete downloads"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Toont Upload / Up-wachtrij"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Clients in wachtrij :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Verstuur"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Verstuurt het opgegeven bericht."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Sluiten"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Bestandsbronnen:"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Sluit deze chat-sessie."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Algemeen"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Volledige Naam :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/B"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "met-Bestand :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Hash :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Bestandsgrootte :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Partbestandsstatus :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Laatst compleet gezien :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Overdracht"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Gevonden Bronnen :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Bronnen Overdragen :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Bestandsdeel-Teller :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Beschikbaar :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Datasnelheid :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Actieve Downloadtijd: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Overgedragen :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Volledige Grootte :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligente Beschadigings Afhandeling (I.C.H.)"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Verloren door beschadiging :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Verkregen door compressie :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Pakketten gered door I.C.H. :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "BestandsNamen"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Neem over"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Opruimen"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Toepassen"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 "Geef bestand commentaar/waardering (Tekst zichtbaar voor alle gebruikers)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Voor een film kunt u vertellen: de lengte, het verhaal, de taal ...\n"
-"en als het nep is kunt u dat de andere gebruikers van aMule vertellen."
+"Voor een film kunt iets zeggen over de lengte, het verhaal, de taal ...\\n"
+"\\nen als het nep is kunt u dat vertellen aan de andere gebruikers van aMule."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Bestands Kwaliteit"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Niet beoordeeld"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Onbruikbaar / Beschadigd / Nep"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Matig"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Redelijk"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Goed"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Uitstekend"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Kies de bestands waardering of adviseer gebruikers als het bestand ongeldig "
 "is ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Verversen"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Downloaden, geduld aub ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Onbekende grootte"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Benodigde Informatie"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP Adres :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Poort :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Extra Informatie"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Gebruikersnaam :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Gebruikershash :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Laad uw gedeelde bestanden opnieuw"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Huidige Sessie"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Totaal"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Opgevraagd :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Actieve Uploads :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Toevoegen"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
-msgstr "Download-Snelheid"
+msgstr "Downloadsnelheid"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Huidige"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Lopende gemiddelde"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Sessie gemiddelde"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
-msgstr "Upload-Snelheid"
+msgstr "Uploadsnelheid"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Verbindingen"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Actieve downloads"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Actieve verbinding (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Actieve uploads"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Statistieken Boom"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Gebruikershash:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Client software:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Client versie:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP adres:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "Gebruikers ID:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "Server IP:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Servernaam:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Maskering"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Overdrachten naar client"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Huidige aanvraag:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Gemiddelde upload snelheid:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Gemiddelde download snelheid:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Geupload (sessie):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Gedownload (sessie):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Geupload (totaal):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Gedownload (totaal):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Scores"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "DL/UP verhouding:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Veilige identiteit:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Waardering (totaal):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Wachtrij positie:"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Wachtrij score:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Bijnaam"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - the Linux Mule"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - de multi-platform Mule"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Dit is de naam die andere gebruikers zien wanneer ze met u verbinden."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Taal"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Taal: "
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "De vertraging voordat tool-tips worden getoond."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Dit specificeert de taal waarin aMule wordt getoond."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Overige Opties"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Controleer op nieuwe versie bij het starten"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Ingeschakeld zorgt dit ervoor dat aMule bij het starten controleert op een "
 "nieuwe versie"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Start geminimaliseerd"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Als u dit inschakelt zal aMule zichzelf minimaliseren bij het starten."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Vraag bevestiging bij afsluiten"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Zorgt ervoor dat aMule om bevestiging vraagt voor af te sluiten."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "Laat aMule om bevestiging vragen alvorens af te sluiten."
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr "Verberg applicatievenster wanneer op de sluitknop wordt geklikt"
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Schakel Tray Pictogram in"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Dit schakelt het systeemvak (of taakbalk) pictogram in/uit."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Minimaliseer naar Systeemvak"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5142,658 +3321,582 @@
 "Deze optie zorgt er voor dat aMule geminimaliseerd wordt naar het "
 "Systeemvak, i.p.v. naar de taakbalk."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Tooltip Vertragings Tijd in seconden"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Tooltip vertragingstijd: "
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "De vertraging voordat tool-tips worden getoond."
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "seconden"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Browser Selectie"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Systeem Standaard"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Selecteer hier uw browser"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Gebruikelijke Browser:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Voer hier de naam van uw browser in. Om de gebruikelijke browser te "
-"gebruiken, selecteer Handmatig Gekozen in het dropdown-menu hierboven."
+"Voer hier uw browsernaam in. Laat dit veld leeg om de standaardbrowser van "
+"uw systeem te gebruiken."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Bladeren"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Open in nieuw tabblad indien mogelijk"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Open de web pagina, indien mogelijk, in een nieuw tabblad in plaats van in "
 "een nieuw venster"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Video Speler"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Maak Backup voor voorbeeld"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Bandbreedte grenzen"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
-msgstr "Slot Toewijzen"
+msgstr "Slot Toewijzing"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Standaard client TCP Poort:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Poorten"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Standaard TCP Poort "
+
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Dit is de standaard eD2k poort en kan niet uitgeschakeld worden."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Uitgebreide client UDP Poort:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "UDP poort voor server aanvragen (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Uitgebreide UDP poort (Kad / globaal zoeken) "
+
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
 msgstr ""
-"Deze UDP poort wordt gebruikt voor uitgebreide ed2k aanvragen en het Kad "
+"Deze UDP poort wordt gebruikt voor uitgebreide eD2k aanvragen en het Kad "
 "netwerk"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "uitschakelen"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Schakel UPnP voor router port forwarding in"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Bind Adres"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "UDP poort voor uitgebreide server aanvragen (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Max Bronnen per Bestand"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnP TCP Poort (Optioneel):"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Harde grens"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Bind lokaal adres aan IP (laat leeg voor elk):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Verbinding grenzen"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Max Verbindingen"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Enkel voor gevorderde gebruikers: Als u meerdere netwerk interfaces hebt, "
+"voer hier het adres in van de interface waar aMule mee verbonden moet worden."
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Max bronnen per bestand aan het downloaden:"
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Max gelijktijdige verbindingen:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universele Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Schakel UPnP in"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP TCP Poort:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Autoverbind bij het opstarten"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Verbind opnieuw bij verbroken verbinding"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Toon overhead bandbreedte"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Server Opties"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Verwijder dode server na"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "pogingen"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Auto-update serverlijst bij het opstarten"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Lijst"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Update serverlijst bij het verbinden met een server"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Update serverlijst wanneer een client verbindt"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Gebruik prioriteitssysteem"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Gebruik slimme Laag ID controle bij verbinden"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Veilig verbinden"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Autoverbind alleen met servers in statische lijst"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Zet handmatig toegevoegde servers op Hoge Prioriteit"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. actief"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH vertrouwt elke hash (niet aanbevolen)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Intelligente Corruptie Afhandling (I.C.H.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Inschakelen"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Geavanceerde I.C.H. vertrouwt elke hash (niet aanbevolen)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Voeg bestanden aan downloads toe in pauze modus"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Voeg bestanden aan downloads toe met auto prioriteit"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Probeer eerste en laatste delen eerst te downloaden"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Voeg nieuwe gedeelde bestanden toe met auto prioriteit"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Probeer om volledige delen naar alle uploads te overdragen"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Start volgend gepauzeerde bestand als een bestand completeert"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Start volgend gepauzeerd bestand als een bestand compleet is"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Uit dezelfde categorie"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Bewaar 10 bronnen van zeldzame bestanden (<20 bronnen)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "In alfabetische volgorde"
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Schijfruimte"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Wijst schijfruimte toe voor nieuwe bestanden"
+
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
+"Wijst schijfruimte toe voor nieuwe bestanden, beperkt hierdoor fragmentatie"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Controleer schijfruimte"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Stop downloads als de vrije schijfruimte bedraagt "
 
-#: src/muuli_wdr.cpp:2058
+#: src/muuli_wdr.cpp:1819
 msgid "Select this if you want aMule to check your disk space"
 msgstr "Selecteer dit als u wilt dat aMule uw schijfruimte controleert"
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Min schijfruimte:"
-
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "Voer hier de gewenste min schijfruimte in."
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "Wijst schijfruimte toe voor nieuwe bestanden"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Bewaar 10 bronnen van zeldzame bestanden (<20 bronnen)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
-"Wijst schijfruimte toe voor nieuwe bestanden, beperkt hierdoor fragmentatie"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Uploads"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Binnenkomende"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Tijdelijke"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Gedeelde"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Voeg nieuwe gedeelde bestanden toe met auto prioriteit"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Doelmap voor downloads"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Map voor tijdelijke download bestanden"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Gedeelde mappen"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Rechtermuisklik op mappictogram om recursief te delen)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Deel verborgen bestanden"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Grafieken"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Update vertraging : 5 seconden"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Tijd voor gemiddelde grafiek: 100 minuten"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Schaal Verbindings Grafiek: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Selecteer Statistieken Kleuren"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Schaal downloadgrafiek:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Schaal uploadgrafiek:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Kleuren: "
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Achtergrond"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Raster"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Huidige download"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Lopend gemiddelde download"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Sessie gemiddelde download"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Huidige upload"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Lopend gemiddelde upload"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Sessie gemiddelde upload"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Actieve verbindingen"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Systeemvak Pictogram Snelheidsbalk"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Kad-nodes huidig"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Kad-nodes draaiende"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Kad-nodes sessie"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Selecteer"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Boom"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Aantal getoonde Client Versies (0=onbegrensd)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Lijn Capaciteiten"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Let op: Deze waarden worden alleen gebruikt voor statistieken."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! WAARSCHUWING !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Verander deze instellingen niet tenzij u weet\n"
-"wat u doet, anders kunt u makkelijk\n"
-"dingen erger maken voor uzelf.\n"
-"\n"
-"aMule zal goed draaien zonder deze instellingen\n"
-"te wijzigen."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Geavanceerde Instellingen"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Max nieuwe verbindingen / 5 seconden"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
-msgstr "Bestands Buffer Grootte: 240000 bytes"
+msgstr "Grootte van Bestandsbuffer : 240000 bytes"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
-msgstr "Upload Wachtrij Grootte: 5000 clients"
+msgstr "Grootte van Uploadwachtrij: 5000 clients"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Server verbinding verversingsinterval: Uitschakelen"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Download Wachtrij Bestanden Voortgang"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Toon percentage"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Schakel standby-modus van computer uit"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Gebruik skin: "
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Toon \"Snelle eD2k Links Afhandelaar\" in elk venster."
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Toon voortgangsindicator"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
+msgstr "Geef uitgebreide info weer op categorie-tabs"
+
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
+msgstr "Toon applicatieversie op titel"
+
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Toon overdrachtsnelheden op titel"
+
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Voor applicatienaam"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Na applicatienaam"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Toon overhead bandbreedte"
+
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Verticale knoppenbalk"
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Voortgangsindicator Stijl"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "Toon landenvlaggen voor clients"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Downloadwachtrij Bestanden"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Toon voortgangspercentage"
+
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Toon voortgangsindicator"
 
-#: src/muuli_wdr.cpp:2351
+#: src/muuli_wdr.cpp:2144
 msgid "Flat"
 msgstr "Plat"
 
-#: src/muuli_wdr.cpp:2354
+#: src/muuli_wdr.cpp:2150
 msgid "Round"
 msgstr "Rond"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Skin Ondersteuning"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Schakel ondersteuning voor skins in "
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Skin:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- geen skins beschikbaar -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Kolom Sortering"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Auto-sorteer bestanden (hoog CPU gebruik)"
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Auto-sorteer bestanden in de download wachtrij (hoog CPU gebruik)"
-
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp:2157
 msgid "aMule will sort the columns in your download list automatically"
 msgstr "aMule zal de kolommen in uw download lijst automatisch sorteren"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Overige Gui Instellingen"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Toon Snelle eD2K Links Afhandelaar"
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "Externe Verbinding Parameters"
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
-msgstr "Geef uitgebreide info weer op categorie-tabs"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "Accepteer externe verbindingen"
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "Toon overdracht snelheden op titel"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP van de luisterende interface:"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Verticale knoppenbalk"
+#: src/muuli_wdr.cpp:2190
+msgid ""
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
+msgstr ""
+"Voer hier een geldig ip in het formaat a.b.c.d in van de luisterende EV "
+"interface. Een leeg veld of 0.0.0.0 betekent elke interface."
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Toon partbestandsnummer voor bestandsnaam"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "TCP poort:"
 
-#: src/muuli_wdr.cpp:2434
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
+msgstr "Schakel UPnP port forwarding van de EV-poort in"
+
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: src/muuli_wdr.cpp:2221
 msgid "Web server parameters"
 msgstr "Webserver parameters"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Start amuleweb bij het opstarten"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Webserver poort"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Schakel UPnP port forwarding van de webserverpoort in"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Webserver UPnP TCP poort"
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Start webserver bij het opstarten"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Pagina Verversings Tijd (in seconden)"
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Web template"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Schakel Gzip compressie in"
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Alle rechten wachtwoord"
 
-#: src/muuli_wdr.cpp:2477
+#: src/muuli_wdr.cpp:2243
 msgid "Enable Low rights User"
 msgstr "Schakel Gebruiker met Beperkte rechten in"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Alle rechten wachtwoord"
-
-#: src/muuli_wdr.cpp:2490
+#: src/muuli_wdr.cpp:2249
 msgid "Low rights password"
 msgstr "Beperkte rechten wachtwoord"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Web template"
-
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "Externe Verbinding Parameters"
-
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "Accepteer externe verbindingen"
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Schakel UPnP port forwarding van de web server poort in"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"IP van de luisterende interface\n"
-"(leeg voor elke)"
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Web server UPnP TCP poort (Optioneel)"
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
-msgstr ""
-"Voer hier een geldig ip in het formaat a.b.c.d in van de luisterende EV "
-"interface. Een leeg veld of 0.0.0.0 betekent elke interface."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Pagina Verversingstijd (in seconden)"
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP poort"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Schakel Gzip compressie in"
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
-msgstr "Schakel UPnP port forwarding van de EV-poort in"
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Klik hier om de veranderingen gemaakt aan de voorkeuren toe te passen."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Maak veranderingen aan de voorkeuren ongedaan."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Titel :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Commentaar :"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Binnenkomende Dir :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Verander prioriteit voor nieuw toegevoegde bestanden :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "Niet veranderen"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Selecteer kleur voor deze Categorie (nu geselecteerd) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Toon server motd bij verbinding ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Server Info"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Leegmaken"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Klik op deze knop om de log te resetten."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule Log"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Klik op deze knop om de lijst van servers te updaten van URL ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Serverlijst"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5801,43 +3904,55 @@
 "Voer de url naar een server.met bestand hier in en druk op de knop links om "
 "de lijst met bekende servers te vernieuwen."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Voeg server handmatig toe: Naam"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Voer hier de naam van de nieuwe server in"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Poort"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Voer hier het IP van de server in, gebuik het x.x.x.x formaat."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Voer hier de poort van de server in."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Voeg een server handmatig toe (vul velden links in voor) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule Log"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Server Info"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "ED2K Info"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad Info"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Klik op deze knop om de nodes lijst te updaten van URL ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nodes (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5845,51 +3960,55 @@
 "Voer hier de url in naar een nodes.dat bestand en druk op de knop links om "
 "de lijst van bekende nodes te updaten."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Nodes stats"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Bootstrap"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Nieuwe node"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bootstrap van \n"
-"bekende clients"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Bootstrap van bekende clients"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Verbreek verbinding met Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2k Info"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Gebruik Secure User Identification"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Het is aan te raden om deze optie in te schakelen. U ontvangt geen credits "
+"indien SUI niet ingeschakeld is."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Protocol Obfuscatie"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Ondersteun Protocol Obfuscatie"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5897,11 +4016,11 @@
 "Deze optie schakelt Protocol Obfuscatie in, en zorgt er voor dat aMule "
 "geobfusceerde verbindingen van andere clients accepteert."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Gebruik obfuscatie voor uitgaande verbindingen"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5909,11 +4028,11 @@
 "Deze optie zorgt er voor dat aMule Protocol Obfuscatie gebruikt bij het "
 "verbinden met andere clients/servers."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Accepteer alleen geobfusceerde verbindingen"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5921,85 +4040,81 @@
 "Deze optie zorgt er voor dat aMule alleen gobfusceerde verbindingen "
 "accepteert. U heeft minder bronnen, maar al uw verkeer is geobfusceerd."
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Bestand Opties"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Iedereen"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Niemand"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Wie kan gedeelde bestanden zien:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Wie kan mijn gedeelde bestanden zien:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Selecteer wie een lijst van uw gedeelde bestanden kan opvragen."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP-Filteren"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filter clients"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Schakel filteren van de client IPs in het bestand ~/.aMule/ipfilter.dat in."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filter servers"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Schakel filteren van de server IPs in het bestand ~/.aMule/ipfilter.dat in."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Lijst Opnieuw laden"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 "Laadt de lijst met IPs om te filteren opnieuw uit het bestand ~/.aMule/"
 "ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Update nu"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Auto-update ipfilter bij het starten"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Level van Filteren:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Filter LAN IPs altijd"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoïde behandeling van niet-kloppende IPs"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6007,11 +4122,11 @@
 "Weigert een pakket als de client ip anders is dan het ip waar het pakket van "
 "is ontvangen. Wees voorzichtig hiermee."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Gebruik systeemwijd ipfilter.dat indien beschikbaar"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -6019,23 +4134,11 @@
 "Indien er geen lokaal ipfilter.dat gevonden wordt, sta gebruik van een "
 "systeemwijd ipfilter toe."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Gebruik Secure User Identification"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Het is aan te raden om deze optie in te schakelen. U ontvangt geen credits "
-"indien SUI niet ingeschakeld is."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Schakel Online-Handtekening in"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6043,853 +4146,1308 @@
 "Schakelt het schrijven van het OH bestand in, die kan gebruikt worden door "
 "externe applicaties om handtekeningen en dergelijke te maken."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
-msgstr "Update Frequentie (Seconden):"
+msgstr "Updatefrequentie (Seconden):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 "Verander de frequentie (in seconden) van de Online Handtekening updates."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Online Handtekening Directory:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Bewaar online-handtekeningbestand in: "
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "Klik hier om de directory te selecteren die de Online Handtekening bestanden "
 "bevat."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "In/Uitschakelen"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filter binnenkomende berichten (behalve huidige chat):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Filter Opties:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filter alle berichten"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filter berichten van mensen niet op uw vriendenlijst"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filter berichten van onbekende clients"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filter berichten met (gebruik ',' als scheiding):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "voeg hier de woorden toe die amule moet filteren en berichten daarmee "
 "blokkeren"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Toon ontvangen berichten in de log"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Commentaren"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr ""
 "Filter commentaren die de volgende tekens bevatten (gebruik ',' als "
 "scheiding):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Automatische verbinding met server zonder proxy"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Schakel aanmelding in"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Schakel gebruikersnaam/wachtwoord aanmelding in/uit"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Gebruikersnaam: "
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "De gebruikersnaam nodig om te verbinden met de proxy"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Wachtwoord:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Het wachtwoord nodig om te verbinden met de proxy"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Schakel Proxy in"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Schakel proxy ondersteuning in/uit"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Proxy type:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Het type proxy waarmee u verbinding maakt"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Proxy host:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "De proxy hostnaam"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Proxy poort:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "De proxy poort"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Aanmelding"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Schakel aanmelding in"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Schakel gebruikersnaam/wachtwoord aanmelding in/uit"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "De gebruikersnaam nodig om te verbinden met de proxy"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Wachtwoord:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Het wachtwoord nodig om te verbinden met de proxy"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Automatische verbinding met server zonder proxy"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Verbind met:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Login op amule op afstand"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Gebruikersnaam"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Onthoud deze instellingen"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Schakel Uitgebreid Debug-Loggen in."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Bericht Categorie?n"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Wachtend..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Voeg geïmporteerden toe"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Probeer geselecteerde opnieuw"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Verwijder geselecteerde"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "Gebeurtenistypes"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+"Statistieken en clients in wachtrij voor geselecteerd(e) bestand(en) : "
+"Sessie / Alle"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Actieve Uploads"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "Procent van alle bestanden"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Alle bestanden"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Geselecteerde bestanden"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Alleen actieve uploads"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Toon Clients voor"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Opnieuw laden:"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Laad uw gedeelde bestanden opnieuw"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Verstuur"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Verstuurt het opgegeven bericht."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Sluit deze chat-sessie."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Verbind met een server en/of Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Netwerken Venster"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Gedeelde Bestanden"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Zoekvenster"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Uitgeschakeld [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Bestands Overdrachten Venster"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Gedeelde Bestanden Venster"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Berichten Venster"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Statistieken Venster (Grafieken)"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Voorkeuren Instellingen Venster"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nieuwe Catgorie"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Kies een directory voor binnenkomende bestanden"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "U moet een naam opgeven voor de categorie!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/sec"
+msgstr[1] "bytes/sec"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "U moet een pad opgeven voor de categorie!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"Kon binnenkomende dir niet aanmaken voor categorie. Geef a.u.b. een geldig "
-"pad op!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "seconden"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "minuten"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "uren"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Dagen"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "alle"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "alle anderen"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Incompleet"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Gestopt"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Video"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Archief"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Tekst"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Actief"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Onbekende extensie '%s' van het '%s' commando.\n"
+msgid "Using config dir: %s"
+msgstr "Gebruikte configdir: %s"
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Wachten tot partbestand-conversiethread sterft..."
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Onbekend commando '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Bezig met importeren van %s: %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Dit commando heeft geen argumenten.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Tijdelijke map wordt gelezen"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Dit commando moet een argument hebben.\n"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Basisinformatie van download info bestand wordt opgehaald"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Doelbestand wordt aangemaakt"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Data van oud download bestand wordt geladen (%u van %u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Data block wordt bewaard in nieuw enkel download bestand (%u van %u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Bron downloadbestand informatie wordt opgehaald"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Download wordt toegevoegd en nieuw partbestand bewaard"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Importeer deelbestanden"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Status"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Bestandshash"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Schijf: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Dit commando is niet compleet, u moet een van onderstaande uitbreidingen "
-"gebruiken.\n"
+"Kies a.u.b. een map om te doorzoeken naar tijdelijke downloads! "
+"(onderliggende mappen worden meegenomen)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Beschikbare uitbreidingen:\n"
+"Wilt u dat de bron bestanden van succesvol ge?mporteerde bestanden "
+"verwijderd worden?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Beschikbare commando's:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Verwijder bronnen?"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "FOUT: Kon partbestand niet aanmaken"
+
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Alle commandos zijn hoofdlettergevoelig.\n"
-"Type '%s <command>' om gedetailleerde info te krijgen over <command>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Proberen backup van met-bestand te laden van %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Sluit het programma af."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "FOUT: Kon part.met bestand niet openen: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Toon help."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "FOUT: part.met bestand heeft grootte 0: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "FOUT: Ongeldige part.met bestandsversie: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Om help te krijgen over een commando, type 'help <commando>'.\n"
-"Om de volledige commando lijst te krijgen type 'help'.\n"
+"FOUT: %s (%s) is beschadigd (verkeerde tags: %s), kan bestand niet laden."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Gebruik '%s' voor commando lijst\n"
-"\n"
+"FOUT: %s (%s) is beschadigd (verkeerde tagcount), kan bestand niet laden."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Syntax fout!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Poging om bestandsinfo te herstellen..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"Fout bij het verwerken van commando - zou nooit mogen gebeuren! Rapporteer "
-"deze bug, a.u.b.\n"
+"Naamloos bestand herstellen - zal proberen om het te herstellen als "
+"RecoverdFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Dit commando heeft geen parameters."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+"Alle beschikbare bestands info hersteld :D - Poging om het te gebruiken..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Dit commando moet een parameter hebben."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Kon bestands info niet herstellen :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Ongeldig argument."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Kon %s (%s) niet openen"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Dit is een incompleet commando."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "WAARSCHUWING: %s is mogelijk beschadigd (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Type '%s' voor meer help.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "FOUT bij het bewaren van partbestand: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "IO fout bij het bewaren van partbestand: "
+
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Dit is %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Kon lengte van '%s' niet bepalen - gebruik %s bestand."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Dit is %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' heeft grootte 0 - %s bestand wordt gebruikt."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Kon bestand part.met.seeds niet bewaren voor %s"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "%i bron seed voor partbestand bewaard: %s (%s)"
+msgstr[1] "%i bron seeds voor partbestand bewaard: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Partbestand %s (%s) heeft geen seeds bestand"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Partbestand %s (%s) heeft een leeg seeds bestand"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Fout bij het lezen van partbestands seeds bestand (%s - %s): %s"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Beschadigd deel (%d) gevonden in %d deel bestand %s - FileResultHash |%s| "
+"FileHash |%s|"
+msgstr[1] ""
+"Beschadigd deel (%d) gevonden in %d delen bestand %s - FileResultHash |%s| "
+"FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Compleet deel (%i) gevonden in %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Klaar met opnieuw hashen %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Onverwachte fout tijdens het voltooien van %s. Bestand gepauzeerd"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Klaar met downloaden: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Verwijderen van bestand: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Aanmaken van client...\n"
+"WAARSCHUWING: Kan gedownload deel niet hashen - incomplete hashset voor '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Ok, %s wordt afgesloten...\n"
+"FOUT: Kan gedownload deel niet hashen - hashset incompleet (%s). Dit zou "
+"nooit mogen gebeuren"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Kan niet verbinden met een leeg wachtwoord.\n"
-"U moet een wachtwoord opgeven in het config bestand\n"
-"of op de commando-regel, of invoeren als daarom gevraagd\n"
-"wordt.\n"
-"\n"
-"Bezig met afsluiten...\n"
+"EOB bij het hashen van gedownload deel %u met lengte %u (max %u) van "
+"partbestand '%s' met lengte %u: %s"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Toon deze help tekst"
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr ""
+"WAARSCHUWING: Niet voldoende vrije schijfruimte! Pauzeren van bestand: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Host waar aMule draait. (standaard: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Gedownload deel %i is beschadigd in bestand: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "aMules poort voor Externe Verbindingen. (standaard: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Beschadigd deel %i van %s hersteld -> Bespaarde bytes: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Externe Verbinding wachtwoord."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Toewijzen"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Lees configuratie uit bestand."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Onvoldoende schijfruimte"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Print geen uitvoer naar stdout."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Gedownload"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Wees uitgebreid - toon ook debug berichten."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "FOUT: Kon partbestand '%s' niet openen"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Stelt programma locale (taal) in."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Systeem standaard"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Schrijf opties op de opdrachtregel naar config bestand."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albanees"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Maakt config bestand gebaseerd op aMules config bestand."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabisch"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Toon programma versie."
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturisch"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Creditfile geladen, %u client is bekend"
-msgstr[1] "Creditfile geladen, %u clients zijn bekend"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Baskisch"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Credits verlopen voor %u client!"
-msgstr[1] " - Credits verlopen voor %u clients!"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgaars"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Geen 'cryptkey.dat' bestand gevonden, wordt aangemaakt."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Catalaans"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Chinees (Vereenvoudigd)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Chinees (Traditioneel)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Kroatisch"
 
-#: src/amuled.cpp:594
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Tsjechisch"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Deens"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Nederlands"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Engels (V.K.)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estonisch"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Fins"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Frans"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Gallisch"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Duits"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Grieks"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebreeuws"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Hongaars"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italiaans"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italiaans (Zwitsers)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japans"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Koreaans"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Litouws"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Noors"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Pools"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugees"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugees (Braziliaans)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Russisch"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Sloveens"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Spaans"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Zweeds"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turks"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Oekraïens"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Verander Taal"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr "Er zijn geen vertalingen voor aMule geïnstalleerd"
+
+#: src/Preferences.cpp:771
+msgid "No languages available"
+msgstr "Geen talen beschikbaar"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "geen opties beschikbaar"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Ongeldige categorie gevonden, wordt overgeslagen"
+
+#: src/Preferences.cpp:1766
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
-"FOUT: aMule daemon kan niet gebruikt worden wanneer externe verbindingen "
-"zijn uitgeschakeld. Gebruik, om Externe Verbindingen in te schakelen, of een "
-"normale aMule, start amuled met de optie --ec-config of verander de waarde "
-"van \"AcceptExternalConnections\" in 1 in het bestand ~/.aMule/amule.conf"
+"TCP poort kan niet hoger zijn dan 65532 omdat de server UDP poort de TCP "
+"poort + 3 is"
 
-#: src/amuled.cpp:750
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "ERROR: %s"
-msgstr "FOUT: %s"
+msgid "Default port will be used (%d)"
+msgstr "Standaard poort zal worden gebruikt (%d)"
+
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Laten vallen van niet-bestaande gedeelde directory: %s"
+
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Verbinding"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Directories"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Servers"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Maak ban ongedaan"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Bestanden"
 
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Laat Uploads zien"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Beveiliging"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Interface"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
 
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Laat Wachtrij zien"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Filters"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Toon Clients"
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Besturing op Afstand"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Selecteer Weergave"
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Online Handtekening"
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Client Software"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Geavanceerd"
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Gewacht"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Gebeurtenissen"
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Upload Tijd"
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Debugging"
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Upload/Download"
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+"De volgende variabelen worden vervangen:\n"
+"    %PARTFILE - volledig pad naar het bestand\n"
+"    %PARTNAME - alleen bestandsnaam"
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Remote Status"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Verander deze instellingen niet tenzij u weet\n"
+"wat u doet, anders kunt u makkelijk\n"
+"dingen erger maken voor uzelf.\n"
+"\n"
+"aMule zal goed draaien zonder deze instellingen\n"
+"te wijzigen."
 
-#: src/ClientListCtrl.cpp:699
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Kon Cfg niet verbinden met widget met ID %d en sleutel %s"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Bestandsprioriteit"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr "Kon data niet overdragen van Cfg naar widget met ID %d en sleutel %s"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Score"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Het type proxy waarmee u verbinding maakt"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Gevraagd"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr "Kon data niet overdragen van Widget naar Cfg met ID %d en sleutel %s"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Laatst Gezien"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"aMule moet opnieuw gestart worden om deze veranderingen toe te passen:\n"
+"\n"
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "In Wachtrij Gekomen"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP poort veranderd.\n"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Upload Status"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP poort veranderd.\n"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Ge-upload"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- Poort voor externe verbinding veranderd.\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- Acceptatie voor externe verbinding veranderd.\n"
+
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- Interface voor externe verbinding veranderd.\n"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Download Status"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"Uw Auto-update serverlijst is leeg.\n"
+"'Auto-update serverlijst bij het opstarten' wordt uitgeschakeld."
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Ge-download"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Userhash"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Versleuteld"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Verberg gedeelde bestanden"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"U hebt externe verbindingen ingeschakeld maar geen wachtwoord ingesteld.\n"
+"Externe verbindingen kunnen niet ingeschakeld worden tenzij een geldig "
+"wachtwoord is ingesteld."
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Client Details"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Taal veranderd.\n"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Ingeschakeld"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Temp directory veranderd.\n"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Ondersteund"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- ED2K netwerk ingeschakeld.\n"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Niet ondersteund"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Zowel het eD2K als het Kad netwerk zijn uitgeschakeld.\n"
+"U kun niet verbinden tot u minimaal een netwerk inschakelt."
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Uitgeschakeld"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad zal niet starten als uw UDP poort is uitgeschakeld.\n"
+"Schakel de UDP poort in of schakel Kad uit."
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f KB/s"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"U MOET aMule nu opnieuw starten.\n"
+"Als u dat niet doet moet u niet klagen als er iets misgaat.\n"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Niet compleet"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Uw Auto-update servers lijst is leeg.\n"
+"Vul a.u.b. minimaal een URL naar een geldig server.met bestand in.\n"
+"Klik op de knop \"Lijst\" hiernaast om een URL in te voeren."
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Slechterik"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Tijdelijke bestanden"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Gecontroleerd - OK"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Binnenkomende bestanden"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Niet Beschikbaar"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Online Handtekeningen"
 
-# What is QR abbr for?
-#: src/ClientDetailDialog.cpp:215
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+msgid "Choose a folder for %s"
+msgstr "Kies een directory voor %s"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr ""
-"Min grootte moet kleiner zijn dan max grootte. Max grootte wordt genegeerd."
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Blader naar videospeler"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Zoekwaarschuwing"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Selecteer browser"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Onbegrensd"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "Uitvoerbare%s"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule Systeemvak Menu"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Bewerk serverlijst"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Snelheid grenzen:"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Voeg hier URL's toe om server.met bestanden te downloaden.\n"
+"Slechts een url per regel."
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "UL: Geen"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Update vertraging: %d seconde"
+msgstr[1] "Update vertraging: %d seconden"
 
-#: src/MuleTrayIcon.cpp:354
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "UL: %u"
-msgstr "UL: %u"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Tijd voor gemiddeldengrafiek: %d minuut"
+msgstr[1] "Tijd voor gemiddeldengrafiek: %d minuten"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DL: Geen"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Schaal Verbindingengrafiek: %d"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "DL: %u"
-msgstr "DL: %u"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Grootte van Bestandsbuffer: %d byte"
+msgstr[1] "Grootte van Bestandsbuffer: %d bytes"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Download snelheid: %.1f"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Grootte van Uploadwachtrij: %d client"
+msgstr[1] "Grootte van Uploadwachtrij: %d clients"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Upload snelheid: %.1f"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Server verbinding verversingsinterval: %d minuut"
+msgstr[1] "Server verbinding verversingsinterval: %d minuten"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Client Informatie"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Server verbinding verversingstijd: Uitgeschakeld"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "uitgeschakeld"
+
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "Nickname: %s"
-msgstr "Bijnaam: %s"
+msgid "Execute command on '%s' event"
+msgstr "Voer commando uit bij gebeurtenis '%s'"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Geen Bijnaam Geselecteerd!"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Schakel uitvoeren van commando's in kern in"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ClientID: "
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Kern commando:"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "ServerNaam: "
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Schakel uitvoeren van commando's in GUI in"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "ServerIP: "
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "GUI commando:"
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "De volgende variabelen worden vervangen:"
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
-msgstr "TCP poort: %d"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+"Min grootte moet kleiner zijn dan max grootte. Max grootte wordt genegeerd."
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "TCP poort: Niet gereed"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Zoekwaarschuwing"
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
-msgstr "UDP poort: %d"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Standaard"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "UDP poort: Niet gereed"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad zoekopdracht kan niet worden uitgevoerd als Kad niet draait"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Online Handtekening: Ingeschakeld"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "eD2K zoekopdracht kan niet worden uitgevoerd als eD2K niet draait"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Online Handtekening: Uitgeschakeld"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Onverwachte fout bij Kad zoekopdracht: "
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
-msgstr "Gedeelde bestanden: %d"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "BestandsID"
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
-msgstr "Clients in wachtrij: %d"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Bestand"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Download in categorie"
+
+#: src/SearchListCtrl.cpp:639
 #, c-format
-msgid "Total DL: %s"
-msgstr "Totaal gedownload: %s"
+msgid "Get %s for this file"
+msgstr "Verkrijg %s voor dit bestand"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Zoek gelijkwaardige bestanden (eD2k, lokale server)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Markeer als bekend bestand"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Kopieer eD2k link naar klembord"
+
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Geannuleerd"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Nieuw"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Kon niet verbinden met een geobfusceerde server. Nogmaals proberen zonder "
+"obfuscatie."
 
-#: src/MuleTrayIcon.cpp:483
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Kon niet verbinden met een server in de lijst. Nogmaals proberen."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "eD2K netwerk is uitgeschakeld in voorkeuren, wordt niet mee verbonden."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "Geen geldige servers om mee te verbinden gevonden in serverlijst"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "Totaal geupload: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Verbonden met %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Upload grens"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Verbinding gemaakt met: %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Download grens"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Fatale Fout bij het proberen te verbinden. Internet verbinding kan uit zijn"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Verberg aMule"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Verbinding verbroken met %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Toon aMule"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) lijkt dood te zijn."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Chat-Sessie Begonnen: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) lijkt vol te zijn."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Verbonden met Client ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] ""
+"Automatische verbinding naar server zal in %d seconde opnieuw proberen"
+msgstr[1] ""
+"Automatische verbinding naar server zal in %d seconden opnieuw proberen"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Verbinden maken met Client ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Verbinding kwijt"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Kon niet Verbinden met client / Verbinding verbroken ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Verbinden met %s (%s:%i) is mislukt."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Sluit tabblad"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "FOUT: Socket ongeldig op timeoutcheck"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Sluit alle tabbladen"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Poging tot verbinden met %s (%s:%i) gaf time out."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Sluit andere tabbladen"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Laat resultaat van DNS lookup ontvangen, wordt genegeerd."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Laden van server.met bestand: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Bestand server.met niet gevonden!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Kon server.met bestand '%s' niet laden, onbekend formaat."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Kon server.met niet openen!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Server.met bestand beschadigd, ongeldig versielabel gevonden: 0x%x, grootte %"
 "i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "%i server in server.met gevonden"
 msgstr[1] "%i servers in server.met gevonden"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d server toegevoegd"
 msgstr[1] "%d servers toegevoegd"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Fout: het bestand 'server.met' is beschadigd: "
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "IO fout bij het lezen van know'server.met': "
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Server niet toegevoegd: [%s:%d] bevat geen geldige poort."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Server niet toegevoegd: Het IP van [%s:%d] is gefilterd of ongeldig."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Server niet toegevoegd: Server met IP:Poort [%s:%d] al gevonden in lijst."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Server toegevoegd: Server op [%s:%d] met naam '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6897,25 +5455,25 @@
 "U bent verbonden met de server die u probeert te verwijderen. Vebreek a.u.b. "
 "eerst de verbinding."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Kon '%s' niet openen"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Kon server.met niet opslaan!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Ongeldige URL"
 
-#: src/ServerList.cpp:805
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Finished to download the server list from %s"
-msgstr "Downloaden serverlijst van %s voltooid"
+msgid "Finished downloading the server list from %s"
+msgstr "Downloaden van serverlijst vanaf %s voltooid"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Kon serverlijst niet downloaden van %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6923,22 +5481,27 @@
 "Geen serverlijstadres gevonden in 'addresses.dat'. Plaats een geldig "
 "serverlijstadres in dit bestand om uw serverlijst automatisch te updaten"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Begin downloaden serverlijst van %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "WAARSCHUWING: ongeldige URL opgegeven voor het auto-updaten van servers: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Geen geldige server.met auto-download url in addresses.dat"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Kon serverlijst niet downloaden van %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -6946,305 +5509,2310 @@
 "De lokale server wordt door de IPFilters weggefilterd, er wordt verbonden "
 "met een andere server!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Kon commando `%s' niet uitvoeren bij gebeurtenis `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Servernaam"
 
-#: src/amule.cpp:703
-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/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Adres"
 
-#: src/amule.cpp:786
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Poort"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Beschrijving"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Gebruikers"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Statisch"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versie"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"U heeft geen servers in de serverlijst.\n"
-"Wilt u dat aMule nu een nieuwe lijst download?"
+"U bent verbonden met een server die u probeert te verwijderen. Verbreek de "
+"verbinding eerst aub. De server is NIET verwijderd."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Download van serverlijst"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Onbekende naam)"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "web server running on pid %d"
-msgstr "webserver draait met pid %d"
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Weet u zeker dat u de statische server %s wilt verwijderen"
 
-#: src/amule.cpp:850
-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 ""
-"U heeft ingesteld om de webserver te starten bij het opstarten, maar "
-"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/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Servers (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Server"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Verbind met server"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Markeer server als statisch"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Markeer server als niet-statisch"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Markeer servers als statisch"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Markeer servers als niet-statisch"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Verwijder server"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Verwijder servers"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Verwijder alle servers"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopieer eD2k links naar klembord"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Verbind opnieuw met server"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Weet u zeker dat u alle servers wilt verwijderen?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Weet u zeker dat u de geselecteerde server wilt verwijderen?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Weet u zeker dat u de geselecteerde servers wilt verwijderen?"
 
-#: src/amule.cpp:937
+#: src/ServerSocket.cpp:259
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Kon geen poorten koppelen aan het opgegeven adres: %s"
+msgid "ERROR: %s (%s) - %s"
+msgstr "FOUT: %s (%s) - %s"
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:274
 #, 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"
+msgid "WARNING: %s (%s) - %s"
+msgstr "WAARSCHUWING: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Nieuwe clientid is %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "WAARSCHUWING: U heeft een laag ID gekregen!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tDit komt waarschijnlijk omdat u achter een firewall of router zit."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tVoor meer informatie, bekijk http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Onbekende server info ontvangen! - te kort"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "%d nieuwe server ontvangen"
+msgstr[1] "%d nieuwe servers ontvangen"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Bewaren van server-lijst compleet."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Server keurde laatste opdracht af"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Fout pakket ontvangen van server: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Onafgehandelde fout bij het verwerken van pakket van de server: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Kan DNS thread niet aanmaken voor het verbinden met %s"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "Server IP %s (%s) is gefilterd.  Wordt niet mee verbonden."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "maakt gebruik van protocol obfuscatie."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Verbinding wordt gemaakt met %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Kan dns niet vinden voor server %s: Kan niet verbinden!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Server niet toegevoegd: Geen IP of hostnaam opgegeven."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Server niet toegevoegd: Ongeldige server-poort opgegeven."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "eD2k Status:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kademlia Status:"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "Draaiend in LAN modus"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Draaiende"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Status:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Verbindingsstatus:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Firewalled - open TCP poort %d in uw router of firewall"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "UDP Verbindingsstatus:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Firewalled - open UDP poort %d in uw router of firewall"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Firewalled status: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "No buddy nodig - TCP poort open"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "No buddy nodig - UDP poort open"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Geen buddy"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Aan het verbinden met buddy"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Verbonden met buddy op %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Geïndexeerde Bronnen :"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Geïndexeerde zoekwoorden:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Geïndexeerde notities:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Geïndexeerde load:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Gemiddelde Gebruikers:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Gemiddelde Bestanden:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Niet draaiende"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Bestand %s wordt toegevoegd aan gedeelde bestanden"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] " %i bekend gedeeld bestand gevonden"
+msgstr[1] " %i bekende gedeelde bestanden gevonden"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "%i bekend gedeeld bestand gevonden, %i onbekend"
+msgstr[1] "%i bekende gedeelde bestanden gevonden, %i onbekend"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "FOUT: Poging om %s te delen"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Gedeelde directory niet gevonden, wordt overgeslagen: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Geen deelbare bestanden gevonden in directory: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Gebruikersnaam"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Downloadsnelheid"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Uploadsnelheid"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Beschikbare Delen"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+msgid "Upload Status"
+msgstr "Uploadstatus"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Download Status"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Oorsprong"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Lokale Bestandsnaam"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+msgid "Shares File List"
+msgstr "Deelt Bestandenlijst"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Aanvragen"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Geaccepteerde Aanvragen"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Overgebrachte Data"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Deelverhouding"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Ontvangen Delen"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Complete Bronnen"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Directory Pad"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Voeg Commentaar/Waardering toe"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Bewerk Commentaar/Waardering"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Hernoemen"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Voeg bestanden in verzameling toe aan overdrachtenlijst"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Kopieer magnet &URI naar klembord"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Kopieer eD2k link naar klembord (&Source)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Kopieer eD2k link naar klembord (Bron) (&With Crypt options)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Kopieer eD2k link naar klembord (&Hostnaam)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr "Kopieer eD2k link naar klembord (Hostnaam) (Met &Crypt opties)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Kopieer eD2k link naar klembord (&AICH info)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "U heeft een Hoog ID nodig om een geldige bronlink te maken"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Gedeelde Bestanden (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[PartBestand]"
+
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Bestandsnaam Op Afstand"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Geuploade Data (Sessie (Totaal)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Totale Overhead (Pakketten): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Bestand Aanvraag Overhead (Pakketten): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Bron Uitwisseling Overhead (Pakketten): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Server Overhead (Pakketten): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Kad Overhead (Pakketten): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Crypt overhead (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Actieve Uploads: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Wachtende Uploads: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Totaal van succesvolle upload sessies: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Totaal van mislukte upload sessies: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Gemiddelde upload tijd: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Gedownloade Data (Sessie (Totaal)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Gevonden Bronnen: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Actieve Download (blokken): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Sessie UL:DL Verhouding (Totaal): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Gemiddelde downloadsnelheid (Sessie): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Gemiddelde uploadsnelheid (Sessie): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Max downloadsnelheid (Sessie): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Max uploadsnelheid (Sessie): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Hernieuwde verbindingen: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Tijd Sinds Eerste Overdracht: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Verbonden Met Server Sinds: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Actieve Verbindingen (schatting): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Max Verbinding Grens Bereikt: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Gemiddelde Verbindingen (schatting): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Aantal Piek Verbindingen (schatting): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Clients"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Onbekend: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Gefilterd: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Geband: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Totaal: %i Bekend: %i"
 
-#: src/amule.cpp:970
+#: src/Statistics.cpp:798
 #, c-format
+msgid "Working Servers: %i"
+msgstr "Werkende Servers: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Mislukte Servers: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Totaal: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Verwijderde Servers: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Gefilterde Servers: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Gebruikers op Werkende Servers: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Bestanden op Werkende Servers: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Totaal Gebruikers: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Totaal Bestanden: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Server Bezetting: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Aantal Gedeelde Bestanden: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Totale grootte van Gedeelde Bestanden: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Gemiddelde bestandsgrootte: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Besturingssysteem"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Niet Ontvangen"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Actieve verbindingen (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Niet beschikbaar"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Nooit"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Commando `%s' met pid `%d' is geëindigd met statuscode '%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Voer <str> uit en sluit af."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Ongeldig IP formaat: Gebruik xxx.xxx.xxx.xxx:xxxx\n"
+
+# Translation 'argument'?
+#: src/TextClient.cpp:323
 msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Poort %u is niet beschikbaar!\n"
-"\n"
-"Dit betekent dat u een LAAG ID krijgt.\n"
-"\n"
-"Controleer uw netwerk en zorg ervoor dat de poort open is voor in- en "
-"uitgaand verkeer."
+"Dit commando heeft een argument nodig. Geldige argumenten: 'all', "
+"bestandsnaam, of een getal.\n"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Kon OnlineHandtekening Bestand niet maken"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Verwerken per hash:"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Kon aMule OnlineHandtekening Bestand niet maken"
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Verwerken per bestandsnaam"
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
-"De gekozen locale lijkt niet ge?nstalleerd te zijn op uw pc. (Let op: Ik "
-"probeer het toch in te stellen)"
+"Dit commando heeft een argument nodig. Geldige argumenten: een "
+"bestandshash.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Niet een geldig nummer\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Geen geldige hash (lengte moet precies 32 tekens zijn)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Aanvraag mislukt met een onbekende fout."
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Bewerking was succesvol."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Dit is de eerste keer dat u aMule %s draait"
+msgid "Request failed with the following error: %s"
+msgstr "Aanvraag mislukte met de volgende fout: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Dit is een test versie, dagelijks geupdate, en\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "IP filteren van clients is %s.\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "we geven geen garantie dat het niks sloopt, uw huis verbrandt,\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "UIT"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr ""
-"of uw hond doodt. Maar het *zou* veilig moeten zijn om het te gebruiken.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "AAN"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "IP filteren van servers is %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Huidige IPFilter Level is %d.\n"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Bandbreedte grenzen: Up: %u kB/s, Down: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Verbonden met %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Aan het verbinden"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "firewalled"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"De volgende opties zijn vanwege beveiligingsredenen gewijzigd in deze "
-"versie:\n"
+"\n"
+"Download:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Protocol Obfuscatie ingeschakeld voor binnenkomende en uitgaande "
-"verbindingen.\n"
+"Upload:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Serverlijst updaten van andere servers en clients uitgeschakeld.\n"
+"Clients in wachtrij:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Voor meer informatie over de reden voor deze veranderingen, zoek\n"
-"op de aMule wiki op http://wiki.amule.org naar \"fake servers\".\n"
-"Het is belangrijk dat u alle nepservers uit uw serverlijst verwijderd om "
-"aMule goed te laten werken."
+"Totale Bronnen:\t%d\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Aantal zoekresultaten: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Voortgang zoeken: %u %% \n"
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Voortgang zoeken niet beschikbaar"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Ongeldig antwoord van de server ontvangen, OpCode = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Toon korte status informatie."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Toon verbindingsstatus, huidige up-/downloadsnelheden, etc.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Toon volledige statistieken boom."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Optioneel kan een getal van 0-255 worden meegegeven als argument aan dit\n"
+"commando, wat aangeeft hoeveel ingangen van de client versie subbomen "
+"getoond\n"
+"moeten worden. 0 of weglaten betekent 'onbegrensd'.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Voorbeeld: 'statistics 5' toont alleen de bovenste 5 versies van elk client "
+"type.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Sluit aMule af."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Sluit de kern op afstand (amule/amuled) af.\n"
+"Dit sluit ook de textclient af, omdat die onbruikbaar is zonder een\n"
+"draaiende kern.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Laad gegeven object opnieuw."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Laad gedeelde-bestandenlijst opnieuw."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "Laad IP-Filtertabel opnieuw."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Laad huidige IP-filtertabel opnieuw."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "Update IP-filtertabel van URL."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "Als de URL wordt weggelaten wordt de URL uit de voorkeuren gebruikt."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Verbind met het netwerk."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Dit verbindt met alle netwerken die ingeschakeld zijn in Voorkeuren.\n"
+"U kunt ook een server adres in de vorm IP:Poort specificeren om alleen met "
+"die\n"
+"server te verbinden. Het IP moet een decimaal IPv4 adres met punten zijn,\n"
+"of een DNS naam."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Verbind alleen met eD2K."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Verbind alleen met Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Verbreek verbinding met het netwerk."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
+"Dit verbreekt de verbinding met alle netwerken waarmee nu verbinding is.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Verbreek alleen verbinding met eD2K."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Verbreek alleen verbinding met Kad."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Voeg een eD2k- of magnet-link toe aan de kern."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"De toe te voegen eD2k link kan zijn:\n"
+"*) een bestandslink (ed2k://|file|...), het wordt toegevoegd aan de download "
+"wachtrij,\n"
+"*) een serverlink (ed2k://|server|...), het wordt toegevoegd aan de "
+"serverlijst,\n"
+"*) of een serverlijst-link, in dat geval worden alle servers in de lijst "
+"toegevoegd aan de\n"
+"   serverlijst.\n"
 "\n"
-"Ook zijn de browser instellingen gereset naar de systeem standaard. "
-"Configureer a.u.b. uw browser opties opnieuw indien nodig.\n"
+"De magnet-link moet de eD2k hash en bestandsgrootte bevatten.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Stel een voorkeurswaarde in."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "Stel voorkeuren voor IP-filter in."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Schakel IP filteren van zowel clients als servers in."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Schakel IP filteren van zowel clients als servers uit."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Schakel IP filteren van clients in/uit."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Schakel IP filteren van clients in."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Schakel IP filteren van clients uit."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Schakel IP filteren van servers in/uit."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Schakel IP filteren van servers in."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Schakel IP filteren van servers uit."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Selecteer IP filter niveau."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Meer informatie, ondersteuning en niuwe versies kunnen gevonden worden op "
-"onze homepage,\n"
+"Geldige filterniveaus zijn in de reeks 0-255, en zijn standaard (initiele)\n"
+"waarde is 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "op www.aMule.org, of op ons IRC kanaal #amule op irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Stel bandbreedte grenzen in."
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Bugs kunt u altijd melden op http://forum.amule.org"
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "De waarde gegeven aan deze commando's moet in kilobytes/sec zijn.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Stel upload bandbreedte grens in."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Stel download bandbreedte grens in."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Verkrijg en toon een voorkeurswaarde."
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "Verkrijg voorkeuren voor IP-filter."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Verkrijg status van IP-filter voor zowel clients als servers."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Verkrijg status van IP-filter alleen voor clients."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Verkrijg status van IP-filter alleen voor servers."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "Verkrijg niveau van IP-filter."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Verkrijg bandbreedte grenzen."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Voer een zoekopdracht uit"
+
+#: src/TextClient.cpp:914
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"De map voor Online Handtekening bestanden die u heeft opgegeven is "
-"ONGELDIG!\n"
-" OnlineSignature is UITGESCHAKELD totdat u dit verbetert in voorkeuren."
+"Een zoektype moet opgegeven worden door het type te geven:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Voorbeeld: 'search kad bestand' voert een kad zoekopdracht uit naar \"bestand"
+"\".\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Voer een globale zoekopdracht uit."
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Voer een lokale zoekopdracht uit"
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Voer een kad zoekopdracht uit"
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Toon de resultaten van de laatste zoekopdracht."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Lever de resultaten van de vorige zoekopdracht op.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Toon de voortgang van een zoekopdracht."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Toon de voortgang van een zoekopdracht.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Begin met downloaden van een bestand"
+
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
+"Het nummer van een bestand uit de laatste zoekopdracht moet gegeven worden.\n"
+"Voorbeeld: 'download 12' begint het bestand met nummer 12 uit de vorige "
+"zoekopdracht te downloaden.\n"
+
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Pauzeer dowload."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Verder gaan met download."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Download annuleren."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Stel downloadprioriteit in."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Stel prioriteit van een download in op Laag, Normaal, Hoog of Auto.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Stel prioriteit in op laag."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Stel prioriteit in op normaal."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Stel prioriteit in op hoog."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Stel prioriteit in op auto."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Toon wachtrij/lijsten."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Toon upload/download wachtrij, server lijst of gedeelde-bestandenlijst.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Toon upload wachtrij."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Toon download wachtrij."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Toon log."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Toon servers lijst."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Log leegmaken."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Toewijzen schijfruimte voor bestand '%s' mislukt: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Afgekeurd commando, gebruik '%s' in plaats hiervan."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "FOUT: kan logbestand niet openen"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Dit is een afgekeurd commando, en kan in de toekomst verwijderd worden.\n"
+"Gebruik '%s' in de plaats.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "WAARSCHUWING: logbestand is leeg. Er is iets mis."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMule tekst client"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Log is gereset"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Oude AICH hashsets in '%s' worden omgezet in 64b in '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "ServerBericht: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr ""
+"WAARSCHUWING: De bestandsnaam '%s' is ongeldig en is gewijzigd in '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Kon nodes lijst niet downloaden."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"WAARSCHUWING: Het bestand '%s' bestaat al, bestandsnaam van nieuw bestand "
+"gewijzigd in '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Kon gedownload versie controle bestand niet openen"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Weet u zeker dat u wilt annuleren en alle bestanden in deze categorie "
+"verwijderen?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Beschadigd versie controle bestand"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Bevestiging Nodig"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "U gebruikt een verouderde versie van aMule!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "Enkel 99 categorieën worden ondersteund."
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "Te veel categorieën!"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Alle anderen"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Selecteer filter"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Voeg categorie toe"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Bewerk categorie"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Verwijder categorie"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Uw aMule versie is %i.%i.%i en de nieuwste versie is %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+"Kon bestand niet openen (%s), wordt verwijderd uit de lijst van gedeelde "
+"bestanden."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "De nieuwste versie kan altijd gevonden worden op http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Hashset opgevraagd voor onbekend bestand: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "WAARSCHUWING: Uw aMuled versie is verouderd: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Verder gaan met uploads van bestand: %s"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "U heeft de nieuwste aMule versie."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Stoppen van upload van bestand: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Kon versie controle bestand niet downloaden"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Kon commando `%s' niet uitvoeren bij gebeurtenis `%s'."
 
-#: src/amule.cpp:2025
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Download voltooid"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Het volledige pad naar het bestand."
+
+# re-check this
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "De naam van het bestand zonder de pad component."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "De eD2k hash van het bestand."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "De grootte van het bestand in bytes."
+
+# Recheck last word
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Cumulatieve download activiteitsduur."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Nieuwe chatsessie begonnen"
+
+# ambiguous in EN, check translation
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Afzender bericht."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Geen schijfruimte meer"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Schijfpartitie."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Fout bij completeren"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Gebruikers: %s | Bestanden: %s"
+msgid "Processing file number %u: %s"
+msgstr "Bestand nummer %u wordt verwerkt: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr ""
+"U heeft om deel hashes gevraagd (Alleen gebruikt voor bestanden > 9,5 MB)"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Gebruikers: E: %s K: %s | Bestanden: E: %s K: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Niet bestaand bestand !\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Geen netwerken geselecteerd"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, de aMule eD2k link maker"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Welkom!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Invoer parameters"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Bestand om te Hashen"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Voeg Optionele URLs toe aan dit bestand"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Voer hier het bestand in waarvan u de eD2k link wilt laten berekenen"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Voer hier de URL in die u wilt toevoegen aan de eD2k link: Voeg / toe aan "
+"het eind om aLinkCreator de huidige bestandsnaam toe te laten voegen"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Verwijder"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Maak link met deel-hashes"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Help om nieuwe en zeldzame bestanden sneller te verspreiden, ten koste van "
+"een verhoogde linkgrootte"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4 BestandsHash"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k BestandsHash"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k link"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Opslaan"
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Kopieer naar klembord"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Openen"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Open een bestand om zijn eD2k link te berekenen"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Kopieer berekende eD2k link naar klembord"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Opslaan als"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Bewaar berekende eD2k link naar bestand"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Over aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Selecteer het bestand waarvoor u de eD2k link wilt laten berekenen"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Kan het klembord niet openen"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Er is nu niets om te kopiëren !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Selecteer het bestand voor uw berekende eD2k link"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Kon niet openen "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Voer a.u.b. een niet lege bestandsnaam in"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Er is nu niets om te bewaren !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, de aMule eD2k link maker\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps van http://www.everaldo.com en http://www.icomania.com\n"
+"en http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Verspreid onder de GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Aan het hashen..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator is aan het werk voor u"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "MD4 Hash word berekend..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "eD2k Hashes worden berekend..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Afgebroken !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Verbonden met %s %s"
+msgid "Done in %.2f s"
+msgstr "Gedaan in %.2f s"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "U heeft deze URL al toegevoegd !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Voer a.u.b. een niet lege URL in"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "Verbinden met %s"
+msgid "Unable to open %s"
+msgstr "Kon %s niet openen"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Verbinding verbroken met eD2K"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i dag(en) %i u(u)r(en) %i min %i s"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad gestart."
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uu %0umin %02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad gestopt."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uu %02umin %02us"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Verbonden met Kad (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Verbonden met Kad (firewalled)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Verbinding met Kad verbroken"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxcas, aMule Online Statistieken"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Maximum DL snelheid sinds wxCas draait"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Absolute Maximum DL snelheid tijdens vorige keren dat wxCas draaide"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Systeem"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Stop Auto Verversen"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Bewaar Online Statistieken figuur"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Print Online Statistieken figuur"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Voorkeur instellingen"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Over wxCas"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Begin Auto Verversen"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Auto Verversen gestopt"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Auto Verversen gestart"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Bewaar Statistieken FIguur"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMule Online Statistieken"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Kad netwerk kan niet gebruikt worden als de UDP poort is uitgeschakeld in "
-"voorkeuren, wordt niet gestart."
+"Er was een probleem tijdens het printen.\n"
+"Misschien is uw printer niet goed ingesteld?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kad netwerk is uitgeschakeld in voorkeuren, wordt niet mee verbonden."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Aan het printen"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Kon vriendenlijst-bestand 'emfriends.met' niet lezen!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, aMule OnLine Handtekening Statistieken\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Gebaseerd op CAS van Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Verspreid onder de GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Kon niet schrijven naar vriendenlijst-bestand 'emfriends.met'!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh oh, aMule draait niet..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule draait"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule draait, maar niet verbonden"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule maakt verbinding..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh Oh, aMule status is onbekend..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " draait "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " is gestopt !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " is niet verbonden !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " is aan het verbinden..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " doet iets raars, controleer het !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " is verbonden met "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "uit"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " is aan "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " met"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Totale Download: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Upload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Sessie Download: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Download: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Upload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Deelt: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " bestand(en), Clients in wachtrij: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Tijd: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr "aan"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Gemiddelde Systeem Belasting (1-5-15 min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Systeem uptime: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Directory die het bestand amulesig.dat bevat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Voer hier de directory in waar uw amulesig.dat bestand is"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Tijd tussen de verversingen in seconden"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Genereer een status figuur bij elke verversing"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr ""
+"Voer hier de directory in waar u het statistieken figuur wilt laten genereren"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Upload uw status figuur regelmatig naar een FTP server"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP Url"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP Pad"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Voer hier de URL in van uw FTP server"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr ""
+"Voer hier de directory in waar uw status figuur op de FTP server moet komen"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Gebruiker"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Voer hier de Gebruikersnaam in om in te loggen op uw FTP server"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Voer hier het Wachtwoord in om in te loggen op uw FTP server"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Tijd tussen de FTP updates in minuten"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Controleer"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Directory die uw handtekening bestand bevat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Directory waar het statistieken figuur gegenereerd moet worden"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Laadt template <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Webserver HTTP poort"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Gebruik UPnP port forwarding voor webserverpoort"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP poort"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Gebruik gzip compressie"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Wachtwoord voor volledige toegang tot webserver"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Gast wachtwoord voor webserver"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Sta gast toegang toe"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Weiger gast toegang"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Laad/bewaar webserverinstellingen van/naar aMule op afstand"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMule config bestand pad. NIET DIRECT GEBRUIKEN!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Schakel PHP interpreter uit (verouderd)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Compileer PHP pagina's opnieuw bij elke aanvraag"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule Web Server"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "Webclient verbinding geaccepteerd\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "FOUT: kan verbinding van web client niet accepteren\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Aanvraag mislukt met de volgende fout: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Indexbestand niet gevonden: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Sessie verlopen - login wordt aangevraagd\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sessie ok, ingelogd\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sessie ok, niet ingelogd\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Geen sessie geopend - login wordt aangevraad\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Sessie aangemaakt - login wordt aangevraagd\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Aanvraag wordt verwerkt [origineel]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Geen wachtwoord opgegeven, login wordt niet toegestaan."
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Controleren van wachtwoord\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Wachtwoordhash ongeldig\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Wachtwoord ok\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Wachtwoord fout\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr ""
+"U heeft geen wachtwoord ingevoerd. Een leeg wachtwoord is niet toegestaan.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Loguit aangevraagd\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Aanvraag wordt verwerkt [omgeleid]: "
+
+#~ msgid "Romanian"
+#~ msgstr "Roemeens"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Download Status"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Update vertraging : %d seconde"
+#~ msgstr[1] "Update vertraging : %d seconden"
+
+#~ msgid "Transferring"
+#~ msgstr "Overdragen"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "QR: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "In Wachtrij"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - toon voortgang van een zoekopdracht"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Begonnen met het maken van MD4 en AICH hash voor bestand: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Begonnen met het maken van MD4 hash voor bestand: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Begonnen met het maken van AICH hash voor bestand: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "WAARSCHUWING: Kon origineel '%s' niet verwijderen na het maken van backup"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "WAARSCHUWING: Kon %s niet verwijderen"
+
+# What is QR abbr for?
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Waardering (totaal):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Probeer om volledige delen naar alle uploads te overdragen"
+
+#~ msgid "Networks window"
+#~ msgstr "Netwerken venster"
+
+#~ msgid "Searches window"
+#~ msgstr "Zoekvenster"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Downloaden"
+
+#~ msgid "Shared files window"
+#~ msgstr "Gedeelde bestanden venster"
+
+#~ msgid "Messages window"
+#~ msgstr "Berichtenvenster"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Statistiekenvenster (grafieken)"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Voorkeuren instellingen venster"
+
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Traybalk-pictogram kwijtgeraakt, poging tot opnieuw maken ..."
+
+#~ msgid "Transfers"
+#~ msgstr "Overdrachten"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Bestands overdrachten venster"
+
+#~ msgid "Unban"
+#~ msgstr "Maak ban ongedaan"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Laat Uploads zien"
+
+#~ msgid "Show Queue"
+#~ msgstr "Laat Wachtrij zien"
+
+#~ msgid "Select View"
+#~ msgstr "Selecteer Weergave"
+
+#~ msgid "Client Software"
+#~ msgstr "Client Software"
+
+#~ msgid "Waited"
+#~ msgstr "Gewacht"
+
+#~ msgid "Upload Time"
+#~ msgstr "Upload Tijd"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Upload/Download"
+
+#~ msgid "Remote Status"
+#~ msgstr "Remote Status"
+
+#~ msgid "File Priority"
+#~ msgstr "Bestandsprioriteit"
+
+#~ msgid "Score"
+#~ msgstr "Score"
+
+#~ msgid "Asked"
+#~ msgstr "Gevraagd"
+
+#~ msgid "Last Seen"
+#~ msgstr "Laatst Gezien"
+
+#~ msgid "Entered Queue"
+#~ msgstr "In Wachtrij Gekomen"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Ge-upload"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Ge-download"
+
+#~ msgid "Userhash"
+#~ msgstr "Userhash"
+
+#~ msgid "Encrypted"
+#~ msgstr "Versleuteld"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "%d vlaggen bitmaps geladen."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Toont Upload / Up-wachtrij"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Clients in wachtrij :"
+
+#~ msgid "Current Session"
+#~ msgstr "Huidige Sessie"
+
+#~ msgid "Total"
+#~ msgstr "Totaal"
+
+#~ msgid "Requested :"
+#~ msgstr "Opgevraagd :"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Maak backup voor voorbeeld"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Bestands Overdrachten Venster"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Totaal Gebruikers: %s | Totaal Bestanden: %s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "HTTP download thread gestart"
+
+#~ msgid "Download size: %i"
+#~ msgstr "Downloadgrootte: %i"
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "HTTP download thread beëindigd"
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Host: %s:%i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Antwoord: %i (Fout: %i)"
+
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "WAARSCHUWING: Leeg antwoord bij het aanmaken van stream"
+
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "FOUT: Redirection code ontvangen zonder URL"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country(): Kon landengegevens niet laden uit "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Verkrijg IPFilter niveau."
+
+#~ msgid "Makes a search."
+#~ msgstr "Voert een zoekopdracht uit."
+
+#~ msgid "Killed!"
+#~ msgstr "Gedood!"
+
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Amuleweb wordt gebruikt in '%s'"
+
+#~ msgid "Shutting down aMule..."
+#~ msgstr "aMule wordt afgesloten..."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "De volgende opties zijn vanwege beveiligingsredenen gewijzigd in deze "
+#~ "versie:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Protocol Obfuscatie ingeschakeld voor binnenkomende en uitgaande "
+#~ "verbindingen.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Serverlijst updaten van andere servers en clients uitgeschakeld.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Voor meer informatie over de reden voor deze veranderingen, zoek\n"
+#~ "op de aMule wiki op http://wiki.amule.org naar \"fake servers\".\n"
+#~ "Het is belangrijk dat u alle nepservers uit uw serverlijst verwijderd om "
+#~ "aMule goed te laten werken."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Verder zijn de browser instellingen gereset naar de systeem standaard. "
+#~ "Configureer a.u.b. uw browser opties opnieuw indien nodig.\n"
+
+#~ msgid "Fetching status..."
+#~ msgstr "Status wordt opgehaald..."
+
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Gebruikers: E: %s K: %s | Bestanden E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Client %s op IP:Poort %s:%d gebruikt %s %s %s"

aMule-2.2.6.tar.bz2/po/nn.po -> aMule-2.3.1.tar.bz2/po/nn.po Changed

@@ -1,1352 +1,1202 @@
-# translation of nn.po to norwegian nynorsk
 # translation of nn.po to
 # Norwegian Nynorsk translations for aMule package.
-# Copyright (C) 2007, 2008, 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the aMule package.
 #
 #
 # <PleaseInsertYour@email.here>, 2007.
 #  <PleaseInsertYour@email.here>, 2007.
 # Hallvor Brunstad <Hallvor_1976@yahoo.com>, 2008.
-# Hallvor Brunstad <Hallvor_1976@yahoo.no>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-03-10 16:55+0100\n"
-"Last-Translator: hallvor\n"
-"Language-Team: norwegian nynorsk <nn@li.org>\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Du må skrive inn eit passord som ikkje er tomt."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Feil passord! Ikkje MD5 hash!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Oppkoplingsfeil"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "EC kopling feila. Tomt svar."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Ekstern kopling: Tilgang nekta fordi:"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Ekstern kopling: Tilgang nekta"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Ekstern kopling: Dårleg svar frå tenar. Kopling stengd."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Vellukka! Kopling til aMule er oppretta "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Vellukka! Kopling oppretta."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Hashar"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Ferdigstiller"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Legg til ein kamerat"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Ferdig"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Du mÃ¥ skrive inn ein gangbar IP og port!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Pausa"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Informasjon"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Feilaktig"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Den innskrivne brukarhashen er ikkje gyldig!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Lastar ned"
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Greidde ikkje Ã¥ opne %sÂ·(%s)"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Ventar"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"ÃTVARING: Du kan ikkje leggje deg sjÃ¸lv til som kjelde for ei eD2k lenkje "
+"medan du har ein lÃ¥gid."
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Opprettar MD4 og AICH hash for fila: %s"
+#: src/amule.cpp:239
+#, fuzzy
+msgid "Now, exiting main app..."
+msgstr ""
+"\n"
+"Ok,Â·avsluttarÂ·%s...\n"
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Opprettar MD4 hash for fila: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:141
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Opprettar AICH hash for fila: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Konverterer gamle AICH hashsett i '%s'·til·64b·i·'%s'."
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Mislukka"
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "ÅTVARING: Filnamnet '%s' er feil og har vorte omdøypt til '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr ""
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "ÅTVARING: Fila '%s' finst allereie; ny fil omdøypt til '%s'."
+#: src/amule.cpp:335
+#, fuzzy
+msgid "aMule shutdown completed."
+msgstr "Nedlasting fullfÃ¸rt"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "ÅTVARING: Kunne ikkje fjerne den opphavelege '%s' etter tryggleikskopi"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr ""
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "ÅTVARING: Greidde ikkje å slette %s"
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "Stadfesting av avslutting"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Greidde ikkje å hente delte filer frå brukar '%s'"
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "Ny ekstern kopling akseptert"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Ukjend"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "ÃTVARING"
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Falsk eMuleutgåve %#x)"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Falsk eMule)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Falsk eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Du har ingen tenarar i tenarlista.\n"
+"Vil du at aMule skal laste ned ei ny liste no?"
 
-#: src/BaseClient.cpp:1790
-#, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x·(basert på eMule·v0.%u)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Nedlasting av tenarliste"
 
-#: src/BaseClient.cpp:1960
+#: src/amule.cpp:654
 #, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Brukarnamn: %s·ID:·%u"
+msgid "web server running on pid %d"
+msgstr "vevtenar kÃ¸yrer pÃ¥ pid %d"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Etterspurt: %s\n"
+#: src/amule.cpp:658
+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 ""
+"Du freista Ã¥ kÃ¸yre vevtenar ved oppstart, men binÃ¦rfila amuleweb kan ikkje "
+"kÃ¸yrast. Installer pakken som inneheld vevtenaren til aMule, eller kompiler "
+"aMule med --enable-webserver og kÃ¸yr make install"
+
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "FEIL"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Filstatistikk for denne økta: Godkjende %d av %d etterspurnad, %s overført\n"
-msgstr[1] ""
-"Filstatistikk for denne økta: Godkjende %d av %d etterspurnader, %s "
-"overført\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Greidde ikkje Ã¥ knyte portar til adressa: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Filstatistikk for alle økter: Godkjende %d av %d etterspurnad, %s overført\n"
-msgstr[1] ""
-"Filstatistikk for alle økter: Godkjende %d av %d etterspurnader, %s "
-"overført\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Etterspurt ukjend fil"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "PortÂ·%u er ikkje tilgjengeleg. Du vil fÃ¥ LÃ¥gID\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Klient %s·på·IP:Port·%s:%d·nyttar·%s·%s·%s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Brukarnamn"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"PortÂ·%uÂ·er ikkje tilgjengeleg!\n"
+"\n"
+"Dette betyr at du vil vere LÃ¥gID.\n"
+"\n"
+"Sjekk nettverket ditt for Ã¥ vere viss pÃ¥ at porten er open for inn- og "
+"utgÃ¥ande trafikk."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Vener"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Greidde ikkje Ã¥ lage OnlineSigfil"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Syn &detaljar"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Greidde ikkje Ã¥ lage aMule si OnlineSigfil."
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Legg til ein ven"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"Dei valte lokale innstillingane ser ikkje ut til Ã¥ vere installerte pÃ¥ "
+"maskina di. (Merk: Eg freistar Ã¥ setje dei likevel)"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Ta bort ven"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "Dette er fÃ¸rste gongen du kÃ¸yrer aMule %s"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Send &melding"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Denne utgÃ¥va er ei testutgÃ¥ve, oppdatert dagleg, og\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Sjå filer"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr "vi gir ingen garanti for skade eller nedbrenning av huset ditt,\n"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Opprett venekopling"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "eller drep hunden din. Men det *burde* vere trygt Ã¥ nytte uansett.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Er du viss på at du vil slette den valde venen?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Meir informasjon, brukarstÃ¸tte og nye utgÃ¥ver kan verte funne pÃ¥ heimesida "
+"vÃ¥r.\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Er du viss på at du vil slette dei valde venene?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"pÃ¥ www.aMule.org, eller pÃ¥ IRC-kanalen vÃ¥r #aMuleÂ·pÃ¥Â·irc.freenode.net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Avbryt"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "VÃ©r god Ã¥ rapportere feil til http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Det er ikkje tillate å opprette meir enn ei venekopling.\n"
-" Berre ei venekopling vart oppretta."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Fleirval"
+"Mappa spesifisert for nettsignaturar er UGANGBAR!\n"
+" Nettsignaturar vert DEAKTIVERT fram til du ordnar det i innstillingar."
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Nedlasting fullført"
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "Tenarnamn:"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Fullstendig sti til fila"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Henting av diskplass for fila '%s' mislukka: %s"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Namnet til fila utan stikomponent."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "FEIL: Greier ikkje Ã¥ opne loggfila"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "eD2k hash på fila"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "ÃTVARING: loggfila er tom. Noko er gale."
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Filstorleiken i bytes."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Loggen har vorte nullstilt"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Samla tid på nedlastingsaktivitet."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Tenarmelding: %s"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Ny lynmeldingsøkt starta"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Meldingssendar."
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Klarte ikkje Ã¥ laste ned nodelista."
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Tom for plass"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Klarte ikkje Ã¥ opne den nedlaste utgÃ¥vesjekkfila"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Diskpartisjon,"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Korrupt utgÃ¥vesjekkfil"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Feil ved ferdigstilling"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Du nyttar ei utdatert utgÃ¥ve av aMule!"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Filnamn"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Di utgÃ¥ve av aMule er %i.%i.%i og den siste utgÃ¥va er %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Storleik"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Den siste utgÃ¥va finst alltid pÃ¥ http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Sort"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "ÃTVARING: UtgÃ¥va di av aMule er utdatert: %i.%i.%iÂ·<Â·%li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioritet"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "UtgÃ¥va di av aMule er oppdatert."
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "FilID"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Klarte ikkje Ã¥ laste ned utgÃ¥vesjekkfila"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Etterspurnader"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Brukarar: %s | Filer: %s"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Godtekne etterspurnader"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Brukarar: E %s K: %s | Filer: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Overførte data"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Ingen valde nettverk"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Delingssamsvar"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "med LÃ¥gID"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Nedlasta delar"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "med HÃ¸gID"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Komplette kjelder"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Tilkopla %sÂ·%s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Katalogsti"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Koplar til %s"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Delte filer"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "FrÃ¥kopla eD2k"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Svært låg"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad starta"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Låg"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad stogga."
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Vanleg"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Tilkopla Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Høg"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Tilkopla Kad (brannmura)"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Svært høg"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "FrÃ¥kopla Kad"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Offentleggjering"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Kad kan ikkje nyttast dersom UDP-porten er deaktivert i innstillingar. "
+"Startar ikkje."
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Automatisk"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Kad-nettverket er deaktivert i innstillingar. Koplar ikkje til."
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Legg til kommentar/Rangering"
+#: src/amuled.cpp:560
+#, fuzzy
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"FEIL: aMule daemon kan ikkje nyttast dersom eksterne koplingar er "
+"deaktiverte. For Ã¥ aktivere eksterne koplingar mÃ¥ du anten nytte vanleg "
+"aMule, starte amuled med valet --ec-config eller set lykelen "
+"\"AcceptExternalConnections\" til 1 i fila ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Endre kommentar/Rangering"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Endre namn"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Legg filer frå samlinga til overføringslista"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Kopiér magnet &URI til utklippstavla"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Kopier eD2k &lenka til utklippstavla"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "Feil: %s"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Kopier eD2k lenka til utklippstavla (&Kjelde)"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Dette er aMule %s basert pÃ¥ eMule."
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Kopier eD2k lenkje til utklippstavle (Kjelde) &Med krypteringsval)"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "KÃ¸yrer pÃ¥ %s"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Kopier eD2k lenkje til utklippstavla (&Vertsnamn)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Vitje http://www.amule.org for Ã¥ sjekke om ei ny utgÃ¥ve er tilgjengeleg."
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr "Kopier eD2k lenkje til utklippstavla (Vertsnamn) (Med &krypteringsval)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "FATAL FEIL: Greidde ikkje Ã¥ lage tidtakar"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Kopier eD2k lenkje til utklippstavla (&AICH info)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "aMule fjernkontroll"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Kopiér tilbakemelding til utklippstavla"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Bilete:"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:501
 msgid ""
-"Feedback from: %s (%s)\n"
+"'All-Platform' p2p client based on eMule \n"
 "\n"
 msgstr ""
-"Tilbakemelding frå: %s (%s)\n"
-"\n"
-
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Du treng ein HøgID for å lage ei gangbar kjeldelenkje"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "ÅTVARING"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Delte filer (%i)"
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[Delfil]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Skriv nytt namn på denne fila:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Døyp om fil"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr ""
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Held fram opplastingar av fila: %s"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr ""
 
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Mellombels stogge opplastingar av fila: %s"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
 
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMule tekstklient"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr ""
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: for kort søkjeord"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Las %u kadkontakt"
-msgstr[1] "Las %u kadkontaktar"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Berre %d kadkontakt tilgjengeleg, skreiv ikkje til nodes.dat"
-msgstr[1] "Berre %d kadkontaktar tilgjengelege, skreiv ikkje til nodes.dat"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: P2P brukarruting bygd pÃ¥ XOR metric.\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Skreiv %d kadkontakt"
-msgstr[1] "Skreiv %d kadkontaktar"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "FEIL: Greidde ikkje lytte til TCP port."
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "vevklientoppkopling godkjend\n"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Melding"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "FEIL: kan ikkje godkjenne vevklientkopling\n"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Etterspurnaden mislukka med følgjande feil: %s."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Koplar til"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Etterspurnaden mislukka med ukjend feil."
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Koplar til"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Registerfil ikkje funne: "
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: FrÃ¥kopla"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Økt utgått - ber om logginn\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Brannmura"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Økt ok, logga inn\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Tilkopla"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Økt ok, ikkje innlogga\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Koplar til"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Inga økt opna - vil be om logginn\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Av"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Økt oppretta - ber om logginn\n"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Handsamar etterspurnad [original]: "
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Stopp inneverande oppkoplingsfreistingar"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Sjekkar passord\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Kople frÃ¥"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Passord hash feil\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Kople frÃ¥ dei aktive nettverka"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Passord ok\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Kople til"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Feil passord\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Kople til dei valde nettverka"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Du skreiv ikkje inn eit passord. Tomt passord er ikkje tillate.\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Opp:Â·%.1f(%.1f)Â·|Â·Ned:Â·%.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Utlogging etterspurt\n"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Opp:Â·%.1fÂ·|Â·Ned:Â·%.1f"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Handsamar etterspurnad [omdirigert]: "
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMuleÂ·(%sÂ·|Â·Tilkopla)"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Lastar modell <str>"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMuleÂ·(%sÂ·|Â·FrÃ¥kopla)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "HTTP port for vevtenar"
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Vil du verkeleg avslutte aMule?"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Bruk UPnP portvidarekopling på vevtenarport"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Stadfesting av avslutting"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP port"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Nytt gzipkomprimering"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Fulltilgangspassord for vevtenar"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Skinnkatalogen '%s' finst ikkje"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Gjestepassord for vevtenar"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "ÃTVARING: Greidde ikkje Ã¥ opne hudfila '%s' for lesing"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Gje løyve til gjestetilgang"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Nettverk"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Nekt gjestetilgang"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Nettverksavindauge"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Last/lagre vevtenarinnstillingar frå/til fjern aMule"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "SÃ¸k"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMule konfugurasjonsfilsti. IKKJE NYTT DIREKTE!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "SÃ¸kjevindauge"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Deaktivér PHP tolk (frårådd)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Nedlastingar"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Omkompilér PHP-sider ved kvar etterspurnad"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Lastar ned"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule vevtenar"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Delte filer"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Ikkje tilgjengeleg"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Vindauge for delte filer"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Aldri"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Meldingar"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Lastar ned..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Meldingsvindauge"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistikk"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr ""
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Statistikkgrafvindauge"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Innstillingar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Katalog som inneheld amulesig.dat fila"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Bla"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Skriv inn kvar katalogen som inneheld amulesig.dat fila er"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Oppfriskingsintervall i sekund"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Innstillingsvalsvindauge"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Lag eit statistikkbilete ved kvar oppfriskingshending"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "ImportÃ©r"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Skriv inn katalogen du vil lage statistikkbiletet i"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Verkty for delfilimport"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Last regelbunde opp statistikkbilete til ein FTP tenar"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Om"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP-Url"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Om/hjelp"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTPsti"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "ed2k nettverk"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Skriv inn URL til FTP tenar"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Kad nettverk"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "Skriv inn katalogen du lastar statistikkbiletet til FTPtenaren til"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Ikkje noko nettverk"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Brukar"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Passord"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Skriv inn brukarnamnet for å logge inn på FTPtenaren din"
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "FATAL FEIL: Greidde ikkje Ã¥ lage tidtakar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Skriv inn brukarpassordet for å logge inn på FTPtenaren din"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Kople til aMule over nettet"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "FTP oppdateringsintervall i minutt"
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "FATAL FEIL: Greidde ikkje Ã¥ lage tidtakar"
+
+#: src/amule-remote-gui.cpp:268
+#, fuzzy
+msgid "Going to event loop..."
+msgstr "Freistar Ã¥ hente fram att filinformasjon..."
+
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "Koplar til"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Validere"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Oppkopling mislukka "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Katalog som inneheld signaturfila di"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Katalog der statistikkbiletet vert laga"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i dag(ar) %i timar %i min %i s"
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "WxCas, aMule nettstatistikk"
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Velkomen!"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Høgaste nedlastingsfart medan wxCas har køyrt"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Alle"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Absolutt maksimum nedlastingsfart nokon gong medan wxCas har køyrt"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Still attende"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Ukjend"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "System"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Greidde ikkje Ã¥ hente delte filer frÃ¥ brukar '%s'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Stopp. Autooppfrisking"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Lagre nettstatistikkbiletet"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Falsk eMuleutgÃ¥ve %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Skriv ut nettstatistikkbiletet"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Falsk eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Innstillingsval"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Falsk eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Om wxCas"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.xÂ·(basert pÃ¥ eMuleÂ·v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Start autooppfrisking"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Brukarnamn: %sÂ·ID:Â·%u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Autooppfrisking stogga"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Etterspurt: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Autooppfrisking starta"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Filstatistikk for denne Ã¸kta: Godkjende %d av %d etterspurnad, %s overfÃ¸rt\n"
+msgstr[1] ""
+"Filstatistikk for denne Ã¸kta: Godkjende %d av %d etterspurnader, %s "
+"overfÃ¸rt\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Lagre statistikkbilete"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Filstatistikk for alle Ã¸kter: Godkjende %d av %d etterspurnad, %s overfÃ¸rt\n"
+msgstr[1] ""
+"Filstatistikk for alle Ã¸kter: Godkjende %d av %d etterspurnader, %s "
+"overfÃ¸rt\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMule nettstatistikk"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Etterspurt ukjend fil"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
-"Det oppstod eit problem med utskrifta.\n"
-"Kanskje er ikkje skrivaren din innstilt skikkeleg?"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Melding filtrÃ©rt frÃ¥ '%s'Â·(IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Skriv ut"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Ny melding frÃ¥ '%s'Â·(IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
 msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"wxCas,·aMule·nettsignaturstatistikk\n"
-"\n"
-"(c)·2004·ThePolish·<thepolish@vipmail.ru>\n"
-"\n"
-"Basert·på·CAS·av·Pedro·de·Oliveira·<falso@rdk.homeip.net>\n"
-"\n"
-"Distribuert·under·GPL"
+"BrukarÂ·%s (%u)Â·etterspurteÂ·listaÂ·overÂ·delteÂ·filerÂ·forÂ·katalogenÂ·%s ->Â·nekta"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Å nei, aMule køyrer ikkje..."
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, fuzzy, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "ÃTVARING: known.met let seg ikkje opne."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule køyrer"
+#: src/CanceledFileList.cpp:61
+#, fuzzy
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr "ÃTVARING: Kjendfillista er korrupt; inneheld ugangbar overskrift."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule køyrer, men fråkopla"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "IO feil underlesing av known.met fila: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule koplar til..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Feil under lagring av known.met fila: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Å nei, ukjend status for aMule..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategori"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " har køyrt i "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Ny kategori"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " er stogga !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "VÃ©l ei mappe for innkomande filer"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " er ikkje tilkopla !"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Du mÃ¥ skrive inn eit namn pÃ¥ kategorien!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " koplar til..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Du mp skrive inn ein sti for kategorien!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " gjer noko rart, sjekk det !"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Greidde ikkje Ã¥ skape innkomande katalog for kategorien. VÃ©r god Ã¥ skrive "
+"inn ein gangbar sti!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " er tilkopla "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "LynmeldingsÃ¸kt starta: %sÂ·(%s:%u)Â·-Â·%sÂ·%s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "***Â·Tilkopla klientÂ·***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "***Â·Koplar til klientÂ·***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "brannmura"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Greidde ikkje Ã¥ kople til klient / Kopling mista ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "av"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " er på "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " med "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Total nedlasting: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Stengje faneblad"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr " Opplasting: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Stengje alle faneblad"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Nedlasting denne økta: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Stengje andre faneblad"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Nedlasting: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Legg til kameratar"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, opplasting: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Kredittfil lasta, %u kjend klient"
+msgstr[1] "Kredittfil lasta, %u kjende klientar"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Kredittar forelda for %u klient!"
+msgstr[1] " - Kredittar forelda for %u klientar!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Deler: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Inga 'cryptkey.dat' fil funne - opprettar."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " filer, klientar i kø: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Klientdetaljar"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Tid: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LÃ¥gID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f·kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HÃ¸gID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " på "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Aktivert"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Gjennomsnittleg systembelasting (1-5-15·min): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "StÃ¸tta"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Oppetid: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Ikkje stÃ¸tta"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Deaktivert"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Tilkopla"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "FrÃ¥kopla"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02us"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HøgID"
+msgid "%.1f kB/s"
+msgstr "%.1fÂ·kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LågID"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Ikkje ferdig"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Ikkje tilkopla"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Kjeltring"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Granska - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f·KB"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Ikkje tilgjengeleg"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "Brukar %sÂ·(%u) etterspurde liste over dei delte filene dine -> Godteke"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "BrukarÂ·%s (%u)Â·etterspurdeÂ·listeÂ·overÂ·deiÂ·delteÂ·fileneÂ·dineÂ·-> Nekta"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Avbrote!"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "Brukar %sÂ·(%u) etterspurte lista di over delte katalogar -> Godteke"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "Unable to open %s"
-msgstr "Ikkje i stand til å opne %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Innmatingsparameter"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Fil å hashe"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Legg til valfrie URL`ar for denne fila"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Skriv inn fila du vil lage eD2k lenkje til her"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "BrukarÂ·%s (%u)Â·etterspurteÂ·listaÂ·diÂ·overÂ·delteÂ·katalogarÂ·->Â·Nekta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Skriv inn internettadressa du vil leggje til eD2k lenka: Legg til / på "
-"slutten for å la aLinkCreator leggje til det noverande filnamnet "
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Legg til"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Ta bort"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Frigjer plass"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Lag lenkje "
+"Brukar %sÂ·(%u) etterspurte lista over delte filer for katalogen %sÂ·-> godteke"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Hjelp til med å spreie nye og sjeldne filer raskare, men med auka "
-"lenkjestorleik"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4 filhash"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k filhash"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k lenkje"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Start"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Lagre"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Kopiér til utklippstavle"
+"BrukarÂ·%s (%u)Â·etterspurteÂ·listaÂ·overÂ·delteÂ·filerÂ·forÂ·katalogenÂ·%s ->Â·nekta"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Avslutt"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Open"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Opne ei fil for å rekne ut eD2k lenka hennar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopiér"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Kopier utrekna eD2k lenkje til skrivebordet"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Brukar %sÂ·(%u) deler katalogen %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Lagre"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Lagre utrekna eD2k lenkje til fil"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Om"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Om aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Vel fila du vil rekne ut eD2k lenkje til"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Greier ikkje opne utklippstavle"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Ikkje noko å kopiére no !"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Vel fila til den utrekna eD2k lenka"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Ikkje i stand til å opne"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Brukar %sÂ·(%u) sende ikkje etterspurte delte kataloger."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Vér god å skrive inn eit filnamn som ikkje er tomt"
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "Brukar %sÂ·(%u) sende liste over delte filer for katalogen %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Ikkje noko å lagre akkurat no !"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Brukar %sÂ·(%u) er ferdig med Ã¥ sende liste over delte filer"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"aLinkCreator, eD2k lenkjeskaparen\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Grafikk frå http://www.everaldo.com og http://www.icomania.com\n"
-"og http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distribuert under GPL"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Brukar%sÂ·(%u) sende ikkje etterspurt liste over delte filer"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Hashar..."
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr "Brukar %sÂ·(%u) nekta tilgang til delte kataloger/filer"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator fungerer"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Filkommentarar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Reknar ut MD4 hash..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Brukarnamn"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Reknar ut eD2k hashar..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Filnamn"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Ferdig om %.2f·s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Verdi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Du har allereie lagt til denne URL`en!"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Kommentar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Vér god å skrive inn ein URL som ikkje er tom"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Ingen kommentarar"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Handsamar filnummer %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Du har spurt etter delhashar (Berre brukt på filer > 9,5 MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u kommentar"
+msgstr[1] "%u kommentarar"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s·--->·Fila finst ikkje·!\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, lenkjeskaparen for aMule"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
-msgstr "Auto [Lå]"
+msgstr "Auto [LÃ¥]"
 
 #: src/DataToText.cpp:38
 msgid "Auto [No]"
-msgstr "Auto·[No]"
+msgstr "AutoÂ·[No]"
 
 #: src/DataToText.cpp:39
 msgid "Auto [Hi]"
-msgstr "Auto·[Hø]"
+msgstr "AutoÂ·[HÃ¸]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Koplar til"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "SvÃ¦rt lÃ¥g"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "LÃ¥g"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Vanleg"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "HÃ¸g"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "SvÃ¦rt hÃ¸g"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Offentleggjering"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
-msgstr "Spør"
+msgstr "SpÃ¸r"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Koplar til gjennom tenar"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
-msgstr "Kø full"
+msgstr "KÃ¸ full"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
-msgstr "I kø"
+msgstr "I kÃ¸"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Overfører"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Lastar ned"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1358,7 +1208,7 @@
 
 #: src/DataToText.cpp:68
 msgid "Cannot connect LowID to LowID"
-msgstr "Greier ikkje å kople LågID til LågID"
+msgstr "Greier ikkje Ã¥ kople LÃ¥gID til LÃ¥gID"
 
 #: src/DataToText.cpp:69
 msgid "Too many connections"
@@ -1372,8 +1222,7 @@
 msgid "Too many Kad connections"
 msgstr "For mange kadkoplingar"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Nekta"
 
@@ -1383,7 +1232,7 @@
 
 #: src/DataToText.cpp:75
 msgid "Remote Queue Full"
-msgstr "Fjern kø full"
+msgstr "Fjern kÃ¸ full"
 
 #: src/DataToText.cpp:105
 msgid "Old MLDonkey"
@@ -1405,8 +1254,8 @@
 msgid "Remote Server"
 msgstr "Fjern tenar"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1424,14 +1273,14 @@
 
 #: src/DataToText.cpp:134
 msgid "Source Seeds"
-msgstr "Kjeldefrø"
+msgstr "KjeldefrÃ¸"
 
 #: src/DataToText.cpp:135
 msgid "Search Result"
-msgstr "Søkjeresultat"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Ferdig"
 
@@ -1455,9 +1304,9 @@
 msgid "ERROR: Failed!"
 msgstr "FEIL: Mislukka!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
-msgstr "I kø"
+msgstr "I kÃ¸"
 
 #: src/DataToText.cpp:152
 msgid "Already downloading"
@@ -1465,3091 +1314,1381 @@
 
 #: src/DataToText.cpp:153
 msgid "Unknown or bad tempfile format."
-msgstr "Ukjend eller dårleg format på tempfil."
-
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Standardinnstillingar"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albansk"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabisk"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturiansk"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Baskisk"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgarsk"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Katalansk"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Kinesisk (forenkla)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Kinesisk (tradisjonell)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Kroatisk"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Tsjekkisk"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Dansk"
+msgstr "Ukjend eller dÃ¥rleg format pÃ¥ tempfil."
 
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Nederlansk"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Engelsk (U.K.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estisk"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finsk"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Fransk"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galisisk"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Tysk"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Gresk"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hebraisk"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Ungarsk"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italiensk"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italiensk (sveitsisk)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japansk"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Koreansk"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Litauisk"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norsk (Nynorsk)"
-
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polsk"
-
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugisisk"
-
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugisisk (Brasil)"
-
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Russisk"
-
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Slovensk"
-
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Spansk"
-
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Svensk"
-
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Tyrkisk"
-
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ukrainsk"
-
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Ikkje i stand til å fastslå valt vevlesar!"
-
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"TCP port kan ikkje vere høgare enn 65532 fordi tenaren si UDPkopling er TCP+3"
-
-#: src/Preferences.cpp:1681
-#, c-format
-msgid "Default port will be used (%d)"
-msgstr "Standardport vert nytta (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Tenarnamn"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Addresse"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Skildring"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Brukarar"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Filer"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Mislukka"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Statisk"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Utgåve"
-
-#: src/ServerListCtrl.cpp:144
-msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
-"Du er tilkopla ein tenar du freistar å slette. Vér god å kople frå først. "
-"Tenaren vart IKKJE sletta."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Ukjent namn)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Er du sikker på at du vil slette den statiske tenaren %s"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Ja"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Nei"
-
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Greidde ikkje å opne '%s'"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Tenarar (%i)"
-
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Tenar"
-
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Kople til tenar"
-
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Merk tenar som statisk"
-
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Merk tenar som ustatisk"
-
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Merk tenarar som statiske"
-
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Merk tenarar som ustatiske"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Storleik"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Ta bort tenar"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "OverfÃ¸rt"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Ta bort tenarar"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Fart"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Fjern alle tenarar"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Framdrift"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Kopier eD2k lenkje til skrivebordet"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Kjelder"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopier eD2k lenkjer til skrivebordet"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioritet"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Kople til tenar att"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Status"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Er du sikker på at du vil slette alle tenarane?"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "AttstÃ¥ande tid"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Er du viss på at du vil slette den valde tenaren."
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Sist sett komplett"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Er du viss på at du vil slette dei valde tenarane?"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Sist motteke"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Deaktivert [%s]"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Er du viss pÃ¥ at du vil slette den valde fila?"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Dette er aMule %s basert på eMule."
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Er du viss pÃ¥ at du vil slette dei valte filene?"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Running on %s"
-msgstr "Køyrer på %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Vitje http://www.amule.org for å sjekke om ei ny utgåve er tilgjengeleg."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "FATAL FEIL: Greidde ikkje å lage tidtakar"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMule fjernkontroll"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Bilete:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr " 'All-platform' p2p klient bygd på eMule \n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Vevside: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Forum: http://forum,amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr "OSS: http://wiki.amule.org \n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Kontaktadmin@amule.org (administrative saker) \n"
-
-#: src/amuleDlg.cpp:469
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
+"Feedback from: %s (%s)\n"
 "\n"
 msgstr ""
-" Opphavsrett (c) 2003-2009 aMule Team \n"
+"Tilbakemelding frÃ¥: %s (%s)\n"
 "\n"
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr "Ein del av aMule er bygd på \n"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Automatisk"
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: P2P brukarruting bygd på XOR metric.\n"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "%Stopp"
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Opphavsrett (c) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Melding"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pause"
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Koplar til"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Hald fram"
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Fråkopla"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "&Ta bort ferdige"
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Brannmura"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Byt alle A4AF til denne fila no"
 
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Tilkopla"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Byt alle A4AF til denne fila (auto)"
 
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Koplar til"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Byt alle A4AF til anna fil no"
 
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Av"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Utvida innstillingar"
 
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Stopp inneverande oppkoplingsfreistingar"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "FÃ¸rehandssyning"
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Kople frå"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Syn fil&detaljar"
 
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Kople frå dei aktive nettverka"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Syn alle kommentarar"
 
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Kople til"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "KopiÃ©r magnet URI til utklippstavla"
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Kople til dei valde nettverka"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Kopier eD2k &lenka til utklippstavla"
 
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Opp:·%.1f(%.1f)·|·Ned:·%.1f(%.1f)"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "KopiÃ©r tilbakemelding til utklippstavla"
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Opp:·%.1f·|·Ned:·%.1f"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "ortildele"
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule·(%s·|·Tilkopla)"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Vel kategori"
 
-#: src/amuleDlg.cpp:836
-#, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule·(%s·|·Fråkopla)"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Opne fila"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Vil du verkeleg avslutte aMule?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Skriv nytt namn pÃ¥ denne fila:"
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Stadfesting av avslutting"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "DÃ¸yp om fil"
 
-#: src/amuleDlg.cpp:1182
-#, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Skinnkatalogen '%s' finst ikkje"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%dÂ·%H:%M:%S"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "ÅTVARING: Greidde ikkje å opne hudfila '%s' for lesing"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Nettverk"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Nettverksvindauge"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Søk"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Søkevindauge"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Overføringar"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Filoverføringsvindauge"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Delte filer"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Vindauge for delte filer"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Meldingar"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Meldingsvindauge"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistikk"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Statistikkgrafvindauge"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Innstillingsvindauge"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importér"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Verkty for delfilimport"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Om/hjelp"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "ed2k nettverk"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Kad nettverk"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Ikkje noko nettverk"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Generelt"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Kopling"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Katalogar"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Tenarar"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Tryggleik"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Grensesnitt"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filter"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Fjernkontrollar"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Nettsignatur"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Avansert"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Hendingar"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Melde om feil"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Brukardefinert"
+msgid "Downloads (%i)"
+msgstr "Nedlastingar (%i)"
 
-#: src/PrefsUnifiedDlg.cpp:539
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-"aMule·treng omstart for å gjere endringane moglege:\n"
-"\n"
+"Vel ein videospelar i innstillingar for Ã¥ hindre at denne Ã¥tvaringa kjem opp "
+"ved kvar fÃ¸rehandssyning (mplayer er standard)"
 
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "-·TCP-porten endra.\n"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "FÃ¸rehandssyning"
 
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "-·UDP-porten endra.\n"
+#: src/DownloadListCtrl.cpp:1461
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "FEIL: Greidde ikkje Ã¥ starte ekstern mediespelar! Kommando: '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
 msgstr ""
-"Tenarlista for automatisk oppdatering er tom.\n"
-"Tenarlista for automatisk oppdatering ved oppstart er ikkje aktivert."
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
-"Du har aktivert eksterne koplingar, men har ikkje skrive inn eit passord.\n"
-"Eksterne koplingar kan ikkje aktiverast utan eit gyldig passord."
 
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Språk endra.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Mellombels mappe endra.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- ED2K nettverket er aktivert.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Opp:·0.0·|·Ned:·0.0"
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "Lastar server.met fila: %s"
 
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Både eD2k og kadnettverket er deaktivert.\n"
-"Du vil ikkje klare å kople til før du aktiverer minst eitt av dei."
+#: src/DownloadQueue.cpp:132
+#, fuzzy, c-format
+msgid "Loading PartFile %u of %u"
+msgstr "Lastar data frÃ¥ gamal nedlastingsfil (%uÂ·avÂ·%u)"
 
-#: src/PrefsUnifiedDlg.cpp:660
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Kad kan ikkje starte dersom UDP-porten er deaktivert.\n"
-"Aktivér UDP-porten eller deaktivér Kad."
+"FEIL: Greidde ikkje Ã¥ laste tryggleikskopifila. SÃ¸k http://forum.amule.org "
+"for lÃ¸ysingar pÃ¥ attskaping av part.met filer."
 
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
-"\n"
-"Du MÅ starte om att aMule no.\n"
-"Ikkje klag dersom du ikkje gjer dette og du får problem.\n"
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
-msgstr ""
-"Lista for automatisk oppdatering av tenarar er tom.\n"
-"Vér god og fylle ut ein URL som peikar til ei gyldig server.met fil.\n"
-"Klikk på knappen \"Liste\" ved denne boksen for å skrive inn ein URL."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Mellombelse filer"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Innkomande filer"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Nettsignaturar"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Vel ei mappe for %s"
-
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Bla etter videospelar"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Vél nettlesar"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Ingen delfiler funne"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Køyrbar%s"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Fann %u delfil"
+msgstr[1] "Fann %u delfiler"
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Handsame tenarlista"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
+msgstr "Filsystemet for mellombelse filer greier ikkje Ã¥ handsame store filer."
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
-"Skriv inn URL`en for å laste ned server.met filer.\n"
-"Berre ein URL på kvar linje."
-
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Oppdateringspause: %d sekund"
-msgstr[1] "Oppdateringspause: %d sekund"
+"Filsystemet i mappa for innkomande filer greier ikkje Ã¥ handsame store filer."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Tid for gjennomsnittleg graf: %d minutt"
-msgstr[1] "Tid for gjennomsnittleg graf; %d minutt"
+msgid "Downloading %s"
+msgstr "Lastar ned %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Koplingsgrafskala: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Du freistar allereie nedlasting av fila '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Oppdateringsforseinking: %d sekund"
-msgstr[1] "Oppdateringsforseinking: %d sekund"
+msgid "You already have the file '%s'"
+msgstr "Du har allereie fila: '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Filbufferstorleik: %d byte"
-msgstr[1] "Filbufferstorleik: %d bytes"
+msgid "You are already trying to download the file %s"
+msgstr "Du freistar allereie nedlasting av fila %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Opplastingskøstorleik: %d klient"
-msgstr[1] "Opplastingskøstorleik: %d klientar"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Kan ikkje konvertere magnetlenkje til eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Oppfriskingsinterval på tenarkoplingar: %d minutt"
-msgstr[1] "Oppfriskingsinterval på tenarkoplingar: %d minutt"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Oppfriskingsintervall for tenarkopling: Deaktivert"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "UDP-port for utvida tenarførespurnader (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "deaktivert"
+msgid "Unknown protocol of link: %s"
+msgstr "Ukjend lenkjeprotokoll for: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Køyr kommando på `%s' hending"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Aktivér kommandokøyring i kjernen"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Kjernekommando:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Aktivér kommandokøyring på drakt"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Draktkommando:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Følgjande variablar vert erstatta:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Ugangbar eD2k lenkje! FEIL: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Uaotorisert freisting på tilgang. Kopling lukka."
+#: src/ExternalConn.cpp:260
+#, fuzzy
+msgid "Client sent packet after authentication failed."
+msgstr "Godkjenning mislukka."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Ekstern kopling lukka."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
-msgstr "Eksterne koplingar deaktiverte på grunn av tomt passord!"
+msgstr "Eksterne koplingar deaktiverte pÃ¥ grunn av tomt passord!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Eksterne koplingar deaktiverte i konfigurasjonsfila"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Ny ekstern kopling akseptert"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
-msgstr "FEIL: greidde ikkje å ta imot ei ny ekstern kopling"
+msgstr "FEIL: greidde ikkje Ã¥ ta imot ei ny ekstern kopling"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
-msgstr "Ekstern kopling nekta på grunn av tomt passord i innstillingar!"
+msgstr "Ekstern kopling nekta pÃ¥ grunn av tomt passord i innstillingar!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Koplar til klient: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
-msgstr "Ukjend utgåve"
+msgstr "Ukjend utgÃ¥ve"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
 msgstr ""
-"Ikkje rett EC utgåve ID: det kan vere binær inkompatibilitet. Bruk core og "
-"remote frå same snapshot."
+"Ikkje rett EC utgÃ¥ve ID: det kan vere binÃ¦r inkompatibilitet. Bruk core og "
+"remote frÃ¥ same snapshot."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"Du kan ikkje kople til ei utgivingsutgåve frå ei vilkårleg SVN utgåve! "
-"*sukk* mogleg krasj unngått"
-
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Godkjenning mislukka."
+"Du kan ikkje kople til ei utgivingsutgÃ¥ve frÃ¥ ei vilkÃ¥rleg SVN utgÃ¥ve! "
+"*sukk* mogleg krasj unngÃ¥tt"
 
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
-msgstr "Ugyldig protokullutgåve."
+msgstr "Ugyldig protokullutgÃ¥ve."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
-msgstr "Manglande merkelapp for protokollutgåve."
+msgstr "Manglande merkelapp for protokollutgÃ¥ve."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
-msgstr "Ugyldig etterspurnad, du treng godkjenning først."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "Godkjenning mislukka."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "Godkjenning mislukka."
+
+#: src/ExternalConn.cpp:516
+#, fuzzy
+msgid "Invalid request, please authenticate first."
+msgstr "Ugyldig etterspurnad, du treng godkjenning fÃ¸rst."
+
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Tilgang innvilga."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, fuzzy, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "FiltrÃ©r meldingar frÃ¥ ukjende klientar"
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Uaotorisert freisting pÃ¥ tilgang. Kopling lukka."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Kommando for fjern delfil mislukka: Filhash ikkje funnen: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Filhash ikkje funnen: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "OPS! Handsamingsfeil i OpCode!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Tenar ikkje lagd til"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "tenar ikkje funnen: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
-msgstr "treng å velje tenar for fjerning"
+msgstr "treng Ã¥ velje tenar for fjerning"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k er deaktivert i innstillingar"
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
-msgstr "Søk i framdrift. Hentar inn att resultata om ein augneblink!"
+msgstr "SÃ¸k i framdrift. Hentar inn att resultata om ein augneblink!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
-msgstr "Nettsøk frå fjern adresse gir ikkje meining."
-
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad er deaktivert i innstillingar."
+msgstr "NettsÃ¸k frÃ¥ fjern adresse gir ikkje meining."
 
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Ingen punkt for graf."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
-msgstr "Klienten din er ikkje konfigurert for dette detaljnivået."
+msgstr "Klienten din er ikkje konfigurert for dette detaljnivÃ¥et."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Ekstern kopling: avslutting etterspurt"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Avsluttar allereie."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Eksternkopling: legg til lenkje '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
-msgstr "Ikkje gangbar lenkje eller lenka allereie på lista."
+msgstr "Ikkje gangbar lenkje eller lenka allereie pÃ¥ lista."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Fil ikkje funne."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Ikkje gangbart filnamn."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
-msgstr "Ikkje i stand til å døype om fila."
+msgstr "Ikkje i stand til Ã¥ dÃ¸ype om fila."
+
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad er deaktivert i innstillingar."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Allereie tilkopla eD2k."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Koplar til eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Allereie tilkopla Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Koplar til Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Alle nettverk er deaktiverte."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
-msgstr "Fråkopla eD2k."
+msgstr "FrÃ¥kopla eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
-msgstr "Fråkopla Kad."
+msgstr "FrÃ¥kopla Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Ekstern kopling: ugangbar opkode motteken: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
-msgstr "Ikkje gangbar opkode (feil protokollutgåve?)"
-
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr "Greidde ikkje å opne fila (%s), fjernar frå lista over delte filer."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Hashsett etterspurt for ukjend fil: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Kommandoen·`%s'·med·pid·`%d'·er ferdig med statuskode·`%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Tenar ikkje lagd til: Manglar IP eller vertsnamn."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Tenar ikkje lagd til: Ikkje gangbar tenarport."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "eD2k status:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Tilkopla"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Port"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kademlia status"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Køyrer"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Status:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Fråkopla"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Tilkoplingsstatus:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Brannmura"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Brannmura status: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Tilkopla kamerat"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Ingen kamerat"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Gjennomsnitt brukarar:"
+msgstr "Ikkje gangbar opkode (feil protokollutgÃ¥ve?)"
 
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Gjennomsnitt filer:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Køyrer ikkje"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Oppetid: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Overføring"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Opplastingar"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Opplasta data (økt (total)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Totalt dataoverskot (pakkar): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Dataoverskot på filetterspurnader (pakkar): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Dataoverskot på kjeldeutveksling (pakkar): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Dataoverskot på tenar (pakkar): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Dataoverskot Kad (pakkar): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Krypteringsdataoverskot (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Aktive opplastingar: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Ventande opplastingar: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Tal på samtlege vellukka opplastingar: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Tal på samtlege mislukka opplastingar: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Gjennomsnittleg opplastingstid: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Nedlastingar"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Nedlasta data (økt (total)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Funne kjelder: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Aktive nedlastingar (delar): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Økt OL:NL proporsjon (total): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Gjennomsnittleg nedlastingsfart (økt): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Gjennomsnittleg opplastingsfart (økt): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Raskaste nedlastingsfart (økt): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Raskaste opplastingsfart (økt): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Attkoplingar: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Tid sidan første overføring: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Tilkopla tenar sidan: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Aktive koplingar (berekna): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Maksimal koplingsgrense nådd: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Gjennomsnittleg tal på koplingar (berekna): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Topp koplingar (berekna): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Klientar"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrert"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Total:·%i·Kjend:·%i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Fungerande tenarar: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Mislukka tenarar: %i"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Ukjend forlengingÂ·'%s'Â·forÂ·'%s'Â·kommandoen.\n"
 
-#: src/Statistics.cpp:717
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Total: %s"
-msgstr "Total:·%s"
+msgid "Unknown command '%s'.\n"
+msgstr "Ukjend kommando '%s'.\n"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Sletta tenarar: %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Denne kommandoen kan ikkje ha eit argument.\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Filtrerte tenarar: %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Denne kommandoen mÃ¥ ha eit argument.\n"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Brukarar på fungerande tenarar: %llu"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Denne kommandoen er ikkje komplett; du mÃ¥ nytte ein av forlengjarane under.\n"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Filer på fungerande tenarar: %llu"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Tilgjengelege forlengjarar:\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Totalt brukertal: %llu"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Tilgjengelege kommandoar:\n"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Total Files: %llu"
-msgstr "Totalt filtal: %llu"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+" Alle kommandoar kan utfÃ¸rast med store og smÃ¥ bokstavar.\n"
+"Skriv '%s <kommando>'for meir opplysningar om <kommando>.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Tenerlast: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Avsluttar programmet."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Tal på delte filer: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Syne hjelp."
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Total storleik på delte filer: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"For Ã¥ fÃ¥ hjelp til ein kommando, skriv 'helpÂ·<kommando>'.\n"
+"For full kommandoliste, skriv 'help'.\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
-msgstr "Gjennomsnittleg filstorleik: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Operativsystem"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Ikkje motteke"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Klipp ut"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Lim inn"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Vél alle"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"BrukÂ·'%s'Â·forÂ·kommandoliste\n"
+"\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Du kan ikkje søkje på Kad dersom Kad ikkje køyrer"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Syntaksfeil!"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "eD2k søk kan ikkje gjennomførast dersom eD2k ikkje er tilkopla"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+"Handsamingsfeil av kommando - burde aldri skje! VÃ©r god Ã¥ rapportere feilen\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Uventa feil oppstod under søk på Kad: "
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Denne kommandoen skulle ikkje ha nokon parameter."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Melding filtrért frå '%s'·(IP:%s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Denne komamndoen mÃ¥ ha eit parameter."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Ny melding frå '%s'·(IP:%s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Ugangbart argument."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "Brukar %s·(%u) etterspurde liste over dei delte filene dine -> Godteke"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Denne kommandoen er ikkje komplett."
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "Brukar·%s (%u)·etterspurde·liste·over·dei·delte·filene·dine·-> Nekta"
+msgid "Type '%s' to get more help.\n"
+msgstr "Skriv '%s'Â·for Ã¥ fÃ¥ meir hjelp.\n"
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "Brukar %s·(%u) etterspurte lista di over delte katalogar -> Godteke"
+msgid "This is %s %s %s\n"
+msgstr "Dette er %sÂ·%sÂ·%s\n"
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "Brukar·%s (%u)·etterspurte·lista·di·over·delte·katalogar·->·Nekta"
+msgid "This is %s %s\n"
+msgstr "Dette er %sÂ·%s\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
+"\n"
+"Creating client...\n"
 msgstr ""
-"Brukar %s·(%u) etterspurte lista over delte filer for katalogen %s·-> godteke"
+"\n"
+"Opprettar klient...\n"
 
-#: src/ClientTCPSocket.cpp:976
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Brukar·%s (%u)·etterspurte·lista·over·delte·filer·for·katalogen·%s ->·nekta"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Brukar %s·(%u) deler katalogen %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Brukar %s·(%u) sende ikkje etterspurte delte kataloger."
-
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "Brukar %s·(%u) sende liste over delte filer for katalogen %s"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Brukar %s·(%u) er ferdig med å sende liste over delte filer"
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Brukar%s·(%u) sende ikkje etterspurt liste over delte filer"
-
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr "Brukar %s·(%u) nekta tilgang til delte kataloger/filer"
-
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Noder (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Ikkje gangbar IP for eigenoppstart"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Ikkje gangbar port for eigenoppstart"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Vér god å fylle ut alle naudsynte felt"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Er du viss på at du vil laste ned ei ny nodes.dat fil?\n"
+"\n"
+"Ok,Â·avsluttarÂ·%s...\n"
 
-#: src/KadDlg.cpp:197
+#: src/ExternalConnector.cpp:420
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"Å gjere dette vil fjerne dine novérande noder og starte Kademlia på nytt."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Halde fram?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "FEIL: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "ÅTVARING: "
+"Kan ikkje kople til med eit tomt passord.\n"
+"Du mÃ¥ skrive inn eit passord anten i konfigurasjonsfila,\n"
+"i kommandolinja eller nÃ¥r du vert spurt.\n"
+"\n"
+"Avsluttar...\n"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Legg til ein kamerat"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Syne denne hjelpeteksten."
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Du må skrive inn ein gangbar IP og port!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Vert der aMule kÃ¸yrer (standard: localhost)"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informasjon"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "aMule sin port for eksternkopling (standard: 4712)"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Den innskrivne brukarhashen er ikkje gyldig!"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Passord for eksternkopling."
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Kjelder"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Les innstillingar frÃ¥ fil."
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Fil"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Ikkje skriv ut data til stdout."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Nedlasting"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "VÃ©r utfÃ¸rleg - syne Ã³g avfeilingsmeldingar,"
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategori"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Set programsprÃ¥k."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Hovud"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Skriv kommandolinjealternativa til konfigurasjonsfila."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Nedlasting i kategori"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Lagar konfigurasjonsfil basert pÃ¥ aMule si konfigurasjonsfil."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Søk beslekta filer (eD2k, lokal tenar)"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Skriv programutgÃ¥ve."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Merk som kjend fil"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Fildetaljar"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Kople til aMule over nettet"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%%Â·ferdig"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Oppkopling mislukka "
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
+msgstr "%.2fÂ·kB/s"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "FEIL"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "Greidde ikkje Ã¥ opne venelista 'emfriends.net' for lesing!"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Oppkopling feila: Greidde ikkje å opprette kopling til %s:%d\n"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "Greidde ikkje Ã¥ opne venelista 'enfriends.met' for skriving!"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
-"ÅTVARING: Du kan ikkje leggje deg sjølv til som kjelde for ei eD2k lenkje "
-"medan du har ein lågid."
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Brukarar:·E:·%s·K:·%s·|·Filer·E:·%s·K:·%s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Alle"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Vener"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Brukarar totalt:·%s·|·Filer totalt:·%s"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Syn &detaljar"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Overført"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Legg til ein ven"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Fart"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Ta bort ven"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Framdrift"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Send &melding"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Status"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "SjÃ¥ filer"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Attståande tid"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Opprett venekopling"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Sist sett komplett"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Er du viss pÃ¥ at du vil slette den valde venen?"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Sist motteke"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Er du viss pÃ¥ at du vil slette dei valde venene?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Er du viss på at du vil slette den valde fila?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Det er ikkje tillate Ã¥ opprette meir enn ei venekopling.\n"
+" Berre ei venekopling vart oppretta."
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Er du viss på at du vil slette dei valte filene?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Fleirval"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Send melding til brukar"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
-msgstr "Melding å sende:"
-
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "%Stopp"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pause"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Hald fram"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "&Ta bort ferdige"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Byt alle A4AF til denne fila no"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Byt alle A4AF til denne fila (auto)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Byt alle A4AF til anna fil no"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Utvida innstillingar"
+msgstr "Melding Ã¥ sende:"
 
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Førehandssyning"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Syn fil&detaljar"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Syn alle kommentarar"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Kopiér magnet URI til utklippstavla"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "ortildele"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Vel kategori"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Opne fila"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
-msgstr "Fjerne frå kameratar"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Legg til kameratar"
+msgstr "Fjerne frÃ¥ kameratar"
 
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Send melding"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Byt til denne fila"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d·%H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
-msgstr "QR:·%u·(%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
+msgstr "QR:Â·%uÂ·(%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Spurt etter anna fil (A4AF)"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Nedlastingar (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Vel ein videospelar i innstillingar for å hindre at denne åtvaringa kjem opp "
-"ved kvar førehandssyning (mplayer er standard)"
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Førehandssyning"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "FEIL: Greidde ikkje å starte ekstern mediespelar! Kommando: '%s'"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Ventande opplastingar: %s"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "FEIL: Greidde ikkje å lage delfil"
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "I kÃ¸"
+
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Opplasting"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Freistar å laste tryggleikskopi av met-fila frå %s"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Ingen"
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "Feil: Greidde ikkje å opne mart.met fila: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Nei"
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "FEIL: part.met fila har ein storleik på 0: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Ja"
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "FEIL: Ugangbar part.met filutgåve: %s ==> %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Lastar ned..."
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
-"FEIL: %s (%s) er korrupt (feil merkelappstal), greidde ikkje å laste fila."
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Freistar å hente fram att filinformasjon..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "Attskaper fil utan namn - freistar å attskape ho som RecoverdFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "Attskapte all tilgjengeleg filinformasjon :D - Freistar å nytte den..."
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "ÃTVARING: Greidde ikkje Ã¥ opne hudfila '%s' for lesing"
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Ikkje i stand til å attskape filinformasjon :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Greidde ikkje å opne %s·(%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "ÅTVARING: %s kan vere korrupt (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "FEIL under lagring av delfila: %s·(%s·==>·%s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Greidde ikkje å hente lengda på '%s' - nyttar %s fila."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s'·er 0 i storleik på ein eller annan måte·-·nyttar·%s·fila."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Greidde ikkje å lagre part.met.seeds fila for %s"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Lagra %i kjeldefrø for delfila: %s (%s)"
-msgstr[1] "Lagra %i kjeldefrø for delfila: %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Delfila %s·(%s) manglar kjeldefil"
-
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Delfila ·%s·(%s) har ei ugangbar kjeldefil"
-
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Feil i lesing av delfila si kjeldefil (%s·-·%s):·%s"
-
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Fann korrupt del (%d) i %d delfil %s - Filresultathash |%s| Filhash | %s"
-msgstr[1] ""
-"Fann korrupt del (%d) i %d deler i fila %s - Filresultathash |%s| Filhash |%"
-"s|"
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Fann ferdig del (%i)·i·%s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Ferdig med omhashing av %s"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Uventa feil ved fullføring av %s. Sette fila på pause"
-
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Ferdig med å laste ned: %s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Slettar fila: %s"
-
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
-"ÅTVARING: Greier ikkje å hashe nedlasta del - hashsett ikkje komplett for '%"
-"s'"
 
-#: src/PartFile.cpp:2389
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
-"FEIL: Greier ikkje å hashe nedlasta del - hashsett ikkje komplett (%s). "
-"Dette burde aldri skje"
-
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "ÅTVARING: Ikkje nok ledig diskplass! Set fila %s på pause"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Nedlasta del %i er korrupt i fila: %s"
 
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Attskapte korrupt del %i·for·%s·->·Lagra bytes:·%s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Hentar plass"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Ikkje nok diskplass"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Stogga"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr ""
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
 msgstr "Lasta ned"
 
-#: src/PartFile.cpp:4167
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "Feil: Greidde ikkje opne delfila '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr ""
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "ÅTVARING: known.met let seg ikkje opne."
+#: src/HTTPDownload.cpp:336
+msgid ""
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
+msgstr ""
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr "ÅTVARING: Kjendfillista er korrupt; inneheld ugangbar overskrift."
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Kople til tenar att"
 
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "IO feil underlesing av known.met fila: %s"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr ""
 
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Feil under lagring av known.met fila: %s"
+msgid "Download new GeoIP.dat from %s"
+msgstr ""
 
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Fann %i kjend delt fil"
-msgstr[1] "Fann %i kjende delte filer"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr ""
 
-#: src/SharedFileList.cpp:358
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Fann %i kjend delt fil, %i ukjend"
-msgstr[1] "Fann %i kjende delte filer, %i ukjende"
+msgid "Failed to remove %s file, aborting update."
+msgstr ""
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "FEIL: Freista å dele %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Filkommentarar"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Verdi"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Kommentar"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Ingen kommentarar"
+msgid "Failed to rename %s file, aborting update."
+msgstr ""
 
-#: src/CommentDialogLst.cpp:104
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u kommentar"
-msgstr[1] "%u kommentarar"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+msgid "Successfully updated %s"
 msgstr ""
-"Greidde ikkje å kople til alle tåkelagde tenarar i lista. Freistar ein gong "
-"til utan tåkelegging."
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
-"Greidde ikkje å kople til alle tenarane i lista. Freistar ein gong til."
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "eD2k nettverket deaktivert i innstillingar, koplar ikkje til"
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Greidde ikkje Ã¥ laste ned tenarlista frÃ¥ %s"
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Ingen gangbare tenarar funne i tenarlista"
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Greidde ikkje Ã¥ laste ned tenarlista frÃ¥ %s"
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Tilkopla %s·(%s:%i)"
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Lastar ipfiltra 'ipfilter.dat'Â·ogÂ·'ipfilter_static.dat'."
 
-#: src/ServerConnect.cpp:263
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Kopling oppretta på: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr "Alvorleg feil i oppkopling. Internett kan vere nede"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Mista kopling til %s·(%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s·(%s:%i) ser ut til å vere daud."
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "Greidde ikkje Ã¥ laste inn ipfilter.dat fila '%s' - ukjend filformat."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s·(%s:%i) ser ut til å vere full."
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr ""
+"Greidde ikkje Ã¥ laste inn ipfilter.dat fila '%s' - greidde ikkje Ã¥ opne fila."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Automatisk tenaroppkopling freistar på nytt om %d sekund"
-msgstr[1] "Automatisk tenaroppkopling freistar på nytt om %d sekund"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Kopling mista"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Lasta %u IP-rekkje frÃ¥ '%s'."
+msgstr[1] "Lasta %u IP-rekkjer frÃ¥ '%s'."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Tilkopling til %s·(%s:%i)·mislukka."
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "FEIL: Ugangbar sokkel ved uttellingssjekk"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u vanskapt linje vart forkasta."
+msgstr[1] "%u vanskapte linjer vart forkasta."
 
-#: src/ServerConnect.cpp:460
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Tilkoplingsfreisting til %s·(%s:%i)·gjekk over tida."
-
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
-"FEIL: Greidde ikkje å laste tryggleikskopifila. Søk http://forum.amule.org "
-"for løysingar på attskaping av part.met filer."
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Ingen delfiler funne"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Fann %u delfil"
-msgstr[1] "Fann %u delfiler"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr "Filsystemet for mellombelse filer greier ikkje å handsame store filer."
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
-"Filsystemet i mappa for innkomande filer greier ikkje å handsame store filer."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Lastar ned %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Du freistar allereie nedlasting av fila '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Du har allereie fila: '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Du freistar allereie nedlasting av fila %s"
-
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Kan ikkje konvertere magnetlenkje til eD2k: %s"
-
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Ukjend lenkjeprotokoll for: %s"
-
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Ugangbar eD2k lenkje! FEIL: %s"
-
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Køyr <str> og avslutt."
-
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Ugangbart IP-format. Bruk xxx.xxx.xxx.xxx:xxxx\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:86
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Denne kommandoen krever eit argument. Gangbare argument: 'alle', filnamn, "
-"eller eit tal.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Handsamar etter hash"
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Handsamar etter filnamn"
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Denne kommandoen krever eit argument: Gangbare argument: ein filhash.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Ikkje gangbart tal\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Ikkje gangbar hash (lengde må vere nøyaktig 32 teikn)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Operasjonen var vellukka"
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Etterspurnaden mislukka med følgjande feil: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "IP-filtréring for klientar er %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "AV"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "PÅ"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "IP-filtréring for tenarar er %s.\n"
+"Eigenoppstart frÃ¥ \n"
+"kjende klientar"
 
-#: src/TextClient.cpp:664
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Novérande IPFilternivå er %d.\n"
+msgid "Nodes (%u)"
+msgstr "Noder (%u)"
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Bandbreiddegrenser: Opp: %u kB/s, Ned: %u kB/s.\n"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Ikkje gangbar IP for eigenoppstart"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Ikkje gangbar port for eigenoppstart"
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "Tilkopla %s·%s·%s"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "VÃ©r god Ã¥ fylle ut alle naudsynte felt"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "med LågID"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Er du viss pÃ¥ at du vil laste ned ei ny nodes.dat fil?\n"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "med HøgID"
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr ""
+"Ã gjere dette vil fjerne dine novÃ©rande noder og starte Kademlia pÃ¥ nytt."
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Koplar til no"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Halde fram?"
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Ikkje tilkopla"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: for kort sÃ¸kjeord"
 
-#: src/TextClient.cpp:723
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+msgid "Keyword for search: %s"
 msgstr ""
-"\n"
-"Nedlasting:\t%s"
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
-"\n"
-"Opplasting:\t%s"
 
-#: src/TextClient.cpp:729
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Klientar i kø:\t%d\n"
 
-#: src/TextClient.cpp:732
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Las %u kadkontakt"
+msgstr[1] "Las %u kadkontaktar"
+
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Alle kjelder:\t%d\n"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Tal på søkjeresultat: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - syne framdrifta på eit søk"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Tok imot ukjend svar frå tenaren, OpCode·=·%#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Syne kort statusinformasjon."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Syne koplingsstatus, noverande opp- og nedlastingsfart, osb.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Syne fullt statistikktre."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Skreiv %d kadkontakt"
+msgstr[1] "Skreiv %d kadkontaktar"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Alternativt kan eit tal mellom 0-255 skrivast inn som argument for denne\n"
-"kommandoen, som fortel kor mange inskripsjonar frå undertréa til "
-"klientutgåva skal  verte\n"
-"synte. Å skrive 0 eller å hoppe over betyr 'ubegrensa'.\n"
-"\n"
-"Til dømes: 'statistics 5' vil berre syne dei 5 utgåvene på top for kvar "
-"klienttype.\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Filnamn"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Avslutt aMule"
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Filstorleik"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Avslutt den fjerne kjernen (amule/amuled).\n"
-"Dette vil óg avslutte tekstklienten, ettersom den er ubrukeleg utan ei "
-"kjerne som køyrer-\n"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Delingsrate"
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Lastar inn att valt objekt."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Lasta opp"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Lastar inn att lista over delte filer."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Etterspurt"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Lastar om att ipfiltertabell frå fil."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Godkjend"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Kople til nettverket."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Komplette kjelder"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Dette vil kople til alle nettverka som er aktiverte i innstillingar.\n"
-"Dy kan óg valfritt gje ei tenaradresse i IP:Port form, for å berre kople "
-"til\n"
-"den tenaren. IP`en må vere ei punktmerka og desimal IPv4-adresse.\n"
-"eller eit løyseleg DNS-namn."
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Kople til berre eD2k."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Berre kople til Kad."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Kople frå nettverket."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Dette vil kople frå alle nettverka som no er kopla til.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Kople frå berre eD2k."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Berre kople frå Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Legg til ei eD2k eller magnetlenkje  til kjernen"
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"eD2k lenkja som skal leggjast til kan vere:\n"
-"*) ei fillenkje (ed2k://|fil|...), som vil verte lagd til nedlastingskøa,\n"
-"*) ei tenarlenkje (ed2k://|tenar|...), som vil verte lagd til tenarlista,\n"
-"*) eller ei tenarlistelenkje, der alle tenarane i lista vert lagde til\n"
-"   tenarlista-\n"
-"\n"
-"Magnetlenkja må innehalde eD2k hashen og fillengda.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Set ein brukarvalverdi."
 
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Set brukarval for ipfilter."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Slå IP-filtréring på for både klientar og tenarar."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Slå IP-filtréring av for både klientar og tenarar."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Aktivér/deaktivér IP-filtrering av klientar."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Slå IP-filtréring på for klientar."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Slå IP-filtréring av for klientar."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Aktivér/deaktivér IP-filtrering av tenarar."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Slå IP-filtréring på for tenarar."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Slå IP-filtréring av for tenarar."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Vel Ipfilternivå"
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Gangbart filtréringsnivå er mellom 0-255, og den opprinnelege\n"
-"verdien er 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Set bandbreiddegrense."
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "Verdien i desse kommandoane må vere i kilobytes/sek.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Set bandbreiddegrense for opplastingar."
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Set bandbreiddegrense for nedlastingar."
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Ukjend utgÃ¥ve"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Hent og syne ein preferanseverdi."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "ÃTVARING: Greidde ikkje Ã¥ opne hudfila '%s' for lesing"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Hent ipfilterinnstillingar"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Hashar"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Hent ipfilterstatus for både klientar og tenarar."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Ferdigstiller"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Hent ipfilterstatus for klientar."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Ferdig"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Hent ipfilterstatus for tenarar."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Pausa"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Få "
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Feilaktig"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Hent bandbreiddegrense."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Ventar"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Lagar eit søk."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Du mÃ¥ skrive inn eit passord som ikkje er tomt."
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"Ei søkjetype må verte spesifisert:\n"
-"····GLOBAL\n"
-"····LOKAL\n"
-"····KAD\n"
-"Døme:·'søk kad fil'·vil starte eit kadsøk for \"fil\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Feil passord! Ikkje MD5 hash!"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Startar eit globalt søk"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Oppkoplingsfeil"
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Startar eit lokalt søk"
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Startar eit kadsøk"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "EC kopling feila. Tomt svar."
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Syne resultata av siste søk."
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "Ekstern kopling: DÃ¥rleg svar frÃ¥ tenar. Kopling stengd."
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Returnerer resultata frå det tidlegare søket.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Vellukka! Kopling til aMule er oppretta "
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Syner framdrifta i eit søk."
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Vellukka! Kopling oppretta."
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Syner framdrifta i eit søk-\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Ekstern kopling: Tilgang nekta fordi:"
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Start nedlasting av ei fil"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "Ekstern kopling: Tilgang nekta"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
-"Talet på ei fil frå siste søk må verte gjeve.\n"
-"Døme: 'download·12' vil starte nedlastinga av fil nummer 12 frå forrige "
-"søk.\n"
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Set nedlasting på pause"
-
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Hald fram nedlasting"
-
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Avbryt nedlasting"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "FEIL: Greidde ikkje lytte til TCP port."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Set nedlastingsprioritet."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "FEIL: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Gje prioritet Låg, Normal, Høg eller Auto til ei nedlasting.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "ÃTVARING: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Set prioritet til låg."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Stengje"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Set prioritet til normal."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Klipp ut"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Set prioritet til høg."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "KopiÃ©r"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Set prioritet til auto."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Lim inn"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Syne køer/lister."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Frigjer plass"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Syner opplastings-/nedlastingskøa, tenarlista eller lista over delte filer.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "VÃ©l alle"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Syne opplastingskø"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Syne nedlastingskø."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Ubegrensa"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Syne logg."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule traumeny"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Syne tenarlister."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Fartsgrenser:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Nullstill logg"
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "OL: Inga"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Forelda kommando; bruk '%s' i staden."
+msgid "UL: %u"
+msgstr "OL: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Dette er ein forelda kommando som ikkje lenger er tilrådd, og kan verte "
-"fjerna i framtida.\n"
-"Bruk '%s' i staden\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "NL: Ingen"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "FEIL: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "NL: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "ÅTVARING: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Nedlastingsfart: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Ny klientid er %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "ÅTVARING: Du har motteke ein Låg-ID!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tTruleg har dette skjedd fordi du er bak ein brannmur eller ruter."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tFor meir informasjon, sjå http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Opplastingsfart: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Ukjend tenarinfo motteke! - for kort"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Klientinformasjon"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Tok mot %d ny tenar"
-msgstr[1] "Tok mot %d nye tenarar"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Lagring av tenarlista ferdig."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Tenar avviste siste kommando"
+msgid "Nickname: %s"
+msgstr "Kallenamn: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Falske pakkar mottekne frå tenar: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Ikkje valt kallenamn!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Urøyvd feil under handsaming av pakke frå tenar: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "KlientID: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Kan ikkje skape DNS-løysande tråd for å kople til %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Ikkje tilkopla"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "Tenar IP %s·(%s) er filtrert.  Koplar ikkje til."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Tenarnamn: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "brukar protokolltåkelegging."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "TenarIP: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Koplar til·%s·(%s·-·%s:%i)·%s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Ikkje tilkopla"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Greidde ikkje å løyse dns for tenar %s: Greier ikkje å kople til!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country():·Greidde ikkje å laste landsdata frå "
+msgid "IP: %s"
+msgstr "IP:Â·%s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Lasta %d flagg bitmap"
-msgstr[1] "Lasta %d flagg bitmaps."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Er du viss på at du vil avbryte og slette alle filene i denne kategorien?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Stadfesting naudsynt"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Alle andre"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Uferdig"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Aktiv"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Video"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Lyd"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Arkiv"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD-bilete"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Bilete"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Tekst"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Vel synsfilter"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Legg til kategori"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Redigér kategori"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Ta bort kategori"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Filnamn"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Filstorleik"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Delingsrate"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Lasta opp"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Etterspurt"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Godkjend"
+msgid "TCP port: %d"
+msgstr "TCP port: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Komplette kjelder"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP port: Ikkje klar"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Importerer %s:·%s"
+msgid "UDP port: %d"
+msgstr "UDP port: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Les mellombels mappe"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UDP port: Ikkje klar"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Hentar grunnleggjande informasjon frå nedlastingsinformasjonfil"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Nettsignatur: Aktivert"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Lagar målfil"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Nettsignatur: Deaktivert"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Lastar data frå gamal nedlastingsfil (%u·av·%u)"
+msgid "Uptime: %s"
+msgstr "Oppetid: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Lagrer datablokk til ei einaste nedlastingsfil (%u·of·%u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Hentar informasjon frå nedlastingsfilkjelde"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Legg til nedlasting og lagrar ny delfil"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importér delfiler"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Tilstand"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Filhash"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Ventar..."
+msgid "Shared files: %d"
+msgstr "Delte filer: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s·(Disk:·%s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Vér god å velje ei katalog til å søkje på mellombelse nedlastingar! "
-"(underkatalogar vil verte inkluderte)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "Vil du slette kjeldefilene til vellukka importerte nedlastingar?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Ta bort kjelder?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/sek"
-msgstr[1] "bytes/sek"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "sekund"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "minutt"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "timar"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Dagar"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Videoar"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Arkiv"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Tekstar"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Program"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Alle"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Ikkje gitt verdi"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Ugyldig / Korrupt /Falsk"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Dårleg"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Middels"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "God"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Utmerka"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "alle"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "alle andre"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Lastar ipfiltra 'ipfilter.dat'·og·'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Klientar i kÃ¸: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Greidde ikkje å laste inn ipfilter.dat fila '%s' - ukjend filformat."
+msgid "Total DL: %s"
+msgstr "Totalt NL: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Greidde ikkje å laste inn ipfilter.dat fila '%s' - greidde ikkje å opne fila."
+msgid "Total UL: %s"
+msgstr "Totalt OL: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Lasta %u IP-rekkje frå '%s'."
-msgstr[1] "Lasta %u IP-rekkjer frå '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Opplastingsgrense"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u vanskapt linje vart forkasta."
-msgstr[1] "%u vanskapte linjer vart forkasta."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Nedlastingsgrense"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktive koplingar (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "GÃ¸yme aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Fildetaljar"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Syne aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%%·ferdig"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Avslutt"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "eD2k lenkje: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Iverksetje"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
-msgstr "Klikk her for å leggje til eD2k lenkja "
+msgstr "Klikk her for Ã¥ leggje til eD2k lenkja "
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr ""
-"Hendingar visast her. Sjå i loggen under Tenarar for å sjå alle hendingane."
+"Hendingar visast her. SjÃ¥ i loggen under Tenarar for Ã¥ sjÃ¥ alle hendingane."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Lastar ..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
-msgstr "Tal på brukarar på tenaren du er tilkopla ..."
+msgstr "Tal pÃ¥ brukarar pÃ¥ tenaren du er tilkopla ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Brukarar: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4558,1116 +2697,1054 @@
 "antalet brukarar."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Opp:Â·0.0Â·|Â·Ned:Â·0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
 msgstr ""
-"Novérande gjennonmsnittleg opplastings- og nedlastingsrater. Dersom aktivért "
-"vil tala i parantés syne dataoverskotet frå klientkommunikasjon."
+"NovÃ©rande gjennonmsnittleg opplastings- og nedlastingsrater. Dersom aktivÃ©rt "
+"vil tala i parantÃ©s syne dataoverskotet frÃ¥ klientkommunikasjon."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
 "low ID (firewalled) and green arrows signify that you have high ID (The "
 "optimal connection type)."
 msgstr ""
-"Syner novérande sratus og aktive overføringar. Raude piler syner at du ikkje "
-"er tilkopla akkurat no, gule piler syner at du har ein låg ID (brannmura) og "
-"grøne piler syner at du har ein høg ID (Denbeste tilkoplingstypen)."
+"Syner novÃ©rande sratus og aktive overfÃ¸ringar. Raude piler syner at du ikkje "
+"er tilkopla akkurat no, gule piler syner at du har ein lÃ¥g ID (brannmura) og "
+"grÃ¸ne piler syner at du har ein hÃ¸g ID (Denbeste tilkoplingstypen)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Ikkje tilkopla ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
-msgstr "Novérande tilkopla tenar."
+msgstr "NovÃ©rande tilkopla tenar."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
-msgstr "Søk"
+msgstr "SÃ¸k"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Sort"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Lokal"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Filhash"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Utvida parameter"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtrerer"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Filtype"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Alle"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Arkiv"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Lyd"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD-bilete"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Bilete"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Program"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Tekstar"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Videoar"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Filetternamn"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Min storleik"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Maks storleik"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Tilgjenge"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filter:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
-msgstr "Filtrér resultat"
+msgstr "FiltrÃ©r resultat"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Snu resultat"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
-msgstr "Gøyme kjende filer"
+msgstr "GÃ¸yme kjende filer"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Start"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Meir"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
-msgstr "Søkjer etter fleire resultat på eD2k. Ikkje støtta for Kad enno."
+msgstr "SÃ¸kjer etter fleire resultat pÃ¥ eD2k. Ikkje stÃ¸tta for Kad enno."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Nedlasting"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Nullstill felta"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Resultat"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Ryddar bort ferdige nedlastingar"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Syner opplasting / oppkøa"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Klientar i kø :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Send"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Sender meldinga."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Stengje"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Komplette kjelder"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Stengje denne lynmeldingsøkta."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Generelt"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Fullt namn :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "I/T"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "metfil :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Hash :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Filstorleik :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Delfilstatus :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Sist sett komplett :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "OverfÃ¸ring"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Funne kjelder :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
-msgstr "Overfører kjelder :"
+msgstr "OverfÃ¸rer kjelder :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Fildelstal :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Tilgjengeleg:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
-msgstr "Datasnøggleik :"
+msgstr "DatasnÃ¸ggleik :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Aktiv nedlastingstid: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
-msgstr "Overført :"
+msgstr "OverfÃ¸rt :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Ferdig storleik :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligent Korrupsjonshandsaming"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Tapt gjennom korrupsjon :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Vunne gjennom komprimering :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Pakkar lagra av I.C.H. :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Filnamn"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Overtaking"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Opprensking"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
-msgstr "Utfør"
+msgstr "UtfÃ¸r"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
-msgstr "Kommentér/verdigjé fila (Teksten vert synleg for alle brukarar)"
+msgstr "KommentÃ©r/verdigjÃ© fila (Teksten vert synleg for alle brukarar)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"For ein film kan du skrive lengda, historia, språket ...\n"
-"og dersom den er falsk kan du fortelje det til andre brukarar."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Filkvalitet"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Ikkje gitt verdi"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Ugyldig / Korrupt /Falsk"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "DÃ¥rleg"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Middels"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "God"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Utmerka"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
-"Vél filverdi eller gje melding til andre brukarar dersom fila er falsk ..."
+"VÃ©l filverdi eller gje melding til andre brukarar dersom fila er falsk ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Oppfrisk"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
-msgstr "Lastar ned, vér god å vente ..."
+msgstr "Lastar ned, vÃ©r god Ã¥ vente ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Ukjend storleik"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Naudsynt informasjon"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP-adresse :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Port :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Brukarnamn :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Brukarhash :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Lastar inn att delte filer"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Novérande økt"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Totalt"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Etterspurt :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Aktive opplastingar :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Legg til"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Nedlastingsfart"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
-msgstr "Novérande"
+msgstr "NovÃ©rande"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
-msgstr "Køyregjennomsnitt"
+msgstr "KÃ¸yregjennomsnitt"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
-msgstr "Gjennomsnitt økt"
+msgstr "Gjennomsnitt Ã¸kt"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Opplastingsfart"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Koplingar"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Aktive nedlastingar"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Aktive koplingar (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Aktive opplastingar"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Statistikktre"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Brukarnamn:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Brukarhash:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Klientmjukvare:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
-msgstr "Klienten si utgåve:"
+msgstr "Klienten si utgÃ¥ve:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP-adresse:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "BrukarID:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "Tenar IP:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Tenarnamn:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
-msgstr "Tåkelegging:"
+msgstr "TÃ¥kelegging:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
-msgstr "Overføringar til klient"
+msgstr "OverfÃ¸ringar til klient"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
-msgstr "Novérande etterspurnader:"
+msgstr "NovÃ©rande etterspurnader:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Gjennomsnittleg opplastingsfart:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Gjennomsnittleg nedlastingsfart:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
-msgstr "Opplasta (økt):"
+msgstr "Opplasta (Ã¸kt):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
-msgstr "Lasta ned (økt)"
+msgstr "Lasta ned (Ã¸kt)"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Opplasta (totalt):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Lasta ned (totalt)"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Scorar"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "NL/OL endringsfaktor:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Sikker identifikasjon:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Verdigjeving (total):"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "I kÃ¸"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
-msgstr "Køscore"
+msgstr "KÃ¸score"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Kallenamn"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org·-·Linux-muldyret"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
-msgstr "Dette er namnet andre brukarar vil sjå når dei koplar til  maskina di."
+msgstr "Dette er namnet andre brukarar vil sjÃ¥ nÃ¥r dei koplar til  maskina di."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Språk"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
-msgstr "Dette vel språket som vert nytta på kontrollane."
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Forseinkinga fÃ¸r ein syner verktytips."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Ymse brukarval"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
+msgstr "Dette vel sprÃ¥ket som vert nytta pÃ¥ kontrollane."
 
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
-msgstr "Sjå etter ny utgåve ved oppstart"
+msgstr "SjÃ¥ etter ny utgÃ¥ve ved oppstart"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
-"Aktivering av denne vil få aMule til å sjå etter ei ny utgåve ved oppstart."
+"Aktivering av denne vil fÃ¥ aMule til Ã¥ sjÃ¥ etter ei ny utgÃ¥ve ved oppstart."
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Start minimert"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Aktivering av denne minimerer aMule ved oppstart."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Stadfest avslutting"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Får aMule til å be om stadfesting før avslutting."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
-msgstr "Aktivér trauikon"
+msgstr "AktivÃ©r trauikon"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
-"Dette aktiverer/deaktiverer ikonet i systemtrauet (eller oppgåvelinja)."
+"Dette aktiverer/deaktiverer ikonet i systemtrauet (eller oppgÃ¥velinja)."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
-msgstr "Minimér til trauikon"
+msgstr "MinimÃ©r til trauikon"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr ""
-"Akrivering av denne vil få aMule til å minimere seg til systemtrauet og "
-"ikkje til oppgåvelinja."
+"Akrivering av denne vil fÃ¥ aMule til Ã¥ minimere seg til systemtrauet og "
+"ikkje til oppgÃ¥velinja."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Tidsforseinking på verktytips i sekund"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Forseinkinga før ein syner verktytips."
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Nettlesarval"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Standardval"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Vel nettlesar her"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Eigenvalt nettlesar"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Skriv nettlesarnamnet her. For å nytte ein eigen nettlesar, vel ein i "
-"nedtrekksmenyen over."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Bla"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Opne nytt faneblad dersom mogleg"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
-msgstr "Opne ny nettside i nytt faneblad i staden for nytt vindauge når mogleg"
+msgstr "Opne ny nettside i nytt faneblad i staden for nytt vindauge nÃ¥r mogleg"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Videospelar"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Opprett tryggleikskopi for førehandssyning"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr "Bandbreiddegrenser"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Opplasting"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Opningsdistribusjon"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Standard klient TCP-port:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr ""
+
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Dette er standardporten for eD2k og kan ikkje deaktiverast"
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Utvida UDP port for klient:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
-"Denne UDP porten vert brukt til utvida eD2k etterspurnader og til "
-"kadnettverket"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "deaktivere"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Bind adresse"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "UDP-port for utvida tenarførespurnader (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Maks kjelder per fil"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Hard grense"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Koplingsgrense"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Maks koplingar"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2k"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universell·Plug·and·Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Aktivér UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP·TCP-port:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2k"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Automatisk tilkopling ved oppstart"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
-msgstr "Kople til dersom fråkopla"
-
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Syne dataoverskotsbandbreidde"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Tenarval"
+msgstr "Kople til dersom frÃ¥kopla"
 
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Ta bort daude tenarar etter"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "freistnader"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Automatisk oppdatering av tenarlista ved oppstart"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Liste"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Oppdater tenarlista ved oppkopling til ein tenar"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
-msgstr "Oppdater tenarlista når ein klient koplar til"
+msgstr "Oppdater tenarlista nÃ¥r ein klient koplar til"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Bruk prioritetssystem"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
-msgstr "Bruk smart LågID sjekk ved tilkopling"
+msgstr "Bruk smart LÃ¥gID sjekk ved tilkopling"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Trygg tilkopling"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Automatisk tilkopling berre til tenarar i statisk liste"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
-msgstr "Gje høg prioritet til manuelt tillagde tenarar"
+msgstr "Gje hÃ¸g prioritet til manuelt tillagde tenarar"
+
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. aktiv"
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH stolar på alle hashar (ikkje tilrådd)"
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Legg filer til nedlasting i pausemodus"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Legg filer til nedlasting med autoprioritet"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
-msgstr "Prøv å laste ned første og siste del først"
-
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Legg til nye delte filer med autoprioritet"
+msgstr "PrÃ¸v Ã¥ laste ned fÃ¸rste og siste del fÃ¸rst"
 
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Forsøk å overføre heile delar til alle opplastingar"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Start neste fil på pause når ei fil vert ferdig."
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
-msgstr "Frå same kategori"
+msgstr "FrÃ¥ same kategori"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Lagre 10 kjelder til sjeldne filer (< 20 kjelder)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Diskplass"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Hent diskplass for nye filer"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Sjekk diskplass"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr "Hentar diskplass for heile nye filer, og reduserer fragmentering"
 
-#: src/muuli_wdr.cpp:2058
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr ""
+
+#: src/muuli_wdr.cpp:1819
 msgid "Select this if you want aMule to check your disk space"
 msgstr "Vel denne dersom du vil at aMule skal sjekke om du har nok diskplass"
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Minimum diskplass:"
-
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
-msgstr "Skriv inn mimimum ønska diskplass."
+msgstr "Skriv inn mimimum Ã¸nska diskplass."
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "Hent diskplass for nye filer"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Lagre 10 kjelder til sjeldne filer (< 20 kjelder)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr "Hentar diskplass for heile nye filer, og reduserer fragmentering"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Opplastingar"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Legg til nye delte filer med autoprioritet"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Innkomande"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Mellombels"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Delt"
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
-msgstr "(Høgreklikk på mappeikonet for å dele underkatalogar)"
+msgstr "(HÃ¸greklikk pÃ¥ mappeikonet for Ã¥ dele underkatalogar)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
-msgstr "Dele gøymde filer"
+msgstr "Dele gÃ¸ymde filer"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Grafar"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Oppdateringsforseinking: 5 sek"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Tid for gjennomsnittleg graf: 100 min"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Koplingsgrafskala: 100 "
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Vel statistikkfargar"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Bakgrunn"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Rutenett"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
-msgstr "Last ned novérande"
+msgstr "Last ned novÃ©rande"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
-msgstr "Last ned køyregjennomsnitt"
+msgstr "Last ned kÃ¸yregjennomsnitt"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
-msgstr "Last ned øktgjennomsnitt"
+msgstr "Last ned Ã¸ktgjennomsnitt"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Opplasting no"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
-msgstr "Gjennomsnittleg køyrande opplasting"
+msgstr "Gjennomsnittleg kÃ¸yrande opplasting"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
-msgstr "Gjennomsnittleg økt opplasting"
+msgstr "Gjennomsnittleg Ã¸kt opplasting"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Aktive koplingar"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Fartslinje i ikontrauet"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Kadnodar no"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
-msgstr "Køyrande kadnodar"
+msgstr "KÃ¸yrande kadnodar"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
-msgstr "Kadnodar (økt)"
+msgstr "Kadnodar (Ã¸kt)"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Velje"
 
-#: src/muuli_wdr.cpp:2214
-msgid "Number of Client Versions shown (0=unlimited)"
-msgstr "Tal på klienutgåver synt (0=uinnskrenka)"
-
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Linjekapasitet"
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Merk: Desse verdiane vert berre nytta til statistikk."
+#: src/muuli_wdr.cpp:2000
+msgid "Number of Client Versions shown (0=unlimited)"
+msgstr "Tal pÃ¥ klienutgÃ¥ver synt (0=uinnskrenka)"
 
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
-msgstr "!!! ÅTVARING !!!"
+msgstr "!!! ÃTVARING !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Ikkje endre desse innstillingane med mindre du veit\n"
-"kva du gjer, ellers kan du fort\n"
-"gjere ting verre for deg sjølv.\n"
-"\n"
-"aMule køyrer fint utan justering av nokon av\n"
-"desse innstillingane."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Avanserte innstillingar"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Maks nye koplingar / 5 sek"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
-msgstr "Filbufferstorleik: 240000·bytes"
+msgstr "Filbufferstorleik: 240000Â·bytes"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
-msgstr "Storleik på opplastingskø: 5000 klientar"
+msgstr "Storleik pÃ¥ opplastingskÃ¸: 5000 klientar"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Oppfriskingsintervall for tenarkopling: Deaktiver"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Filframgang i nedlastingskø"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Syne prosent"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Syne framdriftsbar"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Stil på framdriftsbar"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Flat"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Rund"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Hudstøtte"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Aktiver hudstøtte"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Hud:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- ingen huder tilgjengeleg -"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Kolonnesortering"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
+msgstr "Syne utvida informasjon i kategorifaneblad"
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Automatisk sortering av filene i nedlastigskøa (høg CPU)"
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Syne overfÃ¸ringsfart i tittellinja"
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule sorterer kolonnene i nedlastingslista di automatisk"
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Syne overfÃ¸ringsfart i tittellinja"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Ymse draktinnstillingar"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Syne eD2k snøgglenkjehandsamar"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
-msgstr "Syne utvida informasjon i kategorifaneblad"
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "Syne overføringsfart i tittellinja"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2412
+#: src/muuli_wdr.cpp:2124
 msgid "Vertical toolbar orientation"
 msgstr "Vertikal verktylinjeorientering"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Syne delfilnummer før filnamn"
-
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Vevtenarparameter"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Køyre amuleweb ved oppstart"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Vevtenarport"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Aktiver UPnP portvidaresending på vevtenarporten"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Vevtenar UPnP TCP port"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Sideoppfriskingstid (i sekund)"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Aktivér Gzipkompresjon"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Aktivér brukar med få rettar"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Flat"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Passord for fulle rettar"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Rund"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Passord for låge rettar"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Vevmønster"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "aMule sorterer kolonnene i nedlastingslista di automatisk"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Parameter for ekstern kopling"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
-msgstr "Akseptér eksterne koplingar"
+msgstr "AkseptÃ©r eksterne koplingar"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
-"IP for lyttande grensesnitt\n"
-"(tom for einkvar)"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5675,290 +3752,346 @@
 "Skriv in ei gyldig IP i a.b.c.d format for det lyttande EC-grensesnittet. "
 "Eit tomt felt eller 0.0.0.0 betyr samtlege grensesnitt."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP-port"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
-msgstr "Aktivér UPnP-portvidaresending på EC-porten"
+msgstr "AktivÃ©r UPnP-portvidaresending pÃ¥ EC-porten"
+
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Passord"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Vevtenarparameter"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "VevmÃ¸nster"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Passord for fulle rettar"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "AktivÃ©r brukar med fÃ¥ rettar"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Passord for lÃ¥ge rettar"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Sideoppfriskingstid (i sekund)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "AktivÃ©r Gzipkompresjon"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
-msgstr "Klikk her for å utføre samtlege endringar gjorde i innstillingar."
+msgstr "Klikk her for Ã¥ utfÃ¸re samtlege endringar gjorde i innstillingar."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Nullstill alle endringar i innstillingar."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Tittel :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Kommentar :"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Innkomande kat:"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Endre prioritet for nytileigna filer :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "Ikkje endre"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Vel farge for denne kategprien (no valt)"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Syne tenar motd når tilkopla ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Tenarinfo"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Still attende"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
-msgstr "Klikk denne knappen for å nullstille loggen."
-
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMulelogg"
+msgstr "Klikk denne knappen for Ã¥ nullstille loggen."
 
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
-msgstr "Klikk på denne knappen for å oppdatere tenarlista frå nettadresse ..."
+msgstr "Klikk pÃ¥ denne knappen for Ã¥ oppdatere tenarlista frÃ¥ nettadresse ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Tenarliste"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
 msgstr ""
-"Skriv inn nettadressa til ei server.met fil her og klikk på knappen til "
-"venstre for å oppdatere tenarlista."
+"Skriv inn nettadressa til ei server.met fil her og klikk pÃ¥ knappen til "
+"venstre for Ã¥ oppdatere tenarlista."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Legg til tenar manuelt: Namn"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
-msgstr "Skriv inn namnet på den nye tenaren her"
+msgstr "Skriv inn namnet pÃ¥ den nye tenaren her"
+
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Port"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Skriv inn IP`en til tenaren her, i x.x.x.x format."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Skriv inn porten til tenaren her."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
-msgstr "Legg til ein tenar manuelt (fyll først ut felta til venstre) ..."
+msgstr "Legg til ein tenar manuelt (fyll fÃ¸rst ut felta til venstre) ..."
+
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMulelogg"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Tenarinfo"
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "ED2k-info"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad-info"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
-"Klikk på denne knappen for å oppdatere nodelista frå internettadresse ..."
+"Klikk pÃ¥ denne knappen for Ã¥ oppdatere nodelista frÃ¥ internettadresse ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nodar (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
 msgstr ""
-"Skriv inn internettadressa til ei nodes-dat fil her og klikk på knappen til "
-"venstre for å oppdatere lista over kjende nodar."
+"Skriv inn internettadressa til ei nodes-dat fil her og klikk pÃ¥ knappen til "
+"venstre for Ã¥ oppdatere lista over kjende nodar."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Nodestatistikk"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Eigenoppstart"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Ny node"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Port:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+#, fuzzy
+msgid "Bootstrap from known clients"
 msgstr ""
-"Eigenoppstart frå \n"
+"Eigenoppstart frÃ¥ \n"
 "kjende klientar"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
-msgstr "Kople frå Kad"
+msgstr "Kople frÃ¥ Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2k info"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Sikker brukaridentifikasjon (SUI)"
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Det er tilrÃ¥dd Ã¥ aktivere denne funksjonen. Du vil ikkje fÃ¥ kredittar dersom "
+"SUI ikkje er aktivert."
+
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
-msgstr "Protokolltåkeleggjing"
+msgstr "ProtokolltÃ¥keleggjing"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
-msgstr "Støtte protokolltåkeleggjing"
+msgstr "StÃ¸tte protokolltÃ¥keleggjing"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
 msgstr ""
-"Dette valet aktiverer protokolltåkeleggjing og gjer at aMule tek imot "
-"tåkelagde koplingar frå andre klientar."
+"Dette valet aktiverer protokolltÃ¥keleggjing og gjer at aMule tek imot "
+"tÃ¥kelagde koplingar frÃ¥ andre klientar."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
-msgstr "Bruk tåkeleggjing for utgåande koplingar"
+msgstr "Bruk tÃ¥keleggjing for utgÃ¥ande koplingar"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
 msgstr ""
-"Dette valet får aMule til å nytte protokolltåkeleggjing ved tilkopling til "
+"Dette valet fÃ¥r aMule til Ã¥ nytte protokolltÃ¥keleggjing ved tilkopling til "
 "andreklientar/tenarar."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
-msgstr "Berre godta tåkelagde koplingar"
+msgstr "Berre godta tÃ¥kelagde koplingar"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
 msgstr ""
-"Dette valet får aMule til å berre godta tåkelagde koplingar. Du vil få færre "
-"kjelder, men all trafikken din vert tåkelagd"
-
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Filinnstillingar"
+"Dette valet fÃ¥r aMule til Ã¥ berre godta tÃ¥kelagde koplingar. Du vil fÃ¥ fÃ¦rre "
+"kjelder, men all trafikken din vert tÃ¥kelagd"
 
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Alle"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Ingen"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Kven kan sjå delte filer:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
-msgstr "Vel kven som kan be om å sjå ei liste over dei delte filene dine."
+msgstr "Vel kven som kan be om Ã¥ sjÃ¥ ei liste over dei delte filene dine."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP-filtrering"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
-msgstr "Filtrér klientar"
+msgstr "FiltrÃ©r klientar"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
-msgstr "Aktivér IP-filterring av klientar i fila ~/.aMule/ipfilter.dat."
+msgstr "AktivÃ©r IP-filterring av klientar i fila ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
-msgstr "Filtrér tenarar"
+msgstr "FiltrÃ©r tenarar"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
-msgstr "Aktivér filtrering av tenarar i fila ~/.aMule/ipfilter.dat."
+msgstr "AktivÃ©r filtrering av tenarar i fila ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Last om att lista"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
-msgstr "Last om att lista av IP`ar å filtre frå fila ~/.aMule/ipfilter.dat"
+msgstr "Last om att lista av IP`ar Ã¥ filtre frÃ¥ fila ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "Nettadresse:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
-msgstr "Oppdatér no"
+msgstr "OppdatÃ©r no"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
-msgstr "Automatisk oppdatér ipfilter ved oppstart"
+msgstr "Automatisk oppdatÃ©r ipfilter ved oppstart"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
-msgstr "Filternivå:"
+msgstr "FilternivÃ¥:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
-msgstr "Alltid filtrér LAN IP`ar"
+msgstr "Alltid filtrÃ©r LAN IP`ar"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoid handsaming av ujamne IP`ar"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
 msgstr ""
 "Avviser pakkar dersom klientadressa er ulik adressa pakken vert motteken "
-"frå. Vér varsam med dette."
+"frÃ¥. VÃ©r varsam med dette."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Bruk systemomspennande ipfilter.dat dersom tilgjengeleg"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -5966,1214 +4099,4000 @@
 "Tillat bruk av ipfilter for heile systemet dersom inga lokal ipfilter-dat "
 "vert funnen"
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Sikker brukaridentifikasjon (SUI)"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Det er tilrådd å aktivere denne funksjonen. Du vil ikkje få kredittar dersom "
-"SUI ikkje er aktivert."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
-msgstr "Aktivér nettsignatur"
+msgstr "AktivÃ©r nettsignatur"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
 msgstr ""
-"Aktiverer skriving av OS-fila, som kan verte nytta av eksterne program forå "
+"Aktiverer skriving av OS-fila, som kan verte nytta av eksterne program forÃ¥ "
 "lage signaturar og liknande."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Oppdateringsfrekvens (sekund):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Endre frekvensen (i sekund) for oppdatering av nettsignaturar."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Nettsignaturkatalog:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
-msgstr "Klikk her for å velje katalogen med nettsignaturfilene."
-
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Deaktivere/Aktivere"
+msgstr "Klikk her for Ã¥ velje katalogen med nettsignaturfilene."
 
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
-msgstr "Filtrér innkomande meldingar (utanom novérande samtale):"
-
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Filterval:"
+msgstr "FiltrÃ©r innkomande meldingar (utanom novÃ©rande samtale):"
 
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
-msgstr "Filtrér alle meldingar"
+msgstr "FiltrÃ©r alle meldingar"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
-msgstr "Filtrér meldingar frå alle som ikkje er på kameratlista"
+msgstr "FiltrÃ©r meldingar frÃ¥ alle som ikkje er pÃ¥ kameratlista"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
-msgstr "Filtrér meldingar frå ukjende klientar"
+msgstr "FiltrÃ©r meldingar frÃ¥ ukjende klientar"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
-msgstr "Filtrér meldingar som inneheld (bruk ','som skiljeteikn):"
+msgstr "FiltrÃ©r meldingar som inneheld (bruk ','som skiljeteikn):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
-msgstr "legg til ord aMule skal filtrére og blokkere"
+msgstr "legg til ord aMule skal filtrÃ©re og blokkere"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Kommentarar"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
-msgstr "Filtrér kommentarar som inneheld (bruk ',' som skiljeteikn):"
+msgstr "FiltrÃ©r kommentarar som inneheld (bruk ',' som skiljeteikn):"
+
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Automatisk tenartilkopling utan vikar"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "AktivÃ©r godkjenning"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "AktivÃ©r/deaktivÃ©r godkjenning av brukarnamn/passord"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr ""
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Brukarnamn Ã¥ nytte for Ã¥ kople til vikar"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Passord:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Passord Ã¥ nytte for Ã¥ kople til vikar"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
-msgstr "Aktivér vikar"
+msgstr "AktivÃ©r vikar"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
-msgstr "Aktivere/deaktivere vikarstøtte"
+msgstr "Aktivere/deaktivere vikarstÃ¸tte"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Vikartype:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Typen vikar du koplar til"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Vikarvert:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Vikaren sitt vertsnamn"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Vikarport:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Vikarport"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Godkjenning"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Aktivér godkjenning"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Aktivér/deaktivér godkjenning av brukarnamn/passord"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Brukarnamn å nytte for å kople til vikar"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Passord:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Passord å nytte for å kople til vikar"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Automatisk tenartilkopling utan vikar"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Kople til:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
-msgstr "Logge inn på fjern aMule"
+msgstr "Logge inn pÃ¥ fjern aMule"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Brukarnamn"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Hugs desse innstillingane"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
-msgstr "Aktivér utførleg avfeilingslogg."
+msgstr "AktivÃ©r utfÃ¸rleg avfeilingslogg."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Meldingskategoriar:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Ventar..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
-msgstr "Importér"
+msgstr "ImportÃ©r"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
-msgstr "Prøv om att valde"
+msgstr "PrÃ¸v om att valde"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Fjern valde"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Hendingstypar"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Aktive opplastingar :"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "GÃ¸yme delte filer"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Vel synsfilter"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Aktive opplastingar"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Syne klientar"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Last om att lista"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Lastar inn att delte filer"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Send"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Sender meldinga."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Stengje denne lynmeldingsÃ¸kta."
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
-msgstr "Kople til vilkårleg tenar og/eller Kad"
+msgstr "Kople til vilkÃ¥rleg tenar og/eller Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Nettverksavindauge"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Delte filer"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Søkjevindauge"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Deaktivert [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Filoverføringsvindauge"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Vindauge for delte filer"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Meldingsvindauge"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Statistikkgrafvindauge"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Innstillingsvalsvindauge"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Ny kategori"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Vél ei mappe for innkomande filer"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Du må skrive inn eit namn på kategorien!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/sek"
+msgstr[1] "bytes/sek"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Du mp skrive inn ein sti for kategorien!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "sekund"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "minutt"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "timar"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Dagar"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "alle"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "alle andre"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Uferdig"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Stogga"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Video"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Arkiv"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Tekst"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Aktiv"
+
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
 msgstr ""
-"Greidde ikkje å skape innkomande katalog for kategorien. Vér god å skrive "
-"inn ein gangbar sti!"
 
-#: src/ExternalConnector.cpp:141
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr ""
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Ukjend forlenging·'%s'·for·'%s'·kommandoen.\n"
+msgid "Importing %s: %s"
+msgstr "Importerer %s:Â·%s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Les mellombels mappe"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Hentar grunnleggjande informasjon frÃ¥ nedlastingsinformasjonfil"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Lagar mÃ¥lfil"
+
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Ukjend kommando '%s'.\n"
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Lastar data frÃ¥ gamal nedlastingsfil (%uÂ·avÂ·%u)"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Denne kommandoen kan ikkje ha eit argument.\n"
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Lagrer datablokk til ei einaste nedlastingsfil (%uÂ·ofÂ·%u)"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Denne kommandoen må ha eit argument.\n"
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Hentar informasjon frÃ¥ nedlastingsfilkjelde"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Legg til nedlasting og lagrar ny delfil"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "ImportÃ©r delfiler"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Tilstand"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Filhash"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%sÂ·(Disk:Â·%s)"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Denne kommandoen er ikkje komplett; du må nytte ein av forlengjarane under.\n"
+"VÃ©r god Ã¥ velje ei katalog til Ã¥ sÃ¸kje pÃ¥ mellombelse nedlastingar! "
+"(underkatalogar vil verte inkluderte)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
-"\n"
-"Tilgjengelege forlengjarar:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "Vil du slette kjeldefilene til vellukka importerte nedlastingar?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Tilgjengelege kommandoar:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Ta bort kjelder?"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "FEIL: Greidde ikkje Ã¥ lage delfil"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-" Alle kommandoar kan utførast med store og små bokstavar.\n"
-"Skriv '%s <kommando>'for meir opplysningar om <kommando>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Freistar Ã¥ laste tryggleikskopi av met-fila frÃ¥ %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Avsluttar programmet."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "Feil: Greidde ikkje Ã¥ opne mart.met fila: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Syne hjelp."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "FEIL: part.met fila har ein storleik pÃ¥ 0: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
-"For å få hjelp til ein kommando, skriv 'help·<kommando>'.\n"
-"For full kommandoliste, skriv 'help'.\n"
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr ""
+"FEIL: %s (%s) er korrupt (feil merkelappstal), greidde ikkje Ã¥ laste fila."
+
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Bruk·'%s'·for·kommandoliste\n"
-"\n"
+"FEIL: %s (%s) er korrupt (feil merkelappstal), greidde ikkje Ã¥ laste fila."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Syntaksfeil!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Freistar Ã¥ hente fram att filinformasjon..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr ""
-"Handsamingsfeil av kommando - burde aldri skje! Vér god å rapportere feilen\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "Attskaper fil utan namn - freistar Ã¥ attskape ho som RecoverdFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Denne kommandoen skulle ikkje ha nokon parameter."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "Attskapte all tilgjengeleg filinformasjon :D - Freistar Ã¥ nytte den..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Denne kommandoen må ha eit parameter."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Ikkje i stand til Ã¥ attskape filinformasjon :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Ugangbart argument."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Greidde ikkje Ã¥ opne %sÂ·(%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Denne kommandoen er ikkje komplett."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "ÃTVARING: %s kan vere korrupt (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Skriv '%s'·for å få meir hjelp.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "FEIL under lagring av delfila: %sÂ·(%sÂ·==>Â·%s)"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "FEIL under lagring av delfila: %sÂ·(%sÂ·==>Â·%s)"
+
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Dette er %s·%s·%s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Greidde ikkje Ã¥ hente lengda pÃ¥ '%s' - nyttar %s fila."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Dette er %s·%s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s'Â·er 0 i storleik pÃ¥ ein eller annan mÃ¥teÂ·-Â·nyttarÂ·%sÂ·fila."
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Greidde ikkje Ã¥ lagre part.met.seeds fila for %s"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Lagra %i kjeldefrÃ¸ for delfila: %s (%s)"
+msgstr[1] "Lagra %i kjeldefrÃ¸ for delfila: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Delfila %sÂ·(%s) manglar kjeldefil"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Delfila Â·%sÂ·(%s) har ei ugangbar kjeldefil"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Feil i lesing av delfila si kjeldefil (%sÂ·-Â·%s):Â·%s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Fann korrupt del (%d) i %d delfil %s - Filresultathash |%s| Filhash | %s"
+msgstr[1] ""
+"Fann korrupt del (%d) i %d deler i fila %s - Filresultathash |%s| Filhash |%"
+"s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Fann ferdig del (%i)Â·iÂ·%s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Ferdig med omhashing av %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Uventa feil ved fullfÃ¸ring av %s. Sette fila pÃ¥ pause"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Ferdig med Ã¥ laste ned: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Slettar fila: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Opprettar klient...\n"
+"ÃTVARING: Greier ikkje Ã¥ hashe nedlasta del - hashsett ikkje komplett for '%"
+"s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Ok,·avsluttar·%s...\n"
+"FEIL: Greier ikkje Ã¥ hashe nedlasta del - hashsett ikkje komplett (%s). "
+"Dette burde aldri skje"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Kan ikkje kople til med eit tomt passord.\n"
-"Du må skrive inn eit passord anten i konfigurasjonsfila,\n"
-"i kommandolinja eller når du vert spurt.\n"
-"\n"
-"Avsluttar...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Syne denne hjelpeteksten."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "ÃTVARING: Ikkje nok ledig diskplass! Set fila %s pÃ¥ pause"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Vert der aMule køyrer (standard: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Nedlasta del %i er korrupt i fila: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "aMule sin port for eksternkopling (standard: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Attskapte korrupt del %iÂ·forÂ·%sÂ·->Â·Lagra bytes:Â·%s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Passord for eksternkopling."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Hentar plass"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Les innstillingar frå fil."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Ikkje nok diskplass"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Ikkje skriv ut data til stdout."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Lasta ned"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Vér utførleg - syne óg avfeilingsmeldingar,"
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "Feil: Greidde ikkje opne delfila '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Set programspråk."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Standardinnstillingar"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Skriv kommandolinjealternativa til konfigurasjonsfila."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albansk"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Lagar konfigurasjonsfil basert på aMule si konfigurasjonsfil."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabisk"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Skriv programutgåve."
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "Estisk"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Kredittfil lasta, %u kjend klient"
-msgstr[1] "Kredittfil lasta, %u kjende klientar"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Baskisk"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Kredittar forelda for %u klient!"
-msgstr[1] " - Kredittar forelda for %u klientar!"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgarsk"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Inga 'cryptkey.dat' fil funne - opprettar."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Katalansk"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"FEIL: aMule daemon kan ikkje nyttast dersom eksterne koplingar er "
-"deaktiverte. For å aktivere eksterne koplingar må du anten nytte vanleg "
-"aMule, starte amuled med valet --ec-config eller set lykelen "
-"\"AcceptExternalConnections\" til 1 i fila ~/.aMule/amule.conf"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Kinesisk (forenkla)"
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "Feil: %s"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Kinesisk (tradisjonell)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Gje amnesti"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Syne opplastingar"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Syne kø"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Kroatisk"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Syne klientar"
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Tsjekkisk"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Vel utsyn"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Dansk"
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Klientmjukvare"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Nederlansk"
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Venta"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Engelsk (U.K.)"
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Opplastingstid"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estisk"
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Opplasting/nedlasting"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finsk"
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Fjernstatus"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Fransk"
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "KR: %u"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galisisk"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Filprioritet"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Tysk"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Score"
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Gresk"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Spurt"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebraisk"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Sist sett"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Ungarsk"
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Kom inn i kø"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italiensk"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Opplastingsstatus"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italiensk (sveitsisk)"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Overført Opp"
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japansk"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Nedlastingsstatus"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Koreansk"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Overført Ned"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Brukarhash"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Kryptért"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Gøyme delte filer"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Litauisk"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Klientdetaljar"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norsk (Nynorsk)"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Aktivert"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polsk"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Støtta"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugisisk"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Ikkje støtta"
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugisisk (Brasil)"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Deaktivert"
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Russisk"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f·kB/s"
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Slovensk"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Ikkje ferdig"
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Spansk"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Kjeltring"
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Svensk"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Granska - OK"
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Tyrkisk"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr ""
+
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "SprÃ¥k"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
+
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
 msgstr "Ikkje tilgjengeleg"
 
-#: src/ClientDetailDialog.cpp:215
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr ""
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr ""
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
+"TCP port kan ikkje vere hÃ¸gare enn 65532 fordi tenaren si UDPkopling er TCP+3"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+msgid "Default port will be used (%d)"
+msgstr "Standardport vert nytta (%d)"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr "Min storleik må vere mindre enn maks storleik. Maks storleik ignorert."
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr ""
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Søkeåtvaring"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Kopling"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Ubegrensa"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Katalogar"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule traumeny"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Tenarar"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Fartsgrenser:"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Filer"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "OL: Inga"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Tryggleik"
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "OL: %u"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "NL: Ingen"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "NL: %u"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Fjernkontrollar"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Nettsignatur"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Hendingar"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Melde om feil"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Ikkje endre desse innstillingane med mindre du veit\n"
+"kva du gjer, ellers kan du fort\n"
+"gjere ting verre for deg sjÃ¸lv.\n"
+"\n"
+"aMule kÃ¸yrer fint utan justering av nokon av\n"
+"desse innstillingane."
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Nedlastingsfart: %.1f"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Opplastingsfart: %.1f"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Klientinformasjon"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Typen vikar du koplar til"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:534
 #, c-format
-msgid "Nickname: %s"
-msgstr "Kallenamn: %s"
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Ikkje valt kallenamn!"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"aMuleÂ·treng omstart for Ã¥ gjere endringane moglege:\n"
+"\n"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "KlientID: "
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "-Â·TCP-porten endra.\n"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Tenarnamn: "
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "-Â·UDP-porten endra.\n"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "TenarIP: "
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Ekstern kopling lukka."
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP:·%s"
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Ny ekstern kopling akseptert"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Ekstern kopling lukka."
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Du har aktivert eksterne koplingar, men har ikkje skrive inn eit passord.\n"
+"Eksterne koplingar kan ikkje aktiverast utan eit gyldig passord."
+
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- SprÃ¥k endra.\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Mellombels mappe endra.\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+#, fuzzy
+msgid "- ED2K network enabled.\n"
+msgstr "Alle nettverk er deaktiverte."
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"BÃ¥de eD2k og kadnettverket er dekativert.\n"
+"Du vil ikkje klare Ã¥ kople til fÃ¸r du aktiverer minst eitt av dei."
+
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad kan ikkje starte dersom UDP-porten er deaktivert.\n"
+"AktivÃ©r UDP-porten eller deaktivÃ©r Kad."
+
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Du MÃ starte om att aMule no.\n"
+"Ikkje klag dersom du ikkje gjer dette og du fÃ¥r problem.\n"
+
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Lista for automatisk oppdatering av tenarar er tom.\n"
+"VÃ©r god og fylle ut ein URL som peikar til ei gyldig server.met fil.\n"
+"Klikk pÃ¥ knappen \"Liste\" ved denne boksen for Ã¥ skrive inn ein URL."
+
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Mellombelse filer"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Innkomande filer"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Nettsignaturar"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "TCP port: %d"
-msgstr "TCP port: %d"
+msgid "Choose a folder for %s"
+msgstr "Vel ei mappe for %s"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "TCP port: Ikkje klar"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Bla etter videospelar"
+
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "VÃ©l nettlesar"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "UDP port: %d"
-msgstr "UDP port: %d"
+msgid "Executable%s"
+msgstr "KÃ¸yrbar%s"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "UDP port: Ikkje klar"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Handsame tenarlista"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Nettsignatur: Aktivert"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Skriv inn URL`en for Ã¥ laste ned server.met filer.\n"
+"Berre ein URL pÃ¥ kvar linje."
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Nettsignatur: Deaktivert"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Oppdateringspause: %d sekund"
+msgstr[1] "Oppdateringspause: %d sekund"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "Shared files: %d"
-msgstr "Delte filer: %d"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Tid for gjennomsnittleg graf: %d minutt"
+msgstr[1] "Tid for gjennomsnittleg graf; %d minutt"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/PrefsUnifiedDlg.cpp:1127
 #, c-format
-msgid "Queued clients: %d"
-msgstr "Klientar i kø: %d"
+msgid "Connections Graph Scale: %d"
+msgstr "Koplingsgrafskala: %d"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "Total DL: %s"
-msgstr "Totalt NL: %s"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Filbufferstorleik: %d byte"
+msgstr[1] "Filbufferstorleik: %d bytes"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Total UL: %s"
-msgstr "Totalt OL: %s"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "OpplastingskÃ¸storleik: %d klient"
+msgstr[1] "OpplastingskÃ¸storleik: %d klientar"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Opplastingsgrense"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Oppfriskingsinterval pÃ¥ tenarkoplingar: %d minutt"
+msgstr[1] "Oppfriskingsinterval pÃ¥ tenarkoplingar: %d minutt"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Nedlastingsgrense"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Oppfriskingsintervall for tenarkopling: Deaktivert"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Gøyme aMule"
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "deaktivere"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Syne aMule"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "KÃ¸yr kommando pÃ¥ `%s' hending"
+
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "AktivÃ©r kommandokÃ¸yring i kjernen"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Kjernekommando:"
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "AktivÃ©r kommandokÃ¸yring pÃ¥ drakt"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Draktkommando:"
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "FÃ¸lgjande variablar vert erstatta:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr "Min storleik mÃ¥ vere mindre enn maks storleik. Maks storleik ignorert."
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "SÃ¸keÃ¥tvaring"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Hovud"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Du kan ikkje sÃ¸kje pÃ¥ Kad dersom Kad ikkje kÃ¸yrer"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "eD2k sÃ¸k kan ikkje gjennomfÃ¸rast dersom eD2k ikkje er tilkopla"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Uventa feil oppstod under sÃ¸k pÃ¥ Kad: "
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "FilID"
 
-#: src/ChatSelector.cpp:127
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Fil"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Nedlasting i kategori"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Legg til valfrie URL`ar for denne fila"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "SÃ¸k beslekta filer (eD2k, lokal tenar)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Merk som kjend fil"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Kopier eD2k lenkje til skrivebordet"
+
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Avbryt"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr ""
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Greidde ikkje Ã¥ kople til alle tÃ¥kelagde tenarar i lista. Freistar ein gong "
+"til utan tÃ¥kelegging."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"Greidde ikkje Ã¥ kople til alle tenarane i lista. Freistar ein gong til."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "eD2k nettverket deaktivert i innstillingar, koplar ikkje til"
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "Ingen gangbare tenarar funne i tenarlista"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Lynmeldingsøkt starta: %s·(%s:%u)·-·%s·%s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Tilkopla %sÂ·(%s:%i)"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "***·Tilkopla klient·***"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Kopling oppretta pÃ¥: %s"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "***·Koplar til klient·***"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr "Alvorleg feil i oppkopling. Internett kan vere nede"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Greidde ikkje å kople til klient / Kopling mista ***"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Mista kopling til %sÂ·(%s:%i)"
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Stengje faneblad"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%sÂ·(%s:%i) ser ut til Ã¥ vere daud."
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Stengje alle faneblad"
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr "%sÂ·(%s:%i) ser ut til Ã¥ vere full."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Stengje andre faneblad"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Automatisk tenaroppkopling freistar pÃ¥ nytt om %d sekund"
+msgstr[1] "Automatisk tenaroppkopling freistar pÃ¥ nytt om %d sekund"
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Kopling mista"
+
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Tilkopling til %sÂ·(%s:%i)Â·mislukka."
+
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "FEIL: Ugangbar sokkel ved uttellingssjekk"
 
-#: src/ServerList.cpp:84
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Tilkoplingsfreisting til %sÂ·(%s:%i)Â·gjekk over tida."
+
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr ""
+
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Lastar server.met fila: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Server.met fila ikkje funnen!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
-msgstr "Greidde ikkje å laste inn server.met fila '%s' - ukjend filformat."
+msgstr "Greidde ikkje Ã¥ laste inn server.met fila '%s' - ukjend filformat."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
-msgstr "Greidde ikkje å opne server.met!"
+msgstr "Greidde ikkje Ã¥ opne server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
-"Server.met fila er korrupt, ugangbar merkelapp på utgåve: 0x%x,·storleik·%i"
+"Server.met fila er korrupt, ugangbar merkelapp pÃ¥ utgÃ¥ve: 0x%x,Â·storleikÂ·%i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "%i tenar funne i server.met"
 msgstr[1] "%i tenarar funne i server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d tenar lagd til"
 msgstr[1] "%d tenarar lagde til"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "IO feil underlesing av known.met fila: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Tenar ikkje lagd til: [%s:%d] oppgir ikkje ein gangbar port."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Tenar ikkje lagd til: IP`en til [%s:%d] er filtrert eller ugangbar."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr "Tenar ikkje lagd til: Tenar med lik IP:Port [%s:%d] funne i lista."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
-msgstr "Tenar lagd til: Tenar på [%s:%d] som nyttar namnet '%s'."
+msgstr "Tenar lagd til: Tenar pÃ¥ [%s:%d] som nyttar namnet '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr ""
-"Du er tilkopla tenaren du freistar å slette. Vér god å kople frå først."
+"Du er tilkopla tenaren du freistar Ã¥ slette. VÃ©r god Ã¥ kople frÃ¥ fÃ¸rst."
+
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Greidde ikkje Ã¥ opne '%s'"
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
-msgstr "Greidde ikkje å lagre server.met!"
+msgstr "Greidde ikkje Ã¥ lagre server.met!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Ugangbar URL"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
-msgstr "Tenarlista ferdig nedlasta frå %s"
-
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Greidde ikkje å laste ned tenarlista frå %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
+msgstr "Tenarlista ferdig nedlasta frÃ¥ %s"
 
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
 msgstr ""
 "Inga tenarlistadresse funnen i 'addresses.dat'. Lim inn ei gangbar "
-"tenarlisteadresse i denne fila for å automatisk oppdatere tenarlista di"
+"tenarlisteadresse i denne fila for Ã¥ automatisk oppdatere tenarlista di"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
-msgstr "Last ned tenarlista frå %s"
+msgstr "Last ned tenarlista frÃ¥ %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
-msgstr "ÅTVARING: ikkje gangbar URL for automatisk oppdatering av tenarar: %s"
+msgstr "ÃTVARING: ikkje gangbar URL for automatisk oppdatering av tenarar: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Ugangbar autonedlastingsnettside for server.met i addresses.dat"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Greidde ikkje Ã¥ laste ned tenarlista frÃ¥ %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr "Lokal tenar er filtrert av ipfiltra - koplar til ein anna tenar!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Greidde ikkje å utføre kommendoen `%s'·på·`%s hending."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Tenarnamn"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Addresse"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Port"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Skildring"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Brukarar"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Statisk"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "UtgÃ¥ve"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Dine lokale innstilingar har vorte endra til opprinnelege "
-"systeminnstillingar på grunn av konfigurasjonsending. Beklager."
+"Du er tilkopla ein tenar du freistar Ã¥ slette. VÃ©r god Ã¥ kople frÃ¥ fÃ¸rst. "
+"Tenaren vart IKKJE sletta."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Ukjent namn)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Er du sikker pÃ¥ at du vil slette den statiske tenaren %s"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Tenarar (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Tenar"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Kople til tenar"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Merk tenar som statisk"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Merk tenar som ustatisk"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Merk tenarar som statiske"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Merk tenarar som ustatiske"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Ta bort tenar"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Ta bort tenarar"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Fjern alle tenarar"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Kopier eD2k lenkjer til skrivebordet"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Kople til tenar att"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Er du sikker pÃ¥ at du vil slette alle tenarane?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Er du viss pÃ¥ at du vil slette den valde tenaren."
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Er du viss pÃ¥ at du vil slette dei valde tenarane?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "FEIL: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "ÃTVARING: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Ny klientid er %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "ÃTVARING: Du har motteke ein LÃ¥g-ID!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tTruleg har dette skjedd fordi du er bak ein brannmur eller ruter."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tFor meir informasjon, sjÃ¥ http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Ukjend tenarinfo motteke! - for kort"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Tok mot %d ny tenar"
+msgstr[1] "Tok mot %d nye tenarar"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Lagring av tenarlista ferdig."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Tenar avviste siste kommando"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Falske pakkar mottekne frÃ¥ tenar: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "UrÃ¸yvd feil under handsaming av pakke frÃ¥ tenar: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Kan ikkje skape DNS-lÃ¸ysande trÃ¥d for Ã¥ kople til %s"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "Tenar IP %sÂ·(%s) er filtrert.  Koplar ikkje til."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "brukar protokolltÃ¥kelegging."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Koplar tilÂ·%sÂ·(%sÂ·-Â·%s:%i)Â·%s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Greidde ikkje Ã¥ lÃ¸yse dns for tenar %s: Greier ikkje Ã¥ kople til!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Tenar ikkje lagd til: Manglar IP eller vertsnamn."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Tenar ikkje lagd til: Ikkje gangbar tenarport."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "eD2k status:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kademlia status"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "KÃ¸yrer pÃ¥ %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "KÃ¸yrer"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Status:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Tilkoplingsstatus:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
-"Du har ingen tenarar i tenarlista.\n"
-"Vil du at aMule skal laste ned ei ny liste no?"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Nedlasting av tenarliste"
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "Tilkoplingsstatus:"
 
-#: src/amule.cpp:846
+#: src/ServerWnd.cpp:219
 #, c-format
-msgid "web server running on pid %d"
-msgstr "vevtenar køyrer på pid %d"
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr ""
 
-#: src/amule.cpp:850
-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"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Brannmura status: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
 msgstr ""
-"Du freista å køyre vevtenar ved oppstart, men binærfila amuleweb kan ikkje "
-"køyrast. Installer pakken som inneheld vevtenaren til aMule, eller kompiler "
-"aMule med --enable-webserver og køyr make install"
 
-#: src/amule.cpp:937
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Ingen kamerat"
+
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "Tilkopla kamerat"
+
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "Tilkopla kamerat"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "Funne kjelder :"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr ""
+
+#: src/ServerWnd.cpp:254
+#, fuzzy
+msgid "Indexed notes:"
+msgstr "Registerfil ikkje funne: "
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr ""
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Gjennomsnitt brukarar:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Gjennomsnitt filer:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "KÃ¸yrer ikkje"
+
+#: src/SharedFileList.cpp:332
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Greidde ikkje å knyte portar til adressa: %s"
+msgid "Adding file %s to shares"
+msgstr ""
 
-#: src/amule.cpp:964
+#: src/SharedFileList.cpp:371
 #, 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"
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Fann %i kjend delt fil"
+msgstr[1] "Fann %i kjende delte filer"
 
-#: src/amule.cpp:970
+#: src/SharedFileList.cpp:377
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Fann %i kjend delt fil, %i ukjend"
+msgstr[1] "Fann %i kjende delte filer, %i ukjende"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "FEIL: Freista Ã¥ dele %s"
+
+#: src/SharedFileList.cpp:410
+#, fuzzy, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "tenar ikkje funnen: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
 msgstr ""
-"Port·%u·er ikkje tilgjengeleg!\n"
-"\n"
-"Dette betyr at du vil vere LågID.\n"
-"\n"
-"Sjekk nettverket ditt for å vere viss på at porten er open for inn- og "
-"utgåande trafikk."
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Greidde ikkje å lage OnlineSigfil"
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Brukarnamn"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Greidde ikkje å lage aMule si OnlineSigfil."
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Nedlastingsfart"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Opplastingsfart"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Tilgjengeleg:"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Opplastingsstatus"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Nedlastingsstatus"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Filnamn"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Delte filer"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Etterspurnader"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Godtekne etterspurnader"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "OverfÃ¸rte data"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Delingssamsvar"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Nedlasta delar"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Komplette kjelder"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Katalogsti"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Legg til kommentar/Rangering"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Endre kommentar/Rangering"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Endre namn"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Legg filer frÃ¥ samlinga til overfÃ¸ringslista"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "KopiÃ©r magnet &URI til utklippstavla"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Kopier eD2k lenka til utklippstavla (&Kjelde)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Kopier eD2k lenkje til utklippstavle (Kjelde) &Med krypteringsval)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Kopier eD2k lenkje til utklippstavla (&Vertsnamn)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr "Kopier eD2k lenkje til utklippstavla (Vertsnamn) (Med &krypteringsval)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Kopier eD2k lenkje til utklippstavla (&AICH info)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Du treng ein HÃ¸gID for Ã¥ lage ei gangbar kjeldelenkje"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Delte filer (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[Delfil]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Filnamn"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Opplasta data (Ã¸kt (total)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Totalt dataoverskot (pakkar): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Dataoverskot pÃ¥ filetterspurnader (pakkar): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Dataoverskot pÃ¥ kjeldeutveksling (pakkar): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Dataoverskot pÃ¥ tenar (pakkar): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Dataoverskot Kad (pakkar): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Krypteringsdataoverskot (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Aktive opplastingar: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Ventande opplastingar: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Tal pÃ¥ samtlege vellukka opplastingar: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Tal pÃ¥ samtlege mislukka opplastingar: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Gjennomsnittleg opplastingstid: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Nedlasta data (Ã¸kt (total)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Funne kjelder: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Aktive nedlastingar (delar): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Ãkt OL:NL proporsjon (total): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Gjennomsnittleg nedlastingsfart (Ã¸kt): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Gjennomsnittleg opplastingsfart (Ã¸kt): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Raskaste nedlastingsfart (Ã¸kt): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Raskaste opplastingsfart (Ã¸kt): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Attkoplingar: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Tid sidan fÃ¸rste overfÃ¸ring: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Tilkopla tenar sidan: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Aktive koplingar (berekna): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Maksimal koplingsgrense nÃ¥dd: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Gjennomsnittleg tal pÃ¥ koplingar (berekna): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Topp koplingar (berekna): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Klientar"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "Ukjend storleik"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "Filtrert"
+
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "Nekta"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Total:Â·%iÂ·Kjend:Â·%i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Fungerande tenarar: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Mislukka tenarar: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Total:Â·%s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Sletta tenarar: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Filtrerte tenarar: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Brukarar pÃ¥ fungerande tenarar: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Filer pÃ¥ fungerande tenarar: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Totalt brukertal: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Totalt filtal: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Tenerlast: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Tal pÃ¥ delte filer: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Total storleik pÃ¥ delte filer: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Gjennomsnittleg filstorleik: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Operativsystem"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Ikkje motteke"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktive koplingar (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Ikkje tilgjengeleg"
 
-#: src/amule.cpp:1299
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Aldri"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "KommandoenÂ·`%s'Â·medÂ·pidÂ·`%d'Â·er ferdig med statuskodeÂ·`%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "KÃ¸yr <str> og avslutt."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Ugangbart IP-format. Bruk xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
+msgstr ""
+"Denne kommandoen krever eit argument. Gangbare argument: 'alle', filnamn, "
+"eller eit tal.\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Handsamar etter hash"
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Handsamar etter filnamn"
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
-"Dei valte lokale innstillingane ser ikkje ut til å vere installerte på "
-"maskina di. (Merk: Eg freistar å setje dei likevel)"
+"Denne kommandoen krever eit argument: Gangbare argument: ein filhash.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Ikkje gangbart tal\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Ikkje gangbar hash (lengde mÃ¥ vere nÃ¸yaktig 32 teikn)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Etterspurnaden mislukka med ukjend feil."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Operasjonen var vellukka"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Dette er første gongen du køyrer aMule %s"
+msgid "Request failed with the following error: %s"
+msgstr "Etterspurnaden mislukka med fÃ¸lgjande feil: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Denne utgåva er ei testutgåve, oppdatert dagleg, og\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "IP-filtrÃ©ring for klientar er %s.\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "vi gir ingen garanti for skade eller nedbrenning av huset ditt,\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "AV"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "eller drep hunden din. Men det *burde* vere trygt å nytte uansett.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "PÃ"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "IP-filtrÃ©ring for tenarar er %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "NovÃ©rande IPFilternivÃ¥ er %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Bandbreiddegrenser: Opp: %u kB/s, Ned: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Tilkopla %sÂ·%sÂ·%s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Koplar til no"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "brannmura"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"Dei følgjande alternativa har vorte endra i denne utgåva av "
-"tryggleiksomsyn:\n"
+"\n"
+"Nedlasting:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"*·Støtte for protokolltåkeleggjing er aktivert for innkomande og utgåande "
-"koplingar.\n"
+"Opplasting:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Oppdatering av tenarlista frå andre tenarar og klientar er deaktivert.\n"
+"Klientar i kÃ¸:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"For meir informasjon om årsaka for desse endringane, søk\n"
-"på \"fake servers\" i wikien til aMule på http://wiki.amule.org.\n"
-"Det er viktig at du tek bort alle falske tenarar frå tenarlistafor at aMule "
-"skal fungere skikkeleg."
+"Alle kjelder:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Tal pÃ¥ sÃ¸kjeresultat: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr ""
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Tok imot ukjend svar frÃ¥ tenaren, OpCodeÂ·=Â·%#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Syne kort statusinformasjon."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Syne koplingsstatus, noverande opp- og nedlastingsfart, osb.\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Syne fullt statistikktre."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Alternativt kan eit tal mellom 0-255 skrivast inn som argument for denne\n"
+"kommandoen, som fortel kor mange inskripsjonar frÃ¥ undertrÃ©a til "
+"klientutgÃ¥va skal  verte\n"
+"synte. Ã skrive 0 eller Ã¥ hoppe over betyr 'ubegrensa'.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Til dÃ¸mes: 'statistics 5' vil berre syne dei 5 utgÃ¥vene pÃ¥ top for kvar "
+"klienttype.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Avslutt aMule"
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Avslutt den fjerne kjernen (amule/amuled).\n"
+"Dette vil Ã³g avslutte tekstklienten, ettersom den er ubrukeleg utan ei "
+"kjerne som kÃ¸yrer-\n"
+
+#: src/TextClient.cpp:859
+#, fuzzy
+msgid "Reload the given object."
+msgstr "Lastar inn att valt objekt."
+
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
+msgstr "Lastar inn att lista over delte filer."
+
+#: src/TextClient.cpp:862
+#, fuzzy
+msgid "Reload IP filtering table."
+msgstr "Lastar om att ipfiltertabell frÃ¥ fil."
+
+#: src/TextClient.cpp:863
+#, fuzzy
+msgid "Reload current IP filtering table."
+msgstr "Vel IpfilternivÃ¥"
+
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "Lastar om att ipfiltertabell frÃ¥ fil."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Kople til nettverket."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Dette vil kople til alle nettverka som er aktiverte i innstillingar.\n"
+"Dy kan Ã³g valfritt gje ei tenaradresse i IP:Port form, for Ã¥ berre kople "
+"til\n"
+"den tenaren. IP`en mÃ¥ vere ei punktmerka og desimal IPv4-adresse.\n"
+"eller eit lÃ¸yseleg DNS-namn."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Kople til berre eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Berre kople til Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Kople frÃ¥ nettverket."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Dette vil kople frÃ¥ alle nettverka som no er kopla til.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Kople frÃ¥ berre eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Berre kople frÃ¥ Kad."
+
+#: src/TextClient.cpp:877
+#, fuzzy
+msgid "Add an eD2k or magnet link to core."
+msgstr "Legg til ei eD2k eller magnetlenkje  til kjernen"
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"eD2k lenkja som skal leggjast til kan vere:\n"
+"*) ei fillenkje (ed2k://|fil|...), som vil verte lagd til nedlastingskÃ¸a,\n"
+"*) ei tenarlenkje (ed2k://|tenar|...), som vil verte lagd til tenarlista,\n"
+"*) eller ei tenarlistelenkje, der alle tenarane i lista vert lagde til\n"
+"   tenarlista-\n"
 "\n"
-"I tillegg har nettlesarinnstillingane vorte nullstilt til "
-"standardinnstilling. Still inn nettlesarinnstillingane på nytt dersom det er "
-"naudsynt.\n"
+"Magnetlenkja mÃ¥ innehalde eD2k hashen og fillengda.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Set ein brukarvalverdi."
+
+#: src/TextClient.cpp:883
+#, fuzzy
+msgid "Set IP filtering preferences."
+msgstr "Set brukarval for ipfilter."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "SlÃ¥ IP-filtrÃ©ring pÃ¥ for bÃ¥de klientar og tenarar."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "SlÃ¥ IP-filtrÃ©ring av for bÃ¥de klientar og tenarar."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "AktivÃ©r/deaktivÃ©r IP-filtrering av klientar."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "SlÃ¥ IP-filtrÃ©ring pÃ¥ for klientar."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "SlÃ¥ IP-filtrÃ©ring av for klientar."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "AktivÃ©r/deaktivÃ©r IP-filtrering av tenarar."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "SlÃ¥ IP-filtrÃ©ring pÃ¥ for tenarar."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "SlÃ¥ IP-filtrÃ©ring av for tenarar."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Vel IpfilternivÃ¥"
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Meir informasjon, brukarstøtte og nye utgåver kan verte funne på heimesida "
-"vår.\n"
+"Gangbart filtrÃ©ringsnivÃ¥ er mellom 0-255, og den opprinnelege\n"
+"verdien er 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Set bandbreiddegrense."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "Verdien i desse kommandoane mÃ¥ vere i kilobytes/sek.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Set bandbreiddegrense for opplastingar."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Set bandbreiddegrense for nedlastingar."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Hent og syne ein preferanseverdi."
+
+#: src/TextClient.cpp:905
+#, fuzzy
+msgid "Get IP filtering preferences."
+msgstr "Hent ipfilterinnstillingar"
+
+#: src/TextClient.cpp:906
+#, fuzzy
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Hent ipfilterstatus for bÃ¥de klientar og tenarar."
+
+#: src/TextClient.cpp:907
+#, fuzzy
+msgid "Get IP filtering state for clients only."
+msgstr "Hent ipfilterstatus for klientar."
+
+#: src/TextClient.cpp:908
+#, fuzzy
+msgid "Get IP filtering state for servers only."
+msgstr "Hent ipfilterstatus for tenarar."
+
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "Vel IpfilternivÃ¥"
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Hent bandbreiddegrense."
+
+#: src/TextClient.cpp:913
+#, fuzzy
+msgid "Execute a search."
+msgstr "Startar eit kadsÃ¸k"
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"på www.aMule.org, eller på IRC-kanalen vår #aMule·på·irc.freenode.net.\n"
+"Ei sÃ¸kjetype mÃ¥ verte spesifisert:\n"
+"Â·Â·Â·Â·GLOBAL\n"
+"Â·Â·Â·Â·LOKAL\n"
+"Â·Â·Â·Â·KAD\n"
+"DÃ¸me:Â·'sÃ¸k kad fil'Â·vil starte eit kadsÃ¸k for \"fil\".\n"
+
+#: src/TextClient.cpp:915
+#, fuzzy
+msgid "Execute a global search."
+msgstr "Startar eit globalt sÃ¸k"
+
+#: src/TextClient.cpp:916
+#, fuzzy
+msgid "Execute a local search"
+msgstr "Startar eit lokalt sÃ¸k"
+
+#: src/TextClient.cpp:917
+#, fuzzy
+msgid "Execute a kad search"
+msgstr "Startar eit kadsÃ¸k"
+
+#: src/TextClient.cpp:919
+#, fuzzy
+msgid "Show the results of the last search."
+msgstr "Syne resultata av siste sÃ¸k."
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Vér god å rapportere feil til http://forum.amule.org"
+#: src/TextClient.cpp:920
+#, fuzzy
+msgid "Return the results of the previous search.\n"
+msgstr "Returnerer resultata frÃ¥ det tidlegare sÃ¸ket.\n"
+
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "Syner framdrifta i eit sÃ¸k."
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "Syner framdrifta i eit sÃ¸k-\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Start nedlasting av ei fil"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"Mappa spesifisert for nettsignaturar er UGANGBAR!\n"
-" Nettsignaturar vert DEAKTIVERT fram til du ordnar det i innstillingar."
+"Talet pÃ¥ ei fil frÃ¥ siste sÃ¸k mÃ¥ verte gjeve.\n"
+"DÃ¸me: 'downloadÂ·12' vil starte nedlastinga av fil nummer 12 frÃ¥ forrige "
+"sÃ¸k.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Set nedlasting pÃ¥ pause"
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Hald fram nedlasting"
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Avbryt nedlasting"
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Set nedlastingsprioritet."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Gje prioritet LÃ¥g, Normal, HÃ¸g eller Auto til ei nedlasting.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Set prioritet til lÃ¥g."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Set prioritet til normal."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Set prioritet til hÃ¸g."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Set prioritet til auto."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Syne kÃ¸er/lister."
+
+#: src/TextClient.cpp:950
+#, fuzzy
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Syner opplastings-/nedlastingskÃ¸a, tenarlista eller lista over delte filer.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Syne opplastingskÃ¸"
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Syne nedlastingskÃ¸."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Syne logg."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Syne tenarlister."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Nullstill logg"
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Henting av diskplass for fila '%s' mislukka: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Forelda kommando; bruk '%s' i staden."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "FEIL: Greier ikkje å opne loggfila"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Dette er ein forelda kommando som ikkje lenger er tilrÃ¥dd, og kan verte "
+"fjerna i framtida.\n"
+"Bruk '%s' i staden\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "ÅTVARING: loggfila er tom. Noko er gale."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMule tekstklient"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Loggen har vorte nullstilt"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Konverterer gamle AICH hashsett i '%s'Â·tilÂ·64bÂ·iÂ·'%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Tenarmelding: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "ÃTVARING: Filnamnet '%s' er feil og har vorte omdÃ¸ypt til '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Klarte ikkje å laste ned nodelista."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "ÃTVARING: Fila '%s' finst allereie; ny fil omdÃ¸ypt til '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Klarte ikkje å opne den nedlaste utgåvesjekkfila"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Er du viss pÃ¥ at du vil avbryte og slette alle filene i denne kategorien?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Korrupt utgåvesjekkfil"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Stadfesting naudsynt"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Du nyttar ei utdatert utgåve av aMule!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
+
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "For mange koplingar"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Alle andre"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Vel synsfilter"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Legg til kategori"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "RedigÃ©r kategori"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Ta bort kategori"
 
-#: src/amule.cpp:1907
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Di utgåve av aMule er %i.%i.%i og den siste utgåva er %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Greidde ikkje Ã¥ opne fila (%s), fjernar frÃ¥ lista over delte filer."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Den siste utgåva finst alltid på http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Hashsett etterspurt for ukjend fil: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "ÅTVARING: Utgåva di av aMule er utdatert: %i.%i.%i·<·%li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Held fram opplastingar av fila: %s"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Utgåva di av aMule er oppdatert."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Mellombels stogge opplastingar av fila: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Klarte ikkje å laste ned utgåvesjekkfila"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Greidde ikkje Ã¥ utfÃ¸re kommendoen `%s'Â·pÃ¥Â·`%s hending."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Nedlasting fullfÃ¸rt"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Fullstendig sti til fila"
 
-#: src/amule.cpp:2025
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Namnet til fila utan stikomponent."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "eD2k hash pÃ¥ fila"
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Filstorleiken i bytes."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Samla tid pÃ¥ nedlastingsaktivitet."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Ny lynmeldingsÃ¸kt starta"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Meldingssendar."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Tom for plass"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Diskpartisjon,"
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Feil ved ferdigstilling"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Brukarar: %s | Filer: %s"
+msgid "Processing file number %u: %s"
+msgstr "Handsamar filnummer %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Du har spurt etter delhashar (Berre brukt pÃ¥ filer > 9,5 MB)"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Brukarar: E %s K: %s | Filer: E: %s K: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%sÂ·--->Â·Fila finst ikkjeÂ·!\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Ingen valde nettverk"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, lenkjeskaparen for aMule"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Velkomen!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Innmatingsparameter"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Fil Ã¥ hashe"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Legg til valfrie URL`ar for denne fila"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Skriv inn fila du vil lage eD2k lenkje til her"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Skriv inn internettadressa du vil leggje til eD2k lenka: Legg til / pÃ¥ "
+"slutten for Ã¥ la aLinkCreator leggje til det noverande filnamnet "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Ta bort"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Lag lenkje "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Hjelp til med Ã¥ spreie nye og sjeldne filer raskare, men med auka "
+"lenkjestorleik"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4 filhash"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k filhash"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k lenkje"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Lagre"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "KopiÃ©r til utklippstavle"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Opne ei fil for Ã¥ rekne ut eD2k lenka hennar"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Kopier utrekna eD2k lenkje til skrivebordet"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Lagre utrekna eD2k lenkje til fil"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Om aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Vel fila du vil rekne ut eD2k lenkje til"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Ikkje noko Ã¥ kopiÃ©re no !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Vel fila til den utrekna eD2k lenka"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Ikkje i stand til Ã¥ opne"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "VÃ©r god Ã¥ skrive inn eit filnamn som ikkje er tomt"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Ikkje noko Ã¥ lagre akkurat no !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, eD2k lenkjeskaparen\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Grafikk frÃ¥ http://www.everaldo.com og http://www.icomania.com\n"
+"og http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distribuert under GPL"
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Hashar..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Avbrote!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Tilkopla %s·%s"
+msgid "Done in %.2f s"
+msgstr "Ferdig om %.2fÂ·s"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Du har allereie lagt til denne URL`en!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "VÃ©r god Ã¥ skrive inn ein URL som ikkje er tom"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "Koplar til %s"
+msgid "Unable to open %s"
+msgstr "Ikkje i stand til Ã¥ opne %s"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Fråkopla eD2k"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i dag(ar) %i timar %i min %i s"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad starta"
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad stogga."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Tilkopla Kad (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Tilkopla Kad (brannmura)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Fråkopla Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2fÂ·KB"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "WxCas, aMule nettstatistikk"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "HÃ¸gaste nedlastingsfart medan wxCas har kÃ¸yrt"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Absolutt maksimum nedlastingsfart nokon gong medan wxCas har kÃ¸yrt"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "System"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Stopp. Autooppfrisking"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Lagre nettstatistikkbiletet"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Skriv ut nettstatistikkbiletet"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Innstillingsval"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Om wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Start autooppfrisking"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Autooppfrisking stogga"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Autooppfrisking starta"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Lagre statistikkbilete"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMule nettstatistikk"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Kad kan ikkje nyttast dersom UDP-porten er deaktivert i innstillingar. "
-"Startar ikkje."
+"Det oppstod eit problem med utskrifta.\n"
+"Kanskje er ikkje skrivaren din innstilt skikkeleg?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kad-nettverket er deaktivert i innstillingar. Koplar ikkje til."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Skriv ut"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Greidde ikkje å opne venelista 'emfriends.net' for lesing!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas,Â·aMuleÂ·nettsignaturstatistikk\n"
+"\n"
+"(c)Â·2004Â·ThePolishÂ·<thepolish@vipmail.ru>\n"
+"\n"
+"BasertÂ·pÃ¥Â·CASÂ·avÂ·PedroÂ·deÂ·OliveiraÂ·<falso@rdk.homeip.net>\n"
+"\n"
+"DistribuertÂ·underÂ·GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Greidde ikkje å opne venelista 'enfriends.met' for skriving!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Ã nei, aMule kÃ¸yrer ikkje..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule kÃ¸yrer"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule kÃ¸yrer, men frÃ¥kopla"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule koplar til..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Ã nei, ukjend status for aMule..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " har kÃ¸yrt i "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " er stogga !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " er ikkje tilkopla !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " koplar til..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " gjer noko rart, sjekk det !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " er tilkopla "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "av"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " er pÃ¥ "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " med "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Total nedlasting: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr " Opplasting: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Nedlasting denne Ã¸kta: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Nedlasting: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, opplasting: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Deler: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " filer, klientar i kÃ¸: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Tid: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " pÃ¥ "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Gjennomsnittleg systembelasting (1-5-15Â·min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Oppetid: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Katalog som inneheld amulesig.dat fila"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Skriv inn kvar katalogen som inneheld amulesig.dat fila er"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Oppfriskingsintervall i sekund"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Lag eit statistikkbilete ved kvar oppfriskingshending"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Skriv inn katalogen du vil lage statistikkbiletet i"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Last regelbunde opp statistikkbilete til ein FTP tenar"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP-Url"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTPsti"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Skriv inn URL til FTP tenar"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "Skriv inn katalogen du lastar statistikkbiletet til FTPtenaren til"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Brukar"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Skriv inn brukarnamnet for Ã¥ logge inn pÃ¥ FTPtenaren din"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Skriv inn brukarpassordet for Ã¥ logge inn pÃ¥ FTPtenaren din"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "FTP oppdateringsintervall i minutt"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Validere"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Katalog som inneheld signaturfila di"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Katalog der statistikkbiletet vert laga"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Lastar modell <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "HTTP port for vevtenar"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Bruk UPnP portvidarekopling pÃ¥ vevtenarport"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP port"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Nytt gzipkomprimering"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Fulltilgangspassord for vevtenar"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Gjestepassord for vevtenar"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Gje lÃ¸yve til gjestetilgang"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Nekt gjestetilgang"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Last/lagre vevtenarinnstillingar frÃ¥/til fjern aMule"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMule konfugurasjonsfilsti. IKKJE NYTT DIREKTE!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "DeaktivÃ©r PHP tolk (frÃ¥rÃ¥dd)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "OmkompilÃ©r PHP-sider ved kvar etterspurnad"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule vevtenar"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "vevklientoppkopling godkjend\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Etterspurnaden mislukka med fÃ¸lgjande feil: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Registerfil ikkje funne: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Ãkt utgÃ¥tt - ber om logginn\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Ãkt ok, logga inn\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Ãkt ok, ikkje innlogga\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Inga Ã¸kt opna - vil be om logginn\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Ãkt oppretta - ber om logginn\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Handsamar etterspurnad [original]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Sjekkar passord\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Passord hash feil\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Passord ok\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Feil passord\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Du skreiv ikkje inn eit passord. Tomt passord er ikkje tillate.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Utlogging etterspurt\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Handsamar etterspurnad [omdirigert]: "
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Albansk"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Nedlastingsstatus"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Oppdateringsforseinking: %d sekund"
+#~ msgstr[1] "Oppdateringsforseinking: %d sekund"
+
+#~ msgid "Transferring"
+#~ msgstr "OverfÃ¸rer"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "KR: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "KR: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "I kÃ¸"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - syne framdrifta pÃ¥ eit sÃ¸k"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Opprettar MD4 og AICH hash for fila: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Opprettar MD4 hash for fila: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Opprettar AICH hash for fila: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "ÃTVARING: Kunne ikkje fjerne den opphavelege '%s' etter tryggleikskopi"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "ÃTVARING: Greidde ikkje Ã¥ slette %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Verdigjeving (total):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "ForsÃ¸k Ã¥ overfÃ¸re heile delar til alle opplastingar"
+
+#~ msgid "Networks window"
+#~ msgstr "Nettverksvindauge"
+
+#~ msgid "Searches window"
+#~ msgstr "SÃ¸kevindauge"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Lastar ned"
+
+#~ msgid "Shared files window"
+#~ msgstr "Vindauge for delte filer"
+
+#~ msgid "Messages window"
+#~ msgstr "Meldingsvindauge"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Statistikkgrafvindauge"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Innstillingsvindauge"
+
+#~ msgid "Transfers"
+#~ msgstr "OverfÃ¸ringar"
+
+#~ msgid "Files transfers window"
+#~ msgstr "FiloverfÃ¸ringsvindauge"
+
+#~ msgid "Unban"
+#~ msgstr "Gje amnesti"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Syne opplastingar"
+
+#~ msgid "Show Queue"
+#~ msgstr "Syne kÃ¸"
+
+#~ msgid "Select View"
+#~ msgstr "Vel utsyn"
+
+#~ msgid "Client Software"
+#~ msgstr "Klientmjukvare"
+
+#~ msgid "Waited"
+#~ msgstr "Venta"
+
+#~ msgid "Upload Time"
+#~ msgstr "Opplastingstid"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Opplasting/nedlasting"
+
+#~ msgid "Remote Status"
+#~ msgstr "Fjernstatus"
+
+#~ msgid "File Priority"
+#~ msgstr "Filprioritet"
+
+#~ msgid "Score"
+#~ msgstr "Score"
+
+#~ msgid "Asked"
+#~ msgstr "Spurt"
+
+#~ msgid "Last Seen"
+#~ msgstr "Sist sett"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Kom inn i kÃ¸"
+
+#~ msgid "Transferred Up"
+#~ msgstr "OverfÃ¸rt Opp"
+
+#~ msgid "Transferred Down"
+#~ msgstr "OverfÃ¸rt Ned"
+
+#~ msgid "Userhash"
+#~ msgstr "Brukarhash"
+
+#~ msgid "Encrypted"
+#~ msgstr "KryptÃ©rt"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Syner opplasting / oppkÃ¸a"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Klientar i kÃ¸ :"
+
+#~ msgid "Current Session"
+#~ msgstr "NovÃ©rande Ã¸kt"
+
+#~ msgid "Total"
+#~ msgstr "Totalt"
+
+#~ msgid "Requested :"
+#~ msgstr "Etterspurt :"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "FiloverfÃ¸ringsvindauge"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Brukarar totalt:Â·%sÂ·|Â·Filer totalt:Â·%s"
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Nedlastingar (%i)"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr ""
+#~ "ÃTVARING: Kunne ikkje fjerne den opphavelege '%s' etter tryggleikskopi"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country():Â·Greidde ikkje Ã¥ laste landsdata frÃ¥ "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "FÃ¥ "
+
+#~ msgid "Makes a search."
+#~ msgstr "Lagar eit sÃ¸k."
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Mislukka"
+
+#, fuzzy
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "KÃ¸yre amuleweb ved oppstart"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Avslutt aMule"
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Dei fÃ¸lgjande alternativa har vorte endra i denne utgÃ¥va av "
+#~ "tryggleiksomsyn:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "*Â·StÃ¸tte for protokolltÃ¥keleggjing er aktivert for innkomande og utgÃ¥ande "
+#~ "koplingar.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Oppdatering av tenarlista frÃ¥ andre tenarar og klientar er deaktivert.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "For meir informasjon om Ã¥rsaka for desse endringane, sÃ¸k\n"
+#~ "pÃ¥ \"fake servers\" i wikien til aMule pÃ¥ http://wiki.amule.org.\n"
+#~ "Det er viktig at du tek bort alle falske tenarar frÃ¥ tenarlistafor at "
+#~ "aMule skal fungere skikkeleg."
+
+#~ msgid "Fetching status..."
+#~ msgstr "Hentar status..."
+
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Brukarar:Â·E:Â·%sÂ·K:Â·%sÂ·|Â·FilerÂ·E:Â·%sÂ·K:Â·%s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Klient %sÂ·pÃ¥Â·IP:PortÂ·%s:%dÂ·nyttarÂ·%sÂ·%sÂ·%s"
+
+#~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
+#~ msgstr "theApp->tenarliste->GetServerByAddress()Â·ga attende NULL"
+
+#~ msgid "Firewalled"
+#~ msgstr "Brannmura"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "Lasta %d flagg bitmap"
+#~ msgstr[1] "Lasta %d flagg bitmaps."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr ""
+#~ "Fila %s er for stor for Muldyret: maksimal lovleg filstorleik er 4 GB."
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Ingen handsamar for denne filtypen"
+
+#~ msgid "File was not saved"
+#~ msgstr "Fila vart ikkje lagra"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr ""
+#~ "Greidde ikkje Ã¥ opprette kopling. Ikkje i stand til Ã¥ kople til verten\n"
+
+#~ msgid "Message Filter"
+#~ msgstr "Meldingsfilter"
+
+#~ msgid "Gui Tweaks"
+#~ msgstr "Draktinnstillingar"
+
+#~ msgid "Core Tweaks"
+#~ msgstr "Kjerneinnstillingar"
+
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Tidsforseinking pÃ¥ verktytips i sekund"
+
+#~ msgid "Show part file number before file name"
+#~ msgstr "Syne delfilnummer fÃ¸r filnamn"
+
+#~ msgid "Skin Support"
+#~ msgstr "HudstÃ¸tte"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- ingen huder tilgjengeleg -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Nettsignaturkatalog:"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Filterval:"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Linjekapasitet"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
+#~ msgstr ""
+#~ "Merk: Desse verdiane vert\n"
+#~ " berre nytta til statistikk."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Standard klient TCP-port:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Utvida UDP port for klient:"
+
+#~ msgid "Bind Address"
+#~ msgstr "Bind adresse"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "UDP-port for utvida tenarfÃ¸respurnader (TCP+3): 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Maks kjelder per fil"
+
+#~ msgid "Connection limits"
+#~ msgstr "Koplingsgrense"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "UniversellÂ·PlugÂ·andÂ·Play"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "AktivÃ©r UPnP"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "UPnPÂ·TCP-port:"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Start neste fil pÃ¥ pause nÃ¥r ei fil vert ferdig."
+
+#~ msgid "Check disk space"
+#~ msgstr "Sjekk diskplass"
+
+#~ msgid "Min disk space:"
+#~ msgstr "Minimum diskplass:"
+
+#~ msgid "Incoming"
+#~ msgstr "Innkomande"
+
+#~ msgid "Temporary"
+#~ msgstr "Mellombels"
+
+#~ msgid "Shared"
+#~ msgstr "Delt"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Vel statistikkfargar"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Filframgang i nedlastingskÃ¸"
+
+#~ msgid "Show percentage"
+#~ msgstr "Syne prosent"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Syne framdriftsbar"
+
+#~ msgid "Enable skin support "
+#~ msgstr "Aktiver hudstÃ¸tte"
+
+#~ msgid "Skin:"
+#~ msgstr "Hud:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "Automatisk sortering av filene i nedlastigskÃ¸a (hÃ¸g CPU)"
+
+#~ msgid "Show Fast eD2k Links Handler"
+#~ msgstr "Syne eD2k snÃ¸gglenkjehandsamar"
+
+#~ msgid "Web server port"
+#~ msgstr "Vevtenarport"
+
+#~ msgid "Enable UPnP port forwarding on the web server port"
+#~ msgstr "Aktiver UPnP portvidaresending pÃ¥ vevtenarporten"
+
+#~ msgid "Web server UPnP TCP port"
+#~ msgstr "Vevtenar UPnP TCP port"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "IP for lyttande grensesnitt\n"
+#~ "(tom for einkvar)"
+
+#~ msgid "TCP port"
+#~ msgstr "TCP-port"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Kven kan sjÃ¥ delte filer:"
+
+#~ msgid "Event types"
+#~ msgstr "Hendingstypar"
+
+#~ msgid "ERROR: can not accept web client connection\n"
+#~ msgstr "FEIL: kan ikkje godkjenne vevklientkopling\n"
+
+#~ msgid ""
+#~ "Your Auto-update server list is empty.\n"
+#~ "'Auto-update server list at startup will be disabled."
+#~ msgstr ""
+#~ "Tenarlista for automatisk oppdatering er tom.\n"
+#~ "Tenarlista for automatisk oppdatering ved oppstart er ikkje aktivert."
+
+#~ msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "FEIL: Ugangbar part.met filutgÃ¥ve: %s ==> %s"
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "FÃ¥r aMule til Ã¥ be om stadfesting fÃ¸r avslutting."
+
+#~ msgid "Bandwith limits"
+#~ msgstr "Bandbreiddegrenser"
+
+#~ msgid "This UDP port is used for extended ed2k requests and Kad network"
+#~ msgstr ""
+#~ "Denne UDP porten vert brukt til utvida eD2k etterspurnader og til "
+#~ "kadnettverket"
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Syne dataoverskotsbandbreidde"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. aktiv"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICH stolar pÃ¥ alle hashar (ikkje tilrÃ¥dd)"
+
+#~ msgid "Disk space"
+#~ msgstr "Diskplass"
+
+#~ msgid "Create Backup for preview"
+#~ msgstr "Opprett tryggleikskopi for fÃ¸rehandssyning"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Avanserte innstillingar"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Stil pÃ¥ framdriftsbar"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Kolonnesortering"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Ymse draktinnstillingar"
+
+#~ msgid "File Options"
+#~ msgstr "Filinnstillingar"
+
+#~ msgid "Status text"
+#~ msgstr "Statustekst"
+
+#~ msgid "Pop-up status text"
+#~ msgstr "Utsprett status tekst"
+
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr " 'All-platform' p2p klient bygd pÃ¥ eMule \n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr " Vevside: http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr " Forum: http://forum,amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr "OSS: http://wiki.amule.org \n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " Kontaktadmin@amule.org (administrative saker) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ " Opphavsrett (c) 2003-2008 aMule Team \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr "Ein del av aMule er bygd pÃ¥ \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " Opphavsrett (c) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "For ein film kan du skrive lengda, historia, sprÃ¥ket ...\n"
+#~ "og dersom den er falsk kan du fortelje det til andre brukarar."
+
+#~ msgid "Misc Options"
+#~ msgstr "Ymse brukarval"
+
+#~ msgid "Server Options"
+#~ msgstr "Tenarval"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Syne tenar motd nÃ¥r tilkopla ..."
+
+#~ msgid "eD2k Info"
+#~ msgstr "eD2k info"
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Deaktivere/Aktivere"
+
+#~ msgid "Authentication"
+#~ msgstr "Godkjenning"
+
+#~ msgid "General Settings"
+#~ msgstr "Brukarval"
+
+#~ msgid "Hard limit"
+#~ msgstr "Hard grense"
+
+#~ msgid "Max Connections"
+#~ msgstr "Maks koplingar"
+
+#~ msgid "GUI Tweaks"
+#~ msgstr "Draktinnstillingar"
+
+#~ msgid "Remote Control"
+#~ msgstr "Fjernkontroll"
+
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Ikkje i stand til Ã¥ fastslÃ¥ valt vevlesar!"
+
+#~ msgid "User Defined"
+#~ msgstr "Brukardefinert"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.orgÂ·-Â·Linux-muldyret"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Vel nettlesar her"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Eigenvalt nettlesar"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Skriv nettlesarnamnet her. For Ã¥ nytte ein eigen nettlesar, vel ein i "
+#~ "nedtrekksmenyen over."
+
+#~ msgid "Please wait... "
+#~ msgstr "VÃ©r god Ã¥ vente..."
+
+#~ msgid "Could not determine the command for running the browser."
+#~ msgstr "Fann ikkje kommando for Ã¥ kÃ¸yre nettlesar."

aMule-2.2.6.tar.bz2/po/pl.po -> aMule-2.3.1.tar.bz2/po/pl.po Changed

@@ -1,20 +1,22 @@
 # translation of pl.po to
 # aMule i18n resource file.
-# Copyright (C) 2004 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the aMule package.
 # Kry <elkry@users.sourceforge.net>, 2004.
 # Ogon <ogon@interia.pl>, 2004, 2005.
 # Mateusz Butowski <>, 2007, 2008.
-# Michał Trzebiatowski <hippie_1968@hotmail.com>, 2008, 2009.
+# Michał Trzebiatowski <hippie_1968@hotmail.com>, 2008, 2009, 2010.
+#
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-03-04 17:59+0100\n"
-"Last-Translator: \n"
-"Language-Team: Michał Trzebiatowski <hippie_1968@hotmail.com>\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,1302 +26,1144 @@
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: POLAND\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Musisz określić hasło."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Nieprawidłowe hasło, nie skrót MD5!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Błąd połączenia"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "Połączenie EC nieudane. Pusta odpowiedź."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "External Connection: Brak dostępu z powodu: "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "External Connection: Brak dostępu"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "External Connection: Zła odpowiedź serwera. Zakończono połączenie."
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Dodaj znajomego"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Sukces! Nawiązano połączenie z aMule"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Musisz wpisać poprawne IP oraz port!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Sukces! Nawiązano połączenie."
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Informacje"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Tworzenie skrótu"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Wybrany skrót użytkownika jest niepoprawny!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Zakańczanie"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Nie udało się otworzyć pliku ED2KLinks."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Ukończono"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"UWAGA: Nie możesz dodać samego siebie jako źródło linku ed2k, gdy masz lowid."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Wstrzymano"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Teraz, zakańczam główną aplikację..."
+
+#: src/amule.cpp:258
+#, fuzzy, c-format
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Zakańczam instancję amuleweb z pid `%ld' ... "
+
+#: src/amule.cpp:261
+#, fuzzy, c-format
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Zabiłam instancję amuleweb z pid `%ld' ... "
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Błędne"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Nieudane"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Pobieranie"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: Zakończenie jądra."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Czeka"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "Zamykanie aMule zakończone."
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Rozpoczynam tworzenie skrótu MD4 i AICH dla pliku: %s"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Wyniki debugu pamięci dla wyjścia aMule:"
 
-#: src/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Rozpoczynam tworzenie skrótu MD4 dla pliku: %s"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+"\n"
+"Konfiguracja EC"
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Rozpoczynam tworzenie skrótu AICH dla pliku: %s"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Ustawione hasło i włączone połączenia zewnętrzne."
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Konwertuję stare zestawy skrótów AICH w '%s' do 64b w '%s'."
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "UWAGA"
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
 msgstr ""
-"UWAGA: Nazwa pliku '%s' jest nieprawidłowa i została zmieniona na '%s'."
-
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "UWAGA: Plik '%s' już istnieje, zmieniono nazwę na '%s'."
-
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "UWAGA: Nie można usunąć oryginału '%s' po wykonaniu kopii zapasowej"
+"Twoje ustawienia lokalne zostały zmienione na domyślne systemowe w związku "
+"ze zmianą konfiguracji. Przepraszamy."
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "UWAGA: Nie udało się usunąć pliku %s"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Informacje"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Nieudane pobieranie udostępnionych plików od użytkownika '%s'"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Nie masz żadnego serwera na twojej liście serwerów.\n"
+"Czy chcesz, żeby aMule pobrał nową listę teraz?"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Nieznany"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Pobieranie listy serwerów"
 
-#: src/BaseClient.cpp:1738
+#: src/amule.cpp:654
 #, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Fałszywa wersja eMule %#x)"
+msgid "web server running on pid %d"
+msgstr "serwer sieciowy uruchomiony na pid %d"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Fałszywy eMule)"
+#: src/amule.cpp:658
+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 ""
+"Zażądałeś włączenia serwera sieciowego podczas uruchomienia, ale binarki "
+"amuleweb nie mogą być uruchomione. Zainstaluj paczkę zawierającą serwer "
+"sieciowy aMule lub skompiluj aMule używając --enable-webserver i uruchom "
+"make install"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Fałszywy eMule)"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "BŁĄD"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:741
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (oparty na eMule v0.%u)"
+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/BaseClient.cpp:1960
+#: src/amule.cpp:768
 #, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Użytkownik: %s ID: %u"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Port %u jest niedostępny. Będziesz mieć LowID\n"
 
-#: src/BaseClient.cpp:1962
+#: src/amule.cpp:774
 #, c-format
-msgid "Requested: %s\n"
-msgstr "Zażądano:  %s\n"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Port %u jest niedostępny!\n"
+"\n"
+"To oznacza, że będziesz mieć LowID.\n"
+"\n"
+"Sprawdź swoją sieć aby mieć pewność, że port jest otwarty dla wejścia i "
+"wyjścia."
 
-#: src/BaseClient.cpp:1964
-#, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statystyki plików tej sesji: Zaakceptowano %d z %d żądania, %s przesłano\n"
-msgstr[1] ""
-"Statystyki plików tej sesji: Zaakceptowano %d z %d żądań, %s przesłano\n"
-msgstr[2] ""
-"Statystyki plików tej sesji: Zaakceptowano %d z %d żądań, %s przesłano\n"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Nie udało się utworzyć pliku podpisu online"
 
-#: src/BaseClient.cpp:1967
-#, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statystyki plików dla wszystkich sesji: Zaakceptowano %d z %d żądania, %s "
-"przesłano\n"
-msgstr[1] ""
-"Statystyki plików dla wszystkich sesji: Zaakceptowano %d z %d żądań, %s "
-"przesłano\n"
-msgstr[2] ""
-"Statystyki plików dla wszystkich sesji: Zaakceptowano %d z %d żądań, %s "
-"przesłano\n"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Nie udało się utworzyć pliku podpisu online aMule"
 
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Zażądano nieznany plik"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"Wybrane lokale wydają się być niezainstalowane. (Uwaga: I tak spróbuję je "
+"ustawić)"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:1040
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Klient %s na IP:Port %s:%d używający %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Znajomi"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Pokaż &szczegóły"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Dodaj znajomego"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Usuń znajomego"
+msgid "This is the first time you run aMule %s"
+msgstr "Po raz pierwszy uruchomiłeś aMule %s"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Wyślij &wiadomość"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Ta wersja jest aktualizowaną codziennie wersją testową i\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Pokaż pliki"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr ""
+"nie dajemy żadnej gwarancji, że nie zniszczy ona niczego, nie spali twojego "
+"domu\n"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Ustaw slot dla znajomego"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"lub zabije twojego psa. *Powinna* ona jednak mimo wszystko działać "
+"poprawnie.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Jesteś pewien, że chcesz usunąć wybranego przyjaciela?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Więcej informacji, pomoc i nowe wydania znajdziesz na naszej stronie \n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Jesteś pewien, że chcesz usunąć wybranych przyjaciół?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "www.aMule.org lub na naszym kanale IRC: #aMule na irc.freenode.net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Anuluj"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Nie wahaj się zgłaszać jakichkolwiek błędów na http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Nie możesz ustanowić więcej niż jeden slot dla znajomego.\n"
-"Przydzielono tylko jeden slot."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Wybór wielu"
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Pobieranie zakończone"
-
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Pełna ścieżka do pliku."
-
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Nazwa pliku bez jego ścieżki."
+"Katalog wybrany na pliki sygnatury online jest nieprawidłowy!\n"
+" Sygnatura online zostanie wyłączona dopóki nie poprawisz tego w "
+"preferencjach."
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "Skrót eD2k pliku."
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Zawiadomiono nazwę hostu serwera"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Rozmiar pliku w bajtach."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Wstępna alokacja dysku dla pliku '%s' nie powiodła się: %s"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Łączny czas aktywności w pobieraniu."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "BŁĄD: nie mogę otworzyć pliku logów"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Rozpoczęto nową sesję czatu"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "UWAGA: plik logów jest pusty. Coś jest nie tak."
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Nadawca wiadomości."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Logi zostały zresetowane"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Brak miejsca"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Wiadomość z serwera: %s"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Partycja dysku."
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "Pominięto pobranie %s, ponieważ żądany plik nie jest nowszy."
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Błąd podczas ukończenia"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Pobieranie listy węzłów nie powiodło się."
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Nazwa pliku"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Nie można otworzyć pobranego pliku kontroli wersji"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Rozmiar"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Uszkodzony plik kontorli wersji"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Typ"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Używasz przestarzałej wersji aMule!"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Priorytet"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Twoje wersja eMule to %i.%i.%i, najnowszą wersją jest %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "ID pliku"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Najnowsza wersja jest zawsze dostępna na http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Żądania"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "UWAGA: Twoja wersja aMule jest przestarzała: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Zaakceptowane żądania"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Twoja kopia aMule jest przestarzała."
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Przesłane dane"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Nie udało się pobrać pliku kontroli wersji"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Ratio wymiany"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Użytkowników: %s | Plików: %s"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Otrzymane części"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Użytkowników: E: %s K: %s | Plików: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Pełne źródła"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Nie wybrano sieci"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Ścieżka katalogu"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "z LowID"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Udostępnione pliki"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "z HighID"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Bardzo niski"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Połączony z %s %s"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Niski"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Łączenie z %s"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normalny"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Rozłączono z eD2k"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Wysoki"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Włączono Kad."
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Bardzo wysoki"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Zatrzymano Kad."
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Wydanie"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Połączono z Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Automatyczny"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Połączono z Kad (za firewallem)"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Dodaj komentarz/ocenę"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Rozłączono z Kad"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Edytuj komentarz/ocenę"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Nie można użyć sieci Kad, jeśli port UDP jest wyłączony w preferencjach, nie "
+"włączam."
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Zmień nazwę"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Zablokowano sieć Kad w preferencjach, nie łączę."
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Dodaj pliki kolekcji do listy pobierania"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"BŁĄD: daemon aMule nie może być użyty, gdy zewnętrzne połączenia są "
+"zablokowane. Aby włączyć połączenia zewnętrzne użyj normalnego aMule, włącz "
+"amuled z opcją --ec-config lub ustaw klucz \"AcceptExternalConnections\" na "
+"1 w pliku ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Skopiuj magnet &URI do schowka"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"BŁĄD: Potrzebne jest ważne hasło do korzystania z zewnętrznych połączeń, a "
+"daemon aMule nie może używany być bez zewnętrznych połączeń. Aby uruchomić "
+"deamon aMule, musisz ustawić pole \"ECPassword\" w pliku ~/.aMule/amule."
+"conf~ z odpowiednią wartością. Wykonaj amuled z flagą --ec-config aby "
+"ustawić hasło. Więcej informacji można znaleźć na http://wiki.amule.org"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: OnInit - począwszy timer"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: rozdzielanie tła - do zobaczenia"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Nie można utworzyć pliku Pid"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Kopiuj &link eD2k do schowka"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "BŁĄD: %s"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Kopiuj link eD2k do schowka (Ź&ródło)"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "To jest aMule %s oparty na eMule."
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Kopiuj link eD2k do schowka (Źródło) (&Z opcjami Crypt)"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Uruchomiony na %s"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Kopiuj link eD2k do schowka (Nazwa &hosta)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Odwiedź http://www.amule.org aby sprawdzić czy jest dostępna nowa wersja."
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr "Kopiuj link eD2k do schowka (Nazwa hosta) (Z opcjami &Crypt)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "KRYTYCZNY BŁĄD: Nie udało się utworzyć Timera"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Kopiuj link eD2k do schowka (Informacje &AICH)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "zdalna kontrola aMule "
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Kopiuj wynik do schowka"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Zrzut ekranu:"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:501
 msgid ""
-"Feedback from: %s (%s)\n"
+"'All-Platform' p2p client based on eMule \n"
 "\n"
 msgstr ""
-"Informacja zwrotna od:  %s (%s)\n"
+"\"Ogólnie-Platformy\" klient P2P oparty na eMule\n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Potrzebujesz HighID, aby stworzyć poprawny link źródłowy"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "UWAGA"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Udostępnione pliki (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[Plik części]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Wprowadź nową nazwę dla tego pliku:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Zmień nazwę"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Wznawianie wysyłania pliku: %s"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Strona internetowa: http://www.amule.org \n"
 
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Wstrzymywanie wysyłania pliku: %s"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Forum: http://forum.amule.org \n"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "Tekstowy klient aMule"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: wyszukiwana fraza jest za krótka"
-
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Wczytaj %u kontakt Kad"
-msgstr[1] "Wczytaj %u kontakty Kad"
-msgstr[2] "Wczytaj %u kontaktów Kad"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Tylko %d dostępny kontakt KAD, nodes.dat nie zapisane"
-msgstr[1] "Tylko %d dostępne kontakty KAD, nodes.dat nie zapisane"
-msgstr[2] "Tylko %d dostępnych kontaktów KAD, nodes.dat nie zapisane"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Kontakt: admin@amule.org (kwestie administracyjne) \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Zapisano %d kontakt Kad"
-msgstr[1] "Zapisano %d kontakty Kad"
-msgstr[2] "Zapisano %d kontaktów Kad"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 Zespół aMule \n"
+"\n"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "BŁĄD: nie można nasłuchiwać na porcie TCP."
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Część aMule oparta jest na \n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "zaakceptowano połączenie klienta sieciowego\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: routing peer-to-peer oparty na metryce XOR.\n"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "BŁĄD: nie można zaakceptować połączenia klienta sieciowego\n"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Wiadomość"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Żądanie nie powiodło się z powodu błędu: %s."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "dialog aMule zniszczony"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Żądanie nie powiodło się z powodu nieznanego błędu."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Łączenie"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Nie znaleziono pliku indeksu: "
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Łączenie"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Sesja wygasła - żądanie loginu\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Rozłączony"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sesja ok, zalogowano\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Za firewallem"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sesja ok, nie zalogowano\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Połączony"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Nie otwarto sesji - zażądam loginu\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Łączenie"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Utworzono sesję - żądam loginu\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Wyłączony"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Przetwarzam żądanie (oryginalne): "
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Anuluj"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Sprawdzam hasło\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Zatrzymaj aktualne próby połączenia"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Nieprawidłowy skrót hasła\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Rozłącz"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Hasło ok\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Rozłącz z aktualnie połączonymi sieciami"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Złe hasło\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Podłącz"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Nie wprowadziłeś hasła. Puste hasło nie jest dozwolone.\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Połącz z aktualnie włączonymi sieciami"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Zażądano wylogowania\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Wysł: %.1f(%.1f) | Pobr: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Przetwarzam żądanie (przekierowane): "
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Wysł: %.1f | Pobr: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Ładuje szablon <str>"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Połączony)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Port HTTP serwera sieciowego"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Rozłączony)"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Użyj forwardowania portu UPnP na porcie serwera sieciowego"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Czy na pewno chcesz opuścić %s?"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Port UPnP"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Potwierdzenie wyjścia"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Używaj kompresji gzip"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Uruchomienie polecenia: "
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- domyślnie -"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Hasło pełnego dostępu do serwera sieciowego"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Katalog skórek '%s' nie istnieje"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Hasło gościa do serwera sieciowego"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "OSTRZEŻENIE: Nie udało się otworzyć pliku skórki '%s' do odczytu"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Pozwól na dostęp gości"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Sieci"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Zabroń dostępu gościom"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Okno sieci"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Wczytaj/zapisz ustawienia serwera sieciowego z/do zdalnego aMule"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Szukaj"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Ścieżka do pliku konfiguracyjnego aMule. NIE UŻYWAJ BEZPOŚREDNIO!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Okno wyszukiwania"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Zablokuj interpreter PHP (wycofywany)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Pobieranie"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Przekompiluj strony PHP przy każdym żądaniu"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Okno pobierań"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Serwer WWW aMule"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Udostępnione pliki"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Niedostępny"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Okno udostępnionych plików"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Nigdy"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Wiadomości"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Pobieranie..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Okno wiadomości"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statystyki"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "Oczekiwane %d bajtów, ale pobrane zostało %d bajtów"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Okno wykresów statystyk"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Katalog zawierający plik amulesig.dat"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Przeglądaj"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Podaj katalog z twoim plikiem amulesig.dat"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Czas pomiędzy odświeżeniami w sekundach"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Generuj obrazek statystyk przy każdym odświeżeniu"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Okno preferencji"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Wpisz katalog, w którym chcesz generować obrazki statystyk"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Import"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Wysyłaj cyklicznie twój obrazek statystyk na serwer FTP"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Narzędzie importowania plików części"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "Url FTP"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Informacje o"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Ścieżka FTP"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Informacje/Pomoc"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Wpisz URL twojego serwera FTP"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Sieć eD2k"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "Wpisz katalog do składowania twoich obrazków statystyk na serwerze FTP"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Sieć Kad"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Użytkownik"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Brak sieci"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Hasło"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "Pilot aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Wpisz nazwę użytkownika. aby zalogować się do twojego serwera FTP"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Wpisz hasło użytkownika. aby zalogować się do twojego serwera FTP"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Krytyczny Błąd: Nie udało się utworzyć Timera Core"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Czas pomiędzy odświeżeniami FTP w minutach"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Podłączony do zdalnego amule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Sprawdź"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Krytyczny Błąd: Nie udało się utworzyć Timera Poll"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Przechodzę do pętli wydarzenia..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Łączenie..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Katalog zawierający twój plik sygnatury"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Nieudane połączenie "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Katalog gdzie będzie wygenerowany statyczny obrazek"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Zdalne GUI EC obsługi zdarzenia"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Zamykanie"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i dni %i godzin %i minut %i "
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, statystyki aMule online"
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Połączenie nie powiodło się. Nie można połączyć się z %s:%d\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Witamy!"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Połączenie zostało zamknięte - aMule prawdopodobnie zakończone."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Gotowy"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Maksymalna szybkość DL od czasu uruchomienia wxCas"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Wszystkie"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
-"Absolutne maksimum szybkości DL podczas poprzedniego uruchomienia wxCas"
+"Nie można utworzyć katalogu '%s' dla kategorii '%s', używany jest nadal "
+"katalog '%s'."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Resetuj"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Nieznany"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "System"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Nieudane pobieranie udostępnionych plików od użytkownika '%s'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Zatrzymaj automatyczne odświeżanie"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Szukam kolegi dla połączenia lowid"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Zapisz obrazek statystyk online"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Fałszywa wersja eMule %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Wydrukuj obrazek statystyk online"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Fałszywy eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Ustawienia preferencji"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Fałszywy eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Informacje o wxCas"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (oparty na eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Rozpocznij automatyczne odświeżanie"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Użytkownik: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Automatyczne odświeżanie zatrzymane"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Zażądano:  %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "automatyczne odświeżanie rozpoczęte"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statystyki plików tej sesji: Zaakceptowano %d z %d żądania, %s przesłano\n"
+msgstr[1] ""
+"Statystyki plików tej sesji: Zaakceptowano %d z %d żądań, %s przesłano\n"
+msgstr[2] ""
+"Statystyki plików tej sesji: Zaakceptowano %d z %d żądań, %s przesłano\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Zapisz obrazek statystyk"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statystyki plików dla wszystkich sesji: Zaakceptowano %d z %d żądania, %s "
+"przesłano\n"
+msgstr[1] ""
+"Statystyki plików dla wszystkich sesji: Zaakceptowano %d z %d żądań, %s "
+"przesłano\n"
+msgstr[2] ""
+"Statystyki plików dla wszystkich sesji: Zaakceptowano %d z %d żądań, %s "
+"przesłano\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Statystyki aMule online"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Zażądano nieznany plik"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
-"Wystąpił problem podczas drukowania.\n"
-"Może nie masz prawidłowo ustawionej drukarki ?"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Wiadomość przefiltrowana od '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Drukuję"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nowa wiadomość od '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
 msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"wxCas, statystyki aMule online\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Oparte na CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Dystrybucja na zasadach GPL"
+"Użytkownik %s (%u) zażądał twojej listy plików udostępnionych w katalogu %s -"
+"> Odmówiono"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Och och, aMule nie jest uruchomiony..."
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "UWAGA: %s nie może być otwarty."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule jest uruchomiony"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+"OSTRZEŻENIE: Anulowana lista plików uszkodzona, zawiera nieprawidłowy "
+"nagłówek."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule jest uruchomiony, ale nie połączony"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Błąd IO podczas odczytu pliku %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule łączy się..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Błąd podczas zapisywania pliku %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Och och, status aMule jest nieznany..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Wpisz Captcha"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " jest uruchomiony od "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nowa kategoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " jest zatrzymany !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Wybierz folder na pobierane pliki"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " jest nie połączony!"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Musisz określić nazwę kategorii!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " łączy się..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Musisz określić ścieżkę dla kategorii!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " robi coś dziwnego, sprawdź to !"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Nie udało się utworzyć katalogu przychodzących dla kategorii. Proszę podać "
+"właściwą ścieżkę!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " jest połączony z "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Rozpoczęto sesję czata: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Połączony do klienta ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Łączenie z klientem ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "za firewallem"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Nie udało się połączyć do klienta / Połączenie utracone ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "wyłączony"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr "*** Zdałeś captcha i użytkownik otrzymał twoją wiadomość. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " jest włączony "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** Twoja odpowiedz na captcha była nieprawidłowa i wiadomość ta została "
+"zignorowana. Możesz otrzymać kolejną captcha wysyłając nową wiadomość. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " z "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Chat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Razem pobranych: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Zamknij kartę"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Wysłanych: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Zamknij wszystkie karty"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Pobranych w sesji: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Zamknij inne karty"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Pobranych: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Dodaj do znajomych"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Wysłanych: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Plik kredytów załadowany, %u klient jest znany"
+msgstr[1] "Plik kredytów załadowany, %u klientów jest znanych"
+msgstr[2] "Plik kredytów załadowany, %u klientów jest znanych"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Kredyty wygasły dla %u klienta!"
+msgstr[1] " - Kredyty wygasły dla %u klientów!"
+msgstr[2] " - Kredyty wygasły dla %u klientów!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Udostępnione: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Nie znaleziono pliku cryptkey.dat, tworzenie."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " plik(ów), Klientów w kolejce: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Szczegóły klienta"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Czas: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LowID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " na "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Włączony"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Średnie obciążenie systemu (1-5-15 min): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Obsługiwany"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Uptime systemu: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Nieobsługiwany"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Wyłączony"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Połączony"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Rozłączony"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02us"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LowID"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Niekompletne"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Nie połączony"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Zły człowiek"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Weryfikacja - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Niedostępne"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr ""
+"Użytkownik %s (%u) zażądał twojej listy udostępnionych plików-> Zaakceptowano"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+"Użytkownik %s (%u) zażądał twojej listy udostępnionych plików -> Odmówiono"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Anulowano !"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr ""
+"Użytkownik %s (%u) zażądał twojej listy udostępnionych katalogów -> "
+"Zaakceptowano"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "Unable to open %s"
-msgstr "Nie mogę otworzyć %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Parametry wejściowe"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Plik do skracania"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Dodaj opcjonalny URL dla tego pliku"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Wprowadź tutaj plik, którego link eD2k chcesz obliczyć"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+"Użytkownik %s (%u) żążądał twojej listy udostępnionych katalogów -> Odmówiono"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Wprowadź tutaj adres URL, który chcesz dodać do linku eD2k: Dodaj / na "
-"końcu, aby pozwolić aLinkCreator dodać nazwę obecnego pliku"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Usuń"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Wyczyść"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Utwórz link ze skrótami części"
+"Użytkownik %s (%u) zażądał twojej listy plików udostępnionych w katalogu %s -"
+"> Zaakceptowano"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Pomóż rozpowszechniać nowe i rzadkie pliki szybciej, kosztem zwiększenia "
-"rozmiaru linku"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Skrót typu MD4 pliku"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "Skrót eD2k pliku"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "Link eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Start"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Zapisz"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Skopiuj do schowka"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Wyjdź"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Otwórz"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Otwórz plik, by obliczyć jego link eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopiuj"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Kopiuj obliczony link ED2k do schowka"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Zapisz jako"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Zapisz obliczony link ED2k do pliku"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Informacje o"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Informacje o aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Zaznacz plik, którego link eD2k chcesz obliczyć"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Nie można otworzyć schowka"
+"Użytkownik %s (%u) zażądał twojej listy plików udostępnionych w katalogu %s -"
+"> Odmówiono"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "W tej chwili nie ma nic do skopiowania !"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Użytkownik %s (%u) udostępnia katalog %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Wybierz plik do twojego obliczonego linku eD2k"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Użytkownik %s (%u) wysłał niechciane katalogi udostępnione."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Nie mogę otworzyć "
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "Użytkownik %s (%u) wysłał listę plików udostępnionych w katalogu %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Proszę wpisać nazwę pliku"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Użytkownik %s (%u) zakończył wysyłanie listy udostępnionych plików"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "W tej chwili nie ma nic do zapisania !"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Użytkownik %s (%u) wysłał niechcianą listę udostępnionych plików"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
-"aLinkCreator, kreator aMule linków eD2k\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Ikony z http://www.everaldo.com oraz http://www.icomania.com\n"
-"i http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Dystrybucja na zasadach GPL"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Tworzę skrót..."
+"Użytkownik %s (%u) odmówił dostępu do listy udostępnionych plików/katalogów"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator pracuje dla Ciebie"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Komentarze pliku"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Obliczam hash MD4..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Nazwa użytkownika"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Obliczam hashy eD2k..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Nazwa pliku"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Gotowe w %.2f ach"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Ocena"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Masz już dodany ten URL !"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Komentarz"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Proszę wpisać adres URL"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Bez komentarza"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Przetwarzanie pliku numer %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Pytałeś o skróty części (Używane tylko dla plików > 9.5 MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u komentarz"
+msgstr[1] "%u komentarze"
+msgstr[2] "%u komentarzy"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Nie istniejący plik !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, kreator linków eD2k aMule"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"Zbanowany klient %s za wysyłanie %s uszkodzonych danych z %s dla pliku '%s'"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1333,31 +1177,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Wy]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Łączenie"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Bardzo niski"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Niski"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normalny"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Wysoki"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Bardzo wysoki"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Wydanie"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Pytam"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Połączenie przez serwer"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Pełna kolejka"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "W kolejce"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Przesyłam"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Pobieranie"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1383,8 +1253,7 @@
 msgid "Too many Kad connections"
 msgstr "Zbyt dużo połączeń Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Zbanowany"
 
@@ -1416,8 +1285,8 @@
 msgid "Remote Server"
 msgstr "Serwer zdalny"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1441,8 +1310,8 @@
 msgid "Search Result"
 msgstr "Wynik wyszukiwania"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Zakończono"
 
@@ -1466,7 +1335,7 @@
 msgid "ERROR: Failed!"
 msgstr "BŁĄD: Niepowodzenie!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "W kolejce"
 
@@ -1478,881 +1347,304 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Nieznany lub błędny format pliku tymczasowego."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Domyślny systemowy"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Część"
 
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albański"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabski"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturyjski"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Baskijski"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bułgarski"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Kataloński"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Chiński (Uproszczony)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Chiński (Tradycyjny)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Chorwacki"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Czeski"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Duński"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Holenderski"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Angielski (U.K.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estoński"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Fiński"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Francuski"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galicyjski"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Niemiecki"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Grecki"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hebrajski"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Węgierski"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Włoski"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Włoski (Szwajcarski)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japoński"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Koreański"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Litewski"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norweski (Nynorsk)"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Rozmiar"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polski"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Przesłano"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugalski"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Prędkość"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugalski (Brazylijski)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Postęp"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Rosyjski"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Źródła"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Słoweński"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Priorytet"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Hiszpański"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Status"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Szwedzki"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Pozostało czasu"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turecki"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Ostatnio widziano cały"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ukraiński"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Ostatnio widziany"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Nie można ustalić wybranej przeglądarki!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Jesteś pewien, że chcesz usunąć wybrany plik?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"Port TCP nie może być większy niż 65532, gdyż gniazdo UDP serwera będzie TCP"
-"+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Jesteś pewien, że chcesz usunąć wybrane pliki?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Zostanie użyty domyślny port (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Nazwa serwera"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adres"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Opis"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Użytkowników"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Pliki"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Nieudane"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Stałe"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Wersja"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Próbujesz usunąć serwer z którym jesteś połączony. Proszę się najpierw "
-"rozłączyć. Serwer NIE został usunięty."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Informacje"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Nieznana nazwa)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Na pewno chcesz usunąć serwer statyczny %s"
+"Informacja zwrotna od:  %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Tak"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Automatyczny"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Nie"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Zatrzymaj"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Nie udało się otworzyć '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pauza"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Serwery (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Wznów"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Serwer"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "Wyczyść s&kończone"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Połącz z serwerem"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Przerzuć wszystkie A4AF do tego pliku"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Oznacz serwer jako statyczny"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Przerzuć wszystkie A4AF do tego pliku (Auto)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Oznacz serwer jako nie statyczny"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Przerzuć wszystkie A4AF do każdego innego pliku"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Oznacz serwery jako statyczne"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Zaawansowane opcje"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Oznacz serwery jako nie statyczne"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Podgląd"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Usuń serwer"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Pokaż &szczegóły pliku"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Usuń serwery"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Pokaż wszystkie komentarze"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Usuń wszystkie serwery"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Skopiuj magnet URI do schowka"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Skopiuj link eD2k do schowka"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Kopiuj &link eD2k do schowka"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Skopiuj linki eD2k do schowka"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Kopiuj informację zwrotną do schowka"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Połącz ponownie z serwerem"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "nieprzydzielony"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Na pewno chcesz usunąć wszystkie serwery?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Przydziel do kategorii"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Jesteś pewien, że chcesz usunąć wybrany serwer?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Otwórz plik"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Jesteś pewien, że chcesz usunąć wybrane serwery?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Wprowadź nową nazwę dla tego pliku:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Wyłączone [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Zmień nazwę"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "To jest aMule %s oparty na eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Uruchomiony na %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Odwiedź http://www.amule.org aby sprawdzić czy jest dostępna nowa wersja."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "KRYTYCZNY BŁĄD: Nie udało się utworzyć Timera"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "zdalna kontrola aMule "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Zrzut ekranu:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" 'Wieloplatformowy' klient p2p oparty na eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Strona domowa: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Forum: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Kontakt: admin@amule.org (sprawy administratorskie) \n"
+msgid "Downloads (%i)"
+msgstr "Pobieranie (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 Zespół aMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Część aMule jest oparta na \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: routing peer-to-peer oparty na metryce XOR.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Wiadomość"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Łączenie"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Rozłączony"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Za firewallem"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Połączony"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Łączenie"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Wyłączony"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Zatrzymaj aktualne próby połączenia"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Rozłącz"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Rozłącz z aktualnie połączonymi sieciami"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Podłącz"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Połącz z aktualnie włączonymi sieciami"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Wysł: %.1f(%.1f) | Pobr: %.1f(%.1f)"
+"Aby zapobiec pojawianiu się tego komunikatu przy każdym podglądzie,\n"
+"ustaw swój odtwarzacz wideo w preferencjach (domyślny jest mplayer)."
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Wysł: %.1f | Pobr: %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Podgląd pliku"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Połączony)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "BŁĄD: Nie udało się uruchomić zewnętrznego odtwarzacza! Komenda: `%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Rozłączony)"
+msgid "Saving PartFile %u of %u"
+msgstr "Zapisywanie pliku części %u z %u"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Czy na pewno chcesz opuścić aMule?"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Wszystkie pliki części zapisane."
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Potwierdzenie wyjścia"
-
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Katalog skórek '%s' nie istnieje"
+msgid "Loading temp files from %s."
+msgstr "Ładowanie plików tymczasowych z %s."
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "OSTRZEŻENIE: Nie udało się otworzyć pliku skórki '%s' do odczytu"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Sieci"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Okno sieci"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Szukaj"
+msgid "Loading PartFile %u of %u"
+msgstr "Ładowanie pliku części %u z %u"
 
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Okno wyszukiwania"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Transfery"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Okno transferu plików"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Udostępnione pliki"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Okno udostępnionych plików"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Wiadomości"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Okno wiadomości"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statystyki"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Okno wykresów statystyk"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Okno ustawień preferencji"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Import"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Narzędzie importowania plików części"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Informacje/Pomoc"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "Sieć eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Sieć Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Brak sieci"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Ogólne"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Połączenie"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Katalogi"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Serwery"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Bezpieczeństwo"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Interfejs"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filtry"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Zdalna kontrola"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Sygnatura Online"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Zdarzenia"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Debugowanie"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Użytkownika"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"aMule musi zostać zrestartowany przed wprowadzeniem tych zmian:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- Zmieniono port TCP.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- Zmieniono port UDP.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"Twoja lista automatycznych aktualizacji serwerów jest pusta.\n"
-"Aktualizowanie listy serwerów podczas uruchamiania zostanie wyłączone."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Połączenia zewnętrzne zostały włączone, ale nie zostało podane hasło.\n"
-"Połączenia zewnętrzne nie mogą być włączone dopóki nie zostanie podane "
-"poprawne hasło."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Zmieniono język.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Zmieniono folder tymczasowy.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- Sieć ED2K włączona.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Wysł: 0.0 | Pobr: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Zarówno sieć eD2K jak i Kad zostały wyłączone.\n"
-"Nie będzie możliwe połączenie, dopóki nie włączysz przynajmniej jednej z "
-"nich."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad nie uruchomi się, jeśli twój port UDP jest wyłączony.\n"
-"Włącz port UDP lub wyłącz Kad."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"Musisz zrestartować teraz aMule.\n"
-"Jeśli nie zrestartujesz go teraz, nie narzekaj, jeśli stanie się coś złego.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Twoja lista automatycznych aktualizacji serwerów jest pusta.\n"
-"Proszę wpisać co najmniej jeden URL wskazujący poprawny plik server.met.\n"
-" Kliknij na przycisku \"Lista\", aby wpisać URL."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Pliki tymczasowe"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Pliki przychodzące"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Sygnatury Online"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Wybierz folder na %s"
+"BŁĄD: Załadowanie pliku kopii zapasowej nieudane. Poszukaj na http://forum."
+"amule.org sposobów odzyskiwania .part.met."
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Szukaj odtwarzacza filmów"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Wszystkie pliki części załadowane."
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Wybierz przeglądarkę"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Nie znaleziono plików z częściami"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Program%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Edytuj listę serwerów"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Znaleziono %u plik części"
+msgstr[1] "Znaleziono %u pliki części"
+msgstr[2] "Znaleziono %u plików części"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
-msgstr ""
-"Dodaj jeden URL w każdej linii.\n"
-"Tylko jeden URL w każdej linii."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
+msgstr "System plików katalogu Temp nie obsługuje dużych plików."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Opóźnienie odświeżania: %d sekunda"
-msgstr[1] "Opóźnienie odświeżania: %d sekundy"
-msgstr[2] "Opóźnienie odświeżania: %d sekund"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr "System plików katalogu Incoming nie obsługuje dużych plików."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Czas dla przeciętnego wykresu: %d minuta"
-msgstr[1] "Czas dla przeciętnego wykresu: %d minuty"
-msgstr[2] "Czas dla przeciętnego wykresu: %d minut"
+msgid "Downloading %s"
+msgstr "Pobieranie %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Skala wykresu połączeń: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Starasz się już pobierać plik '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Opóźnienie odświeżania: %d sekunda"
-msgstr[1] "Opóźnienie odświeżania: %d sekundy"
-msgstr[2] "Opóźnienie odświeżania: %d sekund"
+msgid "You already have the file '%s'"
+msgstr "Masz już ten plik '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Rozmiar bufora pliku: %d bajt"
-msgstr[1] "Rozmiar bufora pliku: %d bajty"
-msgstr[2] "Rozmiar bufora pliku: %d bajtów"
+msgid "You are already trying to download the file %s"
+msgstr "Starasz się już pobierać plik %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Rozmiar kolejki wysyłania: %d klient"
-msgstr[1] "Rozmiar kolejki wysyłania: %d klientów"
-msgstr[2] "Rozmiar kolejki wysyłania: %d klientów"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Nie można skonwertować magnet linka do eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Odświeżanie połączeń do serwera co: %d minutę"
-msgstr[1] "Odświeżanie połączeń do serwera co: %d minuty"
-msgstr[2] "Odświeżanie połączeń do serwera co: %d minut"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Odświeżanie połączeń do serwera co: Wyłączone"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Port UDP dla rozszerzonych żądań serwera (TCP+3):"
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "wyłączone"
+msgid "Unknown protocol of link: %s"
+msgstr "Nieznany protokół linku: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Wykonaj komendę przy wydarzeniu `%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Włącz wykonanie komendy w rdzeniu"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Komenda rdzenia:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Włącz wykonanie komendy w GUI"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Komenda GUI:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Następujące zmienne zostaną zastąpione:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Nieprawidłowy link eD2k! BŁĄD: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Próba nieautoryzowanego dostępu. Połączenie zakończone."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "Klient wysyła pakiet po nie udanym uwierzytelnieniu."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Zewnętrzne połączenie zamknięte."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Zewnętrzne połączenia wyłączone w związku z brakiem hasła!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Zewnętrzne połączenia wyłączone w pliku konfiguracyjnym"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Nowe zewnętrzne połączenie zaakceptowane"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "BŁĄD: nie można zaakceptować nowego połączenia zewnętrznego"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "Zewnętrzne połączenia odrzucone, ze względu na brak hasła w preferencjach!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Łączę z klientem: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Nieznana wersja"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2360,2238 +1652,1065 @@
 "Niepoprawny ID wersji EC, może występować niezgodność binarna. Użyj rdzenia "
 "i zdalnego z tej samej wersji."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 "Nie można połączyć się z wersją finałową z dowolnej wersji SVN! "
 "*westchnięcie* prawdopodobnie zapobiegnięto awarii"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Uwierzytelnianie nie powiodło się."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Zła wersja protokołu."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Brak znacznika wersji protokołu."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+"Uwierzytelnianie nie powiodło się: nieprawidłowy skrót podany jako hasło EC."
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Uwierzytelnianie nie powiodło się: nieprawidłowe hasło."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Uwierzytelnianie nie powiodło się: brak hasła."
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr "Nieprawidłowe żądanie, najpierw musisz się uwierzytelnić."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Dostęp udzielony."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Wyślij wiadomość błędu \"%s\" do klienta."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Próba nieautoryzowanego dostępu z %s. Połączenie zakończone."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 "Zdalna komenda pliku części nieudana: Skrót dla pliku nieznaleziony: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Skrót dla pliku nieznaleziony: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! Błąd przetwarzania OpCode!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Nie dodano serwera"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "serwer nieznaleziony: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "trzeba zdefiniować serwer do usunięcia"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k jest wyłączony w preferencjach."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Wyszukiwanie w trakcie. Odświeżenie rezultatów za chwilę!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Szukanie przez WWW ze zdalnych interfejsów nie ma sensu."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad jest wyłączony w preferencjach."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Brak punktów dla wykresu."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Twój klient nie jest skonfigurowany do tego poziomu szczegółów."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "External Connection: żądanie zamknięcia"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Już w trakcie zamykania."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: dodaję link '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Nieprawidłowy lub znajdujący się już na liście link."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Nie znaleziono pliku."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Nieprawidłowa nazwa pliku."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Nie udało się zmienić nazwy pliku."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad jest wyłączony w preferencjach."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Już podłączony do eD2k."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Łączę do eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Już podłączony do Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Łączę z Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Wszystkie sieci są wyłączone."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Rozłącz z eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Rozłączono z Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "External Connection: otrzymano nieprawidłowy opcode: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Nieprawidłowy opcode (zła wersja protokołu?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr "Otwarcie pliku (%s) nieudane, usuwam z listy udostępnionych plików."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Żądanie skrótu dla nieznanego pliku: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Komenda `%s' z pid `%d' zakończyła działanie ze statusem `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Serwer nie dodany: Nie podano IP lub nazwy hosta."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Serwer nie dodany: Podano nieprawidłowy port serwera."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Status eD2k:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Połączony"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Port "
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Status Kademlii:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Uruchomiony"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Status:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Rozłączony"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Stan połączenia:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Za firewallem"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Stan firewalla: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Połączony do kolegi"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Brak kolegów"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Średnio użytkowników:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Średnio plików:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Nie uruchomiony"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Uptime: %s"
-msgstr "Uptime: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Transfer"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Wysyłanie"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Wysłane dane (Sesja (Razem)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Łączny narzut  (Pakiety): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Narzut żądań pliku (Pakiety): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Narzut wymiany źródeł (Pakiety): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Narzut serwera (Pakiety): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Narzut Kad (Pakiety): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Narzut Crypt (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Aktywne wysyłanie: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Oczekujące wysyłanie: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Całkowita ilość udanych sesji wysyłania: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Całkowita ilość nieudanych sesji wysyłania: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Średni czas wysyłania: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Pobieranie"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Pobrane dane (Sesja (Razem)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Znaleziono źródła: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Aktywne pobieranie (części): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Stosunek UL:DL sesji (Razem): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Średnie tempo pobierania (sesja): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Średnie tempo wysyłania (sesja): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Maksymalne tempo pobierania (sesja): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Maksymalne tempo wysyłania (sesja): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Ponowne łączenia: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Czas od pierwszego transferu: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Podłączony do serwera od: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Aktywne połączenia (szacunkowo): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Osiągnięto maks. limit połączeń: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Średnio połączeń (szacunkowo): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Szczytowe połączenia (szacunkowo): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Klienci"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrowane"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Razem: %i Znanych: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Działające serwery:  %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Niedziałające serwery: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "W sumie: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Usunięte serwery: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Przefiltrowane serwery: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Użytkowników na działających serwerach: %llu"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Nieznane rozszerzenie '%s' dla komendy '%s'.\n"
 
-#: src/Statistics.cpp:721
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Plików na działających serwerach:  %llu"
+msgid "Unknown command '%s'.\n"
+msgstr "Nieznana komenda '%s'.\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "W sumie użytkowników: %llu"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Ta komenda nie może posiadać argumentu.\n"
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "W sumie plików: %llu"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Ta komenda musi posiadać argument.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Zajętość serwera: %.2f%%"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Ta komenda jest niekompletna, użyj jednego z rozszerzeń podanych niżej.\n"
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Liczba udostępnianych plików: %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Dostępne rozszerzenia:\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Łączny rozmiar udostępnianych plików: %s"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Dostępne komendy:\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Average file size: %s"
-msgstr "Średni rozmiar pliku: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "System operacyjny"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Nie otrzymano"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Wytnij"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Wklej"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Zaznacz wszystko"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Nie można wykonać wyszukiwania Kad, jeśli Kad nie jest włączony"
-
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "Nie można wykonać wyszukiwania eD2K, jeśli eD2K nie jest połączony"
-
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Nieoczekiwany błąd podczas próby wyszukiwania Kad: "
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Wszystkie komendy są niewrażliwe na wielkość znaków.\n"
+"Wpisz '%s <komenda>', aby uzyskać szczegółowe informacje na temat "
+"<komenda>.\n"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Wiadomość przefiltrowana od '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Wychodzi z programu."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nowa wiadomość od '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Pokaż pomoc."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
-"Użytkownik %s (%u) zażądał twojej listy udostępnionych plików-> Zaakceptowano"
+"Aby uzyskać pomoc dotyczącą komendy, wpisz 'help <komenda>'.\n"
+"Aby uzyskać pełną listę komend, wpisz 'help'.\n"
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
-"Użytkownik %s (%u) zażądał twojej listy udostępnionych plików -> Odmówiono"
+"\n"
+"Użyj '%s' aby otrzymać listę komend\n"
+"\n"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
-"Użytkownik %s (%u) zażądał twojej listy udostępnionych katalogów -> "
-"Zaakceptowano"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Błąd składni!"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
-"Użytkownik %s (%u) żążądał twojej listy udostępnionych katalogów -> Odmówiono"
+"Błąd przetwarzania komendy - to nie powinno się zdarzyć! Proszę zgłosić "
+"błąd\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"Użytkownik %s (%u) zażądał twojej listy plików udostępnionych w katalogu %s -"
-"> Zaakceptowano"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Ta komenda nie powinna posiadać żadnego parametru."
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"Użytkownik %s (%u) zażądał twojej listy plików udostępnionych w katalogu %s -"
-"> Odmówiono"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Ta komenda musi posiadać parametr."
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Użytkownik %s (%u) udostępnia katalog %s"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Nieprawidłowy argument."
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Użytkownik %s (%u) wysłał niechciane katalogi udostępnione."
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "To jest niekompletna komenda."
 
-#: src/ClientTCPSocket.cpp:1025
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "Użytkownik %s (%u) wysłał listę plików udostępnionych w katalogu %s"
+msgid "Type '%s' to get more help.\n"
+msgstr "Wpisz '%s' , aby uzyskać więcej pomocy.\n"
 
-#: src/ClientTCPSocket.cpp:1032
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Użytkownik %s (%u) zakończył wysyłanie listy udostępnionych plików"
+msgid "This is %s %s %s\n"
+msgstr "To jest %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1037
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Użytkownik %s (%u) wysłał niechcianą listę udostępnionych plików"
+msgid "This is %s %s\n"
+msgstr "To jest %s %s\n"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
 msgstr ""
-"Użytkownik %s (%u) odmówił dostępu do listy udostępnionych plików/katalogów"
+"\n"
+"Tworzenie klienta...\n"
 
-#: src/KadDlg.cpp:132
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Nodes (%u)"
-msgstr "Węzły (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Nieprawidłowe ip do rozruchu"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Nieprawidłowy port do rozruchu"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Proszę wypełnij wszystkie wymagane pola"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Czy jesteś pewien, że chcesz pobrać nowy plik nodes.dat?\n"
-
-#: src/KadDlg.cpp:197
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Kontynuowanie spowoduje usunięcie obecnych węzłów i restart połączenia "
-"Kademlii."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Kontynuować?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "BŁĄD: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "OSTRZEŻENIE: "
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Dodaj znajomego"
+"\n"
+"OK, wychodzę %s...\n"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Musisz wpisać poprawne IP oraz port!"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
+"Nie można połączyć z pustym hasłem.\n"
+"Musisz podać hasło poprzez edycję pliku konfiguracyjnego\n"
+"lub poprzez linię poleceń, lub podaj je kiedy zostaniesz o to poproszony.\n"
+"\n"
+"Wychodzę...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informacje"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Pokazuj ten tekst pomocy."
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Wybrany skrót użytkownika jest niepoprawny!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Host gdzie jest uruchomiony aMule. (domyślny: localhost)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Źródła"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Port zewnętrznych połączeń aMule. (domyślny: 4712)"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Plik"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Hasło połączeń zewnętrznych."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Pobieranie"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Czyta konfiguracje z pliku."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategoria"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Nie wysyłaj żadnego wyjścia na stdout."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Główne"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Bądź gadatliwy - pokazuj także wiadomości diagnostyczne."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Pobieranie w kategorii"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Ustawia locale programu (język)."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Szukaj powiązanych plików (eD2k, serwer lokalny)"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Zapisuje opcje listy komend do pliku konfiguracyjnego."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Oznacz jako znany plik"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Tworzy plik konfiguracyjny oparty na pliku konfiguracyjnym aMule."
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Podłączony do zdalnego amule"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Drukuj wersję programu."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Nieudane połączenie "
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Szczegóły pliku"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "BŁĄD"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% skończone"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Połączenie nieudane. Nie można się połączyć z %s:%d\n"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
-"UWAGA: Nie możesz dodać samego siebie jako źródło linku ed2k, gdy masz lowid."
+"Nie udało się otworzyć pliku listy przyjaciół 'emfriends.met' do odczytu!"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Użytkowników: E: %s K: %s | Plików E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+"Nie udało się otworzyć pliku listy przyjaciół 'emfriends.met' do zapisu!"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Wszystkie"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "KRYTYCZNE - brak klienta przy StartChatSession"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Razem użytkowników: %s | Razem plików: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Znajomi"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Przesłano"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Pokaż &szczegóły"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Prędkość"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Dodaj znajomego"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Postęp"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Usuń znajomego"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Status"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Wyślij &wiadomość"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Pozostało czasu"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Pokaż pliki"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Ostatnio widziano cały"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Ustaw slot dla znajomego"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Ostatnio widziany"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Jesteś pewien, że chcesz usunąć wybranego przyjaciela?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Jesteś pewien, że chcesz usunąć wybrany plik?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Jesteś pewien, że chcesz usunąć wybranych przyjaciół?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Jesteś pewien, że chcesz usunąć wybrane pliki?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Nie możesz ustanowić więcej niż jeden slot dla znajomego.\n"
+"Przydzielono tylko jeden slot."
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Wybór wielu"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Wyślij wiadomość do użytkownika"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Wiadomość do wysłania:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Zatrzymaj"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pauza"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Wznów"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "Wyczyść s&kończone"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Przerzuć wszystkie A4AF do tego pliku"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Przerzuć wszystkie A4AF do tego pliku (Auto)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Przerzuć wszystkie A4AF do każdego innego pliku"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Zaawansowane opcje"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Podgląd"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Pokaż &szczegóły pliku"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Pokaż wszystkie komentarze"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Skopiuj magnet URI do schowka"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "nieprzydzielony"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Przydziel do kategorii"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Otwórz plik"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Usuń ze znajomych"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Dodaj do znajomych"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Zamień na ten plik"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Proszę o inny plik"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Pobieranie (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Aby zapobiec pojawianiu się tego komunikatu przy każdym podglądzie,\n"
-"ustaw swój odtwarzacz wideo w preferencjach (domyślny jest mplayer)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Podgląd pliku"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "BŁĄD: Nie udało się uruchomić zewnętrznego odtwarzacza! Komenda: `%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "BŁĄD: Nie udało się utworzyć pliku części)"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Próbuję załadować kopię zapasową pliku met z %s"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "BŁĄD: Nie udało się otworzyć pliku part.met: %s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "BŁĄD: plik part.met ma zerowy rozmiar: %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "BŁĄD: Nieprawidłowa wersja pliku part.met: %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"BŁĄD: %s (%s) jest uszkodzony (zła ilość znaków), nie mogę otworzyć pliku."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Próbuję odzyskać informacje o pliku..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr ""
-"Odzyskiwanie nienazwanego pliku - będę próbował odzyskać go jako "
-"RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Odzyskano wszystkie możliwe informacje o pliku :D - Próbuję ich użyć..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Nie mogę odzyskać informacji o pliku :("
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Oczekiwanie na slot wysyłań"
+
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "W kolejce"
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Nie udało się otworzyć: %s (%s)"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Wysyłanie"
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "OSTRZEŻENIE: %s może być uszkodzony (%i)"
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Brak"
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "BŁĄD podczas zapisywania pliku części: %s (%s ==> %s)"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Nie"
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Nie można pobrać długości '%s' - użyto pliku %s."
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Tak"
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' ma zerowy rozmiar - używam pliku '%s'."
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Pobieranie..."
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Nie udało się zapisać pliku part.met.seeds dla %s"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "Pobranie HTTP anulowane"
 
-#: src/PartFile.cpp:1024
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Zapisano %i zarodek źródeł dla pliku części: %s (%s)"
-msgstr[1] "Zapisano %i zarodki źródeł dla pliku części: %s (%s)"
-msgstr[2] "Zapisano %i zarodków źródeł dla pliku części: %s (%s)"
+msgid "Unable to create destination file %s for download!"
+msgstr "Nie można utworzyć docelowego pliku %s do pobrania!"
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Plik części %s (%s) nie ma pliku zarodków"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "Adres URL do pobrania nie może być pusty"
 
-#: src/PartFile.cpp:1062
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Plik części %s (%s) ma nieważny plik zarodków"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "Adres URL %s zwrócił: %i - Błąd (%i)!"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Błąd podczas odczytu pliku źródeł plików części  (%s - %s): %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Krytyczny błąd podczas zapisywania pobranego pliku"
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Znaleziono uszkodzoną część (%d) w %d pliku części %s - FileResultHash |%s| "
-"FileHash |%s|"
-msgstr[1] ""
-"Znaleziono uszkodzoną część (%d) w %d plikach części %s - FileResultHash |%"
-"s| FileHash |%s|"
-msgstr[2] ""
-"Znaleziono uszkodzoną część (%d) w %d plikach części %s - FileResultHash |%"
-"s| FileHash |%s|"
+msgid "Downloaded %d bytes"
+msgstr "Pobrano %d bajtów"
 
-#: src/PartFile.cpp:1181
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Znaleziono kompletnych części (%i) w %s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Skończono ponowne tworzenie skrótu %s"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Nieoczekiwany błąd podczas zakańczania %s. Plik wstrzymany"
-
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Skończono pobieranie: %s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Usuwanie pliku: %s"
-
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"OSTRZEŻENIE: Nie można utworzyć skrótu pobranej części - zestaw skrótów jest "
-"niekompletny dla '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Oczekiwane %d bajtów, ale pobrane zostało %d bajtów"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"BŁĄD: Nie można utworzyć skrótu pobranej części - zestaw skrótów "
-"niekompletny (%s). Nie powinno do tego dojść"
+"Nieprawidłowy adres URL do pobrania HTTP lub przekierowania HTTP (nie "
+"zapomniałeś 'http://' ?)"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "UWAGA: Niewystarczająca ilość wolnego miejsca! Wstrzymywanie pliku: %s"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "Nie można połączyć się z serwerem pobrania HTTP"
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Pobrana część %i jest uszkodzona w pliku: %s"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Nieprawidłowa odpowiedź serwera pobrania HTTP"
 
-#: src/PartFile.cpp:3214
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Odzyskano uszkodzoną część %i dla %s -> Zapisanych bajtów: %s"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Pobierz nową GeoIP.dat z %s"
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Alokuję"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "Nie można pobrąć pliku GeoIP.dat, przerwana aktualizacja."
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Niewystarczająca ilość przestrzeni dyskowej"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Zatrzymany"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Pobrano"
-
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "BŁĄD: Nie udało się otworzyć pliku części '%s'"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "UWAGA: known.met nie może być otwarty."
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr ""
-"UWAGA: lista znanych plików uszkodzona, zawiera nieprawidłowy nagłówek."
+msgid "Failed to remove %s file, aborting update."
+msgstr "Nie można usunąć pliku %s, przerwana aktualizacja."
 
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Błąd IO podczas odczytu pliku known.met: %s"
+msgid "Failed to rename %s file, aborting update."
+msgstr "Nie można zmienić nazwy pliku %s, przerwana aktualizacja."
 
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Błąd podczas zapisywania pliku known.met: %s"
+msgid "Successfully updated %s"
+msgstr "Pomyślnie zaktualizowany %s"
 
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Znaleziono %i znany udostępniony plik"
-msgstr[1] "Znaleziono %i znane udostępnionych plików"
-msgstr[2] "Znaleziono %i znanych udostępnionych plików"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Błąd aktualizacji GeoIP.dat"
 
-#: src/SharedFileList.cpp:358
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Znaleziono %i znany udostępniony plik, %i nieznanych"
-msgstr[1] "Znaleziono %i znane udostępnionych plików, %i nieznanych"
-msgstr[2] "Znaleziono %i znanych udostępnionych plików, %i nieznanych"
+msgid "Failed to download %s from %s"
+msgstr "Nie powiodło się pobranie %s z %s"
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "BŁĄD: Próba udostępnienia %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Komentarze pliku"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Ocena"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Komentarz"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Bez komentarza"
-
-#: src/CommentDialogLst.cpp:104
-#, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u komentarz"
-msgstr[1] "%u komentarze"
-msgstr[2] "%u komentarzy"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+msgid "Failed to load country data for '%s'."
 msgstr ""
-"Nie udało się połączyć do wszystkich zamaskowanych serwerów na liście. "
-"Próbuję ponownie bez maskowania."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Nie udało się połączyć do serwerów z listy. Kolejne podejście."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "Sieć eD2K wyłączona w preferencjach, nie łączę."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Nie ma poprawnych serwerów do połączenia na liście"
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Połączony z %s (%s:%i)"
+"Nie można połączyć się z serwerem pobrania HTTPNie powiodło się pobranie "
+"GeoIP.dat z %s"
 
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Nawiązano połączenie z: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr ""
-"Błąd krytyczny podczas próby łączenia. Może nie ma połączenia do internetu"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Ładowanie filtrów IP 'ipfilter.dat' i 'ipfilter_static.dat'."
 
-#: src/ServerConnect.cpp:339
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Utracono połączenie z %s (%s:%i)"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "Ładowanie pliku ipfilter.dat nieudane '%s', napotkano nieznany format."
 
-#: src/ServerConnect.cpp:349
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) wygląda na wyłączony."
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "Ładowanie pliku ipfilter.dat nieudane '%s', nie można otworzyć pliku."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) wygląda na pełny."
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Załadowano %u zakres IP z '%s'."
+msgstr[1] "Załadowano %u zakresy IP z '%s'."
+msgstr[2] "Załadowano %u zakresów IP z '%s'."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Automatyczne łączenie do serwera nastąpi za %d sekundę"
-msgstr[1] "Automatyczne łączenie do serwera nastąpi za %d sekundy"
-msgstr[2] "Automatyczne łączenie do serwera nastąpi za %d sekund"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Utracono połączenie"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u niepoprawna linia została odrzucona."
+msgstr[1] "%u niepoprawne linie zostały odrzucone."
+msgstr[2] "%u niepoprawnych linii zostało odrzuconych."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Łączenie z %s (%s:%i) nieudane."
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Nie można załadować danych kraju dla '%s'."
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "BŁĄD: nieprawidłowe gniazdo przy sprawdzaniu timeouta"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "Filtr IP jest gotowy"
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Próba połączenia z %s (%s:%i) przedawniła się."
-
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"BŁĄD: Załadowanie pliku kopii zapasowej nieudane. Poszukaj na http://forum."
-"amule.org sposobów odzyskiwania .part.met."
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Nie znaleziono plików z częściami"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Znaleziono %u plik części"
-msgstr[1] "Znaleziono %u pliki części"
-msgstr[2] "Znaleziono %u plików części"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr "System plików katalogu Temp nie obsługuje dużych plików."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr "System plików katalogu Incoming nie obsługuje dużych plików."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Pobieranie %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Starasz się już pobierać plik '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Masz już ten plik '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Starasz się już pobierać plik %s"
+"Rozruch od \n"
+"znanych klientów"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Nie można skonwertować magnet linka do eD2k: %s"
+msgid "Nodes (%u)"
+msgstr "Węzły (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Nieznany protokół linku: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Nieprawidłowe ip do rozruchu"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Nieprawidłowy link eD2k! BŁĄD: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Nieprawidłowy port do rozruchu"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Wykonaj <str> i wyjdź."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Proszę wypełnij wszystkie wymagane pola"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Niepoprawny format IP. Użyj xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Czy jesteś pewien, że chcesz pobrać nowy plik nodes.dat?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Komenda ta wymaga argumentu. Prawidłowe argumenty: 'all', nazwa pliku lub "
-"liczba.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Przetwarzanie przez skrót: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Przetwarzanie przez nazwę pliku: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr "Komenda ta wymaga argumentu. Prawidłowe arguentu: skrót pliku.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Niepoprawny numer\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Nieprawidłowy skrót (długość powinna wynosić dokładnie 32 znaki)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Operacja zakończona pomyślnie."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Żądanie nieudane z powodu błędu: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Filtrowanie IP klientów jest %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "WYŁĄCZONE"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "WŁĄCZONE"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Filtrowanie IP serwerów jest %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Aktualny poziom filtra IP to %d.\n"
+"Kontynuowanie spowoduje usunięcie obecnych węzłów i restart połączenia "
+"Kademlii."
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Limity przepustowości: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Kontynuować?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: wyszukiwana fraza jest za krótka"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Połączony z %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "z LowID"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "z HighID"
+msgid "Keyword for search: %s"
+msgstr "Słowa kluczowe dla wyszukiwania: %s"
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Łącze"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: Szukane słowo kluczowe jest już na liście wyszukiwania: "
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Nie połączony"
-
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Pobieranie:\t%s"
 
-#: src/TextClient.cpp:726
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"Wysyłanie:\t%s"
-
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Klientów w kolejce:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Wczytaj %u kontakt Kad"
+msgstr[1] "Wczytaj %u kontakty Kad"
+msgstr[2] "Wczytaj %u kontaktów Kad"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
-msgstr ""
-"\n"
-"Razem źródeł:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
+msgstr "Nie znaleziono kontaktów, proszę rozruszyć, lub pobrać plik nodes.dat."
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Liczba wyników wyszukiwania: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - pokaż postęp wyszukiwania"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Tylko %d dostępny kontakt KAD, nodes.dat nie zapisane"
+msgstr[1] "Tylko %d dostępne kontakty KAD, nodes.dat nie zapisane"
+msgstr[2] "Tylko %d dostępnych kontaktów KAD, nodes.dat nie zapisane"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Otrzymano nieznaną odpowiedź z serwera, OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Pokaż krótką informację o statusie."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Pokaż stan połączenia, obecne prędkości wysyłania/pobierania itd.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Pokaż pełne drzewo statystyk."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Zapisano %d kontakt Kad"
+msgstr[1] "Zapisano %d kontakty Kad"
+msgstr[2] "Zapisano %d kontaktów Kad"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Opcjonalnie, liczba z zakresu 0-255 może być przekazana do tej komendy jako "
-"argument\n"
-"który mówi ile wpisów poddrzew  wersji klienta powinno zostać\n"
-"wyświetlone. 0 lub pusta wartość oznacza 'nieograniczony'.\n"
-"\n"
-"Przykład: 'statistics 5' wyświetli tylko 5 pierwszych wersji dla każdego "
-"typu klienta.\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Nazwa pliku"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Wyłącz aMule."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Rozmiar pliku"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Wyłącz zdalnie działający rdzeń (amule/amuled).\n"
-"Spowoduje to również wyłączenie klienta tekstowego, ponieważ jest on "
-"bezużyteczny\n"
-"bez działającego rdzenia.\n"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Ratio wymiany"
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Przeładowuje podany obiekt."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Wysłano"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Przeładowuje listę udostępnionych plików."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Zażądano"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Przeładowuje tabelę IP Filter z pliku."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Zaakceptowano"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Połącz z siecią."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Pełne źródła"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Spowoduje to połączenie z wszystkimi sieciami włączonymi w Preferencjach.\n"
-"Możesz również opcjonalnie określić adres serwera w formie IP:Port form, aby "
-"połączyć się\n"
-"tylko z tym serwerem. IP musi być adresem IPv4\n"
-"lub odczytywalną nazwą DNS."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Połącz tylko z eD2k."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Połącz tylko z Kad."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Rozłącz z siecią."
+"OSTRZEŻENIE: Znana lista plików uszkodzona, zawiera nieprawidłowy nagłówek."
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"Spowoduje to rozłączenie z wszystkich sieci, które są obecnie włączone.\n"
+"Nie można załadować wpisu w znanej liście plików, plik może być uszkodzony"
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Rozłącz tylko z eD2k."
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
+msgstr "Nieprawidłowy wpis w znanej liście plików, plik może być uszkodzony: "
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Rozłącz tylko z Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Dodaje link eD2k lub magnet do rdzenia."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
-msgstr ""
-"Dodawany link eD2k może być:\n"
-"*) linkiem pliku (ed2k://|file|...), zostanie on dodany do kolejki "
-"pobierania,\n"
-"*) linkiem serwera (ed2k://|server|...), zostanie on dodany do listy "
-"serwerów,\n"
-"*) linkiem do listy serwerów, który spowoduje dodanie wszystkich serwerów na "
-"liście\n"
-"   do listy serwerów.\n"
-"\n"
-"Magnet link musi zawierać skrót eD2k i długość pliku.\n"
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Nieznana wersja"
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Ustaw wartość opcji."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Nie można utworzyć docelowego pliku %s do pobrania!"
 
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Ustaw preferencje IPFilter."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Tworzenie skrótu"
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Włącz filtrowanie IP klientów i serwerów."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Zakańczanie"
 
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Wyłącz filtrowanie IP klientów i serwerów."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Ukończono"
 
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Włącz/wyłącz filtrowanie IP klientów."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Wstrzymano"
 
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Włącz filtrowanie IP klientów."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Błędne"
 
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Wyłącz filtrowanie IP klientów."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Czeka"
 
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Włącz/Wyłącz filtrowanie IP serwerów."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Musisz określić hasło."
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Włącz filtrowanie IP serwerów."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Nieprawidłowe hasło, nie skrót MD5!"
 
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Wyłącz filtrowanie IP serwerów."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Błąd połączenia"
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Wybierz poziom filtrowania IP."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "Połączenie EC nieudane. Pusta odpowiedź."
 
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
-"Prawidłowe poziomy filtrowania mieszczą się w zakresie 0-255, a wartością\n"
-"domyślną (początkową) jest 127.\n"
+"External Connection: Zła odpowiedź serwera, brak nawiązania. Zakończono "
+"połączenie."
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Ustaw limity przepustowości."
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "Wartości podane w tych komendach muszą być w kilobajtach/sekundę.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Ustaw limit przepustowości wysyłania."
-
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Ustaw limit przepustowości pobierania."
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Pobierz i wyświetl wartość preferencji."
-
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Pobierz preferencje IPFilter."
-
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Pobierz stan IPFilter dla klientów i serwerów."
-
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Pobierz stan IPFilter tylko dla klientów."
-
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Pobierz stan IPFilter tylko dla serwerów."
-
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Pobierz poziom IPFilter."
-
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Pobierz limity przepustowości."
-
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Tworzy wyszukiwanie."
-
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"Musi zostać określony typ wyszukiwania przez podanie typu:\n"
-"    GLOBALNY\n"
-"    LOKALNY\n"
-"    KAD\n"
-"Przykład: 'search kad plik' uruchomi wyszukiwanie kad dla \"plik\".\n"
-
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Wykonuje globalne wyszukiwanie."
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Wykonuje lokalne wyszukiwanie"
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Wykonuje wyszukiwanie kad"
-
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Pokazuje wyniki ostatniego wyszukiwania."
-
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Zwraca wyniki poprzedniego wyszukiwania.\n"
-
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Pokazuje postęp wyszukiwania."
-
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Pokazuje postęp wyszukiwania.\n"
-
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Rozpocznij pobieranie pliku"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Sukces! Nawiązano połączenie z aMule"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Musi zostać podany numer pliku z ostatniego wyszukiwania.\n"
-"Przykład: 'download 12' rozpocznie pobieranie pliku o numerze 12 z "
-"poprzedniego wyszukiwania.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Sukces! Nawiązano połączenie."
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Wstrzymaj pobieranie."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "External Connection: Brak dostępu z powodu: "
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Wznów pobieranie."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "External Connection: Brak nawiązania"
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "ListenSocket: Ok."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Anuluj pobieranie."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "BŁĄD: nie można nasłuchiwać na porcie TCP."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Ustaw priorytet pobierania."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "BŁĄD: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Ustaw priorytet pobierania na Niski, Normalny, Wysoki lub Auto.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "OSTRZEŻENIE: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Ustaw priorytet na niski."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Zamknij"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Ustaw priorytet na normalny."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Wytnij"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Ustaw priorytet na wysoki."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Kopiuj"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Ustaw priorytet na auto."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Wklej"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Pokaż kolejki/listy."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Wyczyść"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Pokazuje kolejkę wysyłania/pobierania, listę serwerów lub udostępnionych "
-"plików.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Zaznacz wszystko"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Pokaż kolejkę wysyłania."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Pokaż kolejkę pobierania."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Nielimitowane"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Pokaż log."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Menu podajnika aMule"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Pokaż listę serwerów."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Limity prędkości:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Zresetuj log."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "UL: Brak"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Wycofywana komenda, użyj '%s' zamiast niej."
+msgid "UL: %u"
+msgstr "UL: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Komenda ta jest wycofywana i może zostać usunięta w przyszłości.\n"
-"Użyj zamiast niej '%s'.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DL: Brak"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "BŁĄD: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "DL: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "OSTRZEŻENIE: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Prędkość pobierania: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Twoje nowe id to %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "OSTRZEŻENIE: Otrzymałeś Low-ID!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr ""
-"\tNajprawdopodobniej jest to spowodowane tym, że jesteś za firewallem lub "
-"routerem."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tPo więcej informacji udaj się na http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Prędkość wysyłania: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Otrzymane info nieznanego serwera! - za krótkie"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Informacje o kliencie"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Otrzymano %d nowy serwer"
-msgstr[1] "Otrzymano %d nowe serwerów"
-msgstr[2] "Otrzymano %d nowych serwerów"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Zapisywanie listy serwerów zakończone."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Serwer odrzucił ostatnią komendę"
+msgid "Nickname: %s"
+msgstr "Ksywka: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Otrzymano podrobiony pakiet z serwera: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Nie wybrano ksywki!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Nieobsługiwany błąd w trakcie przetwarzania pakietu z serwera: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID klienta: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Nie mogę utworzyć wątku rozwiązywania dns dla połączenia do %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Nie połączony"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "IP serwera %s (%s) jest filtrowane. Nie łącze."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Nazwa serwera: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "używa maskowania protokołu."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP serwera: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Łączę z  %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Nie połączony"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Nie mogę rozwiązać dns dla serwera %s: Nie mogę połączyć!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Nie udało się załadować danych kraju z "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Załadowano %d bitmapę flag."
-msgstr[1] "Załadowano %d bitmapy flag."
-msgstr[2] "Załadowano %d bitmap flag."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Jesteś pewien, że chcesz anulować i usunąć wszystkie pliki z tej kategorii?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Wymagane potwierdzenie"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Wszystkie inne"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Niekompletne"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Aktywny"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Film"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Audio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Archiwum"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Obrazy CD"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Obrazki"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Tekst"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Wybierz filtr przeglądania"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Dodaj kategorię"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Edytuj kategorię"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Usuń kategorię"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Nazwa pliku"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Rozmiar pliku"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Ratio wymiany"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Wysłano"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Zażądano"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Zaakceptowano"
+msgid "TCP port: %d"
+msgstr "Port TCP: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Pełne źródła"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "Port TCP: Nie gotowy"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Importowanie %s: %s"
+msgid "UDP port: %d"
+msgstr "Port UDP: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Wczytywanie katalogu temp"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "Port UDP: Nie gotowy"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Odbieranie podstawowych informacji z info pobieranego pliku"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Podpis online: Włączony"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Tworzenie pliku docelowego"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Podpis online: Wyłączony"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Ładowanie danych ze starego pobieranego pliku (%u z %u)"
+msgid "Uptime: %s"
+msgstr "Uptime: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Zapisywanie bloku w nowym pojedynczym pobieranym pliku (%u z %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Odbieranie informacji o źródłach pobieranego pliku"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Dodawanie pobierania i zapisywanie nowego pliku części"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Import pliku części"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Stan"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Skrót pliku"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Czekam..."
+msgid "Shared files: %d"
+msgstr "Udostępnionych plików: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Dysk: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Proszę wybraćkatalog w celu poszukiwania tymczasowych pobierań! (Podkatalogi "
-"zostaną uwzględnione)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"Czy chcesz, aby źródła pomyślnie zaimportowanych pobierań zostały usunięte?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Usunąć źródła?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "bajt"
-msgstr[1] "bajty"
-msgstr[2] "bajtów"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "bajt/sek"
-msgstr[1] "bajty/sek"
-msgstr[2] "bajtów/sek"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "sek"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "min"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "godzin"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Dni"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Filmy"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Archiwa"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Teksty"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programy"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Dowolny"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Nieoceniony"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Nieprawidłowy / Uszkodzony / Fałszywy"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Marny"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "W miarę"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Dobry"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Znakomity"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "wszystkie"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "wszystkie inne"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Ładowanie filtrów IP 'ipfilter.dat' i 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Klientów w kolejce: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Ładowanie pliku ipfilter.dat nieudane '%s', napotkano nieznany format."
+msgid "Total DL: %s"
+msgstr "Razem DL: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "Ładowanie pliku ipfilter.dat nieudane '%s', nie można otworzyć pliku."
+msgid "Total UL: %s"
+msgstr "Razem UL: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Załadowano %u zakres IP z '%s'."
-msgstr[1] "Załadowano %u zakresy IP z '%s'."
-msgstr[2] "Załadowano %u zakresów IP z '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Limit wysyłania"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u niepoprawna linia została odrzucona."
-msgstr[1] "%u niepoprawne linie zostały odrzucone."
-msgstr[2] "%u niepoprawnych linii zostało odrzuconych."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Limit pobierania"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktywnych połączeń (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Ukryj aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Szczegóły pliku"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Pokaż aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% skończone"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Wyjdź"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "Link eD2k: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Zatwierdź"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Kliknij tutaj, aby dodać link eD2k w linii poleceń do twojej kolejki "
 "pobierań."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4599,19 +2718,19 @@
 "Zdarzenie są wyświetlane tu. Dla pełnej listy zdarzeń, definiuj logowanie w "
 "zakładce serwerów."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Ładuje..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Ilość użytkowników na serwerze do którego jesteś połączony ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Użytkowników: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4620,6 +2739,10 @@
 "wszystkich użytkowników."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Wysł: 0.0 | Pobr: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4627,7 +2750,7 @@
 "Aktualna średnia szybkość wysyłania i pobierania. Jeżeli włączone, liczby w "
 "nawiasach wskazują narzut komunikacji z klientem."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4639,520 +2762,575 @@
 "firewallem) i zielone strzałki wskazują, że masz wysokie ID (optymalny typ "
 "połączenia)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Niepołączony ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Aktualnie połączony serwer."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Typ"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Lokalne"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Globalne"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Skrót pliku"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Parametry dodatkowe"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtrowanie"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Typ Pliku"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Dowolny"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Archiwa"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Audio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Obrazy CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Obrazki"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programy"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Teksty"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Filmy"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Rozszerzenie"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Min rozmiar"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bajtów"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Maks. rozmiar"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Dostępność"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Wyniki filtrowania"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Odwróć wyniki"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Ukryj znane pliki"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Start"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Więcej"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Wyszukuje więcej wyników na eD2K. Nieobsługiwane jeszcze dla Kad."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Pobieranie"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Zresetuj pola"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Wyniki"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Wyczyść skończone pobierania"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Pokaż wysłane / Kolejkę wysyłań"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Klientów w kolejce :"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Źródła pliku:"
 
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Wyślij"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Wysyła wybraną wiadomość."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Zamknij"
-
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Zamknij tę sesję czata."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Ogólne"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Pełna nazwa :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "Brak"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "plik met :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Skrót :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Rozmiar pliku :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Status pliku części:"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Ostatnio widziano całość :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Transfer"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Znaleziono źródeł :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Przesyłam ze źródeł :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Części pliku :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Dostępne :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Prędkość transmisji danych :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Aktywny czas pobierania: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Przesłano :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Zakończono :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Inteligentny System Obsługi Błędów"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Utracono z powodu błędów :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Zyskano przez kompresję :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Pakietów uratowanych przez I.C.H. :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Nazwy plików"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Przejmij"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Wyczyść"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "OK"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Komentuj/Oceń plik (tekst będą widzieli wszyscy użytkownicy)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"W przypadku filmu możesz podać jego długość, język ...\n"
-"oraz jeżeli jest fałszywy możesz powiedzieć o tym innym użytkownikom aMule."
+"Dla filmu można opisać jego długość, historię, język ...\\n\\ni jeśli jest "
+"on fałszywy, można powiedzieć to innym użytkownikom aMule."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Jakość pliku"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Nieoceniony"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Nieprawidłowy / Uszkodzony / Fałszywy"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Marny"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "W miarę"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Dobry"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Znakomity"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Wybierz ocenę pliku lub skonsultuj z użytkownikiem jeżeli jest "
 "nieprawidłowy ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Odśwież"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Pobieranie, proszę czekać..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Nieznany rozmiar"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Wymagane informacje"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "Adres IP :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Port :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Dodatkowe informacje"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Nazwa użytkownika :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Skrót użytkownika :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Przeładuj twoje udostępnione pliki"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Aktualna sesja"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Razem"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Żądany :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Aktywne wysyłania :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Dodaj"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Prędkość pobierania"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Aktualna"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Bieżąca średnia"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Średnia sesji"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Prędkość wysyłania"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Połączenie"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Aktywne pobierania"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Aktywnych połączeń (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Aktywne wysyłania"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Drzewo statystyk"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Nazwa użytkownika:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Skrót użytkownika:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Oprogramowanie klienta:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Wersja klienta:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "Adres IP:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID użytkownika:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP Serwera:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Nazwa serwera:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Maskowanie:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Transfery do klientów"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Aktualnie żądań:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Średnia prędkość wysyłania:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Średnia prędkość pobierania:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Wysłane (sesja):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Pobrane (sesja):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Wysłanych (razem):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Pobranych (razem):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Punkty"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Modyfikator DL/UL:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Bezpieczny identyfikator:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Ocena (razem):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Pozycja kolejki:"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Punkty kolejki:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Ksywa"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - linuksowy Muł"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - Mule na wielu platformach"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 "To jest nazwa jaką inni użytkownicy będą widzieli łącząc się do Ciebie."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Język"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Język:"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Opóźnienie przed pokazaniem podpowiedzi."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Określa język jaki będzie używany do sterowania."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Różne opcje"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Sprawdź podczas startu czy jest nowa wersja"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Włączenie tego spowoduje, że aMule będzie sprawdzał, czy jest nowa wersja "
 "podczas startu"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Uruchom zminimalizowany"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Włączenie tego spowoduje minimalizowanie aMule podczas startu."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Pytaj przy wyjściu"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Włącza pytanie przed wyjściem z aMule."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "Pytaj przed zakończeniem aMule."
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Włącz ikonę w zasobniku"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "To włącza/wyłącza ikonę w zasobniku systemowym."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Zminimalizuj do ikony zasobnika"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5160,288 +3338,216 @@
 "Włączenie opcji spowoduje, że aMule będzie minimalizował się do paska "
 "systemowego zamiast paska stanu."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Opóźnienie podpowiedzi w sekundach"
-
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Opóźnienie przed pokazaniem podpowiedzi."
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Opóźnienie tooltipów: "
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "sekund"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Wybór przeglądarki"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Domyślny systemu"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Wybierz tu swoją przeglądarkę"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Przeglądarka użytkownika:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Wpisz tu nazwę swojej przeglądarki. Aby użyć zdefiniowanej przeglądarki "
-"wybierz opcje Użytkownika z rozwijanego menu."
+"Podaj tutaj nazwę swojej przeglądarki. Pozostaw to pole puste, aby korzystać "
+"z domyślnej przeglądarki systemu."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Przeglądaj"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Otwórz w nowej karcie jeśli to możliwe"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Otwórz stronę WWW w nowej karcie zamiast w nowym oknie jeśli to możliwe"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Odtwarzacz filmów"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Utwórz kopię zapasową dla podglądu"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Limity przepustowości"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Wysyłanie"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Przydział slotów"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Standardowy port TCP klienta:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Pporty"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Standardowy port TCP"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "To jest standardowy port eD2k i nie może być wyłączony."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Rozszerzony port UDP klienta:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "Port UDP dla żądań serwera (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr "Ten port UDP jest używany w rozszerzonych żądaniach sieci eD2K i Kad"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Rozszerzony port UDP (KAD / globalne wyszukiwanie)"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "wyłącz"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr "Ten port UDP jest używany do rozszerzonych żądań ed2k i sieci KAD"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Adres bindowania"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Port UDP dla rozszerzonych żądań serwera (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Ilość źródeł na plik"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Włącz UPnP dla przekierowania portów routera"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Twardy limit"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "Port UPnP TCP (opcjonalnie):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Limity połączeń"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Maks. połączeń"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Wiąż lokalne adresy z IP (puste dla każdego):"
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Tylko zaawansowani użytkownicy: Jeśli masz kilka interfejsów sieciowych, "
+"wpisz adres interfejsu do którego powiązany powinien być aMule."
+
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Maks. ilość źródeł dla pobieranego pliku:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Maksymalne połączenia jednoczesne:"
+
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Uniwersalne Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Włącz UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Port TCP UPnP:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Automatycznie połącz przy uruchomieniu"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Połącz ponownie po rozłączeniu"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Pokaż narzut przepustowości"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Opcje serwera"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Usuń martwe serwery po"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "próbach"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Autoaktualizacja listy serwerów przy starcie"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Uaktualnij listę serwerów przy połączeniu do serwera"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Uaktualnij listę serwerów przy połączeniu klienta"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Używaj systemu priorytetów"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Używaj inteligentnego sprawdzania LowID przy połączeniu"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Bezpieczne połączenie"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Automatyczne łączenie tylko do serwerów statycznych"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Ustaw priorytet ręcznie dodanych serwerów na Wysoki"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. aktywny"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH ufa każdemu skrótowi (niezalecane)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Inteligentna obsługa uszkodzeń (I.C.H.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Włączone"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Zaawansowane I.C.H. ufa każdemu skrótu (nie zalecane)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Dodaj pliki do pobrania w trybie wstrzymania"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Dodaj pliki do pobrania z automatycznym priorytetem"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Próbuj najpierw pobrać pierwszy i ostatni kawałek"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Dodaj udostępnione pliki z automatycznym priorytetem"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Próbuj przesłać pełne części do wszystkich pobierających"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Zacznij pobierać następny plik po skończeniu poprzedniego"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Zacznij następny wstrzymany plik, gdy plik gotowy"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Z tej samej kategorii"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Zapisz 10 źródeł dla rzadkich plików (< 20 źródeł)"
-
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Przestrzeń dyskowa"
-
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Sprawdź przestrzeń dyskową"
-
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Zaznacz jeśli chcesz, aby aMule sprawdzał Twoją przestrzeń dyskową"
-
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Minimalna przestrzeń dyskowa:"
-
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
-msgstr "Wpisz tu minimalną ilość miejsca na dysku."
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2077
+#: src/muuli_wdr.cpp:1811
 msgid "Preallocate disk space for new files"
 msgstr "Alokuj wstępnie przestrzeń dyskową dla nowych plików"
 
-#: src/muuli_wdr.cpp:2078
+#: src/muuli_wdr.cpp:1812
 msgid ""
 "For new files preallocates disk space for the whole file, thus reduces "
 "fragmentation"
@@ -5449,291 +3555,250 @@
 "Dla nowych plików alokuje wstępnie przestrzeń dyskową dla całego pliku "
 "redukując w ten sposób fragmentację"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Przychodzące"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Tymczasowe"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Udostępnione"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Zatrzymaj pobieranie gdy zabraknie wolnego miejsca na dysku"
+
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Zaznacz jeśli chcesz, aby aMule sprawdzał Twoją przestrzeń dyskową"
+
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
+msgstr "Wpisz tu minimalną ilość miejsca na dysku."
+
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Zapisz 10 źródeł dla rzadkich plików (< 20 źródeł)"
+
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Wysyłanie"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Dodaj udostępnione pliki z automatycznym priorytetem"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Folder docelowy dla pobrań"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Folder dla pobranych plików tymczasowych"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Udostępnione foldery"
+
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 "(Kliknij prawym przyciskiem na katalog, aby udostępnić go razem z "
 "podkatalogami)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Udostępnij pliki ukryte"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Wykresy"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Odśwież co : 5 sekund"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Czas dla wykresów średnich: 100 minut"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Skala wykresu połączeń: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Wybierz kolory statystyk"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Skala wykresu pobierania:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Skala wykresu przesyłania:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Kolory:"
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Tło"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Siatka"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Aktualnie pobierane"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Bieżąca średnia pobierania"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Średnia pobierania sesji"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Aktualnie wysyłane"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Bieżąca średnia wysyłania"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Średnia wysyłania sesji"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Aktywnych połączeń"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Ikona prędkości w zasobniku systemowym"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Obecne Kad-węzły "
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Działające Kad-węzły"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Sesyjne Kad-węzły"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Wybierz"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Drzewo"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Liczba wyświetlanych wersji klienta (0=nieograniczona)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Możliwości łącza"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Uwaga: wartości te są używane tylko do celów statystycznych."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! UWAGA !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Nie zmieniaj tych ustawień, chyba że dobrze wiesz co robisz - \n"
-"w przeciwnym wypadku możesz coś łatwo zepsuć.\n"
-"\n"
-"aMule będzie działał prawidłowo bez zmiany tych ustawień."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Ustawienia zaawansowane"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Maks. nowych połączeń"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Rozmiar bufora plików: 240000 bajtów"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Rozmiar kolejki wysyłania: 5000 klientów"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Odświeżanie połączeń do serwera co: Wyłączone"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Postęp Kolejki Ściąganych Plików "
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Pokaż procentowo"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Pokaż pasek postępu "
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Styl paska postępu"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Płaski"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Okrągły"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Wsparcie skórek"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Włącz obsługę skórek "
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Skórka:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- brak dostępnych skórek -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Sortowanie kolumn"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Automatyczne sortowanie plików w kolejce pobierania (mocne CPU)"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule będzie sortował kolumny w liście pobierania automatycznie"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Skóra do użycia:"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Inne ustawienia GUI"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Pokazuj szybkie wyłapywanie linków eD2K"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Pokazuj \"Szybkie wyłapywanie linków eD2K\" w każdym oknie."
 
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Pokaż rozszerzone info w kartach kategorii"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Pokaż prędkość transferu w tytule"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "Pokaż prędkość transferu w tytule"
 
-#: src/muuli_wdr.cpp:2412
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Przed nazwą aplikacji"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Za nazwą aplikacji"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Pokaż narzut przepustowości"
+
+#: src/muuli_wdr.cpp:2124
 msgid "Vertical toolbar orientation"
 msgstr "Pionowa orientacja paska narzędzi"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Pokaż numer pliku części przed nazwą pliku"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Parametry serwera sieciowego"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Pobierane pliki w kolejce"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Uruchom amuleweb podczas startu"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Port serwera sieciowego"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Włącz forwarding portu UPnP na porcie serwera sieciowego"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Port TCP UPnP serwera sieciowego"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Pokaż procent postępu"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Odświeżanie strony co:  (w sekundach)"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Pokaż pasek postępu"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Włącz kompresję Gzip"
-
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Włącz użytkowników z niskimi uprawnieniami"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Płaski"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Hasło pełnych uprawnień"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Okrągły"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Hasło niskich uprawnień"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Auto-sortowanie plików (wysokie obciążenie procesora)"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Szablon WWW"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "aMule będzie sortował kolumny w liście pobierania automatycznie"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Parametry zewnętrznych połączeń"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Akceptuj zewnętrzne połączenia"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"IP nasłuchującego interfejsu\n"
-"(puste jeśli dowolny)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP z interfejsem słuchania:"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5741,75 +3806,116 @@
 "Wprowadź tutaj w formacie a.b.c.d prawidłowy adres ip nasłuchującego "
 "interfejsu EC. Puste pole lub 0.0.0.0 oznacza dowolny interfejs."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Port TCP"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "Port TCP:"
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Włącz forwarding portu UPnP na porcie EC"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Hasło"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Parametry serwera sieciowego"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Uruchom serwera internetowego przy starcie"
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Szablon WWW"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Hasło pełnych uprawnień"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Włącz użytkowników z niskimi uprawnieniami"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Hasło niskich uprawnień"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Włącz przekierowanie portu UPnP na port serwera internetowego"
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Port web serwera UPnP TCP (opcjonalnie)"
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Odświeżanie strony co:  (w sekundach)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Włącz kompresję Gzip"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Kliknij tu aby zastosować wszystkie zmiany dokonane w preferencjach."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Reset wszystkich zmian dokonanych w preferencjach."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Tytuł :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Komentarz :"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Katalog przychodzących :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Zmień priorytet nowo przydzielonych plików :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "Nie zmieniaj"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Wybierz kolor dla tej kategorii (aktualnie wybrany) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Wyświetl motd serwera po połączeniu ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Serwer Info"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Resetuj"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Kliknij tu aby wyczyścić logi."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Logi aMule"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Kliknij na tym przycisku aby uaktualnić listę serwerów z URL-a ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Lista serwerów"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5817,43 +3923,55 @@
 "Wpisz tu url do pliku server.met  i przyciśnij przycisk po lewej aby "
 "zaktualizować listę znanych serwerów."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Dodaj serwer ręcznie: Nazwa"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Wpisz tu nazwę nowego serwera"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Port "
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Wpisz tu IP serwera, używając formatu x.x.x.x ."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Wpisz tu port serwera."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Dodaj ręcznie serwer (wypełnij pola od lewej) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Logi aMule"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Serwer Info"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
-msgstr "ED2K Info"
+msgstr "Info eD2K"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
-msgstr "Kad Info"
+msgstr "Info Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Kliknij ten przycisk, aby uaktualnić listę węzłów z adresu URL ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Węzły (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5861,51 +3979,55 @@
 "Wprowadź tutaj url pliku nodes.dat i naciśnij przycisk z lewej, aby "
 "zaktualizować listę znanych węzłów."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Statystyki węzłów"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Bootstrap"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Nowy węzeł"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Port:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Rozruch od \n"
-"znanych klientów"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Rozruch od znanych klientów"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Rozłącz z Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "Info eD2k"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Użyj bezpiecznej identyfikacji użytkownika"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Zalecane jest włączenie tej opcji. Nic nie zyskasz wyłączając bezpieczną "
+"identyfikację użytkownika."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Maskowanie protokołu"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Obsługa maskowania protokołu"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5913,11 +4035,11 @@
 "Opcja ta włącza maskowanie protokołu i powoduje, że aMule będzie akceptował "
 "zamaskowane połączenia od innych klientów."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Użyj maskowania dla połączeń wychodzących"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5925,11 +4047,11 @@
 "Opcja ta powoduje, że aMule będzie używał maskowania protokołu podczas "
 "łączenia z innymi klientami/serwerami."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Akceptuj tylko zamaskowane połączenia"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5937,83 +4059,79 @@
 "Opcja ta powoduje, że aMule akceptuje tylko zamaskowane połączenia. Uzyskasz "
 "mniej źródeł, ale cały twój ruch będzie zamaskowany"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Opcje plików"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Wszyscy"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Nikt"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Kto może zobaczyć udostępnione pliki:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Kto może widzieć moje udostępnione pliki:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Wybierz kto może zażądać pokazania listy twoich udostępnionych plików."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Filtrowanie IP"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtruj klientów"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Włącza filtrowanie IP klientów zdefiniowanych w pliku ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtruj serwery"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Włącza filtrowanie IP serwerów zdefiniowanych w pliku ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
-msgstr "Odśwież listę"
+msgstr "Przeładuj listę"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Przeładuj listę filtrowanych IP z pliku ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Uaktualnij teraz"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Uaktualniaj filtr IP przy starcie"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Poziom filtrowania:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Zawsze filtruj IP z LAN"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoidalna obsługa niepasujących IP"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6021,11 +4139,11 @@
 "Odrzuca pakiety, gdy ip klienta jest różne od ip, z którego pakiet jest "
 "otrzymywany. Używaj z ostrożnością."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Użyj ogólno-systemowego ipfilter.dat jeśli dostępny"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -6033,23 +4151,11 @@
 "Jeśli ipfilter.dat nie istnieje lokalnie, zezwól na użycie ogólno-"
 "systemowego pliku ipfilter."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Użyj bezpiecznej identyfikacji użytkownika"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Zalecane jest włączenie tej opcji. Nic nie zyskasz wyłączając bezpieczną "
-"identyfikację użytkownika."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Włącz podpis online"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6057,813 +4163,1279 @@
 "Włącza zapisywanie pliku OS, który może być użyty przez zewnętrzne aplikacje "
 "do stworzenia sygnatury itp."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Częstotliwość odświeżania (sek):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Zmień częstotliwość (w sekundach) aktualizacji Sygnatury Online."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Katalog podpisu online:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Zapisz podpis internetowy w pliku: "
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr "Kliknij tu aby wskazać katalog zawierający pliki Sygnatur Online."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Wyłączony/Włączony"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtruj wiadomości przychodzące (za wyjątkiem aktualnej rozmowy):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Opcje filtrowania:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtruj wszystkie wiadomości"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtruj wiadomości od ludzi, którzy nie są na twojej liście znajomych"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtruj wiadomości od nieznanych klientów"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtruj wiadomości zawierające (jako separatora użyj ','):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "dodaj frazy które według których amule powinien filtrować i blokować "
 "wiadomości"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Pokaż otrzymane wiadomości w dzienniku"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Komentarze"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtruj komentarze zawierające (użyj ',' jako separatora):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Automatyczne łączenie z serwerem bez proxy"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Włącz uwierzytelnianie"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Włącza/Wyłącza uwierzytelnianie login/hasło"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Nazwa uzytkownika:"
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Login używany do połączeń z proxy"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Hasło:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Hasło używane do połączeń z proxy"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Włącz proxy"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Włącza/Wyłącza obsługę proxy"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Typ proxy:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Typ serwera proxy do którego się łączysz"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Adres proxy:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Nazwa hosta proxy"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Port proxy:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Port serwera proxy"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Uwierzytelnianie"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Włącz uwierzytelnianie"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Włącza/Wyłącza uwierzytelnianie login/hasło"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Login używany do połączeń z proxy"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Hasło:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Hasło używane do połączeń z proxy"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Automatyczne łączenie z serwerem bez proxy"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Połącz z:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Login do zdalnego amule"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Nazwa użytkownika"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Zapamiętaj te ustawienia"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Włącz gadatliwe logowanie debugowe."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Kategorie wiadomości:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Czekam..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Dodaj importy"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Przywróć wybrane"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Usuń wybrane"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "Typy zdarzeń"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+"Statystyki i klienty w kolejce dla wybranego plik(u-ów) : Sesja / Cały czas"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Aktywne wysyłania"
+
+#: src/muuli_wdr.cpp:3368
+#, fuzzy
+msgid "Percent of total files"
+msgstr "procent wszystkich plików"
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Wszystkie udostępnione pliki"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Wybierz filtr przeglądania"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Aktywne wysyłania"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Pokaż klientów"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Przeładuj:"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Przeładuj twoje udostępnione pliki"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Wyślij"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Wysyła wybraną wiadomość."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Zamknij tę sesję czata."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Podłącz do dowolnego serwera i/lub Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Okno sieci"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Udostępnione pliki"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Okno wyszukiwania"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Wyłączone [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Transfery plików"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "bajt"
+msgstr[1] "bajty"
+msgstr[2] "bajtów"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Okno udostępnionych plików"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Okno wiadomości"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Okno wykresów statystyk"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Okno preferencji"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nowa kategoria"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Wybierz folder na pobierane pliki"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Musisz określić nazwę kategorii!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "bajt/sek"
+msgstr[1] "bajty/sek"
+msgstr[2] "bajtów/sek"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Musisz określić ścieżkę dla kategorii!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"Nie udało się utworzyć katalogu przychodzących dla kategorii. Proszę podać "
-"właściwą ścieżkę!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "sek"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "min"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "godzin"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Dni"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "wszystkie"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "wszystkie inne"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Niekompletne"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Zatrzymany"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Film"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Archiwum"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Tekst"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Aktywny"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Nieznane rozszerzenie '%s' dla komendy '%s'.\n"
+msgid "Using config dir: %s"
+msgstr "Używanie katalogu konfiguracyjnego: %s"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Oczekiwanie na koniec wątku przemiany pliku części ..."
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Nieznana komenda '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Importowanie %s: %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Ta komenda nie może posiadać argumentu.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Wczytywanie katalogu temp"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Ta komenda musi posiadać argument.\n"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Odbieranie podstawowych informacji z info pobieranego pliku"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Tworzenie pliku docelowego"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Ładowanie danych ze starego pobieranego pliku (%u z %u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Zapisywanie bloku w nowym pojedynczym pobieranym pliku (%u z %u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Odbieranie informacji o źródłach pobieranego pliku"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Dodawanie pobierania i zapisywanie nowego pliku części"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Import pliku części"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Stan"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Skrót pliku"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Dysk: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Ta komenda jest niekompletna, użyj jednego z rozszerzeń podanych niżej.\n"
+"Proszę wybraćkatalog w celu poszukiwania tymczasowych pobierań! (Podkatalogi "
+"zostaną uwzględnione)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Dostępne rozszerzenia:\n"
+"Czy chcesz, aby źródła pomyślnie zaimportowanych pobierań zostały usunięte?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Dostępne komendy:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Usunąć źródła?"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "BŁĄD: Nie udało się utworzyć pliku części)"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Wszystkie komendy są niewrażliwe na wielkość znaków.\n"
-"Wpisz '%s <komenda>', aby uzyskać szczegółowe informacje na temat "
-"<komenda>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Próbuję załadować kopię zapasową pliku met z %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Wychodzi z programu."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "BŁĄD: Nie udało się otworzyć pliku part.met: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Pokaż pomoc."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "BŁĄD: plik part.met ma zerowy rozmiar: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "BŁĄD: Nieprawidłowa wersja pliku part.met: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Aby uzyskać pomoc dotyczącą komendy, wpisz 'help <komenda>'.\n"
-"Aby uzyskać pełną listę komend, wpisz 'help'.\n"
+"BŁĄD: %s (%s) jest uszkodzony (zła ilość znaków), nie mogę otworzyć pliku."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Użyj '%s' aby otrzymać listę komend\n"
-"\n"
+"BŁĄD: %s (%s) jest uszkodzony (zła ilość znaków), nie mogę otworzyć pliku."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Błąd składni!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Próbuję odzyskać informacje o pliku..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"Błąd przetwarzania komendy - to nie powinno się zdarzyć! Proszę zgłosić "
-"błąd\n"
+"Odzyskiwanie nienazwanego pliku - będę próbował odzyskać go jako "
+"RecoveredFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Ta komenda nie powinna posiadać żadnego parametru."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+"Odzyskano wszystkie możliwe informacje o pliku :D - Próbuję ich użyć..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Ta komenda musi posiadać parametr."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Nie mogę odzyskać informacji o pliku :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Nieprawidłowy argument."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Nie udało się otworzyć: %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "To jest niekompletna komenda."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "OSTRZEŻENIE: %s może być uszkodzony (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Wpisz '%s' , aby uzyskać więcej pomocy.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "BŁĄD podczas zapisywania pliku części: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "Awaria IO podczas zapisywania pliku części:"
+
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "To jest %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Nie można pobrać długości '%s' - użyto pliku %s."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "To jest %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' ma zerowy rozmiar - używam pliku '%s'."
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Nie udało się zapisać pliku part.met.seeds dla %s"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Zapisano %i zarodek źródeł dla pliku części: %s (%s)"
+msgstr[1] "Zapisano %i zarodki źródeł dla pliku części: %s (%s)"
+msgstr[2] "Zapisano %i zarodków źródeł dla pliku części: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Plik części %s (%s) nie ma pliku zarodków"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Plik części %s (%s) ma nieważny plik zarodków"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Błąd podczas odczytu pliku źródeł plików części  (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Znaleziono uszkodzoną część (%d) w %d pliku części %s - FileResultHash |%s| "
+"FileHash |%s|"
+msgstr[1] ""
+"Znaleziono uszkodzoną część (%d) w %d plikach części %s - FileResultHash |%"
+"s| FileHash |%s|"
+msgstr[2] ""
+"Znaleziono uszkodzoną część (%d) w %d plikach części %s - FileResultHash |%"
+"s| FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Znaleziono kompletnych części (%i) w %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Skończono ponowne tworzenie skrótu %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Nieoczekiwany błąd podczas zakańczania %s. Plik wstrzymany"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Skończono pobieranie: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Usuwanie pliku: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Tworzenie klienta...\n"
+"OSTRZEŻENIE: Nie można utworzyć skrótu pobranej części - zestaw skrótów jest "
+"niekompletny dla '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"OK, wychodzę %s...\n"
+"BŁĄD: Nie można utworzyć skrótu pobranej części - zestaw skrótów "
+"niekompletny (%s). Nie powinno do tego dojść"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Nie można połączyć z pustym hasłem.\n"
-"Musisz podać hasło poprzez edycję pliku konfiguracyjnego\n"
-"lub poprzez linię poleceń, lub podaj je kiedy zostaniesz o to poproszony.\n"
-"\n"
-"Wychodzę...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Pokazuj ten tekst pomocy."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "UWAGA: Niewystarczająca ilość wolnego miejsca! Wstrzymywanie pliku: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Host gdzie jest uruchomiony aMule. (domyślny: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Pobrana część %i jest uszkodzona w pliku: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Port zewnętrznych połączeń aMule. (domyślny: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Odzyskano uszkodzoną część %i dla %s -> Zapisanych bajtów: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Hasło połączeń zewnętrznych."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Alokuję"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Czyta konfiguracje z pliku."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Niewystarczająca ilość przestrzeni dyskowej"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Nie wysyłaj żadnego wyjścia na stdout."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Pobrano"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Bądź gadatliwy - pokazuj także wiadomości diagnostyczne."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "BŁĄD: Nie udało się otworzyć pliku części '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Ustawia locale programu (język)."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Domyślny systemowy"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Zapisuje opcje listy komend do pliku konfiguracyjnego."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albański"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Tworzy plik konfiguracyjny oparty na pliku konfiguracyjnym aMule."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabski"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Drukuj wersję programu."
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturyjski"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Baskijski"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bułgarski"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Kataloński"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Chiński (Uproszczony)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Chiński (Tradycyjny)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Chorwacki"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Czeski"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Duński"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Holenderski"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Angielski (U.K.)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estoński"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Fiński"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Francuski"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galicyjski"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Niemiecki"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Grecki"
 
-#: src/ClientCreditsList.cpp:168
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebrajski"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Węgierski"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Włoski"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Włoski (Szwajcarski)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japoński"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Koreański"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Litewski"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norweski (Nynorsk)"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polski"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugalski"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugalski (Brazylijski)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Rosyjski"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Słoweński"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Hiszpański"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Szwedzki"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turecki"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ukraiński"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Zmień język"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
+
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "Niedostępny"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "nie ma dostępnych opcji"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Znaleziono nieprawidłową kategorie, pomijam"
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
+"Port TCP nie może być większy niż 65532, gdyż gniazdo UDP serwera będzie TCP"
+"+3"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Plik kredytów załadowany, %u klient jest znany"
-msgstr[1] "Plik kredytów załadowany, %u klientów jest znanych"
-msgstr[2] "Plik kredytów załadowany, %u klientów jest znanych"
+msgid "Default port will be used (%d)"
+msgstr "Zostanie użyty domyślny port (%d)"
 
-#: src/ClientCreditsList.cpp:171
+#: src/Preferences.cpp:1790
 #, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Kredyty wygasły dla %u klienta!"
-msgstr[1] " - Kredyty wygasły dla %u klientów!"
-msgstr[2] " - Kredyty wygasły dla %u klientów!"
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Usuwam nieistniejące udostępnione katalogi: %s"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Nie znaleziono pliku cryptkey.dat, tworzenie."
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Połączenie"
 
-#: src/amuled.cpp:594
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Katalogi"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Serwery"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Pliki"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Bezpieczeństwo"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Interfejs"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Filtry"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Zdalna kontrola"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Sygnatura Online"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Zawansowane"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Zdarzenia"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Debugowanie"
+
+#: src/PrefsUnifiedDlg.cpp:249
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
-"BŁĄD: daemon aMule nie może być użyty, gdy zewnętrzne połączenia są "
-"zablokowane. Aby włączyć połączenia zewnętrzne użyj normalnego aMule, włącz "
-"amuled z opcją --ec-config lub ustaw klucz \"AcceptExternalConnections\" na "
-"1 w pliku ~/.aMule/amule.conf"
+"Następujące zmienne zostaną zastąpione:\n"
+"    %PARTFILE - pełna ścieżka do pliku\n"
+"    %PARTNAME - tylko nazwa pliku"
 
-#: src/amuled.cpp:750
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Nie zmieniaj tych ustawień, chyba że dobrze wiesz co robisz - \n"
+"w przeciwnym wypadku możesz coś łatwo zepsuć.\n"
+"\n"
+"aMule będzie działał prawidłowo bez zmiany tych ustawień."
+
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "ERROR: %s"
-msgstr "BŁĄD: %s"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Błąd połączenia Cfg do widżetu z identyfikatorem %d i kluczem %s"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Odbanuj"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Pokaż wysyłane"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Pokaż kolejkę"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
+"Błąd przesyłania danych połączenia z Cfg do widżetu z identyfikatorem %d i "
+"kluczem %s"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Pokaż klientów"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Typ serwera proxy do którego się łączysz"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Wybierz widok"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Oprogramowanie klienta"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Czekał"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Czas wysyłania"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Wysyłanie/Pobieranie"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Zdalny Status"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Priorytet pliku"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
+"Błąd przesyłania danych połączenia z widżetu do Cfg z identyfikatorem %d i "
+"kluczem %s"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Punkty"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"aMule musi zostać zrestartowany przed wprowadzeniem tych zmian:\n"
+"\n"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Poprosił"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- Zmieniono port TCP.\n"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Ostatnio widziany"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- Zmieniono port UDP.\n"
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Wszedł do kolejki"
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Zewnętrzne połączenie zamknięte."
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Status wysyłania"
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Nowe zewnętrzne połączenie zaakceptowane"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Wysłanych"
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Zewnętrzne połączenie zamknięte."
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Status pobierania"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"Twoja lista auto-aktualizacji serwerów jest pusta.\n"
+"'Autoaktualizacja listy serwerów przy starcie' zostanie wyłączona."
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Pobranych"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Skrót użytkownika"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Zaszyfrowane"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Ukryj udostępniane pliki"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Połączenia zewnętrzne zostały włączone, ale nie zostało podane hasło.\n"
+"Połączenia zewnętrzne nie mogą być włączone dopóki nie zostanie podane "
+"poprawne hasło."
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Szczegóły klienta"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Zmieniono język.\n"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Włączony"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Zmieniono folder tymczasowy.\n"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Obsługiwany"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- sieć ED2K włączona.\n"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Nieobsługiwany"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Zarówno sieć eD2K jak i Kad zostały wyłączone.\n"
+"Nie będzie możliwe połączenie, dopóki nie włączysz przynajmniej jednej z "
+"nich."
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Wyłączony"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad nie uruchomi się, jeśli twój port UDP jest wyłączony.\n"
+"Włącz port UDP lub wyłącz Kad."
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Musisz zrestartować teraz aMule.\n"
+"Jeśli nie zrestartujesz go teraz, nie narzekaj, jeśli stanie się coś złego.\n"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Niekompletne"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Twoja lista automatycznych aktualizacji serwerów jest pusta.\n"
+"Proszę wpisać co najmniej jeden URL wskazujący poprawny plik server.met.\n"
+" Kliknij na przycisku \"Lista\", aby wpisać URL."
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Zły człowiek"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Pliki tymczasowe"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Weryfikacja - OK"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Pliki przychodzące"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Niedostępne"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Sygnatury Online"
 
-#: src/ClientDetailDialog.cpp:215
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+msgid "Choose a folder for %s"
+msgstr "Wybierz folder na %s"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr "Min. rozmiar musi być mniejszy od maks. Zignorowano maks. rozmiar."
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Szukaj odtwarzacza filmów"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Ostrzeżenie wyszukiwania"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Wybierz przeglądarkę"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Nielimitowane"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "Program%s"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Menu podajnika aMule"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Edytuj listę serwerów"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Limity prędkości:"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Dodaj jeden URL w każdej linii.\n"
+"Tylko jeden URL w każdej linii."
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "UL: Brak"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Opóźnienie odświeżania: %d sekunda"
+msgstr[1] "Opóźnienie odświeżania: %d sekundy"
+msgstr[2] "Opóźnienie odświeżania: %d sekund"
 
-#: src/MuleTrayIcon.cpp:354
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "UL: %u"
-msgstr "UL: %u"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Czas dla przeciętnego wykresu: %d minuta"
+msgstr[1] "Czas dla przeciętnego wykresu: %d minuty"
+msgstr[2] "Czas dla przeciętnego wykresu: %d minut"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DL: Brak"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Skala wykresu połączeń: %d"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "DL: %u"
-msgstr "DL: %u"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Rozmiar bufora pliku: %d bajt"
+msgstr[1] "Rozmiar bufora pliku: %d bajty"
+msgstr[2] "Rozmiar bufora pliku: %d bajtów"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Prędkość pobierania: %.1f"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Rozmiar kolejki wysyłania: %d klient"
+msgstr[1] "Rozmiar kolejki wysyłania: %d klientów"
+msgstr[2] "Rozmiar kolejki wysyłania: %d klientów"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Prędkość wysyłania: %.1f"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Odświeżanie połączeń do serwera co: %d minutę"
+msgstr[1] "Odświeżanie połączeń do serwera co: %d minuty"
+msgstr[2] "Odświeżanie połączeń do serwera co: %d minut"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Informacje o kliencie"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Odświeżanie połączeń do serwera co: Wyłączone"
 
-#: src/MuleTrayIcon.cpp:380
-#, c-format
-msgid "Nickname: %s"
-msgstr "Ksywka: %s"
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "wyłączone"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Nie wybrano ksywki!"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "Wykonaj komendę przy wydarzeniu `%s'"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID klienta: "
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Włącz wykonanie komendy w rdzeniu"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Nazwa serwera: "
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Komenda rdzenia:"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP serwera: "
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Włącz wykonanie komendy w GUI"
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Komenda GUI:"
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
-msgstr "Port TCP: %d"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Następujące zmienne zostaną zastąpione:"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "Port TCP: Nie gotowy"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr "Min. rozmiar musi być mniejszy od maks. Zignorowano maks. rozmiar."
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
-msgstr "Port UDP: %d"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Ostrzeżenie wyszukiwania"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "Port UDP: Nie gotowy"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Główne"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Podpis online: Włączony"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Nie można wykonać wyszukiwania Kad, jeśli Kad nie jest włączony"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Podpis online: Wyłączony"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "Nie można wykonać wyszukiwania eD2K, jeśli eD2K nie jest połączony"
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
-msgstr "Udostępnionych plików: %d"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Nieoczekiwany błąd podczas próby wyszukiwania Kad: "
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
-msgstr "Klientów w kolejce: %d"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "ID pliku"
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
-msgstr "Razem DL: %s"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Plik"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Pobieranie w kategorii"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Dodaj opcjonalny URL dla tego pliku"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Szukaj powiązanych plików (eD2k, serwer lokalny)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Oznacz jako znany plik"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Skopiuj link eD2k do schowka"
+
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Anulowane"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Nowy"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Nie udało się połączyć do wszystkich zamaskowanych serwerów na liście. "
+"Próbuję ponownie bez maskowania."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Nie udało się połączyć do serwerów z listy. Kolejne podejście."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "Sieć eD2K wyłączona w preferencjach, nie łączę."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "Nie ma poprawnych serwerów do połączenia na liście"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "Razem UL: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Połączony z %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Limit wysyłania"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Nawiązano połączenie z: %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Limit pobierania"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Błąd krytyczny podczas próby łączenia. Może nie ma połączenia do internetu"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Ukryj aMule"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Utracono połączenie z %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Pokaż aMule"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) wygląda na wyłączony."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Rozpoczęto sesję czata: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) wygląda na pełny."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Połączony do klienta ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Automatyczne łączenie do serwera nastąpi za %d sekundę"
+msgstr[1] "Automatyczne łączenie do serwera nastąpi za %d sekundy"
+msgstr[2] "Automatyczne łączenie do serwera nastąpi za %d sekund"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Łączenie z klientem ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Utracono połączenie"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Nie udało się połączyć do klienta / Połączenie utracone ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Łączenie z %s (%s:%i) nieudane."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Zamknij kartę"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "BŁĄD: nieprawidłowe gniazdo przy sprawdzaniu timeouta"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Zamknij wszystkie karty"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Próba połączenia z %s (%s:%i) przedawniła się."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Zamknij inne karty"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Otrzymano późny wynik wyszukiwania DNS, odrzucanie."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Otwieram plik server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Nieznaleziono pliku server.met!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Nie udało się załadować pliku server.met '%s', napotkano nieznany format."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Nie udało się otworzyć server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Uszkodzony plik server.met, znaleziono nieprawidłowy versiontag: 0x%x, "
 "rozmiar %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
@@ -6871,7 +5443,7 @@
 msgstr[1] "%i serwery znaleziono w server.met"
 msgstr[2] "%i serwery znaleziono w server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
@@ -6879,53 +5451,62 @@
 msgstr[1] "%d serwery dodane"
 msgstr[2] "%d serwerów dodanych"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "Błąd IO podczas odczytu pliku %s: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Serwer nie dodany: [%s:%d] nie określa prawidłowego portu."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Serwer nie dodany: Ten IP [%s:%d] jest filtrowany lub niepoprawny."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Serwer nie dodany: Serwer z takim IP:Portem [%s:%d] znaleziony na liście."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Serwer dodany: Serwer na [%s:%d] używający nazwy '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr ""
 "Jesteś połączony do serwera który chcesz usunąć. Proszę rozłącz się najpierw."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Nie udało się otworzyć '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Nie udało się zapisać server.met!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Nieprawidłowy URL"
 
-#: src/ServerList.cpp:805
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Finished to download the server list from %s"
+msgid "Finished downloading the server list from %s"
 msgstr "Zakończono pobieranie listy serwerów z %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Nie udało się pobrać listy serwerów z %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6933,22 +5514,27 @@
 "Brak wpisu listy adresów serwerów w 'addresses.dat'. Wklej prawidłową listę "
 "adresów do tego pliku, aby automatycznie zaktualizować listę twoich serwerów"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Rozpocznij pobieranie listy serwerów z %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "UWAGA: określono nieprawidłowo adres URL dla autoaktualizacji serwerów: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Niepoprawny url do auto-pobierania serwer.met w adresses.dat"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Nie udało się pobrać listy serwerów z %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -6956,879 +5542,2671 @@
 "Serwer lokalny jest filtrowany przez IPFilters, podłączam ponownie do innego "
 "serwera!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Nie powiodło się wykonanie komendy `%s' przy zdarzeniu `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Nazwa serwera"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Adres"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Port"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Opis"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Użytkowników"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Stałe"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Wersja"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Twoje ustawienia lokalne zostały zmienione na domyślne systemowe w związku "
-"ze zmianą konfiguracji. Przepraszamy."
+"Próbujesz usunąć serwer z którym jesteś połączony. Proszę się najpierw "
+"rozłączyć. Serwer NIE został usunięty."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Nieznana nazwa)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Na pewno chcesz usunąć serwer statyczny %s"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Serwery (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Serwer"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Połącz z serwerem"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Oznacz serwer jako statyczny"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Oznacz serwer jako nie statyczny"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Oznacz serwery jako statyczne"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Oznacz serwery jako nie statyczne"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Usuń serwer"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Usuń serwery"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Usuń wszystkie serwery"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Skopiuj linki eD2k do schowka"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Połącz ponownie z serwerem"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Na pewno chcesz usunąć wszystkie serwery?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Jesteś pewien, że chcesz usunąć wybrany serwer?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Jesteś pewien, że chcesz usunąć wybrane serwery?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "BŁĄD: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "OSTRZEŻENIE: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Twoje nowe id to %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "OSTRZEŻENIE: Otrzymałeś Low-ID!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
-"Nie masz żadnego serwera na twojej liście serwerów.\n"
-"Czy chcesz, żeby aMule pobrał nową listę teraz?"
+"\tNajprawdopodobniej jest to spowodowane tym, że jesteś za firewallem lub "
+"routerem."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Pobieranie listy serwerów"
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tPo więcej informacji udaj się na http://wiki.amule.org"
 
-#: src/amule.cpp:846
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Otrzymane info nieznanego serwera! - za krótkie"
+
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "web server running on pid %d"
-msgstr "serwer sieciowy uruchomiony na pid %d"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Otrzymano %d nowy serwer"
+msgstr[1] "Otrzymano %d nowe serwerów"
+msgstr[2] "Otrzymano %d nowych serwerów"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Zapisywanie listy serwerów zakończone."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Serwer odrzucił ostatnią komendę"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Otrzymano podrobiony pakiet z serwera: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Nieobsługiwany błąd w trakcie przetwarzania pakietu z serwera: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Nie mogę utworzyć wątku rozwiązywania dns dla połączenia do %s"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "IP serwera %s (%s) jest filtrowane. Nie łącze."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "używa maskowania protokołu."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Łączę z  %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Nie mogę rozwiązać dns dla serwera %s: Nie mogę połączyć!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Serwer nie dodany: Nie podano IP lub nazwy hosta."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Serwer nie dodany: Podano nieprawidłowy port serwera."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Status eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Status Kademlii:"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "Uruchomiony na %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Uruchomiony"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Status:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Stan połączenia:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Za firewallem - otwórz port %d TCP w routerze lub firewallu"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "Stan połączenia UDP:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Za firewallem - otwórz port %d UDP w routerze lub firewallu"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Stan firewalla: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Bez wymagania kolegi - otwarty port TCP"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Bez wymagania kolegi - otwarty port UDP"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Brak kolegów"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Łączenie do kolegi"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Łączenie do kolegi przy %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Indeksowane źródła:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Indeksowane słowa kluczowe:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Indeksowane uwagi:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Załadowane indeksowania:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Średnio użytkowników:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Średnio plików:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Nie uruchomiony"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Dodawanie pliku %s do udostępnień"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Znaleziono %i znany udostępniony plik"
+msgstr[1] "Znaleziono %i znane udostępnionych plików"
+msgstr[2] "Znaleziono %i znanych udostępnionych plików"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Znaleziono %i znany udostępniony plik, %i nieznanych"
+msgstr[1] "Znaleziono %i znane udostępnionych plików, %i nieznanych"
+msgstr[2] "Znaleziono %i znanych udostępnionych plików, %i nieznanych"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "BŁĄD: Próba udostępnienia %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Nie znaleziono katalogu udostępnionego, pomijam: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Nie znaleziono plików do udostępniania w katalogu: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Nazwa uzytkownika"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Prędkość pobierania"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Prędkość wysyłania"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Dostępne części"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Status wysyłania"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Status pobierania"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Źródło"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Nazwa pliku lokalnego"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Udostępnione pliki"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Żądania"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Zaakceptowane żądania"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Przesłane dane"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Ratio wymiany"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Otrzymane części"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Pełne źródła"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Ścieżka katalogu"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Dodaj komentarz/ocenę"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Edytuj komentarz/ocenę"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Zmień nazwę"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Dodaj pliki kolekcji do listy pobierania"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Kopiuj magnet &URI do schowka"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Kopiuj link eD2k do schowka (Ź&ródło)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Kopiuj link eD2k do schowka (Źródło) (&Z opcjami Crypt)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Kopiuj link eD2k do schowka (Nazwa &hosta)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr "Kopiuj link eD2k do schowka (Nazwa hosta) (Z opcjami &Crypt)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Kopiuj link eD2k do schowka (Informacje &AICH)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Potrzebujesz HighID, aby stworzyć poprawny link źródłowy"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Udostępnione pliki (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[Plik części]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Nazwa pliku"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Wysłane dane (Sesja (Razem)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Łączny narzut  (Pakiety): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Narzut żądań pliku (Pakiety): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Narzut wymiany źródeł (Pakiety): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Narzut serwera (Pakiety): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Narzut Kad (Pakiety): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Narzut Crypt (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Aktywne wysyłanie: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Oczekujące wysyłanie: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Całkowita ilość udanych sesji wysyłania: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Całkowita ilość nieudanych sesji wysyłania: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Średni czas wysyłania: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Pobrane dane (Sesja (Razem)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Znaleziono źródła: %s"
 
-#: src/amule.cpp:850
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Aktywne pobieranie (części): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Stosunek UL:DL sesji (Razem): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Średnie tempo pobierania (sesja): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Średnie tempo wysyłania (sesja): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Maksymalne tempo pobierania (sesja): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Maksymalne tempo wysyłania (sesja): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Ponowne łączenia: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Czas od pierwszego transferu: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Podłączony do serwera od: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Aktywne połączenia (szacunkowo): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Osiągnięto maks. limit połączeń: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Średnio połączeń (szacunkowo): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Szczytowe połączenia (szacunkowo): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Klienci"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Nieznane: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Filtrowane: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Zbanowane: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Razem: %i Znanych: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Działające serwery:  %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Niedziałające serwery: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "W sumie: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Usunięte serwery: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Przefiltrowane serwery: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Użytkowników na działających serwerach: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Plików na działających serwerach:  %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "W sumie użytkowników: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "W sumie plików: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Zajętość serwera: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Liczba udostępnianych plików: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Łączny rozmiar udostępnianych plików: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Średni rozmiar pliku: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "System operacyjny"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Nie otrzymano"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktywnych połączeń (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Niedostępny"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Nigdy"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Komenda `%s' z pid `%d' zakończyła działanie ze statusem `%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Wykonaj <str> i wyjdź."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Niepoprawny format IP. Użyj xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 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"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Zażądałeś włączenia serwera sieciowego podczas uruchomienia, ale binarki "
-"amuleweb nie mogą być uruchomione. Zainstaluj paczkę zawierającą serwer "
-"sieciowy aMule lub skompiluj aMule używając --enable-webserver i uruchom "
-"make install"
+"Komenda ta wymaga argumentu. Prawidłowe argumenty: 'all', nazwa pliku lub "
+"liczba.\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Przetwarzanie przez skrót: "
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Przetwarzanie przez nazwę pliku: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr "Komenda ta wymaga argumentu. Prawidłowe arguentu: skrót pliku.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Niepoprawny numer\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Nieprawidłowy skrót (długość powinna wynosić dokładnie 32 znaki)\n"
 
-#: src/amule.cpp:937
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Żądanie nie powiodło się z powodu nieznanego błędu."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Operacja zakończona pomyślnie."
+
+#: src/TextClient.cpp:653
 #, 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"
+msgid "Request failed with the following error: %s"
+msgstr "Żądanie nieudane z powodu błędu: %s"
 
-#: src/amule.cpp:964
+#: src/TextClient.cpp:667
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Port %u jest niedostępny. Będziesz mieć LowID\n"
+msgid "IP filtering for clients is %s.\n"
+msgstr "Filtrowanie IP klientów jest %s.\n"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "WYŁĄCZONE"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "WŁĄCZONE"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Filtrowanie IP serwerów jest %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Aktualny poziom filtra IP to %d.\n"
 
-#: src/amule.cpp:970
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Limity przepustowości: Up: %u kB/s, Down: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Połączony z %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Łącze"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "za firewallem"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
 #, c-format
 msgid ""
-"Port %u is not available!\n"
 "\n"
-"This means that you will be LOWID.\n"
+"Download:\t%s"
+msgstr ""
 "\n"
-"Check your network to make sure the port is open for output and input."
+"Pobieranie:\t%s"
+
+#: src/TextClient.cpp:737
+#, c-format
+msgid ""
+"\n"
+"Upload:\t%s"
 msgstr ""
-"Port %u jest niedostępny!\n"
 "\n"
-"To oznacza, że będziesz mieć LowID.\n"
+"Wysyłanie:\t%s"
+
+#: src/TextClient.cpp:740
+#, c-format
+msgid ""
 "\n"
-"Sprawdź swoją sieć aby mieć pewność, że port jest otwarty dla wejścia i "
-"wyjścia."
+"Clients in queue:\t%d\n"
+msgstr ""
+"\n"
+"Klientów w kolejce:\t%d\n"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Nie udało się utworzyć pliku podpisu online"
+#: src/TextClient.cpp:743
+#, c-format
+msgid ""
+"\n"
+"Total sources:\t%d\n"
+msgstr ""
+"\n"
+"Razem źródeł:\t%d\n"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Nie udało się utworzyć pliku podpisu online aMule"
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Liczba wyników wyszukiwania: %i\n"
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
 msgstr ""
-"Wybrane lokale wydają się być niezainstalowane. (Uwaga: I tak spróbuję je "
-"ustawić)"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:832
+#, fuzzy
+msgid "Search progress not available"
+msgstr "Pokaż procent postępu"
+
+#: src/TextClient.cpp:837
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Po raz pierwszy uruchomiłeś aMule %s"
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Otrzymano nieznaną odpowiedź z serwera, OpCode = %#x."
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Ta wersja jest aktualizowaną codziennie wersją testową i\n"
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Pokaż krótką informację o statusie."
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Pokaż stan połączenia, obecne prędkości wysyłania/pobierania itd.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Pokaż pełne drzewo statystyk."
+
+#: src/TextClient.cpp:854
+msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
+"\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
 msgstr ""
-"nie dajemy żadnej gwarancji, że nie zniszczy ona niczego, nie spali twojego "
-"domu\n"
+"Opcjonalnie, liczba z zakresu 0-255 może być przekazana do tej komendy jako "
+"argument\n"
+"który mówi ile wpisów poddrzew  wersji klienta powinno zostać\n"
+"wyświetlone. 0 lub pusta wartość oznacza 'nieograniczony'.\n"
+"\n"
+"Przykład: 'statistics 5' wyświetli tylko 5 pierwszych wersji dla każdego "
+"typu klienta.\n"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Wyłącz aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
-"lub zabije twojego psa. *Powinna* ona jednak mimo wszystko działać "
-"poprawnie.\n"
+"Wyłącz zdalnie działający rdzeń (amule/amuled).\n"
+"Spowoduje to również wyłączenie klienta tekstowego, ponieważ jest on "
+"bezużyteczny\n"
+"bez działającego rdzenia.\n"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Przeładowuje podany obiekt."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Przeładowuje listę udostępnionych plików."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "Przeładowuje tabelę filtrowania IP."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Przeładowuje bieżącą tabelę filtrowania IP."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "Aktualizuje tabelę filtrowania IP z adresu URL."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr ""
+"Jeśli adres URL zostanie pominięty to używany będzie adres URL z listy "
+"preferencji."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Połącz z siecią."
+
+#: src/TextClient.cpp:868
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Spowoduje to połączenie z wszystkimi sieciami włączonymi w Preferencjach.\n"
+"Możesz również opcjonalnie określić adres serwera w formie IP:Port form, aby "
+"połączyć się\n"
+"tylko z tym serwerem. IP musi być adresem IPv4\n"
+"lub odczytywalną nazwą DNS."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Połącz tylko z eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Połącz tylko z Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Rozłącz z siecią."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
-"Następujące opcje zostały zmienione w tym wydaniu z przyczyn "
-"bezpieczeństwa:\n"
+"Spowoduje to rozłączenie z wszystkich sieci, które są obecnie włączone.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Rozłącz tylko z eD2k."
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Rozłącz tylko z Kad."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Dodaje link eD2k lub magnet do rdzenia."
+
+#: src/TextClient.cpp:878
 msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
+"Dodawany link eD2k może być:\n"
+"*) linkiem pliku (ed2k://|file|...), zostanie on dodany do kolejki "
+"pobierania,\n"
+"*) linkiem serwera (ed2k://|server|...), zostanie on dodany do listy "
+"serwerów,\n"
+"*) linkiem do listy serwerów, który spowoduje dodanie wszystkich serwerów na "
+"liście\n"
+"   do listy serwerów.\n"
 "\n"
-"* Włączono obsługę maskowania protokołu dla połączeń przychodzących i "
-"wychodzących.\n"
+"Magnet link musi zawierać skrót eD2k i długość pliku.\n"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Ustaw wartość opcji."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "Ustaw preferencje filtrowania IP."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Włącz filtrowanie IP klientów i serwerów."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Wyłącz filtrowanie IP klientów i serwerów."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Włącz/wyłącz filtrowanie IP klientów."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Włącz filtrowanie IP klientów."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Wyłącz filtrowanie IP klientów."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Włącz/Wyłącz filtrowanie IP serwerów."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Włącz filtrowanie IP serwerów."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Wyłącz filtrowanie IP serwerów."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Wybierz poziom filtrowania IP."
+
+#: src/TextClient.cpp:893
 msgid ""
-"\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"\n"
-"* Zablokowano aktualizację listy serwerów od innych serwerów i klientów.\n"
+"Prawidłowe poziomy filtrowania mieszczą się w zakresie 0-255, a wartością\n"
+"domyślną (początkową) jest 127.\n"
+
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Ustaw limity przepustowości."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "Wartości podane w tych komendach muszą być w kilobajtach/sekundę.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Ustaw limit przepustowości wysyłania."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Ustaw limit przepustowości pobierania."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Pobierz i wyświetl wartość preferencji."
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "Pobierz preferencje filtrowania IP."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Pobierz stan filtrowania IP zarówno dla klientów i serwerów."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Pobierz stan filtrowania IP tylko dla klientów."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Pobierz stan filtrowania IP tylko dla serwerów."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "Pobierz poziom filtrowania IP."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Pobierz limity przepustowości."
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Wykonuje wyszukiwanie."
+
+#: src/TextClient.cpp:914
 msgid ""
-"\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"\n"
-"Aby uzyskać więcej informacji na temat tej zmiany, poszukaj\n"
-"hasła \"fake servers\" na wiki aMule na http://wiki.amule.org.\n"
-"Ważne jest, abyś usunął wszystkie fałszywe serwery z twojej listy serwerów, "
-"aby aMule działał poprawnie."
+"Musi zostać określony typ wyszukiwania przez podanie typu:\n"
+"    GLOBALNY\n"
+"    LOKALNY\n"
+"    KAD\n"
+"Przykład: 'search kad plik' uruchomi wyszukiwanie kad dla \"plik\".\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Wykonuje globalne wyszukiwanie."
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Wykonuje lokalne wyszukiwanie"
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Wykonuje wyszukiwanie kad"
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Pokazuje wyniki ostatniego wyszukiwania."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Zwraca wyniki poprzedniego wyszukiwania.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Pokazuje postęp wyszukiwania."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Pokazuje postęp wyszukiwania.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Rozpocznij pobieranie pliku"
+
+#: src/TextClient.cpp:926
 msgid ""
-"\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"\n"
-"\n"
-"Dodatkowo, ustawienia przeglądarki zostały zresetowane do ustawień "
-"domyślnych. Należy ponownie skonfigurować opcje przeglądarki w razie "
-"potrzeby.\n"
+"Musi zostać podany numer pliku z ostatniego wyszukiwania.\n"
+"Przykład: 'download 12' rozpocznie pobieranie pliku o numerze 12 z "
+"poprzedniego wyszukiwania.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Wstrzymaj pobieranie."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Wznów pobieranie."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Anuluj pobieranie."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Ustaw priorytet pobierania."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Ustaw priorytet pobierania na Niski, Normalny, Wysoki lub Auto.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Ustaw priorytet na niski."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Ustaw priorytet na normalny."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Ustaw priorytet na wysoki."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Ustaw priorytet na auto."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Pokaż kolejki/listy."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
-"Więcej informacji, pomoc i nowe wydania znajdziesz na naszej stronie \n"
+"Pokazuje kolejkę wysyłania/pobierania, listę serwerów lub listę "
+"udostępnionych plików.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "www.aMule.org lub na naszym kanale IRC: #aMule na irc.freenode.net.\n"
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Pokaż kolejkę wysyłania."
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Nie wahaj się zgłaszać jakichkolwiek błędów na http://forum.amule.org"
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Pokaż kolejkę pobierania."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Pokaż log."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Pokaż listę serwerów."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Zresetuj log."
+
+#: src/TextClient.cpp:964
+#, c-format
+msgid "Deprecated command, use '%s' instead."
+msgstr "Wycofywana komenda, użyj '%s' zamiast niej."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:965
+#, c-format
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
 msgstr ""
-"Katalog wybrany na pliki sygnatury online jest nieprawidłowy!\n"
-" Sygnatura online zostanie wyłączona dopóki nie poprawisz tego w "
-"preferencjach."
+"Komenda ta jest wycofywana i może zostać usunięta w przyszłości.\n"
+"Użyj zamiast niej '%s'.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Tekstowy klient aMule"
+
+#: src/ThreadTasks.cpp:363
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Wstępna alokacja dysku dla pliku '%s' nie powiodła się: %s"
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Konwertuję stare zestawy skrótów AICH w '%s' do 64b w '%s'."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "BŁĄD: nie mogę otworzyć pliku logów"
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr ""
+"UWAGA: Nazwa pliku '%s' jest nieprawidłowa i została zmieniona na '%s'."
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "UWAGA: plik logów jest pusty. Coś jest nie tak."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "UWAGA: Plik '%s' już istnieje, zmieniono nazwę na '%s'."
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Logi zostały zresetowane"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Jesteś pewien, że chcesz anulować i usunąć wszystkie pliki z tej kategorii?"
+
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Wymagane potwierdzenie"
+
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
+
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Zbyt dużo połączeń"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Wszystkie inne"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Wybierz filtr przeglądania"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Dodaj kategorię"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Edytuj kategorię"
 
-#: src/amule.cpp:1826
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Usuń kategorię"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Wiadomość z serwera: %s"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Otwarcie pliku (%s) nieudane, usuwam z listy udostępnionych plików."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Pobieranie listy węzłów nie powiodło się."
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Żądanie skrótu dla nieznanego pliku: %s"
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Nie można otworzyć pobranego pliku kontroli wersji"
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
+msgstr "Wznawianie wysyłania pliku: %s"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Uszkodzony plik kontorli wersji"
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Wstrzymywanie wysyłania pliku: %s"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Używasz przestarzałej wersji aMule!"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Nie powiodło się wykonanie komendy `%s' przy zdarzeniu `%s'."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Pobieranie zakończone"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Pełna ścieżka do pliku."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Nazwa pliku bez jego ścieżki."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "Skrót eD2k pliku."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Rozmiar pliku w bajtach."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Łączny czas aktywności w pobieraniu."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Rozpoczęto nową sesję czatu"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Nadawca wiadomości."
 
-#: src/amule.cpp:1907
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Brak miejsca"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Partycja dysku."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Błąd podczas ukończenia"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Twoje wersja eMule to %i.%i.%i, najnowszą wersją jest %li.%li.%li"
+msgid "Processing file number %u: %s"
+msgstr "Przetwarzanie pliku numer %u: %s"
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Najnowsza wersja jest zawsze dostępna na http://www.amule.org"
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Pytałeś o skróty części (Używane tylko dla plików > 9.5 MB)"
 
-#: src/amule.cpp:1911
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "UWAGA: Twoja wersja aMule jest przestarzała: %i.%i.%i < %li.%li.%li"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Nie istniejący plik !\n"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Twoja kopia aMule jest przestarzała."
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, kreator linków eD2k aMule"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Nie udało się pobrać pliku kontroli wersji"
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Witamy!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Parametry wejściowe"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Plik do skracania"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Dodaj opcjonalny URL dla tego pliku"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Wprowadź tutaj plik, którego link eD2k chcesz obliczyć"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Wprowadź tutaj adres URL, który chcesz dodać do linku eD2k: Dodaj / na "
+"końcu, aby pozwolić aLinkCreator dodać nazwę obecnego pliku"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Usuń"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Utwórz link ze skrótami części"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Pomóż rozpowszechniać nowe i rzadkie pliki szybciej, kosztem zwiększenia "
+"rozmiaru linku"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Skrót typu MD4 pliku"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "Skrót eD2k pliku"
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "Link eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Zapisz"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Skopiuj do schowka"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Otwórz"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Otwórz plik, by obliczyć jego link eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Kopiuj obliczony link ED2k do schowka"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Zapisz jako"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Zapisz obliczony link ED2k do pliku"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Informacje o aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Zaznacz plik, którego link eD2k chcesz obliczyć"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Nie można otworzyć schowka"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "W tej chwili nie ma nic do skopiowania !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Wybierz plik do twojego obliczonego linku eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Nie mogę otworzyć "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Proszę wpisać nazwę pliku"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "W tej chwili nie ma nic do zapisania !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, kreator aMule linków eD2k\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Ikony z http://www.everaldo.com oraz http://www.icomania.com\n"
+"i http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Dystrybucja na zasadach GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Tworzę skrót..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator pracuje dla ciebie"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Obliczenie Hashu MD4..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Obliczenie Hashów eD2k..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Anulowano !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Użytkowników: %s | Plików: %s"
+msgid "Done in %.2f s"
+msgstr "Gotowe w %.2f ach"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Masz już dodany ten URL !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Proszę wpisać adres URL"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Użytkowników: E: %s K: %s | Plików: E: %s K: %s"
+msgid "Unable to open %s"
+msgstr "Nie mogę otworzyć %s"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Nie wybrano sieci"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i dni %i godzin %i minut %i "
 
-#: src/amule.cpp:2102
+#: src/utils/wxCas/src/onlinesig.cpp:234
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Połączony z %s %s"
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
 
-#: src/amule.cpp:2105
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "Connecting to %s"
-msgstr "Łączenie z %s"
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Rozłączono z eD2k"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Włączono Kad."
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Zatrzymano Kad."
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Połączono z Kad (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Połączono z Kad (za firewallem)"
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Rozłączono z Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
 
-#: src/amule.cpp:2191
-msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, statystyki aMule online"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Maksymalna szybkość DL od czasu uruchomienia wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
 msgstr ""
-"Nie można użyć sieci Kad, jeśli port UDP jest wyłączony w preferencjach, nie "
-"włączam."
+"Absolutne maksimum szybkości DL podczas poprzedniego uruchomienia wxCas"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Zablokowano sieć Kad w preferencjach, nie łączę."
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "System"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Zatrzymaj automatyczne odświeżanie"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Zapisz obrazek statystyk online"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Wydrukuj obrazek statystyk online"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Ustawienia preferencji"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Informacje o wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Rozpocznij automatyczne odświeżanie"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Automatyczne odświeżanie zatrzymane"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "automatyczne odświeżanie rozpoczęte"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Zapisz obrazek statystyk"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Statystyki aMule online"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Nie udało się otworzyć pliku listy przyjaciół 'emfriends.met' do odczytu!"
+"Wystąpił problem podczas drukowania.\n"
+"Może nie masz prawidłowo ustawionej drukarki ?"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Drukuję"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
-"Nie udało się otworzyć pliku listy przyjaciół 'emfriends.met' do zapisu!"
+"wxCas, statystyki aMule online\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Oparte na CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Dystrybucja na zasadach GPL"
 
-#~ msgid "Fetching status..."
-#~ msgstr "Status ściągania..."
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Och och, aMule nie jest uruchomiony..."
 
-#~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
-#~ msgstr "theApp->serverlist->GetServerByAddress() zwrócił NULL"
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule jest uruchomiony"
 
-#~ msgid "Message Filter"
-#~ msgstr "Filtr wiadomości"
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule jest uruchomiony, ale nie połączony"
 
-#~ msgid "Gui Tweaks"
-#~ msgstr "Dostosowanie GUI"
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule łączy się..."
 
-#~ msgid "Core Tweaks"
-#~ msgstr "Optymalizacja"
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Och och, status aMule jest nieznany..."
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Nieobsługiwany typ pliku."
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
 
-#~ msgid "File was not saved"
-#~ msgstr "Plik nie został zapisany"
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " jest uruchomiony od "
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
-#~ msgstr ""
-#~ "Plik %s jest za duży na Donkeya: maksymalny dozwolony rozmiar to 4 GB."
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " jest zatrzymany !"
 
-#~ msgid "Status text"
-#~ msgstr "Tekst statusu"
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " jest nie połączony!"
 
-#~ msgid "Pop-up status text"
-#~ msgstr "tekst statusu jako Pop-up"
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " łączy się..."
 
-#~ msgid "Please wait... "
-#~ msgstr "Proszę czekać... "
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " robi coś dziwnego, sprawdź to !"
 
-#~ msgid "General Settings"
-#~ msgstr "Ustawienia ogólne"
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " jest połączony z "
 
-#~ msgid "GUI Tweaks"
-#~ msgstr "Dostosowanie GUI"
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
 
-#~ msgid "Remote Control"
-#~ msgstr "Zdalna kontrola"
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "wyłączony"
 
-#~ msgid "Could not determine the command for running the browser."
-#~ msgstr "Nie można ustalić komendy do uruchomienia przeglądarki."
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " jest włączony "
 
-#~ msgid "EC Connection Failed. Empty reply."
-#~ msgstr "Połączenie EC nieudane. Pusta odpowiedź."
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " z "
 
-#~ msgid "ExternalConn: Access denied because: "
-#~ msgstr "ExternalConn: Brak dostępu z powodu: "
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Razem pobranych: "
 
-#~ msgid "ExternalConn: Access denied"
-#~ msgstr "ExternalConn: Brak dostępu"
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Wysłanych: "
 
-#~ msgid "ExternalConn: Bad reply from server. Connection closed."
-#~ msgstr "ExternalConn: Zła odpowiedź serwera. Połączenie zakończone."
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Pobranych w sesji: "
 
-#~ msgid "The ed2k hash of the file."
-#~ msgstr "Skrót ed2k pliku."
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Pobranych: "
 
-#~ msgid "Copy ED2k &link to clipboard"
-#~ msgstr "Skopiuj &link ED2k do schowka"
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Wysłanych: "
 
-#~ msgid "Copy ED2k link to clipboard (&Source)"
-#~ msgstr "Skopiuj link ED2k do schowka (&Zródło)"
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
 
-#~ msgid "Copy ED2k link to clipboard (Source) (&With Crypt options)"
-#~ msgstr "Skopiuj link ED2k do schowka (Źródło) (Z &opcjami szyfrowania)"
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Udostępnione: "
 
-#~ msgid "Copy ED2k link to clipboard (&Hostname)"
-#~ msgstr "Skopiuj link ED2k do schowka (Nazwa &hosta)"
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " plik(ów), Klientów w kolejce: "
 
-#~ msgid "Copy ED2k link to clipboard (Hostname) (With &Crypt options)"
-#~ msgstr "Skopiuj link ED2k do schowka (Nazwa hosta) (z opcjami &szyfrowania)"
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Czas: "
 
-#~ msgid "Copy ED2k link to clipboard (&AICH info)"
-#~ msgstr "Skopiuj link ed2k do schowka (&AICH info)"
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " na "
 
-#~ msgid "Warning"
-#~ msgstr "Ostrzeżenie"
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Średnie obciążenie systemu (1-5-15 min): "
 
-#~ msgid "Error: Could not listen to TCP port."
-#~ msgstr "Błąd: nie mogę nasłuchiwać na porcie TCP."
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Uptime systemu: "
 
-#~ msgid "Webserver HTTP port"
-#~ msgstr "Port HTTP serwera WWW"
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Katalog zawierający plik amulesig.dat"
 
-#~ msgid "Use UPnP port forwarding on webserver port"
-#~ msgstr "Użyj przekierowania portu UPnP na port serwera WWW"
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Podaj katalog z twoim plikiem amulesig.dat"
 
-#~ msgid "Full access password for webserver"
-#~ msgstr "Hasło pełnego dostępu do serwera WWW"
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Czas pomiędzy odświeżeniami w sekundach"
 
-#~ msgid "Guest password for webserver"
-#~ msgstr "Hasło gościa dla serwera WWW"
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Generuj obrazek statystyk przy każdym odświeżeniu"
 
-#~ msgid "Load/save webserver settings from/to remote aMule"
-#~ msgstr "Otwórz/zapisz ustawienia serwera WWW z/do zdalnego aMule"
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Wpisz katalog, w którym chcesz generować obrazki statystyk"
 
-#~ msgid "Enter here the file you want to compute the Ed2k link"
-#~ msgstr "Wpisz plik dla którego chcesz obliczyć link Ed2k"
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Wysyłaj cyklicznie twój obrazek statystyk na serwer FTP"
 
-#~ msgid ""
-#~ "Enter here the URL you want to add to the Ed2k link: Add / at the end to "
-#~ "let aLinkCreator append the current file name"
-#~ msgstr ""
-#~ "Wpisz URL który chcesz dodać do linków Ed2k: Dodaj / na końcu aby "
-#~ "aLinkCreator mógł dołączyć aktualną nazwę pliku"
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "Url FTP"
 
-#~ msgid "Ed2k File Hash"
-#~ msgstr "Skrót typu ed2k pliku"
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Ścieżka FTP"
 
-#~ msgid "Ed2k link"
-#~ msgstr "Link ed2k"
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Wpisz URL twojego serwera FTP"
 
-#~ msgid "Open a file to compute its ed2k link"
-#~ msgstr "Otwórz plik aby obliczyć jego link ed2k"
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "Wpisz katalog do składowania twoich obrazków statystyk na serwerze FTP"
 
-#~ msgid "Copy computed ed2k link to clipboard"
-#~ msgstr "Skopiuj obliczony link ed2k do schowka"
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Użytkownik"
 
-#~ msgid "Save computed ed2k link to file"
-#~ msgstr "Zapisz obliczony link ed2k do pliku"
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Wpisz nazwę użytkownika. aby zalogować się do twojego serwera FTP"
 
-#~ msgid "Select the file you want to compute the ed2k link"
-#~ msgstr "Wybierz plik do obliczenia linku ed2k"
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Wpisz hasło użytkownika. aby zalogować się do twojego serwera FTP"
 
-#~ msgid "Select the file to your computed ed2k link"
-#~ msgstr "Wybierz plik do twojego obliczonego linku ed2k"
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Czas pomiędzy odświeżeniami FTP w minutach"
 
-#~ msgid ""
-#~ "aLinkCreator, the aMule ed2k link creator\n"
-#~ "\n"
-#~ "(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-#~ "\n"
-#~ "Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-#~ "and http://jimmac.musichall.cz/ikony.php3\n"
-#~ "\n"
-#~ "Distributed under GPL"
-#~ msgstr ""
-#~ "aLinkCreator, kreator aMule linków ed2k\n"
-#~ "\n"
-#~ "(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-#~ "\n"
-#~ "Ikony z http://www.everaldo.com oraz http://www.icomania.com\n"
-#~ "i http://jimmac.musichall.cz/ikony.php3\n"
-#~ "\n"
-#~ "Dystrybucja na zasadach GPL"
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Sprawdź"
 
-#~ msgid "aLinkCreator, the aMule ed2k link creator"
-#~ msgstr "aLinkCreator, kreator aMule linków ed2k"
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Katalog zawierający twój plik sygnatury"
 
-#~ msgid "Copy ED2k link to clipboard"
-#~ msgstr "Skopiuj link ed2k do schowka"
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Katalog gdzie będzie wygenerowany statyczny obrazek"
 
-#~ msgid "Copy ED2k links to clipboard"
-#~ msgstr "Skopiuj linki ED2k do schowka"
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Ładuje szablon <str>"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "Błąd krytyczny: Nie udało się stworzyć zegara"
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Port HTTP serwera sieciowego"
 
-#~ msgid "ED2K: Connecting"
-#~ msgstr "ED2K: Łączenie"
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Użyj forwardowania portu UPnP na porcie serwera sieciowego"
 
-#~ msgid "ED2K: Disconnected"
-#~ msgstr "ED2K: Rozłączony"
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Port UPnP"
 
-#~ msgid "Warning: Unable to open skin file '%s' for read"
-#~ msgstr "Ostrzeżenie: niemożliwe otwarcie pliku skórki '%s' do odczytu"
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Używaj kompresji gzip"
 
-#~ msgid "ed2k network"
-#~ msgstr "Sieć ed2k"
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Hasło pełnego dostępu do serwera sieciowego"
 
-#~ msgid ""
-#~ "Your Auto-update servers list is in blank.\n"
-#~ "'Auto-update serverlist at startup' will be disabled."
-#~ msgstr ""
-#~ "Twoja lista automatycznych aktualizacji serwerów jest pusta.\n"
-#~ "Aktualizowanie listy serwerów podczas uruchamiania zostanie wyłączone."
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Hasło gościa do serwera sieciowego"
 
-#~ msgid ""
-#~ "Both ED2K and Kad network are disabled.\n"
-#~ "You won't be able to connect until you enable at least one of them."
-#~ msgstr ""
-#~ "Zarówno sieć ED2K jak i Kad zostały wyłączone.\n"
-#~ "Nie będzie możliwe połączenie, dopóki nie włączysz przynajmniej jednej z "
-#~ "nich."
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Pozwól na dostęp gości"
 
-#~ msgid "Edit Serverlist"
-#~ msgstr "Lista serwerów"
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Zabroń dostępu gościom"
 
-#~ msgid "Error: couldn't accept a new external connection"
-#~ msgstr "Błąd: nie mogę zaakceptować nowego połączenia zewnętrznego"
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Wczytaj/zapisz ustawienia serwera sieciowego z/do zdalnego aMule"
 
-#~ msgid "ED2K is disabled in preferences."
-#~ msgstr "ED2K jest wyłączony w preferencjach."
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Ścieżka do pliku konfiguracyjnego aMule. NIE UŻYWAJ BEZPOŚREDNIO!"
 
-#~ msgid "ExternalConn: shutdown requested"
-#~ msgstr "ExternalConn: żądanie zamknięcia"
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Zablokuj interpreter PHP (wycofywany)"
 
-#~ msgid "Already connected to ED2K."
-#~ msgstr "Już podłączony do ED2K."
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Przekompiluj strony PHP przy każdym żądaniu"
 
-#~ msgid "Connecting to ED2K..."
-#~ msgstr "Łączę z ED2K..."
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Serwer WWW aMule"
 
-#~ msgid "Disconnected from ED2K."
-#~ msgstr "Rozłączono z ED2K."
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "zaakceptowano połączenie klienta sieciowego\n"
 
-#~ msgid "ExternalConn: invalid opcode received: %#x"
-#~ msgstr "ExternalConn: otrzymano nieprawidłowy opcode: %#x"
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "BŁĄD: nie można zaakceptować połączenia klienta internetowego\n"
 
-#~ msgid "ED2K Status:"
-#~ msgstr "Status ED2K:"
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Żądanie nie powiodło się z powodu błędu: %s."
 
-#~ msgid "Average Downloadrate (Session): %s"
-#~ msgstr "Przeciętna prędkość pobierania (sesja): %s"
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Nie znaleziono pliku indeksu: "
 
-#~ msgid "Average Uploadrate (Session): %s"
-#~ msgstr "Przeciętna prędkość wysyłania (sesja): %s"
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Sesja wygasła - żądanie loginu\n"
 
-#~ msgid "Max Downloadrate (Session): %s"
-#~ msgstr "Maks. prędkość pobierania (sesja): %s"
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sesja ok, zalogowano\n"
 
-#~ msgid "Max Uploadrate (Session): %s"
-#~ msgstr "Maks. prędkość wysyłania (sesja): %s"
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sesja ok, nie zalogowano\n"
 
-#~ msgid "Average filesize: %s"
-#~ msgstr "Średni rozmiar pliku: %s"
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Nie otwarto sesji - zażądam loginu\n"
 
-#~ msgid "ED2K search can't be done if ED2K is not connected"
-#~ msgstr "Nie można wykonać wyszukiwania ED2K, jeśli ED2K nie jest połączony"
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Utworzono sesję - żądam loginu\n"
 
-#~ msgid "Error: "
-#~ msgstr "Błąd: "
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Przetwarzam żądanie (oryginalne): "
 
-#~ msgid "Warning: "
-#~ msgstr "Uwaga: "
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Nie podano hasła, logowania nie będą akceptowane."
 
-#~ msgid "Search related files (ED2k, local server)"
-#~ msgstr "Szukaj powiązanych plików (ED2k, serwer lokalny)"
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Sprawdzam hasło\n"
 
-#~ msgid "Error"
-#~ msgstr "Błąd"
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Nieprawidłowy skrót hasła\n"
 
-#~ msgid ""
-#~ "WARNING: You can't add yourself as a source for a ed2k link while being "
-#~ "lowid."
-#~ msgstr ""
-#~ "UWAGA: Nie możesz dodać samego siebie jako źródło linku ed2k, gdy masz "
-#~ "lowid."
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Hasło ok\n"
 
-#~ msgid ""
-#~ "Please set your preferred video player on preferences.\n"
-#~ "Meanwhile, aMule will attempt to use mplayer and you will get this "
-#~ "warning on every preview"
-#~ msgstr ""
-#~ "Proszę ustaw w preferencjach swój odtwarzacz wideo.\n"
-#~ "W międzyczasie aMule będzie próbował użyć mplayera, a Ty będziesz "
-#~ "otrzymywał to ostrzeżenie przy każdym podglądzie"
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Złe hasło\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Nie wprowadziłeś hasła. Puste hasło nie jest dozwolone.\n"
 
-#~ msgid "Error: Failed to open part.met file: %s ==> %s"
-#~ msgstr "Błąd: Nie udało się otworzyć pliku part.met: %s ==> %s"
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Zażądano wylogowania\n"
 
-#~ msgid "Error: part.met file is 0 size: %s ==> %s"
-#~ msgstr "Błąd: plik part.met ma zerowy rozmiar: %s ==> %s"
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Przetwarzam żądanie (przekierowane): "
 
-#~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
-#~ msgstr "Błąd: Niepoprawna wersja pliku part.met: %s ==> %s"
+#~ msgid "Romanian"
+#~ msgstr "Rumuński"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr ""
-#~ "Błąd: %s (%s) jest uszkodzony (zła ilość znaków), nie mogę otworzyć pliku."
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Status pobierania"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Opóźnienie odświeżania: %d sekunda"
+#~ msgstr[1] "Opóźnienie odświeżania: %d sekundy"
+#~ msgstr[2] "Opóźnienie odświeżania: %d sekund"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr "Oceny i komentarze jeszcze nie są obsługiwane na zdalnym gui"
+
+#~ msgid "Transferring"
+#~ msgstr "Przesyłam"
+
+#~ msgid "QR: ???"
+#~ msgstr "QR: ???"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#~ msgid "Only files currently uploading"
+#~ msgstr "Tylko obecnie wysyłane pliki"
+
+#~ msgid "Queue Rank"
+#~ msgstr "Współczynnik kolejki"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - pokaż postęp wyszukiwania"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Rozpoczynam tworzenie skrótu MD4 i AICH dla pliku: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Rozpoczynam tworzenie skrótu MD4 dla pliku: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Rozpoczynam tworzenie skrótu AICH dla pliku: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr "UWAGA: Nie można usunąć oryginału '%s' po wykonaniu kopii zapasowej"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "UWAGA: Nie udało się usunąć pliku %s"
+
+#~ msgid "%u"
+#~ msgstr "%u"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Ocena (razem):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Próbuj przesłać pełne części do wszystkich pobierających"
+
+#~ msgid "Networks window"
+#~ msgstr "Okno sieci"
+
+#~ msgid "Searches window"
+#~ msgstr "Okno wyszukiwania"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Pobieranie"
+
+#~ msgid "Shared files window"
+#~ msgstr "Okno udostępnionych plików"
+
+#~ msgid "Messages window"
+#~ msgstr "Okno wiadomości"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Okno wykresów statystyk"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Okno ustawień preferencji"
+
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Stracono ikonę paska zadań, próbuje odtworzyć ..."
+
+#~ msgid "Transfers"
+#~ msgstr "Transfery"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Okno transferu plików"
+
+#~ msgid "Unban"
+#~ msgstr "Odbanuj"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Pokaż wysyłane"
+
+#~ msgid "Show Queue"
+#~ msgstr "Pokaż kolejkę"
+
+#~ msgid "Select View"
+#~ msgstr "Wybierz widok"
+
+#~ msgid "Client Software"
+#~ msgstr "Oprogramowanie klienta"
+
+#~ msgid "Waited"
+#~ msgstr "Czekał"
+
+#~ msgid "Upload Time"
+#~ msgstr "Czas wysyłania"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Wysyłanie/Pobieranie"
+
+#~ msgid "Remote Status"
+#~ msgstr "Zdalny Status"
+
+#~ msgid "File Priority"
+#~ msgstr "Priorytet pliku"
+
+#~ msgid "Score"
+#~ msgstr "Punkty"
+
+#~ msgid "Asked"
+#~ msgstr "Poprosił"
+
+#~ msgid "Last Seen"
+#~ msgstr "Ostatnio widziany"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Wszedł do kolejki"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Wysłanych"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Pobranych"
+
+#~ msgid "Userhash"
+#~ msgstr "Skrót użytkownika"
+
+#~ msgid "Encrypted"
+#~ msgstr "Zaszyfrowane"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "Załadowano %d flag bitmapy."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Pokaż wysłane / Kolejkę wysyłań"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Klientów w kolejce :"
+
+#~ msgid "Current Session"
+#~ msgstr "Aktualna sesja"
+
+#~ msgid "Total"
+#~ msgstr "Razem"
+
+#~ msgid "Requested :"
+#~ msgstr "Żądany :"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Stwórz kopię dla podglądu"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Transfery plików"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Razem użytkowników: %s | Razem plików: %s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "Rozpoczęte pobranie wątku HTTP"
+
+#~ msgid "Download size not received, downloading until connection is closed"
+#~ msgstr "Nie otrzymany rozmiar pomiaru, pobieranie do zamknięcia połączenia"
+
+#~ msgid "Download size: %i"
+#~ msgstr "Rozmiar pobierania: %i"
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "Zakończenie pobrania wątku HTTP"
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Host: %s:%i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Odpowiedź: %i (Błąd: %i)"
 
-#~ msgid "Warning: %s might be corrupted (%i)"
-#~ msgstr "Uwaga: %s może być uszkodzony (%i)"
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "UWAGA: Pusta odpowiedz przy tworzeniu strumienia"
 
-#~ msgid "Unexpected file error while completing %s. File paused"
-#~ msgstr "Nieoczekiwany błąd przy kończeniu pliku %s. Plik wstrzymano"
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "BŁĄD: Kod przekierowujący otrzymany bez adresu"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country(): Nie udało się załadować danych kraju z "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Pobierz poziom IPFilter."
+
+#~ msgid "Makes a search."
+#~ msgstr "Tworzy wyszukiwanie."
+
+#~ msgid "Killed!"
+#~ msgstr "Zabite!"
+
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Używanie amuleweb w '%s'."
+
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Zamykanie aMule..."
 
 #~ msgid ""
-#~ "Warning: Unable to hash downloaded part - hashset incomplete for '%s'"
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
 #~ msgstr ""
-#~ "Błąd: Nie można utworzyć skrótu ściągniętej części - zestaw skrótów jest "
-#~ "niekompletny dla '%s'"
+#~ "Następujące opcje zostały zmienione w tym wydaniu z przyczyn "
+#~ "bezpieczeństwa:\n"
 
 #~ msgid ""
-#~ "Error: Unable to hash downloaded part - hashset incomplete (%s). This "
-#~ "should never happen"
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
 #~ msgstr ""
-#~ "Błąd: Nie można utworzyć skrótu ściągniętej części - zestaw skrótów "
-#~ "niekompletny (%s). Nie powinno do tego dojść"
+#~ "\n"
+#~ "* Włączono obsługę maskowania protokołu dla połączeń przychodzących i "
+#~ "wychodzących.\n"
 
-#~ msgid "Insufficient Diskspace"
-#~ msgstr "Niewystarczająca ilość wolnego miejsca na dysku"
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Zablokowano aktualizację listy serwerów od innych serwerów i klientów.\n"
 
-#~ msgid "Warning: known.met cannot be opened."
-#~ msgstr "Uwaga: known.met nie może być otwarty."
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Aby uzyskać więcej informacji na temat tej zmiany, poszukaj\n"
+#~ "hasła \"fake servers\" na wiki aMule na http://wiki.amule.org.\n"
+#~ "Ważne jest, abyś usunął wszystkie fałszywe serwery z twojej listy "
+#~ "serwerów, aby aMule działał poprawnie."
 
-#~ msgid "Warning: Knownfile list corrupted, contains invalid header."
-#~ msgstr "Uwaga: lista Knownfile uszkodzona, zawiera nieprawidłowy nagłówek."
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Dodatkowo, ustawienia przeglądarki zostały zresetowane do ustawień "
+#~ "domyślnych. Należy ponownie skonfigurować opcje przeglądarki w razie "
+#~ "potrzeby.\n"
 
-#~ msgid "ERROR! Attempted to share %s"
-#~ msgstr "BŁĄD! Próba udostępnienia %s"
+#~ msgid "Fetching status..."
+#~ msgstr "Status ściągania..."
 
-#~ msgid "ED2K network disabled on preferences, not connecting."
-#~ msgstr "Sieć ED2K wyłączona w preferencjach, nie łączę."
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Użytkowników: E: %s K: %s | Plików E: %s K: %s"
 
-#~ msgid "No valid servers to connect in serverlist found"
-#~ msgstr "Nie ma poprawnych serwerów na liście"
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Klient %s na IP:Port %s:%d używający %s %s %s"
 
-#~ msgid "Error: Socket invalid at timeoutcheck"
-#~ msgstr "Błąd: Socket nieprawidłowy przy sprawdzaniu timeout-a"
+#~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
+#~ msgstr "theApp->serverlist->GetServerByAddress() zwrócił NULL"
 
-#~ msgid ""
-#~ "Error: Failed to load backup file. Search http://forum.amule.org for ."
-#~ "part.met recovery solutions."
+#~ msgid "Firewalled"
+#~ msgstr "Za firewallem"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "Załadowano %d bitmapę flag."
+#~ msgstr[1] "Załadowano %d bitmapy flag."
+#~ msgstr[2] "Załadowano %d bitmap flag."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
 #~ msgstr ""
-#~ "Błąd: Załadowanie pliku kopii zapasowej nieudane. Poszukaj na http://"
-#~ "forum.amule.org sposobów odzyskiwania .part.met."
+#~ "Plik %s jest za duży na Donkeya: maksymalny dozwolony rozmiar to 4 GB."
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Nieobsługiwany typ pliku."
 
-#~ msgid "Cannot convert magnet link to ed2k: %s"
-#~ msgstr "Nie można skonwertować magnet linka do ed2k: %s"
+#~ msgid "File was not saved"
+#~ msgstr "Plik nie został zapisany"
 
-#~ msgid "Invalid ed2k link! Error: %s"
-#~ msgstr "Błędny link ed2k! Błąd: %s"
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr "Połączenie nieudane. Nie można się połączyć z wybranym hostem\n"
 
-#~ msgid "Bandwidth Limits: Up: %u kB/s, Down: %u kB/s.\n"
-#~ msgstr "Limity przepustowości: Wysł: %u kB/s, Pobr: %u kB/s.\n"
+#~ msgid "Message Filter"
+#~ msgstr "Filtr wiadomości"
+
+#~ msgid "Gui Tweaks"
+#~ msgstr "Dostosowanie GUI"
+
+#~ msgid "Core Tweaks"
+#~ msgstr "Optymalizacja"
+
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Opóźnienie podpowiedzi w sekundach"
+
+#~ msgid "Show part file number before file name"
+#~ msgstr "Pokaż numer pliku części przed nazwą pliku"
+
+#~ msgid "Skin Support"
+#~ msgstr "Wsparcie skórek"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- brak dostępnych skórek -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Katalog podpisu online:"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Opcje filtrowania:"
+
+#~ msgid "ERROR: can not accept web client connection\n"
+#~ msgstr "BŁĄD: nie można zaakceptować połączenia klienta sieciowego\n"
+
+#~ msgid "Please wait... "
+#~ msgstr "Proszę czekać... "
 
-#~ msgid "Shutdown aMule."
-#~ msgstr "Zamknij aMule."
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Nie można ustalić wybranej przeglądarki!"
 
 #~ msgid ""
-#~ "Shutdown the remote running core (amule/amuled).\n"
-#~ "This will also shut down the text client, since it is unusable without a\n"
-#~ "running core.\n"
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
 #~ msgstr ""
-#~ "Wyłącz zdalnie działający rdzeń (amule/amuled).\n"
-#~ "Spowoduje to również wyłączenie klienta tekstowego, ponieważ jest on "
-#~ "bezużyteczny\n"
-#~ "bez działającego rdzenia.\n"
+#~ " 'Wieloplatformowy' klient p2p oparty na eMule \n"
+#~ "\n"
 
-#~ msgid "Connect to ED2K only."
-#~ msgstr "Połącz tylko z ED2K."
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr " Strona domowa: http://www.amule.org \n"
 
-#~ msgid "Disconnect from ED2K only."
-#~ msgstr "Rozłącz tylko z ED2K."
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr " Forum: http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
 
-#~ msgid "Adds an ed2k or magnet link to core."
-#~ msgstr "Dodaje link ed2k lub magnet do rdzenia."
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " Kontakt: admin@amule.org (sprawy administratorskie) \n"
 
 #~ msgid ""
-#~ "The ed2k link to be added can be:\n"
-#~ "*) a file link (ed2k://|file|...), it will be added to the download "
-#~ "queue,\n"
-#~ "*) a server link (ed2k://|server|...), it will be added to the server "
-#~ "list,\n"
-#~ "*) or a serverlist link, in which case all servers in the list will be "
-#~ "added to the\n"
-#~ "   server list.\n"
+#~ " Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
-#~ "The magnet link must contain the ed2k hash and file length.\n"
 #~ msgstr ""
-#~ "Dodawany link ed2k może być:\n"
-#~ "*) linkiem pliku (ed2k://|file|...), zostanie on dodany do kolejki "
-#~ "pobierania,\n"
-#~ "*) linkiem serwera (ed2k://|server|...), zostanie on dodany do listy "
-#~ "serwerów,\n"
-#~ "*) linkiem do listy serwerów, który spowoduje dodanie wszystkich serwerów "
-#~ "na liście\n"
-#~ "   do listy serwerów.\n"
+#~ " Copyright (C) 2003-2008 Zespół aMule \n"
 #~ "\n"
-#~ "Magnet link musi zawierać skrót ed2k i długość pliku.\n"
 
-#~ msgid "Deprecated command, now '%s'."
-#~ msgstr "Wycofywana komenda, obecnie '%s'."
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr " Część aMule jest oparta na \n"
 
-#~ msgid "Error: %s (%s) - %s"
-#~ msgstr "Błąd: %s (%s) - %s"
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " Copyright (C) 2002 Petar Maymounkov\n"
 
-#~ msgid "Warning: %s (%s) - %s"
-#~ msgstr "Uwaga: %s (%s) - %s"
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
 
-#~ msgid "Error: Out of diskspace"
-#~ msgstr "Błąd: Brak miejsca na dysku"
+#~ msgid "Status text"
+#~ msgstr "Tekst statusu"
 
-#~ msgid "Error: Partmet not found"
-#~ msgstr "Błąd: Partmet nie znaleziony"
+#~ msgid "Could not determine the command for running the browser."
+#~ msgstr "Nie można ustalić komendy do uruchomienia przeglądarki."
 
-#~ msgid "Error: IO error!"
-#~ msgstr "Błąd: Błąd IO!"
+#~ msgid "User Defined"
+#~ msgstr "Użytkownika"
 
-#~ msgid "Error: Failed!"
-#~ msgstr "Błąd: Nieudane!"
+#~ msgid ""
+#~ "Your Auto-update server list is empty.\n"
+#~ "'Auto-update server list at startup will be disabled."
+#~ msgstr ""
+#~ "Twoja lista automatycznych aktualizacji serwerów jest pusta.\n"
+#~ "Aktualizowanie listy serwerów podczas uruchamiania zostanie wyłączone."
+
+#~ msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "BŁĄD: Nieprawidłowa wersja pliku part.met: %s ==> %s"
 
-#~ msgid "ED2K Link: "
-#~ msgstr "Link ED2K: "
+#~ msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#~ msgstr ""
+#~ "UWAGA: lista znanych plików uszkodzona, zawiera nieprawidłowy nagłówek."
+
+#~ msgid "Pop-up status text"
+#~ msgstr "tekst statusu jako Pop-up"
 
 #~ msgid ""
-#~ "Click here to add the ed2k link in the text control to your download "
-#~ "queue."
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
 #~ msgstr ""
-#~ "Kliknij tu aby dodać link ed2k w linii poleceń do twojej kolejki pobierań."
+#~ "W przypadku filmu możesz podać jego długość, język ...\n"
+#~ "oraz jeżeli jest fałszywy możesz powiedzieć o tym innym użytkownikom "
+#~ "aMule."
+
+#~ msgid "General Settings"
+#~ msgstr "Ustawienia ogólne"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - linuksowy Muł"
+
+#~ msgid "Misc Options"
+#~ msgstr "Różne opcje"
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "Włącza pytanie przed wyjściem z aMule."
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
 
-#~ msgid "Searches for more results on ED2K. Not supported for Kad yet."
-#~ msgstr "Wyszukuje więcej wyników na ED2K. Nieobsługiwane jeszcze dla Kad."
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
 
-#~ msgid "0"
-#~ msgstr "0"
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
 
-#~ msgid "Bandwith Limits"
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Wybierz tu swoją przeglądarkę"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Przeglądarka użytkownika:"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Wpisz tu nazwę swojej przeglądarki. Aby użyć zdefiniowanej przeglądarki "
+#~ "wybierz opcje Użytkownika z rozwijanego menu."
+
+#~ msgid "Bandwith limits"
 #~ msgstr "Limity przepustowości"
 
-#~ msgid "This is the standard ED2K port and cannot be disabled."
-#~ msgstr "To jest standardowy port ED2K i nie może być on wyłączony."
+#~ msgid "Line Capacities"
+#~ msgstr "Możliwości łącza"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
+#~ msgstr ""
+#~ "Uwaga: wartości te są\n"
+#~ " używane tylko w statystykach."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Standardowy port TCP klienta:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Rozszerzony port UDP klienta:"
 
-#~ msgid "This UDP port is used for extended Ed2K requests and Kad network"
+#~ msgid "This UDP port is used for extended ed2k requests and Kad network"
 #~ msgstr ""
-#~ "Ten port UDP jest używany w rozszerzonych żądaniach sieci Ed2K i Kad"
+#~ "Ten port UDP jest używany w rozszerzonych żądaniach sieci eD2K i Kad"
 
-#~ msgid "Hard Limit"
-#~ msgstr "Ostateczny limit"
+#~ msgid "Bind Address"
+#~ msgstr "Adres bindowania"
 
-#~ msgid "Connection Limits"
-#~ msgstr "Limit połączeń"
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "Port UDP dla rozszerzonych żądań serwera (TCP+3): 4665"
 
-#~ msgid "Auto-update serverlist at startup"
-#~ msgstr "Aktualizuj listę serwerów podczas uruchamiania"
+#~ msgid "Max Sources per File"
+#~ msgstr "Ilość źródeł na plik"
 
-#~ msgid "Update serverlist when connecting to a server"
-#~ msgstr "Aktualizuj listę w czasie łączenia do serwera"
+#~ msgid "Hard limit"
+#~ msgstr "Twardy limit"
 
-#~ msgid "Update serverlist when a client connect"
-#~ msgstr "Aktualizuj listę serwerów po połączeniu do serwera"
+#~ msgid "Connection limits"
+#~ msgstr "Limity połączeń"
 
-#~ msgid "Disk Space"
-#~ msgstr "Miejsce na dysku"
+#~ msgid "Max Connections"
+#~ msgstr "Maks. połączeń"
 
-#~ msgid "Check Disk Space"
-#~ msgstr "Sprawdź miejsce na dysku"
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Uniwersalne Plug and Play"
 
-#~ msgid "Select this if you want aMule to check your Disk Space"
-#~ msgstr "Wybierz to jeżeli chcesz aby aMule sprawdzał ilość miejsca na dysku"
+#~ msgid "Enable UPnP"
+#~ msgstr "Włącz UPnP"
 
-#~ msgid "Min Disk Space:"
-#~ msgstr "Min. przestrzeń dyskowa:"
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "Port TCP UPnP:"
 
-#~ msgid "Incoming Directory :"
-#~ msgstr "Katalog przychodzących :"
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Pokaż narzut przepustowości"
 
-#~ msgid "Temporary Directory :"
-#~ msgstr "Katalog tymczasowy :"
+#~ msgid "Server Options"
+#~ msgstr "Opcje serwera"
 
-#~ msgid "Shared Directories"
-#~ msgstr "Katalogi udostępnione"
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. aktywny"
 
-#~ msgid "Create Backup to preview"
-#~ msgstr "Twórz kopie do podglądu"
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICH ufa każdemu skrótowi (niezalecane)"
 
-#~ msgid "Show Fast ED2K Links Handler"
-#~ msgstr "Szybkie wyłapywanie linków ED2K"
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Zacznij pobierać następny plik po skończeniu poprzedniego"
 
-#~ msgid "Webserver Parameters"
-#~ msgstr "Parametry serwera WWW"
+#~ msgid "Disk space"
+#~ msgstr "Przestrzeń dyskowa"
 
-#~ msgid "Webserver port"
-#~ msgstr "Port serwera WWW"
+#~ msgid "Check disk space"
+#~ msgstr "Sprawdź przestrzeń dyskową"
 
-#~ msgid "Enable UPnP port forwarding on the Webserver port"
-#~ msgstr "Włącz forwarding portu UPnP na porcie serwera WWW"
+#~ msgid "Min disk space:"
+#~ msgstr "Minimalna przestrzeń dyskowa:"
 
-#~ msgid "Webserver UPnP TCP port"
-#~ msgstr "Port TCP UPnP serwera WWW"
+#~ msgid "Incoming"
+#~ msgstr "Przychodzące"
 
-#~ msgid "Serverlist"
-#~ msgstr "Lista serwerów"
+#~ msgid "Temporary"
+#~ msgstr "Tymczasowe"
 
-#~ msgid "Manual Server Add : Name"
-#~ msgstr "Ręcznie dodaj serwer : Nazwa"
+#~ msgid "Shared"
+#~ msgstr "Udostępnione"
 
-#~ msgid "No One"
-#~ msgstr "Nikt"
+#~ msgid "Create Backup for preview"
+#~ msgstr "Utwórz kopię zapasową dla podglądu"
 
-#~ msgid "Speed Limits:"
-#~ msgstr "Limity prędkości:"
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Wybierz kolory statystyk"
 
-#~ msgid "Download Speed: %.1f"
-#~ msgstr "Prędkość pobierania: %.1f"
+#~ msgid "Advanced Settings"
+#~ msgstr "Ustawienia zaawansowane"
 
-#~ msgid "Upload Speed: %.1f"
-#~ msgstr "Prędkość wysyłania: %.1f"
+#~ msgid "GUI Tweaks"
+#~ msgstr "Dostosowanie GUI"
 
-#~ msgid "TCP Port: %d"
-#~ msgstr "Port TCP: %d"
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Postęp Kolejki Ściąganych Plików "
 
-#~ msgid "TCP Port: Not Ready"
-#~ msgstr "Port TCP: Niegotowy"
+#~ msgid "Show percentage"
+#~ msgstr "Pokaż procentowo"
 
-#~ msgid "UDP Port: %d"
-#~ msgstr "Port UDP: %d"
+#~ msgid "Show progressbar "
+#~ msgstr "Pokaż pasek postępu "
 
-#~ msgid "UDP Port: Not Ready"
-#~ msgstr "Port UDP: Niegotowy"
+#~ msgid "Progressbar Style"
+#~ msgstr "Styl paska postępu"
 
-#~ msgid "Shared Files: %d"
-#~ msgstr "Udostępnionych plików: %d"
+#~ msgid "Enable skin support "
+#~ msgstr "Włącz obsługę skórek "
 
-#~ msgid "Queued Clients: %d"
-#~ msgstr "Klientów w kolejce: %d"
+#~ msgid "Skin:"
+#~ msgstr "Skórka:"
 
-#~ msgid "Upload Limit"
-#~ msgstr "Limit wysyłania"
+#~ msgid "Column Sorting"
+#~ msgstr "Sortowanie kolumn"
 
-#~ msgid "Download Limit"
-#~ msgstr "Limit pobierania"
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "Automatyczne sortowanie plików w kolejce pobierania (mocne CPU)"
 
-#~ msgid ""
-#~ "No serverlist address entry in 'addresses.dat' found. Please paste a "
-#~ "valid serverlist address into this file in order to auto-update your "
-#~ "serverlist"
-#~ msgstr ""
-#~ "Brak adresów serwerów w 'adresses.dat'. Proszę wkleić kolejno dobre adres "
-#~ "listy serwerów do tego pliku aby aktualizować listę automatycznie"
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Inne ustawienia GUI"
 
-#~ msgid "Warning, invalid URL specified for auto-updating of servers: %s"
-#~ msgstr "Uwaga: niepoprawny URL podany do auto-aktualizacji serwerów: %s"
+#~ msgid "Show Fast eD2k Links Handler"
+#~ msgstr "Pokazuj szybkie wyłapywanie linków eD2K"
 
-#~ msgid "webserver running on pid %d"
-#~ msgstr "serwer WWW uruchomiony z pid %d"
+#~ msgid "Remote Control"
+#~ msgstr "Zdalna kontrola"
+
+#~ msgid "Web server port"
+#~ msgstr "Port serwera sieciowego"
+
+#~ msgid "Enable UPnP port forwarding on the web server port"
+#~ msgstr "Włącz forwarding portu UPnP na porcie serwera sieciowego"
+
+#~ msgid "Web server UPnP TCP port"
+#~ msgstr "Port TCP UPnP serwera sieciowego"
 
 #~ msgid ""
-#~ "You requested to run webserver from startup, but the amuleweb binary "
-#~ "cannot be run. Please install the package containing aMule webserver, or "
-#~ "compile aMule using --enable-webserver and run make install"
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
 #~ msgstr ""
-#~ "Żądasz startu serwera WWW podczas uruchamiania, ale binarka amuleweb nie "
-#~ "może być uruchomiona. Proszę zainstaluj pakiet zawierający serwer WWW "
-#~ "aMule lub skompiluj aMule używając --enable-webserver i uruchom make "
-#~ "install"
+#~ "IP nasłuchującego interfejsu\n"
+#~ "(puste jeśli dowolny)"
 
-#~ msgid "Disconnected from ED2K"
-#~ msgstr "Rozłączono z ED2K"
+#~ msgid "TCP port"
+#~ msgstr "Port TCP"
 
-#~ msgid "Failed to open friendlist file 'emfriends.met' for reading!"
-#~ msgstr ""
-#~ "Nie udało się otworzyć pliku listy znajomych 'emfriends.met' do odczytu!"
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Wyświetl motd serwera po połączeniu ..."
 
-#~ msgid "Failed to open friendlist file 'emfriends.met' for writing!"
-#~ msgstr ""
-#~ "Nie udało się otworzyć pliku listy znajomych 'emfriends.met' do zapisu!"
+#~ msgid "eD2k Info"
+#~ msgstr "Info eD2k"
 
-#~ msgid "ERROR: Failed to open partfile)"
-#~ msgstr "BŁĄD: Nie udało się otworzyć pliku części)"
+#~ msgid "File Options"
+#~ msgstr "Opcje plików"
 
-#~ msgid "Mb"
-#~ msgstr "Mb"
+#~ msgid "Who can see shared files:"
+#~ msgstr "Kto może zobaczyć udostępnione pliki:"
 
-#~ msgid "Can't create web socket thread\n"
-#~ msgstr "Nie mogę utworzyć wątku gniazda WWW\n"
+#~ msgid "Disable/Enable"
+#~ msgstr "Wyłączony/Włączony"
 
-#~ msgid "Web Server: Started\n"
-#~ msgstr "Serwer WWW: uruchomiony\n"
+#~ msgid "Authentication"
+#~ msgstr "Uwierzytelnianie"
 
-#~ msgid "Not Supported"
-#~ msgstr "Niewspierane"
+#~ msgid "Event types"
+#~ msgstr "Typy zdarzeń"

aMule-2.2.6.tar.bz2/po/pt_BR.po -> aMule-2.3.1.tar.bz2/po/pt_BR.po Changed

@@ -6,14 +6,14 @@
 # Israel Rodrigo Faria <israel.faria@gmail.com>, 2007.
 # Fabio Junior Beneditto <fabiobeneditto@uol.com.br>, 2008.
 # aMule i18n resource file.
-# Copyright (C) 2004 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the aMule package.
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-03-20 17:30-0300\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
+"PO-Revision-Date: 2008-06-13 17:15-0300\n"
 "Last-Translator: felipe augusto <flipeicl@gmail.com>\n"
 "Language-Team: Português (Brasileiro) <pt@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,1293 +25,1114 @@
 "X-Poedit-Country: BRAZIL\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Você deve informar uma senha não-vazia."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Senha inválida, não é um hash MD5!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Falha ao conectar"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "Conexão EC falhou. Resposta vazia."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Conexão Externa: Acesso negado porque:"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Conexão Externa: Acesso negado"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Conexão Externa: Má resposta do servidor. Conexão fechada."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Sucesso! Conexão estabelecida ao aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Sucesso! Conexão estabelecida."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Calculando hash"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Adicionar um amigo"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Finalizando"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Você deve digitar um IP e porta válidos!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Completo"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Informação"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Pausa"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "A Hash do usuário especificado é inválida"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Com Erro"
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Falha ao abrir %s (%s)"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Baixando"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"CUIDADO: Você não pode adicionar você mesmo como uma fonte para uma ligação "
+"eD2k quando tem um lowid."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Esperando"
+#: src/amule.cpp:239
+#, fuzzy
+msgid "Now, exiting main app..."
+msgstr ""
+"\n"
+"Ok, abandonando %s...\n"
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Criando hash MD4 e info. de recuperação AICH para o arquivo: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Criando hash MD4 para o arquivo: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Criando hash AICH para o arquivo: %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Falha"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Convertendo hashsets AICH antigos de '%s' para 64b em '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr ""
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "AVISO: O nome de arquivo '%s' é inválido e foi renomeado para '%s'."
+#: src/amule.cpp:335
+#, fuzzy
+msgid "aMule shutdown completed."
+msgstr "Download concluído"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "AVISO: O arquivo '%s' já existe, novo arquivo renomeado para '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr ""
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "AVISO: Não foi possível remover arquivo '%s' depois de criar o backup"
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "Confirmação de saída"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "AVISO: Falha ao apagar %s"
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "Novas conexões externas aceitas"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Falha ao receber lista de compartilhamentos do usuário '%s'"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "CUIDADO"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Desconhecido"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (versão de eMule FALSA %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (eMule Falso)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Você não tem nenhum servidor na lista de servidor.\n"
+"Você quer que o aMule baixe uma nova lista agora?"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (eMule Falso)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Lista de servidor baixada"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (baseado no eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr "web server rodando no pid %d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Nickname: %s ID: %u"
+#: src/amule.cpp:658
+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 ""
+"Você requisitou rodar o web server na iniciação, mas o binário do amuleweb "
+"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/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Solicitado: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "ERRO"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] "Estatísticas dessa sessão: Aceito %d de %d pedido, %s transferido\n"
-msgstr[1] ""
-"Estatísticas dessa sessão: Aceitos %d de %d pedidos, %s transferidos\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Não foi possível conectar às portas desse endereço: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Estatísticas de todas as sessões: Aceito %d de %d pedido, %s transferido\n"
-msgstr[1] ""
-"Estatísticas de todas as sessões: Aceitos %d de %d pedidos, %s transferidos\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Solicitado um arquivo desconhecido"
+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/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Cliente %s em IP:Porta %s:%d usando %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Nome do usuário"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Amigos"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Exibir &Detalhes"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Adicionar amigo"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Remover amigo"
-
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Enviar &Mensagem"
-
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Exibir Arquivos"
-
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Abrir slot para amigos"
-
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Deseja eliminar o amigo selecionado de sua lista?"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"A Porta %u não está disponível!\n"
+"\n"
+"Isso quer dizer que você ficará com LOWID (ID baixa).\n"
+"\n"
+"Verifique sua rede para ver se essa porta está aberta para entrada e saída."
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Deseja eliminar os amigos selecionados de sua lista?"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Falha ao criar o arquivo OnlineSig"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Cancelar"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Falha ao criar o arquivo OnlineSig do aMule"
 
-#: src/FriendListCtrl.cpp:359
+# src/amuled.cpp:1246:
+#: src/amule.cpp:1031
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
 msgstr ""
-"Você não pode definir mais de um slot para amigos.\n"
-" Apenas um foi definido."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Seleção múltipla"
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Download concluído"
+"Parece que o idioma selecionado não está instalado no seu computador. (Nota: "
+"eu irei definí-lo mesmo assim)."
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Caminho completo do arquivo."
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "Essa é a primeira vez que você executa o aMule %s"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Nome do arquivo sem seu caminho completo."
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Essa é uma versão de testes, atualizada diariamente, e\n"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "O hash eD2k do arquivo."
+#: src/amule.cpp:1043
+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"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Tamanho do arquivo em bytes."
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"ou matar seu cachorro. Mas ela *deve* ser segura para uso mesmo assim.\n"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Tempo acumulado de download ativo."
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Maiores informações, suporte e novas versões podem ser encontradas em nossa\n"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Nova sessão de chat iniciada"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"homepage www.aMule.org ou em nosso canal de irc #aMule na irc.freenode.net.\n"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Remetente da mensagem."
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Esteja a vontade para notificar qualquer bug em http://forum.amule.org"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Sem espaço"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
+msgstr ""
+"A pasta especificada para os arquivos da Online Signature é INVÁLIDA!\n"
+"OnlineSignature ficará DESATIVADA até você atualizar as preferências."
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Partição do disco"
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "Nome do Servidor:"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Erro ao concluir"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Préalocação de espaço em disco para arquivo '%s' falhou: %s"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Nome do arquivo"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "ERRO: não foi possível abrir arquivo de log"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Tamanho"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "AVISO: o arquivo de log está vazio. Algo está errado."
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tipo"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Arquivo de log resetado"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioridade"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "MensagemDoServidor: %s"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "ID do arquivo"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Pedidos"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Falha ao obter a lista de nodes."
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Pedidos aceitos"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Falha ao abrir arquivo de versão baixado"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Dados transferidos"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Arquivo de versão corrompido"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Taxa Compartilhada"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Você está utilizando uma versão anterior do aMule!"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Partes já baixadas"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Sua versão do aMule é %i.%i.%i e a última versão é %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Fontes Completas"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "A mais recente versão pode ser obtida em http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Caminho completo"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr ""
+"CUIDADO: Sua versão do aMuled esta ultrapassada: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Arquivos Compartilhados"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Sua versão do aMule está em dia :)"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Muito baixo"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Falha ao baixar arquivo de controle de versão"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Baixo"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Usuários:%s | Arquivos: %s"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normal"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Usuários: E: %s K: %s | Arquivos: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Alto"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Nenhuma rede selecionada"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Muito Alto"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "com LowID"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Lançamento"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "com HighID (Id alta)"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Auto"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Conectado a %s %s"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Adicionar Comentário/Avaliação"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Conectando a %s"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Editar Comentário/Avaliação"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Disconectado de eD2k"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Renomear"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad iniciado."
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Adicionar arquivo na coleção para lista de transgênica"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad parado."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Copiar &URL Magnet para Área de Transferência"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Conectado a rede Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Copiar &link eD2k para área de tranferência"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Conectado a rede Kad (sob firewall)"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Copiar &link eD2k para área de tranferência (&Fonte)"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Desconectado da rede Kad"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
 msgstr ""
-"Copiar &link eD2k para área de tranferência (Fonte) (&Com opções de "
-"criptografia)"
+"A rede Kad não pode ser usada se a porta UDP está desabilitada em "
+"preferências, não iniciará."
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Copiar &link eD2k para área de tranferência (&Nome da máquina)"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "A rede Kad está desabilitada em preferências, não iniciará."
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuled.cpp:560
+#, fuzzy
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
 msgstr ""
-"Copiar &link eD2k para área de tranferência (Nome da máquina) (Com &Opções "
-"de criptografia)"
-
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Copiar &link eD2k para área de tranferência (&Info AICH)"
-
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Copiar retorno para a Área de Transferência"
+"ERRO: O daemon aMule não pode ser usado quando conexões externas estão "
+"desabilitadas. Para habilitar conexões externas, use um dos dois normal no "
+"aMule, inicie o amuled com a opção --ec-config ou mude o comando"
+"\"AcceptExternalConnections\" para 1 no arquivo ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuled.cpp:563
 msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
 msgstr ""
-"Resposta de: %s (%s)\n"
-"\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Você precisa ter HighID para criar uma fonte ED2K válida"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "CUIDADO"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Arquivos Compartilhados (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[PartFile]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Informe o novo nome para o arquivo:"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Renomear"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr ""
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Continuando uploads para o arquivo: %s"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr ""
 
-#: src/UploadQueue.cpp:520
+#: src/amuled.cpp:711
 #, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Suspendendo uploads para o arquivo: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "Cliente em modo texto do aMule"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: chave de pesquisa muito curta"
+msgid "ERROR: %s"
+msgstr "ERRO: %s"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
+#: src/amuleDlg.cpp:238
 #, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Lendo %u contato Kad"
-msgstr[1] "Lendo %u contatos Kad"
+msgid "This is aMule %s based on eMule."
+msgstr "Esse é o aMule %s, baseado no eMule"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
+#: src/amuleDlg.cpp:240
 #, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Somente %d contato Kad disponível, nodes.dat não escrito"
-msgstr[1] "Somente %d contatos Kad disponíveis, nodes.dat não escrito"
+msgid "Running on %s"
+msgstr "Executando em %s"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Gravado %d contato Kad"
-msgstr[1] "Gravados %d contatos Kad"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr "Visite http://www.amule.org para ver se há nova versão disponível."
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ERRO: Não pôde ouvir a porta TCP."
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ERRO FATAL: Falha ao criar Timer"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "conexão de cliente web aceita\n"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Controle Remoto do aMule"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ERRO: não pode aceitar conexão do cliente web\n"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Snapshot:"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Solicitação falhou com o seguinte erro: %s."
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Solicitação falhou com erro desconhecido."
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Arquivo index não encontrado:"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Sessão expirada - solicitando login\n"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sessão Ok, logado\n"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sessão Ok, ainda não logado\n"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Nenhuma sessão aberta - solicitando login\n"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Sessão criada - solicitando login\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: roteamento peer-to-peer baseado em métrica XOR.\n"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Processando pedido [original]: "
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Verificando senha\n"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Hash de senha inválido\n"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Mensagem"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Senha Ok\n"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Senha inválida\n"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Conectando"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Você não digitou nenhuma senha. Senha em branco não é permitido.\n"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Conectado"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Solicitado logout\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Disconectado"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Processando solicitação [redirecionado]: "
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Atrás de Firewall"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Carregar modelo <str>"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Conectado"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Porta HTTP do web server"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Conectando"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Usar redirecionamento de porta UPnP na porta do cliente web"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Desligado"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Porta UPnP"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Utilizar compressão gzip"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Cancelar as tentativas atuais de conexão"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Senha de total acesso para servidor web"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Desconectar"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Senha de visitante para servidor web"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Desconectar das redes atualmente conectadas"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Permitir acesso restrito"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Conectar"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Negar acesso restrito"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Conectar às redes ativas"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Carregar/salvar configurações do servidor web de/para aMule remoto"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Caminho para arquivo amule.conf - NÃO USE DIRETAMENTE!"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Up: %.1f | Down: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Desativar interpretador PHP (depreciado)"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Conectado)"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Recompilar páginas PHP a cada solicitação"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Desconectado)"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Servidor Web do aMule"
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Você realmente quer sair do aMule?"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Não disponível"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Confirmação de saída"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Nunca"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr ""
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Baixando..."
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr ""
 
-#: src/HTTPDownload.cpp:75
+#: src/amuleDlg.cpp:1232
 #, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+msgid "Skin directory '%s' does not exist"
+msgstr "O diretório '%s' de skins não existe"
 
-#: src/HTTPDownload.cpp:239
+#: src/amuleDlg.cpp:1237
 #, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr ""
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Preferências"
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "CUIDADO: Incapaz de abrir o arquivo de pele '%s' para leitura"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Pasta contendo arquivo amulesig.dat"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Redes"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Procurar"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Janela de redes"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Informe aqui a pasta onde está o arquivo amulesig.dat"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Pesquisas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Taxa de atualização (em segundos)"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Janela de Pesquisas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Gerar imagem de estatística a cada atualização"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Downloads"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Informe aqui a pasta onde gravar a imagem de estatística gerada"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Baixando"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Fazer upload periódico da imagem para servidor FTP"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Arquivos compartilhados"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "URL do FTP"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Janela de compartilhados"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Caminho no FTP"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Mensagens"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Informe a URL do seu servidor FTP"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Janela de Mensagens"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "Informe a pasta onde colocar a sua imagem estatística no servidor FTP"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Estatísticas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Usuário"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Janela de Estatísticas"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Senha"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Preferências"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Informe o nome do usuário de login, para o servidor FTP"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Janela de Preferências"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Informe a senha para o usuário do servidor FTP"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Intervalo entre atualizações do servidor FTP"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Ferramenta de importação de arquivos .part"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Validar"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Sobre"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Pasta contendo seu arquivo de assinatura"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Sobre/Ajuda"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Pasta para colocar imagem estatística gerada"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Rede eD2k"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
-#, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i dias %i horas %i min %i s"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "rede Kad"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, Estatísticas Online do aMule"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Sem redes"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Bem-vindo!"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
 msgid "aMule"
 msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Taxa máxima de DL enquanto roda o wxCas"
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "ERRO FATAL: Falha ao criar 'Timer'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Taxa máxima absoluta de DL enquanto rodava o wxCas (anterior)"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Conectar a aMule remoto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Limpar"
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "ERRO FATAL: Falha ao criar 'Timer'"
+
+#: src/amule-remote-gui.cpp:268
+#, fuzzy
+msgid "Going to event loop..."
+msgstr "Tentando recuperar info do arquivo..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistema"
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "Conectando"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Parar atualização automática"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Conexão falhou "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Salvar imagem de estatística Online"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Imprimir imagem de estatística Online"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Preferências"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Sobre wxCas"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Iniciar atualização automática"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Atualização automática parada"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Tudo"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Atualização automática iniciada"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Salvar imagem estatísticas"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Desconhecido"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Estatísticas Online do aMule"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Falha ao receber lista de compartilhamentos do usuário '%s'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
 msgstr ""
-"Encontrei um problema na hora de imprimir.\n"
-"A sua impressora está configurada corretamente?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Imprimindo"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (versão de eMule FALSA %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"wxCas, Gerador de Assinaturas Online com estatísticas do aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Baseado no CAS, por Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distribuído sob licença GPL"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (eMule Falso)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, aMule não está rodando..."
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (eMule Falso)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule está rodando"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (baseado no eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule está rodando, mas desconectado"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Nickname: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule está conectando..."
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Solicitado: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh Oh, o status do aMule é desconhecido..."
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] "Estatísticas dessa sessão: Aceito %d de %d pedido, %s transferido\n"
+msgstr[1] ""
+"Estatísticas dessa sessão: Aceitos %d de %d pedidos, %s transferidos\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Estatísticas de todas as sessões: Aceito %d de %d pedido, %s transferido\n"
+msgstr[1] ""
+"Estatísticas de todas as sessões: Aceitos %d de %d pedidos, %s transferidos\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " está rodando há "
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Solicitado um arquivo desconhecido"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr "esta parado !"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Mensagem filtrada de '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " não esta conectado !"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nova mensagem de '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " está conectando..."
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr "Usuário %s (%u) solicitou sua lista de shares na pasta %s -> Negado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " está fazendo algo de estranho, verifique!"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, fuzzy, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "CUIDADO: known.met não pode ser aberto."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " conectado em "
+#: src/CanceledFileList.cpp:61
+#, fuzzy
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr "CUIDADO: Lista known corrompida, contém cabeçalho inválido."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Erro de I/O ao ler arquivo known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "Ok"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Erro ao salvar arquivo known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "sob firewall"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "desligado"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Categoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " está ativo "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nova Categoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " com "
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Escolha um diretório para os arquivos"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Download Total: "
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Você precisa dar um nome para a categoria!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Upload: "
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Você precisa definir um caminho para a categoria!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Download da Sessão: "
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Falha ao definir pasta para a categoria. Favor informar um caminho válido!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Download: "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Sessão de Chat iniciada: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upload: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Conectado ao Cliente ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Conectando ao Cliente ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Compartilhando: "
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Falha ao conectar ao Cliente / Conexão perdida ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " arquivos, Clientes na fila: "
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Tempo: "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " em "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Fechar aba"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Média de carga do Sistema (1-5-15 min): "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Fechar todas as abas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Uptime do Sistema: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Fechar outras abas"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02umin %02us"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Adicionar aos Amigos"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/ClientCreditsList.cpp:158
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Arquivo de créditos carregado, %u cliente reconhecido"
+msgstr[1] "Arquivo de créditos carregado, %u clientes reconhecidos"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
+#: src/ClientCreditsList.cpp:161
 #, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Créditos expirados para %u cliente!"
+msgstr[1] " - Créditos expirados para %u clientes!"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
-#, c-format
-msgid "%02us"
-msgstr "%02us"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Arquivo 'cryptkey.dat' não foi encontrado, criando."
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Detalhes do Cliente"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
 msgid "LowID"
 msgstr "LowID"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Não conectado"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Habilitado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Suportado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Não suportado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Disabilitado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Conectado"
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Cancelado !"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Desconectado"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "Unable to open %s"
-msgstr "Impossível abrir %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Parâmetros de Entrada"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Arquivo a gerar hash"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "URL para esse arquivo (opcional)"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Escreva aqui o arquivo que você quer computar a ligação eD2k"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Incompleto"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
-msgstr ""
-"Escreva aqui a URL que você quer adicionar na ligação eD2k: Adicione / no "
-"fim para deixar o aLinkCreator anexar o atual nome do arquivo"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Cara Mau"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Adicionar"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Verificado - OK"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Remover"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Não Disponível"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Limpar"
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "Usuário %s (%u) pediu sua lista de shares -> Aceito"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Criar link com hash de partes"
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "Usuário %s (%u) pediu sua lista de shares -> Negado"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
-"Ajuda a espalhar arquivos novos e raros mais rápido, mas aumenta o tamanho "
-"do link"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Hash MD4 do arquivo"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "Hash de arquivo eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "Ligação eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Iniciar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Salvar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Copiar para a Área de Transferência"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Sair"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Abrir"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Abra o arquivo para computar esta ligação eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Copiar ligação eD2k computada para a área de transferência"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Salvar como"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Salvar ligação eD2k computada no arquivo"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Sobre"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Sobre o aLinkCreator"
+"O usuário %s (%u) solicitou sua lista de pastas compartilhadas -> Aceito"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Selecione o arquivo que você quer computar a ligação eD2k"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr ""
+"O usuário %s (%u) solicitou sua lista de pastas compartilhadas -> Negado"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Não pode abrir na Área de Transferência"
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
+msgstr "Usuário %s (%u) solicitou sua lista de shares na pasta %s -> Aceito"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Nada a ser copiado!"
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr "Usuário %s (%u) solicitou sua lista de shares na pasta %s -> Negado"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Selecione o arquivo para sua ligação eD2k computada"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Usuário %s (%u) compartilha diretório %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Impossível abrir "
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Usuário %s (%u) enviou pastas não solicitadas."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Por favor, informe um nome não-vazio"
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "Usuário %s (%u) enviou lista de compartilhamentos da pasta %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Nada a ser salvo!"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Usuário %s (%u) terminou de enviar seus compartilhamentos"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"aLinkCreator, o criador de ligação do aMule eD2k\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps de http://www.everaldo.com e http://www.icomania.com\n"
-"e http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distribuído sobre GPL"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Usuário %s (%u) enviou compartilhamentos não solicitados"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Criando Hash..."
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr "Usuário %s (%u) negou o acesso a lista de arquivos compartilhados"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator está funcionando para você"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Comentários do arquivo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Cálculando Hash MD4..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Nome do usuário"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Cálculando Hashses eD2k..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Nome do arquivo"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Pronto em %.2f s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Avaliação"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Você já adicionou essa URL!"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Comentário"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Informe uma URL não-vazia"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Sem comentários"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Processando arquivo número %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Você pediu por hash de partes (só é usado para arquivos > 9,5MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u comentário"
+msgstr[1] "%u comentários"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Arquivo não existe !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, o criador de ligações do aMule eD2k"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1325,31 +1146,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Alto]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Conectando"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Muito baixo"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Baixo"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normal"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Alto"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Muito Alto"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Lançamento"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Perguntando"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Conectando via servidor"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Fila de espera cheia"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "Na fila de espera"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Transferindo"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Baixando"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1375,8 +1222,7 @@
 msgid "Too many Kad connections"
 msgstr "Muitas conexões Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Banido"
 
@@ -1408,8 +1254,8 @@
 msgid "Remote Server"
 msgstr "Servidor Remoto"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1431,10 +1277,10 @@
 
 #: src/DataToText.cpp:135
 msgid "Search Result"
-msgstr "Resultado da Pesquisa"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Completado"
 
@@ -1458,7 +1304,7 @@
 msgid "ERROR: Failed!"
 msgstr "ERRO: Falhou!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "Na fila de espera"
 
@@ -1470,871 +1316,309 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Arquivo temp desconhecido ou danificado"
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Padrão do sistema"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albanês"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Árabe"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturiano"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Basco"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Búlgaro"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Catalão"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Chinês (Simplificado)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Chinês (Tradicional)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Croácia"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Tcheco"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Dinamarquês"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Holandês"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Inglês (UK)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estônia"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finlandês"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Francês"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galego"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Alemão"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Grego"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hebreu"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Hungria"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italiano (Suíço)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japonês"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Coreano"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lituânia"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Noruega (Nynorsk)"
-
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polonês"
-
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Português (Portugal)"
-
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Português (Brasil)"
-
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Russo"
-
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Esloveno"
-
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Espanhol"
-
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Suécia"
-
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turquia"
-
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ucraniano"
-
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Impossível determinar browser selecionado!"
-
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr "Porta TCP não pode ser maior do que 65532, pois a UDP escuta em TCP+3"
-
-#: src/Preferences.cpp:1681
-#, c-format
-msgid "Default port will be used (%d)"
-msgstr "Porta padrão será utilizada (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Nome do Servidor"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Endereço"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Porta"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Descrição"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Usuários"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Arquivos"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Falha"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Fixo"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versão"
-
-#: src/ServerListCtrl.cpp:144
-msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
-"Você está conectado a um servidor que está tentando apagar. Desconecte "
-"antes. O servidor NÃO foi apagado."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Nome Desconhecido)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Deseja remover o servidor estático %s"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Sim"
-
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Não"
-
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Falha ao abrir '%s'"
-
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Servidores (%i)"
-
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Servidor"
-
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Conectar ao servidor"
-
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Marcar servidor como fixo"
-
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Marcar servidor como não-fixo"
-
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Marcar servidores como fixos"
-
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Marcar servidores como não-fixos"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Tamanho"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Apagar servidor"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Transferido"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Apagar servidores"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Velocidade"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Remover todos os servidores"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Progresso"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Copiar ligação eD2k para área de tranferência"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Fontes"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Copiar ligações eD2k para área de tranferência"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioridade"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Reconectar ao servidor"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Status"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Deseja remover todos os servidores?"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Tempo Restante"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Deseja remover o servidor selecionado?"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Última vez concluído"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Deseja remover o servidores selecionados?"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Último recebimento"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Desativado [%s]"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Deseja remover os arquivo selecionado?"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Esse é o aMule %s, baseado no eMule"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Deseja remover os arquivos selecionados?"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Running on %s"
-msgstr "Executando em %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr "Visite http://www.amule.org para ver se há nova versão disponível."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ERRO FATAL: Falha ao criar Timer"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Controle Remoto do aMule"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Snapshot:"
-
-#: src/amuleDlg.cpp:464
 msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Cliente p2p 'Multiplataforma' baseado no eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Página: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Fórum: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ (ajuda): http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Contato: admin@amule.org (assuntos administrativos) \n"
-
-#: src/amuleDlg.cpp:469
-msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
+"Feedback from: %s (%s)\n"
 "\n"
 msgstr ""
-" Copyright (C) 2003-2009 aMule Team \n"
+"Resposta de: %s (%s)\n"
 "\n"
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Trechos do aMule são baseados em \n"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: roteamento peer-to-peer baseado em métrica XOR.\n"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Parar"
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Mensagem"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "Pau&se"
 
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Conectado"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Continuar"
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Disconectado"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "Limpar Down&loads concluídos"
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Atrás de Firewall"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Trocar cada entrada A4AF para este arquivo agora"
 
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Conectado"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Trocar cada entrada A4AF para este arquivo (auto)"
 
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Conectando"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Trocar cada entrada A4AF para outro arquivo"
 
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Desligado"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Opções Extras"
 
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Cancelar as tentativas atuais de conexão"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Pré-visualizar"
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Desconectar"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Exibir &detalhes do arquivo"
 
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Desconectar das redes atualmente conectadas"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Exibir todos os comentários"
 
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Conectar"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Copiar URL Magnet para Área de Transferência"
 
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Conectar às redes ativas"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Copiar &link eD2k para área de tranferência"
 
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Copiar retorno para a Área de Transferência"
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Up: %.1f | Down: %.1f"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "não definido"
 
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Conectado)"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Adicionar na Categoria"
 
-#: src/amuleDlg.cpp:836
-#, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Desconectado)"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "Abrir &o arquivo"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Você realmente quer sair do aMule?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Informe o novo nome para o arquivo:"
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Confirmação de saída"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Renomear"
 
-#: src/amuleDlg.cpp:1182
-#, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "O diretório '%s' de skins não existe"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "CUIDADO: Incapaz de abrir o arquivo de pele '%s' para leitura"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Redes"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Janela de Redes"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Pesquisas"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Janela de Busca"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Transferências"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Janela de arquivos transferidos"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Arquivos compartilhados"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Janela de arquivos compartilhados"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Mensagens"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Janela de Mensagens"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Janela de gráficos de estatísticas"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Janela de configuração de preferências"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importar"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Ferramenta de importação de arquivos .part"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Sobre/Ajuda"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "Rede eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "rede Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Sem redes"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Geral"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Conexão"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Diretórios"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Servidores"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Segurança"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Interface"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filtros"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Controles remotos"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Assinatura Online"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Avançado"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Eventos"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Debugando"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Definido pelo Usuário"
+msgid "Downloads (%i)"
+msgstr "Downloads (%i)"
 
-#: src/PrefsUnifiedDlg.cpp:539
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-"O aMule deve ser reiniciado para habilitar estas mudanças:\n"
-"\n"
+"Para previnir que este aviso apareça em toda pré-visualização,\n"
+"indique seu tocador de vídeo preferido em preferências (mplayer é o padrão)."
 
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "-Porta TCP alterada.\n"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Pré-visualização"
 
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "-Porta UDP alterada.\n"
+#: src/DownloadListCtrl.cpp:1461
+#, c-format
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "ERRO: Falha ao executar o player de mídia externo! Comando: `%s'"
 
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
 msgstr ""
-"Sua lista de servidores Auto-atualizáveis está vazia.\n"
-"'Lista de servidores Auto-atualizáveis no ínicio será desabilitada."
 
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
-"Você ativou as conexões externas (EC) mas não definiu uma senha.\n"
-"Conexões Externas só podem ser feitas se for especificada uma senha válida."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "-Idioma alterado.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "-Diretório temporário alterado.\n"
 
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- Rede ED2K habilitada.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Up: 0.0 | Down: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Ambas rede eD2k e Kad estão desativadas.\n"
-"Você não será capaz de conectar senão habilitar pelo menos um deles."
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "Carregando arquivo server.met: %s"
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad não iniciará se sua porta UDP estiver desabilitada.\n"
-"Habilite a porta UDP ou desative a rede Kad."
+#: src/DownloadQueue.cpp:132
+#, fuzzy, c-format
+msgid "Loading PartFile %u of %u"
+msgstr "Carregando dados do download antigo (%u de %u)"
 
-#: src/PrefsUnifiedDlg.cpp:669
+#: src/DownloadQueue.cpp:154
 msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"\n"
-"Você DEVE reiniciar o aMule agora.\n"
-"Se você não reiniciá-lo agora, não reclame se algo de ruim acontecer.\n"
+"ERRO: Falha ao carregar arquivo de cópia. Procure em http://forum.amule.org "
+"para o .part.met recuperar soluções."
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
-"Sua lista de atualização de servidores está em branco.\n"
-"Coloque pelo menos uma linha que aponte para um server.met válido.\n"
-"Clique no botão \"Lista\" para abrir a caixa para digitar uma URL."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Arquivos Temporários"
 
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Arquivos Recebidos"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Assinatura Online"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Escolha uma pasta para %s"
-
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Defina seu Player de Vídeo preferido"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Selecione o Browser"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Nenhum arquivo parcial (.part) encontrado"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Executável%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Editar lista de servidores"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Encontrado %u arquivo parcial"
+msgstr[1] "Encontrados %u arquivos parciais"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Adicione aqui URL's para baixar arquivo 'server.met'\n"
-"Somente uma URL por Linha."
+"O sistema de arquivos para o diretório Temp não pode manusear grandes "
+"arquivos."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Delay na atualização: %d segundo"
-msgstr[1] "Delay na atualização: %d segundos"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"O sistema de arquivos para o diretório Recebido não pode manusear grandes "
+"arquivos."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Tempo do gráfico de média: %d minuto"
-msgstr[1] "Tempo do gráfico de média: %d minutos"
+msgid "Downloading %s"
+msgstr "Baixando %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Escala do gráfico de conexões: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Ooops! Você já está tentando baixar o arquivo '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Espera na atualização: %d segundo"
-msgstr[1] "Espera na atualização: %d segundos"
+msgid "You already have the file '%s'"
+msgstr "Você já tem o arquivo '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Tamanho do Buffer de Arquivo: %d byte"
-msgstr[1] "Tamanho do Buffer de Arquivo: %d bytes"
+msgid "You are already trying to download the file %s"
+msgstr "Ooops! Você já está tentando baixar o arquivo %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Tamanho de Espera de Upload: %d cliente"
-msgstr[1] "Tamanho de Espera de Upload: %d clientes"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Não pode converter ligação magnética para eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Atualizar conexão com servidor: %d minuto"
-msgstr[1] "Atualizar conexão com servidor: %d minutos"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Intervalo para atualizar conexão no servidor: Desativado"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Porta UDP para solicitações extendidas do servidor(TCP+3):"
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "desativado"
+msgid "Unknown protocol of link: %s"
+msgstr "Protocolo de link desconhecido: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Executar comando em evento `%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Habilitar execução de comando no núcleo"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Comando do Núcleo:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Habilitar execução de comando na GUI"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Comando da GUI:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "As seguinte váriaveis serão substituidas:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Ligação eD2k inválida! ERRO: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Tentaviva de acesso não autorizado. Conexão encerrada."
+#: src/ExternalConn.cpp:260
+#, fuzzy
+msgid "Client sent packet after authentication failed."
+msgstr "Falha na autenticação."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Conexão externa encerrada."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Conexões externas desativadas por não ter sido definida uma senha!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Conexões externas desativadas no arquivo de configuração"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Novas conexões externas aceitas"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERRO: Não pôde aceitar uma nova conexão externa"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "Conexão externa recusada por não ter sido definida uma senha nas "
 "preferências!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Cliente conectando: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Versão desconhecida"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2342,2210 +1626,1060 @@
 "Id de versão do EC incorreta, deve ser incompatibilidade binária. Use o core "
 "e o remote da mesma versão"
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 "Você não pode conectar a uma versão oficial a partir de um cliente SVN! "
 "*droga* Possível travamento evitado"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Falha na autenticação."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Versão do protocolo inválida."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Falta tag de versão do protocolo."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "Falha na autenticação."
+
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "Falha na autenticação."
+
+#: src/ExternalConn.cpp:516
+#, fuzzy
+msgid "Invalid request, please authenticate first."
 msgstr "Pedido negado, você precisa autenticar primeiro."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Acesso liberado."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, fuzzy, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Filtrar mensagens de clientes desconhecidos"
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Tentaviva de acesso não autorizado. Conexão encerrada."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Comando de PartFile remoto falhou: Filehash não encontrada: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Hash do arquivo não encontrada: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! Processando erro OpCode!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Servidor não adicionado"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "servidor não encontrado: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "precisa definir o servidor a ser removido"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k foi desabilitado nas preferências."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Pesquisa em andamento, aguarde..."
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Pesquisa web pela interface remota não faz sentido."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad está desativado nas preferências"
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Sem dados para gráfico."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Seu cliente não está configurado para esse nível de detalhes."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Conexão Externa: requerido desligar"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Já estou desligando."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: adicionar link '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Link inválido ou já está na lista."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Arquivo não encontrado."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Nome de arquivo inválido."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Não foi possível renomear o arquivo."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad está desativado nas preferências"
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Já conectado em eD2k."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Conectando em eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Já conectado a rede Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Conectando a rede Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Todas as redes estão DESATIVADAS."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Disconectado de eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Desconectado da rede Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Conexão Externa:opcode recebido inválido: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "opcode inválido (versão errada do protocolo?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr "Falha ao abrir o arquivo (%s), removendo da lista de compartilhados."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Hashset solicitado para arquivo desconhecido: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Comando `%s' com pid `%d' foi finalizado com o status `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Servidor não adicionado: sem IP ou hostname."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Servidor não adicionado: porta informada inválida."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Status de eD2k:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Conectado"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Porta:"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Status Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Rodando"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Status:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Desconectado"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Estado da Conexão:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Atrás de Firewall"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Estado do Firewall:"
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Conectado ao amigo"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Sem amigos"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Média de Usuários:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Média de Arquivos:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Parado"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Uptime: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Transferência"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Uploads"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Dados enviados (Sessão (Total)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Overhead Total (pacotes): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Solicitações de Arquivo (pacotes): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Troca de fontes (Pacotes): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Overhead de servidor (Pacotes): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Overhead Kad (pacotes): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Criptografia elevada (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Uploads ativos: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Uploads em espera: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Total de sessões de UP com sucesso: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Total de sessões de UP que falharam: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Tempo médio de upload: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Downloads"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Dados baixados (Sessão (Total)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Fontes encontradas: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Downloads ativos (pedaços): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Média de UL:DL da Sessão (Total): %s"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Extensão '%s' desconhecida para o comando '%s'.\n"
 
-#: src/Statistics.cpp:689
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Taxa média de download (Sessão): %s"
+msgid "Unknown command '%s'.\n"
+msgstr "Comando desconhecido '%s'.\n"
 
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Taxa média de envio (Sessão): %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Esse comando não precisa de argumentos.\n"
 
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Taxa máxima de download (Sessão): %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Esse comando precisa de um argumento.\n"
 
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Taxa máxima de envio (Sessão): %s"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Esse comando está incompleto, você precisa de uma das extensões abaixo.\n"
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Reconectados: %i"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Extensões disponíveis:\n"
 
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Tempo desde a primeira transferência: %s"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Comandos disponíveis:\n"
 
-#: src/Statistics.cpp:695
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Conectado ao servidor desde: %s"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Todos os comandos são case-insensitive (MAIÚSCULAS ou minúsculas).\n"
+"Digite '%s <comando>' para obter ajuda sobre o <comando>.\n"
 
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Conexões ativas (estimada): %i"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Sair do programa."
 
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Máximo de conexões que atingiram tempo limite: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Exibe a ajuda."
 
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Média de conexões (estimativa): %g"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Para obter ajuda sobre um comando, digite 'help <comando>'.\n"
+"Para obter a lista completa de comandos, digite 'help'.\n"
 
-#: src/Statistics.cpp:700
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Pico de conexões (estimada): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Clientes"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrado"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Use '%s' para lista de comandos\n"
+"\n"
 
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Total: %i Conhecidos: %i"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Erro na sintaxe!"
 
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Servidores ativos: %i"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+"Erro processando comando - isso jamais deveria acontecer! Reporte o bug, por "
+"favor\n"
 
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Servidores que falharam: %i"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Este comando não precisa de parâmetros."
 
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Total: %s"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Este comando precisa de um parâmetro."
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Servidores eliminados: %s"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Argumento inválido."
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Servidores Filtrados: %s"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Este comando está incompleto."
 
-#: src/Statistics.cpp:720
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Usuários em servidores ativos: %llu"
+msgid "Type '%s' to get more help.\n"
+msgstr "Digite '%s' para maiores informações.\n"
 
-#: src/Statistics.cpp:721
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Arquivos nos servidores ativos: %llu"
+msgid "This is %s %s %s\n"
+msgstr "Este é %s %s %s\n"
 
-#: src/Statistics.cpp:722
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "Total Users: %llu"
-msgstr "Total de usuários: %llu"
+msgid "This is %s %s\n"
+msgstr "Este é %s %s\n"
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "Total de arquivos: %llu"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
+msgstr ""
+"\n"
+"Criando cliente..\n"
 
-#: src/Statistics.cpp:724
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Ocupação do Servidor: %.2f%%"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
+msgstr ""
+"\n"
+"Ok, abandonando %s...\n"
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Número de arquivos compartilhados: %s"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
+"Não é possível conectar sem senha.\n"
+"Você deve informar uma no arquivo de configuração\n"
+"ou na linha de comando, ou informar um quando pedido.\n"
+"\n"
+"Finalizando...\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Tamanho total de compartilhados: %s"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Exibir esse texto de ajuda."
 
-#: src/Statistics.cpp:731
-#, c-format
-msgid "Average file size: %s"
-msgstr "Média de tamanho de arquivo: %s"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Host onde o aMule está rodando. (padrão: localhost)"
 
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Sistema Operacional"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Porta em que o aMule está esperando Conexões Externas (padrão: 4712)"
 
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Não recebido"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Senha para Conexão Externa."
 
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Recortar"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Ler configuração de arquivo."
 
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Colar"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Não exiba mensagens no stdout (silencioso)"
 
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Selecionar Tudo"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Verbose - exiba até as mensagens de debug."
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "A busca do Kad não pode ser feita se o Kad não estiver rodando"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Defina o locale (idioma)."
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "Procura eD2k não pode ser concluída se o eD2k não está conectado"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Gravar opções de linha de comando"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Erro inesperado quando tentava fazer a busca do Kad:"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Criar arquivo de configuração baseado no do aMule."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Mensagem filtrada de '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Exibir versão do programa."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nova mensagem de '%s' (IP:%s)"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Detalhes do Arquivo"
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "Usuário %s (%u) pediu sua lista de shares -> Aceito"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% concluído"
 
-#: src/ClientTCPSocket.cpp:842
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "Usuário %s (%u) pediu sua lista de shares -> Negado"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
-"O usuário %s (%u) solicitou sua lista de pastas compartilhadas -> Aceito"
+"Falha em abrir lista de amigos do arquivo 'emfriends.met' para leitura!"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
-"O usuário %s (%u) solicitou sua lista de pastas compartilhadas -> Negado"
-
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr "Usuário %s (%u) solicitou sua lista de shares na pasta %s -> Aceito"
-
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr "Usuário %s (%u) solicitou sua lista de shares na pasta %s -> Negado"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Usuário %s (%u) compartilha diretório %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Usuário %s (%u) enviou pastas não solicitadas."
-
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "Usuário %s (%u) enviou lista de compartilhamentos da pasta %s"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Usuário %s (%u) terminou de enviar seus compartilhamentos"
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Usuário %s (%u) enviou compartilhamentos não solicitados"
-
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr "Usuário %s (%u) negou o acesso a lista de arquivos compartilhados"
-
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Nodes (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "IP Inválido para inicialização"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Porta inválida para inicialização"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Preencha todos os campos necessários"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Deseja baixar uma nova versão do arquivo nodes.dat?\n"
+"Falha em abrir lista de amigos do arquivo 'emfriends.met' para escrita!"
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
-"Fazendo isso, seus nodes atuais serão removidos e a conexão Kademlia será "
-"reiniciada."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Continuar?"
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "ERRO:"
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "CUIDADO:"
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Adicionar um amigo"
-
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Você deve digitar um IP e porta válidos!"
-
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informação"
-
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "A Hash do usuário especificado é inválida"
-
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Fontes"
-
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Arquivo"
-
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Download"
-
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Categoria"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Amigos"
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Principal"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Exibir &Detalhes"
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Baixar na categoria"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Adicionar amigo"
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Procurando arquivos relacionados (eD2k, servidor local)"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Remover amigo"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Marcar como arquivo conhecido"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Enviar &Mensagem"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Conectar a aMule remoto"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Exibir Arquivos"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Conexão falhou "
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Abrir slot para amigos"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "ERRO"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Deseja eliminar o amigo selecionado de sua lista?"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Conexão Falhou. Impossível conectar em %s:%d\n"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Deseja eliminar os amigos selecionados de sua lista?"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
 msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
-"CUIDADO: Você não pode adicionar você mesmo como uma fonte para uma ligação "
-"eD2k quando tem um lowid."
-
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Usr: E: %s K: %s | Arquivos E: %s K: %s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Tudo"
-
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Total de Usr: %s | Total de Arquivos: %s"
-
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Transferido"
-
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Velocidade"
-
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Progresso"
-
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Status"
-
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Tempo Restante"
-
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Última vez concluído"
-
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Último recebimento"
-
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Deseja remover os arquivo selecionado?"
+"Você não pode definir mais de um slot para amigos.\n"
+" Apenas um foi definido."
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Deseja remover os arquivos selecionados?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Seleção múltipla"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Enviar mensagem ao usuário"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Mensagem a Enviar:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Parar"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "Pau&se"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Continuar"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "Limpar Down&loads concluídos"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Trocar cada entrada A4AF para este arquivo agora"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Trocar cada entrada A4AF para este arquivo (auto)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Trocar cada entrada A4AF para outro arquivo"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Opções Extras"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Pré-visualizar"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Exibir &detalhes do arquivo"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Exibir todos os comentários"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Copiar URL Magnet para Área de Transferência"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "não definido"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Adicionar na Categoria"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "Abrir &o arquivo"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Remover dos amigos"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Adicionar aos Amigos"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Trocar para esse arquivo"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Pedindo por outro arquivo(A4AF)"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Downloads (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Para previnir que este aviso apareça em toda pré-visualização,\n"
-"indique seu tocador de vídeo preferido em preferências (mplayer é o padrão)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Pré-visualização"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ERRO: Falha ao executar o player de mídia externo! Comando: `%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "ERRO: falha na criação do arquivo .part)"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Uploads em espera: %s"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Tentando carregar backup do met-file de %s"
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "Na fila de espera"
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ERRO:Falha ao abrir arquivo part.met: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Upload"
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ERRO: arquivo part.met é de tamanho 0: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Nenhum"
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ERRO: Versão do arquivo part.met inválida: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Não"
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"ERRO: %s (%s) está corrompido (tagcount errado), incapaz de carregar arquivo."
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Sim"
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Tentando recuperar info do arquivo..."
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Baixando..."
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
-"Recuperando arquivo sem nome - tentarei recuperá-lo como RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "Recuperada todas as informações do arquivo :D - Tente usá-lo..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Não foi possível recuperar o arquivo :("
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Falha ao abrir %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "CUIDADO: %s pode estar corrompido (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "Erro ao salvar arquivo .part: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Não foi possível identificar o tamanho de '%s' - usando arquivo '%s'."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "De alguma forma o arquivo '%s' está zerado - usando arquivo %s"
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Falha ao salvar part.met.seeds para %s"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Salvo %i fonte do .part: %s (%s)"
-msgstr[1] "Salvos %i fontes do .part: %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Arquivo .part %s (%s) não possui fontes disponíveis"
-
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Arquivo .part %s (%s) tem fontes expiradas."
-
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Erro lendo arquivo .seeds do arquivo (%s - %s): %s"
-
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Encontrada parte corrompida (%d) em %d arquivo .part %s - Resultado |%s| "
-"Hash |%s|"
-msgstr[1] ""
-"Encontradas partes corrompidas (%d) em %d arquivo .part %s - Resultado |%s| "
-"Hash |%s|"
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Achado parte completa (%i) em %s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Terminado o rehash %s"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Erro inesperado quando completado %s. Arquivo parado"
-
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Download concluído: %s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Apagando arquivo: %s"
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "CUIDADO: Incapaz de abrir o arquivo de pele '%s' para leitura"
 
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
-"CUIDADO: Incapaz de fazer hash em part baixado - hashset incompleto para '%s'"
 
-#: src/PartFile.cpp:2389
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
-"ERRO: Incapaz de fazer hash de part baixado - hashset incompleto (%s). Isto "
-"nunca deveria acontecer"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
-"AVISO: Não há espaço em disco suficiente! Colocando arquivo %s em pausa"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Parte baixada %i do arquivo %s está corrompida"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Recuperada parte corrompida %i para %s -> Bytes salvos: %s"
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Alocando"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Espaço em disco insuficiente"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Parado"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
 msgstr "Baixado"
 
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ERRO: Falha ao abrir partfile '%s'"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "CUIDADO: known.met não pode ser aberto."
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr "CUIDADO: Lista known corrompida, contém cabeçalho inválido."
-
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Erro de I/O ao ler arquivo known.met: %s"
-
-#: src/KnownFileList.cpp:158
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Erro ao salvar arquivo known.met: %s"
-
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Encontrado %i arquivo conhecido compartilhado"
-msgstr[1] "Encontrados %i arquivos conhecidos compartilhados"
-
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Encontrado %i arquivo conhecido, %i desconhecido"
-msgstr[1] "Encontrados %i arquivos conhecidos, %i desconhecidos"
-
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ERRO: Tentando compartilhar %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Comentários do arquivo"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Avaliação"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Comentário"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Sem comentários"
-
-#: src/CommentDialogLst.cpp:104
-#, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u comentário"
-msgstr[1] "%u comentários"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr ""
 
-#: src/ServerConnect.cpp:69
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"Falha ao conectar em todos servidores obscurecidos listados. Tentando de "
-"novo sem ofuscação."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Falha ao conectar em todos os servidores listados. Tentando novamente."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "Rede eD2k desabilitada nas preferências, não conectado."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Nenhum servidor válido para o qual conectar na lista de servidor"
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Conectado a %s (%s:%i)"
-
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Conexão estabelecida em: %s"
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Reconectar ao servidor"
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
-"Erro Fatal durante tentativa de conexão. Talvez seu link Internet tenha caído"
 
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Conexão perdida com %s (%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) parece estar desativado."
-
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) parece estar cheio."
-
-#: src/ServerConnect.cpp:381
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Conexão automática com o servidor irá se repetir em %d segundo"
-msgstr[1] "Conexão automática com o servidor irá se repetir em %d segundos"
+msgid "Download new GeoIP.dat from %s"
+msgstr ""
 
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Conexão perdida"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr ""
 
-#: src/ServerConnect.cpp:408
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Conexão a %s (%s:%i) falhou"
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ERRO: Socket inválido no tempo de checagem"
+msgid "Failed to remove %s file, aborting update."
+msgstr ""
 
-#: src/ServerConnect.cpp:460
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Expirado tempo de espera para conectar a %s (%s:%i)."
-
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
-"ERRO: Falha ao carregar arquivo de cópia. Procure em http://forum.amule.org "
-"para o .part.met recuperar soluções."
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Nenhum arquivo parcial (.part) encontrado"
-
-#: src/DownloadQueue.cpp:171
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Encontrado %u arquivo parcial"
-msgstr[1] "Encontrados %u arquivos parciais"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
+msgid "Successfully updated %s"
 msgstr ""
-"O sistema de arquivos para o diretório Temp não pode manusear grandes "
-"arquivos."
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
-"O sistema de arquivos para o diretório Recebido não pode manusear grandes "
-"arquivos."
 
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Baixando %s"
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Falha ao obter a lista de servidores de %s"
 
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Ooops! Você já está tentando baixar o arquivo '%s'"
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Falha ao obter a lista de servidores de %s"
 
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Você já tem o arquivo '%s'"
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Carregando  Filtros-IP 'ipfilter.dat' e 'ipfilter_static.dat'."
 
-#: src/DownloadQueue.cpp:364
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Ooops! Você já está tentando baixar o arquivo %s"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "Falha ao carregar arquivo ipfilter.dat '%s', formato desconhecido."
 
-#: src/DownloadQueue.cpp:1299
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Não pode converter ligação magnética para eD2k: %s"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "Falha ao carregar arquivo ipfilter.dat '%s', impossível abrir arquivo."
 
-#: src/DownloadQueue.cpp:1307
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Protocolo de link desconhecido: %s"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Carregada %u Faixa de IP de '%s'."
+msgstr[1] "Carregadas %u Faixas de IP de '%s'."
 
-#: src/DownloadQueue.cpp:1328
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Ligação eD2k inválida! ERRO: %s"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u linha malformada foi ignorada."
+msgstr[1] "%u linhas malformadas foram ignoradas."
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Executar <str> e sair."
+#: src/IPFilter.cpp:503
+#, c-format
+msgid "Failed to rename new %s file, aborting update."
+msgstr ""
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Formato do IP inválido. Use xxx.xxx.xxx.xxx:xxxx\n"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr ""
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:86
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Esse comando requer um parâmetro. Válidos: 'all', NomeDeArquivo, ou um "
-"número.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Processando pela hash: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Processando por nome de arquivo: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr "Esse comando requer um parâmetro. Válido: hash de um arquivo.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Não é um número válido\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Não é uma hash válida (precisa ter exatamente 32 caracteres)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Operação executada com sucesso."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Solicitação falhou com os seguintes erros: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Filtragem IP para clientes é %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "Desligado"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "Ligado"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Filtragem IP para servidores é %s.\n"
+"Inicializando com \n"
+"clientes conhecidos"
 
-#: src/TextClient.cpp:664
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Nível atual do IPFilter é %d.\n"
+msgid "Nodes (%u)"
+msgstr "Nodes (%u)"
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Limites de banda: Enviar: %u kB/s, Baixar: %u kB/s.\n"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "IP Inválido para inicialização"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Porta inválida para inicialização"
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "Conectado a %s %s %s"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Preencha todos os campos necessários"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "com LowID"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Deseja baixar uma nova versão do arquivo nodes.dat?\n"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "com HighID (Id alta)"
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr ""
+"Fazendo isso, seus nodes atuais serão removidos e a conexão Kademlia será "
+"reiniciada."
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Conectando"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Continuar?"
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Não conectado"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: chave de pesquisa muito curta"
 
-#: src/TextClient.cpp:723
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+msgid "Keyword for search: %s"
 msgstr ""
-"\n"
-"Download:\t%s"
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
-"\n"
-"Upload:\t%s"
 
-#: src/TextClient.cpp:729
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Clientes na fila:\t%d\n"
 
-#: src/TextClient.cpp:732
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Lendo %u contato Kad"
+msgstr[1] "Lendo %u contatos Kad"
+
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Fontes totais:\t%d\n"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Número de resultados da busca: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - mostrar progresso de uma busca"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Resposta recebida do servidor desconhecida, OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Exibir informações de status resumidas."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Exibir informações de conexão, taxa de Down/Up, etc.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Exibir árvore de estatísticas completas."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Gravado %d contato Kad"
+msgstr[1] "Gravados %d contatos Kad"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Opcionalmente, um número entre 0-255 pode ser informado como parâmetro para\n"
-"esse comando, que vai dizer quantas entradas de versões de clientes foram \n"
-"encontradas. Informar 0 ou nada quer dizer 'sem limites'.\n"
-"\n"
-"Exemplo: 'statistics 5' vai mostrar apenas as 5 maiores versões de cada tipo "
-"de cliente.\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Nome do Arquivo"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Fechar aMule."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Tamanho do arquivo"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Desligando o núcleo remoto (amule/amuled).\n"
-"Isso irá também desligar o cliente texto, por causa disso é inusável sem um\n"
-"núcleo rodando.\n"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Taxa de compartilhamento"
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Recarregar objeto selecionado."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Enviado"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Recarregar a lista de compartilhamentos."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Requisitado"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Recarregar a tabela IPFilter do arquivo."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Aceito"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Conectar a rede."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Fontes completas"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Isso vai fazer com que o aMule se conecte às redes definidas nas "
-"Preferências.\n"
-"Opcionalmente. você pode informar um servidor (servidor:porta) para se "
-"conectar\n"
-"a esse servidor apenas. O IP deve ter notação decimal IPv4,\n"
-"ou um nome DNS que possa ser resolvido."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Conectar somente em eD2k."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Conectar a rede Kad apenas."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Desconectar da rede."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Isso irá desconectar você de todas as redes conectadas atualmente.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Disconectar somente de eD2k."
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Desconectar apenas da rede Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Adicionar uma ligação eD2k ou magnética no núcleo."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"A ligação eD2k para ser adicionada pode ser:\n"
-"*) um arquivo de ligação (ed2k://|file|...), ela será adicionado na fila de "
-"download,\n"
-"*) uma ligação de servidor (ed2k://|server|...), ela será adicionarda a "
-"lista de servidores,\n"
-"*) ou uma ligação de lista de servidores, em qualquer caso todos servidores "
-"na lista serão adicionados para a\n"
-"   lista de servidores.\n"
-"\n"
-"A ligação magnética deve conter o hash eD2k e tamanho do arquivo.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Defina as preferências."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Preferências do IPFilter."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Ligar filtragem IP para ambos clientes e servidores."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Desligar filtragem IP para ambos clientes e servidores."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Habilitar/Desabilitar filtragem IP para clientes."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Ligar filtragem IP para clientes."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Desligar filtragem IP para clientes."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Habilitar/Desabilitar filtragem IP para servidores."
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Ligar filtragem IP para servidores."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Desligar filtragem IP para servidores."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Definir no nível do IP Filter."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Qualquer valor entre 0 e 255 é válido, e o valor padrão (inicial)\n"
-"é 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Limitação de Uso de Banda"
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "O Valor informado nesses comandos deve ser em kilobytes/s.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Definir limite de Upload."
-
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Definir limite de Download."
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Obter e mostrar o valor da opção selecionada."
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Versão desconhecida"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Obter preferências do IPFilter."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "CUIDADO: Incapaz de abrir o arquivo de pele '%s' para leitura"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Obter estado do IPFilter para ambos clientes e servidores."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Calculando hash"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Obter estado do IPFilter somente para clientes."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Finalizando"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Obter estado do IPFilter somente para servidores."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Completo"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Obter nível do IPFilter"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Pausa"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Obter limites de Up/Down"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Com Erro"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Faça uma busca"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Esperando"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"Um tipo de busca poderá ser especificado escolhendo o tipo:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Exemplo: 'search kad file' será pesquisado na rede kad o \"arquivo\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Você deve informar uma senha não-vazia."
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Executa uma pesquisa global."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Senha inválida, não é um hash MD5!"
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Executa uma pesquisa local"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Falha ao conectar"
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Executa uma pesquisa no kad"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "Conexão EC falhou. Resposta vazia."
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Mostra resultados da última pesquisa."
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "Conexão Externa: Má resposta do servidor. Conexão fechada."
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Retorna os resultados da pesquisa anterior.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Sucesso! Conexão estabelecida ao aMule "
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Exibe progresso de uma pesquisa."
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Sucesso! Conexão estabelecida."
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Exibe o progresso de uma pesquisa.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Conexão Externa: Acesso negado porque:"
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Iniciar download de um arquivo"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "Conexão Externa: Acesso negado"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
-"O número de um arquivo de uma última busca poderá ser obtido.\n"
-"Exemplo: 'download 12' começará a baixar o arquivo com o número 12 da busca "
-"anterior.\n"
-
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Parar Download."
-
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Continuar Download."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Cancelar Download"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "ERRO: Não pôde ouvir a porta TCP."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Definir prioridade de download."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "ERRO:"
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Mudar prioridade de um download para Baixo, Normal, Alto ou Auto.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "CUIDADO:"
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Definir prioridade baixa."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Fechar"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Definir prioridade normal."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Recortar"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Definir prioridade alta."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Copiar"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Definir prioridade auto."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Colar"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Exibir as listas de Up/Down"
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Limpar"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Exibe listas de Down/Up, lista de servidores ou lista de compartilhados.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Selecionar Tudo"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Mostrar fila de Upload."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Mostrar fila de Download."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Ilimitado"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Mostrar log."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Menu do Tray aMule"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Mostrar lista de servidores."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Limites de Velocidade:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Reiniciar log."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "UL: Nenhum"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Comando ultrapassado, use '%s' no lugar."
+msgid "UL: %u"
+msgstr "UL: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Esse comando foi depreciado e será removido no futuro.\n"
-"Ao invés desse, use '%s'.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DL: Nenhum"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ERRO %s (%s) - %s"
+msgid "DL: %u"
+msgstr "DL: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "CUIDADO: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Velocidade de Download: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Novo ID do cliente é %u."
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "AVISO: você recebeu uma ID baixa (LowID)!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr ""
-"\tGeralmente isso acontece quando você está atrás de um firewall/router."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tPara maiores informações, vá até http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Velocidade de Envio: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Info desconhecida recebida do servidor - muito curta"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Informação do Cliente"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Recebido %d servidor novo"
-msgstr[1] "Recebidos %d servidores novos"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Salvamento da lista de servidores concluído."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "O servidor rejeitou o último comando"
+msgid "Nickname: %s"
+msgstr "Nickname: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Pacote falso recebido do servidor: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Nenhum Nickname definido!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Ocorreu um erro imprevisto ao processar os pacotes do servidor: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ClienteID: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Não foi possível ativar resolução DNS para conectar a %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Não conectado"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "IP do servidor %s (%s) está filtrado. Não conectando."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Nome do Servidor: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "usando obscurecimento de protocolo."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP do Servidor: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Conectando para %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Não conectado"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Não foi possível resolver o DNS para %s: Impossível conectar!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Falha ao carrega dado do país de"
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Carregado %d bitmap de bandeira."
-msgstr[1] "Carregados %d bitmaps de bandeiras."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr "Deseja cancelar e APAGAR TODOS os arquivos desta categoria?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Confirmação requerida"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Todos os outros"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Incompleto"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Ativos"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Vídeo"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Áudio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Arquivo"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Imagem-CD"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Figuras"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Texto"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Selecione o filtro de exibição"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Adicionar categoria"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Editar categoria"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Remover categoria"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Nome do Arquivo"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Tamanho do arquivo"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Taxa de compartilhamento"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Enviado"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Requisitado"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Aceito"
+msgid "TCP port: %d"
+msgstr "Porta TCP: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Fontes completas"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "Porta TCP: Não está pronta"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Importando %s: %s"
+msgid "UDP port: %d"
+msgstr "Porta UDP: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Lendo pasta temp"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "Porta UDP: Não está pronta"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Recebendo informações básicas do arquivo info de download"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Online Signature: Ativado"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Criando arquivo de destino"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Online Signature: Desativado"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Carregando dados do download antigo (%u de %u)"
+msgid "Uptime: %s"
+msgstr "Uptime: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Salvando bloco de dados em novo arquivo de download (%u de %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Recebendo informações sobre fontes do arquivo a baixar"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Adicionando download e salvando novo arquivo .part"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importar arquivos .part"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Estado"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Hash do arquivo"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Aguardando..."
+msgid "Shared files: %d"
+msgstr "Arquivos compartilhados: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disco: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Escolha uma pasta para procurar por downloads temporários! (subdiretórios "
-"serão incluídos)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "Deseja excluir os temporários dos que foram importados com sucesso?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Remover temporários?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/s"
-msgstr[1] "bytes/s"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "s"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "min"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "horas"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "dias"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Vídeos"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Arquivos"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Textos"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programas"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Todos"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Não avaliado"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Inválido / Corrompido / Falso"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Ruim"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Regular"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Bom"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Excelente"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "todos"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "todos os outros"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Carregando  Filtros-IP 'ipfilter.dat' e 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Cliente na fila: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Falha ao carregar arquivo ipfilter.dat '%s', formato desconhecido."
+msgid "Total DL: %s"
+msgstr "DL Total: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "Falha ao carregar arquivo ipfilter.dat '%s', impossível abrir arquivo."
+msgid "Total UL: %s"
+msgstr "UL Total: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Carregada %u Faixa de IP de '%s'."
-msgstr[1] "Carregadas %u Faixas de IP de '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Limite de envio"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u linha malformada foi ignorada."
-msgstr[1] "%u linhas malformadas foram ignoradas."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Limite de download"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Conexões ativas (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Ocultar aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Detalhes do Arquivo"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Mostrar aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% concluído"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Sair"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "Ligação 2D2k:"
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Adicionar"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Clique aqui para adicionar a ligação eD2k no controle de texto para sua fila "
 "de download."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4553,19 +2687,19 @@
 "Os eventos são exibidos aqui. Para uma lista completa, veja o log na aba "
 "Servidores."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Carregando..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Número de usuários conectados neste servidor..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Usuários: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4573,6 +2707,10 @@
 "Usuários conectados a esse servidor e número estimado do total de usuários."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Up: 0.0 | Down: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4580,7 +2718,7 @@
 "Média atual de Download e Upload. Se há número entre os parêntesis, "
 "significa que atingiu o número máximo de conexões com o cliente."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4592,516 +2730,571 @@
 "low ID (sob firewall) e VERDE significa que você está com uma Id Alta (High "
 "ID, o melhor tipo de conexão)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Não Conectado..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Servidor atualmente conectado."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Pesquisar"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tipo"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "ArquivoHash"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Parâmetros Estendidos"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtrando"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Tipo de Arquivo"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Todos"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Arquivos"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Áudio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Imagem-CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Figuras"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programas"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Textos"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Vídeos"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Extensão"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Tamanho Mínimo"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Tamanho Máximo"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Disponível"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Resultados do Filtro"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Inverter resultado"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Ocultar arquivos conhecidos"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Iniciar"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Mais"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Procure por mais resultados no eD2k. Não suportado por Kad ainda."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Pare"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Download"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Reiniciar Campos"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Resultados"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Limpar downloads completados"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Exibir Uploads / Fila de espera"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Clientes em espera: "
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Enviar"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Enviar a mensagem especificada"
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Fechar"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Fontes completas"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Encerrar sessão de Chat"
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Geral"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Nome Completo:"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/A"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "arquivo-met :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Hash :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Tamanho :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Status parcial :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Última vez completo:"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Transferência"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Fontes encontradas:"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Transferindo de (fontes):"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Contador de partes: "
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Disponíveis: "
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Taxa de transf.: "
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Tempo ativo de download:"
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Transferido :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Tamanho completo: "
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Manipulador Inteligente de Corrupção (I.C.H.)"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Perdido ao corromper: "
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Ganho com compressão: "
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Pacotes recuperados pelo I.C.H.: "
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Nomes do arquivo"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Assumir"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Limpar"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Comente/Avalie o arquivo (o texto será exibido para todos)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Para um filme, Você pode falar do tamanho, idioma, história...\n"
-"e se ele for falso (fake), Você poderá informar aos demais usuários."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Qualidade do arquivo"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Não avaliado"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Inválido / Corrompido / Falso"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Ruim"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Regular"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Bom"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Excelente"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Escolha uma classe ou avise os demais usuários se o arquivo é inválido..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Atualizar"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Baixando, aguarde..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Tamanho desconhecido"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Informação necessária"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "Endereço IP:"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Porta:"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Usuário :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Userhash :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Atualizar lista de compartilhados"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Sessão atual"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Total"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Solicitados:"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Uploads ativos:"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Adicionar"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Download (Velocidade)"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Atual"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Média de execução"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Média da sessão"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Upload (velocidade)"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Conexões"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Downloads ativos"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Conexões ativas (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Uploads ativos"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Árvore de Estatísticas"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Nome do Usuário:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Hash do Usuário:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Software Cliente"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Versão do Cliente"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "Endereço IP:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID do Usuário:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP do servidor"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Nome do Servidor:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Obfuscação:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Transferir para o cliente"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Solicitação atual:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Taxa upload (média):"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Taxa download (média):"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Upload (Sessão):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Download (sessão):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Upload (total):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Download (total):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Pontuação"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Modificador Down/Up:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Secure ident:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Avaliação (total):"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "Na fila de espera"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Pontuação de fila:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Nick (identificação)"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - a Mula do Linux"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Esse é o nome que os usuários verão quando se conectarem à você."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Idioma"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Tempo de espera antes de mostrar as dicas."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Especifica o idioma que será usado no aMule."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Opções Diversas"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Procurar por nova versão ao iniciar"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr "Ativar faz com que o aMule verifique por nova versão ao iniciar"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Iniciar minimizado"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Ativando isto deixará o aMule minimizado na inicialização."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Perguntar ao sair"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Faz com que o aMule confirme antes de sair."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Ativar ícone no Systray"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Essa opção ativa/desativa o ícone no system tray (ou taskbar)."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Minimizar para a bandeja"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5109,581 +3302,462 @@
 "Ativando isso, o aMule vai minimizar para o ícone de bandeja, ao invés da "
 "barra de tarefas."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Tempo de Espera (dicas) em secs"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Tempo de espera antes de mostrar as dicas."
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Browser Padrão"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Padrão do Sistema"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Selecione seu navegador aqui"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Definido pelo Usuário:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Defina seu browser aqui, selecionando a opção 'definido pelo usuário' acima."
-"Para browser personalizado, selecione essa opção na lista."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Procurar"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Abrir em nova aba se possível"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Abrir a webpage em nova aba quando possível, ao invés de uma nova janela"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Player de Video"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Criar cópia para pré-visualização"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr "Limites da banda"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Alocação de Slots"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Porta TCP do Cliente:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Essa é a porta eD2k padrão e não pode ser desabilitada."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Porta UDP do cliente (Estendida):"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr "Essa porta UDP é usada para extender as requisições ed2k e da rede Kad"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "desativado"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Fixar esse Endereço"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Porta UDP para solicitações estendidas (TCP+3):4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "No. Max. de fontes por arquivo"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Limite"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Limites da conexão"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "No. Máximo de Conexões"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Plug and Play Universal"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Habilitar UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Porta TCP UPnP"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Auto-conectar ao iniciar"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Reconectar ao ser desconectado"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Exibir estatísticas da conexão"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Opções do Servidor"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Remover servidores inativos após"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "tentativas"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Lista de servidores auto-atualizáveis na iniciação"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Atualizar lista de servidores quando conectar em um servidor"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Atualizar lista de servidores quando um cliente conectar"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Usar sistema de prioridades"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Usar verificação inteligente de LowID ao conectar"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Conexão segura"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Auto-conectar somente em servidores da lista estática"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Definir servidores adicionados manualmente com prioridade Alta"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. ativo"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH a cada hash novo (não recomendado)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Adicionar novos downloads em pausa"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Adicionar novos downloads com prioridade automática"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Tentar baixar o primeiro e o último pedaço do arquivo primeiro"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Adicionar novos compartilhamentos com prioridade automática"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Tentar transferir pedaços completos em cada upload"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Iniciar próximo arquivo em pausa ao concluir download"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Da mesma categoria"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Salvar 10 fontes em arquivos raros (< 20 fontes)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Espaço em disco"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Préalocar espaço em disco para novos arquivos"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Checar espaço em disco"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
+"Para novos arquivos préalocar espaço em disco para todo o arquivo, isso "
+"reduz fragmentação"
+
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2058
+#: src/muuli_wdr.cpp:1819
 msgid "Select this if you want aMule to check your disk space"
 msgstr "Selecione isso se você quer uqe o aMule cheque seu espaço em disco"
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Espaço min em disco:"
-
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "Digite aqui o espaço min. de disco desejado"
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "Préalocar espaço em disco para novos arquivos"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Salvar 10 fontes em arquivos raros (< 20 fontes)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Uploads"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Adicionar novos compartilhamentos com prioridade automática"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
-"Para novos arquivos préalocar espaço em disco para todo o arquivo, isso "
-"reduz fragmentação"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Completo"
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Temporário"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Compartilhado"
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Botão direito na pasta para compartilhar recursivamente)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Compartilhar arquivos ocultos"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Tempo de atualização: 5s"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Tempo para gráfico de média: 100min"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Escala dos gráficos das conexões: 100 "
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Selecionar cores das estatísticas"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr ""
+
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Fundo"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Grade"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Download atual"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Média dos Downloads ativos"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Média dos Downloads da sessão"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Upload Atual"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Média dos Uploads ativos"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Média dos Uploads da sessão"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Conexões ativas"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Indicador do SystemTray"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Kad-nodes atuais"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Kad-nodes rodando"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Sessões Kad-nodes"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Selecione"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Número de versões a exibir (0=sem limite)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Capacidades de Linha"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Nota: Esses valores são apenas usados para estatísticas."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! CUIDADO !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Não mude esses valores, a menos que você saiba o\n"
-"que esteja fazendo, se não você poderá facilmente\n"
-"tornar as coisas uma bagunça.\n"
-"\n"
-"O aMule funciona corretamente sem qualquer tipo de\n"
-"alteração nessas opções."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Configurações Avançadas"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "No. Max. de conexões / 5s"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Tamanho do arquivo buffer: 240000 bytes"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Tamanho de Espera de Upload: 5000 clientes"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Atualizar conexão com servidor: desativado"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Progresso dos arquivos em espera"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Exibir porcentagem"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Exibir barra de progresso"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Estilo da Barra de progresso"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Plana"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Arredondada"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Suporte a Skin"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Habilitar suporte a pele"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Pele:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- Nenhuma pele disponível -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Ordenação das Colunas"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Auto-organizar arquivos na fila de espera (ALTO uso de CPU)"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
 msgstr ""
-"O aMule vai organizar automaticamente as colunas da lista de downloads."
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Tweaks de Interface"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Mostrar manipulador rápido de ligações eD2k"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr ""
 
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Mostrar info. extras nas abas de categoria"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Exibir taxa de transferência no título"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "Exibir taxa de transferência no título"
 
-#: src/muuli_wdr.cpp:2412
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2124
 msgid "Vertical toolbar orientation"
 msgstr "Orientação Vertical da Barra de Ferramentas"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Mostrar número da parte do arquivo antes do nome do arquivo"
-
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Parâmetros do web server"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Executar o amuleweb na inicialização"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Porta do web server"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Habilitar redirecionamento de porta UPnP na porta do servidor web"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Porta TCP UPnP do web server"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Tempo atualização (secs)"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Ativar compactação Gzip"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Usuário com direitos limitados"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Plana"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Password para acesso completo"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Arredondada"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Password para acesso limitado"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Modelo de rede"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr ""
+"O aMule vai organizar automaticamente as colunas da lista de downloads."
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Parâmetros de conexão externa"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Aceitar conexões externas"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
-"IP da interface de audição\n"
-"(vazio para qualquer)"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5691,75 +3765,116 @@
 "Informe um IP válido no formato a.b.c.d para a interface EC que ficará "
 "aguardando. Um campo vazio ou 0.0.0.0 quer dizer 'qualquer interface'"
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Porta TCP"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Habilitar redirecionamento de porta UPnP para porta EC"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Senha"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Parâmetros do web server"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Modelo de rede"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Password para acesso completo"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Usuário com direitos limitados"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Password para acesso limitado"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Tempo atualização (secs)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Ativar compactação Gzip"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Clique aqui para aplicar as alterações feitas."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Ignora todas as alterações feitas."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Título: "
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Comentário: "
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Dir incoming:"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Alterar prioridade para novos arquivos:"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "Não Alterar"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Selecione a cor para esta Categoria (selecionada): "
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Exibir a mensagem do dia (motd) ao conectar"
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Informações do Servidor"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Limpar"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Clique nesse botão para limpar o log."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Log do aMule"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Clique nesse botão para atualizar a lista de servidores..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Lista de servidores"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5767,43 +3882,55 @@
 "Informe a URL com o arquivo server.met aqui e pressione o botão a esquerda "
 "para atualizar a lista de servidores."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Adicionar servidor manualmente: Nome"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Informe o nome do novo servidor aqui"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Porta:"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Informe o IP do servidor no formato x.x.x.x nesse espaço."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Informe a porta do servidor aqui."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Adicionar manualmente um servidor (preencha os campos ao lado antes)"
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Log do aMule"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Informações do Servidor"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "ED2K Info"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad Info"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Clique nesse botão para atualizar a lista de nodes da URL..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nodes (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5811,51 +3938,58 @@
 "informe uma URL para um arquivo nodes.dat e pressione o botão da esquerda "
 "para atualizar a lista de nodes conhecidos."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Estatísticas dos Nodes"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Inicialização"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Novo node"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+#, fuzzy
+msgid "Bootstrap from known clients"
 msgstr ""
 "Inicializando com \n"
 "clientes conhecidos"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Desconectar da rede Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "Info eD2k"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Utilizar Identificação Segura de Usuário"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"É recomendável ativar essa opção. Você não receberá seus créditos se a "
+"identificação segura não estiver ativada."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Obscurecimento de Protocolo"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Suportar Obscurecimento de Protocolo"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5863,11 +3997,11 @@
 "Esta opção habilita Obscurecimento de Protocolo, e faz o aMule aceitar "
 "conexões obscuras (criptografadas) de outros clientes."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Usar obscurecimento para conexões externas"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5875,11 +4009,11 @@
 "Esta opção faz o aMule usar Obscurecimento de Protocolo quando conectando "
 "outros clientes/servidores."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Aceitar somente conexões obscuras"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5887,85 +4021,81 @@
 "Esta opção faz o aMule aceitar somente conexões obscurecidas. Você terá "
 "menos fontes, mas todo seu tráfego será obscurecido"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Opções de Arquivo"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Todos"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Nenhum"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Quem pode ver os compartilhados:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Selecione quem pode pedir a sua lista de compartilhamentos."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Filtro de IP"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtrar clientes"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Habilitar filtragem de IPs de clientes definidos no arquivo ~/.aMule/"
 "ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtrar servidores"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Habilitar filtragem de IPs de servidores definidos no arquivo ~/.aMule/"
 "ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Recarregar lista"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Recarregar lista de IPs a filtrar do arquivo ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Atualizar agora"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Auto-atualizar ipfilter ao iniciar"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Níveis de Filtro:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Sempre filtrar IPs de redes LAN"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Manuseio paranóico de IPs não-casados"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -5973,11 +4103,11 @@
 "Rejeitar pacotes se o IP do cliente é diferente do IP onde o pacote foi "
 "recebido. Use com cuidado."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Utilizar ipfilter.dat global se disponível"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -5985,866 +4115,1312 @@
 "Se nenhum ipfilter.dat local for encontrado, permita o uso de um arquivo "
 "global."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Utilizar Identificação Segura de Usuário"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"É recomendável ativar essa opção. Você não receberá seus créditos se a "
-"identificação segura não estiver ativada."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Ativar Assinatura Online"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
 msgstr ""
 "Habilita a gravação do arquivo, que pode ser usado por programas externos."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Frequência de atualização (Seg):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Alterar frequência (em segundos) da atualização da Assinatura."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Diretório da Assinatura Online:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "Clique aqui para definir pasta contendo os arquivos da Assinatura Online"
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Desativar/Ativar"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtrar mensagens (Exceto chat atual): "
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Opções de Filtragem:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtrar todas as mensagens"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtrar mensagens de pessoas que não estão em sua lista"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtrar mensagens de clientes desconhecidos"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrar mensagens contendo (use ',' como separador):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "adicione aqui as palavras que o amule deve filtrar e bloquear nas mensagens"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Comentários"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrar comentários contendo (use '.' como separador):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Conexão direta, sem proxy"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Ativar autenticação"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Ativa/Desativa autenticação por usuário/senha"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr ""
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Nome do usuário para conectar ao proxy"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Senha:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Senha utilizada para conectar ao proxy"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Ativar proxy"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Ativa/desativa suporte a proxy"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Tipo de proxy:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Tipo de proxy ao qual você está conectado"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Host do Proxy:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Nome do Host do proxy"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Porta do Proxy:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Porta do Proxy"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Autenticação"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Ativar autenticação"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Ativa/Desativa autenticação por usuário/senha"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Nome do usuário para conectar ao proxy"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Senha:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Senha utilizada para conectar ao proxy"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Conexão direta, sem proxy"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Conectar em:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Fazer login em amule remoto"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Usuário"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Lembrar essas definições"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Ativar log de debug detalhado"
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Categorias de Mensagens:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Aguardando..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Adicionar importadas"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Tentar novamente selecionada"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Remover selecionada"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Tipos de eventos"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Uploads ativos:"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Esconder arquivos compartilhados"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Selecione o filtro de exibição"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Uploads ativos"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Exibir Clientes"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Recarregar lista"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Atualizar lista de compartilhados"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Enviar"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Enviar a mensagem especificada"
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Encerrar sessão de Chat"
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Conectar a qualquer servidor e/ou Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Janela de redes"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Arquivos Compartilhados"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Janela de Pesquisas"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Desativado [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Janela de Transferências"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Janela de compartilhados"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Janela de Mensagens"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Janela de Estatísticas"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Janela de Preferências"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nova Categoria"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Escolha um diretório para os arquivos"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Você precisa dar um nome para a categoria!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/s"
+msgstr[1] "bytes/s"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Você precisa definir um caminho para a categoria!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "s"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "min"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "horas"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "dias"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "todos"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "todos os outros"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Incompleto"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Parado"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Vídeo"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Arquivo"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Texto"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Ativos"
+
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
 msgstr ""
-"Falha ao definir pasta para a categoria. Favor informar um caminho válido!"
 
-#: src/ExternalConnector.cpp:141
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr ""
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Extensão '%s' desconhecida para o comando '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Importando %s: %s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Lendo pasta temp"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Recebendo informações básicas do arquivo info de download"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Criando arquivo de destino"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Comando desconhecido '%s'.\n"
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Carregando dados do download antigo (%u de %u)"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Esse comando não precisa de argumentos.\n"
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Salvando bloco de dados em novo arquivo de download (%u de %u)"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Esse comando precisa de um argumento.\n"
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Recebendo informações sobre fontes do arquivo a baixar"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Adicionando download e salvando novo arquivo .part"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Importar arquivos .part"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Estado"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Hash do arquivo"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Disco: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Esse comando está incompleto, você precisa de uma das extensões abaixo.\n"
+"Escolha uma pasta para procurar por downloads temporários! (subdiretórios "
+"serão incluídos)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
-"\n"
-"Extensões disponíveis:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "Deseja excluir os temporários dos que foram importados com sucesso?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Comandos disponíveis:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Remover temporários?"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "ERRO: falha na criação do arquivo .part)"
+
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Todos os comandos são case-insensitive (MAIÚSCULAS ou minúsculas).\n"
-"Digite '%s <comando>' para obter ajuda sobre o <comando>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Tentando carregar backup do met-file de %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Sair do programa."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "ERRO:Falha ao abrir arquivo part.met: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Exibe a ajuda."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "ERRO: arquivo part.met é de tamanho 0: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
 msgstr ""
-"Para obter ajuda sobre um comando, digite 'help <comando>'.\n"
-"Para obter a lista completa de comandos, digite 'help'.\n"
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr "Erro: %s (%s) está corrompido, impossível carregar arquivo."
+
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Use '%s' para lista de comandos\n"
-"\n"
+"ERRO: %s (%s) está corrompido (tagcount errado), incapaz de carregar arquivo."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Erro na sintaxe!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Tentando recuperar info do arquivo..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"Erro processando comando - isso jamais deveria acontecer! Reporte o bug, por "
-"favor\n"
+"Recuperando arquivo sem nome - tentarei recuperá-lo como RecoveredFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Este comando não precisa de parâmetros."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "Recuperada todas as informações do arquivo :D - Tente usá-lo..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Este comando precisa de um parâmetro."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Não foi possível recuperar o arquivo :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Argumento inválido."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Falha ao abrir %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Este comando está incompleto."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "CUIDADO: %s pode estar corrompido (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Digite '%s' para maiores informações.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "Erro ao salvar arquivo .part: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "Erro ao salvar arquivo .part: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Este é %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Não foi possível identificar o tamanho de '%s' - usando arquivo '%s'."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Este é %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "De alguma forma o arquivo '%s' está zerado - usando arquivo %s"
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Falha ao salvar part.met.seeds para %s"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Salvo %i fonte do .part: %s (%s)"
+msgstr[1] "Salvos %i fontes do .part: %s (%s)"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Arquivo .part %s (%s) não possui fontes disponíveis"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Arquivo .part %s (%s) tem fontes expiradas."
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Erro lendo arquivo .seeds do arquivo (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Encontrada parte corrompida (%d) em %d arquivo .part %s - Resultado |%s| "
+"Hash |%s|"
+msgstr[1] ""
+"Encontradas partes corrompidas (%d) em %d arquivo .part %s - Resultado |%s| "
+"Hash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Achado parte completa (%i) em %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Terminado o rehash %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Erro inesperado quando completado %s. Arquivo parado"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Download concluído: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Apagando arquivo: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Criando cliente..\n"
+"CUIDADO: Incapaz de fazer hash em part baixado - hashset incompleto para '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Ok, abandonando %s...\n"
+"ERRO: Incapaz de fazer hash de part baixado - hashset incompleto (%s). Isto "
+"nunca deveria acontecer"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Não é possível conectar sem senha.\n"
-"Você deve informar uma no arquivo de configuração\n"
-"ou na linha de comando, ou informar um quando pedido.\n"
-"\n"
-"Finalizando...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Exibir esse texto de ajuda."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr ""
+"AVISO: Não há espaço em disco suficiente! Colocando arquivo %s em pausa"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Host onde o aMule está rodando. (padrão: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Parte baixada %i do arquivo %s está corrompida"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Porta em que o aMule está esperando Conexões Externas (padrão: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Recuperada parte corrompida %i para %s -> Bytes salvos: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Senha para Conexão Externa."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Alocando"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Ler configuração de arquivo."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Espaço em disco insuficiente"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Não exiba mensagens no stdout (silencioso)"
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Baixado"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Verbose - exiba até as mensagens de debug."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "ERRO: Falha ao abrir partfile '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Defina o locale (idioma)."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Padrão do sistema"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Gravar opções de linha de comando"
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albanês"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Criar arquivo de configuração baseado no do aMule."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Árabe"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Exibir versão do programa."
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "Estônia"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Arquivo de créditos carregado, %u cliente reconhecido"
-msgstr[1] "Arquivo de créditos carregado, %u clientes reconhecidos"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Basco"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Créditos expirados para %u cliente!"
-msgstr[1] " - Créditos expirados para %u clientes!"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Búlgaro"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Arquivo 'cryptkey.dat' não foi encontrado, criando."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Catalão"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"ERRO: O daemon aMule não pode ser usado quando conexões externas estão "
-"desabilitadas. Para habilitar conexões externas, use um dos dois normal no "
-"aMule, inicie o amuled com a opção --ec-config ou mude o comando"
-"\"AcceptExternalConnections\" para 1 no arquivo ~/.aMule/amule.conf"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Chinês (Simplificado)"
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "ERRO: %s"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Chinês (Tradicional)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "DesBanir"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Exibir Uploads"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Exibir lista de espera"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Croácia"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Exibir Clientes"
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Tcheco"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Selecionar modo de visão"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Software Cliente"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Dinamarquês"
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Aguardou"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Holandês"
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Tempo de Upload"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Inglês (UK)"
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Upload/Download"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estônia"
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Status Remoto"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finlandês"
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Francês"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Prioridade de Arquivo"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galego"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Contagem"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Alemão"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Pedidos"
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Grego"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Última visita"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Lista de Espera"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebreu"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Status de Upload"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Hungria"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Transferido (Up)"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italiano"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Status de Download"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italiano (Suíço)"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Transferido (Down)"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Userhash"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Encriptado"
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japonês"
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Esconder arquivos compartilhados"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Coreano"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Detalhes do Cliente"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lituânia"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Habilitado"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Noruega (Nynorsk)"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Suportado"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polonês"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Não suportado"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Português (Portugal)"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Disabilitado"
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Português (Brasil)"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Russo"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Incompleto"
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Esloveno"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Cara Mau"
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Espanhol"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Verificado - OK"
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Suécia"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Não Disponível"
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turquia"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr ""
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr "Tamanho min deve ser menor que tamanho max. Tamanho max ignorado"
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Idioma"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Alerta da busca"
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Ilimitado"
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "Não disponível"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Menu do Tray aMule"
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Limites de Velocidade:"
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "UL: Nenhum"
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr "Porta TCP não pode ser maior do que 65532, pois a UDP escuta em TCP+3"
 
-#: src/MuleTrayIcon.cpp:354
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "UL: %u"
-msgstr "UL: %u"
-
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DL: Nenhum"
+msgid "Default port will be used (%d)"
+msgstr "Porta padrão será utilizada (%d)"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/Preferences.cpp:1790
 #, c-format
-msgid "DL: %u"
-msgstr "DL: %u"
+msgid "Dropping non-existing shared directory: %s"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Conexão"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Diretórios"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Servidores"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Arquivos"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Segurança"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Controles remotos"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Assinatura Online"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Eventos"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Debugando"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Não mude esses valores, a menos que você saiba o\n"
+"que esteja fazendo, se não você poderá facilmente\n"
+"tornar as coisas uma bagunça.\n"
+"\n"
+"O aMule funciona corretamente sem qualquer tipo de\n"
+"alteração nessas opções."
+
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Velocidade de Download: %.1f"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Velocidade de Envio: %.1f"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Informação do Cliente"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Tipo de proxy ao qual você está conectado"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:534
 #, c-format
-msgid "Nickname: %s"
-msgstr "Nickname: %s"
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Nenhum Nickname definido!"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"O aMule deve ser reiniciado para habilitar estas mudanças:\n"
+"\n"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ClienteID: "
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "-Porta TCP alterada.\n"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Nome do Servidor: "
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "-Porta UDP alterada.\n"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP do Servidor: "
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Conexão externa encerrada."
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Novas conexões externas aceitas"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Conexão externa encerrada."
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Você ativou as conexões externas (EC) mas não definiu uma senha.\n"
+"Conexões Externas só podem ser feitas se for especificada uma senha válida."
+
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "-Idioma alterado.\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "-Diretório temporário alterado.\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+#, fuzzy
+msgid "- ED2K network enabled.\n"
+msgstr "Todas as redes estão DESATIVADAS."
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Ambas rede eD2k e Kad estão desativadas.\n"
+"Você não será capaz de conectar senão habilitar pelo menos um deles."
+
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad não iniciará se sua porta UDP estiver desabilitada.\n"
+"Habilite a porta UDP ou desative a rede Kad."
+
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Você DEVE reiniciar o aMule agora.\n"
+"Se você não reiniciá-lo agora, não reclame se algo de ruim acontecer.\n"
+
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Sua lista de atualização de servidores está em branco.\n"
+"Coloque pelo menos uma linha que aponte para um server.met válido.\n"
+"Clique no botão \"Lista\" para abrir a caixa para digitar uma URL."
+
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Arquivos Temporários"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Arquivos Recebidos"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Assinatura Online"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "TCP port: %d"
-msgstr "Porta TCP: %d"
+msgid "Choose a folder for %s"
+msgstr "Escolha uma pasta para %s"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "Porta TCP: Não está pronta"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Defina seu Player de Vídeo preferido"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Selecione o Browser"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "UDP port: %d"
-msgstr "Porta UDP: %d"
+msgid "Executable%s"
+msgstr "Executável%s"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "Porta UDP: Não está pronta"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Editar lista de servidores"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Online Signature: Ativado"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Adicione aqui URL's para baixar arquivo 'server.met'\n"
+"Somente uma URL por Linha."
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Online Signature: Desativado"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Delay na atualização: %d segundo"
+msgstr[1] "Delay na atualização: %d segundos"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "Shared files: %d"
-msgstr "Arquivos compartilhados: %d"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Tempo do gráfico de média: %d minuto"
+msgstr[1] "Tempo do gráfico de média: %d minutos"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/PrefsUnifiedDlg.cpp:1127
 #, c-format
-msgid "Queued clients: %d"
-msgstr "Cliente na fila: %d"
+msgid "Connections Graph Scale: %d"
+msgstr "Escala do gráfico de conexões: %d"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "Total DL: %s"
-msgstr "DL Total: %s"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Tamanho do Buffer de Arquivo: %d byte"
+msgstr[1] "Tamanho do Buffer de Arquivo: %d bytes"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Total UL: %s"
-msgstr "UL Total: %s"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Tamanho de Espera de Upload: %d cliente"
+msgstr[1] "Tamanho de Espera de Upload: %d clientes"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Limite de envio"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Atualizar conexão com servidor: %d minuto"
+msgstr[1] "Atualizar conexão com servidor: %d minutos"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Limite de download"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Intervalo para atualizar conexão no servidor: Desativado"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Ocultar aMule"
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "desativado"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Mostrar aMule"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "Executar comando em evento `%s'"
+
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Habilitar execução de comando no núcleo"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Comando do Núcleo:"
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Habilitar execução de comando na GUI"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Comando da GUI:"
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "As seguinte váriaveis serão substituidas:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr "Tamanho min deve ser menor que tamanho max. Tamanho max ignorado"
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Alerta da busca"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Principal"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "A busca do Kad não pode ser feita se o Kad não estiver rodando"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "Procura eD2k não pode ser concluída se o eD2k não está conectado"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Erro inesperado quando tentava fazer a busca do Kad:"
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "ID do arquivo"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Arquivo"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Baixar na categoria"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "URL para esse arquivo (opcional)"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Procurando arquivos relacionados (eD2k, servidor local)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Marcar como arquivo conhecido"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Copiar ligação eD2k para área de tranferência"
+
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Cancelar"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr ""
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Falha ao conectar em todos servidores obscurecidos listados. Tentando de "
+"novo sem ofuscação."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Falha ao conectar em todos os servidores listados. Tentando novamente."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "Rede eD2k desabilitada nas preferências, não conectado."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "Nenhum servidor válido para o qual conectar na lista de servidor"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Sessão de Chat iniciada: %s (%s:%u) - %s %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Conectado a %s (%s:%i)"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Conectado ao Cliente ***"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Conexão estabelecida em: %s"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Conectando ao Cliente ***"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Erro Fatal durante tentativa de conexão. Talvez seu link Internet tenha caído"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Falha ao conectar ao Cliente / Conexão perdida ***"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Conexão perdida com %s (%s:%i)"
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Fechar aba"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) parece estar desativado."
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Fechar todas as abas"
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) parece estar cheio."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Fechar outras abas"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Conexão automática com o servidor irá se repetir em %d segundo"
+msgstr[1] "Conexão automática com o servidor irá se repetir em %d segundos"
 
-#: src/ServerList.cpp:84
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Conexão perdida"
+
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Conexão a %s (%s:%i) falhou"
+
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "ERRO: Socket inválido no tempo de checagem"
+
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Expirado tempo de espera para conectar a %s (%s:%i)."
+
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr ""
+
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Carregando arquivo server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Arquivo server.met não encontrado!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Falha ao carregar arquivo server.met '%s', formato desconhecido."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Falha ao abrir arquivo server.met !"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Arquivo server.met corrompido, encontrada tag de versão inválida: 0x%x, "
 "tamanho %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "Encontrado %i servidor no server.met"
 msgstr[1] "Encontrados %i servidores no server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "Adicionado %d servidor"
 msgstr[1] "Adicionados %d servidores"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "Erro de I/O ao ler arquivo known.met: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Servidor não adicionado: [%s:%d] não possui uma porta válida."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Servidor não adicionado: o IP de [%s:%d] está filtrado ou é inválido."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Servidor não adicionado: Servidor com esse IP:Porta [%s:%d] já na lista."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Servidor adicionado: Servidor em [%s:%d] usando o nome '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6852,25 +5428,25 @@
 "Você está conectado a um servidor que está tentando apagar. Desconecte "
 "primeiro."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Falha ao abrir '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Falha ao salvar server.met!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "URL inválida"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
 msgstr "Download da lista de servidores de %s concluída"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Falha ao obter a lista de servidores de %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6879,22 +5455,27 @@
 "Por favor cole uma lista de endereços válida de servidores dentro deste "
 "arquivo em ordem para auto-atualizar sua lista de servidores."
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Iniciando download da lista de servidores de %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "CUIDADO: URL especificada inválida para auto-atualização dos servidores: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "Nenhuma URL com server.met da lista addresses.dat é válida"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Falha ao obter a lista de servidores de %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -6902,317 +5483,2340 @@
 "Servidor local é filtrado pelo IPFilters, reconectando em um servidor "
 "diferente!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Falha ao executar comando `%s' no evento `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Nome do Servidor"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Endereço"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Porta"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Descrição"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Usuários"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Fixo"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versão"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Seu locale foi alterado para o padrão do Sistema devido a mudança na "
-"configuração. Desculpe."
+"Você está conectado a um servidor que está tentando apagar. Desconecte "
+"antes. O servidor NÃO foi apagado."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Nome Desconhecido)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Deseja remover o servidor estático %s"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Servidores (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Servidor"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Conectar ao servidor"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Marcar servidor como fixo"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Marcar servidor como não-fixo"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Marcar servidores como fixos"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Marcar servidores como não-fixos"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Apagar servidor"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Apagar servidores"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Remover todos os servidores"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Copiar ligações eD2k para área de tranferência"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Reconectar ao servidor"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Deseja remover todos os servidores?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Deseja remover o servidor selecionado?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Deseja remover o servidores selecionados?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "ERRO %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "CUIDADO: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Novo ID do cliente é %u."
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "AVISO: você recebeu uma ID baixa (LowID)!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
-"Você não tem nenhum servidor na lista de servidor.\n"
-"Você quer que o aMule baixe uma nova lista agora?"
+"\tGeralmente isso acontece quando você está atrás de um firewall/router."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Lista de servidor baixada"
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tPara maiores informações, vá até http://wiki.amule.org"
 
-#: src/amule.cpp:846
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Info desconhecida recebida do servidor - muito curta"
+
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "web server running on pid %d"
-msgstr "web server rodando no pid %d"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Recebido %d servidor novo"
+msgstr[1] "Recebidos %d servidores novos"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Salvamento da lista de servidores concluído."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "O servidor rejeitou o último comando"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Pacote falso recebido do servidor: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Ocorreu um erro imprevisto ao processar os pacotes do servidor: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Não foi possível ativar resolução DNS para conectar a %s"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "IP do servidor %s (%s) está filtrado. Não conectando."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "usando obscurecimento de protocolo."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Conectando para %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Não foi possível resolver o DNS para %s: Impossível conectar!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Servidor não adicionado: sem IP ou hostname."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Servidor não adicionado: porta informada inválida."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Status de eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Status Kademlia:"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "Executando em %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Rodando"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Status:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Estado da Conexão:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
-"Você requisitou rodar o web server na iniciação, mas o binário do amuleweb "
-"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:937
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "Estado da Conexão:"
+
+#: src/ServerWnd.cpp:219
 #, 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"
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr ""
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Estado do Firewall:"
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr ""
 
-#: src/amule.cpp:964
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Sem amigos"
+
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "Conectado ao amigo"
+
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "Conectado ao amigo"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "Fontes encontradas:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr ""
+
+#: src/ServerWnd.cpp:254
+#, fuzzy
+msgid "Indexed notes:"
+msgstr "Arquivo index não encontrado:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr ""
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Média de Usuários:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Média de Arquivos:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Parado"
+
+#: src/SharedFileList.cpp:332
 #, 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"
+msgid "Adding file %s to shares"
+msgstr ""
 
-#: src/amule.cpp:970
+#: src/SharedFileList.cpp:371
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Encontrado %i arquivo conhecido compartilhado"
+msgstr[1] "Encontrados %i arquivos conhecidos compartilhados"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Encontrado %i arquivo conhecido, %i desconhecido"
+msgstr[1] "Encontrados %i arquivos conhecidos, %i desconhecidos"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "ERRO: Tentando compartilhar %s"
+
+#: src/SharedFileList.cpp:410
+#, fuzzy, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "servidor não encontrado: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
 msgstr ""
-"A Porta %u não está disponível!\n"
-"\n"
-"Isso quer dizer que você ficará com LOWID (ID baixa).\n"
-"\n"
-"Verifique sua rede para ver se essa porta está aberta para entrada e saída."
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Falha ao criar o arquivo OnlineSig"
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Usuário"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Falha ao criar o arquivo OnlineSig do aMule"
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Download (Velocidade)"
 
-# src/amuled.cpp:1246:
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Upload (velocidade)"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Disponíveis: "
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Status de Upload"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Status de Download"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
 msgstr ""
-"Parece que o idioma selecionado não está instalado no seu computador. (Nota: "
-"eu irei definí-lo mesmo assim)."
 
-#: src/amule.cpp:1308
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Nome do arquivo"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Arquivos Compartilhados"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Pedidos"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Pedidos aceitos"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Dados transferidos"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Taxa Compartilhada"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Partes já baixadas"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Fontes Completas"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Caminho completo"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Adicionar Comentário/Avaliação"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Editar Comentário/Avaliação"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Renomear"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Adicionar arquivo na coleção para lista de transgênica"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Copiar &URL Magnet para Área de Transferência"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Copiar &link eD2k para área de tranferência (&Fonte)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr ""
+"Copiar &link eD2k para área de tranferência (Fonte) (&Com opções de "
+"criptografia)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Copiar &link eD2k para área de tranferência (&Nome da máquina)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+"Copiar &link eD2k para área de tranferência (Nome da máquina) (Com &Opções "
+"de criptografia)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Copiar &link eD2k para área de tranferência (&Info AICH)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Você precisa ter HighID para criar uma fonte ED2K válida"
+
+#: src/SharedFilesCtrl.cpp:461
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Essa é a primeira vez que você executa o aMule %s"
+msgid "Shared Files (%i)"
+msgstr "Arquivos Compartilhados (%i)"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Essa é uma versão de testes, atualizada diariamente, e\n"
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[PartFile]"
 
-#: src/amule.cpp:1311
-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"
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Nome do arquivo"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Dados enviados (Sessão (Total)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Overhead Total (pacotes): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Solicitações de Arquivo (pacotes): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Troca de fontes (Pacotes): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Overhead de servidor (Pacotes): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Overhead Kad (pacotes): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Criptografia elevada (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Uploads ativos: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Uploads em espera: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Total de sessões de UP com sucesso: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Total de sessões de UP que falharam: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Tempo médio de upload: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Dados baixados (Sessão (Total)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Fontes encontradas: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Downloads ativos (pedaços): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Média de UL:DL da Sessão (Total): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Taxa média de download (Sessão): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Taxa média de envio (Sessão): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Taxa máxima de download (Sessão): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Taxa máxima de envio (Sessão): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Reconectados: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Tempo desde a primeira transferência: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Conectado ao servidor desde: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Conexões ativas (estimada): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Máximo de conexões que atingiram tempo limite: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Média de conexões (estimativa): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Pico de conexões (estimada): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Clientes"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "Tamanho desconhecido"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "Filtrado"
+
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "Banido"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Total: %i Conhecidos: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Servidores ativos: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Servidores que falharam: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Total: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Servidores eliminados: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Servidores Filtrados: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Usuários em servidores ativos: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Arquivos nos servidores ativos: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Total de usuários: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Total de arquivos: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Ocupação do Servidor: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Número de arquivos compartilhados: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Tamanho total de compartilhados: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Média de tamanho de arquivo: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Sistema Operacional"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Não recebido"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Conexões ativas (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Não disponível"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Nunca"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Comando `%s' com pid `%d' foi finalizado com o status `%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Executar <str> e sair."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Formato do IP inválido. Use xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
+msgid ""
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"ou matar seu cachorro. Mas ela *deve* ser segura para uso mesmo assim.\n"
+"Esse comando requer um parâmetro. Válidos: 'all', NomeDeArquivo, ou um "
+"número.\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Processando pela hash: "
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Processando por nome de arquivo: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr "Esse comando requer um parâmetro. Válido: hash de um arquivo.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Não é um número válido\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Não é uma hash válida (precisa ter exatamente 32 caracteres)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Solicitação falhou com erro desconhecido."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Operação executada com sucesso."
+
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
+msgstr "Solicitação falhou com os seguintes erros: %s"
+
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Filtragem IP para clientes é %s.\n"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "Desligado"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "Ligado"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Filtragem IP para servidores é %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Nível atual do IPFilter é %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Limites de banda: Enviar: %u kB/s, Baixar: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Conectado a %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Conectando"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "sob firewall"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "Ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"As seguintes opções foram mudadas nesta versão por razões de segurança:\n"
+"\n"
+"Download:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Habilitar suporte a Obscurecimento de Protocolo para conexões de entrada e "
-"saída.\n"
+"Upload:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Desabilitar a atualização da lista de servidores através de outros "
-"servidores e clientes.\n"
+"Clientes na fila:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Para mais informações sobre a razão dessas mudanças, procure\n"
-"o wiki do aMule em http://wiki.amule.org e busque por \"fake servers\".\n"
-"É importante que você limpe qualquer servidor falso de sua lista para o que "
-"aMule funcione apropriadamente."
+"Fontes totais:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Número de resultados da busca: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr ""
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Resposta recebida do servidor desconhecida, OpCode = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Exibir informações de status resumidas."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Exibir informações de conexão, taxa de Down/Up, etc.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Exibir árvore de estatísticas completas."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Opcionalmente, um número entre 0-255 pode ser informado como parâmetro para\n"
+"esse comando, que vai dizer quantas entradas de versões de clientes foram \n"
+"encontradas. Informar 0 ou nada quer dizer 'sem limites'.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Exemplo: 'statistics 5' vai mostrar apenas as 5 maiores versões de cada tipo "
+"de cliente.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Fechar aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
+"Desligando o núcleo remoto (amule/amuled).\n"
+"Isso irá também desligar o cliente texto, por causa disso é inusável sem um\n"
+"núcleo rodando.\n"
+
+#: src/TextClient.cpp:859
+#, fuzzy
+msgid "Reload the given object."
+msgstr "Recarregar objeto selecionado."
+
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
+msgstr "Recarregar a lista de compartilhamentos."
+
+#: src/TextClient.cpp:862
+#, fuzzy
+msgid "Reload IP filtering table."
+msgstr "Recarregar a tabela IPFilter do arquivo."
+
+#: src/TextClient.cpp:863
+#, fuzzy
+msgid "Reload current IP filtering table."
+msgstr "Definir no nível do IP Filter."
+
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "Recarregar a tabela IPFilter do arquivo."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr ""
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Conectar a rede."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Isso vai fazer com que o aMule se conecte às redes definidas nas "
+"Preferências.\n"
+"Opcionalmente. você pode informar um servidor (servidor:porta) para se "
+"conectar\n"
+"a esse servidor apenas. O IP deve ter notação decimal IPv4,\n"
+"ou um nome DNS que possa ser resolvido."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Conectar somente em eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Conectar a rede Kad apenas."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Desconectar da rede."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Isso irá desconectar você de todas as redes conectadas atualmente.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Disconectar somente de eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Desconectar apenas da rede Kad."
+
+#: src/TextClient.cpp:877
+#, fuzzy
+msgid "Add an eD2k or magnet link to core."
+msgstr "Adicionar uma ligação eD2k ou magnética no núcleo."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"A ligação eD2k para ser adicionada pode ser:\n"
+"*) um arquivo de ligação (ed2k://|file|...), ela será adicionado na fila de "
+"download,\n"
+"*) uma ligação de servidor (ed2k://|server|...), ela será adicionarda a "
+"lista de servidores,\n"
+"*) ou uma ligação de lista de servidores, em qualquer caso todos servidores "
+"na lista serão adicionados para a\n"
+"   lista de servidores.\n"
 "\n"
-"Adicionalmente, as preferências tem de ser reinicidas para o padrão do "
-"sistema. Por favor configure suas opções novamente se for necessário.\n"
+"A ligação magnética deve conter o hash eD2k e tamanho do arquivo.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Defina as preferências."
+
+#: src/TextClient.cpp:883
+#, fuzzy
+msgid "Set IP filtering preferences."
+msgstr "Preferências do IPFilter."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Ligar filtragem IP para ambos clientes e servidores."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Desligar filtragem IP para ambos clientes e servidores."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Habilitar/Desabilitar filtragem IP para clientes."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Ligar filtragem IP para clientes."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Desligar filtragem IP para clientes."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Habilitar/Desabilitar filtragem IP para servidores."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Ligar filtragem IP para servidores."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Desligar filtragem IP para servidores."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Definir no nível do IP Filter."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Maiores informações, suporte e novas versões podem ser encontradas em nossa\n"
+"Qualquer valor entre 0 e 255 é válido, e o valor padrão (inicial)\n"
+"é 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Limitação de Uso de Banda"
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "O Valor informado nesses comandos deve ser em kilobytes/s.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Definir limite de Upload."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Definir limite de Download."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Obter e mostrar o valor da opção selecionada."
+
+#: src/TextClient.cpp:905
+#, fuzzy
+msgid "Get IP filtering preferences."
+msgstr "Obter preferências do IPFilter."
+
+#: src/TextClient.cpp:906
+#, fuzzy
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Obter estado do IPFilter para ambos clientes e servidores."
+
+#: src/TextClient.cpp:907
+#, fuzzy
+msgid "Get IP filtering state for clients only."
+msgstr "Obter estado do IPFilter somente para clientes."
+
+#: src/TextClient.cpp:908
+#, fuzzy
+msgid "Get IP filtering state for servers only."
+msgstr "Obter estado do IPFilter somente para servidores."
+
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "Definir no nível do IP Filter."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Obter limites de Up/Down"
+
+#: src/TextClient.cpp:913
+#, fuzzy
+msgid "Execute a search."
+msgstr "Executa uma pesquisa no kad"
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"homepage www.aMule.org ou em nosso canal de irc #aMule na irc.freenode.net.\n"
+"Um tipo de busca poderá ser especificado escolhendo o tipo:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Exemplo: 'search kad file' será pesquisado na rede kad o \"arquivo\".\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Esteja a vontade para notificar qualquer bug em http://forum.amule.org"
+#: src/TextClient.cpp:915
+#, fuzzy
+msgid "Execute a global search."
+msgstr "Executa uma pesquisa global."
+
+#: src/TextClient.cpp:916
+#, fuzzy
+msgid "Execute a local search"
+msgstr "Executa uma pesquisa local"
+
+#: src/TextClient.cpp:917
+#, fuzzy
+msgid "Execute a kad search"
+msgstr "Executa uma pesquisa no kad"
+
+#: src/TextClient.cpp:919
+#, fuzzy
+msgid "Show the results of the last search."
+msgstr "Mostra resultados da última pesquisa."
+
+#: src/TextClient.cpp:920
+#, fuzzy
+msgid "Return the results of the previous search.\n"
+msgstr "Retorna os resultados da pesquisa anterior.\n"
+
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "Exibe progresso de uma pesquisa."
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "Exibe o progresso de uma pesquisa.\n"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Iniciar download de um arquivo"
+
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"A pasta especificada para os arquivos da Online Signature é INVÁLIDA!\n"
-"OnlineSignature ficará DESATIVADA até você atualizar as preferências."
+"O número de um arquivo de uma última busca poderá ser obtido.\n"
+"Exemplo: 'download 12' começará a baixar o arquivo com o número 12 da busca "
+"anterior.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Parar Download."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Continuar Download."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Cancelar Download"
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Definir prioridade de download."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Mudar prioridade de um download para Baixo, Normal, Alto ou Auto.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Definir prioridade baixa."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Definir prioridade normal."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Definir prioridade alta."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Definir prioridade auto."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Exibir as listas de Up/Down"
+
+#: src/TextClient.cpp:950
+#, fuzzy
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Exibe listas de Down/Up, lista de servidores ou lista de compartilhados.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Mostrar fila de Upload."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Mostrar fila de Download."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Mostrar log."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Mostrar lista de servidores."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Reiniciar log."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Préalocação de espaço em disco para arquivo '%s' falhou: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Comando ultrapassado, use '%s' no lugar."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "ERRO: não foi possível abrir arquivo de log"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Esse comando foi depreciado e será removido no futuro.\n"
+"Ao invés desse, use '%s'.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "AVISO: o arquivo de log está vazio. Algo está errado."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Cliente em modo texto do aMule"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Arquivo de log resetado"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Convertendo hashsets AICH antigos de '%s' para 64b em '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "MensagemDoServidor: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "AVISO: O nome de arquivo '%s' é inválido e foi renomeado para '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Falha ao obter a lista de nodes."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "AVISO: O arquivo '%s' já existe, novo arquivo renomeado para '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Falha ao abrir arquivo de versão baixado"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr "Deseja cancelar e APAGAR TODOS os arquivos desta categoria?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Arquivo de versão corrompido"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Confirmação requerida"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Você está utilizando uma versão anterior do aMule!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
+
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Excesso de conexões"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Todos os outros"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Selecione o filtro de exibição"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Adicionar categoria"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Editar categoria"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Remover categoria"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Sua versão do aMule é %i.%i.%i e a última versão é %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Falha ao abrir o arquivo (%s), removendo da lista de compartilhados."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "A mais recente versão pode ser obtida em http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Hashset solicitado para arquivo desconhecido: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Continuando uploads para o arquivo: %s"
+
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Suspendendo uploads para o arquivo: %s"
+
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Falha ao executar comando `%s' no evento `%s'."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Download concluído"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Caminho completo do arquivo."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Nome do arquivo sem seu caminho completo."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "O hash eD2k do arquivo."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Tamanho do arquivo em bytes."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Tempo acumulado de download ativo."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Nova sessão de chat iniciada"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Remetente da mensagem."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Sem espaço"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Partição do disco"
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Erro ao concluir"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
+msgstr "Processando arquivo número %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Você pediu por hash de partes (só é usado para arquivos > 9,5MB)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
+#, c-format
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Arquivo não existe !\n"
+
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, o criador de ligações do aMule eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Bem-vindo!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Parâmetros de Entrada"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Arquivo a gerar hash"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "URL para esse arquivo (opcional)"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Escreva aqui o arquivo que você quer computar a ligação eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
-"CUIDADO: Sua versão do aMuled esta ultrapassada: %i.%i.%i < %li.%li.%li"
+"Escreva aqui a URL que você quer adicionar na ligação eD2k: Adicione / no "
+"fim para deixar o aLinkCreator anexar o atual nome do arquivo"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Sua versão do aMule está em dia :)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Remover"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Falha ao baixar arquivo de controle de versão"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Criar link com hash de partes"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Ajuda a espalhar arquivos novos e raros mais rápido, mas aumenta o tamanho "
+"do link"
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Hash MD4 do arquivo"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "Hash de arquivo eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "Ligação eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Salvar"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Copiar para a Área de Transferência"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Abra o arquivo para computar esta ligação eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Copiar ligação eD2k computada para a área de transferência"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Salvar ligação eD2k computada no arquivo"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Sobre o aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Selecione o arquivo que você quer computar a ligação eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Nada a ser copiado!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Selecione o arquivo para sua ligação eD2k computada"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Impossível abrir "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Por favor, informe um nome não-vazio"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Nada a ser salvo!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, o criador de ligação do aMule eD2k\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps de http://www.everaldo.com e http://www.icomania.com\n"
+"e http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distribuído sobre GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Criando Hash..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Cancelado !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Usuários:%s | Arquivos: %s"
+msgid "Done in %.2f s"
+msgstr "Pronto em %.2f s"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Você já adicionou essa URL!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Informe uma URL não-vazia"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Usuários: E: %s K: %s | Arquivos: E: %s K: %s"
+msgid "Unable to open %s"
+msgstr "Impossível abrir %s"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Nenhuma rede selecionada"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i dias %i horas %i min %i s"
 
-#: src/amule.cpp:2102
+#: src/utils/wxCas/src/onlinesig.cpp:234
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Conectado a %s %s"
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
 
-#: src/amule.cpp:2105
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "Connecting to %s"
-msgstr "Conectando a %s"
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Disconectado de eD2k"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad iniciado."
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad parado."
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Conectado a rede Kad (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Conectado a rede Kad (sob firewall)"
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Desconectado da rede Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, Estatísticas Online do aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Taxa máxima de DL enquanto roda o wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Taxa máxima absoluta de DL enquanto rodava o wxCas (anterior)"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistema"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Parar atualização automática"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Salvar imagem de estatística Online"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Imprimir imagem de estatística Online"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Preferências"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Sobre wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Iniciar atualização automática"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Atualização automática parada"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Atualização automática iniciada"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Salvar imagem estatísticas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Estatísticas Online do aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"A rede Kad não pode ser usada se a porta UDP está desabilitada em "
-"preferências, não iniciará."
+"Encontrei um problema na hora de imprimir.\n"
+"A sua impressora está configurada corretamente?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "A rede Kad está desabilitada em preferências, não iniciará."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Imprimindo"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
-"Falha em abrir lista de amigos do arquivo 'emfriends.met' para leitura!"
+"wxCas, Gerador de Assinaturas Online com estatísticas do aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Baseado no CAS, por Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distribuído sob licença GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh Oh, aMule não está rodando..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule está rodando"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule está rodando, mas desconectado"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule está conectando..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh Oh, o status do aMule é desconhecido..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " está rodando há "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr "esta parado !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " não esta conectado !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " está conectando..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " está fazendo algo de estranho, verifique!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " conectado em "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "desligado"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " está ativo "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " com "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Download Total: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Upload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Download da Sessão: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Download: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Upload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Compartilhando: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " arquivos, Clientes na fila: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Tempo: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " em "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Média de carga do Sistema (1-5-15 min): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Uptime do Sistema: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Pasta contendo arquivo amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Informe aqui a pasta onde está o arquivo amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Taxa de atualização (em segundos)"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Gerar imagem de estatística a cada atualização"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Informe aqui a pasta onde gravar a imagem de estatística gerada"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Fazer upload periódico da imagem para servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "URL do FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Caminho no FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Informe a URL do seu servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "Informe a pasta onde colocar a sua imagem estatística no servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Usuário"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Informe o nome do usuário de login, para o servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Informe a senha para o usuário do servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Intervalo entre atualizações do servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Validar"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Pasta contendo seu arquivo de assinatura"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Pasta para colocar imagem estatística gerada"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Carregar modelo <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Porta HTTP do web server"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Usar redirecionamento de porta UPnP na porta do cliente web"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Porta UPnP"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Utilizar compressão gzip"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Senha de total acesso para servidor web"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Senha de visitante para servidor web"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Permitir acesso restrito"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Negar acesso restrito"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Carregar/salvar configurações do servidor web de/para aMule remoto"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Caminho para arquivo amule.conf - NÃO USE DIRETAMENTE!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Desativar interpretador PHP (depreciado)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Recompilar páginas PHP a cada solicitação"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Servidor Web do aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "conexão de cliente web aceita\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
-"Falha em abrir lista de amigos do arquivo 'emfriends.met' para escrita!"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Solicitação falhou com o seguinte erro: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Arquivo index não encontrado:"
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Sessão expirada - solicitando login\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sessão Ok, logado\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sessão Ok, ainda não logado\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Nenhuma sessão aberta - solicitando login\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Sessão criada - solicitando login\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Processando pedido [original]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Verificando senha\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Hash de senha inválido\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Senha Ok\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Senha inválida\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Você não digitou nenhuma senha. Senha em branco não é permitido.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Solicitado logout\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Processando solicitação [redirecionado]: "
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Albanês"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Status de Download"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Espera na atualização: %d segundo"
+#~ msgstr[1] "Espera na atualização: %d segundos"
+
+#~ msgid "Transferring"
+#~ msgstr "Transferindo"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "QR: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "Na fila de espera"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - mostrar progresso de uma busca"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Criando hash MD4 e info. de recuperação AICH para o arquivo: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Criando hash MD4 para o arquivo: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Criando hash AICH para o arquivo: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "AVISO: Não foi possível remover arquivo '%s' depois de criar o backup"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "AVISO: Falha ao apagar %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Avaliação (total):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Tentar transferir pedaços completos em cada upload"
+
+#~ msgid "Networks window"
+#~ msgstr "Janela de Redes"
+
+#~ msgid "Searches window"
+#~ msgstr "Janela de Busca"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Baixando"
+
+#~ msgid "Shared files window"
+#~ msgstr "Janela de arquivos compartilhados"
+
+#~ msgid "Messages window"
+#~ msgstr "Janela de Mensagens"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Janela de gráficos de estatísticas"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Janela de configuração de preferências"
+
+#~ msgid "Transfers"
+#~ msgstr "Transferências"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Janela de arquivos transferidos"
+
+#~ msgid "Unban"
+#~ msgstr "DesBanir"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Exibir Uploads"
+
+#~ msgid "Show Queue"
+#~ msgstr "Exibir lista de espera"
+
+#~ msgid "Select View"
+#~ msgstr "Selecionar modo de visão"
+
+#~ msgid "Client Software"
+#~ msgstr "Software Cliente"
+
+#~ msgid "Waited"
+#~ msgstr "Aguardou"
+
+#~ msgid "Upload Time"
+#~ msgstr "Tempo de Upload"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Upload/Download"
+
+#~ msgid "Remote Status"
+#~ msgstr "Status Remoto"
+
+#~ msgid "File Priority"
+#~ msgstr "Prioridade de Arquivo"
+
+#~ msgid "Score"
+#~ msgstr "Contagem"
+
+#~ msgid "Asked"
+#~ msgstr "Pedidos"
+
+#~ msgid "Last Seen"
+#~ msgstr "Última visita"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Lista de Espera"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Transferido (Up)"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Transferido (Down)"
+
+#~ msgid "Userhash"
+#~ msgstr "Userhash"
+
+#~ msgid "Encrypted"
+#~ msgstr "Encriptado"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Exibir Uploads / Fila de espera"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Clientes em espera: "
+
+#~ msgid "Current Session"
+#~ msgstr "Sessão atual"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Requested :"
+#~ msgstr "Solicitados:"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Janela de Transferências"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Total de Usr: %s | Total de Arquivos: %s"
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Downloads (%i)"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr ""
+#~ "AVISO: Não foi possível remover arquivo '%s' depois de criar o backup"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country(): Falha ao carrega dado do país de"
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Obter nível do IPFilter"
+
+#~ msgid "Makes a search."
+#~ msgstr "Faça uma busca"
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Falha"
+
+#, fuzzy
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Executar o amuleweb na inicialização"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Fechar aMule."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "As seguintes opções foram mudadas nesta versão por razões de segurança:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Habilitar suporte a Obscurecimento de Protocolo para conexões de "
+#~ "entrada e saída.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Desabilitar a atualização da lista de servidores através de outros "
+#~ "servidores e clientes.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Para mais informações sobre a razão dessas mudanças, procure\n"
+#~ "o wiki do aMule em http://wiki.amule.org e busque por \"fake servers\".\n"
+#~ "É importante que você limpe qualquer servidor falso de sua lista para o "
+#~ "que aMule funcione apropriadamente."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Adicionalmente, as preferências tem de ser reinicidas para o padrão do "
+#~ "sistema. Por favor configure suas opções novamente se for necessário.\n"
 
 #~ msgid "Fetching status..."
 #~ msgstr "Recebendo status..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Usr: E: %s K: %s | Arquivos E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Cliente %s em IP:Porta %s:%d usando %s %s %s"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() returned NULL"
 
+#~ msgid "Firewalled"
+#~ msgstr "Atrás de Firewall"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "Carregado %d bitmap de bandeira."
+#~ msgstr[1] "Carregados %d bitmaps de bandeiras."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr "O arquivo %s é muito grande para a Mula: máximo suportado é 4 GB."
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Não há um programa definido para esse tipo de arquivo."
+
+#~ msgid "File was not saved"
+#~ msgstr "Arquivo não foi salvo"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr "Conexão Falhou. Impossível conectar ao Host especificado\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "Filtro de Mensagens"
 
@@ -7222,14 +7826,180 @@
 #~ msgid "Core Tweaks"
 #~ msgstr "CORE Tweaks"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Não há um programa definido para esse tipo de arquivo."
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Tempo de Espera (dicas) em secs"
 
-#~ msgid "File was not saved"
-#~ msgstr "Arquivo não foi salvo"
+#~ msgid "Show part file number before file name"
+#~ msgstr "Mostrar número da parte do arquivo antes do nome do arquivo"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
-#~ msgstr "O arquivo %s é muito grande para a Mula: máximo suportado é 4 GB."
+#~ msgid "Skin Support"
+#~ msgstr "Suporte a Skin"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- Nenhuma pele disponível -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Diretório da Assinatura Online:"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Opções de Filtragem:"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Capacidades de Linha"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
+#~ msgstr ""
+#~ "Nota: Esses valores apenas\n"
+#~ " são usados para estatísticas."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Porta TCP do Cliente:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Porta UDP do cliente (Estendida):"
+
+#~ msgid "Bind Address"
+#~ msgstr "Fixar esse Endereço"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "Porta UDP para solicitações estendidas (TCP+3):4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "No. Max. de fontes por arquivo"
+
+#~ msgid "Connection limits"
+#~ msgstr "Limites da conexão"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Plug and Play Universal"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "Habilitar UPnP"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "Porta TCP UPnP"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Iniciar próximo arquivo em pausa ao concluir download"
+
+#~ msgid "Check disk space"
+#~ msgstr "Checar espaço em disco"
+
+#~ msgid "Min disk space:"
+#~ msgstr "Espaço min em disco:"
+
+#~ msgid "Incoming"
+#~ msgstr "Completo"
+
+#~ msgid "Temporary"
+#~ msgstr "Temporário"
+
+#~ msgid "Shared"
+#~ msgstr "Compartilhado"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Selecionar cores das estatísticas"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Progresso dos arquivos em espera"
+
+#~ msgid "Show percentage"
+#~ msgstr "Exibir porcentagem"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Exibir barra de progresso"
+
+#~ msgid "Enable skin support "
+#~ msgstr "Habilitar suporte a pele"
+
+#~ msgid "Skin:"
+#~ msgstr "Pele:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "Auto-organizar arquivos na fila de espera (ALTO uso de CPU)"
+
+#~ msgid "Show Fast eD2k Links Handler"
+#~ msgstr "Mostrar manipulador rápido de ligações eD2k"
+
+#~ msgid "Web server port"
+#~ msgstr "Porta do web server"
+
+#~ msgid "Enable UPnP port forwarding on the web server port"
+#~ msgstr "Habilitar redirecionamento de porta UPnP na porta do servidor web"
+
+#~ msgid "Web server UPnP TCP port"
+#~ msgstr "Porta TCP UPnP do web server"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "IP da interface de audição\n"
+#~ "(vazio para qualquer)"
+
+#~ msgid "TCP port"
+#~ msgstr "Porta TCP"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Quem pode ver os compartilhados:"
+
+#~ msgid "Event types"
+#~ msgstr "Tipos de eventos"
+
+#~ msgid "ERROR: can not accept web client connection\n"
+#~ msgstr "ERRO: não pode aceitar conexão do cliente web\n"
+
+#~ msgid ""
+#~ "Your Auto-update server list is empty.\n"
+#~ "'Auto-update server list at startup will be disabled."
+#~ msgstr ""
+#~ "Sua lista de servidores Auto-atualizáveis está vazia.\n"
+#~ "'Lista de servidores Auto-atualizáveis no ínicio será desabilitada."
+
+#~ msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "ERRO: Versão do arquivo part.met inválida: %s ==> %s"
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "Faz com que o aMule confirme antes de sair."
+
+#~ msgid "Bandwith limits"
+#~ msgstr "Limites da banda"
+
+#~ msgid "This UDP port is used for extended ed2k requests and Kad network"
+#~ msgstr ""
+#~ "Essa porta UDP é usada para extender as requisições ed2k e da rede Kad"
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Exibir estatísticas da conexão"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. ativo"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICH a cada hash novo (não recomendado)"
+
+#~ msgid "Disk space"
+#~ msgstr "Espaço em disco"
+
+#~ msgid "Create Backup for preview"
+#~ msgstr "Criar cópia para pré-visualização"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Configurações Avançadas"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Estilo da Barra de progresso"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Ordenação das Colunas"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Tweaks de Interface"
+
+#~ msgid "File Options"
+#~ msgstr "Opções de Arquivo"
 
 #~ msgid "Status text"
 #~ msgstr "Texto de Status"
@@ -7237,18 +8007,137 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "Pop-Up do texto de status"
 
-#~ msgid "Please wait... "
-#~ msgstr "Aguarde..."
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Cliente p2p 'Multiplataforma' baseado no eMule \n"
+#~ "\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr " Página: http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr " Fórum: http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ " FAQ (ajuda): http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " Contato: admin@amule.org (assuntos administrativos) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr " Trechos do aMule são baseados em \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " Copyright (C) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "Para um filme, Você pode falar do tamanho, idioma, história...\n"
+#~ "e se ele for falso (fake), Você poderá informar aos demais usuários."
+
+#~ msgid "Misc Options"
+#~ msgstr "Opções Diversas"
+
+#~ msgid "Server Options"
+#~ msgstr "Opções do Servidor"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Exibir a mensagem do dia (motd) ao conectar"
+
+#~ msgid "eD2k Info"
+#~ msgstr "Info eD2k"
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Desativar/Ativar"
+
+#~ msgid "Authentication"
+#~ msgstr "Autenticação"
 
 #~ msgid "General Settings"
 #~ msgstr "Opções Gerais"
 
+#~ msgid "Hard limit"
+#~ msgstr "Limite"
+
+#~ msgid "Max Connections"
+#~ msgstr "No. Máximo de Conexões"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "GUI Tweaks"
 
 #~ msgid "Remote Control"
 #~ msgstr "Controle Remoto"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Impossível determinar browser selecionado!"
+
+#~ msgid "User Defined"
+#~ msgstr "Definido pelo Usuário"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - a Mula do Linux"
+
+#~ msgid "System Default"
+#~ msgstr "Padrão do Sistema"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Selecione seu navegador aqui"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Definido pelo Usuário:"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Defina seu browser aqui, selecionando a opção 'definido pelo usuário' "
+#~ "acima.Para browser personalizado, selecione essa opção na lista."
+
+#~ msgid "Please wait... "
+#~ msgstr "Aguarde..."
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "Não foi possível reconhecer o comando para executar o navegador."
 
@@ -7372,9 +8261,6 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "Copiar links ED2k para a Área de Transferência"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "ERRO FATAL: Falha ao criar 'Timer'"
-
 #~ msgid "ED2K: Connecting"
 #~ msgstr "ED2K: Conectando"
 
@@ -7483,9 +8369,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "Erro: versão do arquivo part.met inválida: %s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr "Erro: %s (%s) está corrompido, impossível carregar arquivo."
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "Aviso: %s parece estar corrompido (%i)"

aMule-2.2.6.tar.bz2/po/pt_PT.po -> aMule-2.3.1.tar.bz2/po/pt_PT.po Changed

@@ -8,1316 +8,1151 @@
 # (special thanks to Pedro Rodrigues <fantasma_2001@yahoo.com>)
 # Helder Correia <helder.pereira.correia@gmail.com>, 2007.
 # Miguel Almeida <miguel@almeida.at>, 2008.
-#
+# Luís Picciochi Oliveira <Pitxyoki@Gmail.com>, 2009-2011
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: aMule 2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-03-14 16:32+0000\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
+"PO-Revision-Date: 2011-06-18 14:15+0000\n"
 "Last-Translator: Luís Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
-"Language-Team: Portuguese\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Deve especificar uma palavra-passe não vazia."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Palavra-passe inválida, não é uma chave MD5!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Falha de ligação"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "Ligação LE falhou. Resposta vazia."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Ligação Externa: Acesso negado porque: "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Ligação Externa: Acesso negado"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Ligação Externa: Má resposta do servidor. Ligação fechada."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Sucesso! Ligação estabelecida com o aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Sucesso! Ligação estabelecida."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "A gerar chave"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Adicionar um Amigo"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "A completar"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Deve indicar um endereço IP e porto válidos!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Completo"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Informação"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Em Pausa"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "A chave de utilizador especificada não é válida!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Erróneo"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Falha ao abrir ficheiro de ligações eD2k."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "A Receber"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"AVISO: Não se pode adicionar a si próprio como fonte para um link eD2k "
+"enquanto tiver lowid."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Em Espera"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "A fechar a aplicação..."
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Início da criação de chaves MD4 e AICH para o ficheiro: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "A terminar instância do amuleweb com o pid '%ld' ... "
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Início da criação da chave MD4 para o ficheiro: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "A matar instância do amuleweb com o pid '%ld' ... "
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Início da criação da chave AICH para o ficheiro: %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Falhas"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Conversão de grupos de chaves AICH antigas em '%s' para 64b em '%s'."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: A terminar núcleo."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "AVISO: O nome do ficheiro '%s' é invalido e foi mudado para '%s'."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "aMule terminado."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr ""
-"AVISO: O ficheiro '%s' já existe, o novo ficheiro tem agora o nome '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Resultados da depuração de memória para a saída do aMule:"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
 msgstr ""
-"AVISO: Não é possível remover o original '%s' após criar cópia de segurança"
+"\n"
+"Configuração das LE"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "AVISO: Falha ao remover %s"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Palavra-passe definida e permitidas as ligações externas."
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Erro ao receber ficheiros partilhados do utilizador '%s'"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "AVISO"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Desconhecido"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Versão do eMule falsa %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Informação"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (eMule falso)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Não tem nenhum servidor na lista de servidores.\n"
+"Quer que o aMule faça o download de uma lista nova agora?"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (eMule falso)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "A fazer download da lista de servidores"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (baseado no eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr "servidor web a executar no pid %d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Alcunha: %s ID: %u"
+#: src/amule.cpp:658
+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 ""
+"Pediu para executar o servidor web no arranque, mas o executável não pode "
+"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/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Pedido: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "ERRO"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Estatísticas para esta sessão: Aceite %d de %d pedido, %s transferido\n"
-msgstr[1] ""
-"Estatísticas para esta sessão: Aceites %d de %d pedidos, %s transferidos\n"
+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/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Estatísticas para todas as sessões: Aceite %d de %d pedido, %s transferido\n"
-msgstr[1] ""
-"Estatísticas para todas as sessões: Aceites %d de %d pedidos, %s "
-"transferidos\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Pedido um ficheiro desconhecido"
+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/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Cliente %s com IP:Porto %s:%d a usar %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Nome de Utilizador"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"O porto %u não está disponível!\n"
+"\n"
+"Isto significa que ficará com LOWID.\n"
+"\n"
+"Verifique a sua rede para se certificar de que o porto está aberto para "
+"leitura e escrita."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Amigos"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Erro ao criar o ficheiro da Assinatura Online"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Mostrar &Detalhes"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Erro a criar o ficheiro da Assinatura Online do aMule"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Adicionar um amigo"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"O idioma seleccionado parece não estar instalado no seu computador. (Nota: "
+"de qualquer das formas, irei tentar activá-lo)"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Remover Amigo"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "Esta é a primeira vez que executa o aMule %s"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Enviar &Mensagem"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Esta é uma versão de testes actualizada diariamente e\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Ver Ficheiros"
+#: src/amule.cpp:1043
+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"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Estabelecer Ligação de Amigo"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "ou matar o seu cão. Mas, *em princípio*, deverá ser seguro usá-lo.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Tem a certeza que deseja remover o amigo seleccionado?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr "Mais informação, suporte e novos lançamentos na nossa página,\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Tem a certeza que deseja remover os amigos seleccionados?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "em www.amule.org ou no canal de IRC #aMule em irc.freenode.net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Cancelar"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Esteja à vontade para comunicar erros para http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Não lhe é permitido definir mais do que uma ligação de amigo.\n"
-" Apenas uma ligação foi atribuída."
+"A pasta para os ficheiros da Assinatura Online é INVÁLIDA!\n"
+" A Assinatura Online será DESACTIVADA até que resolva a situação nas "
+"preferências."
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Selecção múltipla"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Servidor notificado"
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Download concluído"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Reserva de espaço em disco para o ficheiro '%s' falhou: %s"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "O caminho completo para o ficheiro."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "ERRO: não é possível abrir o ficheiro de relatório"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "O nome do ficheiro sem a parte do caminho."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "AVISO: o ficheiro de relatório está vazio. Algo está mal."
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "A chave eD2k do ficheiro."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "O relatório foi limpo"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "O tamanho do ficheiro em bytes."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Mensagem do servidor: %s"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Tempo cumulativo de download."
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
+"O download de %s não foi feito porque o ficheiro requisitado não é mais "
+"recente."
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Nova sessão de conversa iniciada"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Falha ao transferir a lista de nós."
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Remetente de mensagem."
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Falha ao abrir o ficheiro de verificação de versão transferido"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Falta de espaço"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Ficheiro de verificação de versão corrompido"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Partição de disco."
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Está a usar uma versão antiga do aMule!"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Erro ao completar"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "A sua versão do aMule é %i.%i.%i e a última versão é %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Nome do Ficheiro"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "A última versão pode ser sempre encontrada em http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Tamanho"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr ""
+"AVISO: A sua versão do aMuled está desactualizada: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tipo"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "A sua cópia do aMule está actualizada."
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioridade"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Falha ao transferir o ficheiro de verificação de versão"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "ID do Ficheiro"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Utilizadores: %s | Ficheiros: %s"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Pedidos"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Utilizadores: E: %s K: %s | Ficheiros: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Pedidos Aceites"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Não foram seleccionadas redes"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Dados Transferidos"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "com LowID"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Grau de Partilha"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "com HighID"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Partes Obtidas"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Ligado a %s %s"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Fontes Completas"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "A ligar a %s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Caminho da Pasta"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Desligado da eD2k"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Ficheiros Partilhados"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad iniciada."
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Muito baixa"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad parada."
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Baixa"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Ligado à Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normal"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Ligado à Kad (atrás de firewall)"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Alta"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Desligado da Kad"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Muito Alta"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"A rede Kad não pode ser usada se o porto UDP estiver desactivado nas "
+"preferências, inicialização não efectuada."
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Lançamento"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Rede Kad desligada nas preferências, a ligação não será efectuada."
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Automática"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"ERRO: Não é possível usar o daemon do aMule quando as ligações externas "
+"estão desactivadas. Para activar as Ligações Externas use um aMule normal, "
+"inicie o amuled com a opção --ec-config ou mude a chave "
+"\"AcceptExternalConnections\" para 1 no ficheiro ~/.aMule/amule.conf"
+
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"ERRO: É necessária uma palavra-passe para utilizar as ligações externas e o "
+"daemon do aMule não pode ser utilizado sem ligações externas. Para executar "
+"o daemon do aMule deve definir o campo \"ECPassword\" no ficheiro ~/.aMule/"
+"amule.conf com um valor adequado. Execute o amuled com o parâmetro --ec-"
+"config para definir a palavra-passe. Para mais informações consulte http://"
+"wiki.amule.org"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: OnInit - a iniciar temporizador"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: a fazer fork para segundo plano - adeus"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Não foi Possível Criar o Ficheiro de Pid"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Adicionar Comentário/Avaliação"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "ERRO: %s"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Editar Comentário/Avaliação"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Este é o aMule %s, baseado no eMule."
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Renomear"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "A correr em %s"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Adicionar ficheiros na colecção à lista de transferências"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr "Visite http://www.amule.org para verificar se há novas versões."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Copiar &URI magnet para a área de transferência"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ERRO FATAL: Falha ao criar Temporizador"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Copiar &ligação eD2k para a área de transferência"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Controlo remoto do aMule "
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Copiar ligação eD2k para a área de transferência (&Fonte)"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Snapshot:"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
-"Copiar ligação eD2k para a área de transferência (Fonte) (&Com opções Crypt)"
+"Cliente p2p 'para todas as plataformas' baseado no eMule \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Copiar ligação eD2k para a área de transferência (&Hostname)"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Website: http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr ""
-"Copiar ligação eD2k para a área de transferência (Hostname) (Com opções "
-"C&rypt)"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Fórum: http://forum.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Copiar ligação eD2k para a área de transferência (informação &AICH)"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Copiar comentários para a área de transferência"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Contacto: admin@amule.org (questões administrativas) \n"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:506
 msgid ""
-"Feedback from: %s (%s)\n"
+"Copyright (c) 2003-2011 aMule Team \n"
 "\n"
 msgstr ""
-"Comentário de: %s (%s)\n"
+"Copyright (C) 2003-2011 Equipa aMule \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Necessita de HighID para criar uma ligação de fonte válida"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Parte do aMule é baseado em \n"
 
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "AVISO"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Ficheiros Partilhados (%i)"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Encaminhamento peer-to-peer baseado na métrica XOR.\n"
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[FicheiroPart]"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (C) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Mensagem"
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Insira o novo nome para este ficheiro:"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "Caixa de diálogo do aMule destruída"
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Renomeação de ficheiro"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "A Ligar"
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "A continuar uploads do ficheiro: %s"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: A Ligar"
 
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "A suspender upload do ficheiro: %s"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Desligado"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "Cliente de texto do aMule"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Atrás de firewall"
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: palavra-chave de pesquisa demasiado curta"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Ligado"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Lido %u contacto Kad"
-msgstr[1] "Lidos %u contactos Kad"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: A Ligar"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Apenas %d contacto Kad disponível, nodes.dat não escrito"
-msgstr[1] "Apenas %d contactos Kad disponíveis, nodes.dat não escrito"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Desligado"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Escrito %d contacto Kad"
-msgstr[1] "Escritos %d contactos Kad"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ERRO: Não é possível escutar o porto TCP"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Cancela as tentativas de ligação actuais"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "Ligação de cliente web aceite\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Desligar"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ERRO: não é possível aceitar ligação de cliente web\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Desligar das redes presentemente ligadas"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "O pedido falhou com o seguinte erro: %s."
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Ligar"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "O pedido falhou com um erro desconhecido."
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Ligar às redes presentemente activadas"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Ficheiro de índice não encontrado: "
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "A sessão expirou - a pedir entrada no sistema\n"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Up: %.1f | Down: %.1f"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sessão ok, dentro do sistema\n"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Ligado)"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sessão ok, fora do sistema\n"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Desligado)"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Sessão não aberta - ir-se-á pedir entrada no sistema\n"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Quer mesmo fechar o %s?"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Sessão criada - a pedir entrada no sistema\n"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Confirmação de saída"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "A processar pedido [original]: "
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Executar Comando: "
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- predefinição -"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "A verificar a palavra-passe\n"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Pasta para os temas '%s' não existe"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Chave da palavra-passe inválida\n"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "AVISO: Não é possível abrir ficheiro de tema '%s' para leitura"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Palavra-passe correcta\n"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Redes"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Palavra-passe incorrecta\n"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Janela de Redes"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr ""
-"Não forneceu uma palavra-passe. Palavras-passe vazias não são permitidas.\n"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Pesquisas"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Saída do sistema pedida\n"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Janela de Pesquisas"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "A processar pedido [redireccionado]: "
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Downloads"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Carrega o modelo <exp>"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Janela de Downloads"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Porto HTTP do servidor web"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Ficheiros partilhados"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Utilizar UPnP para configurar encaminhamento no porto do servidor web"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Janela de Ficheiros Partilhados"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Porto UPnP"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Mensagens"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Usar compressão gzip"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Janela de Mensagens"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Palavra-passe de acesso total para o servidor web"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Estatísticas"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Palavra-passe de convidado para o servidor web"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Janela de Estatísticas"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Permitir acesso de convidado"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Preferências"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Negar acesso de convidado"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Janela de Preferências"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Carregar/guardar as preferências do servidor web de/para aMule remoto"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importar"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Caminho do ficheiro de configuração do aMule. NÃO USE DIRECTAMENTE!"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "A ferramenta de importação de ficheiro de partes"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Desactivar o interpretador PHP (obsoleto)"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Acerca"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Recompilar as páginas PHP em cada pedido"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Acerca/Ajuda"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Servidor Web do aMule"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Rede eD2k"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Indisponível"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Rede Kad"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Nunca"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Sem rede"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "A Receber..."
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "Controlo remoto do aMule"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "Esperavam-se %d bytes, mas foram transferidos %d"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Erro Fatal: Falha ao criar o Temporizador Central"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Preferências"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Ligar ao amule remoto"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Pasta que contém o ficheiro amulesig.dat"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Erro Fatal: Falha ao criar o 'Poll Timer'"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "A ir para o ciclo de eventos..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "A Ligar..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Procurar"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "A ligação falhou "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Insira a pasta onde se encontra o seu ficheiro amulesig.dat"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Gestor de eventos da interface gráfica remota"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "A fechar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Intervalo de actualização em segundos"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "A ligação falhou. Não é possível ligar a %s:%d\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Gerar uma imagem das estatísticas a cada evento de actualização"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Ligação fechada - provavelmente o aMule foi terminado."
+
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Pronto"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Insira aqui a pasta onde deseja gerar a imagem das estatísticas"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Todos"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
-"Transferir periodicamente a imagem das estatísticas para o servidor FTP"
+"Não é possível criar o directório '%s' para a categoria '%s', a manter "
+"directório '%s'."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "URL do FTP"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Desconhecido"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Caminho do FTP"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Erro ao receber ficheiros partilhados do utilizador '%s'"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Insira aqui o URL do seu servidor FTP"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "A procurar parceiro para ligação com lowid"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
-"Insira aqui a pasta do servidor FTP onde deseja colocar a sua imagem das "
-"estatísticas"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Versão do eMule falsa %#x)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Utilizador"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (eMule falso)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Palavra-passe"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (eMule falso)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Insira aqui o nome de utilizador para entrar no seu servidor FTP"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (baseado no eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Insira aqui a palavra-passe para entrar no seu servidor FTP"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Alcunha: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Intervalo de actualização do FTP em minutos"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Pedido: %s\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Validar"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Estatísticas para esta sessão: Aceite %d de %d pedido, %s transferido\n"
+msgstr[1] ""
+"Estatísticas para esta sessão: Aceites %d de %d pedidos, %s transferidos\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Pasta que contém o seu ficheiro de assinatura"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Estatísticas para todas as sessões: Aceite %d de %d pedido, %s transferido\n"
+msgstr[1] ""
+"Estatísticas para todas as sessões: Aceites %d de %d pedidos, %s "
+"transferidos\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Pasta onde se gera a imagem das estatísticas"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Pedido um ficheiro desconhecido"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/BaseClient.cpp:2700
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i dia(s) %i hora(s) %i minuto(s) %i segundo(s)"
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, Estísticas Online do aMule"
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Mensagem filtrada de '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Bem-vindo!"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nova mensagem de '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/BaseClient.cpp:2899
+#, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr ""
+"O utilizador %s (%u) pediu a sua lista de ficheiros partilhados para a pasta "
+"'%s' -> Ignorado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Taxa máxima de download desde que o wxCas está em execução"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "AVISO: %s não pode ser aberto."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
-"Taxa absoluta de download máxima durante as execuções anteriores do wxCas"
+"AVISO: Lista de ficheiros cancelados corrompida, contém cabeçalho inválido."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Limpar"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Erro de entrada/saída ao ler ficheiro %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistema"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Erro ao gravar ficheiro %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Parar Actualização Automática"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Escrever 'Captcha'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Gravar imagem das Estatísticas Online"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Categoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Imprimir a imagem de Estatísticas Online"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nova Categoria"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Definição de preferências"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Seleccione uma pasta de ficheiros completos"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Acerca do wxCas"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Deve especificar um nome para a categoria!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Iniciar a Actualização Automática"
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Deve especificar um caminho para a categoria!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Actualização Automática parada"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Erro ao criar pasta de entrada para categoria. Por favor, especifique um "
+"caminho válido!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Actualização automática iniciada"
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Sessão de Conversa Iniciada: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Gravar a Imagem de Estatísticas"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Ligado ao Cliente ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Estatísticas Online do aMule"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** A Ligar ao Cliente ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Erro na ligação ao cliente / Ligação perdida ***"
+
+#: src/ChatSelector.cpp:335
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
 msgstr ""
-"Ocorreu um erro ao imprimir.\n"
-"Talvez a sua impressora actual não esteja bem configurada."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "A imprimir"
+"*** Passou o teste do 'captcha' e o utilizador recebeu a sua mensagem. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
+#: src/ChatSelector.cpp:336
 msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
-"wxCas, Estatísticas de Assinatura Online do aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Baseado no CAS por Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distribuído sob a licença GPL"
+"*** A sua resposta ao 'captcha' estava errada e a sua mensagem foi ignorada. "
+"Pode solicitar um novo 'captcha' enviando uma nova mensagem. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, o aMule não esta em execução..."
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Chat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "O aMule está em execução"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "O aMule está a funcionar mas está desligado"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "O aMule está a ligar..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh Oh, o estado do aMule é desconhecido..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " está em execução há "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " está parado !"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " não está ligado !"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " está a ligar..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " está a fazer algo estranho, verifique!"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " está ligado a "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Fechar o separador"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Fechar todos os separadores"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Fechar os outros separadores"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "atrás de uma firewall"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Adicionar à lista de Amigos"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "parado"
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Ficheiro de créditos carregado, %u cliente conhecido"
+msgstr[1] "Ficheiro de créditos carregado, %u clientes conhecidos"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " está em "
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Os créditos expiraram para %u cliente!"
+msgstr[1] " - Os créditos expiraram para %u clientes!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr "com "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Ficheiro 'cryptkey.dat' não encontrado, a criar."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Download Total: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Detalhes do Cliente"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Upload: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LowID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Download na Sessão: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Download: "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Activado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Upload: "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Suportado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr "kB/s"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Não suportado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "A partilhar: "
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Desactivado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " ficheiro(s). Clientes na fila de espera: "
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Ligado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Hora: "
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Desligado"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " no "
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Incompleto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Média de carga do sistema (1-5-15 minutos): "
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Pessoa Maldosa"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Tempo de funcionamento do sistema: "
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Verificado - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02um %02us"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Indisponível"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02um %02us"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr ""
+"O utilizador %s (%u) pediu a sua lista de ficheiros partilhados -> Aceite"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%02umin %02us"
-msgstr "%02um %02us"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr ""
+"O utilizador %s (%u) pediu a sua lista de ficheiros partilhados -> Negado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%02us"
-msgstr "%02us"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
-
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LowID"
-
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Não Ligado"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "O utilizador %s (%u) pediu a sua lista de pastas partilhadas -> Aceite"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "O utilizador %s (%u) pediu a sua lista de pastas partilhadas -> Negado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f kB"
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
+msgstr ""
+"O utilizador %s (%u) pediu a sua lista de ficheiros partilhados para a pasta "
+"'%s' -> aceite"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:933
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr ""
+"O utilizador %s (%u) pediu a sua lista de ficheiros partilhados para a pasta "
+"'%s' -> negado"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:952
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) shares directory '%s'"
+msgstr "O utilizador %s (%u) partilha a pasta '%s'"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:967
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Cancelado !"
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "O utilizador %s (%u) enviou pastas partilhadas não requisitadas."
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:982
 #, c-format
-msgid "Unable to open %s"
-msgstr "Não é possível abrir %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Parâmetros de entrada"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Ficheiro para gerar chave"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Adicionar URLs Opcionais para este ficheiro"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Indique aqui o ficheiro para o qual deseja obter o link eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
-"Indique aqui o URL onde pretende adicionar a ligação eD2k: Adicione / ao "
-"fimpara permitir que o aLinkCreator acrescente o nome de ficheiro actual"
+"O utilizador %s (%u) enviou a lista de ficheiros partilhados para a pasta '%"
+"s'"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Adicionar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Remover"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Limpar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Criar a ligação com chaves de partes"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
-"Ajudar a espalhar ficheiros novos e raros mais rapidamente, com o custo de "
-"um maior tamanho da ligação"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Chave MD4 do ficheiro"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "Chave eD2k do ficheiro"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "Ligação eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Iniciar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Gravar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Copiar para a área de transferência"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Sair"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Abrir"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Abrir um ficheiro para calcular a sua ligação eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Copiar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Copiar ligação eD2k calculada para a área de transferência"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Gravar como"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Gravar a ligação eD2k calculada para um ficheiro"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Acerca"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Acerca do aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Seleccione o ficheiro para o qual pretende criar a ligação eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Não é possível abrir a área de transferência"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Nada a copiar por agora!"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Seleccione o ficheiro para guardar a sua ligação eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Não é possível abrir "
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Por favor, insira um nome de ficheiro"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Nada a gravar por agora!"
+"O utilizador %s (%u) terminou o envio da lista de ficheiros partilhados"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
-"aLinkCreator, o criador de ligações eD2k do aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps de http://www.everaldo.com e http://www.icomania.com\n"
-"e http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distrubuído sob a licença GPL"
+"O utilizador %s (%u) enviou lista de ficheiros partilhados não desejada"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "A gerar chaves..."
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr ""
+"O utilizador %s (%u) negou acesso à lista de pastas/ficheiros partilhados"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "O aLinkCreator está a trabalhar"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Comentários do ficheiro"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "A calcular chave MD4..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Nome de Utilizador"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "A calcular chave eD2k..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Nome do Ficheiro"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Concluído em %.2f s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Classificação"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Já adicionou este URL!"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Comentário"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Por favor, insira um URL"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Sem comentários"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "A processar o ficheiro número %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Requisitou chaves parciais (Usado apenas para ficheiros > 9.5 MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u comentário"
+msgstr[1] "%u comentários"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Ficheiro inexistente!\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, o criador de ligações eD2k do aMule"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"Cliente %s banido por ter enviado %s dados corrompidos de um total de %s "
+"para o ficheiro '%s'"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1331,31 +1166,57 @@
 msgid "Auto [Hi]"
 msgstr "Automática [Alta]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "A Ligar"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Muito baixa"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Baixa"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normal"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Alta"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Muito Alta"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Lançamento"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "A Pedir"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "A ligar via servidor"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Fila de Espera Cheia"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "Em Fila de Espera"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "A Transferir"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "A Receber"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1381,8 +1242,7 @@
 msgid "Too many Kad connections"
 msgstr "Demasiadas ligações Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Banidos"
 
@@ -1414,8 +1274,8 @@
 msgid "Remote Server"
 msgstr "Servidor Remoto"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1439,8 +1299,8 @@
 msgid "Search Result"
 msgstr "Resultados de Pesquisas"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Concluído"
 
@@ -1464,7 +1324,7 @@
 msgid "ERROR: Failed!"
 msgstr "ERRO: Falhou!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "Em Fila"
 
@@ -1474,877 +1334,310 @@
 
 #: src/DataToText.cpp:153
 msgid "Unknown or bad tempfile format."
-msgstr "Formato de ficheiro temporário desconhecido ou danificado"
-
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Predefinição do sistema"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albanês"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Árabe"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturiano"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Basco"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Búlgaro"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Catalão"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Chinês (Simplificado)"
+msgstr "Formato de ficheiro temporário desconhecido ou danificado."
 
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Chinês (Tradicional)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Croata"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Checo"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Dinamarquês"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Holandês"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Inglês"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estoniano"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finlandês"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Francês"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galego"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Parte"
 
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Alemão"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Grego"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hebreu"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Húngaro"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italiano"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italiano (Suíço)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japonês"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Coreano"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lituano"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norueguês (Nynorsk)"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Tamanho"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polaco"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Transferido"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Português"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Velocidade"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Português (Brasil)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Progresso"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Russo"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Fontes"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Esloveno"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioridade"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Espanhol"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Estado"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Sueco"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Tempo Restante"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turco"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Última Vez Visto Completo"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ucraniano"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Última recepção"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Não é possível determinar o navegador seleccionado!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Tem a certeza que deseja eliminar o ficheiro seleccionado?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"O porto TCP não pode ser superior a 65532 porque o socket UDP do servidor "
-"tem de ser TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Tem a certeza que deseja eliminar os ficheiros seleccionados?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "O porto predefinido será usado (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Nome do Servidor"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Endereço"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Porto"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Descrição"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Distância (ping)"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Utilizadores"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Ficheiros"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Falhas"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Estático"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versão"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Encontra-se ligado a um servidor que está a tentar remover. Por favor, "
-"desligue-se primeiro. O servidor NÃO foi removido."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Informação"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Nome desconhecido)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Tem a certeza que deseja eliminar o servidor estático %s"
+"Comentário de: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Sim"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Automática"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Não"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "P&arar"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Erro ao abrir '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pausa"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Servidores (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Continuar"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Servidor"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "&Limpar terminados"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Ligar ao servidor"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Trocar cada A4AF para este ficheiro"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Marcar o servidor como estático"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Trocar cada A4AF para este ficheiro (Automático)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Marcar o servidor como não estático"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Trocar cada A4AF para outro ficheiro"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Marcar os servidores como estáticos"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Opções Estendidas"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Marcar os servidores como não estáticos"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Pré-visualizar"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Remover o servidor"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Mostrar &detalhes do ficheiro"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Remover os servidores"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Mostrar todos os comentários"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Remover todos os servidores"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Copiar URI magnet para a área de transferência"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Copiar ligação eD2k para a área de transferência"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Copiar &ligação eD2k para a área de transferência"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Copiar ligações eD2k para a área de transferência"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Copiar comentários para a área de transferência"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Voltar a ligar ao servidor"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "destituir"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Tem a certeza que deseja eliminar todos os servidores?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Atribuir à categoria"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Tem a certeza que deseja eliminar o servidor seleccionado?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Abrir o ficheiro"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Tem a certeza que deseja eliminar os servidores seleccionados?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Insira o novo nome para este ficheiro:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Desactivado [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Renomear ficheiro"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Este é o aMule %s baseado no eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "A correr em %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr "Visite http://www.amule.org para verificar se há novas versões."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ERRO FATAL: Falha ao criar Temporizador"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Controlo remoto do aMule "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Snapshot:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" Cliente p2p multiplataforma baseado no eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Site: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Fórum: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Contacto: admin@amule.org (problemas administrativos) \n"
+msgid "Downloads (%i)"
+msgstr "Downloads (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 Equipa aMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Parte do aMule é baseado em \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Routing peer-to-peer baseado na métrica XOR.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Mensagem"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: A Ligar"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Desligado"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Atrás de firewall"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Ligado"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: A Ligar"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Desligado"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Cancela as tentativas de ligação actuais"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Desligar"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Desligar das redes presentemente ligadas."
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Ligar"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Ligar às redes presentemente activadas"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+"Para evitar que este aviso apareça em cada pré-visualização,\n"
+"defina o seu leitor de vídeo nas preferências (por omissão é o mplayer)."
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Up: %.1f | Down: %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Pré-visualização do ficheiro"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Ligado)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "ERRO: Erro na execução do leitor multimédia externo! Comando: '%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Desligado)"
+msgid "Saving PartFile %u of %u"
+msgstr "A gravar Ficheiro Parcial %u de %u"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Quer mesmo sair do aMule?"
-
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Confirmação de saída"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Todos os Ficheiros Parciais Gravados."
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Pasta para os temas '%s' não existe"
+msgid "Loading temp files from %s."
+msgstr "A carregar ficheiros temporários de %s."
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "AVISO: Não é possível abrir ficheiro de tema '%s' para leitura"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Redes"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Janela de redes"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Pesquisas"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Janela de Pesquisas"
+msgid "Loading PartFile %u of %u"
+msgstr "A carregar Ficheiro Parcial %u de %u"
 
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Transferências"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Janela de transferências"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Ficheiros partilhados"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Janela de ficheiros partilhados"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Mensagens"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Janela de mensagens"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Estatísticas"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Janela de estatísticas"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Janela de preferências"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importar"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "A ferramenta de importação de ficheiro de partes"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Acerca/Ajuda"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "Rede eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Rede Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Sem rede"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Geral"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Ligação"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Directorias"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Servidores"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Segurança"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Interface"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filtros"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Controlos remotos"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Assinatura Online"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Avançado"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Eventos"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Depuração"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Personalizado"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"O aMule tem de ser reiniciado para activar estas alterações:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- Porto TCP alterado.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- Porto UDP alterado.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"A sua lista de actualização automática de servidores está vazia.\n"
-"A actualização automática no arranque será desactivada."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Activou as ligações externas mas não especificou uma palavra-passe.\n"
-"As ligações externas não podem ser activadas a menos que uma palavra-passe "
-"válida seja especificada"
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- O idioma foi alterado.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- A pasta Temp foi alterada.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- Rede ED2K activada.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Up: 0.0 | Down: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"As redes eD2K e Kad estão desactivados.\n"
-"Não vai conseguir uma ligação até activar pelo menos uma deles."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"A Kad não vai funcionar se o porto UDP estiver desactivado.\n"
-"Active o porto UDP ou desactive a Kad."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"DEVE reiniciar o aMule agora.\n"
-"Se não o fizer, não se queixe se algo grave acontecer.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"A sua lista de actualização automática de servidores está vazia.\n"
-"Por favor, indique pelo menos uma localização que aponte para um ficheiro "
-"server.met válido.\n"
-"Clique no botão \"Lista\" para inserir uma localização."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Ficheiros temporários"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Ficheiros recebidos"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Assinaturas Online"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Seleccione uma pasta para %s"
+"ERRO: Falha ao carregar ficheiro de backup. Procure em http://forum.amule."
+"org por soluções para recuperação de .part.met."
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Procurar leitor de vídeo"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Carregados Todos os Ficheiros Parciais."
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Seleccionar navegador"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Nenhum ficheiro de partes (.part) encontrado"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Executável%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Editar a lista de servidores"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Encontrado %u ficheiro de partes"
+msgstr[1] "Encontrados %u ficheiros de partes"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Adicione localizações para obter ficheiros server.met\n"
-"Apenas uma localização por linha."
+"O sistema de ficheiros da pasta de ficheiros temporários não suporta "
+"ficheiros grandes."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Intervalo de actualização: %d segundo"
-msgstr[1] "Intervalo de actualização: %d segundos"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"O sistema de ficheiros da pasta de ficheiros completos não suporta ficheiros "
+"grandes"
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Tempo para o gráfico de média: %d minuto"
-msgstr[1] "Tempo para o gráfico de média: %d minutos"
+msgid "Downloading %s"
+msgstr "A transferir %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Escala do Gráfico de Ligações: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Já está a tentar obter o ficheiro '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Intervalo de actualização: %d segundo"
-msgstr[1] "Intervalo de actualização: %d segundos"
+msgid "You already have the file '%s'"
+msgstr "Já possui o ficheiro '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Tamanho de memória temporária de ficheiros: %d byte"
-msgstr[1] "Tamanho de memória temporária de ficheiros: %d bytes"
+msgid "You are already trying to download the file %s"
+msgstr "Já está a tentar transferir o ficheiro %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Tamanho da fila de espera de upload: %d cliente"
-msgstr[1] "Tamanho da fila de espera de upload: %d clientes"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Conversão de ligação magnet para eD2k não pode ser feita: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Intervalo de actualização de ligação ao servidor: %d minuto"
-msgstr[1] "Intervalo de actualização de ligação ao servidor: %d minutos"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Intervalo de actualização de ligação ao servidor: Desactivado"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Porto UDP para pedidos extendidos ao servidor (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "desactivado"
+msgid "Unknown protocol of link: %s"
+msgstr "Protocolo do link desconhecido: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Executar o comando quando ocorrer o evento `%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Activar execução de comandos no núcleo"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Comando de núcleo:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Activar execução de comando na interface gráfica"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Comando da interface gráfica:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "As variáveis seguintes vão ser substituídas:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Ligação eD2k inválida! ERRO: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Tentativa de acesso não autorizado. Ligação fechada."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "O cliente enviou um pacote depois de a autenticação ter falhado."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Ligação externa fechada."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Ligações externas desactivadas devido a palavra-passe vazia!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Ligações externas desactivadas no ficheiro de configuração"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Nova ligação externa aceite"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ERRO: não foi possível aceitar uma nova ligação externa"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "Ligação externa recusada devido a palavra-passe não preenchida nas "
 "preferências!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "A ligar cliente: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Versão desconhecida"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2352,2235 +1645,1068 @@
 "Versão de LE incorrecta, pode haver incompatibilidade binária. Utilize "
 "núcleo e remoto da mesma versão."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"Não pode ligar-se a uma versão oficial a partir de uma versão arbitrária "
-"SVN! *suspiro*... Prevenido potencial erro futuro"
+"Não pode ligar-se a uma versão oficial a partir de uma versão de "
+"desenvolvimento arbitrária! *suspiro*... Prevenido potencial erro futuro"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "A autenticação falhou."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Versão de protocolo inválida."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Elemento de versão de protocolo em falta."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+"Falha de autenticação: chave inválida indicada como palavra-passe para LE"
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "A autenticação falhou: palavra-passe errada."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "A autenticação falhou: palavra-passe em falta."
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr "Pedido inválido, deve autenticar-se primeiro."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Acesso concedido."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Enviada mensagem de erro \"%s\" ao cliente."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Acesso não-autorizado de %s. Ligação fechada."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
 "Falha no comando de ficheiro de partes remoto: Chave não encontrada: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Chave não encontrada: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "UPS! Erro de processamento de código de operação!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Servidor não adicionado"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "servidor não encontrado: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "é necessário definir o servidor a remover"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2K desactivada nas preferências."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "A pesquisar. Resultados dentro de momentos!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Pesquisa na web a partir da interface remota não faz sentido."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "A Kad está desactivada nas preferências."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Sem pontos para gráfico."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "O cliente não está configurado para este nível de detalhe."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Ligação Externa: finalização pedida"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Já a desligar."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "LigaçãoExterna: a adicionar o link '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Ligação inválida ou já na lista."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Ficheiro não encontrado."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Nome de ficheiro inválido."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Não é possível renomear o ficheiro."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "A Kad está desactivada nas preferências."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Já ligado à eD2k."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "A ligar à eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Já ligado à Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "A ligar à Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Todas as redes estão desactivadas."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Desligado da eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Desligado da Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Ligação Externa: recebido código de operação inválido: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Código de operação inválido (versão de protocolo errada?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Falha ao abrir ficheiro (%s), a remover da lista de ficheiros partilhados."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Conjunto de chaves pedido para ficheiro desconhecido: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Comando `%s' com pid `%d' terminou com codigo `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Servidor não adicionado: IP ou nome de máquina não especificado."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Servidor não adicionado: Porto de servidor especificado inválido."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Estado da eD2k:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Ligado"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Porto"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Estado da Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "A Executar"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Estado:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Desligado"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Estado da Ligação:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Atrás de Firewall"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Estado da firewall: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Ligado a parceiro"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Sem parceiro"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Média de Utilizadores"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Média de Ficheiros"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Parado"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Tempo de funcionamento: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Transferência"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Uploads"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Dados Enviados (Sessão (Total)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Sobrecarga Total (Pacotes): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Sobrecarga de Pedidos de Ficheiro (Pacotes): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Sobrecarga de Trocas de Fontes (Pacotes): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Sobrecarga do Servidor (Pacotes): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Sobrecarga na Kad (Pacotes): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Sobrecarga criptográfica (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Uploads Activos: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Uploads Em Espera: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Total de sessões de upload com sucesso: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Total de sessões de upload falhadas: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Tempo médio de envio: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Downloads"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Dados recebidos (Sessão (Total)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Fontes Encontradas: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Downloads activos (blocos): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Razão UL:DL da sessão (Total): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Taxa média de download (Sessão): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Taxa média de upload (Sessão): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Taxa máxima de download (Sessão): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Taxa máxima de upload (Sessão): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Religações: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Tempo Desde a Primeira Transferência: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Ligado Ao Servidor Desde: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Ligações Activas (estimativa): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Limite Máximo de Ligações Alcançado: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Média de Ligações (estimativa): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Pico de Ligações (estimativa): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Clientes"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrados"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Total: %i Conhecidos: %i"
-
-#: src/Statistics.cpp:715
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Working Servers: %i"
-msgstr "Servidores Activos: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Servidores Falhados: %i"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Extensão '%s' desconhecida para o comando '%s'.\n"
 
-#: src/Statistics.cpp:717
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Total: %s"
-msgstr "Total: %s"
+msgid "Unknown command '%s'.\n"
+msgstr "Comando '%s' desconhecido.\n"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Servidores Removidos: %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Este comando não pode ter um argumento.\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Servidores Filtrados: %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Este comando deve ter um argumento.\n"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Utilizadores em Servidores Activos: %llu"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Este comando está incompleto, deve usar uma das extensões abaixo.\n"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Ficheiros em Servidores Activos: %llu"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Extensões disponíveis:\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Total de Utilizadores: %llu"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Comandos disponíveis:\n"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Total Files: %llu"
-msgstr "Total de Ficheiros: %llu"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Todos os comandos não consideram a capitalização das letras.\n"
+"Escreva '%s <comando>' para obter mais detalhes sobre <comando>.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Ocupação dos Servidores: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Sai do programa."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Número de Ficheiros Partilhados: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Mostrar ajuda."
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Tamanho total dos Ficheiros Partilhados: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Para obter ajuda num comando, escreva 'help <comando>'.\n"
+"Para obter a lista completa de comandos escreva 'help'.\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
-msgstr "Tamanho médio dos ficheiros: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Sistema Operativo"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Não recebido"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Cortar"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Colar"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Seleccionar tudo"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Use '%s' para a lista de comandos\n"
+"\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Não é possível pesquisar na Kad se não estiver ligado à rede Kad"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Erro de sintaxe!"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "Não é possível pesquisar na eD2k se não estiver ligado à rede eD2k"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+"Erro ao processar o comando - nunca deveria acontecer! Por favor, comunique "
+"o erro\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Erro inesperado enquanto tentava pesquisar na Kad: "
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Este comando não deveria ter quaisquer parâmetros."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Mensagem filtrada de '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Este comando deve ter um parâmetro."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nova mensagem de '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Argumento inválido."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr ""
-"O utilizador %s (%u) pediu a sua lista de ficheiros partilhados -> Aceite"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Este comando está incompleto."
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr ""
-"O utilizador %s (%u) pediu a sua lista de ficheiros partilhados -> Negado"
+msgid "Type '%s' to get more help.\n"
+msgstr "Escreva '%s' para obter mais ajuda.\n"
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "O utilizador %s (%u) pediu a sua lista de pastas partilhadas -> Aceite"
+msgid "This is %s %s %s\n"
+msgstr "Isto é %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "O utilizador %s (%u) pediu a sua lista de pastas partilhadas -> Negado"
+msgid "This is %s %s\n"
+msgstr "Isto é %s %s\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
+"\n"
+"Creating client...\n"
 msgstr ""
-"O utilizador %s (%u) pediu a sua lista de ficheiros partilhados para a pasta "
-"%s -> aceite"
+"\n"
+"A criar o cliente...\n"
 
-#: src/ClientTCPSocket.cpp:976
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"O utilizador %s (%u) pediu a sua lista de ficheiros partilhados para a pasta "
-"%s -> negado"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "O utilizador %s (%u) partilha a pasta %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "O utilizador %s (%u) enviou pastas partilhadas não requisitadas."
+"\n"
+"OK, a sair %s...\n"
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"O utilizador %s (%u) enviou a lista de ficheiros partilhados para a pasta %s"
+"Não é possível ligar com uma palavra-passe vazia.\n"
+"Deve especificar uma palavra-passe no ficheiro de configuração\n"
+"ou na linha de comandos, ou insira uma quando lhe for pedida.\n"
+"\n"
+"A sair...\n"
 
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr ""
-"O utilizador %s (%u) terminou o envio da lista de ficheiros partilhados"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Mostra esta ajuda."
 
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr ""
-"O utilizador %s (%u) enviou lista de ficheiros partilhados não desejada"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Máquina onde o aMule está a ser executado. (predefinida: localhost)"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr ""
-"O utilizador %s (%u) negou acesso à lista de pastas/ficheiros partilhados"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Porto do aMule para Ligação Externa. (predefinido: 4712)"
 
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Nós (%u)"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Palavra-passe de Ligação Externa."
 
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Endereço IP inválido para arranque"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Ler a configuração a partir do ficheiro."
 
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Porto inválido para arranque"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Não mostrar qualquer mensagem para a saída padrão."
 
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Por favor, preencha todos os campos pedidos"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Detalhado - mostrar também mensagens de depuração."
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Tem a certeza que deseja transferir um novo ficheiro nodes.dat?\n"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Define a localização do programa (idioma)."
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
 msgstr ""
-"Ao fazê-lo, irá remover os seus nós actuais e reiniciar a ligação à Kademlia."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Continuar?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "ERRO: "
+"Escrever as opções da linha de comandos para o ficheiro de configuração."
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "AVISO: "
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr ""
+"Cria ficheiro de configuração baseado no ficheiro de configuração do aMule."
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Adicionar um Amigo"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Mostrar a versão do programa."
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Deve indicar um endereço IP e porto válidos!"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Detalhes do ficheiro"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informação"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% terminado"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "A chave de utilizador especificada não é válida!"
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Fontes"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr ""
+"Erro ao abrir o ficheiro de lista de amigos 'emfriends.met' para leitura!"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Ficheiro"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+"Erro ao abrir o ficheiro de lista de amigos 'emfriends.met' para escrita!"
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Download"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "CRÍTICO - sem cliente no StartChatSession"
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Categoria"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Amigos"
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Principal"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Mostrar &Detalhes"
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Transferir para a categoria"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Adicionar um amigo"
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Procurar ficheiros relacionados (eD2k, servidor local)"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Remover Amigo"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Marcar como ficheiro conhecido"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Enviar &Mensagem"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Ligar ao amule remoto"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Ver Ficheiros"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "A ligação falhou "
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Estabelecer Ligação de Amigo"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "ERRO"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Tem a certeza que deseja remover o amigo seleccionado?"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "A ligação falhou. Não é possível ligar a %s:%d\n"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Tem a certeza que deseja remover os amigos seleccionados?"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
 msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
-"AVISO: Não se pode adicionar a si próprio como fonte para um link ed2k "
-"enquanto tiver lowid."
-
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Utilizadores: E: %s K: %s | Ficheiros E: %s K: %s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Todos"
-
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Utilizadores: %s | Ficheiros: %s"
-
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Transferido"
-
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Velocidade"
-
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Progresso"
-
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Estado"
-
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Tempo Restante"
-
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Última Vez Visto Completo"
-
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Última recepção"
-
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Tem a certeza que deseja eliminar o ficheiro seleccionado?"
+"Não lhe é permitido definir mais do que uma ligação de amigo.\n"
+" Apenas uma ligação foi atribuída."
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Tem a certeza que deseja eliminar os ficheiros seleccionados?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Selecção múltipla"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Enviar uma mensagem ao utilizador"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Mensagem a enviar:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "P&arar"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pausa"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Continuar"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "&Limpar terminados"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Trocar cada A4AF para este ficheiro"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Trocar cada A4AF para este ficheiro (Automático)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Trocar cada A4AF para outro ficheiro"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Opções Extendidas"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Pré-visualizar"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Mostrar &detalhes do ficheiro"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Mostrar todos os comentários"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Copiar URI magnet para a área de transferência"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "destituir"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Atribuir à categoria"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Abrir o ficheiro"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Tirar da lista dos amigos"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Adicionar à lista de Amigos"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Mudar para este ficheiro"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
-msgstr "QR: %u (%i)"
+msgid "On Queue: %u (%i)"
+msgstr "Na Fila: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "A pedir outro ficheiro"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Downloads (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Para evitar que este aviso apareça em cada pré-visualização,\n"
-"defina o seu leitor de vídeo nas preferências (por omissão é o mplayer)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Pré-visualização do ficheiro"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "À espera de upload"
 
-#: src/DownloadListCtrl.cpp:2320
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ERRO: Erro na execução do leitor multimédia externo! Comando: '%s'"
+msgid "On Queue: %u"
+msgstr "Em Fila de Espera: %u"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "ERRO: falha na criação do ficheiro de partes)"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "A Enviar"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "A tentar carregar a cópia de segurança do ficheiro met de %s"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ERRO: Falha ao abrir o ficheiro part.met: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Nenhum"
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ERRO: O ficheiro part.met está vazio: %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ERRO: Versão inválida do ficheiro part.met: %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"ERRO: %s (%s) está corrompido (contagem de elementos errada), não é possível "
-"carregar o ficheiro."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "A tentar recuperar a informação do ficheiro..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr ""
-"A recuperar ficheiro sem nome - tentar-se-á recuperá-lo como 'RecoveredFile."
-"dat'"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Recuperada toda a informação disponível do ficheiro :D - A tentar usá-la..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Não é possível recuperar a informação do ficheiro :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Falha ao abrir %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "AVISO: %s parece estar corrompido (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "ERRO ao gravar ficheiro parcial: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Não foi possível obter o tamanho de '%s' - a usar o ficheiro %s."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' está vazio - a usar o ficheiro %s."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Erro ao gravar o ficheiro 'part.met.seeds' para %s"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Gravada %i semente de fontes para o ficheiro de partes: %s (%s)"
-msgstr[1] "Gravadas %i sementes de fontes para o ficheiro de partes: %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "O ficheiro de partes %s (%s) não tem ficheiro de sementes"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Não"
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "O ficheiro de partes %s (%s) tem um ficheiro de sementes indefinido"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Sim"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Erro ao ler o ficheiro de sementes de ficheiro de partes (%s - %s): %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "A Receber..."
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Encontrada parte corrompida (%d) no ficheiro de %d parte %s - FileResultHash "
-"|%s| FileHash |%s|"
-msgstr[1] ""
-"Encontrada parte corrompida (%d) no ficheiro de %d partes %s - "
-"FileResultHash |%s| FileHash |%s|"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "Download HTTP cancelado"
 
-#: src/PartFile.cpp:1181
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Encontrada parte completa (%i) em %s"
+msgid "Unable to create destination file %s for download!"
+msgstr "Não é possível criar o ficheiro de destino %s para o download!"
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Terminado a regeneração da chave de %s"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "O URL para download não pode estar vazio"
 
-#: src/PartFile.cpp:2239
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Erro inesperado ao completar %s. ficheiro em pausa"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "O URL %s devolveu: %i - Erro (%i)!"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Transferência concluída: %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Erro crítico durante a escrita do ficheiro recebido"
 
-#: src/PartFile.cpp:2323
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Deleting file: %s"
-msgstr "A eliminar o ficheiro: %s"
+msgid "Downloaded %d bytes"
+msgstr "%d bytes transferidos"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"AVISO: Não é possível calcular a chave de uma parte recebida - conjunto de "
-"chaves incompleto para '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Esperavam-se %d bytes, mas foram transferidos %d"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"ERRO: Impossível calcular a chave de uma parte recebida - conjunto de chaves "
-"incompleto (%s). Isto nunca deveria acontecer."
+"URL inválido para download HTTP ou redirecção HTTP (esqueceu-se do "
+"'http://' ?)"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "AVISO: Espaço livre em disco insuficiente! A pausar o ficheiro: %s"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "Impossível ligar ao servidor HTTP"
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Parte recebida %i está corrompida no ficheiro: %s"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Resposta inválida do servidor HTTP"
 
-#: src/PartFile.cpp:3214
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Recuperada parte corrompida %i para %s -> bytes guardados: %s"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Transferir novo GeoIP.dat a partir de %s"
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "A atribuir"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Espaço em disco insuficiente"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Parado"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "Transferência do ficheiro GeoIP.dat falhou, a abortar actualização."
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Transferido"
-
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ERRO: Falhou ao abrir ficheiro de partes '%s'"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "AVISO: known.met não pode ser aberto."
+msgid "Failed to remove %s file, aborting update."
+msgstr "Falhou ao remover ficheiro %s, a cancelar actualização."
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr ""
-"AVISO: Lista de ficheiros conhecidos corrompida, contém cabeçalho inválido."
-
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Erro de entrada/saída ao ler ficheiro known.met: %s"
+msgid "Failed to rename %s file, aborting update."
+msgstr "Falhou ao mudar o nome do ficheiro %s, a cancelar actualização."
 
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Erro ao gravar ficheiro known.met: %s"
+msgid "Successfully updated %s"
+msgstr "%s actualizado com sucesso"
 
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Encontrado %i ficheiro partilhado conhecido"
-msgstr[1] "Encontrados %i ficheiros partilhados conhecidos"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Erro ao actualizar o GeoIP.dat"
 
-#: src/SharedFileList.cpp:358
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Encontrado %i ficheiro partilhado conhecido, %i desconhecido"
-msgstr[1] "Encontrados %i ficheiros partilhados conhecidos, %i desconhecidos"
+msgid "Failed to download %s from %s"
+msgstr "Falhou a transferência do %s de %s"
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ERRO: Tentado partilhar %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Comentários do ficheiro"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Classificação"
+msgid "Failed to load country data for '%s'."
+msgstr "Falha ao carregar dados de país para '%s'."
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Comentário"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Sem comentários"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "A carregar os filtros de IPs 'ipfilter.dat' e 'ipfilter_static.dat'."
 
-#: src/CommentDialogLst.cpp:104
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u comentário"
-msgstr[1] "%u comentários"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
-"Ligação a servidores ofuscados falhou. A tentar de novo, sem ofuscação."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Falha ao ligar a todos os servidores listados. A tentar novamente."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "Rede eD2K desactivada nas preferências, a ligação não vai ser feita."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Não há servidores válidos para ligar na lista de servidores"
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Ligado a %s (%s:%i)"
+"Erro ao carregar o ficheiro ipfilter.dat '%s', formato desconhecido "
+"encontrado."
 
-#: src/ServerConnect.cpp:263
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Ligação estabelecida a: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
-"Erro Fatal durante tentativa de ligação. Talvez a sua ligação à Internet "
-"tenha caído."
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Perdida a ligação a %s (%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) parece estar morto."
+"Erro ao carregar o ficheiro ipfilter.dat '%s', não foi possível abrir o "
+"ficheiro."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) parece estar cheio."
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "%u intervalo IP carregado de '%s'."
+msgstr[1] "%u intervalos IP carregados de '%s'."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Ligação automática ao servidor irá repetir-se em %d segundo"
-msgstr[1] "Ligação automática ao servidor irá repetir-se em %d segundos"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Ligação perdida"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u linha defeituosa foi ignorada."
+msgstr[1] "%u linhas defeituosas foram ignoradas."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "A Ligação a %s (%s:%i) falhou."
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Falhou ao mudar o nome ao novo ficheiro %s, a cancelar actualização."
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ERRO: Socket inválido durante a verificacão"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "O filtro de IPs está pronto"
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "A tentativa de ligação a %s (%s:%i) expirou."
-
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-"ERRO: Falha ao carregar ficheiro de backup. Procure em http://forum.amule."
-"org por soluções para recuperação de .part.met."
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Nenhum ficheiro de partes (.part) encontrado"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Encontrado %u ficheiro de partes"
-msgstr[1] "Encontrados %u ficheiros de partes"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
-"O sistema de ficheiros da pasta de ficheiros temporários não suporta "
-"ficheiros grandes."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"O sistema de ficheiros da pasta de ficheiros completos não suporta ficheiros "
-"grandes"
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "A transferir %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Já está a tentar obter o ficheiro '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Já possui o ficheiro '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Já está a tentar transferir o ficheiro %s"
+"Arrancar a partir de \n"
+"clientes conhecidos"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Conversão de ligação magnet para eD2k não pode ser feita: %s"
+msgid "Nodes (%u)"
+msgstr "Nós (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Protocolo do link desconhecido: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Endereço IP inválido para arranque"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Ligação eD2k inválida! ERRO: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Porto inválido para arranque"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Executar <exp> e sair."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Por favor, preencha todos os campos pedidos"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Formato de IP inválido. Use xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Tem a certeza que deseja transferir um novo ficheiro nodes.dat?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Este comando requer um argumento. Argumentos válidos: 'all', nome de "
-"ficheiro, ou um número.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "A processar por chave: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "A processar por ficheiro: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Este comando requer um argumento. Argumentos válidos: uma chave de "
-"ficheiro.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Número inválido\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Não é uma chave válida (o comprimento deveria ser de 32 caracteres)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Operação com sucesso."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Falha no pedido com o seguinte erro: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Filtro de IP para clientes está %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "Desactivado"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "Activado"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Filtro para servidores está %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "O nível actual do filtro de IPs é %d.\n"
+"Ao fazê-lo, irá remover os seus nós actuais e reiniciar a ligação à Kademlia."
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Limites de banda: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Continuar?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: palavra-chave de pesquisa demasiado curta"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Ligado a %s %s %s"
+msgid "Keyword for search: %s"
+msgstr "Palavra-chave para pesquisa: %s"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "com LowID"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "com HighID"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: A palavra-chave de pesquisa já está na lista de pesquisa: "
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "A ligar"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Não ligado"
-
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
-msgstr ""
-"\n"
-"Download:\t%s"
-
-#: src/TextClient.cpp:726
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Upload:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Upload:\t%s"
+"Falha ao ler o ficheiro nodes.dat - demasiado antigo. Esta versão (0) já não "
+"é suportada."
 
-#: src/TextClient.cpp:729
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Clientes em espera:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Lido %u contacto Kad"
+msgstr[1] "Lidos %u contactos Kad"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Total de fontes:\t%d\n"
+"Não foram encontrados contactos. Por favor inicialize ou transfira um "
+"ficheiro nodes.dat."
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Número de resultados: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "A FAZER - mostrar o progresso de uma pesquisa"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Apenas %d contacto Kad disponível, nodes.dat não escrito"
+msgstr[1] "Apenas %d contactos Kad disponíveis, nodes.dat não escrito"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Recebida resposta desconhecida do servidor, instrução %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Mostrar informação curta de estado."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Mostrar estado da ligação, velocidade de transferência actual, etc.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Mostrar a árvore de estatísticas completa."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Escrito %d contacto Kad"
+msgstr[1] "Escritos %d contactos Kad"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Opcionalmente, um número no intervalo 0-255 pode ser passado como parâmetro "
-"a este\n"
-"comando, que diz quantas entradas das sub-árvores de versão do cliente devem "
-"ser\n"
-"exibidas. Passar 0 ou omitir significa 'ilimitado'.\n"
-"\n"
-"Exemplo: 'statistics 5' exibirá apenas as 5 versões de topo para cada tipo "
-"de cliente.\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Nome de ficheiro"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Terminar o aMule"
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Tamanho do Ficheiro"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Desligar o núcleo remoto em execução (amule/amuled).\n"
-"O cliente de texto também será desligado, uma vez que é inútil sem um\n"
-"núcleo em execução.\n"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Razão de partilha"
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Recarrega o objecto dado."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Enviado"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Recarrega a lista de ficheiros partilhados."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Pedido"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Recarrega a tabela de filtros de IP a partir do ficheiro."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Aceite"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Religar à rede."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Fontes completas"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Isto irá ligar a todas as redes activadas nas Preferências.\n"
-"Pode também especificar opcionalmente um endereço de servidor na forma IP:"
-"Porto, para\n"
-"ligar apenas a esse servidor. O endereço IP deve ser na forma IPv4 ou um\n"
-"nome resolúvel por DNS."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Ligar apenas à eD2k."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Ligar apenas à Kad"
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Desligar da rede."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Isto desligará de todas as redes actualmente ligadas.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Desligar apenas da eD2k"
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Desligar apenas da Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Adiciona uma ligação eD2k ou magnet ao núcleo."
+"AVISO: Lista de ficheiros conhecidos corrompida, contém cabeçalho inválido."
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"A ligação eD2k a ser adicionada pode ser:\n"
-"*) uma ligação de ficheiro (ed2k://|file|...), será adicionado à lista dos \n"
-"ficheiros a serem transferidos,\n"
-"*) uma ligação de servidor (ed2k://|server|...), será adicionado à lista \n"
-"dos servidores,\n"
-"*) ou uma ligação para uma lista de servidores, todos dos quais \n"
-"serão adicionados à lista dos servidores \n"
-"A ligação magnet tem de conter a chave eD2k e o tamanho do ficheiro.\n"
+"Falhou ao carregar entrada na lista de ficheiros conhecidos, o ficheiro pode "
+"estar corrompido"
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Definir um valor de preferência."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Definir preferências de filtros de IP."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Activar o filtro de IPs para servidores e clientes."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Desactivar o filtro de IPs para clientes e servidores."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Activar/Desactivar filtro de IPs para clientes."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Activar filtro de IPs para clientes."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Desactivar filtro de IPs para clientes."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Activar/Desactivar filtro de IPs para servidores."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Activar filtro de IPs para servidores."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Desactivar filtro de IPs para servidores."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Seleccionar nível de filtragem de IPs."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Níveis de filtragem válidos pertencem ao intervalo 0-255 e\n"
-"o valor padrão (inicial) é 127.\n"
+"Entrada inválida na lista de ficheiros conhecidos, o ficheiro pode estar "
+"corrompido"
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Definir limites de largura de banda."
+#: src/libs/common/Format.cpp:307
+#, c-format
+msgid "Unknown error %d"
+msgstr "Erro desconhecido %d"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "O valor dado nestes comandos deve ser em kilobytes/s.\n"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Impossível obter descrição para o erro %d"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Definir limite de largura de banda de upload."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "A gerar chave"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Definir limite de largura de banda de download."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "A completar"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Obter e exibir um valor de preferência."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Completo"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Obter preferências de filtragem de IP."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Em Pausa"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Obter estado do filtro de IPs para clientes e servidores."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Erróneo"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Obter estado do filtro de IPs para clientes."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Em Espera"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Obter estado do filtro de IPs para servidores."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Deve especificar uma palavra-passe não vazia."
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Obter nível de filtragem de IP."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Palavra-passe inválida, não é uma chave MD5!"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Obter limites de largura de banda."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Falha de ligação"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Faz uma pesquisa."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "Ligação LE falhou. Resposta vazia."
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
-"O tipo de pesquisa tem de ser definido com um tipo:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Exemplo: 'search kad file' fará uma pesquisa por \"file\" \n"
-
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Faz uma pesquisa global."
+"Ligação Externa: Má resposta, negociação inicial falhou. Ligação fechada."
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Faz uma pesquisa local"
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Faz uma pesquisa na Kad"
-
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Mostra os resultados da última pesquisa."
-
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Mostra os resultados da pesquisa anterior.\n"
-
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Apresenta o progresso da pesquisa."
-
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Apresenta o progresso de uma pesquisa.\n"
-
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Começar a transferir um ficheiro"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Sucesso! Ligação estabelecida com o aMule "
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"O número do ficheiro da última pesquisa tem de ser especificado.\n"
-"Exemplo: 'download 12' iniciará o download do ficheiro com o número 12 da "
-"última pesquisa.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Sucesso! Ligação estabelecida."
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Pausar download."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Ligação Externa: Acesso negado porque: "
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Continuar download."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Ligação Externa: Negociação inicial falhou."
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "ListenSocket: Ok."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Cancelar download."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "ERRO: Não é possível escutar o porto TCP."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Estabelecer a prioridade."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "ERRO: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Estabelecer a prioridade como Baixa, Normal, Alta ou Automática.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "AVISO: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Estabelecer a prioridade como Baixa."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Fechar"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Estabelecer a prioridade como Normal."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Cortar"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Estabelecer a prioridade como Alta."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Copiar"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Estabelecer a prioridade como Automática."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Colar"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Mostrar filas/listas."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Limpar"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Mostra as filas de upload/download, listas de servidores ou ficheiros "
-"partilhados.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Seleccionar tudo"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Mostrar fila de saída."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Mostrar fila de entrada."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Ilimitado"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Mostrar o relatório."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Menu de Área de Notificação do aMule"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Mostrar lista de servidores."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Limites de velocidade:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Apagar o relatório."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "UL: Nenhum"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Comando obsoleto, passe a usar '%s'."
+msgid "UL: %u"
+msgstr "UL: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Este é um comando obsoleto, e poderá ser retirado no futuro.\n"
-"Passe a usar '%s'.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DL: Nenhum"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ERRO: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "DL: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "AVISO: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Velocidade de Download: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "O novo identificador de cliente é %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "AVISO: Recebeu LowID!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr ""
-"\tMuito provavelmente, isto deve-se ao facto de estar por detrás de uma "
-"firewall ou router."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tPara mais informação, por favor consulte http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Velocidade de Upload: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Recebida informação do servidor desconhecida! - demasiado curta"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Informação do cliente"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Recebido %d novo servidor"
-msgstr[1] "Recebidos %d novos servidores"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Gravação da lista de servidores completa."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "O servidor rejeitou o último comando"
+msgid "Nickname: %s"
+msgstr "Alcunha: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Pacote mal formado recebido do servidor: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Nenhuma Alcunha seleccionada!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Erro não tratado ao processar pacote do servidor: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID do cliente: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr ""
-"Não é possível criar o processo leve de resolução de nomes para ligar a %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Não ligado"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "O endereço IP do servidor %s (%s) está filtrado. Não irá ligar."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Nome do servidor: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "a utilizar ofuscação do protocolo."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP do servidor: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "A ligar a %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Não Ligado"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Não é possível resolver o nome do servidor %s: Incapaz de ligar!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Carregamento dos dados do país falhou de "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Foi carregada a imagem de %d bandeira."
-msgstr[1] "Foram carregadas %d imagens de bandeiras."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Tem a certeza que deseja cancelar e apagar todos os ficheiros desta "
-"categoria?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Confirmação Necessária"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Todos os outros"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Incompleto"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Activo"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Vídeo"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Áudio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Arquivo"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Imagens de CDs"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Fotografias"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Texto"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Seleccione o filtro de exibição"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Adicionar categoria"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Editar categoria"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Remover categoria"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Nome de ficheiro"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Tamanho do Ficheiro"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Razão de partilha"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Enviado"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Pedido"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Aceite"
+msgid "TCP port: %d"
+msgstr "Porto TCP: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Fontes completas"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "Porto TCP: Não preparado"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "A importar %s: %s"
+msgid "UDP port: %d"
+msgstr "Porto UDP: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "A ler pasta de temporários"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "Porto UDP: Não preparado"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "A obter informação básica do ficheiro de informação de download"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Assinatura Online: Activada"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "A criar ficheiro de destino"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Assinatura Online: Desactivada"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "A carregar dados a partir do ficheiro de download antigo (%u de %u)"
+msgid "Uptime: %s"
+msgstr "Tempo de funcionamento: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "A gravar bloco de dados no novo ficheiro único (%u de %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "A obter informação de ficheiro de fontes"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "A adicionar download e a gravar novo ficheiro de partes"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importar ficheiros de partes"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Estado"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Chave de ficheiro"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "A aguardar..."
+msgid "Shared files: %d"
+msgstr "Ficheiros partilhados: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disco: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Por favor escolha uma pasta para localizar downloads incompletos! (subpastas "
-"serão incluídas)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"Deseja que os ficheiros de origem dos downloads importados com sucesso sejam "
-"removidos?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Remover fontes?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/seg"
-msgstr[1] "bytes/seg"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "segundos"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "minutos"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "horas"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Dias"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Vídeos"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Arquivos"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Textos"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programas"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Qualquer"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Não avaliado"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Inválido / Corrompido / Falso"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Mau"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Razoável"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Bom"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Excelente"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "todos"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "todos os outros"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "A carregar os filtros de IP 'ipfilter.dat' e 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Clientes em espera: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr ""
-"Erro ao carregar o ficheiro ipfilter.dat '%s', formato desconhecido "
-"encontrado."
+msgid "Total DL: %s"
+msgstr "Total DL: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Erro ao carregar o ficheiro ipfilter.dat '%s', não foi possível abrir o "
-"ficheiro."
+msgid "Total UL: %s"
+msgstr "Total UL: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "%u intervalo IP carregado de '%s'."
-msgstr[1] "%u intervalos IP carregados de '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Limite de Upload"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u linha defeituosa foi ignorada"
-msgstr[1] "%u linhas defeituosas foram ignoradas"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Limite de Download"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Ligações activas (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Esconder"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Detalhes do ficheiro"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Mostrar"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% terminado"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Sair"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "Ligação eD2k: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Adicionar"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Clique aqui para adicionar a ligação eD2k (na caixa de texto) à sua lista de "
 "downloads."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4588,27 +2714,31 @@
 "Os eventos são mostrados aqui. Para uma lista completa de eventos, consulte "
 "o relatório no separador Servidores."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "A carregar..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Número de utilizadores ligados a este servidor..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Utilizadores: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr ""
-"Utilizadores ligados ao servidor actual e um estimativa do número total "
-"deutilizadores."
+"Utilizadores ligados ao servidor actual e um estimativa do número total de "
+"utilizadores."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Up: 0.0 | Down: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4616,7 +2746,7 @@
 "Médias de entrada e saída actuais. Se activado, os números entre parêntesis "
 "representam a sobrecarga da comunicação do cliente."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4628,517 +2758,572 @@
 "tem LowID (atrás de firewall) e setas verdes significam que tem HighID (o "
 "tipo de ligação óptimo)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Desligado..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Servidor a que está ligado."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Pesquisar"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tipo"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Local"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Global"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Chave de Ficheiro"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
-msgstr "Parâmetros extendidos"
+msgstr "Parâmetros estendidos"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtragem"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Tipo de Ficheiro"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Qualquer"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Arquivos"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Áudio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Imagens de CDs"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Fotografias"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programas"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Textos"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Vídeos"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Extensão"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Tamanho Mínimo"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "kB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Tamanho Máximo"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Disponibilidade"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Filtrar Resultados"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Inverter Resultados"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Esconder Ficheiros Conhecidos"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Iniciar"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Mais"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Pesquisa mais resultados na eD2k. Ainda não funciona para a Kad."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Parar"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Download"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Limpar campos"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Resultados"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Limpa os downloads concluídos"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Mostra Uploads / fila de espera de uploads"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Clientes na lista de espera :"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Fontes de ficheiros:"
 
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Enviar"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Envia a mensagem especificada."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Fechar"
-
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Fechar esta conversa."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Geral"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Nome completo :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/D"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "Ficheiro de servidores conhecidos :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Chave :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Tamanho do ficheiro :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Estado do ficheiro de partes :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Última vez visto completo :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Transferência"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
-msgstr "Fontes encontradas:"
+msgstr "Fontes encontradas :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
-msgstr "Fontes em transferência:"
+msgstr "Fontes em transferência :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
-msgstr "Contagem de partes: "
+msgstr "Contagem de partes :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Disponíveis :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Taxa de transferência :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Tempo de Download Activo: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Transferido :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Tamanho Completo :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Manipulação Inteligente de Corrupção (M.I.C.)"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Perdido por corrupção :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Ganho por compressão :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
-msgstr "Pacotes recuperados por M.I.C.:"
+msgstr "Pacotes recuperados por M.I.C. :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Nomes de ficheiros"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Assumir"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Limpar"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Aplicar"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Comentar/Avaliar ficheiro (Texto será visível a todos os utilizadores)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Para um filme, pode dizer a duração, idioma, enredo ...\n"
-"e se for falso, poderá transmiti-lo aos outros utilizadores."
+"Para um filme pode dizer a sua duração, enredo, idioma ...\\n\\ne se for um "
+"ficheiro falso, pode transmiti-lo aos outros utilizadores."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Qualidade do Ficheiro"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Não avaliado"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Inválido / Corrompido / Falso"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Mau"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Razoável"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Bom"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Excelente"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Escolha a classificação ou avise os utilizadores se o ficheiro for "
 "inválido..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "A transferir, por favor aguarde ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Tamanho desconhecido"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Informação Necessária"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "Endereço IP :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Porto :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Informações adicionais"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Utilizador :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Chave de utilizador :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Recarregar os seus ficheiros partilhados"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Sessão actual"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Total"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Pedidos :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Uploads activos :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Adicionar"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Velocidade de Download"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Actual"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Média actual"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Média da sessão"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Velocidade de Upload"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Ligações"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Downloads activos"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Ligações activas (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Uploads activos"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Árvore de Estatísticas"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Utilizador:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Chave de utilizador:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Programa cliente:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Versão do cliente:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "Endereço IP:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID do utilizador:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP do servidor:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Nome do servidor:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
-msgstr "Ofuscação"
+msgstr "Ofuscação:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "A transferir"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Pedidos actuais:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Taxa média de upload:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Taxa média de download:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Enviado (sessão):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Recebido (sessão) :"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Enviado (total):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Recebido (total):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Pontuações"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Modificador DL/UL:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Identificação segura:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Classificação (total):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Pontuação na fila de espera:"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Pontuação na fila de espera:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Alcunha"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - a Mula do Linux"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - a Mula multi-plataforma"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Este é o nome que os outros utilizadores verão ao ligar-se a si."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Idioma"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Idioma: "
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "O tempo que decorre até serem mostradas as dicas."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Especifica o idioma usado nos controlos."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Opções diversas"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Verificar nova versão no arranque"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr "Ao activar, fará o aMule procurar por uma nova versão no arranque"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Iniciar minimizado"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Quando activado, o aMule minimiza automaticamente no arranque."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Confirmar fecho do programa"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Faz com que o aMule peça confirmação de saída."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "Faz com que o aMule peça uma confirmação ao sair."
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Activar o ícone da área de notificação"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Activa/desactiva o ícone da área de notificação (ou barra de tarefas)."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Minimizar para a área de notificação"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5146,288 +3331,216 @@
 "Se activar isto o aMule vai minimizar para a área de notificação em vez de "
 "para a barra de tarefas."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Atraso de exibição de dicas em segundos"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Atraso de exibição de dicas: "
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "O tempo que decorre até serem mostradas as dicas."
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "segundos"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Selecção de Navegador"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Predefinição de Sistema"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Seleccione o seu navegador"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Navegador personalizado:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Insira o nome do seu navegador. Para usar o navegador personalizado, "
-"seleccione o item Personalizado do menu acima."
+"Indique aqui o nome do seu browser. Deixe este campo em branco para utilizar "
+"o browser por omissão do sistema."
+
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Procurar"
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Abrir num novo separador se possível"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Abrir a página num novo separador em vez de uma nova janela, quando possível"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Leitor de vídeo"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Criar cópia de segurança para pré-visualização"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Limites de largura de banda"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Upload"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Atribuição de Ligações"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Porto TCP padrão do cliente:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Portos"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Porto TCP Padrão "
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
-msgstr "Este é o porto por omissão da eD2k e não pode ser desactivado."
+msgstr "Este é o porto da eD2k por omissão e não pode ser desactivado."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Porto UDP extendido do cliente:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "Porto UDP para pedidos ao servidor (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr "Este porto UDP é usado para pedidos extendidos eD2k e para a rede Kad"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Porto UDP estendido (Kad / pesquisa global) "
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "desactivar"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr "Este porto UDP é usado para pedidos eD2k estendidos e para a rede Kad"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Associar ao Endereço"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Porto UDP para pedidos de servidor extendidos (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Máximo de fontes por ficheiro"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Activar UPnP para encaminhamento de portos no router"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Limite máximo"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "Porto TCP UPnP (Opcional):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Limites de ligação"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Máximo de ligações"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Associar endereço local ao IP (em branco para qualquer um):"
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Apenas para utilizadores avançados: Se possui múltiplos interfaces de rede "
+"indique o endereço do interface que o aMule deve usar."
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Máximo de fontes por ficheiro:"
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Máximo de ligações simultâneas:"
+
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Activar UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Porto TCP UPnP:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Ligar automaticamente no arranque"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Voltar a ligar se perder ligação"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Mostrar sobrecarga na largura de banda"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Opções de servidores"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Remover servidores inactivos após"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "tentativas"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Auto-actualizar lista de servidores no arranque"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Actualizar a lista de servidores quando se liga a um servidor"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Actualizar a lista de servidores quando um cliente se liga"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Usar o sistema de prioridades"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Usar verificação inteligente de LowID ao ligar"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Ligação segura"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Apenas ligar automaticamente a servidores estáticos"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Atribuir alta prioridade a servidores adicionados manualmente"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "M.I.C. activo"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH confia em todas as chaves (não recomendado)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Manipulação Inteligente de Corrupção (M.I.C.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Activar"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "M.I.C. Avançada confia em todas as chaves (não recomendado)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Adicionar ficheiros para transferir em modo de pausa"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Adicionar ficheiros para transferir com prioridade automática"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Tentar receber primeiro o início e o final dos ficheiros"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Adicionar novos ficheiros partilhados com prioridade automática"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Tentar enviar partes inteiras nos uploads"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Ao terminar um ficheiro iniciar o próximo em pausa"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Iniciar o próximo ficheiro em pausa quando um ficheiro completa"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Da mesma categoria"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Guardar 10 fontes para ficheiros raros (< 20 fontes)"
-
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Espaço em disco"
-
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Verificar espaço em disco"
-
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "Seleccione se quiser que o aMule verifique o espaço em disco"
-
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Espaço mínimo em disco:"
-
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
-msgstr "Insira o espaço mínimo no disco desejado."
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "Em ordem alfabética"
 
-#: src/muuli_wdr.cpp:2077
+#: src/muuli_wdr.cpp:1811
 msgid "Preallocate disk space for new files"
 msgstr "Reservar previamente espaço em disco para novos ficheiros"
 
-#: src/muuli_wdr.cpp:2078
+#: src/muuli_wdr.cpp:1812
 msgid ""
 "For new files preallocates disk space for the whole file, thus reduces "
 "fragmentation"
@@ -5435,375 +3548,369 @@
 "Para novos ficheiros, reserva o espaço em disco para o ficheiro completo, "
 "reduzindo assim a fragmentação"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Completos"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Temporários"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Partilhados"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Parar os downloads quando o espaço livre em disco atinge "
+
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Seleccione se quiser que o aMule verifique o espaço em disco"
+
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
+msgstr "Insira o espaço mínimo no disco desejado."
+
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Guardar 10 fontes para ficheiros raros (< 20 fontes)"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Uploads"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Adicionar novos ficheiros partilhados com prioridade automática"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Pasta de destino para downloads"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Pasta para ficheiros temporários"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Pastas partilhadas"
+
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 "(Clique com o botão do lado direito no ícone da pasta para partilha "
 "recursiva)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Partilhar ficheiros ocultos"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Gráficos"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Atraso de actualização: 5 segundos"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Tempo para gráfico de média: 100 minutos"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Escala do Gráfico de Ligações: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Seleccionar as Cores das Estatísticas"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Escala do gráfico de download:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Escala do gráfico de upload"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Cores: "
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Fundo"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Grelha"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Download actual"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Média actual de download"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Média de download da sessão"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Upload actual"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Média actual de upload"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Média de upload da sessão"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Ligações activas"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Barra de velocidade no ícone da área de notificação"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Nós Kad actuais"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Nós Kad a executar"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Nós Kad da sessão"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Seleccionar"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Árvore"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Número de Versões de Cliente mostradas (0=ilimitado)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Capacidades da Ligação"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Nota: estes valores são usados apenas nas estatísticas."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! AVISO !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"A menos que saiba o que está a fazer, não\n"
-"altere estas preferências. Caso contrário, \n"
-"pode facilmente piorar a sua situação.\n"
-"\n"
-"O aMule correrá perfeitamente sem ajustar qualquer\n"
-"uma destas opções."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Preferências Avançadas"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Máximo de novas ligações / 5 segundos"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Tamanho da memória temporária de ficheiro: 240000 Byte"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Tamanho da Lista de Espera de Upload: 5000 clientes"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Intervalo de actualização da ligação ao servidor: Desactivado"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Progresso na Fila de Espera dos Downloads"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Mostrar percentagem"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Desactivar o modo de espera temporizado do computador"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Tema a utilizar: "
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Mostrar a barra de adição rápida de ligações eD2k em todas as janelas."
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Mostrar barra de progresso"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
+msgstr "Mostrar informação extra nos separadores de categorias"
+
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Mostrar velocidades de transferência na barra de título"
+
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Mostrar velocidades de transferência na barra de título"
+
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Antes do nome da aplicação"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Depois do nome da aplicação"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Mostrar sobrecarga na largura de banda"
+
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Orientação vertical da barra de ferramentas"
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Estilo da barra de progresso"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "Mostrar bandeiras de países para clientes"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Ficheiros na Fila de Espera dos Downloads"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Mostrar percentagem de progresso"
+
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Mostrar barra de progresso"
 
-#: src/muuli_wdr.cpp:2351
+#: src/muuli_wdr.cpp:2144
 msgid "Flat"
 msgstr "Plana"
 
-#: src/muuli_wdr.cpp:2354
+#: src/muuli_wdr.cpp:2150
 msgid "Round"
 msgstr "Arredondada"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Suporte de temas"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Activar supporte de temas"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Tema:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- Nenhum tema disponível"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Ordenação da coluna"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Ordenar ficheiros automaticamente (pode consumir muito CPU)"
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr ""
-"Ordenar automaticamente os ficheiros na fila de transferência (processador "
-"rápido)"
-
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp:2157
 msgid "aMule will sort the columns in your download list automatically"
 msgstr ""
 "O aMule ordenará as colunas na sua lista de transferências automaticamente"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Ajustes de interface diversos"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Mostrar barra de adição rápida de ligações eD2k"
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "Parâmetros de Ligação Externa"
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
-msgstr "Mostrar informação extra nos separadores de categorias"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "Aceitar ligações externas"
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "Mostrar velocidades de transferência na barra de título"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP da interface a escutar:"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Orientação vertical da barra de ferramentas"
+#: src/muuli_wdr.cpp:2190
+msgid ""
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
+msgstr ""
+"Insira um endereço IP válido no formato a.b.c.d para a interface que irá "
+"aguardar as LE. Um campo vazio ou 0.0.0.0 significará qualquer interface."
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Mostrar o número do ficheiro parcial antes do nome do ficheiro"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "Porto TCP:"
 
-#: src/muuli_wdr.cpp:2434
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
+msgstr "Activar UPnP para configuração do encaminhamento no porto das LE"
+
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Palavra-passe"
+
+#: src/muuli_wdr.cpp:2221
 msgid "Web server parameters"
 msgstr "Parâmetros do servidor web"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
 msgstr "Executar o servidor web no arranque"
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Porto do servidor web"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr ""
-"Activar UPnP para configuração do encaminhamento no porto do servidor web"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Porto TCP UPnP do servidor web"
-
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Taxa de Actualização de Páginas (em segundos)"
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Aspecto da página web"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Activar compressão Gzip"
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Palavra-passe para controlo total"
 
-#: src/muuli_wdr.cpp:2477
+#: src/muuli_wdr.cpp:2243
 msgid "Enable Low rights User"
 msgstr "Activar utilizador com permissões reduzidas"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Palavra-passe para controlo total"
-
-#: src/muuli_wdr.cpp:2490
+#: src/muuli_wdr.cpp:2249
 msgid "Low rights password"
 msgstr "Palavra-passe para controlo reduzido"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Aspecto da página web"
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Activar UPnP para encaminhamento do porto do servidor web"
 
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "Parâmetros de Ligação Externa"
-
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "Aceitar ligações externas"
-
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"IP da interface do servidor\n"
-"(deixe em branco para qualquer um)"
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Porto TCP UPnP do servidor web (Opcional)"
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
-msgstr ""
-"Insira um endereço IP válido no formato a.b.c.d para a interface que irá "
-"aguardar as LE. Um campo vazio ou 0.0.0.0 significará qualquer interface."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Taxa de Actualização de Páginas (em segundos)"
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Porto TCP"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Activar compressão Gzip"
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
-msgstr "Activar UPnP para configuração do encaminhamento no porto das LE"
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Clique aqui para aplicar as alterações efectuadas nas preferências."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
-msgstr "Anular as alterações efectuadas nas preferências"
+msgstr "Anular as alterações efectuadas nas preferências."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Título :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Comentário :"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Pasta de completos :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Trocar prioridade nos novos ficheiros :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
-msgstr "Não trocar"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
+msgstr "Não mudar"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Seleccionar a cor para a categoria seleccionada :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Exibir a mensagem do dia ao ligar ao servidor..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Informações do Servidor"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Limpar"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Clique para limpar o relatório."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Relatório"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 "Clique neste botão para actualizar a lista de servidores a partir do "
 "endereço ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Lista de Servidores"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5811,43 +3918,55 @@
 "Insira a localização de um ficheiro server.met e pressione o botão à "
 "esquerda para actualizar a lista de servidores conhecidos."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Adicionar servidor manualmente: Nome"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Insira o nome do novo servidor"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Porto"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Insira o IP do servidor, usando o formato x.x.x.x."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Insira o porto do servidor."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Adicionar manualmente um servidor (preencher os campos ao lado) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Relatório"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Informações do Servidor"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "Informação ED2K"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Informação Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Clique para actualizar a lista de nós a partir do endereço ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nós (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5855,51 +3974,55 @@
 "Insira o endereço de um ficheiro nodes.dat e pressione o botão à esquerda "
 "para actualizar a lista de nós conhecidos."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Estado dos nós"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Inicialização"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Novo nó"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Porto:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Arrancar a partir de \n"
-"clientes conhecidos"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Arrancar a partir de clientes conhecidos"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Desligar Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "Informação eD2k"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Utilizar Identificação Segura de Utilizador"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"É recomendado activar esta opção. Não receberá créditos se a Identificação "
+"Segura de Utilizador não estiver activada."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
-msgstr "Ofuscação do protocolo"
+msgstr "Ofuscação do Protocolo"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Suportar a Ofuscação do Protocolo"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5907,11 +4030,11 @@
 "Esta opção activa a Ofuscação do Protocolo e faz com que o aMule aceite "
 "ligações ofuscadas de outros clientes."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Usar ofuscação em ligações para o exterior"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5919,11 +4042,11 @@
 "Esta opção faz com que o aMule use a Ofuscação do Protocolo quando ligado a "
 "outros clientes/servidores."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Aceitar apenas ligações ofuscadas"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5931,86 +4054,82 @@
 "Esta opção faz com que o aMUle aceite apenas ligações ofuscadas. Terá menos "
 "fontes, mas todo o tráfego será ofuscado"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Opções de ficheiros"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Todos"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Ninguém"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Quem pode ver os ficheiros partilhados:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Quem pode ver os meus ficheiros partilhados:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Seleccione quem pode pedir a lista dos seus ficheiros partilhados."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Filtragem de IP"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtrar clientes"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Activar filtragem por IPs dos clientes definidos no ficheiro ~/.aMule/"
-"ipfilter.dat"
+"ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtrar servidores"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Activar filtragem da lista de IPs definida no ficheiro ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Recarregar a lista"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 "Recarregar a lista de IPs a filtrar a partir do ficheiro ~/.aMule/ipfilter."
 "dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Actualizar agora"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Actualizar o filtro de IPs automaticamente no arranque"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Nível de filtragem:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Filtrar sempre endereços IP de rede local"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Tratamento paranóico de IPs sem correspondência"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6018,35 +4137,23 @@
 "Rejeitar pacotes se o IP do cliente é diferente do IP de onde o pacote é "
 "recebido. Usar com cautela."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Utilizar ipfilter.dat global do sistema se disponível"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
 msgstr ""
 "Se não existir um ficheiro ipfilter.dat, permitir a utilização de um "
-"ficheiro ipfilter global do sistema"
-
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Utilizar Identificação Segura de Utilizador"
+"ficheiro ipfilter global do sistema."
 
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"É recomendado activar esta opção. Não receberá creditos se a Identificação "
-"Segura de Utilizador) não estiver activada."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Activar Assinatura Online"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6054,852 +4161,1309 @@
 "Activa a escrita do ficheiro da AO, o qual pode ser usado por aplicações "
 "externas para criar assinaturas e afins."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Frequência de Actualização (segundos):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 "Alterar a frequência (em segundos) das actualizações da assinatura Online."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Pasta de Assinatura Online:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Gravar a assinatura Online em: "
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "Clique para seleccionar a pasta que contém os ficheiros de Assinatura Online"
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Desactivar/Activar"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtrar mensagens recebidas (excepto da conversa corrente):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Opções de filtragem:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtrar todas as mensagens"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtrar mensagens de utilizadores que não pertençam à lista de amigos"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtrar mensagens de clientes desconhecidos"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtrar mensagens que contenham (usar ',' como separador):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "adicione as palavras que o aMule deve filtrar e bloquear as mensagens que as "
-"contenham."
+"contenham"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Mostrar mensagens recebidas no relatório"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Comentários"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Filtrar comentários que contenham (usar ',' como separador):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Ligação ao servidor automática sem proxy"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Activar autenticação"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Activar/desactivar autenticação utilizador/palavra-passe"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Utilizador: "
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "O nome de utilizador para ligar ao proxy"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Palavra-passe:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "A palavra-passe a usar para ligar ao proxy"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Activar Proxy"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Activar/desactivar o suporte de proxy"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Tipo de proxy:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "O tipo de proxy ao qual está a ligar-se"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Servidor:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "O nome da máquina proxy"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Porto do proxy:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "O porto do proxy"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Autenticação"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Activar autenticação"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Activar/desactivar autenticação utilizador/palavra-passe"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "O nome de utilizador para ligar ao proxy"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Palavra-passe:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "A palavra-passe a usar para ligar ao proxy"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Ligação ao servidor automática sem proxy"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Ligar a:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Autenticação remota"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Nome de utilizador"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Lembrar estas preferências"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Activar Relatório detalhado para Depuração."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Categorias de Mensagens:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "A aguardar..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Adicionar importações"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Reassumir seleccionados"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Remover seleccionados"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "Tipos de eventos"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+"Estatísticas e clientes em espera para o(s) ficheiro(s) seleccionado(s) : "
+"Sessão / Desde sempre"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Uploads Activos"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "Percentagem dos ficheiros totais"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Todos os ficheiros"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Ficheiros seleccionados"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Apenas os uploads activos"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Mostrar Clientes para"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Recarregar:"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Recarregar os seus ficheiros partilhados"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Enviar"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Envia a mensagem especificada."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Fechar esta conversa."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Ligar a qualquer servidor e/ou Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Janela de Redes"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Ficheiros Partilhados"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Janela de Pesquisas"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Desactivado [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Janela de Transferências"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Janela de Ficheiros Partilhados"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Janela de Mensagens"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Janela de Estatísticas"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Janela de Preferências"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nova Categoria"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Seleccione uma pasta de ficheiros completos"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Deve especificar um nome para a categoria!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/seg"
+msgstr[1] "bytes/seg"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Deve especificar um caminho para a category!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"Erro ao criar pasta de entrada para categoria. Por favor, especifique um "
-"caminho válido!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "segundos"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "minutos"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "horas"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Dias"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "todos"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "todos os outros"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Incompleto"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Parado"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Vídeo"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Arquivo"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Texto"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Activo"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Extensão '%s' desconhecida para o comando '%s'.\n"
+msgid "Using config dir: %s"
+msgstr "A utilizar pasta de configuração: %s"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "À espera que o programa de conversão do ficheiro de partes termine..."
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Comando '%s' desconhecido.\n"
+msgid "Importing %s: %s"
+msgstr "A importar %s: %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Este comando não pode ter um argumento.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "A ler pasta de temporários"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Este comando deve ter um argumento.\n"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "A obter informação básica do ficheiro de informação de download"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "A criar ficheiro de destino"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "A carregar dados a partir do ficheiro de download antigo (%u de %u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "A gravar bloco de dados no novo ficheiro único (%u de %u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "A obter informação de ficheiro de fontes"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "A adicionar download e a gravar novo ficheiro de partes"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Importar ficheiros de partes"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Estado"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Chave de ficheiro"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Disco: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Este comando está incompleto, deve usar uma das extensões abaixo.\n"
+"Por favor escolha uma pasta para localizar downloads incompletos! (subpastas "
+"serão incluídas)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Extensões disponíveis:\n"
+"Deseja que os ficheiros de origem dos downloads importados com sucesso sejam "
+"removidos?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Comandos disponíveis:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Remover fontes?"
+
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "ERRO: falha na criação do ficheiro de partes"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Todos os comandos não consideram a capitalização das letras.\n"
-"Escreva '%s <comando>' para obter mais detalhes sobre <comando>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "A tentar carregar a cópia de segurança do ficheiro met de %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Sai do programa."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "ERRO: Falha ao abrir o ficheiro part.met: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Mostrar ajuda."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "ERRO: O ficheiro part.met está vazio: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "ERRO: Versão inválida no ficheiro part.met: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Para obter ajuda num comando, escreva 'help <comando>'.\n"
-"Para obter a lista completa de comandos escreva 'help'.\n"
+"Erro: %s (%s) está corrompido (elementos incorrectos: %s), não é possível "
+"carregar o ficheiro."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Use '%s' para a lista de comandos\n"
-"\n"
+"ERRO: %s (%s) está corrompido (contagem de elementos errada), não é possível "
+"carregar o ficheiro."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Erro de sintaxe!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "A tentar recuperar a informação do ficheiro..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"Erro ao processar o comando - nunca deveria acontecer! Por favor, comunique "
-"o erro\n"
+"A recuperar ficheiro sem nome - tentar-se-á recuperá-lo como 'RecoveredFile."
+"dat'"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Este comando não deveria ter quaisquer parâmetros."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+"Recuperada toda a informação disponível do ficheiro :D - A tentar usá-la..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Este comando deve ter um parâmetro."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Não é possível recuperar a informação do ficheiro :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Argumento inválido."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Falha ao abrir %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Este comando está incompleto."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "AVISO: %s parece estar corrompido (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Escreva '%s' para obter mais ajuda.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "ERRO ao gravar ficheiro parcial: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "Falha ao gravar ficheiro parcial: "
+
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Isto é %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Não foi possível obter o tamanho de '%s' - a usar o ficheiro %s."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Isto é %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' está vazio - a usar o ficheiro %s."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Erro ao gravar o ficheiro 'part.met.seeds' para %s"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Gravada %i semente de fontes para o ficheiro de partes: %s (%s)"
+msgstr[1] "Gravadas %i sementes de fontes para o ficheiro de partes: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "O ficheiro de partes %s (%s) não tem ficheiro de sementes"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "O ficheiro de partes %s (%s) tem um ficheiro de sementes indefinido"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Erro ao ler o ficheiro de sementes de ficheiro de partes (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Encontrada parte corrompida (%d) no ficheiro de %d parte %s - FileResultHash "
+"|%s| FileHash |%s|"
+msgstr[1] ""
+"Encontrada parte corrompida (%d) no ficheiro de %d partes %s - "
+"FileResultHash |%s| FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Encontrada parte completa (%i) em %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Terminado a regeneração da chave de %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Erro inesperado ao completar %s. ficheiro em pausa"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Transferência concluída: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "A eliminar o ficheiro: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"A criar o cliente...\n"
+"AVISO: Não é possível calcular a chave de uma parte recebida - conjunto de "
+"chaves incompleto para '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"OK, a sair %s...\n"
+"ERRO: Impossível calcular a chave de uma parte recebida - conjunto de chaves "
+"incompleto (%s). Isto nunca deveria acontecer"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Não é possível ligar com uma palavra-chave vazia.\n"
-"Deve especificar uma palavra-chave no ficheiro de configuração\n"
-"ou na linha de comandos, ou insira uma quando lhe for pedida.\n"
-"\n"
-"A sair...\n"
+"EOF ao gerar a chave da parte transferida %u de comprimento %u (máximo %u) "
+"do ficheiro de partes '%s' com comprimento %u: %s"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Mostra esta ajuda."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "AVISO: Espaço livre em disco insuficiente! A pausar o ficheiro: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Máquina onde o aMule está a ser executado. (predefinida: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Parte recebida %i está corrompida no ficheiro: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Porto do aMule para Ligação Externa. (predefinido: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Recuperada parte corrompida %i para %s -> bytes guardados: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Palavra-passe de Ligação Externa."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "A atribuir"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Ler a configuração a partir do ficheiro."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Espaço em disco insuficiente"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Não mostrar qualquer mensagem para a saída padrão."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Transferido"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Detalhado - mostrar também mensagens de depuração"
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "ERRO: Falhou ao abrir ficheiro de partes '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Define a localização do programa (idioma)."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Predefinição do sistema"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr ""
-"Escrever as opções da linha de comandos para o ficheiro de configuração."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albanês"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Árabe"
+
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturiano"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Basco"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Búlgaro"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Catalão"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Chinês (Simplificado)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Chinês (Tradicional)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Croata"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Checo"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Dinamarquês"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Holandês"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Inglês"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estoniano"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finlandês"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Francês"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galego"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Alemão"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Grego"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebreu"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Húngaro"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italiano"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italiano (Suíço)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japonês"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Coreano"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norueguês (Nynorsk)"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polaco"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Português"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Português (Brasil)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Russo"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Esloveno"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Espanhol"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Sueco"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turco"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ucraniano"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Alterar Idioma"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
 msgstr ""
-"Cria ficheiro de configuração baseado no ficheiro de configuração do aMule."
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Mostrar a versão do programa."
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "Indisponível"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "sem opções disponíveis"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Categoria inválida encontrada, a ignorar"
 
-#: src/ClientCreditsList.cpp:168
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr ""
+"O porto TCP não pode ser superior a 65532 porque o socket UDP do servidor "
+"tem de ser TCP+3"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Ficheiro de créditos carregado, %u cliente conhecido"
-msgstr[1] "Ficheiro de créditos carregado, %u clientes conhecidos"
+msgid "Default port will be used (%d)"
+msgstr "O porto predefinido será usado (%d)"
 
-#: src/ClientCreditsList.cpp:171
+#: src/Preferences.cpp:1790
 #, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Os créditos expiraram para %u cliente!"
-msgstr[1] " - Os créditos expiraram para %u clientes!"
+msgid "Dropping non-existing shared directory: %s"
+msgstr "A ignorar pasta partilhada inexistente: %s"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Ficheiro 'cryptkey.dat' não encontrado, a criar."
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Ligação"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Directórios"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Servidores"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Ficheiros"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Segurança"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Interface"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Filtros"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Controlos remotos"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Assinatura Online"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Avançado"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Eventos"
 
-#: src/amuled.cpp:594
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Depuração"
+
+#: src/PrefsUnifiedDlg.cpp:249
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
-"ERRO: o daemon do aMule não pode ser usado quando as ligações externas estão "
-"desactivadas. Para activar as Ligações Externas, use um aMule normal, inicie "
-"o amuled com a opção --ec-config ou mude a chave \"AcceptExternalConnections"
-"\" para 1 no ficheiro ~/.aMule/amule.conf"
+"As seguintes variáveis serão substituídas:\n"
+"    %PARTFILE - caminho completo do ficheiro\n"
+"    %PARTNAME - apenas o nome do ficheiro"
 
-#: src/amuled.cpp:750
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"A menos que saiba o que está a fazer, não\n"
+"altere estas preferências. Caso contrário, \n"
+"pode facilmente piorar a sua situação.\n"
+"\n"
+"O aMule correrá perfeitamente sem ajustar qualquer\n"
+"uma destas opções."
+
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "ERROR: %s"
-msgstr "ERRO: %s"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Falhou ao ligar Cfg ao widget com o ID %d e chave %s"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Remover Ban"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Mostrar Uploads"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Mostrar a Lista de Espera"
-
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Mostrar Clientes"
-
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Seleccionar a Vista"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Programa Cliente"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Esperou"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Tempo de Upload"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Upload/Download"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Estado remoto"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Prioridade do ficheiro"
-
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Pontuação"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr "Falhou ao transferir dados do Cfg para o Widget com o ID %d e chave %s"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Pedido"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "O tipo de proxy ao qual está a ligar-se"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Última vez visto"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Entrou na Lista de Espera"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr "Falhou ao transferir dados do Widget para o Cfg com o ID %d e chave %s"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Estado do Upload"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"O aMule tem de ser reiniciado para activar estas alterações:\n"
+"\n"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Enviado"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- Porto TCP alterado.\n"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Estado do Download"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- Porto UDP alterado.\n"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Recebido"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Chave de Utilizador"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Cifrado"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Esconder ficheiros partilhados"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- Porta para ligações externas alterada.\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- Alterada a aceitação de ligações externas.\n"
+
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- Alterada interface para ligações externas.\n"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Detalhes do Cliente"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"A sua lista de actualização automática de servidores está vazia.\n"
+"A 'actualização automática no arranque' será desactivada."
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Activado"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Activou as ligações externas mas não especificou uma palavra-passe.\n"
+"As ligações externas não podem ser activadas a menos que seja especificada "
+"uma palavra-passe válida."
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Suportado"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- O idioma foi alterado.\n"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Não suportado"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- A pasta Temp foi alterada.\n"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Desactivado"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- Rede ED2K activada.\n"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"As redes eD2K e Kad estão desactivados.\n"
+"Não vai conseguir uma ligação até activar pelo menos uma deles."
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Incompleto"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"A Kad não vai funcionar se o porto UDP estiver desactivado.\n"
+"Active o porto UDP ou desactive a Kad."
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Pessoa Maldosa"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"DEVE reiniciar o aMule agora.\n"
+"Se não o fizer, não se queixe se algo grave acontecer.\n"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Verificado - OK"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"A sua lista de actualização automática de servidores está vazia.\n"
+"Por favor, indique pelo menos uma localização que aponte para um ficheiro "
+"server.met válido.\n"
+"Clique no botão \"Lista\" para inserir uma localização."
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Indisponível"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Ficheiros temporários"
 
-#: src/ClientDetailDialog.cpp:215
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Ficheiros recebidos"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Assinaturas Online"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+msgid "Choose a folder for %s"
+msgstr "Seleccione uma pasta para %s"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr ""
-"O Tamanho mínimo tem de ser menor que o tamanho máximo. Tamanho máximo "
-"ignorado"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Procurar leitor de vídeo"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Aviso de pesquisa"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Seleccionar navegador"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Ilimitado"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "Executável%s"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Menu de Área de Notificação do aMule"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Editar a lista de servidores"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Limites de velocidade:"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Adicione localizações para obter ficheiros server.met\n"
+"Apenas uma localização por linha."
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "UL: Nenhum"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Intervalo de actualização: %d segundo"
+msgstr[1] "Intervalo de actualização: %d segundos"
 
-#: src/MuleTrayIcon.cpp:354
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "UL: %u"
-msgstr "UL: %u"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Tempo para o gráfico de média: %d minuto"
+msgstr[1] "Tempo para o gráfico de média: %d minutos"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DL: Nenhum"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Escala do Gráfico de Ligações: %d"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "DL: %u"
-msgstr "DL: %u"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Tamanho de memória temporária de ficheiros: %d byte"
+msgstr[1] "Tamanho de memória temporária de ficheiros: %d bytes"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Velocidade de Download: %.1f"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Tamanho da fila de espera de upload: %d cliente"
+msgstr[1] "Tamanho da fila de espera de upload: %d clientes"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Velocidade de Upload: %.1f"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Intervalo de actualização de ligação ao servidor: %d minuto"
+msgstr[1] "Intervalo de actualização de ligação ao servidor: %d minutos"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Informação do cliente"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Intervalo de actualização de ligação ao servidor: Desactivado"
+
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "desactivado"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "Nickname: %s"
-msgstr "Alcunha: %s"
+msgid "Execute command on '%s' event"
+msgstr "Executar o comando quando ocorrer o evento '%s'"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Nenhuma Alcunha seleccionada!"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Activar execução de comandos no núcleo"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID do cliente: "
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Comando de núcleo:"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Nome do servidor: "
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Activar execução de comando na interface gráfica"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP do servidor: "
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Comando da interface gráfica:"
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "As seguintes variáveis serão substituídas:"
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
-msgstr "Porto TCP: %d"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+"O Tamanho mínimo tem de ser menor que o tamanho máximo. Tamanho máximo "
+"ignorado."
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "Porto TCP: Não preparado"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Aviso de pesquisa"
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
-msgstr "Porto UDP: %d"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Principal"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "Porto UDP: Não preparado"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Não é possível pesquisar na Kad se não estiver ligado à rede Kad"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Assinatura Online: Activada"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "Não é possível pesquisar na eD2k se não estiver ligado à rede eD2k"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Assinatura Online: Desactivada"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Erro inesperado enquanto tentava pesquisar na Kad: "
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
-msgstr "Ficheiros partilhados: %d"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "ID do Ficheiro"
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
-msgstr "Clientes em espera: %d"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Ficheiro"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Transferir para a categoria"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/SearchListCtrl.cpp:639
 #, c-format
-msgid "Total DL: %s"
-msgstr "Total DL: %s"
+msgid "Get %s for this file"
+msgstr "Obter %s para este ficheiro"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Procurar ficheiros relacionados (eD2k, servidor local)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Marcar como ficheiro conhecido"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Copiar ligação eD2k para a área de transferência"
+
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Cancelado"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Novo"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Ligação a servidores ofuscados falhou. A tentar de novo, sem ofuscação."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Falha ao ligar a todos os servidores listados. A tentar novamente."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "Rede eD2K desactivada nas preferências, a ligação não vai ser feita."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "Não há servidores válidos para ligar na lista de servidores"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "Total UL: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Ligado a %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Limite de Upload"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Ligação estabelecida a: %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Limite de Download"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Erro Fatal durante tentativa de ligação. A ligação à Internet pode ter caído"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Esconder"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Perdida a ligação a %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Mostrar"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) parece estar morto."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Sessão de Conversa Iniciada: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) parece estar cheio."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Ligado ao Cliente ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Ligação automática ao servidor irá repetir-se em %d segundo"
+msgstr[1] "Ligação automática ao servidor irá repetir-se em %d segundos"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** A Ligar ao Cliente ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Ligação perdida"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Erro na ligação ao cliente / Ligação perdida ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "A Ligação a %s (%s:%i) falhou."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Fechar o separador"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "ERRO: Socket inválido durante a verificação"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Fechar todos os separadores"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "A tentativa de ligação a %s (%s:%i) expirou."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Fechar os outros separadores"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Recebido resultado tardio para pedido DNS, a descartar."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "A carregar o ficheiro server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Ficheiro server.met não encontrado!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Falha ao carregar o ficheiro server.met '%s', formato desconhecido "
 "encontrado."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Falha ao abrir server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Ficheiro server.met corrompido, versão inválida encontrada: 0x%x, tamanho %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "Foi encontrado %i servidor no server.met"
 msgstr[1] "Foram encontrados %i servidores no server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d servidor adicionado"
 msgstr[1] "%d servidores adicionados"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Erro: o ficheiro 'server.met' está corrompido: "
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "Erro de entrada/saída ao ler o ficheiro 'known.met': "
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Servidor não adicionado: [%s:%d] não especifica um porto válido."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Servidor não adicionado: O IP de [%s:%d] está filtrado ou é inválido."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Servidor não adicionado: Servidor com IP:Porto correspondente [%s:%d] "
 "encontrado na lista."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Servidor adicionado: Servidor em [%s:%d] a usar o nome '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6907,25 +5471,25 @@
 "Está ligado ao servidor que está a tentar remover. Por favor, desligue-se "
 "primeiro."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Erro ao abrir '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Falha ao gravar server.met!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "URL inválido"
 
-#: src/ServerList.cpp:805
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Finished to download the server list from %s"
+msgid "Finished downloading the server list from %s"
 msgstr "Terminou a transferência da lista de servidores de %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Erro ao obter a lista de servidores a partir de %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6934,334 +5498,2458 @@
 "indique um endereço correcto neste ficheiro para a auto-actualização da "
 "lista de servidores"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Iniciar transferência de lista de servidores de %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "AVISO: URL especificado inválido para a actualização automática de "
 "servidores: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 "Não há nenhuma localização válida para download automático do server.met em "
 "addresses.dat"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Erro ao obter a lista de servidores a partir de %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr ""
 "Servidor local filtrado pelo Filtro de IPs, a ligar a um servidor diferente!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "A execução do comando `%s' no evento `%s' falhou."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Nome do Servidor"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Endereço"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Porto"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Descrição"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Utilizadores"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Estático"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versão"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"O seu idioma foi alterado para a predefinição do sistema devido a uma "
-"mudança de configuração. Desculpe."
+"Encontra-se ligado a um servidor que está a tentar remover. Por favor, "
+"desligue-se primeiro. O servidor NÃO foi removido."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Nome desconhecido)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Tem a certeza que deseja eliminar o servidor estático %s"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Servidores (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Servidor"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Ligar ao servidor"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Marcar o servidor como estático"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Marcar o servidor como não estático"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Marcar os servidores como estáticos"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Marcar os servidores como não estáticos"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Remover o servidor"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Remover os servidores"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Remover todos os servidores"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Copiar ligações eD2k para a área de transferência"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Voltar a ligar ao servidor"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Tem a certeza que deseja eliminar todos os servidores?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Tem a certeza que deseja eliminar o servidor seleccionado?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Tem a certeza que deseja eliminar os servidores seleccionados?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "ERRO: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "AVISO: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "O novo identificador de cliente é %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "AVISO: Recebeu LowID!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
-"Não tem nenhum servidor na lista de servidores.\n"
-"Quer que o aMule faça o download de uma lista nova agora?"
+"\tMuito provavelmente, isto deve-se ao facto de estar por detrás de uma "
+"firewall ou router."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "A fazer download da lista de servidores"
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tPara mais informação, por favor consulte http://wiki.amule.org"
 
-#: src/amule.cpp:846
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Recebida informação do servidor desconhecida! - demasiado curta"
+
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "web server running on pid %d"
-msgstr "servidor web a executar no pid %d"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Recebido %d novo servidor"
+msgstr[1] "Recebidos %d novos servidores"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Gravação da lista de servidores completa."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "O servidor rejeitou o último comando"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Pacote mal formado recebido do servidor: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Erro não tratado ao processar pacote do servidor: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
-"Pediu para executar o servidor web no arranque, mas o executável não pode "
-"ser lançado. Por favor, instale o pacote que contém o servidor web ou "
-"compile o o aMule com --enable-webserver e execute make install"
+"Não é possível criar o processo leve de resolução de nomes para ligar a %s"
 
-#: src/amule.cpp:937
+#: src/ServerSocket.cpp:725
 #, 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"
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "O endereço IP do servidor %s (%s) está filtrado. Não irá ligar."
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "a utilizar ofuscação do protocolo."
+
+#: src/ServerSocket.cpp:744
 #, 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"
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "A ligar a %s (%s - %s:%i) %s"
 
-#: src/amule.cpp:970
+#: src/ServerSocket.cpp:757
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Não é possível resolver o nome do servidor %s: Incapaz de ligar!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Servidor não adicionado: IP ou nome de máquina não especificado."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Servidor não adicionado: Porto de servidor especificado inválido."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Estado da eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Estado da Kademlia:"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "A correr no modo LAN"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "A Executar"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Estado:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Estado da Ligação:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Atrás de firewall - abra o porto TCP %d no seu router ou firewall"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "Estado da Ligação UDP:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Atrás de firewall - abra o porto UDP %d no seu router ou firewall"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Estado da firewall: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Não é necessário um parceiro - porto TCP aberto"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Não é necessário um parceiro - porto UDP aberto"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Sem parceiro"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "A ligar a um parceiro"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Ligado a parceiro em %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Fontes indexadas:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Palavras-chave indexadas:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Notas indexadas:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Carga indexada:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Média de Utilizadores:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Média de Ficheiros:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Parado"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "A adicionar ficheiro %s à partilha"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Encontrado %i ficheiro partilhado conhecido"
+msgstr[1] "Encontrados %i ficheiros partilhados conhecidos"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Encontrado %i ficheiro partilhado conhecido, %i desconhecido"
+msgstr[1] "Encontrados %i ficheiros partilhados conhecidos, %i desconhecidos"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "ERRO: Tentado partilhar %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Pasta partilhada não encontrada, a ignorar: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Não foram encontrados ficheiros partilhados no directório: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Nome de Utilizador"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Velocidade de Download"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Velocidade de Upload"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Partes Disponíveis"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+msgid "Upload Status"
+msgstr "Estado do Upload"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Estado do Download"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Origem"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Nome do Ficheiro Local"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+msgid "Shares File List"
+msgstr "Partilha a Lista de Ficheiros"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Pedidos"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Pedidos Aceites"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Dados Transferidos"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Grau de Partilha"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Partes Obtidas"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Fontes Completas"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Caminho da Pasta"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Adicionar Comentário/Avaliação"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Editar Comentário/Avaliação"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Renomear"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Adicionar ficheiros na colecção à lista de transferências"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Copiar &URI magnet para a área de transferência"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Copiar ligação eD2k para a área de transferência (&Fonte)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
-"O porto %u não está disponível!\n"
-"\n"
-"Isto significa que ficará com LOWID.\n"
-"\n"
-"Verifique a sua rede para se certificar de que o porto está aberto para "
-"leitura e escrita."
+"Copiar ligação eD2k para a área de transferência (Fonte) (Com opções C&rypt)"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Erro ao criar o ficheiro da Assinatura Online"
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Copiar ligação eD2k para a área de transferência (&Hostname)"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Erro a criar o ficheiro da Assinatura Online do aMule"
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+"Copiar ligação eD2k para a área de transferência (Hostname) (Com opções "
+"Cr&ypt)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Copiar ligação eD2k para a área de transferência (informação &AICH)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Necessita de HighID para criar uma ligação de fonte válida"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Ficheiros Partilhados (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[FicheiroPart]"
+
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Nome do Ficheiro Remoto"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Dados Enviados (Sessão (Total)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Sobrecarga Total (Pacotes): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Sobrecarga de Pedidos de Ficheiro (Pacotes): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Sobrecarga de Trocas de Fontes (Pacotes): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Sobrecarga do Servidor (Pacotes): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Sobrecarga na Kad (Pacotes): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Sobrecarga criptográfica (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Uploads Activos: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Uploads Em Espera: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Total de sessões de upload com sucesso: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Total de sessões de upload falhadas: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Tempo médio de envio: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Dados recebidos (Sessão (Total)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Fontes Encontradas: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Downloads activos (blocos): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Razão UL:DL da sessão (Total): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Taxa média de download (Sessão): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Taxa média de upload (Sessão): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Taxa máxima de download (Sessão): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Taxa máxima de upload (Sessão): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Religações: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Tempo Desde a Primeira Transferência: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Ligado Ao Servidor Desde: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Ligações Activas (estimativa): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Limite Máximo de Ligações Alcançado: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Média de Ligações (estimativa): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Pico de Ligações (estimativa): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Clientes"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Desconhecido: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Filtrados: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Banidos: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Total: %i Conhecidos: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Servidores Activos: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Servidores Falhados: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Total: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Servidores Removidos: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Servidores Filtrados: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Utilizadores em Servidores Activos: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Ficheiros em Servidores Activos: %llu"
 
-#: src/amule.cpp:1299
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Total de Utilizadores: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Total de Ficheiros: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Ocupação dos Servidores: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Número de Ficheiros Partilhados: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Tamanho total dos Ficheiros Partilhados: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Tamanho médio dos ficheiros: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Sistema Operativo"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Não recebido"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Ligações activas (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Indisponível"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Nunca"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Comando '%s' com pid '%d' terminou com o código '%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Executar <exp> e sair."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Formato de IP inválido. Use xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"O idioma seleccionado parece não estar instalado no seu computador. (Nota: "
-"de qualquer das formas, irei tentar activá-lo)."
+"Este comando requer um argumento. Argumentos válidos: 'all', nome de "
+"ficheiro, ou um número.\n"
 
-#: src/amule.cpp:1308
-#, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Esta é a primeira vez que executa o aMule %s"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "A processar por chave: "
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Esta é uma versão de testes actualizada diariamente e\n"
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "A processar por ficheiro: "
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
-"não há qualquer garantia de que não irá partir nada, pegar fogo à sua casa,\n"
+"Este comando requer um argumento. Argumentos válidos: uma chave de "
+"ficheiro.\n"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "ou matar o seu cão. Mas, *em princípio*, deverá ser seguro usá-lo.\n"
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Número inválido\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Não é uma chave válida (o comprimento deveria ser de 32 caracteres)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "O pedido falhou com um erro desconhecido."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Operação com sucesso."
+
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
+msgstr "Falha no pedido com o seguinte erro: %s"
+
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Filtro de IP para clientes está %s.\n"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "Desactivado"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "Activado"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Filtro para servidores está %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "O nível actual do filtro de IPs é %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Limites de banda: Up: %u kB/s, Down: %u kB/s.\n"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Ligado a %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "A ligar"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "atrás de uma firewall"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"As seguintes opções foram mudadas nesta distribuição por motivos de "
-"segurança:\n"
+"\n"
+"Download:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Activada a Ofuscação do Protocolo para todas as ligações de entrada e "
-"saída.\n"
+"Upload:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Desactivada a actualização da lista de servidores de outros servidores e "
-"clientes.\n"
+"Clientes em espera:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Para mais informação acerca da razão para estas mudanças, procure\n"
-"informação no wiki do aMule em http://wiki.amule.org sobre \"fake servers"
-"\".\n"
-"É importante que remova todos os servidores falsos da sua lista para que o "
-"aMule funcione correctamente."
+"Total de fontes:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Número de resultados: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Progresso da pesquisa: %u %% \n"
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Progresso da pesquisa indisponível"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Recebida resposta desconhecida do servidor, instrução %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Mostrar informação curta de estado."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Mostrar estado da ligação, velocidade de transferência actual, etc.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Mostrar a árvore de estatísticas completa."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
 msgstr ""
+"Opcionalmente, um número no intervalo 0-255 pode ser passado como parâmetro "
+"a este\n"
+"comando, que diz quantas entradas das sub-árvores de versão do cliente devem "
+"ser\n"
+"exibidas. Passar 0 ou omitir significa 'ilimitado'.\n"
 "\n"
+"Exemplo: 'statistics 5' exibirá apenas as 5 versões de topo para cada tipo "
+"de cliente.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Terminar o aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Desligar o núcleo remoto em execução (amule/amuled).\n"
+"O cliente de texto também será desligado, uma vez que é inútil sem um\n"
+"núcleo em execução.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Recarrega o objecto."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Recarrega a lista de ficheiros partilhados."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "Recarrega a tabela de filtros de IP a partir do ficheiro."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Recarrega a tabela de filtros de IPs actual."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "Actualiza a tabela de filtros de IPs a partir do URL."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "Se o URL for omitido, será utilizado o URL nas preferências."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Religar à rede."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Isto irá ligar a todas as redes activadas nas Preferências.\n"
+"Pode também especificar opcionalmente um endereço de servidor na forma IP:"
+"Porto, para\n"
+"ligar apenas a esse servidor. O endereço IP deve ser na forma IPv4 ou um\n"
+"nome resolúvel por DNS."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Ligar apenas à eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Ligar apenas à Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Desligar da rede."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Isto desligará de todas as redes actualmente ligadas.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Desligar apenas da eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Desligar apenas da Kad."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Adiciona uma ligação eD2k ou ligação magnet ao núcleo."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
-"Adicionalmente, as definições sobre o navegador foram repostas para a "
-"predefinição do sistema. Por favor configure as suas opções do navegador de "
-"novo, caso seja necessário.\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"A ligação eD2k a ser adicionada pode ser:\n"
+"*) uma ligação de ficheiro (ed2k://|file|...), será adicionado à lista dos \n"
+"ficheiros a serem transferidos,\n"
+"*) uma ligação de servidor (ed2k://|server|...), será adicionado à lista \n"
+"dos servidores,\n"
+"*) ou uma ligação para uma lista de servidores, todos dos quais \n"
+"serão adicionados à lista dos servidores \n"
+"A ligação magnet tem de conter a chave eD2k e o tamanho do ficheiro.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
-msgstr "Mais informação, suporte e novos lançamentos na nossa página,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Definir um valor de preferência."
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "em www.amule.org ou no canal de IRC #aMule em irc.freenode.net.\n"
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "Definir preferências do filtro de IPs."
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Esteja à vontade para comunicar erros para http://forum.amule.org"
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Activar o filtro de IPs para servidores e clientes."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Desactivar o filtro de IPs para clientes e servidores."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Activar/Desactivar filtro de IPs para clientes."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Activar filtro de IPs para clientes."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Desactivar filtro de IPs para clientes."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Activar/Desactivar filtro de IPs para servidores."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Activar filtro de IPs para servidores."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Desactivar filtro de IPs para servidores."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Seleccionar nível de filtragem de IPs."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
+msgstr ""
+"Níveis de filtragem válidos pertencem ao intervalo 0-255 e\n"
+"o valor padrão (inicial) é 127.\n"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Definir limites de largura de banda."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "O valor dado nestes comandos deve ser em kilobytes/s.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Definir limite de largura de banda de upload."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Definir limite de largura de banda de download."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Obter e exibir um valor de preferência."
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "Obter preferências do filtro de IPs."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Obter estado do filtro de IPs para clientes e servidores."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Obter estado do filtro de IPs para clientes."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Obter estado do filtro de IPs para servidores."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "Obter nível de filtragem de IPs."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Obter limites de largura de banda."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Faz uma pesquisa."
+
+#: src/TextClient.cpp:914
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"A pasta para os ficheiros da Assinatura Online é INVÁLIDA!\n"
-" A Assinatura Online será DESACTIVADA até que resolva a situação nas "
-"preferências."
+"O tipo de pesquisa tem de ser definido com um tipo:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Exemplo: 'search kad file' fará uma pesquisa por \"file\" \n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Faz uma pesquisa global."
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Faz uma pesquisa local"
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Faz uma pesquisa na Kad"
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Mostra os resultados da última pesquisa."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Mostra os resultados da pesquisa anterior.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Apresenta o progresso da pesquisa."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Apresenta o progresso de uma pesquisa.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Começar a transferir um ficheiro"
+
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
+"O número do ficheiro da última pesquisa tem de ser especificado.\n"
+"Exemplo: 'download 12' iniciará o download do ficheiro com o número 12 da "
+"última pesquisa.\n"
+
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Pausar download."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Continuar download."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Cancelar download."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Estabelecer a prioridade."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Estabelecer a prioridade como Baixa, Normal, Alta ou Automática.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Estabelecer a prioridade como Baixa."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Estabelecer a prioridade como Normal."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Estabelecer a prioridade como Alta."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Estabelecer a prioridade como Automática."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Mostrar filas/listas."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Mostra as filas de upload/download, listas de servidores ou ficheiros "
+"partilhados.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Mostrar fila de saída."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Mostrar fila de entrada."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Mostrar o relatório."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Mostrar lista de servidores."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Apagar o relatório."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Reserva de espaço em disco para o ficheiro '%s' falhou: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Comando obsoleto, passe a usar '%s'."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "ERRO: não é possível abrir o ficheiro de relatório"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Este é um comando obsoleto, e poderá ser retirado no futuro.\n"
+"Passe a usar '%s'.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "AVISO: o ficheiro de relatório está vazio. Algo está mal."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Cliente de texto do aMule"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "O relatório foi limpo"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Conversão de grupos de chaves AICH antigas em '%s' para 64b em '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Mensagem do servidor: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "AVISO: O nome do ficheiro '%s' é invalido e foi mudado para '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Falha ao transferir a lista de nós."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"AVISO: O ficheiro '%s' já existe, o novo ficheiro tem agora o nome '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Falha ao abrir o ficheiro de verificação de versão transferido"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Tem a certeza que deseja cancelar e apagar todos os ficheiros desta "
+"categoria?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Ficheiro de verificação de versão corrompido"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Confirmação Necessária"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Está a usar uma versão antiga do aMule!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "Só são suportadas 99 categorias"
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "Demasiadas categorias!"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Todos os outros"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Seleccione o filtro de exibição"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Adicionar categoria"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Editar categoria"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Remover categoria"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "A sua versão do aMule é %i.%i.%i e a última versão é %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+"Falha ao abrir ficheiro (%s), a remover da lista de ficheiros partilhados."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "A última versão pode ser sempre encontrada em http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Conjunto de chaves pedido para ficheiro desconhecido: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "A continuar uploads do ficheiro: %s"
+
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "A suspender upload do ficheiro: %s"
+
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "A execução do comando `%s' no evento `%s' falhou."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Download concluído"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "O caminho completo para o ficheiro."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "O nome do ficheiro sem a parte do caminho."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "A chave eD2k do ficheiro."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "O tamanho do ficheiro em bytes."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Tempo cumulativo de download."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Nova sessão de conversa iniciada"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Remetente de mensagem."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Falta de espaço"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Partição de disco."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Erro ao completar"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
+msgstr "A processar o ficheiro número %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Requisitou chaves parciais (Usado apenas para ficheiros > 9.5 MB)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
+#, c-format
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Ficheiro inexistente!\n"
+
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, o criador de ligações eD2k do aMule"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Bem-vindo!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Parâmetros de entrada"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Ficheiro para gerar chave"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Adicionar URLs Opcionais para este ficheiro"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Indique aqui o ficheiro para o qual deseja obter o link eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
-"AVISO: A sua versão do aMuled está desactualizada: %i.%i.%i < %li.%li.%li"
+"Indique aqui o URL onde pretende adicionar a ligação eD2k: Adicione / ao fim "
+"para permitir que o aLinkCreator acrescente o nome de ficheiro actual"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "A sua cópia do aMule está actualizada."
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Remover"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Falha ao transferir o ficheiro de verificação de versão"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Criar a ligação com chaves de partes"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Ajudar a espalhar ficheiros novos e raros mais rapidamente, com o custo de "
+"um maior tamanho da ligação"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Chave MD4 do ficheiro"
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "Chave eD2k do ficheiro"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "Ligação eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Gravar"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Copiar para a área de transferência"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Abrir"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Abrir um ficheiro para calcular a sua ligação eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Copiar ligação eD2k calculada para a área de transferência"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Gravar como"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Gravar a ligação eD2k calculada para um ficheiro"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Acerca do aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Seleccione o ficheiro para o qual pretende criar a ligação eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Não é possível abrir a área de transferência"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Nada a copiar por agora!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Seleccione o ficheiro para guardar a sua ligação eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Não é possível abrir "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Por favor, insira um nome de ficheiro"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Nada a gravar por agora!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, o criador de ligações eD2k do aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps de http://www.everaldo.com e http://www.icomania.com\n"
+"e http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distribuído sob a licença GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "A gerar chaves..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "O aLinkCreator está a trabalhar"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "A calcular chave MD4..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "A calcular chave eD2k..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Cancelado !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Utilizadores: %s | Ficheiros: %s"
+msgid "Done in %.2f s"
+msgstr "Concluído em %.2f s"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Já adicionou este URL!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Por favor, insira um URL"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Utilizadores: E: %s K: %s | Ficheiros: E: %s K: %s"
+msgid "Unable to open %s"
+msgstr "Não é possível abrir %s"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Não foram seleccionadas redes"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i dia(s) %i hora(s) %i minuto(s) %i segundo(s)"
 
-#: src/amule.cpp:2102
+#: src/utils/wxCas/src/onlinesig.cpp:234
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Ligado a %s %s"
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02um %02us"
 
-#: src/amule.cpp:2105
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "Connecting to %s"
-msgstr "A ligar a %s"
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02um %02us"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Desligado da eD2k"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02um %02us"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad iniciada."
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad parada."
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Ligado à Kad (ok)"
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f kB"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Ligado à Kad (atrás de firewall)"
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Desligado da Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, Estatísticas Online do aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Taxa máxima de download desde que o wxCas está em execução"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr ""
+"Taxa absoluta de download máxima durante as execuções anteriores do wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistema"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Parar Actualização Automática"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Gravar imagem das Estatísticas Online"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Imprimir a imagem de Estatísticas Online"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Definição de preferências"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Acerca do wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Iniciar a Actualização Automática"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Actualização Automática parada"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Actualização automática iniciada"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Gravar a Imagem de Estatísticas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Estatísticas Online do aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"A rede Kad não pode ser usada se o porto UDP estiver desactivado nas "
-"preferências, inicialização não efectuada."
+"Ocorreu um erro ao imprimir.\n"
+"Talvez a sua impressora actual não esteja bem configurada."
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Rede Kad desligada nas preferências, a ligação não será efectuada."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "A imprimir"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
-"Erro ao abrir o ficheiro de lista de amigos 'emfriends.met' para leitura!"
+"wxCas, Estatísticas de Assinatura Online do aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Baseado no CAS por Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distribuído sob a licença GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh Oh, o aMule não esta em execução..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "O aMule está em execução"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "O aMule está a funcionar mas está desligado"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "O aMule está a ligar..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh Oh, o estado do aMule é desconhecido..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " está em execução há "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " está parado !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " não está ligado !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " está a ligar..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " está a fazer algo estranho, verifique!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " está ligado a "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "parado"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " está em "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr "com "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Download Total: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Upload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Download na Sessão: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Download: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Upload: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr "kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "A partilhar: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " ficheiro(s). Clientes na fila de espera: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Hora: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " no "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Média de carga do sistema (1-5-15 minutos): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Tempo de funcionamento do sistema: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Pasta que contém o ficheiro amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Insira a pasta onde se encontra o seu ficheiro amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Intervalo de actualização em segundos"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Gerar uma imagem das estatísticas a cada evento de actualização"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Insira aqui a pasta onde deseja gerar a imagem das estatísticas"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
 msgstr ""
-"Erro ao abrir o ficheiro de lista de amigos 'emfriends.met' para escrita!"
+"Transferir periodicamente a imagem das estatísticas para o servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "URL do FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Caminho do FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Insira aqui o URL do seu servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr ""
+"Insira aqui a pasta do servidor FTP onde deseja colocar a sua imagem das "
+"estatísticas"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Utilizador"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Insira aqui o nome de utilizador para entrar no seu servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Insira aqui a palavra-passe para entrar no seu servidor FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Intervalo de actualização do FTP em minutos"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Validar"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Pasta que contém o seu ficheiro de assinatura"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Pasta onde se gera a imagem das estatísticas"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Carrega o modelo <exp>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Porto HTTP do servidor web"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Utilizar UPnP para configurar encaminhamento no porto do servidor web"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Porto UPnP"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Usar compressão gzip"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Palavra-passe de acesso total para o servidor web"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Palavra-passe de convidado para o servidor web"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Permitir acesso de convidado"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Negar acesso de convidado"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Carregar/guardar as preferências do servidor web de/para aMule remoto"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Caminho do ficheiro de configuração do aMule. NÃO USE DIRECTAMENTE!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Desactivar o interpretador PHP (obsoleto)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Recompilar as páginas PHP em cada pedido"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Servidor Web do aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "Ligação de cliente web aceite\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "ERRO: não é possível aceitar ligação de cliente web\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "O pedido falhou com o seguinte erro: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Ficheiro de índice não encontrado: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "A sessão expirou - a pedir entrada no sistema\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sessão ok, dentro do sistema\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sessão ok, fora do sistema\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Sessão não aberta - ir-se-á pedir entrada no sistema\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Sessão criada - a pedir entrada no sistema\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "A processar pedido [original]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Não foi indicada uma palavra-passe, a entrada não será permitida"
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "A verificar a palavra-passe\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Chave da palavra-passe inválida\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Palavra-passe correcta\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Palavra-passe incorrecta\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr ""
+"Não forneceu uma palavra-passe. Palavras-passe vazias não são permitidas.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Saída do sistema pedida\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "A processar pedido [redireccionado]: "
+
+#~ msgid "Romanian"
+#~ msgstr "Romeno"
+
+#~ msgid "Download status"
+#~ msgstr "Estado do Download"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Início da criação de chaves MD4 e AICH para o ficheiro: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Início da criação da chave MD4 para o ficheiro: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Início da criação da chave AICH para o ficheiro: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "AVISO: Não é possível remover o original '%s' após criar cópia de "
+#~ "segurança"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "AVISO: Falha ao remover %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Cliente %s com IP:Porto %s:%d a usar %s %s %s"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "Transferring"
+#~ msgstr "A Transferir"
+
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Não é possível determinar o navegador seleccionado!"
+
+#~ msgid "Networks window"
+#~ msgstr "Janela de redes"
+
+#~ msgid "Searches window"
+#~ msgstr "Janela de Pesquisas"
+
+#~ msgid "Transfers"
+#~ msgstr "Transferências"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Janela de transferências"
+
+#~ msgid "Shared files window"
+#~ msgstr "Janela de ficheiros partilhados"
+
+#~ msgid "Messages window"
+#~ msgstr "Janela de mensagens"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Janela de estatísticas"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Janela de preferências"
+
+#~ msgid "User Defined"
+#~ msgstr "Personalizado"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Intervalo de actualização: %d segundo"
+#~ msgstr[1] "Intervalo de actualização: %d segundos"
+
+#~ msgid "Firewalled"
+#~ msgstr "Atrás de Firewall"
+
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Utilizadores: E: %s K: %s | Ficheiros E: %s K: %s"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Utilizadores: %s | Ficheiros: %s"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "A FAZER - mostrar o progresso de uma pesquisa"
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Obter nível de filtragem de IP."
+
+#~ msgid "Makes a search."
+#~ msgstr "Faz uma pesquisa."
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr ""
+#~ "CIP2Country::CIP2Country(): Carregamento dos dados do país falhou de "
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "Foi carregada a imagem de %d bandeira."
+#~ msgstr[1] "Foram carregadas %d imagens de bandeiras."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Mostra Uploads / fila de espera de uploads"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Clientes na lista de espera :"
+
+#~ msgid "Current Session"
+#~ msgstr "Sessão actual"
+
+#~ msgid "Total"
+#~ msgstr "Total"
+
+#~ msgid "Requested :"
+#~ msgstr "Pedidos :"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Classificação (total):"
+
+#~ msgid "Misc Options"
+#~ msgstr "Opções diversas"
+
+#~ msgid "System Default"
+#~ msgstr "Predefinição de Sistema"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Seleccione o seu navegador"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Navegador personalizado:"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Insira o nome do seu navegador. Para usar o navegador personalizado, "
+#~ "seleccione o item Personalizado do menu acima."
+
+#~ msgid "Create Backup for preview"
+#~ msgstr "Criar cópia de segurança para pré-visualização"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Porto UDP extendido do cliente:"
+
+#~ msgid "disable"
+#~ msgstr "desactivar"
+
+#~ msgid "Bind Address"
+#~ msgstr "Associar ao Endereço"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "Porto UDP para pedidos de servidor extendidos (TCP+3): 4665"
+
+#~ msgid "Hard limit"
+#~ msgstr "Limite máximo"
+
+#~ msgid "Connection limits"
+#~ msgstr "Limites de ligação"
+
+#~ msgid "Max Connections"
+#~ msgstr "Máximo de ligações"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Universal Plug and Play"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "Activar UPnP"
+
+#~ msgid "Server Options"
+#~ msgstr "Opções de servidores"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "M.I.C. activo"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Tentar enviar partes inteiras nos uploads"
+
+#~ msgid "Disk space"
+#~ msgstr "Espaço em disco"
+
+#~ msgid "Check disk space"
+#~ msgstr "Verificar espaço em disco"
+
+#~ msgid "Min disk space:"
+#~ msgstr "Espaço mínimo em disco:"
+
+#~ msgid "Incoming"
+#~ msgstr "Completos"
+
+#~ msgid "Temporary"
+#~ msgstr "Temporários"
+
+#~ msgid "Shared"
+#~ msgstr "Partilhados"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Seleccionar as Cores das Estatísticas"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Capacidades da Ligação"
+
+#~ msgid "Note: These values are only used for statistics."
+#~ msgstr "Nota: estes valores são usados apenas nas estatísticas."
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Preferências Avançadas"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Estilo da barra de progresso"
+
+#~ msgid "Skin Support"
+#~ msgstr "Suporte de temas"
+
+#~ msgid "Enable skin support "
+#~ msgstr "Activar supporte de temas"
+
+#~ msgid "Skin:"
+#~ msgstr "Tema:"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Ordenação da coluna"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Ajustes de interface diversos"
+
+#~ msgid "Show part file number before file name"
+#~ msgstr "Mostrar o número do ficheiro parcial antes do nome do ficheiro"
+
+#~ msgid "Web server port"
+#~ msgstr "Porto do servidor web"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Exibir a mensagem do dia ao ligar ao servidor..."
+
+#~ msgid "eD2k Info"
+#~ msgstr "Informação eD2k"
+
+#~ msgid "File Options"
+#~ msgstr "Opções de ficheiros"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Pasta de Assinatura Online:"
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Desactivar/Activar"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Opções de filtragem:"
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Authentication"
+#~ msgstr "Autenticação"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Janela de Transferências"
+
+#~ msgid "Unban"
+#~ msgstr "Remover Ban"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Mostrar Uploads"
+
+#~ msgid "Show Queue"
+#~ msgstr "Mostrar a Lista de Espera"
+
+#~ msgid "Select View"
+#~ msgstr "Seleccionar a Vista"
+
+#~ msgid "Client Software"
+#~ msgstr "Programa Cliente"
+
+#~ msgid "Waited"
+#~ msgstr "Esperou"
+
+#~ msgid "Upload Time"
+#~ msgstr "Tempo de Upload"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Upload/Download"
+
+#~ msgid "Remote Status"
+#~ msgstr "Estado remoto"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#~ msgid "File Priority"
+#~ msgstr "Prioridade do ficheiro"
+
+#~ msgid "Score"
+#~ msgstr "Pontuação"
+
+#~ msgid "Asked"
+#~ msgstr "Pedido"
+
+#~ msgid "Last Seen"
+#~ msgstr "Última vez visto"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Entrou na Lista de Espera"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Enviado"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Recebido"
+
+#~ msgid "Userhash"
+#~ msgstr "Chave de Utilizador"
+
+#~ msgid "Encrypted"
+#~ msgstr "Cifrado"
+
+#~ msgid "Hide shared files"
+#~ msgstr "Esconder ficheiros partilhados"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "As seguintes opções foram mudadas nesta distribuição por motivos de "
+#~ "segurança:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Activada a Ofuscação do Protocolo para todas as ligações de entrada e "
+#~ "saída.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Desactivada a actualização da lista de servidores de outros servidores "
+#~ "e clientes.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Para mais informação acerca da razão para estas mudanças, procure\n"
+#~ "informação no wiki do aMule em http://wiki.amule.org sobre \"fake servers"
+#~ "\".\n"
+#~ "É importante que remova todos os servidores falsos da sua lista para que "
+#~ "o aMule funcione correctamente."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Adicionalmente, as definições sobre o navegador foram repostas para a "
+#~ "predefinição do sistema. Por favor configure as suas opções do navegador "
+#~ "de novo, caso seja necessário.\n"

aMule-2.2.6.tar.bz2/po/ru.po -> aMule-2.3.1.tar.bz2/po/ru.po Changed

@@ -1,4 +1,4 @@
-# translation of ru.po to Русский
+# translation of amule_2007-08-29.po to Русский
 # aMule project source code strings for i18n.
 # This file is distributed under the same license as the aMule package.
 #
@@ -8,1322 +8,1164 @@
 # toshi <K.Koshelyaev@gmail.com>, 2006.
 # Ivan Nazimov <ivan@lonerx.net>, 2007.
 # Nick Shaforostoff <shaforostoff@kde.ru>, 2008.
-# User294, 2008.
+# Radist Morse <radist.morse@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: ru\n"
+"Project-Id-Version: amule_2007-08-29\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2008-12-05 14:00+0300\n"
-"Last-Translator: User294\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
 "X-Poedit-Language: Russian\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: LoKalize 0.2\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"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Необходимо указать пароль."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Неверный пароль. Не MD5-хеш!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Подключение не удалось"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "EC соединение не удалось. Пустой ответ."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Внешнее Соединение: В доступе отказано по причине:"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Внешнее Соединение: В доступе отказано"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Внешнее соединение: Некорректный ответ сервера. Соединение закрыто."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Успешное подключение к aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Соединение установлено."
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Добавить в друзья"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Хешируется"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Вы должны ввести правильный IP-адрес и порт."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Завершается"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Информация"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Завершён"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Указанный хеш пользователя недопустим."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Приостановлен"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Не удалось открыть файл ED2KLinks."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Ошибочный"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: Вы не можете добавить себя в качестве источника для eD2k "
+"ссылки если у вас lowid."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Загружается"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Выходим из основного приложения..."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Ожидает"
-
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Начинаю создавать MD4 и AICH хеши для файла: %s"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Завершаем процесс amuleweb с pid `%ld' ... "
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Начинаю создавать MD4-хеш для файла: %s"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Убиваем процесс amuleweb с pid `%ld' ... "
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Начинаю создавать AICH-хеш для файла: %s"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Неудачно"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Конвертирую старые AICH хеши из '%s' в 64b в '%s'"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: Прекращаем работу ядра."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "ПРЕДУПРЕЖДЕНИЕ: Имя файла '%s' - неверно и было изменено на '%s'."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "выключение aMule завершено."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "ПРЕДУПРЕЖДЕНИЕ: Файл '%s' уже существует. Новый файл назван '%s'."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Результаты дебага памяти при выходе из aMule:"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
 msgstr ""
-"ПРЕДУПРЕЖДЕНИЕ: не удалось удалить оригинал '%s' после создания резервной "
-"копии."
+"\n"
+"EC конфигурация"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: не удалось удалить %s"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Пароль задан и внешние соединения разрешены."
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Не удалось получить список доступных файлов от '%s'"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "ПРЕДУПРЕЖДЕНИЕ"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Неизвестны"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr ""
+"В связи со сменой версии, значение вашей локали было изменено на значение по "
+"умолчанию. Извините."
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Поддельная версия eMule %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Сведения"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (имитация eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Ваш список серверов пуст.\n"
+"Скачать новый список?"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (имитация eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Загрузить список серверов"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (на основе eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr "веб-сервер работает с pid %d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Псевдоним: %s ID: %u"
+#: src/amule.cpp:658
+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 ""
+"Вы хотите запускать веб-сервер при загрузке, но исполняемый файл amuleweb не "
+"может быть запущен. Установите пакет содержащий веб-сервер aMule или "
+"скомпилируйте его с опцией --enable-webserver и запустите make install"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Запрошено: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "ОШИБКА"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Статистика для текущего сеанса: принято %d из %d запросов, %s передано\n"
-msgstr[1] ""
-"Статистика для текущего сеанса: принято %d из %d запросов, %s передано\n"
-msgstr[2] ""
-"Статистика для текущего сеанса: принято %d из %d запросов, %s передано\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Невозможно связать порты с указанными адресами: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Статистика для всех сеансов: принято %d из %d запросов, %s передано\n"
-msgstr[1] ""
-"Статистика для всех сеансов: принято %d из %d запросов, %s передано\n"
-msgstr[2] ""
-"Статистика для всех сеансов: принято %d из %d запросов, %s передано\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Запрошен неизвестный файл"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Порт %u не доступен. У вас будет LowID\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Клиент %s на IP:порт %s:%d используя %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Имя пользователя"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Порт %u недоступен!\n"
+"\n"
+"Это означает что вам будет выдан LowID.\n"
+"\n"
+"Проверьте вашу сетевую конфигурацию, убедитесь что необходимый порт открыт."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Друзья"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Не удалось создать aMule OnlineSig файл"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Показать &подробности"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Не удалось создать aMule OnlineSig файл"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Добавить в друзья"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"Выбранная локаль отсутствует в вашей системе (тем не менее, будет "
+"произведена попытка ее использовать)."
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Удалить из друзей"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "Это первый запуск aMule %s"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Послать &сообщение"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Эта версия является тестовой и обновляется ежедневно.\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Просмотр файлов"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr ""
+"мы не предоставляем никаких гарантий на случай каких либо повреждений, "
+"пожара \n"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Создать слот для друга"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"или же смерти вашей любимой собачки. И все же использование ее *должно* быть "
+"безопасным. \n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Удалить выбранного пользователя из списка друзей?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Дополнительную информацию, поддержку и обновленные версии вы найдете на "
+"нашем сайте \n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Удалить выбранных пользователей из списка друзей?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"www.aMule.org, или на нашем irc-канале #aMule, находящемся на сервере irc."
+"freenode.net. \n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Отменить"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Сообщайте нам о найденных ошибках на форум http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Устанавка более одного слота для друзей запрещена.\n"
-" Был выделен только один слот."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Множественный выбор"
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Загрузка завершена"
-
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Полный путь к файлу"
-
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Имя файла без пути"
+"Указан неверный каталог для файлов Online-подписей!\n"
+"Online-подписи будут отключены пока вы не исправите это в настройках."
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "eD2k хэш файла"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Имя сервера подтверждено"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Размер файла в байтах"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Выделение место под файл '%s' не удалось: %s"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Общее время загрузки"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "Ошибка: невозможно открыть файл журнала"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Начата новая беседа"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "ПРЕДУПРЕЖДЕНИЕ: файл журнала пуст. Что-то здесь не так :-("
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Отправитель"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Журнал был очищен"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Недостаточно места"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Сообщение сервера: %s"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Раздел диска"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "Пропущена загрузка %s, так как запрашиваемый файл не новее."
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Ошибка при завершении"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Ошибка при загрузке списка узлов."
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Имя файла"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Ошибка при загрузке файла контроля версии"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Размер"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Поврежден файл контроля версии"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Тип"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Вы используете устаревшую версию aMule!"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Приоритет"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr ""
+"Версия вашего aMule - %i.%i.%i, тогда как актуальная версия - %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "FileID"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Актуальная версия aMule всегда доступна тут:  http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Запросов"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "ВНИМАНИЕ: Версия вашего aMule устарела: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Принятых запросов"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Ваша копия aMule актуальна."
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Передано данных"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Ошибка при загрузке файла контроля версии"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Коэффициент передачи"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Польз.: %s | Файлов: %s"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Полученные части"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Польз.: E: %s K: %s | Файлов: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Полных источников"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Нет выделенной сети"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Каталог"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "LowID"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Публикуемые файлы"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "HighID"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Очень низкий"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Соединен с %s %s"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Низкий"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Подключение к %s"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Нормальный"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Отсоединен от eD2k"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Высокий"
+# Kad как сеть, или служба - поэтому в женском роде
+# да, согласен
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad запущена."
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Очень высокий"
+# Kad как сеть, или служба - поэтому в женском роде
+# согласен
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad остановлена."
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Релиз"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Подключен к Kad (норм.)"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Авто"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Подключен к Kad (за брандмауэром)"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Добавить комментарий/рейтинг"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Отключился от Kad"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Редактировать комментарий/рейтинг"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Сеть Kad не может быть использована если порт UDP выключен в настройках. "
+"Отменяю запуск."
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Переименовать"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Сеть Kad выключена в настройках. Отменяю соединение."
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Добавить файлы коллекции в список для закачки"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"ОШИБКА: демон aMule не может быть использован когда внешние соединения "
+"выключены. Чтобы включить внешние соединения, используйте aMule, или "
+"запустите amuled с параметром --ec-config, или установите ключ "
+"\"AcceptExternalConnections\" равным 1 в файле ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Скопировать magnet &URI в буфер обмена"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"ОШИБКА: Для использования внешних соединений необходим пароль, а без внешних "
+"соединений демон aMule бесполезен. Чтобы запустить aMule-демона необходимо "
+"заполнить поле \"ECPassword\" в файле ~/.aMule/amule.conf. Запустите amuled "
+"с флагом --ec-config чтобы создать пароль. Более подробную информацию вы "
+"найдете на http://wiki.amule.org"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: OnInit - запускаем таймер"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: уходим в фоновый режим - до встречи"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Не удалось создать pid-файл"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Копировать eD2k &ссылку в буфер"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "Ошибка: %s"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Копировать eD2k ссылку в буфер (&Источник)"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "aMule %s (основан на eMule)."
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Копировать eD2k ссылку в буфер (Источник) (&С шифрованием)"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Работает на %s"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Копировать eD2k ссылку в буфер (Имя &хоста)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr "Посетите http://www.amule.org для проверки наличия новой версии."
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr "Копировать eD2k ссылку в буфер (Имя хоста) (С &шифрованием)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ФАТАЛЬНАЯ ОШИБКА: не удалось создать таймер"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Копировать eD2k ссылку в буфер (информация &AICH)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Удаленное управление aMule"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Скопировать доп. информацию в буфер обмена"
+# Used only in CVS!
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Версия CVS:"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:501
 msgid ""
-"Feedback from: %s (%s)\n"
+"'All-Platform' p2p client based on eMule \n"
 "\n"
 msgstr ""
-"Ответ от: %s (%s)\n"
+"Многоплатформенный p2p клиент основанный на eMule \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Для создания ссылки на источник требуется HighID"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "ПРЕДУПРЕЖДЕНИЕ"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Публикуемые файлы (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[частично]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Введите новое имя файла:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Переименовать файл"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Возобновляется отдача файла: %s"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Сайт: http://www.amule.org \n"
 
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Приостанавливается отдача файла: %s"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Форум: http://forum.amule.org \n"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "Текстовый клиент aMule"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kad: слово запроса лишком коротоко"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Контакт: admin@amule.org (по административным вопросам) \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Считан %u контакт Kad"
-msgstr[1] "Считано %u контакта Kad"
-msgstr[2] "Считано %u контактов Kad"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 команда aMule \n"
+"\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Доступен только %d контакт Kad, файл nodes.dat не записан"
-msgstr[1] "Доступно только %d контакта Kad, файл nodes.dat не записан"
-msgstr[2] "Доступно только %d контактов Kad, файл nodes.dat не записан"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Часть aMule основана на \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Записан %d Kad контакт"
-msgstr[1] "Записано %d Kad контакта"
-msgstr[2] "Записано %d Kad контактов"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: пиринговый роутинг на основе XOR-метрики.\n"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ОШИБКА: невозможно открыть TCP порт."
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr "Copyright (c) 2002-2011 Петр Маймунков ( petar@post.harvard.edu )\n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "соединение Веб-клиента принято\n"
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ОШИБКА: невозможно принять соединение веб-клиента\n"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Сообщение"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Запрос не удался из-за следующей ошибки: %s."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "диалоговое окно aMule уничтожено"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Запрос не удался - неизвестная ошибка."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Идет подключение"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Индексный файл не найден:"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Соединение"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Сессия просрочена - запрашиваю логин\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: не соединено"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Сессия в порядке, авторизован\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: За брандмауэром"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Сессия в порядке, не авторизован\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Подключена"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Нет открытых сессий - буду запрашивать логин\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Идет подключение"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Сессия открыта - запрашиваю логин\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr " Kad: Выключено"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Обрабатываю запрос [исходный]:"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Отменить"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Проверяю пароль\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Прекратить попытки соединения"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Хеш пароля неверен\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Отключиться"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Пароль верен\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Отключиться от работающих сетей"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Неверный пароль\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Подключиться"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Вы не ввели пароль. Пустой пароль недопустим.\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Подключиться к разрешенным сетям"
 
-# в eMule - так и пишут: логин/логаут, но мне не нравится
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Запрошено отсоединение:\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Передача: %.1f(%.1f) | Прием: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Обрабатываю запрос [перенаправленный]:"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Передача: %.1f | Прием: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Загрузить шаблон <str>"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Подключен)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "HTTP порт веб-сервера"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Отключен)"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Использовать UPnP форвардинг портов для порта веб-сервера"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Вы действительно хотите выйти из %s?"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP-порт"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Подтверждение выхода"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Использовать gzip-сжатие"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Команда запуска:"
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- по умолчанию -"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Пароль веб-сервера для полного доступа"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Каталог с темами оформления '%s' не существует."
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Пароль веб-сервера для ограниченного доступа"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: невозможно открыть для чтения файл скина '%s'"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Позволять ограниченный доступ"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Сети"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Запрещать ограниченный доступ"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Окно сетей"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Загрузить/сохранить настройки веб-сервера из/в удаленный aMule"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Поиск"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Путь к файл конфигурации aMule. НЕ ИСПОЛЬЗУЙТЕ ПРЯМОЙ ПУТЬ!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Окно поиска"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Отключить PHP (не рекомендуется)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Загрузки"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Компилировать PHP-страницы при каждом запросе"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Окно загрузки"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Веб-сервер aMule"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Публикуемые файлы"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Недоступен"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Окно публикуемых файлов"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Никогда"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Сообщения"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Принимается..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Сообщения"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Статистика"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "Вместо %d байт было загружено %d байт"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Статистика"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Настройки"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Каталог, содержащий файл amulesig.dat"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Открыть"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Введите путь к вашему файлу amulesig.dat"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Окно настроек клиента"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Интервал обновления в секундах"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Импорт"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Генерировать картинку со статистикой после каждого события обновления"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Инструмент импортирования частично загруженных файлов (part files)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr ""
-"Укажите здесь каталог, в который вы хотите сохранять картинку со статистикой"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "О программе"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Периодическая загрузка картинки со статистикой на FTP сервер"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "О программе/Помощь"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP Url"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Сеть eD2k"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP путь"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Сеть Kad"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Введите здесь адрес вашего FTP сервера"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Нет сети"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
-"Введите здесь путь для сохранения картинки со статистикой на FTP сервере"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "удаленное управление aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Пользователь"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Пароль"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Фатальная Ошибка: не удалось создать таймер ядра"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Введите здесь имя пользователя для вашего FTP сервера"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Подключиться к удаленному aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Введите здесь пароль для вашего FTP сервера"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Фатальная Ошибка: не удалось создать Poll-таймер"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Интервал обновления через FTP в минутах"
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Переходим в событийный цикл..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Проверить"
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Подключаемся..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Каталог, в котором хранится файл-подпись"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Попытка подключиться не удалась "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Каталог, в котором будет сохранятся картинка со статистикой"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Обработчик событий EC удаленного GUI"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Выключаемся"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i дней %i часов %i минут %i секунд"
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, модуль статистики aMule"
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Неудачное соединение. Невозможно соединиться с %s:%d\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Добро пожаловать!"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Соединение прервано. Возможно, aMule остановлен."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Готов"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Максимальная скорость загрузки за время работы wxCas"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Все"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Абсолютная максимальная скорость загрузки за время работы wxCas"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr ""
+"Не удается создать директорию '%s' для категории '%s', оставляем директорию "
+"'%s'."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Сбросить"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Неизвестно"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Система"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Не удалось получить список доступных файлов от '%s'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Остановить автоматическое обновление"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Ищем друга для lowid-соединения"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Сохранить картинку со статистикой"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Поддельная версия eMule %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Распечатать картинку со статистикой"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (имитация eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Настройки"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (имитация eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "О модуле wxCas"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (на основе eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Начать авто обновление"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Псевдоним: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Автоматическое обновление остановлено"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Запрошено: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Автоматическое обновление начато"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Статистика для текущего сеанса: принято %d из %d запроса, %s передано\n"
+msgstr[1] ""
+"Статистика для текущего сеанса: принято %d из %d запросов, %s передано\n"
+msgstr[2] ""
+"Статистика для текущего сеанса: принято %d из %d запросов, %s передано\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Сохранить картинку со статистикой"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Статистика для всех сеансов: принято %d из %d запроса, %s передано\n"
+msgstr[1] ""
+"Статистика для всех сеансов: принято %d из %d запросов, %s передано\n"
+msgstr[2] ""
+"Статистика для всех сеансов: принято %d из %d запросов, %s передано\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Онлайн-статистика"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Запрошен неизвестный файл"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
-"Проблема с печатью.\n"
-"Возможно принтер неправильно установлен."
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Отфильтрованное сообщение от '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Печать"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Новое сообщение от '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
+#: src/BaseClient.cpp:2899
+#, c-format
 msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"wxCas, aMule модуль OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Основано на CAS, написанным Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Лицензия - GPL"
+"Пользователь %s (%u) запросил список публикуемых файлов из несуществующего "
+"каталога %s -> Проигнорировано"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Ох-ох... aMule то не запущен..."
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "ПРЕДУПРЕЖДЕНИЕ: файл %s не может быть открыт"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule запущен"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: Список отмененных файлов поврежден, содержит некорректный "
+"заголовок."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule запущен, но не подключен"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Ошибка ввода/вывода при чтении файла %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule подключается..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Ошибка при сохранении файла %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Ох, ох, статус aMule неизвестен..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Введите код"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Категория"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " работает "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Новая категория"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " остановлен!"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Выберите каталог для входящих файлов"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " не подключен!"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Вы должны указать имя для категории!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " подключается..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Вы должны указать путь для категории!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " делает что-то непонятное, проверьте!"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Не удалось создать каталог для загружаемых файлов категории. Укажите верный "
+"путь."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " подключен к "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Сеанс чата запущен: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Соединен с клиентом ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Соединение с клиентом ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "за брандмауэром"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Не удалость соединиться с клиентом / Соединение разорвано ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "отключен"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr "*** Код введен верно. Пользователь получил ваше сообщение. ***"
 
-#  stands for $User is on $server
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " на "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** Код введен неверно. Ваше сообщение проигнорировано. Вы можете повторить "
+"ввод кода отправив новое сообщение. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " с "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Чат"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Всего принято: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Закрыть вкладку"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Передано: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Закрыть все вкладки"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Принято за сеанс: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Закрыть остальные вкладки"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Приём: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Добавить в список друзей"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Передача: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Файл кредитов загружен, %u клиент известен"
+msgstr[1] "Файл кредитов загружен, %u клиента известно"
+msgstr[2] "Файл кредитов загружен, %u клиентов известно"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr "КБ/с"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Кредиты перестали действовать для %u клиента!"
+msgstr[1] " - Кредиты перестали действовать для %u клиентов!"
+msgstr[2] " - Кредиты перестали действовать для %u клиентов!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Передача другим: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Файл 'cryptkey.dat' не найден. Создаю заново."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr "файлов, клиентов в очереди: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Сведения о клиенте"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Время:"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LowID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f КБ/с"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " на "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Разрешено"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Системная загрузка (за 1-5-15 мин): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Поддерживается"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Время работы системы: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Не поддерживается"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uд %02uч %02uмин %02uс"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Запрещено"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uч %02uмин %02uс"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Подключен"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02uмин %02uс"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Отключен"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02uс"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Не завершен"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LowID"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Нарушитель"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Не подключен"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Проверено - OK"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Не доступно"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "Пользователь %s (%u) запросил список публикуемых файлов -> Принято"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "Пользователь %s (%u) запросил список публикуемых файлов -> Отказано"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "Пользователь %s (%u) запросил список публикуемых папок -> Принято"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Отменено."
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "Пользователь %s (%u) запросил список публикуемых папок -> Отказано"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "Unable to open %s"
-msgstr "Не удалось открыть %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Параметры ввода"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Файл для хеширования"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Добавьте возможные URL для этого файла"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Введите здесь файл для которого вы хотите получить eD2k ссылку"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Введите здесь URL который вы хотите добавить к eD2k ссылке: добавьте / в "
-"конце если хотите чтобы aLinkCreator присоеденил текущее имя файла"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Добавить"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Удалить"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Очистить"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Создать ссылку с хешами частей"
+"Пользователь %s (%u) запросил список публикуемых файлов из каталога '%s' -> "
+"Принято"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Помогите распространить новые и редкие файлы быстрее, за счет увеличения "
-"размера ссылки"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Хеш MD4"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k хэш-файл"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k ссылка"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Начать"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Сохранить"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Скопировать в буфер обмена"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Выйти"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Открыть"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Открыть файл и получить его eD2k ссылку"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Копировать"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Копировать полученную eD2k ссылку в буфер"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Сохранить как"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Сохранить полученную eD2k ссылку в файл"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "О программе"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "О программе aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Выберите файл для которого вы хотите получить eD2k ссылку"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Не удалось открыть буфер обмена"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Сейчас нечего копировать!"
+"Пользователь %s (%u) запросил список публикуемых файлов из каталога '%s' -> "
+"Отказано"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Выберите файл в который сохранить полученную eD2k ссылку"
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Пользователь %s (%u) сделал доступным каталог '%s'"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Невозможно открыть "
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Пользователь %s (%u) отправил незапрошенный список публикуемых папок."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Пожалуйста, введите не пустое имя файла"
+#: src/ClientTCPSocket.cpp:982
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr ""
+"Пользователь %s (%u) отправил список публикуемых каталогов из каталога '%s'"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Сейчас нечего сохранять!"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Пользователь %s (%u) закончил передачу списка публикуемых файлов."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
-"aLinkCreator, программа для создания eD2k ссылок для aMule\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Иконки взяты из http://www.everaldo.com и http://www.icomania.com\n"
-"и http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Лицензия - GPL"
+"Пользователь %s (%u) отправил список публикуемых файлов, который не нужен."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Идёт хеширование..."
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr ""
+"Пользователь %s (%u) отказал в доступе к списку публикуемых файлов/папок"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator работает для вас"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Комментарии к файлам"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Вычисляется MD4 хэш..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Имя пользователя"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Вычисляются ed2k хэши..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Имя файла"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Выполнено за %.2f s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Рейтинг"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Этот URL уже добавлен !"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Комментарий"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Введите URL"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Нет комментариев"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Обрабатывается файл под номером %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Вы запросили частичные хеши (используется только для файлов > 9.5 MБ)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u комментарий"
+msgstr[1] "%u комментария"
+msgstr[2] "%u комментариев"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Файл не существует !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, программа для создания eD2k ссылок для aMule"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"Клиент %s забанен за отсыл %s поврежденных данных из %s всего для файла '%s'"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1337,31 +1179,57 @@
 msgid "Auto [Hi]"
 msgstr "Авто [Выс]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Идёт подключение"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Очень низкий"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Низкий"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Нормальный"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Высокий"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Очень высокий"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Релиз"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Запрос"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Соединение через сервер"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Очередь заполнена"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "В очереди"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Передача"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Загружается"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1373,7 +1241,7 @@
 
 #: src/DataToText.cpp:68
 msgid "Cannot connect LowID to LowID"
-msgstr "Клиенты с LowID не могут подключаться один к одному"
+msgstr "Клиенты с LowID не могут подключаться друг с другом"
 
 #: src/DataToText.cpp:69
 msgid "Too many connections"
@@ -1387,8 +1255,7 @@
 msgid "Too many Kad connections"
 msgstr "Слишком много соединений Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Заблокированы"
 
@@ -1420,8 +1287,8 @@
 msgid "Remote Server"
 msgstr "Удаленный сервер"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1445,8 +1312,8 @@
 msgid "Search Result"
 msgstr "Результаты поиска"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Завершено"
 
@@ -1460,18 +1327,18 @@
 
 #: src/DataToText.cpp:148
 msgid "ERROR: Partmet not found"
-msgstr "ОШИБКА: не найден файл part.met"
+msgstr "ОШИБКА: Не найден файл part.met"
 
 #: src/DataToText.cpp:149
 msgid "ERROR: IO error!"
-msgstr "ОШИБКА: ошибка ввода/вывода!"
+msgstr "ОШИБКА: Ошибка ввода/вывода!"
 
 # знаю что звучит глупо. если есть идеи - прошу
 #: src/DataToText.cpp:150
 msgid "ERROR: Failed!"
-msgstr "ОШИБКА: неудачно!"
+msgstr "ОШИБКА: Неудачно!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "В очереди"
 
@@ -1483,878 +1350,308 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Неизвестный или нарушенный формат временного файла."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Системный"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Албанский"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Арабский"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Астурианский"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Баскский"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Болгарский"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Каталонский"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Китайский (упрощенный)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Китайский (традиционный)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Хорватский"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Чешский"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Датский"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Голландский"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Английский (Великобритания)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Эстонский"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Финский"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Французский"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Гальский"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Немецкий"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Греческий"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Израильский"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Венгерский"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Итальянский"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Итальянский (Швеция)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Японский"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Корейский"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Литовский"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Часть"
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Норвежский (Нюнорск)"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Размер"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Польский"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Передано"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Португальский"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Скорость"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Португальский (Бразилия)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Выполнено"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Русский"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Источники"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Словакский"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Приоритет"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Испанский"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Состояние"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Шведский"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Осталось времени"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Турецкий"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Последний раз файл был доступен полностью"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Украинский"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Последнее получение данных"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Не удалось найти выбранный броузер!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Удалить выбранный файл?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr "TCP порт не может быть выше 65532, так как UDP сокет - TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Удалить выбранные файлы?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Используется пот по умолчанию (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Имя сервера"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Адрес"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Порт"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Описание"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Пользователей"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Файлы"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Сбоев"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Статический"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Версия"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Вы соединены с сервером, который вы пытаетесь удалить. Сначала нужно "
-"отключиться от него. Сервер НЕ удален."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Сведения"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Неизвестное имя)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Вы уверены, что хотите удалить сервер %s из статического списка "
+"Ответ от: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Да"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Авто"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Нет"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Остановить"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Невозможно открыть %s"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Пауза"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Серверов (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Возобновить"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Сервер"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "Очистить &завершенные"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Подключиться к серверу"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Использовать все A4AF источники для этого файла"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Внести в список статических серверов"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Использовать все A4AF источники для этого файла (авто)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Удалить из списка статических серверов"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Отдать все A4AF источники этого файла другим файлам"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Внести в список статических серверов"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Дополнительные настройки"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Удалить из списка статических серверов"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Предварительный просмотр"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Удалить выбранный сервер"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "По&казать подробности"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Удалить выбранные серверы"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Показать все комментарии"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Удалить все сервера"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Скопировать magnet URL в буфер обмена"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Копировать eD2k ссылку в буфер"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Копировать eD2k &ссылку в буфер"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Копировать eD2k ссылки в буфер"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Скопировать доп. информацию в буфер обмена"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Восстановить соединение с сервером"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "отменить категорию"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Вы уверены, что хотите удалить все сервера?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Присвоить категорию"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Удалить выбранный сервер?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Открыть файл"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Удалить выбранные серверы?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Введите новое имя файла:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Отключено [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Переименовать файл"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "aMule %s (основан на eMule)."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Работает на %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr "Посетите http://www.amule.org для проверки наличия новой версии."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ФАТАЛЬНАЯ ОШИБКА: не удалось создать таймер"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Удалённое управление aMule"
-
-# Used only in CVS!
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Версия CVS:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Клиент пиринговых сетей, работающий на разных платформах и основанный на "
-"eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Сайт: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Форум: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr "По административным вопросам: admin@amule.org\n"
+msgid "Downloads (%i)"
+msgstr "Загрузки (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr "Часть aMule основана на \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: пиринговый роутинг на основе XOR-метрики.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr "Copyright (C) 2002 Петр Маймунков\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr "http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Сообщение"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Соединение"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: не соединено"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: За брандмауэром"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Соединение установлено"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Идёт подключение"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr " Kad: Выключено"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Прекрытить попытки соединения"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Отключиться"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Отключиться от работающих сетей"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Подключиться"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Подключиться к разрешенным сетям"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Передача: %.1f(%.1f) | Приём: %.1f(%.1f)"
+"Чтобы избежать появления этого предупреждения\n"
+"при каждом предпросмотре, установите предпочитаемый\n"
+"видео проигрыватель в настройках (по умолчанию mplayer)."
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Передача: %.1f | Приём: %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Предварительный просмотр"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Подключен)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "ОШИБКА: невозможно запустить видео-проигрыватель. Команда: `%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Отключен)"
+msgid "Saving PartFile %u of %u"
+msgstr "Сохранаяем файл %u из %u"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Вы действительно хотите выйти из aMule?"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Все файлы сохранены."
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Подтверждение выхода"
-
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Каталог с темами оформления '%s' не существует."
+msgid "Loading temp files from %s."
+msgstr "Загружаются файлы из %s"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: невозможно открыть для чтения файл скина '%s'"
+msgid "Loading PartFile %u of %u"
+msgstr "Загружается файл %u из %u"
 
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Сети"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Окно сетей"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Поиск"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Окно поиска"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Передачи"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Окно передач"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Публикуемые файлы"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Окно публикуемых файлов"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Сообщения"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Окно сообщений"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Статистика"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Окно статистики"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Окно настроек"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Импорт"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Инструмент импортирования частично загруженных файлов (part files)"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "О программе"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "Сеть eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Сеть Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Нет сети"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Общие"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Соединение"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Каталоги"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Сервера"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Безопасность"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Интерфейс"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Прокси"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Фильтры"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Удалённый контроль"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Online-подпись"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Дополнительно"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "События"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Отладка"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Другой"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"Необходимо перезапустить aMule чтобы следующие изменения вступили в силу:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- изменен порт TCP.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- изменен порт UDP.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"Список адресов авто-обновления пуст.\n"
-"Авто-обновление списка серверов при запуске будет отключено."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Вы включили внешние соединения, но не указали пароль.\n"
-"Внешние соединения нельзя включить до тех пор, пока не указан пароль."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Изменен язык.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Изменен временный каталог.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- сеть eD2k включена. \n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Передача: 0.0 | Приём: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Обе сети eD2k и Kad отключены.\n"
-"Вы не сможете подсоединиться пока не подключите хотя бы одну из них."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad не будет запущена, если UDP-порт выключен.\n"
-"Включите UDP-порт или выключите Kad."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"Вам НЕОБХОДИМО перезапустить aMule немедленно.\n"
-"Иначе не жалуйтесь, если произойдет какая-нибудь неприятность.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Ваш список авто обновления серверов пуст.\n"
-"Пожалуйста, внесите в список хотя бы один URL, указывающий на корректный "
-"'server.met'.\n"
-"Щёлкните на кнопке \"Список\" чтобы ввести URL."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Временные файлы"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Входящие файлы"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Online-подписи"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Выберите каталог для %s"
+"ОШИБКА: не удалось загрузить резервный файл. Ищите на http://forum.amule.org "
+"как восстановить файл part.met"
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Выбрать видео-проигрыватель"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Все файлы загружены."
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Выберите броузер"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Частично загруженных файлов не найдено"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Команда запуска%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Редактировать список серверов"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Найден %u частично закаченный файл"
+msgstr[1] "Найдено %u частично закаченных файла"
+msgstr[2] "Найдено %u частично закаченных файлов"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Впишите сюда адреса для получения файлов 'server.met'.\n"
-"Только один URL в одной строчке."
+"Файловая система каталога временных файлов не поддерживает файлы больших "
+"размеров"
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Интервал обновления: %d с"
-msgstr[1] "Интервал обновления: %d сек"
-msgstr[2] "Интервал обновления: %d сек"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr ""
+"Файловая система каталога принятых файлов не поддерживает файлы больших "
+"размеров"
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Отрезок времени, охватывающийся графиком: %d м"
-msgstr[1] "Отрезок времени, охватывающийся графиком: %d минут"
-msgstr[2] "Отрезок времени, охватывающийся графиком: %d минут"
+msgid "Downloading %s"
+msgstr "Прием %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Масштаб графика соединений: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Вы уже загружаете файл '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Интервал обновления: %d с"
-msgstr[1] "Интервал обновления: %d секунд"
-msgstr[2] "Интервал обновления: %d секунд"
+msgid "You already have the file '%s'"
+msgstr "У вас уже есть файл '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Файловый буфер: %d Б"
-msgstr[1] "Размер буфера: %d байт"
-msgstr[2] "Размер буфера: %d байт"
+msgid "You are already trying to download the file %s"
+msgstr "Вы уже пытаетесь загрузить файл %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Размер очереди отдачи: %d"
-msgstr[1] "Размер очереди отдачи: %d клиентов"
-msgstr[2] "Размер очереди отдачи: %d клиентов"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Не удается преобразовать magnet-ссылку в eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Частота связи с сервером: %d м"
-msgstr[1] "Интервал обновления соединения с сервером: %d минут"
-msgstr[2] "Интервал обновления соединения с сервером: %d минут"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Обновление соединения с сервером: Отключено"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "UDP-порт для расширенных серверных запросов (TCP+3):"
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "отключено"
+msgid "Unknown protocol of link: %s"
+msgstr "Неизвестный протокол ссылки: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Выполнить команду при событии  '%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Включить выполнение команд в ядре"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Команда ядра:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Включить выполнение команд в ГИП"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Команда ГИП:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Следующие переменные будут заменены:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Неверная eD2k ссылка! ОШИБКА: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Попытка неавторизированного доступа. Соединение разорвано."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "Клиент послал пакет после ошибки идентификации."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Внешнее соединение закрыто."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Внешние соединения выключены из-за отсутствия пароля."
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Внешние соединения выключены в конфигурационном файле"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Принято новое внешнее соединение"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ОШИБКА: невозможно принять новое внешнее соединение"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Отказано во внешнем соединении из-за пустого пароля"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Соединение с клиентом: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Неизвестная версия"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2362,2246 +1659,1064 @@
 "Неверный идентификатор версии ВС. Возможна бинарная несовместимость. "
 "Используйте ядро и компонент удаленного доступа одинаковой версии."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 "Вы не можете подсоединиться к релизной версии с произвольной SVN версии! "
 "Возможный сбой предотвращен"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Ошибка идентификации."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Недопустимая версия протокола."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Тег версии протокола отсутствует."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr "Ошибка авторизации: в качестве EC-пароля указан неправильный хэш."
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Ошибка идентификации: неверный пароль."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Ошибка идентификации: пароль не задан."
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr "Неверный запрос, сначала пройдите идентификацию."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Доступ получен."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Клиенту отправлено сообщение об ошибке \"%s\"."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Попытка неавторизированного доступа с %s. Соединение разорвано."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Удаленная команда PartFile не удалась: хеш файла не найден: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Хеш файла не найден: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "Ошибка при выполнении OpCode."
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Сервер не добавлен"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "сервер не найден: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "необходимо выделить сервер для удаления"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "Сеть eD2k отключена в настройках"
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Поиск запущен. Ждите результатов."
 
 # Explained by Jacobo221.
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "При удаленном использовании aMule WWW поиск бесполезен."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad выключена в настройках."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "В графике нет точек."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Ваш клиент не настроен на этот уровень детализации."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Внешнее соединение: запрошено выключение"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Уже завершаю работу."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "ExternalConn: добавляю ссылку '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
-msgstr "Ссылка неверна, или уже в списке."
+msgstr "Ссылка неверна или уже в списке."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Файл не найден."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Неверное имя файла."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Невозможно переименовать файл."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad выключена в настройках."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
-msgstr "Уже подсоединен в сети eD2k."
+msgstr "Уже подсоединен к сети eD2k."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "Подсоединение к сети eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Уже подключен к Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Подключаюсь к Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Все сети выключены."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Отсоединен от сети eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Отключен от Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Внешнее соединение: получен неверный код операции: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Неверный opcode (Возможно, не та версия протокола)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr "Не удалось открыть файл (%s), удаляю из списка публикуемых файлов."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Запрошен набор хешей для неизвестного файла: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Команда `%s' с pid `%d' завершилась с кодом статуса `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Сервер не был добавлен: не указан адрес сервера."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Сервер не был добавлен: указан неверный порт сервера."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Статус eD2k:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Подключен"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Порт"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Статус Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Выполняется"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Статус:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Отключен"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Состояние соединения:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "За брандмауэром"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "ОК"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Состояние брандмауэра:"
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Соединен с другом"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Нет друзей"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Пользователей в среднем:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Файлов в среднем:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Не запущен"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Время работы: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Передача"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Отдача"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Передано за сеанс (всего): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Служебный трафик (пакеты): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Трафик запросов (пакеты): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Трафик обмена источниками (пакеты): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Трафик с сервером (пакеты): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Служебный трафик Kad (пакеты): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Потери шифрования (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Активные отдачи: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Ожидающие отдачи: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Всего успешных сессий отдачи: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Всего неудачных сессий отдачи: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Среднее время отдачи: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Загрузки"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Принято за сеанс (всего): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Найдено источников: %s"
-
-# chunk, конечно, никакой не пакет.... но фиг знает
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Активных загрузок (фрагменты файлов): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Соотношение UL:DL (всего): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Средняя скорость закачки (Сессия): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Средняя скорость отдачи (Сессия): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Максимальная скорость закачки (Сессия): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Максимальная скорость отдачи (Сессия): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Пересоединений: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Прошло после первой передачи: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "Время подключения к серверу: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Активных соединений (примерно): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Достигнуто макс. число соединений: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Соединений в среднем (прибл.): %g"
-
-#: src/Statistics.cpp:700
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Максимальное число соединений (примерно): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Клиенты"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Отфильтрованы"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Всего: %i Известно: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Работающих серверов: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Сбойных серверов: %i"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Неизвестное расширение '%s' для команды '%s'.\n"
 
-#: src/Statistics.cpp:717
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Total: %s"
-msgstr "Всего: %s"
+msgid "Unknown command '%s'.\n"
+msgstr "Неизвестная команда '%s.'\n"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Удаленных серверов: %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"У этой команды не может быть аргументов.\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Отфильтрованных серверов: %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"У этой команды должен быть аргумент.\n"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Пользователей на работающих серверах: %llu"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Команда не завершена. Необходимо использовать одно из следующих расширений.\n"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Файлов на работающих серверах: %llu"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Доступные расширения:\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Всего пользователей: %llu"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Доступные команды:\n"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Total Files: %llu"
-msgstr "Всего файлов: %llu"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Все команды чувствительны к регистру.\n"
+"Наберите '%s <имя команды>' чтобы получить справку по этой команде.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Загруженность сервера: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Завершить работу с приложением."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Число публикуемых файлов: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Показать справку."
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Общий размер публикуемых файлов: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Чтобы получить справку по команде, наберите  'help <имя команды>'.\n"
+"Чтобы получить полный список команд, наберите 'help'.\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
-msgstr "Средний размер файлов: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Операционная система"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Не получено"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Вырезать"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Вставить"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Выделить все"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Введите '%s' для получения списка команд\n"
+"\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Невозможно осуществить поиск через Kad если Кад не запущен"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Синтаксическая ошибка!"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "Поиск по сети eD2k  не может быть произведен когда она отсоединена."
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+"Ошибка при обработке команды - это не должно было произойти! Пожалуйста, "
+"сообщите нам об этой ошибке\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Ошибка при поиске через Kad: "
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "У этой команды не должно быть параметров."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Отфильтрованное сообщение от '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "У этой команды должен быть параметр."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Новое сообщение от '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Неверный аргумент."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "Пользователь %s (%u) запросил список публикуемых файлов -> Принято"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Команда введена не полность."
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "Пользователь %s (%u) запросил список публикуемых файлов -> Отказано"
+msgid "Type '%s' to get more help.\n"
+msgstr "Наберите '%s' для подробной справки.\n"
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "Пользователь %s (%u) запросил список публикуемых папок -> Принято"
+msgid "This is %s %s %s\n"
+msgstr "Это %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "Пользователь %s (%u) запросил список публикуемых папок -> Отказано"
+msgid "This is %s %s\n"
+msgstr "Это %s %s\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"Пользователь %s (%u) запросил список публикуемых каталогов из каталога %s -> "
-"Принято"
-
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+"\n"
+"Creating client...\n"
 msgstr ""
-"Пользователь %s (%u) запросил список публикуемых каталогов из каталога %s -> "
-"Отказано"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Пользователь %s (%u) сделал доступной каталог %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Пользователь %s (%u) отправил незапрошенный список публикуемых папок."
+"\n"
+"Создается клиент...\n"
 
-#: src/ClientTCPSocket.cpp:1025
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Пользователь %s (%u) отправил список публикуемых каталогов из каталога %s"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Пользователь %s (%u) закончил передачу списка публикуемых файлов."
+"\n"
+"Ok, выход из %s...\n"
 
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"Пользователь %s (%u) отправил список публикуемых файлов, который не нужен."
+"Невозможно подключиться без пароля.\n"
+"Вы должны указать пароль либо в конфигурационном файле,\n"
+"либо используя командную строку.\n"
+"\n"
+"Завершение работы...\n"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr ""
-"Пользователь %s (%u) отказал в доступе к списку публикуемых файлов/папок"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Показать эту справку."
 
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Узлы (%u)"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Узел, на котором работает aMule (по умолчанию: localhost)"
 
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Неверный IP для инициализации"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Порт aMule для внешних подключений (по умолчанию: 4712)"
 
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Неверный порт для инициализации"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Пароль для внешнего соединения."
 
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Пожалуйста, заполните все необходимые поля"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Прочесть настройки из файла."
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Вы уверены что хотите загрузить новый файл nodes.dat?\n"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Не выводить ничего в поток стандартного вывода."
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
-msgstr "Это удалит используемые в данный момент узлы и перезапустит Kademlia."
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Детально - выводить отладочную информацию."
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Продолжить?"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Установить локаль программы (язык)."
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "ОШИБКА:"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Записать параметры командной строки в конфигурационный файл."
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "ПРЕДУПРЕЖДЕНИЕ:"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Создает конфигурационный файл на основе оного из aMule."
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Добавить в друзья"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Вывести версию программы."
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Вы должны ввести правильный IP-адрес и порт."
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Детали файла"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Информация"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% готово"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Указанный хеш пользователя недопустим."
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
+msgstr "%.2f kB/сек"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Источники"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "Не удалось открыть список друзей 'emfriends.met' для чтения!"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Файл"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "Не удалось открыть список друзей 'emfriends.met' для записи!"
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Загрузить"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "КРИТИЧНО - нет клиентов на StartChatSession"
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Категория"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Друзья"
 
-# It's about default category to download to.
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Общая"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Показать &подробности"
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Загрузить в категории"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Добавить в друзья"
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Искать связанные файлы (eD2k, локально)"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Удалить из друзей"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Отметить как известный"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Послать &сообщение"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Подключиться к удалённому aMule"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Просмотр файлов"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Попытка подключиться не удалась "
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Создать слот для друга"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "ОШИБКА"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Удалить выбранного пользователя из списка друзей?"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Соединение не удалось. Невозможно подключиться к %s:%d\n"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Удалить выбранных пользователей из списка друзей?"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
 msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
-"ПРЕДУПРЕЖДЕНИЕ: Вы не можете добавить себя в качестве источника для eD2k "
-"ссылки если у вас lowid."
-
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Пользователей: E: %s K: %s | Файлов E: %s K: %s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Все"
-
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Всего пользователей: %s | Всего файлов: %s"
-
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Передано"
-
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Скорость"
-
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Выполнено"
-
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Состояние"
-
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Осталось времени"
-
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Последний раз файл был доступен полностью"
-
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Последнее получение данных"
-
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Удалить выбранный файл?"
+"Устанавка более одного слота для друзей запрещена.\n"
+" Был выделен только один слот."
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Удалить выбранные файлы?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Множественный выбор"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Послать сообщение пользователю"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Сообщение:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Остановить"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Пауза"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Возобновить"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "&Очистить завершённые"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Использовать все A4AF источники для этого файла"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Использовать все A4AF источники для этого файла (авто)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Отдать все A4AF источники этого файла другим файлам"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Дополнительные настройки"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Предварительный просмотр"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Показать &подробности"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Показать все комментарии"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Скопировать magnet URI в буфер обмена"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "отменить категорию"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Присвоить категорию"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Открыть файл"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Удалить из списка друзей"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Добавить в список друзей"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Переключить на этот файл"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "кБ/сек"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
-msgstr "QR: %u (%i)"
+msgid "On Queue: %u (%i)"
+msgstr "В очереди: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Запрошен другой файл"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Загрузки (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Чтобы избежать появления этого предупреждения\n"
-"при каждом предпросмотре, установите предпочитаемый\n"
-"видео проигрыватель в настройках (по умолчанию mplayer)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Предварительный просмотр"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ОШИБКА: невозможно запустить видео-проигрыватель. Команда: `%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "Ошибка: невозможно создать part-файл)"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Ожидание слота отдачи"
 
-#: src/PartFile.cpp:327
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Попытка загрузки резервной копии файла '.met'  из %s"
+msgid "On Queue: %u"
+msgstr "В очереди: %u"
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ОШИБКА: не удалось открыть файл part.met: %s ==> %s"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Отдается"
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ОШИБКА: файл part.met пуст: %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ОШИБКА: неправильная версия файла part.met: %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"ОШИБКА: %s (%s) поврежден (неверное число тегов), невозможно открыть файл."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Попытка восстановления информации о файле..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr ""
-"Восстановление безымянного файла - попытка восстановить его как "
-"'RecoveredFile.dat'"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Восстановлена вся возможная информация о файлах ;-))) Попытаемся ее "
-"использовать..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Не удалось восстановить информацию о файлах :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Не удалось открыть %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: %s возможно поврежден (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "Ошибка сохранения part-файла: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Невозможно получить длину '%s' - используется файл %s"
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "Файл '%s' имеет размер в ноль байт - используется %s."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Не удалось сохранить файл 'part.met.seeds' для %s"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Сохранен %i источник для файла %s (%s)"
-msgstr[1] "Сохранено %i источника для файла %s (%s)"
-msgstr[2] "Сохранено %i источников для файла %s (%s)"
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Нет"
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Файл %s (%s) не имеет сохранённых источников"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Нет"
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Файл %s (%s) не имеет сохранённых источников"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Да"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Ошибка при чтении источников частично загруженного файла (%s - %s): %s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Принимается..."
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Найдена испорченная часть (%d) в %d части файла %s - FileResultHash |%s| "
-"FileHash |%s|"
-msgstr[1] ""
-"Найдена испорченная часть (%d) в %d частях файла %s - FileResultHash |%s| "
-"FileHash |%s|"
-msgstr[2] ""
-"Найдена испорченная часть (%d) в %d частях файла %s - FileResultHash |%s| "
-"FileHash |%s|"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "загрузка HTTP отменена"
 
-#: src/PartFile.cpp:1181
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Найдена завершённая часть (%i) в %s"
+msgid "Unable to create destination file %s for download!"
+msgstr "Невозможно создать файл %s для загрузки!"
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Завершено повторное хеширование %s"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "URL загрузки не может быть пустым"
 
-#: src/PartFile.cpp:2239
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Неожиданная ошибка во время завершения %s. Файл приостановлен."
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "Обработка URL %s: %i - Ошибка (%i)!"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Загрузка завершена: %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Критическая ошибка при записи загруженного файла"
 
-#: src/PartFile.cpp:2323
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Deleting file: %s"
-msgstr "Удаление файла: %s"
+msgid "Downloaded %d bytes"
+msgstr "Загружено %d байт"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"ПРЕДУПРЕЖДЕНИЕ: Не удается схэшировать загруженную часть - хэш-набор неполон "
-"для '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Вместо %d байт было загружено %d байт"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"ОШИБКА: Не удается схэшировать загруженную часть - хэш-набор неполон (%s). "
-"Это никогда не должно происходить"
+"Неверный URL для HTTP-загрузки или HTTP-редиректа (возможно, забыт "
+"'http://'?)"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr ""
-"ПРЕДУПРЕЖДЕНИЕ: не достаточно свободного места на диске. Файл приостановлен: "
-"%s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Загруженная часть %i повреждена: %s"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Восстановлена повреждённая часть %i для %s -> Выигрыш: %s Б"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Выделяется место"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Недостаточно места на диске"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Остановлен"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "Невозможно соединиться с HTTP сервером загрузок"
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Загружено"
-
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ОШИБКА: не удалось открыть частично закаченный '%s'"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Неверный ответ от сервера HTTP-загрузки"
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "ПРЕДУПРЕЖДЕНИЕ: файл known.met не может быть открыт"
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr "ПРЕДЕПРЕЖДЕНИЕ: список файла known.met поврежден: неверный заголовок."
-
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Ошибка ввода/вывода при чтении файла known.met: %s"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Загружен новый GeoIP.dat с %s"
 
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Ошибка при сохранении файла known.met: %s"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "Загрузка GeoIP.dat неудачна, прекращаем обновление."
 
-#: src/SharedFileList.cpp:352
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Найден %i известный публикуемый файл."
-msgstr[1] "Найдено %i известных публикуемых файла."
-msgstr[2] "Найдено %i известных публикуемых файлов."
+msgid "Failed to remove %s file, aborting update."
+msgstr "Удаление файла %s неудачно, прекращаем обновление."
 
-#: src/SharedFileList.cpp:358
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Найден %i известный публикуемый файл, %i неизвестных."
-msgstr[1] "Найдено %i известных публикуемых файла, %i неизвестных."
-msgstr[2] "Найдено %i известных публикуемых файлов, %i неизвестных."
-
-# ей-богу не понимаю что за ошибка и когда вылазит
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ОШИБКА: попытка опубликовать %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Комментарии к файлам"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Рейтинг"
+msgid "Failed to rename %s file, aborting update."
+msgstr "Переименование файла %s неудачно, прекращаем обновление."
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Комментарий"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Нет комментариев"
-
-#: src/CommentDialogLst.cpp:104
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u комментарий"
-msgstr[1] "%u комментария"
-msgstr[2] "%u комментариев"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Не могу соединиться ни с одним завуалированным сервером в списке. Пробую ещё "
-"раз, но без вуалирования."
+msgid "Successfully updated %s"
+msgstr "Обновление %s успешно."
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "Не удалось соединиться ни с одним указанным сервером. Еще один заход."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "Сеть eD2k отключена в настройках, не соединяется."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "В списке серверов не найдено ни одного доступного сервера"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Ошибка обновления GeoIP.dat"
 
-#: src/ServerConnect.cpp:187
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Подключен к %s (%s:%i)"
+msgid "Failed to download %s from %s"
+msgstr "Не удалось загрузить %s с %s"
 
-#: src/ServerConnect.cpp:263
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Установлено соединение с: %s"
+msgid "Failed to load country data for '%s'."
+msgstr "Не удалось загрузить данные страны для %s"
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr "Ошибка во время соединения. Возможно нет соединения с Интернет."
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Загружаю IP-фильтры 'ipfilter.dat' и 'ipfilter_static.dat'."
 
-#: src/ServerConnect.cpp:339
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Утеряно соединение с %s (%s:%i)"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "Не удалось загрузить ipfilter.dat файл '%s', формат файла неизвестен."
 
-#: src/ServerConnect.cpp:349
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) вероятно умер."
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "Не удалось загрузить ipfilter.dat файл '%s', не удалось открыть файл."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) вероятно заполнен."
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Загружен %u IP-диапазон из '%s'."
+msgstr[1] "Загружено %u IP-диапазона из '%s'."
+msgstr[2] "Загружено %u IP-диапазонов из '%s'."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] ""
-"Автоматическое соединение с сервером будет предпринято через %d секунду"
-msgstr[1] ""
-"Автоматическое соединение с сервером будет предпринято через %d секунды"
-msgstr[2] ""
-"Автоматическое соединение с сервером будет предпринято через %d секунд"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Соединение утрачено"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u испорченная строка была пропущена."
+msgstr[1] "%u испорченных строки было пропущено."
+msgstr[2] "%u испорченных строк было пропущено."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Подключение к %s (%s:%i) завершилось ошибкой."
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Переименование нового файла %s неудачно, прекращаем обновление."
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ОШИБКА: сокет был закрыт по таймауту"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "IP-фильтр готов"
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Время ожидания соединения с %s (%s:%i) вышло."
-
-#: src/DownloadQueue.cpp:154
+# Похоже, bootstrap в eMule перевели как инициализация
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-"ОШИБКА: не удалось загрузить резервный файл. Ищите на http://forum.amule.org "
-"как восстановить файл part.met"
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Частично загруженных файлов не найдено"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Найден %u частично закаченный файл"
-msgstr[1] "Найдено %u частично закаченных файла"
-msgstr[2] "Найдено %u частично закаченных файлов"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
-"Файловая система каталога временных файлов не поддерживает файлы больших "
-"размеров"
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Файловая система каталога принятых файлов не поддерживает файлы больших "
-"размеров"
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Приём %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Вы уже загружаете файл '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "У вас уже есть файл '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Вы уже пытаетесь загрузить файл %s"
+"Инициализация от \n"
+"известных клиентов"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Не удается преобразовать magnet-ссылку в eD2k: %s"
+msgid "Nodes (%u)"
+msgstr "Узлы (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Неизвестный протокол ссылки: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Неверный IP для инициализации"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Неверная eD2k ссылка! ОШИБКА: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Неверный порт для инициализации"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Выполнить <str> и выйти."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Пожалуйста, заполните все необходимые поля"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Неверный формат IP-адреса. Пример: xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Вы уверены что хотите загрузить новый файл nodes.dat?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Этой команде требуется аргумент. Доступные аргументы: 'all', имя файла или "
-"число.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Обрабатывается по хэшу:"
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Обрабатывается по имени:"
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr "Эта команда требует аргумента. Допустимые аргументы: хэш файла.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Недопустимое число\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Недопустимый хеш (длина должна быть равна 32 символам)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Операция выполнена успешно."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Запрос не удался: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "IP-фильтрация клиентов: %s\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "ВЫКЛ"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "ВКЛ"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "IP-фильтрация серверов: %s\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Текущий уровень IP-фильтра: %d.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr "Это удалит используемые в данный момент узлы и перезапустит Kademlia."
 
-# писать тут "вверх" и "вниз" по-моему глупо. да и не поймет никто
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Ограничения загрузки: UL: %u kB/сек, DL: %u kB/сек.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Продолжить?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kad: слово запроса лишком коротко"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Подключен с %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "LowID"
+msgid "Keyword for search: %s"
+msgstr "Ключевое слово поиска: %s"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "HighID"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Идёт подключение"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: ключевое слово поиска уже в списке поиска:"
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Отсоединен"
-
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
-msgstr ""
-"\n"
-"Закачка:\t%s"
-
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Отдача:\t%s"
+"Ошибка чтения nodes.dat - формат файла устарел. Эта версия (0) больше не "
+"поддерживается."
 
-#: src/TextClient.cpp:729
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Клиентов в очереди:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Считан %u контакт Kad"
+msgstr[1] "Считано %u контакта Kad"
+msgstr[2] "Считано %u контактов Kad"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Всего источников:\t%d\n"
+"Не найдено контактов. Произведите инициализацию, или загрузите файл nodes."
+"dat."
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Число результатов поиска: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "СДЕЛАТЬ - отобразить прогресс поиска"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Доступен только %d контакт Kad, файл nodes.dat не записан"
+msgstr[1] "Доступно только %d контакта Kad, файл nodes.dat не записан"
+msgstr[2] "Доступно только %d контактов Kad, файл nodes.dat не записан"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Получен неверный ответ сервера, OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Показать краткую информацию о статусе."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr ""
-"Показать состояние соединения, такущие скорости отдачи/закачки, и т.д.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Показать полную статистику."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Записан %d Kad контакт"
+msgstr[1] "Записано %d Kad контакта"
+msgstr[2] "Записано %d Kad контактов"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Дополнительно этой команде в качестве аргумента может быть передано число от "
-"0 до 255,\n"
-"которое указывает сколько версий клиентов должно быть показано.\n"
-"0 или пустое значение отключает ограничение.\n"
-"\n"
-"Пример:  'statistics 5' покажет только пять наиболее частых номеров версий "
-"каждого клиента .\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Имя файла"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Закрыть aMule."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Размер файла"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Завершить работу удаленного ядра (amule/amuled).\n"
-"Это так же завершит работу текстового клиента, т.к.\n"
-"без ядра он бесполезен.\n"
+# по крайней мере торренты называют его так
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Рейтинг"
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Обновляет данный объект."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Загружено"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Обновляет список публикуемых файлов."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Запрошено"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Обновляет IP фильтр из файла."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Разрешено"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Подключиться к сети."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Полных источников"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"Подключиться ко всем сетям, включенным в настройках\n"
-"Также можно указать адрес сервера, к которому надо\n"
-"подключиться, в форме IP:Порт. В поле IP вводится либо\n"
-"сетевой адрес вида x.x.x.x, либо доменное имя."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Подключиться только к eD2k."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Подключиться только к Kad."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Отключиться от сети."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Это отключит от всех подсоединенных сетей.\n"
+"ПРЕДУПРЕЖДЕНИЕ: Список известных файлов поврежден, содержит некорректный "
+"заголовок."
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Отключиться только от eD2k."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Отсоединиться от Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Добавляет eD2k или magnet-ссылку в ядро"
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"Добавляемая eD2k ссылка может являться:\n"
-"*) ссылкой на файл (ed2k://|file|...), тогда данный файл будет\n"
-"    добавлен в очередь на закачку\n"
-"*) ссылкой на сервер (ed2k://|server|...), тогда данный сервер будет\n"
-"    добавлен в список серверов\n"
-"*) ссылкой на список серверов, тогда все сервера из него будут\n"
-"   добавлены в список\n"
-"\n"
-"magnet-ссылка должна содержать eD2k хэш и длину файла.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Установить значение параметра."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Установить настройки IPFilter."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Включить IP-фильтрацию для клиентов и серверов."
+"Ошибка загрузки элемента списка известных файлов, файл возможно поврежден"
 
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Выключить IP-фильтрацию для клиентов и серверов."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Включить/выключить IP-фильтрацию для клиентов."
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
+msgstr "Неверный элемент списка известных файлов, файл возможно поврежден:"
 
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Включить IP-фильтрацию для клиентов."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Выключить IP-фильтрацию для клиентов."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Включить/выключить IP-фильтрацию для серверов."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Включить IP-фильтрацию для серверов."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Выключить IP-фильтрацию для серверов."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Выбирите уровень IP фильтрации."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
-msgstr ""
-"Допустимые уровни фильтрации находятся в диапазоне 0-255,\n"
-"значением по умолчанию является 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Укажите пределы канала."
+#: src/libs/common/Format.cpp:307
+#, c-format
+msgid "Unknown error %d"
+msgstr "Неизвестная ошибка %d"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "Значения тут указываются в кб/сек (килобайтах в секунду).\n"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Невозможно получить описание ошибки %d"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Укажите ограничение скорости по даче."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Хешируется"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Укажите ограничение скорости по закачке."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Завершается"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Получить и отобразить значение параметра."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Завершен"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Получить параметры IPFilter."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Приостановлен"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Получить состояние IPFilter для клиентов и серверов."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Ошибочный"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Получить состояние IPFilter только для клиентов."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Ожидает"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Получить состояние IPFilter только для серверов."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Необходимо указать пароль."
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Получить уровень IPFilter."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Неверный пароль. Не MD5-хеш!"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Получить ограничения полосы пропускания."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Подключение не удалось"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Выполняет поиск."
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "EC соединение не удалось. Пустой ответ."
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
-"Необходимо указать тип поиска с помощью следующих значений:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Пример: 'search kad file' выполнит поиск в Kad файла \"file\".\n"
-
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Выполняет глобальный поиск"
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Выполняет локальный поиск"
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Выполняет поиск в Kad"
+"Внешнее соединение: Некорректный ответ, авторизация неудачна. Соединение "
+"закрыто."
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Показывает результат последнего поиска."
-
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Возвращает результат предыдущего поиска.\n"
-
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Показывает состояние поиска."
-
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Показывает состояние поиска.\n"
-
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Начать загрузку файла."
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Успешное подключение к aMule "
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Должен быть указан номер файла из последнего поиска.\n"
-"Пример: 'download 12' запустит загрузку файла номер 12 из последнего "
-"поиска.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Соединение установлено."
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Приостановить закачку."
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Внешнее Соединение: В доступе отказано по причине:"
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Продолжить закачку."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Внешнее Соединение: авторизация неудачна."
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "ListenSocket: Ok."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Отменить закачку."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "ОШИБКА: невозможно открыть TCP порт."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Установить приоритет загрузки."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "ОШИБКА:"
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr ""
-"Установить для загрузки низкий, нормальный, высокий или автоматический "
-"приоритет.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "ПРЕДУПРЕЖДЕНИЕ:"
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Установить низкий приоритет."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Закрыть"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Установить нормальный приоритет."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Вырезать"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Установить высокий приоритет."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Копировать"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Установить авто-приоритет."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Вставить"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Показать очереди/списки."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Очистить"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Показывает очереди на закачку/отдачу, список серверов или публикуемых "
-"файлов.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Выделить все"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Показать очередь на отдачу."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "кБ/сек"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Показать очередь на закачку."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Неограниченно"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Показать журнал."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Меню aMule в области уведомлений"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Показать список серверов."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Ограничения скорости:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Очистить журнал."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "UL: Нет"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Устаревшая команда, используйте вместо нее '%s'."
+msgid "UL: %u"
+msgstr "UL: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Устаревшая команда, и возможно в будущем будет удалена.\n"
-"Используйте вместо нее '%s'.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "DL: Нет"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ОШИБКА: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "DL: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Скорость приема: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Новый ID клиента %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "ПРЕДУПРЕЖДЕНИЕ: вы получили Low-ID!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr ""
-"\tСкорее всего это из-за того, что вы находитесь за брандмауэром или "
-"маршрутизатором."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tДля подробностей, обратитесь к http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Скорость отдачи: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Получена неизвестная информация о сервере. - слишком коротко"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Информация о клиенте"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Получено %d новых серверов"
-msgstr[1] "Получено %d новых серверов"
-msgstr[2] "Получено %d новых серверов"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Сохранение списка серверов завершено."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Сервер отклонил последнюю команду"
+msgid "Nickname: %s"
+msgstr "Псевдоним: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Подложный пакет получен от сервера: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Псевдоним не выбран!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Неизвестная ошибка при обработке пакета от сервера: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID клиента: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Невозможно создать поток разрешения DNS для соединения с %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Отсоединен"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "IP адрес сервера %s (%s) запрещен фильтром.  Соединение отменено."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Имя сервера: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "использую вуалирование протокола."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP-адрес сервера: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Установка соединения с %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Не подключен"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Не удалось разрешить DNS для сервера %s: Невозможно подключиться."
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Не удалось загрузить данные о стране"
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Загружено %d флагов."
-msgstr[1] "Загружено %d карт флагов."
-msgstr[2] "Загружено %d карт флагов."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr "Вы уверены, что хотите отменить и удалить все файлы в этой категории?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Требуется подтверждение"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Все остальные"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Незавершенные"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Активный"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Видео"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Аудио"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Архив"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD-образ"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Изображение"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Текст"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Выбрать фильтр просмотра"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Добавить категорию"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Редакировать категорию"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Удалить категорию"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Имя файла"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Размер файла"
-
-# по крайней мере торренты называют его так
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Рейтинг"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Загружено"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Запрошено"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Разрешено"
+msgid "TCP port: %d"
+msgstr "TCP порт: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Полные источники"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP порт: Не готово"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Импортируется %s: %s"
+msgid "UDP port: %d"
+msgstr "UDP порт: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Чтение из временного каталога"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UDP порт: Не готово"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Извлекаю основную информацию из информационного файла загрузки"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Онлайн-подпись: Включена"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Создаю целевой файл"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Онлайн-подпись: Выключена"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Загружаю данные из старого файла загрузки (%u из %u)"
+msgid "Uptime: %s"
+msgstr "Время работы: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Сохраняю данные в новый монолитный файл загрузки (%u из %u)"
-
-# не уверен что верно
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Получаем информацию по источникам"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Добавляю загрузку и сохраняю новый частично закачанный файл"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Импорт частично загруженных файлов"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Состояние"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Хеш файла"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Ожидание..."
+msgid "Shared files: %d"
+msgstr "Опубликованные файлы: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Диск: %s)"
-
-# Полностью лучше не переводить - это титул небольшого диалога.
-# Если перевести полностью - будет маленький, но широоооокий диалог :)
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr "Укажите каталог для поиска незавершенных загрузок."
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "Вы хотите, чтобы исходные файлы импортированных закачек были удалены?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Удалить исходные файлы?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "Б"
-msgstr[1] "байт"
-msgstr[2] "байт"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "КБ"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "МБ"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "ГБ"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "ТБ"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "К"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "М"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "Г"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "Т"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "Б/с"
-msgstr[1] "байт/сек"
-msgstr[2] "байт/сек"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "МБ/с"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "с"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "м"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "ч"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "д"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Видео"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Архив"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Текст"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Программа"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Любой"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Без оценки"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Ошибочный / Повреждённый / Фальшивка"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Плохой"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Очень хороший"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Хороший"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Великолепный"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "все"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "все остальные"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Загружаю IP-фильтры 'ipfilter.dat' и 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Клиентов в очереди: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Не удалось загрузить ipfilter.dat файл '%s', формат файла неизвестен."
+msgid "Total DL: %s"
+msgstr "Всего загружено: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "Не удалось загрузить ipfilter.dat файл '%s', не удалось открыть файл."
+msgid "Total UL: %s"
+msgstr "Всего передано: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Загружен %u IP-диапазон из '%s'."
-msgstr[1] "Загружено %u IP-диапазона из '%s'."
-msgstr[2] "Загружено %u IP-диапазонов из '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Ограничение отдачи"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u испорченная строка была пропущена."
-msgstr[1] "%u испорченных строки было пропущено."
-msgstr[2] "%u испорченных строк было пропущено."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Ограничение приема"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Активные соединения (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Свернуть aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Детали файла"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Показать aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% готово"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Выйти"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "eD2k ссылка:"
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Добавить"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Нажмите сюда чтобы добавить eD2k ссылку из текстового поля в очередь "
 "загрузок."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4609,19 +2724,19 @@
 "Тут отображаются события. Для полного списка событий, обратитесь к журналу в "
 "окне \"Сети\"."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Загружается..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Количество пользователей на сервере, к которым вы подключены..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Пользователей: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4629,8 +2744,12 @@
 "Пользователи, подключенные к данному серверу и оценка общего количества "
 "пользователей."
 
-# Тултип. Лучше оставить как можно более коротким (не все системы автоматом делают их многострочными ;-))
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Передача: 0.0 | Прием: 0.0"
+
+# Тултип. Лучше оставить как можно более коротким (не все системы автоматом делают их многострочными ;-))
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4639,1232 +2758,1223 @@
 "включены), отображают служебный трафик (трафик связи между клиентами)."
 
 # Тултип. Лучше оставить как можно более коротким (не все системы автоматом делают их многострочными ;-))
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
 "low ID (firewalled) and green arrows signify that you have high ID (The "
 "optimal connection type)."
 msgstr ""
-"Статус соединения. Красная стрелка - нет соединения, жёлтая - LowID (вы за "
-"маршрутизатором или брандмауэром), зелёная - HighID (оптимальный вариант)."
+"Статус соединения. Красная стрелка - нет соединения, желтая - LowID (вы за "
+"маршрутизатором или брандмауэром), зеленая - HighID (оптимальный вариант)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Не подключен..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Подключен к серверу."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Поиск"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Тип"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Локальный"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Глобальный"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "По хешу"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Дополнительные параметры"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Фильтрация"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Тип файла"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Любой"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Архив"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Аудио"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD-образ"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Изображение"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Программа"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Текст"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Видео"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Расширение"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Мин. размер"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Байт"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "КБ"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "МБ"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "ГБ"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Макс. размер"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Доступность"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Фильтр:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Фильтровать результаты"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Инвертировать"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Скрывать известные файлы"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Начать"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Дополнительно"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Искать больше результатов в eD2k. Для Kad пока не поддерживается."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Остановить"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Загрузка"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Сбросить значения"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Результаты"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Очистить результаты"
 
-# Неточно, но соответствует тому, что делает кнопка
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Отдача/Очередь/Клиенты"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Клиентов в очереди:"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Отправить"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Отправить данное сообщение."
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Источников:"
 
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Закрыть"
-
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Закрыть данный чат."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Общие"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Полное имя :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/A"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "Файл met:"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Хеш:"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Размер файла:"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Статус:"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Последний раз полный файл был доступен :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Передача"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Найдено источников:"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Передающие источники:"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Число частей:"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Доступно:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Скорость передачи:"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Время активности закачки:"
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Передано:"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Завершено:"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
-msgstr "I.C.H. (интеллектуальная обработка повреждений)"
+msgstr "Интеллектуальная Обработка Ошибок (I.C.H.)"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Потери из-за повреждений :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Выигрыш сжатия:"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Экономия пакетов I.C.H. :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Имя файла"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Выбрать"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Очистить"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Применить"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ok"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Комментарий/Оценка файла (Текст будет доступен всем пользователям)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Например, для фильма вы можете указать его длительность, сюжет, язык...\n"
-"Если это - фальшивка, вы можете сообщить об этом остальным пользователям "
+"Например, для фильма вы можете указать его длительность, сюжет, язык...\\n"
+"\\nЕсли это - фальшивка, вы можете сообщить об этом остальным пользователям "
 "aMule."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Качество файла"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Без оценки"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Ошибочный / Поврежденный / Фальшивка"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Плохой"
+
+# было "очень хороший" непонятно почему. это название среднего рейтинга (обе полоски белые)
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Нормальный"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Хороший"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Великолепный"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "Выберите оценку файлу, или сообщите пользователям, что это - утка..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Обновить"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Идет загрузка, подождите..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Неизвестный размер"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Обязательная информация"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP адрес :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Порт :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Дополнительная информация"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Имя пользователя :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Хеш пользователя :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Обновить список публикуемых файлов"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Текущий сеанс"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Всего"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Запрошено:"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Активных загрузок: "
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Добавить"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
-msgstr "Скорость приёма"
+msgstr "Скорость приема"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Текущая"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Средняя за все время"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "В среднем за сеанс"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Скорость отдачи"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Соединения"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Активные загрузки"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Активные соединения (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Активные передачи"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Дерево статистики"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Имя пользователя:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Хеш пользователя:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Клиентское ПО:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Версия клиентского ПО:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP адрес:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID пользователя:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP сервера:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Имя сервера:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Вуалирование:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Передача"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Текущий запрос:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Средняя скорость отдачи:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
-msgstr "Средняя скорость приёма:"
+msgstr "Средняя скорость приема:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Передано (сеанс):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Принято (этот сеанс):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Передано всего:"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Принято всего:"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
-msgstr "Счёт"
+msgstr "Счет"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Модификатор DL/UP:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Безопасная идентификация:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Рейтинг (всего):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "QR:"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
-msgstr "Счёт на передачу:"
+msgstr "Счет на передачу:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - the Linux Mule"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - многоплатформный Mule"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Это имя, которое будет показано пользователям, подключающимся к вам."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Язык"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Язык:"
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Задержка отображения контекстных подсказок (как эта) в секундах."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Выберите язык интерфейса."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Прочие параметры"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Проверка наличия новой версии при запуске"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr "При запуске aMule будет проверено наличие новой версии"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Сворачиваться при запуске"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Сразу после запуска  aMule будет минимизирован в область уведомлений."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Подтверждение при выходе"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Подтверждение на закрытие aMule."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "Делать подтверждающий запрос перед выходом"
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Значок в области уведомлений"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Эта опция включает/выключает значок в области уведомлений"
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Сворачивать в область уведомлений"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr "Сворачивать aMule в область уведомлений, а не в панель задач."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Задержка контекстных подсказок в секундах"
-
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Задержка отображения контекстных подсказок (как эта) в секундах."
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Время задержки подсказок:"
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "секунд"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Выбор браузера"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Системные настройки"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Выберите браузер"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Свой браузер:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Введите здесь имя браузера. Чтобы использовать другой браузер, выберите "
-"'Свой браузер' из выпадающего меню чуть выше."
+"Введите имя предпочитаемого браузера. Оставьте поле пустым чтобы "
+"использовать системный браузер по умолчанию."
+
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Открыть"
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Открывать в новой вкладке"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Открывать веб-страницы в новой вкладке, а не в отдельном окне, если это "
 "возможно"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Видео-проигрыватель"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Создавать копию для предпросмотра"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr "Ограничения скорости"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
+msgstr "Ограничения загрузки"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Отдача"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Слот"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Стандартный TCP-порт клиента:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Порты"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Стандартный порт TCP"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Это стандартный порт eD2k, он не может быть отключен."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Дополнительный UDP-порт клиента:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "Порт UDP для запросов сервера (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr ""
-"Этот UDP порт используется для дополнительных запросов ed2k а также для Kad-"
-"сети"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Дополнительный порт UDP (Kad / Глобальный поиск)"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "выключить"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr "Этот порт UDP используется для дополнительных eD2k запросов и Kad"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Локальный адрес"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "UDP-порт для расширенных запросов сервера (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Макс. количество источников на файл"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Разрешить UPnP форвардинг портов роутера"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Жесткое ограничение"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnP TCP порт (Не обязательно):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Ограничение соединений"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Макс. соединений"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Закрепить локальный адрес за IP (пустой для любого):"
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Только для продвинутых пользователей: если у вас несколько сетевых "
+"интерфейсов введите адрес того, которым будет пользоваться aMule."
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Максимум источников на файл:"
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Максимум одновременных соединений:"
+
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Универсальный Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Включить UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP TCP-порт:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Соединяться автоматически после запуска"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Восстановить соединение в случае разрыва"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Показывать служебный трафик"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Настройки сервера"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Удалить нерабочий сервер после"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "попыток"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Автоматически обновлять список серверов при запуске"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Список"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Обновлять список серверов при подключении к серверу"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Обновлять список серверов при подключении к клиенту"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Использовать систему приоритетов"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Проверка на LowID при подключении к серверу"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Безопасное подключение"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Автоподключение только к статическим серверам"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Высокий приоритет серверов, добавленных вручную"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.M. включено"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH доверяет всем хешам (не рекомендуется)"
+# слишком уж частая аббривеатура. написать И.О.О. - никто не поймет
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Интеллектуальная Обработка Ошибок (I.C.H.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Разрешить"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "AICH-доверие для каждого хэша (не рекомендуется)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Добавлять файлы на загрузку в режиме паузы"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Добавлять файлы в загрузку с авто приоритетом"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Пытаться сначала загрузить первую и последнюю части"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Добавлять новые файлы для публикации с авто приоритетом"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Пытаться передать полные части всем клиентам"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Снимать с паузы файл при завершении загрузки другого"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Возобновлять следующий файл на паузе при завершении загрузки"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Из той же категории"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Оставлять 10 источников для редких файлов (<20 источников)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "В алфавитном порядке"
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Дисковое пространство"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Заранее выделять место для новых фалов"
+
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
+"Сразу выделяет место под весь файл. Таким образом уменьшается фрагментация"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Проверка дискового пространства"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Останавливать загрузки по окончанию свободного места на диске"
 
-#: src/muuli_wdr.cpp:2058
+#: src/muuli_wdr.cpp:1819
 msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 "Отметьте это если  хотите чтобы aMule проверял наличие свободного места"
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Минимальное свободное место"
-
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "Введите здесь минимальное количество свободного места на диске."
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "Заранее выделять место для новых фалов"
-
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
-"Сразу выделяет место под весь файл. Такоим образом уменьшается фрагментация"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Оставлять 10 источников для редких файлов (<20 источников)"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Входящие"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Отдача"
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Временные"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Добавлять новые файлы для публикации с авто приоритетом"
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Опубликованные"
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Папка для загружаемых файлов"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Папка для временных файлов"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Публикуемые папки"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 "(кликните правой кнопкой на значке каталога для рекурсивной публикации)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Включая скрытые файлы"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Графики"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Интервал обновления: 5 сек"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Время для среднестатического графика: 100 минут"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Масштаб графика соединений: 100 "
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Выберите цвета для статистики"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Масштаб графика загрузки:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Масштаб графика отдачи:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Цвета:"
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Фон"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Сетка"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
-msgstr "Загрузить текущий"
+msgstr "Текущая загрузка"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Средняя общая загрузка"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Средняя загрузка за сеанс"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Текущая отдача"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Средняя общая отдача"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Средняя отдача за сеанс"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Активные соединения"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Скорость передачи в области уведомлений"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Узлы Kad (текущие)"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Узлы Kad (действующие)"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Узлы Kad (сессия)"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Выбрать"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Дерево"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Число отображаемых версий клиентов (0=неогр.)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Пропускная способность линии"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Учтите: эти значения используются только для статистик."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! ВНИМАНИЕ !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Не изменяйте следующие настройки до тех пор, пока\n"
-"вы не будете абсолютно не уверены в том, что вы делаете,\n"
-"в противном случае может случиться непоправимое.\n"
-"\n"
-"aMule будет превосходно работать и БЕЗ ИЗМЕНЕНИЯ вами\n"
-"этих настроек."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Дополнительные настройки"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Предел количества новых соединений за 5 секунд"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Размер буфера: 240000 байт"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Размер очереди: 5000 клиентов"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Интервал обновления соединения с сервером: Отключено"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Индикатор процесса загрузки файлов"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Показывать процентное значение"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Отключить засыпание компьютера"
+
+# в LA помнится так и перевели - "шкурка", но по-моему глупо.
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Скин:"
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Показывать строку \"быстрой загрузки\" в каждой вкладке."
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Показывать полосу выполнения"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
+msgstr "Показывать дополнительную информацию на закладках категорий"
+
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Выводить скорость передачи в заголовке"
+
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Выводить скорость передачи в заголовке"
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Стиль полоски процесса"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Перед именем приложения"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "После имени приложения"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Показывать скорость служебного трафика"
+
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Вертикальное расположение панели инструментов"
 
-#: src/muuli_wdr.cpp:2351
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "Показывать национальные флаги клиентов"
+
+# This is the heading for the preference options regarding the files in the transfer list.
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Загружаемые файлы"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Показывать процент загрузки"
+
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Показывать полосу выполнения"
+
+#: src/muuli_wdr.cpp:2144
 msgid "Flat"
 msgstr "Плоская"
 
-#: src/muuli_wdr.cpp:2354
+#: src/muuli_wdr.cpp:2150
 msgid "Round"
 msgstr "Круглая"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Скины"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Включить поддержку тем оформления"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Тема:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- темы не установлены -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Сортировка колонок"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Автосортировка в списке загрузок (большая нагрузка на процессор)"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Авто-сортировка файлов (нагружает процессор)"
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp:2157
 msgid "aMule will sort the columns in your download list automatically"
 msgstr "aMule будет сортировать файлы в списке загрузок автоматически."
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Прочие настройки"
-
-# возможно перевод неверен. никогда не встречал сей надписи
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Показывать быстрый обработчик eD2k ссылок"
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "Параметры внешних соединений"
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
-msgstr "Показывать дополнительную информацию на закладках категорий"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "Принимать внешние соединения"
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "Выводить скорость передачи в заголовке"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP прослушиваемого интерфейса:"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Вертикальное расположение панели инструментов"
+#: src/muuli_wdr.cpp:2190
+msgid ""
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
+msgstr ""
+"Введите сюда IP в формате a.b.c.d для прослушиваемого интерфейса ВС. Пустое "
+"поле или значение 0.0.0.0 означают любой интерфейс."
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Отображать номер частично закачанного файла перед именем"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "порт TCP:"
 
-#: src/muuli_wdr.cpp:2434
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
+msgstr "Включить UPnP для порта ВС"
+
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Пароль"
+
+#: src/muuli_wdr.cpp:2221
 msgid "Web server parameters"
 msgstr "Параметры веб-сервера"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Запуск 'amuleweb' при загрузке aMule"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Порт веб-сервера"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Разрешить UPnP форфардинг порта для веб-сервера"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "UPnP TCP порт веб-сервера"
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Запускать веб-сервер при старте"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Период обновления страницы (в секундах)"
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Веб-шаблон"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Включить сжатие Gzip"
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Пароль для обычного доступа"
 
-#: src/muuli_wdr.cpp:2477
+#: src/muuli_wdr.cpp:2243
 msgid "Enable Low rights User"
-msgstr "Допустить не привилегированных пользователей"
+msgstr "Разрешить ограниченный доступ"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Пароль для привилегированного доступа"
-
-#: src/muuli_wdr.cpp:2490
+#: src/muuli_wdr.cpp:2249
 msgid "Low rights password"
 msgstr "Пароль ограниченного доступа"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Веб-шаблон"
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Разрешить UPnP форвардинг порта веб-сервера"
 
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "Параметры внешних соединений"
-
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "Принимать внешние соединения"
-
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"IP целевого интерфейса\n"
-"(оставьте пустым для любого)"
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "UPnP TCP порт веб-сервера (не обязательно):"
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
-msgstr ""
-"Введите сюда актуальный IP в формате a.b.c.d для целевого интерфейса ВС. "
-"Пустое поле или значение 0.0.0.0 означают любой интерфейс."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Период обновления страницы (в секундах)"
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP-порт"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Включить сжатие Gzip"
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
-msgstr "Включить UPnP для порта ВС"
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "ОК"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Кликните тут, чтобы сохранить внесенные вами изменения."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Сбросить все изменения, внесенные вами."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Заголовок :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Комментарий :"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Каталог загрузок:"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Установить приоритет для новых файлов:"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "Не изменять"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Выбрать цвет для этой категории:"
 
-# MOTD - Message Of The Day
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Показывать \"сообщение дня\" с сервера при подключении..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Сообщение сервера"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Сбросить"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Кликните тут для очистки журнала."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Журнал aMule"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Кликните здесь чтобы обновить список серверов через URL ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Список серверов"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
 msgstr ""
-"Введите URL к файлу 'server.met' сервера и нажмите кнопку слева для "
-"обновления списка известных файлов."
+"Введите URL к файлу 'server.met' и нажмите кнопку слева для обновления "
+"списка известных серверов."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Добавить сервер вручную: Имя"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Введите имя нового сервера"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Порт"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Введите здесь IP-адрес сервера в формате: x.x.x.x"
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Введите здесь порт сервера."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
-msgstr "Добавить сервер (предварительно заполнив поля слева) ..."
+msgstr "Добавить сервер (предварительно заполните поля слева) ..."
+
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Журнал aMule"
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Сообщение сервера"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "Инфо ED2K"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Инфо Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Нажмите на эту кнопку чтобы обновить список узлов из URL..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Узлы (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5872,52 +3982,57 @@
 "Ведите сюда URL к файлу nodes.dat и нажмите кнопку слева чтобы обновить "
 "список известных узлов."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Статистика узлов"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
-msgstr "Подключиться"
+msgstr "Инициализация"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Новый узел"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Порт:"
 
 # Похоже, bootstrap в eMule перевели как инициализация
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Инициализация от \n"
-"известных клиентов"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Инициализация от известных клиентов"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Отключить Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2k информация"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Использовать безопасную идентификацию пользователя"
+
+# интересно, что на самом деле подразумевалось под 'credits'
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Рекомендуется включить данную опцию. Вы не будете получать рейтинга если БИП "
+"выключена."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Вуалирование протокола"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Поддержка вуалирования протокола"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5925,11 +4040,11 @@
 "Включает вуалирование протокола и позволяет aMule принимать завуалированные "
 "соединения от других клиентов."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Использовать вуалирование исходящих соединений"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5937,11 +4052,11 @@
 "Включает вуалирование протокола при соединении с другими клиентами и "
 "серверами."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Принимать только завуалированные соединения"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5949,85 +4064,81 @@
 "aMule будет принимать только завуалированные соединения. У вас будет меньше "
 "источников, но зато весь трафик будет завуалирован."
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Настройки файлов"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
-msgstr "Всем"
+msgstr "Все"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
-msgstr "Ни одного"
+msgstr "Никто"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Кому показывать публикуемые файлы:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Кто может запрашивать публикуемые файлы:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Выберите, кому показывать список ваших файлов."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Фильтрование IP"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Фильтровать клиентов."
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Включает фильтрацию IP клиентов в соответствии с файлом ~/.aMule/ipfilter."
 "dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Фильтровать сервера"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Включает фильтрацию IP серверов в соответствии с файлом ~/.aMule/ipfilter."
 "dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Обновить список"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Прочесть список IP адресов, указанных в файле '~/.aMule/ipfilter.dat'."
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Обновить сейчас"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Автоматически обновлять IP-фильтр при запуске"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Уровень фильтрации:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Всегда фильтровать IP-адреса LAN"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Параноидная обработка несовпадающих IP "
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6035,34 +4146,21 @@
 "Отбрасывает пакеты у которых IP клиента отличается от IP с которого пришел "
 "пакет. Используйте осторожно."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Использовать системный ipfilter.dat если возможно"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
 msgstr "Если не найден локальный ipfilter.dat разрешить использовать системный"
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Использовать безопасную идентификацию пользователя"
-
-# интересно, что на самом деле подразумевалось под 'credits'
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Рекомендуется включить данную опцию. Вы не будете получать рейтинга если БИП "
-"выключена."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Включить Online-подпись"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6070,811 +4168,1275 @@
 "Включает запись файла OS, который может использоваться другими приложениями "
 "для создания подписей."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Частота обновления (в секундах):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Изменить частоту обновления для Online-подписи в секундах."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Каталог Online-подписи:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Сохранять Online-подпись в:"
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr "Кликните здесь, чтобы выбрать каталок для файлов Online-подписи."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Отключить/Включить"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Фильтровать входящие сообщения (кроме текущего чата):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "настройки фильтра:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Фильтровать все сообщения"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Фильтровать сообщения пользователей не из вашего списка друзей"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Фильтровать сообщения от неизвестных клиентов"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Фильтровать сообщения по содержанию (используйте ',' как разделитель):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "Добавьте сюда ключевые слова, при наличии которых aMule будет "
 "отфильтровывать и блокировать входящие сообщения."
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Показывать полученные сообщения в логе"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Комментарии"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Фильтровать комментарии содержащие (используйте ',' как разделитель):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Автоматическое соединение с сервером без прокси"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Включить идентификацию"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Включить/выключить использование пароля и логина"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Имя:"
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Имя пользователя для подключения к прокси-серверу"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Пароль:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Пароль для подключения к прокси-серверу"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Использовать прокси-сервер"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Включить/выключить поддержку прокси-сервера"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Тип прокси-сервера:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Тип прокси-сервера, который вы используете"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Прокси-сервер:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Имя прокси-сервера"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Порт:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
-msgstr "Порт прокси сервера"
+msgstr "Порт прокси-сервера"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Идентификация"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Включить идентификацию"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Включить/выключить использование пароля и логина"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Имя пользователя для подключения"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Пароль:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Пароль для подключения к прокси-серверу"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Автоматическое соединение с сервером без прокси"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Соединиться с:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
-msgstr "Войти на удалённый aMule"
+msgstr "Войти на удаленный aMule"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Имя пользователя"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Запомнить настройки"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Записывать в журнал подробные сообщения отладчика."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Категории сообщений:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Ожидание..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Добавить файлы"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Перезапустить выбранное"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Удалить выбранное"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Типы событий"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr "Типы Событий"
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+"Статистика и очередь клиентов для выбранных файлов: За сессию / За все время"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Активные загрузки"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "Процент от всех файлов"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Все файлы"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Выбранные файлы"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Только активные передачи"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Показать клиентов для"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Обновить:"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Обновить список публикуемых файлов"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Отправить"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Отправить данное сообщение."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Закрыть данный чат."
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Соединиться с произвольным сервером и/или Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Окно сетей"
+# подпись в главном окне. длинная просто не влезет.
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Файлы"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Окно поиска"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Отключено [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Окно передач"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "Б"
+msgstr[1] "байт"
+msgstr[2] "байт"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Окно публикуемых файлов"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "КБ"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Сообщения"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "ТБ"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Статистика"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "К"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Окно настроек клиента"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "М"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Новая категория"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "Г"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Выберите каталог для входящих файлов"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "Т"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Вы должны указать имя для категории!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "Б/с"
+msgstr[1] "байт/сек"
+msgstr[2] "байт/сек"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Вы должны указать путь для категории!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "МБ/с"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"Не удалось создать каталог для загружаемых файлов категории. Укажите верный "
-"путь."
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "с"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "м"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "ч"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "д"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "все"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "все остальные"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Незавершенные"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Остановлен"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Видео"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Архив"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Текст"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Активные"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Неизвестное расширение '%s' для команды '%s'.\n"
+msgid "Using config dir: %s"
+msgstr "Используем директорию конфигурации: %s"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Ожидание завершения нити конвертации файла..."
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Неизвестная команда '%s.'\n"
+msgid "Importing %s: %s"
+msgstr "Импортируется %s: %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"У этой команды не может быть аргументов.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Чтение из временного каталога"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"У этой команды должен быть аргумент.\n"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Извлекаю основную информацию из информационного файла загрузки"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Создаю целевой файл"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Загружаю данные из старого файла загрузки (%u из %u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Сохраняю данные в новый монолитный файл загрузки (%u из %u)"
+
+# не уверен что верно
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Получаем информацию по источникам"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Добавляю загрузку и сохраняю новый частично закачанный файл"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Импорт частично загруженных файлов"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Состояние"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Хеш файла"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Диск: %s)"
+
+# Полностью лучше не переводить - это титул небольшого диалога.
+# Если перевести полностью - будет маленький, но широоооокий диалог :)
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
-msgstr ""
-"\n"
-"Команда не завершена. Необходимо использовать одно из следующих расширений.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
+msgstr "Укажите каталог для поиска незавершенных загрузок."
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
-"\n"
-"Доступные расширения:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "Вы хотите, чтобы исходные файлы импортированных закачек были удалены?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Доступные команды:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Удалить исходные файлы?"
+
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "ОШИБКА: невозможно создать part-файл"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Все команды чувствительны к регистру.\n"
-"Наберите '%s <имя команды>' чтобы получить справку по этой команде.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Попытка загрузки резервной копии файла '.met'  из %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Завершить работу с приложением."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "ОШИБКА: не удалось открыть файл part.met: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Показать справку."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "ОШИБКА: файл part.met пуст: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "ОШИБКА: неверная версия файла part.met: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Чтобы получить справку по команде, наберите  'help <имя команды>'.\n"
-"Чтобы получить полный список команд, наберите 'help'.\n"
+"ОШИБКА: %s (%s) поврежден (неверные теги: %s), невозможно открыть файл."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Введите '%s' для получения списка команд\n"
-"\n"
+"ОШИБКА: %s (%s) поврежден (неверное число тегов), невозможно открыть файл."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Синтаксическая ошибка!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Попытка восстановления информации о файле..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"Ошибка при обработке команды - это не должно было произойти! Пожалуйста, "
-"сообщите нам об этой ошибке\n"
+"Восстановление безымянного файла - попытка восстановить его как "
+"'RecoveredFile.dat'"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "У этой команды не должно быть параметров."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+"Восстановлена вся возможная информация о файлах ;-))) Попытаемся ее "
+"использовать..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "У этой команды должен быть параметр."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Не удалось восстановить информацию о файлах :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Неверный аргумент."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Не удалось открыть %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Команда введена не полность."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: %s возможно поврежден (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Наберите '%s' для подробной справки.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "Ошибка сохранения part-файла: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "Ошибка ввода-вывода во время сохранения файла:"
+
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Это %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Невозможно получить длину '%s' - используется файл %s"
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Это %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "Файл '%s' имеет размер в ноль байт - используется %s."
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Не удалось сохранить файл 'part.met.seeds' для %s"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Сохранен %i источник для файла %s (%s)"
+msgstr[1] "Сохранено %i источника для файла %s (%s)"
+msgstr[2] "Сохранено %i источников для файла %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Файл %s (%s) не имеет сохраненных источников"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Файл %s (%s) не имеет сохраненных источников"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Ошибка при чтении источников частично загруженного файла (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Найдена испорченная часть (%d) в %d части файла %s - FileResultHash |%s| "
+"FileHash |%s|"
+msgstr[1] ""
+"Найдена испорченная часть (%d) в %d частях файла %s - FileResultHash |%s| "
+"FileHash |%s|"
+msgstr[2] ""
+"Найдена испорченная часть (%d) в %d частях файла %s - FileResultHash |%s| "
+"FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Найдена завершенная часть (%i) в %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Завершено повторное хеширование %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Неожиданная ошибка во время завершения %s. Файл приостановлен."
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Загрузка завершена: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Удаление файла: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Создается клиент...\n"
+"ПРЕДУПРЕЖДЕНИЕ: Не удается схэшировать загруженную часть - хэш-набор неполон "
+"для '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Ok, выход из %s...\n"
+"ОШИБКА: Не удается схэшировать загруженную часть - хэш-набор неполон (%s). "
+"Это никогда не должно происходить"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Невозможно подключиться без пароля.\n"
-"Вы должны указать пароль либо в конфигурационном файле,\n"
-"либо используя командную строку.\n"
-"\n"
-"Завершение работы...\n"
+"EOF при хешировании загруженной части %u с длиной %u (макс %u) файла '%s' с "
+"длиной %u: %s"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Показать эту справку."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr ""
+"ПРЕДУПРЕЖДЕНИЕ: не достаточно свободного места на диске. Файл приостановлен: "
+"%s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Узел, на котором работает aMule (по умолчанию - 'localhost')"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Загруженная часть %i повреждена: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Порт aMule для внешних подключений (по умолчанию: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Восстановлена поврежденная часть %i для %s -> Выигрыш: %s Б"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Пароль для внешнего соединения."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Выделяется место"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Прочесть настройки из файла."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Недостаточно места на диске"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Не выводить ничего в поток стандартного вывода."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Загружено"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Детально - выводить отладочную информацию."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "ОШИБКА: не удалось открыть частично закаченный '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Установить локаль программы (язык)."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Системный"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Записать параметры командной строки в конфигурационный файл."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Албанский"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Создаёт конфигурационный файл на основе оного из aMule."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Арабский"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Вывести версию программы."
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Астурианский"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Баскский"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Болгарский"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Каталонский"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Китайский (упрощенный)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Китайский (традиционный)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Хорватский"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Чешский"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Датский"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Голландский"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Английский (Великобритания)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Эстонский"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Финский"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Французский"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Гальский"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Немецкий"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Греческий"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Израильский"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Венгерский"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Итальянский"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Итальянский (Швеция)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Японский"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Корейский"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Литовский"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Норвежский (Нюнорск)"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Польский"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Португальский"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Португальский (Бразилия)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Русский"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Словакский"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Испанский"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Шведский"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Турецкий"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Украинский"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Изменить язык"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
+
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "Недоступен"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "нет доступных опций"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Обнаружена неверная категория, пропускаем"
 
-#: src/ClientCreditsList.cpp:168
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr "TCP порт не может быть выше 65532, так как UDP сокет - TCP+3"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Файл кредитов загружен, %u клиент известен"
-msgstr[1] "Файл кредитов загружен, %u клиента известно"
-msgstr[2] "Файл кредитов загружен, %u клиентов известно"
+msgid "Default port will be used (%d)"
+msgstr "Используется порт по умолчанию (%d)"
 
-#: src/ClientCreditsList.cpp:171
+#: src/Preferences.cpp:1790
 #, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Кредиты перестали действовать для %u клиента!"
-msgstr[1] " - Кредиты перестали действовать для %u клиентов!"
-msgstr[2] " - Кредиты перестали действовать для %u клиентов!"
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Убираем несуществующую опубликованную директорию: %s"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Файл 'cryptkey.dat' не найден. Создаю заново."
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Соединение"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Каталоги"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Сервера"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Файлы"
 
-#: src/amuled.cpp:594
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Безопасность"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Прокси"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Фильтры"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Удаленный контроль"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Online-подпись"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Дополнительно"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "События"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Отладчик"
+
+#: src/PrefsUnifiedDlg.cpp:249
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
-"ОШИБКА: демон aMule не может быть использован когда внешние соединения "
-"выключены. Чтобы включить внешние соединения, используйте aMule, или "
-"запустите amuled с параметром --ec-config, или установите ключ "
-"\"AcceptExternalConnections\" равным 1 в файле ~/.aMule/amule.conf"
+"Эти переменный будут подставлены:\n"
+"   %PARTFILE - полный путь к файлу\n"
+"   %PARTNAME - только имя файла"
 
-#: src/amuled.cpp:750
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Не изменяйте следующие настройки до тех пор, пока\n"
+"вы не будете абсолютно уверены в том, что вы делаете,\n"
+"в противном случае может случиться непоправимое.\n"
+"\n"
+"aMule будет превосходно работать и БЕЗ ИЗМЕНЕНИЯ вами\n"
+"этих настроек."
+
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "ERROR: %s"
-msgstr "Ошибка: %s"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Не удалось подключить Cfg к widget с ID %d и ключом %s"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Разблокировать"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Показать передачу"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Показать очередь"
-
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Показать клиентов"
-
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Выбрать вид"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Клиентская программа"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Время ожидания"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Время загрузки"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Передача/Загрузка"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Удалённый статус"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Приоритет файла"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr "Не удалось передать данные из Cfg к Widget с ID %d и ключом %s"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Счет"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Тип прокси-сервера, который вы используете"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Запрошено"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr "Не удалось передать данные из Widget к Cfg с ID %d и ключом %s"
+
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"Необходимо перезапустить aMule чтобы следующие изменения вступили в силу:\n"
+"\n"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Последний раз был доступен"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Встал в очередь"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- изменен порт TCP.\n"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Статус передаваемых файлов"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- изменен порт UDP.\n"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Передано"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- Порт для внешних соединений изменен.\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- Принятие внешних соединений изменено.\n"
+
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- Интерфейс внешних соединений изменен.\n"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Статус принимаемых файлов"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"Список авто обновления пуст.\n"
+"Автоматическое обновление списка серверов отключено."
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Принято"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Хеш пользователя"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Зашифровано"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Скрыть публикуемые файлы"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Вы включили внешние соединения, но не указали пароль.\n"
+"Внешние соединения нельзя включить до тех пор, пока не указан пароль."
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Сведения о клиенте"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Изменен язык.\n"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Разрешено"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Изменен временный каталог.\n"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Поддерживается"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- сеть eD2k включена. \n"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Не поддерживается"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Сети eD2k и Kad обе отключены.\n"
+"Вы не сможете подсоединиться пока не подключите хотя бы одну из них."
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Запрещено"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad не будет запущена, если UDP-порт выключен.\n"
+"Включите UDP-порт или выключите Kad."
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Вам НЕОБХОДИМО перезапустить aMule немедленно.\n"
+"Иначе не жалуйтесь, если произойдет какая-нибудь неприятность.\n"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Не завершён"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Ваш список авто обновления серверов пуст.\n"
+"Пожалуйста, внесите в список хотя бы один URL, указывающий на корректный "
+"'server.met'.\n"
+"Щелкните на кнопке \"Список\" чтобы ввести URL."
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Нарушитель"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Временные файлы"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Проверено - OK"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Входящие файлы"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Не доступно"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Online-подписи"
 
-#: src/ClientDetailDialog.cpp:215
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+msgid "Choose a folder for %s"
+msgstr "Выберите каталог для %s"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr "Мин. размер должен быть меньше макс. размера. Игнорирую макс. размер."
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Выбрать видео-проигрыватель"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Предупреждение поиска"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Выберите броузер"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Неограниченно"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "Команда запуска%s"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Меню aMule в области уведомлений"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Редактировать список серверов"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Ограничения скорости:"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Впишите сюда адреса для получения файлов 'server.met'.\n"
+"Только один URL в одной строчке."
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "UL: Нет"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Интервал обновления: %d с"
+msgstr[1] "Интервал обновления: %d сек"
+msgstr[2] "Интервал обновления: %d сек"
 
-#: src/MuleTrayIcon.cpp:354
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "UL: %u"
-msgstr "UL: %u"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Отрезок времени, охватывающийся графиком: %d м"
+msgstr[1] "Отрезок времени, охватывающийся графиком: %d минут"
+msgstr[2] "Отрезок времени, охватывающийся графиком: %d минут"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "DL: Нет"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Масштаб графика соединений: %d"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "DL: %u"
-msgstr "DL: %u"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Файловый буфер: %d Б"
+msgstr[1] "Размер буфера: %d байт"
+msgstr[2] "Размер буфера: %d байт"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Скорость приема: %.1f"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Размер очереди отдачи: %d"
+msgstr[1] "Размер очереди отдачи: %d клиентов"
+msgstr[2] "Размер очереди отдачи: %d клиентов"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Скорость отдачи: %.1f"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Частота связи с сервером: %d м"
+msgstr[1] "Интервал обновления соединения с сервером: %d минут"
+msgstr[2] "Интервал обновления соединения с сервером: %d минут"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Информация о клиенте"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Обновление соединения с сервером: Отключено"
+
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "выключена"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "Nickname: %s"
-msgstr "Псевдоним: %s"
+msgid "Execute command on '%s' event"
+msgstr "Выполнить команду при событии '%s'"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Псевдоним не выбран!"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Включить выполнение команд в ядре"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID клиента: "
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Команда ядра:"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Имя сервера: "
+# никто ни в жизни не поймет переведенную аббревиатуру
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Включить выполнение команд в GUI"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP-адрес сервера: "
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Команда GUI:"
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Следующие переменные будут заменены:"
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
-msgstr "TCP порт: %d"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr "Мин. размер должен быть меньше макс. размера. Игнорирую макс. размер."
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "TCP поррт: Не готово"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Предупреждение поиска"
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
-msgstr "UDP порт: %d"
+# It's about default category to download to.
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Общая"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "UDP порт: Не готово"
+# unification
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Поиск по сети Kad не может быть произведен когда она отсоединена."
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Онлайн-подпись: Включена"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "Поиск по сети eD2k  не может быть произведен когда она отсоединена."
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Онлайн-подпись: Выключена"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Ошибка при поиске через Kad: "
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
-msgstr "Опубликованные файлы: %d"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "FileID"
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
-msgstr "Клиентов в очереди: %d"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Файл"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Загрузить в категории"
+
+#: src/SearchListCtrl.cpp:639
 #, c-format
-msgid "Total DL: %s"
-msgstr "Всего загружено: %s"
+msgid "Get %s for this file"
+msgstr "Получить %s для этого файла"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Искать связанные файлы (eD2k, локально)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Отметить как известный"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Копировать eD2k ссылку в буфер"
+
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Отменено"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Новый"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Не могу соединиться ни с одним завуалированным сервером в списке. Пробую еще "
+"раз, но без вуалирования."
 
-#: src/MuleTrayIcon.cpp:483
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "Не удалось соединиться ни с одним указанным сервером. Еще один заход."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "Сеть eD2k отключена в настройках, не соединяется."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "В списке серверов не найдено ни одного доступного сервера"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "Всего передано: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "Подключен к %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Ограничение отдачи"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Установлено соединение с: %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Ограничение приема"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr "Ошибка во время соединения. Возможно нет соединения с Интернет."
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Свернуть aMule"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Утеряно соединение с %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Показать aMule"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) вероятно умер."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Сеанс чата запущен: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) вероятно заполнен."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Соединён с клиентом ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] ""
+"Автоматическое соединение с сервером будет предпринято через %d секунду"
+msgstr[1] ""
+"Автоматическое соединение с сервером будет предпринято через %d секунды"
+msgstr[2] ""
+"Автоматическое соединение с сервером будет предпринято через %d секунд"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Соединение с клиентом ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Соединение утрачено"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Не удалость соединиться с клиентом / Соединение разорвано ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Подключение к %s (%s:%i) завершилось ошибкой."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Закрыть вкладку"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "ОШИБКА: сокет был закрыт по таймауту"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Закрыть все вкладки"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Время ожидания соединения с %s (%s:%i) вышло."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Закрыть остальные вкладки"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Получен старый результат поиска DNS, опускаем."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Загружается файл 'server.met': %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Файл 'server.met' не найден!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Не удалось загрузить файл server.met '%s', потому что он имеет неправильный "
 "формат."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Не удалось открыть файл 'server.met'!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Файл server.met поврежден. Неверная метка версии: 0x%x, размер %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
@@ -6882,7 +5444,7 @@
 msgstr[1] "В файле 'server.met' найдено %i сервера"
 msgstr[2] "В файле 'server.met' найдено %i серверов"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
@@ -6890,54 +5452,62 @@
 msgstr[1] "%d сервера добавлено"
 msgstr[2] "%d серверов добавлено"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Ошибка: файл 'server.met' поврежден:"
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "Ошибка ввода/вывода при чтении файла known.met: "
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Сервер не был добавлен: [%s:%d] не указывает на подходящий порт."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Сервер не был указан: IP адрес [%s:%d] был отфильтрован или неверен."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Сервер не был добавлен: сервер с совпадающим IP:порт [%s:%d] был найден в "
 "списке."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Сервер добавлен: сервер [%s:%d] использует имя '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr ""
 "Вы соединены с сервером, который вы пытаетесь удалить. Отключитесь от него."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Невозможно открыть %s"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Не удалось сохранить файл 'server.met'."
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Неверный URL"
 
-#: src/ServerList.cpp:805
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Finished to download the server list from %s"
-msgstr "Завершена загрузка списка серверов от %s"
+msgid "Finished downloading the server list from %s"
+msgstr "Завершена загрузка списка серверов с %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Не удалось получить список серверов из %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6945,340 +5515,2220 @@
 "Не найдено адресов списков серверов в 'addresses.dat'. Пожалуйста, введите "
 "правильные адреса чтобы авто-обновление работало."
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Начинаю загружать список серверов с %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "ПРЕДУПРЕЖДЕНИЕ: неверный URL для авто-обновления серверов: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 "Отсутствует допустимый 'server.met' файл по адресу для автоматического "
 "обновления серверов"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Не удалось получить список серверов из %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr ""
 "Локальный сервер отфильтрован через IPFilters. Подключаюсь к другому серверу!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Не удалось выполнить команду `%s' при событии `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Имя сервера"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Адрес"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Порт"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Описание"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Пользователей"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Статический"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Версия"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"В связи со сменой версии, значение вашей локали было изменено на значение по "
-"умолчанию. Извините."
+"Вы соединены с сервером, который вы пытаетесь удалить. Сначала нужно "
+"отключиться от него. Сервер НЕ удален."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
-msgstr "Ваш список серверов пуст. Скачать новый список?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Неизвестное имя)"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Загрузить список серверов"
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Вы уверены, что хотите удалить сервер %s из статического списка "
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:347
 #, c-format
-msgid "web server running on pid %d"
-msgstr "веб-сервер работает с pid %d"
+msgid "Servers (%i)"
+msgstr "Серверов (%i)"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Сервер"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Подключиться к серверу"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Внести в список статических серверов"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Удалить из списка статических серверов"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Внести в список статических серверов"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Удалить из списка статических серверов"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Удалить выбранный сервер"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Удалить выбранные серверы"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Удалить все сервера"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Копировать eD2k ссылки в буфер"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Восстановить соединение с сервером"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Вы уверены, что хотите удалить все сервера?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Удалить выбранный сервер?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Удалить выбранные серверы?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "ОШИБКА: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Новый ID клиента %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "ПРЕДУПРЕЖДЕНИЕ: вы получили Low-ID!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
 msgstr ""
-"Вы хотите запускать веб-сервер при загрузке, но исполняемый файл amuleweb не "
-"может быть запущен. Установите пакет содержащий веб-сервер aMule или "
-"скомпилируйте его с опцией --enable-webserver и запустите make install"
+"\tСкорее всего это из-за того, что вы находитесь за брандмауэром или "
+"маршрутизатором."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tДля подробностей, обратитесь к http://wiki.amule.org"
 
-#: src/amule.cpp:937
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Получена неизвестная информация о сервере. - слишком коротко"
+
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Невозможно связать порты с указанными адресами: %s"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Получен %d новый сервер"
+msgstr[1] "Получено %d новых сервера"
+msgstr[2] "Получено %d новых серверов"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Сохранение списка серверов завершено."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Сервер отклонил последнюю команду"
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Порт %u не доступен. У вас будет LowID\n"
+msgid "Bogus packet received from server: %s"
+msgstr "Подложный пакет получен от сервера: %s"
 
-#: src/amule.cpp:970
+#: src/ServerSocket.cpp:600
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Неизвестная ошибка при обработке пакета от сервера: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Невозможно создать поток разрешения DNS для соединения с %s"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "IP адрес сервера %s (%s) запрещен фильтром.  Соединение отменено."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "использую вуалирование протокола."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Установка соединения с %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Не удалось разрешить DNS для сервера %s: Невозможно подключиться."
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Сервер не был добавлен: не указан адрес сервера."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Сервер не был добавлен: указан неверный порт сервера."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Статус eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Статус Kademlia:"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "Работает в режиме LAN"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Выполняется"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Статус:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Состояние соединения:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
-"Порт %u недоступен!\n"
-"\n"
-"Это означает что вам будет выдан LowID.\n"
-"\n"
-"Проверьте вашу сетевую конфигурацию, убедитесь что необходимый порт открыт."
+"За брандмауэром - откройте TCP порт %d на вашем роутере или брандмауэре"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Не удалось создать aMule OnlineSig файл"
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "Состояние UDP соединения:"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Не удалось создать aMule OnlineSig файл"
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr ""
+"За брандмауэром - откройте UDP порт %d на вашем роутере или брандмауэре"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Состояние брандмауэра:"
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Друг не требуется - TCP порт открыт"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Друг не требуется - UDP порт открыт"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Нет друзей"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Соединяем с другом"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Соединяем с другом на %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Проиндексировано источников:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Ключевые слова проиндексированы:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Проиндексировано записей:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Загрузки проиндексированы:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Пользователей в среднем:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Файлов в среднем:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Не запущен"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Добавляем файл %s к списку опубликованных"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Найден %i известный публикуемый файл."
+msgstr[1] "Найдено %i известных публикуемых файла."
+msgstr[2] "Найдено %i известных публикуемых файлов."
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Найден %i известный публикуемый файл, %i неизвестных."
+msgstr[1] "Найдено %i известных публикуемых файла, %i неизвестных."
+msgstr[2] "Найдено %i известных публикуемых файлов, %i неизвестных."
+
+# ей-богу не понимаю что за ошибка и когда вылазит
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "ОШИБКА: попытка опубликовать %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Публикуемая директория не найдена, пропускаем: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Нет публикуемых файлов в директории: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Имя пользователя"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Скорость загрузки"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Скорость отдачи"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Доступные части"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Статус отдачи"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Статус принимаемых файлов"
+
+# Source of a source. I mean, it's where a client came from.
+# (GonoszTopi)
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Откуда"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Локальное имя файла"
+
+# подпись в главном окне. длинная просто не влезет.
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Файлы"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Запросов"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Принятых запросов"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Передано данных"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Коэффициент передачи"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Полученные части"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Полных источников"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Каталог"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Добавить комментарий/рейтинг"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Редактировать комментарий/рейтинг"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Переименовать"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Добавить файлы коллекции в список для закачки"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Скопировать magnet URL в буфер &обмена"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Копировать eD2k ссылку в буфер (&Источник)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Копировать eD2k ссылку в буфер (Источник) (&С шифрованием)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Копировать eD2k ссылку в буфер (Имя &хоста)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr "Копировать eD2k ссылку в буфер (Имя хоста) (С &шифрованием)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Копировать eD2k ссылку в &буфер (информация AICH)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Для создания ссылки на источник требуется HighID"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Публикуемые файлы (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[частично]"
+
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Удаленное имя файла"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Передано за сеанс (всего): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Служебный трафик (пакеты): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Трафик запросов (пакеты): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Трафик обмена источниками (пакеты): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Трафик с сервером (пакеты): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Служебный трафик Kad (пакеты): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Потери шифрования (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Активные отдачи: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Ожидающие отдачи: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Всего успешных сессий отдачи: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Всего неудачных сессий отдачи: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Среднее время отдачи: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Принято за сеанс (всего): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Найдено источников: %s"
+
+# chunk, конечно, никакой не пакет.... но фиг знает
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Активных загрузок (фрагменты файлов): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Соотношение UL:DL (всего): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Средняя скорость закачки (Сессия): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Средняя скорость отдачи (Сессия): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Максимальная скорость закачки (Сессия): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Максимальная скорость отдачи (Сессия): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Пересоединений: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Прошло после первой передачи: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "Время подключения к серверу: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Активных соединений (примерно): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Достигнуто макс. число соединений: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Соединений в среднем (прибл.): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Максимальное число соединений (примерно): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Клиенты"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Неизвестны: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Отфильтрованы: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Заблокированы: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Всего: %i Известно: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Работающих серверов: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Сбойных серверов: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Всего: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Удаленных серверов: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Отфильтрованных серверов: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Пользователей на работающих серверах: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Файлов на работающих серверах: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Всего пользователей: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Всего файлов: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Загруженность сервера: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Число публикуемых файлов: %s"
 
-#: src/amule.cpp:1299
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Общий размер публикуемых файлов: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Средний размер файлов: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Операционная система"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Не получено"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Активные соединения (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Недоступен"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Никогда"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Команда `%s' с pid `%d' завершилась с кодом статуса `%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Выполнить <str> и выйти."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Неверный формат IP-адреса. Пример: xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Выбранная локаль отсутствует в вашей системе (тем не менее, будет "
-"произведена попытка её использовать)."
+"Этой команде требуется аргумент. Доступные аргументы: 'all', имя файла или "
+"номер.\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Обрабатывается по хэшу:"
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Обрабатывается по имени:"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr "Эта команда требует аргумента. Допустимые аргументы: хэш файла.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Недопустимый номер\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Недопустимый хеш (длина должна быть равна 32 символам)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Запрос не удался - неизвестная ошибка."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Операция выполнена успешно."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Это первый запуск aMule %s"
+msgid "Request failed with the following error: %s"
+msgstr "Запрос не удался: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Эта версия является тестовой и обновляется ежедневно.\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "IP-фильтрация клиентов: %s\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr ""
-"Мы не предоставляем никаких гарантий на случай каких либо повреждений, "
-"пожара \n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "ВЫКЛ"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr ""
-"или же смерти вашей любимой собачки. И всё же использование её *должно* быть "
-"безопасным. \n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "ВКЛ"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "IP-фильтрация серверов: %s\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Текущий уровень IP-фильтра: %d.\n"
+
+# писать тут "вверх" и "вниз" по-моему глупо. да и не поймет никто
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Ограничения загрузки: UL: %u kB/сек, DL: %u kB/сек.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Подключен к %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Идет подключение"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "за брандмауэром"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"Эти опции были изменены в данном релизе по соображениям безопасности:\n"
+"\n"
+"Закачка:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"*Включена поддержка вуалирования протокола для входящих и исходящих "
-"соединений.\n"
+"Отдача:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Отключено обновление списка серверов с других серверов и от клиентов.\n"
+"Клиентов в очереди:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Больше информации о причинах этих изменений, выполните поиск\n"
-"в вики aMule по адресу http://wiki.amule.org, используя фразу\"fake servers"
-"\".\n"
-"Важно, чтобы вы удалили все поддельные сервера из списка, чтобы aMule "
-"работал правильно."
+"Всего источников:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Число результатов поиска: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Состояние поиска: %u %% \n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Состояние поиска неизвестно"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Получен неверный ответ сервера, OpCode = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Показать краткую информацию о статусе."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr ""
+"Показать состояние соединения, такущие скорости отдачи/закачки, и т.д.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Показать полную статистику."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Дополнительно этой команде в качестве аргумента может быть передано число от "
+"0 до 255,\n"
+"которое указывает сколько версий клиентов должно быть показано.\n"
+"0 или пустое значение отключает ограничение.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Пример:  'statistics 5' покажет только пять наиболее частых номеров версий "
+"каждого клиента .\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Закрыть aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
+"Завершить работу удаленного ядра (amule/amuled).\n"
+"Это так же завершит работу текстового клиента, т.к.\n"
+"без ядра он бесполезен.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Обновить данный объект."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Обновить список публикуемых файлов."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "Обновить таблицу IP фильтра."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Обновить локальную таблицу IP фильтра."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "Обновить таблицу IP фильтра с URL."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "Если URL пропущен, используется URL из настроек."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Подключиться к сети."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Подключиться ко всем сетям, включенным в настройках\n"
+"Также можно указать адрес сервера, к которому надо\n"
+"подключиться, в форме IP:Порт. В поле IP вводится либо\n"
+"сетевой адрес вида x.x.x.x, либо доменное имя."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Подключиться только к eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Подключиться только к Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Отключиться от сети."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Это отключит от всех подсоединенных сетей.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Отключиться только от eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Отсоединиться от Kad."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Добавить eD2k или magnet-ссылку в ядро"
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"Добавляемая eD2k ссылка может являться:\n"
+"*) ссылкой на файл (ed2k://|file|...), тогда данный файл будет\n"
+"    добавлен в очередь на закачку\n"
+"*) ссылкой на сервер (ed2k://|server|...), тогда данный сервер будет\n"
+"    добавлен в список серверов\n"
+"*) ссылкой на список серверов, тогда все сервера из него будут\n"
+"   добавлены в список\n"
 "\n"
-"Настройки браузера были скинуты на значения по умолчанию. Настройте свой "
-"браузер снова если нужно.\n"
+"magnet-ссылка должна содержать eD2k хэш и длину файла.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Установить значение параметра."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "Установить настройки IP фильтра."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Включить IP-фильтрацию для клиентов и серверов."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Выключить IP-фильтрацию для клиентов и серверов."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Включить/выключить IP-фильтрацию для клиентов."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Включить IP-фильтрацию для клиентов."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Выключить IP-фильтрацию для клиентов."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Включить/выключить IP-фильтрацию для серверов."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Включить IP-фильтрацию для серверов."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Выключить IP-фильтрацию для серверов."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Выбирите уровень IP фильтрации."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Дополнительную информацию, поддержку и обновленные версии вы найдёте на "
-"нашем сайте \n"
+"Допустимые уровни фильтрации находятся в диапазоне 0-255,\n"
+"значением по умолчанию является 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Укажите пределы канала."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "Значения тут указываются в кб/сек (килобайтах в секунду).\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Укажите ограничение скорости отдачи."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Укажите ограничение скорости загрузки."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Получить и отобразить значение параметра."
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "Получить параметры IP фильтра."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Получить состояние IP фильтра для клиентов и серверов."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Получить состояние IP фильтра только для клиентов."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Получить состояние IP фильтра только для серверов."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "Получить уровень IP фильтрации."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Получить ограничения полосы пропускания."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Выполнить поиск."
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"www.aMule.org, или на нашем irc-канале #aMule, находящемся на сервере irc."
-"freenode.net. \n"
+"Необходимо указать тип поиска с помощью следующих значений:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Пример: 'search kad file' выполнит поиск в Kad файла \"file\".\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Сообщайте нам о найденных ошибках на форум http://forum.amule.org"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Выполнить глобальный поиск."
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Выполнить локальный поиск"
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Выполнить поиск в Kad"
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Показать результаты последнего поиска."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Вернуть результаты предыдущего поиска.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Показать состояние поиска."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Показать состояние поиска.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Начать загрузку файла."
+
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"Указан неверный каталог для файлов Online-подписей!\n"
-"Online-подписи будут отключены пока вы не исправите это в настройках."
+"Должен быть указан номер файла из последнего поиска.\n"
+"Пример: 'download 12' запустит загрузку файла номер 12 из последнего "
+"поиска.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Приостановить закачку."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Продолжить закачку."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Отменить закачку."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Установить приоритет загрузки."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr ""
+"Установить для загрузки низкий, нормальный, высокий или автоматический "
+"приоритет.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Установить низкий приоритет."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Установить нормальный приоритет."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Установить высокий приоритет."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Установить авто-приоритет."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Показать очереди/списки."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Показать очереди на закачку/отдачу, список серверов или публикуемых файлов.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Показать очередь на отдачу."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Показать очередь на закачку."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Показать журнал."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Показать список серверов."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Очистить журнал."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Выделение место под файл '%s' не удалось: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Устаревшая команда, используйте вместо нее '%s'."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "Ошибка: невозможно открыть файл журнала"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Устаревшая команда, и возможно в будущем будет удалена.\n"
+"Используйте вместо нее '%s'.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "ПРЕДУПРЕЖДЕНИЕ: файл журнала пуст. Что-то здесь не так :-("
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Текстовый клиент aMule"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Журнал был очищен"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Конвертирую старые AICH хеши из '%s' в 64b в '%s'"
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Сообщение сервера: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Имя файла '%s' - неверно и было изменено на '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Ошибка при загрузке списка узлов."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "ПРЕДУПРЕЖДЕНИЕ: Файл '%s' уже существует. Новый файл назван '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Ошибка при загрузке файла контроля версии"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr "Вы уверены, что хотите отменить и удалить все файлы в этой категории?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Поврежден файл контроля версии"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Требуется подтверждение"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Вы используете устаревшую версию aMule!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "Поддерживается только 99 категорий."
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "Слишком много категорий!"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Все остальные"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Выбрать фильтр просмотра"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Добавить категорию"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Редакировать категорию"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Удалить категорию"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Не удалось открыть файл (%s), удаляю из списка публикуемых файлов."
+
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Запрошен набор хешей для неизвестного файла: %s"
+
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
+msgstr "Возобновляется отдача файла: %s"
+
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Приостанавливается отдача файла: %s"
+
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Не удалось выполнить команду `%s' при событии `%s'."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Загрузка завершена"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Полный путь к файлу"
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Имя файла без пути"
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "eD2k хэш файла"
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Размер файла в байтах"
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Общее время загрузки"
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Начата новая беседа"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Отправитель"
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Недостаточно места"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Раздел диска"
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Ошибка при завершении"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
+msgstr "Обрабатывается файл под номером %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Вы запросили частичные хеши (используется только для файлов > 9.5 MБ)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
+#, c-format
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Файл не существует !\n"
+
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, программа для создания eD2k ссылок для aMule"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Добро пожаловать!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Параметры ввода"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Файл для хеширования"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Добавьте возможные URL для этого файла"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Введите здесь файл для которого вы хотите получить eD2k ссылку"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
-"Версия вашего aMule - %i.%i.%i, тогда как актуальная версия - %li.%li.%li"
+"Введите здесь URL который вы хотите добавить к eD2k ссылке: добавьте / в "
+"конце если хотите чтобы aLinkCreator присоеденил текущее имя файла"
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Актуальная версия aMule всегда доступна тут:  http://www.amule.org"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Удалить"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Создать ссылку с хешами частей"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Помогите распространить новые и редкие файлы быстрее, за счет увеличения "
+"размера ссылки"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Хеш MD4"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k хэш-файл"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k ссылка"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Сохранить"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Скопировать в буфер обмена"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Открыть"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Открыть файл и получить его eD2k ссылку"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Копировать полученную eD2k ссылку в буфер"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Сохранить как"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Сохранить полученную eD2k ссылку в файл"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "О программе aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Выберите файл для которого вы хотите получить eD2k ссылку"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Невозможно открыть буфер"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Сейчас нечего копировать!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Выберите файл в который сохранить полученную eD2k ссылку"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Невозможно открыть "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Пожалуйста, введите не пустое имя файла"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Сейчас нечего сохранять!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, программа для создания eD2k ссылок для aMule\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Иконки взяты из http://www.everaldo.com и http://www.icomania.com\n"
+"и http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Лицензия - GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Идет хеширование..."
 
-#: src/amule.cpp:1911
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator работает для вас"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Считаем MD4 хэш..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Считаем eD2k хэши..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Отменено."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "ВНИМАНИЕ: Версия вашего aMule устарела: %i.%i.%i < %li.%li.%li"
+msgid "Done in %.2f s"
+msgstr "Выполнено за %.2f сек"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Ваша копия aMule актуальна."
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Этот URL уже добавлен !"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Ошибка при загрузке файла контроля версии"
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Введите URL"
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Польз. %s | Файлов %s"
+msgid "Unable to open %s"
+msgstr "Не удалось открыть %s"
 
-#: src/amule.cpp:2026
+#: src/utils/wxCas/src/linuxmon.cpp:86
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Польз. E: %s K: %s | Файлов E: %s K: %s"
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i дней %i часов %i минут %i секунд"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Нет выделенной сети"
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uд %02uч %02uмин %02uс"
 
-#: src/amule.cpp:2102
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Соединён с %s %s"
+msgid "%02uh %02umin %02us"
+msgstr "%02uч %02uмин %02uс"
 
-#: src/amule.cpp:2105
+#: src/utils/wxCas/src/onlinesig.cpp:238
 #, c-format
-msgid "Connecting to %s"
-msgstr "Подключение к %s"
+msgid "%02umin %02us"
+msgstr "%02uмин %02uс"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Отсоединен от eD2k"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02uс"
 
-# Kad как сеть, или служба - поэтому в женском роде
-# да, согласен
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad запущена."
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
 
-# Kad как сеть, или служба - поэтому в женском роде
-# согласен
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad остановлена."
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Подключен к Kad (норм.)"
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Подключен к Kad (за брандмауэром)"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Отключился от Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, модуль статистики aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Максимальная скорость загрузки за время работы wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Абсолютная максимальная скорость загрузки за время работы wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Система"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Остановить автоматическое обновление"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Сохранить картинку со статистикой"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Распечатать картинку со статистикой"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Настройки"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "О модуле wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Начать авто обновление"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Автоматическое обновление остановлено"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Автоматическое обновление начато"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Сохранить картинку со статистикой"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Онлайн-статистика"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Сеть Kad не может быть использована если порт UDP выключен в настройках. "
-"Отменяю запуск."
+"Проблема с печатью.\n"
+"Возможно принтер неправильно установлен."
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Сеть Kad выключена в настройках. Отменяю соединение."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Печать"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Не удалось открыть список друзей 'emfriends.met' для чтения!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, aMule модуль OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Основано на CAS, написанным Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Лицензия - GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Не удалось открыть список друзей 'emfriends.met' для записи!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Ох-ох... aMule то не запущен..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule запущен"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule запущен, но не подключен"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule подключается..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Ох-ох... статус aMule неизвестен..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " работает "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " остановлен!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " не подключен!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " подключается..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " делает что-то непонятное, проверьте!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " подключен к "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "отключен"
+
+#  stands for $User is on $server
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " на "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " с "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Всего принято: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Передано: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Принято за сеанс: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Прием: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/сек, Передача: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr "kB/сек"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Передача другим: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr "файлов, клиентов в очереди: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Время:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " на "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Системная загрузка (за 1-5-15 мин): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Время работы системы: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Каталог, содержащий файл amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Введите здесь путь к вашему файлу amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Интервал обновления в секундах"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Генерировать картинку со статистикой после каждого события обновления"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr ""
+"Укажите здесь каталог, в который вы хотите сохранять картинку со статистикой"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Периодическая загрузка картинки со статистикой на FTP сервер"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP Url"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP путь"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Введите здесь адрес вашего FTP сервера"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr ""
+"Введите здесь путь для сохранения картинки со статистикой на FTP сервере"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Пользователь"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Введите здесь имя пользователя для вашего FTP сервера"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Введите здесь пароль для вашего FTP сервера"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Интервал обновления через FTP в минутах"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Проверить"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Каталог, в котором хранится файл-подпись"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Каталог, в котором будет сохранятся картинка со статистикой"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Загрузить шаблон <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "HTTP порт веб-сервера"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Использовать UPnP форвардинг портов для порта веб-сервера"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP-порт"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Использовать gzip-сжатие"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Пароль веб-сервера для полного доступа"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Пароль веб-сервера для ограниченного доступа"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Позволять ограниченный доступ"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Запрещать ограниченный доступ"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Загрузить/сохранить настройки веб-сервера из/в удаленный aMule"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Путь к файлу конфигурации aMule. НЕ ИСПОЛЬЗУЙТЕ ПРЯМОЙ ПУТЬ!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Отключить PHP (не рекомендуется)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Компилировать PHP-страницы при каждом запросе"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Веб-сервер aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "соединение Веб-клиента принято\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "ОШИБКА: невозможно принять соединение web-клиента\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Запрос не удался из-за следующей ошибки: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Индексный файл не найден:"
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Сессия просрочена - запрашиваю логин\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Сессия в порядке, авторизован\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Сессия в порядке, не авторизован\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Нет открытых сессий - буду запрашивать логин\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Сессия открыта - запрашиваю логин\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Обрабатываю запрос [исходный]:"
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Не указан пароль, авторизация запрещена."
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Проверяю пароль\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Хеш пароля неверен\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Пароль верен\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Неверный пароль\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Вы не ввели пароль. Пустой пароль недопустим.\n"
+
+# в eMule - так и пишут: логин/логаут, но мне не нравится
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Запрошено отсоединение\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Обрабатываю запрос [перенаправленный]:"
+
+#~ msgid "Romanian"
+#~ msgstr "Румынский"
+
+#~ msgid "Download status"
+#~ msgstr "Статус загрузки"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Интервал обновления: %d с"
+#~ msgstr[1] "Интервал обновления: %d секунд"
+#~ msgstr[2] "Интервал обновления: %d секунд"
+
+#~ msgid "Transferring"
+#~ msgstr "Передача"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "QR: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "В очереди"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "СДЕЛАТЬ - отобразить прогресс поиска"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Начинаю создавать MD4 и AICH хеши для файла: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Начинаю создавать MD4-хеш для файла: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Начинаю создавать AICH-хеш для файла: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "ПРЕДУПРЕЖДЕНИЕ: не удалось удалить оригинал '%s' после создания резервной "
+#~ "копии."
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "ПРЕДУПРЕЖДЕНИЕ: не удалось удалить %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Рейтинг (всего):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Пытаться передать полные части всем клиентам"
+
+#~ msgid "Networks window"
+#~ msgstr "Окно сетей"
+
+#~ msgid "Searches window"
+#~ msgstr "Окно поиска"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Загружается"
+
+#~ msgid "Shared files window"
+#~ msgstr "Окно публикуемых файлов"
+
+#~ msgid "Messages window"
+#~ msgstr "Окно сообщений"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "Окно статистики"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Окно настроек"
+
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Потеряна пиктограмма области уведомлений, попытка пересоздать..."
+
+#~ msgid "Transfers"
+#~ msgstr "Передачи"
+
+#~ msgid "Files transfers window"
+#~ msgstr "Окно передач"
+
+#~ msgid "Unban"
+#~ msgstr "Разблокировать"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Показать передачи"
+
+#~ msgid "Show Queue"
+#~ msgstr "Показать очередь"
+
+#~ msgid "Select View"
+#~ msgstr "Выбрать вид"
+
+#~ msgid "Client Software"
+#~ msgstr "Клиентская программа"
+
+#~ msgid "Waited"
+#~ msgstr "Время ожидания"
+
+#~ msgid "Upload Time"
+#~ msgstr "Время загрузки"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Передача/Загрузка"
+
+#~ msgid "Remote Status"
+#~ msgstr "Удаленный статус"
+
+#~ msgid "File Priority"
+#~ msgstr "Приоритет файла"
+
+#~ msgid "Score"
+#~ msgstr "Счет"
+
+#~ msgid "Asked"
+#~ msgstr "Запрошено"
+
+#~ msgid "Last Seen"
+#~ msgstr "Последний раз был доступен"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Встал в очередь"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Передано"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Принято"
+
+#~ msgid "Userhash"
+#~ msgstr "Хеш пользователя"
 
-#~ msgid "Fetching status..."
-#~ msgstr "Получение информации о состоянии..."
+#~ msgid "Encrypted"
+#~ msgstr "Зашифровано"
 
-#~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
-#~ msgstr "theApp->serverlist->GetServerByAddress() returned NULL"
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "Загружено %d изображений флагов."

aMule-2.2.6.tar.bz2/po/sl.po -> aMule-2.3.1.tar.bz2/po/sl.po Changed

@@ -4,1303 +4,1157 @@
 # Uros Vampl <mobile.leecher@gmail.com>, 2005-2008.
 # Aljosa Vidmar <agapetos.typhonis@gmail.com>, 2006-2008.
 # Aljoša Vidmar <agapetos.typhonis@gmail.com>, 2007.
+# Jure Repinc <jlp@holodeck1.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2008-12-11 22:22+0100\n"
-"Last-Translator: Aljoša Vidmar <agapetos.typhonis@gmail.com>\n"
-"Language-Team: Slovenščina <sl@li.org>\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Navesti morate neprazno geslo."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Neveljavno geslo, ni MD5 hash!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Napaka med povezovanjem"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "Povezava EC ni uspela. Prazen odgovor."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Zunanja povezava: Dostop zavrnjen, ker: "
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Dodaj prijatelja"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Zunanja povezava: Dostop zavrnjen"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Vnesti morate veljaven IP in vrata."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Zunanja povezava: Slab odgovor strežnika. Povezava končana."
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Podatki"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Uspeh! Vzpostavljena povezava z aMule "
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Navedena koda uporabnika ni veljavna."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Uspeh! Povezava vzpostavljena."
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Ni bilo mogoče odpreti datoteke ED2KLinks."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Ustvarjanje hasha"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"OPOZORILO: če imete nizek ID, sebe ne morete dodati kot vira za povezavo "
+"eD2k."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Zaključevanje"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Sedaj, zapuščanje glavnega programa ..."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Končano"
+#: src/amule.cpp:258
+#, c-format
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Končanje izvoda amuleweb s PID »%ld« ... "
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Na premoru"
+#: src/amule.cpp:261
+#, c-format
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Ubijanje izvoda amuleweb s PID »%ld« ... "
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Vsebuje napake"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Neuspeh"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Prenašanje"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: Končevanje jedra."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Na čakanju"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "Zaustavitev aMule zaključena."
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Začetek ustvarjanja hasha MD4 in AICH za datoteko: %s"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Rezultati razhroščevanja pomnilnika za izhod iz aMule:"
 
-#: src/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Začetek ustvarjanja hasha MD4 za datoteko: %s"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+"\n"
+"Nastavitev zunanje povezave"
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Začetek ustvarjanja hasha AICH za datoteko: %s"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Geslo je bilo nastavljeno in zunanje povezave omogočene."
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Pretvarjanje starih hashov AICH v '%s' v 64b v '%s'."
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "OPOZORILO"
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
 msgstr ""
-"OPOZORILO: Ime datoteke '%s' ni veljavno in je bilo preimenovano v '%s'."
+"Vaše področne nastavitve so bile spremenjene na sistemsko privzete zaradi "
+"spremembe v nastavitvah. Oprostite."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr ""
-"OPOZORILO: Datoteka '%s' že obstaja, nova datoteka je preimenovana v '%s'."
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Podatki"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
 msgstr ""
-"OPOZORILO: Ni bilo mogoče odstraniti izvirnika '%s' po izdelavi varnostne "
-"kopije"
-
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "OPOZORILO: Ni bilo mogoče zbrisati %s"
-
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Ni bilo mogoče dobiti deljenih datotek od uporabnika '%s'"
+"Na seznamu strežnikov nimate nobenega strežnika.\n"
+"Ali želite, da aMule zdaj pridobi nov seznam?"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Neznano"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Prejemanje seznama strežnikov"
 
-#: src/BaseClient.cpp:1738
+#: src/amule.cpp:654
 #, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Lažna različica eMule %#x)"
-
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Lažna eMule)"
+msgid "web server running on pid %d"
+msgstr "spletni strežnik teče s PID %d"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Lažna eMule)"
+#: src/amule.cpp:658
+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 ""
+"Zahtevali ste zagon spletnega strežnika ob zagonu programa, a programa "
+"amuleweb ni moč zagnati. Namestite paket, ki vsebuje spletni strežnik aMule, "
+"ali pa prevedite aMule z možnostjo »--enable-webserver« in ga znova namestite "
+"z »make install«."
+
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "NAPAKA"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:741
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (temelji na eMule v0.%u)"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Vrat ni bilo moč povezati z navedenim naslovom: %s"
 
-#: src/BaseClient.cpp:1960
+#: src/amule.cpp:768
 #, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Vzdevek: %s ID: %u"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Vrata %u niso razpoložljiva. Imeli boste nizek ID\n"
 
-#: src/BaseClient.cpp:1962
+#: src/amule.cpp:774
 #, c-format
-msgid "Requested: %s\n"
-msgstr "Zahtevano: %s\n"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Vrata %u niso razpoložljiva.\n"
+"\n"
+"To pomeni, da boste imeli nizek ID.\n"
+"\n"
+"Preverite omrežje in se prepričajte, da so vrata odprta za izhod in vhod."
 
-#: src/BaseClient.cpp:1964
-#, fuzzy, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statistika datotek v tej seji: Sprejetih %d od %d zahtev, %s prenesenih\n"
-"Statistika datotek v tej seji: Sprejetih %d od %d zahtev, %s prenesenih\n"
-msgstr[1] ""
-"Statistika datotek v tej seji: Sprejetih %d od %d zahtev, %s prenesenih\n"
-"Statistika datotek v tej seji: Sprejetih %d od %d zahtev, %s prenesenih\n"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Ni bilo mogoče ustvariti datoteke spletnega podpisa"
 
-#: src/BaseClient.cpp:1967
-#, fuzzy, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statistika datotek vseh sejah: Sprejetih %d od %d zahtev, %s prenesenih\n"
-"Statistika datotek vseh sejah: Sprejetih %d od %d zahtev, %s prenesenih\n"
-msgstr[1] ""
-"Statistika datotek vseh sejah: Sprejetih %d od %d zahtev, %s prenesenih\n"
-"Statistika datotek vseh sejah: Sprejetih %d od %d zahtev, %s prenesenih\n"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Ni bilo mogoče ustvariti aMule datoteke spletnega podpisa"
 
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Zahtevana neznana datoteka"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"Kot kaže izbrana področna nastavitev ni nameščena na vašem računalniku. "
+"(Opomba: vseeno se jo bo poskusilo nastaviti)"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:1040
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Odjemalec %s na IP:Vratih %s:%d uporablja %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Uporabniško ime"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Prijatelji"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Prikaži Po&drobnosti"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Dodaj prijatelja"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Odstrani prijatelja"
+msgid "This is the first time you run aMule %s"
+msgstr "To je vaš prvi zagon aMule %s"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Pošlji &sporočilo"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "To je testna različica, posodobljena dnevno in\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Poglej datoteke"
+#: src/amule.cpp:1043
+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/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Ustvari mesto za prijatelja"
+#: src/amule.cpp:1044
+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/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Ali ste prepričani, da želite izbrisati izbranega prijatelja?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Več informacij, podporo in nove različice, lahko najdete na naši domači "
+"strani,\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Ali ste prepričani, da želite izbrisati izbrane prijatelje?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"na www.aMule.org, ali na kanalu IRC #aMule, na strežniku irc.freenode.net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Prekliči"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Morebitne hrošče lahko sporočite na http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Nimate dovoljenja za dodelitev več kot enega mesta za prijatelje.\n"
-"Samo eno mesto je bilo dodeljeno."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Izbira večih"
+"Navedena mapa za datoteke za spletni podpis je NEVELJAVNA.\n"
+"Spletni podpis bo ONEMOGOČEN, dokler težave ne odpravite v nastavitvah."
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Prenos končan"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Gostitelj strežnika obveščen"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Polna pot do datoteke."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Vnaprejšnja dodelitev prostora na disku za datoteko »%s« ni uspela: %s"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Ime datoteke brez komponente poti."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "NAPAKA: ni mogoče odpreti dnevniške datoteke"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "eD2k hash datoteke."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "OPOZORILO: dnevniška datoteka je prazna. Nekaj je narobe."
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Velikost datoteke v bajtih."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Dnevnik je bil ponastavljen"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Skupni aktivni čas prenosa dol."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Sporočilo strežnika: %s"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Začetek nove seje klepeta"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "Prejemanje %s je bilo preskočeno, ker zahtevana datoteka ni novejša."
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Pošiljatelj sporočila."
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Ni bilo mogoče prenesti seznama vozlišč."
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Ni več prostora"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Ni bilo mogoče odpreti prejete datoteke za preverjanje različice"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Razdelek diska."
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Datoteka za preverjanje različice je pokvarjena"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Napaka pri zaključevanju"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Uporabljate zastarelo različico aMule."
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Ime datoteke"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr ""
+"Različica vaše aMule je %i.%i.%i, najnovejša različica pa je %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Velikost"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Najnovejšo različico lahko vedno najdete na http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Vrsta"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "OPOZORILO: vaša različica aMule je zastarela: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioriteta"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Uporabljate najnovejšo različico aMule."
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "ID datoteke"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Ni bilo mogoče prenesti datoteke za preverjanje različice"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Zahtev"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Uporabniki: %s | Datoteke: %s"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Sprejetih zahtev"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Uporabniki: E: %s K: %s | Datoteke: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Prenesenih podatkov"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Izbranega ni nobenega omrežja"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Delilno razmerje"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "z nizkim ID-jem"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Dobljeni deli"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "z visokim ID-jem"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Celotni viri"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Povezan z %s %s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Pot imenika"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Povezovanje z %s"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Deljene datoteke"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Povezava z eD2k prekinjena"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Zelo nizka"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad zagnan."
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Nizka"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad ustavljen."
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normalna"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Povezan s Kad (v redu)"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Visoka"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Povezan s Kad (za požarnim zidom)"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Zelo visoka"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Povezava s Kad prekinjena"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Najvišja"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Omrežja Kad ni mogoče uporabljati, če so vrata UDP onemogočena v "
+"nastavitvah. Kad ni zagnan."
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Samod."
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Omrežje Kad je onemogočeno v nastavitvah. Ni povezave."
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Dodaj komentar/oceno"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"NAPAKA: Ne morete uporabljati demona aMule, ko so zunanje povezave "
+"onemogočene. Za vklop zunanjih povezav uporabite ali navaden aMule ali "
+"zaženite amuled z možnostjo --ec-config ali pa nastavite vrednost ključa"
+"\"AcceptExternalConnections\"  na 1 v datoteki ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Uredi komentar/oceno"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"NAPAKA: Za uporabo zunanjih povezav je potrebno veljavno geslo, demona aMule "
+"pa brez zunanjih povezav ni mogoče uporabiti. Za zagon demona aMule morate "
+"ključ »ECPassword« v datoteki ~/.aMule/amule.conf nastaviti na ustrezno "
+"vrednost. Za nastavitev gesla zaženite amuled z možnostjo --ec-config. Več "
+"informacij lahko najdete na http://wiki.amule.org"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: OnInit - zaganjanje časomerilnika"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: cepljenje v ozadje – se vidimo"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Ni moč ustvariti datoteke PID"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Preimenuj"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "NAPAKA: %s"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Dodaj datoteke iz zbirke na seznam prenosov"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "To je aMule %s, ki temelji na eMule."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Kopiraj magnet &URI v odložišče"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Operacijski sistem: %s"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Kopiraj &povezavo eD2k v odložišče"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Obiščite http://www.amule.org da preverite, če je na voljo nova različica."
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Kopiraj povezavo eD2k na odložišče (&Vir)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "USODNA NAPAKA: ustvaritev časomerilnika ni uspela"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Kopiraj povezavo eD2k v odložišče (Vir) (&S Crypt možnostmi)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Oddaljen nadzor aMule "
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Kopiraj povezavo eD2k v odložišče (&Ime gostitelja)"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Posnetek:"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
-"Kopiraj povezavo eD2k v odložišče (Ime gostitelja) (Z &Crypt možnostmi)"
+"Odjemalec P2P, ki temelji na eMule in je za vse platforme\n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Kopiraj povezavo eD2k v odložišče (&AICH info)"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Spletna stran: http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Kopiraj odziv v odložišče"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Forum: http://forum.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:504
 msgid ""
-"Feedback from: %s (%s)\n"
+"FAQ: http://wiki.amule.org \n"
 "\n"
 msgstr ""
-"Odgovor od: %s (%s)\n"
+"PZS: http://wiki.amule.org \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Potrebujete visok ID, da ustvarite povezavo z virom"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "OPOZORILO"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Deljene datoteke (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[Delna datoteka]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Vnesite novo ime za to datoteko:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Preimenuj datoteko"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Nadaljevanje prenosov gor za datoteko: %s"
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Ustavljanje prenosa gor za datoteko: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMule besedilni odjemalec"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Stik: admin@amule.org (administrativne zadeve) \n"
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: iskalni niz je prekratek"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Avtorske pravice © 2003–2011 ekipa aMule\n"
+"\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, fuzzy, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Prebranih %u stikov Kad"
-msgstr[1] "Prebranih %u stikov Kad"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Del aMule temelji na\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, fuzzy, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Samo %d Kad stiki so na voljo, nodes.dat ni zapisan"
-msgstr[1] "Samo %d Kad stiki so na voljo, nodes.dat ni zapisan"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: usmerjanje med enakovrednimi, ki temelji na metriki XOR.\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
+" Avtorske pravice 2002–2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "NAPAKA: Ni bilo mogoče poslušati vrat TCP."
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "povezava s spletnim odjemalcem sprejeta\n"
-
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "NAPAKA: ni mogoče sprejeti povezavo s spletnim odjemalcem\n"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Sporočilo"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Zahteve ni bilo mogoče izvesti zaradi napake: %s."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "Pogovorno okno aMule je bilo uničeno"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Zahteva prekinjena z neznano napako."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Povezovanje"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Indeksne datoteke ni mogoče najti: "
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: povezovanje"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Seja potekla - zahtevek za prijavo\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: povezava prekinjena"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Seja v redu, prijavljen\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: za požarnim zidom"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Seja v redu, ni prijave\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: povezan"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Ni odprte seje - zahtevek za prijavo\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: povezovanje"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Seja ustvarjena - zahtevek za prijavo\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: izklopljen"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Obdelovanje zahteve [izvirno]: "
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Prekliči"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Preverjanje gesla\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Ustavi trenutne poskuse povezovanja"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Hash gesla ni veljaven\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Prekini povezave"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Geslo v redu\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Prekini povezavo s trenutno povezanimi omrežji"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Napačno geslo\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Poveži se"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Niste navedli gesla. Prazno geslo ni dovoljeno.\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Poveži se s trenutno omogočenimi omrežji"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Zahtevana odjava\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Gor: %.1f (%.1f) | Dol: %.1f (%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Obdelovanje zahteve [preusmerjeno]: "
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Gor: %.1f | Dol: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Naloži predlogo <str>"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Povezan)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Vrata HTTP spletnega strežnika"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Ni povezave)"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr ""
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Ali res želite zapustiti %s?"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Vrata UPnP"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Potrditev izhoda"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Uporabi kompresijo gzip"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Zaženi ukaz: "
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "– privzeto –"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Geslo s polnim dostopom za spletni strežnik"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Mapa za preobleke »%s« ne obstaja"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Gostovo geslo za spletni strežnik"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "OPOZORILO: datoteke s preobleko »%s« ni moč odpreti za branje"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Dovoli dostop gostom"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Omrežja"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Zavrni dostop gostom"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Okno z omrežji"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Naloži/shrani nastavitve spletnega strežnika iz/na oddaljene aMule"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Iskanja"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Pot do nastavitvene datoteke. NE UPORABI NEPOSREDNO!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Okno z iskanji"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Onemogoči tolmač PHP (zastarelo)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Prejemanja"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Ponovno prevedi strani PHP ob vsaki zahtevi"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "Okno s prejemanji"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Spletni strežnik aMule"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Deljene datoteke"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Ni na voljo"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Okno z deljenimi datotekami"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Nikoli"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Sporočila"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Prenašanje..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Okno s sporočili"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistika"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr ""
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Okno s statističnimi grafi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Nastavitve"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Imenik, ki vsebuje datoteko amulesig.dat"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Okno z nastavitvami"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Prebrskaj"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Uvoz"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Tu vnesite imenik, ki vsebuje datoteko amulesig.dat"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Orodje za uvažanje delnih datotek"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Interval med osvežitvami v sekundah"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "O programu"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Ustvari statistično sliko ob vsaki osvežitvi"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "O programu/pomoč"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Tu vnesite imenik, v katerem želite ustvariti statistično sliko"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Omrežje eD2k"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Periodično prenesi statistično sliko na strežnik FTP"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Omrežje Kad"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP URL"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Brez omrežja"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Pot FTP"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "Oddaljeni nadzor aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Tu vnesite URL vašega strežnika FTP"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
-"Tu vnesite imenik na strežniku FTP, v katerega se naj shrani statistična "
-"slika"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Usodna napaka: ni bilo mogoče ustvariti osrednjega časomerilnika"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Uporabnik"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Poveži se z oddaljenim aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Geslo"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Usodna napaka: ni bilo mogoče ustvariti časomerilnika za povpraševanje"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Prehod v dogodkovno zanko ..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Povezovanje ..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Tu vnesite uporabniško ime za prijavo na vaš strežnik FTP"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Povezovanje ni uspelo "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Tu vnesite geslo za prijavo na vaš strežnik FTP"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Rokovalnik z dogodki zunanje povezave oddaljenega vmesnika"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Zaustavljanje"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Interval med osvežitvami prenosov na FTP v minutah"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Povezava ni uspela. Ni se moč povezati z %s: %d\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Preveri veljavnost"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Povezava prekinjena – aMule se je najverjetneje končal."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Mapa, ki vsebuje vašo datoteko s podpisom"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Pripravljen"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Mapa, v katerem je ustvarjena statistična slika"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Vse"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:631
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i dni %i ur %i min. %i sek."
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, spletna statistika aMule"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Dobrodošli!"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr "Ni moč ustvariti mape »%s« za kategorijo »%s«, obdržana bo mapa »%s«."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Največji prenos dol odkar teče wxCas"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Neznano"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Absolutni največji prenos dol med vsemi prejšnjimi sejami wxCas"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Ni bilo mogoče dobiti deljenih datotek od uporabnika »%s«"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Počisti"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Iskanje kolega za povezavo z nizkim ID-jem"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistem"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (lažna različica eMule %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Ustavi samodejno osveževanje"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (lažni eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Shrani sliko spletne statistike"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (lažni eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Natisni sliko spletne statistike"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (temelji na eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Nastavitve"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Vzdevek: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "O wxCas"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Zahtevano: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Zaženi samodejno osveževanje"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statistika datotek v tej seji: sprejetih %d od %d zahtev, %s prenesenih\n"
+msgstr[1] ""
+"Statistika datotek v tej seji: Sprejetih %d od %d zahteve, %s prenesenih\n"
+msgstr[2] ""
+"Statistika datotek v tej seji: Sprejetih %d od %d zahtev, %s prenesenih\n"
+msgstr[3] ""
+"Statistika datotek v tej seji: Sprejetih %d od %d zahtev, %s prenesenih\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Samodejno osveževanje ustavljeno"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statistika datotek vseh sej: sprejetih %d od %d zahtev, %s prenesenih\n"
+msgstr[1] ""
+"Statistika datotek vseh sej: Sprejetih %d od %d zahteve, %s prenesenih\n"
+msgstr[2] ""
+"Statistika datotek vseh sej: Sprejetih %d od %d zahtev, %s prenesenih\n"
+msgstr[3] ""
+"Statistika datotek vseh sej: Sprejetih %d od %d zahtev, %s prenesenih\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Samodejno osveževanje začeto"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Zahtevana neznana datoteka"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Shrani statistično sliko"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Filtrirano sporočilo od »%s« (IP: %s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Spletna statistika aMule"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Novo sporočilo od »%s« (IP: %s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/BaseClient.cpp:2899
+#, c-format
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"Pri tiskanju se je pojavil problem.\n"
-"Ali je privzet tiskalnik pravilno nastavljen?"
+"Uporabnik %s (%u) je zahteval seznam deljenih datotek za mapo »%s« → prezrto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Tiskanje"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "OPOZORILO: %s ni moč odpreti."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
-"wxCas, aMule statistika spletnega podpisa\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Temelji na CAS, avtorja Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Na voljo pod licenco GPL"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "aMule ne teče..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule teče"
+"OPOZORILO: Seznam preklicanih datotek je pokvarjen, vsebuje neveljavno glavo."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule teče, vendar brez povezave"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Vhodno/izhodna napaka med branjem datoteke %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule se povezuje..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Napaka med shranjevanjem datoteke %s: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Status aMule je neznan..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Vnesite besedilo s slike"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategorija"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr "teče že"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Nova kategorija"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " je ustavljena !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Izberite mapo za prejete datoteke"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " ni povezana !"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Navesti morate ime za kategorijo."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " se povezuje..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Navesti morate pot za kategorijo."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " dela nekaj nenavadnega, preverite !"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Ni bilo mogoče ustvariti mape prejetih datotek za kategorijo. Prosimo, "
+"navedite veljavno pot."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " je povezana z "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Pogovorna seja se je začela: %s (%s:%u) – %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Povezan z odjemalcem ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "V redu"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Povezovanje z odjemalcem ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "za požarnim zidom"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Povezava z odjemalcem ni uspela / povezava izgubljena ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "ugasnjen"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
+"*** Prestali ste preverjanje z besedilom na sliki in uporabnik je prejel "
+"vaše sporočilo. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " je povezan"
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** Odgovor na preizkus z besedilom na sliki je bil napačen in vaše "
+"sporočilo je bilo prezrto. S pošiljanjem novega sporočila lahko zahtevate "
+"nov preizkus. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " z "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Klepet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Skupni prenos dol: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Zapri zavihek"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Prenos gor: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Zapri vse zavihke"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Prenos dol to sejo: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Zapri druge zavihke"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Prenos dol: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Dodaj med prijatelje"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Prenos gor: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Datoteka s krediti naložena, %u znanih odjemalcev"
+msgstr[1] "Datoteka s krediti naložena, %u znan odjemalec"
+msgstr[2] "Datoteka s krediti naložena, %u znana odjemalca"
+msgstr[3] "Datoteka s krediti naložena, %u znani odjemalci"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Zasluge potekle za %u odjemalcev."
+msgstr[1] " - Zasluge potekle za %u odjemalec."
+msgstr[2] " - Zasluge potekle za %u odjemalca."
+msgstr[3] " - Zasluge potekle za %u odjemalce."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Deljenih: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Datoteka »cryptkey.dat« ne obstaja. Ustvarjanje."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " datotek, Odjemalcev v vrsti: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Podrobnosti o odjemalcu"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Čas: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "Nizek ID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "Visok ID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " na "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Omogočeno"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Povprečna obremenitev sistema (1-5-15 min.):"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Podprto"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Neprekinjeno delovanje: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Ni podprto"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Onemogočeno"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Povezan"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Ni povezave"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02us"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "Visok ID"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Nedokončano"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "Nizek ID"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Baraba"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Ni povezave"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Preverjeno – v redu"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Ni na voljo"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "Uporabnik %s (%u) je zahteval vaš seznam deljenih datotek → sprejeto"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "Uporabnik %s (%u) je zahteval vaš seznam deljenih datotek → zavrnjeno"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "Uporabnik %s (%u) je zahteval vaš seznam deljenih map → sprejeto"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Preklicano !"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "Uporabnik %s (%u) je zahteval vaš seznam deljenih map → zavrnjeno"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "Unable to open %s"
-msgstr "Ni mogoče odpreti %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Vhodni parametri"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Ustvari hash za datoteko"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Dodaj URL-je za to datoteko (neobvezno)"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
+"Uporabnik %s (%u) je zahteval seznam deljenih datotek za mapo »%s« → sprejeto"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Dodaj"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Odstrani"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Počisti"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Ustvari povezavo z delnimi hashi"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
-msgstr ""
-"Pomaga pri hitrejšem razširjanju novih in redkih datotek, za ceno večje "
-"dolžine povezave"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Hash MD4 datoteke"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "Povezava eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Začni"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Shrani"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Kopiraj v odložišče"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Izhod"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Odpri"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopiraj"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
+"Uporabnik %s (%u) je zahteval seznam deljenih datotek za mapo »%s« → zavrnjeno"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Shrani kot"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "O programu"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "O aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Ni mogoče odpreti odložišča"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Zaenkrat ni nič za skopirati !"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr ""
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Uporabnik %s (%u) deli mapo »%s«"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Ni mogoče odpreti "
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Uporabnik %s (%u) je poslal nezahtevane deljene mape."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Prosim, vnesite neprazno ime datoteke"
+#: src/ClientTCPSocket.cpp:982
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "Uporabnik %s (%u) je poslal seznam deljenih datotek za mapo »%s«"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Zaenkrat ni nič za shraniti !"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Uporabnik %s (%u) je končal s prenosom seznama deljenih datotek"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Uporabnik %s (%u) je poslal nezaželen seznam deljenih datotek"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Ustvarjanje hasha..."
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr "Uporabnik %s (%u) je zavrnil dostop do seznama deljenih datotek/map"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator dela za vas"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Komentarji o datoteki"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr ""
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Uporabniško ime"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr ""
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Ime datoteke"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Končano v %.2f s"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Ocena"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Ta URL ste že dodali !"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Komentar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Prosim, vnesite neprazen URL"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Ni komentarjev"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Obdelovanje datoteke številka %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Zahtevali ste delne hashe (na voljo samo za datoteke > 9.5 MB)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u komentarjev"
+msgstr[1] "%u komentar"
+msgstr[2] "%u komentarja"
+msgstr[3] "%u komentarji"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Datoteka ne obstaja !\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, ustvarjalec povezav eD2k za aMule"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"Izločil odjemalca %s, ker je poslal %s pokvarjenih podatkov od skupno %s za "
+"datoteko »%s«"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1314,35 +1168,61 @@
 msgid "Auto [Hi]"
 msgstr "Samod. [Vi]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Povezovanje"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Zelo nizka"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Nizka"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normalna"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Visoka"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Zelo visoka"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Najvišja"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Povpraševanje"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Povezovanje preko strežnika"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Vrsta polna"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "V vrsti"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Prenašanje"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Prejemanje"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
-msgstr "Sprejemanje hashseta"
+msgstr "Prejemanje kode"
 
 #: src/DataToText.cpp:67
 msgid "No needed parts"
@@ -1350,7 +1230,7 @@
 
 #: src/DataToText.cpp:68
 msgid "Cannot connect LowID to LowID"
-msgstr "Povezava Nizkega ID-ja z Nizkim ID-jem ni mogoča"
+msgstr "Povezava nizkega ID-ja z nizkim ID-jem ni mogoča"
 
 #: src/DataToText.cpp:69
 msgid "Too many connections"
@@ -1364,8 +1244,7 @@
 msgid "Too many Kad connections"
 msgstr "Preveč povezav Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Izločen"
 
@@ -1391,14 +1270,14 @@
 
 #: src/DataToText.cpp:128
 msgid "Local Server"
-msgstr "Krajeven strežnik"
+msgstr "Krajevni strežnik"
 
 #: src/DataToText.cpp:129
 msgid "Remote Server"
-msgstr "Oddaljen strežnik"
+msgstr "Oddaljni strežnik"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1416,3671 +1295,2044 @@
 
 #: src/DataToText.cpp:134
 msgid "Source Seeds"
-msgstr "Izvirna semena"
+msgstr "Izvorna semena"
 
 #: src/DataToText.cpp:135
 msgid "Search Result"
 msgstr "Rezultat iskanja"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
-msgstr "Končano"
+msgstr "Zaključeno"
 
 #: src/DataToText.cpp:146
 msgid "In progress"
-msgstr "Poteka"
+msgstr "V teku"
 
 #: src/DataToText.cpp:147
 msgid "ERROR: Out of diskspace"
-msgstr ""
+msgstr "NAPAKA: zmanjkalo je prostora na disku"
 
 #: src/DataToText.cpp:148
 msgid "ERROR: Partmet not found"
-msgstr ""
+msgstr "NAPAKA: ni bilo moč najti datoteke partmet"
 
 #: src/DataToText.cpp:149
 msgid "ERROR: IO error!"
-msgstr "NAPAKA: Napaka IO!"
+msgstr "NAPAKA: vhodno/izhodna napaka"
 
 #: src/DataToText.cpp:150
 msgid "ERROR: Failed!"
-msgstr "NAPAKA: Spodletelo!"
+msgstr "NAPAKA: neuspeh"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "V vrsti"
 
 #: src/DataToText.cpp:152
 msgid "Already downloading"
-msgstr "Datoteka se že prenaša"
+msgstr "Datoteka se že prejema"
 
 #: src/DataToText.cpp:153
 msgid "Unknown or bad tempfile format."
 msgstr "Neznan ali pokvarjen format začasne datoteke."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Sistemsko privzeto"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Albansko"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "arabski"
-
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "estonski"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "baskovski"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "bolgarski"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "katalonski"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "kitajski (poenostavljen)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "kitajski (tradicionalen)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "hrvaški"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Češko"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "danski"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "nizozemski"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Del"
 
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "angleški (UK)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "estonski"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "finski"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "francoski"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "galicijski"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "nemški"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Grško"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Hebrejsko"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "madžarski"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "italijanski"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "italijanski (švicarski)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japonsko"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "korejski"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Latvijsko"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norveško (Nynorsk)"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Velikost"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "poljski"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Preneseno"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "portugalski"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Hitrost"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "portugalski (brazilski)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Napredek"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "ruski"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Viri"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "slovenski"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prednost"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "španski"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Stanje"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Švedsko"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Preostali čas"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "turški"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Nazadnje videno celotno"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ukrajinsko"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Zadnji sprejem"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Ni mogoče določiti izbranega brskalnika!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Ali res želite izbrisati izbrano datoteko?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr "Vrata TCP ne smejo biti večja od 65532, ker so vrata UDP TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Ali res želite izbrisati izbrane datoteke?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Uporabljena bodo privzeta vrata (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Ime strežnika"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Naslov"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Vrata"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Opis"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Uporabnikov"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Datotek"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Neuspeh"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Statičen"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Različica"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Povezani ste na strežnik, ki ga hočete izbrisati. Prosimo, najprej prekinite "
-"povezavo. Strežnik NI bil zbrisan."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Neznano ime)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Ali ste prepričani, da želite izbrisati statičen strežnik %s?"
+"Odziv od: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Da"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Samod."
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Ne"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Ustavi"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Ni bilo mogoče odpreti '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Premor"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Strežniki (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Nadaljuj"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Strežnik"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "Počisti &končane"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Poveži se na strežnik"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Prenesi vse vire PZDD na to datoteko zdaj"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Označi strežnik kot statičen"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Prenesi vse vire PZDD na to dat. (samod.)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Označi strežnik kot ne-statičen"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Prenesi vse vire PZDD na druge datoteke"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Označi strežnike kot statične"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Dodatne možnosti"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Označi strežnike kot ne-statične"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Ogled"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Odstrani strežnik"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Prikaži po&drobnosti datoteke"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Odstrani strežnike"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Prikaži vse komentarje"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Odstrani vse strežnike"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Skopiraj magnet URI na odložišče"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Kopiraj povezavo eD2k v odložišče"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Skopiraj &povezavo eD2k na odložišče"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Kopiraj povezave eD2k v odložišče"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Skopiraj odziv na odložišče"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Ponovno se poveži s strežnikom"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "prekliči dodelitev"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Ali ste prepričani, da želite zbrisati vse strežnike?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Dodeli kategoriji"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Ali ste prepričani, da želite zbrisati izbran strežnik?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Odpri datoteko"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Ali ste prepričani, da želite zbrisati izbrane strežnike?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Vnesite novo ime za to datoteko:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Onemogočeno [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Preimenuj datoteko"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "To je aMule %s, ki temelji na eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%d.%m.%y %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Operacijski sistem: %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Obiščite http://www.amule.org da preverite, če je na voljo nova različica."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "USODNA NAPAKA: Merilnik časa ni bilo mogoče ustvariti"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Oddaljen nadzor aMule "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Posnetek:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" 'All-Platform' p2p odjemalec, temelječ na eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Spletna stran: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Forum: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" Pogosta vprašanja: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Stik: admin@amule.org (administrativne zadeve) \n"
+msgid "Downloads (%i)"
+msgstr "Prejemanja (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-msgstr ""
-" Avtorske pravice (C) 2003-2009 aMule moštvo \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Del aMule temelji na \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
+"Da preprečite to opozorilo ob vsakem ogledu,\n"
+"nastavite svoj priljubljen predvajalnik video posnetkov (privzet je mplayer)"
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Avtorske pravice (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Sporočilo"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Povezovanje"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Ni povezave"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Za požarnim zidom"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Povezan"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Povezovanje"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Izklopljen"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Ustavi trenutne poskuse povezovanja"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Prekini"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Prekini povezavo s trenutno povezanimi omrežji"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Poveži"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Poveži se s trenutno omogočenimi omrežji"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Gor: %.1f(%.1f) | Dol: %.1f(%.1f)"
-
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Gor: %.1f | Dol: %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Ogled datoteke"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Povezan)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "NAPAKA: Ni bilo mogoče zagnati zunanjega predvajalnika. Ukaz: »%s«"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Ni povezave)"
+msgid "Saving PartFile %u of %u"
+msgstr "Shranjevanje delne datoteke %u od %u"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Ali ste prepričani, da želite zapustiti aMule?"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Vse delne datoteke shranjene."
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Potrditev izhoda"
-
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Imenik za preobleke '%s' ne obstaja"
+msgid "Loading temp files from %s."
+msgstr "Nalaganje začasnih datotek iz %s."
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr ""
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Omrežja"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Omrežno okno"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Iskanje"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Iskalno okno"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Prenosi"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Okno prenosov"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Deljene datoteke"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Okno z deljenimi datotekami"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Sporočila"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Okno s sporočili"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistika"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Okno statistike"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Okno nastavitev"
+msgid "Loading PartFile %u of %u"
+msgstr "Nalaganje delne datoteke %u od %u"
 
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Uvoz"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Orodje za uvažanje delnih datotek"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "O programu/Pomoč"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "Omrežje eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Omrežje Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Ni omrežja"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Splošno"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Povezava"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Imeniki"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Strežniki"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Varnost"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Vmesnik"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proksi"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Filtri"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Oddaljeno upravljanje"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Spletni podpis"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Napredno"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Dogodki"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Iskanje napak"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Uporabniško določeno"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"Potreben je ponoven zagon aMule za uveljavitev teh sprememb:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- Vrata TCP so spremenjena.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- Vrata UDP so spremenjena.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:567
+#: src/DownloadQueue.cpp:154
 msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Omogočili ste zunanje povezave, vendar niste navedli gesla.\n"
-"Zunanje povezave ne morejo biti omogočene, dokler ne navedete veljavnega "
-"gesla."
+"NAPAKA: nalaganje varnostne kopije ni uspelo. Na http://forum.amule.org "
+"pošičite rešitve za obnavljanje datotek .part.met."
 
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Jezik spremenjen.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Mapa za začasne datoteke spremenjena.\n"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Vse delne datoteke naložene."
 
-#: src/PrefsUnifiedDlg.cpp:589
-#, fuzzy
-msgid "- ED2K network enabled.\n"
-msgstr "Vsa omrežja so onemogočena."
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Gor: 0.0 | Dol: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Ni mogoče najti delnih datotek"
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad se ne bo zagnal, če so vrata UDP onemogočena.\n"
-"Omogočite vrata UDP ali pa onemogočite Kad."
+#: src/DownloadQueue.cpp:168
+#, c-format
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Najdenih %u delnih datotek"
+msgstr[1] "Najdena %u delna datoteka"
+msgstr[2] "Najdeni %u delni datoteki"
+msgstr[3] "Najdene %u delne datoteke"
 
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"aMule morate NUJNO ponovno zagnati.\n"
-"Če tega ne storite zdaj, se ne pritožujte, če se zgodi kaj slabega.\n"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
+msgstr "Datotečni sistem z začasno mapo ne more shranjevati velikih datotek."
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
-"Seznam za samodejno posodabljanje strežnikov je prazen.\n"
-"Vnesite vsaj en URL do veljavne server.met datoteke.\n"
-"Kliknite na gumb \"Seznam\", zraven potrditvenega polja, za vnos URL-ja."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Začasne datoteke"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Prihajajoče datoteke"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Spletni podpisi"
+"Datotečni sistem z mapo prejetih datotek ne more shranjevati velikih datotek."
 
-#: src/PrefsUnifiedDlg.cpp:920
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Choose a folder for %s"
-msgstr "Izberite mapo za %s"
-
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Prebrskajte za video predvajalnik"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Izberite brskalnik"
+msgid "Downloading %s"
+msgstr "Prejemanje %s"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Executable%s"
-msgstr "Izvedljiva datoteka %s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Uredi seznam strežnikov"
-
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
-msgstr ""
-"Tu dodajte URL-je do datotek server.met.\n"
-"Po en URL v vsako vrstico."
-
-#: src/PrefsUnifiedDlg.cpp:1031
-#, fuzzy, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Zakasnitev osveževanja: %d sek."
-msgstr[1] "Zakasnitev osveževanja: %d sek."
-
-#: src/PrefsUnifiedDlg.cpp:1038
-#, fuzzy, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Čas za graf povprečja: %d min."
-msgstr[1] "Čas za graf povprečja: %d min."
+msgid "You are already trying to download the file '%s'"
+msgstr "Datoteko »%s« že poskušate prejeti."
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Merilo za graf povezav: %d"
-
-#: src/PrefsUnifiedDlg.cpp:1050
-#, fuzzy, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Zakasnitev osveževanja: %d sek."
-msgstr[1] "Zakasnitev osveževanja: %d sek."
-
-#: src/PrefsUnifiedDlg.cpp:1056
-#, fuzzy, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Velikost medpomnilnika: %d bajtov"
-msgstr[1] "Velikost medpomnilnika: %d bajtov"
-
-#: src/PrefsUnifiedDlg.cpp:1062
-#, fuzzy, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Velikost čakalne vrste: %d odjemalcev"
-msgstr[1] "Velikost čakalne vrste: %d odjemalcev"
-
-#: src/PrefsUnifiedDlg.cpp:1069
-#, fuzzy, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Interval osvežitev povezave s strežnikom: %d min."
-msgstr[1] "Interval osvežitev povezave s strežnikom: %d min."
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Interval osvežitev povezave s strežnikom: Onemogočeno"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Vrata UDP za razširjene zahteve strežnika (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "onemogočen"
+msgid "You already have the file '%s'"
+msgstr "Datoteko »%s« že imate."
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Izvrši ukaz ob dogodku '%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Omogoči izvrševanje ukazov na jedru"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Ukaz jedra:"
+msgid "You are already trying to download the file %s"
+msgstr "Datoteko %s že poskušate prejemati"
 
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Omogoči izvrševanje ukazov v vmesniku"
+#: src/DownloadQueue.cpp:1401
+#, c-format
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Povezave magnet ni moč pretvoriti v eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Ukaz vmesnika:"
+#: src/DownloadQueue.cpp:1409
+#, c-format
+msgid "Unknown protocol of link: %s"
+msgstr "Neznan protokol povezave: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Sledeče spremenljivke bodo zamenjane:"
+#: src/DownloadQueue.cpp:1430
+#, c-format
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Neveljavna povezava eD2k. NAPAKA: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Nepooblaščen poskus dostopa. Povezava prekinjena."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "Po neuspelem overjanju je odjemalec poslal paket."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Zunanja povezava se je zaprla."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
-msgstr "Zunanje povezave onemogočene zaradi praznega gesla!"
+msgstr "Zunanje povezave onemogočene zaradi praznega gesla."
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Zunanje povezave onemogočene v nastavitveni datoteki"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Nova zunanja povezava sprejeta"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
-msgstr ""
+msgstr "NAPAKA: nove zunanje povezave ni bilo moč sprejeti"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
-msgstr "Zunanja povezava zavrnjena zaradi praznega gesla v nastavitvah!"
+msgstr "Zunanja povezava zavrnjena zaradi praznega gesla v nastavitvah."
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Povezovanje z odjemalcem: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Neznana različica"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
 msgstr ""
-"Napačna različica EC ID-ja; lahko pride do binarne neskladnosti. Uporabite "
-"jedro in oddaljen odjemalec iz istega posnetka."
+"Napačen ID različice za zunanje povezave; lahko pride do binarne "
+"nezdružljivosti. Uporabite jedro in oddaljen odjemalec iz istega posnetka."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
+"Ne morete se povezati s stabilno različico iz poljubne razvojne različice. "
+"Preprečeno morebitno sesutje."
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Overjanje ni uspelo."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Neveljavna različica protokola."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
-msgstr "Manjka označevalec različice protokola."
+msgstr "Manjka oznaka različice protokola."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
-msgstr "Neveljavna zahteva, najprej se morate overoviti."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+"Overjanje ni uspelo: kot geslo za zunanje povezave je bila podana napačna "
+"koda."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Overjanje ni uspelo: napačno geslo."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Overjanje ni uspelo: manjkajoče geslo."
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
+msgstr "Neveljavna zahteva, najprej se morate overiti."
+
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
-msgstr "Dostop sprejet."
+msgstr "Dostop dovoljen."
+
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Odjemalcu je bilo poslano sporočilo o napaki »%s«."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Nepooblaščen poskus dostopa od %s. Povezava prekinjena."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr ""
-"Ukaz za oddaljeno delno datoteko ni uspel: Ni bilo mogoče najti hasha "
-"datoteke: %s "
+"Ukaz za oddaljeno delno datoteko ni uspel: Ni bilo mogoče najti kode "
+"datoteke: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
-msgstr "Hasha datoteke ni mogoče najti: %s"
+msgstr "Kode datoteke ni mogoče najti: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
-msgstr "Ups! Napaka pri obdelavi OpCode!"
+msgstr "UPS. Napaka pri obdelavi OpCode."
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Strežnik ni bil dodan"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "strežnika ni mogoče najti: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "morate navesti strežnik za odstranitev"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k je onemogočen v nastavitvah."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
-msgstr "Iskanje poteka. Ponovno poglejte za rezultati čez nekaj trenutkov!"
+msgstr "Iskanje poteka. Ponovno poglejte za rezultati čez nekaj trenutkov."
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Spletno iskanje iz oddaljenega vmesnika nima smisla."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad je onemogočen v nastavitvah."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Ni točk za graf."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Vaš odjemalec ni nastavljen za to stopnjo podrobnosti."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
-msgstr ""
+msgstr "Zunanja povezava: zahtevana zaustavitev"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Ustavljanje že poteka."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
-msgstr "ExternalConn: dodajanje povezave '%s'."
+msgstr "Zunanja povezava: dodajanje povezave »%s«."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Neveljavna povezava oz. je že na seznamu."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Datoteke ni mogoče najti."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Neveljavno ime datoteke."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Ni mogoče preimenovati datoteke."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad je onemogočen v nastavitvah."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
-msgstr ""
+msgstr "Povezava z eD2k že obstaja."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
-msgstr "Povezovanje z eD2k..."
+msgstr "Povezovanje z eD2k ..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Povezava s Kad že obstaja."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
-msgstr "Povezovanje s Kad..."
+msgstr "Povezovanje s Kad ..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Vsa omrežja so onemogočena."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
-msgstr ""
+msgstr "Povezava z eD2k prekinjena."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Povezava s Kad prekinjena."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
-msgstr ""
+msgstr "Zunanja povezava: prejeta je bila neveljavna operacijska koda: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
-msgstr "Neveljaven 'opcode' (napačna različica protokola?)"
-
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"Ni bilo mogoče odpreti datoteke (%s), odstranjevanje iz seznama deljenih "
-"datotek."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Zahtevan je bil hashset za neznano datoteko: %s"
+msgstr "Neveljavna operacijska koda (napačna različica protokola?)"
 
-#: src/TerminationProcess.cpp:48
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Ukaz '%s' z id-jem '%d' se je končal s statusno kodo '%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Strežnik ni bil dodan: IP ali ime gostitelja nista navedena."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Strežnik ni bil dodan: navedena so neveljavna vrata strežnika."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "eD2k status:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Povezan"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Vrata"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Stanje Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Teče"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Stanje:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Ni povezave"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Stanje povezave:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Za požarnim zidom"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "V redu"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Stanje za požarnim zidom: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "Povezan s kolegom"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Brez kolegov"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Povprečno uporabnikov: "
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Povprečno datotek:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Ne teče"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Neprekinjeno delovanje: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Prenos"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Prenosi gor"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Prenesenih podatkov gor (Seja (Skupno)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Celotni presežek (paketov): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Presežek zahtev datotek (paketov): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Presežek izmenjav virov (paketov): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Presežek strežnikov (paketov): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Presežek Kad (paketov): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr ""
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Aktivni prenosi gor: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Čakajoči prenosi gor: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Skupno št. uspelih prenosov gor: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Skupno št. neuspelih prenosov gor: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Povprečen čas prenosov gor: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Prenosi dol"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Prenesenih podatkov dol (Seja (Skupno)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Najdenih virov: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Aktivni prenosi (deli): %s"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Neznana razširitev »%s« za ukaz »%s«.\n"
 
-#: src/Statistics.cpp:686
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Razmerje med prenosi gor:dol to sejo (skupno): %s"
+msgid "Unknown command '%s'.\n"
+msgstr "Neznan ukaz »%s«.\n"
 
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
+"\n"
+"Ta ukaz nima argumentov.\n"
 
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
+"\n"
+"Ta ukaz mora imeti argument.\n"
 
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
+"\n"
+"Ta ukaz je nepopoln, uporabiti morate eno od spodnjih razširitev.\n"
 
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
 msgstr ""
+"\n"
+"Razpoložljive razširitve:\n"
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Ponovnih povezav: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Čas od prvega prenosa: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "S strežnikom povezan že: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Aktivnih povezav (približek): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Dosežnih največ možnih povezav: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Povprečnih povezav (približek): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Povezav v konici (približek): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Odjemalci"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrirani"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Skupno: %i Znani: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Delujoči strežniki: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Nedelujoči strežniki: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Skupno: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Zbrisani strežniki: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Filtrirani strežniki: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Uporabnikov na delujočih strežnikih: %llu"
-
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Datotek na delujočih strežnikih: %llu"
-
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Skupno uporabnikov: %llu"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Razpoložljivi ukazi:\n"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Total Files: %llu"
-msgstr "Skupno datotek: %llu"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Ukazi niso občutljivi na velikost črk.\n"
+"Napišite »%s <ukaz>« za podrobne informacije o <ukaz>.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Zasedenost strežnikov: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Konča program."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Število deljenih datotek: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Prikaži pomoč."
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Celotna velikost deljenih datotek: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Za pomoč pri ukazu napišite »help <ukaz>«.\n"
+"Za celoten seznam ukazov napišite »help«.\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
-msgstr "Povprečna velikost datotek: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Operacijski sistem"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Ni prejeto"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Izreži"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Prilepi"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Izberi vse"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Uporabite »%s« za seznam ukazov\n"
+"\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Iskanje preko Kad ni mogoče, če Kad ne teče"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Napaka v skladnji."
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
+"Napaka pri obdelavi ukaza – se ne bi smelo zgoditi. Prosimo, poročajte o "
+"hrošču.\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Nepričakovana napaka med iskanjem Kad: "
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Ta ukaz ne sme imeti parametrov."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Filtrirano sporočilo od '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Ta ukaz mora imeti parameter."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Novo sporočilo od '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Neveljaven argument."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "Uporabnik %s (%u) je zahteval vaš seznam deljenih datotek -> Sprejeto"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Ukaz ni popoln."
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "Uporabnik %s (%u) je zahteval vaš seznam deljenih datotek -> Zavrnjeno"
+msgid "Type '%s' to get more help.\n"
+msgstr "Napišite »%s« za dodatno pomoč.\n"
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "Uporabnik %s (%u) je zahteval vaš seznam deljenih imenikov -> Sprejeto"
+msgid "This is %s %s %s\n"
+msgstr "To je %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr ""
-"Uporabnik %s (%u) je zahteval vaš seznam deljenih imenikov -> Zavrnjeno"
+msgid "This is %s %s\n"
+msgstr "To je %s %s\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"Uporabnik %s (%u) je zahteval seznam deljenih datotek za imenik %s -> "
-"sprejeto"
-
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+"\n"
+"Creating client...\n"
 msgstr ""
-"Uporabnik %s (%u) je zahteval seznam deljenih datotek za imenik %s -> "
-"zavrnjeno"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Uporabnik %s (%u) deli imenik %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Uporabnik %s (%u) je poslal nezahtevane deljene imenike."
-
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "Uporabnik %s (%u) je poslal seznam deljenih datotek za imenik %s"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Uporabnik %s (%u) je končal s prenosom seznama deljenih datotek"
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Uporabnik %s (%u) je poslal nezaželen seznam deljenih datotek"
+"\n"
+"Ustvarjanje odjemalca ...\n"
 
-#: src/ClientTCPSocket.cpp:1049
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Uporabnik %s (%u) je zavrnil dostop do seznama deljenih datotek/imenikov"
-
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Vozlišča (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Neveljaven IP za začetno nalaganje"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Neveljavna vrata za začetno nalaganje"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Prosimo, izpolnite vsa zahtevana polja"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Ali ste prepričani, da želite prenesti novo datoteko nodes.dat?\n"
+"\n"
+"V redu, končevanje %s ...\n"
 
-#: src/KadDlg.cpp:197
+#: src/ExternalConnector.cpp:420
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"S tem boste odstranili trenutna vozlišča in ponovno zagnali povezavo Kad."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Nadaljuj?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "NAPAKA: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "OPOZORILO: "
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Dodaj prijatelja"
+"Ne morete se povezati s praznim geslom.\n"
+"Vnesti morate geslo v nastavitveni datoteki,\n"
+"ukazni vrstici ali pa ko boste vprašani za geslo.\n"
+"\n"
+"Končevanje ...\n"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Vnesti morate veljaven IP in vrata!"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Prikaži to besedilo pomoči."
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informacije"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Gostitelj kjer teče aMule. (privzeto: localhost)"
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Naveden hash uporabnika ni veljaven!"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Vrata aMule za zunanje povezave. (privzeto: 4712)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Viri"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Geslo za zunanje povezave."
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Datoteka"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Preberi nastavitve iz datoteke."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Prenos"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Ne izpisuj izhodnih podatkov na standardni izhod."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategorija"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Zgovorno – prikaži tudi razhroščevalna sporočila."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Glavna"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Nastavi področne nastavitve (jezik) programa."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Prenesi v kategorijo"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Zapiši možnosti ukazne vrstice v nastavitveno datoteko."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
 msgstr ""
+"Ustvari nastavitveno datoteko, ki temelji na nastavitveni datoteki aMule."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Označi kot znano datoteko"
-
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Poveži se z oddaljeno aMule"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Izpiši različico programa."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Povezovanje ni uspelo "
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Podrobnosti datoteke"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "NAPAKA"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f% % zaključeno"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Povezava ni uspela. Ni se bilo mogoče povezati z %s:%d\n"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
+"Datoteke s seznamom prijateljev »emfriends.met« ni bilo moč odpreti za branje."
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Uporabnikov: E: %s K: %s | Datoteke E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
+"Datoteke s seznamom prijateljev »emfriends.met« ni bilo moč odpreti za "
+"pisanje."
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Vse"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "KRITIČNO – ni odjemalca za StartChatSession"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Skupno uporabnikov: %s | Skupno datotek: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Prijatelji"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Preneseno"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Prikaži po&drobnosti"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Hitrost"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Dodaj prijatelja"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Potek"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Odstrani prijatelja"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Stanje"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Pošlji &sporočilo"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Preostaja še"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Prikaži datoteke"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Nazadnje videno celotno"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Ustvari mesto za prijatelja"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Zadnji sprejem"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Ali res želite izbrisati izbranega prijatelja?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Ali ste prepričani, da želite zbrisati označeno datoteko?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Ali res želite izbrisati izbrane prijatelje?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Ali ste prepričani, da želite zbrisati označene datoteke?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Ne morete dodeliti več kot enega mesta za prijatelja.\n"
+"Samo eno mesto je bilo dodeljeno."
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Izbira večih"
+
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Pošlji uporabniku sporočilo"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Sporočilo:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Ustavi"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Premor"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Nadaljuj"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "Počisti &končane"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Prenesi vse vire A4AF na to datoteko zdaj"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Prenesi vse vire A4AF na to dat. (samod.)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Prenesi vse vire A4AF na druge datoteke"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Dodatne možnosti"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Predogled"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Prikaži po&drobnosti datoteke"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Prikaži vse komentarje"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Kopiraj magnet URI v odložišče"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "prekliči dodelitev"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Dodeli kategoriji"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Odpri datoteko"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
-msgstr "Odstrani iz seznama prijateljev"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Dodaj med prijatelje"
+msgstr "Odstrani s seznama prijateljev"
 
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Pošlji sporočilo"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Prenesi k tej datoteki"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
-msgstr "A4AF"
+msgstr "PZDD"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
-msgstr "QR: %u (%i)"
+msgid "On Queue: %u (%i)"
+msgstr "V vrsti: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Prosil za drugo datoteko"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Prenosi dol (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Predogled datoteke"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Čakanje na mesto za pošiljanje"
 
-#: src/DownloadListCtrl.cpp:2320
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "NAPAKA: Ni bilo mogoče zagnati zunanjega predvajalnika!  Ukaz: `%s'"
+msgid "On Queue: %u"
+msgstr "V vrsti: %u"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "NAPAKA: Delne datoteke ni bilo mogoče ustvariti)"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Pošiljanje"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Poskus nalaganja varnostne kopije met datoteke iz %s"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr ""
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr ""
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr ""
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Brez"
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Poskus reševanja informacije o datoteki..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "Reševanje neimenovane datoteke - rešena bo kot RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Rešene vse informacije o datoteki ki so na voljo :D - Poskus njihove "
-"uporabe..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Ni mogoče rešiti informacij o datoteki :("
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Ne"
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Ni bilo mogoče odpreti %s (%s)"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Da"
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr ""
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Prejemanje ..."
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "NAPAKA med shranjevanjem delne datoteke: %s (%s ==> %s)"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "Prejemanje HTTP preklicano"
 
-#: src/PartFile.cpp:919
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr ""
+msgid "Unable to create destination file %s for download!"
+msgstr "Ni moč ustvariti ciljne datoteke %s za prejemanje."
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "Velikost '%s' je 0 - uporabljena bo datoteka %s."
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "URL za prejemanje ne sme biti prazen"
 
-#: src/PartFile.cpp:998
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Ni bilo mogoče shraniti datoteke part.met.seeds za %s"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "URL %s je vrnil: %i – Napaka (%i)."
 
-#: src/PartFile.cpp:1024
-#, fuzzy, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Shranjenih %i virov za delno datoteko: %s (%s)"
-msgstr[1] "Shranjenih %i virov za delno datoteko: %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Delna datoteka %s (%s) nima datoteke seeds"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "Kritična napaka pri zapisovanju prejete datoteke"
 
-#: src/PartFile.cpp:1062
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Delna datoteka %s (%s) ima prazno datoteko seeds"
+msgid "Downloaded %d bytes"
+msgstr "Prejetih %d bajtov"
 
-#: src/PartFile.cpp:1118
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Napaka pri branju delne datoteke 'seeds' (%s - %s): %s"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "Pričakovanih je bilo %d bajtov, prejetih pa %d bajtov"
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, fuzzy, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Najden pokvarjen del (%d) v %d delni datoteki %s - FileResultHash |%s| "
-"FileHash |%s|Najden pokvarjen del (%d) v %d delni datoteki %s - "
-"FileResultHash |%s| FileHash |%s|"
-msgstr[1] ""
-"Najden pokvarjen del (%d) v %d delni datoteki %s - FileResultHash |%s| "
-"FileHash |%s|Najden pokvarjen del (%d) v %d delni datoteki %s - "
-"FileResultHash |%s| FileHash |%s|"
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Najden končan del (%i) v %s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Končano ponovno ustvarjanje hasha za %s"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
+"Neveljaven URL za prejemanje HTTP ali pa preusmeritev HTTP (ali ste pozabili "
+"»http://«?)"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Končan prenos: %s"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "Ni se moč povezati s strežnikom za prejemanje HTTP"
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Brisanje datoteke: %s"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "Neveljaven odziv strežnika za prejemanje HTTP"
 
-#: src/PartFile.cpp:2384
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr ""
-"OPOZORILO: Ni mogoče hashirati prenesenega dela - hashset nepopoln za '%s'"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Pridobi novo datoteko GeoIP.dat od %s"
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
-msgstr ""
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "Prejemanje datoteke GeoIP.dat ni uspelo, posodobitev preklicana."
 
-#: src/PartFile.cpp:3086
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "OPOZORILO: Na disku ni dovolj prostora! Datoteka %s na premoru"
+msgid "Failed to remove %s file, aborting update."
+msgstr "Odstranitev datoteke %s ni uspela, posodobitev preklicana."
 
-#: src/PartFile.cpp:3171
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Prenesen del %i v datoteki je pokvarjeni: %s"
+msgid "Failed to rename %s file, aborting update."
+msgstr "Preimenovanje datoteke %s ni uspelo, posodobitev preklicana."
 
-#: src/PartFile.cpp:3214
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "IRN: Rešen pokvarjen del %i za %s -> Rešenih bajtov: %s"
+msgid "Successfully updated %s"
+msgstr "%s je bila uspešno posodobljena"
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr ""
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr ""
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Napaka pri posodabljanju GeoIP.dat"
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Ustavljeno"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "Prejeto"
-
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr ""
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr ""
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr ""
+msgid "Failed to download %s from %s"
+msgstr "Prejemanje %s od %s ni uspelo"
 
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Vhodno/izhodna napaka med branjem datoteke known.met: %s"
+msgid "Failed to load country data for '%s'."
+msgstr "Nalaganje državnih podatkov za »%s« ni uspelo."
 
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Napaka med shranjevanjem datoteke known.met: %s"
-
-#: src/SharedFileList.cpp:352
-#, fuzzy, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Najdenih %i znanih deljenih datotek"
-msgstr[1] "Najdenih %i znanih deljenih datotek"
-
-#: src/SharedFileList.cpp:358
-#, fuzzy, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Najdenih %i znanih deljenih datotek, %i neznanih"
-msgstr[1] "Najdenih %i znanih deljenih datotek, %i neznanih"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Nalaganje datotek filtrov IP »ipfilter.dat« in »ipfilter_static.dat«."
 
-#: src/SharedFileList.cpp:367
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr ""
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Komentarji o datoteki"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Ocena"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Komentar"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Ni komentarjev"
-
-#: src/CommentDialogLst.cpp:104
-#, fuzzy, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u komentar"
-msgstr[1] "%u komentar"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Ni bilo mogoče vzpostaviti maskirane povezave s strežniki na seznamu. "
-"Ponoven poskus brez maskiranja."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr ""
-"Ni se bilo mogoče povezati na katerega koli izmed strežnikov na seznamu. "
-"Ponoven poskus."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr ""
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr ""
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Povezan z %s (%s:%i)"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "Ni bilo mogoče naložiti datoteke ipfilter.dat »%s«, neznan format."
 
-#: src/ServerConnect.cpp:263
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Connection established on: %s"
-msgstr "Povezava vzpostavljena z: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
-"Kritična napaka med povezovanjem. Internetna povezava je mogoče prekinjena"
+"Ni bilo mogoče naložiti datoteke ipfilter.dat »%s«, ni bilo moč odpreti "
+"datoteke"
 
-#: src/ServerConnect.cpp:339
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Izgubljena povezava z %s (%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) je nedosegljiv."
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Naloženih %u nizov IP iz »%s«."
+msgstr[1] "Naložen %u niz IP iz '%s'."
+msgstr[2] "Naložena %u niza IP iz '%s'."
+msgstr[3] "Naloženi %u nizi IP iz '%s'."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) je poln."
-
-#: src/ServerConnect.cpp:381
-#, fuzzy, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] ""
-"Samodejen poskus povezovanja s strežnikom se bo izvedel čez %d sekund"
-msgstr[1] ""
-"Samodejen poskus povezovanja s strežnikom se bo izvedel čez %d sekund"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Povezava izgubljena"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u nepravilnih vrstic je bilo izpuščenih."
+msgstr[1] "%u nepravilna vrstica je bila izpuščena."
+msgstr[2] "%u nepravilni vrstici sta bili izpuščeni."
+msgstr[3] "%u nepravilne vrstice so bile izpuščene."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Povezovanje z %s (%s:%i) ni uspelo."
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Preimenovanje nove datoteke %s ni uspelo, posodobitev preklicana."
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr ""
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "Filter IP je pripravljen"
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Poskus povezovanja z %s (%s:%i) je potekel."
-
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Ni mogoče najti delnih datotek"
-
-#: src/DownloadQueue.cpp:171
-#, fuzzy, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Najdenih %u delnih datotek"
-msgstr[1] "Najdenih %u delnih datotek"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+"Bootstrap from \n"
+"known clients"
 msgstr ""
+"Naloži od znanih \n"
+"odjemalcev"
 
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Prenašanje %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Datoteko '%s' že poskušate prenesti."
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Datoteko '%s' že imate."
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Datoteko %s že poskušate prenesti."
-
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr ""
+msgid "Nodes (%u)"
+msgstr "Vozlišča (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Neznan protokol povezave: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Neveljaven IP za začetno nalaganje"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr ""
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Neveljavna vrata za začetno nalaganje"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Izvrši <str> in končaj."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Prosimo, izpolnite vsa zahtevana polja"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Neveljaven format IP. Uporabite xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Ali res želite prenesti novo datoteko nodes.dat?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Ta ukaz potrebuje argument. Veljavni argumenti: 'all', ime datoteke ali "
-"število.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Obdelovanje datoteke po hashu: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Obdelovanje po imenu datoteke: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
+"S tem boste odstranili trenutna vozlišča in ponovno zagnali povezavo Kad."
 
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Ni veljavno število\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Ni veljaven hash (dolžina mora biti točno 32 znakov)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Operacija je bila uspešna."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Zahteva ni uspela zaradi napake: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Filtriranje IP za odjemalce je %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "IZKLOPLJENO"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "VKLOPLJENO"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Filtriranje IP za strežnike je %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Trenutna stopnja IP Filtra je %d.\n"
-
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr ""
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Ali želite nadaljevati?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: iskalni niz je prekratek"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Povezan z %s %s %s"
+msgid "Keyword for search: %s"
+msgstr "Ključna beseda za iskanje: %s"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "z Nizkim ID-jem"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: iskalna ključna beseda je že na iskalnem seznamu: "
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "z Visokim ID-jem"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Povezovanje"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Ni povezave"
-
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Prenos dol:\t%s"
+"Branje datoteke nodes.dat ni uspelo – prestara je. Ta različica (0) ni več "
+"podprta."
 
-#: src/TextClient.cpp:726
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Prebranih %u stikov Kad"
+msgstr[1] "Prebran %u stik Kad"
+msgstr[2] "Prebrana %u stika Kad"
+msgstr[3] "Prebrani %u stiki Kad"
+
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Prenos gor:\t%s"
+"Najdenega ni bilo nobenega stika. Opravite začetno nalaganje ali pa "
+"pridobite datoteko nodes.dat."
 
-#: src/TextClient.cpp:729
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Odjemalcev v vrsti:\t%d\n"
-
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
-msgstr ""
-"\n"
-"Vseh virov:\t%d\n"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Na voljo je samo %d stikov Kad, nodes.dat ni bila zapisana"
+msgstr[1] "Na voljo je samo %d stik Kad, nodes.dat ni bila zapisana"
+msgstr[2] "Na voljo sta samo %d stika Kad, nodes.dat ni bila zapisana"
+msgstr[3] "Na voljo so samo %d stiki Kad, nodes.dat ni bila zapisana"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Število rezultatov: %i\n"
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Zapisanih %d stikov Kad"
+msgstr[1] "Zapisan %d stik Kad"
+msgstr[2] "Zapisana %d stika Kad"
+msgstr[3] "Zapisani %d stiki Kad"
 
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "V PRIHODNJE - prikaz poteka iskanja"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Ime datoteke"
 
-#: src/TextClient.cpp:828
-#, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Prejet neznan odgovor od strežnika, OpCode = %#x."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Velikost datoteke"
 
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Prikaži kratke informacije o stanju."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Delilno razmerje"
 
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Prikaži stanje povezave, trenutne hitrosti prenosa gor/dol, itd.\n"
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Poslano"
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Prikaži celotno statistično drevo."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Zahtevano"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Neobvezno: kot argument tega ukaza lahko podate število v obsegu 0-255, ki "
-"določa,\n"
-"koliko različic odjemalca naj bo prikazanih v poddrevesu tipa odjemalcev.\n"
-"Vrednost 0 ali izpuščen argument pomeni 'neomejeno'.\n"
-"\n"
-"Primer: 'statistics 5' bo prikazalo 5 najpogostejših različic vsakega tipa "
-"odjemalca.\n"
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Sprejeto"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Ugasni aMule."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Popolnih virov"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
+"OPOZORILO: seznam znanih datotek je pokvarjen, vsebuje neveljavno glavo."
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Ponovno naloži naveden objekt."
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Ponovno naloži seznam deljenih datotek."
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Ponovno naloži IP-Filtre iz datoteke."
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Poveži se z omrežjem."
-
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"Ta možnost bo vzpostavila povezavo z vsemi omrežji, omogočenimi v "
-"nastavitvah.\n"
-"Neobvezno: Lahko navedete naslov strežnika v obliki IP:Vrata,\n"
-"za povezavo samo s tem strežnikom. IP mora biti s pikami ločen\n"
-"decimalen naslov IPv4 ali razrešljivo ime DNS."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Poveži se le z eD2k."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Poveži se samo s Kad."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Prekini povezavo z omrežjem."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "To bo prekinilo povezavo z vsemi omrežji s katerimi ste povezani.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
+"Nalaganje vnosa iz seznama znanih datotek ni uspelo, datoteka je morda "
+"pokvarjena"
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Prekini samo povezavo Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Doda eD2k ali magnet povezavo v jedro."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
+"Neveljaven vnos na seznamu znanih datotek, datoteka je morda pokvarjena: "
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Nastavitvi izbrano vrednost."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Nastavi IP Filter."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Vključi filtriranje IP-jev za odjemalce in strežnike."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Izključi filtriranje IP-jev za odjemalce in strežnike."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Omogoči/Onemogoči filtriranje IP-jev za odjemalce."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Vključi filtriranje IP-jev za odjemalce."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Izključi filtriranje IP-jev za odjemalce."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Omogoči/Onemogoči filtriranje IP-jev za strežnike."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Vključi filtriranje IP-jev za strežnike."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Izključi filtriranje IP-jev za strežnike."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Izberite stopnjo filtriranja IP-jev."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
-msgstr "Veljavne stopnje filtriranja so od 0-255, privzeta stopnja je 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Nastavi omejitve povezave."
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "Vrednost teh ukazov mora biti v kilobajtih/sek.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Nastavi omejitev prenosa gor."
-
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Nastavi omejitev prenosa dol."
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Dobi in prikaži vrednost nastavitve."
-
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Dobi nastavitve filtriranja IP-jev."
-
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Dobi stanje IP Filtra za odjemalce in strežnike."
+#: src/libs/common/Format.cpp:307
+#, c-format
+msgid "Unknown error %d"
+msgstr "Neznana napaka %d"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Dobi stanje IP Filtra samo za odjemalce."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Ni moč dobiti opisa napake za napako %d"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Dobi stanje IP Filtra samo za strežnike."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Ustvarjanje kode"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Dobi stopnjo IP Filtra."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Zaključevanje"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Dobi omejitve prenosa."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Zaključeno"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Začne iskanje."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Prekinjeno"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"Vrsta iskanja mora biti navedena s sledečimi tipi:\n"
-"    GLOBAL (globalno)\n"
-"    LOCAL (krajevno)\n"
-"    KAD (kad)\n"
-"Primer: search kad datoteka' bo izvršilo kad iskanje za \"datoteka\".\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Vsebuje napake"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Izvrši globalno iskanje."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Na čakanju"
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Izvrši krajevno iskanje."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Navesti morate neprazno geslo."
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Izvrši kad iskanje."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Neveljavno geslo, ni izvleček MD5."
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Prikaže rezultate zadnjega iskanja."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Napaka med povezovanjem"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Vrne rezultate prejšnjega iskanja.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "Zunanja povezava ni uspela. Prazen odgovor."
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
 msgstr ""
+"Zunanja povezava: slab odgovor, rokovanje ni uspelo. Povezava prekinjena."
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr ""
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Uspeh! Vzpostavljena povezava z aMule "
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Začni prenašati datoteko"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Uspeh! Povezava vzpostavljena."
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Navesti morate številko datoteke iz predhodnega iskanja.\n"
-"Primer: ukaz 'download 12' bo dodal na seznam prenosov datoteko št. 12 iz "
-"predhodnega iskanja.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Zunanja povezava: dostop je bil zavrnjen. Razlog: "
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Pavziraj prenos."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Zunanja povezava: rokovanje ni uspelo."
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Nadaljuj prenos."
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "Vtičnica za poslušanje: v redu."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Prekliči prenos."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "NAPAKA: ni moč poslušati na vratih TCP."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Nastavi prioriteto prenosa dol."
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "NAPAKA: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr ""
-"Nastavi prioriteto prenosa dol na 'Nizka', 'Normalna', 'Visoka' ali "
-"'Samodejna'.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "OPOZORILO: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Nastavi prioriteto na 'Nizka'."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Zapri"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Nastavi prioriteto na 'Normalna'."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Izreži"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Nastavi prioriteto na 'Visoka'."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Skopiraj"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Nastavi prioriteto na 'Samodejna'."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Prilepi"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Prikaži čakalne vrste/seznam."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Počisti"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Prikaži čakalno vrsto prenosov gor/dol, seznam strežnikov ali deljenih "
-"datotek.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Izberi vse"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Prikaži čakalno vrsto prenosov gor."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Prikaži čakalno vrsto prenosov dol."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Neomejeno"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Prikaži dnevnik."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule meni sistemske vrstice"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Prikaži seznam strežnikov."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Omejitve hitrosti"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Ponastavi dnevnik."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "Gor: brez"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr ""
+msgid "UL: %u"
+msgstr "Gor: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "Dol: brez"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr ""
+msgid "DL: %u"
+msgstr "Dol: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr ""
+msgid "Download speed: %.1f"
+msgstr "Hitrost prejemanja: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Nov odjemalčev ID je %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr ""
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tPo vsej verjetnosti ste za požarnim zidom ali usmerjevalnikom."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tZa več informacij se obrnite na http://wiki.amule.org"
-
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Prejete neznane informacije strežnika! - prekratke"
+msgid "Upload speed: %.1f"
+msgstr "Hitrost pošiljanja: %.1f"
 
-#: src/ServerSocket.cpp:539
-#, fuzzy, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Prejetih %d novih strežnikov"
-msgstr[1] "Prejetih %d novih strežnikov"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Podatki o odjemalcu"
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Shranjevanje seznama strežnikov končano."
+#: src/MuleTrayIcon.cpp:330
+#, c-format
+msgid "Nickname: %s"
+msgstr "Vzdevek: %s"
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Strežnik je zavrnil zadnji ukaz"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Izbran ni noben vzdevek."
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Nepravi paket prejet od strežnika: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "Odjemalčev ID: "
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Napaka med obdelavo paketa iz strežnika: %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Ni povezave"
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Ni mogoče ustvariti niti za razrešitev DNS pri povezavi z %s"
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Ime strežnika: "
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "Strežnikov IP %s (%s) je filtriran.  Ni povezave."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP strežnika: "
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "z maskiranim protokolom."
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Ni povezave"
 
-#: src/ServerSocket.cpp:748
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Povezovanje z %s (%s - %s:%i) %s"
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Ni mogoče razrešiti DNS za strežnik: %s: Povezava ni mogoča!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr ""
-"CIP2Country::CIP2Country(): Ni bilo mogoče naložiti podatkov o državah iz "
-
-#: src/IP2Country.cpp:105
-#, fuzzy, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Naloženih %d slik zastav."
-msgstr[1] "Naloženih %d slik zastav."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Ali ste prepričani, da želite preklicati prenos in zbrisati vse datoteke v "
-"tej kategoriji?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Potrebna je potrditev"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Vse ostalo"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Nedokončano"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Aktivno"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Video"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Avdio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Arhiv"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Slike CD-jev"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Slike"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Besedilo"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Izberi filter prikaza"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Dodaj kategorijo"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Uredi kategorijo"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Odstrani kategorijo"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Ime datoteke"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Velikost datoteke"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Delilno razmerje"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Naloženo"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Zahtevano"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Sprejeto"
+msgid "TCP port: %d"
+msgstr "Vrata TCP: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Celotni viri"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "Vrata TCP: niso pripravljena"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Uvažanje %s: %s"
+msgid "UDP port: %d"
+msgstr "Vrata UDP: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Branje mape začasnih datotek"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "Vrata UDP: niso pripravljena"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Prenašanje splošnih informacij iz info-datoteke prenosa"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Spletni podpis: omogočen"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Ustvarjanje ciljne datoteke"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Spletni podpis: onemogočen"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Nalaganje podatkov iz stare datoteke prenosa (%u od %u)"
+msgid "Uptime: %s"
+msgstr "Neprekinjeno delovanje: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Shranjevanje podatkovnega bloka v novo datoteko prenosa (%u od %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Prenašanje informacij o izvirni datoteki prenosa"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Dodajanje prenosa in shranjevanje nove delne datoteke"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Uvozi delne datoteke"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Stanje"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Hash datoteke"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Čakanje..."
+msgid "Shared files: %d"
+msgstr "Deljene datoteke: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disk: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Prosimo, izberite mapo za iskanje delnih prenosov! (vključene bodo tudi "
-"podmape)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "Ali želite zbrisati izvirne datoteke uspešno uvoženih prenosov?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Ali želite odstraniti vire?"
-
-#: src/OtherFunctions.cpp:112
-#, fuzzy
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "bajtov"
-msgstr[1] "bajtov"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-#, fuzzy
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "bajtov/sek."
-msgstr[1] "bajtov/sek."
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "sek."
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "min."
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "ur"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "dni"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Video"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Arhivi"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Besedila"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programi"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Vse"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Ni ocenjeno"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Neveljaven / Pokvarjen / Lažen"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Slabo"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Povprečno"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Dobro"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Odlično"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "vse"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "vse ostalo"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Nalaganje datotek IP filtrov 'ipfilter.dat' in 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Odjemalci v vrsti: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Ni bilo mogoče naložiti datoteke ipfilter.dat '%s', neznan format."
+msgid "Total DL: %s"
+msgstr "Skupno dol: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Ni bilo mogoče naložiti datoteke ipfilter.dat '%s', datoteke ni mogoče "
-"odpreti."
+msgid "Total UL: %s"
+msgstr "Skupno gor: %s"
 
-#: src/IPFilter.cpp:331
-#, fuzzy, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Naloženih %u nizov IP iz '%s'."
-msgstr[1] "Naloženih %u nizov IP iz '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Omejitev pošiljanja"
 
-#: src/IPFilter.cpp:333
-#, fuzzy, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u nepravilnih vrstic izpuščenih."
-msgstr[1] "%u nepravilnih vrstic izpuščenih."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Omejitev prejemanja"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktivne povezave (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Skrij aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Podrobnosti"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Prikaži aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% končano"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Končaj"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "Povezava eD2k: "
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
-msgstr "Izvrši"
+msgstr "Pridobi"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
-msgstr ""
+msgstr "Kliknite za dodajanje povezave eD2k v vrsto za prejemanje."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr ""
-"Dogodki so prikazani tukaj. Za poln seznam dogodkov, poglejte v zapisnik v "
-"zavihku Strežniki."
+"Dogodki so prikazani tukaj. Za celoten seznam dogodkov, poglejte v zapisnik "
+"na zavihku Strežniki."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Nalaganje ..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Število uporabnikov na strežniku na katerega ste povezani ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Uporabnikov: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr ""
-"Št. uporabnikov povezanih na ta strežnik in približek celotnega števila "
+"Število uporabnikov povezanih na ta strežnik in ocena skupnega števila "
 "uporabnikov."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Gor: 0,0 | Dol: 0,0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
 msgstr ""
 "Trenutno povprečje prenosa v obe smeri. Če je vklopljen prikaz presežka, "
 "številke v oklepaju ponazarjajo presežek prenosa od komunikacije med "
-"uporabniki."
+"odjemalci."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
 "low ID (firewalled) and green arrows signify that you have high ID (The "
 "optimal connection type)."
 msgstr ""
-"Prikazuje stanje povezave. Rdeče puščice pomenijo, da trenutno niste "
-"povezani, rumene puščice pomenijo, da imate nizek ID (ste za požarnim zidom) "
-"in zelene puščice pomenijo da imate visok ID (optimalna povezava)."
+"Prikazuje stanje povezave in aktivne prenose. Rdeče puščice pomenijo, da "
+"trenutno niste povezani, rumene puščice pomenijo, da imate nizek ID (ste za "
+"požarnim zidom) in zelene puščice pomenijo, da imate visok ID (optimalna "
+"povezava)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Ni povezave ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Trenutno povezan strežnik."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Iskanje"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Ime:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Vrsta"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Krajevno"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Globalno"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
-msgstr "Hash datoteke"
+msgstr "Koda datoteke"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Dodatni parametri"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtriranje"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Vrsta datoteke"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Vse"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Arhivi"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Zvok"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Slike CD-jev"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Slike"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programi"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Besedila"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Video"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Končnica"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Min. velikost"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bajtov"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
-msgstr "KB"
+msgstr "KiB"
+
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MiB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GiB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Maks. velikost"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Razpoložljivost"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filter:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Filtriraj rezultate"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
-msgstr "Obraten rezultat"
+msgstr "Obrni rezultat"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Skrij znane datoteke"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Začni"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Več"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
-msgstr ""
+msgstr "Poišče več rezultatov na eD2k. za Kad to še ni podprto."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Ustavi"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Pridobi"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
-msgstr "Počisti polja"
+msgstr "Ponastavi polja"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Rezultati"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
-msgstr "Počisti končane prenose"
-
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Prikaže čakalno vrsto prenosov gor"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Uporabnikov v vrsti :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Pošlji"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Pošlje navedeno sporočilo."
+msgstr "Počisti zaključena prejemanja"
 
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Zapri"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Viri datoteke:"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Zapri to pogovorno sejo."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Splošno"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
-msgstr "Polno Ime :"
+msgstr "Polno Ime:"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
-msgstr "N/A"
+msgstr "Ni na voljo"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
-msgstr "Datoteka met :"
+msgstr "Datoteka met:"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
-msgstr "Hash :"
+msgstr "Koda:"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
-msgstr "Velikost :"
+msgstr "Velikost datoteke:"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
-msgstr "Stanje delne datoteke :"
+msgstr "Stanje delne datoteke:"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
-msgstr "Nazadnje videno celotno: "
+msgstr "Nazadnje videno celotno:"
+
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Prenos"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
-msgstr "Najdenih virov :"
+msgstr "Najdenih virov:"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
-msgstr "Prenašajoči viri :"
+msgstr "Prenašajoči viri:"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
-msgstr "Število delov :"
+msgstr "Število delov:"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
-msgstr "Razpoložljivih :"
+msgstr "Razpoložljivih:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
-msgstr "Razmerje podatkov :"
+msgstr "Podatkovna hitrost:"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
-msgstr "Čas aktivnih prenosov dol: "
+msgstr "Čas aktivnega prejemanja: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
-msgstr "Preneseno :"
+msgstr "Preneseno:"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
-msgstr "Končano :"
+msgstr "Zaključeno:"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
-msgstr "Inteligentno Reševanje Napak"
+msgstr "Inteligentno rokovanje s poškodbami"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
-msgstr "Izguba zaradi napak :"
+msgstr "Izguba zaradi poškodb:"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
-msgstr "Pridobitev zaradi kompresije :"
+msgstr "Pridobitev zaradi stiskanja:"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
-msgstr "Paketi rešeni z I.R.N. :"
+msgstr "Paketi rešeni z I.R.P.:"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Imena datoteke"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Prevzemi"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Počisti"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
-msgstr "Uporabi"
+msgstr "Uveljavi"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "V redu"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
-msgstr "Komentiraj/Oceni datoteko (besedilo bo vidno vsem uporabnikom)"
+msgstr "Komentirajte/ocenite datoteko (besedilo bo vidno vsem uporabnikom)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Za film lahko navedete zgodbo, dolžino, jezik ...\n"
-"in če je lažen, lahko opozorite ostale uporabnike aMule."
+"Za film lahko poveste njegovo dolžino, zgodbo, jezik ...\\n\\nin če je "
+"lažna, lahko to sporočite drugim uporabnikom."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Kakovost datoteke"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Ni ocenjena"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Neveljavna/poškodovana/lažna"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Slaba"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Povprečna"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Dobra"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Odlična"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Izberite oceno datoteke ali sporočite uporabnikom, če datoteka ni "
 "veljavna ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Osveži"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
-msgstr "Prenašanje, prosimo počakajte ..."
+msgstr "Prejemanje, prosimo počakajte ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Neznana velikost"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
-msgstr "Zahtevane informacije"
+msgstr "Zahtevani podatki"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
-msgstr "Naslov IP :"
+msgstr "Naslov IP:"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
-msgstr "Vrata :"
+msgstr "Vrata:"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
-msgstr "Dodatne informacije"
+msgstr "Dodatni podatki"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
-msgstr "Uporabniško ime :"
+msgstr "Uporabniško ime:"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
-msgstr "Hash uporabnika :"
-
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Ponovno naloži deljene datoteke"
+msgstr "Koda uporabnika:"
 
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Trenutna seja"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Skupno"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Zahtevano :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Aktivni prenosi gor :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Dodaj"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
-msgstr "Hitrost prenosa dol"
+msgstr "Hitrost prejemanja"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Trenutno"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Trenutno povprečje"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Povprečje seje"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
-msgstr "Hitrost prenosa gor"
+msgstr "Hitrost pošiljanja"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Povezave"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
-msgstr "Aktivni prenosi dol"
+msgstr "Aktivna prejemanja"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Aktivne povezave (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
-msgstr "Aktivni prenosi gor"
+msgstr "Aktivna pošiljanja"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Statistično drevo"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
-msgstr "Hash uporabnika:"
+msgstr "Koda uporabnika:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Program odjemalca:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Različica odjemalca:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "Naslov IP:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID uporabnika:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP strežnika:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Ime strežnika:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
-msgstr ""
+msgstr "Maskiranje:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
-msgstr "Prenosi k/od uporabnika"
+msgstr "Prenosi do uporabnika"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Trenutna zahteva:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
-msgstr "Povprečni prenos gor:"
+msgstr "Povprečna hitrost pošiljanja:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
-msgstr "Povprečni prenos dol:"
+msgstr "Povprečna hitrost prejemanja:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
-msgstr "Preneseno gor (seja):"
+msgstr "Poslano (seja):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
-msgstr "Preneseno dol (seja):"
+msgstr "Prejeto (seja):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
-msgstr "Preneseno gor (skupno):"
+msgstr "Poslano (skupno):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
-msgstr "Preneseno dol (skupno):"
+msgstr "Prejeto (skupno):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Točke"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
-msgstr "Gor/Dol količnik:"
+msgstr "Količnik dol/gor:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Varna identifikacija:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Ocena (skupna):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Položaj v vrsti:"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
-msgstr "Točke čakalne vrste:"
+msgstr "Točke v vrsti:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Vzdevek"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - mula za Linux"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org – Mule za vse platforme"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "To je ime, ki ga vidijo ostali uporabniki, ko se povežejo z vami."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Jezik"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Jezik: "
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
-msgstr "To določa jezik programa."
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Zakasnitev preden se pojavi namig z navodili."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Razne možnosti"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
+msgstr "To določa jezik vmesnika programa."
 
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Ob zagonu preveri za novo različico"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Ob vklopu te možnosti, bo aMule ob vsakem zagonu preveril za novo različico "
 "programa."
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Zaženi pomanjšano"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Vklop te možnosti pomanjša aMule ob zagonu."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
-msgstr "Opozori ob izhodu."
+msgstr "Opozori ob končanju"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "aMule prikaže opozorilo ob izhodu."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "Preden se aMule konča vas o tem opozori."
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
-msgstr "Prikaži ikono v sistemski vrstici."
+msgstr "Ikona v sistemski vrstici"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
-msgstr "Vklopi/Izklopi ikono v sistemski vrstici."
+msgstr "Vklopi/izklopi ikono v sistemski vrstici."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Pomanjšaj v sistemsko vrstico"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5088,697 +3340,638 @@
 "Ob vklopu te možnosti se bo aMule pomanjšal v sistemsko vrstico, namesto v "
 "opravilno vrstico."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Zakasnitev v sek. pri prikazu namigov"
-
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Zakasnitev preden se pojavi namig z navodili."
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Zakasnitev namigov: "
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "sekund"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Izbira brskalnika"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Sistemsko privzeto"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Tu izberite svoj brskalnik"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Ročna nastavitev:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Tu navedite ime vašega brskalnika. Da ga boste lahko uporabili, izberite "
-"'Ročno' v zgornjem meniju."
+"Sem vnesite ime brskalnika. Za uporabo privzetega sistemskega brskalnika "
+"pustite prazno."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Brskanje"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Odpri v novem zavihku, če je mogoče"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Če je mogoče, odpre stran v novem zavihku namesto v novem oknu."
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Video predvajalnik"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr ""
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
+msgstr "Omejitve povezave"
 
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
-msgstr "Omejitve pasovne širine"
-
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
-msgstr "Prenos gor"
+msgstr "Pošiljanje"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
-msgstr "Hitrost prenosa za eno mesto"
+msgstr "Hitrost za eno mesto"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Vrata TCP standardnega odjemalca:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Vrata"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Standardna vrata TCP "
+
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
-msgstr ""
+msgstr "To so standardna vrata za eD2k in jih ni moč onemogočiti."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Vrata UDP razširjenega odjemalca:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "Vrata UDP za zahtevke strežnika (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr ""
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Dodatna vrata UDP (globalno/Kad iskanje) "
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "onemogoči"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr "Ta vrata UDP se uporabljajo za dodatne zahtevke eD2k in omrežje Kad."
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Naslov za vezavo"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Vrata UDP za razširjene zahteve strežnika (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Maks. število virov na datoteko"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Omogoči posredovanje vrat na usmerjevalniku"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr ""
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "Vrata TCP za UPnP (neobvezno):"
+
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Krajevni naslov poveži z IP-jem (prazno za poljuben):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
 msgstr ""
+"Samo za napredne uporabnike: če imate več omrežnih vmesnikov, vnesite naslov "
+"vmesnika, s katerim bo povezan aMule."
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Največ povezav"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Največ virov na prejemanje:"
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Največ istočasnih povezav:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Univerzalen 'Plug and Play'"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Omogoči UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Vrata UPnP TCP:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "eD2k"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
-msgstr "Samodejno poveži ob zagonu"
+msgstr "Samodejno se poveži ob zagonu"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
-msgstr "Ponovno poveži ob prekinjeni povezavi"
-
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Prikaži presežek prenosa"
+msgstr "Ponovno se poveži ob prekinjeni povezavi"
 
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Strežniške možnosti"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
-msgstr "Zbriši nedosegljiv strežnik po"
+msgstr "Izbriši nedosegljiv strežnik po"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "poskusih"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
-msgstr ""
+msgstr "Ob zagonu samodejno posodobi seznam strežnikov"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Seznam"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
-msgstr ""
+msgstr "Ob povezavi s strežnikom posodobi seznam strežnikov"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
-msgstr ""
+msgstr "Ob povezavi odjemalca posodobi seznam strežnikov"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
-msgstr "Uporabi sistem prioritete"
+msgstr "Uporabi sistem prednosti"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
-msgstr "Uporabi preverjanje za Nizek ID ob povezavi"
+msgstr "Uporabi preverjanje za nizek ID ob povezavi"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Varno povezovanje"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
-msgstr "Samodejna povezava samo s strežniki na statičnem seznamu."
+msgstr "Samodejna povezava samo s strežniki na statičnem seznamu"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
-msgstr "Nastavi ročno dodane strežnike na visoko prioriteto"
+msgstr "Nastavi ročno dodane strežnike na visoko prednost"
+
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Inteligentno rokovanje s poškodbami (I.R.P.)"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.R.N. aktiven"
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Omogoči"
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH zaupa vsakemu hashu (ni priporočeno)"
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Napredni I.R.P. zaupa vsaki kodi (ni priporočeno)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
-msgstr "Na novo dodani prenosi naj bodo na premoru"
+msgstr "Na novo dodani prenosi naj bodo prekinjeni"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
-msgstr "Na novo dodani prenosi naj imajo avtoprioriteto"
+msgstr "Na novo dodani prenosi naj imajo samodejno prednost"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Najprej poskusi prenesti prvi in zadnji del"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Nove deljene datoteke naj imajo avtoprioriteto"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Poskušaj pošiljati cele dele vsem odjemalcem"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Ob končanem prenosu začni prenašati naslednjo datoteko na premoru"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Po zaključku datoteke začni naslednjo prekinjeno"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Iz iste kategorije"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Shrani 10 virov pri redkih datotekah (< 20 virov)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "Po abecednem vrstnem redu"
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr ""
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Novim datotekam vnaprej dodeli prostor na disku"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
 msgstr ""
+"Za nove datoteke v naprej dodeli prostor na disku v velikosti celotne "
+"datoteke, kar zmanjša razdrobljenost."
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr ""
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Ustavi prejemanja, ko prostor na disku doseže "
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr ""
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "Izberite, če želite, da aMule preverja prostor na disku"
 
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
-msgstr "Tu vnesite min. želen prostor na disku."
+msgstr "Sem vnesite min. želen prostor na disku."
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr ""
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Shrani 10 virov pri redkih datotekah (< 20 virov)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Pošiljanja"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr ""
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Nove deljene datoteke naj imajo samodejno prednost"
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr ""
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Ciljna mapa za prejeto"
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr ""
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Mapa za začasne datoteke prejemanj"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Deljene mape"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
-msgstr "(Desni klik na ikono mape izbere tudi podmape)"
+msgstr "(desni klik na ikono mape izbere tudi podmape)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Deli skrite datoteke"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Grafi"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
-msgstr "Zamik posodabljanja : 5 sek."
+msgstr "Zamik posodabljanja: 5 sek."
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
-msgstr "Čas za graf trenutnega povprečja : 100 min."
+msgstr "Čas za graf povprečja: 100 min."
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Merilo za graf povezav: 100 "
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Izberi barve za statistiko"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Merilo za graf prejemanj:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Merilo za graf pošiljanj:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Barve: "
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Ozadje"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Mreža"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
-msgstr "Trenuten prenos dol"
+msgstr "Trenutno prejemanje"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
-msgstr "Povprečje za prenos dol"
+msgstr "Povprečje prejemanja"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
-msgstr "Povprečje seje za prenos dol"
+msgstr "Povprečje seje za prejemanje"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
-msgstr "Trenuten prenos gor"
+msgstr "Trenutno pošiljanje"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
-msgstr "Povprečje za prenos gor"
+msgstr "Povprečje pošiljanja"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
-msgstr "Povprečje seje za prenos gor"
+msgstr "Povprečje seje za pošiljanje"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Aktivne povezave"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
-msgstr "Merilnik hitrosti v sistemski vrstici"
+msgstr "Prikaz hitrosti v sistemski vrstici"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Trenutna vozlišča Kad"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Vozlišča Kad v teku"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Vozlišča Kad te seje"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Izberi"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Drevo"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Število prikazanih različic odjemalcev (0=neomejeno)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Zmožnosti povezave"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Opomba: Te vrednosti so uporabljene le za statistiko."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! OPOZORILO !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Ne spreminjajte teh nastavitev, razen če dobro\n"
-"veste kaj počnete. V nasprotnem primeru lahko\n"
-"hitro zadeve poslabšate.\n"
-"\n"
-"aMule bo deloval dobro tudi brez\n"
-"spreminjanja teh nastavitev."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Napredne nastavitve"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Maks. novih povezav / 5 sek."
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
-msgstr "Velikost datotečnega predpomnilnika: 240000 bajtov"
+msgstr "Datotečni medpomnilnik: 240000 bajtov"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
-msgstr "Velikost vrste prenosov gor: 5000 odjemalcev"
+msgstr "Velikost vrste za pošiljanje: 5000 odjemalcev"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
-msgstr "Interval med osvežitvama povezave na strežnik: onemogoči"
+msgstr "Čas med osvežitvama povezave na strežnik: onemogoči"
+
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Onemogoči prehod računalnika v pripravljenost"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Uporabljena preobleka: "
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Prikaži hitri rokovalnik s povezavami eD2k v vsakem oknu."
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Napredek prenosov dol"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
+msgstr "Prikaži razširjene podatke na zavihkih kategorij"
 
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Prikaži odstotke"
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Prikaži hitrosti prenosa v naslovu"
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Prikaži vrstico napredka "
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Prikaži hitrosti prenosa v naslovu"
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Slog vrstice napredka"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Pred imenom programa"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Za imenom programa"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Prikaži presežek prenosov"
 
-#: src/muuli_wdr.cpp:2351
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Usmeri orodjarno navpično"
+
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "Prikaži zastave držav za odjemalce"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Datoteke v vrsti prejemanj"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Prikaži odstotek napredka"
+
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Prikaži črto napredka"
+
+#: src/muuli_wdr.cpp:2144
 msgid "Flat"
 msgstr "Plosko"
 
-#: src/muuli_wdr.cpp:2354
+#: src/muuli_wdr.cpp:2150
 msgid "Round"
 msgstr "Zaokroženo"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Podpora preoblekam"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Omogoči preobleke "
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Preobleka:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr " - nič preoblek na voljo -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Razvrščanje stolpcev"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Samodejno razvrščaj datoteke"
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Samodejno razvrsti dat. v vrsti prenosov (visoka poraba CPU)"
-
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp:2157
 msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule bo samodejno razvrstil datoteke na vašem seznamu ponosov."
-
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Razne prilagoditve vmesnika"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
 msgstr ""
+"aMule bo samodejno razvrstil datoteke na vašem seznamu pprejemanj, kar "
+"potrebuje precej procesorske moči."
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
-msgstr "Prikaži razširjene informacije na zavihkih kategorij"
-
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "Prikaži hitrosti prenosa v naslovu"
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "Parametri za zunanje povezave"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Usmeri orodjarno navpično"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "Sprejmi zunanje povezave"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Pred imenom datoteke prikaži ime .part datoteke"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP vmesnika, ki posluša:"
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
+#: src/muuli_wdr.cpp:2190
+msgid ""
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
 msgstr ""
+"Sem vnesite veljaven IP v formatu a.b.c.d za poslušalen vmesnik. Prazno "
+"polje ali 0.0.0.0 pomeni poljuben vmesnik."
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Zaženi amuleweb ob zagonu"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "Vrata TCP:"
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Vrata spletnega strežnika"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr ""
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
+msgstr "Vklopi posredovanje vrat UPnP za vrata zunanjih povezav"
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr ""
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Geslo"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Čas med osvežitvami strani (v sek.)"
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Parametri spletnega strežnika"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Omogoči gzip kompresijo"
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Spletni strežnik zaženi ob zagonu"
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Omogoči uporabnika z nizkimi pravicami"
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Spletna predloga"
 
-#: src/muuli_wdr.cpp:2484
+#: src/muuli_wdr.cpp:2237
 msgid "Full rights password"
 msgstr "Geslo za vse pravice"
 
-#: src/muuli_wdr.cpp:2490
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Omogoči uporabnika z nizkimi pravicami"
+
+#: src/muuli_wdr.cpp:2249
 msgid "Low rights password"
 msgstr "Geslo za nizke pravice"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Spletna predloga"
-
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "Parametri za zunanje povezave"
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Vklopi posredovanje vrat UPnP za vrata spletnega strežnika"
 
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "Sprejmi zunanje povezave"
-
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"IP poslušalnega vmesnika\n"
-"(prazno za vse)"
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Vrata TCP za UPnP za spletni strežnik (neobvezno)"
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
-msgstr ""
-"Tu vnesite veljaven IP v formatu a.b.c.d za poslušalen vmesnik EC. Prazno "
-"polje ali 0.0.0.0 pomeni katerikoli vmesnik."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Čas med osvežitvami strani (v sek.)"
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Vrata TCP"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Omogoči stiskanje gzip"
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
-msgstr "Vklopi preusmerjanje vrat UPnP za vrata zunanjih povezav"
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "V redu"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Kliknite tukaj za uveljavitev sprememb v nastavitvah."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Razveljavi vse spremembe v nastavitvah."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
-msgstr "Naslov :"
+msgstr "Naslov:"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
-msgstr "Komentar :"
+msgstr "Komentar:"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
-msgstr "Imenik prihajajočih dat. :"
-
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
+msgstr "Mapa za prejeto:"
 
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
-msgstr "Spremeni prioriteto novo dodeljenim datotekam :"
+msgstr "Spremeni prednost novo dodeljenim datotekam:"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "Ne spremeni"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
-msgstr "Izberi barvo za to kategorijo (trenutno izbrano) :"
-
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Pokaži 'motd' strežnika ob povezavi ..."
+msgstr "Izberite barvo za to kategorijo (trenutno izbrano):"
 
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Info. strežnika"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Ponastavi"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
-msgstr "Kliknite tukaj, da počistite dnevnik."
+msgstr "Kliknite ta gumb, da ponastavite dnevnik."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule dnevnik"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
-msgstr "Kliknite tukaj za posodobitev seznama strežnikov iz URL-ja ..."
+msgstr "Kliknite ta gumb za posodobitev seznama strežnikov iz URL-ja."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Seznam strežnikov"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
 msgstr ""
-"Vnesite URL do server.met datoteke in pritisnite gumb na levi, da posodobite "
+"Vnesite URL do datoteke server.met in kliknite gumb na levi, da posodobite "
 "seznam strežnikov."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
-msgstr ""
+msgstr "Ročno dodaj strežnik: ime"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
-msgstr "Tukaj vnesite ime strežnika"
+msgstr "Sem vnesite ime novega strežnika"
+
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Vrata"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
-msgstr "Tukaj vnesite IP strežnika v x.x.x.x formatu."
+msgstr "Sem vnesite IP strežnika v formatu x.x.x.x."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
-msgstr "Tukaj vnesite vrata strežnika."
+msgstr "Sem vnesite vrata strežnika."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Ročno dodaj strežnik (najprej izpolnite vsa polja) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule dnevnik"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Podatki o strežniku"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
-msgstr "Info. o ED2K"
+msgstr "Podatki o eD2k"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
-msgstr "Info. o Kad"
+msgstr "Podatki o Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
-msgstr "Kliknite tukaj za posodobitev seznama vozlišč iz URL-ja ..."
+msgstr "Kliknite ta gumb za posodobitev seznama vozlišč iz URL-ja."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Vozlišča (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5786,51 +3979,57 @@
 "Vnesite URL do datoteke nodes.dat in pritisnite gumb na levi za posodobitev "
 "seznama vozlišč."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Statistika vozlišč"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Začetno nalaganje"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Novo vozlišče"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Vrata:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
 msgstr ""
 "Naloži od znanih \n"
 "odjemalcev"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
-msgstr "Prekini Kad"
+msgstr "Prekini povezavo s Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2k info"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Uporabi varno identifikacijo uporabnikov"
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Priporočamo, da omogočite to možnost. Če to ni omogočeno, ne boste prejeli "
+"točk za zasluge."
+
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Maskiranje protokola"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Omogoči maskiranje protokola"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5838,11 +4037,11 @@
 "Ob vklopu te možnosti, bo aMule sprejemal maskirane povezave od drugih "
 "odjemalcev."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
-msgstr "Uporabi maskiranje za odhajajoče povezave"
+msgstr "Uporabi maskiranje za izhodne povezave"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5850,11 +4049,11 @@
 "Ob vklopu te možnosti, bo aMule uporabil maskiranje pri povezavi z drugimi "
 "odjemalci in s strežniki."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Dovoli samo maskirane povezave"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5862,85 +4061,81 @@
 "Ob vklopu te možnosti, bo aMule sprejemal samo maskirane povezave. Imeli "
 "boste manj virov, vendar bodo vse povezave maskirane."
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Nastavitve datotek"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Vsi"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Nihče"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Kdo lahko vidi deljene datoteke:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Kdo lahko vidi moje deljene datoteke:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
-msgstr "Izberite, kdo lahko vidi vaš seznam deljenih datotek."
+msgstr "Izberite, kdo lahko zahteva vaš seznam deljenih datotek."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Filtriranje IP-jev"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtriraj odjemalce"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Omogoči filtriranje odjemalčevih IP-jev, določenih v datoteki ~/.aMule/"
 "ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtriraj strežnike"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Omogoči filtriranje strežnikovih IP-jev, določenih v datoteki ~/.aMule/"
 "ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
-msgstr "Ponovno naloži seznam"
+msgstr "Znova naloži seznam"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "Ponovno naloži seznam IP-jev za filtriranje iz ~/.aMule/ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Posodobi zdaj"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
-msgstr "Samodejno posodobi IP Filter ob zagonu"
+msgstr "Samodejno posodobi filter IP-jev ob zagonu"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Stopnja filtriranja:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
-msgstr "Vedno filtriraj LAN IP-je"
+msgstr "Vedno filtriraj IP-je krajevnega omrežja"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Paranoično rokovanje z ne-ujemajočimi IP-ji"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -5948,1238 +4143,3710 @@
 "Zavrne paket, če se odjemalčev IP razlikuje od IP-ja kjer paket izvira. "
 "Bodite pazljivi pri uporabi te možnosti."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
-msgstr ""
+msgstr "Uporabi sistemsko ipfilter.dat, če je na voljo"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
 msgstr ""
+"Če krajevne datoteke ipfilter.dat ni moč najti, omogoči uporabo sistemske "
+"datoteke."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr ""
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Priporočeno je, da omogočite to možnost. Če SUI ni omogočen, ne boste "
-"dobivali kreditov."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
-msgstr "Omogoči Spletni podpis"
+msgstr "Omogoči spletni podpis"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
 msgstr ""
-"Omogoči pisanje v datoteko SP, katero lahko uporabljajo zunanji programi za "
-"izdelavo podpisov in podobnih stvari."
+"Omogoči pisanje v datoteko spletnega podpisa, katero lahko uporabljajo "
+"zunanji programi za izdelavo podpisov in podobnih stvari."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
-msgstr "Frekvenca posodobitve (sek.):"
+msgstr "Pogostost posodobitev (sek.):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
-msgstr "Spremeni frekvenco (v sekundah) posodobitev Spletnega podpisa."
+msgstr "Spremeni pogostost (v sekundah) posodobitev spletnega podpisa."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Imenik za Spletni podpis:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Spletni podpis shrani v datoteko: "
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
-"Kliknite tukaj, da nastavite imenik, ki vsebuje datoteke za Spletni podpis."
+"Kliknite tukaj, da nastavite mapo, ki vsebuje datoteke za spletni podpis."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Onemogoči/Omogoči"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtriraj prihajajoča sporočila (razen v trenutnem pogovoru):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Možnosti filtriranja: "
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtriraj vsa sporočila"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtriraj sporočila vseh, ki niso na seznamu prijateljev"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtriraj sporočila neznanih uporabnikov"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
-msgstr "Filtriraj sporočila, ki vsebujejo (uporabi ',' kot ločilnik):"
+msgstr "Filtriraj sporočila, ki vsebujejo (uporabi »,« kot ločilnik):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
-"Tu dodajte besede ki jih naj aMule filtrira, vključno s sporočili v katerih "
-"se nahajajo."
+"Sem dodajte besede, ki naj jih aMule filtrira, vključno s sporočili v "
+"katerih se nahajajo."
+
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Prejeta sporočila prikaži v dnevniku"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Komentarji"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
-msgstr ""
+msgstr "Filtriraj komentarje, ki vsebujejo (uporabi »,« kot ločilnik):"
 
-#: src/muuli_wdr.cpp:3339
-msgid "Enable Proxy"
-msgstr "Omogoči proksi"
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Samodejna povezava s strežnikom brez posrednika"
 
-#: src/muuli_wdr.cpp:3340
-msgid "Enable/disable proxy support"
-msgstr "Omogoči/Onemogoči podporo za proksi"
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Omogoči overjanje"
 
-#: src/muuli_wdr.cpp:3345
-msgid "Proxy type:"
-msgstr "Tip proksija:"
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Omogoči/onemogoči overjanje z uporabniškim imenom/geslom"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Uporabniško ime: "
 
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Uporabniško ime za povezavo s posrednikom"
 
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Geslo:"
 
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Geslo za povezavo s posrednikom"
 
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Tip proksija na katerega se hočete povezati"
+#: src/muuli_wdr.cpp:3050
+msgid "Enable Proxy"
+msgstr "Omogoči posrednika"
 
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3051
+msgid "Enable/disable proxy support"
+msgstr "Omogoči/onemogoči podporo za posrednika"
+
+#: src/muuli_wdr.cpp:3056
+msgid "Proxy type:"
+msgstr "Vrsta posrednika:"
+
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
-msgstr "Proksi gostitelj:"
+msgstr "Gostitelj posrednika:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
-msgstr "Ime gostitelja proksi strežnika"
+msgstr "Ime gostitelja posredniškega strežnika"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
-msgstr "Proksi vrata:"
+msgstr "Vrata posrednika:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
-msgstr "Vrata proksi strežnika"
+msgstr "Vrata posredniškega strežnika"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Overjanje"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Omogoči overjanje"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Omogoči/Onemogoči overjanje uporabniškega imena/gesla"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Uporabniško ime za povezavo s proksijem"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Geslo:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Geslo za povezavo s proksijem"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Samodejna povezava s strežnikom brez proksija"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Poveži se z:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
-msgstr "Poveži se z oddaljenim aMule"
+msgstr "Prijavi se pri oddaljenem aMule"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Uporabniško ime"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Zapomni si te nastavitve"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
-msgstr "Omogoči zgovorno beleženje odpravljanja napak."
+msgstr "Omogoči zgovorno beleženje za razhroščevanje."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Kategorije sporočil:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Čakanje ..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Dodaj uvoze"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Ponovno poskusi izbrane"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Odstrani izbrane"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "Vrste dogodkov"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr "Statistika in odjemalci v vrsti za izbrane datoteke: seja / ves čas"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Aktivna pošiljanja"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "Odstotek vseh datotek"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Vse datoteke"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Izbrane datoteke"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Samo aktivna pošiljanja"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Prikaži odjemalce za"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Znova naloži"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Ponovno naloži deljene datoteke"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Pošlji"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Pošlje navedeno sporočilo."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Zapri to pogovorno sejo."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
-msgstr "Poveži se s katerimkoli strežnikom in/ali s Kad"
+msgstr "Poveži se s poljubnim strežnikom in/ali s Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Okno z omrežji"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Deljene datoteke"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Okno iskalnika"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Onemogočeno [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Okno s prenosi datotek"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "bajtov"
+msgstr[1] "bajt"
+msgstr[2] "bajta"
+msgstr[3] "bajti"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Okno z deljenimi datotekami"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Okno s sporočili"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Okno s statističnimi grafi"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Okno z nastavitvami"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Nova kategorija"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Izberite mapo za prihajajoče datoteke"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Navesti morate ime za kategorijo!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "bajtov/sek."
+msgstr[1] "bajt/sek."
+msgstr[2] "bajta/sek."
+msgstr[3] "bajti/sek."
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Navesti morate pot za kategorijo!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MiB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"Ni bilo mogoče ustvariti imenika prihajajočih datotek za kategorijo. "
-"Prosimo, navedite veljavno pot!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "sek."
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "min."
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "ur"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "dni"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "vse"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "vse ostalo"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Nezaključeno"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Ustavljeno"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Video"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Arhiv"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Besedilo"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Aktivno"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Neznana končnica '%s' za ukaz '%s'.\n"
+msgid "Using config dir: %s"
+msgstr "Uporaba mape z nastavitvami: %s"
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Čakanje na zamrtje niti za pretvarjanje delnih datotek ..."
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Neznan ukaz '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Uvažanje %s: %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Ta ukaz nima argumentov.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Branje začasne mape"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Pridobivanje osnovnih podatkov iz datoteke o prejemanjuh"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Ustvarjanje ciljne datoteke"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Nalaganje podatkov iz stare datoteke prejemanja (%u od %u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
-"\n"
-"Ta ukaz mora imeti argument.\n"
+"Shranjevanje podatkovnega bloka v novo enojno datoteko prejemanja (%u od %u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Prenašanje podatkov o izvorni datoteki prejemanja"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Dodajanje prejemanja in shranjevanje nove delne datoteke"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Uvozi delne datoteke"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Stanje"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Koda datoteke"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (disk: %s)"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Ta ukaz je nepopoln, uporabiti morate enega od spodaj navedenih dodatnih "
-"ukazov.\n"
+"Prosimo, izberite mapo za iskanje začasnih prejemanj (vključene bodo tudi "
+"podmape)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
-"\n"
-"Razpoložljivi ukazi:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "Ali želite izbrisati izvorne datoteke uspešno uvoženih prejemanj?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Ukazi, ki so na voljo:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Ali želite odstraniti vire?"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "NAPAKA: delne datoteke ni bilo mogoče ustvariti"
+
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Vsi ukazi niso občutljivi na velike in male začetnice.\n"
-"Napišite '%s <ukaz>' za podrobne informacije o <ukaz>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Poskus nalaganja varnostne kopije datoteke met iz %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Izhod iz programa."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "NAPAKA: odpiranje datoteke part.met ni uspelo: %s → %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Prikaži pomoč."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "NAPAKA: datoteka part.met je velika 0: %s → %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "NAPAKA: neveljavna različica datoteke part.met: %s → %s"
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Za pomoč pri ukazu napišite 'help <ukaz>'.\n"
-"Za celoten seznam ukazov napišite 'help'.\n"
+"Napaka: %s (%s) je pokvarjena (slabe oznake: %s), ni mogoče naložiti "
+"datoteke."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Uporabite '%s' za seznam ukazov\n"
-"\n"
+"NAPAKA: %s (%s) je pokvarjena (napačno število oznak), ni mogoče naložiti "
+"datoteke."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Napaka v sintaksi!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Poskus reševanja podatkov o datoteki ..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "Reševanje neimenovane datoteke – rešena bo kot RecoveredFile.dat"
+
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
-"Napaka pri obdelavi ukaza - se ne bi smelo zgoditi! Prosimo, poročajte o "
-"hrošču.\n"
+"Rešeni vsi podatki o datoteki, ki so na voljo :D – Poskus njihove uporabe ..."
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Ta ukaz ne sme imeti parametrov."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Ni mogoče rešiti podatkov o datoteki :("
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Ta ukaz mora imeti parameter."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Ni bilo mogoče odpreti %s (%s)"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Neveljaven argument."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "OPOZORILO: %s je morda pokvarjena (%i)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Ukaz ni popoln."
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "NAPAKA med shranjevanjem delne datoteke: %s (%s → %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "Vhodno/izhodna napaka med shranjevanjem delne datoteke: "
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:917
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Napišite '%s' za dodatno pomoč.\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Ni bilo moč pridobiti dolžine »%s« – uporaba datoteke %s."
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "To je %s %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "Velikost »%s« je 0 – uporabljena bo datoteka %s."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:994
 #, c-format
-msgid "This is %s %s\n"
-msgstr "To je %s %s\n"
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Ni bilo mogoče shraniti datoteke part.met.seeds za %s"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Shranjenih %i izvornih semen za delno datoteko: %s (%s)"
+msgstr[1] "Shranjeno %i izvorno seme za delno datoteko: %s (%s)"
+msgstr[2] "Shranjeni %i izvorni semeni za delno datoteko: %s (%s)"
+msgstr[3] "Shranjena %i izvorna semena za delno datoteko: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Delna datoteka %s (%s) nima datoteke s semeni"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Delna datoteka %s (%s) ima prazno datoteko s semeni"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Napaka pri branju datoteke s semeni delne datoteke (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Najden pokvarjen del (%d) v %d delnih datotekah %s – FileResultHash |%s| "
+"FileHash |%s|"
+msgstr[1] ""
+"Najden pokvarjen del (%d) v %d delni datoteki %s - - FileResultHash |%s| "
+"FileHash |%s|"
+msgstr[2] ""
+"Najden pokvarjen del (%d) v %d delnih datotekah %s - - FileResultHash |%s| "
+"FileHash |%s|"
+msgstr[3] ""
+"Najden pokvarjen del (%d) v %d delnih datotekah %s - - FileResultHash |%s| "
+"FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Najden zaključen del (%i) v %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Zaključeno ponovno ustvarjanje kode za %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Nepričakovana napaka med zaključevanjem %s. Datoteka prekinjena."
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Zaključen prenos: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Brisanje datoteke: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Ustvarjanje odjemalca...\n"
+"OPOZORILO: ni moč ustvariti kode za prejet del – nabor kod za »%s« ni popoln"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"V redu, zapuščanje %s...\n"
+"NAPAKA: ni moč ustvariti kode za prejet del – nabor kod ni popoln (%s). To "
+"se nikoli ne bi smelo zgoditi."
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Ne morete se povezati s praznim geslom.\n"
-"Vnesti morate geslo v nastavitveni datoteki,\n"
-"ukazni vrstici ali pa ko boste vprašani za geslo.\n"
-"\n"
-"Zapuščanje...\n"
+"Konec datoteke med ustvarjanjem kode prejetega dela %u z dolžino %u (maks. %"
+"u) delne datoteke »%s« z dolžino %u: %s"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Prikaži to besedilo pomoči."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "OPOZORILO: na disku ni dovolj prostora. Datoteka prekinjena: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Gostitelj kjer teče aMule. (privzeto: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Prejet del %i v datoteki je pokvarjen: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Vrata aMule za zunanje povezave. (privzeto: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "IRP: rešen pokvarjen del %i za %s → Rešenih bajtov: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Geslo za zunanje povezave."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Dodeljevanje"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Preberi nastavitve iz datoteke."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Premalo prostora na disku"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Ne napiši izhodnih podatkov v stdout."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Prejeto"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Zgovorno - prikaži tudi razhroščevalna sporočila."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "NAPAKA: delne datoteke »%s« ni bilo moč odpreti"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Nastavi področne nastavitve (jezik) programa."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Sistemsko privzet"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Zapiši možnosti ukazne vrstice v nastavitveno datoteko."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Albansko"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr ""
-"Ustvari nastavitveno datoteko, ki temelji na nastavitveni datoteki aMule."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabsko"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Izpiši različico programa."
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturijsko"
 
-#: src/ClientCreditsList.cpp:168
-#, fuzzy, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Datoteka s krediti naložena, %u znanih odjemalcev"
-msgstr[1] "Datoteka s krediti naložena, %u znanih odjemalcev"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Baskovsko"
 
-#: src/ClientCreditsList.cpp:171
-#, fuzzy, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Krediti potekli za %u odjemalcev!"
-msgstr[1] " - Krediti potekli za %u odjemalcev!"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bolgarsko"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Datoteka 'cryptkey.dat' ne obstaja. Ustvarjanje."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Katalonsko"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"NAPAKA: Ne morete uporabljati demona aMule, ko so zunanje povezave "
-"onemogočene. Za vklop zunanjih povezav uporabite ali navaden aMule ali "
-"zaženite amuled z možnostjo --ec-config ali pa nastavite vrednost ključa"
-"\"AcceptExternalConnections\"  na 1 v datoteki ~/.aMule/amule.conf"
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Kitajsko (poenostavljeno)"
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "NAPAKA: %s"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Kitajsko (tradicionalno)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Dovoli nazaj"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Prikaži prenose gor"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Prikaži čakalno vrsto"
-
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Prikaži odjemalce"
-
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Izberi pogled"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Program odjemalca"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Čakal"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Čas prenosa gor"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Preneseno gor/dol"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Oddaljeno stanje"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Prioriteta datoteke"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Hrvaško"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Točke"
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Češko"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Zahteval"
-
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Nazadnje viden"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Vstopil v vrsto"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Dansko"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Stanje prenosa gor"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Nizozemsko"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Prenesel gor"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Angleško (Z.K.)"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Stanje prenosa dol"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estonsko"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finsko"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Prenesel dol"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Francosko"
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Hash uporabnika"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galicijsko"
 
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Maskiranje"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Nemško"
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Skrite deljene datoteke"
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Grško"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Podrobnosti o odjemalcu"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Hebrejsko"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Omogočeno"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Madžarsko"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Podprto"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italijansko"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Ni podprto"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italijansko (Švica)"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Onemogočeno"
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japonsko"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Korejsko"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Nedokončano"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Litvansko"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Baraba"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norveško (Nynorsk)"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Preverjeno - V redu"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Poljsko"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugalsko"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugalsko (brazilsko)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Rusko"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Slovensko"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Špansko"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Švedsko"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turško"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ukrajinsko"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Spremeni jezik"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
+
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
 msgstr "Ni na voljo"
 
-#: src/ClientDetailDialog.cpp:215
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "na voljo ni nobene možnosti"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Najdena neveljavna kategorija, preskočena"
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr "Vrata TCP ne smejo biti večja od 65532, ker so vrata UDP TCP+3"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+msgid "Default port will be used (%d)"
+msgstr "Uporabljena bodo privzeta vrata (%d)"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr ""
-"Min. velikost mora biti manjša kot maks. velikost. Maks. velikost ni "
-"upoštevana."
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Opuščanje neobstoječe deljene mape: %s"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Opozorilo iskanja"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Povezava"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Neomejeno"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Mape"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule meni sistemske vrstice"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Strežniki"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Omejitve hitrosti: "
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Datoteke"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "Gor: brez"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Varnost"
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "Gor: %u"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Vmesnik"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "Dol: brez"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Posrednik"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Filtri"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Oddaljeno upravljanje"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Spletni podpis"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Napredno"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Dogodki"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Razhroščevanje"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+"Nadomeščene bodo naslednje spremenljivke:\n"
+"    %PARTFILE – polna pot do datoteke\n"
+"    %PARTNAME – samo ime datoteke"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Ne spreminjajte teh nastavitev, razen če dobro\n"
+"veste, kaj počnete. V nasprotnem primeru lahko\n"
+"hitro zadeve poslabšate.\n"
+"\n"
+"aMule bo deloval dobro tudi brez\n"
+"spreminjanja teh nastavitev."
+
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "DL: %u"
-msgstr "Dol: %u"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Nastavitve ni bilo moč povezati z gradnikom z ID-jem %d in ključem %s"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "Download speed: %.1f"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
+"Podatkov iz nastavitev ni bilo moč prenesti v gradnik z ID-jem %d in ključem "
+"%s."
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Vrsta posrednika s katerim se hočete povezati"
+
+#: src/PrefsUnifiedDlg.cpp:534
 #, c-format
-msgid "Upload speed: %.1f"
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
+"Podatkov iz gradnika ni bilo moč prenesti v nastavitve z ID-jem %d in "
+"ključem %s."
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Informacije o odjemalcu"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"Potreben je ponoven zagon aMule za uveljavitev teh sprememb:\n"
+"\n"
 
-#: src/MuleTrayIcon.cpp:380
-#, c-format
-msgid "Nickname: %s"
-msgstr "Vzdevek: %s"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "• Vrata TCP so spremenjena.\n"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Vzdevek ni izbran!"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "• Vrata UDP so spremenjena.\n"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "Odjemalčev ID: "
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "• Vrata za zunanje povezave so spremenjena.\n"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Ime strežnika: "
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "• Sprejemljivost zunanjih povezav je spremenjena.\n"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP strežnika: "
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "• Vmesnik za zunanje povezave je spremenjen.\n"
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"Seznam za samodejno posodobitev strežnikov je prazen.\n"
+"Možnost »Ob zagonu samodejno posodobi seznam strežnikov« bo onemogočena."
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
 msgstr ""
+"Omogočili ste zunanje povezave, vendar niste navedli gesla.\n"
+"Zunanje povezave ne morejo biti omogočene, dokler ne navedete veljavnega "
+"gesla."
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "• Jezik je spremenjen.\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "• Mapa za začasne datoteke spremenjena.\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "• Omrežje eD2k je omogočeno.\n"
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
 msgstr ""
+"Omrežji eD2k in Kad sta onemogočeni.\n"
+"Ne boste se mogli povezati, dokler ne omogočite vsaj enega izmed njih."
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
 msgstr ""
+"Kad se ne bo zagnal, če so vrata UDP onemogočena.\n"
+"Omogočite vrata UDP ali pa onemogočite Kad."
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
+"\n"
+"aMule morate NUJNO ponovno zagnati.\n"
+"Če tega ne storite zdaj, se ne pritožujte, če se zgodi kaj slabega.\n"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Spletni podpis: Omogočen"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Seznam za samodejno posodabljanje strežnikov je prazen.\n"
+"Vnesite vsaj en URL do veljavne datoteke server.met.\n"
+"Kliknite na gumb »Seznam«, zraven potrditvenega polja, za vnos URL-ja."
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Spletni podpis: Onemogočen"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Začasne datoteke"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Prejete datoteke"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Spletni podpisi"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "Shared files: %d"
-msgstr "Deljenih datotek: %d"
+msgid "Choose a folder for %s"
+msgstr "Izberite mapo za %s"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Prebrskajte za video predvajalnik"
+
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Izberite brskalnik"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "Queued clients: %d"
+msgid "Executable%s"
+msgstr "Izvedljiva datoteka %s"
+
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Uredi seznam strežnikov"
+
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
 msgstr ""
+"Sem dodajte URL-je do datotek server.met.\n"
+"Po en URL v vsako vrstico."
 
-#: src/MuleTrayIcon.cpp:476
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
 #, c-format
-msgid "Total DL: %s"
-msgstr "Skupno dol: %s"
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Osveži vsakih: %d sekund"
+msgstr[1] "Osveži vsakih: %d sekundo"
+msgstr[2] "Osveži vsakih: %d sekundi"
+msgstr[3] "Osveži vsakih: %d sekunde"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "Total UL: %s"
-msgstr "Skupno gor: %s"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Čas za graf povprečja: %d minut"
+msgstr[1] "Čas za graf trenutnega povprečja: %i minuta"
+msgstr[2] "Čas za graf trenutnega povprečja: %i minuti"
+msgstr[3] "Čas za graf trenutnega povprečja: %i minute"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Omejitev prenosa gor"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Merilo za graf povezav: %d"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Omejitev prenosa dol"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Datotečni medpomnilnik: %d bajtov"
+msgstr[1] "Datotečni medpomnilnik: %d bajt"
+msgstr[2] "Datotečni medpomnilnik: %d bajta"
+msgstr[3] "Datotečni medpomnilnik: %d bajti"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Skrij aMule"
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Velikost vrste za pošiljanje: %d odjemalcev"
+msgstr[1] "Velikost vrste za pošiljanje: %d odjemalec"
+msgstr[2] "Velikost vrste za pošiljanje: %d odjemalca"
+msgstr[3] "Velikost vrste za pošiljanje: %d odjemalci"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Prikaži aMule"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Čas med osvežitvama povezave na strežnik: %d minut"
+msgstr[1] "Čas med osvežitvama povezave na strežnik: %d minuta"
+msgstr[2] "Čas med osvežitvama povezave na strežnik: %d minuti"
+msgstr[3] "Čas med osvežitvama povezave na strežnik: %d minute"
 
-#: src/ChatSelector.cpp:127
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Čas med osvežitvama povezave na strežnik: onemogočeno"
+
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "onemogočeno"
+
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Pogovorna seja se je začela: %s (%s:%u) - %s %s"
+msgid "Execute command on '%s' event"
+msgstr "Izvrši ukaz ob dogodku »%s«"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Povezan z odjemalcem ***"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Omogoči izvrševanje ukazov na jedru"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Povezovanje z odjemalcem ***"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Ukaz jedra:"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Povezava z odjemalcem ni uspela / povezava izgubljena ***"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Omogoči izvrševanje ukazov v vmesniku"
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Zapri zavihek"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Ukaz vmesnika:"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Zapri vse zavihke"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Sledeče spremenljivke bodo nadomeščene:"
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Zapri ostale zavihke"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+"Min. velikost mora biti manjša kot maks. velikost. Maks. velikost ni "
+"upoštevana."
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Opozorilo iskanja"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Glavna"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Iskanje preko Kad ni mogoče, če Kad ne teče"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "Iskanje preko eD2k ni mogoče, če eD2k ni povezan"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Nepričakovana napaka med iskanjem Kad: "
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "ID datoteke"
 
-#: src/ServerList.cpp:84
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Datoteka"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Prejemaj v kategoriji"
+
+#: src/SearchListCtrl.cpp:639
+#, c-format
+msgid "Get %s for this file"
+msgstr "Dobi %s za to datoteko"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Poišči sorodne datoteke (eD2k, krajevni strežnik)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Označi kot znano datoteko"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Skopiraj povezavo eD2k na odložišče"
+
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "Preklicano"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Novo"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Ni bilo mogoče vzpostaviti maskirane povezave s strežniki na seznamu. "
+"Ponoven poskus brez maskiranja."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"Ni se bilo mogoče povezati na katerega koli izmed strežnikov na seznamu. "
+"Ponoven poskus."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "Omrežje eD2k je onemogočeno v nastavitvah, brez povezovanja."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "Na seznamu ni bilo moč najti nobenega veljavnega strežnika za povezavo"
+
+#: src/ServerConnect.cpp:198
+#, c-format
+msgid "Connected to %s (%s:%i)"
+msgstr "Povezan z %s (%s:%i)"
+
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Povezava vzpostavljena z: %s"
+
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Kritična napaka med povezovanjem. Internetna povezava je mogoče prekinjena"
+
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Izgubljena povezava z %s (%s:%i)"
+
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) je nedosegljiv."
+
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) je poln."
+
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] ""
+"Samodejen poskus povezovanja s strežnikom se bo izvedel čez %d sekund"
+msgstr[1] ""
+"Samodejen poskus povezovanja s strežnikom se bo izvedel čez %d sekundo"
+msgstr[2] ""
+"Samodejen poskus povezovanja s strežnikom se bo izvedel čez %d sekundi"
+msgstr[3] ""
+"Samodejen poskus povezovanja s strežnikom se bo izvedel čez %d sekunde"
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Povezava izgubljena"
+
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Povezovanje z %s (%s:%i) ni uspelo."
+
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "NAPAKA: po poteku časa je bila vtičnica neveljavna"
+
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Čas za poskus povezovanja z %s (%s:%i) je potekel."
+
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Prejel zapoznjen rezultat poizvedbe DNS, preziram"
+
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Nalaganje datoteko server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
-msgstr "Ni bilo mogoče najti datoteke server.met!"
+msgstr "Ni bilo mogoče najti datoteke server.met."
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
-msgstr "Ni bilo mogoče naložiti datoteke server.met '%s', neznan format."
+msgstr "Ni bilo mogoče naložiti datoteke server.met »%s«, neznan format."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
-msgstr "Ni bilo mogoče odpreti server.met!"
+msgstr "Ni bilo mogoče odpreti server.met."
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
-"Datoteke server.met je pokvarjena, napačen zaznamek različice "
-"('versiontag'): 0x%x, velikost %i"
+"Datoteka server.met je pokvarjena, napačna oznaka različice: 0x%x, velikost %"
+"i"
 
-#: src/ServerList.cpp:169
-#, fuzzy, c-format
+#: src/ServerList.cpp:173
+#, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "%i najdenih strežnikov v server.met"
-msgstr[1] "%i najdenih strežnikov v server.met"
+msgstr[1] "%i najden strežnik v server.met"
+msgstr[2] "%i najdena strežnika v server.met"
+msgstr[3] "%i najdeni strežniki v server.met"
 
-#: src/ServerList.cpp:171
-#, fuzzy, c-format
+#: src/ServerList.cpp:175
+#, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d strežnikov dodanih"
-msgstr[1] "%d strežnikov dodanih"
+msgstr[1] "%d strežnik dodan"
+msgstr[2] "%d strežnika dodana"
+msgstr[3] "%d strežniki dodani"
+
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Napaka: datoteka »server.met« je pokvarjena: "
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "Vhodno/izhodna napaka med branjem »server.met«: "
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Strežnik ni bil dodan: [%s:%d] nima navedenih veljavnih vrat."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Strežnik ni bil dodan: [%s:%d] IP je filtriran ali neveljaven."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Strežnik ni bil dodan: Strežnik z IP:vrata [%s:%d] že obstaja na seznamu."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
-msgstr "Strežnik dodan: Strežnik na [%s:%d], z imenom '%s'."
+msgstr "Strežnik dodan: Strežnik na [%s:%d], z imenom »%s«."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr ""
-"Povezani ste s strežnikom, ki ga hočete izbrisati. Prosim, najprej prekinite "
-"povezavo."
+"Povezani ste s strežnikom, ki ga poskušate izbrisati. Prosimo, najprej "
+"prekinite povezavo."
+
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Ni bilo mogoče odpreti »%s«"
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
-msgstr "Ni bilo mogoče shraniti server.met!"
+msgstr "Ni bilo mogoče shraniti server.met."
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Neveljaven URL"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
-msgstr ""
-
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Ni bilo mogoče prenesti seznama strežnikov iz %s"
+msgid "Finished downloading the server list from %s"
+msgstr "Prejemanje seznama strežnikov od %s zaključeno"
 
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
 msgstr ""
+"V »addresses.dat« ni bil najden noben vnos za seznam strežnikov. Za samodejno "
+"posodobitev seznama strežnikov morate v to datoteko vnesti veljaven naslov "
+"seznama strežnikov."
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
-msgstr ""
+msgstr "Začni s prejemanjem seznama strežnikov od %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
+"OPOZORILO: za samodejno posodabljanje strežnikov je bil naveden neveljaven "
+"URL: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 "V addresses.dat ni veljavnega server.met URL-ja za samodejno posodabljanje."
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Ni bilo mogoče prenesti seznama strežnikov od %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr ""
-"IP Filter je filtriral krajevni strežnik. Povezovanje z drugim strežnikom!"
+"IP Filter je filtriral krajevni strežnik. Povezovanje z drugim strežnikom."
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Ni bilo mogoče izvesti ukaza '%s' za dogodek '%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Ime strežnika"
 
-#: src/amule.cpp:703
-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/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Naslov"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Vrata"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Opis"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Odziv"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Uporabniki"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Statičen"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Različica"
 
-#: src/amule.cpp:786
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Na seznamu strežnikov nimate nobenega strežnika.\n"
-"Ali želite, da aMule zdaj prenese nov seznam?"
+"Povezani ste s strežnikom, ki ga poskušate izbrisati. Prosimo, najprej "
+"prekinite povezavo. Strežnik NI bil izbrisan."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Prenos seznama strežnikov"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(neznano ime)"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "web server running on pid %d"
-msgstr ""
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Ali res želite izbrisati statičen strežnik %s?"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Strežniki (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Strežnik"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Poveži se s strežnikom"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Označi strežnik kot statičen"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Označi strežnik kot ne-statičen"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Označi strežnike kot statične"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Označi strežnike kot ne-statične"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Odstrani strežnik"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Odstrani strežnike"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Odstrani vse strežnike"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Skopiraj povezave eD2k na odložišče"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Ponovno se poveži s strežnikom"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Ali res želite izbrisati vse strežnike?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Ali res želite izbrisati izbrani strežnik?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Ali res želite izbrisati izbrane strežnike?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "NAPAKA: %s (%s) – %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "OPOZORILO: %s (%s) – %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Nov odjemalčev ID je %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "OPOZORILO: prejeli ste nizek ID."
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tPo vsej verjetnosti ste za požarnim zidom ali usmerjevalnikom."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tZa več informacij se obrnite na http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Prejeti neznani podatki o strežniku – prekratko"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Prejetih %d novih strežnikov"
+msgstr[1] "Prejet %d nov strežnik"
+msgstr[2] "Prejeta %d nova strežnika"
+msgstr[3] "Prejeti %d novi strežniki"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Shranjevanje seznama strežnikov zaključeno."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Strežnik je zavrnil zadnji ukaz"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Nepravi paket prejet od strežnika: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Neobravnavana napaka med obdelavo paketa od strežnika: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Ni mogoče ustvariti niti za razrešitev DNS pri povezavi z %s"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "Strežnikov IP %s (%s) je filtriran.  Ni povezave."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "z maskiranim protokolom."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Povezovanje z %s (%s – %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Ni mogoče razrešiti DNS za strežnik: %s: Povezava ni mogoča."
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Strežnik ni bil dodan: IP ali ime gostitelja nista navedena."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Strežnik ni bil dodan: navedena so neveljavna vrata strežnika."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Stanje eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Stanje Kademlia:"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "Teče v načinu krajevnega omrežja"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Teče"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Stanje:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Stanje povezave:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
+"Za požarnim zidom – v požarnem zidu ali na usmerjevalniku odprite vrata TCP %"
+"d"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "Stanje povezave UDP:"
 
-#: src/amule.cpp:937
+#: src/ServerWnd.cpp:219
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
+msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
+"Za požarnim zidom – v požarnem zidu ali na usmerjevalniku odprite vrata UDP %"
+"d"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Stanje za požarnim zidom: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Potreben ni noben kolega – vrata TCP odprta"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Potreben ni noben kolega – vrata UDP odprta"
 
-#: src/amule.cpp:964
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Brez kolegov"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Povezovanje s kolegom"
+
+#: src/ServerWnd.cpp:240
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Vrata %u niso dosegljiva. Imeli boste Nizek ID\n"
+msgid "Connected to buddy at %s"
+msgstr "Povezan s kolegom na %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Indeksirani viri:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Indeksirane ključne besede:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Indeksirane opombe:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Indeksirana obremenitev:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Povprečno uporabnikov:"
 
-#: src/amule.cpp:970
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Povprečno datotek:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Ne teče"
+
+#: src/SharedFileList.cpp:332
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Adding file %s to shares"
+msgstr "Dodajanje datoteke %s med deljene"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Najdenih %i znanih deljenih datotek"
+msgstr[1] "Najdena %i znana deljena datoteka"
+msgstr[2] "Najdeni %i znani deljeni datoteki"
+msgstr[3] "Najdene %i znane deljene datoteke"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Najdenih %i znanih deljenih datotek, %i neznanih"
+msgstr[1] "Najdena %i znana deljena datoteka, %i neznanih"
+msgstr[2] "Najdeni %i znani deljeni datoteki, %i neznanih"
+msgstr[3] "Najdene %i znane deljene datoteke, %i neznanih"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "NAPAKA: poskus delitve %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Deljene mape ni bilo moč najti, preskakujem: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "V mapi ni bilo moč najti datotek za deliti: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Uporabniško ime"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "Hitrost prejemanja"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Hitrost pošiljanja"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Razpoložljivi deli"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Stanje pošiljanja"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Stanje prejemanja"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Izvor"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Krajevno ime datoteke"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Deljene datoteke"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Zahteve"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Sprejete zahteve"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Prenesenih podatkov"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Delilno razmerje"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Dobljeni deli"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Popolni viri"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Pot mape"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Dodaj komentar/oceno"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Uredi komentar/oceno"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Preimenuj"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Dodaj datoteke iz zbirke na seznam prenosov"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Skopiraj magnet &URI na odložišče"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Skopiraj povezavo eD2k na odložišče (&vir)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Skopiraj povezavo eD2k na odložišče (vir) (&s šifrirnimi možnostmi)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Skopiraj povezavo eD2k na odložišče (&gostitelj)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
-"Vrata %u niso dosegljiva!\n"
-"\n"
-"To pomeni, da boste imeli Nizek ID.\n"
-"\n"
-"Preverite omrežje in se prepričajte, da so vhodna in izhodna vrata odprta."
+"Skopiraj povezavo eD2k na odložišče (gostitelj) (s &šifrirnimi možnostmi)"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Ni bilo mogoče ustvariti datoteke Spletnega podpisa"
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Skopiraj povezavo eD2k na odložišče (&podatki NIRP)"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Ni bilo mogoče ustvariti aMule datoteke Spletnega podpisa"
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Potrebujete visok ID, da ustvarite povezavo z virom"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Deljene datoteke (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[Delna datoteka]"
+
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Oddaljeno ime datoteke"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Poslani podatki (seja (skupno)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Skupni presežek (paketov): %s"
 
-#: src/amule.cpp:1299
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Presežek zahtev datotek (paketov): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Presežek izmenjav virov (paketov): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Presežek strežnikov (paketov): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Presežek Kad (paketov): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Presežek šifriranja (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Aktivna pošiljanja: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Čakajoča pošiljanja: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Skupno št. uspelih sej pošiljanj: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Skupno št. neuspelih sej pošiljanj: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Povprečen čas pošiljanja: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Prejeti podatki (seja (skupno)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Najdeni viri: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Aktivna prejemanja (deli): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Razmerje poslano/prejeto te seje (skupno): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Povprečna hitrost prejemanja (seja): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Povprečna hitrost pošiljanja (seja): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Največja hitrost prejemanja (seja): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Največja hitrost pošiljanja (seja): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Ponovne povezave: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Čas od prvega prenosa: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "S strežnikom povezan od: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Aktivnih povezav (ocena): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Dosežnih največ možnih povezav: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Povprečno povezav (ocena): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Največ povezav (ocena): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Odjemalci"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Neznani: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Filtrirani: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Izločeni: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Skupno: %i Znani: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Delujoči strežniki: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Nedelujoči strežniki: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Skupno: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Izbrisani strežniki: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Filtrirani strežniki: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Uporabniki na delujočih strežnikih: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Datoteke na delujočih strežnikih: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Skupno uporabnikov: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Skupno datotek: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Zasedenost strežnikov: %.2f% %"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Število deljenih datotek: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Skupna velikost deljenih datotek: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Povprečna velikost datoteke: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Operacijski sistem"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Ni prejeto"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktivne povezave (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Ni na voljo"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Nikoli"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Ukaz »%s« s PID-jem »%d« se je končal s statusno kodo »%d«."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Izvrši <str> in končaj."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Neveljaven format IP. Uporabite xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Zgleda, da izbrana področna nastavitev ni nameščena na vašem računalniku. "
-"(Opomba: Vseeno bo nastavljena)"
+"Ta ukaz potrebuje argument. Veljavni argumenti: »all«, ime datoteke ali "
+"število.\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Obdelovanje po kodi: "
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Obdelovanje po imenu datoteke: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr "Ta ukaz potrebuje argument. Veljaven argument: koda datoteke.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Ni veljavno število\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Ni veljavna koda (dolžina mora biti točno 32 znakov)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Zahteva spodletela z neznano napako."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Operacija je bila uspešna."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "To je vaš prvi zagon aMule %s"
+msgid "Request failed with the following error: %s"
+msgstr "Zahteva ni uspela zaradi napake: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "To je testna različica, posodobljena dnevno in\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Filtriranje IP za odjemalce je %s.\n"
 
-#: src/amule.cpp:1311
-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/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "IZKLOPLJENO"
 
-#: src/amule.cpp:1312
-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/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "VKLOPLJENO"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Filtriranje IP za strežnike je %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Trenutna stopnja IP filtriranja je %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Omejitve povezave: Gor: %u kB/s, Dol: %u kB/s.\n"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Povezan z %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Povezovanje"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "za požarnim zidom"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "v redu"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+"\n"
+"Download:\t%s"
 msgstr ""
-"Naslednje nastavitve so bile spremenjene v tej različici iz varnostnih "
-"razlogov:\n"
+"\n"
+"Prejemanje:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Vklop maskiranja protokola za prihajajoče in odhajajoče povezave.\n"
+"Pošiljanje:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Izklop posodobitev seznama strežnikov ob povezavi s strežnikom in z "
-"odjemalcem.\n"
+"Odjemalci v vrsti:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Za več informacij o razlogih za te spremembe, preiščite wiki\n"
-"na http://wiki.amule.org za informacije o \"lažnih strežnikih\".\n"
-"Za pravilno delovanje aMule je zelo pomembno, da odstranite vse lažne "
-"strežnike iz seznama strežnikov."
+"Skupno virov:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Število rezultatov iskanja: %i\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Napredek iskanja: %u %% \n"
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Napredek iskanja ni na voljo"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Prejet neznan odgovor od strežnika, OpCode = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Prikaži kratke podatke o stanju."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Prikaži stanje povezave, trenutne hitrosti prenosa gor/dol, itd.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Prikaži celotno statistično drevo."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Neobvezno: kot argument tega ukaza lahko podate število v obsegu 0-255, ki "
+"določa,\n"
+"koliko različic odjemalca naj bo prikazanih v poddrevesu tipa odjemalcev.\n"
+"Vrednost 0 ali izpuščen argument pomeni »neomejeno«.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Primer: »statistics 5« bo prikazalo 5 najpogostejših različic vsakega tipa "
+"odjemalca.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Zaustavi aMule"
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
+"Zaustavi oddaljeno tekoče jedro (amule/amuled).\n"
+"To bo zaustavilo tudi besedilnega odjemalca, ker brez tekočega jedra ni "
+"uporaben.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Ponovno naloži naveden objekt."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Ponovno naloži seznam deljenih datotek."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "Ponovno naloži seznam za filtriranje IP-jev."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "Ponovno naloži trenutni seznam za filtriranje current IP-jev."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "Posodobi seznam za filtriranje IP-jev iz URL-ja."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "Če je URL izpuščen, se uporabi URL iz nastavitev."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Poveži se z omrežjem."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
-"Več informacij, podporo in nove različice, lahko najdete na naši domači "
-"strani,\n"
+"Ta možnost bo vzpostavila povezavo z vsemi omrežji, omogočenimi v "
+"nastavitvah.\n"
+"Neobvezno: Lahko navedete naslov strežnika v obliki IP:Vrata,\n"
+"za povezavo samo s tem strežnikom. IP mora biti s pikami ločen\n"
+"decimalen naslov IPv4 ali razrešljivo ime DNS."
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Poveži se samo z eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Poveži se samo s Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Prekini povezavo z omrežjem."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "To bo prekinilo povezavo z vsemi omrežji, s katerimi ste povezani.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Prekini samo povezavo z eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Prekini samo povezavo s Kad."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Dodaj povezavo magnet ali povezavo ed2k v jedro."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
+"\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
-"na www.aMule.org, ali na kanalu IRC #aMule, na strežniku irc.freenode.net.\n"
+"Povezava eD2k za dodajanje je lahko:\n"
+"• povezava za datoteko (ed2k://|file|...), dodana bo na v vrsto prejemanj\n"
+"• povezava za strežnik (ed2k://|server|...), dodan bo na seznam strežnikov\n"
+"• povezava do seznama strežnikov, vsi strežniki bodo dodani na seznam "
+"strežnikov\n"
+"\n"
+"Povezava magnet mora vsebovati kodo eD2k in dolžino datoteke.\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Morebitne hrošče lahko sporočite na http://forum.amule.org"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Nastavi vrednost nastavitve."
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "Nastavi filtriranje IP-jev."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Vključi filtriranje IP-jev za odjemalce in strežnike."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Izključi filtriranje IP-jev za odjemalce in strežnike."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Omogoči/onemogoči filtriranje IP-jev za odjemalce."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Vključi filtriranje IP-jev za odjemalce."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Izključi filtriranje IP-jev za odjemalce."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Omogoči/onemogoči filtriranje IP-jev za strežnike."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Vključi filtriranje IP-jev za strežnike."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Izključi filtriranje IP-jev za strežnike."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Izberite stopnjo filtriranja IP-jev."
+
+#: src/TextClient.cpp:893
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
+msgstr "Veljavne stopnje filtriranja so od 0-255, privzeta stopnja je 127.\n"
+
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Nastavi omejitve povezave."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "Vrednost podana tem ukazom mora biti v kilobajtih/sek.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Nastavi omejitev pošiljanja."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Nastavi omejitev prejemanja."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Dobi in prikaži vrednost nastavitve."
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "Dobi nastavitve filtriranja IP-jev."
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Dobi stanje filtriranja IP-jev za odjemalce in strežnike."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Dobi stanje filtriranja IP-jev samo za odjemalce."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Dobi stanje filtriranja IP-jev samo za strežnike."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "Dobi stopnjo filtriranja IP-jev."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Dobi omejitve prenosa."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Izvrši iskanje."
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"Mapa za Spletni podpis, ki ste jo navedli, je NEVELJAVNA!\n"
-"Spletni podpis bo ONEMOGOČEN, dokler težave ne odpravite v nastavitvah."
+"Vrsta iskanja mora biti navedena s sledečimi tipi:\n"
+"    GLOBAL (globalno)\n"
+"    LOCAL (krajevno)\n"
+"    KAD (kad)\n"
+"Primer: »search kad datoteka« bo izvršilo Kad iskanje za »datoteka«.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Izvrši globalno iskanje."
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Izvrši krajevno iskanje."
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Izvrši iskanje kad."
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Prikaže rezultate zadnjega iskanja."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Vrne rezultate prejšnjega iskanja.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Prikaže napredek iskanja."
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Prikaže napredek iskanja.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Začni prejemati datoteko"
+
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
+"Navesti morate številko datoteke iz zadnjega iskanja.\n"
+"Primer: ukaz »download 12« bo dodal na seznam prejemanj datoteko št. 12 iz "
+"zadnjega iskanja.\n"
+
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Prekini prejemanje."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Nadaljuj prejemanje."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Prekliči prejemanje."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Nastavi prednost prejemanja."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr ""
+"Nastavi prednost prejemanja na nizko, normalno, visoko ali samodejno.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Nastavi prioriteto na nizko."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Nastavi prioriteto na normalno."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Nastavi prioriteto na visoko."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Nastavi prioriteto na samodejno."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Prikaži čakalne vrste/sezname."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Prikaži čakalno vrsto prenosov, seznam strežnikov ali deljenih datotek.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Prikaži čakalno vrsto pošiljanj."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Prikaži čakalno vrsto prejemanj."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Prikaži dnevnik."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Prikaži seznam strežnikov."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Ponastavi dnevnik."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Opuščen ukaz, namesto njega uporabite »%s«."
+
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
 msgstr ""
+"Ta ukaz je opuščen in bo morda v prihodnosti odstranjen.\n"
+"Namesto njega uporabite »%s«.\n"
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "NAPAKA: Ni mogoče odpreti dnevniške datoteke"
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMule besedilni odjemalec"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "OPOZORILO: Dnevniška datoteka je prazna. Nekaj je narobe."
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Pretvarjanje starih kod NIRP v »%s« v 64b v »%s«."
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Dnevnik počiščen."
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "OPOZORILO: ime datoteke »%s« ni veljavno in je bilo spremenjeno v »%s«."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:454
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Sporočilo strežnika: %s"
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"OPOZORILO: datoteka »%s« že obstaja, nova datoteka je preimenovana v »%s«."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Ni bilo mogoče prenesti seznama vozlišč."
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Ali res želite preklicati prejemanja in izbrisati vse datoteke iz te "
+"kategorije?"
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Ni bilo mogoče odpreti datoteke za preverjanje različice"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Potrebna je potrditev"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Datoteka za preverjanje različice je pokvarjena"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "Podprtih je največ 99 kategorij."
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "Preveč kategorij."
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Uporabljate zastarelo različico aMule!"
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Vse drugo"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Izberite filter prikaza"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Dodaj kategorijo"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Uredi kategorijo"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Odstrani kategorijo"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
 msgstr ""
-"Različica vaše aMule je %i.%i.%i, najnovejša različica pa je %li.%li.%li"
+"Ni bilo mogoče odpreti datoteke (%s), odstranjevanje s seznama deljenih "
+"datotek."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Najnovejšo različico lahko vedno najdete na http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Zahtevan je bil nabor kod za neznano datoteko: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "OPOZORILO: Vaša različica aMule je zastarela: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Nadaljevanje ppošiljanja za datoteko: %s"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Uporabljate najnovejšo različico."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Ustavljanje pošiljanja za datoteko: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Ni bilo mogoče prenesti datoteke za preverjanje različice"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Ni bilo mogoče izvesti ukaza »%s« za dogodek »%s«."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Prejemanje zaključeno"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Polna pot datoteke."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Ime datoteke brez poti."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "Koda eD2k datoteke."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Velikost datoteke v bajtih."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Skupni čas aktivnega prejemanja."
 
-#: src/amule.cpp:2025
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Začeta je bila nova seja klepeta."
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Pošiljatelj sporočila."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Zmanjkalo je prostora"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Razdelek diska."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Napaka pri zaključevanju"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr ""
+msgid "Processing file number %u: %s"
+msgstr "Obdelovanje datoteke številka %u: %s"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Zahtevali ste kode delov (na voljo samo za datoteke > 9,5 MiB)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s → Datoteka ne obstaja.\n"
+
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, ustvarjalnik povezav eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Dobrodošli!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Vhodni parametri"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Ustvari kodo za datoteko"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Dodaj URL-je za to datoteko (neobvezno)"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Sem vnesite datoteko, za katero želite ustvariti povezavo eD2k."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
+"Sem vnesite URL, ki ga želite dodati povezavi eD2k. Na konec dodajte »/«, da "
+"aLinkCreator doda trenutno ime datoteke."
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Odstrani"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Ustvari povezavo s kodami delov"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Pomaga pri hitrejšem razširjanju novih in redkih datotek, za ceno večje "
+"dolžine povezave"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Koda MD4 datoteke"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "Koda datoteke eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "Povezava eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Shrani"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Skopiraj na odložišče"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Odpri"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Odpre datoteko za ustvaritev povezave eD2k zanjo"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Skopira ustvarjeno povezavo eD2k na odložišče"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Shrani kot"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Shrani ustvarjeno povezavo eD2k v datoteko"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "O aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Izberite datoteko za ustvaritev povezave eD2k zanjo"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Odložišča ni moč odpreti"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Zaenkrat ni ničesar za skopirati."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Izberite datoteko za ustvaritev povezave eD2k"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Ni mogoče odpreti "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Prosimo, vnesite neprazno ime datoteke"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Zaenkrat ni ničesar za shraniti."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
+"aLinkCreator, ustvarjalnik povezav eD2k\n"
+"\n"
+"© 2004 ThePolish  <thepolish@vipmail.ru>\n"
+"\n"
+"Ikone od http://www.everaldo.com in http://www.icomania.com\n"
+"in http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Razširja se pod pogoji licence GPL"
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Ustvarjanje kode ..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator dela za vas"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Izračunavanje kode MD4 ..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Izračunavanje kode eD2k ..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Preklicano."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Povezan z %s %s"
+msgid "Done in %.2f s"
+msgstr "Zaključeno v %.2f s"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Ta URL ste že dodali."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Prosimo, vnesite neprazen URL"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "Povezovanje z %s"
+msgid "Unable to open %s"
+msgstr "Ni mogoče odpreti %s"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr ""
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i dni %i ur %i min. %i sek."
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad zagnan."
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02umin %02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad ustavljen."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Povezan s Kad (V redu)"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Povezan s Kad (za požarnim zidom)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Povezava s Kad prekinjena"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KiB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MiB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GiB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TiB"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, spletna statistika aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Najhitrejše prejemanje odkar teče wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Absolutno najhitrejše prejemanje med vsemi prejšnjimi sejami wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistem"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Ustavi samodejno osveževanje"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Shrani sliko spletne statistike"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Natisni sliko spletne statistike"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Nastavitve"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "O wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Zaženi samodejno osveževanje"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Samodejno osveževanje ustavljeno"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Samodejno osveževanje začeto"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Shrani statistično sliko"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Spletna statistika aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"Omrežja Kad ni mogoče uporabljati, če so vrata UDP onemogočena v "
-"nastavitvah. Kad ni zagnan."
+"Pri tiskanju se je pojavila težava.\n"
+"Morda privzeti tiskalnik ni pravilno nastavljen?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Omrežje Kad je onemogočeno v nastavitvah. Ni povezave."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Tiskanje"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
+"wxCas, aMule statistika spletnega podpisa\n"
+"\n"
+"© 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Temelji na CAS, avtorja Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Na voljo pod licenco GPL"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "aMule ne teče."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule teče."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule teče, vendar ni povezave."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule se povezuje ..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Stanje aMule je neznano."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " teče že "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " je ustavljen."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " ni povezan."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " se povezuje..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " dela nekaj nenavadnega, preverite."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " je povezan z "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "ugasnjen"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " je povezan "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " z "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Skupno prejetega: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", poslanega: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "To sejo prejetega: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Prejemanje: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Pošiljanje: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Deljenih: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " datotek, Odjemalcev v vrsti: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Čas: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " na "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Povprečna obremenitev sistema (1-5-15 min.):"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Neprekinjeno delovanje: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Mapa, ki vsebuje datoteko amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Sem vnesite mapo, ki vsebuje datoteko amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Interval med osvežitvami v sekundah"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Ustvari statistično sliko ob vsaki osvežitvi"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Sem vnesite mapo, v katero želite ustvariti statistično sliko"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Periodično prenesi statistično sliko na strežnik FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "URL FTP-ja"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Pot na FTP-ju"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Sem vnesite URL vašega strežnika FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
+"Sem vnesite mapo na strežniku FTP, v katero se naj shrani statistična slika"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Uporabnik"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Sem vnesite uporabniško ime za prijavo na vaš strežnik FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Sem vnesite geslo za prijavo na vaš strežnik FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Interval med osvežitvami prenosov na FTP v minutah"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Preveri veljavnost"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Mapa, ki vsebuje vašo datoteko s podpisom"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Mapa, v katerem je ustvarjena statistična slika"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Naloži predlogo <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Vrata HTTP spletnega strežnika"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Uporabi posredovanje vrat UPnP za vrata spletnega strežnika"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Vrata UPnP"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Uporabi stiskanje gzip"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Geslo za polni dostop do spletnega strežnika"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Geslo za goste na spletnem strežniku"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Dovoli dostop gostom"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Zavrni dostop gostom"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Naloži/shrani nastavitve spletnega strežnika od/na oddaljeni aMule"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Pot do nastavitvene datoteke. NE UPORABITE NEPOSREDNO."
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Onemogoči tolmača PHP-ja (opuščeno)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Ponovno prevedi strani PHP ob vsaki zahtevi"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Spletni strežnik aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "povezava spletnega odjemalca sprejeta\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "NAPAKA: ni moč sprejeti povezave spletnega odjemalca\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Zahteve ni bilo mogoče izvesti zaradi napake: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Indeksne datoteke ni mogoče najti: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Seja potekla – zahtevek za prijavo\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Seja v redu, prijavljen\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Seja v redu, ni prijave\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Ni odprte seje – zahtevek za prijavo\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Seja ustvarjena – zahtevek za prijavo\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Obdelovanje zahteve [izvorno]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Geslo ni nastavljeno, prijava ne bo dovoljena."
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Preverjanje gesla\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Koda gesla ni veljavna\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Geslo v redu\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Napačno geslo\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Niste navedli gesla. Prazno geslo ni dovoljeno.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Zahtevana odjava\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Obdelovanje zahteve [preusmerjeno]: "
+
+#~ msgid "Romanian"
+#~ msgstr "Romunsko"
+
+#~ msgid "Download status"
+#~ msgstr "Stanje prejemanja"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#, fuzzy
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Čas med posodobitvami: %d sek."
+#~ msgstr[1] "Čas med posodobitvami: %d sek."
+
+#~ msgid "Transferring"
+#~ msgstr "Prenašanje"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "QR: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "V vrsti"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "V PRIHODNJE - prikaz poteka iskanja"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Začetek ustvarjanja hasha MD4 in AICH za datoteko: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Začetek ustvarjanja hasha MD4 za datoteko: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Začetek ustvarjanja hasha AICH za datoteko: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "OPOZORILO: Ni bilo mogoče odstraniti izvirnika '%s' po izdelavi varnostne "
+#~ "kopije"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "OPOZORILO: Ni bilo mogoče zbrisati %s"
+
+#, fuzzy
+#~ msgid "%u (QR: %u)"
+#~ msgstr "QR: %u"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Ocena (skupna):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Poskušaj pošiljati cele dele vsem odjemalcem"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Prenašanje"
+
+#~ msgid "Transfers"
+#~ msgstr "Prenosi"
+
+#~ msgid "Unban"
+#~ msgstr "Dovoli nazaj"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Prikaži prenose gor"
+
+#~ msgid "Show Queue"
+#~ msgstr "Prikaži čakalno vrsto"
+
+#~ msgid "Select View"
+#~ msgstr "Izberi pogled"
+
+#~ msgid "Client Software"
+#~ msgstr "Program odjemalca"
+
+#~ msgid "Waited"
+#~ msgstr "Čakal"
+
+#~ msgid "Upload Time"
+#~ msgstr "Čas prenosa gor"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Preneseno gor/dol"
+
+#~ msgid "Remote Status"
+#~ msgstr "Oddaljeno stanje"
+
+#~ msgid "File Priority"
+#~ msgstr "Prioriteta datoteke"
+
+#~ msgid "Score"
+#~ msgstr "Točke"
+
+#~ msgid "Asked"
+#~ msgstr "Zahteval"
+
+#~ msgid "Last Seen"
+#~ msgstr "Nazadnje viden"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Vstopil v vrsto"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Prenesel gor"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Prenesel dol"
+
+#~ msgid "Userhash"
+#~ msgstr "Hash uporabnika"
+
+#~ msgid "Encrypted"
+#~ msgstr "Maskiranje"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Prikaže čakalno vrsto prenosov gor"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Uporabnikov v vrsti :"
+
+#~ msgid "Current Session"
+#~ msgstr "Trenutna seja"
+
+#~ msgid "Total"
+#~ msgstr "Skupno"
+
+#~ msgid "Requested :"
+#~ msgstr "Zahtevano :"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Okno s prenosi datotek"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Skupno uporabnikov: %s | Skupno datotek: %s"
+
+#, fuzzy
+#~ msgid "HTTP download thread started"
+#~ msgstr "Zagon sinhronizacijske niti."
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Prenosi dol (%i)"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr ""
+#~ "OPOZORILO: Ni bilo mogoče odstraniti izvirnika '%s' po izdelavi varnostne "
+#~ "kopije"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr ""
+#~ "CIP2Country::CIP2Country(): Ni bilo mogoče naložiti podatkov o državah iz "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Dobi stopnjo IP Filtra."
+
+#~ msgid "Makes a search."
+#~ msgstr "Začne iskanje."
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Neuspeh"
+
+#, fuzzy
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Zaženi amuleweb ob zagonu"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Zaustavi aMule."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Naslednje nastavitve so bile spremenjene v tej različici iz varnostnih "
+#~ "razlogov:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Vklop maskiranja protokola za prihajajoče in odhajajoče povezave.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Izklop posodobitev seznama strežnikov ob povezavi s strežnikom in z "
+#~ "odjemalcem.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Za več informacij o razlogih za te spremembe, preiščite wiki\n"
+#~ "na http://wiki.amule.org za informacije o \"lažnih strežnikih\".\n"
+#~ "Za pravilno delovanje aMule je zelo pomembno, da odstranite vse lažne "
+#~ "strežnike iz seznama strežnikov."
 
 #~ msgid "Fetching status..."
 #~ msgstr "Prenašanje stanja..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Uporabnikov: E: %s K: %s | Datoteke E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Odjemalec %s na IP:Vratih %s:%d uporablja %s %s %s"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() returned NULL"
 
+#~ msgid "Firewalled"
+#~ msgstr "Za požarnim zidom"
+
+#, fuzzy
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "Naloženih %d slik zastav."
+#~ msgstr[1] "Naloženih %d slik zastav."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr ""
+#~ "Datoteka %s je prevelika za Donkey: največja dovoljena velikost je 4 GB."
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Ni upravitelja za to vrsto datoteke."
+
+#~ msgid "File was not saved"
+#~ msgstr "Datoteka ni bila shranjena"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr ""
+#~ "Povezava ni uspela. Ni se bilo mogoče povezati z navedenim gostiteljem\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "Filter za sporočila"
 
@@ -7189,15 +7856,124 @@
 #~ msgid "Core Tweaks"
 #~ msgstr "Prilagoditve jedra"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Ni upravitelja za to vrsto datoteke."
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Zakasnitev v sek. pri prikazu namigov"
 
-#~ msgid "File was not saved"
-#~ msgstr "Datoteka ni bila shranjena"
+#~ msgid "Show part file number before file name"
+#~ msgstr "Pred imenom datoteke prikaži ime .part datoteke"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgid "Skin Support"
+#~ msgstr "Podpora preoblekam"
+
+#~ msgid "- no skins available -"
+#~ msgstr " - nič preoblek na voljo -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Imenik za Spletni podpis:"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Možnosti filtriranja: "
+
+#~ msgid "Line Capacities"
+#~ msgstr "Zmožnosti povezave"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
 #~ msgstr ""
-#~ "Datoteka %s je prevelika za Donkey: največja dovoljena velikost je 4 GB."
+#~ "Opomba: Te vrednosti\n"
+#~ "vplivajo samo na statistiko."
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Vrata TCP standardnega odjemalca:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Vrata UDP razširjenega odjemalca:"
+
+#~ msgid "Bind Address"
+#~ msgstr "Naslov za vezavo"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "Vrata UDP za razširjene zahteve strežnika (TCP+3): 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Maks. število virov na datoteko"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Univerzalen 'Plug and Play'"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "Omogoči UPnP"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "Vrata UPnP TCP:"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Ob končanem prenosu začni prenašati naslednjo datoteko na premoru"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Izberi barve za statistiko"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Napredek prenosov dol"
+
+#~ msgid "Show percentage"
+#~ msgstr "Prikaži odstotke"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Prikaži vrstico napredka "
+
+#~ msgid "Enable skin support "
+#~ msgstr "Omogoči preobleke "
+
+#~ msgid "Skin:"
+#~ msgstr "Preobleka:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "Samodejno razvrsti dat. v vrsti prenosov (visoka poraba CPU)"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "IP poslušalnega vmesnika\n"
+#~ "(prazno za vse)"
+
+#~ msgid "TCP port"
+#~ msgstr "Vrata TCP"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Kdo lahko vidi deljene datoteke:"
+
+#~ msgid "Event types"
+#~ msgstr "Vrste dogodkov"
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "aMule prikaže opozorilo ob izhodu."
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Prikaži presežek prenosa"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.R.N. aktiven"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICH zaupa vsakemu hashu (ni priporočeno)"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Napredne nastavitve"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Slog vrstice napredka"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Razvrščanje stolpcev"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Razne prilagoditve vmesnika"
+
+#~ msgid "File Options"
+#~ msgstr "Nastavitve datotek"
 
 #~ msgid "Status text"
 #~ msgstr "Besedilo stanja"
@@ -7205,18 +7981,89 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "Prikaži okno z besedilom stanja"
 
-#~ msgid "Please wait... "
-#~ msgstr "Prosim, počakajte... "
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "Za film lahko navedete zgodbo, dolžino, jezik ...\n"
+#~ "in če je lažen, lahko opozorite ostale uporabnike aMule."
+
+#~ msgid "Misc Options"
+#~ msgstr "Razne možnosti"
+
+#~ msgid "Server Options"
+#~ msgstr "Strežniške možnosti"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Pokaži 'motd' strežnika ob povezavi ..."
+
+#~ msgid "Disable/Enable"
+#~ msgstr "Onemogoči/Omogoči"
+
+#~ msgid "Authentication"
+#~ msgstr "Overjanje"
 
 #~ msgid "General Settings"
 #~ msgstr "Splošne nastavitve"
 
+#~ msgid "Max Connections"
+#~ msgstr "Največ povezav"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "Prilagoditve vmesnika"
 
 #~ msgid "Remote Control"
 #~ msgstr "Oddaljeno upravljanje"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "Ni mogoče določiti izbranega brskalnika!"
+
+#~ msgid "User Defined"
+#~ msgstr "Uporabniško določeno"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - mula za Linux"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Tu izberite svoj brskalnik"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Ročna nastavitev:"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Tu navedite ime vašega brskalnika. Da ga boste lahko uporabili, izberite "
+#~ "'Ročno' v zgornjem meniju."
+
+#~ msgid "Please wait... "
+#~ msgstr "Prosim, počakajte... "
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "Ukaza za zagon brskalnika ni bilo mogoče določiti."
 
@@ -7229,9 +8076,6 @@
 #~ msgid "ExternalConn: Access denied"
 #~ msgstr "ExternalConn: Dostop zavrnjen"
 
-#~ msgid "ExternalConn: Bad reply from server. Connection closed."
-#~ msgstr "ExternalConn: Slab odgovor strežnika. Povezava prekinjena."
-
 #~ msgid "Copy ED2k &link to clipboard"
 #~ msgstr "Kopiraj pove&zavo ED2k v odložišče"
 
@@ -7333,9 +8177,6 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "Kopiraj povezavo ED2k v odložišče"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "Usodna napaka: ni bilo mogoče ustvariti Merilnika časa"
-
 #, fuzzy
 #~ msgid "ED2K: Connecting"
 #~ msgstr "Povezovanje"
@@ -7344,9 +8185,6 @@
 #~ msgid "ED2K: Disconnected"
 #~ msgstr "Ni povezave"
 
-#~ msgid "Warning: Unable to open skin file '%s' for read"
-#~ msgstr "Opozorilo: Ni mogoče odpreti datoteke za preobleko '%s'"
-
 #~ msgid ""
 #~ "Your Auto-update servers list is in blank.\n"
 #~ "'Auto-update serverlist at startup' will be disabled."
@@ -7444,11 +8282,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "Napaka: Neveljavna različica part.met datoteke: %s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr ""
-#~ "Napaka: %s (%s) je pokvarjen (napačen 'tagcount'), ni mogoče naložiti "
-#~ "datoteke."
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "Opozorilo: možno, da je %s pokvarjen (%i)"
 
@@ -7472,13 +8305,6 @@
 #~ msgid "Insufficient Diskspace"
 #~ msgstr "Ni dovolj prostora na disku"
 
-#~ msgid "Warning: known.met cannot be opened."
-#~ msgstr "Opozorilo: known.met ni mogoče odpreti."
-
-#~ msgid "Warning: Knownfile list corrupted, contains invalid header."
-#~ msgstr ""
-#~ "Opozorilo: Seznam znanih datotek je pokvarjen, vsebuje neveljavno glavo."
-
 #~ msgid "ERROR! Attempted to share %s"
 #~ msgstr "NAPAKA! Poskus deljenja %s"
 
@@ -7502,9 +8328,6 @@
 #~ msgid "Bandwidth Limits: Up: %u kB/s, Down: %u kB/s.\n"
 #~ msgstr "Omejitve prenosa: Gor: %u kB/s, Dol: %u kB/s.\n"
 
-#~ msgid "Shutdown aMule."
-#~ msgstr "Zaustavi aMule."
-
 #~ msgid ""
 #~ "Shutdown the remote running core (amule/amuled).\n"
 #~ "This will also shut down the text client, since it is unusable without a\n"
@@ -7520,9 +8343,6 @@
 #~ msgid "Disconnect from ED2K only."
 #~ msgstr "Prekini samo povezavo ED2K."
 
-#~ msgid "Adds an ed2k or magnet link to core."
-#~ msgstr "Dodaj povezavo magnet ali povezavo ed2k v jedro."
-
 #~ msgid ""
 #~ "The ed2k link to be added can be:\n"
 #~ "*) a file link (ed2k://|file|...), it will be added to the download "
@@ -7648,9 +8468,6 @@
 #~ msgid "Manual Server Add : Name"
 #~ msgstr "Ročno dodajanje strežnika : Ime"
 
-#~ msgid "No One"
-#~ msgstr "Nihče"
-
 #~ msgid "Speed Limits:"
 #~ msgstr "Omejitve hitrosti:"
 
@@ -7866,9 +8683,6 @@
 #~ msgid "Client request is invalid! %i / %i"
 #~ msgstr "Zahteva odjemalca ni veljavna! %i / %i"
 
-#~ msgid "Command: %s"
-#~ msgstr "Ukaz: %s"
-
 #~ msgid "Unable to open %s file - using %s file."
 #~ msgstr "Ni mogoče odpreti datoteke %s - uporabljena bo datoteka %s."
 
@@ -7885,12 +8699,6 @@
 #~ msgid "Waiting for subprocess termination failed"
 #~ msgstr "Čakanje na končanje podprocesa je spodletelo."
 
-#~ msgid ""
-#~ "You cannot connect to a release version from an arbitrary CVS version! "
-#~ "*sigh* possible crash prevented"
-#~ msgstr ""
-#~ "Ne morete se povezati z uradno različico iz poljubne CVS različice! "
-
 #~ msgid "doesn't work"
 #~ msgstr "ne dela"
 
@@ -7922,7 +8730,7 @@
 #~ " FAQ: http://wiki.amule.org \n"
 #~ "\n"
 #~ " Contact: admin@amule.org (administrative issues) \n"
-#~ " Copyright (C) 2003-2009 aMule Team \n"
+#~ " Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
 #~ " Part of aMule is based on \n"
 #~ " Kademlia: Peer-to-peer routing based on the XOR metric.\n"
@@ -8039,9 +8847,6 @@
 #~ "Ta ukaz je zastarel in bo v prihodnosti odstranjen.\n"
 #~ "Namesto njega uporabite 'Set BwLimit Down'.\n"
 
-#~ msgid "Syncronization thread started."
-#~ msgstr "Zagon sinhronizacijske niti."
-
 #~ msgid "Masterhashes of known files have been loaded."
 #~ msgstr "Glavni hashi znanih datotek so bili naloženi."
 
@@ -8072,12 +8877,6 @@
 #~ msgid ".%d"
 #~ msgstr ".%d"
 
-#~ msgid "Shows the process of a search."
-#~ msgstr "Prikaže postopek iskanja."
-
-#~ msgid "Shows the process of a search..\n"
-#~ msgstr "Prikaže postopek iskanja..\n"
-
 #~ msgid "Search warning."
 #~ msgstr "Opozorilo iskanja."
 
@@ -8100,9 +8899,6 @@
 #~ msgid "Source Dropping"
 #~ msgstr "Opuščanje virov"
 
-#~ msgid "Keep sources"
-#~ msgstr "Ohrani vire"
-
 #~ msgid "Drop sources"
 #~ msgstr "Opusti vire"

aMule-2.2.6.tar.bz2/po/sq.po -> aMule-2.3.1.tar.bz2/po/sq.po Changed

@@ -1,6 +1,5 @@
 # translation of sq.po to Shqip
 # Albanian translations for PACKAGE package.
-# Copyright (C) 2008 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 #
 #  <dj_barthezz@linuxmail.org>, 2008.
@@ -11,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: sq\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
 "PO-Revision-Date: 2008-04-20 20:41+0200\n"
 "Last-Translator: Fation  <dj_barthezz@linuxmail.org lushnja_corps@hotmail."
 "com>\n"
@@ -22,1290 +21,1131 @@
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Ju duhet te specifikoni nje fjalekalim jo bosh "
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Shto nje shoke"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Fjalekalim i gabuar, nuk eshte nje hash MD5 "
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Ju duhet te futni nje IP dhe nje porte te vlefshem!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Lidhja deshtoi"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Informacion"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr ""
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Userhash-i i specifikuar nuk eshte i vlefshem!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr ""
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Deshtoi ne hapjen %s (%s)"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
+#: src/amule.cpp:239
+#, fuzzy
+msgid "Now, exiting main app..."
 msgstr ""
+"\n"
+"Ne rregull, duke dalur %s...\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Sukses! Lidhja u vendos ne aMule "
+#: src/amule.cpp:258
+#, c-format
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Sukses! Lidhja u vendos."
+#: src/amule.cpp:261
+#, c-format
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Hashing"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "E Deshtuar"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Duke perfunduar"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "E kompletuar"
+#: src/amule.cpp:335
+#, fuzzy
+msgid "aMule shutdown completed."
+msgstr "Shkarkimi Perfundoi"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Ne pritje"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "E gabuar"
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "Konfirmimi i daljes"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Duke shkarkuar"
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "U pranua nje lidhje e jashtme e re"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Duke pritur"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "KUJDES"
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Duke filluar krijimin e MD4 dhe hash-it AICH per failin: %s"
+#: src/amule.cpp:495
+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/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Duke filluar krijimin e hash-it MD4 per failin: %s"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Informacion"
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Duke filluar krijimin e hash-it AICH per failin: %s"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Ju nuk keni asnje server ne listen e serverave tuaj.\n"
+"Deshironi qe aMule te shkarkoje nje liste te re tani?"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Duke kembyer hashsetet e vjetra AICH ne '%s' 64b ne '%s'."
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Shkarkim per listen e serverave"
 
-#: src/ThreadTasks.cpp:429
+#: src/amule.cpp:654
 #, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgid "web server running on pid %d"
 msgstr ""
-"KUJDES: Emri i failit '%s' eshte i pavlere dhe eshte riemeruar ne '%s'."
-
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "KUJDES: Faili '%s' ekziston,faili i ri i riemertuar ne '%s'."
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:658
+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 ""
-"KUJDES: Nuk mund te zhvendosesh origjinalin '%s' mbas krijimit te backup-it"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "KUJDES: Deshtoi ne fshirjen %s"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr ""
 
-#: src/BaseClient.cpp:1307
+#: src/amule.cpp:741
 #, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Deshtoi te rimarri failet e ndara nga perdoruesi '%s'"
-
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "E panjohur"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Nuk mund te lidh portat tek adresa e dhene: %s"
 
-#: src/BaseClient.cpp:1738
+#: src/amule.cpp:768
 #, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (eMule e falsifikuar versioni %#x)"
-
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr "(eMule e falsifikuar)"
-
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (eMule e falsifikuar)"
+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/BaseClient.cpp:1790
+#: src/amule.cpp:774
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (e bazuar ne eMule v0 %u)"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Porta %u nuk eshte e vlefshme!\n"
+"\n"
+"Kjo do te thote qe ju do te keni ID te ulet.\n"
+"\n"
+"KOntrolloni rrjetin tuaj per tu siguruar qe porta eshte hapur per hyrje dhe "
+"dalje."
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Emri: %s ID: %u"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Deshtoi te krijoje failin per Firmen Online"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "Kerkuar: %s\n"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Deshtoi te krijoje failin per Firmen Online te aMule-s"
 
-#: src/BaseClient.cpp:1964
-#, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statistikat e failit per kete sesion: U pranua %d nga %d kerkesa, %s te "
-"transferuara\n"
-msgstr[1] ""
-"Statistikat e failit per kete sesion: U pranuan %d nga %d kerkesat, %s te "
-"transferuara\n"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"Vendi i zgjedur duket se nuk do te instalohet ne kutine tuaj. (Shenim: Une "
+"do te mundohem ta vendos ate)"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:1040
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Statistikat e failit per te gjitha sesionet: U pranua %d nga %d kerkesa, %s "
-"te transferuar\n"
-msgstr[1] ""
-"Statistikat e faileve per te gjitha sesionet: U pranua %d nga %d kerkesat, %"
-"s te transferuara\n"
+msgid "This is the first time you run aMule %s"
+msgstr "Kjo eshte hera e pare qe ju po persorni aMule %s"
 
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Po kerkoni nje faili te panjohur"
+#: src/amule.cpp:1042
+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/BaseClient.cpp:2242
-#, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Klienti %s ne porten IP: %s:%d po perdor %s %s %s"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr ""
+"ne nuk japim siguri per te ai nuk do te thyej asgje,nuk do te djegi shtepine "
+"tuaj,\n"
 
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Emri i perdorimit"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"ose te vrasi qenin tuaj. Por ai *do te* behet i sigurte per tu perdorur.\n"
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Shkoket"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Me shume informacion,mbeshtetje dhe leshime te reja do ti gjeni tek faqet "
+"tona,\n"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Trego &Detaje"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"tek www.amule.org ose ne kanalin tone IRC #amule tek irc.freenode.net.\n"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Shto nje shoke"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Raportoni cdo gabim tek http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Fshi nje shoke"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
+msgstr ""
+"Kartela e faileve per Firmen Online qe ju specifikuat eshte e PAVLERE!\n"
+" Firma Online do te C'AKTIVIZOHET deri sa ju ta rregulloni tek Preferencat."
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Dergo &Mesazh"
+#: src/amule.cpp:1120
+#, fuzzy
+msgid "Server hostname notified"
+msgstr "Emri i Serverit:"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Shiko failet"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr ""
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Vendos slotin per shoket"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "GABIM: nuk mund te hapet logfile"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Jeni te sigurt qe deshironi te fshini shokun e zgjedhur?"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "KUJDES: faili i log-ve eshte bosh. Dicka nuk shkon."
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Jeni te sigurt qe deshironi te fshini shoket e zgjedhur?"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Faili i Log eshte risetuar"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Fshij"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Mesazhe nga Serveri: %s"
 
-#: src/FriendListCtrl.cpp:359
-msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
-"Ju nuk lejoheni qe te vendosni me shume se nje slot per shoket.\n"
-" Vetem nje slot i vetem u vendos."
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Perzgjedhje e shumte"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Deshtoi ne shkarkimin e listave nod."
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Shkarkimi Perfundoi"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Deshtoi te hapi failin per kontrollin e versionit qe sapo shkarkuat"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Path-i i plote per tek faili"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Fili per kontrollin e versionit eshte i demtuar"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Emri i failit pa perberesit e Path-it."
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Ju po perdorni nje version te vjeter te aMule!"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
+"Versioni juaj i amUle eshte %i.%i-%i dhe versioni i fundit eshte %li.%li.%li"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Madhesia e failit ne bytes."
-
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "KOha permbledhese e shkarkimeve."
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Versioni i fundit mund te gjendet gjithmone tek http://www.amule.org"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Sesion i ri chati filloi"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr ""
+"KUJDES: Versioni juaj i aMule-s eshte i vjeteruar: %i.%i-%i < %li.%li.%li"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Derguesi i mesazheve."
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Kopja juaj e aMule eshte azhornuar."
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Jashte nga hapesira"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Deshtoi ne shkarkimin e failit per kontrollin e versionit"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Particioni i diskut."
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr ""
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Gabim ne perfundim"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Emri i failit"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Madhesia"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "me ID te ulet"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tipi"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "me ID te larte"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Perparesia"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "I lidhur tek %s %s"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "FailiID"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Duke u lidhur tek %s"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Kerkesa"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Kerkesa te pranuara"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad filloi."
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Te dhena te transferuara"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad u ndalua."
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Raporti i ndarjeve"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "I lidhur ne Kad (Ne rregull)"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Pjese te marra"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "I lidhur ne Kad (Me firewall)"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Burime te kompletuara"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "I shkeputur nga Kad"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Direktoria Path"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Rrjeti Kad nuk mund te perdoret nqs porta UDP eshte c'aktivizuar tek "
+"Preferencat, nuk po filloj."
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "File te ndara"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Rrjeti Kad eshte c'aktivizuar tek Preferencat,nuk eshte duke u lidhur."
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Shume ngadale"
+#: src/amuled.cpp:560
+#, fuzzy
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"GABIM: demoni i aMule-s nuk mund te perdoret kur lidhjet e jashtme kan te "
+"c'aktivizuara. Per te aktivizuar Lidhjet e Jashtme mund te perdorni dhe nje "
+"aMule normale, filloje aMule me kete opsion --ec-config ose vendosni celesin"
+"\"AcceptExternalConnections\" tek 1 ne failin ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Ngadale"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normale"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "E larte"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Shume e larte"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Leshim"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "GABIM: %s"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Automatike"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Kjo eshte aMule %s dhe bazohet ne eMule."
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Shti Komento/Klasifiko"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Duke punuar ne %s"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Redakto Koment/Klasifiko"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr ""
+"Vizitoni http://www.amule.org per te kontrolluar nqs eshte ne dispozicion "
+"nje version i ri."
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Riemerto"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Shto failet ne koleksionin e listes per transferim"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Kontrolli remote i aMule "
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Kopjo magnetin &URI ne shenime "
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Snapshot:"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr ""
-
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Kopjo feedback ne shenimet"
-
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:506
 msgid ""
-"Feedback from: %s (%s)\n"
+"Copyright (c) 2003-2011 aMule Team \n"
 "\n"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
 msgstr ""
-"Ju keni nevoje per nje ID te larte per te krijuar nje sourcelink te vlefshem"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "KUJDES"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Faile te ndara (%i)"
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[File ne shkarkim]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Futni nje emer te ti per kete fail:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Riemertim i failit"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Rimarrja e ngarkimeve te failit: %s"
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Duke pezulluar ngarkimin e failit: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "Teksti i klientit aMule"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: fjala qe u kerkua eshte shume e shkurter"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Peer-to-peer routing i bazuar ne metriken XOR.\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Po lexoj %u kontakt Kad"
-msgstr[1] "Po lexoj %u kontakte Kad"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-msgstr[1] ""
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "U shkruajt %d kontakt Kadi"
-msgstr[1] "U shkruajten %d kontakte Kadi"
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Mesazh"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr ""
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Duke u lòidhur"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Kerkesa deshtoi me kete gabim: %s."
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr ""
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Kerkesa deshtoi me nje gabim te panjohur. "
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Me Firewall"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Indeksi i failit nuk u gjet:  "
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: I lidhur"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Sesioni mbaroi - kerkohet hyrja\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Po lidhet"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Sesioni ne rregull, u futet ne\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Fikur"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Sesioni ne rregul,nuk u futet ne\n"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Fshij"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Nuk ka sesion te hapur - kerkese per hyrje\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Ndalo tentativat e lidhjes qe po behen"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Sesioni u krijua - kerkohet hyrja\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Shkeputu"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Perpunim i kerkeses [origjinale]: "
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Shkeputu nga rrjetet e lidhura"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Duke kerkuar fjalekalimin\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Lidhu"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Hash-i i fjalekalimit nuk eshte i rregullt\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Lidhu tek rrjetet"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Fjalekalimi ne rregull\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Larte: %.1f(%.1f) | Poshte: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Fjalekalim i gabuar\n"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Larte: %.1f | Poshte: %.1f"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Ju nuk futet asnje fjalekalim: Vendi bosh nuk lejohet.\n"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | e lidhur)"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Dalja e kerkuar\n"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | e shkeputur)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Perpunimi i kerkeses [e ridrejtuar]: "
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Vertet deshironi qe te dilni nga aMule?"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Duke ngarkuar modelin <str>"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Konfirmimi i daljes"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Porta UPnP"
-
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Perdor kompresimin gzip "
-
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr ""
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Direktoria e skin '%s' nuk ekziston"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Lejo hyrjen e guest-ve"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Rrjetet"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Ndalo hyrjen e guest-ve"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Dritaret e rrjeteve"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr ""
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Kerkimet"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Rruga per konfigurimin e failit te aMule. MOS E PERDORNI DIREKT!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Dritaret e kerkimeve"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "C'aktivizo interpretuesin e PHP (nuk aprovohet)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Shkarkime"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Rimbush faqet PHP ne c'do kerkese"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Duke shkarkuar"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Web Server i aMule"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr ""
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Nuk eshte ne dispozicion"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Dritarja e faileve te ndara"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Asnjehere"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Mesazhe"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Duke shkarkuar..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Dritarja e mesazheve"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistikat"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr ""
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Dritarja e grafikut te statistikave"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Preferencat"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Direktoria permban failin amulesig.dat"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Dritarja e rregullimeve te preferencave"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Shfleto"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importimi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Futni ketu direktorine se ku keni vendosur failin e amulesig.dat"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Veglat per importimin e pjeseve te faileve"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Intervali i rifreskimit ne sekonda"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Rreth"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Prodho nje imazh te statistikave ne c'do rifreskim ngjarje"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Rreth/Ndihme"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
 msgstr ""
-"Futni ketu direktorine se ku deshironi te prodhoni nje imazh te statistikave"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Ngarko periodikisht imazhin tuaj te statistikave ne serverin FTP"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "Url e FTP-se"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Rruga e FTP-se"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Rrjeti Kad"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Futni ketu URL e serverit tuaj FTP"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Nuk ka rrjet"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
 msgstr ""
-"Futni ketu direktorine e serverit FTP ne te cilen doni te kopjoni imazhin "
-"tuaj te statistikave"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Perdorues"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Fjalekalim"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Futni ketu emrin e Perdoruesit per te hyre ne serverin FTP"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Futni ketu fjalekalimin e Perdoruesit per te hyre ne serverin FTP"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Intervali i rifreskimit te FTP-se ne minuta"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Konvalido"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Kartela qe mban failoin e firmes"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Kartela ku prodhohet imazhi i statistikave"
-
-#: src/utils/wxCas/src/linuxmon.cpp:86
-#, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i dita(et) %i ora(et) %i min %i s"
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, Statistikat Online te aMule"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Miresevini!"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:116
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
 msgid "aMule"
 msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Shpejtesia maksimale e DL qe kur eshte aktive wxCas"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "Shpejtesia maksimale e DL ne aktivizimet e meparshme"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Rivendos"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistem"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Ndalo Rifreskimin Automatik"
+#: src/amule-gui.cpp:294
+#, fuzzy
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Gabim Fatal: Deshtoi te krijoje Timerin"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Shpeto imazhet e statistikave online"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Lidhu me Remote te amule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Printo imazhet e statistikave online"
+#: src/amule-remote-gui.cpp:253
+#, fuzzy
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Gabim Fatal: Deshtoi te krijoje Timerin"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Rregullimet e preferencave"
+#: src/amule-remote-gui.cpp:268
+#, fuzzy
+msgid "Going to event loop..."
+msgstr "Tentative per rekuperimin e informacionit te failit..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Rreth wxCas"
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "Duke u lòidhur"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Fillo Rifreskimin Automatik"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Lidhja deshtoi "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Rifreskimi Automatik u ndalua"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Rifreskimi Automatik filloi"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Shpeto imazhet e statistikave"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Statistikat Online te aMule"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
 msgstr ""
-"Kishte nje problem duke printuar.\n"
-" Mos valle printeri juaj nuk eshte instaluar ne menyre korrekte?"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Duke printuar"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Te gjithe"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
-"wxCas, Statistikat e Firmes Online te aMule\n"
-"\n"
-"(c) 2004 The Polish <thepolish@vipmail.ru>\n"
-"\n"
-"Bazuar ne CAS nga Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Shperndare nga GPL"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, aMule nuk eshte duke punuar..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule eshte duke punuar"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "E panjohur"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule eshte duke punuar,por e shkeputur"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Deshtoi te rimarri failet e ndara nga perdoruesi '%s'"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule po lidhet..."
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh Oh, Statusi i aMule eshte i panjohur..."
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (eMule e falsifikuar versioni %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr "(eMule e falsifikuar)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr "ka punuar per "
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (eMule e falsifikuar)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " ka ndaluar !"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (e bazuar ne eMule v0 %u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " nuk eshte lidhur !"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Emri: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " po lidhet..."
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Kerkuar: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " eshte duke bere dicka te cuditshme, kontrolloje !"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statistikat e failit per kete sesion: U pranua %d nga %d kerkesa, %s te "
+"transferuara\n"
+msgstr[1] ""
+"Statistikat e failit per kete sesion: U pranuan %d nga %d kerkesat, %s te "
+"transferuara\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " eshte lidhur me "
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Statistikat e failit per te gjitha sesionet: U pranua %d nga %d kerkesa, %s "
+"te transferuar\n"
+msgstr[1] ""
+"Statistikat e faileve per te gjitha sesionet: U pranua %d nga %d kerkesat, %"
+"s te transferuara\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Po kerkoni nje faili te panjohur"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Filtrim mesazhi nga '%s' (IP: %s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "firewalled"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Mesazh i ri nga '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "Fikur"
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr ""
+"Perdoruesi %s (%u) kerkoi listen e faileve tuaja te ndara per kartelen %s -> "
+"nuk u lejua"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr "  Eshte ndezur "
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, fuzzy, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "Kujdes: known.met nuk mund te hapet."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " me "
+#: src/CanceledFileList.cpp:61
+#, fuzzy
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+"Kujdes: Lista e faileve te njohur eshte e demtuar, permban nje header te "
+"pavlere."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Shkarkimi Total: "
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Gabim IO duke lexuar failin known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Ngarkimi: "
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Gabim duke shpetuar failin known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Sesioni i Shkarkimit: "
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Shkarkim: "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategori"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Ngarkim: "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Kategori e re"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Zgjidh nje kartele per failet ne hyrje"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Te ndara: "
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Ju duhet te specifikoni nje emer per kategorine!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " faili(et), Klientet ne pritje: "
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Ju duhet te specifikoni nje rruge per kategorine!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Koha: "
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"E pamundur te krijoje nje kartele per failet ne hyrje per kete kategori.Ju "
+"lutem specifikoni nje rruge te vlefshme!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/ChatSelector.cpp:129
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " Ndezur "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Ngarikimi mesatar i sistemit (1-5-15 minuta): "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Uptime i Sistemit: "
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Sesioni i chatit filloi: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uo %02umin %02us"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** I lidhur me klientin ***"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02umin %02us"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** DUke u lidhur me klientin ***"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02umin %02us"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Deshtoi te lidhet me klientin / Lidhja humbi ***"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
-#, c-format
-msgid "%02us"
-msgstr "%02us"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "ID i larte"
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "ID i ulet"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "I palidhur"
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Mbyll tabelen"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Mbylli te gjitha tabelat"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Mbyll tabelat e tjera"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Shto tek shoket"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientCreditsList.cpp:158
 #, c-format
-msgid "%.2f GB"
-msgstr "%2f GB"
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Faili i kreditit u ngarkua, %u klienti eshte njohur"
+msgstr[1] "Faili i kreditit u ngarkua, %u klientet u njohen"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientCreditsList.cpp:161
 #, c-format
-msgid "%.2f TB"
-msgstr "%2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "i anulluar !"
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Kreditet mbaruan per %u klientin!"
+msgstr[1] " - Kreditet mbaruan per %u klientet!"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
-#, c-format
-msgid "Unable to open %s"
-msgstr "I paafte per te hapur %s"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "NUk u gjet faili cryptkey.dat,duke e krijuar."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Parametrat e hyrjes"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Detajet e klientit"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Faili per ekzaminim"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "ID i ulet"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Shtoni URLs opsionale per kete fail"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "ID i larte"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Shto"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Hiq"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Pastro"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Krijo lidhje me pjeset-hash"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
 msgstr ""
-"Ndihmo te shperndash sa me shpejte failet e reja dhe te vyera, ne kembim te "
-"nje lidhjeje me te gjate"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "Hash MD4"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr ""
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "I lidhur"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Fillo"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "I shkeputur"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Shpeto"
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Kopjo ne shenime"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Nuk eshte e kompletuar"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Dlje"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Djale i keq"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-#, fuzzy
-msgid "Open"
-msgstr "Opera"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "E verifikuar - Ne rregull"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr ""
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Nuk eshte aktive"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopjo"
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "Perdoruesi %s (%u) kerkoi listen e faileve tuaja te ndara -> U lejua"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
+"Perdoruesi %s (%u) kerkoi listen e faileve tuaja te ndara -> Nuk u lejua"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-#, fuzzy
-msgid "Save as"
-msgstr "Shpeto"
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "Perdoruesi %s (%u) kerkoi listen e kartelave tuaja te ndara -> U lejua"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
+"Perdoruesi %s (%u) kerkoi listen e kartelave tuaja te ndara -> Nuk u lejua"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Rreth"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Rreth aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
+"Perdoruesi %s (%u) kerkoi listen e faileve tuaja te ndara per kartelen %s -> "
+"u lejua"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-#, fuzzy
-msgid "Can't open the clipboard"
-msgstr "Kopjo ne shenime"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Asgje per te kopjuar tani !"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
+"Perdoruesi %s (%u) kerkoi listen e faileve tuaja te ndara per kartelen %s -> "
+"nuk u lejua"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "E pamundur te hapet "
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Ju lutem, futni nje emer faili jo boshe"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Perdoruesi %s (%u) ndan kartelen %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Asgje per te shpetuar tani !"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr ""
+"Perdoruesi %s (%u) dergoi nje liste te kartelave te ndara qe nuk u kerkua."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
+"Perdoruesi %s (%u) derrgoi listen e faileve te ndara per direktorine %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Hashing..."
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Perdoruesi %s (%u) mbaroi dergimin e listes se faileve te ndara"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr ""
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Perdoruesi %s (%u) dergoi listen e faileve te ndara te padeshiruara"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
+"Perdoruesi %s (%u) nuk lejoi hyrjen ne listen e kartelave/faileve te ndara"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr ""
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Komentet e faileve"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "I perfunduar ne %.2f s"
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Emri i perdorimit"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Ju e keni futur edhe me pare kete URL !"
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Emri i failit"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Ju lutem, futni nje URL jo boshe"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Vleresimi"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
-#, c-format
-msgid "Processing file number %u: %s"
-msgstr "Numeri i failit ne proces %u: %s"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Komenti"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Ju kerkuat hashin e pjeseve (Vetem per failet e perdorur > 9.5 MB)"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Nuk ka komente"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Fail qe nuk ekziston !\n"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u koment"
+msgstr[1] "%u komente"
 
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
+#: src/CorruptionBlackBox.cpp:227
+#, c-format
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
 #: src/DataToText.cpp:37
@@ -1320,31 +1160,57 @@
 msgid "Auto [Hi]"
 msgstr "Automatike [Larte]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Duke u lòidhur"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Shume ngadale"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Ngadale"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normale"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "E larte"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Shume e larte"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Leshim"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Duke pyetur"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Lidhje nepermjet serverit"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Radha ne pritje eshte plote"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "Ne radhe"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Duke transferuar"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Duke shkarkuar"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1370,8 +1236,7 @@
 msgid "Too many Kad connections"
 msgstr "Shume lidhje Kad"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Te larguar"
 
@@ -1403,8 +1268,8 @@
 msgid "Remote Server"
 msgstr "Server i larget"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1425,12 +1290,11 @@
 msgstr "Burime te shpetuara"
 
 #: src/DataToText.cpp:135
-#, fuzzy
 msgid "Search Result"
-msgstr "Kerkimet"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Te kompletuara"
 
@@ -1454,7 +1318,7 @@
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "Ne radhe"
 
@@ -1466,877 +1330,298 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Formati i failit temp i panjohur ose i gabuar."
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "E vendosur nga sistemi"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Shqip"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabe"
-
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "Estoneze"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Baske"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bullgare"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Katallanase"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Kineze (E thjeshtesuar)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "KIneze (Tradicionale)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Kroate"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Ceke"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Daneze"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Holandeze"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Anglisht (G.B.)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estoneze"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finlandeze"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Frengjisht"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galiciane"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Gjermanisht"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Greqisht"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Cifut"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Hungarisht"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italiane"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italiane (Zvic)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japonisht"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Koreane"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Lituane"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norvegjeze (Nynorsk)"
-
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polake"
-
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugeze"
-
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugeze (Braziliane)"
-
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Ruse"
-
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Sllovene"
-
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Spanjolle"
-
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Suedeze"
-
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Turqisht"
-
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "E pamundur te percaktoj shfletuesin e zgjedhur!"
-
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"Porta TCP nuk mund te jene me te medha se 65532  sepse socket i UDP eshte "
-"fiksuar ne TCP+3"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Madhesia"
 
-#: src/Preferences.cpp:1681
-#, c-format
-msgid "Default port will be used (%d)"
-msgstr "Do te perdoret porta e vendosur (%d)"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Te transferuara"
 
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Emri i serverit"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Shpejtesia"
 
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adresa"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Avancimi"
 
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Porta"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Burime"
 
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Pershkrimi"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Perparesia"
 
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping-u"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Gjendja"
 
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Perdoruesit"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Koha e mbetur"
 
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Failet"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Hera e fundit qe u pa e kompletuar"
 
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "E Deshtuar"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Marrja e fundit"
 
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "E qendrueshme"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Jeni te sigurte qe deshironi te fshini failin e zgjedhur?"
 
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Versioni"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Jeni te sigurte qe deshironi te fshini failet e zgjedhura?"
 
-#: src/ServerListCtrl.cpp:144
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
+#, c-format
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Ju jeni lidhur tek nje serveri qe po perpiqeni te fshini. Ju lutem mbylleni "
-"lidhjen ne fillim. Serveri NUK u fshi."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Informacion"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Emer i panjohur)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Jeni te sigurte qe doni te fshini kete server te qendrueshem %s"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Po"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Automatike"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Jo"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Ndal"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Deshtoi te hapi '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pushim"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Serverat (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Rimerr"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Serveri"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "&Pastro te kompletuarit"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Lidhu ne Server"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Sposto cdo A4AF ne kete fail tani"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Shenoje Serverin si te qendrueshem"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Sposto cdo A4F4 ne kete fail (Automatikisht)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Shenoje Serverin si te Jo-Qendrueshem"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Sposto cdo A4F4 ne cdo fail tjeter tani"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Shenoji Serverat si te qendrueshem"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Opsione te Avancuara"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Shenoji Serverat si te Jo-Qendrueshem"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Parashikim"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Hiq Server"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Trego &detajet e faileve"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Hiq Serverat"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Trego te gjithe komentet"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Hiq te gjithe Serverat"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Kopjo magnetin URI ne shenimet"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr ""
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Kopjo feedback ne shenimet"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Rilidhu ne Server"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "hiq"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Jeni te sigurte qe deshironi te fshini te gjithe serverat?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Vendos tek kategoria"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr ""
-"Jeni te sigurte qe deshironi te fshini te gjithe serverin e perzgjedhur?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Hap failin"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Jeni te sigurte qe deshironi te fshini serverat e zgjedhur?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Futni nje emer te ti per kete fail:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Jo aktive [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Riemertim i failit"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Kjo eshte aMule %s dhe bazohet ne eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Duke punuar ne %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Vizitoni http://www.amule.org per te kontrolluar nqs eshte ne dispozicion "
-"nje version i ri."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr ""
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Kontrolli remote i aMule "
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Snapshot:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-"Te gjitha platformat p2p te bazuara ne eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Websajti: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Forumi: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-"FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Kontakt: admin@amule.org (pyetje administrative) \n"
+msgid "Downloads (%i)"
+msgstr "Shkarkimet (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-msgstr ""
-"Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr "Pjesa e aMule bazohet ne \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Peer-to-peer routing i bazuar ne metriken XOR.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http:/kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Mesazh"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr ""
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
 
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Me Firewall"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: I lidhur"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Po lidhet"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Fikur"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Ndalo tentativat e lidhjes qe po behen"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Shkeputu"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Shkeputu nga rrjetet e lidhura"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Lidhu"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Lidhu tek rrjetet"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Larte: %.1f(%.1f) | Poshte: %.1f(%.1f)"
-
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Larte: %.1f | Poshte: %.1f"
-
-#: src/amuleDlg.cpp:834
-#, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | e lidhur)"
-
-#: src/amuleDlg.cpp:836
-#, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | e shkeputur)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Vertet deshironi qe te dilni nga aMule?"
-
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Konfirmimi i daljes"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Parashikimi i failit"
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Direktoria e skin '%s' nuk ekziston"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "GABIM: Deshtoi te luaj media-player te jashtem! Komanda: `%s'"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr ""
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Rrjetet"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Kerkimet"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Transferimet"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr ""
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Mesazhe"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr ""
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistikat"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
+msgid "Saving PartFile %u of %u"
 msgstr ""
 
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
 msgstr ""
 
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importimi"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Veglat per importimin e pjeseve te faileve"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Rreth/Ndihme"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr ""
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Rrjeti Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Nuk ka rrjet"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Te pergjithshme"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Lidhje"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Direktorite"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Servera"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Sigurimi"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proksi"
-
-#: src/PrefsUnifiedDlg.cpp:177
-#, fuzzy
-msgid "Filters"
-msgstr "Filteri:"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Kontrollet e remote"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Firma online"
-
-#: src/PrefsUnifiedDlg.cpp:180
-#, fuzzy
-msgid "Advanced"
-msgstr "Rregullime te Avancuara"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Ngjarje"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Debug"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Te percaktuara nga perdoruesi"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"aMule duhet qe te ristartohet qe keto ndryshime te aplikohen:\n"
-" \n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "Porta TCP eshte ndryshuar.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "Porta UDP eshte ndryshuar.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Ju keni lejuar lidhjet e jashtme por nuk keni specifikuar nje fjalekalim.\n"
-"Lidhjet e jashtme nuk mund te lejohen derisa te specifikohet nje fjalekalim."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Gjuha ndryshoi.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "Kartela Temp ndryshoi.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-#, fuzzy
-msgid "- ED2K network enabled.\n"
-msgstr "Te gjithe rrjetet jane c'aktivizuar."
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Larte: 0.0 | Poshte: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
+#: src/DownloadQueue.cpp:113
+#, fuzzy, c-format
+msgid "Loading temp files from %s."
+msgstr "Duke ngarkuar failin e server.met: %s"
 
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad nuk mund te filloje nqs porta juaj UDP eshte c'aktivizuar.\n"
-"Aktivizoni porten UDP ose c'aktivizoni Kad-in."
+#: src/DownloadQueue.cpp:132
+#, fuzzy, c-format
+msgid "Loading PartFile %u of %u"
+msgstr "Duke ngarkuar te dhena nga nje fail i shkarkuar i vjeter (%u te %u)"
 
-#: src/PrefsUnifiedDlg.cpp:669
+#: src/DownloadQueue.cpp:154
 msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"\n"
-"Ju duhet te ristartoni aMule-n tani.\n"
-"Nqs nuk e ristartoni tani mos u anko nqs te ndodh dicka e keqe.\n"
 
-#: src/PrefsUnifiedDlg.cpp:749
-msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
-"Lista e azhornimit automatik te serverave eshte boshe.\n"
-"Ju lutem mbushni te pakten nje URL te vlefshme ne failin e server.met.\n"
-"Klikoni ne butonin \"List\" per te futur nje URL."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Failet e perkohshme"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Failet e shkarkuara"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Firma online"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Zgjidhni nje kartele per %s"
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Shfletoni per nje videoplayer"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Perzgjidhni shfletuesin"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Nuk u gjenden part-files"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Te ekzekutueshme%s"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "U gjend %u part file"
+msgstr[1] "U gjenden %u part files"
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
-"Futni ketu URL-te per te shkarkuar failet server.met.\n"
-"Vetem nga nje URL per c'do linje."
 
-#: src/PrefsUnifiedDlg.cpp:1031
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Intervali i azhornimit: %d sekonde"
-msgstr[1] "Intervali i azhornimit: %d sekonda"
+msgid "Downloading %s"
+msgstr "Duke shkarkuar %s"
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Koha per mesataren grafike: %d minute"
-msgstr[1] "Koha per mesataren grafike: %d minuta"
+msgid "You are already trying to download the file '%s'"
+msgstr "Jeni duke e shkarkuar kete fail ne nje vend tjeter '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Shkalla grafike e lidhjeve: %d"
+msgid "You already have the file '%s'"
+msgstr "Ju e keni kete fail '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Intervali i azhornimit : %d sekonde"
-msgstr[1] "Intervali i azhornimit : %d sekonda"
+msgid "You are already trying to download the file %s"
+msgstr "Jeni duke u perpjekur te shkarkoni edhe njehere tjeter kete fail %s"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Madhesia buffer e failit: %d byte"
-msgstr[1] "Madesia Buffer e failit: %d bytes"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Madhesia e radhes se ngarkimit: %d klienti"
-msgstr[1] "Madhesia e radhes se ngarkimit: %d klientet"
+msgid "Unknown protocol of link: %s"
+msgstr "Protokoll i panjohur i linut: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Intervali i rifreskimit te lidhjeve te serverit: %d minute"
-msgstr[1] "Intervali i rifreskimit te lidhjeve te serverit: %d minuta"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Intervali i rifreskimit te lidhjeve te serverit: I c'aktivizuar"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-#, fuzzy
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Porta UDP per kerkesat e zgjeruara te serverit (TCP+3): 4665"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1118
+#: src/ExternalConn.cpp:260
 #, fuzzy
-msgid "disabled"
-msgstr "c'aktivizo"
-
-#: src/PrefsUnifiedDlg.cpp:1138
-#, c-format
-msgid "Execute command on `%s' event"
-msgstr "Ekzekuto komanden ne kete ngjarje `%s' "
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Lejo ekzekutimin e komandes ne core"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "KOmanda Core:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Lejo ekzekutimin e komandes ne GUI"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Komanda GUI:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Variacionet qe vijojne do te rivendosen:"
-
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Tentative per hyrje e paautorizuar. Lidhja u mbyll."
+msgid "Client sent packet after authentication failed."
+msgstr "Autentifikimi deshtoi."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Lidhja e jashtme u mbyll."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "LIdhjet e jashtme u c'aktivizuan sepse fjalekalimi ishte bosh|"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Lidhjet e jashtme u c'aktivizuan ne failin e konfigurimeve"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "U pranua nje lidhje e jashtme e re"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "Lidhja e jashtme nuk u pranua sepse fjalekalimi tek preferencat ishte bosh!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Duke lidhur klientin: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Version i panjohur"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2344,2207 +1629,1062 @@
 "ID-ja i versionit EC jo korrekt,duhet te kete mospershtatje binaresh. Perdor "
 "Core dhe Remote nga i njejti Snapshot."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 "NUk mund te lidheni me nje version SVN tek nje version i perfunduar ne "
 "menyre arbitrare| *sigh* crash i mundshem u evitua"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Autentifikimi deshtoi."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Version protokoli jo i rregullt."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Munfon tag-u i versionit te protokolit."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "Autentifikimi deshtoi."
+
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "Autentifikimi deshtoi."
+
+#: src/ExternalConn.cpp:516
+#, fuzzy
+msgid "Invalid request, please authenticate first."
 msgstr "Kerkese jo e rregullt, fillimisht duhet te identifikoheni."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Hyrja lejohet."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, fuzzy, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Filtron mesazhet nga klienta t èanjohur"
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Tentative per hyrje e paautorizuar. Lidhja u mbyll."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Komanda e Remote per pjeset e faileve deshtoi: Nuk u gjet FileHash: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Nuk u gjet FileHash: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "OOPS! Gabim ne procesimin e OpCode|"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Serveri nuk u shtua"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "Serveri nuk u gjend: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "nevojitet percaktimi i serverit qe do te levizet"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Kerkimi vazhdon. Rezultate ne ardhje!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Kerkimi WebSearch nga Remote eshte i kote."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad-i eshte c'aktivizuar tek Preferencat."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "NUk ka pika per grafike."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Klienti juaj nuk eshte i konfiguruar per kete nivel detaji."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Jam duke dalur."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Lidhje e jashtme: Duke shtuar linkun '%s'."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Link i pavlere ose qe eshte ne liste."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Faili nuk u gjete."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Emri i failit i pavlere."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "E pamundur te riemeroje failin."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad-i eshte c'aktivizuar tek Preferencat."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Jam i lidhur ne Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Duke u lidhur me Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Te gjithe rrjetet jane c'aktivizuar."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "I shkeputur nga Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr ""
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "OpCode e pavlere (version protokoli i gabuar?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr "Deshtoi te hapi failin (%s). duke hequr nga lista failet e ndara."
-
-#: src/UploadClient.cpp:718
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Kerkohet Hashset-i per failin e panjohur: %s"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Shtim i panjohur '%s' per komanden '%s'.\n"
 
-#: src/TerminationProcess.cpp:48
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Komanda `%s' me pid `%d' mbaroi me kodin e statusit `%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Serveri nuk u shtua: Nuk ka Hostname ose IP per specifikuar."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Serveri nuk u shtua: Porta e serverit te specifkuar eshte e pavlere."
+msgid "Unknown command '%s'.\n"
+msgstr "KOmande e panjohur '%s'.\n"
 
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
 msgstr ""
+"\n"
+"Kjo komande nuk mund te kete nje argument.\n"
 
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "I lidhur"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Porta"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Statusi i Kademlia"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Aktive"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Statusi:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "I shkeputur"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Gjendja e lidhjes"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Me firewall"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "Ne rregull"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Gjendja e firewall-it"
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "I lidhur me shokun"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Nuk ka Shoke"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Perdorues mesatare:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Mesatarja e faileve:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Nuk eshte aktive"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Uptime: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Transferimi"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Ngarkimi"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Vlera te ngarkuara (Sesioni (Total)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Overhead-i Total (Paketa): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Overhead-i i faileve te kerkuara (Paketa): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Overhead-i i nderrimit te burimit (Paketa): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Overhead-i i Serverit (Paketa): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Overhead i Kad (Paketa): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
 msgstr ""
+"\n"
+"Kjo komande duhet te kete nje argument.\n"
 
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Ngarkime Aktive: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Ngarkime ne pritje: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Sesione totale ngarkimi me sukses: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Sesione totale ngarkimi te deshtuara: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Mesatarja kohore e ngarkimeve: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Shkarkime"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Te dhenat e shkarkimeve (Sesioni(Total)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Burime te gjetura: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Shkarkime Aktive (pjeset): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Raporti NG:SHK i sesionit (Total): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
+"\n"
+"Kjo komande nuk eshte komplete, ju duhet te perdorni nje nga shtimet me "
+"poshte.\n"
 
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
 msgstr ""
+"\n"
+"Shtime ne dispozicion:\n"
 
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr ""
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Komanda ne dispozicion:\n"
 
-#: src/Statistics.cpp:692
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Max upload rate (Session): %s"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
 msgstr ""
+"\n"
+"Te gjitha komandat mund te shkruhen me shkronja te medha ose te vogla.\n"
+"Shtyp '%s <command>' per te marre informacion te detajuar ne <command>.\n"
 
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Rilidhjet: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Koha qe nga transferimi i pare: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "I lidhur ne server qe prej: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Lidhje Aktive (vleresimi): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Kufiri maksimal i lidhjeve u arrit: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Mesatarja e lidhjeve (vleresim): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Kulmi i lidhjeve (vleresim): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Kliente"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Te filtruar"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Totale: %i Te njohur: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Servera qe punojne: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Servera te deshtuar: %i"
-
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Totale: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Servera te fshire: %s"
-
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Servera te filtruar: %s"
-
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Perdorues ne serverat qe punojne: %llu"
-
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Faile ne serverat qe punojne: %llu"
-
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Perdorues Total: %llu"
-
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "Totali i Faileve: %llu"
-
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Zenia e Serverit: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Del nga aplikimi."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Numeri i faileve te ndara: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Trego ndihme."
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Totali i madhesise se faileve te ndara: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Per te marre ndihme per nje komande shtyp help <command> .\n"
+"Per te marre listen e plote te komandave shtyp help .\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
+"\n"
+"Perdor '%s' per listen e komandave\n"
+"\n"
 
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Sistemi Operativ"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Jo te marra"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Ndaj"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Ngjit"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Zgjidhi te gjitha"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kerkimi i Kad nuk mund te behet nqs Kad nuk eshte duke punuar"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Gabim Sintakse!"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
+"Gabim ne punimin e komandes - nuk duhet qe te ndodhi me! Raportoni Bug-un ju "
+"lutem\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Gabim i paparashikuar duke kerkuar Kad: "
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Kjo komande nuk duhet te kete parametra."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Filtrim mesazhi nga '%s' (IP: %s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Kjo komande duhet te kete nje parameter."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Mesazh i ri nga '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Argument i pavlere."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "Perdoruesi %s (%u) kerkoi listen e faileve tuaja te ndara -> U lejua"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Kjo eshte nje komande jo komplete."
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr ""
-"Perdoruesi %s (%u) kerkoi listen e faileve tuaja te ndara -> Nuk u lejua"
+msgid "Type '%s' to get more help.\n"
+msgstr "Shtyp '%s' per te marre me shume ndihme.\n"
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "Perdoruesi %s (%u) kerkoi listen e kartelave tuaja te ndara -> U lejua"
+msgid "This is %s %s %s\n"
+msgstr "Ky eshte %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr ""
-"Perdoruesi %s (%u) kerkoi listen e kartelave tuaja te ndara -> Nuk u lejua"
+msgid "This is %s %s\n"
+msgstr "Ky eshte %s %s\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
-"Perdoruesi %s (%u) kerkoi listen e faileve tuaja te ndara per kartelen %s -> "
-"u lejua"
-
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr ""
-"Perdoruesi %s (%u) kerkoi listen e faileve tuaja te ndara per kartelen %s -> "
-"nuk u lejua"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Perdoruesi %s (%u) ndan kartelen %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
+"\n"
+"Creating client...\n"
 msgstr ""
-"Perdoruesi %s (%u) dergoi nje liste te kartelave te ndara qe nuk u kerkua."
+"\n"
+"Duke krijuar klientin...\n"
 
-#: src/ClientTCPSocket.cpp:1025
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Perdoruesi %s (%u) derrgoi listen e faileve te ndara per direktorine %s"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Perdoruesi %s (%u) mbaroi dergimin e listes se faileve te ndara"
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Perdoruesi %s (%u) dergoi listen e faileve te ndara te padeshiruara"
+"\n"
+"Ne rregull, duke dalur %s...\n"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"Perdoruesi %s (%u) nuk lejoi hyrjen ne listen e kartelave/faileve te ndara"
+"Nuk mund te lidhem me nje fjalekalim boshe.\n"
+"Ju duhet te specifikoni nje fjalekalim edhe ne failin e konfigurimeve\n"
+"ose ne nje linje-komande, ose futni nje kur kerkohet.\n"
+"Duke dalur.\n"
 
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Nyjet (%u)"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Trego kete tekstin ndihmues."
 
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "IP i pavlefshem per bootstrap"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Host ne te cilin aMule vepron. (default: localhost)"
 
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Porte e pavlefshme per bootstrap"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Porta e aMule per Lidhjet e Jashtme. (default: 4712)"
 
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Ju lutem plotesoni te gjitha fushat e kerkuara"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Fjalekalimi per Lidhjet e Jashtme."
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Jeni te sigurte qe deshironi te shkarkoni nje fail te ri nodes.dat?\n"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Lexo rregullimin nga faili."
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
-msgstr ""
-"Duke bere keshtu te gjitha nyjet aktuale do te hiqen dhe do te rifillohet "
-"lidhja ne Kademlia."
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Mos printo asnje output tek stdout"
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Te vazhdoj?"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Behu fjaleshume - trego dhe mesazhet e Debug-ut."
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr ""
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Vendos Locale-n e programit (gjuha)"
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
 msgstr ""
+"Shkruaj opsionet e lenjes se komandave tek faili i konfigurimeve"
+"(rregullimeve)"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Shto nje shoke"
-
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Ju duhet te futni nje IP dhe nje porte te vlefshem!"
-
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Informacion"
-
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Userhash-i i specifikuar nuk eshte i vlefshem!"
-
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Burime"
-
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Faile"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Krijo nje fail per konfigurimin te bazuar ne ate te aMule-s."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Shkarkime"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Printo versioni ne programit."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategori"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Detajet e failit"
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Kryesore"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% te mbaruara"
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Shkarko ne kategori"
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
+#, c-format
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Shenoje si fail te njohur"
-
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Lidhu me Remote te amule"
-
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Lidhja deshtoi "
-
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, fuzzy, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Lidhja Deshtoi.E pamundur te lidhem ne ate host\n"
-
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Perdoruesit: E: %s K: %s | Failet E: %s K: %s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Te gjithe"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Shkoket"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Totali i Perdoruesve: %s | Totali i Faileve: %s"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Trego &Detaje"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Te transferuara"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Shto nje shoke"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Shpejtesia"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Fshi nje shoke"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Avancimi"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Dergo &Mesazh"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Gjendja"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Shiko failet"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Koha e mbetur"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Vendos slotin per shoket"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Hera e fundit qe u pa e kompletuar"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Jeni te sigurt qe deshironi te fshini shokun e zgjedhur?"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Marrja e fundit"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Jeni te sigurt qe deshironi te fshini shoket e zgjedhur?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Jeni te sigurte qe deshironi te fshini failin e zgjedhur?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Ju nuk lejoheni qe te vendosni me shume se nje slot per shoket.\n"
+" Vetem nje slot i vetem u vendos."
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Jeni te sigurte qe deshironi te fshini failet e zgjedhura?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Perzgjedhje e shumte"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Dergo nje mesash perdoruesit"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Mesazhi qe do te dergohet:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Ndal"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pushim"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Rimerr"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "&Pastro te kompletuarit"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Sposto cdo A4AF ne kete fail tani"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Sposto cdo A4F4 ne kete fail (Automatikisht)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Sposto cdo A4F4 ne cdo fail tjeter tani"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Opsione te Avancuara"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Parashikim"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Trego &detajet e faileve"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Trego te gjithe komentet"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Kopjo magnetin URI ne shenimet"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "hiq"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Vendos tek kategoria"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Hap failin"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Hiqe nga shoket"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Shto tek shoket"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Dergo mesazh"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Sposto tek ky fail"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Nje tjeter fail i kerkuar"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Shkarkimet (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Parashikimi i failit"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Ngarkime ne pritje: %s"
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "GABIM: Deshtoi te luaj media-player te jashtem! Komanda: `%s'"
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "Ne radhe"
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "GABIM: Deshtoi te krijoje partfile)"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Ngarkim"
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Ngarkimi i backup-it te failit met nga %s"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Asnjeri"
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr ""
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Jo"
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr ""
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Po"
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr ""
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Duke shkarkuar..."
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Tentative per rekuperimin e informacionit te failit..."
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "Kujdes: E pamundur te lexohet skin nga faili '%s'"
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
-"Rekuperim i failit pa emer - tentativa e rekuperimit si RecoveredFile.dat"
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr ""
-"Te gjitha informacionet e mundshme jane rekuperuar :D - duke u munduar ti "
-"perdor..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "E pamundur te merren informacione mbi failin :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Deshtoi ne hapjen %s (%s)"
-
-#: src/PartFile.cpp:708
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "WARNING: %s might be corrupted (%i)"
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "GABIM duke shpetuar partfile: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Nuk mund te merret gjatesia e '%s' - duke perdorur failin %s ."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' eshte 0 per ndonje motiv - po perdor failin  %s ."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "E pamundur te shpetohet faili part.met seeds per %s"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Te shpetuar %i burimi seed per partfile: %s (%s)"
-msgstr[1] "Te shpetuar %i burimet seeds per partfile: %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Partfile %s (%s) nuk ka faile seeds"
-
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Partfile %s (%s) ka nje fail seeds boshe"
-
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Gabim ne leximin e failit seeds tek partfile-t (%s - %s): %s"
-
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"U gjend pjese e prishur (%d) ne %d pjesen e failit %s - Rezultati Hash i "
-"Failit |%s| Hash i Failit |%s|"
-msgstr[1] ""
-"U gjend pjese e prishur (%d) ne %d pjeset e failit %s - Rezultati Hash i "
-"Failit !%s| Hash i Failit |%s|"
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "U gjend pjese e kompletuar (%i) ne %s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Hashing i ri i kompletuar %s"
-
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Shkarkim i perfunduar: %s"
-
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Duke fshire failin: %s"
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
+msgstr "Duke shkarkuar %s"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr ""
-"KUJDES: Nuk ka hapesire te mjaftueshme ne disk! Duke vene ne pushim failet: %"
-"s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Pjesa e shkarkuar %i eshte e prishur ne failin: %s"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH: Rekuperohet pjesa e demtuar %i per %s -> Bytes te kursyera: %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr ""
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr ""
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "E ndalur"
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Rilidhu ne Server"
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
 
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr ""
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
 
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Gabim IO duke lexuar failin known.met: %s"
-
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Gabim duke shpetuar failin known.met: %s"
-
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "U gjend %i fail i njohur i ndare"
-msgstr[1] "U gjenden %i faile te njohura te ndara"
-
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "U gjenden %i faile te njohur te ndare, %i te panjohura"
-msgstr[1] "U gjenden %i faile te njohura te ndara,%i te panjohura"
-
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "ERROR: Attempted to share %s"
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Komentet e faileve"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Vleresimi"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Komenti"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Nuk ka komente"
-
-#: src/CommentDialogLst.cpp:104
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u koment"
-msgstr[1] "%u komente"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"E pamundur te lidhet tek lista e serverave me protokollin e turbullimit. Po "
-"provoj pa turbullim."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "E pamundur te lidhem tek serverat qe jane ne liste. Po provoj perseri."
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr ""
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/ServerConnect.cpp:187
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "I lidhur tek %s (%s:%i)"
-
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Lidhja u vendos ne: %s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Successfully updated %s"
 msgstr ""
-"Gabim i Rende gjate tentatives per tu lidhur. Lidhja e Internetit mund te "
-"jete shkeputur"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Humbi lidhja tek %s (%s:%i)"
 
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) duket sikur nuk ka shenja jete."
-
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) duket sikur eshte plote."
-
-#: src/ServerConnect.cpp:381
-#, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Rilidhje automatike tek serveri do te behet ne %d sekonde"
-msgstr[1] "Rilidhje automatike tek serveri do te behet ne %d sekonda"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr ""
 
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "LIdhja humbi"
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Deshtoi te shkarkoje listen e serverave nga %s"
 
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "Lidhja tek %s (%s:%i) deshtoi."
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Deshtoi te shkarkoje listen e serverave nga %s"
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
+"Duke ngarkuar filtrat e IP nga 'ipfilter.dat' dhe 'ipfilter_static.dat'."
 
-#: src/ServerConnect.cpp:460
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Lidhja tek %s (%s:%i) nuk u vendos per time-out."
-
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
+"Deshtoi ne ngarkimin e failit ipfilter.dat '%s', rastisem ne nje format te "
+"panjohur."
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Nuk u gjenden part-files"
-
-#: src/DownloadQueue.cpp:171
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "U gjend %u part file"
-msgstr[1] "U gjenden %u part files"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr ""
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
+"Deshtoi ne ngarkimin e failit ipfilter.dat '%s', nuk mund te hapet faili."
 
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Duke shkarkuar %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Jeni duke e shkarkuar kete fail ne nje vend tjeter '%s'"
-
-#: src/DownloadQueue.cpp:359
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "You already have the file '%s'"
-msgstr "Ju e keni kete fail '%s'"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "U ngarkua %u intervali i adreses se IP nga '%s'."
+msgstr[1] "U ngarkuan %u intervale te adresave IP nga '%s'."
 
-#: src/DownloadQueue.cpp:364
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Jeni duke u perpjekur te shkarkoni edhe njehere tjeter kete fail %s"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u linja e deformuar u skarcua."
+msgstr[1] "%u linjat e deformuara u skarcuan."
 
-#: src/DownloadQueue.cpp:1299
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Protokoll i panjohur i linut: %s"
-
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Shtyp <str> dhe dil."
-
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Format IP e pavlere. Perdor xxx.xxx.xxx.xxx:xxxx\n"
-
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:86
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Kjo komanda kerkon nje argument, Argumente te vlefshme: all , emri i failit, "
-"ose nje numer.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Perpunim nga Hash: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Perpunim nga emri i failit: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr ""
-"Kjo komanda kerkon nje argumet. Argumente te vlefshem jane: nje fail hash.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Nuk eshte numer i vlefshem\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Nuk eshte hash i vlefshem (gjatesia duhet te jete ekzaktesisht 32 shkronja)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Operacioni u mbyll me sukses."
+"Bootstrap nga \n"
+"kliente te njohur"
 
-#: src/TextClient.cpp:637
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Kerkesa deshtoi me kete gabim: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Filtrimi i IP per klientet eshte %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "Fikur"
+msgid "Nodes (%u)"
+msgstr "Nyjet (%u)"
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "Ndezur"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "IP i pavlefshem per bootstrap"
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Filtrimi i IP per serverat eshte %s.\n"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Porte e pavlefshme per bootstrap"
 
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Niveli aktual i filtrimit te IP eshte %d.\n"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Ju lutem plotesoni te gjitha fushat e kerkuara"
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr ""
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Jeni te sigurte qe deshironi te shkarkoni nje fail te ri nodes.dat?\n"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
+"Duke bere keshtu te gjitha nyjet aktuale do te hiqen dhe do te rifillohet "
+"lidhja ne Kademlia."
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "I lidhur tek %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "me ID te ulet"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "me ID te larte"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Tani po lidhem"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Te vazhdoj?"
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Nuk jam i lidhur"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: fjala qe u kerkua eshte shume e shkurter"
 
-#: src/TextClient.cpp:723
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+msgid "Keyword for search: %s"
 msgstr ""
-"\n"
-"Shkarkim:\t%s"
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
-"\n"
-"Ngarkim:\t%s"
 
-#: src/TextClient.cpp:729
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Kliente ne radhe:\t%d\n"
 
-#: src/TextClient.cpp:732
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Po lexoj %u kontakt Kad"
+msgstr[1] "Po lexoj %u kontakte Kad"
+
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Burime Totale:\t%d\n"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Numri i rezultateve te kerkimeve: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - tregon avancimin e kerkimit"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Erdhi nje pergjigje e panjohur nga serveri, OpCode = %#x"
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Trego informacione mbi gjendjen."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Trego gjendjen e lidhjes, ngarkim/shkarkim shpejtesi aktuale, etj.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Trego pemen e te gjitha statistikave."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "U shkruajt %d kontakt Kadi"
+msgstr[1] "U shkruajten %d kontakte Kadi"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Me deshire, nje numer nga 0-255 mund te dergohet si nje argument tek kjo\n"
-"komande, per te treguar se sa versione te tregoje ne nenpeme\n"
-". Asnje numer nuk tregon 'infinit'.\n"
-"Shembull: 'statitistics 5' do te tregoje vetem 5 versionet eme te perhapura "
-"per cdo lloj klienti.\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Emri i failit"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
+#: src/KnownFile.cpp:1545
+msgid "File size"
 msgstr ""
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
 msgstr ""
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Ringarko objektet e dhena."
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Ringarko listen e faileve te ndara."
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Ringarko tabelen e Filterit te Ip nga faili."
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Lidhu me rrjetin."
-
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
 msgstr ""
-"Kjo do te lidh ne te gjithe rrjetet qe jane te aktivizuara tek Preferencat.\n"
-"Ju gjithashtu mund te specifikoni adresen IP ne formen IP:Port, te nje "
-"serveri dhe\n"
-"te lidhesh vetem tek ai. Mund te perdoret nje adrese IPv4 ose nje emer i "
-"zgjidhshem DNS."
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
 msgstr ""
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Lidhu vetem tek Kad."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Shkeputu nga rrjeti."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Kjo do te shkepusi aMulen nga te gjithe rrjetet qe eshte e lidhur.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
 msgstr ""
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Shkeputu vetem nga Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
 msgstr ""
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Vendos nje vlere te preferuar."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Vendos preferimet per filtrin e IP."
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Ndize filtrin e IP si per kliente dhe per serverat."
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Fike filterin e IP si per klientet si per serverat."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Aktivizo/C'aktivizo filtrimin e IP per klientat."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Ndiz filtrimin e IP per klientet."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Fike filtrimin e IP per klientet."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Aktivizo/C'aktivizo filtrimin e IP per serverat."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Ndize filtrimin e IP per serverat."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Fike filtrimin e IP per serverat."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Zgjidh nivelin e filtrimit te IP."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"Niveled e duhura per filtrimin jane nga 0-255, dhe eshte e dhene "
-"(fillimisht)\n"
-"vlera eshte 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Vendos kufijte e rrjetit."
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "Vlera e dhene e ketyre komandave duhet te jete ne kilobytes/sec.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Vendos kufijte ngarkues te rrjetit."
-
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Vendos kufijte shkarkues per rrjetin."
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Merr dhe trego nje vlere te preferencave."
-
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Merr preferencat e filtrit te IP."
-
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Merr gjendjen e filterit te IP per klientet dhe per serverat."
-
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Merr gjendjen e filterit te IP vetem per kliente."
-
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Merr gjendjen e filterit IP vetem per servera."
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Merr nivelin e Filterit te IP."
-
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Merrni kufijte e bandwdith"
-
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Ben nje kerkim"
-
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Eshte e nevojshme te specifikohet tipi i kerkimit qe mund te jete:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Shembull: 'search kad file' do te filloje kerkimin per \"fail\".\n"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Fillon nje kerkim global."
-
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Fillon nje kerkim lokal"
-
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Fillon nje kerkim Kad"
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Version i panjohur"
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Tregon rezultatet e kerkimit te fundit."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Kujdes: E pamundur te lexohet skin nga faili '%s'"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Rikthen rezultatet tek kerkimi i meparshem.\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Hashing"
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Tregon ecurine e nje kerkimi."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Duke perfunduar"
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Tregon ecurine e nje kerkimi.\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "E kompletuar"
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Shkarko nje fail"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Ne pritje"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Duhet te jepet numri i nje faili nga kerkimi i fundit.\n"
-"Shembull: 'shkarkimi 12' do te filloje te shkarkoje failin me numer 12 te "
-"kerkimit te meparshem.\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "E gabuar"
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Pusho shkarkimin."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Duke pritur"
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Rimerr shkarkimin."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Ju duhet te specifikoni nje fjalekalim jo bosh "
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Fshij shkarkimin."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Fjalekalim i gabuar, nuk eshte nje hash MD5 "
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Vendos prioritetin e shkarkimit."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Lidhja deshtoi"
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
 msgstr ""
-"Vendos prioritetin e nje shkarkimi tek Ulet, Normale, Larte ose Auto,\n"
-
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Vendos prioritetin tek Ulet,"
-
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Vendos prioritetin tek Normale."
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Vendos prioritetin tek Larte."
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "Lidje e jashtme: Pergjigje e keqe nga serveri. Lidhja u mbyll."
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Vendos prioritetin tek auto."
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Sukses! Lidhja u vendos ne aMule "
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Trego radhet/listat."
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Sukses! Lidhja u vendos."
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
 msgstr ""
-"Tregon radhen e ngarkim/shkarkimit, listen e serverave ose listen e faileve "
-"te ndara.\n"
-
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Trego radhen e ngarkimeve."
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Trego radhen e shkarkimeve."
-
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Trego log."
-
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Trego listen e serverave."
-
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Fshi log-un"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "Fjalekalimi per Lidhjet e Jashtme."
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Deprecated command, use '%s' instead."
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
 msgstr ""
-"Kjo eshte nje komande e pavlere dhe mund te largohet ne te ardhmen.\n"
-"Perdor '%s' ne vendin e saj.\n"
 
-#: src/ServerSocket.cpp:259
-#, c-format
-msgid "ERROR: %s (%s) - %s"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
 msgstr ""
 
-#: src/ServerSocket.cpp:274
-#, c-format
-msgid "WARNING: %s (%s) - %s"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
 msgstr ""
 
-#: src/ServerSocket.cpp:417
-#, c-format
-msgid "New clientid is %u"
-msgstr "Klienti i ri eshte %u"
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Mbylle"
 
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "KUJDES: Ju keni marre nje ID te ulet!"
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Ndaj"
 
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tMbase ngaqe ju jeni mbas nje firewalli ose routeri."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Kopjo"
 
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tPer me shume informacion ju lutem vizitoni http://wiki.amule.org"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Ngjit"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "U moren Informacione serveri te panjohura! - shume e shkurter"
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Pastro"
 
-#: src/ServerSocket.cpp:539
-#, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "U mor %d server i ri"
-msgstr[1] "U moren %d servera te rinj"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Zgjidhi te gjitha"
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Shpetimi i listes se serverit u perfundua."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Serveri nuk pranoi komanden e fundit"
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "E pakufijshme"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Paketa Bogus te marra nga serveri: %s"
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "Menuja e sherbimeve te aMule"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
 msgstr ""
-"Gabim qe nuk mund te menaxhohet derisa punohet me paketat nga serveri: %s"
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr ""
-"Nuk eshte e mundur te krijohet nje thread per te zgjidhur DNS per tu lidhur "
-"tek %s"
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "Ngarkim: Asnje"
 
-#: src/ServerSocket.cpp:729
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "IP-ja e Serverit %s ( %s) eshte e filtruar.  Nuk po lidhet."
+msgid "UL: %u"
+msgstr "Ngarkim: %u"
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "duke perdorur protokollin e turbullimit."
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "Shkarkim: Asnje"
 
-#: src/ServerSocket.cpp:748
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "Duke u lidhur tek %s ( %s - %s:%i) %s"
+msgid "DL: %u"
+msgstr "Shkarkim: %u"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr ""
-"NUk eshte e mundur te zgjidhet DNS per serverin %s: E pamundur te lidhem!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+msgid "Download speed: %.1f"
 msgstr ""
-"CIP2Country::CIP2Country(): Deshtoi te ngarkoje te dhenat e vendit nga "
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Te ngarkuar %d flag bitmap."
-msgstr[1] "Te ngarkuar %d flag bitmaps."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgid "Upload speed: %.1f"
 msgstr ""
-"Jeni te sigurte qe deshironi te fshini te gjithe failet nga kjo kategori?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Konfirmo kerkesen"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Te gjithe te tjeret"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "E pakompletuar"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Aktive"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Video"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Audio"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Arkivi"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Imazhet-CD"
 
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Figurat"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Informacion mbi klientin"
 
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Tekst"
+#: src/MuleTrayIcon.cpp:330
+#, c-format
+msgid "Nickname: %s"
+msgstr "Nickname: %s"
 
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Zgjidh filtrin e shikimit"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Nuk eshte perzgjedhur asnje Nickname"
 
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Shto kategorine"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID-ja e klientit: "
 
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Redakto kategorine"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Nuk jam i lidhur"
 
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Zhvendos kategorine"
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Emri i Serverit: "
 
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Emri i failit"
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP-ja e Serverit: "
 
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr ""
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "I palidhur"
 
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr ""
+#: src/MuleTrayIcon.cpp:365
+#, c-format
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
+#: src/MuleTrayIcon.cpp:374
+#, c-format
+msgid "TCP port: %d"
 msgstr ""
 
-#: src/KnownFile.cpp:1363
-msgid "Requested"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
+#: src/MuleTrayIcon.cpp:385
+#, c-format
+msgid "UDP port: %d"
 msgstr ""
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/PartFileConvert.cpp:208
-#, c-format
-msgid "Importing %s: %s"
-msgstr "Duke importuar %s: %s"
-
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Duke lexuar kartelen temp"
-
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Rekuperim informacioni themelor nga informacioni i failit ne shkarkim"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Firma Online: E aktivizuar"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Duke krijuar destinacionin e failit"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Firma Online: E c'aktivizuar"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Duke ngarkuar te dhena nga nje fail i shkarkuar i vjeter (%u te %u)"
+msgid "Uptime: %s"
+msgstr "Uptime: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
+msgid "Shared files: %d"
 msgstr ""
-"Shpetimi i blloqeve te dhenave ne nje fail shkarkimi te vetem (%u te %u)"
 
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Rekuperim informacioni mbi burimet e failit ne shkarkim"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Shtim shkarkimi dhe duke shpetuar partfile-n e re"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Importo pjeset e faileve"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Gjendja"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Filehash"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Ne pritje..."
-
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disku: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Ju lutem zgjdhni nje kartele per te kerkuar per shkarkimet e perkohshme! "
-"(bejne pjese edhe nenkartelat)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"Deshironi qe burimet e faileve te importuara ne menyre te suksesshme te "
-"fshihen?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Te heq burimet?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "byte"
-msgstr[1] "bytes"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "byte/sec"
-msgstr[1] "bytes/sec"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "sekonda"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "minuta"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "ore"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Dite"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Video"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Arkive"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Tekste"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programe"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Kushdo"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "E pavotuar"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Pa vlere / E prishur / Falso"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "I varfer"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Mjaftueshem"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Mire"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "E perkryer"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "te gjithe"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "te gjithe te tjeret"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
 msgstr ""
-"Duke ngarkuar filtrat e IP nga 'ipfilter.dat' dhe 'ipfilter_static.dat'."
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr ""
-"Deshtoi ne ngarkimin e failit ipfilter.dat '%s', rastisem ne nje format te "
-"panjohur."
+msgid "Total DL: %s"
+msgstr "Totali i shkarkimit: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Deshtoi ne ngarkimin e failit ipfilter.dat '%s', nuk mund te hapet faili."
+msgid "Total UL: %s"
+msgstr "Totali i ngarkimit: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "U ngarkua %u intervali i adreses se IP nga '%s'."
-msgstr[1] "U ngarkuan %u intervale te adresave IP nga '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr ""
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u linja e deformuar u skarcua."
-msgstr[1] "%u linjat e deformuara u skarcuan."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr ""
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Lidhjet Aktive (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Fshih aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Detajet e failit"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Trego aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% te mbaruara"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Dlje"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Dergo"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4552,19 +2692,19 @@
 "Ngjarjet jane te treguara ketu. Per nje liste komplete te ngjarjeve, "
 "referohuni log-ut ne skeden e Serverave."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Duke ngarkuar ..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Numeri i perdoruesve ne serverin qe jeni lidhur edhe ju ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Perdorues: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4573,6 +2713,10 @@
 "gjithe perdoruesve."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Larte: 0.0 | Poshte: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4580,7 +2724,7 @@
 "Mesatarja aktuale e ngarkimeve dhe shkarkimeve. Nese aktivizohet numrat ne "
 "thonjeza tregojne overhead-in nga komunikimi me klientin."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4592,521 +2736,574 @@
 "ID te ulet (me firewall) dhe shigjetat e jeshile tregojne qe ju keni ID te "
 "larte (Tipi i lidhjes optimale)"
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Nuk eshte i lidhur ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Serveri aktualisht i lidhur."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Kerko"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Emri:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tipi"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Lokale"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Globale"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Hash-i i failit"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Parametra te zgjeruara"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Filtrim"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Lloji i failit"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Kushdo"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Arkive"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Audio"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Imazhet-CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Figurat"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programe"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Tekste"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Video"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Zgjerimi"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Madhesia Minimale"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "Bytes"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Madhesia Maksimale"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Te disponueshem"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Filteri:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Rezultatet e filterit"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Nderro pozicionin e rezultateve"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Fshi failet e njohura"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Fillo"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Me shume"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Ndalo"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Shkarkime"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Reseto fushat"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Rezultatet"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Pastro shkarkimet e perfunduara"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Trego ngarkimin / Radha e ngarkimit"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Kliente ne radhe :"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Dergo"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Dergo mesazhin e specifikuar."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Mbylle"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Burime te gjetura :"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Mbylle kete sesion chati."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Te pergjithshme"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Emri i plote :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/A"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "Faili-met :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Hash :"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Madhesia e failit :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Gjendja e pjeseve te failit :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Hera e fundit qe u pa i perfunduar :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Transferimi"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Burime te gjetura :"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Burime ne transferim :"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Numerimi i pjeseve te failit :"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Te disponueshem :"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Shpejtesia :"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Koha Aktive e Shkarkimit :"
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Te transferuara :"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Te kompletuara :"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Intelligent Corruption Handling"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Humbje per pjese te prishura :"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Fitimi nga kompresimi :"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Paketa te rekuperuara nga I.C.H. :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Emrat e Faileve"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Mbishkruaj"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Pastro"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Zbato"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Ne rregull"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Komento/Gjyko failin (Teksti do te shikohet nga perdoruesit e tjere)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Per nje film ju mund te tregoni gjatesine e tij, historine e tij, "
-"gjuhen ...\n"
-"dhe nese eshte falso, ju mund ta tregoni ate per perdoruesit e tjere te "
-"aMule."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Cilesia e failit"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "E pavotuar"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Pa vlere / E prishur / Falso"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "I varfer"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Mjaftueshem"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Mire"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "E perkryer"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "Gjyko failin ose lajmero perdoruesit nese faili eshte i pavlefshem ..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Rifreskim"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Duke shkarkuar, ju lutem prisni ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Madhesi e panjohur"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Informacion i Kerkuar"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "Adresa IP :"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Porta :"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Informacion i Shtuar"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Emri i Perdoruesit :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Userhash :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Ringarko failet e ndara"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Sesioni Aktual"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Totale"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Te kerkuara :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Ngarkime Aktive :"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Shto"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Shpejtesia-Shkarkimit"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Aktualisht"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Mesatarja e Punes"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Mesatarja e Sesionit"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Shpejtesia-Ngarkimit"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Lidhjet"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Shkarkime Aktive"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Lidhje Aktive (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Ngarkime Aktive"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Pema e statistikave"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Emri i perdoruesit:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Userhash:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Software i klientit:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Versioni i klientit:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "Adresa IP:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID-ja e Perdoruesit:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "IP-ja e Serverit:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Emri i Serverit:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Transferime tek klienti"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Kerkesa aktuale:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Shpejtesia mesatare e ngarkimeve:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Shpejtesia mesatare e shkarkimeve:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Te ngarkuara (sesione):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Te shkarkuara (sesione):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Ngarkimet (total):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Shkarkimet (total):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Piket"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Modifikuesi DL/UP:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Identifikim i sigurte:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Gjykimi (total):"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "Ne radhe"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Piket e pritjes:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Nick"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - Gomari i Linux "
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Ky eshte emri qe te tjeret do te shohin kur te lidhen tek ju."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Gjuha"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Interval kohor para se te tregohen sugjerimet."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Kjo specifikon gjuhen e perzgjedhur."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Opsione te ndryshme"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Kerko per versione te reja sapo te filloje"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 "Duke aktivizuar kete beni qe aMule te kerkoje per versione te reja sapo te "
 "filloje"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Fillo te minimizuar"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 "Duke aktivizuar kete opsion beni qe aMule te minimizohet vetevetiu sapo te "
 "filloje."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Pyet kur del"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "Bej qe aMule te kerkoje perpara daljes."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Aktivizo Ikonen Tray"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Aktivizon ose C'aktivizon ikonen e System Tray (ose taskbar-in)"
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Minimizoje ne ikonen Tray"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
@@ -5114,583 +3311,461 @@
 "Duke aktivizuar kete opsion do te beni qe te minimizoni aMule-n ne System "
 "Tray sesa ne taskbar."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Vonesa e sugjerimeve ne sekonda"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Interval kohor para se te tregohen sugjerimet."
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Zgjedhesi i shfletuesit"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Zgjidhni shfletuesin tuaj ketu"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Shfletuesi(browser) i zakonshem"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Futni emrin e shfletuesit(browser) tuaj ketu. Per te perdorur nje shfletues "
-"tjeter zgjidh shfletues te zakonshemr nga tendina poshte."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Shfleto"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Hape ne nje faqe te re nqs eshte e mundur"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Nqs eshte e mundur hape faqen e re te web-it ne nje faqe tjeter te re"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Video Player"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Ngarkim"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Vendndodhja e slotit"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Porta standarte TCP e klientit:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Porta e avancuar e klientit UDP:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "c'aktivizo"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Bind Adress"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Porta UDP per kerkesat e zgjeruara te serverit (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Burimet maksimale per failet"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Lidhje Maksimale"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Plug and Play Universale"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Aktivizo UPnp"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Porta TCP per UPnP:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Lidje automatike sapo programi te hapet"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Rilidhu mbas humbjes se lidhjes"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Trego Overhead-in e bandes"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Opsionet e Serverit"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Largo serverat e papune mbas"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "tentativa"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Lista"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Perdor sistemin e prioritetit"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Perdor kontrollin e zgjuar per ID e ulet kur lidhesh"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Lidhje e sigurte"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Lidhu automatikisht vetem me serverat e qendrueshem"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Vendosni ne menyre manuale serverat e shtuar ne Prioritet te Larte"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. aktive"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH i beson kujtdo hashi (nuk rekomandohet)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Shto failet tek shkarkimi duke i vene ne pushim"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Shto failet tek shkarkimi me prioritet automatik"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Mundohu te shkarkosh pjesen e pare dhe te fundit te failit"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Shto faile te reja te ndara me prioritet automatik"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Kerko te transferosh pjese te plota per te gjithe ngarkimet"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Fillo failin tjeter qe keni ne pritje kur nje fail te kompletohet"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "Nga e njejta kategori"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Shpeto 10 burime per failet e rralla (< 20 burime)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "Futni ketu hapesiren minimale qe deshironi per diskun."
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr ""
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Shpeto 10 burime per failet e rralla (< 20 burime)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Ngarkimi"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Shto faile te reja te ndara me prioritet automatik"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 "( Klikoni me butonin e djathte ne ikonene e karteles per te ndare ne menyre "
 "rekursive)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Nda failet e fshehur"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Grafiket"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Intervali i azhornimit : 5 sek"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Intervali grafik i vlerave mesatare: 100 minuta"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Shkalla grafike e lidhjeve: 100 "
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Zgjidh ngjyrat e statistikave"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr ""
+
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Sfondi"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Zgara"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Shkarkimi aktual"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Mesatarja e shkarkimeve ne punim"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Mesatarja e sesioneve te shkarkimit"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Ngarkimi aktual"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Mesatarja e ngarkimit ne punim"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Mesatarja e sesionit te ngarkimeve"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Lidhjet aktive"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Ikona e Speedbar-it ne Systray"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Nyjet e Kad aktuale"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Nyjet e Kad jane duke punuar"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Sesioni i Nyjeve te Kad"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Zgjidh"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Numera te treguar te versioneve te klienteve (0= pa kufij)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Kapaciteti i Linjes"
-
-#: src/muuli_wdr.cpp:2249
-#, fuzzy
-msgid "Note: These values are only used for statistics."
-msgstr ""
-"Shenim: Keto vlera jane\n"
-" vetem per statistika"
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! KUJDES !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"MOs ndryshoni keto rregullime vetem nese ju dini\n"
-"se cfare jeni duke bere,  perndryshe ju mund te\n"
-"perkeqesoni gjerat.\n"
-"\n"
-"aMule do te punoje ne rregull pa modifikuarr asnje nga\n"
-"keto rregullime"
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Rregullime te Avancuara"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Lidhe maksimale te reja / 5 sek"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Madhesia e Buffer-it te failit: 240000 bytes"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Madhesia e Radhes ne Ngarkim: 5000 klienta"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Interval i azhornimit te lidhjes se serverit: C'aktivizuar"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Avancimi i faileve ne radhe per shkarkim"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Trego perqindjen"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Trego Progressbar "
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Stili Progressbar"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "E sheshte"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "E rrumbullakosur"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Perkrahja Skin"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Aktivizo perkrahjen e skin-ve"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Skin:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- nuk ka skin te disponueshem -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Rreshtimi i Kollonave"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "Rreshtim automatik i faileve ne radhen e shkarkimeve (CPU i larte)"
-
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
-"aMule do te rreshtoje automatikisht kollonat ne listen tuaj te shkarkimeve"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Tweaks Gui te ndryshem"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Trego informacion te zgjeruar ne tabelat e kategorive"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Trego shpejtesine e transferimit ne titull"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "Trego shpejtesine e transferimit ne titull"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Orientim Vertikal i toolbar-it"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Trego numrin partfile me pare se emrin e failit"
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Fillo amuleweb sapo te nise programi"
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Orientim Vertikal i toolbar-it"
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Koha e Rifreskimit te Faqes (ne sek)"
-
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Aktivizo kompresimin Gzip"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Aktivizo Perdorues me te drejta te kufizuara"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "E sheshte"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Fjalekalim per te drejta komplete"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "E rrumbullakosur"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Fjalekalim per te drejta te kufizuara"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Modeli Web"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr ""
+"aMule do te rreshtoje automatikisht kollonat ne listen tuaj te shkarkimeve"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Parametrat e Lidhjeve te Jashtme"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Prano lidhje te jashtme"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
-"IP-ja e nderfaqes se degjimit\n"
-"(ose bosh per cdo IP)"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5698,75 +3773,116 @@
 "Futni ketu nje ip te vlefshem ne formatin a.b.c.d per te degjuar nderfaqesin "
 "EC. Nje fushe boshe ose 0.0.0.0 do te nenkuptoje cdo nderfaqe."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Porta TCP"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Aktivizo port forwarding UPnP tek porta EC"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Fjalekalim"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Modeli Web"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Fjalekalim per te drejta komplete"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Aktivizo Perdorues me te drejta te kufizuara"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Fjalekalim per te drejta te kufizuara"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Koha e Rifreskimit te Faqes (ne sek)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Aktivizo kompresimin Gzip"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "Ne rregull"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Kliko ketu per te bere aktive ndryshimet qe u bene tek Preferencat."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Rikthe ne gjendjen e meparshme ndryshimet te bera tek Preferencat."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Titulli :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Komente :"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Direktoria e Hyrjeve :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Nderro perparesine per failet e reja te caktuara :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "Mos nderro"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Zgjidh ngjyren per kete kategori (e zgjedhur aktualisht) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Trego motd e serverit kur jeni te lidhur ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Informacion mbi serverin"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Rivendos"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "Kliko ne kete buton per te resetuar log-un."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Log i aMule"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Kliko ne kete buton per te azhornuar listen e serverave nga URL ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5774,44 +3890,56 @@
 "Futni url tek nje fail server.met dhe shtypni butonin ne te majte per te "
 "azhornuar listen e serverave te njohur."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Futni emrin e serverit te ri ketu"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Porta"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Futni IP-ne e serverit ketu. duke perdorur formatin x.x.x.x."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Futni porten e serverit ketu."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 "Shto ne menyre manuale nje server (mbushni fushen ne te majte me pare) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Log i aMule"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Informacion mbi serverin"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "Informacioni i ED2K"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Informacioni i Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Kliko ne kete buton per te azhornuar listen e nyjeve nga URL ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nyjet (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5819,51 +3947,58 @@
 "Fut url e nje faili nodes.dat dhe shtyp butonin ne te majte per te azhornuar "
 "listen e nyjeve te njohura."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Statistikat e Nyjeve"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Bootstrap"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Nyje e re"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+#, fuzzy
+msgid "Bootstrap from known clients"
 msgstr ""
 "Bootstrap nga \n"
 "kliente te njohur"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Shkeput Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Perdor Identifikimin e Sigurte te Perdoruesve"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
 msgstr ""
+"Eshte e rekomandueshme qe ta lejoni kete opsion. Ju nuk mund te merrni "
+"kredite nqs SUI nuk eshte i aktivizuar."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Protokolli i Turbullimit"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Mbeshtet Protokollin e Turbullimit"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5871,11 +4006,11 @@
 "Ky opsion lejon Protokollin e Turbullimit, dhe ben qe aMule te pranoje "
 "lidhje te turbulluara nga kliente te tjere."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Perdor turbullimin per lidhjet ne dalje"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5883,11 +4018,11 @@
 "Ky opsion lejon aMule-n qe te perdori protokollin e turbullimit kur lidhet "
 "me klientet/serverat e tjere."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Prano vetem lidhje te turbulluara"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5895,86 +4030,82 @@
 "Ky opsion e ben aMule-n qe te lejoje lidhje te turbulluara. Ju do te keni me "
 "pak burime, por i gjithe trafiku juaj do te turbullohet"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Opsionet e faileve"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Te gjithe"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Kush mund te shikoje failet e ndara:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Zgjidh se kush ka kerkuar te shikoje listene faileve qe ju keni ndare."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "Filtrimi-IP"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Filtro klientet"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Lejo filtrimin e IP-ve te klientave te percaktuar ne failin ~/.aMule/"
 "ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Filtron Serverat"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Lejo filtrimin e IP-ve te serverave te percaktuara ne failin ~/.aMule/"
 "ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Lista e Ringarkimeve"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 "Ringarko listen e IP-ve per te filtruar nga faili ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Azhorno tani"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Azhornim-Automatik i ipfilter sapo te ndizet"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Niveli i Filtrimit:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Gjithmone filtro IP-te LAN"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Perdorim Paranoik te IP-ve qe nuk korrespondojne"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -5982,11 +4113,11 @@
 "Refuzo paketat nqs IP e klientit eshte e ndryshme nga IP se ku paketat kane "
 "ardhur. Perdore me kujdes."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Perdor ipfilter.dat te sistemit nqs eshte i disponueshem"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -5994,23 +4125,11 @@
 "Nese nuk eshte gjetur ndonje ipfilter.dat lokal, lejo perdorimin e failit "
 "ipfilter te sistemit."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Perdor Identifikimin e Sigurte te Perdoruesve"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Eshte e rekomandueshme qe ta lejoni kete opsion. Ju nuk mund te merrni "
-"kredite nqs SUI nuk eshte i aktivizuar."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Lejo Firmen-Online"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6018,850 +4137,1310 @@
 "Lejon shkrimin e faileve OS, qe mund te perdorren nga aplikacione te jashtme "
 "per te krijuar firma dhe te ngjashme."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Frekuenca e azhornimeve (sek):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Nderron frekuqncen (ne sekonda) te azhornimit te Firmes Online."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Direktoria e Firmes Online:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr ""
 "Shtypni ketu per te zgjedhur direktorine qe permban failet e Firmes Online."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "C'aktivizo/Aktivizo"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Filtron mesazhet ne hyrje (pervec chatit qe po zhvilloni):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Opsionet e filtrimit:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Filtron te gjithe mesazhet"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Filtron mesazhet nga njerezit qe nuk ndohen ne listen e miqve tuaj"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Filtron mesazhet nga klienta t èanjohur"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Filtron mesazhet qe permbajne (perdor ',' si nje ndarese):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "shto ketu fjalet qe aMule do te filtroje duke bllokuar mesazhet qe ato mbajne"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Komente"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Komente e filtrave permbajne (perdor ',' si nje ndarese):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Lidhje automatike e serverit pa nevojen e Proksit(Proxy)"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Aktivizo njohjen"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Aktivizo/C'aktivizo emri i perdoruesit/njohja e fjalekalimit"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr ""
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Emri i perdorimit qe do perdoret per tu lidhur tek Proksi(Proxy)"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Fjalekalimi:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Fjalekalimi per te perdorur per tu lidhur tek Proksi(Proxy)"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Aktivizo Proksin(Proxy)"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Aktivizo/C'aktivizo mbeshtetjen e Proksit(Proxy)"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Lloji i Proksit(Proxy):"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Lloji i Proksit(Proxy) qe ju po lidheni"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "Hosti i Proksit(Proxy)"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Host Name i Proksit(Proxy)"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Porta e Proksit:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Porta e Proksit(Proxy)"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Njohja"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Aktivizo njohjen"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Aktivizo/C'aktivizo emri i perdoruesit/njohja e fjalekalimit"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Emri i perdorimit qe do perdoret per tu lidhur tek Proksi(Proxy)"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Fjalekalimi:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Fjalekalimi per te perdorur per tu lidhur tek Proksi(Proxy)"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Lidhje automatike e serverit pa nevojen e Proksit(Proxy)"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Lidhu me:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Futu tek Remote i aMule"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Emri i Perdoruesit"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Mbaji mend keto rregullime"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Aktivizon logging-un e detajuar te mesazheve te debug-ut."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Kategorite e Mesazheve:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Ne pritje..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Shton importimet"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Provoji perseri te perzgjedhurit"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Zhvendos te perzgjedhurat"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Tipet e ngjarjeve"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Ngarkime Aktive :"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Fshih failet e ndara"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Zgjidh filtrin e shikimit"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Ngarkime Aktive"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Trego klientet"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Lista e Ringarkimeve"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Ringarko failet e ndara"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Dergo"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Dergo mesazhin e specifikuar."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Mbylle kete sesion chati."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "Lidhu me ndonje server dhe/ose Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Dritaret e rrjeteve"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "File te ndara"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Dritaret e kerkimeve"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Jo aktive [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Dritarja e transferimeve te faileve"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "byte"
+msgstr[1] "bytes"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Dritarja e faileve te ndara"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Dritarja e mesazheve"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Dritarja e grafikut te statistikave"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Dritarja e rregullimeve te preferencave"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Kategori e re"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Zgjidh nje kartele per failet ne hyrje"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Ju duhet te specifikoni nje emer per kategorine!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "byte/sec"
+msgstr[1] "bytes/sec"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Ju duhet te specifikoni nje rruge per kategorine!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "sekonda"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "minuta"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "ore"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Dite"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "te gjithe"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "te gjithe te tjeret"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "E pakompletuar"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "E ndalur"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Video"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Arkivi"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Tekst"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Aktive"
+
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
+msgstr ""
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
 msgstr ""
-"E pamundur te krijoje nje kartele per failet ne hyrje per kete kategori.Ju "
-"lutem specifikoni nje rruge te vlefshme!"
 
-#: src/ExternalConnector.cpp:141
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Shtim i panjohur '%s' per komanden '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Duke importuar %s: %s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Duke lexuar kartelen temp"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Rekuperim informacioni themelor nga informacioni i failit ne shkarkim"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Duke krijuar destinacionin e failit"
+
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "KOmande e panjohur '%s'.\n"
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Duke ngarkuar te dhena nga nje fail i shkarkuar i vjeter (%u te %u)"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
 msgstr ""
-"\n"
-"Kjo komande nuk mund te kete nje argument.\n"
+"Shpetimi i blloqeve te dhenave ne nje fail shkarkimi te vetem (%u te %u)"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Kjo komande duhet te kete nje argument.\n"
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Rekuperim informacioni mbi burimet e failit ne shkarkim"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Shtim shkarkimi dhe duke shpetuar partfile-n e re"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Importo pjeset e faileve"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Gjendja"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Filehash"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Disku: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Kjo komande nuk eshte komplete, ju duhet te perdorni nje nga shtimet me "
-"poshte.\n"
+"Ju lutem zgjdhni nje kartele per te kerkuar per shkarkimet e perkohshme! "
+"(bejne pjese edhe nenkartelat)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Shtime ne dispozicion:\n"
+"Deshironi qe burimet e faileve te importuara ne menyre te suksesshme te "
+"fshihen?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Komanda ne dispozicion:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Te heq burimet?"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "GABIM: Deshtoi te krijoje partfile)"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Ngarkimi i backup-it te failit met nga %s"
+
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
 msgstr ""
-"\n"
-"Te gjitha komandat mund te shkruhen me shkronja te medha ose te vogla.\n"
-"Shtyp '%s <command>' per te marre informacion te detajuar ne <command>.\n"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Del nga aplikimi."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr ""
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Trego ndihme."
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr ""
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Per te marre ndihme per nje komande shtyp help <command> .\n"
-"Per te marre listen e plote te komandave shtyp help .\n"
+"Gabim: %s (%s) eshte e pavlere (tagcount i gabuar), e pamundur te ngarkoj "
+"failin."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Perdor '%s' per listen e komandave\n"
-"\n"
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Gabim Sintakse!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Tentative per rekuperimin e informacionit te failit..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"Gabim ne punimin e komandes - nuk duhet qe te ndodhi me! Raportoni Bug-un ju "
-"lutem\n"
+"Rekuperim i failit pa emer - tentativa e rekuperimit si RecoveredFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Kjo komande nuk duhet te kete parametra."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr ""
+"Te gjitha informacionet e mundshme jane rekuperuar :D - duke u munduar ti "
+"perdor..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Kjo komande duhet te kete nje parameter."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "E pamundur te merren informacione mbi failin :("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Argument i pavlere."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Deshtoi ne hapjen %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Kjo eshte nje komande jo komplete."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr ""
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Shtyp '%s' per te marre me shume ndihme.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "GABIM duke shpetuar partfile: %s (%s ==> %s)"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:904
+#, fuzzy
+msgid "IO failure while saving partfile: "
+msgstr "GABIM duke shpetuar partfile: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Ky eshte %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Nuk mund te merret gjatesia e '%s' - duke perdorur failin %s ."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Ky eshte %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' eshte 0 per ndonje motiv - po perdor failin  %s ."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "E pamundur te shpetohet faili part.met seeds per %s"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Te shpetuar %i burimi seed per partfile: %s (%s)"
+msgstr[1] "Te shpetuar %i burimet seeds per partfile: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Partfile %s (%s) nuk ka faile seeds"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Partfile %s (%s) ka nje fail seeds boshe"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Gabim ne leximin e failit seeds tek partfile-t (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"U gjend pjese e prishur (%d) ne %d pjesen e failit %s - Rezultati Hash i "
+"Failit |%s| Hash i Failit |%s|"
+msgstr[1] ""
+"U gjend pjese e prishur (%d) ne %d pjeset e failit %s - Rezultati Hash i "
+"Failit !%s| Hash i Failit |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "U gjend pjese e kompletuar (%i) ne %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Hashing i ri i kompletuar %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
-"\n"
-"Duke krijuar klientin...\n"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Shkarkim i perfunduar: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Duke fshire failin: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr ""
+
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Ne rregull, duke dalur %s...\n"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Nuk mund te lidhem me nje fjalekalim boshe.\n"
-"Ju duhet te specifikoni nje fjalekalim edhe ne failin e konfigurimeve\n"
-"ose ne nje linje-komande, ose futni nje kur kerkohet.\n"
-"Duke dalur.\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Trego kete tekstin ndihmues."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr ""
+"KUJDES: Nuk ka hapesire te mjaftueshme ne disk! Duke vene ne pushim failet: %"
+"s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Host ne te cilin aMule vepron. (default: localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Pjesa e shkarkuar %i eshte e prishur ne failin: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Porta e aMule per Lidhjet e Jashtme. (default: 4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH: Rekuperohet pjesa e demtuar %i per %s -> Bytes te kursyera: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Fjalekalimi per Lidhjet e Jashtme."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr ""
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Lexo rregullimin nga faili."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr ""
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Mos printo asnje output tek stdout"
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr ""
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Behu fjaleshume - trego dhe mesazhet e Debug-ut."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr ""
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Vendos Locale-n e programit (gjuha)"
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "E vendosur nga sistemi"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Shqip"
+
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabe"
+
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "Estoneze"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Baske"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bullgare"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Katallanase"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Kineze (E thjeshtesuar)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "KIneze (Tradicionale)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Kroate"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Ceke"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Daneze"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Holandeze"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Anglisht (G.B.)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estoneze"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finlandeze"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Frengjisht"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galiciane"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Gjermanisht"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Greqisht"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Cifut"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Hungarisht"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italiane"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italiane (Zvic)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japonisht"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Koreane"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Lituane"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norvegjeze (Nynorsk)"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polake"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugeze"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugeze (Braziliane)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Ruse"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Sllovene"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Spanjolle"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Suedeze"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Turqisht"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
 msgstr ""
-"Shkruaj opsionet e lenjes se komandave tek faili i konfigurimeve"
-"(rregullimeve)"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Krijo nje fail per konfigurimin te bazuar ne ate te aMule-s."
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Gjuha"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Printo versioni ne programit."
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Faili i kreditit u ngarkua, %u klienti eshte njohur"
-msgstr[1] "Faili i kreditit u ngarkua, %u klientet u njohen"
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "Nuk eshte ne dispozicion"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Kreditet mbaruan per %u klientin!"
-msgstr[1] " - Kreditet mbaruan per %u klientet!"
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr ""
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "NUk u gjet faili cryptkey.dat,duke e krijuar."
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr ""
 
-#: src/amuled.cpp:594
+#: src/Preferences.cpp:1766
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
-"GABIM: demoni i aMule-s nuk mund te perdoret kur lidhjet e jashtme kan te "
-"c'aktivizuara. Per te aktivizuar Lidhjet e Jashtme mund te perdorni dhe nje "
-"aMule normale, filloje aMule me kete opsion --ec-config ose vendosni celesin"
-"\"AcceptExternalConnections\" tek 1 ne failin ~/.aMule/amule.conf"
+"Porta TCP nuk mund te jene me te medha se 65532  sepse socket i UDP eshte "
+"fiksuar ne TCP+3"
 
-#: src/amuled.cpp:750
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "ERROR: %s"
-msgstr "GABIM: %s"
+msgid "Default port will be used (%d)"
+msgstr "Do te perdoret porta e vendosur (%d)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Hiqe nga Ban"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Trego Ngarkimet"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Trego radhen"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Trego klientet"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Lidhje"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Zgjidh veshtrimin"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Software i klientit"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "I pritur"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Koha e ngarkimit"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Ngarkim/Shkarkim"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Gjendja e Remote"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "QR: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Perparesia e faileve"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Direktorite"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Piket"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Servera"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "E kerkuar"
-
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Hera e fundit qe u pa"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "U shtua ne radhe"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Failet"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Gjendja e ngarkimit"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Sigurimi"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Te ngarkuara"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Gjendja e shkarkimit"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proksi"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Te marra"
-
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Userhash"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "E kriptuar"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Fshih failet e ndara"
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Kontrollet e remote"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Detajet e klientit"
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Firma online"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Ngjarje"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Debug"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
 msgstr ""
+"MOs ndryshoni keto rregullime vetem nese ju dini\n"
+"se cfare jeni duke bere,  perndryshe ju mund te\n"
+"perkeqesoni gjerat.\n"
+"\n"
+"aMule do te punoje ne rregull pa modifikuarr asnje nga\n"
+"keto rregullime"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Nuk eshte e kompletuar"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Lloji i Proksit(Proxy) qe ju po lidheni"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Djale i keq"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "E verifikuar - Ne rregull"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"aMule duhet qe te ristartohet qe keto ndryshime te aplikohen:\n"
+" \n"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Nuk eshte aktive"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "Porta TCP eshte ndryshuar.\n"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR: %u)"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "Porta UDP eshte ndryshuar.\n"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Lidhja e jashtme u mbyll."
+
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "U pranua nje lidhje e jashtme e re"
+
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Lidhja e jashtme u mbyll."
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
-"Masa minimale duhet te jete me e vogel se masa maksimale.Po injoroj Masen "
-"Maksimale.."
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "PoParalajmerim per kerkim"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Ju keni lejuar lidhjet e jashtme por nuk keni specifikuar nje fjalekalim.\n"
+"Lidhjet e jashtme nuk mund te lejohen derisa te specifikohet nje fjalekalim."
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "E pakufijshme"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Gjuha ndryshoi.\n"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "Menuja e sherbimeve te aMule"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "Kartela Temp ndryshoi.\n"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
+#: src/PrefsUnifiedDlg.cpp:652
+#, fuzzy
+msgid "- ED2K network enabled.\n"
+msgstr "Te gjithe rrjetet jane c'aktivizuar."
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "Ngarkim: Asnje"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad nuk mund te filloje nqs porta juaj UDP eshte c'aktivizuar.\n"
+"Aktivizoni porten UDP ose c'aktivizoni Kad-in."
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "Ngarkim: %u"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Ju duhet te ristartoni aMule-n tani.\n"
+"Nqs nuk e ristartoni tani mos u anko nqs te ndodh dicka e keqe.\n"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "Shkarkim: Asnje"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Lista e azhornimit automatik te serverave eshte boshe.\n"
+"Ju lutem mbushni te pakten nje URL te vlefshme ne failin e server.met.\n"
+"Klikoni ne butonin \"List\" per te futur nje URL."
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "Shkarkim: %u"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Failet e perkohshme"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Failet e shkarkuara"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Firma online"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "Download speed: %.1f"
-msgstr ""
+msgid "Choose a folder for %s"
+msgstr "Zgjidhni nje kartele per %s"
+
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Shfletoni per nje videoplayer"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Perzgjidhni shfletuesin"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "Upload speed: %.1f"
+msgid "Executable%s"
+msgstr "Te ekzekutueshme%s"
+
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Informacion mbi klientin"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Futni ketu URL-te per te shkarkuar failet server.met.\n"
+"Vetem nga nje URL per c'do linje."
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
 #, c-format
-msgid "Nickname: %s"
-msgstr "Nickname: %s"
-
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Nuk eshte perzgjedhur asnje Nickname"
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Intervali i azhornimit: %d sekonde"
+msgstr[1] "Intervali i azhornimit: %d sekonda"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID-ja e klientit: "
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Koha per mesataren grafike: %d minute"
+msgstr[1] "Koha per mesataren grafike: %d minuta"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Emri i Serverit: "
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Shkalla grafike e lidhjeve: %d"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP-ja e Serverit: "
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Madhesia buffer e failit: %d byte"
+msgstr[1] "Madesia Buffer e failit: %d bytes"
 
-#: src/MuleTrayIcon.cpp:416
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Madhesia e radhes se ngarkimit: %d klienti"
+msgstr[1] "Madhesia e radhes se ngarkimit: %d klientet"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "TCP port: %d"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Intervali i rifreskimit te lidhjeve te serverit: %d minute"
+msgstr[1] "Intervali i rifreskimit te lidhjeve te serverit: %d minuta"
+
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Intervali i rifreskimit te lidhjeve te serverit: I c'aktivizuar"
+
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "c'aktivizo"
+
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "Ekzekuto komanden ne kete ngjarje `%s' "
+
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Lejo ekzekutimin e komandes ne core"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "KOmanda Core:"
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Lejo ekzekutimin e komandes ne GUI"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Komanda GUI:"
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Variacionet qe vijojne do te rivendosen:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
+"Masa minimale duhet te jete me e vogel se masa maksimale.Po injoroj Masen "
+"Maksimale.."
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "PoParalajmerim per kerkim"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Kryesore"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kerkimi i Kad nuk mund te behet nqs Kad nuk eshte duke punuar"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Gabim i paparashikuar duke kerkuar Kad: "
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "FailiID"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Faile"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Shkarko ne kategori"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Shtoni URLs opsionale per kete fail"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Shenoje si fail te njohur"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Firma Online: E aktivizuar"
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Fshij"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Firma Online: E c'aktivizuar"
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
 msgstr ""
+"E pamundur te lidhet tek lista e serverave me protokollin e turbullimit. Po "
+"provoj pa turbullim."
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "E pamundur te lidhem tek serverat qe jane ne liste. Po provoj perseri."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
-msgstr "Totali i shkarkimit: %s"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:483
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "Totali i ngarkimit: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "I lidhur tek %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr ""
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Lidhja u vendos ne: %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
+"Gabim i Rende gjate tentatives per tu lidhur. Lidhja e Internetit mund te "
+"jete shkeputur"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Fshih aMule"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Humbi lidhja tek %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Trego aMule"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) duket sikur nuk ka shenja jete."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Sesioni i chatit filloi: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) duket sikur eshte plote."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** I lidhur me klientin ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Rilidhje automatike tek serveri do te behet ne %d sekonde"
+msgstr[1] "Rilidhje automatike tek serveri do te behet ne %d sekonda"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** DUke u lidhur me klientin ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "LIdhja humbi"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Deshtoi te lidhet me klientin / Lidhja humbi ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "Lidhja tek %s (%s:%i) deshtoi."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Mbyll tabelen"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr ""
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Mbylli te gjitha tabelat"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Lidhja tek %s (%s:%i) nuk u vendos per time-out."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Mbyll tabelat e tjera"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr ""
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Duke ngarkuar failin e server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Faili i server.met nuk u gjete!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 "Deshtoi te ngarkoje failin e server.met '%s' u ndeshem ne nje format te "
 "panjohur."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Deshtoi per te hapur server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Faili i server.met nuk eshte i vlefshem, u gjet nje TAG i versionit i "
 "pavlere: 0x%x, madhesia %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "%i u gjet server ne server.met"
 msgstr[1] "%i u gjeten servera ne server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d serveri i shtua"
 msgstr[1] "%d serverat u shtuan"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "Gabim IO duke lexuar failin known.met: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Serveri nuk u shtua: [%s:%d] nuk specifikon nje porte te vlefshme."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Serveri nuk u shtua: Ip-ja e [%s:%d] eshte e filtruar ose e pavlere."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 "Serveri nuk u shtua: Servera me Ip qe mungon:Porta [%s:%d] u gjet ne liste."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Serveri u shtua: Server tek é%s.%d* duke perdorur emrin '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6869,46 +5448,51 @@
 "Ju jeni i lidhur tek serveri qe deshironi te fshini. ju lutem ne fillim "
 "shkeputuni prej tij."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Deshtoi te hapi '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Deshtoi te shpetoje server.met!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "URL e pavlere"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
 msgstr "Mbaroi se shkarkuari listen e serverave nga %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Deshtoi te shkarkoje listen e serverave nga %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
 msgstr ""
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Duke filluar shkarkimin e listes se serverave nga %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 "Nuk eshte gjetur nje url per auto-shkarkimin e server.met ne adresses.dat"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Deshtoi te shkarkoje listen e serverave nga %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -6916,312 +5500,2300 @@
 "Serverat lokale jane te filtruara nga IPFilters, duke u rilidhur ne nje "
 "server tjeter!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Deshtoi te ekzekutoje komanden `%s' ne `%s' ngjarjet."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Emri i serverit"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Adresa"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Porta"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Pershkrimi"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping-u"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Perdoruesit"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "E qendrueshme"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Versioni"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Vendndodhja juaj eshte ndryshuar tek System Default i pershtatur per nje "
-"nderrim konfigurimi. Me vjen keq."
+"Ju jeni lidhur tek nje serveri qe po perpiqeni te fshini. Ju lutem mbylleni "
+"lidhjen ne fillim. Serveri NUK u fshi."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Emer i panjohur)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Jeni te sigurte qe doni te fshini kete server te qendrueshem %s"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Serverat (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Serveri"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Lidhu ne Server"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Shenoje Serverin si te qendrueshem"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Shenoje Serverin si te Jo-Qendrueshem"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Shenoji Serverat si te qendrueshem"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Shenoji Serverat si te Jo-Qendrueshem"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Hiq Server"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Hiq Serverat"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Hiq te gjithe Serverat"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
 msgstr ""
-"Ju nuk keni asnje server ne listen e serverave tuaj.\n"
-"Deshironi qe aMule te shkarkoje nje liste te re tani?"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Shkarkim per listen e serverave"
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Rilidhu ne Server"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Jeni te sigurte qe deshironi te fshini te gjithe serverat?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr ""
+"Jeni te sigurte qe deshironi te fshini te gjithe serverin e perzgjedhur?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Jeni te sigurte qe deshironi te fshini serverat e zgjedhur?"
+
+#: src/ServerSocket.cpp:259
 #, c-format
-msgid "web server running on pid %d"
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/amule.cpp:937
+#: src/ServerSocket.cpp:413
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Nuk mund te lidh portat tek adresa e dhene: %s"
+msgid "New clientid is %u"
+msgstr "Klienti i ri eshte %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "KUJDES: Ju keni marre nje ID te ulet!"
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tMbase ngaqe ju jeni mbas nje firewalli ose routeri."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tPer me shume informacion ju lutem vizitoni http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "U moren Informacione serveri te panjohura! - shume e shkurter"
+
+#: src/ServerSocket.cpp:535
 #, 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"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "U mor %d server i ri"
+msgstr[1] "U moren %d servera te rinj"
 
-#: src/amule.cpp:970
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Shpetimi i listes se serverit u perfundua."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Serveri nuk pranoi komanden e fundit"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Bogus packet received from server: %s"
+msgstr "Paketa Bogus te marra nga serveri: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
-"Porta %u nuk eshte e vlefshme!\n"
-"\n"
-"Kjo do te thote qe ju do te keni ID te ulet.\n"
-"\n"
-"KOntrolloni rrjetin tuaj per tu siguruar qe porta eshte hapur per hyrje dhe "
-"dalje."
+"Gabim qe nuk mund te menaxhohet derisa punohet me paketat nga serveri: %s"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Deshtoi te krijoje failin per Firmen Online"
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr ""
+"Nuk eshte e mundur te krijohet nje thread per te zgjidhur DNS per tu lidhur "
+"tek %s"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Deshtoi te krijoje failin per Firmen Online te aMule-s"
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "IP-ja e Serverit %s ( %s) eshte e filtruar.  Nuk po lidhet."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "duke perdorur protokollin e turbullimit."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "Duke u lidhur tek %s ( %s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr ""
+"NUk eshte e mundur te zgjidhet DNS per serverin %s: E pamundur te lidhem!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Serveri nuk u shtua: Nuk ka Hostname ose IP per specifikuar."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Serveri nuk u shtua: Porta e serverit te specifkuar eshte e pavlere."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr ""
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Statusi i Kademlia"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "Duke punuar ne %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Aktive"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Statusi:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Gjendja e lidhjes"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr ""
+
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "Gjendja e lidhjes"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr ""
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Gjendja e firewall-it"
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr ""
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Nuk ka Shoke"
+
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "I lidhur me shokun"
+
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "I lidhur me shokun"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "Burime te gjetura :"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr ""
+
+#: src/ServerWnd.cpp:254
+#, fuzzy
+msgid "Indexed notes:"
+msgstr "Indeksi i failit nuk u gjet:  "
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr ""
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Perdorues mesatare:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Mesatarja e faileve:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Nuk eshte aktive"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr ""
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "U gjend %i fail i njohur i ndare"
+msgstr[1] "U gjenden %i faile te njohura te ndara"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "U gjenden %i faile te njohur te ndare, %i te panjohura"
+msgstr[1] "U gjenden %i faile te njohura te ndara,%i te panjohura"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr ""
+
+#: src/SharedFileList.cpp:410
+#, fuzzy, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Serveri nuk u gjend: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Emri i Perdoruesit"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Shpejtesia-Shkarkimit"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Shpejtesia-Ngarkimit"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Te disponueshem :"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Gjendja e ngarkimit"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Gjendja e shkarkimit"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Emri i failit"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "File te ndara"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Kerkesa"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Kerkesa te pranuara"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Te dhena te transferuara"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Raporti i ndarjeve"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Pjese te marra"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Burime te kompletuara"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Direktoria Path"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Shti Komento/Klasifiko"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Redakto Koment/Klasifiko"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Riemerto"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Shto failet ne koleksionin e listes per transferim"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Kopjo magnetin &URI ne shenime "
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr ""
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr ""
+"Ju keni nevoje per nje ID te larte per te krijuar nje sourcelink te vlefshem"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Faile te ndara (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[File ne shkarkim]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Emri i failit"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Vlera te ngarkuara (Sesioni (Total)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Overhead-i Total (Paketa): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Overhead-i i faileve te kerkuara (Paketa): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Overhead-i i nderrimit te burimit (Paketa): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Overhead-i i Serverit (Paketa): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Overhead i Kad (Paketa): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr ""
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Ngarkime Aktive: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Ngarkime ne pritje: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Sesione totale ngarkimi me sukses: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Sesione totale ngarkimi te deshtuara: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Mesatarja kohore e ngarkimeve: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Te dhenat e shkarkimeve (Sesioni(Total)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Burime te gjetura: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Shkarkime Aktive (pjeset): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Raporti NG:SHK i sesionit (Total): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr ""
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Rilidhjet: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Koha qe nga transferimi i pare: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "I lidhur ne server qe prej: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Lidhje Aktive (vleresimi): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Kufiri maksimal i lidhjeve u arrit: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Mesatarja e lidhjeve (vleresim): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Kulmi i lidhjeve (vleresim): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Kliente"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "Madhesi e panjohur"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "Te filtruar"
+
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "Te larguar"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Totale: %i Te njohur: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Servera qe punojne: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Servera te deshtuar: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Totale: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Servera te fshire: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Servera te filtruar: %s"
 
-#: src/amule.cpp:1299
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Perdorues ne serverat qe punojne: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Faile ne serverat qe punojne: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Perdorues Total: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Totali i Faileve: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Zenia e Serverit: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Numeri i faileve te ndara: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Totali i madhesise se faileve te ndara: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr ""
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Sistemi Operativ"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Jo te marra"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Lidhjet Aktive (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Nuk eshte ne dispozicion"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Asnjehere"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Komanda `%s' me pid `%d' mbaroi me kodin e statusit `%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Shtyp <str> dhe dil."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Format IP e pavlere. Perdor xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Vendi i zgjedur duket se nuk do te instalohet ne kutine tuaj. (Shenim: Une "
-"do te mundohem ta vendos ate)"
+"Kjo komanda kerkon nje argument, Argumente te vlefshme: all , emri i failit, "
+"ose nje numer.\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Perpunim nga Hash: "
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Perpunim nga emri i failit: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr ""
+"Kjo komanda kerkon nje argumet. Argumente te vlefshem jane: nje fail hash.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Nuk eshte numer i vlefshem\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr ""
+"Nuk eshte hash i vlefshem (gjatesia duhet te jete ekzaktesisht 32 shkronja)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Kerkesa deshtoi me nje gabim te panjohur. "
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Operacioni u mbyll me sukses."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Kjo eshte hera e pare qe ju po persorni aMule %s"
+msgid "Request failed with the following error: %s"
+msgstr "Kerkesa deshtoi me kete gabim: %s"
 
-#: src/amule.cpp:1310
-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/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Filtrimi i IP per klientet eshte %s.\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "Fikur"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "Ndezur"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Filtrimi i IP per serverat eshte %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Niveli aktual i filtrimit te IP eshte %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
 msgstr ""
-"ne nuk japim siguri per te ai nuk do te thyej asgje,nuk do te djegi shtepine "
-"tuaj,\n"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+#: src/TextClient.cpp:699
+msgid "eD2k"
 msgstr ""
-"ose te vrasi qenin tuaj. Por ai *do te* behet i sigurte per tu perdorur.\n"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "I lidhur tek %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Tani po lidhem"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "firewalled"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
-msgstr "Opsionet ne vazhdim u ndryshuan ne kete version per aresye sigurie:\n"
+"\n"
+"Download:\t%s"
+msgstr ""
+"\n"
+"Shkarkim:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* U aktivizua protekoli per suportimin e Fshejes per lidhjet hyrese dhe "
-"dalese.\n"
+"Ngarkim:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* U c'aktivizua azhornimi i listes se serverave nga serverat dhe klientet e "
-"tjere.\n"
+"Kliente ne radhe:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Per me shume informacion ne lidhje me aresyet me keto ndryshime, kerko\n"
-"wiki-n e aMule-s tek http://wiki.amule.org per \"informacion\"per servera te "
-"rreme.\n"
-"Eshte e rendesishme qe ju te fshini cdo server te rreme nga lista juaj qe "
-"aMule te punoje rregullisht."
+"Burime Totale:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Numri i rezultateve te kerkimeve: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr ""
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Erdhi nje pergjigje e panjohur nga serveri, OpCode = %#x"
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Trego informacione mbi gjendjen."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Trego gjendjen e lidhjes, ngarkim/shkarkim shpejtesi aktuale, etj.\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Trego pemen e te gjitha statistikave."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Me deshire, nje numer nga 0-255 mund te dergohet si nje argument tek kjo\n"
+"komande, per te treguar se sa versione te tregoje ne nenpeme\n"
+". Asnje numer nuk tregon 'infinit'.\n"
+"Shembull: 'statitistics 5' do te tregoje vetem 5 versionet eme te perhapura "
+"per cdo lloj klienti.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr ""
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+
+#: src/TextClient.cpp:859
+#, fuzzy
+msgid "Reload the given object."
+msgstr "Ringarko objektet e dhena."
+
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
+msgstr "Ringarko listen e faileve te ndara."
+
+#: src/TextClient.cpp:862
+#, fuzzy
+msgid "Reload IP filtering table."
+msgstr "Ringarko tabelen e Filterit te Ip nga faili."
+
+#: src/TextClient.cpp:863
+#, fuzzy
+msgid "Reload current IP filtering table."
+msgstr "Zgjidh nivelin e filtrimit te IP."
+
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "Ringarko tabelen e Filterit te Ip nga faili."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr ""
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Lidhu me rrjetin."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"Kjo do te lidh ne te gjithe rrjetet qe jane te aktivizuara tek Preferencat.\n"
+"Ju gjithashtu mund te specifikoni adresen IP ne formen IP:Port, te nje "
+"serveri dhe\n"
+"te lidhesh vetem tek ai. Mund te perdoret nje adrese IPv4 ose nje emer i "
+"zgjidhshem DNS."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr ""
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Lidhu vetem tek Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Shkeputu nga rrjeti."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Kjo do te shkepusi aMulen nga te gjithe rrjetet qe eshte e lidhur.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr ""
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Shkeputu vetem nga Kad."
+
+#: src/TextClient.cpp:877
+#, fuzzy
+msgid "Add an eD2k or magnet link to core."
+msgstr "Shton nje link magnet ose ed2k tek Core."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Vendos nje vlere te preferuar."
+
+#: src/TextClient.cpp:883
+#, fuzzy
+msgid "Set IP filtering preferences."
+msgstr "Vendos preferimet per filtrin e IP."
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Ndize filtrin e IP si per kliente dhe per serverat."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Fike filterin e IP si per klientet si per serverat."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Aktivizo/C'aktivizo filtrimin e IP per klientat."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Ndiz filtrimin e IP per klientet."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Fike filtrimin e IP per klientet."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Aktivizo/C'aktivizo filtrimin e IP per serverat."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Ndize filtrimin e IP per serverat."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Fike filtrimin e IP per serverat."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Zgjidh nivelin e filtrimit te IP."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Me shume informacion,mbeshtetje dhe leshime te reja do ti gjeni tek faqet "
-"tona,\n"
+"Niveled e duhura per filtrimin jane nga 0-255, dhe eshte e dhene "
+"(fillimisht)\n"
+"vlera eshte 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Vendos kufijte e rrjetit."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "Vlera e dhene e ketyre komandave duhet te jete ne kilobytes/sec.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Vendos kufijte ngarkues te rrjetit."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Vendos kufijte shkarkues per rrjetin."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Merr dhe trego nje vlere te preferencave."
+
+#: src/TextClient.cpp:905
+#, fuzzy
+msgid "Get IP filtering preferences."
+msgstr "Merr preferencat e filtrit te IP."
+
+#: src/TextClient.cpp:906
+#, fuzzy
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Merr gjendjen e filterit te IP per klientet dhe per serverat."
+
+#: src/TextClient.cpp:907
+#, fuzzy
+msgid "Get IP filtering state for clients only."
+msgstr "Merr gjendjen e filterit te IP vetem per kliente."
+
+#: src/TextClient.cpp:908
+#, fuzzy
+msgid "Get IP filtering state for servers only."
+msgstr "Merr gjendjen e filterit IP vetem per servera."
+
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "Zgjidh nivelin e filtrimit te IP."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Merrni kufijte e bandwdith"
+
+#: src/TextClient.cpp:913
+#, fuzzy
+msgid "Execute a search."
+msgstr "Fillon nje kerkim Kad"
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"tek www.amule.org ose ne kanalin tone IRC #amule tek irc.freenode.net.\n"
+"Eshte e nevojshme te specifikohet tipi i kerkimit qe mund te jete:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Shembull: 'search kad file' do te filloje kerkimin per \"fail\".\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Raportoni cdo gabim tek http://forum.amule.org"
+#: src/TextClient.cpp:915
+#, fuzzy
+msgid "Execute a global search."
+msgstr "Fillon nje kerkim global."
+
+#: src/TextClient.cpp:916
+#, fuzzy
+msgid "Execute a local search"
+msgstr "Fillon nje kerkim lokal"
+
+#: src/TextClient.cpp:917
+#, fuzzy
+msgid "Execute a kad search"
+msgstr "Fillon nje kerkim Kad"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:919
+#, fuzzy
+msgid "Show the results of the last search."
+msgstr "Tregon rezultatet e kerkimit te fundit."
+
+#: src/TextClient.cpp:920
+#, fuzzy
+msgid "Return the results of the previous search.\n"
+msgstr "Rikthen rezultatet tek kerkimi i meparshem.\n"
+
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "Tregon ecurine e nje kerkimi."
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "Tregon ecurine e nje kerkimi.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Shkarko nje fail"
+
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"Kartela e faileve per Firmen Online qe ju specifikuat eshte e PAVLERE!\n"
-" Firma Online do te C'AKTIVIZOHET deri sa ju ta rregulloni tek Preferencat."
+"Duhet te jepet numri i nje faili nga kerkimi i fundit.\n"
+"Shembull: 'shkarkimi 12' do te filloje te shkarkoje failin me numer 12 te "
+"kerkimit te meparshem.\n"
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Pusho shkarkimin."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Rimerr shkarkimin."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Fshij shkarkimin."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Vendos prioritetin e shkarkimit."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
+"Vendos prioritetin e nje shkarkimi tek Ulet, Normale, Larte ose Auto,\n"
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "GABIM: nuk mund te hapet logfile"
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Vendos prioritetin tek Ulet,"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "KUJDES: faili i log-ve eshte bosh. Dicka nuk shkon."
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Vendos prioritetin tek Normale."
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Faili i Log eshte risetuar"
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Vendos prioritetin tek Larte."
 
-#: src/amule.cpp:1826
-#, c-format
-msgid "ServerMessage: %s"
-msgstr "Mesazhe nga Serveri: %s"
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Vendos prioritetin tek auto."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Deshtoi ne shkarkimin e listave nod."
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Trego radhet/listat."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Deshtoi te hapi failin per kontrollin e versionit qe sapo shkarkuat"
+#: src/TextClient.cpp:950
+#, fuzzy
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Tregon radhen e ngarkim/shkarkimit, listen e serverave ose listen e faileve "
+"te ndara.\n"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Fili per kontrollin e versionit eshte i demtuar"
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Trego radhen e ngarkimeve."
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Ju po perdorni nje version te vjeter te aMule!"
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Trego radhen e shkarkimeve."
 
-#: src/amule.cpp:1907
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Trego log."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Trego listen e serverave."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Fshi log-un"
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgid "Deprecated command, use '%s' instead."
 msgstr ""
-"Versioni juaj i amUle eshte %i.%i-%i dhe versioni i fundit eshte %li.%li.%li"
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Versioni i fundit mund te gjendet gjithmone tek http://www.amule.org"
-
-#: src/amule.cpp:1911
+#: src/TextClient.cpp:965
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
 msgstr ""
-"KUJDES: Versioni juaj i aMule-s eshte i vjeteruar: %i.%i-%i < %li.%li.%li"
+"Kjo eshte nje komande e pavlere dhe mund te largohet ne te ardhmen.\n"
+"Perdor '%s' ne vendin e saj.\n"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Kopja juaj e aMule eshte azhornuar."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Teksti i klientit aMule"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Deshtoi ne shkarkimin e failit per kontrollin e versionit"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Duke kembyer hashsetet e vjetra AICH ne '%s' 64b ne '%s'."
 
-#: src/amule.cpp:2025
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "Users: %s | Files: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
+"KUJDES: Emri i failit '%s' eshte i pavlere dhe eshte riemeruar ne '%s'."
 
-#: src/amule.cpp:2026
+#: src/ThreadTasks.cpp:454
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "KUJDES: Faili '%s' ekziston,faili i ri i riemertuar ne '%s'."
+
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
 msgstr ""
+"Jeni te sigurte qe deshironi te fshini te gjithe failet nga kjo kategori?"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Konfirmo kerkesen"
+
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
 msgstr ""
 
-#: src/amule.cpp:2102
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Shume lidhje"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Te gjithe te tjeret"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Zgjidh filtrin e shikimit"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Shto kategorine"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Redakto kategorine"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Zhvendos kategorine"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Connected to %s %s"
-msgstr "I lidhur tek %s %s"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Deshtoi te hapi failin (%s). duke hequr nga lista failet e ndara."
 
-#: src/amule.cpp:2105
+#: src/UploadClient.cpp:683
 #, c-format
-msgid "Connecting to %s"
-msgstr "Duke u lidhur tek %s"
+msgid "Hashset requested for unknown file: %s"
+msgstr "Kerkohet Hashset-i per failin e panjohur: %s"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
+msgstr "Rimarrja e ngarkimeve te failit: %s"
+
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Duke pezulluar ngarkimin e failit: %s"
+
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Deshtoi te ekzekutoje komanden `%s' ne `%s' ngjarjet."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Shkarkimi Perfundoi"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Path-i i plote per tek faili"
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Emri i failit pa perberesit e Path-it."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
 msgstr ""
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad filloi."
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Madhesia e failit ne bytes."
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad u ndalua."
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "KOha permbledhese e shkarkimeve."
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "I lidhur ne Kad (Ne rregull)"
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Sesion i ri chati filloi"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "I lidhur ne Kad (Me firewall)"
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Derguesi i mesazheve."
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "I shkeputur nga Kad"
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Jashte nga hapesira"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Particioni i diskut."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Gabim ne perfundim"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
+#, c-format
+msgid "Processing file number %u: %s"
+msgstr "Numeri i failit ne proces %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Ju kerkuat hashin e pjeseve (Vetem per failet e perdorur > 9.5 MB)"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
+#, c-format
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Fail qe nuk ekziston !\n"
 
-#: src/amule.cpp:2191
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Miresevini!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Parametrat e hyrjes"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Faili per ekzaminim"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Shtoni URLs opsionale per kete fail"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
 msgstr ""
-"Rrjeti Kad nuk mund te perdoret nqs porta UDP eshte c'aktivizuar tek "
-"Preferencat, nuk po filloj."
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Rrjeti Kad eshte c'aktivizuar tek Preferencat,nuk eshte duke u lidhur."
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Hiq"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Krijo lidhje me pjeset-hash"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Ndihmo te shperndash sa me shpejte failet e reja dhe te vyera, ne kembim te "
+"nje lidhjeje me te gjate"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "Hash MD4"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
 msgstr ""
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Shpeto"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Kopjo ne shenime"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Rreth aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Asgje per te kopjuar tani !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "E pamundur te hapet "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Ju lutem, futni nje emer faili jo boshe"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Asgje per te shpetuar tani !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Hashing..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr ""
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "i anulluar !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
+#, c-format
+msgid "Done in %.2f s"
+msgstr "I perfunduar ne %.2f s"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Ju e keni futur edhe me pare kete URL !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Ju lutem, futni nje URL jo boshe"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#, c-format
+msgid "Unable to open %s"
+msgstr "I paafte per te hapur %s"
+
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i dita(et) %i ora(et) %i min %i s"
+
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uo %02umin %02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02umin %02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02umin %02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
+
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, Statistikat Online te aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Shpejtesia maksimale e DL qe kur eshte aktive wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "Shpejtesia maksimale e DL ne aktivizimet e meparshme"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistem"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Ndalo Rifreskimin Automatik"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Shpeto imazhet e statistikave online"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Printo imazhet e statistikave online"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Rregullimet e preferencave"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Rreth wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Fillo Rifreskimin Automatik"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Rifreskimi Automatik u ndalua"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Rifreskimi Automatik filloi"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Shpeto imazhet e statistikave"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Statistikat Online te aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
+msgstr ""
+"Kishte nje problem duke printuar.\n"
+" Mos valle printeri juaj nuk eshte instaluar ne menyre korrekte?"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Duke printuar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, Statistikat e Firmes Online te aMule\n"
+"\n"
+"(c) 2004 The Polish <thepolish@vipmail.ru>\n"
+"\n"
+"Bazuar ne CAS nga Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Shperndare nga GPL"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh Oh, aMule nuk eshte duke punuar..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule eshte duke punuar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule eshte duke punuar,por e shkeputur"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule po lidhet..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh Oh, Statusi i aMule eshte i panjohur..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr "ka punuar per "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " ka ndaluar !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " nuk eshte lidhur !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " po lidhet..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " eshte duke bere dicka te cuditshme, kontrolloje !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " eshte lidhur me "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "Fikur"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr "  Eshte ndezur "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " me "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Shkarkimi Total: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Ngarkimi: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Sesioni i Shkarkimit: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Shkarkim: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Ngarkim: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Te ndara: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " faili(et), Klientet ne pritje: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Koha: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " Ndezur "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Ngarikimi mesatar i sistemit (1-5-15 minuta): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Uptime i Sistemit: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Direktoria permban failin amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Futni ketu direktorine se ku keni vendosur failin e amulesig.dat"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Intervali i rifreskimit ne sekonda"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Prodho nje imazh te statistikave ne c'do rifreskim ngjarje"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr ""
+"Futni ketu direktorine se ku deshironi te prodhoni nje imazh te statistikave"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Ngarko periodikisht imazhin tuaj te statistikave ne serverin FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "Url e FTP-se"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "Rruga e FTP-se"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Futni ketu URL e serverit tuaj FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr ""
+"Futni ketu direktorine e serverit FTP ne te cilen doni te kopjoni imazhin "
+"tuaj te statistikave"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Perdorues"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Futni ketu emrin e Perdoruesit per te hyre ne serverin FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Futni ketu fjalekalimin e Perdoruesit per te hyre ne serverin FTP"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Intervali i rifreskimit te FTP-se ne minuta"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Konvalido"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Kartela qe mban failoin e firmes"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Kartela ku prodhohet imazhi i statistikave"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Duke ngarkuar modelin <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
 msgstr ""
 
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "Porta UPnP"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Perdor kompresimin gzip "
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Lejo hyrjen e guest-ve"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Ndalo hyrjen e guest-ve"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr ""
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Rruga per konfigurimin e failit te aMule. MOS E PERDORNI DIREKT!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "C'aktivizo interpretuesin e PHP (nuk aprovohet)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Rimbush faqet PHP ne c'do kerkese"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Web Server i aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Kerkesa deshtoi me kete gabim: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Indeksi i failit nuk u gjet:  "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Sesioni mbaroi - kerkohet hyrja\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Sesioni ne rregull, u futet ne\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Sesioni ne rregul,nuk u futet ne\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Nuk ka sesion te hapur - kerkese per hyrje\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Sesioni u krijua - kerkohet hyrja\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Perpunim i kerkeses [origjinale]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Duke kerkuar fjalekalimin\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Hash-i i fjalekalimit nuk eshte i rregullt\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Fjalekalimi ne rregull\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Fjalekalim i gabuar\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Ju nuk futet asnje fjalekalim: Vendi bosh nuk lejohet.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Dalja e kerkuar\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Perpunimi i kerkeses [e ridrejtuar]: "
+
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Shqip"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Gjendja e shkarkimit"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Intervali i azhornimit : %d sekonde"
+#~ msgstr[1] "Intervali i azhornimit : %d sekonda"
+
+#~ msgid "Transferring"
+#~ msgstr "Duke transferuar"
+
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "QR: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "Ne radhe"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - tregon avancimin e kerkimit"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Duke filluar krijimin e MD4 dhe hash-it AICH per failin: %s"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Duke filluar krijimin e hash-it MD4 per failin: %s"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Duke filluar krijimin e hash-it AICH per failin: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr ""
+#~ "KUJDES: Nuk mund te zhvendosesh origjinalin '%s' mbas krijimit te backup-"
+#~ "it"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "KUJDES: Deshtoi ne fshirjen %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Gjykimi (total):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Kerko te transferosh pjese te plota per te gjithe ngarkimet"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Duke shkarkuar"
+
+#~ msgid "Transfers"
+#~ msgstr "Transferimet"
+
+#~ msgid "Unban"
+#~ msgstr "Hiqe nga Ban"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Trego Ngarkimet"
+
+#~ msgid "Show Queue"
+#~ msgstr "Trego radhen"
+
+#~ msgid "Select View"
+#~ msgstr "Zgjidh veshtrimin"
+
+#~ msgid "Client Software"
+#~ msgstr "Software i klientit"
+
+#~ msgid "Waited"
+#~ msgstr "I pritur"
+
+#~ msgid "Upload Time"
+#~ msgstr "Koha e ngarkimit"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Ngarkim/Shkarkim"
+
+#~ msgid "Remote Status"
+#~ msgstr "Gjendja e Remote"
+
+#~ msgid "File Priority"
+#~ msgstr "Perparesia e faileve"
+
+#~ msgid "Score"
+#~ msgstr "Piket"
+
+#~ msgid "Asked"
+#~ msgstr "E kerkuar"
+
+#~ msgid "Last Seen"
+#~ msgstr "Hera e fundit qe u pa"
+
+#~ msgid "Entered Queue"
+#~ msgstr "U shtua ne radhe"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Te ngarkuara"
+
+#~ msgid "Transferred Down"
+#~ msgstr "Te marra"
+
+#~ msgid "Userhash"
+#~ msgstr "Userhash"
+
+#~ msgid "Encrypted"
+#~ msgstr "E kriptuar"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Trego ngarkimin / Radha e ngarkimit"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Kliente ne radhe :"
+
+#~ msgid "Current Session"
+#~ msgstr "Sesioni Aktual"
+
+#~ msgid "Total"
+#~ msgstr "Totale"
+
+#~ msgid "Requested :"
+#~ msgstr "Te kerkuara :"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Dritarja e transferimeve te faileve"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Totali i Perdoruesve: %s | Totali i Faileve: %s"
+
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Shkarkimet (%i)"
+
+#, fuzzy
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr ""
+#~ "KUJDES: Nuk mund te zhvendosesh origjinalin '%s' mbas krijimit te backup-"
+#~ "it"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr ""
+#~ "CIP2Country::CIP2Country(): Deshtoi te ngarkoje te dhenat e vendit nga "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "Merr nivelin e Filterit te IP."
+
+#~ msgid "Makes a search."
+#~ msgstr "Ben nje kerkim"
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "E Deshtuar"
+
+#, fuzzy
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Fillo amuleweb sapo te nise programi"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Fike aMule."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Opsionet ne vazhdim u ndryshuan ne kete version per aresye sigurie:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* U aktivizua protekoli per suportimin e Fshejes per lidhjet hyrese dhe "
+#~ "dalese.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* U c'aktivizua azhornimi i listes se serverave nga serverat dhe klientet "
+#~ "e tjere.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Per me shume informacion ne lidhje me aresyet me keto ndryshime, kerko\n"
+#~ "wiki-n e aMule-s tek http://wiki.amule.org per \"informacion\"per servera "
+#~ "te rreme.\n"
+#~ "Eshte e rendesishme qe ju te fshini cdo server te rreme nga lista juaj qe "
+#~ "aMule te punoje rregullisht."
+
 #~ msgid "Fetching status..."
 #~ msgstr "Duke verifikuar gjendjen..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Perdoruesit: E: %s K: %s | Failet E: %s K: %s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Klienti %s ne porten IP: %s:%d po perdor %s %s %s"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() na solli NULL"
 
+#~ msgid "Firewalled"
+#~ msgstr "Me firewall"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "Te ngarkuar %d flag bitmap."
+#~ msgstr[1] "Te ngarkuar %d flag bitmaps."
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr ""
+#~ "Faili %s eshte shume i madh per rrjetin eDonkey: maksimumi i lejuar eshte "
+#~ "4 GB."
+
+#~ msgid "No handler for this file type."
+#~ msgstr "Nuk ka program per hapjen e ketij lloji."
+
+#~ msgid "File was not saved"
+#~ msgstr "Faili nuk u shpetua"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr "Lidhja Deshtoi.E pamundur te lidhem ne ate host\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "Filtrimi i mesazheve"
 
@@ -7231,16 +7803,124 @@
 #~ msgid "Core Tweaks"
 #~ msgstr "Core Tweaks"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Nuk ka program per hapjen e ketij lloji."
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "Vonesa e sugjerimeve ne sekonda"
 
-#~ msgid "File was not saved"
-#~ msgstr "Faili nuk u shpetua"
+#~ msgid "Show part file number before file name"
+#~ msgstr "Trego numrin partfile me pare se emrin e failit"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgid "Skin Support"
+#~ msgstr "Perkrahja Skin"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- nuk ka skin te disponueshem -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "Direktoria e Firmes Online:"
+
+#~ msgid "Filtering Options:"
+#~ msgstr "Opsionet e filtrimit:"
+
+#~ msgid "Line Capacities"
+#~ msgstr "Kapaciteti i Linjes"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
 #~ msgstr ""
-#~ "Faili %s eshte shume i madh per rrjetin eDonkey: maksimumi i lejuar eshte "
-#~ "4 GB."
+#~ "Shenim: Keto vlera jane\n"
+#~ " vetem per statistika"
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "Porta standarte TCP e klientit:"
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "Porta e avancuar e klientit UDP:"
+
+#~ msgid "Bind Address"
+#~ msgstr "Bind Adress"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "Porta UDP per kerkesat e zgjeruara te serverit (TCP+3): 4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "Burimet maksimale per failet"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "Plug and Play Universale"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "Aktivizo UPnp"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "Porta TCP per UPnP:"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "Fillo failin tjeter qe keni ne pritje kur nje fail te kompletohet"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "Zgjidh ngjyrat e statistikave"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "Avancimi i faileve ne radhe per shkarkim"
+
+#~ msgid "Show percentage"
+#~ msgstr "Trego perqindjen"
+
+#~ msgid "Show progressbar "
+#~ msgstr "Trego Progressbar "
+
+#~ msgid "Enable skin support "
+#~ msgstr "Aktivizo perkrahjen e skin-ve"
+
+#~ msgid "Skin:"
+#~ msgstr "Skin:"
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "Rreshtim automatik i faileve ne radhen e shkarkimeve (CPU i larte)"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "IP-ja e nderfaqes se degjimit\n"
+#~ "(ose bosh per cdo IP)"
+
+#~ msgid "TCP port"
+#~ msgstr "Porta TCP"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "Kush mund te shikoje failet e ndara:"
+
+#~ msgid "Event types"
+#~ msgstr "Tipet e ngjarjeve"
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "Bej qe aMule te kerkoje perpara daljes."
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "Trego Overhead-in e bandes"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "I.C.H. aktive"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "AICH i beson kujtdo hashi (nuk rekomandohet)"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "Rregullime te Avancuara"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "Stili Progressbar"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Rreshtimi i Kollonave"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "Tweaks Gui te ndryshem"
+
+#~ msgid "File Options"
+#~ msgstr "Opsionet e faileve"
 
 #~ msgid "Status text"
 #~ msgstr "Teksti i statusit"
@@ -7248,18 +7928,130 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "Teksti i gjendjes se pop-up"
 
-#~ msgid "Please wait... "
-#~ msgstr "Ju lutem prisni... "
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Te gjitha platformat p2p te bazuara ne eMule \n"
+#~ "\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr " Websajti: http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr " Forumi: http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ "FAQ: http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " Kontakt: admin@amule.org (pyetje administrative) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ "Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr "Pjesa e aMule bazohet ne \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " Copyright (C) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http:/kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "Per nje film ju mund te tregoni gjatesine e tij, historine e tij, "
+#~ "gjuhen ...\n"
+#~ "dhe nese eshte falso, ju mund ta tregoni ate per perdoruesit e tjere te "
+#~ "aMule."
+
+#~ msgid "Misc Options"
+#~ msgstr "Opsione te ndryshme"
+
+#~ msgid "Server Options"
+#~ msgstr "Opsionet e Serverit"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "Trego motd e serverit kur jeni te lidhur ..."
+
+#~ msgid "Disable/Enable"
+#~ msgstr "C'aktivizo/Aktivizo"
+
+#~ msgid "Authentication"
+#~ msgstr "Njohja"
 
 #~ msgid "General Settings"
 #~ msgstr "Rregullimet e pergjithshme"
 
+#~ msgid "Max Connections"
+#~ msgstr "Lidhje Maksimale"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "GUI Tweaks"
 
 #~ msgid "Remote Control"
 #~ msgstr "Kontrolli i Remote"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "E pamundur te percaktoj shfletuesin e zgjedhur!"
+
+#~ msgid "User Defined"
+#~ msgstr "Te percaktuara nga perdoruesi"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - Gomari i Linux "
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "Zgjidhni shfletuesin tuaj ketu"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "Shfletuesi(browser) i zakonshem"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "Futni emrin e shfletuesit(browser) tuaj ketu. Per te perdorur nje "
+#~ "shfletues tjeter zgjidh shfletues te zakonshemr nga tendina poshte."
+
+#~ msgid "Please wait... "
+#~ msgstr "Ju lutem prisni... "
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "Nuk eshte e mundur qe te gjej komanden per te filluar shfletuesin."
 
@@ -7272,9 +8064,6 @@
 #~ msgid "ExternalConn: Access denied"
 #~ msgstr "Lidhje e jashtme: Hyrja nuk lejohet"
 
-#~ msgid "ExternalConn: Bad reply from server. Connection closed."
-#~ msgstr "Lidje e jashtme: Pergjigje e keqe nga serveri. Lidhja u mbyll."
-
 #~ msgid "The ed2k hash of the file."
 #~ msgstr "Hash-i ed2k i failit"
 
@@ -7376,18 +8165,12 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "Kopjo linket ED2k ne shenime"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "Gabim Fatal: Deshtoi te krijoje Timerin"
-
 #~ msgid "ED2K: Connecting"
 #~ msgstr "ED2K: Po lidhet"
 
 #~ msgid "ED2K: Disconnected"
 #~ msgstr "ED2K: E shkeputur"
 
-#~ msgid "Warning: Unable to open skin file '%s' for read"
-#~ msgstr "Kujdes: E pamundur te lexohet skin nga faili '%s'"
-
 #~ msgid "ed2k network"
 #~ msgstr "Rrjeti ed2k"
 
@@ -7487,11 +8270,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "Gabim:versioni i failit part.met eshte i pavlere: %s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr ""
-#~ "Gabim: %s (%s) eshte e pavlere (tagcount i gabuar), e pamundur te ngarkoj "
-#~ "failin."
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "Kujdes: %s mund te jete e prishur (%i)"
 
@@ -7516,14 +8294,6 @@
 #~ msgid "Insufficient Diskspace"
 #~ msgstr "Nuk ka hapesire te mjaftueshme ne Disk"
 
-#~ msgid "Warning: known.met cannot be opened."
-#~ msgstr "Kujdes: known.met nuk mund te hapet."
-
-#~ msgid "Warning: Knownfile list corrupted, contains invalid header."
-#~ msgstr ""
-#~ "Kujdes: Lista e faileve te njohur eshte e demtuar, permban nje header te "
-#~ "pavlere."
-
 #~ msgid "ERROR! Attempted to share %s"
 #~ msgstr "GABIM! Tentative per te ndare %s"
 
@@ -7553,9 +8323,6 @@
 #~ msgid "Bandwidth Limits: Up: %u kB/s, Down: %u kB/s.\n"
 #~ msgstr "Kufijte e rrjetit: Up: %u kB/s, Down: %u kB/s.\n"
 
-#~ msgid "Shutdown aMule."
-#~ msgstr "Fike aMule."
-
 #~ msgid ""
 #~ "Shutdown the remote running core (amule/amuled).\n"
 #~ "This will also shut down the text client, since it is unusable without a\n"
@@ -7572,9 +8339,6 @@
 #~ msgid "Disconnect from ED2K only."
 #~ msgstr "Shkeputu vetem nga ED2K."
 
-#~ msgid "Adds an ed2k or magnet link to core."
-#~ msgstr "Shton nje link magnet ose ed2k tek Core."
-
 #~ msgid ""
 #~ "The ed2k link to be added can be:\n"
 #~ "*) a file link (ed2k://|file|...), it will be added to the download "
@@ -7707,9 +8471,6 @@
 #~ msgid "Manual Server Add : Name"
 #~ msgstr "Shtimi manual i Serverit : Emri"
 
-#~ msgid "No One"
-#~ msgstr "Asnjeri"
-
 #~ msgid "Speed Limits:"
 #~ msgstr "Kufijte e shpejtesise:"

aMule-2.2.6.tar.bz2/po/sv.po -> aMule-2.3.1.tar.bz2/po/sv.po Changed

@@ -1,5 +1,4 @@
 # Swedish tranlation for aMule
-# Copyright (C) 2007 Free Software Foundation, Inc.
 # This file is distributed under the same license as the amule package.
 # Daniel Nylander <po@danielnylander.se>, 2007.
 #
@@ -7,1276 +6,1097 @@
 msgstr ""
 "Project-Id-Version: aMule\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
 "PO-Revision-Date: 2007-03-12 22:49+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr ""
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Lägg till en vän"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr ""
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Du måste ange en giltig IP-adress och port!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr ""
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Information"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr ""
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Angiven userhash är inte giltig!"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr ""
+#: src/amuleAppCommon.cpp:128
+#, fuzzy
+msgid "Failed to open ED2KLinks file."
+msgstr "Kunde inte öppna skalfil: %s"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
 msgstr ""
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
+#: src/amule.cpp:239
+#, fuzzy
+msgid "Now, exiting main app..."
 msgstr ""
+"\n"
+"Ok, avslutar %s...\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Lyckades! Anslutning etablerad till aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Lyckades! Anslutning etablerad."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
+#: src/amule.cpp:258
+#, c-format
+msgid "Terminating amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
+#: src/amule.cpp:261
+#, c-format
+msgid "Killing amuleweb instance with pid '%ld' ... "
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Färdig"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Pausad"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Misslyckades"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
 msgstr ""
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Hämtar"
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Väntar"
+#: src/amule.cpp:335
+#, fuzzy
+msgid "aMule shutdown completed."
+msgstr "aMule är inte ansluten!"
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
 msgstr ""
 
-#: src/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr ""
+#: src/amule.cpp:435
+#, fuzzy
+msgid ""
+"\n"
+"EC configuration"
+msgstr "Bekräfta avslutning"
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr ""
+#: src/amule.cpp:438
+#, fuzzy
+msgid "Password set and external connections enabled."
+msgstr "Acceptera externa anslutningar"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr ""
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "VARNING"
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+#: src/amule.cpp:495
+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/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr ""
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Info"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
 msgstr ""
+"Du har inga servrar i serverlistan.\n"
+"Vill du att aMule ska hämta en ny lista nu?"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "VARNING: Misslyckades med att ta bort %s"
+#: src/amule.cpp:581
+#, fuzzy
+msgid "Server list download"
+msgstr "Serverlista"
 
-#: src/BaseClient.cpp:1307
+#: src/amule.cpp:654
 #, c-format
-msgid "Failed to retrieve shared files from user '%s'"
+msgid "web server running on pid %d"
 msgstr ""
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Okänd"
-
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Fake eMule version %#x)"
-
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Fake eMule)"
-
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Fake eMule)"
-
-#: src/BaseClient.cpp:1790
-#, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (baserad på eMule v0.%u)"
-
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Smeknamn: %s ID: %u"
+#: src/amule.cpp:658
+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/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
 msgstr ""
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Could not bind ports to the specified address: %s"
+msgstr ""
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr ""
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Port %u är inte tillgänglig. Du kommer att bli LOWID\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
 msgstr ""
 
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Användarnamn"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Vänner"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Visa &detaljer"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Lägg till en vän"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Ta bort vän"
-
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "Skicka &meddelande"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Misslyckades med att skapa OnlineSig File"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Visa filer"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Misslyckades med att skapa aMule OnlineSig File"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
 msgstr ""
 
-#: src/FriendListCtrl.cpp:273
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Är du säker på att du vill ta bort alla servrar?"
-
-#: src/FriendListCtrl.cpp:275
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Är du säker på att du vill ta bort alla servrar?"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "Det här är första gången som du kör aMule %s"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Avbryt"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Den här versionen är en testversion, uppdaterad dagligen, och\n"
 
-#: src/FriendListCtrl.cpp:359
-msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
 msgstr ""
+"vi ger ingen garanti, den kommer inte att förstöra någonting, bränna,\n"
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr ""
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "när ditt hus eller döda din hund. Men den *bör* vara användbar ändå.\n"
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr ""
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr "Mer information, support och nya utgåvor kan hittas på vår,\n"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
 msgstr ""
+"webbplats, www.aMule.org, eller i vår IRC-kanal #aMule på irc.freenode.net.\n"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr ""
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Rapportera gärna eventuella fel på http://forum.amule.org"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
 msgstr ""
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
 msgstr ""
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr ""
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "FEL: kan inte öppna loggfilen"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr ""
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "VARNING: loggfilen är tom. Någonting är fel."
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr ""
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Loggen har nollställts"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr ""
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Servermeddelande: %s"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Filnamn"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Misslyckades med att hämta nodlistan."
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Storlek"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Misslyckades med att öppna den hämtade versionskontrollfilen"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Typ"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Skadad versionskontrollfil"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Prioritet"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Du använder en utdaterad version av aMule!"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
 msgstr ""
+"Din version av aMule är %i.%i.%i och den senaste versionen är %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr ""
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Den senaste versionen kan alltid hittas på http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr ""
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "VARNING: Din version av aMuled är utdaterad: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr ""
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Din kopia av aMule är uppdaterad."
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Utdelningsratio"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Misslyckades med att hämta versionskontrollfilen"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Utdelade filer"
-
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Mycket låg"
-
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Låg"
-
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normal"
-
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Hög"
-
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Mycket hög"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "med LowID"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Utgåva"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "med HighID"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Auto"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Ansluten till %s %s"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr ""
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Ansluter till %s"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Byt namn"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad startad."
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr ""
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad stoppad."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr ""
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Ansluten till Kad (ok)"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr ""
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Ansluten till Kad (brandvägg)"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr ""
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Frånkopplad från Kad"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
 msgstr ""
 
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "VARNING"
-
-#: src/SharedFilesCtrl.cpp:451
+#: src/amuled.cpp:711
 #, c-format
-msgid "Shared Files (%i)"
-msgstr "Utdelade filer (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr ""
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Ange nytt namn för den här filen:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr ""
+msgid "ERROR: %s"
+msgstr "FEL: %s"
 
-#: src/UploadQueue.cpp:511
+#: src/amuleDlg.cpp:238
 #, c-format
-msgid "Resuming uploads of file: %s"
-msgstr ""
+msgid "This is aMule %s based on eMule."
+msgstr "Det här är aMule %s baserad på eMule."
 
-#: src/UploadQueue.cpp:520
+#: src/amuleDlg.cpp:240
 #, c-format
-msgid "Suspending upload of file: %s"
-msgstr ""
+msgid "Running on %s"
+msgstr "Kör på %s"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
 msgstr ""
+"Besök http://www.amule.org för att se om en ny version finns tillgänglig."
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
 msgstr ""
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Kontrollerar lösenord\n"
-
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr ""
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Meddelande"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr ""
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Ansluter"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
 msgstr ""
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr ""
+#: src/amuleDlg.cpp:715
+#, fuzzy
+msgid "Kad: Firewalled"
+msgstr "brandvägg"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr ""
+#: src/amuleDlg.cpp:719
+#, fuzzy
+msgid "Kad: Connected"
+msgstr "Ansluten"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr ""
+#: src/amuleDlg.cpp:724
+#, fuzzy
+msgid "Kad: Connecting"
+msgstr "Ansluter"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr ""
+#: src/amuleDlg.cpp:728
+#, fuzzy
+msgid "Kad: Off"
+msgstr " Kad: "
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP-port"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Använd gzip-komprimering"
+#: src/amuleDlg.cpp:775
+#, fuzzy
+msgid "Stop the current connection attempts"
+msgstr "Stoppar de aktuella anslutningsförsöken"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr ""
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Koppla från"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr ""
+#: src/amuleDlg.cpp:781
+#, fuzzy
+msgid "Disconnect from the currently connected networks"
+msgstr "Koppla från nätverket."
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr ""
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Anslut"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr ""
+#: src/amuleDlg.cpp:787
+#, fuzzy
+msgid "Connect to the currently enabled networks"
+msgstr "Anslut till nätverket."
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr ""
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Upp: %.1f(%.1f) | Ner: %.1f(%.1f)"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr ""
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Upp: %.1f | Ner: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr ""
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Ansluten)"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr ""
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Frånkopplad)"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr ""
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Vill du verkligen avsluta aMule?"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Inte tillgänglig"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Bekräfta avslutning"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Aldrig"
+#: src/amuleDlg.cpp:1173
+#, fuzzy
+msgid "Launch Command: "
+msgstr "Kommando: %s"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Hämtar..."
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr ""
 
-#: src/HTTPDownload.cpp:75
+#: src/amuleDlg.cpp:1232
 #, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+msgid "Skin directory '%s' does not exist"
+msgstr ""
 
-#: src/HTTPDownload.cpp:239
+#: src/amuleDlg.cpp:1237
 #, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
+msgid "WARNING: Unable to open skin file '%s' for read"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "Inställningar"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Nätverk"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Bläddra"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Sökningar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr ""
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Hämtningar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr ""
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Hämtar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr ""
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Meddelanden"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr ""
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Statistik"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Användare"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Lösenord"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "Inställningar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr ""
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Importera"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Validera"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Om"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr ""
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Om/Hjälp"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
 msgstr ""
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
-#, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Välkommen!"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
 msgid "aMule"
 msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr ""
-
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Nollställ"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "System"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr ""
+#: src/amule-remote-gui.cpp:294
+#, fuzzy
+msgid "Connecting..."
+msgstr "Ansluter"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Om wxCas"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Anslutningen misslyckades "
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
-
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr ""
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Alla"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Oh Oh, aMule kör inte..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule kör"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule kör men är frånkopplad"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule ansluter..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Oh oh, status för aMule är okänd..."
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Okänd"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " har kört i "
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " är stoppad !"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Fake eMule version %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " är inte ansluten!"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Fake eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " ansluter..."
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Fake eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " gör någonting konstigt, kontrollera det!"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (baserad på eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " är ansluten till "
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Smeknamn: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "brandvägg"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "av"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " är på "
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Meddelande filtrerat från \"%s\" (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-#, fuzzy
-msgid " with "
-msgstr "] med "
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Nytt meddelande från \"%s\" (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
+#: src/BaseClient.cpp:2899
+#, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-#, fuzzy
-msgid " kB/s"
-msgstr "kB/s"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
 msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr ""
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Kategori"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr ""
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Ny kategori"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Välj en mapp för inkommande filer"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr ""
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Du måste ange ett namn för kategorin!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr ""
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Du måste ange en sökväg för kategorin!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
+#: src/ChatSelector.cpp:129
 #, c-format
-msgid "%02uD %02uh %02umin %02us"
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Ansluten till klient ***"
+
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Ansluter till klient ***"
+
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
-#, c-format
-msgid "%02us"
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LowID"
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Stäng flik"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Inte ansluten"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Stäng alla flikar"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Stäng andra flikar"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Lägg till i vänner"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientCreditsList.cpp:158
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientCreditsList.cpp:161
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
-#, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr ""
 
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-#, fuzzy
-msgid "Cancelled !"
-msgstr "Avbruten!"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Klientdetaljer"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
-#, c-format
-msgid "Unable to open %s"
-msgstr "Kunde inte öppna %s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LowID"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr ""
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Lägg till"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Ansluten"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Ta bort"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Frånkopplad"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Töm"
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr ""
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Inte färdig"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr ""
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Verifierad - OK"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr ""
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Inte tillgänglig"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
+#: src/ClientTCPSocket.cpp:844
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
+#: src/ClientTCPSocket.cpp:865
+#, c-format
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Spara"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Kopiera till urklipp"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Avsluta"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-#, fuzzy
-msgid "Open"
-msgstr "Opera"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
+#: src/ClientTCPSocket.cpp:897
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopiera"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-#, fuzzy
-msgid "Save as"
-msgstr "Spara"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
+#: src/ClientTCPSocket.cpp:928
+#, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Om"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Om aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
+#: src/ClientTCPSocket.cpp:933
+#, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-#, fuzzy
-msgid "Can't open the clipboard"
-msgstr "Kopiera till urklipp"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Kunde inte öppna"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
+#: src/ClientTCPSocket.cpp:982
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Hashar..."
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
 msgstr ""
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr ""
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Filkommentarer"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr ""
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Användarnamn"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "Klar om %.2f s"
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Filnamn"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr ""
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Rankning"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr ""
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Kommentar"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
-#, c-format
-msgid "Processing file number %u: %s"
-msgstr ""
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Inga kommentarer"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr ""
+#: src/CommentDialogLst.cpp:105
+#, fuzzy, c-format
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%s kommentar(er)"
+msgstr[1] "%s kommentar(er)"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr ""
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
 
 #: src/DataToText.cpp:37
@@ -1291,31 +1111,57 @@
 msgid "Auto [Hi]"
 msgstr "Auto [Hö]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Ansluter"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Mycket låg"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Låg"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normal"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Hög"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Mycket hög"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Utgåva"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr ""
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Ansluter via server"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr ""
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr ""
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Överför"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Hämtar"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1341,8 +1187,7 @@
 msgid "Too many Kad connections"
 msgstr "För många Kad-anslutningar"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Bannlyst"
 
@@ -1374,8 +1219,8 @@
 msgid "Remote Server"
 msgstr "Fjärrserver"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1396,12 +1241,11 @@
 msgstr ""
 
 #: src/DataToText.cpp:135
-#, fuzzy
 msgid "Search Result"
-msgstr "Sökningar"
+msgstr ""
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Färdig"
 
@@ -1425,7 +1269,7 @@
 msgid "ERROR: Failed!"
 msgstr ""
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr ""
 
@@ -1437,5556 +1281,6168 @@
 msgid "Unknown or bad tempfile format."
 msgstr ""
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Systemets standard"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
 msgstr ""
 
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arabiska"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Storlek"
 
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "Estniska"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Överfört"
 
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Basiska"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Hastighet"
 
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgariska"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Förlopp"
 
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Katalanska"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Källor"
 
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Kinesiska (Förenklad)"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Prioritet"
 
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Kinesiska (Traditionell)"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Status"
 
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Kroatiska"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr ""
 
-#: src/Preferences.cpp:638
-msgid "Czech"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
 msgstr ""
 
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Danska"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr ""
 
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Nederländska"
+#: src/DownloadListCtrl.cpp:411
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Är du säker på att du vill ta bort alla servrar?"
 
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Engelska (Storbritannien)"
+#: src/DownloadListCtrl.cpp:413
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Är du säker på att du vill ta bort alla servrar?"
 
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estniska"
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
+#, c-format
+msgid ""
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
 
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Finska"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Auto"
 
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Franska"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Stoppa"
 
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galiciska"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Pausa"
 
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Tyska"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Fortsätt"
 
-#: src/Preferences.cpp:647
-msgid "Greek"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
 msgstr ""
 
-#: src/Preferences.cpp:648
-msgid "Hebrew"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
 msgstr ""
 
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Ungerska"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Italienska"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Italienska (Schweiz)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
 msgstr ""
 
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Koreanska"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
 msgstr ""
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
 msgstr ""
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Polska"
-
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portugisiska"
-
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portugisiska (Brasilien)"
-
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Ryska"
-
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Slovenska"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Förhandsgranska"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Spanska"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Visa fil&detaljer"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr ""
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Visa alla kommentarer"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
 msgstr ""
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
 msgstr ""
 
-#: src/Preferences.cpp:1681
-#, c-format
-msgid "Default port will be used (%d)"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Servernamn"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adress"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Beskrivning"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Användare"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "&Öppna filen"
 
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Filer"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Ange nytt namn för den här filen:"
 
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Misslyckades"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Statisk"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H.%M.%S"
 
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Version"
+#: src/DownloadListCtrl.cpp:1268
+#, c-format
+msgid "Downloads (%i)"
+msgstr "Hämtningar (%i)"
 
-#: src/ServerListCtrl.cpp:144
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Info"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Okänt namn)"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:149
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "Are you sure you want to delete the static server %s"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Ja"
+#: src/DownloadQueue.cpp:103
+#, c-format
+msgid "Saving PartFile %u of %u"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Nej"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:346
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Failed to open '%s'"
-msgstr "Misslyckades med att öppna \"%s\""
+msgid "Loading temp files from %s."
+msgstr ""
 
-#: src/ServerListCtrl.cpp:369
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "Servers (%i)"
-msgstr "Servrar (%i)"
-
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Server"
-
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Anslut till server"
-
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
+msgid "Loading PartFile %u of %u"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
+#: src/DownloadQueue.cpp:154
+msgid ""
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
 msgstr ""
 
-#: src/ServerListCtrl.cpp:438
-#, fuzzy
-msgid "Remove server"
-msgstr "Ta bort servrar"
-
-#: src/ServerListCtrl.cpp:440
-#, fuzzy
-msgid "Remove servers"
-msgstr "Ta bort servrar"
-
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Ta bort alla servrar"
+#: src/DownloadQueue.cpp:168
+#, c-format
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
 msgstr ""
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Återanslut till server"
-
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Är du säker på att du vill ta bort alla servrar?"
+#: src/DownloadQueue.cpp:374
+#, c-format
+msgid "Downloading %s"
+msgstr "Hämtar %s"
 
-#: src/ServerListCtrl.cpp:570
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Är du säker på att du vill ta bort alla servrar?"
+#: src/DownloadQueue.cpp:382
+#, c-format
+msgid "You are already trying to download the file '%s'"
+msgstr ""
 
-#: src/ServerListCtrl.cpp:572
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Är du säker på att du vill ta bort alla servrar?"
+#: src/DownloadQueue.cpp:394
+#, c-format
+msgid "You already have the file '%s'"
+msgstr "Du har redan filen \"%s\""
 
-#: src/OScopeCtrl.cpp:242
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "Disabled [%s]"
-msgstr "Inaktiverad [%s]"
+msgid "You are already trying to download the file %s"
+msgstr ""
 
-#: src/amuleDlg.cpp:210
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Det här är aMule %s baserad på eMule."
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr ""
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Running on %s"
-msgstr "Kör på %s"
+msgid "Unknown protocol of link: %s"
+msgstr ""
 
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
+#: src/DownloadQueue.cpp:1430
+#, c-format
+msgid "Invalid eD2k link! ERROR: %s"
 msgstr ""
-"Besök http://www.amule.org för att se om en ny version finns tillgänglig."
 
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
 msgstr ""
 
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
+#: src/ExternalConn.cpp:278
+msgid "External connection closed."
 msgstr ""
 
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
+#: src/ExternalConn.cpp:317
+msgid "External connections disabled due to empty password!"
 msgstr ""
 
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
+#: src/ExternalConn.cpp:340
+msgid "External connections disabled in config file"
 msgstr ""
 
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
+#: src/ExternalConn.cpp:400
+msgid "New external connection accepted"
 msgstr ""
 
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
+#: src/ExternalConn.cpp:403
+msgid "ERROR: couldn't accept a new external connection"
 msgstr ""
 
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
+#: src/ExternalConn.cpp:421
+msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
+#: src/ExternalConn.cpp:430
+#, c-format
+msgid "Connecting client: %s %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:469
+#: src/ExternalConn.cpp:432
+msgid "Unknown version"
+msgstr "Okänd version"
+
+#: src/ExternalConn.cpp:442
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"Incorrect EC version ID, there might be binary incompatibility. Use core and "
+"remote from same snapshot."
 msgstr ""
 
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
+#: src/ExternalConn.cpp:447
+msgid ""
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+#: src/ExternalConn.cpp:475
+msgid "Invalid protocol version."
 msgstr ""
 
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#: src/ExternalConn.cpp:480
+msgid "Missing protocol version tag."
 msgstr ""
 
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
 msgstr ""
 
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Meddelande"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
 msgstr ""
 
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
 msgstr ""
 
-#: src/amuleDlg.cpp:692
-#, fuzzy
-msgid "Kad: Firewalled"
-msgstr "brandvägg"
-
-#: src/amuleDlg.cpp:696
-#, fuzzy
-msgid "Kad: Connected"
-msgstr "Ansluten"
-
-#: src/amuleDlg.cpp:701
-#, fuzzy
-msgid "Kad: Connecting"
-msgstr "Ansluter"
-
-#: src/amuleDlg.cpp:705
-#, fuzzy
-msgid "Kad: Off"
-msgstr " Kad: "
-
-#: src/amuleDlg.cpp:752
-#, fuzzy
-msgid "Stop the current connection attempts"
-msgstr "Stoppar de aktuella anslutningsförsöken"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Koppla från"
-
-#: src/amuleDlg.cpp:758
-#, fuzzy
-msgid "Disconnect from the currently connected networks"
-msgstr "Koppla från nätverket."
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Anslut"
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
+msgstr ""
 
-#: src/amuleDlg.cpp:764
-#, fuzzy
-msgid "Connect to the currently enabled networks"
-msgstr "Anslut till nätverket."
+#: src/ExternalConn.cpp:521
+msgid "Access granted."
+msgstr ""
 
-#: src/amuleDlg.cpp:810
+#: src/ExternalConn.cpp:529
 #, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Upp: %.1f(%.1f) | Ner: %.1f(%.1f)"
+msgid "Sent error message \"%s\" to client."
+msgstr ""
 
-#: src/amuleDlg.cpp:812
+#: src/ExternalConn.cpp:534
 #, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Upp: %.1f | Ner: %.1f"
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr ""
 
-#: src/amuleDlg.cpp:834
+#: src/ExternalConn.cpp:799
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Ansluten)"
+msgid "Remote PartFile command failed: FileHash not found: %s"
+msgstr ""
 
-#: src/amuleDlg.cpp:836
+#: src/ExternalConn.cpp:801
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Frånkopplad)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Vill du verkligen avsluta aMule?"
+msgid "FileHash not found: %s"
+msgstr ""
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Bekräfta avslutning"
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
+msgid "OOPS! OpCode processing error!"
+msgstr ""
 
-#: src/amuleDlg.cpp:1182
-#, c-format
-msgid "Skin directory '%s' does not exist"
+#: src/ExternalConn.cpp:876
+msgid "Server not added"
 msgstr ""
 
-#: src/amuleDlg.cpp:1187
+#: src/ExternalConn.cpp:894
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
+msgid "server not found: %s"
 msgstr ""
 
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Nätverk"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
+#: src/ExternalConn.cpp:910
+msgid "need to define server to be removed"
 msgstr ""
 
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Sökningar"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
+#: src/ExternalConn.cpp:924
+msgid "eD2k is disabled in preferences."
 msgstr ""
 
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Överföringar"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
+#: src/ExternalConn.cpp:1102
+msgid "Search in progress. Refetch results in a moment!"
 msgstr ""
 
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
+#: src/ExternalConn.cpp:1108
+msgid "WebSearch from remote interface makes no sense."
 msgstr ""
 
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
+#: src/ExternalConn.cpp:1306
+msgid "No points for graph."
 msgstr ""
 
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Meddelanden"
+#: src/ExternalConn.cpp:1315
+msgid "Your client is not configured for this detail level."
+msgstr ""
 
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
+#: src/ExternalConn.cpp:1342
+msgid "External Connection: shutdown requested"
 msgstr ""
 
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Statistik"
+#: src/ExternalConn.cpp:1354
+msgid "Already shutting down."
+msgstr ""
 
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
+#: src/ExternalConn.cpp:1366
+#, c-format
+msgid "ExternalConn: adding link '%s'."
 msgstr ""
 
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
+#: src/ExternalConn.cpp:1372
+msgid "Invalid link or already on list."
 msgstr ""
 
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Importera"
+#: src/ExternalConn.cpp:1442
+msgid "File not found."
+msgstr "Filen hittades inte."
 
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr ""
+#: src/ExternalConn.cpp:1447
+msgid "Invalid file name."
+msgstr "Ogiltigt filnamn."
 
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Om/Hjälp"
+#: src/ExternalConn.cpp:1455
+msgid "Unable to rename file."
+msgstr "Kunde inte byta namn på fil."
 
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
 msgstr ""
 
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
+#: src/ExternalConn.cpp:1790
+msgid "Already connected to eD2k."
 msgstr ""
 
-#: src/amuleDlg.cpp:1468
-msgid "No network"
+#: src/ExternalConn.cpp:1793
+msgid "Connecting to eD2k..."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Allmänt"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Anslutning"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Kataloger"
+#: src/ExternalConn.cpp:1801
+msgid "Already connected to Kad."
+msgstr "Redan ansluten till Kad."
 
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Servrar"
+#: src/ExternalConn.cpp:1804
+msgid "Connecting to Kad..."
+msgstr "Ansluter till Kad..."
 
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Säkerhet"
+#: src/ExternalConn.cpp:1811
+msgid "All networks are disabled."
+msgstr "Alla nätverk är inaktiverade."
 
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
+#: src/ExternalConn.cpp:1819
+msgid "Disconnected from eD2k."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Proxy"
+#: src/ExternalConn.cpp:1823
+msgid "Disconnected from Kad."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:177
-#, fuzzy
-msgid "Filters"
-msgstr "Filter:"
+#: src/ExternalConn.cpp:1832
+#, c-format
+msgid "External Connection: invalid opcode received: %#x"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
+#: src/ExternalConn.cpp:1835
+msgid "Invalid opcode (wrong protocol version?)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
+#: src/ExternalConnector.cpp:142
+#, c-format
+msgid "Unknown extension '%s' for the '%s' command.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
+#: src/ExternalConnector.cpp:144
+#, c-format
+msgid "Unknown command '%s'.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Händelser"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Felsökning"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:539
+#: src/ExternalConnector.cpp:167
 msgid ""
-"aMule must be restarted to enable these changes:\n"
 "\n"
+"Available extensions:\n"
 msgstr ""
-"aMule måste startas om för att aktivera dessa ändringar:\n"
+
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Tillgängliga kommandon:\n"
+
+#: src/ExternalConnector.cpp:186
+#, c-format
+msgid ""
 "\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP-port ändrad.\n"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Avslutar programmet."
 
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP-port ändrad.\n"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Visa hjälp."
 
-#: src/PrefsUnifiedDlg.cpp:560
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
 msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:567
+#: src/ExternalConnector.cpp:248
+#, c-format
 msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
+"\n"
+"Use '%s' for command list\n"
+"\n"
 msgstr ""
+"\n"
+"Använd \"%s\" för kommandolista\n"
+"\n"
 
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Språk ändrat.\n"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Syntaxfel!"
 
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:589
-#, fuzzy
-msgid "- ED2K network enabled.\n"
-msgstr "Alla nätverk är inaktiverade."
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Upp: 0.0 | Ner: 0.0"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Ogiltigt argument."
+
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:660
+#: src/ExternalConnector.cpp:302
+#, c-format
+msgid "Type '%s' to get more help.\n"
+msgstr "Skriv \"%s\" för att få mer hjälp.\n"
+
+#: src/ExternalConnector.cpp:357
+#, c-format
+msgid "This is %s %s %s\n"
+msgstr "Det här är %s %s %s\n"
+
+#: src/ExternalConnector.cpp:359
+#, c-format
+msgid "This is %s %s\n"
+msgstr "Det här är %s %s\n"
+
+#: src/ExternalConnector.cpp:390
 msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
+"\n"
+"Creating client...\n"
 msgstr ""
+"\n"
+"Skapar klient...\n"
 
-#: src/PrefsUnifiedDlg.cpp:669
+#: src/ExternalConnector.cpp:414
+#, c-format
 msgid ""
 "\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
+"Ok, exiting %s...\n"
 msgstr ""
+"\n"
+"Ok, avslutar %s...\n"
 
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/ExternalConnector.cpp:420
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Temporära filer"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Inkommande filer"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Visa den här hjälptexten."
 
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Välj en mapp för %s"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Välj webbläsare"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Läs in konfiguration från fil."
 
-#: src/PrefsUnifiedDlg.cpp:950
-#, c-format
-msgid "Executable%s"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Ställer in programlokalen (språk)."
+
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1038
-#, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Skriv ut programversion."
+
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Fildetaljer"
+
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% färdig"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connections Graph Scale: %d"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
+
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1050
-#, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1056
-#, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] ""
-msgstr[1] ""
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1062
-#, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] ""
-msgstr[1] ""
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Vänner"
 
-#: src/PrefsUnifiedDlg.cpp:1069
-#, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] ""
-msgstr[1] ""
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Visa &detaljer"
 
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Lägg till en vän"
+
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Ta bort vän"
+
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Skicka &meddelande"
+
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Visa filer"
+
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
+#: src/FriendListCtrl.cpp:169
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Är du säker på att du vill ta bort alla servrar?"
+
+#: src/FriendListCtrl.cpp:171
+#, fuzzy
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Är du säker på att du vill ta bort alla servrar?"
+
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1118
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr ""
+
+#: src/GenericClientListCtrl.cpp:547
+msgid "Send message to user"
+msgstr "Skicka meddelande till användare"
+
+#: src/GenericClientListCtrl.cpp:548
+msgid "Message to send:"
+msgstr "Meddelande att skicka:"
+
+#: src/GenericClientListCtrl.cpp:587
 #, fuzzy
-msgid "disabled"
-msgstr "inaktivera"
+msgid "Remove from friends"
+msgstr "Ta bort vän"
+
+#: src/GenericClientListCtrl.cpp:598
+msgid "Send message"
+msgstr "Skicka meddelande"
+
+#: src/GenericClientListCtrl.cpp:600
+msgid "Swap to this file"
+msgstr "Växla till den här filen"
+
+#: src/GenericClientListCtrl.cpp:943
+msgid "A4AF"
+msgstr "A4AF"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "Execute command on `%s' event"
+msgid "On Queue: %u (%i)"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
+msgid "Asked for another file"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1149
+#: src/GenericClientListCtrl.cpp:1024
 #, fuzzy
-msgid "Core command:"
-msgstr "Tillgängliga kommandon:\n"
+msgid "Waiting for upload slot"
+msgstr "Väntande sändningar: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
+#: src/GenericClientListCtrl.cpp:1026
+#, c-format
+msgid "On Queue: %u"
 msgstr ""
 
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr ""
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Sändningar"
 
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Ingen"
+
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Nej"
+
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Ja"
+
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Hämtar..."
+
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
 msgstr ""
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
+#: src/HTTPDownload.cpp:205
+#, c-format
+msgid "Unable to create destination file %s for download!"
 msgstr ""
 
-#: src/ExternalConn.cpp:116
-msgid "External connection closed."
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
 
-#: src/ExternalConn.cpp:143
-msgid "External connections disabled due to empty password!"
+#: src/HTTPDownload.cpp:233
+#, c-format
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
 
-#: src/ExternalConn.cpp:168
-msgid "External connections disabled in config file"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
 
-#: src/ExternalConn.cpp:217
-msgid "New external connection accepted"
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
+msgstr "Hämta: %s"
+
+#: src/HTTPDownload.cpp:279
+#, c-format
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
 
-#: src/ExternalConn.cpp:220
-msgid "ERROR: couldn't accept a new external connection"
+#: src/HTTPDownload.cpp:336
+msgid ""
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
 
-#: src/ExternalConn.cpp:239
-msgid "External connection refused due to empty password in preferences!"
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Återanslut till server"
+
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
 
-#: src/ExternalConn.cpp:249
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "Connecting client: %s %s"
+msgid "Download new GeoIP.dat from %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:251
-msgid "Unknown version"
-msgstr "Okänd version"
-
-#: src/ExternalConn.cpp:262
-msgid ""
-"Incorrect EC version ID, there might be binary incompatibility. Use core and "
-"remote from same snapshot."
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:267
-msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
+#, c-format
+msgid "Failed to remove %s file, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
+#: src/IP2Country.cpp:140
+#, c-format
+msgid "Failed to rename %s file, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:292
-msgid "Invalid protocol version."
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
+#, c-format
+msgid "Successfully updated %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:296
-msgid "Missing protocol version tag."
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
 msgstr ""
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Misslyckades med att hämta nodlistan."
+
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Misslyckades med att öppna \"%s\""
+
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
 msgstr ""
 
-#: src/ExternalConn.cpp:306
-msgid "Access granted."
+#: src/IPFilter.cpp:299
+#, c-format
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
 
-#: src/ExternalConn.cpp:564
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Remote PartFile command failed: FileHash not found: %s"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
 msgstr ""
 
-#: src/ExternalConn.cpp:566
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "FileHash not found: %s"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/IPFilter.cpp:331
+#, c-format
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/IPFilter.cpp:503
+#, c-format
+msgid "Failed to rename new %s file, aborting update."
 msgstr ""
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
-msgid "OOPS! OpCode processing error!"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
 
-#: src/ExternalConn.cpp:659
-msgid "Server not added"
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
 msgstr ""
 
-#: src/ExternalConn.cpp:677
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "server not found: %s"
-msgstr ""
+msgid "Nodes (%u)"
+msgstr "Noder (%u)"
 
-#: src/ExternalConn.cpp:693
-msgid "need to define server to be removed"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
 msgstr ""
 
-#: src/ExternalConn.cpp:707
-msgid "eD2k is disabled in preferences."
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
 msgstr ""
 
-#: src/ExternalConn.cpp:803
-msgid "Search in progress. Refetch results in a moment!"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
 msgstr ""
 
-#: src/ExternalConn.cpp:808
-msgid "WebSearch from remote interface makes no sense."
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
 msgstr ""
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
+#: src/KadDlg.cpp:212
+msgid ""
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
 
-#: src/ExternalConn.cpp:1020
-msgid "No points for graph."
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Fortsätt?"
+
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
 msgstr ""
 
-#: src/ExternalConn.cpp:1029
-msgid "Your client is not configured for this detail level."
+#: src/kademlia/kademlia/SearchManager.cpp:133
+#, c-format
+msgid "Keyword for search: %s"
 msgstr ""
 
-#: src/ExternalConn.cpp:1057
-msgid "External Connection: shutdown requested"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
 msgstr ""
 
-#: src/ExternalConn.cpp:1069
-msgid "Already shutting down."
+#: src/kademlia/routing/RoutingZone.cpp:172
+msgid ""
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
 
-#: src/ExternalConn.cpp:1077
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid "ExternalConn: adding link '%s'."
-msgstr ""
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:1083
-msgid "Invalid link or already on list."
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
 
-#: src/ExternalConn.cpp:1168
-msgid "File not found."
-msgstr "Filen hittades inte."
+#: src/kademlia/routing/RoutingZone.cpp:307
+#, c-format
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:1173
-msgid "Invalid file name."
-msgstr "Ogiltigt filnamn."
+#: src/kademlia/routing/RoutingZone.cpp:338
+#, c-format
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/ExternalConn.cpp:1181
-msgid "Unable to rename file."
-msgstr "Kunde inte byta namn på fil."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Filnamn"
 
-#: src/ExternalConn.cpp:1405
-msgid "Already connected to eD2k."
+#: src/KnownFile.cpp:1545
+msgid "File size"
 msgstr ""
 
-#: src/ExternalConn.cpp:1408
-msgid "Connecting to eD2k..."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
 msgstr ""
 
-#: src/ExternalConn.cpp:1416
-msgid "Already connected to Kad."
-msgstr "Redan ansluten till Kad."
-
-#: src/ExternalConn.cpp:1419
-msgid "Connecting to Kad..."
-msgstr "Ansluter till Kad..."
-
-#: src/ExternalConn.cpp:1424
-msgid "All networks are disabled."
-msgstr "Alla nätverk är inaktiverade."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr ""
 
-#: src/ExternalConn.cpp:1432
-msgid "Disconnected from eD2k."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
 msgstr ""
 
-#: src/ExternalConn.cpp:1436
-msgid "Disconnected from Kad."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
 msgstr ""
 
-#: src/ExternalConn.cpp:1444
-#, c-format
-msgid "External Connection: invalid opcode received: %#x"
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
 msgstr ""
 
-#: src/ExternalConn.cpp:1447
-msgid "Invalid opcode (wrong protocol version?)"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
 
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
 
-#: src/TerminationProcess.cpp:48
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Okänd version"
+
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
 #, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
+msgid "Unable to get error description for error %d"
 msgstr ""
 
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
 msgstr ""
 
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
 msgstr ""
 
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Färdig"
+
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Pausad"
+
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
 msgstr ""
 
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Ansluten"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Väntar"
 
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Port"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr ""
 
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr ""
 
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kademlia-status:"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr ""
 
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Kör"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr ""
 
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Status:"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr ""
 
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Frånkopplad"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Lyckades! Anslutning etablerad till aMule "
 
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Anslutningstillstånd:"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Lyckades! Anslutning etablerad."
 
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
 msgstr ""
 
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "Anslutningen misslyckades "
 
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
 msgstr ""
 
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
 msgstr ""
 
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
 msgstr ""
 
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr ""
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Stäng"
 
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Kör inte"
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Klipp ut"
 
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Upptid: %s"
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Kopiera"
 
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Överför"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Klistra in"
 
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Sändningar"
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Töm"
 
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Markera alla"
+
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
+
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Obegränsad"
+
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
 msgstr ""
 
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
 msgstr ""
 
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
 msgstr ""
 
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Source Exchange Overhead (Packets): %s"
+msgid "UL: %u"
 msgstr ""
 
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
 msgstr ""
 
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "Kad Overhead (Packets): %s"
+msgid "DL: %u"
 msgstr ""
 
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "Crypt overhead (UDP): %s"
+msgid "Download speed: %.1f"
 msgstr ""
 
-#: src/Statistics.cpp:662
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "Active Uploads: %s"
-msgstr "Aktiva sändningar: %s"
+msgid "Upload speed: %.1f"
+msgstr ""
 
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Väntande sändningar: %s"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Klientinformation"
 
-#: src/Statistics.cpp:664
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Total successful upload sessions: %s"
-msgstr ""
+msgid "Nickname: %s"
+msgstr "Smeknamn: %s"
 
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
 msgstr ""
 
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
 msgstr ""
 
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Hämtningar"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Inte ansluten"
 
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr ""
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Servernamn: "
+
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "ServerIP: "
+
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Inte ansluten"
 
-#: src/Statistics.cpp:683
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Found Sources: %s"
-msgstr ""
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/Statistics.cpp:684
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Active Downloads (chunks): %s"
+msgid "TCP port: %d"
 msgstr ""
 
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
 msgstr ""
 
-#: src/Statistics.cpp:689
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Average download rate (Session): %s"
+msgid "UDP port: %d"
 msgstr ""
 
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
 msgstr ""
 
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
 msgstr ""
 
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
 msgstr ""
 
-#: src/Statistics.cpp:693
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Reconnects: %i"
-msgstr ""
+msgid "Uptime: %s"
+msgstr "Upptid: %s"
 
-#: src/Statistics.cpp:694
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Time Since First Transfer: %s"
+msgid "Shared files: %d"
 msgstr ""
 
-#: src/Statistics.cpp:695
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "Connected To Server Since: %s"
+msgid "Queued clients: %d"
 msgstr ""
 
-#: src/Statistics.cpp:696
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Active Connections (estimate): %i"
+msgid "Total DL: %s"
 msgstr ""
 
-#: src/Statistics.cpp:697
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Max Connection Limit Reached: %s"
+msgid "Total UL: %s"
 msgstr ""
 
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
 msgstr ""
 
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
 msgstr ""
 
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Klienter"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Dölj aMule"
 
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Filtrered"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Visa aMule"
 
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Avsluta"
+
+#: src/muuli_wdr.cpp:75
+msgid "eD2k Link: "
 msgstr ""
 
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Fungerande servrar: %i"
+#: src/muuli_wdr.cpp:82
+msgid "Commit"
+msgstr "Verkställ"
 
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
+#: src/muuli_wdr.cpp:83
+msgid ""
+"Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "Totalt: %s"
-
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Borttagna servrar: %s"
+#: src/muuli_wdr.cpp:91
+msgid ""
+"Events are displayed here. For a complete list of events, refer to the log "
+"in the Servers-tab."
+msgstr ""
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Filtrerade servrar: %s"
+#: src/muuli_wdr.cpp:94
+msgid "Loading ..."
+msgstr "Läser in ..."
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
+#: src/muuli_wdr.cpp:102
+msgid "Number of users on the server you are connected to ..."
 msgstr ""
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr ""
+#: src/muuli_wdr.cpp:105
+msgid "Users: 0"
+msgstr "Användare: 0"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
+#: src/muuli_wdr.cpp:106
+msgid ""
+"Users connected to the current server and an estimate of the total number of "
+"users."
 msgstr ""
 
-#: src/Statistics.cpp:723
-#, c-format
-msgid "Total Files: %llu"
-msgstr "Totalt antal filer: %llu"
+#: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Upp: 0.0 | Ner: 0.0"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
+#: src/muuli_wdr.cpp:118
+msgid ""
+"Current average upload and download rates. If enabled the numbers in the "
+"braces signify the overhead from client communication."
 msgstr ""
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
+#: src/muuli_wdr.cpp:126
+msgid ""
+"Displays the connected status and active transfers. Red arrows signifies "
+"that you are currently not connected, yellow arrows signify that you have "
+"low ID (firewalled) and green arrows signify that you have high ID (The "
+"optimal connection type)."
 msgstr ""
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr ""
+#: src/muuli_wdr.cpp:130
+msgid "Not Connected ..."
+msgstr "Inte ansluten ..."
 
-#: src/Statistics.cpp:731
-#, c-format
-msgid "Average file size: %s"
+#: src/muuli_wdr.cpp:131
+msgid "Currently connected server."
 msgstr ""
 
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Operativsystem"
+#: src/muuli_wdr.cpp:177
+msgid "Search"
+msgstr "Sök"
 
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr ""
+#: src/muuli_wdr.cpp:183
+msgid "Name:"
+msgstr "Namn:"
 
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Klipp ut"
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Typ"
 
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Klistra in"
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
+msgid "Local"
+msgstr "Lokal"
 
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Markera alla"
+#: src/muuli_wdr.cpp:197
+msgid "Global"
+msgstr "Global"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
+#: src/muuli_wdr.cpp:199
+#, fuzzy
+msgid "FileHash"
+msgstr "Filer"
+
+#: src/muuli_wdr.cpp:207
+msgid "Extended Parameters"
 msgstr ""
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
+#: src/muuli_wdr.cpp:213
+msgid "Filtering"
 msgstr ""
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
+#: src/muuli_wdr.cpp:224
+msgid "File Type"
+msgstr "Filtyp"
+
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Meddelande filtrerat från \"%s\" (IP:%s)"
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Arkiv"
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Nytt meddelande från \"%s\" (IP:%s)"
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Ljud"
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr ""
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Bilder"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr ""
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Program"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr ""
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Texter"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr ""
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Videoklipp"
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+#: src/muuli_wdr.cpp:254
+msgid "Extension"
+msgstr "Filändelse"
+
+#: src/muuli_wdr.cpp:260
+msgid "Min Size"
+msgstr "Min storlek"
+
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+msgid "Bytes"
+msgstr "Byte"
+
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
+msgid "KB"
+msgstr "KB"
+
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
+msgid "Max Size"
+msgstr "Max storlek"
+
+#: src/muuli_wdr.cpp:306
+msgid "Availability"
+msgstr "Tillgänglighet"
+
+#: src/muuli_wdr.cpp:319
+msgid "Filter:"
+msgstr "Filter:"
+
+#: src/muuli_wdr.cpp:328
+msgid "Filter Results"
+msgstr "Filtrera resultat"
+
+#: src/muuli_wdr.cpp:334
+msgid "Invert Result"
+msgstr "Invertera resultat"
+
+#: src/muuli_wdr.cpp:340
+msgid "Hide Known Files"
+msgstr "Dölj kända filer"
+
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
+#: src/muuli_wdr.cpp:356
+#, fuzzy
+msgid "More"
+msgstr "Koreanska"
+
+#: src/muuli_wdr.cpp:357
+msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
+#: src/muuli_wdr.cpp:364
+msgid "Stop"
+msgstr "Stoppa"
+
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Hämta"
+
+#: src/muuli_wdr.cpp:378
+#, fuzzy
+msgid "Reset Fields"
+msgstr "Ta bort vän"
+
+#: src/muuli_wdr.cpp:393
+msgid "Results"
+msgstr "Resultat"
+
+#: src/muuli_wdr.cpp:422
+msgid "Clears completed downloads"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Ta bort källor?"
+
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Allmänt"
+
+#: src/muuli_wdr.cpp:525
+msgid "Full Name :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
+msgid "N/A"
+msgstr "-"
+
+#: src/muuli_wdr.cpp:536
+msgid "met-File :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
+#: src/muuli_wdr.cpp:547
+msgid "Hash :"
+msgstr "Hash :"
+
+#: src/muuli_wdr.cpp:562
+msgid "Filesize :"
+msgstr "Filstorlek :"
+
+#: src/muuli_wdr.cpp:573
+msgid "Partfilestatus :"
 msgstr ""
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
+#: src/muuli_wdr.cpp:584
+msgid "Last seen complete :"
 msgstr ""
 
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Noder (%u)"
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Överför"
 
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
+#: src/muuli_wdr.cpp:606
+msgid "Found Sources :"
 msgstr ""
 
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
+#: src/muuli_wdr.cpp:617
+msgid "Transferring Sources :"
 msgstr ""
 
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
+#: src/muuli_wdr.cpp:628
+msgid "Filepart-Count :"
 msgstr ""
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr ""
+#: src/muuli_wdr.cpp:639
+msgid "Available :"
+msgstr "Tillgänglig :"
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+#: src/muuli_wdr.cpp:650
+msgid "Datarate :"
+msgstr "Datahastighet :"
+
+#: src/muuli_wdr.cpp:661
+msgid "Download Active Time: "
 msgstr ""
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Fortsätt?"
+#: src/muuli_wdr.cpp:672
+msgid "Transferred :"
+msgstr "Överförd :"
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
+#: src/muuli_wdr.cpp:683
+msgid "Completed Size :"
 msgstr ""
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
+#: src/muuli_wdr.cpp:710
+msgid "Intelligent Corruption Handling"
 msgstr ""
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Lägg till en vän"
+#: src/muuli_wdr.cpp:719
+msgid "Lost to corruption :"
+msgstr ""
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Du måste ange en giltig IP-adress och port!"
+#: src/muuli_wdr.cpp:730
+msgid "Gained by compression :"
+msgstr ""
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Information"
+#: src/muuli_wdr.cpp:741
+msgid "Packages saved by I.C.H. :"
+msgstr ""
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Angiven userhash är inte giltig!"
+#: src/muuli_wdr.cpp:754
+msgid "File Names"
+msgstr "Filnamn"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Källor"
+#: src/muuli_wdr.cpp:763
+msgid "Takeover"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Fil"
+#: src/muuli_wdr.cpp:773
+msgid "Cleanup"
+msgstr ""
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Hämta"
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
+msgid "Apply"
+msgstr "Verkställ"
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategori"
+#: src/muuli_wdr.cpp:798
+msgid "Ok"
+msgstr "Ok"
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
+#: src/muuli_wdr.cpp:823
+msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
+#: src/muuli_wdr.cpp:829
+msgid ""
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
+#: src/muuli_wdr.cpp:841
+msgid "File Quality"
 msgstr ""
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
 msgstr ""
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Anslutningen misslyckades "
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Dålig"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr ""
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Bra"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr ""
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Normal"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
-msgstr ""
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Utmärkt"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Användare: E: %s K: %s | Filer E: %s K: %s"
+#: src/muuli_wdr.cpp:854
+msgid "Choose the file rating or advice users if the file is invalid ..."
+msgstr ""
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Alla"
+#: src/muuli_wdr.cpp:898
+msgid "Refresh"
+msgstr "Uppdatera"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Totalt antal användare: %s | Totalt antal filer: %s"
+#: src/muuli_wdr.cpp:925
+msgid "Downloading, please wait ..."
+msgstr "Hämtar, vänta ..."
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Överfört"
+#: src/muuli_wdr.cpp:931
+msgid "Unknown size"
+msgstr "Okänd storlek"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Hastighet"
+#: src/muuli_wdr.cpp:955
+msgid "Required Information"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Förlopp"
+#: src/muuli_wdr.cpp:960
+msgid "IP Address :"
+msgstr "IP-adress :"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Status"
+#: src/muuli_wdr.cpp:966
+msgid "Port :"
+msgstr "Port :"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
+#: src/muuli_wdr.cpp:976
+msgid "Additional Information"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
+#: src/muuli_wdr.cpp:981
+msgid "Username :"
+msgstr "Användarnamn :"
+
+#: src/muuli_wdr.cpp:987
+msgid "Userhash :"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Lägg till"
+
+#: src/muuli_wdr.cpp:1046
+msgid "Download-Speed"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:581
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Är du säker på att du vill ta bort alla servrar?"
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
+msgid "Current"
+msgstr "Aktuell"
 
-#: src/DownloadListCtrl.cpp:583
-#, fuzzy
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Är du säker på att du vill ta bort alla servrar?"
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
+msgid "Running average"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
-msgid "Send message to user"
-msgstr "Skicka meddelande till användare"
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
+msgid "Session average"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
-msgid "Message to send:"
-msgstr "Meddelande att skicka:"
+#: src/muuli_wdr.cpp:1095
+msgid "Upload-Speed"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Stoppa"
+#: src/muuli_wdr.cpp:1144
+msgid "Connections"
+msgstr "Anslutningar"
 
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Pausa"
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
+msgid "Active downloads"
+msgstr "Aktiva hämtningar"
 
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Fortsätt"
+#: src/muuli_wdr.cpp:1173
+msgid "Active connections (1:1)"
+msgstr "Aktiva anslutningar (1:1)"
 
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
+msgid "Active uploads"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
+#: src/muuli_wdr.cpp:1193
+msgid "Statistics Tree"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr ""
+#: src/muuli_wdr.cpp:1223
+msgid "Username:"
+msgstr "Användarnamn:"
 
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
+#: src/muuli_wdr.cpp:1226
+msgid "Userhash:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr ""
+#: src/muuli_wdr.cpp:1249
+msgid "Client software:"
+msgstr "Klientprogramvara:"
 
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Förhandsgranska"
+#: src/muuli_wdr.cpp:1258
+msgid "Client version:"
+msgstr "Klientversion:"
 
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Visa fil&detaljer"
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
+msgid "IP address:"
+msgstr "IP-adress:"
 
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Visa alla kommentarer"
+#: src/muuli_wdr.cpp:1274
+msgid "User ID:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
+#: src/muuli_wdr.cpp:1281
+msgid "Server IP:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
+#: src/muuli_wdr.cpp:1290
+msgid "Server name:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
+#: src/muuli_wdr.cpp:1297
+msgid "Obfuscation:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "&Öppna filen"
+#: src/muuli_wdr.cpp:1306
+msgid "Kad:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-#, fuzzy
-msgid "Remove from friends"
-msgstr "Ta bort vän"
+#: src/muuli_wdr.cpp:1317
+msgid "Transfers to client"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Lägg till i vänner"
+#: src/muuli_wdr.cpp:1322
+msgid "Current request:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
-msgid "Send message"
-msgstr "Skicka meddelande"
+#: src/muuli_wdr.cpp:1335
+msgid "Average upload rate:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1017
-msgid "Swap to this file"
-msgstr "Växla till den här filen"
+#: src/muuli_wdr.cpp:1344
+msgid "Average download rate:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
+#: src/muuli_wdr.cpp:1351
+msgid "Uploaded (session):"
+msgstr "Skickat (session):"
 
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H.%M.%S"
+#: src/muuli_wdr.cpp:1360
+msgid "Downloaded (session):"
+msgstr "Hämtat (session):"
 
-#: src/DownloadListCtrl.cpp:1657
-msgid "A4AF"
-msgstr "A4AF"
+#: src/muuli_wdr.cpp:1367
+msgid "Uploaded (total):"
+msgstr "Skickat (totalt):"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
-msgstr ""
+#: src/muuli_wdr.cpp:1376
+msgid "Downloaded (total):"
+msgstr "Hämtat (totalt):"
 
-#: src/DownloadListCtrl.cpp:1721
-msgid "Asked for another file"
+#: src/muuli_wdr.cpp:1387
+msgid "Scores"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Hämtningar (%i)"
+#: src/muuli_wdr.cpp:1394
+msgid "DL/UP modifier:"
+msgstr ""
 
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
+#: src/muuli_wdr.cpp:1403
+msgid "Secure ident:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
 msgstr ""
 
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+#: src/muuli_wdr.cpp:1419
+msgid "Queue score:"
 msgstr ""
 
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
+#: src/muuli_wdr.cpp:1448
+msgid "Nick"
 msgstr ""
 
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
 msgstr ""
 
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
+#: src/muuli_wdr.cpp:1452
+msgid "This is the name that other users will see when connecting to you."
 msgstr ""
 
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
 msgstr ""
 
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
 msgstr ""
 
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
 msgstr ""
 
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
+#: src/muuli_wdr.cpp:1471
+msgid "Check for new version at startup"
 msgstr ""
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+#: src/muuli_wdr.cpp:1472
+msgid "Enabling this will make aMule check for new version at startup"
 msgstr ""
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
+#: src/muuli_wdr.cpp:1475
+msgid "Start minimized"
 msgstr ""
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
+#: src/muuli_wdr.cpp:1476
+msgid "Enabling this makes aMule minimize itself upon start."
 msgstr ""
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Misslyckades med att öppna %s (%s)"
+#: src/muuli_wdr.cpp:1479
+msgid "Prompt on exit"
+msgstr ""
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
 msgstr ""
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
 msgstr ""
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
+#: src/muuli_wdr.cpp:1487
+msgid "Enable Tray Icon"
 msgstr ""
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
+#: src/muuli_wdr.cpp:1488
+msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
+#: src/muuli_wdr.cpp:1491
+msgid "Minimize to Tray Icon"
 msgstr ""
 
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1492
+msgid ""
+"Enabling this will make aMule minimize to the System Tray, rather than the "
+"taskbar."
+msgstr ""
 
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
 msgstr ""
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
 msgstr ""
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
+#: src/muuli_wdr.cpp:1511
+msgid "Browser Selection"
 msgstr ""
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Bläddra"
+
+#: src/muuli_wdr.cpp:1525
+msgid "Open in new tab if possible"
 msgstr ""
 
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
+#: src/muuli_wdr.cpp:1527
+msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
+#: src/muuli_wdr.cpp:1532
+msgid "Video Player"
+msgstr "Videouppspelare"
+
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr ""
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Tar bort fil: %s"
+#: src/muuli_wdr.cpp:1579
+msgid "Upload"
+msgstr ""
 
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/muuli_wdr.cpp:1588
+msgid "Slot Allocation"
 msgstr ""
 
-#: src/PartFile.cpp:2389
-#, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
 msgstr ""
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
 msgstr ""
 
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
+#: src/muuli_wdr.cpp:1611
+msgid "This is the standard eD2k port and cannot be disabled."
 msgstr ""
 
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
 msgstr ""
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
 msgstr ""
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
 msgstr ""
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Stoppad"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr ""
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
 msgstr ""
 
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
 msgstr ""
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
 msgstr ""
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
 msgstr ""
 
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
 msgstr ""
 
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
 msgstr ""
 
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1676
+msgid "Kademlia"
+msgstr "Kademlia"
 
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
+#: src/muuli_wdr.cpp:1689
+msgid "Autoconnect on startup"
 msgstr ""
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Filkommentarer"
+#: src/muuli_wdr.cpp:1692
+msgid "Reconnect on loss"
+msgstr ""
 
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Rankning"
+#: src/muuli_wdr.cpp:1716
+msgid "Remove dead server after"
+msgstr "Ta bort död server efter"
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Kommentar"
+#: src/muuli_wdr.cpp:1722
+msgid "retries"
+msgstr "försök"
 
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Inga kommentarer"
+#: src/muuli_wdr.cpp:1729
+msgid "Auto-update server list at startup"
+msgstr ""
 
-#: src/CommentDialogLst.cpp:104
-#, fuzzy, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%s kommentar(er)"
-msgstr[1] "%s kommentar(er)"
+#: src/muuli_wdr.cpp:1732
+msgid "List"
+msgstr ""
 
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
+#: src/muuli_wdr.cpp:1737
+msgid "Update server list when connecting to a server"
 msgstr ""
 
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
+#: src/muuli_wdr.cpp:1740
+msgid "Update server list when a client connects"
 msgstr ""
-"Misslyckades med att ansluta till alla listade servrar. Gör ett nytt försök."
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
+#: src/muuli_wdr.cpp:1743
+msgid "Use priority system"
 msgstr ""
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+#: src/muuli_wdr.cpp:1747
+msgid "Use smart LowID check on connect"
 msgstr ""
 
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "Ansluten till %s (%s:%i)"
+#: src/muuli_wdr.cpp:1751
+msgid "Safe connect"
+msgstr ""
 
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "Anslutning etablerad: %s"
+#: src/muuli_wdr.cpp:1755
+msgid "Autoconnect to servers in static list only"
+msgstr ""
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+#: src/muuli_wdr.cpp:1758
+msgid "Set manually added servers to High Priority"
 msgstr ""
 
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Förlorade anslutningen till %s (%s:%i)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr ""
 
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) verkar vara död."
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr ""
 
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) verkar vara full."
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr ""
 
-#: src/ServerConnect.cpp:381
-#, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1791
+msgid "Add files to download in pause mode"
+msgstr ""
 
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Anslutningen förlorades"
+#: src/muuli_wdr.cpp:1794
+msgid "Add files to download with auto priority"
+msgstr ""
 
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
+#: src/muuli_wdr.cpp:1797
+msgid "Try to download first and last chunks first"
 msgstr ""
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr ""
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
+#: src/muuli_wdr.cpp:1805
+msgid "From the same category"
 msgstr ""
 
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
 msgstr ""
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
 msgstr ""
 
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
 
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
 msgstr ""
 
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
 msgstr ""
 
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Hämtar %s"
+#: src/muuli_wdr.cpp:1823
+msgid "Enter here the min disk space desired."
+msgstr ""
 
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
 msgstr ""
 
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Du har redan filen \"%s\""
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Sändningar"
 
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
 msgstr ""
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
 msgstr ""
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
+#: src/muuli_wdr.cpp:1884
+msgid "(Right click on folder icon for recursive share)"
 msgstr ""
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr ""
+#: src/muuli_wdr.cpp:1891
+msgid "Share hidden files"
+msgstr "Dela ut dolda filer"
 
-#: src/TextClient.cpp:309
-msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+#: src/muuli_wdr.cpp:1911
+msgid "Graphs"
+msgstr "Diagram"
+
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
+msgid "Update delay : 5 secs"
 msgstr ""
 
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
+#: src/muuli_wdr.cpp:1920
+msgid "Time for average graph: 100 mins"
 msgstr ""
 
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
+#: src/muuli_wdr.cpp:1926
+msgid "Connections Graph Scale: 100 "
 msgstr ""
 
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
 msgstr ""
 
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
 msgstr ""
 
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
 msgstr ""
 
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
+#: src/muuli_wdr.cpp:1963
+msgid "Background"
+msgstr "Bakgrund"
+
+#: src/muuli_wdr.cpp:1964
+msgid "Grid"
 msgstr ""
 
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
+#: src/muuli_wdr.cpp:1965
+msgid "Download current"
 msgstr ""
 
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
+#: src/muuli_wdr.cpp:1966
+msgid "Download running average"
 msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "AV"
+#: src/muuli_wdr.cpp:1967
+msgid "Download session average"
+msgstr ""
 
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "PÅ"
+#: src/muuli_wdr.cpp:1968
+msgid "Upload current"
+msgstr ""
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
+#: src/muuli_wdr.cpp:1969
+msgid "Upload running average"
 msgstr ""
 
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
+#: src/muuli_wdr.cpp:1970
+msgid "Upload session average"
 msgstr ""
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+#: src/muuli_wdr.cpp:1971
+msgid "Active connections"
 msgstr ""
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
+#: src/muuli_wdr.cpp:1974
+msgid "Systray Icon Speedbar"
 msgstr ""
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "Ansluten till %s %s %s"
+#: src/muuli_wdr.cpp:1975
+msgid "Kad-nodes current"
+msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "med LowID"
+#: src/muuli_wdr.cpp:1976
+msgid "Kad-nodes running"
+msgstr ""
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "med HighID"
+#: src/muuli_wdr.cpp:1977
+msgid "Kad-nodes session"
+msgstr ""
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Ansluter nu"
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
+msgid "Select"
+msgstr "Välj"
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Inte ansluten"
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr ""
 
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
+#: src/muuli_wdr.cpp:2000
+msgid "Number of Client Versions shown (0=unlimited)"
 msgstr ""
-"\n"
-"Hämta:\t%s"
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
+#: src/muuli_wdr.cpp:2028
+msgid "!!! WARNING !!!"
+msgstr "!!! VARNING !!!"
+
+#: src/muuli_wdr.cpp:2042
+msgid "Max new connections / 5 secs"
 msgstr ""
-"\n"
-"Skicka:\t%s"
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
+#: src/muuli_wdr.cpp:2048
+msgid "File Buffer Size: 240000 bytes"
 msgstr ""
-"\n"
-"Klienter i kö:\t%d\n"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/muuli_wdr.cpp:2054
+msgid "Upload Queue Size: 5000 clients"
 msgstr ""
 
-#: src/TextClient.cpp:809
-#, c-format
-msgid "Number of search results: %i\n"
+#: src/muuli_wdr.cpp:2060
+msgid "Server connection refresh interval: Disable"
 msgstr ""
 
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
 
-#: src/TextClient.cpp:828
-#, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
 msgstr ""
 
-#: src/TextClient.cpp:841
-msgid "Show short status information."
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
 msgstr ""
 
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
 msgstr ""
 
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
 msgstr ""
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
 msgstr ""
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
 msgstr ""
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
 msgstr ""
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
 msgstr ""
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
 msgstr ""
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
 msgstr ""
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Anslut till nätverket."
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr ""
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
 msgstr ""
 
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
 msgstr ""
 
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Anslut endast till Kad."
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Flat"
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Koppla från nätverket."
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Rund"
 
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
 msgstr ""
 
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
 msgstr ""
 
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Koppla endast från Kad."
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr ""
 
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "Acceptera externa anslutningar"
+
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
 msgstr ""
 
-#: src/TextClient.cpp:865
+#: src/muuli_wdr.cpp:2190
 msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
 msgstr ""
 
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
 msgstr ""
 
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
 msgstr ""
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr ""
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Lösenord"
 
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
 msgstr ""
 
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
 msgstr ""
 
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
 msgstr ""
 
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
 msgstr ""
 
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
 msgstr ""
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
 msgstr ""
 
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
 msgstr ""
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
 msgstr ""
 
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
 msgstr ""
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
 msgstr ""
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr ""
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
+#: src/muuli_wdr.cpp:2326
+msgid "Click here to apply any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
+#: src/muuli_wdr.cpp:2330
+msgid "Reset any changes made to the preferences."
 msgstr ""
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr ""
+#: src/muuli_wdr.cpp:2354
+msgid "Title :"
+msgstr "Titel :"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr ""
+#: src/muuli_wdr.cpp:2364
+msgid "Comment :"
+msgstr "Kommentar :"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
+#: src/muuli_wdr.cpp:2374
+msgid "Incoming Dir :"
 msgstr ""
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
+#: src/muuli_wdr.cpp:2387
+msgid "Change priority for new assigned files :"
 msgstr ""
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
+msgstr "Ändra inte"
+
+#: src/muuli_wdr.cpp:2406
+msgid "Select color for this Category (currently selected) :"
 msgstr ""
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Nollställ"
+
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
+msgid "Click this button to reset the log."
 msgstr ""
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
+#: src/muuli_wdr.cpp:2528
+msgid "Click on this button to update the servers list from URL ..."
 msgstr ""
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
+#: src/muuli_wdr.cpp:2532
+msgid "Server list"
 msgstr ""
 
-#: src/TextClient.cpp:901
+#: src/muuli_wdr.cpp:2537
 msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
+"Enter the url to a server.met file here and press the button to the left to "
+"update the list of known servers."
 msgstr ""
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
+#: src/muuli_wdr.cpp:2544
+msgid "Add server manually: Name"
 msgstr ""
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
+#: src/muuli_wdr.cpp:2548
+msgid "Enter the name of the new server here"
 msgstr ""
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Port"
+
+#: src/muuli_wdr.cpp:2555
+msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr ""
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
+#: src/muuli_wdr.cpp:2562
+msgid "Enter the port of the server here."
 msgstr ""
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
+#: src/muuli_wdr.cpp:2566
+msgid "Add manually a server (fill fields to the left before) ..."
 msgstr ""
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule-logg"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Serverinformation"
+
+#: src/muuli_wdr.cpp:2612
+msgid "ED2K Info"
+msgstr "ED2K-info"
+
+#: src/muuli_wdr.cpp:2616
+msgid "Kad Info"
+msgstr "Kad-info"
+
+#: src/muuli_wdr.cpp:2645
+msgid "Click on this button to update the nodes list from URL ..."
 msgstr ""
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
+#: src/muuli_wdr.cpp:2649
+msgid "Nodes (0)"
+msgstr "Noder (0)"
+
+#: src/muuli_wdr.cpp:2654
+msgid ""
+"Enter the url to a nodes.dat file here and press the button to the left to "
+"update the list of known nodes."
 msgstr ""
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
+#: src/muuli_wdr.cpp:2659
+msgid "Nodes stats"
 msgstr ""
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
+#: src/muuli_wdr.cpp:2710
+msgid "Bootstrap"
 msgstr ""
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Pausa hämtning."
+#: src/muuli_wdr.cpp:2713
+msgid "New node"
+msgstr "Ny nod"
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Fortsätt hämtning."
+#: src/muuli_wdr.cpp:2718
+msgid "IP:"
+msgstr "IP:"
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Avbryt hämtning."
+#: src/muuli_wdr.cpp:2747
+msgid "Port:"
+msgstr "Port:"
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Ställ in hämtningsprioritet."
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr ""
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+#: src/muuli_wdr.cpp:2768
+msgid "Disconnect Kad"
+msgstr "Koppla från Kad"
+
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
 msgstr ""
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
 msgstr ""
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
+#: src/muuli_wdr.cpp:2811
+msgid "Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
+#: src/muuli_wdr.cpp:2814
+msgid "Support Protocol Obfuscation"
 msgstr ""
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
+#: src/muuli_wdr.cpp:2816
+msgid ""
+"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
+"connections from other clients."
 msgstr ""
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Visa köer/listor."
+#: src/muuli_wdr.cpp:2819
+msgid "Use obfuscation for outgoing connections"
+msgstr ""
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
+#: src/muuli_wdr.cpp:2821
+msgid ""
+"This option makes aMule use Protocol Obfuscation when connecting other "
+"clients/servers."
 msgstr ""
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Visa sändningskö."
+#: src/muuli_wdr.cpp:2824
+msgid "Accept only obfuscated connections"
+msgstr ""
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Visa hämtningskö."
+#: src/muuli_wdr.cpp:2825
+msgid ""
+"This option makes aMule only accept obfuscated connections. You will have "
+"less sources, but all your traffic will be obfuscated"
+msgstr ""
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Visa logg."
+#: src/muuli_wdr.cpp:2832
+msgid "Everybody"
+msgstr "Alla"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Visa serverlista."
+#: src/muuli_wdr.cpp:2834
+msgid "No one"
+msgstr ""
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Nollställ logg."
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr ""
 
-#: src/TextClient.cpp:951
-#, c-format
-msgid "Deprecated command, use '%s' instead."
+#: src/muuli_wdr.cpp:2837
+msgid "Select who can request to view a list of your shared files."
 msgstr ""
 
-#: src/TextClient.cpp:952
-#, c-format
+#: src/muuli_wdr.cpp:2840
+msgid "IP-Filtering"
+msgstr "IP-filtrering"
+
+#: src/muuli_wdr.cpp:2847
+#, fuzzy
+msgid "Filter clients"
+msgstr "Fildetaljer"
+
+#: src/muuli_wdr.cpp:2849
 msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
+"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/ServerSocket.cpp:259
-#, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr ""
+#: src/muuli_wdr.cpp:2852
+#, fuzzy
+msgid "Filter servers"
+msgstr "Filtreringsnivå:"
 
-#: src/ServerSocket.cpp:274
-#, c-format
-msgid "WARNING: %s (%s) - %s"
+#: src/muuli_wdr.cpp:2854
+msgid ""
+"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 
-#: src/ServerSocket.cpp:417
-#, c-format
-msgid "New clientid is %u"
-msgstr ""
+#: src/muuli_wdr.cpp:2861
+msgid "Reload List"
+msgstr "Läs om lista"
 
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
+#: src/muuli_wdr.cpp:2862
+msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr ""
-"\tMest sannolikt att det på grund av du är bakom en brandvägg eller router."
+#: src/muuli_wdr.cpp:2870
+msgid "URL:"
+msgstr "URL:"
 
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tFör mer information, referera till http://wiki.amule.org"
+#: src/muuli_wdr.cpp:2876
+msgid "Update now"
+msgstr "Uppdatera nu"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
+#: src/muuli_wdr.cpp:2881
+msgid "Auto-update ipfilter at startup"
 msgstr ""
 
-#: src/ServerSocket.cpp:539
-#, fuzzy, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Ta bort död server efter"
-msgstr[1] "Ta bort död server efter"
+#: src/muuli_wdr.cpp:2886
+msgid "Filtering Level:"
+msgstr "Filtreringsnivå:"
 
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
+#: src/muuli_wdr.cpp:2896
+msgid "Always filter LAN IPs"
 msgstr ""
 
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
+#: src/muuli_wdr.cpp:2900
+msgid "Paranoid handling of non-matching IPs"
 msgstr ""
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
+#: src/muuli_wdr.cpp:2902
+msgid ""
+"Rejects packet if the client ip is different from the ip where the packet is "
+"received from. Use with caution."
 msgstr ""
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
+#: src/muuli_wdr.cpp:2905
+msgid "Use system-wide ipfilter.dat if available"
 msgstr ""
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
+#: src/muuli_wdr.cpp:2906
+msgid ""
+"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
+"file."
 msgstr ""
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
+#: src/muuli_wdr.cpp:2925
+msgid "Enable Online-Signature"
 msgstr ""
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
+#: src/muuli_wdr.cpp:2927
+msgid ""
+"Enables the writing of the OS file, which can be used by external apps to "
+"create signatures and the like."
 msgstr ""
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
+#: src/muuli_wdr.cpp:2932
+msgid "Update Frequency (Secs):"
 msgstr ""
 
-#: src/ServerSocket.cpp:760
-#, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
+#: src/muuli_wdr.cpp:2936
+msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
 msgstr ""
 
-#: src/IP2Country.cpp:105
-#, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] ""
-msgstr[1] ""
+#: src/muuli_wdr.cpp:2952
+msgid ""
+"Click here to select the directory containing the the Online Signature files."
+msgstr ""
 
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
+#: src/muuli_wdr.cpp:2974
+msgid "Filter incoming messages (except current chat):"
 msgstr ""
 
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
+#: src/muuli_wdr.cpp:2977
+msgid "Filter all messages"
+msgstr "Filtrera alla meddelanden"
+
+#: src/muuli_wdr.cpp:2980
+msgid "Filter messages from people not on your friend list"
 msgstr ""
 
-#: src/TransferWnd.cpp:342
-msgid "All others"
+#: src/muuli_wdr.cpp:2983
+msgid "Filter messages from unknown clients"
 msgstr ""
 
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
+#: src/muuli_wdr.cpp:2986
+msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Aktiv"
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
+msgid "add here the words amule should filter and block messages including it"
+msgstr ""
 
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Video"
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr ""
 
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Ljud"
+#: src/muuli_wdr.cpp:2998
+msgid "Comments"
+msgstr "Kommentarer"
 
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Arkiv"
+#: src/muuli_wdr.cpp:3001
+msgid "Filter comments containing (use ',' as separator):"
+msgstr ""
 
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
 msgstr ""
 
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Bilder"
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Aktivera autentisering"
 
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Text"
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr ""
 
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
 msgstr ""
 
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Lägg till kategori"
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr ""
 
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Redigera kategori"
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Lösenord:"
 
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Ta bor kategori"
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr ""
 
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Filnamn"
+#: src/muuli_wdr.cpp:3050
+msgid "Enable Proxy"
+msgstr "Aktivera proxy"
 
-#: src/KnownFile.cpp:1360
-msgid "File size"
+#: src/muuli_wdr.cpp:3051
+msgid "Enable/disable proxy support"
 msgstr ""
 
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr ""
+#: src/muuli_wdr.cpp:3056
+msgid "Proxy type:"
+msgstr "Proxytyp:"
 
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr ""
+#: src/muuli_wdr.cpp:3069
+msgid "Proxy host:"
+msgstr "Proxyserver:"
 
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr ""
+#: src/muuli_wdr.cpp:3073
+msgid "The proxy host name"
+msgstr "Proxyserverns värdnamn"
 
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr ""
+#: src/muuli_wdr.cpp:3076
+msgid "Proxy port:"
+msgstr "Proxyport:"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
+#: src/muuli_wdr.cpp:3080
+msgid "The proxy port"
+msgstr "Proxyporten"
+
+#: src/muuli_wdr.cpp:3101
+msgid "Connect to:"
+msgstr "Anslut till:"
+
+#: src/muuli_wdr.cpp:3115
+msgid "Login to remote amule"
 msgstr ""
 
-#: src/PartFileConvert.cpp:208
-#, c-format
-msgid "Importing %s: %s"
-msgstr "Importerar %s: %s"
+#: src/muuli_wdr.cpp:3120
+msgid "User name"
+msgstr "Användarnamn"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
+#: src/muuli_wdr.cpp:3137
+msgid "Remember those settings"
 msgstr ""
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
+#: src/muuli_wdr.cpp:3166
+msgid "Enable Verbose Debug-Logging."
 msgstr ""
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
+#: src/muuli_wdr.cpp:3169
+msgid "Message Categories:"
 msgstr ""
 
-#: src/PartFileConvert.cpp:331
-#, c-format
-msgid "Loading data from old download file (%u of %u)"
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Väntar..."
+
+#: src/muuli_wdr.cpp:3222
+msgid "Add imports"
 msgstr ""
 
-#: src/PartFileConvert.cpp:351
-#, c-format
-msgid "Saving data block into new single download file (%u of %u)"
+#: src/muuli_wdr.cpp:3226
+msgid "Retry selected"
 msgstr ""
 
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
+#: src/muuli_wdr.cpp:3229
+msgid "Remove selected"
 msgstr ""
 
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Tillstånd"
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Aktiva sändningar: %s"
 
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Väntar..."
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Utdelade filer"
 
-#: src/PartFileConvertDlg.cpp:176
-#, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disk: %s)"
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Välj vy"
 
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Aktiva sändningar: %s"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Visa klienter"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Läs om lista"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Skicka"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
 msgstr ""
 
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Ta bort källor?"
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr ""
 
-#: src/OtherFunctions.cpp:112
+#: src/muuli_wdr.cpp:3527
+msgid "Connect to any server and/or Kad"
+msgstr "Anslut till någon server och/eller Kad"
+
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Utdelade filer"
+
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Inaktiverad [%s]"
+
+#: src/OtherFunctions.cpp:106
 #, fuzzy
 msgid "byte"
 msgid_plural "bytes"
 msgstr[0] "byte"
 msgstr[1] "byte"
 
-#: src/OtherFunctions.cpp:114
+#: src/OtherFunctions.cpp:108
 msgid "kB"
 msgstr "kB"
 
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
+#: src/OtherFunctions.cpp:114
 msgid "TB"
 msgstr "TB"
 
-#: src/OtherFunctions.cpp:130
+#: src/OtherFunctions.cpp:124
 msgid "k"
 msgstr "k"
 
-#: src/OtherFunctions.cpp:132
+#: src/OtherFunctions.cpp:126
 msgid "M"
 msgstr "M"
 
-#: src/OtherFunctions.cpp:134
+#: src/OtherFunctions.cpp:128
 msgid "G"
 msgstr "G"
 
-#: src/OtherFunctions.cpp:136
+#: src/OtherFunctions.cpp:130
 msgid "T"
 msgstr "T"
 
-#: src/OtherFunctions.cpp:143
+#: src/OtherFunctions.cpp:137
 #, fuzzy
 msgid "byte/sec"
 msgid_plural "bytes/sec"
 msgstr[0] "byte/s"
 msgstr[1] "byte/s"
 
-#: src/OtherFunctions.cpp:147
+#: src/OtherFunctions.cpp:141
 msgid "MB/s"
 msgstr "MB/s"
 
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
 msgid "secs"
 msgstr "sekunder"
 
-#: src/OtherFunctions.cpp:170
+#: src/OtherFunctions.cpp:157
 msgid "mins"
 msgstr "minuter"
 
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
 msgid "hours"
 msgstr "timmar"
 
-#: src/OtherFunctions.cpp:185
+#: src/OtherFunctions.cpp:163
 msgid "Days"
 msgstr "Dagar"
 
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Videoklipp"
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr ""
 
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr ""
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr ""
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Stoppad"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Video"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
 msgstr "Arkiv"
 
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Texter"
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Text"
 
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Program"
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Aktiv"
 
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
 msgstr ""
 
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
 msgstr ""
 
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
+#: src/PartFileConvert.cpp:200
+#, c-format
+msgid "Importing %s: %s"
+msgstr "Importerar %s: %s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
 msgstr ""
 
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Dålig"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr ""
 
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Bra"
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr ""
 
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Normal"
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr ""
 
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Utmärkt"
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr ""
 
-#: src/OtherFunctions.cpp:693
-msgid "all"
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
 msgstr ""
 
-#: src/OtherFunctions.cpp:694
-msgid "all others"
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
 msgstr ""
 
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Tillstånd"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
 msgstr ""
 
-#: src/IPFilter.cpp:285
+#: src/PartFileConvertDlg.cpp:169
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgid "%s (Disk: %s)"
+msgstr "%s (Disk: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
+msgid ""
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
+msgstr ""
+
+#: src/PartFileConvertDlg.cpp:198
+msgid ""
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
 
-#: src/IPFilter.cpp:326
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Ta bort källor?"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "Misslyckades med att skapa OnlineSig File"
+
+#: src/PartFile.cpp:336
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgid "Trying to load backup of met-file from %s"
 msgstr ""
 
-#: src/IPFilter.cpp:331
+#: src/PartFile.cpp:343
 #, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] ""
-msgstr[1] ""
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr ""
 
-#: src/IPFilter.cpp:333
+#: src/PartFile.cpp:349
 #, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] ""
-msgstr[1] ""
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr ""
 
-#: src/StatisticsDlg.cpp:189
+#: src/PartFile.cpp:360
 #, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktiva anslutningar (1:%u)"
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr ""
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Fildetaljer"
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr ""
 
-#: src/FileDetailDialog.cpp:114
+#: src/PartFile.cpp:606
 #, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% färdig"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+msgstr ""
 
-#: src/muuli_wdr.cpp:73
-msgid "eD2k Link: "
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:80
-msgid "Commit"
-msgstr "Verkställ"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr ""
 
-#: src/muuli_wdr.cpp:81
-msgid ""
-"Click here to add the eD2k link in the text control to your download queue."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
 msgstr ""
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
-msgid ""
-"Events are displayed here. For a complete list of events, refer to the log "
-"in the Servers-tab."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
 msgstr ""
 
-#: src/muuli_wdr.cpp:92
-msgid "Loading ..."
-msgstr "Läser in ..."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Misslyckades med att öppna %s (%s)"
 
-#: src/muuli_wdr.cpp:101
-msgid "Number of users on the server you are connected to ..."
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:104
-msgid "Users: 0"
-msgstr "Användare: 0"
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr ""
 
-#: src/muuli_wdr.cpp:105
-msgid ""
-"Users connected to the current server and an estimate of the total number of "
-"users."
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:117
-msgid ""
-"Current average upload and download rates. If enabled the numbers in the "
-"braces signify the overhead from client communication."
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:125
-msgid ""
-"Displays the connected status and active transfers. Red arrows signifies "
-"that you are currently not connected, yellow arrows signify that you have "
-"low ID (firewalled) and green arrows signify that you have high ID (The "
-"optimal connection type)."
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
 msgstr ""
 
-#: src/muuli_wdr.cpp:129
-msgid "Not Connected ..."
-msgstr "Inte ansluten ..."
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:130
-msgid "Currently connected server."
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:176
-msgid "Search"
-msgstr "Sök"
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr ""
 
-#: src/muuli_wdr.cpp:182
-msgid "Name:"
-msgstr "Namn:"
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
-msgid "Local"
-msgstr "Lokal"
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
+msgid ""
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/muuli_wdr.cpp:196
-msgid "Global"
-msgstr "Global"
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:198
-#, fuzzy
-msgid "FileHash"
-msgstr "Filer"
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:206
-msgid "Extended Parameters"
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
 msgstr ""
 
-#: src/muuli_wdr.cpp:212
-msgid "Filtering"
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:223
-msgid "File Type"
-msgstr "Filtyp"
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Tar bort fil: %s"
 
-#: src/muuli_wdr.cpp:253
-msgid "Extension"
-msgstr "Filändelse"
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr ""
 
-#: src/muuli_wdr.cpp:259
-msgid "Min Size"
-msgstr "Min storlek"
+#: src/PartFile.cpp:2292
+#, c-format
+msgid ""
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
+msgstr ""
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
-msgid "Bytes"
-msgstr "Byte"
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
+msgid ""
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
-msgid "KB"
-msgstr "KB"
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:282
-msgid "Max Size"
-msgstr "Max storlek"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:305
-msgid "Availability"
-msgstr "Tillgänglighet"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:318
-msgid "Filter:"
-msgstr "Filter:"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr ""
 
-#: src/muuli_wdr.cpp:327
-msgid "Filter Results"
-msgstr "Filtrera resultat"
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr ""
 
-#: src/muuli_wdr.cpp:333
-msgid "Invert Result"
-msgstr "Invertera resultat"
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr ""
 
-#: src/muuli_wdr.cpp:339
-msgid "Hide Known Files"
-msgstr "Dölj kända filer"
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr ""
 
-#: src/muuli_wdr.cpp:355
-#, fuzzy
-msgid "More"
-msgstr "Koreanska"
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Systemets standard"
 
-#: src/muuli_wdr.cpp:356
-msgid "Searches for more results on eD2k. Not supported for Kad yet."
+#: src/Preferences.cpp:631
+msgid "Albanian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:363
-msgid "Stop"
-msgstr "Stoppa"
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arabiska"
 
-#: src/muuli_wdr.cpp:377
+#: src/Preferences.cpp:633
 #, fuzzy
-msgid "Reset Fields"
-msgstr "Ta bort vän"
+msgid "Asturian"
+msgstr "Estniska"
 
-#: src/muuli_wdr.cpp:392
-msgid "Results"
-msgstr "Resultat"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Basiska"
 
-#: src/muuli_wdr.cpp:428
-msgid "Clears completed downloads"
-msgstr ""
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgariska"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr ""
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Katalanska"
 
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr ""
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Kinesiska (Förenklad)"
 
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Skicka"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Kinesiska (Traditionell)"
 
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Kroatiska"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
 msgstr ""
 
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Stäng"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Danska"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr ""
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Nederländska"
 
-#: src/muuli_wdr.cpp:575
-msgid "Full Name :"
-msgstr ""
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Engelska (Storbritannien)"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
-msgid "N/A"
-msgstr "-"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estniska"
 
-#: src/muuli_wdr.cpp:586
-msgid "met-File :"
-msgstr ""
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Finska"
 
-#: src/muuli_wdr.cpp:597
-msgid "Hash :"
-msgstr "Hash :"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Franska"
 
-#: src/muuli_wdr.cpp:612
-msgid "Filesize :"
-msgstr "Filstorlek :"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galiciska"
 
-#: src/muuli_wdr.cpp:623
-msgid "Partfilestatus :"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Tyska"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
 msgstr ""
 
-#: src/muuli_wdr.cpp:634
-msgid "Last seen complete :"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
 msgstr ""
 
-#: src/muuli_wdr.cpp:656
-msgid "Found Sources :"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Ungerska"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Italienska"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Italienska (Schweiz)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
 msgstr ""
 
-#: src/muuli_wdr.cpp:667
-msgid "Transferring Sources :"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Koreanska"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:678
-msgid "Filepart-Count :"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:689
-msgid "Available :"
-msgstr "Tillgänglig :"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Polska"
 
-#: src/muuli_wdr.cpp:700
-msgid "Datarate :"
-msgstr "Datahastighet :"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portugisiska"
 
-#: src/muuli_wdr.cpp:711
-msgid "Download Active Time: "
-msgstr ""
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portugisiska (Brasilien)"
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
-msgid "Transferred :"
-msgstr "Överförd :"
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Ryska"
 
-#: src/muuli_wdr.cpp:733
-msgid "Completed Size :"
-msgstr ""
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Slovenska"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
-msgid "Intelligent Corruption Handling"
-msgstr ""
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Spanska"
 
-#: src/muuli_wdr.cpp:769
-msgid "Lost to corruption :"
+#: src/Preferences.cpp:664
+msgid "Swedish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:780
-msgid "Gained by compression :"
+#: src/Preferences.cpp:665
+msgid "Turkish"
 msgstr ""
 
-#: src/muuli_wdr.cpp:791
-msgid "Packages saved by I.C.H. :"
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
 msgstr ""
 
-#: src/muuli_wdr.cpp:811
-msgid "File Names"
-msgstr "Filnamn"
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Språk"
 
-#: src/muuli_wdr.cpp:825
-msgid "Takeover"
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
 msgstr ""
 
-#: src/muuli_wdr.cpp:835
-msgid "Cleanup"
-msgstr ""
-
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
-msgid "Apply"
-msgstr "Verkställ"
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "Inte tillgänglig"
 
-#: src/muuli_wdr.cpp:854
-msgid "Ok"
-msgstr "Ok"
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr ""
 
-#: src/muuli_wdr.cpp:883
-msgid "Comment/Rate file (Text will be visible to all users)"
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
 msgstr ""
 
-#: src/muuli_wdr.cpp:897
+#: src/Preferences.cpp:1766
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
 
-#: src/muuli_wdr.cpp:905
-msgid "File Quality"
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:920
-msgid "Choose the file rating or advice users if the file is invalid ..."
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:964
-msgid "Refresh"
-msgstr "Uppdatera"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Anslutning"
 
-#: src/muuli_wdr.cpp:991
-msgid "Downloading, please wait ..."
-msgstr "Hämtar, vänta ..."
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Kataloger"
 
-#: src/muuli_wdr.cpp:997
-msgid "Unknown size"
-msgstr "Okänd storlek"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Servrar"
 
-#: src/muuli_wdr.cpp:1021
-msgid "Required Information"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Filer"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Säkerhet"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1026
-msgid "IP Address :"
-msgstr "IP-adress :"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Proxy"
 
-#: src/muuli_wdr.cpp:1032
-msgid "Port :"
-msgstr "Port :"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1042
-msgid "Additional Information"
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1047
-msgid "Username :"
-msgstr "Användarnamn :"
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1053
-msgid "Userhash :"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Händelser"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Felsökning"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Aktuell session"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1206
-msgid "Download-Speed"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
-msgid "Current"
-msgstr "Aktuell"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"aMule måste startas om för att aktivera dessa ändringar:\n"
+"\n"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
-msgid "Running average"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP-port ändrad.\n"
+
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP-port ändrad.\n"
+
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "- UDP-port ändrad.\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Anslutningen misslyckades "
+
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Anslutningen misslyckades "
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
-msgid "Session average"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1255
-msgid "Upload-Speed"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Språk ändrat.\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1304
-msgid "Connections"
-msgstr "Anslutningar"
+#: src/PrefsUnifiedDlg.cpp:652
+#, fuzzy
+msgid "- ED2K network enabled.\n"
+msgstr "Alla nätverk är inaktiverade."
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
-msgid "Active downloads"
-msgstr "Aktiva hämtningar"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1333
-msgid "Active connections (1:1)"
-msgstr "Aktiva anslutningar (1:1)"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
-msgid "Active uploads"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
-msgid "Statistics Tree"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
-msgid "Username:"
-msgstr "Användarnamn:"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Temporära filer"
 
-#: src/muuli_wdr.cpp:1386
-msgid "Userhash:"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Inkommande filer"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1409
-msgid "Client software:"
-msgstr "Klientprogramvara:"
+#: src/PrefsUnifiedDlg.cpp:1003
+#, c-format
+msgid "Choose a folder for %s"
+msgstr "Välj en mapp för %s"
 
-#: src/muuli_wdr.cpp:1418
-msgid "Client version:"
-msgstr "Klientversion:"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1425
-msgid "IP address:"
-msgstr "IP-adress:"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Välj webbläsare"
 
-#: src/muuli_wdr.cpp:1434
-msgid "User ID:"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1441
-msgid "Server IP:"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1450
-msgid "Server name:"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1457
-msgid "Obfuscation:"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1466
-msgid "Kad:"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1477
-msgid "Transfers to client"
+#: src/PrefsUnifiedDlg.cpp:1199
+#, fuzzy
+msgid "disabled"
+msgstr "inaktivera"
+
+#: src/PrefsUnifiedDlg.cpp:1222
+#, c-format
+msgid "Execute command on '%s' event"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1482
-msgid "Current request:"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1495
-msgid "Average upload rate:"
+#: src/PrefsUnifiedDlg.cpp:1233
+#, fuzzy
+msgid "Core command:"
+msgstr "Tillgängliga kommandon:\n"
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1504
-msgid "Average download rate:"
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1511
-msgid "Uploaded (session):"
-msgstr "Skickat (session):"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1520
-msgid "Downloaded (session):"
-msgstr "Hämtat (session):"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1527
-msgid "Uploaded (total):"
-msgstr "Skickat (totalt):"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1536
-msgid "Downloaded (total):"
-msgstr "Hämtat (totalt):"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1547
-msgid "Scores"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1554
-msgid "DL/UP modifier:"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1563
-msgid "Secure ident:"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1579
-msgid "Queue score:"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Fil"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1610
-msgid "Nick"
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Ange nytt namn för den här filen:"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1614
-msgid "This is the name that other users will see when connecting to you."
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Språk"
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Avbryt"
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1634
-msgid "Check for new version at startup"
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
 msgstr ""
+"Misslyckades med att ansluta till alla listade servrar. Gör ett nytt försök."
 
-#: src/muuli_wdr.cpp:1635
-msgid "Enabling this will make aMule check for new version at startup"
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1638
-msgid "Start minimized"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1639
-msgid "Enabling this makes aMule minimize itself upon start."
+#: src/ServerConnect.cpp:198
+#, c-format
+msgid "Connected to %s (%s:%i)"
+msgstr "Ansluten till %s (%s:%i)"
+
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "Anslutning etablerad: %s"
+
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1642
-msgid "Prompt on exit"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Förlorade anslutningen till %s (%s:%i)"
+
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) verkar vara död."
+
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) verkar vara full."
+
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Anslutningen förlorades"
+
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1647
-msgid "Enable Tray Icon"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1648
-msgid "This Enables/Disables the system tray (or taskbar) icon."
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1651
-msgid "Minimize to Tray Icon"
+#: src/ServerList.cpp:88
+#, c-format
+msgid "Loading server.met file: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1652
-msgid ""
-"Enabling this will make aMule minimize to the System Tray, rather than the "
-"taskbar."
+#: src/ServerList.cpp:93
+msgid "Server.met file not found!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
+#: src/ServerList.cpp:101
+#, c-format
+msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
+#: src/ServerList.cpp:107
+msgid "Failed to open server.met!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1669
-msgid "Browser Selection"
+#: src/ServerList.cpp:118
+#, c-format
+msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
+#: src/ServerList.cpp:173
+#, fuzzy, c-format
+msgid "%i server in server.met found"
+msgid_plural "%i servers in server.met found"
+msgstr[0] "Inga giltiga servrar att ansluta till hittades i serverlista"
+msgstr[1] "Inga giltiga servrar att ansluta till hittades i serverlista"
+
+#: src/ServerList.cpp:175
+#, fuzzy, c-format
+msgid "%d server added"
+msgid_plural "%d servers added"
+msgstr[0] "Servernamn"
+msgstr[1] "Servernamn"
+
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr ""
 
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
+#: src/ServerList.cpp:195
+#, c-format
+msgid "Server not added: [%s:%d] does not specify a valid port."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
+#: src/ServerList.cpp:213
+#, c-format
+msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
+msgstr ""
 
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
+#: src/ServerList.cpp:232
+#, c-format
+msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
+#: src/ServerList.cpp:250
+#, c-format
+msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1696
+#: src/ServerList.cpp:345
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"You are connected to the server you are trying to delete. please disconnect "
+"first."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1705
-msgid "Open in new tab if possible"
-msgstr ""
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Misslyckades med att öppna \"%s\""
 
-#: src/muuli_wdr.cpp:1707
-msgid "Open the web page in a new tab instead of in a new window when possible"
+#: src/ServerList.cpp:685
+msgid "Failed to save server.met!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1712
-msgid "Video Player"
-msgstr "Videouppspelare"
+#: src/ServerList.cpp:832
+msgid "Invalid URL"
+msgstr "Ogiltig URL"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
+msgstr "Misslyckades med att hämta nodlistan."
+
+#: src/ServerList.cpp:869
+msgid ""
+"No server list address entry in 'addresses.dat' found. Please paste a valid "
+"server list address into this file in order to auto-update your server list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/ServerList.cpp:882
+#, c-format
+msgid "Start downloading server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
-msgid "Upload"
+#: src/ServerList.cpp:891
+#, c-format
+msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1775
-msgid "Slot Allocation"
+#: src/ServerList.cpp:895
+msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1796
-msgid "This is the standard eD2k port and cannot be disabled."
+#: src/ServerList.cpp:985
+msgid ""
+"Local server is filtered by the IPFilters, reconnecting to a different "
+"server!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Servernamn"
+
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Adress"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Port"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Beskrivning"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Användare"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Statisk"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Version"
+
+#: src/ServerListCtrl.cpp:148
+msgid ""
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Okänt namn)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "inaktivera"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Servrar (%i)"
 
-#: src/muuli_wdr.cpp:1817
-#, fuzzy
-msgid "Bind Address"
-msgstr "Adress"
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Server"
 
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Anslut till server"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Max anslutningar"
+#: src/ServerListCtrl.cpp:417
+#, fuzzy
+msgid "Remove server"
+msgstr "Ta bort servrar"
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/ServerListCtrl.cpp:419
+#, fuzzy
+msgid "Remove servers"
+msgstr "Ta bort servrar"
 
-#: src/muuli_wdr.cpp:1886
-msgid "Kademlia"
-msgstr "Kademlia"
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Ta bort alla servrar"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1899
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Återanslut till server"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Är du säker på att du vill ta bort alla servrar?"
+
+#: src/ServerListCtrl.cpp:541
 #, fuzzy
-msgid "Enable UPnP"
-msgstr "Aktivera proxy"
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Är du säker på att du vill ta bort alla servrar?"
 
-#: src/muuli_wdr.cpp:1902
+#: src/ServerListCtrl.cpp:543
 #, fuzzy
-msgid "UPnP TCP Port:"
-msgstr "TCP-port: %d"
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Är du säker på att du vill ta bort alla servrar?"
 
-#: src/muuli_wdr.cpp:1913
-msgid "Autoconnect on startup"
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1916
-msgid "Reconnect on loss"
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1947
-msgid "Remove dead server after"
-msgstr "Ta bort död server efter"
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr ""
+"\tMest sannolikt att det på grund av du är bakom en brandvägg eller router."
 
-#: src/muuli_wdr.cpp:1953
-msgid "retries"
-msgstr "försök"
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tFör mer information, referera till http://wiki.amule.org"
 
-#: src/muuli_wdr.cpp:1960
-msgid "Auto-update server list at startup"
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1963
-msgid "List"
-msgstr ""
+#: src/ServerSocket.cpp:535
+#, fuzzy, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Ta bort död server efter"
+msgstr[1] "Ta bort död server efter"
 
-#: src/muuli_wdr.cpp:1968
-msgid "Update server list when connecting to a server"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1971
-msgid "Update server list when a client connects"
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1974
-msgid "Use priority system"
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1978
-msgid "Use smart LowID check on connect"
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1982
-msgid "Safe connect"
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:1986
-msgid "Autoconnect to servers in static list only"
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
 msgstr ""
 
-#: src/muuli_wdr.cpp:1989
-msgid "Set manually added servers to High Priority"
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2024
-msgid "Add files to download in pause mode"
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2027
-msgid "Add files to download with auto priority"
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2030
-msgid "Try to download first and last chunks first"
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr ""
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
 
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr ""
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kademlia-status:"
 
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr ""
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "Kör på %s"
 
-#: src/muuli_wdr.cpp:2045
-msgid "From the same category"
-msgstr ""
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Kör"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Status:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Anslutningstillstånd:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
+#: src/ServerWnd.cpp:216
+#, fuzzy
+msgid "UDP Connection State:"
+msgstr "Anslutningstillstånd:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2069
-msgid "Enter here the min disk space desired."
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
+#: src/ServerWnd.cpp:237
+#, fuzzy
+msgid "Connecting to buddy"
+msgstr "Ansluter till %s"
+
+#: src/ServerWnd.cpp:240
+#, fuzzy, c-format
+msgid "Connected to buddy at %s"
+msgstr "Ansluten till %s %s"
+
+#: src/ServerWnd.cpp:250
+#, fuzzy
+msgid "Indexed sources:"
+msgstr "Ta bort källor?"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2122
-msgid "(Right click on folder icon for recursive share)"
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Kör inte"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2129
-msgid "Share hidden files"
-msgstr "Dela ut dolda filer"
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/muuli_wdr.cpp:2149
-msgid "Graphs"
-msgstr "Diagram"
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
-msgid "Update delay : 5 secs"
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2158
-msgid "Time for average graph: 100 mins"
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2164
-msgid "Connections Graph Scale: 100 "
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr ""
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Användarnamn"
 
-#: src/muuli_wdr.cpp:2177
-msgid "Background"
-msgstr "Bakgrund"
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Hämtningshastighet: %.1f"
 
-#: src/muuli_wdr.cpp:2178
-msgid "Grid"
-msgstr ""
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Sändningshastighet: %.1f"
 
-#: src/muuli_wdr.cpp:2179
-msgid "Download current"
-msgstr ""
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Tillgänglig :"
 
-#: src/muuli_wdr.cpp:2180
-msgid "Download running average"
-msgstr ""
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Sändningsstatus"
 
-#: src/muuli_wdr.cpp:2181
-msgid "Download session average"
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Hämtningsstatus"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2182
-msgid "Upload current"
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Filnamn"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Utdelade filer"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2183
-msgid "Upload running average"
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2184
-msgid "Upload session average"
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2185
-msgid "Active connections"
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Utdelningsratio"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2188
-msgid "Systray Icon Speedbar"
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2189
-msgid "Kad-nodes current"
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2190
-msgid "Kad-nodes running"
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2191
-msgid "Kad-nodes session"
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
-msgid "Select"
-msgstr "Välj"
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Byt namn"
 
-#: src/muuli_wdr.cpp:2214
-msgid "Number of Client Versions shown (0=unlimited)"
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2272
-msgid "!!! WARNING !!!"
-msgstr "!!! VARNING !!!"
-
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2288
-msgid "Max new connections / 5 secs"
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2294
-msgid "File Buffer Size: 240000 bytes"
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2300
-msgid "Upload Queue Size: 5000 clients"
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2306
-msgid "Server connection refresh interval: Disable"
-msgstr ""
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Utdelade filer (%i)"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Visa procentandel"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Visa förloppsmätare"
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Filnamn"
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Flat"
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Rund"
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Kolumnsortering"
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Aktiva sändningar: %s"
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Väntande sändningar: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Klienter"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "Okänd storlek"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "Filtrered"
+
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "Bannlyst"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Fungerande servrar: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "Acceptera externa anslutningar"
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Totalt: %s"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Borttagna servrar: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Filtrerade servrar: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP-port"
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Totalt antal filer: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2583
-msgid "Click here to apply any changes made to the preferences."
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2587
-msgid "Reset any changes made to the preferences."
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2611
-msgid "Title :"
-msgstr "Titel :"
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2621
-msgid "Comment :"
-msgstr "Kommentar :"
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Operativsystem"
 
-#: src/muuli_wdr.cpp:2631
-msgid "Incoming Dir :"
+#: src/Statistics.cpp:980
+msgid "Not Received"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktiva anslutningar (1:%u)"
 
-#: src/muuli_wdr.cpp:2644
-msgid "Change priority for new assigned files :"
-msgstr ""
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Inte tillgänglig"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
-msgstr "Ändra inte"
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Aldrig"
 
-#: src/muuli_wdr.cpp:2663
-msgid "Select color for this Category (currently selected) :"
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Serverinformation"
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
-msgid "Click this button to reset the log."
+#: src/TextClient.cpp:323
+msgid ""
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule-logg"
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr ""
 
-#: src/muuli_wdr.cpp:2806
-msgid "Click on this button to update the servers list from URL ..."
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
 msgstr ""
 
-#: src/muuli_wdr.cpp:2810
-msgid "Server list"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2815
-msgid ""
-"Enter the url to a server.met file here and press the button to the left to "
-"update the list of known servers."
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2822
-msgid "Add server manually: Name"
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2826
-msgid "Enter the name of the new server here"
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2833
-msgid "Enter the IP of the server here, using the x.x.x.x format."
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
 msgstr ""
 
-#: src/muuli_wdr.cpp:2840
-msgid "Enter the port of the server here."
+#: src/TextClient.cpp:653
+#, c-format
+msgid "Request failed with the following error: %s"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2844
-msgid "Add manually a server (fill fields to the left before) ..."
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2890
-msgid "ED2K Info"
-msgstr "ED2K-info"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "AV"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
-msgid "Kad Info"
-msgstr "Kad-info"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "PÅ"
 
-#: src/muuli_wdr.cpp:2923
-msgid "Click on this button to update the nodes list from URL ..."
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2927
-msgid "Nodes (0)"
-msgstr "Noder (0)"
-
-#: src/muuli_wdr.cpp:2932
-msgid ""
-"Enter the url to a nodes.dat file here and press the button to the left to "
-"update the list of known nodes."
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2937
-msgid "Nodes stats"
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2988
-msgid "Bootstrap"
+#: src/TextClient.cpp:699
+msgid "eD2k"
 msgstr ""
 
-#: src/muuli_wdr.cpp:2991
-msgid "New node"
-msgstr "Ny nod"
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Ansluten till %s %s %s"
 
-#: src/muuli_wdr.cpp:2996
-msgid "IP:"
-msgstr "IP:"
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Ansluter nu"
 
-#: src/muuli_wdr.cpp:3025
-msgid "Port:"
-msgstr "Port:"
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "brandvägg"
 
-#: src/muuli_wdr.cpp:3042
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"Bootstrap from \n"
-"known clients"
+"\n"
+"Download:\t%s"
 msgstr ""
+"\n"
+"Hämta:\t%s"
 
-#: src/muuli_wdr.cpp:3048
-msgid "Disconnect Kad"
-msgstr "Koppla från Kad"
+#: src/TextClient.cpp:737
+#, c-format
+msgid ""
+"\n"
+"Upload:\t%s"
+msgstr ""
+"\n"
+"Skicka:\t%s"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
+#: src/TextClient.cpp:740
+#, c-format
+msgid ""
+"\n"
+"Clients in queue:\t%d\n"
 msgstr ""
+"\n"
+"Klienter i kö:\t%d\n"
 
-#: src/muuli_wdr.cpp:3096
-msgid "Protocol Obfuscation"
+#: src/TextClient.cpp:743
+#, c-format
+msgid ""
+"\n"
+"Total sources:\t%d\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3099
-msgid "Support Protocol Obfuscation"
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3101
-msgid ""
-"This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
-"connections from other clients."
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3104
-msgid "Use obfuscation for outgoing connections"
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3106
-msgid ""
-"This option makes aMule use Protocol Obfuscation when connecting other "
-"clients/servers."
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3109
-msgid "Accept only obfuscated connections"
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr ""
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3110
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr ""
+
+#: src/TextClient.cpp:854
 msgid ""
-"This option makes aMule only accept obfuscated connections. You will have "
-"less sources, but all your traffic will be obfuscated"
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
+"\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Filalternativ"
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr ""
 
-#: src/muuli_wdr.cpp:3120
-msgid "Everybody"
-msgstr "Alla"
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
 
-#: src/muuli_wdr.cpp:3122
-msgid "No one"
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
 msgstr "Vem kan se utdelade filer:"
 
-#: src/muuli_wdr.cpp:3125
-msgid "Select who can request to view a list of your shared files."
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3130
-msgid "IP-Filtering"
-msgstr "IP-filtrering"
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr ""
 
-#: src/muuli_wdr.cpp:3137
-#, fuzzy
-msgid "Filter clients"
-msgstr "Fildetaljer"
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr ""
 
-#: src/muuli_wdr.cpp:3139
-msgid ""
-"Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3142
-#, fuzzy
-msgid "Filter servers"
-msgstr "Filtreringsnivå:"
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Anslut till nätverket."
 
-#: src/muuli_wdr.cpp:3144
+#: src/TextClient.cpp:868
 msgid ""
-"Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3151
-msgid "Reload List"
-msgstr "Läs om lista"
-
-#: src/muuli_wdr.cpp:3152
-msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3160
-msgid "URL:"
-msgstr "URL:"
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Anslut endast till Kad."
 
-#: src/muuli_wdr.cpp:3166
-msgid "Update now"
-msgstr "Uppdatera nu"
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Koppla från nätverket."
 
-#: src/muuli_wdr.cpp:3171
-msgid "Auto-update ipfilter at startup"
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3176
-msgid "Filtering Level:"
-msgstr "Filtreringsnivå:"
-
-#: src/muuli_wdr.cpp:3186
-msgid "Always filter LAN IPs"
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3190
-msgid "Paranoid handling of non-matching IPs"
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Koppla endast från Kad."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3192
+#: src/TextClient.cpp:878
 msgid ""
-"Rejects packet if the client ip is different from the ip where the packet is "
-"received from. Use with caution."
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
+"\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3195
-msgid "Use system-wide ipfilter.dat if available"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3196
-msgid ""
-"If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
-"file."
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3223
-msgid "Enable Online-Signature"
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3225
-msgid ""
-"Enables the writing of the OS file, which can be used by external apps to "
-"create signatures and the like."
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3230
-msgid "Update Frequency (Secs):"
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3234
-msgid "Change the frequency (in seconds) of Online Signature updates."
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3249
-msgid ""
-"Click here to select the directory containing the the Online Signature files."
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Inaktivera/Aktivera"
-
-#: src/muuli_wdr.cpp:3271
-msgid "Filter incoming messages (except current chat):"
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3277
-msgid "Filter all messages"
-msgstr "Filtrera alla meddelanden"
-
-#: src/muuli_wdr.cpp:3280
-msgid "Filter messages from people not on your friend list"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3283
-msgid "Filter messages from unknown clients"
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3286
-msgid "Filter messages containing (use ',' as separator):"
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
-msgid "add here the words amule should filter and block messages including it"
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3302
-msgid "Comments"
-msgstr "Kommentarer"
-
-#: src/muuli_wdr.cpp:3310
-msgid "Filter comments containing (use ',' as separator):"
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3339
-msgid "Enable Proxy"
-msgstr "Aktivera proxy"
-
-#: src/muuli_wdr.cpp:3340
-msgid "Enable/disable proxy support"
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3345
-msgid "Proxy type:"
-msgstr "Proxytyp:"
-
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3359
-msgid "Proxy host:"
-msgstr "Proxyserver:"
-
-#: src/muuli_wdr.cpp:3363
-msgid "The proxy host name"
-msgstr "Proxyserverns värdnamn"
-
-#: src/muuli_wdr.cpp:3366
-msgid "Proxy port:"
-msgstr "Proxyport:"
-
-#: src/muuli_wdr.cpp:3370
-msgid "The proxy port"
-msgstr "Proxyporten"
-
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Aktivera autentisering"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Lösenord:"
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "Filtreringsnivå:"
 
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
+#: src/TextClient.cpp:913
+msgid "Execute a search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3424
-msgid "Connect to:"
-msgstr "Anslut till:"
-
-#: src/muuli_wdr.cpp:3438
-msgid "Login to remote amule"
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3443
-msgid "User name"
-msgstr "Användarnamn"
-
-#: src/muuli_wdr.cpp:3460
-msgid "Remember those settings"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3492
-msgid "Enable Verbose Debug-Logging."
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3497
-msgid "Message Categories:"
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3550
-msgid "Add imports"
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3554
-msgid "Retry selected"
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3557
-msgid "Remove selected"
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "Visa förloppsmätare"
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "Visa förloppsmätare"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3668
-msgid "Connect to any server and/or Kad"
-msgstr "Anslut till någon server och/eller Kad"
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Pausa hämtning."
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr ""
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Fortsätt hämtning."
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Avbryt hämtning."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Ställ in hämtningsprioritet."
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
 msgstr ""
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
 msgstr ""
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Visa köer/listor."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
 msgstr ""
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Ny kategori"
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Visa sändningskö."
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Välj en mapp för inkommande filer"
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Visa hämtningskö."
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Du måste ange ett namn för kategorin!"
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Visa logg."
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Du måste ange en sökväg för kategorin!"
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Visa serverlista."
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Nollställ logg."
 
-#: src/ExternalConnector.cpp:141
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
+msgid "Deprecated command, use '%s' instead."
 msgstr ""
 
-#: src/ExternalConnector.cpp:143
+#: src/TextClient.cpp:965
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr ""
-
-#: src/ExternalConnector.cpp:155
 msgid ""
-"\n"
-"This command cannot have an argument.\n"
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
 msgstr ""
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
+#: src/TextClient.h:60
+msgid "aMule text client"
 msgstr ""
 
-#: src/ExternalConnector.cpp:160
-msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Tillgängliga kommandon:\n"
-
-#: src/ExternalConnector.cpp:185
+#: src/ThreadTasks.cpp:454
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
 msgstr ""
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Avslutar programmet."
-
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Visa hjälp."
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
 msgstr ""
 
-#: src/ExternalConnector.cpp:243
-#, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
 msgstr ""
-"\n"
-"Använd \"%s\" för kommandolista\n"
-"\n"
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Syntaxfel!"
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "För många anslutningar"
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
+#: src/TransferWnd.cpp:341
+msgid "All others"
 msgstr ""
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
 msgstr ""
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr ""
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Lägg till kategori"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Ogiltigt argument."
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Redigera kategori"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr ""
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Ta bor kategori"
 
-#: src/ExternalConnector.cpp:297
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Skriv \"%s\" för att få mer hjälp.\n"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
 
-#: src/ExternalConnector.cpp:362
+#: src/UploadClient.cpp:683
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Det här är %s %s %s\n"
+msgid "Hashset requested for unknown file: %s"
+msgstr ""
 
-#: src/ExternalConnector.cpp:364
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Det här är %s %s\n"
-
-#: src/ExternalConnector.cpp:395
-msgid ""
-"\n"
-"Creating client...\n"
+msgid "Resuming uploads of file: %s"
 msgstr ""
-"\n"
-"Skapar klient...\n"
 
-#: src/ExternalConnector.cpp:418
+#: src/UploadQueue.cpp:613
 #, c-format
-msgid ""
-"\n"
-"Ok, exiting %s...\n"
+msgid "Suspending upload of file: %s"
 msgstr ""
-"\n"
-"Ok, avslutar %s...\n"
 
-#: src/ExternalConnector.cpp:424
-msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
 msgstr ""
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Visa den här hjälptexten."
-
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
+#: src/UserEvents.h:60
+msgid "Download completed"
 msgstr ""
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
 msgstr ""
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
 msgstr ""
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Läs in konfiguration från fil."
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr ""
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
 msgstr ""
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
 msgstr ""
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Ställer in programlokalen (språk)."
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr ""
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
+#: src/UserEvents.h:87
+msgid "Message sender."
 msgstr ""
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/UserEvents.h:92
+msgid "Out of space"
 msgstr ""
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Skriv ut programversion."
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr ""
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] ""
-msgstr[1] ""
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr ""
 
-#: src/ClientCreditsList.cpp:171
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] ""
-msgstr[1] ""
-
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
+msgid "Processing file number %u: %s"
 msgstr ""
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
 msgstr ""
 
-#: src/amuled.cpp:750
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "ERROR: %s"
-msgstr "FEL: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Avbannlys"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Visa sändningar"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Visa kö"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Visa klienter"
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Välkommen!"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Välj vy"
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Klientprogramvara"
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Väntande"
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Sändningstid"
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Skicka/Hämta"
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Fjärrstatus"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Ta bort"
 
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Filprioritet"
-
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Betyg"
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Senast sedd"
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Sändningsstatus"
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Spara"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr ""
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Kopiera till urklipp"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Hämtningsstatus"
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr ""
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
 msgstr ""
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Klientdetaljer"
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Om aLinkCreator"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Kunde inte öppna"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Inte färdig"
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
 msgstr ""
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Verifierad - OK"
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Inte tillgänglig"
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Hashar..."
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
 msgstr ""
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
 msgstr ""
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Obegränsad"
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+#, fuzzy
+msgid "Cancelled !"
+msgstr "Avbruten!"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr ""
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
+#, c-format
+msgid "Done in %.2f s"
+msgstr "Klar om %.2f s"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:354
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "UL: %u"
+msgid "Unable to open %s"
+msgstr "Kunde inte öppna %s"
+
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:364
+#: src/utils/wxCas/src/onlinesig.cpp:236
 #, c-format
-msgid "DL: %u"
+msgid "%02uh %02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:368
+#: src/utils/wxCas/src/onlinesig.cpp:238
 #, c-format
-msgid "Download speed: %.1f"
+msgid "%02umin %02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:370
+#: src/utils/wxCas/src/onlinesig.cpp:240
 #, c-format
-msgid "Upload speed: %.1f"
+msgid "%02us"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Klientinformation"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/utils/wxCas/src/onlinesig.cpp:342
 #, c-format
-msgid "Nickname: %s"
-msgstr "Smeknamn: %s"
+msgid "%.2f KB"
+msgstr "%.2f KB"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr ""
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Servernamn: "
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "ServerIP: "
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr ""
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "System"
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Om wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:483
-#, c-format
-msgid "Total UL: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Dölj aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Oh Oh, aMule kör inte..."
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Visa aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule kör"
 
-#: src/ChatSelector.cpp:127
-#, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule kör men är frånkopplad"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule ansluter..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Oh oh, status för aMule är okänd..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " har kört i "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " är stoppad !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " är inte ansluten!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " ansluter..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " gör någonting konstigt, kontrollera det!"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " är ansluten till "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "av"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " är på "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+#, fuzzy
+msgid " with "
+msgstr "] med "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
 msgstr ""
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Ansluten till klient ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ""
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Ansluter till klient ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr ""
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
 msgstr ""
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Stäng flik"
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr ""
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Stäng alla flikar"
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+#, fuzzy
+msgid " kB/s"
+msgstr "kB/s"
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Stäng andra flikar"
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr ""
 
-#: src/ServerList.cpp:84
-#, c-format
-msgid "Loading server.met file: %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
 msgstr ""
 
-#: src/ServerList.cpp:89
-msgid "Server.met file not found!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
 msgstr ""
 
-#: src/ServerList.cpp:97
-#, c-format
-msgid "Failed to load server.met file '%s', unknown format encountered."
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
 msgstr ""
 
-#: src/ServerList.cpp:103
-msgid "Failed to open server.met!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
 msgstr ""
 
-#: src/ServerList.cpp:114
-#, c-format
-msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
 msgstr ""
 
-#: src/ServerList.cpp:169
-#, fuzzy, c-format
-msgid "%i server in server.met found"
-msgid_plural "%i servers in server.met found"
-msgstr[0] "Inga giltiga servrar att ansluta till hittades i serverlista"
-msgstr[1] "Inga giltiga servrar att ansluta till hittades i serverlista"
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr ""
 
-#: src/ServerList.cpp:171
-#, fuzzy, c-format
-msgid "%d server added"
-msgid_plural "%d servers added"
-msgstr[0] "Servernamn"
-msgstr[1] "Servernamn"
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr ""
 
-#: src/ServerList.cpp:192
-#, c-format
-msgid "Server not added: [%s:%d] does not specify a valid port."
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
 msgstr ""
 
-#: src/ServerList.cpp:208
-#, c-format
-msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
 msgstr ""
 
-#: src/ServerList.cpp:228
-#, c-format
-msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
 msgstr ""
 
-#: src/ServerList.cpp:247
-#, c-format
-msgid "Server added: Server at [%s:%d] using the name '%s'."
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
 msgstr ""
 
-#: src/ServerList.cpp:342
-msgid ""
-"You are connected to the server you are trying to delete. please disconnect "
-"first."
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
 msgstr ""
 
-#: src/ServerList.cpp:629
-msgid "Failed to save server.met!"
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
 msgstr ""
 
-#: src/ServerList.cpp:782
-msgid "Invalid URL"
-msgstr "Ogiltig URL"
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr ""
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
 msgstr ""
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Användare"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
 msgstr ""
 
-#: src/ServerList.cpp:818
-msgid ""
-"No server list address entry in 'addresses.dat' found. Please paste a valid "
-"server list address into this file in order to auto-update your server list"
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
 msgstr ""
 
-#: src/ServerList.cpp:831
-#, c-format
-msgid "Start downloading server list from %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
 msgstr ""
 
-#: src/ServerList.cpp:840
-#, c-format
-msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Validera"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
 msgstr ""
 
-#: src/ServerList.cpp:844
-msgid "No valid server.met auto-download url on addresses.dat"
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
 msgstr ""
 
-#: src/ServerList.cpp:937
-msgid ""
-"Local server is filtered by the IPFilters, reconnecting to a different "
-"server!"
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
 msgstr ""
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
 msgstr ""
 
-#: src/amule.cpp:703
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
 msgstr ""
-"Din lokal har ändrats till systemets standardlokal på grund av en "
-"konfigurationsändring. Ursäkta."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP-port"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Använd gzip-komprimering"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
 msgstr ""
-"Du har inga servrar i serverlistan.\n"
-"Vill du att aMule ska hämta en ny lista nu?"
 
-#: src/amule.cpp:787
-#, fuzzy
-msgid "Server list download"
-msgstr "Serverlista"
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr ""
 
-#: src/amule.cpp:846
-#, c-format
-msgid "web server running on pid %d"
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
 msgstr ""
 
-#: src/amule.cpp:850
-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"
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
 msgstr ""
 
-#: src/amule.cpp:937
-#, c-format
-msgid "Could not bind ports to the specified address: %s"
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
 msgstr ""
 
-#: src/amule.cpp:964
-#, 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"
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr ""
 
-#: src/amule.cpp:970
-#, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
 msgstr ""
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Misslyckades med att skapa OnlineSig File"
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr ""
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Misslyckades med att skapa aMule OnlineSig File"
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr ""
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
 msgstr ""
 
-#: src/amule.cpp:1308
+#: src/webserver/src/WebServer.cpp:370
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Det här är första gången som du kör aMule %s"
+msgid "Request failed with the following error: %s."
+msgstr ""
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Den här versionen är en testversion, uppdaterad dagligen, och\n"
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr ""
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
 msgstr ""
-"vi ger ingen garanti, den kommer inte att förstöra någonting, bränna,\n"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "när ditt hus eller döda din hund. Men den *bör* vara användbar ändå.\n"
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr ""
 
-#: src/amule.cpp:1316
-msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
 msgstr ""
 
-#: src/amule.cpp:1317
-msgid ""
-"\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
 msgstr ""
 
-#: src/amule.cpp:1318
-msgid ""
-"\n"
-"* Disabled updating the server list from other server and clients.\n"
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
 msgstr ""
 
-#: src/amule.cpp:1319
-msgid ""
-"\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
 msgstr ""
 
-#: src/amule.cpp:1320
-msgid ""
-"\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
 msgstr ""
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
-msgstr "Mer information, support och nya utgåvor kan hittas på vår,\n"
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Kontrollerar lösenord\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
 msgstr ""
-"webbplats, www.aMule.org, eller i vår IRC-kanal #aMule på irc.freenode.net.\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Rapportera gärna eventuella fel på http://forum.amule.org"
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr ""
 
-#: src/amule.cpp:1341
-msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
 msgstr ""
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
 msgstr ""
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "FEL: kan inte öppna loggfilen"
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr ""
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "VARNING: loggfilen är tom. Någonting är fel."
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr ""
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Loggen har nollställts"
+#, fuzzy
+#~ msgid "Romanian"
+#~ msgstr "Kroatiska"
 
-#: src/amule.cpp:1826
-#, c-format
-msgid "ServerMessage: %s"
-msgstr "Servermeddelande: %s"
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Hämtningsstatus"
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Misslyckades med att hämta nodlistan."
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Misslyckades med att öppna den hämtade versionskontrollfilen"
+#~ msgid "..."
+#~ msgstr "..."
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Skadad versionskontrollfil"
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Du använder en utdaterad version av aMule!"
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
 
-#: src/amule.cpp:1907
-#, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr ""
-"Din version av aMule är %i.%i.%i och den senaste versionen är %li.%li.%li"
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Den senaste versionen kan alltid hittas på http://www.amule.org"
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
 
-#: src/amule.cpp:1911
-#, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "VARNING: Din version av aMuled är utdaterad: %i.%i.%i < %li.%li.%li"
+#~ msgid "Transferring"
+#~ msgstr "Överför"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Din kopia av aMule är uppdaterad."
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "VARNING: Misslyckades med att ta bort %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Misslyckades med att hämta versionskontrollfilen"
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "Hämtar"
 
-#: src/amule.cpp:2025
-#, c-format
-msgid "Users: %s | Files: %s"
-msgstr ""
+#~ msgid "Transfers"
+#~ msgstr "Överföringar"
 
-#: src/amule.cpp:2026
-#, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr ""
+#~ msgid "Unban"
+#~ msgstr "Avbannlys"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr ""
+#~ msgid "Show Uploads"
+#~ msgstr "Visa sändningar"
 
-#: src/amule.cpp:2102
-#, c-format
-msgid "Connected to %s %s"
-msgstr "Ansluten till %s %s"
+#~ msgid "Show Queue"
+#~ msgstr "Visa kö"
 
-#: src/amule.cpp:2105
-#, c-format
-msgid "Connecting to %s"
-msgstr "Ansluter till %s"
+#~ msgid "Client Software"
+#~ msgstr "Klientprogramvara"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr ""
+#~ msgid "Waited"
+#~ msgstr "Väntande"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad startad."
+#~ msgid "Upload Time"
+#~ msgstr "Sändningstid"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad stoppad."
+#~ msgid "Upload/Download"
+#~ msgstr "Skicka/Hämta"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Ansluten till Kad (ok)"
+#~ msgid "Remote Status"
+#~ msgstr "Fjärrstatus"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Ansluten till Kad (brandvägg)"
+#~ msgid "File Priority"
+#~ msgstr "Filprioritet"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Frånkopplad från Kad"
+#~ msgid "Score"
+#~ msgstr "Betyg"
 
-#: src/amule.cpp:2191
-msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
-msgstr ""
+#~ msgid "Last Seen"
+#~ msgstr "Senast sedd"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr ""
+#~ msgid "Current Session"
+#~ msgstr "Aktuell session"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr ""
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Totalt antal användare: %s | Totalt antal filer: %s"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr ""
+#, fuzzy
+#~ msgid "Download size: %i"
+#~ msgstr "Hämtningar (%i)"
+
+#, fuzzy
+#~ msgid "Killed!"
+#~ msgstr "Misslyckades"
+
+#, fuzzy
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Stäng av aMule."
 
 #~ msgid "Fetching status..."
 #~ msgstr "Hämtar status..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Användare: E: %s K: %s | Filer E: %s K: %s"
+
 #~ msgid "Message Filter"
 #~ msgstr "Meddelandefilter"
 
+#, fuzzy
+#~ msgid "Bind Address"
+#~ msgstr "Adress"
+
+#, fuzzy
+#~ msgid "Enable UPnP"
+#~ msgstr "Aktivera proxy"
+
+#, fuzzy
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "TCP-port: %d"
+
+#~ msgid "Show percentage"
+#~ msgstr "Visa procentandel"
+
+#~ msgid "TCP port"
+#~ msgstr "TCP-port"
+
+#~ msgid "Column Sorting"
+#~ msgstr "Kolumnsortering"
+
+#~ msgid "File Options"
+#~ msgstr "Filalternativ"
+
 #~ msgid "Status text"
 #~ msgstr "Statustext"
 
+#~ msgid "Disable/Enable"
+#~ msgstr "Inaktivera/Aktivera"
+
+#~ msgid "Authentication"
+#~ msgstr "Autentisering"
+
+#~ msgid "Max Connections"
+#~ msgstr "Max anslutningar"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
 #~ msgid "Please wait... "
 #~ msgstr "Vänta..."
 
@@ -7044,9 +7500,6 @@
 #~ msgid "No valid servers to connect in serverlist found"
 #~ msgstr "Inga giltiga servrar att ansluta till hittades i serverlista"
 
-#~ msgid "Shutdown aMule."
-#~ msgstr "Stäng av aMule."
-
 #~ msgid "Connect to ED2K only."
 #~ msgstr "Anslut endast till ED2K."
 
@@ -7081,15 +7534,6 @@
 #~ msgid "Manual Server Add : Name"
 #~ msgstr "Lägg till server manuellt : Namn"
 
-#~ msgid "No One"
-#~ msgstr "Ingen"
-
-#~ msgid "Download Speed: %.1f"
-#~ msgstr "Hämtningshastighet: %.1f"
-
-#~ msgid "Upload Speed: %.1f"
-#~ msgstr "Sändningshastighet: %.1f"
-
 #~ msgid "TCP Port: %d"
 #~ msgstr "TCP-port: %d"
 
@@ -7150,9 +7594,6 @@
 #~ msgid " | Kad: "
 #~ msgstr " | Kad: "
 
-#~ msgid "Command: %s"
-#~ msgstr "Kommando: %s"
-
 #~ msgid "doesn't work"
 #~ msgstr "fungerar inte"
 
@@ -7201,9 +7642,6 @@
 #~ msgid "File size: %s"
 #~ msgstr "Filstorlek: %s"
 
-#~ msgid "Download: %s"
-#~ msgstr "Hämta: %s"
-
 #~ msgid ""
 #~ " 'All-Platform' p2p client based on eMule \n"
 #~ "\n"
@@ -7242,9 +7680,6 @@
 #~ msgid "Skin file %s does not exist"
 #~ msgstr "Skalfilen %s finns inte"
 
-#~ msgid "Unable to open skin file: %s"
-#~ msgstr "Kunde inte öppna skalfil: %s"
-
 #~ msgid " - loading defaults"
 #~ msgstr " - läser in standardvärden"
 
@@ -7262,6 +7697,3 @@
 
 #~ msgid "Enable IP-Filtering"
 #~ msgstr "Aktivera IP-filtrering"
-
-#~ msgid "aMule is not connected!"
-#~ msgstr "aMule är inte ansluten!"

aMule-2.2.6.tar.bz2/po/tr.po -> aMule-2.3.1.tar.bz2/po/tr.po Changed

@@ -1,1312 +1,1143 @@
-# translation of tr.po to Turkish
-# Copyright (C) 2008 Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
+# translation of aMule to Turkish
+# This file is distributed under the same license as the aMule package.
+# Atilla ÖNTAŞ <atilla_ontas@mandriva.org>, 2009.
+# Atilla ÖNTAŞ <atilla_ontas@mandriva.org>, 2009.
+# Atilla ÖNTAŞ <atilla_ontas@mandriva.org>, 2009.
 #
-# Atilla ÖNTAŞ <atilla_ontas@hotmail.com>, 2008.
-# Atilla ÖNTAŞ <atilla_ontas@mandriva.org>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2008-12-04 18:59+0200\n"
-"Last-Translator: Atilla ÖNTAŞ <atilla_ontas@mandriva.org>\n"
-"Language-Team: Turkish <cooker-i18n@mandrivalinux.org>\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
+"PO-Revision-Date: 2011-11-01 23:27+0100\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=2; plural=n != 1;\n"
-"X-Generator: Lokalize 0.2\n"
+"X-Poedit-Language: Turkish\n"
+"X-Poedit-Country: TURKEY\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Boş olmayan bir şifre girmelisiniz."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Geçersiz şifre, bir MD5 adreslemesi değil!"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "Bağlantı başarısız"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "EC bağlantısı başarısız. Boş cevap."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Dış Bağlantı: Erişim engellendi, nedeni: "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Dış Bağlantı: Erişim engellendi"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Dış Bağlantı: Sunucudan kötü cevap. Bağlantı kesildi."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Başarıldı! aMule'ye bağlantı kuruldu. "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Başarıldı! Bağlantı kuruldu."
-
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Adreslemesi Yapılıyor"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Arkadaş Ekle"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Tamamlanıyor"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Geçerli bir IP ve port girmelisiniz!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Tamamlandı"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Bilgi"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Duraklatıldı"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Belirlenen kullanıcı adreslemesi geçersiz!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Hatalı"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "ED2KBağlantı dosyası açılamadı."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Aktarılıyor"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"UYARI: DüşükID olduğunuz sürece kendinizi bir kaynak olarak eD2k "
+"bağlantılarına ekleyemezsiniz."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Bekliyor"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Ana uygulamadan çıkılıyor..."
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "%s dosyası için MD4 ve AICH adreslemesi oluşturulmaya başlanıyor "
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Amuleweb oturumu pid `%ld' ile sonlandırılıyor..."
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "%s dosyası için MD4 adreslemesi oluşturulmaya başlanıyor."
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Amuleweb oturumu pid `%ld' ile öldürülüyor..."
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "%s dosyası için AICH adreslemesi oluşturulmaya başlanıyor."
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Başarısız"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr ""
-"'%s' içindeki eski AICH adresleme setleri '%s' içindeki 64 b'ye çevriliyor."
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule Çıkışında: Çekirdek imha ediliyor."
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "UYARI: '%s' dosya adı geçersiz ve'%s'olarak yeniden adlandırıldı."
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "aMule kapatılma işlemi tamamlandı."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "UYARI: '%s' dosyası zaten var ve '%s'olarak yeniden adlandırıldı."
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "aMule çıkışı için hafıza hata raporlama sonuçları:"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "UYARI: Yedekleme oluşturulduktan sonra özgün '%s' çıkartılamıyor"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+"\n"
+"EC yapılandırması"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "UYARI: %s dosyası silinemiyor"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Parola ayarlandı ve dış bağlantılar etkinleştirildi."
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "'%s' kullanıcısının paylaşılmış dosyalarını alma başarısız"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "UYARI"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Bilinmiyor"
+#: src/amule.cpp:495
+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/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Sahte eMule sürümü %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Bilgi"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr "(Sahte eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Sunucu listesinde mevcut bir sunucu yok.\n"
+"aMule'nin yeni bir liste indirmesini ister misiniz?"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (Sahte eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Sunucu listesi indirme"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (eMule s.0.%u üzerine kurulu)"
+msgid "web server running on pid %d"
+msgstr "web sunucusu pid %d üzerinde çalışıyor"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Rumuz: %s ID: %u"
+#: src/amule.cpp:658
+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 ""
+"Web sunucusunun başlangıçta çalışmasını istediniz. Fakat amuleweb "
+"çalıştırılamıyor. Lütfen, aMule web sunucusunu içeren paketi yükleyin veya "
+"aMule' yi --enable-webserver komutu ile derleyip make install komutunu "
+"çalıştırın"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "İstek: %s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "HATA"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Bu oturum için dosya durumu: Kabul edilen istek %d si %d nin, %s aktarıldı\n"
-msgstr[1] ""
-"Bu oturum için dosya durumu: Kabul edilen istek %d si %d nin, %s aktarıldı\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Belirtilen şu adrese portlar bağlanamıyor: %s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Tüm oturumlar için dosya durumu: Kabul edilen istek %d si %d nin, %s "
-"aktarıldı\n"
-msgstr[1] ""
-"Tüm oturumlar için dosya durumu: Kabul edilen istek %d si %d nin, %s "
-"aktarıldı\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Bilinmeyen dosya istendi"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Port. %u kullanılamıyor. DÜŞÜKID alacaksınız.\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "%s Kullanıcısı IP:Port %s:%d üzerinde ve %s %s %s kullanıyor"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Kullanıcı Adı"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Port. %u kullanılamıyor!\n"
+"\n"
+"Bunun anlamı DÜŞÜKID alacağınızdır.\n"
+"\n"
+"Ağ ayarlarınıza göz atarak portun giriş ve çıkışlar için açık olup "
+"olmadığını denetleyiniz."
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Arkadaşlar"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Çevrim içi İmza dosyası oluşturma başarısız."
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "&Ayrıntıları Göster"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "aMule Çevrim içi İmza dosyası oluşturma başarısız."
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Arkadaş ekle"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"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/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Arkadaş sil"
+#: src/amule.cpp:1040
+#, 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/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "&İleti Gönder"
+#: src/amule.cpp:1042
+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"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Paylaşılmış Dosyalara bak"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr "bir şeyleri bozmayacağını veya evinizi yakmayacağını \n"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Arkadaş Slotu Kur"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr ""
+"yahut da köpeğinizi öldürmeyeceğini garanti edemeyiz. Fakat bir *sorun* "
+"yaratmayacağını da umuyoruz.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Seçili arkadaşı silmek istediğinizden emin misiniz?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr "Daha fazla bilgi, destek ve yeni sürümler ana sayfamızda bulunabilir\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Seçili arkadaşları silmek istediğinizden emin misiniz?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "www.aMule.org veya IRC Kanalımız: #aMule at irc.freenode.net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "İptal"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Her türlü hatayı bize bildirmekten çekinmeyin http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Birden fazla arkadaş slotu kuramazsınız.\n"
-"Sadece bir slot kuruldu."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Çoklu seçim"
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "İndirme tamamlandı"
-
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Dosyanın tam yolu."
-
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Yol eki olmaksızın dosyanın tam adı."
-
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "Dosyanın eD2k adreslemesi"
+"Belirlediğiniz Çevrim içi İmza dosyaları dizini GEÇERSİZ!\n"
+" Çevrim içi İmza, ayarlarınızda düzeltene kadar DEVREDIŞI bırakıldı."
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Dosyanın bayt cinsinden boyutu."
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Sunucu makine adı uyarıldı"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Toplam indirme hareketleri süresi."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "%s dosyası için diskte yer ayırma başarısız oldu: %s"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Yeni sohbet oturumu başladı"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "HATA: Günlük dosyası açılamıyor."
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "İleti göndericisi."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "UYARI: Günlük dosyası boş, bir şeyler yanlış."
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Dolu"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Günlük kaydı silindi."
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Disk bölümü."
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Sunucu İletisi: %s"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Hata"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "%s indirilmeyecek; çünkü istenen dosya yeni değil."
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Dosya Adı"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Nod listesini indirme başarısız."
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Boyut"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "İndirilen sürüm denetleme dosyasını açma başarısız oldu."
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Tür"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Bozuk sürüm denetleme dosyası"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Öncelik"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "aMule'nin eski bir sürümünü kullanıyorsunuz!"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "Dosya Adresi"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "aMule sürümünüz %i.%i.%i ve en güncel sürüm %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "İstekler"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "En güncel sürüm her zaman http://www.amule.org adresinde bulunabilir."
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Kabul Edilen İstekler"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "UYARI: aMuled sürümünüz eski: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Aktarılan Veri"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "aMule sürümünüz güncel."
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Paylaşım Oranı"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Sürüm denetleme dosyasını indirme başarısız oldu."
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Alınan Parçalar"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Kullanıcılar: %s | Dosyalar: %s"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Tam Kaynaklar"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Kullanıcılar: E: %s K: %s | Dosyalar: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Dizin Yolu"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Hiç bir ağ seçilmedi"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Paylaşılan Dosyalar"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "DüşükID ile"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Çok düşük"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "YüksekID ile"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Düşük"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "Bağlandı: %s %s"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Normal"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "Bağlanıyor: %s"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Yüksek"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "eD2k Bağlantısı kesildi"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Çok Yüksek"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kademlia başladı."
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Yayım"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kademlia durdu."
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Otomatik"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "Kademlia ağına bağlanıldı (tamam)"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Yorum/Puanlama Ekle"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "Kademlia ağına bağlanıldı. (Güvenlik duvarı)"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Yorum/Puanlama Düzenle"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Kademlia bağlantısı kesildi."
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Yeniden Adlandır"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"UDP portu ayarlarda devre dışı bırakılmışsa Kad ağı kullanılamaz. "
+"Başlatılmıyor."
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Koleksiyondaki dosyaları aktarım listesine ekle"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Kad ağı ayarlarda devre dışı bırakılmış, bağlanılmıyor."
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Magnet &bağlantısını panoya kopyala"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"HATA: aMule daemon dış bağlantılar devre dışı bırakıldığında kullanılamaz. "
+"Dış Bağlantıları etkinleştirmek için ya aMule'yi, --ec-config seçeneği ile "
+"birlikte amuledi başlatarak ya da ~/.aMule/amule.conf dosyasındaki "
+"\"AcceptExternalConnections\" seçeneğini 1 olarak ayarlayın."
+
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"HATA: Dış bağlantıların kullanılabilmesi için geçerli bir parola gerekilidir "
+"ve aMule uygulamacığı dış bağlantılar olmadan kullanılamaz. aMule "
+"uygulamacığını çalıştırmak için ~/.aMule/amule.conf dosyasında \"ECPassword"
+"\" kısmını uygun bir değerle doldurmalısınız. amuled' i --ec-config seçeneği "
+"ile çalıştırın ve parolanızı ayarlayın. Daha fazla bilgi http://wiki.amule."
+"org adresinde bulunabilir."
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: OnInit - zamanlayıcı başlatılıyor"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: arka plana çatallanıyor - görüşürüz"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "Pid dosyası oluşturulamıyor"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "eD2k &bağlantısını panoya kopyala"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "HATA: %s"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "eD2k bağlantısını panoya kopyala (&Kaynak)"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Bu, eMule üzerine kurulu olan aMule %s yazılımıdır."
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "eD2k bağlantısını panoya kopyala (Kaynak) (&Crypt seçenekleriyle)"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "%s üzerinde çalışıyor"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "eD2k bağlantısını panoya kopyala (&Makine adı)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr "Yeni sürüm denetimi için http://www.amule.org adresini ziyaret ediniz."
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr "eD2k bağlantısını panoya kopyala (Makine adı) (&Crypt seçenekleriyle)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ÖNEMLİ HATA: Zamanlayıcı oluşturulamadı"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "eD2k bağlantısını panoya kopyala (&AICH bilgisi)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "aMule uzak denetimi"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Geri beslemeyi panoya kopyala"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Bilgileri:"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:501
 msgid ""
-"Feedback from: %s (%s)\n"
+"'All-Platform' p2p client based on eMule \n"
 "\n"
 msgstr ""
-"Geri besleme: %s (%s)\n"
+"eMule üzerine kurulu 'Sistem-Üstü' p2p  yazılımı \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr ""
-"Geçerli bir kaynak bağlantısı oluşturmak için YüksekID almanız gerekiyor"
-
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "UYARI"
-
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Paylaşılan Dosyalar (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[Parça Dosyası]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Bu dosya için yeni bir isim girin:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Dosya yeniden adlandır"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Şu dosya için gönderimler başlatılıyor:%s"
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Şu dosya için gönderimler bekletiliyor: %s"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Web Sitemiz: http://www.amule.org \n"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMule metin aracı"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: Arama sözcüğü çok kısa"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Forumumuz: http://forum.amule.org \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "%u adet Kademlia bağlantısı okundu"
-msgstr[1] "%u adet Kademlia bağlantısı okundu"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"S.S.S.: http://wiki.amule.org \n"
+"\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Sadece %d adet Kad bağlantısı var. Nodes.dat yazılamadı"
-msgstr[1] "Sadece %d adet Kad bağlantısı var. Nodes.dat yazılamadı"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "İletişim: admin@amule.org (yönetimsel konular) \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "%d adet Kad bağlantısı yazıldı"
-msgstr[1] "%d adet Kad bağlantısı yazıldı"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 aMule Ekibi \n"
+"\n"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "HATA: TCP portu dinlenemiyor."
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "aMule'nin üzerinde kurulduğu parçalar: \n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "web aracı bağlantısı kabul edildi\n"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: XOR matrisi üzerine kurulu bire-bir iletişim.\n"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "HATA: web aracı bağlantısı kabul edilemiyor\n"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr "Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "İleti"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "İstem şu hatayla başarısız oldu: %s."
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "aMule diyaloğu imha edildi"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "İstem bilinmeyen bir hatayla başarısız oldu."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "Bağlanıyor"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "İndeks dosyası bulunamadı: "
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: Bağlanıyor"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Oturum sona erdi - giriş gerekiyor\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: Bağlantı kesildi"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Oturum tamam, giriş yapıldı.\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: Güvenlik Duvarı"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Oturum tamam, giriş yapılmadı.\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: Bağlandı"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Hiç oturum açılmadı -  giriş gerekecek\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: Bağlanıyor"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Oturum oluşturuldu.-  giriş gerekiyor\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: Kapalı"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "İstem işleniyor [özgün]: "
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "İptal"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Şifre kontrol ediliyor\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Durdur"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Şifre adreslemesi geçersiz.\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Bağlantıyı Kes"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Şifre kabul edildi.\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Bağlanılmış olan ağlar ile bağlantıyı Kes"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Şifre kötü.\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "Bağlan"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Herhangi bir şifre girmediniz. Boş şifre kullanılamaz.\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "Etkinleştirilmiş olan ağlara bağlan"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Çıkış istendi.\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Gön: %.1f(%.1f) | İnd:%.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "İstem işleniyor [yönlendirilmiş]: "
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Gön: %.1f | İnd:%.1f"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Şablonu yükler <str>"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | Bağlandı)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Web Sunucusu HTTP portu"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Bağlantı kesildi)"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Web sunucusu portu üzerinde UPnP port yönlendirmesi kullan"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "%s üzerinden çıkmayı gerçekten istiyor musunuz?"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP portu"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Çıkışı onaylayınız"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Gzip sıkıştırması kullan"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Çalıştırma Komutu: "
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- ön tanımlı -"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Web sunucusu için tam erişim şifresi"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Kaplama dizini '%s' yok."
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Web sunucusu için konuk şifresi"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "UYARI: Kaplama dosyası '%s' okuma için açılamıyor"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Konuk girişine izin ver"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Ağlar"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Konuk girişini reddet"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Ağ Penceresi"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Web sunucusu ayarlarını aMule'ye/ aMule'den Yükle/ Kaydet"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Aramalar"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMule yapılandırma yolu: DOĞRUDAN KULLANMAYINIZ!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Arama Penceresi"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "PHP yorumcusunu devreden çıkar. (onaylanmamış)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "İndirmeler"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Her istemde PHP sayfalarını yeniden oluştur"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "İndirme Penceresi"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule Web  Sunucusu"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Paylaşılan dosyalar"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Devre dışı"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Paylaşılan Dosya Penceresi"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Hiç"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Sohbet"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Aktarılıyor..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Sohbet Penceresi"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "İstatistikler"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "%d bayt bekleniyordu; fakat %d bayt indirildi"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "İstatistik Grafik Penceresi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Ayarlar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Dizin amulesig.dat dosyası içeriyor"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Göz at"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Buraya amulesig.dat dosyasının bulunduğu dizini giriniz"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Saniye bazında yenileme döngüsü"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Her yenileme olayında bir durum imajı oluştur"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Ayar Penceresi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Buraya istatistik imajının oluşturulacağı dizini giriniz."
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "İçe Aktar"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Durum imajını düzenli olarak FTP sunucusuna gönder."
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Parça dosyası içe aktarım aracı"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP bağlantısı"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Hakkında"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP Yolu"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Hakkında/Yardım"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Buraya FTP Sunucunuz için adresi giriniz."
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "eD2k ağı"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "Buraya durum imajını koyacağınız FTP Sunucusundaki bir dizini giriniz."
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Kademlia ağı"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Kullanıcı"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Ağ yok"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Şifre"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "aMule Uzak Denetimi"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "FTP sunucunuza girebilmek için bir Kullanıcı adı giriniz."
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "FTP sunucunuza girebilmek için bir Şifre giriniz."
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Önemli Hata: Çekirdek Zamanlayıcı oluşturulamadı"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Dakika bazında FTP günceleme hızı"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "Uzak aMule'ye bağlan"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Onayla"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Önemli Hata: Havuz Zamanlayıcı oluşturulamadı"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Olay döngüsüne gidiliyor..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "Bağlanıyor..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Dizin imza dosyanızı içeriyor."
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "Bağlantı başarısız "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "İstatistik imajının üretildiği dizin"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Uzak ARAYÜZ EC olay yakalayıcı"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "İniyor"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i gün %i saat %i dakika %i saniye"
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "Bağlantı Başarısız Oldu. %s:%d bağlanılamıyor\n"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas,aMule Bağlantı İstatistikleri"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "Bağlantı kesildi - Muhtemelen aMule sonlandırıldı."
+
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Hazır"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Hoş geldiniz!"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Tümü"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr "'%s' dizini '%s' sınıfı için oluşturulamadı. '%s' dizini kullanılıyor."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "wxCas çalışmaya başladığından beri en fazla aktarım oranı"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Bilinmiyor"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "wxCas'ın önceki açılışlarındaki kesin En Fazla İND. oranı"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "'%s' kullanıcısının paylaşılmış dosyalarını alma başarısız"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Sıfırla"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "DüşükID bağlantı için bir eş aranıyor"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Sistem"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Sahte eMule sürümü %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Otomatik Yenilemeyi Durdur."
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr "(Sahte eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Bağlantı İstatistikleri imajını kaydet."
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (Sahte eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Bağlantı İstatistikleri imajını yazdır."
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (eMule s.0.%u üzerine kurulu)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Ayarlar"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Rumuz: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "wxCas Hakkında"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "İstek: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Otomatik Yenilemeyi Başlat"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Bu oturum için dosya durumu: Kabul edilen istek %d si %d nin, %s aktarıldı\n"
+msgstr[1] ""
+"Bu oturum için dosya durumu: Kabul edilen istek %d si %d nin, %s aktarıldı\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Otomatik Yenilemeyi Durdu."
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Tüm oturumlar için dosya durumu: Kabul edilen istek %d si %d nin, %s "
+"aktarıldı\n"
+msgstr[1] ""
+"Tüm oturumlar için dosya durumu: Kabul edilen istek %d si %d nin, %s "
+"aktarıldı\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Otomatik Yenileme Başladı."
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Bilinmeyen dosya istendi"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "İstatistik imajını kaydet."
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "'%s' kullanıcısından gelen ileti engellendi. (IP: %s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMule Bağlantı İstatistikleri"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "'%s' kullanıcısından yeni ileti geldi (IP: %s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/BaseClient.cpp:2899
+#, c-format
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"Yazdırmada bir sorun var.\n"
-"Yazıcınız doğru ayarlanmamış olabilir mi?"
+"Kullanıcı %s (%u), var olmayan '%s' dizini için paylaşılmış dosya listenizi "
+"istedi. -> Görmezden gelindi."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Yazdırılıyor"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:414
-msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"wxCas, aMule Çevrim içi İmza İstatistikleri\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-" Pedro de Oliveira' nın <falso@rdk.homeip.net> geliştirdiği CAS üzerine "
-"kurulmuştur.\n"
-"\n"
-"GPL altında dağıtımı yapılır."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "Aman Aman, aMule çalışmıyor..."
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "UYARI: %s açılamıyor."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule çalışıyor"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr "UYARI: İptal edilen dosya listesi bozuk. Geçersiz başlık içeriyor."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule çalışıyor ama bağlı değil."
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "%s dosyası okumada IO hatası: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule bağlanıyor..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "%s dosyası kaydedilirken hata: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Aman aman, aMule'nin durumu bilinmiyor..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "Captcha Gir"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Sınıf"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr "çalışıyor"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Yeni Sınıf"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " durdu !"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Gelen dosyalar için bir dizin seçin"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " bağlı değil !"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Sınıf için bir isim girmelisiniz!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr "bağlanıyor..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Sınıf için bir yol girmelisiniz!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr "garip şeyler yapıyor, kontrol ediniz !"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Sınıf için gelen dizini oluşturma başarısız. Lütfen geçerli bir yol giriniz!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " şuna bağlandı:"
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Sohbet Oturumu Başladı: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr "Kad:"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** Kullanıcıya Bağlandı. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "tamam"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** Kullanıcıya Bağlanıyor.***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "güvenlik duvarı"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Kullanıcıya bağlantı başarısız. / Bağlantı koptu.***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "bağlı değil"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr "*** Captcha denetiminden geçtiniz ve kullanıcı iletinizi aldı. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr "bağlı"
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
+"*** Captcha' ya cevabınız yanlıştı ve iletiniz yok sayıldı. Yeni bir ileti "
+"göndererek yeni bir captcha isteyebilirsiniz. ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr "ile"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "Sohbet"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Toplam Aktarım: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Sekmeyi Kapat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", Gönderme: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Tüm sekmeleri kapat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Oturumdaki Aktarım: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Diğer sekmeleri kapat"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Aktarım: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Arkadaşlara Ekle"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s, Gönderme "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Kredi dosyası yüklendi. %u adet kullanıcı biliniyor"
+msgstr[1] "Kredi dosyası yüklendi. %u adet kullanıcı biliniyor"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr "kB"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - %u adet kullanıcı için krediler bitti!"
+msgstr[1] " - %u adet kullanıcı için krediler bitti!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Paylaşılan: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "'cryptkey.dat' dosyası bulunamadı. Oluşturuluyor..."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " dosya(lar), Sıradaki kullanıcılar:"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Kullanıcı Ayrıntıları"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Süre: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "DüşükID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "YüksekID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " bağlı "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Etkinleştirildi"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Sistem Yükü Ortalaması (1-5-15 dk.): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Destekleniyor"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Sistem çalışma süresi: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Desteklenmiyor"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uD %02uh %02udk. %02us"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Devre dışı"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uh %02udk. %02us"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "Bağlandı"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02udk. %02us"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Bağlantı kesildi"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02us"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "YüksekID"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Eksik"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "DüşükID"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Kötü Çocuk"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Bağlanmadı"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "İncelendi - Tamam"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Uygun değil."
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "Kullanıcı %s (%u), paylaşılmış dosya listenizi istedi. -> Kabul edildi"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "Kullanıcı %s (%u), paylaşılmış dosya listenizi istedi. -> Reddedildi"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "Kullanıcı %s (%u), paylaşılmış dizin listenizi istedi. -> Kabul edildi"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "İptal Edildi !"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "Kullanıcı %s (%u), paylaşılmış dizin listenizi istedi. -> Reddedildi"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "Unable to open %s"
-msgstr "%s açılamıyor."
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Girdi parametreleri"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Adreslenecek Dosya"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Bu dosya için isteğe bağlı adres ekleyin"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "eD2k bağlantısını hesaplamak için bir dosya girin"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"eD2k bağlantısına eklemek istediğiniz bağlantı adresini buraya girin. "
-"aLinkCreator' ün geçerli dosya adını yazabilmesi için en sona ekleyin"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Ekle"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Çıkar"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Temizle"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Parça adreslemesi içeren bağlantı oluştur."
+"Kullanıcı %s (%u), '%s' dizini için paylaşılmış dosya listenizi istedi. -> "
+"kabul edildi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Yeni ve nadir dosyaların yayılmasına yardımcı olun;bunun bedeli ise artan "
-"bağlantı boyutu olacaktır."
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4 Dosya Adreslemesi"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k Dosya Adreslemesi"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k Bağlantısı"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Başlat"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Kaydet"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Panoya kopyala"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Çıkış"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Aç"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "eD2k bağlantısının hesaplanması için bir dosya açın"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Kopyala"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Hesaplanan eD2k bağlantısını panoya kopyala"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Farklı Kaydet"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Hesaplanan eD2k bağlantısını bir dosyaya kaydet"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Hakkında"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "aLinkCreator Hakkında"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "eD2k bağlantısının hesaplanacağı dosyayı seçin"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Pano açılamıyor"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Şimdilik kopyalanacak bir şey yok !"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "eD2k bağlantısının hesaplanacağı dosyayı seçin"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Açılamıyor"
+"Kullanıcı %s (%u), '%s' dizini için paylaşılmış dosya listenizi istedi. -> "
+"reddedildi."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Lütfen boş olmayan bir dosya adı giriniz."
+#: src/ClientTCPSocket.cpp:952
+#, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Kullanıcı %s (%u), %s dizinini paylaşıyor"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Şimdilik kaydedilecek bir şey yok !"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Kullanıcı %s (%u) istenmeyen paylaşılmış dosya listesi gönderdi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/ClientTCPSocket.cpp:982
+#, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
 msgstr ""
-"aLinkCreator, aMule eD2k bağlantı oluşturucusu\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmap kaynağı: http://www.everaldo.com ve http://www.icomania.com\n"
-"ve http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"GPL altında dağıtılır"
+"Kullanıcı %s (%u) '%s' dizini için paylaşılmış dosya listesini gönderdi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Adreslemesi Yapılıyor."
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Kullanıcı %s (%u) paylaşılmış dosya listesini göndermeyi tamamladı"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator sizin için çalışıyor"
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Kullanıcı %s (%u) istenmeyen paylaşılmış dosya listesi gönderdi"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "MD4 Adreslemesi hesaplanıyor..."
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr "Kullanıcı %s (%u)nın paylaşılmış dizin/dosyalara erişimi reddedildi."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "eD2k Adreslemeleri hesaplanıyor..."
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Dosya Yorumları"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "%.2f s içinde tamamlandı."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Kullanıcı Adı"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Bu adresi zaten eklemiştiniz. !"
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Dosya Adı"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Lütfen boş olmayan bir adres giriniz."
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Puanlama"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
-#, c-format
-msgid "Processing file number %u: %s"
-msgstr "İşlenmekte olan dosya sayısı %u: %s"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Yorum"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "Parça dosyalarını sormuştunuz (Sadece 9.5 MB' tan büyük dosyalar)"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Yorum yok"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Var olmayan dosya !\n"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u adet yorum"
+msgstr[1] "%u adet yorum"
 
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, aMule eD2k bağlantı oluşturucusu"
+#: src/CorruptionBlackBox.cpp:227
+#, c-format
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"%s istemcisi %s kadar veriyi %s toplamda '%s' dosyasında gönderdiği için "
+"yasaklandı."
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1320,30 +1151,56 @@
 msgid "Auto [Hi]"
 msgstr "Oto (Yük)"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "Bağlanıyor"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Çok düşük"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Düşük"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Normal"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Yüksek"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Çok Yüksek"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Yayım"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Soruyor"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "Sunucu yoluyla bağlanıyor"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Sıra dolu"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "Sırada"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
 msgstr "Aktarılıyor"
 
 #: src/DataToText.cpp:66
@@ -1364,14 +1221,13 @@
 
 #: src/DataToText.cpp:71
 msgid "Connecting via Kad"
-msgstr "Kad.yoluyla bağlanıyor"
+msgstr "Kad yoluyla bağlanıyor"
 
 #: src/DataToText.cpp:72
 msgid "Too many Kad connections"
-msgstr "Çok fazla Kad. bağlantısı"
+msgstr "Çok fazla Kad bağlantısı"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "Engellendi"
 
@@ -1403,8 +1259,8 @@
 msgid "Remote Server"
 msgstr "Uzak Sunucu"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kademlia"
 
@@ -1428,8 +1284,8 @@
 msgid "Search Result"
 msgstr "Arama Sonucu"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "Tamamlandı"
 
@@ -1447,13 +1303,13 @@
 
 #: src/DataToText.cpp:149
 msgid "ERROR: IO error!"
-msgstr "HATA: IO hatası!"
+msgstr "HATA: Girdi-çıktı hatası!"
 
 #: src/DataToText.cpp:150
 msgid "ERROR: Failed!"
 msgstr "HATA: Başarısız!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "Sıraya girdi"
 
@@ -1463,867 +1319,306 @@
 
 #: src/DataToText.cpp:153
 msgid "Unknown or bad tempfile format."
-msgstr "Bilinmeyen yada bozuk geçici dosya biçimi."
-
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Sistem Ön tanımlısı"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Arnavutça"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Arapça"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Asturyaca"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Baskça"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Bulgarca"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Katalanca"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Çince (Basit)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Çince (Geleneksel)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Hırvatça"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Çekçe"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Danca"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Felemenkçe"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "İngilizce (U.K)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Estonyaca"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Fince"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Fransızca"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Galce"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Almanca"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Yunanca"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "İbranice"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Macarca"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "İtalyanca"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "İtalyanca (İsviçre)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Japonca"
+msgstr "Bilinmeyen yada bozuk geçici dosya formatı."
 
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Korece"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Litvanyaca"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Parça"
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Norveççe(Nynorsk)"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Boyut"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Lehçe"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Aktarıldı"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Portekizce"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Hız"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Portekizce (Brezilya)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "İşlem"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Rusça"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Kaynaklar"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Slovence"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Öncelik"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "İspanyolca"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Durum"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "İsveççe"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Kalan Süre"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Türkçe"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Son Tamamlanmış Görülme"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Ukraynaca"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Son Alım"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Seçili tarayıcı tanımlanamıyor!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Seçili dosyayı silmek istediğinizden emin misiniz?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"TCP portu numarası, UDP soketi TCP+3 olduğundan 65532' den yüksek olamaz"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Seçili dosyaları silmek istediğinizden emin misiniz?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Ön tanımlı port kullanılacak (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Sunucu Adı"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Adres"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Port"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Açıklama"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Kullanıcılar"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Dosyalar"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Başarısız"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Statik Sunucu"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Sürüm"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Silmeye çalıştığınız bir sunucuya bağlısınız. Lütfen önce bağlantıyı "
-"kesiniz. Sunucu SİLİNMEDİ."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Bilgi"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(Bilinmeyen ad)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Statik sunucu %s'i silmek istediğinizden emin misiniz?"
+"Geri besleme: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Evet"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Otomatik"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Hayır"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "&Dur"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "'%s' açma başarısız"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "&Durakla"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Sunucular (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "&Başlat"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Sunucu"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "Tamamlananları T&emizle"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "Sunucuya bağlan"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Tüm A4Afleri derhal bu dosyaya geçir"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Sunucuyu statik olarak işaretle"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Tüm A4Afleri bu dosyaya geçir (Otomatik)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Sunucuyu statik olmayan olarak işaretle"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Tüm A4Afleri derhal bir başka dosyaya geçir"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Sunucuları statik olarak işaretle"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Genişletilmiş Seçenekler"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Sunucuları statik olmayan olarak işaretle"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Ön İzleme"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Çıkar"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Dosya &ayrıntılarını göster"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Çıkar"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Tüm yorumları göster"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Bütün sunucuları kaldır"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Magnet bağlantısını panoya kopyala"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "eD2k bağlantısını panoya kopyala"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "eD2k bağlantısını panoya kopya&la"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "eD2k bağlantılarını panoya kopyala"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Geri beslemeyi panoya kopyala"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Sunucuya yeniden bağlan"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "Ekleme"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Hepsini silmek istediğinizden emin misiniz?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Sınıfa Ekle"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Seçili sunucuyu silmek istediğinizden emin misiniz?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "Dosyayı &Aç"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Seçili sunucuları silmek istediğinizden emin misiniz?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Bu dosya için yeni bir isim girin:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Devre dışı [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Dosya yeniden adlandır"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Bu, eMule üzerine kurulu olan aMule %s yazılımıdır."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "%s üzerinde çalışıyor"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr "Yeni sürüm kontrolü için http://www.amule.org adresini ziyaret ediniz."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ÖNEMLİ HATA: Zamanlayıcı oluşturulamıyor"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMule uzak kontrolü"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Bilgileri:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" eMule üzerine kurulu 'Sistem-Üstü' p2p yazılımı\n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Website: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Forum: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" S.S.S.: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " İletişim: admin@amule.org (yönetimsel konular) \n"
+msgid "Downloads (%i)"
+msgstr "İndirmeler (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 aMule Ekibi \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " aMule'nin üzerine kurulduğu parçalar: \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr " Kademlia: XOR matrisi üzerine kurulu bire-bir iletişim.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "İleti"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: Bağlanıyor"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: Bağlantı Kesildi"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: Güvenlik Duvarı"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: Bağlandı"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: Bağlanıyor"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: Kapalı"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Şu anki bağlanma girişimlerini durdur"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Bağlantıyı Kes"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Şu andaki etkin ağlardan bağlantıyı kes"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "Bağlan"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "Şu andaki etkin ağlara bağlan"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Gön: %.1f(%.1f) | İnd:%.1f(%.1f)"
+"Her önizlemede bu uyarının gösterilemsini önlemek için,\n"
+"seçeneklerden tercih ettiğiniz video oynatıcısını ayarlayın. (öntanımlı "
+"mplayer)"
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Gön: %.1f | İnd:%.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Dosya ön izlemesi"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | Bağlandı)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "Hata: Ortam oynatıcısını çalıştırma başarısız! Komut :  `%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Bağlantı kesildi)"
+msgid "Saving PartFile %u of %u"
+msgstr "ParçaDosyası %u, %u'da kaydediliyor"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "aMule'den çıkmayı gerçekten istiyor musunuz?"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Tüm ParçaDosyaları Kaydedildi."
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Çıkışı onaylayınız"
-
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Kaplama dizini '%s' yok."
+msgid "Loading temp files from %s."
+msgstr "%s konumundan geçici dosyalar yükleniyor."
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "UYARI: Kaplama dosyası '%s' okunmak için açılamıyor"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Ağ"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Ağ Penceresi"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Ara"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Arama penceresi"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Aktarımlar"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Dosya aktarım penceresi"
+msgid "Loading PartFile %u of %u"
+msgstr "ParçaDosyası %u %u'dan yükleniyor"
 
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Paylaşılan Dosyalar"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Paylaşılan dosya penceresi"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Sohbet"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Sohbet penceresi"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "İstatistikler"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "İstatistik penceresi"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Ayar penceresi"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "İçe Aktar"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Parça dosyası içe aktarım aracı"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Hakkında/Yardım"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "eD2k ağı"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Kademlia"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Ağ yok"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Genel"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "Bağlantı"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Dizinler"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Sunucular"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Güvenlik"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Ara birim"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Vekil sunucu"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Süzgeçler"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Uzaktan Kontroller"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Çevrim içi İmza"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Gelişmiş"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Olaylar"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Hata Çıktısı"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Kullanıcı Tanımlı"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr "Değişikliklerin uygulanması için, aMule yeniden başlatılmalı\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP portu değişti.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP Portu değişti.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr "Otomatik Otomatik."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Dışarıdan bağlantıları aktifleştirmiş ama bir şifre belirlememişsiniz.\n"
-"Geçerli bir şifre belirlenmedikçe dışarıdan bağlantılar devre dışı "
-"kalacaktır."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Dil ayarları değişti.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Geçici Dosyalar dizini değişti.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- ED2K ağı etkinleştirildi.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Gön: 0.0 | İnd: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr "Kademlia pasifleştirilmiş."
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"UDP portu devre dışı bırakılmışsa Kad. başlamayacaktır.\n"
-"UDP portu açın veya Kademlia'yı devre dışı bırakın."
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"aMule' yi ŞİMDİ yeniden başlatmalısınız.\n"
-"Şimdi yeniden başlatmazsanız, kötü şeyler olabilir.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Sunucuları Otomatik-Güncelleme listeniz boş.\n"
-"Lütfen geçerli bir server.met dosyasını gösteren en az bir adres yazınız.\n"
-"Bir adres girmek için bu kutucuğun yanındaki \"Liste\" düğmesine basınız."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Geçici dosya(lar)"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Gelen dosya(lar)"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Çevrim içi İmzalar"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "%s için bir dizin seçiniz."
+"HATA: Yedekleme dosyası yüklenemedi. .part.met kurtarma çözümleri için "
+"http://forum.amule.org adresini ziyaret edin."
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Ortam Çalıcısı için göz at"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Tüm ParçaDosyaları Yüklendi."
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Tarayıcı Seçiniz"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Hiç part dosyası bulunamadı"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Çalıştırılabilir  %s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Düzenle"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "%u adet parça dosyası bulundu"
+msgstr[1] "%u adet parça dosyası bulundu"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
-msgstr ""
-"Server.met dosyasını indirmek için buraya bağlantı adresi girin.\n"
-"Her satıra sadece bir adres yazılmalıdır."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
+msgstr "Geçici dizininin dosya sistemi büyük dosyaları kullanamaz."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Güncelleme gecikmesi: %d saniye"
-msgstr[1] "Güncelleme gecikmesi: %d saniye"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr "Gelen dizininin dosya sistemi büyük dosyaları kullanamaz."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Ortalama grafiği için süre: %d dakika"
-msgstr[1] "Ortalama grafiği için süre: %d dakika"
+msgid "Downloading %s"
+msgstr "Aktarılıyor %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Bağlantı Grafik Ölçüsü: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Zaten %s dosyasını indirmeye çalışıyorsunuz."
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Güncelleme gecikmesi: %d saniye"
-msgstr[1] "Güncelleme gecikmesi: %d saniye"
+msgid "You already have the file '%s'"
+msgstr "Zaten %s dosyası var."
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Dosya Alım Boyutu: %d bayt"
-msgstr[1] "Dosya Alım Boyutu: %d bayt"
+msgid "You are already trying to download the file %s"
+msgstr "%s dosyasını indirmeyi zaten deniyorsunuz"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Gönderme Sıra Boyutu: %d kullanıcı"
-msgstr[1] "Gönderme Sıra Boyutu: %d kullanıcı"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Magnet bağlantısı eD2k' ya çevrilemez: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Sunucu bağlantısı yenileme sıklığı: %d dakika"
-msgstr[1] "Sunucu bağlantısı yenileme sıklığı: %d dakika"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Sunucu bağlantısı yenileme döngüsü: Devre dışı"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Genişletilmiş sunucu istemleri için UDP portu (TCP+3):"
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "devre dışı"
+msgid "Unknown protocol of link: %s"
+msgstr "Bağlantı için bilinmeyen protokol: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "'%s' olayında komut çalıştır."
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Çekirdekte komut çalıştırmayı aktifleştir."
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Çekirdek komutu:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Arayüzde komut çalıştırmayı etkinleştir."
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Arayüz komutu:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Şu girdiler değiştirilecek:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Geçersiz eD2k bağlantısı! HATA: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Yetkilendirilmemiş giriş denemesi. Bağlantı kesildi."
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr ""
+"Kimlik kanıtlamadan sonra istemci tarafından gönderilen paket başarısız."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Dışarıdan bağlantı kesildi."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Boş şifre sebebiyle dışarıdan bağlantı devre dışı!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Yapılandırma dosyasında dışarıdan bağlantılar devre dışı bırakılmış."
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Yeni dışarıdan bağlantı kabul edildi"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "HATA: yeni bir dış bağlantı kabul edilemiyor"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "Ayarlardaki boş şifre sebebiyle dışarıdan bağlantılar reddedildi."
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "Kullanıcıya bağlanılıyor: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Bilinmeyen sürüm"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2331,2200 +1626,1057 @@
 "Yanlış EC sürüm ID, bir çift uyumsuzluğu olabilir. Aynı görüntüden çekirdek "
 "ve uzak kullanınız."
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
-"Keyfi bir SVN sürümden dengeli bir sürüme bağlanamazsınız! muhtemel bir kaza "
-"önlendi"
-
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Doğrulanamadı."
+"Bir geliştirme sürümünden dengeli bir sürüme bağlanamazsınız! *muhtemel* bir "
+"çökme önlendi"
 
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Geçersiz protokol sürümü."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Kayıp protokol sürüm eki."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+"Kimlik doğrulama başarısız oldu: EC parolası olarak geçersiz adresleme "
+"girildi."
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "Kimlik doğrulama başarısız oldu: yanlış parola."
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "Kimlik doğrulama başarısız oldu: kayıp parola."
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr "Geçersiz istem, öncelikle doğrulatmanız lazım."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Giriş izni verildi."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "\"%s\"  hata iletisi makineye gönderildi."
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "%s üzerinden yetkilendirilmemiş giriş denemesi. Bağlantı kesildi."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Uzak Parça Dosyası komutu başarısız: Dosya Adreslemesi bulunamadı: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Dosya adreslemesi bulunamadı: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "Aman aman! OpCode işleme hatası!"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Sunucu eklenmedi."
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "sunucu bulunamadı: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "çıkarılacak sunucunun tanımlanması gerekli"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "pasifleştirilmiş."
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
-msgstr "Arama sürüyor.Bir dakikaya sonuçlanır!"
+msgstr "Arama sürüyor. Bir dakikaya sonuçlanır!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Uzak arayüzden Web araması yapmak anlamsız."
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad. ayarlarda devre dışı bırakılmış."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Grafik için hiç nokta yok."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Yazılımınız bu ayrıntı düzeyi için yapılandırılmamış."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Bağlantı kapat"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Zaten kapatılıyor."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Dışarıdan Bağ.:'%s' bağlantısı ekleniyor."
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Geçersiz bağlantı veya zaten listede mevcut."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Dosya bulunamadı."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Geçersiz dosya adı."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Dosya yeniden adlandırılamıyor."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad ayarlarda devre dışı bırakılmış."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "eD2k ağına zaten bağlandı."
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
-msgstr "Bağlanıyor."
+msgstr "eD2k ağına bağlanıyor..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
-msgstr "Kad. zaten bağlı."
+msgstr "Kad zaten bağlı."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
-msgstr "Kad.' a bağlanıyor..."
+msgstr "Kad ağına bağlanıyor..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Bütün ağlar devre dışı"
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
-msgstr "Bağlantı kesildi."
+msgstr "eD2k ağından bağlantı kesildi."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
-msgstr "Bağlantı kesildi :Kad."
+msgstr "Kad ağından bağlantı kesildi."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Dış Bağlantı: geçersiz opcode alındı: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Geçersiz opcode (yanlış protokol sürümü mü?)"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr ""
-"(%s) dosyasını açma başarısız. Paylaşılan dosya listesinden çıkartılıyor."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Bilinmeyen dosya için adresleme seti istendi: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "`%s' komutu, pid `%d' içermekteydi ve durum kodu `%d' ile bitti."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Sunucu eklenmedi: Bir IP veya makine adı girilmedi."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Sunucu eklenmedi: Geçersiz sunucu portu girildi."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Durum:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "Bağlandı"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Port"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kademlia Durumu:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Çalışıyor"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Durum:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Bağlantı kesildi"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Bağlantı Durumu:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "Güvenlik Duvarı"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "Tamam"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Güvenlik duvarı durumu: "
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "En yakına Bağlandı"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Yakın yok"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Kullanıcı Ortalaması:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Dosya Ortalaması:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Çalışmıyor"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Çalışma Süresi: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Aktarım"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Gönderilenler"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Gönderilen Veri (Oturum (Toplam)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Toplam Ek Yük (Paket): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Dosya İstemi Ek Yükü (Paket): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Kaynak Değişimi Ek Yükü (Paket): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Sunucu Ek Yükü (Paket):%s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Kad. Ek Yükü (Paketler): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Şifreleme ek yükü (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Aktif Gönderimler: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Bekleyen Gönderimler: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Toplam başarılı gönderme oturumu: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Toplam başarısız gönderme oturumu: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Ortalama gönderme süresi: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "İndirmeler"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Aktarılan Veri (Oturum (Toplam)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Bulunan Kaynaklar: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Aktif İndirmeler (parçalar): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Oturum GÖN:İND Oranı (Toplam): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Ortalama aktarım oranı (Oturum): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Ortalama gönderim oranı (Oturum): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "En fazla aktarım oranı (Oturum): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "En fazla gönderim oranı (Oturum): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Yeniden Bağlanma: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "İlk Aktarımdan Beri Geçen Süre: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "%s beri Sunucuya Bağlı"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Aktif Bağlantılar (yaklaşık): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Ulaşılan En Fazla Bağlantı Sınırı: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Ortalama Bağlantılar (yaklaşık): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Doruk Bağlantılar (yaklaşık): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Kullanıcılar"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Süzülen"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Toplam: %i Bilinen: %i"
-
-#: src/Statistics.cpp:715
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Working Servers: %i"
-msgstr "Çalışan Sunucular: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Başarısız Sunucular: %i"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Bilinmeyen %s uzantısı, %s komutu için.\n"
 
-#: src/Statistics.cpp:717
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Total: %s"
-msgstr "Toplam: %s"
+msgid "Unknown command '%s'.\n"
+msgstr "Bilinmeyen komut '%s' .\n"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Silinen Sunucular: %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Bu komut bir argüman içeremez.\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Süzülen Sunucular: %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Bu komut bir argüman içermelidir.\n"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Çalışan Sunuculardaki Kullanıcı Sayısı: %llu"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Bu komut eksik.Aşağıdaki uzantılardan birini girmelisiniz.\n"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Çalışan Sunuculardaki Dosya Sayısı: %llu"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Uygun uzantılar:\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Toplam Kullanıcılar: %llu"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Uygun komutlar:\n"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Total Files: %llu"
-msgstr "Toplam Dosyalar: %llu"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Tüm komutlar büyük-küçük harf duyarlıdır.\n"
+"'%s <command>' tuşlayarak <command> hakkında detaylı bilgi alabilirsiniz.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Sunucu Bağlantısı: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Uygulamadan çıkar."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Paylaşılmış Dosya Sayısı: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Yardımı göster."
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Paylaşılan Dosyaların Toplam Boyutu: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Bir komut hakkında yardım çağırmak için 'help <command>' yazınız.\n"
+"Tüm komutları görmek için 'help' yazınız.\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
-msgstr "Ortalama dosya boyutu: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "İşletim Sistemi"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Alınmadı"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Kes"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Yapıştır"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Hepsini Seçiniz"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Komut listesi için '%s' kullanınız.\n"
+"\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad. çalışmıyorsa, Kad. araması yapılamaz."
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Söz dizimi hatası!"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "eD2k ağına bağlanılmamışsa eD2k araması yapılamaz"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+"Komut çalıştırmada hata.- Bu hiç olmamalıydı! Lütfen hatayı bildiriniz.\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Kad. araması sırasında beklenilmeyen hata oluştu."
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Bu komut herhangi bir parametre içermemeli."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "'%s' kullanıcısından gelen ileti engellendi. (IP: %s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Bu komut bir parametre içermeli."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "'%s' kullanıcısından yeni ileti geldi (IP: %s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Geçersiz argüman."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "Kullanıcı %s (%u), paylaşılmış dosya listenizi istedi. -> Kabul edildi"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Bu eksik bir komut."
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "Kullanıcı %s (%u), paylaşılmış dosya listenizi istedi. -> Reddedildi"
+msgid "Type '%s' to get more help.\n"
+msgstr "Daha fazla yardım için '%s' yazınız.\n"
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "Kullanıcı %s (%u), paylaşılmış dizin listenizi istedi. -> Kabul edildi"
+msgid "This is %s %s %s\n"
+msgstr "Bu bir %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "Kullanıcı %s (%u), paylaşılmış dizin listenizi istedi. -> Reddedildi"
+msgid "This is %s %s\n"
+msgstr "Bu bir %s %s\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
+"\n"
+"Creating client...\n"
 msgstr ""
-"Kullanıcı %s (%u), %s dizini için paylaşılmış dosya listenizi istedi. -> "
-"kabul edildi"
+"\n"
+"Yazılım oluşturuluyor...\n"
 
-#: src/ClientTCPSocket.cpp:976
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Kullanıcı %s (%u), %s dizini için paylaşılmış dosya listenizi istedi. -> "
-"reddedildi."
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Kullanıcı %s (%u), %s dizinini paylaşıyor"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Kullanıcı %s (%u) istenmeyen paylaşılmış dosya listesi gönderdi"
-
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "Kullanıcı %s (%u) %s dizini için paylaşılmış dosya listesini gönderdi"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Kullanıcı %s (%u) paylaşılmış dosya listesini göndermeyi tamamladı"
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Kullanıcı %s (%u) istenmeyen paylaşılmış dosya listesi gönderdi"
-
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr "Kullanıcı %s (%u)nın paylaşılmış dizin/dosyalara erişimi  reddedildi."
-
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Nodlar (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Ön yükleme için geçersiz ip"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Ön yükleme için geçersiz port"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "İstenilen tüm alanları doldurunuz."
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Yeni bir nodes.dat dosyası indirmek istediğinizden emin misiniz?\n"
+"\n"
+"Tamam, çıkılıyor %s...\n"
 
-#: src/KadDlg.cpp:197
+#: src/ExternalConnector.cpp:420
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"Bunu yapmanız şu anki nodları silecek ve Kademlia bağlantısını baştan "
-"başlatacaktır."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Devam mı?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "HATA: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "UYARI "
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Arkadaş Ekle"
-
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Geçerli bir IP ve port girmelisiniz"
+"Boş bir şifreyle bağlanılamaz.\n"
+"Ya yapılandırma dosyasında ya da komut\n"
+"satırında bir şifre olmalı veyahut da istendiğinde girmelisiniz\n"
+"\n"
+"Çıkılıyor...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Bilgi"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Bu yardım dosyasını göster."
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Belirlenen kullanıcı adreslemesi geçersiz!"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "aMule'nin çalıştığı makine. (varsayılan: localhost)"
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Kaynaklar"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Dışarıdan bağlantı için aMule portu. (Varsayılan:4712)"
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Dosya"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Dışarıdan bağlantı şifresi."
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "İndir(me)"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Yapılandırmayı dosyadan oku."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Kategori"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "stdout' a herhangi bir çıktı yazdırma."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Ana"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Geveze ol - hata iletilerini de göster."
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Kategoriye göre indir"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Yazılım yerelini ayarla (dil)"
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Ara"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Komut satırı seçeneklerini yapılandırma dosyasına yaz."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Bilinmeyen dosya olarak işaretle"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr ""
+"aMule'nin yapılandırma dosyasını temel alan yapılandırma dosyası oluşturur."
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "Uzak aMule'ye bağlan"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Yazılım sürümünü yazdır."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "Bağlantı başarısız "
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Dosya Ayrıntıları"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "HATA"
+#: src/FileDetailDialog.cpp:113
+#, c-format
+msgid "%.1f%% done"
+msgstr "%.1f%% tamamlandı"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "Bağlantı Başarısız Oldu. %s:%d bağlanılamıyor\n"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
-msgstr "UYARI."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "Arkadaş listesi  'emfriends.met'  dosyası okunamıyor!"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Kullanıcı: E: %s K: %s | Dosya E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "Arkadaş listesi  'emfriends.met'  dosyasına yazılamıyor!"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Tümü"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "KRİTİK - SohbetOturumunuBaşlat' ta istemci yok"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Toplam Kullanıcılar: %s | Toplam Dosyalar: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Arkadaşlar"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Aktarıldı"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "&Ayrıntıları Göster"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Hız"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Arkadaş ekle"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "İşlem"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Arkadaş sil"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Durum"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "&İleti Gönder"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Kalan Süre"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Paylaşılmış Dosyalara bak"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Son Tamamlanmış Görülme"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Arkadaş Slotu Kur"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Son Alım"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Seçili arkadaşı silmek istediğinizden emin misiniz?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Seçili dosyayı silmek istediğinizden emin misiniz?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Seçili arkadaşları silmek istediğinizden emin misiniz?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Seçili dosyaları silmek istediğinizden emin misiniz?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Birden fazla arkadaş slotu kuramazsınız.\n"
+"Sadece bir slot kuruldu."
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Çoklu seçim"
+
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Kullanıcıya ileti gönder"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Gönderilecek ileti:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "&Dur"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "&Durakla"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "&Başlat"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "Tamamlananları T&emizle"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Tüm A4Afleri derhal bu dosyaya geçir"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Tüm A4Afleri bu dosyaya geçir (Otomatik)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Tüm A4Afleri derhal bir başka dosyaya geçir"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Genişletilmiş Seçenekler"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Ön İzleme"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Dosya &ayrıntılarını göster"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Tüm yorumları göster"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Magnet bağlantısını panoya kopyala"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "Ekleme"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Kategoriye Ekle"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "Dosyayı &Aç"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Arkadaşlardan Çıkar"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Arkadaşlara Ekle"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "İleti Gönder"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Bu dosyaya geçir"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
-msgstr "SR: %u (%i)"
+msgid "On Queue: %u (%i)"
+msgstr "Sırada: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Başka dosya için soruldu"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "İndirmeler (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr "yukarı."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Dosya Ön izlemesi"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "Hata: Ortam oynatıcısını çalıştırma başarısız! Komut :  `%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "HATA: Part dosyası oluşturma başarısız)"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Met-dosyası yedeklemesi %s konumundan yüklenmeye çalışılıyor."
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "HATA: part.met dosyası açılamadı: %s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "HATA: part.met dosyası 0 boyuta sahip: %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "HATA: Geçersiz part.met dosya sürümü: %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr "HATA: %s (%s) bozuk (hatalı başlık sayısı), dosya yüklenemez."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Dosya bilgisi kurtarılmaya çalışılıyor..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr ""
-"İsimsiz dosya kurtarılmaya çalışılıyor-RecoveredFile.dat olarak kaydedilecek."
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "Uygun olan tüm bilgiler kurtarıldı. :-D - bunlar kullanılacak..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Dosya bilgisi kurtarılamıyor :("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "%s (%s) açma başarısız"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "Gönderme slotu için bekleniyor"
 
-#: src/PartFile.cpp:708
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "UYARI: %s bozulmuş olabilir (%i)"
+msgid "On Queue: %u"
+msgstr "Sırada: %u"
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "Parça dosyası kaydedilirken HATA: %s (%s ==> %s)"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "Gönderiliyor"
 
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "'%s' dosyasının uzunluğu alınamıyor - %s dosyası kullanılıyor."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' bir şekilde 0 boyutlu-%s dosyası kullanılacak."
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "Yok"
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "%s için part.met girdilerini kaydetme başarısız."
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "%i kaynak tohumu parça dosyası için kaydedildi: %s (%s)"
-msgstr[1] "%i kaynak tohumu parça dosyası için kaydedildi: %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "%s (%s) parça dosyası girdi dosyasına sahip değil."
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Hayır"
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Parça dosyası %s (%s) geçersiz girdi dosyası içeriyor."
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Evet"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Parça dosyasına ait girdi dosyası  (%s - %s): %s okunamıyor."
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Aktarılıyor..."
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Bozuk parça (%d) %d parça dosyası %s içinde bulundu -Dosya sonuç adreslemesi "
-"|%s| Dosya adreslemesi |%s|"
-msgstr[1] ""
-"Bozuk parça (%d) %d parça dosyası %s içinde bulundu -Dosya sonuç adreslemesi "
-"|%s| Dosya adreslemesi |%s|"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "HTTP aktarımı iptal edildi"
 
-#: src/PartFile.cpp:1181
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Tamamlanmış (%i) parçası %s içinde bulundu."
+msgid "Unable to create destination file %s for download!"
+msgstr "İndirme için hedef %s dosyası oluşturulamıyor!"
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "%s dosyasının yeniden adreslenmesi bitti"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "İndirme bağlantısı boş olamaz."
 
-#: src/PartFile.cpp:2239
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "%s tamamlanırken beklenmeyen bir hata oluştu. Dosya duraklatıldı"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "%s bağlantı adresi dönüşü: %i - Hata (%i)!"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Aktarım tamamlandı: %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "İndirilen dosyanın yazımında önemli bir hata oluştu"
 
-#: src/PartFile.cpp:2323
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Deleting file: %s"
-msgstr "Dosya siliniyor: %s"
+msgid "Downloaded %d bytes"
+msgstr "%d bayt indirildi."
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr "UYARI: İndirilen parça adreslenemiyor - adresleme seti '%s' için eksik"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "%d bayt bekleniyordu; fakat %d bayt indirildi"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
-msgstr ""
-"HATA: Aktarılan parça adreslenemiyor.- adres seti tamamlanmamış (%s). Bu hiç "
-"olmamalıydı"
-
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "UYARI: Yetersiz disk alanı! %s dosyası duraklatılıyor."
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "İndirilen %i parçası %s dosyasındaydı ve bozuk."
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"ICH: Bozulan %i parçası %s dosyasındaydı ve kurtarıldı -> Kaydedilen miktar: "
-"%s bayt"
+"HTTP aktarım veya HTTP yönlendirme için geçersiz bağlantı adresi ( 'http://' "
+"yazmayı unuttunuz mu?)"
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Ayrılıyor"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "HTTP indirme sunucusuna bağlanılamıyor"
 
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Yetersiz disk alanı"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Durduruldu"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "İndirilen"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "HTTP indirme sunucusundan geçersiz yanıt alındı"
 
-#: src/PartFile.cpp:4167
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "HATA: Parça dosyası '%s' açılamıyor"
+msgid "Download new GeoIP.dat from %s"
+msgstr "%s kaynağından yeni bir GeoIP.dat indir"
 
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "UYARI."
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "GeoIP.dat dosyası indirilemedi. Güncelleme iptal edildi."
 
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr "UYARI."
-
-#: src/KnownFileList.cpp:112
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "known.met dosyası okumada IO hatası: %s"
+msgid "Failed to remove %s file, aborting update."
+msgstr "%s dosyası silinemedi. Güncelleme iptal edildi."
 
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "known.met dosyası kaydedilirken hata: %s"
+msgid "Failed to rename %s file, aborting update."
+msgstr "%s dosyası yeniden adlandırılamadı. Güncelleme iptal edildi."
 
-#: src/SharedFileList.cpp:352
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Bilinen %i adet paylaşılmış dosya bulundu"
-msgstr[1] "Bilinen %i adet paylaşılmış dosya bulundu"
+msgid "Successfully updated %s"
+msgstr "%s başarıyla güncellendi."
 
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Bilinen %i adet paylaşılmış dosya bulundu. Bilinmeyen %i adet"
-msgstr[1] "Bilinen %i adet paylaşılmış dosya bulundu. Bilinmeyen %i adet"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "GeoIP.dat güncellemesinde hata oluştu."
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "HATA: %s paylaşılmak istendi"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Dosya Yorumları"
+msgid "Failed to download %s from %s"
+msgstr "%s, %s kaynağından indirilemedi."
 
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Puanlama"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Yorum"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Yorum yok"
-
-#: src/CommentDialogLst.cpp:104
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u adet yorum"
-msgstr[1] "%u adet yorum"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Listelenen gizlenmiş bağlantılı tüm sunuculara bağlanma başarısız. Gizlenmiş "
-"bağlantı olmadan geçiş yapılacak."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr ""
-"Listelenen sunucuların hiç birine bağlanılamadı. Başka bir geçiş yapılıyor."
+msgid "Failed to load country data for '%s'."
+msgstr "'%s' için ülke verisi yüklenemedi."
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "pasifleştirilmiş."
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "Sunucu listesinde bağlanılabilecek geçerli bir sunucu yok"
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr " %s (%s:%i) sunucusuna bağlanıldı"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "IP süzgeçleri 'ipfilter.dat' ve 'ipfilter_static.dat' yükleniyor."
 
-#: src/ServerConnect.cpp:263
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Connection established on: %s"
-msgstr "%s sunucusuna bağlanıldı"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
 msgstr ""
-"Önemli Hata: Bağlantı sağlanamıyor. İnternet bağlantınız kopmuş olabilir."
+"ipfilter.dat dosyasını '%s' yükleme başarısız. bilinmeyen format algılandı."
 
-#: src/ServerConnect.cpp:339
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Bağlantı kaybedildi: %s (%s:%i)"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) görünüşe göre ölü."
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "ipfilter.dat dosyasını '%s' yükleme başarısız. Dosya açılamıyor."
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) görünüşe göre dolu."
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "%u adet IP-aralığı '%s' den  yüklendi."
+msgstr[1] "%u adet IP-aralığı '%s' den  yüklendi."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Sunucuya otomatik bağlanma %d saniye içinde tekrar denenecek"
-msgstr[1] "Sunucuya otomatik bağlanma %d saniye içinde tekrar denenecek"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Bağlantı Koptu"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u adet bozuk satır göz ardı edildi."
+msgstr[1] "%u adet bozuk satır göz ardı edildi."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "%s (%s:%i) adresine bağlantı başarısız."
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Yeni %s dosyası yeniden adlandırılamadı. Güncelleme iptal edildi."
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "HATA: Zaman aşımı denetlemesinde soket geçersiz"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "IP süzgeci hazır"
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "%s (%s:%i) adresine bağlanma denemesi zaman aşımına uğradı."
-
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"HATA: Yedekleme dosyası yüklenemedi. .part.met kurtarma çözümleri için "
-"http://forum.amule.org adresini araştırın."
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Hiç part dosyası bulunamadı"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "%u adet parça dosyası bulundu"
-msgstr[1] "%u adet parça dosyası bulundu"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr "Geçici dizininin dosya sistemi büyük dosyaları kullanamaz."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr "Gelen dizininin dosya sistemi büyük dosyaları kullanamaz."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Aktarılıyor %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Zaten %s dosyasını indirmeye çalışıyorsunuz."
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Zaten %s dosyası var."
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "%s dosyasını indirmeyi zaten deniyorsunuz"
+"Bilinen kullanıcılardan\n"
+"Ön Yükleme"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Magnet bağlantısı eD2k' ya çevrilemez: %s"
+msgid "Nodes (%u)"
+msgstr "Nodlar (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Bağlantı için bilinmeyen protokol: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Ön yükleme için geçersiz ip"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Geçersiz eD2k bağlantısı! HATA: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Ön yükleme için geçersiz port"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr " <str> çalıştır ve çık."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "İstenilen tüm alanları doldurunuz."
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Geçersiz IP biçimi. xxx.xxx.xxx.xxx:xxxx kullanınız.\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Yeni bir nodes.dat dosyası indirmek istediğinizden emin misiniz?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr ""
-"Bu komut bir argüman gerektiriyor. Geçerli argümanlar: 'all', dosya adı veya "
-"birsayı.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Hash ile işleniyor: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Dosya adı ile işleniyor: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Bu komut bir argüman gerektirir. Geçerli argümanlar: bir dosya adreslemesi.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Geçerli bir sayı değil\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Geçerli bir adresleme değil (uzunluğu tam olarak 32 karakter olmalı)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "İşlem başarılı."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "İstek şu hata ile başarısız oldu: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Kullanıcılar için IP Süzgeci %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "KAPALI"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "AÇIK"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Sunucular için IP süzgeci %s.\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Şu anki IP Süzgeç seviyesi %d.\n"
+"Bunu yapmanız şu anki nodları silecek ve Kademlia bağlantısını baştan "
+"başlatacaktır."
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "Bağlantı sınırları: Gön: %u kb/s, İnd: %u kB/s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Devam mı?"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: Arama sözcüğü çok kısa"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "Bağlandı: %s %s %s"
+msgid "Keyword for search: %s"
+msgstr "Arama için anahtar kelime: %s"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "DüşükID ile"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: Arama anahtar sözcüğü zaten arama listesinde var. "
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "YüksekID ile"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Şimdi bağlanıyor"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Bağlı değil"
-
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
-msgstr ""
-"\n"
-"Aktarım:\t%s"
-
-#: src/TextClient.cpp:726
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Upload:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Gönderim:\t%s"
+"Nodes.dat dosyası okunamadı- dosya çok eski. Bu sürüm (0) artık "
+"desteklenmiyor."
 
-#: src/TextClient.cpp:729
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Sıradaki Kullanıcılar:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "%u adet Kademlia bağlantısı okundu"
+msgstr[1] "%u adet Kademlia bağlantısı okundu"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Toplam Kaynak:\t%d\n"
+"Hiç bağlantı bulunamadı. Lütfen, ön yükleme veya nodes.dat dosyası indirmeyi "
+"deneyin."
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Arama sonuçları sayısı:%i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "YAPILACAK - bir aramanın gidişatını göstermek."
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Sadece %d Kad bağlantısı var. Nodes.dat yazılamadı"
+msgstr[1] "Sadece %d adet Kad bağlantısı var. Nodes.dat yazılamadı"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Sunucudan bilinmeyen bir cevap alındı.: OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Kısa durum bilgisi göster."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "Bağlantı durumunu, o anki gönderim/aktarım hızını v.b. göster.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Tüm istatistik ağacını göster."
-
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"İsteğe bağlı olarak, yazılım alt dallarının kaç girdisinin gösterilmesi "
-"gerektiğini söyleyen\n"
-"bu komuta 0-255 aralığında bir sayı, argüman olarak\n"
-"verilebilir.\n"
-"Boş bırakma veya 0 değerini verme 'sınırsız' demektir.\n"
-"\n"
-"Örnek: 'istatistik 5 sadece her yazılım türünün en üstteki 5 sürümünü "
-"gösterecektir.\n"
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "aMule' yi kapat."
-
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Çalışan uzak çekirdeği kapat (amule/amuled).\n"
-"Bu ayrıca sonraki aracı da kapatacaktır; çünkü çalışan bir çekirdek olmadan\n"
-"bir işe yaramayacaktır.\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Verilen nesne yeniden yükleniyor."
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Paylaşılmış dosya listesini yeniden yükler."
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Dosyadan IP süzgeci tablosunu yeniden yükler."
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "Ağa bağlan."
-
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"Bu, ayarlarda etkinleştirilen tüm ağlara bağlar.\n"
-"Bağlanılacak bir sunucu adresini de IP:Port biçiminde belirleyebilirsiniz.\n"
-"IP onluk IPv4 adresi biçiminde veya çözümlenebilir\n"
-"bir DNS adı olmalıdır."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "Sadece eD2k ağına bağlan."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "Sadece Kad'a bağlan"
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Ağ bağlantısını kes."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Bu, şu anda bağlı olduğunuz tüm ağlarla bağlantıyı kesecektir.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Sadece eD2k bağlantısını kes."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Sadece Kad'dan bağlantıyı kes."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Çekirdeğe bir eD2k veya magnet bağlantısı ekler."
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
-msgstr "Tümü\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Bir ayar değeri girin."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "IP Süzgeci ayarları girin"
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "%d Kademlia bağlantısı yazıldı"
+msgstr[1] "%d Kademlia bağlantısı yazıldı"
 
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "IP süzgecini hem kullanıcılar hem de sunucular için aç."
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Dosya adı"
 
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "IP süzgecini hem kullanıcılar hem de sunucular için  kapat."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Dosya"
 
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "IP süzgecini kullanıcılar için Aç/Kapat."
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Paylaşım oranı"
 
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "IP süzgecini kullanıcılar için aç."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Gönderilen"
 
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "IP süzgecini kullanıcılar için kapat."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "İstenen"
 
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "IP süzgecini sunucular için Aç/Kapa"
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Kabul edilen"
 
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "IP süzgecini sunucular için aç."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Tamamlandı"
 
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "IP süzgecini sunucular için kapat."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
+msgstr "UYARI: Bilinen dosya listesi bozuk. Geçersiz başlık içeriyor."
 
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "IP süzme seviyesini seçiniz."
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
+msgstr "Bilinen dosyalar listesinden girdi yüklenemedi. Dosya bozuk olabilir"
 
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Geçerli süzme seviyeleri 0-255 aralığındadır.Ön tanımlı\n"
-"değer 127'dir.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Bağlantı sınırlarını girin."
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "Bu komutlar için girdiler kilobayt/saniye cinsinden olmalıdır.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Gönderme sınırını girin."
-
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "İndirme sınırını girin."
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Bir ayar değerini al ve göster"
-
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "IP Süzgeci ayarlarını al"
+"Bilinen dosyalar listesinde geçersiz girdi bulundu. Dosya bozuk olabilir:"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Hem kullanıcılar hem de sunucular için IP süzgeci durumunu al."
+#: src/libs/common/Format.cpp:307
+#, c-format
+msgid "Unknown error %d"
+msgstr "Bilinmeyen hata %d"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Sadece kullanıcılar için IP süzgeci durumunu al."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, c-format
+msgid "Unable to get error description for error %d"
+msgstr "%d hatası için tanımlama alınamadı!"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Sadece sunucular için IP süzgeci durumunu al."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Adresleniyor"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "IP Süzgeç seviyesini al."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Tamamlanıyor"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Bağlantı sınırlarını al."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Tamamlandı"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Arama yapar."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Duraklatıldı"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"Bir arama türü şu seçeneklerle belirlenmelidir:\n"
-"    GENEL\n"
-"    SUNUCU\n"
-"    KAD\n"
-"Örnek:'kad dosyası ara' dosya için bir kad araması \"gerçekleştirir\".\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Hatalı"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Genel arama yapar."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Bekliyor"
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Sunucuda arama yapar."
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Boş olmayan bir şifre girmelisiniz."
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Kad. araması yapar."
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Geçersiz şifre, bir MD5 adreslemesi değil!"
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Son arama sonuçlarını gösterir."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "Bağlantı başarısız"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Önceki aramanın sonuçlarına döner.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "EC bağlantısı başarısız. Boş cevap."
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Bir aramanın işleyişini göster"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "Dış Bağlantı: Kötü yanıt. Bağlantı kapatıldı."
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Bir aramanın işleyişini gösterir.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Başarıldı! aMule'ye bağlantı kuruldu. "
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Dosyayı indirmeye başla."
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Başarıldı! Bağlantı kuruldu."
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Son arama sonucunda elde edilen dosya numarası verilmelidir.\n"
-"Örnek: '12 İndir' bir önceki aramadaki 12 numaralı dosyayı indirmeye "
-"başlayacaktır.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Dış Bağlantı: Erişim engellendi çünkü: "
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Aktarımı duraklat"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "Dış Bağlantı: Tanılama engellendi"
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Aktarıma devam et"
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "DinlemeSoketi: Tamam."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Aktarım İptal."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "HATA: TCP portu dinlenemiyor."
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "İndirme önceliği ayarla"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "HATA: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Bir aktarımın önceliğini Düşük, Normal, Yüksek veya OTO. ayarla.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "UYARI:"
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Önceliği Düşük ayarla."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Kapat"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Önceliği Normal ayarla."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Kes"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Önceliği Yüksek ayarla."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Kopyala"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Önceliği Otomatik ayarla."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Yapıştır"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Sıra/liste göster."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Temizle"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Gönderme/indirme sırasını,sunucu listesini veya paylaşılmış dosya listesini "
-"gösterir.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Tümünü Seç"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Gönderim sırasını göster."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "İndirme sırasını göster."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Sınırsız"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Kayıtları göster."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule Sistem Tablası Menüsü"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Sunucu listesini göster."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Hız:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Kaydı (Log) Sıfırla."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "GÖN: Yok"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Geçersiz komut, yerine '%s' kullanın."
+msgid "UL: %u"
+msgstr "GÖN: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Bu geçersiz bir komut, ve gelecekte belki çıkartılabilir.\n"
-"Bunun yerine '%s' kullanın.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "İND: Yok"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "HATA: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "İND: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "UYARI: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Aktarım hızı: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Yeni kullanıcı kimliğiniz %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "UYARI Düşük ID!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tBüyük ihtimalle bir güvenlik duvarı veya router arkasındasınız."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\tDaha fazla bilgi için: http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Gönderme hızı: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Bilinmeyen sunucu bilgisi alındı! - çok kısa"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Yazılım Bilgisi"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "%d adet yeni sunucu alındı"
-msgstr[1] "%d adet yeni sunucu alındı"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Sunucu listesinin kaydı tamamlandı."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Sunucu son komutu reddetti"
+msgid "Nickname: %s"
+msgstr "Rumuz: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "Sunucudan Bogus paketi alındı: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Rumuz Seçilmedi!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "Sunucudan paket alınırken beklenmeyen hata: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "KullanıcıID: "
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "%s bağlantısı için DNS çözümlemesi yapılamıyor."
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Bağlı değil"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "Sunucu IP. %s (%s) süzüldü.  Bağlanılmıyor."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Sunucu Adı:"
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "protokol gizleme kullanılarak bağlanıyor."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "SunucuIP:"
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "%s (%s - %s:%i) adresine %s ."
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Bağlanmadı"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Sunucu %s için DNS çözümlenemiyor: Bağlanmak imkansız!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): Ülke verisi yükleme başarısız "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "%d adet bayrak bitmapi yüklendi"
-msgstr[1] "%d adet bayrak bitmapi yüklendi"
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Bu kategori içindeki bütün dosyaları iptal edip silmek istediğinizden emin "
-"misiniz?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Onaylama Gerekiyor"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Tüm Diğerleri"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Tamamlanmamış"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Aktif"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Görüntü"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Ses"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Sıkıştırılmış"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD-İmajı"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Resim"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Döküman"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Görünüm Süzgeci Seç"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Kategori Ekle"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Kategoriyi Düzenle"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Kategoriyi Kaldır"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Dosya adı"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Dosya boyutu"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Paylaşım oranı"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Gönderilen"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "İstenen"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Kabul edilen"
+msgid "TCP port: %d"
+msgstr "TCP port: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Tam kaynaklar"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP port: Hazır değil"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "İçe Aktarılıyor %s: %s"
+msgid "UDP port: %d"
+msgstr "UDP port: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Geçici dosyalar dizini okunuyor."
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UDP port: Hazır değil"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Aktarım bilgisi dosyasından temel bilgiler alınıyor."
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Çevrim içi İmza: Etkin"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Hedef dosya oluşturuluyor."
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Çevrim içi İmza: Devre dışı"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Eski aktarım dosyasından veri yükleniyor.  (%u of %u)"
+msgid "Uptime: %s"
+msgstr "Çalışma Süresi: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Yeni tek aktarım dosyasına veri bloku kaydediliyor.  (%u of %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Kaynak aktarım dosyası bilgisi alınıyor."
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Aktarım ekleniyor ve yeni parça dosyası kaydediliyor."
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Parça dosyalarını içe aktar"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Durum"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Dosya adreslemesi"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Bekliyor..."
+msgid "Shared files: %d"
+msgstr "Paylaşılan dosyalar: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (Disk: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Lütfen geçici aktarım dosyaları için bir dizin seçiniz. (Alt dizinler de "
-"taranacaktır.)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr ""
-"İçe aktarımı başarılı olan kaynak dosyalarının silinmesini ister misiniz?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Kaynakları çıkar?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "bayt"
-msgstr[1] "bayt"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "bayt/sn"
-msgstr[1] "bayt/sn"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "sn"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "dk"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "saat"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "Gün"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Görüntüler"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Sıkıştırılmış Dosyalar"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Dokümanlar"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Programlar"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Herhangi"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Derecelendirilmemiş"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Geçersiz / Bozuk / Sahte"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Zayıf"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Doğru"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "İyi"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Mükemmel"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "Tümü"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "Diğer"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "IP süzgeçleri 'ipfilter.dat' ve 'ipfilter_static.dat' yükleniyor."
+msgid "Queued clients: %d"
+msgstr "Sıraya giren kullanıcılar: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr ""
-"ipfilter.dat dosyasını '%s' yükleme başarısız. bilinmeyen biçim algılandı."
+msgid "Total DL: %s"
+msgstr "Toplam İND: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "ipfilter.dat dosyasını '%s' yükleme başarısız. Dosya açılamıyor."
+msgid "Total UL: %s"
+msgstr "Toplam GÖN: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "%u adet IP-aralığı '%s' dosyasından  yüklendi."
-msgstr[1] "%u adet IP-aralığı '%s' dosyasından  yüklendi."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Gönderim sınırı"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u adet bozuk satır göz ardı edildi."
-msgstr[1] "%u adet bozuk satır göz ardı edildi."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Aktarım sınırı"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Aktif Bağlantılar (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "aMule'yi Gizle"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Dosya Ayrıntıları"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "aMule'yi Göster"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% tamamlandı"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Çıkış"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
-msgstr "Bağlantı "
+msgstr "eD2k Bağlantısı:"
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Onayla"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Metin denetimindeki eD2k bağlantısını indirme sırasına eklemek için burayı "
 "tıklayın."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
@@ -4532,25 +2684,29 @@
 "Olaylar burada gösterilir. Olayların tam listesi için Sunucu sekmesine "
 "bakınız."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Yükleniyor..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Sunucu üzerinden bağlandığınız kullanıcı sayısı..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Kullanıcılar: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr "Şu anki sunucuya bağlı kullanıcılar ve kullanıcıların yaklaşık sayısı."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Gön: 0.0 | İnd: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4558,7 +2714,7 @@
 "Şu anki ortalama gönderim ve aktarım oranları. Etkinleştirilirse, ızgaralar "
 "üzerindeki rakamlar kullanıcı iletişiminden kaynaklanan ek yükü gösterir."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4569,1173 +2725,1151 @@
 "bağlanmadığınızı, sarı ok düşük ID (güvenlik duvarı)aldığınızı ve yeşil ok "
 "ise yüksek ID (En verimli bağlantı türü) aldığınızı simgeler."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Bağlanmadı ..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "Şu an bağlanılan sunucu."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Ara"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Ad:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Tür"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Sunucu"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Genel"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Dosya Adreslemesi"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Genişletilmiş Parametreler"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Süzgeç"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Dosya Türü"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Herhangi"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Sıkıştırılmış Dosyalar"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Ses"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD-İmajı"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Resim"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Programlar"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Belgeler"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Videolar"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Uzantı"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "En Az Boyut"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "bayt"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "En Fazla Boyut"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Uygunluk"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Süz:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Süzme Sonuçları"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Sonuçları tersine çevir."
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Bilinen Dosyaları Gizle"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Başlat"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Daha Fazla"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
-msgstr "Ara Kademlia."
+msgstr "Daha fazla sonuç için eD2k aranır. Kad ağında henüz desteklenmiyor."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Durdur"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "İndir"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Alanları Sıfırla"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Sonuçlar"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Tamamlanan aktarımları temizler."
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Gönderim/Gön-sırasını  Gösterir."
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Sıradaki Kullanıcılar:"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Gönder"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Belirlenen iletiyi gönderir."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Kapat"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "Dosya kaynakları"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Bu sohbet oturumunu kapatır."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Genel"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Tam Ad :"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/A"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "met-Dosyası :"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Adresleme:"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Dosya Boyutu :"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Parça Dosya Durumu :"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Son Görülen Tamamlama :"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Aktarım"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Bulunan Kaynaklar:"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Aktarılan Kaynaklar:"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Dosya Parçası-Sayısı:"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Uygun:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Veri Oranı:"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Aktarım Süresi: "
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Aktarılan:"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Tamamlanmış Boyut:"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Akıllı Bozulma Yakalayıcısı"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Bozulma ile kaybedilen:"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Sıkıştırma ile kazanılan:"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "I.C.H ile kurtarılan paketler :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Dosya Adları"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Devral"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Temizle"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Uygula"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Tamam"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Dosyayı Yorumla/Puanla (İçerik tüm kullanıcılara gösterilecektir.)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Bir filmin uzunluğu, öyküsü, dili hakkında yorumda bulunabilir\n"
-" ve sahteyse diğer kullanıcıları uyarabilirsiniz."
+"Bir film için süresini, öyküsünü, dilini ...\\n\\nve sahte bir dosya ise "
+"bunu diğer aMule kullanıcılarına bildirebilirsiniz."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Dosya Kalitesi"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Derecelendirilmemiş"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Geçersiz / Bozuk / Sahte"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Zayıf"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Doğru"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "İyi"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Mükemmel"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Dosya puanlaması seçiniz veya geçersiz ise diğer kullanıcıları uyarınız."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Yenile"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Aktarılıyor, lütfen bekleyiniz ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Boyut bilinmiyor"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Gerekli Bilgiler"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP Adresi:"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Port:"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Ek Bilgi"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Kullanıcı Adı :"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Kullanıcı Adreslemesi :"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Paylaşılan dosyalarınızı yeniden yükleyin"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Şimdiki Oturum"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Toplam"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "İstenilen :"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Aktif Göndermeler:"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Ekle"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "İndirme Hızı"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Şimdiki"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Çalışma ortalaması"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Oturum ortalaması"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Gönderim Hızı"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "Bağlantılar"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Aktif İndirmeler"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Aktif Bağlantılar (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Aktif Göndermeler"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "İstatistik Ağacı"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Kullanıcı Adı:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Kullanıcı Adreslemesi:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Yazılım:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Yazılım Sürümü:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP :"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "Kullanıcı ID:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "Sunucu IP:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Sunucu:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
-msgstr "Gizlenme:"
+msgstr "Gizleme:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
-msgstr "Kad:"
+msgstr "Kademlia:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Yapılan aktarımlar"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Şimdiki İstek:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Ortalama gönderim oranı:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Ortalama aktarım oranı:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Gönderilen (oturum):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "İndirilen (oturum):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Gönderilen (toplam):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "İndirilen (toplam):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Skor"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "İND./GÖN. niteleyici:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Güvenli Kimlik:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Puanlama (toplam):"
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "Kuyruk sırası:"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Sıra skoru:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Rumuz"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - Linux Katırı"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - çok-sistemli Katır"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Bağlandığınızda diğerlerinin göreceği isminiz budur."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Dil"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Dil: "
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "İpuçlarını göstermeden önce geçecek süreyi belirler."
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "Arayüzde kullanılacak dil."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Çeşitli Seçenekler"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
-msgstr "Yeni sürümü başlangıçta kontrol et."
+msgstr "Yeni sürümü başlangıçta denetle."
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr "Bunu etkinleştirmek, aMule'nin yeni sürümleri aramasını sağlar."
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Küçültülmüş başla"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Bunu etkinleştirmek aMule'nin küçültülmüş durumda başlamasını sağlar."
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Çıkışta uyar"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "aMule'nin çıkışta sizi uyarmasını sağlar."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "aMule'nin çıkıştan önce uyarmasını sağlar."
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr "Kapatma butonuna tıklandığında uygulamayı sakla"
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Sistem tablası simgesini etkinleştir."
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr ""
-"Bu, sistem tablası (ya da görev çubuğu) simgesini Etkinleştirir/Devreden "
-"çıkarır."
+"Bu, sistem tablası (ya da görev çubuğu) simgesini Etkinleştirir/Devre dışı "
+"bırakır."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Sistem tablasına küçült."
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr "Bu, aMule'nin görev çubuğu yerine sistem tablasına küçülmesini sağlar."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "İpucu gösterme gecikmesi"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "İpucu gecikme süresi: "
+
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "saniye"
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "İpuçlarını göstermeden önce geçecek süreyi belirler."
-
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Tarayıcı Seçimi"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Sistem Ön Tanımlısı"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Tarayıcınızı burada seçiniz"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Kullanıcı Tanımlı Tarayıcı:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Tarayıcınızın adını buraya giriniz. Kişisel bir tarayıcı kullanmak için "
-"yukarıdaki 'Kullanıcı Tanımlı' seçeneğini seçiniz."
+"Tarayıcı adını buraya giriniz. Sisteminizin ön tanımlı tarayıcısını "
+"kullanmak için boş bırakınız."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Göz at"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Mümkünse yeni sekmede aç"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "Web sayfasını ,yeni pencere yerine mümkünse yeni sekmede açar."
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Ortam Çalıcısı"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Ön izleme için yedekleme oluştur"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Bağlantı sınırları"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Gönderme"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Slot Tahsis Boyutu"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Standart TCP Portu:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Portlar"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Standard TCP Portu "
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "pasifleştirilmiş."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Genişletilmiş UDP Portu:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "Sunucu istemleri için UDP Portu (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr "Kademlia"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Genişletilmiş UDP portu (Kad / Genel arama) "
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "devre dışı"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr "Bu UDP portu genişletilmiş eD2k istemleri ve Kad ağı için kullanılır"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Bağlı Adres"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Genişletilmiş sunucu istemleri için UDP portu (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Dosya başına En Fazla Kaynak"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Router port iletimi için UPnP'yi etkinleştir"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Katı sınır"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnP TCP Portu (İsteğe bağlı):"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Bağlantı sınırları"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Yerel adresi IP' ye bağla (herhangi biri için boş bırakın):"
 
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "En Fazla bağlantı sayısı"
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Sadece ileri düzey kullanıcılar: Birden fazla ağ arayüzünüz varsa; aMule'nin "
+"izleyeceği arayüz adresini giriniz."
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "İndirilen dosya başına en fazla kaynak sayısı:"
+
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "En cazla eş bağlantı sayısı:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Evrensel Tak ve Çalıştır"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "UPnP'yi aktifleştir."
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP TCP Portu:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Başlangıçta otomatik bağlan"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Bağlantı koptuğunda yeniden bağlan"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Ek Yük Sınırını Göster"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Sunucu Seçenekleri"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Ölü sunucuları"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "denemeden sonra kaldır"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
-msgstr "Sunucu listesini her açılışta güncelle"
+msgstr "Otomatik başlangıç"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Liste"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
-msgstr "Sunucu listesini bir sunucuya bağlanınca güncelle"
+msgstr "Bir sunucuya bağlandığında sunucu listesini güncelle"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
-msgstr "Sunucu listesini bir kullanıcıya bağlanınca güncelle"
+msgstr "Bir kullanıcı bağlandığında sunucu listesini güncelle"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Öncelik sistemini kullan"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
-msgstr "Bağlanırken akıllı DüşükID kontrolü yap"
+msgstr "Bağlanırken akıllı DüşükID denetimi yap"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Güvenli Bağlantı"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Sadece statik listesindeki sunuculara otomatikman  bağlan"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Elle eklenmiş sunuculara Yüksek Öncelik ata"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H aktif"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH her adreslemeyi doğru kabul etsin. (önerilmez)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Akıllı Bozulma Yakalayıcısı (I.C.H.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Etkinleştir"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Gelişmiş I.C.H. her adreslemeye güvensin. ( önerilmez )"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Dosyaları aktarımlara duraklatılmış kipte ekle"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Dosyaları, aktarımlara otomatik öncelikle ekle"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "İlk ve son parçaları en önce indirmeye çalış"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Dosyaları paylaşılanlara otomatik öncelikle ekle"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Bütün gönderimlere tam parçaları yollamayı dene"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "Bir dosya tamamlandığında sonraki duraklatılmış dosyayı başlat"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "Bir dosya tamamlandığında duraklatılan sonraki dosyaya başla"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
-msgstr "Aynı kategoriden"
+msgstr "Aynı sınıftan"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Nadir bulunan dosyalarda 10 kaynak sakla (<20 kaynak)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "Alfabetik sırayla"
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Boş alan"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Yeni dosyalar için diskte yer ayır"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Boş alanı denetle"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
+"Yeni dosyalarda, dosyanın tamamı için sabit diskte yer ayrılarak parçalanma "
+"azaltılır"
 
-#: src/muuli_wdr.cpp:2058
-msgid "Select this if you want aMule to check your disk space"
-msgstr "aMule' nin diskteki alanı denetlemesini istiyorsanız bunu seçiniz."
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Boş disk alanı şu kadar kaldığında aktarımları durdur "
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "En az boş alan:"
+#: src/muuli_wdr.cpp:1819
+msgid "Select this if you want aMule to check your disk space"
+msgstr "aMule'nin diskteki alanı denetlemesini istiyorsanız bunu seçiniz."
 
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "Buraya istenilen en az disk alanını giriniz"
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "Yeni dosyalar için diskte yer ayır"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Nadir bulunan dosyalarda 10 kaynak sakla (<20 kaynak)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
-"Yeni dosyaların tamamı için diskte yer ayırır ve böylece dosya sistemi "
-"parçalanması azalır"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Gönderilenler"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Gelen"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Geçici"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Paylaşılan"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Dosyaları paylaşılanlara otomatik öncelikle ekle"
+
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "İndirmeler için hedef dizin"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Geçici dosyalar için dizin"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Paylaşılan dizinler"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Sürekli paylaşım için dizin simgesine sağ tıklayınız.)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Gizli dosyaları paylaş"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Grafikler"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Güncelleme gecikmesi: 5 sn"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Ortalama grafiği için süre: 100 dk"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Bağlantı Grafik Ölçüsü: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "İstatistik Renklerini Seçiniz"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "İndirme grafik ölçüsü:"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Gönderme grafik ölçüsü:"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Renkler: "
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
-msgstr "Arka Plan"
+msgstr "Arka plan"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Izgara"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Şu anki aktarımlar"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Aktarım çalışma ortalaması"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Aktarım oturum ortalaması"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Şu anki gönderme"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Gönderme çalışma Ortalaması"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Gönderme oturum ortalaması"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Aktif bağlantılar"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Sistem Tablası Simgesi Hız Göstergesi"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Şu anki Kad nodları"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "İşlemdeki Kad-nodları"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Oturumdaki Kad-nodları"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Seçiniz"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Ağaç"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Gösterilen Yazılım Sürümü Sayısı (0=sınırsız)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Bağlantı Kapasitesi"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Not: Bu değerler sadece istatistikler için kullanılacaktır."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! UYARI !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Ne yaptığınızı bilmediğiniz sürece \n"
-"bu ayarları değiştirmeyiniz.\n"
-"Yoksa her şeyi karıştırabilirsiniz.\n"
-"\n"
-"Bu ayarlarla oynanmasa da\n"
-"aMule gayet iyi işleyecektir."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "İleri Ayarlar"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "En fazla yeni bağlantı / 5 sn"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Dosya Tampon Boyutu: 240000 bayt"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Gönderme Sıra Boyutu: 5000 kullanıcı"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Sunucu bağlantısı yenileme sıklığı :Devre dışı"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Aktarım Sırası Dosya İşlemi"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Tamamlanmış aktarım yüzdesini göster."
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "İşlem çubuğunu göster. "
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "İşlem çubuğu biçemi"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "Bilgisayarın devre dışı kalma modunu etkisiz hale getir"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Kullanılacak kaplama: "
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "\"Hızlı eD2k Bağlantı Yakalayıcısı\"nı her pencerede göster.."
+
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
+msgstr "Sınıf sekmelerinde genişletilmiş bilgi göster."
 
-#: src/muuli_wdr.cpp:2351
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
+msgstr "Başlık çubuğunda uygulama sürümünü göster"
+
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "Başlık çubuğunda aktarım oranlarını göster."
+
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Uygulama adından önce"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Uygulama adından sonra"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Ek yük ağ genişliğini göster"
+
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "Dikey araç çubuğu yerleşimi"
+
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "İstemciler için ülke bayraklarını göster"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Sıradaki Dosyaları İndir"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "İşlem yüzdesini göster"
+
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "İşlem çubuğunu göster"
+
+#: src/muuli_wdr.cpp:2144
 msgid "Flat"
 msgstr "Düz"
 
-#: src/muuli_wdr.cpp:2354
+#: src/muuli_wdr.cpp:2150
 msgid "Round"
 msgstr "Yuvarlatılmış"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Kaplama Desteği"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Kaplama desteğini etkinleştir."
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Kaplama:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "-kaplama yok-"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Sütun Sıralama"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr ""
-"Aktarım sırasındaki dosyaları, otomatikman sırala (Yüksek işlemci yükü)"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Dosyaları otomatik sırala (yüksek CPU)"
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp:2157
 msgid "aMule will sort the columns in your download list automatically"
 msgstr "aMule aktarım listenizdeki sütunları otomatikman sıralayacaktır."
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Çeşitli Arayüz Seçenekleri"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Hızlı eD2k Bağlantı Alıcısını göster"
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "Dışarıdan Bağlantı Parametreleri"
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
-msgstr "Kategori sekmelerinde genişletilmiş bilgi göster."
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "Dışarıdan bağlantıları kabul et."
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "Başlık çubuğunda aktarım oranlarını göster."
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "Dinlenen arayüzün IP' si:"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "Dikey araç çubuğu yerleşimi"
-
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "İsimden önce parça dosyası numarasını göster."
+#: src/muuli_wdr.cpp:2190
+msgid ""
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
+msgstr ""
+"Dinleme EC arayüzü için a.b.c.d biçiminde geçerli bir ip giriniz. Boş "
+"bırakılan alan veya 0.0.0.0 arayüz yok demektir."
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Web sunucusu parametreleri"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "TCP portu:"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Başlangıçta amuleweb'i çalıştır."
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
+msgstr "EC portuna UPnP port yönlendirmesi etkin."
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Web sunucusu portu"
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Şifre"
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Web sunucusu portu üzerinde UPnP port yönlendirmesini etkinleştir"
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Web sunucusu değerleri"
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Web sunucusu UPnP TCP portu"
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Başlangıçta web sunucusunu başlat"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Sayfa yenileme zamanı (sn)"
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Web şablonu"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Gzip sıkıştırmayı etkinleştir."
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Tam hak şifresi"
 
-#: src/muuli_wdr.cpp:2477
+#: src/muuli_wdr.cpp:2243
 msgid "Enable Low rights User"
 msgstr "Düşük hakka sahip kullanıcıyı etki kıl."
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Tam hak şifresi"
-
-#: src/muuli_wdr.cpp:2490
+#: src/muuli_wdr.cpp:2249
 msgid "Low rights password"
 msgstr "Düşük hak şifresi"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Web şablonu"
-
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "Dışarıdan Bağlantı Parametreleri"
-
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "Dışarıdan bağlantıları kabul et."
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Web sunucu portunun UPnp port iletimini etkinleştir"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"Dinleme arayüzü için IP\n"
-"(yok ise boş)"
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Web sunucusu UPnp TCP portu (İsteğe bağlı)"
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
-msgstr ""
-"Dinleme EC arayüzü için a.b.c.d biçiminde geçerli bir ip giriniz. Boş "
-"bırakılan alan veya 0.0.0.0 arayüz yok demektir."
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Sayfa yenileme zamanı (sn)"
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP portu"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Gzip sıkıştırmayı etkinleştir."
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
-msgstr "EC portuna UPnP port yönlendirmesi etkin."
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "Tamam"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Ayarlarda yapılan değişikliklerin uygulanması için buraya tıklayınız."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Ayarlarda yapılan değişiklikleri sil."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Başlık :"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Yorum:"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Gelen Dosyalar Dizini :"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Yeni eklenen dosyalar için öncelikleri değiştir."
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "Değiştirme"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
-msgstr "Bu kategori için renk seçiniz. (ön tanımlı) :"
+msgstr "Bu sınıf için renk seçiniz. (varsayılan) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Bağlanıldığında sunucu motd göster...."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Sunucu Bilgisi"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Sıfırla"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
-msgstr "Kayıtları (Log) silmek için bu düğmeye basınız."
+msgstr "Günlük kayıtlarını silmek için bu düğmeye basınız."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule Kayıtları"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Sunucu listesini İnternet'ten güncellemek için bu düğmeye basınız..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Sunucu"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5743,43 +3877,55 @@
 "Adresi server.met dosyasına buradan giriniz. Sonra, bilinen sunucuları "
 "güncellemek için soldaki düğmeye tıklayınız."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Sunucuyu elle ekle: İsim"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Yeni sunucunun adını buraya giriniz."
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Port"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Yeni sunucun IP numarasını x.x.x.x biçiminde buraya giriniz."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Sunucunu portunu buraya giriniz."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Sunucuyu elle ekle (önce soldaki alanları doldurunuz) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule Günlüğü"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Sunucu Bilgisi"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "ED2K Bilgileri"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kademlia Bilgileri"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Nod listesini İnternet'ten güncellemek için bu düğmeye tıklayınız."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Nodlar (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5787,51 +3933,54 @@
 "Bilinen nodları güncellemek için buraya adresi giriniz ve soldaki düğmeye "
 "tıklayınız."
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Nod Durumu"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Ön Yükleme"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Yeni nod"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Port:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
-msgstr ""
-"Bilinen kullanıcılardan\n"
-"Ön Yükleme"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
+msgstr "Bilinen kullanıcılardan Ön Yükleme"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
-msgstr "Kad. Bağlantısını Kes"
+msgstr "Kad Bağlantısını Kes"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2k Bilgisi"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Kullanıcı"
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Bu seçeneği aktifleştirmeniz önerilir. SUI aktif değilse, kredi alamazsınız."
+
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Protokol Gizleme"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Protokol Gizleme etkin"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5839,11 +3988,11 @@
 "Bu seçenek Protokol Gizleme'yi etkinleştirir ve aMule'nin gizlenmiş "
 "bağlantıları kabul etmesini sağlar."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Giden bağlantılar için gizleme kullan"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5851,11 +4000,11 @@
 "Bu seçenek diğer kullanıcı veya sunucularla olan bağlantılarda Protokol "
 "Gizleme'yi etkinleştirir."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Sadece gizlenmiş bağlantıları kabul et"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5863,85 +4012,81 @@
 "Bu seçenek aMule'nin sadece gizlenmiş bağlantıları kabul etmesini sağlar."
 "Daha az kaynak bulursunuz;ancak tüm trafiğiniz de gizlenmiş olur."
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Dosya Seçenekleri"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Herkes"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Hiç kimse"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Paylaşılan dosyaları görebilecek olanlar:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Paylaşılan dosyalarımı kim görebilir:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Paylaşılan dosyalarınızı kime göstereceğinizi seçiniz."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP_Süzme"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Kullanıcıları Süz"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "~/.aMule/ipfilter.dat dosyasında tanımlanan kullanıcı IP'lerini süzmeyi "
 "etkinleştir."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Sunucuları süz"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "~/.aMule/ipfilter.dat dosyasında tanımlanan sunucu IP'lerini süzmeyi "
 "etkinleştir."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Listeyi yeniden yükle"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "~/.aMule/ipfilter.dat dosyasından IP'leri süzgece yeniden yükle."
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "Adres:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Şimdi güncelle"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Ip süzgecini başlangıçta otomatikman güncelle."
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Süzme Seviyesi:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Her zaman LAN IP'lerini süz."
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "Uyuşmayan IP'lere şüpheci yaklaşım."
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -5949,11 +4094,11 @@
 "Paketin alındığı ip ile kullanıcı ip numarası farklıysa paket reddedilir."
 "(Dikkatli kullanın)"
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Varsa, sistem geneli ipfilter.dat kullan"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
@@ -5961,22 +4106,11 @@
 "Yerel bir ipfilter.dat dosyası bulunamazsa, sistem geneli ipfilter "
 "kullanımına izin ver"
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Kullanıcı"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Bu seçeneği aktifleştirmeniz önerilir. SUI aktif değilse, kredi alamazsınız."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
-msgstr "Çevrimiçi-İmza Etkin"
+msgstr "Çevrimiçi-İmza' yı Etkinleştir"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -5984,843 +4118,1294 @@
 "Diğer uygulamaların imzalar ve benzerlerini  oluşturabilmesi için "
 "kullanabileceği Çev.İmza dosyasını yazmayı etkinleştirir."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Güncelleme Sıklığı (Sn.):"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr ""
 "Çevrim içi İmza güncellemeleri için (saniye bazında) sıklığı değiştirir."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Çevrim içi İmza Dizini:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Çevrim içi imza dosyasını buraya sakla: "
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr "Çevrim içi İmza dosyalarını içeren dizini seçiniz."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Etkinleştir/Devre dışı bırak"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Gelen iletileri süz (o anki sohbet dışında.)"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Süzgeç Seçenekleri:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Hepsini süz."
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Arkadaş listesindekiler dışında herkesi süz."
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Bilinmeyen yazılımlardan gelenleri süz."
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "Şu içerikteki iletileri süz (ayraç olarak ','  kullanınız.):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "Buraya ekleyeceğiniz sözcükleri içeren iletiler aMule tarafından engellenir."
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Günlükte alınan iletileri göster"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Yorumlar"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Şu içerikteki iletileri süz (ayraç olarak ',' kullanınız.):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Vekil sunucu kullanmadan otomatik sunucu bağlantısı"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Yetkilendirmeyi etkinleştir."
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Kullanıcı adı/şifre yetkilendirmeyi etkinleştir/devre dışı bırak."
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Kullanıcı adı: "
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Vekil sunucuya bağlanmak için gerekli kullanıcı adı"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Şifre:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Vekil sunucuya bağlanmak için gerekli şifre"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Vekil sunucuyu Etkinleştir."
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Vekil sunucu desteğini etkinleştir/devre dışı bırak"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Vekil sunucu Türü:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Bağlanacağınız vekil sunucu türü"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
-msgstr "Vekil sunucu makinesi:"
+msgstr "Vekil sunucu makine:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Vekil sunucu makine adı"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Vekil sunucu Portu:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Vekil sunucu portu"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Yetkilendirme"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Yetkilendirmeyi etkinleştir."
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Kullanıcı adı/şifre yetkilendirmeyi etkinleştir/devre dışı bırak."
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Vekil sunucuya bağlanmak için gerekli kullanıcı adı"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Şifre:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Vekil sunucuya bağlanmak için gerekli şifre"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Vekil sunucu kullanmadan otomatik sunucu bağlantısı"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "Bağlan:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Uzaktan aMule'ye giriş yapınız."
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Kullanıcı adı"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Bu ayarları hatırla"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "Fazladan Hata Çıktısı Kaydını Etkinleştir."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
-msgstr "İleti Kategorileri:"
+msgstr "İleti Sınıfları:"
+
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Bekliyor..."
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "İçe aktarımları ekle"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Seçileni tekrar dene"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Seçileni çıkar"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
-msgstr "Olay türleri"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
+msgstr "Olay Türleri"
+
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+"Seçili dosya(lar) için kuyruktaki istemciler ve istatistikler: Oturum / "
+"Bütün zamanlar"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "Etkin Göndermeler"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "Toplam dosyaların yüzdesi"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "Tüm dosyalar"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "Seçilen dosyalar"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "Sadece aktif Göndermeler"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "Kullanıcıları Göster"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "Yeniden yükle"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Paylaşılan dosyalarınızı yeniden yükleyin"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Gönder"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Belirlenen iletiyi gönderir."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Bu sohbet oturumunu kapatır."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
-msgstr "Herhangi bir sunucuya ve/ya Kad.'a bağlan."
+msgstr "Herhangi bir sunucuya ve/veya Kad'a bağlan."
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Ağ Penceresi"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Paylaşılan Dosyalar"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Arama Penceresi"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Devre dışı [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Dosya Aktarım Penceresi"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "bayt"
+msgstr[1] "bayt"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Paylaşılan Dosya Penceresi"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Sohbet Penceresi"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "İstatistik Grafik Penceresi"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Ayar Penceresi"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Yeni Kategori"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Gelen dosyalar için bir dizin seçin"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Kategori için bir isim girmelisiniz!"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "bayt/sn"
+msgstr[1] "bayt/sn"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Kategori için bir yol girmelisiniz!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr ""
-"Kategori için gelen dizini oluşturma başarısız. Lütfen geçerli bir yol "
-"giriniz!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "sn"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "dk"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "saat"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "Gün"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "Tümü"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "Diğerleri"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Tamamlanmamış"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Durduruldu"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Görüntü"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Sıkıştırılmış"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Belge"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Etkin"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Bilinmeyen %s uzantısı, %s komutu için.\n"
+msgid "Using config dir: %s"
+msgstr "Kullanılan yapılandırma dizini: %s"
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Parçadosyası dönüşümünün bitmesi bekleniyor..."
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Bilinmeyen komut '%s' .\n"
+msgid "Importing %s: %s"
+msgstr "İçe Aktarılıyor %s: %s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Bu komut bir argüman içeremez.\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Geçici dosyalar dizini okunuyor."
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Aktarım bilgisi dosyasından temel bilgiler alınıyor."
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Hedef dosya oluşturuluyor."
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Eski aktarım dosyasından veri yükleniyor.  (%u of %u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Yeni tek aktarım dosyasına veri bloku kaydediliyor.  (%u of %u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Kaynak aktarım dosyası bilgisi alınıyor."
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Aktarım ekleniyor ve yeni parça dosyası kaydediliyor."
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Parça dosyalarını içe aktar"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Durum"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Dosya adreslemesi"
 
-#: src/ExternalConnector.cpp:157
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (Disk: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command must have an argument.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Bu komut bir argüman içermelidir.\n"
+"Lütfen geçici aktarım dosyaları için bir dizin seçiniz. (Alt dizinler de "
+"taranacaktır.)"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
 msgstr ""
-"\n"
-"Bu komut eksik.Aşağıdaki uzantılardan birini girmelisiniz.\n"
+"İçe aktarımı başarılı olan kaynak dosyalarının silinmesini ister misiniz?"
 
-#: src/ExternalConnector.cpp:166
-msgid ""
-"\n"
-"Available extensions:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Kaynakları çıkar?"
+
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "HATA: Part dosyası oluşturma başarısız"
+
+#: src/PartFile.cpp:336
+#, c-format
+msgid "Trying to load backup of met-file from %s"
+msgstr "Met-dosyası yedeklemesi %s konumundan yüklenmeye çalışılıyor."
+
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "HATA: part.met dosyası açılamadı: %s ==> %s"
+
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "HATA: part.met dosyası 0 boyuta sahip: %s ==> %s"
+
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "HATA: Geçersiz part.met dosya sürümü: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr "HATA: %s (%s) bozuk (hatalı yaftalar: %s), dosya yüklenemez."
+
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+msgstr "HATA: %s (%s) bozuk (hatalı başlık sayısı), dosya yüklenemez."
+
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Dosya bilgisi kurtarılmaya çalışılıyor..."
+
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
 msgstr ""
-"\n"
-"Uygun uzantılar:\n"
+"İsimsiz dosya kurtarılmaya çalışılıyor-RecoveredFile.dat olarak kaydedilecek."
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Uygun komutlar:\n"
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "Uygun olan tüm bilgiler kurtarıldı. :-D - bunlar kullanılacak..."
+
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Dosya bilgisi kurtarılamıyor :("
+
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "%s (%s) açma başarısız"
+
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "UYARI: %s bozulmuş olabilir (%i)"
+
+#: src/PartFile.cpp:897
+#, c-format
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "Parça dosyası kaydedilirken HATA: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "Parçadosyası kaydedilirken girdi-çıktı hatası: "
+
+#: src/PartFile.cpp:917
+#, c-format
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "'%s' dosyasının uzunluğu alınamıyor - %s dosyası kullanılıyor."
+
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' bir şekilde 0 boyutlu-%s dosyası kullanılacak."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "%s için pat.met girdilerini kaydetme başarısız."
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "%i kaynak tohumu parça dosyası için kaydedildi: %s (%s)"
+msgstr[1] "%i kaynak tohumu parça dosyası için kaydedildi: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "%s (%s) parça dosyası girdi dosyasına sahip değil."
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Parça dosyası %s (%s) geçersiz girdi dosyası içeriyor."
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Parça dosyasına ait girdi dosyası  (%s - %s): %s okunamıyor."
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
 #, c-format
 msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Tüm komutlar büyük-küçük harf duyarlıdır.\n"
-"'%s <command>' tuşlayarak <command> hakkında detaylı bilgi alabilirsiniz.\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Bozuk parça (%d) %d parça dosyası %s içinde bulundu -Dosya sonuç adreslemesi "
+"|%s| Dosya adreslemesi |%s|"
+msgstr[1] ""
+"Bozuk parça (%d) %d parçadosyası %s içinde bulundu -Dosya sonuç adreslemesi |"
+"%s| Dosya adreslemesi |%s|"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Uygulamadan çıkar."
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Tamamlanmış (%i) parçası %s içinde bulundu."
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Yardımı göster."
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "%s dosyasının yeniden adreslenmesi bitti"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "%s tamamlanırken beklenmeyen bir hata oluştu. Dosya duraklatıldı"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Aktarım tamamlandı: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Dosya siliniyor: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr "UYARI: İndirilen parça adreslenemiyor - adresleme seti '%s' için eksik"
+
+#: src/PartFile.cpp:2292
+#, c-format
 msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"Bir komut hakkında yardım çağırmak için 'help <command>' yazınız.\n"
-"Tüm komutları görmek için 'help' yazınız.\n"
+"HATA: Aktarılan parça adreslenemiyor.- adres seti tamamlanmamış (%s). Bu hiç "
+"olmamalıydı"
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
 #, c-format
 msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"\n"
-"Komut listesi için '%s' kullanınız.\n"
-"\n"
+"İndirilen %u bölümünün %u uzunluğunda (maksimum %u) parçasının ('%s' parça "
+"dosyasına ait (%u uzunluğunda)), adreslenmesinde EOF: %s"
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Söz dizimi hatası!"
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "UYARI: Yetersiz disk alanı! %s dosyası duraklatılıyor."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr ""
-"Komut çalıştırmada hata.- Bu hiç olmamalıydı! Lütfen hatayı bildiriniz.\n"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "İndirilen %i parçası %s dosyasındaydı ve bozuk."
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Bu komut herhangi bir parametre içermemeli."
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr ""
+"ICH: Bozulan %i parçası %s dosyasındaydı ve kurtarıldı -> Kaydedilen miktar: "
+"%s bayt"
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Bu komut bir parametre içermeli."
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Ayrılıyor"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Geçersiz argüman."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Yetersiz disk alanı"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Bu eksik bir komut."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "İndirildi"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:4003
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Daha fazla yardım için '%s' yazınız.\n"
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "HATA: Parça dosyası '%s' açılamıyor"
 
-#: src/ExternalConnector.cpp:362
-#, c-format
-msgid "This is %s %s %s\n"
-msgstr "Bu bir %s %s %s\n"
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Sistem öntanımlısı"
 
-#: src/ExternalConnector.cpp:364
-#, c-format
-msgid "This is %s %s\n"
-msgstr "Bu bir %s %s\n"
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Arnavutça"
+
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Arapça"
+
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "Asturyasça"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Baskça"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Bulgarca"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Katalanca"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Çince (Simplified)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Çince (Traditional)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Hırvatça"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Çekçe"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Danca"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Felemenkçe"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "İngilizce (U.K)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Estonca"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Fince"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Fransızca"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Galce"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Almanca"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Yunanca"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "İbranice"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Macarca"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "İtalyanca"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "İtalyanca (İsviçre)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Japonca"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Korece"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Litvanyaca"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Norveççe(Nynorsk)"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Lehçe"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Portekizce"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Portekizce (Brezilya)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Rusça"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Slovence"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "İspanyolca"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "İsveççe"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Türkçe"
 
-#: src/ExternalConnector.cpp:395
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Ukraynaca"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "Dili Değiştirin "
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr "aMule tercümeleri kurulu değildir"
+
+#: src/Preferences.cpp:771
+msgid "No languages available"
+msgstr "Diller mevcut değil"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "mevcut seçenek yok"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Geçersiz sınıf bulundu, atlanıyor"
+
+#: src/Preferences.cpp:1766
 msgid ""
-"\n"
-"Creating client...\n"
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
-"\n"
-"Yazılım oluşturuluyor...\n"
+"TCP portu numarası, UDP soketi TCP+3 olduğundan 65532' den yüksek olamaz"
+
+#: src/Preferences.cpp:1767
+#, c-format
+msgid "Default port will be used (%d)"
+msgstr "Varsayılan port kullanılacak (%d)"
 
-#: src/ExternalConnector.cpp:418
+#: src/Preferences.cpp:1790
 #, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Var olmayan paylaşılmış dizin kaldırılıyor: %s"
+
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "Bağlantı"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Dizinler"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Sunucular"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Dosyalar"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Güvenlik"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Arayüz"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Vekil sunucu"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Süzgeçler"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Uzak Denetimler"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Çevrimiçi İmza"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Gelişmiş"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Olaylar"
+
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Hata Çıktısı"
+
+#: src/PrefsUnifiedDlg.cpp:249
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
-"\n"
-"Tamam, çıkılıyor %s...\n"
+"Şu değişkenler kullanılacak:\n"
+"    %PARTFILE - dosyanın tam yolu\n"
+"    %PARTNAME - dosyanın sadece adı"
 
-#: src/ExternalConnector.cpp:424
+#: src/PrefsUnifiedDlg.cpp:289
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
 "\n"
-"Exiting...\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
 msgstr ""
-"Boş bir şifreyle bağlanılamaz.\n"
-"Ya yapılandırma dosyasında ya da komut\n"
-"satırında bir şifre olmalı veyahut da istendiğinde girmelisiniz\n"
+"Ne yaptığınızı bilmediğiniz sürece \n"
+"bu ayarları değiştirmeyiniz.\n"
+"Yoksa her şeyi karıştırabilirsiniz.\n"
 "\n"
-"Çıkılıyor...\n"
+"Bu ayarlarla oynanmasa da\n"
+"aMule gayet iyi işleyecektir."
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Bu yardım dosyasını göster."
+#: src/PrefsUnifiedDlg.cpp:350
+#, c-format
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Cfg %d Kimliği ve %s anahtarı ile parçacığa bağlanamadı"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "aMule'nin çalıştığı makine. (ön tanımlı: yerel makine)"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr "Cfg' den %d Kimliği ve %s anahtarı ile Parçacığa veri aktarılamadı"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Dışarıdan bağlantı için aMule portu. (Ön tanımlı:4712)"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Bağlanacağınız vekil sunucu türü"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Dışarıdan bağlantı şifresi."
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr "Parçacıktan %d Kimliği ve %s anahtarı ile Cfg' ye veri aktarılamadı"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Yapılandırmayı dosyadan oku."
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"Değişikliklerin uygulanması için, aMule yeniden başlatılmalı\n"
+"\n"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "stdout' a herhangi bir çıktı yazdırma."
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP portu değişti.\n"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Geveze ol - hata iletilerini de göster."
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP Portu değişti.\n"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Yazılım yerelini ayarla (dil)"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- Dışarıdan bağlantı portu değişti.\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- Dışarıdan bağlantı kabul edilme işlemi değişti.\n"
+
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- Dışarıdan bağlantı arayüzü değişti.\n"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Komut satırı seçeneklerini yapılandırma dosyasına yaz."
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"Otomatik Sunucu güncelleme listeniz boş.\n"
+"'Sunucu listesini başlangıçta otomatikman güncelle' devre dışı bırakılacak."
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
 msgstr ""
-"aMule' nin yapılandırma dosyasını temel alan yapılandırma dosyası oluşturur."
+"Dışarıdan bağlantıları aktifleştirmiş ama bir şifre belirlememişsiniz.\n"
+"Geçerli bir şifre belirlenmedikçe dışarıdan bağlantılar devre dışı "
+"kalacaktır."
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Yazılım sürümünü yazdır."
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Dil ayarları değişti.\n"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Kredi dosyası yüklendi. %u adet kullanıcı biliniyor"
-msgstr[1] "Kredi dosyası yüklendi. %u adet kullanıcı biliniyor"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Geçici Dosyalar dizini değişti.\n"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - %u adet kullanıcı için krediler bitti!"
-msgstr[1] " - %u adet kullanıcı için krediler bitti!"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- ED2K ağı etkinleştirildi.\n"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "'cryptkey.dat' dosyası bulunamadı. Oluşturuluyor..."
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Hem eD2k hem de Kad ağları devre dışı bırakılmış.\n"
+"En az birini etkinleştirmeden bağlanamaycaksınız."
 
-#: src/amuled.cpp:594
+#: src/PrefsUnifiedDlg.cpp:728
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
 msgstr ""
-"HATA: aMule uygulamacığı dış bağlantılar devre dışı bırakıldığında "
-"kullanılamaz. Dış Bağlantıları etkinleştirmek için ya aMule'yi, --ec-config "
-"seçeneği ile birlikte amuledi başlatarak ya da ~/.aMule/amule.conf "
-"dosyasındaki \"AcceptExternalConnections\" seçeneğini 1 olarak ayarlayın."
+"UDP portu devre dışı bırakılmışsa Kad başlamayacaktır.\n"
+"UDP portu açın veya Kademlia'yı devre dışı bırakın."
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "HATA: %s"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"aMule' yi ŞİMDİ yeniden başlatmalısınız.\n"
+"Şimdi yeniden başlatmazsanız, kötü şeyler olabilir.\n"
+
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Sunucuları Otomatik-Güncelleme listeniz boş.\n"
+"Lütfen geçerli bir server.met dosyasını gösteren en az bir adres yazınız.\n"
+"Bir adres girmek için bu kutucuğun yanındaki \"Liste\" düğmesine basınız."
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Yasaklama"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Gönderimleri Göster"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Sırayı Göster"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Geçici dosya(lar)"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Kullanıcıları Göster"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Gelen dosya(lar)"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Görünüm Seçiniz"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Kullanıcı Yazılımı"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Beklenen"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Gönderme Süresi"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Gönderme/İndirme"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Uzak Durumu"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "SR: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Dosya Önceliği"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Çevrimiçi İmzalar"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Skor"
+#: src/PrefsUnifiedDlg.cpp:1003
+#, c-format
+msgid "Choose a folder for %s"
+msgstr "%s için bir dizin seçiniz."
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Soruldu"
-
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Son görülme"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Girilen Sıra"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Ortam Çalıcısı için göz at"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Gönderme Durumu"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Tarayıcı Seçiniz"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Gönderilen"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "Çalıştırılabilir  %s"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Aktarım Durumu"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Sunucu listesini düzenle"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Aktarılan"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Server.met dosyasını indirmek için buraya bağlantı adresi girin.\n"
+"Her satıra sadece bir adres yazılmalıdır."
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Kullanıcı Adreslemesi"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Güncelleme gecikmesi: %d saniye"
+msgstr[1] "Güncelleme gecikmesi: %d saniye"
 
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Şifrelenmiş"
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Ortalama grafiği için süre: %d dakika"
+msgstr[1] "Ortalama grafiği için süre: %d dakika"
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Paylaşılan dosyaları gizle"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "Bağlantı Grafik Ölçüsü: %d"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Kullanıcı Ayrıntıları"
+#: src/PrefsUnifiedDlg.cpp:1139
+#, c-format
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Dosya Alım Boyutu: %d bayt"
+msgstr[1] "Dosya Alım Boyutu: %d bayt"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Etkin"
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Gönderme Sıra Boyutu: %d kullanıcı"
+msgstr[1] "Gönderme Sıra Boyutu: %d kullanıcı"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Desteklenen"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Sunucu bağlantısı yenileme sıklığı: %d dakika"
+msgstr[1] "Sunucu bağlantısı yenileme sıklığı: %d dakika"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Desteklenmeyen"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Sunucu bağlantısı yenileme döngüsü: Devre dışı"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Devre dışı"
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "devre dışı"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+msgid "Execute command on '%s' event"
+msgstr "'%s' olayında komut çalıştır."
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Eksik"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Çekirdekte komut çalıştırmayı aktifleştir."
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Kötü Çocuk"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Çekirdek komutu:"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "İncelendi - Tamam"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Arayüzde komut çalıştırmayı etkinleştir."
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Uygun değil."
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Arayüz komutu:"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (SR: %u)"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Şu girdiler değiştirilecek:"
 
-#: src/SearchDlg.cpp:527
+#: src/SearchDlg.cpp:506
 msgid "Min size must be smaller than max size. Max size ignored."
 msgstr ""
 "En küçük boyut, en büyük boyuttan küçük olmalıdır. En büyük boyut göz ardı "
 "ediliyor."
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
 msgid "Search warning"
 msgstr "Arama uyarısı."
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Sınırsız"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Ana"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule Sistem Tablası Menüsü"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad çalışmıyorsa, Kad. araması yapılamaz."
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Hız:"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "eD2k ağına bağlanılmamışsa eD2k araması yapılamaz"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "GÖN: Yok"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Kad araması sırasında beklenilmeyen hata oluştu."
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "GÖN: %u"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "Dosya Adresi"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "İND: Yok"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Dosya"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "İND: %u"
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Sınıfa göre indir"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/SearchListCtrl.cpp:639
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "Aktarım hızı: %.1f"
+msgid "Get %s for this file"
+msgstr "Bu dosya için %s iste"
 
-#: src/MuleTrayIcon.cpp:370
-#, c-format
-msgid "Upload speed: %.1f"
-msgstr "Gönderme hızı: %.1f"
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "İlgili dosyaları ara (eD2k, yerel sunucu)"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Yazılım Bilgisi"
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Bilinen dosya olarak işaretle"
 
-#: src/MuleTrayIcon.cpp:380
-#, c-format
-msgid "Nickname: %s"
-msgstr "Rumuz: %s"
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "eD2k bağlantısını panoya kopyala"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Rumuz Seçilmedi!"
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "İptal edildi"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "Yeni"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "KullanıcıID: "
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Listelenen gizlenmiş bağlantılı tüm sunuculara bağlanma başarısız. Gizlenmiş "
+"bağlantı olmadan geçiş yapılacak."
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Sunucu Adı:"
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"Listelenen sunucuların hiç birine bağlanılamadı. Başka bir geçiş yapılıyor."
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "SunucuIP:"
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "eD2k ağı ayarlarda devre dışı bırakılmış, bağlanılmıyor."
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "Sunucu listesinde bağlanılabilecek geçerli bir sunucu yok"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "TCP port: %d"
-msgstr "TCP port: %d"
-
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "TCP port: Hazır değil"
+msgid "Connected to %s (%s:%i)"
+msgstr " %s (%s:%i) sunucusuna bağlanıldı"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/ServerConnect.cpp:274
 #, c-format
-msgid "UDP port: %d"
-msgstr "UDP port: %d"
-
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "UDP port: Hazır değil"
-
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Çevrim içi İmza: Devrede"
+msgid "Connection established on: %s"
+msgstr "%s sunucusuna bağlanıldı"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Çevrim içi İmza: Devre dışı"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Önemli Hata: Bağlantı sağlanamıyor. İnternet bağlantınız kopmuş olabilir."
 
-#: src/MuleTrayIcon.cpp:463
+#: src/ServerConnect.cpp:350
 #, c-format
-msgid "Shared files: %d"
-msgstr "Paylaşılan dosyalar: %d"
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Bağlantı kaybedildi: %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/ServerConnect.cpp:360
 #, c-format
-msgid "Queued clients: %d"
-msgstr "Sıraya giren kullanıcılar: %d"
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) görünüşe göre ölü."
 
-#: src/MuleTrayIcon.cpp:476
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Total DL: %s"
-msgstr "Toplam İND: %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) görünüşe göre dolu."
 
-#: src/MuleTrayIcon.cpp:483
+#: src/ServerConnect.cpp:392
 #, c-format
-msgid "Total UL: %s"
-msgstr "Toplam GÖN: %s"
-
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Gönderim sınırı"
-
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Aktarım sınırı"
-
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "aMule'yi Gizle"
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Sunucuya otomatik bağlanma %d saniye içinde tekrar denenecek"
+msgstr[1] "Sunucuya otomatik bağlanma %d saniye içinde tekrar denenecek"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "aMule'yi Göster"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Bağlantı Koptu"
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:419
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Sohbet Oturumu Başladı: %s (%s:%u) - %s %s"
-
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** Kullanıcıya Bağlandı. ***"
-
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** Kullanıcıya Bağlanıyor.***"
-
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Kullanıcıya bağlantı başarısız. / Bağlantı koptu.***"
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "%s (%s:%i) adresine bağlantı başarısız."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Sekmeyi Kapat"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "HATA: Zaman aşımı denetlemesinde soket geçersiz"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Tüm sekmeleri kapat"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "%s (%s:%i) adresine bağlanma denemesi zaman aşımına uğradı."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Diğer sekmeleri kapat"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "DNS araştırmasında geç sonuç alındı, atlanıyor."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "Server.met dosyası yükleniyor: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Server.met dosyası bulunamadı!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
-msgstr "Server.met dosyası '%s' açılamadı. Bilinmeyen biçim."
+msgstr "Server.met dosyası '%s' açılamadı. Bilinmeyen format."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Server.met açılamadı!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Server.met dosyası bozuk, geçersiz sürüm eki bulundu: 0x%x, size %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "%i adet sunucu server.met dosyasında bulundu"
 msgstr[1] "%i adet sunucu server.met dosyasında bulundu"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "%d adet sunucu eklendi"
 msgstr[1] "%d adet sunucu eklendi"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "Hata: 'server.met' dosyası bozuk: "
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "'server.met' dosyası okumada IO hatası:"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Sunucu eklenmedi: [%s:%d] geçerli bir port içermiyor."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Sunucu eklenmedi: [%s:%d] IP'si süzüldü veya geçersiz."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr "Sunucu eklenmedi: Listede IP:Portu [%s:%d] eşleşen bir sunucu bulundu."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Sunucu eklendi: [%s:%d] adresindeki sunucu '%s' adını kullanıyor."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6828,25 +5413,25 @@
 "Silmeye çalıştığınız sunucuya bağlı durumdasınız. Lütfen, öncelikle "
 "bağlantıyı kesiniz."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "'%s' açma başarısız"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Server.met kaydetme işlemi başarısız!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Geçersiz adres"
 
-#: src/ServerList.cpp:805
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Finished to download the server list from %s"
-msgstr "%s adresinden sunucu aktarımı tamamlandı."
+msgid "Finished downloading the server list from %s"
+msgstr "%s adresinden sunucu listesi aktarımı tamamlandı."
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "%s adresinden sunucu listesi alınamadı."
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6855,22 +5440,27 @@
 "sunucu listenizi otomatik güncellemek için bu bu dosyaya sunucu listesi "
 "dosyası yapıştırın"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Sunucu listesini %s adresinden indirmeye başla."
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "UYARI: sunucuların otomatik güncellenmesi için geçersi URL girildi: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 "address.dat üzerinde, geçerli bir server.met güncelleme adresi bulunamadı."
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "%s adresinden sunucu listesi alınamadı."
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
@@ -6878,329 +5468,2302 @@
 "Yerel sunucu IP Süzgeci tarafından engellendi, başka bir sunucuya "
 "bağlanılıyor!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "%s komutunun %s olayında çalıştırılması başarısız oldu."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Sunucu Adı"
 
-#: src/amule.cpp:703
-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 Ön tanımlısı'na "
-"çevrildi.Üzgünüm. Gerçekten..."
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Adres"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Port"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Açıklama"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
 
-#: src/amule.cpp:786
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Kullanıcılar"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Statik Sunucu"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Sürüm"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Sunucu listesinde mevcut bir sunucu yok.\n"
-"aMule'nin yeni bir liste indirmesini ister misiniz?"
+"Silmeye çalıştığınız bir sunucuya bağlısınız. Lütfen önce bağlantıyı "
+"kesiniz. Sunucu SİLİNMEDİ."
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Sunucu listesi indirme"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(Bilinmeyen ad)"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "web server running on pid %d"
-msgstr "web sunucusu pid %d üzerinde çalışıyor"
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Statik sunucu %s'i silmek istediğinizden emin misiniz?"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Sunucular (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Sunucu"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "Sunucuya bağlan"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Sunucuyu statik olarak işaretle"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Sunucuyu statik olmayan olarak işaretle"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Sunucuları statik olarak işaretle"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Sunucuları statik olmayan olarak işaretle"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Sunucuyu kaldır"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Sunucuları kaldır"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Bütün sunucuları kaldır"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "eD2k bağlantısını panoya kopyala"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Sunucuya yeniden bağlan"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Hepsini silmek istediğinizden emin misiniz?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Seçili sunucuyu silmek istediğinizden emin misiniz?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Seçili sunucuları silmek istediğinizden emin misiniz?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "HATA: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "UYARI: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Yeni kullanıcı kimliğiniz %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "UYARI: Düşük ID aldınız!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tBüyük ihtimalle bir güvenlik duvarı veya router arkasındasınız."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\tDaha fazla bilgi için: http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Bilinmeyen sunucu bilgisi alındı! - çok kısa"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "%d adet yeni sunucu alındı"
+msgstr[1] "%d adet yeni sunucu alındı"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Sunucu listesinin kaydı tamamlandı."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Sunucu son komutu reddetti"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "Sunucudan bozuk paket alındı: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "Sunucudan paket alınırken beklenmeyen hata: %s"
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "%s bağlantısı için DNS çözümlemesi yapılamıyor."
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "Sunucu IP. %s (%s) süzüldü.  Bağlanılmıyor."
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "protokol gizleme kullanılarak bağlanıyor."
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "%s (%s - %s:%i) adresine %s ."
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Sunucu %s için DNS çözümlenemiyor: Bağlanmak imkansız!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Sunucu eklenmedi: Bir IP veya makine adı girilmedi."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Sunucu eklenmedi: Geçersiz sunucu portu girildi."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "eD2k Durumu:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kademlia Durumu:"
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "LAN kipinde çalışıyor"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Çalışıyor"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Durum:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Bağlantı Durumu:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "Güvenlik Duvarı - router veya güvenlik duvarınızda %d TCP portunu açın"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "UDP Bağlantı Durumu:"
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "Güvenlik Duvarı - router veya güvenlik duvarınızda %d UDP portunu açın"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Güvenlik duvarı durumu: "
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Eşe gerek yok - TCP portu açık"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Eşe gerek yok - UDP portu açık"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Eş yok"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "Eşe Bağlanıyor"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "Eşe %s üzerinde bağlandı"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Fihristlenen Kaynaklar:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Fihristlenen anahtar kelimeler: "
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Fihristlenen notlar: "
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Fihristlenen yük: "
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Kullanıcı Ortalaması:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Dosya Ortalaması:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Çalışmıyor"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "%s dosyası paylaşılanlara ekleniyor"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Bilinen %i adet paylaşılmış dosya bulundu"
+msgstr[1] "Bilinen %i adet paylaşılmış dosya bulundu"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Bilinen %i adet paylaşılmış dosya bulundu. Bilinmeyen %i adet"
+msgstr[1] "Bilinen %i adet paylaşılmış dosya bulundu. Bilinmeyen %i adet"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "HATA: %s paylaşılmak istendi"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Paylaşılan dizin bulunamadı, atlanıyor: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Dizinde paylaşılabilir dosya bulunamadı: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "Kullanıcı Adı"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "İndirme Hızı"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "Gönderme Hızı"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "Erişilebilir Parçalar"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+msgid "Upload Status"
+msgstr "Gönderme Durumu"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "İndirme Durumu"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "Köken"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "Yerel Dosya Adı"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+msgid "Shares File List"
+msgstr "Paylaşılan Dosyalar Listesi"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "İstekler"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Kabul Edilen İstekler"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Aktarılan Veri"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Paylaşım Oranı"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Alınan Parçalar"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Tam Kaynak Sayısı"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Dizin Konumu"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Yorum/Puanlama Ekle"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Yorum/Puanlama Düzenle"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Yeniden Adlandır"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Koleksiyondaki dosyaları aktarım listesine ekle"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Magnet &bağlantısını panoya kopyala"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "eD2k bağlantısını panoya kopyala (&Kaynak)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
 msgstr ""
-"Web sunucusunun başlangıçta çalışmasını istediniz. Fakat amuleweb "
-"çalıştırılamıyor. Lütfen, aMule web sunucusunu içeren paketi yükleyin veya "
-"aMule' yi --enable-webserver komutu ile derleyip make install komutunu "
-"çalıştırın"
+"eD2k bağlantısını panoya kopyala (Kaynak) (&Şifreleme seçenekleriyle "
+"birlikte)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "eD2k bağlantısını panoya kopyala (&Makine Adı)"
 
-#: src/amule.cpp:937
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr ""
+"eD2k bağlantısını panoya kopyala (Makine adı) (&Şifrelem seçenekleriyle "
+"birlikte)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "eD2k bağlantısını panoya kopyala (&AICH bilgisi)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr ""
+"Geçerli bir kaynak bağlantısı oluşturmak için YüksekID almanız gerekiyor"
+
+#: src/SharedFilesCtrl.cpp:461
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Belirtilen şu adrese portlar bağlanamıyor: %s"
+msgid "Shared Files (%i)"
+msgstr "Paylaşılan Dosyalar (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[Parça Dosyası]"
 
-#: src/amule.cpp:964
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "Dosya Adı"
+
+#: src/Statistics.cpp:732
 #, 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"
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Gönderilen Veri (Oturum (Toplam)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Toplam Ek Yük (Paket): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Dosya İstemi Ek Yükü (Paket): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Kaynak Değişimi Ek Yükü (Paket): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Sunucu Ek Yükü (Paket):%s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Kad Ek Yükü (Paketler): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Şifreleme ek yükü (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Aktif Gönderimler: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Bekleyen Gönderimler: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Toplam başarılı gönderme oturumu: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Toplam başarısız gönderme oturumu: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Ortalama gönderme süresi: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Aktarılan Veri (Oturum (Toplam)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Bulunan Kaynaklar: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Aktif İndirmeler (parçalar): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Oturum GÖN:İND Oranı (Toplam): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Ortalama aktarım oranı (Oturum): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Ortalama gönderim oranı (Oturum): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "En fazla aktarım oranı (Oturum): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "En fazla gönderim oranı (Oturum): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Yeniden Bağlanma: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "İlk Aktarımdan Beri Geçen Süre: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "%s beri Sunucuya Bağlı"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Aktif Bağlantılar (yaklaşık): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Ulaşılan En Fazla Bağlantı Sınırı: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Ortalama Bağlantılar (yaklaşık): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Doruk Bağlantılar (yaklaşık): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Kullanıcılar"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "Bilinmiyor: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "Süzülen: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "Engellenen: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Toplam: %i Bilinen: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Çalışan Sunucular: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Başarısız Sunucular: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Toplam: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Silinen Sunucular: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Süzülen Sunucular: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Çalışan Sunuculardaki Kullanıcı Sayısı: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Çalışan Sunuculardaki Dosya Sayısı: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Toplam Kullanıcılar: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Toplam Dosyalar: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Sunucu Bağlantısı: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Paylaşılmış Dosya Sayısı: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Paylaşılan Dosyaların Toplam Boyutu: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Ortalama dosya boyutu: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "İşletim Sistemi"
 
-#: src/amule.cpp:970
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Alınmadı"
+
+#: src/StatisticsDlg.cpp:189
 #, c-format
+msgid "Active connections (1:%u)"
+msgstr "Aktif Bağlantılar (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Devre dışı"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Hiç"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "`%s' komutu, pid `%d' içermekteydi ve durum kodu `%d' ile sona erdi."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr " <str> çalıştır ve çık."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Geçersiz IP biçimi. xxx.xxx.xxx.xxx:xxxx kullanınız.\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Port. %u kullanılamıyor!\n"
-"\n"
-"Bunun anlamı DÜŞÜKID alacağınızdır.\n"
-"\n"
-"Ağ ayarlarınızı kontrol ederek portun giriş ve çıkışlar için açık olup "
-"olmadığını kontrol ediniz."
+"Bu komut bir argüman gerektiriyor. Geçerli argümanlar: 'all', dosya adı veya "
+"bir sayı.\n"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Çevrim içi İmza dosyası oluşturma başarısız."
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Adresleme ile işleniyor: "
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "aMule Çevrim içi İmza dosyası oluşturma başarısız."
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Dosya adı ile işleniyor: "
 
-#: src/amule.cpp:1299
-msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
 msgstr ""
-"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)"
+"Bu komut bir argüman gerektirir. Geçerli argümanlar: bir dosya adreslemesi.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Geçerli bir sayı değil\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Geçerli bir adresleme değil (uzunluğu tam olarak 32 karakter olmalı)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "İstem bilinmeyen bir hatayla başarısız oldu."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "İşlem başarılı."
+
+#: src/TextClient.cpp:653
 #, 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."
+msgid "Request failed with the following error: %s"
+msgstr "İstek şu hata ile başarısız oldu: %s"
 
-#: src/amule.cpp:1310
-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"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Kullanıcılar için IP Süzgeci %s.\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "bir şeyleri bozmayacağını veya evinizi yakmayacağını \n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "KAPALI"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr ""
-"yahut da köpeğinizi öldürmeyeceğini garanti edemeyiz. Fakat bir *sorun* "
-"yaratmayacağını da umuyoruz.\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "AÇIK"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Sunucular için IP süzgeci %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Şu anki IP Süzgeç seviyesi %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "Bağlantı sınırları: Gön: %u kb/s, İnd: %u kB/s.\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "Bağlandı: %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Şimdi bağlanıyor"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "güvenlik duvarı"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "tamam"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
-msgstr "Aşağıdaki seçenekler güvenlik sebebiyle bu sürümde değiştirilmiştir:\n"
+"\n"
+"Download:\t%s"
+msgstr ""
+"\n"
+"İndirme:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Gelen ve giden bağlantılar için Protokol Gizleme \n"
-"etkinleştirildi.\n"
+"Gönderme:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Sunucu listesinin diğer sunucular ve kullanıcılardan güncellenmesi devre "
-"dışı bırakıldı.\n"
+"Sıradaki Kullanıcılar:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Bu değişikliklerin sebepleri hakkında bilgi için;\n"
-" http://wiki.amule.org adresindeki aMule Wiki \"sahte sunucular\" bilgisini "
-"araştırın.\n"
-"aMule'nin düzgün çalışabilmesi için sunucu listenizdeki sahte sunucuları "
-"temizlemeniz çok önemlidir."
+"Toplam Kaynak:\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Arama sonuçları sayısı:%i\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "Arama süreci: %u %% \n"
+
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "Arama süreci görüntülenemiyor"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Sunucudan bilinmeyen bir cevap alındı.: OpCode = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Kısa durum bilgisi göster."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "Bağlantı durumunu, o anki gönderim/aktarım hızını v.b. göster.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Tüm istatistik ağacını göster."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"İsteğe bağlı olarak, yazılım alt dallarının kaç girdisinin gösterilmesi "
+"gerektiğini söyleyen\n"
+"bu komuta 0-255 aralığında bir sayı, argüman olarak\n"
+"verilebilir.\n"
+"Boş bırakma veya 0 değerini verme 'sınırsız' demektir.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Örnek: 'istatistik 5 sadece her yazılım türünün en üstteki 5 sürümünü "
+"gösterecektir.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "aMule' yi kapat."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Çalışan uzak çekirdeği kapat (amule/amuled).\n"
+"Bu ayrıca sonraki aracı da kapatacaktır; çünkü çalışan bir çekirdek olmadan\n"
+"bir işe yaramayacaktır.\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "Verilen nesne yeniden yükleniyor."
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "Paylaşılmış dosya listesini yeniden yükler."
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "Dosyadan IP süzgeci tablosunu yeniden yükler."
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "IP süzme seviyesini seçiniz."
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "Dosyadan IP süzgeci tablosunu yeniden yükler."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "Bir URL verilmediyse ayarlarda belirlenen URL kullanılır."
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "Ağa bağlan."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
+"Bu, ayarlarda etkinleştirilen tüm ağlara bağlar.\n"
+"Bağlanılacak bir sunucu adresini de IP:Port biçiminde belirleyebilirsiniz.\n"
+"IP onluk IPv4 adresi biçiminde veya çözümlenebilir\n"
+"bir DNS adı olmalıdır."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "Sadece eD2k ağına bağlan."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "Sadece Kad'a bağlan"
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Ağ bağlantısını kes."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Bu, şu anda bağlı olduğunuz tüm ağlarla bağlantıyı kesecektir.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Sadece eD2k bağlantısını kes."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Sadece Kad'dan bağlantıyı kes."
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "Çekirdeğe bir eD2k veya magnet bağlantısı ekler."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"Eklenecek eD2k bağlantısı şunlar olabilir:\n"
+"*) bir dosya, (ed2k://|file|...), indirme sırasına eklenecektir.\n"
+"*) bir sunucu, (ed2k://|server|...), sunucu listesine eklenecektir.\n"
+"*) veya bir sunucu listesi, listedeki tüm sunucular, sunucu listesine\n"
+"   eklenecektir.\n"
 "\n"
-"Ayrıca, tarayıcı ayarları sistem ön tanımlısına ayarlanmıştır. Gerekirse, "
-"lütfen tarayıcı seçeneklerini yeniden yapılandırın.\n"
+"Magnet bağlantısı eD2k adreslemesi ve dosya boyutunu içermelidir.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
-msgstr "Daha fazla bilgi, destek ve yeni sürümler ana sayfamızda bulunabilir\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Bir ayar değeri girin."
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "www.aMule.org veya IRC Kanalımız: #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "IP Süzgeci ayarları girin"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Her türlü hatayı bize bildirmekten çekinmeyin http://forum.amule.org"
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "IP süzgecini hem kullanıcılar hem de sunucular için aç."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "IP süzgecini hem kullanıcılar hem de sunucular için  kapat."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "IP süzgecini kullanıcılar için Aç/Kapat."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "IP süzgecini kullanıcılar için aç."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "IP süzgecini kullanıcılar için kapat."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "IP süzgecini sunucular için Aç/Kapa"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "IP süzgecini sunucular için aç."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "IP süzgecini sunucular için kapat."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "IP süzme seviyesini seçiniz."
+
+#: src/TextClient.cpp:893
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Belirlediğiniz Çevrim içi İmza dosyaları dizini GEÇERSİZ!\n"
-" Çevrim içi İmza, ayarlarınızda düzeltene kadar DEVREDIŞI bırakıldı."
+"Geçerli süzme seviyeleri 0-255 aralığındadır.Varsayılan\n"
+"değer 127'dir.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Bağlantı sınırlarını girin."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "Bu komutlar için girdiler kilobayt/saniye cinsinden olmalıdır.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Gönderme sınırını girin."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "İndirme sınırını girin."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Bir ayar değerini al ve göster"
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "IP Süzgeci ayarlarını al"
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Hem kullanıcılar hem de sunucular için IP süzgeci durumunu al."
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "Sadece kullanıcılar için IP süzgeci durumunu al."
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "Sadece sunucular için IP süzgeci durumunu al."
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "IP süzme seviyesini seçiniz."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Bağlantı sınırlarını al."
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "Kad araması yapar."
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
+msgstr ""
+"Bir arama türü şu seçeneklerle belirlenmelidir:\n"
+"    GENEL\n"
+"    SUNUCU\n"
+"    KAD\n"
+"Örnek:'kad dosyası ara' \"dosya\" için bir kad araması gerçekleştirir.\n"
+
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "Genel arama yapar."
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "Sunucuda arama yapar."
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "Kad araması yapar."
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "Son arama sonuçlarını gösterir."
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "Önceki aramanın sonuçlarına döner.\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "Bir aramanın işleyişini göster"
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "Bir aramanın işleyişini gösterir.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Dosyayı indirmeye başla."
+
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
+"Son arama sonucunda elde edilen dosya numarası verilmelidir.\n"
+"Örnek: '12 İndir' bir önceki aramadaki 12 numaralı dosyayı indirmeye "
+"başlayacaktır.\n"
+
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Aktarımı duraklat"
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Aktarıma devam et"
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Aktarım İptal."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "İndirme önceliği ayarla"
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Bir aktarımın önceliğini Düşük, Normal, Yüksek veya OTO. ayarla.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Önceliği Düşük ayarla."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Önceliği Normal ayarla."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Önceliği Yüksek ayarla."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Önceliği Otomatik ayarla."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Sıra/liste göster."
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Gönderme/indirme sırasını,sunucu listesini veya paylaşılmış dosya listesini "
+"gösterir.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Gönderim sırasını göster."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "İndirme sırasını göster."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Günlük kayıtlarını göster."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Sunucu listesini göster."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Günlük kayıtlarını sıfırla."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "%s dosyası için diskte yer ayırma başarısız oldu: %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Geçersiz komut, yerine '%s' kullanın."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "HATA: Kayıt dosyası açılamıyor."
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Bu geçersiz bir komut, ve gelecekte belki çıkartılabilir.\n"
+"Bunun yerine '%s' kullanın.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "UYARI: Kayıt dosyası boş, bir şeyler yanlış."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMule metin aracı"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Kayıt silindi."
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr ""
+"'%s' içindeki eski AICH adresleme setleri '%s' içindeki 64 b'ye çevriliyor."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Sunucu İletisi: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "UYARI: '%s' dosya adı geçersiz ve'%s'olarak yeniden adlandırıldı."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Nod listesini indirme başarısız."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "UYARI: '%s' dosyası zaten var ve '%s'olarak yeniden adlandırıldı."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "İndirilen sürüm kontrol dosyasını açma başarısız oldu."
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Bu sınıf içindeki bütün dosyaları iptal edip silmek istediğinizden emin "
+"misiniz?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Bozuk sürüm kontrol dosyası"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Onaylama Gerekiyor"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "aMule'nin eski bir sürümünü kullanıyorsunuz!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "Sadece 99 kategori deskteklenir."
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "Çok fazla kategori!"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Tüm Diğerleri"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Görünüm Süzgeci Seç"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Sınıf Ekle"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Sınıfı Düzenle"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Sınıfı Kaldır"
 
-#: src/amule.cpp:1907
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "aMule sürümünüz %i.%i.%i ve en güncel sürüm %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr ""
+"(%s) dosyasını açma başarısız. Paylaşılan dosya listesinden çıkartılıyor."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "En güncel sürüm her zaman http://www.amule.org adresinde bulunabilir."
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Bilinmeyen dosya için adresleme seti istendi: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "UYARI: aMuled sürümünüz eski: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Şu dosya için gönderimler sürdürülüyor: %s"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "aMule sürümünüz güncel."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Şu dosya için gönderimler bekletiliyor: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Sürüm kontrol dosyasını indirme başarısız oldu."
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "%s komutunun %s olayında çalıştırılması başarısız oldu."
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "İndirme tamamlandı"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Dosyanın tam konumu."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Konum eki olmaksızın dosyanın tam adı."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "Dosyanın eD2k adreslemesi."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Dosyanın bayt cinsinden boyutu."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Toplam indirme hareketleri süresi."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Yeni sohbet oturumu başladı"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "İleti göndericisi."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Dolu"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Disk bölümü."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Tamamla sırasına hata"
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Kullanıcılar: %s | Dosyalar: %s"
+msgid "Processing file number %u: %s"
+msgstr "İşlenmekte olan dosya sayısı %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "Parça dosyalarını sormuştunuz (Sadece 9.5 MB' tan büyük dosyalar)"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Kullanıcılar: E: %s K: %s | Dosyalar: E: %s K: %s "
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Var olmayan dosya !\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Hiç bir ağ seçilmedi"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, aMule'nin eD2k bağlantı oluşturucusu"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Hoş geldiniz!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Girdi parametreleri"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Adreslenecek Dosya"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Bu dosya için isteğe bağlı adres ekleyin"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "eD2k bağlantısının hesaplanmasını istediğiniz dosyayı buraya girin"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"eD2k bağlantısına eklenecek URL' yi girin: aLinkCreator' ün geçerli dosya "
+"adını ekleyebilmesi için sonuna / ekleyin"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Çıkar"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Parça adreslemesi içeren bağlantı oluştur."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Yeni ve nadir dosyaların yayılmasına yardımcı olun;bunun bedeli ise artan "
+"bağlantı boyutu olacaktır."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4 Dosya Adreslemesi"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k Dosya Adreslemesi"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k bağlantısı"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Kaydet"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Panoya kopyala"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Aç"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "eD2k bağlantısını hesaplamak için bir dosya açın"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Hesaplanan eD2k bağlantısını panoya kopyala"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Farklı Kaydet"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Hesaplanan eDk2 bağlantısını dosyaya kaydet"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "aLinkCreator Hakkında"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "eD2k bağlantısının hesaplanacağı dosyayı seçiniz"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Pano açılamıyor"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Şimdilik kopyalanacak bir şey yok !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Seçiniz"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Açılamıyor"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Lütfen boş olmayan bir dosya adı giriniz."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Şimdilik kaydedilecek bir şey yok !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, aMule eD2k bağlantı oluşturucusu\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmapler: http://www.everaldo.com ve http://www.icomania.com\n"
+"ve http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"GPL altında dağıtılır."
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Adresleniyor."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator sizin için çalışıyor"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "MD4 Adreslemesi hesaplanıyor..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "eD2k Adreslemeleri hesaplanıyor..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "İptal Edildi !"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "Bağlandı: %s %s"
+msgid "Done in %.2f s"
+msgstr "%.2f s içinde tamamlandı."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Bu adresi zaten eklemiştiniz. !"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Lütfen boş olmayan bir adres giriniz."
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "Bağlanıyor: %s"
+msgid "Unable to open %s"
+msgstr "%s açılamıyor."
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "eD2k Bağlantısı kesildi"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i gün %i saat %i dakika %i saniye"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kademlia başladı."
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uD %02uh %02udk. %02us"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kademlia durdu."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uh %02udk. %02us"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "Kademila ağına bağlanıldı (tamam)"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02udk. %02us"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "Kademlia ağına bağlanıldı. (Güvenlik duvarı)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02us"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Kademlia bağlantısı kesildi."
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, aMule Bağlantı İstatistikleri"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "wxCas çalışmaya başladığından beri en fazla aktarım oranı"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "wxCas'ın önceki açılışlarındaki kesin En Fazla İND. oranı"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Sistem"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Otomatik Yenilemeyi Durdur."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Bağlantı İstatistikleri imajını kaydet."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Bağlantı İstatistikleri imajını yazdır."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Ayarlar"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "wxCas Hakkında"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Otomatik Yenilemeyi Başlat"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Otomatik Yenilemeyi Durdu."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Otomatik Yenileme Başladı."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "İstatistik imajını kaydet."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMule Bağlantı İstatistikleri"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
 msgstr ""
-"UDP portu ayarlarda devre dışı bırakılmışsa Kad ağı kullanılamaz. "
-"Başlatılmıyor."
+"Yazdırmada bir sorun var.\n"
+"Yazıcınız doğru ayarlanmamış olabilir mi?"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kad. ağı ayarlarda devre dışı bırakılmış, bağlanılmıyor."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Yazdırılıyor"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Arkadaş listesi  'emfriends.met'  dosyası okunamıyor!"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, aMule Çevrim içi İmza İstatistikleri\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+" Pedro de Oliveira' nın <falso@rdk.homeip.net> geliştirdiği CAS üzerine "
+"kurulmuştur.\n"
+"\n"
+"GPL altında dağıtımı yapılır."
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Arkadaş listesi  'emfriends.met'  dosyasına yazılamıyor!"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "Aman Aman, aMule çalışmıyor..."
 
-#~ msgid "Fetching status..."
-#~ msgstr "Aktarım durumu ..."
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule çalışıyor"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule çalışıyor ama bağlı değil."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule bağlanıyor..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Aman aman, aMule'nin durumu bilinmiyor..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr "çalışıyor"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " durdu !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " bağlı değil !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr "bağlanıyor..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr "garip şeyler yapıyor, denetleyiniz !"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " şuna bağlandı:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr "Kad:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "bağlı değil"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr "bağlı"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr "ile"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Toplam Aktarım: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", Gönderme: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Oturumdaki Aktarım: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Aktarım: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s, Gönderme "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr "kB"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Paylaşılan: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " dosya(lar), Sıradaki kullanıcılar:"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Süre: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " bağlı "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Sistem Yükü Ortalaması (1-5-15 dk.): "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Sistem çalışma süresi: "
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Dizin amulesig.dat dosyası içeriyor"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Buraya amulesig.dat dosyasının bulunduğu dizini giriniz"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Saniye bazında yenileme döngüsü"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Her yenileme olayında bir durum imajı oluştur"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Buraya istatistik imajının oluşturulacağı dizini giriniz."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Durum imajını düzenli olarak FTP sunucusuna gönder."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP bağlantısı"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP Yolu"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Buraya FTP Sunucunuz için adresi giriniz."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "Buraya durum imajını koyacağınız FTP Sunucusundaki bir dizini giriniz."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Kullanıcı"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "FTP sunucunuza girebilmek için bir Kullanıcı adı giriniz."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "FTP sunucunuza girebilmek için bir Şifre giriniz."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Dakika bazında FTP günceleme hızı"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Onayla"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Dizin imza dosyanızı içeriyor."
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "İstatistik imajının üretildiği dizin"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Şablonu yükler <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "web sunucusu HTTP portu"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Web sunucu portu üzerine iletmek için UPnP portunu kullanın"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP portu"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Gzip sıkıştırması kullan"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Web sunucusu için tam erişim parolası"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Web sunucusu için konuk parolası"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Konuk girişine izin ver"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Konuk girişini reddet"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Web sunucusu ayarlarını uzak aMule'ye/ aMule'den kaydet/yükle"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMule yapılandırma yolu: DOĞRUDAN KULLANMAYINIZ!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "PHP yorumcusunu devreden çıkar. (onaylanmamış)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Her istemde PHP sayfalarını yeniden oluştur"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule Web  Sunucusu"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "web aracı bağlantısı kabul edildi\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "HATA: web aracı bağlantısı kabul edilemiyor\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "İstem şu hatayla başarısız oldu: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Fihristleme dosyası bulunamadı: "
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Oturum sona erdi - giriş gerekiyor\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Oturum tamam, giriş yapıldı.\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Oturum tamam, giriş yapılmadı.\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Hiç oturum açılmadı -  giriş gerekecek\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Oturum oluşturuldu.-  giriş gerekiyor\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "İstem işleniyor [özgün]: "
 
-#~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
-#~ msgstr "theApp->serverlist->GetServerByAddress() returned NULL"
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "Bir parola belirtilmemiş. Giriş yapılamaz."
 
-#~ msgid "Message Filter"
-#~ msgstr "İleti Süzgeci"
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Şifre denetleniyor\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Şifre adreslemesi geçersiz.\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Şifre kabul edildi.\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Şifre kötü.\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Herhangi bir şifre girmediniz. Boş şifre kullanılamaz.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Çıkış istendi.\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "İstem işleniyor [yönlendirilmiş]: "
+
+#~ msgid "Romanian"
+#~ msgstr "Rumence"
+
+#~ msgid "Download status"
+#~ msgstr "İndirme Durumu"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Güncelleme gecikmesi: %d saniye"
+#~ msgstr[1] "Güncelleme gecikmesi: %d saniye"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr "Uzak arayüzde yorum ve puanlama henüz desteklenmemektedir."
+
+#~ msgid "Transferring"
+#~ msgstr "Aktarılıyor"
+
+#~ msgid "QR: ???"
+#~ msgstr "SR: ???"
+
+#~ msgid "QR: %u"
+#~ msgstr "SR: %u"
+
+#~ msgid "Only files currently uploading"
+#~ msgstr "Şu anda sadece gönderilen dosyalar"
+
+#~ msgid "Queue Rank"
+#~ msgstr "Kuyruk Sırası"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "YAPILACAK - bir aramanın gidişatını göstermek."
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "%s dosyası için MD4 ve AICH adreslemesi oluşturulmaya başlanıyor "
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "%s dosyası için MD4 adreslemesi oluşturulmaya başlanıyor."
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "%s dosyası için AICH adreslemesi oluşturulmaya başlanıyor."
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr "UYARI: Yedekleme oluşturulduktan sonra özgün '%s' çıkartılamıyor"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "UYARI: %s dosyası silinemiyor"
+
+#~ msgid "%u"
+#~ msgstr "%u"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (SR: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Puanlama (toplam):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Bütün gönderimlere tam parçaları yollamayı dene"
+
+#~ msgid "Networks window"
+#~ msgstr "Ağ Penceresi"
+
+#~ msgid "Searches window"
+#~ msgstr "Arama Penceresi"
+
+#~ msgid "Downloads window"
+#~ msgstr "İndirme penceresi"
+
+#~ msgid "Shared files window"
+#~ msgstr "Paylaşılan dosya penceresi"
+
+#~ msgid "Messages window"
+#~ msgstr "Sohbet penceresi"
 
-#~ msgid "Gui Tweaks"
-#~ msgstr "Görünüm Seçenekleri"
+#~ msgid "Statistics graph window"
+#~ msgstr "İstatistik penceresi"
 
-#~ msgid "Core Tweaks"
-#~ msgstr "Hassas Ayarlar"
+#~ msgid "Preferences settings window"
+#~ msgstr "Ayar penceresi"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "Bu dosya türü için ilişkilendirilmiş uygulama yok."
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "Sistem tablası simgesi kayboldu, yeniden oluşturulma deneniyor..."
 
-#~ msgid "File was not saved"
-#~ msgstr "Dosya kaydedilmedi."
+#~ msgid "Transfers"
+#~ msgstr "Aktarımlar"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgid "Files transfers window"
+#~ msgstr "Dosya aktarım penceresi"
+
+#~ msgid "Unban"
+#~ msgstr "Yasaklama"
+
+#~ msgid "Show Uploads"
+#~ msgstr "Gönderimleri Göster"
+
+#~ msgid "Show Queue"
+#~ msgstr "Sırayı Göster"
+
+#~ msgid "Select View"
+#~ msgstr "Görünüm Seçiniz"
+
+#~ msgid "Client Software"
+#~ msgstr "İstemci Yazılımı"
+
+#~ msgid "Waited"
+#~ msgstr "Beklenen"
+
+#~ msgid "Upload Time"
+#~ msgstr "Gönderme Süresi"
+
+#~ msgid "Upload/Download"
+#~ msgstr "Gönderme/İndirme"
+
+#~ msgid "Remote Status"
+#~ msgstr "Uzak Durumu"
+
+#~ msgid "File Priority"
+#~ msgstr "Dosya Önceliği"
+
+#~ msgid "Score"
+#~ msgstr "Skor"
+
+#~ msgid "Asked"
+#~ msgstr "Soruldu"
+
+#~ msgid "Last Seen"
+#~ msgstr "Son Görülme"
+
+#~ msgid "Entered Queue"
+#~ msgstr "Girilen Sıra"
+
+#~ msgid "Transferred Up"
+#~ msgstr "Gönderilen"
+
+#~ msgid "Transferred Down"
+#~ msgstr "İndirilen"
+
+#~ msgid "Userhash"
+#~ msgstr "Kullanıcı Adreslemesi"
+
+#~ msgid "Encrypted"
+#~ msgstr "Şifrelenmiş"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "%d adet bit işlem bayrağı yüklendi."
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Gönderim/Gön-sırasını  Gösterir."
+
+#~ msgid "Clients on queue :"
+#~ msgstr "Sıradaki Kullanıcılar:"
+
+#~ msgid "Current Session"
+#~ msgstr "Şimdiki Oturum"
+
+#~ msgid "Total"
+#~ msgstr "Toplam"
+
+#~ msgid "Requested :"
+#~ msgstr "İstenilen :"
+
+#~ msgid "Create backup for preview"
+#~ msgstr "Ön izleme için yedekleme oluştur"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "Dosya Aktarım Penceresi"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Toplam Kullanıcılar: %s | Toplam Dosyalar: %s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "HTTP aktarımı başladı"
+
+#~ msgid "Download size not received, downloading until connection is closed"
 #~ msgstr ""
-#~ "%s dosyası Donkey için fazla büyük.:İzin verilen en fazla boyu:4 GB."
+#~ "İndirme boyutu alınamadı, bağlantı kesilinceye kadar indirme sürecek."
+
+#~ msgid "Download size: %i"
+#~ msgstr "İndirme Boyutu: %i"
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "HTTP aktarımı bitti"
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Makine: %s:%i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Cevap:%i (Hata: %i)"
+
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "UYARI: Akış oluşumunda geçersiz cevap"
+
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "HATA: Yeniden yönlendirme kodu URL olmaksızın alındı"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country(): Ülke verisi yükleme başarısız "
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "IP Süzgeç seviyesini al."
+
+#~ msgid "Makes a search."
+#~ msgstr "Arama yapar."
+
+#~ msgid "Killed!"
+#~ msgstr "Öldürüldü!"
+
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "'%s'te amuleweb kullanılıyor."
+
+#~ msgid "Shutting down aMule..."
+#~ msgstr "aMule Kapatılıyor..."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr ""
+#~ "Aşağıdaki seçenekler güvenlik sebebiyle bu sürümde değiştirilmiştir:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Gelen ve giden bağlantılar için Protokol Gizleme \n"
+#~ "etkinleştirildi.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Sunucu listesinin diğer sunucular ve kullanıcılardan güncellenmesi "
+#~ "devre dışı bırakıldı.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Bu değişikliklerin sebepleri hakkında bilgi için;\n"
+#~ " http://wiki.amule.org adresindeki aMule Wiki \"sahte sunucular\" "
+#~ "bilgisini araştırın.\n"
+#~ "aMule'nin düzgün çalışabilmesi için sunucu listenizdeki sahte sunucuları "
+#~ "temizlemeniz çok önemlidir."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Ayrıca, tarayıcı ayarları sistem ön tanımlısına ayarlanmıştır. Gerekirse, "
+#~ "lütfen tarayıcı seçeneklerini yeniden yapılandırın.\n"
+
+#~ msgid "Fetching status..."
+#~ msgstr "Durum alınıyor..."

aMule-2.2.6.tar.bz2/po/uk.po -> aMule-2.3.1.tar.bz2/po/uk.po Changed

@@ -1,18 +1,17 @@
-# Ukrainian translations for aMule package
-# Переклад українською для пакету aMule.
-# Copyright (C) 2008-2009 Free Software Foundation, Inc.
-# This file is distributed under the same license as the aMule.
-#
-# Oleksandr Kovalenko <alx.kovalenko@gmail.com>, 2008-2009.
+# Ukrainian translations for aMule SVN package
+# Переклад українською для пакету aMule SVN.
+# Copyright (C) 2008-2011 Free Software Foundation, Inc.
+# This file is distributed under the same license as the aMule SVN.
 #
+# okovalenko <alx.kovalenko@gmail.com>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: aMule\n"
+"Project-Id-Version: aMule SVN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2009-08-22 13:55+0300\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
+"PO-Revision-Date: 2008-12-17 11:21+0200\n"
 "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n"
-"Language-Team: Ukrainian <uk@li.org>\n"
+"Language-Team: Ukrainian <translation@linux.org.ua>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,1306 +20,1129 @@
 "X-Poedit-Language: Ukrainian\n"
 "X-Poedit-Country: UKRAINE\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "Ви маєте вказати непорожній пароль."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "Неправильний пароль, не MD5-хеш"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "З'єднання невдале"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "EC з'єднання невдале. Порожня відповідь."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "Зовнішнє з'єднання: в доступі відмовлено з причини: "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "Зовнішнє з'єднання: в доступі відмовлено"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "Зовнішнє з'єднання: неправильна відповідь сервера. З'єднання закрито."
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "Успіх! З'єднання до aMule встановлено "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "Успіх! З'єднання встановлено."
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "Додати друга"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "Обчислюється хеш"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "Ви повинні ввести вірну IP-адресу та порт!"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "Завершується"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "Інформація"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "Завершений"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "Визначений хеш користувача невірний"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "Призупинений"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "Не вдалося відкрити файл ED2KLinks."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "Помилковий"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr ""
+"ЗАСТЕРЕЖЕННЯ: ви не можете додати себе як джерело для eD2k-посилання маючи "
+"LowID."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "Звантажується"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "Тепер, виходимо з головної програми..."
+
+#: src/amule.cpp:258
+#, fuzzy, c-format
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "Вбиваю екземпляр amuleweb з pid `%ld' ... "
+
+#: src/amule.cpp:261
+#, fuzzy, c-format
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "Вбиваю екземпляр amuleweb з pid `%ld' ... "
 
-# файл
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "Очікує"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "Невдалі"
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "Починається створення MD4 та AICH хешів для файлу: %s"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule OnExit: Завершується core."
 
-#: src/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "Починається створення MD4 хеша для файлу: %s"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "Завершення роботи aMule закінчене."
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "Починається створення AICH хеша для файлу: %s"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "Наслідки зневадження пам'яті для виходу aMule:"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "Перетворюється старий набір хешів AICH в '%s' до 64b в '%s'."
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+"\n"
+"Налаштування зовнішніх з'єднань"
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "ЗАСТЕРЕЖЕННЯ: назва файлу '%s' неправильна і буде змінена на '%s'."
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "Пароль встановлений та дозволені зовнішні з'єднання."
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr ""
-"ЗАСТЕРЕЖЕННЯ: файл '%s' вже існує, назва нового файлу буде змінена на '%s'."
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "ЗАСТЕРЕЖЕННЯ"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
 msgstr ""
-"ЗАСТЕРЕЖЕННЯ: неможливо перенести початковий '%s' після створення резервної "
-"копії"
+"Ваша локаль змінена на системну за замовчуванням із-за зміни налаштувань. "
+"Вибачте."
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "ЗАСТЕРЕЖЕННЯ: неможливо видалити %s"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "Інфо"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "Неможливо отримати спільні файли користувача '%s'"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"Ви не маєте жодного серверу в переліку серверів.\n"
+"Хочете, щоб aMule звантажив зараз новий?"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "Невідомо"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "Звантажити перелік серверів"
 
-#: src/BaseClient.cpp:1738
+#: src/amule.cpp:654
 #, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (Підробна версія eMule %#x)"
+msgid "web server running on pid %d"
+msgstr "Веб-сервер запущений з %d"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (Підробний eMule)"
+#: src/amule.cpp:658
+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 ""
+"Ви встановили запуск веб-сервера під час завантаження, але amuleweb не може "
+"бути запущено. Будь ласка, встановіть пакунок, що містить веб-сервер aMule, "
+"зберіть aMule з --enable-webserver та виконайте make install"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (підробний eMule)"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "ПОМИЛКА"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:741
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (оснований на eMule v0.%u)"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "Неможливо прив'язати порт до визначеної адреси: %s"
 
-#: src/BaseClient.cpp:1960
+#: src/amule.cpp:768
 #, c-format
-msgid "NickName: %s ID: %u"
-msgstr "Прізвисько: %s ID: %u"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "Порт %u недоступний. Ви будете мати LowID\n"
 
-#: src/BaseClient.cpp:1962
+#: src/amule.cpp:774
 #, c-format
-msgid "Requested: %s\n"
-msgstr "Запитано: %s\n"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"Порт %u недоступний!\n"
+"\n"
+"Це означає, що ви отримаєте LowID.\n"
+"\n"
+"Перевірте вашу мережу, щоб впевнитись, що порт відкритий."
 
-#: src/BaseClient.cpp:1964
-#, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Статистика файлів для цієї сесії: дозволено %d з %d запитаного, %s передано\n"
-msgstr[1] ""
-"Статистика файлів для цієї сесії: дозволено %d з %d запитаних, %s передано\n"
-msgstr[2] ""
-"Статистика файлів для цієї сесії: дозволено %d з %d запитаних, %s передано\n"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "Неможливо створити файл онлайн-підпису"
 
-#: src/BaseClient.cpp:1967
-#, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] ""
-"Статистика файлів для всіх сесій: дозволено %d з %d запитаного, %s передано\n"
-msgstr[1] ""
-"Статистика файлів для всіх сесій: дозволено %d з %d запитаних, %s передано\n"
-msgstr[2] ""
-"Статистика файлів для всіх сесій: дозволено %d з %d запитаних, %s передано\n"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "Неможливо створити файл онлайн-підпису aMule"
 
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "Запитано невідомий файл"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"Обрана локаль здається не встановлена. (примітка: спроба встановити її в "
+"будь-якому випадку)"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:1040
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "Клієнт %s на IP:Port %s:%d використовує %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "Ім'я користувача"
-
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "Друзі"
-
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "Показати &подробиці"
-
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "Додати друга"
-
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "Видалити друга"
+msgid "This is the first time you run aMule %s"
+msgstr "Ви запускаєте aMule %s вперше"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "&Надіслати повідомлення"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "Це тестова версія, оновлюється щодня, та\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "Переглянути файли"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr ""
+"ми не даємо жодної гарантії, якщо вона щось пошкодить, спалить ваш будинок,\n"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "Встановити шматок для друга"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "або вб'є собаку. Але вона *має бути* безпечною у використанні всюди.\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "Ви дійсно бажаєте видалити вибраного друга?"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr ""
+"Більше подробиць, підтримка та нові випуски можуть бути знайдені на нашій "
+"сторінці,\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "Ви дійсно бажаєте видалити вибраних друзів?"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr ""
+"на www.aMule.org, або у нашому IRC-каналі #aMule на irc.freenode.net.\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "Скасувати"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "Не соромтеся повідомити про будь-які помилки на http://forum.amule.org"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"Встановлення більш ніж одного шматка для друга не дозволено.\n"
-"Був виділений тільки один шматок."
-
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "Числений вибір"
-
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "Звантаження завершено"
+"Тека для файлів онлайн-підпису НЕВІРНА!\n"
+"Онлайн-підпис буде ВИМКНЕНО поки ви не виправите це в налаштуваннях."
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "Повний шлях до файлу."
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "Назва сервера повідомлена"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "Назва файлу без шляху."
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "Не вдалося виділити місце на диску для файлу '%s': %s"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "eD2k-хеш файлу."
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "ПОМИЛКА: не можу відкрити файл часопису"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "Розмір файлу в байтах."
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "ЗАСТЕРЕЖЕННЯ: журнал порожній. Щось негаразд."
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "Загальний час звантаження."
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "Часопис очищено"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "Розпочато нову розмову"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "Повідомлення сервера: %s"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "Відправник повідомлення."
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr ""
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "Немає місця"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "Не вдалося звантажити перелік вузлів."
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "Розділ диску."
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "Не вдалося відкрити звантажений файл перевірки версії"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "Помилка під час завершення"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "Файл перевірки версії зіпсований"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "Назва файлу"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "Ви використовуєте застарілу версію aMule!"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "Розмір"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "Ваша версія aMule %i.%i.%i, а остання %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "Тип"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "Остання версія може бути завжди знайдена на http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "Перевага"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "ЗАСТЕРЕЖЕННЯ: Ваша версія aMuled застаріла: %i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "ID файлу"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "Ваша копія aMule оновлена."
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "Запити"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "Неможливо звантажити файл перевірки версії"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "Прийняті запити"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "Користувачі: %s | Файли: %s"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "Передані дані"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "Користувачі: %s K: %s | Файли: E: %s K: %s"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "Відношення поширення"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "Не вибрано жодної мережі"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "Отримані частини"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "з LowID"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "Повні джерела"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "з HighID"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "Шлях до теки"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "З'єднано з %s %s"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "Спільні файли"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "З'єднується з %s"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "Дуже низька"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "Від'єднано від eD2k"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "Низька"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad запущена."
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "Звичайна"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad зупинена."
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "Висока"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "З'єднано з Kad (все гаразд)"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "Дуже висока"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "З'єднано з Kad (за фаєрволом)"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "Випуск"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "Від'єднано від Kad"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "Автоматично"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr ""
+"Мережа Kad не може бути використана якщо UDP-порт вимкнено в налаштуваннях, "
+"не починаю."
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "Додати коментар/рейтинг"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Мережа Kad вимкнена в налаштуваннях, не з'єднуюсь."
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "Редагувати коментар/рейтинг"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"ПОМИЛКА: демон aMule не може бути використаний з вимкненими зовнішніми "
+"з'єднаннями. Щоб ввімкнути зовнішні з'єднання, використовуйте або звичайний "
+"режим з опцією --ec-config або встановіть \"AcceptExternalConnections\" в 1 "
+"в файлі ~/.aMule/amule.conf"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "Змінити назву"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"ПОМИЛКА: необхідний вірний пароль, щоб використовувати зовнішні з'єднання, і "
+"демон aMule не може бути використаний без зовнішніх з'єднань. Щоб запустити "
+"демон aMule, ви маєте встановити відповідне значення у полі \"ECPassword\" у "
+"файлі ~/.aMule/amule.conf. Виконайте amuled  з параметром --ec-config, щоб "
+"встановити пароль. Більше інформації можете знайти на http://wiki.amule.org"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "Додати файли зі збірки до переліку передавання"
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled: OnInit - запускається timer"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "Скопіювати &magnet-посилання до буферу обміну"
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled: переходимо у фоновий режим - до зустрічі"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "Скопіювати &eD2k-посилання до буферу обміну"
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr ""
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "Скопіювати eD2k-посилання до буферу обміну (&джерело)"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "ПОМИЛКА: %s"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "Скопіювати eD2k-посилання до буферу обміну (джерело з &шифруванням)"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "Це aMule %s оснований на eMule."
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "Скопіювати eD2k-посилання до буферу обміну (назва &хосту)"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "Запущений на %s"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
 msgstr ""
-"Скопіювати eD2k-посилання до буферу обміну (назва хосту &з шифруванням)"
+"Відвідайте http://www.amule.org, щоб перевірити наявність нових версій."
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "Скопіювати eD2k-посилання до буферу обміну (інформація &AICH)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "ЖАХЛИВА ПОМИЛКА: не вдалося створити Timer"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "Скопіювати інформацію відгуку до буферу обміну"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "Віддалене керування aMule"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "Знімок:"
+
+#: src/amuleDlg.cpp:501
 msgid ""
-"Feedback from: %s (%s)\n"
+"'All-Platform' p2p client based on eMule \n"
 "\n"
 msgstr ""
-"Відгук від: %s (%s)\n"
+"'Багатоплатформений' p2p-клієнт, що оснований на eMule \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "Вам потрібно мати HighID щоб створити правильне посилання на джерело"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "Сторінка в Інтернет: http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "ЗАСТЕРЕЖЕННЯ"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "Форум: http://forum.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "Спільні файли (%i)"
-
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[частковий файл]"
-
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "Введіть нову назву для цього файлу:"
-
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "Змінити назву файлу"
-
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "Відновлюється вивантаження файлу: %s"
-
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "Призупиняється вивантаження файлу: %s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "Текстовий клієнт aMule"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kademlia: пошукове слово занадто коротке"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "Контакт: admin@amule.org (адміністративні питання) \n"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "Прочитано %u контакт Kad"
-msgstr[1] "Прочитано %u контакти Kad"
-msgstr[2] "Прочитано %u контактів Kad"
-
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "Тільки %d контакт Kad доступний, nodes.dat не записано"
-msgstr[1] "Тільки %d контакти Kad доступні, nodes.dat не записано"
-msgstr[2] "Тільки %d контактів Kad доступні, nodes.dat не записано"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "Записано %d контакт Kad"
-msgstr[1] "Записано %d контакти Kad"
-msgstr[2] "Записано %d контактів Kad"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "Частина aMule основана на \n"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "ПОМИЛКА: неможливо відкрити порт TCP"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "з'єднання клієнта тенет прийнято\n"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "Повідомлення"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "ПОМИЛКА: неможливо прийняти з'єднання клієнта тенет\n"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "Діалог aMule знищений"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "Запит невдалий з помилкою: %s."
-
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "Запит невдалий з невідомою помилкою."
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "З'єднується"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "Файл індексу не знайдено:"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k: з'єднання"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "Сесія добігла кінця - запитуємо новий вхід\n"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k: від'єднаний"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "Сесія в порядку, входимо\n"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad: за фаєрволом"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "Сесія в порядку, не увійшли\n"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad: з'єднаний"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "Немає відкритих сесій - буде запитано вхід\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad: з'єднуюсь"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "Сесію створено - запит на вхід\n"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad: вимкнена"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "Оброблюється запит [початковий]: "
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "Скасувати"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "Перевіряється пароль\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "Зупинити поточні спроби з'єднань"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "Неправильний хеш пароля\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "Від'єднатися"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "Пароль правильний\n"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "Від'єднатися від з'єднаних мереж"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "Пароль неправильний\n"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "З'єднатися"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "Ви не ввели жодного паролю. Порожній пароль не дозволено.\n"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "З'єднатися з дозволеними мережами"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "Запитано вихід\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "Вивантаження: %.1f(%.1f) | Звантаження: %.1f(%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "Оброблюється запит [перенаправлений]:"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "Вивантаження: %.1f | Звантаження: %.1f"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "Завантажується зразок <str>"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | З'єднано)"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Порт HTTP сервера тенет"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | Від'єднано)"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "Використовувати перенаправлення портів UPnP на порт сервера тенет"
+#: src/amuleDlg.cpp:913
+#, fuzzy, c-format
+msgid "Do you really want to exit %s?"
+msgstr "Ви справді хочете вийти з aMule?"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "Порт UPnP"
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "Підтвердження виходу"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "Використовувати стиснення gzip"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "Команда для запуску: "
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- за замовчуванням -"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Пароль повного доступу для сервера тенет"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "Тека з шкірами '%s' не існує"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Пароль гостя сервера тенет"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "ЗАСТЕРЕЖЕННЯ: Неможливо відкрити файл шкіри '%s' для читання"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "Дозволити гостьовий доступ"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "Мережі"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "Заборонити гостьовий доступ"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "Вікно мереж"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "Завантажити/записати налаштування сервера тенет з/до віддаленого aMule"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "Пошук"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "Шлях до файлу налаштувань aMule. НЕ ВИКОРИСТОВУЙТЕ БЕЗПОСЕРЕДНЬО!"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "Вікно пошуку"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "Вимкнути інтерпретатор PHP (застаріло)"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "Звантаження"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "Перекомпільовувати сторінки PHP під час кожного запиту"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+#, fuzzy
+msgid "Downloads Window"
+msgstr "Звантажується"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "Сервер тенет aMule"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "Спільні файли"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "Не доступно"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "Вікно спільних файлів"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "Ніколи"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "Повідомлення"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "Звантажування..."
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "Вікно повідомлень"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "Статистика"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "Очікувалось на %d байт, але звантажено %d байт"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "Вікно статистики"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
 msgid "Preferences"
 msgstr "Налаштування"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "Тека, що містить файл amulesig.dat"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "Переглянути"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "Введіть назву теки, де знаходиться файл amulesig.dat"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "Час оновлення в секундах"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "Створювати зображення статистики під час кожного оновлення"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "Вікно налаштувань"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "Введіть назву теки, де б ви хотіли зберігати зображення статистики"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "Зовн. внесення"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "Вивантажувати час від часу ваші зображення статистики на сервер FTP"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "Засіб зовнішнього внесення частково звантажених файлів"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "Адреса URL FTP"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "Про програму"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "Шлях FTP"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "Про/Допомога"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "Введіть адресу вашого сервера FTP"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "Мережа eD2k"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr ""
-"Введіть теку, куди будуть складатися зображення зі статистикою на сервері FTP"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Мережа Kad"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "Користувач"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "Немає мережі"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "Пароль"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "Віддалене керування aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "Введіть ім'я користувача для входу на ваш сервер FTP"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "Введіть пароль входу на ваш сервер FTP"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "Жахлива помилка: не вдалося створити Core Timer"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "Час оновлення FTP в хвилинах"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "З'єднатися з віддаленим aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "Перевірити"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "Жахлива помилка: не вдалося створити Poll Timer"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "Переходимо до циклу обробки подій..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "З'єднання..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "Тека, що містить файл з вашим підписом"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "З'єднання невдале "
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "Тека, де створюються зображення статистики"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "Віддалений обробник подій зовнішніх з'єднань графічного інтерфейсу"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "Вимикається"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i діб %i год %i хв %i с"
-
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, aMule онлайн статистика"
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "З'єдання невдале. Неможливо з'єднатися з %s:%d\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "Ласкаво просимо!"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "Готовий"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "Найбільша швидкість звантаження з часу запуску wxCas"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "Всі"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
 msgstr ""
-"Безумовна найбільша швидкість звантаження під час попереднього запуску wxCas"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "Очистити"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "Невідомо"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "Система"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "Неможливо отримати спільні файли користувача %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "Зупинити автоматичне оновлення"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "Шукається друг для lowid-з'єднання"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "Зберегти зображення онлайн статистики"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (Підробна версія eMule %#x)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "Надрукувати зображення онлайн статистики"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (Підробний eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "Налаштування"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (підробний eMule)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "Про wxCas"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (оснований на eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "Розпочати автоматичне оновлення"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "Прізвисько: %s ID: %u"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "Автоматичне оновлення зупинено"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "Запросив: %s\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "Автоматичне оновлення розпочато"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Статистика файлів для цієї сесії: дозволено %d з %d запитаний, %s передано\n"
+msgstr[1] ""
+"Статистика файлів для цієї сесії: дозволено %d з %d запитаних, %s передано\n"
+msgstr[2] ""
+"Статистика файлів для цієї сесії: дозволено %d з %d запитаних, %s передано\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "Зберегти зображення статистики"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] ""
+"Статистика файлів для всіх сесій: дозволено %d з %d запитаного, %s передано\n"
+msgstr[1] ""
+"Статистика файлів для всіх сесій: дозволено %d з %d запитаних, %s передано\n"
+msgstr[2] ""
+"Статистика файлів для всіх сесій: дозволено %d з %d запитаних, %s передано\n"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "Онлайн статистика aMule"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "Запитаний невідомий файл"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
-msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
-"Негаразди друку.\n"
-"Можливо ваша поточна друкарка не налаштована вірно?"
+#: src/BaseClient.cpp:2700
+#, c-format
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "Повідомлення відфільтроване від '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "Друк"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "Нове повідомлення від '%s' (IP:%s)"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:414
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
 msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
 msgstr ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"Користувач %s (%u) запитав ваш перелік спільних файлів для теки %s -> "
+"відмовлено"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "aMule не запущений..."
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, fuzzy, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "ЗАСТЕРЕЖЕННЯ: не можна відкрити known.met."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule запущений"
+#: src/CanceledFileList.cpp:61
+#, fuzzy
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr ""
+"ЗАСТЕРЕЖЕННЯ: Перелік відомих файлів зіпсовано, містить неприпустимий "
+"заголовок."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule запущений, але від'єднаний"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, fuzzy, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "Помилка введення-виведення під час читання файлу known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule з'єднується..."
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, fuzzy, c-format
+msgid "Error while saving %s file: %s"
+msgstr "Помилка під час збереження файлу known.met: %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "Стан aMule невідомий..."
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "Категорія"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " працює "
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "Нова категорія"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " зупинений!"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "Виберіть теку для вхідних файлів"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr " не з'єднаний!"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "Ви повинні визначити назву категорії"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " з'єднується..."
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "Ви повинні визначити шлях категорії!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " робить щось дивне, перевірте!"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr ""
+"Неможливо створити вхідну теку для категорії. Будь ласка, вкажіть вірний "
+"шлях!"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " з'єднався з "
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "Розмову розпочато: %s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad: "
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** З'єднано з клієнтом ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "гаразд"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** З'єднуюсь з клієнтом ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "за фаєрволом"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** Неможливо з'єднатись з клієнтом / з'єднання втрачене***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "вимкнено"
+#: src/ChatSelector.cpp:335
+msgid ""
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " увімкнено "
+#: src/ChatSelector.cpp:336
+msgid ""
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " з "
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr ""
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "Всього звантажень: "
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "Закрити вкладки"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr ", вивантажень: "
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "Закрити всі вкладки"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "Сесія звантаження: "
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "Закрити інші вкладки"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "Звантаження: "
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "Додати до друзів"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " кБ/с, вивантаження: "
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "Завантажено файл довіри, %u відомий клієнт"
+msgstr[1] "Завантажено файл довіри, %u відомі клієнти"
+msgstr[2] "Завантажено файл довіри, %u відомих клієнтів"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " кБ/с"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - Довіра сплила для %u клієнта"
+msgstr[1] " - Довіра сплила для %u клієнтів"
+msgstr[2] " - Довіра сплила для %u клієнтів"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "Спільні файли: "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "Не знайдено 'cryptkey.dat', створюємо."
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " файл(ів), клієнтів у черзі: "
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "Подробиці клієнта"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "Час: "
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LowID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
-#, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f кБ/с"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " увімкнено "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "Дозволено"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "Середня завантаженість системи (1-5-15 хв): "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "Підтримується"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "Час роботи системи: "
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "Не підтримується"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02uдіб %02uгод %02uхв %02uс"
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "Вимкнено"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
-#, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02uгод %02uхв %02uс"
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "З'єднано"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
-#, c-format
-msgid "%02umin %02us"
-msgstr "%02uхв %02uс"
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "Від'єднана"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%02us"
-msgstr "%02uс"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
+msgid "%.1f kB/s"
+msgstr "%.1f кбайт/с"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LowID"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "Незавершено"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "Не з'єднано"
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "Поганий хлопець"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f Б"
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "Перевірено - добре"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
-#, c-format
-msgid "%.2f KB"
-msgstr "%.0f кБ"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "Недоступно"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f MB"
-msgstr "%.0f МБ"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "Користувач %s (%u) запитав ваш перелік спільних файлів -> Дозволено"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%.2f GB"
-msgstr "%.0f ГБ"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "Користувач %s (%u) запитав ваш перелік спільних файлів -> Відмовлено"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%.2f TB"
-msgstr "%.0f ТБ"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "Скасовано!"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "Користувач %s (%u) запитав ваш перелік спільних тек -> Дозволено"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "Unable to open %s"
-msgstr "Неможливо відкрити %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "Вхідні параметри"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "Файл для обчислення хешу"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "Додати додаткові адреси URL для цього файлу"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "Введіть файл, посилання eD2k якого хочете обчислити"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "Користувач %s (%u) запитав ваш перелік спільних тек -> Відмовлено"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
 msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
 msgstr ""
-"Введіть адресу, яку хочете додати до посилання eD2k: Додайте / в кінець, щоб "
-"дати змогу aLinkCreator долучити поточну назву файлу"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "Додати"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "Вилучити"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "Очистити"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "Створити посилання з частковими хешами"
+"Користувач %s (%u) запитав ваш перелік спільних файлів для теки %s -> "
+"Дозволено"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
 msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
 msgstr ""
-"Допоможіть поширювати нові та рідкісні файли швидше за рахунок збільшення "
-"розміру посилання"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4-хеш файлу"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k-хеш файлу"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "Посилання eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "Почати"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "Зберегти"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "Скопіювати до буферу обміну"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "Вийти"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "Відкрити"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "Відкрити файл, щоб обчислити його посилання eD2k"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "Копіювати"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "Копіювати посилання eD2k до буферу обміну"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "Зберегти як"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "Зберегти розраховане посилання eD2k до файлу"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "Про програму"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "Про aLinkCreator"
+"Користувач %s (%u) запитав ваш перелік спільних файлів для теки %s -> "
+"відмовлено"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "Виберіть файл посилання eD2k якого потрібно обчислити"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "Користувач %s (%u) зробив спільною теку %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "Неможливо відкрити буфер обміну"
+#: src/ClientTCPSocket.cpp:967
+#, c-format
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "Користувач %s (%u) надіслав незапитані спільні теки."
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "Зараз немає що копіювати!"
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "Користувач %s (%u) надіслав перелік спільних файлів для теки %s"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "Виберіть файл для обчисленого посилання eD2k"
+#: src/ClientTCPSocket.cpp:989
+#, c-format
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "Користувач %s (%u) завершив надсилати перелік спільних файлів"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "Неможливо відкрити "
+#: src/ClientTCPSocket.cpp:994
+#, c-format
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "Користувач %s (%u) надіслав небажаний перелік спільних файлів"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "Будь ласка, введіть непорожню назву файлу"
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr "Користувач %s (%u) заборонив доступ до переліку спільних тек/файлів"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "Зараз немає що зберігати!"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "Коментарі файлу"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "Ім'я користувача"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "Обчислення хешу..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "Назва файлу"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator працює для вас"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "Рейтинг"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "Обчислюється хеш MD4..."
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "Коментар"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "Обчислюються eD2k хеші..."
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "Немає коментарів"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Done in %.2f s"
-msgstr "Виконано за %.2f с"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "Ви вже додали цю адресу URL!"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "Будь ласка, введіть непорожню адресц URL"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u коментар"
+msgstr[1] "%u коментарі"
+msgstr[2] "%u коментарів"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "Кількість оброблених файлів %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
 msgstr ""
-"Ви запитали частковий хеш (використовується тільки для файлів, розмір яких "
-"більше ніж 9.5 МБ"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:83
-#, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> Файл не існує!\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, створювач посилань eD2k aMule"
 
 # перевага
 #: src/DataToText.cpp:37
@@ -1337,31 +1159,57 @@
 msgid "Auto [Hi]"
 msgstr "Авто [висока]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "З'єднується"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "Дуже низька"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "Низька"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "Звичайна"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "Висока"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "Дуже висока"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "Випуск"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "Запитується"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "З'єднується через сервер"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "Черга заповнена"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "В черзі"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "Передавання"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "Звантажується"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1373,7 +1221,7 @@
 
 #: src/DataToText.cpp:68
 msgid "Cannot connect LowID to LowID"
-msgstr "Неможливо з'єднати LowID з LowID"
+msgstr "Не можу з'єднати LowID з LowID"
 
 #: src/DataToText.cpp:69
 msgid "Too many connections"
@@ -1388,8 +1236,7 @@
 msgstr "Забагато з'єднань Kad"
 
 # користувач
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "заборонений"
 
@@ -1421,8 +1268,8 @@
 msgid "Remote Server"
 msgstr "Віддалений сервер"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1446,10 +1293,10 @@
 msgid "Search Result"
 msgstr "Здобутки пошуку"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
-msgstr "Завершені"
+msgstr "Завершених"
 
 #: src/DataToText.cpp:146
 msgid "In progress"
@@ -1471,7 +1318,7 @@
 msgid "ERROR: Failed!"
 msgstr "ПОМИЛКА: невдача!"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "В черзі"
 
@@ -1483,879 +1330,307 @@
 msgid "Unknown or bad tempfile format."
 msgstr "Невідомий або неправильний формат тимчасового файлу"
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "Мова системи"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "Албанська"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "Арабська"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "Астурійська"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "Частина"
 
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "Баскська"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "Болгарська"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "Каталонська"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "Китайська (спрощена)"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "Китайська (традиційна)"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "Хорватська"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "Чеська"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "Данська"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "Нідерландська"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "Англійська (Великобританія)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "Естонська"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "Фінська"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "Французька"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "Галісійська"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "Німецька"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "Грецька"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "Іврит"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "Угорська"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "Італійська"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "Італійська (Швейцарія)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "Японська"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "Корейська"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "Литовська"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "Норвезька (Нюнорск)"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "Розмір"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "Польська"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "Переданих"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "Португальська"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "Швидкість"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "Португальська (Бразилія)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "Перебіг"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "Російська"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "Джерела"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "Словенська"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "Перевага"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "Іспанська"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "Стан"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "Шведська"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "Залишилось"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "Турецька"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "Востаннє повний"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "Українська"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "Останнє отримання"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "Неможливо визначити обраний переглядач!"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "Ви впевнені, що хочете видалити вибраний файл?"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr ""
-"Порт TCP не може бути більшим ніж 65532, оскільки UDP-порт сервера є TCP+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "Ви впевнені, що хочете видалити вибрані файли?"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "Буде використовуватися порт за замовчуванням (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "Назва сервера"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "Адреса"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "Порт"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "Опис"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Час луни"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "Користувачі"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "Файли"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "Невдало"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "Постійні"
-
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "Версія"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
+"Feedback from: %s (%s)\n"
+"\n"
 msgstr ""
-"Ви з'єднані з сервером, який намагаєтесь видалити. Будь ласка, роз'єднайтеся "
-"спочатку. Сервер НЕ був видалений."
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "Інфо"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(невідома назва)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "Ви впевнені, що хочете видалити постійний сервер %s"
+"Відгук від: %s (%s)\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "Так"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "Автоматично"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "Ні"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "Зупинити"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "Не вдалося відкрити '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "Призупинити"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "Сервери (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "Продовжити"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "Сервер"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "Видалити завершені"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "З'єднатися з сервером"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "Віддати всі A4AF-джерела цьому файлу зараз"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "Позначити сервер як постійний"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "Віддати всі A4AF-джерела цьому файлу (авто)"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "Позначити сервер як непостійний"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "Віддати всі A4AF-джерела іншим файлам зараз"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "Позначити сервери як постійні"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "Розширені налаштування"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "Позначити сервери як непостійні"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "Попередній перегляд"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "Видалити сервер"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "Показати подробиці файлу"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "Видалити сервери"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "Показати всі коментарі"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "Видалити всі сервери"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "Скопіювати magnet-посилання в буфер обміну"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "Скопіювати посилання eD2k до буферу обміну"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "Скопіювати eD2k-посилання до буферу обміну"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "Скопіювати посилання eD2k до буферу обміну"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "Скопіювати інформацію відгуку до буферу обміну"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "Перез'єднатись з сервером"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "прибрати"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "Ви впевнені, що хочете видалити всі сервери?"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "Призначити категорію"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "Ви впевнені, що хочете видалити вибраний сервер?"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "Відкрити файл"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "Ви впевнені, що хочете видалити вибрані сервери?"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "Введіть нову назву для цього файлу:"
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "Вимкнено [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "Змінити назву файлу"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "Це aMule %s, що оснований на eMule."
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y.%m.%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "Запущений на %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr ""
-"Відвідайте http://www.amule.org, щоб перевірити наявність нових версій."
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "ЖАХЛИВА ПОМИЛКА: не вдалося створити Timer"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "Віддалене керування aMule"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "Знімок:"
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" 'Багатоплатформений' p2p-клієнт, що оснований на eMule \n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " Сторінка в Інтернет: http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " Форум: http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " Контакт: admin@amule.org (адміністративні питання) \n"
+msgid "Downloads (%i)"
+msgstr "Звантаження (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " Частина aMule основана на \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "Повідомлення"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k: з'єднання"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k: від'єднаний"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad: за фаєрволом"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad: з'єднаний"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad: з'єднуюсь"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad: вимкнена"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "Зупинити поточні спроби з'єднань"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "Від'єднатися"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "Від'єднатися від з'єднаних мереж"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "З'єднатися"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "З'єднатися з дозволеними мережами"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "Вивантаження: %.1f(%.1f) | Звантаження: %.1f(%.1f)"
+"Щоб попередити показ цього застереження під час кожного попереднього "
+"перегляду,\n"
+"оберіть відеопрогравач в налаштуваннях (за замовчуванням mplayer)."
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "Вивантаження: %.1f | Звантаження: %.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "Попередній перегляд файлу"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | З'єднано)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "ПОМИЛКА: не вдалося виконати зовнішній медіа-програвач! Команда: '%s'"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | Від'єднано)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "Ви справді хочете вийти з aMule?"
+msgid "Saving PartFile %u of %u"
+msgstr "Зберігається частковий файл %u з %u"
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "Підтвердження виходу"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "Всі часткові файли збережені."
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "Тека з шкірами '%s' не існує"
+msgid "Loading temp files from %s."
+msgstr "Завантаження тимчасових файлів з %s."
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "ЗАСТЕРЕЖЕННЯ: Неможливо відкрити файл шкіри '%s' для читання"
+msgid "Loading PartFile %u of %u"
+msgstr "Завантажуються частковий файл %u з %u"
 
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "Мережі"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "Вікно мереж"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "Пошук"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "Вікно пошуку"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "Передачі"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "Вікно передачі файлів"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "Спільні файли"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "Вікно спільних файлів"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "Повідомлення"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "Вікно повідомлень"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "Статистика"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "Вікно статистики"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "Вікно налаштувань"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "Зовн. внесення"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "Засіб зовнішнього внесення частково звантажених файлів"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "Про/Допомога"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "Мережа eD2k"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Мережа Kad"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "Немає мережі"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "Загальні"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "З'єднання"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "Теки"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "Сервери"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "Безпека"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "Зовнішній вигляд"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "Проксі"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "Фільтри"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "Віддалене керування"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "Онлайн-підпис"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "Розширені"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "Події"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "Налагоджувач"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "Визначений користувачем"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"aMule має бути перезапущений, щоб зміни подіяли:\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP-порт змінено.\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP-порт змінено.\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"Перелік автоматичного оновлення серверів порожній.\n"
-"'Автоматичне оновлення серверів під час звантаження буде вимкнене."
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"Ви увімкнули зовнішні з'єднання, але не визначили пароль.\n"
-"Зовнішні з'єднання не можуть бути ввімкнені поки не вказано вірний пароль."
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- Мова змінена.\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- Тимчасова тека змінена.\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- ED2K мережа увімкнена.\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "Вивантаження: 0.0 | Звантаження: 0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"Обидві eD2k та Kad-мережі вимкнені.\n"
-"Ви не зможете з'єднатися поки не увімкнете хоча б одну з них"
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"Kad не розпочне роботу, якщо UDP-порт вимкнено.\n"
-"Увімкніть UDP-порт або вимкніть Kad"
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"Ви ЗОБОВ'ЯЗАНІ перезапустити aMule зараз.\n"
-"Якщо ж не перезапустите, не скаржтеся, коли станеться щось жахливе.\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"Ваш перелік серверів автоматичного оновлення порожній.\n"
-"Будь ласка заповніть принаймні одну адресу, що посилається на існуючий файл "
-"server.met.\n"
-"Натисніть на кнопку \"Перелік\" щоб ввести адресу."
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "Тимчасові файли"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "Вхідні файли"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "Онлайн-підписи"
+"ПОМИЛКА: не вдалося завантажити файл резервної копії. Шукайте на http://"
+"forum.amule.org вирішення проблем відновлення .part.met"
 
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "Виберіть теку для %s"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "Всі часткові файли завантажені."
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "Переглянути, щоб знайти відеопрогравач"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "Вибрати переглядач тенет"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "Не знайдено жодного часткового файлу"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "Виконуваний %s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "Редагувати перелік серверів"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "Знайдений %u частковий файл"
+msgstr[1] "Знайдені %u часткові файли"
+msgstr[2] "Знайдені %u часткових файлів"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
 msgstr ""
-"Додайте тут адреси файлів server.met.\n"
-"Тільки одна адреса на рядок."
+"Файлова система для теки тимчасових файлів не може обробити великі файли."
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "Затримка оновлення: %d секунда"
-msgstr[1] "Затримка оновлення: %d секунди"
-msgstr[2] "Затримка оновлення: %d секунд"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr "Файлова система для теки вхідних файлів не може обробити великі файли."
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "Час усереднення графіків: %d хвилина"
-msgstr[1] "Час усереднення графіків: %d хвилини"
-msgstr[2] "Час усереднення графіків: %d хвилин"
+msgid "Downloading %s"
+msgstr "Звантажую %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "Зміна розміру графіка з'єднань: %d"
+msgid "You are already trying to download the file '%s'"
+msgstr "Ви вже спробували звантажити файл '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "Затримка оновлення: %d секунда"
-msgstr[1] "Затримка оновлення: %d секунди"
-msgstr[2] "Затримка оновлення: %d секунд"
+msgid "You already have the file '%s'"
+msgstr "Ви вже маєте файл '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "Розмір файлу буфера: %d байт"
-msgstr[1] "Розмір файлу буфера: %d байти"
-msgstr[2] "Розмір файлу буфера: %d байт"
+msgid "You are already trying to download the file %s"
+msgstr "Ви вже спробували звантажити файл %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "Розмір черги вивантаження: %d клієнт"
-msgstr[1] "Розмір черги вивантаження: %d клієнти"
-msgstr[2] "Розмір черги вивантаження: %d клієнтів"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "Неможливо перетворити magnet-посилання в eD2k-посилання: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "Інтервал оновлення з'єднання з сервером: %d хвилина"
-msgstr[1] "Інтервал оновлення з'єднання з сервером: %d хвилини"
-msgstr[2] "Інтервал оновлення з'єднання з сервером: %d хвилин"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "Інтервал оновлення з'єднання з сервером: вимкнено"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "Порт UDP для запитів сервера (TCP+3): "
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "вимкнено"
+msgid "Unknown protocol of link: %s"
+msgstr "Невідомий протокол посилання: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "Виконати команду на подію '%s'"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "Ввімкнути виконання команди в ядрі"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "Команда ядра:"
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "Ввімкнути виконання команд в ГІК"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "Команда ГІК:"
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "Наступні змінні будуть замінені:"
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "Невірне eD2k-посилання! ПОМИЛКА: %s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "Спроба доступу без уповноваження. З'єднання розірвано."
+#: src/ExternalConn.cpp:260
+#, fuzzy
+msgid "Client sent packet after authentication failed."
+msgstr "Аутентифікація не вдалася."
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "Зовнішнє з'єднання розірвано."
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "Зовнішні з'єднання вимкнені, оскільки відсутній пароль!"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "Зовнішні з'єднання вимкнені у файлі налаштувань."
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "Дозволено нове зовнішнє з'єднання"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "ПОМИЛКА: неможливо дозволити нове зовнішнє з'єднання"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr ""
 "Відмовлено у зовнішньому з'єднанні, оскільки в налаштуваннях порожній пароль!"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "З'єднується клієнт: %s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "Невідома версія"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2363,2255 +1638,1089 @@
 "Невірний ID версії EC, може бути двійкова несумісність. Використовуйте ядро "
 "та віддаленого клієнта з того самого зрізу"
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
 msgstr ""
 "Ви не можете під'єднатись до остаточної версії з довільної SVN-версії! "
 "Можлива відмова попереджена"
 
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "Аутентифікація не вдалася."
-
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "Невірна версія протоколу."
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "Відсутня позначка версії протоколу."
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
-msgstr "Невірний запит, ви маєте спочатку пройти автентифікацію."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr ""
+
+#: src/ExternalConn.cpp:504
+#, fuzzy
+msgid "Authentication failed: wrong password."
+msgstr "Аутентифікація не вдалася."
+
+#: src/ExternalConn.cpp:506
+#, fuzzy
+msgid "Authentication failed: missing password."
+msgstr "Аутентифікація не вдалася."
+
+#: src/ExternalConn.cpp:516
+#, fuzzy
+msgid "Invalid request, please authenticate first."
+msgstr "Невірний запит, ви маєте спочатку представитись."
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "Дозвіл надано."
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, fuzzy, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "Фільтрувати повідомлення від невідомих клієнтів"
+
+#: src/ExternalConn.cpp:534
+#, fuzzy, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "Спроба доступу без уповноваження. З'єднання розірвано."
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "Віддалена PartFile-команда не вдалася: хеш файлу не знайдено: %s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "Хеш файлу не знайдений: %s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "Помилка при виконання OpCode"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "Сервер не додано"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "сервер не знайдено: %s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "потрібно визначити сервер для видалення"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k вимкнена у налаштуваннях"
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
 msgstr "Пошук просувається. За мить отримаю здобутки!"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "Веб-пошук через віддалений інтерфейс не має сенсу. "
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad вимкнена в налаштуваннях."
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "Немає точок для графіку."
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
 msgstr "Ваш клієнт не налаштований для такого рівня подробиць."
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "Зовнішнє з'єднання: запит на вимкнення"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "Вже вимикається."
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "Зовнішнє з'єднання: додається посилання '%s'"
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "Недопустиме посилання або вже в переліку."
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "Файл не знайдено."
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "Недопустима назва файлу."
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "Неможливо змінити назву файлу."
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad вимкнена в налаштуваннях."
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "Вже з'єднано з eD2k"
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "З'єднується з eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Вже з'єднано з Kad."
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "З'єднується з Kad"
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "Всі мережі вимкнені."
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "Від'єднується від eD2k."
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "Від'єднується від Kad."
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "Зовнішнє з'єднання: отримано недопустимий opcode: %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "Недопустимий opcode (невірна версія протоколу?)"
 
-#: src/UploadClient.cpp:273
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr "Не вдалося відкрити файл (%s), видаляю з переліку спільних файлів."
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "Запитано набір хешів для невідомого файлу: %s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "Команда '%s' з pid '%d' завершилась з кодом стану '%d'."
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "Сервер не додано: не задана ні адреса, ні назва."
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "Сервер не додано: неприпустимий порт."
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "Стан eD2k:"
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "З'єднано"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Порт"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Стан Kademlia:"
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "Працює"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "Стан:"
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "Від'єднана"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "Стан з'єднання:"
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "За фаєрволом"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "Гаразд"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "Стан фаєрволу:"
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "З'єднаний з другом"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "Немає друга"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "Середня кількість користувачів:"
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "Всередньому файлів:"
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "Не запущений"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "Час роботи: %s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "Передавання"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "Вивантаження"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "Вивантажені дані (сесія (всього)): %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "Всього службового трафіку (пакети): %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "Трафік запитів (пакети): %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "Трафік обміну джерелами (пакети): %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "Трафік з сервером (пакети): %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Трафік Kad (пакети): %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "Втрати на шифрування (UDP): %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "Активні вивантаження: %s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "Вивантаження очікують: %s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "Вього успішних сесій вивантаження: %s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "Всього невдалих сесій вивантаження: %s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "Середній час вивантаження: %s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "Звантаження"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "Звантажені дані (сесія (всього)): %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "Знайдені джерела: %s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "Чинні звантаження (шматки): %s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "Відношення вивантажено/звантажено за сесію (всього): %s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "Середня швидкість звантаження (сесія): %s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "Середня швидкість вивантаження (сесія): %s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "Найбільша швидкість звантаження (сесія): %s"
-
-#: src/Statistics.cpp:692
-#, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "Найбільша швидкість вивантаження (сесія): %s"
-
-#: src/Statistics.cpp:693
-#, c-format
-msgid "Reconnects: %i"
-msgstr "Перепід'єднань: %i"
-
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "Пройшло часу з останньої передачі: %s"
-
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "З'єднано з сервером з: %s"
-
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "Чинні з'єднання (приблизно): %i"
-
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "Досягнуто найбільшої кількості з'єднань: %s"
-
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "Середня кількість з'єднань (приблизно): %g"
-
-#: src/Statistics.cpp:700
-#, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "Найбільше з'єднань (приблизно): %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "Клієнти"
-
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "Відфільтровані"
-
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "Всього: %i Відомих: %i"
-
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "Робочі сервери: %i"
-
-#: src/Statistics.cpp:716
-#, c-format
-msgid "Failed Servers: %i"
-msgstr "Неробочі сервери: %i"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "Невідоме розширення '%s' для команди '%s'.\n"
 
-#: src/Statistics.cpp:717
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Total: %s"
-msgstr "Всього: %s"
+msgid "Unknown command '%s'.\n"
+msgstr "Невідома команда '%s'.\n"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "Видалені сервери: %s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"Ця команда не може мати аргумент.\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "Відфільтровані сервери: %s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"Ця команда повинна мати аргумент.\n"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "Користувачів на робочих серверах: %llu"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"Ця команда незавершена, ви повинні використати одне з розширень, що подані "
+"нижче.\n"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "Файлів на робочих серверах: %llu"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"Доступні розширення:\n"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "Всього користувачів: %llu"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "Доступні команди:\n"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Total Files: %llu"
-msgstr "Всього файлів: %llu"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"Всі команди розрізняють великі та малі літери.Введіть '%s <command>' щоб "
+"отримати докладну інформацію по <command>.\n"
 
-#: src/Statistics.cpp:724
-#, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "Навантаження на сервер: %.2f%%"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "Вийти з програми."
 
-#: src/Statistics.cpp:728
-#, c-format
-msgid "Number of Shared Files: %s"
-msgstr "Кількість спільних файлів: %s"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "Показати допомогу."
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "Загальний розмір спільних файлів: %s"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"Щоб отримати допомогу по команді, введіть 'help <command>'.\n"
+"Щоб отримати повний перелік команд, введіть ''help\".\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Average file size: %s"
-msgstr "Середній розмір файлу: %s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "Операційна система"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "Не отримана"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "Вирізати"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "Вставити"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "Вибрати всі"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"Використовуйте '%s' для переліку команд\n"
+"\n"
 
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Пошук у Kad неможливо виконати коли Kad не працює"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "Помилка синтаксису!"
 
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "Пошук eD2k не може бути виконаний, якщо eD2k не з'єднана"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr ""
+"Помилка обробки команди - не повинно ніколи такого бути! Будь, ласка, "
+"повідомте про помилку\n"
 
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "Неочікувана помилка, коли намагаюсь шукати в Kad:"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "Ця команда не повинна мати жодного параметру."
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "Повідомлення відфільтроване від '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "Ця команда повинна мати параметр."
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "Нове повідомлення від '%s' (IP:%s)"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "Невірний аргумент."
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "Користувач %s (%u) запитав ваш перелік спільних файлів -> Дозволено"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "Це незавершена команда"
 
-#: src/ClientTCPSocket.cpp:842
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "Користувач %s (%u) запитав ваш перелік спільних файлів -> Відмовлено"
+msgid "Type '%s' to get more help.\n"
+msgstr "Напишіть '%s' щоб отримати більше допомоги.\n"
 
-#: src/ClientTCPSocket.cpp:874
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "Користувач %s (%u) запитав ваш перелік спільних тек -> Дозволено"
+msgid "This is %s %s %s\n"
+msgstr "Це %s %s %s\n"
 
-#: src/ClientTCPSocket.cpp:914
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "Користувач %s (%u) запитав ваш перелік спільних тек -> Відмовлено"
+msgid "This is %s %s\n"
+msgstr "Це %s %s\n"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
+#: src/ExternalConnector.cpp:390
 msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
+"\n"
+"Creating client...\n"
 msgstr ""
-"Користувач %s (%u) запитав ваш перелік спільних файлів для теки %s -> "
-"Дозволено"
+"\n"
+"Створюється клієнт...\n"
 
-#: src/ClientTCPSocket.cpp:976
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
 msgstr ""
-"Користувач %s (%u) запитав ваш перелік спільних файлів для теки %s -> "
-"відмовлено"
-
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "Користувач %s (%u) зробив спільною теку %s"
-
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "Користувач %s (%u) надіслав незапитані спільні теки."
-
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "Користувач %s (%u) надіслав перелік спільних файлів для теки %s"
-
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "Користувач %s (%u) завершив надсилати перелік спільних файлів"
-
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "Користувач %s (%u) надіслав небажаний перелік спільних файлів"
-
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr "Користувач %s (%u) заборонив доступ до переліку спільних тек/файлів"
-
-#: src/KadDlg.cpp:132
-#, c-format
-msgid "Nodes (%u)"
-msgstr "Вузли (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "Недопустима IP-адреса для початкового запуску"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "Недопустимий порт для початкового запуску"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "Будь ласка, заповніть потрібні поля"
-
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "Ви впевнені, що хочете звантажити новий файл nodes.dat?\n"
+"\n"
+"Добре, виходимо %s...\n"
 
-#: src/KadDlg.cpp:197
+#: src/ExternalConnector.cpp:420
 msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
 msgstr ""
-"Такі дії призведуть до видалення поточних вузлів та перез'єднання з Kademlia."
-
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "Продовжити?"
-
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "ПОМИЛКА: "
-
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "ЗАСТЕРЕЖЕННЯ: "
-
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
-msgstr "Додати друга"
-
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "Ви повинні ввести вірну IP-адресу та порт!"
+"Неможливо з'єднатися з пустим паролем.\n"
+"Ви повинні визначити пароль чи в файлі налаштувань\n"
+"чи в командному рядку, або ввести на запит.\n"
+"\n"
+"Вихід...\n"
 
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "Інформація"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "Показати цей текст допомоги."
 
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "Визначений хеш користувача невірний"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "Хост, де запущений aMule (за замовчуванням: localhost)."
 
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "Джерела"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "Порт aMule для зовнішніх з'єднань (зазвичай: 4712)."
 
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "Файл"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "Пароль зовнішнього з'єднання"
 
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "Звантаження"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "Читати налаштування з файлу."
 
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "Категорія"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "Не друкувати нічого до stdout."
 
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "Головна"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "Бути докладним: показувати також всі повідомлення налагодження"
 
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "Звантажити в категорію"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "Вибрати локаль програми (мова)."
 
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "Пошук схожих файлів (eD2k, місцевий сервер)"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "Записати параметри командного рядка до файлу налаштувань."
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "Позначити як відомий файл"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "Створити файл налаштувань оснований на файлі налаштувань aMule."
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "З'єднатися з віддаленим aMule"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "Друкувати версію програми."
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "З'єднання невдале "
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "Подробиці файлу"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "ПОМИЛКА"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% виконано"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "З'єдання невдале. Неможливо з'єднатися з %s:%d\n"
+msgid "%.2f kB/s"
+msgstr "%.2f кбайт/с"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
-msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
-msgstr ""
-"ЗАСТЕРЕЖЕННЯ: ви не можете додати себе як джерело для eD2k-посилання маючи "
-"LowID."
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "Неможливо відкрити перелік друзів 'emfriends.met' для читання!"
 
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "Користувачі: E: %s K: %s | Файли E: %s K: %s"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "Неможливо відкрити перелік друзів 'emfriends.met' для запису!"
 
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "Всі"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "КРИТИЧНО - немає клієнта на StartChatSession"
 
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "Вього користувачів: %s | Всього файлів: %s"
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "Друзі"
 
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "Переданих"
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "Показати подробиці"
 
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "Швидкість"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
+msgstr "Додати друга"
 
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "Поступ"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "Видалити друга"
 
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "Стан"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "Надіслати повідомлення"
 
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "Залишилось"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "Переглянути файли"
 
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "Востаннє повний"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "Встановити шматок для друга"
 
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "Останнє отримання"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "Ви впевнені, що бажаєте видалити вибраного друга?"
 
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "Ви впевнені, що хочете видалити вибраний файл?"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "Ви впевнені, що бажаєте видалити вибраних друзів?"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "Ви впевнені, що хочете видалити вибрані файли?"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid ""
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"Встановлення більш ніж одного шматка для друга не дозволено.\n"
+"Був виділений тільки один слот."
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "Численний вибір"
+
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "Надіслати повідомлення користувачу"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "Повідомлення:"
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "Зупинити"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "Призупинити"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "Продовжити"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "Видалити завершені"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "Віддати всі A4AF-джерела цьому файлу зараз"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "Віддати всі A4AF-джерела цьому файлу (авто)"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "Віддати всі A4AF-джерела іншим файлам зараз"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "Розширені налаштування"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "Попередній перегляд"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "Показати подробиці файлу"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "Показати всі коментарі"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "Скопіювати magnet-посилання в буфер обміну"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "прибрати"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "Призначити категорію"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "Відкрити файл"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "Видалити з друзів"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "Додати до друзів"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "Надіслати повідомлення"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "Перемкнути на цей файл"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "кбайт/с"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y.%m.%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
 msgstr "QR: %u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "Запитано інший файл"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "Звантаження (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"Щоб попередити показ цього застереження під час кожного попереднього "
-"перегляду,\n"
-"оберіть відеопрогравач в налаштуваннях (за замовчуванням mplayer)."
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "Попередній перегляд файлу"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "ПОМИЛКА: не вдалося виконати зовнішній медіа-програвач! Команда: '%s'"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "ПОМИЛКА: Не вдалося створити частковий файл"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "Спроба завантажити резервну копію met-файлу з %s"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "ПОМИЛКА: Не вдалося відкрити файл part.met: %s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "ПОМИЛКА: файл part.met має розмір 0: %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "ПОМИЛКА: Невірна версія файлу part.met: %s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr ""
-"ПОМИЛКА: %s (%s) зіпсований (невірна кількість міток), неможливо завантажити "
-"файл."
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "Намагання відтворити інформацію файлу..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "Відновлюється файл без назви - спроба відновити як RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "Відновлена вся доступна інформація файлу :D - спроба використати її..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "Неможливо відтворити інформацію файлу"
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "Не вдалося відкрити %s (%s)"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "ЗАСТЕРЕЖЕННЯ: %s може бути зіпсований (%i)"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "ПОМИЛКА під час збереження часткового файлу: %s (%s ==> %s)"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "Неможливо отримати довжину '%s' - використовується файл %s."
-
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' чомусь має нульовий розмір - використовується файл %s."
-
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "Не вдалося зберегти файл part.met.seeds для %s"
-
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "Збережено %i джерело для часткового файлу: %s (%s)"
-msgstr[1] "Збережено %i джерела для часткового файлу: %s (%s)"
-msgstr[2] "Збережено %i джерел для часткового файлу: %s (%s)"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Частковий файл %s (%s) не має джерел"
+#: src/GenericClientListCtrl.cpp:1024
+#, fuzzy
+msgid "Waiting for upload slot"
+msgstr "Вивантаження очікують: %s"
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Частковий файл %s (%s) має порожні файли-джерела "
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "В черзі"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "Помилка читання файлу-джерела часткового файлу (%s - %s): %s"
+#: src/GenericClientListCtrl.cpp:1029
+#, fuzzy
+msgid "Uploading"
+msgstr "Вивантаження"
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"Знайдена підробна частина (%d) в (%d) частковому файлі %s - FileResultHash |%"
-"s| FileHash |%s|"
-msgstr[1] ""
-"Знайдена підробна частина (%d) в (%d) часткових файлах %s - FileResultHash |%"
-"s| FileHash |%s|"
-msgstr[2] ""
-"Знайдена підробна частина (%d) в (%d) часткових файлах %s - FileResultHash |%"
-"s| FileHash |%s|"
+#: src/GenericClientListCtrl.cpp:1031
+#, fuzzy
+msgid "None"
+msgstr "Жоден"
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "Знайдено завершену частину (%i) в %s"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "Ні"
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "Завершене повторне обчислення хешу: %s"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "Так"
 
-#: src/PartFile.cpp:2239
-#, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "Неочікувана помилка під час завершення %s. Файл призупинено"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "Звантажування..."
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "Завершене звантаження: %s"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "HTTP завантаження скасоване"
 
-#: src/PartFile.cpp:2323
-#, c-format
-msgid "Deleting file: %s"
-msgstr "Видаляється файл: %s"
+#: src/HTTPDownload.cpp:205
+#, fuzzy, c-format
+msgid "Unable to create destination file %s for download!"
+msgstr "Тека призначення для звантажень"
 
-#: src/PartFile.cpp:2384
-#, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
 msgstr ""
-"ЗАСТЕРЕЖЕННЯ: неможливо обчислити хеш звантаженого файлу - набір хешів "
-"неповний для '%s'"
 
-#: src/PartFile.cpp:2389
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
+msgid "The URL %s returned: %i - Error (%i)!"
 msgstr ""
-"ПОМИЛКА: неможливо обчислити хеш звантаженого файлу - набір хешів неповний (%"
-"s). Такого ніколи не повинно бути"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
 msgstr ""
-"ЗАСТЕРЕЖЕННЯ: недостатньо вільного місця на диску! Призупиняється файл: %s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "Звантажена частина %i зіпсована в файлі: %s"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "Р.О.П.: відновлено зіпсовану частину %i для %s -> Збережено байт: %s"
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "Виділяється"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "Не вистачає місця на диску"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "Зупинені"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
+#: src/HTTPDownload.cpp:275
+#, fuzzy, c-format
+msgid "Downloaded %d bytes"
 msgstr "Звантажені"
 
-#: src/PartFile.cpp:4167
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "ПОМИЛКА: не вдалося відкрити частковий файл '%s'"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "ЗАСТЕРЕЖЕННЯ: не можна відкрити known.met."
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
+msgid "Expected %d bytes, but downloaded %d bytes"
 msgstr ""
-"ЗАСТЕРЕЖЕННЯ: Перелік відомих файлів зіпсовано, містить неприпустимий "
-"заголовок."
-
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "Помилка введення-виведення під час читання файлу known.met: %s"
-
-#: src/KnownFileList.cpp:158
-#, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "Помилка під час збереження файлу known.met: %s"
-
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "Знайдено %i новий спільний файл"
-msgstr[1] "Знайдено %i нові спільні файли"
-msgstr[2] "Знайдено %i нових спільних файлів"
 
-#: src/SharedFileList.cpp:358
-#, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "Знайдено %i відомий спільний файл, невідомих - %i"
-msgstr[1] "Знайдено %i відомі спільні файли, невідомих - %i"
-msgstr[2] "Знайдено %i відомих спільних файли, невідомих - %i"
-
-#: src/SharedFileList.cpp:367
-#, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "ПОМИЛКА: спроба зробити спільним %s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "Коментарі файлу"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "Рейтинг"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "Коментар"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "Немає коментарів"
-
-#: src/CommentDialogLst.cpp:104
-#, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u коментар"
-msgstr[1] "%u коментарі"
-msgstr[2] "%u коментарів"
-
-#: src/ServerConnect.cpp:69
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr ""
-"Не вдалося з'єднатися з усіма переліченими прихованими серверами. Робиться "
-"ще одна спроба без приховування."
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
 msgstr ""
-"Не вдалося з'єднатися з усіма переліченими серверами. Робиться ще одна "
-"спроба."
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "eD2k вимкнена в налаштуваннях, не з'єднується."
+#: src/HTTPDownload.cpp:379
+#, fuzzy
+msgid "Unable to connect to HTTP download server"
+msgstr "Перез'єднатись з сервером"
 
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
 msgstr ""
-"Не знайдено справних серверів в переліку серверів з якими можна було "
-"з'єднатися"
 
-#: src/ServerConnect.cpp:187
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "З'єднані з %s (%s:%i)"
+msgid "Download new GeoIP.dat from %s"
+msgstr "Звантажую новий GeoIP.dat з %s"
 
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "З'єднання встановлено з: %s"
+#: src/IP2Country.cpp:128
+#, fuzzy
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "Неможливо видалити файл GeoIP.dat, оновлення зірване."
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr ""
-"Жахлива помилка під час спроби з'єднання. З'єднання з Інтернет може бути "
-"відсутнє"
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
+#, fuzzy, c-format
+msgid "Failed to remove %s file, aborting update."
+msgstr "Неможливо видалити файл GeoIP.dat, оновлення зірване."
+
+#: src/IP2Country.cpp:140
+#, fuzzy, c-format
+msgid "Failed to rename %s file, aborting update."
+msgstr "Неможливо змінити назву нового файлу GeoIP.dat, оновлення зірване."
+
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
+#, fuzzy, c-format
+msgid "Successfully updated %s"
+msgstr "Успішно оновлено GeoIP.dat"
+
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "Помилка оновлення GeoIP.dat"
+
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
+#, fuzzy, c-format
+msgid "Failed to download %s from %s"
+msgstr "Не вдалося звантажити GeoIP.dat з %s"
+
+#: src/IP2Country.cpp:172
+#, fuzzy, c-format
+msgid "Failed to load country data for '%s'."
+msgstr "Не вдалося звантажити GeoIP.dat з %s"
 
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "Втрачене з'єднання з %s (%s:%i)"
+#: src/IPFilter.cpp:113
+#, fuzzy
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "Завантажую IP-filters 'ipfilter.dat' та 'ipfilter_static.dat'."
 
-#: src/ServerConnect.cpp:349
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) здається мертвий."
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "Звантаження файлу ipfilter.dat '%s' зазнало невдачі, невідомий формат"
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) здається заповнений."
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr ""
+"Звантаження файлу ipfilter.dat '%s' зазнало невдачі, неможливо відкрити файл."
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "Автоматичне з'єднання з сервером повториться через %d секунду"
-msgstr[1] "Автоматичне з'єднання з сервером повториться через %d секунди"
-msgstr[2] "Автоматичне з'єднання з сервером повториться через %d секунд"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "Втрата з'єднання"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "Завантажено %u обсяг IP-адрес з '%s'."
+msgstr[1] "Завантажено %u обсяги IP-адрес з '%s'."
+msgstr[2] "Завантажено %u обсягів IP-адрес з '%s'."
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "З'єднання з %s (%s:%i) не вдалося."
-
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "ПОМИЛКА: невірний сокет після сплину часу"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "%u спотворений рядок був відкинутий."
+msgstr[1] "%u спотворені рядки були відкинуті."
+msgstr[2] "%u спотворених рядків були відкинуті."
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "Спроба з'єднання з %s (%s:%i) добігла кінця."
+#: src/IPFilter.cpp:503
+#, fuzzy, c-format
+msgid "Failed to rename new %s file, aborting update."
+msgstr "Неможливо змінити назву нового файлу GeoIP.dat, оновлення зірване."
 
-#: src/DownloadQueue.cpp:154
-msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
 msgstr ""
-"ПОМИЛКА: не вдалося завантажити файл резервної копії. Шукайте на http://"
-"forum.amule.org вирішення проблем відновлення .part.met"
 
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "Не знайдено жодного часткового файлу"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "Знайдений %u частковий файл"
-msgstr[1] "Знайдені %u часткові файли"
-msgstr[2] "Знайдені %u часткових файлів"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
+#: src/KadDlg.cpp:86
+msgid ""
+"Bootstrap from \n"
+"known clients"
 msgstr ""
-"Файлова система для теки тимчасових файлів не може обробити великі файли."
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr "Файлова система для теки вхідних файлів не може обробити великі файли."
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "Звантажую %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "Ви вже спробували звантажити файл '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "Ви вже маєте файл '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "Ви вже спробували звантажити файл %s"
+"Початковий запуск\n"
+"відомого клієнта"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "Неможливо перетворити magnet-посилання в eD2k-посилання: %s"
+msgid "Nodes (%u)"
+msgstr "Вузли (%u)"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "Невідомий протокол посилання: %s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "Недопустима IP-адреса для початкового запуску"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "Невірне eD2k-посилання! ПОМИЛКА: %s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "Недопустимий порт для початкового запуску"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "Виконати <str> та вийти."
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "Будь ласка, заповніть потрібні поля"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "Невірний формат IP-адреси. Використовуйте xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "Ви впевнені, що хочете звантажити новий файл nodes.dat?\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
 msgstr ""
-"Ця команда потребує аргумент. Вірні аргументи:  'all', назва файлу, або "
-"номер.\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "Оброблюється за хешем: "
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "Оброблюється на назвою файлу: "
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr "Ця команда потребує аргумент. Правильний аргумент: хеш файлу.\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "Невірне число\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "Невірний хеш (довжина має бути точно 32 символи)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "Дія була вдалою."
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "Запит невдалий з помилкою: %s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "Фільтрування IP для клієнтів %s.\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "Вимк."
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "Ввімк."
+"Такі дії призведуть до видалення поточних вузлів та перез'єднання з Kademlia."
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "Фільтрування IP для серверів %s.\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "Продовжити?"
 
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "Поточний рівень IP-фільтра %d.\n"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kademlia: пошукове слово занадто коротке"
 
-#: src/TextClient.cpp:671
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr ""
-"Обмеження смуги пропускання: вивантаження %u кб/с, звантаження: %u кб/с.\n"
+msgid "Keyword for search: %s"
+msgstr "Ключове слово для пошуку: %s"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
-
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "З'єднався з %s %s %s"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kademlia: пошукове слово вже в переліку пошуку: "
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "з LowID"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "з HighID"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "Не з'єднується"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "Не з'єднаний"
-
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
 msgstr ""
-"\n"
-"Звантаження:\t%s"
-
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"Вивантаження:\t%s"
 
-#: src/TextClient.cpp:729
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"Клієнтів у черзі:\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "Прочитано %u контакт Kad"
+msgstr[1] "Прочитано %u контакти Kad"
+msgstr[2] "Прочитано %u контактів Kad"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
 msgstr ""
-"\n"
-"Всього джерел:\t%d\n"
+"Не знайдено жодного контакту, будь ласка, здійсніть початковий запуск або "
+"звантажте файл nodes.dat"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "Кількість здобутків пошуку: %i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "TODO - показати поступ пошуку"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "Тільки %d контакт Kad доступний, nodes.dat не записано"
+msgstr[1] "Тільки %d контакти Kad доступні, nodes.dat не записано"
+msgstr[2] "Тільки %d контактів Kad доступні, nodes.dat не записано"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "Отримано невідому відповідь з серверу, OpCode = %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "Показати коротку інформацію про стан."
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr ""
-"Показати стан з'єднань, поточні швидкості вивантаження/звантаження, інше.\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "Показати повне дерево статистики."
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "Записано %d контакт Kad"
+msgstr[1] "Записано %d контакти Kad"
+msgstr[2] "Записано %d контактів Kad"
 
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"Додатково, число з межах 0-255 може бути прийнято як аргумент для цієї\n"
-"команди, що повідомляє скільки елементів піддерева версій клієнта слід\n"
-"показувати. 0 або пусте значення означатимуть \"необмежено.\"\n"
-"\n"
-"Наприклад: 'statistics 5' покаже тільки 5 найбільш частих номерів для "
-"кожного типу клієнта.\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "Назва файлу"
 
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "Завершити роботу aMule."
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "Розмір файлу"
 
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"Вимкнути віддалено запущене ядро (amule/amuled).\n"
-"Це також вимкне текстові клієнти, оскільки вони непридатні\n"
-"без запущеного ядра.\n"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "Відношення передачі"
 
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "Перезавантажується отриманий об'єкт."
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "Вивантажено"
 
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "Перезавантажується перелік спільних файлів."
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "Запитано"
 
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "Перезавантажується IP фільтр з файлу."
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "Дозволено"
 
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "З'єднання з мережею."
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "Завершених джерел"
 
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
 msgstr ""
-"З'єднатися з усіма мережами, що ввімкнені в налаштуваннях.\n"
-"Ви також можете додатково визначити адресу сервера у вигляді IP:порт\n"
-"щоб з'єднатись тільки з ним. IP-адреса повинна мати вигляд a.b.c.d версії "
-"IPv4\n"
-"або назва."
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "З'єднання тільки з eD2k."
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "З'єднання тільки з Kad."
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "Від'єднано тільки від мережі."
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "Це від'єднає від всіх мереж, до яких зараз під'єднано.\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "Від'єднано тільки від eD2k."
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "Від'єднано тільки від Kad."
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "Додає eD2k-посилання або magnet-посилання до ядра."
+"ЗАСТЕРЕЖЕННЯ: Перелік відомих файлів зіпсовано, містить неприпустимий "
+"заголовок."
 
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
 msgstr ""
-"eD2k-посилання, яке треба додати, може бути:\n"
-"*) посиланням на файл (ed2k://|file|...), буде додане до черги звантажень,\n"
-"*) посиланням на сервер (ed2k://|server|...), буде додане до переліку "
-"серверів,\n"
-"*) або посиланням на перелік серверів, в такому випадку всі сервери списку "
-"будуть\n"
-"   додані до переліку серверів.\n"
-"\n"
-"Magnet-посилання повинне містити eD2k-хеш та довжину файлу.\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "Встановити значення налаштувань."
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "Налаштувати IP-фільтри"
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "Ввімкнути IP фільтрування для клієнтів та серверів."
 
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "Вимкнути IP фільтрування для клієнтів та серверів."
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "Ввімкнути/вимкнути IP фільтрування для клієнтів."
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "Ввімкнути IP-фільтри для клієнтів."
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "Вимкнути IP-фільтри для клієнтів."
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "Ввімкнути/вимкнути IP фільтрування для серверів."
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "Ввімкнути IP-фільтри для серверів."
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "Вимкнути IP-фільтри для серверів."
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "Вибрати рівні IP-фільтрування."
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
 msgstr ""
-"Вірні рівні фільтрування в межах 0-255, і їх значення\n"
-"за замовчуванням(початкове) 127.\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "Встановити обмеження швидкостей."
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "Значення передане цій команді має бути в кб/с.\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "Встановити обмеження швидкості вивантаження."
-
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "Встановити обмеження швидкості звантаження."
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "Отримати та відобразити значення налаштувань."
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "Отримати налаштування IP-фільтра."
-
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "Отримати стан IP-фільтра для клієнта і сервера."
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "Невідома версія"
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "Отримати стан IP-фільтра тільки для клієнта."
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "Тека призначення для звантажень"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "Отримати стан IP-фільтра тільки для сервера."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "Обчислюється хеш"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "Отримати рівень IP-фільтра."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "Завершується"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "Отримати обмеження смуги пропускання."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "Завершений"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "Робить пошук."
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "Призупинений"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"Вид пошуку має бути визначений одним з наступних:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Наприклад: 'search kad file' виконає пошук файлу \"file\" в Kad.\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "Помилковий"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "Виконати глобальний пошук"
+# файл
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "Очікує"
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "Виконати місцевий пошук"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "Ви повинні вказати непорожній пароль."
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "Виконати пошук у Kad"
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "Неправильний пароль, не MD5-хеш"
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "Показати здобутки попереднього пошуку."
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "З'єднання невдале"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "Повернути здобутки попереднього пошуку.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "EC з'єднання невдале. Порожня відповідь."
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "Показати поступ пошуку."
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+#, fuzzy
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "Зовнішнє з'єднання: невірна відповідь сервера. З'єднання закрите."
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "Показує поступ пошуку.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "Успіх! Встановлене з'єднання до aMule"
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "Почати звантаження файлу."
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "Успіх! Встановлене з'єднання."
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"Потрібно вказати номер файлу з останнього пошуку.\n"
-"Наприклад:  'download 12'  розпочне звантаження файлу з номером 12 "
-"попереднього пошуку.\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "Зовнішнє з'єднання: в доступі відмовлено з причини: "
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "Призупинити звантаження."
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+#, fuzzy
+msgid "External Connection: Handshake failed."
+msgstr "Зовнішнє з'єднання: в доступі відмовлено"
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "Відновити звантаження."
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "ListenSocket: Гаразд."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "Відмінити звантаження."
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "ПОМИЛКА: неможливо відкрити TCP-порт"
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "Встановити перевагу звантаження"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "ПОМИЛКА: "
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "Встановити перевагу звантаження на низьку, звичайну або автоматичну.\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "ЗАСТЕРЕЖЕННЯ: "
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "Встановити перевагу низькою."
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "Закрити"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "Встановити перевагу звичайною."
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "Вирізати"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "Встановити перевагу високою."
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "Скопіювати"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "Встановити перевагу авто."
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "Вставити"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "Показати черги/переліки."
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "Очистити"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr ""
-"Показати чергу звантаження та вивантаження, перелік серверів або перелік "
-"спільних файлів.\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "Вибрати всі"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "Показати чергу вивантаження."
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "кбайт/с"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "Показати чергу звантаження."
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "Безмежно"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "Показати журнал."
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule Tray Menu"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "Показати перелік серверів."
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "Обмеження швидкості:"
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "Очистити журнал."
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "Вивантаження: Немає"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "Застаріла команда, використовуйте '%s' замість неї."
+msgid "UL: %u"
+msgstr "Вивантаження: %u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"Це застаріла команда та може бути видалена в майбутньому.\n"
-"Використовуйте '%s' замість неї.\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "Звантаження: немає"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "ПОМИЛКА: %s (%s) - %s"
+msgid "DL: %u"
+msgstr "Звантаження: %u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "ЗАСТЕРЕЖЕННЯ: %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "Швидкість звантаження: %.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "Новий id клієнта %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "ЗАСТЕРЕЖЕННЯ: ви отримали LowID!"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\tНайбільш ймовірно це тому, що ви за фаєрволом або маршрутизатором."
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr ""
-"\tЗа додатковою інформацією, будь ласка, завітайте до http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "Швидкість вивантаження: %.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "Отримана невідома інформація про сервери! - занадто коротко"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "Інформація клієнта"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "Отримано %d новий сервер"
-msgstr[1] "Отримано %d нові сервери"
-msgstr[2] "Отримано %d нових серверів"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "Збереження переліку серверів завершено."
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "Сервер відхилив останню команду"
+msgid "Nickname: %s"
+msgstr "Прізвисько: %s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "З сервера отримано підробний пакет: %s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "Не вибрано прізвисько!"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr ""
-"Помилка, що не може бути опрацьована, під час обробки пакету з сервера: %s"
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "ID клієнта:"
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "Неможливо створити потік DNS-запиту для з'єднання з %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "Не з'єднаний"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "IP-адреса сервера %s (%s) відфільтрована.  Не з'єднується."
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "Назва серверу:"
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "використовується приховування протоколу."
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "IP серверу: "
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "З'єднуюсь з %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "Не з'єднано"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "Неможливо визначити DNS-назву для сервера: %s. Неможливо з'єднатися!"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country(): неможливо завантажити дані країн з "
+msgid "IP: %s"
+msgstr "IP: %s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "Завантажене %d зображення прапору."
-msgstr[1] "Завантажені %d зображення прапорів."
-msgstr[2] "Завантажені %d зображень прапорів."
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr ""
-"Ви впевнені, що хочете відмінити або видалити всі файли в цій категорії?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "Потрібне підтвердження"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "Всі інші"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "Незавершені"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "Чинні"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "Відео"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "Аудіо"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "Архів"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "Образи CD"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "Зображення"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "Текст"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "Вибрати фільтр перегляду"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "Додати категорію"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "Редагувати категорію"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "Видалити категорію"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "Назва файлу"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "Розмір файлу"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "Відношення передачі"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "Вивантажено"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "Запитано"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "Дозволено"
+msgid "TCP port: %d"
+msgstr "Порт TCP: %d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "Завершених джерел"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "Порт TCP: не готовий"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "Вноситься %s: %s"
+msgid "UDP port: %d"
+msgstr "Порт UDP: %d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "Читається тимчасова тека"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "Порт UDP: не готовий"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "Витягується основна інформація з інформації звантажуваного файла"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "Online-підпис: увімкнено"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "Створюється файл призначення"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "Online-підпис: вимкнено"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "Завантажуються дані зі старого файлу звантажень (%u з %u)"
+msgid "Uptime: %s"
+msgstr "Час роботи: %s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "Зберігається блок даних в новий один файл звантаження (%u з %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "Отримується інформація по джерелам звантажуваного файла"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "Додається звантаження та зберігається новий частковий файл"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "Вношу часткові файли"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "Стан"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "Хеш файлу"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "Очікується..."
+msgid "Shared files: %d"
+msgstr "Спільні файли: %d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (диск: %s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr ""
-"Будь ласка, виберіть теку з тимчасовими звантаженнями! (підтеки будуть "
-"додані)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "Ви хочете, щоб джерела успішно внесених звантажень були видалені?"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "Видалити джерела?"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "байт"
-msgstr[1] "байти"
-msgstr[2] "байт"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "кбайт"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "Мбайт"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "Гбайт"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "Тбайт"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "к"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "М"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "Г"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "Т"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "байт/с"
-msgstr[1] "байти/с"
-msgstr[2] "байт/с"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "Мбайт/с"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "с"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "хв"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "год"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "діб"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "Відео"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "Архіви"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "Тексти"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "Програми"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "Будь-який"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "Без рейтингу"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "Невірний / Зіпсований / Підробний"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "Погано"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "Непогано"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "Добре"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "Відмінно"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "всі"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "всі інші"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "Завантажую IP-filters 'ipfilter.dat' та 'ipfilter_static.dat'."
+msgid "Queued clients: %d"
+msgstr "Клієнтів в черзі: %d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "Звантаження файлу ipfilter.dat '%s' зазнало невдачі, невідомий формат"
+msgid "Total DL: %s"
+msgstr "Всього звантажень: %s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr ""
-"Звантаження файлу ipfilter.dat '%s' зазнало невдачі, неможливо відкрити файл."
+msgid "Total UL: %s"
+msgstr "Всього вивантажень: %s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "Завантажено %u обсяг IP-адрес з '%s'."
-msgstr[1] "Завантажено %u обсяги IP-адрес з '%s'."
-msgstr[2] "Завантажено %u обсягів IP-адрес з '%s'."
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "Обмеження вивантаження"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "%u спотворений рядок був відкинутий."
-msgstr[1] "%u спотворені рядки були відкинуті."
-msgstr[2] "%u спотворених рядків були відкинуті."
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "Обмеження звантаження"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "Чинні з'єднання (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "Сховати aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "Подробиці файлу"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "Показати aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% виконано"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "Вийти"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "eD2k-посилання:"
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "Підтвердити"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr ""
 "Натисніть щоб додати eD2k-посилання в текстовий нагляд до черги звантажень."
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr ""
-"Тут відображаються події. Для повного переліку подій, зверніться до журналу "
+"Тут відображаються події. Для повного переліку подій, зверніться до часопису "
 "у вкладці серверів."
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "Завантаження..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "Кількість користувачів на сервері, з якими ви з'єднані..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "Користувачів: 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
@@ -4620,6 +2729,10 @@
 "користувачів."
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "Вивантаження: 0.0 | Звантаження: 0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
@@ -4627,7 +2740,7 @@
 "Поточні швидкості вивантаження та звантаження. Значення в дужках (якщо "
 "ввімкнено) відображають службовий трафік зв'язку клієнтів."
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4638,1096 +2751,1036 @@
 "ви не з'єднані, жовті - маєте LowID (за фаєрволом), зелені - маєте high ID "
 "(найкраще)."
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "Не з'єднано..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "З'єднаний сервер в даний час."
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "Пошук"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "Назва:"
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "Тип"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "Місцевий"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "Глобальний"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "Хеш файлу"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "Розширені параметри"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "Фільтрування"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "Тип файлу"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "Будь-який"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "Архіви"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "Аудіо"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "Образи CD"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "Зображення"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "Програми"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "Тексти"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "Відео"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "Розширення"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "Найменший розмір"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "байт"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "кбайт"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "Мбайт"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "Гбайт"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "Найбільший розмір"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "Доступність"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "Фільтр:"
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "Здобутки фільтру"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "Перевернути фільтр"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "Сховати відомі файли"
 
-#: src/muuli_wdr.cpp:355
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "Почати"
+
+#: src/muuli_wdr.cpp:356
 msgid "More"
 msgstr "Більше"
 
-#: src/muuli_wdr.cpp:356
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "Для більших наслідків шукайте в eD2k. Ще не підтримується Kad."
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "Зупинити"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "Звантаження"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "Очистити поля"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "Здобутки"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "Очистити завершені звантаження"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "Показати черги вивантаження/звантаження"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "Клієнтів у черзі:"
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "Надіслати"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "Надіслати вказане повідомлення."
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "Закрити"
+#: src/muuli_wdr.cpp:466
+#, fuzzy
+msgid "File sources:"
+msgstr "Завершених джерел"
 
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "Закрити цю розмову."
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "Загальні"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "Повна назва:"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "недоступні"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "met-файл:"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "Хеш:"
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "Розмір файлу:"
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "Стан часткових файлів:"
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "Востаннє повний:"
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "Передавання"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "Знайдено джерел:"
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "Передані джерела:"
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "Кількість часткових файлів:"
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "Наявні:"
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "Швидкість передачі:"
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "Чинний час звантаження:"
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "Передані:"
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "Розмір завершених:"
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "Розумна обробка пошкоджень"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "Втрачено за рахунок спотворень:"
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "Здобуто стисненням:"
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "Пакунки збережено Р.О.П. :"
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "Назви файлів"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
 msgstr "Прибрати"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "Очистити"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "Застосувати"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "Гаразд"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "Коментувати/оцінити файл (текст буде видно всім користувачам)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"Для фільму ви можете написати тривалість, сюжет, мову... \n"
-"або ж, якщо він підробний, ви можете розповісти це іншим користувачам aMule."
+"Для фільму ви можете написати тривалість, сюжет, мову... \\n\\nабо ж якщо "
+"він підробний, ви можете розповісти це іншим користувачам aMule."
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "Якість файлу"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "Без рейтингу"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "Невірний / Зіпсований / Підробний"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "Погано"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "Непогано"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "Добре"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "Відмінно"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr ""
 "Змінити оцінку файлу або повідомити користувачів, якщо файл невірний..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "Оновити"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "Звантажується, будь ласка, зачекайте..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "Невідомий розмір"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "Потрібна інформація"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP-адреса:"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "Порт:"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "Додаткова інформація"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "Ім'я користувача:"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "Хеш користувача:"
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "Перезавантажити ваші спільні файли"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "Поточна сесія"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "Всього"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "Запитані:"
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "Чинні вивантаження:"
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "Додати"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "Швидкість звантаження"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "Поточна"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "Середня"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "Середня за сесію"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "Швидкість вивантаження"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "З'єднання"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "Чинні звантаження"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "Чинні з'єднання (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "Чинні вивантаження"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "Дерево статистики"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "Ім'я користувача:"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "Хеш користувача:"
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "Програма клієнта:"
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "Версія клієнта:"
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP-адреса:"
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "ID користувача:"
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "Адреса сервера:"
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "Назва сервера:"
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "Приховування:"
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad:"
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "Передано клієнту"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "Поточні запити:"
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "Середня швидкість вивантаження:"
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "Середня швидкість звантаження:"
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "Вивантажено (сесія):"
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "Звантажено (сесія):"
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "Вивантажено (всього):"
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "Звантажено (всього):"
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "Рахунок"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "Модифікатор звантаження/вивантаження:"
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "Безпечна ідентифікація:"
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "Оцінка (всього):"
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "В черзі"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "Рахунок черги:"
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "Прізвисько"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - Mule для Linux"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - багатоплатформений Mule"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "Це ім'я, яке бачать інші користувачі, коли під'єднуються до вас."
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "Мова"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "Мова: "
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
-msgstr "Визначає мову, що використовується для керування"
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "Затримка перед показом підказок."
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "Різні опції"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
+msgstr "Це визначає мову"
 
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "Перевірити наявність нової версії під час запуску"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
 msgstr "Перевірка нової версії після запуску"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "Розпочати зменшеним"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "Зменшитись після запуску"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "Запит на вихід"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "aMule запитуватиме перед виходом."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "Питає перед виходом."
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
+
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "Увімкнути знак у системному лотку"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "Ввімкнути/вимкнути знак в системному лотку або панелі."
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "Зменшитись в знак"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr "Зменшуватись в системний лоток, а не в смужку програм."
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "Затримка показу порад (с): "
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "Затримка показу порад: "
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "Затримка перед показом підказок."
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "с"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "Обрати переглядач тенет"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "Типові системи"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "Виберіть переглядач тенет"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "Інший переглядач:"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
 msgstr ""
-"Введіть тут назву вашого переглядача. Щоб використовувати інший, виберіть "
-"пункт меню \"Нетиповий\" зі спадаючого меню нижче."
+"Введіть тут назву вашого переглядача тенет. Залиште це поле порожнім, щоб "
+"використовувати переглядач встановлений за замовчуванням."
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "Переглянути"
+
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "Відкрити в новій вкладці, якщо можливо"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr ""
 "Відкрити сторінку тенет в новій вкладці замість нового вікна, якщо можливо"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "Відеопрогравач"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "Створити копію для перегляду"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "Обмеження ширини смуги"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "Вивантаження"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "Виділення шматків"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "Типовий порт TCP клієнта:"
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "Порти"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "Зразковий TCP-порт"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "Це звичайний порт eD2k і не може бути вимкненим."
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "Розширений клієнтський порт UDP:"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "Порт UDP для запитів сервера (TCP+3):"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr ""
-"Цей порт UDP використовується для зовнішній запитів ed2k та для мережі Kad"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "Розширений порт UDP (Kad / глобальний пошук)"
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "вимкнено"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr "Цей порт використовується для зовнішній запитів eD2k та для мережі Kad"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "Адреса"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "Ввімкнути UPnP для перенаправлення портів"
 
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "Порт UDP для зовнішніх запитів сервера (TCP+3): 4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "Найбільше джерел на файл"
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnP TCP порт (не обов'язково):"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "Жорстке обмеження"
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "Використовувати IP-адресу (пусто для будь-якої):"
+
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr ""
+"Тільки досвідченим користувачам: якщо ви маєте багато мережевих інтерфейсів, "
+"введіть адресу інтерфейсу до якого слід прив'язатися aMule."
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "Обмеження з'єднань"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "Найбільше з'єднань"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "Найбільше джерел на звантажуваний файл:"
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "eD2k"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "Найбільше одночасних з'єднань:"
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "Universal Plug and Play"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "Увімкнути UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "Порт UPnP TCP:"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "eD2k"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "Автоматичне з'єднання після запуску"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "Перез'єднатись при втраті з'єднання"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "Показати ширину смуги службового трафіку"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "Опції сервера"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "Вилучити мертвий сервер після"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "спроб"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "Автоматичне оновлення переліку серверів після запуску"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "Перелік"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "Оновити перелік серверів після з'єднання з сервером"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "Оновити перелік серверів після з'єднання з клієнтами"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "Використовувати систему переваг"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "Використовувати розумну перевірку LowID під час з'єднання"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "Безпечне з'єднання"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "Автоматично з'єднуватись тільки з серверами з переліку постійних"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "Встановити високу перевагу доданим вручну серверам"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "I.C.H. активна"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "AICH довіряє кожному хешу (не радимо)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "Розумна обробка пошкоджень (Р.О.П.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "Ввімкнено"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "Вдосконалена Р.О.П. довіряє всім хешам (не радимо)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "Додати файли для звантаження призупиненими"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "Додати файли для звантаження з автоматичною перевагою"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "Спробувати спершу звантажити перший та останній шматки"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "Додати нові спільні файли з автоматичною перевагою"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "Спробувати передати повні шматки до всіх вивантажень"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr "Запустити наступний призупинений файл, коли файл завершиться"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "З тієї самої категорії"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "Зберегти 10 джерел рідкісних файлів (менше ніж 20 джерел)"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "Місце на диску"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "Попереднє виділення місця на диску для нових файлів"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "Перевірка місця на диску"
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr ""
+"Повністю виділяти місце для всього нового файлу, це зменшить фрагментування"
+
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "Припинити звантаження коли вільне місце на диску досягнуло "
 
-#: src/muuli_wdr.cpp:2058
+#: src/muuli_wdr.cpp:1819
 msgid "Select this if you want aMule to check your disk space"
 msgstr "Виберіть це якщо хочете, щоб aMule перевіряв ваше місце на диску"
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "Найменший обсяг місця на диску:"
-
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "Введіть найменше бажане місце на диску"
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "Попереднє виділення місця на диску для нових файлів"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "Зберегти 10 джерел рідкісних файлів (менше ніж 20 джерел)"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr ""
-"Повністю виділяти місце для всього нового файлу, це зменшить фрагментування"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "Вивантаження"
+
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "Додати нові спільні файли з автоматичною перевагою"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "Вхідна"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "Тимчасова"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "Спільна"
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "Тека призначення для звантажень"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "Тека для тимчасових звантажуваних файлів"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "Спільні теки"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(Праве клацання по значку теки для рекурсивного додавання)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "Робити спільними приховані файли"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "Графіки"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "Час оновлення: 5 с"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "Час для середніх графіків: 100 хв"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "Шкала графіку з'єднань: 100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "Виберіть кольори статистики"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "Шкала графіку звантаження"
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "Шкала графіку вивантаження"
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "Кольори:"
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "Фон"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "Сітка"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "Звантаження зараз"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "Звантаження середні за роботу"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "Звантаження середні за сесію"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "Вивантаження поточні"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "Вивантаження середні за роботу"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "Вивантаження середні за сесію"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "Чинні з'єднання"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "Показувати стовпчик швидкості в системному лотку"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "Вузлів Kad зараз"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "Вузлів Kad запущено"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "Вузлів Kad за сесію"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "Вибрати"
 
-#: src/muuli_wdr.cpp:2214
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "Дерево"
+
+#: src/muuli_wdr.cpp:2000
 msgid "Number of Client Versions shown (0=unlimited)"
 msgstr "Кількість відображуваних версій клієнтів (0=необмежено)"
 
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "Пропускна здатність лінії"
-
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "Примітка: ці значення використовуються тільки для статистики."
-
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! ЗАСТЕРЕЖЕННЯ !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"Не змінюйте ці налаштування, якщо не знаєте\n"
-"що робите, інакше ви можете легко\n"
-"собі нашкодити\n"
-"\n"
-"aMule чудово працює без зміни будь-яких\n"
-"з цих параметрів."
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "Розширені налаштування"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "Найбільше зовнішніх з'єднань за 5 с"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "Розмір файлу буфера: 240000 байт"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "Розмір черги вивантаження: 5000 клієнтів"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "Час оновлення з'єднання з сервером: вимкнено"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "Поступ черги звантаження файлів"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "Показувати відсотки"
-
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "Показувати панель поступу"
-
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "Стиль панелі поступу"
-
-#: src/muuli_wdr.cpp:2351
-msgid "Flat"
-msgstr "Плаский"
-
-#: src/muuli_wdr.cpp:2354
-msgid "Round"
-msgstr "Круглий"
-
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "Підтримка шкір"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "Увімкнути підтримку шкір "
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "Шкіра:"
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- немає наявних шкір -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "Впорядкування стовпців"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
 msgstr ""
-"Автоматично впорядковувати файли в черзі звантаження (багато ресурсів CPU)"
 
-#: src/muuli_wdr.cpp:2392
-msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule буде автоматично впорядковувати стовпці в переліку звантажень"
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "Використати шкіру: "
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "Різні удосконалення графічного інтерфейсу"
-
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "Показати швидкий оброблювач посилань eD2k"
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "Показати \"Швидкий оброблювач eD2k-посилань\" в кожному вікні."
 
-#: src/muuli_wdr.cpp:2404
+#: src/muuli_wdr.cpp:2103
 msgid "Show extended info on categories tabs"
 msgstr "Показати розширену інформацію на вкладках категорій"
 
-#: src/muuli_wdr.cpp:2408
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "Показувати швидкість передавання в заголовку"
+
+#: src/muuli_wdr.cpp:2110
 msgid "Show transfer rates on title"
 msgstr "Показувати швидкість передавання в заголовку"
 
-#: src/muuli_wdr.cpp:2412
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "Перед назвою програми"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "Після назви програми"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "Показати ширину смуги службового трафіку"
+
+#: src/muuli_wdr.cpp:2124
 msgid "Vertical toolbar orientation"
 msgstr "Вертикальне розміщення панелі інструментів"
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "Показувати номер часткового файлу перед назвою файлу"
-
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Налаштування веб-сервера"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr ""
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "Запустити amuleweb під час запуску"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Порт веб-сервера"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "Увімкнути UPnP перенаправлення портів для порту сервера тенет"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "UPnP TCP порт сервера тенет"
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "Звантажити файли в черзі"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "Час оновлення сторінки (с)"
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "Показувати поступ у відсотках"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "Дозволити Gzip-стиснення"
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "Показувати панель поступу"
 
-#: src/muuli_wdr.cpp:2477
-msgid "Enable Low rights User"
-msgstr "Ввімкнути користувача з низькими правами"
+#: src/muuli_wdr.cpp:2144
+msgid "Flat"
+msgstr "Плаский"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "Пароль повних прав"
+#: src/muuli_wdr.cpp:2150
+msgid "Round"
+msgstr "Круглий"
 
-#: src/muuli_wdr.cpp:2490
-msgid "Low rights password"
-msgstr "Пароль низьких прав"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "Автоматично впорядковувати файли (багато ресурсів CPU)"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Веб шаблон"
+#: src/muuli_wdr.cpp:2157
+msgid "aMule will sort the columns in your download list automatically"
+msgstr "aMule буде автоматично впорядковувати стовпці в переліку звантажень"
 
-#: src/muuli_wdr.cpp:2507
+#: src/muuli_wdr.cpp:2176
 msgid "External Connection Parameters"
 msgstr "Параметри зовнішніх з'єднань"
 
-#: src/muuli_wdr.cpp:2510
+#: src/muuli_wdr.cpp:2179
 msgid "Accept external connections"
 msgstr "Дозволити зовнішні з'єднання"
 
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"IP-адреса інтерфейса, що прослуховуватиметься\n"
-"(залиште порожнє, якщо всі)"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "IP-адреса інтерфейса:"
 
-#: src/muuli_wdr.cpp:2533
+#: src/muuli_wdr.cpp:2190
 msgid ""
 "Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
 "An empty field or 0.0.0.0 will mean any interface."
@@ -5735,75 +3788,116 @@
 "Введіть IP-адресу в вірному форматі a.b.c.d для прослуховування EC-"
 "інтерфейсу. Порожнє поле або 0.0.0.0 означатиме всі."
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "Порт TCP"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "Порт TCP:"
 
-#: src/muuli_wdr.cpp:2548
+#: src/muuli_wdr.cpp:2206
 msgid "Enable UPnP port forwarding on the EC port"
 msgstr "Ввімкнути UPnP перенаправлення для EC-порту"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "Пароль"
+
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Налаштування веб-сервера"
+
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "Запустити веб-сервер під час запуску"
+
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Веб шаблон"
+
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "Пароль повних прав"
+
+#: src/muuli_wdr.cpp:2243
+msgid "Enable Low rights User"
+msgstr "Ввімкнути користувача з низькими правами"
+
+#: src/muuli_wdr.cpp:2249
+msgid "Low rights password"
+msgstr "Пароль низьких прав"
+
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "Ввімкнути UPnP перенаправлення портів для порту веб-сервера"
+
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "UPnP TCP-порт веб-сервера (не обов'язково)"
+
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "Час оновлення сторінки (с)"
+
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "Дозволити Gzip-стиснення"
+
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "Гаразд"
+
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "Натисніть тут щоб застосувати зміни зроблені в налаштуваннях."
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "Скинути всі зміни внесені в налаштування."
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "Назва:"
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "Коментар:"
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "Вхідна тека:"
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "Змінити перевагу для нового призначеного файлу:"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "Не змінювати"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "Виберіть колір для цієї категорії (зараз вибрано):"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "Показати motd сервера після з'єднання ..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "Інфо сервера"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "Очистити"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
-msgstr "Натисніть цю кнопку, щоб очистити журнал."
-
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "Журнал aMule"
+msgstr "Натисніть цю кнопку, щоб очистити часопис."
 
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "Натисніть на кнопку щоб оновити перелік серверів з адреси..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "Перелік серверів"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
@@ -5811,43 +3905,55 @@
 "Введіть адресу файлу server.met та натисніть кнопку ліворуч щоб оновити "
 "перелік відомих серверів."
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "Додати сервер вручну: Назва"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "Введіть тут назву нового сервера"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Порт"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "Тут введіть IP-адресу сервера, використовуючи формат x.x.x.x."
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "Введіть тут порт сервера."
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "Додати сервер вручну (заповніть поля ліворуч)..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "Часопис aMule"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "Інфо сервера"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "Інфо eD2k"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Інфо Kad"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "Натисніть на цю кнопку щоб оновити перелік вузлів з URL..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "Вузли (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
@@ -5855,51 +3961,58 @@
 "Введіть адресу файлу nodes.dat та натисніть кнопку ліворуч щоб оновити "
 "перелік відомих вузлів. "
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "Статистика вузлів"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "Початковий запуск"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "Новий вузол"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP:"
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+#, fuzzy
+msgid "Bootstrap from known clients"
 msgstr ""
 "Початковий запуск\n"
 "відомого клієнта"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "Від'єднатися від Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "Інфо eD2k"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "Використовувати безпечну ідентифікацію користувача"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr ""
+"Рекомендовано ввімкнути цю опцію. Ви не отримаєте довіру якщо безпечна "
+"ідентифікація вимкнена."
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "Приховування протоколу"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "Підтримка приховування протоколу"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
@@ -5907,11 +4020,11 @@
 "Ця опція вмикає приховування протоколу та дозволяє aMule приймати приховані "
 "з'єднання від інших клієнтів."
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "Використовувати приховування для вихідних з'єднань"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
@@ -5919,11 +4032,11 @@
 "Ця опція вмикає приховування протоколу під час з'єдання з іншими клієнтами/"
 "серверами."
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "Приймати тільки приховані з'єднання"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5931,87 +4044,83 @@
 "Приймати приховані з'єднання. Будете мати менше джерел, але весь ваш трафік "
 "буде приховано"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "Опції файлу"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "Кожен"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "Жоден"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "Хто може бачити спільні файли:"
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "Хто може бачити мої спільні файли:"
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "Оберіть тих, хто може запитати перелік ваших спільних файлів."
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP-фільтрування"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "Фільтрувати клієнтів"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Ввімкнено фільтрування IP-адрес клієнтів, що визначені в файлі ~/.aMule/"
 "ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "Фільтрувати сервери"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr ""
 "Ввімкнено фільтрування IP-адрес серверів, що визначені в файлі ~/.aMule/"
 "ipfilter.dat."
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "Перезавантажити перелік"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr ""
 "Перезавантажити перелік IP-адрес для фільтрування з файлу ~/.aMule/ipfilter."
 "dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "URL:"
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "Оновити зараз"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "Автоматичне оновлення IP-фільтру після запуску"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "Рівень фільтра:"
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "Завжди відфільтровувати IP-адреси локальних мереж"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
-msgstr "Параноїдальна обробка адрес IP, що не збіглися"
+msgstr "Параноїдальна обробка IP-адрес, що не співпали"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
@@ -6019,34 +4128,22 @@
 "Відкинути пакет якщо IP-адреса клієнта відрізняється від IP-адреси з якої "
 "прийшов пакет. Використовуйте обережно."
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "Використовувати системний ipfilter.dat якщо наявний"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
 msgstr ""
 "Якщо не знайдено місцевий ipfilter.dat, дозволити використання системного."
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "Використовувати безпечну ідентифікацію користувача"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr ""
-"Рекомендовано ввімкнути цю опцію. Ви не отримаєте довіру якщо безпечна "
-"ідентифікація вимкнена."
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "Ввімкнути онлайн-підпис"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
@@ -6054,814 +4151,1281 @@
 "Ввімкнути запис файлу ОС, який може бути використано зовнішніми програмами "
 "для створення підписів та подібного."
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "Частота оновлення (с)"
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "Змінити частоту (в секундах) оновлень онлайн-підписів."
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "Каталог Online-підписів:"
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "Зберегти файл онлайн-підпису в: "
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr "Натисніть тут, щоб вибрати теку, що містить файли з онлайн-підписами."
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "Вимкнена/увімкнена"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "Фільтрувати вхідні повідомлення (окрім поточної розмови):"
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "Опції фільтрування:"
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "Фільтрувати всі повідомлення"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "Фільтрувати повідомлення від людей, що не в вашому переліку друзів"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "Фільтрувати повідомлення від невідомих клієнтів"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr ""
 "Фільтрувати повідомлення, що містять (використовуйте ',' для переліку):"
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr ""
 "додати слова, які aMule буде фільтрувати, та забороняти повідомлення, що їх "
 "містять"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "Показувати отримані повідомлення в часописі"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "Коментарі"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "Фільтрувати коментарі, що містять (використовуйте ',' для переліку):"
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "Автоматичне з'єднання з сервером без проксі"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "Включити авторизацію"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "Ввімкнути/вимкнути аутентифікацію з ім'ям/паролем"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "Ім'я користувача: "
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "Ім'я користувача для з'єднання з проксі"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "Пароль:"
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "Пароль для з'єднання з проксі"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "Ввімкнути проксі"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "Ввімкнути/вимкнути підтримку проксі"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "Тип проксі:"
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "Тип проксі з яким ви з'єднуєтесь"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
-msgstr "Назва вузла проксі:"
+msgstr "Хост проксі:"
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "Ім'я хосту проксі"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "Порт проксі:"
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "Порт проксі"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "Аутентифікація"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "Включити авторизацію"
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "Ввімкнути/вимкнути аутентифікацію з ім'ям/паролем"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "Ім'я користувача для з'єднання з проксі"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "Пароль:"
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "Пароль для з'єднання з проксі"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "Автоматичне з'єднання з сервером без проксі"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "З'єднатись з:"
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "Вхід до віддаленого aMule"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "Ім'я користувача"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "Запам'ятати ці налаштування"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
-msgstr "Увімкнути докладне ведення журналу."
+msgstr "Ввімкнути докладне ведення часопису."
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "Категорія повідомлення:"
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "Очікується..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "Додати зовнішні внесення"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "Повторити вибрані"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "Вилучити вибрані"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "Типи подій"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3348
+#, fuzzy
+msgid "Active Uploads"
+msgstr "Чинні вивантаження:"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr ""
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "Сховати спільні файли"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "Вибрати фільтр перегляду"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "Чинні вивантаження"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "Показати клієнтів"
+
+#: src/muuli_wdr.cpp:3422
+#, fuzzy
+msgid "Reload:"
+msgstr "Перезавантажити перелік"
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "Перезавантажити ваші спільні файли"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "Надіслати"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "Надіслати вказане повідомлення."
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "Закрити цю розмову."
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "З'єднатися з будь-яким сервером та/чи Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "Вікно мереж"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "Спільні файли"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "Вікно пошуку"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "Вимкнено [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "Вікно передавання файлів"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "байт"
+msgstr[1] "байти"
+msgstr[2] "байт"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "Вікно спільних файлів"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "кбайт"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "Вікно повідомлень"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "Тбайт"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "Вікно статистики"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "к"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "Вікно налаштувань"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "М"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "Нова категорія"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "Г"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "Виберіть теку для вхідних файлів"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "Т"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "Ви повинні визначити назву категорії"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "байт/с"
+msgstr[1] "байти/с"
+msgstr[2] "байт/с"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "Ви повинні визначити шлях категорії!"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "Мбайт/с"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "с"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "хв"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "год"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "діб"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "всі"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "всі інші"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "Незавершені"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "Зупинені"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "Відео"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "Архів"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "Текст"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "Чинні"
+
+#: src/OtherFunctions.cpp:1103
+#, c-format
+msgid "Using config dir: %s"
 msgstr ""
-"Неможливо створити вхідну теку для категорії. Будь ласка, вкажіть вірний "
-"шлях!"
 
-#: src/ExternalConnector.cpp:141
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "Очікується завершення потому перетворення часткового файлу..."
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "Невідоме розширення '%s' для команди '%s'.\n"
+msgid "Importing %s: %s"
+msgstr "Вноситься %s: %s"
+
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "Читається тимчасова тека"
+
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "Витягується основна інформація з інформації звантажуваного файла"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "Створюється файл призначення"
+
+#: src/PartFileConvert.cpp:327
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "Невідома команда '%s'.\n"
+msgid "Loading data from old download file (%u of %u)"
+msgstr "Завантажуються дані зі старого файлу звантажень (%u з %u)"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"Ця команда не може мати аргумент.\n"
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "Зберігається блок даних в новий один файл звантаження (%u з %u)"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"Ця команда повинна мати аргумент.\n"
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "Отримується інформація по джерелам звантажуваного файла"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "Додається звантаження та зберігається новий частковий файл"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "Вношу часткові файли"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "Стан"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "Хеш файлу"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (диск: %s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
 msgstr ""
-"\n"
-"Ця команда незавершена, ви повинні використати одне з розширень, що подані "
-"нижче.\n"
+"Будь ласка, виберіть теку з тимчасовими звантаженнями! (підтеки будуть "
+"додані)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
-"\n"
-"Доступні розширення:\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "Ви хочете, щоб джерела успішно внесених звантажень були видалені?"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "Доступні команди:\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "Видалити джерела?"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "ПОМИЛКА: Не вдалося створити частковий файл"
+
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"Всі команди розрізняють великі та малі літери.Введіть '%s <command>' щоб "
-"отримати докладну інформацію по <command>.\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "Спроба завантажити резервну копію met-файлу з %s"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "Вийти з програми."
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "ПОМИЛКА: Не вдалося відкрити файл part.met: %s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "Показати допомогу."
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "ПОМИЛКА: файл part.met має розмір 0: %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "ПОМИЛКА: Невірна версія файлу part.met: %s ==> %s"
+
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
 msgstr ""
-"Щоб отримати допомогу по команді, введіть 'help <command>'.\n"
-"Щоб отримати повний перелік команд, введіть ''help\".\n"
+"ПОМИЛКА: %s (%s) зіпсований (невірна кількість міток), неможливо завантажити "
+"файл."
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
 msgstr ""
-"\n"
-"Використовуйте '%s' для переліку команд\n"
-"\n"
+"ПОМИЛКА: %s (%s) зіпсований (невірна кількість міток), неможливо завантажити "
+"файл."
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "Помилка синтаксису!"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "Намагання відтворити інформацію файлу..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr ""
-"Помилка обробки команди - не повинно ніколи такого бути! Будь, ласка, "
-"повідомте про помилку\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "Відновлюється файл без назви - спроба відновити як RecoveredFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "Ця команда не повинна мати жодного параметру."
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "Відновлена вся доступна інформація файлу :D - спроба використати її..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "Ця команда повинна мати параметр."
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "Неможливо відтворити інформацію файлу"
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "Невірний аргумент."
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "Не вдалося відкрити %s (%s)"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "Це незавершена команда"
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "ЗАСТЕРЕЖЕННЯ: %s може бути зіпсований (%i)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "Напишіть '%s' щоб отримати більше допомоги.\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "ПОМИЛКА під час збереження часткового файлу: %s (%s ==> %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "Помилка введення-виведення під час збереження часткового файлу: "
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "Це %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "Неможливо отримати довжину '%s' - використовується файл %s."
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "Це %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' чомусь має нульовий розмір - використовується файл %s."
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "Не вдалося зберегти файл part.met.seeds для %s"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "Збережено %i джерело для часткового файлу: %s (%s)"
+msgstr[1] "Збережено %i джерела для часткового файлу: %s (%s)"
+msgstr[2] "Збережено %i джерел для часткового файлу: %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Частковий файл %s (%s) не має джерел"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Частковий файл %s (%s) має порожні файли-джерела "
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "Помилка читання файлу-джерела часткового файлу (%s - %s): %s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"Знайдена підробна частина (%d) в (%d) частковому файлі %s - FileResultHash |%"
+"s| FileHash |%s|"
+msgstr[1] ""
+"Знайдена підробна частина (%d) в (%d) часткових файлах %s - FileResultHash |%"
+"s| FileHash |%s|"
+msgstr[2] ""
+"Знайдена підробна частина (%d) в (%d) часткових файлах %s - FileResultHash |%"
+"s| FileHash |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "Знайдено завершену частину (%i) в %s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "Завершене повторне обчислення хешу: %s"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "Неочікувана помилка під час завершення %s. Файл призупинено"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "Завершене звантаження: %s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "Видаляється файл: %s"
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
 msgstr ""
-"\n"
-"Створюється клієнт...\n"
+"ЗАСТЕРЕЖЕННЯ: неможливо обчислити хеш звантаженого файлу - набір хешів "
+"неповний для '%s'"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"Добре, виходимо %s...\n"
+"ПОМИЛКА: неможливо обчислити хеш звантаженого файлу - набір хешів неповний (%"
+"s). Такого ніколи не повинно бути"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"Неможливо з'єднатися з пустим паролем.\n"
-"Ви повинні визначити пароль чи в файлі налаштувань\n"
-"чи в командному рядку, або ввести на запит.\n"
-"\n"
-"Вихід...\n"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "Показати цей текст допомоги."
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr ""
+"ЗАСТЕРЕЖЕННЯ: недостатньо вільного місця на диску! Призупиняється файл: %s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "Хост, де запущений aMule (за замовчуванням: localhost)."
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "Звантажена частина %i зіпсована в файлі: %s"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "Порт aMule для зовнішніх з'єднань (зазвичай: 4712)."
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "Р.О.П.: відновлено зіпсовану частину %i для %s -> Збережено байт: %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "Пароль зовнішнього з'єднання"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "Виділяється"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "Читати налаштування з файлу."
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "Не вистачає місця на диску"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "Не друкувати нічого до stdout."
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "Звантажені"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "Бути докладним - показувати також всі повідомлення зневадження."
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "ПОМИЛКА: не вдалося відкрити частковий файл '%s'"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "Вибрати локаль програми (мова)."
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "Мова системи"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "Записати параметри командного рядка до файлу налаштувань."
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "Албанська"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "Створити файл налаштувань оснований на файлі налаштувань aMule."
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "Арабська"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "Друкувати версію програми."
+#: src/Preferences.cpp:633
+#, fuzzy
+msgid "Asturian"
+msgstr "Естонська"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "Завантажено файл довіри, %u відомий клієнт"
-msgstr[1] "Завантажено файл довіри, %u відомі клієнти"
-msgstr[2] "Завантажено файл довіри, %u відомих клієнтів"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "Баскська"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - Довіра сплила для %u клієнта"
-msgstr[1] " - Довіра сплила для %u клієнтів"
-msgstr[2] " - Довіра сплила для %u клієнтів"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "Болгарська"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "Не знайдено 'cryptkey.dat', створюємо."
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "Каталонська"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "Китайська (спрощена)"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "Китайська (традиційна)"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "Хорватська"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "Чеська"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "Данська"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "Нідерландська"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "Англійська (Великобританія)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "Естонська"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "Фінська"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "Французька"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "Галісійська"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "Німецька"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "Грецька"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "Іврит"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "Угорська"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "Італійська"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "Італійська (Швейцарія)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "Японська"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "Корейська"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "Литовська"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "Норвезька (Нюнорск)"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "Польська"
+
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "Португальська"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "Португальська (Бразилія)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "Російська"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "Словенська"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "Іспанська"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "Шведська"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "Турецька"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "Українська"
+
+#: src/Preferences.cpp:728
+#, fuzzy
+msgid "Change Language"
+msgstr "Мова: "
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
+
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
+msgstr "Недоступний"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "немає наявних опцій"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "Знайдена помилкова категорія, пропущена"
 
-#: src/amuled.cpp:594
+#: src/Preferences.cpp:1766
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
 msgstr ""
-"ПОМИЛКА: демон aMule не може бути використаний з вимкненими зовнішніми "
-"з'єднаннями. Щоб ввімкнути зовнішні з'єднання, використовуйте або звичайний "
-"aMule, або amuled з опцією --ec-config, або ж встановіть "
-"\"AcceptExternalConnections\" в 1 в файлі ~/.aMule/amule.conf"
+"Порт TCP не може бути більшим ніж 65532, оскільки UDP-порт сервера є TCP+3"
 
-#: src/amuled.cpp:750
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "ERROR: %s"
-msgstr "ПОМИЛКА: %s"
+msgid "Default port will be used (%d)"
+msgstr "Буде використовуватися порт за замовчуванням (%d)"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "Зняти заборону"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "Показати вивантаження"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "Показати чергу"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr "Усунення неіснуючих спільних тек: %s"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "Показати клієнтів"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "З'єднання"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "Обрати вигляд"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "Програма клієнта"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "Очікуваний"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "Час вивантаження"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "Вивантаження/Звантаження"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "Віддалений стан"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "Рахунок черги: %u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "Перевага файлу"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "Теки"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "Рахунок"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "Сервери"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "Запитаний"
-
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "Востаннє побачений"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "Увійшов в чергу"
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "Файли"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "Стан вивантаження"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "Безпека"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "Вивантажується"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "Зовнішній вигляд"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "Стан звантаження"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "Проксі"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "Звантажується"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "Фільтри"
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "Хеш користувача"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "Зашифрований"
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "Віддалене керування"
 
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "Сховати спільні файли"
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "Онлайн-підпис"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "Подробиці клієнта"
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "Розширені"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "Дозволено"
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "Події"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "Підтримується"
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "Налагоджувач"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "Не підтримується"
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "Вимкнено"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"Не змінюйте ці налаштування, якщо не знаєте\n"
+"що робите, інакше ви можете легко\n"
+"собі нашкодити\n"
+"\n"
+"aMule чудово працює без зміни будь-яких\n"
+"з цих параметрів."
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f кбайт/с"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "Помилка з'єднання Cfg до Widget з ID %d та ключем %s"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "Незавершено"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr "Помилка передавання даних з Cfg до Widget з ID %d та ключем %s"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "Поганий хлопець"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "Тип проксі з яким ви з'єднуєтесь"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "Перевірено - гаразд"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr "Помилка передавання даних з Widget до Cfg з ID %d та ключем %s"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "Не наявний"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"aMule має бути перезапущений, щоб зміни подіяли:\n"
+"\n"
 
-#: src/ClientDetailDialog.cpp:215
-#, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (рахунок черги: %u)"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP-порт змінено.\n"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP-порт змінено.\n"
+
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "Зовнішнє з'єднання розірвано."
+
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "Дозволено нове зовнішнє з'єднання"
+
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "Зовнішнє з'єднання розірвано."
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
 msgstr ""
-"Найменший розмір має бути меншим ніж найбільший. Найбільшим розміром "
-"знехтувано."
+"Ваш перелік автоматичного оновлення серверів порожній.\n"
+"'Автоматичне оновлення серверів під час завантаження буде вимкнено."
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "Застереження пошуку"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"Ви увімкнули зовнішні з'єднання, але не визначили пароль.\n"
+"Зовнішні з'єднання не можуть бути ввімкнені поки не вказано вірний пароль."
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "Безмежно"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- Мова змінена.\n"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule Tray Menu"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- Тимчасова тека змінена.\n"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "Обмеження швидкостей:"
+#: src/PrefsUnifiedDlg.cpp:652
+#, fuzzy
+msgid "- ED2K network enabled.\n"
+msgstr "Всі мережі вимкнені."
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "Вивантаження: Немає"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"Обидві eD2k та Kad-мережі вимкнені.\n"
+"Ви не зможете з'єднатися поки не увімкнете хоча б одну з них"
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "Вивантаження: %u"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"Kad не розпочне роботу, якщо UDP-порт вимкнено.\n"
+"Увімкніть UDP-порт або вимкніть Kad"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "Звантаження: немає"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"Ви ЗОБОВ'ЯЗАНІ перезапустити aMule зараз.\n"
+"Якщо ж не перезапустите, не скаржтеся, коли станеться щось жахливе.\n"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "Звантаження: %u"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"Ваш перелік серверів автоматичного оновлення порожній.\n"
+"Будь ласка заповніть принаймні одну адресу, що посилається на існуючий файл "
+"server.met.\n"
+"Натисніть на кнопку \"Перелік\" щоб ввести адресу."
 
-#: src/MuleTrayIcon.cpp:368
-#, c-format
-msgid "Download speed: %.1f"
-msgstr "Швидкість звантаження: %.1f"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "Тимчасові файли"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "Вхідні файли"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "Онлайн-підписи"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "Швидкість вивантаження: %.1f"
+msgid "Choose a folder for %s"
+msgstr "Виберіть теку для %s"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "Інформація клієнта"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "Переглянути, щоб знайти відеопрогравач"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "Вибрати переглядач тенет"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "Nickname: %s"
-msgstr "Прізвисько: %s"
+msgid "Executable%s"
+msgstr "Виконуваний %s"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "Не вибрано прізвисько!"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "Редагувати перелік серверів"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "ID клієнта:"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"Додайте тут адреси файлів server.met.\n"
+"Тільки одна адреса на рядок."
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "Назва серверу: "
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "Затримка оновлення: %d секунда"
+msgstr[1] "Затримка оновлення: %d секунди"
+msgstr[2] "Затримка оновлення: %d секунд"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "IP серверу: "
+#: src/PrefsUnifiedDlg.cpp:1121
+#, c-format
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "Час усереднення графіків: %d хвилина"
+msgstr[1] "Час усереднення графіків: %d хвилини"
+msgstr[2] "Час усереднення графіків: %d хвилин"
 
-#: src/MuleTrayIcon.cpp:416
+#: src/PrefsUnifiedDlg.cpp:1127
 #, c-format
-msgid "IP: %s"
-msgstr "IP: %s"
+msgid "Connections Graph Scale: %d"
+msgstr "Зміна розміру графіка з'єднань: %d"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "TCP port: %d"
-msgstr "Порт TCP: %d"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "Розмір файлу буфера: %d байт"
+msgstr[1] "Розмір файлу буфера: %d байти"
+msgstr[2] "Розмір файлу буфера: %d байт"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "Порт TCP: не готовий"
+#: src/PrefsUnifiedDlg.cpp:1145
+#, c-format
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "Розмір черги вивантаження: %d клієнт"
+msgstr[1] "Розмір черги вивантаження: %d клієнти"
+msgstr[2] "Розмір черги вивантаження: %d клієнтів"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "UDP port: %d"
-msgstr "Порт UDP: %d"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "Інтервал оновлення з'єднання з сервером: %d хвилина"
+msgstr[1] "Інтервал оновлення з'єднання з сервером: %d хвилини"
+msgstr[2] "Інтервал оновлення з'єднання з сервером: %d хвилин"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "Порт UDP: не готовий"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "Інтервал оновлення з'єднання з сервером: вимкнено"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "Online-підпис: увімкнено"
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "вимкнено"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "Online-підпис: вимкнено"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "Виконати команду на подію '%s'"
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
-msgstr "Спільні файли: %d"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "Ввімкнути виконання команди в ядрі"
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
-msgstr "Клієнтів в черзі: %d"
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "Команда ядра:"
 
-#: src/MuleTrayIcon.cpp:476
-#, c-format
-msgid "Total DL: %s"
-msgstr "Всього звантажень: %s"
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "Ввімкнути виконання команд в ГІК"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "Команда ГІК:"
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "Наступні змінні будуть замінені:"
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr ""
+"Найменший розмір має бути меншим ніж найбільший. Найбільшим розміром "
+"знехтувано."
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "Очікування пошуку"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "Головна"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Пошук у Kad неможливо виконати коли Kad не працює"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "Пошук eD2k не може бути виконаний, якщо eD2k не з'єднана"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "Неочікувана помилка, коли намагаюсь шукати в Kad:"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "ID файлу"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "Файл"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "Звантажити в категорію"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "Додати додаткові URL-адреси для цього файлу"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "Пошук схожих файлів (eD2k, місцевий сервер)"
+
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "Позначити як відомий файл"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "Скопіювати eD2k посилання до буферу обміну"
+
+#: src/SearchListCtrl.cpp:1014
+#, fuzzy
+msgid "Canceled"
+msgstr "Скасувати"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr ""
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr ""
+"Не вдалося з'єднатися з усіма переліченими прихованими серверами. Робиться "
+"ще одна спроба без приховування."
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr ""
+"Не вдалося з'єднатися з усіма переліченими серверами. Робиться ще одна "
+"спроба."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "eD2k вимкнена в налаштуваннях, не з'єднується."
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr ""
+"Не знайдено справних серверів в переліку серверів з якими можна було "
+"з'єднатися"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "Всього вивантажень: %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "З'єднані з %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "Обмеження вивантаження"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "З'єднання встановлено з: %s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "Обмеження звантаження"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr ""
+"Жахлива помилка під час спроби з'єднання. З'єднання з Інтернет може бути "
+"відсутнє"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "Сховати aMule"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "Втрачене з'єднання з %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "Показати aMule"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) здається мертвий."
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "Розмову розпочато: %s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) здається заповнений."
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** З'єднано з клієнтом ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "Автоматичне з'єднання з сервером повториться через %d секунду"
+msgstr[1] "Автоматичне з'єднання з сервером повториться через %d секунди"
+msgstr[2] "Автоматичне з'єднання з сервером повториться через %d секунд"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** З'єднуюсь з клієнтом ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "Втрата з'єднання"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** Неможливо з'єднатись з клієнтом / з'єднання втрачено***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "З'єднання з %s (%s:%i) не вдалося."
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "Закрити вкладки"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "ПОМИЛКА: невірний сокет після сплину часу"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "Закрити всі вкладки"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "Спроба з'єднання з %s (%s:%i) добігла кінця."
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "Закрити інші вкладки"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "Отриманий застарілий наслідок запиту до DNS, відкидається."
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
-msgstr "Завантажується файл server.met: %s"
+msgstr "Завантажую файл server.met: %s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "Файл server.met не знайдено!"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "Неможливо завантажити файл server.met '%s', невірний формат."
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "Неможливо відкрити server.met!"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr ""
 "Файл server.met підробний, знайдена невірна мітка версії: 0x%x, розмір %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
@@ -6869,7 +5433,7 @@
 msgstr[1] "%i сервери знайдені в server.met"
 msgstr[2] "%i серверів знайдені в server.met"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
@@ -6877,27 +5441,36 @@
 msgstr[1] "Додано %d сервери"
 msgstr[2] "Додано %d серверів"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr ""
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "Помилка введення-виведення під час читання файлу known.met: %s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "Сервер не додано: [%s:%d] не визначив вірний порт."
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "Сервер не додано: IP-адреса [%s:%d] відфільтрована або неприпустима."
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr "Сервер не додано: сервер з такими ж IP:порт [%s:%d] вже в переліку."
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "Сервер додано: сервер на [%s:%d] використовуючи назву '%s'."
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
@@ -6905,25 +5478,25 @@
 "Ви з'єднані з сервером, який хочете видалити, будь ласка, роз'єднайтесь "
 "спочатку."
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "Не вдалося відкрити '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "Неможливо зберегти server.met!"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "Невірна URL-адреса"
 
-#: src/ServerList.cpp:805
-#, c-format
-msgid "Finished to download the server list from %s"
+#: src/ServerList.cpp:854
+#, fuzzy, c-format
+msgid "Finished downloading the server list from %s"
 msgstr "Завершилось звантаження переліку серверів з %s"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "Неможливо звантажити перелік серверів з %s"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6932,670 +5505,2372 @@
 "вставте вірний перелік адрес серверів в цей файл для того щоб автоматично "
 "оновити ваш перелік серверів"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "Починається звантаження переліку серверів з %s"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr ""
 "ЗАСТЕРЕЖЕННЯ: вказана невірна адреса для автоматичного оновлення серверів: %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr ""
 "Немає правильної адреси автоматичного звантаження server.met в addresses.dat"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "Неможливо звантажити перелік серверів з %s"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr "Місцевий сервер відфільтрований IPFilters, з'єднайтесь з іншим!"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "Не вдалося виконати команду `%s' на подію `%s'."
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "Назва сервера"
 
-#: src/amule.cpp:703
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "Адреса"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "Порт"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "Опис"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Час луни"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "Користувачі"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "Постійні"
+
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "Версія"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
 msgstr ""
-"Ваша локаль змінена на системну за замовчуванням із-за зміни налаштувань. "
-"Вибачте."
+"Ви з'єднані з сервером, який намагаєтесь видалити. Будь ласка, роз'єднайтеся "
+"спочатку. Сервер НЕ був видалений."
 
-#: src/amule.cpp:786
-msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(невідома назва)"
+
+#: src/ServerListCtrl.cpp:153
+#, c-format
+msgid "Are you sure you want to delete the static server %s"
+msgstr "Ви впевнені, що хочете видалити постійний сервер %s"
+
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "Сервери (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "Сервер"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "З'єднатися з сервером"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "Позначити сервер як постійний"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "Позначити сервер як непостійний"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "Позначити сервери як постійні"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "Позначити сервери як непостійні"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "Видалити сервер"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "Видалити сервери"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "Видалити всі сервери"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "Скопіювати eD2k посилання до буферу обміну"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "Перез'єднатись з сервером"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "Ви впевнені, що хочете видалити всі сервери?"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "Ви впевнені, що хочете видалити вибраний сервер?"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "Ви впевнені, що хочете видалити вибрані сервери?"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "ПОМИЛКА: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "ЗАСТЕРЕЖЕННЯ: %s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "Новий id клієнта %u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "ЗАСТЕРЕЖЕННЯ: ви отримали LowID!"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\tНайбільш ймовірно це тому, що ви за фаєрволом або маршрутизатором."
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
 msgstr ""
-"Ви не маєте жодного серверу в переліку серверів.\n"
-"Хочете, щоб aMule звантажив зараз новий?"
+"\tЗа додатковою інформацією, будь ласка, завітайте до http://wiki.amule.org"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "Звантажити перелік серверів"
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "Отримана невідома інформація про сервери! - занадто коротко"
 
-#: src/amule.cpp:846
+#: src/ServerSocket.cpp:535
 #, c-format
-msgid "web server running on pid %d"
-msgstr "Веб-сервер запущений з %d"
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "Отримано %d новий сервер"
+msgstr[1] "Отримано %d нові сервери"
+msgstr[2] "Отримано %d нових серверів"
 
-#: src/amule.cpp:850
-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"
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "Збереження переліку серверів завершено."
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "Сервер відхилив останню команду"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "З сервера отримано підробний пакет: %s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
 msgstr ""
-"Ви встановили запуск веб-сервера під час завантаження, але amuleweb не може "
-"бути запущено. Будь ласка, встановіть пакунок, що містить веб-сервер aMule, "
-"зберіть aMule з --enable-webserver та виконайте make install"
+"Помилка, що не може бути опрацьована, під час обробки пакету з сервера: %s"
 
-#: src/amule.cpp:937
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "Неможливо прив'язати порт до визначеної адреси: %s"
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "Неможливо створити потік DNS-запиту для з'єднання з %s"
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:725
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "Порт %u недоступний. Ви будете мати LowID\n"
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "IP-адреса сервера %s (%s) відфільтрована.  Не з'єднується."
 
-#: src/amule.cpp:970
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "використовується приховування протоколу."
+
+#: src/ServerSocket.cpp:744
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "З'єднуюсь з %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "Неможливо визначити DNS-назву для сервера: %s. Неможливо з'єднатися!"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "Сервер не додано: не задана ні адреса, ні назва."
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "Сервер не додано: неприпустимий порт."
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "Стан eD2k:"
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Стан Kademlia:"
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "Запущений на %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "Працює"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "Стан:"
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "Стан з'єднання:"
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
 msgstr ""
-"Порт %u недоступний!\n"
-"\n"
-"Це означає, що ви отримаєте LowID.\n"
-"\n"
-"Перевірте вашу мережу, щоб впевнитись, що порт відкритий."
+"За фаерволом - відкрийте порт TCP:%d на вашому маршрутизаторі або фаерволі"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "Неможливо створити файл онлайн-підпису"
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "Стан з'єднання UDP:"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "Неможливо створити файл онлайн-підпису aMule"
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr ""
+"За фаерволом - відкрийте порт UDP:%d на вашому маршрутизаторі або фаерволі"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "Стан фаєрволу:"
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "Не потрібен жоден друг: порт TCP відкритий"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "Не потрібен жоден друг: порт UDP відкритий"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "Немає друга"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "З'єднання з другом"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "З'єднання з другом на %s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "Проіндексовані джерела:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "Проіндексовані ключові слова:"
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "Проіндексовані нотатки:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "Проіндексовані завантаження:"
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "Середня кількість користувачів:"
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "Всередньому файлів:"
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "Не запущений"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "Додається файл %s до спільних"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "Знайдено %i новий спільний файл"
+msgstr[1] "Знайдено %i нові спільні файли"
+msgstr[2] "Знайдено %i нових спільних файлів"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "Знайдено %i відомий спільний файл, невідомих - %i"
+msgstr[1] "Знайдено %i відомі спільні файли, невідомих - %i"
+msgstr[2] "Знайдено %i відомих спільних файли, невідомих - %i"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "ПОМИЛКА: спроба зробити спільним %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "Спільна тека не знайдена, пропускаємо: %s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "Не знайдені спільні файли в теці: %s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+#, fuzzy
+msgid "User Name"
+msgstr "Ім'я користувача"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+#, fuzzy
+msgid "Download Speed"
+msgstr "Швидкість звантаження"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+#, fuzzy
+msgid "Upload Speed"
+msgstr "Швидкість вивантаження"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+#, fuzzy
+msgid "Available Parts"
+msgstr "Наявні:"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "Стан вивантаження"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "Стан звантаження"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr ""
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "Назва файлу"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "Спільні файли"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "Запитів"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "Прийняті запити"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "Передані дані"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "Відношення поширення"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "Отримані частини"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "Повних джерел"
 
-#: src/amule.cpp:1299
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "Шлях до теки"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "Додати коментар/рейтинг"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "Редагувати коментар/рейтинг"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "Змінити назву"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "Додати файли зі збірки до переліку передач"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "Скопіювати magnet-посилання до буферу обміну"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "Скопіювати eD2k-посилання до буферу обміну (джерело)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "Скопіювати eD2k-посилання до буферу обміну (джерело з шифруванням)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "Скопіювати eD2k-посилання до буферу обміну (назва хосту)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr "Скопіювати eD2k-посилання до буферу обміну (назва хосту з шифруванням)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "Скопіювати eD2k-посилання до буферу обміну (інформація AICH)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "Вам потрібно мати HighID щоб створити посилання на джерело"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "Спільні файли (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[частковий файл]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "Назва файлу"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "Вивантажені дані (сесія (всього)): %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "Всього службового трафіку (пакети): %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "Трафік запитів (пакети): %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "Трафік обміну джерелами (пакети): %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "Трафік з сервером (пакети): %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Трафік Kad (пакети): %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "Втрати на шифрування (UDP): %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "Активні вивантаження: %s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "Вивантаження очікують: %s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "Вього успішних сесій вивантаження: %s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "Всього невдалих сесій вивантаження: %s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "Середній час вивантаження: %s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "Звантажені дані (сесія (всього)): %s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "Знайдені джерела: %s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "Чинні звантаження (шматки): %s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "Відношення вивантажено/звантажено за сесію (всього): %s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "Середня швидкість звантаження (сесія): %s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "Середня швидкість вивантаження (сесія): %s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "Найбільша швидкість звантаження (сесія): %s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "Найбільша швидкість вивантаження (сесія): %s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "Перепід'єднань: %i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "Пройшло часу з останньої передачі: %s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "З'єднано з сервером з: %s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "Чинні з'єднання (приблизно): %i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "Досягнуто найбільшої кількості з'єднань: %s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "Середня кількість з'єднань (приблизно): %g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "Найбільше з'єднань (приблизно): %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "Клієнти"
+
+#: src/Statistics.cpp:786
+#, fuzzy, c-format
+msgid "Unknown: %s"
+msgstr "Невідомий розмір"
+
+#: src/Statistics.cpp:792
+#, fuzzy, c-format
+msgid "Filtered: %s"
+msgstr "Відфільтровані"
+
+# користувач
+#: src/Statistics.cpp:793
+#, fuzzy, c-format
+msgid "Banned: %s"
+msgstr "заборонений"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "Всього: %i Відомих: %i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "Робочі сервери: %i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "Неробочі сервери: %i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "Всього: %s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "Видалені сервери: %s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "Відфільтровані сервери: %s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "Користувачів на робочих серверах: %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "Файлів на робочих серверах: %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "Всього користувачів: %llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "Всього файлів: %llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "Навантаження на сервер: %.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "Кількість спільних файлів: %s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "Загальний розмір спільних файлів: %s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "Середній розмір файлу: %s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "Операційна система"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "Не отримана"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "Чинні з'єднання (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "Недоступний"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "Ніколи"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "Команда '%s' з pid '%d' завершилась з кодом стану '%d'."
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "Виконати <str> та вийти."
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "Невірний формат IP-адреси. Використовуйте xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
 msgstr ""
-"Обрана локаль здається не встановлена. (примітка: спроба встановити її в "
-"будь-якому випадку)"
+"Ця команда потребує аргумент. Вірні аргументи:  'all', назва файлу, або "
+"номер.\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "Оброблюється за хешем: "
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "Оброблюється на назвою файлу: "
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr "Ця команда потребує аргумент. Правильний аргумент: хеш файлу.\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "Невірне число\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "Невірний хеш (довжина має бути точно 32 символи)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "Запит невдалий з невідомою помилкою."
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "Дія була вдалою."
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "Ви запускаєте aMule %s вперше"
+msgid "Request failed with the following error: %s"
+msgstr "Запит невдалий з помилкою: %s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "Це тестова версія, оновлюється щодня, та\n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "Фільтрування IP для клієнтів %s.\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "Вимк."
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "Ввімк."
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "Фільтрування IP для серверів %s.\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "Поточний рівень IP-фільтра %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
 msgstr ""
-"ми не даємо жодної гарантії, якщо вона щось пошкодить, спалить ваш будинок,\n"
+"Обмеження смуги пропускання: вивантаження %u кб/с, звантаження: %u кб/с.\n"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "або вб'є собаку. Але вона *має бути* безпечною у використанні всюди.\n"
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "З'єднався з %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "Не з'єднується"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "за фаєрволом"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "гаразд"
+
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
-msgstr "Наступні опції були змінені в цьому випуску з причин безпеки:\n"
+"\n"
+"Download:\t%s"
+msgstr ""
+"\n"
+"Звантаження:\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* Ввімкнено підтримку приховування протоколу для вхідних та вихідних "
-"з'єднань.\n"
+"Вивантаження:\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* Вимкнено оновлення переліку серверів від іншого серверу та клієнтів.\n"
+"Клієнтів у черзі:\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"Для більш докладної інформації з питань цих змін, шукайте\n"
-"\"fake servers\" на aMule wiki (http://wiki.amule.org).\n"
-"Важливо, щоб ви видалили всі підробні сервери з переліку ваших\n"
-"серверів для правильної роботи aMule."
+"Всього джерел:\t%d\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "Кількість здобутків пошуку: %i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr ""
+
+#: src/TextClient.cpp:832
+#, fuzzy
+msgid "Search progress not available"
+msgstr "Показувати поступ у відсотках"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "Отримано невідому відповідь з серверу, OpCode = %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "Показати коротку інформацію про стан."
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr ""
+"Показати стан з'єднань, поточні швидкості вивантаження/звантаження, інше.\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "Показати повне дерево статистики."
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"Додатково, число з межах 0-255 може бути прийнято як аргумент для цієї\n"
+"команди, що повідомляє скільки елементів піддерева версій клієнта слід\n"
+"показувати. 0 або пусте значення означатимуть \"необмежено.\"\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"Наприклад: 'statistics 5' покаже тільки 5 найбільш частих номерів для "
+"кожного типу клієнта.\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "Завершити роботу aMule."
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"Вимкнути віддалено запущене ядро (amule/amuled).\n"
+"Це також вимкне текстові клієнти, оскільки вони непридатні\n"
+"без запущеного ядра.\n"
+
+#: src/TextClient.cpp:859
+#, fuzzy
+msgid "Reload the given object."
+msgstr "Перезавантажується отриманий об'єкт."
+
+#: src/TextClient.cpp:860
+#, fuzzy
+msgid "Reload shared files list."
+msgstr "Перезавантажується перелік спільних файлів."
+
+#: src/TextClient.cpp:862
+#, fuzzy
+msgid "Reload IP filtering table."
+msgstr "Перезавантажується IP фільтр з файлу."
+
+#: src/TextClient.cpp:863
+#, fuzzy
+msgid "Reload current IP filtering table."
+msgstr "Вибрати рівні IP-фільтрування."
+
+#: src/TextClient.cpp:864
+#, fuzzy
+msgid "Update IP filtering table from URL."
+msgstr "Перезавантажується IP фільтр з файлу."
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr ""
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "З'єднання з мережею."
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
+"З'єднатися з усіма мережами, що ввімкнені в налаштуваннях.\n"
+"Ви також можете додатково визначити адресу сервера у вигляді IP:порт\n"
+"щоб з'єднатись тільки з ним. IP-адреса повинна мати вигляд a.b.c.d версії "
+"IPv4\n"
+"або назва."
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "З'єднання тільки з eD2k."
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "З'єднання тільки з Kad."
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "Від'єднано тільки від мережі."
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "Це від'єднає від всіх мереж, до яких зараз під'єднано.\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "Від'єднано тільки від eD2k."
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "Від'єднано тільки від Kad."
+
+#: src/TextClient.cpp:877
+#, fuzzy
+msgid "Add an eD2k or magnet link to core."
+msgstr "Додає eD2k-посилання або magnet-посилання до ядра."
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
+"The magnet link must contain the eD2k hash and file length.\n"
+msgstr ""
+"eD2k-посилання, яке треба додати, може бути:\n"
+"*) посиланням на файл (ed2k://|file|...), буде додане до черги звантажень,\n"
+"*) посиланням на сервер (ed2k://|server|...), буде додане до переліку "
+"серверів,\n"
+"*) або посиланням на перелік серверів, в такому випадку всі сервери списку "
+"будуть\n"
+"   додані до переліку серверів.\n"
 "\n"
-"Додатково, налаштування переглядача тенет скинуті до за замовчуванням. Будь "
-"ласка, якщо потрібно, налаштуйте його ще раз.\n"
+"Magnet-посилання повинне містити eD2k-хеш та довжину файлу.\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "Встановити значення налаштувань."
+
+#: src/TextClient.cpp:883
+#, fuzzy
+msgid "Set IP filtering preferences."
+msgstr "Налаштувати IP-фільтри"
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "Ввімкнути IP фільтрування для клієнтів та серверів."
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "Вимкнути IP фільтрування для клієнтів та серверів."
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "Ввімкнути/вимкнути IP фільтрування для клієнтів."
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "Ввімкнути IP-фільтри для клієнтів."
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "Вимкнути IP-фільтри для клієнтів."
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "Ввімкнути/вимкнути IP фільтрування для серверів."
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "Ввімкнути IP-фільтри для серверів."
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "Вимкнути IP-фільтри для серверів."
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "Вибрати рівні IP-фільтрування."
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"Більше подробиць, підтримка та нові випуски можуть бути знайдені на нашій "
-"сторінці,\n"
+"Вірні рівні фільтрування в межах 0-255, і їх значення\n"
+"за замовчуванням(початкове) 127.\n"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "Встановити обмеження швидкостей."
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "Значення передане цій команді має бути в кб/с.\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "Встановити обмеження швидкості вивантаження."
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "Встановити обмеження швидкості звантаження."
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "Отримати та відобразити значення налаштувань."
+
+#: src/TextClient.cpp:905
+#, fuzzy
+msgid "Get IP filtering preferences."
+msgstr "Отримати налаштування IP-фільтра."
+
+#: src/TextClient.cpp:906
+#, fuzzy
+msgid "Get IP filtering state for both clients and servers."
+msgstr "Отримати стан IP-фільтра для клієнта і сервера."
+
+#: src/TextClient.cpp:907
+#, fuzzy
+msgid "Get IP filtering state for clients only."
+msgstr "Отримати стан IP-фільтра тільки для клієнта."
+
+#: src/TextClient.cpp:908
+#, fuzzy
+msgid "Get IP filtering state for servers only."
+msgstr "Отримати стан IP-фільтра тільки для сервера."
+
+#: src/TextClient.cpp:909
+#, fuzzy
+msgid "Get IP filtering level."
+msgstr "Вибрати рівні IP-фільтрування."
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "Отримати обмеження смуги пропускання."
+
+#: src/TextClient.cpp:913
+#, fuzzy
+msgid "Execute a search."
+msgstr "Виконати пошук у Kad"
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
 msgstr ""
-"на www.aMule.org, або у нашому IRC-каналі #aMule на irc.freenode.net.\n"
+"Вид пошуку має бути визначений одним з наступних:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Наприклад: 'search kad file' виконає пошук файлу \"file\" в Kad.\n"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "Не соромтеся повідомити про будь-які помилки на http://forum.amule.org"
+#: src/TextClient.cpp:915
+#, fuzzy
+msgid "Execute a global search."
+msgstr "Виконати глобальний пошук"
+
+#: src/TextClient.cpp:916
+#, fuzzy
+msgid "Execute a local search"
+msgstr "Виконати місцевий пошук"
+
+#: src/TextClient.cpp:917
+#, fuzzy
+msgid "Execute a kad search"
+msgstr "Виконати пошук у Kad"
+
+#: src/TextClient.cpp:919
+#, fuzzy
+msgid "Show the results of the last search."
+msgstr "Показати здобутки попереднього пошуку."
+
+#: src/TextClient.cpp:920
+#, fuzzy
+msgid "Return the results of the previous search.\n"
+msgstr "Повернути здобутки попереднього пошуку.\n"
+
+#: src/TextClient.cpp:922
+#, fuzzy
+msgid "Show the progress of a search."
+msgstr "Показати перебіг пошуку."
+
+#: src/TextClient.cpp:923
+#, fuzzy
+msgid "Show the progress of a search.\n"
+msgstr "Показати перебіг пошуку.\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "Почати звантаження файлу."
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"Тека для файлів онлайн-підпису НЕВІРНА!\n"
-"Онлайн-підпис буде ВИМКНЕНО поки ви не виправите це в налаштуваннях."
+"Потрібно вказати номер файлу з останнього пошуку.\n"
+"Наприклад:  'download 12'  розпочне звантаження файлу з номером 12 "
+"попереднього пошуку.\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "Призупинити звантаження."
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "Відновити звантаження."
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "Відмінити звантаження."
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "Встановити перевагу звантаження"
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "Встановити перевагу звантаження на низьку, звичайну або автоматичну.\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "Встановити перевагу низькою."
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "Встановити перевагу звичайною."
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "Встановити перевагу високою."
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "Встановити перевагу авто."
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "Показати черги/переліки."
+
+#: src/TextClient.cpp:950
+#, fuzzy
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr ""
+"Показати чергу звантаження та вивантаження, перелік серверів або перелік "
+"спільних файлів.\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "Показати чергу вивантаження."
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "Показати чергу звантаження."
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "Показати часопис."
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "Показати перелік серверів."
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "Очистити журнал."
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "Не вдалося виділити місце на диску для файлу '%s': %s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "Застаріла команда, використовуйте '%s' замість неї."
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "ПОМИЛКА: не можу відкрити файл журналу"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"Це застаріла команда та може бути видалена в майбутньому.\n"
+"Використовуйте '%s' замість неї.\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "ЗАСТЕРЕЖЕННЯ: журнал порожній. Щось негаразд."
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "Текстовий клієнт aMule"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "Журнал очищено"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "Перетворюється старий набір хешів AICH в '%s' до 64b в '%s'."
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "Повідомлення сервера: %s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "ЗАСТЕРЕЖЕННЯ: назва файлу '%s' невірна і буде змінена на '%s'."
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "Не вдалося звантажити перелік вузлів."
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr ""
+"ЗАСТЕРЕЖЕННЯ: файл '%s' вже існує, новий файл буде перейменований у '%s'."
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "Не вдалося відкрити звантажений файл перевірки версії"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr ""
+"Ви впевнені, що хочете відмінити або видалити всі файли в цій категорії?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "Файл перевірки версії зіпсований"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "Потрібне підтвердження"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "Ви використовуєте застарілу версію aMule!"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr ""
+
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "Забагато з'єднань"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "Всі інші"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "Вибрати фільтр перегляду"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "Додати категорію"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "Редагувати категорію"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "Видалити категорію"
 
-#: src/amule.cpp:1907
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "Ваша версія aMule %i.%i.%i, а остання %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "Не вдалося відкрити файл (%s), видаляю з переліку спільних файлів."
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "Остання версія може бути завжди знайдена на http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "Запитано набір хешів для невідомого файлу: %s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "ЗАСТЕРЕЖЕННЯ: Ваша версія aMuled застаріла: %i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "Відновлюється вивантаження файлу: %s"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "Ваша копія aMule оновлена."
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "Призупиняється вивантаження файлу: %s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "Неможливо звантажити файл перевірки версії"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "Не вдалося виконати команду `%s' на подію `%s'."
 
-#: src/amule.cpp:2025
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "Звантаження завершено"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "Повний шлях до файлу."
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "Ім'я файлу без шляху."
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "eD2k-хеш файлу."
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "Розмір файлу в байтах."
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "Загальний час звантаження."
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "Розпочато нову розмову"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "Відправник."
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "Немає місця"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "Розділ диску."
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "Помилка під час завершення"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "Користувачі: %s | Файли: %s"
+msgid "Processing file number %u: %s"
+msgstr "Кількість оброблених файлів %u: %s"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr ""
+"Ви запитали частковий хеш (використовується тільки для файлів розмір яких "
+"більше ніж 9.5 МБ"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "Користувачі: E: %s K: %s | Файли: E: %s K: %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> Файл не існує!\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "Не вибрано жодної мережі"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, створювач eD2k-посилань aMule"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "Ласкаво просимо!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "Вхідні параметри"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "Файл для обчислення хешу"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "Додати додаткові URL-адреси для цього файлу"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "Введіть тут файл, eD2k-посилання якого хочете обчислити"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"Введіть тут адресу, яку хочете додати до eD2k-посилання: Додати / в кінець, "
+"щоб дати змогу aLinkCreator долучити поточну назву файлу"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "Вилучити"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "Створити посилання з частковими хешами"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr ""
+"Допоможіть поширювати нові та рідкісні файли швидше за рахунок збільшення "
+"розміру посилання"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4-хеш файлу"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k-хеш файлу"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k-посилання"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "Зберегти"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "Скопіювати до буферу обміну"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "Відкрити"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "Відкрити файл, щоб обчислити його eD2k-посилання"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "Копіювати eD2k-посилання до буферу обміну"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "Зберегти як"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "Зберегти розраховане eD2k-посилання до файлу"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "Про aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "Виберіть файл eD2k-посилання якого потрібно обчислити"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "Не можу відкрити буфер обміну"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "Зараз немає що копіювати!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "Виберіть файл для обчисленого eD2k-посилання"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "Неможливо відкрити "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "Будь ласка, введіть непорожнє ім'я файлу"
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "Зараз немає що зберігати!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "Обчислення хешу..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator працює для вас"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "Обчислюється MD4-хеш..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "Обчислюються хеші eD2k..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "Скасовано!"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "З'єднано з %s %s"
+msgid "Done in %.2f s"
+msgstr "Виконано за %.2f с"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "Ви вже додали цю URL-адресу!"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "Будь ласка, введіть непустий URL-адресу"
+
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "З'єднується з %s"
+msgid "Unable to open %s"
+msgstr "Неможливо відкрити %s"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "Від'єднано від eD2k"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i діб %i год %i хв %i с"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad запущена."
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02uдіб %02uгод %02uхв %02uс"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad зупинена."
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02uгод %02uхв %02uс"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "З'єднано з Kad (все гаразд)"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02uхв %02uс"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "З'єднано з Kad (за фаєрволом)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02uс"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "Від'єднано від Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f байт"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.0f кбайт"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.0f Мбайт"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.0f Гбайт"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.0f Тбайт"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, aMule онлайн-статистика"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "Найбільша швидкість звантаження з тих пір як wxCas запущено"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr ""
+"Безумовна найбільша швидкість звантаження під час попереднього запуску wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "Система"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "Зупинити автоматичне оновлення"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "Зберегти зображення онлайн статистики"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "Надрукувати зображення онлайн статистики"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "Налаштування"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "Про wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "Розпочати автоматичне оновлення"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "Автоматичне оновлення зупинено"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "Автоматичне оновлення розпочато"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "Зберегти зображення статистики"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "Онлайн статистика aMule"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
+msgstr ""
+"Негаразди друку.\n"
+"Можливо ваша поточна друкарка не налаштована вірно?"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "Друк"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:414
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 msgstr ""
-"Мережа Kad не може бути використана якщо UDP-порт вимкнено в налаштуваннях, "
-"не починаю."
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Мережа Kad вимкнена в налаштуваннях, не з'єднуюсь."
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "aMule не запущений..."
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "Неможливо відкрити перелік друзів 'emfriends.met' для читання!"
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule запущений"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "Неможливо відкрити перелік друзів 'emfriends.met' для запису!"
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule запущений, але від'єднаний"
 
-#~ msgid "Now, exiting main app..."
-#~ msgstr "Тепер, виходимо з головної програми..."
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule з'єднується..."
 
-#~ msgid "Killing amuleweb instance with pid `%ld' ... "
-#~ msgstr "Вбиваю екземпляр amuleweb з pid `%ld' ... "
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "Стан aMule невідомий..."
 
-#~ msgid "Killed!"
-#~ msgstr "Вбитий!"
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule"
 
-#~ msgid "aMule OnExit: Terminating core."
-#~ msgstr "aMule OnExit: Завершується core."
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " працює "
 
-#~ msgid "aMule shutdown completed."
-#~ msgstr "Завершення роботи aMule закінчене."
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " зупинений!"
 
-#~ msgid "Memory debug results for aMule exit:"
-#~ msgstr "Наслідки зневадження пам'яті для виходу aMule:"
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr " не з'єднаний!"
 
-#~ msgid ""
-#~ "\n"
-#~ "EC configuration"
-#~ msgstr ""
-#~ "\n"
-#~ "Налаштування зовнішніх з'єднань"
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " з'єднується..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " робить щось дивне, перевірте!"
 
-#~ msgid "Password set and external connections enabled."
-#~ msgstr "Пароль встановлений та дозволені зовнішні з'єднання."
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " з'єднався з "
 
-#~ msgid "Using amuleweb in '%s'."
-#~ msgstr "Використовується amuleweb у '%s'."
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad: "
 
-#~ msgid "Server hostname notified"
-#~ msgstr "Назва сервера повідомлена"
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "вимкнено"
 
-#~ msgid ""
-#~ "ERROR: A valid password is required to use external connections, and "
-#~ "aMule daemon cannot be used without external connections. To run aMule "
-#~ "deamon, you must set the \"ECPassword\" field in the file ~/.aMule/amule."
-#~ "conf with an appropriate value. Execute amuled with the flag --ec-config "
-#~ "to set the password. More information can be found at http://wiki.amule."
-#~ "org"
-#~ msgstr ""
-#~ "ПОМИЛКА: необхідний вірний пароль, щоб використовувати зовнішні "
-#~ "з'єднання, і демон aMule не може бути використаний без зовнішніх "
-#~ "з'єднань. Щоб запустити демон aMule, ви маєте встановити відповідне "
-#~ "значення у полі \"ECPassword\" у файлі ~/.aMule/amule.conf. Виконайте "
-#~ "amuled  з параметром --ec-config, щоб встановити пароль. Більше "
-#~ "інформації можете знайти на http://wiki.amule.org"
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " ввімкнено "
 
-#~ msgid "amuled: OnInit - starting timer"
-#~ msgstr "amuled: OnInit - запускається timer"
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " з "
 
-#~ msgid "amuled: forking to background - see you"
-#~ msgstr "amuled: переходимо у фоновий режим - до зустрічі"
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "Всього звантажень: "
 
-#~ msgid "Shutting down aMule..."
-#~ msgstr "Завершення роботи aMule..."
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr ", вивантажень: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "Сесія звантаження: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "Звантаження: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " кбайт/с, вивантаження: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " кбайт/с"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "Спільні файли: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " файл(ів), клієнтів у черзі: "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "Час: "
 
-#~ msgid "aMule dialog destroyed"
-#~ msgstr "Діалог aMule знищений"
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " ввімкнено "
 
-#~ msgid "Launch Command: "
-#~ msgstr "Команда для запуску: "
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "Середня завантаженість системи (1-5-15 хв): "
 
-#~ msgid "aMule remote control"
-#~ msgstr "Віддалене керування aMule"
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "Час роботи системи: "
 
-#~ msgid "Fatal Error: Failed to create Core Timer"
-#~ msgstr "Жахлива помилка: не вдалося створити Core Timer"
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "Тека, що містить файл amulesig.dat"
 
-#~ msgid "Fatal Error: Failed to create Poll Timer"
-#~ msgstr "Жахлива помилка: не вдалося створити Poll Timer"
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "Введіть тут теку, де знаходиться файл amulesig.dat"
 
-#~ msgid "Going to event loop..."
-#~ msgstr "Переходимо до циклу обробки подій..."
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "Час оновлення в секундах"
 
-#~ msgid "Connecting..."
-#~ msgstr "З'єднання..."
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "Створювати зображення статистики під час кожного оновлення"
 
-#~ msgid "Remote GUI EC event handler"
-#~ msgstr "Віддалений обробник подій зовнішніх з'єднань графічного інтерфейсу"
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "Введіть назву теки, де б ви хотіли зберігати зображення статистики"
 
-#~ msgid "Going down"
-#~ msgstr "Вимикається"
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "Вивантажувати час від часу ваші зображення статистики на FTP-сервер"
 
-#~ msgid "Ready"
-#~ msgstr "Готовий"
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP-адреса"
 
-#~ msgid "Searching buddy for lowid connection"
-#~ msgstr "Шукається друг для lowid-з'єднання"
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP-шлях"
 
-#~ msgid "Part"
-#~ msgstr "Частина"
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "Введіть тут адресу вашого FTP-сервера"
 
-#~ msgid "Saving PartFile %u of %u"
-#~ msgstr "Зберігається частковий файл %u з %u"
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr ""
+"Введіть тут теку, куди будуть складатися зображення зі статистикою на FTP-"
+"сервері"
 
-#~ msgid "All PartFiles Saved."
-#~ msgstr "Всі часткові файли збережені."
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "Користувач"
 
-#~ msgid "Loading temp files from %s."
-#~ msgstr "Завантаження тимчасових файлів з %s."
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "Введіть тут ім'я користувача для входу на ваш FTP-сервер"
 
-#~ msgid "Loading PartFile %u of %u"
-#~ msgstr "Завантажуються частковий файл %u з %u"
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "Введіть тут пароль входу на ваш FTP-сервер"
 
-#~ msgid "All PartFiles Loaded."
-#~ msgstr "Всі часткові файли завантажені."
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "Час оновлення FTP в хвилинах"
 
-#~ msgid "Failed to open ED2KLinks file."
-#~ msgstr "Не вдалося відкрити файл ED2KLinks."
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "Перевірити"
 
-#, fuzzy
-#~ msgid "Client sent packet after authentication failed."
-#~ msgstr "Аутентифікація не вдалася."
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "Тека, що містить файл з вашим підписом"
 
-#~ msgid "CRITICAL - no client on StartChatSession"
-#~ msgstr "КРИТИЧНО - немає клієнта на StartChatSession"
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "Тека, де створюються зображення статистики"
 
-#~ msgid "HTTP download cancelled"
-#~ msgstr "HTTP завантаження скасоване"
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "Завантажується зразок <str>"
 
-#~ msgid "HTTP download thread started"
-#~ msgstr "Потік звантаження HTTP розпочатий"
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "HTTP порт веб-сервера"
 
-#~ msgid "Download size: %i"
-#~ msgstr "Розмір звантаження: %i"
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "Використовувати перенаправлення UPnP-портів на порт веб-сервера"
 
-#~ msgid "HTTP download thread ended"
-#~ msgstr "Потік звантаження HTTP завершений"
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP порт"
 
-#~ msgid "Host: %s:%i\n"
-#~ msgstr "Хост: %s:%i\n"
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "Використовувати gzip-стиснення"
 
-#~ msgid "Response: %i (Error: %i)"
-#~ msgstr "Відповідь: %i (Помилка: %i)"
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Пароль повного доступу для веб-сервера"
 
-#~ msgid "WARNING: Void response on stream creation"
-#~ msgstr "ЗАСТЕРЕЖЕННЯ: порожня відповідь під час створення потоку"
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Пароль гостя веб-сервера"
 
-#~ msgid "ERROR: Redirection code received with no URL"
-#~ msgstr "ПОМИЛКА: Отриманий код перенаправлення без URL-адреси"
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "Дозволити гостьовий доступ"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "Заборонити гостьовий доступ"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "Завантажити/записати налаштування веб-сервера з/до віддаленого aMule"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "Шлях до файлу налаштувань aMule. НЕ ВИКОРИСТОВУЙТЕ БЕЗПОСЕРЕДНЬО!"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "Вимкнути інтерпретатор PHP (застаріло)"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "Перекомпілювати PHP-сторінки під час кожного запиту"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "Веб-сервер aMule"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "з'єднання веб-клієнта прийнято\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "ПОМИЛКА: неможливо прийняти з'єднання веб-клієнта\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "Запит невдалий з наступною помилкою: %s."
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "Файл індексу не знайдено:"
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "Сесія добігла кінця - запитуємо новий вхід\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "Сесія в порядку, входимо\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "Сесія в порядку, не увійшли\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "Немає відкритих сесій, буде запитано вхід\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "Сесію створено - запит на вхід\n"
 
-#~ msgid "Download new GeoIP.dat from %s"
-#~ msgstr "Звантажую новий GeoIP.dat з %s"
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "Оброблюю запит [початковий]: "
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr ""
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "Перевіряється пароль\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "Неправильний хеш пароля\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "Пароль правильний\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "Пароль неправильний\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "Ви не ввели жодного паролю. Порожній пароль не дозволено.\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "Запитано вихід\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "Обробляється запит [перенаправлений]:"
 
 #, fuzzy
-#~ msgid "Download of GeoIP.dat file failed, aborting update."
-#~ msgstr "Неможливо видалити файл GeoIP.dat, оновлення зірване."
+#~ msgid "Romanian"
+#~ msgstr "Албанська"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "Стан звантаження"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
 
-#~ msgid "Failed to remove GeoIP.dat file, aborting update."
-#~ msgstr "Неможливо видалити файл GeoIP.dat, оновлення зірване."
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
 
-#~ msgid "Failed to rename new GeoIP.dat file, aborting update."
-#~ msgstr "Неможливо змінити назву нового файлу GeoIP.dat, оновлення зірване."
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "Затримка оновлення: %d секунда"
+#~ msgstr[1] "Затримка оновлення: %d секунди"
+#~ msgstr[2] "Затримка оновлення: %d секунд"
 
-#~ msgid "Successfully updated GeoIP.dat"
-#~ msgstr "Успішно оновлено GeoIP.dat"
+#~ msgid "Transferring"
+#~ msgstr "Передавання"
 
-#~ msgid "Error updating GeoIP.dat"
-#~ msgstr "Помилка оновлення GeoIP.dat"
+#, fuzzy
+#~ msgid "QR: ???"
+#~ msgstr "Рахунок черги: %u"
+
+#~ msgid "QR: %u"
+#~ msgstr "Рахунок черги: %u"
+
+#, fuzzy
+#~ msgid "Queue Rank"
+#~ msgstr "В черзі"
 
-#~ msgid "Failed to download GeoIP.dat from %s"
-#~ msgstr "Не вдалося звантажити GeoIP.dat з %s"
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "TODO - показати поступ пошуку"
 
-#~ msgid "Keyword for search: %s"
-#~ msgstr "Ключове слово для пошуку: %s"
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "Починається створення MD4 та AICH хешів для файлу: %s"
 
-#~ msgid "Kademlia: Search keyword is already on search list: "
-#~ msgstr "Kademlia: пошукове слово вже в переліку пошуку: "
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "Починається створення MD4 хеша для файлу: %s"
 
-#~ msgid "No contacts found, please bootstrap, or download a nodes.dat file."
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "Починається створення AICH хеша для файлу: %s"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
 #~ msgstr ""
-#~ "Не знайдено жодного контакту, будь ласка, здійсніть початковий запуск або "
-#~ "звантажте файл nodes.dat"
+#~ "ЗАСТЕРЕЖЕННЯ: неможливо перенести початковий '%s' після створення "
+#~ "резервної копії"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "ЗАСТЕРЕЖЕННЯ: неможливо видалити %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (рахунок черги: %u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "Оцінка (всього):"
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "Спробувати передати повні шматки до всіх вивантажень"
+
+#~ msgid "Networks window"
+#~ msgstr "Вікно мереж"
+
+#~ msgid "Searches window"
+#~ msgstr "Вікно пошуку"
 
 #, fuzzy
-#~ msgid "External Connection: Handshake failed."
-#~ msgstr "Зовнішнє з'єднання: в доступі відмовлено"
+#~ msgid "Downloads window"
+#~ msgstr "Звантажується"
+
+#~ msgid "Shared files window"
+#~ msgstr "Вікно спільних файлів"
+
+#~ msgid "Messages window"
+#~ msgstr "Вікно повідомлень"
 
-#~ msgid "ListenSocket: Ok."
-#~ msgstr "ListenSocket: Гаразд."
+#~ msgid "Statistics graph window"
+#~ msgstr "Вікно статистики"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "Вікно налаштувань"
 
 #~ msgid "Traybar-icon lost, trying to recreate ..."
 #~ msgstr "Піктограма в системному лотку втрачена, спроба створити знову ..."
 
-#~ msgid "seconds"
-#~ msgstr "с"
+#~ msgid "Transfers"
+#~ msgstr "Передачі"
 
-#~ msgid ""
-#~ "Enter your browser name here. Leave this field empty to use the system "
-#~ "default browser."
-#~ msgstr ""
-#~ "Введіть тут назву вашого переглядача тенет. Залиште це поле порожнім, щоб "
-#~ "використовувати переглядач встановлений за замовчуванням."
+#~ msgid "Files transfers window"
+#~ msgstr "Вікно передачі файлів"
 
-#~ msgid "Ports"
-#~ msgstr "Порти"
+#~ msgid "Unban"
+#~ msgstr "Зняти заборону"
 
-#~ msgid "4665"
-#~ msgstr "4665"
+#~ msgid "Show Uploads"
+#~ msgstr "Показати вивантаження"
 
-#~ msgid "Extended UDP port (Kad / global search) "
-#~ msgstr "Розширений порт UDP (Kad / глобальний пошук)"
+#~ msgid "Show Queue"
+#~ msgstr "Показати чергу"
 
-#~ msgid "Enable UPnP for router port forwarding"
-#~ msgstr "Ввімкнути UPnP для перенаправлення портів"
+#~ msgid "Select View"
+#~ msgstr "Обрати вигляд"
 
-#~ msgid "Bind local address to IP (empty for any):"
-#~ msgstr "Використовувати IP-адресу (пусто для будь-якої):"
+#~ msgid "Client Software"
+#~ msgstr "Програма клієнта"
 
-#~ msgid ""
-#~ "Advanced users only: If you have multiple network interfaces, enter the "
-#~ "address of the interface to which aMule should be bound."
-#~ msgstr ""
-#~ "Тільки досвідченим користувачам: якщо ви маєте багато мережевих "
-#~ "інтерфейсів, введіть адресу інтерфейсу до якого слід прив'язатися aMule."
+#~ msgid "Waited"
+#~ msgstr "Чекає"
 
-#~ msgid "Max simultaneous connections:"
-#~ msgstr "Найбільше одночасних з'єднань:"
+#~ msgid "Upload Time"
+#~ msgstr "Час вивантаження"
 
-#~ msgid "Intelligent Corruption Handling (I.C.H.)"
-#~ msgstr "Розумна обробка пошкоджень (Р.О.П.)"
+#~ msgid "Upload/Download"
+#~ msgstr "Вивантаження/Звантаження"
 
-#~ msgid "Stop downloads when free disk space reaches "
-#~ msgstr "Припинити звантаження коли вільне місце на диску досягнуло "
+#~ msgid "Remote Status"
+#~ msgstr "Віддалений стан"
 
-#~ msgid "Destination folder for downloads"
-#~ msgstr "Тека призначення для звантажень"
+#~ msgid "File Priority"
+#~ msgstr "Перевага файлу"
 
-#~ msgid "Folder for temporary download files"
-#~ msgstr "Тека для тимчасових звантажуваних файлів"
+#~ msgid "Score"
+#~ msgstr "Рахунок"
 
-#~ msgid "Shared folders"
-#~ msgstr "Спільні теки"
+#~ msgid "Asked"
+#~ msgstr "Запитаний"
 
-#~ msgid "Download graph scale:"
-#~ msgstr "Шкала графіку звантаження"
+#~ msgid "Last Seen"
+#~ msgstr "Востаннє побачений"
 
-#~ msgid "Upload graph scale:"
-#~ msgstr "Шкала графіку вивантаження"
+#~ msgid "Entered Queue"
+#~ msgstr "Увійшов в чергу"
 
-#~ msgid "Colours: "
-#~ msgstr "Кольори:"
+#~ msgid "Transferred Up"
+#~ msgstr "Вивантажується"
 
-#~ msgid "Tree"
-#~ msgstr "Дерево"
+#~ msgid "Transferred Down"
+#~ msgstr "Звантажується"
 
-#~ msgid "Skin to use: "
-#~ msgstr "Використати шкіру: "
+#~ msgid "Userhash"
+#~ msgstr "Хеш користувача"
 
-#~ msgid "- default -"
-#~ msgstr "- за замовчуванням -"
+#~ msgid "Encrypted"
+#~ msgstr "Зашифрований"
 
-#~ msgid "Before application name"
-#~ msgstr "Перед назвою програми"
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "Завантажено %d зображень прапорів."
 
-#~ msgid "After application name"
-#~ msgstr "Після назви програми"
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "Показати черги вивантаження/звантаження"
 
-#~ msgid "Web server UPnP TCP port (Optional)"
-#~ msgstr "UPnP TCP-порт веб-сервера (не обов'язково)"
+#~ msgid "Clients on queue :"
+#~ msgstr "Клієнтів у черзі:"
 
-#~ msgid "Save online signature file in: "
-#~ msgstr "Зберегти файл онлайн-підпису в: "
+#~ msgid "Current Session"
+#~ msgstr "Поточна сесія"
 
-#~ msgid "Show received messages in the log"
-#~ msgstr "Показувати отримані повідомлення в часописі"
+#~ msgid "Total"
+#~ msgstr "Всього"
 
-#~ msgid "Username: "
-#~ msgstr "Ім'я користувача: "
+#~ msgid "Requested :"
+#~ msgstr "Запитані:"
 
-#~ msgid "Waiting for partfile convert thread to die..."
-#~ msgstr "Очікується завершення потому перетворення часткового файлу..."
+#~ msgid "Create backup for preview"
+#~ msgstr "Створити копію для перегляду"
 
-#~ msgid "Fetching status..."
-#~ msgstr "Отримується стан..."
+#~ msgid "Files Transfers Window"
+#~ msgstr "Вікно передавання файлів"
 
-#~ msgid "IO failure while saving partfile: "
-#~ msgstr "Помилка введення-виведення під час збереження часткового файлу: "
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "Вього користувачів: %s | Всього файлів: %s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "Потік звантаження HTTP розпочатий"
+
+#~ msgid "Download size: %i"
+#~ msgstr "Розмір звантаження: %i"
 
-#~ msgid "Invalid category found, skipping"
-#~ msgstr "Знайдена помилкова категорія, пропущена"
+#~ msgid "HTTP download thread ended"
+#~ msgstr "Потік звантаження HTTP завершений"
 
-#~ msgid "Dropping non-existing shared directory: %s"
-#~ msgstr "Усунення неіснуючих спільних тек: %s"
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "Хост: %s:%i\n"
 
-#~ msgid "Failed to connect Cfg to widget with the ID %d and key %s"
-#~ msgstr "Помилка з'єднання Cfg до Widget з ID %d та ключем %s"
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "Відповідь: %i (Помилка: %i)"
 
-#~ msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
-#~ msgstr "Помилка передавання даних з Cfg до Widget з ID %d та ключем %s"
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "ЗАСТЕРЕЖЕННЯ: порожня відповідь під час створення потоку"
 
-#~ msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
-#~ msgstr "Помилка передавання даних з Widget до Cfg з ID %d та ключем %s"
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "ПОМИЛКА: Отриманий код перенаправлення без URL-адреси"
 
-#~ msgid "Received late result of DNS lookup, discarding."
-#~ msgstr "Отриманий застарілий наслідок запиту до DNS, відкидається."
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country(): неможливо завантажити дані країн з "
 
-#~ msgid "Firewalled - open TCP port %d in your router or firewall"
-#~ msgstr ""
-#~ "За фаерволом - відкрийте порт TCP:%d на вашому маршрутизаторі або фаерволі"
+#~ msgid "Get IPFilter level."
+#~ msgstr "Отримати рівень IP-фільтра."
 
-#~ msgid "UDP Connection State:"
-#~ msgstr "Стан з'єднання UDP:"
+#~ msgid "Makes a search."
+#~ msgstr "Робить пошук."
 
-#~ msgid "Firewalled - open UDP port %d in your router or firewall"
-#~ msgstr ""
-#~ "За фаерволом - відкрийте порт UDP:%d на вашому маршрутизаторі або фаерволі"
+#~ msgid "Killed!"
+#~ msgstr "Вбитий!"
 
-#~ msgid "No buddy required - TCP port open"
-#~ msgstr "Не потрібен жоден друг: порт TCP відкритий"
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "Використовується amuleweb у '%s'."
 
-#~ msgid "No buddy required - UDP port open"
-#~ msgstr "Не потрібен жоден друг: порт UDP відкритий"
+#~ msgid "Shutting down aMule..."
+#~ msgstr "Завершення роботи aMule..."
 
-#~ msgid "Connected to buddy at %s"
-#~ msgstr "З'єднання з другом на %s"
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr "Наступні опції були змінені в цьому випуску з причин безпеки:\n"
 
-#~ msgid "Indexed sources:"
-#~ msgstr "Проіндексовані джерела:"
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Ввімкнено підтримку приховування протоколу для вхідних та вихідних "
+#~ "з'єднань.\n"
 
-#~ msgid "Indexed keywords:"
-#~ msgstr "Проіндексовані ключові слова:"
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* Вимкнено оновлення переліку серверів від іншого серверу та клієнтів.\n"
 
-#~ msgid "Indexed notes:"
-#~ msgstr "Проіндексовані нотатки:"
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "Для більш докладної інформації з питань цих змін, шукайте\n"
+#~ "\"fake servers\" на aMule wiki (http://wiki.amule.org).\n"
+#~ "Важливо, щоб ви видалили всі підробні сервери з переліку ваших\n"
+#~ "серверів для правильної роботи aMule."
 
-#~ msgid "Indexed load:"
-#~ msgstr "Проіндексовані завантаження:"
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Додатково, налаштування переглядача тенет скинуті до за замовчуванням. "
+#~ "Будь ласка, якщо потрібно, налаштуйте його ще раз.\n"
 
-#~ msgid "Adding file %s to shares"
-#~ msgstr "Додається файл %s до спільних"
+#~ msgid "Fetching status..."
+#~ msgstr "Отримується стан..."
 
-#~ msgid "Shared directory not found, skipping: %s"
-#~ msgstr "Спільна тека не знайдена, пропускаємо: %s"
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "Користувачі: E: %s K: %s | Файли E: %s K: %s"
 
-#~ msgid "No shareable files found in directory: %s"
-#~ msgstr "Не знайдені спільні файли в теці: %s"
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "Клієнт %s на IP:Port %s:%d використовує %s %s %s"
 
-#~ msgid "Unknown: %s"
-#~ msgstr "Невідомий: %s"
+#~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
+#~ msgstr "theApp->serverlist->GetServerByAddress() повернув NULL"
 
-#~ msgid "Filtered: %s"
-#~ msgstr "Відфільтрований: %s"
+#~ msgid "Firewalled"
+#~ msgstr "За фаєрволом"

aMule-2.2.6.tar.bz2/po/zh_CN.po -> aMule-2.3.1.tar.bz2/po/zh_CN.po Changed

@@ -1,1300 +1,1110 @@
 # Chinese translation of aMule.
-# Copyright (C) YEAR Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
+#
 # Chen Nan, 2004.
 # xiaoqiao <29551030@qq.com>, 2007, 2008.
+# JimHu <jimhuyiwei@gmail.com>, 2009.
+# Xiaoqiao <wo@xiaoqiao.me>, 2010.
+# Yi Qi <u4781098@anu.edu.au>,2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: aMule 2.2.6\n"
+"Project-Id-Version: aMule 2.2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2008-06-08 23:30+0800\n"
-"Last-Translator: 小桥 <29551030@qq.com>\n"
-"Language-Team: 小桥 <29551030@qq.com>\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.0\n"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "您必须输入密码"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "添加好友"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "非法密码，不是合法的MD5校验码"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "请输入正确 IP 地址和端口！"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "连接失败"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "信息"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "远程连接失败，回复为空。"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "该用户编码无效！"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "远程连接：访问被拒绝，原因："
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "打开 ED2K 链接文件失败。"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "远程连接：请求被拒绝"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "远程连接：服务器错误回复，已断开连接。"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr "警告：在低 ID 的情况下，你不能添加自己作为 ed2k 链接的源。"
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "成功！已连接至aMule"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "现在，正在退出主程序..."
 
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "已成功连接。"
+#: src/amule.cpp:258
+#, fuzzy, c-format
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "杀死 pid 为 '%ld' 的 amuleweb 进程..."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "正在校检"
+#: src/amule.cpp:261
+#, fuzzy, c-format
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "杀死 pid 为 '%ld' 的 amuleweb 进程..."
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "正在完成"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "失败"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "完成"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule 正在退出：中止内核。"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "已暂停"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "aMule 已经关闭。"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "已出错"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "aMule 退出的内存 Debug 结果："
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "正在下载"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+"\n"
+"EC 配置"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "等待中"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "密码已设置，启用远程连接。"
 
-#: src/ThreadTasks.cpp:133
-#, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "开始为文件 %s 创建 MD4 和 AICH 校验码"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "警告"
 
-#: src/ThreadTasks.cpp:137
-#, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "开始为文件 %s 创建 MD4 校验码"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr "对不起，由于配置变动，您的地区设置已经变为系统默认值。"
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "开始为文件 %s 创建 AICH 校验码"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "信息"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "正在转换在 '%s'在 '%s' 中旧的 AICH 校验集至64b"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"在服务器列表中没有任何服务器。\n"
+"需要 aMule 现在就下载一个新的列表吗？"
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "警告：文件名 '%s' 非法，已经重命名为 '%s'。"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "服务器列表已下载"
 
-#: src/ThreadTasks.cpp:442
+#: src/amule.cpp:654
 #, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "警告：文件 '%s' 已经存在，新文件重命名为 '%s'。"
+msgid "web server running on pid %d"
+msgstr "Web 服务器正在运行，进程编号为 %d"
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "警告：为 '%s' 建立备份后无法删除原文件"
+#: src/amule.cpp:658
+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 ""
+"您要求启动时运行 Web 服务器，但 amuleweb 程序无法 运行， 请先安装包含 Web 服"
+"务器的 aMule 版本，或者使用 --enable-webserver 选项编译 aMule，然后运行 make "
+"install 进行安装"
+
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "错误"
 
-#: src/ThreadTasks.cpp:467
+#: src/amule.cpp:741
 #, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "警告：无法删除 %s"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "无法绑定端口到指定的地址：%s"
 
-#: src/BaseClient.cpp:1307
+#: src/amule.cpp:768
 #, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "无法获取用户%s的共享文件"
-
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "未知"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "端口 %u 已被占用，你会成为低 ID。\n"
 
-#: src/BaseClient.cpp:1738
+#: src/amule.cpp:774
 #, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (假冒 eMule 版本 %#x)"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"端口 %u 已被占用。\n"
+"\n"
+"这意味着你会成为低 ID。\n"
+"\n"
+"请检测网络设置以确保端口可用于输入输出。"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (假冒 eMule)"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "创建在线统计文件失败"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (假冒 eMule)"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "创建 aMule 在线统计文件失败"
 
-#: src/BaseClient.cpp:1790
-#, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (基于 eMule v0.%u)"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"您所选择的地区设置在您的计算机上似乎没有安装。(注意：我还是会尝试您所选择的地"
+"区设置。)"
 
-#: src/BaseClient.cpp:1960
+#: src/amule.cpp:1040
 #, c-format
-msgid "NickName: %s ID: %u"
-msgstr "昵称：%s ID：%u"
+msgid "This is the first time you run aMule %s"
+msgstr "这是您第一次运行 aMule %s"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "已请求： %s\n"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "此版本是测试版，更新频繁， \n"
 
-#: src/BaseClient.cpp:1964
-#, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] "本次运行文件统计：接受了 %d 个请求（总请求数 %d），已传送 %s\n"
-msgstr[1] "本次运行文件统计：接受了 %d 个请求（总请求数 %d），已传送 %s\n"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr "我们无法承诺它不会损坏任何东西，烧毁您的房子，\n"
 
-#: src/BaseClient.cpp:1967
-#, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] "历史运行文件统计：接受了 %d 个请求（总请求数 %d），已传送 %s\n"
-msgstr[1] "历史运行文件统计：接受了 %d 个请求（总请求数 %d），已传送 %s\n"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "或杀死你的狗，但 * 一般来讲 * 它应该是安全的。\n"
 
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "请求了未知文件"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr "如要获取使用信息、用户支持以及下载最新版本，请访问我们的首页\n"
 
-#: src/BaseClient.cpp:2242
-#, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "用户 %s 位于 %s:%d，使用 %s %s %s"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "www.aMule.org，或进入我们在 irc.freenode.net 的 IRC 频道 #aMule。\n"
 
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "用户名"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "欢迎您到 http://forum.amule.org 去提交错误报告"
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "好友"
+#: src/amule.cpp:1065
+msgid ""
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
+msgstr ""
+"您为在线统计文件所选择的文件夹无效！\n"
+"在您更正设置之前在线统计将被禁用。"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "显示详细信息 (&D)"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "获取服务器名称"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "添加好友"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "为文件 '%s' 预分配磁盘空间失败：%s"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "删除好友"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "错误：无法打开日志文件"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "发送消息 (&M)"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "警告：日志文件为空。肯定有什么地方出错了。"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "查看共享文件"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "记录文件已被重置"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "建立好友通道"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "服务器消息：%s"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "确定删除选中的好友吗？"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "跳过下载%s，因为请求的文件不是最新的。"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "确定删除选中的好友吗？"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "下载节点列表失败。"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "取消"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "打开已下载的版本检查文件失败"
 
-#: src/FriendListCtrl.cpp:359
-msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
-msgstr ""
-"只设计了一个通道，不允许设置超过一个好友通道。\n"
-" "
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "损坏的版本检查文件"
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "多选"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "您使用的是老版本的aMule！"
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "下载已完成"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "您的 aMule 版本是 %i.%i.%i，最新版本是 %li.%li.%li"
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "文件的完整路径。"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "最新版本可从这里下载：http://www.amule.org"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "不包含路径部分的文件名。"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "警告：您的 aMuled 版本太旧：%i.%i.%i < %li.%li.%li"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "文件的eD2k校验码。"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "您的aMule是最新版本。"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "文件大小（字节）。"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "下载版本检查文件失败"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "累计下载活动时间。"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "用户：%s | 文件：%s"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "新的聊天对话已启动"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "用户：E：%s K：%s | 文件：E：%s K：%s"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "消息发送者。"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "没有选择网络"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "磁盘空间不足"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "有低 ID"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "磁盘分区。"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "有高 ID"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "最后阶段出错"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "已连接到 %s %s"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "文件名"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "正在连接到 %s"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "大小"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "已从 eD2k 断开"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "类型"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad 已启动。"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "优先级"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad 已停止。"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "文件编号"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "已连接至 Kad (ok）"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "请求"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "已连接至 Kad 网络 (有防火墙)"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "接受的请求"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "已断开 Kad 连接"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "已传送数据"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr "如果在设置中禁用了 UDP 端口，Kad 网络将不能使用，没有启动。"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "共享比例"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Kad 网络在设置中被禁用了，没有连接。"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "已下载数据段"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"错误：当远程连接被禁用的时，aMule 服务程序无法使用。要启用远程连接，请使用普"
+"通的 aMule，或使用 --ec-config选项启动 amuled 或在文件 ~/aMule/amule.conf 中"
+"设置选项\"AcceptExternalConnections\"为1"
+
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"错误：如果需要使用外部连接，必须设置一个可用的密码，aMule daemon不能在没有启"
+"用外部连接的情况下使用。要运行aMule daemon，你必须设置~/.aMule/amule.conf文件"
+"中的\"ECPassword\"字段，使它有一个合适的值。执行amuled --ce-config来设置这个"
+"密码。更多信息请访问http://wiki.amule.org。"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled：正在初始化 - 启动计时器"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled： 进入后台 - 再见"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "不能创建 Pid 文件"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "完整源"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "错误：%s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "所在目录"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "这是基于 eMule 的 aMule %s。"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "共享文件"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "运行于 %s"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "极低"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr "访问 http://www.amule.org 来检查 是否有新版本。"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "低"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "致命错误：创建计时器失败"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "普通"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "aMule 远程控制"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "高"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "快照："
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "极高"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr "基于 eMule 的“全平台” P2P客户端\n"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "发布"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "网站：http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "自动"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "论坛：http://forum.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "添加注释"
+#: src/amuleDlg.cpp:504
+msgid ""
+"FAQ: http://wiki.amule.org \n"
+"\n"
+msgstr "FAQ: http://wiki.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "编辑注释"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "联系邮件：admin@amule.org (管理问题) \n"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "更名"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr "版权所有 (C) 2003-2008 aMule 团队 \n"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "添加收藏中的文件至传输列表"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "aMule 的一部分是基于 \n"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "复制magnet地址到剪贴板（&U）"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr "Kademlia：基于异或算法的点对点路由。\n"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "复制eD2k链接到剪贴板 (&L)"
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr "版权所有 (c) 2002-2008 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "消息"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "复制eD2k链接到剪贴板（含源）（&S）"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "aMule 对话损坏"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "复制eD2k链接到剪贴板（含源）（包括加密选项）（&W）"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "正在连接"
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "复制eD2k链接到剪贴板（含主机名）（&H）"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k：正在连接"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr "复制eD2k链接到剪贴板（含主机名）（包括加密选项）（&C）"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k：连接已断开"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "复制eD2k链接到剪贴板（包含&AICH信息）"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad：有防火墙"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "复制统计信息到剪贴板"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad：已连接"
 
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
-msgid ""
-"Feedback from: %s (%s)\n"
-"\n"
-msgstr "统计信息来自：%s(%s)\n"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad：正在连接"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "你需要高ID来产生源链接"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad：关闭"
 
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "警告"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "取消"
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "共享文件 (%i)"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "终止本次连接尝试"
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[part 文件]"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "断开连接"
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "请输入新文件名"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "从当前已连接的网络断开"
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "更改文件名"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "连接"
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "继续上传此文件：%s"
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "连接至当前已启用的网络"
 
-#: src/UploadQueue.cpp:520
+#: src/amuleDlg.cpp:846
 #, c-format
-msgid "Suspending upload of file: %s"
-msgstr "暂停上传此文件：%s"
-
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMule 文本客户端"
-
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kad：搜索关键词太短"
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "上传：%.1f（%.1f） | 下载：%.1f（%.1f）"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
+#: src/amuleDlg.cpp:848
 #, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "读取 %u 个 Kad 联系人"
-msgstr[1] "读取 %u 个 Kad 联系人"
+msgid "Up: %.1f | Down: %.1f"
+msgstr "上传：%.1f | 下载：%.1f"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
+#: src/amuleDlg.cpp:874
 #, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "只有%d个Kad联系人可用，nodes.dat没有写入"
-msgstr[1] "只有%d个Kad联系人可用，nodes.dat没有写入"
+msgid "aMule (%s | Connected)"
+msgstr "aMule（%s | 已连接）"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
+#: src/amuleDlg.cpp:876
 #, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "已写入%d个Kad联系人"
-msgstr[1] "已写入%d个Kad联系人"
-
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "错误：无法监听TCP端口。"
-
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "网页客户端连接已被接受\n"
-
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "错误：无法接受Web客户端连接\n"
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule（%s | 已断开）"
 
-#: src/webserver/src/WebServer.cpp:374
+#: src/amuleDlg.cpp:913
 #, c-format
-msgid "Request failed with the following error: %s."
-msgstr "请求失败，错误为：%s"
-
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "请求失败，错误未知。"
+msgid "Do you really want to exit %s?"
+msgstr "您确定要关闭%s吗？"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "索引文件未找到："
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "退出确认"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "会话过期 - 正在请求登录\n"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "运行命令："
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- 默认 -"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "会话正常，已登录\n"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "皮肤目录 %s 不存在"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "会话正常，未登录\n"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "警告：无法打开皮肤文件 %s 进行读取"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "没有会话已打开 - 将请求登录\n"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "网络"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "会话已创建 - 正在请求登录\n"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "网络窗口"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "正在处理请求 [原始]："
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "搜索"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "检查密码\n"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "搜索窗口"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "密码校验值错误\n"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "下载"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "密码正确\n"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "下载窗口"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "密码错误\n"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "共享文件"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "您没有输入密码，不允许空密码。\n"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "共享文件窗口"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "已请求注销\n"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "消息"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "正在处理请求 [已重定向]："
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "消息窗口"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "载入模板 <str>"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "统计"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "Web服务器的HTTP端口"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "统计图窗口"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "为Web服务器端口启用uPnP"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "设置"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP端口"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "设置窗口"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "使用gzip压缩"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "导入"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "Web服务器的完整权限密码"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "part 文件导入工具"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "Web服务器的访客密码"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "关于"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "允许访客访问"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "关于/帮助"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "拒绝访客访问"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "eD2k 网络"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "载入/保存Web服务器设置从/至远程aMule"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "Kad 网络"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMule设置文件路径，不要直接使用！"
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "无网络"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "禁用PHP解释器（已废弃）"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "aMule 远程控制"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "为每个请求重编译PHP页面"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule Web服务器"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "严重错误：无法创建核心计时器"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "不可用"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "连接到远程 amule"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "从来没有"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "严重错误：无法建立轮询计时器"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "准备事件循环..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "正在连接..."
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "正在下载..."
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "连接失败"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "（%s / %s）"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "远程 GUI 外部连接事件处理程序"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "下降"
 
-#: src/HTTPDownload.cpp:239
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
 #, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr ""
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "设置"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "amulesig.dat 文件所在的目录"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "浏览"
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "连接失败。不能连接到 %s:%d\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "请输入 amulesig.dat 文件所在的目录"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "连接关闭 - aMule 可能已经终止运行。"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "刷新周期（秒）"
-
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "每次刷新都生成统计图"
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "准备"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "输入存放所产生的统计图的目录"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "全部"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "周期性上传统计图到 FTP 服务器"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr "不能为分类 '%2$s' 创建目录 '%1$s'，保持目录 '%3$s'。"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP 地址"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "未知"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP 路径"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "无法获取用户 %s 的共享文件"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "输入 FTP 服务器的地址"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "正在搜索用户用于低 ID 连接"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "输入 FTP 服务器上存放统计图的目录"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (假冒 eMule 版本 %#x)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "用户名"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (假冒 eMule)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "密码"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (假冒 eMule)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "输入登录 FTP 服务器的用户名"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (基于 eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "输入登录FTP服务器的密码"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "昵称：%s ID：%u"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "FTP上传周期(分钟)"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "已请求： %s\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "检测"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] "本次运行文件统计：接受了 %d 个请求（总请求数 %d），已传送 %s\n"
+msgstr[1] "本次运行文件统计：接受了 %d 个请求（总请求数 %d），已传送 %s\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "统计文件所在文件夹"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] "历史运行文件统计：接受了 %d 个请求（总请求数 %d），已传送 %s\n"
+msgstr[1] "历史运行文件统计：接受了 %d 个请求（总请求数 %d），已传送 %s\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "统计图存放文件夹"
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "请求了未知文件"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/BaseClient.cpp:2700
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i 天 %i 小时 %i 分钟 %i 秒"
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "来自 %s（IP：%s）的消息被过滤掉了"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas，aMule在线统计"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "新消息来自于 %s（IP：%s）"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "欢迎！"
+#: src/BaseClient.cpp:2899
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr "用户 %s（%u）请求目录 %s 的共享文件列表 -> 已拒绝"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "警告：%s 文件无法打开。"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "本次运行最高下载速度"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr "警告：已取消文件列表损坏，包含有非法头部。"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "历史最高下载速度"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "读取 %s 文件时发生 IO 错误：%s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "重置"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "保存 %s 文件时发生错误：%s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "系统"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "输入 Captcha"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "停止自动刷新"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "分类"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "保存在线统计图"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "新分类"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "打印在线统计图"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "请选择下载文件夹"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "设置"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "必须定义分类名称！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "关于 wxCas"
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "必须定义分类路径！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "开始自动刷新"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr "无法建立该分类的接收文件夹，请给出一个有效的分类路径！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "自动刷新已停止"
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "聊天已开始：%s（%s：%u）- %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "自动刷新已开始"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** 已连接到用户 ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "保存统计图"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** 正在连接用户 ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMule 在线统计"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** 无法连接用户/连接丢失 ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/ChatSelector.cpp:335
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
-"打印时出现问题。\n"
-"可能当前打印机没有设置正确？"
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr "*** 您已经通过了 captcha 检测，用户已经接收到你的信息了。***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "打印中"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:414
+#: src/ChatSelector.cpp:336
 msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
-"wxCas, aMule在线统计\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"基于 GPL 协议分发"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "aMule没有运行"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule 正在运行"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule 正在运行，但是已断开连接"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule 正在连接..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "aMule状态不明..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " 已经运行 "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr "已停止！"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr "未连接！"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " 正在连接..."
+"*** 您输入了错误的 captcha 信息，您的信息已经被忽略。您可以通过重新发送一条信"
+"息来再一次请求一个captcha验证。***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " 状态不正常，请检查！"
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "聊天"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr "已连接至"
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "关闭分页"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr "Kad："
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "关闭所有分页"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "确定"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "关闭其它分页"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "被防火墙阻挡"
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "加为好友"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "关闭"
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "积分文件已载入，%u 个已知用户"
+msgstr[1] "积分文件已载入，%u个已知用户"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " 是在 "
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - %u 个用户的积分已过期！"
+msgstr[1] " - %u 个用户的积分已过期"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " 和 "
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "文件 'crytkey.dat' 未找到，正在创建。"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "总下载："
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "客户端详细信息"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr "，上传："
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "低 ID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "本次运行下载："
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "高 ID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "下载："
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "已启用"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " kB/s，上传："
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "已支持"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " kB/s"
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "不支持"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "共享："
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "已禁用"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " 文件，队列长度："
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "已连接"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "时间："
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "断开连接"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f kB/s"
+msgid "%.1f kB/s"
+msgstr "%.1f kB/s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " 在 "
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "未完成"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "系统平均负载（1-5-15 分钟）："
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "坏蛋"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "系统运行时间："
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "验证 - 通过"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
-#, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02u天 %02u小时 %02u分钟 %02u秒"
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "不可用"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02u小时 %02u分钟 %02u秒"
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "用户 %s（%u）请求您的共享文件列表 -> 已接受"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%02umin %02us"
-msgstr "%02u分钟 %02u秒"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "用户 %s（%u）请求您的共享文件列表 -> 已拒绝"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%02us"
-msgstr "%02u秒"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "用户  %s（%u）请求了您的共享文件夹列表 -> 已接受"
 
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "高ID"
+#: src/ClientTCPSocket.cpp:903
+#, c-format
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "用户 %s（%u）请求了您的共享文件夹列表 -> 已拒绝"
 
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "低ID"
+#: src/ClientTCPSocket.cpp:928
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
+msgstr "用户 %s（%u）请求目录 %s 的共享文件列表 -> 已接受"
 
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "未连接"
+#: src/ClientTCPSocket.cpp:933
+#, fuzzy, c-format
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr "用户 %s（%u）请求目录 %s 的共享文件列表 -> 已拒绝"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
-#, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+#: src/ClientTCPSocket.cpp:952
+#, fuzzy, c-format
+msgid "User %s (%u) shares directory '%s'"
+msgstr "用户 %s（%u）共享了目录 %s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:967
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "用户 %s（%u）发送了未经请求的共享文件夹列表"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: src/ClientTCPSocket.cpp:982
+#, fuzzy, c-format
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "用户 %s（%u）发送了目录 %s 内的共享文件列表"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:989
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "用户 %s（%u）完成了共享文件列表的发送"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:994
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "已取消！"
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "用户 %s（%u）发送了未经请求的共享文件列表"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:1006
 #, c-format
-msgid "Unable to open %s"
-msgstr "无法打开 %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "输入参数"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "需计算校检码的文件"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "添加附加链接到该文件"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "在此处输入需要生成eD2k链接的文件名"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
-msgstr "在这里输入要添加的eD2k链接，在结尾加 '/' 以附加此文件名"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "添加"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "删除"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "清除"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "创建有文件块校检码的链接"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
-msgstr "该选项可以帮助新文件和稀有文件更快散播，只是链接长度会增加"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4 文件校检码"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k文件校验码"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k链接"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "开始"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "保存"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "复制到剪贴板"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "退出"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-#, fuzzy
-msgid "Open"
-msgstr "Opera"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "打开文件并生成eD2k链接"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "复制"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "复制已生成的eD2k链接至剪贴板"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-#, fuzzy
-msgid "Save as"
-msgstr "保存"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "保存已生成的eD2k链接至文件"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "关于"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "关于 aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "选择要生成eD2k链接的文件"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-#, fuzzy
-msgid "Can't open the clipboard"
-msgstr "复制到剪贴板"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "当前无内容需要复制！"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "选择已生成eD2k链接的文件"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "无法读取 "
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "请输入一个非空的文件名"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "暂时没有东西可保存！"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"aLinkCreator, 用于生成eD2k链接的程序\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"图片来自 http://www.everaldo.com 和 http://www.icomania.com\n"
-"以及 http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"基于GPL协议发布"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "正在生成校检码"
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr "用户 %s（%u）拒绝了目录/文件列表的访问"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr ""
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "文件注释"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr ""
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "用户名"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-#, fuzzy
-msgid "Computing eD2k Hashes..."
-msgstr "正在连接至eD2k..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "文件名"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "在 %.2f 秒内完成"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "评分"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "您已添加了该链接！"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "注释"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "请输入一个非空的链接"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "没有注释"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "正在处理文件号 %u: %s"
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "您要求了文件块校检码（只用于大于 9.5 MB 的文件）"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u 条注释"
+msgstr[1] "%u条注释"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> 文件不存在！\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator，aMule eD2k链接的创建程序"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr ""
+"封禁客户端 %1$s，因为向文件 '%4$s' 总共发送的 %3$s 中有 %2$s 的错误数据。"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1308,31 +1118,57 @@
 msgid "Auto [Hi]"
 msgstr "自动 [高]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "正在连接"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "极低"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "低"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "普通"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "高"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "极高"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "发布"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "正在询问"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "通过服务器连接中"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "队列已满"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
-msgstr "在排队"
+msgstr "正在排队"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "正在传送"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "正在下载"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
@@ -1344,7 +1180,7 @@
 
 #: src/DataToText.cpp:68
 msgid "Cannot connect LowID to LowID"
-msgstr "无法连接两个低ID用户"
+msgstr "无法连接两个低 ID 用户"
 
 #: src/DataToText.cpp:69
 msgid "Too many connections"
@@ -1352,14 +1188,13 @@
 
 #: src/DataToText.cpp:71
 msgid "Connecting via Kad"
-msgstr "正在用 Kad 连接"
+msgstr "正在通过 Kad 连接"
 
 #: src/DataToText.cpp:72
 msgid "Too many Kad connections"
 msgstr "Kad 连接过多"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "封杀"
 
@@ -1369,7 +1204,7 @@
 
 #: src/DataToText.cpp:75
 msgid "Remote Queue Full"
-msgstr "远程队列已满"
+msgstr "队列已满"
 
 #: src/DataToText.cpp:105
 msgid "Old MLDonkey"
@@ -1391,14 +1226,14 @@
 msgid "Remote Server"
 msgstr "远程服务器"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
 #: src/DataToText.cpp:131
 msgid "Source Exchange"
-msgstr "源交换"
+msgstr "来源交换"
 
 #: src/DataToText.cpp:132
 msgid "Passive"
@@ -1416,8 +1251,8 @@
 msgid "Search Result"
 msgstr "搜索结果"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "已完成"
 
@@ -1435,13 +1270,13 @@
 
 #: src/DataToText.cpp:149
 msgid "ERROR: IO error!"
-msgstr "错误：输入输出错误！"
+msgstr "错误：IO 错误！"
 
 #: src/DataToText.cpp:150
 msgid "ERROR: Failed!"
 msgstr "错误：失败！"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
 msgstr "已加入队列"
 
@@ -1453,4343 +1288,2645 @@
 msgid "Unknown or bad tempfile format."
 msgstr "未知或错误的临时文件格式。"
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "系统默认"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "阿尔巴尼亚语"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "阿拉伯语"
-
-#: src/Preferences.cpp:631
-#, fuzzy
-msgid "Asturian"
-msgstr "爱斯托尼亚语"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "巴斯克语"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "保加利亚语"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "加泰罗尼亚语"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "简体中文"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "繁体中文"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "克罗的亚语"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "捷克语"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "丹麦语"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "荷兰语"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "英语（英国）"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "爱斯托尼亚语"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "芬兰语"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "法语"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "加利西亚语"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "德语"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "希腊语"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "希伯来语"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "匈牙利语"
-
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "意大利语"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "意大利语（瑞士）"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "日语"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "韩语"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "立陶宛语"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "块"
 
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "新挪威语"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "大小"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "芬兰语"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "已传输"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "葡萄牙语"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "速度"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "葡萄牙语（巴西）"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "进度"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "俄语"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "源"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "斯洛文尼亚语"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "优先级"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "西班牙语"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "状态"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "瑞典语"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "剩余时间"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "土耳其语"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "最后一次发现完整文件"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr ""
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "最后一次下载"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "未检测到所选择的浏览器"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "您确定删除所选择的文件吗？"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr "TCP端口不可高于65532，因为服务器UDP端口值为TCP端口值+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "您确定删除所选择的文件吗？"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "缺省端口将被使用（%d）"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "服务器名称"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "地址"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "端口"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "描述"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "响应时间"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "用户数"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "文件"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "失败次数"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "静态"
-
-#
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "版本"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
-msgstr "现在正连接在要删除的服务器。该服务器暂时无法删除。请先断开连接。"
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "信息"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "（未知名称）"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "您确定要删除静态服务器 %s ?"
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr "反馈来自：%s(%s)\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "是"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "自动"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "否"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "停止(&S)"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "无法读取 '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "暂停 (&P)"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "服务器（%i）"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "续传(&R)"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "服务器"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "清除已完成的文件 (&l)"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "连接到服务器"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "立即转移所有 A4AF 到这个文件"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "标记服务器为静态"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "自动转移所有 A4AF 到这个文件"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "标记服务器为非静态"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "立即转移所有 A4AF 到其它文件"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "标记服务器为静态"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "扩展选项"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "标记服务器为非静态"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "预览"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "删除服务器"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "显示文件信息(&D)"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "删除服务器"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "显示所有注释"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "删除所有服务器"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "复制 magnet 地址到剪贴板"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "复制eD2k链接至剪贴板"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "复制 eD2k 链接到剪贴板 (&L)"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "复制eD2k链接至剪贴板"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "复制统计信息到剪贴板"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "重新连接到服务器"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "清除分类"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "您确定要删除所有服务器吗？"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "指定到分类"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "您确定要删除已选的服务器吗？"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "打开文件 (&O)"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "您确定要删除已选的服务器吗？"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "请输入新文件名："
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "已禁用 [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "更改文件名"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "这是基于eMule的aMule %s。"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "运行于%s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr "访问 http://www.amule.org 可查看是否有新版本"
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "致命错误：创建计时器失败"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMule远程控制"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "快照："
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr " 基于eMule的“全平台”P2P客户端\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " 网站：http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " 论坛：http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " 联系邮件：admin@amule.org (管理问题) \n"
+msgid "Downloads (%i)"
+msgstr "下载（%i）"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" 版权所有 (C) 2003-2009 aMule 团队 \n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " aMule的一部分是基于 \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr "Kademlia：基于异或算法的点对点路由。\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " 版权所有 (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "消息"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k：正在连接"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k：连接已断开"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad：有防火墙"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad：已连接"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad：正在连接"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad：停止"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "终止连接尝试"
+"为了不让此提示在每次预览时都出现，\n"
+"请在设置中预设您喜欢的播放器（默认为mplayer）。"
 
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "断开连接"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "从当前已连接的网络断开"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "连接"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "连接至当前已启用的网络"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "上传：%.1f（%.1f） | 下载：%.1f（%.1f）"
-
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "上传：%.1f | 下载：%.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "文件预览"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule（%s | 已连接）"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "错误：无法运行媒体播放器！命令：%s"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule（%s | 已断开）"
+msgid "Saving PartFile %u of %u"
+msgstr "正在保存 PartFile %u 之 %u"
 
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "您确定要关闭aMule吗？"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "所有 PartFile 都已经保存。"
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "退出确认"
-
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "皮肤目录 %s 不存在"
+msgid "Loading temp files from %s."
+msgstr "从 %s 载入临时文件。"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "警告：无法打开皮肤文件%s进行读取"
-
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "网络"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "网络窗口"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "搜索"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "查找窗口"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "传输文件"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "文件传输窗口"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "共享文件"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "共享文件窗口"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "消息"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "消息窗口"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "统计"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "统计图表窗口"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "设置窗口"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "导入"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "part 文件导入工具"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "关于/帮助"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "eD2k网络"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "Kad网络"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "无网络"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "常规"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "连接"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "目录"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "服务器"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "安全"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "接口"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "代理"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "过滤"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "远程控制"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "在线统计"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "高级"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "事件"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "调试"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "用户定义的"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr "重启aMule后设置才能生效：\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP端口已更改。\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP端口已更改。\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"自动更新服务器地址列表为空，\n"
-"启动时自动更新服务器将被禁用。"
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"您已经启用了远程连接但还没有设置密码。\n"
-"远程连接在没有有效密码的情况下不能使用。"
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- 语言已更改。\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- 临时文件目录已更改。\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-#, fuzzy
-msgid "- ED2K network enabled.\n"
-msgstr "全部网络都被禁用了。"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "上传：0.0 | 下载：0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"eD2k和Kad网络都已被禁用，\n"
-"你至少要启用其中的一项才能连接。"
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"如果你的 UDP 端口被禁用，Kad 将不能启动。\n"
-"启动 UDP 端口或禁用 Kad。"
+msgid "Loading PartFile %u of %u"
+msgstr "载入 PartFile %u 之 %u"
 
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"你必须现在重启aMule，\n"
-"如果现在不重启的话，出现任何问题可别怪别人。\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"您的自动更新服务器列表是的空的，\n"
-"请输入至少一个指向有效 server.met 的网址，\n"
-"点击这个勾选框旁边的\"列表\"按钮然后输入网址。"
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "临时文件"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "传入文件"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "在线统计"
+"错误：载入备份文件失败！请到 http://forum.amule.org 搜索 .part 和 .met 文件的"
+"恢复方法。"
 
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "为%s选择文件夹"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "所有 PartFile 已经载入。"
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "浏览寻找视频播放器"
-
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "选择浏览器"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "没有找到 part 文件"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "可执行%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "编辑服务器列表"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "发现 %u 个 part 文件"
+msgstr[1] "发现 %u 个 part 文件"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
-msgstr ""
-"加入下载 server.met 文件的网址，每行只限一个网址。\n"
-" "
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
+msgstr "存放零时文件分区的文件系统不支持大文件。"
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "刷新时间：%d秒"
-msgstr[1] "刷新时间：%d秒"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr "存放下载文件分区的文件系统不支持大文件。"
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "平均值图表显示时间：%d分钟"
-msgstr[1] "平均值图表显示时间：%d分钟"
+msgid "Downloading %s"
+msgstr "正在下载 %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "网络连接图表缩放：%d"
+msgid "You are already trying to download the file '%s'"
+msgstr "您已经在下载文件 '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "刷新时间：%d秒"
-msgstr[1] "刷新时间：%d秒"
+msgid "You already have the file '%s'"
+msgstr "您已下载了文件 '%s'"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "文件缓冲区大小：%d字节"
-msgstr[1] "文件缓冲区大小：%d字节"
+msgid "You are already trying to download the file %s"
+msgstr "您已经尝试下载文件 %s"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "上传队列长度：%d个用户"
-msgstr[1] "上传队列长度：%d个用户"
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "无法转换 magnet 链接为 eD2k：%s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "服务器连接刷新周期：%d分钟"
-msgstr[1] "服务器连接刷新周期：%d分钟"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "服务器连接刷新周期：已禁用"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-#, fuzzy
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "用于扩展的服务器请求的 UDP 端口 (TCP+3)：4665"
-
-#: src/PrefsUnifiedDlg.cpp:1118
-#, fuzzy
-msgid "disabled"
-msgstr "禁用"
+msgid "Unknown protocol of link: %s"
+msgstr "未知链接协议：%s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "发生 '%s' 事件时执行命令"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "在核心启用执行命令"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "核心命令："
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "在图形界面端启用执行命令"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "图形界面命令："
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr "以下变量将被替换："
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "非法 eD2k 链接！错误：%s"
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "非法登录尝试。已关闭连接。"
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "客户端在验证失败后发送包。"
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "已关闭远程连接。"
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "密码未设置，远程连接已被禁止"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "配置文件中已禁止远程连接"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "新的远程连接已被接受"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "错误：不能接受新的远程连接"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "由于未设置密码，远程连接已被拒绝！"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "正在连接用户：%s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "未知版本"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
 msgstr "错误的远程连接版本号，可能会不兼容，请使用相同版本的核心和远程程序。"
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
+#, fuzzy
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
-msgstr "为了尽可能避免程序崩溃，您不能从任意的SVN版本连接到发行版本！"
-
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "登录失败。"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
+msgstr "你不能连接至任意 CVS 版本的发布！目的是为了不让程序崩溃。"
 
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "非法协议版本。"
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "缺失协议版本标签。"
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
-msgstr "无效请求，请现登录。"
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr "验证失败：非法的校验作为EC密码"
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "验证失败：密码错误。"
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "验证失败：没有密码"
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
+msgstr "无效请求，请先验证。"
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "登录成功"
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "发送错误消息喔 \"%s\"到客户端。"
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "来自%s的非法登录尝试，已关闭连接。"
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
 msgstr "远程 Part 文件命令失败：文件校验码不存在：%s"
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
 msgstr "文件校验码不存在：%s"
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
-msgstr "哇靠! OpCode处理错误！"
+msgstr "OpCode 处理错误！"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "服务器没有被添加"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "找不到服务器：%s"
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "必须定义需删除的服务器"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
-msgstr "eD2k被设为禁用"
+msgstr "eD2k 被设为禁用"
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
-msgstr "正在搜索，请稍等然后刷新结果！"
+msgstr "正在搜索，请稍等然后重新获取结果！"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "远程界面使用网络搜索没有意义。"
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad被设为禁用"
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "此图没有节点"
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
-msgstr "你的客户端没有为详细级别进行配置。"
+msgstr "您的客户端没有为详细级别进行配置。"
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "远程连接：已请求关闭"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "已经在关闭。"
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
 msgstr "远程连接：正在添加链接 '%s'。"
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "非法链接或已经存在列表中。"
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "文件未找到。"
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "非法文件名。"
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "无法重命名文件。"
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad 被设为禁用"
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
-msgstr "已经连接至eD2k。"
+msgstr "已经连接至 eD2k。"
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
-msgstr "正在连接至eD2k..."
+msgstr "正在连接至 eD2k..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "已连接至 Kad。"
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "正在连接至 Kad..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "全部网络都被禁用了。"
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
-msgstr "已从eD2k断开连接。"
+msgstr "已从 eD2k 断开连接。"
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
-msgstr "断开 Kad。"
+msgstr "已从 Kad 断开连接。"
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
-msgstr "远程连接：收到非法的操作码：%#x"
+msgstr "远程连接：非法 opcode：%#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
-msgstr "非法的操作码（错误的协议版本？）"
-
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr "打开文件(%s)失败，从共享文件列表删除。"
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "请求未知文件校检码：%s"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "命令 '%s' 已启动进程 %d，返回值为 %d。"
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "没有添加服务器： 没有 IP 地址或主机名"
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "没有添加服务器： 服务器端口无效"
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "eD2k状态："
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "已连接"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP地址:端口"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kad 状态："
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "正在运行"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "状态："
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "连接已断"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "连接状态："
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "有防火墙"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "确定"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "防火墙状态："
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "已连接至好友"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "没有好友"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "平均用户："
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "平均文件："
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "没有运行"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "运行时间：%s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "传输"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "上传"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "本次上传（全部）： %s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "总开销 （数据包）： %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "文件请求开销（数据包）： %s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "源交换开销（数据包）： %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "服务器开销（数据包）： %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Kad 开销（数据包）：%s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "加密开销(UDP)：%s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "活动上传：%s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "等待上传：%s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "成功上传会话总数：%s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "失败上传会话总数：%s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "平均上传时间：%s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "下载"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "本次下载（总共）： %s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "发现的源：%s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "活动下载（块数）：%s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "本次上传下载比率：%s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "平均下载速度（本次运行）：%s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "平均上传速度（本次运行）：%s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "最大下载速度（本次运行）：%s"
+msgstr "非法的 opcode（错误的协议版本？)"
 
-#: src/Statistics.cpp:692
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "最大上传速度（本次运行）：%s"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "未知扩展选项 '%s' 用于命令 '%s'。\n"
 
-#: src/Statistics.cpp:693
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Reconnects: %i"
-msgstr "重新连接：%i"
+msgid "Unknown command '%s'.\n"
+msgstr "未知命令 '%s'。\n"
 
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "首次传输到现在时间：%s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"此命令不能含有参数。\n"
 
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "与服务器连接时间：%s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"此命令必须有参数。\n"
 
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "活跃连接（估计值)：%i"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"此命令不完整，您必须使用以下扩展选项中的一个。\n"
 
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "达到最大连接数：%s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"可用扩展选项：\n"
 
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "平均连接数（估计）：%g"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "可用命令：\n"
 
-#: src/Statistics.cpp:700
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "最高连接（估计值）： %i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "用户"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"全部命令都不区分大小写。\n"
+"输入 '%s <命令>' 获取在 <命令> 中的详细信息。\n"
 
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "过滤"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "退出程序。"
 
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "总数：%i　已知：%i"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "显示帮助。"
 
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "有效服务器：%i"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"输入 'help <命令>' 可显示命令的帮助。\n"
+"输入 'help' 可显示全部命令列表。\n"
 
-#: src/Statistics.cpp:716
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Failed Servers: %i"
-msgstr "无效服务器：%i"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"使用 '%s' 列出所有命令\n"
+"\n"
 
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "总共：%s"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "语法错误！"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "已删除服务器：%s"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr "处理指令时发生意外错误 - 这不应该发生！请提交错误报告\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "被过滤的服务器：%s"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "此命令不需要任何参数。"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "有效服务器中的用户数： %llu"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "此命令必须有一个参数。"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "有效服务器中的文件数： %llu"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "无效参数"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "用户总数：%llu"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "此命令不完整。"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "Total Files: %llu"
-msgstr "文件总数：%llu"
+msgid "Type '%s' to get more help.\n"
+msgstr "输入 '%s' 显示更多帮助信息。\n"
 
-#: src/Statistics.cpp:724
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "服务器开销：%.2f%%"
+msgid "This is %s %s %s\n"
+msgstr "这是 %s %s %s\n"
 
-#: src/Statistics.cpp:728
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "Number of Shared Files: %s"
-msgstr "共享文件数：%s"
+msgid "This is %s %s\n"
+msgstr "这是 %s %s\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "共享文件大小总和：%s"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
+msgstr ""
+"\n"
+"正在建立用户...\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Average file size: %s"
-msgstr "平均文件大小：%s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "操作系统"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "没有收到"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "剪切"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "粘贴"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "选择全部"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad搜索不能使用，因为Kad没有连接"
-
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "eD2k未连接时eD2k搜索无法进行"
-
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "尝试Kad搜索时出现不可预料的错误："
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
+msgstr ""
+"\n"
+"完成，正在退出 %s...\n"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "来自%s（IP：%s）的消息被过滤掉了"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
+"不能使用空密码连接，\n"
+"您必须在配置文件\n"
+"或在命令行设置一个，或者在询问时输入。\n"
+"\n"
+"退出...\n"
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "新消息来自于%s（IP：%s）"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "显示帮助信息。"
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "用户%s（%u）请求您的共享文件列表 -> 已接受"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "aMule 正在运行的主机。(缺省：localhost)"
 
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "用户%s（%u）请求您的共享文件列表 -> 已拒绝"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "aMule 的远程连接端口。(默认：4712)"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "用户%s（%u）请求了共享文件夹列表 -> 已接受"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "远程连接密码。"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "用户%s（%u）请求了共享文件夹列表 -> 已拒绝"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "从文件读取设置。"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr "用户%s（%u）请求目录 %s 的共享文件列表 -> 已接受"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "不在控制台输出任何信息。"
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr "用户%s（%u）请求目录 %s 的共享文件列表 -> 已拒绝"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "详细显示调试信息。"
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "用户%s（%u）共享了目录 %s"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "设置程序地区(语言)。"
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "用户%s（%u）发送了未经请求的共享文件夹列表"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "把命令行参数写入设置文件。"
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "用户%s（%u）发送了目录 %s 内的共享文件列表"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "基于 aMule 的设置文件建立新设置文件。"
 
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "用户%s（%u）完成了共享文件列表的发送"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "输出程序版本。"
 
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "用户%s（%u）发送了未经请求的共享文件列表"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "文件信息"
 
-#: src/ClientTCPSocket.cpp:1049
-#, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr "用户%s（%u）拒绝了目录/文件列表的访问"
+#: src/FileDetailDialog.cpp:113
+#, fuzzy, c-format
+msgid "%.1f%% done"
+msgstr "%.2f%% 已完成"
 
-#: src/KadDlg.cpp:132
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Nodes (%u)"
-msgstr "节点（%u）"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "无效IP"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "无效端口"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "请填写所有必要信息"
+msgid "%.2f kB/s"
+msgstr "%.2f kB/s"
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "确定要下载新的 node.dat 文件吗？\n"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "读取好友列表文件 emfriends.met 失败！"
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
-msgstr "这样将删除您当前节点并重启Kad连接。"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "写好友列表文件emfriends.met失败！"
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "继续？"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "严重错误 - 开始聊天进程没有客户端"
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "错误："
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "好友"
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "警告："
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "显示详细信息 (&D)"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
 msgstr "添加好友"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "请输入正确 IP 地址和端口！"
-
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "信息"
-
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "该用户编码无效"
-
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "源"
-
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "文件"
-
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "下载"
-
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "分类"
-
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "主要"
-
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "下载分类"
-
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "搜索相关文件（eD2k，本地服务器）"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "删除好友"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "标记为已知文件"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "发送消息 (&M)"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "连接到远程 amule"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "查看共享文件"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "连接失败"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "建立好友通道"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "错误"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "确定删除选中的好友吗？"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, fuzzy, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "连接失败，无法连接到指定的计算机\n"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "确定删除选中的好友吗？"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
 msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
-msgstr "警告：在低ID的情况下，你不能添加你自己作为ed2k链接的源。"
-
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "用户：E：%s K：%s | 文件 E：%s K：%s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "全部"
-
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "用户总数：%s | 文件总数：%s"
-
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "已传输"
-
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "速度"
-
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "进度"
-
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "状态"
-
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "剩余时间"
-
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "最后一次发现完整文件"
-
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "最后一次下载"
-
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "您确定删除所选择的文件吗？"
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"不允许设置超过一个好友通道。\n"
+" 只能指定一个通道。"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "您确定删除所选择的文件吗？"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "多选"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "发消息给用户"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "发送消息："
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "停止(&S)"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "暂停 (&P)"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "续传(&R)"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "清除已完成的文件 (&l)"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "立即转移所有 A4AF 到这个文件"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "自动转移所有 A4AF 到这个文件"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "立即转移所有 A4AF 到其它文件"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "扩展选项"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "预览"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "显示文件信息"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "显示所有注释"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "复制magnet地址到剪贴板"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "清除"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "分类"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "打开文件 (&O)"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "从好友中删除"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "加为好友"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "发送消息"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "转移到这个文件"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "kB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
-msgstr "已请求其它文件"
+msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
-#, c-format
-msgid "QR: %u (%i)"
-msgstr "排队顺序：%u（%i）"
+#: src/GenericClientListCtrl.cpp:995
+#, fuzzy, c-format
+msgid "On Queue: %u (%i)"
+msgstr "队列级别：%u（%i）"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "已要求其它文件 (A4AF)"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "下载（%i）"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"为了不让此提示在每次预览时都出现，请在设置中预设您喜欢的播放器（默认为"
-"mplayer）。"
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "文件预览"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "错误：无法运行媒体播放器！命令为：%s"
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "错误：无法创建 part 文件)"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "尝试从 %s 载入 met 文件的备份"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "错误：无法打开part.met文件：%s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "错误：part.met文件大小为0： %s ==> %s"
-
-#: src/PartFile.cpp:351
-#, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "错误：无效的part.met文件版本：%s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr "错误：文件 %s（%s）已损坏（标签数不对），无法读取文件。"
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "尝试恢复文件信息..."
-
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "尝试恢复无名文件 - 保存为 RecoveredFile.dat"
-
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "成功恢复所有文件信息 :D - 尝试使用文件信息..."
-
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "无法恢复文件：("
-
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "无法读取 %s（%s）"
-
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "警告：%s可能已损坏（%i）"
-
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "part 文件存盘时发生错误：%s（%s => %s）"
-
-#: src/PartFile.cpp:919
-#, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "无法获取%s的大小 - 正在使用%s文件。"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "等待上传机会"
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' 文件长度为 0 - 使用 %s 文件。"
+#: src/GenericClientListCtrl.cpp:1026
+#, fuzzy, c-format
+msgid "On Queue: %u"
+msgstr "正在排队"
 
-#: src/PartFile.cpp:998
-#, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "%s 的 part.met.seeds 文件存盘失败"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "正在上传"
+
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "没有"
 
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "保存了 %i 个源给 part 文件 %s（%s）"
-msgstr[1] "保存了 %i 个源给 part 文件 %s（%s）"
-
-#: src/PartFile.cpp:1053
-#, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "Part 文件 %s（%s）没有种子文件"
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "否"
 
-#: src/PartFile.cpp:1062
-#, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "Part 文件 %s（%s）的种子文件为空"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "是"
 
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "读取 part 文件的种子文件出错（%s - %s）：%s"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "正在下载..."
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
-msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"发现损坏的数据块 (%d) 于%d段文件 %s - 文件结果校检码 |%s| 文件校检码 |%s|"
-msgstr[1] ""
-"发现损坏的数据块 (%d) 于%d段文件 %s - 文件结果校检码 |%s| 文件校检码 |%s|"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "HTTP 下载已经取消"
 
-#: src/PartFile.cpp:1181
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "发现了已完成的数据段 %i 在%s"
+msgid "Unable to create destination file %s for download!"
+msgstr "无法为下载创建目标文件%s"
 
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "重新校验 %s 完成"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "要下载的地址不能为空"
 
-#: src/PartFile.cpp:2239
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "在完成文件%s时遇到意外文件错误，文件已暂停"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "地址%s已经返回：%i - 错误（%i）！"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "完成下载：%s"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "写入下载文件时发生严重错误"
 
-#: src/PartFile.cpp:2323
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Deleting file: %s"
-msgstr "正在删除文件：%s "
+msgid "Downloaded %d bytes"
+msgstr "已下载 %d 字节"
 
-#: src/PartFile.cpp:2384
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr "警告：无法为已下载的数据段计算校检码 - 校检码集不完整 '%s'"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "丢弃了 %d 字节，但是下载了 %d 字节。"
 
-#: src/PartFile.cpp:2389
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
-msgstr ""
-"警告：无法生成校检码 - 校检码集不完整（%s）， 正常情况下这是不应该发生的"
-
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "警告：硬盘空间不足！暂停文件：%s"
-
-#: src/PartFile.cpp:3171
-#, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "下载的数据段 %i 已损坏 文件： (%s)"
-
-#: src/PartFile.cpp:3214
-#, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH：修复了损坏的数据段 %i（%s），挽救数据（字节）： %s"
-
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "正在分配"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "磁盘空间不足"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
+msgstr "非法的HTTP下载或重定向地址（您是否忘记了加“http://”？）"
 
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "已停止"
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "无法连接到HTTP下载服务器"
 
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "已下载"
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "HTTP下载服务器返回非法响应"
 
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "错误：打开part文件'%s'失败"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "警告：known.net文件无法打开。"
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr "警告：已知文件列表已损坏，文件头无效。"
-
-#: src/KnownFileList.cpp:112
-#, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "读取known.net文件时发生IO错误：%s"
-
-#: src/KnownFileList.cpp:158
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "保存known.met文件时发生错误：%s"
+msgid "Download new GeoIP.dat from %s"
+msgstr "从 %s 下载新的 GeoIP.dat"
 
-#: src/SharedFileList.cpp:352
-#, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "发现 %i 个已知共享文件"
-msgstr[1] "发现 %i 个已知共享文件"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "下载 GeoIP.dat 文件失败，放弃更新。"
 
-#: src/SharedFileList.cpp:358
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "发现 %i 个已知共享的文件， %i 个未知"
-msgstr[1] "发现 %i 个已知共享的文件， %i 个未知"
+msgid "Failed to remove %s file, aborting update."
+msgstr "删除%s文件失败，放弃更新。"
 
-#: src/SharedFileList.cpp:367
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "错误：尝试共享%s"
-
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "文件注释"
-
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "评级"
+msgid "Failed to rename %s file, aborting update."
+msgstr "重名命%s文件失败，放弃更新。"
 
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "注释"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "没有注释"
-
-#: src/CommentDialogLst.cpp:104
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u条注释"
-msgstr[1] "%u条注释"
-
-#: src/ServerConnect.cpp:69
-msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr "无法连接至列出的全部迷惑协议服务器，尝试不使用迷惑协议。"
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "无法连接列表中的所有服务器. 开始新的一轮尝试."
+msgid "Successfully updated %s"
+msgstr "成功更新%s"
 
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "设置中已禁用eD2k网络，将不会连接。"
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "服务器列表中没有可以连接的服务器"
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "更新 GeoIP.dat 时发生错误"
 
-#: src/ServerConnect.cpp:187
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "已连接至 %s (%s:%i)"
+msgid "Failed to download %s from %s"
+msgstr "从%s下载%s失败"
 
-#: src/ServerConnect.cpp:263
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "Connection established on: %s"
-msgstr "已成功连接到：%s"
+msgid "Failed to load country data for '%s'."
+msgstr "为%s载入国家数据失败"
 
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr "尝试连接时出现严重错误，网络可能没有连接"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "正在载入IP过滤文件ipfilter.dat和ipfilter_static.dat。"
 
-#: src/ServerConnect.cpp:339
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "连接已断开 %s（%s：%i）"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "载入 ipfilter.dat 文件 '%s' 失败，遇到未知格式。"
 
-#: src/ServerConnect.cpp:349
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s（%s：%i）可能已当机"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "载入 ipfilter.dat 文件 '%s' 失败，无法打开文件。"
 
-#: src/ServerConnect.cpp:362
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s（%s：%i）可能已没有空位"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "自 %2$s 载入 %1$u 个IP段。"
+msgstr[1] "载入 %u 个IP段自 %s。"
 
-#: src/ServerConnect.cpp:381
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "服务器自动连接会在 %d 秒后重新尝试"
-msgstr[1] "服务器自动连接会在 %d 秒后重新尝试"
-
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "连接已断"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "丢弃了 %u 行错误数据。"
+msgstr[1] "丢弃了 %u 行错误数据。"
 
-#: src/ServerConnect.cpp:408
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "连接失败 %s（%s：%i）"
+msgid "Failed to rename new %s file, aborting update."
+msgstr "重名命新的%s文件失败，放弃更新。"
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "错误：连接超时，端口无效"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "IP过滤器已准备好"
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "连接超时 %s（%s：%i）"
-
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:86
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-"错误：载入备份文件失败！请到http://forum.amule.org搜索.part和.met文件的恢复方"
-"法。"
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "没有找到 part 文件"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "发现 %u 个 part 文件"
-msgstr[1] "发现 %u 个 part 文件"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr "存放零时文件分区的文件系统不支持大文件。"
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr "存放下载文件分区的文件系统不支持大文件。"
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "正在下载 %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "您已经在下载文件 '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "您已下载了文件 '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "您已经尝试下载文件 %s"
+"Bootstrap from \n"
+"known clients"
+msgstr "从已知用户启动"
 
-#: src/DownloadQueue.cpp:1299
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "无法转换magnet链接为eD2k：%s"
+msgid "Nodes (%u)"
+msgstr "节点（%u）"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "未知链接协议：%s"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "无效 IP"
 
-#: src/DownloadQueue.cpp:1328
-#, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "非法eD2k链接！错误信息：%s"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "无效端口"
 
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "执行 <str> 然后退出。"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "请填写所有必要信息"
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "无效 IP 地址格式，请使用 xxx.xxx.xxx.xxx:xxxx\n"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "确定要下载新的 node.dat 文件吗？\n"
 
-#: src/TextClient.cpp:309
+#: src/KadDlg.cpp:212
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr "此命令需要一个参数，合法参数为 'all'、文件名或一个数字。\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "正在用此校验码处理："
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "正在用此文件名处理："
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr "此命令需要一个参数，合法参数为文件校验码。\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "非有效数字\n"
-
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "无效的校验值（长度必须为32个字符）\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "操作成功。"
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "请求失败，错误为：%s"
-
-#: src/TextClient.cpp:653
-#, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "用户的IP过滤器是：%s。\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "关"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "开"
-
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "服务器的IP过滤器是%s。\n"
-
-#: src/TextClient.cpp:664
-#, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "当前IP过滤级别时 %d.\n"
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr "这样将删除您当前节点并重启 Kad 连接。"
 
-#: src/TextClient.cpp:671
-#, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "带宽限制：上传：%u kB/s，下载：%u kB/s。\n"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "继续？"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kad：搜索关键词太短"
 
-#: src/TextClient.cpp:693
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Connected to %s %s %s"
-msgstr "已连接到 %s %s %s"
-
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "有低ID"
+msgid "Keyword for search: %s"
+msgstr "搜索关键词：%s"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "有高ID"
-
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "正在连接"
-
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "未连接"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kad：搜索关键词已经在搜索列表中："
 
-#: src/TextClient.cpp:723
-#, c-format
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"\n"
-"Download:\t%s"
-msgstr ""
-"\n"
-"下载：\t%s"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
+msgstr "无法读取 node.dat 档案 - 版本 （0） 太旧，已经不再支持了。"
 
-#: src/TextClient.cpp:726
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"上传：\t%s"
-
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"队列长度：\t%d\n"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "读取 %u 个 Kad 联系人"
+msgstr[1] "读取 %u 个 Kad 联系人"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
-msgstr ""
-"\n"
-"源总数：\t%d\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
+msgstr "没有找到联系人，请尝试 bootstrap 或者下载一个 nodes.dat 文件。"
 
-#: src/TextClient.cpp:809
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "搜索结果数量：%i\n"
-
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "待办事项 - 显示搜索进度"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "只有 %d 个 Kad 联系人可用，nodes.dat 没有写入"
+msgstr[1] "只有%d个Kad联系人可用，nodes.dat没有写入"
 
-#: src/TextClient.cpp:828
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "从服务器收到未知的回复，操作码是 %#x."
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "显示简短的状态信息。"
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "显示连接状态，当前上传下载速度等等。\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "显示全部统计树。"
-
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"可选，一个0-255之间的数字可作为此命令的参数， \n"
-"用于设置用户版本树显示的节点数量。 n参数设为0表示无限制。\n"
-"\n"
-"示例： 'statistics 5' 将显示每个用户软件的5个版本。\n"
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "关闭aMule。"
-
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"关闭远程运行的服务程序（amule/amuled）,\n"
-"当远程服务程序不可用时，文本客户端也将关闭。\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "重新载入所给的对象。"
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "重新载入共享文件列表。"
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "重新从文件载入IP过滤表。"
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "连接至网络。"
-
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"这将连接至全部在设置中启用的网络。\n"
-"您也可以使用此格式（IP:端口）定义一个服务器地址，并只连接至此服务器。\n"
-"此IP必须是用点分隔的十进制IPv4地址，\n"
-"或者是可以解析的DNS名称。"
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "只连接eD2k。"
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "只连接Kad。"
-
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "断开网络。"
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "这将断开当前已连接的全部网络。\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "只断开eD2k。"
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "只断开 Kad 连接。"
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "添加eD2k或magnet链接。"
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
-msgstr ""
-"允许添加的eD2k链接：\n"
-"*) 文件链接（ed2k://|file|..），将添加至下载队列，\n"
-"*) 服务器链接（ed2k://|server|...），将添加至服务器列表，\n"
-"*) 或服务器列表链接，这种情况将添加此列表中的所有服务器至服务器列表。\n"
-"\n"
-"magnet链接必须包含eD2k校验码和文件大小。\n"
-"\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "设置一个参数值。"
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "设置IP过滤参数。"
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "开启用户和服务器的 IP 过滤。"
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "关闭用户和服务器的 IP 过滤。"
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "启动/禁用用户 IP 过滤。"
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "开启用户 IP 过滤。"
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "关闭用户 IP 过滤。"
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "启用/禁用服务器 IP 过滤。"
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "开启服务器 IP 过滤。"
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "关闭服务器 IP 过滤。"
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "选择 IP 过滤级别。"
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "已写入 %d 个 Kad 联系人"
+msgstr[1] "已写入%d个Kad联系人"
 
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
-msgstr ""
-"正确的 IP 过滤级别是在0-255之间，\n"
-"默认（初始）值是127。\n"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "文件名"
 
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "设置带宽限制。"
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "文件大小"
 
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "给此命令的值必须使用kB/s。\n"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "共享率"
 
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "设置上传带宽限制。"
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "已上传"
 
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "设置下载带宽限制。"
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "已请求"
 
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "获取并显示设置值。"
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "已接受"
 
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "获取 IP 过滤器设置。"
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "完成的源"
 
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "获取用户和服务器的 IP 过滤器状态。"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
+msgstr "警告：已知文件的列表已经损坏，包含有非法头部。"
+
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
+msgstr "在已知文件列表载入条目失败，文件可能损坏"
+
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
+msgstr "已知文件列表包含非法条目，文件可能损坏："
 
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "只获取用户的 IP 过滤器状态。"
+#: src/libs/common/Format.cpp:307
+#, fuzzy, c-format
+msgid "Unknown error %d"
+msgstr "未知版本"
 
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "只获取服务器的 IP 过滤器状态。"
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
+#, fuzzy, c-format
+msgid "Unable to get error description for error %d"
+msgstr "无法为下载创建目标文件%s"
 
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "获取 IP 过滤级别。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "正在校检"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "获取带宽限制。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "正在完成"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "进行搜索。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "完成"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"搜索类型必须使用设定的类型：\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"示例： 'search kad 文件' 将对 \"文件\"执行 Kad 搜索。\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "已暂停"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "执行全球搜索。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "已出错"
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "执行本地搜索"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "等待中"
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "执行 Kad 搜索"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "您必须输入非空密码。"
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "显示上次搜索的结果。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "非法密码，不是合法的MD5校验码！"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "返回以前搜索的结果。\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "连接失败"
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "显示搜索进度。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "远程连接失败，回复为空。"
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "显示搜索进度。\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "远程连接：错误回应，握手失败。连接已经关闭。"
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "开始下载文件"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "成功！已连接至 aMule"
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"必须指定上次搜索的文件数量。\n"
-"示例：'download 12' 将开始下载上次搜索结果中的12个文件。\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "成功！已经建立连接。"
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "停止下载。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "远程连接：访问被拒绝，原因："
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "继续下载。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "远程连接：握手失败。"
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "监听Socket: Ok."
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "取消下载。"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "错误：无法监听 TCP 端口。"
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "设置下载优先级。"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "错误："
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "设置下载的优先级为低、正常、高或自动。\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "警告："
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "设为低优先级。"
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "关闭"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "设为正常优先级。"
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "剪切"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "设为高优先级。"
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "复制"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "设为自动优先级。"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "粘贴"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "显示队列/列表。"
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "清除"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr "显示上传/下载队列，服务器列表或共享文件列表。\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "选择全部"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "显示上传队列。"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "kB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "显示下载队列。"
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "无限制"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "显示日志。"
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule 状态栏菜单"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "显示服务器列表。"
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "速度限制："
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "重设日志。"
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "上传：无"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "废弃的命令，请使用%s代替。"
+msgid "UL: %u"
+msgstr "上传：%u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr "这是一个已废弃的命令，将来可能被删除，请使用 '%s' 替代。\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "下载：无"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "错误： %s (%s) - %s"
+msgid "DL: %u"
+msgstr "下载：%u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "警告： %s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "下载速度：%.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "新的用户编号是 %u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "警告：你收到了低ID！"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\t大概这是因为您处在防火墙或路由器后面。"
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\t如需了解更多相关信息，请访问 http://wiki.amule.org"
+msgid "Upload speed: %.1f"
+msgstr "上传速度：%.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "收到未知服务器信息 ! - 长度过短"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "客户端信息"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "收到 %d 个新服务器"
-msgstr[1] "收到 %d 个新服务器"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "服务器列表保存完毕。"
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "服务器拒绝了上一个明令"
+msgid "Nickname: %s"
+msgstr "昵称：%s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "服务器数据包无效：%s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "未选择昵称"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "在处理从服务器接收的数据有无法处理的错误 : %s "
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "客户端 ID："
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "无法建立DNS线程以连接 %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "未连接"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "服务器 IP %s (%s) 已被过滤，不在连接。"
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "服务器名称："
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "使用迷惑协议。"
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "服务器 IP："
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "正在连接至 %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "未连接"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "无法查找服务器%s的DNS记录： 无法连接！"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country()：载入国家数据失败"
+msgid "IP: %s"
+msgstr "IP：%s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "%d个国旗标志已载入。"
-msgstr[1] "%d个国旗标志已载入。"
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr "您确定要删除分类中的所有下载文件吗?"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "需要确认"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "所有其它"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "未完成"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "活动"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "视频"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "音乐"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "归档"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "CD映象"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "图片"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "文本"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "选择显示过滤"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "新建分类"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "编辑分类"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "删除分类"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "文件名"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "文件大小"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "共享率"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "已上传"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "已请求"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "已接受"
+msgid "TCP port: %d"
+msgstr "TCP 端口：%d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "完成的源"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP 端口：未准备好"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "正在导入 %s：%s"
+msgid "UDP port: %d"
+msgstr "UDP 端口：%d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "正在读取临时文件夹"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UDP 端口：未准备好"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "正在从下载信息文件获取基本信息"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "在线统计： 启用"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "创建目标文件"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "在线统计： 禁用"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "从旧下载文件载入数据（%u 共 %u）"
+msgid "Uptime: %s"
+msgstr "运行时间：%s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "正在保存数据块至新的单个下载文件（%u 共 %u）"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "正在获取源下载文件信息"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "正在下载和保存新part文件"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "导入 part 文件"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "状态"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "文件校验码"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "等待中..."
+msgid "Shared files: %d"
+msgstr "共享文件：%d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (磁盘：%s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr "请选择一个目录用于搜索临时下载文件！（子目录也将被包括）"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "要删除成功导入下载的源文件吗？"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "删除源？"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "字节"
-msgstr[1] "字节"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "kB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "k"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "字节/秒"
-msgstr[1] "字节/秒"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "秒"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "分钟"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "小时"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "日"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "录像"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "存档"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "文本"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "程序"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "任何"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "未评级"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "无效 / 损坏 / 假冒"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "差"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "一般"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "好"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "很好"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "所有"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "其它"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "正在载入 IP 过滤文件 ipfilter.dat 和 ipfilter_static.dat。"
+msgid "Queued clients: %d"
+msgstr "排队用户：%d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "载入 ipfilter.dat 文件 '%s' 失败，遇到未知格式。"
+msgid "Total DL: %s"
+msgstr "总下载：%s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "载入 ipfilter.dat 文件 '%s' 失败，无法打开文件。"
+msgid "Total UL: %s"
+msgstr "总上传：%s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "载入 %u 个IP段自 %s。"
-msgstr[1] "载入 %u 个IP段自 %s。"
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "上传限制"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "丢弃了 %u 行错误数据。"
-msgstr[1] "丢弃了 %u 行错误数据。"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "下载限制"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "活跃连接 （1：%u）"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "隐藏 aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "文件信息"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "显示 aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%% 已完成"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "退出"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
-msgstr "eD2k链接："
+msgstr "eD2k 链接："
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "确定"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
-msgstr "点击此处将添加文本框中的eD2k链接至下载队列"
+msgstr "点击此处将添加文本框中的 eD2k 链接至下载队列。"
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr "此处显示系统事件。如需完整事件列表，请到服务器分页。"
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
-msgstr "正在载入"
+msgstr "正在载入..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
-msgstr "当前服务器上用户数 ..."
+msgstr "当前服务器上用户数..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "用户： 0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr "当前服务器上的用户和估算总用户数。"
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "上传：0.0 | 下载：0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
 msgstr "当前平均上传下载速度。括号中的值为于其他用户连接所消耗的带宽。"
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
 "low ID (firewalled) and green arrows signify that you have high ID (The "
 "optimal connection type)."
 msgstr ""
-"显示当前连接状态及当前传送状态。红色箭头表示未连接，黄色箭头表示低ID，绿色箭"
-"头表示正常连接。"
+"显示当前连接状态及当前传送状态。红色箭头表示未连接，黄色箭头表示低 ID (有防火"
+"墙)，绿色箭头表示正常连接(最佳连接方式)。"
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
-msgstr "未连接"
+msgstr "未连接..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
 msgstr "现在已连接的服务器。"
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "查找"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "名字："
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "类型"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "本地"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "全球"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
 msgstr "文件校验码"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "附加参数"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "过滤"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "文件类型"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "任何"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "存档"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "音乐"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "CD 镜像"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "图片"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "程序"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "文本"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "视频"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "扩展名"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "大小下限"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "字节"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "大小上限"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
-msgstr "最低源数"
+msgstr "可用来源数"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "过滤："
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "过滤结果"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "反向排序结果"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "隐藏已知文件"
 
-#: src/muuli_wdr.cpp:355
-msgid "More"
-msgstr "其他"
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "开始"
 
 #: src/muuli_wdr.cpp:356
+msgid "More"
+msgstr "更多"
+
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
-msgstr "基于eD2k搜索更多结果，咱不支持Kad。"
+msgstr "基于 eD2k 搜索更多结果。Kad 还不支持此功能。"
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "停止"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "下载"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
-msgstr "复位"
+msgstr "重置表单"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "搜索结果"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "清除已完成的下载"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "显示上传/上传队列"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "队列长度："
-
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "发送"
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "文件资源："
 
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "发送指定消息。"
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "关闭"
-
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "结束本次聊天。"
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "常规"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "全名："
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/A"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
 msgstr "met 文件："
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
 msgstr "校检码："
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "文件大小："
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "part 文件状态："
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "最后发现完整共享文件："
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "传输"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
-msgstr "已发现源："
+msgstr "已发现来源："
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
-msgstr "正在传输的源："
+msgstr "正在传输的来源："
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
-msgstr "文件部分数："
+msgstr "文件分块数量："
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "可用："
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "数据率："
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "下载活动时间："
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "已传输："
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "已完成大小："
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
-msgstr "智能损坏数据处理 (ICH)"
+msgstr "智能损坏数据处理"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "因数据损坏而丢失："
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "压缩效益："
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
-msgstr "由 ICH 挽救的数据包："
+msgstr "由 I.C.H. 挽救的数据包："
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "文件名"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
-msgstr "接管"
+msgstr "替换"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "清除"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "应用"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "确定"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
-msgstr "注释文件（文本将对全部用户可见）"
+msgstr "注释/评分文件（文本将对全部用户可见）"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"您可以说明电影的长度，情节和语言等等...\n"
-"如果电影是假冒的，您可以提醒其它用户。"
+"像电影的话，您可以说明它的长度、情节和语言等等...\\n\\n如果文件是假冒的，您可"
+"以提醒其它 aMule 用户。"
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "文件质量"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "未评分"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "无效 / 损坏 / 假冒"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "差"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "一般"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "好"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "很好"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
-msgstr "选择文件评级或者提醒其它用户该文件是无效的"
+msgstr "选择文件评分或者提醒其它用户该文件是无效的..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "刷新"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "正在下载，请等待 ..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
 msgstr "未知大小"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "必填信息"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP 地址："
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "端口："
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "附加信息"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "用户名："
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
 msgstr "用户编码："
 
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "刷新共享文件"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "本次运行"
-
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "总和"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "已请求："
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "活跃上传："
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "添加"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "下载速度"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "当前"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "动态平均值"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "本次运行平均值"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "上传速度"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "连接"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "活跃下载"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
-msgstr "活跃连接（1：1）"
+msgstr "活跃连接(1：1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "活跃上传"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "统计树"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "用户名："
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
 msgstr "用户编码："
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
-msgstr "用户软件："
+msgstr "客户端软件："
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
-msgstr "用户软件版本："
+msgstr "客户端软件版本："
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP 地址："
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
-msgstr "用户ID："
+msgstr "用户 ID："
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
-msgstr "服务器IP："
+msgstr "服务器 IP："
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "服务器名称："
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "迷惑协议："
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad："
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
-msgstr "上传"
+msgstr "客户端传输"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "当前请求："
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "平均上传速度："
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "平均下载速度："
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
-msgstr "上传（本次运行）："
+msgstr "上传 (本次运行)："
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
-msgstr "下载（本次运行）："
+msgstr "下载 (本次运行)："
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
-msgstr "上传总量："
+msgstr "上传 (总共)："
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
-msgstr "下载总量："
+msgstr "下载 (总共)："
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "分数"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
-msgstr "下载上传比率："
+msgstr "下载/上传比率："
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "安全身份认证："
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "评级（总和）："
+#: src/muuli_wdr.cpp:1410
+#, fuzzy
+msgid "Queue rank:"
+msgstr "队列级别"
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "队列积分："
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "昵称"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - Linux 平台的 Mule"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - 跨平台的骡子"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
-msgstr "这是其他用户看到的名字。"
+msgstr "其他用户连接到您的时候，他们会看到这个名字。"
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "语言"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "语言："
 
-#: src/muuli_wdr.cpp:1624
-msgid "This specifies the language used on controls."
-msgstr "选择界面语言。"
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "显示提示前的延迟时间。"
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "其它选项"
+#: src/muuli_wdr.cpp:1466
+msgid "This specifies the language used on controls."
+msgstr "这用来指定控制语言。"
 
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "启动时检查新版本"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
-msgstr "启用此选项将让aMule启动时检查新版本"
+msgstr "启用此选项将让 aMule 启动时检查新版本"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "启动后最小化"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
-msgstr "启用后aMule启动后立即最小化。"
+msgstr "启用后 aMule 启动后立即最小化。"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "退出时确认"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
-msgstr "退出前确认。"
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
+msgstr "让 aMule 在退出前进行询问。"
+
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr ""
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "启用状态栏图标"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "启用/禁用系统状态栏图标。"
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "最小化至系统状态栏图标"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
-msgstr "启用此选项将使aMule最小化到系统状态栏，而不是任务栏。"
+msgstr "启用此选项将使 aMule 最小化到系统状态栏，而不是任务栏。"
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "提示延迟时间（秒）"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "提示延时："
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "显示提示前的延迟时间。"
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "秒"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "浏览器选择"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr ""
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "请选择您的网络浏览器"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "其它浏览器"
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
-msgstr ""
-"请输入网络浏览器名称。如需使用自定义浏览器，在以上弹出菜单中选择自定义。"
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
+msgstr "在此处输入您的浏览器名称，如要使用系统默认浏览器则请留空。"
+
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "浏览"
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
-msgstr "在新标签页中打开"
+msgstr "如果可能的话，在新标签页中打开"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
-msgstr "如果可能的话在新的标签页中打开而不是新的窗口"
+msgstr "如果可能的话，在新的标签页中打开而不是新的窗口"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
-msgstr "录像播放器"
-
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "为预览创建备份"
+msgstr "视频播放器"
 
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "带宽限制"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "上传"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
-msgstr "单用户上传速度"
+msgstr "槽速度"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "标准用户 TCP 端口："
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "端口"
 
-#: src/muuli_wdr.cpp:1796
-msgid "This is the standard eD2k port and cannot be disabled."
-msgstr "这是标准的eD2k端口，不能被禁用。"
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "标准 TCP 端口 "
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "扩展用户 UDP 端口："
+#: src/muuli_wdr.cpp:1611
+msgid "This is the standard eD2k port and cannot be disabled."
+msgstr "这是标准的 eD2k 端口，不能被禁用。"
 
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr "此UDP端口用于扩展eD2k请求和Kad网络"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "用户服务器请求的 UDP 端口(TCP+3)："
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "禁用"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "扩展 UDP 端口(Kad/全局搜索)"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "绑定地址"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "用于扩展的服务器请求的 UDP 端口 (TCP+3)：4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "单个文件最大源数"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr "此 UDP 端口用于扩展 eD2k 请求和 Kad 网络"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "硬限制"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "启用 UPnP 以用于路由器端口转发"
+
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnP 的 TCP 端口(可选)："
+
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "为本地地址绑定 IP(全部绑定则留空)："
+
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr "只限高级用户：如果您有多个网络接口，请输入 aMule 将要绑定接口的地址。"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "连接限制"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "最大连接数"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "每个下载文件的最大的源数量："
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "最大同时连接："
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
-msgstr "Kad"
+msgstr "Kademlia"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "通用即插即用（UPnP）"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "启用UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP的TCP 端口"
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "启动后自动连接"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "断线后自动重连"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "显示通信开销带宽"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "服务器选项"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "如果"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "次连接失败，则删除该服务器。"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "启动时自动更新服务器列表"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "列表"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "与服务器连接时更新服务器列表"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
-msgstr "与其它用户连接时更新服务器列表"
+msgstr "与其他用户连接时更新服务器列表"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "启用优先级系统"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
-msgstr "连接时启用智能低ID检测"
+msgstr "连接时启用智能低 ID 检测"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "安全连接"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "只自动连接到静态服务器列表里的服务器"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "设置用户输入的服务器为高优先级"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "启用ICH"
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "高级智能损坏数据处理(AICH)信任所有校验码（建议不要使用）"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "智能损坏数据处理(I.C.H.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "启用"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "高级 I.C.H.，信任全部校验值（不推荐）"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "添加新下载文件时设为暂停状态"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
-msgstr "添加新下载文件时设优先级为自动"
+msgstr "添加新下载文件时设定优先级为自动"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "尝试先下载文件的第一段和最后一段"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "添加新共享文件时设优先级为自动状态"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "尝试传送完整数据段给所有用户"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
-msgstr "文件下载完毕时开始下一个暂停的文件"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
+msgstr "当一个文件完成时开始下一个暂停的文件"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
 msgstr "来自同一分类"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "保存稀有文件（少于20个源）的10个源"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "依照字母顺序"
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "磁盘空间"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "为新文件预分配磁盘空间"
+
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr "为新文件分配全部所需的磁盘空间，这样可以减少碎片"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "检查磁盘空间"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "停止下载当可用磁盘空间只有"
 
-#: src/muuli_wdr.cpp:2058
+#: src/muuli_wdr.cpp:1819
 msgid "Select this if you want aMule to check your disk space"
 msgstr "要求检查磁盘空间"
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "最小磁盘空间："
-
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "请输入最低硬盘空间。"
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "为新文件预分配磁盘空间"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "保存稀有文件（少于20个源）的10个源"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr "为新文件分配全部所需的磁盘空间，这样可以减少碎片"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "上传"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "传入"
-
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "临时"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "共享"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "添加新共享文件时设优先级为自动"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "存放下载文件的文件夹"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "存放临时下载文件的文件夹"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "共享的文件夹"
+
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
-msgstr "（鼠标右键单击文件夹图标来递归共享）"
+msgstr "(鼠标右键单击文件夹图标来递归共享)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "共享隐藏文件"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "图表"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "刷新延迟：5 秒"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "平均值图表显示时间：100 分钟"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
-msgstr "连接图表尺寸：100 "
+msgstr "连接图表尺寸：100"
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "选择统计图表使用颜色"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "下载图表尺寸："
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "上传图表尺寸："
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "颜色："
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "背景"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "网格"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "目前下载"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "动态平均下载"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "本次运行平均下载"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "目前上传"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "动态平均上传"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "本次运行平均上传"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "活跃连接"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "系统状态栏图标速度显示"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "当前 Kad 节点"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "运行的 Kad 节点"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "本次运行的 Kad 节点"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "选择"
 
-#: src/muuli_wdr.cpp:2214
-msgid "Number of Client Versions shown (0=unlimited)"
-msgstr "显示用户软件版本的数量（0代表不限制）"
-
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "连接带宽"
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "树"
 
-#: src/muuli_wdr.cpp:2249
-#, fuzzy
-msgid "Note: These values are only used for statistics."
-msgstr ""
-"注意：这些数值只作为统计用途。\n"
-" "
+#: src/muuli_wdr.cpp:2000
+msgid "Number of Client Versions shown (0=unlimited)"
+msgstr "显示用户软件版本的数量(0代表不限制)"
 
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "！！！警告！！！"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-"注意：如果你不清楚以下设置的含义请不要随意更改，\n"
-"否则你可能弄巧成拙。即使不改动这些设置，aMule\n"
-"也完全可以正常运行。"
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "高级设置"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "5 秒内最大新连接数"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "文件缓冲：24000 字节"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "上传队列长度：5000 用户"
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "服务器连接刷新周期：禁用"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "下载队列文件进度"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "显示百分比"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "停用电脑自动进入待命模式功能"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "要使用的皮肤："
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "在全部窗口都显示“快捷 eD2k 链接处理栏”。"
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "显示进度条"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
+msgstr "在分类页中显示附加信息"
+
+#: src/muuli_wdr.cpp:2107
+#, fuzzy
+msgid "Show application version on title"
+msgstr "标题栏显示传送速度"
+
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "标题栏显示传送速度"
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "进度条风格"
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "程序名称之前"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "程序名称之后"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "显示额外开销的带宽"
 
-#: src/muuli_wdr.cpp:2351
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "垂直显示工具栏"
+
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "显示客户端的国旗"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "下载队列文件"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "显示进度百分比"
+
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "显示进度条"
+
+#: src/muuli_wdr.cpp:2144
 msgid "Flat"
 msgstr "扁平"
 
-#: src/muuli_wdr.cpp:2354
+#: src/muuli_wdr.cpp:2150
 msgid "Round"
 msgstr "圆润"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "皮肤支持"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "启用皮肤支持"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "皮肤："
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- 没有皮肤可用 -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "列排序"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "自动排序文件(高 CPU 占用)"
 
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "自动排列下载队列中的文件 (大CPU用量)"
-
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp:2157
 msgid "aMule will sort the columns in your download list automatically"
-msgstr "自动逐列排序"
-
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "界面设置"
+msgstr "aMule 会自动将下载列表按列排序"
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "显示快速eD2k链接处理器"
-
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
-msgstr "在分类页中显示附加信息"
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "远程连接参数"
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "标题栏显示传送速度"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "接受远程连接"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "垂直显示工具栏"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "监听接口的 IP："
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "在文件名前显示 part 文件编号"
+#: src/muuli_wdr.cpp:2190
+msgid ""
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
+msgstr ""
+"在此输入正确的 IP(格式：a.b.c.d)用于监听远程连接接口。空着不填或者 0.0.0.0 表"
+"示任何接口。"
 
-#: src/muuli_wdr.cpp:2434
-msgid "Web server parameters"
-msgstr "Web服务器参数"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "TCP 端口："
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "开启时运行Web服务器"
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
+msgstr "为远程连接端口启用 UPnP"
 
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "Web服务器端口"
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "密码"
 
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "为Web服务器端口启用UPnP"
+#: src/muuli_wdr.cpp:2221
+msgid "Web server parameters"
+msgstr "Web 服务参数"
 
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "Web服务器UPnP使用的TCP端口"
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "启动时运行 Web 服务"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "页面刷新周期 (秒)"
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "Web 模板"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "启用gzip压缩"
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "最高权限密码"
 
-#: src/muuli_wdr.cpp:2477
+#: src/muuli_wdr.cpp:2243
 msgid "Enable Low rights User"
 msgstr "启用低权限用户"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "最高权限密码"
-
-#: src/muuli_wdr.cpp:2490
+#: src/muuli_wdr.cpp:2249
 msgid "Low rights password"
 msgstr "低权限密码"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "Web模板"
-
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "远程连接参数"
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "为 Web 服务端口启用 UPn P端口转发"
 
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "接受远程连接"
-
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr ""
-"监听IP\n"
-"（留空则监听全部）"
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "Web 服务器 UPnP 的 TCP 端口(可选)"
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
-msgstr "在此输入正确的IP（格式：a.b.c.d）用于监听远程连接接口。"
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "页面刷新周期(秒)"
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP端口"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "启用 Gzip 压缩"
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
-msgstr "为远程连接端口启用UPnP"
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "确定"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "点击这里立即使用新的设置。"
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "取消所有设置改动。"
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "标题："
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "注释："
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "下载文件目录："
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "设置新加入的文件优先级为 :"
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+#, fuzzy
+msgid "Don't change"
 msgstr "不要改变"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "选择该类别颜色 (当前选择) :"
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "连接后显示服务器当日通告"
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "服务器信息"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "重置"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
 msgstr "按此按钮清空日志."
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule 日志"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
 msgstr "按此按钮从该网址更新服务器列表 ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "服务器列表"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
 msgstr "输入 server.met 文件的地址，然后按此按钮更新服务器列表。"
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "手动添加服务器：名称"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "在此输入新服务器的名称"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP地址:端口"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "输入新服务器的 IP 地址（x.x.x.x格式）。"
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "在此请输入服务器端口。"
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "添加新服务器（先填写左侧的内容） ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule 日志"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "服务器信息"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
 msgstr "ED2K 信息"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad 信息"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
 msgstr "按此更新节点列表自网址..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "节点（0）"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
 msgstr "输入 nodes.dat 文件的地址并按左边的按钮以更新已知节点列表"
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "节点状态"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "启动"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "新节点"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP："
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "端口："
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
 msgstr "从已知用户启动"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "断开 Kad"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2k信息"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "使用安全用户认证"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr "建议使用此选项，如果安全用户认证没有启用，将不会接收信用证明。"
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "迷惑协议"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "支持迷惑协议"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
 msgstr "此选项启用了迷惑协议，可让aMule接受其他用户用迷糊协议的连接"
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "为传出连接使用迷惑协议"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
 msgstr "此选项使aMule在连接其他用户或服务器时使用迷惑协议。"
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "只接受迷惑协议连接"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
@@ -5797,967 +3934,1399 @@
 "此选项让aMule只接受迷惑协议连接，源相对来说会更少，但全部数据包都将进行迷惑处"
 "理"
 
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "文件选项"
-
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "任何人"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "没人"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "谁可以查看我共享的文件： "
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "谁可查看我的共享文件："
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "选择可以浏览共享文件列表的用户。"
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP 过滤"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "过滤用户"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "过滤在文件~/.aMule/ipfilter.dat中定义的用户IP"
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "过滤服务器"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "过滤在文件~/.aMule/ipfilter.dat中定义的服务器IP"
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "刷新列表"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "更新IP 地址过滤列表 ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "地址："
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "立即更新"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "启动后自动更新IP 地址过滤列表"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "过滤级别："
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "永远过滤局域网 IP 地址"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "处理不匹配的 IP"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
 msgstr "拒绝用户IP不同于接收包中的IP的数据包，请谨慎使用。"
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "在可用的情况下使用系统级的 ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
 msgstr "如果没有找到本地 ipfilter.dat 文件，则允许使用系统级的IP过滤文件。"
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "使用安全用户认证"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr "建议使用此选项，如果安全用户认证没有启用，将不会接收信用证明。"
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "启用在线统计"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
 msgstr "输出该文件以用于在线统计等等。"
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "更新频率（秒）："
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "更改在线统计文件的更新频率（秒）。"
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "在线统计目录："
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "保存在线统计文件在："
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr "点击选择包含在线统计文件的目录。"
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "禁用/启用"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "过滤收到的消息（不包括当前对话）："
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "过滤选项："
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "过滤所有消息"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "过滤来自好友列表外的消息"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "过滤来自未知用户的消息"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "过滤包含以下内容的消息（用半角逗号分隔）："
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr "输入需过滤的词组"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "在日志中显示接收的消息"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "备注"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "过滤包含以下内容的备注（使用‘,’作为分隔符）："
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "自动连接服务器时忽略代理设置"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "启用验证："
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "启用/禁用用户名/密码验证"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "用户名："
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "连接代理服务器的用户名"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "密码："
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "连接代理服务器的密码"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "启用代理"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "启用/禁用代理支持"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "代理类型："
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "正在连接的代理服务器类型"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "代理服务器："
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "代理服务器名称"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
 msgstr "代理端口："
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
 msgstr "代理端口"
 
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "验证"
-
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "启用验证："
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "启用/禁用用户名/密码验证"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "连接代理服务器的用户名"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "密码："
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "连接代理服务器的密码"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "自动连接服务器时忽略代理设置"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "连接到："
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "登录远程 amule"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "用户名"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "记住这些设置"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "启用详细调试日志。"
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "消息分类："
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "等待中..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
 msgstr "添加导入文件"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
 msgstr "重试所选"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
 msgstr "删除所选"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "事件类型"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr "所选文件的统计和队列用户：会话/全部时间"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "活跃上传："
+
+#: src/muuli_wdr.cpp:3368
+#, fuzzy
+msgid "Percent of total files"
+msgstr "全部文件的百分比"
+
+#: src/muuli_wdr.cpp:3415
+#, fuzzy
+msgid "All files"
+msgstr "所有共享文件"
+
+#: src/muuli_wdr.cpp:3416
+#, fuzzy
+msgid "Selected files"
+msgstr "选择显示过滤"
+
+#: src/muuli_wdr.cpp:3417
+#, fuzzy
+msgid "Active uploads only"
+msgstr "活跃上传"
+
+#: src/muuli_wdr.cpp:3419
+#, fuzzy
+msgid "Show Clients for"
+msgstr "显示用户"
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "重新载入："
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "刷新共享文件"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "发送"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "发送指定消息。"
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "结束本次聊天。"
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "连接至任何服务器和/或 Kad"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "网络窗口"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "共享文件"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "搜索窗口"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "已禁用 [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "文件传送窗口"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "字节"
+msgstr[1] "字节"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "共享文件窗口"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "kB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "消息窗口"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "统计图窗口"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "k"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "设置窗口"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "新分类"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "请选择下载文件夹"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "必须定义分类名称！"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "字节/秒"
+msgstr[1] "字节/秒"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "必须定义分类路径！"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr "无法建立该分类的接收文件夹，请给出一个有效的分类路径！"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "秒"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "分钟"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "小时"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "日"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "所有"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "其它"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "未完成"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "已停止"
+
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "视频"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "归档"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "文本"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "活动"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "未知扩展选项 '%s' 用于命令 '%s'。\n"
+msgid "Using config dir: %s"
+msgstr "使用配置目录：%s"
+
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "等待partfile转换线程结束..."
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "未知命令 '%s'。\n"
+msgid "Importing %s: %s"
+msgstr "正在导入 %s：%s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"此命令不需要参数。\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "正在读取临时文件夹"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"此命令必须要参数。\n"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "正在从下载信息文件获取基本信息"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "创建目标文件"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "从旧下载文件载入数据（%u 共 %u）"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "正在保存数据块至新的单个下载文件（%u 共 %u）"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "正在获取源下载文件信息"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "正在下载和保存新part文件"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "导入 part 文件"
+
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "状态"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "文件校验码"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (磁盘：%s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
-msgstr ""
-"\n"
-"此命令不完整，您必须使用以下中的一个扩展选项。\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
+msgstr "请选择一个目录用于搜索临时下载文件！（子目录也将被包括）"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
-"\n"
-"可用扩展选项：\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "要删除成功导入下载的源文件吗？"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "可用命令：\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "删除源？"
+
+#: src/PartFile.cpp:298
+#, fuzzy
+msgid "ERROR: Failed to create partfile"
+msgstr "错误：无法创建 part 文件)"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"全部命令都不区分大小写。\n"
-"输入 '%s <命令>' 获取在 <命令> 中的详细信息。\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "尝试从 %s 载入 met 文件的备份"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "退出程序。"
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "错误：无法打开part.met文件：%s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "显示帮助。"
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "错误：part.met文件大小为0： %s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
-msgstr ""
-"输入 'help <命令>' 可显示命令的帮助。\n"
-"输入 'help' 可显示全部命令列表。\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "错误：非法的part.met文件版本：%s ==> %s"
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:595
+#, fuzzy, c-format
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr "错误：文件 %s（%s）已损坏（标签数不对），无法读取文件。"
+
+#: src/PartFile.cpp:606
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
-msgstr ""
-"\n"
-"使用 '%s' 列出所有命令\n"
-"\n"
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+msgstr "错误：文件 %s（%s）已损坏（标签数不对），无法读取文件。"
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "语法错误！"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "尝试恢复文件信息..."
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr "处理指令时发生意外错误！请提交错误报告\n"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "尝试恢复无名文件 - 保存为 RecoveredFile.dat"
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "此命令不需要任何参数。"
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "成功恢复所有文件信息 :D - 尝试使用文件信息..."
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "此命令必须要参数。"
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "无法恢复文件：("
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "无效参数"
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "无法读取 %s（%s）"
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "此命令不完整。"
+#: src/PartFile.cpp:715
+#, c-format
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "警告：%s可能已损坏（%i）"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:897
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "输入 '%s' 显示更多帮助信息。\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "part 文件存盘时发生错误：%s（%s => %s）"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "保存partfile时，发生磁盘读写错误："
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "这是 %s %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "无法获取%s的大小 - 正在使用%s文件。"
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:925
 #, c-format
-msgid "This is %s %s\n"
-msgstr "这是 %s %s\n"
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "'%s' 文件长度为 0 - 使用 %s 文件。"
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "%s 的 part.met.seeds 文件存盘失败"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "保存了 %i 个源给 part 文件 %s（%s）"
+msgstr[1] "保存了 %i 个源给 part 文件 %s（%s）"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "Part 文件 %s（%s）没有种子文件"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "Part 文件 %s（%s）的种子文件为空"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "读取 part 文件的种子文件出错（%s - %s）：%s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
-msgstr ""
-"\n"
-"正在建立用户...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"发现损坏的数据块 (%d) 于%d段文件 %s - 文件结果校检码 |%s| 文件校检码 |%s|"
+msgstr[1] ""
+"发现损坏的数据块 (%d) 于%d段文件 %s - 文件结果校检码 |%s| 文件校检码 |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "发现了已完成的数据段 %i 在%s"
+
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "重新校验 %s 完成"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "在完成文件%s时遇到意外文件错误，文件已暂停"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "完成下载：%s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "正在删除文件：%s "
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr "警告：无法为已下载的数据段计算校检码 - 校检码集不完整 '%s'"
+
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"完成，正在退出 %s...\n"
+"警告：无法生成校检码 - 校检码集不完整（%s）， 正常情况下这是不应该发生的"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
-msgstr ""
-"不能使用空密码连接，\n"
-"你必须在配置文件\n"
-"或在命令行设置一个，或者在询问时输入。\n"
-"\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
+msgstr "文件结束 当下载  %u 长度 %u (最大 %u) partfile '%s'长度 %u: %s"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "显示帮助信息。"
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "警告：硬盘空间不足！暂停文件：%s"
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "aMule正在运行的主机。(缺省：localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "下载的数据段 %i 已损坏 文件： (%s)"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "aMule的远程连接端口。（默认：4712）"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH：修复了损坏的数据段 %i（%s），挽救数据（字节）： %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "远程连接密码。"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "正在分配"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "从文件读取设置。"
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "磁盘空间不足"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "不打印任何信息到控制台。"
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "已下载"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "详细显示调试信息。"
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "错误：打开part文件'%s'失败"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "设置程序地区(语言)。"
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "系统默认"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "把命令行参数写入设置文件。"
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "阿尔巴尼亚语"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "基于aMule的设置文件建立新设置文件。"
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "阿拉伯语"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "打印程序版本。"
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "澳大利亚"
 
-#: src/ClientCreditsList.cpp:168
-#, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "积分文件已载入，%u个已知用户"
-msgstr[1] "积分文件已载入，%u个已知用户"
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "巴斯克语"
 
-#: src/ClientCreditsList.cpp:171
-#, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - %u 个用户的积分已过期"
-msgstr[1] " - %u 个用户的积分已过期"
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "保加利亚语"
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "文件 'crytkey.dat' 未找到，正在创建。"
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "加泰罗尼亚语"
 
-#: src/amuled.cpp:594
-msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
-msgstr ""
-"错误：当远程连接被禁用的时，aMule服务程序无法使用，要启用远程连接，请使用标准"
-"的aMule，或使用 --ec-config选项启动amuled或在文件 ~/aMule/amule.conf 中设置选"
-"项\"AcceptExternalConnections\""
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "简体中文"
 
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "错误：%s"
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "繁体中文"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "取消封杀"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "显示上传"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "显示队列"
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "克罗的亚语"
 
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "显示用户"
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "捷克语"
 
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "选择视角"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "用户软件"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "已等待"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "上传时间"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "上传/下载"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "远程状态"
-
-#: src/ClientListCtrl.cpp:699
-#, c-format
-msgid "QR: %u"
-msgstr "排队顺序：%u"
-
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "文件优先级"
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "丹麦语"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "分数"
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "荷兰语"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "已请求"
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "英语（英国）"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "最后连接"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "进入队列"
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "爱斯托尼亚语"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "上传状态"
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "芬兰语"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "已传输"
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "法语"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "下载状态"
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "加利西亚语"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "已传输"
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "德语"
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "用户编码"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "已加密"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "隐藏共享文件"
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "希腊语"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "用户信息"
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "希伯来语"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "已启用"
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "匈牙利语"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "已支持"
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "意大利语"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "不支持"
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "意大利语（瑞士）"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "已禁用"
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "日语"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "韩语"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "未完成"
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "立陶宛语"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "坏蛋"
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "新挪威语"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "验证已通过"
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "芬兰语"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "葡萄牙语"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "葡萄牙语（巴西）"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "俄语"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "斯洛文尼亚语"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "西班牙语"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "瑞典语"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "土耳其语"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "乌克兰"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "更改语言"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr ""
+
+#: src/Preferences.cpp:771
+#, fuzzy
+msgid "No languages available"
 msgstr "不可用"
 
-#: src/ClientDetailDialog.cpp:215
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "无选项可用"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "发现无效的分类，跳过"
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr "TCP端口不可高于65532，因为服务器UDP端口值为TCP端口值+3"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "%u (QR: %u)"
-msgstr "%u（排队顺序：%u）"
+msgid "Default port will be used (%d)"
+msgstr "缺省端口将被使用（%d）"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr "最小值必须小于最大值，最大值已被忽略。"
+#: src/Preferences.cpp:1790
+#, c-format
+msgid "Dropping non-existing shared directory: %s"
+msgstr "丢弃不存在共享目录：%s"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "搜索警告"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "连接"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "无限制"
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "目录"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule 状态栏 菜单"
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "服务器"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "速度限制："
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "文件"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "上传：无"
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "安全"
 
-#: src/MuleTrayIcon.cpp:354
-#, c-format
-msgid "UL: %u"
-msgstr "上传：%u"
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "界面"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "下载：无"
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "代理"
 
-#: src/MuleTrayIcon.cpp:364
-#, c-format
-msgid "DL: %u"
-msgstr "下载：%u"
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "过滤"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "远程控制"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "在线统计"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "高级"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "事件"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "调试"
+
+#: src/PrefsUnifiedDlg.cpp:249
+msgid ""
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
+msgstr ""
+"以下变量将被被替换：    %PARTFILE - 文件的完整路径\n"
+"    %PARTNAME - 只有文件名"
+
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+"如果您不清楚以下设置的\n"
+"含义，请不要随意更改，\n"
+"否则您可能弄巧成拙。\n"
+"\n"
+"即使不改动这些设置，aMule\n"
+"也完全可以正常运行。"
+
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "下载速度：%.1f"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "使用ID %d和密匙%s连接Cfg到小插件失败"
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:399
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "上传速度：%.1f"
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr "通过ID %d和密匙%s把数据从Cfg转移到小插件失败"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "用户信息"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "正在连接的代理服务器类型"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:534
 #, c-format
-msgid "Nickname: %s"
-msgstr "昵称：%s"
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr "通过ID %d和密匙%s把数据从小插件转移到Cfg失败"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "未选择昵称"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr "重启aMule后设置才能生效：\n"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "用户ID："
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP端口已更改。\n"
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "服务器名称："
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP端口已更改。\n"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "服务器IP："
+#: src/PrefsUnifiedDlg.cpp:606
+#, fuzzy
+msgid "- External connect port changed.\n"
+msgstr "已关闭远程连接。"
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP：%s"
+#: src/PrefsUnifiedDlg.cpp:610
+#, fuzzy
+msgid "- External connect acceptance changed.\n"
+msgstr "新的远程连接已被接受"
 
-#: src/MuleTrayIcon.cpp:425
+#: src/PrefsUnifiedDlg.cpp:614
+#, fuzzy
+msgid "- External connect interface changed.\n"
+msgstr "已关闭远程连接。"
+
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"您的自动更新服务器列表是可空的，\n"
+"启动时自动更新服务器列表功能将被禁用。"
+
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"您已经启用了远程连接但还没有设置密码。\n"
+"远程连接在没有有效密码的情况下不能使用。"
+
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- 语言已更改。\n"
+
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- 临时文件目录已更改。\n"
+
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "-ED2K网络已启用。\n"
+
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"eD2k和Kad网络都已被禁用，\n"
+"你至少要启用其中的一项才能连接。"
+
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"如果你的 UDP 端口被禁用，Kad 将不能启动。\n"
+"启动 UDP 端口或禁用 Kad。"
+
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"你必须现在重启aMule，\n"
+"如果现在不重启的话，出现任何问题可别怪别人。\n"
+
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"您的自动更新服务器列表是的空的，\n"
+"请输入至少一个指向有效 server.met 的网址，\n"
+"点击这个勾选框旁边的\"列表\"按钮然后输入网址。"
+
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "临时文件"
+
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "传入文件"
+
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "在线统计"
+
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "TCP port: %d"
-msgstr "TCP端口：%d"
+msgid "Choose a folder for %s"
+msgstr "为%s选择文件夹"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "TCP端口：未准备好"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "浏览寻找视频播放器"
 
-#: src/MuleTrayIcon.cpp:436
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "选择浏览器"
+
+#: src/PrefsUnifiedDlg.cpp:1033
 #, c-format
-msgid "UDP port: %d"
-msgstr "UDP端口：%d"
+msgid "Executable%s"
+msgstr "可执行%s"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "UDP端口：未准备好"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "编辑服务器列表"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "在线统计： 启用"
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"加入下载 server.met 文件的网址，每行只限一个网址。\n"
+" "
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "在线统计： 禁用"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "刷新时间：%d秒"
+msgstr[1] "刷新时间：%d秒"
 
-#: src/MuleTrayIcon.cpp:463
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "Shared files: %d"
-msgstr "共享文件：%d"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "平均值图表显示时间：%d分钟"
+msgstr[1] "平均值图表显示时间：%d分钟"
 
-#: src/MuleTrayIcon.cpp:469
+#: src/PrefsUnifiedDlg.cpp:1127
 #, c-format
-msgid "Queued clients: %d"
-msgstr "排队用户：%d"
+msgid "Connections Graph Scale: %d"
+msgstr "网络连接图表缩放：%d"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "Total DL: %s"
-msgstr "总下载：%s"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "文件缓冲区大小：%d字节"
+msgstr[1] "文件缓冲区大小：%d字节"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Total UL: %s"
-msgstr "总上传：%s"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "上传队列长度：%d个用户"
+msgstr[1] "上传队列长度：%d个用户"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "上传限制"
+#: src/PrefsUnifiedDlg.cpp:1152
+#, c-format
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "服务器连接刷新周期：%d分钟"
+msgstr[1] "服务器连接刷新周期：%d分钟"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "下载限制"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "服务器连接刷新周期：已禁用"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "隐藏 aMule"
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "禁用"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "显示 aMule"
+#: src/PrefsUnifiedDlg.cpp:1222
+#, fuzzy, c-format
+msgid "Execute command on '%s' event"
+msgstr "发生 '%s' 事件时执行命令"
+
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "在核心启用执行命令"
+
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "核心命令："
+
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "在图形界面端启用执行命令"
+
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "图形界面命令："
+
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr "以下变量将被替换："
+
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr "最小值必须小于最大值，最大值已被忽略。"
+
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "搜索警告"
+
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "主要"
+
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad搜索不能使用，因为Kad没有连接"
+
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "eD2k未连接时eD2k搜索无法进行"
+
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "尝试Kad搜索时出现不可预料的错误："
+
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "文件编号"
+
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "文件"
+
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "下载分类"
+
+#: src/SearchListCtrl.cpp:639
+#, fuzzy, c-format
+msgid "Get %s for this file"
+msgstr "添加附加链接到该文件"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "搜索相关文件（eD2k，本地服务器）"
 
-#: src/ChatSelector.cpp:127
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "标记为已知文件"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "复制eD2k链接至剪贴板"
+
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "已取消"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "新建"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr "无法连接至列出的全部迷惑协议服务器，尝试不使用迷惑协议。"
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "无法连接列表中的所有服务器. 开始新的一轮尝试."
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "设置中已禁用eD2k网络，将不会连接。"
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "服务器列表中没有可以连接的服务器"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "聊天已开始：%s（%s：%u）- %s %s"
+msgid "Connected to %s (%s:%i)"
+msgstr "已连接至 %s (%s:%i)"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** 已连接到用户 ***"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "已成功连接到：%s"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** 正在连接用户 ***"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr "尝试连接时出现严重错误，网络可能没有连接"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** 无法连接用户/连接中断 ***"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "连接已断开 %s（%s：%i）"
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "关闭分页"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s（%s：%i）可能已当机"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "关闭所有分页"
+#: src/ServerConnect.cpp:373
+#, c-format
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s（%s：%i）可能已没有空位"
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "关闭其它分页"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "服务器自动连接会在 %d 秒后重新尝试"
+msgstr[1] "服务器自动连接会在 %d 秒后重新尝试"
+
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "连接已断"
+
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "连接失败 %s（%s：%i）"
 
-#: src/ServerList.cpp:84
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "错误：连接超时，端口无效"
+
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "连接超时 %s（%s：%i）"
+
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "获取更新的DNS查询结果，丢弃。"
+
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "正在载入 server.met 文件：%s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "找不到server.met 文件"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
 msgstr "载入 server.met 文件 '%s' 失败，遇到未知格式。"
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "无法打开 server.met 文件"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
 msgstr "Server.met 文件损坏，发现错误的版本标记：0x%x，大小 %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "server.met 中找到%i个服务器"
 msgstr[1] "server.met 中找到%i个服务器"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "新增%d个服务器"
 msgstr[1] "新增%d个服务器"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "错误: 文件 'server.met' 已经损坏: "
+
+#: src/ServerList.cpp:182
+#, fuzzy
+msgid "IO error while reading 'server.met': "
+msgstr "读取 %s 文件时发生 IO 错误：%s"
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "没有添加服务器：[%s：%d] 端口无效"
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "没有添加服务器：[%s：%d] IP 地址无效"
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr "没有添加服务器： 服务器列表中已有[%s：%d]"
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
 msgstr "成功添加服务器：[%s:%d] 服务器名为 '%s'"
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr "您在连接您已决定删除的服务器，请断开连接。"
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "无法读取 '%s'"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "无法 server.met 保存"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "无效 URL"
 
-#: src/ServerList.cpp:805
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Finished to download the server list from %s"
-msgstr "从 %s 下载服务器列表完成"
-
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "无法从 %s 下载服务器列表"
+msgid "Finished downloading the server list from %s"
+msgstr "从%s下载服务器列表完成"
 
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6765,321 +5334,2345 @@
 "addresses.dat文件内没有服务器列表地址，请粘贴一个有效服务器列表地址到该文件以"
 "自动更新服务器列表."
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "正在开始从 %s 下载服务器列表"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "警告：自动下载服务器列表的地址错误：%s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "addresses.dat 文件中没有有效的自动更新服务器列表URL"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "无法从 %s 下载服务器列表"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr "本地服务器被IP过滤器过滤掉了，正在重新连接至其他服务器！"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "执行`%s' 事件中的命令`%s' 失败。"
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "服务器名称"
 
-#: src/amule.cpp:703
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr "对不起,由于版本变动,您的地区设置已经被变为系统默认值。"
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "地址"
+
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "端口"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "描述"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "响应时间"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "用户数"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "静态"
 
-#: src/amule.cpp:786
+#
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "版本"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
-msgstr ""
-"在服务器列表中没有任何服务器。\n"
-"需要aMule现在就下载一个新的列表吗？"
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
+msgstr "现在正连接在要删除的服务器。该服务器暂时无法删除。请先断开连接。"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "服务器列表已下载"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "（未知名称）"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "web server running on pid %d"
-msgstr "Web服务器正在运行，进程编号为%d"
+msgid "Are you sure you want to delete the static server %s"
+msgstr "您确定要删除静态服务器 %s ?"
 
-#: src/amule.cpp:850
-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 ""
-"您要求启动时运行Web服务器，但amuleweb程序无法运行，请先安装包含Web服务器的"
-"aMule版本，或者使用 --enable-webserver选项编译aMule，然后运行make install进行"
-"安装"
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "服务器（%i）"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "服务器"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "连接到服务器"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "标记服务器为静态"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "标记服务器为非静态"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "标记服务器为静态"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "标记服务器为非静态"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "删除服务器"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "删除服务器"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "删除所有服务器"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "复制eD2k链接至剪贴板"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "重新连接到服务器"
 
-#: src/amule.cpp:937
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "您确定要删除所有服务器吗？"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "您确定要删除已选的服务器吗？"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "您确定要删除已选的服务器吗？"
+
+#: src/ServerSocket.cpp:259
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "无法绑定端口到指定的地址：%s"
+msgid "ERROR: %s (%s) - %s"
+msgstr "错误： %s (%s) - %s"
 
-#: src/amule.cpp:964
+#: src/ServerSocket.cpp:274
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "端口 %u 已被占用，你会成为低ID。\n"
+msgid "WARNING: %s (%s) - %s"
+msgstr "警告： %s (%s) - %s"
 
-#: src/amule.cpp:970
+#: src/ServerSocket.cpp:413
 #, c-format
-msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
-"\n"
-"Check your network to make sure the port is open for output and input."
-msgstr ""
-"端口 %u 已被占用。\n"
-"\n"
-"这意味着你会成为低ID。\n"
-"\n"
-"请检测网络设置以确保端口可用于输入输出。"
+msgid "New clientid is %u"
+msgstr "新的用户编号是 %u"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "创建在线统计文件失败"
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "警告：你收到了低ID！"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "创建aMule在线统计文件失败"
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\t大概这是因为您处在防火墙或路由器后面。"
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\t如需了解更多相关信息，请访问 http://wiki.amule.org"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "收到未知服务器信息 ! - 长度过短"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "收到 %d 个新服务器"
+msgstr[1] "收到 %d 个新服务器"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "服务器列表保存完毕。"
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "服务器拒绝了上一个明令"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "服务器数据包无效：%s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "在处理从服务器接收的数据有无法处理的错误 : %s "
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "无法建立DNS线程以连接 %s"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "服务器 IP %s (%s) 已被过滤，不在连接。"
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "使用迷惑协议。"
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "正在连接至 %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "无法查找服务器%s的DNS记录： 无法连接！"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "没有添加服务器： 没有 IP 地址或主机名"
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "没有添加服务器： 服务器端口无效"
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "eD2k状态："
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kad 状态："
+
+#: src/ServerWnd.cpp:206
+#, fuzzy
+msgid "Running in LAN mode"
+msgstr "运行于 %s"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "正在运行"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "状态："
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "连接状态："
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "被防火墙阻挡-请在你的路由器或者防火墙中打开TCP端口%d"
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "UDP连接状态："
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "被防火墙阻挡-请在你的路由器或者防火墙中打开UDP端口%d"
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "防火墙状态："
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "没有请求 - TCP 端口打开"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "没有请求 - UDP 端口打开"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "没有好友"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "已连接至好友"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "连接到好友于%s"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "索引源:"
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "索引关键词："
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "索引批注:"
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "索引载入："
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "平均用户："
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "平均文件："
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "没有运行"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "将文件%s加入共享"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "发现 %i 个已知共享文件"
+msgstr[1] "发现 %i 个已知共享文件"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "发现 %i 个已知共享的文件， %i 个未知"
+msgstr[1] "发现 %i 个已知共享的文件， %i 个未知"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "错误：尝试共享%s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "找不到共享目录，跳过：%s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "在目录中没有找到可以共享的文件：%s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "用户名"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "下载速度"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "上传速度"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "可用分块"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+#, fuzzy
+msgid "Upload Status"
+msgstr "上传状态"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "下载状态"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "来源"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+#, fuzzy
+msgid "Local File Name"
+msgstr "文件名"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+#, fuzzy
+msgid "Shares File List"
+msgstr "共享文件"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "请求"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "接受的请求"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "已传送数据"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "共享比例"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "已获取的部分"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "完整源"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "所在目录"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "添加注释"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "编辑注释"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "更名"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "添加收藏中的文件至传输列表"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "复制magnet地址到剪贴板（&U）"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "复制eD2k链接到剪贴板（含源）（&S）"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "复制eD2k链接到剪贴板（含源）（包括加密选项）（&W）"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "复制eD2k链接到剪贴板（含主机名）（&H）"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr "复制eD2k链接到剪贴板（含主机名）（包括加密选项）（&C）"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "复制eD2k链接到剪贴板（包含&AICH信息）"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "你需要高ID来产生源链接"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "共享文件 (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[part 文件]"
+
+#: src/SourceListCtrl.cpp:37
+#, fuzzy
+msgid "Remote File Name"
+msgstr "文件名"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "本次上传（全部）： %s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "总开销 （数据包）： %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "文件请求开销（数据包）： %s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "源交换开销（数据包）： %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "服务器开销（数据包）： %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "Kad 开销（数据包）：%s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "加密开销(UDP)：%s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "活动上传：%s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "等待上传：%s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "成功上传会话总数：%s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "失败上传会话总数：%s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "平均上传时间：%s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "本次下载（总共）： %s"
 
-#: src/amule.cpp:1299
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "发现的源：%s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "活动下载（块数）：%s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "本次上传下载比率：%s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "平均下载速度（本次运行）：%s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "平均上传速度（本次运行）：%s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "最大下载速度（本次运行）：%s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "最大上传速度（本次运行）：%s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "重新连接：%i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "首次传输到现在时间：%s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "与服务器连接时间：%s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "活跃连接（估计值)：%i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "达到最大连接数：%s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "平均连接数（估计）：%g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "最高连接（估计值）： %i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "用户"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "未知大小: %s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "过滤: %s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "封杀: %s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "总数：%i　已知：%i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "有效服务器：%i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "无效服务器：%i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "总共：%s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "已删除服务器：%s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "被过滤的服务器：%s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "有效服务器中的用户数： %llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "有效服务器中的文件数： %llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "用户总数：%llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "文件总数：%llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "服务器开销：%.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "共享文件数：%s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "共享文件大小总和：%s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "平均文件大小：%s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "操作系统"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "没有收到"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "活跃连接 （1：%u）"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "不可用"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "从来没有"
+
+#: src/TerminationProcess.cpp:47
+#, fuzzy, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "命令 '%s' 已启动进程 %d，返回值为 %d。"
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "执行 <str> 然后退出。"
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "无效 IP 地址格式，请使用 xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
-msgstr ""
-"您所选择的地区设置在您的计算机上似乎没有安装.但无论如何，我还是会采用你所选择"
-"的地区设置。"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
+msgstr "此命令需要一个参数，合法参数为 'all'、文件名或一个数字。\n"
+
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "正在用此校验码处理："
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "正在用此文件名处理："
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr "此命令需要一个参数，合法参数为文件校验码。\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "非有效数字\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "无效的校验值（长度必须为32个字符）\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "请求失败，错误未知。"
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "操作成功。"
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "这是您第一次运行aMule %s"
+msgid "Request failed with the following error: %s"
+msgstr "请求失败，错误为：%s"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "这个版本是测试版，每天更新， 而且 \n"
+#: src/TextClient.cpp:667
+#, c-format
+msgid "IP filtering for clients is %s.\n"
+msgstr "用户的IP过滤器是：%s。\n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "我们无法承诺它一定不会损坏任何东西或烧毁你的房子，\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "关"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "或杀死你的狗，但一般来讲它应该是安全的。\n"
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "开"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "服务器的IP过滤器是%s。\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "当前IP过滤级别时 %d.\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "带宽限制：上传：%u kB/s，下载：%u kB/s。\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
+
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "已连接到 %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "正在连接"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "被防火墙阻挡"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "确定"
 
-#: src/amule.cpp:1316
+#: src/TextClient.cpp:734
+#, c-format
 msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
-msgstr "此版本中，以下选项因为安全问题已经被更改：\n"
+"\n"
+"Download:\t%s"
+msgstr ""
+"\n"
+"下载：\t%s"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:737
+#, c-format
 msgid ""
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Upload:\t%s"
 msgstr ""
 "\n"
-"* 为进站和出站连接启用迷惑协议支持。\n"
+"上传：\t%s"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:740
+#, c-format
 msgid ""
 "\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Clients in queue:\t%d\n"
 msgstr ""
 "\n"
-"* 禁用从其他服务器和用户更新服务器列表。\n"
+"队列长度：\t%d\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
 "\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"Total sources:\t%d\n"
 msgstr ""
 "\n"
-"想更多地了解更改的原因， 请访问\n"
-"aMule为\"fake servers\" 信息的 wiki，地址是： http://wiki.amule.org。\n"
-"有一点很重要，为了让你的aMule正常工作，请从服务器列表中清除假冒服务器。"
+"源总数：\t%d\n"
+
+#: src/TextClient.cpp:816
+#, c-format
+msgid "Number of search results: %i\n"
+msgstr "搜索结果数量：%i\n"
+
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "搜索进度: %u %% \n"
+
+#: src/TextClient.cpp:832
+#, fuzzy
+msgid "Search progress not available"
+msgstr "显示进度百分比"
+
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "从服务器收到未知的回复，操作码是 %#x."
+
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "显示简短的状态信息。"
+
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "显示连接状态，当前上传下载速度等等。\n"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "显示全部统计树。"
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
+msgstr ""
+"可选，一个0-255之间的数字可作为此命令的参数， \n"
+"用于设置用户版本树显示的节点数量。 n参数设为0表示无限制。\n"
+"\n"
+"示例： 'statistics 5' 将显示每个用户软件的5个版本。\n"
+
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "关闭aMule。"
+
+#: src/TextClient.cpp:857
+msgid ""
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
+msgstr ""
+"关闭远程运行的服务程序（amule/amuled）,\n"
+"当远程服务程序不可用时，文本客户端也将关闭。\n"
+
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "重新载入所给的对象。"
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "重新载入共享文件列表。"
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "重新载入IP过滤表。"
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "重新载入当前IP过滤表。"
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "从URL更新IP过滤表。"
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "如果URL省略了则将使用设置的URL。"
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "连接至网络。"
+
+#: src/TextClient.cpp:868
+msgid ""
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
+msgstr ""
+"这将连接至全部在设置中启用的网络。\n"
+"您也可以使用此格式（IP:端口）定义一个服务器地址，并只连接至此服务器。\n"
+"此IP必须是用点分隔的十进制IPv4地址，\n"
+"或者是可以解析的DNS名称。"
+
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "只连接eD2k。"
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "只连接Kad。"
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "断开网络。"
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "这将断开当前已连接的全部网络。\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "只断开eD2k。"
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "只断开 Kad 连接。"
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "添加一个eD2k或magnet链接到核心。"
+
+#: src/TextClient.cpp:878
+msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
+"允许添加的eD2k链接：\n"
+"*) 文件链接（ed2k://|file|..），将添加至下载队列，\n"
+"*) 服务器链接（ed2k://|server|...），将添加至服务器列表，\n"
+"*) 或服务器列表链接，这种情况将添加此列表中的所有服务器至服务器列表。\n"
 "\n"
+"magnet链接必须包含eD2k校验码和文件大小。\n"
 "\n"
-"此外，浏览器设定已经被重设为系统默认，如有必要，请重新配置浏览器选项。\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
-msgstr "如要获取使用信息，用户支持以及下载最新版本，请访问我们的首页\n"
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "设置一个参数值。"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "www.aMule.org，或我们在 irc.freenode.net 的 IRC 频道 #aMule。\n"
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "设置IP过滤参数。"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "欢迎您到 http://forum.amule.org 去提交错误报告"
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "开启用户和服务器的 IP 过滤。"
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "关闭用户和服务器的 IP 过滤。"
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "启动/禁用用户 IP 过滤。"
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "开启用户 IP 过滤。"
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "关闭用户 IP 过滤。"
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "启用/禁用服务器 IP 过滤。"
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "开启服务器 IP 过滤。"
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "关闭服务器 IP 过滤。"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "选择 IP 过滤级别。"
+
+#: src/TextClient.cpp:893
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
 msgstr ""
-"您为在线统计文件所选择的文件夹无效！\n"
-"在您更正设置之前在线统计将被禁用。"
+"正确的 IP 过滤级别是在0-255之间，\n"
+"默认（初始）值是127。\n"
 
-#: src/amule.cpp:1627
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "设置带宽限制。"
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "给此命令的值必须使用kB/s。\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "设置上传带宽限制。"
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "设置下载带宽限制。"
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "获取并显示设置值。"
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "获取 IP 过滤器设置。"
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "获取用户和服务器的 IP 过滤器状态。"
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "只获取用户的 IP 过滤器状态。"
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "只获取服务器的 IP 过滤器状态。"
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "获取 IP 过滤级别。"
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "获取带宽限制。"
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "执行搜索"
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
+msgstr ""
+"搜索类型必须使用设定的类型：\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"示例： 'search kad 文件' 将对 \"文件\"执行 Kad 搜索。\n"
+
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "执行全面搜索。"
+
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "执行本地搜索"
+
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "执行 Kad 搜索"
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "显示上次搜索的结果。"
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "返回以前搜索的结果。\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "显示搜索进度。"
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "显示搜索进度。\n"
+
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "开始下载文件"
+
+#: src/TextClient.cpp:926
+msgid ""
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
+msgstr ""
+"必须指定上次搜索的文件数量。\n"
+"示例：'download 12' 将开始下载上次搜索结果中的12个文件。\n"
+
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "停止下载。"
+
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "继续下载。"
+
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "取消下载。"
+
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "设置下载优先级。"
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "设置下载的优先级为低、正常、高或自动。\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "设为低优先级。"
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "设为正常优先级。"
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "设为高优先级。"
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "设为自动优先级。"
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "显示队列/列表。"
+
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr "显示上传/下载队列，服务器列表或共享文件列表。\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "显示上传队列。"
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "显示下载队列。"
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "显示日志。"
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "显示服务器列表。"
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "重设日志。"
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "为文件'%s'预分配磁盘空间失败：%s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "废弃的命令，请使用%s代替。"
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "错误: 无法打开日志文件"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr "这是一个已废弃的命令，将来可能被删除，请使用 '%s' 替代。\n"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "警告：日志文件为空。肯定有什么地方出错了。"
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMule 文本客户端"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "记录文件已被重启"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "正在转换在 '%s'在 '%s' 中旧的 AICH 校验集至64b"
 
-#: src/amule.cpp:1826
+#: src/ThreadTasks.cpp:442
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "服务器消息：%s"
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "警告：文件名 '%s' 非法，已经重命名为 '%s'。"
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "下载节点列表失败。"
+#: src/ThreadTasks.cpp:454
+#, c-format
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "警告：文件 '%s' 已经存在，新文件重命名为 '%s'。"
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "打开已下载的版本检查文件失败"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr "您确定要删除分类中的所有下载文件吗?"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "损坏的版本检查文件"
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "需要确认"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "你使用的是老版本的aMule！"
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "只支持99个连接数"
+
+#: src/TransferWnd.cpp:238
+#, fuzzy
+msgid "Too many categories!"
+msgstr "连接过多"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "所有其它"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "选择显示过滤"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "新建分类"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "编辑分类"
 
-#: src/amule.cpp:1907
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "删除分类"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "你的aMule版本是%i.%i.%i，最新版本是 %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "打开文件(%s)失败，从共享文件列表删除。"
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "最新版本可从此下载：http://www.amule.org"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "请求未知文件校检码：%s"
 
-#: src/amule.cpp:1911
+#: src/UploadQueue.cpp:596
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "警告：你的 aMuled 版本太旧：%i.%i.%i < %li.%li.%li"
+msgid "Resuming uploads of file: %s"
+msgstr "继续上传此文件：%s"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "你的aMule是最新版本。"
+#: src/UploadQueue.cpp:613
+#, c-format
+msgid "Suspending upload of file: %s"
+msgstr "暂停上传此文件：%s"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "下载版本检查文件失败"
+#: src/UserEvents.cpp:138
+#, c-format
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "执行`%s' 事件中的命令`%s' 失败。"
+
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "下载已完成"
+
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "文件的完整路径。"
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "不包含路径部分的文件名。"
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "文件的eD2k校验码。"
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "文件大小（字节）。"
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "累计下载活动时间。"
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "新的聊天对话已启动"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "消息发送者。"
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "磁盘空间不足"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "磁盘分区。"
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "最后阶段出错"
 
-#: src/amule.cpp:2025
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "用户：%s | 文件：%s"
+msgid "Processing file number %u: %s"
+msgstr "正在处理文件号 %u: %s"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "您要求了文件块校检码（只用于大于 9.5 MB 的文件）"
 
-#: src/amule.cpp:2026
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "用户：E：%s K：%s | 文件：E：%s K：%s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> 文件不存在！\n"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "没有选择网络"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator，aMule eD2k链接的创建程序"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "欢迎！"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "输入参数"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "需计算校检码的文件"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "添加附加链接到该文件"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "在此处输入需要生成eD2k链接的文件名"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
+msgid ""
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr "在这里输入要添加的eD2k链接，在结尾加 '/' 以附加此文件名"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "删除"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "创建有文件块校检码的链接"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr "该选项可以帮助新文件和稀有文件更快散播，只是链接长度会增加"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4 文件校检码"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k文件校验码"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k链接"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "保存"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "复制到剪贴板"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "打开"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "打开文件并生成eD2k链接"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "复制已生成的eD2k链接至剪贴板"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "另存为"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "保存已生成的eD2k链接至文件"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "关于 aLinkCreator"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "选择要生成eD2k链接的文件"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "不能打开剪贴簿"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "当前无内容需要复制！"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "选择已生成eD2k链接的文件"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "无法读取 "
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "请输入一个非空的文件名"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "暂时没有东西可保存！"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator, 用于生成eD2k链接的程序\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"图片来自 http://www.everaldo.com 和 http://www.icomania.com\n"
+"以及 http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"基于GPL协议发布"
 
-#: src/amule.cpp:2102
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "正在生成校检码"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator正在工作"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "计算MD4编码..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "计算eD2K编码..."
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "已取消！"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
 #, c-format
-msgid "Connected to %s %s"
-msgstr "已连接到 %s %s"
+msgid "Done in %.2f s"
+msgstr "在 %.2f 秒内完成"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "您已添加了该链接！"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "请输入一个非空的链接"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
 #, c-format
-msgid "Connecting to %s"
-msgstr "正在连接到 %s"
+msgid "Unable to open %s"
+msgstr "无法打开 %s"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "已从eD2k断开"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i 天 %i 小时 %i 分钟 %i 秒"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad已启动。"
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02u天 %02u小时 %02u分钟 %02u秒"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad已停止。"
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02u小时 %02u分钟 %02u秒"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "已连接至 Kad"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02u分钟 %02u秒"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "已连接至 Kad 网络(有防火墙)"
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02u秒"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "已断开 Kad 连接"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
+
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
+
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas，aMule在线统计"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "本次运行最高下载速度"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "历史最高下载速度"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "系统"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "停止自动刷新"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "保存在线统计图"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "打印在线统计图"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "设置"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "关于 wxCas"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "开始自动刷新"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "自动刷新已停止"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "自动刷新已开始"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "保存统计图"
 
-#: src/amule.cpp:2191
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMule 在线统计"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:395
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
-msgstr "如果在设置中禁用了 UDP 端口，Kad 网络将不能使用，没有启动。"
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
+msgstr ""
+"打印时出现问题。\n"
+"可能当前打印机没有设置正确？"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kad 网络在设置中被禁用了，没有连接。"
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "打印中"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "为读取而打开好友列表文件emfriends.met失败"
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, aMule在线统计\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"基于 GPL 协议分发"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "为写入而打开好友列表文件emfriends.met失败"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "aMule没有运行"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule 正在运行"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule 正在运行，但是已断开连接"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule 正在连接..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "aMule状态不明..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " 已经运行 "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr "已停止！"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr "未连接！"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " 正在连接..."
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " 状态不正常，请检查！"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr "已连接至"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr "Kad："
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "关闭"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " 是在 "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " 和 "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "总下载："
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr "，上传："
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "本次运行下载："
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "下载："
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " kB/s，上传："
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " kB/s"
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "共享："
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " 文件，队列长度："
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "时间："
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " 在 "
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "系统平均负载（1-5-15 分钟）："
+
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "系统运行时间："
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "amulesig.dat 文件所在的目录"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "请输入 amulesig.dat 文件所在的目录"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "刷新周期（秒）"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "每次刷新都生成统计图"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "输入存放所产生的统计图的目录"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "周期性上传统计图到 FTP 服务器"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP 地址"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP 路径"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "输入 FTP 服务器的地址"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "输入 FTP 服务器上存放统计图的目录"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "用户名"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "输入登录 FTP 服务器的用户名"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "输入登录FTP服务器的密码"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "FTP上传周期(分钟)"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "检测"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "统计文件所在文件夹"
+
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "统计图存放文件夹"
+
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "载入模板 <str>"
+
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "Web服务器的HTTP端口"
+
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "为Web服务器端口启用uPnP"
+
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP端口"
+
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "使用gzip压缩"
+
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "Web服务器的完整权限密码"
+
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "Web服务器的访客密码"
+
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "允许访客访问"
+
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "拒绝访客访问"
+
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "载入/保存Web服务器设置从/至远程aMule"
+
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMule设置文件路径，不要直接使用！"
+
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "禁用PHP解释器（已废弃）"
+
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "为每个请求重编译PHP页面"
+
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule Web服务器"
+
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "网页客户端连接已被接受\n"
+
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "错误：无法接受网页客户端连接\n"
+
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "请求失败，错误为：%s"
+
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "索引文件未找到："
+
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "会话过期 - 正在请求登录\n"
+
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "会话正常，已登录\n"
+
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "会话正常，未登录\n"
+
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "没有会话已打开 - 将请求登录\n"
+
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "会话已创建 - 正在请求登录\n"
+
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "正在处理请求 [原始]："
+
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "没有指定密码，不允许登录。"
+
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "检查密码\n"
+
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "密码校验值错误\n"
+
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "密码正确\n"
+
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "密码错误\n"
+
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "您没有输入密码，不允许空密码。\n"
+
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "已请求注销\n"
+
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "正在处理请求 [已重定向]："
+
+#~ msgid "Romanian"
+#~ msgstr "罗马尼亚语"
+
+#, fuzzy
+#~ msgid "Download status"
+#~ msgstr "下载状态"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "（%s / %s）"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "刷新时间：%d秒"
+#~ msgstr[1] "刷新时间：%d秒"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr "远程 GUI 目前不支持评论和打分"
+
+#~ msgid "Transferring"
+#~ msgstr "正在传送"
+
+#~ msgid "QR: ???"
+#~ msgstr "队列级别: ???"
+
+#~ msgid "QR: %u"
+#~ msgstr "队列级别: %u"
+
+#~ msgid "Only files currently uploading"
+#~ msgstr "只有当前上传中的文件"
+
+#~ msgid "Queue Rank"
+#~ msgstr "队列级别"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "待办事项 - 显示搜索进度"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "开始为文件 %s 创建 MD4 和 AICH 校验码"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "开始为文件 %s 创建 MD4 校验码"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "开始为文件 %s 创建 AICH 校验码"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr "警告：为 '%s' 建立备份后无法删除原文件"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "警告：无法删除 %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u（QR：%u）"
+
+#~ msgid ""
+#~ "You cannot connect to a release version from an arbitrary SVN version! "
+#~ "*sigh* possible crash prevented"
+#~ msgstr "为了尽可能避免程序崩溃，您不能从任意的SVN版本连接到发行版本！"
+
+#~ msgid "Rating (total):"
+#~ msgstr "评级 (总和)："
+
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "尝试传送完整数据段给所有用户"
+
+#~ msgid "Networks window"
+#~ msgstr "网络窗口"
+
+#~ msgid "Searches window"
+#~ msgstr "查找窗口"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "正在下载"
+
+#~ msgid "Shared files window"
+#~ msgstr "共享文件窗口"
+
+#~ msgid "Messages window"
+#~ msgstr "消息窗口"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "统计图表窗口"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "设置窗口"
+
+#~ msgid "Traybar-icon lost, trying to recreate ..."
+#~ msgstr "任务栏图标丢失，尝试重新创建..."
+
+#~ msgid "Transfers"
+#~ msgstr "传输文件"
+
+#~ msgid "Files transfers window"
+#~ msgstr "文件传输窗口"
+
+#~ msgid "Unban"
+#~ msgstr "取消封杀"
+
+#~ msgid "Show Uploads"
+#~ msgstr "显示上传"
+
+#~ msgid "Show Queue"
+#~ msgstr "显示队列"
+
+#~ msgid "Select View"
+#~ msgstr "选择视角"
+
+#~ msgid "Client Software"
+#~ msgstr "客户端软件"
+
+#~ msgid "Waited"
+#~ msgstr "已等待"
+
+#~ msgid "Upload Time"
+#~ msgstr "上传时间"
+
+#~ msgid "Upload/Download"
+#~ msgstr "上传/下载"
+
+#~ msgid "Remote Status"
+#~ msgstr "远程状态"
+
+#~ msgid "File Priority"
+#~ msgstr "文件优先级"
+
+#~ msgid "Score"
+#~ msgstr "分数"
+
+#~ msgid "Asked"
+#~ msgstr "已请求"
+
+#~ msgid "Last Seen"
+#~ msgstr "最后连接"
+
+#~ msgid "Entered Queue"
+#~ msgstr "进入队列"
+
+#~ msgid "Transferred Up"
+#~ msgstr "已传输"
+
+#~ msgid "Transferred Down"
+#~ msgstr "已传输"
+
+#~ msgid "Userhash"
+#~ msgstr "用户编码"
+
+#~ msgid "Encrypted"
+#~ msgstr "已加密"
+
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "读取 %d 国旗位图。"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "显示上传/上传队列"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "队列长度："
+
+#~ msgid "Current Session"
+#~ msgstr "本次运行"
+
+#~ msgid "Total"
+#~ msgstr "总和"
+
+#~ msgid "Requested :"
+#~ msgstr "已请求："
+
+#~ msgid "Create backup for preview"
+#~ msgstr "为预览创建备份"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "文件传送窗口"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "用户总数：%s | 文件总数：%s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "HTTP 下载线程开始"
+
+#~ msgid "Download size not received, downloading until connection is closed"
+#~ msgstr "没有获得下载大小，持续下载直到连接关闭"
+
+#~ msgid "Download size: %i"
+#~ msgstr "下载大小：%i"
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "HTTP 下载进程结束"
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "主机： %s:%i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "回应： %i (错误：%i)"
+
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "警告：创建流时收到空回应"
+
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "错误：跳转代码没有获取到 URL"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country()：载入国家数据失败"
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "获取 IP 过滤级别。"
+
+#~ msgid "Makes a search."
+#~ msgstr "进行搜索。"
+
+#~ msgid "Killed!"
+#~ msgstr "杀死！"
+
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "使用 amuleweb 在 '%s'。"
+
+#~ msgid "Shutting down aMule..."
+#~ msgstr "正在关闭 aMule..."
+
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr "此版本中，以下选项因为安全问题已经被更改：\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* 为进站和出站连接启用迷惑协议支持。\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* 禁用从其他服务器和用户更新服务器列表。\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "想更多地了解更改的原因， 请访问\n"
+#~ "aMule Wiki ，http://wiki.amule.org，中关于“虚假服务器”的信息。\n"
+#~ "这一点很重要，为了让您的 aMule 正常工作，请从服务器列表中清除假冒服务器。"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "此外，浏览器设定已经被重设为系统默认值。如有必要，请重新配置浏览器选项。\n"
 
 #~ msgid "Fetching status..."
 #~ msgstr "正在获取状态..."
 
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "用户：E：%s K：%s | 文件 E：%s K：%s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "用户 %s 位于 %s:%d，使用 %s %s %s"
+
 #~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
 #~ msgstr "theApp->serverlist->GetServerByAddress() 返回了  NULL"
 
+#~ msgid "Firewalled"
+#~ msgstr "有防火墙"
+
+#~ msgid "Loaded %d flag bitmap."
+#~ msgid_plural "Loaded %d flag bitmaps."
+#~ msgstr[0] "%d个国旗标志已载入。"
+#~ msgstr[1] "%d个国旗标志已载入。"
+
+#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
+#~ msgstr "文件 %s 过大：上限为4GB。"
+
+#~ msgid "User:"
+#~ msgstr "用户："
+
+#~ msgid "System:"
+#~ msgstr "系统："
+
+#~ msgid "No handler for this file type."
+#~ msgstr "无法处理该文件类型"
+
+#~ msgid "File was not saved"
+#~ msgstr "文件未被保存"
+
+#~ msgid "Connection Failed. Unable to connect to the specified host\n"
+#~ msgstr "连接失败，无法连接到指定的计算机\n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov <petar@post.harvard.edu>\n"
+#~ msgstr "版权所有 (C) 2002 Petar Maymounkov\n"
+
 #~ msgid "Message Filter"
 #~ msgstr "消息过滤"
 
@@ -7089,14 +7682,182 @@
 #~ msgid "Core Tweaks"
 #~ msgstr "核心设置"
 
-#~ msgid "No handler for this file type."
-#~ msgstr "无法处理该文件类型"
+#~ msgid "Tooltip Delay Time in secs"
+#~ msgstr "提示延迟时间（秒）"
 
-#~ msgid "File was not saved"
-#~ msgstr "文件未被保存"
+#~ msgid "Show part file number before file name"
+#~ msgstr "在文件名前显示 part 文件编号"
 
-#~ msgid "The file %s is to big for the Donkey: maximum allowed is 4 GB."
-#~ msgstr "文件 %s 过大：上限为4GB。"
+#~ msgid "Skin Support"
+#~ msgstr "皮肤支持"
+
+#~ msgid "- no skins available -"
+#~ msgstr "- 没有皮肤可用 -"
+
+#~ msgid "Online Signature Directory:"
+#~ msgstr "在线统计目录："
+
+#~ msgid "Filtering Options:"
+#~ msgstr "过滤选项："
+
+#~ msgid "Line Capacities"
+#~ msgstr "连接带宽"
+
+#~ msgid ""
+#~ "Note: These values are\n"
+#~ " only used for statistics."
+#~ msgstr ""
+#~ "注意：这些数值只作为统计用途。\n"
+#~ " "
+
+#~ msgid "Standard client TCP Port:"
+#~ msgstr "标准用户 TCP 端口："
+
+#~ msgid "Extended client UDP Port:"
+#~ msgstr "扩展用户 UDP 端口："
+
+#~ msgid "Bind Address"
+#~ msgstr "绑定地址"
+
+#~ msgid "UDP port for extended server requests (TCP+3): 4665"
+#~ msgstr "用于扩展的服务器请求的 UDP 端口 (TCP+3)：4665"
+
+#~ msgid "Max Sources per File"
+#~ msgstr "单个文件最大源数"
+
+#~ msgid "Connection limits"
+#~ msgstr "连接限制"
+
+#~ msgid "Universal Plug and Play"
+#~ msgstr "通用即插即用（UPnP）"
+
+#~ msgid "Enable UPnP"
+#~ msgstr "启用UPnP"
+
+#~ msgid "UPnP TCP Port:"
+#~ msgstr "UPnP的TCP 端口"
+
+#~ msgid "Start next paused file when a file completed"
+#~ msgstr "文件下载完毕时开始下一个暂停的文件"
+
+#~ msgid "Check disk space"
+#~ msgstr "检查磁盘空间"
+
+#~ msgid "Min disk space:"
+#~ msgstr "最小磁盘空间："
+
+#~ msgid "Incoming"
+#~ msgstr "传入"
+
+#~ msgid "Temporary"
+#~ msgstr "临时"
+
+#~ msgid "Shared"
+#~ msgstr "共享"
+
+#~ msgid "Select Statistics Colors"
+#~ msgstr "选择统计图表使用颜色"
+
+#~ msgid "Download Queue Files Progress"
+#~ msgstr "下载队列文件进度"
+
+#~ msgid "Show percentage"
+#~ msgstr "显示百分比"
+
+#~ msgid "Show progressbar "
+#~ msgstr "显示进度条"
+
+#~ msgid "Enable skin support "
+#~ msgstr "启用皮肤支持"
+
+#~ msgid "Skin:"
+#~ msgstr "皮肤："
+
+#~ msgid "Auto-sort files in the download queue (high CPU)"
+#~ msgstr "自动排列下载队列中的文件 (大CPU用量)"
+
+#~ msgid "Show Fast eD2k Links Handler"
+#~ msgstr "显示快速eD2k链接处理器"
+
+#~ msgid "Web server port"
+#~ msgstr "Web服务器端口"
+
+#~ msgid "Enable UPnP port forwarding on the web server port"
+#~ msgstr "为Web服务器端口启用UPnP"
+
+#~ msgid "Web server UPnP TCP port"
+#~ msgstr "Web服务器UPnP使用的TCP端口"
+
+#~ msgid ""
+#~ "IP of the listening interface\n"
+#~ "(empty for any)"
+#~ msgstr ""
+#~ "监听IP\n"
+#~ "（留空则监听全部）"
+
+#~ msgid "TCP port"
+#~ msgstr "TCP端口"
+
+#~ msgid "Who can see shared files:"
+#~ msgstr "谁可以查看我共享的文件： "
+
+#~ msgid "Event types"
+#~ msgstr "事件类型"
+
+#~ msgid "ERROR: can not accept web client connection\n"
+#~ msgstr "错误：无法接受Web客户端连接\n"
+
+#~ msgid ""
+#~ "Your Auto-update server list is empty.\n"
+#~ "'Auto-update server list at startup will be disabled."
+#~ msgstr ""
+#~ "自动更新服务器地址列表为空，\n"
+#~ "启动时自动更新服务器将被禁用。"
+
+#~ msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
+#~ msgstr "错误：无效的part.met文件版本：%s ==> %s"
+
+#~ msgid "WARNING: Knownfile list corrupted, contains invalid header."
+#~ msgstr "警告：已知文件列表已损坏，文件头无效。"
+
+#~ msgid "Makes aMule promt before exiting."
+#~ msgstr "退出前确认。"
+
+#~ msgid "Bandwith limits"
+#~ msgstr "带宽限制"
+
+#~ msgid "This UDP port is used for extended ed2k requests and Kad network"
+#~ msgstr "此UDP端口用于扩展eD2k请求和Kad网络"
+
+#~ msgid "Show overhead bandwith"
+#~ msgstr "显示通信开销带宽"
+
+#~ msgid "I.C.H. active"
+#~ msgstr "启用ICH"
+
+#~ msgid "AICH trusts every hash (not recomended)"
+#~ msgstr "高级智能损坏数据处理(AICH)信任所有校验码（建议不要使用）"
+
+#~ msgid "Disk space"
+#~ msgstr "磁盘空间"
+
+#~ msgid "Create Backup for preview"
+#~ msgstr "为预览创建备份"
+
+#~ msgid "Advanced Settings"
+#~ msgstr "高级设置"
+
+#~ msgid "Progressbar Style"
+#~ msgstr "进度条风格"
+
+#~ msgid "Column Sorting"
+#~ msgstr "列排序"
+
+#~ msgid "Misc Gui Tweaks"
+#~ msgstr "界面设置"
+
+#~ msgid "File Options"
+#~ msgstr "文件选项"
 
 #~ msgid "Status text"
 #~ msgstr "状态"
@@ -7104,18 +7865,131 @@
 #~ msgid "Pop-up status text"
 #~ msgstr "弹出状态显示"
 
-#~ msgid "Please wait... "
-#~ msgstr "请等待 ..."
+#~ msgid ""
+#~ " 'All-Platform' p2p client based on eMule \n"
+#~ "\n"
+#~ msgstr " 基于eMule的“全平台”P2P客户端\n"
+
+#~ msgid " Website: http://www.amule.org \n"
+#~ msgstr " 网站：http://www.amule.org \n"
+
+#~ msgid " Forum: http://forum.amule.org \n"
+#~ msgstr " 论坛：http://forum.amule.org \n"
+
+#~ msgid ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+#~ msgstr ""
+#~ " FAQ: http://wiki.amule.org \n"
+#~ "\n"
+
+#~ msgid " Contact: admin@amule.org (administrative issues) \n"
+#~ msgstr " 联系邮件：admin@amule.org (管理问题) \n"
+
+#~ msgid ""
+#~ " Copyright (C) 2003-2008 aMule Team \n"
+#~ "\n"
+#~ msgstr ""
+#~ " 版权所有 (C) 2003-2008 aMule 团队 \n"
+#~ "\n"
+
+#~ msgid " Part of aMule is based on \n"
+#~ msgstr " aMule的一部分是基于 \n"
+
+#~ msgid " Copyright (C) 2002 Petar Maymounkov\n"
+#~ msgstr " 版权所有 (C) 2002 Petar Maymounkov\n"
+
+#~ msgid " http://kademlia.scs.cs.nyu.edu\n"
+#~ msgstr " http://kademlia.scs.cs.nyu.edu\n"
+
+#~ msgid ""
+#~ "For a film you can say its length, its story, language ...\n"
+#~ "and if it's a fake, you can tell that to other users of aMule."
+#~ msgstr ""
+#~ "您可以说明电影的长度，情节和语言等等...\n"
+#~ "如果电影是假冒的，您可以提醒其它用户。"
+
+#~ msgid "Misc Options"
+#~ msgstr "其它选项"
+
+#~ msgid "Server Options"
+#~ msgstr "服务器选项"
+
+#~ msgid "Display server motd when connected ..."
+#~ msgstr "连接后显示服务器当日通告"
+
+#~ msgid "eD2k Info"
+#~ msgstr "eD2k信息"
+
+#~ msgid "Disable/Enable"
+#~ msgstr "禁用/启用"
+
+#~ msgid "Authentication"
+#~ msgstr "验证"
 
 #~ msgid "General Settings"
 #~ msgstr "综合设置"
 
+#~ msgid "Hard limit"
+#~ msgstr "硬限制"
+
+#~ msgid "Max Connections"
+#~ msgstr "最大连接数"
+
 #~ msgid "GUI Tweaks"
 #~ msgstr "界面设置"
 
 #~ msgid "Remote Control"
 #~ msgstr "远程控制"
 
+#~ msgid "Unable to determine selected browser!"
+#~ msgstr "未检测到所选择的浏览器"
+
+#~ msgid "User Defined"
+#~ msgstr "用户定义的"
+
+#~ msgid "http://www.aMule.org - the Linux Mule"
+#~ msgstr "http://www.aMule.org - Linux 平台的 Mule"
+
+#~ msgid "Konqueror"
+#~ msgstr "Konqueror"
+
+#~ msgid "Mozilla"
+#~ msgstr "Mozilla"
+
+#~ msgid "Firefox"
+#~ msgstr "Firefox"
+
+#~ msgid "Firebird"
+#~ msgstr "Firebird"
+
+#~ msgid "Opera"
+#~ msgstr "Opera"
+
+#~ msgid "Netscape"
+#~ msgstr "Netscape"
+
+#~ msgid "Galeon"
+#~ msgstr "Galeon"
+
+#~ msgid "Epiphany"
+#~ msgstr "Epiphany"
+
+#~ msgid "Select your browser here"
+#~ msgstr "请选择您的网络浏览器"
+
+#~ msgid "Custom Browser:"
+#~ msgstr "其它浏览器"
+
+#~ msgid ""
+#~ "Enter your browser name here. To use the custom browser, select the "
+#~ "Custom menu-item from the dropdown-menu above."
+#~ msgstr ""
+#~ "请输入网络浏览器名称。如需使用自定义浏览器，在以上弹出菜单中选择自定义。"
+
+#~ msgid "Please wait... "
+#~ msgstr "请等待 ..."
+
 #~ msgid "Could not determine the command for running the browser."
 #~ msgstr "无法确定运行浏览器的命令"
 
@@ -7233,9 +8107,6 @@
 #~ msgid "Copy ED2k links to clipboard"
 #~ msgstr "复制 ED2K 链接到剪贴板"
 
-#~ msgid "Fatal Error: Failed to create Timer"
-#~ msgstr "严重错误：无法建立计时器"
-
 #~ msgid "ED2K: Connecting"
 #~ msgstr "ED2K：正在连接"
 
@@ -7341,9 +8212,6 @@
 #~ msgid "Error: Invalid part.met fileversion: %s ==> %s"
 #~ msgstr "错误：无效的 part.met 文件版本：%s ==> %s"
 
-#~ msgid "Error: %s (%s) is corrupt (wrong tagcount), unable to load file."
-#~ msgstr "错误：文件 %s（%s）已损坏（标签数不对），无法读取文件。"
-
 #~ msgid "Warning: %s might be corrupted (%i)"
 #~ msgstr "警告：%s 可能已损坏（%i）"
 
@@ -7754,9 +8622,6 @@
 #~ msgid "Client request is invalid! %i / %i"
 #~ msgstr "用户请求非法！%i / %i"
 
-#~ msgid "Command: %s"
-#~ msgstr "命令：%s"
-
 #~ msgid "Unable to open %s file - using %s file."
 #~ msgstr "无法读取 %s - 现在使用 %s"
 
@@ -7772,11 +8637,6 @@
 #~ msgid "Waiting for subprocess termination failed"
 #~ msgstr "等待子进程终止失败"
 
-#~ msgid ""
-#~ "You cannot connect to a release version from an arbitrary CVS version! "
-#~ "*sigh* possible crash prevented"
-#~ msgstr "你不能连接至任意 CVS 版本的发布！目的是为了不让程序崩溃。"
-
 #~ msgid "doesn't work"
 #~ msgstr "没有工作"
 
@@ -7808,7 +8668,7 @@
 #~ " FAQ: http://wiki.amule.org \n"
 #~ "\n"
 #~ " Contact: admin@amule.org (administrative issues) \n"
-#~ " Copyright (C) 2003-2009 aMule Team \n"
+#~ " Copyright (C) 2003-2008 aMule Team \n"
 #~ "\n"
 #~ " Part of aMule is based on \n"
 #~ " Kademlia: Peer-to-peer routing based on the XOR metric.\n"
@@ -7822,7 +8682,7 @@
 #~ " FAQ：http://wiki.amule.org \n"
 #~ "\n"
 #~ " 联系人：admin@amule.org (administrative issues) \n"
-#~ " 版权所有 (C) 2003-2009 aMule 开发团队 \n"
+#~ " 版权所有 (C) 2003-2008 aMule 开发团队 \n"
 #~ "\n"
 #~ " aMule 的一部分是基于 \n"
 #~ " Kad：基于异或算法的 P2P 路由协议。\n"
@@ -7929,9 +8789,6 @@
 #~ "此命令已过时，将来可能会删除。\n"
 #~ "请用 'Set BwLimit Down' 替代。\n"
 
-#~ msgid "Syncronization thread started."
-#~ msgstr "同步线程已开始"
-
 #~ msgid "Masterhashes of known files have been loaded."
 #~ msgstr "已经文件的主校验码已经载入"
 
@@ -7991,9 +8848,6 @@
 #~ msgid "Source Dropping"
 #~ msgstr "源清理"
 
-#~ msgid "Keep sources"
-#~ msgstr "保留源"
-
 #~ msgid "Drop sources"
 #~ msgstr "清除源"
 
@@ -8065,9 +8919,6 @@
 #~ "the taskbar."
 #~ msgstr "启用后最小化系统状态栏而不是系统任务栏。"
 
-#~ msgid "Unable to open skin file: %s"
-#~ msgstr "无法读取面板文件：%s"
-
 #~ msgid "Browse skin file"
 #~ msgstr "浏览skin面板文件"
 
@@ -8086,9 +8937,6 @@
 #~ msgid "Skin file %s does not exist - loading defaults"
 #~ msgstr "面板文件 %s 不存在 - 正在加载默认面板"
 
-#~ msgid "IPFilter is %s.\n"
-#~ msgstr "IP 过滤当前状态是 %s.\n"
-
 #~ msgid "Enable IP-Filtering"
 #~ msgstr "启用IP过滤"
 
@@ -8187,9 +9035,6 @@
 #~ msgid "Desktop integration"
 #~ msgstr "桌面集成"
 
-#~ msgid "aMule remote control"
-#~ msgstr "aMule 远程控制"
-
 #~ msgid ""
 #~ " 'All-Platform' p2p client based on eMule \n"
 #~ "\n"
@@ -8257,9 +9102,6 @@
 #~ msgid "File Name:"
 #~ msgstr "文件名："
 
-#~ msgid "File size:"
-#~ msgstr "文件大小 :"
-
 #~ msgid "Download:"
 #~ msgstr "下载:"
 
@@ -8326,906 +9168,3 @@
 
 #~ msgid "ExternalConn: Access denied because: %s\n"
 #~ msgstr "外部连接：请求被拒绝，具体原因：%s\n"
-
-#
-#~ msgid "ExternalConn: Access denied.\n"
-#~ msgstr "外部连接：请求被拒绝\n"
-
-#~ msgid "ExternalConn: Bad reply from server. Connection closed.\n"
-#~ msgstr "外部连接：服务器回复错误。已断开连接。\n"
-
-#~ msgid "Succeeded! Connection established to aMule %s\n"
-#~ msgstr "已成功连接到aMule %s\n"
-
-#~ msgid "Succeeded! Connection established.\n"
-#~ msgstr "已成功连接。\n"
-
-#~ msgid "A socket error occured during authentication. Exiting.\n"
-#~ msgstr "登录时出现端口错误。正在退出。\n"
-
-#~ msgid "Failed to read corrupted friendlist file 'emfriends.met'!"
-#~ msgstr "无法读取损坏的好友列表文件 'emfriends.met'!"
-
-#~ msgid "Loaded ipfilter with %d new IP addresses."
-#~ msgstr "成功载入IP地址过滤，共有 %d 个新IP地址。"
-
-#~ msgid "Error reading known.met file! (corrupted?)"
-#~ msgstr "无法读取 known.met (文件损坏?)"
-
-#~ msgid "Client requests invalid %u."
-#~ msgstr "用户请求非法%u。"
-
-#~ msgid ""
-#~ "User %s (%u) requested your requested your sharedfiles-list -> Accepted"
-#~ msgstr "用户 %s (%u) 请求了共享文件列表 -> 接受"
-
-#~ msgid ""
-#~ "User %s (%u) requested your requested your sharedfiles-list -> Denied"
-#~ msgstr "用户 %s (%u) 请求了共享文件列表 -> 拒绝"
-
-#~ msgid "User %s (%u) denied access to shareddirectories/files-list"
-#~ msgstr "用户%s (%u) 拒绝提供共享文件／文件夹列表"
-
-#~ msgid "CListenSocket: Cannot create thread"
-#~ msgstr "CListenSocket: 无法产生新线程"
-
-#~ msgid "CListenSocket: Destroying"
-#~ msgstr "CListenSocket: 正在销毁中"
-
-#~ msgid "CSocketGlobalThread: Call to Create failed"
-#~ msgstr "CSocketGlobalThread: Create调用失败"
-
-#~ msgid "CSocketGlobalThread: Exited"
-#~ msgstr "CSocketGlobalThread: 已退出"
-
-#~ msgid "Download Speed: %.1f\n"
-#~ msgstr "下载速度: %.1f\n"
-
-#~ msgid "Upload Speed: %.1f\n"
-#~ msgstr "上传速度: %.1f\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Speed Limits:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "速度限制：\n"
-
-#~ msgid "UL: None, "
-#~ msgstr "上传: 无"
-
-#~ msgid "UL: %u, "
-#~ msgstr "上传:%u, "
-
-#~ msgid "Nickname: "
-#~ msgstr "昵称: "
-
-#~ msgid "IP: "
-#~ msgstr "IP: "
-
-#~ msgid "TCP Port: "
-#~ msgstr "TCP 端口："
-
-#~ msgid "UDP Port: "
-#~ msgstr "UDP 端口："
-
-#~ msgid "Uptime: "
-#~ msgstr "运行时间: "
-
-#~ msgid "Shared Files: "
-#~ msgstr "共享文件: "
-
-#~ msgid "Queued Clients: "
-#~ msgstr "队列中用户: "
-
-#~ msgid "Total DL: "
-#~ msgstr "总下载: "
-
-#~ msgid "Total UL: "
-#~ msgstr "总上传: "
-
-#~ msgid "Disconnect from server"
-#~ msgstr "服务器连接中断"
-
-#~ msgid ""
-#~ "For system tray integration to work,\n"
-#~ "you must specify which desktop you are using.\n"
-#~ "You can change this later from preferences."
-#~ msgstr ""
-#~ "为了使系统状态栏集成正常工作，\n"
-#~ "您必需确定您所使用的桌面系统。\n"
-#~ "您以后可以设置中更改此选项。"
-
-#~ msgid "Gnome 2.x (or other XEMBED compatible)"
-#~ msgstr "Gnome 2.x (或其它 XEMBED 兼容系统)"
-
-#~ msgid "KDE 3.x"
-#~ msgstr "KDE 3.x"
-
-#~ msgid "KDE 2.x / Gnome 1.2 "
-#~ msgstr "KDE 2.x / Gnome 1.2 "
-
-#~ msgid "No systray integration, please"
-#~ msgstr "取消系统状态栏集成"
-
-#~ msgid "Desktop"
-#~ msgstr "桌面"
-
-#~ msgid "Jugle (WWW)"
-#~ msgstr "Jugle (WWW)"
-
-#~ msgid ""
-#~ "switch download list to clients you're downloading from, with files also "
-#~ "(some day)"
-#~ msgstr "调换至下载中的源列表。"
-
-#~ msgid " / ("
-#~ msgstr " / ("
-
-#~ msgid ")"
-#~ msgstr ")"
-
-#~ msgid "Comment this file (this text will be show by all users)"
-#~ msgstr "为该文件加注释 (给所有用户看)"
-
-#~ msgid "("
-#~ msgstr "("
-
-#~ msgid "Downloadlist doubleclick to expand"
-#~ msgstr "鼠标双击展开下载列表"
-
-#~ msgid ""
-#~ "If enabled, it is possible to display the sources associated with "
-#~ "downloads by double-clicking on them."
-#~ msgstr "启用后可双击显示下载源。"
-
-#~ msgid "Select Window Manager"
-#~ msgstr "选择窗口管理器"
-
-#~ msgid ""
-#~ "Click here to select the type of systray integration you wish aMule to "
-#~ "use."
-#~ msgstr "点击选择系统状态栏集成方式。"
-
-#~ msgid "Fake Check"
-#~ msgstr "真伪鉴别"
-
-#~ msgid "my browser"
-#~ msgstr "我的浏览器"
-
-#~ msgid "Client TCP Port:"
-#~ msgstr "用户TCP端口："
-
-#~ msgid "Client UDP port: 4665"
-#~ msgstr "用户UDP端口：4665"
-
-#~ msgid "eMule extended UDP Port:"
-#~ msgstr "用户拓展UDP端口："
-
-#~ msgid "Save 5 sources on rare files (< 20 sources)"
-#~ msgstr "保存稀有文件的5个源 (< 20 个源)"
-
-#~ msgid "Extract Meta Data Tags"
-#~ msgstr "提取信息标签"
-
-#~ msgid "Reduce Fragmentation"
-#~ msgstr "降低硬盘数据散乱度"
-
-#~ msgid "Allocate full chunks for .part files"
-#~ msgstr "预留数据段硬盘空间"
-
-#~ msgid ""
-#~ "Select this to allocate a full chunk each time data is received for it."
-#~ msgstr "该选项在接收数据段前为其预留硬盘空间"
-
-#~ msgid "Allocate full disk space for .part files"
-#~ msgstr "预留整个硬盘空间给.part文件"
-
-#~ msgid ""
-#~ "This option reduces fragmentation but slows down the part file creation "
-#~ "and will disable sparse files"
-#~ msgstr "该选项可以降低硬盘数据散乱度但会使part文件的产生变慢"
-
-#~ msgid "    Min Disk Space:    "
-#~ msgstr "    最低硬盘空间:         "
-
-#~ msgid "mplayer -idx"
-#~ msgstr "mplayer -idx"
-
-#~ msgid "Use TCP ports instead of unix local sockets"
-#~ msgstr "使用TCP端口而不是Unix的本地接口"
-
-#~ msgid "External TCP port"
-#~ msgstr "外部TCP端口"
-
-#~ msgid "http://www.srv1000.com/azz/server.met"
-#~ msgstr "http://www.srv1000.com/azz/server.met"
-
-#~ msgid "My Info"
-#~ msgstr "我的信息"
-
-#~ msgid "."
-#~ msgstr "."
-
-#~ msgid "Bootstrap known clients"
-#~ msgstr "启动已知用户"
-
-#~ msgid "Current Searches"
-#~ msgstr "当前搜索"
-
-#~ msgid "Default Permissions"
-#~ msgstr "默认许可"
-
-#~ msgid "Owner permissions, must at least be read/write'able."
-#~ msgstr "拥有者许可，至少需要可读可写。"
-
-#~ msgid "Group permissions."
-#~ msgstr "用户组许可"
-
-#~ msgid "Other permissions."
-#~ msgstr "其他许可"
-
-#~ msgid "localhost"
-#~ msgstr "本机"
-
-#~ msgid "4712"
-#~ msgstr "4712"
-
-#~ msgid "amule"
-#~ msgstr "amule"
-
-#~ msgid "Servers List Window"
-#~ msgstr "服务器列表窗口"
-
-#~ msgid "Kademlia bootstrap"
-#~ msgstr "Kademlia bootstrap"
-
-#~ msgid "SharedFiles"
-#~ msgstr "共享文件"
-
-#~ msgid "K"
-#~ msgstr "K"
-
-#~ msgid "Error: part.met nackups file is 0 size: %s ==> %s"
-#~ msgstr "错误: part.met 文件长度为0 : %s ==> %s"
-
-#~ msgid "Error: %s (%s) is corrupt."
-#~ msgstr "错误: %s (%s) 已损坏"
-
-#~ msgid "Error: %s is corrupt, unable to load file."
-#~ msgstr "错误: 文件 %s 已损坏，无法读取文件"
-
-#~ msgid ""
-#~ "WARNING: A file with that name already exists, the file has been renamed"
-#~ msgstr "警告：文件名已存在, 现有文件已被更名"
-
-#~ msgid "WARNING: Failed to delete %s.seeds"
-#~ msgstr "警告：无法删除 %s.seeds"
-
-#~ msgid ""
-#~ "Downloaded:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "已下载:\n"
-#~ "%s"
-
-#~ msgid "\tStopped"
-#~ msgstr "\t已停止"
-
-#~ msgid "\tRemoved from shared"
-#~ msgstr "\t已从共享中移除"
-
-#~ msgid "\tRemoved from download queue"
-#~ msgstr "\t已从下载队列中删除"
-
-#~ msgid "\tRemoved transferwnd"
-#~ msgstr "\t已删除下载窗口"
-
-#~ msgid "\tClosed"
-#~ msgstr "\t已关闭"
-
-#~ msgid "\tFailed to delete '%s'"
-#~ msgstr "\t无法删除 '%s'"
-
-#~ msgid "\tRemoved .part.met"
-#~ msgstr "\t已删除 .part.met"
-
-#~ msgid "Failed to delete '%s'"
-#~ msgstr "无法删除 '%s'"
-
-#~ msgid "\tRemoved .part"
-#~ msgstr "\t已删除 .part"
-
-#~ msgid "\tRemoved .BAK"
-#~ msgstr "\t已删除 .BAK"
-
-#~ msgid "\tRemoved .seeds"
-#~ msgstr "\t已删除 .seeds"
-
-#~ msgid "Done"
-#~ msgstr "完成"
-
-#~ msgid "Expected part-hash: %s"
-#~ msgstr "part-hash期望值：%s"
-
-#~ msgid "Actual part-hash: %s"
-#~ msgstr "part-hash实际值：%s"
-
-#~ msgid "Language change will not be applied until aMule is restarted."
-#~ msgstr "语言设置更动在重新启动 aMule 后才会生效"
-
-#~ msgid "Incomming files"
-#~ msgstr "接收文件"
-
-#~ msgid "Executable (*)|*||"
-#~ msgstr "可执行文件 (*)|*||"
-
-#~ msgid "You are not connected to a server!"
-#~ msgstr "您现在没有连接到服务器上！"
-
-#~ msgid "Copy ED2k link to clipboard (HTML)"
-#~ msgstr "拷贝 ED2K 链接到剪贴板 (HTML)"
-
-#~ msgid "Invalid versiontag in server.met (0x%x , size %i)!"
-#~ msgstr "server.met 中的版本标签无效 (0x%x , 大小 %i)!"
-
-#~ msgid "Error: the file server.met is corrupted"
-#~ msgstr "错误: server.met 文件已损坏"
-
-#~ msgid "Failed to download the server list from "
-#~ msgstr "无法下载服务器列表 "
-
-#~ msgid "CServerSocketHandler: can not create my thread"
-#~ msgstr "CServerSocketHandler: can not create my thread"
-
-#~ msgid "Unknown exception while processing packet from server!"
-#~ msgstr "在处理从服务器接收的数据是有无法处理的错误！"
-
-#~ msgid "WARNING! Sharing the following directory is not recommended: %s"
-#~ msgstr "警告！建议不要共享下列文件夹：%s"
-
-#~ msgid "Change this file's comment..."
-#~ msgstr "更改该文件的注释"
-
-#~ msgid "Operative System"
-#~ msgstr "操作系统"
-
-#~ msgid "Found Sources: %i"
-#~ msgstr "发现源: %i"
-
-#~ msgid "Active Downloads (chunks): %i"
-#~ msgstr "活跃下载 (数据段): %i"
-
-#~ msgid "Active Uploads: %i"
-#~ msgstr "活跃上传: %i"
-
-#~ msgid "Waiting Uploads: %i"
-#~ msgstr "等待上传: %i"
-
-#~ msgid "Total successful upload sessions: %i"
-#~ msgstr "总成功上传片段: %i"
-
-#~ msgid "Total failed upload sessions: %i"
-#~ msgstr "总失败上传片段: %i"
-
-#~ msgid "Average Downloadrate (Session): %.2f kB/s"
-#~ msgstr "平均下载速度 (本次运行): %.2f kB/s"
-
-#~ msgid "Average Uploadrate (Session): %.2f kB/s"
-#~ msgstr "平均上传速度 (本次运行): %.2f kB/s"
-
-#~ msgid "Max Downloadrate Average (Session): %.2f kB/s"
-#~ msgstr "平均最高下载速度 (本次运行): %.2f kB/s"
-
-#~ msgid "Max Downloadrate (Session): %.2f kB/s"
-#~ msgstr "最高下载速度 (本次运行): %.2f kB/s"
-
-#~ msgid "waiting for transfer..."
-#~ msgstr "等待传输..."
-
-#~ msgid "Waiting for connection..."
-#~ msgstr "等待连接..."
-
-#~ msgid "Max Connection Limit Reached: %i : %s"
-#~ msgstr "连接总数达到上限: %i : %s"
-
-#~ msgid "Max Connection Limit Reached: Never"
-#~ msgstr "连接总数达到上限: 从来没有"
-
-#~ msgid "Average Connections (estimate): %f"
-#~ msgstr "平均连接 (估计值): %f"
-
-#~ msgid "Session UL:DL Ratio (Total): Not available"
-#~ msgstr "本次运行 上传:下载 比率 (总和): 无有效数据"
-
-#~ msgid "Number of Shared Files: %i"
-#~ msgstr "共享文件数: %i"
-
-#~ msgid "Old MLDonkey: %i (%1.1f%%)"
-#~ msgstr "旧 MLDonkey: %i (%1.1f%%)"
-
-#~ msgid "New MLDonkey: %i (%1.1f%%)"
-#~ msgstr "新 MLDonkey: %i (%1.1f%%)"
-
-#~ msgid "Compatible: %i (%1.1f%%)"
-#~ msgstr "兼容: %i (%1.1f%%)"
-
-#~ msgid "Unknown: %i"
-#~ msgstr "未知: %i"
-
-#~ msgid "Filtered: %i"
-#~ msgstr "屏蔽: %i"
-
-#~ msgid "HasSocket: %i (%1.1f%%)"
-#~ msgstr "HasSocket: %i (%1.1f%%)"
-
-#~ msgid "Working Servers"
-#~ msgstr "正常运行的服务器"
-
-#~ msgid "Failed Servers"
-#~ msgstr "当机的服务器"
-
-#~ msgid "Deleted Servers"
-#~ msgstr "已删除的服务器"
-
-#~ msgid "Users on Working Servers"
-#~ msgstr "正常运行服务器上的用户总数"
-
-#~ msgid "Files on Working Servers"
-#~ msgstr "正常运行服务器上的文件总数"
-
-#~ msgid "Total Users"
-#~ msgstr "用户总数"
-
-#~ msgid "Total Files"
-#~ msgstr "文件总数"
-
-#~ msgid "aMule Tray Menu Info"
-#~ msgstr "aMule 状态栏 菜单 信息"
-
-#~ msgid "ClientID:"
-#~ msgstr "客户代号: "
-
-#~ msgid "ServerName:"
-#~ msgstr "服务器名称:"
-
-#~ msgid "ServerIP:"
-#~ msgstr "服务器 IP:"
-
-#~ msgid "Shared Files: %s"
-#~ msgstr "共享文件: %s"
-
-#~ msgid "aMule for Linux"
-#~ msgstr "aMule for Linux"
-
-#~ msgid "E&xit\tAlt-X"
-#~ msgstr "退出(&x)\tAlt-X"
-
-#~ msgid "Quit amulecmd"
-#~ msgstr "退出 amulecmd"
-
-#~ msgid "&About...\tF1"
-#~ msgstr "关于(&A)...\tF1"
-
-#~ msgid "Show about dialog"
-#~ msgstr "显示‘关于’对话框"
-
-#~ msgid "&File"
-#~ msgstr "文件(&F)"
-
-#~ msgid "&Help"
-#~ msgstr "帮助(&H)"
-
-#~ msgid ""
-#~ "\n"
-#~ "Ok, exiting Text Client...\n"
-#~ msgstr ""
-#~ "\n"
-#~ "退出...\n"
-
-#~ msgid ""
-#~ "amulecmd DLG version\n"
-#~ "Using %s\n"
-#~ "(c) aMule Dev Team"
-#~ msgstr ""
-#~ "amulecmd DLG version\n"
-#~ "Using %s\n"
-#~ "(c) aMule Dev Team"
-
-#~ msgid "About amulecmd"
-#~ msgstr "关于 amulecmd"
-
-#~ msgid "This command requieres an argument. Valid arguments: 'on', 'off'\n"
-#~ msgstr "该命令需要一个参数。有效参数为：'on', 'off'\n"
-
-#~ msgid ""
-#~ "This command requieres an argument. Valid arguments: 'all', a number.\n"
-#~ msgstr "该命令需要一个参数。有效参数为：'all', 或一数字\n"
-
-#~ msgid "Hint: Use Show DL or Show UL\n"
-#~ msgstr "提示：使用 Show DL or Show UL\n"
-
-#~ msgid "IPLevel parameter must be in the range of 0-255.\n"
-#~ msgstr "IPLevel 命令参数一定要在 0-255 的范围。\n"
-
-#~ msgid "This option requires an argument."
-#~ msgstr "该选项需要一个参数。"
-
-#~ msgid "Connected to %s %s "
-#~ msgstr "已连接到 %s %s "
-
-#~ msgid ""
-#~ "\n"
-#~ "Download:\t %d/sec"
-#~ msgstr ""
-#~ "\n"
-#~ "下载:\t %d/秒"
-
-#~ msgid ""
-#~ "\n"
-#~ "Upload:\t%d/sec"
-#~ msgstr ""
-#~ "\n"
-#~ "上传:\t %d/秒"
-
-#~ msgid "%s/sec"
-#~ msgstr "%s/秒"
-
-#~ msgid ""
-#~ "\n"
-#~ "--------------------> Available commands (case insensitive): "
-#~ "<------------------\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "----------------> 有效命令 (分大小写): <----------------\n"
-#~ "\n"
-
-#~ msgid "server IP"
-#~ msgstr "服务器 IP"
-
-#~ msgid "Connect to given/random server. No warn if failed!\n"
-#~ msgstr "连接到随机服务器。失败后无警告信息！\n"
-
-#~ msgid "Disconnect from server.\n"
-#~ msgstr "中断服务器连接。\n"
-
-#~ msgid "Show server list.\n"
-#~ msgstr "显示服务器列表。\n"
-
-#~ msgid "Shows status and statistics.\n"
-#~ msgstr "显示状态和统计\n"
-
-#~ msgid "Shows Download/Upload queue.\n"
-#~ msgstr "显示下载/上传队列。\n"
-
-#~ msgid "Resume file number n (or 'all').\n"
-#~ msgstr "续传文件编号 n (或 'all').\n"
-
-#~ msgid "Pauses file number n (or 'all').\n"
-#~ msgstr "暂停文件编号 n (或 'all').\n"
-
-#~ msgid "Turn on/off amule IPFilter.\n"
-#~ msgstr "开关IP过滤。\n"
-
-#~ msgid "Reload IPFilter table from file.\n"
-#~ msgstr "重新载入IP过滤列表文件。\n"
-
-#~ msgid "level"
-#~ msgstr "级别"
-
-#~ msgid "Shows/Sets current IP Filter level.\n"
-#~ msgstr "显示/设置IP过滤级别。\n"
-
-#~ msgid "ED2k_Link"
-#~ msgstr "ED2K_Link"
-
-#~ msgid "Adds <ED2k_Link> (file or server) to aMule.\n"
-#~ msgstr "添加 <ED2k_Link> (文件或服务器)到aMule.\n"
-
-#~ msgid "limit"
-#~ msgstr "限制"
-
-#~ msgid "Sets maximum upload bandwidth.\n"
-#~ msgstr "设置最高上传带宽。\n"
-
-#~ msgid "Sets maximum download bandwidth.\n"
-#~ msgstr "设置最高下载带宽。\n"
-
-#~ msgid "Displays bandwidth limits.\n"
-#~ msgstr "显示带宽限制.\n"
-
-#~ msgid "Displays full statistics tree.\n"
-#~ msgstr "显示完整统计数据树。\n"
-
-#~ msgid "Reload shared files list.\n"
-#~ msgstr "刷新共享文件列表。\n"
-
-#~ msgid "Shows this help.\n"
-#~ msgstr "显示帮助。\n"
-
-#~ msgid "Exits aMulecmd.\n"
-#~ msgstr "退出 aMulecmd.\n"
-
-#~ msgid "Shutdown aMule\n"
-#~ msgstr "关闭 aMule\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "----------------------------> End of listing "
-#~ "<----------------------------------\n"
-#~ msgstr ""
-#~ "\n"
-#~ "----------------------------> 列表完毕 "
-#~ "<----------------------------------\n"
-
-#~ msgid "Failed to open shared file (%s), rechecking list of shared files."
-#~ msgstr "无法打开共享文件(%s)，正在重新检查共享文件名单。"
-
-#~ msgid "WARNING: aMule is stopped !"
-#~ msgstr "警告： aMule 已经停止运行！"
-
-#~ msgid " is STOPPED !"
-#~ msgstr " 已经停止运行！"
-
-#~ msgid "Quit amuleweb"
-#~ msgstr "退出 amuleweb"
-
-#~ msgid ""
-#~ "\n"
-#~ "Ok, exiting Web Client...\n"
-#~ msgstr ""
-#~ "\n"
-#~ "正在退出 Web Client...\n"
-
-#~ msgid ""
-#~ "amuleweb [DLG version]\n"
-#~ "Using %s\n"
-#~ "(c) aMule Dev Team"
-#~ msgstr ""
-#~ "amuleweb [DLG version]\n"
-#~ "Using %s\n"
-#~ "(c) aMule Dev Team"
-
-#~ msgid "About amuleweb"
-#~ msgstr "关于 amuleweb"
-
-#~ msgid "amuleweb DLG"
-#~ msgstr "amuleweb DLG"
-
-#~ msgid "FATAL ERROR: Cannot find template: %s"
-#~ msgstr "错误: 找不到模板：%s"
-
-#~ msgid ""
-#~ "\n"
-#~ "----------------> Help: Available commands (case insensitive): "
-#~ "<----------------\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "----------------> 帮助: 有效命令 (分大小写): <----------------\n"
-#~ "\n"
-
-#~ msgid "Exits aMuleWeb.\n"
-#~ msgstr "退出 aMuleWeb.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Use 'Help' for command list\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "使用 'Help' 列出所有命令\n"
-#~ "\n"
-
-#~ msgid "Very Low"
-#~ msgstr "极低"
-
-#~ msgid " Auto"
-#~ msgstr "自动"
-
-#~ msgid "Web Server: running\n"
-#~ msgstr "Web服务器：正在运行\n"
-
-#~ msgid "Web Server: Restarted\n"
-#~ msgstr "Web服务器：重启动完毕\n"
-
-#~ msgid "Web Server: Stopped\n"
-#~ msgstr "Web服务器：已停止\n"
-
-#~ msgid "Web Server: not running\n"
-#~ msgstr "Web服务器：没有运行\n"
-
-#~ msgid "Can't load templates: Can't open file %s"
-#~ msgstr "无法加载模板: 无法开启文件 %s"
-
-#~ msgid ""
-#~ "Can't find template version number!\n"
-#~ "Please replace aMule.tmpl with a newer version!"
-#~ msgstr ""
-#~ "找不到模板版本号!\n"
-#~ "请升级 aMule.tmpl 到新版本!"
-
-#~ msgid "Failed to load template %s\n"
-#~ msgstr "无法加载模板 %s\n"
-
-#
-#~ msgid "Access denied!"
-#~ msgstr "请求被拒绝"
-
-#~ msgid "Web Control Panel"
-#~ msgstr "网络服务器控制板"
-
-#~ msgid "ED2K Link(s)"
-#~ msgstr "ED2K链接"
-
-#~ msgid "Log"
-#~ msgstr "日志"
-
-#~ msgid "Serverinfo"
-#~ msgstr "服务器信息"
-
-#~ msgid "Debug Log"
-#~ msgstr "调试日志"
-
-#~ msgid "Logout"
-#~ msgstr "登出"
-
-#~ msgid "Server name"
-#~ msgstr "服务器名称"
-
-#~ msgid "IP"
-#~ msgstr "IP"
-
-#~ msgid "users"
-#~ msgstr "用户"
-
-#~ msgid "files"
-#~ msgstr "文件"
-
-#~ msgid "Actions"
-#~ msgstr "动作"
-
-#~ msgid "Remove selected server"
-#~ msgstr "删除选择的服务器"
-
-#~ msgid "Are you sure to remove this server from list?"
-#~ msgstr "您确定要把该服务器从列表中删除吗？"
-
-#~ msgid "This ed2k link is invalid (%s)"
-#~ msgstr "该 ED2K 链接无效 (%s)"
-
-#~ msgid "Got no response from aMule."
-#~ msgstr "aMule 没有响应"
-
-#~ msgid "Downloaded total"
-#~ msgstr "下载总量"
-
-#~ msgid "Uploaded total"
-#~ msgstr "上传总量"
-
-#~ msgid "Increase Priority"
-#~ msgstr "提高优先级"
-
-#~ msgid "Decrease Priority"
-#~ msgstr "降低优先级"
-
-#~ msgid "Internal error - no item in container"
-#~ msgstr "内部错误 - no item in container"
-
-#~ msgid "Hide Queue"
-#~ msgstr "隐藏队列"
-
-#~ msgid "Clear Completed"
-#~ msgstr "清除已完成的文件"
-
-#~ msgid "Uploads (%i)"
-#~ msgstr "上传 (%i)"
-
-#~ msgid "Download Selected"
-#~ msgstr "下载已选文件"
-
-#~ msgid "Time"
-#~ msgstr "时间"
-
-#~ msgid "Refetch graph data"
-#~ msgstr "重新获取图数据"
-
-#~ msgid "IP or Address"
-#~ msgstr "IP 或地址："
-
-#~ msgid "Name"
-#~ msgstr "名字"
-
-#~ msgid "Add to list"
-#~ msgstr "加入列表"
-
-#~ msgid "Update server.met from URL"
-#~ msgstr "读取URL以更新server.met"
-
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#~ msgid "Web-based Search"
-#~ msgstr "网上搜索"
-
-#~ msgid "File Settings"
-#~ msgstr "文件设置"
-
-#~ msgid "Max Sources Per File"
-#~ msgstr "单个文件最大源数"
-
-#~ msgid "Max. Connections"
-#~ msgstr "最大连接数"
-
-#~ msgid "Max. new connections / 5secs"
-#~ msgstr "5 秒内最大新连接数"
-
-#~ msgid "Gzip Compression"
-#~ msgstr "启用 Gzip 压缩"
-
-#~ msgid "Save traffic, especially in graphs."
-#~ msgstr "保存传输数据，特别是在图里"
-
-#~ msgid "Enable or disable the display of waiting queue in transfer page."
-#~ msgstr "启用或禁用传输页内的等待队列显示"
-
-#~ msgid "Refresh-Time of Pages"
-#~ msgstr "页刷新周期"
-
-#~ msgid "Time in seconds (zero=disabled)"
-#~ msgstr "时间秒数 (0代表禁用)"
-
-#~ msgid "Speed Limits"
-#~ msgstr "速度限制"
-
-#~ msgid "Bandwidth Limits"
-#~ msgstr "带宽限制"
-
-#~ msgid "Statistics graphs' settings"
-#~ msgstr "统计图像窗口设置"
-
-#~ msgid "Graph height"
-#~ msgstr "图表高度"
-
-#~ msgid "Graph width"
-#~ msgstr "图表宽度"
-
-#~ msgid "pixels"
-#~ msgstr "像素"
-
-#~ msgid "In the graph, each pixel represents"
-#~ msgstr "在图表中每个像素代表"
-
-#~ msgid "seconds"
-#~ msgstr "seconds"
-
-#~ msgid "Login"
-#~ msgstr "登录"
-
-#~ msgid "Enter your password here"
-#~ msgstr "请输入密码"
-
-#~ msgid "Login Now"
-#~ msgstr "现在登录"
-
-#~ msgid "Server Preferences"
-#~ msgstr "服务器设置"
-
-#~ msgid "Connected "
-#~ msgstr "已连接"
-
-#~ msgid "Refetch Results"
-#~ msgstr "刷新结果"
-
-#~ msgid "File Hash"
-#~ msgstr "文件校检码"
-
-#~ msgid "Min Availability"
-#~ msgstr "最低源数"
-
-#~ msgid "Method"
-#~ msgstr "方式"
-
-#~ msgid "Global (Server)"
-#~ msgstr "全球 (服务器)"

aMule-2.2.6.tar.bz2/po/zh_TW.po -> aMule-2.3.1.tar.bz2/po/zh_TW.po Changed

@@ -1,1304 +1,1120 @@
 # aMule Translation file.
-# Copyright (c) 2003-2008 aMule Team
+# Copyright (c) 2003-2011 aMule Team
 # This file is distributed under the same license as the aMule package.
+#
+# Simplified Chinese translation by:
 # Chen yu-kai <ishappyday@msn.com>, 2004.
-# xiaoqiao <29551030@qq.com>, 2007, 2008.
+# xiaoqiao <29551030@qq.com>, 2007-2008.
+#
+# Traditional Chinese translation converted and updated by:
+# Wayne Su <mstarmstar@gmail.com>, 2008-2010.
+#
+# =============================================================================
+# How to translate:
+# http://www.amule.org/wiki/index.php/Translations-tw
+#
+# Please give any advice here:
+# http://www.ubuntu-tw.org/modules/newbb/viewtopic.php?topic_id=12208&forum=15
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-16 23:03+0200\n"
-"PO-Revision-Date: 2008-12-06 14:09+0800\n"
-"Last-Translator: mstar\n"
+"POT-Creation-Date: 2011-11-11 21:59+0100\n"
+"PO-Revision-Date: 2011-11-11 01:29+0800\n"
+"Last-Translator: Wayne Su <mstarmstar@gmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: TAIWAN\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Bookmarks: 826,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:86 src/libs/ec/cpp/RemoteConnect.cpp:94
-msgid "You must specify a non-empty password."
-msgstr "您必須輸入密碼。"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:91
-msgid "Invalid password, not a MD5 hash!"
-msgstr "無效的密碼，不是 MD5 雜湊值！"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:132
-msgid "Connection failure"
-msgstr "無法連線"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:188
-msgid "EC connection failed. Empty reply."
-msgstr "無法外部連線，無回應。"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:194
-msgid "External Connection: Access denied because: "
-msgstr "外部連線：拒絕存取，原因："
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:197
-msgid "External Connection: Access denied"
-msgstr "外部連線：拒絕存取"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:201
-msgid "External Connection: Bad reply from server. Connection closed."
-msgstr "外部連線：伺服器回應不正確，連線中斷。"
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:205
-msgid "Succeeded! Connection established to aMule "
-msgstr "已成功連線到 aMule "
-
-#: src/libs/ec/cpp/RemoteConnect.cpp:208
-msgid "Succeeded! Connection established."
-msgstr "連線成功。"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:39 src/PartFile.cpp:3867
-msgid "Hashing"
-msgstr "正在雜湊"
+#: src/AddFriend.cpp:45
+msgid "Add a Friend"
+msgstr "加入好友"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:43 src/PartFile.cpp:3873
-msgid "Completing"
-msgstr "正在完成"
+#: src/AddFriend.cpp:61
+msgid "You have to enter a valid IP and port!"
+msgstr "請輸入有效的 IP 位址和通訊埠！"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:45 src/PartFile.cpp:3876
-msgid "Complete"
-msgstr "完成"
+#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
+msgid "Information"
+msgstr "資訊"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:47 src/PartFile.cpp:3879
-#: src/TransferWnd.cpp:351 src/OtherFunctions.cpp:700
-msgid "Paused"
-msgstr "已暫停"
+#: src/AddFriend.cpp:67
+msgid "The specified userhash is not valid!"
+msgstr "這個使用者 hash 值無效！"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:49 src/PartFile.cpp:3882
-#: src/TransferWnd.cpp:350 src/OtherFunctions.cpp:699
-msgid "Erroneous"
-msgstr "錯誤的"
+#: src/amuleAppCommon.cpp:128
+msgid "Failed to open ED2KLinks file."
+msgstr "無法開啟 ED2K 連結檔。"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:52 src/PartFile.cpp:3889
-#: src/TransferWnd.cpp:349 src/OtherFunctions.cpp:698
-msgid "Downloading"
-msgstr "正在下載"
+#: src/amuleAppCommon.cpp:190
+msgid ""
+"WARNING: You can't add yourself as a source for an eD2k link while having a "
+"lowid."
+msgstr "警告：LowID 時不可以將自己加入 eD2k 連結來源。"
 
-#: src/libs/ec/cpp/ECSpecialTags.cpp:54 src/PartFile.cpp:3891
-#: src/TransferWnd.cpp:348 src/OtherFunctions.cpp:697
-msgid "Waiting"
-msgstr "正在等候"
+#: src/amule.cpp:239
+msgid "Now, exiting main app..."
+msgstr "正在離開主程式..."
 
-#: src/ThreadTasks.cpp:133
+#: src/amule.cpp:258
 #, c-format
-msgid "Starting to create MD4 and AICH hash for file: %s"
-msgstr "開始爲檔案 %s 計算 MD4 和 AICH 雜湊值"
+msgid "Terminating amuleweb instance with pid '%ld' ... "
+msgstr "正在終止 pid %ld 的 amuleweb 執行緒..."
 
-#: src/ThreadTasks.cpp:137
+#: src/amule.cpp:261
 #, c-format
-msgid "Starting to create MD4 hash for file: %s"
-msgstr "開始爲檔案 %s 計算 MD4 雜湊值"
+msgid "Killing amuleweb instance with pid '%ld' ... "
+msgstr "正在強行終止 pid %ld 的 amuleweb 執行緒..."
 
-#: src/ThreadTasks.cpp:141
-#, c-format
-msgid "Starting to create AICH hash for file: %s"
-msgstr "開始爲檔案 %s 計算 AICH 雜湊值"
+#: src/amule.cpp:263 src/ClientRef.cpp:194 src/ServerListCtrl.cpp:94
+msgid "Failed"
+msgstr "失敗"
 
-#: src/ThreadTasks.cpp:350
-#, c-format
-msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
-msgstr "將 '%s' 的舊 AICH 雜湊值組轉換為 '%s' 的 64b 格式。"
+#: src/amule.cpp:269
+msgid "aMule OnExit: Terminating core."
+msgstr "aMule 離開中：正在終止主程式。"
 
-#: src/ThreadTasks.cpp:429
-#, c-format
-msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
-msgstr "警告：檔名 '%s' 無效，已重新命名爲 '%s'。"
+#: src/amule.cpp:335
+msgid "aMule shutdown completed."
+msgstr "已關閉 aMule 。"
 
-#: src/ThreadTasks.cpp:442
-#, c-format
-msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
-msgstr "警告：檔案 '%s' 已經存在，新檔案重新命名爲 '%s'。"
+#: src/amule.cpp:339
+msgid "Memory debug results for aMule exit:"
+msgstr "離開 aMule 時記憶體除錯結果："
 
-#: src/ThreadTasks.cpp:455
-#, c-format
-msgid "WARNING: Could not remove original '%s' after creating backup"
-msgstr "警告：爲 '%s' 建立備份後無法刪除原檔案"
+#: src/amule.cpp:435
+msgid ""
+"\n"
+"EC configuration"
+msgstr ""
+"\n"
+"外部連線設定"
 
-#: src/ThreadTasks.cpp:467
-#, c-format
-msgid "WARNING: Failed to delete %s"
-msgstr "警告：無法刪除 %s"
+#: src/amule.cpp:438
+msgid "Password set and external connections enabled."
+msgstr "密碼已設定，外部連線已啟用。"
 
-#: src/BaseClient.cpp:1307
-#, c-format
-msgid "Failed to retrieve shared files from user '%s'"
-msgstr "無法從使用者 '%s' 取得分享檔案清單"
+#: src/amule.cpp:449 src/KadDlg.cpp:182 src/KadDlg.cpp:188
+#: src/PrefsUnifiedDlg.cpp:742 src/SharedFilesCtrl.cpp:315
+msgid "WARNING"
+msgstr "警告"
 
-#: src/BaseClient.cpp:1721 src/BaseClient.cpp:2243 src/BaseClient.cpp:2517
-#: src/HTTPDownload.cpp:81 src/DataToText.cpp:54 src/DataToText.cpp:70
-#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
-#: src/ExternalConn.cpp:250 src/Statistics.cpp:703 src/Statistics.cpp:884
-#: src/Server.cpp:160 src/Server.cpp:235 src/DownloadListCtrl.cpp:1418
-#: src/DownloadListCtrl.cpp:1431 src/DownloadListCtrl.cpp:1442
-#: src/PartFile.cpp:2619 src/PartFile.cpp:2625 src/KnownFile.cpp:884
-#: src/KnownFile.cpp:890 src/FileDetailDialog.cpp:130
-#: src/ClientListCtrl.cpp:678 src/ClientListCtrl.cpp:701
-#: src/ClientListCtrl.cpp:709 src/ClientListCtrl.cpp:872
-#: src/ClientDetailDialog.cpp:83 src/ClientDetailDialog.cpp:84
-#: src/ClientDetailDialog.cpp:85 src/ClientDetailDialog.cpp:120
-#: src/ClientDetailDialog.cpp:121 src/MuleTrayIcon.cpp:416
-msgid "Unknown"
-msgstr "不明"
+#: src/amule.cpp:495
+msgid ""
+"Your locale has been changed to System Default due to a configuration "
+"change. Sorry."
+msgstr "對不起，由於版本變更，您的地區設定已經被變更爲系統預設值。"
 
-#: src/BaseClient.cpp:1738
-#, c-format
-msgid " (Fake eMule version %#x)"
-msgstr " (假 eMule 版本 %#x)"
+#: src/amule.cpp:497 src/amule.cpp:1054 src/CatDialog.cpp:141
+#: src/CatDialog.cpp:151 src/CatDialog.cpp:163 src/ServerList.cpp:345
+#: src/ServerListCtrl.cpp:148
+msgid "Info"
+msgstr "資訊"
 
-#: src/BaseClient.cpp:1749
-msgid " (Fake eMule)"
-msgstr " (假 eMule)"
+#: src/amule.cpp:580
+msgid ""
+"You don't have any server in the server list.\n"
+"Do you want aMule to download a new list now?"
+msgstr ""
+"在伺服器清單中沒有任何伺服器。\n"
+"要讓 aMule 現在就下載一個新的嗎？"
 
-#: src/BaseClient.cpp:1751
-msgid "xMule (Fake eMule)"
-msgstr "xMule (假 eMule)"
+#: src/amule.cpp:581
+msgid "Server list download"
+msgstr "已下載伺服器清單"
 
-#: src/BaseClient.cpp:1790
+#: src/amule.cpp:654
 #, c-format
-msgid "1.x (based on eMule v0.%u)"
-msgstr "1.x (源自 eMule v0.%u)"
+msgid "web server running on pid %d"
+msgstr "執行中的網站伺服器 pid：%d"
 
-#: src/BaseClient.cpp:1960
-#, c-format
-msgid "NickName: %s ID: %u"
-msgstr "暱稱：%s ID：%u"
+#: src/amule.cpp:658
+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 ""
+"您要求啟動時執行網站伺服器，但系統無法執行 amuleweb。請安裝含有 aMule 網站伺"
+"服器的套件，或於編譯 aMule 程式碼時加入 --enable-webserver 選項"
 
-#: src/BaseClient.cpp:1962
-#, c-format
-msgid "Requested: %s\n"
-msgstr "已要求：%s\n"
+#: src/amule.cpp:659 src/amule.cpp:776 src/amule.cpp:1065
+#: src/amule-remote-gui.cpp:298 src/amule-remote-gui.cpp:320
+#: src/amule-remote-gui.cpp:322 src/amule-remote-gui.cpp:633
+msgid "ERROR"
+msgstr "錯誤"
 
-#: src/BaseClient.cpp:1964
+#: src/amule.cpp:741
 #, c-format
-msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] "本次：共接受 %d/%d 個要求，已傳送 %s\n"
-msgstr[1] "本次：共接受 %d/%d 個要求，已傳送 %s\n"
+msgid "Could not bind ports to the specified address: %s"
+msgstr "無法選定使用此位址的通訊埠：%s"
 
-#: src/BaseClient.cpp:1967
+#: src/amule.cpp:768
 #, c-format
-msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
-msgid_plural ""
-"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
-msgstr[0] "總計：共接受 %d/%d 個要求，已傳送 %s\n"
-msgstr[1] "總計：共接受 %d/%d 個要求，已傳送 %s\n"
-
-#: src/BaseClient.cpp:1970
-msgid "Requested unknown file"
-msgstr "已要求不明檔案"
+msgid "Port %u is not available. You will be LOWID\n"
+msgstr "通訊埠 %u 已被佔用。您會變成 LOWID。\n"
 
-#: src/BaseClient.cpp:2242
+#: src/amule.cpp:774
 #, c-format
-msgid "Client %s on IP:Port %s:%d using %s %s %s"
-msgstr "客戶端 %s：位址 %s:%d，使用 %s %s %s"
-
-#: src/FriendListCtrl.cpp:79 src/CommentDialogLst.cpp:55
-#: src/ClientListCtrl.cpp:509 src/ClientListCtrl.cpp:834
-#: src/ClientListCtrl.cpp:1002
-msgid "Username"
-msgstr "使用者名稱"
+msgid ""
+"Port %u is not available!\n"
+"\n"
+"This means that you will be LOWID.\n"
+"\n"
+"Check your network to make sure the port is open for output and input."
+msgstr ""
+"通訊埠 %u 已被佔用！\n"
+"\n"
+"這表示您會變成 LOWID。\n"
+"\n"
+"請檢查網路設定以確保通訊埠可正常使用。"
 
-#: src/FriendListCtrl.cpp:226 src/muuli_wdr.cpp:507 src/muuli_wdr.cpp:3121
-msgid "Friends"
-msgstr "好友"
+#: src/amule.cpp:853
+msgid "Failed to create OnlineSig File"
+msgstr "無法建立線上簽名識別檔"
 
-#: src/FriendListCtrl.cpp:230 src/DownloadListCtrl.cpp:1013
-#: src/ClientListCtrl.cpp:258
-msgid "Show &Details"
-msgstr "顯示詳細資訊(&D)"
+#: src/amule.cpp:861
+msgid "Failed to create aMule OnlineSig File"
+msgstr "無法建立 aMule 線上簽名識別檔"
 
-#: src/FriendListCtrl.cpp:234
-msgid "Add a friend"
-msgstr "加入好友"
+#: src/amule.cpp:1031
+msgid ""
+"The selected locale seems not to be installed on your box. (Note: I'll try "
+"to set it anyway)"
+msgstr ""
+"在您的電腦上似乎沒有安裝您所選取的地區設定。 (但仍會採用您所選擇的設定)"
 
-#: src/FriendListCtrl.cpp:237
-msgid "Remove Friend"
-msgstr "移除好友"
+#: src/amule.cpp:1040
+#, c-format
+msgid "This is the first time you run aMule %s"
+msgstr "這是您第一次執行 aMule %s"
 
-#: src/FriendListCtrl.cpp:238
-msgid "Send &Message"
-msgstr "傳送訊息(&M)"
+#: src/amule.cpp:1042
+msgid "This version is a testing version, updated daily, and\n"
+msgstr "這個版本是測試版，每日有更新，\n"
 
-#: src/FriendListCtrl.cpp:239 src/DownloadListCtrl.cpp:1015
-#: src/ClientListCtrl.cpp:260
-msgid "View Files"
-msgstr "檢視檔案"
+#: src/amule.cpp:1043
+msgid "we give no warranty it won't break anything, burn your house,\n"
+msgstr "但我們無法擔保它不會造成任何損害、燒掉您的房子、\n"
 
-#: src/FriendListCtrl.cpp:240
-msgid "Establish Friend Slot"
-msgstr "建立好友位置"
+#: src/amule.cpp:1044
+msgid "or kill your dog. But it *should* be safe to use anyway.\n"
+msgstr "或害死您的狗。但一般來講它「應該」是安全的。\n"
 
-#: src/FriendListCtrl.cpp:273
-msgid "Are you sure that you wish to delete the selected friend?"
-msgstr "您確定要刪除這個好友嗎？"
+#: src/amule.cpp:1049
+msgid "More information, support and new releases can found at our homepage,\n"
+msgstr "在我們的網頁可找到更多資訊、使用者支援以及程式最新版本：\n"
 
-#: src/FriendListCtrl.cpp:275
-msgid "Are you sure that you wish to delete the selected friends?"
-msgstr "您確定要刪除這些好友嗎？"
+#: src/amule.cpp:1050
+msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
+msgstr "http://www.aMule.org，或我們在 irc.freenode.net 的 IRC 頻道 #aMule。\n"
 
-#: src/FriendListCtrl.cpp:278 src/utils/wxCas/src/wxcasprefs.cpp:298
-#: src/ServerListCtrl.cpp:149 src/ServerListCtrl.cpp:556
-#: src/ServerListCtrl.cpp:575 src/amuleDlg.cpp:751
-#: src/DownloadListCtrl.cpp:585 src/DownloadListCtrl.cpp:905
-#: src/TransferWnd.cpp:376 src/muuli_wdr.cpp:859 src/muuli_wdr.cpp:929
-#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:1069 src/muuli_wdr.cpp:2586
-#: src/muuli_wdr.cpp:2688 src/muuli_wdr.cpp:3470
-msgid "Cancel"
-msgstr "取消"
+#: src/amule.cpp:1052
+msgid "Feel free to report any bugs to http://forum.amule.org"
+msgstr "歡迎您到 http://forum.amule.org 提出錯誤報告"
 
-#: src/FriendListCtrl.cpp:359
+#: src/amule.cpp:1065
 msgid ""
-"You are not allowed to set more than one friendslot.\n"
-" Only one slot was assigned."
+"The folder for Online Signature files you specified is INVALID!\n"
+" OnlineSignature will be DISABLED until you fix it on preferences."
 msgstr ""
-"不允許設定超過一個好友位置。\n"
-" 只設定了一個位置。"
+"您選擇的線上簽名識別檔案所在資料夾無效！\n"
+" 在您變更偏好設定之前，線上簽名識別功能將被停用。"
 
-#: src/FriendListCtrl.cpp:359
-msgid "Multiple selection"
-msgstr "多重選取"
+#: src/amule.cpp:1120
+msgid "Server hostname notified"
+msgstr "已通伺服器主機名稱"
 
-#: src/UserEvents.h:60
-msgid "Download completed"
-msgstr "下載完畢"
+#: src/amule.cpp:1346
+#, c-format
+msgid "Disk space preallocation for file '%s' failed: %s"
+msgstr "無法為檔案 %s 預先分配磁碟空間：%s "
 
-#: src/UserEvents.h:63 src/UserEvents.h:103
-msgid "The full path to the file."
-msgstr "檔案的完整路徑。"
+#: src/amule.cpp:1475
+msgid "ERROR: can't open logfile"
+msgstr "錯誤：無法開啟記錄檔"
 
-#: src/UserEvents.h:67
-msgid "The name of the file without path component."
-msgstr "不包含路徑的檔名。"
+#: src/amule.cpp:1479
+msgid "WARNING: logfile is empty. Something is wrong."
+msgstr "警告：沒有記錄檔，肯定有什麽地方出錯了。"
 
-#: src/UserEvents.h:71
-msgid "The eD2k hash of the file."
-msgstr "檔案的 eD2k 雜湊值。"
+#: src/amule.cpp:1497
+msgid "Log has been reset"
+msgstr "記錄已被清除"
 
-#: src/UserEvents.h:75
-msgid "The size of the file in bytes."
-msgstr "檔案大小 (B)。"
+#: src/amule.cpp:1523
+#, c-format
+msgid "ServerMessage: %s"
+msgstr "伺服器訊息：%s"
 
-#: src/UserEvents.h:79
-msgid "Cumulative download activity time."
-msgstr "累計實際下載時間。"
+#: src/amule.cpp:1561 src/IP2Country.cpp:151 src/IPFilter.cpp:509
+#: src/ServerList.cpp:856
+#, c-format
+msgid "Skipped download of %s, because requested file is not newer."
+msgstr "略過不下載 %s ，因為並不是新近檔案。"
 
-#: src/UserEvents.h:84
-msgid "New chat session started"
-msgstr "已開始新的交談"
+#: src/amule.cpp:1563
+msgid "Failed to download the nodes list."
+msgstr "無法下載節點清單。"
 
-#: src/UserEvents.h:87
-msgid "Message sender."
-msgstr "訊息傳送者。"
+#: src/amule.cpp:1583
+msgid "Failed to open the downloaded version check file"
+msgstr "無法開啟下載的版本檢查檔"
 
-#: src/UserEvents.h:92
-msgid "Out of space"
-msgstr "空間不足"
+#: src/amule.cpp:1586 src/amule.cpp:1596 src/amule.cpp:1602
+msgid "Corrupted version check file"
+msgstr "損壞的版本檢查檔"
 
-#: src/UserEvents.h:95
-msgid "Disk partition."
-msgstr "磁碟分割區。"
+#: src/amule.cpp:1612
+msgid "You are using an outdated version of aMule!"
+msgstr "您使用的是過期的 aMule 版本！"
 
-#: src/UserEvents.h:100
-msgid "Error on completion"
-msgstr "有錯誤發生於完成"
+#: src/amule.cpp:1613
+#, c-format
+msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
+msgstr "您的 aMule 版本是 %i.%i.%i，最新版本是 %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:102 src/SearchListCtrl.cpp:87
-#: src/DownloadListCtrl.cpp:189 src/CommentDialogLst.cpp:56
-#: src/FileDetailListCtrl.cpp:43
-msgid "File Name"
-msgstr "檔案名稱"
+#: src/amule.cpp:1614
+msgid "The latest version can always be found at http://www.amule.org"
+msgstr "最新版本可從這裏下載：http://www.amule.org"
 
-#: src/SharedFilesCtrl.cpp:103 src/SearchListCtrl.cpp:88
-#: src/DownloadListCtrl.cpp:190 src/PartFileConvertDlg.cpp:95
-msgid "Size"
-msgstr "大小"
+#: src/amule.cpp:1616
+#, c-format
+msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
+msgstr "警告：您的 aMuled 版本已經過期：%i.%i.%i < %li.%li.%li"
 
-#: src/SharedFilesCtrl.cpp:104 src/SearchListCtrl.cpp:90 src/muuli_wdr.cpp:190
-msgid "Type"
-msgstr "類型"
+#: src/amule.cpp:1620
+msgid "Your copy of aMule is up to date."
+msgstr "您的 aMule 是最新版本。"
 
-#: src/SharedFilesCtrl.cpp:105 src/SharedFilesCtrl.cpp:140
-#: src/ServerListCtrl.cpp:94 src/ServerListCtrl.cpp:423
-#: src/DownloadListCtrl.cpp:196 src/DownloadListCtrl.cpp:904
-msgid "Priority"
-msgstr "優先等級"
+#: src/amule.cpp:1627
+msgid "Failed to download the version check file"
+msgstr "無法下載版本檢查檔"
 
-#: src/SharedFilesCtrl.cpp:106 src/SearchListCtrl.cpp:91
-msgid "FileID"
-msgstr "檔案 ID"
+#: src/amule.cpp:1792 src/amule-remote-gui.cpp:518
+#, c-format
+msgid "Users: %s | Files: %s"
+msgstr "使用者：%s | 檔案：%s"
 
-#: src/SharedFilesCtrl.cpp:107
-msgid "Requests"
-msgstr "要求"
+#: src/amule.cpp:1793 src/amule-remote-gui.cpp:519
+#, c-format
+msgid "Users: E: %s K: %s | Files: E: %s K: %s"
+msgstr "使用者：E:%s K:%s | 檔案：E:%s K:%s"
 
-#: src/SharedFilesCtrl.cpp:108
-msgid "Accepted Requests"
-msgstr "已接受要求"
+#: src/amule.cpp:1802 src/amule-remote-gui.cpp:528
+msgid "No networks selected"
+msgstr "未選取網路"
 
-#: src/SharedFilesCtrl.cpp:109
-msgid "Transferred Data"
-msgstr "已傳輸資料"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with LowID"
+msgstr "有 LowID"
 
-#: src/SharedFilesCtrl.cpp:110
-msgid "Share Ratio"
-msgstr "分享率"
+#: src/amule.cpp:1865 src/TextClient.cpp:707
+msgid "with HighID"
+msgstr "有 HighID"
 
-#: src/SharedFilesCtrl.cpp:111 src/ClientListCtrl.cpp:517
-#: src/ClientListCtrl.cpp:844
-msgid "Obtained Parts"
-msgstr "已獲得部分"
+#: src/amule.cpp:1867
+#, c-format
+msgid "Connected to %s %s"
+msgstr "已連線到 %s %s"
 
-#: src/SharedFilesCtrl.cpp:112
-msgid "Complete Sources"
-msgstr "完整來源"
+#: src/amule.cpp:1870
+#, c-format
+msgid "Connecting to %s"
+msgstr "正在連線到 %s"
 
-#: src/SharedFilesCtrl.cpp:113
-msgid "Directory Path"
-msgstr "所在目錄"
+#: src/amule.cpp:1872
+msgid "Disconnected from eD2k"
+msgstr "已中斷 eD2k 網路連線"
 
-#: src/SharedFilesCtrl.cpp:130 src/Statistics.cpp:727 src/muuli_wdr.cpp:1094
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files"
-msgstr "分享檔案"
+#: src/amule.cpp:1879
+msgid "Kad started."
+msgstr "Kad 已啓動。"
 
-#: src/SharedFilesCtrl.cpp:132 src/DataToText.cpp:43
-msgid "Very low"
-msgstr "極低"
+#: src/amule.cpp:1881
+msgid "Kad stopped."
+msgstr "Kad 已停止。"
 
-#: src/SharedFilesCtrl.cpp:133 src/DataToText.cpp:44
-#: src/ServerListCtrl.cpp:230 src/ServerListCtrl.cpp:419
-#: src/DownloadListCtrl.cpp:899 src/muuli_wdr.cpp:2650
-msgid "Low"
-msgstr "低"
+#: src/amule.cpp:1888
+msgid "Connected to Kad (ok)"
+msgstr "已連線到 Kad"
 
-#: src/SharedFilesCtrl.cpp:134 src/DataToText.cpp:45
-#: src/ServerListCtrl.cpp:231 src/ServerListCtrl.cpp:420
-#: src/DownloadListCtrl.cpp:900 src/muuli_wdr.cpp:2651
-msgid "Normal"
-msgstr "普通"
+#: src/amule.cpp:1890
+msgid "Connected to Kad (firewalled)"
+msgstr "已連線到 Kad 網路 (防火牆內)"
 
-#: src/SharedFilesCtrl.cpp:135 src/DataToText.cpp:46
-#: src/ServerListCtrl.cpp:232 src/ServerListCtrl.cpp:421
-#: src/DownloadListCtrl.cpp:901 src/muuli_wdr.cpp:2652
-msgid "High"
-msgstr "高"
+#: src/amule.cpp:1893
+msgid "Disconnected from Kad"
+msgstr "已中斷 Kad 網路連線"
 
-#: src/SharedFilesCtrl.cpp:136 src/DataToText.cpp:47
-msgid "Very High"
-msgstr "極高"
+#: src/amule.cpp:1960
+msgid ""
+"Kad network cannot be used if UDP port is disabled on preferences, not "
+"starting."
+msgstr "Kad 網路未啟動：如果在偏好設定中停用了 UDP 埠，Kad 網路將不能使用。"
 
-#: src/SharedFilesCtrl.cpp:137 src/DataToText.cpp:48
-msgid "Release"
-msgstr "釋放"
+#: src/amule.cpp:1963
+msgid "Kad network disabled on preferences, not connecting."
+msgstr "Kad 網路在偏好設定中被停用了，沒有連線。"
 
-#: src/SharedFilesCtrl.cpp:138 src/DownloadListCtrl.cpp:902
-#: src/muuli_wdr.cpp:2653
-msgid "Auto"
-msgstr "自動"
+#: src/amuled.cpp:560
+msgid ""
+"ERROR: aMule daemon cannot be used when external connections are disabled. "
+"To enable External Connections, use either a normal aMule, start amuled with "
+"the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in "
+"the file ~/.aMule/amule.conf"
+msgstr ""
+"錯誤：當停用外部連線時，aMule 背景服務程式無法使用。要啓用外部連線，請使用標"
+"準的 aMule，或使用 --ec-config 選項啓動 amuled，或在檔案 ~/aMule/amule.conf "
+"中將「AcceptExternalConnections」設定值改為 1"
 
-#: src/SharedFilesCtrl.cpp:145
-msgid "Add Comment/Rating"
-msgstr "加入註解/評價"
+#: src/amuled.cpp:563
+msgid ""
+"ERROR: A valid password is required to use external connections, and aMule "
+"daemon cannot be used without external connections. To run aMule deamon, you "
+"must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an "
+"appropriate value. Execute amuled with the flag --ec-config to set the "
+"password. More information can be found at http://wiki.amule.org"
+msgstr ""
+"錯誤：需要有效的密碼以使用外部連線，且 aMule 背景服務程式要有外部連線才可使"
+"用。要執行 aMule 背景服務程式，您必須在檔案 ~/aMule/amule.conf 中將 "
+"「ECPassword」 設定值改為適當的數字。使用 --ec-config 參數啓動 amuled 以設定"
+"密碼。請到 http://wiki.amule.org 取得更多資訊"
+
+#: src/amuled.cpp:615
+msgid "amuled: OnInit - starting timer"
+msgstr "amuled：初始中 - 正在開始計時器"
+
+#: src/amuled.cpp:630
+msgid "amuled: forking to background - see you"
+msgstr "amuled：在背景執行 - 再見"
+
+#: src/amuled.cpp:661
+msgid "Cannot Create Pid File"
+msgstr "無法建立 pid 檔案"
 
-#: src/SharedFilesCtrl.cpp:147
-msgid "Edit Comment/Rating"
-msgstr "編輯註解/評價"
+#: src/amuled.cpp:711
+#, c-format
+msgid "ERROR: %s"
+msgstr "錯誤：%s"
 
-#: src/SharedFilesCtrl.cpp:151
-msgid "Rename"
-msgstr "重新命名"
+#: src/amuleDlg.cpp:238
+#, c-format
+msgid "This is aMule %s based on eMule."
+msgstr "這是 aMule %s (源自 eMule)。"
 
-#: src/SharedFilesCtrl.cpp:158
-msgid "Add files in collection to transfer list"
-msgstr "加入收藏中的檔案到傳輸清單"
+#: src/amuleDlg.cpp:240
+#, c-format
+msgid "Running on %s"
+msgstr "執行於 %s"
 
-#: src/SharedFilesCtrl.cpp:161
-msgid "Copy magnet &URI to clipboard"
-msgstr "複製 magnet 網址到剪貼簿(&U)"
+#: src/amuleDlg.cpp:242
+msgid "Visit http://www.amule.org to check if a new version is available."
+msgstr "請到 http://www.amule.org 下載最新版本。"
 
-#: src/SharedFilesCtrl.cpp:162 src/DownloadListCtrl.cpp:939
-msgid "Copy eD2k &link to clipboard"
-msgstr "複製 eD2k 連結到剪貼簿(&L)"
+#: src/amuleDlg.cpp:268
+msgid "FATAL ERROR: Failed to create Timer"
+msgstr "嚴重錯誤：無法建立計時器"
 
-#: src/SharedFilesCtrl.cpp:163
-msgid "Copy eD2k link to clipboard (&Source)"
-msgstr "複製 eD2k 連結到剪貼簿 (來源) (&S)"
+#: src/amuleDlg.cpp:493
+msgid "aMule remote control "
+msgstr "aMule 遠端控制"
 
-#: src/SharedFilesCtrl.cpp:164
-msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
-msgstr "複製 eD2k 連結到剪貼簿 (來源，加密) (&W)"
+#: src/amuleDlg.cpp:499
+msgid "Snapshot:"
+msgstr "快照："
 
-#: src/SharedFilesCtrl.cpp:165
-msgid "Copy eD2k link to clipboard (&Hostname)"
-msgstr "複製 eD2k 連結到剪貼簿 (主機名稱) (&H)"
+#: src/amuleDlg.cpp:501
+msgid ""
+"'All-Platform' p2p client based on eMule \n"
+"\n"
+msgstr ""
+"源自 eMule 的「跨平台」P2P 客戶端程式\n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:166
-msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
-msgstr "複製 eD2k 連結到剪貼簿 (主機名稱，加密) (&C)"
+#: src/amuleDlg.cpp:502
+msgid "Website: http://www.amule.org \n"
+msgstr "網站：http://www.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:167
-msgid "Copy eD2k link to clipboard (&AICH info)"
-msgstr "複製 eD2k 連結到剪貼簿 (AICH 資訊) (&A)"
+#: src/amuleDlg.cpp:503
+msgid "Forum: http://forum.amule.org \n"
+msgstr "論壇：http://forum.amule.org \n"
 
-#: src/SharedFilesCtrl.cpp:168 src/DownloadListCtrl.cpp:940
-msgid "Copy feedback to clipboard"
-msgstr "複製傳輸狀況到剪貼簿"
-
-#: src/SharedFilesCtrl.cpp:190 src/DownloadListCtrl.cpp:731
-#, c-format
+#: src/amuleDlg.cpp:504
 msgid ""
-"Feedback from: %s (%s)\n"
+"FAQ: http://wiki.amule.org \n"
 "\n"
 msgstr ""
-"%s (%s) 回覆訊息\n"
+"FAQ：http://wiki.amule.org \n"
 "\n"
 
-#: src/SharedFilesCtrl.cpp:306
-msgid "You need a HighID to create a valid sourcelink"
-msgstr "您需要一個 HighID 才能建立有效來源連結"
+#: src/amuleDlg.cpp:505
+msgid "Contact: admin@amule.org (administrative issues) \n"
+msgstr "聯絡：admin@amule.org (行政管理) \n"
 
-#: src/SharedFilesCtrl.cpp:306 src/PrefsUnifiedDlg.cpp:669 src/KadDlg.cpp:167
-#: src/KadDlg.cpp:173 src/amule.cpp:657
-msgid "WARNING"
-msgstr "警告"
+#: src/amuleDlg.cpp:506
+msgid ""
+"Copyright (c) 2003-2011 aMule Team \n"
+"\n"
+msgstr ""
+"Copyright (c) 2003-2011 aMule 團隊\n"
+"\n"
 
-#: src/SharedFilesCtrl.cpp:451
-#, c-format
-msgid "Shared Files (%i)"
-msgstr "分享檔案 (%i)"
+#: src/amuleDlg.cpp:507
+msgid "Part of aMule is based on \n"
+msgstr "部份 aMule 源自 \n"
 
-#: src/SharedFilesCtrl.cpp:609
-msgid "[PartFile]"
-msgstr "[--暫存檔--]"
+#: src/amuleDlg.cpp:508
+msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
+msgstr " KAD：基於 XOR 演算法的 P2P 路由。\n"
 
-#: src/SharedFilesCtrl.cpp:710 src/DownloadListCtrl.cpp:1075
-msgid "Enter new name for this file:"
-msgstr "請輸入新檔案名："
+#: src/amuleDlg.cpp:509
+msgid " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+msgstr " Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n"
+
+#: src/amuleDlg.cpp:510
+msgid "http://kademlia.scs.cs.nyu.edu\n"
+msgstr "http://kademlia.scs.cs.nyu.edu\n"
+
+#: src/amuleDlg.cpp:513 src/KadDlg.cpp:192 src/PartFile.cpp:920
+#: src/PartFile.cpp:928 src/PrefsUnifiedDlg.cpp:624
+#: src/PrefsUnifiedDlg.cpp:729 src/PrefsUnifiedDlg.cpp:842
+msgid "Message"
+msgstr "訊息"
 
-#: src/SharedFilesCtrl.cpp:711 src/DownloadListCtrl.cpp:1076
-msgid "File rename"
-msgstr "更改檔名"
+#: src/amuleDlg.cpp:550
+msgid "aMule dialog destroyed"
+msgstr "aMule 對話方塊已銷毀"
 
-#: src/UploadQueue.cpp:511
-#, c-format
-msgid "Resuming uploads of file: %s"
-msgstr "繼續上傳檔案：%s"
+#: src/amuleDlg.cpp:574 src/DataToText.cpp:61 src/IPFilter.cpp:543
+msgid "Connecting"
+msgstr "正在連線"
 
-#: src/UploadQueue.cpp:520
-#, c-format
-msgid "Suspending upload of file: %s"
-msgstr "暫停上傳檔案：%s"
+#: src/amuleDlg.cpp:705
+msgid "eD2k: Connecting"
+msgstr "eD2k：正在連線"
 
-#: src/TextClient.h:60
-msgid "aMule text client"
-msgstr "aMule 文字模式客戶端"
+#: src/amuleDlg.cpp:709
+msgid "eD2k: Disconnected"
+msgstr "eD2k：已中斷連線"
 
-#: src/kademlia/kademlia/SearchManager.cpp:129
-msgid "Kademlia: search keyword too short"
-msgstr "Kad：關鍵字太短"
+#: src/amuleDlg.cpp:715
+msgid "Kad: Firewalled"
+msgstr "Kad：防火牆內"
 
-#: src/kademlia/routing/RoutingZone.cpp:208
-#: src/kademlia/routing/RoutingZone.cpp:278
-#, c-format
-msgid "Read %u Kad contact"
-msgid_plural "Read %u Kad contacts"
-msgstr[0] "讀取 %u 個 Kad 聯絡人"
-msgstr[1] "讀取 %u 個 Kad 聯絡人"
+#: src/amuleDlg.cpp:719
+msgid "Kad: Connected"
+msgstr "Kad：已連線"
 
-#: src/kademlia/routing/RoutingZone.cpp:297
-#, c-format
-msgid "Only %d Kad contact available, nodes.dat not written"
-msgid_plural "Only %d Kad contacts available, nodes.dat not written"
-msgstr[0] "只有 %d 個 Kad 聯絡人，nods.dat 未寫入"
-msgstr[1] "只有 %d 個 Kad 聯絡人，nods.dat 未寫入"
+#: src/amuleDlg.cpp:724
+msgid "Kad: Connecting"
+msgstr "Kad：正在連線"
 
-#: src/kademlia/routing/RoutingZone.cpp:326
-#, c-format
-msgid "Wrote %d Kad contact"
-msgid_plural "Wrote %d Kad contacts"
-msgstr[0] "已寫入 %d 個 Kad 聯絡人"
-msgstr[1] "已寫入 %d 個 Kad 聯絡人"
+#: src/amuleDlg.cpp:728
+msgid "Kad: Off"
+msgstr "Kad：關閉"
 
-#: src/ListenSocket.cpp:68
-msgid "ERROR: Could not listen to TCP port."
-msgstr "錯誤：無法監聽 TCP 埠。"
+#: src/amuleDlg.cpp:774 src/DownloadListCtrl.cpp:415
+#: src/DownloadListCtrl.cpp:652 src/FriendListCtrl.cpp:174
+#: src/muuli_wdr.cpp:803 src/muuli_wdr.cpp:863 src/muuli_wdr.cpp:937
+#: src/muuli_wdr.cpp:1003 src/muuli_wdr.cpp:2329 src/muuli_wdr.cpp:2431
+#: src/muuli_wdr.cpp:3147 src/ServerListCtrl.cpp:153
+#: src/ServerListCtrl.cpp:527 src/ServerListCtrl.cpp:546
+#: src/TransferWnd.cpp:375 src/utils/wxCas/src/wxcasprefs.cpp:294
+msgid "Cancel"
+msgstr "取消"
 
-#: src/webserver/src/WebServer.cpp:301
-msgid "web client connection accepted\n"
-msgstr "已接受網頁客戶端連線\n"
+#: src/amuleDlg.cpp:775
+msgid "Stop the current connection attempts"
+msgstr "停止連線作業"
 
-#: src/webserver/src/WebServer.cpp:304
-msgid "ERROR: can not accept web client connection\n"
-msgstr "錯誤：無法接受網頁客戶端連線\n"
+#: src/amuleDlg.cpp:780 src/MuleTrayIcon.cpp:496 src/muuli_wdr.cpp:2572
+msgid "Disconnect"
+msgstr "中斷連線"
 
-#: src/webserver/src/WebServer.cpp:374
-#, c-format
-msgid "Request failed with the following error: %s."
-msgstr "要求失敗，錯誤爲：%s 。"
+#: src/amuleDlg.cpp:781
+msgid "Disconnect from the currently connected networks"
+msgstr "中斷已連線的網路"
 
-#: src/webserver/src/WebServer.cpp:377 src/TextClient.cpp:627
-msgid "Request failed with an unknown error."
-msgstr "要求失敗，不明的錯誤。"
+#: src/amuleDlg.cpp:786 src/MuleTrayIcon.cpp:499 src/muuli_wdr.cpp:2755
+#: src/muuli_wdr.cpp:3143 src/muuli_wdr.cpp:3527
+msgid "Connect"
+msgstr "連線"
 
-#: src/webserver/src/WebServer.cpp:1738
-msgid "Index file not found: "
-msgstr "找不到索引檔："
+#: src/amuleDlg.cpp:787
+msgid "Connect to the currently enabled networks"
+msgstr "連線到目前已啟用的網路"
 
-#: src/webserver/src/WebServer.cpp:1815
-msgid "Session expired - requesting login\n"
-msgstr "作業階段過期 - 正在要求登入\n"
+#: src/amuleDlg.cpp:846
+#, c-format
+msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
+msgstr "上傳：%.1f (%.1f) | 下載：%.1f (%.1f)"
 
-#: src/webserver/src/WebServer.cpp:1820
-msgid "Session ok, logged in\n"
-msgstr "作業階段正常，已登入\n"
+#: src/amuleDlg.cpp:848
+#, c-format
+msgid "Up: %.1f | Down: %.1f"
+msgstr "上傳：%.1f | 下載：%.1f"
 
-#: src/webserver/src/WebServer.cpp:1822
-msgid "Session ok, not logged in\n"
-msgstr "作業階段正常，未登入\n"
+#: src/amuleDlg.cpp:874
+#, c-format
+msgid "aMule (%s | Connected)"
+msgstr "aMule (%s | 已連線)"
 
-#: src/webserver/src/WebServer.cpp:1827
-msgid "No session opened - will request login\n"
-msgstr "未開啟作業階段 - 將要求登入\n"
+#: src/amuleDlg.cpp:876
+#, c-format
+msgid "aMule (%s | Disconnected)"
+msgstr "aMule (%s | 已中斷連線)"
 
-#: src/webserver/src/WebServer.cpp:1836
-msgid "Session created - requesting login\n"
-msgstr "作業階段已建立 - 正在要求登入\n"
+#: src/amuleDlg.cpp:913
+#, c-format
+msgid "Do you really want to exit %s?"
+msgstr "您確定要離開 %s 嗎？"
 
-#: src/webserver/src/WebServer.cpp:1853
-msgid "Processing request [original]: "
-msgstr "正在處理要求 [原始]："
+#: src/amuleDlg.cpp:914
+msgid "Exit confirmation"
+msgstr "確認離開"
 
-#: src/webserver/src/WebServer.cpp:1869
-msgid "Checking password\n"
-msgstr "正在檢查密碼\n"
+#: src/amuleDlg.cpp:1173
+msgid "Launch Command: "
+msgstr "執行指令："
+
+#: src/amuleDlg.cpp:1209 src/muuli_wdr.cpp:2092 src/Preferences.cpp:842
+msgid "- default -"
+msgstr "- 預設 -"
 
-#: src/webserver/src/WebServer.cpp:1874
-msgid "Password hash invalid\n"
-msgstr "密碼雜湊值無效\n"
+#: src/amuleDlg.cpp:1232
+#, c-format
+msgid "Skin directory '%s' does not exist"
+msgstr "面板目錄 %s 不存在"
 
-#: src/webserver/src/WebServer.cpp:1889
-msgid "Password ok\n"
-msgstr "密碼正確\n"
+#: src/amuleDlg.cpp:1237
+#, c-format
+msgid "WARNING: Unable to open skin file '%s' for read"
+msgstr "警告：無法開啟面板檔案 %s 供讀取"
 
-#: src/webserver/src/WebServer.cpp:1891
-msgid "Password bad\n"
-msgstr "密碼錯誤\n"
+#: src/amuleDlg.cpp:1335 src/amuleDlg.cpp:1469 src/muuli_wdr.cpp:1673
+#: src/muuli_wdr.cpp:3529
+msgid "Networks"
+msgstr "網路"
 
-#: src/webserver/src/WebServer.cpp:1894
-msgid "You did not enter any password. Blank password is not allowed.\n"
-msgstr "您沒有輸入密碼，密碼不允許空白。\n"
+#: src/amuleDlg.cpp:1335 src/muuli_wdr.cpp:3529
+msgid "Networks Window"
+msgstr "網路 視窗"
 
-#: src/webserver/src/WebServer.cpp:1902
-msgid "Logout requested\n"
-msgstr "已要求登出\n"
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches"
+msgstr "搜尋"
 
-#: src/webserver/src/WebServer.cpp:1907
-msgid "Processing request [redirected]: "
-msgstr "正在處理要求 [已重定向]："
+#: src/amuleDlg.cpp:1336 src/muuli_wdr.cpp:3530
+msgid "Searches Window"
+msgstr "搜尋 視窗"
 
-#: src/webserver/src/WebInterface.cpp:483
-msgid "Loads template <str>"
-msgstr "載入模板 <str>"
+#: src/amuleDlg.cpp:1337 src/DownloadListCtrl.cpp:643 src/muuli_wdr.cpp:426
+#: src/muuli_wdr.cpp:1788 src/muuli_wdr.cpp:3531 src/Statistics.cpp:752
+msgid "Downloads"
+msgstr "下載"
 
-#: src/webserver/src/WebInterface.cpp:487
-msgid "Web server HTTP port"
-msgstr "網站伺服器 HTTP 埠"
+#: src/amuleDlg.cpp:1337 src/muuli_wdr.cpp:3531
+msgid "Downloads Window"
+msgstr "下載 視窗"
 
-#: src/webserver/src/WebInterface.cpp:491
-msgid "Use UPnP port forwarding on web server port"
-msgstr "網站伺服器通訊埠使用 UPnP 通訊埠轉向"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3409
+msgid "Shared files"
+msgstr "檔案分享"
 
-#: src/webserver/src/WebInterface.cpp:495
-msgid "UPnP port"
-msgstr "UPnP 埠"
+#: src/amuleDlg.cpp:1338 src/muuli_wdr.cpp:3533
+msgid "Shared Files Window"
+msgstr "檔案分享 視窗"
 
-#: src/webserver/src/WebInterface.cpp:499
-msgid "Use gzip compression"
-msgstr "使用 gzip 壓縮"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:2971 src/muuli_wdr.cpp:3482
+#: src/muuli_wdr.cpp:3534
+msgid "Messages"
+msgstr "訊息"
 
-#: src/webserver/src/WebInterface.cpp:507
-msgid "Full access password for web server"
-msgstr "網站伺服器的 完整存取密碼"
+#: src/amuleDlg.cpp:1339 src/muuli_wdr.cpp:3534
+msgid "Messages Window"
+msgstr "訊息 視窗"
 
-#: src/webserver/src/WebInterface.cpp:511
-msgid "Guest password for web server"
-msgstr "網站伺服器的 訪客密碼"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535 src/PrefsUnifiedDlg.cpp:183
+#: src/Statistics.cpp:722 src/Statistics.cpp:1020
+msgid "Statistics"
+msgstr "統計"
 
-#: src/webserver/src/WebInterface.cpp:515
-msgid "Allow guest access"
-msgstr "允許訪客連線"
+#: src/amuleDlg.cpp:1340 src/muuli_wdr.cpp:3535
+msgid "Statistics Graph Window"
+msgstr "統計 視窗"
 
-#: src/webserver/src/WebInterface.cpp:519
-msgid "Deny guest access"
-msgstr "拒絕訪客連線"
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537 src/PrefsUnifiedDlg.cpp:198
+#: src/utils/wxCas/src/wxcasprefs.cpp:50
+msgid "Preferences"
+msgstr "偏好設定"
 
-#: src/webserver/src/WebInterface.cpp:523
-msgid "Load/save web server settings from/to remote aMule"
-msgstr "載入/儲存 遠端 aMule 的網站伺服器設定 "
+#: src/amuleDlg.cpp:1342 src/muuli_wdr.cpp:3537
+msgid "Preferences Settings Window"
+msgstr "偏好設定 視窗"
 
-#: src/webserver/src/WebInterface.cpp:527
-msgid "aMule config file path. DO NOT USE DIRECTLY!"
-msgstr "aMule 設定檔路徑。請勿直接使用！"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "Import"
+msgstr "匯入"
 
-#: src/webserver/src/WebInterface.cpp:535
-msgid "Disable PHP interpreter (deprecated)"
-msgstr "停用 PHP 解譯器（不建議）"
+#: src/amuleDlg.cpp:1344 src/muuli_wdr.cpp:3538
+msgid "The partfile importer tool"
+msgstr "暫存檔匯入工具"
 
-#: src/webserver/src/WebInterface.cpp:543
-msgid "Recompile PHP pages on each request"
-msgstr "爲每個要求重編譯 PHP 頁面"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+#: src/utils/aLinkCreator/src/alcframe.cpp:274
+msgid "About"
+msgstr "關於"
 
-#: src/webserver/src/WebInterface.cpp:638
-msgid "aMule Web Server"
-msgstr "aMule 網站伺服器"
+#: src/amuleDlg.cpp:1346 src/muuli_wdr.cpp:3539
+msgid "About/Help"
+msgstr "關於/幫助"
 
-#: src/StatTree.cpp:555 src/StatTree.cpp:570
-msgid "Not available"
-msgstr "不可用"
+#: src/amuleDlg.cpp:1480
+msgid "eD2k network"
+msgstr "eD2k 網路"
 
-#: src/StatTree.cpp:606 src/StatTree.cpp:620
-msgid "Never"
-msgstr "無"
+#: src/amuleDlg.cpp:1484
+msgid "Kad network"
+msgstr "kad 網路"
 
-#: src/HTTPDownload.cpp:55
-msgid "Downloading..."
-msgstr "正在下載..."
+#: src/amuleDlg.cpp:1489
+msgid "No network"
+msgstr "無網路"
 
-#: src/HTTPDownload.cpp:75
-#, c-format
-msgid "( %s / %s )"
-msgstr "( %s / %s )"
+#: src/amule-gui.cpp:210
+msgid "aMule remote control"
+msgstr "aMulle 遠端控制"
 
-#: src/HTTPDownload.cpp:239
-#, c-format
-msgid "Expected %d bytes, but downloaded %d bytes"
-msgstr "原預計 %d B，但實際下載了 %d B"
+#: src/amule-gui.cpp:212 src/utils/wxCas/src/wxcasframe.cpp:116
+msgid "aMule"
+msgstr "aMule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:50 src/amuleDlg.cpp:1312
-#: src/PrefsUnifiedDlg.cpp:190 src/muuli_wdr.cpp:3678
-msgid "Preferences"
-msgstr "偏好設定"
+#: src/amule-gui.cpp:294
+msgid "Fatal Error: Failed to create Core Timer"
+msgstr "嚴重錯誤：無法建立主程式端計時器"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:60
-msgid "Directory containing amulesig.dat file"
-msgstr "amulesig.dat 檔案所在的目錄"
+#: src/amule-remote-gui.cpp:71
+msgid "Connect to remote amule"
+msgstr "連線到遠端 amule"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:65
-#: src/utils/wxCas/src/wxcasprefs.cpp:142
-#: src/utils/aLinkCreator/src/alcframe.cpp:141 src/muuli_wdr.cpp:1700
-#: src/muuli_wdr.cpp:1720 src/muuli_wdr.cpp:2103 src/muuli_wdr.cpp:2114
-#: src/muuli_wdr.cpp:3248
-msgid "Browse"
-msgstr "瀏覽"
+#: src/amule-remote-gui.cpp:253
+msgid "Fatal Error: Failed to create Poll Timer"
+msgstr "嚴重錯誤：無法建立 Poll Timer"
+
+#: src/amule-remote-gui.cpp:268
+msgid "Going to event loop..."
+msgstr "正在進行事件迴圈..."
+
+#: src/amule-remote-gui.cpp:294
+msgid "Connecting..."
+msgstr "正在連線..."
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:80
-msgid "Enter here the directory where your amulesig.dat file is"
-msgstr "請輸入 amulesig.dat 所在的目錄"
+#: src/amule-remote-gui.cpp:298
+msgid "Connection failed "
+msgstr "無法連線"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:99
-msgid "Refresh rate interval in seconds"
-msgstr "更新顯示間隔 (秒)"
+#: src/amule-remote-gui.cpp:309
+msgid "Remote GUI EC event handler"
+msgstr "遠端 GUI 外部連線事件處理器"
+
+#: src/amule-remote-gui.cpp:316
+msgid "Going down"
+msgstr "關閉中"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:115
-msgid "Generate a stat image at every refresh event"
-msgstr "每次更新顯示時都產生統計圖"
+#: src/amule-remote-gui.cpp:319 src/ExternalConnector.cpp:400
+#, c-format
+msgid "Connection Failed. Unable to connect to %s:%d\n"
+msgstr "無法連線到 %s:%d\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:139
-msgid "Enter here the directory where you want to generate the statistic image"
-msgstr "輸入存放製成的統計圖的目錄"
+#: src/amule-remote-gui.cpp:322
+msgid "Connection closed - aMule has terminated probably."
+msgstr "已關閉連線 - aMule 可能已經被終止執行了。"
+
+#: src/amule-remote-gui.cpp:407
+msgid "Ready"
+msgstr "就緒"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:166
-msgid "Upload periodicaly your stat image to FTP server"
-msgstr "定期上傳統計圖到 FTP 伺服器"
+#: src/amule-remote-gui.cpp:585 src/TransferWnd.cpp:340
+msgid "All"
+msgstr "全部"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:174
-msgid "FTP Url"
-msgstr "FTP 網址"
+#: src/amule-remote-gui.cpp:631
+#, c-format
+msgid "Can't create directory '%s' for category '%s', keeping directory '%s'."
+msgstr "無法建立 %s 目錄 ( %s 分類用)，繼續使用 %s 目錄。"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:178
-msgid "FTP Path"
-msgstr "FTP 路徑"
+#: src/amule-remote-gui.cpp:1343 src/BaseClient.cpp:1785
+#: src/BaseClient.cpp:2311 src/BaseClient.cpp:2327 src/BaseClient.cpp:2622
+#: src/ClientDetailDialog.cpp:80 src/ClientDetailDialog.cpp:81
+#: src/ClientDetailDialog.cpp:114 src/ClientDetailDialog.cpp:115
+#: src/ClientDetailDialog.cpp:125 src/DataToText.cpp:54 src/DataToText.cpp:70
+#: src/DataToText.cpp:80 src/DataToText.cpp:116 src/DataToText.cpp:137
+#: src/DownloadListCtrl.cpp:1076 src/DownloadListCtrl.cpp:1089
+#: src/DownloadListCtrl.cpp:1100 src/ExternalConn.cpp:431
+#: src/FileDetailDialog.cpp:129 src/GenericClientListCtrl.cpp:1050
+#: src/GenericClientListCtrl.cpp:1061 src/GenericClientListCtrl.cpp:1071
+#: src/HTTPDownload.cpp:83 src/KnownFile.cpp:916 src/KnownFile.cpp:922
+#: src/MuleTrayIcon.cpp:365 src/PartFile.cpp:2521 src/PartFile.cpp:2527
+#: src/Server.cpp:133 src/Server.cpp:208 src/Statistics.cpp:967
+msgid "Unknown"
+msgstr "不明"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:188
-msgid "Enter here the URL of your FTP server"
-msgstr "輸入 FTP 伺服器的網址"
+#: src/BaseClient.cpp:1378
+#, c-format
+msgid "Failed to retrieve shared files from user '%s'"
+msgstr "無法從使用者 %s 取得分享檔案清單"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:200
-msgid "Enter here the directory where putting your stat image on FTP server"
-msgstr "輸入 FTP 伺服器上存放統計圖的目錄"
+#: src/BaseClient.cpp:1590
+msgid "Searching buddy for lowid connection"
+msgstr "搜尋 LowID 連線好友"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:206
-msgid "User"
-msgstr "使用者"
+#: src/BaseClient.cpp:1802
+#, c-format
+msgid " (Fake eMule version %#x)"
+msgstr " (假 eMule 版本 %#x)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:210 src/muuli_wdr.cpp:2515
-#: src/muuli_wdr.cpp:3450
-msgid "Password"
-msgstr "密碼"
+#: src/BaseClient.cpp:1813
+msgid " (Fake eMule)"
+msgstr " (假 eMule)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:221
-msgid "Enter here the User name to log into your FTP server"
-msgstr "輸入登入 FTP 伺服器的使用者名稱"
+#: src/BaseClient.cpp:1815
+msgid "xMule (Fake eMule)"
+msgstr "xMule (假 eMule)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:233
-msgid "Enter here the User password to log into your FTP server"
-msgstr "輸入登入 FTP 伺服器的密碼"
+#: src/BaseClient.cpp:1854
+#, c-format
+msgid "1.x (based on eMule v0.%u)"
+msgstr "1.x (源自 eMule v0.%u)"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:252
-msgid "FTP update rate interval in minutes"
-msgstr "FTP 上傳間隔 (分鐘)"
+#: src/BaseClient.cpp:2027
+#, c-format
+msgid "NickName: %s ID: %u"
+msgstr "暱稱：%s ID：%u"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:296
-msgid "Validate"
-msgstr "檢測"
+#: src/BaseClient.cpp:2029
+#, c-format
+msgid "Requested: %s\n"
+msgstr "已要求：%s\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:330
-msgid "Folder containing your signature file"
-msgstr "簽名識別檔所在資料夾"
+#: src/BaseClient.cpp:2031
+#, c-format
+msgid "Filestats for this session: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for this session: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] "本次：共接受 %d/%d 個要求，已傳送 %s\n"
 
-#: src/utils/wxCas/src/wxcasprefs.cpp:344
-msgid "Folder where generating the statistic image"
-msgstr "統計圖存放資料夾"
+#: src/BaseClient.cpp:2034
+#, c-format
+msgid "Filestats for all sessions: Accepted %d of %d request, %s transferred\n"
+msgid_plural ""
+"Filestats for all sessions: Accepted %d of %d requests, %s transferred\n"
+msgstr[0] "總計：共接受 %d/%d 個要求，已傳送 %s\n"
 
-#: src/utils/wxCas/src/linuxmon.cpp:86
+#: src/BaseClient.cpp:2037
+msgid "Requested unknown file"
+msgstr "已要求不明檔案"
+
+#: src/BaseClient.cpp:2700
 #, c-format
-msgid "%i day(s) %i hour(s) %i min %i s"
-msgstr "%i 天 %i 小時 %i 分鐘 %i 秒"
+msgid "Message filtered from '%s' (IP:%s)"
+msgstr "來自 %s (IP：%s) 的訊息被過濾掉了"
 
-#: src/utils/wxCas/src/wxcas.cpp:85
-msgid "wxCas, aMule Online Statistics"
-msgstr "wxCas, aMule 線上統計"
+#: src/BaseClient.cpp:2807
+#, c-format
+msgid "New message from '%s' (IP:%s)"
+msgstr "來自 %s (IP:%s) 的新訊息"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:96
-#: src/utils/aLinkCreator/src/alcframe.cpp:84
-msgid "Welcome!"
-msgstr "歡迎！"
+#: src/BaseClient.cpp:2899
+#, c-format
+msgid ""
+"User %s (%u) requested sharedfiles-list for not existing directory '%s' -> "
+"Ignored"
+msgstr "使用者 %s (%u) 要求不存在的目錄 %s 的分享檔案清單 -> 已忽略"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:116
-msgid "aMule"
-msgstr "aMule"
+#: src/CanceledFileList.cpp:54 src/KnownFileList.cpp:85
+#, c-format
+msgid "WARNING: %s cannot be opened."
+msgstr "警告：無法開啟 %s 。"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:120
-msgid "Maximum DL rate since wxCas is running"
-msgstr "本次 wxCas 執行後最大下載速度"
+#: src/CanceledFileList.cpp:61
+msgid "WARNING: Canceled file list corrupted, contains invalid header."
+msgstr "警告：已取消檔案清單損壞，內有無效標頭。"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:124
-msgid "Absolute Maximum DL rate during wxCas previous runs"
-msgstr "過去執行 wxCas 時最大下載速度"
+#: src/CanceledFileList.cpp:81 src/KnownFileList.cpp:116
+#, c-format
+msgid "IO error while reading %s file: %s"
+msgstr "讀取 %s 時發生 IO 錯誤：%s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:138
-#: src/utils/wxCas/src/wxcasframe.cpp:142 src/muuli_wdr.cpp:2748
-#: src/muuli_wdr.cpp:2783
-msgid "Reset"
-msgstr "清除"
+#: src/CanceledFileList.cpp:104 src/KnownFileList.cpp:164
+#, c-format
+msgid "Error while saving %s file: %s"
+msgstr "儲存 %s 時發生錯誤：%s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:147
-msgid "System"
-msgstr "系統"
+#: src/CaptchaDialog.cpp:44
+msgid "Enter Captcha"
+msgstr "輸入圖形驗證碼"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:211
-#: src/utils/wxCas/src/wxcasframe.cpp:340
-msgid "Stop Auto Refresh"
-msgstr "停止更新顯示"
+#: src/CatDialog.cpp:60 src/DownloadListCtrl.cpp:693 src/muuli_wdr.cpp:244
+#: src/SearchListCtrl.cpp:627 src/TransferWnd.cpp:335
+msgid "Category"
+msgstr "分類"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:216
-msgid "Save Online Statistics image"
-msgstr "儲存線上統計圖表"
+#: src/CatDialog.cpp:87
+msgid "New Category"
+msgstr "新分類"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:219
-msgid "Print Online Statistics image"
-msgstr "列印線上統計圖表"
+#: src/CatDialog.cpp:125
+msgid "Choose a folder for incoming files"
+msgstr "請選擇新進檔案資料夾"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:222
-msgid "Preferences setting"
-msgstr "偏好設定"
+#: src/CatDialog.cpp:140
+msgid "You must specify a name for the category!"
+msgstr "請輸入此分類的名稱！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:227
-#: src/utils/wxCas/src/wxcasframe.cpp:418
-msgid "About wxCas"
-msgstr "關於 wxCas"
+#: src/CatDialog.cpp:150
+msgid "You must specify a path for the category!"
+msgstr "請輸入此分類的路徑！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:331
-msgid "Start Auto Refresh"
-msgstr "開始自動更新顯示"
+#: src/CatDialog.cpp:162
+msgid ""
+"Failed to create incoming dir for category. Please specify a valid path!"
+msgstr "無法建立該分類的目錄。請輸入有效的路徑！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:333
-msgid "Auto Refresh stopped"
-msgstr "自動更新顯示已停止"
+#: src/ChatSelector.cpp:129
+#, c-format
+msgid "Chat-Session Started: %s (%s:%u) - %s %s"
+msgstr "已開始交談：%s (%s:%u) - %s %s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:342
-msgid "Auto Refresh started"
-msgstr "已開始自動更新顯示"
+#: src/ChatSelector.cpp:208 src/ChatSelector.cpp:288
+msgid "*** Connected to Client ***"
+msgstr "*** 已連線到客戶端 ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:353
-msgid "Save Statistics Image"
-msgstr "儲存統計圖表"
+#: src/ChatSelector.cpp:251
+msgid "*** Connecting to Client ***"
+msgstr "*** 正在連線到客戶端 ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:391
-msgid "aMule Online Statistics"
-msgstr "aMule 線上統計"
+#: src/ChatSelector.cpp:282
+msgid "*** Failed to Connect to client / Connection lost ***"
+msgstr "*** 無法連線到客戶端 / 連線中斷 ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:395
+#: src/ChatSelector.cpp:335
 msgid ""
-"There was a problem printing.\n"
-"Perhaps your current printer is not set correctly?"
-msgstr ""
-"列印時發生問題。\n"
-"可能是您的印表機沒有設定正確？"
+"*** You have passed the captcha check and the user has received your "
+"message. ***"
+msgstr "*** 您已通過圖形驗證，使用者已收到您的訊息。 ***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:396
-msgid "Printing"
-msgstr "正在列印"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:414
+#: src/ChatSelector.cpp:336
 msgid ""
-"wxCas, aMule OnLine Signature Statistics\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"Distributed under GPL"
+"*** Your response to the captcha was wrong and your message has been "
+"ignored. You can request a new captcha by sending a new message. ***"
 msgstr ""
-"wxCas, aMule 線上簽名識別統計\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"源自 CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
-"\n"
-"依據 GPL 授權散佈"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:585
-msgid "Oh Oh, aMule is not running..."
-msgstr "aMule 未執行..."
+"*** 您輸入的驗證碼不正確，訊息將被忽略。要重傳送訊息，請重新輸入圖形驗證碼。 "
+"***"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:661
-#: src/utils/wxCas/src/wxcasframe.cpp:731
-#: src/utils/wxCas/src/wxcasframe.cpp:800
-msgid "aMule is running"
-msgstr "aMule 正在執行"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:870
-msgid "aMule is running, but disconnected"
-msgstr "aMule 正在執行，但是已中斷連線"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:941
-msgid "aMule is connecting..."
-msgstr "aMule 正在連線..."
-
-#: src/utils/wxCas/src/wxcasframe.cpp:945
-msgid "Oh Oh, aMule status is unknown..."
-msgstr "aMule 狀態不明..."
+#: src/ChatWnd.cpp:99
+msgid "Chat"
+msgstr "交談"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1016
-#: src/utils/wxCas/src/wxcasframe.cpp:1021
-#: src/utils/wxCas/src/wxcasframe.cpp:1025
-#: src/utils/wxCas/src/wxcasframe.cpp:1029
-#: src/utils/wxCas/src/wxcasframe.cpp:1033
-msgid "aMule "
-msgstr "aMule "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1018
-msgid " has been running for "
-msgstr " 已執行"
+#: src/ChatWnd.cpp:101 src/MuleNotebook.cpp:168
+msgid "Close tab"
+msgstr "關閉分頁"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1023
-msgid " is stopped !"
-msgstr " 已停止！"
+#: src/ChatWnd.cpp:102 src/MuleNotebook.cpp:169
+msgid "Close all tabs"
+msgstr "關閉所有分頁"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1027
-#: src/utils/wxCas/src/wxcasframe.cpp:1051
-msgid " is not connected !"
-msgstr "未連線！"
+#: src/ChatWnd.cpp:103 src/MuleNotebook.cpp:170
+msgid "Close other tabs"
+msgstr "關閉其它分頁"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1031
-msgid " is connecting..."
-msgstr " 正在連線..."
+#: src/ChatWnd.cpp:107 src/GenericClientListCtrl.cpp:587
+msgid "Add to Friends"
+msgstr "加入好友"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1035
-msgid " is doing something strange, check it !"
-msgstr " 狀態不正常，請檢查！"
+#: src/ClientCreditsList.cpp:158
+#, c-format
+msgid "Creditfile loaded, %u client is known"
+msgid_plural "Creditfile loaded, %u clients are known"
+msgstr[0] "積分檔已載入，有 %u 個已知客戶端"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1056
-msgid " is connected to "
-msgstr " 已連線到"
+#: src/ClientCreditsList.cpp:161
+#, c-format
+msgid " - Credits expired for %u client!"
+msgid_plural " - Credits expired for %u clients!"
+msgstr[0] " - %u 個客戶端的積分已過期！"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1057
-#: src/utils/wxCas/src/wxcasframe.cpp:1079
-msgid " Kad: "
-msgstr " Kad："
+#: src/ClientCreditsList.cpp:305
+msgid "No 'cryptkey.dat' file found, creating."
+msgstr "找不到 crytkey.dat，正在建立新的。"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1059
-#: src/utils/wxCas/src/wxcasframe.cpp:1081 src/TextClient.cpp:710
-msgid "ok"
-msgstr "ok"
+#: src/ClientDetailDialog.cpp:49
+msgid "Client Details"
+msgstr "客戶端詳細資訊"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1061
-#: src/utils/wxCas/src/wxcasframe.cpp:1083 src/TextClient.cpp:708
-msgid "firewalled"
-msgstr "防火牆內"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:169 src/ServerWnd.cpp:179
+#: src/utils/wxCas/src/onlinesig.cpp:269
+msgid "LowID"
+msgstr "LowID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1063
-#: src/utils/wxCas/src/wxcasframe.cpp:1085
-msgid "off"
-msgstr "關閉"
+#: src/ClientDetailDialog.cpp:100 src/ServerWnd.cpp:182
+#: src/utils/wxCas/src/onlinesig.cpp:267
+msgid "HighID"
+msgstr "HighID"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1069
-msgid " is on "
-msgstr " 是在 "
+#: src/ClientDetailDialog.cpp:121
+msgid "Enabled"
+msgstr "已啟用"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1076
-msgid " with "
-msgstr " 和 "
+#: src/ClientDetailDialog.cpp:122
+msgid "Supported"
+msgstr "已支援"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1094
-msgid "Total Download: "
-msgstr "總下載："
+#: src/ClientDetailDialog.cpp:123 src/ClientRef.cpp:192
+msgid "Not supported"
+msgstr "不支援"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1096
-#: src/utils/wxCas/src/wxcasframe.cpp:1107
-msgid ", Upload: "
-msgstr "，上傳："
+#: src/ClientDetailDialog.cpp:124
+msgid "Disabled"
+msgstr "已停用"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1105
-msgid "Session Download: "
-msgstr "本次下載："
+#: src/ClientDetailDialog.cpp:131 src/ServerWnd.cpp:163 src/ServerWnd.cpp:210
+#: src/TextClient.cpp:717
+msgid "Connected"
+msgstr "已連線"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1116
-msgid "Download: "
-msgstr "下載："
+#: src/ClientDetailDialog.cpp:133 src/ServerWnd.cpp:210
+msgid "Disconnected"
+msgstr "已中斷連線"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1118
-msgid " kB/s, Upload: "
-msgstr " KB/s，上傳："
+#: src/ClientDetailDialog.cpp:155 src/ClientDetailDialog.cpp:159
+#: src/DownloadListCtrl.cpp:964 src/GenericClientListCtrl.cpp:879
+#: src/GenericClientListCtrl.cpp:886
+#, c-format
+msgid "%.1f kB/s"
+msgstr "%.1f KB/s"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1120
-msgid " kB/s"
-msgstr " KB/s"
+#: src/ClientRef.cpp:196
+msgid "Not complete"
+msgstr "未完成"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1128
-msgid "Sharing: "
-msgstr "分享："
+#: src/ClientRef.cpp:198
+msgid "Bad Guy"
+msgstr "壞蛋"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1130
-msgid " file(s), Clients on queue: "
-msgstr " 個檔案、等候區人數："
+#: src/ClientRef.cpp:200
+msgid "Verified - OK"
+msgstr "驗證通過"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1140
-msgid "Time: "
-msgstr "時間："
+#: src/ClientRef.cpp:203
+msgid "Not Available"
+msgstr "N/A"
 
-#: src/utils/wxCas/src/wxcasframe.cpp:1149
-#: src/utils/wxCas/src/wxcasframe.cpp:1159 src/FileDetailDialog.cpp:116
+#: src/ClientTCPSocket.cpp:844
 #, c-format
-msgid "%.2f kB/s"
-msgstr "%.2f KB/s"
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1150
-#: src/utils/wxCas/src/wxcasframe.cpp:1160
-msgid " on "
-msgstr " 在 "
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1170
-msgid "System Load Average (1-5-15 min): "
-msgstr "系統平均負載 (1-5-15 分鐘)："
-
-#: src/utils/wxCas/src/wxcasframe.cpp:1181
-msgid "System uptime: "
-msgstr "系統執行時間："
+msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
+msgstr "使用者 %s (%u) 要求您的分享檔案清單 -> 已接受"
 
-#: src/utils/wxCas/src/onlinesig.cpp:234
+#: src/ClientTCPSocket.cpp:865
 #, c-format
-msgid "%02uD %02uh %02umin %02us"
-msgstr "%02u天 %02u小時 %02u分鐘 %02u秒"
+msgid "User %s (%u) requested your sharedfiles-list -> Denied"
+msgstr "使用者 %s (%u) 要求您的分享檔案清單 -> 已拒絕"
 
-#: src/utils/wxCas/src/onlinesig.cpp:236
+#: src/ClientTCPSocket.cpp:897
 #, c-format
-msgid "%02uh %02umin %02us"
-msgstr "%02u小時 %02u分鐘 %02u秒"
+msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
+msgstr "使用者 %s (%u) 要求您的分享目錄清單 -> 接受"
 
-#: src/utils/wxCas/src/onlinesig.cpp:238
+#: src/ClientTCPSocket.cpp:903
 #, c-format
-msgid "%02umin %02us"
-msgstr "%02u分鐘 %02u秒"
+msgid "User %s (%u) requested your shareddirectories-list -> Denied"
+msgstr "使用者 %s (%u) 要求您的分享目錄清單 -> 拒絕"
 
-#: src/utils/wxCas/src/onlinesig.cpp:240
+#: src/ClientTCPSocket.cpp:928
 #, c-format
-msgid "%02us"
-msgstr "%02u秒"
-
-#: src/utils/wxCas/src/onlinesig.cpp:267 src/ServerWnd.cpp:184
-#: src/ClientDetailDialog.cpp:104
-msgid "HighID"
-msgstr "HighID"
-
-#: src/utils/wxCas/src/onlinesig.cpp:269 src/ServerWnd.cpp:171
-#: src/ServerWnd.cpp:181 src/ClientListCtrl.cpp:883
-#: src/ClientDetailDialog.cpp:104
-msgid "LowID"
-msgstr "LowID"
-
-#: src/utils/wxCas/src/onlinesig.cpp:272 src/ServerWnd.cpp:189
-#: src/MuleTrayIcon.cpp:408
-msgid "Not Connected"
-msgstr "未連線"
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted"
+msgstr "使用者 %s (%u) 要求目錄 %s 的分享檔案清單 -> 已接受"
 
-#: src/utils/wxCas/src/onlinesig.cpp:339
+#: src/ClientTCPSocket.cpp:933
 #, c-format
-msgid "%.0f B"
-msgstr "%.0f B"
+msgid ""
+"User %s (%u) requested your sharedfiles-list for directory '%s' -> denied"
+msgstr "使用者 %s (%u) 要求目錄 %s 的分享檔案清單 -> 已拒絕"
 
-#: src/utils/wxCas/src/onlinesig.cpp:342
+#: src/ClientTCPSocket.cpp:952
 #, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+msgid "User %s (%u) shares directory '%s'"
+msgstr "使用者 %s (%u) 分享的目錄 %s"
 
-#: src/utils/wxCas/src/onlinesig.cpp:345
+#: src/ClientTCPSocket.cpp:967
 #, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+msgid "User %s (%u) sent unrequested shared dirs."
+msgstr "使用者 %s (%u) 傳送了未要求的分享目錄。"
 
-#: src/utils/wxCas/src/onlinesig.cpp:348
+#: src/ClientTCPSocket.cpp:982
 #, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
+msgid "User %s (%u) sent sharedfiles-list for directory '%s'"
+msgstr "使用者 %s (%u) 傳送了目錄 %s 內的分享檔案清單"
 
-#: src/utils/wxCas/src/onlinesig.cpp:351
+#: src/ClientTCPSocket.cpp:989
 #, c-format
-msgid "%.2f TB"
-msgstr "%.2f TB"
-
-#: src/utils/aLinkCreator/src/md4.cpp:359
-#: src/utils/aLinkCreator/src/alcframe.cpp:566
-#: src/utils/aLinkCreator/src/alcframe.cpp:567
-msgid "Cancelled !"
-msgstr "已取消！"
+msgid "User %s (%u) finished sending sharedfiles-list"
+msgstr "使用者 %s (%u) 已傳送分享檔案清單"
 
-#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#: src/ClientTCPSocket.cpp:994
 #, c-format
-msgid "Unable to open %s"
-msgstr "無法開啟 %s"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:104
-msgid "Input parameters"
-msgstr "輸入參數"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:115
-msgid "File to Hash"
-msgstr "須雜湊的檔案"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:119
-msgid "Add Optional URLs for this file"
-msgstr "加入附加網址到此檔案"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:127
-msgid "Enter here the file you want to compute the eD2k link"
-msgstr "輸入您想要求得 eD2k 連結的檔案"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:133
-msgid ""
-"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
-"aLinkCreator append the current file name"
-msgstr ""
-"輸入您想要加入 eD2k 連結的網址：請在最後加上 '/' 以利 aLinkCreator 程式幫您輸"
-"入檔名"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:144 src/muuli_wdr.cpp:1065
-#: src/muuli_wdr.cpp:2843
-msgid "Add"
-msgstr "加入"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:149
-msgid "Remove"
-msgstr "移除"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:151 src/MuleTextCtrl.cpp:82
-#: src/muuli_wdr.cpp:384 src/muuli_wdr.cpp:891
-msgid "Clear"
-msgstr "清除"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:160
-msgid "Create link with part-hashes"
-msgstr "以暫存檔雜湊值產生連結"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:166
-msgid ""
-"Help to spread new and rare files faster, at the cost of an increased link "
-"size"
-msgstr "協助新檔案和稀有檔案更快散播，只是會增加連結長度"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:192
-msgid "MD4 File Hash"
-msgstr "MD4 檔案雜湊值"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:204
-msgid "eD2k File Hash"
-msgstr "eD2k 檔案雜湊值"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:215
-msgid "eD2k link"
-msgstr "eD2k 連結"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:228 src/muuli_wdr.cpp:348
-msgid "Start"
-msgstr "開始"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:230
-msgid "Save"
-msgstr "儲存"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:232
-msgid "Copy to clipboard"
-msgstr "複製到剪貼簿"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:234 src/MuleTrayIcon.cpp:568
-msgid "Exit"
-msgstr "離開"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:259
-msgid "Open"
-msgstr "開啟"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:260
-msgid "Open a file to compute its eD2k link"
-msgstr "開啟要求得 eD2k 連結的檔案"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:262 src/MuleTextCtrl.cpp:80
-#: src/PartFileConvert.cpp:398
-msgid "Copy"
-msgstr "複製"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:263
-msgid "Copy computed eD2k link to clipboard"
-msgstr "複製 eD2k 連結到剪貼簿"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:265
-msgid "Save as"
-msgstr "另存為"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:266
-msgid "Save computed eD2k link to file"
-msgstr "儲存 eD2k 連結到檔案"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:270 src/amuleDlg.cpp:1320
-#: src/muuli_wdr.cpp:3680
-msgid "About"
-msgstr "關於"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:271
-#: src/utils/aLinkCreator/src/alcframe.cpp:467
-msgid "About aLinkCreator"
-msgstr "關於 aLinkCreator"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:364
-msgid "Select the file you want to compute the eD2k link"
-msgstr "選取要求得 eD2k 連結的檔案"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:398
-msgid "Can't open the clipboard"
-msgstr "無法開啟剪貼簿"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:407
-msgid "Nothing to copy for now !"
-msgstr "沒有東西可複製！"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:434
-msgid "Select the file to your computed eD2k link"
-msgstr "選取已求得 eD2k 連結的檔案"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:445
-msgid "Unable to open "
-msgstr "無法開啟"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:452
-#: src/utils/aLinkCreator/src/alcframe.cpp:581
-msgid "Please, enter a non empty file name"
-msgstr "請輸入一個非空白的檔名"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:457
-msgid "Nothing to save for now !"
-msgstr "沒有東西可儲存！"
-
-#: src/utils/aLinkCreator/src/alcframe.cpp:466
-msgid ""
-"aLinkCreator, the aMule eD2k link creator\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
-"and http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"Distributed under GPL"
-msgstr ""
-"aLinkCreator，用以建立 aMule eD2k 連結\n"
-"\n"
-"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
-"\n"
-"Pixmaps 來自 http://www.everaldo.com and http://www.icomania.com\n"
-"與 http://jimmac.musichall.cz/ikony.php3\n"
-"\n"
-"依據 GPL 授權散佈"
+msgid "User %s (%u) sent unwanted sharedfiles-list"
+msgstr "使用者 %s (%u) 傳送了未經要求的分享檔案清單"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:511
-#: src/utils/aLinkCreator/src/alcframe.cpp:512
-#: src/utils/aLinkCreator/src/alcframe.cpp:518
-msgid "Hashing..."
-msgstr "正在雜湊..."
+#: src/ClientTCPSocket.cpp:1006
+#, c-format
+msgid "User %s (%u) denied access to shared directories/files list"
+msgstr "使用者 %s (%u) 拒絕傳送分享檔案/目錄清單"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "aLinkCreator is working for you"
-msgstr "aLinkCreator，協助您的作業"
+#: src/CommentDialog.cpp:35 src/CommentDialogLst.cpp:47
+msgid "File Comments"
+msgstr "檔案註解"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:516
-msgid "Computing MD4 Hash..."
-msgstr "計算 MD4 雜湊值中..."
+#: src/CommentDialogLst.cpp:55 src/FriendListCtrl.cpp:60
+msgid "Username"
+msgstr "使用者名稱"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:531
-msgid "Computing eD2k Hashes..."
-msgstr "計算 eD2k 雜湊值中..."
+#: src/CommentDialogLst.cpp:56 src/DownloadListCtrl.cpp:159
+#: src/FileDetailListCtrl.cpp:42 src/SearchListCtrl.cpp:87
+#: src/SharedFilesCtrl.cpp:101
+msgid "File Name"
+msgstr "檔案名稱"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:575
-#, c-format
-msgid "Done in %.2f s"
-msgstr "在 %.2f 秒內完成"
+#: src/CommentDialogLst.cpp:57
+msgid "Rating"
+msgstr "評價"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:614
-msgid "You have already added this URL !"
-msgstr "您已經加入此網址了！"
+#: src/CommentDialogLst.cpp:58
+msgid "Comment"
+msgstr "註解"
 
-#: src/utils/aLinkCreator/src/alcframe.cpp:619
-msgid "Please, enter a non empty URL"
-msgstr "請輸入一個非空白的網址"
+#: src/CommentDialogLst.cpp:103 src/muuli_wdr.cpp:891
+msgid "No comments"
+msgstr "沒有註解"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:66
+#: src/CommentDialogLst.cpp:105
 #, c-format
-msgid "Processing file number %u: %s"
-msgstr "正在處理檔案編號 %u：%s "
-
-#: src/utils/aLinkCreator/src/alcc.cpp:70
-msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
-msgstr "您已要求暫存檔雜湊值 (只用於超過 9.5 MB 的檔案)"
+msgid "%u comment"
+msgid_plural "%u comments"
+msgstr[0] "%u 個註解"
 
-#: src/utils/aLinkCreator/src/alcc.cpp:83
+#: src/CorruptionBlackBox.cpp:227
 #, c-format
-msgid "%s ---> Non existant file !\n"
-msgstr "%s ---> 檔案不存在！\n"
-
-#: src/utils/aLinkCreator/src/alc.cpp:55
-msgid "aLinkCreator, the aMule eD2k link creator"
-msgstr "aLinkCreator, 用以建立 aMule eD2k 連結"
+msgid ""
+"Banned client %s for sending %s corrupt data of %s total for the file '%s'"
+msgstr "已封鎖客戶端 %s：因傳送 %s (總計 %s ) 損壞資料 (檔案 %s )"
 
 #: src/DataToText.cpp:37
 msgid "Auto [Lo]"
@@ -1312,35 +1128,61 @@
 msgid "Auto [Hi]"
 msgstr "自動 [高]"
 
-#: src/DataToText.cpp:61 src/amuleDlg.cpp:538 src/ClientListCtrl.cpp:657
-#: src/amule.cpp:803
-msgid "Connecting"
-msgstr "正在連線"
+#: src/DataToText.cpp:43 src/SharedFilesCtrl.cpp:136
+msgid "Very low"
+msgstr "極低"
+
+#: src/DataToText.cpp:44 src/DownloadListCtrl.cpp:646 src/muuli_wdr.cpp:2393
+#: src/ServerListCtrl.cpp:235 src/ServerListCtrl.cpp:398
+#: src/SharedFilesCtrl.cpp:137
+msgid "Low"
+msgstr "低"
+
+#: src/DataToText.cpp:45 src/DownloadListCtrl.cpp:647 src/muuli_wdr.cpp:2394
+#: src/ServerListCtrl.cpp:236 src/ServerListCtrl.cpp:399
+#: src/SharedFilesCtrl.cpp:138
+msgid "Normal"
+msgstr "普通"
+
+#: src/DataToText.cpp:46 src/DownloadListCtrl.cpp:648 src/muuli_wdr.cpp:2395
+#: src/ServerListCtrl.cpp:237 src/ServerListCtrl.cpp:400
+#: src/SharedFilesCtrl.cpp:139
+msgid "High"
+msgstr "高"
+
+#: src/DataToText.cpp:47 src/SharedFilesCtrl.cpp:140
+msgid "Very High"
+msgstr "極高"
+
+#: src/DataToText.cpp:48 src/SharedFilesCtrl.cpp:141
+msgid "Release"
+msgstr "釋放"
 
 #: src/DataToText.cpp:62
 msgid "Asking"
 msgstr "正在要求"
 
-#: src/DataToText.cpp:63 src/ClientListCtrl.cpp:661
+#: src/DataToText.cpp:63
 msgid "Connecting via server"
 msgstr "正在經伺服器連線"
 
-#: src/DataToText.cpp:64 src/DownloadListCtrl.cpp:1688
-#: src/ClientListCtrl.cpp:696
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:981
 msgid "Queue Full"
 msgstr "等候區已滿"
 
-#: src/DataToText.cpp:64 src/TransferWnd.cpp:455 src/ClientListCtrl.cpp:674
+#: src/DataToText.cpp:64 src/GenericClientListCtrl.cpp:997
+#: src/KnownFile.cpp:1550
 msgid "On Queue"
 msgstr "等候中"
 
-#: src/DataToText.cpp:65 src/ClientListCtrl.cpp:666
-msgid "Transferring"
-msgstr "正在傳輸"
+#: src/DataToText.cpp:65 src/libs/ec/cpp/ECSpecialTags.cpp:53
+#: src/OtherFunctions.cpp:676 src/PartFile.cpp:3715 src/TransferWnd.cpp:348
+msgid "Downloading"
+msgstr "正在下載"
 
 #: src/DataToText.cpp:66
 msgid "Receiving hashset"
-msgstr "正在接收雜湊值組"
+msgstr "正在接收 hash 值組"
 
 #: src/DataToText.cpp:67
 msgid "No needed parts"
@@ -1348,7 +1190,7 @@
 
 #: src/DataToText.cpp:68
 msgid "Cannot connect LowID to LowID"
-msgstr "兩個 LowID 使用者不能連線"
+msgstr "無法由 LowID 連線至 LowID"
 
 #: src/DataToText.cpp:69
 msgid "Too many connections"
@@ -1362,8 +1204,7 @@
 msgid "Too many Kad connections"
 msgstr "Kad 連線數過多"
 
-#: src/DataToText.cpp:73 src/Statistics.cpp:710 src/TransferWnd.cpp:309
-#: src/ClientListCtrl.cpp:843
+#: src/DataToText.cpp:73
 msgid "Banned"
 msgstr "已封鎖"
 
@@ -1389,14 +1230,14 @@
 
 #: src/DataToText.cpp:128
 msgid "Local Server"
-msgstr "本機伺服器"
+msgstr "本地伺服器"
 
 #: src/DataToText.cpp:129
 msgid "Remote Server"
 msgstr "遠端伺服器"
 
-#: src/DataToText.cpp:130 src/TextClient.cpp:703 src/muuli_wdr.cpp:197
-#: src/muuli_wdr.cpp:3622 src/SearchDlg.cpp:109
+#: src/DataToText.cpp:130 src/muuli_wdr.cpp:198 src/muuli_wdr.cpp:3284
+#: src/SearchDlg.cpp:109 src/TextClient.cpp:714
 msgid "Kad"
 msgstr "Kad"
 
@@ -1420,8 +1261,8 @@
 msgid "Search Result"
 msgstr "搜尋結果"
 
-#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:192 src/TransferWnd.cpp:347
-#: src/OtherFunctions.cpp:696
+#: src/DataToText.cpp:145 src/DownloadListCtrl.cpp:162
+#: src/OtherFunctions.cpp:674 src/TransferWnd.cpp:346
 msgid "Completed"
 msgstr "已完成"
 
@@ -1445,882 +1286,313 @@
 msgid "ERROR: Failed!"
 msgstr "錯誤：失敗！"
 
-#: src/DataToText.cpp:151
+#: src/DataToText.cpp:151 src/SearchListCtrl.cpp:1011
 msgid "Queued"
-msgstr "已加入等候區"
+msgstr "待處理"
 
 #: src/DataToText.cpp:152
 msgid "Already downloading"
-msgstr "已經在下載"
+msgstr "已在下載清單中"
 
 #: src/DataToText.cpp:153
 msgid "Unknown or bad tempfile format."
 msgstr "不明或錯誤的暫存檔格式。"
 
-#: src/Preferences.cpp:628 src/PrefsUnifiedDlg.cpp:242
-msgid "System default"
-msgstr "系統預設"
-
-#: src/Preferences.cpp:629
-msgid "Albanian"
-msgstr "阿爾巴尼亞語"
-
-#: src/Preferences.cpp:630
-msgid "Arabic"
-msgstr "阿拉伯語"
-
-#: src/Preferences.cpp:631
-msgid "Asturian"
-msgstr "奧地利語"
-
-#: src/Preferences.cpp:632
-msgid "Basque"
-msgstr "巴斯克語"
-
-#: src/Preferences.cpp:633
-msgid "Bulgarian"
-msgstr "保加利亞語"
-
-#: src/Preferences.cpp:634
-msgid "Catalan"
-msgstr "加泰隆尼亞語"
-
-#: src/Preferences.cpp:635
-msgid "Chinese (Simplified)"
-msgstr "簡體中文"
-
-#: src/Preferences.cpp:636
-msgid "Chinese (Traditional)"
-msgstr "正體中文"
-
-#: src/Preferences.cpp:637
-msgid "Croatian"
-msgstr "克羅埃西亞語"
-
-#: src/Preferences.cpp:638
-msgid "Czech"
-msgstr "捷克語"
-
-#: src/Preferences.cpp:639
-msgid "Danish"
-msgstr "丹麥語"
-
-#: src/Preferences.cpp:640
-msgid "Dutch"
-msgstr "荷蘭語"
-
-#: src/Preferences.cpp:641
-msgid "English (U.K.)"
-msgstr "英語 (英國)"
-
-#: src/Preferences.cpp:642
-msgid "Estonian"
-msgstr "愛沙尼亞語"
-
-#: src/Preferences.cpp:643
-msgid "Finnish"
-msgstr "芬蘭語"
-
-#: src/Preferences.cpp:644
-msgid "French"
-msgstr "法語"
-
-#: src/Preferences.cpp:645
-msgid "Galician"
-msgstr "加利西亞語"
-
-#: src/Preferences.cpp:646
-msgid "German"
-msgstr "德語"
-
-#: src/Preferences.cpp:647
-msgid "Greek"
-msgstr "希臘語"
-
-#: src/Preferences.cpp:648
-msgid "Hebrew"
-msgstr "希伯來語"
-
-#: src/Preferences.cpp:649
-msgid "Hungarian"
-msgstr "匈牙利語"
+#: src/DownloadListCtrl.cpp:158
+msgid "Part"
+msgstr "部份"
 
-#: src/Preferences.cpp:650
-msgid "Italian"
-msgstr "義大利語"
-
-#: src/Preferences.cpp:651
-msgid "Italian (Swiss)"
-msgstr "意大利語 (瑞士)"
-
-#: src/Preferences.cpp:652
-msgid "Japanese"
-msgstr "日語"
-
-#: src/Preferences.cpp:653
-msgid "Korean"
-msgstr "韓語"
-
-#: src/Preferences.cpp:654
-msgid "Lithuanian"
-msgstr "立陶宛語"
-
-#: src/Preferences.cpp:655
-msgid "Norwegian (Nynorsk)"
-msgstr "新挪威語"
+#: src/DownloadListCtrl.cpp:160 src/PartFileConvertDlg.cpp:93
+#: src/SearchListCtrl.cpp:88 src/SharedFilesCtrl.cpp:102
+msgid "Size"
+msgstr "大小"
 
-#: src/Preferences.cpp:656
-msgid "Polish"
-msgstr "波蘭語"
+#: src/DownloadListCtrl.cpp:161 src/muuli_wdr.cpp:3359
+msgid "Transferred"
+msgstr "已傳輸"
 
-#: src/Preferences.cpp:657
-msgid "Portuguese"
-msgstr "葡萄牙語"
+#: src/DownloadListCtrl.cpp:163 src/SourceListCtrl.cpp:30
+msgid "Speed"
+msgstr "速度"
 
-#: src/Preferences.cpp:658
-msgid "Portuguese (Brazilian)"
-msgstr "葡萄牙語 (巴西)"
+#: src/DownloadListCtrl.cpp:164
+msgid "Progress"
+msgstr "進度"
 
-#: src/Preferences.cpp:659
-msgid "Russian"
-msgstr "俄語"
+#: src/DownloadListCtrl.cpp:165 src/FileDetailListCtrl.cpp:43
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:89
+msgid "Sources"
+msgstr "來源"
 
-#: src/Preferences.cpp:660
-msgid "Slovenian"
-msgstr "斯洛維尼亞語"
+#: src/DownloadListCtrl.cpp:166 src/DownloadListCtrl.cpp:651
+#: src/ServerListCtrl.cpp:93 src/ServerListCtrl.cpp:402
+#: src/SharedFilesCtrl.cpp:104 src/SharedFilesCtrl.cpp:144
+msgid "Priority"
+msgstr "優先等級"
 
-#: src/Preferences.cpp:661
-msgid "Spanish"
-msgstr "西班牙語"
+#: src/DownloadListCtrl.cpp:167 src/PartFile.cpp:3763
+#: src/SearchListCtrl.cpp:92
+msgid "Status"
+msgstr "狀態"
 
-#: src/Preferences.cpp:662
-msgid "Swedish"
-msgstr "瑞典語"
+#: src/DownloadListCtrl.cpp:168
+msgid "Time Remaining"
+msgstr "剩餘時間"
 
-#: src/Preferences.cpp:663
-msgid "Turkish"
-msgstr "土耳其語"
+#: src/DownloadListCtrl.cpp:169
+msgid "Last Seen Complete"
+msgstr "最後看到完整檔案"
 
-#: src/Preferences.cpp:664
-msgid "Ukrainian"
-msgstr "烏克蘭語"
+#: src/DownloadListCtrl.cpp:170
+msgid "Last Reception"
+msgstr "最後一次下載"
 
-#: src/Preferences.cpp:1627 src/Preferences.cpp:1642 src/Preferences.cpp:1649
-msgid "Unable to determine selected browser!"
-msgstr "無法發現選取的瀏覽器！"
+#: src/DownloadListCtrl.cpp:411
+msgid "Are you sure that you wish to delete the selected file?"
+msgstr "您確定要刪除這個檔案嗎？"
 
-#: src/Preferences.cpp:1680
-msgid ""
-"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
-msgstr "TCP 埠不可大於 65532，因爲伺服器 UDP 連接端點值爲 TCP 埠值+3"
+#: src/DownloadListCtrl.cpp:413
+msgid "Are you sure that you wish to delete the selected files?"
+msgstr "您確定要刪除這些檔案嗎？"
 
-#: src/Preferences.cpp:1681
+#: src/DownloadListCtrl.cpp:554 src/SharedFilesCtrl.cpp:200
 #, c-format
-msgid "Default port will be used (%d)"
-msgstr "使用預設通訊埠 (%d)"
-
-#: src/ServerListCtrl.cpp:87
-msgid "Server Name"
-msgstr "伺服器名稱"
-
-#: src/ServerListCtrl.cpp:88
-msgid "Address"
-msgstr "位址"
-
-#: src/ServerListCtrl.cpp:89
-msgid "Port"
-msgstr "通訊埠"
-
-#: src/ServerListCtrl.cpp:90
-msgid "Description"
-msgstr "說明"
-
-#: src/ServerListCtrl.cpp:91
-msgid "Ping"
-msgstr "Ping"
-
-#: src/ServerListCtrl.cpp:92
-msgid "Users"
-msgstr "使用者數"
-
-#: src/ServerListCtrl.cpp:93 src/PrefsUnifiedDlg.cpp:172
-msgid "Files"
-msgstr "檔案數"
-
-#: src/ServerListCtrl.cpp:95 src/ClientDetailDialog.cpp:196
-msgid "Failed"
-msgstr "失敗數"
-
-#: src/ServerListCtrl.cpp:96
-msgid "Static"
-msgstr "靜態"
-
-#
-#: src/ServerListCtrl.cpp:97 src/Statistics.cpp:871
-msgid "Version"
-msgstr "版本"
-
-#: src/ServerListCtrl.cpp:144
 msgid ""
-"You are connected to a server you are trying to delete. Please disconnect "
-"first. The server was NOT deleted."
-msgstr "您現在正和要刪除的伺服器連線，該伺服器暫時無法刪除。請先中斷連線。"
-
-#: src/ServerListCtrl.cpp:144 src/CatDialog.cpp:142 src/CatDialog.cpp:152
-#: src/CatDialog.cpp:160 src/ServerList.cpp:342 src/amule.cpp:705
-#: src/amule.cpp:1330
-msgid "Info"
-msgstr "資訊"
-
-#: src/ServerListCtrl.cpp:147
-msgid "(Unknown name)"
-msgstr "(不明名稱)"
-
-#: src/ServerListCtrl.cpp:149
-#, c-format
-msgid "Are you sure you want to delete the static server %s"
-msgstr "您確定要刪除靜態伺服器 %s"
+"Feedback from: %s (%s)\n"
+"\n"
+msgstr ""
+"%s (%s) 回覆訊息\n"
+"\n"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:912
-#: src/ClientListCtrl.cpp:1055 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "Yes"
-msgstr "是"
+#: src/DownloadListCtrl.cpp:649 src/muuli_wdr.cpp:2396
+#: src/SharedFilesCtrl.cpp:142
+msgid "Auto"
+msgstr "自動"
 
-#: src/ServerListCtrl.cpp:237 src/ClientListCtrl.cpp:914
-#: src/ClientListCtrl.cpp:1057 src/ClientListCtrl.cpp:1068
-#: src/ClientListCtrl.cpp:1074
-msgid "No"
-msgstr "否"
+#: src/DownloadListCtrl.cpp:653 src/TransferWnd.cpp:376
+msgid "&Stop"
+msgstr "停止(&S)"
 
-#: src/ServerListCtrl.cpp:346
-#, c-format
-msgid "Failed to open '%s'"
-msgstr "無法開啟 '%s'"
+#: src/DownloadListCtrl.cpp:654 src/TransferWnd.cpp:377
+msgid "&Pause"
+msgstr "暫停(&P)"
 
-#: src/ServerListCtrl.cpp:369
-#, c-format
-msgid "Servers (%i)"
-msgstr "伺服器 (%i)"
+#: src/DownloadListCtrl.cpp:655 src/TransferWnd.cpp:378
+msgid "&Resume"
+msgstr "續傳(&R)"
 
-#: src/ServerListCtrl.cpp:417 src/ServerWnd.cpp:180 src/ServerSocket.cpp:257
-#: src/ServerSocket.cpp:272
-msgid "Server"
-msgstr "伺服器"
+#: src/DownloadListCtrl.cpp:656
+msgid "C&lear completed"
+msgstr "清除已傳完成的(&l)"
 
-#: src/ServerListCtrl.cpp:422
-msgid "Connect to server"
-msgstr "連線到伺服器"
+#: src/DownloadListCtrl.cpp:662
+msgid "Swap every A4AF to this file now"
+msgstr "立即轉移所有 A4AF 到這個檔案"
 
-#: src/ServerListCtrl.cpp:428
-msgid "Mark server as static"
-msgstr "標記爲靜態伺服器"
+#: src/DownloadListCtrl.cpp:664
+msgid "Swap every A4AF to this file (Auto)"
+msgstr "自動轉移所有 A4AF 到這個檔案"
 
-#: src/ServerListCtrl.cpp:429
-msgid "Mark server as non-static"
-msgstr "標記爲非靜態伺服器"
+#: src/DownloadListCtrl.cpp:669
+msgid "Swap every A4AF to any other file now"
+msgstr "立即轉移所有 A4AF 到其它檔案"
 
-#: src/ServerListCtrl.cpp:431
-msgid "Mark servers as static"
-msgstr "標記爲靜態伺服器"
+#: src/DownloadListCtrl.cpp:672
+msgid "Extended Options"
+msgstr "擴充選項"
 
-#: src/ServerListCtrl.cpp:432
-msgid "Mark servers as non-static"
-msgstr "標記爲非靜態伺服器"
+#: src/DownloadListCtrl.cpp:677 src/DownloadListCtrl.cpp:737
+msgid "Preview"
+msgstr "預覽"
 
-#: src/ServerListCtrl.cpp:438
-msgid "Remove server"
-msgstr "移除伺服器"
+#: src/DownloadListCtrl.cpp:678
+msgid "Show file &details"
+msgstr "顯示檔案詳細資訊(&D)"
 
-#: src/ServerListCtrl.cpp:440
-msgid "Remove servers"
-msgstr "移除伺服器"
+#: src/DownloadListCtrl.cpp:679 src/muuli_wdr.cpp:768
+msgid "Show all comments"
+msgstr "顯示所有註解"
 
-#: src/ServerListCtrl.cpp:442
-msgid "Remove all servers"
-msgstr "移除所有伺服器"
+#: src/DownloadListCtrl.cpp:684
+msgid "Copy magnet URI to clipboard"
+msgstr "複製 magnet 網址到剪貼簿"
 
-#: src/ServerListCtrl.cpp:447 src/SearchListCtrl.cpp:603
-msgid "Copy eD2k link to clipboard"
-msgstr "複製 eD2k 連結到剪貼簿"
+#: src/DownloadListCtrl.cpp:686 src/SharedFilesCtrl.cpp:163
+msgid "Copy eD2k &link to clipboard"
+msgstr "複製 eD2k 連結到剪貼簿(&L)"
 
-#: src/ServerListCtrl.cpp:449
-msgid "Copy eD2k links to clipboard"
-msgstr "複製 eD2k 連結到剪貼簿"
+#: src/DownloadListCtrl.cpp:688 src/SharedFilesCtrl.cpp:169
+msgid "Copy feedback to clipboard"
+msgstr "複製傳輸狀況到剪貼簿"
 
-#: src/ServerListCtrl.cpp:457
-msgid "Reconnect to server"
-msgstr "重新連線到伺服器"
+#: src/DownloadListCtrl.cpp:697
+msgid "unassign"
+msgstr "取消"
 
-#: src/ServerListCtrl.cpp:554
-msgid "Are you sure that you wish to delete all servers?"
-msgstr "您確定要刪除所有伺服器嗎？"
+#: src/DownloadListCtrl.cpp:704
+msgid "Assign to category"
+msgstr "分類"
 
-#: src/ServerListCtrl.cpp:570
-msgid "Are you sure that you wish to delete the selected server?"
-msgstr "您確定要刪除選取的伺服器嗎？"
+#: src/DownloadListCtrl.cpp:740
+msgid "&Open the file"
+msgstr "開啟檔案(&O)"
 
-#: src/ServerListCtrl.cpp:572
-msgid "Are you sure that you wish to delete the selected servers?"
-msgstr "您確定要刪除選取的伺服器嗎？"
+#: src/DownloadListCtrl.cpp:812 src/SharedFilesCtrl.cpp:682
+msgid "Enter new name for this file:"
+msgstr "請輸入新檔案名稱："
 
-#: src/OScopeCtrl.cpp:242
-#, c-format
-msgid "Disabled [%s]"
-msgstr "已停用 [%s]"
+#: src/DownloadListCtrl.cpp:813 src/SharedFilesCtrl.cpp:683
+msgid "File rename"
+msgstr "更改檔名"
 
-#: src/amuleDlg.cpp:210
-#, c-format
-msgid "This is aMule %s based on eMule."
-msgstr "這是 aMule %s (源自 eMule)。"
+#: src/DownloadListCtrl.cpp:1087 src/DownloadListCtrl.cpp:1098
+msgid "%y/%m/%d %H:%M:%S"
+msgstr "%y/%m/%d %H:%M:%S"
 
-#: src/amuleDlg.cpp:212
+#: src/DownloadListCtrl.cpp:1268
 #, c-format
-msgid "Running on %s"
-msgstr "執行於 %s"
-
-#: src/amuleDlg.cpp:214
-msgid "Visit http://www.amule.org to check if a new version is available."
-msgstr "請到 http://www.amule.org 下載最新版本。"
-
-#: src/amuleDlg.cpp:237
-msgid "FATAL ERROR: Failed to create Timer"
-msgstr "嚴重錯誤：無法建立計時器"
-
-#: src/amuleDlg.cpp:456
-msgid "aMule remote control "
-msgstr "aMule 遠端控制"
-
-#: src/amuleDlg.cpp:462
-msgid "Snapshot:"
-msgstr "快照："
-
-#: src/amuleDlg.cpp:464
-msgid ""
-" 'All-Platform' p2p client based on eMule \n"
-"\n"
-msgstr ""
-" 源自 eMule 的 '跨平台' P2P 客戶端程式\n"
-"\n"
-
-#: src/amuleDlg.cpp:465
-msgid " Website: http://www.amule.org \n"
-msgstr " 網站：http://www.amule.org \n"
-
-#: src/amuleDlg.cpp:466
-msgid " Forum: http://forum.amule.org \n"
-msgstr " 論壇：http://forum.amule.org \n"
-
-#: src/amuleDlg.cpp:467
-msgid ""
-" FAQ: http://wiki.amule.org \n"
-"\n"
-msgstr ""
-" FAQ：http://wiki.amule.org \n"
-"\n"
-
-#: src/amuleDlg.cpp:468
-msgid " Contact: admin@amule.org (administrative issues) \n"
-msgstr " 聯絡：admin@amule.org (行政管理) \n"
+msgid "Downloads (%i)"
+msgstr "下載 (%i)"
 
-#: src/amuleDlg.cpp:469
+#: src/DownloadListCtrl.cpp:1412
 msgid ""
-" Copyright (C) 2003-2009 aMule Team \n"
-"\n"
+"To prevent this warning to show up in every preview,\n"
+"set your preferred video player in preferences (default is mplayer)."
 msgstr ""
-" Copyright (c) 2003-2009 aMule 團隊\n"
-"\n"
-
-#: src/amuleDlg.cpp:470
-msgid " Part of aMule is based on \n"
-msgstr " 部份 aMule 源自 \n"
-
-#: src/amuleDlg.cpp:471
-msgid "Kademlia: Peer-to-peer routing based on the XOR metric.\n"
-msgstr " KAD：基於 XOR 演算法的 P2P 路由。\n"
-
-#: src/amuleDlg.cpp:472
-msgid " Copyright (C) 2002 Petar Maymounkov\n"
-msgstr " Copyright (C) 2002 Petar Maymounkov\n"
-
-#: src/amuleDlg.cpp:473
-msgid " http://kademlia.scs.cs.nyu.edu\n"
-msgstr " http://kademlia.scs.cs.nyu.edu\n"
-
-#: src/amuleDlg.cpp:476 src/PrefsUnifiedDlg.cpp:561
-#: src/PrefsUnifiedDlg.cpp:661 src/PrefsUnifiedDlg.cpp:750 src/KadDlg.cpp:177
-#: src/PartFile.cpp:922 src/PartFile.cpp:930
-msgid "Message"
-msgstr "訊息"
-
-#: src/amuleDlg.cpp:682
-msgid "eD2k: Connecting"
-msgstr "eD2k：正在連線"
-
-#: src/amuleDlg.cpp:686
-msgid "eD2k: Disconnected"
-msgstr "eD2k：已中斷連線"
-
-#: src/amuleDlg.cpp:692
-msgid "Kad: Firewalled"
-msgstr "Kad：防火牆內"
-
-#: src/amuleDlg.cpp:696
-msgid "Kad: Connected"
-msgstr "Kad：已連線"
-
-#: src/amuleDlg.cpp:701
-msgid "Kad: Connecting"
-msgstr "Kad：正在連線"
-
-#: src/amuleDlg.cpp:705
-msgid "Kad: Off"
-msgstr "Kad：關閉"
-
-#: src/amuleDlg.cpp:752
-msgid "Stop the current connection attempts"
-msgstr "停止連線作業"
-
-#: src/amuleDlg.cpp:757 src/muuli_wdr.cpp:2850 src/MuleTrayIcon.cpp:547
-msgid "Disconnect"
-msgstr "中斷連線"
-
-#: src/amuleDlg.cpp:758
-msgid "Disconnect from the currently connected networks"
-msgstr "中斷已連線的網路"
-
-#: src/amuleDlg.cpp:763 src/muuli_wdr.cpp:3033 src/muuli_wdr.cpp:3466
-#: src/muuli_wdr.cpp:3668 src/MuleTrayIcon.cpp:550
-msgid "Connect"
-msgstr "連線"
-
-#: src/amuleDlg.cpp:764
-msgid "Connect to the currently enabled networks"
-msgstr "連線到網路"
-
-#: src/amuleDlg.cpp:810
-#, c-format
-msgid "Up: %.1f(%.1f) | Down: %.1f(%.1f)"
-msgstr "上傳：%.1f (%.1f) | 下載：%.1f (%.1f)"
+"請在偏好設定中設定影片播放器 (預設為 mplayer)，\n"
+"以避免這個警告訊息繼續出現。"
 
-#: src/amuleDlg.cpp:812
-#, c-format
-msgid "Up: %.1f | Down: %.1f"
-msgstr "上傳：%.1f | 下載：%.1f"
+#: src/DownloadListCtrl.cpp:1413
+msgid "File preview"
+msgstr "檔案預覽"
 
-#: src/amuleDlg.cpp:834
+#: src/DownloadListCtrl.cpp:1461
 #, c-format
-msgid "aMule (%s | Connected)"
-msgstr "aMule (%s | 已連線)"
+msgid "ERROR: Failed to execute external media-player! Command: `%s'"
+msgstr "錯誤：無法執行媒體播放器！指令：「 %s 」"
 
-#: src/amuleDlg.cpp:836
+#: src/DownloadQueue.cpp:103
 #, c-format
-msgid "aMule (%s | Disconnected)"
-msgstr "aMule (%s | 已中斷連線)"
-
-#: src/amuleDlg.cpp:867
-msgid "Do you really want to exit aMule?"
-msgstr "您確定要離開 aMule 嗎？"
+msgid "Saving PartFile %u of %u"
+msgstr "正在儲存暫存檔 (%u / %u)"
 
-#: src/amuleDlg.cpp:868
-msgid "Exit confirmation"
-msgstr "確認離開"
+#: src/DownloadQueue.cpp:106
+msgid "All PartFiles Saved."
+msgstr "已儲存所有暫存檔。"
 
-#: src/amuleDlg.cpp:1182
+#: src/DownloadQueue.cpp:113
 #, c-format
-msgid "Skin directory '%s' does not exist"
-msgstr "面板目錄 '%s' 不存在"
+msgid "Loading temp files from %s."
+msgstr "正在從 %s 載入暫存檔。"
 
-#: src/amuleDlg.cpp:1187
+#: src/DownloadQueue.cpp:132
 #, c-format
-msgid "WARNING: Unable to open skin file '%s' for read"
-msgstr "警告：無法開啟面板檔案 '%s' 供讀取"
+msgid "Loading PartFile %u of %u"
+msgstr "正在載入暫存檔 (%u / %u)"
 
-#: src/amuleDlg.cpp:1287 src/amuleDlg.cpp:1448 src/muuli_wdr.cpp:1867
-#: src/muuli_wdr.cpp:3670
-msgid "Networks"
-msgstr "網路"
-
-#: src/amuleDlg.cpp:1289
-msgid "Networks window"
-msgstr "網路 視窗"
-
-#: src/amuleDlg.cpp:1291 src/muuli_wdr.cpp:3671
-msgid "Searches"
-msgstr "搜尋"
-
-#: src/amuleDlg.cpp:1293
-msgid "Searches window"
-msgstr "搜尋 視窗"
-
-#: src/amuleDlg.cpp:1295 src/muuli_wdr.cpp:3672
-msgid "Transfers"
-msgstr "檔案傳輸"
-
-#: src/amuleDlg.cpp:1297
-msgid "Files transfers window"
-msgstr "檔案傳輸 視窗"
-
-#: src/amuleDlg.cpp:1299
-msgid "Shared files"
-msgstr "檔案分享"
-
-#: src/amuleDlg.cpp:1301
-msgid "Shared files window"
-msgstr "檔案分享 視窗"
-
-#: src/amuleDlg.cpp:1303 src/muuli_wdr.cpp:525 src/muuli_wdr.cpp:3675
-msgid "Messages"
-msgstr "訊息"
-
-#: src/amuleDlg.cpp:1305
-msgid "Messages window"
-msgstr "訊息 視窗"
-
-#: src/amuleDlg.cpp:1307 src/PrefsUnifiedDlg.cpp:175 src/Statistics.cpp:639
-#: src/Statistics.cpp:937 src/muuli_wdr.cpp:1108 src/muuli_wdr.cpp:3676
-msgid "Statistics"
-msgstr "統計"
-
-#: src/amuleDlg.cpp:1309
-msgid "Statistics graph window"
-msgstr "統計 視窗"
-
-#: src/amuleDlg.cpp:1314
-msgid "Preferences settings window"
-msgstr "偏好設定 視窗"
-
-#: src/amuleDlg.cpp:1316 src/muuli_wdr.cpp:3679
-msgid "Import"
-msgstr "匯入"
-
-#: src/amuleDlg.cpp:1318 src/muuli_wdr.cpp:3679
-msgid "The partfile importer tool"
-msgstr "暫存檔匯入工具"
-
-#: src/amuleDlg.cpp:1322 src/muuli_wdr.cpp:3680
-msgid "About/Help"
-msgstr "關於/幫助"
-
-#: src/amuleDlg.cpp:1459
-msgid "eD2k network"
-msgstr "eD2k 網路"
-
-#: src/amuleDlg.cpp:1463
-msgid "Kad network"
-msgstr "kad 網路"
-
-#: src/amuleDlg.cpp:1468
-msgid "No network"
-msgstr "無網路"
-
-#: src/PrefsUnifiedDlg.cpp:168 src/muuli_wdr.cpp:570 src/muuli_wdr.cpp:1376
-#: src/muuli_wdr.cpp:3333
-msgid "General"
-msgstr "一般"
-
-#: src/PrefsUnifiedDlg.cpp:169 src/Statistics.cpp:688
-msgid "Connection"
-msgstr "連線"
-
-#: src/PrefsUnifiedDlg.cpp:170
-msgid "Directories"
-msgstr "目錄"
-
-#: src/PrefsUnifiedDlg.cpp:171 src/Statistics.cpp:714
-msgid "Servers"
-msgstr "伺服器"
-
-#: src/PrefsUnifiedDlg.cpp:173
-msgid "Security"
-msgstr "安全"
-
-#: src/PrefsUnifiedDlg.cpp:174
-msgid "Interface"
-msgstr "介面"
-
-#: src/PrefsUnifiedDlg.cpp:176
-msgid "Proxy"
-msgstr "代理伺服器"
-
-#: src/PrefsUnifiedDlg.cpp:177
-msgid "Filters"
-msgstr "過濾"
-
-#: src/PrefsUnifiedDlg.cpp:178
-msgid "Remote Controls"
-msgstr "遠端控制"
-
-#: src/PrefsUnifiedDlg.cpp:179
-msgid "Online Signature"
-msgstr "線上簽名識別"
-
-#: src/PrefsUnifiedDlg.cpp:180
-msgid "Advanced"
-msgstr "進階"
-
-#: src/PrefsUnifiedDlg.cpp:181
-msgid "Events"
-msgstr "事件"
-
-#: src/PrefsUnifiedDlg.cpp:183
-msgid "Debugging"
-msgstr "除錯"
-
-#: src/PrefsUnifiedDlg.cpp:243 src/muuli_wdr.cpp:1683
-msgid "User Defined"
-msgstr "使用者自定"
-
-#: src/PrefsUnifiedDlg.cpp:539
-msgid ""
-"aMule must be restarted to enable these changes:\n"
-"\n"
-msgstr ""
-"重新啟動 aMule，變更的設定才能生效：\n"
-"\n"
-
-#: src/PrefsUnifiedDlg.cpp:546
-msgid "- TCP port changed.\n"
-msgstr "- TCP 埠已變更。\n"
-
-#: src/PrefsUnifiedDlg.cpp:551
-msgid "- UDP port changed.\n"
-msgstr "- UDP 埠已變更。\n"
-
-#: src/PrefsUnifiedDlg.cpp:560
-msgid ""
-"Your Auto-update server list is empty.\n"
-"'Auto-update server list at startup will be disabled."
-msgstr ""
-"您的自動更新伺服器清單是空的。\n"
-"'啟動時自動更新伺服器清單' 功能將被停用。"
-
-#: src/PrefsUnifiedDlg.cpp:567
-msgid ""
-"You have enabled external connections but have not specified a password.\n"
-"External connections cannot be enabled unless a valid password is specified."
-msgstr ""
-"您已經設定啓用外部連線但還沒有輸入密碼，\n"
-"輸入有效密碼之後，外部連線才能開始使用。"
-
-#: src/PrefsUnifiedDlg.cpp:579
-msgid "- Language changed.\n"
-msgstr "- 語言已變更。\n"
-
-#: src/PrefsUnifiedDlg.cpp:584
-msgid "- Temp folder changed.\n"
-msgstr "- 暫存資料夾已變更。\n"
-
-#: src/PrefsUnifiedDlg.cpp:589
-msgid "- ED2K network enabled.\n"
-msgstr "- ED2K 網路已啟用。\n"
-
-#: src/PrefsUnifiedDlg.cpp:614 src/muuli_wdr.cpp:116
-msgid "Up: 0.0 | Down: 0.0"
-msgstr "上傳：0.0 | 下載：0.0"
-
-#: src/PrefsUnifiedDlg.cpp:656
-msgid ""
-"Both eD2k and Kad network are disabled.\n"
-"You won't be able to connect until you enable at least one of them."
-msgstr ""
-"eD2k 與 Kad 網路都已停用。\n"
-"請至少啟用一種，否則您將無法連線。"
-
-#: src/PrefsUnifiedDlg.cpp:660
-msgid ""
-"Kad will not start if your UDP port is disabled.\n"
-"Enable UDP port or disable Kad."
-msgstr ""
-"如果您停用 UDP 埠，Kad 將無法啓動。\n"
-"請啟用 UDP 埠或停用 Kad。"
-
-#: src/PrefsUnifiedDlg.cpp:669
-msgid ""
-"\n"
-"You MUST restart aMule now.\n"
-"If you do not restart now, don't complain if anything bad happens.\n"
-msgstr ""
-"\n"
-"您必須立即重新啟動 aMule，\n"
-"如果現在不重啟動，可能會發生不可預期的問題。\n"
-
-#: src/PrefsUnifiedDlg.cpp:749
+#: src/DownloadQueue.cpp:154
 msgid ""
-"Your Auto-update servers list is in blank.\n"
-"Please fill in at least one URL to point to a valid server.met file.\n"
-"Click on the button \"List\" by this checkbox to enter an URL."
+"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
+"met recovery solutions."
 msgstr ""
-"伺服器清單自動更新設定空白。\n"
-"請至少輸入一個能取得有效 server.met 檔案的網址。\n"
-"請點選旁邊的\"清單\"按鈕後輸入。"
-
-#: src/PrefsUnifiedDlg.cpp:897
-msgid "Temporary files"
-msgstr "暫存檔"
-
-#: src/PrefsUnifiedDlg.cpp:902
-msgid "Incoming files"
-msgstr "新進檔案"
-
-#: src/PrefsUnifiedDlg.cpp:907
-msgid "Online Signatures"
-msgstr "線上簽名識別"
-
-#: src/PrefsUnifiedDlg.cpp:920
-#, c-format
-msgid "Choose a folder for %s"
-msgstr "爲 %s 選擇資料夾"
+"錯誤：無法載入備份檔案，請到 http://forum.amule.org 搜尋復原 .part.met 的方"
+"法。"
 
-#: src/PrefsUnifiedDlg.cpp:940
-msgid "Browse for videoplayer"
-msgstr "瀏覽尋找影片播放器"
+#: src/DownloadQueue.cpp:163
+msgid "All PartFiles Loaded."
+msgstr "已載入所有暫存檔。"
 
-#: src/PrefsUnifiedDlg.cpp:944
-msgid "Select browser"
-msgstr "設定瀏覽器"
+#: src/DownloadQueue.cpp:166
+msgid "No part files found"
+msgstr "找不到暫存檔"
 
-#: src/PrefsUnifiedDlg.cpp:950
+#: src/DownloadQueue.cpp:168
 #, c-format
-msgid "Executable%s"
-msgstr "可執行%s"
-
-#: src/PrefsUnifiedDlg.cpp:971
-msgid "Edit server list"
-msgstr "編輯伺服器清單"
+msgid "Found %u part file"
+msgid_plural "Found %u part files"
+msgstr[0] "找到 %u 個暫存檔"
 
-#: src/PrefsUnifiedDlg.cpp:972
-msgid ""
-"Add here URL's to download server.met files.\n"
-"Only one url on each line."
-msgstr ""
-"加入可下載 server.met 檔案的網址。\n"
-"每一行一個網址。"
+#: src/DownloadQueue.cpp:241 src/DownloadQueue.cpp:1467
+msgid "Filesystem for Temp directory cannot handle large files."
+msgstr "設定存放暫存檔的目錄，檔案系統不支援大容量檔案。"
 
-#: src/PrefsUnifiedDlg.cpp:1031
-#, c-format
-msgid "Update delay: %d second"
-msgid_plural "Update delay: %d seconds"
-msgstr[0] "更新延遲時間：%d 秒"
-msgstr[1] "更新延遲時間：%d 秒"
+#: src/DownloadQueue.cpp:244 src/DownloadQueue.cpp:1470
+msgid "Filesystem for Incoming directory cannot handle large files."
+msgstr "設定存放新進檔案的目錄，檔案系統不支援大容量檔案。"
 
-#: src/PrefsUnifiedDlg.cpp:1038
+#: src/DownloadQueue.cpp:374
 #, c-format
-msgid "Time for average graph: %d minute"
-msgid_plural "Time for average graph: %d minutes"
-msgstr[0] "平均值圖表顯示時間：%d 分鐘"
-msgstr[1] "平均值圖表顯示時間：%d 分鐘"
+msgid "Downloading %s"
+msgstr "下載 %s"
 
-#: src/PrefsUnifiedDlg.cpp:1044
+#: src/DownloadQueue.cpp:382
 #, c-format
-msgid "Connections Graph Scale: %d"
-msgstr "網路連線圖表比例：%d"
+msgid "You are already trying to download the file '%s'"
+msgstr "您已經在下載檔案 %s 了"
 
-#: src/PrefsUnifiedDlg.cpp:1050
+#: src/DownloadQueue.cpp:394
 #, c-format
-msgid "Update delay : %d second"
-msgid_plural "Update delay : %d seconds"
-msgstr[0] "更新延遲時間：%d 秒"
-msgstr[1] "更新延遲時間：%d 秒"
+msgid "You already have the file '%s'"
+msgstr "您已經有檔案 %s"
 
-#: src/PrefsUnifiedDlg.cpp:1056
+#: src/DownloadQueue.cpp:399
 #, c-format
-msgid "File Buffer Size: %d byte"
-msgid_plural "File Buffer Size: %d bytes"
-msgstr[0] "檔案緩衝區大小：%d B"
-msgstr[1] "檔案緩衝區大小：%d Byte"
+msgid "You are already trying to download the file %s"
+msgstr "您已經在下載檔案 %s 了"
 
-#: src/PrefsUnifiedDlg.cpp:1062
+#: src/DownloadQueue.cpp:1401
 #, c-format
-msgid "Upload Queue Size: %d client"
-msgid_plural "Upload Queue Size: %d clients"
-msgstr[0] "上傳等候區大小：%d "
-msgstr[1] "上傳等候區大小：%d "
+msgid "Cannot convert magnet link to eD2k: %s"
+msgstr "無法將 magnet 連結轉換為 eD2k: %s"
 
-#: src/PrefsUnifiedDlg.cpp:1069
+#: src/DownloadQueue.cpp:1409
 #, c-format
-msgid "Server connection refresh interval: %d minute"
-msgid_plural "Server connection refresh interval: %d minutes"
-msgstr[0] "伺服器連線更新間隔時間：%d 分鐘"
-msgstr[1] "伺服器連線更新間隔時間：%d 分鐘"
-
-#: src/PrefsUnifiedDlg.cpp:1071
-msgid "Server connection refresh interval: Disabled"
-msgstr "伺服器連線更新間隔時間：已停用"
-
-#: src/PrefsUnifiedDlg.cpp:1114
-msgid "UDP port for extended server requests (TCP+3): "
-msgstr "擴充伺服器要求 UDP 埠 (TCP+3)："
-
-#: src/PrefsUnifiedDlg.cpp:1118
-msgid "disabled"
-msgstr "已停用"
+msgid "Unknown protocol of link: %s"
+msgstr "有不明協定的連結：%s"
 
-#: src/PrefsUnifiedDlg.cpp:1138
+#: src/DownloadQueue.cpp:1430
 #, c-format
-msgid "Execute command on `%s' event"
-msgstr "發生 '%s' 事件時執行命令"
-
-#: src/PrefsUnifiedDlg.cpp:1141
-msgid "Enable command execution on core"
-msgstr "啓用在主程式端執行指令"
-
-#: src/PrefsUnifiedDlg.cpp:1149
-msgid "Core command:"
-msgstr "主程式端指令："
-
-#: src/PrefsUnifiedDlg.cpp:1158
-msgid "Enable command execution on GUI"
-msgstr "啓用在圖形界面端執行指令"
-
-#: src/PrefsUnifiedDlg.cpp:1166
-msgid "GUI command:"
-msgstr "圖形界面端指令："
-
-#: src/PrefsUnifiedDlg.cpp:1175
-msgid "The following variables will be replaced:"
-msgstr ""
-"使用以下變數：\n"
-" "
+msgid "Invalid eD2k link! ERROR: %s"
+msgstr "無效的 eD2k 連結！錯誤：%s "
 
-#: src/ExternalConn.cpp:102
-msgid "Unauthorized access attempt. Connection closed."
-msgstr "發現試圖非法登入。已關閉連線。"
+#: src/ExternalConn.cpp:260
+msgid "Client sent packet after authentication failed."
+msgstr "客戶端在驗證失敗後傳送封包。"
 
-#: src/ExternalConn.cpp:116
+#: src/ExternalConn.cpp:278
 msgid "External connection closed."
 msgstr "已關閉外部連線。"
 
-#: src/ExternalConn.cpp:143
+#: src/ExternalConn.cpp:317
 msgid "External connections disabled due to empty password!"
 msgstr "未設定密碼，外部連線已被停用！"
 
-#: src/ExternalConn.cpp:168
+#: src/ExternalConn.cpp:340
 msgid "External connections disabled in config file"
 msgstr "已在設定檔中停用外部連線"
 
-#: src/ExternalConn.cpp:217
+#: src/ExternalConn.cpp:400
 msgid "New external connection accepted"
 msgstr "已接受新的外部連線"
 
-#: src/ExternalConn.cpp:220
+#: src/ExternalConn.cpp:403
 msgid "ERROR: couldn't accept a new external connection"
 msgstr "錯誤：無法接受新的外部連線"
 
-#: src/ExternalConn.cpp:239
+#: src/ExternalConn.cpp:421
 msgid "External connection refused due to empty password in preferences!"
 msgstr "由於偏好設定中未設定密碼，外部連線已被拒絕！"
 
-#: src/ExternalConn.cpp:249
+#: src/ExternalConn.cpp:430
 #, c-format
 msgid "Connecting client: %s %s"
 msgstr "連線中客戶端：%s %s"
 
-#: src/ExternalConn.cpp:251
+#: src/ExternalConn.cpp:432
 msgid "Unknown version"
 msgstr "不明版本"
 
-#: src/ExternalConn.cpp:262
+#: src/ExternalConn.cpp:442
 msgid ""
 "Incorrect EC version ID, there might be binary incompatibility. Use core and "
 "remote from same snapshot."
@@ -2328,2202 +1600,1067 @@
 "不正確的外部連線版本 ID，這將導致執行檔不相容，請使用相同版本的主程式和遠端程"
 "式。"
 
-#: src/ExternalConn.cpp:267
+#: src/ExternalConn.cpp:447
 msgid ""
-"You cannot connect to a release version from an arbitrary SVN version! "
-"*sigh* possible crash prevented"
-msgstr "為了避免系統受損害，您不能用開發中的版本連線到正式發行版"
-
-#: src/ExternalConn.cpp:288
-msgid "Authentication failed."
-msgstr "登入驗證失敗。"
+"You cannot connect to a release version from an arbitrary development "
+"snapshot! *sigh* possible crash prevented"
+msgstr ""
+"您不能用開發中版本 (SVN) 連線到正式發行版，這是為了避免系統遭受不確定的損害"
 
-#: src/ExternalConn.cpp:292
+#: src/ExternalConn.cpp:475
 msgid "Invalid protocol version."
 msgstr "協定版本無效。"
 
-#: src/ExternalConn.cpp:296
+#: src/ExternalConn.cpp:480
 msgid "Missing protocol version tag."
 msgstr "缺少協定版本標記。"
 
-#: src/ExternalConn.cpp:300
-msgid "Invalid request, you should first authenticate."
+#: src/ExternalConn.cpp:487
+msgid "Authentication failed: invalid hash specified as EC password."
+msgstr "驗證失敗：指定無效的 hash 值做為外部連線密碼。"
+
+#: src/ExternalConn.cpp:504
+msgid "Authentication failed: wrong password."
+msgstr "驗證失敗：密碼錯誤。"
+
+#: src/ExternalConn.cpp:506
+msgid "Authentication failed: missing password."
+msgstr "驗證失敗：沒有密碼。"
+
+#: src/ExternalConn.cpp:516
+msgid "Invalid request, please authenticate first."
 msgstr "無效的要求，請先通過登入驗證。"
 
-#: src/ExternalConn.cpp:306
+#: src/ExternalConn.cpp:521
 msgid "Access granted."
 msgstr "登入成功。"
 
-#: src/ExternalConn.cpp:564
+#: src/ExternalConn.cpp:529
+#, c-format
+msgid "Sent error message \"%s\" to client."
+msgstr "傳送錯誤訊息「%s」給客戶端。"
+
+#: src/ExternalConn.cpp:534
+#, c-format
+msgid "Unauthorized access attempt from %s. Connection closed."
+msgstr "%s 試圖非法登入，已關閉連線。"
+
+#: src/ExternalConn.cpp:799
 #, c-format
 msgid "Remote PartFile command failed: FileHash not found: %s"
-msgstr "無法執行對遠端暫存檔的指令：找不到檔案雜湊值：%s "
+msgstr "無法執行對遠端暫存檔的指令：找不到檔案 hash 值：%s "
 
-#: src/ExternalConn.cpp:566
+#: src/ExternalConn.cpp:801
 #, c-format
 msgid "FileHash not found: %s"
-msgstr "找不到檔案雜湊值：%s "
+msgstr "找不到檔案 hash 值：%s "
 
-#: src/ExternalConn.cpp:629 src/ExternalConn.cpp:713
+#: src/ExternalConn.cpp:848 src/ExternalConn.cpp:930 src/ExternalConn.cpp:1001
 msgid "OOPS! OpCode processing error!"
 msgstr "糟糕！指令碼處理錯誤！"
 
-#: src/ExternalConn.cpp:659
+#: src/ExternalConn.cpp:876
 msgid "Server not added"
 msgstr "伺服器未被加入"
 
-#: src/ExternalConn.cpp:677
+#: src/ExternalConn.cpp:894
 #, c-format
 msgid "server not found: %s"
 msgstr "找不到伺服器：%s "
 
-#: src/ExternalConn.cpp:693
+#: src/ExternalConn.cpp:910
 msgid "need to define server to be removed"
 msgstr "必須指定要刪除的伺服器"
 
-#: src/ExternalConn.cpp:707
+#: src/ExternalConn.cpp:924
 msgid "eD2k is disabled in preferences."
 msgstr "eD2k 網路已在偏好設定中被停用了。"
 
-#: src/ExternalConn.cpp:803
+#: src/ExternalConn.cpp:1102
 msgid "Search in progress. Refetch results in a moment!"
-msgstr "搜尋中，請稍後再重新抓取結果！"
+msgstr "搜尋中，請稍候！"
 
-#: src/ExternalConn.cpp:808
+#: src/ExternalConn.cpp:1108
 msgid "WebSearch from remote interface makes no sense."
 msgstr "從遠端界面使用網頁搜尋功能沒有意義。"
 
-#: src/ExternalConn.cpp:859
-msgid "Kad is disabled in preferences."
-msgstr "Kad 網路已在偏好設定中被停用了。"
-
-#: src/ExternalConn.cpp:1020
+#: src/ExternalConn.cpp:1306
 msgid "No points for graph."
 msgstr "此圖沒有參考點。"
 
-#: src/ExternalConn.cpp:1029
+#: src/ExternalConn.cpp:1315
 msgid "Your client is not configured for this detail level."
-msgstr "此細部等級中沒有設定您的客戶端。"
+msgstr "您的客戶端並沒有設定這個細部等級。"
 
-#: src/ExternalConn.cpp:1057
+#: src/ExternalConn.cpp:1342
 msgid "External Connection: shutdown requested"
 msgstr "外部連線：必須關閉"
 
-#: src/ExternalConn.cpp:1069
+#: src/ExternalConn.cpp:1354
 msgid "Already shutting down."
 msgstr "已經在關閉中。"
 
-#: src/ExternalConn.cpp:1077
+#: src/ExternalConn.cpp:1366
 #, c-format
 msgid "ExternalConn: adding link '%s'."
-msgstr "外部連線：正在加入連結 '%s'。"
+msgstr "外部連線：正在加入連結 %s 。"
 
-#: src/ExternalConn.cpp:1083
+#: src/ExternalConn.cpp:1372
 msgid "Invalid link or already on list."
 msgstr "無效連結或已在清單中。"
 
-#: src/ExternalConn.cpp:1168
+#: src/ExternalConn.cpp:1442
 msgid "File not found."
 msgstr "找不到檔案。"
 
-#: src/ExternalConn.cpp:1173
+#: src/ExternalConn.cpp:1447
 msgid "Invalid file name."
 msgstr "無效的檔名。"
 
-#: src/ExternalConn.cpp:1181
+#: src/ExternalConn.cpp:1455
 msgid "Unable to rename file."
 msgstr "無法重新命名。"
 
-#: src/ExternalConn.cpp:1405
+#: src/ExternalConn.cpp:1751 src/ExternalConn.cpp:1778
+msgid "Kad is disabled in preferences."
+msgstr "Kad 網路已在偏好設定中被停用了。"
+
+#: src/ExternalConn.cpp:1790
 msgid "Already connected to eD2k."
 msgstr "eD2k 網路已連線。"
 
-#: src/ExternalConn.cpp:1408
+#: src/ExternalConn.cpp:1793
 msgid "Connecting to eD2k..."
 msgstr "eD2k 連線中..."
 
-#: src/ExternalConn.cpp:1416
+#: src/ExternalConn.cpp:1801
 msgid "Already connected to Kad."
 msgstr "Kad 網路已連線。"
 
-#: src/ExternalConn.cpp:1419
+#: src/ExternalConn.cpp:1804
 msgid "Connecting to Kad..."
 msgstr "Kad 連線中..."
 
-#: src/ExternalConn.cpp:1424
+#: src/ExternalConn.cpp:1811
 msgid "All networks are disabled."
 msgstr "所有網路都被停用了。"
 
-#: src/ExternalConn.cpp:1432
+#: src/ExternalConn.cpp:1819
 msgid "Disconnected from eD2k."
 msgstr "已中斷 eD2k 網路連線。"
 
-#: src/ExternalConn.cpp:1436
+#: src/ExternalConn.cpp:1823
 msgid "Disconnected from Kad."
 msgstr "已中斷 Kad 網路連線。"
 
-#: src/ExternalConn.cpp:1444
+#: src/ExternalConn.cpp:1832
 #, c-format
 msgid "External Connection: invalid opcode received: %#x"
 msgstr "外部連線：接收到無效的指令碼 - %#x"
 
-#: src/ExternalConn.cpp:1447
+#: src/ExternalConn.cpp:1835
 msgid "Invalid opcode (wrong protocol version?)"
 msgstr "無效的指令碼（協定版本錯誤？）"
 
-#: src/UploadClient.cpp:273
-#, c-format
-msgid "Failed to open file (%s), removing from list of shared files."
-msgstr "無法開啟檔案 '%s'，從分享檔案清單移除。"
-
-#: src/UploadClient.cpp:718
-#, c-format
-msgid "Hashset requested for unknown file: %s"
-msgstr "要求不明檔案 %s 的雜湊值組"
-
-#: src/TerminationProcess.cpp:48
-#, c-format
-msgid "Command `%s' with pid `%d' has finished with status code `%d'."
-msgstr "指令 '%s' (pid '%d') 的傳回值爲 '%d'。 "
-
-#: src/ServerWnd.cpp:104
-msgid "Server not added: No IP or hostname specified."
-msgstr "伺服器未加入：沒有 IP 或主機名稱。"
-
-#: src/ServerWnd.cpp:109
-msgid "Server not added: Invalid server-port specified."
-msgstr "伺服器未加入：無效的伺服器通訊埠。"
-
-#: src/ServerWnd.cpp:162
-msgid "eD2k Status:"
-msgstr "eD2k 狀態："
-
-#: src/ServerWnd.cpp:165 src/ServerWnd.cpp:215 src/TextClient.cpp:706
-#: src/ClientListCtrl.cpp:1008 src/ClientDetailDialog.cpp:143
-msgid "Connected"
-msgstr "已連線"
-
-#: src/ServerWnd.cpp:169 src/muuli_wdr.cpp:2829
-msgid "IP:Port"
-msgstr "IP:Port"
-
-#: src/ServerWnd.cpp:173
-msgid "ID"
-msgstr "ID"
-
-#: src/ServerWnd.cpp:205
-msgid "Kademlia Status:"
-msgstr "Kad 狀態："
-
-#: src/ServerWnd.cpp:208
-msgid "Running"
-msgstr "執行中"
-
-#: src/ServerWnd.cpp:214
-msgid "Status:"
-msgstr "狀態："
-
-#: src/ServerWnd.cpp:215 src/ClientDetailDialog.cpp:145
-msgid "Disconnected"
-msgstr "已中斷連線"
-
-#: src/ServerWnd.cpp:218
-msgid "Connection State:"
-msgstr "連線狀態："
-
-#: src/ServerWnd.cpp:219
-msgid "Firewalled"
-msgstr "防火牆內"
-
-#: src/ServerWnd.cpp:219 src/muuli_wdr.cpp:2581 src/muuli_wdr.cpp:2684
-msgid "OK"
-msgstr "OK"
-
-#: src/ServerWnd.cpp:223
-msgid "Firewalled state: "
-msgstr "防火牆狀態："
-
-#: src/ServerWnd.cpp:224
-msgid "Connected to buddy"
-msgstr "已與好友連線"
-
-#: src/ServerWnd.cpp:224
-msgid "No buddy"
-msgstr "沒有好友"
-
-#: src/ServerWnd.cpp:243
-msgid "Average Users:"
-msgstr "平均使用者數："
-
-#: src/ServerWnd.cpp:246
-msgid "Average Files:"
-msgstr "平均檔案數："
-
-#: src/ServerWnd.cpp:253 src/TextClient.cpp:717
-msgid "Not running"
-msgstr "未執行"
-
-#: src/Statistics.cpp:644 src/MuleTrayIcon.cpp:457
-#, c-format
-msgid "Uptime: %s"
-msgstr "已執行時間：%s"
-
-#: src/Statistics.cpp:646 src/muuli_wdr.cpp:647
-msgid "Transfer"
-msgstr "傳輸"
-
-#: src/Statistics.cpp:648 src/TransferWnd.cpp:451 src/muuli_wdr.cpp:467
-msgid "Uploads"
-msgstr "上傳"
-
-#: src/Statistics.cpp:649
-#, c-format
-msgid "Uploaded Data (Session (Total)): %s"
-msgstr "本次上傳量/總計上傳量：%s"
-
-#: src/Statistics.cpp:651 src/Statistics.cpp:672
-#, c-format
-msgid "Total Overhead (Packets): %s"
-msgstr "額外支出傳輸量/封包： %s"
-
-#: src/Statistics.cpp:652 src/Statistics.cpp:673
-#, c-format
-msgid "File Request Overhead (Packets): %s"
-msgstr "檔案要求支出傳輸量/封包：%s"
-
-#: src/Statistics.cpp:654 src/Statistics.cpp:675
-#, c-format
-msgid "Source Exchange Overhead (Packets): %s"
-msgstr "來源交換支出傳輸量/封包： %s"
-
-#: src/Statistics.cpp:656 src/Statistics.cpp:677
-#, c-format
-msgid "Server Overhead (Packets): %s"
-msgstr "伺服器支出傳輸量/封包： %s"
-
-#: src/Statistics.cpp:658 src/Statistics.cpp:679
-#, c-format
-msgid "Kad Overhead (Packets): %s"
-msgstr "Kad 網路支出傳輸量/封包： %s"
-
-#: src/Statistics.cpp:660 src/Statistics.cpp:681
-#, c-format
-msgid "Crypt overhead (UDP): %s"
-msgstr "加密支出傳輸量/封包： %s"
-
-#: src/Statistics.cpp:662
-#, c-format
-msgid "Active Uploads: %s"
-msgstr "目前上傳數：%s"
-
-#: src/Statistics.cpp:663
-#, c-format
-msgid "Waiting Uploads: %s"
-msgstr "等候中：%s"
-
-#: src/Statistics.cpp:664
-#, c-format
-msgid "Total successful upload sessions: %s"
-msgstr "上傳成功總次數：%s"
-
-#: src/Statistics.cpp:665
-#, c-format
-msgid "Total failed upload sessions: %s"
-msgstr "上傳失敗總次數：%s"
-
-#: src/Statistics.cpp:667
-#, c-format
-msgid "Average upload time: %s"
-msgstr "平均上傳時間：%s"
-
-#: src/Statistics.cpp:669 src/DownloadListCtrl.cpp:896 src/muuli_wdr.cpp:423
-msgid "Downloads"
-msgstr "下載"
-
-#: src/Statistics.cpp:670
-#, c-format
-msgid "Downloaded Data (Session (Total)): %s"
-msgstr "本次下載量/總計下載量：%s"
-
-#: src/Statistics.cpp:683
-#, c-format
-msgid "Found Sources: %s"
-msgstr "找到的來源數：%s"
-
-#: src/Statistics.cpp:684
-#, c-format
-msgid "Active Downloads (chunks): %s"
-msgstr "目前下載數/區塊數：%s"
-
-#: src/Statistics.cpp:686
-#, c-format
-msgid "Session UL:DL Ratio (Total): %s"
-msgstr "本次上傳下載比率 (總計)：%s"
-
-#: src/Statistics.cpp:689
-#, c-format
-msgid "Average download rate (Session): %s"
-msgstr "本次平均下載速度：%s"
-
-#: src/Statistics.cpp:690
-#, c-format
-msgid "Average upload rate (Session): %s"
-msgstr "本次平均上傳速度：%s"
-
-#: src/Statistics.cpp:691
-#, c-format
-msgid "Max download rate (Session): %s"
-msgstr "本次最大下載速度：%s"
-
-#: src/Statistics.cpp:692
+#: src/ExternalConnector.cpp:142
 #, c-format
-msgid "Max upload rate (Session): %s"
-msgstr "本次最大上傳速度：%s"
+msgid "Unknown extension '%s' for the '%s' command.\n"
+msgstr "不明的副檔名 %s 傳給指令「 %s 」。\n"
 
-#: src/Statistics.cpp:693
+#: src/ExternalConnector.cpp:144
 #, c-format
-msgid "Reconnects: %i"
-msgstr "重新連線次數：%i"
+msgid "Unknown command '%s'.\n"
+msgstr "不明的指令「 %s 」。\n"
 
-#: src/Statistics.cpp:694
-#, c-format
-msgid "Time Since First Transfer: %s"
-msgstr "首次傳輸至今時間：%s"
+#: src/ExternalConnector.cpp:156
+msgid ""
+"\n"
+"This command cannot have an argument.\n"
+msgstr ""
+"\n"
+"這個指令不能有引數。\n"
 
-#: src/Statistics.cpp:695
-#, c-format
-msgid "Connected To Server Since: %s"
-msgstr "與伺服器連線時間：%s"
+#: src/ExternalConnector.cpp:158
+msgid ""
+"\n"
+"This command must have an argument.\n"
+msgstr ""
+"\n"
+"這個指令必須要有引數。\n"
 
-#: src/Statistics.cpp:696
-#, c-format
-msgid "Active Connections (estimate): %i"
-msgstr "目前連線數 (估計值)：%i"
+#: src/ExternalConnector.cpp:161
+msgid ""
+"\n"
+"This command is incomplete, you must use one of the extensions below.\n"
+msgstr ""
+"\n"
+"這個指令不完整，您必須使用以下其中一個副檔名。\n"
 
-#: src/Statistics.cpp:697
-#, c-format
-msgid "Max Connection Limit Reached: %s"
-msgstr "達到最大連線量次數：%s"
+#: src/ExternalConnector.cpp:167
+msgid ""
+"\n"
+"Available extensions:\n"
+msgstr ""
+"\n"
+"可用的副檔名：\n"
 
-#: src/Statistics.cpp:698
-#, c-format
-msgid "Average Connections (estimate): %g"
-msgstr "平均連線數 (估計值)：%g"
+#: src/ExternalConnector.cpp:169
+msgid "Available commands:\n"
+msgstr "可用的指令：\n"
 
-#: src/Statistics.cpp:700
+#: src/ExternalConnector.cpp:186
 #, c-format
-msgid "Peak Connections (estimate): %i"
-msgstr "最高連線數 (估計值)：%i"
-
-#: src/Statistics.cpp:702 src/TransferWnd.cpp:459 src/ClientListCtrl.cpp:257
-msgid "Clients"
-msgstr "客戶端"
+msgid ""
+"\n"
+"All commands are case insensitive.\n"
+"Type '%s <command>' to get detailed info on <command>.\n"
+msgstr ""
+"\n"
+"所有指令都不區分大小寫。\n"
+"輸入「 %s <指令> 」取得 <指令> 的詳細資訊。\n"
 
-#: src/Statistics.cpp:709
-msgid "Filtered"
-msgstr "已過濾"
+#: src/ExternalConnector.cpp:222 src/ExternalConnector.cpp:223
+msgid "Exits from the application."
+msgstr "離開程式。"
 
-#: src/Statistics.cpp:711
-#, c-format
-msgid "Total: %i Known: %i"
-msgstr "總計：%i  -  已知：%i"
+#: src/ExternalConnector.cpp:224
+msgid "Show help."
+msgstr "顯示幫助。"
 
-#: src/Statistics.cpp:715
-#, c-format
-msgid "Working Servers: %i"
-msgstr "有效：%i"
+#. TRANSLATORS:
+#. Do not translate the word 'help', it is a command to the program!
+#: src/ExternalConnector.cpp:227
+msgid ""
+"To get help on a command, type 'help <command>'.\n"
+"To get the full command list type 'help'.\n"
+msgstr ""
+"輸入「 help <指令> 」可顯示該指令的說明。\n"
+"輸入「 help 」可顯示所有指令一覽。\n"
 
-#: src/Statistics.cpp:716
+#: src/ExternalConnector.cpp:248
 #, c-format
-msgid "Failed Servers: %i"
-msgstr "無效：%i"
+msgid ""
+"\n"
+"Use '%s' for command list\n"
+"\n"
+msgstr ""
+"\n"
+"使用「 %s 」列出所有指令\n"
+"\n"
 
-#: src/Statistics.cpp:717
-#, c-format
-msgid "Total: %s"
-msgstr "總計：%s"
+#: src/ExternalConnector.cpp:278
+msgid "Syntax error!"
+msgstr "語法錯誤！"
 
-#: src/Statistics.cpp:718
-#, c-format
-msgid "Deleted Servers: %s"
-msgstr "已刪除：%s"
+#: src/ExternalConnector.cpp:281
+msgid "Error processing command - should never happen! Report bug, please\n"
+msgstr "處理指令時發生意外錯誤！請提出錯誤報告\n"
 
-#: src/Statistics.cpp:719
-#, c-format
-msgid "Filtered Servers: %s"
-msgstr "已過濾：%s"
+#: src/ExternalConnector.cpp:284
+msgid "This command should not have any parameters."
+msgstr "這個指令不能有參數。"
 
-#: src/Statistics.cpp:720
-#, c-format
-msgid "Users on Working Servers: %llu"
-msgstr "有效使用者數：%llu"
+#: src/ExternalConnector.cpp:287
+msgid "This command must have a parameter."
+msgstr "這個指令必須要有參數。"
 
-#: src/Statistics.cpp:721
-#, c-format
-msgid "Files on Working Servers: %llu"
-msgstr "有效檔案數：%llu"
+#: src/ExternalConnector.cpp:290
+msgid "Invalid argument."
+msgstr "無效的引數。"
 
-#: src/Statistics.cpp:722
-#, c-format
-msgid "Total Users: %llu"
-msgstr "使用者總數：%llu"
+#: src/ExternalConnector.cpp:293
+msgid "This is an incomplete command."
+msgstr "不完整的指令。"
 
-#: src/Statistics.cpp:723
+#: src/ExternalConnector.cpp:302
 #, c-format
-msgid "Total Files: %llu"
-msgstr "檔案總數：%llu"
+msgid "Type '%s' to get more help.\n"
+msgstr "輸入「 %s 」顯示更多協助資訊。\n"
 
-#: src/Statistics.cpp:724
+#: src/ExternalConnector.cpp:357
 #, c-format
-msgid "Server Occupation: %.2f%%"
-msgstr "伺服器使用率：%.2f%%"
+msgid "This is %s %s %s\n"
+msgstr "這是 %s %s %s\n"
 
-#: src/Statistics.cpp:728
+#: src/ExternalConnector.cpp:359
 #, c-format
-msgid "Number of Shared Files: %s"
-msgstr "檔案數：%s"
+msgid "This is %s %s\n"
+msgstr "這是 %s %s\n"
 
-#: src/Statistics.cpp:729
-#, c-format
-msgid "Total size of Shared Files: %s"
-msgstr "檔案總容量：%s"
+#: src/ExternalConnector.cpp:390
+msgid ""
+"\n"
+"Creating client...\n"
+msgstr ""
+"\n"
+"正在建立客戶端...\n"
 
-#: src/Statistics.cpp:731
+#: src/ExternalConnector.cpp:414
 #, c-format
-msgid "Average file size: %s"
-msgstr "平均檔案大小：%s"
-
-#: src/Statistics.cpp:872
-msgid "Operating System"
-msgstr "作業系統"
-
-#: src/Statistics.cpp:897
-msgid "Not Received"
-msgstr "未收到"
-
-#: src/MuleTextCtrl.cpp:79
-msgid "Cut"
-msgstr "剪下"
-
-#: src/MuleTextCtrl.cpp:81
-msgid "Paste"
-msgstr "貼上"
-
-#: src/MuleTextCtrl.cpp:86
-msgid "Select All"
-msgstr "全選"
-
-#: src/SearchList.cpp:292
-msgid "Kad search can't be done if Kad is not running"
-msgstr "Kad 網路尚未連線，無法使用 Kad 搜尋"
-
-#: src/SearchList.cpp:294
-msgid "eD2k search can't be done if eD2k is not connected"
-msgstr "eD2k 網路尚未連線，無法使用 eD2k 搜尋"
-
-#: src/SearchList.cpp:341
-msgid "Unexpected error while attempting Kad search: "
-msgstr "試圖 Kad 搜尋時發生無法預料的錯誤："
+msgid ""
+"\n"
+"Ok, exiting %s...\n"
+msgstr ""
+"\n"
+"OK，正在離開 %s...\n"
 
-#: src/ClientTCPSocket.cpp:801
-#, c-format
-msgid "Message filtered from '%s' (IP:%s)"
-msgstr "來自 '%s' (IP：%s) 的訊息被過濾掉了"
+#: src/ExternalConnector.cpp:420
+msgid ""
+"Cannot connect with an empty password.\n"
+"You must specify a password either in config file\n"
+"or on command-line, or enter one when asked.\n"
+"\n"
+"Exiting...\n"
+msgstr ""
+"不能使用空白密碼連線。\n"
+"您必須在設定檔或命令列中設定，\n"
+"或者在詢問時輸入。\n"
+"\n"
+"正在離開...\n"
 
-#: src/ClientTCPSocket.cpp:803
-#, c-format
-msgid "New message from '%s' (IP:%s)"
-msgstr "來自 '%s' (IP:%s) 的新訊息"
+#: src/ExternalConnector.cpp:429
+msgid "Show this help text."
+msgstr "顯示協助資訊。"
 
-#: src/ClientTCPSocket.cpp:821
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Accepted"
-msgstr "使用者 %s (%u) 要求您的分享檔案清單 -> 已接受"
+#: src/ExternalConnector.cpp:432
+msgid "Host where aMule is running. (default: localhost)"
+msgstr "執行 aMule 的主機。(預設：localhost)"
 
-#: src/ClientTCPSocket.cpp:842
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list -> Denied"
-msgstr "使用者 %s (%u) 要求您的分享檔案清單 -> 已拒絕"
+#: src/ExternalConnector.cpp:435
+msgid "aMule's port for External Connection. (default: 4712)"
+msgstr "aMule 的外部連線埠。 (預設：4712)"
 
-#: src/ClientTCPSocket.cpp:874
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Accepted"
-msgstr "使用者 %s (%u) 要求您的分享目錄清單 -> 接受"
+#: src/ExternalConnector.cpp:438
+msgid "External Connection password."
+msgstr "外部連線密碼。"
 
-#: src/ClientTCPSocket.cpp:914
-#, c-format
-msgid "User %s (%u) requested your shareddirectories-list -> Denied"
-msgstr "使用者 %s (%u) 要求您的分享目錄清單 -> 拒絕"
+#: src/ExternalConnector.cpp:441
+msgid "Read configuration from file."
+msgstr "從檔案讀取設定。"
 
-#: src/ClientTCPSocket.cpp:939
-#, c-format
-msgid ""
-"User %s (%u) requested your sharedfiles-list for directory %s -> accepted"
-msgstr "使用者 %s (%u) 要求目錄 %s 的分享檔案清單 -> 已接受"
+#: src/ExternalConnector.cpp:444
+msgid "Do not print any output to stdout."
+msgstr "不顯示任何輸出訊息。"
 
-#: src/ClientTCPSocket.cpp:976
-#, c-format
-msgid "User %s (%u) requested your sharedfiles-list for directory %s -> denied"
-msgstr "使用者 %s (%u) 要求目錄 %s 的分享檔案清單 -> 已拒絕"
+#: src/ExternalConnector.cpp:447
+msgid "Be verbose - show also debug messages."
+msgstr "詳細顯示除錯資訊。"
 
-#: src/ClientTCPSocket.cpp:995
-#, c-format
-msgid "User %s (%u) shares directory %s"
-msgstr "使用者 %s (%u) 分享的目錄 %s"
+#: src/ExternalConnector.cpp:450
+msgid "Sets program locale (language)."
+msgstr "設定程式的地區設定 (語言)。"
 
-#: src/ClientTCPSocket.cpp:1010
-#, c-format
-msgid "User %s (%u) sent unrequested shared dirs."
-msgstr "使用者 %s (%u) 傳送了未要求的分享目錄。"
+#: src/ExternalConnector.cpp:453
+msgid "Write command line options to config file."
+msgstr "把命令列選項寫入設定檔。"
 
-#: src/ClientTCPSocket.cpp:1025
-#, c-format
-msgid "User %s (%u) sent sharedfiles-list for directory %s"
-msgstr "使用者 %s (%u) 傳送了目錄 %s 內的分享檔案清單"
+#: src/ExternalConnector.cpp:456
+msgid "Creates config file based on aMule's config file."
+msgstr "使用 aMule 的設定檔建立新設定檔。"
 
-#: src/ClientTCPSocket.cpp:1032
-#, c-format
-msgid "User %s (%u) finished sending sharedfiles-list"
-msgstr "使用者 %s (%u) 已傳送分享檔案清單"
+#: src/ExternalConnector.cpp:459
+msgid "Print program version."
+msgstr "列出程式版本。"
 
-#: src/ClientTCPSocket.cpp:1037
-#, c-format
-msgid "User %s (%u) sent unwanted sharedfiles-list"
-msgstr "使用者 %s (%u) 傳送了未經要求的分享檔案清單"
+#: src/FileDetailDialog.cpp:60
+msgid "File Details"
+msgstr "檔案詳細資訊"
 
-#: src/ClientTCPSocket.cpp:1049
+#: src/FileDetailDialog.cpp:113
 #, c-format
-msgid "User %s (%u) denied access to shared directories/files list"
-msgstr "使用者 %s (%u) 拒絕傳送分享檔案/目錄清單"
+msgid "%.1f%% done"
+msgstr "完成 %.1f%%"
 
-#: src/KadDlg.cpp:132
+#: src/FileDetailDialog.cpp:115 src/utils/wxCas/src/wxcasframe.cpp:1144
+#: src/utils/wxCas/src/wxcasframe.cpp:1154
 #, c-format
-msgid "Nodes (%u)"
-msgstr "節點 (%u)"
-
-#: src/KadDlg.cpp:167
-msgid "Invalid ip to bootstrap"
-msgstr "無效 IP"
-
-#: src/KadDlg.cpp:173
-msgid "Invalid port to bootstrap"
-msgstr "無效的通訊埠"
-
-#: src/KadDlg.cpp:177
-msgid "Please fill all fields required"
-msgstr "請填寫所有必要資訊"
+msgid "%.2f kB/s"
+msgstr "%.2f KB/s"
 
-#: src/KadDlg.cpp:196
-msgid "Are you sure you want to download a new nodes.dat file?\n"
-msgstr "確定要下載新的 node.dat 檔案嗎？\n"
+#: src/FriendList.cpp:122
+msgid "Failed to open friend list file 'emfriends.met' for reading!"
+msgstr "無法開啟好友清單檔案 emfriends.met 供讀取！"
 
-#: src/KadDlg.cpp:197
-msgid ""
-"Doing so will remove your current nodes and restart Kademlia connection."
-msgstr "這樣將會刪除您現有節點並重新啓動 Kad 連線。"
+#: src/FriendList.cpp:148
+msgid "Failed to open friend list file 'emfriends.met' for writing!"
+msgstr "無法開啟好友清單檔案 emfriends.met 供寫入！"
 
-#: src/KadDlg.cpp:198
-msgid "Continue?"
-msgstr "繼續？"
+#: src/FriendList.cpp:248
+msgid "CRITICAL - no client on StartChatSession"
+msgstr "重大錯誤 - 開始交談時沒有客戶端"
 
-#: src/Logger.cpp:273
-msgid "ERROR: "
-msgstr "錯誤："
+#: src/FriendListCtrl.cpp:122 src/muuli_wdr.cpp:2833 src/muuli_wdr.cpp:3455
+msgid "Friends"
+msgstr "好友"
 
-#: src/Logger.cpp:273
-msgid "WARNING: "
-msgstr "警告："
+#: src/FriendListCtrl.cpp:126 src/GenericClientListCtrl.cpp:586
+msgid "Show &Details"
+msgstr "顯示詳細資訊(&D)"
 
-#: src/AddFriend.cpp:45
-msgid "Add a Friend"
+#: src/FriendListCtrl.cpp:130
+msgid "Add a friend"
 msgstr "加入好友"
 
-#: src/AddFriend.cpp:61
-msgid "You have to enter a valid IP and port!"
-msgstr "請輸入有效的 IP 位址和通訊埠！"
-
-#: src/AddFriend.cpp:61 src/AddFriend.cpp:67
-msgid "Information"
-msgstr "資訊"
-
-#: src/AddFriend.cpp:67
-msgid "The specified userhash is not valid!"
-msgstr "這個使用者雜湊值無效！"
-
-#: src/SearchListCtrl.cpp:89 src/DownloadListCtrl.cpp:195
-#: src/PartFile.cpp:3935 src/FileDetailListCtrl.cpp:44
-msgid "Sources"
-msgstr "來源"
-
-#: src/SearchListCtrl.cpp:578 src/ClientListCtrl.cpp:510
-#: src/ClientListCtrl.cpp:835
-msgid "File"
-msgstr "檔案"
-
-#: src/SearchListCtrl.cpp:579 src/muuli_wdr.cpp:370 src/muuli_wdr.cpp:1749
-#: src/muuli_wdr.cpp:2229
-msgid "Download"
-msgstr "下載"
-
-#: src/SearchListCtrl.cpp:581 src/DownloadListCtrl.cpp:945
-#: src/TransferWnd.cpp:336 src/muuli_wdr.cpp:243 src/CatDialog.cpp:60
-msgid "Category"
-msgstr "分類"
-
-#: src/SearchListCtrl.cpp:582 src/SearchDlg.cpp:647
-msgid "Main"
-msgstr "主要"
-
-#: src/SearchListCtrl.cpp:588
-msgid "Download in category"
-msgstr "分類下載"
-
-#: src/SearchListCtrl.cpp:594
-msgid "Search related files (eD2k, local server)"
-msgstr "搜尋相關檔案 (eD2k，本地伺服器)"
+#: src/FriendListCtrl.cpp:133
+msgid "Remove Friend"
+msgstr "移除好友"
 
-#: src/SearchListCtrl.cpp:599
-msgid "Mark as known file"
-msgstr "標記為已知檔案"
+#: src/FriendListCtrl.cpp:134
+msgid "Send &Message"
+msgstr "傳送訊息(&M)"
 
-#: src/amule-remote-gui.cpp:73
-msgid "Connect to remote amule"
-msgstr "連線到遠端 amule"
+#: src/FriendListCtrl.cpp:135 src/GenericClientListCtrl.cpp:597
+msgid "View Files"
+msgstr "檢視檔案"
 
-#: src/amule-remote-gui.cpp:289
-msgid "Connection failed "
-msgstr "無法連線"
+#: src/FriendListCtrl.cpp:136 src/GenericClientListCtrl.cpp:589
+msgid "Establish Friend Slot"
+msgstr "建立好友位置"
 
-#: src/amule-remote-gui.cpp:289 src/amule-remote-gui.cpp:310 src/amule.cpp:851
-#: src/amule.cpp:972 src/amule.cpp:1341
-msgid "ERROR"
-msgstr "錯誤"
+#: src/FriendListCtrl.cpp:169
+msgid "Are you sure that you wish to delete the selected friend?"
+msgstr "您確定要刪除這個好友嗎？"
 
-#: src/amule-remote-gui.cpp:309 src/ExternalConnector.cpp:404
-#, c-format
-msgid "Connection Failed. Unable to connect to %s:%d\n"
-msgstr "無法連線到 %s:%d\n"
+#: src/FriendListCtrl.cpp:171
+msgid "Are you sure that you wish to delete the selected friends?"
+msgstr "您確定要刪除這些好友嗎？"
 
-#: src/amule-remote-gui.cpp:484 src/amule.cpp:1078
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
 msgid ""
-"WARNING: You can't add yourself as a source for an eD2k link while having a "
-"lowid."
-msgstr "警告：LowID 時不可以將自己加入 eD2k 連結來源。"
-
-#: src/amule-remote-gui.cpp:580
-#, c-format
-msgid "Users: E: %s K: %s | Files E: %s K: %s"
-msgstr "使用者：E:%s K:%s | 檔案 E:%s K:%s"
-
-#: src/amule-remote-gui.cpp:638 src/TransferWnd.cpp:341
-msgid "All"
-msgstr "全部"
-
-#: src/amule-remote-gui.cpp:876
-#, c-format
-msgid "Total Users: %s | Total Files: %s"
-msgstr "使用者總數：%s | 檔案總數：%s"
-
-#: src/DownloadListCtrl.cpp:191 src/ClientListCtrl.cpp:513
-msgid "Transferred"
-msgstr "已傳輸"
-
-#: src/DownloadListCtrl.cpp:193 src/ClientListCtrl.cpp:512
-msgid "Speed"
-msgstr "速度"
-
-#: src/DownloadListCtrl.cpp:194
-msgid "Progress"
-msgstr "進度"
-
-#: src/DownloadListCtrl.cpp:197 src/PartFile.cpp:3937
-#: src/ClientListCtrl.cpp:516
-msgid "Status"
-msgstr "狀態"
-
-#: src/DownloadListCtrl.cpp:198
-msgid "Time Remaining"
-msgstr "剩餘時間"
-
-#: src/DownloadListCtrl.cpp:199
-msgid "Last Seen Complete"
-msgstr "最後看到完整檔案"
-
-#: src/DownloadListCtrl.cpp:200
-msgid "Last Reception"
-msgstr "最後一次下載"
-
-#: src/DownloadListCtrl.cpp:581
-msgid "Are you sure that you wish to delete the selected file?"
-msgstr "您確定要刪除這個檔案嗎？"
+"You are not allowed to set more than one friendslot.\n"
+" Only one slot was assigned."
+msgstr ""
+"不允許設定超過一個好友位置。\n"
+" 只設定了一個位置。"
 
-#: src/DownloadListCtrl.cpp:583
-msgid "Are you sure that you wish to delete the selected files?"
-msgstr "您確定要刪除這些檔案嗎？"
+#: src/FriendListCtrl.cpp:229 src/GenericClientListCtrl.cpp:530
+msgid "Multiple selection"
+msgstr "多重選取"
 
-#: src/DownloadListCtrl.cpp:845 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:547
 msgid "Send message to user"
 msgstr "傳送訊息給使用者"
 
-#: src/DownloadListCtrl.cpp:846 src/ClientListCtrl.cpp:365
+#: src/GenericClientListCtrl.cpp:548
 msgid "Message to send:"
 msgstr "傳送訊息："
 
-#: src/DownloadListCtrl.cpp:906 src/TransferWnd.cpp:377
-msgid "&Stop"
-msgstr "停止(&S)"
-
-#: src/DownloadListCtrl.cpp:907 src/TransferWnd.cpp:378
-msgid "&Pause"
-msgstr "暫停(&P)"
-
-#: src/DownloadListCtrl.cpp:908 src/TransferWnd.cpp:379
-msgid "&Resume"
-msgstr "續傳(&R)"
-
-#: src/DownloadListCtrl.cpp:909
-msgid "C&lear completed"
-msgstr "清除已完成的(&l)"
-
-#: src/DownloadListCtrl.cpp:914
-msgid "Swap every A4AF to this file now"
-msgstr "立即轉移所有 A4AF 到這個檔案"
-
-#: src/DownloadListCtrl.cpp:915
-msgid "Swap every A4AF to this file (Auto)"
-msgstr "自動轉移所有 A4AF 到這個檔案"
-
-#: src/DownloadListCtrl.cpp:919
-msgid "Swap every A4AF to any other file now"
-msgstr "立即轉移所有 A4AF 到其它檔案"
-
-#: src/DownloadListCtrl.cpp:921
-msgid "Extended Options"
-msgstr "擴充選項"
-
-#: src/DownloadListCtrl.cpp:931 src/DownloadListCtrl.cpp:990
-msgid "Preview"
-msgstr "預覽"
-
-#: src/DownloadListCtrl.cpp:932
-msgid "Show file &details"
-msgstr "顯示檔案詳細資訊(&D)"
-
-#: src/DownloadListCtrl.cpp:934 src/muuli_wdr.cpp:830
-msgid "Show all comments"
-msgstr "顯示所有註解"
-
-#: src/DownloadListCtrl.cpp:938
-msgid "Copy magnet URI to clipboard"
-msgstr "複製 magnet 網址到剪貼簿"
-
-#: src/DownloadListCtrl.cpp:949
-msgid "unassign"
-msgstr "取消"
-
-#: src/DownloadListCtrl.cpp:956
-msgid "Assign to category"
-msgstr "分類"
-
-#: src/DownloadListCtrl.cpp:993
-msgid "&Open the file"
-msgstr "開啟檔案(&O)"
-
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
+#: src/GenericClientListCtrl.cpp:587
 msgid "Remove from friends"
 msgstr "從好友中刪除"
 
-#: src/DownloadListCtrl.cpp:1014 src/ClientListCtrl.cpp:259
-msgid "Add to Friends"
-msgstr "加入好友"
-
-#: src/DownloadListCtrl.cpp:1016 src/ClientListCtrl.cpp:261
+#: src/GenericClientListCtrl.cpp:598
 msgid "Send message"
 msgstr "傳送訊息"
 
-#: src/DownloadListCtrl.cpp:1017
+#: src/GenericClientListCtrl.cpp:600
 msgid "Swap to this file"
 msgstr "轉移到這個檔案"
 
-#: src/DownloadListCtrl.cpp:1306 src/DownloadListCtrl.cpp:1609
-#: src/OtherFunctions.cpp:145 src/StatisticsDlg.cpp:100
-#: src/StatisticsDlg.cpp:102 src/muuli_wdr.cpp:1757 src/muuli_wdr.cpp:1770
-#: src/muuli_wdr.cpp:1783 src/muuli_wdr.cpp:2235 src/muuli_wdr.cpp:2244
-#: src/ClientListCtrl.cpp:639 src/ClientListCtrl.cpp:707
-msgid "kB/s"
-msgstr "KB/s"
-
-#: src/DownloadListCtrl.cpp:1429 src/DownloadListCtrl.cpp:1440
-msgid "%y/%m/%d %H:%M:%S"
-msgstr "%y/%m/%d %H:%M:%S"
-
-#: src/DownloadListCtrl.cpp:1657
+#: src/GenericClientListCtrl.cpp:943
 msgid "A4AF"
 msgstr "A4AF"
 
-#: src/DownloadListCtrl.cpp:1707
+#: src/GenericClientListCtrl.cpp:995
 #, c-format
-msgid "QR: %u (%i)"
+msgid "On Queue: %u (%i)"
 msgstr "QR：%u (%i)"
 
-#: src/DownloadListCtrl.cpp:1721
+#: src/GenericClientListCtrl.cpp:1005 src/GenericClientListCtrl.cpp:1034
 msgid "Asked for another file"
 msgstr "已要求其它檔案 (A4AF)"
 
-#: src/DownloadListCtrl.cpp:2070
-#, c-format
-msgid "Downloads (%i)"
-msgstr "下載 (%i)"
-
-#: src/DownloadListCtrl.cpp:2275
-msgid ""
-"To prevent this warning to show up in every preview,\n"
-"set your preferred video player in preferences (default is mplayer)."
-msgstr ""
-"請在偏好設定中設定影片播放器 (預設為 mplayer)，\n"
-"以避免此警告訊息繼續出現。"
-
-#: src/DownloadListCtrl.cpp:2276
-msgid "File preview"
-msgstr "檔案預覽"
-
-#: src/DownloadListCtrl.cpp:2320
-#, c-format
-msgid "ERROR: Failed to execute external media-player! Command: `%s'"
-msgstr "錯誤：無法執行媒體播放器！指令：'%s' "
-
-#: src/PartFile.cpp:290
-msgid "ERROR: Failed to create partfile)"
-msgstr "錯誤：無法建立暫存檔"
-
-#: src/PartFile.cpp:327
-#, c-format
-msgid "Trying to load backup of met-file from %s"
-msgstr "嘗試使用在 %s 的 met 設定檔備份檔"
-
-#: src/PartFile.cpp:334
-#, c-format
-msgid "ERROR: Failed to open part.met file: %s ==> %s"
-msgstr "錯誤：無法開啟 part.met 檔案：%s ==> %s"
-
-#: src/PartFile.cpp:340
-#, c-format
-msgid "ERROR: part.met file is 0 size: %s ==> %s"
-msgstr "錯誤：part.met 檔案大小為 0：%s ==> %s"
+#: src/GenericClientListCtrl.cpp:1024
+msgid "Waiting for upload slot"
+msgstr "正在等待上傳位置"
 
-#: src/PartFile.cpp:351
+#: src/GenericClientListCtrl.cpp:1026
 #, c-format
-msgid "ERROR: Invalid part.met fileversion: %s ==> %s"
-msgstr "錯誤：無效的 part.met 檔案版本：%s ==> %s"
-
-#: src/PartFile.cpp:601
-#, c-format
-msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
-msgstr "錯誤：%s (%s) 已經損壞 (識別索引錯誤)，無法載入。"
-
-#: src/PartFile.cpp:604
-msgid "Trying to recover file info..."
-msgstr "嘗試復原檔案資訊中..."
+msgid "On Queue: %u"
+msgstr "QR：%u"
 
-#: src/PartFile.cpp:619
-msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
-msgstr "嘗試復原無名檔案 - 將存爲 RecoveredFile.dat"
+#: src/GenericClientListCtrl.cpp:1029
+msgid "Uploading"
+msgstr "正在上傳"
 
-#: src/PartFile.cpp:624
-msgid "Recovered all available file info :D - Trying to use it..."
-msgstr "已復原所有檔案資訊 :D - 嘗試使用中..."
+#: src/GenericClientListCtrl.cpp:1031
+msgid "None"
+msgstr "無"
 
-#: src/PartFile.cpp:626
-msgid "Unable to recover file info :("
-msgstr "無法復原檔案資訊 :("
+#: src/GenericClientListCtrl.cpp:1089 src/ServerListCtrl.cpp:242
+msgid "No"
+msgstr "否"
 
-#: src/PartFile.cpp:660
-#, c-format
-msgid "Failed to open %s (%s)"
-msgstr "無法開啟 %s (%s)"
+#: src/GenericClientListCtrl.cpp:1091 src/ServerListCtrl.cpp:242
+msgid "Yes"
+msgstr "是"
 
-#: src/PartFile.cpp:708
-#, c-format
-msgid "WARNING: %s might be corrupted (%i)"
-msgstr "警告：%s 可能已經損壞 (%i)"
+#: src/HTTPDownload.cpp:57
+msgid "Downloading..."
+msgstr "正在下載..."
 
-#: src/PartFile.cpp:891 src/PartFile.cpp:896
-#, c-format
-msgid "ERROR while saving partfile: %s (%s ==> %s)"
-msgstr "儲存暫存檔時發生錯誤：%s (%s => %s)"
+#: src/HTTPDownload.cpp:109
+msgid "HTTP download cancelled"
+msgstr "已取消 HTTP 下載"
 
-#: src/PartFile.cpp:919
+#: src/HTTPDownload.cpp:205
 #, c-format
-msgid "Could not retrieve length of '%s' - using %s file."
-msgstr "無法取得 '%s' 的大小 - 使用 %s 檔案。"
+msgid "Unable to create destination file %s for download!"
+msgstr "無法建立要下載的目標檔案 %s ！"
 
-#: src/PartFile.cpp:927
-#, c-format
-msgid "'%s' is 0 size somehow - using %s file."
-msgstr "'%s' 檔案大小爲 0 - 使用 %s 檔案。"
+#: src/HTTPDownload.cpp:210
+msgid "The URL to download can't be empty"
+msgstr "要下載的網址不可空白"
 
-#: src/PartFile.cpp:998
+#: src/HTTPDownload.cpp:233
 #, c-format
-msgid "Failed to save part.met.seeds file for %s"
-msgstr "無法儲存 %s 的 part.met.seeds 檔案"
+msgid "The URL %s returned: %i - Error (%i)!"
+msgstr "網址 %s 傳回：%i - 錯誤 (%i)！"
 
-#: src/PartFile.cpp:1024
-#, c-format
-msgid "Saved %i source seed for partfile: %s (%s)"
-msgid_plural "Saved %i source seeds for partfile: %s (%s)"
-msgstr[0] "已儲存 %i 個來源種子給暫存檔 %s (%s)"
-msgstr[1] "已儲存 %i 個來源種子給暫存檔 %s (%s)"
+#: src/HTTPDownload.cpp:260
+msgid "Critical error while writing downloaded file"
+msgstr "寫入下載檔案時發生重大錯誤"
 
-#: src/PartFile.cpp:1053
+#: src/HTTPDownload.cpp:275
 #, c-format
-msgid "Partfile %s (%s) has no seeds file"
-msgstr "暫存檔 %s (%s) 沒有種子檔案"
+msgid "Downloaded %d bytes"
+msgstr "已下載 %d B"
 
-#: src/PartFile.cpp:1062
+#: src/HTTPDownload.cpp:279
 #, c-format
-msgid "Partfile %s (%s) has a void seeds file"
-msgstr "暫存檔 %s (%s) 的種子檔案沒有內容"
-
-#: src/PartFile.cpp:1118
-#, c-format
-msgid "Error reading partfile's seeds file (%s - %s): %s"
-msgstr "讀取暫存檔的種子檔案 (%s - %s) 時出錯：%s"
+msgid "Expected %d bytes, but downloaded %d bytes"
+msgstr "原預計 %d B，但實際下載了 %d B"
 
-#: src/PartFile.cpp:1136 src/PartFile.cpp:1164
-#, c-format
+#: src/HTTPDownload.cpp:336
 msgid ""
-"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
-"%s|"
-msgid_plural ""
-"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
-"|%s|"
-msgstr[0] ""
-"找到損壞 (%d) 的 %d 個暫存檔 %s - 檔案結果雜湊值 |%s| 檔案雜湊值 |%s|"
-msgstr[1] ""
-"找到損壞 (%d) 的 %d 個暫存檔 %s - 檔案結果雜湊值 |%s| 檔案雜湊值 |%s|"
+"Invalid URL for HTTP download or HTTP redirection (did you forget "
+"'http://' ?)"
+msgstr "無效的 HTTP 下載網址或 HTTP 轉址 (您是否忘了在前面加「http://」？"
+
+#: src/HTTPDownload.cpp:379
+msgid "Unable to connect to HTTP download server"
+msgstr "無法連線到 HTTP 下載伺服器"
+
+#: src/HTTPDownload.cpp:400
+msgid "Invalid response from HTTP download server"
+msgstr "HTTP 下載伺服器傳來無效的回應"
 
-#: src/PartFile.cpp:1181
-#, c-format
-msgid "Found completed part (%i) in %s"
-msgstr "找到已完成的暫存檔 %i 在 %s"
-
-#: src/PartFile.cpp:1218
-#, c-format
-msgid "Finished rehashing %s"
-msgstr "已完成的重新雜湊 %s"
-
-#: src/PartFile.cpp:2239
+#: src/IP2Country.cpp:100
 #, c-format
-msgid "Unexpected error while completing %s. File paused"
-msgstr "計算 %s 時發生意外的錯誤，暫停檔案處理"
+msgid "Download new GeoIP.dat from %s"
+msgstr "從 %s 下載新的 GeoIP.dat"
 
-#: src/PartFile.cpp:2266
-#, c-format
-msgid "Finished downloading: %s"
-msgstr "下載完成：%s"
+#: src/IP2Country.cpp:128
+msgid "Download of GeoIP.dat file failed, aborting update."
+msgstr "無法下載 GeoIP.dat，停止更新。"
 
-#: src/PartFile.cpp:2323
+#: src/IP2Country.cpp:134 src/IPFilter.cpp:500
 #, c-format
-msgid "Deleting file: %s"
-msgstr "正刪除檔案：%s "
+msgid "Failed to remove %s file, aborting update."
+msgstr "無法移除 %s 檔案，停止更新。"
 
-#: src/PartFile.cpp:2384
+#: src/IP2Country.cpp:140
 #, c-format
-msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
-msgstr "警告：無法雜湊已下載部份 - '%s' 的雜湊值組不完整"
+msgid "Failed to rename %s file, aborting update."
+msgstr "無法重新命名 %s 檔案，停止更新。"
 
-#: src/PartFile.cpp:2389
+#: src/IP2Country.cpp:146 src/IPFilter.cpp:506
 #, c-format
-msgid ""
-"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
-"never happen"
-msgstr "錯誤：無法雜湊已下載部分 - %s 的雜湊值組不完整，此狀況不該發生"
+msgid "Successfully updated %s"
+msgstr "成功更新 %s"
 
-#: src/PartFile.cpp:3086
-#, c-format
-msgid "WARNING: Not enough free disk-space! Pausing file: %s"
-msgstr "警告：磁碟可用空間不足！暫停檔案：%s "
+#: src/IP2Country.cpp:148
+msgid "Error updating GeoIP.dat"
+msgstr "GeoIP.dat 更新錯誤"
 
-#: src/PartFile.cpp:3171
+#: src/IP2Country.cpp:153 src/IPFilter.cpp:511 src/ServerList.cpp:858
 #, c-format
-msgid "Downloaded part %i is corrupt in file: %s"
-msgstr "已下載的部份 %i 已損壞 (檔案：%s)"
+msgid "Failed to download %s from %s"
+msgstr "無法下載 %s (從 %s)"
 
-#: src/PartFile.cpp:3214
+#: src/IP2Country.cpp:172
 #, c-format
-msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
-msgstr "ICH：已修復損壞的部份 %i (%s) -> 救回 %s B"
+msgid "Failed to load country data for '%s'."
+msgstr "無法自 %s 下載國家資料。"
 
-#: src/PartFile.cpp:3869
-msgid "Allocating"
-msgstr "正在分配"
-
-#: src/PartFile.cpp:3885
-msgid "Insufficient disk space"
-msgstr "磁碟空間不足"
-
-#: src/PartFile.cpp:3896 src/TransferWnd.cpp:352 src/OtherFunctions.cpp:701
-msgid "Stopped"
-msgstr "已停止"
-
-#: src/PartFile.cpp:3934
-msgid "Downloaded"
-msgstr "已下載"
-
-#: src/PartFile.cpp:4167
-#, c-format
-msgid "ERROR: Failed to open partfile '%s'"
-msgstr "錯誤：無法開啟暫存檔 '%s'"
-
-#: src/KnownFileList.cpp:79
-msgid "WARNING: known.met cannot be opened."
-msgstr "警告：無法開啟 known.met 。"
-
-#: src/KnownFileList.cpp:86
-msgid "WARNING: Knownfile list corrupted, contains invalid header."
-msgstr "警告：已知檔案清單損壞，內有無效標頭。"
+#: src/IPFilter.cpp:113
+msgid "Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+msgstr "正在載入 IP 過濾檔 ipfilter.dat 與 ipfilter_static.dat 。"
 
-#: src/KnownFileList.cpp:112
+#: src/IPFilter.cpp:299
 #, c-format
-msgid "IO error while reading known.met file: %s"
-msgstr "讀取 known.net 檔案時發生 IO 錯誤：%s"
+msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
+msgstr "無法載入 ipfilter.dat 檔案 %s，為不明格式。"
 
-#: src/KnownFileList.cpp:158
+#: src/IPFilter.cpp:325
 #, c-format
-msgid "Error while saving known.met file: %s"
-msgstr "儲存 known.met 時發生錯誤：%s"
+msgid "Failed to load ipfilter.dat file '%s', could not open file."
+msgstr "無法載入 ipfilter.dat 檔案 %s，無法開啟檔案。"
 
-#: src/SharedFileList.cpp:352
+#: src/IPFilter.cpp:329
 #, c-format
-msgid "Found %i known shared file"
-msgid_plural "Found %i known shared files"
-msgstr[0] "找到 %i 個已知的分享檔案"
-msgstr[1] "找到 %i 個已知的分享檔案"
+msgid "Loaded %u IP-range from '%s'."
+msgid_plural "Loaded %u IP-ranges from '%s'."
+msgstr[0] "已載入 %u 個 IP 區段 (從 %s )。"
 
-#: src/SharedFileList.cpp:358
+#: src/IPFilter.cpp:331
 #, c-format
-msgid "Found %i known shared file, %i unknown"
-msgid_plural "Found %i known shared files, %i unknown"
-msgstr[0] "發現 %i 個已知、%i 個不明的分享檔案"
-msgstr[1] "發現 %i 個已知、%i 個不明的分享檔案"
+msgid "%u malformed line was discarded."
+msgid_plural "%u malformed lines were discarded."
+msgstr[0] "放棄 %u 行錯誤資料。"
 
-#: src/SharedFileList.cpp:367
+#: src/IPFilter.cpp:503
 #, c-format
-msgid "ERROR: Attempted to share %s"
-msgstr "錯誤：試圖分享 %s"
+msgid "Failed to rename new %s file, aborting update."
+msgstr "無法重新命名新的 %s 檔案，停止更新。"
 
-#: src/CommentDialogLst.cpp:47 src/CommentDialog.cpp:34
-msgid "File Comments"
-msgstr "檔案註解"
+#: src/IPFilter.cpp:533
+msgid "IP filter is ready"
+msgstr "IP 過濾表已備妥"
 
-#: src/CommentDialogLst.cpp:57 src/ClientListCtrl.cpp:838
-msgid "Rating"
-msgstr "評價"
-
-#: src/CommentDialogLst.cpp:58
-msgid "Comment"
-msgstr "註解"
-
-#: src/CommentDialogLst.cpp:102 src/muuli_wdr.cpp:957
-msgid "No comments"
-msgstr "沒有註解"
-
-#: src/CommentDialogLst.cpp:104
-#, c-format
-msgid "%u comment"
-msgid_plural "%u comments"
-msgstr[0] "%u 個註解"
-msgstr[1] "%u 個註解"
-
-#: src/ServerConnect.cpp:69
+#: src/KadDlg.cpp:86
 msgid ""
-"Failed to connect to all obfuscated servers listed. Making another pass "
-"without obfuscation."
-msgstr "無法與清單中的模糊伺服器連線，嘗試不使用模糊協定。"
-
-#: src/ServerConnect.cpp:74
-msgid "Failed to connect to all servers listed. Making another pass."
-msgstr "無法與清單中的模糊伺服器連線，開始下一輪嘗試。"
-
-#: src/ServerConnect.cpp:88 src/ServerConnect.cpp:137
-msgid "eD2k network disabled on preferences, not connecting."
-msgstr "eD2k 網路已在偏好設定中被停用了，未連線。"
-
-#: src/ServerConnect.cpp:111 src/ServerConnect.cpp:124
-msgid "No valid servers to which to connect found in server list"
-msgstr "在伺服器清單中找不到有效的伺服器可連線"
-
-#: src/ServerConnect.cpp:187
-#, c-format
-msgid "Connected to %s (%s:%i)"
-msgstr "已連線到 %s (%s:%i)"
-
-#: src/ServerConnect.cpp:263
-#, c-format
-msgid "Connection established on: %s"
-msgstr "已連線到：%s"
-
-#: src/ServerConnect.cpp:335
-msgid "Fatal Error while trying to connect. Internet connection might be down"
-msgstr "連線時發生嚴重錯誤. Internet 連線可能有問題"
-
-#: src/ServerConnect.cpp:339
-#, c-format
-msgid "Lost connection to %s (%s:%i)"
-msgstr "已與 %s (%s:%i) 失去連斷"
-
-#: src/ServerConnect.cpp:349
-#, c-format
-msgid "%s (%s:%i) appears to be dead."
-msgstr "%s (%s:%i) 可能已當機。"
-
-#: src/ServerConnect.cpp:362
-#, c-format
-msgid "%s (%s:%i) appears to be full."
-msgstr "%s (%s:%i) 可能已客滿。"
+"Bootstrap from \n"
+"known clients"
+msgstr "從已知客戶端啓動"
 
-#: src/ServerConnect.cpp:381
+#: src/KadDlg.cpp:147
 #, c-format
-msgid "Automatic connection to server will retry in %d second"
-msgid_plural "Automatic connection to server will retry in %d seconds"
-msgstr[0] "在 %d 秒後自動連線到伺服器"
-msgstr[1] "在 %d 秒後自動連線到伺服器"
+msgid "Nodes (%u)"
+msgstr "節點 (%u)"
 
-#: src/ServerConnect.cpp:401
-msgid "Connection lost"
-msgstr "失去連線"
+#: src/KadDlg.cpp:182
+msgid "Invalid ip to bootstrap"
+msgstr "無效 IP"
 
-#: src/ServerConnect.cpp:408
-#, c-format
-msgid "Connecting to %s (%s:%i) failed."
-msgstr "無法連線到 %s (%s:%i)。"
+#: src/KadDlg.cpp:188
+msgid "Invalid port to bootstrap"
+msgstr "無效的通訊埠"
 
-#: src/ServerConnect.cpp:450
-msgid "ERROR: Socket invalid at timeout check"
-msgstr "錯誤：連接端點於逾時查驗時失效"
+#: src/KadDlg.cpp:192
+msgid "Please fill all fields required"
+msgstr "請填寫所有必要資訊"
 
-#: src/ServerConnect.cpp:460
-#, c-format
-msgid "Connection attempt to %s (%s:%i) timed out."
-msgstr "連線到 %s (%s:%i) 時逾時。"
+#: src/KadDlg.cpp:211
+msgid "Are you sure you want to download a new nodes.dat file?\n"
+msgstr "確定要下載新的 node.dat 檔案嗎？\n"
 
-#: src/DownloadQueue.cpp:154
+#: src/KadDlg.cpp:212
 msgid ""
-"ERROR: Failed to load backup file. Search http://forum.amule.org for .part."
-"met recovery solutions."
-msgstr ""
-"錯誤：無法載入備份檔案，請到 http://forum.amule.org 搜尋復原 .part.met 的方"
-"法。"
-
-#: src/DownloadQueue.cpp:169
-msgid "No part files found"
-msgstr "找不到暫存檔"
-
-#: src/DownloadQueue.cpp:171
-#, c-format
-msgid "Found %u part file"
-msgid_plural "Found %u part files"
-msgstr[0] "找到 %u 個暫存檔"
-msgstr[1] "找到 %u 個暫存檔"
-
-#: src/DownloadQueue.cpp:227 src/DownloadQueue.cpp:1365
-msgid "Filesystem for Temp directory cannot handle large files."
-msgstr "設定存放暫存檔的目錄，檔案系統不支援大容量檔案。"
-
-#: src/DownloadQueue.cpp:230 src/DownloadQueue.cpp:1368
-msgid "Filesystem for Incoming directory cannot handle large files."
-msgstr "設定存放新進檔案的目錄，檔案系統不支援大容量檔案。"
-
-#: src/DownloadQueue.cpp:339
-#, c-format
-msgid "Downloading %s"
-msgstr "正在下載 %s"
-
-#: src/DownloadQueue.cpp:347
-#, c-format
-msgid "You are already trying to download the file '%s'"
-msgstr "您已經在下載檔案 '%s'"
-
-#: src/DownloadQueue.cpp:359
-#, c-format
-msgid "You already have the file '%s'"
-msgstr "您已經有檔案 '%s'"
-
-#: src/DownloadQueue.cpp:364
-#, c-format
-msgid "You are already trying to download the file %s"
-msgstr "您已經在下載檔案 %s "
+"Doing so will remove your current nodes and restart Kademlia connection."
+msgstr "這樣將會刪除您現有節點並重新啓動 Kad 連線。"
 
-#: src/DownloadQueue.cpp:1299
-#, c-format
-msgid "Cannot convert magnet link to eD2k: %s"
-msgstr "無法將 magnet 連結轉換為 eD2k: %s"
+#: src/KadDlg.cpp:213
+msgid "Continue?"
+msgstr "繼續？"
 
-#: src/DownloadQueue.cpp:1307
-#, c-format
-msgid "Unknown protocol of link: %s"
-msgstr "有不明協定的連結：%s"
+#: src/kademlia/kademlia/SearchManager.cpp:128
+msgid "Kademlia: search keyword too short"
+msgstr "Kad：關鍵字太短"
 
-#: src/DownloadQueue.cpp:1328
+#: src/kademlia/kademlia/SearchManager.cpp:133
 #, c-format
-msgid "Invalid eD2k link! ERROR: %s"
-msgstr "無效的 eD2k 連結！錯誤：%s "
-
-#: src/TextClient.cpp:133
-msgid "Execute <str> and exit."
-msgstr "執行 <str> 後離開。"
+msgid "Keyword for search: %s"
+msgstr "搜尋的關鍵字：%s "
 
-#: src/TextClient.cpp:201
-msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
-msgstr "IP 格式無效。請使用 xxx.xxx.xxx.xxx:xxxx\n"
+#: src/kademlia/kademlia/SearchManager.cpp:141
+msgid "Kademlia: Search keyword is already on search list: "
+msgstr "Kad：關鍵字已在搜尋清單中："
 
-#: src/TextClient.cpp:309
+#: src/kademlia/routing/RoutingZone.cpp:172
 msgid ""
-"This command requires an argument. Valid arguments: 'all', filename, or a "
-"number.\n"
-msgstr "此指令需要引數，有效引數為：'all'、'檔案名' 或 '數字'。\n"
-
-#: src/TextClient.cpp:347
-msgid "Processing by hash: "
-msgstr "正在依雜湊值處理："
-
-#: src/TextClient.cpp:362
-msgid "Processing by filename: "
-msgstr "正在依檔名處理："
-
-#: src/TextClient.cpp:385
-msgid "This command requires an argument. Valid arguments: a file hash.\n"
-msgstr "此指令需要引數，有效引數為：'檔案雜湊值' 。\n"
-
-#: src/TextClient.cpp:411
-msgid "Not a valid number\n"
-msgstr "不是有效的數字\n"
+"Failed to read nodes.dat file - too old. This version (0) is not supported "
+"anymore."
+msgstr "無法讀取 nodes.dat 檔案 - 版本 (0) 太舊，已經不再支援了。"
 
-#: src/TextClient.cpp:415
-msgid "Not a valid hash (length should be exactly 32 chars)\n"
-msgstr "不是有效的雜湊值 (必須爲 32 個字元)\n"
-
-#: src/TextClient.cpp:631
-msgid "Operation was successful."
-msgstr "操作成功。"
-
-#: src/TextClient.cpp:637
-#, c-format
-msgid "Request failed with the following error: %s"
-msgstr "要求失敗，錯誤：%s"
-
-#: src/TextClient.cpp:653
+#: src/kademlia/routing/RoutingZone.cpp:210
+#: src/kademlia/routing/RoutingZone.cpp:285
 #, c-format
-msgid "IP filtering for clients is %s.\n"
-msgstr "對客戶端的 IP 過濾：%s 。\n"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "OFF"
-msgstr "關"
-
-#: src/TextClient.cpp:654 src/TextClient.cpp:660
-msgid "ON"
-msgstr "開"
+msgid "Read %u Kad contact"
+msgid_plural "Read %u Kad contacts"
+msgstr[0] "讀取 %u 個 Kad 聯絡人"
 
-#: src/TextClient.cpp:659
-#, c-format
-msgid "IP filtering for servers is %s.\n"
-msgstr "對伺服器的 IP 過濾：%s 。\n"
+#: src/kademlia/routing/RoutingZone.cpp:222
+#: src/kademlia/routing/RoutingZone.cpp:289
+msgid "No contacts found, please bootstrap, or download a nodes.dat file."
+msgstr "找不到聯絡人，請設啟動節點、或下載一個 nodes.dat 檔案。"
 
-#: src/TextClient.cpp:664
+#: src/kademlia/routing/RoutingZone.cpp:307
 #, c-format
-msgid "Current IPFilter Level is %d.\n"
-msgstr "目前的 IP 過濾等級：%d 。\n"
+msgid "Only %d Kad contact available, nodes.dat not written"
+msgid_plural "Only %d Kad contacts available, nodes.dat not written"
+msgstr[0] "只有 %d 個 Kad 聯絡人，nods.dat 未寫入"
 
-#: src/TextClient.cpp:671
+#: src/kademlia/routing/RoutingZone.cpp:338
 #, c-format
-msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
-msgstr "頻寬限制：上傳 %u KB/s、下載 %u KB/s 。\n"
+msgid "Wrote %d Kad contact"
+msgid_plural "Wrote %d Kad contacts"
+msgstr[0] "已寫入 %d 個 Kad 聯絡人"
 
-#: src/TextClient.cpp:688
-msgid "eD2k"
-msgstr "eD2k"
+#: src/KnownFile.cpp:1544 src/PartFileConvertDlg.cpp:91
+msgid "File name"
+msgstr "檔案名稱"
 
-#: src/TextClient.cpp:693
-#, c-format
-msgid "Connected to %s %s %s"
-msgstr "已連線到 %s %s %s"
+#: src/KnownFile.cpp:1545
+msgid "File size"
+msgstr "檔案大小"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with LowID"
-msgstr "有 LowID"
+#: src/KnownFile.cpp:1546
+msgid "Share ratio"
+msgstr "分享率"
 
-#: src/TextClient.cpp:696 src/amule.cpp:2100
-msgid "with HighID"
-msgstr "有 HighID"
+#: src/KnownFile.cpp:1547 src/SharedFilePeersListCtrl.cpp:31
+#: src/SourceListCtrl.cpp:31
+msgid "Uploaded"
+msgstr "已上傳"
 
-#: src/TextClient.cpp:699
-msgid "Now connecting"
-msgstr "正在連線"
+#: src/KnownFile.cpp:1548 src/muuli_wdr.cpp:3337
+msgid "Requested"
+msgstr "已要求"
 
-#: src/TextClient.cpp:701 src/TextClient.cpp:714 src/MuleTrayIcon.cpp:393
-#: src/MuleTrayIcon.cpp:407
-msgid "Not connected"
-msgstr "未連線"
+#: src/KnownFile.cpp:1549
+msgid "Accepted"
+msgstr "已接受"
 
-#: src/TextClient.cpp:723
-#, c-format
-msgid ""
-"\n"
-"Download:\t%s"
-msgstr ""
-"\n"
-"下載：\t%s"
+#: src/KnownFile.cpp:1551
+msgid "Complete sources"
+msgstr "完整來源"
 
-#: src/TextClient.cpp:726
-#, c-format
-msgid ""
-"\n"
-"Upload:\t%s"
-msgstr ""
-"\n"
-"上傳：\t%s"
+#: src/KnownFileList.cpp:92
+msgid "WARNING: Known file list corrupted, contains invalid header."
+msgstr "警告：已知檔案清單損壞，內有無效標頭。"
 
-#: src/TextClient.cpp:729
-#, c-format
-msgid ""
-"\n"
-"Clients in queue:\t%d\n"
-msgstr ""
-"\n"
-"等候區內人數：\t%d\n"
+#: src/KnownFileList.cpp:107
+msgid "Failed to load entry in known file list, file may be corrupt"
+msgstr "無法載入已知檔案清單內的項目，檔案可能有損壞"
 
-#: src/TextClient.cpp:732
-#, c-format
-msgid ""
-"\n"
-"Total sources:\t%d\n"
-msgstr ""
-"\n"
-"來源總數：\t%d\n"
+#: src/KnownFileList.cpp:114
+msgid "Invalid entry in known file list, file may be corrupt: "
+msgstr "已知檔案清單內有無效的項目，檔案可能有損壞："
 
-#: src/TextClient.cpp:809
+#: src/libs/common/Format.cpp:307
 #, c-format
-msgid "Number of search results: %i\n"
-msgstr "搜尋結果：%i\n"
+msgid "Unknown error %d"
+msgstr "不明的錯誤 %d"
 
-#: src/TextClient.cpp:822
-msgid "TODO - show progress of a search"
-msgstr "待辦事項 - 顯示搜尋進度"
-
-#: src/TextClient.cpp:828
+#: src/libs/common/Format.cpp:312 src/libs/common/Format.cpp:321
 #, c-format
-msgid "Received an unknown reply from the server, OpCode = %#x."
-msgstr "從伺服器收到不明的回應，指令碼是 %#x 。"
-
-#: src/TextClient.cpp:841
-msgid "Show short status information."
-msgstr "顯示簡短狀態資訊。"
-
-#: src/TextClient.cpp:842
-msgid "Show connection status, current up/download speeds, etc.\n"
-msgstr "顯示連線狀態、目前上傳下載速度等等。\n"
-
-#: src/TextClient.cpp:844
-msgid "Show full statistics tree."
-msgstr "顯示完整統計資料。"
-
-#: src/TextClient.cpp:845
-msgid ""
-"Optionally, a number in the range 0-255 can be passed as an argument to "
-"this\n"
-"command, which tells how many entries of the client version subtrees should "
-"be\n"
-"shown. Passing 0 or omitting it means 'unlimited'.\n"
-"\n"
-"Example: 'statistics 5' will show only the top 5 versions for each client "
-"type.\n"
-msgstr ""
-"可附加一個 0 到 255 之間的數字作爲此指令的引數， 以用來設定\n"
-"每種客戶端軟體各要顯示多少個版本數。設爲 0 表示全部顯示。\n"
-"\n"
-"例如：'statistics 5' 則每種客戶端軟體最多會顯示 5 個版本。\n"
-"\n"
-
-#: src/TextClient.cpp:847
-msgid "Shut down aMule."
-msgstr "關閉 aMule 。"
-
-#: src/TextClient.cpp:848
-msgid ""
-"Shut down the remote running core (amule/amuled).\n"
-"This will also shut down the text client, since it is unusable without a\n"
-"running core.\n"
-msgstr ""
-"關閉遠端執行中主程式 (amule 或 amuled)。\n"
-"這會導致文字模式客戶端程式因缺少執行核心而一起被關閉。\n"
-"\n"
-
-#: src/TextClient.cpp:850
-msgid "Reloads the given object."
-msgstr "重新載入指定的項目。"
-
-#: src/TextClient.cpp:851
-msgid "Reloads shared files list."
-msgstr "重新載入分享檔案清單。"
-
-#: src/TextClient.cpp:852
-msgid "Reloads IP Filter table from file."
-msgstr "重新從檔案載入 IP 過濾表。"
-
-#: src/TextClient.cpp:854
-msgid "Connect to the network."
-msgstr "連線到網路。"
-
-#: src/TextClient.cpp:855
-msgid ""
-"This will connect to all networks that are enabled in Preferences.\n"
-"You may also optionally specify a server address in IP:Port form, to connect "
-"to\n"
-"that server only. The IP must be a dotted decimal IPv4 address,\n"
-"or a resolvable DNS name."
-msgstr ""
-"這將連線到偏好設定中設定啓用的所有網路。\n"
-"您也可以用 'IP:Port'  格式指定要連線的伺服器。\n"
-"此位址必須是用句點隔開的十進位 IPv4 位址，\n"
-"或者是可以解析的 DNS 網域名稱。"
-
-#: src/TextClient.cpp:856
-msgid "Connect to eD2k only."
-msgstr "只連線到 eD2k 網路。"
-
-#: src/TextClient.cpp:857
-msgid "Connect to Kad only."
-msgstr "只連線到 Kad 網路。"
+msgid "Unable to get error description for error %d"
+msgstr "無法取得關於錯誤 %d 的說明"
 
-#: src/TextClient.cpp:859
-msgid "Disconnect from the network."
-msgstr "中斷網路連線。"
-
-#: src/TextClient.cpp:860
-msgid "This will disconnect from all networks that are currently connected.\n"
-msgstr "這將中斷目前所有已連線的網路。\n"
-
-#: src/TextClient.cpp:861
-msgid "Disconnect from eD2k only."
-msgstr "只中斷 eD2k 連線。"
-
-#: src/TextClient.cpp:862
-msgid "Disconnect from Kad only."
-msgstr "只中斷 Kad 連線。"
-
-#: src/TextClient.cpp:864
-msgid "Adds an eD2k or magnet link to core."
-msgstr "加入 eD2k 或 magnet 連結到主程式。"
-
-#: src/TextClient.cpp:865
-msgid ""
-"The eD2k link to be added can be:\n"
-"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
-"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
-"*) or a serverlist link, in which case all servers in the list will be added "
-"to the\n"
-"   server list.\n"
-"\n"
-"The magnet link must contain the eD2k hash and file length.\n"
-msgstr ""
-"加入的 eD2k 連結：\n"
-"*) 檔案連結 (ed2k://|file|...)：會被加入下載等候區。\n"
-"*) 伺服器連結 (ed2k://|server|...)：會被加入伺服器清單。\n"
-"*) 伺服器清單連結：裏面的所有伺服器都會被加入伺服器清單中。\n"
-"\n"
-"magnet 連結必須含有 eD2k 雜湊值與檔案大小資料。\n"
-
-#: src/TextClient.cpp:867
-msgid "Set a preference value."
-msgstr "設定參數值。"
-
-#: src/TextClient.cpp:870
-msgid "Set IPFilter preferences."
-msgstr "設定 IP 過濾參數。"
-
-#: src/TextClient.cpp:871
-msgid "Turn IP filtering on for both clients and servers."
-msgstr "開啓對客戶端和對伺服器 IP 過濾。"
-
-#: src/TextClient.cpp:872
-msgid "Turn IP filtering off for both clients and servers."
-msgstr "關閉對客戶端和對伺服器 IP 過濾。"
-
-#: src/TextClient.cpp:873
-msgid "Enable/Disable IP filtering for clients."
-msgstr "啓用/停用對客戶端 IP 過濾。"
-
-#: src/TextClient.cpp:874
-msgid "Turn IP filtering on for clients."
-msgstr "啟動對客戶端 IP 過濾。"
-
-#: src/TextClient.cpp:875
-msgid "Turn IP filtering off for clients."
-msgstr "停用對客戶端 IP 過濾。"
-
-#: src/TextClient.cpp:876
-msgid "Enable/Disable IP filtering for servers."
-msgstr "啓用/停用對伺服器 IP 過濾。"
-
-#: src/TextClient.cpp:877
-msgid "Turn IP filtering on for servers."
-msgstr "啓動對伺服器 IP 過濾。"
-
-#: src/TextClient.cpp:878
-msgid "Turn IP filtering off for servers."
-msgstr "停用對伺服器 IP 過濾。"
-
-#: src/TextClient.cpp:879
-msgid "Select IP filtering level."
-msgstr "選取 IP 過濾等級。"
-
-#: src/TextClient.cpp:880
-msgid ""
-"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
-"value is 127.\n"
-msgstr ""
-"有效的 IP 過濾等級是在 0 到 255 之間，\n"
-"初始預設值是 127。\n"
-
-#: src/TextClient.cpp:882
-msgid "Set bandwidth limits."
-msgstr "設定頻寬限制。"
-
-#: src/TextClient.cpp:883
-msgid "The value given to these commands has to be in kilobytes/sec.\n"
-msgstr "給此指令的的值，單位是 KB/s 。\n"
-
-#: src/TextClient.cpp:884
-msgid "Set upload bandwidth limit."
-msgstr "設定上傳頻寬限制。"
-
-#: src/TextClient.cpp:886
-msgid "Set download bandwidth limit."
-msgstr "設定下載頻寬限制。"
-
-#: src/TextClient.cpp:889
-msgid "Get and display a preference value."
-msgstr "取得並顯示偏好設定值。"
-
-#: src/TextClient.cpp:892
-msgid "Get IPFilter preferences."
-msgstr "取得 IP 過濾器設定。"
-
-#: src/TextClient.cpp:893
-msgid "Get IPFilter state for both clients and servers."
-msgstr "取得對客戶端和伺服器的 IP 過濾器狀態。"
-
-#: src/TextClient.cpp:894
-msgid "Get IPFilter state for clients only."
-msgstr "只取得對客戶端的 IP 過濾器狀態。"
-
-#: src/TextClient.cpp:895
-msgid "Get IPFilter state for servers only."
-msgstr "只取得對伺服器的 IP 過濾器狀態。"
-
-#: src/TextClient.cpp:896
-msgid "Get IPFilter level."
-msgstr "取得 IP 過濾等級。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:40 src/PartFile.cpp:3693
+msgid "Hashing"
+msgstr "正在計算 hash 值"
 
-#: src/TextClient.cpp:898
-msgid "Get bandwidth limits."
-msgstr "取得頻寬限制。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:44 src/PartFile.cpp:3699
+msgid "Completing"
+msgstr "正在完成"
 
-#: src/TextClient.cpp:900
-msgid "Makes a search."
-msgstr "開始搜尋。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:46 src/PartFile.cpp:3702
+msgid "Complete"
+msgstr "完成"
 
-#: src/TextClient.cpp:901
-msgid ""
-"A search type has to be specified by giving the type:\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"Example: 'search kad file' will execute a kad search for \"file\".\n"
-msgstr ""
-"搜尋類型必須為以下幾種之一：\n"
-"    GLOBAL\n"
-"    LOCAL\n"
-"    KAD\n"
-"\n"
-"例如： 'search kad 檔案' 將在 Kad 網路搜尋 \"檔案\"。\n"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:48 src/OtherFunctions.cpp:678
+#: src/PartFile.cpp:3705 src/TransferWnd.cpp:350
+msgid "Paused"
+msgstr "已暫停"
 
-#: src/TextClient.cpp:902
-msgid "Executes a global search."
-msgstr "執行全球搜尋。"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:50 src/OtherFunctions.cpp:677
+#: src/PartFile.cpp:3708 src/TransferWnd.cpp:349
+msgid "Erroneous"
+msgstr "錯誤的"
 
-#: src/TextClient.cpp:903
-msgid "Executes a local search"
-msgstr "執行本地搜尋"
+#: src/libs/ec/cpp/ECSpecialTags.cpp:55 src/OtherFunctions.cpp:675
+#: src/PartFile.cpp:3717 src/TransferWnd.cpp:347
+msgid "Waiting"
+msgstr "正在等候"
 
-#: src/TextClient.cpp:904
-msgid "Executes a kad search"
-msgstr "執行 Kad 搜尋"
+#: src/libs/ec/cpp/RemoteConnect.cpp:118 src/libs/ec/cpp/RemoteConnect.cpp:126
+msgid "You must specify a non-empty password."
+msgstr "您必須輸入密碼。"
 
-#: src/TextClient.cpp:906
-msgid "Shows the results of the last search."
-msgstr "顯示上一次的搜尋結果。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:123
+msgid "Invalid password, not a MD5 hash!"
+msgstr "無效的密碼，不是 MD5 hash 值！"
 
-#: src/TextClient.cpp:907
-msgid "Returns the results of the previous search.\n"
-msgstr "傳回前幾次的搜尋結果。\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:184
+msgid "Connection failure"
+msgstr "無法連線"
 
-#: src/TextClient.cpp:909
-msgid "Shows the progress of a search."
-msgstr "顯示搜尋進度。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:244
+msgid "EC connection failed. Empty reply."
+msgstr "無法外部連線，無回應。"
 
-#: src/TextClient.cpp:910
-msgid "Shows the progress of a search.\n"
-msgstr "顯示搜尋進度。\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:255
+msgid "External Connection: Bad reply, handshake failed. Connection closed."
+msgstr "外部連線：回應不正確、訊號交換失敗，已關閉連線。"
 
-#: src/TextClient.cpp:912
-msgid "Start downloading a file"
-msgstr "開始下載檔案"
+#: src/libs/ec/cpp/RemoteConnect.cpp:263
+msgid "Succeeded! Connection established to aMule "
+msgstr "已成功連線到 aMule "
 
-#: src/TextClient.cpp:913
-msgid ""
-"The number of a file from the last search has to be given.\n"
-"Example: 'download 12' will start to download the file with the number 12 of "
-"the previous search.\n"
-msgstr ""
-"必須指定檔案在過去搜尋中的編號。\n"
-"例如：'download 12' 將會下載過去搜尋結果中編號 12 號的檔案。\n"
+#: src/libs/ec/cpp/RemoteConnect.cpp:266
+msgid "Succeeded! Connection established."
+msgstr "連線成功。"
 
-#: src/TextClient.cpp:920
-msgid "Pause download."
-msgstr "暫停下載。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:272
+msgid "External Connection: Access denied because: "
+msgstr "外部連線：拒絕存取，原因："
 
-#: src/TextClient.cpp:923
-msgid "Resume download."
-msgstr "繼續下載。"
+#: src/libs/ec/cpp/RemoteConnect.cpp:275
+msgid "External Connection: Handshake failed."
+msgstr "外部連線：訊號交換失敗"
+
+#: src/ListenSocket.cpp:65
+msgid "ListenSocket: Ok."
+msgstr "監聽連接端點：OK。"
 
-#: src/TextClient.cpp:926
-msgid "Cancel download."
-msgstr "取消下載。"
+#: src/ListenSocket.cpp:67
+msgid "ERROR: Could not listen to TCP port."
+msgstr "錯誤：無法監聽 TCP 埠。"
 
-#: src/TextClient.cpp:929
-msgid "Set download priority."
-msgstr "設定下載優先等級。"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "ERROR: "
+msgstr "錯誤："
 
-#: src/TextClient.cpp:930
-msgid "Set priority of a download to Low, Normal, High or Auto.\n"
-msgstr "設定下載優先等級爲：低、普通、高或自動。\n"
+#: src/Logger.cpp:305 src/Logger.cpp:328
+msgid "WARNING: "
+msgstr "警告："
 
-#: src/TextClient.cpp:931
-msgid "Set priority to low."
-msgstr "設爲低優先等級。"
+#: src/MuleNotebook.cpp:167 src/muuli_wdr.cpp:901 src/muuli_wdr.cpp:1430
+#: src/muuli_wdr.cpp:3232 src/muuli_wdr.cpp:3502
+msgid "Close"
+msgstr "關閉"
 
-#: src/TextClient.cpp:932
-msgid "Set priority to normal."
-msgstr "設爲普通優先等級。"
+#: src/MuleTextCtrl.cpp:79
+msgid "Cut"
+msgstr "剪下"
 
-#: src/TextClient.cpp:933
-msgid "Set priority to high."
-msgstr "設爲高優先等級。"
+#: src/MuleTextCtrl.cpp:80 src/PartFileConvert.cpp:393
+#: src/utils/aLinkCreator/src/alcframe.cpp:266
+msgid "Copy"
+msgstr "複製"
 
-#: src/TextClient.cpp:934
-msgid "Set priority to auto."
-msgstr "設爲自動優先等級。"
+#: src/MuleTextCtrl.cpp:81
+msgid "Paste"
+msgstr "貼上"
 
-#: src/TextClient.cpp:936
-msgid "Show queues/lists."
-msgstr "顯示等候區/清單。"
+#: src/MuleTextCtrl.cpp:82 src/muuli_wdr.cpp:385 src/muuli_wdr.cpp:832
+#: src/utils/aLinkCreator/src/alcframe.cpp:155
+msgid "Clear"
+msgstr "清除"
 
-#: src/TextClient.cpp:937
-msgid "Shows upload/download queue, server list or shared files list.\n"
-msgstr "顯示上傳/下載等候區，伺服器清單或分享檔案清單。\n"
+#: src/MuleTextCtrl.cpp:86
+msgid "Select All"
+msgstr "全選"
 
-#: src/TextClient.cpp:938
-msgid "Show upload queue."
-msgstr "顯示上傳等候區。"
+#: src/MuleTrayIcon.cpp:82 src/MuleTrayIcon.cpp:464 src/MuleTrayIcon.cpp:485
+#: src/muuli_wdr.cpp:1576 src/muuli_wdr.cpp:1585 src/muuli_wdr.cpp:1594
+#: src/muuli_wdr.cpp:1941 src/muuli_wdr.cpp:1950 src/OtherFunctions.cpp:139
+#: src/StatisticsDlg.cpp:101 src/StatisticsDlg.cpp:103
+msgid "kB/s"
+msgstr "KB/s"
 
-#: src/TextClient.cpp:939
-msgid "Show download queue."
-msgstr "顯示下載等候區。"
+#: src/MuleTrayIcon.cpp:98 src/MuleTrayIcon.cpp:124 src/MuleTrayIcon.cpp:451
+#: src/MuleTrayIcon.cpp:472
+msgid "Unlimited"
+msgstr "無限制"
 
-#: src/TextClient.cpp:940
-msgid "Show log."
-msgstr "顯示記錄。"
+#: src/MuleTrayIcon.cpp:290
+msgid "aMule Tray Menu"
+msgstr "aMule 狀態列選單"
 
-#: src/TextClient.cpp:941
-msgid "Show servers list."
-msgstr "顯示伺服器清單。"
+#: src/MuleTrayIcon.cpp:296
+msgid "Speed limits:"
+msgstr "速度限制："
 
-#: src/TextClient.cpp:944
-msgid "Reset log."
-msgstr "清除記錄。"
+#: src/MuleTrayIcon.cpp:301
+msgid "UL: None"
+msgstr "上傳：無"
 
-#: src/TextClient.cpp:951
+#: src/MuleTrayIcon.cpp:304
 #, c-format
-msgid "Deprecated command, use '%s' instead."
-msgstr "已停用的指令，請改用 '%s' 。"
+msgid "UL: %u"
+msgstr "上傳：%u"
 
-#: src/TextClient.cpp:952
-#, c-format
-msgid ""
-"This is a deprecated command, and may be removed in the future.\n"
-"Use '%s' instead.\n"
-msgstr ""
-"這是一個已停用的指令，將來可能被刪除，\n"
-"請改用 '%s'。\n"
+#: src/MuleTrayIcon.cpp:311
+msgid "DL: None"
+msgstr "下載：無"
 
-#: src/ServerSocket.cpp:259
+#: src/MuleTrayIcon.cpp:314
 #, c-format
-msgid "ERROR: %s (%s) - %s"
-msgstr "錯誤：%s (%s) - %s"
+msgid "DL: %u"
+msgstr "下載：%u"
 
-#: src/ServerSocket.cpp:274
+#: src/MuleTrayIcon.cpp:318
 #, c-format
-msgid "WARNING: %s (%s) - %s"
-msgstr "警告：%s (%s) - %s"
+msgid "Download speed: %.1f"
+msgstr "下載速度：%.1f"
 
-#: src/ServerSocket.cpp:417
+#: src/MuleTrayIcon.cpp:320
 #, c-format
-msgid "New clientid is %u"
-msgstr "新客戶端 ID：%u"
-
-#: src/ServerSocket.cpp:419
-msgid "WARNING: You have received Low-ID!"
-msgstr "警告：您現在是 Low-ID！"
-
-#: src/ServerSocket.cpp:420
-msgid "\tMost likely this is because you're behind a firewall or router."
-msgstr "\t可能是因爲您受防火牆或路由器影響。"
-
-#: src/ServerSocket.cpp:421
-msgid "\tFor more information, please refer to http://wiki.amule.org"
-msgstr "\t請參考 http://wiki.amule.org 的資訊"
+msgid "Upload speed: %.1f"
+msgstr "上傳速度：%.1f"
 
-#: src/ServerSocket.cpp:478
-msgid "Unknown server info received! - too short"
-msgstr "收到不明伺服器資訊 ! - 長度過短"
+#: src/MuleTrayIcon.cpp:326
+msgid "Client Information"
+msgstr "客戶端資訊"
 
-#: src/ServerSocket.cpp:539
+#: src/MuleTrayIcon.cpp:330
 #, c-format
-msgid "Received %d new server"
-msgid_plural "Received %d new servers"
-msgstr[0] "收到 %d 個新伺服器"
-msgstr[1] "收到 %d 個新伺服器"
-
-#: src/ServerSocket.cpp:542
-msgid "Saving of server-list completed."
-msgstr "伺服器清單儲存完畢。"
-
-#: src/ServerSocket.cpp:593
-msgid "Server rejected last command"
-msgstr "伺服器已拒絕上一個指令"
+msgid "Nickname: %s"
+msgstr "暱稱：%s"
 
-#: src/ServerSocket.cpp:603 src/ServerSocket.cpp:605
-#, c-format
-msgid "Bogus packet received from server: %s"
-msgstr "從伺服器收到偽裝封包：%s"
+#: src/MuleTrayIcon.cpp:330
+msgid "No Nickname Selected!"
+msgstr "未選取暱稱！"
 
-#: src/ServerSocket.cpp:607
-#, c-format
-msgid "Unhandled error while processing packet from server: %s"
-msgstr "處理伺服器傳來的封包時發生無法處理的錯誤：%s "
+#: src/MuleTrayIcon.cpp:337
+msgid "ClientID: "
+msgstr "客戶端 ID："
 
-#: src/ServerSocket.cpp:646 src/ServerSocket.cpp:650
-#, c-format
-msgid "Cannot create DNS solving thread for connecting to %s"
-msgstr "無法送出 DNS 解析執行緒以連線到 %s"
+#: src/MuleTrayIcon.cpp:342 src/MuleTrayIcon.cpp:356 src/TextClient.cpp:712
+#: src/TextClient.cpp:725
+msgid "Not connected"
+msgstr "未連線"
 
-#: src/ServerSocket.cpp:729
-#, c-format
-msgid "Server IP %s (%s) is filtered.  Not connecting."
-msgstr "伺服器 IP %s (%s) 已被過濾。未連線。"
+#: src/MuleTrayIcon.cpp:349
+msgid "ServerName: "
+msgstr "伺服器名稱："
 
-#: src/ServerSocket.cpp:739
-msgid "using protocol obfuscation."
-msgstr "，使用模糊協定。"
+#: src/MuleTrayIcon.cpp:350
+msgid "ServerIP: "
+msgstr "伺服器 IP："
 
-#: src/ServerSocket.cpp:748
-#, c-format
-msgid "Connecting to %s (%s - %s:%i) %s"
-msgstr "正在連線到 %s (%s - %s:%i) %s"
+#: src/MuleTrayIcon.cpp:357 src/ServerWnd.cpp:187
+#: src/utils/wxCas/src/onlinesig.cpp:272
+msgid "Not Connected"
+msgstr "未連線"
 
-#: src/ServerSocket.cpp:760
+#: src/MuleTrayIcon.cpp:365
 #, c-format
-msgid "Could not solve dns for server %s: Unable to connect!"
-msgstr "無法解析伺服器 %s 的 DNS 資訊：無法連線！"
-
-#: src/IP2Country.cpp:100
-msgid "CIP2Country::CIP2Country(): Failed to load country data from "
-msgstr "CIP2Country::CIP2Country()：無法載入國家資訊"
+msgid "IP: %s"
+msgstr "IP：%s"
 
-#: src/IP2Country.cpp:105
+#: src/MuleTrayIcon.cpp:374
 #, c-format
-msgid "Loaded %d flag bitmap."
-msgid_plural "Loaded %d flag bitmaps."
-msgstr[0] "已載入 %d 個國旗圖片。"
-msgstr[1] "已載入 %d 個國旗圖片。"
-
-#: src/TransferWnd.cpp:194
-msgid "Are you sure you wish to cancel and delete all files in this category?"
-msgstr "您確定要移除此分類中的所有檔案嗎？"
-
-#: src/TransferWnd.cpp:194
-msgid "Confirmation Required"
-msgstr "需要確認"
-
-#: src/TransferWnd.cpp:342
-msgid "All others"
-msgstr "其它"
-
-#: src/TransferWnd.cpp:346 src/OtherFunctions.cpp:695
-msgid "Incomplete"
-msgstr "不完整"
-
-#: src/TransferWnd.cpp:353 src/OtherFunctions.cpp:708
-msgid "Active"
-msgstr "啟動"
-
-#: src/TransferWnd.cpp:357 src/OtherFunctions.cpp:702
-msgid "Video"
-msgstr "影片"
-
-#: src/TransferWnd.cpp:358 src/OtherFunctions.cpp:222
-#: src/OtherFunctions.cpp:703 src/muuli_wdr.cpp:230
-msgid "Audio"
-msgstr "音樂"
-
-#: src/TransferWnd.cpp:359 src/OtherFunctions.cpp:704
-msgid "Archive"
-msgstr "壓縮檔"
-
-#: src/TransferWnd.cpp:360 src/OtherFunctions.cpp:236
-#: src/OtherFunctions.cpp:705 src/muuli_wdr.cpp:231
-msgid "CD-Images"
-msgstr "光碟映像"
-
-#: src/TransferWnd.cpp:361 src/OtherFunctions.cpp:243
-#: src/OtherFunctions.cpp:706 src/muuli_wdr.cpp:232
-msgid "Pictures"
-msgstr "圖片"
-
-#: src/TransferWnd.cpp:362 src/OtherFunctions.cpp:707
-msgid "Text"
-msgstr "文件"
-
-#: src/TransferWnd.cpp:364
-msgid "Select view filter"
-msgstr "選取顯示過濾"
-
-#: src/TransferWnd.cpp:367
-msgid "Add category"
-msgstr "加入分類"
-
-#: src/TransferWnd.cpp:370
-msgid "Edit category"
-msgstr "編輯分類"
-
-#: src/TransferWnd.cpp:371
-msgid "Remove category"
-msgstr "移除分類"
-
-#: src/KnownFile.cpp:1359 src/PartFileConvertDlg.cpp:93
-msgid "File name"
-msgstr "檔案名稱"
-
-#: src/KnownFile.cpp:1360
-msgid "File size"
-msgstr "檔案大小"
-
-#: src/KnownFile.cpp:1361
-msgid "Share ratio"
-msgstr "分享率"
-
-#: src/KnownFile.cpp:1362
-msgid "Uploaded"
-msgstr "已上傳"
-
-#: src/KnownFile.cpp:1363
-msgid "Requested"
-msgstr "已要求"
-
-#: src/KnownFile.cpp:1364
-msgid "Accepted"
-msgstr "已接受"
+msgid "TCP port: %d"
+msgstr "TCP 埠：%d"
 
-#: src/KnownFile.cpp:1365
-msgid "Complete sources"
-msgstr "完整來源"
+#: src/MuleTrayIcon.cpp:376
+msgid "TCP port: Not ready"
+msgstr "TCP 埠：尚未就緒"
 
-#: src/PartFileConvert.cpp:208
+#: src/MuleTrayIcon.cpp:385
 #, c-format
-msgid "Importing %s: %s"
-msgstr "正在匯入 %s：%s"
+msgid "UDP port: %d"
+msgstr "UDP 埠：%d"
 
-#: src/PartFileConvert.cpp:239
-msgid "Reading temp folder"
-msgstr "正在讀取暫存資料夾"
+#: src/MuleTrayIcon.cpp:387
+msgid "UDP port: Not ready"
+msgstr "UDP 埠：尚未就緒"
 
-#: src/PartFileConvert.cpp:243
-msgid "Retrieving basic information from download info file"
-msgstr "正在從下載資訊檔取得基本資訊"
+#: src/MuleTrayIcon.cpp:396
+msgid "Online Signature: Enabled"
+msgstr "線上簽名識別：啟用"
 
-#: src/PartFileConvert.cpp:322
-msgid "Creating destination file"
-msgstr "建立目標檔案"
+#: src/MuleTrayIcon.cpp:399
+msgid "Online Signature: Disabled"
+msgstr "線上簽名識別：停用"
 
-#: src/PartFileConvert.cpp:331
+#: src/MuleTrayIcon.cpp:406 src/Statistics.cpp:727
 #, c-format
-msgid "Loading data from old download file (%u of %u)"
-msgstr "從舊下載檔案載入資料 (%u / %u)"
+msgid "Uptime: %s"
+msgstr "已執行時間：%s"
 
-#: src/PartFileConvert.cpp:351
+#: src/MuleTrayIcon.cpp:412
 #, c-format
-msgid "Saving data block into new single download file (%u of %u)"
-msgstr "正在將資料區塊儲存到新的單一下載檔案 (%u / %u)"
-
-#: src/PartFileConvert.cpp:418
-msgid "Retrieving source downloadfile information"
-msgstr "正在取得來源下載檔案資訊"
-
-#: src/PartFileConvert.cpp:443
-msgid "Adding download and saving new partfile"
-msgstr "正在加入下載和儲存新暫存檔"
-
-#: src/PartFileConvertDlg.cpp:86
-msgid "Import partfiles"
-msgstr "匯入暫存檔"
-
-#: src/PartFileConvertDlg.cpp:94
-msgid "State"
-msgstr "狀態"
-
-#: src/PartFileConvertDlg.cpp:96
-msgid "Filehash"
-msgstr "檔案雜湊值"
-
-#: src/PartFileConvertDlg.cpp:152 src/muuli_wdr.cpp:3523
-msgid "Waiting..."
-msgstr "等候中..."
+msgid "Shared files: %d"
+msgstr "已分享檔案：%d"
 
-#: src/PartFileConvertDlg.cpp:176
+#: src/MuleTrayIcon.cpp:418
 #, c-format
-msgid "%s (Disk: %s)"
-msgstr "%s (磁碟：%s)"
-
-#: src/PartFileConvertDlg.cpp:202
-msgid ""
-"Please choose a folder to search for temporary downloads! (subfolders will "
-"be included)"
-msgstr "請選擇要搜尋暫存檔的資料夾！ (底下的子資料夾將一併處理)"
-
-#: src/PartFileConvertDlg.cpp:206
-msgid ""
-"Do you want the source files of succesfully imported downloads be deleted?"
-msgstr "要刪除已成功匯入下載的來源檔嗎？"
-
-#: src/PartFileConvertDlg.cpp:207
-msgid "Remove sources?"
-msgstr "刪除來源？"
-
-#: src/OtherFunctions.cpp:112
-msgid "byte"
-msgid_plural "bytes"
-msgstr[0] "B"
-msgstr[1] "B"
-
-#: src/OtherFunctions.cpp:114
-msgid "kB"
-msgstr "KB"
-
-#: src/OtherFunctions.cpp:116 src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
-#: src/muuli_wdr.cpp:2072
-msgid "MB"
-msgstr "MB"
-
-#: src/OtherFunctions.cpp:118 src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295
-msgid "GB"
-msgstr "GB"
-
-#: src/OtherFunctions.cpp:120
-msgid "TB"
-msgstr "TB"
-
-#: src/OtherFunctions.cpp:130
-msgid "k"
-msgstr "K"
-
-#: src/OtherFunctions.cpp:132
-msgid "M"
-msgstr "M"
-
-#: src/OtherFunctions.cpp:134
-msgid "G"
-msgstr "G"
-
-#: src/OtherFunctions.cpp:136
-msgid "T"
-msgstr "T"
-
-#: src/OtherFunctions.cpp:143
-msgid "byte/sec"
-msgid_plural "bytes/sec"
-msgstr[0] "B/s"
-msgstr[1] "B/s"
-
-#: src/OtherFunctions.cpp:147
-msgid "MB/s"
-msgstr "MB/s"
-
-#: src/OtherFunctions.cpp:158 src/OtherFunctions.cpp:162
-msgid "secs"
-msgstr "秒"
-
-#: src/OtherFunctions.cpp:170
-msgid "mins"
-msgstr "分"
-
-#: src/OtherFunctions.cpp:177 src/OtherFunctions.cpp:187
-msgid "hours"
-msgstr "時"
-
-#: src/OtherFunctions.cpp:185
-msgid "Days"
-msgstr "日"
-
-#: src/OtherFunctions.cpp:215 src/muuli_wdr.cpp:235
-msgid "Videos"
-msgstr "影片"
-
-#: src/OtherFunctions.cpp:229 src/muuli_wdr.cpp:229
-msgid "Archives"
-msgstr "壓縮檔"
-
-#: src/OtherFunctions.cpp:250 src/muuli_wdr.cpp:234
-msgid "Texts"
-msgstr "文件"
-
-#: src/OtherFunctions.cpp:257 src/muuli_wdr.cpp:233
-msgid "Programs"
-msgstr "程式"
-
-#: src/OtherFunctions.cpp:264 src/muuli_wdr.cpp:228
-msgid "Any"
-msgstr "任何"
-
-#: src/OtherFunctions.cpp:284 src/OtherFunctions.cpp:290 src/muuli_wdr.cpp:910
-msgid "Not rated"
-msgstr "未評價"
-
-#: src/OtherFunctions.cpp:285 src/muuli_wdr.cpp:911
-msgid "Invalid / Corrupt / Fake"
-msgstr "無效 / 損壞 / 假檔"
-
-#: src/OtherFunctions.cpp:286 src/muuli_wdr.cpp:912
-msgid "Poor"
-msgstr "差"
-
-#: src/OtherFunctions.cpp:287 src/muuli_wdr.cpp:913
-msgid "Fair"
-msgstr "一般"
-
-#: src/OtherFunctions.cpp:288 src/muuli_wdr.cpp:914
-msgid "Good"
-msgstr "好"
-
-#: src/OtherFunctions.cpp:289 src/muuli_wdr.cpp:915
-msgid "Excellent"
-msgstr "優良"
-
-#: src/OtherFunctions.cpp:693
-msgid "all"
-msgstr "全部"
-
-#: src/OtherFunctions.cpp:694
-msgid "all others"
-msgstr "其它"
-
-#: src/IPFilter.cpp:109
-msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
-msgstr "正在載入 IP 過濾檔 ipfilter.dat 與 ipfilter_static.dat 。"
+msgid "Queued clients: %d"
+msgstr "等候中客戶端：%d"
 
-#: src/IPFilter.cpp:285
+#: src/MuleTrayIcon.cpp:425
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', unknown format encountered."
-msgstr "無法載入 ipfilter.dat 檔案 '%s'，為不明格式。"
+msgid "Total DL: %s"
+msgstr "總下載：%s"
 
-#: src/IPFilter.cpp:326
+#: src/MuleTrayIcon.cpp:432
 #, c-format
-msgid "Failed to load ipfilter.dat file '%s', could not open file."
-msgstr "無法載入 ipfilter.dat 檔案 '%s'，無法開啟檔案。"
+msgid "Total UL: %s"
+msgstr "總上傳：%s"
 
-#: src/IPFilter.cpp:331
-#, c-format
-msgid "Loaded %u IP-range from '%s'."
-msgid_plural "Loaded %u IP-ranges from '%s'."
-msgstr[0] "已載入 %u 個 IP 區段 (從 '%s')。"
-msgstr[1] "已載入 %u 個 IP 區段 (從 '%s')。"
+#: src/MuleTrayIcon.cpp:443
+msgid "Upload limit"
+msgstr "上傳限制"
 
-#: src/IPFilter.cpp:333
-#, c-format
-msgid "%u malformed line was discarded."
-msgid_plural "%u malformed lines were discarded."
-msgstr[0] "放棄 %u 行錯誤資料。"
-msgstr[1] "放棄 %u 行錯誤資料。"
+#: src/MuleTrayIcon.cpp:447
+msgid "Download limit"
+msgstr "下載限制"
 
-#: src/StatisticsDlg.cpp:189
-#, c-format
-msgid "Active connections (1:%u)"
-msgstr "目前連線數 (1:%u)"
+#: src/MuleTrayIcon.cpp:507
+msgid "Hide aMule"
+msgstr "隱藏 aMule"
 
-#: src/FileDetailDialog.cpp:59
-msgid "File Details"
-msgstr "檔案詳細資訊"
+#: src/MuleTrayIcon.cpp:510
+msgid "Show aMule"
+msgstr "顯示 aMule"
 
-#: src/FileDetailDialog.cpp:114
-#, c-format
-msgid "%.2f%% done"
-msgstr "%.2f%%"
+#: src/MuleTrayIcon.cpp:517 src/utils/aLinkCreator/src/alcframe.cpp:238
+msgid "Exit"
+msgstr "離開"
 
-#: src/muuli_wdr.cpp:73
+#: src/muuli_wdr.cpp:75
 msgid "eD2k Link: "
 msgstr "eD2k 連結："
 
-#: src/muuli_wdr.cpp:80
+#: src/muuli_wdr.cpp:82
 msgid "Commit"
 msgstr "加入"
 
-#: src/muuli_wdr.cpp:81
+#: src/muuli_wdr.cpp:83
 msgid ""
 "Click here to add the eD2k link in the text control to your download queue."
 msgstr "點選這裏將欄內的 eD2k 連結加入下載等候區。"
 
-#: src/muuli_wdr.cpp:89 src/muuli_wdr.cpp:93
+#: src/muuli_wdr.cpp:91
 msgid ""
 "Events are displayed here. For a complete list of events, refer to the log "
 "in the Servers-tab."
 msgstr "此處顯示系統事件。如需完整事件記錄，請到伺服器分頁。"
 
-#: src/muuli_wdr.cpp:92
+#: src/muuli_wdr.cpp:94
 msgid "Loading ..."
 msgstr "正在載入..."
 
-#: src/muuli_wdr.cpp:101
+#: src/muuli_wdr.cpp:102
 msgid "Number of users on the server you are connected to ..."
 msgstr "目前伺服器上使用者數 ..."
 
-#: src/muuli_wdr.cpp:104
+#: src/muuli_wdr.cpp:105
 msgid "Users: 0"
 msgstr "使用者數：0"
 
-#: src/muuli_wdr.cpp:105
+#: src/muuli_wdr.cpp:106
 msgid ""
 "Users connected to the current server and an estimate of the total number of "
 "users."
 msgstr "目前伺服器上的連線使用者和估計的總使用者數。"
 
 #: src/muuli_wdr.cpp:117
+msgid "Up: 0.0 | Down: 0.0"
+msgstr "上傳：0.0 | 下載：0.0"
+
+#: src/muuli_wdr.cpp:118
 msgid ""
 "Current average upload and download rates. If enabled the numbers in the "
 "braces signify the overhead from client communication."
 msgstr "目前平均上傳下載速度。括號中的爲與其他客戶端連線所消耗的頻寬。"
 
-#: src/muuli_wdr.cpp:125
+#: src/muuli_wdr.cpp:126
 msgid ""
 "Displays the connected status and active transfers. Red arrows signifies "
 "that you are currently not connected, yellow arrows signify that you have "
@@ -4533,2241 +2670,2646 @@
 "顯示目前連線與傳輸狀態。紅色箭頭表示未連線，黃色箭頭表示 LowID (防火牆內)，綠"
 "色箭頭表示正常連線。"
 
-#: src/muuli_wdr.cpp:129
+#: src/muuli_wdr.cpp:130
 msgid "Not Connected ..."
 msgstr "未連線..."
 
-#: src/muuli_wdr.cpp:130
+#: src/muuli_wdr.cpp:131
 msgid "Currently connected server."
-msgstr "現在連線的伺服器。"
+msgstr "目前連線的伺服器。"
 
-#: src/muuli_wdr.cpp:176
+#: src/muuli_wdr.cpp:177
 msgid "Search"
 msgstr "搜尋"
 
-#: src/muuli_wdr.cpp:182
+#: src/muuli_wdr.cpp:183
 msgid "Name:"
 msgstr "名稱："
 
-#: src/muuli_wdr.cpp:195 src/SearchDlg.cpp:108
+#: src/muuli_wdr.cpp:191 src/SearchListCtrl.cpp:90 src/SharedFilesCtrl.cpp:103
+msgid "Type"
+msgstr "類型"
+
+#: src/muuli_wdr.cpp:196 src/SearchDlg.cpp:108
 msgid "Local"
 msgstr "本地"
 
-#: src/muuli_wdr.cpp:196
+#: src/muuli_wdr.cpp:197
 msgid "Global"
 msgstr "全球"
 
-#: src/muuli_wdr.cpp:198
+#: src/muuli_wdr.cpp:199
 msgid "FileHash"
-msgstr "檔案雜湊值"
+msgstr "檔案 hash 值"
 
-#: src/muuli_wdr.cpp:206
+#: src/muuli_wdr.cpp:207
 msgid "Extended Parameters"
 msgstr "擴充參數"
 
-#: src/muuli_wdr.cpp:212
+#: src/muuli_wdr.cpp:213
 msgid "Filtering"
 msgstr "過濾"
 
-#: src/muuli_wdr.cpp:223
+#: src/muuli_wdr.cpp:224
 msgid "File Type"
 msgstr "檔案類型"
 
-#: src/muuli_wdr.cpp:253
+#: src/muuli_wdr.cpp:229 src/OtherFunctions.cpp:241
+msgid "Any"
+msgstr "任何"
+
+#: src/muuli_wdr.cpp:230 src/OtherFunctions.cpp:206
+msgid "Archives"
+msgstr "壓縮檔"
+
+#: src/muuli_wdr.cpp:231 src/OtherFunctions.cpp:199 src/OtherFunctions.cpp:681
+#: src/TransferWnd.cpp:357
+msgid "Audio"
+msgstr "音樂"
+
+#: src/muuli_wdr.cpp:232 src/OtherFunctions.cpp:213 src/OtherFunctions.cpp:683
+#: src/TransferWnd.cpp:359
+msgid "CD-Images"
+msgstr "光碟映像"
+
+#: src/muuli_wdr.cpp:233 src/OtherFunctions.cpp:220 src/OtherFunctions.cpp:684
+#: src/TransferWnd.cpp:360
+msgid "Pictures"
+msgstr "圖片"
+
+#: src/muuli_wdr.cpp:234 src/OtherFunctions.cpp:234
+msgid "Programs"
+msgstr "程式"
+
+#: src/muuli_wdr.cpp:235 src/OtherFunctions.cpp:227
+msgid "Texts"
+msgstr "文件"
+
+#: src/muuli_wdr.cpp:236 src/OtherFunctions.cpp:192
+msgid "Videos"
+msgstr "影片"
+
+#: src/muuli_wdr.cpp:254
 msgid "Extension"
 msgstr "副檔名"
 
-#: src/muuli_wdr.cpp:259
+#: src/muuli_wdr.cpp:260
 msgid "Min Size"
 msgstr "大小下限"
 
-#: src/muuli_wdr.cpp:269 src/muuli_wdr.cpp:292
+#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
 msgid "Bytes"
 msgstr "B"
 
-#: src/muuli_wdr.cpp:270 src/muuli_wdr.cpp:293
+#: src/muuli_wdr.cpp:271 src/muuli_wdr.cpp:294
 msgid "KB"
 msgstr "KB"
 
-#: src/muuli_wdr.cpp:282
+#: src/muuli_wdr.cpp:272 src/muuli_wdr.cpp:295 src/muuli_wdr.cpp:1826
+#: src/OtherFunctions.cpp:110
+msgid "MB"
+msgstr "MB"
+
+#: src/muuli_wdr.cpp:273 src/muuli_wdr.cpp:296 src/OtherFunctions.cpp:112
+msgid "GB"
+msgstr "GB"
+
+#: src/muuli_wdr.cpp:283
 msgid "Max Size"
 msgstr "大小上限"
 
-#: src/muuli_wdr.cpp:305
+#: src/muuli_wdr.cpp:306
 msgid "Availability"
 msgstr "最小來源數"
 
-#: src/muuli_wdr.cpp:318
+#: src/muuli_wdr.cpp:319
 msgid "Filter:"
 msgstr "過濾："
 
-#: src/muuli_wdr.cpp:327
+#: src/muuli_wdr.cpp:328
 msgid "Filter Results"
 msgstr "過濾結果"
 
-#: src/muuli_wdr.cpp:333
+#: src/muuli_wdr.cpp:334
 msgid "Invert Result"
 msgstr "反向排序結果"
 
-#: src/muuli_wdr.cpp:339
+#: src/muuli_wdr.cpp:340
 msgid "Hide Known Files"
 msgstr "隱藏已知檔案"
 
-#: src/muuli_wdr.cpp:355
-msgid "More"
-msgstr "更多"
+#: src/muuli_wdr.cpp:349 src/utils/aLinkCreator/src/alcframe.cpp:232
+msgid "Start"
+msgstr "開始"
 
 #: src/muuli_wdr.cpp:356
+msgid "More"
+msgstr "其他"
+
+#: src/muuli_wdr.cpp:357
 msgid "Searches for more results on eD2k. Not supported for Kad yet."
 msgstr "在 eD2k 搜尋更多結果 (尚不支援 Kad)。"
 
-#: src/muuli_wdr.cpp:363
+#: src/muuli_wdr.cpp:364
 msgid "Stop"
 msgstr "停止"
 
-#: src/muuli_wdr.cpp:377
+#: src/muuli_wdr.cpp:371 src/muuli_wdr.cpp:1570 src/SearchListCtrl.cpp:625
+msgid "Download"
+msgstr "下載"
+
+#: src/muuli_wdr.cpp:378
 msgid "Reset Fields"
 msgstr "清空欄位"
 
-#: src/muuli_wdr.cpp:392
+#: src/muuli_wdr.cpp:393
 msgid "Results"
 msgstr "搜尋結果"
 
-#: src/muuli_wdr.cpp:428
+#: src/muuli_wdr.cpp:422
 msgid "Clears completed downloads"
 msgstr "清除已完成的檔案"
 
-#: src/muuli_wdr.cpp:464
-msgid "Shows Upload / Up-queue"
-msgstr "顯示上傳/上傳等候區"
-
-#: src/muuli_wdr.cpp:473
-msgid "Clients on queue :"
-msgstr "等候區人數："
+#: src/muuli_wdr.cpp:466
+msgid "File sources:"
+msgstr "檔案來源："
 
-#: src/muuli_wdr.cpp:540
-msgid "Send"
-msgstr "傳送"
-
-#: src/muuli_wdr.cpp:541
-msgid "Sends the specified message."
-msgstr "傳送訊息。"
-
-#: src/muuli_wdr.cpp:545 src/muuli_wdr.cpp:967 src/muuli_wdr.cpp:1590
-#: src/muuli_wdr.cpp:3560 src/MuleNotebook.cpp:161
-msgid "Close"
-msgstr "關閉"
-
-#: src/muuli_wdr.cpp:546
-msgid "Close this chat-session."
-msgstr "結束本次交談。"
+#: src/muuli_wdr.cpp:520 src/muuli_wdr.cpp:1216 src/PrefsUnifiedDlg.cpp:176
+msgid "General"
+msgstr "一般"
 
-#: src/muuli_wdr.cpp:575
+#: src/muuli_wdr.cpp:525
 msgid "Full Name :"
 msgstr "全名︰"
 
-#: src/muuli_wdr.cpp:578 src/muuli_wdr.cpp:589 src/muuli_wdr.cpp:600
-#: src/muuli_wdr.cpp:615 src/muuli_wdr.cpp:626 src/muuli_wdr.cpp:637
-#: src/muuli_wdr.cpp:659 src/muuli_wdr.cpp:670 src/muuli_wdr.cpp:681
-#: src/muuli_wdr.cpp:692 src/muuli_wdr.cpp:703 src/muuli_wdr.cpp:714
-#: src/muuli_wdr.cpp:725 src/muuli_wdr.cpp:738 src/muuli_wdr.cpp:745
-#: src/muuli_wdr.cpp:772 src/muuli_wdr.cpp:783 src/muuli_wdr.cpp:794
-#: src/muuli_wdr.cpp:1133 src/muuli_wdr.cpp:1144 src/muuli_wdr.cpp:1153
-#: src/muuli_wdr.cpp:1164 src/muuli_wdr.cpp:1173 src/muuli_wdr.cpp:1184
-#: src/muuli_wdr.cpp:1393 src/muuli_wdr.cpp:1397 src/muuli_wdr.cpp:1412
-#: src/muuli_wdr.cpp:1421 src/muuli_wdr.cpp:1428 src/muuli_wdr.cpp:1437
-#: src/muuli_wdr.cpp:1444 src/muuli_wdr.cpp:1453 src/muuli_wdr.cpp:1460
-#: src/muuli_wdr.cpp:1469 src/muuli_wdr.cpp:1485 src/muuli_wdr.cpp:1498
-#: src/muuli_wdr.cpp:1507 src/muuli_wdr.cpp:1514 src/muuli_wdr.cpp:1523
-#: src/muuli_wdr.cpp:1530 src/muuli_wdr.cpp:1539 src/muuli_wdr.cpp:1557
-#: src/muuli_wdr.cpp:1566 src/muuli_wdr.cpp:1573 src/muuli_wdr.cpp:1582
-#: src/ClientListCtrl.cpp:627
+#: src/muuli_wdr.cpp:528 src/muuli_wdr.cpp:539 src/muuli_wdr.cpp:550
+#: src/muuli_wdr.cpp:565 src/muuli_wdr.cpp:576 src/muuli_wdr.cpp:587
+#: src/muuli_wdr.cpp:609 src/muuli_wdr.cpp:620 src/muuli_wdr.cpp:631
+#: src/muuli_wdr.cpp:642 src/muuli_wdr.cpp:653 src/muuli_wdr.cpp:664
+#: src/muuli_wdr.cpp:675 src/muuli_wdr.cpp:688 src/muuli_wdr.cpp:695
+#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:733 src/muuli_wdr.cpp:744
+#: src/muuli_wdr.cpp:1233 src/muuli_wdr.cpp:1237 src/muuli_wdr.cpp:1252
+#: src/muuli_wdr.cpp:1261 src/muuli_wdr.cpp:1268 src/muuli_wdr.cpp:1277
+#: src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:1293 src/muuli_wdr.cpp:1300
+#: src/muuli_wdr.cpp:1309 src/muuli_wdr.cpp:1325 src/muuli_wdr.cpp:1338
+#: src/muuli_wdr.cpp:1347 src/muuli_wdr.cpp:1354 src/muuli_wdr.cpp:1363
+#: src/muuli_wdr.cpp:1370 src/muuli_wdr.cpp:1379 src/muuli_wdr.cpp:1397
+#: src/muuli_wdr.cpp:1406 src/muuli_wdr.cpp:1413 src/muuli_wdr.cpp:1422
+#: src/muuli_wdr.cpp:3340 src/muuli_wdr.cpp:3351 src/muuli_wdr.cpp:3362
 msgid "N/A"
 msgstr "N/A"
 
-#: src/muuli_wdr.cpp:586
+#: src/muuli_wdr.cpp:536
 msgid "met-File :"
-msgstr "met 檔案"
+msgstr "met 檔"
 
-#: src/muuli_wdr.cpp:597
+#: src/muuli_wdr.cpp:547
 msgid "Hash :"
-msgstr "雜湊值："
+msgstr "hash 值："
 
-#: src/muuli_wdr.cpp:612
+#: src/muuli_wdr.cpp:562
 msgid "Filesize :"
 msgstr "檔案大小："
 
-#: src/muuli_wdr.cpp:623
+#: src/muuli_wdr.cpp:573
 msgid "Partfilestatus :"
 msgstr "暫存檔狀態："
 
-#: src/muuli_wdr.cpp:634
+#: src/muuli_wdr.cpp:584
 msgid "Last seen complete :"
 msgstr "最後看到完整檔案："
 
-#: src/muuli_wdr.cpp:656
+#: src/muuli_wdr.cpp:597 src/Statistics.cpp:729
+msgid "Transfer"
+msgstr "傳輸"
+
+#: src/muuli_wdr.cpp:606
 msgid "Found Sources :"
 msgstr "找到的來源："
 
-#: src/muuli_wdr.cpp:667
+#: src/muuli_wdr.cpp:617
 msgid "Transferring Sources :"
 msgstr "正在傳輸的來源："
 
-#: src/muuli_wdr.cpp:678
+#: src/muuli_wdr.cpp:628
 msgid "Filepart-Count :"
 msgstr "檔案分段數："
 
-#: src/muuli_wdr.cpp:689
+#: src/muuli_wdr.cpp:639
 msgid "Available :"
 msgstr "可用："
 
-#: src/muuli_wdr.cpp:700
+#: src/muuli_wdr.cpp:650
 msgid "Datarate :"
 msgstr "速度："
 
-#: src/muuli_wdr.cpp:711
+#: src/muuli_wdr.cpp:661
 msgid "Download Active Time: "
 msgstr "下載時間："
 
-#: src/muuli_wdr.cpp:722 src/muuli_wdr.cpp:1170 src/muuli_wdr.cpp:1181
+#: src/muuli_wdr.cpp:672
 msgid "Transferred :"
 msgstr "已傳輸："
 
-#: src/muuli_wdr.cpp:733
+#: src/muuli_wdr.cpp:683
 msgid "Completed Size :"
 msgstr "已完成："
 
-#: src/muuli_wdr.cpp:760 src/muuli_wdr.cpp:2009
+#: src/muuli_wdr.cpp:710
 msgid "Intelligent Corruption Handling"
 msgstr "智慧資料損壞處理 (I.C.H.)"
 
-#: src/muuli_wdr.cpp:769
+#: src/muuli_wdr.cpp:719
 msgid "Lost to corruption :"
 msgstr "因資料損壞而損失："
 
-#: src/muuli_wdr.cpp:780
+#: src/muuli_wdr.cpp:730
 msgid "Gained by compression :"
 msgstr "壓縮量："
 
-#: src/muuli_wdr.cpp:791
+#: src/muuli_wdr.cpp:741
 msgid "Packages saved by I.C.H. :"
 msgstr "由 I.C.H. 救回的封包："
 
-#: src/muuli_wdr.cpp:811
+#: src/muuli_wdr.cpp:754
 msgid "File Names"
 msgstr "檔案名稱"
 
-#: src/muuli_wdr.cpp:825
+#: src/muuli_wdr.cpp:763
 msgid "Takeover"
-msgstr "接管"
+msgstr "取用"
 
-#: src/muuli_wdr.cpp:835
+#: src/muuli_wdr.cpp:773
 msgid "Cleanup"
 msgstr "清除"
 
-#: src/muuli_wdr.cpp:849 src/muuli_wdr.cpp:925
+#: src/muuli_wdr.cpp:793 src/muuli_wdr.cpp:859
 msgid "Apply"
 msgstr "套用"
 
-#: src/muuli_wdr.cpp:854
+#: src/muuli_wdr.cpp:798
 msgid "Ok"
 msgstr "確定"
 
-#: src/muuli_wdr.cpp:883
+#: src/muuli_wdr.cpp:823
 msgid "Comment/Rate file (Text will be visible to all users)"
 msgstr "註解/評價 檔案 (所有使用者都可看到)"
 
-#: src/muuli_wdr.cpp:897
+#: src/muuli_wdr.cpp:829
 msgid ""
-"For a film you can say its length, its story, language ...\n"
-"and if it's a fake, you can tell that to other users of aMule."
+"For a film you can say its length, its story, language ...\\n\\nand if it's "
+"a fake, you can tell that to other users of aMule."
 msgstr ""
-"針對影片，您可以留下片長、故事、語言...等資訊\n"
-"或是提出假檔警告，以供其他 aMule 使用者注意。"
+"針對影片，您可以留下片長、故事、語言...等資訊\\n\\n或是提出假檔警告，以供其"
+"他 aMule 使用者注意。"
 
-#: src/muuli_wdr.cpp:905
+#: src/muuli_wdr.cpp:841
 msgid "File Quality"
 msgstr "檔案品質"
 
-#: src/muuli_wdr.cpp:920
+#: src/muuli_wdr.cpp:846 src/OtherFunctions.cpp:261 src/OtherFunctions.cpp:267
+msgid "Not rated"
+msgstr "未評價"
+
+#: src/muuli_wdr.cpp:847 src/OtherFunctions.cpp:262
+msgid "Invalid / Corrupt / Fake"
+msgstr "無效 / 損壞 / 假檔"
+
+#: src/muuli_wdr.cpp:848 src/OtherFunctions.cpp:263
+msgid "Poor"
+msgstr "差"
+
+#: src/muuli_wdr.cpp:849 src/OtherFunctions.cpp:264
+msgid "Fair"
+msgstr "一般"
+
+#: src/muuli_wdr.cpp:850 src/OtherFunctions.cpp:265
+msgid "Good"
+msgstr "好"
+
+#: src/muuli_wdr.cpp:851 src/OtherFunctions.cpp:266
+msgid "Excellent"
+msgstr "優良"
+
+#: src/muuli_wdr.cpp:854
 msgid "Choose the file rating or advice users if the file is invalid ..."
 msgstr "選擇檔案評價或者提醒其它使用者該檔案是無效的..."
 
-#: src/muuli_wdr.cpp:964
+#: src/muuli_wdr.cpp:898
 msgid "Refresh"
 msgstr "重新整理"
 
-#: src/muuli_wdr.cpp:991
+#: src/muuli_wdr.cpp:925
 msgid "Downloading, please wait ..."
 msgstr "正在下載，請稍待..."
 
-#: src/muuli_wdr.cpp:997
+#: src/muuli_wdr.cpp:931
 msgid "Unknown size"
-msgstr "未知大小"
+msgstr "不明大小"
 
-#: src/muuli_wdr.cpp:1021
+#: src/muuli_wdr.cpp:955
 msgid "Required Information"
 msgstr "必要資訊"
 
-#: src/muuli_wdr.cpp:1026
+#: src/muuli_wdr.cpp:960
 msgid "IP Address :"
 msgstr "IP 位址︰"
 
-#: src/muuli_wdr.cpp:1032
+#: src/muuli_wdr.cpp:966
 msgid "Port :"
 msgstr "通訊埠︰"
 
-#: src/muuli_wdr.cpp:1042
+#: src/muuli_wdr.cpp:976
 msgid "Additional Information"
 msgstr "附加資訊"
 
-#: src/muuli_wdr.cpp:1047
+#: src/muuli_wdr.cpp:981
 msgid "Username :"
 msgstr "使用者名稱︰"
 
-#: src/muuli_wdr.cpp:1053
+#: src/muuli_wdr.cpp:987
 msgid "Userhash :"
-msgstr "使用者雜湊值："
-
-#: src/muuli_wdr.cpp:1099
-msgid "Reload your shared files"
-msgstr "重新載入分享檔案"
-
-#: src/muuli_wdr.cpp:1116
-msgid "Current Session"
-msgstr "本次執行"
+msgstr "使用者 hash 值："
 
-#: src/muuli_wdr.cpp:1123
-msgid "Total"
-msgstr "總計"
-
-#: src/muuli_wdr.cpp:1130 src/muuli_wdr.cpp:1141
-msgid "Requested :"
-msgstr "已要求："
-
-#: src/muuli_wdr.cpp:1150 src/muuli_wdr.cpp:1161
-msgid "Active Uploads :"
-msgstr "目前上傳數："
+#: src/muuli_wdr.cpp:999 src/muuli_wdr.cpp:2565
+#: src/utils/aLinkCreator/src/alcframe.cpp:148
+msgid "Add"
+msgstr "加入"
 
-#: src/muuli_wdr.cpp:1206
+#: src/muuli_wdr.cpp:1046
 msgid "Download-Speed"
 msgstr "下載速度"
 
-#: src/muuli_wdr.cpp:1224 src/muuli_wdr.cpp:1273 src/muuli_wdr.cpp:2955
+#: src/muuli_wdr.cpp:1064 src/muuli_wdr.cpp:1113 src/muuli_wdr.cpp:2677
 msgid "Current"
 msgstr "目前"
 
-#: src/muuli_wdr.cpp:1235 src/muuli_wdr.cpp:1284 src/muuli_wdr.cpp:2966
+#: src/muuli_wdr.cpp:1075 src/muuli_wdr.cpp:1124 src/muuli_wdr.cpp:2688
 msgid "Running average"
 msgstr "執行中平均值"
 
-#: src/muuli_wdr.cpp:1246 src/muuli_wdr.cpp:1295 src/muuli_wdr.cpp:2977
+#: src/muuli_wdr.cpp:1086 src/muuli_wdr.cpp:1135 src/muuli_wdr.cpp:2699
 msgid "Session average"
 msgstr "本次平均值"
 
-#: src/muuli_wdr.cpp:1255
+#: src/muuli_wdr.cpp:1095
 msgid "Upload-Speed"
 msgstr "上傳速度"
 
-#: src/muuli_wdr.cpp:1304
+#: src/muuli_wdr.cpp:1144
 msgid "Connections"
 msgstr "連線"
 
-#: src/muuli_wdr.cpp:1322 src/muuli_wdr.cpp:2186
+#: src/muuli_wdr.cpp:1162 src/muuli_wdr.cpp:1972
 msgid "Active downloads"
 msgstr "目前下載數"
 
-#: src/muuli_wdr.cpp:1333
+#: src/muuli_wdr.cpp:1173
 msgid "Active connections (1:1)"
 msgstr "目前連線數 (1:1)"
 
-#: src/muuli_wdr.cpp:1344 src/muuli_wdr.cpp:2187
+#: src/muuli_wdr.cpp:1184 src/muuli_wdr.cpp:1973
 msgid "Active uploads"
 msgstr "目前上傳數"
 
-#: src/muuli_wdr.cpp:1353 src/muuli_wdr.cpp:2203
+#: src/muuli_wdr.cpp:1193
 msgid "Statistics Tree"
 msgstr "統計資訊"
 
-#: src/muuli_wdr.cpp:1383 src/muuli_wdr.cpp:3387
+#: src/muuli_wdr.cpp:1223
 msgid "Username:"
 msgstr "使用者名稱︰"
 
-#: src/muuli_wdr.cpp:1386
+#: src/muuli_wdr.cpp:1226
 msgid "Userhash:"
-msgstr "使用者雜湊值"
+msgstr "使用者 hash 值："
 
-#: src/muuli_wdr.cpp:1409
+#: src/muuli_wdr.cpp:1249
 msgid "Client software:"
 msgstr "客戶端軟體："
 
-#: src/muuli_wdr.cpp:1418
+#: src/muuli_wdr.cpp:1258
 msgid "Client version:"
 msgstr "版本："
 
-#: src/muuli_wdr.cpp:1425
+#: src/muuli_wdr.cpp:1265 src/ServerWnd.cpp:246
 msgid "IP address:"
 msgstr "IP 位址："
 
-#: src/muuli_wdr.cpp:1434
+#: src/muuli_wdr.cpp:1274
 msgid "User ID:"
 msgstr "使用者 ID："
 
-#: src/muuli_wdr.cpp:1441
+#: src/muuli_wdr.cpp:1281
 msgid "Server IP:"
 msgstr "伺服器 IP："
 
-#: src/muuli_wdr.cpp:1450
+#: src/muuli_wdr.cpp:1290
 msgid "Server name:"
 msgstr "伺服器名稱："
 
-#: src/muuli_wdr.cpp:1457
+#: src/muuli_wdr.cpp:1297
 msgid "Obfuscation:"
 msgstr "模糊協定："
 
-#: src/muuli_wdr.cpp:1466
+#: src/muuli_wdr.cpp:1306
 msgid "Kad:"
 msgstr "Kad："
 
-#: src/muuli_wdr.cpp:1477
+#: src/muuli_wdr.cpp:1317
 msgid "Transfers to client"
 msgstr "傳輸"
 
-#: src/muuli_wdr.cpp:1482
+#: src/muuli_wdr.cpp:1322
 msgid "Current request:"
 msgstr "目前要求："
 
-#: src/muuli_wdr.cpp:1495
+#: src/muuli_wdr.cpp:1335
 msgid "Average upload rate:"
 msgstr "平均上傳速度："
 
-#: src/muuli_wdr.cpp:1504
+#: src/muuli_wdr.cpp:1344
 msgid "Average download rate:"
 msgstr "平均下載速度："
 
-#: src/muuli_wdr.cpp:1511
+#: src/muuli_wdr.cpp:1351
 msgid "Uploaded (session):"
 msgstr "本次上傳："
 
-#: src/muuli_wdr.cpp:1520
+#: src/muuli_wdr.cpp:1360
 msgid "Downloaded (session):"
 msgstr "本次下載："
 
-#: src/muuli_wdr.cpp:1527
+#: src/muuli_wdr.cpp:1367
 msgid "Uploaded (total):"
 msgstr "總計上傳："
 
-#: src/muuli_wdr.cpp:1536
+#: src/muuli_wdr.cpp:1376
 msgid "Downloaded (total):"
 msgstr "總計下載："
 
-#: src/muuli_wdr.cpp:1547
+#: src/muuli_wdr.cpp:1387
 msgid "Scores"
 msgstr "分數"
 
-#: src/muuli_wdr.cpp:1554
+#: src/muuli_wdr.cpp:1394
 msgid "DL/UP modifier:"
 msgstr "下載/上傳 比率："
 
-#: src/muuli_wdr.cpp:1563
+#: src/muuli_wdr.cpp:1403
 msgid "Secure ident:"
 msgstr "安全驗證："
 
-#: src/muuli_wdr.cpp:1570
-msgid "Rating (total):"
-msgstr "評價 (總計)："
+#: src/muuli_wdr.cpp:1410
+msgid "Queue rank:"
+msgstr "等候排名："
 
-#: src/muuli_wdr.cpp:1579
+#: src/muuli_wdr.cpp:1419
 msgid "Queue score:"
 msgstr "得分："
 
-#: src/muuli_wdr.cpp:1610
+#: src/muuli_wdr.cpp:1448
 msgid "Nick"
 msgstr "暱稱"
 
-#: src/muuli_wdr.cpp:1613
-msgid "http://www.aMule.org - the Linux Mule"
-msgstr "http://www.aMule.org - Linux 下的騾子"
+#: src/muuli_wdr.cpp:1451
+msgid "http://www.aMule.org - the multi-platform Mule"
+msgstr "http://www.aMule.org - 跨平台的騾子"
 
-#: src/muuli_wdr.cpp:1614
+#: src/muuli_wdr.cpp:1452
 msgid "This is the name that other users will see when connecting to you."
 msgstr "這是其他使用者與您連線時能看到的名字。"
 
-#: src/muuli_wdr.cpp:1619
-msgid "Language"
-msgstr "語言"
+#: src/muuli_wdr.cpp:1460
+msgid "Language: "
+msgstr "語言："
 
-#: src/muuli_wdr.cpp:1624
+#: src/muuli_wdr.cpp:1461 src/muuli_wdr.cpp:1498 src/muuli_wdr.cpp:1502
+#: src/muuli_wdr.cpp:1506
+msgid "The delay before showing tool-tips."
+msgstr "顯示提示的延遲時間。"
+
+#: src/muuli_wdr.cpp:1466
 msgid "This specifies the language used on controls."
 msgstr "選擇界面語言。"
 
-#: src/muuli_wdr.cpp:1631
-msgid "Misc Options"
-msgstr "其他選項"
-
-#: src/muuli_wdr.cpp:1634
+#: src/muuli_wdr.cpp:1471
 msgid "Check for new version at startup"
 msgstr "啓動時檢查新版本"
 
-#: src/muuli_wdr.cpp:1635
+#: src/muuli_wdr.cpp:1472
 msgid "Enabling this will make aMule check for new version at startup"
-msgstr "啟用此選項使 aMule 在啓動時檢查新版本"
+msgstr "啟用後使 aMule 在啓動時檢查新版本"
 
-#: src/muuli_wdr.cpp:1638
+#: src/muuli_wdr.cpp:1475
 msgid "Start minimized"
 msgstr "啟動後縮到最小"
 
-#: src/muuli_wdr.cpp:1639
+#: src/muuli_wdr.cpp:1476
 msgid "Enabling this makes aMule minimize itself upon start."
 msgstr "啓用後使 aMule 啓動後立即最小化。"
 
-#: src/muuli_wdr.cpp:1642
+#: src/muuli_wdr.cpp:1479
 msgid "Prompt on exit"
 msgstr "離開前先確認"
 
-#: src/muuli_wdr.cpp:1644
-msgid "Makes aMule promt before exiting."
+#: src/muuli_wdr.cpp:1481
+msgid "Makes aMule prompt before exiting."
 msgstr "離開 aMule 前要先確認。"
 
-#: src/muuli_wdr.cpp:1647
+#: src/muuli_wdr.cpp:1484
+msgid "Hide application window when close button is pressed"
+msgstr "按下關閉按鈕後隱藏應用程式視窗"
+
+#: src/muuli_wdr.cpp:1487
 msgid "Enable Tray Icon"
 msgstr "啟用狀態列圖示"
 
-#: src/muuli_wdr.cpp:1648
+#: src/muuli_wdr.cpp:1488
 msgid "This Enables/Disables the system tray (or taskbar) icon."
 msgstr "啓用/停用系統狀態列圖示。"
 
-#: src/muuli_wdr.cpp:1651
+#: src/muuli_wdr.cpp:1491
 msgid "Minimize to Tray Icon"
 msgstr "縮小到狀態列圖示"
 
-#: src/muuli_wdr.cpp:1652
+#: src/muuli_wdr.cpp:1492
 msgid ""
 "Enabling this will make aMule minimize to the System Tray, rather than the "
 "taskbar."
 msgstr "開啓此選項將使 aMule 最小化到系統狀態列，而不是工作列。"
 
-#: src/muuli_wdr.cpp:1657
-msgid "Tooltip Delay Time in secs"
-msgstr "工具提示延遲秒數"
+#: src/muuli_wdr.cpp:1497
+msgid "Tooltip delay time: "
+msgstr "工具提示延遲："
 
-#: src/muuli_wdr.cpp:1658 src/muuli_wdr.cpp:1662
-msgid "The delay before showing tool-tips."
-msgstr "顯示提示的延遲時間。"
+#: src/muuli_wdr.cpp:1505
+msgid "seconds"
+msgstr "秒"
 
-#: src/muuli_wdr.cpp:1669
+#: src/muuli_wdr.cpp:1511
 msgid "Browser Selection"
 msgstr "瀏覽器設定"
 
-#: src/muuli_wdr.cpp:1674
-msgid "System Default"
-msgstr "系統預設"
-
-#: src/muuli_wdr.cpp:1675
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: src/muuli_wdr.cpp:1676
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: src/muuli_wdr.cpp:1677
-msgid "Firefox"
-msgstr "Firefox"
-
-#: src/muuli_wdr.cpp:1678
-msgid "Firebird"
-msgstr "Firebird"
-
-#: src/muuli_wdr.cpp:1679
-msgid "Opera"
-msgstr "Opera"
-
-#: src/muuli_wdr.cpp:1680
-msgid "Netscape"
-msgstr "Netscape"
-
-#: src/muuli_wdr.cpp:1681
-msgid "Galeon"
-msgstr "Galeon"
-
-#: src/muuli_wdr.cpp:1682
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: src/muuli_wdr.cpp:1686
-msgid "Select your browser here"
-msgstr "設定您的瀏覽器"
-
-#: src/muuli_wdr.cpp:1692
-msgid "Custom Browser:"
-msgstr "其它瀏覽器："
-
-#: src/muuli_wdr.cpp:1696
+#: src/muuli_wdr.cpp:1517
 msgid ""
-"Enter your browser name here. To use the custom browser, select the Custom "
-"menu-item from the dropdown-menu above."
-msgstr ""
-"請輸入瀏覽器的名稱。若要使用其他瀏覽器，請在上面的下拉式選單中選取 '使用者自"
-"定'。"
+"Enter your browser name here. Leave this field empty to use the system "
+"default browser."
+msgstr "請輸入瀏覽器的名稱，空白則使用系統預設。"
+
+#: src/muuli_wdr.cpp:1520 src/muuli_wdr.cpp:1540 src/muuli_wdr.cpp:1865
+#: src/muuli_wdr.cpp:1876 src/muuli_wdr.cpp:2951
+#: src/utils/aLinkCreator/src/alcframe.cpp:145
+#: src/utils/wxCas/src/wxcasprefs.cpp:65
+#: src/utils/wxCas/src/wxcasprefs.cpp:142
+msgid "Browse"
+msgstr "瀏覽"
 
-#: src/muuli_wdr.cpp:1705
+#: src/muuli_wdr.cpp:1525
 msgid "Open in new tab if possible"
 msgstr "在新分頁中開啟"
 
-#: src/muuli_wdr.cpp:1707
+#: src/muuli_wdr.cpp:1527
 msgid "Open the web page in a new tab instead of in a new window when possible"
 msgstr "如果可能，在新的分頁中打開而不是新的視窗"
 
-#: src/muuli_wdr.cpp:1712
+#: src/muuli_wdr.cpp:1532
 msgid "Video Player"
 msgstr "影片播放器"
 
-#: src/muuli_wdr.cpp:1725
-msgid "Create Backup for preview"
-msgstr "建立預覽用備份"
-
-#: src/muuli_wdr.cpp:1746
-msgid "Bandwith limits"
+#: src/muuli_wdr.cpp:1564
+msgid "Bandwidth limits"
 msgstr "頻寬限制"
 
-#: src/muuli_wdr.cpp:1762 src/muuli_wdr.cpp:2238
+#: src/muuli_wdr.cpp:1579
 msgid "Upload"
 msgstr "上傳"
 
-#: src/muuli_wdr.cpp:1775
+#: src/muuli_wdr.cpp:1588
 msgid "Slot Allocation"
 msgstr "位置分配"
 
-#: src/muuli_wdr.cpp:1792
-msgid "Standard client TCP Port:"
-msgstr "標準 TCP 埠："
+#: src/muuli_wdr.cpp:1601
+msgid "Ports"
+msgstr "通訊埠"
+
+#: src/muuli_wdr.cpp:1607
+msgid "Standard TCP Port "
+msgstr "標準 TCP 埠"
 
-#: src/muuli_wdr.cpp:1796
+#: src/muuli_wdr.cpp:1611
 msgid "This is the standard eD2k port and cannot be disabled."
 msgstr "標準 eD2k 通訊埠，不可停用。"
 
-#: src/muuli_wdr.cpp:1801
-msgid "Extended client UDP Port:"
-msgstr "標準 UDP 埠："
-
-#: src/muuli_wdr.cpp:1805
-msgid "This UDP port is used for extended ed2k requests and Kad network"
-msgstr "此 UDP 埠用於 eD2k 擴充要求與 Kad 網路"
+#: src/muuli_wdr.cpp:1614
+msgid "UDP port for server requests (TCP+3):"
+msgstr "伺服器要求 UDP 埠 (TCP+3)："
 
-#: src/muuli_wdr.cpp:1808
-msgid "disable"
-msgstr "停用"
+#: src/muuli_wdr.cpp:1617
+msgid "4665"
+msgstr "4665"
+
+#: src/muuli_wdr.cpp:1620
+msgid "Extended UDP port (Kad / global search) "
+msgstr "擴充 UDP 埠 (Kad / 全球搜尋)"
 
-#: src/muuli_wdr.cpp:1817
-msgid "Bind Address"
-msgstr "選定位址"
-
-#: src/muuli_wdr.cpp:1828
-msgid "UDP port for extended server requests (TCP+3): 4665"
-msgstr "擴充伺服器要求 UDP 埠 (TCP+3)：4665"
-
-#: src/muuli_wdr.cpp:1835
-msgid "Max Sources per File"
-msgstr "每個檔案最大來源數"
+#: src/muuli_wdr.cpp:1624
+msgid "This UDP port is used for extended eD2k requests and Kad network"
+msgstr "這個 UDP 埠用於 eD2k 擴充要求與 Kad 網路"
 
-#: src/muuli_wdr.cpp:1840
-msgid "Hard limit"
-msgstr "硬性限制"
+#: src/muuli_wdr.cpp:1627
+msgid "Enable UPnP for router port forwarding"
+msgstr "啟用 UPnP 的路由通訊埠轉向"
+
+#: src/muuli_wdr.cpp:1632
+msgid "UPnP TCP Port (Optional):"
+msgstr "UPnP TCP 埠 (選用)："
+
+#: src/muuli_wdr.cpp:1645
+msgid "Bind local address to IP (empty for any):"
+msgstr "選定本機使用 IP (留白或輸入)："
+
+#: src/muuli_wdr.cpp:1649
+msgid ""
+"Advanced users only: If you have multiple network interfaces, enter the "
+"address of the interface to which aMule should be bound."
+msgstr "進階使用者用：如果您有多網路介面，請輸入要給 aMule 使用的的網路位址。"
 
-#: src/muuli_wdr.cpp:1850
-msgid "Connection limits"
-msgstr "連線限制"
-
-#: src/muuli_wdr.cpp:1855
-msgid "Max Connections"
-msgstr "最大連線數"
+#: src/muuli_wdr.cpp:1657
+msgid "Max sources per downloading file:"
+msgstr "每個檔案最大來源數："
 
-#: src/muuli_wdr.cpp:1879 src/muuli_wdr.cpp:3617
-msgid "ED2K"
-msgstr "ED2K"
+#: src/muuli_wdr.cpp:1663
+msgid "Max simultaneous connections:"
+msgstr "最大同時連線數："
 
-#: src/muuli_wdr.cpp:1886
+#: src/muuli_wdr.cpp:1676
 msgid "Kademlia"
 msgstr "Kad"
 
-#: src/muuli_wdr.cpp:1896
-msgid "Universal Plug and Play"
-msgstr "通用隨插即用 (UPnP)"
-
-#: src/muuli_wdr.cpp:1899
-msgid "Enable UPnP"
-msgstr "啟用 UPnP"
-
-#: src/muuli_wdr.cpp:1902
-msgid "UPnP TCP Port:"
-msgstr "UPnP TCP 埠："
+#: src/muuli_wdr.cpp:1680 src/muuli_wdr.cpp:3279
+msgid "ED2K"
+msgstr "ED2K"
 
-#: src/muuli_wdr.cpp:1913
+#: src/muuli_wdr.cpp:1689
 msgid "Autoconnect on startup"
 msgstr "啟動後自動連線"
 
-#: src/muuli_wdr.cpp:1916
+#: src/muuli_wdr.cpp:1692
 msgid "Reconnect on loss"
 msgstr "斷線後自動重新連線"
 
-#: src/muuli_wdr.cpp:1920
-msgid "Show overhead bandwith"
-msgstr "顯示額外支出頻寬"
-
-#: src/muuli_wdr.cpp:1942
-msgid "Server Options"
-msgstr "伺服器選項"
-
-#: src/muuli_wdr.cpp:1947
+#: src/muuli_wdr.cpp:1716
 msgid "Remove dead server after"
 msgstr "移除無法連線伺服器：如果"
 
-#: src/muuli_wdr.cpp:1953
+#: src/muuli_wdr.cpp:1722
 msgid "retries"
 msgstr "次重試"
 
-#: src/muuli_wdr.cpp:1960
+#: src/muuli_wdr.cpp:1729
 msgid "Auto-update server list at startup"
 msgstr "啟動時自動更新伺服器清單"
 
-#: src/muuli_wdr.cpp:1963
+#: src/muuli_wdr.cpp:1732
 msgid "List"
 msgstr "清單"
 
-#: src/muuli_wdr.cpp:1968
+#: src/muuli_wdr.cpp:1737
 msgid "Update server list when connecting to a server"
 msgstr "連線到伺服器時更新伺服器清單"
 
-#: src/muuli_wdr.cpp:1971
+#: src/muuli_wdr.cpp:1740
 msgid "Update server list when a client connects"
 msgstr "連線到客戶端時更新伺服器清單"
 
-#: src/muuli_wdr.cpp:1974
+#: src/muuli_wdr.cpp:1743
 msgid "Use priority system"
 msgstr "啟用優先等級系統"
 
-#: src/muuli_wdr.cpp:1978
+#: src/muuli_wdr.cpp:1747
 msgid "Use smart LowID check on connect"
 msgstr "連線時啟用智慧 LowID 偵測"
 
-#: src/muuli_wdr.cpp:1982
+#: src/muuli_wdr.cpp:1751
 msgid "Safe connect"
 msgstr "安全連線"
 
-#: src/muuli_wdr.cpp:1986
+#: src/muuli_wdr.cpp:1755
 msgid "Autoconnect to servers in static list only"
 msgstr "只自動連線到靜態伺服器清單裏的伺服器"
 
-#: src/muuli_wdr.cpp:1989
+#: src/muuli_wdr.cpp:1758
 msgid "Set manually added servers to High Priority"
 msgstr "手動輸入的伺服器設為高優先等級"
 
-#: src/muuli_wdr.cpp:2012
-msgid "I.C.H. active"
-msgstr "啟動 I.C.H."
-
-#: src/muuli_wdr.cpp:2016
-msgid "AICH trusts every hash (not recomended)"
-msgstr "I.C.H. 信任所有雜湊值 (不建議)"
+#: src/muuli_wdr.cpp:1776
+msgid "Intelligent Corruption Handling (I.C.H.)"
+msgstr "智慧型損壞處理 (I.C.H.)"
+
+#: src/muuli_wdr.cpp:1779
+msgid "Enable"
+msgstr "啟用"
+
+#: src/muuli_wdr.cpp:1783
+msgid "Advanced I.C.H. trusts every hash (not recommended)"
+msgstr "進階 I.C.H. 信任所有 hash 值 (不建議)"
 
-#: src/muuli_wdr.cpp:2024
+#: src/muuli_wdr.cpp:1791
 msgid "Add files to download in pause mode"
 msgstr "加入新下載檔案時設為暫停狀態"
 
-#: src/muuli_wdr.cpp:2027
+#: src/muuli_wdr.cpp:1794
 msgid "Add files to download with auto priority"
 msgstr "加入新下載檔案時設定優先等級為自動狀態"
 
-#: src/muuli_wdr.cpp:2030
+#: src/muuli_wdr.cpp:1797
 msgid "Try to download first and last chunks first"
 msgstr "嘗試先下載檔案的第一段和最後一段"
 
-#: src/muuli_wdr.cpp:2034
-msgid "Add new shared files with auto priority"
-msgstr "新加入分享檔案優先等級設定為自動"
-
-#: src/muuli_wdr.cpp:2037
-msgid "Try to transfer full chunks to all uploads"
-msgstr "嘗試傳送完整資料區塊給所有人"
-
-#: src/muuli_wdr.cpp:2041
-msgid "Start next paused file when a file completed"
+#: src/muuli_wdr.cpp:1801
+msgid "Start next paused file when a file completes"
 msgstr "完成後自動傳輸下一個暫停的檔案"
 
-#: src/muuli_wdr.cpp:2045
+#: src/muuli_wdr.cpp:1805
 msgid "From the same category"
-msgstr "同一分類"
+msgstr "同一分類檔案"
 
-#: src/muuli_wdr.cpp:2048
-msgid "Save 10 sources on rare files (< 20 sources)"
-msgstr "為來源稀少 (< 20) 的檔案儲存 10 個來源"
+#: src/muuli_wdr.cpp:1808
+msgid "In alphabetic order"
+msgstr "依字母順序"
 
-#: src/muuli_wdr.cpp:2054
-msgid "Disk space"
-msgstr "磁碟空間"
+#: src/muuli_wdr.cpp:1811
+msgid "Preallocate disk space for new files"
+msgstr "新檔案預先分配磁碟空間"
+
+#: src/muuli_wdr.cpp:1812
+msgid ""
+"For new files preallocates disk space for the whole file, thus reduces "
+"fragmentation"
+msgstr "新檔案預先分配所需的完整磁碟空間，這樣可以減少檔案分散度"
 
-#: src/muuli_wdr.cpp:2057
-msgid "Check disk space"
-msgstr "檢查磁碟空間"
+#: src/muuli_wdr.cpp:1818
+msgid "Stop downloads when free disk space reaches "
+msgstr "磁碟可用空間不足時停止下載"
 
-#: src/muuli_wdr.cpp:2058
+#: src/muuli_wdr.cpp:1819
 msgid "Select this if you want aMule to check your disk space"
 msgstr "讓 aMule 檢查磁碟可用空間"
 
-#: src/muuli_wdr.cpp:2065
-msgid "Min disk space:"
-msgstr "最小磁碟空間："
-
-#: src/muuli_wdr.cpp:2069
+#: src/muuli_wdr.cpp:1823
 msgid "Enter here the min disk space desired."
 msgstr "請輸入最小磁碟可用空間。"
 
-#: src/muuli_wdr.cpp:2077
-msgid "Preallocate disk space for new files"
-msgstr "新檔案預先分配磁碟空間"
+#: src/muuli_wdr.cpp:1831
+msgid "Save 10 sources on rare files (< 20 sources)"
+msgstr "為來源稀少 (< 20) 的檔案儲存 10 個來源"
 
-#: src/muuli_wdr.cpp:2078
-msgid ""
-"For new files preallocates disk space for the whole file, thus reduces "
-"fragmentation"
-msgstr "新檔案預先分配所需的完整磁碟空間，這樣可以減少檔案分散度"
+#: src/muuli_wdr.cpp:1837 src/Statistics.cpp:731
+msgid "Uploads"
+msgstr "上傳"
 
-#: src/muuli_wdr.cpp:2097
-msgid "Incoming"
-msgstr "新進檔案"
+#: src/muuli_wdr.cpp:1840
+msgid "Add new shared files with auto priority"
+msgstr "新加入分享檔案優先等級設定為自動"
 
-#: src/muuli_wdr.cpp:2108
-msgid "Temporary"
-msgstr "暫存檔案"
-
-#: src/muuli_wdr.cpp:2119
-msgid "Shared"
-msgstr "分享的檔案"
+#: src/muuli_wdr.cpp:1859
+msgid "Destination folder for downloads"
+msgstr "下載資料夾"
+
+#: src/muuli_wdr.cpp:1870
+msgid "Folder for temporary download files"
+msgstr "暫存資料夾"
+
+#: src/muuli_wdr.cpp:1881
+msgid "Shared folders"
+msgstr "分享資料夾"
 
-#: src/muuli_wdr.cpp:2122
+#: src/muuli_wdr.cpp:1884
 msgid "(Right click on folder icon for recursive share)"
 msgstr "(滑鼠右鍵點選檔案夾圖示可全部遞迴分享)"
 
-#: src/muuli_wdr.cpp:2129
+#: src/muuli_wdr.cpp:1891
 msgid "Share hidden files"
 msgstr "分享隱藏檔"
 
-#: src/muuli_wdr.cpp:2149
+#: src/muuli_wdr.cpp:1911
 msgid "Graphs"
 msgstr "圖表"
 
-#: src/muuli_wdr.cpp:2152 src/muuli_wdr.cpp:2206
+#: src/muuli_wdr.cpp:1914 src/muuli_wdr.cpp:1992
 msgid "Update delay : 5 secs"
 msgstr "更新延遲時間：5 秒"
 
-#: src/muuli_wdr.cpp:2158
+#: src/muuli_wdr.cpp:1920
 msgid "Time for average graph: 100 mins"
 msgstr "平均圖表顯示時間：100 分鐘"
 
-#: src/muuli_wdr.cpp:2164
+#: src/muuli_wdr.cpp:1926
 msgid "Connections Graph Scale: 100 "
 msgstr "連線圖表比例：100 "
 
-#: src/muuli_wdr.cpp:2170
-msgid "Select Statistics Colors"
-msgstr "統計圖表顏色"
+#: src/muuli_wdr.cpp:1935
+msgid "Download graph scale:"
+msgstr "下載統計圖比例："
+
+#: src/muuli_wdr.cpp:1944
+msgid "Upload graph scale:"
+msgstr "上傳統計圖比例："
+
+#: src/muuli_wdr.cpp:1958
+msgid "Colours: "
+msgstr "顏色："
 
-#: src/muuli_wdr.cpp:2177
+#: src/muuli_wdr.cpp:1963
 msgid "Background"
 msgstr "背景"
 
-#: src/muuli_wdr.cpp:2178
+#: src/muuli_wdr.cpp:1964
 msgid "Grid"
 msgstr "格線"
 
-#: src/muuli_wdr.cpp:2179
+#: src/muuli_wdr.cpp:1965
 msgid "Download current"
 msgstr "目前下載"
 
-#: src/muuli_wdr.cpp:2180
+#: src/muuli_wdr.cpp:1966
 msgid "Download running average"
 msgstr "執行中平均下載"
 
-#: src/muuli_wdr.cpp:2181
+#: src/muuli_wdr.cpp:1967
 msgid "Download session average"
 msgstr "本次平均下載"
 
-#: src/muuli_wdr.cpp:2182
+#: src/muuli_wdr.cpp:1968
 msgid "Upload current"
 msgstr "目前上傳"
 
-#: src/muuli_wdr.cpp:2183
+#: src/muuli_wdr.cpp:1969
 msgid "Upload running average"
 msgstr "執行中平均上傳"
 
-#: src/muuli_wdr.cpp:2184
+#: src/muuli_wdr.cpp:1970
 msgid "Upload session average"
 msgstr "本次平均上傳"
 
-#: src/muuli_wdr.cpp:2185
+#: src/muuli_wdr.cpp:1971
 msgid "Active connections"
 msgstr "目前連線數"
 
-#: src/muuli_wdr.cpp:2188
+#: src/muuli_wdr.cpp:1974
 msgid "Systray Icon Speedbar"
 msgstr "狀態列圖示顯示速度"
 
-#: src/muuli_wdr.cpp:2189
+#: src/muuli_wdr.cpp:1975
 msgid "Kad-nodes current"
 msgstr "目前 Kad 節點"
 
-#: src/muuli_wdr.cpp:2190
+#: src/muuli_wdr.cpp:1976
 msgid "Kad-nodes running"
 msgstr "執行中 Kad 節點"
 
-#: src/muuli_wdr.cpp:2191
+#: src/muuli_wdr.cpp:1977
 msgid "Kad-nodes session"
 msgstr "本次 Kad 節點"
 
-#: src/muuli_wdr.cpp:2196 src/muuli_wdr.cpp:2674
+#: src/muuli_wdr.cpp:1982 src/muuli_wdr.cpp:2417
 msgid "Select"
 msgstr "選取"
 
-#: src/muuli_wdr.cpp:2214
-msgid "Number of Client Versions shown (0=unlimited)"
-msgstr "顯示客戶端版本的數量 ('0' 代表不限制)"
-
-#: src/muuli_wdr.cpp:2224
-msgid "Line Capacities"
-msgstr "網路最大頻寬"
+#: src/muuli_wdr.cpp:1989
+msgid "Tree"
+msgstr "樹狀"
 
-#: src/muuli_wdr.cpp:2249
-msgid "Note: These values are only used for statistics."
-msgstr "註：這些數值僅供統計使用。"
+#: src/muuli_wdr.cpp:2000
+msgid "Number of Client Versions shown (0=unlimited)"
+msgstr "顯示客戶端版本的數量 ( 0 代表不限制)"
 
-#: src/muuli_wdr.cpp:2272
+#: src/muuli_wdr.cpp:2028
 msgid "!!! WARNING !!!"
 msgstr "!!! 警告 !!!"
 
-#: src/muuli_wdr.cpp:2278
-msgid ""
-"Do not change these setting unless you know\n"
-"what you are doing, otherwise you can easily\n"
-"make things worse for yourself.\n"
-"\n"
-"aMule will run fine without adjusting any of\n"
-"these settings."
-msgstr ""
-" \n"
-"如果您不清楚以下設定的意義，則請不要隨意變更，\n"
-"否則可能匯弄巧成拙。\n"
-"\n"
-"即使不變更這些設定，aMule 一樣可以正常運作。"
-
-#: src/muuli_wdr.cpp:2285
-msgid "Advanced Settings"
-msgstr "進階設定"
-
-#: src/muuli_wdr.cpp:2288
+#: src/muuli_wdr.cpp:2042
 msgid "Max new connections / 5 secs"
 msgstr "5 秒內最大新連線數"
 
-#: src/muuli_wdr.cpp:2294
+#: src/muuli_wdr.cpp:2048
 msgid "File Buffer Size: 240000 bytes"
 msgstr "檔案緩衝區：240.000 KB"
 
-#: src/muuli_wdr.cpp:2300
+#: src/muuli_wdr.cpp:2054
 msgid "Upload Queue Size: 5000 clients"
 msgstr "上傳等候區大小：5000 "
 
-#: src/muuli_wdr.cpp:2306
+#: src/muuli_wdr.cpp:2060
 msgid "Server connection refresh interval: Disable"
 msgstr "伺服器連線更新間隔時間：停用"
 
-#: src/muuli_wdr.cpp:2328
-msgid "Download Queue Files Progress"
-msgstr "下載等候區檔案進度"
-
-#: src/muuli_wdr.cpp:2331
-msgid "Show percentage"
-msgstr "顯示百分比"
+#: src/muuli_wdr.cpp:2066
+msgid "Disable computer's timed standby mode"
+msgstr "停用電腦的自動進入待命模式功能"
+
+#: src/muuli_wdr.cpp:2087
+msgid "Skin to use: "
+msgstr "使用面板："
+
+#: src/muuli_wdr.cpp:2099
+msgid "Show \"Fast eD2k Links Handler\" in every window."
+msgstr "在每個視窗顯示「eD2k 連結快速處理器」。"
 
-#: src/muuli_wdr.cpp:2335
-msgid "Show progressbar "
-msgstr "顯示進度條"
+#: src/muuli_wdr.cpp:2103
+msgid "Show extended info on categories tabs"
+msgstr "在分類頁中顯示擴充資訊"
+
+#: src/muuli_wdr.cpp:2107
+msgid "Show application version on title"
+msgstr "在標題顯示應用程式版本"
+
+#: src/muuli_wdr.cpp:2110
+msgid "Show transfer rates on title"
+msgstr "標題列顯示傳輸速度"
+
+#: src/muuli_wdr.cpp:2113
+msgid "Before application name"
+msgstr "在程式名稱前"
+
+#: src/muuli_wdr.cpp:2116
+msgid "After application name"
+msgstr "在程式名稱後"
+
+#: src/muuli_wdr.cpp:2120
+msgid "Show overhead bandwidth"
+msgstr "顯示額外支出頻寬"
+
+#: src/muuli_wdr.cpp:2124
+msgid "Vertical toolbar orientation"
+msgstr "垂直顯示工具列"
 
-#: src/muuli_wdr.cpp:2341
-msgid "Progressbar Style"
-msgstr "進度條樣式"
+#: src/muuli_wdr.cpp:2127
+msgid "Show country flags for clients"
+msgstr "顯示客戶端的國旗"
+
+#: src/muuli_wdr.cpp:2130
+msgid "Download Queue Files"
+msgstr "下載等候區檔案"
+
+#: src/muuli_wdr.cpp:2133
+msgid "Show progress percentage"
+msgstr "顯示進度百分比"
 
-#: src/muuli_wdr.cpp:2351
+#: src/muuli_wdr.cpp:2140
+msgid "Show progress bar"
+msgstr "顯示進度條"
+
+#: src/muuli_wdr.cpp:2144
 msgid "Flat"
 msgstr "扁平"
 
-#: src/muuli_wdr.cpp:2354
+#: src/muuli_wdr.cpp:2150
 msgid "Round"
 msgstr "圓弧"
 
-#: src/muuli_wdr.cpp:2365
-msgid "Skin Support"
-msgstr "面板功能"
-
-#: src/muuli_wdr.cpp:2368
-msgid "Enable skin support "
-msgstr "啟用面板功能"
-
-#: src/muuli_wdr.cpp:2373
-msgid "Skin:"
-msgstr "面板："
-
-#: src/muuli_wdr.cpp:2378
-msgid "- no skins available -"
-msgstr "- 沒有面板可用 -"
-
-#: src/muuli_wdr.cpp:2387
-msgid "Column Sorting"
-msgstr "欄位排序"
-
-#: src/muuli_wdr.cpp:2390
-msgid "Auto-sort files in the download queue (high CPU)"
-msgstr "自動排序下載等候區檔案 (很耗系統資源)"
+#: src/muuli_wdr.cpp:2155
+msgid "Auto-sort files (high CPU)"
+msgstr "自動排序檔案 (耗系統資源)"
 
-#: src/muuli_wdr.cpp:2392
+#: src/muuli_wdr.cpp:2157
 msgid "aMule will sort the columns in your download list automatically"
-msgstr "aMule  會自動自動逐行排列下載清單"
+msgstr "aMule 將自動對下載清單進行排序"
 
-#: src/muuli_wdr.cpp:2397
-msgid "Misc Gui Tweaks"
-msgstr "其他 GUI 設定"
+#: src/muuli_wdr.cpp:2176
+msgid "External Connection Parameters"
+msgstr "外部連線參數"
 
-#: src/muuli_wdr.cpp:2400
-msgid "Show Fast eD2k Links Handler"
-msgstr "顯示 eD2k 連結快速處理器"
+#: src/muuli_wdr.cpp:2179
+msgid "Accept external connections"
+msgstr "接受外部連線"
 
-#: src/muuli_wdr.cpp:2404
-msgid "Show extended info on categories tabs"
-msgstr "在分類頁中顯示擴充資訊"
+#: src/muuli_wdr.cpp:2186
+msgid "IP of the listening interface:"
+msgstr "監聽 IP："
 
-#: src/muuli_wdr.cpp:2408
-msgid "Show transfer rates on title"
-msgstr "標題列顯示傳輸速度"
+#: src/muuli_wdr.cpp:2190
+msgid ""
+"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
+"An empty field or 0.0.0.0 will mean any interface."
+msgstr "輸入要監聽外部連線的的 IP (格式：a.b.c.d)，空白或 0.0.0.0 表示全部。"
 
-#: src/muuli_wdr.cpp:2412
-msgid "Vertical toolbar orientation"
-msgstr "垂直顯示工具列"
+#: src/muuli_wdr.cpp:2198 src/muuli_wdr.cpp:2259
+msgid "TCP port:"
+msgstr "TCP 埠："
 
-#: src/muuli_wdr.cpp:2415
-msgid "Show part file number before file name"
-msgstr "檔案名稱前顯示暫存檔編號"
+#: src/muuli_wdr.cpp:2206
+msgid "Enable UPnP port forwarding on the EC port"
+msgstr "外部連線通訊埠啟用 UPnP 通訊埠轉向"
 
-#: src/muuli_wdr.cpp:2434
+#: src/muuli_wdr.cpp:2211 src/muuli_wdr.cpp:3127
+#: src/utils/wxCas/src/wxcasprefs.cpp:210
+msgid "Password"
+msgstr "密碼"
+
+#: src/muuli_wdr.cpp:2221
 msgid "Web server parameters"
 msgstr "網站伺服器參數"
 
-#: src/muuli_wdr.cpp:2437
-msgid "Run amuleweb on startup"
-msgstr "啟動時執行 amuleweb"
-
-#: src/muuli_wdr.cpp:2442
-msgid "Web server port"
-msgstr "網站伺服器通訊埠"
-
-#: src/muuli_wdr.cpp:2450
-msgid "Enable UPnP port forwarding on the web server port"
-msgstr "網站伺服器通訊埠啟用 UPnP 通訊埠轉向"
-
-#: src/muuli_wdr.cpp:2455
-msgid "Web server UPnP TCP port"
-msgstr "網站伺服器的 UPnP TCP 埠"
+#: src/muuli_wdr.cpp:2224
+msgid "Run webserver on startup"
+msgstr "啟動時執行網站伺服器"
 
-#: src/muuli_wdr.cpp:2465
-msgid "Page Refresh Time (in secs)"
-msgstr "頁面更新時間 (秒)"
+#: src/muuli_wdr.cpp:2230
+msgid "Web template"
+msgstr "網頁模板"
 
-#: src/muuli_wdr.cpp:2473
-msgid "Enable Gzip compression"
-msgstr "啟用 Gzip 壓縮"
+#: src/muuli_wdr.cpp:2237
+msgid "Full rights password"
+msgstr "絕對權限使用者密碼"
 
-#: src/muuli_wdr.cpp:2477
+#: src/muuli_wdr.cpp:2243
 msgid "Enable Low rights User"
 msgstr "啟用低權限使用者"
 
-#: src/muuli_wdr.cpp:2484
-msgid "Full rights password"
-msgstr "絕對權限使用者密碼"
-
-#: src/muuli_wdr.cpp:2490
+#: src/muuli_wdr.cpp:2249
 msgid "Low rights password"
 msgstr "低權限使用者密碼"
 
-#: src/muuli_wdr.cpp:2496
-msgid "Web template"
-msgstr "網頁模板"
-
-#: src/muuli_wdr.cpp:2507
-msgid "External Connection Parameters"
-msgstr "外部連線參數"
+#: src/muuli_wdr.cpp:2267
+msgid "Enable UPnP port forwarding of the web server port"
+msgstr "網站伺服器的通訊埠啟用 UPnP 通訊埠轉向"
 
-#: src/muuli_wdr.cpp:2510
-msgid "Accept external connections"
-msgstr "接受外部連線"
-
-#: src/muuli_wdr.cpp:2528
-msgid ""
-"IP of the listening interface\n"
-"(empty for any)"
-msgstr "監聽的 IP (空白表示全部)"
+#: src/muuli_wdr.cpp:2272
+msgid "Web server UPnP TCP port (Optional)"
+msgstr "網站伺服器的 UPnP TCP 埠 (選用)"
 
-#: src/muuli_wdr.cpp:2533
-msgid ""
-"Enter here a valid ip in the a.b.c.d format for the listening EC interface. "
-"An empty field or 0.0.0.0 will mean any interface."
-msgstr ""
-"輸入要監聽外部連線的的 IP (格式：a.b.c.d)，空白或 0.0.0.0 表示使用任意介面。"
+#: src/muuli_wdr.cpp:2282
+msgid "Page Refresh Time (in secs)"
+msgstr "頁面更新時間 (秒)"
 
-#: src/muuli_wdr.cpp:2540
-msgid "TCP port"
-msgstr "TCP 埠"
+#: src/muuli_wdr.cpp:2290
+msgid "Enable Gzip compression"
+msgstr "啟用 Gzip 壓縮"
 
-#: src/muuli_wdr.cpp:2548
-msgid "Enable UPnP port forwarding on the EC port"
-msgstr "外部連線通訊埠啟用 UPnP 通訊埠轉向"
+#: src/muuli_wdr.cpp:2324 src/muuli_wdr.cpp:2427 src/ServerWnd.cpp:215
+#: src/ServerWnd.cpp:220
+msgid "OK"
+msgstr "OK"
 
-#: src/muuli_wdr.cpp:2583
+#: src/muuli_wdr.cpp:2326
 msgid "Click here to apply any changes made to the preferences."
 msgstr "點選這裏立即套用已變更的偏好設定。"
 
-#: src/muuli_wdr.cpp:2587
+#: src/muuli_wdr.cpp:2330
 msgid "Reset any changes made to the preferences."
 msgstr "取消所有偏好設定變更。"
 
-#: src/muuli_wdr.cpp:2611
+#: src/muuli_wdr.cpp:2354
 msgid "Title :"
 msgstr "標題："
 
-#: src/muuli_wdr.cpp:2621
+#: src/muuli_wdr.cpp:2364
 msgid "Comment :"
 msgstr "註解："
 
-#: src/muuli_wdr.cpp:2631
+#: src/muuli_wdr.cpp:2374
 msgid "Incoming Dir :"
 msgstr "新進檔目錄："
 
-#: src/muuli_wdr.cpp:2637
-msgid "..."
-msgstr "..."
-
-#: src/muuli_wdr.cpp:2644
+#: src/muuli_wdr.cpp:2387
 msgid "Change priority for new assigned files :"
 msgstr "設定新加入的檔案優先等級為："
 
-#: src/muuli_wdr.cpp:2649
-msgid "Dont change"
+#: src/muuli_wdr.cpp:2392
+msgid "Don't change"
 msgstr "不要變更"
 
-#: src/muuli_wdr.cpp:2663
+#: src/muuli_wdr.cpp:2406
 msgid "Select color for this Category (currently selected) :"
 msgstr "選取該分類的顏色 (目前選擇)："
 
-#: src/muuli_wdr.cpp:2735
-msgid "Display server motd when connected ..."
-msgstr "連線後顯示伺服器當日訊息..."
-
-#: src/muuli_wdr.cpp:2738 src/muuli_wdr.cpp:2886
-msgid "Server Info"
-msgstr "伺服器資訊"
+#: src/muuli_wdr.cpp:2480 src/muuli_wdr.cpp:2505
+#: src/utils/wxCas/src/wxcasframe.cpp:138
+#: src/utils/wxCas/src/wxcasframe.cpp:142
+msgid "Reset"
+msgstr "清除"
 
-#: src/muuli_wdr.cpp:2749 src/muuli_wdr.cpp:2784
+#: src/muuli_wdr.cpp:2481 src/muuli_wdr.cpp:2506
 msgid "Click this button to reset the log."
-msgstr "點選此按鈕清除記錄。"
+msgstr "點選這個按鈕來清除記錄。"
 
-#: src/muuli_wdr.cpp:2773 src/muuli_wdr.cpp:2882
-msgid "aMule Log"
-msgstr "aMule 記錄"
-
-#: src/muuli_wdr.cpp:2806
+#: src/muuli_wdr.cpp:2528
 msgid "Click on this button to update the servers list from URL ..."
-msgstr "點選此按鈕從該網址更新伺服器清單 ..."
+msgstr "點選這個按鈕從該網址更新伺服器清單 ..."
 
-#: src/muuli_wdr.cpp:2810
+#: src/muuli_wdr.cpp:2532
 msgid "Server list"
 msgstr "伺服器清單"
 
-#: src/muuli_wdr.cpp:2815
+#: src/muuli_wdr.cpp:2537
 msgid ""
 "Enter the url to a server.met file here and press the button to the left to "
 "update the list of known servers."
 msgstr "輸入 server.met 檔案的網址並按下左邊的按鈕以更新已知伺服器清單。"
 
-#: src/muuli_wdr.cpp:2822
+#: src/muuli_wdr.cpp:2544
 msgid "Add server manually: Name"
 msgstr "手動加入伺服器：名稱"
 
-#: src/muuli_wdr.cpp:2826
+#: src/muuli_wdr.cpp:2548
 msgid "Enter the name of the new server here"
 msgstr "輸入新伺服器的名稱"
 
-#: src/muuli_wdr.cpp:2833
+#: src/muuli_wdr.cpp:2551 src/ServerWnd.cpp:167
+msgid "IP:Port"
+msgstr "IP:Port"
+
+#: src/muuli_wdr.cpp:2555
 msgid "Enter the IP of the server here, using the x.x.x.x format."
 msgstr "輸入新伺服器的 IP (格式：x.x.x.x)。"
 
-#: src/muuli_wdr.cpp:2840
+#: src/muuli_wdr.cpp:2562
 msgid "Enter the port of the server here."
 msgstr "輸入伺服器的通訊埠。"
 
-#: src/muuli_wdr.cpp:2844
+#: src/muuli_wdr.cpp:2566
 msgid "Add manually a server (fill fields to the left before) ..."
 msgstr "手動加入伺服器 (填入左側空格中) ..."
 
-#: src/muuli_wdr.cpp:2890
+#: src/muuli_wdr.cpp:2604
+msgid "aMule Log"
+msgstr "aMule 記錄"
+
+#: src/muuli_wdr.cpp:2608
+msgid "Server Info"
+msgstr "伺服器資訊"
+
+#: src/muuli_wdr.cpp:2612
 msgid "ED2K Info"
-msgstr "ED2K 資訊"
+msgstr "eD2k 資訊"
 
-#: src/muuli_wdr.cpp:2894 src/muuli_wdr.cpp:3584
+#: src/muuli_wdr.cpp:2616
 msgid "Kad Info"
 msgstr "Kad 資訊"
 
-#: src/muuli_wdr.cpp:2923
+#: src/muuli_wdr.cpp:2645
 msgid "Click on this button to update the nodes list from URL ..."
-msgstr "點選此按鈕從該網址更新節點清單 ..."
+msgstr "點選這個按鈕來從該網址更新節點清單 ..."
 
-#: src/muuli_wdr.cpp:2927
+#: src/muuli_wdr.cpp:2649
 msgid "Nodes (0)"
 msgstr "節點 (0)"
 
-#: src/muuli_wdr.cpp:2932
+#: src/muuli_wdr.cpp:2654
 msgid ""
 "Enter the url to a nodes.dat file here and press the button to the left to "
 "update the list of known nodes."
 msgstr "輸入 nodes.dat 檔案的網址，並按下左邊的按鈕以更新已知節點清單。"
 
-#: src/muuli_wdr.cpp:2937
+#: src/muuli_wdr.cpp:2659
 msgid "Nodes stats"
 msgstr "節點狀態"
 
-#: src/muuli_wdr.cpp:2988
+#: src/muuli_wdr.cpp:2710
 msgid "Bootstrap"
 msgstr "啓動"
 
-#: src/muuli_wdr.cpp:2991
+#: src/muuli_wdr.cpp:2713
 msgid "New node"
 msgstr "新節點"
 
-#: src/muuli_wdr.cpp:2996
+#: src/muuli_wdr.cpp:2718
 msgid "IP:"
 msgstr "IP："
 
-#: src/muuli_wdr.cpp:3025
+#: src/muuli_wdr.cpp:2747
 msgid "Port:"
 msgstr "埠："
 
-#: src/muuli_wdr.cpp:3042
-msgid ""
-"Bootstrap from \n"
-"known clients"
+#: src/muuli_wdr.cpp:2763
+msgid "Bootstrap from known clients"
 msgstr "從已知客戶端啓動"
 
-#: src/muuli_wdr.cpp:3048
+#: src/muuli_wdr.cpp:2768
 msgid "Disconnect Kad"
 msgstr "中斷 Kad 連線"
 
-#: src/muuli_wdr.cpp:3074
-msgid "eD2k Info"
-msgstr "eD2K 資訊"
+#: src/muuli_wdr.cpp:2806
+msgid "Use Secure User Identification"
+msgstr "啟用使用者安全認證"
+
+#: src/muuli_wdr.cpp:2808
+msgid ""
+"It is recommended to enable this option. You will not receive credits if SUI "
+"is not enabled."
+msgstr "建議啟用此選項。如果使用者安全認證未啟用，將會得不到積分。"
 
-#: src/muuli_wdr.cpp:3096
+#: src/muuli_wdr.cpp:2811
 msgid "Protocol Obfuscation"
 msgstr "模糊協定"
 
-#: src/muuli_wdr.cpp:3099
+#: src/muuli_wdr.cpp:2814
 msgid "Support Protocol Obfuscation"
 msgstr "支援模糊協定"
 
-#: src/muuli_wdr.cpp:3101
+#: src/muuli_wdr.cpp:2816
 msgid ""
 "This option enabled Protocol Obfuscation, and makes aMule accept obfuscated "
 "connections from other clients."
-msgstr "此選項啓用模糊協定，可讓 aMule 接受來自其他客戶端的模糊連線。"
+msgstr "啓用模糊協定，可讓 aMule 接受來自其他客戶端的模糊連線。"
 
-#: src/muuli_wdr.cpp:3104
+#: src/muuli_wdr.cpp:2819
 msgid "Use obfuscation for outgoing connections"
 msgstr "對外的連線使用模糊協定"
 
-#: src/muuli_wdr.cpp:3106
+#: src/muuli_wdr.cpp:2821
 msgid ""
 "This option makes aMule use Protocol Obfuscation when connecting other "
 "clients/servers."
-msgstr "此選項使 aMule 在與其他客戶端或伺服器連線時使用模糊協定。"
+msgstr "使 aMule 在與其他客戶端或伺服器連線時使用模糊協定。"
 
-#: src/muuli_wdr.cpp:3109
+#: src/muuli_wdr.cpp:2824
 msgid "Accept only obfuscated connections"
 msgstr "只接受模糊連線"
 
-#: src/muuli_wdr.cpp:3110
+#: src/muuli_wdr.cpp:2825
 msgid ""
 "This option makes aMule only accept obfuscated connections. You will have "
 "less sources, but all your traffic will be obfuscated"
-msgstr ""
-"此選項讓 aMule 只接受模糊協定，檔案來源會比較少，但所有傳輸都將是模糊連線"
-
-#: src/muuli_wdr.cpp:3115
-msgid "File Options"
-msgstr "檔案選項"
+msgstr "讓 aMule 只接受模糊協定，檔案來源會比較少，但所有傳輸都將是模糊連線"
 
-#: src/muuli_wdr.cpp:3120
+#: src/muuli_wdr.cpp:2832
 msgid "Everybody"
 msgstr "任何人"
 
-#: src/muuli_wdr.cpp:3122
+#: src/muuli_wdr.cpp:2834
 msgid "No one"
 msgstr "無"
 
-#: src/muuli_wdr.cpp:3124
-msgid "Who can see shared files:"
-msgstr "誰可以看分享檔案："
+#: src/muuli_wdr.cpp:2836
+msgid "Who can see my shared files:"
+msgstr "誰可以看我的分享檔案："
 
-#: src/muuli_wdr.cpp:3125
+#: src/muuli_wdr.cpp:2837
 msgid "Select who can request to view a list of your shared files."
 msgstr "選取可以瀏覽分享檔案清單的使用者。"
 
-#: src/muuli_wdr.cpp:3130
+#: src/muuli_wdr.cpp:2840
 msgid "IP-Filtering"
 msgstr "IP 過濾"
 
-#: src/muuli_wdr.cpp:3137
+#: src/muuli_wdr.cpp:2847
 msgid "Filter clients"
 msgstr "過濾客戶端"
 
-#: src/muuli_wdr.cpp:3139
+#: src/muuli_wdr.cpp:2849
 msgid ""
 "Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "過濾列在 ~/.aMule/ipfilter.dat 檔案中的客戶端 IP"
 
-#: src/muuli_wdr.cpp:3142
+#: src/muuli_wdr.cpp:2852
 msgid "Filter servers"
 msgstr "過濾伺服器"
 
-#: src/muuli_wdr.cpp:3144
+#: src/muuli_wdr.cpp:2854
 msgid ""
 "Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat."
 msgstr "過濾列在 ~/.aMule/ipfilter.dat 檔案中的伺服器 IP 。"
 
-#: src/muuli_wdr.cpp:3151
+#: src/muuli_wdr.cpp:2861
 msgid "Reload List"
 msgstr "重載入清單"
 
-#: src/muuli_wdr.cpp:3152
+#: src/muuli_wdr.cpp:2862
 msgid "Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat"
 msgstr "重新載入 IP 過濾清單 ~/.aMule/ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3160
+#: src/muuli_wdr.cpp:2870
 msgid "URL:"
 msgstr "網址："
 
-#: src/muuli_wdr.cpp:3166
+#: src/muuli_wdr.cpp:2876
 msgid "Update now"
 msgstr "立即更新"
 
-#: src/muuli_wdr.cpp:3171
+#: src/muuli_wdr.cpp:2881
 msgid "Auto-update ipfilter at startup"
 msgstr "啓動後自動更新 IP 過濾清單"
 
-#: src/muuli_wdr.cpp:3176
+#: src/muuli_wdr.cpp:2886
 msgid "Filtering Level:"
 msgstr "過濾等級："
 
-#: src/muuli_wdr.cpp:3186
+#: src/muuli_wdr.cpp:2896
 msgid "Always filter LAN IPs"
 msgstr "永遠過濾區域網路 IP"
 
-#: src/muuli_wdr.cpp:3190
+#: src/muuli_wdr.cpp:2900
 msgid "Paranoid handling of non-matching IPs"
 msgstr "處理不匹配的 IP"
 
-#: src/muuli_wdr.cpp:3192
+#: src/muuli_wdr.cpp:2902
 msgid ""
 "Rejects packet if the client ip is different from the ip where the packet is "
 "received from. Use with caution."
 msgstr "拒絕客戶端 IP 與接收封包中的 IP 不同的封包。(請小心使用)"
 
-#: src/muuli_wdr.cpp:3195
+#: src/muuli_wdr.cpp:2905
 msgid "Use system-wide ipfilter.dat if available"
 msgstr "如果可以則使用系統級的 ipfilter.dat"
 
-#: src/muuli_wdr.cpp:3196
+#: src/muuli_wdr.cpp:2906
 msgid ""
 "If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter "
 "file."
 msgstr "如果找不到本機 ipfilter.dat 檔案，則允許使用系統級的 IP 過濾檔。"
 
-#: src/muuli_wdr.cpp:3199
-msgid "Use Secure User Identification"
-msgstr "啟用使用者安全認證"
-
-#: src/muuli_wdr.cpp:3201
-msgid ""
-"It is recommended to enable this option. You will not receive credits if SUI "
-"is not enabled."
-msgstr "建議啟用此選項。如果使用者安全認證未啟用，將會得不到積分。"
-
-#: src/muuli_wdr.cpp:3223
+#: src/muuli_wdr.cpp:2925
 msgid "Enable Online-Signature"
 msgstr "啟用線上簽名識別"
 
-#: src/muuli_wdr.cpp:3225
+#: src/muuli_wdr.cpp:2927
 msgid ""
 "Enables the writing of the OS file, which can be used by external apps to "
 "create signatures and the like."
 msgstr "啟用寫入到作業系統檔案，以讓外部程式用來建立簽名識別等等。"
 
-#: src/muuli_wdr.cpp:3230
+#: src/muuli_wdr.cpp:2932
 msgid "Update Frequency (Secs):"
 msgstr "更新頻率(秒)："
 
-#: src/muuli_wdr.cpp:3234
+#: src/muuli_wdr.cpp:2936
 msgid "Change the frequency (in seconds) of Online Signature updates."
 msgstr "變更線上簽名識別檔的更新頻率 (單位為 秒)。"
 
-#: src/muuli_wdr.cpp:3242
-msgid "Online Signature Directory:"
-msgstr "線上簽名識別目錄："
+#: src/muuli_wdr.cpp:2945
+msgid "Save online signature file in: "
+msgstr "儲存線上簽名識別檔："
 
-#: src/muuli_wdr.cpp:3249
+#: src/muuli_wdr.cpp:2952
 msgid ""
 "Click here to select the directory containing the the Online Signature files."
 msgstr "點擊選取線上簽識別名檔案所在的目錄。"
 
-#: src/muuli_wdr.cpp:3268 src/muuli_wdr.cpp:3307 src/muuli_wdr.cpp:3489
-msgid "Disable/Enable"
-msgstr "停用/啟用"
-
-#: src/muuli_wdr.cpp:3271
+#: src/muuli_wdr.cpp:2974
 msgid "Filter incoming messages (except current chat):"
 msgstr "過濾收到的訊息 (不包含目前交談)："
 
-#: src/muuli_wdr.cpp:3274
-msgid "Filtering Options:"
-msgstr "過濾器選項："
-
-#: src/muuli_wdr.cpp:3277
+#: src/muuli_wdr.cpp:2977
 msgid "Filter all messages"
 msgstr "過濾所有訊息"
 
-#: src/muuli_wdr.cpp:3280
+#: src/muuli_wdr.cpp:2980
 msgid "Filter messages from people not on your friend list"
 msgstr "過濾來自好友以外的訊息"
 
-#: src/muuli_wdr.cpp:3283
+#: src/muuli_wdr.cpp:2983
 msgid "Filter messages from unknown clients"
 msgstr "過濾來自不明客戶端的訊息"
 
-#: src/muuli_wdr.cpp:3286
+#: src/muuli_wdr.cpp:2986
 msgid "Filter messages containing (use ',' as separator):"
 msgstr "過濾含以下內容的訊息 (用逗號 ',' 隔開)："
 
-#: src/muuli_wdr.cpp:3290 src/muuli_wdr.cpp:3314
+#: src/muuli_wdr.cpp:2990 src/muuli_wdr.cpp:3005
 msgid "add here the words amule should filter and block messages including it"
 msgstr "輸入要過濾的詞句"
 
-#: src/muuli_wdr.cpp:3302
+#: src/muuli_wdr.cpp:2993
+msgid "Show received messages in the log"
+msgstr "記錄收到的訊息"
+
+#: src/muuli_wdr.cpp:2998
 msgid "Comments"
 msgstr "註解"
 
-#: src/muuli_wdr.cpp:3310
+#: src/muuli_wdr.cpp:3001
 msgid "Filter comments containing (use ',' as separator):"
 msgstr "過濾含以下內容的註解 (用逗號 ',' 隔開)："
 
-#: src/muuli_wdr.cpp:3339
+#: src/muuli_wdr.cpp:3024
+msgid "Automatic server connect without proxy"
+msgstr "自動不經代理伺服器連線到伺服器"
+
+#: src/muuli_wdr.cpp:3030
+msgid "Enable authentication"
+msgstr "啓用登入驗證"
+
+#: src/muuli_wdr.cpp:3031
+msgid "Enable/disable username/password authentication"
+msgstr "啓用/停用 使用者名稱/密碼登入驗證"
+
+#: src/muuli_wdr.cpp:3036
+msgid "Username: "
+msgstr "使用者名稱："
+
+#: src/muuli_wdr.cpp:3040
+msgid "The username to use to connect to the proxy"
+msgstr "登入代理伺服器的使用者名稱"
+
+#: src/muuli_wdr.cpp:3043
+msgid "Password:"
+msgstr "密碼："
+
+#: src/muuli_wdr.cpp:3047
+msgid "The password to use to connect to the proxy"
+msgstr "登入代理伺服器的密碼"
+
+#: src/muuli_wdr.cpp:3050
 msgid "Enable Proxy"
 msgstr "啓用代理伺服器"
 
-#: src/muuli_wdr.cpp:3340
+#: src/muuli_wdr.cpp:3051
 msgid "Enable/disable proxy support"
 msgstr "啓用/停用代理伺服器支援"
 
-#: src/muuli_wdr.cpp:3345
+#: src/muuli_wdr.cpp:3056
 msgid "Proxy type:"
 msgstr "類型："
 
-#: src/muuli_wdr.cpp:3350
-msgid "SOCKS5"
-msgstr "SOCKS5"
-
-#: src/muuli_wdr.cpp:3351
-msgid "SOCKS4"
-msgstr "SOCKS4"
-
-#: src/muuli_wdr.cpp:3352
-msgid "HTTP"
-msgstr "HTTP"
-
-#: src/muuli_wdr.cpp:3353
-msgid "SOCKS4a"
-msgstr "SOCKS4a"
-
-#: src/muuli_wdr.cpp:3356
-msgid "The type of proxy you are connecting to"
-msgstr "正在連線的代理伺服器類型"
-
-#: src/muuli_wdr.cpp:3359
+#: src/muuli_wdr.cpp:3069
 msgid "Proxy host:"
 msgstr "主機："
 
-#: src/muuli_wdr.cpp:3363
+#: src/muuli_wdr.cpp:3073
 msgid "The proxy host name"
 msgstr "代理伺服器主機名稱"
 
-#: src/muuli_wdr.cpp:3366
+#: src/muuli_wdr.cpp:3076
 msgid "Proxy port:"
-msgstr "通訊埠："
+msgstr "連接埠："
 
-#: src/muuli_wdr.cpp:3370
+#: src/muuli_wdr.cpp:3080
 msgid "The proxy port"
-msgstr "代理伺服器埠"
-
-#: src/muuli_wdr.cpp:3377
-msgid "Authentication"
-msgstr "登入驗證"
+msgstr "代理伺服器連接埠"
 
-#: src/muuli_wdr.cpp:3380
-msgid "Enable authentication"
-msgstr "啓用登入驗證："
-
-#: src/muuli_wdr.cpp:3381
-msgid "Enable/disable username/password authentication"
-msgstr "啓用/停用 使用者名稱/密碼登入驗證"
-
-#: src/muuli_wdr.cpp:3391
-msgid "The username to use to connect to the proxy"
-msgstr "登入代理伺服器的使用者名稱"
-
-#: src/muuli_wdr.cpp:3394
-msgid "Password:"
-msgstr "密碼："
-
-#: src/muuli_wdr.cpp:3398
-msgid "The password to use to connect to the proxy"
-msgstr "登入代理伺服器的密碼"
-
-#: src/muuli_wdr.cpp:3405
-msgid "Automatic server connect without proxy"
-msgstr "自動不經代理伺服器連線到伺服器"
-
-#: src/muuli_wdr.cpp:3424
+#: src/muuli_wdr.cpp:3101
 msgid "Connect to:"
 msgstr "連線到："
 
-#: src/muuli_wdr.cpp:3438
+#: src/muuli_wdr.cpp:3115
 msgid "Login to remote amule"
 msgstr "登入遠端 amule"
 
-#: src/muuli_wdr.cpp:3443
+#: src/muuli_wdr.cpp:3120
 msgid "User name"
 msgstr "使用者名稱"
 
-#: src/muuli_wdr.cpp:3460
+#: src/muuli_wdr.cpp:3137
 msgid "Remember those settings"
 msgstr "記住這些設定"
 
-#: src/muuli_wdr.cpp:3492
+#: src/muuli_wdr.cpp:3166
 msgid "Enable Verbose Debug-Logging."
 msgstr "啓用記錄詳細除錯訊息。"
 
-#: src/muuli_wdr.cpp:3497
+#: src/muuli_wdr.cpp:3169
 msgid "Message Categories:"
 msgstr "訊息分類："
 
-#: src/muuli_wdr.cpp:3550
+#: src/muuli_wdr.cpp:3195 src/PartFileConvertDlg.cpp:145
+msgid "Waiting..."
+msgstr "等候中..."
+
+#: src/muuli_wdr.cpp:3222
 msgid "Add imports"
-msgstr "加入匯入檔"
+msgstr "加入"
 
-#: src/muuli_wdr.cpp:3554
+#: src/muuli_wdr.cpp:3226
 msgid "Retry selected"
-msgstr "重試選取"
+msgstr "重試"
 
-#: src/muuli_wdr.cpp:3557
+#: src/muuli_wdr.cpp:3229
 msgid "Remove selected"
-msgstr "刪除選取"
+msgstr "移除"
 
-#: src/muuli_wdr.cpp:3642
-msgid "Event types"
+#: src/muuli_wdr.cpp:3301
+msgid "Event Types"
 msgstr "事件種類"
 
-#: src/muuli_wdr.cpp:3668
+#: src/muuli_wdr.cpp:3321
+msgid "Statistics and queued clients for selected file(s) : Session / All time"
+msgstr "已選取的檔案的統計資料與等候區客戶端數：本次 / 總計"
+
+#: src/muuli_wdr.cpp:3348
+msgid "Active Uploads"
+msgstr "目前上傳數"
+
+#: src/muuli_wdr.cpp:3368
+msgid "Percent of total files"
+msgstr "% (所有檔案中)"
+
+#: src/muuli_wdr.cpp:3415
+msgid "All files"
+msgstr "所有檔案"
+
+#: src/muuli_wdr.cpp:3416
+msgid "Selected files"
+msgstr "選取的檔案"
+
+#: src/muuli_wdr.cpp:3417
+msgid "Active uploads only"
+msgstr "僅限目前上傳中"
+
+#: src/muuli_wdr.cpp:3419
+msgid "Show Clients for"
+msgstr "顯示客戶端："
+
+#: src/muuli_wdr.cpp:3422
+msgid "Reload:"
+msgstr "重新載入："
+
+#: src/muuli_wdr.cpp:3427
+msgid "Reload your shared files"
+msgstr "重新載入分享的檔案"
+
+#: src/muuli_wdr.cpp:3497
+msgid "Send"
+msgstr "傳送"
+
+#: src/muuli_wdr.cpp:3498
+msgid "Sends the specified message."
+msgstr "傳送訊息。"
+
+#: src/muuli_wdr.cpp:3503
+msgid "Close this chat-session."
+msgstr "結束本次交談。"
+
+#: src/muuli_wdr.cpp:3527
 msgid "Connect to any server and/or Kad"
 msgstr "連線到任何伺服器 和/或 Kad 網路"
 
-#: src/muuli_wdr.cpp:3670
-msgid "Networks Window"
-msgstr "網路 視窗"
+#: src/muuli_wdr.cpp:3533 src/SharedFilesCtrl.cpp:134 src/Statistics.cpp:810
+msgid "Shared Files"
+msgstr "分享檔案"
 
-#: src/muuli_wdr.cpp:3671
-msgid "Searches Window"
-msgstr "搜尋 視窗"
+#: src/OScopeCtrl.cpp:247
+#, c-format
+msgid "Disabled [%s]"
+msgstr "已停用 [%s]"
 
-#: src/muuli_wdr.cpp:3672
-msgid "Files Transfers Window"
-msgstr "傳輸 視窗"
+#: src/OtherFunctions.cpp:106
+msgid "byte"
+msgid_plural "bytes"
+msgstr[0] "B"
 
-#: src/muuli_wdr.cpp:3674
-msgid "Shared Files Window"
-msgstr "檔案分享 視窗"
+#: src/OtherFunctions.cpp:108
+msgid "kB"
+msgstr "KB"
 
-#: src/muuli_wdr.cpp:3675
-msgid "Messages Window"
-msgstr "訊息 視窗"
+#: src/OtherFunctions.cpp:114
+msgid "TB"
+msgstr "TB"
 
-#: src/muuli_wdr.cpp:3676
-msgid "Statistics Graph Window"
-msgstr "統計 視窗"
+#: src/OtherFunctions.cpp:124
+msgid "k"
+msgstr "K"
 
-#: src/muuli_wdr.cpp:3678
-msgid "Preferences Settings Window"
-msgstr "偏好設定 視窗"
+#: src/OtherFunctions.cpp:126
+msgid "M"
+msgstr "M"
 
-#: src/CatDialog.cpp:87
-msgid "New Category"
-msgstr "新分類"
+#: src/OtherFunctions.cpp:128
+msgid "G"
+msgstr "G"
 
-#: src/CatDialog.cpp:126
-msgid "Choose a folder for incoming files"
-msgstr "請選擇新進檔案資料夾"
+#: src/OtherFunctions.cpp:130
+msgid "T"
+msgstr "T"
 
-#: src/CatDialog.cpp:141
-msgid "You must specify a name for the category!"
-msgstr "請輸入此分類的名稱！"
+#: src/OtherFunctions.cpp:137
+msgid "byte/sec"
+msgid_plural "bytes/sec"
+msgstr[0] "B/s"
 
-#: src/CatDialog.cpp:151
-msgid "You must specify a path for the category!"
-msgstr "請輸入此分類的路徑！"
+#: src/OtherFunctions.cpp:141
+msgid "MB/s"
+msgstr "MB/s"
 
-#: src/CatDialog.cpp:159
-msgid ""
-"Failed to create incoming dir for category. Please specify a valid path!"
-msgstr "無法建立該分類的目錄。請輸入有效的路徑！"
+#: src/OtherFunctions.cpp:150 src/OtherFunctions.cpp:153
+msgid "secs"
+msgstr "秒"
+
+#: src/OtherFunctions.cpp:157
+msgid "mins"
+msgstr "分"
+
+#: src/OtherFunctions.cpp:160 src/OtherFunctions.cpp:164
+msgid "hours"
+msgstr "時"
+
+#: src/OtherFunctions.cpp:163
+msgid "Days"
+msgstr "天"
+
+#: src/OtherFunctions.cpp:671
+msgid "all"
+msgstr "全部"
+
+#: src/OtherFunctions.cpp:672
+msgid "all others"
+msgstr "其它"
+
+#: src/OtherFunctions.cpp:673 src/TransferWnd.cpp:345
+msgid "Incomplete"
+msgstr "不完整"
+
+#: src/OtherFunctions.cpp:679 src/PartFile.cpp:3722 src/TransferWnd.cpp:351
+msgid "Stopped"
+msgstr "已停止"
 
-#: src/ExternalConnector.cpp:141
+#: src/OtherFunctions.cpp:680 src/TransferWnd.cpp:356
+msgid "Video"
+msgstr "影片"
+
+#: src/OtherFunctions.cpp:682 src/TransferWnd.cpp:358
+msgid "Archive"
+msgstr "壓縮檔"
+
+#: src/OtherFunctions.cpp:685 src/TransferWnd.cpp:361
+msgid "Text"
+msgstr "文件"
+
+#: src/OtherFunctions.cpp:686 src/TransferWnd.cpp:352
+msgid "Active"
+msgstr "啟動"
+
+#: src/OtherFunctions.cpp:1103
 #, c-format
-msgid "Unknown extension '%s' for the '%s' command.\n"
-msgstr "不明的副檔名 '%s' 傳給指令 '%s' 。\n"
+msgid "Using config dir: %s"
+msgstr "使用設定目錄：%s"
 
-#: src/ExternalConnector.cpp:143
+#: src/PartFileConvert.cpp:156
+msgid "Waiting for partfile convert thread to die..."
+msgstr "正在等候暫存檔轉換執行緒終止..."
+
+#: src/PartFileConvert.cpp:200
 #, c-format
-msgid "Unknown command '%s'.\n"
-msgstr "不明的指令 '%s' 。\n"
+msgid "Importing %s: %s"
+msgstr "正在匯入 %s：%s"
 
-#: src/ExternalConnector.cpp:155
-msgid ""
-"\n"
-"This command cannot have an argument.\n"
-msgstr ""
-"\n"
-"此指令不能有引數。\n"
+#: src/PartFileConvert.cpp:237
+msgid "Reading temp folder"
+msgstr "正在讀取暫存資料夾"
 
-#: src/ExternalConnector.cpp:157
-msgid ""
-"\n"
-"This command must have an argument.\n"
-msgstr ""
-"\n"
-"此指令必須要有引數。\n"
+#: src/PartFileConvert.cpp:241
+msgid "Retrieving basic information from download info file"
+msgstr "正在從下載資訊檔取得基本資訊"
+
+#: src/PartFileConvert.cpp:318
+msgid "Creating destination file"
+msgstr "正在建立目標檔案"
+
+#: src/PartFileConvert.cpp:327
+#, c-format
+msgid "Loading data from old download file (%u of %u)"
+msgstr "正在從舊下載檔案載入資料 (%u / %u)"
+
+#: src/PartFileConvert.cpp:347
+#, c-format
+msgid "Saving data block into new single download file (%u of %u)"
+msgstr "正在將資料區塊儲存到新的單一下載檔案 (%u / %u)"
+
+#: src/PartFileConvert.cpp:413
+msgid "Retrieving source downloadfile information"
+msgstr "正在取得來源下載檔案資訊"
+
+#: src/PartFileConvert.cpp:436
+msgid "Adding download and saving new partfile"
+msgstr "正在加入下載和儲存新暫存檔"
+
+#: src/PartFileConvertDlg.cpp:84
+msgid "Import partfiles"
+msgstr "匯入暫存檔"
 
-#: src/ExternalConnector.cpp:160
+#: src/PartFileConvertDlg.cpp:92
+msgid "State"
+msgstr "狀態"
+
+#: src/PartFileConvertDlg.cpp:94
+msgid "Filehash"
+msgstr "檔案 hash 值"
+
+#: src/PartFileConvertDlg.cpp:169
+#, c-format
+msgid "%s (Disk: %s)"
+msgstr "%s (磁碟：%s)"
+
+#: src/PartFileConvertDlg.cpp:194
 msgid ""
-"\n"
-"This command is incomplete, you must use one of the extensions below.\n"
-msgstr ""
-"\n"
-"此指令不完整，您必須使用以下其中一個副檔名。\n"
+"Please choose a folder to search for temporary downloads! (subfolders will "
+"be included)"
+msgstr "請選擇要搜尋暫存檔的資料夾！ (底下的子資料夾將一併處理)"
 
-#: src/ExternalConnector.cpp:166
+#: src/PartFileConvertDlg.cpp:198
 msgid ""
-"\n"
-"Available extensions:\n"
-msgstr ""
-"\n"
-"可用的副檔名：\n"
+"Do you want the source files of succesfully imported downloads be deleted?"
+msgstr "要刪除已成功匯入下載的來源檔嗎？"
 
-#: src/ExternalConnector.cpp:168
-msgid "Available commands:\n"
-msgstr "可用的指令：\n"
+#: src/PartFileConvertDlg.cpp:199
+msgid "Remove sources?"
+msgstr "刪除來源？"
 
-#: src/ExternalConnector.cpp:185
+#: src/PartFile.cpp:298
+msgid "ERROR: Failed to create partfile"
+msgstr "錯誤：無法建立暫存檔"
+
+#: src/PartFile.cpp:336
 #, c-format
-msgid ""
-"\n"
-"All commands are case insensitive.\n"
-"Type '%s <command>' to get detailed info on <command>.\n"
-msgstr ""
-"\n"
-"所有指令都不區分大小寫。\n"
-"輸入 '%s <指令>' 取得 <指令> 的詳細資訊。\n"
+msgid "Trying to load backup of met-file from %s"
+msgstr "嘗試使用在 %s 的 met 設定檔備份檔"
 
-#: src/ExternalConnector.cpp:217 src/ExternalConnector.cpp:218
-msgid "Exits from the application."
-msgstr "離開程式。"
+#: src/PartFile.cpp:343
+#, c-format
+msgid "ERROR: Failed to open part.met file: %s ==> %s"
+msgstr "錯誤：無法開啟 part.met 檔案：%s ==> %s"
 
-#: src/ExternalConnector.cpp:219
-msgid "Show help."
-msgstr "顯示幫助。"
+#: src/PartFile.cpp:349
+#, c-format
+msgid "ERROR: part.met file is 0 size: %s ==> %s"
+msgstr "錯誤：part.met 檔案大小為 0：%s ==> %s"
 
-#. TRANSLATORS:
-#. Do not translate the word 'help', it is a command to the program!
-#: src/ExternalConnector.cpp:222
-msgid ""
-"To get help on a command, type 'help <command>'.\n"
-"To get the full command list type 'help'.\n"
-msgstr ""
-"輸入 'help <指令>' 可顯示指令的說明。\n"
-"輸入 'help' 可顯示所有指令一覽。\n"
+#: src/PartFile.cpp:360
+#, c-format
+msgid "ERROR: Invalid part.met file version: %s ==> %s"
+msgstr "錯誤：無效的 part.met 檔案版本：%s ==> %s"
 
-#: src/ExternalConnector.cpp:243
+#: src/PartFile.cpp:595
 #, c-format
-msgid ""
-"\n"
-"Use '%s' for command list\n"
-"\n"
-msgstr ""
-"\n"
-"使用 '%s' 列出所有指令\n"
-"\n"
+msgid "Error: %s (%s) is corrupt (bad tags: %s), unable to load file."
+msgstr "錯誤：%s (%s) 已經損壞 (錯誤的標記：%s )，無法載入檔案。"
 
-#: src/ExternalConnector.cpp:273
-msgid "Syntax error!"
-msgstr "語法錯誤！"
+#: src/PartFile.cpp:606
+#, c-format
+msgid "ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file."
+msgstr "錯誤：%s (%s) 已經損壞 (標記數錯誤)，無法載入。"
 
-#: src/ExternalConnector.cpp:276
-msgid "Error processing command - should never happen! Report bug, please\n"
-msgstr "處理指令時發生意外錯誤！請提出錯誤報告\n"
+#: src/PartFile.cpp:609
+msgid "Trying to recover file info..."
+msgstr "嘗試復原檔案資訊中..."
 
-#: src/ExternalConnector.cpp:279
-msgid "This command should not have any parameters."
-msgstr "此指令不能有參數。"
+#: src/PartFile.cpp:624
+msgid "Recovering no-named file - will try to recover it as RecoveredFile.dat"
+msgstr "嘗試復原無名檔案 - 將存爲 RecoveredFile.dat"
 
-#: src/ExternalConnector.cpp:282
-msgid "This command must have a parameter."
-msgstr "此指令必須要有參數。"
+#: src/PartFile.cpp:628
+msgid "Recovered all available file info :D - Trying to use it..."
+msgstr "已復原所有檔案資訊 :D - 嘗試使用中..."
 
-#: src/ExternalConnector.cpp:285
-msgid "Invalid argument."
-msgstr "無效的引數。"
+#: src/PartFile.cpp:630
+msgid "Unable to recover file info :("
+msgstr "無法復原檔案資訊 :("
 
-#: src/ExternalConnector.cpp:288
-msgid "This is an incomplete command."
-msgstr "不完整的指令。"
+#: src/PartFile.cpp:665
+#, c-format
+msgid "Failed to open %s (%s)"
+msgstr "無法開啟 %s (%s)"
 
-#: src/ExternalConnector.cpp:297
+#: src/PartFile.cpp:715
 #, c-format
-msgid "Type '%s' to get more help.\n"
-msgstr "輸入 '%s' 顯示更多協助資訊。\n"
+msgid "WARNING: %s might be corrupted (%i)"
+msgstr "警告：%s 可能已經損壞 (%i)"
 
-#: src/ExternalConnector.cpp:362
+#: src/PartFile.cpp:897
 #, c-format
-msgid "This is %s %s %s\n"
-msgstr "這是 %s %s %s\n"
+msgid "ERROR while saving partfile: %s (%s ==> %s)"
+msgstr "儲存暫存檔時發生錯誤：%s (%s => %s)"
+
+#: src/PartFile.cpp:904
+msgid "IO failure while saving partfile: "
+msgstr "儲存暫存檔時發生 IO 錯誤："
 
-#: src/ExternalConnector.cpp:364
+#: src/PartFile.cpp:917
 #, c-format
-msgid "This is %s %s\n"
-msgstr "這是 %s %s\n"
+msgid "Could not retrieve length of '%s' - using %s file."
+msgstr "無法取得 %s 的大小 - 使用 %s 檔案。"
 
-#: src/ExternalConnector.cpp:395
+#: src/PartFile.cpp:925
+#, c-format
+msgid "'%s' is 0 size somehow - using %s file."
+msgstr "%s 檔案大小爲 0 - 使用 %s 檔案。"
+
+#: src/PartFile.cpp:994
+#, c-format
+msgid "Failed to save part.met.seeds file for %s"
+msgstr "無法儲存 %s 的 part.met.seeds 檔案"
+
+#: src/PartFile.cpp:1020
+#, c-format
+msgid "Saved %i source seed for partfile: %s (%s)"
+msgid_plural "Saved %i source seeds for partfile: %s (%s)"
+msgstr[0] "已儲存 %i 個來源種子給暫存檔 %s (%s)"
+
+#: src/PartFile.cpp:1049
+#, c-format
+msgid "Partfile %s (%s) has no seeds file"
+msgstr "暫存檔 %s (%s) 沒有種子檔案"
+
+#: src/PartFile.cpp:1058
+#, c-format
+msgid "Partfile %s (%s) has a void seeds file"
+msgstr "ha暫存檔 %s (%s) 的種子檔案沒有內容"
+
+#: src/PartFile.cpp:1114
+#, c-format
+msgid "Error reading partfile's seeds file (%s - %s): %s"
+msgstr "讀取暫存檔的種子檔案 (%s - %s) 時出錯：%s"
+
+#: src/PartFile.cpp:1131 src/PartFile.cpp:1160
+#, c-format
 msgid ""
-"\n"
-"Creating client...\n"
-msgstr ""
-"\n"
-"正在建立客戶端...\n"
+"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |"
+"%s|"
+msgid_plural ""
+"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash "
+"|%s|"
+msgstr[0] ""
+"找到損壞 (%d) 的 %d 個暫存檔 %s - 檔案結果 hash 值 |%s| 檔案 hash 值 |%s|"
+
+#: src/PartFile.cpp:1175
+#, c-format
+msgid "Found completed part (%i) in %s"
+msgstr "找到已完成的暫存檔 %i 在 %s"
 
-#: src/ExternalConnector.cpp:418
+#: src/PartFile.cpp:1208
+#, c-format
+msgid "Finished rehashing %s"
+msgstr "已重新計算完成 %s 的 hash 值"
+
+#: src/PartFile.cpp:2128
+#, c-format
+msgid "Unexpected error while completing %s. File paused"
+msgstr "計算 %s 時發生意外的錯誤，暫停檔案處理"
+
+#: src/PartFile.cpp:2165
+#, c-format
+msgid "Finished downloading: %s"
+msgstr "下載完成：%s"
+
+#: src/PartFile.cpp:2222
+#, c-format
+msgid "Deleting file: %s"
+msgstr "正刪除檔案：%s "
+
+#: src/PartFile.cpp:2287
+#, c-format
+msgid "WARNING: Unable to hash downloaded part - hashset incomplete for '%s'"
+msgstr "警告：無法計算已下載部份的 hash 值 - %s 的 hash 值組不完整"
+
+#: src/PartFile.cpp:2292
 #, c-format
 msgid ""
-"\n"
-"Ok, exiting %s...\n"
+"ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should "
+"never happen"
 msgstr ""
-"\n"
-"OK，正在離開 %s...\n"
+"錯誤：無法計算已下載部分的 hash 值 - %s 的 hash 值組不完整，這個狀況不該發生"
 
-#: src/ExternalConnector.cpp:424
+#: src/PartFile.cpp:2302 src/PartFile.cpp:2307
+#, c-format
 msgid ""
-"Cannot connect with an empty password.\n"
-"You must specify a password either in config file\n"
-"or on command-line, or enter one when asked.\n"
-"\n"
-"Exiting...\n"
+"EOF while hashing downloaded part %u with length %u (max %u) of partfile '%"
+"s' with length %u: %s"
 msgstr ""
-"不能使用空白密碼連線。\n"
-"您必須在設定檔或命令列中設定，\n"
-"或者在詢問時輸入。\n"
-"\n"
-"正在離開...\n"
+"計算下載部份 %u (長度 %u / 最大 %u) - 暫存檔 %s (長度 %u) 的 hash 值時出現檔"
+"案結束碼：%s"
 
-#: src/ExternalConnector.cpp:431
-msgid "Show this help text."
-msgstr "顯示協助資訊。"
+#: src/PartFile.cpp:2968
+#, c-format
+msgid "WARNING: Not enough free disk-space! Pausing file: %s"
+msgstr "警告：磁碟可用空間不足！暫停檔案：%s "
 
-#: src/ExternalConnector.cpp:434
-msgid "Host where aMule is running. (default: localhost)"
-msgstr "執行 aMule 的主機。(預設：localhost)"
+#: src/PartFile.cpp:3038
+#, c-format
+msgid "Downloaded part %i is corrupt in file: %s"
+msgstr "已下載的部份 %i 已損壞 (檔案：%s)"
 
-#: src/ExternalConnector.cpp:437
-msgid "aMule's port for External Connection. (default: 4712)"
-msgstr "aMule 的外部連線埠。 (預設：4712)"
+#: src/PartFile.cpp:3090
+#, c-format
+msgid "ICH: Recovered corrupted part %i for %s -> Saved bytes: %s"
+msgstr "ICH：已修復損壞的部份 %i (%s) -> 救回 %s"
 
-#: src/ExternalConnector.cpp:440
-msgid "External Connection password."
-msgstr "外部連線密碼。"
+#: src/PartFile.cpp:3695
+msgid "Allocating"
+msgstr "正在分配"
 
-#: src/ExternalConnector.cpp:443
-msgid "Read configuration from file."
-msgstr "從檔案讀取設定。"
+#: src/PartFile.cpp:3711
+msgid "Insufficient disk space"
+msgstr "磁碟空間不足"
 
-#: src/ExternalConnector.cpp:446
-msgid "Do not print any output to stdout."
-msgstr "不顯示任何輸出訊息。"
+#: src/PartFile.cpp:3761 src/SearchListCtrl.cpp:1006
+#: src/SharedFilePeersListCtrl.cpp:29 src/SourceListCtrl.cpp:29
+msgid "Downloaded"
+msgstr "已下載"
 
-#: src/ExternalConnector.cpp:449
-msgid "Be verbose - show also debug messages."
-msgstr "詳細顯示除錯資訊。"
+#: src/PartFile.cpp:4003
+#, c-format
+msgid "ERROR: Failed to open partfile '%s'"
+msgstr "錯誤：無法開啟暫存檔 %s"
 
-#: src/ExternalConnector.cpp:452
-msgid "Sets program locale (language)."
-msgstr "設定程式的地區設定 (語言)。"
+#: src/Preferences.cpp:630
+msgid "System default"
+msgstr "系統預設"
 
-#: src/ExternalConnector.cpp:455
-msgid "Write command line options to config file."
-msgstr "把命令列選項寫入設定檔。"
+#: src/Preferences.cpp:631
+msgid "Albanian"
+msgstr "阿爾巴尼亞語"
 
-#: src/ExternalConnector.cpp:458
-msgid "Creates config file based on aMule's config file."
-msgstr "使用 aMule 的設定檔建立新設定檔。"
+#: src/Preferences.cpp:632
+msgid "Arabic"
+msgstr "阿拉伯語"
 
-#: src/ExternalConnector.cpp:461
-msgid "Print program version."
-msgstr "列出程式版本。"
+#: src/Preferences.cpp:633
+msgid "Asturian"
+msgstr "奧地利語"
+
+#: src/Preferences.cpp:634
+msgid "Basque"
+msgstr "巴斯克語"
+
+#: src/Preferences.cpp:635
+msgid "Bulgarian"
+msgstr "保加利亞語"
+
+#: src/Preferences.cpp:636
+msgid "Catalan"
+msgstr "加泰隆尼亞語"
+
+#: src/Preferences.cpp:637
+msgid "Chinese (Simplified)"
+msgstr "簡體中文"
+
+#: src/Preferences.cpp:638
+msgid "Chinese (Traditional)"
+msgstr "正體中文"
+
+#: src/Preferences.cpp:639
+msgid "Croatian"
+msgstr "克羅埃西亞語"
+
+#: src/Preferences.cpp:640
+msgid "Czech"
+msgstr "捷克語"
+
+#: src/Preferences.cpp:641
+msgid "Danish"
+msgstr "丹麥語"
+
+#: src/Preferences.cpp:642
+msgid "Dutch"
+msgstr "荷蘭語"
+
+#: src/Preferences.cpp:643
+msgid "English (U.K.)"
+msgstr "英語 (英國)"
+
+#: src/Preferences.cpp:644
+msgid "Estonian"
+msgstr "愛沙尼亞語"
+
+#: src/Preferences.cpp:645
+msgid "Finnish"
+msgstr "芬蘭語"
+
+#: src/Preferences.cpp:646
+msgid "French"
+msgstr "法語"
+
+#: src/Preferences.cpp:647
+msgid "Galician"
+msgstr "加利西亞語"
+
+#: src/Preferences.cpp:648
+msgid "German"
+msgstr "德語"
+
+#: src/Preferences.cpp:649
+msgid "Greek"
+msgstr "希臘語"
+
+#: src/Preferences.cpp:650
+msgid "Hebrew"
+msgstr "希伯來語"
+
+#: src/Preferences.cpp:651
+msgid "Hungarian"
+msgstr "匈牙利語"
+
+#: src/Preferences.cpp:652
+msgid "Italian"
+msgstr "義大利語"
+
+#: src/Preferences.cpp:653
+msgid "Italian (Swiss)"
+msgstr "意大利語 (瑞士)"
+
+#: src/Preferences.cpp:654
+msgid "Japanese"
+msgstr "日語"
+
+#: src/Preferences.cpp:655
+msgid "Korean"
+msgstr "韓語"
+
+#: src/Preferences.cpp:656
+msgid "Lithuanian"
+msgstr "立陶宛語"
+
+#: src/Preferences.cpp:657
+msgid "Norwegian (Nynorsk)"
+msgstr "新挪威語"
+
+#: src/Preferences.cpp:658
+msgid "Polish"
+msgstr "波蘭語"
 
-#: src/ClientCreditsList.cpp:168
+#: src/Preferences.cpp:659
+msgid "Portuguese"
+msgstr "葡萄牙語"
+
+#: src/Preferences.cpp:660
+msgid "Portuguese (Brazilian)"
+msgstr "葡萄牙語 (巴西)"
+
+#: src/Preferences.cpp:661
+msgid "Russian"
+msgstr "俄語"
+
+#: src/Preferences.cpp:662
+msgid "Slovenian"
+msgstr "斯洛維尼亞語"
+
+#: src/Preferences.cpp:663
+msgid "Spanish"
+msgstr "西班牙語"
+
+#: src/Preferences.cpp:664
+msgid "Swedish"
+msgstr "瑞典語"
+
+#: src/Preferences.cpp:665
+msgid "Turkish"
+msgstr "土耳其語"
+
+#: src/Preferences.cpp:666
+msgid "Ukrainian"
+msgstr "烏克蘭語"
+
+#: src/Preferences.cpp:728
+msgid "Change Language"
+msgstr "變更語言"
+
+#: src/Preferences.cpp:771
+msgid "There are no translations installed for aMule"
+msgstr "沒有已安裝的 aMule 翻譯"
+
+#: src/Preferences.cpp:771
+msgid "No languages available"
+msgstr "沒有可用的語言"
+
+#: src/Preferences.cpp:902
+msgid "no options available"
+msgstr "沒有選項"
+
+#: src/Preferences.cpp:1584
+msgid "Invalid category found, skipping"
+msgstr "找到無效的分類，略過"
+
+#: src/Preferences.cpp:1766
+msgid ""
+"TCP port can't be higher than 65532 due to server UDP socket being TCP+3"
+msgstr "TCP 埠不可大於 65532，因爲伺服器 UDP 連接端點值爲 TCP 埠值+3"
+
+#: src/Preferences.cpp:1767
 #, c-format
-msgid "Creditfile loaded, %u client is known"
-msgid_plural "Creditfile loaded, %u clients are known"
-msgstr[0] "積分檔已載入，有 %u 個已知客戶端"
-msgstr[1] "積分檔已載入，有 %u 個已知客戶端"
+msgid "Default port will be used (%d)"
+msgstr "使用預設通訊埠 (%d)"
 
-#: src/ClientCreditsList.cpp:171
+#: src/Preferences.cpp:1790
 #, c-format
-msgid " - Credits expired for %u client!"
-msgid_plural " - Credits expired for %u clients!"
-msgstr[0] " - %u 個客戶端的積分已過期！"
-msgstr[1] " - %u 個客戶端的積分已過期！"
+msgid "Dropping non-existing shared directory: %s"
+msgstr "正在放棄不存在的分享目錄：%s "
 
-#: src/ClientCreditsList.cpp:315
-msgid "No 'cryptkey.dat' file found, creating."
-msgstr "找不到 crytkey.dat，正在建立新的。"
+#: src/PrefsUnifiedDlg.cpp:177 src/Statistics.cpp:771
+msgid "Connection"
+msgstr "連線"
+
+#: src/PrefsUnifiedDlg.cpp:178 src/SearchListCtrl.cpp:93
+msgid "Directories"
+msgstr "目錄"
+
+#: src/PrefsUnifiedDlg.cpp:179 src/Statistics.cpp:797
+msgid "Servers"
+msgstr "伺服器"
+
+#: src/PrefsUnifiedDlg.cpp:180 src/ServerListCtrl.cpp:92
+msgid "Files"
+msgstr "檔案"
+
+#: src/PrefsUnifiedDlg.cpp:181
+msgid "Security"
+msgstr "安全"
+
+#: src/PrefsUnifiedDlg.cpp:182
+msgid "Interface"
+msgstr "介面"
+
+#: src/PrefsUnifiedDlg.cpp:184
+msgid "Proxy"
+msgstr "代理伺服器"
+
+#: src/PrefsUnifiedDlg.cpp:185
+msgid "Filters"
+msgstr "過濾"
+
+#: src/PrefsUnifiedDlg.cpp:186
+msgid "Remote Controls"
+msgstr "遠端控制"
+
+#: src/PrefsUnifiedDlg.cpp:187
+msgid "Online Signature"
+msgstr "線上簽名識別"
+
+#: src/PrefsUnifiedDlg.cpp:188
+msgid "Advanced"
+msgstr "進階"
+
+#: src/PrefsUnifiedDlg.cpp:189
+msgid "Events"
+msgstr "事件"
 
-#: src/amuled.cpp:594
+#: src/PrefsUnifiedDlg.cpp:191
+msgid "Debugging"
+msgstr "除錯"
+
+#: src/PrefsUnifiedDlg.cpp:249
 msgid ""
-"ERROR: aMule daemon cannot be used when external connections are disabled. "
-"To enable External Connections, use either a normal aMule, start amuled with "
-"the option --ec-config or set the key\"AcceptExternalConnections\" to 1 in "
-"the file ~/.aMule/amule.conf"
+"The following variables will be substituted:\n"
+"    %PARTFILE - full path to the file\n"
+"    %PARTNAME - file name only"
 msgstr ""
-"錯誤：當停用外部連線時，aMule 背景服務程式無法使用。要啓用外部連線，請使用標"
-"準的 aMule，或使用 --ec-config 選項啓動 amuled，或在檔案 ~/aMule/amule.conf "
-"中將 \"AcceptExternalConnections\" 設定值改為 1"
-
-#: src/amuled.cpp:750
-#, c-format
-msgid "ERROR: %s"
-msgstr "錯誤：%s"
+"可使用以下變數：\n"
+"    %PARTFILE - 檔案的完整路徑\n"
+"    %PARTNAME - 只有檔案名稱"
 
-#: src/ClientListCtrl.cpp:262
-msgid "Unban"
-msgstr "取消封鎖"
-
-#: src/ClientListCtrl.cpp:267
-msgid "Show Uploads"
-msgstr "顯示上傳"
-
-#: src/ClientListCtrl.cpp:268
-msgid "Show Queue"
-msgstr "顯示等候區"
-
-#: src/ClientListCtrl.cpp:269
-msgid "Show Clients"
-msgstr "顯示客戶端"
-
-#: src/ClientListCtrl.cpp:273
-msgid "Select View"
-msgstr "切換顯示"
-
-#: src/ClientListCtrl.cpp:511 src/ClientListCtrl.cpp:836
-#: src/ClientListCtrl.cpp:1007
-msgid "Client Software"
-msgstr "客戶端軟體"
-
-#: src/ClientListCtrl.cpp:514
-msgid "Waited"
-msgstr "已等候"
-
-#: src/ClientListCtrl.cpp:515
-msgid "Upload Time"
-msgstr "上傳時間"
-
-#: src/ClientListCtrl.cpp:518
-msgid "Upload/Download"
-msgstr "上傳/下載"
-
-#: src/ClientListCtrl.cpp:519
-msgid "Remote Status"
-msgstr "遠端狀態"
+#: src/PrefsUnifiedDlg.cpp:289
+msgid ""
+"Do not change these setting unless you know\n"
+"what you are doing, otherwise you can easily\n"
+"make things worse for yourself.\n"
+"\n"
+"aMule will run fine without adjusting any of\n"
+"these settings."
+msgstr ""
+" \n"
+"如果您不清楚以下設定的意義，就請不要隨意變更，\n"
+"否則可能會弄巧成拙。\n"
+"\n"
+"即使不變更這些設定，aMule 一樣可以正常運作。"
 
-#: src/ClientListCtrl.cpp:699
+#: src/PrefsUnifiedDlg.cpp:350
 #, c-format
-msgid "QR: %u"
-msgstr "QR：%u"
+msgid "Failed to connect Cfg to widget with the ID %d and key %s"
+msgstr "無法以 ID %d、key %s 將 Cfg 與 widget 相連"
 
-#: src/ClientListCtrl.cpp:837
-msgid "File Priority"
-msgstr "檔案優先等級"
+#: src/PrefsUnifiedDlg.cpp:399
+#, c-format
+msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
+msgstr "無法以 ID %d、key %s 將資料 Cfg 與 widget 連線"
 
-#: src/ClientListCtrl.cpp:839
-msgid "Score"
-msgstr "分數"
+#: src/PrefsUnifiedDlg.cpp:416
+msgid "The type of proxy you are connecting to"
+msgstr "正在連線的代理伺服器類型"
 
-#: src/ClientListCtrl.cpp:840
-msgid "Asked"
-msgstr "已要求"
+#: src/PrefsUnifiedDlg.cpp:534
+#, c-format
+msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
+msgstr "無法以 ID %d、key %s 從 Cfg 傳輸資料到 Widget"
 
-#: src/ClientListCtrl.cpp:841
-msgid "Last Seen"
-msgstr "最後看到"
-
-#: src/ClientListCtrl.cpp:842
-msgid "Entered Queue"
-msgstr "已進等候區"
+#: src/PrefsUnifiedDlg.cpp:589
+msgid ""
+"aMule must be restarted to enable these changes:\n"
+"\n"
+msgstr ""
+"請重新啟動 aMule，變更的設定才能生效：\n"
+"\n"
 
-#: src/ClientListCtrl.cpp:1003
-msgid "Upload Status"
-msgstr "上傳狀態"
+#: src/PrefsUnifiedDlg.cpp:596
+msgid "- TCP port changed.\n"
+msgstr "- TCP 埠已變更。\n"
 
-#: src/ClientListCtrl.cpp:1004
-msgid "Transferred Up"
-msgstr "已傳輸"
+#: src/PrefsUnifiedDlg.cpp:601
+msgid "- UDP port changed.\n"
+msgstr "- UDP 埠已變更。\n"
 
-#: src/ClientListCtrl.cpp:1005
-msgid "Download Status"
-msgstr "下載狀態"
+#: src/PrefsUnifiedDlg.cpp:606
+msgid "- External connect port changed.\n"
+msgstr "- 已變更外部連線埠設定。\n"
+
+#: src/PrefsUnifiedDlg.cpp:610
+msgid "- External connect acceptance changed.\n"
+msgstr "- 已變更外部連線設定。\n"
+
+#: src/PrefsUnifiedDlg.cpp:614
+msgid "- External connect interface changed.\n"
+msgstr "- 已變更外部連線介面設定。\n"
 
-#: src/ClientListCtrl.cpp:1006
-msgid "Transferred Down"
-msgstr "已傳輸"
+#: src/PrefsUnifiedDlg.cpp:623
+msgid ""
+"Your Auto-update server list is empty.\n"
+"'Auto-update server list at startup' will be disabled."
+msgstr ""
+"您的自動更新伺服器清單是空的。\n"
+"「啟動時自動更新伺服器清單」功能將被停用。"
 
-#: src/ClientListCtrl.cpp:1009
-msgid "Userhash"
-msgstr "使用者雜湊值"
-
-#: src/ClientListCtrl.cpp:1010
-msgid "Encrypted"
-msgstr "已加密"
-
-#: src/ClientListCtrl.cpp:1011
-msgid "Hide shared files"
-msgstr "隱藏分享檔案"
+#: src/PrefsUnifiedDlg.cpp:630
+msgid ""
+"You have enabled external connections but have not specified a password.\n"
+"External connections cannot be enabled unless a valid password is specified."
+msgstr ""
+"您已經設定啓用外部連線但還沒有輸入密碼，\n"
+"輸入有效密碼之後，外部連線才能開始使用。"
 
-#: src/ClientDetailDialog.cpp:50
-msgid "Client Details"
-msgstr "客戶端詳細資訊"
+#: src/PrefsUnifiedDlg.cpp:642
+msgid "- Language changed.\n"
+msgstr "- 語言已變更。\n"
 
-#: src/ClientDetailDialog.cpp:129
-msgid "Enabled"
-msgstr "已啟用"
+#: src/PrefsUnifiedDlg.cpp:647
+msgid "- Temp folder changed.\n"
+msgstr "- 暫存資料夾已變更。\n"
 
-#: src/ClientDetailDialog.cpp:131
-msgid "Supported"
-msgstr "已支援"
+#: src/PrefsUnifiedDlg.cpp:652
+msgid "- ED2K network enabled.\n"
+msgstr "- ED2K 網路已啟用。\n"
 
-#: src/ClientDetailDialog.cpp:134 src/ClientDetailDialog.cpp:193
-msgid "Not supported"
-msgstr "不支援"
+#: src/PrefsUnifiedDlg.cpp:724
+msgid ""
+"Both eD2k and Kad network are disabled.\n"
+"You won't be able to connect until you enable at least one of them."
+msgstr ""
+"eD2k 與 Kad 網路都已停用。\n"
+"請至少啟用一種，否則您將無法連線。"
 
-#: src/ClientDetailDialog.cpp:137
-msgid "Disabled"
-msgstr "已停用"
+#: src/PrefsUnifiedDlg.cpp:728
+msgid ""
+"Kad will not start if your UDP port is disabled.\n"
+"Enable UDP port or disable Kad."
+msgstr ""
+"如果您停用 UDP 埠，Kad 將無法啓動。\n"
+"請啟用 UDP 埠或停用 Kad。"
 
-#: src/ClientDetailDialog.cpp:168 src/ClientDetailDialog.cpp:173
-#, c-format
-msgid "%.1f kB/s"
-msgstr "%.1f kB/s"
+#: src/PrefsUnifiedDlg.cpp:741
+msgid ""
+"\n"
+"You MUST restart aMule now.\n"
+"If you do not restart now, don't complain if anything bad happens.\n"
+msgstr ""
+"\n"
+"您必須立即重新啟動 aMule，\n"
+"如果現在不重啟動，可能會發生不可預期的問題。\n"
 
-#: src/ClientDetailDialog.cpp:199
-msgid "Not complete"
-msgstr "未完成"
+#: src/PrefsUnifiedDlg.cpp:841
+msgid ""
+"Your Auto-update servers list is in blank.\n"
+"Please fill in at least one URL to point to a valid server.met file.\n"
+"Click on the button \"List\" by this checkbox to enter an URL."
+msgstr ""
+"伺服器清單自動更新設定空白。\n"
+"請至少輸入一個能取得有效 server.met 檔案的網址。\n"
+"請點選旁邊的「清單」按鈕後輸入。"
 
-#: src/ClientDetailDialog.cpp:202
-msgid "Bad Guy"
-msgstr "壞蛋"
+#: src/PrefsUnifiedDlg.cpp:980
+msgid "Temporary files"
+msgstr "暫存檔"
 
-#: src/ClientDetailDialog.cpp:205
-msgid "Verified - OK"
-msgstr "驗證通過"
+#: src/PrefsUnifiedDlg.cpp:985
+msgid "Incoming files"
+msgstr "新進檔案"
 
-#: src/ClientDetailDialog.cpp:209
-msgid "Not Available"
-msgstr "N/A"
+#: src/PrefsUnifiedDlg.cpp:990
+msgid "Online Signatures"
+msgstr "線上簽名識別"
 
-#: src/ClientDetailDialog.cpp:215
+#: src/PrefsUnifiedDlg.cpp:1003
 #, c-format
-msgid "%u (QR: %u)"
-msgstr "%u (QR：%u)"
+msgid "Choose a folder for %s"
+msgstr "爲 %s 選擇資料夾"
 
-#: src/SearchDlg.cpp:527
-msgid "Min size must be smaller than max size. Max size ignored."
-msgstr "最小值必須小於最大值，最大值已被忽略。"
+#: src/PrefsUnifiedDlg.cpp:1023
+msgid "Browse for videoplayer"
+msgstr "瀏覽尋找影片播放器"
 
-#: src/SearchDlg.cpp:528 src/SearchDlg.cpp:587
-msgid "Search warning"
-msgstr "搜尋警告"
+#: src/PrefsUnifiedDlg.cpp:1027
+msgid "Select browser"
+msgstr "設定瀏覽器"
 
-#: src/MuleTrayIcon.cpp:121 src/MuleTrayIcon.cpp:147 src/MuleTrayIcon.cpp:502
-#: src/MuleTrayIcon.cpp:523
-msgid "Unlimited"
-msgstr "無限制"
+#: src/PrefsUnifiedDlg.cpp:1033
+#, c-format
+msgid "Executable%s"
+msgstr "可執行%s"
 
-#: src/MuleTrayIcon.cpp:340
-msgid "aMule Tray Menu"
-msgstr "aMule 狀態列選單"
+#: src/PrefsUnifiedDlg.cpp:1054
+msgid "Edit server list"
+msgstr "編輯伺服器清單"
 
-#: src/MuleTrayIcon.cpp:346
-msgid "Speed limits:"
-msgstr "速度限制："
+#: src/PrefsUnifiedDlg.cpp:1055
+msgid ""
+"Add here URL's to download server.met files.\n"
+"Only one url on each line."
+msgstr ""
+"加入可下載 server.met 檔案的網址。\n"
+"每一行一個網址。"
 
-#: src/MuleTrayIcon.cpp:351
-msgid "UL: None"
-msgstr "上傳：無"
+#: src/PrefsUnifiedDlg.cpp:1114 src/PrefsUnifiedDlg.cpp:1133
+#, c-format
+msgid "Update delay: %d second"
+msgid_plural "Update delay: %d seconds"
+msgstr[0] "更新延遲時間：%d 秒"
 
-#: src/MuleTrayIcon.cpp:354
+#: src/PrefsUnifiedDlg.cpp:1121
 #, c-format
-msgid "UL: %u"
-msgstr "上傳：%u"
+msgid "Time for average graph: %d minute"
+msgid_plural "Time for average graph: %d minutes"
+msgstr[0] "平均值圖表顯示時間：%d 分鐘"
 
-#: src/MuleTrayIcon.cpp:361
-msgid "DL: None"
-msgstr "下載：無"
+#: src/PrefsUnifiedDlg.cpp:1127
+#, c-format
+msgid "Connections Graph Scale: %d"
+msgstr "網路連線圖表比例：%d"
 
-#: src/MuleTrayIcon.cpp:364
+#: src/PrefsUnifiedDlg.cpp:1139
 #, c-format
-msgid "DL: %u"
-msgstr "下載：%u"
+msgid "File Buffer Size: %d byte"
+msgid_plural "File Buffer Size: %d bytes"
+msgstr[0] "檔案緩衝區大小：%d B"
 
-#: src/MuleTrayIcon.cpp:368
+#: src/PrefsUnifiedDlg.cpp:1145
 #, c-format
-msgid "Download speed: %.1f"
-msgstr "下載速度：%.1f"
+msgid "Upload Queue Size: %d client"
+msgid_plural "Upload Queue Size: %d clients"
+msgstr[0] "上傳等候區大小：%d "
 
-#: src/MuleTrayIcon.cpp:370
+#: src/PrefsUnifiedDlg.cpp:1152
 #, c-format
-msgid "Upload speed: %.1f"
-msgstr "上傳速度：%.1f"
+msgid "Server connection refresh interval: %d minute"
+msgid_plural "Server connection refresh interval: %d minutes"
+msgstr[0] "伺服器連線更新間隔時間：%d 分鐘"
 
-#: src/MuleTrayIcon.cpp:376
-msgid "Client Information"
-msgstr "客戶端資訊"
+#: src/PrefsUnifiedDlg.cpp:1154
+msgid "Server connection refresh interval: Disabled"
+msgstr "伺服器連線更新間隔時間：已停用"
+
+#: src/PrefsUnifiedDlg.cpp:1199
+msgid "disabled"
+msgstr "已停用"
 
-#: src/MuleTrayIcon.cpp:380
+#: src/PrefsUnifiedDlg.cpp:1222
 #, c-format
-msgid "Nickname: %s"
-msgstr "暱稱：%s"
+msgid "Execute command on '%s' event"
+msgstr "發生 %s 事件時執行指令"
 
-#: src/MuleTrayIcon.cpp:380
-msgid "No Nickname Selected!"
-msgstr "未選取暱稱！"
+#: src/PrefsUnifiedDlg.cpp:1225
+msgid "Enable command execution on core"
+msgstr "啓用在主程式端執行指令"
 
-#: src/MuleTrayIcon.cpp:387
-msgid "ClientID: "
-msgstr "客戶端 ID："
+#: src/PrefsUnifiedDlg.cpp:1233
+msgid "Core command:"
+msgstr "主程式端指令："
 
-#: src/MuleTrayIcon.cpp:400
-msgid "ServerName: "
-msgstr "伺服器名稱："
+#: src/PrefsUnifiedDlg.cpp:1242
+msgid "Enable command execution on GUI"
+msgstr "啓用在圖形界面端執行指令"
 
-#: src/MuleTrayIcon.cpp:401
-msgid "ServerIP: "
-msgstr "伺服器 IP："
+#: src/PrefsUnifiedDlg.cpp:1250
+msgid "GUI command:"
+msgstr "圖形界面端指令："
 
-#: src/MuleTrayIcon.cpp:416
-#, c-format
-msgid "IP: %s"
-msgstr "IP：%s"
+#: src/PrefsUnifiedDlg.cpp:1259
+msgid "The following variables will be replaced:"
+msgstr ""
+"使用以下變數：\n"
+" "
 
-#: src/MuleTrayIcon.cpp:425
-#, c-format
-msgid "TCP port: %d"
-msgstr "TCP 埠：%d"
+#: src/SearchDlg.cpp:506
+msgid "Min size must be smaller than max size. Max size ignored."
+msgstr "最小值必須小於最大值，最大值已被忽略。"
 
-#: src/MuleTrayIcon.cpp:427
-msgid "TCP port: Not ready"
-msgstr "TCP 埠：尚未就緒"
+#: src/SearchDlg.cpp:507 src/SearchDlg.cpp:566
+msgid "Search warning"
+msgstr "搜尋警告"
 
-#: src/MuleTrayIcon.cpp:436
-#, c-format
-msgid "UDP port: %d"
-msgstr "UDP 埠：%d"
+#: src/SearchDlg.cpp:626 src/SearchListCtrl.cpp:628
+msgid "Main"
+msgstr "主要"
 
-#: src/MuleTrayIcon.cpp:438
-msgid "UDP port: Not ready"
-msgstr "UDP 埠：尚未就緒"
+#: src/SearchList.cpp:292
+msgid "Kad search can't be done if Kad is not running"
+msgstr "Kad 網路尚未連線，無法使用 Kad 搜尋"
 
-#: src/MuleTrayIcon.cpp:447
-msgid "Online Signature: Enabled"
-msgstr "線上簽名識別：啟用"
+#: src/SearchList.cpp:294
+msgid "eD2k search can't be done if eD2k is not connected"
+msgstr "eD2k 網路尚未連線，無法使用 eD2k 搜尋"
 
-#: src/MuleTrayIcon.cpp:450
-msgid "Online Signature: Disabled"
-msgstr "線上簽名識別：停用"
+#: src/SearchList.cpp:343
+msgid "Unexpected error while attempting Kad search: "
+msgstr "試圖 Kad 搜尋時發生無法預料的錯誤："
 
-#: src/MuleTrayIcon.cpp:463
-#, c-format
-msgid "Shared files: %d"
-msgstr "已分享檔案：%d"
+#: src/SearchListCtrl.cpp:91 src/SharedFilesCtrl.cpp:105
+msgid "FileID"
+msgstr "檔案 ID"
 
-#: src/MuleTrayIcon.cpp:469
-#, c-format
-msgid "Queued clients: %d"
-msgstr "等候中客戶端：%d"
+#: src/SearchListCtrl.cpp:624
+msgid "File"
+msgstr "檔案"
 
-#: src/MuleTrayIcon.cpp:476
+#: src/SearchListCtrl.cpp:634
+msgid "Download in category"
+msgstr "分類下載"
+
+#: src/SearchListCtrl.cpp:639
 #, c-format
-msgid "Total DL: %s"
-msgstr "總下載：%s"
+msgid "Get %s for this file"
+msgstr "取得這個檔案的 %s"
+
+#: src/SearchListCtrl.cpp:643
+msgid "Search related files (eD2k, local server)"
+msgstr "搜尋相關檔案 (eD2k，本地伺服器)"
 
-#: src/MuleTrayIcon.cpp:483
+#: src/SearchListCtrl.cpp:648
+msgid "Mark as known file"
+msgstr "標記為已知檔案"
+
+#: src/SearchListCtrl.cpp:652 src/ServerListCtrl.cpp:426
+msgid "Copy eD2k link to clipboard"
+msgstr "複製 eD2k 連結到剪貼簿"
+
+#: src/SearchListCtrl.cpp:1014
+msgid "Canceled"
+msgstr "已取消"
+
+#: src/SearchListCtrl.cpp:1017
+msgid "New"
+msgstr "新"
+
+#: src/ServerConnect.cpp:74
+msgid ""
+"Failed to connect to all obfuscated servers listed. Making another pass "
+"without obfuscation."
+msgstr "無法與清單中的模糊伺服器連線，嘗試不使用模糊協定。"
+
+#: src/ServerConnect.cpp:79
+msgid "Failed to connect to all servers listed. Making another pass."
+msgstr "無法與清單中的模糊伺服器連線，開始下一輪嘗試。"
+
+#: src/ServerConnect.cpp:94 src/ServerConnect.cpp:148
+msgid "eD2k network disabled on preferences, not connecting."
+msgstr "eD2k 網路已在偏好設定中被停用了，未連線。"
+
+#: src/ServerConnect.cpp:122 src/ServerConnect.cpp:135
+msgid "No valid servers to which to connect found in server list"
+msgstr "在伺服器清單中找不到有效的伺服器可連線"
+
+#: src/ServerConnect.cpp:198
 #, c-format
-msgid "Total UL: %s"
-msgstr "總上傳：%s"
+msgid "Connected to %s (%s:%i)"
+msgstr "已連線到 %s (%s:%i)"
 
-#: src/MuleTrayIcon.cpp:494
-msgid "Upload limit"
-msgstr "上傳限制"
+#: src/ServerConnect.cpp:274
+#, c-format
+msgid "Connection established on: %s"
+msgstr "已連線到：%s"
 
-#: src/MuleTrayIcon.cpp:498
-msgid "Download limit"
-msgstr "下載限制"
+#: src/ServerConnect.cpp:346
+msgid "Fatal Error while trying to connect. Internet connection might be down"
+msgstr "連線時發生嚴重錯誤. 網路連線可能有問題"
 
-#: src/MuleTrayIcon.cpp:558
-msgid "Hide aMule"
-msgstr "隱藏 aMule"
+#: src/ServerConnect.cpp:350
+#, c-format
+msgid "Lost connection to %s (%s:%i)"
+msgstr "已與 %s (%s:%i) 失去連線"
 
-#: src/MuleTrayIcon.cpp:561
-msgid "Show aMule"
-msgstr "顯示 aMule"
+#: src/ServerConnect.cpp:360
+#, c-format
+msgid "%s (%s:%i) appears to be dead."
+msgstr "%s (%s:%i) 可能已當機。"
 
-#: src/ChatSelector.cpp:127
+#: src/ServerConnect.cpp:373
 #, c-format
-msgid "Chat-Session Started: %s (%s:%u) - %s %s"
-msgstr "已開始交談：%s (%s:%u) - %s %s"
+msgid "%s (%s:%i) appears to be full."
+msgstr "%s (%s:%i) 可能已客滿。"
 
-#: src/ChatSelector.cpp:206 src/ChatSelector.cpp:286
-msgid "*** Connected to Client ***"
-msgstr "*** 已連線到客戶端 ***"
+#: src/ServerConnect.cpp:392
+#, c-format
+msgid "Automatic connection to server will retry in %d second"
+msgid_plural "Automatic connection to server will retry in %d seconds"
+msgstr[0] "在 %d 秒後自動連線到伺服器"
 
-#: src/ChatSelector.cpp:249
-msgid "*** Connecting to Client ***"
-msgstr "*** 正在連線到客戶端 ***"
+#: src/ServerConnect.cpp:412
+msgid "Connection lost"
+msgstr "失去連線"
 
-#: src/ChatSelector.cpp:280
-msgid "*** Failed to Connect to client / Connection lost ***"
-msgstr "*** 無法連線到客戶端 / 連線中斷 ***"
+#: src/ServerConnect.cpp:419
+#, c-format
+msgid "Connecting to %s (%s:%i) failed."
+msgstr "無法連線到 %s (%s:%i)。"
 
-#: src/MuleNotebook.cpp:162
-msgid "Close tab"
-msgstr "關閉分頁"
+#: src/ServerConnect.cpp:461
+msgid "ERROR: Socket invalid at timeout check"
+msgstr "錯誤：連接端點於逾時查驗時失效"
 
-#: src/MuleNotebook.cpp:163
-msgid "Close all tabs"
-msgstr "關閉所有分頁"
+#: src/ServerConnect.cpp:471
+#, c-format
+msgid "Connection attempt to %s (%s:%i) timed out."
+msgstr "連線到 %s (%s:%i) 時逾時。"
 
-#: src/MuleNotebook.cpp:164
-msgid "Close other tabs"
-msgstr "關閉其它分頁"
+#: src/ServerConnect.cpp:645
+msgid "Received late result of DNS lookup, discarding."
+msgstr "接收到過期的 DNS 查閱，放棄中。"
 
-#: src/ServerList.cpp:84
+#: src/ServerList.cpp:88
 #, c-format
 msgid "Loading server.met file: %s"
 msgstr "正在載入 server.met 檔案：%s"
 
-#: src/ServerList.cpp:89
+#: src/ServerList.cpp:93
 msgid "Server.met file not found!"
 msgstr "找不到 server.met 檔案！"
 
-#: src/ServerList.cpp:97
+#: src/ServerList.cpp:101
 #, c-format
 msgid "Failed to load server.met file '%s', unknown format encountered."
-msgstr "無法載入 server.met 檔案 '%s'，不明格式。"
+msgstr "無法載入 server.met 檔案 %s，為不明格式。"
 
-#: src/ServerList.cpp:103
+#: src/ServerList.cpp:107
 msgid "Failed to open server.met!"
 msgstr "無法開啟 server.met ！"
 
-#: src/ServerList.cpp:114
+#: src/ServerList.cpp:118
 #, c-format
 msgid "Server.met file corrupt, found invalid versiontag: 0x%x, size %i"
-msgstr "server.met 檔案損壞，找到無效的版本標記：0x%x, 大小 %i"
+msgstr "server.met 檔案損壞，發現無效的版本標記：0x%x, 大小 %i"
 
-#: src/ServerList.cpp:169
+#: src/ServerList.cpp:173
 #, c-format
 msgid "%i server in server.met found"
 msgid_plural "%i servers in server.met found"
 msgstr[0] "在 server.met 中找到 %i 個伺服器"
-msgstr[1] "在 server.met 中找到 %i 個伺服器"
 
-#: src/ServerList.cpp:171
+#: src/ServerList.cpp:175
 #, c-format
 msgid "%d server added"
 msgid_plural "%d servers added"
 msgstr[0] "已加入 %d 個伺服器"
-msgstr[1] "已加入 %d 個伺服器"
 
-#: src/ServerList.cpp:192
+#: src/ServerList.cpp:178
+msgid "Error: the file 'server.met' is corrupted: "
+msgstr "錯誤:  server.met 檔案已經損壞: "
+
+#: src/ServerList.cpp:182
+msgid "IO error while reading 'server.met': "
+msgstr "讀取 server.met 時發生 IO 錯誤："
+
+#: src/ServerList.cpp:195
 #, c-format
 msgid "Server not added: [%s:%d] does not specify a valid port."
 msgstr "未加入伺服器：[%s:%d] 的通訊埠無效。"
 
-#: src/ServerList.cpp:208
+#: src/ServerList.cpp:213
 #, c-format
 msgid "Server not added: The IP of [%s:%d] is filtered or invalid."
 msgstr "未加入伺服器：[%s:%d] 已被過濾或無效。"
 
-#: src/ServerList.cpp:228
+#: src/ServerList.cpp:232
 #, c-format
 msgid "Server not added: Server with matching IP:Port [%s:%d] found in list."
 msgstr "未加入伺服器：%s:%d 已在伺服器清單中。"
 
-#: src/ServerList.cpp:247
+#: src/ServerList.cpp:250
 #, c-format
 msgid "Server added: Server at [%s:%d] using the name '%s'."
-msgstr "已加入伺服器：[%s:%d]  名稱 '%s' 。"
+msgstr "已加入伺服器：[%s:%d]  名稱 %s 。"
 
-#: src/ServerList.cpp:342
+#: src/ServerList.cpp:345
 msgid ""
 "You are connected to the server you are trying to delete. please disconnect "
 "first."
 msgstr "現在正連線到要刪除的伺服器。請先中斷連線。"
 
-#: src/ServerList.cpp:629
+#: src/ServerList.cpp:517
+#, c-format
+msgid "Failed to open '%s'"
+msgstr "無法開啟 %s"
+
+#: src/ServerList.cpp:685
 msgid "Failed to save server.met!"
 msgstr "無法儲存 server.met ！"
 
-#: src/ServerList.cpp:782
+#: src/ServerList.cpp:832
 msgid "Invalid URL"
 msgstr "無效網址"
 
-#: src/ServerList.cpp:805
+#: src/ServerList.cpp:854
 #, c-format
-msgid "Finished to download the server list from %s"
+msgid "Finished downloading the server list from %s"
 msgstr "完成從 %s 下載伺服器清單"
 
-#: src/ServerList.cpp:807 src/ServerList.cpp:861
-#, c-format
-msgid "Failed to download the server list from %s"
-msgstr "無法從 %s 下載伺服器清單"
-
-#: src/ServerList.cpp:818
+#: src/ServerList.cpp:869
 msgid ""
 "No server list address entry in 'addresses.dat' found. Please paste a valid "
 "server list address into this file in order to auto-update your server list"
@@ -6775,792 +5317,2385 @@
 "在 addresses.dat 中找不到伺服器清單檔位址。請在檔案中貼上有效的伺服器清單檔位"
 "址，以自動更新您的伺服器清單"
 
-#: src/ServerList.cpp:831
+#: src/ServerList.cpp:882
 #, c-format
 msgid "Start downloading server list from %s"
 msgstr "開始從 %s下載伺服器清單"
 
-#: src/ServerList.cpp:840
+#: src/ServerList.cpp:891
 #, c-format
 msgid "WARNING: invalid URL specified for auto-updating of servers: %s"
 msgstr "警告：自動更新伺服器的網址無效 - %s"
 
-#: src/ServerList.cpp:844
+#: src/ServerList.cpp:895
 msgid "No valid server.met auto-download url on addresses.dat"
 msgstr "addresses.dat 檔案中沒有有效的自動更新伺服器清單網址"
 
-#: src/ServerList.cpp:937
+#: src/ServerList.cpp:911
+#, c-format
+msgid "Failed to download the server list from %s"
+msgstr "無法從 %s 下載伺服器清單"
+
+#: src/ServerList.cpp:985
 msgid ""
 "Local server is filtered by the IPFilters, reconnecting to a different "
 "server!"
 msgstr "本地伺服器被 IP 過濾器過濾掉了，正在重新連線到其他伺服器！"
 
-#: src/UserEvents.cpp:132
-#, c-format
-msgid "Failed to execute command `%s' on `%s' event."
-msgstr "無法執行指令 '%s' (事件：'%s' )。"
+#: src/ServerListCtrl.cpp:86
+msgid "Server Name"
+msgstr "伺服器名稱"
 
-#: src/amule.cpp:703
-msgid ""
-"Your locale has been changed to System Default due to a configuration "
-"change. Sorry."
-msgstr "對不起，由於版本變更，您的地區設定已經被變更爲系統預設值。"
+#: src/ServerListCtrl.cpp:87
+msgid "Address"
+msgstr "位址"
 
-#: src/amule.cpp:786
+#: src/ServerListCtrl.cpp:88
+msgid "Port"
+msgstr "通訊埠"
+
+#: src/ServerListCtrl.cpp:89
+msgid "Description"
+msgstr "說明"
+
+#: src/ServerListCtrl.cpp:90
+msgid "Ping"
+msgstr "Ping"
+
+#: src/ServerListCtrl.cpp:91
+msgid "Users"
+msgstr "使用者"
+
+#: src/ServerListCtrl.cpp:95
+msgid "Static"
+msgstr "靜態"
+
+#
+#: src/ServerListCtrl.cpp:96 src/SharedFilePeersListCtrl.cpp:34
+#: src/SourceListCtrl.cpp:33 src/Statistics.cpp:954
+msgid "Version"
+msgstr "版本"
+
+#: src/ServerListCtrl.cpp:148
 msgid ""
-"You don't have any server in the server list.\n"
-"Do you want aMule to download a new list now?"
-msgstr ""
-"在伺服器清單中沒有任何伺服器。\n"
-"要讓 aMule 現在就下載一個新的嗎？"
+"You are connected to a server you are trying to delete. Please disconnect "
+"first. The server was NOT deleted."
+msgstr "您現在正和要刪除的伺服器連線，該伺服器暫時無法刪除。請先中斷連線。"
 
-#: src/amule.cpp:787
-msgid "Server list download"
-msgstr "已下載伺服器清單"
+#: src/ServerListCtrl.cpp:151
+msgid "(Unknown name)"
+msgstr "(不明名稱)"
 
-#: src/amule.cpp:846
+#: src/ServerListCtrl.cpp:153
 #, c-format
-msgid "web server running on pid %d"
-msgstr "執行中網站伺服器的 pid：%d"
+msgid "Are you sure you want to delete the static server %s"
+msgstr "您確定要刪除靜態伺服器 %s"
 
-#: src/amule.cpp:850
+#: src/ServerListCtrl.cpp:347
+#, c-format
+msgid "Servers (%i)"
+msgstr "伺服器 (%i)"
+
+#: src/ServerListCtrl.cpp:396 src/ServerSocket.cpp:257
+#: src/ServerSocket.cpp:272 src/ServerWnd.cpp:178
+msgid "Server"
+msgstr "伺服器"
+
+#: src/ServerListCtrl.cpp:401
+msgid "Connect to server"
+msgstr "連線到伺服器"
+
+#: src/ServerListCtrl.cpp:407
+msgid "Mark server as static"
+msgstr "標記爲靜態伺服器"
+
+#: src/ServerListCtrl.cpp:408
+msgid "Mark server as non-static"
+msgstr "標記爲非靜態伺服器"
+
+#: src/ServerListCtrl.cpp:410
+msgid "Mark servers as static"
+msgstr "標記爲靜態伺服器"
+
+#: src/ServerListCtrl.cpp:411
+msgid "Mark servers as non-static"
+msgstr "標記爲非靜態伺服器"
+
+#: src/ServerListCtrl.cpp:417
+msgid "Remove server"
+msgstr "移除伺服器"
+
+#: src/ServerListCtrl.cpp:419
+msgid "Remove servers"
+msgstr "移除伺服器"
+
+#: src/ServerListCtrl.cpp:421
+msgid "Remove all servers"
+msgstr "移除所有伺服器"
+
+#: src/ServerListCtrl.cpp:428
+msgid "Copy eD2k links to clipboard"
+msgstr "複製 eD2k 連結到剪貼簿"
+
+#: src/ServerListCtrl.cpp:436
+msgid "Reconnect to server"
+msgstr "重新連線到伺服器"
+
+#: src/ServerListCtrl.cpp:525
+msgid "Are you sure that you wish to delete all servers?"
+msgstr "您確定要刪除所有伺服器嗎？"
+
+#: src/ServerListCtrl.cpp:541
+msgid "Are you sure that you wish to delete the selected server?"
+msgstr "您確定要刪除選取的伺服器嗎？"
+
+#: src/ServerListCtrl.cpp:543
+msgid "Are you sure that you wish to delete the selected servers?"
+msgstr "您確定要刪除選取的伺服器嗎？"
+
+#: src/ServerSocket.cpp:259
+#, c-format
+msgid "ERROR: %s (%s) - %s"
+msgstr "錯誤：%s (%s) - %s"
+
+#: src/ServerSocket.cpp:274
+#, c-format
+msgid "WARNING: %s (%s) - %s"
+msgstr "警告：%s (%s) - %s"
+
+#: src/ServerSocket.cpp:413
+#, c-format
+msgid "New clientid is %u"
+msgstr "新客戶端 ID：%u"
+
+#: src/ServerSocket.cpp:415
+msgid "WARNING: You have received Low-ID!"
+msgstr "警告：您現在是 Low-ID！"
+
+#: src/ServerSocket.cpp:416
+msgid "\tMost likely this is because you're behind a firewall or router."
+msgstr "\t可能是因爲受到防火牆或網路分享器影響。"
+
+#: src/ServerSocket.cpp:417
+msgid "\tFor more information, please refer to http://wiki.amule.org"
+msgstr "\t請參考 http://wiki.amule.org 的資訊"
+
+#: src/ServerSocket.cpp:474
+msgid "Unknown server info received! - too short"
+msgstr "收到不明伺服器資訊 ! - 長度過短"
+
+#: src/ServerSocket.cpp:535
+#, c-format
+msgid "Received %d new server"
+msgid_plural "Received %d new servers"
+msgstr[0] "收到 %d 個新伺服器"
+
+#: src/ServerSocket.cpp:538
+msgid "Saving of server-list completed."
+msgstr "伺服器清單儲存完畢。"
+
+#: src/ServerSocket.cpp:588
+msgid "Server rejected last command"
+msgstr "伺服器已拒絕上一個指令"
+
+#: src/ServerSocket.cpp:596 src/ServerSocket.cpp:598
+#, c-format
+msgid "Bogus packet received from server: %s"
+msgstr "從伺服器收到偽裝封包：%s"
+
+#: src/ServerSocket.cpp:600
+#, c-format
+msgid "Unhandled error while processing packet from server: %s"
+msgstr "處理伺服器傳來的封包時發生無法處理的錯誤：%s "
+
+#: src/ServerSocket.cpp:639 src/ServerSocket.cpp:643
+#, c-format
+msgid "Cannot create DNS solving thread for connecting to %s"
+msgstr "無法送出 DNS 解析執行緒以連線到 %s"
+
+#: src/ServerSocket.cpp:725
+#, c-format
+msgid "Server IP %s (%s) is filtered.  Not connecting."
+msgstr "伺服器 IP %s (%s) 已被過濾。未連線。"
+
+#: src/ServerSocket.cpp:735
+msgid "using protocol obfuscation."
+msgstr "，使用模糊協定。"
+
+#: src/ServerSocket.cpp:744
+#, c-format
+msgid "Connecting to %s (%s - %s:%i) %s"
+msgstr "正在連線到 %s (%s - %s:%i) %s"
+
+#: src/ServerSocket.cpp:757
+#, c-format
+msgid "Could not solve dns for server %s: Unable to connect!"
+msgstr "無法解析伺服器 %s 的 DNS 資訊：無法連線！"
+
+#: src/ServerWnd.cpp:102
+msgid "Server not added: No IP or hostname specified."
+msgstr "伺服器未加入：沒有 IP 或主機名稱。"
+
+#: src/ServerWnd.cpp:107
+msgid "Server not added: Invalid server-port specified."
+msgstr "伺服器未加入：無效的伺服器通訊埠。"
+
+#: src/ServerWnd.cpp:160
+msgid "eD2k Status:"
+msgstr "eD2k 狀態："
+
+#: src/ServerWnd.cpp:171
+msgid "ID"
+msgstr "ID"
+
+#: src/ServerWnd.cpp:203
+msgid "Kademlia Status:"
+msgstr "Kad 狀態："
+
+#: src/ServerWnd.cpp:206
+msgid "Running in LAN mode"
+msgstr "在區域網路模式下執行"
+
+#: src/ServerWnd.cpp:206
+msgid "Running"
+msgstr "執行中"
+
+#: src/ServerWnd.cpp:209
+msgid "Status:"
+msgstr "狀態："
+
+#: src/ServerWnd.cpp:212
+msgid "Connection State:"
+msgstr "連線狀態："
+
+#: src/ServerWnd.cpp:214
+#, c-format
+msgid "Firewalled - open TCP port %d in your router or firewall"
+msgstr "防火牆內 - 請設定您的路由器或防火牆開啟 TCP 埠 %d "
+
+#: src/ServerWnd.cpp:216
+msgid "UDP Connection State:"
+msgstr "UDP 連線狀態："
+
+#: src/ServerWnd.cpp:219
+#, c-format
+msgid "Firewalled - open UDP port %d in your router or firewall"
+msgstr "防火牆內 - 請設定您的路由器或防火牆開啟 UDP 埠 %d "
+
+#: src/ServerWnd.cpp:223
+msgid "Firewalled state: "
+msgstr "防火牆狀態："
+
+#: src/ServerWnd.cpp:229
+msgid "No buddy required - TCP port open"
+msgstr "沒有好友要求 - TCP 埠開啟"
+
+#: src/ServerWnd.cpp:231
+msgid "No buddy required - UDP port open"
+msgstr "沒有好友要求 - UDP 埠開啟"
+
+#: src/ServerWnd.cpp:233
+msgid "No buddy"
+msgstr "沒有好友"
+
+#: src/ServerWnd.cpp:237
+msgid "Connecting to buddy"
+msgstr "正在與好友連線"
+
+#: src/ServerWnd.cpp:240
+#, c-format
+msgid "Connected to buddy at %s"
+msgstr "已與在 %s 的好友連線"
+
+#: src/ServerWnd.cpp:250
+msgid "Indexed sources:"
+msgstr "索引來源："
+
+#: src/ServerWnd.cpp:252
+msgid "Indexed keywords:"
+msgstr "索引關鍵字："
+
+#: src/ServerWnd.cpp:254
+msgid "Indexed notes:"
+msgstr "索引註釋："
+
+#: src/ServerWnd.cpp:256
+msgid "Indexed load:"
+msgstr "索引負載："
+
+#: src/ServerWnd.cpp:259
+msgid "Average Users:"
+msgstr "平均使用者數："
+
+#: src/ServerWnd.cpp:262
+msgid "Average Files:"
+msgstr "平均檔案數："
+
+#: src/ServerWnd.cpp:267 src/TextClient.cpp:728
+msgid "Not running"
+msgstr "未執行"
+
+#: src/SharedFileList.cpp:332
+#, c-format
+msgid "Adding file %s to shares"
+msgstr "正在加入分享檔案 %s"
+
+#: src/SharedFileList.cpp:371
+#, c-format
+msgid "Found %i known shared file"
+msgid_plural "Found %i known shared files"
+msgstr[0] "找到 %i 個已知的分享檔案"
+
+#: src/SharedFileList.cpp:377
+#, c-format
+msgid "Found %i known shared file, %i unknown"
+msgid_plural "Found %i known shared files, %i unknown"
+msgstr[0] "發現 %i 個已知、%i 個不明的分享檔案"
+
+#: src/SharedFileList.cpp:386
+#, c-format
+msgid "ERROR: Attempted to share %s"
+msgstr "錯誤：試圖分享 %s"
+
+#: src/SharedFileList.cpp:410
+#, c-format
+msgid "Shared directory not found, skipping: %s"
+msgstr "找不到分享目錄，略過：%s"
+
+#: src/SharedFileList.cpp:480
+#, c-format
+msgid "No shareable files found in directory: %s"
+msgstr "目錄中找不到可分享的檔案：%s"
+
+#: src/SharedFilePeersListCtrl.cpp:28 src/SourceListCtrl.cpp:28
+msgid "User Name"
+msgstr "使用者名稱"
+
+#: src/SharedFilePeersListCtrl.cpp:30
+msgid "Download Speed"
+msgstr "下載速度"
+
+#: src/SharedFilePeersListCtrl.cpp:32
+msgid "Upload Speed"
+msgstr "上傳速度"
+
+#: src/SharedFilePeersListCtrl.cpp:33 src/SourceListCtrl.cpp:32
+msgid "Available Parts"
+msgstr "可取得的部份"
+
+#: src/SharedFilePeersListCtrl.cpp:35
+msgid "Upload Status"
+msgstr "上傳狀態"
+
+#: src/SharedFilePeersListCtrl.cpp:36 src/SourceListCtrl.cpp:34
+msgid "Download Status"
+msgstr "下載狀態"
+
+#: src/SharedFilePeersListCtrl.cpp:37 src/SourceListCtrl.cpp:35
+msgid "Origin"
+msgstr "來源"
+
+#: src/SharedFilePeersListCtrl.cpp:38 src/SourceListCtrl.cpp:36
+msgid "Local File Name"
+msgstr "本地檔案名稱"
+
+#: src/SharedFilePeersListCtrl.cpp:39 src/SourceListCtrl.cpp:38
+msgid "Shares File List"
+msgstr "分享檔案清單"
+
+#: src/SharedFilesCtrl.cpp:106
+msgid "Requests"
+msgstr "要求"
+
+#: src/SharedFilesCtrl.cpp:107
+msgid "Accepted Requests"
+msgstr "已接受要求"
+
+#: src/SharedFilesCtrl.cpp:108
+msgid "Transferred Data"
+msgstr "已傳輸資料"
+
+#: src/SharedFilesCtrl.cpp:109
+msgid "Share Ratio"
+msgstr "分享率"
+
+#: src/SharedFilesCtrl.cpp:110
+msgid "Obtained Parts"
+msgstr "已獲得部分"
+
+#: src/SharedFilesCtrl.cpp:111
+msgid "Complete Sources"
+msgstr "完整來源"
+
+#: src/SharedFilesCtrl.cpp:112
+msgid "Directory Path"
+msgstr "所在目錄"
+
+#: src/SharedFilesCtrl.cpp:149
+msgid "Add Comment/Rating"
+msgstr "加入註解/評價"
+
+#: src/SharedFilesCtrl.cpp:151
+msgid "Edit Comment/Rating"
+msgstr "編輯註解/評價"
+
+#: src/SharedFilesCtrl.cpp:155
+msgid "Rename"
+msgstr "重新命名"
+
+#: src/SharedFilesCtrl.cpp:159
+msgid "Add files in collection to transfer list"
+msgstr "加入收藏中的檔案到傳輸清單"
+
+#: src/SharedFilesCtrl.cpp:162
+msgid "Copy magnet &URI to clipboard"
+msgstr "複製 magnet 網址到剪貼簿(&U)"
+
+#: src/SharedFilesCtrl.cpp:164
+msgid "Copy eD2k link to clipboard (&Source)"
+msgstr "複製 eD2k 連結到剪貼簿 (來源) (&S)"
+
+#: src/SharedFilesCtrl.cpp:165
+msgid "Copy eD2k link to clipboard (Source) (&With Crypt options)"
+msgstr "複製 eD2k 連結到剪貼簿 (來源，加密) (&W)"
+
+#: src/SharedFilesCtrl.cpp:166
+msgid "Copy eD2k link to clipboard (&Hostname)"
+msgstr "複製 eD2k 連結到剪貼簿 (主機名稱) (&H)"
+
+#: src/SharedFilesCtrl.cpp:167
+msgid "Copy eD2k link to clipboard (Hostname) (With &Crypt options)"
+msgstr "複製 eD2k 連結到剪貼簿 (主機名稱，加密) (&C)"
+
+#: src/SharedFilesCtrl.cpp:168
+msgid "Copy eD2k link to clipboard (&AICH info)"
+msgstr "複製 eD2k 連結到剪貼簿 (AICH 資訊) (&A)"
+
+#: src/SharedFilesCtrl.cpp:315
+msgid "You need a HighID to create a valid sourcelink"
+msgstr "您需要一個 HighID 才能建立有效來源連結"
+
+#: src/SharedFilesCtrl.cpp:461
+#, c-format
+msgid "Shared Files (%i)"
+msgstr "分享檔案 (%i)"
+
+#: src/SharedFilesCtrl.cpp:596
+msgid "[PartFile]"
+msgstr "[--暫存檔--]"
+
+#: src/SourceListCtrl.cpp:37
+msgid "Remote File Name"
+msgstr "遠端檔案名稱"
+
+#: src/Statistics.cpp:732
+#, c-format
+msgid "Uploaded Data (Session (Total)): %s"
+msgstr "本次上傳量/總計上傳量：%s"
+
+#: src/Statistics.cpp:734 src/Statistics.cpp:755
+#, c-format
+msgid "Total Overhead (Packets): %s"
+msgstr "額外支出傳輸量/封包： %s"
+
+#: src/Statistics.cpp:735 src/Statistics.cpp:756
+#, c-format
+msgid "File Request Overhead (Packets): %s"
+msgstr "  檔案要求支出傳輸量/封包：%s"
+
+#: src/Statistics.cpp:737 src/Statistics.cpp:758
+#, c-format
+msgid "Source Exchange Overhead (Packets): %s"
+msgstr "  來源交換支出傳輸量/封包： %s"
+
+#: src/Statistics.cpp:739 src/Statistics.cpp:760
+#, c-format
+msgid "Server Overhead (Packets): %s"
+msgstr "  伺服器支出傳輸量/封包： %s"
+
+#: src/Statistics.cpp:741 src/Statistics.cpp:762
+#, c-format
+msgid "Kad Overhead (Packets): %s"
+msgstr "  Kad 網路支出傳輸量/封包： %s"
+
+#: src/Statistics.cpp:743 src/Statistics.cpp:764
+#, c-format
+msgid "Crypt overhead (UDP): %s"
+msgstr "  加密支出傳輸量/封包： %s"
+
+#: src/Statistics.cpp:745
+#, c-format
+msgid "Active Uploads: %s"
+msgstr "目前上傳數：%s"
+
+#: src/Statistics.cpp:746
+#, c-format
+msgid "Waiting Uploads: %s"
+msgstr "等候中：%s"
+
+#: src/Statistics.cpp:747
+#, c-format
+msgid "Total successful upload sessions: %s"
+msgstr "上傳成功總次數：%s"
+
+#: src/Statistics.cpp:748
+#, c-format
+msgid "Total failed upload sessions: %s"
+msgstr "上傳失敗總次數：%s"
+
+#: src/Statistics.cpp:750
+#, c-format
+msgid "Average upload time: %s"
+msgstr "平均上傳時間：%s"
+
+#: src/Statistics.cpp:753
+#, c-format
+msgid "Downloaded Data (Session (Total)): %s"
+msgstr "本次下載量/總計下載量：%s"
+
+#: src/Statistics.cpp:766
+#, c-format
+msgid "Found Sources: %s"
+msgstr "找到的來源數：%s"
+
+#: src/Statistics.cpp:767
+#, c-format
+msgid "Active Downloads (chunks): %s"
+msgstr "目前下載中區塊數：%s"
+
+#: src/Statistics.cpp:769
+#, c-format
+msgid "Session UL:DL Ratio (Total): %s"
+msgstr "本次上傳下載比率 (總計)：%s"
+
+#: src/Statistics.cpp:772
+#, c-format
+msgid "Average download rate (Session): %s"
+msgstr "本次平均下載速度：%s"
+
+#: src/Statistics.cpp:773
+#, c-format
+msgid "Average upload rate (Session): %s"
+msgstr "本次平均上傳速度：%s"
+
+#: src/Statistics.cpp:774
+#, c-format
+msgid "Max download rate (Session): %s"
+msgstr "本次最大下載速度：%s"
+
+#: src/Statistics.cpp:775
+#, c-format
+msgid "Max upload rate (Session): %s"
+msgstr "本次最大上傳速度：%s"
+
+#: src/Statistics.cpp:776
+#, c-format
+msgid "Reconnects: %i"
+msgstr "重新連線次數：%i"
+
+#: src/Statistics.cpp:777
+#, c-format
+msgid "Time Since First Transfer: %s"
+msgstr "首次傳輸至今時間：%s"
+
+#: src/Statistics.cpp:778
+#, c-format
+msgid "Connected To Server Since: %s"
+msgstr "與伺服器連線時間：%s"
+
+#: src/Statistics.cpp:779
+#, c-format
+msgid "Active Connections (estimate): %i"
+msgstr "目前連線數 (估計值)：%i"
+
+#: src/Statistics.cpp:780
+#, c-format
+msgid "Max Connection Limit Reached: %s"
+msgstr "達到最大連線量次數：%s"
+
+#: src/Statistics.cpp:781
+#, c-format
+msgid "Average Connections (estimate): %g"
+msgstr "平均連線數 (估計值)：%g"
+
+#: src/Statistics.cpp:783
+#, c-format
+msgid "Peak Connections (estimate): %i"
+msgstr "最高連線數 (估計值)：%i"
+
+#: src/Statistics.cpp:785
+msgid "Clients"
+msgstr "客戶端"
+
+#: src/Statistics.cpp:786
+#, c-format
+msgid "Unknown: %s"
+msgstr "不明：%s"
+
+#: src/Statistics.cpp:792
+#, c-format
+msgid "Filtered: %s"
+msgstr "已過濾：%s"
+
+#: src/Statistics.cpp:793
+#, c-format
+msgid "Banned: %s"
+msgstr "已封鎖：%s"
+
+#: src/Statistics.cpp:794
+#, c-format
+msgid "Total: %i Known: %i"
+msgstr "總計：%i  -  已知：%i"
+
+#: src/Statistics.cpp:798
+#, c-format
+msgid "Working Servers: %i"
+msgstr "有效：%i"
+
+#: src/Statistics.cpp:799
+#, c-format
+msgid "Failed Servers: %i"
+msgstr "無效：%i"
+
+#: src/Statistics.cpp:800
+#, c-format
+msgid "Total: %s"
+msgstr "總計：%s"
+
+#: src/Statistics.cpp:801
+#, c-format
+msgid "Deleted Servers: %s"
+msgstr "已刪除：%s"
+
+#: src/Statistics.cpp:802
+#, c-format
+msgid "Filtered Servers: %s"
+msgstr "已過濾：%s"
+
+#: src/Statistics.cpp:803
+#, c-format
+msgid "Users on Working Servers: %llu"
+msgstr "有效使用者數：%llu"
+
+#: src/Statistics.cpp:804
+#, c-format
+msgid "Files on Working Servers: %llu"
+msgstr "有效檔案數：%llu"
+
+#: src/Statistics.cpp:805
+#, c-format
+msgid "Total Users: %llu"
+msgstr "使用者總數：%llu"
+
+#: src/Statistics.cpp:806
+#, c-format
+msgid "Total Files: %llu"
+msgstr "檔案總數：%llu"
+
+#: src/Statistics.cpp:807
+#, c-format
+msgid "Server Occupation: %.2f%%"
+msgstr "伺服器使用率：%.2f%%"
+
+#: src/Statistics.cpp:811
+#, c-format
+msgid "Number of Shared Files: %s"
+msgstr "檔案數：%s"
+
+#: src/Statistics.cpp:812
+#, c-format
+msgid "Total size of Shared Files: %s"
+msgstr "檔案總容量：%s"
+
+#: src/Statistics.cpp:814
+#, c-format
+msgid "Average file size: %s"
+msgstr "平均檔案大小：%s"
+
+#: src/Statistics.cpp:955
+msgid "Operating System"
+msgstr "作業系統"
+
+#: src/Statistics.cpp:980
+msgid "Not Received"
+msgstr "未收到"
+
+#: src/StatisticsDlg.cpp:189
+#, c-format
+msgid "Active connections (1:%u)"
+msgstr "目前連線數 (1:%u)"
+
+#: src/StatTree.cpp:550
+msgid "Not available"
+msgstr "不可用"
+
+#: src/StatTree.cpp:594 src/StatTree.cpp:605
+msgid "Never"
+msgstr "無"
+
+#: src/TerminationProcess.cpp:47
+#, c-format
+msgid "Command '%s' with pid '%d' has finished with status code '%d'."
+msgstr "指令「 %s 」(pid %d) 的傳回狀態值爲「%d」。 "
+
+#: src/TextClient.cpp:134
+msgid "Execute <str> and exit."
+msgstr "執行 <str> 後離開。"
+
+#: src/TextClient.cpp:209
+msgid "Invalid IP format. Use xxx.xxx.xxx.xxx:xxxx\n"
+msgstr "IP 格式無效。請使用 xxx.xxx.xxx.xxx:xxxx\n"
+
+#: src/TextClient.cpp:323
 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 ""
-"您要求啟動時執行網站伺服器，但系統無法執行 amuleweb。請安裝含有 aMule 網站伺"
-"服器的套件，或於編譯 aMule 程式碼時加入 --enable-webserver 選項"
+"This command requires an argument. Valid arguments: 'all', filename, or a "
+"number.\n"
+msgstr "這個指令需要引數，有效引數為：「all」、「檔案名」或「數字」。\n"
 
-#: src/amule.cpp:937
+#: src/TextClient.cpp:359
+msgid "Processing by hash: "
+msgstr "正在依 hash 值處理："
+
+#: src/TextClient.cpp:373
+msgid "Processing by filename: "
+msgstr "正在依檔名處理："
+
+#: src/TextClient.cpp:395
+msgid "This command requires an argument. Valid arguments: a file hash.\n"
+msgstr "這個指令需要引數，有效引數為：「檔案 hash 值」。\n"
+
+#: src/TextClient.cpp:421
+msgid "Not a valid number\n"
+msgstr "不是有效的數字\n"
+
+#: src/TextClient.cpp:425
+msgid "Not a valid hash (length should be exactly 32 chars)\n"
+msgstr "不是有效的 hash 值 (必須爲 32 碼)\n"
+
+#: src/TextClient.cpp:643 src/webserver/src/WebServer.cpp:373
+msgid "Request failed with an unknown error."
+msgstr "要求失敗，不明的錯誤。"
+
+#: src/TextClient.cpp:647
+msgid "Operation was successful."
+msgstr "操作成功。"
+
+#: src/TextClient.cpp:653
 #, c-format
-msgid "Could not bind ports to the specified address: %s"
-msgstr "無法選定使用此位址的通訊埠：%s"
+msgid "Request failed with the following error: %s"
+msgstr "要求失敗，錯誤：%s"
 
-#: src/amule.cpp:964
+#: src/TextClient.cpp:667
 #, c-format
-msgid "Port %u is not available. You will be LOWID\n"
-msgstr "通訊埠 %u 已被佔用。您會變成 LOWID。\n"
+msgid "IP filtering for clients is %s.\n"
+msgstr "對客戶端的 IP 過濾：%s 。\n"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "OFF"
+msgstr "關"
+
+#: src/TextClient.cpp:668 src/TextClient.cpp:674
+msgid "ON"
+msgstr "開"
+
+#: src/TextClient.cpp:673
+#, c-format
+msgid "IP filtering for servers is %s.\n"
+msgstr "對伺服器的 IP 過濾：%s 。\n"
+
+#: src/TextClient.cpp:678
+#, c-format
+msgid "Current IPFilter Level is %d.\n"
+msgstr "目前的 IP 過濾等級：%d 。\n"
+
+#: src/TextClient.cpp:685
+#, c-format
+msgid "Bandwidth limits: Up: %u kB/s, Down: %u kB/s.\n"
+msgstr "頻寬限制：上傳 %u KB/s、下載 %u KB/s 。\n"
+
+#: src/TextClient.cpp:699
+msgid "eD2k"
+msgstr "eD2k"
 
-#: src/amule.cpp:970
+#: src/TextClient.cpp:704
+#, c-format
+msgid "Connected to %s %s %s"
+msgstr "已連線到 %s %s %s"
+
+#: src/TextClient.cpp:710
+msgid "Now connecting"
+msgstr "正在連線"
+
+#: src/TextClient.cpp:719 src/utils/wxCas/src/wxcasframe.cpp:1056
+#: src/utils/wxCas/src/wxcasframe.cpp:1078
+msgid "firewalled"
+msgstr "防火牆內"
+
+#: src/TextClient.cpp:721 src/utils/wxCas/src/wxcasframe.cpp:1054
+#: src/utils/wxCas/src/wxcasframe.cpp:1076
+msgid "ok"
+msgstr "ok"
+
+#: src/TextClient.cpp:734
 #, c-format
 msgid ""
-"Port %u is not available!\n"
-"\n"
-"This means that you will be LOWID.\n"
 "\n"
-"Check your network to make sure the port is open for output and input."
+"Download:\t%s"
 msgstr ""
-"通訊埠 %u 已被佔用！\n"
-"\n"
-"這表示您會變成 LOWID。\n"
 "\n"
-"請檢查網路設定以確保通訊埠可正常使用。"
+"下載：\t%s"
 
-#: src/amule.cpp:1123
-msgid "Failed to create OnlineSig File"
-msgstr "無法建立線上簽名識別檔"
+#: src/TextClient.cpp:737
+#, c-format
+msgid ""
+"\n"
+"Upload:\t%s"
+msgstr ""
+"\n"
+"上傳：\t%s"
 
-#: src/amule.cpp:1131
-msgid "Failed to create aMule OnlineSig File"
-msgstr "無法建立 aMule 線上簽名識別檔"
+#: src/TextClient.cpp:740
+#, c-format
+msgid ""
+"\n"
+"Clients in queue:\t%d\n"
+msgstr ""
+"\n"
+"等候區內人數：\t%d\n"
 
-#: src/amule.cpp:1299
+#: src/TextClient.cpp:743
+#, c-format
 msgid ""
-"The selected locale seems not to be installed on your box. (Note: I'll try "
-"to set it anyway)"
+"\n"
+"Total sources:\t%d\n"
 msgstr ""
-"在您的電腦上似乎沒有安裝您所選取的地區設定。 (但仍會採用您所選擇的設定)"
+"\n"
+"來源總數：\t%d\n"
 
-#: src/amule.cpp:1308
+#: src/TextClient.cpp:816
 #, c-format
-msgid "This is the first time you run aMule %s"
-msgstr "這是您第一次執行 aMule %s"
+msgid "Number of search results: %i\n"
+msgstr "搜尋結果：%i\n"
 
-#: src/amule.cpp:1310
-msgid "This version is a testing version, updated daily, and\n"
-msgstr "這個版本是測試版，每日有更新，只是我們無法保證\n"
+#: src/TextClient.cpp:830
+#, c-format
+msgid "Search progress: %u %% \n"
+msgstr "搜尋進度：%u %% \n"
 
-#: src/amule.cpp:1311
-msgid "we give no warranty it won't break anything, burn your house,\n"
-msgstr "它一定不會造成任何損害，像是燒掉您的房子、\n"
+#: src/TextClient.cpp:832
+msgid "Search progress not available"
+msgstr "沒有進行中的搜尋"
 
-#: src/amule.cpp:1312
-msgid "or kill your dog. But it *should* be safe to use anyway.\n"
-msgstr "或殺死您的狗。但一般來講它應該是安全的。\n"
+#: src/TextClient.cpp:837
+#, c-format
+msgid "Received an unknown reply from the server, OpCode = %#x."
+msgstr "從伺服器收到不明的回應，指令碼是 %#x 。"
 
-#: src/amule.cpp:1316
-msgid ""
-"The following options have been changed in this release for security "
-"reasons:\n"
-msgstr "此版本中，因爲安全問題以下選項已經被變更：\n"
+#: src/TextClient.cpp:850
+msgid "Show short status information."
+msgstr "顯示簡短狀態資訊。"
 
-#: src/amule.cpp:1317
+#: src/TextClient.cpp:851
+msgid "Show connection status, current up/download speeds, etc.\n"
+msgstr "顯示連線狀態、目前上傳下載速度等等。\n"
+
+#: src/TextClient.cpp:853
+msgid "Show full statistics tree."
+msgstr "顯示完整統計資料。"
+
+#: src/TextClient.cpp:854
 msgid ""
+"Optionally, a number in the range 0-255 can be passed as an argument to "
+"this\n"
+"command, which tells how many entries of the client version subtrees should "
+"be\n"
+"shown. Passing 0 or omitting it means 'unlimited'.\n"
 "\n"
-"* Enabled Protocol Obfuscation support for incoming and outgoing "
-"connections.\n"
+"Example: 'statistics 5' will show only the top 5 versions for each client "
+"type.\n"
 msgstr ""
+"可附加一個 0 到 255 之間的數字作爲此指令的引數， 以用來設定\n"
+"每種客戶端軟體各要顯示多少個版本數。設爲 0 表示全部顯示。\n"
+"\n"
+"例如：「 statistics 5 」則每種客戶端軟體最多會顯示 5 個版本。\n"
 "\n"
-"* 已啓用模糊協定。\n"
 
-#: src/amule.cpp:1318
+#: src/TextClient.cpp:856
+msgid "Shut down aMule."
+msgstr "關閉 aMule 。"
+
+#: src/TextClient.cpp:857
 msgid ""
-"\n"
-"* Disabled updating the server list from other server and clients.\n"
+"Shut down the remote running core (amule/amuled).\n"
+"This will also shut down the text client, since it is unusable without a\n"
+"running core.\n"
 msgstr ""
+"關閉遠端執行中主程式 (amule 或 amuled)。\n"
+"這會導致文字模式客戶端程式因缺少執行核心而一起被關閉。\n"
 "\n"
-"* 已停用從其他伺服器和客戶端更新伺服器清單。\n"
 
-#: src/amule.cpp:1319
+#: src/TextClient.cpp:859
+msgid "Reload the given object."
+msgstr "重新載入指定的項目。"
+
+#: src/TextClient.cpp:860
+msgid "Reload shared files list."
+msgstr "重新載入分享檔案清單。"
+
+#: src/TextClient.cpp:862
+msgid "Reload IP filtering table."
+msgstr "重新載入 IP 過濾表。"
+
+#: src/TextClient.cpp:863
+msgid "Reload current IP filtering table."
+msgstr "重新載入現用的 IP 過濾表。"
+
+#: src/TextClient.cpp:864
+msgid "Update IP filtering table from URL."
+msgstr "從網址更新 IP 過濾表。"
+
+#: src/TextClient.cpp:865
+msgid "If URL is omitted the URL from the preferences is used."
+msgstr "如果網址被省略掉，則使用偏好設定中的網址。"
+
+#: src/TextClient.cpp:867
+msgid "Connect to the network."
+msgstr "連線到網路。"
+
+#: src/TextClient.cpp:868
 msgid ""
-"\n"
-"For more information on the reason for this changes, seach\n"
-"the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
-"It's important that you clear any fake server from your server list for "
-"aMule to work properly."
+"This will connect to all networks that are enabled in Preferences.\n"
+"You may also optionally specify a server address in IP:Port form, to connect "
+"to\n"
+"that server only. The IP must be a dotted decimal IPv4 address,\n"
+"or a resolvable DNS name."
 msgstr ""
-"\n"
-"想瞭解更多改版原因， 請到 aMule wiki 搜尋 \"fake servers\" 。\n"
-"網址是：http://wiki.amule.org \n"
-"爲了讓 aMule 正常工作，從伺服器清單中清除假伺服器非常重要。"
+"這將連線到偏好設定中設定啓用的所有網路。\n"
+"您也可以用「 IP:Port 」格式指定要連線的伺服器。\n"
+"此位址必須是用句點隔開的十進位 IPv4 位址，\n"
+"或者是可以解析的 DNS 網域名稱。"
 
-#: src/amule.cpp:1320
+#: src/TextClient.cpp:869
+msgid "Connect to eD2k only."
+msgstr "只連線到 eD2k 網路。"
+
+#: src/TextClient.cpp:870
+msgid "Connect to Kad only."
+msgstr "只連線到 Kad 網路。"
+
+#: src/TextClient.cpp:872
+msgid "Disconnect from the network."
+msgstr "中斷網路連線。"
+
+#: src/TextClient.cpp:873
+msgid "This will disconnect from all networks that are currently connected.\n"
+msgstr "這將中斷目前所有已連線的網路。\n"
+
+#: src/TextClient.cpp:874
+msgid "Disconnect from eD2k only."
+msgstr "只中斷 eD2k 連線。"
+
+#: src/TextClient.cpp:875
+msgid "Disconnect from Kad only."
+msgstr "只中斷 Kad 連線。"
+
+#: src/TextClient.cpp:877
+msgid "Add an eD2k or magnet link to core."
+msgstr "加入 eD2k 或 magnet 連結到主程式。"
+
+#: src/TextClient.cpp:878
 msgid ""
+"The eD2k link to be added can be:\n"
+"*) a file link (ed2k://|file|...), it will be added to the download queue,\n"
+"*) a server link (ed2k://|server|...), it will be added to the server list,\n"
+"*) or a serverlist link, in which case all servers in the list will be added "
+"to the\n"
+"   server list.\n"
 "\n"
-"\n"
-"Additionally, the browser settings have been reset to the system default. "
-"Please configure your browser options again if needed.\n"
+"The magnet link must contain the eD2k hash and file length.\n"
 msgstr ""
+"加入的 eD2k 連結：\n"
+"*) 檔案連結 (ed2k://|file|...)：會被加入下載等候區。\n"
+"*) 伺服器連結 (ed2k://|server|...)：會被加入伺服器清單。\n"
+"*) 伺服器清單連結：裏面的所有伺服器都會被加入伺服器清單中。\n"
 "\n"
+"magnet 連結必須含有 eD2k hash 值與檔案大小資料。\n"
+
+#: src/TextClient.cpp:880
+msgid "Set a preference value."
+msgstr "設定參數值。"
+
+#: src/TextClient.cpp:883
+msgid "Set IP filtering preferences."
+msgstr "設定 IP 過濾參數。"
+
+#: src/TextClient.cpp:884
+msgid "Turn IP filtering on for both clients and servers."
+msgstr "開啓對客戶端和對伺服器 IP 過濾。"
+
+#: src/TextClient.cpp:885
+msgid "Turn IP filtering off for both clients and servers."
+msgstr "關閉對客戶端和對伺服器 IP 過濾。"
+
+#: src/TextClient.cpp:886
+msgid "Enable/Disable IP filtering for clients."
+msgstr "啓用/停用對客戶端 IP 過濾。"
+
+#: src/TextClient.cpp:887
+msgid "Turn IP filtering on for clients."
+msgstr "啟動對客戶端 IP 過濾。"
+
+#: src/TextClient.cpp:888
+msgid "Turn IP filtering off for clients."
+msgstr "停用對客戶端 IP 過濾。"
+
+#: src/TextClient.cpp:889
+msgid "Enable/Disable IP filtering for servers."
+msgstr "啓用/停用對伺服器 IP 過濾。"
+
+#: src/TextClient.cpp:890
+msgid "Turn IP filtering on for servers."
+msgstr "啓動對伺服器 IP 過濾。"
+
+#: src/TextClient.cpp:891
+msgid "Turn IP filtering off for servers."
+msgstr "停用對伺服器 IP 過濾。"
+
+#: src/TextClient.cpp:892
+msgid "Select IP filtering level."
+msgstr "選取 IP 過濾等級。"
+
+#: src/TextClient.cpp:893
+msgid ""
+"Valid filtering levels are in the range 0-255, and it's default (initial)\n"
+"value is 127.\n"
+msgstr ""
+"有效的 IP 過濾等級是在 0 到 255 之間，\n"
+"初始預設值是 127。\n"
+
+#: src/TextClient.cpp:895
+msgid "Set bandwidth limits."
+msgstr "設定頻寬限制。"
+
+#: src/TextClient.cpp:896
+msgid "The value given to these commands has to be in kilobytes/sec.\n"
+msgstr "給此指令的的值，單位是 KB/s 。\n"
+
+#: src/TextClient.cpp:897
+msgid "Set upload bandwidth limit."
+msgstr "設定上傳頻寬限制。"
+
+#: src/TextClient.cpp:899
+msgid "Set download bandwidth limit."
+msgstr "設定下載頻寬限制。"
+
+#: src/TextClient.cpp:902
+msgid "Get and display a preference value."
+msgstr "取得並顯示偏好設定值。"
+
+#: src/TextClient.cpp:905
+msgid "Get IP filtering preferences."
+msgstr "取得 IP 過濾設定。"
+
+#: src/TextClient.cpp:906
+msgid "Get IP filtering state for both clients and servers."
+msgstr "取得對客戶端和伺服器的 IP 過濾狀態。"
+
+#: src/TextClient.cpp:907
+msgid "Get IP filtering state for clients only."
+msgstr "只取得對客戶端的 IP 過濾狀態。"
+
+#: src/TextClient.cpp:908
+msgid "Get IP filtering state for servers only."
+msgstr "只取得對伺服器的 IP 過濾狀態。"
+
+#: src/TextClient.cpp:909
+msgid "Get IP filtering level."
+msgstr "取得 IP 過濾等級。"
+
+#: src/TextClient.cpp:911
+msgid "Get bandwidth limits."
+msgstr "取得頻寬限制。"
+
+#: src/TextClient.cpp:913
+msgid "Execute a search."
+msgstr "執行搜尋。"
+
+#: src/TextClient.cpp:914
+msgid ""
+"A search type has to be specified by giving the type:\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
+"Example: 'search kad file' will execute a kad search for \"file\".\n"
+msgstr ""
+"搜尋類型必須為以下幾種之一：\n"
+"    GLOBAL\n"
+"    LOCAL\n"
+"    KAD\n"
 "\n"
-"瀏覽器設定已恢復為系統預設值。如果有需要，請設定您的瀏覽器。\n"
+"例如：「 search kad 關鍵字 」將在 Kad 網路搜尋該「關鍵字」。\n"
 
-#: src/amule.cpp:1325
-msgid "More information, support and new releases can found at our homepage,\n"
-msgstr "在我們的網頁可找到更多資訊、使用者支援以及程式最新版本：\n"
+#: src/TextClient.cpp:915
+msgid "Execute a global search."
+msgstr "執行全球搜尋。"
 
-#: src/amule.cpp:1326
-msgid "at www.aMule.org, or in our IRC channel #aMule at irc.freenode.net.\n"
-msgstr "http://www.aMule.org，或我們在 irc.freenode.net 的 IRC 頻道 #aMule。\n"
+#: src/TextClient.cpp:916
+msgid "Execute a local search"
+msgstr "執行本地搜尋"
 
-#: src/amule.cpp:1328
-msgid "Feel free to report any bugs to http://forum.amule.org"
-msgstr "歡迎您到 http://forum.amule.org 提出錯誤報告"
+#: src/TextClient.cpp:917
+msgid "Execute a kad search"
+msgstr "執行 Kad 搜尋"
+
+#: src/TextClient.cpp:919
+msgid "Show the results of the last search."
+msgstr "顯示上一次的搜尋結果。"
+
+#: src/TextClient.cpp:920
+msgid "Return the results of the previous search.\n"
+msgstr "傳回前幾次的搜尋結果。\n"
+
+#: src/TextClient.cpp:922
+msgid "Show the progress of a search."
+msgstr "顯示搜尋進度。"
+
+#: src/TextClient.cpp:923
+msgid "Show the progress of a search.\n"
+msgstr "顯示搜尋進度。\n"
 
-#: src/amule.cpp:1341
+#: src/TextClient.cpp:925
+msgid "Start downloading a file"
+msgstr "開始下載檔案"
+
+#: src/TextClient.cpp:926
 msgid ""
-"The folder for Online Signature files you specified is INVALID!\n"
-" OnlineSignature will be DISABLED until you fix it on preferences."
+"The number of a file from the last search has to be given.\n"
+"Example: 'download 12' will start to download the file with the number 12 of "
+"the previous search.\n"
 msgstr ""
-"您選擇的線上簽名識別檔案所在資料夾無效！\n"
-" 在您變更偏好設定之前，線上簽名識別功能將被停用。"
+"必須指定檔案在過去搜尋中的編號。\n"
+"例如：「 download 12 」將會下載過去搜尋結果中編號 12 號的檔案。\n"
 
-#: src/amule.cpp:1627
-#, c-format
-msgid "Disk space preallocation for file '%s' failed: %s"
-msgstr "無法為檔案 '%s' 預先分配磁碟空間：%s "
+#: src/TextClient.cpp:933
+msgid "Pause download."
+msgstr "暫停下載。"
 
-#: src/amule.cpp:1775
-msgid "ERROR: can't open logfile"
-msgstr "錯誤：無法打開記錄檔"
+#: src/TextClient.cpp:936
+msgid "Resume download."
+msgstr "繼續下載。"
 
-#: src/amule.cpp:1779
-msgid "WARNING: logfile is empty. Something is wrong."
-msgstr "警告：沒有記錄檔，肯定有什麽地方出錯了。"
+#: src/TextClient.cpp:939
+msgid "Cancel download."
+msgstr "取消下載。"
 
-#: src/amule.cpp:1798
-msgid "Log has been reset"
-msgstr "記錄已被清除"
+#: src/TextClient.cpp:942
+msgid "Set download priority."
+msgstr "設定下載優先等級。"
+
+#: src/TextClient.cpp:943
+msgid "Set priority of a download to Low, Normal, High or Auto.\n"
+msgstr "設定下載優先等級爲：低、普通、高或自動。\n"
+
+#: src/TextClient.cpp:944
+msgid "Set priority to low."
+msgstr "設爲低優先等級。"
+
+#: src/TextClient.cpp:945
+msgid "Set priority to normal."
+msgstr "設爲普通優先等級。"
+
+#: src/TextClient.cpp:946
+msgid "Set priority to high."
+msgstr "設爲高優先等級。"
+
+#: src/TextClient.cpp:947
+msgid "Set priority to auto."
+msgstr "設爲自動優先等級。"
+
+#: src/TextClient.cpp:949
+msgid "Show queues/lists."
+msgstr "顯示等候區/清單。"
 
-#: src/amule.cpp:1826
+#: src/TextClient.cpp:950
+msgid "Show upload/download queue, server list or shared files list.\n"
+msgstr "顯示上傳/下載等候區、伺服器清單或分享檔案清單。\n"
+
+#: src/TextClient.cpp:951
+msgid "Show upload queue."
+msgstr "顯示上傳等候區。"
+
+#: src/TextClient.cpp:952
+msgid "Show download queue."
+msgstr "顯示下載等候區。"
+
+#: src/TextClient.cpp:953
+msgid "Show log."
+msgstr "顯示記錄。"
+
+#: src/TextClient.cpp:954
+msgid "Show servers list."
+msgstr "顯示伺服器清單。"
+
+#: src/TextClient.cpp:957
+msgid "Reset log."
+msgstr "清除記錄。"
+
+#: src/TextClient.cpp:964
 #, c-format
-msgid "ServerMessage: %s"
-msgstr "伺服器訊息：%s"
+msgid "Deprecated command, use '%s' instead."
+msgstr "已停用的指令，請改用「 %s 」。"
 
-#: src/amule.cpp:1864
-msgid "Failed to download the nodes list."
-msgstr "無法下載節點清單。"
+#: src/TextClient.cpp:965
+#, c-format
+msgid ""
+"This is a deprecated command, and may be removed in the future.\n"
+"Use '%s' instead.\n"
+msgstr ""
+"這是一個已停用的指令，將來可能被刪除，\n"
+"請改用「 %s 」。\n"
 
-#: src/amule.cpp:1877
-msgid "Failed to open the downloaded version check file"
-msgstr "無法開啟下載的版本檢查檔"
+#: src/TextClient.h:60
+msgid "aMule text client"
+msgstr "aMule 文字模式客戶端"
 
-#: src/amule.cpp:1880 src/amule.cpp:1890 src/amule.cpp:1896
-msgid "Corrupted version check file"
-msgstr "損壞的版本檢查檔"
+#: src/ThreadTasks.cpp:363
+#, c-format
+msgid "Converting old AICH hashsets in '%s' to 64b in '%s'."
+msgstr "將 %s 的舊 AICH hash 值組轉換為 %s 的 64b 格式。"
 
-#: src/amule.cpp:1906
-msgid "You are using an outdated version of aMule!"
-msgstr "您使用的是過期的 aMule 版本！"
+#: src/ThreadTasks.cpp:442
+#, c-format
+msgid "WARNING: The filename '%s' is invalid and has been renamed to '%s'."
+msgstr "警告：檔名 %s 無效，已重新命名爲 %s 。"
 
-#: src/amule.cpp:1907
+#: src/ThreadTasks.cpp:454
 #, c-format
-msgid "Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"
-msgstr "您的 aMule 版本是 %i.%i.%i，最新版本是 %li.%li.%li"
+msgid "WARNING: The file '%s' already exists, new file renamed to '%s'."
+msgstr "警告：檔案 %s 已經存在，新檔案重新命名爲 %s 。"
 
-#: src/amule.cpp:1908
-msgid "The latest version can always be found at http://www.amule.org"
-msgstr "最新版本可從這裏下載：http://www.amule.org"
+#: src/TransferWnd.cpp:209
+msgid "Are you sure you wish to cancel and delete all files in this category?"
+msgstr "您確定要移除此分類中的所有檔案嗎？"
 
-#: src/amule.cpp:1911
+#: src/TransferWnd.cpp:209
+msgid "Confirmation Required"
+msgstr "需要確認"
+
+#: src/TransferWnd.cpp:238
+msgid "Only 99 categories are supported."
+msgstr "最多只支援 99 個分類。"
+
+#: src/TransferWnd.cpp:238
+msgid "Too many categories!"
+msgstr "分類數過多！"
+
+#: src/TransferWnd.cpp:341
+msgid "All others"
+msgstr "其它"
+
+#: src/TransferWnd.cpp:363
+msgid "Select view filter"
+msgstr "選取顯示過濾"
+
+#: src/TransferWnd.cpp:366
+msgid "Add category"
+msgstr "加入分類"
+
+#: src/TransferWnd.cpp:369
+msgid "Edit category"
+msgstr "編輯分類"
+
+#: src/TransferWnd.cpp:370
+msgid "Remove category"
+msgstr "移除分類"
+
+#: src/UploadClient.cpp:240
 #, c-format
-msgid "WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"
-msgstr "警告：您的 aMuled 版本已經過期：%i.%i.%i < %li.%li.%li"
+msgid "Failed to open file (%s), removing from list of shared files."
+msgstr "無法開啟檔案 %s，從分享檔案清單移除。"
 
-#: src/amule.cpp:1915
-msgid "Your copy of aMule is up to date."
-msgstr "您的 aMule 是最新版本。"
+#: src/UploadClient.cpp:683
+#, c-format
+msgid "Hashset requested for unknown file: %s"
+msgstr "要求不明檔案 %s 的 hash 值組"
 
-#: src/amule.cpp:1922
-msgid "Failed to download the version check file"
-msgstr "無法下載版本檢查檔"
+#: src/UploadQueue.cpp:596
+#, c-format
+msgid "Resuming uploads of file: %s"
+msgstr "繼續上傳檔案：%s"
 
-#: src/amule.cpp:2025
+#: src/UploadQueue.cpp:613
 #, c-format
-msgid "Users: %s | Files: %s"
-msgstr "使用者：%s | 檔案：%s"
+msgid "Suspending upload of file: %s"
+msgstr "暫停上傳檔案：%s"
 
-#: src/amule.cpp:2026
+#: src/UserEvents.cpp:138
 #, c-format
-msgid "Users: E: %s K: %s | Files: E: %s K: %s"
-msgstr "使用者：E:%s K:%s | 檔案：E:%s K:%s"
+msgid "Failed to execute command `%s' on `%s' event."
+msgstr "無法執行指令「 %s 」(事件：%s )。"
 
-#: src/amule.cpp:2035
-msgid "No networks selected"
-msgstr "未選取網路"
+#: src/UserEvents.h:60
+msgid "Download completed"
+msgstr "下載完畢"
 
-#: src/amule.cpp:2102
+#: src/UserEvents.h:63 src/UserEvents.h:103
+msgid "The full path to the file."
+msgstr "檔案的完整路徑。"
+
+#: src/UserEvents.h:67
+msgid "The name of the file without path component."
+msgstr "不包含路徑的檔名。"
+
+#: src/UserEvents.h:71
+msgid "The eD2k hash of the file."
+msgstr "這個檔案的 eD2k hash 值。"
+
+#: src/UserEvents.h:75
+msgid "The size of the file in bytes."
+msgstr "檔案大小 (B)。"
+
+#: src/UserEvents.h:79
+msgid "Cumulative download activity time."
+msgstr "累計實際下載時間。"
+
+#: src/UserEvents.h:84
+msgid "New chat session started"
+msgstr "已開始新的交談"
+
+#: src/UserEvents.h:87
+msgid "Message sender."
+msgstr "訊息傳送者。"
+
+#: src/UserEvents.h:92
+msgid "Out of space"
+msgstr "空間不足"
+
+#: src/UserEvents.h:95
+msgid "Disk partition."
+msgstr "磁碟分割區。"
+
+#: src/UserEvents.h:100
+msgid "Error on completion"
+msgstr "有錯誤發生於完成"
+
+#: src/utils/aLinkCreator/src/alcc.cpp:74
 #, c-format
-msgid "Connected to %s %s"
-msgstr "已連線到 %s %s"
+msgid "Processing file number %u: %s"
+msgstr "a正在處理檔案編號 %u：%s "
+
+#: src/utils/aLinkCreator/src/alcc.cpp:78
+msgid "You have asked for part hashes (Only used for files > 9.5 MB)"
+msgstr "您已要求暫存檔 hash 值 (只用於超過 9.5 MB 的檔案)"
 
-#: src/amule.cpp:2105
+#: src/utils/aLinkCreator/src/alcc.cpp:95
 #, c-format
-msgid "Connecting to %s"
-msgstr "正在連線到 %s"
+msgid "%s ---> Non existant file !\n"
+msgstr "%s ---> 檔案不存在！\n"
 
-#: src/amule.cpp:2107
-msgid "Disconnected from eD2k"
-msgstr "已中斷 eD2k 網路連線"
+#: src/utils/aLinkCreator/src/alc.cpp:55
+msgid "aLinkCreator, the aMule eD2k link creator"
+msgstr "aLinkCreator, 用以建立 aMule eD2k 連結"
 
-#: src/amule.cpp:2114
-msgid "Kad started."
-msgstr "Kad 已啓動。"
+#: src/utils/aLinkCreator/src/alcframe.cpp:88
+#: src/utils/wxCas/src/wxcasframe.cpp:96
+msgid "Welcome!"
+msgstr "歡迎！"
 
-#: src/amule.cpp:2116
-msgid "Kad stopped."
-msgstr "Kad 已停止。"
+#: src/utils/aLinkCreator/src/alcframe.cpp:108
+msgid "Input parameters"
+msgstr "輸入參數"
 
-#: src/amule.cpp:2123
-msgid "Connected to Kad (ok)"
-msgstr "已連線到 Kad"
+#: src/utils/aLinkCreator/src/alcframe.cpp:119
+msgid "File to Hash"
+msgstr "須計算 hash 值的檔案"
 
-#: src/amule.cpp:2125
-msgid "Connected to Kad (firewalled)"
-msgstr "已連線到 Kad 網路 (防火牆內)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:123
+msgid "Add Optional URLs for this file"
+msgstr "加入附加網址到這個檔案"
 
-#: src/amule.cpp:2128
-msgid "Disconnected from Kad"
-msgstr "已中斷 Kad 網路連線"
+#: src/utils/aLinkCreator/src/alcframe.cpp:131
+msgid "Enter here the file you want to compute the eD2k link"
+msgstr "輸入您想要求得 eD2k 連結的檔案"
 
-#: src/amule.cpp:2191
+#: src/utils/aLinkCreator/src/alcframe.cpp:137
 msgid ""
-"Kad network cannot be used if UDP port is disabled on preferences, not "
-"starting."
-msgstr "Kad 網路未啟動：如果在偏好設定中停用了 UDP 埠，Kad 網路將不能使用。"
+"Enter here the URL you want to add to the eD2k link: Add / at the end to let "
+"aLinkCreator append the current file name"
+msgstr ""
+"輸入您想要加入 eD2k 連結的網址：請在最後加上 '/' 以利 aLinkCreator 程式幫您輸"
+"入檔名"
 
-#: src/amule.cpp:2194
-msgid "Kad network disabled on preferences, not connecting."
-msgstr "Kad 網路在偏好設定中被停用了，沒有連線。"
+#: src/utils/aLinkCreator/src/alcframe.cpp:153
+msgid "Remove"
+msgstr "移除"
 
-#: src/FriendList.cpp:120
-msgid "Failed to open friend list file 'emfriends.met' for reading!"
-msgstr "無法開啟好友清單檔案 emfriends.met 供讀取！"
+#: src/utils/aLinkCreator/src/alcframe.cpp:164
+msgid "Create link with part-hashes"
+msgstr "以暫存檔 hash 值建立連結"
 
-#: src/FriendList.cpp:146
-msgid "Failed to open friend list file 'emfriends.met' for writing!"
-msgstr "無法開啟好友清單檔案 emfriends.met 供寫入！"
+#: src/utils/aLinkCreator/src/alcframe.cpp:170
+msgid ""
+"Help to spread new and rare files faster, at the cost of an increased link "
+"size"
+msgstr "協助新檔案和稀有檔案更快散播，只是會增加連結長度"
 
-#~ msgid "Fetching status..."
-#~ msgstr "正在取得狀態..."
+#: src/utils/aLinkCreator/src/alcframe.cpp:196
+msgid "MD4 File Hash"
+msgstr "MD4 檔案 hash 值"
 
-#~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
-#~ msgstr "theApp->serverlist->GetServerByAddress() 傳回  NULL"
+#: src/utils/aLinkCreator/src/alcframe.cpp:208
+msgid "eD2k File Hash"
+msgstr "eD2k 檔案 hash 值"
 
-#~ msgid "Searching buddy for lowid connection"
-#~ msgstr "搜尋 LowID 連線好友"
+#: src/utils/aLinkCreator/src/alcframe.cpp:219
+msgid "eD2k link"
+msgstr "eD2k 連結"
 
-#~ msgid "Keyword for search: %s"
-#~ msgstr "搜尋的關鍵字：%s "
+#: src/utils/aLinkCreator/src/alcframe.cpp:234
+msgid "Save"
+msgstr "儲存"
 
-#~ msgid "Kademlia: Search keyword is already on search list: "
-#~ msgstr "Kad：關鍵字已在搜尋清單中："
+#: src/utils/aLinkCreator/src/alcframe.cpp:236
+msgid "Copy to clipboard"
+msgstr "複製到剪貼簿"
 
-#~ msgid "No contacts found, please bootstrap, or download a nodes.dat file."
-#~ msgstr "找不到聯絡人，請設啟動節點、或下載一個 nodes.dat 檔案。"
+#: src/utils/aLinkCreator/src/alcframe.cpp:263
+msgid "Open"
+msgstr "開啟"
 
-#~ msgid "ListenSocket: Ok."
-#~ msgstr "監聽連接端點：OK。"
+#: src/utils/aLinkCreator/src/alcframe.cpp:264
+msgid "Open a file to compute its eD2k link"
+msgstr "開啟要求得 eD2k 連結的檔案"
 
-#~ msgid "ERROR: cannot accept web client connection\n"
-#~ msgstr "錯誤：無法接受網頁客戶端連線\n"
+#: src/utils/aLinkCreator/src/alcframe.cpp:267
+msgid "Copy computed eD2k link to clipboard"
+msgstr "複製 eD2k 連結到剪貼簿"
 
-#~ msgid "HTTP download cancelled"
-#~ msgstr "已取消 HTTP 下載"
+#: src/utils/aLinkCreator/src/alcframe.cpp:269
+msgid "Save as"
+msgstr "另存為"
 
-#~ msgid "HTTP download thread started"
-#~ msgstr "已開始 HTTP 下載執行緒"
+#: src/utils/aLinkCreator/src/alcframe.cpp:270
+msgid "Save computed eD2k link to file"
+msgstr "儲存 eD2k 連結到檔案"
 
-#~ msgid "Download size: %i"
-#~ msgstr "下載大小：%i "
+#: src/utils/aLinkCreator/src/alcframe.cpp:275
+#: src/utils/aLinkCreator/src/alcframe.cpp:475
+msgid "About aLinkCreator"
+msgstr "關於 aLinkCreator"
 
-#~ msgid "HTTP download thread ended"
-#~ msgstr "已啟用 HTTP 下載執行緒"
+#: src/utils/aLinkCreator/src/alcframe.cpp:372
+msgid "Select the file you want to compute the eD2k link"
+msgstr "選取要求得 eD2k 連結的檔案"
 
-#~ msgid "Host: %s:%i\n"
-#~ msgstr "主機：%s:%i\n"
+#: src/utils/aLinkCreator/src/alcframe.cpp:406
+msgid "Can't open the clipboard"
+msgstr "無法開啟剪貼簿"
 
-#~ msgid "Response: %i (Error: %i)"
-#~ msgstr "回應：%i (錯誤：%i)"
+#: src/utils/aLinkCreator/src/alcframe.cpp:415
+msgid "Nothing to copy for now !"
+msgstr "沒有東西可複製！"
 
-#~ msgid "WARNING: Void response on stream creation"
-#~ msgstr "警告：建立串流時沒有回應"
+#: src/utils/aLinkCreator/src/alcframe.cpp:442
+msgid "Select the file to your computed eD2k link"
+msgstr "選取已求得 eD2k 連結的檔案"
 
-#~ msgid "ERROR: Redirection code received with no URL"
-#~ msgstr "錯誤：接收到沒有網址的重新導向碼"
+#: src/utils/aLinkCreator/src/alcframe.cpp:453
+msgid "Unable to open "
+msgstr "無法開啟"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:460
+#: src/utils/aLinkCreator/src/alcframe.cpp:589
+msgid "Please, enter a non empty file name"
+msgstr "請輸入一個非空白的檔名"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:465
+msgid "Nothing to save for now !"
+msgstr "沒有東西可儲存！"
+
+#: src/utils/aLinkCreator/src/alcframe.cpp:474
+msgid ""
+"aLinkCreator, the aMule eD2k link creator\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps from http://www.everaldo.com and http://www.icomania.com\n"
+"and http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"aLinkCreator，用以建立 aMule eD2k 連結\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Pixmaps 來自 http://www.everaldo.com and http://www.icomania.com\n"
+"與 http://jimmac.musichall.cz/ikony.php3\n"
+"\n"
+"依據 GPL 授權散佈"
 
-#~ msgid "- default -"
-#~ msgstr "- 預設 -"
+#: src/utils/aLinkCreator/src/alcframe.cpp:519
+#: src/utils/aLinkCreator/src/alcframe.cpp:520
+#: src/utils/aLinkCreator/src/alcframe.cpp:526
+msgid "Hashing..."
+msgstr "正在計算 hash 值..."
 
-#~ msgid "no options available"
-#~ msgstr "沒有選項"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "aLinkCreator is working for you"
+msgstr "aLinkCreator 正為您運作中"
 
-#~ msgid "Invalid category found, skipping"
-#~ msgstr "找到無效的分類，略過"
+#: src/utils/aLinkCreator/src/alcframe.cpp:524
+msgid "Computing MD4 Hash..."
+msgstr "計算 MD4 hash 值中..."
 
-#~ msgid "Dropping non-existing shared directory: %s"
-#~ msgstr "正在放棄不存在的分享目錄：%s "
+#: src/utils/aLinkCreator/src/alcframe.cpp:539
+msgid "Computing eD2k Hashes..."
+msgstr "計算 eD2k hash 值中..."
 
-#~ msgid ""
-#~ "'All-Platform' p2p client based on eMule \n"
-#~ "\n"
-#~ msgstr ""
-#~ "源自 eMule 的 '跨平台' P2P 客戶端程式\n"
-#~ "\n"
+#: src/utils/aLinkCreator/src/alcframe.cpp:574
+#: src/utils/aLinkCreator/src/alcframe.cpp:575
+#: src/utils/aLinkCreator/src/md4.cpp:359
+msgid "Cancelled !"
+msgstr "已取消！"
 
-#~ msgid "Website: http://www.amule.org \n"
-#~ msgstr "網站：http://www.amule.org \n"
+#: src/utils/aLinkCreator/src/alcframe.cpp:583
+#, c-format
+msgid "Done in %.2f s"
+msgstr "在 %.2f 秒內完成"
 
-#~ msgid "Forum: http://forum.amule.org \n"
-#~ msgstr "論壇：http://forum.amule.org \n"
+#: src/utils/aLinkCreator/src/alcframe.cpp:622
+msgid "You have already added this URL !"
+msgstr "您已經加入這個網址了！"
 
-#~ msgid ""
-#~ "FAQ: http://wiki.amule.org \n"
-#~ "\n"
-#~ msgstr ""
-#~ "FAQ：http://wiki.amule.org \n"
-#~ "\n"
+#: src/utils/aLinkCreator/src/alcframe.cpp:627
+msgid "Please, enter a non empty URL"
+msgstr "請輸入一個非空白的網址"
 
-#~ msgid "Contact: admin@amule.org (administrative issues) \n"
-#~ msgstr "聯絡：admin@amule.org (行政管理) \n"
+#: src/utils/aLinkCreator/src/ed2khash.cpp:82
+#, c-format
+msgid "Unable to open %s"
+msgstr "無法開啟 %s"
 
-#~ msgid ""
-#~ "Copyright (c) 2003-2009 aMule Team \n"
-#~ "\n"
-#~ msgstr ""
-#~ "Copyright (c) 2003-2009 aMule 團隊\n"
-#~ "\n"
+#: src/utils/wxCas/src/linuxmon.cpp:86
+#, c-format
+msgid "%i day(s) %i hour(s) %i min %i s"
+msgstr "%i 天 %i 小時 %i 分鐘 %i 秒"
 
-#~ msgid "Part of aMule is based on \n"
-#~ msgstr "部份 aMule 源自 \n"
+#: src/utils/wxCas/src/onlinesig.cpp:234
+#, c-format
+msgid "%02uD %02uh %02umin %02us"
+msgstr "%02u天 %02u小時 %02u分鐘 %02u秒"
 
-#~ msgid ""
-#~ " Copyright (c) 2002-2009 Petar Maymounkov ( petar@post.harvard.edu )\n"
-#~ msgstr ""
-#~ " Copyright (c) 2002-2009 Petar Maymounkov ( petar@post.harvard.edu )\n"
+#: src/utils/wxCas/src/onlinesig.cpp:236
+#, c-format
+msgid "%02uh %02umin %02us"
+msgstr "%02u小時 %02u分鐘 %02u秒"
 
-#~ msgid "http://kademlia.scs.cs.nyu.edu\n"
-#~ msgstr "http://kademlia.scs.cs.nyu.edu\n"
+#: src/utils/wxCas/src/onlinesig.cpp:238
+#, c-format
+msgid "%02umin %02us"
+msgstr "%02u分鐘 %02u秒"
 
-#~ msgid "Shutting down aMule..."
-#~ msgstr "關閉 aMule 中..."
+#: src/utils/wxCas/src/onlinesig.cpp:240
+#, c-format
+msgid "%02us"
+msgstr "%02u秒"
 
-#~ msgid "aMule dialog destroyed"
-#~ msgstr "aMule 對話方塊已銷毀"
+#: src/utils/wxCas/src/onlinesig.cpp:339
+#, c-format
+msgid "%.0f B"
+msgstr "%.0f B"
 
-#~ msgid "Launch Command: "
-#~ msgstr "執行指令：%s "
+#: src/utils/wxCas/src/onlinesig.cpp:342
+#, c-format
+msgid "%.2f KB"
+msgstr "%.2f KB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:345
+#, c-format
+msgid "%.2f MB"
+msgstr "%.2f MB"
 
-#~ msgid "Failed to connect Cfg to widget with the ID %d and key %s"
-#~ msgstr "無法以 ID %d、key %s 將 Cfg 與 widget 相連"
+#: src/utils/wxCas/src/onlinesig.cpp:348
+#, c-format
+msgid "%.2f GB"
+msgstr "%.2f GB"
+
+#: src/utils/wxCas/src/onlinesig.cpp:351
+#, c-format
+msgid "%.2f TB"
+msgstr "%.2f TB"
 
-#~ msgid "Failed to transfer data from Cfg to Widget with the ID %d and key %s"
-#~ msgstr "無法以 ID %d、key %s 將資料 Cfg 與 widget 連線"
+#: src/utils/wxCas/src/wxcas.cpp:83
+msgid "wxCas, aMule Online Statistics"
+msgstr "wxCas, aMule 線上統計"
 
-#~ msgid "Failed to transfer data from Widget to Cfg with the ID %d and key %s"
-#~ msgstr "無法以 ID %d、key %s 從 Cfg 傳輸資料到 Widget"
+#: src/utils/wxCas/src/wxcasframe.cpp:120
+msgid "Maximum DL rate since wxCas is running"
+msgstr "本次 wxCas 執行後最大下載速度"
 
-#~ msgid ""
-#~ "Your Auto-update server list is empty.\n"
-#~ "'Auto-update server list at startup' will be disabled."
-#~ msgstr ""
-#~ "您的自動更新伺服器清單是空的。\n"
-#~ "'啟動時自動更新伺服器清單' 功能將被停用。"
+#: src/utils/wxCas/src/wxcasframe.cpp:124
+msgid "Absolute Maximum DL rate during wxCas previous runs"
+msgstr "過去執行 wxCas 時最大下載速度"
 
-#~ msgid "Firewalled - open TCP port %d in your router or firewall"
-#~ msgstr "防火牆內 - 請設定您的路由器或防火牆開啟 TCP 埠 %d "
+#: src/utils/wxCas/src/wxcasframe.cpp:147
+msgid "System"
+msgstr "系統"
 
-#~ msgid "UDP Connection State:"
-#~ msgstr "UDP 連線狀態："
+#: src/utils/wxCas/src/wxcasframe.cpp:211
+#: src/utils/wxCas/src/wxcasframe.cpp:340
+msgid "Stop Auto Refresh"
+msgstr "停止自動更新顯示"
 
-#~ msgid "Firewalled - open UDP port %d in your router or firewall"
-#~ msgstr "防火牆內 - 請設定您的路由器或防火牆開啟 UDP 埠 %d "
+#: src/utils/wxCas/src/wxcasframe.cpp:216
+msgid "Save Online Statistics image"
+msgstr "儲存線上統計圖表"
 
-#~ msgid "No buddy required - TCP port open"
-#~ msgstr "沒有好友要求 - TCP 埠開啟"
+#: src/utils/wxCas/src/wxcasframe.cpp:219
+msgid "Print Online Statistics image"
+msgstr "列印線上統計圖表"
 
-#~ msgid "No buddy required - UDP port open"
-#~ msgstr "沒有好友要求 - UDP 埠開啟"
+#: src/utils/wxCas/src/wxcasframe.cpp:222
+msgid "Preferences setting"
+msgstr "偏好設定"
 
-#~ msgid "Connecting to buddy"
-#~ msgstr "正在與好友連線"
+#: src/utils/wxCas/src/wxcasframe.cpp:227
+#: src/utils/wxCas/src/wxcasframe.cpp:415
+msgid "About wxCas"
+msgstr "關於 wxCas"
 
-#~ msgid "Connected to buddy at %s"
-#~ msgstr "已與在 %s 的好友連線"
+#: src/utils/wxCas/src/wxcasframe.cpp:331
+msgid "Start Auto Refresh"
+msgstr "開始自動更新顯示"
 
-#~ msgid "Indexed sources:"
-#~ msgstr "索引來源："
+#: src/utils/wxCas/src/wxcasframe.cpp:333
+msgid "Auto Refresh stopped"
+msgstr "自動更新顯示已停止"
 
-#~ msgid "Indexed keywords:"
-#~ msgstr "索引關鍵字："
+#: src/utils/wxCas/src/wxcasframe.cpp:342
+msgid "Auto Refresh started"
+msgstr "已開始自動更新顯示"
 
-#~ msgid "Indexed notes:"
-#~ msgstr "索引註釋："
+#: src/utils/wxCas/src/wxcasframe.cpp:353
+msgid "Save Statistics Image"
+msgstr "儲存統計圖表"
 
-#~ msgid "Indexed load:"
-#~ msgstr "索引負載："
+#: src/utils/wxCas/src/wxcasframe.cpp:391
+msgid "aMule Online Statistics"
+msgstr "aMule 線上統計"
 
-#~ msgid "Fatal Error: Failed to create Poll Timer"
-#~ msgstr "嚴重錯誤：無法建立 Poll Timer"
+#: src/utils/wxCas/src/wxcasframe.cpp:395
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
+msgstr ""
+"列印時發生問題。\n"
+"可能是您的印表機沒有設定正確？"
 
-#~ msgid "Going to event loop..."
-#~ msgstr "正在進行事件迴圈..."
+#: src/utils/wxCas/src/wxcasframe.cpp:396
+msgid "Printing"
+msgstr "正在列印"
 
-#~ msgid "Connecting..."
-#~ msgstr "正在連線..."
+#: src/utils/wxCas/src/wxcasframe.cpp:414
+msgid ""
+"wxCas, aMule OnLine Signature Statistics\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"Distributed under GPL"
+msgstr ""
+"wxCas, aMule 線上簽名識別統計\n"
+"\n"
+"(c) 2004 ThePolish <thepolish@vipmail.ru>\n"
+"\n"
+"源自 CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n"
+"\n"
+"依據 GPL 授權散佈"
 
-#~ msgid "Remote GUI EC event handler"
-#~ msgstr "遠端 GUI 外部連線事件處理器"
+#: src/utils/wxCas/src/wxcasframe.cpp:580
+msgid "Oh Oh, aMule is not running..."
+msgstr "aMule 未執行..."
 
-#~ msgid "Going down"
-#~ msgstr "關閉中"
+#: src/utils/wxCas/src/wxcasframe.cpp:656
+#: src/utils/wxCas/src/wxcasframe.cpp:726
+#: src/utils/wxCas/src/wxcasframe.cpp:795
+msgid "aMule is running"
+msgstr "aMule 正在執行"
 
-#~ msgid "Ready"
-#~ msgstr "就緒"
+#: src/utils/wxCas/src/wxcasframe.cpp:865
+msgid "aMule is running, but disconnected"
+msgstr "aMule 正在執行，但是已中斷連線"
 
-#~ msgid "Part"
-#~ msgstr "部份"
+#: src/utils/wxCas/src/wxcasframe.cpp:936
+msgid "aMule is connecting..."
+msgstr "aMule 正在連線..."
 
-#~ msgid "ERROR: Invalid part.met file version: %s ==> %s"
-#~ msgstr "錯誤：無效的 part.met 檔案版本：%s ==> %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:940
+msgid "Oh Oh, aMule status is unknown..."
+msgstr "aMule 狀態不明..."
 
-#~ msgid "IO failure while saving partfile: "
-#~ msgstr "儲存暫存檔時發生 IO 錯誤："
+#: src/utils/wxCas/src/wxcasframe.cpp:1011
+#: src/utils/wxCas/src/wxcasframe.cpp:1016
+#: src/utils/wxCas/src/wxcasframe.cpp:1020
+#: src/utils/wxCas/src/wxcasframe.cpp:1024
+#: src/utils/wxCas/src/wxcasframe.cpp:1028
+msgid "aMule "
+msgstr "aMule "
 
-#~ msgid "WARNING: Known file list corrupted, contains invalid header."
-#~ msgstr "警告：已知檔案清單損壞，內有無效標頭。"
+#: src/utils/wxCas/src/wxcasframe.cpp:1013
+msgid " has been running for "
+msgstr " 已執行"
 
-#~ msgid "Adding file %s to shares"
-#~ msgstr "正在加入分享檔案 %s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1018
+msgid " is stopped !"
+msgstr " 已停止！"
 
-#~ msgid "Shared directory not found, skipping: %s"
-#~ msgstr "找不到分享目錄，略過：%s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1022
+#: src/utils/wxCas/src/wxcasframe.cpp:1046
+msgid " is not connected !"
+msgstr "未連線！"
 
-#~ msgid "No shareable files found in directory: %s"
-#~ msgstr "目錄中找不到可分享的檔案：%s"
+#: src/utils/wxCas/src/wxcasframe.cpp:1026
+msgid " is connecting..."
+msgstr " 正在連線..."
 
-#~ msgid "Received late result of DNS lookup, discarding."
-#~ msgstr "接收到過期的 DNS 查閱，放棄中。"
+#: src/utils/wxCas/src/wxcasframe.cpp:1030
+msgid " is doing something strange, check it !"
+msgstr " 狀態不正常，請檢查！"
 
-#~ msgid "Saving PartFile %u of %u"
-#~ msgstr "正在儲存暫存檔 (%u / %u)"
+#: src/utils/wxCas/src/wxcasframe.cpp:1051
+msgid " is connected to "
+msgstr " 已連線到"
 
-#~ msgid "All PartFiles Saved."
-#~ msgstr "已儲存所有暫存檔。"
+#: src/utils/wxCas/src/wxcasframe.cpp:1052
+#: src/utils/wxCas/src/wxcasframe.cpp:1074
+msgid " Kad: "
+msgstr " Kad："
 
-#~ msgid "Loading temp files from %s."
-#~ msgstr "正在從 %s 載入暫存檔。"
+#: src/utils/wxCas/src/wxcasframe.cpp:1058
+#: src/utils/wxCas/src/wxcasframe.cpp:1080
+msgid "off"
+msgstr "關閉"
 
-#~ msgid "Loading PartFile %u of %u"
-#~ msgstr "正在載入暫存檔 (%u / %u)"
+#: src/utils/wxCas/src/wxcasframe.cpp:1064
+msgid " is on "
+msgstr " 是在 "
 
-#~ msgid "All PartFiles Loaded."
-#~ msgstr "已載入所有暫存檔。"
+#: src/utils/wxCas/src/wxcasframe.cpp:1071
+msgid " with "
+msgstr " 和 "
 
-#~ msgid "Failed to open ED2KLinks file."
-#~ msgstr "無法開啟 ED2K 連結檔。"
+#: src/utils/wxCas/src/wxcasframe.cpp:1089
+msgid "Total Download: "
+msgstr "總下載："
 
-#~ msgid "Download new GeoIP.dat from %s"
-#~ msgstr "從 %s 下載新的 GeoIP.dat"
+#: src/utils/wxCas/src/wxcasframe.cpp:1091
+#: src/utils/wxCas/src/wxcasframe.cpp:1102
+msgid ", Upload: "
+msgstr "，上傳："
 
-#~ msgid "Failed to remove GeoIP.dat file, aborting update."
-#~ msgstr "無法移除 GeoIP.dat，停止更新。"
+#: src/utils/wxCas/src/wxcasframe.cpp:1100
+msgid "Session Download: "
+msgstr "本次下載："
 
-#~ msgid "Failed to rename new GeoIP.dat file, aborting update."
-#~ msgstr "無法重新命名 GeoIP.dat，停止更新。"
+#: src/utils/wxCas/src/wxcasframe.cpp:1111
+msgid "Download: "
+msgstr "下載："
 
-#~ msgid "Successfully updated GeoIP.dat"
-#~ msgstr "成功更新 GeoIP.dat"
+#: src/utils/wxCas/src/wxcasframe.cpp:1113
+msgid " kB/s, Upload: "
+msgstr " KB/s，上傳："
 
-#~ msgid "Error updating GeoIP.dat"
-#~ msgstr "GeoIP.dat 更新錯誤"
+#: src/utils/wxCas/src/wxcasframe.cpp:1115
+msgid " kB/s"
+msgstr " KB/s"
 
-#~ msgid "Failed to download GeoIP.dat from %s"
-#~ msgstr "無法自 %s 下載 GeoIP.dat"
+#: src/utils/wxCas/src/wxcasframe.cpp:1123
+msgid "Sharing: "
+msgstr "分享："
 
-#~ msgid "Loaded %d flag bitmaps."
-#~ msgstr "已載入 %d 個國旗圖片。"
+#: src/utils/wxCas/src/wxcasframe.cpp:1125
+msgid " file(s), Clients on queue: "
+msgstr " 個檔案、等候區人數："
 
-#~ msgid "Waiting for partfile convert thread to die..."
-#~ msgstr "正在等候暫存檔轉換執行緒終止..."
+#: src/utils/wxCas/src/wxcasframe.cpp:1135
+msgid "Time: "
+msgstr "時間："
 
-#~ msgid ""
-#~ "For a film you can say its length, its story, language ...\\n\\nand if "
-#~ "it's a fake, you can tell that to other users of aMule."
-#~ msgstr ""
-#~ "針對影片，您可以留下長度、故事、語言...等資訊\\n\\n或是提出假檔警告，以供"
-#~ "其他 aMule 使用者注意。"
+#: src/utils/wxCas/src/wxcasframe.cpp:1145
+#: src/utils/wxCas/src/wxcasframe.cpp:1155
+msgid " on "
+msgstr " 在 "
 
-#~ msgid "http://www.aMule.org - the multi-platform Mule"
-#~ msgstr "http://www.aMule.org - 跨平台的騾子"
+#: src/utils/wxCas/src/wxcasframe.cpp:1165
+msgid "System Load Average (1-5-15 min): "
+msgstr "系統平均負載 (1-5-15 分鐘)："
 
-#~ msgid "Language: "
-#~ msgstr "語言："
+#: src/utils/wxCas/src/wxcasframe.cpp:1176
+msgid "System uptime: "
+msgstr "系統執行時間："
 
-#~ msgid "Makes aMule prompt before exiting."
-#~ msgstr "離開 aMule 前要先確認。"
+#: src/utils/wxCas/src/wxcasprefs.cpp:60
+msgid "Directory containing amulesig.dat file"
+msgstr "amulesig.dat 檔案所在的目錄"
 
-#~ msgid "Tooltip delay time: "
-#~ msgstr "工具提示延遲："
+#: src/utils/wxCas/src/wxcasprefs.cpp:80
+msgid "Enter here the directory where your amulesig.dat file is"
+msgstr "請輸入 amulesig.dat 所在的目錄"
 
-#~ msgid "seconds"
-#~ msgstr "秒"
+#: src/utils/wxCas/src/wxcasprefs.cpp:99
+msgid "Refresh rate interval in seconds"
+msgstr "更新顯示間隔 (秒)"
 
-#~ msgid ""
-#~ "Enter your browser name here. Leave this field empty to use the system "
-#~ "default browser."
-#~ msgstr "請輸入瀏覽器的名稱，空白則使用系統預設。"
+#: src/utils/wxCas/src/wxcasprefs.cpp:115
+msgid "Generate a stat image at every refresh event"
+msgstr "每次更新顯示時都產生統計圖"
 
-#~ msgid "Create backup for preview"
-#~ msgstr "建立預覽用備份"
+#: src/utils/wxCas/src/wxcasprefs.cpp:139
+msgid "Enter here the directory where you want to generate the statistic image"
+msgstr "輸入存放製成的統計圖的目錄"
 
-#~ msgid "Bandwidth limits"
-#~ msgstr "頻寬限制"
+#: src/utils/wxCas/src/wxcasprefs.cpp:166
+msgid "Upload periodicaly your stat image to FTP server"
+msgstr "定期上傳統計圖到 FTP 伺服器"
 
-#~ msgid "Ports"
-#~ msgstr "通訊埠"
+#: src/utils/wxCas/src/wxcasprefs.cpp:174
+msgid "FTP Url"
+msgstr "FTP 網址"
 
-#~ msgid "Standard TCP Port "
-#~ msgstr "標準 TCP 埠"
+#: src/utils/wxCas/src/wxcasprefs.cpp:178
+msgid "FTP Path"
+msgstr "FTP 路徑"
 
-#~ msgid "UDP port for server requests (TCP+3):"
-#~ msgstr "伺服器所需 UDP 埠 (TCP+3)："
+#: src/utils/wxCas/src/wxcasprefs.cpp:188
+msgid "Enter here the URL of your FTP server"
+msgstr "輸入 FTP 伺服器的網址"
 
-#~ msgid "4665"
-#~ msgstr "4665"
+#: src/utils/wxCas/src/wxcasprefs.cpp:200
+msgid "Enter here the directory where putting your stat image on FTP server"
+msgstr "輸入 FTP 伺服器上存放統計圖的目錄"
 
-#~ msgid "Extended UDP port (Kad / global search) "
-#~ msgstr "擴充 UDP 埠 (Kad / 全球搜尋)"
+#: src/utils/wxCas/src/wxcasprefs.cpp:206
+msgid "User"
+msgstr "使用者"
 
-#~ msgid "This UDP port is used for extended eD2k requests and Kad network"
-#~ msgstr "此 UDP 埠用於 eD2k 擴充功能與 Kad 網路"
+#: src/utils/wxCas/src/wxcasprefs.cpp:221
+msgid "Enter here the User name to log into your FTP server"
+msgstr "輸入登入 FTP 伺服器的使用者名稱"
 
-#~ msgid "Enable UPnP for router port forwarding"
-#~ msgstr "啟用 UPnP 的路由通訊埠轉向"
+#: src/utils/wxCas/src/wxcasprefs.cpp:233
+msgid "Enter here the User password to log into your FTP server"
+msgstr "輸入登入 FTP 伺服器的密碼"
 
-#~ msgid "UPnP TCP Port (Optional):"
-#~ msgstr "UPnP TCP 埠 (選用)："
+#: src/utils/wxCas/src/wxcasprefs.cpp:252
+msgid "FTP update rate interval in minutes"
+msgstr "FTP 上傳間隔 (分鐘)"
 
-#~ msgid "Bind local address to IP (empty for any):"
-#~ msgstr "選定本機使用 IP (留白或輸入)："
+#: src/utils/wxCas/src/wxcasprefs.cpp:292
+msgid "Validate"
+msgstr "檢測"
 
-#~ msgid ""
-#~ "Advanced users only: If you have multiple network interfaces, enter the "
-#~ "address of the interface to which aMule should be bound."
-#~ msgstr ""
-#~ "進階使用者用：如果您有多網路介面，請輸入要給 aMule 使用的的網路位址。"
+#: src/utils/wxCas/src/wxcasprefs.cpp:326
+msgid "Folder containing your signature file"
+msgstr "簽名識別檔所在資料夾"
 
-#~ msgid "Max sources per downloading file:"
-#~ msgstr "每個檔案最大來源數："
+#: src/utils/wxCas/src/wxcasprefs.cpp:340
+msgid "Folder where generating the statistic image"
+msgstr "統計圖存放資料夾"
 
-#~ msgid "Max simultaneous connections:"
-#~ msgstr "最大同時連線數："
+#: src/webserver/src/WebInterface.cpp:523
+msgid "Loads template <str>"
+msgstr "載入模板 <str>"
 
-#~ msgid "Intelligent Corruption Handling (I.C.H.)"
-#~ msgstr "智慧型損壞處理 (I.C.H.)"
+#: src/webserver/src/WebInterface.cpp:527
+msgid "Web server HTTP port"
+msgstr "網站伺服器 HTTP 埠"
 
-#~ msgid "Enable"
-#~ msgstr "啟用"
+#: src/webserver/src/WebInterface.cpp:531
+msgid "Use UPnP port forwarding on web server port"
+msgstr "網站伺服器通訊埠使用 UPnP 通訊埠轉向"
 
-#~ msgid "Advanced I.C.H. trusts every hash (not recommended)"
-#~ msgstr "進階 I.C.H. 信任所有雜湊值 (不建議)"
+#: src/webserver/src/WebInterface.cpp:535
+msgid "UPnP port"
+msgstr "UPnP 埠"
 
-#~ msgid "Start next paused file when a file completes"
-#~ msgstr "完成後自動傳輸下一個暫停的檔案"
+#: src/webserver/src/WebInterface.cpp:539
+msgid "Use gzip compression"
+msgstr "使用 gzip 壓縮"
 
-#~ msgid "Stop downloads when free disk space reaches "
-#~ msgstr "磁碟可用空間不足時停止下載"
+#: src/webserver/src/WebInterface.cpp:547
+msgid "Full access password for web server"
+msgstr "網站伺服器的 完整存取密碼"
 
-#~ msgid "Destination folder for downloads"
-#~ msgstr "下載資料夾"
+#: src/webserver/src/WebInterface.cpp:551
+msgid "Guest password for web server"
+msgstr "網站伺服器的 訪客密碼"
 
-#~ msgid "Folder for temporary download files"
-#~ msgstr "暫存資料夾"
+#: src/webserver/src/WebInterface.cpp:555
+msgid "Allow guest access"
+msgstr "允許訪客連線"
 
-#~ msgid "Shared folders"
-#~ msgstr "分享資料夾"
+#: src/webserver/src/WebInterface.cpp:559
+msgid "Deny guest access"
+msgstr "拒絕訪客連線"
 
-#~ msgid "Download graph scale:"
-#~ msgstr "下載統計圖比例："
+#: src/webserver/src/WebInterface.cpp:563
+msgid "Load/save web server settings from/to remote aMule"
+msgstr "載入/儲存 遠端 aMule 的網站伺服器設定 "
 
-#~ msgid "Upload graph scale:"
-#~ msgstr "上傳統計圖比例："
+#: src/webserver/src/WebInterface.cpp:567
+msgid "aMule config file path. DO NOT USE DIRECTLY!"
+msgstr "aMule 設定檔路徑。請勿直接使用！"
 
-#~ msgid "Colours: "
-#~ msgstr "顏色："
+#: src/webserver/src/WebInterface.cpp:575
+msgid "Disable PHP interpreter (deprecated)"
+msgstr "停用 PHP 解譯器（不建議）"
 
-#~ msgid "Tree"
-#~ msgstr "樹狀"
+#: src/webserver/src/WebInterface.cpp:583
+msgid "Recompile PHP pages on each request"
+msgstr "爲每個要求重編譯 PHP 頁面"
 
-#~ msgid "Skin to use: "
-#~ msgstr "使用面板："
+#: src/webserver/src/WebInterface.cpp:681
+msgid "aMule Web Server"
+msgstr "aMule 網站伺服器"
 
-#~ msgid "Show \"Fast eD2k Links Handler\" in every window."
-#~ msgstr "在每個視窗顯示 \"eD2k 連結快速處理器\"。"
+#: src/webserver/src/WebServer.cpp:298
+msgid "web client connection accepted\n"
+msgstr "已接受網頁客戶端連線\n"
 
-#~ msgid "Before application name"
-#~ msgstr "在程式名稱前"
+#: src/webserver/src/WebServer.cpp:301
+msgid "ERROR: cannot accept web client connection\n"
+msgstr "錯誤：無法接受網頁客戶端連線\n"
 
-#~ msgid "After application name"
-#~ msgstr "在程式名稱後"
+#: src/webserver/src/WebServer.cpp:370
+#, c-format
+msgid "Request failed with the following error: %s."
+msgstr "要求失敗，錯誤爲：%s 。"
 
-#~ msgid "Show overhead bandwidth"
-#~ msgstr "顯示額外支出頻寬"
+#: src/webserver/src/WebServer.cpp:1697
+msgid "Index file not found: "
+msgstr "找不到索引檔："
 
-#~ msgid "Download Queue Files"
-#~ msgstr "下載等候區檔案"
+#: src/webserver/src/WebServer.cpp:1775
+msgid "Session expired - requesting login\n"
+msgstr "作業階段過期 - 正在要求登入\n"
 
-#~ msgid "Show progress percentage"
-#~ msgstr "顯示進度百分比"
+#: src/webserver/src/WebServer.cpp:1780
+msgid "Session ok, logged in\n"
+msgstr "作業階段正常，已登入\n"
 
-#~ msgid "Show progress bar"
-#~ msgstr "顯示進度條"
+#: src/webserver/src/WebServer.cpp:1782
+msgid "Session ok, not logged in\n"
+msgstr "作業階段正常，未登入\n"
 
-#~ msgid "Auto-sort files (high CPU)"
-#~ msgstr "自動排序檔案 (耗系統速度)"
+#: src/webserver/src/WebServer.cpp:1787
+msgid "No session opened - will request login\n"
+msgstr "未開啟作業階段 - 將要求登入\n"
 
-#~ msgid "IP of the listening interface:"
-#~ msgstr "監聽的 IP："
+#: src/webserver/src/WebServer.cpp:1796
+msgid "Session created - requesting login\n"
+msgstr "作業階段已建立 - 正在要求登入\n"
 
-#~ msgid "TCP port:"
-#~ msgstr "TCP 埠："
+#: src/webserver/src/WebServer.cpp:1811
+msgid "Processing request [original]: "
+msgstr "正在處理要求 [原始]："
 
-#~ msgid "Run webserver on startup"
-#~ msgstr "啟動時執行網站伺服器"
+#: src/webserver/src/WebServer.cpp:1826
+msgid "No password specified, login will not be allowed."
+msgstr "未輸入密碼，不允許登入。"
 
-#~ msgid "Enable UPnP port forwarding of the web server port"
-#~ msgstr "網站伺服器的通訊埠啟用 UPnP 通訊埠轉向"
+#: src/webserver/src/WebServer.cpp:1828
+msgid "Checking password\n"
+msgstr "正在檢查密碼\n"
 
-#~ msgid "Web server UPnP TCP port (Optional)"
-#~ msgstr "網站伺服器的 UPnP TCP 埠 (選用)"
+#: src/webserver/src/WebServer.cpp:1833
+msgid "Password hash invalid\n"
+msgstr "密碼 hash 值無效\n"
 
-#~ msgid "Who can see my shared files:"
-#~ msgstr "誰可以看我的分享檔案："
+#: src/webserver/src/WebServer.cpp:1848
+msgid "Password ok\n"
+msgstr "密碼正確\n"
 
-#~ msgid "Save online signature file in: "
-#~ msgstr "儲存線上簽名識別檔："
+#: src/webserver/src/WebServer.cpp:1850
+msgid "Password bad\n"
+msgstr "密碼錯誤\n"
 
-#~ msgid "Show received messages in the log"
-#~ msgstr "記錄收到的訊息"
+#: src/webserver/src/WebServer.cpp:1853
+msgid "You did not enter any password. Blank password is not allowed.\n"
+msgstr "您沒有輸入密碼，密碼不允許空白。\n"
 
-#~ msgid "Username: "
-#~ msgstr "使用者名稱："
+#: src/webserver/src/WebServer.cpp:1861
+msgid "Logout requested\n"
+msgstr "已要求登出\n"
 
-#~ msgid "Event Types"
-#~ msgstr "事件種類"
+#: src/webserver/src/WebServer.cpp:1866
+msgid "Processing request [redirected]: "
+msgstr "正在處理 [已重定向] 的要求："
 
-#~ msgid ""
-#~ "ERROR: aMule daemon cannot be used when external connections are "
-#~ "disabled. To enable External Connections, use either a normal aMule, "
-#~ "start amuled with the option --ec-config or set the key "
-#~ "\"AcceptExternalConnections\" to 1 in the file ~/.aMule/amule.conf"
-#~ msgstr ""
-#~ "錯誤：當停用外部連線時，aMule 背景服務程式無法使用。要啓用外部連線，請使用"
-#~ "標準的 aMule，或使用 --ec-config 選項啓動 amuled，或在檔案 ~/aMule/amule."
-#~ "conf 中將 \"AcceptExternalConnections\" 設定值改為 1"
+#~ msgid "Romanian"
+#~ msgstr "羅馬尼亞語"
 
-#~ msgid ""
-#~ "ERROR: A valid password is required to use external connections, and "
-#~ "aMule daemon cannot be used without external connections. To run aMule "
-#~ "deamon, you must set the \"ECPassword\" field in the file ~/.aMule/amule."
-#~ "conf with an appropriate value. Execute amuled with the flag --ec-config "
-#~ "to set the password. More information can be found at http://wiki.amule."
-#~ "org"
-#~ msgstr ""
-#~ "錯誤：需要有效的密碼以使用外部連線，且 aMule 背景服務程式要有外部連線才可"
-#~ "使用。要執行 aMule 背景服務程式，您必須在檔案 ~/aMule/amule.conf 中將 "
-#~ "\"ECPassword\"  設定值改為適當的數字。使用 --ec-config 參數啓動 amuled 以"
-#~ "設定密碼。請到 http://wiki.amule.org 取得更多資訊"
+#~ msgid "Download status"
+#~ msgstr "下載狀態"
+
+#~ msgid "( %s / %s )"
+#~ msgstr "( %s / %s )"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "SOCKS5"
+#~ msgstr "SOCKS5"
+
+#~ msgid "SOCKS4"
+#~ msgstr "SOCKS4"
+
+#~ msgid "HTTP"
+#~ msgstr "HTTP"
+
+#~ msgid "SOCKS4a"
+#~ msgstr "SOCKS4a"
+
+#~ msgid "Update delay : %d second"
+#~ msgid_plural "Update delay : %d seconds"
+#~ msgstr[0] "更新延遲時間：%d 秒"
+
+#~ msgid "Comments and ratings are not supported on remote gui yet"
+#~ msgstr "遠端圖形介面尚未支援註解與評價功能"
+
+#~ msgid "Transferring"
+#~ msgstr "正在傳輸"
+
+#~ msgid "QR: ???"
+#~ msgstr "QR：???"
+
+#~ msgid "QR: %u"
+#~ msgstr "QR：%u"
+
+#~ msgid "Only files currently uploading"
+#~ msgstr "只有目前正在上傳的檔案"
+
+#~ msgid "Queue Rank"
+#~ msgstr "等候排名"
+
+#~ msgid "TODO - show progress of a search"
+#~ msgstr "待辦事項 - 顯示搜尋進度"
+
+#~ msgid "Starting to create MD4 and AICH hash for file: %s"
+#~ msgstr "開始爲檔案 %s 計算 MD4 和 AICH hash 值"
+
+#~ msgid "Starting to create MD4 hash for file: %s"
+#~ msgstr "開始爲檔案 %s 計算 MD4 hash 值"
+
+#~ msgid "Starting to create AICH hash for file: %s"
+#~ msgstr "開始爲檔案 %s 計算 AICH hash 值"
+
+#~ msgid "WARNING: Could not remove original '%s' after creating backup"
+#~ msgstr "警告：爲 %s 建立備份後無法刪除原檔案"
+
+#~ msgid "WARNING: Failed to delete %s"
+#~ msgstr "警告：無法刪除 %s"
+
+#~ msgid "%u (QR: %u)"
+#~ msgstr "%u (QR：%u)"
+
+#~ msgid "Rating (total):"
+#~ msgstr "評價 (總計)："
 
-#~ msgid "amuled: OnInit - starting timer"
-#~ msgstr "amuled：初始中 - 正在開始計時器"
+#~ msgid "Try to transfer full chunks to all uploads"
+#~ msgstr "嘗試傳送完整資料區塊給所有人"
 
-#~ msgid "amuled: forking to background - see you"
-#~ msgstr "amuled：在背景執行 - 再見"
+#~ msgid "Networks window"
+#~ msgstr "網路 視窗"
+
+#~ msgid "Searches window"
+#~ msgstr "搜尋 視窗"
+
+#, fuzzy
+#~ msgid "Downloads window"
+#~ msgstr "正在下載"
+
+#~ msgid "Shared files window"
+#~ msgstr "檔案分享 視窗"
+
+#~ msgid "Messages window"
+#~ msgstr "訊息 視窗"
+
+#~ msgid "Statistics graph window"
+#~ msgstr "統計 視窗"
+
+#~ msgid "Preferences settings window"
+#~ msgstr "偏好設定 視窗"
 
 #~ msgid "Traybar-icon lost, trying to recreate ..."
 #~ msgstr "狀態列圖示遺失，正在重新建立..."
 
-#~ msgid "aMule remote control"
-#~ msgstr "aMulle 遠端控制"
+#~ msgid "Transfers"
+#~ msgstr "檔案傳輸"
+
+#~ msgid "Files transfers window"
+#~ msgstr "檔案傳輸 視窗"
+
+#~ msgid "Unban"
+#~ msgstr "取消封鎖"
+
+#~ msgid "Show Uploads"
+#~ msgstr "顯示上傳"
+
+#~ msgid "Show Queue"
+#~ msgstr "顯示等候區"
+
+#~ msgid "Select View"
+#~ msgstr "切換顯示"
+
+#~ msgid "Client Software"
+#~ msgstr "客戶端軟體"
+
+#~ msgid "Waited"
+#~ msgstr "已等候"
+
+#~ msgid "Upload Time"
+#~ msgstr "上傳時間"
+
+#~ msgid "Upload/Download"
+#~ msgstr "上傳/下載"
+
+#~ msgid "Remote Status"
+#~ msgstr "遠端狀態"
+
+#~ msgid "File Priority"
+#~ msgstr "檔案優先等級"
+
+#~ msgid "Score"
+#~ msgstr "分數"
+
+#~ msgid "Asked"
+#~ msgstr "已要求"
+
+#~ msgid "Last Seen"
+#~ msgstr "最後看到"
+
+#~ msgid "Entered Queue"
+#~ msgstr "已進等候區"
+
+#~ msgid "Transferred Up"
+#~ msgstr "已傳輸"
+
+#~ msgid "Transferred Down"
+#~ msgstr "已傳輸"
+
+#~ msgid "Userhash"
+#~ msgstr "使用者 hash 值"
 
-#~ msgid "Fatal Error: Failed to create Core Timer"
-#~ msgstr "嚴重錯誤：無法建立主程式端計時器"
+#~ msgid "Encrypted"
+#~ msgstr "已加密"
 
-#~ msgid "Now, exiting main app..."
-#~ msgstr "正在離開主程式..."
+#~ msgid "Loaded %d flag bitmaps."
+#~ msgstr "已載入 %d 個國旗圖片。"
+
+#~ msgid "Shows Upload / Up-queue"
+#~ msgstr "顯示上傳/上傳等候區"
+
+#~ msgid "Clients on queue :"
+#~ msgstr "等候區人數："
+
+#~ msgid "Current Session"
+#~ msgstr "本次執行"
+
+#~ msgid "Total"
+#~ msgstr "總計"
+
+#~ msgid "Requested :"
+#~ msgstr "已要求："
+
+#~ msgid "Create backup for preview"
+#~ msgstr "建立備份檔案以供預覽"
+
+#~ msgid "Files Transfers Window"
+#~ msgstr "傳輸 視窗"
+
+#~ msgid "Total Users: %s | Total Files: %s"
+#~ msgstr "使用者總數：%s | 檔案總數：%s"
+
+#~ msgid "HTTP download thread started"
+#~ msgstr "已開始 HTTP 下載執行緒"
+
+#~ msgid "Download size not received, downloading until connection is closed"
+#~ msgstr "未收到下載大小資料，持續下載至連線關閉時"
+
+#~ msgid "Download size: %i"
+#~ msgstr "下載大小：%i "
+
+#~ msgid "HTTP download thread ended"
+#~ msgstr "已啟用 HTTP 下載執行緒"
+
+#~ msgid "Host: %s:%i\n"
+#~ msgstr "主機：%s:%i\n"
+
+#~ msgid "Response: %i (Error: %i)"
+#~ msgstr "回應：%i (錯誤：%i)"
 
-#~ msgid "Killing amuleweb instance with pid `%ld' ... "
-#~ msgstr "正在終止 pid '%ld' 的 amuleweb 執行緒..."
+#~ msgid "WARNING: Void response on stream creation"
+#~ msgstr "警告：建立串流時沒有回應"
+
+#~ msgid "ERROR: Redirection code received with no URL"
+#~ msgstr "錯誤：接收到沒有網址的重新導向碼"
+
+#~ msgid "CIP2Country::CIP2Country(): Failed to load country data from "
+#~ msgstr "CIP2Country::CIP2Country()：無法載入國家資訊 ("
+
+#~ msgid "Get IPFilter level."
+#~ msgstr "取得 IP 過濾等級。"
+
+#~ msgid "Makes a search."
+#~ msgstr "開始搜尋。"
 
 #~ msgid "Killed!"
 #~ msgstr "已終止！"
 
-#~ msgid "aMule OnExit: Terminating core."
-#~ msgstr "aMule 離開中：正在終止主程式。"
+#~ msgid "Using amuleweb in '%s'."
+#~ msgstr "在 '%s' 使用 amuleweb 。"
 
-#~ msgid "aMule shutdown completed."
-#~ msgstr "已關閉 aMule 。"
+#~ msgid "Shutting down aMule..."
+#~ msgstr "關閉 aMule 中..."
 
-#~ msgid "Memory debug results for aMule exit:"
-#~ msgstr "離開 aMule 時記憶體除錯結果："
+#~ msgid ""
+#~ "The following options have been changed in this release for security "
+#~ "reasons:\n"
+#~ msgstr "因爲安全問題，此版本中以下的選項已經被變更：\n"
 
 #~ msgid ""
 #~ "\n"
-#~ "EC configuration"
+#~ "* Enabled Protocol Obfuscation support for incoming and outgoing "
+#~ "connections.\n"
 #~ msgstr ""
 #~ "\n"
-#~ "外部連線設定"
+#~ "* 已啓用模糊協定。\n"
 
-#~ msgid "Password set and external connections enabled."
-#~ msgstr "密碼已設定，外部連線已啟用。"
+#~ msgid ""
+#~ "\n"
+#~ "* Disabled updating the server list from other server and clients.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "* 已停用從其他伺服器和客戶端更新伺服器清單。\n"
 
-#~ msgid "Using amuleweb in '%s'."
-#~ msgstr "在 '%s' 使用 amuleweb 。"
+#~ msgid ""
+#~ "\n"
+#~ "For more information on the reason for this changes, seach\n"
+#~ "the aMule wiki at http://wiki.amule.org for \"fake servers\" info.\n"
+#~ "It's important that you clear any fake server from your server list for "
+#~ "aMule to work properly."
+#~ msgstr ""
+#~ "\n"
+#~ "想瞭解更多改版原因， 請到 aMule wiki 搜尋「fake servers」 。\n"
+#~ "網址是：http://wiki.amule.org \n"
+#~ "爲了讓 aMule 正常工作，從伺服器清單中清除假伺服器非常重要。"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Additionally, the browser settings have been reset to the system default. "
+#~ "Please configure your browser options again if needed.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "瀏覽器設定已恢復為系統預設值。如果有需要，請設定您的瀏覽器。\n"
+
+#~ msgid "Fetching status..."
+#~ msgstr "正在取得狀態..."
+
+#~ msgid "Users: E: %s K: %s | Files E: %s K: %s"
+#~ msgstr "使用者：E:%s K:%s | 檔案 E:%s K:%s"
+
+#~ msgid "Client %s on IP:Port %s:%d using %s %s %s"
+#~ msgstr "客戶端 %s：位址 %s:%d，使用 %s %s %s"
+
+#~ msgid "theApp->serverlist->GetServerByAddress() returned NULL"
+#~ msgstr "theApp->serverlist->GetServerByAddress() 傳回  NULL"
+
+#~ msgid "Do you really want to exit aMule?"
+#~ msgstr "您確定要離開 aMule 嗎？"
+
+#~ msgid "Failed to remove GeoIP.dat file, aborting update."
+#~ msgstr "無法移除 GeoIP.dat，停止更新。"
+
+#~ msgid "Failed to rename new GeoIP.dat file, aborting update."
+#~ msgstr "無法重新命名 GeoIP.dat，停止更新。"
+
+#~ msgid "Successfully updated GeoIP.dat"
+#~ msgstr "成功更新 GeoIP.dat"
+
+#~ msgid "Failed to download GeoIP.dat from %s"
+#~ msgstr "無法自 %s 下載 GeoIP.dat"
+
+#~ msgid "Finished to download the server list from %s"
+#~ msgstr "完成從 %s 下載伺服器清單"
+
+#~ msgid "WARNING: known.met cannot be opened."
+#~ msgstr "警告：無法開啟 known.met 。"
+
+#~ msgid "IO error while reading known.met file: %s"
+#~ msgstr "讀取 known.net 檔案時發生 IO 錯誤：%s"
+
+#~ msgid "Error while saving known.met file: %s"
+#~ msgstr "儲存 known.met 時發生錯誤：%s"
+
+#~ msgid "Reloads the given object."
+#~ msgstr "重新載入指定的項目。"
+
+#~ msgid "Reloads shared files list."
+#~ msgstr "重新載入分享檔案清單。"
+
+#~ msgid "Reloads IP Filter table from file."
+#~ msgstr "重新從檔案載入 IP 過濾表。"
+
+#~ msgid "Adds an eD2k or magnet link to core."
+#~ msgstr "加入 eD2k 或 magnet 連結到主程式。"
+
+#~ msgid "Set IPFilter preferences."
+#~ msgstr "設定 IP 過濾參數。"
+
+#~ msgid "Get IPFilter preferences."
+#~ msgstr "取得 IP 過濾器設定。"
+
+#~ msgid "Get IPFilter state for both clients and servers."
+#~ msgstr "取得對客戶端和伺服器的 IP 過濾器狀態。"
+
+#~ msgid "Get IPFilter state for clients only."
+#~ msgstr "只取得對客戶端的 IP 過濾器狀態。"
+
+#~ msgid "Get IPFilter state for servers only."
+#~ msgstr "只取得對伺服器的 IP 過濾器狀態。"
+
+#~ msgid "Executes a global search."
+#~ msgstr "執行全球搜尋。"
+
+#~ msgid "Executes a local search"
+#~ msgstr "執行本地搜尋"
+
+#~ msgid "Executes a kad search"
+#~ msgstr "執行 Kad 搜尋"
+
+#~ msgid "Shows the results of the last search."
+#~ msgstr "顯示上一次的搜尋結果。"
+
+#~ msgid "Returns the results of the previous search.\n"
+#~ msgstr "傳回前幾次的搜尋結果。\n"
+
+#~ msgid "Shows the progress of a search."
+#~ msgstr "顯示搜尋進度。"
+
+#~ msgid "Shows the progress of a search.\n"
+#~ msgstr "顯示搜尋進度。\n"
+
+#~ msgid "Shows upload/download queue, server list or shared files list.\n"
+#~ msgstr "顯示上傳/下載等候區，伺服器清單或分享檔案清單。\n"
 
-#~ msgid "Server hostname notified"
-#~ msgstr "伺服器主機名稱已通告"
+#~ msgid "Authentication failed."
+#~ msgstr "登入驗證失敗。"
 
-#~ msgid "CRITICAL - no client on StartChatSession"
-#~ msgstr "重大 - 開始交談時沒有客戶端"
+#~ msgid "Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."
+#~ msgstr "正在載入 IP 過濾檔 ipfilter.dat 與 ipfilter_static.dat 。"

aMule-2.2.6.tar.bz2/src/AddFriend.cpp -> aMule-2.3.1.tar.bz2/src/AddFriend.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -28,7 +28,7 @@
 #include "muuli_wdr.h"		// Needed for addFriendDlg
 #include "amule.h"		// Needed for theApp
 #include "amuleDlg.h"	// Needed for amuleDlg
-#include "ChatWnd.h"
+#include "FriendList.h"
 #include "NetworkFunctions.h"
 #include "OtherFunctions.h"
 #include "MD4Hash.h"
@@ -73,7 +73,7 @@
 		name = fullip;
 	}
 
-	theApp->amuledlg->m_chatwnd->AddFriend( userhash,name, ip, port);
+	theApp->friendlist->AddFriend(userhash, ip, port, name);
 	
 	EndModal(true); // Friend added
 }

aMule-2.2.6.tar.bz2/src/AddFriend.h -> aMule-2.3.1.tar.bz2/src/AddFriend.h Changed

aMule-2.2.6.tar.bz2/src/ArchSpecific.h -> aMule-2.3.1.tar.bz2/src/ArchSpecific.h Changed

aMule-2.2.6.tar.bz2/src/AsyncDNS.cpp -> aMule-2.3.1.tar.bz2/src/AsyncDNS.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal Veiga - Kry (kry@amule.org)
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -28,6 +28,7 @@
 
 #include "InternalEvents.h"	// Needed for wxEVT_*
 #include "NetworkFunctions.h" // Needed for StringHosttoUint32
+#include "Logger.h"
 
 
 CAsyncDNS::CAsyncDNS(const wxChar* ipName, DnsSolveType type, wxEvtHandler* handler, void* socket)
@@ -60,7 +61,7 @@
 			event_data = m_socket;
 			break;
 		default:
-			printf("WRONG TYPE ID ON ASYNC DNS SOLVING!!!\n");
+			AddLogLineN(wxT("WRONG TYPE ID ON ASYNC DNS SOLVING!!!"));
 	}
 	
 	if (event_id) {

aMule-2.2.6.tar.bz2/src/AsyncDNS.h -> aMule-2.3.1.tar.bz2/src/AsyncDNS.h Changed

aMule-2.2.6.tar.bz2/src/BarShader.cpp -> aMule-2.3.1.tar.bz2/src/BarShader.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -24,17 +24,16 @@
 //
 
 #include <wx/dc.h>
-#include "Color.h"		// Needed for RGB
-
+#include <wx/image.h>
 #include "BarShader.h"		// Interface declarations.
+#include <cstring>		// Needed for std::memcpy
 
 const double Pi = 3.14159265358979323846264338328;
 
 #define HALF(X) (((X) + 1) / 2)
 #define DEFAULT_DEPTH 10
 
-
-CBarShader::CBarShader(uint32 height, uint32 width)
+CBarShader::CBarShader(unsigned height, unsigned width)
 : m_Width( width ),
   m_Height( height ),
   m_FileSize( 1 ),
@@ -53,13 +52,7 @@
 }
 
 
-void CBarShader::SetFileSize(uint64 fileSize)
-{
-	m_FileSize = fileSize;
-}
-
-
-void CBarShader::SetHeight( int height )
+void CBarShader::SetHeight(unsigned height)
 {
 	if( m_Height != height ) {
 		m_Height = height;
@@ -75,15 +68,14 @@
 
 void CBarShader::SetWidth(int width)
 {
-       if (width > 0) {
-               m_Width = width;
-               m_Content.clear();
-               m_Content.resize(m_Width, 0);
-       }
+	if (width > 0) {
+		m_Width = width;
+		Fill(CMuleColour(0,0,0));
+	}
 }
 
 
-void CBarShader::Set3dDepth( int depth )
+void CBarShader::Set3dDepth(unsigned depth)
 {
 	if ( depth < 1 ) {
 		depth = 1;
@@ -105,24 +97,28 @@
 
 void CBarShader::BuildModifiers()
 {
+	wxASSERT(m_used3dlevel < 7);
+
 	if ( m_Modifiers ) {
 		delete[] m_Modifiers;
 	}
 
-	int depth = (7-m_used3dlevel);
-	int count = HALF(m_Height);
+	unsigned depth = (7 - m_used3dlevel);
+	unsigned count = HALF(m_Height);
 	double piOverDepth = Pi/depth;
 	double base = piOverDepth * ((depth / 2.0) - 1);
 	double increment = piOverDepth / (count - 1);
 
 	m_Modifiers = new double[count];
-	for (int i = 0; i < count; i++)
+	for (unsigned i = 0; i < count; i++)
 		m_Modifiers[i] = (double)(sin(base + i * increment));
 }
 
 
-void CBarShader::FillRange(uint64 start, uint64 end, uint32 color)
+void CBarShader::FillRange(uint64 start, uint64 end, const CMuleColour& colour)
 {
+	wxASSERT(m_FileSize > 0);
+
 	if (start >= end || start >= m_FileSize) {
 		return;
 	}
@@ -136,59 +132,30 @@
 		end = m_FileSize;
 	}
 
-	uint32 firstPixel = start * m_Width / m_FileSize;
-	uint32 lastPixel  = end   * m_Width / m_FileSize;
+	unsigned firstPixel = start * m_Width / m_FileSize;
+	unsigned lastPixel  = end   * m_Width / m_FileSize;
 	if (lastPixel == m_Width) {
 		lastPixel--;
 	}
+	
 	double f_Width = m_Width;
 	// calculate how much of this pixels is to be covered with the fill
 	double firstCovered = firstPixel + 1 - start * f_Width / m_FileSize;
 	double lastCovered  = end * f_Width / m_FileSize - lastPixel;
 	// all inside one pixel ?
 	if (firstPixel == lastPixel) {
-		BlendPixel(firstPixel, color, firstCovered + lastCovered - 1.0);
+		m_Content[firstPixel].BlendWith(colour, firstCovered + lastCovered - 1.0);
 	} else {
-		BlendPixel(firstPixel, color, firstCovered);
-		BlendPixel(lastPixel, color, lastCovered);
+		m_Content[firstPixel].BlendWith(colour, firstCovered);
+		m_Content[lastPixel].BlendWith(colour, lastCovered);
 		// fill pixels between (if any)
-		for (uint32 i = firstPixel + 1; i < lastPixel; i++) {
-			m_Content[i] = color;
+		for (unsigned i = firstPixel + 1; i < lastPixel; i++) {
+			m_Content[i] = colour;
 		}
 	}
 }
 
 
-// This function is responsible for drawing ranges that are too small
-// to fill a single pixel. To overcome this problem, we gather the
-// sum of ranges until we have enough to draw a single pixel. The
-// color of this pixel will be the sum of the colors of the ranges
-// within the single pixel, each weighted after its relative size.
-void CBarShader::BlendPixel(uint32 index, uint32 color, double covered)
-{
-	uint32 oldcolor = m_Content[index];
-	// Colors are added up, so the bar must be initialized black (zero) for blending to work.
-	// So after blending in 10 * the same color with covered == 0.1, the pixel will
-	// have the color.
-	// Blending in black will thus have no effect.
-	// This works as long each part of the virtual bar is overwritten just once (or left black).
-	int Red   = (int) (GetRValue(oldcolor) + GetRValue(color) * covered + 0.5);
-	int Green = (int) (GetGValue(oldcolor) + GetGValue(color) * covered + 0.5);
-	int Blue  = (int) (GetBValue(oldcolor) + GetBValue(color) * covered + 0.5);
-	Red   = Red   > 255 ? 255 : Red  ;
-	Green = Green > 255 ? 255 : Green;
-	Blue  = Blue  > 255 ? 255 : Blue ;
-	m_Content[index] = RGB(Red, Green, Blue);
-}
-
-
-void CBarShader::Fill(uint32 color)
-{
-	m_Content.clear();
-	m_Content.resize(m_Width, color);
-}
-
-
 void CBarShader::Draw( wxDC* dc, int iLeft, int iTop, bool bFlat )
 {
 	wxASSERT( dc );
@@ -198,64 +165,53 @@
 		BuildModifiers();
 	}
 
-	wxRect rectSpan;
-	rectSpan.x = iLeft;
-	rectSpan.y = iTop;
-	rectSpan.height = m_Height;
-	rectSpan.width = 0;
-	uint32 lastcolor = 0xffffffff; // invalid value
-	
-	dc->SetPen(*wxTRANSPARENT_PEN);
-
-	// draw each pixel, draw same colored pixels together
-	for (int x = 0; x < m_Width; x++) {
-		uint32 color = m_Content[x];
-		if (color == lastcolor) {
-			rectSpan.width++;
-		} else {
-			if (rectSpan.width) {
-				FillRect(dc, rectSpan, lastcolor, bFlat);
-				rectSpan.x += rectSpan.width;
-			}
-			rectSpan.width = 1;
-			lastcolor = color;
+	// Render the bar into a raw buffer
+	unsigned char * buf = (unsigned char *) malloc(m_Width * m_Height * 3);
+
+	if (bFlat) {
+		// draw flat bar
+		unsigned idx = 0;
+		for (unsigned x = 0; x < m_Width; x++) {
+			unsigned cRed   = m_Content[x].Red();
+			unsigned cGreen = m_Content[x].Green();
+			unsigned cBlue  = m_Content[x].Blue();
+			buf[idx++] = cRed;
+			buf[idx++] = cGreen;
+			buf[idx++] = cBlue;
+		}
+		unsigned linelength = idx;
+		unsigned y = 1;
+		for (; y < m_Height >> 1; y <<= 1, idx <<= 1) {
+			std::memcpy(buf + idx, buf, idx);
+		}
+		if (y < m_Height) {
+			std::memcpy(buf + idx, buf, (m_Height - y) * linelength);
 		}
-	}
-	FillRect(dc, rectSpan, lastcolor, bFlat);
-}
-
-
-void CBarShader::FillRect(wxDC *dc, const wxRect& rectSpan, uint32 color, bool bFlat)
-{
-	wxASSERT( dc );
-
-	if( bFlat || !color ) {
-		wxBrush brush( WxColourFromCr(color), wxSOLID );
-		dc->SetBrush( brush );
-		dc->DrawRectangle( rectSpan );
 	} else {
-		int x1 = rectSpan.x;
-		int x2 = rectSpan.x + rectSpan.width;
-		int y1 = rectSpan.y;
-		int y2 = rectSpan.GetBottom();
-		
-		int Max = HALF(m_Height);
-		for (int i = 0; i < Max; i++) {
-			int cRed   = std::min( 255, (int)(GetRValue(color) * m_Modifiers[i] + .5f) );
-			int cGreen = std::min( 255, (int)(GetGValue(color) * m_Modifiers[i] + .5f) );
-			int cBlue  = std::min( 255, (int)(GetBValue(color) * m_Modifiers[i] + .5f) );
-				
-			wxPen pen( wxColour( cRed, cGreen, cBlue ), 1, wxSOLID );
-			dc->SetPen( pen );
-
-			// Draw top row
-			dc->DrawLine( x1, y1 + i, x2, y1 + i );
-
-			// Draw bottom row
-			dc->DrawLine( x1, y2 - i, x2, y2 - i );
+		// draw rounded bar
+		unsigned Max = HALF(m_Height);
+		unsigned idx = 0;
+		for (unsigned y = 0; y < Max; y++) {
+			for (unsigned x = 0; x < m_Width; x++) {
+				unsigned cRed   = (unsigned)(m_Content[x].Red()   * m_Modifiers[y] + .5f);
+				unsigned cGreen = (unsigned)(m_Content[x].Green() * m_Modifiers[y] + .5f);
+				unsigned cBlue  = (unsigned)(m_Content[x].Blue()  * m_Modifiers[y] + .5f);
+				cRed   = std::min(255u, cRed);
+				cGreen = std::min(255u, cGreen);
+				cBlue  = std::min(255u, cBlue);
+				buf[idx++] = cRed;
+				buf[idx++] = cGreen;
+				buf[idx++] = cBlue;
+			}
+		}
+		unsigned linelength = m_Width * 3;
+		for (unsigned y = std::max(Max, m_Height - Max); y < m_Height; y++) {
+			std::memcpy(buf + y * linelength, buf + (m_Height - 1 - y) * linelength, linelength);
 		}
 	}
-
-	dc->SetBrush(wxNullBrush);
+	wxImage image(m_Width, m_Height);
+	image.SetData(buf);
+	wxBitmap bitmap(image);
+	dc->DrawBitmap(bitmap, iLeft, iTop);
 }
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/BarShader.h -> aMule-2.3.1.tar.bz2/src/BarShader.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,12 +27,11 @@
 #define BARSHADER_H
 
 #include "Types.h"	// Needed for uint16 and uint32
-
+#include "MuleColour.h"
 
 class wxRect;
 class wxDC;
 
-
 /**
  * The barshader class is responsible for drawing the chunk-based progress bars used in aMule.
  *
@@ -52,7 +51,7 @@
 	 * @param height The height of the area upon which the span is drawn.
 	 * @param width  The width of the area upon which the span is drawn.
 	 */
-	CBarShader(uint32 height = 1, uint32 width = 1);
+	CBarShader(unsigned height = 1, unsigned width = 1);
 
 	/**
 	 * Destructor.
@@ -76,15 +75,14 @@
 	 *
 	 * Changes the height of the bar, used when it is drawn.
 	 */
-	void SetHeight( int height );
-
+	void SetHeight(unsigned height);
 
 	/**
 	 * Sets the 3D-depth of the bar
 	 *
 	 * @param depth A value in the range from 1 to 5.
 	 */
-	void Set3dDepth( int depth );
+	void Set3dDepth(unsigned depth);
 
 	/**
 	 * Sets a new filesize.
@@ -94,28 +92,32 @@
 	 * Calling this function sets a new filesize, which is the virtual 
 	 * length of the bar. This function must be called before any filling.
 	 */
-	void SetFileSize(uint64 fileSize);
+	void SetFileSize(uint64 fileSize)	{ m_FileSize = fileSize; }
 
 	/**
 	 * Fills in a range with a certain color.
 	 *
 	 * @param start The starting position of the new span.
 	 * @param end The ending position of the new span. Must be larger than start.
-	 * @param color The color of the new span.
+	 * @param colour The colour of the new span.
 	 *
 	 * Calling this function fill the specified range with the specified color.
 	 * Any spans completly or partially covered by the new span are either
 	 * removed or resized. If the value of end is larger than the current
 	 * filesize, the filesize is increased to the value of end.
 	 */
-	void FillRange(uint64 start, uint64 end, uint32 color);
+	void FillRange(uint64 start, uint64 end, const CMuleColour& colour);
 
 	/**
 	 * Fill the entire bar with a span of the specified color.
 	 *
-	 * @param color The color of the new span.
+	 * @param colour The colour of the new span.
 	 */
-	void Fill(uint32 color);
+	void Fill(const CMuleColour& colour)
+	{
+		m_Content.clear();
+		m_Content.resize(m_Width, colour);
+	}
 
 	/**
 	 * Draws the bar on the specifed wxDC.
@@ -136,34 +138,19 @@
 	 */
 	void BuildModifiers();
 	
-	/**
-	 * Fills a rectangle with a given color.
-	 *
-	 * @param dc The DC upon which to draw the bar.
-	 * @param rectSpan The area within the specifed DC upon which to draw.
-	 * @param color The color of the rectangle.
-	 * @param bFlat If this is true, a simple rectangle will be drawn, otherwise the modifers will be applyed to achive a 3D effect.
-	 */
-	void FillRect(wxDC* dc, const wxRect& rectSpan, uint32 color, bool bFlat);
-
-	/**
-	 * Blend in a single pixel
-	 */
-	void BlendPixel(uint32 index, uint32 color, double covered);
-
 	//! The width of the drawn bar
-	int    m_Width;
+	unsigned	m_Width;
 	//! The height of the drawn bar
-	int    m_Height;
+	unsigned	m_Height;
 	//! The virtual filesize assosiated with the bar
-	uint64 m_FileSize;
+	uint64	m_FileSize;
 	//! Pointer to array of modifers used to create 3D effect. Size is (m_Height+1)/2 when set.
-	double* m_Modifiers;
+	double*	m_Modifiers;
 	//! The current 3d level 
-	uint16 m_used3dlevel;
+	uint16	m_used3dlevel;
 
 	// color for each pixel across the width is stored here
-	std::vector<uint32> m_Content;
+	std::vector<CMuleColour> m_Content;
 };
 
 #endif

aMule-2.2.6.tar.bz2/src/BaseClient.cpp -> aMule-2.3.1.tar.bz2/src/BaseClient.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -24,8 +24,11 @@
 //
 
 #include <wx/wx.h>
+#include <wx/mstream.h>
+#include <wx/tokenzr.h>
 
 #include "updownclient.h"	// Needed for CUpDownClient
+#include "SharedFileList.h"	// Needed for CSharedFileList
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Client2Client/TCP.h>
@@ -56,6 +59,12 @@
 #include "Packet.h"		// Needed for CPacket
 #include "Friend.h"		// Needed for CFriend
 #include "ClientList.h"		// Needed for CClientList
+#ifndef AMULE_DAEMON
+#include "amuleDlg.h"		// Needed for CamuleDlg
+#include "CaptchaDialog.h"	// Needed for CCaptchaDialog
+#include "CaptchaGenerator.h"
+#include "ChatWnd.h"		// Needed for CChatWnd
+#endif
 #include "amule.h"		// Needed for theApp
 #include "PartFile.h"		// Needed for CPartFile
 #include "ClientTCPSocket.h"	// Needed for CClientTCPSocket
@@ -119,7 +128,7 @@
 			m_nConnectIP = wxUINT32_SWAP_ALWAYS(in_userid);
 		}
 		// Will be on right endianess now
-		m_FullUserIP = Uint32toStringIP(m_nConnectIP);
+		m_FullUserIP = m_nConnectIP;
 	}
 
 	m_dwServerIP = in_serverip;
@@ -129,7 +138,7 @@
 
 	if (checkfriend) {
 		if ((m_Friend = theApp->friendlist->FindFriend(CMD4Hash(), m_dwUserIP, m_nUserPort)) != NULL){
-			m_Friend->LinkClient(this);
+			m_Friend->LinkClient(CCLIENTREF(this, wxT("CUpDownClient::CUpDownClient m_Friend->LinkClient")));
 		} else{
 			// avoid that an unwanted client instance keeps a friend slot
 			m_bFriendSlot = false;
@@ -140,10 +149,15 @@
 
 void CUpDownClient::Init()
 {
+	m_linked = 0;
+#ifdef DEBUG_ZOMBIE_CLIENTS
+	m_linkedDebug = false;
+#endif
 	m_bAddNextConnect = false;
 	credits = NULL;
 	m_byChatstate = MS_NONE;
 	m_nKadState = KS_NONE;
+	m_nChatCaptchaState = CA_NONE;
 	m_cShowDR = 0;
 	m_reqfile = NULL;	 // No file required yet
 	m_nTransferredUp = 0;
@@ -203,6 +217,8 @@
 	m_fSharedDirectories = 0;
 	m_lastPartAsked = 0xffff;
 	m_nUpCompleteSourcesCount= 0;
+	m_waitingPosition = 0;
+	m_score = 0;
 	m_lastRefreshedDLDisplay = 0;
 	m_bHelloAnswerPending = false;
 	m_fSentCancelTransfer = 0;
@@ -218,6 +234,7 @@
 	m_fAICHRequested = 0;
 	m_fSupportsLargeFiles = 0;
 	m_fExtMultiPacket = 0;
+	m_fIsSpammer = 0;
 
 	m_dwUserIP = 0;
 	m_nConnectIP = 0;
@@ -226,7 +243,7 @@
 	m_fNeedOurPublicIP = false;
 	m_bHashsetRequested = false;
 
-	m_nLastBlockOffset = 0;
+	m_lastDownloadingPart = 0;
 
 	m_uploadingfile = NULL;
 
@@ -243,8 +260,7 @@
 	if (m_socket) {
 		amuleIPV4Address address;
 		m_socket->GetPeer(address);
-		m_FullUserIP = address.IPAddress();
-		SetIP(StringIPtoUint32(m_FullUserIP));
+		SetIP(StringIPtoUint32(address.IPAddress()));
 	} else {
 		SetIP(0);
 	}
@@ -266,10 +282,16 @@
 	m_fSupportsCryptLayer = 0;
 	m_fRequiresCryptLayer = 0;
 	m_fSupportsSourceEx2 = 0;
+	m_fSupportsCaptcha = 0;
 	m_fDirectUDPCallback = 0;
 	m_dwDirectCallbackTimeout = 0;
 
 	m_hasbeenobfuscatinglately = false;
+
+	m_cCaptchasSent = 0;
+	m_cMessagesReceived = 0;
+	m_cMessagesSent = 0;
+
 }
 
 
@@ -277,10 +299,11 @@
 {
 	#ifdef __DEBUG__
 	if (!connection_reason.IsEmpty()) {
-		printf("Client to check for %s was deleted without connection.\n",(const char*)unicode2char(connection_reason));
+		AddDebugLogLineN(logClient, wxT("Client to check for ") + connection_reason + wxT(" was deleted without connection."));
 	}
 	#endif	
 	
+	
 	if (m_lastClientSoft == SO_UNKNOWN) {
 		theStats::RemoveUnknownClient();
 	} else if (m_lastClientSoft != (uint32)(-1)) {
@@ -290,20 +313,6 @@
 	// Indicate that we are not anymore on stats
 	m_lastClientSoft = (uint32)(-1);
 	
-
-	if (IsAICHReqPending()){
-		m_fAICHRequested = FALSE;
-		CAICHHashSet::ClientAICHRequestFailed(this);
-	}
-
-	//theApp->clientlist->RemoveClient(this, wxT("Destructing client object"));
-	
-	if (m_Friend) {
-		m_Friend->UnLinkClient();
-		Notify_ChatRefreshFriend(m_Friend->GetIP(), m_Friend->GetPort(), wxEmptyString);
-		m_Friend = NULL;
-	}
-
 	// The socket should have been removed in Safe_Delete, but it
 	// doesn't hurt to have an extra check.
 	if (m_socket) {
@@ -312,32 +321,16 @@
 		SetSocket(NULL);
 	}
 
-
 	ClearUploadBlockRequests();
 	ClearDownloadBlockRequests();
 
 	DeleteContents(m_WaitingPackets_list);
 	
-	if (m_iRating>0 || !m_strComment.IsEmpty()) {
-		m_iRating = 0;
-		m_strComment.Clear();
-		if (m_reqfile) {
-			m_reqfile->UpdateFileRatingCommentAvail();
-		}
-	}
-
-	// Ensure that source-counts gets updated in case
-	// of a source not on the download-queue
-	SetRequestFile( NULL );
-
-	SetUploadFileID(NULL);
-
-	if (m_pReqFileAICHHash != NULL) {
-		delete m_pReqFileAICHHash;
-		m_pReqFileAICHHash = NULL;
-	}
+	// Allow detection of deleted clients that didn't go through Safe_Delete
+ 	m_clientState = CS_DYING;
 }
 
+
 void CUpDownClient::ClearHelloProperties()
 {
 	m_nUDPPort = 0;
@@ -362,7 +355,12 @@
 	m_fSupportsCryptLayer = 0;
 	m_fRequiresCryptLayer = 0;
 	m_fSupportsSourceEx2 = 0;
+	m_fSupportsCaptcha = 0;
 	m_fDirectUDPCallback = 0;
+	m_bIsHybrid = false;
+	m_bIsML = false;
+	m_fNoViewSharedFiles = true;	// that's a sensible default to assume until we get the real value
+	m_bUnicodeSupport = false;
 }
 
 bool CUpDownClient::ProcessHelloPacket(const byte* pachPacket, uint32 nSize)
@@ -391,8 +389,17 @@
 		return;
 	}
 
+	// If called from background, post an event to process it in main thread
+	if (!wxThread::IsMain()) {
+		CoreNotify_Client_Delete(CCLIENTREF(this, wxT("CUpDownClient::Safe_Delete CoreNotify_Client_Delete")));
+		return;
+	}
+
  	m_clientState = CS_DYING;
 
+	// Make sure client doesn't get deleted until this method is finished
+	CClientRef ref(CCLIENTREF(this, wxT("CUpDownClient::Safe_Delete reflocker")));
+
 	// Close the socket to avoid any more connections and related events
 	if ( m_socket ) {
 		m_socket->Safe_Delete();
@@ -400,12 +407,57 @@
 		SetSocket(NULL);
 	}
 
-	// Schedule the client for deletion if we still have the clientlist
+	// Remove the client from the clientlist if we still have it
 	if ( theApp->clientlist ) {
-		theApp->clientlist->AddToDeleteQueue( this );
-	} else {
-		delete this;
+		theApp->clientlist->RemoveClient( this );
+	}
+
+	// Doing what RemoveClient used to do. Just to be sure...
+	if (theApp->uploadqueue) {
+		theApp->uploadqueue->RemoveFromUploadQueue(this);
+		theApp->uploadqueue->RemoveFromWaitingQueue(this);
+	}
+	if (theApp->downloadqueue) {
+		theApp->downloadqueue->RemoveSource(this);
+	}
+
+	// For security, remove it from the lists unconditionally.
+	Notify_SharedCtrlRemoveClient(ECID(), (CKnownFile*)NULL);
+	Notify_SourceCtrlRemoveSource(ECID(), (CPartFile*)NULL);
+
+	if (IsAICHReqPending()){
+		m_fAICHRequested = FALSE;
+		CAICHHashSet::ClientAICHRequestFailed(this);
+	}
+
+	if (m_Friend) {
+		m_Friend->UnLinkClient();	// this notifies
+		m_Friend = NULL;
+	}
+
+	if (m_iRating>0 || !m_strComment.IsEmpty()) {
+		m_iRating = 0;
+		m_strComment.Clear();
+		if (m_reqfile) {
+			m_reqfile->UpdateFileRatingCommentAvail();
+		}
 	}
+
+	// Ensure that source-counts gets updated in case
+	// of a source not on the download-queue
+	SetRequestFile( NULL );
+
+	SetUploadFileID(NULL);
+
+	delete m_pReqFileAICHHash;
+	m_pReqFileAICHHash = NULL;
+
+#ifdef DEBUG_ZOMBIE_CLIENTS
+	if (m_linked > 1) {
+		AddLogLineC(CFormat(wxT("Client %d still linked in %d places: %s")) % ECID() % (m_linked - 1) % GetLinkedFrom());
+		m_linkedDebug = true;
+	}
+#endif
 }
 
 
@@ -419,11 +471,6 @@
 
 bool CUpDownClient::ProcessHelloTypePacket(const CMemFile& data)
 {
-
-	m_bIsHybrid = false;
-	m_bIsML = false;
-	m_fNoViewSharedFiles = 0;
-	m_bUnicodeSupport = false;
 	uint32 dwEmuleTags = 0;
 
 	CMD4Hash hash = data.ReadHash();
@@ -446,7 +493,7 @@
 				if (temptag.IsStr()) {
 					m_strModVersion = temptag.GetStr();
 				} else if (temptag.IsInt()) {
-					m_strModVersion = wxString::Format(wxT("ModID=%u"), temptag.GetInt());
+					m_strModVersion = CFormat(wxT("ModID=%u")) % temptag.GetInt();
 				} else {
 					m_strModVersion = wxT("ModID=<Unknown>");
 				}
@@ -464,7 +511,7 @@
 				m_nUDPPort = temptag.GetInt() & 0xFFFF;
 				dwEmuleTags |= 1;
 				#ifdef __PACKET_DEBUG__
-				printf("Hello type packet processing with eMule ports UDP=%i KAD=%i\n",m_nUDPPort,m_nKadPort);
+				AddLogLineNS(CFormat(wxT("Hello type packet processing with eMule ports UDP=%i KAD=%i")) % m_nUDPPort % m_nKadPort);
 				#endif
 				break;
 				
@@ -472,7 +519,7 @@
 				// 32 BUDDY IP
 				m_nBuddyIP = temptag.GetInt();
 				#ifdef __PACKET_DEBUG__
-				printf("Hello type packet processing with eMule BuddyIP=%u (%s)\n",m_nBuddyIP, (const char*)unicode2char(Uint32toStringIP(m_nBuddyIP)));
+				AddLogLineNS(CFormat(wxT("Hello type packet processing with eMule BuddyIP=%u (%s)")) % m_nBuddyIP % Uint32toStringIP(m_nBuddyIP));
 				#endif
 				break;				
 				
@@ -481,7 +528,7 @@
 				// 16 BUDDY Port
 				m_nBuddyPort = (uint16)temptag.GetInt();
 				#ifdef __PACKET_DEBUG__
-				printf("Hello type packet processing with eMule BuddyPort=%u\n",m_nBuddyPort);
+				AddLogLineNS(CFormat(wxT("Hello type packet processing with eMule BuddyPort=%u")) % m_nBuddyPort);
 				#endif
 				break;
 				
@@ -512,17 +559,17 @@
 				m_fSupportsPreview		= (flags >> 1*0) & 0x01;
 				dwEmuleTags |= 2;
 				#ifdef __PACKET_DEBUG__
-				printf("Hello type packet processing with eMule Misc Options:\n");
-				printf("m_byUDPVer = %i\n",m_byUDPVer);
-				printf("m_byDataCompVer = %i\n",m_byDataCompVer);
-				printf("m_bySupportSecIdent = %i\n",m_bySupportSecIdent);
-				printf("m_bySourceExchangeVer = %i\n",m_bySourceExchange1Ver);
-				printf("m_byExtendedRequestsVer = %i\n",m_byExtendedRequestsVer);
-				printf("m_byAcceptCommentVer = %i\n",m_byAcceptCommentVer);
-				printf("m_fNoViewSharedFiles = %i\n",m_fNoViewSharedFiles);
-				printf("m_bMultiPacket = %i\n",m_bMultiPacket);
-				printf("m_fSupportsPreview = %i\n",m_fSharedDirectories);
-				printf("That's all.\n");
+				AddLogLineNS(wxT("Hello type packet processing with eMule Misc Options:"));
+				AddLogLineNS(CFormat(wxT("m_byUDPVer = %i")) % m_byUDPVer);
+				AddLogLineNS(CFormat(wxT("m_byDataCompVer = %i")) % m_byDataCompVer);
+				AddLogLineNS(CFormat(wxT("m_bySupportSecIdent = %i")) % m_bySupportSecIdent);
+				AddLogLineNS(CFormat(wxT("m_bySourceExchangeVer = %i")) % m_bySourceExchange1Ver);
+				AddLogLineNS(CFormat(wxT("m_byExtendedRequestsVer = %i")) % m_byExtendedRequestsVer);
+				AddLogLineNS(CFormat(wxT("m_byAcceptCommentVer = %i")) % m_byAcceptCommentVer);
+				AddLogLineNS(CFormat(wxT("m_fNoViewSharedFiles = %i")) % m_fNoViewSharedFiles);
+				AddLogLineNS(CFormat(wxT("m_bMultiPacket = %i")) % m_bMultiPacket);
+				AddLogLineNS(CFormat(wxT("m_fSupportsPreview = %i")) % m_fSharedDirectories);
+				AddLogLineNS(wxT("That's all."));
 				#endif
 				SecIdentSupRec +=  1;
 				break;
@@ -541,7 +588,7 @@
 				//   1 Large Files (includes support for 64bit tags)
 				//   4 Kad Version - will go up to version 15 only (may need to add another field at some point in the future)
 				m_fDirectUDPCallback	= (temptag.GetInt() >> 12) & 0x01;
-				// 1 captcha support
+				m_fSupportsCaptcha	    = (temptag.GetInt() >> 11) & 0x01;
 				m_fSupportsSourceEx2	= (temptag.GetInt() >> 10) & 0x01;
 				m_fRequiresCryptLayer	= (temptag.GetInt() >>  9) & 0x01;
 				m_fRequestsCryptLayer	= (temptag.GetInt() >>  8) & 0x01;
@@ -556,16 +603,17 @@
 				m_fRequiresCryptLayer &= m_fRequestsCryptLayer;
 			
 				#ifdef __PACKET_DEBUG__
-				printf("Hello type packet processing with eMule Misc Options 2:\n");
-				printf("	m_fDirectUDPCallback	= %i\n", m_fDirectUDPCallback);
-				printf("	m_fSupportsSourceEx2	= %i\n", m_fSupportsSourceEx2);
-				printf("	m_fRequiresCryptLayer	= %i\n", m_fRequiresCryptLayer);
-				printf("	m_fRequestsCryptLayer	= %i\n", m_fRequestsCryptLayer);
-				printf("	m_fSupportsCryptLayer	= %i\n", m_fSupportsCryptLayer);
-				printf("	m_fExtMultiPacket	= %i\n", m_fExtMultiPacket);
-				printf("	m_fSupportsLargeFiles	= %i\n", m_fSupportsLargeFiles);
-				printf("	KadVersion		= %u\n", m_byKadVersion);
-				printf("That's all.\n");
+				AddLogLineNS(wxT("Hello type packet processing with eMule Misc Options 2:"));
+				AddLogLineNS(CFormat(wxT("	m_fDirectUDPCallback	= %i")) % m_fDirectUDPCallback);
+				AddLogLineNS(CFormat(wxT("	m_fSupportsCaptcha		= %i")) % m_fSupportsCaptcha);
+				AddLogLineNS(CFormat(wxT("	m_fSupportsSourceEx2	= %i")) % m_fSupportsSourceEx2);
+				AddLogLineNS(CFormat(wxT("	m_fRequiresCryptLayer	= %i")) % m_fRequiresCryptLayer);
+				AddLogLineNS(CFormat(wxT("	m_fRequestsCryptLayer	= %i")) % m_fRequestsCryptLayer);
+				AddLogLineNS(CFormat(wxT("	m_fSupportsCryptLayer	= %i")) % m_fSupportsCryptLayer);
+				AddLogLineNS(CFormat(wxT("	m_fExtMultiPacket	= %i")) % m_fExtMultiPacket);
+				AddLogLineNS(CFormat(wxT("	m_fSupportsLargeFiles	= %i")) % m_fSupportsLargeFiles);
+				AddLogLineNS(CFormat(wxT("	KadVersion		= %u")) % m_byKadVersion);
+				AddLogLineNS(wxT("That's all."));
 				#endif			
 				break;
 
@@ -614,8 +662,7 @@
 	if (m_socket) {
 		amuleIPV4Address address;
 		m_socket->GetPeer(address);
-		m_FullUserIP = address.IPAddress();
-		SetIP(StringIPtoUint32(m_FullUserIP));
+		SetIP(StringIPtoUint32(address.IPAddress()));
 	} else {
 		throw wxString(wxT("Huh, socket failure. Avoided crash this time."));
 	}
@@ -641,18 +688,18 @@
 	if (credits == NULL){
 		credits = pFoundCredits;
 		if (!theApp->clientlist->ComparePriorUserhash(m_dwUserIP, m_nUserPort, pFoundCredits)){
-			AddDebugLogLineM( false, logClient, CFormat( wxT("Client: %s (%s) Banreason: Userhash changed (Found in TrackedClientsList)") ) % GetUserName() % GetFullIP() );
+			AddDebugLogLineN( logClient, CFormat( wxT("Client: %s (%s) Banreason: Userhash changed (Found in TrackedClientsList)") ) % GetUserName() % GetFullIP() );
 			Ban();
 		}
 	} else if (credits != pFoundCredits){
 		// userhash change ok, however two hours "waittime" before it can be used
 		credits = pFoundCredits;
-		AddDebugLogLineM( false, logClient, CFormat( wxT("Client: %s (%s) Banreason: Userhash changed") ) % GetUserName() % GetFullIP() );
+		AddDebugLogLineN( logClient, CFormat( wxT("Client: %s (%s) Banreason: Userhash changed") ) % GetUserName() % GetFullIP() );
 		Ban();
 	}
 
 	if ((m_Friend = theApp->friendlist->FindFriend(m_UserHash, m_dwUserIP, m_nUserPort)) != NULL){
-		m_Friend->LinkClient(this);
+		m_Friend->LinkClient(CCLIENTREF(this, wxT("CUpDownClient::ProcessHelloTypePacket m_Friend->LinkClient")));
 	} else{
 		// avoid that an unwanted client instance keeps a friend slot
 		SetFriendSlot(false);
@@ -670,22 +717,22 @@
 		m_byInfopacketsReceived |= IP_EMULEPROTPACK;
 	}
 
-	if( GetKadPort() ) {
-		Kademlia::CKademlia::Bootstrap(wxUINT32_SWAP_ALWAYS(GetIP()), GetKadPort(), GetKadVersion() > 1);
+	if (GetKadPort() && GetKadVersion() > 1) {
+		Kademlia::CKademlia::Bootstrap(wxUINT32_SWAP_ALWAYS(GetIP()), GetKadPort());
 	}
 
 	return bIsMule;
 }
 
 
-bool CUpDownClient::SendHelloPacket() {
-
-	if (m_socket == NULL){
-		wxASSERT(0);
+bool CUpDownClient::SendHelloPacket()
+{
+	if (m_socket == NULL) {
+		wxFAIL;
 		return true;
 	}
 
-	// if IP is filtered, dont greet him but disconnect...
+	// if IP is filtered, don't greet him but disconnect...
 	amuleIPV4Address address;
 	m_socket->GetPeer(address);
 	if ( theApp->ipfilter->IsFiltered(StringIPtoUint32(address.IPAddress()))) {
@@ -704,14 +751,14 @@
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
 	SendPacket(packet,true);
 	m_bHelloAnswerPending = true;
-	AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_HELLO to ") + GetFullIP() );
+	AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_HELLO to ") + GetFullIP() );
 	return true;
 }
 
 void CUpDownClient::SendMuleInfoPacket(bool bAnswer, bool OSInfo) {
 
 	if (m_socket == NULL){
-		wxASSERT(0);
+		wxFAIL;
 		return;
 	}
 
@@ -793,12 +840,12 @@
 		
 		if (!bAnswer) {
 			if (!OSInfo) {
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_EMULEINFO to ") + GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_EMULEINFO to ") + GetFullIP() );
 			} else {
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_EMULEINFO/OS_INFO to ") + GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_EMULEINFO/OS_INFO to ") + GetFullIP() );
 			}
 		} else {
-			AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_EMULEINFOANSWER to ") + GetFullIP() );
+			AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_EMULEINFOANSWER to ") + GetFullIP() );
 		}
 	}
 }
@@ -915,7 +962,7 @@
 					if (temptag.IsStr()) {
 						m_strModVersion = temptag.GetStr();
 					} else if (temptag.IsInt()) {
-						m_strModVersion = wxString::Format(wxT("ModID=%u"), temptag.GetInt());
+						m_strModVersion = CFormat(wxT("ModID=%u")) % temptag.GetInt();
 					} else {
 						m_strModVersion = wxT("ModID=<Unknown>");
 					}
@@ -923,7 +970,7 @@
 					break;
 
 				default:
-					AddDebugLogLineM( false, logPacketErrors,
+					AddDebugLogLineN( logPacketErrors,
 						CFormat( wxT("Unknown Mule tag (%s) from client: %s") )
 							% temptag.GetFullInfo()
 							% GetClientFullInfo()
@@ -973,7 +1020,7 @@
 void CUpDownClient::SendHelloAnswer()
 {
 	if (m_socket == NULL){
-		wxASSERT(0);
+		wxFAIL;
 		return;
 	}
 
@@ -981,7 +1028,7 @@
 	SendHelloTypePacket(&data);
 	CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_HELLOANSWER);
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
-	AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_HELLOANSWER to ") + GetFullIP() );
+	AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_HELLOANSWER to ") + GetFullIP() );
 	SendPacket(packet,true);
 }
 
@@ -1086,7 +1133,13 @@
 	const uint32 uSupportsCryptLayer	= thePrefs::IsClientCryptLayerSupported() ? 1 : 0;
 	const uint32 uRequestsCryptLayer	= thePrefs::IsClientCryptLayerRequested() ? 1 : 0;
 	const uint32 uRequiresCryptLayer	= thePrefs::IsClientCryptLayerRequired() ? 1 : 0;	
-	const uint32 uSupportsSourceEx2		= 1;					
+	const uint32 uSupportsSourceEx2		= 1;
+#ifdef AMULE_DAEMON
+// captcha for daemon/remotegui not supported for now
+	const uint32 uSupportsCaptcha		= 0;
+#else
+	const uint32 uSupportsCaptcha		= 1;
+#endif
 	// direct callback is only possible if connected to kad, tcp firewalled and verified UDP open (for example on a full cone NAT)
 	const uint32 uDirectUDPCallback		= (Kademlia::CKademlia::IsRunning() && Kademlia::CKademlia::IsFirewalled()
 						   && !Kademlia::CUDPFirewallTester::IsFirewalledUDP(true) && Kademlia::CUDPFirewallTester::IsVerified()) ? 1 : 0;
@@ -1094,7 +1147,7 @@
 	CTagVarInt tagMisOptions2(CT_EMULE_MISCOPTIONS2, 
 //				(RESERVED				     )
 				(uDirectUDPCallback	<< 12) |
-// 				(uSupportsCaptcha	<< 11) |	// No captcha support in aMule
+ 				(uSupportsCaptcha	<< 11) |	
 				(uSupportsSourceEx2	<< 10) |
 				(uRequiresCryptLayer	<<  9) |
 				(uRequestsCryptLayer	<<  8) |
@@ -1147,11 +1200,11 @@
 
 	uint8 rating = data.ReadUInt8();
 	if (rating > 5) {
-		AddDebugLogLineM( false, logClient, wxString(wxT("Invalid Rating for file '")) << m_clientFilename << wxT("' received: ") << rating);
+		AddDebugLogLineN( logClient, wxString(wxT("Invalid Rating for file '")) << m_clientFilename << wxT("' received: ") << rating);
 		m_iRating = 0;
 	} else {
 		m_iRating = rating;
-		AddDebugLogLineM( false, logClient, wxString(wxT("Rating for file '")) << m_clientFilename << wxT("' received: ") << m_iRating);
+		AddDebugLogLineN( logClient, wxString(wxT("Rating for file '")) << m_clientFilename << wxT("' received: ") << m_iRating);
 	}
 
 	// The comment is unicoded, with a uin32 len and safe read 
@@ -1159,7 +1212,7 @@
 	// Truncated to MAXFILECOMMENTLEN size
 	m_strComment = data.ReadString((GetUnicodeSupport() != utf8strNone), 4 /* bytes (it's a uint32)*/, true).Left(MAXFILECOMMENTLEN);
 	
-	AddDebugLogLineM( false, logClient, wxString(wxT("Description for file '")) << m_clientFilename << wxT("' received: ") << m_strComment);
+	AddDebugLogLineN( logClient, wxString(wxT("Description for file '")) << m_clientFilename << wxT("' received: ") << m_strComment);
 
 	// Update file rating
 	m_reqfile->UpdateFileRatingCommentAvail();
@@ -1207,47 +1260,54 @@
 }
 
 
-bool CUpDownClient::Disconnected(const wxString& strReason, bool bFromSocket)
+bool CUpDownClient::Disconnected(const wxString& DEBUG_ONLY(strReason), bool bFromSocket)
 {
 	//wxASSERT(theApp->clientlist->IsValidClient(this));
+
+	if (HasBeenDeleted()) {
+		AddDebugLogLineN(logClient, wxT("Disconnected() called for already deleted client on ip ") + Uint32toStringIP(GetConnectIP()));
+		return false;
+	}
 	
 	// was this a direct callback?
 	if (m_dwDirectCallbackTimeout != 0) {
 		theApp->clientlist->RemoveDirectCallback(this);
 		m_dwDirectCallbackTimeout = 0;
 		theApp->clientlist->AddDeadSource(this);
-		AddDebugLogLineM(false, logClient, wxT("Direct callback failed to client ") + GetUserHash().Encode() + wxT(" on ip ") + GetFullIP());
+		AddDebugLogLineN(logClient, wxT("Direct callback failed to client on ip ") + Uint32toStringIP(GetConnectIP()));
 	}
 
 	if (GetKadState() == KS_QUEUED_FWCHECK_UDP || GetKadState() == KS_CONNECTING_FWCHECK_UDP) {
 		Kademlia::CUDPFirewallTester::SetUDPFWCheckResult(false, true, wxUINT32_SWAP_ALWAYS(GetConnectIP()), 0); // inform the tester that this test was cancelled
 	} else if (GetKadState() == KS_FWCHECK_UDP) {
 		Kademlia::CUDPFirewallTester::SetUDPFWCheckResult(false, false, wxUINT32_SWAP_ALWAYS(GetConnectIP()), 0); // inform the tester that this test has failed
-// 	} else if (GetKadState() == KS_CONNECTED_BUDDY) {
-// 		AddDebugLogLineM(false, logClient, wxT("Buddy client disconnected - ") + strReason);
+	} else if (GetKadState() == KS_CONNECTED_BUDDY) {
+		AddDebugLogLineN(logClient, wxT("Buddy client disconnected - ") + strReason);
 	}
 
 	//If this is a KAD client object, just delete it!
 	SetKadState(KS_NONE);
 	
 	if (GetUploadState() == US_UPLOADING) {
+		// sets US_NONE
 		theApp->uploadqueue->RemoveFromUploadQueue(this);
 	}
 
 	if (GetDownloadState() == DS_DOWNLOADING) {
 		SetDownloadState(DS_ONQUEUE);
-	} else{
+	} else {
 		// ensure that all possible block requests are removed from the partfile
 		ClearDownloadBlockRequests();
 
-		if ( GetDownloadState() == DS_CONNECTED ){
+		if (GetDownloadState() == DS_CONNECTED) {
+			// successfully connected, but probably didn't respond to our filerequest
 			theApp->clientlist->AddDeadSource(this);
 			theApp->downloadqueue->RemoveSource(this);
 	    }
 	}
 
 	// we had still an AICH request pending, handle it
-	if (IsAICHReqPending()){
+	if (IsAICHReqPending()) {
 		m_fAICHRequested = FALSE;
 		CAICHHashSet::ClientAICHRequestFailed(this);
 	}
@@ -1259,74 +1319,84 @@
 		m_reqfile->SetHashSetNeeded(true);
 	}
 
+	SourceItemType source_type = UNAVAILABLE_SOURCE;
+	SourceItemType peer_type = UNAVAILABLE_SOURCE;
+	
 	//check if this client is needed in any way, if not delete it
 	bool bDelete = true;
-	switch(m_nUploadState){
+	switch (m_nUploadState) {
 		case US_ONUPLOADQUEUE:
 			bDelete = false;
+			peer_type = AVAILABLE_SOURCE;
 			break;
 	};
-	switch(m_nDownloadState){
+	
+	switch (m_nDownloadState) {
 		case DS_ONQUEUE:
+			source_type = A4AF_SOURCE; // Will be checked.		
 		case DS_TOOMANYCONNS:
 		case DS_NONEEDEDPARTS:
 		case DS_LOWTOLOWIP:
 			bDelete = false;
+			break;
 	};
 
-	switch(m_nUploadState){
+	switch (m_nUploadState) {
 		case US_CONNECTING:
 		case US_WAITCALLBACK:
 		case US_ERROR:
 			theApp->clientlist->AddDeadSource(this);
 			bDelete = true;
 	};
-	switch(m_nDownloadState){
+
+	switch (m_nDownloadState) {
 		case DS_CONNECTING:
 		case DS_WAITCALLBACK:
 		case DS_ERROR:
+		case DS_BANNED:
 			theApp->clientlist->AddDeadSource(this);
 			bDelete = true;
 	};
 
 
-	if (GetChatState() != MS_NONE){
+	// We keep chat partners in any case
+	if (GetChatState() != MS_NONE) {
 		bDelete = false;
 		m_pendingMessage.Clear();
 		Notify_ChatConnResult(false,GUI_ID(GetIP(),GetUserPort()),wxEmptyString);
 	}
 
-	if (!bFromSocket && m_socket){
+	// Delete socket
+	if (!bFromSocket && m_socket) {
 		wxASSERT (theApp->listensocket->IsValidSocket(m_socket));
 		m_socket->Safe_Delete();
 	}
 
 	SetSocket(NULL);
 
-	if (m_iFileListRequested){
-		AddLogLineM( false, CFormat(_("Failed to retrieve shared files from user '%s'")) % GetUserName() );
+	if (m_iFileListRequested) {
+		AddLogLineC(CFormat(_("Failed to retrieve shared files from user '%s'")) % GetUserName() );
 		m_iFileListRequested = 0;
 	}
 
-	Notify_ClientCtrlRefreshClient( this );
 
 	if (bDelete) {
 		if (m_Friend) {
 			// Remove the friend linkage
-			Notify_ChatRefreshFriend(m_Friend->GetIP(), m_Friend->GetPort(), wxEmptyString);
+			m_Friend->UnLinkClient();	// this notifies
 		}
-		AddDebugLogLineM( false, logClient, wxString() <<
-			wxT("--- Deleted client \"") <<	GetClientFullInfo() <<
-			wxT("\"; Reason was ") << strReason );
 	} else {
-		AddDebugLogLineM( false, logClient, wxString() <<
-			wxT("--- Disconnected client \"") << GetClientFullInfo() <<
-			wxT("\"; Reason was ") << strReason );
+		Notify_SharedCtrlRefreshClient(ECID(), peer_type);
+		Notify_SourceCtrlUpdateSource(ECID(), source_type);
+		
 		m_fHashsetRequesting = 0;
 		SetSentCancelTransfer(0);
 		m_bHelloAnswerPending = false;
 		m_fSentOutOfPartReqs = 0;
 	}
+	AddDebugLogLineN(logClient, CFormat(wxT("--- %s client D:%d U:%d \"%s\"; Reason was %s"))
+		% (bDelete ? wxT("Deleted") : wxT("Disconnected")) 
+		% m_nDownloadState % m_nUploadState % GetClientFullInfo() % strReason );
 	
 	return bDelete;
 }
@@ -1367,18 +1437,17 @@
 		// Although we filter all received IPs (server sources, source exchange) and all incomming connection attempts,
 		// we do have to filter outgoing connection attempts here too, because we may have updated the ip filter list
 		if (theApp->ipfilter->IsFiltered(uClientIP)) {
-			AddDebugLogLineM(false, logIPFilter, CFormat(wxT("Filtered ip %u (%s) on TryToConnect\n")) % uClientIP % Uint32toStringIP(uClientIP));
+			AddDebugLogLineN(logIPFilter, CFormat(wxT("Filtered ip %u (%s) on TryToConnect\n")) % uClientIP % Uint32toStringIP(uClientIP));
 			if (Disconnected(wxT("IPFilter"))) {
 				Safe_Delete();
 				return false;
-			} else {
-				return true;
 			}
+			return true;
 		}
 
 		// for safety: check again whether that IP is banned
 		if (theApp->clientlist->IsBannedClient(uClientIP)) {
-			AddDebugLogLineM(false, logClient, wxT("Refused to connect to banned client ") + Uint32toStringIP(uClientIP));
+			AddDebugLogLineN(logClient, wxT("Refused to connect to banned client ") + Uint32toStringIP(uClientIP));
 			if (Disconnected(wxT("Banned IP"))) {
 				Safe_Delete();
 				return false;
@@ -1393,8 +1462,8 @@
 		SetKadState(KS_CONNECTING_FWCHECK_UDP);
 	}
 
-	if ( HasLowID() ) {
-		if (!theApp->DoCallback(this)) {
+	if (HasLowID()) {
+		if (!theApp->CanDoCallback(GetServerIP(), GetServerPort())) {
 			//We cannot do a callback!
 			if (GetDownloadState() == DS_CONNECTING) {
 				SetDownloadState(DS_LOWTOLOWIP);
@@ -1412,7 +1481,7 @@
 		}
 
 		//We already know we are not firewalled here as the above condition already detected LowID->LowID and returned.
-		//If ANYTHING changes with the "if(!theApp->DoCallback(this))" above that will let you fall through 
+		//If ANYTHING changes with the "if(!theApp->CanDoCallback(this))" above that will let you fall through 
 		//with the condition that the source is firewalled and we are firewalled, we must
 		//recheck it before the this check..
 		if (HasValidBuddyID() && !GetBuddyIP() && !GetBuddyPort() && !theApp->serverconnect->IsLocalServer(GetServerIP(), GetServerPort())
@@ -1442,23 +1511,22 @@
 	
 	if (HasLowID() && SupportsDirectUDPCallback() && thePrefs::GetEffectiveUDPPort() != 0 && GetConnectIP() != 0) { // LOWID with DirectCallback
 		if (m_dwDirectCallbackTimeout != 0) {
-			AddDebugLogLineM(false, logClient, wxT("ERROR: Trying Direct UDP Callback while already trying to connect to client ") + GetUserHash().Encode());
+			AddDebugLogLineN(logClient, wxT("ERROR: Trying Direct UDP Callback while already trying to connect to client on ip ") + Uint32toStringIP(GetConnectIP()));
 			return true;	// We're already trying a direct connection to this client
 		}
 		// a direct callback is possible - since no other parties are involved and only one additional packet overhead 
 		// is used we basically handle it like a normal connection try, no restrictions apply
-		// we already check above with !theApp->DoCallback(this) if any callback is possible at all
+		// we already check above with !theApp->CanDoCallback(this) if any callback is possible at all
 		m_dwDirectCallbackTimeout = ::GetTickCount() + SEC2MS(45);
 		theApp->clientlist->AddDirectCallbackClient(this);
-		// TODO LOGREMOVE
-		AddDebugLogLineM(false, logClient, wxString::Format(wxT("Direct Callback on port %u to client "), GetKadPort()) + GetUserHash().Encode());
+		AddDebugLogLineN(logClient, CFormat(wxT("Direct Callback on port %u to client on ip %s")) % GetKadPort() % Uint32toStringIP(GetConnectIP()));
 
 		CMemFile data;
 		data.WriteUInt16(thePrefs::GetPort()); // needs to know our port
 		data.WriteHash(thePrefs::GetUserHash()); // and userhash
 		// our connection settings
 		data.WriteUInt8(Kademlia::CPrefs::GetMyConnectOptions(true, false));
-		AddDebugLogLineM(false, logClientUDP, wxT("Sending OP_DIRECTCALLBACKREQ to ") + Uint32_16toStringIP_Port(GetConnectIP(), GetKadPort()));
+		AddDebugLogLineN(logClientUDP, wxT("Sending OP_DIRECTCALLBACKREQ to ") + Uint32_16toStringIP_Port(GetConnectIP(), GetKadPort()));
 		CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_DIRECTCALLBACKREQ);
 		theStats::AddUpOverheadOther(packet->GetPacketSize());
 		theApp->clientudp->SendPacket(packet, GetConnectIP(), GetKadPort(), ShouldReceiveCryptUDPPackets(), GetUserHash().GetHash(), false, 0);
@@ -1481,7 +1549,7 @@
 			data.WriteUInt32(m_nUserIDHybrid);
 			CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_CALLBACKREQUEST);
 			theStats::AddUpOverheadServer(packet->GetPacketSize());
-			AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_CALLBACKREQUEST to ") + GetFullIP());
+			AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_CALLBACKREQUEST to ") + GetFullIP());
 			theApp->serverconnect->SendPacket(packet);
 			SetDownloadState(DS_WAITCALLBACK);
 		} else {
@@ -1513,13 +1581,13 @@
 						bio.WriteUInt128(Kademlia::CUInt128(m_reqfile->GetFileHash().GetHash()));
 						bio.WriteUInt16(thePrefs::GetPort());
 						CPacket* packet = new CPacket(bio, OP_KADEMLIAHEADER, KADEMLIA_CALLBACK_REQ);
-						// eMule FIXME: We dont know which kadversion the buddy has, so we need to send unencrypted
+						// eMule FIXME: We don't know which kadversion the buddy has, so we need to send unencrypted
 						theApp->clientudp->SendPacket(packet, GetBuddyIP(), GetBuddyPort(), false, NULL, true, 0);
-						AddDebugLogLineM(false,logLocalClient, wxString::Format(wxT("KADEMLIA_CALLBACK_REQ (%i) to"),packet->GetPacketSize()) + GetFullIP());
+						AddDebugLogLineN(logClientKadUDP, CFormat(wxT("KadCallbackReq (size=%i) to %s")) % packet->GetPacketSize() % Uint32_16toStringIP_Port(GetBuddyIP(), GetBuddyPort()));
 						theStats::AddUpOverheadKad(packet->GetRealPacketSize());
 						SetDownloadState(DS_WAITCALLBACKKAD);
 					} else {
-						printf("Searching buddy for lowid connection\n");
+						AddLogLineN(_("Searching buddy for lowid connection"));
 						//Create search to find buddy.
 						Kademlia::CSearch *findSource = new Kademlia::CSearch;
 						findSource->SetSearchTypes(Kademlia::CSearch::FINDSOURCE);
@@ -1530,7 +1598,7 @@
 							SetDownloadState(DS_WAITCALLBACKKAD);
 						} else {
 							//This should never happen..
-							wxASSERT(0);
+							wxFAIL;
 						}
 					}
 				}
@@ -1556,8 +1624,6 @@
 	if (!m_socket->IsOk()) {
 		// Enable or disable crypting based on our and the remote clients preference
 		if (HasValidHash() && SupportsCryptLayer() && thePrefs::IsClientCryptLayerSupported() && (RequestsCryptLayer() || thePrefs::IsClientCryptLayerRequested())){
-//			printf("Set connection encryption for socket\n");
-			//DebugLog(_T("Enabling CryptLayer on outgoing connection to client %s"), DbgGetClientInfo()); // to be removed later
 			m_socket->SetConnectionEncryption(true, GetUserHash().GetHash(), false);
 		} else {
 			m_socket->SetConnectionEncryption(false, NULL, false);
@@ -1565,7 +1631,7 @@
 		amuleIPV4Address tmp;
 		tmp.Hostname(GetConnectIP());
 		tmp.Service(GetUserPort());
-		AddDebugLogLineM(false, logClient, wxT("Trying to connect to ") + Uint32_16toStringIP_Port(GetConnectIP(),GetUserPort()));
+		AddDebugLogLineN(logClient, wxT("Trying to connect to ") + Uint32_16toStringIP_Port(GetConnectIP(),GetUserPort()));
 		m_socket->Connect(tmp, false);
 		// We should send hello packets AFTER connecting!
 		// so I moved it to OnConnect	
@@ -1577,7 +1643,6 @@
 
 void CUpDownClient::ConnectionEstablished()
 {
-	
 	/* Kry - First thing, check if this client was just used to retrieve 
 	   info. That's some debug thing for myself... check connection_reason
 	   definition */
@@ -1586,8 +1651,8 @@
 	
 	#ifdef __DEBUG__
 	if (!connection_reason.IsEmpty()) {
-		printf("Got client info checking for %s: %s\nDisconnecting and deleting.\n",(const char*)unicode2char(connection_reason),(const char*)unicode2char(GetClientFullInfo()));
-		connection_reason.Clear(); // So we don't re-printf on destructor.
+		AddLogLineN(CFormat(wxT("Got client info checking for %s: %s\nDisconnecting and deleting.")) % connection_reason % GetClientFullInfo());
+		connection_reason.Clear(); // So we don't re-print on destructor.
 		Safe_Delete();
 		return;
 	}
@@ -1603,8 +1668,7 @@
 	if (m_dwDirectCallbackTimeout != 0){
 		theApp->clientlist->RemoveDirectCallback(this);
 		m_dwDirectCallbackTimeout = 0;
-		// TODO LOGREMOVE
-		AddDebugLogLineM(false, logClient, wxT("Direct Callback succeeded, connection established to ") + GetUserHash().Encode());
+		AddDebugLogLineN(logClient, wxT("Direct Callback succeeded, connection established to ") + Uint32toStringIP(GetConnectIP()));
 	}
 
 	switch (GetKadState()) {
@@ -1631,7 +1695,7 @@
 	if (GetChatState() == MS_CHATTING) {
 		bool result = true;
 		if (!m_pendingMessage.IsEmpty()) {
-			result = SendMessage(m_pendingMessage);
+			result = SendChatMessage(m_pendingMessage);
 		}
 		Notify_ChatConnResult(result,GUI_ID(GetIP(),GetUserPort()),m_pendingMessage);
 		m_pendingMessage.Clear();
@@ -1660,7 +1724,7 @@
 				CPacket* packet = new CPacket(OP_ACCEPTUPLOADREQ, 0, OP_EDONKEYPROT);
 				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
 				SendPacket(packet,true);
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ACCEPTUPLOADREQ to ") + GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ACCEPTUPLOADREQ to ") + GetFullIP() );
 			}
 	}
 	if (m_iFileListRequested == 1) {
@@ -1668,9 +1732,9 @@
 		theStats::AddUpOverheadOther(packet->GetPacketSize());
 		SendPacket(packet,true,true);
 		if (m_fSharedDirectories) {
-			AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ASKSHAREDDIRS to ") + GetFullIP() );
+			AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ASKSHAREDDIRS to ") + GetFullIP() );
 		} else {
-			AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ASKSHAREDFILES to ") + GetFullIP() );
+			AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ASKSHAREDFILES to ") + GetFullIP() );
 		}
 	}
 	
@@ -1703,7 +1767,7 @@
 
 void CUpDownClient::SetSocket(CClientTCPSocket* socket)
 {
-#if defined(__DEBUG__) && !defined(EC_REMOTE)
+#ifdef __DEBUG__
 	if (m_socket == NULL && socket != NULL) {
 		theStats::SocketAssignedToClient();
 	} else if (m_socket != NULL && socket == NULL) {
@@ -1735,7 +1799,7 @@
 		}
 		// Isn't xMule annoying?
 		if ((m_clientSoft == SO_LXMULE) && (GetMuleVersion() > 0x26) && (GetMuleVersion() != 0x99)) {
-			m_clientSoftString += wxString::Format(_(" (Fake eMule version %#x)"),GetMuleVersion());
+			m_clientSoftString += CFormat(_(" (Fake eMule version %#x)")) % GetMuleVersion();
 		}
 		if ((m_clientSoft == SO_EMULE) && 
 			(
@@ -1767,10 +1831,10 @@
 					(m_byCompatibleClient != 0xf0)	// Chinese leech mod
 					&& (1==1) 						// Your ad here
 					) {
-					printf("Compatible client found with ET_COMPATIBLECLIENT of %#x\n",m_byCompatibleClient);
+					AddLogLineNS(CFormat(wxT("Compatible client found with ET_COMPATIBLECLIENT of %x")) % m_byCompatibleClient);
 				}
 				#endif
-				m_clientSoftString = GetSoftName(m_clientSoft) + wxString::Format(wxT("(%#x)"),m_byCompatibleClient);
+				m_clientSoftString = CFormat(wxT("%s(%#x)")) % GetSoftName(m_clientSoft) % m_byCompatibleClient;
 			} else {
 				// If we step here, it might mean 2 things:
 				// a eMule
@@ -1787,14 +1851,14 @@
 			m_nClientVersion = MAKE_CLIENT_VERSION(0,nClientMinVersion,0);
 			switch (m_clientSoft) {
 				case SO_AMULE:
-					m_clientVerString = wxString::Format(_("1.x (based on eMule v0.%u)"), nClientMinVersion);
+					m_clientVerString = CFormat(_("1.x (based on eMule v0.%u)")) % nClientMinVersion;
 					break;
 				case SO_LPHANT:
 					m_clientVerString = wxT("< v0.05");
 					break;
 				default:
 					clientModString = GetClientModString();
-					m_clientVerString = wxString::Format(wxT("v0.%u"), nClientMinVersion);
+					m_clientVerString = CFormat(wxT("v0.%u")) % nClientMinVersion;
 					break;
 			}
 		} else {
@@ -1808,28 +1872,31 @@
 				case SO_AMULE:
 				case SO_LXMULE:
 				case SO_HYDRANODE:
+				case SO_MLDONKEY:
+				case SO_NEW_MLDONKEY:
+				case SO_NEW2_MLDONKEY:					
 					// Kry - xMule started sending correct version tags on 1.9.1b.
 					// It only took them 4 months, and being told by me and the
 					// eMule+ developers, so I think they're slowly getting smarter.
 					// They are based on our implementation, so we use the same format
 					// for the version string.
-					m_clientVerString =  wxString::Format(wxT("v%u.%u.%u"), nClientMajVersion, nClientMinVersion, nClientUpVersion);
+					m_clientVerString = CFormat(wxT("v%u.%u.%u")) % nClientMajVersion % nClientMinVersion % nClientUpVersion;
 					break;
 				case SO_LPHANT:
-					m_clientVerString =  wxString::Format(wxT(" v%u.%.2u%c"), nClientMajVersion-1, nClientMinVersion, 'a' + nClientUpVersion);
+					m_clientVerString = CFormat(wxT(" v%u.%.2u%c")) % (nClientMajVersion-1) % nClientMinVersion % ('a' + nClientUpVersion);
 					break;
 				case SO_EMULEPLUS:
-					m_clientVerString =  wxString::Format(wxT("v%u"), nClientMajVersion);
+					m_clientVerString = CFormat(wxT("v%u")) % nClientMajVersion;
 					if(nClientMinVersion != 0) {
-						m_clientVerString +=  wxString::Format(wxT(".%u"), nClientMinVersion);
+						m_clientVerString += CFormat(wxT(".%u")) % nClientMinVersion;
 					}
 					if(nClientUpVersion != 0) {
-						m_clientVerString +=  wxString::Format(wxT("%c"), 'a' + nClientUpVersion - 1);
+						m_clientVerString += CFormat(wxT("%c")) % ('a' + nClientUpVersion - 1);
 					}
 					break;
 				default:
 					clientModString = GetClientModString();
-					m_clientVerString =  wxString::Format(wxT("v%u.%u%c"), nClientMajVersion, nClientMinVersion, 'a' + nClientUpVersion);
+					m_clientVerString = CFormat(wxT("v%u.%u%c")) % nClientMajVersion % nClientMinVersion % ('a' + nClientUpVersion);
 					break;
 			}
 		}
@@ -1877,27 +1944,27 @@
 		}
 		m_nClientVersion = MAKE_CLIENT_VERSION(nClientMajVersion, nClientMinVersion, nClientUpVersion);
 		if (nClientUpVersion) {
-			m_clientVerString = wxString::Format(wxT("v%u.%u.%u"), nClientMajVersion, nClientMinVersion, nClientUpVersion);
+			m_clientVerString = CFormat(wxT("v%u.%u.%u")) % nClientMajVersion % nClientMinVersion % nClientUpVersion;
 		} else {
-			m_clientVerString = wxString::Format(wxT("v%u.%u"), nClientMajVersion, nClientMinVersion);
+			m_clientVerString = CFormat(wxT("v%u.%u")) % nClientMajVersion % nClientMinVersion;
 		}
 	} else if (m_bIsML || (iHashType == SO_MLDONKEY)) {
 		m_clientSoft = SO_MLDONKEY;
 		m_clientSoftString = GetSoftName(m_clientSoft);
 		uint32 nClientMinVersion = m_nClientVersion;
 		m_nClientVersion = MAKE_CLIENT_VERSION(0, nClientMinVersion, 0);
-		m_clientVerString = wxString::Format(wxT("v0.%u"), nClientMinVersion);
+		m_clientVerString = CFormat(wxT("v0.%u")) % nClientMinVersion;
 	} else if (iHashType == SO_OLDEMULE) {
 		m_clientSoft = SO_OLDEMULE;
 		m_clientSoftString = GetSoftName(m_clientSoft);
 		uint32 nClientMinVersion = m_nClientVersion;
 		m_nClientVersion = MAKE_CLIENT_VERSION(0, nClientMinVersion, 0);
-		m_clientVerString = wxString::Format(wxT("v0.%u"), nClientMinVersion);
+		m_clientVerString = CFormat(wxT("v0.%u")) % nClientMinVersion;
 	} else {
 		m_clientSoft = SO_EDONKEY;
 		m_clientSoftString = GetSoftName(m_clientSoft);
 		m_nClientVersion *= 10;
-		m_clientVerString = wxString::Format(wxT("v%u.%u"), m_nClientVersion / 100000, (m_nClientVersion / 1000) % 100);
+		m_clientVerString = CFormat(wxT("v%u.%u")) % (m_nClientVersion / 100000) % ((m_nClientVersion / 1000) % 100);
 	}
 
 	m_clientVersionString = m_clientVerString;
@@ -1912,11 +1979,11 @@
 void CUpDownClient::RequestSharedFileList()
 {
 	if (m_iFileListRequested == 0) {
-		AddDebugLogLineM( false, logClient, wxString( wxT("Requesting shared files from ") ) + GetUserName() );
+		AddDebugLogLineN( logClient, wxString( wxT("Requesting shared files from ") ) + GetUserName() );
 		m_iFileListRequested = 1;
 		TryToConnect(true);
 	} else {
-		AddDebugLogLineM( false, logClient, CFormat( wxT("Requesting shared files from user %s (%u) is already in progress") ) % GetUserName() % GetUserIDHybrid() );
+		AddDebugLogLineN( logClient, CFormat( wxT("Requesting shared files from user %s (%u) is already in progress") ) % GetUserName() % GetUserIDHybrid() );
 	}
 }
 
@@ -1989,7 +2056,7 @@
 void CUpDownClient::SendPublicKeyPacket(){
 	// send our public key to the client who requested it
 	if (m_socket == NULL || credits == NULL || m_SecureIdentState != IS_KEYANDSIGNEEDED){
-		wxASSERT ( false );
+		wxFAIL;
 		return;
 	}
 	if (!theApp->CryptoAvailable())
@@ -2001,7 +2068,7 @@
 	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_PUBLICKEY);
 
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
-	AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_PUBLICKEY to ") + GetFullIP() );
+	AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_PUBLICKEY to ") + GetFullIP() );
 	SendPacket(packet,true,true);
 	m_SecureIdentState = IS_SIGNATURENEEDED;
 }
@@ -2010,7 +2077,7 @@
 void CUpDownClient::SendSignaturePacket(){
 	// signate the public key of this client and send it
 	if (m_socket == NULL || credits == NULL || m_SecureIdentState == 0){
-		wxASSERT ( false );
+		wxFAIL;
 		return;
 	}
 
@@ -2022,7 +2089,7 @@
 	}
 	// do we have a challenge value received (actually we should if we are in this function)
 	if (credits->m_dwCryptRndChallengeFrom == 0){
-		AddDebugLogLineM( false, logClient, wxString(wxT("Want to send signature but challenge value is invalid - User ")) + GetUserName());
+		AddDebugLogLineN( logClient, wxString(wxT("Want to send signature but challenge value is invalid - User ")) + GetUserName());
 		return;
 	}
 	// v2
@@ -2050,7 +2117,7 @@
 
 	uint8 siglen = theApp->clientcredits->CreateSignature(credits, achBuffer,  250, ChallengeIP, byChaIPKind );
 	if (siglen == 0){
-		wxASSERT ( false );
+		wxFAIL;
 		return;
 	}
 	CMemFile data;
@@ -2063,7 +2130,7 @@
 	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_SIGNATURE);
 
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
-	AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_SIGNATURE to ") + GetFullIP() );
+	AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_SIGNATURE to ") + GetFullIP() );
 	SendPacket(packet,true,true);
 	m_SecureIdentState = IS_ALLREQUESTSSEND;
 }
@@ -2075,7 +2142,7 @@
 
 	if (m_socket == NULL || credits == NULL || pachPacket[0] != nSize-1
 		|| nSize == 0 || nSize > 250){
-		wxASSERT ( false );
+		wxFAIL;
 		return;
 	}
 	if (!theApp->CryptoAvailable())
@@ -2086,12 +2153,12 @@
 		if (m_SecureIdentState == IS_SIGNATURENEEDED){
 			SendSignaturePacket();
 		}
-		else if(m_SecureIdentState == IS_KEYANDSIGNEEDED){
+		else if (m_SecureIdentState == IS_KEYANDSIGNEEDED) {
 			// something is wrong
-			AddDebugLogLineM( false, logClient, wxT("Invalid State error: IS_KEYANDSIGNEEDED in ProcessPublicKeyPacket") );
+			AddDebugLogLineN( logClient, wxT("Invalid State error: IS_KEYANDSIGNEEDED in ProcessPublicKeyPacket") );
 		}
-	} else{
-		AddDebugLogLineM( false, logClient, wxT("Failed to use new received public key") );
+	} else {
+		AddDebugLogLineN( logClient, wxT("Failed to use new received public key") );
 	}
 }
 
@@ -2101,7 +2168,7 @@
 	// here we spread the good guys from the bad ones ;)
 
 	if (m_socket == NULL || credits == NULL || nSize == 0 || nSize > 250){
-		wxASSERT ( false );
+		wxFAIL;
 		return;
 	}
 
@@ -2111,7 +2178,7 @@
 	else if (pachPacket[0] == nSize-2 && (m_bySupportSecIdent & 2) > 0) //v2
 		byChaIPKind = pachPacket[nSize-1];
 	else{
-		wxASSERT ( false );
+		wxFAIL;
 		return;
 	}
 
@@ -2120,25 +2187,25 @@
 
 	// we accept only one signature per IP, to avoid floods which need a lot cpu time for cryptfunctions
 	if (m_dwLastSignatureIP == GetIP()){
-		AddDebugLogLineM( false, logClient, wxT("received multiple signatures from one client") );
+		AddDebugLogLineN( logClient, wxT("received multiple signatures from one client") );
 		return;
 	}
 	// also make sure this client has a public key
 	if (credits->GetSecIDKeyLen() == 0){
-		AddDebugLogLineM( false, logClient, wxT("received signature for client without public key") );
+		AddDebugLogLineN( logClient, wxT("received signature for client without public key") );
 		return;
 	}
 	// and one more check: did we ask for a signature and sent a challange packet?
 	if (credits->m_dwCryptRndChallengeFor == 0){
-		AddDebugLogLineM( false, logClient, wxT("received signature for client with invalid challenge value - User ") + GetUserName() );
+		AddDebugLogLineN( logClient, wxT("received signature for client with invalid challenge value - User ") + GetUserName() );
 		return;
 	}
 
-	if (theApp->clientcredits->VerifyIdent(credits, pachPacket+1, pachPacket[0], GetIP(), byChaIPKind ) ){
+	if (theApp->clientcredits->VerifyIdent(credits, pachPacket+1, pachPacket[0], GetIP(), byChaIPKind ) ) {
 		// result is saved in function above
-		AddDebugLogLineM( false, logClient, CFormat( wxT("'%s' has passed the secure identification, V2 State: %i") ) % GetUserName() % byChaIPKind );
+		AddDebugLogLineN( logClient, CFormat( wxT("'%s' has passed the secure identification, V2 State: %i") ) % GetUserName() % byChaIPKind );
 	} else {
-		AddDebugLogLineM( false, logClient, CFormat( wxT("'%s' has failed the secure identification, V2 State: %i") ) % GetUserName() % byChaIPKind );
+		AddDebugLogLineN( logClient, CFormat( wxT("'%s' has failed the secure identification, V2 State: %i") ) % GetUserName() % byChaIPKind );
 	}
 
 	m_dwLastSignatureIP = GetIP();
@@ -2156,7 +2223,7 @@
 			}
 		}
 		if (nValue == 0){
-			AddDebugLogLineM( false, logClient, wxT("Not sending SecIdentState Packet, because State is Zero") );
+			AddDebugLogLineN( logClient, wxT("Not sending SecIdentState Packet, because State is Zero") );
 			return;
 		}
 		// crypt: send random data to sign
@@ -2169,10 +2236,10 @@
 		CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_SECIDENTSTATE);
 
 		theStats::AddUpOverheadOther(packet->GetPacketSize());
-		AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_SECIDENTSTATE to ") + GetFullIP() );
+		AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_SECIDENTSTATE to ") + GetFullIP() );
 		SendPacket(packet,true,true);
 	} else {
-		wxASSERT ( false );
+		wxFAIL;
 	}
 }
 
@@ -2221,11 +2288,12 @@
 }
 
 
-bool CUpDownClient::CheckHandshakeFinished(uint32 WXUNUSED(protocol), uint32 WXUNUSED(opcode)) const
+bool CUpDownClient::CheckHandshakeFinished() const
 {
-	if (m_bHelloAnswerPending){
+	if (m_bHelloAnswerPending) {
 		// this triggers way too often.. need more time to look at this -> only create a warning
-		AddDebugLogLineM( false, logClient, wxT("Handshake not finished while processing packet.") );
+		// The reason for this is that 2 clients are connecting to each other at the same time..
+		AddDebugLogLineN( logClient, wxT("Handshake not finished while processing packet.") );
 		return false;
 	}
 
@@ -2233,13 +2301,13 @@
 }
 
 
-wxString CUpDownClient::GetClientFullInfo() {
-
+wxString CUpDownClient::GetClientFullInfo()
+{
 	if (m_clientVerString.IsEmpty()) {
 		ReGetClientSoft();
 	}
 
-	return CFormat( _("Client %s on IP:Port %s:%d using %s %s %s") )
+	return CFormat( wxT("Client %s on IP:Port %s:%d using %s %s %s") )
 		% ( m_Username.IsEmpty() ? wxString(_("Unknown")) : m_Username )
 		% GetFullIP()
 		% GetUserPort()
@@ -2249,18 +2317,33 @@
 }
 
 
+wxString CUpDownClient::GetClientShortInfo()
+{
+	if (m_clientVerString.IsEmpty()) {
+		ReGetClientSoft();
+	}
 
-void CUpDownClient::SendPublicIPRequest(){
+	return CFormat( wxT("'%s' (%s %s %s)") )
+		% ( m_Username.IsEmpty() ? wxString(_("Unknown")) : m_Username )
+		% m_clientSoftString 
+		% m_clientVerString
+		% m_strModVersion;
+}
+
+
+void CUpDownClient::SendPublicIPRequest()
+{
 	if (IsConnected()){
 		CPacket* packet = new CPacket(OP_PUBLICIP_REQ,0,OP_EMULEPROT);
 		theStats::AddUpOverheadOther(packet->GetPacketSize());
-		AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_PUBLICIP_REQ to") + GetFullIP());
+		AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_PUBLICIP_REQ to ") + GetFullIP());
 		SendPacket(packet,true);
 		m_fNeedOurPublicIP = true;
 	}
 }
 
-void CUpDownClient::ProcessPublicIPAnswer(const byte* pbyData, uint32 uSize){
+void CUpDownClient::ProcessPublicIPAnswer(const byte* pbyData, uint32 uSize)
+{
 	if (uSize != 4) {
 		throw wxString(wxT("Wrong Packet size on Public IP answer"));
 	}
@@ -2286,14 +2369,13 @@
 		m_socket->SendPacket(packet, delpacket, controlpacket );
 		return true;
 	} else {
-		printf("CAUGHT DEAD SOCKET IN SENDPACKET()\n");
+		AddLogLineN(wxT("CAUGHT DEAD SOCKET IN SENDPACKET()"));
 		return false;
 	}
 }
 
 float CUpDownClient::SetDownloadLimit(uint32 reducedownload)
 {
-
 	// lfroen: in daemon it actually can happen
 		wxASSERT( m_socket );
 
@@ -2325,11 +2407,10 @@
 		}		
 		
 	} else {
-		printf("CAUGHT DEAD SOCKET IN SETDOWNLOADLIMIT() WITH SPEED %f\n", kBpsClient);
+		AddLogLineNS(CFormat(wxT("CAUGHT DEAD SOCKET IN SETDOWNLOADLIMIT() WITH SPEED %f")) % kBpsClient);
 	}
 	
 	return kBpsClient;
-	
 }
 
 void CUpDownClient::SetUserIDHybrid(uint32 nUserID)
@@ -2348,7 +2429,7 @@
 
 	m_nConnectIP = val;
 	
-	m_FullUserIP = Uint32toStringIP(val);
+	m_FullUserIP = val;
 }
 
 
@@ -2366,30 +2447,50 @@
 	return m_bUnicodeSupport ? utf8strRaw : utf8strNone;
 }
 
+void CUpDownClient::SetSpammer(bool bVal)
+{ 
+	if (bVal) {
+		Ban();
+	} else if (IsBanned() && m_fIsSpammer) {
+		UnBan();
+	}
+	m_fIsSpammer = bVal;
+}
 
-uint8 CUpDownClient::GetSecureIdentState() {
+uint8 CUpDownClient::GetSecureIdentState()
+{
 	if (m_SecureIdentState != IS_UNAVAILABLE) {
 		if (!SecIdentSupRec) {
 			// This can be caused by a 0.30x based client which sends the old
 			// style Hello packet, and the mule info packet, but between them they
 			// send a secure ident state packet (after a hello but before we have 
 			// the SUI capabilities). This is a misbehaving client, and somehow I
-			// Feel like ti should be dropped. But then again, it won't harm to use
+			// feel like it should be dropped. But then again, it won't harm to use
 			// this SUI state if they are reporting no SUI (won't be used) and if 
 			// they report using SUI on the mule info packet, it's ok to use it.
-			
-			AddDebugLogLineM(false, logClient, wxT("A client sent secure ident state before telling us the SUI capabilities"));
-			AddDebugLogLineM(false, logClient, wxT("Client info: ") + GetClientFullInfo());
-			AddDebugLogLineM(false, logClient, wxT("This client won't be disconnected, but it should be. :P"));
+
+			AddDebugLogLineN(logClient, wxT("A client sent secure ident state before telling us the SUI capabilities"));
+			AddDebugLogLineN(logClient, wxT("Client info: ") + GetClientFullInfo());
+			AddDebugLogLineN(logClient, wxT("This client won't be disconnected, but it should be. :P"));
 		}
 	}
-	
+
 	return m_SecureIdentState;
 }
 
 
-bool CUpDownClient::SendMessage(const wxString& message)
+bool CUpDownClient::SendChatMessage(const wxString& message)
 {
+	if (GetChatCaptchaState() == CA_CAPTCHARECV) {
+		m_nChatCaptchaState = CA_SOLUTIONSENT;
+	} else if (GetChatCaptchaState() == CA_SOLUTIONSENT) {
+		wxFAIL; // we responsed to a captcha but didn't heard from the client afterwards - hopefully its just lag and this message will get through
+	} else {
+		m_nChatCaptchaState = CA_ACCEPTING;
+	}
+
+	SetSpammer(false);
+	IncMessagesSent();
 	// Already connecting?
 	if (GetChatState() == MS_CONNECTING) {
 		// Queue all messages till we're able to send them (or discard them)
@@ -2397,17 +2498,20 @@
 			m_pendingMessage += wxT("\n");
 		} else {
 			// There must be a message to send
-			wxASSERT(0);
+			// - except if we got disconnected. No need to assert therefore.
 		}
 		m_pendingMessage += message;		
 		return false;
 	}
 	if (IsConnected()) {
+		// If we are already connected when we send the first message,
+		// we have to update the chat status.
+		SetChatState(MS_CHATTING);
 		CMemFile data;
 		data.WriteString(message, GetUnicodeSupport());
 		CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_MESSAGE);
 		theStats::AddUpOverheadOther(packet->GetPacketSize());
-		AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_MESSAGE to ") + GetFullIP());
+		AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_MESSAGE to ") + GetFullIP());
 		SendPacket(packet, true, true);
 		return true;
 	} else {
@@ -2416,7 +2520,7 @@
 		// True to ignore "Too Many Connections"
 		TryToConnect(true);
 		return false;
-	}	
+	}
 }
 
 /* Kad stuff */
@@ -2438,7 +2542,7 @@
 	SetLastBuddyPingPongTime();	
 	CPacket* buddyPing = new CPacket(OP_BUDDYPING, 0, OP_EMULEPROT);
 	theStats::AddUpOverheadKad(buddyPing->GetPacketSize());
-	AddDebugLogLineM(false, logLocalClient,wxT("Local Client: OP_BUDDYPING to ") + GetFullIP());
+	AddDebugLogLineN(logLocalClient,wxT("Local Client: OP_BUDDYPING to ") + GetFullIP());
 	return SafeSendPacket(buddyPing);
 }
 
@@ -2501,7 +2605,8 @@
 	return credits ? credits->GetUploadedTotal() : 0;
 }
 	
-double CUpDownClient::GetScoreRatio() const {
+double CUpDownClient::GetScoreRatio() const 
+{
 	return credits ? credits->GetScoreRatio(GetIP(), theApp->CryptoAvailable()) : 0;
 }
 
@@ -2520,11 +2625,298 @@
 	return ret;
 }
 
-bool CUpDownClient::ShouldReceiveCryptUDPPackets() const {
+bool CUpDownClient::ShouldReceiveCryptUDPPackets() const 
+{
 	return (thePrefs::IsClientCryptLayerSupported() && SupportsCryptLayer() && theApp->GetPublicIP() != 0
 		&& HasValidHash() && (thePrefs::IsClientCryptLayerRequested() || RequestsCryptLayer()) );
 }
 
+#ifdef AMULE_DAEMON
+
+void CUpDownClient::ProcessCaptchaRequest(CMemFile* WXUNUSED(data)) {}
+void CUpDownClient::ProcessCaptchaReqRes(uint8 WXUNUSED(nStatus)) {}
+void CUpDownClient::ProcessChatMessage(const wxString WXUNUSED(message)) {}
+
+#else
+
+void CUpDownClient::ProcessCaptchaRequest(CMemFile* data)
+{
+	uint64 id = GUI_ID(GetIP(),GetUserPort());
+	// received a captcha request, check if we actually accept it (only after sending a message ourself to this client)
+	if (GetChatCaptchaState() == CA_ACCEPTING && GetChatState() != MS_NONE
+		&& theApp->amuledlg->m_chatwnd->IsIdValid(id)) {
+		// read tags (for future use)
+		uint8 nTagCount = data->ReadUInt8();
+		if (nTagCount) {
+			AddDebugLogLineN(logClient, CFormat(wxT("Received captcha request from client (%s) with (%u) tags")) % GetFullIP() % nTagCount);
+			// and ignore them for now
+			for (uint32 i = 0; i < nTagCount; i++) {
+				CTag tag(*data, true);
+			}
+		}
+
+		// sanitize checks - we want a small captcha not a wallpaper
+		uint32 nSize = (uint32)(data->GetLength() - data->GetPosition());
+
+		if ( nSize > 128 && nSize < 4096 ) {
+			uint64 pos = data->GetPosition();
+			wxMemoryInputStream memstr(data->GetRawBuffer() + pos, nSize);
+			wxImage imgCaptcha(memstr, wxBITMAP_TYPE_BMP);
+
+			if (imgCaptcha.IsOk() && imgCaptcha.GetHeight() > 10 && imgCaptcha.GetHeight() < 50
+				&& imgCaptcha.GetWidth() > 10 && imgCaptcha.GetWidth() < 150 ) {
+				m_nChatCaptchaState = CA_CAPTCHARECV;
+				CCaptchaDialog * dialog = new CCaptchaDialog(theApp->amuledlg, imgCaptcha, id);
+				dialog->Show();
+
+			} else {
+				AddDebugLogLineN(logClient, CFormat(wxT("Received captcha request from client, processing image failed or invalid pixel size (%s)")) % GetFullIP());
+			}
+		} else {
+			AddDebugLogLineN(logClient, CFormat(wxT("Received captcha request from client, size sanitize check failed (%u) (%s)")) % nSize % GetFullIP());
+		}
+	} else {
+		AddDebugLogLineN(logClient, CFormat(wxT("Received captcha request from client, but don't accepting it at this time (%s)")) % GetFullIP());
+	}
+}
+
+void CUpDownClient::ProcessCaptchaReqRes(uint8 nStatus)
+{
+	uint64 id = GUI_ID(GetIP(),GetUserPort());
+	if (GetChatCaptchaState() == CA_SOLUTIONSENT && GetChatState() != MS_NONE
+		&& theApp->amuledlg->m_chatwnd->IsIdValid(id)) {
+		wxASSERT( nStatus < 3 );
+		m_nChatCaptchaState = CA_NONE;
+		theApp->amuledlg->m_chatwnd->ShowCaptchaResult(id, nStatus == 0);
+	} else {
+		m_nChatCaptchaState = CA_NONE;
+		AddDebugLogLineN(logClient, CFormat(wxT("Received captcha result from client, but not accepting it at this time (%s)")) % GetFullIP());
+	}
+}
+
+void CUpDownClient::ProcessChatMessage(wxString message)
+{
+	if (IsMessageFiltered(message)) {
+		AddLogLineC(CFormat(_("Message filtered from '%s' (IP:%s)")) % GetUserName() % GetFullIP());
+		return;
+	}
+
+	// advanced spamfilter check
+	if (thePrefs::IsChatCaptchaEnabled() && !IsFriend()) {
+		// captcha checks outrank any further checks - if the captcha has been solved, we assume it's not spam
+		// first check if we need to send a captcha request to this client
+		if (GetMessagesSent() == 0 && GetMessagesReceived() == 0 && GetChatCaptchaState() != CA_CAPTCHASOLVED) {
+			// we have never sent a message to this client, and no message from him has ever passed our filters
+			if (GetChatCaptchaState() != CA_CHALLENGESENT) {
+				// we also aren't currently expecting a captcha response
+				if (m_fSupportsCaptcha) {
+					// and he supports captcha, so send him one and store the message (without showing for now)
+					if (m_cCaptchasSent < 3) {	// no more than 3 tries
+						m_strCaptchaPendingMsg = message;
+						wxMemoryOutputStream memstr;
+						memstr.PutC(0); // no tags, for future use
+						CCaptchaGenerator captcha(4);
+						if (captcha.WriteCaptchaImage(memstr)){
+							m_strCaptchaChallenge = captcha.GetCaptchaText();
+							m_nChatCaptchaState = CA_CHALLENGESENT;
+							m_cCaptchasSent++;
+							CMemFile fileAnswer((byte*) memstr.GetOutputStreamBuffer()->GetBufferStart(), memstr.GetLength());
+							CPacket* packet = new CPacket(fileAnswer, OP_EMULEPROT, OP_CHATCAPTCHAREQ);
+							theStats::AddUpOverheadOther(packet->GetPacketSize());
+							AddLogLineN(CFormat(wxT("sent Captcha %s (%d)")) % m_strCaptchaChallenge % packet->GetPacketSize());
+							SafeSendPacket(packet);
+						} else {
+							wxFAIL;
+						}
+					}
+				} else {
+					// client doesn't support captchas, but we require them, tell him that it's not going to work out
+					// with an answer message (will not be shown and doesn't count as sent message)
+					if (m_cCaptchasSent < 1) {	// don't send this notifier more than once
+						m_cCaptchasSent++;
+						// always sent in english
+						SendChatMessage(wxT("In order to avoid spam messages, this user requires you to solve a captcha before you can send a message to him. However your client does not supports captchas, so you will not be able to chat with this user."));
+						AddDebugLogLineN(logClient, CFormat(wxT("Received message from client not supporting captchas, filtered and sent notifier (%s)")) % GetClientFullInfo());
+					} else {
+						AddDebugLogLineN(logClient, CFormat(wxT("Received message from client not supporting captchas, filtered, didn't send notifier (%s)")) % GetClientFullInfo());
+					}
+				}
+				return;
+			} else { // (GetChatCaptchaState() == CA_CHALLENGESENT)
+				// this message must be the answer to the captcha request we sent him, let's verify
+				wxASSERT( !m_strCaptchaChallenge.IsEmpty() );
+				if (m_strCaptchaChallenge.CmpNoCase(message.Trim().Right(std::min(message.Length(), m_strCaptchaChallenge.Length()))) == 0) {
+					// allright
+					AddDebugLogLineN(logClient, CFormat(wxT("Captcha solved, showing withheld message (%s)")) % GetClientFullInfo());
+					m_nChatCaptchaState = CA_CAPTCHASOLVED; // this state isn't persitent, but the messagecounter will be used to determine later if the captcha has been solved
+					// replace captchaanswer with withheld message and show it
+					message = m_strCaptchaPendingMsg;
+					m_cCaptchasSent = 0;
+					m_strCaptchaChallenge.Clear();
+					CPacket* packet = new CPacket(OP_CHATCAPTCHARES, 1, OP_EMULEPROT, false);
+					byte statusResponse = 0; // status response
+					packet->CopyToDataBuffer(0, &statusResponse, 1);
+					theStats::AddUpOverheadOther(packet->GetPacketSize());
+					SafeSendPacket(packet);
+				} else { // wrong, cleanup and ignore
+					AddDebugLogLineN(logClient, CFormat(wxT("Captcha answer failed (%s)")) % GetClientFullInfo());
+					m_nChatCaptchaState = CA_NONE;
+					m_strCaptchaChallenge.Clear();
+					m_strCaptchaPendingMsg.Clear();
+					CPacket* packet = new CPacket(OP_CHATCAPTCHARES, 1, OP_EMULEPROT, false);
+					byte statusResponse = (m_cCaptchasSent < 3) ? 1 : 2; // status response
+					packet->CopyToDataBuffer(0, &statusResponse, 1);
+					theStats::AddUpOverheadOther(packet->GetPacketSize());
+					SafeSendPacket(packet);
+					return; // nothing more todo
+				}
+			}	
+		}
+	}
+
+	if (thePrefs::IsAdvancedSpamfilterEnabled() && !IsFriend()) { // friends are never spammer... (but what if two spammers are friends :P )
+		bool bIsSpam = false;
+		if (m_fIsSpammer) {
+			bIsSpam = true;
+		} else {
+			// first fixed criteria: If a client sends me an URL in his first message before I respond to him
+			// there is a 99,9% chance that it is some poor guy advising his leech mod, or selling you .. well you know :P
+			if (GetMessagesSent() == 0) {
+				static wxArrayString urlindicators(wxStringTokenize(wxT("http:|www.|.de |.net |.com |.org |.to |.tk |.cc |.fr |ftp:|ed2k:|https:|ftp.|.info|.biz|.uk|.eu|.es|.tv|.cn|.tw|.ws|.nu|.jp"), wxT("|")));
+				for (size_t pos = urlindicators.GetCount(); pos--;) {
+					if (message.Find(urlindicators[pos]) != wxNOT_FOUND) {
+						bIsSpam = true;
+						break;
+					}
+				}
+				// second fixed criteria: he sent me 4 or more messages and I didn't answer him once
+				if (GetMessagesReceived() > 3) {
+					bIsSpam = true;
+				}
+			}
+		}
+		if (bIsSpam) {
+			AddDebugLogLineN(logClient, CFormat(wxT("'%s' has been marked as spammer")) % GetUserName());
+			SetSpammer(true);
+			theApp->amuledlg->m_chatwnd->EndSession(GUI_ID(GetIP(),GetUserPort()));
+			return;
+		}
+	}
+
+
+	wxString logMsg = CFormat(_("New message from '%s' (IP:%s)")) % GetUserName() % GetFullIP();
+	if(thePrefs::ShowMessagesInLog()) {
+		logMsg += wxT(": ") + message;
+	}
+	AddLogLineC(logMsg);
+	IncMessagesReceived();
+
+	Notify_ChatProcessMsg(GUI_ID(GetIP(), GetUserPort()), GetUserName() + wxT("|") + message);
+}
+
+bool CUpDownClient::IsMessageFiltered(const wxString& message)
+{
+	bool filtered = false;
+	// If we're chatting to the guy, we don't want to filter!
+	if (GetChatState() != MS_CHATTING) {
+		if (thePrefs::MsgOnlyFriends() && !IsFriend()) {
+			filtered = true;
+		} else if (thePrefs::MsgOnlySecure() && GetUserName().IsEmpty() ) {
+			filtered = true;
+		} else if (thePrefs::MustFilterMessages()) {
+			filtered = thePrefs::IsMessageFiltered(message);
+		}
+	}
+	if (filtered) {
+		SetSpammer(true);
+	}
+	return filtered;
+}
+
+#endif
+
+void CUpDownClient::SendSharedDirectories()
+{
+		// This list will contain all (unique) folders.
+		PathList foldersToSend;
+	   
+		// The shared folders
+		const unsigned folderCount = theApp->glob_prefs->shareddir_list.size();
+		for (unsigned i = 0; i < folderCount; ++i) {
+			foldersToSend.push_back(theApp->glob_prefs->shareddir_list[i]);
+		}
+		
+		// ... the categories folders ... (category 0 -> incoming)
+		for (unsigned i = 0; i < theApp->glob_prefs->GetCatCount(); ++i) {
+			foldersToSend.push_back(theApp->glob_prefs->GetCategory(i)->path);
+		}
+
+		// Strip duplicates
+		foldersToSend.sort();
+		foldersToSend.unique();
+		
+		// Build packet
+		CMemFile tempfile(80);
+		tempfile.WriteUInt32(foldersToSend.size());
+
+		PathList::iterator it = foldersToSend.begin();
+		for (; it != foldersToSend.end(); ++it) {
+			// Note: the public shared name contains the 'raw' path, so we can recognize it again.
+			//       the 'raw' path is determined using CPath::GetRaw()
+			tempfile.WriteString( theApp->sharedfiles->GetPublicSharedDirName(*it), GetUnicodeSupport() );
+		}
+
+		// ... and the Magic thing from the eDonkey Hybrids...
+		tempfile.WriteString(OP_INCOMPLETE_SHARED_FILES, GetUnicodeSupport());
+
+		// Send the packet.
+		CPacket* replypacket = new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDDIRSANS);
+		theStats::AddUpOverheadOther(replypacket->GetPacketSize());
+		AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ASKSHAREDDIRSANS to ") + GetFullIP() );
+		SendPacket(replypacket, true, true);
+}
+
+void CUpDownClient::SendSharedFilesOfDirectory(const wxString& strReqDir)
+{
+	CKnownFilePtrList list;
+	
+	if (strReqDir == OP_INCOMPLETE_SHARED_FILES) {
+		// get all shared files from download queue
+		int iQueuedFiles = theApp->downloadqueue->GetFileCount();
+		for (int i = 0; i < iQueuedFiles; i++) {
+			CPartFile* pFile = theApp->downloadqueue->GetFileByIndex(i);
+			if (pFile == NULL || pFile->GetStatus(true) != PS_READY) {
+				continue;
+			}
+			list.push_back(pFile);
+		}
+	} else {
+		// get all shared files for the requested directory
+		const CPath *sharedDir = theApp->sharedfiles->GetDirForPublicSharedDirName(strReqDir);
+		if (sharedDir) {
+			theApp->sharedfiles->GetSharedFilesByDirectory(sharedDir->GetRaw(), list);
+		} else {
+			AddLogLineC(CFormat(_("User %s (%u) requested sharedfiles-list for not existing directory '%s' -> Ignored")) % GetUserName() % GetUserIDHybrid() % strReqDir);
+		}
+	}
+
+	CMemFile tempfile(80);
+	tempfile.WriteString(strReqDir, GetUnicodeSupport());
+	tempfile.WriteUInt32(list.size());
+	
+	while (!list.empty()) {
+		if (!list.front()->IsLargeFile() || SupportsLargeFiles()) {
+			list.front()->CreateOfferedFilePacket(&tempfile, NULL, this);
+		}
+		list.pop_front();
+	}
+	
+	CPacket* replypacket = new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDFILESDIRANS);
+	theStats::AddUpOverheadOther(replypacket->GetPacketSize());
+	AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ASKSHAREDFILESDIRANS to ") + GetFullIP() );
+	SendPacket(replypacket, true, true);
+}
+
 void CUpDownClient::SendFirewallCheckUDPRequest()
 {
 	wxASSERT(GetKadState() == KS_FWCHECK_UDP);
@@ -2550,7 +2942,7 @@
 void CUpDownClient::ProcessFirewallCheckUDPRequest(CMemFile* data)
 {
 	if (!Kademlia::CKademlia::IsRunning() || Kademlia::CKademlia::GetUDPListener() == NULL) {
-		//DebugLogWarning(_T("Ignored Kad Firewallrequest UDP because Kad is not running (%s)"), DbgGetClientInfo());
+		//DebugLogWarning(_T("Ignored Kad Firewallrequest UDP because Kad is not running (%s)"), GetClientFullInfo());
 		return;
 	}
 
@@ -2566,11 +2958,11 @@
 	uint16_t remoteExternPort = data->ReadUInt16();
 	uint32_t senderKey = data->ReadUInt32();
 	if (remoteInternPort == 0) {
-		//DebugLogError(_T("UDP Firewallcheck requested with Intern Port == 0 (%s)"), DbgGetClientInfo());
+		//DebugLogError(_T("UDP Firewallcheck requested with Intern Port == 0 (%s)"), GetClientFullInfo());
 		return;
 	}
 // 	if (senderKey == 0)
-// 		DebugLogWarning(_T("UDP Firewallcheck requested with SenderKey == 0 (%s)"), DbgGetClientInfo());
+// 		DebugLogWarning(_T("UDP Firewallcheck requested with SenderKey == 0 (%s)"), GetClientFullInfo());
 	
 	CMemFile testPacket1;
 	testPacket1.WriteUInt8(errorAlreadyKnown ? 1 : 0);
@@ -2586,7 +2978,7 @@
 		DebugSend(Kad2FirewalledUDP, wxUINT32_SWAP_ALWAYS(GetConnectIP()), remoteExternPort);
 		Kademlia::CKademlia::GetUDPListener()->SendPacket(testPacket2, KADEMLIA2_FIREWALLUDP, wxUINT32_SWAP_ALWAYS(GetConnectIP()), remoteExternPort, Kademlia::CKadUDPKey(senderKey, theApp->GetPublicIP(false)), NULL);
 	}
-	//DebugLog(_T("Answered UDP Firewallcheck request (%s)"), DbgGetClientInfo());
+	//DebugLog(_T("Answered UDP Firewallcheck request (%s)"), GetClientFullInfo());
 }
 
 void CUpDownClient::SetConnectOptions(uint8_t options, bool encryption, bool callback)
@@ -2596,4 +2988,34 @@
 	SetCryptLayerRequires((options & 0x04) != 0 && encryption);
 	SetDirectUDPCallbackSupport((options & 0x08) != 0 && callback);
 }
+
+
+#ifdef DEBUG_ZOMBIE_CLIENTS
+void CUpDownClient::Unlink(const wxString& from)
+{
+	std::multiset<wxString>::iterator it = m_linkedFrom.find(from);
+	if (it != m_linkedFrom.end()) {
+		m_linkedFrom.erase(it);
+	}
+	m_linked--;
+	if (!m_linked) {
+		if (m_linkedDebug) {
+			AddLogLineN(CFormat(wxT("Last reference to client %d %p unlinked, delete it.")) % ECID() % this);
+		}
+		delete this;
+	}
+}
+
+#else
+
+void CUpDownClient::Unlink()
+{
+	m_linked--;
+	if (!m_linked) {
+		delete this;
+	}
+}
+#endif
+
+
 // File_checked_for_headers

aMule-2.3.1.tar.bz2/src/BitVector.h Added

@@ -0,0 +1,153 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2009-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2009-2011 Stu Redman ( sturedman@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 BITVECTOR_H
+#define BITVECTOR_H
+
+//
+// Packed bit vector
+//
+class BitVector {
+public:
+	BitVector()
+	{
+		m_bits	= 0;
+		m_bytes = 0;
+		m_allTrue = 0;
+		m_vector = NULL;
+	}
+
+	~BitVector() { clear();	}
+
+	// number of bits
+	uint32 size() const	{ return m_bits; }
+
+	// is it empty?
+	bool empty() const { return m_bits == 0; }
+
+	// get bit at index
+	bool get(uint32 idx) const
+	{
+		if (idx >= m_bits) {
+			wxFAIL;
+			return false;
+		}
+		return (m_vector[idx / 8] & s_posMask[idx & 7]) != 0;
+	}
+
+	// set bit at index
+	void set(uint32 idx, bool value)
+	{
+		if (idx >= m_bits) {
+			wxFAIL;
+			return;
+		}
+		uint32 bidx = idx / 8;
+		if (value) {
+			m_vector[bidx] = m_vector[bidx] | s_posMask[idx & 7];
+			// If it was not all true before, then we don't know now.
+			if (m_allTrue == 0) {
+				m_allTrue = 2;
+			}
+		} else {
+			m_vector[bidx] = m_vector[bidx] & s_negMask[idx & 7];
+			m_allTrue = 0;
+		}
+	}
+
+	// set number of bits to zero and free memory
+	void clear()
+	{
+		m_bits	= 0;
+		m_bytes = 0;
+		m_allTrue = 0;
+		delete[] m_vector;
+		m_vector = NULL;
+	}
+
+	// set number of bits and initialize them with value
+	void setsize(uint32 newsize, bool value)
+	{
+		if (newsize == 0) {
+			clear();
+			return;
+		}
+		m_bits = newsize;
+		m_bytes = newsize / 8;
+		if (newsize & 7) {
+			m_bytes++;
+		}
+		delete[] m_vector;
+		m_vector = new uint8[m_bytes];
+		memset(m_vector, value ? 0xFF : 0, m_bytes);
+		m_allTrue = value ? 1 : 0;
+	}
+
+	// are all bits true ?
+	bool AllTrue() const
+	{
+		if (m_allTrue == 2) {
+			// don't know, have to check
+			bool foundFalse = false;
+			uint32 lastByte = m_bytes;
+			if (m_bits & 7) {
+				// uneven: check bits of last byte individually
+				lastByte--;
+				for (uint32 i = m_bits & 0xfffffff8; !foundFalse && i < m_bits; i++) {
+					foundFalse = !get(i);
+				}
+			}
+			// check bytewise
+			for (uint32 i = 0; !foundFalse && i < lastByte; i++) {
+				foundFalse = m_vector[i] != 0xff;
+			}
+			// This is really just a caching of information, 
+			// so m_allTrue is mutable and AllTrue() still const.
+			m_allTrue = foundFalse ? 0 : 1;
+		}
+		return m_allTrue == 1;
+	}
+
+	// set all bits to true
+	void SetAllTrue() { if (m_bytes) { memset(m_vector, 0xFF, m_bytes); } }
+
+	// handling of the internal buffer (for EC)
+	// get size
+	uint32 SizeBuffer() const { return m_bytes; }
+	// get buffer
+	const void* GetBuffer() const { return m_vector; }
+	// set buffer
+	void SetBuffer(const void* src) { memcpy(m_vector, src, m_bytes); m_allTrue = 2; }
+
+private:
+	uint32	m_bits;			// number of bits
+	uint32	m_bytes;		// number of bytes in the vector
+	uint8 *	m_vector;		// the storage
+	mutable uint8 m_allTrue;// All true ? 0: no  1: yes  2: don't know
+	static const uint8 s_posMask[]; // = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80}; implemented in OtherFunctions.cpp
+	static const uint8 s_negMask[]; // = {0xFE, 0xFD, 0xFB, 0xF7, 0xEF, 0xDF, 0xBF, 0x7F};
+};
+
+#endif

aMule-2.2.6.tar.bz2/src/CFile.cpp -> aMule-2.3.1.tar.bz2/src/CFile.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 1998 Vadim Zeitlin ( zeitlin@dptmaths.ens-cachan.fr )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 1998-2011 Vadim Zeitlin ( zeitlin@dptmaths.ens-cachan.fr )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -25,7 +25,7 @@
 
 
 #include "CFile.h"		// Interface declarations.
-#include "Logger.h"		// Needed for AddDebugLogLineM
+#include "Logger.h"		// Needed for AddDebugLogLineC
 #include <common/Path.h>	// Needed for CPath
 
 
@@ -135,7 +135,7 @@
 	const wxString& what)
 {
 	if (!check) {
-		AddDebugLogLineM(true, logCFile,
+		AddDebugLogLineC(logCFile,
 			CFormat(wxT("Error when %s (%s): %s"))
 				% what % filePath % wxSysErrorMsg());
 	}
@@ -148,7 +148,7 @@
 
 
 CFile::CFile()
-	: m_fd(fd_invalid)
+	: m_fd(fd_invalid), m_safeWrite(false)
 {}
 
 
@@ -169,6 +169,10 @@
 CFile::~CFile()
 { 
 	if (IsOpened()) {
+		// If the writing gets aborted, dtor is still called.
+		// In this case do NOT replace the original file with the
+		// probably broken new one!
+		m_safeWrite = false;
 		Close(); 
 	}
 }
@@ -188,8 +192,6 @@
 
 const CPath& CFile::GetFilePath() const
 {
-	MULE_VALIDATE_STATE(IsOpened(), wxT("CFile: Cannot return path of closed file."));
-
 	return m_filePath;
 }
 
@@ -221,6 +223,13 @@
 {
 	MULE_VALIDATE_PARAMS(fileName.IsOk(), wxT("CFile: Cannot open, empty path."));
 
+	if (IsOpened()) {
+		Close();	
+	}
+	
+	m_safeWrite = false;
+	m_filePath = fileName;
+
 #ifdef __linux__
 	int flags = O_BINARY | O_LARGEFILE;
 #else
@@ -244,6 +253,12 @@
 			flags |= O_WRONLY | O_CREAT | O_TRUNC;
 			break;
 		
+		case write_safe:
+			flags |= O_WRONLY | O_CREAT | O_TRUNC;
+			m_filePath = m_filePath.AppendExt(wxT(".new"));
+			m_safeWrite = true;
+			break;
+		
 		case write_excl:
 			flags |= O_WRONLY | O_CREAT | O_EXCL;
 			break;
@@ -253,23 +268,28 @@
         	break;
 	}
 	
-	if (IsOpened()) {
-		Close();	
-	}
-	
-
-	
-	Unicode2CharBuf tmpFileName = filename2char(fileName.GetRaw());
+	// Windows needs wide character file names
+#ifdef __WXMSW__
+	m_fd = _wopen(m_filePath.GetRaw().c_str(), flags, accessMode);
+#else
+	Unicode2CharBuf tmpFileName = filename2char(m_filePath.GetRaw());
 	wxASSERT_MSG(tmpFileName, wxT("Convertion failed in CFile::Open"));
-
-	m_filePath = fileName;
 	m_fd = open(tmpFileName, flags, accessMode);
+#endif
 	syscall_check(m_fd != fd_invalid, m_filePath, wxT("opening file"));
 	
 	return IsOpened();
 }
 
 
+void CFile::Reopen(OpenMode mode)
+{
+	if (!Open(m_filePath, mode)) {
+		throw CIOFailureException(wxString(wxT("Error reopening file")));
+	}
+}
+
+
 bool CFile::Close() 
 {
 	MULE_VALIDATE_STATE(IsOpened(), wxT("CFile: Cannot close closed file."));
@@ -277,7 +297,15 @@
 	bool closed = (close(m_fd) != -1);
 	syscall_check(closed, m_filePath, wxT("closing file"));
 	
-	m_fd = fd_invalid;	
+	m_fd = fd_invalid;
+
+	if (m_safeWrite) {
+		CPath filePathTemp(m_filePath);
+		m_filePath = m_filePath.RemoveExt();	// restore m_filePath for Reopen()
+		if (closed) {
+			closed = CPath::RenameFile(filePathTemp, m_filePath, true);
+		}
+	}
 	
 	return closed;
 }
@@ -393,18 +421,24 @@
 }
 
 
-bool CFile::SetLength(size_t new_len)
+bool CFile::SetLength(uint64 new_len)
 {
 	MULE_VALIDATE_STATE(IsOpened(), wxT("CFile: Cannot set length when no file is open."));
 
 #ifdef __WXMSW__
-	int result = chsize(m_fd, new_len);
+#ifdef _MSC_VER
+// MSVC has a 64bit version
+	bool result = _chsize_s(m_fd, new_len) == 0;
+#else
+// MingW has an old runtime without it
+	bool result = chsize(m_fd, new_len) == 0;
+#endif
 #else
-	int result = ftruncate(m_fd, new_len);
+	bool result = ftruncate(m_fd, new_len) != -1;
 #endif
 
-	syscall_check((result != -1), m_filePath, wxT("truncating file"));
+	syscall_check(result, m_filePath, wxT("truncating file"));
 
-	return (result != -1);
+	return result;
 }
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/CFile.h -> aMule-2.3.1.tar.bz2/src/CFile.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 1998 Vadim Zeitlin ( zeitlin@dptmaths.ens-cachan.fr )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 1998-2011 Vadim Zeitlin ( zeitlin@dptmaths.ens-cachan.fr )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -31,6 +31,9 @@
 
 #include <wx/file.h>		// Needed for constants
 
+#ifdef _MSC_VER  // silly warnings about deprecated functions
+#pragma warning(disable:4996)
+#endif
 
 /**
  * This class is a modified version of the wxFile class.
@@ -48,7 +51,7 @@
 	enum { fd_invalid = -1, fd_stdin, fd_stdout, fd_stderr };
 
 	/** @see wxFile::OpenMode */
-	enum OpenMode { read, write, read_write, write_append, write_excl };
+	enum OpenMode { read, write, read_write, write_append, write_excl, write_safe };
 
 	
 	/**
@@ -82,11 +85,26 @@
 	 * Calling Open with the openmodes 'write' or 'write_append' will 
 	 * create the specified file if it does not already exist.
 	 *
+	 * Calling Open with the openmode 'write_safe' will append ".new"
+	 * to the file name and otherwise work like 'write'.
+	 * On close it will be renamed to the original name.
+	 * Close() has to be called manually - destruct won't rename the file!
+	 *
 	 * If an accessMode is not explicitly specified, the accessmode
 	 * specified via CPreferences::GetFilePermissions will be used.
 	 */
 	bool Open(const CPath& path, OpenMode mode = read, int accessMode = wxS_DEFAULT);
 	bool Open(const wxString& path, OpenMode mode = read, int accessMode = wxS_DEFAULT);
+
+	/**
+	 * Reopens a file which was opened and closed before.
+	 *
+	 * @param mode The opening mode.
+	 * 
+	 * The filename used for last open is used again.
+	 * No return value - function throws on failure.
+	 */
+	void Reopen(OpenMode mode);
 	
 	/**
 	 * Calling Create is equivilant of calling open with OpenMode 'write'.
@@ -136,7 +154,7 @@
 	/**
 	 * Resizes the file to the specified length.
 	 */
-	bool SetLength(size_t newLength);
+	bool SetLength(uint64 newLength);
 	
 	/**
 	 * @see CSafeFileIO::GetPosition
@@ -155,8 +173,6 @@
 	/**
 	 * Returns the path of the currently opened file.
 	 * 
-	 * Calling this function on an closed file is
-	 * an illegal operation.
 	 */
 	const CPath& GetFilePath() const;
 	
@@ -186,6 +202,9 @@
 	
 	//! The full path to the current file.
 	CPath m_filePath;
+
+	//! Are we using safe write mode?
+	bool m_safeWrite;
 };

aMule-2.3.1.tar.bz2/src/CanceledFileList.cpp Added

@@ -0,0 +1,127 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2010-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
+//
+
+
+#include "CanceledFileList.h"	// Interface declarations
+
+#include <common/DataFileVersion.h>
+#include "amule.h"
+#include "CFile.h"
+#include "Logger.h"
+#include <common/Format.h>
+
+
+CCanceledFileList::CCanceledFileList()
+{
+	m_filename = wxT("canceled.met");
+	Init();
+}
+
+
+bool CCanceledFileList::Init()
+{
+	CFile file;
+	
+	CPath fullpath = CPath(theApp->ConfigDir + m_filename);
+	if (!fullpath.FileExists()) {
+		// This is perfectly normal. The file was probably either
+		// deleted, or this is the first time running aMule.
+		return false;
+	}
+
+	if (!file.Open(fullpath)) {
+		AddLogLineC(CFormat(_("WARNING: %s cannot be opened.")) % m_filename);
+		return false;
+	}
+	
+	try {
+		uint8 version = file.ReadUInt8();
+		if (version != CANCELEDFILE_VERSION) {
+			AddLogLineC(_("WARNING: Canceled file list corrupted, contains invalid header."));
+			return false;
+		}
+		
+		uint32 RecordsNumber = file.ReadUInt32();
+		AddDebugLogLineN(logKnownFiles,
+			CFormat(wxT("Reading %i canceled files from file format 0x%02x."))
+			% RecordsNumber % version);
+		for (uint32 i = 0; i < RecordsNumber; i++) {
+			CMD4Hash hash;
+			file.Read(hash.GetHash(), 16);
+			AddDebugLogLineN(logKnownFiles, CFormat(wxT("Canceled file read: %s")) % hash.Encode());
+			if (!hash.IsEmpty()) {
+				m_canceledFileList.insert(hash);
+			}
+		}
+		AddDebugLogLineN(logKnownFiles, wxT("Finished reading canceled files"));
+	
+		return true;
+	} catch (const CSafeIOException& e) {
+		AddLogLineC(CFormat(_("IO error while reading %s file: %s")) % m_filename % e.what());
+	}	
+	
+	return false;
+}
+
+
+void CCanceledFileList::Save()
+{
+	CFile file(theApp->ConfigDir + m_filename, CFile::write);
+	if (!file.IsOpened()) {
+		return;
+	}
+
+	try {
+		file.WriteUInt8(CANCELEDFILE_VERSION);
+		file.WriteUInt32(m_canceledFileList.size());
+
+		CanceledFileList::iterator it = m_canceledFileList.begin();
+		for (; it != m_canceledFileList.end(); ++it) {
+			file.Write(it->GetHash(), 16);
+		}
+	} catch (const CIOFailureException& e) {
+		AddLogLineC(CFormat(_("Error while saving %s file: %s")) % m_filename % e.what());
+	}
+}
+
+
+bool CCanceledFileList::IsCanceledFile(const CMD4Hash& hash) const
+{
+	return !hash.IsEmpty() && m_canceledFileList.find(hash) != m_canceledFileList.end();
+}
+
+
+bool CCanceledFileList::Add(const CMD4Hash& hash)
+{
+	return m_canceledFileList.insert(hash).second;
+}
+
+
+bool CCanceledFileList::Remove(const CMD4Hash& hash)
+{
+	return m_canceledFileList.erase(hash) > 0;
+}
+
+
+// File_checked_for_headers

aMule-2.3.1.tar.bz2/src/CanceledFileList.h Added

@@ -0,0 +1,61 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2010-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
+//
+
+#ifndef CANCELEDFILELIST_H
+#define CANCELEDFILELIST_H
+
+#include <set>
+#include "MD4Hash.h"
+
+//
+// A list to keep track of canceled files, stored in canceled.met .
+// Only the file hash is stored.
+//
+class CCanceledFileList
+{
+public:
+	// Ctor, calls Init()
+	CCanceledFileList();
+	// Save list
+	void	Save();
+	// Check if hash belongs to a canceled file
+	bool	IsCanceledFile(const CMD4Hash& hash) const;
+	// Add a hash to the list (returns true if added, false if already in list)
+	bool	Add(const CMD4Hash& hash);
+	// Remove a hash from the list (returns true if removed, false if not in list)
+	bool	Remove(const CMD4Hash& hash);
+
+private:
+	// The list
+	typedef std::set<CMD4Hash> CanceledFileList;
+	CanceledFileList m_canceledFileList;
+	// The filename "canceled.met"
+	wxString	m_filename;
+
+	// Load list from file (if it exists)
+	bool	Init();
+};
+
+#endif // CANCELEDFILELIST_H
+// File_checked_for_headers

aMule-2.3.1.tar.bz2/src/CaptchaDialog.cpp Added

@@ -0,0 +1,95 @@
+//
+// 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
+//
+
+
+#include "CaptchaDialog.h"	// Interface declarations
+#include "muuli_wdr.h"		// Needed for ID_CLOSEWND
+#include "GuiEvents.h"
+
+
+BEGIN_EVENT_TABLE(CCaptchaDialog,wxDialog)
+	EVT_BUTTON(wxID_OK, CCaptchaDialog::OnBnClose)
+END_EVENT_TABLE()
+
+
+CCaptchaDialog::CCaptchaDialog(
+	wxWindow *parent,
+	const wxImage& captchaImage,
+	uint64 id)
+:
+wxDialog(
+	parent,
+	-1,
+	_("Enter Captcha"),
+	wxDefaultPosition,
+	wxDefaultSize,
+	wxDEFAULT_DIALOG_STYLE)
+{
+	m_captchaBitmap = new wxBitmap(captchaImage);
+	m_id = id;
+	wxSizer* content = captchaDlg(this);
+	OnInitDialog();
+	content->SetSizeHints(this);
+	content->Show(this, true);
+	m_TextCtrl->SetFocus();
+}
+
+CCaptchaDialog::~CCaptchaDialog()
+{
+	delete m_captchaBitmap;
+}
+
+void CCaptchaDialog::OnBnClose(wxCommandEvent& WXUNUSED(evt))
+{
+	Notify_ChatSendCaptcha(m_TextCtrl->GetLineText(0), m_id);
+	Destroy();
+}
+
+wxSizer * CCaptchaDialog::captchaDlg( wxWindow *parent )
+{
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+
+    wxStaticBitmap *item1 = new wxStaticBitmap( parent, -1, *m_captchaBitmap, wxDefaultPosition, wxSize(160,60) );
+    item0->Add( item1, 0, wxALIGN_CENTER|wxALL, 5 );
+
+	m_TextCtrl = new wxTextCtrl( parent, -1, wxEmptyString, wxDefaultPosition, wxSize(80,20));
+    item0->Add( m_TextCtrl, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    wxButton *item3 = new wxButton( parent, wxID_OK  );
+    item3->SetDefault();
+    item0->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    parent->SetSizer( item0 );
+    item0->SetSizeHints( parent );
+    
+    return item0;
+}
+
+bool CCaptchaDialog::OnInitDialog()
+{
+	Layout();
+	
+	return true;
+}
+// File_checked_for_headers

aMule-2.3.1.tar.bz2/src/CaptchaDialog.h Added

@@ -0,0 +1,84 @@
+//
+// 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
+//
+
+#ifndef CAPTCHADIALOG_H
+#define CAPTCHADIALOG_H
+
+#include <wx/dialog.h>		// Needed for wxDialog
+#include "Types.h"
+
+/**
+ * The ClientDetailDialog class is responsible for showing the info about a client.
+ *
+ * It shows all releavant data about the client: ip, port, hash, name, client
+ * type and version, uploading/downloading data, credits, server... etc
+ *
+ * It's  wxDialog, modal, with return value always '0'.
+ *
+ */
+
+class CCaptchaDialog : public wxDialog
+{
+public:
+	/**
+	 * Constructor. 
+	 *
+	 * @param parent The window that created the dialog.
+	 * @param client The client whose details we're showing.
+	 */
+	CCaptchaDialog(wxWindow*parent, const wxImage& captchaImage, uint64 id);   
+	
+	/**
+	 * Destructor. 
+	 */
+	virtual ~CCaptchaDialog();
+
+protected:
+
+	/**
+	 * Creates all the data objects in the dialog, filling them accordingly.
+	 * 
+	 * Called when the dialog object is created.
+	 */
+	virtual bool OnInitDialog();	
+	
+	/**
+	 * Ends the dialog, calling EndModal with return value 0
+	 * 
+	 * @param evt The close event, unused right now
+	 */
+	void OnBnClose(wxCommandEvent& evt);
+
+	DECLARE_EVENT_TABLE()
+
+private:
+
+	wxSizer * captchaDlg( wxWindow *parent );
+
+	class wxBitmap * m_captchaBitmap;
+	class wxTextCtrl * m_TextCtrl;
+	uint64 m_id;
+};
+#endif // CAPTCHADIALOG_H
+// File_checked_for_headers

aMule-2.3.1.tar.bz2/src/CaptchaGenerator.cpp Added

@@ -0,0 +1,85 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2011 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,
+// 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
+//
+
+#include "CaptchaGenerator.h"
+#include "RandomFunctions.h"
+#include "MemFile.h"
+#include <wx/bitmap.h>
+#include <wx/dcmemory.h>
+#include <wx/font.h>
+
+
+#define LETTERSIZE  32
+#define CROWDEDSIZE 20
+
+// fairly simply captcha generator, might be improved is spammers think its really worth it solving captchas on aMule
+
+CCaptchaGenerator::CCaptchaGenerator(uint32 nLetterCount)
+{
+	ReGenerateCaptcha(nLetterCount);
+}
+
+void CCaptchaGenerator::ReGenerateCaptcha(uint32 nLetterCount)
+{
+	static wxString schCaptchaContent = wxT("ABCDEFGHJKLMNPQRSTUVWXYZ123456789"); 
+	m_strCaptchaText.Clear();
+	// Bitmap must be created with full depth, or it will fail on GTK
+	wxBitmap pimgResult(LETTERSIZE + (nLetterCount-1)*CROWDEDSIZE, 36);
+	wxMemoryDC dc(pimgResult);
+	dc.SetBackground(*wxWHITE_BRUSH);
+	dc.Clear();
+	dc.SetTextForeground(*wxBLACK);
+	dc.SetTextBackground(*wxWHITE);
+	double lastrotate = 15.0;
+
+	for (uint32 i = 0; i < nLetterCount; i++) {
+		wxString strLetter(schCaptchaContent[GetRandomUint16() % schCaptchaContent.length()]);
+		m_strCaptchaText += strLetter;
+		
+		uint16 nRandomSize = 30 - GetRandomUint16() % 12;
+		wxFont font(nRandomSize, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD);
+		dc.SetFont(font);
+		uint16 nRandomOffset = 3 + GetRandomUint16() % 8;
+		uint16 maxRotate = 50 - nRandomSize; // rotate small letters more than large letters
+		double fRotate = (double)(maxRotate - (GetRandomUint16() % (maxRotate*2)));
+		// limit angle diff - it causes too much overlap since wx rotates at the corner
+		// (maybe I'll redo that with some coordinate transformation one day)
+		if (fRotate - lastrotate > 20) {
+			fRotate = lastrotate + 20;
+		} else if (fRotate - lastrotate < -20) {
+			fRotate = lastrotate - 20;
+		}
+		dc.DrawRotatedText(strLetter, nRandomOffset + i * CROWDEDSIZE, 0, fRotate);
+	}
+	m_pimgCaptcha = pimgResult.ConvertToImage();
+	// wx always saves as 24 bpp except when it gets this WELL DOCUMENTED option...
+	m_pimgCaptcha.SetOption(wxIMAGE_OPTION_BMP_FORMAT, wxBMP_1BPP);
+	// m_pimgCaptcha.SaveFile(wxT("captcha.bmp"), wxBITMAP_TYPE_BMP);
+}
+
+bool CCaptchaGenerator::WriteCaptchaImage(wxMemoryOutputStream& file)
+{
+	return m_pimgCaptcha.SaveFile(file, wxBITMAP_TYPE_BMP);
+}

aMule-2.3.1.tar.bz2/src/CaptchaGenerator.h Added

@@ -0,0 +1,51 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2011 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,
+// 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 CAPTCHAGENERATOR_H
+#define CAPTCHAGENERATOR_H
+
+#include <wx/image.h>
+#include <wx/mstream.h>
+#include "Types.h"
+
+class wxImage;
+
+class CCaptchaGenerator
+{
+public:
+	CCaptchaGenerator(uint32 nLetterCount = 4);
+
+	void		ReGenerateCaptcha(uint32 nLetterCount = 4);
+	wxString	GetCaptchaText() const				{ return m_strCaptchaText; }
+	bool		WriteCaptchaImage(wxMemoryOutputStream& file);
+
+
+private:
+	wxImage		m_pimgCaptcha;
+	wxString	m_strCaptchaText;
+};
+
+#endif
+// File_checked_for_headers

aMule-2.2.6.tar.bz2/src/CatDialog.cpp -> aMule-2.3.1.tar.bz2/src/CatDialog.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) created by Ornis
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -81,7 +81,7 @@
 		CastChild(IDC_COMMENT,	wxTextCtrl)->SetValue(m_category->comment);
 		CastChild(IDC_PRIOCOMBO,wxChoice)->SetSelection(m_category->prio);
 		
-		m_color = m_category->color;
+		m_colour = CMuleColour(m_category->color);
 	} else {
 		// Default values for new categories
 		CastChild(IDC_TITLE,	wxTextCtrl)->SetValue(_("New Category"));
@@ -89,11 +89,10 @@
 		CastChild(IDC_COMMENT,	wxTextCtrl)->SetValue(wxEmptyString);
 		CastChild(IDC_PRIOCOMBO,wxChoice)->SetSelection(0);
 		
-		m_color = RGB(rand() % 255, rand() % 255, rand() % 255);
+		m_colour = CMuleColour(rand() % 255, rand() % 255, rand() % 255);
 	}
 	
-	CastChild(ID_BOX_CATCOLOR, wxStaticBitmap)->
-		SetBitmap(MakeBitmap(WxColourFromCr(m_color)));
+	CastChild(ID_BOX_CATCOLOR, wxStaticBitmap)->SetBitmap(MakeBitmap());
 	
 	if (!allowbrowse) {
 		CastChild(IDC_BROWSE, wxButton)->Destroy();
@@ -106,12 +105,12 @@
 }
 
 
-wxBitmap CCatDialog::MakeBitmap(wxColour colour)
+wxBitmap CCatDialog::MakeBitmap()
 {
 	wxBitmap bitmap(16, 16);
 	wxMemoryDC dc(bitmap);
 
-	dc.SetBrush(wxBrush(colour, wxSOLID));
+	dc.SetBrush(m_colour.GetBrush());
 	dc.DrawRectangle(0, 0, 16, 16);
 	
 	return bitmap;
@@ -154,6 +153,10 @@
 		return;
 	}
 
+	// remote gui:
+	// Pass path unchecked (and don't try to create it on the wrong machine...).
+	// It will be checked on the server, and an error message created.
+#ifndef CLIENT_GUI
 	if (!newpath.DirExists()) {
 		if (!CPath::MakeDir(newpath)) {
 			wxMessageBox(_("Failed to create incoming dir for category. Please specify a valid path!"),
@@ -161,7 +164,8 @@
 			return;
 		}
 	}
-	
+#endif
+
 	// Check if we are using an existing category, and if we are, if it has
 	// been removed in the mean-while. Otherwise create new category.
 	// lfroen: The only place where it could happen, is removing category
@@ -185,16 +189,16 @@
 
 	if (!m_category) {
 		// New category, or the old one is gone
-		m_category = theApp->glob_prefs->CreateCategory(
-			newname, newpath, 
+		 theApp->glob_prefs->CreateCategory(
+			m_category, newname, newpath, 
 			CastChild(IDC_COMMENT, wxTextCtrl)->GetValue(),
-			m_color,
+			m_colour.GetULong(),
  			CastChild(IDC_PRIOCOMBO, wxChoice)->GetSelection());
         	
 		theApp->amuledlg->m_transferwnd->AddCategory(m_category);
 	} else {
 		theApp->glob_prefs->UpdateCategory(index, newname, newpath, 
-        	CastChild(IDC_COMMENT, wxTextCtrl)->GetValue(), m_color,
+        	CastChild(IDC_COMMENT, wxTextCtrl)->GetValue(), m_colour.GetULong(),
         	CastChild(IDC_PRIOCOMBO, wxChoice)->GetSelection());
 
 		theApp->amuledlg->m_transferwnd->UpdateCategory(index);
@@ -208,11 +212,10 @@
 
 void CCatDialog::OnBnClickColor(wxCommandEvent& WXUNUSED(evt))
 {
-	wxColour newcol = wxGetColourFromUser(this, WxColourFromCr(m_color));
+	wxColour newcol = wxGetColourFromUser(this, m_colour);
 	if (newcol.Ok()) {
-		m_color = CrFromWxColour(newcol);
-		CastChild(ID_BOX_CATCOLOR, wxStaticBitmap)->
-			SetBitmap(MakeBitmap(WxColourFromCr(m_color)));
+		m_colour = newcol;
+		CastChild(ID_BOX_CATCOLOR, wxStaticBitmap)->SetBitmap(MakeBitmap());
 	}
 }
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/CatDialog.h -> aMule-2.3.1.tar.bz2/src/CatDialog.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 quekky
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2002-2011 quekky
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -29,11 +29,10 @@
 #include <wx/dialog.h>		// Needed for wxDialog
 #include "Types.h"		// Needed for uint32
 #include "OtherStructs.h"
+#include "MuleColour.h"
 
 class wxStaticBitmap;
 class wxBitmap;
-class wxColour;
-
 
 /**
  * This dialog takes of displaying either existing or new categories, so that
@@ -71,16 +70,13 @@
 	/**
 	 * Helper function for making the color-preview.
 	 *
-	 * @param colour The color with which to fill the bitmap.
-	 *
 	 * This function creates a single-color 16x16 image, using the
-	 * specified colour.
+	 * m_colour member variable.
 	 */
-	wxBitmap MakeBitmap( wxColour colour );
-
+	wxBitmap MakeBitmap();
 
 	//! Variable used to store the user-selected color.
-	uint32			m_color;
+	CMuleColour			m_colour;
 
 	//! Pointer to category to be edited or NULL if we are adding a new category.
 	Category_Struct*	m_category;

aMule-2.2.6.tar.bz2/src/ChatSelector.cpp -> aMule-2.3.1.tar.bz2/src/ChatSelector.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -25,15 +25,17 @@
 
 #include <wx/tokenzr.h>
 #include <wx/imaglist.h>
+#include <wx/datetime.h>
 
 #include "pixmaps/chat.ico.xpm"
 #include "ChatSelector.h"	// Interface declarations
 #include "Preferences.h"	// Needed for CPreferences
-#include "amule.h"		// Needed for theApp
-#include "updownclient.h"	// Needed for CUpDownClient
+#include "amule.h"			// Needed for theApp
+#include "ClientRef.h"		// Needed for CClientRef
 #include "OtherFunctions.h"
 #include "muuli_wdr.h"		// Needed for amuleSpecial
 #include "UserEvents.h"
+#include "Constants.h"		// Needed for MS_NONE
 
 //#warning Needed while not ported
 #include "ClientList.h"
@@ -193,7 +195,7 @@
 			// This must NOT happen.
 			// Build a client name based on the ID
 			uint32 ip = IP_FROM_GUI_ID(sender_id);
-			client_name =  wxString::Format(wxT("IP: %u.%u.%u.%u Port: %u"),(uint8)ip,(uint8)(ip>>8),(uint8)(ip>>16),(uint8)(ip>>24),(unsigned)PORT_FROM_GUI_ID(sender_id));
+			client_name = CFormat(wxT("IP: %s Port: %u")) % Uint32toStringIP(ip) % PORT_FROM_GUI_ID(sender_id);
 		}
 		
 		session = StartSession( sender_id, client_name, true );
@@ -238,11 +240,11 @@
 	CChatSession* ci = (CChatSession*)GetPage( usedtab );
 
 	ci->m_active = true;
-	
+
 	//#warning EC needed here.
 	
 	#ifndef CLIENT_GUI
-	if (theApp->clientlist->SendMessage(ci->m_client_id, message)) {
+	if (theApp->clientlist->SendChatMessage(ci->m_client_id, message)) {
 		ci->AddText( thePrefs::GetUserNick(), COLOR_GREEN, false );
 		ci->AddText( wxT(": ") + message, COLOR_BLACK );
 	} else {
@@ -323,4 +325,39 @@
 		// Nothing to be done here.
 	}
 }
+
+
+void CChatSelector::ShowCaptchaResult(uint64 id, bool ok)
+{
+	CChatSession* ci = GetPageByClientID(id);
+	if (ci)	{
+		ci->AddText(ok
+			? _("*** You have passed the captcha check and the user has received your message. ***")
+			: _("*** Your response to the captcha was wrong and your message has been ignored. You can request a new captcha by sending a new message. ***"),
+			COLOR_RED );
+	}
+}
+
+
+#ifdef CLIENT_GUI
+bool CChatSelector::GetCurrentClient(CClientRef&) const
+{
+	return false;
+}
+#else
+bool CChatSelector::GetCurrentClient(CClientRef& clientref) const
+{
+	// Get the chat session associated with the active tab
+	CChatSession* ci = (CChatSession*)GetPage(GetSelection());
+	
+	// Get the client that the session is open to
+	if (ci) {
+		clientref.Link(theApp->clientlist->FindClientByIP(IP_FROM_GUI_ID(ci->m_client_id), PORT_FROM_GUI_ID(ci->m_client_id)) CLIENT_DEBUGSTRING("CChatSelector::GetCurrentClient"));
+		return true;
+	} else {
+		return false;
+	}
+}
+#endif
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/ChatSelector.h -> aMule-2.3.1.tar.bz2/src/ChatSelector.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -30,9 +30,8 @@
 #include "MuleNotebook.h"
 #include "Types.h"				// Needed for uint16
 
-class CUpDownClient;
+class CClientRef;
 class CFriend;
-class CDlgFriend;
 
 
 /**
@@ -75,6 +74,8 @@
 	bool			SendMessage(const wxString& message, const wxString& client_name = wxEmptyString, uint64 to_id = 0);
 	void			ConnectionResult(bool success, const wxString& message, uint64 id);
 	void			RefreshFriend(uint64 toupdate_id, const wxString& new_name);
+	void			ShowCaptchaResult(uint64 id, bool ok);
+	bool			GetCurrentClient(CClientRef&) const;
 };
 
 #endif

aMule-2.2.6.tar.bz2/src/ChatWnd.cpp -> aMule-2.3.1.tar.bz2/src/ChatWnd.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -23,18 +23,31 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include <common/MenuIDs.h>  // IDs for the chat-popup menu
+
 #include <wx/app.h>
 
 #include "ChatWnd.h"		// Interface declarations
 
 #include "amule.h"		// Needed for theApp
 #include "amuleDlg.h"		// Needed for CamuleDlg
+#include "ClientList.h"		// Needed for CClientList
+#include "ClientRef.h"		// Needed for CClientRef
 #include "FriendListCtrl.h"	// Needed for CFriendListCtrl
+#include "FriendList.h"		// Needed for CFriendList
+#include "Friend.h"			// Needed for CFriend
 #include "ChatSelector.h"	// Needed for CChatSelector
 #include "muuli_wdr.h"		// Needed for messagePage
 #include "OtherFunctions.h"
 
 BEGIN_EVENT_TABLE(CChatWnd, wxPanel)
+	EVT_RIGHT_DOWN(CChatWnd::OnNMRclickChatTab)
+
+	EVT_MENU(MP_CLOSE_TAB,			CChatWnd::OnPopupClose)
+	EVT_MENU(MP_CLOSE_ALL_TABS,		CChatWnd::OnPopupCloseAll)
+	EVT_MENU(MP_CLOSE_OTHER_TABS,	CChatWnd::OnPopupCloseOthers)
+	EVT_MENU(MP_ADDFRIEND,			CChatWnd::OnAddFriend )
+
 	EVT_TEXT_ENTER(IDC_CMESSAGE, CChatWnd::OnBnClickedCsend)
 	EVT_BUTTON(IDC_CSEND, CChatWnd::OnBnClickedCsend)
 	EVT_BUTTON(IDC_CCLOSE, CChatWnd::OnBnClickedCclose)
@@ -49,17 +62,21 @@
 	content->Show(this, true);
 
 	chatselector = CastChild( IDC_CHATSELECTOR, CChatSelector );
+	// We want to use our own popup menu
+	chatselector->SetPopupHandler(this);
+	m_menu = NULL;
+
 	friendlistctrl = CastChild( ID_FRIENDLIST, CFriendListCtrl );
 }
 
-void CChatWnd::StartSession(CDlgFriend* friend_client, bool setfocus)
+void CChatWnd::StartSession(CFriend* friend_client, bool setfocus)
 {
 
-	if ( !friend_client->m_name.IsEmpty() ) {
+	if ( !friend_client->GetName().IsEmpty() ) {
 		if (setfocus) {
 			theApp->amuledlg->SetActiveDialog(CamuleDlg::DT_CHAT_WND, this);
 		}
-		chatselector->StartSession(GUI_ID(friend_client->m_ip, friend_client->m_port), friend_client->m_name, true);
+		chatselector->StartSession(GUI_ID(friend_client->GetIP(), friend_client->GetPort()), friend_client->GetName(), true);
 	}
 
 	// Check to enable the window controls if needed
@@ -67,65 +84,118 @@
 }
 
 
-void CChatWnd::OnBnClickedCsend(wxCommandEvent& WXUNUSED(evt))
+void CChatWnd::OnNMRclickChatTab(wxMouseEvent& evt)
 {
-	wxString message = CastChild(IDC_CMESSAGE, wxTextCtrl)->GetValue();
+	// Only handle events from the chat-notebook
+	if (evt.GetEventObject() != (wxObject*)chatselector)
+		return;
 	
-	SendMessage(message);
+	if (chatselector->GetSelection() == -1) {
+		return;
+	}
+	
+	// Avoid opening another menu when it's already open
+	if (m_menu == NULL) {  
+		m_menu = new wxMenu(_("Chat"));
+		
+		m_menu->Append(MP_CLOSE_TAB, wxString(_("Close tab")));
+		m_menu->Append(MP_CLOSE_ALL_TABS, wxString(_("Close all tabs")));
+		m_menu->Append(MP_CLOSE_OTHER_TABS, wxString(_("Close other tabs")));
+		
+		m_menu->AppendSeparator();
+		
+		wxMenuItem * addFriend = m_menu->Append(MP_ADDFRIEND, _("Add to Friends"));
+
+		// Disable this client if it is already a friend
+		CClientRef client;
+		if (chatselector->GetCurrentClient(client) && client.IsFriend()) {
+			addFriend->Enable(false);
+		}
+
+		PopupMenu(m_menu, evt.GetPosition());
+		
+		delete m_menu;
+		m_menu = NULL;
+	}
 }
 
 
-void CChatWnd::OnBnClickedCclose(wxCommandEvent& WXUNUSED(evt))
+void CChatWnd::OnPopupClose(wxCommandEvent& WXUNUSED(evt))
 {
-	chatselector->EndSession();
+	chatselector->DeletePage(chatselector->GetSelection());
 }
 
 
-void CChatWnd::OnAllPagesClosed(wxNotebookEvent& WXUNUSED(evt))
+void CChatWnd::OnPopupCloseAll(wxCommandEvent& WXUNUSED(evt))
 {
-	CastChild(IDC_CMESSAGE, wxTextCtrl)->Clear();
-	// Check to disable the window controls
-	CheckNewButtonsState();
+	chatselector->DeleteAllPages();
 }
 
 
-CDlgFriend* CChatWnd::FindFriend(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort)
+void CChatWnd::OnPopupCloseOthers(wxCommandEvent& WXUNUSED(evt))
 {
-	return friendlistctrl->FindFriend(userhash, dwIP, nPort);
+	wxNotebookPage* current = chatselector->GetPage(chatselector->GetSelection());
+	
+	for (int i = chatselector->GetPageCount() - 1; i >= 0; i--) {
+		if (current != chatselector->GetPage(i))
+			chatselector->DeletePage( i );
+	}
 }
 
 
-void CChatWnd::AddFriend(CUpDownClient* toadd)
+void CChatWnd::OnAddFriend(wxCommandEvent& WXUNUSED(evt))
 {
-	friendlistctrl->AddFriend(toadd);
+	// Get the client that the session is open to
+	CClientRef client;
+	
+	// Add the client as friend unless it's already a friend
+	if (chatselector->GetCurrentClient(client) && !client.IsFriend()) {
+		theApp->friendlist->AddFriend(client);
+	}
 }
 
 
-void CChatWnd::AddFriend(const CMD4Hash& userhash, const wxString& name, uint32 lastUsedIP, uint32 lastUsedPort)
+void CChatWnd::OnBnClickedCsend(wxCommandEvent& WXUNUSED(evt))
 {
-	friendlistctrl->AddFriend( userhash, name, lastUsedIP, lastUsedPort);
+	wxString message = CastChild(IDC_CMESSAGE, wxTextCtrl)->GetValue();
+	
+	SendMessage(message);
 }
 
-void CChatWnd::RemoveFriend(const CMD4Hash& userhash, uint32 lastUsedIP, uint32 lastUsedPort)
+
+void CChatWnd::OnBnClickedCclose(wxCommandEvent& WXUNUSED(evt))
 {
-	friendlistctrl->RemoveFriend(friendlistctrl->FindFriend(userhash, lastUsedIP, lastUsedPort));
+	chatselector->EndSession();
 }
 
-void CChatWnd::RefreshFriend(const CMD4Hash& userhash, const wxString& name, uint32 lastUsedIP, uint32 lastUsedPort)
+
+void CChatWnd::OnAllPagesClosed(wxNotebookEvent& WXUNUSED(evt))
 {
-	CDlgFriend* toupdate = friendlistctrl->FindFriend(userhash, lastUsedIP, lastUsedPort);
-	if (toupdate) {
-		if (!name.IsEmpty()) {
-			toupdate->m_name = name;	
-		} 
-		
-		// If name is empty, this is a disconnection/deletion event
-		toupdate->islinked = !name.IsEmpty();
-		friendlistctrl->RefreshFriend(toupdate);
-		chatselector->RefreshFriend(GUI_ID(toupdate->m_ip, toupdate->m_port), toupdate->m_name);
+	CastChild(IDC_CMESSAGE, wxTextCtrl)->Clear();
+	// Check to disable the window controls
+	CheckNewButtonsState();
+}
+
+
+void CChatWnd::UpdateFriend(CFriend* toupdate)
+{
+	if (toupdate->GetLinkedClient().IsLinked()) {
+		chatselector->RefreshFriend(GUI_ID(toupdate->GetIP(), toupdate->GetPort()), toupdate->GetName());
+	} else {
+		// drop Chat session
+		chatselector->EndSession(GUI_ID(toupdate->GetIP(), toupdate->GetPort()));
 	}
+	friendlistctrl->UpdateFriend(toupdate);
+}
+
+
+void CChatWnd::RemoveFriend(CFriend* todel)
+{
+	chatselector->EndSession(GUI_ID(todel->GetIP(), todel->GetPort()));
+	friendlistctrl->RemoveFriend(todel);
 }
 
+
 void CChatWnd::ProcessMessage(uint64 sender, const wxString& message)
 {
 	if ( !theApp->amuledlg->IsDialogVisible(CamuleDlg::DT_CHAT_WND) ) {
@@ -137,11 +207,13 @@
 	}
 }
 
+
 void CChatWnd::ConnectionResult(bool success, const wxString& message, uint64 id)
 {
 	chatselector->ConnectionResult(success, message, id);
 }
 
+
 void CChatWnd::SendMessage(const wxString& message, const wxString& client_name, uint64 to_id)
 {
 	
@@ -155,7 +227,8 @@
 }
 
 
-void CChatWnd::CheckNewButtonsState() {
+void CChatWnd::CheckNewButtonsState()
+{
 	switch (chatselector->GetPageCount()) {
 			case 0:
 				GetParent()->FindWindow(IDC_CSEND)->Enable(false);
@@ -175,4 +248,22 @@
 				break;
 	}
 }
+
+
+bool CChatWnd::IsIdValid(uint64 id)
+{ 
+	return chatselector->GetTabByClientID(id) >= 0;
+}
+
+
+void CChatWnd::ShowCaptchaResult(uint64 id, bool ok)
+{
+	chatselector->ShowCaptchaResult(id, ok);
+}
+
+void CChatWnd::EndSession(uint64 id)
+{
+	chatselector->EndSession(id);
+}
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/ChatWnd.h -> aMule-2.3.1.tar.bz2/src/ChatWnd.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -30,8 +30,7 @@
 #include <wx/notebook.h>		// Needed for wxNotebookEvent
 #include "Types.h"
 
-class CDlgFriend;
-class CUpDownClient;
+class CFriend;
 class CChatSelector;
 class CFriendListCtrl;
 class CMD4Hash;
@@ -42,20 +41,45 @@
 	CChatWnd(wxWindow* pParent = NULL); 
 	~CChatWnd() {};
 
-	void StartSession(CDlgFriend* friend_client, bool setfocus = true);
+	void StartSession(CFriend* friend_client, bool setfocus = true);
 
-	CDlgFriend* FindFriend(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort);	
-	void	AddFriend(CUpDownClient* toadd);
-	void	AddFriend(const CMD4Hash& userhash, const wxString& name, uint32 lastUsedIP, uint32 lastUsedPort);
-	void	RemoveFriend(const CMD4Hash& userhash, uint32 lastUsedIP, uint32 lastUsedPort);
-	void	RefreshFriend(const CMD4Hash& userhash, const wxString& name, uint32 lastUsedIP, uint32 lastUsedPort);
+	void	UpdateFriend(CFriend* toupdate);
+	void	RemoveFriend(CFriend* todel);
 
 	void	ProcessMessage(uint64 sender, const wxString& message);
 	void 	ConnectionResult(bool success, const wxString& message, uint64 id);
 
 	void	SendMessage(const wxString& message, const wxString& client_name = wxEmptyString, uint64 to_id = 0);
+
+	bool	IsIdValid(uint64 id);
+	void	ShowCaptchaResult(uint64 id, bool ok);
+	void	EndSession(uint64 id);
 		
 protected:
+	/**
+	 * Event-handler for displaying the chat-popup menu.
+	 */
+	void	OnNMRclickChatTab(wxMouseEvent& evt);
+	/**
+	 * Event-handler fo the Close item on the popup-menu.
+	 */
+	void	OnPopupClose(wxCommandEvent& evt);
+	
+	/**
+	 * Event-handler fo the CloseAll item on the popup-menu.
+	 */
+	void	OnPopupCloseAll(wxCommandEvent& evt);
+
+	/**
+	 * Event-handler fo the CloseOthers item on the popup-menu.
+	 */
+	void	OnPopupCloseOthers(wxCommandEvent& evt);
+
+	/**
+	 * Event-handler fo the AddFriend item on the popup-menu.
+	 */
+	void	OnAddFriend(wxCommandEvent& evt);
+
 	void	OnBnClickedCsend(wxCommandEvent& evt);
 	void	OnBnClickedCclose(wxCommandEvent& evt);
 	void	OnAllPagesClosed(wxNotebookEvent& evt);
@@ -63,7 +87,11 @@
 
 	DECLARE_EVENT_TABLE()
 
+	//! Variable used to ensure that the popup menu doesn't get displayed twice.
+	wxMenu* m_menu;
+	//! Pointer to the control serving as the friend list
 	CFriendListCtrl* friendlistctrl;
+	//! Pointer to the chat tabs.
 	CChatSelector*	chatselector;
 };

aMule-2.2.6.tar.bz2/src/ClientCredits.cpp -> aMule-2.3.1.tar.bz2/src/ClientCredits.cpp Changed

aMule-2.2.6.tar.bz2/src/ClientCredits.h -> aMule-2.3.1.tar.bz2/src/ClientCredits.h Changed

aMule-2.2.6.tar.bz2/src/ClientCreditsList.cpp -> aMule-2.3.1.tar.bz2/src/ClientCreditsList.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -42,7 +42,7 @@
 
 
 #define CLIENTS_MET_FILENAME		wxT("clients.met")
-#define CLIENTS_MET_BAK_FILENAME	wxT("clients.met.BAK")
+#define CLIENTS_MET_BAK_FILENAME	wxT("clients.met.bak")
 #define CRYPTKEY_FILENAME		wxT("cryptkey.dat")
 
 
@@ -57,11 +57,7 @@
 
 CClientCreditsList::~CClientCreditsList()
 {
-	ClientMap::iterator it = m_mapClients.begin();
-	for ( ; it != m_mapClients.end(); ++it ){
-		delete it->second;
-	}
-	m_mapClients.clear();
+	DeleteContents(m_mapClients);
 	delete static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey);
 }
 
@@ -79,8 +75,7 @@
 		file.Open(fileName, CFile::read);
 	
 		if (file.ReadUInt8() != CREDITFILE_VERSION) {
-			AddDebugLogLineM( true, logCredits,
-				wxT("Creditfile is out of date and will be replaced") );
+			AddDebugLogLineC( logCredits, wxT("Creditfile is outdated and will be replaced") );
 			file.Close();
 			return;
 		}
@@ -106,12 +101,12 @@
 		if (bCreateBackup) {
 			file.Close(); // close the file before copying
 			if (!CPath::CloneFile(fileName, bakFileName, true)) {
-				AddDebugLogLineM(true, logCredits,
+				AddDebugLogLineC(logCredits,
 					CFormat(wxT("Could not create backup file '%s'")) % fileName);
 			}
 			// reopen file
 			if (!file.Open(fileName, CFile::read)) {
-				AddDebugLogLineM( true, logCredits,
+				AddDebugLogLineC( logCredits,
 					wxT("Failed to load creditfile") );
 				return;
 			}
@@ -143,14 +138,9 @@
 				// and will have to discard it.
 				delete newcstruct;
 				
-				// Remove already read, and possibly invalid, entries
-				ClientMap::iterator it = m_mapClients.begin();
-				for ( ; it != m_mapClients.end(); ++it ){
-					delete it->second;
-				}
-				m_mapClients.clear();
+				DeleteContents(m_mapClients);
 				
-				AddDebugLogLineM( true, logCredits,
+				AddDebugLogLineC( logCredits,
 					wxT("WARNING: Corruptions found while reading Creditfile!") );
 				return;	
 			}
@@ -165,27 +155,27 @@
 			m_mapClients[newcredits->GetKey()] = newcredits;
 		}
 
-		AddLogLineM(false, wxString::Format(wxPLURAL("Creditfile loaded, %u client is known", "Creditfile loaded, %u clients are known", count - cDeleted), count - cDeleted));
+		AddLogLineN(CFormat(wxPLURAL("Creditfile loaded, %u client is known", "Creditfile loaded, %u clients are known", count - cDeleted)) % (count - cDeleted));
 	
 		if (cDeleted) {
-			AddLogLineM(false, wxString::Format(wxPLURAL(" - Credits expired for %u client!", " - Credits expired for %u clients!", cDeleted), cDeleted));
+			AddLogLineN(CFormat(wxPLURAL(" - Credits expired for %u client!", " - Credits expired for %u clients!", cDeleted)) % cDeleted);
 		}
 	} catch (const CSafeIOException& e) {
-		AddDebugLogLineM(true, logCredits, wxT("IO error while loading clients.met file: ") + e.what());
+		AddDebugLogLineC(logCredits, wxT("IO error while loading clients.met file: ") + e.what());
 	}
 }
 
 
 void CClientCreditsList::SaveList()
 {
-	AddDebugLogLineM( false, logCredits, wxT("Saved Credit list"));
+	AddDebugLogLineN( logCredits, wxT("Saved Credit list"));
 	m_nLastSaved = ::GetTickCount();
 
 	wxString name(theApp->ConfigDir + CLIENTS_MET_FILENAME);
 	CFile file;
 
 	if ( !file.Create(name, true) ) {
-		AddDebugLogLineM( true, logCredits, wxT("Failed to create creditfile") );
+		AddDebugLogLineC( logCredits, wxT("Failed to create creditfile") );
 		return;
 	}
 	
@@ -221,10 +211,10 @@
 			file.Seek( 1 );
 			file.WriteUInt32( count );
 		} catch (const CIOFailureException& e) {
-			AddDebugLogLineM(true, logCredits, wxT("IO failure while saving clients.met: ") + e.what());
+			AddDebugLogLineC(logCredits, wxT("IO failure while saving clients.met: ") + e.what());
 		}
 	} else {
-		AddDebugLogLineM(true, logCredits, wxT("Failed to open existing creditfile!"));
+		AddDebugLogLineC(logCredits, wxT("Failed to open existing creditfile!"));
 	}
 }
 
@@ -258,7 +248,7 @@
 
 bool CClientCreditsList::CreateKeyPair()
 {
-	try{
+	try {
 		CryptoPP::AutoSeededX917RNG<CryptoPP::DES_EDE3> rng;
 		CryptoPP::InvertibleRSAFunction privkey;
 		privkey.Initialize(rng, RSAKEYSIZE);
@@ -276,12 +266,12 @@
 		// delete privkeysink;
 		// delete fileSink;
 
-		AddDebugLogLineM( true, logCredits, wxT("Created new RSA keypair"));
+		AddDebugLogLineN(logCredits, wxT("Created new RSA keypair"));
 	} catch(const CryptoPP::Exception& e) {
-		AddDebugLogLineM(true, logCredits,
+		AddDebugLogLineC(logCredits,
 			wxString(wxT("Failed to create new RSA keypair: ")) +
-			char2unicode(e.what()));
-		wxASSERT(false);
+			wxString(char2unicode(e.what())));
+		wxFAIL;
  		return false;
  	}
 	
@@ -305,14 +295,14 @@
 			off_t keySize = CPath::GetFileSize(theApp->ConfigDir + CRYPTKEY_FILENAME);
 			
 			if (keySize == wxInvalidOffset) {
-				AddDebugLogLineM(true, logCredits, wxT("Cannot access 'cryptkey.dat', please check permissions."));
+				AddDebugLogLineC(logCredits, wxT("Cannot access 'cryptkey.dat', please check permissions."));
 				return;
 			} else if (keySize == 0) {
-				AddDebugLogLineM(true, logCredits, wxT("'cryptkey.dat' is empty, recreating keypair."));
+				AddDebugLogLineC(logCredits, wxT("'cryptkey.dat' is empty, recreating keypair."));
 				CreateKeyPair();
  			}
  		} else {
-			AddLogLineM( false, _("No 'cryptkey.dat' file found, creating.") );
+			AddLogLineN(_("No 'cryptkey.dat' file found, creating.") );
  			CreateKeyPair();
  		}
 			
@@ -329,9 +319,9 @@
 		delete static_cast<CryptoPP::RSASSA_PKCS1v15_SHA_Signer *>(m_pSignkey);
 		m_pSignkey = NULL;
 		
-		AddDebugLogLineM(true, logCredits,
+		AddDebugLogLineC(logCredits,
 			wxString(wxT("Error while initializing encryption keys: ")) +
-			char2unicode(e.what()));
+			wxString(char2unicode(e.what())));
  	}
 }
 
@@ -375,8 +365,8 @@
 		
 		return asink.TotalPutLength();			
 	} catch (const CryptoPP::Exception& e) {
-		AddDebugLogLineM(true, logCredits, wxString(wxT("Error while creating signature: ")) + char2unicode(e.what()));
-		wxASSERT(false);
+		AddDebugLogLineC(logCredits, wxString(wxT("Error while creating signature: ")) + wxString(char2unicode(e.what())));
+		wxFAIL;
 		
 		return 0;
  	}
@@ -407,7 +397,7 @@
 		if (byChaIPKind != 0){
 			nChIpSize = 5;
 			uint32 ChallengeIP = 0;
-			switch (byChaIPKind){
+			switch (byChaIPKind) {
 				case CRYPT_CIP_LOCALCLIENT:
 					ChallengeIP = dwForIP;
 					break;
@@ -415,7 +405,7 @@
 					// Ignore local ip...
 					if (!theApp->GetPublicIP(true)) {
 						if (::IsLowID(theApp->GetED2KID())){
-							AddDebugLogLineM( false, logCredits, wxT("Warning: Maybe SecureHash Ident fails because LocalIP is unknown"));
+							AddDebugLogLineN(logCredits, wxT("Warning: Maybe SecureHash Ident fails because LocalIP is unknown"));
 							// Fallback to local ip...
 							ChallengeIP = theApp->GetPublicIP();
 						} else {
@@ -436,7 +426,7 @@
 		
  		bResult = pubkey.VerifyMessage(abyBuffer, m_nMyPublicKeyLen+4+nChIpSize, pachSignature, nInputSize);
 	} catch (const CryptoPP::Exception& e) {
-		AddDebugLogLineM(true, logCredits, wxString(wxT("Error while verifying identity: ")) + char2unicode(e.what()));
+		AddDebugLogLineC(logCredits, wxString(wxT("Error while verifying identity: ")) + wxString(char2unicode(e.what())));
  		bResult = false;
  	}

aMule-2.2.6.tar.bz2/src/ClientCreditsList.h -> aMule-2.3.1.tar.bz2/src/ClientCreditsList.h Changed

aMule-2.2.6.tar.bz2/src/ClientDetailDialog.cpp -> aMule-2.3.1.tar.bz2/src/ClientDetailDialog.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,9 +27,8 @@
 #include "PartFile.h"		// Needed for CPartFile
 #include "UploadQueue.h"	// Needed for CUploadQueue
 #include "ServerList.h"		// Needed for CServerList
-#include "amule.h"		// Needed for theApp
-#include "Server.h"		// Needed for CServer
-#include "updownclient.h"	// Needed for CUpDownClient
+#include "amule.h"			// Needed for theApp
+#include "Server.h"			// Needed for CServer
 #include "muuli_wdr.h"		// Needed for ID_CLOSEWND
 #include "Preferences.h"	// Needed for thePrefs
 
@@ -42,7 +41,7 @@
 
 CClientDetailDialog::CClientDetailDialog(
 	wxWindow *parent,
-	CUpDownClient *client)
+	const CClientRef& client)
 :
 wxDialog(
 	parent,
@@ -69,53 +68,48 @@
 }
 
 bool CClientDetailDialog::OnInitDialog() {
-	// Username, Userhash and Rating
-	if (!m_client->GetUserName().IsEmpty()) {
+	// Username, Userhash
+	if (!m_client.GetUserName().IsEmpty()) {
 		CastChild(ID_DNAME, wxStaticText)->SetLabel(
-			m_client->GetUserName());
+			m_client.GetUserName());
 		// if we have client name we have userhash
-		wxASSERT(!m_client->GetUserHash().IsEmpty());
+		wxASSERT(!m_client.GetUserHash().IsEmpty());
 		CastChild(ID_DHASH, wxStaticText)->SetLabel(
-			m_client->GetUserHash().Encode());
-		CastChild(ID_DRATING, wxStaticText)->SetLabel(
-			wxString::Format(wxT("%.1f"), m_client->GetRating()));
+			m_client.GetUserHash().Encode());
 	} else {
 		CastChild(ID_DNAME, wxStaticText)->SetLabel(_("Unknown"));
 		CastChild(ID_DHASH, wxStaticText)->SetLabel(_("Unknown"));
-		CastChild(ID_DRATING, wxStaticText)->SetLabel(_("Unknown"));;
 	}	
 	
 	// Client Software
-	wxString OSInfo = m_client->GetClientOSInfo();
+	wxString OSInfo = m_client.GetClientOSInfo();
 	if (!OSInfo.IsEmpty()) {
 		CastChild(ID_DSOFT, wxStaticText)->SetLabel(
-			m_client->GetSoftStr()+wxT(" (")+OSInfo+wxT(")"));
+			m_client.GetSoftStr()+wxT(" (")+OSInfo+wxT(")"));
 	} else {
 		CastChild(ID_DSOFT, wxStaticText)->SetLabel(
-			m_client->GetSoftStr());
+			m_client.GetSoftStr());
 	}
 
 	// Client Version
 	CastChild(ID_DVERSION, wxStaticText)->SetLabel(
-		m_client->GetSoftVerStr());
+		m_client.GetSoftVerStr());
 	
 	// User ID
 	CastChild(ID_DID, wxStaticText)->SetLabel(
-		CFormat(wxT("%u (%s)")) % ENDIAN_NTOHL(m_client->GetIP()) % (m_client->HasLowID() ? _("LowID") : _("HighID")));
+		CFormat(wxT("%u (%s)")) % m_client.GetUserIDHybrid() % (m_client.HasLowID() ? _("LowID") : _("HighID")));
 
 	// Client IP/Port
 	CastChild(ID_DIP, wxStaticText)->SetLabel(
-		m_client->GetFullIP() +
-		wxString::Format(wxT(":%i"), m_client->GetUserPort()));
+		CFormat(wxT("%s:%i")) % m_client.GetFullIP() % m_client.GetUserPort());
 	
 	// Server IP/Port/Name
-	if (m_client->GetServerIP()) {
-		wxString srvaddr = Uint32toStringIP(m_client->GetServerIP());
+	if (m_client.GetServerIP()) {
+		wxString srvaddr = Uint32toStringIP(m_client.GetServerIP());
 		CastChild(ID_DSIP, wxStaticText)->SetLabel(
-			srvaddr +
-			wxString::Format(wxT(":%i"),m_client->GetServerPort()));
+			CFormat(wxT("%s:%i")) % srvaddr % m_client.GetServerPort());
 		CastChild(ID_DSNAME, wxStaticText)->SetLabel(
-			m_client->GetServerName());
+			m_client.GetServerName());
 	} else {
 		CastChild(ID_DSIP, wxStaticText)->SetLabel(_("Unknown"));
 		CastChild(ID_DSNAME, wxStaticText)->SetLabel(_("Unknown"));
@@ -123,33 +117,26 @@
 
 	// Obfuscation
 	wxString buffer;
-	if (thePrefs::IsClientCryptLayerSupported()) {
-		if (m_client->SupportsCryptLayer()) {
-			if ((m_client->RequestsCryptLayer() || thePrefs::IsClientCryptLayerRequested()) && m_client->HasObfuscatedConnectionBeenEstablished()) {
-				buffer = _("Enabled");
-			} else {
-				buffer = _("Supported");
-			}
-		} else {
-			buffer = _("Not supported");
-		}
-	} else {
-		buffer = _("Disabled");
+	switch (m_client.GetObfuscationStatus()) {
+		case OBST_ENABLED:			buffer = _("Enabled"); break;
+		case OBST_SUPPORTED:		buffer = _("Supported"); break;
+		case OBST_NOT_SUPPORTED:	buffer = _("Not supported"); break;
+		case OBST_DISABLED:			buffer = _("Disabled"); break;
+		default:					buffer = _("Unknown"); break;
 	}
 	CastChild(IDT_OBFUSCATION, wxStaticText)->SetLabel(buffer);
 
 	// Kad
-	if (m_client->GetKadPort()) {
+	if (m_client.GetKadPort()) {
 		CastChild(IDT_KAD, wxStaticText)->SetLabel(_("Connected"));
 	} else {
 		CastChild(IDT_KAD, wxStaticText)->SetLabel(_("Disconnected"));
 	}
 
 	// File Name
-	const CKnownFile* file = m_client->GetUploadFile();
+	const CKnownFile* file = m_client.GetUploadFile();
 	if (file) {
-		wxString filename = MakeStringEscaped(
-			TruncateFilename(file->GetFileName(), 60));
+		wxString filename = MakeStringEscaped(file->GetFileName().TruncatePath(60));
 		CastChild(ID_DDOWNLOADING, wxStaticText)->SetLabel(filename);
 	} else {
 		CastChild(ID_DDOWNLOADING, wxStaticText)->SetLabel(wxT("-"));
@@ -157,66 +144,44 @@
 	
 	// Upload
 	CastChild(ID_DDUP, wxStaticText)->SetLabel(
-		CastItoXBytes(m_client->GetTransferredDown()));
+		CastItoXBytes(m_client.GetTransferredDown()));
 	
 	// Download
 	CastChild(ID_DDOWN, wxStaticText)->SetLabel(
-		CastItoXBytes(m_client->GetTransferredUp()));
+		CastItoXBytes(m_client.GetTransferredUp()));
 	
 	// Average Upload Rate
 	CastChild(ID_DAVUR, wxStaticText)->SetLabel(
-		wxString::Format(_("%.1f kB/s"),
-			m_client->GetKBpsDown()));
+		CFormat(_("%.1f kB/s")) % m_client.GetKBpsDown());
 	
 	// Average Download Rate
 	CastChild(ID_DAVDR, wxStaticText)->SetLabel(
-		wxString::Format(_("%.1f kB/s"),
-			m_client->GetUploadDatarate() / 1024.0f));
+		CFormat(_("%.1f kB/s")) % (m_client.GetUploadDatarate() / 1024.0f));
 	
 	// Total Upload
 	CastChild(ID_DUPTOTAL, wxStaticText)->SetLabel(
-		CastItoXBytes(m_client->GetDownloadedTotal()));
+		CastItoXBytes(m_client.GetDownloadedTotal()));
 	
 	// Total Download
 	CastChild(ID_DDOWNTOTAL, wxStaticText)->SetLabel(
-		CastItoXBytes(m_client->GetUploadedTotal()));
+		CastItoXBytes(m_client.GetUploadedTotal()));
 	
 	// DL/UP Modifier
 	CastChild(ID_DRATIO, wxStaticText)->SetLabel(
-		wxString::Format(wxT("%.1f"),
-			(float)m_client->GetScoreRatio()));
+		CFormat(wxT("%.1f")) % m_client.GetScoreRatio());
 	
 	// Secure Ident
-	if (theApp->CryptoAvailable()) {
-		if (m_client->SUINotSupported()) {
-			CastChild(IDC_CDIDENT, wxStaticText)->SetLabel(
-				_("Not supported"));
-		} else if (m_client->SUIFailed()) {
-			CastChild(IDC_CDIDENT, wxStaticText)->SetLabel(
-				_("Failed"));
-		} else if (m_client->SUINeeded()) {
-			CastChild(IDC_CDIDENT, wxStaticText)->SetLabel(
-				_("Not complete"));
-		} else if (m_client->IsBadGuy()) {
-			CastChild(IDC_CDIDENT, wxStaticText)->SetLabel(
-				_("Bad Guy"));
-		} else if (m_client->IsIdentified()) {
-			CastChild(IDC_CDIDENT, wxStaticText)->SetLabel(
-				_("Verified - OK"));
-		}	
-	} else {
-		CastChild(IDC_CDIDENT, wxStaticText)->SetLabel(
-			_("Not Available"));
-	}
+	CastChild(IDC_CDIDENT, wxStaticText)->SetLabel(
+		m_client.GetSecureIdentTextStatus());
 	
 	// Queue Score
-	if (m_client->GetUploadState() != US_NONE) {
+	if (m_client.GetUploadState() != US_NONE) {
+		CastChild(ID_QUEUERANK, wxStaticText)->SetLabel(
+			CFormat(wxT("%u")) % m_client.GetUploadQueueWaitingPosition());
 		CastChild(ID_DSCORE, wxStaticText)->SetLabel(
-			wxString::Format(_("%u (QR: %u)"),
-				m_client->GetScore(
-					false, m_client->IsDownloading(), false),
-			theApp->uploadqueue->GetWaitingPosition(m_client)));		
+			CFormat(wxT("%u")) % m_client.GetScore());		
 	} else {
+		CastChild(ID_QUEUERANK, wxStaticText)->SetLabel(wxT("-"));
 		CastChild(ID_DSCORE, wxStaticText)->SetLabel(wxT("-"));
 	}
 	Layout();

aMule-2.2.6.tar.bz2/src/ClientDetailDialog.h -> aMule-2.3.1.tar.bz2/src/ClientDetailDialog.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -28,7 +28,7 @@
 
 #include <wx/dialog.h>		// Needed for wxDialog
 
-class CUpDownClient;
+#include "ClientRef.h"		// Needed for CClientRef
 
 /**
  * The ClientDetailDialog class is responsible for showing the info about a client.
@@ -49,7 +49,7 @@
 	 * @param parent The window that created the dialog.
 	 * @param client The client whose details we're showing.
 	 */
-	CClientDetailDialog(wxWindow*parent,CUpDownClient* client);   
+	CClientDetailDialog(wxWindow*parent, const CClientRef& client);   
 	
 	/**
 	 * Destructor. 
@@ -78,8 +78,8 @@
 
 private:
 	
-	//! The CUpDownClient whose data is drawn
-	CUpDownClient* m_client;
+	//! The client whose data is drawn
+	CClientRef m_client;
 };
 #endif // CLIENTDETAILDIALOG_H
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/ClientList.cpp -> aMule-2.3.1.tar.bz2/src/ClientList.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -89,25 +89,15 @@
 	m_dwLastBannCleanUp = 0;
 	m_dwLastTrackedCleanUp = 0;
 	m_dwLastClientCleanUp = 0;
-	m_pBuddy = NULL;
 	m_nBuddyStatus = Disconnected;
-#ifdef __WXDEBUG__
-	m_delete_queue_closed = false;
-#endif
 }
 
 
 CClientList::~CClientList()
 {
-	std::map<uint32, CDeletedClient*>::iterator it = m_trackedClientsList.begin();
-	for ( ; it != m_trackedClientsList.end(); ++it ){
-		delete it->second;
-	}
-
-	m_trackedClientsList.clear();
+	DeleteContents(m_trackedClientsList);
 
 	wxASSERT(m_clientList.empty());
-	wxASSERT(m_delete_queue.empty());
 }
 
 
@@ -118,19 +108,19 @@
 		// Update the client-state
 		toadd->m_clientState = CS_LISTED;
 	
- 		Notify_ClientCtrlAddClient( toadd );
+ 		//Notify_ClientCtrlAddClient( toadd );
 	
 		// We always add the ID/ptr pair, regardles of the actual ID value
-		m_clientList.insert( IDMapPair( toadd->GetUserIDHybrid(), toadd ) );
+		m_clientList.insert( IDMapPair( toadd->GetUserIDHybrid(), CCLIENTREF(toadd, wxT("CClientList::AddClient m_clientList.insert"))) );
 
 		// We only add the IP if it is valid
 		if ( toadd->GetIP() ) {
-			m_ipList.insert( IDMapPair( toadd->GetIP(), toadd ) );
+			m_ipList.insert( IDMapPair( toadd->GetIP(), CCLIENTREF(toadd, wxT("CClientList::AddClient m_ipList.insert")) ) );
 		}
 
 		// We only add the hash if it is valid
 		if ( toadd->HasValidHash() ) {
-			m_hashList.insert( HashMapPair( toadd->GetUserHash(), toadd ) );
+			m_hashList.insert( HashMapPair( toadd->GetUserHash(), CCLIENTREF(toadd, wxT("CClientList::AddClient m_hashList.insert")) ) );
 		}
 
 		toadd->UpdateStats();
@@ -138,24 +128,15 @@
 }
 
 
-void CClientList::AddToDeleteQueue(CUpDownClient* client)
+void CClientList::RemoveClient(CUpDownClient* client)
 {
 	RemoveFromKadList( client );
 	RemoveDirectCallback( client );
 
-	// We have to remove the client from the list immediatly, to avoit it getting
-	// found by functions such as AttachToAlreadyKnown and GetClientsFromIP, 
-	// however, if the client isn't on the clientlist, then it is safe to delete 
-	// it right now. Otherwise, push it onto the queue.
 	if ( RemoveIDFromList( client ) ) {
 		// Also remove the ip and hash entries
 		RemoveIPFromList( client );
 		RemoveHashFromList( client );
-		
-		wxASSERT(!m_delete_queue_closed);
-		m_delete_queue.push_back( client );
-	} else {
-		delete client;
 	}
 }
 
@@ -170,7 +151,7 @@
 	RemoveIDFromList( client );
 
 	// Add the new entry
-	m_clientList.insert( IDMapPair( newID, client ) );
+	m_clientList.insert( IDMapPair( newID, CCLIENTREF(client, wxT("CClientList::UpdateClientID")) ) );
 }
 
 
@@ -184,7 +165,7 @@
 	RemoveIPFromList( client );
 
 	if ( newIP ) {
-		m_ipList.insert( IDMapPair( newIP, client ) );
+		m_ipList.insert( IDMapPair( newIP, CCLIENTREF(client, wxT("CClientList::UpdateClientIP")) ) );
 	}
 }
 
@@ -201,7 +182,7 @@
 
 	// And add the new one if valid
 	if ( !newHash.IsEmpty() ) {
-		m_hashList.insert( HashMapPair( newHash, client ) );
+		m_hashList.insert( HashMapPair( newHash, CCLIENTREF(client, wxT("CClientList::UpdateClientHash")) ) );
 	}
 }
 
@@ -214,7 +195,7 @@
 	std::pair<IDMap::iterator, IDMap::iterator> range = m_clientList.equal_range( client->GetUserIDHybrid() );
 
 	for ( ; range.first != range.second; ++range.first ) {
-		if ( client == range.first->second ) {
+		if ( client == range.first->second.GetClient() ) {
 			/* erase() will invalidate the iterator, but we're not using it anymore 
 			    anyway (notice the break;) */
 			m_clientList.erase( range.first );
@@ -239,7 +220,7 @@
 	std::pair<IDMap::iterator, IDMap::iterator> range = m_ipList.equal_range( client->GetIP() );
 
 	for ( ; range.first != range.second; ++range.first ) {
-		if ( client == range.first->second ) {
+		if ( client == range.first->second.GetClient() ) {
 			/* erase() will invalidate the iterator, but we're not using it anymore 
 			    anyway (notice the break;) */
 			m_ipList.erase( range.first );
@@ -259,7 +240,7 @@
 	std::pair<HashMap::iterator, HashMap::iterator> range = m_hashList.equal_range( client->GetUserHash() );
 
 	for ( ; range.first != range.second; ++range.first ) {
-		if ( client == range.first->second ) {
+		if ( client == range.first->second.GetClient() ) {
 			/* erase() will invalidate the iterator, but we're not using it anymore 
 			    anyway (notice the break;) */
 			m_hashList.erase( range.first );
@@ -287,7 +268,7 @@
 			IDMapIteratorPair range = m_ipList.equal_range(userIP);
 
 			for ( ; range.first != range.second; ++range.first ) {
-				CUpDownClient* other = range.first->second;
+				CUpDownClient* other = range.first->second.GetClient();
 				wxASSERT(userIP == other->GetIP());
 						
 				if (userPort && (userPort == other->GetUserPort())) {
@@ -304,7 +285,7 @@
 			IDMapIteratorPair range = m_clientList.equal_range(userID);
 
 			for (; range.first != range.second; ++range.first) {
-				CUpDownClient* other = range.first->second;
+				CUpDownClient* other = range.first->second.GetClient();
 				wxASSERT(userID == other->GetUserIDHybrid());
 
 				// For lowid, we also have to check the server
@@ -332,8 +313,8 @@
 			if (userPort) {
 				IDMap::const_iterator it = range.first;
 				for (; it != range.second; ++it) {
-					if (userPort == it->second->GetUserPort()) {
-						return it->second;
+					if (userPort == it->second.GetUserPort()) {
+						return it->second.GetClient();
 					}
 				}
 			}
@@ -341,8 +322,8 @@
 			if (userKadPort) {
 				IDMap::const_iterator it = range.first;
 				for (; it != range.second; ++it) {
-					if (userKadPort == it->second->GetKadPort()) {
-						return it->second;
+					if (userKadPort == it->second.GetClient()->GetKadPort()) {
+						return it->second.GetClient();
 					}
 				}
 			}
@@ -357,7 +338,7 @@
 
 		// Just return the first item if any
 		if ( range.first != range.second ) {
-			return range.first->second;
+			return range.first->second.GetClient();
 		}
 	}
 
@@ -381,15 +362,9 @@
 		IDMap::iterator it = m_clientList.begin();
 		
 		// Will call the removal of the item on this same class 
-		it->second->Disconnected(wxT("Removed while deleting all from ClientList."));
-		it->second->Safe_Delete();
+		it->second.GetClient()->Disconnected(wxT("Removed while deleting all from ClientList."));
+		it->second.GetClient()->Safe_Delete();
 	}
-
-	// Clean up the clients now queued for deletion
-#ifdef __WXDEBUG__
-	m_delete_queue_closed = true;
-#endif
-	ProcessDeleteQueue();
 }
 
 
@@ -412,12 +387,12 @@
 				{
 					// if found_client is connected and has the IS_IDENTIFIED, it's safe to say that the other one is a bad guy
 					if (found_client->IsIdentified()){
-						AddDebugLogLineM( false, logClient, wxT("Client: ") + tocheck->GetUserName() + wxT("(") + tocheck->GetFullIP() +  wxT("), Banreason: Userhash invalid")); 
+						AddDebugLogLineN(logClient, wxT("Client: ") + tocheck->GetUserName() + wxT("(") + tocheck->GetFullIP() +  wxT("), Banreason: Userhash invalid"));
 						tocheck->Ban();
 						return false;
 					}
 	
-					AddDebugLogLineM( false, logClient, wxT("WARNING! Found matching client, to a currently connected client: ") 
+					AddDebugLogLineN(logClient, wxT("WARNING! Found matching client, to a currently connected client: ")
 															+ tocheck->GetUserName() + wxT("(") +  tocheck->GetFullIP() 
 															+ wxT(") and ") + found_client->GetUserName() + wxT("(") +  found_client->GetFullIP() + wxT(")"));
 					return false;
@@ -443,7 +418,7 @@
 	std::pair<IDMap::iterator, IDMap::iterator> range = m_ipList.equal_range( clientip );
 
 	for ( ; range.first != range.second; ++range.first ) {
-		CUpDownClient* cur_client = range.first->second;
+		CUpDownClient* cur_client = range.first->second.GetClient();
 		// Check if it's actually the client we want
 		if ( cur_client->GetUserPort() == port ) {
 			return cur_client;
@@ -454,6 +429,27 @@
 }
 
 
+CUpDownClient* CClientList::FindClientByIP( uint32 clientip )
+{
+	// Find all items with the specified ip
+	std::pair<IDMap::iterator, IDMap::iterator> range = m_ipList.equal_range( clientip );
+
+	return (range.first != range.second) ? range.first->second.GetClient() : NULL;
+}
+
+
+CUpDownClient* CClientList::FindClientByECID(uint32 ecid) const
+{
+	for (IDMap::const_iterator it =	m_clientList.begin(); it != m_clientList.end(); it++) {
+		if (it->second.ECID() == ecid) {
+			return it->second.GetClient();
+		}
+	}
+
+	return NULL;
+}
+
+
 bool CClientList::IsIPAlreadyKnown(uint32_t ip)
 {
 	// Find all items with the specified ip
@@ -523,31 +519,10 @@
 }
 
 
-void CClientList::ProcessDeleteQueue()
-{
-	// Delete pending clients
-	while ( !m_delete_queue.empty() ) {
-		CUpDownClient* toremove = m_delete_queue.front();
-		m_delete_queue.pop_front();
-		
-		// Doing what RemoveClient used to do. Just to be sure...
-		theApp->uploadqueue->RemoveFromUploadQueue( toremove );
-		theApp->uploadqueue->RemoveFromWaitingQueue( toremove );
-		theApp->downloadqueue->RemoveSource( toremove );
-	
-		Notify_ClientCtrlRemoveClient( toremove );
-
-		delete toremove;
-	}
-}
-
-
 void CClientList::Process()
 {
 	const uint32 cur_tick = ::GetTickCount();
 
-	ProcessDeleteQueue();
-
 	if (m_dwLastBannCleanUp + BAN_CLEANUP_TIME < cur_tick) {
 		m_dwLastBannCleanUp = cur_tick;
 		
@@ -587,9 +562,9 @@
 	// buddy is just a flag that is used to make sure we are still connected or connecting to a buddy.
 	buddyState buddy = Disconnected;
 	
-	std::set<CUpDownClient*>::iterator current_it = m_KadSources.begin();
+	CClientRefSet::iterator current_it = m_KadSources.begin();
 	while (current_it != m_KadSources.end()) {
-		CUpDownClient* cur_client = *current_it;
+		CUpDownClient* cur_client = current_it->GetClient();
 		++current_it; // Won't be used anymore till while loop 
 		if( !Kademlia::CKademlia::IsRunning() ) {
 			//Clear out this list if we stop running Kad.
@@ -619,11 +594,11 @@
 					// The result is now sent per TCP instead of UDP, because this will fail if our intern port is unreachable.
 					// But we want the TCP testresult regardless if UDP is firewalled, the new UDP state and test takes care of the rest
 					wxASSERT(cur_client->IsConnected());
-					//AddDebugLogLineM(false, logClient, wxT("Sent OP_KAD_FWTCPCHECK_ACK"));
+					AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_KAD_FWTCPCHECK_ACK to ") + Uint32toStringIP(cur_client->GetIP()));
 					CPacket *packet = new CPacket(OP_KAD_FWTCPCHECK_ACK, 0, OP_EMULEPROT);
 					cur_client->SafeSendPacket(packet);
 				} else {
-					DebugSend(KadFirewalledAckRes, wxUINT32_SWAP_ALWAYS(cur_client->GetIP()), cur_client->GetKadPort());
+					AddDebugLogLineN(logClientKadUDP, wxT("KadFirewalledAckRes to ") + Uint32_16toStringIP_Port(cur_client->GetIP(), cur_client->GetKadPort()));
 					Kademlia::CKademlia::GetUDPListener()->SendNullPacket(KADEMLIA_FIREWALLED_ACK_RES, wxUINT32_SWAP_ALWAYS(cur_client->GetIP()), cur_client->GetKadPort(), 0, NULL);
 				}
 				//We are done with this client. Set Kad status to KS_NONE and it will be removed in the next cycle.
@@ -679,11 +654,11 @@
 
 				//If m_nBuddyStatus is not connected already, we set this client as our buddy!
 				if( m_nBuddyStatus != Connected ) {
-					m_pBuddy = cur_client;
+					m_pBuddy.Link(cur_client CLIENT_DEBUGSTRING("CClientList::Process KS_CONNECTED_BUDDY m_pBuddy.Link"));
 					m_nBuddyStatus = Connected;
 					Notify_ServerUpdateED2KInfo();
 				}
-				if( m_pBuddy == cur_client && theApp->IsFirewalled() && cur_client->SendBuddyPingPong() ) {
+				if( m_pBuddy.GetClient() == cur_client && theApp->IsFirewalled() && cur_client->SendBuddyPingPong() ) {
 					cur_client->SendBuddyPing();
 				}
 				break;
@@ -695,13 +670,13 @@
 
 	//We either never had a buddy, or lost our buddy..
 	if( buddy == Disconnected ) {
-		if( m_nBuddyStatus != Disconnected || m_pBuddy ) {
+		if( m_nBuddyStatus != Disconnected || m_pBuddy.IsLinked() ) {
 			if( Kademlia::CKademlia::IsRunning() && theApp->IsFirewalled() && Kademlia::CUDPFirewallTester::IsFirewalledUDP(true) ) {
 				//We are a lowID client and we just lost our buddy.
 				//Go ahead and instantly try to find a new buddy.
 				Kademlia::CKademlia::GetPrefs()->SetFindBuddy();
 			}
-			m_pBuddy = NULL;
+			m_pBuddy.Unlink();
 			m_nBuddyStatus = Disconnected;
 			Notify_ServerUpdateED2KInfo();
 		}
@@ -716,7 +691,7 @@
 			// (this makes it work fine if our buddy uses require crypt), however callback requests don't support it yet so we
 			// wouldn't be able to answer callback requests with RequireCrypt, protocolchange intended for eMule 0.49b
 			if(m_nBuddyStatus == Disconnected && Kademlia::CKademlia::GetPrefs()->GetFindBuddy() && !thePrefs::IsClientCryptLayerRequired()) {
-				AddDebugLogLineM(false, logKadMain, wxT("Starting BuddySearch"));
+				AddDebugLogLineN(logKadMain, wxT("Starting BuddySearch"));
 				//We are a firewalled client with no buddy. We have also waited a set time
 				//to try to avoid a false firewalled status.. So lets look for a buddy..
 				if (!Kademlia::CSearchManager::PrepareLookup(Kademlia::CSearch::FINDBUDDY, true, Kademlia::CUInt128(true).XOR(Kademlia::CKademlia::GetPrefs()->GetKadID()))) {
@@ -728,19 +703,19 @@
 				}
 			}
 		} else {
-			if( m_pBuddy ) {
+			if (m_pBuddy.IsLinked()) {
 				//Lets make sure that if we have a buddy, they are firewalled!
 				//If they are also not firewalled, then someone must have fixed their firewall or stopped saturating their line.. 
 				//We just set the state of this buddy to KS_NONE and things will be cleared up with the next cycle.
-				if( !m_pBuddy->HasLowID() ) {
-					m_pBuddy->SetKadState(KS_NONE);
+				if( !m_pBuddy.HasLowID() ) {
+					m_pBuddy.GetClient()->SetKadState(KS_NONE);
 				}
 			}
 		}
 	} else {
-		if( m_pBuddy ) {
+		if (m_pBuddy.IsLinked()) {
 			//We are not connected anymore. Just set this buddy to KS_NONE and things will be cleared out on next cycle.
-			m_pBuddy->SetKadState(KS_NONE);
+			m_pBuddy.GetClient()->SetKadState(KS_NONE);
 		}
 	}
 	
@@ -783,10 +758,10 @@
 	// Filter client list
 	for ( IDMap::iterator it = m_ipList.begin(); it != m_ipList.end(); ) {
 		IDMap::iterator tmp = it++; // Don't change this to a ++it! 
-		
-		if ( theApp->ipfilter->IsFiltered(tmp->second->GetConnectIP())) {
-			tmp->second->Disconnected(wxT("Filtered by IPFilter"));
-			tmp->second->Safe_Delete();
+		CUpDownClient* client = tmp->second.GetClient();
+		if ( theApp->ipfilter->IsFiltered(client->GetConnectIP())) {
+			client->Disconnected(wxT("Filtered by IPFilter"));
+			client->Safe_Delete();
 		}
 	}
 }
@@ -839,22 +814,22 @@
 	return m_deadSources.IsDeadSource( client );
 }
 
-bool CClientList::SendMessage(uint64 client_id, const wxString& message)
+bool CClientList::SendChatMessage(uint64 client_id, const wxString& message)
 {
 	CUpDownClient* client = FindClientByIP(IP_FROM_GUI_ID(client_id), PORT_FROM_GUI_ID(client_id));
-	AddDebugLogLineM( false, logClient, wxT("Trying to Send Message.") );
+	AddDebugLogLineN( logClient, wxT("Trying to Send Message.") );
 	if (client) {
-		AddDebugLogLineM( false, logClient, wxT("Sending.") );
+		AddDebugLogLineN( logClient, wxT("Sending.") );
 	} else {
-		AddDebugLogLineM( true, logClient, 
-			CFormat( wxT("No client (GUI_ID %lli [%s:%llu]) found in CClientList::SendMessage(). Creating") ) 
+		AddDebugLogLineC( logClient,
+			CFormat( wxT("No client (GUI_ID %lli [%s:%llu]) found in CClientList::SendChatMessage(). Creating") ) 
 				% client_id 
 				% Uint32toStringIP(IP_FROM_GUI_ID(client_id))
 				% PORT_FROM_GUI_ID(client_id) );
 		client = new CUpDownClient(PORT_FROM_GUI_ID(client_id),IP_FROM_GUI_ID(client_id),0,0,NULL, true, true);
 		AddClient(client);
 	}
-	return client->SendMessage(message);
+	return client->SendChatMessage(message);
 }
 
 void CClientList::SetChatState(uint64 client_id, uint8 state) {
@@ -912,7 +887,7 @@
 	} else if (pNewClient->GetKadState() != KS_NONE) {
 		return; // already busy with this client in some way (probably fw stuff), don't mess with it
 	} else if (IsKadFirewallCheckIP(nContactIP)) { // doing a kad firewall check with this IP, abort
-		AddDebugLogLineM(false, logKadMain, wxT("Kad TCP firewallcheck / Buddy request collision for IP ") + Uint32toStringIP(nContactIP));
+		AddDebugLogLineN(logKadMain, wxT("Kad TCP firewallcheck / Buddy request collision for IP ") + Uint32toStringIP(nContactIP));
 		return;
 	}
 
@@ -936,7 +911,7 @@
 	if (FindClientByIP(nContactIP, contact->GetTCPPort())) {
 		return false;
 	} else if (IsKadFirewallCheckIP(nContactIP)) { // doing a kad firewall check with this IP, abort
-		AddDebugLogLineM(false, logKadMain, wxT("Kad TCP firewallcheck / Buddy request collision for IP ") + Uint32toStringIP(nContactIP));
+		AddDebugLogLineN(logKadMain, wxT("Kad TCP firewallcheck / Buddy request collision for IP ") + Uint32toStringIP(nContactIP));
 		return false;
 	}
 
@@ -962,9 +937,9 @@
 {
 	wxCHECK_RET(torem, wxT("NULL pointer in RemoveFromKadList"));
 
-	if (m_KadSources.erase(torem)) {
-		if(torem == m_pBuddy) {
-			m_pBuddy = NULL;
+	if (m_KadSources.erase(CCLIENTREF(torem, wxEmptyString))) {
+		if (torem == m_pBuddy.GetClient()) {
+			m_pBuddy.Unlink();
 			m_nBuddyStatus = Disconnected;
 			Notify_ServerUpdateED2KInfo();
 		}
@@ -975,7 +950,7 @@
 {
 	wxCHECK_RET(toadd, wxT("NULL pointer in AddToKadList"));
 
-	m_KadSources.insert(toadd); // This will take care of duplicates.
+	m_KadSources.insert(CCLIENTREF(toadd, wxT("CClientList::AddToKadList"))); // This will take care of duplicates.
 }
 
 bool CClientList::DoRequestFirewallCheckUDP(const Kademlia::CContact& contact)
@@ -990,7 +965,7 @@
 	// but certainly not nice. Only somewhat acceptable way to solve this is to use the KadID instead.
 	CUpDownClient* pNewClient = new CUpDownClient(contact.GetTCPPort(), contact.GetIPAddress(), 0, 0, NULL, false, true);
 	pNewClient->SetKadState(KS_QUEUED_FWCHECK_UDP);
-	AddDebugLogLineM(false, logClient, wxT("Selected client for UDP Firewallcheck: ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contact.GetIPAddress())));
+	AddDebugLogLineN(logClient, wxT("Selected client for UDP Firewallcheck: ") + KadIPToString(contact.GetIPAddress()));
 	AddToKadList(pNewClient);
 	AddClient(pNewClient);
 	wxASSERT(!pNewClient->SupportsDirectUDPCallback());
@@ -1011,54 +986,56 @@
 	const uint32 cur_tick = ::GetTickCount();
 	if (m_dwLastClientCleanUp + CLIENTLIST_CLEANUP_TIME < cur_tick ){
 		m_dwLastClientCleanUp = cur_tick;
-		uint32 cDeleted = 0;
+		DEBUG_ONLY( uint32 cDeleted = 0; )
 		IDMap::iterator current_it = m_clientList.begin();
 		while (current_it != m_clientList.end()) {
-			CUpDownClient* pCurClient = current_it->second;
+			CUpDownClient* pCurClient = current_it->second.GetClient();
 			++current_it; // Won't be used till while loop again
 			// Don't delete sources coming from source seeds for 10 mins,
 			// to give them a chance to connect and become a useful source.
 			if (pCurClient->GetSourceFrom() == SF_SOURCE_SEEDS && cur_tick - (uint32)theStats::GetStartTime() < MIN2MS(10)) continue;
-			if ((pCurClient->GetUploadState() == US_NONE || pCurClient->GetUploadState() == US_BANNED && !pCurClient->IsBanned())
+			if ((pCurClient->GetUploadState() == US_NONE || (pCurClient->GetUploadState() == US_BANNED && !pCurClient->IsBanned()))
 				&& pCurClient->GetDownloadState() == DS_NONE
 				&& pCurClient->GetChatState() == MS_NONE
 				&& pCurClient->GetKadState() == KS_NONE
 				&& pCurClient->GetSocket() == NULL)
 			{
-				cDeleted++;
+				DEBUG_ONLY( cDeleted++; )
 				pCurClient->Disconnected(wxT("Removed during ClientList cleanup."));
 				pCurClient->Safe_Delete(); 
+#ifdef __DEBUG__
 			} else {
-				if (!(pCurClient->GetUploadState() == US_NONE || pCurClient->GetUploadState() == US_BANNED && !pCurClient->IsBanned())) {
-					AddDebugLogLineM(false, logProxy,
+				if (!(pCurClient->GetUploadState() == US_NONE || (pCurClient->GetUploadState() == US_BANNED && !pCurClient->IsBanned()))) {
+					AddDebugLogLineN(logProxy,
 						CFormat(wxT("Debug: Not deleted client %x with up state: %i "))
 							% (long int)pCurClient % pCurClient->GetUploadState());
 				}
 				if (!(pCurClient->GetDownloadState() == DS_NONE)) {
-					AddDebugLogLineM(false, logProxy, 
+					AddDebugLogLineN(logProxy,
 						CFormat(wxT("Debug: Not deleted client %x with down state: %i "))
 							% (long int)pCurClient % pCurClient->GetDownloadState());
 				}
 				if (!(pCurClient->GetChatState() == MS_NONE)) {	
-					AddDebugLogLineM(false, logProxy, 
+					AddDebugLogLineN(logProxy,
 						CFormat(wxT("Debug: Not deleted client %x with chat state: %i "))
 							% (long int)pCurClient % pCurClient->GetChatState());
 				}
 				if (!(pCurClient->GetKadState() == KS_NONE)) {
-					AddDebugLogLineM(false, logProxy, 
+					AddDebugLogLineN(logProxy,
 						CFormat(wxT("Debug: Not deleted client %x with kad state: %i ip: %s"))
-							% (long int)pCurClient % pCurClient->GetKadState() % pCurClient->GetFullIP());
+							% (long int)pCurClient % (int)pCurClient->GetKadState() % pCurClient->GetFullIP());
 				}
 				if (!(pCurClient->GetSocket() == NULL)) {
-					AddDebugLogLineM(false, logProxy, 
+					AddDebugLogLineN(logProxy,
 						CFormat(wxT("Debug: Not deleted client %x: has socket")) % (long int)pCurClient);
 				}	
-				AddDebugLogLineM(false, logProxy, 
+				AddDebugLogLineN(logProxy,
 					CFormat(wxT("Debug: Not deleted client %x with kad version: %i"))
 						% (long int)pCurClient % pCurClient->GetKadVersion());				
+#endif
 			}
 		}
-		AddDebugLogLineM(false, logClient, wxString::Format(wxT("Cleaned ClientList, removed %i not used known clients"), cDeleted));
+		AddDebugLogLineN(logClient, CFormat(wxT("Cleaned ClientList, removed %i not used known clients")) % cDeleted);
 	}
 }
 
@@ -1090,13 +1067,16 @@
 void CClientList::AddDirectCallbackClient(CUpDownClient* toAdd)
 {
 	wxASSERT(toAdd->GetDirectCallbackTimeout() != 0);
+	if (toAdd->HasBeenDeleted()) {
+		return;
+	}
 	for (DirectCallbackList::const_iterator it = m_currentDirectCallbacks.begin(); it != m_currentDirectCallbacks.end(); ++it) {
-		if (*it == toAdd) {
+		if (it->GetClient() == toAdd) {
 			wxFAIL; // might happen very rarely on multiple connection tries, could be fixed in the client class, till then it's not much of a problem though
 			return;
 		}
 	}
-	m_currentDirectCallbacks.push_back(toAdd);
+	m_currentDirectCallbacks.push_back(CCLIENTREF(toAdd, wxT("CClientList::AddDirectCallbackClient")));
 }
 
 void CClientList::ProcessDirectCallbackList()
@@ -1105,7 +1085,7 @@
 	const uint32_t cur_tick = ::GetTickCount();
 	for (DirectCallbackList::iterator it = m_currentDirectCallbacks.begin(); it != m_currentDirectCallbacks.end();) {
 		DirectCallbackList::iterator it2 = it++;
-		CUpDownClient* curClient = *it2;
+		CUpDownClient* curClient = it2->GetClient();
 		if (curClient->GetDirectCallbackTimeout() < cur_tick) {
 			wxASSERT(curClient->GetDirectCallbackTimeout() != 0);
 			// TODO LOGREMOVE
@@ -1142,4 +1122,16 @@
 	}
 	return true;
 }
+
+uint32 CClientList::GetBuddyIP()
+{
+	return GetBuddy()->GetIP();
+}
+
+uint16 CClientList::GetBuddyPort()
+{
+	return GetBuddy()->GetUDPPort();
+}
+
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/ClientList.h -> aMule-2.3.1.tar.bz2/src/ClientList.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,6 +27,7 @@
 #define CLIENTLIST_H
 
 #include "DeadSourceList.h"	// Needed for CDeadSourceList
+#include "ClientRef.h"
 
 #include <deque>
 #include <set>
@@ -81,17 +82,13 @@
 	void	AddClient( CUpDownClient* toadd );
 
 	/**
-	 * Schedules a client for deletion.
+	 * Removes a client from the  client lists.
 	 *
-	 * @param client The client to be deleted.
+	 * @param client The client to be removed.
 	 *
-	 * Call this function whenever a client is to be deleted, rather than 
-	 * directly deleting the client. If the client is on the global client-
-	 * list, then it will be scheduled for deletion, otherwise it will be 
-	 * deleted immediatly. Please check CUpDownClient::Safe_Delete for the
-	 * proper way to do this.
+	 * To be called from CUpDownClient::Safe_Delete only.
 	 */
-	void	AddToDeleteQueue( CUpDownClient* client );
+	void	RemoveClient( CUpDownClient* client );
 
 
 	/**
@@ -167,6 +164,25 @@
 	CUpDownClient* FindClientByIP( uint32 clientip, uint16 port );
 
 
+	/**
+	 * Finds a client with the specified ip.
+	 *
+	 * @param clientip The IP of the client to find.
+	 *
+	 * Returns the first client found if there are several with same ip.
+	 */
+	CUpDownClient* FindClientByIP( uint32 clientip );
+
+
+	/**
+	 * Finds a client with the specified ECID.
+	 *
+	 * @param clientip The IP of the client to find.
+	 *
+	 */
+	CUpDownClient* FindClientByECID(uint32 ecid) const;
+
+
 	//! The list-type used to store clients IPs and other information
 	typedef std::map<uint32, uint32> ClientMap;
 	
@@ -234,15 +250,6 @@
 
 
 	/**
-	 * Deletes clients previously queued for deletion
-	 *
-	 * This function takes care of deleting pending clients on the
-	 * deletion-queue.
-	 */
-	void	ProcessDeleteQueue();
-
-
-	/**
 	 * This function removes all clients filtered by the current IPFilter.
 	 *
 	 * Call this function after changing the current IPFiler list, to ensure
@@ -253,7 +260,7 @@
 
 
 	//! The type of the list used to store client-pointers for a couple of tasks.
-	typedef std::deque<CUpDownClient*> SourceList;
+	typedef std::deque<CClientRef> SourceList;
 	
 
 	/**
@@ -280,9 +287,9 @@
 
 
 	//! The type of the lists used to store IPs and IDs.
-	typedef std::multimap<uint32, CUpDownClient*> IDMap;
+	typedef std::multimap<uint32, CClientRef> IDMap;
 	//! The pairs of the IP/ID list.
-	typedef std::pair<uint32, CUpDownClient*> IDMapPair;
+	typedef std::pair<uint32, CClientRef> IDMapPair;
 
 
 	/**
@@ -316,7 +323,7 @@
 	 *
 	 * @return Success
 	 */
-	 bool	SendMessage(uint64 client_id, const wxString& message);
+	 bool	SendChatMessage(uint64 client_id, const wxString& message);
 	 
 	/**
 	 * Stops a chat session with a client.
@@ -327,7 +334,9 @@
 	uint8	GetBuddyStatus() const {return m_nBuddyStatus;}
 	// This must be used on CreateKadSourceLink and if we ever add the columns
 	// on shared files control.
-	CUpDownClient* GetBuddy() const { return m_pBuddy; }
+	CUpDownClient* GetBuddy() { return m_pBuddy.GetClient(); }
+	uint32 GetBuddyIP();
+	uint16 GetBuddyPort();
 	bool RequestTCP(Kademlia::CContact* contact, uint8_t connectOptions);
 	void RequestBuddy(Kademlia::CContact* contact, uint8_t connectOptions);
 	bool IncomingBuddy(Kademlia::CContact* contact, Kademlia::CUInt128* buddyID);
@@ -340,7 +349,7 @@
 
 	// Direct Callback list
 	void	AddDirectCallbackClient(CUpDownClient *toAdd);
-	void	RemoveDirectCallback(CUpDownClient *toRemove) { m_currentDirectCallbacks.remove(toRemove); }
+	void	RemoveDirectCallback(CUpDownClient *toRemove) { m_currentDirectCallbacks.remove(CCLIENTREF(toRemove, wxEmptyString)); }
 	void	AddTrackCallbackRequests(uint32_t ip);
 	bool	AllowCallbackRequest(uint32_t ip) const;
 
@@ -391,9 +400,9 @@
 
 
 	//! The type of the list used to store user-hashes.
-	typedef std::multimap<CMD4Hash, CUpDownClient*> HashMap;
+	typedef std::multimap<CMD4Hash, CClientRef> HashMap;
 	//! The pairs of the Hash-list.
-	typedef std::pair<CMD4Hash, CUpDownClient*> HashMapPair;
+	typedef std::pair<CMD4Hash, CClientRef> HashMapPair;
 
 
 	//! The map of clients with valid hashes
@@ -405,12 +414,6 @@
 	//! The full lists of clients
 	IDMap	m_clientList;
 
-	//! This is the lists of clients that should be deleted
-	SourceList m_delete_queue;
-#ifdef __WXDEBUG__
-	bool m_delete_queue_closed;
-#endif
-	
 	//! This is the map of banned clients.
 	ClientMap m_bannedList;
 	//! This variable is used to keep track of the last time the banned-list was pruned.
@@ -428,8 +431,8 @@
 	CDeadSourceList	m_deadSources;
 	
 	/* Kad Stuff */
-	std::set<CUpDownClient*>	m_KadSources;
-	CUpDownClient* m_pBuddy;
+	CClientRefSet	m_KadSources;
+	CClientRef		m_pBuddy;
 	uint8 m_nBuddyStatus;
 
 	typedef struct {
@@ -439,7 +442,7 @@
 	typedef std::list<IpAndTicks>	IpAndTicksList;
 	IpAndTicksList			m_firewallCheckRequests;
 
-	typedef std::list<CUpDownClient *>	DirectCallbackList;
+	typedef CClientRefList	DirectCallbackList;
 	DirectCallbackList		m_currentDirectCallbacks;
 	IpAndTicksList			m_directCallbackRequests;
 };

aMule-2.3.1.tar.bz2/src/ClientRef.cpp Added

@@ -0,0 +1,207 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Stu Redman ( sturedman@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
+//
+
+#include "ClientRef.h"
+#include "amule.h"				// Needed fot theApp
+
+#ifdef CLIENT_GUI
+#include "UpDownClientEC.h"	// Needed for CUpDownClient
+#else
+#include "updownclient.h"	// Needed for CUpDownClient
+#endif
+
+#ifdef DEBUG_ZOMBIE_CLIENTS
+#define MFROM m_from
+#define ASSIGN_MFROM(a) m_from = a
+#else
+#define MFROM
+#define ASSIGN_MFROM(a)
+#endif
+
+
+CClientRef::CClientRef(const CClientRef& ref)
+{
+	m_client = ref.m_client;
+	ASSIGN_MFROM(wxT("copy ctor of ") + ref.m_from);
+	if (m_client) {
+		m_client->Link(MFROM);
+	}
+}
+
+
+CClientRef::CClientRef(CUpDownClient * client LINKED_FROM)
+{
+	m_client = client;
+	ASSIGN_MFROM(from);
+	if (m_client) {
+		m_client->Link(MFROM);
+	}
+}
+
+
+void CClientRef::Link(CUpDownClient * client LINKED_FROM)
+{
+	Unlink();
+	m_client = client;
+	ASSIGN_MFROM(from);
+	if (m_client) {
+		m_client->Link(MFROM);
+	}
+}
+
+
+void CClientRef::Unlink()
+{
+	if (m_client) {
+		m_client->Unlink(MFROM);
+		m_client = NULL;
+	}
+}
+
+
+// in amulegui clients are never deleted except when they are marked as removed through EC
+#ifndef CLIENT_GUI
+
+CUpDownClient * CClientRef::GetClientChecked()
+{
+	if (m_client && m_client->HasBeenDeleted()) {
+		m_client->Unlink(MFROM);
+		m_client = NULL;
+	}
+	return m_client;
+}
+
+
+CClientRef&	CClientRef::GetRef()
+{
+	if (m_client && m_client->HasBeenDeleted()) {
+		m_client->Unlink(MFROM);
+		m_client = NULL;
+	}
+	return *this;
+}
+
+
+void CClientRef::Safe_Delete()
+{
+	CUpDownClient * client = m_client;
+	if (client) {
+		Unlink();
+		client->Safe_Delete();
+	}
+}
+#endif
+
+
+#define WRAPC(func) CClientRef::func() const { return m_client->func(); }
+
+uint32				WRAPC(ECID)
+bool				WRAPC(ExtProtocolAvailable)
+uint16				WRAPC(GetAvailablePartCount)
+const wxString&		WRAPC(GetClientFilename)
+const wxString&		WRAPC(GetClientModString)
+const wxString&		WRAPC(GetClientOSInfo)
+uint8				WRAPC(GetClientSoft)
+const wxString&		WRAPC(GetClientVerString)
+uint64				WRAPC(GetDownloadedTotal)
+uint8				WRAPC(GetDownloadState)
+CFriend*			WRAPC(GetFriend)
+bool				WRAPC(GetFriendSlot)
+wxString			WRAPC(GetFullIP)
+uint32				WRAPC(GetIP)
+uint16				WRAPC(GetKadPort)
+float				WRAPC(GetKBpsDown)
+uint16				WRAPC(GetLastDownloadingPart)
+uint16				WRAPC(GetNextRequestedPart)
+uint8				WRAPC(GetObfuscationStatus)
+uint16				WRAPC(GetOldRemoteQueueRank)
+const BitVector&	WRAPC(GetPartStatus)
+uint16				WRAPC(GetRemoteQueueRank)
+CPartFile*			WRAPC(GetRequestFile)
+uint32				WRAPC(GetScore)
+double 				WRAPC(GetScoreRatio)
+uint32				WRAPC(GetServerIP)
+const wxString		WRAPC(GetServerName)
+uint16				WRAPC(GetServerPort)
+const wxString&		WRAPC(GetSoftStr)
+const wxString&		WRAPC(GetSoftVerStr)
+int					WRAPC(GetSourceFrom)
+uint64				WRAPC(GetTransferredDown)
+uint64				WRAPC(GetTransferredUp)
+uint32				WRAPC(GetUploadDatarate)
+uint64				WRAPC(GetUploadedTotal)
+const CKnownFile*	WRAPC(GetUploadFile)
+uint16				WRAPC(GetUploadQueueWaitingPosition)
+uint8				WRAPC(GetUploadState)
+size_t				WRAPC(GetUpPartCount)
+uint32				WRAPC(GetUserIDHybrid)
+const wxString&		WRAPC(GetUserName)
+uint16_t			WRAPC(GetUserPort)
+const CMD4Hash&		WRAPC(GetUserHash)
+uint32				WRAPC(GetVersion)
+bool				WRAPC(HasDisabledSharedFiles)
+bool				WRAPC(HasLowID)
+bool				WRAPC(IsBadGuy)
+bool				WRAPC(IsFriend)
+bool				WRAPC(IsIdentified)
+bool				WRAPC(IsRemoteQueueFull)
+void				WRAPC(RequestSharedFileList)
+
+bool		CClientRef::IsUpPartAvailable(uint16 iPart) const { return m_client->IsUpPartAvailable(iPart); }
+void		CClientRef::SetFriend(CFriend* newfriend) const { m_client->SetFriend(newfriend); }
+void		CClientRef::SetFriendSlot(bool bNV) const { m_client->SetFriendSlot(bNV); }
+
+#ifndef CLIENT_GUI
+void				WRAPC(ClearUploadFileID)
+uint16				WRAPC(GetUDPPort)
+void		CClientRef::SetCommentDirty(bool bDirty) const { m_client->SetCommentDirty(bDirty); }
+#endif
+
+bool		CClientRef::SwapToAnotherFile(bool bIgnoreNoNeeded, bool ignoreSuspensions, bool bRemoveCompletely, CPartFile* toFile) const
+{
+	return m_client->SwapToAnotherFile(bIgnoreNoNeeded, ignoreSuspensions, bRemoveCompletely, toFile);
+}
+
+wxString	CClientRef::GetSecureIdentTextStatus() const
+{
+	wxString ret;
+	if (theApp->CryptoAvailable()) {
+		if (m_client->SUINotSupported()) {
+			ret = _("Not supported");
+		} else if (m_client->SUIFailed()) {
+			ret = _("Failed");
+		} else if (m_client->SUINeeded()) {
+			ret = _("Not complete");
+		} else if (m_client->IsBadGuy()) {
+			ret = _("Bad Guy");
+		} else if (m_client->IsIdentified()) {
+			ret = _("Verified - OK");
+		}	
+	} else {
+		ret = _("Not Available");
+	}
+	return ret;
+}
+

aMule-2.3.1.tar.bz2/src/ClientRef.h Added

@@ -0,0 +1,193 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Stu Redman ( sturedman@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 CLIENTREF_H
+#define CLIENTREF_H
+
+//
+// Clients are stored in many places. To prevent problems when a client gets deleted
+// and later a pointer to a deleted client is referenced, clients are now stored in 
+// this class only. It uses reference counting in the client which deletes the client only 
+// after the last reference has been unlinked.
+// Also the class is used as abstraction layer for the CUpDownClient class.
+//
+
+#include <list>
+#include <set>
+#include "Types.h"
+
+class CUpDownClient;
+class CKnownFile;
+class CPartFile;
+class CFriend;
+class BitVector;
+class CMD4Hash;
+
+#ifdef __DEBUG__
+#define DEBUG_ZOMBIE_CLIENTS
+#endif
+
+#ifdef DEBUG_ZOMBIE_CLIENTS
+#define LINKED_FROM , wxString from
+#define CLIENT_DEBUGSTRING(a) , wxT(a)
+#define CCLIENTREF(a, b) CClientRef(a, b)
+#else
+#define LINKED_FROM
+#define CLIENT_DEBUGSTRING(a)
+#define CCLIENTREF(a, b) CClientRef(a)
+#endif
+
+class CClientRef {
+
+	CUpDownClient * m_client;
+#ifdef DEBUG_ZOMBIE_CLIENTS
+	wxString	m_from;
+#endif
+
+public:
+	CClientRef()	{ m_client = NULL; }
+	CClientRef(const CClientRef&);
+	CClientRef(CUpDownClient * client LINKED_FROM);
+	CClientRef(class CEC_UpDownClient_Tag *);
+	~CClientRef()	{ Unlink(); }
+	CClientRef& operator = (const CClientRef& ref)
+	{
+#ifdef DEBUG_ZOMBIE_CLIENTS
+		m_from = wxT("assigned from ") + ref.m_from;
+		Link(ref.m_client, m_from); 
+#else
+		Link(ref.m_client); 
+#endif
+		return *this; 
+	}
+
+
+// For sets and maps
+	bool operator <  (const CClientRef & other) const { return m_client < other.m_client; }
+	bool operator == (const CClientRef & other) const { return m_client == other.m_client; }
+	bool operator != (const CClientRef & other) const { return m_client != other.m_client; }
+
+	void swap(CClientRef & other)
+	{
+		CUpDownClient * c =	m_client;
+		m_client = other.m_client;
+		other.m_client = c;
+#ifdef DEBUG_ZOMBIE_CLIENTS
+		m_from.swap(other.m_from);
+#endif
+	}
+
+	void Link(CUpDownClient * client LINKED_FROM);
+	void Unlink();
+	bool IsLinked() const		{ return m_client != NULL; }
+
+	// Return client, no matter if it was deleted
+	CUpDownClient * GetClient() const	{ return m_client; }
+	// Check if client was deleted, if yes unlink and return zero
+	CUpDownClient * GetClientChecked();
+	// Check if client was deleted, if yes unlink
+	CClientRef&		GetRef();
+
+	void Safe_Delete();
+
+// Wrapper methods
+	void				ClearUploadFileID() const;		// only wrapper const
+	uint32				ECID() const;
+	bool				ExtProtocolAvailable() const;
+	uint16				GetAvailablePartCount() const;
+	const wxString&		GetClientFilename() const;
+	const wxString&		GetClientModString() const;
+	const wxString&		GetClientOSInfo() const;
+	uint8				GetClientSoft() const;
+	const wxString&		GetClientVerString() const;
+	uint64				GetDownloadedTotal() const;
+	uint8				GetDownloadState() const;
+	CFriend*			GetFriend() const;
+	bool				GetFriendSlot() const;
+	wxString			GetFullIP() const;
+	uint16				GetKadPort() const;
+	float				GetKBpsDown() const;
+	uint32				GetIP() const;
+	uint16				GetLastDownloadingPart() const;
+	uint16				GetNextRequestedPart() const;
+	uint8				GetObfuscationStatus() const;
+	uint16				GetOldRemoteQueueRank() const;
+	const BitVector&	GetPartStatus() const;
+	uint16				GetRemoteQueueRank() const;
+	CPartFile*			GetRequestFile() const;
+	uint32				GetScore() const;
+	double 				GetScoreRatio() const;
+	uint32				GetServerIP() const;
+	const wxString		GetServerName() const;
+	uint16				GetServerPort() const;
+	const wxString&		GetSoftStr() const;
+	const wxString&		GetSoftVerStr() const;
+	int					GetSourceFrom() const;	// ESourceFrom
+	wxString			GetSecureIdentTextStatus() const;
+	uint64				GetTransferredDown() const;
+	uint64				GetTransferredUp() const;
+	uint16				GetUDPPort() const;
+	uint32				GetUploadDatarate() const;
+	uint64				GetUploadedTotal() const;
+	const CKnownFile*	GetUploadFile() const;
+	uint16				GetUploadQueueWaitingPosition() const;
+	uint8				GetUploadState() const;
+	size_t				GetUpPartCount() const;
+	const CMD4Hash&		GetUserHash() const;
+	uint32				GetUserIDHybrid() const;
+	const wxString&		GetUserName() const;
+	uint16_t			GetUserPort() const;
+	uint32				GetVersion() const;
+	bool				HasDisabledSharedFiles() const;
+	bool				HasLowID() const;
+	bool				IsBadGuy() const;
+	bool				IsFriend() const;
+	bool				IsIdentified() const;
+	bool				IsRemoteQueueFull() const;
+	bool				IsUpPartAvailable(uint16 iPart) const;
+	void				RequestSharedFileList() const;
+	void				SetCommentDirty(bool bDirty = true) const;		// only wrapper const
+	void				SetFriend(CFriend* newfriend) const;			// only wrapper const
+	void				SetFriendSlot(bool bNV) const;					// only wrapper const
+	bool				SwapToAnotherFile(bool bIgnoreNoNeeded, bool ignoreSuspensions, bool bRemoveCompletely, CPartFile* toFile = NULL) const;	// only wrapper const
+
+};
+
+// efficient std::swap for it
+namespace std
+{
+    template<> inline void swap(CClientRef& a, CClientRef& b)
+	{
+		a.swap(b);
+	}
+}
+
+
+typedef std::list<CClientRef> CClientRefList;
+typedef std::set<CClientRef>  CClientRefSet;
+
+
+#endif
+

aMule-2.2.6.tar.bz2/src/ClientTCPSocket.cpp -> aMule-2.3.1.tar.bz2/src/ClientTCPSocket.cpp Changed

@@ -1,9 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
-//
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
 // respective authors.
@@ -77,7 +76,14 @@
 
 void CClientTCPSocketHandler::ClientTCPSocketHandler(wxSocketEvent& event)
 {
-	CClientTCPSocket *socket = dynamic_cast<CClientTCPSocket *>(event.GetSocket());
+	wxSocketBase* baseSocket = event.GetSocket();
+//	wxASSERT(baseSocket);	// Rather want a log message right now. Enough other wx problems. >:(
+	if (!baseSocket) {		// WTF?
+		AddDebugLogLineN(logClient, wxT("received bad wxSocketEvent"));
+		return;
+	}
+
+	CClientTCPSocket *socket = dynamic_cast<CClientTCPSocket *>(baseSocket);
 	wxASSERT(socket);
 	if (!socket) {
 		return;
@@ -103,7 +109,7 @@
 			break;
 		default:
 			// Nothing should arrive here...
-			wxASSERT(0);
+			wxFAIL;
 			break;
 	}
 }
@@ -170,13 +176,13 @@
 	MULE_CHECK(m_remoteip, false);
 
 	if (theApp->ipfilter->IsFiltered(m_remoteip)) {
-		AddDebugLogLineM(false, logClient, wxT("Denied connection from ") + addr.IPAddress() + wxT("(Filtered IP)"));
+		AddDebugLogLineN(logClient, wxT("Denied connection from ") + addr.IPAddress() + wxT("(Filtered IP)"));
 		return false;
 	} else if (theApp->clientlist->IsBannedClient(m_remoteip)) {
-		AddDebugLogLineM(false, logClient, wxT("Denied connection from ") + addr.IPAddress() + wxT("(Banned IP)"));
+		AddDebugLogLineN(logClient, wxT("Denied connection from ") + addr.IPAddress() + wxT("(Banned IP)"));
 		return false;
 	} else {
-		AddDebugLogLineM(false, logClient, wxT("Accepted connection from ") + addr.IPAddress());
+		AddDebugLogLineN(logClient, wxT("Accepted connection from ") + addr.IPAddress());
 		return true;
 	}
 }
@@ -237,7 +243,7 @@
 	wxASSERT(theApp->listensocket->IsValidSocket(this));
 	CEMSocket::OnClose(nErrorCode);
 	if (nErrorCode) {
-		Disconnect(wxString::Format(wxT("Closed: %u"), nErrorCode));
+		Disconnect(CFormat(wxT("Closed: %u")) % nErrorCode);
 	} else {
 		Disconnect(wxT("Close"));
 	}
@@ -266,6 +272,12 @@
 
 void CClientTCPSocket::Safe_Delete()
 {
+	// More paranoia - make sure client is unlinked in any case
+	if (m_client) {
+		m_client->SetSocket( NULL );
+		m_client = NULL;
+	}
+
 	if ( !ForDeletion() && !OnDestroy() ) {
 		// Paranoia is back.
 		SetNotify(0);
@@ -273,11 +285,6 @@
 		// lfroen: first of all - stop handler
 		m_ForDeletion = true;
 
-		if (m_client) {
-			m_client->SetSocket( NULL );
-			m_client = NULL;
-		}
-		
 		byConnected = ES_DISCONNECTED;
 		Close(); // Destroy is suposed to call Close(), but.. it doesn't hurt.
 		Destroy();
@@ -285,6 +292,15 @@
 }
 
 
+void CClientTCPSocket::Safe_Delete_Client()
+{
+	if (m_client) {
+		m_client->Safe_Delete();
+		m_client = NULL;
+	}
+}
+
+
 bool CClientTCPSocket::ProcessPacket(const byte* buffer, uint32 size, uint8 opcode)
 {
 	#ifdef __PACKET_RECV_DUMP__
@@ -294,12 +310,12 @@
 	if (!m_client && opcode != OP_HELLO) {
 		throw wxString(wxT("Asks for something without saying hello"));
 	} else if (m_client && opcode != OP_HELLO && opcode != OP_HELLOANSWER) {
-		m_client->CheckHandshakeFinished(OP_EDONKEYPROT, opcode);
+		m_client->CheckHandshakeFinished();
 	}
 	
 	switch(opcode) {
 		case OP_HELLOANSWER: {	// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_HELLOANSWER from ") + m_client->GetFullIP());
+			AddDebugLogLineN(logRemoteClient, wxT("Remote Client: OP_HELLOANSWER from ") + m_client->GetFullIP());
 			theStats::AddDownOverheadOther(size);
 			m_client->ProcessHelloAnswer(buffer, size);
 
@@ -317,7 +333,7 @@
 			
 			// Socket might die on ConnectionEstablished somehow. Check it.
 			if (m_client) {					
-				Notify_UploadCtrlRefreshClient( m_client );
+				Notify_SharedCtrlRefreshClient( m_client->ECID() , AVAILABLE_SOURCE);
 			}
 			
 			break;
@@ -332,7 +348,7 @@
 			}
 			
 			// Do not move up!
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_HELLO from ") + m_client->GetFullIP() );
+			AddDebugLogLineN(logRemoteClient, wxT("Remote Client: OP_HELLO from ") + m_client->GetFullIP() );
 			
 			bool bIsMuleHello = false;
 			
@@ -350,7 +366,7 @@
 			if (thePrefs::ParanoidFilter() && !IsLowID(m_client->GetUserIDHybrid()) && (GetRemoteIP() != wxUINT32_SWAP_ALWAYS(m_client->GetUserIDHybrid()))) {
 				wxString reason = wxT("Client claims a different IP from the one we received the hello packet from: ");
 				reason += Uint32toStringIP(wxUINT32_SWAP_ALWAYS(m_client->GetUserIDHybrid())) + wxT(" / ") + Uint32toStringIP(GetRemoteIP());
-				AddDebugLogLineM(false, logClient, reason);
+				AddDebugLogLineN(logClient, reason);
 				if (bNewClient) {
 					m_client->Safe_Delete();
 					m_client = NULL;
@@ -371,7 +387,7 @@
 					
 			wxASSERT(m_client);
 			
-			// now we check if we now this client already. if yes this socket will
+			// now we check if we know this client already. if yes this socket will
 			// be attached to the known client, the new client will be deleted
 			// and the var. "client" will point to the known client.
 			// if not we keep our new-constructed client ;)
@@ -382,7 +398,7 @@
 				theApp->clientlist->AddClient(m_client);
 				m_client->SetCommentDirty();
 			}
-			Notify_UploadCtrlRefreshClient( m_client );
+			Notify_SharedCtrlRefreshClient( m_client->ECID(), AVAILABLE_SOURCE );
 			// send a response packet with standart informations
 			if ((m_client->GetHashType() == SO_EMULE) && !bIsMuleHello) {
 				m_client->SendMuleInfoPacket(false);				
@@ -413,7 +429,7 @@
 			break;
 		}
 		case OP_REQUESTFILENAME: {	// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_REQUESTFILENAME from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_REQUESTFILENAME from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 			// IP banned, no answer for this request
@@ -460,7 +476,7 @@
 				
 				CPacket* packet = new CPacket(data_out, OP_EDONKEYPROT, OP_REQFILENAMEANSWER);
 				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_REQFILENAMEANSWER to ") + m_client->GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_REQFILENAMEANSWER to ") + m_client->GetFullIP() );
 				SendPacket(packet,true);
 
 				// SendPacket might kill the socket, so check
@@ -473,7 +489,7 @@
 			break;  
 		}
 		case OP_SETREQFILEID: {	// 0.43b EXCEPT track of bad clients
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_SETREQFILEID from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_SETREQFILEID from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 			
@@ -495,7 +511,7 @@
 						CPacket* replypacket = new CPacket(OP_FILEREQANSNOFIL, 16, OP_EDONKEYPROT);
 						replypacket->Copy16ToDataBuffer(fileID.GetHash());
 						theStats::AddUpOverheadFileRequest(replypacket->GetPacketSize());
-						AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_FILERE to ") + m_client->GetFullIP() );
+						AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_FILERE to ") + m_client->GetFullIP() );
 						SendPacket(replypacket, true);
 						break;
 					}
@@ -517,7 +533,7 @@
 				}
 				CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_FILESTATUS);
 				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_FILESTATUS to ") + m_client->GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_FILESTATUS to ") + m_client->GetFullIP() );
 				SendPacket(packet, true);
 				break;
 			}
@@ -527,7 +543,7 @@
 		}			
 		
 		case OP_FILEREQANSNOFIL: {	// 0.43b protocol, lacks ZZ's download manager on swap
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_FILEREQANSNOFIL from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_FILEREQANSNOFIL from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 			if (size == 16) {
@@ -556,7 +572,7 @@
 		}
 		
 		case OP_REQFILENAMEANSWER: {	// 0.43b except check for bad clients
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_REQFILENAMEANSWER from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_REQFILENAMEANSWER from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 			CMemFile data(buffer, size);
@@ -567,7 +583,7 @@
 		}
 		
 		case OP_FILESTATUS: {		// 0.43b except check for bad clients
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_FILESTATUS from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_FILESTATUS from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 			CMemFile data(buffer, size);
@@ -578,11 +594,11 @@
 		}
 		
 		case OP_STARTUPLOADREQ: {
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_STARTUPLOADREQ from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_STARTUPLOADREQ from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 		
-			if (!m_client->CheckHandshakeFinished(OP_EDONKEYPROT, opcode)) {
+			if (!m_client->CheckHandshakeFinished()) {
 				break;
 			}
 			
@@ -610,7 +626,7 @@
 		}
 		
 		case OP_QUEUERANK: {	// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_QUEUERANK from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_QUEUERANK from ") + m_client->GetFullIP() );
 			 
 			theStats::AddDownOverheadFileRequest(size);
 			CMemFile data(buffer, size);
@@ -621,7 +637,7 @@
 		}
 		
 		case OP_ACCEPTUPLOADREQ: {	// 0.42e (xcept khaos stats)
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_ACCEPTUPLOADREQ from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_ACCEPTUPLOADREQ from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 			if (m_client->GetRequestFile() && !m_client->GetRequestFile()->IsStopped() && (m_client->GetRequestFile()->GetStatus()==PS_READY || m_client->GetRequestFile()->GetStatus()==PS_EMPTY)) {
@@ -634,7 +650,7 @@
 				if (!m_client->GetSentCancelTransfer()) {
 					CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
 					theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-					AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + m_client->GetFullIP() );
+					AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + m_client->GetFullIP() );
 					m_client->SendPacket(packet,true,true);
 					
 					// SendPacket can cause the socket to die, so check
@@ -649,7 +665,7 @@
 		}
 		
 		case OP_REQUESTPARTS: {		// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_REQUESTPARTS from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_REQUESTPARTS from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 
@@ -659,31 +675,27 @@
 		}
 		
 		case OP_CANCELTRANSFER: {		// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_CANCELTRANSFER from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_CANCELTRANSFER from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 			theApp->uploadqueue->RemoveFromUploadQueue(m_client);
-			if ( CLogger::IsEnabled( logClient ) ) {
-				AddDebugLogLineM( false, logClient, m_client->GetUserName() + wxT(": Upload session ended due canceled transfer."));
-			}
+			AddDebugLogLineN( logClient, m_client->GetUserName() + wxT(": Upload session ended due canceled transfer."));
 			break;
 		}
 		
 		case OP_END_OF_DOWNLOAD: { // 0.43b except check for bad clients
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_END_OF_DOWNLOAD from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_END_OF_DOWNLOAD from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 			if (size>=16 && m_client->GetUploadFileID() == CMD4Hash(buffer)) {
 				theApp->uploadqueue->RemoveFromUploadQueue(m_client);
-				if ( CLogger::IsEnabled( logClient ) ) {
-					AddDebugLogLineM( false, logClient, m_client->GetUserName() + wxT(": Upload session ended due ended transfer."));
-				}
+				AddDebugLogLineN( logClient, m_client->GetUserName() + wxT(": Upload session ended due ended transfer."));
 			}
 			break;
 		}
 		
 		case OP_HASHSETREQUEST: {		// 0.43b except check for bad clients
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_HASHSETREQUEST from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_HASHSETREQUEST from ") + m_client->GetFullIP() );
 			
 			
 			theStats::AddDownOverheadFileRequest(size);
@@ -695,7 +707,7 @@
 		}
 		
 		case OP_HASHSETANSWER: {		// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_HASHSETANSWER from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_HASHSETANSWER from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 			m_client->ProcessHashSet(buffer, size);
@@ -703,7 +715,7 @@
 		}
 		
 		case OP_SENDINGPART: {		// 0.47a
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_SENDINGPART from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_SENDINGPART from ") + m_client->GetFullIP() );
 			
 			if (	 m_client->GetRequestFile() && 
 				!m_client->GetRequestFile()->IsStopped() && 
@@ -718,7 +730,7 @@
 					if (!m_client->GetSentCancelTransfer()) {
 						CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
 						theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-						AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + m_client->GetFullIP() );
+						AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + m_client->GetFullIP() );
 						m_client->SendPacket(packet,true,true);
 						
 						// Socket might die because of SendPacket, so check
@@ -733,7 +745,7 @@
 				if (!m_client->GetSentCancelTransfer()) {
 					CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
 					theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-					AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + m_client->GetFullIP() );
+					AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + m_client->GetFullIP() );
 					m_client->SendPacket(packet,true,true);
 					
 					// Socket might die because of SendPacket, so check
@@ -745,7 +757,7 @@
 		}
 		
 		case OP_OUTOFPARTREQS: {	// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_OUTOFPARTREQS from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_OUTOFPARTREQS from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 			if (m_client->GetDownloadState() == DS_DOWNLOADING) {
@@ -755,7 +767,7 @@
 		}
 		
 		case OP_CHANGE_CLIENT_ID: { 	// Kad reviewed
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_CHANGE_CLIENT_ID from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_CHANGE_CLIENT_ID from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadOther(size);
 			CMemFile data(buffer, size);
@@ -782,7 +794,7 @@
 		}					
 		
 		case OP_CHANGE_SLOT:{	// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_CHANGE_SLOT from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_CHANGE_SLOT from ") + m_client->GetFullIP() );
 			
 			// sometimes sent by Hybrid
 			theStats::AddDownOverheadOther(size);
@@ -790,25 +802,36 @@
 		}			
 		
 		case OP_MESSAGE: {		// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_MESSAGE from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_MESSAGE from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadOther(size);
 			
+			if (size < 2) {
+				throw wxString(wxT("invalid message packet"));
+			}
 			CMemFile message_file(buffer, size);
-
-			wxString message = message_file.ReadString((m_client->GetUnicodeSupport() != utf8strNone));
-			if (IsMessageFiltered(message, m_client)) {
-				AddLogLineM( true, CFormat(_("Message filtered from '%s' (IP:%s)")) % m_client->GetUserName() % m_client->GetFullIP());
-			} else {
-				AddLogLineM( true, CFormat(_("New message from '%s' (IP:%s)")) % m_client->GetUserName() % m_client->GetFullIP());
-				
-				Notify_ChatProcessMsg(GUI_ID(m_client->GetIP(),m_client->GetUserPort()), m_client->GetUserName() + wxT("|") + message);
+			uint16 length = message_file.ReadUInt16();
+			if (length + 2u != size) {
+				throw wxString(wxT("invalid message packet"));
 			}
+
+			// limit message length
+			static const uint16 MAX_CLIENT_MSG_LEN = 450;
+
+			if (length > MAX_CLIENT_MSG_LEN) {
+				AddDebugLogLineN(logRemoteClient, CFormat(wxT("Message from '%s' (IP:%s) exceeds limit by %u chars, truncated."))
+					% m_client->GetUserName() % m_client->GetFullIP() % (length - MAX_CLIENT_MSG_LEN));
+				length = MAX_CLIENT_MSG_LEN;
+			}					
+
+			wxString message = message_file.ReadOnlyString((m_client->GetUnicodeSupport() != utf8strNone), length);
+			m_client->ProcessChatMessage(message);
+
 			break;
 		}
 		
 		case OP_ASKSHAREDFILES:	{	// 0.43b (well, er, it does the same, but in our own way)
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_ASKSHAREDFILES from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_ASKSHAREDFILES from ") + m_client->GetFullIP() );
 			
 			// client wants to know what we have in share, let's see if we allow him to know that
 			theStats::AddDownOverheadOther(size);
@@ -818,7 +841,7 @@
 			}
 			
 			if (thePrefs::CanSeeShares() == vsfaEverybody || (thePrefs::CanSeeShares() == vsfaFriends && m_client->IsFriend())) {
-				AddLogLineM( true, CFormat( _("User %s (%u) requested your sharedfiles-list -> Accepted"))
+				AddLogLineC(CFormat( _("User %s (%u) requested your sharedfiles-list -> Accepted"))
 					% m_client->GetUserName() 
 					% m_client->GetUserIDHybrid() );
 				
@@ -829,23 +852,23 @@
 				tempfile.WriteUInt32(list.size());
 				for (unsigned i = 0; i < list.size(); ++i) {
 					if (!list[i]->IsLargeFile() || m_client->SupportsLargeFiles()) {
-						theApp->sharedfiles->CreateOfferedFilePacket(list[i], &tempfile, NULL, m_client);
+						list[i]->CreateOfferedFilePacket(&tempfile, NULL, m_client);
 					}
 				}
 				
 				// create a packet and send it
 				CPacket* replypacket = new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDFILESANSWER);
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ASKSHAREDFILESANSWER to ") + m_client->GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ASKSHAREDFILESANSWER to ") + m_client->GetFullIP() );
 				theStats::AddUpOverheadOther(replypacket->GetPacketSize());
 				SendPacket(replypacket, true, true);
 			} else {
-				AddLogLineM( true, CFormat( _("User %s (%u) requested your sharedfiles-list -> Denied"))
+				AddLogLineC(CFormat( _("User %s (%u) requested your sharedfiles-list -> Denied"))
 					% m_client->GetUserName() 
 					% m_client->GetUserIDHybrid() );
 			
 				CPacket* replypacket = new CPacket(OP_ASKSHAREDDENIEDANS, 0, OP_EDONKEYPROT);
 				theStats::AddUpOverheadOther(replypacket->GetPacketSize());
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ASKSHAREDDENIEDANS to ") + m_client->GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ASKSHAREDDENIEDANS to ") + m_client->GetFullIP() );
 				SendPacket(replypacket, true, true);				
 			}
 
@@ -853,7 +876,7 @@
 		}
 		
 		case OP_ASKSHAREDFILESANSWER: {	// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_ASKSHAREDFILESANSWER from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_ASKSHAREDFILESANSWER from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadOther(size);
 			wxString EmptyStr;
@@ -862,7 +885,7 @@
 		}
 		
 		case OP_ASKSHAREDDIRS: { 		// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_ASKSHAREDDIRS from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_ASKSHAREDDIRS from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadOther(size);
 			wxASSERT( size == 0 );
@@ -871,53 +894,19 @@
 				break;
 			}
 			if ((thePrefs::CanSeeShares()==vsfaEverybody) || ((thePrefs::CanSeeShares()==vsfaFriends) && m_client->IsFriend())) {
-				AddLogLineM( true, CFormat( _("User %s (%u) requested your shareddirectories-list -> Accepted") )
+				AddLogLineC(CFormat( _("User %s (%u) requested your shareddirectories-list -> Accepted") )
 					% m_client->GetUserName()
-					% m_client->GetUserIDHybrid() );
-
-				// This list will contain all (unique) folders.
-				std::list<CPath> foldersToSend;
-			   
-				// The shared folders
-				const unsigned folderCount = theApp->glob_prefs->shareddir_list.size();
-				for (unsigned i = 0; i < folderCount; ++i) {
-					foldersToSend.push_back(theApp->glob_prefs->shareddir_list[i]);
-				}
-				
-				// ... the categories folders ... (category 0 -> incoming)
-				for (unsigned i = 0; i < theApp->glob_prefs->GetCatCount(); ++i) {
-					foldersToSend.push_back(theApp->glob_prefs->GetCategory(i)->path);
-				}
-	
-				// ... and the Magic thing from the eDonkey Hybrids...
-				foldersToSend.push_back(CPath(OP_INCOMPLETE_SHARED_FILES));
-
-				// Strip duplicates
-				foldersToSend.sort();
-				foldersToSend.unique();
-				
-				// Send packet.
-				CMemFile tempfile(80);
-				tempfile.WriteUInt32(foldersToSend.size());
-
-				std::list<CPath>::iterator it = foldersToSend.begin();
-				for (; it != foldersToSend.end(); ++it) {
-					// We need to send the 'raw' filename, so we can recognize it again.
-					tempfile.WriteString(it->GetRaw(), m_client->GetUnicodeSupport());
-				}
-
-				CPacket* replypacket = new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDDIRSANS);
-				theStats::AddUpOverheadOther(replypacket->GetPacketSize());
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ASKSHAREDDIRSANS to ") + m_client->GetFullIP() );
-				SendPacket(replypacket, true, true);
+ 					% m_client->GetUserIDHybrid() );
+				// send the list of shared directories
+				m_client->SendSharedDirectories();
 			} else {
-				AddLogLineM( true, CFormat( _("User %s (%u) requested your shareddirectories-list -> Denied") )
+				AddLogLineC(CFormat( _("User %s (%u) requested your shareddirectories-list -> Denied") )
 					% m_client->GetUserName()
 					% m_client->GetUserIDHybrid() );
 
 				CPacket* replypacket = new CPacket(OP_ASKSHAREDDENIEDANS, 0, OP_EDONKEYPROT);
 				theStats::AddUpOverheadOther(replypacket->GetPacketSize());
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ASKSHAREDDENIEDANS to ") + m_client->GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ASKSHAREDDENIEDANS to ") + m_client->GetFullIP() );
 				SendPacket(replypacket, true, true);
 			}
 
@@ -925,7 +914,7 @@
 		}
 		
 		case OP_ASKSHAREDFILESDIR: {	// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_ASKSHAREDFILESDIR from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_ASKSHAREDFILESDIR from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadOther(size);
 			// IP banned, no answer for this request
@@ -936,55 +925,23 @@
 										
 			wxString strReqDir = data.ReadString((m_client->GetUnicodeSupport() != utf8strNone));
 			if (thePrefs::CanSeeShares()==vsfaEverybody || (thePrefs::CanSeeShares()==vsfaFriends && m_client->IsFriend())) {
-				AddLogLineM( true, CFormat(_("User %s (%u) requested your sharedfiles-list for directory %s -> accepted")) % m_client->GetUserName() % m_client->GetUserIDHybrid() % strReqDir);
+				AddLogLineC(CFormat(_("User %s (%u) requested your sharedfiles-list for directory '%s' -> accepted")) % m_client->GetUserName() % m_client->GetUserIDHybrid() % strReqDir);
 				wxASSERT( data.GetPosition() == data.GetLength() );
-				
-				CKnownFilePtrList list;
-				
-				if (strReqDir == OP_INCOMPLETE_SHARED_FILES) {
-					// get all shared files from download queue
-					int iQueuedFiles = theApp->downloadqueue->GetFileCount();
-					for (int i = 0; i < iQueuedFiles; i++) {
-						CPartFile* pFile = theApp->downloadqueue->GetFileByIndex(i);
-						if (pFile == NULL || pFile->GetStatus(true) != PS_READY) {
-							continue;
-						}
-						
-						list.push_back(pFile);
-					}
-				} else {
-					theApp->sharedfiles->GetSharedFilesByDirectory(strReqDir, list);
-				}
-
-				CMemFile tempfile(80);
-				tempfile.WriteString(strReqDir, m_client->GetUnicodeSupport());
-				tempfile.WriteUInt32(list.size());
-				
-				while (!list.empty()) {
-					if (!list.front()->IsLargeFile() || m_client->SupportsLargeFiles()) {
-						theApp->sharedfiles->CreateOfferedFilePacket(list.front(), &tempfile, NULL, m_client);
-					}
-					
-					list.pop_front();
-				}
-				
-				CPacket* replypacket = new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDFILESDIRANS);
-				theStats::AddUpOverheadOther(replypacket->GetPacketSize());
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ASKSHAREDFILESDIRANS to ") + m_client->GetFullIP() );
-				SendPacket(replypacket, true, true);
+				// send the list of shared files for the requested directory
+				m_client->SendSharedFilesOfDirectory(strReqDir);
 			} else {
-				AddLogLineM( true, CFormat(_("User %s (%u) requested your sharedfiles-list for directory %s -> denied")) % m_client->GetUserName() % m_client->GetUserIDHybrid() % strReqDir);
+				AddLogLineC(CFormat(_("User %s (%u) requested your sharedfiles-list for directory '%s' -> denied")) % m_client->GetUserName() % m_client->GetUserIDHybrid() % strReqDir);
 				
 				CPacket* replypacket = new CPacket(OP_ASKSHAREDDENIEDANS, 0, OP_EDONKEYPROT);
 				theStats::AddUpOverheadOther(replypacket->GetPacketSize());
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ASKSHAREDDENIEDANS to ") + m_client->GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ASKSHAREDDENIEDANS to ") + m_client->GetFullIP() );
 				SendPacket(replypacket, true, true);
 			}
 			break;
 		}		
 		
 		case OP_ASKSHAREDDIRSANS:{		// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_ASKSHAREDDIRSANS from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_ASKSHAREDDIRSANS from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadOther(size);
 			if (m_client->GetFileListRequested() == 1){
@@ -992,7 +949,7 @@
 				uint32 uDirs = data.ReadUInt32();
 				for (uint32 i = 0; i < uDirs; i++){
 					wxString strDir = data.ReadString((m_client->GetUnicodeSupport() != utf8strNone));
-					AddLogLineM( true, CFormat( _("User %s (%u) shares directory %s") )
+					AddLogLineC(CFormat( _("User %s (%u) shares directory '%s'") )
 						% m_client->GetUserName()
 						% m_client->GetUserIDHybrid()
 						% strDir );
@@ -1001,13 +958,13 @@
 					tempfile.WriteString(strDir, m_client->GetUnicodeSupport());
 					CPacket* replypacket = new CPacket(tempfile, OP_EDONKEYPROT, OP_ASKSHAREDFILESDIR);
 					theStats::AddUpOverheadOther(replypacket->GetPacketSize());
-					AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ASKSHAREDFILESD to ") + m_client->GetFullIP() );
+					AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ASKSHAREDFILESDIR to ") + m_client->GetFullIP() );
 					SendPacket(replypacket, true, true);
 				}
 				wxASSERT( data.GetPosition() == data.GetLength() );
 				m_client->SetFileListRequested(uDirs);
 			} else {
-				AddLogLineM( true, CFormat( _("User %s (%u) sent unrequested shared dirs.") )
+				AddLogLineC(CFormat( _("User %s (%u) sent unrequested shared dirs.") )
 					% m_client->GetUserName() 
 					% m_client->GetUserIDHybrid() );
 			}
@@ -1015,26 +972,26 @@
 		}
   
 		case OP_ASKSHAREDFILESDIRANS: {		// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_ASKSHAREDFILESDIRANS from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_ASKSHAREDFILESDIRANS from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadOther(size);
 			CMemFile data(buffer, size);
 			wxString strDir = data.ReadString((m_client->GetUnicodeSupport() != utf8strNone));
 
 			if (m_client->GetFileListRequested() > 0){
-				AddLogLineM( true, CFormat( _("User %s (%u) sent sharedfiles-list for directory %s") )
+				AddLogLineC(CFormat( _("User %s (%u) sent sharedfiles-list for directory '%s'") )
 					% m_client->GetUserName()
 					% m_client->GetUserIDHybrid()
 					% strDir );
 				
 				m_client->ProcessSharedFileList(buffer + data.GetPosition(), size - data.GetPosition(), strDir);
 				if (m_client->GetFileListRequested() == 0) {
-					AddLogLineM( true, CFormat( _("User %s (%u) finished sending sharedfiles-list") )
+					AddLogLineC(CFormat( _("User %s (%u) finished sending sharedfiles-list") )
 						% m_client->GetUserName()
 						% m_client->GetUserIDHybrid() );
 				}
 			} else {
-				AddLogLineM( true, CFormat( _("User %s (%u) sent unwanted sharedfiles-list") )
+				AddLogLineC(CFormat( _("User %s (%u) sent unwanted sharedfiles-list") )
 					% m_client->GetUserName()
 					% m_client->GetUserIDHybrid() );
 			}
@@ -1042,11 +999,11 @@
 		}
 		
 		case OP_ASKSHAREDDENIEDANS:
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_ASKSHAREDDENIEDANS from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_ASKSHAREDDENIEDANS from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadOther(size);
 			wxASSERT( size == 0 );
-			AddLogLineM( true, CFormat( _("User %s (%u) denied access to shared directories/files list") )
+			AddLogLineC(CFormat( _("User %s (%u) denied access to shared directories/files list") )
 				% m_client->GetUserName()
 				% m_client->GetUserIDHybrid() );
 					
@@ -1055,7 +1012,7 @@
 		
 		default:
 			theStats::AddDownOverheadOther(size);
-			AddDebugLogLineM( false, logRemoteClient, wxString::Format(wxT("Edonkey packet: unknown opcode: %i %x from "), opcode, opcode) + m_client->GetFullIP());
+			AddDebugLogLineN(logRemoteClient, CFormat(wxT("Edonkey packet: unknown opcode: %i %x from %s")) % opcode % opcode % m_client->GetFullIP());
 			return false;
 	}
 	
@@ -1075,17 +1032,17 @@
 		throw wxString(wxT("Unknown clients sends extended protocol packet"));
 	}
 	/*
-	if (!client->CheckHandshakeFinished(OP_EMULEPROT, opcode)) {
-		// Here comes a extended packet without finishing the hanshake.
+	if (!client->CheckHandshakeFinished()) {
+		// Here comes an extended packet without finishing the handshake.
 		// IMHO, we should disconnect the client.
 		throw wxString(wxT("Client send extended packet before finishing handshake"));
 	}
 	*/
 	switch(opcode) {
 		case OP_MULTIPACKET_EXT:
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_MULTIPACKET_EXT from ") + m_client->GetFullIP());
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_MULTIPACKET_EXT from ") + m_client->GetFullIP());
 		case OP_MULTIPACKET: {	
-			if (opcode == OP_MULTIPACKET) AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_MULTIPACKET from ") + m_client->GetFullIP() );
+			if (opcode == OP_MULTIPACKET) AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_MULTIPACKET from ") + m_client->GetFullIP() );
 
 			theStats::AddDownOverheadFileRequest(size);
 
@@ -1093,8 +1050,8 @@
 				break;
 			}
 
-			if (!m_client->CheckHandshakeFinished(OP_EMULEPROT, opcode)) {
-				// Here comes a extended packet without finishing the hanshake.
+			if (!m_client->CheckHandshakeFinished()) {
+				// Here comes an extended packet without finishing the handshake.
 				// IMHO, we should disconnect the client.
 				throw wxString(wxT("Client send OP_MULTIPACKET before finishing handshake"));
 			}
@@ -1108,18 +1065,18 @@
 			if ( reqfile == NULL ){
 				reqfile = theApp->downloadqueue->GetFileByID(reqfilehash);
 				if ( !( reqfile != NULL && reqfile->GetFileSize() > PARTSIZE ) ) {
-					AddDebugLogLineM(false, logRemoteClient, wxT("Remote client asked for a non-shared file"));
+					AddDebugLogLineN(logRemoteClient, wxT("Remote client asked for a non-shared file"));
 					file_not_found = true;
 				}
 			}
 			
 			if (!file_not_found && reqfile->IsLargeFile() && !m_client->SupportsLargeFiles()) {
-				AddDebugLogLineM(false, logRemoteClient, wxT("Remote client asked for a large file but doesn't support them"));
+				AddDebugLogLineN(logRemoteClient, wxT("Remote client asked for a large file but doesn't support them"));
 				file_not_found = true;
 			}				
 			
 			if (!file_not_found && nSize && (reqfile->GetFileSize() != nSize)) {
-				AddDebugLogLineM(false, logRemoteClient, wxT("Remote client asked for a file but specified wrong size"));
+				AddDebugLogLineN(logRemoteClient, wxT("Remote client asked for a file but specified wrong size"));
 				file_not_found = true;
 			}
 
@@ -1127,7 +1084,7 @@
 				CPacket* replypacket = new CPacket(OP_FILEREQANSNOFIL, 16, OP_EDONKEYPROT);
 				replypacket->Copy16ToDataBuffer(reqfilehash.GetHash());
 				theStats::AddUpOverheadFileRequest(replypacket->GetPacketSize());
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_FILEREQANSNOFIL to ") + m_client->GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_FILEREQANSNOFIL to ") + m_client->GetFullIP() );
 				SendPacket(replypacket, true);
 				break;				
 			}
@@ -1156,7 +1113,7 @@
 				uint8 opcode_in = data_in.ReadUInt8();
 				switch(opcode_in) {
 					case OP_REQUESTFILENAME: {
-						AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_MULTIPACKET has OP_REQUESTFILENAME") );
+						AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_MULTIPACKET has OP_REQUESTFILENAME") );
 						m_client->ProcessExtendedInfo(&data_in, reqfile);
 						data_out.WriteUInt8(OP_REQFILENAMEANSWER);
 						
@@ -1166,7 +1123,7 @@
 						break;
 					}
 					case OP_AICHFILEHASHREQ: {
-						AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_MULTIPACKET has OP_AICHFILEHASHANS") );
+						AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_MULTIPACKET has OP_AICHFILEHASHANS") );
 						if (m_client->IsSupportingAICH() && reqfile->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE
 							&& reqfile->GetAICHHashset()->HasValidMasterHash())
 						{
@@ -1176,7 +1133,7 @@
 						break;
 					}						
 					case OP_SETREQFILEID: {
-						AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_MULTIPACKET has OP_SETREQFILEID") );
+						AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_MULTIPACKET has OP_SETREQFILEID") );
 						data_out.WriteUInt8(OP_FILESTATUS);
 						if (reqfile->IsPartFile()) {
 							((CPartFile*)reqfile)->WritePartStatus(&data_out);
@@ -1189,7 +1146,7 @@
 					//We could send it within this packet.. If agreeded, I will fix it..
 					case OP_REQUESTSOURCES2:
 					case OP_REQUESTSOURCES: {
-						AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_MULTIPACKET has OP_REQUESTSOURCES(2)") );
+						AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_MULTIPACKET has OP_REQUESTSOURCES(2)") );
 						uint8 byRequestedVersion = 0;
 						uint16 byRequestedOptions = 0;
 						if (opcode_in == OP_REQUESTSOURCES2){ // SX2 requests contains additional data
@@ -1216,7 +1173,7 @@
 								CPacket* tosend = reqfile->CreateSrcInfoPacket(m_client, byRequestedVersion, byRequestedOptions);
 								if(tosend) {
 									theStats::AddUpOverheadSourceExchange(tosend->GetPacketSize());
-									AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ANSWERSOURCES to ") + m_client->GetFullIP() );
+									AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ANSWERSOURCES to ") + m_client->GetFullIP() );
 									SendPacket(tosend, true);
 								}
 							}
@@ -1229,14 +1186,14 @@
 			if( data_out.GetLength() > 16 ) {
 				CPacket* reply = new CPacket(data_out, OP_EMULEPROT, OP_MULTIPACKETANSWER);
 				theStats::AddUpOverheadFileRequest(reply->GetPacketSize());
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_MULTIPACKETANSWER to ") + m_client->GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_MULTIPACKETANSWER to ") + m_client->GetFullIP() );
 				SendPacket(reply, true);
 			}
 			break;
 		}
 
 		case OP_MULTIPACKETANSWER: {	// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_MULTIPACKETANSWER from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_MULTIPACKETANSWER from ") + m_client->GetFullIP() );
 			
 			theStats::AddDownOverheadFileRequest(size);
 
@@ -1244,12 +1201,12 @@
 				break;
 			}
 
-			if( m_client->GetKadPort() ) {
-				Kademlia::CKademlia::Bootstrap(wxUINT32_SWAP_ALWAYS(m_client->GetIP()), m_client->GetKadPort(), m_client->GetKadVersion() > 1);
+			if (m_client->GetKadPort() && m_client->GetKadVersion() > 1) {
+				Kademlia::CKademlia::Bootstrap(wxUINT32_SWAP_ALWAYS(m_client->GetIP()), m_client->GetKadPort());
 			}
 
- 			if (!m_client->CheckHandshakeFinished(OP_EMULEPROT, opcode)) {
-				// Here comes a extended packet without finishing the hanshake.
+			if (!m_client->CheckHandshakeFinished()) {
+				// Here comes an extended packet without finishing the handshake.
 				// IMHO, we should disconnect the client.
 				throw wxString(wxT("Client send OP_MULTIPACKETANSWER before finishing handshake"));
 			}
@@ -1309,7 +1266,7 @@
 			theStats::AddDownOverheadOther(size);
 
 			if (!m_client->ProcessMuleInfoPacket(buffer, size)) { 
-				AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_EMULEINFO from ") + m_client->GetFullIP() );
+				AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_EMULEINFO from ") + m_client->GetFullIP() );
 				
 				// If it's not a OS Info packet, is an old client
 				// start secure identification, if
@@ -1319,12 +1276,12 @@
 				}
 				m_client->SendMuleInfoPacket(true);
 			} else {
-				AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_EMULEINFO is an OS_INFO") );
+				AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_EMULEINFO is an OS_INFO") );
 			}
 			break;
 		}
 		case OP_EMULEINFOANSWER: {	// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_EMULEINFOANSWER from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_EMULEINFOANSWER from ") + m_client->GetFullIP() );
 			theStats::AddDownOverheadOther(size);
 			
 			m_client->ProcessMuleInfoPacket(buffer, size);
@@ -1339,10 +1296,10 @@
 		}
 		
 		case OP_SECIDENTSTATE:{		// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_SECIDENTSTATE from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_SECIDENTSTATE from ") + m_client->GetFullIP() );
 			
-			if (!m_client->CheckHandshakeFinished(OP_EMULEPROT, opcode)) {
-				// Here comes a extended packet without finishing the hanshake.
+			if (!m_client->CheckHandshakeFinished()) {
+				// Here comes an extended packet without finishing the handshake.
 				// IMHO, we should disconnect the client.
 				throw wxString(wxT("Client send OP_SECIDENTSTATE before finishing handshake"));
 			}								
@@ -1364,14 +1321,14 @@
 		}
 		
 		case OP_PUBLICKEY: {		// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_PUBLICKEY from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_PUBLICKEY from ") + m_client->GetFullIP() );
 			
 			if (m_client->IsBanned() ){
 				break;						
 			}
 			
-			if (!m_client->CheckHandshakeFinished(OP_EMULEPROT, opcode)) {
-				// Here comes a extended packet without finishing the hanshake.
+			if (!m_client->CheckHandshakeFinished()) {
+				// Here comes an extended packet without finishing the handshake.
 				// IMHO, we should disconnect the client.
 				throw wxString(wxT("Client send OP_PUBLICKEY before finishing handshake"));
 			}
@@ -1380,10 +1337,10 @@
 			break;
 		}
 		case OP_SIGNATURE:{			// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_SIGNATURE from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_SIGNATURE from ") + m_client->GetFullIP() );
 			
-			if (!m_client->CheckHandshakeFinished(OP_EMULEPROT, opcode)) {
-				// Here comes a extended packet without finishing the hanshake.
+			if (!m_client->CheckHandshakeFinished()) {
+				// Here comes an extended packet without finishing the handshake.
 				// IMHO, we should disconnect the client.
 				throw wxString(wxT("Client send OP_COMPRESSEDPART before finishing handshake"));
 			}
@@ -1392,14 +1349,14 @@
 			break;
 		}
 		case OP_SENDINGPART_I64:
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_SENDINGPART_I64 from ") + m_client->GetFullIP() );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_SENDINGPART_I64 from ") + m_client->GetFullIP() );
 		case OP_COMPRESSEDPART_I64:
-			if (opcode == OP_COMPRESSEDPART_I64) AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_COMPRESSEDPART_I64 from ") + m_client->GetFullIP() );
+			if (opcode == OP_COMPRESSEDPART_I64) AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_COMPRESSEDPART_I64 from ") + m_client->GetFullIP() );
 		case OP_COMPRESSEDPART: {	// 0.47a
-			if (opcode == OP_COMPRESSEDPART) AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_COMPRESSEDPART from ") + m_client->GetFullIP() );
+			if (opcode == OP_COMPRESSEDPART) AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_COMPRESSEDPART from ") + m_client->GetFullIP() );
 			
-			if (!m_client->CheckHandshakeFinished(OP_EMULEPROT, opcode)) {
-				// Here comes a extended packet without finishing the hanshake.
+			if (!m_client->CheckHandshakeFinished()) {
+				// Here comes an extended packet without finishing the handshake.
 				// IMHO, we should disconnect the client.
 				throw wxString(wxT("Client send OP_COMPRESSEDPART before finishing handshake"));
 			}
@@ -1415,7 +1372,7 @@
 					if (!m_client->GetSentCancelTransfer()) {
 						CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
 						theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-						AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + m_client->GetFullIP() );
+						AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + m_client->GetFullIP() );
 						m_client->SendPacket(packet,true,true);					
 						
 						if (m_client) {
@@ -1431,7 +1388,7 @@
 				if (!m_client->GetSentCancelTransfer()) {
 					CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
 					theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-					AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + m_client->GetFullIP() );
+					AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + m_client->GetFullIP() );
 					m_client->SendPacket(packet,true,true);
 					
 					if ( m_client ) {
@@ -1446,7 +1403,7 @@
 			break;
 		}
 		case OP_REQUESTPARTS_I64: {	
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_REQUESTPARTS_I64 from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_REQUESTPARTS_I64 from ") + m_client->GetFullIP()  );
 			
 			theStats::AddDownOverheadFileRequest(size);
 
@@ -1455,12 +1412,12 @@
 			break;
 		}		
 		case OP_QUEUERANKING: {		// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_QUEUERANKING from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_QUEUERANKING from ") + m_client->GetFullIP()  );
 			
 			theStats::AddDownOverheadOther(size);
 			
-			if (!m_client->CheckHandshakeFinished(OP_EMULEPROT, opcode)) {
-				// Here comes a extended packet without finishing the hanshake.
+			if (!m_client->CheckHandshakeFinished()) {
+				// Here comes an extended packet without finishing the handshake.
 				// IMHO, we should disconnect the client.
 				throw wxString(wxT("Client send OP_QUEUERANKING before finishing handshake"));
 			}
@@ -1476,11 +1433,11 @@
 		}
 		case OP_REQUESTSOURCES2:
 		case OP_REQUESTSOURCES:{
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_REQUESTSOURCES from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_REQUESTSOURCES from ") + m_client->GetFullIP()  );
 			
 			theStats::AddDownOverheadSourceExchange(size);
 
-			if (!m_client->CheckHandshakeFinished(OP_EMULEPROT, opcode)) {
+			if (!m_client->CheckHandshakeFinished()) {
 				// Here comes an extended packet without finishing the handshake.
 				// IMHO, we should disconnect the client.
 				throw wxString(wxT("Client send OP_REQUESTSOURCES before finishing handshake"));
@@ -1529,7 +1486,7 @@
 						CPacket* tosend = file->CreateSrcInfoPacket(m_client, byRequestedVersion, byRequestedOptions);
 						if(tosend) {
 							theStats::AddUpOverheadSourceExchange(tosend->GetPacketSize());
-							AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ANSWERSOURCES to ") + m_client->GetFullIP() );
+							AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ANSWERSOURCES to ") + m_client->GetFullIP() );
 							SendPacket(tosend, true, true);
 						}
 					}
@@ -1538,12 +1495,12 @@
 			break;
 		}
 		case OP_ANSWERSOURCES: {
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_ANSWERSOURCES from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_ANSWERSOURCES from ") + m_client->GetFullIP()  );
 			
 			theStats::AddDownOverheadSourceExchange(size);
 
-			if (!m_client->CheckHandshakeFinished(OP_EMULEPROT, opcode)) {
-				// Here comes a extended packet without finishing the hanshake.
+			if (!m_client->CheckHandshakeFinished()) {
+				// Here comes an extended packet without finishing the handshake.
 				// IMHO, we should disconnect the client.
 				throw wxString(wxT("Client send OP_ANSWERSOURCES before finishing handshake"));
 			}
@@ -1567,8 +1524,8 @@
 			//printf("Received OP_ANSWERSOURCES2\n");
 			theStats::AddDownOverheadSourceExchange(size);
 
-			if (!m_client->CheckHandshakeFinished(OP_EMULEPROT, opcode)) {
-				// Here comes a extended packet without finishing the hanshake.
+			if (!m_client->CheckHandshakeFinished()) {
+				// Here comes an extended packet without finishing the handshake.
 				// IMHO, we should disconnect the client.
 				throw wxString(wxT("Client send OP_ANSWERSOURCES2 before finishing handshake"));
 			}
@@ -1589,12 +1546,12 @@
 			break;
 		}		
 		case OP_FILEDESC: {		// 0.43b
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_FILEDESC from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_FILEDESC from ") + m_client->GetFullIP()  );
 			
 			theStats::AddDownOverheadFileRequest(size);
 
-			if (!m_client->CheckHandshakeFinished(OP_EMULEPROT, opcode)) {
-				// Here comes a extended packet without finishing the hanshake.
+			if (!m_client->CheckHandshakeFinished()) {
+				// Here comes an extended packet without finishing the handshake.
 				// IMHO, we should disconnect the client.
 				throw wxString(wxT("Client send OP_FILEDESC before finishing handshake"));
 			}
@@ -1605,46 +1562,46 @@
 
 		// Unsupported
 		case OP_REQUESTPREVIEW: {
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_REQUESTPREVIEW  from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_REQUESTPREVIEW  from ") + m_client->GetFullIP()  );
 			break;
 		}
 		// Unsupported
 		case OP_PREVIEWANSWER: {
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_PREVIEWANSWER from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_PREVIEWANSWER from ") + m_client->GetFullIP()  );
 			break;
 		}
 
 		case OP_PUBLICIP_ANSWER: {
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_PUBLICIP_ANSWER from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_PUBLICIP_ANSWER from ") + m_client->GetFullIP()  );
 			theStats::AddDownOverheadOther(size);
 			m_client->ProcessPublicIPAnswer(buffer, size);
 			break;
 		}
 		case OP_PUBLICIP_REQ: {
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_PUBLICIP_REQ from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_PUBLICIP_REQ from ") + m_client->GetFullIP()  );
 			theStats::AddDownOverheadOther(size);
 			CPacket* pPacket = new CPacket(OP_PUBLICIP_ANSWER, 4, OP_EMULEPROT);
 			pPacket->CopyUInt32ToDataBuffer(m_client->GetIP());
 			theStats::AddUpOverheadOther(pPacket->GetPacketSize());
-			AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_PUBLICIP_ANSWER to") + m_client->GetFullIP());
+			AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_PUBLICIP_ANSWER to") + m_client->GetFullIP());
 			SendPacket(pPacket);
 			break;
 		}			
 		case OP_AICHANSWER: {
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_AICHANSWER from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_AICHANSWER from ") + m_client->GetFullIP()  );
 			theStats::AddDownOverheadOther(size);
 			m_client->ProcessAICHAnswer(buffer, size);
 			break;
 		}
 		case OP_AICHREQUEST: {
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_AICHREQUEST from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_AICHREQUEST from ") + m_client->GetFullIP()  );
 			theStats::AddDownOverheadOther(size);
 			m_client->ProcessAICHRequest(buffer, size);
 			break;
 		}
 		case OP_AICHFILEHASHANS: {
 			// those should not be received normally, since we should only get those in MULTIPACKET
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_AICHFILEHASHANS from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_AICHFILEHASHANS from ") + m_client->GetFullIP()  );
 			theStats::AddDownOverheadOther(size);
 			CMemFile data(buffer, size);
 			m_client->ProcessAICHFileHash(&data, NULL);
@@ -1652,7 +1609,7 @@
 		}
 		case OP_AICHFILEHASHREQ: {
 			// those should not be received normally, since we should only get those in MULTIPACKET
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_AICHFILEHASHREQ from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_AICHFILEHASHREQ from ") + m_client->GetFullIP()  );
 			CMemFile data(buffer, size);
 			CMD4Hash hash = data.ReadHash();
 			CKnownFile* pPartFile = theApp->sharedfiles->GetFileByID(hash);
@@ -1667,13 +1624,13 @@
 				pPartFile->GetAICHHashset()->GetMasterHash().Write(&data_out);
 				CPacket* packet = new CPacket(data_out, OP_EMULEPROT, OP_AICHFILEHASHANS);
 				theStats::AddUpOverheadOther(packet->GetPacketSize());
-					AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_AICHFILEHASHANS to") + m_client->GetFullIP());
+					AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_AICHFILEHASHANS to") + m_client->GetFullIP());
 				SendPacket(packet);
 			}
 			break;
 		}
 		case OP_CALLBACK: {
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_CALLBACK from ") + m_client->GetFullIP() );				
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_CALLBACK from ") + m_client->GetFullIP() );
 			theStats::AddDownOverheadFileRequest(size);
 			if(!Kademlia::CKademlia::IsRunning()) {
 				break;
@@ -1708,7 +1665,7 @@
 		}
 		
 		case OP_BUDDYPING: {
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_BUDDYPING from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_BUDDYPING from ") + m_client->GetFullIP()  );
 			theStats::AddDownOverheadKad(size);
 
 			CUpDownClient* buddy = theApp->clientlist->GetBuddy();
@@ -1720,12 +1677,12 @@
 			m_client->SetLastBuddyPingPongTime();
 			CPacket* replypacket = new CPacket(OP_BUDDYPONG, 0, OP_EMULEPROT);
 			theStats::AddUpOverheadKad(replypacket->GetPacketSize());
-			AddDebugLogLineM(false, logLocalClient,wxT("Local Client: OP_BUDDYPONG to ") + m_client->GetFullIP());
+			AddDebugLogLineN(logLocalClient,wxT("Local Client: OP_BUDDYPONG to ") + m_client->GetFullIP());
 			SendPacket(replypacket);
 			break;
 		}
 		case OP_BUDDYPONG: {
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_BUDDYPONG from ") + m_client->GetFullIP()  );
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_BUDDYPONG from ") + m_client->GetFullIP()  );
 			theStats::AddDownOverheadKad(size);
 
 			CUpDownClient* buddy = theApp->clientlist->GetBuddy();
@@ -1741,11 +1698,11 @@
 			theStats::AddDownOverheadFileRequest(size);
 			CUpDownClient* buddy = theApp->clientlist->GetBuddy();
 			if (buddy != m_client) {
-				AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_REASKCALLBACKTCP from ") + m_client->GetFullIP() + wxT(" which is not our buddy!") );
+				AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_REASKCALLBACKTCP from ") + m_client->GetFullIP() + wxT(" which is not our buddy!") );
 				//This callback was not from our buddy.. Ignore.
 				break;
 			}
-			AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: OP_REASKCALLBACKTCP from ") + m_client->GetFullIP()  );				
+			AddDebugLogLineN( logRemoteClient, wxT("Remote Client: OP_REASKCALLBACKTCP from ") + m_client->GetFullIP() );
 			CMemFile data_in(buffer, size);
 			uint32 destip = data_in.ReadUInt32();
 			uint16 destport = data_in.ReadUInt16();
@@ -1755,7 +1712,7 @@
 			bool bSenderMultipleIpUnknown = false;
 			CUpDownClient* sender = theApp->uploadqueue->GetWaitingClientByIP_UDP(destip, destport, true, &bSenderMultipleIpUnknown);
 			if (!reqfile) {
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_FILENOTFOUND to ") + m_client->GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_FILENOTFOUND to ") + m_client->GetFullIP() );
 				CPacket* response = new CPacket(OP_FILENOTFOUND,0,OP_EMULEPROT);
 				theStats::AddUpOverheadFileRequest(response->GetPacketSize());
 				if (sender) {
@@ -1798,49 +1755,66 @@
 						}
 					}
 					
-					data_out.WriteUInt16(theApp->uploadqueue->GetWaitingPosition(sender));
+					data_out.WriteUInt16(sender->GetUploadQueueWaitingPosition());
 					CPacket* response = new CPacket(data_out, OP_EMULEPROT, OP_REASKACK);
 					theStats::AddUpOverheadFileRequest(response->GetPacketSize());
-					AddDebugLogLineM( false, logLocalClient, wxT("Local Client UDP: OP_REASKACK to ") + m_client->GetFullIP()  );
+					AddDebugLogLineN( logLocalClient, wxT("Local Client UDP: OP_REASKACK to ") + m_client->GetFullIP()  );
 					theApp->clientudp->SendPacket(response, destip, destport, sender->ShouldReceiveCryptUDPPackets(), sender->GetUserHash().GetHash(), false, 0);
 				} else {
-					AddDebugLogLineM(false, logListenSocket, wxT("Client UDP socket; OP_REASKCALLBACKTCP; reqfile does not match"));
+					AddDebugLogLineN(logListenSocket, wxT("Client UDP socket; OP_REASKCALLBACKTCP; reqfile does not match"));
 				}
 			} else {
 				if (!bSenderMultipleIpUnknown){
 					if ((theStats::GetWaitingUserCount() + 50) > thePrefs::GetQueueSize()) {
-						AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_QUEUEFULL to ") + m_client->GetFullIP()  );
+						AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_QUEUEFULL to ") + m_client->GetFullIP()  );
 						CPacket* response = new CPacket(OP_QUEUEFULL,0,OP_EMULEPROT);
 						theStats::AddUpOverheadFileRequest(response->GetPacketSize());
 						theApp->clientudp->SendPacket(response, destip, destport, false, NULL, false, 0);
 					}
 				} else {
-					AddDebugLogLineM(false, logRemoteClient, CFormat(wxT("OP_REASKCALLBACKTCP Packet received - multiple clients with the same IP but different UDP port found. Possible UDP Portmapping problem, enforcing TCP connection. IP: %s, Port: %u")) % Uint32toStringIP(destip) % destport);
+					AddDebugLogLineN(logRemoteClient, CFormat(wxT("OP_REASKCALLBACKTCP Packet received - multiple clients with the same IP but different UDP port found. Possible UDP Portmapping problem, enforcing TCP connection. IP: %s, Port: %u")) % Uint32toStringIP(destip) % destport);
 				}
 			}
 			break;
 		}
+		case OP_CHATCAPTCHAREQ:
+		{
+			AddDebugLogLineN(logRemoteClient, wxT("Remote Client: OP_CHATCAPTCHAREQ from ") + m_client->GetFullIP());
+			theStats::AddDownOverheadOther(size);
+			CMemFile data_in(buffer, size);
+			m_client->ProcessCaptchaRequest(&data_in);
+			break;
+		}
+		case OP_CHATCAPTCHARES:
+		{
+			AddDebugLogLineN(logRemoteClient, wxT("Remote Client: OP_CHATCAPTCHARES from ") + m_client->GetFullIP());
+			theStats::AddDownOverheadOther(size);
+			if (size) {
+				m_client->ProcessCaptchaReqRes(buffer[0]);
+			}
+			break;
+		}
 		case OP_FWCHECKUDPREQ: { // Support required for Kadversion >= 6
-			AddDebugLogLineM(false, logRemoteClient, wxT("Remote Client: OP_FWCHECKUDPREQ from ") + m_client->GetFullIP());
+			AddDebugLogLineN(logRemoteClient, wxT("Remote Client: OP_FWCHECKUDPREQ from ") + m_client->GetFullIP());
 			theStats::AddDownOverheadOther(size);
 			CMemFile data_in(buffer, size);
 			m_client->ProcessFirewallCheckUDPRequest(&data_in);
 			break;
 		}
 		case OP_KAD_FWTCPCHECK_ACK: { // Support required for Kadversion >= 7
-			AddDebugLogLineM(false, logRemoteClient, wxT("Remote Client: OP_KAD_FWTCPCHECK_ACK from ") + m_client->GetFullIP());
+			AddDebugLogLineN(logRemoteClient, wxT("Remote Client: OP_KAD_FWTCPCHECK_ACK from ") + m_client->GetFullIP());
 			if (theApp->clientlist->IsKadFirewallCheckIP(m_client->GetIP())) {
 				if (Kademlia::CKademlia::IsRunning()) {
 					Kademlia::CKademlia::GetPrefs()->IncFirewalled();
 				}
 			} else {
-				AddDebugLogLineM(false, logListenSocket, wxT("Received unrequested OP_KAD_FWTCPCHECK_ACK packet from ") + m_client->GetFullIP());
+				AddDebugLogLineN(logListenSocket, wxT("Received unrequested OP_KAD_FWTCPCHECK_ACK packet from ") + m_client->GetFullIP());
 			}
 			break;
 		}
 		default:
 			theStats::AddDownOverheadOther(size);
-			AddDebugLogLineM( false, logRemoteClient, wxString::Format(wxT("eMule packet : unknown opcode: %i %x from "),opcode,opcode) + m_client->GetFullIP());
+			AddDebugLogLineN(logRemoteClient, CFormat(wxT("eMule packet : unknown opcode: %i %x from %s")) % opcode % opcode % m_client->GetFullIP());
 			break;
 	}
 	
@@ -1862,10 +1836,11 @@
 	try {
 		switch(opcode) {
 			case OP_QUEUERANK: {	
-				AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: ED2Kv2 OP_QUEUERANK from ") + m_client->GetFullIP() );
+				AddDebugLogLineN( logRemoteClient, wxT("Remote Client: ED2Kv2 OP_QUEUERANK from ") + m_client->GetFullIP() );
 				
 				uint8 numtags = data.ReadUInt8();
 				wxASSERT(numtags == 1);
+				if(numtags){}	// prevent GCC warning
 				
 				m_client->SetRemoteQueueRank(data.GetIntTagValue());
 				
@@ -1874,7 +1849,7 @@
 			}
 			
 			case OP_REQUESTPARTS: {
-				AddDebugLogLineM( false, logRemoteClient, wxT("Remote Client: ED2Kv2 OP_REQUESTPARTS from ") + m_client->GetFullIP() );
+				AddDebugLogLineN( logRemoteClient, wxT("Remote Client: ED2Kv2 OP_REQUESTPARTS from ") + m_client->GetFullIP() );
 					
 				m_client->ProcessRequestPartsPacketv2(data);
 				
@@ -1884,10 +1859,10 @@
 
 			default:
 				theStats::AddDownOverheadOther(size);
-				AddDebugLogLineM( false, logRemoteClient, wxString::Format(wxT("ED2Kv2 packet : unknown opcode: %i %x from "), opcode, opcode) + m_client->GetFullIP());
+				AddDebugLogLineN(logRemoteClient, CFormat(wxT("ED2Kv2 packet : unknown opcode: %i %x from %s")) % opcode % opcode % m_client->GetFullIP());
 		}
 	} catch (...) {
-		AddDebugLogLineM( false, logRemoteClient, wxString::Format(wxT("ED2Kv2 packet is corrupt at pos %i! opcode: %i %x from "),data.GetPosition(), opcode, opcode) + m_client->GetFullIP());
+		AddDebugLogLineN(logRemoteClient, CFormat(wxT("ED2Kv2 packet is corrupt at pos %i! opcode: %i %x from %s")) % data.GetPosition() % opcode % opcode % m_client->GetFullIP());
 		throw;
 	}
 	
@@ -1900,10 +1875,10 @@
 		OnError(nErrorCode);
 	} else if (!m_client) {
 		// and now? Disconnect? not?			
-		AddDebugLogLineM( false, logClient, wxT("Couldn't send hello packet (Client deleted!)") );
+		AddDebugLogLineN( logClient, wxT("Couldn't send hello packet (Client deleted!)") );
 	} else if (!m_client->SendHelloPacket()) {	
 		// and now? Disconnect? not?				
-		AddDebugLogLineM( false, logClient, wxT("Couldn't send hello packet (Client deleted by SendHelloPacket!)") );
+		AddDebugLogLineN( logClient, wxT("Couldn't send hello packet (Client deleted by SendHelloPacket!)") );
 	} else {
 		ResetTimeOutTimer();
 	}
@@ -1928,7 +1903,7 @@
 			m_client->Safe_Delete();
 		}
 		Safe_Delete();
-		AddDebugLogLineM( false, logIPFilter, wxT("A connected client was dropped by IPFilter on new packet received"));
+		AddDebugLogLineN( logIPFilter, wxT("A connected client was dropped by IPFilter on new packet received"));
 	} else {
 		CEMSocket::OnReceive(nErrorCode);
 	}
@@ -1960,22 +1935,20 @@
 			strError += wxT("caused a socket blocking error.");
 		}
 	} else {
-		if ( CLogger::IsEnabled( logClient ) && (nErrorCode != 107)) {
+		if (theLogger.IsEnabled(logClient) && nErrorCode != 107) {
 			// 0    -> No Error / Disconect
 			// 107  -> Transport endpoint is not connected
 			if (m_client) {
 				if (!m_client->GetUserName().IsEmpty()) {
-					strError = wxT("OnError: Client '") + m_client->GetUserName() +
-						wxT("' (IP:") + m_client->GetFullIP() + 
-						wxString::Format(wxT(") caused an error: %u. Disconnecting client!"), nErrorCode);
+					strError = CFormat(wxT("OnError: Client '%s' (IP:%s) caused an error: %u. Disconnecting client!"))
+						% m_client->GetUserName() % m_client->GetFullIP() % nErrorCode;
 				} else {
-					strError = wxT("OnError: Unknown client (IP:") + 
-					m_client->GetFullIP() + 
-					wxString::Format(wxT(") caused an error: %u. Disconnecting client!"), nErrorCode);
+					strError = CFormat(wxT("OnError: Unknown client (IP:%s) caused an error: %u. Disconnecting client!"))
+						% m_client->GetFullIP() % nErrorCode;
 				}
 			} else {
-				strError = wxString::Format(wxT("OnError: A client caused an error or did something bad (error %u). Disconnecting client !"),
-					nErrorCode);
+				strError = CFormat(wxT("OnError: A client caused an error or did something bad (error %u). Disconnecting client !"))
+					% nErrorCode;
 			}
 		} else {
 			strError = wxT("Error 107 (Transport endpoint is not connected)");
@@ -1992,7 +1965,7 @@
 	bool bResult = false;
 	uint32 uRawSize = packet->GetPacketSize();
 
-	AddDebugLogLineM( false, logRemoteClient,
+	AddDebugLogLineN( logRemoteClient,
 		CFormat(wxT("Packet with protocol %x, opcode %x, size %u received from %s"))
 			% packet->GetProtocol()
 			% packet->GetOpCode()
@@ -2009,16 +1982,12 @@
 			(packet->GetProtocol() == OP_ED2KV2PACKEDPROT)) {
 				
 			if (!packet->UnPackPacket()) {
-				AddDebugLogLineM( false, logZLib, wxT("Failed to decompress client TCP packet."));
+				AddDebugLogLineN(logZLib, wxT("Failed to decompress client TCP packet."));
 				bResult = false;
 				process = false;
 			} else {
-				AddDebugLogLineM(false, logRemoteClient, 
-					wxString::Format(wxT("Packet unpacked, new protocol %x, opcode %x, size %u"), 
-						packet->GetProtocol(),
-						packet->GetOpCode(),
-						packet->GetPacketSize())
-				);
+				AddDebugLogLineN(logRemoteClient, CFormat(wxT("Packet unpacked, new protocol %x, opcode %x, size %u")) 
+					% packet->GetProtocol() % packet->GetOpCode() % packet->GetPacketSize());
 			}
 		}
 		
@@ -2036,7 +2005,7 @@
 				case OP_ED2KV2PACKEDPROT:				
 				case OP_PACKEDPROT:
 					// Packed inside packed?
-					wxASSERT(0);
+					wxFAIL;
 					break;
 				default: {
 					theStats::AddDownOverheadOther(uRawSize);
@@ -2057,7 +2026,7 @@
 	}
 
 	if (!exception.IsEmpty()) {
-		AddDebugLogLineM( false, logPacketErrors,
+		AddDebugLogLineN( logPacketErrors,
 			CFormat(wxT("Caught %s\nOn packet with protocol %x, opcode %x, size %u\tClientData: %s\n"))
 				% exception
 				% packet->GetProtocol()
@@ -2070,7 +2039,7 @@
 			m_client->SetDownloadState(DS_ERROR);
 		}
 		
-		AddDebugLogLineM( false, logClient, 
+		AddDebugLogLineN( logClient,
 			CFormat( wxT("Client '%s' (IP: %s) caused an error (%s). Disconnecting client!" ) )
 				% ( m_client ? m_client->GetUserName() : wxString(wxT("Unknown")) )
 				% ( m_client ? m_client->GetFullIP() : wxString(wxT("Unknown")) )
@@ -2084,22 +2053,6 @@
 }
 
 
-bool CClientTCPSocket::IsMessageFiltered(const wxString& Message, CUpDownClient* client) {
-	
-	bool filtered = false;
-	// If we're chatting to the guy, we don't want to filter!
-	if (client->GetChatState() != MS_CHATTING) {
-		if (thePrefs::MsgOnlyFriends() && !client->IsFriend()) {
-			filtered = true;
-		} else if (thePrefs::MsgOnlySecure() && client->GetUserName().IsEmpty() ) {
-			filtered = true;
-		} else if (thePrefs::MustFilterMessages()) {
-			filtered = thePrefs::IsMessageFiltered(Message);
-		}
-	}
-	return filtered;
-}
-
 SocketSentBytes CClientTCPSocket::SendControlData(uint32 maxNumberOfBytesToSend, uint32 overchargeMaxBytesToSend)
 {
     SocketSentBytes returnStatus = CEMSocket::SendControlData(maxNumberOfBytesToSend, overchargeMaxBytesToSend);

aMule-2.2.6.tar.bz2/src/ClientTCPSocket.h -> aMule-2.3.1.tar.bz2/src/ClientTCPSocket.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -55,6 +55,7 @@
 	bool		CheckTimeOut();
 
 	void		Safe_Delete();
+	void		Safe_Delete_Client();
 
 	bool		ForDeletion() const { return m_ForDeletion; }
 
@@ -82,7 +83,6 @@
 	bool	ProcessPacket(const byte* packet, uint32 size, uint8 opcode);
 	bool	ProcessExtPacket(const byte* packet, uint32 size, uint8 opcode);
 	bool	ProcessED2Kv2Packet(const byte* packet, uint32 size, uint8 opcode);
-	bool	IsMessageFiltered(const wxString& Message, CUpDownClient* client);
 	void	ResetTimeOutTimer();
 	void	SetClient(CUpDownClient* client);

aMule-2.2.6.tar.bz2/src/ClientUDPSocket.cpp -> aMule-2.3.1.tar.bz2/src/ClientUDPSocket.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -111,12 +111,12 @@
 						uLongf unpackedsize = newSize - 2;
 						uint16_t result = uncompress(&(unpack[2]), &unpackedsize, decryptedBuffer + 2, packetLen - 2);
 						if (result == Z_OK) {
-							AddDebugLogLineM(false, logClientKadUDP, wxT("Correctly uncompressed Kademlia packet"));
+							AddDebugLogLineN(logClientKadUDP, wxT("Correctly uncompressed Kademlia packet"));
 							unpack[0] = OP_KADEMLIAHEADER;
 							unpack[1] = opcode;
 							Kademlia::CKademlia::ProcessPacket(&(unpack[0]), unpackedsize + 2, wxUINT32_SWAP_ALWAYS(ip), port, (Kademlia::CPrefs::GetUDPVerifyKey(ip) == receiverVerifyKey), Kademlia::CKadUDPKey(senderVerifyKey, theApp->GetPublicIP(false)));
 						} else {
-							AddDebugLogLineM(false, logClientKadUDP, wxT("Failed to uncompress Kademlia packet"));
+							AddDebugLogLineN(logClientKadUDP, wxT("Failed to uncompress Kademlia packet"));
 						}
 					} else {
 						throw wxString(wxT("Kad packet (compressed) too short"));
@@ -124,14 +124,14 @@
 					break;
 
 				default:
-					AddDebugLogLineM(false, logClientUDP, wxString::Format(wxT("Unknown opcode on received packet: 0x%x"), protocol));
+					AddDebugLogLineN(logClientUDP, CFormat(wxT("Unknown opcode on received packet: 0x%x")) % protocol);
 			}
-		} catch (const wxString& e) {
-			AddDebugLogLineM(false, logClientUDP, wxT("Error while parsing UDP packet: ") + e);
-		} catch (const CInvalidPacket& e) {
-			AddDebugLogLineM(false, logClientUDP, wxT("Invalid UDP packet encountered: ") + e.what());
-		} catch (const CEOFException& e) {
-			AddDebugLogLineM(false, logClientUDP, wxT("Malformed packet encountered while parsing UDP packet: ") + e.what());
+		} catch (const wxString& DEBUG_ONLY(e)) {
+			AddDebugLogLineN(logClientUDP, wxT("Error while parsing UDP packet: ") + e);
+		} catch (const CInvalidPacket& DEBUG_ONLY(e)) {
+			AddDebugLogLineN(logClientUDP, wxT("Invalid UDP packet encountered: ") + e.what());
+		} catch (const CEOFException& DEBUG_ONLY(e)) {
+			AddDebugLogLineN(logClientUDP, wxT("Malformed packet encountered while parsing UDP packet: ") + e.what());
 		}
 	}
 }
@@ -141,7 +141,7 @@
 {
 	switch (opcode) {
 		case OP_REASKCALLBACKUDP: {
-			AddDebugLogLineM( false, logClientUDP, wxT("Client UDP socket; OP_REASKCALLBACKUDP") );
+			AddDebugLogLineN( logClientUDP, wxT("Client UDP socket; OP_REASKCALLBACKUDP") );
 			theStats::AddDownOverheadOther(size);
 			CUpDownClient* buddy = theApp->clientlist->GetBuddy();
 			if( buddy ) {
@@ -161,7 +161,7 @@
 					mem_packet.WriteUInt32(host);
 					mem_packet.WriteUInt16(port);
 					CPacket* response = new CPacket(mem_packet, OP_EMULEPROT, OP_REASKCALLBACKTCP);
-					AddDebugLogLineM( false, logClientUDP, wxT("Client UDP socket: send OP_REASKCALLBACKTCP") );
+					AddDebugLogLineN( logClientUDP, wxT("Client UDP socket: send OP_REASKCALLBACKTCP") );
 					theStats::AddUpOverheadFileRequest(response->GetPacketSize());
 					buddy->GetSocket()->SendPacket(response);
 				}
@@ -169,7 +169,7 @@
 			break;
 		}
 		case OP_REASKFILEPING: {
-			AddDebugLogLineM( false, logClientUDP, wxT("Client UDP socket: OP_REASKFILEPING") );
+			AddDebugLogLineN( logClientUDP, wxT("Client UDP socket: OP_REASKFILEPING") );
 			theStats::AddDownOverheadFileRequest(size);
 			
 			CMemFile data_in(packet, size);
@@ -219,13 +219,13 @@
 						}
 					}
 					
-					data_out.WriteUInt16(theApp->uploadqueue->GetWaitingPosition(sender));
+					data_out.WriteUInt16(sender->GetUploadQueueWaitingPosition());
 					CPacket* response = new CPacket(data_out, OP_EMULEPROT, OP_REASKACK);
 					theStats::AddUpOverheadFileRequest(response->GetPacketSize());
-					AddDebugLogLineM( false, logClientUDP, wxT("Client UDP socket: OP_REASKACK to ") + sender->GetFullIP());
+					AddDebugLogLineN( logClientUDP, wxT("Client UDP socket: OP_REASKACK to ") + sender->GetFullIP());
 					SendPacket(response, host, port, sender->ShouldReceiveCryptUDPPackets(), sender->GetUserHash().GetHash(), false, 0);
 				} else {
-					AddDebugLogLineM( false, logClientUDP, wxT("Client UDP socket; ReaskFilePing; reqfile does not match") );
+					AddDebugLogLineN( logClientUDP, wxT("Client UDP socket; ReaskFilePing; reqfile does not match") );
 				}						
 			} else {
 				if (!bSenderMultipleIpUnknown) {
@@ -235,13 +235,13 @@
 						SendPacket(response,host,port, false, NULL, false, 0); // we cannot answer this one encrypted since we dont know this client
 					}
 				} else {
-					AddDebugLogLineM(false, logClientUDP, CFormat(wxT("UDP Packet received - multiple clients with the same IP but different UDP port found. Possible UDP Portmapping problem, enforcing TCP connection. IP: %s, Port: %u")) % Uint32toStringIP(host) % port);
+					AddDebugLogLineN(logClientUDP, CFormat(wxT("UDP Packet received - multiple clients with the same IP but different UDP port found. Possible UDP Portmapping problem, enforcing TCP connection. IP: %s, Port: %u")) % Uint32toStringIP(host) % port);
 				}
 			}
 			break;
 		}
 		case OP_QUEUEFULL: {
-			AddDebugLogLineM( false, logClientUDP, wxT("Client UDP socket: OP_QUEUEFULL") );
+			AddDebugLogLineN( logClientUDP, wxT("Client UDP socket: OP_QUEUEFULL") );
 			theStats::AddDownOverheadOther(size);
 			CUpDownClient* sender = theApp->downloadqueue->GetDownloadClientByIP_UDP(host,port);
 			if (sender) {
@@ -265,7 +265,7 @@
 			break;
 		}
 		case OP_FILENOTFOUND: {
-			AddDebugLogLineM( false, logClientUDP, wxT("Client UDP socket: OP_FILENOTFOUND") );
+			AddDebugLogLineN( logClientUDP, wxT("Client UDP socket: OP_FILENOTFOUND") );
 			theStats::AddDownOverheadFileRequest(size);
 			CUpDownClient* sender = theApp->downloadqueue->GetDownloadClientByIP_UDP(host,port);
 			if (sender){
@@ -276,10 +276,10 @@
 		}
 		case OP_DIRECTCALLBACKREQ:
 		{
-			AddDebugLogLineM( false, logClientUDP, wxT("Client UDP socket: OP_DIRECTCALLBACKREQ") );
+			AddDebugLogLineN( logClientUDP, wxT("Client UDP socket: OP_DIRECTCALLBACKREQ") );
 			theStats::AddDownOverheadOther(size);
 			if (!theApp->clientlist->AllowCallbackRequest(host)) {
-				AddDebugLogLineM(false, logClientUDP, wxT("Ignored DirectCallback Request because this IP (") + Uint32toStringIP(host) + wxT(") has sent too many request within a short time"));
+				AddDebugLogLineN(logClientUDP, wxT("Ignored DirectCallback Request because this IP (") + Uint32toStringIP(host) + wxT(") has sent too many requests within a short time"));
 				break;
 			}
 			// do we accept callbackrequests at all?
@@ -292,8 +292,8 @@
 				CUpDownClient* requester = NULL;
 				CClientList::SourceList clients = theApp->clientlist->GetClientsByHash(userHash);
 				for (CClientList::SourceList::iterator it = clients.begin(); it != clients.end(); ++it) {
-					if ((host == 0 || (*it)->GetIP() == host) && (remoteTCPPort == 0 || (*it)->GetUserPort() == remoteTCPPort)) {
-						requester = *it;
+					if ((host == 0 || it->GetIP() == host) && (remoteTCPPort == 0 || it->GetUserPort() == remoteTCPPort)) {
+						requester = it->GetClient();
 						break;
 					}
 				}
@@ -306,11 +306,10 @@
 				requester->SetDirectUDPCallbackSupport(false);
 				requester->SetIP(host);
 				requester->SetUserPort(remoteTCPPort);
-				//TODO LOGREMOVE
-				//AddDebugLogLineM(false, logClientUDP, wxT("Accepting incoming DirectCallbackRequest from ") + requester->DbgGetClientInfo());
+				AddDebugLogLineN(logClientUDP, wxT("Accepting incoming DirectCallback Request from ") + Uint32toStringIP(host));
 				requester->TryToConnect();
 			} else {
-				AddDebugLogLineM(false, logClientUDP, wxT("Ignored DirectCallback Request because we do not accept DirectCall backs at all (") + Uint32toStringIP(host) + wxT(")"));
+				AddDebugLogLineN(logClientUDP, wxT("Ignored DirectCallback Request because we do not accept Direct Callbacks at all (") + Uint32toStringIP(host) + wxT(")"));
 			}
 			break;
 		}

aMule-2.2.6.tar.bz2/src/ClientUDPSocket.h -> aMule-2.3.1.tar.bz2/src/ClientUDPSocket.h Changed

aMule-2.2.6.tar.bz2/src/ColorFrameCtrl.cpp -> aMule-2.3.1.tar.bz2/src/ColorFrameCtrl.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -26,16 +26,15 @@
 #include <wx/dcclient.h>
 
 #include "ColorFrameCtrl.h"	// Interface declarations
+#include "MuleColour.h"
 
 /////////////////////////////////////////////////////////////////////////////
 // CColorFrameCtrl
 CColorFrameCtrl::CColorFrameCtrl( wxWindow* parent,int id, int wid,int hei )
   : wxControl(parent,id,wxDefaultPosition,wxSize(wid,hei)),
-    m_brushBack(wxColour(0,0,0),wxSOLID),
-    m_brushFrame(wxColour(0,255,255),wxSOLID)
+    m_brushBack(*wxBLACK_BRUSH),
+    m_brushFrame(CMuleColour(0,255,255).GetBrush())
 {
-	m_crBackColor  = RGB(  0,   0,   0) ;  // see also SetBackgroundColor
-	m_crFrameColor  = RGB(  0, 255, 255) ;  // see also SetFrameColor
 	SetSizeHints(wid,hei,wid,hei,0,0);
 	wxRect rc=GetClientRect();
 	m_rectClient.left=rc.x;
@@ -60,30 +59,21 @@
 // CColorFrameCtrl message handlers
 
 /////////////////////////////////////////////////////////////////////////////
-void CColorFrameCtrl::SetFrameColor( COLORREF color )
+void CColorFrameCtrl::SetFrameBrushColour(const wxColour& colour)
 {
-	m_crFrameColor = color;
-	m_brushFrame.SetColour(wxColour(GetRValue(m_crFrameColor),
-					GetGValue(m_crFrameColor),
-					GetBValue(m_crFrameColor)));
+	m_brushFrame = *(wxTheBrushList->FindOrCreateBrush(colour, wxSOLID));
 
 	Refresh(FALSE);
-
 }  // SetFrameColor
 
 
 /////////////////////////////////////////////////////////////////////////////
-void CColorFrameCtrl::SetBackgroundColor(COLORREF color)
+void CColorFrameCtrl::SetBackgroundBrushColour(const wxColour& colour)
 {
-	m_crBackColor = color ;
-
-	m_brushBack.SetColour(wxColour(GetRValue(m_crBackColor),
-				       GetGValue(m_crBackColor),
-				       GetBValue(m_crBackColor)));
+	m_brushBack = *(wxTheBrushList->FindOrCreateBrush(colour, wxSOLID));
 
 	// clear out the existing garbage, re-start with a clean plot
 	Refresh(FALSE);
-
 }  // SetBackgroundColor
 
  
@@ -102,8 +92,7 @@
   dc.SetBrush(m_brushBack);
   dc.DrawRectangle(rc);
 
-  wxPen kyna(wxColour(0,0,0),1,wxSOLID);
-  dc.SetPen(kyna);
+  dc.SetPen(*wxBLACK_PEN);
   dc.DrawLine(rc.x+1,rc.y+1,rc.x+rc.width-2,rc.y+1);
   dc.DrawLine(rc.x+rc.width-2,rc.y+1,rc.x+rc.width-2,rc.y+rc.height-2);
   dc.DrawLine(rc.x+rc.width-2,rc.y+rc.height-2,rc.x+1,rc.y+rc.height-2);
@@ -112,6 +101,7 @@
   dc.SetPen(*wxWHITE_PEN);
   dc.DrawLine(rc.x+rc.width-1,rc.y,rc.x+rc.width-1,rc.y+rc.height-1);
   dc.DrawLine(rc.x+rc.width-1,rc.y+rc.height-1,rc.x,rc.y+rc.height-1);
+  
   dc.SetPen(*wxGREY_PEN);
   dc.DrawLine(rc.x+rc.width,rc.y,rc.x,rc.y);
   dc.DrawLine(rc.x,rc.y,rc.x,rc.y+rc.height);

aMule-2.2.6.tar.bz2/src/ColorFrameCtrl.h -> aMule-2.3.1.tar.bz2/src/ColorFrameCtrl.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -30,8 +30,8 @@
 #include <wx/control.h>		// Needed for wxControl
 
 #include "Types.h"		// Needed for RECT
-#include "Color.h"		// Needed for COLORREF
 
+class wxColour;
 
 /////////////////////////////////////////////////////////////////////////////
 // CColorFrameCtrl window
@@ -40,15 +40,10 @@
 
 public:
 	CColorFrameCtrl( wxWindow* parent, int id,int wid,int hei );
-
-	void SetFrameColor(COLORREF color);
-	void SetBackgroundColor(COLORREF color);
-
-	COLORREF m_crBackColor;        // background color
-	COLORREF m_crFrameColor;       // frame color
-
 	virtual ~CColorFrameCtrl();
 
+	void SetFrameBrushColour(const wxColour& colour);
+	void SetBackgroundBrushColour(const wxColour& colour);
 protected:
 
 	void OnPaint(wxPaintEvent& evt);

aMule-2.2.6.tar.bz2/src/CommentDialog.cpp -> aMule-2.3.1.tar.bz2/src/CommentDialog.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -25,6 +25,7 @@
 
 
 #include "CommentDialog.h"	// Interface declarations
+#include "GuiEvents.h"
 #include "KnownFile.h"		// Needed for CKnownFile
 #include "muuli_wdr.h"		// Needed for commentDlg
 // CommentDialog dialog 
@@ -56,10 +57,8 @@
 
 void CCommentDialog::OnBnClickedApply(wxCommandEvent& WXUNUSED(evt))
 {
-	wxString SValue;
-	SValue = CastChild( IDC_CMT_TEXT, wxTextCtrl )->GetValue();
-	m_file->SetFileComment(SValue);
-	m_file->SetFileRating((int8)ratebox->GetSelection());
+	wxString comment = CastChild( IDC_CMT_TEXT, wxTextCtrl )->GetValue();
+	CoreNotify_KnownFile_Comment_Set(m_file, comment, (int8)ratebox->GetSelection());
 	EndModal(0);
 }

aMule-2.2.6.tar.bz2/src/CommentDialog.h -> aMule-2.3.1.tar.bz2/src/CommentDialog.h Changed

aMule-2.2.6.tar.bz2/src/CommentDialogLst.cpp -> aMule-2.3.1.tar.bz2/src/CommentDialogLst.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -85,7 +85,8 @@
 	int count = 0;
 	ClearList();
  
-	const FileRatingList &list = m_file->GetRatingAndComments();
+	FileRatingList list;
+	m_file->GetRatingAndComments(list);
 	for (FileRatingList::const_iterator it = list.begin(); it != list.end(); ++it) {
 		if (!thePrefs::IsCommentFiltered(it->Comment)) {
 			m_list->InsertItem(count, it->UserName);
@@ -101,7 +102,7 @@
 	if (count == 0) {
 		info = _("No comments");
 	} else {
-		info = wxString::Format(wxPLURAL("%u comment", "%u comments", count), count);
+		info = CFormat(wxPLURAL("%u comment", "%u comments", count)) % count;
 	}
 	
 	FindWindow(IDC_CMSTATUS)->SetLabel(info);

aMule-2.2.6.tar.bz2/src/CommentDialogLst.h -> aMule-2.3.1.tar.bz2/src/CommentDialogLst.h Changed

aMule-2.2.6.tar.bz2/src/Constants.h -> aMule-2.3.1.tar.bz2/src/Constants.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2006-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
@@ -42,20 +42,6 @@
 };
 
 
-//! These types specifies the char. of a given item on the CDownloadListCtrl
-enum DownloadItemType
-{
-	//! A CPartFile object
-	FILE_TYPE,
-	//! A source which is currently queued for another file.
-	A4AF_SOURCE,
-	//! A source which has not yet been contacted.
-	UNAVAILABLE_SOURCE,
-	//! A source which is currently queued for this file.
-	AVAILABLE_SOURCE
-};
-
-
 // lfroen : custom events for core internal messages
 // 'cause - there's no wxCommand etc in wxBase
 enum Core_Event_ID 
@@ -80,9 +66,123 @@
 	//! The download is the version check file.
 	HTTP_VersionCheck,
 	//! The download is a notes.dat file (possibly compressed).
-	HTTP_NodesDat
+	HTTP_NodesDat,
+	//! The download is a GeoIP database file (possibly compressed).
+	HTTP_GeoIP
+};
+
+//! Source types for source showing list.
+enum SourceItemType
+{
+	//! A source which is currently queued for another file.
+	A4AF_SOURCE,
+	//! A source which has not yet been contacted.
+	UNAVAILABLE_SOURCE,
+	//! A source which is currently queued for this file.
+	AVAILABLE_SOURCE
 };
 
+//! Types of stat graphs
+enum StatsGraphType {
+	GRAPH_INVALID = 0,
+	GRAPH_DOWN,
+	GRAPH_UP,
+	GRAPH_CONN,
+	GRAPH_KAD
+};
+
+// KnownFile constants
+
+#define	PS_READY			0
+#define	PS_EMPTY			1
+#define PS_WAITINGFORHASH		2
+#define PS_HASHING			3
+#define PS_ERROR			4
+#define	PS_INSUFFICIENT			5
+#define	PS_UNKNOWN			6
+#define PS_PAUSED			7
+#define PS_COMPLETING			8
+#define PS_COMPLETE			9
+#define PS_ALLOCATING			10
+
+
+#define PR_VERYLOW			4 // I Had to change this because
+					  // it didn't save negative number
+					  // correctly.. Had to modify the
+					  // sort function for this change..
+#define PR_LOW				0 //*
+#define PR_NORMAL			1 // Don't change this - needed for
+					  // edonkey clients and server!
+#define PR_HIGH				2 //*
+#define PR_VERYHIGH			3
+#define PR_AUTO				5
+#define PR_POWERSHARE			6 //added for powershare (deltaHF)
+
+
+// CUpDownClient constants
+
+enum ESourceFrom {
+	SF_NONE,
+	SF_LOCAL_SERVER,
+	SF_REMOTE_SERVER,
+	SF_KADEMLIA,
+	SF_SOURCE_EXCHANGE,
+	SF_PASSIVE,
+	SF_LINK,
+	SF_SOURCE_SEEDS,
+	SF_SEARCH_RESULT
+};
+
+// downloadstate
+enum EDownloadState {
+	DS_DOWNLOADING = 0,
+	DS_ONQUEUE,
+	DS_CONNECTED,
+	DS_CONNECTING,
+	DS_WAITCALLBACK,
+	DS_WAITCALLBACKKAD,
+	DS_REQHASHSET,
+	DS_NONEEDEDPARTS,
+	DS_TOOMANYCONNS,
+	DS_TOOMANYCONNSKAD,
+	DS_LOWTOLOWIP,
+	DS_BANNED,
+	DS_ERROR,
+	DS_NONE,
+	DS_REMOTEQUEUEFULL  // not used yet, except in statistics
+};
+
+// uploadstate
+enum EUploadState {
+	US_UPLOADING = 0,
+	US_ONUPLOADQUEUE,
+	US_WAITCALLBACK,
+	US_CONNECTING,
+	US_PENDING,
+	US_LOWTOLOWIP,
+	US_BANNED,
+	US_ERROR,
+	US_NONE
+};
+
+// Obfuscation status
+enum EObfuscationState {
+	OBST_UNDEFINED = 0,
+	OBST_ENABLED,
+	OBST_SUPPORTED,
+	OBST_NOT_SUPPORTED,
+	OBST_DISABLED
+};
+
+// m_byChatstate
+enum {
+	MS_NONE = 0,
+	MS_CHATTING,
+	MS_CONNECTING,
+	MS_UNABLETOCONNECT
+};
+
+
 
 #endif
 // File_checked_for_headers

aMule-2.3.1.tar.bz2/src/CorruptionBlackBox.cpp Added

@@ -0,0 +1,274 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2008-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-2011 Stu Redman ( sturedman@amule.org )
+// Copyright (C) 2002-2011 Merkur ( strEmail.Format("%s@%s", "devteam", "emule-project.net") / http://www.emule-project.net )
+//
+// 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
+//
+
+#include "CorruptionBlackBox.h"
+#include <protocol/ed2k/Constants.h>	// needed for PARTSIZE
+#include "updownclient.h"		// Needed for CUpDownClient
+#include "Logger.h"
+#include "amule.h"				// needed for theApp
+#include "ClientList.h"
+#include "NetworkFunctions.h"	// needed for Uint32toStringIP
+#include "OtherFunctions.h"		// needed for CastItoXBytes
+#include <common/Format.h>		// needed for CFormat
+#include <common/Macros.h>
+
+#define	 CBB_BANTHRESHOLD	32 //% max corrupted data	
+
+// Record to store information which piece of data was downloaded from which client
+
+CCorruptionBlackBox::CCBBRecord::CCBBRecord(uint32 nStartPos, uint32 nEndPos, uint32 dwIP)
+{
+	if (nStartPos > nEndPos) {
+		wxFAIL;
+		return;
+	}
+	m_nStartPos = nStartPos;
+	m_nEndPos = nEndPos;
+	m_dwIP = dwIP;
+}
+
+// Try to merge new data to an existing record
+bool CCorruptionBlackBox::CCBBRecord::Merge(uint32 nStartPos, uint32 nEndPos, uint32 dwIP)
+{
+	if (m_dwIP == dwIP) {
+		if (nStartPos == m_nEndPos + 1) {
+			m_nEndPos = nEndPos;
+			return true;
+		} else if (nEndPos + 1 == m_nStartPos) {
+			m_nStartPos = nStartPos;
+			return true;
+		}
+	}
+	return false;
+}
+
+// Release memory (after download completes)
+void CCorruptionBlackBox::Free()
+{
+	m_Records.clear();
+	m_goodClients.clear();
+	m_badClients.clear();
+}
+
+// Store a piece of received data (don't know if it's good or bad yet).
+// Data is stored in a list for the chunk in belongs to.
+void CCorruptionBlackBox::TransferredData(uint64 nStartPos, uint64 nEndPos, uint32 senderIP)
+{
+	if (nStartPos > nEndPos) {
+		wxFAIL;
+		return;
+	}
+	
+	// convert pos to relative block pos
+	uint16 nPart = (uint16)(nStartPos / PARTSIZE);
+	uint32 nRelStartPos = nStartPos - nPart*PARTSIZE;
+	uint32 nRelEndPos = nEndPos - nPart*PARTSIZE;
+	if (nRelEndPos >= PARTSIZE) {
+		// data crosses the partborder, split it
+		// (for the fun of it, this should never happen)
+		nRelEndPos = PARTSIZE-1;
+		TransferredData((nPart+1)*PARTSIZE, nEndPos, senderIP);
+	}
+	//
+	// Let's keep things simple.
+	// We don't request data we already have.
+	// We check if received data exceeds block boundaries.
+	// -> There should not be much overlap here.
+	// So just stuff everything received into the list and only join adjacent blocks.
+	//
+	CRecordList & list = m_Records[nPart]; // this creates the entry if it doesn't exist yet
+	bool merged = false;
+	for (CRecordList::iterator it = list.begin(); it != list.end() && !merged; ++it) {
+		merged = it->Merge(nRelStartPos, nRelEndPos, senderIP);
+	}
+	if (!merged) {
+		list.push_back(CCBBRecord(nRelStartPos, nRelEndPos, senderIP));
+		AddDebugLogLineN(logPartFile, CFormat(wxT("CorruptionBlackBox(%s): transferred: new record for part %d (%d - %d, %s)")) 
+			% m_partNumber % nPart % nRelStartPos % nRelEndPos % Uint32toStringIP(senderIP));
+	}
+}
+
+// Mark a piece of data as good or bad.
+// Piece is removed from the chunk list and added to the client's record.
+void CCorruptionBlackBox::VerifiedData(bool ok, uint16 nPart, uint32 nRelStartPos, uint32 nRelEndPos) {
+	if (nRelStartPos > nRelEndPos) {
+		wxFAIL;
+		return;
+	}
+
+	CRecordList & list = m_Records[nPart];
+#ifdef __DEBUG__
+	std::map<uint32, bool> mapDebug;
+	uint32 nDbgVerifiedBytes = 0;
+	size_t listsize1 = list.size();
+#endif
+	for (CRecordList::iterator it1 = list.begin(); it1 != list.end();) {
+		CRecordList::iterator it = it1++;
+		uint32 & curStart = it->m_nStartPos;
+		uint32 & curEnd   = it->m_nEndPos;
+		uint32 ip = it->m_dwIP;
+		uint32 data = 0;
+		if (curStart >= nRelStartPos && curStart <= nRelEndPos) {
+			// [arg
+			//   [cur
+			if (curEnd > nRelEndPos) {
+				// [arg]
+				//   [cur]
+				data = nRelEndPos - curStart + 1;
+				curStart = nRelEndPos + 1;
+			} else {
+				// [arg    ]
+				//   [cur]
+				data = curEnd - curStart + 1;
+				list.erase(it);
+			}
+		} else if (curStart < nRelStartPos && curEnd >= nRelStartPos) {
+			//   [arg
+			// [cur
+			if (curEnd > nRelEndPos) {
+				//   [arg]
+				// [cur    ]
+				data = nRelEndPos - nRelStartPos + 1;
+				// split it: insert new block before current block
+				list.insert(it, CCBBRecord(curStart, nRelStartPos - 1, ip));
+				curStart = nRelEndPos + 1;
+			} else {
+				//   [arg]
+				// [cur]
+				data = curEnd - nRelStartPos + 1;
+				curEnd = nRelStartPos - 1;
+			}
+		// else no overlap
+		}
+		if (data) {
+			if (ok) {
+				m_goodClients[ip].m_downloaded += data;
+			} else {
+				// corrupted data records are always counted as at least blocksize or bigger
+				m_badClients[ip].m_downloaded += (data > EMBLOCKSIZE) ? data : EMBLOCKSIZE;;
+			}
+			DEBUG_ONLY(nDbgVerifiedBytes += data);
+			DEBUG_ONLY(mapDebug[ip] = 1);
+		}
+	}
+	DEBUG_ONLY(size_t listsize2 = list.size());
+	// when everything is added to the stats drop the whole record
+	if (list.empty()) {
+		m_Records.erase(nPart);
+	}
+#ifdef __DEBUG__
+	AddDebugLogLineN(logPartFile, CFormat(wxT("CorruptionBlackBox(%s): found and marked %d recorded bytes of %d as %s in part %d, %d records found, %d records left, %d different clients"))
+		% m_partNumber % nDbgVerifiedBytes % (nRelEndPos-nRelStartPos+1) % (ok ? wxT("verified") : wxT("corrupt"))
+		% nPart % listsize1 % listsize2 % mapDebug.size());
+#endif
+}
+
+// Check all clients that uploaded corrupted data,
+// and ban them if they didn't upload enough good data too.
+void CCorruptionBlackBox::EvaluateData()
+{
+	CCBBClientMap::iterator it = m_badClients.begin();
+	for (; it != m_badClients.end(); ++it) {
+		uint32 ip = it->first;
+		uint64 bad = it->second.m_downloaded;
+		if (!bad) {
+			wxFAIL;		// this should not happen
+			continue;
+		}
+		uint64 good = 0;
+		CCBBClientMap::iterator it2 = m_goodClients.find(ip);
+		if (it2 != m_goodClients.end()) {
+			good = it2->second.m_downloaded;
+		}
+
+		int nCorruptPercentage = bad * 100 / (bad + good);
+
+		if (nCorruptPercentage > CBB_BANTHRESHOLD) {
+			CUpDownClient* pEvilClient = theApp->clientlist->FindClientByIP(ip);
+			wxString clientName;
+			if (pEvilClient != NULL) {
+				clientName = pEvilClient->GetClientShortInfo();
+				AddDebugLogLineN(logPartFile, CFormat(wxT("CorruptionBlackBox(%s): Banning: Found client which sent %d of %d corrupted data, %s"))
+					% m_partNumber % bad % (good + bad) % pEvilClient->GetClientFullInfo());
+				theApp->clientlist->AddTrackClient(pEvilClient);
+				pEvilClient->Ban();  // Identified as sender of corrupt data
+				// Stop download right away
+				pEvilClient->SetDownloadState(DS_BANNED);
+				if (pEvilClient->Disconnected(wxT("Upload of corrupted data"))) {
+					pEvilClient->Safe_Delete();
+				}
+			} else {
+				clientName = Uint32toStringIP(ip);
+				theApp->clientlist->AddBannedClient(ip);
+			}
+			AddLogLineN(CFormat(_("Banned client %s for sending %s corrupt data of %s total for the file '%s'")) 
+				% clientName % CastItoXBytes(bad) % CastItoXBytes(good + bad) % m_fileName);
+		} else {
+			CUpDownClient* pSuspectClient = theApp->clientlist->FindClientByIP(ip);
+			if (pSuspectClient != NULL) {
+				AddDebugLogLineN(logPartFile, CFormat(wxT("CorruptionBlackBox(%s): Reporting: Found client which probably sent %d of %d corrupted data, but it is within the acceptable limit, %s"))
+					% m_partNumber % bad % (good + bad) % pSuspectClient->GetClientFullInfo());
+				theApp->clientlist->AddTrackClient(pSuspectClient);
+			} else {
+				AddDebugLogLineN(logPartFile, CFormat(wxT("CorruptionBlackBox(%s): Reporting: Found client which probably sent %d of %d corrupted data, but it is within the acceptable limit, %s"))
+					% m_partNumber % bad % (good + bad) % Uint32toStringIP(ip));
+			}
+		}
+	}
+}
+
+// Full debug output of all data
+void CCorruptionBlackBox::DumpAll()
+{
+#ifdef __DEBUG__
+	AddDebugLogLineN(logPartFile, wxT("CBB Dump Records"));
+	std::map<uint16, CRecordList>::iterator it = m_Records.begin();
+	for (; it != m_Records.end(); ++it) {
+		uint16 block = it->first;
+		CRecordList & list = it->second;
+		for (CRecordList::iterator it2 = list.begin(); it2 != list.end(); ++it2) {
+			AddDebugLogLineN(logPartFile, CFormat(wxT("CBBD %6d %.16s %10d - %10d"))
+				% block % Uint32toStringIP(it2->m_dwIP) % it2->m_nStartPos % it2->m_nEndPos);
+		}
+	}
+	if (!m_goodClients.empty()) {
+		AddDebugLogLineN(logPartFile, wxT("CBB Dump good Clients"));
+		CCBBClientMap::iterator it3 = m_goodClients.begin();
+		for (; it3 != m_goodClients.end(); ++it3) {
+			AddDebugLogLineN(logPartFile, CFormat(wxT("CBBD %.16s good %10d"))
+				% Uint32toStringIP(it3->first) % it3->second.m_downloaded);
+		}
+	}
+	if (!m_badClients.empty()) {
+		AddDebugLogLineN(logPartFile, wxT("CBB Dump bad Clients"));
+		CCBBClientMap::iterator it3 = m_badClients.begin();
+		for (; it3 != m_badClients.end(); ++it3) {
+			AddDebugLogLineN(logPartFile, CFormat(wxT("CBBD %.16s bad %10d"))
+				% Uint32toStringIP(it3->first) % it3->second.m_downloaded);
+		}
+	}
+#endif
+}

aMule-2.3.1.tar.bz2/src/CorruptionBlackBox.h Added

@@ -0,0 +1,76 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2008-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-2011 Stu Redman ( sturedman@amule.org )
+// Copyright (C) 2002-2011 Merkur ( strEmail.Format("%s@%s", "devteam", "emule-project.net") / http://www.emule-project.net )
+//
+// 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 CORRUPTIONBLACKBOX_H
+#define CORRUPTIONBLACKBOX_H
+
+#include "Types.h"
+#include <list>
+#include <map>
+
+class CCorruptionBlackBox
+{
+public:
+	void Free();
+	void TransferredData(uint64 nStartPos, uint64 nEndPos, uint32 senderIP);
+	void VerifiedData(bool ok, uint16 nPart, uint32 nRelStartPos, uint32 nRelEndPos);
+	void EvaluateData();
+	void SetPartFileInfo(const wxString& name, const wxString& nr) { m_fileName = name; m_partNumber = nr; }
+	void DumpAll();
+
+private:
+	// downloaded data for each part
+	class CCBBRecord
+	{
+	public:
+		CCBBRecord(uint32 nStartPos, uint32 nEndPos, uint32 dwIP);
+		bool Merge(uint32 nStartPos, uint32 nEndPos, uint32 dwIP);
+
+		// Startpos / Endpos relative to part
+		uint32	m_nStartPos;
+		uint32	m_nEndPos;
+		// IP of client
+		uint32	m_dwIP;
+	};
+	typedef std::list<CCBBRecord> CRecordList;
+	std::map<uint16, CRecordList> m_Records;
+
+	// good/bad data for each client
+	class CCBBClient
+	{
+	public:
+		CCBBClient() { m_downloaded = 0; }
+		uint64 m_downloaded;
+	};
+	typedef std::map<uint32, CCBBClient> CCBBClientMap;
+	CCBBClientMap m_goodClients, m_badClients;
+
+	// for debug prints
+	wxString m_fileName;
+	wxString m_partNumber;
+};
+
+#endif

aMule-2.2.6.tar.bz2/src/CryptoPP_Inc.h -> aMule-2.3.1.tar.bz2/src/CryptoPP_Inc.h Changed

aMule-2.2.6.tar.bz2/src/DataToText.cpp -> aMule-2.3.1.tar.bz2/src/DataToText.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// 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
@@ -24,7 +24,7 @@
 
 
 #include "KnownFile.h"		// Needed by PriorityToStr
-#include "updownclient.h"	// Needed by DownloadStateToStr and GetSoftName
+#include "Constants.h"		// Needed by DownloadStateToStr and GetSoftName
 #define __need_convstatus	// Only the conversion status enum is needed
 #include "PartFileConvert.h"	// Needed by GetConversionState
 
@@ -49,7 +49,7 @@
 		}
 	}
 
-	wxASSERT( false );
+	wxFAIL;
 
 	return _("Unknown");
 }
@@ -62,7 +62,7 @@
 		case DS_CONNECTED:		return _("Asking");
 		case DS_WAITCALLBACK:		return _("Connecting via server");
 		case DS_ONQUEUE:		return ( queueFull ? _("Queue Full") : _("On Queue") );
-		case DS_DOWNLOADING:		return _("Transferring");
+		case DS_DOWNLOADING:		return _("Downloading");
 		case DS_REQHASHSET:		return _("Receiving hashset");
 		case DS_NONEEDEDPARTS:		return _("No needed parts");
 		case DS_LOWTOLOWIP:		return _("Cannot connect LowID to LowID");
@@ -75,7 +75,7 @@
 		case DS_REMOTEQUEUEFULL:	return _("Remote Queue Full");
 	}
 	
-	wxASSERT( false );
+	wxFAIL;
 
 	return _("Unknown");
 }
@@ -132,7 +132,7 @@
 		case SF_PASSIVE:		return wxTRANSLATE("Passive");
 		case SF_LINK:			return wxTRANSLATE("Link");
 		case SF_SOURCE_SEEDS:		return wxTRANSLATE("Source Seeds");
-		case SF_SEARCH_RESULT:          return wxTRANSLATE("Search Result");
+		case SF_SEARCH_RESULT:		return wxTRANSLATE("Search Result");
 		case SF_NONE:
 		default:		return wxTRANSLATE("Unknown");
 	}

aMule-2.2.6.tar.bz2/src/DataToText.h -> aMule-2.3.1.tar.bz2/src/DataToText.h Changed

aMule-2.2.6.tar.bz2/src/DeadSourceList.cpp -> aMule-2.3.1.tar.bz2/src/DeadSourceList.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (C) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2004 Merkur ( devs@users.sourceforge.net / http://www.emule-project.net )
+// Copyright (c) 2005-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,7 +27,7 @@
 
 #include <common/Macros.h>
 
-#include "updownclient.h"
+#include "updownclient.h"		// Needed for CUpDownClient
 
 #define	CLEANUPTIME			MIN2MS(60)
 
@@ -157,10 +157,9 @@
 
 	DeadSourceIterator it = m_sources.begin();
 	for ( ; it != m_sources.end(); ) {
-		if ( it->second.GetTimeout() < m_dwLastCleanUp ) {
-			m_sources.erase( it++ );
-		} else {
-			++it;
+		DeadSourceIterator it1 = it++;
+		if ( it1->second.GetTimeout() < m_dwLastCleanUp ) {
+			m_sources.erase( it1 );
 		}
 	}
 }

aMule-2.2.6.tar.bz2/src/DeadSourceList.h -> aMule-2.3.1.tar.bz2/src/DeadSourceList.h Changed

aMule-2.2.6.tar.bz2/src/DirectoryTreeCtrl.cpp -> aMule-2.3.1.tar.bz2/src/DirectoryTreeCtrl.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Robert Rostek ( tecxx@rrs.at )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Robert Rostek ( tecxx@rrs.at )
+// 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,
 // or contributed by third-party developers are copyrighted by their
@@ -32,6 +32,7 @@
 
 #include <common/StringFunctions.h>
 #include <common/FileFunctions.h>
+#include "amule.h"			// Needed for theApp
 #include "muuli_wdr.h"		// Needed for amuleSpecial
 
 
@@ -46,19 +47,14 @@
 {
 	public:
 		CItemData(const CPath& pathComponent)
-			: m_data(0)
-			, m_path(pathComponent)
+			: m_path(pathComponent)
 		{
 		}
 
 		~CItemData() {}
 
-		void AddCount() { m_data++; }
-		void SubCount() { m_data--; }
-		int GetCount() const { return m_data; }
 		const CPath& GetPathComponent() const { return m_path; }
 	private:
-		int	m_data;
 		CPath	m_path;
 };
 
@@ -67,6 +63,12 @@
 	: wxTreeCtrl(parent,id,pos,siz,flags,wxDefaultValidator,wxT("ShareTree"))
 {
 	m_IsInit = false;
+	HasChanged = false;
+#ifdef CLIENT_GUI
+	m_IsRemote = !theApp->m_connect->IsConnectedToLocalHost();
+#else
+	m_IsRemote = false;
+#endif
 }
 
 
@@ -98,34 +100,35 @@
 	
 	// Create an empty root item, which we can
 	// safely append when creating a full path.
-	wxTreeItemId root = AddRoot(wxEmptyString, IMAGE_FOLDER, -1,
+	m_root = AddRoot(wxEmptyString, IMAGE_FOLDER, -1,
 					new CItemData(CPath()));
 	
-
-#ifndef __WXMSW__
-	AddChildItem(root, CPath(wxT("/")));
-#else
-	// this might take awhile, so change the cursor
-	::wxSetCursor(*wxHOURGLASS_CURSOR);
-	// retrieve bitmask of all drives available
-	uint32 drives = GetLogicalDrives();
-	drives >>= 1;
-	for (char drive = 'C'; drive <= 'Z'; drive++) {
+	if (!m_IsRemote) {
+	#ifndef __WXMSW__
+		AddChildItem(m_root, CPath(wxT("/")));
+	#else
+		// this might take awhile, so change the cursor
+		::wxSetCursor(*wxHOURGLASS_CURSOR);
+		// retrieve bitmask of all drives available
+		uint32 drives = GetLogicalDrives();
 		drives >>= 1;
-		if (! (drives & 1)) { // skip non existant drives
-			continue;
-		}
-		wxString driveStr = wxString::Format(wxT("%c:"), drive);
-		uint32 type = GetDriveType(driveStr + wxT("\\"));
+		for (char drive = 'C'; drive <= 'Z'; drive++) {
+			drives >>= 1;
+			if (! (drives & 1)) { // skip non existant drives
+				continue;
+			}
+			wxString driveStr = CFormat(wxT("%c:")) % drive;
+			uint32 type = GetDriveType(driveStr + wxT("\\"));
 
-		// skip removable/undefined drives, share only fixed or remote drives
-		if ((type == 3 || type == 4)   // fixed drive / remote drive
-			&& CPath::DirExists(driveStr)) {
-			AddChildItem(root, CPath(driveStr));
+			// skip removable/undefined drives, share only fixed or remote drives
+			if ((type == 3 || type == 4)   // fixed drive / remote drive
+				&& CPath::DirExists(driveStr)) {
+				AddChildItem(m_root, CPath(driveStr));
+			}
 		}
+		::wxSetCursor(*wxSTANDARD_CURSOR);
+	#endif
 	}
-	::wxSetCursor(*wxSTANDARD_CURSOR);
-#endif
 
 	HasChanged = false;
 
@@ -147,19 +150,28 @@
 
 void CDirectoryTreeCtrl::OnItemActivated(wxTreeEvent& evt)
 {
-	CheckChanged(evt.GetItem(), !IsBold(evt.GetItem()));
-	HasChanged = true;
+	if (!m_IsRemote) {
+		CheckChanged(evt.GetItem(), !IsBold(evt.GetItem()), false);
+		HasChanged = true;
+	}
 }
 
 
 void CDirectoryTreeCtrl::OnRButtonDown(wxTreeEvent& evt)
 {
-	MarkChildren(evt.GetItem(), !IsBold(evt.GetItem()));
-	HasChanged = true;
+	if (m_IsRemote) {
+		SelectItem(evt.GetItem()); // looks weird otherwise
+	} else {
+		// this might take awhile, so change the cursor
+		::wxSetCursor(*wxHOURGLASS_CURSOR);
+		MarkChildren(evt.GetItem(), !IsBold(evt.GetItem()), false);
+		::wxSetCursor(*wxSTANDARD_CURSOR);
+		HasChanged = true;
+	}
 }
 
 
-void CDirectoryTreeCtrl::MarkChildren(wxTreeItemId hChild, bool mark)
+void CDirectoryTreeCtrl::MarkChildren(wxTreeItemId hChild, bool mark, bool recursed)
 {
 	// Ensure that children are added, otherwise we might only get a "." entry.
 	if (!IsExpanded(hChild) && ItemHasChildren(hChild)) {
@@ -170,13 +182,16 @@
 	
 	wxTreeItemIdValue cookie;
 	wxTreeItemId hChild2 = GetFirstChild(hChild, cookie);
+	if (hChild2.IsOk()) {
+		SetHasSharedSubdirectory(hChild, mark);
+	}
 	while (hChild2.IsOk()) {
-		MarkChildren(hChild2, mark);
+		MarkChildren(hChild2, mark, true);
 
 		hChild2 = GetNextSibling(hChild2);
 	}
 
-	CheckChanged(hChild, mark);
+	CheckChanged(hChild, mark, recursed);
 }
 
 
@@ -189,13 +204,16 @@
 						IMAGE_FOLDER, -1,
 						new CItemData(item));
 	
+	// BUG: wxGenericTreeControl won't set text calculated sizes when the item is created in AppendItem.
+	// This causes asserts on Mac and possibly other systems, so we have to repeat setting the string here.
+	SetItemText(treeItem, item.GetPrintable()); 
+
 	if (IsShared(fullPath)) {
 		SetItemBold(treeItem, true);
-		UpdateParentItems(treeItem, true);
 	}
 	
 	if (HasSharedSubdirectory(fullPath)) {
-		SetItemImage(treeItem, IMAGE_FOLDER_SUB_SHARED);
+		SetHasSharedSubdirectory(treeItem, true);
 	}
 	
 	if (HasSubdirectories(fullPath)) {
@@ -207,7 +225,7 @@
 
 CPath CDirectoryTreeCtrl::GetFullPath(wxTreeItemId hItem)
 {
-	wxCHECK_MSG(hItem.IsOk(), CPath(), wxT("Invalid item in GetFullPath"));
+	{ wxCHECK_MSG(hItem.IsOk(), CPath(), wxT("Invalid item in GetFullPath")); }
 	
 	CPath result;
 	for (; hItem.IsOk(); hItem = GetItemParent(hItem)) {
@@ -249,7 +267,9 @@
 {
 	wxCHECK_RET(list, wxT("Invalid list in GetSharedDirectories"));
 	
-	list->insert(list->end(), m_lstShared.begin(), m_lstShared.end());
+	for (SharedMap::iterator it = m_lstShared.begin(); it != m_lstShared.end(); it++) {
+		list->push_back(it->second);
+	}
 }
 
 
@@ -258,7 +278,9 @@
 	wxCHECK_RET(list, wxT("Invalid list in SetSharedDirectories"));
 	
 	m_lstShared.clear();
-	m_lstShared.insert(m_lstShared.end(), list->begin(), list->end());
+	for (PathList::iterator it = list->begin(); it != list->end(); it++) {
+		m_lstShared.insert(SharedMapItem(GetKey(*it), *it));
+	}
 
 	if (m_IsInit) {
 		UpdateSharedDirectories();
@@ -266,8 +288,32 @@
 }
 
 
+wxString CDirectoryTreeCtrl::GetKey(const CPath& path)
+{
+	if (m_IsRemote) {
+		return path.GetRaw();
+	}
+
+	// Sanity check, see IsSameAs() in Path.cpp
+	const wxString cwd = wxGetCwd();
+	const int flags = (wxPATH_NORM_ALL | wxPATH_NORM_CASE) & ~wxPATH_NORM_ENV_VARS;
+	wxFileName fn(path.GetRaw());
+	fn.Normalize(flags, cwd);
+	return fn.GetFullPath();
+}
+
+
 void CDirectoryTreeCtrl::UpdateSharedDirectories()
 {
+	// ugly hack to at least show shared dirs in remote gui
+	if (m_IsRemote) {
+		DeleteChildren(m_root);
+		for (SharedMap::iterator it = m_lstShared.begin(); it != m_lstShared.end(); it++) {
+			AppendItem(m_root, it->second.GetPrintable(), IMAGE_FOLDER, -1, new CItemData(it->second));
+		}
+		return;
+	}
+
 	// Mark all shared root items (on windows this can be multiple
 	// drives, on unix there is only the root dir).
 	wxTreeItemIdValue cookie;
@@ -276,7 +322,7 @@
 	while (hChild.IsOk()) {
 		// Does this drive have shared subfolders?
 		if (HasSharedSubdirectory(GetFullPath(hChild))) { 
-			SetItemImage(hChild, IMAGE_FOLDER_SUB_SHARED);
+			SetHasSharedSubdirectory(hChild, true);
 		}
 		
 		// Is this drive shared?
@@ -291,19 +337,22 @@
 
 bool CDirectoryTreeCtrl::HasSharedSubdirectory(const CPath& path)
 {
-	PathList::iterator it = m_lstShared.begin();
-	for (; it != m_lstShared.end(); ++it) {
-		// IsSameDir to avoid the case where 'path' itself is shared.
-		if (it->StartsWith(path) && (!it->IsSameDir(path))) {
-			return true;
-		}
+	SharedMap::iterator it = m_lstShared.upper_bound(GetKey(path) + wxFileName::GetPathSeparator());
+	if (it == m_lstShared.end()) {
+		return false;
 	}
+	// upper_bound() doesn't find the directory itself, so no need to check for that.
+	return it->second.StartsWith(path);
+}
+
 
-	return false;
+void CDirectoryTreeCtrl::SetHasSharedSubdirectory(wxTreeItemId hItem, bool add)
+{
+	SetItemImage(hItem, add ? IMAGE_FOLDER_SUB_SHARED : IMAGE_FOLDER);
 }
 
 
-void CDirectoryTreeCtrl::CheckChanged(wxTreeItemId hItem, bool bChecked)
+void CDirectoryTreeCtrl::CheckChanged(wxTreeItemId hItem, bool bChecked, bool recursed)
 {
 	if (IsBold(hItem) != bChecked) {
 		SetItemBold(hItem, bChecked);
@@ -314,7 +363,9 @@
 			DelShare(GetFullPath(hItem));
 		}
 
-		UpdateParentItems(hItem, bChecked);
+		if (!recursed) {
+			UpdateParentItems(hItem, bChecked);
+		}
 	}
 }
 
@@ -323,14 +374,7 @@
 {
 	wxCHECK_MSG(path.IsOk(), false, wxT("Invalid path in IsShared"));
 
-	PathList::iterator it = m_lstShared.begin();
-	for (; it != m_lstShared.end(); ++it) {
-		if (it->IsSameDir(path)) {
-			return true;
-		}
-	}
-
-	return false;
+	return m_lstShared.find(GetKey(path)) != m_lstShared.end();
 }
 
 
@@ -342,7 +386,7 @@
 		return;
 	}
 	
-	m_lstShared.push_back(path);
+	m_lstShared.insert(SharedMapItem(GetKey(path), path));
 }
 
 
@@ -350,13 +394,7 @@
 {
 	wxCHECK_RET(path.IsOk(), wxT("Invalid path in DelShare"));
 	
-	PathList::iterator it = m_lstShared.begin();
-	for (; it != m_lstShared.end(); ++it ) {
-		if (it->IsSameDir(path)) {
-			m_lstShared.erase(it);
-			return;
-		}
-	}
+	m_lstShared.erase(GetKey(path));
 }
 
 
@@ -365,23 +403,27 @@
 	wxTreeItemId parent = hChild;
 	while (parent != GetRootItem()) {
 		parent = GetItemParent(parent);
-		CItemData* parent_data = dynamic_cast<CItemData*>(GetItemData(parent));
 		if (add) {
-			parent_data->AddCount();
-			if (parent_data->GetCount()==1) {
-				SetItemImage(parent, IMAGE_FOLDER_SUB_SHARED);
+			if (GetItemImage(parent) == IMAGE_FOLDER_SUB_SHARED) {
+				// parent already marked -> so are all its parents, finished
+				break;
+			} else {
+				SetHasSharedSubdirectory(parent, true);
 			}
 		} else {
-			switch (parent_data->GetCount()) {
-				case 0:
-					break;
-				case 1:
-					SetItemImage(parent, IMAGE_FOLDER);
-				default:
-					parent_data->SubCount();
+			if (GetItemImage(parent) == IMAGE_FOLDER_SUB_SHARED) {
+				// check if now there are still other shared dirs
+				if (HasSharedSubdirectory(GetFullPath(parent))) {
+					// yes, then further parents can stay red
 					break;
+				} else {
+					// no, further parents have to be checked too
+					SetHasSharedSubdirectory(parent, false);
+				}
+			} else {  // should not happen (unmark child of which the parent is already unmarked
+				break;
 			}
 		}
-	};
+	}
 }
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/DirectoryTreeCtrl.h -> aMule-2.3.1.tar.bz2/src/DirectoryTreeCtrl.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Robert Rostek ( tecxx@rrs.at )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2002-2011 Robert Rostek ( tecxx@rrs.at )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -28,6 +28,7 @@
 
 #include <wx/treectrl.h>
 #include <vector>
+#include <map>
 
 #include <common/Path.h>
 
@@ -61,28 +62,37 @@
 	// return the full path of an item (like C:\abc\somewhere\inheaven\)
 	CPath GetFullPath(wxTreeItemId hItem);
 	// check status of an item has changed
-	void CheckChanged(wxTreeItemId hItem, bool bChecked);
+	void CheckChanged(wxTreeItemId hItem, bool bChecked, bool recursed);
 	// returns true if a subdirectory of strDir is shared
 	bool HasSharedSubdirectory(const CPath& path);
 	// set shared directories according to list
 	void UpdateSharedDirectories();
 	// when sharing a directory, make all parent directories red
 	void UpdateParentItems(wxTreeItemId hChild, bool add);
+	// set color red if there's a shared subdirectory
+	void SetHasSharedSubdirectory(wxTreeItemId hItem, bool add);
 
 	// share list access
 	bool IsShared(const CPath& path);
 	void AddShare(const CPath& path);
 	void DelShare(const CPath& path);
-	void MarkChildren(wxTreeItemId hChild, bool mark);
+	void MarkChildren(wxTreeItemId hChild, bool mark, bool recursed);
 	
 	void OnItemExpanding(wxTreeEvent& evt);
 	void OnRButtonDown(wxTreeEvent& evt);
 	void OnItemActivated(wxTreeEvent& evt);
 
-	PathList m_lstShared;
+	typedef std::pair<wxString, CPath> SharedMapItem;
+	typedef std::map<wxString, CPath> SharedMap;
+	SharedMap m_lstShared;
+	// get map key from path (normalized path)
+	wxString GetKey(const CPath& path);
 
 	bool m_IsInit;
+	// Are we running the remote GUI, and from a remote location?
+	bool m_IsRemote;
 	
+	wxTreeItemId m_root;
 	
 	DECLARE_EVENT_TABLE()
 };

aMule-2.2.6.tar.bz2/src/DownloadClient.cpp -> aMule-2.3.1.tar.bz2/src/DownloadClient.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "updownclient.h"	// Interface declarations
+#include "updownclient.h"		// Needed for CUpDownClient
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Client2Client/TCP.h>
@@ -49,6 +49,7 @@
 #include "Statistics.h"		// Needed for theStats
 #include "Logger.h"
 #include "GuiEvents.h"		// Needed for Notify_*
+#include "UploadQueue.h"	// Needed for CUploadQueue
 
 
 #ifdef __MULE_UNUSED_CODE__
@@ -154,6 +155,7 @@
 	m_bUDPPending = false;
 	m_dwLastAskedTime = ::GetTickCount();
 	SetDownloadState(DS_CONNECTING);
+	SetSentCancelTransfer(0);
 	return TryToConnect();
 }
 
@@ -169,7 +171,7 @@
 	dataStartupLoadReq.WriteHash(m_reqfile->GetFileHash());
 	CPacket* packet = new CPacket(dataStartupLoadReq, OP_EDONKEYPROT, OP_STARTUPLOADREQ);
 	theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-	AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_STARTUPLOADREQ to ") + GetFullIP());	
+	AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_STARTUPLOADREQ to ") + GetFullIP());
 	SendPacket(packet, true, true);
 }
 
@@ -219,16 +221,16 @@
 	dataFileReq.WriteHash(m_reqfile->GetFileHash());
 
 	if (SupportMultiPacket()) {
-		wxString sent_opcodes;
+		DEBUG_ONLY( wxString sent_opcodes; )
 		
 		if (SupportExtMultiPacket()) {
 			dataFileReq.WriteUInt64(m_reqfile->GetFileSize());
 		}
 		
-		AddDebugLogLineM(false, logClient, wxT("Sending file request to client"));
+		AddDebugLogLineN(logClient, wxT("Sending file request to client"));
 		
 		dataFileReq.WriteUInt8(OP_REQUESTFILENAME);
-		sent_opcodes += wxT("|RFNM|");
+		DEBUG_ONLY( sent_opcodes += wxT("|RFNM|"); )
 		// Extended information
 		if (GetExtendedRequestsVersion() > 0) {
 			m_reqfile->WritePartStatus(&dataFileReq);
@@ -237,7 +239,7 @@
 			m_reqfile->WriteCompleteSourcesCount(&dataFileReq);
 		}
 		if (m_reqfile->GetPartCount() > 1) {
-			sent_opcodes += wxT("|RFID|");
+			DEBUG_ONLY( sent_opcodes += wxT("|RFID|"); )
 			dataFileReq.WriteUInt8(OP_SETREQFILEID);
 		}
 		if (IsEmuleClient()) {
@@ -246,25 +248,26 @@
 		}
 		if (IsSourceRequestAllowed()) {
 			if (SupportsSourceExchange2()){
-				sent_opcodes += wxT("|RSRC2|");
+				DEBUG_ONLY( sent_opcodes += wxT("|RSRC2|"); )
 				dataFileReq.WriteUInt8(OP_REQUESTSOURCES2);
 				dataFileReq.WriteUInt8(SOURCEEXCHANGE2_VERSION);
 				const uint16 nOptions = 0; // 16 ... Reserved
 				dataFileReq.WriteUInt16(nOptions);
-			} else{
-				sent_opcodes += wxT("|RSRC|");
+			} else {
+				DEBUG_ONLY( sent_opcodes += wxT("|RSRC|"); )
 				dataFileReq.WriteUInt8(OP_REQUESTSOURCES);
 			}
 			m_reqfile->SetLastAnsweredTimeTimeout();
 			SetLastAskedForSources();
 		}
 		if (IsSupportingAICH()) {
-			sent_opcodes += wxT("|AFHR|");
+			DEBUG_ONLY( sent_opcodes += wxT("|AFHR|"); )
 			dataFileReq.WriteUInt8(OP_AICHFILEHASHREQ);
 		}		
 		CPacket* packet = new CPacket(dataFileReq, OP_EMULEPROT, (SupportExtMultiPacket() ? OP_MULTIPACKET_EXT : OP_MULTIPACKET));
 		theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-		AddDebugLogLineM( false, logLocalClient, wxString::Format(wxT("Local Client: %s "), (SupportExtMultiPacket() ? wxT("OP_MULTIPACKET_EXT (") : wxT("OP_MULTIPACKET (") )) + sent_opcodes + wxT(") to ") + GetFullIP());
+		AddDebugLogLineN(logLocalClient, CFormat(wxT("Local Client: %s (%s) to %s"))
+			% (SupportExtMultiPacket() ? wxT("OP_MULTIPACKET_EXT") : wxT("OP_MULTIPACKET")) % sent_opcodes % GetFullIP());
 		SendPacket(packet, true);
 	} else {
 		//This is extended information
@@ -276,7 +279,7 @@
 		}
 		CPacket* packet = new CPacket(dataFileReq, OP_EDONKEYPROT, OP_REQUESTFILENAME);
 		theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-		AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_REQUESTFILENAME to ") + GetFullIP() );
+		AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_REQUESTFILENAME to ") + GetFullIP() );
 		SendPacket(packet, true);
 	
 		// 26-Jul-2003: removed requesting the file status for files <= PARTSIZE for better compatibility with ed2k protocol (eDonkeyHybrid).
@@ -289,7 +292,7 @@
 			dataSetReqFileID.WriteHash(m_reqfile->GetFileHash());
 			packet = new CPacket(dataSetReqFileID, OP_EDONKEYPROT, OP_SETREQFILEID);
 			theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-			AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_SETREQFILEID to ") + GetFullIP());
+			AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_SETREQFILEID to ") + GetFullIP());
 			SendPacket(packet, true);
 		}
 	
@@ -314,7 +317,7 @@
 			packet = new CPacket(packetdata, OP_EMULEPROT, SupportsSourceExchange2() ? OP_REQUESTSOURCES2 : OP_REQUESTSOURCES);
 			
 			theStats::AddUpOverheadSourceExchange(packet->GetPacketSize());
-			AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_REQUESTSOURCES to ") + GetFullIP() );
+			AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_REQUESTSOURCES to ") + GetFullIP() );
 			SendPacket(packet,true,true);
 			SetLastAskedForSources();
 		}
@@ -324,7 +327,7 @@
 			packet = new CPacket(OP_AICHFILEHASHREQ,16,OP_EMULEPROT);
 			packet->Copy16ToDataBuffer((const char *)m_reqfile->GetFileHash().GetHash());
 			theStats::AddUpOverheadOther(packet->GetPacketSize());
-			AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_AICHFILEHASHREQ to ") + GetFullIP());
+			AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_AICHFILEHASHREQ to ") + GetFullIP());
 			SendPacket(packet,true,true);
 		}
 	}
@@ -353,8 +356,7 @@
 		m_nPartCount = m_reqfile->GetPartCount();
 		
 		m_reqfile->UpdatePartsFrequency( this, false );	// Decrement
-		m_downPartStatus.clear();
-		m_downPartStatus.resize( m_nPartCount, 1 );
+		m_downPartStatus.setsize( m_nPartCount, 1 );
 		m_reqfile->UpdatePartsFrequency( this, true );	// Increment
 		
 		m_bCompleteSource = true;
@@ -366,13 +368,13 @@
 				CPacket* packet = new CPacket(OP_HASHSETREQUEST,16, OP_EDONKEYPROT);
 				packet->Copy16ToDataBuffer((const char *)m_reqfile->GetFileHash().GetHash());
 				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_HASHSETREQUEST to ") + GetFullIP());
+				AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_HASHSETREQUEST to ") + GetFullIP());
 				SendPacket(packet,true,true);
 				SetDownloadState(DS_REQHASHSET);
 				m_fHashsetRequesting = 1;
 				m_reqfile->SetHashSetNeeded(false);
 			} else {
-				wxASSERT(0);
+				wxFAIL;
 			}
 		} else {
 			SendStartupLoadReq();
@@ -403,7 +405,7 @@
 	if (!nED2KPartCount)
 	{
 		m_nPartCount = m_reqfile->GetPartCount();
-		m_downPartStatus.resize( m_nPartCount, 1);
+		m_downPartStatus.setsize( m_nPartCount, 1);
 		bPartsNeeded = true;
 		m_bCompleteSource = true;
 	}
@@ -425,7 +427,7 @@
 		m_nPartCount = m_reqfile->GetPartCount();
 
 		m_bCompleteSource = false;
-		m_downPartStatus.resize( m_nPartCount, 0 );
+		m_downPartStatus.setsize( m_nPartCount, 0 );
 		uint16 done = 0;
 	
 		try {
@@ -433,10 +435,11 @@
 				uint8 toread = data->ReadUInt8();
 			
 				for ( uint8 i = 0;i < 8; i++ ) {
-					m_downPartStatus[done] = ((toread>>i)&1)? 1:0;
+					bool status = ((toread>>i)&1)? 1:0;
+					m_downPartStatus.set(done, status);
 				
-					if ( m_downPartStatus[done] ) {
-						if (!m_reqfile->IsComplete(done*PARTSIZE,((done+1)*PARTSIZE)-1)){
+					if (status) {
+						if (!m_reqfile->IsComplete(done)){
 							bPartsNeeded = true;
 							iNeeded++;
 						}
@@ -469,13 +472,13 @@
 				CPacket* packet = new CPacket(OP_HASHSETREQUEST,16, OP_EDONKEYPROT);
 				packet->Copy16ToDataBuffer((const char *)m_reqfile->GetFileHash().GetHash());
 				theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_HASHSETREQUEST to ") + GetFullIP());
+				AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_HASHSETREQUEST to ") + GetFullIP());
 				SendPacket(packet, true, true);
 				SetDownloadState(DS_REQHASHSET);
 				m_fHashsetRequesting = 1;
 				m_reqfile->SetHashSetNeeded(false);
 			} else {
-				wxASSERT(0);
+				wxFAIL;
 			}
 		}
 		else {
@@ -669,7 +672,7 @@
 		
 		if (slower_client != this) {
 			// Re-request freed blocks.
-			AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_CANCELTRANSFER (faster source eager to transfer) to ") + slower_client->GetFullIP() );
+			AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_CANCELTRANSFER (faster source eager to transfer) to ") + slower_client->GetFullIP() );
 			wxASSERT(m_DownloadBlocks_list.empty());
 			wxASSERT(m_PendingBlocks_list.empty());
 			uint16 count = m_MaxBlockRequests;
@@ -686,12 +689,12 @@
 				}
 			}	else {
 				// WTF, we just freed blocks.
-				wxASSERT(0);
+				wxFAIL;
 				return;
 			}
 		} else {
 			// Drop this one.
-			AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_CANCELTRANSFER (no free blocks) to ") + GetFullIP() );			
+			AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_CANCELTRANSFER (no free blocks) to ") + GetFullIP() );
 			//#warning Kry - Would be nice to swap A4AF here.		
 			return;
 		}
@@ -729,7 +732,8 @@
 			}
 			
 			packet = new CPacket(data, OP_ED2KV2HEADER, OP_REQUESTPARTS);
-			AddDebugLogLineM( false, logLocalClient, wxString::Format(wxT("Local Client ED2Kv2: OP_REQUESTPARTS(%i) to "),(m_PendingBlocks_list.size()<m_MaxBlockRequests) ? m_PendingBlocks_list.size() : m_MaxBlockRequests) + GetFullIP() );
+			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;
 		}
@@ -749,11 +753,11 @@
 						bHasLongBlocks = true;
 						if (!SupportsLargeFiles()){
 							// Requesting a large block from a client that doesn't support large files?
-							wxASSERT( false );
+							wxFAIL;
 							if (!GetSentCancelTransfer()){
 								CPacket* cancel_packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
 								theStats::AddUpOverheadFileRequest(cancel_packet->GetPacketSize());
-								AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + GetFullIP() );
+								AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + GetFullIP() );
 								SendPacket(cancel_packet,true,true);
 								SetSentCancelTransfer(1);
 							}					
@@ -806,18 +810,18 @@
 				}
 			}	
 			packet = new CPacket(data, (bHasLongBlocks ? OP_EMULEPROT : OP_EDONKEYPROT), (bHasLongBlocks ? (uint8)OP_REQUESTPARTS_I64 : (uint8)OP_REQUESTPARTS));
-			AddDebugLogLineM( false, logLocalClient, wxString::Format(wxT("Local Client: %s to "),(bHasLongBlocks ? wxT("OP_REQUESTPARTS_I64") : wxT("OP_REQUESTPARTS"))) + GetFullIP() );
+			AddDebugLogLineN(logLocalClient, CFormat(wxT("Local Client: %s to %s")) % (bHasLongBlocks ? wxT("OP_REQUESTPARTS_I64") : wxT("OP_REQUESTPARTS")) % GetFullIP());
 			break;
 		}
 		default:
-			wxASSERT(0);
+			wxFAIL;
 	}
 	
 	if (packet) {
 		theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
 		SendPacket(packet, true, true);
 	} else {
-		wxASSERT(0);
+		wxFAIL;
 	}
 }
 
@@ -916,7 +920,7 @@
 				}
 				
 				if (cur_block->fZStreamError){
-					AddDebugLogLineM( false, logZLib, 
+					AddDebugLogLineN(logZLib,
 						CFormat(wxT("Ignoring %u bytes of block %u-%u because of erroneous zstream state for file: %s"))
 							% (size - header_size) % nStartPos % nEndPos % m_reqfile->GetFileName());
 					m_reqfile->RemoveBlockFromList(cur_block->block->StartOffset, cur_block->block->EndOffset);
@@ -924,7 +928,7 @@
 				}
 		   
 				// Remember this start pos, used to draw part downloading in list
-				m_nLastBlockOffset = nStartPos;
+				m_lastDownloadingPart = nStartPos / PARTSIZE;
 	
 				// Occasionally packets are duplicated, no point writing it twice
 				// This will be 0 in these cases, or the length written otherwise
@@ -934,15 +938,12 @@
 				if (!packed) {
 					// security sanitize check
 					if (nEndPos > cur_block->block->EndOffset) {
-						AddDebugLogLineM(false, logRemoteClient, CFormat(wxT("Received Blockpacket exceeds requested boundaries (requested end: %u, Part: %u, received end: %u, Part: %u), file: %s remote IP: %s")) % cur_block->block->EndOffset % (uint32)(cur_block->block->EndOffset / PARTSIZE) % nEndPos % (uint32)(nEndPos / PARTSIZE) % m_reqfile->GetFileName() % Uint32toStringIP(GetIP()));
+						AddDebugLogLineN(logRemoteClient, CFormat(wxT("Received Blockpacket exceeds requested boundaries (requested end: %u, Part: %u, received end: %u, Part: %u), file: %s remote IP: %s")) % cur_block->block->EndOffset % (uint32)(cur_block->block->EndOffset / PARTSIZE) % nEndPos % (uint32)(nEndPos / PARTSIZE) % m_reqfile->GetFileName() % Uint32toStringIP(GetIP()));
 						m_reqfile->RemoveBlockFromList(cur_block->block->StartOffset, cur_block->block->EndOffset);
 						return;
 					}
 					// Write to disk (will be buffered in part file class)
-					lenWritten = m_reqfile->WriteToBuffer( size - header_size,
-														   (byte*)(packet + header_size),
-														   nStartPos, nEndPos,
-														   cur_block->block);
+					lenWritten = m_reqfile->WriteToBuffer( size - header_size, (byte*)(packet + header_size), nStartPos, nEndPos, cur_block->block, this);
 				} else {
 					// Packed
 					wxASSERT( (long int)size > 0 );
@@ -971,7 +972,7 @@
 							nEndPos = cur_block->block->StartOffset + cur_block->totalUnzipped - 1;
 	
 							if (nStartPos > cur_block->block->EndOffset || nEndPos > cur_block->block->EndOffset) {
-								AddDebugLogLineM( false, logZLib, 
+								AddDebugLogLineN(logZLib,
 									CFormat(wxT("Corrupted compressed packet for '%s' received (error 666)")) % m_reqfile->GetFileName());
 								m_reqfile->RemoveBlockFromList(cur_block->block->StartOffset, cur_block->block->EndOffset);
 							} else {
@@ -980,7 +981,8 @@
 																	   unzipped,
 																	   nStartPos,
 																	   nEndPos,
-																	   cur_block->block );
+																	   cur_block->block,
+																	   this);
 							}
 						}
 					} else {
@@ -989,7 +991,7 @@
 							strZipError = wxT(" - ") + wxString::FromAscii(cur_block->zStream->msg);
 						} 
 						
-						AddDebugLogLineM( false, logZLib,
+						AddDebugLogLineN(logZLib,
 							CFormat(wxT("Corrupted compressed packet for '%s' received (error %i): %s"))
 								% m_reqfile->GetFileName() % result % strZipError);
 						
@@ -1049,10 +1051,10 @@
 		}
 	} catch (const CEOFException& e) {
 		wxString error = wxString(wxT("Error reading "));
-		if (packed) error += wxString::Format(wxT("packed (LU: %i) "),lenUnzipped);
-		if (packed) error += wxT("largeblocks ");
-		error += wxString::Format(wxT("data packet: RS: %i HS: %i SP: %i EP: %i BS: %i -> "),size,header_size,nStartPos,nEndPos,nBlockSize);
-		AddDebugLogLineM(true, logRemoteClient, error + e.what());
+		if (packed) error += CFormat(wxT("packed (LU: %i) largeblocks ")) % lenUnzipped;
+		error += CFormat(wxT("data packet: RS: %i HS: %i SP: %i EP: %i BS: %i -> "))
+					% size % header_size % nStartPos % nEndPos % nBlockSize;
+		AddDebugLogLineC(logRemoteClient, error + e.what());
 		return;
 	}
 }
@@ -1147,12 +1149,12 @@
 		wxString strZipError;
 		
 		if ( zS->msg ) {
-			strZipError = wxString::Format(wxT(" %d '"), err) + wxString::FromAscii(zS->msg) + wxT("'");
+			strZipError = CFormat(wxT(" %d '%s'")) % err % wxString::FromAscii(zS->msg);
 		} else if (err != Z_OK) {
-			strZipError = wxString::Format(wxT(" %d"), err);
+			strZipError = CFormat(wxT(" %d")) % err;
 		}
 		
-		AddDebugLogLineM(false, logZLib,
+		AddDebugLogLineN(logZLib,
 			CFormat(wxT("Unexpected zip error %s in file '%s'"))
 				% strZipError % (m_reqfile ? m_reqfile->GetFileName() : CPath(wxT("?"))));
 	}
@@ -1186,8 +1188,8 @@
 		} else {
 			kBpsDown = (kBpsDown * (tAverage - dt) + kBpsDownCur * dt) / tAverage;
 		}
-		AddDebugLogLineM( false, logLocalClient, CFormat(wxT("CalculateKBpsDown %p kbps %.1f kbpsCur %.1f dt %.3f rcv %d ")) 
-					% this % kBpsDown  % kBpsDownCur % dt % bytesReceivedCycle);
+		//AddDebugLogLineN(logLocalClient, CFormat(wxT("CalculateKBpsDown %p kbps %.1f kbpsCur %.1f dt %.3f rcv %d ")) 
+		//			% this % kBpsDown  % kBpsDownCur % dt % bytesReceivedCycle);
 		bytesReceivedCycle = 0;
 		msReceivedPrev = msCur;	
 	}
@@ -1201,7 +1203,7 @@
 		if (!GetSentCancelTransfer()){
 			CPacket* packet = new CPacket(OP_CANCELTRANSFER, 0, OP_EDONKEYPROT);
 			theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-			AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + GetFullIP() );
+			AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + GetFullIP() );
 			SendPacket(packet,true,true);
 			SetSentCancelTransfer(1);
 		}
@@ -1253,7 +1255,7 @@
 			}
 		}
 	} else {
-		AddDebugLogLineM( false, logRemoteClient, wxT("UDP ANSWER FNF : ") + GetUserName() + wxT(" - did not remove client because of current download state") );
+		AddDebugLogLineN( logRemoteClient, wxT("UDP ANSWER FNF : ") + GetUserName() + wxT(" - did not remove client because of current download state") );
 	}
 }
 
@@ -1302,7 +1304,7 @@
 		}
 		
 		CPacket* response = new CPacket(data, OP_EMULEPROT, OP_REASKFILEPING);
-		AddDebugLogLineM( false, logClientUDP, wxT("Client UDP socket: send OP_REASKFILEPING") );
+		AddDebugLogLineN( logClientUDP, wxT("Client UDP socket: send OP_REASKFILEPING") );
 		theStats::AddUpOverheadFileRequest(response->GetPacketSize());
 		theApp->clientudp->SendPacket(response,GetConnectIP(),GetUDPPort(), ShouldReceiveCryptUDPPackets(), GetUserHash().GetHash(), false, 0);
 	} else  if (HasLowID() && GetBuddyIP() && GetBuddyPort() && HasValidBuddyID()) {
@@ -1327,32 +1329,34 @@
 		}
 		
 		CPacket* response = new CPacket(data, OP_EMULEPROT, OP_REASKCALLBACKUDP);
-		AddDebugLogLineM( false, logClientUDP, wxT("Client UDP socket: send OP_REASKCALLBACKUDP") );
+		AddDebugLogLineN( logClientUDP, wxT("Client UDP socket: send OP_REASKCALLBACKUDP") );
 		theStats::AddUpOverheadFileRequest(response->GetPacketSize());
 		theApp->clientudp->SendPacket(response, GetBuddyIP(), GetBuddyPort(), false, NULL, true, 0 );
 	}
 }
 
 
-//! Barry - Sets string to show parts downloading, eg NNNYNNNNYYNYN
-wxString CUpDownClient::ShowDownloadingParts() const
+// Get the next part that is requested
+uint16 CUpDownClient::GetNextRequestedPart() const
 {
-	// Initialise to all N's
-	wxString Parts(wxT('N'), m_nPartCount);
+	uint16 part = 0xffff;
 
 	std::list<Pending_Block_Struct*>::const_iterator it = m_PendingBlocks_list.begin();
 	for (; it != m_PendingBlocks_list.end(); ++it) {
-		Parts.SetChar(((*it)->block->StartOffset / PARTSIZE), 'Y');
+		part = (*it)->block->StartOffset / PARTSIZE;
+		if (part != m_lastDownloadingPart) {
+			break;
+		}
 	}
 	
-	return Parts;
+	return part;
 }
 
 
 void CUpDownClient::UpdateDisplayedInfo(bool force)
 {
 	uint32 curTick = ::GetTickCount();
-	if(force || curTick-m_lastRefreshedDLDisplay > MINWAIT_BEFORE_DLDISPLAY_WINDOWUPDATE) {
+	if (force || curTick-m_lastRefreshedDLDisplay > MINWAIT_BEFORE_DLDISPLAY_WINDOWUPDATE) {
 		// Check if we actually need to notify of changes
 		bool update = m_reqfile && m_reqfile->ShowSources();
 		
@@ -1369,13 +1373,48 @@
 	
 		// And finnaly trigger an event if there's any reason
 		if ( update ) {
-			Notify_DownloadCtrlUpdateItem(this);
+			SourceItemType type;
+			switch (GetDownloadState()) {
+				case DS_DOWNLOADING:
+				case DS_ONQUEUE:
+					// We will send A4AF, which will be checked.
+					type = A4AF_SOURCE;
+					break;
+				default:
+					type = UNAVAILABLE_SOURCE;
+					break;
+			}
+			
+			Notify_SourceCtrlUpdateSource(ECID(), type );
+		}
+
+		// Shared files view
+		if (m_uploadingfile && m_uploadingfile->ShowPeers()) {
+			Notify_SharedCtrlRefreshClient(ECID(), AVAILABLE_SOURCE);
 		}
 				
 		m_lastRefreshedDLDisplay = curTick;
 	}
 }
 
+uint8 CUpDownClient::GetObfuscationStatus() const
+{
+	uint8 ret = OBST_UNDEFINED;
+	if (thePrefs::IsClientCryptLayerSupported()) {
+		if (SupportsCryptLayer()) {
+			if ((RequestsCryptLayer() || thePrefs::IsClientCryptLayerRequested()) && HasObfuscatedConnectionBeenEstablished()) {
+				ret = OBST_ENABLED;
+			} else {
+				ret = OBST_SUPPORTED;
+			}
+		} else {
+			ret = OBST_NOT_SUPPORTED;
+		}
+	} else {
+		ret = OBST_DISABLED;
+	}
+	return ret;
+}
 
 // IgnoreNoNeeded = will switch to files of which this source has no needed parts (if no better fiels found)
 // ignoreSuspensions = ignore timelimit for A4Af jumping
@@ -1402,8 +1441,8 @@
 		A4AFList::iterator it = m_A4AF_list.find( toFile );
 		if ( it != m_A4AF_list.end() ) {
 
-			// We force ignoring of noneeded flag and timestamps
-			if ( IsValidSwapTarget( it, true, true ) ) {
+			// We force ignoring of timestamps
+			if ( IsValidSwapTarget( it, bIgnoreNoNeeded, true ) ) {
 				// Set the target
 				target = it;
 			}
@@ -1442,14 +1481,14 @@
 	// Try to swap if we found a valid target
 	if ( target != m_A4AF_list.end() ) {
 		
-		// Sainity check, if reqfile doesn't own the source, then something
+		// Sanity check, if reqfile doesn't own the source, then something
 		// is wrong and the swap cannot proceed.
 		if ( m_reqfile->DelSource( this ) ) {
 			CPartFile* SwapTo = target->first;
 			
 			// remove this client from the A4AF list of our new m_reqfile
 			if ( SwapTo->RemoveA4AFSource( this ) ) {
-				Notify_DownloadCtrlRemoveSource(this, SwapTo);
+				Notify_SourceCtrlRemoveSource(ECID(), SwapTo);
 			}
 
 			m_reqfile->RemoveDownloadingSource( this );
@@ -1464,9 +1503,9 @@
 				// Avoid swapping to this file for a while
 				m_A4AF_list[m_reqfile].timestamp = ::GetTickCount(); 
 							
-				Notify_DownloadCtrlAddSource(m_reqfile, this, A4AF_SOURCE);
+				Notify_SourceCtrlAddSource(m_reqfile, CCLIENTREF(this, wxT("CUpDownClient::SwapToAnotherFile Notify_SourceCtrlAddSource 1")), A4AF_SOURCE);
 			} else {
-				Notify_DownloadCtrlRemoveSource( this, m_reqfile );
+				Notify_SourceCtrlRemoveSource(ECID(), m_reqfile);
 			}
 		
 			SetDownloadState(DS_NONE);
@@ -1481,7 +1520,7 @@
 
 			SwapTo->AddSource( this );
 		
-			Notify_DownloadCtrlAddSource(SwapTo, this, UNAVAILABLE_SOURCE);
+			Notify_SourceCtrlAddSource(SwapTo, CCLIENTREF(this, wxT("CUpDownClient::SwapToAnotherFile Notify_SourceCtrlAddSource 2")), UNAVAILABLE_SOURCE);
 
 			// Remove the new reqfile from the list of other files
 			m_A4AF_list.erase( target );
@@ -1561,7 +1600,7 @@
 void CUpDownClient::SendAICHRequest(CPartFile* pForFile, uint16 nPart){
 	CAICHRequestedData request;
 	request.m_nPart = nPart;
-	request.m_pClient = this;
+	request.m_pClient.Link(this CLIENT_DEBUGSTRING("CUpDownClient::SendAICHRequest"));
 	request.m_pPartFile = pForFile;
 	CAICHHashSet::m_liRequestedData.push_back(request);
 	m_fAICHRequested = TRUE;
@@ -1571,7 +1610,7 @@
 	pForFile->GetAICHHashset()->GetMasterHash().Write(&data);
 	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_AICHREQUEST);
 	theStats::AddUpOverheadOther(packet->GetPacketSize());	
-	AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_AICHREQUEST to") + GetFullIP());
+	AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_AICHREQUEST to") + GetFullIP());
 	SafeSendPacket(packet);
 }
 
@@ -1592,25 +1631,25 @@
 	CPartFile* pPartFile = theApp->downloadqueue->GetFileByID(hash);
 	CAICHRequestedData request = CAICHHashSet::GetAICHReqDetails(this);
 	uint16 nPart = data.ReadUInt16();
-	if (pPartFile != NULL && request.m_pPartFile == pPartFile && request.m_pClient == this && nPart == request.m_nPart){
+	if (pPartFile != NULL && request.m_pPartFile == pPartFile && request.m_pClient.GetClient() == this && nPart == request.m_nPart){
 		CAICHHash ahMasterHash(&data);
 		if ( (pPartFile->GetAICHHashset()->GetStatus() == AICH_TRUSTED || pPartFile->GetAICHHashset()->GetStatus() == AICH_VERIFIED)
 			 && ahMasterHash == pPartFile->GetAICHHashset()->GetMasterHash())
 		{
 			if(pPartFile->GetAICHHashset()->ReadRecoveryData(request.m_nPart*PARTSIZE, &data)){
 				// finally all checks passed, everythings seem to be fine
-				AddDebugLogLineM( false, logAICHTransfer, wxT("AICH Packet Answer: Succeeded to read and validate received recoverydata"));
+				AddDebugLogLineN(logAICHTransfer, wxT("AICH Packet Answer: Succeeded to read and validate received recoverydata"));
 				CAICHHashSet::RemoveClientAICHRequest(this);
 				pPartFile->AICHRecoveryDataAvailable(request.m_nPart);
 				return;
 			} else {
-				AddDebugLogLineM( false, logAICHTransfer, wxT("AICH Packet Answer: Succeeded to read and validate received recoverydata"));
+				AddDebugLogLineN(logAICHTransfer, wxT("AICH Packet Answer: Succeeded to read and validate received recoverydata"));
 			}
 		} else {
-			AddDebugLogLineM( false, logAICHTransfer, wxT("AICH Packet Answer: Masterhash differs from packethash or hashset has no trusted Masterhash") );
+			AddDebugLogLineN( logAICHTransfer, wxT("AICH Packet Answer: Masterhash differs from packethash or hashset has no trusted Masterhash") );
 		}
 	} else {
-		AddDebugLogLineM( false, logAICHTransfer, wxT("AICH Packet Answer: requested values differ from values in packet") );
+		AddDebugLogLineN( logAICHTransfer, wxT("AICH Packet Answer: requested values differ from values in packet") );
 	}
 
 	CAICHHashSet::ClientAICHRequestFailed(this);
@@ -1639,33 +1678,33 @@
 			fileResponse.WriteUInt16(nPart);
 			pKnownFile->GetAICHHashset()->GetMasterHash().Write(&fileResponse);
 			if (pKnownFile->GetAICHHashset()->CreatePartRecoveryData(nPart*PARTSIZE, &fileResponse)){
-				AddDebugLogLineM(false, logAICHTransfer,
+				AddDebugLogLineN(logAICHTransfer,
 					CFormat(wxT("AICH Packet Request: Sucessfully created and send recoverydata for '%s' to %s"))
 						% pKnownFile->GetFileName() % GetClientFullInfo());
 				
 				CPacket* packAnswer = new CPacket(fileResponse, OP_EMULEPROT, OP_AICHANSWER);			
 				theStats::AddUpOverheadOther(packAnswer->GetPacketSize());
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_AICHANSWER to") + GetFullIP());
+				AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_AICHANSWER to") + GetFullIP());
 				SafeSendPacket(packAnswer);
 				return;
 			} else {
-				AddDebugLogLineM(false, logAICHTransfer,
+				AddDebugLogLineN(logAICHTransfer,
 					CFormat(wxT("AICH Packet Request: Failed to create recoverydata for '%s' to %s"))
 						% pKnownFile->GetFileName() % GetClientFullInfo());
 			}
 		} else {
-			AddDebugLogLineM(false, logAICHTransfer,
+			AddDebugLogLineN(logAICHTransfer,
 				CFormat(wxT("AICH Packet Request: Failed to create recoverydata - Hashset not ready or requested Hash differs from Masterhash for '%s' to %s"))
 					% pKnownFile->GetFileName() % GetClientFullInfo());
 		}
 	} else {
-		AddDebugLogLineM( false, logAICHTransfer, wxT("AICH Packet Request: Failed to find requested shared file - ") + GetClientFullInfo() );
+		AddDebugLogLineN( logAICHTransfer, wxT("AICH Packet Request: Failed to find requested shared file - ") + GetClientFullInfo() );
 	}
 		
 	CPacket* packAnswer = new CPacket(OP_AICHANSWER, 16, OP_EMULEPROT);
 	packAnswer->Copy16ToDataBuffer(hash.GetHash());
 	theStats::AddUpOverheadOther(packAnswer->GetPacketSize());
-	AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_AICHANSWER to") + GetFullIP());
+	AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_AICHANSWER to") + GetFullIP());
 	SafeSendPacket(packAnswer);
 }
 
@@ -1682,7 +1721,7 @@
 		SetReqFileAICHHash(new CAICHHash(ahMasterHash));
 		pPartFile->GetAICHHashset()->UntrustedHashReceived(ahMasterHash, GetConnectIP());
 	} else {
-		AddDebugLogLineM( false, logAICHTransfer, wxT("ProcessAICHFileHash(): PartFile not found or Partfile differs from requested file, ") + GetClientFullInfo() );
+		AddDebugLogLineN( logAICHTransfer, wxT("ProcessAICHFileHash(): PartFile not found or Partfile differs from requested file, ") + GetClientFullInfo() );
 	}
 }
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/DownloadListCtrl.cpp -> aMule-2.3.1.tar.bz2/src/DownloadListCtrl.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -23,6 +23,8 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#include "DownloadListCtrl.h"	// Interface declarations
+
 #include <protocol/ed2k/ClientSoftware.h>
 #include <common/MenuIDs.h>
 
@@ -30,96 +32,75 @@
 #include "amule.h"		// Needed for theApp
 #include "amuleDlg.h"		// Needed for CamuleDlg
 #include "BarShader.h"		// Needed for CBarShader
-#include "ClientDetailDialog.h"	// Needed for CClientDetailDialog
-#include "ChatWnd.h"		// Needed for CChatWnd
 #include "CommentDialogLst.h"	// Needed for CCommentDialogLst
-#include "DownloadListCtrl.h"	// Interface declarations
 #include "DataToText.h"		// Needed for PriorityToStr
+#include "DownloadQueue.h"
 #include "FileDetailDialog.h"	// Needed for CFileDetailDialog
 #include "GuiEvents.h"		// Needed for CoreNotify_*
-#ifdef ENABLE_IP2COUNTRY
-	#include "IP2Country.h"	// Needed for IP2Country
-#endif
 #include "Logger.h"
 #include "muuli_wdr.h"		// Needed for ID_DLOADLIST
 #include "PartFile.h"		// Needed for CPartFile
 #include "Preferences.h"
 #include "SharedFileList.h"	// Needed for CSharedFileList
 #include "TerminationProcess.h"	// Needed for CTerminationProcess
-#include "updownclient.h"	// Needed for CUpDownClient
-
+#include "TransferWnd.h"
+#include "SourceListCtrl.h"
 
 class CPartFile;
 
 
-struct CtrlItem_Struct
+struct FileCtrlItem_Struct
 {
-	CtrlItem_Struct()
+	FileCtrlItem_Struct()
 		: dwUpdated(0),
 		  status(NULL),
-		  m_owner(NULL),
-		  m_fileValue(NULL),
-		  m_sourceValue(NULL),
-		  m_type(FILE_TYPE)
+		  m_fileValue(NULL)
 	{ }
 	
-	~CtrlItem_Struct() {
+	~FileCtrlItem_Struct() {
 		delete status;
 	}
 
-	DownloadItemType GetType() const {
-		return m_type;
-	}
-
-	CPartFile* GetOwner() const {
-		return m_owner;
-	}
-
 	CPartFile* GetFile() const {
 		return m_fileValue;
 	}
 
-	CUpDownClient* GetSource() const {
-		return m_sourceValue;
-	}
-
 	void SetContents(CPartFile* file) {
-		m_owner = NULL;
 		m_fileValue = file;
-		m_sourceValue = NULL;
-		m_owner = NULL;
-		m_type = FILE_TYPE;
-	}
-
-	void SetContents(CPartFile* owner, CUpDownClient* source, DownloadItemType type) {
-		wxCHECK_RET(type != FILE_TYPE, wxT("Invalid type, not a source"));
-		
-		m_owner = owner;
-		m_fileValue = NULL;
-		m_sourceValue = source;
-		m_type = type;
 	}
 	
-	
 	uint32		dwUpdated;
 	wxBitmap*	status;
 
 private:
-	CPartFile*			m_owner;
 	CPartFile*			m_fileValue;
-	CUpDownClient*		m_sourceValue;
-	DownloadItemType	m_type;
 };
 
-
-
 #define m_ImageList theApp->amuledlg->m_imagelist
 
-
+enum ColumnEnum {
+	ColumnPart = 0,
+	ColumnFileName,
+	ColumnSize,
+	ColumnTransferred,
+	ColumnCompleted,
+	ColumnSpeed,
+	ColumnProgress,
+	ColumnSources,
+	ColumnPriority,
+	ColumnStatus,
+	ColumnTimeRemaining,
+	ColumnLastSeenComplete,
+	ColumnLastReception,
+	ColumnNumberOfColumns
+};
+	
 BEGIN_EVENT_TABLE(CDownloadListCtrl, CMuleListCtrl)
 	EVT_LIST_ITEM_ACTIVATED(ID_DLOADLIST,	CDownloadListCtrl::OnItemActivated)
 	EVT_LIST_ITEM_RIGHT_CLICK(ID_DLOADLIST, CDownloadListCtrl::OnMouseRightClick)
 	EVT_LIST_ITEM_MIDDLE_CLICK(ID_DLOADLIST, CDownloadListCtrl::OnMouseMiddleClick)
+	EVT_LIST_ITEM_SELECTED(ID_DLOADLIST, CDownloadListCtrl::OnItemSelectionChanged)
+	EVT_LIST_ITEM_DESELECTED(ID_DLOADLIST, CDownloadListCtrl::OnItemSelectionChanged)
 
 	EVT_CHAR( CDownloadListCtrl::OnKeyPressed )
 
@@ -150,21 +131,11 @@
 	EVT_MENU( MP_VIEWFILECOMMENTS,		CDownloadListCtrl::OnViewFileComments )
 
 	EVT_MENU( MP_WS,			CDownloadListCtrl::OnGetFeedback )
-	EVT_MENU( MP_RAZORSTATS, 		CDownloadListCtrl::OnGetRazorStats )
 
-	EVT_MENU( MP_CHANGE2FILE,		CDownloadListCtrl::OnSwapSource )
-	EVT_MENU( MP_SHOWLIST,			CDownloadListCtrl::OnViewFiles )
-	EVT_MENU( MP_ADDFRIEND,			CDownloadListCtrl::OnAddFriend )
-	EVT_MENU( MP_SENDMESSAGE,		CDownloadListCtrl::OnSendMessage )
-	EVT_MENU( MP_DETAIL,			CDownloadListCtrl::OnViewClientInfo )
 END_EVENT_TABLE()
 
-
-
 //! This listtype is used when gathering the selected items.
-typedef std::list<CtrlItem_Struct*>	ItemList;
-
-
+typedef std::list<FileCtrlItem_Struct*>	ItemList;
 
 CDownloadListCtrl::CDownloadListCtrl(
 	wxWindow *parent, wxWindowID winid, const wxPoint& pos, const wxSize& size,
@@ -180,31 +151,38 @@
 
 	m_menu = NULL;
 
-	wxColour colour = BLEND( SYSCOLOR( wxSYS_COLOUR_HIGHLIGHT ), 125 );
-	m_hilightBrush  = new wxBrush( colour, wxSOLID );
-	
-	colour = BLEND( SYSCOLOR( wxSYS_COLOUR_BTNSHADOW), 125 );
-	m_hilightUnfocusBrush = new wxBrush( colour, wxSOLID );
-
-	InsertColumn( 0,  _("File Name"),		wxLIST_FORMAT_LEFT, 260 );
-	InsertColumn( 1,  _("Size"),			wxLIST_FORMAT_LEFT,  60 );
-	InsertColumn( 2,  _("Transferred"),		wxLIST_FORMAT_LEFT,  65 );
-	InsertColumn( 3,  _("Completed"),		wxLIST_FORMAT_LEFT,  65 );
-	InsertColumn( 4,  _("Speed"),			wxLIST_FORMAT_LEFT,  65 );
-	InsertColumn( 5,  _("Progress"),		wxLIST_FORMAT_LEFT, 170 );
-	InsertColumn( 6,  _("Sources"),			wxLIST_FORMAT_LEFT,  50 );
-	InsertColumn( 7,  _("Priority"),		wxLIST_FORMAT_LEFT,  55 );
-	InsertColumn( 8,  _("Status"),			wxLIST_FORMAT_LEFT,  70 );
-	InsertColumn( 9,  _("Time Remaining"),		wxLIST_FORMAT_LEFT, 110 );
-	InsertColumn( 10, _("Last Seen Complete"),	wxLIST_FORMAT_LEFT, 220 );
-	InsertColumn( 11, _("Last Reception"),		wxLIST_FORMAT_LEFT, 220 );
+	m_hilightBrush  = CMuleColour(wxSYS_COLOUR_HIGHLIGHT).Blend(125).GetBrush();
+
+	m_hilightUnfocusBrush = CMuleColour(wxSYS_COLOUR_BTNSHADOW).Blend(125).GetBrush();
+
+	InsertColumn( ColumnPart,			_("Part"),					wxLIST_FORMAT_LEFT,  30, wxT("a") );
+	InsertColumn( ColumnFileName,		_("File Name"),				wxLIST_FORMAT_LEFT, 260, wxT("N") );
+	InsertColumn( ColumnSize,			_("Size"),					wxLIST_FORMAT_LEFT,  60, wxT("Z") );
+	InsertColumn( ColumnTransferred,	_("Transferred"),			wxLIST_FORMAT_LEFT,  65, wxT("T") );
+	InsertColumn( ColumnCompleted,		_("Completed"),				wxLIST_FORMAT_LEFT,  65, wxT("C") );
+	InsertColumn( ColumnSpeed,			_("Speed"),					wxLIST_FORMAT_LEFT,  65, wxT("S") );
+	InsertColumn( ColumnProgress,		_("Progress"),				wxLIST_FORMAT_LEFT, 170, wxT("P") );
+	InsertColumn( ColumnSources,		_("Sources"),				wxLIST_FORMAT_LEFT,  50, wxT("u") );
+	InsertColumn( ColumnPriority,		_("Priority"),				wxLIST_FORMAT_LEFT,  55, wxT("p") );
+	InsertColumn( ColumnStatus,			_("Status"),				wxLIST_FORMAT_LEFT,  70, wxT("s") );
+	InsertColumn( ColumnTimeRemaining,  _("Time Remaining"),		wxLIST_FORMAT_LEFT, 110, wxT("r") );
+	InsertColumn( ColumnLastSeenComplete, _("Last Seen Complete"),	wxLIST_FORMAT_LEFT, 220, wxT("c") );
+	InsertColumn( ColumnLastReception,	_("Last Reception"),		wxLIST_FORMAT_LEFT, 220, wxT("R") );
 
 	m_category = 0;
-	m_completedFiles = 0;
 	m_filecount = 0;
+	m_ItemSelectionChangePending = false;
 	LoadSettings();
+	
+	//m_ready = true;
 }
 
+// This is the order the columns had before extendable list-control settings save/load code was introduced.
+// Don't touch when inserting new columns!
+wxString CDownloadListCtrl::GetOldColumnOrder() const
+{
+	return wxT("N,Z,T,C,S,P,u,p,s,r,c,R");
+}
 
 CDownloadListCtrl::~CDownloadListCtrl()
 {
@@ -212,18 +190,15 @@
 		delete m_ListItems.begin()->second;
 		m_ListItems.erase( m_ListItems.begin() );
 	}
-	delete m_hilightBrush;
-	delete m_hilightUnfocusBrush;
 }
 
-
 void CDownloadListCtrl::AddFile( CPartFile* file )
 {
 	wxASSERT( file );
 	
 	// Avoid duplicate entries of files
 	if ( m_ListItems.find( file ) == m_ListItems.end() ) {
-		CtrlItem_Struct* newitem = new CtrlItem_Struct;
+		FileCtrlItem_Struct* newitem = new FileCtrlItem_Struct;
 		newitem->SetContents(file);
 	
 		m_ListItems.insert( ListItemsPair( file, newitem ) );
@@ -231,103 +206,19 @@
 		// Check if the new file is visible in the current category
 		if ( file->CheckShowItemInGivenCat( m_category ) ) {
 			ShowFile( file, true );
-			SortList();
-		}
-	}
-}
-
-
-void CDownloadListCtrl::AddSource(CPartFile* owner, CUpDownClient* source, DownloadItemType type)
-{
-	wxCHECK_RET(owner, wxT("NULL owner in CDownloadListCtrl::AddSource"));
-	wxCHECK_RET(source, wxT("NULL source in CDownloadListCtrl::AddSource"));
-	wxCHECK_RET(type != FILE_TYPE, wxT("Invalid type, not a source"));
-
-	// Update the other instances of this source
-	bool bFound = false;
-	ListIteratorPair rangeIt = m_ListItems.equal_range(source);
-	for ( ListItems::iterator it = rangeIt.first; it != rangeIt.second; ++it ) {
-		CtrlItem_Struct* cur_item = it->second;
-
-		// Check if this source has been already added to this file => to be sure
-		if ( cur_item->GetOwner() == owner ) {
-			// Update this instance with its new setting
-			cur_item->SetContents(owner, source, type);
-			cur_item->dwUpdated = 0;
-			bFound = true;
-		} else if ( type == AVAILABLE_SOURCE ) {
-			// The state 'Available' is exclusive
-			cur_item->SetContents(cur_item->GetOwner(), source, A4AF_SOURCE);
-			cur_item->dwUpdated = 0;
-		}
-	}
-
-	if ( bFound ) {
-		return;
-	}
-
-	if ( owner->ShowSources() ) {
-		CtrlItem_Struct* newitem = new CtrlItem_Struct;
-		newitem->SetContents(owner, source, type);
-		
-		m_ListItems.insert( ListItemsPair(source, newitem) );
-
-		// Find the owner-object
-		ListItems::iterator it = m_ListItems.find( owner );
-	
-		if ( it != m_ListItems.end() ) {
-			long item = FindItem( -1, reinterpret_cast<wxUIntPtr>(it->second) );
-			
-			if ( item > -1 ) {
-				item = InsertItem( item + 1, wxEmptyString );
-				
-				SetItemPtrData( item, reinterpret_cast<wxUIntPtr>(newitem) );
-
-				// background.. this should be in a function
-				wxListItem listitem;
-				listitem.m_itemId = item;
-
-				listitem.SetBackgroundColour( GetBackgroundColour() );
-	
-				SetItem( listitem );
-			}
-		}
-	}
-}
-
-
-void CDownloadListCtrl::RemoveSource( const CUpDownClient* source, const CPartFile* owner )
-{
-	wxASSERT( source );
-	
-	// Retrieve all entries matching the source
-	ListIteratorPair rangeIt = m_ListItems.equal_range(source);
-	
-	for ( ListItems::iterator it = rangeIt.first; it != rangeIt.second; ) {
-		ListItems::iterator tmp = it++;
-		
-		CtrlItem_Struct* item = tmp->second;
-		if ( owner == NULL || owner == item->GetOwner() ) {
-			// Remove it from the m_ListItems
-			m_ListItems.erase( tmp );
-
-			long index = FindItem( -1, reinterpret_cast<wxUIntPtr>(item) );
-			
-			if ( index > -1 ) {
-				DeleteItem( index );
+			if (file->IsCompleted()) {
+				CastByID(ID_BTNCLRCOMPL, GetParent(), wxButton)->Enable(true);
 			}
-			
-			delete item;
+			SortList();
 		}
 	}
 }
 
-
 void CDownloadListCtrl::RemoveFile( CPartFile* file )
 {
 	wxASSERT( file );
 	
-	// Ensure that any assosiated sources and list-entries are removed
+	// Ensure that any list-entries are removed
 	ShowFile( file, false );
 
 	// Find the assosiated list-item
@@ -358,48 +249,38 @@
 #endif
 	
 	for ( ListItems::iterator it = rangeIt.first; it != rangeIt.second; ++it ) {
-		CtrlItem_Struct* item = it->second;
+		FileCtrlItem_Struct* item = it->second;
 
 		long index = FindItem( -1, reinterpret_cast<wxUIntPtr>(item) );
 
 		// Determine if the file should be shown in the current category
-		if ( item->GetType() == FILE_TYPE ) {
-			CPartFile* file = item->GetFile();
-		
-			bool show = file->CheckShowItemInGivenCat( m_category );
-	
-			if ( index > -1 ) {
-				if ( show ) {
-					item->dwUpdated = 0;
 
-					// Only update visible lines
-					if ( index >= first && index <= last) {
-						RefreshItem( index );
-					}
-				} else {
-					// Item should no longer be shown in
-					// the current category
-					ShowFile( file, false );
-				}
-			} else if ( show ) {
-				// Item has been hidden but new status means
-				// that it should it should be shown in the
-				// current category
-				ShowFile( file, true );
-			}
+		CPartFile* file = item->GetFile();
+	
+		bool show = file->CheckShowItemInGivenCat( m_category );
 
-			if (file->GetStatus() == PS_COMPLETE) {
-				m_completedFiles = true;
+		if ( index > -1 ) {
+			if ( show ) {
+				item->dwUpdated = 0;
 
-				CastByID(ID_BTNCLRCOMPL, GetParent(), wxButton)->Enable(true);
+				// Only update visible lines
+				if ( index >= first && index <= last) {
+					RefreshItem( index );
+				}
+			} else {
+				// Item should no longer be shown in
+				// the current category
+				ShowFile( file, false );
 			}
-		} else {
-			item->dwUpdated = 0;
+		} else if ( show ) {
+			// Item has been hidden but new status means
+			// that it should it should be shown in the
+			// current category
+			ShowFile( file, true );
+		}
 
-			// Only update visible lines
-			if ( index >= first && index <= last) {
-				RefreshItem( index );
-			}
+		if (file->IsCompleted() && show) {
+			CastByID(ID_BTNCLRCOMPL, GetParent(), wxButton)->Enable(true);
 		}
 	}
 }
@@ -412,7 +293,7 @@
 	ListItems::iterator it = m_ListItems.find( file );
 	
 	if ( it != m_ListItems.end() ) { 
-		CtrlItem_Struct* item = it->second;
+		FileCtrlItem_Struct* item = it->second;
 	
 		if ( show ) {
 			// Check if the file is already being displayed
@@ -433,9 +314,6 @@
 				ShowFilesCount( 1 );
 			}
 		} else {
-			// Ensure sources are hidden
-			ShowSources( file, false );
-
 			// Try to find the file and remove it
 			long index = FindItem( -1, reinterpret_cast<wxUIntPtr>(item) );
 			if ( index > -1 ) {
@@ -446,83 +324,35 @@
 	}
 }
 
-
-void CDownloadListCtrl::ShowSources( CPartFile* file, bool show )
-{
-	// Check if the current state is the same as the new state
-	if ( file->ShowSources() == show ) {
-		return;
-	}
-	
-	Freeze();
-	
-	file->SetShowSources( show );
-	
-	if ( show ) {
-		const CPartFile::SourceSet& normSources = file->GetSourceList();
-		const CPartFile::SourceSet& a4afSources = file->GetA4AFList();
-			
-		// Adding normal sources
-		CPartFile::SourceSet::const_iterator it;
-		for ( it = normSources.begin(); it != normSources.end(); ++it ) {
-			switch ((*it)->GetDownloadState()) {
-				case DS_DOWNLOADING:
-				case DS_ONQUEUE:
-					AddSource( file, *it, AVAILABLE_SOURCE );
-				default:
-					// Any other state
-					AddSource( file, *it, UNAVAILABLE_SOURCE );
-			}
-			
-		}
-
-		// Adding A4AF sources
-		for ( it = a4afSources.begin(); it != a4afSources.end(); ++it ) {
-			AddSource( file, *it, A4AF_SOURCE );
-		}
-
-		SortList();
-	} else {
-		for ( int i = GetItemCount() - 1; i >= 0; --i ) {
-			CtrlItem_Struct* item = (CtrlItem_Struct*)GetItemData(i);
-		
-			if ( item->GetType() != FILE_TYPE && item->GetOwner() == file ) {
-				// Remove from the grand list, this call doesn't remove the source
-				// from the listctrl, because ShowSources is now false. This also
-				// deletes the item.
-				RemoveSource(item->GetSource(), file);
-			}
-		}
-	}
-	
-	Thaw();
-}
-
-
 void CDownloadListCtrl::ChangeCategory( int newCategory )
 {
 	Freeze();
 
+	bool hasCompletedDownloads = false;
+
 	// remove all displayed files with a different cat and show the correct ones
 	for (ListItems::const_iterator it = m_ListItems.begin(); it != m_ListItems.end(); it++) {
-		const CtrlItem_Struct *cur_item = it->second;
 		
-		if ( cur_item->GetType() == FILE_TYPE ) {
-			CPartFile* file = cur_item->GetFile();
+		CPartFile* file =  it->second->GetFile();
+
+		bool curVisibility = file->CheckShowItemInGivenCat( m_category );
+		bool newVisibility = file->CheckShowItemInGivenCat( newCategory );
+
+		if (newVisibility && file->IsCompleted()) {
+			hasCompletedDownloads = true;
+		}
 	
-			bool curVisibility = file->CheckShowItemInGivenCat( m_category );
-			bool newVisibility = file->CheckShowItemInGivenCat( newCategory );
-		
-			// Check if the visibility of the file has changed. However, if the
-			// current category is the default (0) category, then we can't use
-			// curVisiblity to see if the visibility has changed but instead
-			// have to let ShowFile() check if the file is or isn't on the list.
-			if ( curVisibility != newVisibility || !newCategory ) {
-				ShowFile( file, newVisibility );
-			}
+		// Check if the visibility of the file has changed. However, if the
+		// current category is the default (0) category, then we can't use
+		// curVisiblity to see if the visibility has changed but instead
+		// have to let ShowFile() check if the file is or isn't on the list.
+		if ( curVisibility != newVisibility || !newCategory ) {
+			ShowFile( file, newVisibility );
 		}
 	}
 	
+	CastByID(ID_BTNCLRCOMPL, GetParent(), wxButton)->Enable(hasCompletedDownloads);
+
 	Thaw();
 
 	m_category = newCategory;
@@ -535,35 +365,21 @@
 }
 
 
-/*
- *
- */
-const int itFILES = 1;
-const int itSOURCES = 2;
-
 /**
  * Helper-function: This function is used to gather selected items.
  *
  * @param list A pointer to the list to gather items from.
- * @param types The desired types OR'd together.
- * @return A list containing the selected items of the choosen types.
+ * @return A list containing the selected items.
  */
-ItemList GetSelectedItems( CDownloadListCtrl* list, int types )
+ItemList GetSelectedItems( CDownloadListCtrl* list)
 {
 	ItemList results;
 
 	long index = list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	
 	while ( index > -1 ) {
-		CtrlItem_Struct* item = (CtrlItem_Struct*)list->GetItemData( index );
-
-		bool add = false;
-		add |= ( item->GetType() == FILE_TYPE ) && ( types & itFILES );
-		add |= ( item->GetType() != FILE_TYPE ) && ( types & itSOURCES );
-		
-		if ( add ) {
-			results.push_back( item );
-		}
+		FileCtrlItem_Struct* item = (FileCtrlItem_Struct*)list->GetItemData( index );
+		results.push_back( item );
 		
 		index = list->GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	}
@@ -574,7 +390,21 @@
 
 void CDownloadListCtrl::OnCancelFile(wxCommandEvent& WXUNUSED(event))
 {
-	ItemList files = ::GetSelectedItems(this, itFILES);
+	ItemList files = ::GetSelectedItems(this);
+	for (ItemList::iterator it = files.begin(); it != files.end(); ) {
+		ItemList::iterator it1 = it++;
+		CPartFile* file = (*it1)->GetFile();
+		if (file) {
+			switch (file->GetStatus()) {
+				case PS_WAITINGFORHASH:
+				case PS_HASHING:
+				case PS_COMPLETING:
+				case PS_COMPLETE:
+					files.erase(it1);
+					break;
+			}
+		}
+	}
 	if (files.size()) {	
 		wxString question;
 		if (files.size() == 1) {
@@ -586,15 +416,7 @@
 			for (ItemList::iterator it = files.begin(); it != files.end(); ++it) {
 				CPartFile* file = (*it)->GetFile();
 				if (file) {
-					switch (file->GetStatus()) {
-					case PS_WAITINGFORHASH:
-					case PS_HASHING:
-					case PS_COMPLETING:
-					case PS_COMPLETE:
-						break;
-					default:
-						CoreNotify_PartFile_Delete(file);
-					}
+					CoreNotify_PartFile_Delete(file);
 				}
 			}
 		}
@@ -611,10 +433,10 @@
 		case MP_PRIOHIGH:	priority = PR_HIGH;	break;
 		case MP_PRIOAUTO:	priority = PR_AUTO;	break;
 		default:
-			wxASSERT( false );
+			wxFAIL;
 	}
 
-	ItemList files = ::GetSelectedItems( this, itFILES );
+	ItemList files = ::GetSelectedItems( this );
 
 	for ( ItemList::iterator it = files.begin(); it != files.end(); ++it ) {
 		CPartFile* file = (*it)->GetFile();
@@ -632,7 +454,7 @@
 
 void CDownloadListCtrl::OnSwapSources( wxCommandEvent& event )
 {
-	ItemList files = ::GetSelectedItems( this, itFILES );
+	ItemList files = ::GetSelectedItems( this );
 
 	for ( ItemList::iterator it = files.begin(); it != files.end(); ++it ) {
 		CPartFile* file = (*it)->GetFile();
@@ -656,21 +478,23 @@
 
 void CDownloadListCtrl::OnSetCategory( wxCommandEvent& event )
 {
-	ItemList files = ::GetSelectedItems( this, itFILES );
+	ItemList files = ::GetSelectedItems( this );
 
 	for ( ItemList::iterator it = files.begin(); it != files.end(); ++it ) {
-		CPartFile* file = (*it)->GetFile();
-
-		CoreNotify_PartFile_SetCat( file, event.GetId() - MP_ASSIGNCAT );
+		CoreNotify_PartFile_SetCat( (*it)->GetFile(), event.GetId() - MP_ASSIGNCAT );
+		ShowFile((*it)->GetFile(), false);
 	}
+	wxListEvent ev;
+	OnItemSelectionChanged(ev);	// clear clients that may have been shown
 
-	ChangeCategory( m_category );
+	ChangeCategory( m_category );	// This only updates the visibility of the clear completed button
+	theApp->amuledlg->m_transferwnd->UpdateCatTabTitles();
 }
 
 
 void CDownloadListCtrl::OnSetStatus( wxCommandEvent& event )
 {
-	ItemList files = ::GetSelectedItems( this, itFILES );
+	ItemList files = ::GetSelectedItems( this );
 
 	for ( ItemList::iterator it = files.begin(); it != files.end(); ++it ) {
 		CPartFile* file = (*it)->GetFile();
@@ -685,7 +509,6 @@
 				break;
 
 			case MP_STOP:
-				ShowSources(file, false);
 				CoreNotify_PartFile_Stop( file );
 				break;
 		}
@@ -701,7 +524,7 @@
 
 void CDownloadListCtrl::OnGetLink(wxCommandEvent& event)
 {
-	ItemList files = ::GetSelectedItems( this, itFILES );
+	ItemList files = ::GetSelectedItems( this );
 
 	wxString URIs;
 
@@ -724,11 +547,11 @@
 void CDownloadListCtrl::OnGetFeedback(wxCommandEvent& WXUNUSED(event))
 {
 	wxString feed;
-	ItemList files = ::GetSelectedItems(this, itFILES);
+	ItemList files = ::GetSelectedItems( this );
 
 	for (ItemList::iterator it = files.begin(); it != files.end(); ++it) {
 		if (feed.IsEmpty()) {
-			feed = CFormat(_("Feedback from: %s (%s)\n\n")) % thePrefs::GetUserNick() % GetFullMuleVersion();
+			feed = CFormat(_("Feedback from: %s (%s)\n\n")) % thePrefs::GetUserNick() % theApp->GetFullMuleVersion();
 		} else {
 			feed += wxT("\n");
 		}
@@ -740,147 +563,72 @@
 	}
 }
 
-
-void CDownloadListCtrl::OnGetRazorStats( wxCommandEvent& WXUNUSED(event) )
-{
-	ItemList files = ::GetSelectedItems( this, itFILES );
-
-	if ( files.size() == 1 ) {
-		CPartFile* file = files.front()->GetFile();
-
-		theApp->amuledlg->LaunchUrl(
-			wxT("http://stats.razorback2.com/ed2khistory?ed2k=") +
-			file->GetFileHash().Encode());
-	}
-}
-
-
 void CDownloadListCtrl::OnViewFileInfo( wxCommandEvent& WXUNUSED(event) )
 {
-	ItemList files = ::GetSelectedItems( this, itFILES );
+	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 
-	if ( files.size() == 1 ) {
-		CPartFile* file = files.front()->GetFile();
-
-		CFileDetailDialog dialog( this, file );
-		dialog.ShowModal();
+	if (index >= 0) {
+		ShowFileDetailDialog(index);
 	}
 }
 
 
 void CDownloadListCtrl::OnViewFileComments( wxCommandEvent& WXUNUSED(event) )
 {
-	ItemList files = ::GetSelectedItems( this, itFILES );
+	ItemList files = ::GetSelectedItems( this );
 
 	if ( files.size() == 1 ) {
-		CPartFile* file = files.front()->GetFile();
-
-		CCommentDialogLst dialog( this, file );
+		CCommentDialogLst dialog( this, files.front()->GetFile() );
 		dialog.ShowModal();
 	}
 }
 
-
 void CDownloadListCtrl::OnPreviewFile( wxCommandEvent& WXUNUSED(event) )
 {
-	ItemList files = ::GetSelectedItems( this, itFILES );
+	ItemList files = ::GetSelectedItems( this );
 
 	if ( files.size() == 1 ) {
 		PreviewFile(files.front()->GetFile());
 	}
 }
 
-void CDownloadListCtrl::OnSwapSource( wxCommandEvent& WXUNUSED(event) )
-{
-	ItemList sources = ::GetSelectedItems( this, itSOURCES );
-
-	for ( ItemList::iterator it = sources.begin(); it != sources.end(); ++it ) {
-		CPartFile* file = (*it)->GetOwner();
-		CUpDownClient* source = (*it)->GetSource();
-
-		source->SwapToAnotherFile( true, false, false, file );
-	}
-}
-
-
-void CDownloadListCtrl::OnViewFiles( wxCommandEvent& WXUNUSED(event) )
-{
-	ItemList sources = ::GetSelectedItems( this, itSOURCES );
+void CDownloadListCtrl::OnItemActivated( wxListEvent& evt )
+{	
+	CPartFile* file = ((FileCtrlItem_Struct*)GetItemData( evt.GetIndex()))->GetFile();
 
-	if ( sources.size() == 1 ) {
-		CUpDownClient* source = sources.front()->GetSource();
-		
-		source->RequestSharedFileList();
-	}
+	if ((!file->IsPartFile() || file->IsCompleted()) && file->PreviewAvailable()) {
+		PreviewFile( file );
+	}	
 }
 
-
-void CDownloadListCtrl::OnAddFriend( wxCommandEvent& WXUNUSED(event) )
-{
-	ItemList sources = ::GetSelectedItems( this, itSOURCES );
-
-	for ( ItemList::iterator it = sources.begin(); it != sources.end(); ++it ) {
-		CUpDownClient* client = (*it)->GetSource();
-		if (client->IsFriend()) {
-			theApp->amuledlg->m_chatwnd->RemoveFriend(client->GetUserHash(), client->GetIP(), client->GetUserPort());
-		} else {
-			theApp->amuledlg->m_chatwnd->AddFriend( client );
-		}
+void CDownloadListCtrl::OnItemSelectionChanged( wxListEvent& )
+{	
+	if (!m_ItemSelectionChangePending && !IsSorting()) {
+		m_ItemSelectionChangePending = true;
+		Notify_DownloadCtrlDoItemSelectionChanged();
 	}
 }
 
+void CDownloadListCtrl::DoItemSelectionChanged()
+{	
+	m_ItemSelectionChangePending = false;
+	CKnownFileVector filesVector;
+	filesVector.reserve(GetSelectedItemCount());
 
-void CDownloadListCtrl::OnSendMessage( wxCommandEvent& WXUNUSED(event) )
-{
-	ItemList sources = ::GetSelectedItems( this, itSOURCES );
-
-	if ( sources.size() == 1 ) {
-		CUpDownClient* source = (sources.front())->GetSource();
-
-		// These values are cached, since calling wxGetTextFromUser will
-		// start an event-loop, in which the client may be deleted.
-		wxString userName = source->GetUserName();
-		uint64 userID = GUI_ID(source->GetIP(), source->GetUserPort());
+	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 		
-		wxString message = ::wxGetTextFromUser(_("Send message to user"),
-			_("Message to send:"));
-		if ( !message.IsEmpty() ) {
-			theApp->amuledlg->m_chatwnd->SendMessage(message, userName, userID);
+	while ( index > -1 ) {
+		CPartFile* file = ((FileCtrlItem_Struct*)GetItemData( index ))->GetFile();
+		if (file->IsPartFile()) {
+			filesVector.push_back(file);
 		}
+		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	}
-}
-
-
-void CDownloadListCtrl::OnViewClientInfo( wxCommandEvent& WXUNUSED(event) )
-{
-	ItemList sources = ::GetSelectedItems( this, itSOURCES );
-
-	if ( sources.size() == 1 ) {
-		CUpDownClient* source = (sources.front())->GetSource();
-
-		CClientDetailDialog dialog( this, source );
-		dialog.ShowModal();
-	}
-}
-
-
-void CDownloadListCtrl::OnItemActivated( wxListEvent& evt )
-{
-	CtrlItem_Struct* content = (CtrlItem_Struct*)GetItemData( evt.GetIndex() );
-	
-	if ( content->GetType() == FILE_TYPE ) {
-		CPartFile* file = content->GetFile();
-
-		if ((!file->IsPartFile() || file->GetStatus() == PS_COMPLETE) && file->PreviewAvailable()) {
-			PreviewFile( file );
-		} else {
-			ShowSources( file, !file->ShowSources() );
-		}
 		
-	}
+	std::sort(filesVector.begin(), filesVector.end());
+	theApp->amuledlg->m_transferwnd->clientlistctrl->ShowSources(filesVector);
 }
 
-
 void CDownloadListCtrl::OnMouseRightClick(wxListEvent& evt)
 {
 	long index = CheckSelection(evt);
@@ -891,138 +639,123 @@
 	delete m_menu;
 	m_menu = NULL;
 
-	CtrlItem_Struct* item = (CtrlItem_Struct*)GetItemData( index );
-	if (item->GetType() == FILE_TYPE) {
-		m_menu = new wxMenu( _("Downloads") );
-
-		wxMenu* priomenu = new wxMenu();
-		priomenu->AppendCheckItem(MP_PRIOLOW, _("Low"));
-		priomenu->AppendCheckItem(MP_PRIONORMAL, _("Normal"));
-		priomenu->AppendCheckItem(MP_PRIOHIGH, _("High"));
-		priomenu->AppendCheckItem(MP_PRIOAUTO, _("Auto"));
-
-		m_menu->Append(MP_MENU_PRIO, _("Priority"), priomenu);
-		m_menu->Append(MP_CANCEL, _("Cancel"));
-		m_menu->Append(MP_STOP, _("&Stop"));
-		m_menu->Append(MP_PAUSE, _("&Pause"));
-		m_menu->Append(MP_RESUME, _("&Resume"));
-		m_menu->Append(MP_CLEARCOMPLETED, _("C&lear completed"));
-		//-----------------------------------------------------
-		m_menu->AppendSeparator();
-		//-----------------------------------------------------
-		wxMenu* extendedmenu = new wxMenu();
-		extendedmenu->Append(MP_SWAP_A4AF_TO_THIS, _("Swap every A4AF to this file now"));
-		extendedmenu->AppendCheckItem(MP_SWAP_A4AF_TO_THIS_AUTO, _("Swap every A4AF to this file (Auto)"));
-		//-----------------------------------------------------
-		extendedmenu->AppendSeparator();
-		//-----------------------------------------------------
-		extendedmenu->Append(MP_SWAP_A4AF_TO_ANY_OTHER, _("Swap every A4AF to any other file now"));
-		//-----------------------------------------------------
-		m_menu->Append(MP_MENU_EXTD, _("Extended Options"), extendedmenu);
-		//-----------------------------------------------------
-		m_menu->AppendSeparator();
-		//-----------------------------------------------------
-/* Commented out till RB2 is back 
-		m_menu->Append( MP_RAZORSTATS, _("Get Razorback 2's stats for this file"));
-		//-----------------------------------------------------
-		m_menu->AppendSeparator();
-		//-----------------------------------------------------
-*/
-		m_menu->Append(MP_VIEW, _("Preview"));
-		m_menu->Append(MP_METINFO, _("Show file &details"));
-		m_menu->Append(MP_VIEWFILECOMMENTS,
-			_("Show all comments"));
-		//-----------------------------------------------------
-		m_menu->AppendSeparator();
-		//-----------------------------------------------------
-		m_menu->Append(MP_GETMAGNETLINK, _("Copy magnet URI to clipboard"));
-		m_menu->Append(MP_GETED2KLINK, _("Copy eD2k &link to clipboard"));
-		m_menu->Append(MP_WS, _("Copy feedback to clipboard"));
-		//-----------------------------------------------------
-		m_menu->AppendSeparator();
-		//-----------------------------------------------------	
-		// Add dinamic entries
-		wxMenu *cats = new wxMenu(_("Category"));
-		if (theApp->glob_prefs->GetCatCount() > 1) {
-			for (uint32 i = 0; i < theApp->glob_prefs->GetCatCount(); i++) {
-				if ( i == 0 ) {
-					cats->Append( MP_ASSIGNCAT, _("unassign") );
-				} else {
-					cats->Append( MP_ASSIGNCAT + i,
-						theApp->glob_prefs->GetCategory(i)->title );
-				}
+	FileCtrlItem_Struct* item = (FileCtrlItem_Struct*)GetItemData( index );
+	m_menu = new wxMenu( _("Downloads") );
+
+	wxMenu* priomenu = new wxMenu();
+	priomenu->AppendCheckItem(MP_PRIOLOW, _("Low"));
+	priomenu->AppendCheckItem(MP_PRIONORMAL, _("Normal"));
+	priomenu->AppendCheckItem(MP_PRIOHIGH, _("High"));
+	priomenu->AppendCheckItem(MP_PRIOAUTO, _("Auto"));
+
+	m_menu->Append(MP_MENU_PRIO, _("Priority"), priomenu);
+	m_menu->Append(MP_CANCEL, _("Cancel"));
+	m_menu->Append(MP_STOP, _("&Stop"));
+	m_menu->Append(MP_PAUSE, _("&Pause"));
+	m_menu->Append(MP_RESUME, _("&Resume"));
+	m_menu->Append(MP_CLEARCOMPLETED, _("C&lear completed"));
+	//-----------------------------------------------------
+	m_menu->AppendSeparator();
+	//-----------------------------------------------------
+	wxMenu* extendedmenu = new wxMenu();
+	extendedmenu->Append(MP_SWAP_A4AF_TO_THIS,
+		_("Swap every A4AF to this file now"));
+	extendedmenu->AppendCheckItem(MP_SWAP_A4AF_TO_THIS_AUTO,
+		_("Swap every A4AF to this file (Auto)"));
+	//-----------------------------------------------------
+	extendedmenu->AppendSeparator();
+	//-----------------------------------------------------
+	extendedmenu->Append(MP_SWAP_A4AF_TO_ANY_OTHER,
+		_("Swap every A4AF to any other file now"));
+	//-----------------------------------------------------
+	m_menu->Append(MP_MENU_EXTD,
+		_("Extended Options"), extendedmenu);
+	//-----------------------------------------------------
+	m_menu->AppendSeparator();
+	//-----------------------------------------------------
+
+	m_menu->Append(MP_VIEW, _("Preview"));
+	m_menu->Append(MP_METINFO, _("Show file &details"));
+	m_menu->Append(MP_VIEWFILECOMMENTS, _("Show all comments"));
+	//-----------------------------------------------------
+	m_menu->AppendSeparator();
+	//-----------------------------------------------------
+	m_menu->Append(MP_GETMAGNETLINK,
+		_("Copy magnet URI to clipboard"));
+	m_menu->Append(MP_GETED2KLINK,
+		_("Copy eD2k &link to clipboard"));
+	m_menu->Append(MP_WS,
+		_("Copy feedback to clipboard"));
+	//-----------------------------------------------------
+	m_menu->AppendSeparator();
+	//-----------------------------------------------------	
+	// Add dynamic entries
+	wxMenu *cats = new wxMenu(_("Category"));
+	if (theApp->glob_prefs->GetCatCount() > 1) {
+		for (uint32 i = 0; i < theApp->glob_prefs->GetCatCount(); i++) {
+			if ( i == 0 ) {
+				cats->Append( MP_ASSIGNCAT, _("unassign") );
+			} else {
+				cats->Append( MP_ASSIGNCAT + i,
+					theApp->glob_prefs->GetCategory(i)->title );
 			}
 		}
-		m_menu->Append(MP_MENU_CATS, _("Assign to category"), cats);
-		m_menu->Enable(MP_MENU_CATS, (theApp->glob_prefs->GetCatCount() > 1) );
-
-		CPartFile* file = item->GetFile();
-		// then set state
-		bool canStop;
-		bool canPause;
-		bool canCancel;
-		bool fileResumable;
-		if (file->GetStatus(true) != PS_ALLOCATING) {
-			const uint8_t fileStatus = file->GetStatus();
-			canStop =
-				(fileStatus != PS_ERROR) &&
-				(fileStatus != PS_COMPLETE) &&
-				(file->IsStopped() != true);
-			canPause = (file->GetStatus() != PS_PAUSED) && canStop;
-			fileResumable =
-				(fileStatus == PS_PAUSED) ||
-				(fileStatus == PS_ERROR) ||
-				(fileStatus == PS_INSUFFICIENT);
-			canCancel = fileStatus != PS_COMPLETE;
-		} else {
-			canStop = canPause = canCancel = fileResumable = false;
-		}
-
-		wxMenu* menu = m_menu;
-		menu->Enable( MP_CANCEL,	canCancel );
-		menu->Enable( MP_PAUSE,		canPause );
-		menu->Enable( MP_STOP,		canStop );
-		menu->Enable( MP_RESUME, 	fileResumable );
-		menu->Enable( MP_CLEARCOMPLETED, m_completedFiles );
-
-		wxString view;
-		if (file->IsPartFile() && (file->GetStatus() != PS_COMPLETE)) {
-			view << CFormat(wxT("%s [%s]")) % _("Preview")
-					% file->GetPartMetFileName().RemoveExt();
-		} else if ( file->GetStatus() == PS_COMPLETE ) {
-			view << _("&Open the file");
-		}
-		menu->SetLabel(MP_VIEW, view);
-		menu->Enable(MP_VIEW, file->PreviewAvailable() );
-
-		menu->Check(  MP_SWAP_A4AF_TO_THIS_AUTO, 	file->IsA4AFAuto() );
+	}
+	m_menu->Append(MP_MENU_CATS, _("Assign to category"), cats);
+	m_menu->Enable(MP_MENU_CATS, (theApp->glob_prefs->GetCatCount() > 1) );
+
+	CPartFile* file = item->GetFile();
+	// then set state
+	bool canStop;
+	bool canPause;
+	bool canCancel;
+	bool fileResumable;
+	if (file->GetStatus(true) != PS_ALLOCATING) {
+		const uint8_t fileStatus = file->GetStatus();
+		canStop =
+			(fileStatus != PS_ERROR) &&
+			(fileStatus != PS_COMPLETE) &&
+			(file->IsStopped() != true);
+		canPause = (file->GetStatus() != PS_PAUSED) && canStop;
+		fileResumable =
+			(fileStatus == PS_PAUSED) ||
+			(fileStatus == PS_ERROR) ||
+			(fileStatus == PS_INSUFFICIENT);
+		canCancel = fileStatus != PS_COMPLETE;
+	} else {
+		canStop = canPause = canCancel = fileResumable = false;
+	}
 
-		int priority = file->IsAutoDownPriority() ?
-			PR_AUTO : file->GetDownPriority();
+	m_menu->Enable( MP_CANCEL,	canCancel );
+	m_menu->Enable( MP_PAUSE,	canPause );
+	m_menu->Enable( MP_STOP,	canStop );
+	m_menu->Enable( MP_RESUME, 	fileResumable );
+	m_menu->Enable( MP_CLEARCOMPLETED, CastByID(ID_BTNCLRCOMPL, GetParent(), wxButton)->IsEnabled() );
 
-		priomenu->Check( MP_PRIOHIGH,	priority == PR_HIGH );
-		priomenu->Check( MP_PRIONORMAL, priority == PR_NORMAL );
-		priomenu->Check( MP_PRIOLOW,	priority == PR_LOW );
-		priomenu->Check( MP_PRIOAUTO,	priority == PR_AUTO );
+	wxString view;
+	if (file->IsPartFile() && !file->IsCompleted()) {
+		view = CFormat(wxT("%s [%s]")) % _("Preview")
+				% file->GetPartMetFileName().RemoveExt();
+	} else if ( file->IsCompleted() ) {
+		view = _("&Open the file");
+	}
+	m_menu->SetLabel(MP_VIEW, view);
+	m_menu->Enable(MP_VIEW, file->PreviewAvailable());
 
-		menu->Enable( MP_MENU_EXTD, canPause );
-	} else {
-		CUpDownClient* client = item->GetSource();
+	FileRatingList ratingList;
+	item->GetFile()->GetRatingAndComments(ratingList);
+	m_menu->Enable(MP_VIEWFILECOMMENTS, !ratingList.empty());
 
-		m_menu = new wxMenu(wxT("Clients"));
-		m_menu->Append(MP_DETAIL, _("Show &Details"));
-		m_menu->Append(MP_ADDFRIEND, client->IsFriend() ? _("Remove from friends") : _("Add to Friends"));
-		m_menu->Append(MP_SHOWLIST, _("View Files"));
-		m_menu->Append(MP_SENDMESSAGE, _("Send message"));
-		m_menu->Append(MP_CHANGE2FILE, _("Swap to this file"));
+	m_menu->Check(  MP_SWAP_A4AF_TO_THIS_AUTO, 	file->IsA4AFAuto() );
 
-		// Only enable the Swap option for A4AF sources
-		m_menu->Enable(MP_CHANGE2FILE, (item->GetType() == A4AF_SOURCE));
-		// We need a valid IP if we are to message the client
-		m_menu->Enable(MP_SENDMESSAGE, (client->GetIP() != 0));
+	int priority = file->IsAutoDownPriority() ? PR_AUTO : file->GetDownPriority();
+	
+	priomenu->Check( MP_PRIOHIGH,	priority == PR_HIGH );
+	priomenu->Check( MP_PRIONORMAL, priority == PR_NORMAL );
+	priomenu->Check( MP_PRIOLOW,	priority == PR_LOW );
+	priomenu->Check( MP_PRIOAUTO,	priority == PR_AUTO );
 
-		m_menu->Enable(MP_SHOWLIST, !client->HasDisabledSharedFiles());
-	}
+	m_menu->Enable( MP_MENU_EXTD, canPause );
 
 	bool autosort = thePrefs::AutoSortDownload(false);
 	PopupMenu(m_menu, evt.GetPoint());
@@ -1030,7 +763,6 @@
 
 	delete m_menu;
 	m_menu = NULL;
-	
 }
 
 
@@ -1038,18 +770,23 @@
 {
 	// Check if clicked item is selected. If not, unselect all and select it.
 	long index = CheckSelection(evt);
-	if ( index < 0 ) {
-		return;
+	if (index >= 0) {
+		ShowFileDetailDialog(index);
 	}
+}
 
-	CtrlItem_Struct* item = (CtrlItem_Struct*)GetItemData( index );
 
-	bool autosort = thePrefs::AutoSortDownload(false);
-	if ( item->GetType() == FILE_TYPE ) {
-		CFileDetailDialog(this, item->GetFile()).ShowModal();
-	} else {
-		CClientDetailDialog(this, item->GetSource()).ShowModal();
+void CDownloadListCtrl::ShowFileDetailDialog(long index)
+{
+	// Make list of part files in control
+	std::vector<CPartFile *> files;
+	int nrItems = GetItemCount();
+	files.reserve(nrItems);
+	for (int i = 0; i < nrItems; i++) {
+		files.push_back(((FileCtrlItem_Struct*)GetItemData(i))->GetFile());
 	}
+	bool autosort = thePrefs::AutoSortDownload(false);
+	CFileDetailDialog(this, files, index).ShowModal();
 	thePrefs::AutoSortDownload(autosort);
 }
 
@@ -1065,7 +802,7 @@
 			break;
 		}
 		case WXK_F2: {
-			ItemList files = ::GetSelectedItems( this, itFILES );
+			ItemList files = ::GetSelectedItems( this );
 			if (files.size() == 1) {	
 				CPartFile* file = files.front()->GetFile();
 				
@@ -1097,55 +834,37 @@
 		return;
 	}
 
-	CtrlItem_Struct* content = (CtrlItem_Struct *)GetItemData(item);
+	FileCtrlItem_Struct* content = (FileCtrlItem_Struct *)GetItemData(item);
 
 	// Define text-color and background
-	if ((content->GetType() == FILE_TYPE) && (highlighted)) {
+	// and the border of the drawn area
+	if (highlighted) {
+		CMuleColour colour;
 		if (GetFocus()) {
-			dc->SetBackground(*m_hilightBrush);
-			dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+			dc->SetBackground(m_hilightBrush);
+			colour = m_hilightBrush.GetColour();
 		} else {
-			dc->SetBackground(*m_hilightUnfocusBrush);
-			dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+			dc->SetBackground(m_hilightUnfocusBrush);
+			colour = m_hilightUnfocusBrush.GetColour();
 		}
+		dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+		dc->SetPen( colour.Blend(65).GetPen() );
 	} else {
-		dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(
-			wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID)));
+		dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID)));
 		dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
-	}
-
-
-	// Define the border of the drawn area
-	if ( highlighted ) {
-		wxColour old;
-		if ( ( content->GetType() == FILE_TYPE ) && !GetFocus() ) {
-			old = m_hilightUnfocusBrush->GetColour();
-		} else {
-			old = m_hilightBrush->GetColour();
-		}
-
-		wxColor newcol(
-			((int)old.Red() * 65) / 100,
-			((int)old.Green() * 65) / 100,
-			((int)old.Blue() * 65) / 100);
-
-		dc->SetPen( wxPen(newcol, 1, wxSOLID) );
-	} else {
 		dc->SetPen(*wxTRANSPARENT_PEN);
 	}
-
-
 	dc->SetBrush( dc->GetBackground() );
+	
 	dc->DrawRectangle( rectHL.x, rectHL.y, rectHL.width, rectHL.height );
 
 	dc->SetPen(*wxTRANSPARENT_PEN);
 
-	if ( content->GetType() == FILE_TYPE && ( !highlighted || !GetFocus() ) ) {
+	if (!highlighted || !GetFocus() ) {
 		// If we have category, override textforeground with what category tells us.
 		CPartFile *file = content->GetFile();
 		if ( file->GetCategory() ) {
-			dc->SetTextForeground(
-				WxColourFromCr(theApp->glob_prefs->GetCatColor(file->GetCategory())) );
+			dc->SetTextForeground(CMuleColour(theApp->glob_prefs->GetCatColor(file->GetCategory())) );
 		}
 	}
 
@@ -1153,11 +872,6 @@
 	const int iTextOffset = ( rect.GetHeight() - dc->GetCharHeight() ) / 2;
 	const int iOffset = 4;
 
-	// The starting end ending position of the tree
-	bool tree_show = false;
-	int tree_start = 0;
-	int tree_end = 0;
-
 	wxRect cur_rec( iOffset, rect.y, 0, rect.height );
 	for (int i = 0; i < GetColumnCount(); i++) {
 		wxListItem listitem;
@@ -1168,12 +882,7 @@
 
 			// Make a copy of the current rectangle so we can apply specific tweaks
 			wxRect target_rec = cur_rec;
-			if ( i == 5 ) {
-				tree_show = ( listitem.GetWidth() > 0 );
-
-				tree_start = cur_rec.x - iOffset;
-				tree_end   = cur_rec.x + iOffset;
-
+			if ( i == ColumnProgress ) {
 				// Double the offset to make room for the cirle-marker
 				target_rec.x += iOffset;
 				target_rec.width -= iOffset;
@@ -1183,66 +892,16 @@
 			}
 
 			// Draw the item
-			if ( content->GetType() == FILE_TYPE ) {
-				DrawFileItem(dc, i, target_rec, content);
-			} else {
-				DrawSourceItem(dc, i, target_rec, content);
-			}
+			DrawFileItem(dc, i, target_rec, content);
 		}
 		
 		// Increment to the next column
 		cur_rec.x += listitem.GetWidth();
 	}
-
-	// Draw tree last so it draws over selected and focus (looks better)
-	if ( tree_show ) {
-		// Gather some information
-		const bool notLast = item + 1 != GetItemCount();
-		const bool notFirst = item != 0;
-		const bool hasNext = notLast &&
-			((CtrlItem_Struct*)GetItemData(item + 1))->GetType() != FILE_TYPE;
-		const bool isOpenRoot = content->GetType() == FILE_TYPE &&
-			(content->GetFile())->ShowSources() &&
-			((content->GetFile())->GetStatus() != PS_COMPLETE);
-		const bool isChild = content->GetType() != FILE_TYPE;
-
-		// Might as well calculate these now
-		const int treeCenter = tree_start + 3;
-		const int middle = cur_rec.y + ( cur_rec.height + 1 ) / 2;
-
-		// Set up a new pen for drawing the tree
-		dc->SetPen( *(wxThePenList->FindOrCreatePen(dc->GetTextForeground(), 1, wxSOLID)) );
-
-		if (isChild) {
-			// Draw the line to the status bar
-			dc->DrawLine(tree_end, middle, tree_start + 3, middle);
-
-			// Draw the line to the child node
-			if (hasNext) {
-				dc->DrawLine(treeCenter, middle, treeCenter, cur_rec.y + cur_rec.height + 1);
-			}
-
-			// Draw the line back up to parent node
-			if (notFirst) {
-				dc->DrawLine(treeCenter, middle, treeCenter, cur_rec.y - 1);
-			}
-		} else if ( isOpenRoot ) {
-			// Draw empty circle
-			dc->SetBrush(*wxTRANSPARENT_BRUSH);
-
-			dc->DrawCircle( treeCenter, middle, 3 );
-
-			// Draw the line to the child node if there are any children
-			if (hasNext) {
-				dc->DrawLine(treeCenter, middle + 3, treeCenter, cur_rec.y + cur_rec.height + 1);
-			}
-		}
-
-	}
 }
 
 
-void CDownloadListCtrl::DrawFileItem( wxDC* dc, int nColumn, const wxRect& rect, CtrlItem_Struct* item ) const
+void CDownloadListCtrl::DrawFileItem( wxDC* dc, int nColumn, const wxRect& rect, FileCtrlItem_Struct* item ) const
 {
 	wxDCClipper clipper( *dc, rect.GetX(), rect.GetY(), rect.GetWidth(), rect.GetHeight() );
 
@@ -1252,562 +911,218 @@
 	wxString text;
 
 	switch (nColumn) {
-	// Filename
-	case 0: {
-		// show no. of partfile in filename column
-		wxString filename;
-		if (thePrefs::ShowPartFileNumber()) {
-			if (file->IsPartFile() && !(file->GetStatus() == PS_COMPLETE)) {
-				filename = CFormat(wxT("[%s] ")) % file->GetPartMetFileName().RemoveAllExt();
+		// Part Number
+		case ColumnPart: {
+			if (file->IsPartFile() && !file->IsCompleted()) {
+			  text = CFormat(wxT("%03d")) % file->GetPartMetNumber();
 			}
+			break;
 		}
-		filename += file->GetFileName().GetPrintable();
-
-		if (file->HasRating() || file->HasComment()) {
-			int image = Client_CommentOnly_Smiley;
-			if (file->HasRating()) {
-				image = Client_InvalidRating_Smiley + file->UserRating() - 1;
-			}	
+		// Filename
+		case ColumnFileName: {
+			wxString filename = file->GetFileName().GetPrintable();
+	
+			if (file->HasRating() || file->HasComment()) {
+				int image = Client_CommentOnly_Smiley;
+				if (file->HasRating()) {
+					image = Client_InvalidRating_Smiley + file->UserRating() - 1;
+				}	
+					
+				wxASSERT(image >= Client_InvalidRating_Smiley);
+				wxASSERT(image <= Client_CommentOnly_Smiley);
 				
-			wxASSERT(image >= Client_InvalidRating_Smiley);
-			wxASSERT(image <= Client_CommentOnly_Smiley);
-			
-			int imgWidth = 16;
-			
-			// it's already centered by OnDrawItem() ...
-			m_ImageList.Draw(image, *dc, rect.GetX(), rect.GetY() - 1,
-				wxIMAGELIST_DRAW_TRANSPARENT);
-			dc->DrawText(filename, rect.GetX() + imgWidth + 4, rect.GetY());
-		} else {
-			dc->DrawText(filename, rect.GetX(), rect.GetY());
+				int imgWidth = 16;
+				
+				// it's already centered by OnDrawItem() ...
+				m_ImageList.Draw(image, *dc, rect.GetX(), rect.GetY() - 1,
+					wxIMAGELIST_DRAW_TRANSPARENT);
+				dc->DrawText(filename, rect.GetX() + imgWidth + 4, rect.GetY());
+			} else {
+				dc->DrawText(filename, rect.GetX(), rect.GetY());
+			}
+			break;
 		}
-	}
-	break;
-
-	// Filesize
-	case 1:
-		text = CastItoXBytes( file->GetFileSize() );
-		break;
-
-	// Transferred
-	case 2:
-		text = CastItoXBytes( file->GetTransferred() );
-		break;
-	
-	// Completed
-	case 3:
-		text = CastItoXBytes( file->GetCompletedSize() );
-		break;
-	
-	// Speed
-	case 4:	// speed
-		if ( file->GetTransferingSrcCount() ) {
-			text = wxString::Format( wxT("%.1f "), file->GetKBpsDown() ) +
-				_("kB/s");
-		}
-		break;
-	
-	case 5:	// progress
-	{
-		if (thePrefs::ShowProgBar())
-		{
-			int iWidth  = rect.GetWidth() - 2;
-			int iHeight = rect.GetHeight() - 2;
-
-			// DO NOT DRAW IT ALL THE TIME
-			uint32 dwTicks = GetTickCount();
-			
-			wxMemoryDC cdcStatus;
-			
-			if ( item->dwUpdated < dwTicks || !item->status || iWidth != item->status->GetWidth() ) {
-				if ( item->status == NULL) {
-					item->status = new wxBitmap(iWidth, iHeight);
-				} else if ( item->status->GetWidth() != iWidth ) {
-					// Only recreate if the size has changed
-					item->status->Create(iWidth, iHeight);
-				}
-						
-				cdcStatus.SelectObject( *item->status );
-				
-				if ( thePrefs::UseFlatBar() ) {
-					DrawFileStatusBar( file, &cdcStatus,
-						wxRect(0, 0, iWidth, iHeight), true);
-				} else {
-					DrawFileStatusBar( file, &cdcStatus,
-						wxRect(1, 1, iWidth - 2, iHeight - 2), false);
 		
-					// Draw black border
-					cdcStatus.SetPen( *wxBLACK_PEN );
-					cdcStatus.SetBrush( *wxTRANSPARENT_BRUSH );
-					cdcStatus.DrawRectangle( 0, 0, iWidth, iHeight );
-				}
-			
-				item->dwUpdated = dwTicks + 5000; // Plus five seconds
-			} else {
-				cdcStatus.SelectObject( *item->status );
-			}
-			
-			dc->Blit( rect.GetX(), rect.GetY() + 1, iWidth, iHeight, &cdcStatus, 0, 0);
-		}
+		// Filesize
+		case ColumnSize:
+			text = CastItoXBytes( file->GetFileSize() );
+			break;
+	
+		// Transferred
+		case ColumnTransferred:
+			text = CastItoXBytes( file->GetTransferred() );
+			break;
 		
-		if (thePrefs::ShowPercent()) {
-			// Percentage of completing
-			// We strip anything below the first decimal point,
-			// to avoid Format doing roundings
-			float percent = floor( file->GetPercentCompleted() * 10.0f ) / 10.0f;
+		// Completed
+		case ColumnCompleted:
+			text = CastItoXBytes( file->GetCompletedSize() );
+			break;
 		
-			wxString buffer = wxString::Format( wxT("%.1f%%"), percent );
-			int middlex = (2*rect.GetX() + rect.GetWidth()) >> 1;
-			int middley = (2*rect.GetY() + rect.GetHeight()) >> 1;
-			
-			wxCoord textwidth, textheight;
-			
-			dc->GetTextExtent(buffer, &textwidth, &textheight);
-			wxColour AktColor = dc->GetTextForeground();
-			if (thePrefs::ShowProgBar()) {
-				dc->SetTextForeground(*wxWHITE);
-			} else {
-				dc->SetTextForeground(*wxBLACK);
+		// Speed
+		case ColumnSpeed:
+			if ( file->GetTransferingSrcCount() ) {
+				text = CFormat(_("%.1f kB/s")) % file->GetKBpsDown();
 			}
-			dc->DrawText(buffer, middlex - (textwidth >> 1), middley - (textheight >> 1));
-			dc->SetTextForeground(AktColor);
-		}
-	}
-	break;
-
-	// Sources
-	case 6:	{
-		uint16 sc = file->GetSourceCount();
-		uint16 ncsc = file->GetNotCurrentSourcesCount();
-		if ( ncsc ) {
-			text = wxString::Format( wxT("%i/%i" ), sc - ncsc, sc );
-		} else {
-			text = wxString::Format( wxT("%i"), sc );
-		}
-
-		if ( file->GetSrcA4AFCount() ) {
-			text += wxString::Format( wxT("+%i"), file->GetSrcA4AFCount() );
-		}
-
-		if ( file->GetTransferingSrcCount() ) {
-			text += wxString::Format( wxT(" (%i)"), file->GetTransferingSrcCount() );
-		}
-
-		break;
-	}
-
-	// Priority
-	case 7:
-		text = PriorityToStr( file->GetDownPriority(), file->IsAutoDownPriority() );
-		break;
-			
-	// File-status
-	case 8:
-		text = file->getPartfileStatus();
-		break;
-	
-	// Remaining
-	case 9: {
-		if ((file->GetStatus() != PS_COMPLETING) && file->IsPartFile()) {
-			uint64 remainSize = file->GetFileSize() - file->GetCompletedSize();
-			sint32 remainTime = file->getTimeRemaining();
-			
-			if (remainTime >= 0) {
-				text = CastSecondsToHM(remainTime);
-			} else {
-				text = _("Unknown");
-			}
-
-			text += wxT(" (") + CastItoXBytes(remainSize) + wxT(")");
-		}
-		break;
-	}
-	
-	// Last seen completed
-	case 10: {
-		if ( file->lastseencomplete ) {
-			text = wxDateTime( file->lastseencomplete ).Format( _("%y/%m/%d %H:%M:%S") );
-		} else {
-			text = _("Unknown");
-		}
-		break;
-	}
+			break;
 	
-	// Laste received
-	case 11: {
-		const time_t lastReceived = file->GetLastChangeDatetime();
-		if (lastReceived) {
-			text = wxDateTime(lastReceived).Format( _("%y/%m/%d %H:%M:%S") );
-		} else {
-			text = _("Unknown");
-		}
-	}
-	} // switch
-
-	if ( !text.IsEmpty() ) {
-		dc->DrawText( text, rect.GetX(), rect.GetY() );
-	}
-}
-
-
-void CDownloadListCtrl::DrawSourceItem(
-	wxDC* dc, int nColumn, const wxRect& rect, CtrlItem_Struct* item ) const
-{
-	wxDCClipper clipper( *dc, rect.GetX(), rect.GetY(), rect.GetWidth(), rect.GetHeight() );
-	wxString buffer;
+		// Progress	
+		case ColumnProgress:{
+			if (thePrefs::ShowProgBar()) {
+				int iWidth  = rect.GetWidth() - 2;
+				int iHeight = rect.GetHeight() - 2;
 	
-	const CUpDownClient* client = item->GetSource();
-
-	switch (nColumn) {
-		// Client name + various icons
-		case 0: {
-			wxRect cur_rec = rect;
-			// +3 is added by OnDrawItem()... so take it off
-			// Kry - eMule says +1, so I'm trusting it
-			wxPoint point( cur_rec.GetX(), cur_rec.GetY()+1 );
-
-			if (item->GetType() != A4AF_SOURCE) {
-				uint8 image = 0;
+				// DO NOT DRAW IT ALL THE TIME
+				uint32 dwTicks = GetTickCount();
+				
+				wxMemoryDC cdcStatus;
 				
-				switch (client->GetDownloadState()) {
-					case DS_CONNECTING:
-					case DS_CONNECTED:
-					case DS_WAITCALLBACK:
-					case DS_TOOMANYCONNS:
-						image = Client_Red_Smiley;
-						break;
-					case DS_ONQUEUE:
-						if (client->IsRemoteQueueFull()) {
-							image = Client_Grey_Smiley;
-						} else {
-							image = Client_Yellow_Smiley;
-						}
-						break;
-					case DS_DOWNLOADING:
-					case DS_REQHASHSET:
-						image = Client_Green_Smiley;
-						break;
-					case DS_NONEEDEDPARTS:
-					case DS_LOWTOLOWIP:
-						image = Client_Grey_Smiley;
-						break;
-					default: // DS_NONE i.e.
-						image = Client_White_Smiley;
+				if ( item->dwUpdated < dwTicks || !item->status || iWidth != item->status->GetWidth() ) {
+					if ( item->status == NULL) {
+						item->status = new wxBitmap(iWidth, iHeight);
+					} else if ( item->status->GetWidth() != iWidth ) {
+						// Only recreate if the size has changed
+						item->status->Create(iWidth, iHeight);
+					}
+							
+					cdcStatus.SelectObject( *item->status );
+					
+					if ( thePrefs::UseFlatBar() ) {
+						DrawFileStatusBar( file, &cdcStatus,
+							wxRect(0, 0, iWidth, iHeight), true);
+					} else {
+						DrawFileStatusBar( file, &cdcStatus,
+							wxRect(1, 1, iWidth - 2, iHeight - 2), false);
+			
+						// Draw black border
+						cdcStatus.SetPen( *wxBLACK_PEN );
+						cdcStatus.SetBrush( *wxTRANSPARENT_BRUSH );
+						cdcStatus.DrawRectangle( 0, 0, iWidth, iHeight );
 					}
-
-					m_ImageList.Draw(image, *dc, point.x, point.y,
-						wxIMAGELIST_DRAW_TRANSPARENT);
-				} else {
-					m_ImageList.Draw(Client_Grey_Smiley, *dc, point.x, point.y,
-						wxIMAGELIST_DRAW_TRANSPARENT);
-				}
-
-				cur_rec.x += 20;
-				wxPoint point2( cur_rec.GetX(), cur_rec.GetY() + 1 );
-
-				uint8 clientImage;
 				
-				if ( client->IsFriend() ) {
-					clientImage = Client_Friend_Smiley;
+					item->dwUpdated = dwTicks + 5000; // Plus five seconds
 				} else {
-					switch ( client->GetClientSoft() ) {
-						case SO_AMULE:
-							clientImage = Client_aMule_Smiley;
-							break;
-						case SO_MLDONKEY:
-						case SO_NEW_MLDONKEY:
-						case SO_NEW2_MLDONKEY:
-							clientImage = Client_mlDonkey_Smiley;
-							break;
-						case SO_EDONKEY:
-						case SO_EDONKEYHYBRID:
-							clientImage = Client_eDonkeyHybrid_Smiley;
-							break;
-						case SO_EMULE:
-							clientImage = Client_eMule_Smiley;
-							break;
-						case SO_LPHANT:
-							clientImage = Client_lphant_Smiley;
-							break;
-						case SO_SHAREAZA:
-						case SO_NEW_SHAREAZA:
-						case SO_NEW2_SHAREAZA:
-							clientImage = Client_Shareaza_Smiley;
-							break;
-						case SO_LXMULE:
-							clientImage = Client_xMule_Smiley;
-							break;
-						default:
-							// cDonkey, Compatible, Unknown
-							// No icon for those yet.
-							// Using the eMule one + '?'
-							clientImage = Client_Unknown;
-							break;
-					}
+					cdcStatus.SelectObject( *item->status );
 				}
-
-				m_ImageList.Draw(clientImage, *dc, point2.x, point.y,
-					wxIMAGELIST_DRAW_TRANSPARENT);
-
-				if (client->GetScoreRatio() > 1) {
-					// Has credits, draw the gold star
-					m_ImageList.Draw(Client_CreditsYellow_Smiley, *dc, point2.x, point.y, 
-						wxIMAGELIST_DRAW_TRANSPARENT );
-				}	else if ( client->ExtProtocolAvailable() ) {
-					// Ext protocol -> Draw the '+'
-					m_ImageList.Draw(Client_ExtendedProtocol_Smiley, *dc, point2.x, point.y,
-						wxIMAGELIST_DRAW_TRANSPARENT);
-				}
-
-				if (client->IsIdentified()) {
-					// the 'v'
-					m_ImageList.Draw(Client_SecIdent_Smiley, *dc, point2.x, point.y,
-						wxIMAGELIST_DRAW_TRANSPARENT);					
-				} else if (client->IsBadGuy()) {
-					// the 'X'
-					m_ImageList.Draw(Client_BadGuy_Smiley, *dc, point2.x, point.y,
-						wxIMAGELIST_DRAW_TRANSPARENT);					
-				}
-							
-				if (client->HasObfuscatedConnectionBeenEstablished()) {
-					// the "¿" except it's a key
-					m_ImageList.Draw(Client_Encryption_Smiley, *dc, point2.x, point.y,
-						wxIMAGELIST_DRAW_TRANSPARENT);					
-				}				
 				
-				wxString userName;
-#ifdef ENABLE_IP2COUNTRY
-				// Draw the flag
-				const CountryData& countrydata = theApp->amuledlg->m_IP2Country->GetCountryData(client->GetFullIP());
-				dc->DrawBitmap(countrydata.Flag,
-					rect.x + 40, rect.y + 5,
-					wxIMAGELIST_DRAW_TRANSPARENT);
+				dc->Blit( rect.GetX(), rect.GetY() + 1, iWidth, iHeight, &cdcStatus, 0, 0);
 				
-				userName << countrydata.Name;
+				if (thePrefs::ShowPercent()) {
+					// Percentage of completing
+					// We strip anything below the first decimal point,
+					// to avoid Format doing roundings
+					float percent = floor( file->GetPercentCompleted() * 10.0f ) / 10.0f;
 				
-				userName << wxT(" - ");
-#endif // ENABLE_IP2COUNTRY
-				if (client->GetUserName().IsEmpty()) {
-					userName << wxT("?");
-				} else {
-					userName << client->GetUserName();
+					wxString buffer = CFormat(wxT("%.1f%%")) % percent;
+					int middlex = (2*rect.GetX() + rect.GetWidth()) >> 1;
+					int middley = (2*rect.GetY() + rect.GetHeight()) >> 1;
+					
+					wxCoord textwidth, textheight;
+					
+					dc->GetTextExtent(buffer, &textwidth, &textheight);
+					wxColour AktColor = dc->GetTextForeground();
+					if (thePrefs::ShowProgBar()) {
+						dc->SetTextForeground(*wxWHITE);
+					} else {
+						dc->SetTextForeground(*wxBLACK);
+					}
+					dc->DrawText(buffer, middlex - (textwidth >> 1), middley - (textheight >> 1));
+					dc->SetTextForeground(AktColor);
 				}
-				dc->DrawText(userName, rect.GetX() + 60, rect.GetY());
 			}
-			break;
 
-		case 3:	// completed
-			if (item->GetType() != A4AF_SOURCE && client->GetTransferredDown()) {
-				buffer = CastItoXBytes(client->GetTransferredDown());
-				dc->DrawText(buffer, rect.GetX(), rect.GetY());
-			}
 			break;
+		}
 
-		case 4:	// speed
-			if (item->GetType() != A4AF_SOURCE && client->GetKBpsDown() > 0.001) {
-				buffer = wxString::Format(wxT("%.1f "),
-						client->GetKBpsDown()) + _("kB/s");
-				dc->DrawText(buffer, rect.GetX(), rect.GetY());
+		// Sources
+		case ColumnSources:	{
+			uint16 sc = file->GetSourceCount();
+			uint16 ncsc = file->GetNotCurrentSourcesCount();
+			if ( ncsc ) {
+				text = CFormat(wxT("%i/%i")) % (sc - ncsc) % sc;
+			} else {
+				text = CFormat(wxT("%i")) % sc;
 			}
+	
+			if ( file->GetSrcA4AFCount() ) {
+				text += CFormat(wxT("+%i")) % file->GetSrcA4AFCount();
+			}
+	
+			if ( file->GetTransferingSrcCount() ) {
+				text += CFormat(wxT(" (%i)")) % file->GetTransferingSrcCount();
+			}
+	
+			break;
+		}
+	
+		// Priority
+		case ColumnPriority:
+			text = PriorityToStr( file->GetDownPriority(), file->IsAutoDownPriority() );
 			break;
-
-		case 5:	// file info
-			if ( thePrefs::ShowProgBar() ) {
-				int iWidth = rect.GetWidth() - 2;
-				int iHeight = rect.GetHeight() - 2;
-			
-				if ( item->GetType() != A4AF_SOURCE ) {
-					uint32 dwTicks = GetTickCount();
-					
-					wxMemoryDC cdcStatus;
-
-					if ( item->dwUpdated < dwTicks || !item->status || 
-							iWidth != item->status->GetWidth() ) {
-						
-						if (item->status == NULL) {
-							item->status = new wxBitmap(iWidth, iHeight);
-						} else if ( item->status->GetWidth() != iWidth ) {
-							// Only recreate if size has changed
-							item->status->Create(iWidth, iHeight);
-						}
-
-						cdcStatus.SelectObject(*(item->status));
-
-						if ( thePrefs::UseFlatBar() ) {
-							DrawSourceStatusBar( client, &cdcStatus,
-								wxRect(0, 0, iWidth, iHeight), true);
-						} else {
-							DrawSourceStatusBar( client, &cdcStatus,
-								wxRect(1, 1, iWidth - 2, iHeight - 2), false);
 				
-							// Draw black border
-							cdcStatus.SetPen( *wxBLACK_PEN );
-							cdcStatus.SetBrush( *wxTRANSPARENT_BRUSH );
-							cdcStatus.DrawRectangle( 0, 0, iWidth, iHeight );
-						}
-						
-						// Plus ten seconds
-						item->dwUpdated = dwTicks + 10000;
-					} else {
-						cdcStatus.SelectObject(*(item->status));
-					}
-
-					dc->Blit(rect.GetX(), rect.GetY() + 1, iWidth, iHeight, &cdcStatus, 0, 0);
-				} else {
-					buffer = _("A4AF");
-					
-					int midx = (2*rect.GetX() + rect.GetWidth()) >> 1;
-					int midy = (2*rect.GetY() + rect.GetHeight()) >> 1;
-					
-					wxCoord txtwidth, txtheight;
-					
-					dc->GetTextExtent(buffer, &txtwidth, &txtheight);
-					
-					dc->SetTextForeground(*wxBLACK);
-					dc->DrawText(buffer, midx - (txtwidth >> 1), midy - (txtheight >> 1));
-
-					// Draw black border
-					dc->SetPen( *wxBLACK_PEN );
-					dc->SetBrush( *wxTRANSPARENT_BRUSH );
-					dc->DrawRectangle( rect.GetX(), rect.GetY() + 1, iWidth, iHeight );		
-				}
-			}
+		// File-status
+		case ColumnStatus:
+			text = file->getPartfileStatus();
 			break;
-
-		case 6: {
-				// Version
-				dc->DrawText(client->GetClientVerString(), rect.GetX(), rect.GetY());
-				break;
-			}
-
-		case 7:	// prio
-			// We only show priority for sources actually queued for that file
-			if (	item->GetType() != A4AF_SOURCE &&
-				client->GetDownloadState() == DS_ONQUEUE ) {
-				if (client->IsRemoteQueueFull()) {
-					buffer = _("Queue Full");
-					dc->DrawText(buffer, rect.GetX(), rect.GetY());
+		
+		// Remaining
+		case ColumnTimeRemaining: {
+			if ((file->GetStatus() != PS_COMPLETING) && file->IsPartFile()) {
+				uint64 remainSize = file->GetFileSize() - file->GetCompletedSize();
+				sint32 remainTime = file->getTimeRemaining();
+				
+				if (remainTime >= 0) {
+					text = CastSecondsToHM(remainTime);
 				} else {
-					if (client->GetRemoteQueueRank()) {
-						sint16 qrDiff = client->GetRemoteQueueRank() -
-							client->GetOldRemoteQueueRank();
-						if(qrDiff == client->GetRemoteQueueRank() ) {
-							qrDiff = 0;
-						}
-						wxColour savedColour = dc->GetTextForeground();
-						if( qrDiff < 0 ) {
-							dc->SetTextForeground(*wxBLUE);
-						}
-						if( qrDiff > 0 ) {
-							dc->SetTextForeground(*wxRED);
-						}
-						//if( qrDiff == 0 ) {
-						//	dc->SetTextForeground(*wxLIGHT_GREY);
-						//}
-						buffer = wxString::Format(_("QR: %u (%i)"),
-							client->GetRemoteQueueRank(), qrDiff);
-						dc->DrawText(buffer, rect.GetX(), rect.GetY());
-						dc->SetTextForeground(savedColour);
-					}
+					text = _("Unknown");
 				}
+	
+				text += wxT(" (") + CastItoXBytes(remainSize) + wxT(")");
 			}
 			break;
-
-		case 8:	// status
-			if (item->GetType() != A4AF_SOURCE) {
-				buffer = DownloadStateToStr( client->GetDownloadState(), 
-					client->IsRemoteQueueFull() );
+		}
+		
+		// Last seen completed
+		case ColumnLastSeenComplete: {
+			if ( file->lastseencomplete ) {
+				text = wxDateTime( file->lastseencomplete ).Format( _("%y/%m/%d %H:%M:%S") );
 			} else {
-				buffer = _("Asked for another file");
-				if (	client->GetRequestFile() &&
-					client->GetRequestFile()->GetFileName().IsOk()) {
-					buffer += CFormat(wxT(" (%s)")) 
-						% client->GetRequestFile()->GetFileName();
-				}
+				text = _("Unknown");
 			}
-			dc->DrawText(buffer, rect.GetX(), rect.GetY());
 			break;
-		// Source comes from?
-		case 9: {
-			buffer = wxGetTranslation(OriginToText(client->GetSourceFrom()));
-			dc->DrawText(buffer, rect.GetX(), rect.GetY());
-			break;
-		}	
+		}
+		
+		// Last received
+		case ColumnLastReception: {
+			const time_t lastReceived = file->GetLastChangeDatetime();
+			if (lastReceived) {
+				text = wxDateTime(lastReceived).Format( _("%y/%m/%d %H:%M:%S") );
+			} else {
+				text = _("Unknown");
+			}
+		}
+	} 
+
+	if ( !text.IsEmpty() ) {
+		dc->DrawText( text, rect.GetX(), rect.GetY() );
 	}
 }
 
-
 wxString CDownloadListCtrl::GetTTSText(unsigned item) const
 {
-	CtrlItem_Struct* content = (CtrlItem_Struct*)GetItemData(item);
-	
-	if (content->GetType() == FILE_TYPE) {
-		CPartFile* file = content->GetFile();
-
-		return file->GetFileName().GetPrintable();
-	}
-
-	return wxEmptyString;
+	return ((FileCtrlItem_Struct*)GetItemData(item))->GetFile()->GetFileName().GetPrintable();
 }
 
 
 int CDownloadListCtrl::SortProc(wxUIntPtr param1, wxUIntPtr param2, long sortData)
 {
-	CtrlItem_Struct* item1 = (CtrlItem_Struct*)param1;
-	CtrlItem_Struct* item2 = (CtrlItem_Struct*)param2;
+	FileCtrlItem_Struct* item1 = (FileCtrlItem_Struct*)param1;
+	FileCtrlItem_Struct* item2 = (FileCtrlItem_Struct*)param2;
 
 	int sortMod = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1;
 	sortData &= CMuleListCtrl::COLUMN_MASK;
-	int comp = 0;
-
-	if ( item1->GetType() == FILE_TYPE ) {
-		if ( item2->GetType() == FILE_TYPE ) {
-			// Both are files, so we just compare them
-			comp = Compare( item1->GetFile(), item2->GetFile(), sortData);
-		} else {
-			// A file and a source, checking if they belong to each other
-			if ( item1->GetFile() == item2->GetOwner() ) {
-				// A file should always be above its sources
-				// Returning directly to avoid the modifier
-				return -1;
-			} else {
-				// Source belongs to anther file, so we compare the files instead
-				comp = Compare( item1->GetFile(), item2->GetOwner(), sortData);
-			}
-		}
-	} else {
-		if ( item2->GetType() == FILE_TYPE ) {
-			// A source and a file, checking if they belong to each other
-			if ( item1->GetOwner() == item2->GetFile() ) {
-				// A source should always be below its file
-				// Returning directly to avoid the modifier
-				return 1;
-			} else {
-				// Source belongs to anther file, so we compare the files instead
-				comp = Compare( item1->GetOwner(), item2->GetFile(), sortData);
-			}
-		} else {
-			// Two sources, some different possibilites
-			if ( item1->GetOwner() == item2->GetOwner() ) {
-				// Avilable sources first, if we have both an
-				// available and an unavailable
-				comp = ( item2->GetType() - item1->GetType() );
-
-				if (comp) {
-					// A4AF and non-A4AF. The order is fixed regardless of sort-order.
-					return comp;
-				} else {
-					comp = Compare(item1->GetSource(), item2->GetSource(), sortData);
-				}
-			} else {
-				// Belongs to different files, so we compare the files
-				comp = Compare( item1->GetOwner(), item2->GetOwner(), sortData);
-			}
-		}
-	}
 
 	// We modify the result so that it matches with ascending or decending
-	return sortMod * comp;
+	return sortMod * Compare( item1->GetFile(), item2->GetFile(), sortData);
 }
 
 
@@ -1816,85 +1131,87 @@
 	int result = 0;
 
 	switch (lParamSort) {
+	// Sort by part number
+	case ColumnPart:
+		result = CmpAny(
+			file1->GetPartMetNumber(),
+			file2->GetPartMetNumber() );
+		break;
+
 	// Sort by filename
-	case 0:
+	case ColumnFileName:
 		result = CmpAny(
 			file1->GetFileName(),
 			file2->GetFileName() );
-		// Filename shouldn't be equal. If it IS, definitely choose one, so comparison result
-		// is always defined. (Fallback in MuleListCtrl is wrong for client comparison.)
-		if (!result) {
-			result = CmpAny(file1, file2);
-		}
 		break;
 
 	// Sort by size
-	case 1:
+	case ColumnSize:
 		result = CmpAny(
 			file1->GetFileSize(),
 			file2->GetFileSize() );
 		break;
 
 	// Sort by transferred
-	case 2:
+	case ColumnTransferred:
 		result = CmpAny(
 			file1->GetTransferred(),
 			file2->GetTransferred() );
 		break;
 
 	// Sort by completed
-	case 3:
+	case ColumnCompleted:
 		result = CmpAny(
 			file1->GetCompletedSize(),
 			file2->GetCompletedSize() );
 		break;
 
 	// Sort by speed
-	case 4:
+	case ColumnSpeed:
 		result = CmpAny(
 			file1->GetKBpsDown() * 1024,
 			file2->GetKBpsDown() * 1024 );
 		break;
 
 	// Sort by percentage completed
-	case 5:
+	case ColumnProgress:
 		result = CmpAny(
 			file1->GetPercentCompleted(),
 			file2->GetPercentCompleted() );
 		break;
 
 	// Sort by number of sources
-	case 6:
+	case ColumnSources:
 		result = CmpAny(
 			file1->GetSourceCount(),
 			file2->GetSourceCount() );
 		break;
 
 	// Sort by priority
-	case 7:
+	case ColumnPriority:
 		result = CmpAny(
 			file1->GetDownPriority(),
 			file2->GetDownPriority() );
 		break;
 
 	// Sort by status
-	case 8:
+	case ColumnStatus:
 		result = CmpAny(
 			file1->getPartfileStatusRang(),
 			file2->getPartfileStatusRang() );
 		break;
 
 	// Sort by remaining time
-	case 9:
+	case ColumnTimeRemaining:
 		if (file1->getTimeRemaining() == -1) {
 			if (file2->getTimeRemaining() == -1) {
 				result = 0;
 			} else {
-				result = -1;
+				result = 1;
 			}
 		} else {
 			if (file2->getTimeRemaining() == -1) {
-				result = 1;
+				result = -1;
 			} else {
 				result = CmpAny(
 					file1->getTimeRemaining(),
@@ -1904,14 +1221,14 @@
 		break;
 
 	// Sort by last seen complete
-	case 10:
+	case ColumnLastSeenComplete:
 		result = CmpAny(
 			file1->lastseencomplete,
 			file2->lastseencomplete );
 		break;
 
 	// Sort by last reception
-	case 11:
+	case ColumnLastReception:
 		result = CmpAny(
 			file1->GetLastChangeDatetime(),
 			file2->GetLastChangeDatetime() );
@@ -1921,145 +1238,24 @@
 	return result;
 }
 
-
-int CDownloadListCtrl::Compare(
-	const CUpDownClient* client1, const CUpDownClient* client2, long lParamSort)
-{
-	switch (lParamSort) {
-		// Sort by name
-		case 0:
-			return CmpAny( client1->GetUserName(), client2->GetUserName() );
-	
-		// Sort by status (size field)
-		case 1:
-			return CmpAny( client1->GetDownloadState(), client2->GetDownloadState() );
-	
-		// Sort by transferred in the following fields
-		case 2:	
-		case 3:
-			return CmpAny( client1->GetTransferredDown(), client2->GetTransferredDown() );
-
-		// Sort by speed
-		case 4:
-			return CmpAny( client1->GetKBpsDown(), client2->GetKBpsDown() );
-		
-		// Sort by parts offered (Progress field)
-		case 5:
-			return CmpAny(
-				client1->GetAvailablePartCount(),
-				client2->GetAvailablePartCount() );
-		
-		// Sort by client version
-		case 6: {
-			if (client1->GetClientSoft() != client2->GetClientSoft()) {
-				return client1->GetSoftStr().Cmp(client2->GetSoftStr());
-			}
-
-			if (client1->GetVersion() != client2->GetVersion()) {
-				return CmpAny(client1->GetVersion(), client2->GetVersion());
-			}
-
-			return client1->GetClientModString().Cmp(client2->GetClientModString());
-		}
-		
-		// Sort by Queue-Rank
-		case 7: {
-			// This will sort by download state: Downloading, OnQueue, Connecting ...
-			// However, Asked For Another will always be placed last, due to
-			// sorting in SortProc
-			if ( client1->GetDownloadState() != client2->GetDownloadState() ) {
-				return client1->GetDownloadState() - client2->GetDownloadState();
-			}
-
-			// Placing items on queue before items on full queues
-			if ( client1->IsRemoteQueueFull() ) {
-				if ( client2->IsRemoteQueueFull() ) {
-					return 0;
-				} else {
-					return  1;
-				}
-			} else if ( client2->IsRemoteQueueFull() ) {
-				return -1;
-			} else {
-				if ( client1->GetRemoteQueueRank() ) {
-					if ( client2->GetRemoteQueueRank() ) {
-						return CmpAny(
-							client1->GetRemoteQueueRank(),
-							client2->GetRemoteQueueRank() );
-					} else {
-						return -1;
-					}
-				} else {
-					if ( client2->GetRemoteQueueRank() ) {
-						return  1;
-					} else {
-						return  0;
-					}
-				}
-			}
-		}
-		
-		// Sort by state
-		case 8: {
-			if (client1->GetDownloadState() == client2->GetDownloadState()) {
-				return CmpAny(
-					client1->IsRemoteQueueFull(),
-					client2->IsRemoteQueueFull() );
-			} else {
-				return CmpAny(
-					client1->GetDownloadState(),
-					client2->GetDownloadState() );
-			}
-		}
-
-		// Source of source ;)
-		case 9:
-			return CmpAny(client1->GetSourceFrom(), client2->GetSourceFrom());
-		
-		default:
-			return 0;
-	}
-}
-
-
 void CDownloadListCtrl::ClearCompleted()
 {
-	m_completedFiles = false;
 	CastByID(ID_BTNCLRCOMPL, GetParent(), wxButton)->Enable(false);
 	
 	// Search for completed files
+	ListOfUInts32 toClear;
 	for ( ListItems::iterator it = m_ListItems.begin(); it != m_ListItems.end(); ) {
-		CtrlItem_Struct* item = it->second; ++it;
+		FileCtrlItem_Struct* item = it->second; ++it;
 		
-		if ( item->GetType() == FILE_TYPE ) {
-			CPartFile* file = item->GetFile();
-			
-			if ( file->IsPartFile() == false ) {
-				RemoveFile(file);
-			}
-		}
-	}
-}
-
-
-void CDownloadListCtrl::ResetCatParts(uint8 cat)
-{
-	// Go through all files
-	for ( ListItems::iterator it = m_ListItems.begin(); it != m_ListItems.end(); ) {
-		CtrlItem_Struct* item = it->second; ++it;
+		CPartFile* file = item->GetFile();
 		
-		if ( item->GetType() == FILE_TYPE ) {
-			CPartFile* file = item->GetFile();
-			
-			if ( file->GetCategory() == cat ) {
-				// Reset the category
-				file->SetCategory( 0 );
-			} else if ( file->GetCategory() > cat ) {
-				// Set to the new position of the original category
-				file->SetCategory( file->GetCategory() - 1 );
-			}
+		if (file->IsCompleted() && file->CheckShowItemInGivenCat(m_category)) {
+			toClear.push_back(file->ECID());
 		}
 	}
+	if (!toClear.empty()) {
+		theApp->downloadqueue->ClearCompleted(toClear);
+	}
 }
 
 
@@ -2067,66 +1263,57 @@
 {
 	m_filecount += diff;
 	
-	wxString str = wxString::Format( _("Downloads (%i)"), m_filecount );
 	wxStaticText* label = CastByName( wxT("downloadsLabel"), GetParent(), wxStaticText );
 
-	label->SetLabel( str );
+	label->SetLabel(CFormat(_("Downloads (%i)")) % m_filecount);
 	label->GetParent()->Layout();
 }
 
 
+static const CMuleColour crHave(104, 104, 104);
+static const CMuleColour crFlatHave(0, 0, 0);
 
+static const CMuleColour crPending(255, 208, 0);
+static const CMuleColour crFlatPending(255, 255, 100);
 
-bool CDownloadListCtrl::ShowItemInCurrentCat(
-	const CPartFile* file, int newsel ) const
-{
-	return 
-		((newsel == 0 && !thePrefs::ShowAllNotCats()) ||
-		 (newsel == 0 && thePrefs::ShowAllNotCats() && file->GetCategory() == 0)) ||
-		(newsel > 0 && newsel == file->GetCategory());
-}
-
+static const CMuleColour crProgress(0, 224, 0);
+static const CMuleColour crFlatProgress(0, 150, 0);
 
+static const CMuleColour crMissing(255, 0, 0);
 
 void CDownloadListCtrl::DrawFileStatusBar(
 	const CPartFile* file, wxDC* dc, const wxRect& rect, bool bFlat ) const
 {
 	static CBarShader s_ChunkBar(16);
 	
-	COLORREF crHave		= ( bFlat ? RGB(   0,   0,   0 ) : RGB( 104, 104, 104 ) );
-	COLORREF crPending	= ( bFlat ? RGB( 255, 255, 100 ) : RGB( 255, 208,   0 ) );
-	COLORREF crProgress	= ( bFlat ? RGB(   0, 150,   0 ) : RGB(   0, 224,   0 ) );
-	COLORREF crMissing	= RGB(255, 0, 0);
-
 	s_ChunkBar.SetHeight(rect.height);
 	s_ChunkBar.SetWidth(rect.width); 
 	s_ChunkBar.SetFileSize( file->GetFileSize() );
 	s_ChunkBar.Set3dDepth( thePrefs::Get3DDepth() );
 
-
-	if ( file->GetStatus() == PS_COMPLETE || file->GetStatus() == PS_COMPLETING ) {
-		s_ChunkBar.Fill( crProgress );
+	if ( file->IsCompleted() || file->GetStatus() == PS_COMPLETING ) {
+		s_ChunkBar.Fill( bFlat ? crFlatProgress : crProgress );
 		s_ChunkBar.Draw(dc, rect.x, rect.y, bFlat); 
 		return;
 	}
-
 	
 	// Part availability ( of missing parts )
-	const CPartFile::CGapPtrList& gaplist = file->GetGapList();
-	CPartFile::CGapPtrList::const_iterator it = gaplist.begin();
+	const CGapList& gaplist = file->GetGapList();
+	CGapList::const_iterator it = gaplist.begin();
 	uint64 lastGapEnd = 0;
+	CMuleColour colour;
+	
 	for (; it != gaplist.end(); ++it) {
-		Gap_Struct* gap = *it;
-
+		
 		// Start position
-		uint32 start = ( gap->start / PARTSIZE );
+		uint32 start = ( it.start() / PARTSIZE );
 		// fill the Have-Part (between this gap and the last)
-		if (gap->start) {
-		  s_ChunkBar.FillRange(lastGapEnd + 1, gap->start - 1,  crHave);
+		if (it.start()) {
+		  s_ChunkBar.FillRange(lastGapEnd + 1, it.start() - 1,  bFlat ? crFlatHave : crHave);
 		}
-		lastGapEnd = gap->end;
+		lastGapEnd = it.end();
 		// End position
-		uint32 end   = ( gap->end / PARTSIZE ) + 1;
+		uint32 end   = ( it.end() / PARTSIZE ) + 1;
 
 		// Avoid going past the filesize. Dunno if this can happen, but the old code did check.
 		if ( end > file->GetPartCount() ) {
@@ -2135,27 +1322,26 @@
 
 		// Place each gap, one PART at a time
 		for ( uint64 i = start; i < end; ++i ) {
-			COLORREF color;
 			if ( i < file->m_SrcpartFrequency.size() && file->m_SrcpartFrequency[i]) {
 				int blue = 210 - ( 22 * ( file->m_SrcpartFrequency[i] - 1 ) );
-				color = RGB( 0, ( blue < 0 ? 0 : blue ), 255 );
+				colour.Set(0, ( blue < 0 ? 0 : blue ), 255 );
 			} else {
-				color = crMissing;
-			}	
+				colour = crMissing;
+			}
 
 			if ( file->IsStopped() ) {
-				color = DarkenColour( color, 2 );
+				colour.Blend(50);
 			}
 			
-			uint64 gap_begin = ( i == start   ? gap->start : PARTSIZE * i );
-			uint64 gap_end   = ( i == end - 1 ? gap->end   : PARTSIZE * ( i + 1 ) - 1 );
+			uint64 gap_begin = ( i == start   ? it.start() : PARTSIZE * i );
+			uint64 gap_end   = ( i == end - 1 ? it.end()   : PARTSIZE * ( i + 1 ) - 1 );
 		
-			s_ChunkBar.FillRange( gap_begin, gap_end,  color);
+			s_ChunkBar.FillRange( gap_begin, gap_end,  colour);
 		}
 	}
-	// fill the last Have-Part (between this gap and the last)
-	s_ChunkBar.FillRange(lastGapEnd + 1, file->GetFileSize() - 1,  crHave);
 	
+	// fill the last Have-Part (between this gap and the last)
+	s_ChunkBar.FillRange(lastGapEnd + 1, file->GetFileSize() - 1,  bFlat ? crFlatHave : crHave);
 	
 	// Pending parts
 	const CPartFile::CReqBlockPtrList& requestedblocks_list = file->GetRequestedBlockList();
@@ -2163,12 +1349,18 @@
 	// adjacing pending parts must be joined to avoid bright lines between them
 	uint64 lastStartOffset = 0;
 	uint64 lastEndOffset = 0;
-	COLORREF color = file->IsStopped() ? DarkenColour( crPending, 2 ) : crPending;
+	
+	colour = bFlat ? crFlatPending : crPending;
+	
+	if ( file->IsStopped() ) {
+		colour.Blend(50);
+	}
+
 	for (; it2 != requestedblocks_list.end(); ++it2) {
 		
 		if ((*it2)->StartOffset > lastEndOffset + 1) { 
 			// not adjacing, draw last block
-			s_ChunkBar.FillRange(lastStartOffset, lastEndOffset, color);
+			s_ChunkBar.FillRange(lastStartOffset, lastEndOffset, colour);
 			lastStartOffset = (*it2)->StartOffset;
 			lastEndOffset   = (*it2)->EndOffset;
 		} else {
@@ -2176,7 +1368,8 @@
 			lastEndOffset   = (*it2)->EndOffset;
 		}
 	}
-	s_ChunkBar.FillRange(lastStartOffset, lastEndOffset, color);
+	
+	s_ChunkBar.FillRange(lastStartOffset, lastEndOffset, colour);
 
 
 	// Draw the progress-bar
@@ -2188,77 +1381,21 @@
 			file->GetCompletedSize() );
 
 	if ( bFlat ) {
-		dc->SetBrush( wxBrush( crProgress, wxSOLID ) );
+		dc->SetBrush( crFlatProgress.GetBrush() );
 		
 		dc->DrawRectangle( rect.x, rect.y, width, 3 );
 	} else {
 		// Draw the two black lines for 3d-effect
-		dc->SetPen( wxPen( wxColour( 0, 0, 0 ), 1, wxSOLID ) );
+		dc->SetPen( *wxBLACK_PEN );
 		dc->DrawLine( rect.x, rect.y + 0, rect.x + width, rect.y + 0 );
 		dc->DrawLine( rect.x, rect.y + 2, rect.x + width, rect.y + 2 );
 		
 		// Draw the green line
-		dc->SetPen( wxPen( crProgress, 1, wxSOLID ) );
+		dc->SetPen( *(wxThePenList->FindOrCreatePen( crProgress , 1, wxSOLID ) ));
 		dc->DrawLine( rect.x, rect.y + 1, rect.x + width, rect.y + 1 );
 	}
 }
 
-
-void CDownloadListCtrl::DrawSourceStatusBar(
-	const CUpDownClient* source, wxDC* dc, const wxRect& rect, bool bFlat) const
-{
-	static CBarShader s_StatusBar(16);
-
-	uint32 crBoth			= ( bFlat ? RGB(   0, 150,   0 ) : RGB(   0, 192,   0 ) );
-	uint32 crNeither		= ( bFlat ? RGB( 224, 224, 224 ) : RGB( 240, 240, 240 ) );
-	uint32 crClientOnly		= ( bFlat ? RGB(   0,   0,   0 ) : RGB( 104, 104, 104 ) );
-	uint32 crPending		= ( bFlat ? RGB( 255, 208,   0 ) : RGB( 255, 208,   0 ) );
-	uint32 crNextPending	= ( bFlat ? RGB( 255, 255, 100 ) : RGB( 255, 255, 100 ) );
-
-	CPartFile* reqfile = source->GetRequestFile();
-
-	s_StatusBar.SetFileSize( reqfile->GetFileSize() );
-	s_StatusBar.SetHeight(rect.height);
-	s_StatusBar.SetWidth(rect.width);
-	s_StatusBar.Set3dDepth( thePrefs::Get3DDepth() );
-
-	// Barry - was only showing one part from client, even when reserved bits from 2 parts
-	wxString gettingParts = source->ShowDownloadingParts();
-
-	const BitVector& partStatus = source->GetPartStatus();
-
-	uint64 uEnd = 0;
-	for ( uint64 i = 0; i < partStatus.size(); i++ ) {
-		uint64 uStart = PARTSIZE * i;
-		uEnd = wxMin(reqfile->GetFileSize(), uStart + PARTSIZE) - 1;
-
-		uint32 color = 0;
-		if (!partStatus[i]) {
-			color = crNeither;
-		} else if ( reqfile->IsComplete(uStart, uEnd)) {
-			color = crBoth;
-		} else if (	source->GetDownloadState() == DS_DOWNLOADING &&
-				source->GetLastBlockOffset() <= uEnd &&
-				source->GetLastBlockOffset() >= uStart) {
-			color = crPending;
-		} else if (gettingParts.GetChar((uint16)i) == 'Y') {
-			color = crNextPending;
-		} else {
-			color = crClientOnly;
-		}
-
-		if ( source->GetRequestFile()->IsStopped() ) {
-			color = DarkenColour( color, 2 );
-		}
-
-		s_StatusBar.FillRange(uStart, uEnd, color);
-	}
-	// fill the rest (if partStatus is empty)
-	s_StatusBar.FillRange(uEnd + 1, reqfile->GetFileSize() - 1, crNeither);
-
-	s_StatusBar.Draw(dc, rect.x, rect.y, bFlat);
-}
-
 #ifdef __WXMSW__
 #	define QUOTE	wxT("\"")
 #else
@@ -2281,43 +1418,47 @@
 		command = thePrefs::GetVideoPlayer();
 	}
 
+	wxString partFile;	// File name with full path
+	wxString partName;	// File name only, without path
+
 	// Check if we are (pre)viewing a completed file or not
-	if (file->GetStatus() != PS_COMPLETE) {
+	if (!file->IsCompleted()) {
 		// Remove the .met and see if out video player specifiation uses the magic string
-		wxString fileWithoutMet = thePrefs::GetTempDir().JoinPaths(
-			file->GetPartMetFileName().RemoveExt()).GetRaw();
-		
-		if (!command.Replace(wxT("$file"), fileWithoutMet)) {
-			// No magic string, so we just append the filename to the player command
-			// Need to use quotes in case filename contains spaces
-			command << wxT(" ") << QUOTE << fileWithoutMet << QUOTE;
-		}
+		partName = file->GetPartMetFileName().RemoveExt().GetRaw();
+		partFile = thePrefs::GetTempDir().JoinPaths(file->GetPartMetFileName().RemoveExt()).GetRaw();
 	} else {
 		// This is a complete file
 		// FIXME: This is probably not going to work if the filenames are mangled ...
-		wxString rawFileName = file->GetFullName().GetRaw();
-
-#ifndef __WXMSW__
-		// We have to escape quote characters in the file name, otherwise arbitrary
-		// options could be passed to the player.
-		rawFileName.Replace(QUOTE, wxT("\\") QUOTE);
-#endif
+		partName = file->GetFileName().GetRaw();
+		partFile = file->GetFullName().GetRaw();
+	}
 
-		if (!command.Replace(wxT("$file"), rawFileName)) {
+	// Compatibility with old behaviour
+	if (!command.Replace(wxT("$file"), wxT("%PARTFILE"))) {
+		if ((command.Find(wxT("%PARTFILE")) == wxNOT_FOUND) && (command.Find(wxT("%PARTNAME")) == wxNOT_FOUND)) {
 			// No magic string, so we just append the filename to the player command
 			// Need to use quotes in case filename contains spaces
-			command << wxT(" ") << QUOTE << rawFileName << QUOTE;
+			command << wxT(" ") << QUOTE << wxT("%PARTFILE") << QUOTE;
 		}
 	}
 
+#ifndef __WXMSW__
+	// We have to escape quote characters in the file name, otherwise arbitrary
+	// options could be passed to the player.
+	partFile.Replace(QUOTE, wxT("\\") QUOTE);
+	partName.Replace(QUOTE, wxT("\\") QUOTE);
+#endif
+
+	command.Replace(wxT("%PARTFILE"), partFile);
+	command.Replace(wxT("%PARTNAME"), partName);
+
 	// We can't use wxShell here, it blocks the app
 	CTerminationProcess *p = new CTerminationProcess(command);
 	int ret = wxExecute(command, wxEXEC_ASYNC, p);
 	bool ok = ret > 0;
 	if (!ok) {
 		delete p;
-		AddLogLineM( true,
-			CFormat( _("ERROR: Failed to execute external media-player! Command: `%s'") ) %
+		AddLogLineC(CFormat( _("ERROR: Failed to execute external media-player! Command: `%s'") ) %
 			command );
 	}
 }

aMule-2.2.6.tar.bz2/src/DownloadListCtrl.h -> aMule-2.3.1.tar.bz2/src/DownloadListCtrl.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -27,6 +27,7 @@
 #define DOWNLOADLISTCTRL_H
 
 #include <map>				// Needed for std::multimap
+#include <wx/brush.h>
 
 #include "Types.h"			// Needed for uint8
 #include "Constants.h"		// Needed for DownloadItemType
@@ -34,29 +35,19 @@
 
 
 class CPartFile;
-class CUpDownClient;
 class wxBitmap;
 class wxRect;
 class wxDC;
 
-struct CtrlItem_Struct;
-
-
+struct FileCtrlItem_Struct;
 
 /**
  * This class is responsible for representing the download queue.
  *
- * The CDownlodListCtrl class is responsible for drawing not only files being
- * downloaded, but also sources assosiated with these. It is in many ways
- * primary widget within the application, since it is here that users can
- * inspect and manipulate their current downloads.
+ * The CDownlodListCtrl class is responsible for drawing files being downloaded.
+ * It is in many ways primary widget within the application, since it is here that 
+ * users can inspect and manipulate their current downloads.
  *
- * Due to the fact that sources are one of the major sources of update-class,
- * this class has been designed such that it does not need to recieve these 
- * unless sources in question are actually being displayed. Upon the initial
- * showing of sources (when a file is expanded), a current list of that file's
- * sources are requested. If the sources are hidden again, the class will
- * discard all knowledge of their existance.
  */
 class CDownloadListCtrl : public CMuleListCtrl
 {
@@ -89,28 +80,6 @@
 	 * Please note that duplicates wont be added.
 	 */
 	void AddFile( CPartFile* file );
-
-	/**
-	 * Adds a source belonging to the specified partfile.
-	 *
-	 * @param owner The owner of this specific source-entry, must be a valid pointer.
-	 * @param source The client object to be added, must be a valid pointer.
-	 * @param available If the source is a current source, or a A4AF source.
-	 *
-	 * Please note that the specified client will only be added to the list if it's
-	 * owner is shown and has ShowSources set to true, otherwise the source will 
-	 * simply be ignored. Duplicates wont be added.
-	 */
-	void AddSource( CPartFile* owner, CUpDownClient* source, DownloadItemType type );
-
-	
-	/**
-	 * Removes a source from the list.
-	 *
-	 * @param source A pointer to the source to be removed.
-	 * @param owner Either a specific file, or NULL to remove the source from all files.
-	 */
-	void RemoveSource( const CUpDownClient* source, const CPartFile* owner );
 	
 	/**
 	 * Removes the specified file from the list.
@@ -120,15 +89,6 @@
 	 * This function also removes any sources assosiated with the file. 
 	 */
 	void RemoveFile( CPartFile* file );
-
-	
-	/**
-	 * Toggles showing of a file's sources on or off.
-	 *
-	 * @param file The file whoose sources should be shown/hidden.
-	 * @param show Whenever or not to show sources.
-	 */
-	void ShowSources( CPartFile* file, bool show );
 	
 	/**
 	 * Shows or hides the sources of a specific file.
@@ -152,7 +112,6 @@
 	 */
 	void UpdateItem(const void* toupdate);
 
-
 	/**
 	 * Returns the current category.
 	 */
@@ -172,13 +131,17 @@
 	void ClearCompleted();
 
 	/**
-	 * Adjust category of all files when cat is deleted.
+	 * Perform client update when item selection has changed.
 	 */
-	void ResetCatParts(uint8 cat);
+	void	DoItemSelectionChanged();
+
+protected:
+	/// Return old column order.
+	wxString GetOldColumnOrder() const;
 
 private:
 	/**
-	 * Updates the displayed number representing the ammount of files currently shown.
+	 * Updates the displayed number representing the amount of files currently shown.
 	 */
 	void ShowFilesCount( int diff );
 
@@ -197,28 +160,15 @@
 	/**
 	 * Draws a file item.
 	 */
-	void	DrawFileItem( wxDC* dc, int nColumn, const wxRect& rect, CtrlItem_Struct* item ) const;
-
-	/**
-	 * Draws a source item.
-	 */
-	void	DrawSourceItem( wxDC* dc, int nColumn, const wxRect& rect, CtrlItem_Struct* item ) const;
+	void	DrawFileItem( wxDC* dc, int nColumn, const wxRect& rect, FileCtrlItem_Struct* item ) const;
 
 	/**
 	 * Draws the status (chunk) bar for a file.
 	 */
 	void	DrawFileStatusBar( const CPartFile* file, wxDC* dc, const wxRect& rect, bool bFlat ) const;
 
-	/**
-	 * Draws the status (chunk) bar for a source.
-	 */
-	void	DrawSourceStatusBar( const CUpDownClient* source, wxDC* dc, const wxRect& rect, bool  bFlat) const;
-
-
 	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, long sortData);
-	static int Compare( const CPartFile* file1, const CPartFile* file2, long lParamSort );
-	static int Compare( const CUpDownClient* client1, const CUpDownClient* client2, long lParamSort);
-	
+	static int Compare( const CPartFile* file1, const CPartFile* file2, long lParamSort );	
 
 	// Event-handlers for files
 	void	OnCancelFile( wxCommandEvent& event );
@@ -229,33 +179,16 @@
 	void	OnClearCompleted( wxCommandEvent& event );
 	void	OnGetLink( wxCommandEvent& event );
 	void	OnGetFeedback( wxCommandEvent& event );
-	void	OnGetRazorStats( wxCommandEvent& event );
 	void	OnViewFileInfo( wxCommandEvent& event );
 	void	OnViewFileComments( wxCommandEvent& event );
 	void	OnPreviewFile( wxCommandEvent& event );
 	
-	// Event-handlers for sources
-	void	OnSwapSource( wxCommandEvent& event );
-	void	OnViewFiles( wxCommandEvent& event );
-	void	OnAddFriend( wxCommandEvent& event );
-	void	OnSendMessage( wxCommandEvent& event );
-	void	OnViewClientInfo( wxCommandEvent& event );
-
 	// Misc event-handlers
 	void	OnItemActivated( wxListEvent& event );
 	void 	OnMouseRightClick( wxListEvent& event );
 	void 	OnMouseMiddleClick( wxListEvent& event );
 	void	OnKeyPressed( wxKeyEvent& event );
-
-
-	/**
-	 * Returns true if the given file should be shown in the specified category.
-	 *
-	 * @param file The file to be examined.
-	 * @param newel The new category selection.
-	 * @return True if the file should be shown, false otherwise.
-	 */
-	bool ShowItemInCurrentCat( const CPartFile* file, int newsel ) const;
+	void	OnItemSelectionChanged( wxListEvent& event );
 
 	/**
 	 * Executes the user-selected preview command on the specified file.
@@ -264,9 +197,14 @@
 	 */
 	void PreviewFile(CPartFile* file);
 
+	/**
+	 * Show file detail dialog for item at index
+	 */
+	void ShowFileDetailDialog(long index);
+
 
 	//! The type of list used to store items on the listctrl.
-	typedef std::multimap<const void*,CtrlItem_Struct*> ListItems;
+	typedef std::multimap<const void*,FileCtrlItem_Struct*> ListItems;
 	//! Shortcut to the pair-type used on the list.
 	typedef ListItems::value_type ListItemsPair;
 	//! This pair is used when searching for equal-ranges.
@@ -280,22 +218,22 @@
 	
 	//! Pointer to the current menu object, used to avoid multiple menus.
 	wxMenu*		m_menu;
-	//! Pointer to a cached brush object.
-	wxBrush*	m_hilightBrush;
-	//! Pointer to a cached brush object.
-	wxBrush*	m_hilightUnfocusBrush;
-	
+	//! Cached brush object.
+	wxBrush	m_hilightBrush;
+	//! Cached brush object.
+	wxBrush	m_hilightUnfocusBrush;	
 	
 	//! The currently displayed category
 	uint8 m_category;
 
-	//! True if there are any completed files being displayed.
-	bool  m_completedFiles;
-	
+	//! Flag if change of item selection is pending
+	bool m_ItemSelectionChangePending;
+
 	//! The number of displayed files
 	int m_filecount;
 
 	DECLARE_EVENT_TABLE()
+
 };
 
 #endif

aMule-2.2.6.tar.bz2/src/DownloadQueue.cpp -> aMule-2.3.1.tar.bz2/src/DownloadQueue.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -31,7 +31,6 @@
 #include <common/MenuIDs.h>
 #include <common/Constants.h>
 
-#include <wx/textfile.h>	// Needed for wxTextFile
 #include <wx/utils.h>
 
 #include "Server.h"		// Needed for CServer
@@ -53,7 +52,6 @@
 #include <common/Format.h>	// Needed for CFormat
 #include "IPFilter.h"
 #include <common/FileFunctions.h>	// Needed for CDirIterator
-#include "FileLock.h"		// Needed for CFileLock
 #include "GuiEvents.h"		// Needed for Notify_*
 #include "UserEvents.h"
 #include "MagnetURI.h"		// Needed for CMagnetED2KConverter
@@ -89,6 +87,11 @@
 	m_dwNextTCPSrcReq = 0;
 	m_cRequestsSentToServer = 0;
 	m_lastDiskCheck = 0;
+	
+	// Static thresholds until dynamic kicks in.
+	m_rareFileThreshold = RARE_FILE;
+	m_commonFileThreshold = 100;
+
 	SetLastKademliaFileRequest();
 }
 
@@ -97,19 +100,17 @@
 {
 	if ( !m_filelist.empty() ) {
 		for ( unsigned int i = 0; i < m_filelist.size(); i++ ) {
-			printf("\rSaving PartFile %u of %u", i + 1, (unsigned int)m_filelist.size());
-			fflush(stdout);
+			AddLogLineNS(CFormat(_("Saving PartFile %u of %u")) % (i + 1) % m_filelist.size());
 			delete m_filelist[i];
 		}
-		printf("\nAll PartFiles Saved.\n");
+		AddLogLineNS(_("All PartFiles Saved."));
 	}
 }
 
 
 void CDownloadQueue::LoadMetFiles(const CPath& path)
 {
-	printf("Loading temp files from %s.\n",
-		(const char *)unicode2char(path.GetPrintable()));
+	AddLogLineNS(CFormat(_("Loading temp files from %s.")) % path.GetPrintable());
 	
 	std::vector<CPath> files;
 
@@ -128,7 +129,7 @@
 
 	// Load part-files	
 	for ( size_t i = 0; i < files.size(); i++ ) {
-		printf("\rLoading PartFile %u of %u", (unsigned int)(i + 1), (unsigned int)files.size());
+		AddLogLineNS(CFormat(_("Loading PartFile %u of %u")) % (i + 1) % files.size());
 		fileName = files[i].GetFullName();
 		CPartFile *toadd = new CPartFile();
 		bool result = toadd->LoadPartFile(path, fileName) != 0;
@@ -150,28 +151,25 @@
 					% toadd->GetFileHash().Encode() % fileName;
 			} else {
 				// If result is false, then reading of both the primary and the backup .met failed
-				AddLogLineM(false, 
-					_("ERROR: Failed to load backup file. Search http://forum.amule.org for .part.met recovery solutions."));
+				AddLogLineN(_("ERROR: Failed to load backup file. Search http://forum.amule.org for .part.met recovery solutions."));
 				msg << CFormat(wxT("ERROR: Failed to load PartFile '%s'")) % fileName;
 			}
-			AddDebugLogLineM(true, logPartFile, msg);
-			
-			// Newline so that the error stays visible.
-			printf(": %s\n", (const char*)unicode2char(msg));
+			AddLogLineCS(msg);
 
 			// Delete the partfile object in the end.
 			delete toadd;
 		}
 	}
-	printf("\nAll PartFiles Loaded.\n");
+	AddLogLineNS(_("All PartFiles Loaded."));
 	
 	if ( GetFileCount() == 0 ) {
-		AddLogLineM(false, _("No part files found"));
+		AddLogLineN(_("No part files found"));
 	} else {
-		AddLogLineM(false, wxString::Format(wxPLURAL("Found %u part file", "Found %u part files", GetFileCount()), GetFileCount()) );
+		AddLogLineN(CFormat(wxPLURAL("Found %u part file", "Found %u part files", GetFileCount())) % GetFileCount());
 
 		DoSortByPriority();
 		CheckDiskspace( path );
+		Notify_ShowUpdateCatTabTitles();
 	}
 }
 
@@ -184,6 +182,22 @@
 }
 
 
+void CDownloadQueue::CopyFileList(std::vector<CPartFile*>& out_list, bool includeCompleted) const
+{
+	wxMutexLocker lock(m_mutex);
+
+	out_list.reserve(m_filelist.size() + includeCompleted ? m_completedDownloads.size() : 0);
+	for (FileQueue::const_iterator it = m_filelist.begin(); it != m_filelist.end(); ++it) {
+		out_list.push_back(*it);
+	}
+	if (includeCompleted) {
+		for (FileList::const_iterator it = m_completedDownloads.begin(); it != m_completedDownloads.end(); ++it) {
+			out_list.push_back(*it);
+		}
+	}
+}
+
+
 CServer* CDownloadQueue::GetUDPServer() const
 {
 	wxMutexLocker lock( m_mutex );
@@ -224,10 +238,10 @@
 
 	if (toadd->GetFileSize() > OLD_MAX_FILE_SIZE) {
 		if (!PlatformSpecific::CanFSHandleLargeFiles(thePrefs::GetTempDir())) {
-			AddLogLineM(true, _("Filesystem for Temp directory cannot handle large files."));
+			AddLogLineC(_("Filesystem for Temp directory cannot handle large files."));
 			return;
 		} else if (!PlatformSpecific::CanFSHandleLargeFiles(theApp->glob_prefs->GetCatPath(category))) {
-			AddLogLineM(true, _("Filesystem for Incoming directory cannot handle large files."));
+			AddLogLineC(_("Filesystem for Incoming directory cannot handle large files."));
 			return;
 		}
 	}
@@ -236,7 +250,7 @@
 	try {
 		newfile = new CPartFile(toadd);
 	} catch (const CInvalidPacket& WXUNUSED(e)) {
-		AddDebugLogLineM(true, logDownloadQueue, wxT("Search-result contained invalid tags, could not add"));
+		AddDebugLogLineC(logDownloadQueue, wxT("Search-result contained invalid tags, could not add"));
 	}
 	
 	if ( newfile && newfile->GetStatus() != PS_ERROR ) {
@@ -268,14 +282,27 @@
 {
 	void operator()(CPartFile* file) {
 		// Check if we should filter out other categories
+		int alphaorder = 0;
+
 		if ((m_category != -1) && (file->GetCategory() != m_category)) {
 			return;
 		} else if (file->GetStatus() != PS_PAUSED) {
 			return;
+		} else if (m_alpha && m_result && ((alphaorder = file->GetFileName().GetPrintable().CmpNoCase(m_result->GetFileName().GetPrintable())) > 0)) {
+			return;
 		}
-	
-		if (!m_result || (file->GetDownPriority() > m_result->GetDownPriority())) {
-			m_result = file;				
+
+		if (!m_result) {
+			m_result = file;
+		} else {
+			if (m_alpha && (alphaorder < 0)) {
+				m_result = file;
+			} else if (file->GetDownPriority() > m_result->GetDownPriority()) {
+				// Either not alpha ordered, or they have the same alpha ordering (could happen if they have same name)
+				m_result = file;
+			} else {
+				// Lower priority file
+			}
 		}
 	}
 
@@ -283,13 +310,15 @@
 	int m_category;
 	//! If any acceptable files are found, this variable store their pointer
 	CPartFile* m_result;
+	//! If we should order alphabetically
+	bool m_alpha;
 };
 
 
 void CDownloadQueue::StartNextFile(CPartFile* oldfile)
 {
 	if ( thePrefs::StartNextFile() ) {
-		SFindBestPF visitor = { -1, NULL };
+		SFindBestPF visitor = { -1, NULL, thePrefs::StartNextFileAlpha() };
 		
 		{
 			wxMutexLocker lock(m_mutex);
@@ -307,6 +336,8 @@
 				
 				visitor = std::for_each(m_filelist.begin(), m_filelist.end(), visitor);
 			}	
+
+			// Alpha doesn't need special cases
 		}
 		
 		if (visitor.m_result) {
@@ -333,10 +364,14 @@
 	}
 
 	NotifyObservers( EventType( EventType::INSERTED, file ) );
-
-	file->SetCategory(category);
+	if (category < theApp->glob_prefs->GetCatCount()) {
+		file->SetCategory(category);
+	} else {
+		AddDebugLogLineN( logDownloadQueue, wxT("Tried to add download into invalid category.") );
+	}
 	Notify_DownloadCtrlAddFile( file );
-	AddLogLineM(true, CFormat(_("Downloading %s")) % file->GetFileName() );
+	theApp->searchlist->UpdateSearchFileByHash(file->GetFileHash()); 	// Update file in the search dialog if it's still open
+	AddLogLineC(CFormat(_("Downloading %s")) % file->GetFileName() );
 }
 
 
@@ -344,7 +379,7 @@
 {
 	if (CKnownFile* file = theApp->sharedfiles->GetFileByID(fileid)) {
 		if (file->IsPartFile()) {
-			AddLogLineM(true, CFormat( _("You are already trying to download the file '%s'") ) % file->GetFileName());
+			AddLogLineC(CFormat( _("You are already trying to download the file '%s'") ) % file->GetFileName());
 		} else {
 			// Check if the file exists, since otherwise the user is forced to 
 			// manually reload the shares to download a file again.
@@ -356,18 +391,21 @@
 				return false;
 			}
 			
-			AddLogLineM(true, CFormat( _("You already have the file '%s'") ) % file->GetFileName());
+			AddLogLineC(CFormat( _("You already have the file '%s'") ) % file->GetFileName());
 		}
 		
 		return true;
 	} else if ((file = GetFileByID(fileid))) {
-		AddLogLineM(true, CFormat( _("You are already trying to download the file %s") ) % file->GetFileName());
+		AddLogLineC(CFormat( _("You are already trying to download the file %s") ) % file->GetFileName());
 		return true;
 	}
 	
 	return false;
 }
 
+#define RARITY_FACTOR 4 // < 25%
+#define NORMALITY_FACTOR 2 // <50%
+// x > NORMALITY_FACTOR -> High availablity.
 
 void CDownloadQueue::Process()
 {
@@ -392,22 +430,83 @@
 		uint32 cur_datarate = 0;
 		uint32 cur_udcounter = m_udcounter;
 		
+		std::list<int> m_sourcecountlist;
+
+		bool mustPreventSleep = false;
+
 		for ( uint16 i = 0; i < m_filelist.size(); i++ ) {
 			CPartFile* file = m_filelist[i];
 	
 			CMutexUnlocker unlocker(m_mutex);
 			
-			if ( file->GetStatus() == PS_READY || file->GetStatus() == PS_EMPTY ){
+			uint8 status = file->GetStatus();
+			mustPreventSleep |= !(status == PS_ERROR || status == PS_INSUFFICIENT || status == PS_PAUSED || status == PS_COMPLETE);
+
+			if (status == PS_READY || status == PS_EMPTY ){
 				cur_datarate += file->Process( downspeed, cur_udcounter );
 			} else {
 				//This will make sure we don't keep old sources to paused and stoped files..
 				file->StopPausedFile();
 			}
+
+			if (!file->IsPaused() && !file->IsStopped()) {
+				m_sourcecountlist.push_back(file->GetSourceCount());
+			}
+		}
+
+		if (thePrefs::GetPreventSleepWhileDownloading()) {
+			if ((mustPreventSleep == false) && (theStats::GetSessionSentBytes() < theStats::GetSessionReceivedBytes())) {
+				// I can see right through your clever plan.
+				mustPreventSleep = true;
+			}
+
+			if (mustPreventSleep) {
+				PlatformSpecific::PreventSleepMode();
+			} else {
+				PlatformSpecific::AllowSleepMode();
+			}
+		} else {
+			// Just in case the value changes while we're preventing. Calls to this function are totally inexpensive anwyay
+			PlatformSpecific::AllowSleepMode();
+		}
+
+
+		// Set the source rarity thresholds
+		int nSourceGroups = m_sourcecountlist.size();
+		if (nSourceGroups) {
+			m_sourcecountlist.sort();
+			if (nSourceGroups == 1) {
+				// High anyway.
+				m_rareFileThreshold = m_sourcecountlist.front() + 1;
+				m_commonFileThreshold = m_rareFileThreshold + 1;
+			} else if (nSourceGroups == 2) {
+				// One high, one low (unless they're both 0, then both high)
+				m_rareFileThreshold = (m_sourcecountlist.back() > 0) ? (m_sourcecountlist.back() - 1) : 1;
+				m_commonFileThreshold = m_rareFileThreshold + 1;
+			} else {
+				// More than two, time to do some math.
+
+				// Lower 25% with the current #define values.
+				int rarecutpoint = (nSourceGroups / RARITY_FACTOR); 
+				for (int i = 0; i < rarecutpoint; ++ i) {
+					m_sourcecountlist.pop_front();
+				}
+				m_rareFileThreshold = (m_sourcecountlist.front() > 0) ? (m_sourcecountlist.front() - 1) : 1;
+
+				// 50% of the non-rare ones, with the curent #define values.
+				int commoncutpoint = (nSourceGroups - rarecutpoint) / NORMALITY_FACTOR;
+				for (int i = 0; i < commoncutpoint; ++ i) {
+					m_sourcecountlist.pop_front();
+				}
+				m_commonFileThreshold = (m_sourcecountlist.front() > 0) ? (m_sourcecountlist.front() - 1) : 1;
+			}
+		} else {
+			m_rareFileThreshold = RARE_FILE;
+			m_commonFileThreshold = 100;
 		}
 	
 		m_datarate += cur_datarate;
-	
-	
+
 		if (m_udcounter == 5) {
 			if (theApp->serverconnect->IsUDPSocketAvailable()) {
 				if( (::GetTickCount() - m_lastudpstattime) > UDPSERVERSTATTIME) {
@@ -429,8 +528,6 @@
 		}
 	
 		if ( (::GetTickCount() - m_lastsorttime) > 10000 ) {
-			
-			
 			DoSortByPriority();
 		}
 		// Check if any paused files can be resumed
@@ -441,7 +538,7 @@
 	
 	// Check for new links once per second.
 	if ((::GetTickCount() - m_nLastED2KLinkCheck) >= 1000) {
-		AddLinksFromFile();
+		theApp->AddLinksFromFile();
 		m_nLastED2KLinkCheck = ::GetTickCount();
 	}
 }
@@ -456,6 +553,12 @@
 			return m_filelist[ i ];
 		}
 	}
+	// Check completed too so we can execute remote commands (like change cat) on them
+	for (FileList::const_iterator it = m_completedDownloads.begin(); it != m_completedDownloads.end(); ++it) {
+		if ( filehash == (*it)->GetFileHash()) {
+			return *it;
+		}
+	}
 	
 	return NULL;
 }
@@ -469,7 +572,7 @@
 		return m_filelist[ index ];
 	}
 	
-	wxASSERT( false );
+	wxFAIL;
 	return NULL;
 }
 
@@ -506,7 +609,7 @@
 	// if we block loopbacks at this point it should prevent us from connecting to ourself
 	if ( source->HasValidHash() ) {
 		if ( source->GetUserHash() == thePrefs::GetUserHash() ) {
-			AddDebugLogLineM( false, logDownloadQueue, wxT("Tried to add source with matching hash to your own.") );
+			AddDebugLogLineN( logDownloadQueue, wxT("Tried to add source with matching hash to your own.") );
 			source->Safe_Delete();
 			return;
 		}
@@ -535,16 +638,16 @@
 
 		CClientList::SourceList::iterator it = found.begin();
 		for ( ; it != found.end(); it++ ) {
-			CKnownFile* file = (*it)->GetRequestFile();
+			CKnownFile* file = it->GetRequestFile();
 
 			// Only check files on the download-queue
 			if ( file ) {
 				// Is the found source queued for something else?
 				if (  file != sender ) {
 					// Try to add a request for the other file
-					if ( (*it)->AddRequestForAnotherFile(sender)) {
+					if ( it->GetClient()->AddRequestForAnotherFile(sender)) {
 						// Add it to downloadlistctrl
-						Notify_DownloadCtrlAddSource(sender, *it, A4AF_SOURCE);
+						Notify_SourceCtrlAddSource(sender, *it, A4AF_SOURCE);
 					}
 				}
 				
@@ -580,7 +683,7 @@
 				sender->UpdateFileRatingCommentAvail();
 			}
 			
-			Notify_DownloadCtrlAddSource(sender, source, UNAVAILABLE_SOURCE);
+			Notify_SourceCtrlAddSource(sender, CCLIENTREF(source, wxT("CDownloadQueue::CheckAndAddSource Notify_SourceCtrlAddSource 1")), UNAVAILABLE_SOURCE);
 		}
 	} else {
 		// Unknown client, add it to the clients list
@@ -593,7 +696,7 @@
 			sender->UpdateFileRatingCommentAvail();
 		}
 	
-		Notify_DownloadCtrlAddSource(sender, source, UNAVAILABLE_SOURCE);
+		Notify_SourceCtrlAddSource(sender, CCLIENTREF(source, wxT("CDownloadQueue::CheckAndAddSource Notify_SourceCtrlAddSource 2")), UNAVAILABLE_SOURCE);
 	}
 }
 
@@ -620,15 +723,14 @@
 	if (!source->HasLowID()) {
 		uint32 nClientIP = wxUINT32_SWAP_ALWAYS(source->GetUserIDHybrid());
 		if (!IsGoodIP(nClientIP, thePrefs::FilterLanIPs())) { // check for 0-IP, localhost and LAN addresses
-			AddDebugLogLineM(false, logIPFilter, wxT("Ignored already known source with IP=%s") + Uint32toStringIP(nClientIP));
+			AddDebugLogLineN(logIPFilter, wxT("Ignored already known source with IP=%s") + Uint32toStringIP(nClientIP));
 			return;
 		}
 	}	
 	
 	// Filter sources which are incompatible with our encryption setting (one requires it, and the other one doesn't supports it)
-	if ( (source->RequiresCryptLayer() && (!thePrefs::IsClientCryptLayerSupported() || !source->HasValidHash())) || (thePrefs::IsClientCryptLayerRequired() && (!source->SupportsCryptLayer() || !source->HasValidHash())))
-	{
-		source->Safe_Delete();
+	if ( (source->RequiresCryptLayer() && (!thePrefs::IsClientCryptLayerSupported() || !source->HasValidHash())) 
+		|| (thePrefs::IsClientCryptLayerRequired() && (!source->SupportsCryptLayer() || !source->HasValidHash()))) {
 		return;
 	}		
 	
@@ -638,7 +740,7 @@
 	if ( file ) {
 		if ( file != sender ) {
 			if ( source->AddRequestForAnotherFile( sender ) ) {
-				Notify_DownloadCtrlAddSource( sender, source, A4AF_SOURCE );
+				Notify_SourceCtrlAddSource( sender, CCLIENTREF(source, wxT("CDownloadQueue::CheckAndAddKnownSource Notify_SourceCtrlAddSource 1")), A4AF_SOURCE );
 			}
 		}
 	} else {
@@ -650,7 +752,7 @@
 
 		source->SetSourceFrom(SF_PASSIVE);
 		sender->AddSource( source );
-		Notify_DownloadCtrlAddSource( sender, source, UNAVAILABLE_SOURCE);
+		Notify_SourceCtrlAddSource( sender, CCLIENTREF(source, wxT("CDownloadQueue::CheckAndAddKnownSource Notify_SourceCtrlAddSource 2")), UNAVAILABLE_SOURCE);
 	}
 }
 
@@ -665,6 +767,10 @@
 		
 		// Remove from source-list
 		if ( cur_file->DelSource( toremove ) ) {
+			
+			// Remove from sourcelist widget
+			Notify_SourceCtrlRemoveSource(toremove->ECID(), cur_file);
+			
 			cur_file->RemoveDownloadingSource(toremove);
 			removed = true;
 			if ( bDoStatsUpdate ) {
@@ -683,16 +789,13 @@
 	
 	toremove->SetRequestFile( NULL );
 	toremove->SetDownloadState(DS_NONE);
-
-	// Remove from downloadlist widget
-	Notify_DownloadCtrlRemoveSource(toremove, (CPartFile*)NULL);
 	toremove->ResetFileStatusInfo();
 
 	return removed;
 }
 
 
-void CDownloadQueue::RemoveFile(CPartFile* file)
+void CDownloadQueue::RemoveFile(CPartFile* file, bool keepAsCompleted)
 {
 	RemoveLocalServerRequest( file );
 
@@ -701,6 +804,28 @@
 	wxMutexLocker lock( m_mutex );
 
 	EraseValue( m_filelist, file );
+
+	if (keepAsCompleted) {
+		m_completedDownloads.push_back(file);
+	}
+}
+
+
+void CDownloadQueue::ClearCompleted(const ListOfUInts32 & ecids)
+{
+	for (ListOfUInts32::const_iterator it1 = ecids.begin(); it1 != ecids.end(); it1++) {
+		uint32 ecid = *it1;
+		for (FileList::iterator it = m_completedDownloads.begin(); it != m_completedDownloads.end(); it++) {
+			CPartFile * file = *it;
+			if (file->ECID() == ecid) {
+				m_completedDownloads.erase(it);
+				// get a new EC ID so it is resent and cleared in remote gui
+				file->RenewECID();
+				Notify_DownloadCtrlRemoveFile(file);
+				break;
+			}
+		}
+	}
 }
 
 
@@ -709,11 +834,11 @@
 	wxMutexLocker lock( m_mutex );
 
 	for ( unsigned int i = 0; i < m_filelist.size(); i++ ) {
-		const CPartFile::SourceSet& set = m_filelist[i]->GetSourceList();
+		const CKnownFile::SourceSet& set = m_filelist[i]->GetSourceList();
 		
-		for ( CPartFile::SourceSet::const_iterator it = set.begin(); it != set.end(); it++ ) {
-			if ( (*it)->GetIP() == dwIP && (*it)->GetUDPPort() == nUDPPort ) {
-				return *it;
+		for ( CKnownFile::SourceSet::const_iterator it = set.begin(); it != set.end(); it++ ) {
+			if ( it->GetIP() == dwIP && it->GetUDPPort() == nUDPPort ) {
+				return it->GetClient();
 			}
 		}
 	}
@@ -785,7 +910,7 @@
  			
 			if ( ( status == PS_READY || status == PS_EMPTY ) && file->GetSourceCount() < thePrefs::GetMaxSourcePerFileUDP() ) {
 				if (file->IsLargeFile() && !m_udpserver->SupportsLargeFilesUDP()) {
-					AddDebugLogLineM(false, logDownloadQueue, wxT("UDP Request for sources on a large file ignored: server doesn't support it")); 	
+					AddDebugLogLineN(logDownloadQueue, wxT("UDP Request for sources on a large file ignored: server doesn't support it"));
 				} else {
 					++m_cRequestsSentToServer;
 					hashlist.WriteHash( file->GetFileHash() );
@@ -926,7 +1051,7 @@
 				if (cur_file->GetStatus() == PS_READY || cur_file->GetStatus() == PS_EMPTY) {
 					uint8 nPriority = cur_file->GetDownPriority();
 					if (nPriority > PR_HIGH) {
-						wxASSERT(0);
+						wxFAIL;
 						nPriority = PR_HIGH;
 					}
 
@@ -939,7 +1064,7 @@
 				} else {
 					it = m_localServerReqQueue.erase(it);
 					cur_file->SetLocalSrcRequestQueued(false);
-					AddDebugLogLineM( false, logDownloadQueue,
+					AddDebugLogLineN(logDownloadQueue,
 						CFormat(wxT("Local server source request for file '%s' not sent because of status '%s'"))
 							% cur_file->GetFileName() % cur_file->getPartfileStatus());
 				}
@@ -953,9 +1078,9 @@
 				iFiles++;
 
 				if (!bServerSupportsLargeFiles && cur_file->IsLargeFile()) {
-					AddDebugLogLineM(false, logDownloadQueue, wxT("TCP Request for sources on a large file ignored: server doesn't support it"));
+					AddDebugLogLineN(logDownloadQueue, wxT("TCP Request for sources on a large file ignored: server doesn't support it"));
 				} else {
-					AddDebugLogLineM(false, logDownloadQueue,
+					AddDebugLogLineN(logDownloadQueue,
 						CFormat(wxT("Creating local sources request packet for '%s'")) % cur_file->GetFileName());
 					// create request packet
 					CMemFile data(16 + (cur_file->IsLargeFile() ? 8 : 4));
@@ -986,12 +1111,12 @@
 		if (iSize > 0) {
 			// create one 'packet' which contains all buffered OP_GETSOURCES ED2K packets to be sent with one TCP frame
 			// server credits: (16+4)*regularfiles + (16+4+8)*largefiles +1
-			CPacket* packet = new CPacket(new byte[iSize], dataTcpFrame.GetLength(), true, false);
+			CScopedPtr<CPacket> packet(new CPacket(new byte[iSize], dataTcpFrame.GetLength(), true, false));
 			dataTcpFrame.Seek(0, wxFromStart);
 			dataTcpFrame.Read(packet->GetPacket(), iSize);
 			uint32 size = packet->GetPacketSize();
-			theApp->serverconnect->SendPacket(packet, true);	// Deletes `packet'.
-			AddDebugLogLineM(false, logDownloadQueue, wxT("Sent local sources request packet."));
+			theApp->serverconnect->SendPacket(packet.release(), true);	// Deletes `packet'.
+			AddDebugLogLineN(logDownloadQueue, wxT("Sent local sources request packet."));
 			theStats::AddUpOverheadServer(size);
 		}
 
@@ -1010,39 +1135,16 @@
 }
 
 
-void CDownloadQueue::AddLinksFromFile()
+void CDownloadQueue::ResetCatParts(uint8 cat)
 {
-	const wxString fullPath = theApp->ConfigDir + wxT("ED2KLinks");
-	if (!wxFile::Exists(fullPath)) {
-		return;
+	for (FileQueue::iterator it = m_filelist.begin(); it != m_filelist.end(); it++) {
+		CPartFile* file = *it;
+		file->RemoveCategory(cat);
 	}
-	
-	// Attempt to lock the ED2KLinks file.
-	CFileLock lock((const char*)unicode2char(fullPath));
-
-	wxTextFile file(fullPath);
-	if ( file.Open() ) {
-		for ( unsigned int i = 0; i < file.GetLineCount(); i++ ) {
-			wxString line = file.GetLine( i ).Strip( wxString::both );
-			
-			if ( !line.IsEmpty() ) {
-				// Special case! used by a secondary running mule to raise this one.
-				if ( line == wxT("RAISE_DIALOG")  ) {
-					Notify_ShowGUI();
-					continue;
-				}
-				
-				AddLink( line );
-			}
-		}
-
-		file.Close();
-	} else {
-		printf("Failed to open ED2KLinks file.\n");
+	for (FileList::iterator it = m_completedDownloads.begin(); it != m_completedDownloads.end(); it++) {
+		CPartFile* file = *it;
+		file->RemoveCategory(cat);
 	}
-	
-	// Delete the file.
-	wxRemoveFile(theApp->ConfigDir +  wxT("ED2KLinks"));
 }
 
 
@@ -1289,14 +1391,14 @@
 }
 
 
-bool CDownloadQueue::AddLink( const wxString& link, int category )
+bool CDownloadQueue::AddLink( const wxString& link, uint8 category )
 {
 	wxString uri(link);
 
 	if (link.compare(0, 7, wxT("magnet:")) == 0) {
 		uri = CMagnetED2KConverter(link);
 		if (uri.empty()) {
-			AddLogLineM(true, CFormat(_("Cannot convert magnet link to eD2k: %s")) % link);
+			AddLogLineC(CFormat(_("Cannot convert magnet link to eD2k: %s")) % link);
 			return false;
 		}
 	}
@@ -1304,13 +1406,13 @@
 	if (uri.compare(0, 7, wxT("ed2k://")) == 0) {
 		return AddED2KLink(uri, category);
 	} else {
-		AddLogLineM(true, CFormat(_("Unknown protocol of link: %s")) % link);
+		AddLogLineC(CFormat(_("Unknown protocol of link: %s")) % link);
 		return false;
 	}
 }
 
 
-bool CDownloadQueue::AddED2KLink( const wxString& link, int category )
+bool CDownloadQueue::AddED2KLink( const wxString& link, uint8 category )
 {
 	wxASSERT( !link.IsEmpty() );
 	wxString URI = link;
@@ -1325,14 +1427,14 @@
 
 		return AddED2KLink( uri.get(), category );
 	} catch ( const wxString& err ) {
-		AddLogLineM( true, CFormat( _("Invalid eD2k link! ERROR: %s")) % err);
+		AddLogLineC(CFormat( _("Invalid eD2k link! ERROR: %s")) % err);
 	}
 	
 	return false;
 }
 
 
-bool CDownloadQueue::AddED2KLink( const CED2KLink* link, int category )
+bool CDownloadQueue::AddED2KLink( const CED2KLink* link, uint8 category )
 {
 	switch ( link->GetKind() ) {
 		case CED2KLink::kFile:
@@ -1351,7 +1453,7 @@
 
 
 
-bool CDownloadQueue::AddED2KLink( const CED2KFileLink* link, int category )
+bool CDownloadQueue::AddED2KLink( const CED2KFileLink* link, uint8 category )
 {
 	CPartFile* file = NULL;
 	if (IsFileExisting(link->GetHashKey())) {
@@ -1362,10 +1464,10 @@
 	} else {
 		if (link->GetSize() > OLD_MAX_FILE_SIZE) {
 			if (!PlatformSpecific::CanFSHandleLargeFiles(thePrefs::GetTempDir())) {
-				AddLogLineM(true, _("Filesystem for Temp directory cannot handle large files."));
+				AddLogLineC(_("Filesystem for Temp directory cannot handle large files."));
 				return false;
 			} else if (!PlatformSpecific::CanFSHandleLargeFiles(theApp->glob_prefs->GetCatPath(category))) {
-				AddLogLineM(true, _("Filesystem for Incoming directory cannot handle large files."));
+				AddLogLineC(_("Filesystem for Incoming directory cannot handle large files."));
 				return false;
 			}
 		}
@@ -1438,31 +1540,31 @@
 
 void CDownloadQueue::KademliaSearchFile(uint32_t searchID, const Kademlia::CUInt128* pcontactID, const Kademlia::CUInt128* pbuddyID, uint8_t type, uint32_t ip, uint16_t tcp, uint16_t udp, uint32_t buddyip, uint16_t buddyport, uint8_t byCryptOptions)
 {
-	AddDebugLogLineM(false, logKadSearch, wxString::Format(wxT("Search result sources (type %i)"),type));
+	AddDebugLogLineN(logKadSearch, CFormat(wxT("Search result sources (type %i)")) % type);
 
 	//Safety measure to make sure we are looking for these sources
 	CPartFile* temp = GetFileByKadFileSearchID(searchID);
 	if( !temp ) {
-		AddDebugLogLineM(false, logKadSearch, wxT("This is not the file we're looking for..."));
+		AddDebugLogLineN(logKadSearch, wxT("This is not the file we're looking for..."));
 		return;
 	}
 
 	//Do we need more sources?
 	if(!(!temp->IsStopped() && thePrefs::GetMaxSourcePerFile() > temp->GetSourceCount())) {
-		AddDebugLogLineM(false, logKadSearch, wxT("No more sources needed for this file"));
+		AddDebugLogLineN(logKadSearch, wxT("No more sources needed for this file"));
 		return;
 	}
 
 	uint32_t ED2KID = wxUINT32_SWAP_ALWAYS(ip);
 
 	if (theApp->ipfilter->IsFiltered(ED2KID)) {
-		AddDebugLogLineM(false, logKadSearch, wxT("Source ip got filtered"));
-		AddDebugLogLineM(false, logIPFilter, CFormat(wxT("IPfiltered source IP=%s received from Kademlia")) % Uint32toStringIP(ED2KID));
+		AddDebugLogLineN(logKadSearch, wxT("Source ip got filtered"));
+		AddDebugLogLineN(logIPFilter, CFormat(wxT("IPfiltered source IP=%s received from Kademlia")) % Uint32toStringIP(ED2KID));
 		return;
 	}
 
 	if( (ip == Kademlia::CKademlia::GetIPAddress() || ED2KID == theApp->GetED2KID()) && tcp == thePrefs::GetPort()) {
-		AddDebugLogLineM(false, logKadSearch, wxT("Trying to add myself as source, ignore"));
+		AddDebugLogLineN(logKadSearch, wxT("Trying to add myself as source, ignore"));
 		return;
 	}
 
@@ -1472,12 +1574,12 @@
 		case 1: {
 			// NonFirewalled users
 			if(!tcp) {
-				AddDebugLogLineM(false, logKadSearch, CFormat(wxT("Ignored source (IP=%s) received from Kademlia, no tcp port received")) % Uint32toStringIP(ip));
+				AddDebugLogLineN(logKadSearch, CFormat(wxT("Ignored source (IP=%s) received from Kademlia, no tcp port received")) % Uint32toStringIP(ip));
 				return;
 			}
 			if (!IsGoodIP(ED2KID,thePrefs::FilterLanIPs())) {
-				AddDebugLogLineM(false, logKadSearch, CFormat(wxT("%s got filtered")) % Uint32toStringIP(ED2KID));
-				AddDebugLogLineM(false, logIPFilter, CFormat(wxT("Ignored source (IP=%s) received from Kademlia, filtered")) % Uint32toStringIP(ED2KID));
+				AddDebugLogLineN(logKadSearch, CFormat(wxT("%s got filtered")) % Uint32toStringIP(ED2KID));
+				AddDebugLogLineN(logIPFilter, CFormat(wxT("Ignored source (IP=%s) received from Kademlia, filtered")) % Uint32toStringIP(ED2KID));
 				return;
 			}
 			ctemp = new CUpDownClient(tcp, ip, 0, 0, temp, false, true);
@@ -1521,7 +1623,7 @@
 			}
 
 			if ((byCryptOptions & 0x08) == 0){
-				AddDebugLogLineM(false, logKadSearch, CFormat(wxT("Received Kad source type 6 (direct callback) which has the direct callback flag not set (%s)")) % Uint32toStringIP(ED2KID));
+				AddDebugLogLineN(logKadSearch, CFormat(wxT("Received Kad source type 6 (direct callback) which has the direct callback flag not set (%s)")) % Uint32toStringIP(ED2KID));
 				break;
 			}
 
@@ -1539,7 +1641,7 @@
 		// add encryption settings
 		ctemp->SetConnectOptions(byCryptOptions);
 
-		AddDebugLogLineM(false, logKadSearch, CFormat(wxT("Happily adding a source (%s) type %d")) % Uint32_16toStringIP_Port(ED2KID, ctemp->GetUserPort()) % type);
+		AddDebugLogLineN(logKadSearch, CFormat(wxT("Happily adding a source (%s) type %d")) % Uint32_16toStringIP_Port(ED2KID, ctemp->GetUserPort()) % type);
 		CheckAndAddSource(temp, ctemp);
 	}
 }

aMule-2.2.6.tar.bz2/src/DownloadQueue.h -> aMule-2.3.1.tar.bz2/src/DownloadQueue.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -137,8 +137,9 @@
 	 * Removes the specified file from the queue.
 	 *
 	 * @param toremove A pointer to the file object to be removed.
+	 * @param keepAsCompleted If true add the removed file to the list of completed files.
 	 */
-	void	RemoveFile(CPartFile* toremove);
+	void	RemoveFile(CPartFile* toremove, bool keepAsCompleted = false);
 	
 	
 	/**
@@ -226,6 +227,11 @@
 
 
 	/**
+	 * Resets the category of all files with the specified category.
+	 */
+	void	ResetCatParts(uint8 cat);
+
+	/**
 	 * Sets the priority of all files with the specified category.
 	 */
 	void	SetCatPrio(uint8 cat, uint8 newprio);
@@ -241,6 +247,11 @@
 	uint16	GetFileCount() const;
 
 	/**
+	 * Makes a copy of the file list.
+	 */
+	void	CopyFileList(std::vector<CPartFile*>& out_list, bool includeCompleted = false) const;
+
+	/**
 	 * Returns the current number of downloading files.
 	 */
 	uint16	GetDownloadingFileCount() const;
@@ -260,11 +271,11 @@
 	/**
 	 * Adds an ed2k or magnet link to download queue.
 	 */
-	bool	AddLink( const wxString& link, int category = 0 );
+	bool	AddLink( const wxString& link, uint8 category = 0 );
 
-	bool	AddED2KLink( const wxString& link, int category = 0 );
-	bool	AddED2KLink( const CED2KLink* link, int category = 0 );
-	bool	AddED2KLink( const CED2KFileLink* link, int category = 0 );
+	bool	AddED2KLink( const wxString& link, uint8 category = 0 );
+	bool	AddED2KLink( const CED2KLink* link, uint8 category = 0 );
+	bool	AddED2KLink( const CED2KFileLink* link, uint8 category = 0 );
 	bool	AddED2KLink( const CED2KServerLink* link );
 	bool	AddED2KLink( const CED2KServerListLink* link );
 
@@ -298,6 +309,14 @@
 	
 	void	SetLastKademliaFileRequest()	{lastkademliafilerequest = ::GetTickCount();}
 	
+	uint32	GetRareFileThreshold() const { return m_rareFileThreshold; }
+	uint32	GetCommonFileThreshold() const { return m_commonFileThreshold; }
+
+	/**
+	 * Remove a file from the list of completed downloads.
+	 */
+	void	ClearCompleted(const ListOfUInts32 & ecids);
+	
 private:
 	/**
 	 * This function initializes new observers with the current contents of the queue.
@@ -314,11 +333,6 @@
 	void	CheckDiskspace(const CPath& path);
 
 	/**
-	 * Parses all links in the ED2KLink file and resets it.
-	 */
-	void	AddLinksFromFile();
-
-	/**
 	 * Stops performing UDP requests.
 	 */
 	void	DoStopUDPRequests();
@@ -370,7 +384,11 @@
 	typedef std::deque<CPartFile*> FileQueue;
 	FileQueue m_filelist;
 	
-	std::list<CPartFile*>		m_localServerReqQueue;
+	typedef std::list<CPartFile*> FileList;
+	FileList		m_localServerReqQueue;
+
+	//! List of downloads completed and still on display
+	FileList		m_completedDownloads;
 
 	//! Observer used to keep track of which servers have yet to be asked for sources
 	CQueueObserver<CServer*>	m_queueServers;
@@ -380,7 +398,12 @@
 	
 	/* Kad Stuff */
 	uint32		lastkademliafilerequest;
+
+	//! Threshold for rare files, dynamically based on the sources for each.
+	uint32		m_rareFileThreshold;
 	
+	//! Threshold for common files, dynamically based on the sources for each.
+	uint32		m_commonFileThreshold;
 };
 
 #endif // DOWNLOADQUEUE_H

aMule-2.2.6.tar.bz2/src/ECSpecialCoreTags.cpp -> aMule-2.3.1.tar.bz2/src/ECSpecialCoreTags.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 Kry ( elkry@sourceforge.net / http://www.amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Angel Vidal ( kry@amule.org )
+// 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
@@ -35,14 +35,16 @@
 #include "Server.h"		// Needed for CServer
 #include "PartFile.h"		// Needed for CPartFile
 #include "ServerConnect.h"	// Needed for CServerConnect
-#include "updownclient.h"
+#include "updownclient.h"	// Needed for CUpDownClient
 #include "UploadQueue.h"	// Needed for CUploadQueue
 #include "SharedFileList.h"
 #include "SearchList.h"
+#include "Friend.h"
 
 #include "kademlia/kademlia/Kademlia.h"
 
 
+// used for webserver, amulecmd
 CEC_Server_Tag::CEC_Server_Tag(const CServer *server, EC_DETAIL_LEVEL detail_level) :
 	CECTag(EC_TAG_SERVER, EC_IPv4_t(server->GetIP(), server->GetPort()))
 {
@@ -53,7 +55,7 @@
 	switch (detail_level) {
 		case EC_DETAIL_INC_UPDATE:
 			// should not get here
-			wxASSERT(0);
+			wxFAIL;
 			break;
 		case EC_DETAIL_UPDATE:
 			if ((tmpInt = server->GetPing()) != 0) {
@@ -99,6 +101,25 @@
 	}
 }
 
+// used for amulegui (EC_DETAIL_INC_UPDATE)
+CEC_Server_Tag::CEC_Server_Tag(const CServer *server, CValueMap *valuemap) :
+	CECTag(EC_TAG_SERVER, server->ECID())
+{
+	AddTag(EC_TAG_SERVER_NAME, server->GetListName(), valuemap);
+	AddTag(EC_TAG_SERVER_DESC, server->GetDescription(), valuemap);
+	AddTag(EC_TAG_SERVER_VERSION, server->GetVersion(), valuemap);
+	AddTag(EC_TAG_SERVER_IP, server->GetIP(), valuemap);
+	AddTag(EC_TAG_SERVER_PORT, server->GetPort(), valuemap);
+	AddTag(EC_TAG_SERVER_PING, server->GetPing(), valuemap);
+	AddTag(EC_TAG_SERVER_PRIO, server->GetPreferences(), valuemap);
+	AddTag(EC_TAG_SERVER_FAILED, server->GetFailedCount(), valuemap);
+	AddTag(EC_TAG_SERVER_STATIC, server->IsStaticMember(), valuemap);
+	AddTag(EC_TAG_SERVER_USERS, server->GetUsers(), valuemap);
+	AddTag(EC_TAG_SERVER_USERS_MAX, server->GetMaxUsers(), valuemap);
+	AddTag(EC_TAG_SERVER_FILES, server->GetFiles(), valuemap);
+}
+
+
 CEC_ConnState_Tag::CEC_ConnState_Tag(EC_DETAIL_LEVEL detail_level) : CECTag(EC_TAG_CONNSTATE,
 	(uint8)(
 			(theApp->IsConnectedED2K() ? 0x01 : 0x00)
@@ -114,303 +135,244 @@
 {
 	if (theApp->IsConnectedED2K()) {
 		if ( theApp->serverconnect->GetCurrentServer() ) {
-			AddTag(CEC_Server_Tag(theApp->serverconnect->GetCurrentServer(), detail_level));
+			if (detail_level == EC_DETAIL_INC_UPDATE) {
+				// Send no full server tag, just the ECID of the connected server
+				AddTag(CECTag(EC_TAG_SERVER, theApp->serverconnect->GetCurrentServer()->ECID()));
+			} else {
+				AddTag(CEC_Server_Tag(theApp->serverconnect->GetCurrentServer(), detail_level));
+			}
 		}
 		AddTag(CECTag(EC_TAG_ED2K_ID, theApp->GetED2KID()));
+	} else if (theApp->serverconnect->IsConnecting()) {
+		AddTag(CECTag(EC_TAG_ED2K_ID, 0xffffffff));
 	}
 
 	AddTag(CECTag(EC_TAG_CLIENT_ID, theApp->GetID()));	
 }
 
-CEC_PartFile_Tag::CEC_PartFile_Tag(CPartFile *file, CValueMap &valuemap)
-	: CECTag(EC_TAG_PARTFILE, file->GetFileHash())
-{
-	valuemap.CreateTag(EC_TAG_PARTFILE_STATUS, file->GetStatus(), this);
-
-	valuemap.CreateTag(EC_TAG_PARTFILE_SOURCE_COUNT, file->GetSourceCount(), this);
-	valuemap.CreateTag(EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT, file->GetNotCurrentSourcesCount(), this);
-	valuemap.CreateTag(EC_TAG_PARTFILE_SOURCE_COUNT_XFER, file->GetTransferingSrcCount(), this);
-	valuemap.CreateTag(EC_TAG_PARTFILE_SOURCE_COUNT_A4AF, file->GetSrcA4AFCount(), this);
-		
-	valuemap.CreateTag(EC_TAG_PARTFILE_SIZE_XFER, file->GetTransferred(), this);
-	valuemap.CreateTag(EC_TAG_PARTFILE_SIZE_DONE, file->GetCompletedSize(), this);
-	valuemap.CreateTag(EC_TAG_PARTFILE_SPEED, (uint64)(file->GetKBpsDown()*1024), this);
-	
-	valuemap.CreateTag(EC_TAG_PARTFILE_PRIO, 
-		(uint64)(file->IsAutoDownPriority() ? 
-						file->GetDownPriority() + 10 : file->GetDownPriority()), this);
-
-	valuemap.CreateTag(EC_TAG_PARTFILE_CAT, file->GetCategory(), this);
-
-	valuemap.CreateTag(EC_TAG_PARTFILE_LAST_SEEN_COMP, (uint64)file->lastseencomplete, this);
-	
-	valuemap.CreateTag(EC_TAG_PARTFILE_NAME, file->GetFileName().GetPrintable(), this);
-
-	long l;
-	if (file->GetPartMetFileName().RemoveAllExt().GetRaw().ToLong(&l)) {
-		valuemap.CreateTag(EC_TAG_PARTFILE_PARTMETID, (uint64)l, this);
-	}
-
-	valuemap.CreateTag(EC_TAG_PARTFILE_SIZE_FULL, file->GetFileSize(), this);
-
-	valuemap.CreateTag(EC_TAG_PARTFILE_ED2K_LINK,
-		theApp->CreateED2kLink(file, (theApp->IsConnectedED2K() && !theApp->serverconnect->IsLowID())), this);
-}
-
-void CEC_PartFile_Tag::Detail_Tag(CPartFile *file)
-{
-	// Tag for source names
-	CECTag sn(EC_TAG_PARTFILE_SOURCE_NAMES, (uint64) 0);
-	SourcenameItemList sil;
-	const CPartFile::SourceSet &sources = file->GetSourceList();
-	for (CPartFile::SourceSet::const_iterator it = sources.begin(); it != sources.end(); ++it) {
-		CUpDownClient *cur_src = *it; 
-		if (cur_src->GetRequestFile() != file || cur_src->GetClientFilename().Length() == 0) {
-			continue;
-		}
-			
-		bool found = false;
-		for (SourcenameItemList::iterator its = sil.begin() ; its != sil.end(); ++its ) {
-			if (its->name == cur_src->GetClientFilename()) {
-				its->count++;
-				found = true;
-				break;
-			}
-		}
-		if (!found) {
-			sil.push_back(SourcenameItem(cur_src->GetClientFilename(), 1));
-		}
-	}
-	for (SourcenameItemList::const_iterator its = sil.begin() ; its != sil.end(); ++its ) {
-		// Tag children are evaluated by index, not by name
-		sn.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_NAMES, its->name));
-		sn.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_NAMES, (uint64) its->count));
-	}
-	AddTag(sn);
-}	
-
-CEC_PartFile_Tag::CEC_PartFile_Tag(CPartFile *file, EC_DETAIL_LEVEL detail_level, bool detail)
+CEC_PartFile_Tag::CEC_PartFile_Tag(const CPartFile *file, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap)
 :
-CECTag(EC_TAG_PARTFILE, file->GetFileHash())
+CEC_SharedFile_Tag(file, detail_level, valuemap, EC_TAG_PARTFILE)
 {
-	AddTag(CECTag(EC_TAG_PARTFILE_STATUS, file->GetStatus()));
+	AddTag(EC_TAG_PARTFILE_STATUS, file->GetStatus(), valuemap);
+	AddTag(EC_TAG_PARTFILE_STOPPED, file->IsStopped(), valuemap);
 
-	AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT, file->GetSourceCount()));
-	AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT, file->GetNotCurrentSourcesCount()));
-	AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT_XFER, file->GetTransferingSrcCount()));
-	AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT_A4AF, file->GetSrcA4AFCount()));
+	AddTag(EC_TAG_PARTFILE_SOURCE_COUNT, file->GetSourceCount(), valuemap);
+	AddTag(EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT, file->GetNotCurrentSourcesCount(), valuemap);
+	AddTag(EC_TAG_PARTFILE_SOURCE_COUNT_XFER, file->GetTransferingSrcCount(), valuemap);
+	AddTag(EC_TAG_PARTFILE_SOURCE_COUNT_A4AF, file->GetSrcA4AFCount(), valuemap);
 		
-	if ( (file->GetTransferingSrcCount() > 0) || (detail_level != EC_DETAIL_UPDATE) ) {
+	if ( (file->GetTransferingSrcCount() > 0) || (detail_level != EC_DETAIL_UPDATE) || valuemap) {
 		
-		AddTag(CECTag(EC_TAG_PARTFILE_SIZE_XFER, file->GetTransferred()));
-		AddTag(CECTag(EC_TAG_PARTFILE_SIZE_DONE, file->GetCompletedSize()));
-		AddTag(CECTag(EC_TAG_PARTFILE_SPEED, (uint64)(file->GetKBpsDown()*1024)));
+		AddTag(EC_TAG_PARTFILE_SIZE_XFER, file->GetTransferred(), valuemap);
+		AddTag(EC_TAG_PARTFILE_SIZE_DONE, file->GetCompletedSize(), valuemap);
+		AddTag(EC_TAG_PARTFILE_SPEED, (uint64_t)(file->GetKBpsDown()*1024), valuemap);
 	}
 	
-	AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint64)(file->IsAutoDownPriority() ? 
-		file->GetDownPriority() + 10 : file->GetDownPriority())));
-
-	AddTag(CECTag(EC_TAG_PARTFILE_CAT, file->GetCategory()));
-	AddTag(CECTag(EC_TAG_PARTFILE_LAST_SEEN_COMP, (uint64)file->lastseencomplete));
-
-	if (detail) {
-		Detail_Tag(file);
-	}
-	
-	if (file->m_CommentUpdated) {
-		// Tag for comments
-		CECTag sc(EC_TAG_PARTFILE_COMMENTS, (uint64) 0);
-	
-		const FileRatingList & list = file->GetRatingAndComments();
-		for (FileRatingList::const_iterator it = list.begin(); it != list.end(); ++it) {
-			// Tag children are evaluated by index, not by name
-			sc.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, it->UserName));
-			sc.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, it->FileName));
-			sc.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, (uint64) it->Rating));
-			sc.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, it->Comment));
-		}
-		AddTag(sc);
+	AddTag(EC_TAG_PARTFILE_PRIO, (file->IsAutoDownPriority() ? 
+		file->GetDownPriority() + 10 : file->GetDownPriority()), valuemap);
+
+	AddTag(EC_TAG_PARTFILE_CAT, file->GetCategory(), valuemap);
+	AddTag(EC_TAG_PARTFILE_LAST_SEEN_COMP, file->lastseencomplete, valuemap);
+	AddTag(EC_TAG_PARTFILE_LAST_RECV, file->GetLastChangeDatetime(), valuemap);
+	AddTag(EC_TAG_PARTFILE_DOWNLOAD_ACTIVE, file->GetDlActiveTime(), valuemap);
+	AddTag(EC_TAG_PARTFILE_AVAILABLE_PARTS, file->GetAvailablePartCount(), valuemap);
+
+	AddTag(EC_TAG_PARTFILE_LOST_CORRUPTION, file->GetLostDueToCorruption(), valuemap);
+	AddTag(EC_TAG_PARTFILE_GAINED_COMPRESSION, file->GetGainDueToCompression(), valuemap);
+	AddTag(EC_TAG_PARTFILE_SAVED_ICH, file->TotalPacketsSavedDueToICH(), valuemap);
+	AddTag(EC_TAG_PARTFILE_A4AFAUTO, file->IsA4AFAuto(), valuemap);
+
+	// Tag for comments
+	CECEmptyTag sc(EC_TAG_PARTFILE_COMMENTS);
+
+	FileRatingList list;
+	file->GetRatingAndComments(list);
+	for (FileRatingList::const_iterator it = list.begin(); it != list.end(); ++it) {
+		// Tag children are evaluated by index, not by name
+		sc.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, it->UserName));
+		sc.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, it->FileName));
+		sc.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, (uint64) it->Rating));
+		sc.AddTag(CECTag(EC_TAG_PARTFILE_COMMENTS, it->Comment));
 	}
+	AddTag(sc, valuemap);
 
 	if (detail_level == EC_DETAIL_UPDATE) {
 		return;
 	}
-	
-	AddTag(CECTag(EC_TAG_PARTFILE_NAME,file->GetFileName().GetPrintable()));
-
-	long l;
-	if (file->GetPartMetFileName().RemoveAllExt().GetRaw().ToLong(&l)) {
-		AddTag(CECTag(EC_TAG_PARTFILE_PARTMETID, (uint64)l));
-	}
 
-	AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, file->GetFileSize()));
+	AddTag(EC_TAG_PARTFILE_PARTMETID, file->GetPartMetNumber(), valuemap);
 
-	AddTag(CECTag(EC_TAG_PARTFILE_ED2K_LINK,
-		theApp->CreateED2kLink(file, (theApp->IsConnectedED2K() && !theApp->serverconnect->IsLowID()))));
+	// A4AF sources
+	CECEmptyTag a4afTag(EC_TAG_PARTFILE_A4AF_SOURCES);
+	const CKnownFile::SourceSet& a4afSources = file->GetA4AFList();
+	for (CKnownFile::SourceSet::const_iterator it = a4afSources.begin(); it != a4afSources.end(); it++) {
+		a4afTag.AddTag(CECTag(EC_TAG_ECID, it->ECID()));
+	}
+	AddTag(a4afTag, valuemap);
 }
 
-CEC_SharedFile_Tag::CEC_SharedFile_Tag(const CKnownFile *file, CValueMap &valuemap) : CECTag(EC_TAG_KNOWNFILE, file->GetFileHash())
+CEC_SharedFile_Tag::CEC_SharedFile_Tag(const CKnownFile *file, EC_DETAIL_LEVEL detail_level, 
+									   CValueMap *valuemap, ec_tagname_t name)
+: CECTag(name, file->ECID())
 {
-	valuemap.CreateTag(EC_TAG_KNOWNFILE_REQ_COUNT, file->statistic.GetRequests(), this);
-	valuemap.CreateTag(EC_TAG_KNOWNFILE_REQ_COUNT_ALL, file->statistic.GetAllTimeRequests(), this);
-	valuemap.CreateTag(EC_TAG_KNOWNFILE_ACCEPT_COUNT, file->statistic.GetAccepts(), this);
-	valuemap.CreateTag(EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL, file->statistic.GetAllTimeAccepts(), this);
-	valuemap.CreateTag(EC_TAG_KNOWNFILE_XFERRED, file->statistic.GetTransferred(), this);
-	valuemap.CreateTag(EC_TAG_KNOWNFILE_XFERRED_ALL, file->statistic.GetAllTimeTransferred(), this);
-	valuemap.CreateTag(EC_TAG_KNOWNFILE_AICH_MASTERHASH, file->GetAICHMasterHash(), this);
+	AddTag(EC_TAG_KNOWNFILE_REQ_COUNT, file->statistic.GetRequests(), valuemap);
+	AddTag(EC_TAG_KNOWNFILE_REQ_COUNT_ALL, file->statistic.GetAllTimeRequests(), valuemap);
 	
-	valuemap.CreateTag(EC_TAG_PARTFILE_PRIO,
-		(uint64)(file->IsAutoUpPriority() ? file->GetUpPriority() + 10 : file->GetUpPriority()), this);
-	
-	valuemap.CreateTag(EC_TAG_PARTFILE_NAME, file->GetFileName().GetPrintable(), this);
-	valuemap.CreateTag(EC_TAG_PARTFILE_SIZE_FULL, file->GetFileSize(), this);
-	valuemap.CreateTag(EC_TAG_PARTFILE_ED2K_LINK,
-		theApp->CreateED2kLink(file, (theApp->IsConnectedED2K() && !theApp->serverconnect->IsLowID())), this);
-}
+	AddTag(EC_TAG_KNOWNFILE_ACCEPT_COUNT, file->statistic.GetAccepts(), valuemap);
+	AddTag(EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL, file->statistic.GetAllTimeAccepts(), valuemap);
 
-CEC_SharedFile_Tag::CEC_SharedFile_Tag(const CKnownFile *file, EC_DETAIL_LEVEL detail_level) : CECTag(EC_TAG_KNOWNFILE, file->GetFileHash())
-{
-	AddTag(CECTag(EC_TAG_KNOWNFILE_REQ_COUNT, file->statistic.GetRequests()));
-	AddTag(CECTag(EC_TAG_KNOWNFILE_REQ_COUNT_ALL, file->statistic.GetAllTimeRequests()));
+	AddTag(EC_TAG_KNOWNFILE_XFERRED, file->statistic.GetTransferred(), valuemap);
+	AddTag(EC_TAG_KNOWNFILE_XFERRED_ALL, file->statistic.GetAllTimeTransferred(), valuemap);
+	AddTag(EC_TAG_KNOWNFILE_AICH_MASTERHASH, file->GetAICHMasterHash(), valuemap);
 	
-	AddTag(CECTag(EC_TAG_KNOWNFILE_ACCEPT_COUNT, file->statistic.GetAccepts()));
-	AddTag(CECTag(EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL, file->statistic.GetAllTimeAccepts()));
+	AddTag(EC_TAG_KNOWNFILE_PRIO,
+		(uint8)(file->IsAutoUpPriority() ? file->GetUpPriority() + 10 : file->GetUpPriority()), valuemap);
 
-	AddTag(CECTag(EC_TAG_KNOWNFILE_XFERRED, file->statistic.GetTransferred()));
-	AddTag(CECTag(EC_TAG_KNOWNFILE_XFERRED_ALL, file->statistic.GetAllTimeTransferred()));
-	AddTag(CECTag(EC_TAG_KNOWNFILE_AICH_MASTERHASH, file->GetAICHMasterHash()));
-	
-	AddTag(CECTag(EC_TAG_PARTFILE_PRIO,
-		(uint8)(file->IsAutoUpPriority() ? file->GetUpPriority() + 10 : file->GetUpPriority())));
+	AddTag(EC_TAG_KNOWNFILE_COMPLETE_SOURCES_LOW, file->m_nCompleteSourcesCountLo, valuemap);
+	AddTag(EC_TAG_KNOWNFILE_COMPLETE_SOURCES_HIGH, file->m_nCompleteSourcesCountHi, valuemap);
+	AddTag(EC_TAG_KNOWNFILE_COMPLETE_SOURCES, file->m_nCompleteSourcesCount, valuemap);
+
+	AddTag(EC_TAG_KNOWNFILE_ON_QUEUE, file->GetQueuedCount(), valuemap);
 
 	if (detail_level == EC_DETAIL_UPDATE) {
 			return;
 	}
 	
-	AddTag(CECTag(EC_TAG_PARTFILE_NAME,file->GetFileName().GetPrintable()));
+	AddTag(EC_TAG_PARTFILE_NAME,file->GetFileName().GetPrintable(), valuemap);
+	AddTag(EC_TAG_PARTFILE_HASH, file->GetFileHash(), valuemap);
+	AddTag(EC_TAG_KNOWNFILE_FILENAME, 
+		file->IsPartFile()	? wxString(CFormat(wxT("%s")) % ((CPartFile*)file)->GetPartMetFileName().RemoveExt())
+							: file->GetFilePath().GetPrintable(),
+		valuemap);
+
+	AddTag(EC_TAG_PARTFILE_SIZE_FULL, file->GetFileSize(), valuemap);
 
-	AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, file->GetFileSize()));
+	AddTag(EC_TAG_PARTFILE_ED2K_LINK,
+			theApp->CreateED2kLink(file, (theApp->IsConnectedED2K() && !theApp->serverconnect->IsLowID())), valuemap);
 
-	AddTag(CECTag(EC_TAG_PARTFILE_ED2K_LINK,
-			theApp->CreateED2kLink(file, (theApp->IsConnectedED2K() && !theApp->serverconnect->IsLowID()))));
+	AddTag(EC_TAG_KNOWNFILE_COMMENT, file->GetFileComment(), valuemap);
+	AddTag(EC_TAG_KNOWNFILE_RATING, file->GetFileRating(), valuemap);
 }
 
-CEC_UpDownClient_Tag::CEC_UpDownClient_Tag(const CUpDownClient* client, EC_DETAIL_LEVEL detail_level) :
-	CECTag(EC_TAG_CLIENT, client->GetUserIDHybrid())
+CEC_UpDownClient_Tag::CEC_UpDownClient_Tag(const CUpDownClient* client, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap) :
+	CECTag(EC_TAG_CLIENT, client->ECID())
 {
 	// General
-	AddTag(CECTag(EC_TAG_CLIENT_NAME, client->GetUserName()));
-	AddTag(CECTag(EC_TAG_CLIENT_HASH, client->GetUserHash()));
-	AddTag(CECTag(EC_TAG_CLIENT_SCORE, client->GetScore(false)));
-	AddTag(CECTag(EC_TAG_CLIENT_SOFTWARE, client->GetClientSoft()));
-	AddTag(CECTag(EC_TAG_CLIENT_SOFT_VER_STR, client->GetSoftVerStr()));
-	AddTag(CECTag(EC_TAG_CLIENT_USER_IP, client->GetConnectIP()));
-	AddTag(CECTag(EC_TAG_CLIENT_USER_PORT, client->GetUserPort()));
-	AddTag(CECTag(EC_TAG_CLIENT_FROM, (uint64)client->GetSourceFrom()));
-	AddTag(CECTag(EC_TAG_CLIENT_SERVER_IP, client->GetServerIP()));
-	AddTag(CECTag(EC_TAG_CLIENT_SERVER_PORT, client->GetServerPort()));
-	AddTag(CECTag(EC_TAG_CLIENT_SERVER_NAME, client->GetServerName()));
+	AddTag(CECTag(EC_TAG_CLIENT_NAME, client->GetUserName()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_HASH, client->GetUserHash()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_USER_ID, client->GetUserIDHybrid()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_SCORE, client->GetScore()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_SOFTWARE, client->GetClientSoft()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_SOFT_VER_STR, client->GetSoftVerStr()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_USER_IP, client->GetIP()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_USER_PORT, client->GetUserPort()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_FROM, (uint64)client->GetSourceFrom()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_SERVER_IP, client->GetServerIP()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_SERVER_PORT, client->GetServerPort()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_SERVER_NAME, client->GetServerName()), valuemap);
 	
 	// Transfers to Client
-	AddTag(CECTag(EC_TAG_CLIENT_UP_SPEED, client->GetUploadDatarate()));
-	if (client->GetDownloadState() == DS_DOWNLOADING) {
-		AddTag(CECTag(EC_TAG_CLIENT_DOWN_SPEED, (uint64)(client->GetKBpsDown()*1024.0)));
+	AddTag(CECTag(EC_TAG_CLIENT_UP_SPEED, client->GetUploadDatarate()), valuemap);
+	if (client->GetDownloadState() == DS_DOWNLOADING || valuemap) {
+		AddTag(CECTag(EC_TAG_CLIENT_DOWN_SPEED, (double)(client->GetKBpsDown())), valuemap);
 	}
-	AddTag(CECTag(EC_TAG_CLIENT_UPLOAD_SESSION, client->GetSessionUp()));
-	AddTag(CECTag(EC_TAG_PARTFILE_SIZE_XFER, client->GetTransferredDown()));
-	AddTag(CECTag(EC_TAG_CLIENT_UPLOAD_TOTAL, client->GetUploadedTotal()));
-	AddTag(CECTag(EC_TAG_CLIENT_DOWNLOAD_TOTAL, client->GetDownloadedTotal()));
+	AddTag(CECTag(EC_TAG_CLIENT_UPLOAD_SESSION, client->GetSessionUp()), valuemap);
+	AddTag(CECTag(EC_TAG_PARTFILE_SIZE_XFER, client->GetTransferredDown()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_UPLOAD_TOTAL, client->GetUploadedTotal()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_DOWNLOAD_TOTAL, client->GetDownloadedTotal()), valuemap);
 	
-	AddTag(CECTag(EC_TAG_CLIENT_STATE,
-		uint64((uint16)client->GetDownloadState() | (((uint16)client->GetUploadState()) << 8) )));
-	AddTag(CECTag(EC_TAG_CLIENT_WAIT_TIME, client->GetWaitTime()));
-	AddTag(CECTag(EC_TAG_CLIENT_XFER_TIME, client->GetUpStartTimeDelay()));
-	AddTag(CECTag(EC_TAG_CLIENT_QUEUE_TIME, (uint64)(::GetTickCount() - client->GetWaitStartTime())));
-	AddTag(CECTag(EC_TAG_CLIENT_LAST_TIME, (uint64)(::GetTickCount() - client->GetLastUpRequest())));
-	AddTag(CECTag(EC_TAG_CLIENT_WAITING_POSITION, theApp->uploadqueue->GetWaitingPosition(client)));
+	AddTag(CECTag(EC_TAG_CLIENT_UPLOAD_STATE, client->GetUploadState()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_DOWNLOAD_STATE, client->GetDownloadState()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_IDENT_STATE, (uint64) client->GetCurrentIdentState()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_EXT_PROTOCOL, client->ExtProtocolAvailable()), valuemap);
+	// These are not needed atm. Keep them for now, maybe columns get reintroduced in client view.
+	//AddTag(CECTag(EC_TAG_CLIENT_WAIT_TIME, client->GetWaitTime()), valuemap);
+	//AddTag(CECTag(EC_TAG_CLIENT_XFER_TIME, client->GetUpStartTimeDelay()), valuemap);
+	//AddTag(CECTag(EC_TAG_CLIENT_QUEUE_TIME, (uint64)(::GetTickCount() - client->GetWaitStartTime())), valuemap);
+	//AddTag(CECTag(EC_TAG_CLIENT_LAST_TIME, (uint64)(::GetTickCount() - client->GetLastUpRequest())), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_WAITING_POSITION, client->GetUploadQueueWaitingPosition()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_REMOTE_QUEUE_RANK, client->IsRemoteQueueFull() ? (uint16)0xffff : client->GetRemoteQueueRank()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_OLD_REMOTE_QUEUE_RANK, client->GetOldRemoteQueueRank()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_OBFUSCATION_STATUS, client->GetObfuscationStatus()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_KAD_PORT, client->GetKadPort()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_FRIEND_SLOT, client->GetFriendSlot()), valuemap);
 	
 	if (detail_level == EC_DETAIL_UPDATE) {
-			return;
+		return;
 	}
 	const CKnownFile* file = client->GetUploadFile();
 	if (file) {
-		AddTag(CECTag(EC_TAG_PARTFILE_NAME, file->GetFileName().GetPrintable()));
-		AddTag(CECTag(EC_TAG_KNOWNFILE, file->GetFileHash()));
+		AddTag(CECTag(EC_TAG_PARTFILE_NAME, file->GetFileName().GetPrintable()), valuemap);
+		AddTag(CECTag(EC_TAG_CLIENT_UPLOAD_FILE, file->ECID()), valuemap);
+	} else {
+		AddTag(CECIntTag(EC_TAG_CLIENT_UPLOAD_FILE, 0), valuemap);
 	}
-	
-}
+	const CPartFile* pfile = client->GetRequestFile();
+	AddTag(CECTag(EC_TAG_CLIENT_REQUEST_FILE, pfile ? pfile->ECID() : 0), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_REMOTE_FILENAME, client->GetClientFilename()), valuemap);
 
-CEC_UpDownClient_Tag::CEC_UpDownClient_Tag(const CUpDownClient* client, CValueMap &valuemap) :
-	CECTag(EC_TAG_CLIENT, client->GetUserIDHybrid())
-{
-	// General
-	valuemap.CreateTag(EC_TAG_CLIENT_NAME, client->GetUserName(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_HASH, client->GetUserHash(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_SCORE, client->GetScore(false), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_SOFTWARE, client->GetClientSoft(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_SOFT_VER_STR, client->GetSoftVerStr(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_USER_IP, client->GetConnectIP(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_USER_PORT, client->GetUserPort(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_FROM, (uint64)client->GetSourceFrom(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_SERVER_IP, client->GetServerIP(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_SERVER_PORT, client->GetServerPort(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_SERVER_NAME, client->GetServerName(), this);
-	
-	// Transfers to Client
-	valuemap.CreateTag(EC_TAG_CLIENT_UP_SPEED, client->GetUploadDatarate(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_DOWN_SPEED, (uint64)(client->GetKBpsDown()*1024.0), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_UPLOAD_SESSION, client->GetSessionUp(), this);
-	valuemap.CreateTag(EC_TAG_PARTFILE_SIZE_XFER, client->GetTransferredDown(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_UPLOAD_TOTAL, client->GetUploadedTotal(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_DOWNLOAD_TOTAL, client->GetDownloadedTotal(), this);
-	
-	valuemap.CreateTag(EC_TAG_CLIENT_STATE,
-		uint64((uint16)client->GetDownloadState() | (((uint16)client->GetUploadState()) << 8) ), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_WAIT_TIME, client->GetWaitTime(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_XFER_TIME, client->GetUpStartTimeDelay(), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_QUEUE_TIME, (uint64)(::GetTickCount() - client->GetWaitStartTime()), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_LAST_TIME, (uint64)(::GetTickCount() - client->GetLastUpRequest()), this);
-	valuemap.CreateTag(EC_TAG_CLIENT_WAITING_POSITION, theApp->uploadqueue->GetWaitingPosition(client), this);
-	
-	const CKnownFile* file = client->GetUploadFile();
+	if (detail_level != EC_DETAIL_INC_UPDATE) {
+		return;
+	}
+	AddTag(CECTag(EC_TAG_CLIENT_DISABLE_VIEW_SHARED, client->HasDisabledSharedFiles()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_VERSION, client->GetVersion()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_MOD_VERSION, client->GetClientModString()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_OS_INFO, client->GetClientOSInfo()), valuemap);
+	AddTag(CECTag(EC_TAG_CLIENT_AVAILABLE_PARTS, client->GetAvailablePartCount()), valuemap);
+	if (pfile) {
+		const BitVector & partStatus = client->GetPartStatus();
+		if (partStatus.size() == pfile->GetPartCount()) {
+			if (partStatus.AllTrue()) {
+				// send just an empty tag for a full source
+				AddTag(CECEmptyTag(EC_TAG_CLIENT_PART_STATUS), valuemap);
+			} else {
+				AddTag(CECTag(EC_TAG_CLIENT_PART_STATUS, partStatus.SizeBuffer(), partStatus.GetBuffer()), valuemap);
+			}
+		}
+		AddTag(CECTag(EC_TAG_CLIENT_NEXT_REQUESTED_PART, client->GetNextRequestedPart()), valuemap);
+		AddTag(CECTag(EC_TAG_CLIENT_LAST_DOWNLOADING_PART, client->GetLastDownloadingPart()), valuemap);
+	}
 	if (file) {
-		valuemap.CreateTag(EC_TAG_PARTFILE_NAME, file->GetFileName().GetPrintable(), this);
-		valuemap.CreateTag(EC_TAG_KNOWNFILE, file->GetFileHash(), this);
+		const BitVector & upPartStatus = client->GetUpPartStatus();
+		if (upPartStatus.size() == file->GetPartCount()) {
+			AddTag(CECTag(EC_TAG_CLIENT_UPLOAD_PART_STATUS, upPartStatus.SizeBuffer(), upPartStatus.GetBuffer()), valuemap);
+		}
 	}
-	
 }
 
 //
 // Search reply
 //
-CEC_SearchFile_Tag::CEC_SearchFile_Tag(CSearchFile *file, EC_DETAIL_LEVEL detail_level) : CECTag(EC_TAG_SEARCHFILE, file->GetFileHash())
+CEC_SearchFile_Tag::CEC_SearchFile_Tag(CSearchFile *file, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap) : CECTag(EC_TAG_SEARCHFILE, file->ECID())
 {
-	AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT, file->GetSourceCount()));
-	AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT_XFER, file->GetCompleteSourceCount()));
+	AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT, file->GetSourceCount()), valuemap);
+	AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_COUNT_XFER, file->GetCompleteSourceCount()), valuemap);
+	AddTag(CECTag(EC_TAG_PARTFILE_STATUS, (uint32)file->GetDownloadStatus()), valuemap);
 
 	if (detail_level == EC_DETAIL_UPDATE) {
 			return;
 	}
 
-	AddTag(CECTag(EC_TAG_PARTFILE_NAME, file->GetFileName().GetPrintable()));
-	AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, file->GetFileSize()));
-	if ( theApp->sharedfiles->GetFileByID(file->GetFileHash()) ) {
-		AddTag(CECEmptyTag(EC_TAG_KNOWNFILE));
+	AddTag(CECTag(EC_TAG_PARTFILE_NAME, file->GetFileName().GetPrintable()), valuemap);
+	AddTag(CECTag(EC_TAG_PARTFILE_SIZE_FULL, file->GetFileSize()), valuemap);
+	AddTag(EC_TAG_PARTFILE_HASH, file->GetFileHash(), valuemap);
+	if (file->GetParent()) {
+		AddTag(EC_TAG_SEARCH_PARENT, file->GetParent()->ECID(), valuemap);
 	}
 }
 
-CEC_SearchFile_Tag::CEC_SearchFile_Tag(CSearchFile *file, CValueMap &valuemap) : CECTag(EC_TAG_SEARCHFILE, file->GetFileHash())
+//
+// Friend
+//
+CEC_Friend_Tag::CEC_Friend_Tag(const CFriend* Friend, CValueMap* valuemap) : CECTag(EC_TAG_FRIEND, Friend->ECID())
 {
-	valuemap.CreateTag(EC_TAG_PARTFILE_SOURCE_COUNT, file->GetSourceCount(), this);
-
-	valuemap.CreateTag(EC_TAG_PARTFILE_SOURCE_COUNT_XFER, file->GetCompleteSourceCount(), this);
-
-	valuemap.CreateTag(EC_TAG_PARTFILE_NAME, file->GetFileName().GetPrintable(), this);
-
-	valuemap.CreateTag(EC_TAG_PARTFILE_SIZE_FULL, file->GetFileSize(), this);
-
-	if ( theApp->sharedfiles->GetFileByID(file->GetFileHash()) ) {
-		AddTag(CECEmptyTag(EC_TAG_KNOWNFILE));
-	}
+	AddTag(EC_TAG_FRIEND_NAME,	Friend->GetName(), valuemap);
+	AddTag(EC_TAG_FRIEND_HASH,	Friend->GetUserHash(), valuemap);
+	AddTag(EC_TAG_FRIEND_IP,	Friend->GetIP(), valuemap);
+	AddTag(EC_TAG_FRIEND_PORT,	Friend->GetPort(), valuemap);
+	const CClientRef& linkedClient = Friend->GetLinkedClient();
+	AddTag(EC_TAG_FRIEND_CLIENT, linkedClient.IsLinked() ? linkedClient.ECID() : 0, valuemap);
 }
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/ECSpecialMuleTags.cpp -> aMule-2.3.1.tar.bz2/src/ECSpecialMuleTags.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 Kry ( elkry@sourceforge.net / http://www.amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Angel Vidal ( kry@amule.org )
+// 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
@@ -58,14 +58,24 @@
 	AddTag(CECTag(EC_TAG_CATEGORY_TITLE, name));
 }
 
-void CEC_Category_Tag::Apply()
+bool CEC_Category_Tag::Apply()
 {
-	theApp->glob_prefs->UpdateCategory(GetInt(), Name(), CPath(Path()), Comment(), Color(), Prio());
+	bool ret = theApp->glob_prefs->UpdateCategory(GetInt(), Name(), CPath(Path()), Comment(), Color(), Prio());
+	if (!ret) {
+		GetTagByName(EC_TAG_CATEGORY_PATH)->SetStringData(theApp->glob_prefs->GetCatPath(GetInt()).GetRaw());
+	}
+	return ret;
 }
 
-void CEC_Category_Tag::Create()
+bool CEC_Category_Tag::Create()
 {
-	theApp->glob_prefs->CreateCategory(Name(), CPath(Path()), Comment(), Color(), Prio());
+	Category_Struct * category = NULL;
+	bool ret = theApp->glob_prefs->CreateCategory(category, Name(), CPath(Path()), Comment(), Color(), Prio());
+	if (!ret) {
+		GetTagByName(EC_TAG_CATEGORY_PATH)->SetStringData(theApp->glob_prefs->GetCatPath(
+			theApp->glob_prefs->GetCatCount() - 1).GetRaw());
+	}
+	return ret;
 }
 
 CEC_Prefs_Packet::CEC_Prefs_Packet(uint32 selection, EC_DETAIL_LEVEL pref_details, EC_DETAIL_LEVEL cat_details) : CECPacket(EC_OP_SET_PREFERENCES, pref_details)
@@ -86,6 +96,7 @@
 		user_prefs.AddTag(CECTag(EC_TAG_USER_NICK, thePrefs::GetUserNick()));
 		user_prefs.AddTag(CECTag(EC_TAG_USER_HASH, thePrefs::GetUserHash()));
 		user_prefs.AddTag(CECTag(EC_TAG_USER_HOST, thePrefs::GetYourHostname()));
+		user_prefs.AddTag(CECTag(EC_TAG_GENERAL_CHECK_NEW_VERSION, thePrefs::GetCheckNewVersion()));
 		AddTag(user_prefs);
 	}
 
@@ -230,9 +241,6 @@
 		if (thePrefs::GetNewAutoUp()) {
 			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_NEW_AUTO_UL_PRIO));
 		}
-		if (thePrefs::TransferFullChunks()) {
-			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_UL_FULL_CHUNKS));
-		}
 		if (thePrefs::StartNextFile()) {
 			filePrefs.AddTag(CECEmptyTag(EC_TAG_FILES_START_NEXT_PAUSED));
 		}
@@ -270,7 +278,17 @@
 	}
 
 	if (selection & EC_PREFS_DIRECTORIES) {
-		//#warning TODO
+		CECEmptyTag dirPrefs(EC_TAG_PREFS_DIRECTORIES);
+		dirPrefs.AddTag(CECTag(EC_TAG_DIRECTORIES_INCOMING, thePrefs::GetIncomingDir().GetRaw()));
+		dirPrefs.AddTag(CECTag(EC_TAG_DIRECTORIES_TEMP, thePrefs::GetTempDir().GetRaw()));
+		uint32 sharedDirs = theApp->glob_prefs->shareddir_list.size();
+		CECTag dirtag(EC_TAG_DIRECTORIES_SHARED, sharedDirs);
+		for (size_t i = 0; i < sharedDirs; i++) {
+			dirtag.AddTag(CECTag(EC_TAG_STRING, theApp->glob_prefs->shareddir_list[i].GetRaw()));
+		}
+		dirPrefs.AddTag(dirtag);
+		dirPrefs.AddTag(CECTag(EC_TAG_DIRECTORIES_SHARE_HIDDEN, thePrefs::ShareHiddenFiles()));
+		AddTag(dirPrefs);
 	}
 
 	if (selection & EC_PREFS_STATISTICS) {
@@ -370,6 +388,9 @@
 		if ((oneTag = thisTab->GetTagByName(EC_TAG_USER_HOST)) != NULL) {
 			thePrefs::SetYourHostname(oneTag->GetStringData());
 		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_GENERAL_CHECK_NEW_VERSION)) != NULL) {
+			thePrefs::SetCheckNewVersion(oneTag->GetInt() != 0);
+		}
 	}
 
 	//
@@ -476,7 +497,6 @@
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetNewAutoDown, EC_TAG_FILES_NEW_AUTO_DL_PRIO);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetPreviewPrio, EC_TAG_FILES_PREVIEW_PRIO);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetNewAutoUp, EC_TAG_FILES_NEW_AUTO_UL_PRIO);
-		ApplyBoolean(use_tag, thisTab, thePrefs::SetTransferFullChunks, EC_TAG_FILES_UL_FULL_CHUNKS);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetStartNextFile, EC_TAG_FILES_START_NEXT_PAUSED);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetStartNextFileSame, EC_TAG_FILES_RESUME_SAME_CAT);
 		ApplyBoolean(use_tag, thisTab, thePrefs::SetSrcSeedsOn, EC_TAG_FILES_SAVE_SOURCES);
@@ -503,7 +523,19 @@
 	}
 
 	if ((thisTab = GetTagByName(EC_TAG_PREFS_DIRECTORIES)) != NULL) {
-		//#warning TODO
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_DIRECTORIES_INCOMING)) != NULL) {
+			thePrefs::SetIncomingDir(CPath(oneTag->GetStringData()));
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_DIRECTORIES_TEMP)) != NULL) {
+			thePrefs::SetTempDir(CPath(oneTag->GetStringData()));
+		}
+		if ((oneTag = thisTab->GetTagByName(EC_TAG_DIRECTORIES_SHARED)) != NULL) {
+			theApp->glob_prefs->shareddir_list.clear();
+			for (CECTag::const_iterator it = oneTag->begin(); it != oneTag->end(); it++) {
+				theApp->glob_prefs->shareddir_list.push_back(CPath(it->GetStringData()));
+			}
+		}
+		ApplyBoolean(use_tag, thisTab, thePrefs::SetShareHiddenFiles, EC_TAG_DIRECTORIES_SHARE_HIDDEN);
 	}
 
 	if ((thisTab = GetTagByName(EC_TAG_PREFS_STATISTICS)) != NULL) {

aMule-2.2.6.tar.bz2/src/ED2KLink.cpp -> aMule-2.3.1.tar.bz2/src/ED2KLink.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -35,7 +35,7 @@
 
 #include "MemFile.h"			// Needed for CMemFile
 #include "NetworkFunctions.h"	// Needed for Uint32toStringIP
-
+#include <common/Format.h>		// Needed for CFormat
 
 
 CED2KLink::CED2KLink( LinkType type )
@@ -58,14 +58,14 @@
 CED2KLink* CED2KLink::CreateLinkFromUrl(const wxString& link)
 {
 	wxRegEx re_type(wxT("ed2k://\\|(file|server|serverlist)\\|.*/"), wxRE_ICASE | wxRE_DEFAULT);
-	wxCHECK(re_type.IsValid(), NULL);
+	{ wxCHECK(re_type.IsValid(), NULL); }
 
 	if (!re_type.Matches(link)) {
 		throw wxString(wxT("Not a valid ed2k-URI"));
 	}
 
 	wxString type = re_type.GetMatch(link, 1).MakeLower();
-	wxCHECK(type.Length(), NULL);
+	{ wxCHECK(type.Length(), NULL); }
 	
 	if (type == wxT("file")) {
 		return new CED2KFileLink(link);
@@ -158,14 +158,18 @@
 	  m_bAICHHashValid(false)
 {
 	// Start tokenizing after the "ed2k:://|file|" part of the link
-	wxStringTokenizer tokens(link.Mid(13), wxT("|/"), wxTOKEN_RET_EMPTY_ALL);
+	wxStringTokenizer tokens(link, wxT("|"), wxTOKEN_RET_EMPTY_ALL);
 
 	// Must at least be ed2k://|file|NAME|SIZE|HASH|/
-	if (tokens.CountTokens() < 5) {
+	if (tokens.CountTokens() < 5 
+		|| tokens.GetNextToken() != wxT("ed2k://")
+		|| tokens.GetNextToken() != wxT("file")) {
 		throw wxString(wxT("Not a valid file link"));
 	}
 
 	m_name = UnescapeHTML(tokens.GetNextToken().Strip(wxString::both));
+	// We don't want a path in the name.
+	m_name.Replace(wxT("/"), wxT("_"));
 	
 	// Note that StrToULong returns ULONG_MAX if the value is
 	// too large to be contained in a unsigned long, which means
@@ -173,7 +177,7 @@
 	wxString size = tokens.GetNextToken().Strip(wxString::both);
 	m_size = StrToULongLong(size);
 	if ((m_size == 0) || (m_size > MAX_FILE_SIZE)) {
-		throw wxString::Format(wxT("Invalid file size %i"), m_size);
+		throw wxString(CFormat(wxT("Invalid file size %i")) % m_size);
 	}
 	
 	if (!m_hash.Decode(tokens.GetNextToken().Strip(wxString::both))) {
@@ -276,7 +280,7 @@
 
 wxString CED2KFileLink::GetLink() const
 {
-	return wxT("ed2k://|file|") + m_name + wxString::Format(wxT("|%u|"), m_size) + m_hash.Encode() + wxT("|/");
+	return CFormat(wxT("ed2k://|file|%s|%u|%s|/")) % m_name % m_size % m_hash.Encode();
 }

aMule-2.2.6.tar.bz2/src/ED2KLink.h -> aMule-2.3.1.tar.bz2/src/ED2KLink.h Changed

aMule-2.2.6.tar.bz2/src/ED2KLinkParser.cpp -> aMule-2.3.1.tar.bz2/src/ED2KLinkParser.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003-2009 Madcat ( madcat@_@users.sf.net / sharedaemon.sf.net )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Alo Sarv ( madcat_@users.sourceforge.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -24,7 +24,7 @@
 //
 
 const int versionMajor		= 1;
-const int versionMinor		= 4;
+const int versionMinor		= 5;
 const int versionRevision	= 1;
 
 #include <cstdlib>
@@ -214,7 +214,7 @@
 		}
 	}
 
-	return str.length();
+	return str.length() > 0;
 }
 
 
@@ -421,6 +421,7 @@
 {
 	bool errors = false;
 	string config_path;
+	string category = "";
 	for ( int i = 1; i < argc; i++ ) {
 		string arg = strip( Unescape( string( argv[i] ) ) );
 
@@ -444,6 +445,7 @@
 			string type = arg.substr( 8, arg.find( '|', 9 ) - 8 );
 		
 			if ( (type == "file") && checkFileLink( arg ) ) {
+				arg += category;
 				writeLink( arg, config_path );
 			} else if ( (type == "server") && checkServerLink( arg ) ) {
 				writeLink( arg, config_path );
@@ -471,23 +473,39 @@
 				<< "    --help, -h              Prints this help.\n"
 				<< "    --config-dir, -c        Specifies the aMule configuration directory.\n"
 				<< "    --version, -v           Displays version info.\n\n"
+				<< "    --category, -t          Add Link to category number.\n"
 				<< "    magnet:?                Causes the file to be queued for download.\n"
 				<< "    ed2k://|file|           Causes the file to be queued for download.\n"
 				<< "    ed2k://|server|         Causes the server to be listed or updated.\n"
 				<< "    ed2k://|serverlist|     Causes aMule to update the current serverlist.\n\n"
+				<< "    --list, -l              Show all links of an emulecollection\n"
 				<< "    --emulecollection, -e   Loads all links of an emulecollection\n\n"
 				<< "*** NOTE: Option order is important! ***\n"
 				<< std::endl;
 			
 		} else if (arg == "-v" || arg == "--version") {
 			std::cout << getVersion() << std::endl;
-		} else if (arg == "-e" || arg == "--emulecollection") {
+		} else if (arg == "-t" || arg == "--category") {
+			if (i < argc - 1) {
+				if ((category == "" ) && (0 != atoi(argv[++i]))) {
+					category = ':';
+					category += argv[i];
+				}
+			} else {
+				std::cerr << "Missing mandatory argument for " << arg << std::endl;
+				errors = true;
+			}
+		} else if (arg == "-e" || arg == "--emulecollection" || arg == "-l" || arg == "--list") {
+			bool listOnly = (arg == "-l" || arg == "--list");
 			if (i < argc - 1) {
 				CMuleCollection my_collection;
 				if (my_collection.Open( /* emulecollection file */ argv[++i] ))
 				{
 					for(size_t e = 0;e < my_collection.GetFileCount();e++)
-						writeLink( my_collection.GetEd2kLink(e), config_path );
+						if (listOnly)
+							std::cout << my_collection.GetEd2kLink(e) << std::endl;
+						else
+							writeLink( my_collection.GetEd2kLink(e), config_path );
 				} else {
 					std::cerr << "Invalid emulecollection file: " << argv[i] << std::endl;
 					errors = true;
@@ -496,7 +514,6 @@
 				std::cerr << "Missing mandatory argument for " << arg << std::endl;
 				errors = true;
 			}
-			std::cout << getVersion() << std::endl;
 		} else {
 			std::cerr << "Bad parameter value:\n\t" << arg << "\n" << std::endl;
 			errors = true;

aMule-2.2.6.tar.bz2/src/EMSocket.cpp -> aMule-2.3.1.tar.bz2/src/EMSocket.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -35,9 +35,10 @@
 #include "UploadBandwidthThrottler.h"
 #include "Logger.h"
 #include "Preferences.h"
+#include "ScopedPtr.h"
 
 
-const uint32 MAX_SIZE = 2000000;
+const uint32 MAX_PACKET_SIZE = 2000000;
 
 CEMSocket::CEMSocket(const CProxyData *ProxyData)
 	: CEncryptedStreamSocket(wxSOCKET_NOWAIT, ProxyData)
@@ -132,14 +133,8 @@
 {
 	wxMutexLocker lock(m_sendLocker);
 
-	{
-		CPacketQueue::iterator it = m_control_queue.begin();
-		for (; it != m_control_queue.end(); ++it) {
-			delete *it;
-		}
-		m_control_queue.clear();
-	}
-	
+	DeleteContents(m_control_queue);
+
 	{
 		CStdPacketQueue::iterator it = m_standard_queue.begin();
 		for (; it != m_standard_queue.end(); ++it) {
@@ -157,7 +152,7 @@
 	pendingHeaderSize = 0;
 
 	// Download partial packet
-	delete pendingPacket;
+	delete[] pendingPacket;
 	pendingPacket = NULL;
 	pendingPacketSize = 0;
 
@@ -188,9 +183,6 @@
 
 void CEMSocket::OnReceive(int nErrorCode)
 {
-	// the 2 meg size was taken from another place
-	static byte GlobalReadBuffer[MAX_SIZE];
-
 	if(nErrorCode) {
 		uint32 error = LastError(); 
 		if (error != wxSOCKET_WOULDBLOCK) {
@@ -206,144 +198,95 @@
 		byConnected = ES_CONNECTED; // ES_DISCONNECTED, ES_NOTCONNECTED, ES_CONNECTED
 	}
 
-	// CPU load improvement
-	if(downloadLimitEnable == true && downloadLimit == 0){
-		pendingOnReceive = true;
-		return;
-	}
-
-	// Remark: an overflow can not occur here
-	uint32 readMax = sizeof(GlobalReadBuffer) - pendingHeaderSize; 
-	if((downloadLimitEnable == true) && (readMax > downloadLimit)) {
-		readMax = downloadLimit;
-	}
-
-	
-	// We attempt to read up to 2 megs at a time (minus whatever is in our internal read buffer)
 	uint32 ret;
-
-	{
-		wxMutexLocker lock(m_sendLocker);
-		ret = Read(GlobalReadBuffer + pendingHeaderSize, readMax);
-		if (Error() || (ret == 0)) {
-			if (LastError() == wxSOCKET_WOULDBLOCK) {
-				pendingOnReceive = true;
-			}
+	do {
+		// CPU load improvement
+		if (downloadLimitEnable && downloadLimit == 0){
+			pendingOnReceive = true;
 			return;
 		}
-	}
-	
-	
-	// Bandwidth control
-	if(downloadLimitEnable == true){
-		// Update limit
-		downloadLimit -= GetRealReceivedBytes();
-	}
-
-	// CPU load improvement
-	// Detect if the socket's buffer is empty (or the size did match...)
-	pendingOnReceive = (ret == readMax);
-
-	// Copy back the partial header into the global read buffer for processing
-	if(pendingHeaderSize > 0) {
-  		memcpy(GlobalReadBuffer, pendingHeader, pendingHeaderSize);
-		ret += pendingHeaderSize;
-		pendingHeaderSize = 0;
-	}
-
-	byte* rptr = GlobalReadBuffer; // floating index initialized with begin of buffer
-	const byte* rend = GlobalReadBuffer + ret; // end of buffer
-
-	// Loop, processing packets until we run out of them
-	while((rend - rptr >= PACKET_HEADER_SIZE) ||
-	      ((pendingPacket != NULL) && (rend - rptr > 0 ))){ 
-
-		// Two possibilities here: 
-		//
-		// 1. There is no pending incoming packet
-		// 2. There is already a partial pending incoming packet
-		//
-		// It's important to remember that emule exchange two kinds of packet
-		// - The control packet
-		// - The data packet for the transport of the block
-		// 
-		// The biggest part of the traffic is done with the data packets. 
-		// The default size of one block is 10240 bytes (or less if compressed), but the
-		// maximal size for one packet on the network is 1300 bytes. It's the reason
-		// why most of the Blocks are splitted before to be sent. 
-		//
-		// Conclusion: When the download limit is disabled, this method can be at least 
-		// called 8 times (10240/1300) by the lower layer before a splitted packet is 
-		// rebuild and transferred to the above layer for processing.
-		//
-		// The purpose of this algorithm is to limit the amount of data exchanged between buffers
-
-		if(pendingPacket == NULL){
-			pendingPacket = new CPacket(rptr); // Create new packet container. 
-			rptr += 6;                        // Only the header is initialized so far
-
-			// Bugfix We still need to check for a valid protocol
-			// Remark: the default eMule v0.26b had removed this test......
-			switch (pendingPacket->GetProtocol()){
-				case OP_EDONKEYPROT:
-				case OP_PACKEDPROT:
-				case OP_EMULEPROT:
-				case OP_ED2KV2HEADER:
-				case OP_ED2KV2PACKEDPROT:
-					break;
-				default:
-					delete pendingPacket;
-					pendingPacket = NULL;
-					OnError(ERR_WRONGHEADER);
-					return;
-			}
 
-			// Security: Check for buffer overflow (2MB)
-			if(pendingPacket->GetPacketSize() > sizeof(GlobalReadBuffer)) {
-				delete pendingPacket;
-				pendingPacket = NULL;
+		uint32 readMax;
+		byte *buf;
+		if (pendingHeaderSize < PACKET_HEADER_SIZE) {
+			delete[] pendingPacket;
+			pendingPacket = NULL;
+			buf = pendingHeader + pendingHeaderSize;
+			readMax = PACKET_HEADER_SIZE - pendingHeaderSize;
+		} else if (pendingPacket == NULL) {
+			pendingPacketSize = 0;
+			readMax = CPacket::GetPacketSizeFromHeader(pendingHeader);
+			if (readMax > MAX_PACKET_SIZE) {
+				pendingHeaderSize = 0;
 				OnError(ERR_TOOBIG);
 				return;
 			}
-
-			// Init data buffer
-			pendingPacket->AllocDataBuffer();
-			pendingPacketSize = 0;
+			pendingPacket = new byte[readMax + 1];
+			buf = pendingPacket;
+		} else {
+			buf = pendingPacket + pendingPacketSize;
+			readMax = CPacket::GetPacketSizeFromHeader(pendingHeader) - pendingPacketSize;
 		}
 
-		// Bytes ready to be copied into packet's internal buffer
-		wxASSERT(rptr <= rend);
-		uint32 toCopy = ((pendingPacket->GetPacketSize() - pendingPacketSize) < (uint32)(rend - rptr)) ? 
-					(pendingPacket->GetPacketSize() - pendingPacketSize) : (uint32)(rend - rptr);
+		if (downloadLimitEnable && readMax > downloadLimit) {
+			readMax = downloadLimit;
+		}
 
-		// Copy Bytes from Global buffer to packet's internal buffer
-		pendingPacket->CopyToDataBuffer(pendingPacketSize, rptr, toCopy);
-		pendingPacketSize += toCopy;
-		rptr += toCopy;
-		
-		// Check if packet is complet
-		wxASSERT(pendingPacket->GetPacketSize() >= pendingPacketSize);
-		if(pendingPacket->GetPacketSize() == pendingPacketSize) {
-			// Process packet
-			bool bPacketResult = PacketReceived(pendingPacket);
-			delete pendingPacket;	
-			pendingPacket = NULL;
-			pendingPacketSize = 0;
-			
-			if (!bPacketResult) {
+		ret = 0;
+		if (readMax) {
+			wxMutexLocker lock(m_sendLocker);
+			ret = Read(buf, readMax);
+			if (Error() || (ret == 0)) {
+				if (LastError() == wxSOCKET_WOULDBLOCK) {
+					pendingOnReceive = true;
+				}
 				return;
 			}
 		}
-	}
 
-	// Finally, if there is any data left over, save it for next time
-	wxASSERT(rptr <= rend);
-	wxASSERT(rend - rptr < PACKET_HEADER_SIZE);
-	if(rptr != rend) {
-		// Keep the partial head
-		pendingHeaderSize = rend - rptr;
-		memcpy(pendingHeader, rptr, pendingHeaderSize);
-	}	
+		// Bandwidth control
+		if (downloadLimitEnable) {
+			// Update limit
+			if (ret >= downloadLimit) {
+				downloadLimit = 0;
+			} else {
+				downloadLimit -= ret;
+			}
+		}
+
+		// CPU load improvement
+		// Detect if the socket's buffer is empty (or the size did match...)
+		pendingOnReceive = (ret == readMax);
+
+		if (pendingHeaderSize >= PACKET_HEADER_SIZE) {
+			pendingPacketSize += ret;
+			if (pendingPacketSize >= CPacket::GetPacketSizeFromHeader(pendingHeader)) {
+				CScopedPtr<CPacket> packet(new CPacket(pendingHeader, pendingPacket));
+				pendingPacket = NULL;
+				pendingPacketSize = 0;
+				pendingHeaderSize = 0;
+
+				// Bugfix We still need to check for a valid protocol
+				// Remark: the default eMule v0.26b had removed this test......
+				switch (packet->GetProtocol()){
+					case OP_EDONKEYPROT:
+					case OP_PACKEDPROT:
+					case OP_EMULEPROT:
+					case OP_ED2KV2HEADER:
+					case OP_ED2KV2PACKEDPROT:
+						break;
+					default:
+						OnError(ERR_WRONGHEADER);
+						return;
+				}
+
+				// Process packet
+				PacketReceived(packet.get());
+			}
+		} else {
+			pendingHeaderSize += ret;
+		}
+	} while (ret && pendingHeaderSize >= PACKET_HEADER_SIZE);
 }
 
 
@@ -533,7 +476,7 @@
     uint32 sentStandardPacketBytesThisCall = 0;
     uint32 sentControlPacketBytesThisCall = 0;
 	
-    if(byConnected == ES_CONNECTED && IsEncryptionLayerReady() && !(m_bBusy && onlyAllowedToSendControlPacket)) {
+    if (byConnected == ES_CONNECTED && IsEncryptionLayerReady() && (!m_bBusy || onlyAllowedToSendControlPacket)) {
 
 		//printf("* Internal attemptto send on %p\n", this);
 		
@@ -551,10 +494,10 @@
 		while(sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall < maxNumberOfBytesToSend && anErrorHasOccured == false && // don't send more than allowed. Also, there should have been no error in earlier loop
 			  (!m_control_queue.empty() || !m_standard_queue.empty() || sendbuffer != NULL) && // there must exist something to send
 			  (onlyAllowedToSendControlPacket == false || // this means we are allowed to send both types of packets, so proceed
-			   sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall > 0 && (sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall) % minFragSize != 0 ||
-			   sendbuffer == NULL && !m_control_queue.empty() || // There's a control packet in queue, and we are not currently sending anything, so we will handle the control packet next
-			   sendbuffer != NULL && m_currentPacket_is_controlpacket == true || // We are in the progress of sending a control packet. We are always allowed to send those
-			   sendbuffer != NULL && m_currentPacket_is_controlpacket == false && bWasLongTimeSinceSend && !m_control_queue.empty() && m_standard_queue.empty() && (sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall) < minFragSize // We have waited to long to clean the current packet (which may be a standard packet that is in the way). Proceed no matter what the value of onlyAllowedToSendControlPacket.
+			   (sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall > 0 && (sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall) % minFragSize != 0) ||
+			   (sendbuffer == NULL && !m_control_queue.empty()) || // There's a control packet in queue, and we are not currently sending anything, so we will handle the control packet next
+			   (sendbuffer != NULL && m_currentPacket_is_controlpacket == true) || // We are in the progress of sending a control packet. We are always allowed to send those
+			   (sendbuffer != NULL && m_currentPacket_is_controlpacket == false && bWasLongTimeSinceSend && !m_control_queue.empty() && m_standard_queue.empty() && (sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall) < minFragSize) // We have waited to long to clean the current packet (which may be a standard packet that is in the way). Proceed no matter what the value of onlyAllowedToSendControlPacket.
 			  )
 			 ) {
 	
@@ -579,8 +522,8 @@
 				} else {
 					// Just to be safe. Shouldn't happen?
 					// if we reach this point, then there's something wrong with the while condition above!
-					wxASSERT(0);
-					AddDebugLogLineM(true, logGeneral, wxT("EMSocket: Couldn't get a new packet! There's an error in the first while condition in EMSocket::Send()"));
+					wxFAIL;
+					AddDebugLogLineC(logGeneral, wxT("EMSocket: Couldn't get a new packet! There's an error in the first while condition in EMSocket::Send()"));
 	
 					SocketSentBytes returnVal = { true, sentStandardPacketBytesThisCall, sentControlPacketBytesThisCall };
 					return returnVal;
@@ -604,7 +547,7 @@
 				   (
 					onlyAllowedToSendControlPacket == false || // this means we are allowed to send both types of packets, so proceed
 					m_currentPacket_is_controlpacket ||
-					bWasLongTimeSinceSend && (sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall) < minFragSize ||
+					(bWasLongTimeSinceSend && (sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall) < minFragSize) ||
 					(sentStandardPacketBytesThisCall + sentControlPacketBytesThisCall) % minFragSize != 0
 				   ) &&
 				   anErrorHasOccured == false) {
@@ -684,7 +627,7 @@
 		}
 	}
 	
-	if(onlyAllowedToSendControlPacket && (!m_control_queue.empty() || sendbuffer != NULL && m_currentPacket_is_controlpacket)) {
+	if(onlyAllowedToSendControlPacket && (!m_control_queue.empty() || (sendbuffer != NULL && m_currentPacket_is_controlpacket))) {
 		// enter control packet send queue
 		// we might enter control packet queue several times for the same package,
 		// but that costs very little overhead. Less overhead than trying to make sure

aMule-2.2.6.tar.bz2/src/EMSocket.h -> aMule-2.3.1.tar.bz2/src/EMSocket.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -40,7 +40,7 @@
 #define	ES_CONNECTED		0x01
 
 
-const sint32 PACKET_HEADER_SIZE	= 6;
+const uint32 PACKET_HEADER_SIZE	= 6;
 
 
 class CEMSocket : public CEncryptedStreamSocket, public ThrottledFileSocket
@@ -50,7 +50,6 @@
 	virtual ~CEMSocket();
 	
 	virtual void 	SendPacket(CPacket* packet, bool delpacket = true, bool controlpacket = true, uint32 actualPayloadSize = 0);
-    bool    HasQueues();
 	bool	IsConnected() { return byConnected==ES_CONNECTED;};
 	uint8	GetConState()	{return byConnected;}
 	void	SetDownloadLimit(uint32 limit);
@@ -102,12 +101,11 @@
 	bool	pendingOnReceive;
 
 	// Download partial header
-	// actually, this holds only 'PACKET_HEADER_SIZE-1' bytes.
 	byte	pendingHeader[PACKET_HEADER_SIZE];
 	uint32	pendingHeaderSize;
 
 	// Download partial packet
-	CPacket* pendingPacket;
+	byte*	pendingPacket;
 	uint32  pendingPacketSize;
 
 	// Upload control

aMule-2.2.6.tar.bz2/src/EditServerListDlg.cpp -> aMule-2.3.1.tar.bz2/src/EditServerListDlg.cpp Changed

aMule-2.2.6.tar.bz2/src/EditServerListDlg.h -> aMule-2.3.1.tar.bz2/src/EditServerListDlg.h Changed

aMule-2.2.6.tar.bz2/src/EncryptedDatagramSocket.cpp -> aMule-2.3.1.tar.bz2/src/EncryptedDatagramSocket.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -23,70 +23,70 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-/* Basic Obfusicated Handshake Protocol UDP:
+/* Basic Obfuscated Handshake Protocol UDP:
 	see EncryptedStreamSocket.h
 
 ****************************** ED2K Packets
 
--Keycreation Client <-> Clinet:
+- Keycreation Client <-> Client:
 	- Client A (Outgoing connection):
 		Sendkey: Md5(<UserHashClientB 16><IPClientA 4><MagicValue91 1><RandomKeyPartClientA 2>)  23
-	- Client B (Incomming connection):
+	- Client B (Incoming connection):
 		Receivekey: Md5(<UserHashClientB 16><IPClientA 4><MagicValue91 1><RandomKeyPartClientA 2>)  23
-	 - Note: The first 1024 Bytes will be _NOT_ discarded for UDP keys to safe CPU time
+	- Note: The first 1024 Bytes will be _NOT_ discarded for UDP keys to save CPU time
 
 	- Handshake
 		-> The handshake is encrypted - except otherwise noted - by the Keys created above
-		-> Padding is cucrently not used for UDP meaning that PaddingLen will be 0, using PaddingLens up to 16 Bytes is acceptable however
+		-> Padding is currently not used for UDP meaning that PaddingLen will be 0, using PaddingLens up to 16 Bytes is acceptable however
 		Client A: <SemiRandomNotProtocolMarker 7 Bits[Unencrypted]><ED2K Marker 1Bit = 1><RandomKeyPart 2[Unencrypted]><MagicValue 4><PaddingLen 1><RandomBytes PaddingLen%16>	
-	
+
 	- Additional Comments:
 		- For obvious reasons the UDP handshake is actually no handshake. If a different Encryption method (or better a different Key) is to be used this has to be negotiated in a TCP connection
-		- SemiRandomNotProtocolMarker is a Byte which has a value unequal any Protocol header byte. This is a compromiss, turning in complete randomness (and nice design) but gaining a lower CPU usage
+		- SemiRandomNotProtocolMarker is a Byte which has a value unequal any Protocol header byte. This is a compromise, turning in complete randomness (and nice design) but gaining a lower CPU usage
 		- Kad/Ed2k Marker are only indicators, which possibility could be tried first, and should not be trusted
 
 ****************************** Server Packets
 
--Keycreation Client <-> Server:
+- Keycreation Client <-> Server:
 	- Client A (Outgoing connection client -> server):
 		Sendkey: Md5(<BaseKey 4><MagicValueClientServer 1><RandomKeyPartClientA 2>)  7
-	- Client B (Incomming connection):
+	- Client B (Incoming connection):
 		Receivekey: Md5(<BaseKey 4><MagicValueServerClient 1><RandomKeyPartClientA 2>)  7
-	- Note: The first 1024 Bytes will be _NOT_ discarded for UDP keys to safe CPU time
+	- Note: The first 1024 Bytes will be _NOT_ discarded for UDP keys to save CPU time
 
 	- Handshake
 		-> The handshake is encrypted - except otherwise noted - by the Keys created above
-		-> Padding is cucrently not used for UDP meaning that PaddingLen will be 0, using PaddingLens up to 16 Bytes is acceptable however
+		-> Padding is currently not used for UDP meaning that PaddingLen will be 0, using PaddingLens up to 16 Bytes is acceptable however
 		Client A: <SemiRandomNotProtocolMarker 1[Unencrypted]><RandomKeyPart 2[Unencrypted]><MagicValue 4><PaddingLen 1><RandomBytes PaddingLen%16>	
 
 	- Overhead: 8 Bytes per UDP Packet
-	
-	- Security for Basic Obfusication:
+
+	- Security for Basic Obfuscation:
 		- Random looking packets, very limited protection against passive eavesdropping single packets
-	
+
 	- Additional Comments:
 		- For obvious reasons the UDP handshake is actually no handshake. If a different Encryption method (or better a different Key) is to be used this has to be negotiated in a TCP connection
-		- SemiRandomNotProtocolMarker is a Byte which has a value unequal any Protocol header byte. This is a compromiss, turning in complete randomness (and nice design) but gaining a lower CPU usage
+		- SemiRandomNotProtocolMarker is a Byte which has a value unequal any Protocol header byte. This is a compromise, turning in complete randomness (and nice design) but gaining a lower CPU usage
 
 ****************************** KAD Packets
 			  
--Keycreation Client <-> Client:
+- Keycreation Client <-> Client:
 	- Client A (Outgoing connection):
 		Sendkey: Md5(<KadID 16><RandomKeyPartClientA 2>)  18
-	- Client B (Incomming connection):
+	- Client B (Incoming connection):
 		Receivekey: Md5(<KadID 16><RandomKeyPartClientA 2>)  18
-	- Note: The first 1024 Bytes will be _NOT_ discarded for UDP keys to safe CPU time
+	- Note: The first 1024 Bytes will be _NOT_ discarded for UDP keys to save CPU time
 
 	- Handshake
 		-> The handshake is encrypted - except otherwise noted - by the Keys created above
-		-> Padding is cucrently not used for UDP meaning that PaddingLen will be 0, using PaddingLens up to 16 Bytes is acceptable however
+		-> Padding is currently not used for UDP meaning that PaddingLen will be 0, using PaddingLens up to 16 Bytes is acceptable however
 		Client A: <SemiRandomNotProtocolMarker 7 Bits[Unencrypted]><Kad Marker 1Bit = 0><RandomKeyPart 2[Unencrypted]><MagicValue 4><PaddingLen 1><RandomBytes PaddingLen%16><ReceiverVerifyKey 2><SenderVerifyKey 2>
 
 	- Overhead: 12 Bytes per UDP Packet
-	
+
 	- Additional Comments:
 		- For obvious reasons the UDP handshake is actually no handshake. If a different Encryption method (or better a different Key) is to be used this has to be negotiated in a TCP connection
-		- SemiRandomNotProtocolMarker is a Byte which has a value unequal any Protocol header byte. This is a compromiss, turning in complete randomness (and nice design) but gaining a lower CPU usage
+		- SemiRandomNotProtocolMarker is a Byte which has a value unequal any Protocol header byte. This is a compromise, turning in complete randomness (and nice design) but gaining a lower CPU usage
 		- Kad/Ed2k Marker are only indicators, which possibility could be tried first, and should not be trusted
 */
 
@@ -113,21 +113,18 @@
 #define	MAGICVALUE_UDP_SERVERCLIENT			0xA5
 #define	MAGICVALUE_UDP_CLIENTSERVER			0x6B
 
-CEncryptedDatagramSocket::CEncryptedDatagramSocket( wxIPaddress &address, wxSocketFlags flags,	const CProxyData *proxyData) : CDatagramSocketProxy(address, flags, proxyData)
-{
-	
-}
+CEncryptedDatagramSocket::CEncryptedDatagramSocket(wxIPaddress &address, wxSocketFlags flags,	const CProxyData *proxyData)
+	: CDatagramSocketProxy(address, flags, proxyData)
+{}
 
 CEncryptedDatagramSocket::~CEncryptedDatagramSocket()
-{
-
-}
+{}
 
 int CEncryptedDatagramSocket::DecryptReceivedClient(uint8_t *bufIn, int bufLen, uint8_t **bufOut, uint32_t ip, uint32_t *receiverVerifyKey, uint32_t *senderVerifyKey)
 {
 	int result = bufLen;
 	*bufOut = bufIn;
-	
+
 	if (receiverVerifyKey == NULL || senderVerifyKey == NULL) {
 		wxFAIL;
 		return result;
@@ -139,7 +136,7 @@
 	if (result <= CRYPT_HEADER_WITHOUTPADDING /*|| !thePrefs.IsClientCryptLayerSupported()*/) {
 		return result;
 	}
-	
+
 	switch (bufIn[0]) {
 		case OP_EMULEPROT:
 		case OP_KADEMLIAPACKEDPROT:
@@ -151,7 +148,7 @@
 		default:
 			;
 	}
-	
+
 	// might be an encrypted packet, try to decrypt
 	CRC4EncryptableBuffer receivebuffer;
 	uint32_t value = 0;
@@ -166,7 +163,6 @@
 	} else {
 		tries = 3;
 	}
-	bool kadRecvKeyUsed = false;
 	bool kad = false;
 	do {
 		receivebuffer.FullReset();
@@ -176,7 +172,6 @@
 		if (currentTry == 0) {
 			// kad packet with NodeID as key
 			kad = true;
-			kadRecvKeyUsed = false;
 			if (Kademlia::CKademlia::GetPrefs()) {
 				uint8_t keyData[18];
 				Kademlia::CKademlia::GetPrefs()->GetKadID().StoreCryptValue((uint8_t *)&keyData);
@@ -186,7 +181,6 @@
 		} else if (currentTry == 1) {
 			// ed2k packet
 			kad = false;
-			kadRecvKeyUsed = false;
 			uint8_t keyData[23];
 			md4cpy(keyData, thePrefs::GetUserHash().GetHash());
 			keyData[20] = MAGICVALUE_UDP;
@@ -196,7 +190,6 @@
 		} else if (currentTry == 2) {
 			// kad packet with ReceiverKey as key
 			kad = true;
-			kadRecvKeyUsed = true;
 			if (Kademlia::CKademlia::GetPrefs()) {
 				uint8_t keyData[6];
 				PokeUInt32(keyData, Kademlia::CPrefs::GetUDPVerifyKey(ip));
@@ -265,9 +258,9 @@
 }
 
 // Encrypt packet. Key used:
-// pachClientHashOrKadID != NULL					-> pachClientHashOrKadID
-// pachClientHashOrKadID == NULL && bKad && nReceiverVerifyKey != 0	-> nReceiverVerifyKey
-// else									-> ASSERT
+// clientHashOrKadID != NULL					-> clientHashOrKadID
+// clientHashOrKadID == NULL && kad && receiverVerifyKey != 0	-> receiverVerifyKey
+// else								-> ASSERT
 int CEncryptedDatagramSocket::EncryptSendClient(uint8_t **buf, int bufLen, const uint8_t *clientHashOrKadID, bool kad, uint32_t receiverVerifyKey, uint32_t senderVerifyKey)
 {
 	wxASSERT(theApp->GetPublicIP() != 0 || kad);
@@ -280,7 +273,7 @@
 	uint32_t cryptedLen = bufLen + cryptHeaderLen;
 	uint8_t *cryptedBuffer = new uint8_t[cryptedLen];
 	bool kadRecvKeyUsed = false;
-	
+
 	uint16_t randomKeyPart = GetRandomUint16();
 	CRC4EncryptableBuffer sendbuffer;
 	MD5Sum md5;
@@ -322,9 +315,11 @@
 		semiRandomNotProtocolMarker = GetRandomUint8();
 		semiRandomNotProtocolMarker = kad ? (semiRandomNotProtocolMarker & 0xFE) : (semiRandomNotProtocolMarker | 0x01); // set the ed2k/kad marker bit
 		if (kad) {
-			semiRandomNotProtocolMarker = kadRecvKeyUsed ? ((semiRandomNotProtocolMarker & 0xFE) | 0x02) : (semiRandomNotProtocolMarker & 0xFC); // set the ed2k/kad and nodeid/reckey markerbit
+			// set the ed2k/kad and nodeid/recvkey markerbit
+			semiRandomNotProtocolMarker = kadRecvKeyUsed ? ((semiRandomNotProtocolMarker & 0xFE) | 0x02) : (semiRandomNotProtocolMarker & 0xFC);
 		} else {
-			semiRandomNotProtocolMarker = (semiRandomNotProtocolMarker | 0x01); // set the ed2k/kad marker bit
+			// set the ed2k/kad marker bit
+			semiRandomNotProtocolMarker = (semiRandomNotProtocolMarker | 0x01);
 		}
 
 		bool bOk = false;
@@ -378,57 +373,53 @@
 	return cryptedLen;
 }
 
-int CEncryptedDatagramSocket::DecryptReceivedServer(
-	uint8* pbyBufIn,
-	int nBufLen, uint8 **ppbyBufOut,
-	uint32 dwBaseKey,
-	uint32 /*dbgIP*/)
+int CEncryptedDatagramSocket::DecryptReceivedServer(uint8_t* pbyBufIn, int nBufLen, uint8_t **ppbyBufOut, uint32_t dwBaseKey, uint32_t /*dbgIP*/)
 {
 	int nResult = nBufLen;
 	*ppbyBufOut = pbyBufIn;
-	
+
 	if (nResult <= CRYPT_HEADER_WITHOUTPADDING || !thePrefs::IsServerCryptLayerUDPEnabled() || dwBaseKey == 0) {
 		return nResult;
 	}
-	
+
 	if(pbyBufIn[0] == OP_EDONKEYPROT) {
 		return nResult; // no encrypted packet (see description on top)
 	}
 
 	// might be an encrypted packet, try to decrypt
-	uint8 achKeyData[7];
+	uint8_t achKeyData[7];
 	PokeUInt32(achKeyData, dwBaseKey);
 	achKeyData[4] = MAGICVALUE_UDP_SERVERCLIENT;
 	memcpy(achKeyData + 5, pbyBufIn + 1, 2); // random key part sent from remote server
-	
+
 	CRC4EncryptableBuffer receivebuffer;
 	MD5Sum md5(achKeyData, sizeof(achKeyData));
 	receivebuffer.SetKey(md5,true);
-	
-	uint32 dwValue;
-	receivebuffer.RC4Crypt(pbyBufIn + 3, (uint8*)&dwValue, sizeof(dwValue));
+
+	uint32_t dwValue;
+	receivebuffer.RC4Crypt(pbyBufIn + 3, (uint8_t*)&dwValue, sizeof(dwValue));
 	ENDIAN_SWAP_I_32(dwValue);
-	if (dwValue == MAGICVALUE_UDP_SYNC_SERVER){
+	if (dwValue == MAGICVALUE_UDP_SYNC_SERVER) {
 		// yup this is an encrypted packet
 		//DEBUG_ONLY( DebugLog(_T("Received obfuscated UDP packet from ServerIP: %s"), ipstr(dbgIP)) );
-		uint8 byPadLen;
-		receivebuffer.RC4Crypt(pbyBufIn + 7, (uint8*)&byPadLen, 1);
+		uint8_t byPadLen;
+		receivebuffer.RC4Crypt(pbyBufIn + 7, (uint8_t*)&byPadLen, 1);
 		byPadLen &= 15;
 		nResult -= CRYPT_HEADER_WITHOUTPADDING;
-		
-		if (nResult <= byPadLen){
+
+		if (nResult <= byPadLen) {
 			//DebugLogError(_T("Invalid obfuscated UDP packet from ServerIP: %s, Paddingsize (%u) larger than received bytes"), ipstr(dbgIP), byPadLen);
 			return nBufLen; // pass through, let the Receivefunction do the errorhandling on this junk
 		}
-		
+
 		if (byPadLen > 0) {
 			receivebuffer.RC4Crypt(NULL, NULL, byPadLen);
 		}
-		
+
 		nResult -= byPadLen;
 		*ppbyBufOut = pbyBufIn + (nBufLen - nResult);
-		receivebuffer.RC4Crypt((uint8*)*ppbyBufOut, (uint8*)*ppbyBufOut, nResult);
-		
+		receivebuffer.RC4Crypt((uint8_t*)*ppbyBufOut, (uint8_t*)*ppbyBufOut, nResult);
+
 		theStats::AddDownOverheadCrypt(nBufLen - nResult);
 		return nResult; // done
 	} else {
@@ -437,17 +428,14 @@
 	}
 }
 
-int CEncryptedDatagramSocket::EncryptSendServer(uint8** ppbyBuf, int nBufLen, uint32 dwBaseKey) {
+int CEncryptedDatagramSocket::EncryptSendServer(uint8_t** ppbyBuf, int nBufLen, uint32_t dwBaseKey)
+{
 	wxASSERT( thePrefs::IsServerCryptLayerUDPEnabled() );
 	wxASSERT( dwBaseKey != 0 );
-	
-	uint8 byPadLen = 0;			// padding disabled for UDP currently
-	uint32 nCryptedLen = nBufLen + byPadLen + CRYPT_HEADER_WITHOUTPADDING;
-	uint8* pachCryptedBuffer = new uint8[nCryptedLen];
-	
-	uint16 nRandomKeyPart = GetRandomUint16();
-
-	uint8 achKeyData[7];
+
+	uint16_t nRandomKeyPart = GetRandomUint16();
+
+	uint8_t achKeyData[7];
 	PokeUInt32(achKeyData, dwBaseKey);
 	achKeyData[4] = MAGICVALUE_UDP_CLIENTSERVER;
 	PokeUInt16(achKeyData + 5, nRandomKeyPart);
@@ -456,33 +444,37 @@
 	sendbuffer.SetKey(md5, true);
 
 	// create the semi random byte encryption header
-	uint8 bySemiRandomNotProtocolMarker = 0;
+	uint8_t bySemiRandomNotProtocolMarker = 0;
 	int i;
-	
-	for (i = 0; i < 128; i++){
+
+	for (i = 0; i < 128; i++) {
 		bySemiRandomNotProtocolMarker = GetRandomUint8();
 		if (bySemiRandomNotProtocolMarker != OP_EDONKEYPROT) { // not allowed values
 			break;
 		}
 	}
-	
-	if (i >= 128){
+
+	if (i >= 128) {
 		// either we have _real_ bad luck or the randomgenerator is a bit messed up
-		wxASSERT( false );
+		wxFAIL;
 		bySemiRandomNotProtocolMarker = 0x01;
 	}
 
+	uint8_t byPadLen = 0;			// padding disabled for UDP currently
+	uint32_t nCryptedLen = nBufLen + byPadLen + CRYPT_HEADER_WITHOUTPADDING;
+	uint8_t* pachCryptedBuffer = new uint8_t[nCryptedLen];
+
 	pachCryptedBuffer[0] = bySemiRandomNotProtocolMarker;
 	PokeUInt16(pachCryptedBuffer + 1, nRandomKeyPart);
 
-	uint32 dwMagicValue = ENDIAN_SWAP_32(MAGICVALUE_UDP_SYNC_SERVER);
-	sendbuffer.RC4Crypt((uint8*)&dwMagicValue, pachCryptedBuffer + 3, 4);
-	
-	sendbuffer.RC4Crypt((uint8*)&byPadLen, pachCryptedBuffer + 7, 1);
+	uint32_t dwMagicValue = ENDIAN_SWAP_32(MAGICVALUE_UDP_SYNC_SERVER);
+	sendbuffer.RC4Crypt((uint8_t*)&dwMagicValue, pachCryptedBuffer + 3, 4);
+
+	sendbuffer.RC4Crypt((uint8_t*)&byPadLen, pachCryptedBuffer + 7, 1);
 
 	for (int j = 0; j < byPadLen; j++){
-		uint8 byRand = (uint8)rand();	// they actually dont really need to be random, but it doesn't hurts either
-		sendbuffer.RC4Crypt((uint8*)&byRand, pachCryptedBuffer + CRYPT_HEADER_WITHOUTPADDING + j, 1);
+		uint8_t byRand = (uint8_t)rand();	// they actually don't really need to be random, but it doesn't hurt either
+		sendbuffer.RC4Crypt((uint8_t*)&byRand, pachCryptedBuffer + CRYPT_HEADER_WITHOUTPADDING + j, 1);
 	}
 	sendbuffer.RC4Crypt(*ppbyBuf, pachCryptedBuffer + CRYPT_HEADER_WITHOUTPADDING + byPadLen, nBufLen);
 	delete[] *ppbyBuf;

aMule-2.2.6.tar.bz2/src/EncryptedDatagramSocket.h -> aMule-2.3.1.tar.bz2/src/EncryptedDatagramSocket.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -23,20 +23,25 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#ifndef ENCRYPTEDDATAGRAMSOCKET_H
+#define ENCRYPTEDDATAGRAMSOCKET_H
+
 #include "Proxy.h"
 #include "Types.h"
 
 class CEncryptedDatagramSocket : public CDatagramSocketProxy
 {
 public:
-	CEncryptedDatagramSocket( wxIPaddress &address, wxSocketFlags flags = wxSOCKET_NONE,	const CProxyData *proxyData = NULL);
+	CEncryptedDatagramSocket(wxIPaddress &address, wxSocketFlags flags = wxSOCKET_NONE, const CProxyData *proxyData = NULL);
 	virtual ~CEncryptedDatagramSocket();
 
 // TODO: Make protected once the UDP socket is again its own class.
 	static int DecryptReceivedClient(uint8_t *bufIn, int bufLen, uint8_t **bufOut, uint32_t ip, uint32_t *receiverVerifyKey, uint32_t *senderVerifyKey);
 	static int EncryptSendClient(uint8_t **buf, int bufLen, const uint8_t *clientHashOrKadID, bool kad, uint32_t receiverVerifyKey, uint32_t senderVerifyKey);
 
-	static int DecryptReceivedServer(uint8* pbyBufIn, int nBufLen, uint8** ppbyBufOut, uint32 dwBaseKey, uint32 dbgIP);
-	static int EncryptSendServer(uint8** ppbyBuf, int nBufLen, uint32 dwBaseKey);
+	static int DecryptReceivedServer(uint8_t* pbyBufIn, int nBufLen, uint8_t** ppbyBufOut, uint32_t dwBaseKey, uint32_t dbgIP);
+	static int EncryptSendServer(uint8_t** ppbyBuf, int nBufLen, uint32_t dwBaseKey);
 
 };
+
+#endif

aMule-2.2.6.tar.bz2/src/EncryptedStreamSocket.cpp -> aMule-2.3.1.tar.bz2/src/EncryptedStreamSocket.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -24,59 +24,59 @@
 //
 
 /* Basic Obfuscated Handshake Protocol Client <-> Client:
-	-Keycreation:
-	 - Client A (Outgoing connection):
+	- Keycreation:
+		- Client A (Outgoing connection):
 				Sendkey:	Md5(<UserHashClientB 16><MagicValue34 1><RandomKeyPartClientA 4>)  21
-				Receivekey: Md5(<UserHashClientB 16><MagicValue203 1><RandomKeyPartClientA 4>) 21
-	 - Client B (Incomming connection):
+				Receivekey:	Md5(<UserHashClientB 16><MagicValue203 1><RandomKeyPartClientA 4>) 21
+		- Client B (Incoming connection):
 				Sendkey:	Md5(<UserHashClientB 16><MagicValue203 1><RandomKeyPartClientA 4>) 21
-				Receivekey: Md5(<UserHashClientB 16><MagicValue34 1><RandomKeyPartClientA 4>)  21
-		NOTE: First 1024 Bytes are discarded
+				Receivekey:	Md5(<UserHashClientB 16><MagicValue34 1><RandomKeyPartClientA 4>)  21
+		NOTE: First 1024 bytes are discarded
 
 	- Handshake
 			-> The handshake is encrypted - except otherwise noted - by the Keys created above
-			-> Handshake is blocking - do not start sending an answer before the request is completly received (this includes the random bytes)
-			-> EncryptionMethod = 0 is Obfusication and the only supported right now
+			-> Handshake is blocking - do not start sending an answer before the request is completely received (this includes the random bytes)
+			-> EncryptionMethod = 0 is Obfuscation and the only supported method right now
 		Client A: <SemiRandomNotProtocolMarker 1[Unencrypted]><RandomKeyPart 4[Unencrypted]><MagicValue 4><EncryptionMethodsSupported 1><EncryptionMethodPreferred 1><PaddingLen 1><RandomBytes PaddingLen%max256>	
 		Client B: <MagicValue 4><EncryptionMethodsSelected 1><PaddingLen 1><RandomBytes PaddingLen%max256>
 			-> The basic handshake is finished here, if an additional/different EncryptionMethod was selected it may continue negotiating details for this one
 
 	- Overhead: 18-48 (~33) Bytes + 2 * IP/TCP Headers per Connection
-	
-	- Security for Basic Obfusication:
+
+	- Security for Basic Obfuscation:
 			- Random looking stream, very limited protection against passive eavesdropping single connections
-	
+
 	- Additional Comments:
 			- RandomKeyPart is needed to make multiple connections between two clients look different (but still random), since otherwise the same key
-			  would be used and RC4 would create the same output. Since the key is a MD5 hash it doesnt weakens the key if that part is known
-		    - Why DH-KeyAgreement isn't used as basic obfusication key: It doesn't offers substantial more protection against passive connection based protocol identification, it has about 200 bytes more overhead,
-			  needs more CPU time, we cannot say if the received data is junk, unencrypted or part of the keyagreement before the handshake is finished without loosing the complete randomness,
-			  it doesn't offers substantial protection against eavesdropping without added authentification
+			  would be used and RC4 would create the same output. Since the key is a MD5 hash it doesn't weaken the key if that part is known
+			- Why DH-KeyAgreement isn't used as basic obfuscation key: It doesn't offer substantial more protection against passive connection based protocol identification, it has about 200 bytes more overhead,
+			  needs more CPU time, we cannot say if the received data is junk, unencrypted or part of the keyagreement before the handshake is finished without losing the complete randomness,
+			  it doesn't offer substantial protection against eavesdropping without added authentification
 
 Basic Obfuscated Handshake Protocol Client <-> Server:
-    - RC4 Keycreation:
-     - Client (Outgoing connection):
-                Sendkey:    Md5(<S 96><MagicValue34 1>)  97
-                Receivekey: Md5(<S 96><MagicValue203 1>) 97
-     - Server (Incomming connection):
-                Sendkey:    Md5(<S 96><MagicValue203 1>)  97
-                Receivekey: Md5(<S 96><MagicValue34 1>) 97
-    
-     NOTE: First 1024 Bytes are discarded
-
-    - Handshake
-            -> The handshake is encrypted - except otherwise noted - by the Keys created above
-            -> Handshake is blocking - do not start sending an answer before the request is completly received (this includes the random bytes)
-            -> EncryptionMethod = 0 is Obfusication and the only supported right now
-        
-        Client: <SemiRandomNotProtocolMarker 1[Unencrypted]><G^A 96 [Unencrypted]><RandomBytes 0-15 [Unencrypted]>    
-        Server: <G^B 96 [Unencrypted]><MagicValue 4><EncryptionMethodsSupported 1><EncryptionMethodPreferred 1><PaddingLen 1><RandomBytes PaddingLen>
-        Client: <MagicValue 4><EncryptionMethodsSelected 1><PaddingLen 1><RandomBytes PaddingLen> (Answer delayed till first payload to save a frame)
-        
-            
-            -> The basic handshake is finished here, if an additional/different EncryptionMethod was selected it may continue negotiating details for this one
-
-    - Overhead: 206-251 (~229) Bytes + 2 * IP/TCP Headers Headers per Connectionon
+	- RC4 Keycreation:
+		- Client (Outgoing connection):
+			Sendkey:    Md5(<S 96><MagicValue34 1>)  97
+			Receivekey: Md5(<S 96><MagicValue203 1>) 97
+		- Server (Incoming connection):
+			Sendkey:    Md5(<S 96><MagicValue203 1>) 97
+			Receivekey: Md5(<S 96><MagicValue34 1>)  97
+
+		NOTE: First 1024 Bytes are discarded
+
+	- Handshake
+		-> The handshake is encrypted - except otherwise noted - by the Keys created above
+		-> Handshake is blocking - do not start sending an answer before the request is completely received (this includes the random bytes)
+		-> EncryptionMethod = 0 is Obfuscation and the only supported method right now
+
+	Client: <SemiRandomNotProtocolMarker 1[Unencrypted]><G^A 96 [Unencrypted]><RandomBytes 0-15 [Unencrypted]>
+	Server: <G^B 96 [Unencrypted]><MagicValue 4><EncryptionMethodsSupported 1><EncryptionMethodPreferred 1><PaddingLen 1><RandomBytes PaddingLen>
+	Client: <MagicValue 4><EncryptionMethodsSelected 1><PaddingLen 1><RandomBytes PaddingLen> (Answer delayed till first payload to save a frame)
+
+
+	-> The basic handshake is finished here, if an additional/different EncryptionMethod was selected it may continue negotiating details for this one
+
+	- Overhead: 206-251 (~229) Bytes + 2 * IP/TCP Headers Headers per Connection
 
 	- DH Agreement Specifics: sizeof(a) and sizeof(b) = 128 Bits, g = 2, p = dh768_p (see below), sizeof p, s, etc. = 768 bits
 */
@@ -95,22 +95,22 @@
 #include <common/MD5Sum.h>
 #include <protocol/Protocols.h>
 
-#define	MAGICVALUE_REQUESTER	34							// modification of the requester-send and server-receive key
-#define	MAGICVALUE_SERVER		203							// modification of the server-send and requester-send key
-#define	MAGICVALUE_SYNC			0x835E6FC4					// value to check if we have a working encrypted stream 
-#define DHAGREEMENT_A_BITS		128
+#define MAGICVALUE_REQUESTER	34			// modification of the requester-send and server-receive key
+#define MAGICVALUE_SERVER	203			// modification of the server-send and requester-send key
+#define MAGICVALUE_SYNC		0x835E6FC4		// value to check if we have a working encrypted stream
+#define DHAGREEMENT_A_BITS	128
 
 #define PRIMESIZE_BYTES	 96
-static unsigned char dh768_p[]={
-        0xF2,0xBF,0x52,0xC5,0x5F,0x58,0x7A,0xDD,0x53,0x71,0xA9,0x36,
-        0xE8,0x86,0xEB,0x3C,0x62,0x17,0xA3,0x3E,0xC3,0x4C,0xB4,0x0D,
-        0xC7,0x3A,0x41,0xA6,0x43,0xAF,0xFC,0xE7,0x21,0xFC,0x28,0x63,
-        0x66,0x53,0x5B,0xDB,0xCE,0x25,0x9F,0x22,0x86,0xDA,0x4A,0x91,
-        0xB2,0x07,0xCB,0xAA,0x52,0x55,0xD4,0xF6,0x1C,0xCE,0xAE,0xD4,
-        0x5A,0xD5,0xE0,0x74,0x7D,0xF7,0x78,0x18,0x28,0x10,0x5F,0x34,
-        0x0F,0x76,0x23,0x87,0xF8,0x8B,0x28,0x91,0x42,0xFB,0x42,0x68,
-        0x8F,0x05,0x15,0x0F,0x54,0x8B,0x5F,0x43,0x6A,0xF7,0x0D,0xF3,
-        };
+static unsigned char dh768_p[] = {
+	0xF2, 0xBF, 0x52, 0xC5, 0x5F, 0x58, 0x7A, 0xDD, 0x53, 0x71, 0xA9, 0x36,
+	0xE8, 0x86, 0xEB, 0x3C, 0x62, 0x17, 0xA3, 0x3E, 0xC3, 0x4C, 0xB4, 0x0D,
+	0xC7, 0x3A, 0x41, 0xA6, 0x43, 0xAF, 0xFC, 0xE7, 0x21, 0xFC, 0x28, 0x63,
+	0x66, 0x53, 0x5B, 0xDB, 0xCE, 0x25, 0x9F, 0x22, 0x86, 0xDA, 0x4A, 0x91,
+	0xB2, 0x07, 0xCB, 0xAA, 0x52, 0x55, 0xD4, 0xF6, 0x1C, 0xCE, 0xAE, 0xD4,
+	0x5A, 0xD5, 0xE0, 0x74, 0x7D, 0xF7, 0x78, 0x18, 0x28, 0x10, 0x5F, 0x34,
+	0x0F, 0x76, 0x23, 0x87, 0xF8, 0x8B, 0x28, 0x91, 0x42, 0xFB, 0x42, 0x68,
+	0x8F, 0x05, 0x15, 0x0F, 0x54, 0x8B, 0x5F, 0x43, 0x6A, 0xF7, 0x0D, 0xF3
+};
 
 // winsock2.h already defines it
 #ifdef SOCKET_ERROR
@@ -134,22 +134,21 @@
 }
 
 CEncryptedStreamSocket::~CEncryptedStreamSocket()
-{
-	
-}
+{}
 
 
 /* External interface */
 
-void CEncryptedStreamSocket::SetConnectionEncryption(bool bEnabled, const uint8* pTargetClientHash, bool bServerConnection){
-	if (m_StreamCryptState != ECS_UNKNOWN && m_StreamCryptState != ECS_NONE){
+void CEncryptedStreamSocket::SetConnectionEncryption(bool bEnabled, const uint8_t* pTargetClientHash, bool bServerConnection)
+{
+	if (m_StreamCryptState != ECS_UNKNOWN && m_StreamCryptState != ECS_NONE) {
 		if (!m_StreamCryptState == ECS_NONE || bEnabled) {
-			wxASSERT( false );
+			wxFAIL;
 		}
 		return;
 	}
 
-	if (bEnabled && pTargetClientHash != NULL && !bServerConnection){
+	if (bEnabled && pTargetClientHash != NULL && !bServerConnection) {
 		m_StreamCryptState = ECS_PENDING;
 		// create obfuscation keys, see on top for key format
 
@@ -159,7 +158,7 @@
 		uint8 achKeyData[21];
 		md4cpy(achKeyData, pTargetClientHash);
 		PokeUInt32(achKeyData + 17, m_nRandomKeyPart);
-		
+
 		achKeyData[16] = MAGICVALUE_REQUESTER;
 		MD5Sum md5(achKeyData, sizeof(achKeyData));
 		m_pfiSendBuffer.SetKey(md5);
@@ -167,7 +166,7 @@
 		achKeyData[16] = MAGICVALUE_SERVER;
 		md5.Calculate(achKeyData, sizeof(achKeyData));
 		m_pfiReceiveBuffer.SetKey(md5);
-		
+
 	} else if (bServerConnection && bEnabled) {
 		//printf("->Server crypt\n");
 		m_bServerCrypt = true;
@@ -180,14 +179,15 @@
 
 /* Internals, common to base class */
 
-// unfortunatly sending cannot be made transparent for the derived class, because of WSA_WOULDBLOCK
+// unfortunately sending cannot be made transparent for the derived class, because of WSA_WOULDBLOCK
 // together with the fact that each byte must pass the keystream only once
-int CEncryptedStreamSocket::Write(const void* lpBuf, wxUint32 nBufLen){
+int CEncryptedStreamSocket::Write(const void* lpBuf, uint32_t nBufLen)
+{
 	//printf("Starting write for %s\n", (const char*) unicode2char(DbgGetIPString()));	
 	if (!IsEncryptionLayerReady()) {
-		wxASSERT(0);
+		wxFAIL;
 		return 0;
-	} else if (m_bServerCrypt && m_StreamCryptState == ECS_ENCRYPTING && !m_pfiSendBuffer.IsEmpty()){
+	} else if (m_bServerCrypt && m_StreamCryptState == ECS_ENCRYPTING && !m_pfiSendBuffer.IsEmpty()) {
 		wxASSERT( m_NegotiatingState == ONS_BASIC_SERVER_DELAYEDSENDING );
 		// handshakedata was delayed to put it into one frame with the first paypload to the server
 		// do so now with the payload attached
@@ -195,30 +195,31 @@
 		wxASSERT( nRes != SOCKET_ERROR );
 		(void)nRes;
 		return nBufLen;	// report a full send, even if we didn't for some reason - the data is now in our buffer and will be handled later
-	}	else if (m_NegotiatingState == ONS_BASIC_SERVER_DELAYEDSENDING) {
-		wxASSERT(0);
+	} else if (m_NegotiatingState == ONS_BASIC_SERVER_DELAYEDSENDING) {
+		wxFAIL;
 	}
 
 	if (m_StreamCryptState == ECS_UNKNOWN) {
-		//this happens when the encryption option was not set on a outgoing connection
-		//or if we try to send before receiving on a incoming connection - both shouldn't happen
+		//this happens when the encryption option was not set on an outgoing connection
+		//or if we try to send before receiving on an incoming connection - both shouldn't happen
 		m_StreamCryptState = ECS_NONE;
 		//DebugLogError(_T("CEncryptedStreamSocket: Overwriting State ECS_UNKNOWN with ECS_NONE because of premature Send() (%s)"), DbgGetIPString());
 	}
-	
+
 	//printf("Writing %i bytes of data\n", nBufLen);
 	CSocketClientProxy::Write(lpBuf, nBufLen);
 	return CSocketClientProxy::LastCount();
 }
 
-int CEncryptedStreamSocket::Read(void* lpBuf, wxUint32 nBufLen) {
+int CEncryptedStreamSocket::Read(void* lpBuf, uint32_t nBufLen)
+{
 	CSocketClientProxy::Read(lpBuf, nBufLen);
 	m_nObfusicationBytesReceived = CSocketClientProxy::LastCount();
 	m_bFullReceive = m_nObfusicationBytesReceived == (uint32)nBufLen;
 
 	//printf("Read %i bytes on %s, socket %p\n", m_nObfusicationBytesReceived, (const char*) unicode2char(DbgGetIPString()), this);
 	
-	if (m_nObfusicationBytesReceived == SOCKET_ERROR || m_nObfusicationBytesReceived <= 0){
+	if (m_nObfusicationBytesReceived == (uint32_t)SOCKET_ERROR || m_nObfusicationBytesReceived <= 0) {
 		return m_nObfusicationBytesReceived;
 	}
 	
@@ -228,15 +229,15 @@
 		case ECS_PENDING:
 		case ECS_PENDING_SERVER:
 			//printf("Received %i bytes before sending?\n", m_nObfusicationBytesReceived);
-			wxASSERT( false );
+			wxFAIL;
 			//DebugLogError(_T("CEncryptedStreamSocket Received data before sending on outgoing connection"));
 			m_StreamCryptState = ECS_NONE;
 			return m_nObfusicationBytesReceived;
 		case ECS_UNKNOWN: {
 			//printf("Receiving encrypted data on ECS_UNKNOWN\n");
-			uint32 nRead = 1;
+			uint32_t nRead = 1;
 			bool bNormalHeader = false;
-			switch (((uint8*)lpBuf)[0]){
+			switch (((uint8_t*)lpBuf)[0]) {
 				case OP_EDONKEYPROT:
 				case OP_PACKEDPROT:
 				case OP_EMULEPROT:
@@ -247,37 +248,37 @@
 			if (!bNormalHeader) {
 				//printf("Not a normal header, negotiating encryption\n");
 				StartNegotiation(false);
-				const uint32 nNegRes = Negotiate((uint8*)lpBuf + nRead, m_nObfusicationBytesReceived - nRead);
-				if (nNegRes == (-1)) {
+				const uint32 nNegRes = Negotiate((uint8_t*)lpBuf + nRead, m_nObfusicationBytesReceived - nRead);
+				if (nNegRes == (uint32_t)(-1)) {
 					return 0;
 				}
 				nRead += nNegRes;
-				if (nRead != (uint32)m_nObfusicationBytesReceived){
+				if (nRead != (uint32_t)m_nObfusicationBytesReceived) {
 					// this means we have more data then the current negotiation step required (or there is a bug) and this should never happen
-					// (note: even if it just finished the handshake here, there still can be no data left, since the other client didnt received our response yet)
+					// (note: even if it just finished the handshake here, there still can be no data left, since the other client didn't receive our response yet)
 					//DebugLogError(_T("CEncryptedStreamSocket: Client %s sent more data then expected while negotiating, disconnecting (1)"), DbgGetIPString());
 					//printf("On error: encryption\n");
 					OnError(ERR_ENCRYPTION);
 				}
 				return 0;
 			} else {
-				// doesn't seems to be encrypted
+				// doesn't seem to be encrypted
 				//printf("Encrypted data doesn't seem to be encrypted\n");
 				m_StreamCryptState = ECS_NONE;
 				
 				// if we require an encrypted connection, cut the connection here. This shouldn't happen that often
 				// at least with other up-to-date eMule clients because they check for incompability before connecting if possible
-				if (thePrefs::IsClientCryptLayerRequired()){
-					// TODO: Remove me when i have been solved
+				if (thePrefs::IsClientCryptLayerRequired()) {
+					// TODO: Remove me when I have been solved
 					// Even if the Require option is enabled, we currently have to accept unencrypted connection which are made
 					// for lowid/firewall checks from servers and other from us selected client. Otherwise, this option would
-					// always result in a lowid/firewalled status. This is of course not nice, but we can't avoid this walkarround
-					// untill servers and kad completely support encryption too, which will at least for kad take a bit
+					// always result in a lowid/firewalled status. This is of course not nice, but we can't avoid this workaround
+					// until servers and kad completely support encryption too, which will at least for kad take a bit
 					// only exception is the .ini option ClientCryptLayerRequiredStrict which will even ignore test connections
 					// Update: New server now support encrypted callbacks
 					amuleIPV4Address address;
 					GetPeer(address);
-					uint32 ip = StringIPtoUint32(address.IPAddress());
+					uint32_t ip = StringIPtoUint32(address.IPAddress());
 					if (thePrefs::IsClientCryptLayerRequiredStrict() || (!theApp->serverconnect->AwaitingTestFromIP(ip)
 						&& !theApp->clientlist->IsKadFirewallCheckIP(ip)) )
 					{
@@ -286,35 +287,33 @@
 					} else {
 						//AddDebugLogLine(DLP_DEFAULT, false, _T("Incoming unencrypted firewallcheck connection permitted despite RequireEncryption setting  - %s"), DbgGetIPString() );
 					}
-						
 				}
-
 				return m_nObfusicationBytesReceived; // buffer was unchanged, we can just pass it through
 			}
 		}
 		case ECS_ENCRYPTING:
 			//printf("Encryption enabled on data receiving, decrypting and passing along\n");
 			// basic obfusication enabled and set, so decrypt and pass along
-			m_pfiReceiveBuffer.RC4Crypt((uint8*)lpBuf, (uint8*)lpBuf, m_nObfusicationBytesReceived);
+			m_pfiReceiveBuffer.RC4Crypt((uint8_t*)lpBuf, (uint8_t*)lpBuf, m_nObfusicationBytesReceived);
 			//DumpMem(lpBuf, m_nObfusicationBytesReceived, wxT("Directly decrypted data:"));
 			return m_nObfusicationBytesReceived;
 		case ECS_NEGOTIATING:{
 			//printf("Negotiating on data receive\n");
-			const uint32 nRead = Negotiate((uint8*)lpBuf, m_nObfusicationBytesReceived);
-			if (nRead == (-1)) {
+			const uint32_t nRead = Negotiate((uint8_t*)lpBuf, m_nObfusicationBytesReceived);
+			if (nRead == (uint32_t)(-1)) {
 				//printf("-> Encryption read error on negotiation\n");
 				return 0;
-			} else if (nRead != (uint32)m_nObfusicationBytesReceived && m_StreamCryptState != ECS_ENCRYPTING) {
+			} else if (nRead != (uint32_t)m_nObfusicationBytesReceived && m_StreamCryptState != ECS_ENCRYPTING) {
 				//printf("-> Too much data, bailing out of negotiation step\n");
 				// this means we have more data then the current negotiation step required (or there is a bug) and this should never happen
 				//DebugLogError(_T("CEncryptedStreamSocket: Client %s sent more data then expected while negotiating, disconnecting (2)"), DbgGetIPString());
 				OnError(ERR_ENCRYPTION);
 				return 0;
-			} else if (nRead != (uint32)m_nObfusicationBytesReceived && m_StreamCryptState == ECS_ENCRYPTING){
+			} else if (nRead != (uint32_t)m_nObfusicationBytesReceived && m_StreamCryptState == ECS_ENCRYPTING) {
 				//printf("-> Handshake negotiation finished\n");
 				// we finished the handshake and if we this was an outgoing connection it is allowed (but strange and unlikely) that the client sent payload
 				//DebugLogWarning(_T("CEncryptedStreamSocket: Client %s has finished the handshake but also sent payload on a outgoing connection"), DbgGetIPString());
-				memmove(lpBuf, (uint8*)lpBuf + nRead, m_nObfusicationBytesReceived - nRead);
+				memmove(lpBuf, (uint8_t*)lpBuf + nRead, m_nObfusicationBytesReceived - nRead);
 				return m_nObfusicationBytesReceived - nRead;
 			} else {
 				//printf("-> Negotiation went probably ok\n");
@@ -322,35 +321,36 @@
 			}
 		}
 		default:
-			wxASSERT( false );
+			wxFAIL;
 			return m_nObfusicationBytesReceived;
 	}
 }
 
-void CEncryptedStreamSocket::OnSend(int) {
-
+void CEncryptedStreamSocket::OnSend(int)
+{
 	// if the socket just connected and this is outgoing, we might want to start the handshake here
 	if (m_StreamCryptState == ECS_PENDING || m_StreamCryptState == ECS_PENDING_SERVER){
 		//printf("Starting connection negotiation on OnSend for %s\n", (const char*) unicode2char(DbgGetIPString()));
 		StartNegotiation(true);
 		return;
 	}
-	
+
 	// check if we have negotiating data pending
-	if (!m_pfiSendBuffer.IsEmpty()){
+	if (!m_pfiSendBuffer.IsEmpty()) {
 		wxASSERT( m_StreamCryptState >= ECS_NEGOTIATING );
 		SendNegotiatingData(NULL, 0);
 	}
 }
 
-void CEncryptedStreamSocket::CryptPrepareSendData(uint8* pBuffer, uint32 nLen){
-	if (!IsEncryptionLayerReady()){
-		wxASSERT( false ); // must be a bug
+void CEncryptedStreamSocket::CryptPrepareSendData(uint8* pBuffer, uint32 nLen)
+{
+	if (!IsEncryptionLayerReady()) {
+		wxFAIL; // must be a bug
 		return;
 	}
-	if (m_StreamCryptState == ECS_UNKNOWN){
-		//this happens when the encryption option was not set on a outgoing connection
-		//or if we try to send before receiving on a incoming connection - both shouldn't happen
+	if (m_StreamCryptState == ECS_UNKNOWN) {
+		//this happens when the encryption option was not set on an outgoing connection
+		//or if we try to send before receiving on an incoming connection - both shouldn't happen
 		m_StreamCryptState = ECS_NONE;
 		//DebugLogError(_T("CEncryptedStreamSocket: Overwriting State ECS_UNKNOWN with ECS_NONE because of premature Send() (%s)"), DbgGetIPString());
 	}
@@ -364,16 +364,16 @@
 
 /* Internals, just for this class (can be raped) */
 
-bool CEncryptedStreamSocket::IsEncryptionLayerReady(){
+bool CEncryptedStreamSocket::IsEncryptionLayerReady()
+{
 	return ( (m_StreamCryptState == ECS_NONE || m_StreamCryptState == ECS_ENCRYPTING || m_StreamCryptState == ECS_UNKNOWN )
 		&& (m_pfiSendBuffer.IsEmpty() || (m_bServerCrypt && m_NegotiatingState == ONS_BASIC_SERVER_DELAYEDSENDING)) );
 }
 
-
 void CEncryptedStreamSocket::StartNegotiation(bool bOutgoing)
 {
 	//printf("Starting socket negotiation\n");
-	if (!bOutgoing){
+	if (!bOutgoing) {
 		//printf("Incoming connection negotiation on %s\n", (const char*) unicode2char(DbgGetIPString()));
 		m_NegotiatingState = ONS_BASIC_CLIENTA_RANDOMPART;
 		m_StreamCryptState = ECS_NEGOTIATING;
@@ -381,77 +381,77 @@
 	} else if (m_StreamCryptState == ECS_PENDING) {
 		//printf("Socket is client.pending on negotiation\n");
 		CMemFile fileRequest(29);
-		const uint8 bySemiRandomNotProtocolMarker = GetSemiRandomNotProtocolMarker();	
+		const uint8_t bySemiRandomNotProtocolMarker = GetSemiRandomNotProtocolMarker();
 		fileRequest.WriteUInt8(bySemiRandomNotProtocolMarker);
 		fileRequest.WriteUInt32(m_nRandomKeyPart);
 		fileRequest.WriteUInt32(MAGICVALUE_SYNC);
-		const uint8 bySupportedEncryptionMethod = ENM_OBFUSCATION; // we do not support any further encryption in this version
+		const uint8_t bySupportedEncryptionMethod = ENM_OBFUSCATION; // we do not support any further encryption in this version
 		fileRequest.WriteUInt8(bySupportedEncryptionMethod);
 		fileRequest.WriteUInt8(bySupportedEncryptionMethod); // so we also prefer this one
-		uint8 byPadding = (uint8)(GetRandomUint8() % (thePrefs::GetCryptTCPPaddingLength() + 1));
+		uint8_t byPadding = (uint8_t)(GetRandomUint8() % (thePrefs::GetCryptTCPPaddingLength() + 1));
 		fileRequest.WriteUInt8(byPadding);
 		for (int i = 0; i < byPadding; i++) {
 			fileRequest.WriteUInt8(GetRandomUint8());
 		}
-		
+
 		m_NegotiatingState = ONS_BASIC_CLIENTB_MAGICVALUE;
 		m_StreamCryptState = ECS_NEGOTIATING;
 		m_nReceiveBytesWanted = 4;
-		
-		SendNegotiatingData(fileRequest.GetRawBuffer(), (uint32)fileRequest.GetLength(), 5);
+
+		SendNegotiatingData(fileRequest.GetRawBuffer(), (uint32_t)fileRequest.GetLength(), 5);
 	} else if (m_StreamCryptState == ECS_PENDING_SERVER) {
 		//printf("Socket is server.pending on negotiation\n");
 		CMemFile fileRequest(113);
-		const uint8 bySemiRandomNotProtocolMarker = GetSemiRandomNotProtocolMarker();	
+		const uint8_t bySemiRandomNotProtocolMarker = GetSemiRandomNotProtocolMarker();
 		fileRequest.WriteUInt8(bySemiRandomNotProtocolMarker);
-		
+
 		m_cryptDHA.Randomize((CryptoPP::AutoSeededRandomPool&)GetRandomPool(), DHAGREEMENT_A_BITS); // our random a
 		wxASSERT( m_cryptDHA.MinEncodedSize() <= DHAGREEMENT_A_BITS / 8 );
 		CryptoPP::Integer cryptDHPrime((byte*)dh768_p, PRIMESIZE_BYTES);  // our fixed prime
 		// calculate g^a % p
-		CryptoPP::Integer cryptDHGexpAmodP = a_exp_b_mod_c(CryptoPP::Integer(2), m_cryptDHA, cryptDHPrime);  
+		CryptoPP::Integer cryptDHGexpAmodP = a_exp_b_mod_c(CryptoPP::Integer(2), m_cryptDHA, cryptDHPrime);
 		wxASSERT( m_cryptDHA.MinEncodedSize() <= PRIMESIZE_BYTES );
 		// put the result into a buffer
-		uint8 aBuffer[PRIMESIZE_BYTES];
+		uint8_t aBuffer[PRIMESIZE_BYTES];
 		cryptDHGexpAmodP.Encode(aBuffer, PRIMESIZE_BYTES);
 
 		fileRequest.Write(aBuffer, PRIMESIZE_BYTES);
 		uint8 byPadding = (uint8)(GetRandomUint8() % 16); // add random padding
 		fileRequest.WriteUInt8(byPadding);
-		
+
 		for (int i = 0; i < byPadding; i++) {
 			fileRequest.WriteUInt8(GetRandomUint8());
 		}
-		
+
 		m_NegotiatingState = ONS_BASIC_SERVER_DHANSWER;
 		m_StreamCryptState = ECS_NEGOTIATING;
 		m_nReceiveBytesWanted = 96;
-		
-		SendNegotiatingData(fileRequest.GetRawBuffer(), (uint32)fileRequest.GetLength(), (uint32)fileRequest.GetLength());
+
+		SendNegotiatingData(fileRequest.GetRawBuffer(), (uint32_t)fileRequest.GetLength(), (uint32_t)fileRequest.GetLength());
 	} else {
-		wxASSERT( false );
+		wxFAIL;
 		m_StreamCryptState = ECS_NONE;
 		return;
 	}
 }
 
-int CEncryptedStreamSocket::Negotiate(const uint8* pBuffer, uint32 nLen){
-	uint32 nRead = 0;
+int CEncryptedStreamSocket::Negotiate(const uint8* pBuffer, uint32 nLen)
+{
+	uint32_t nRead = 0;
 	wxASSERT( m_nReceiveBytesWanted > 0 );
-	
+
 	//DumpMem(pBuffer, nLen, wxT("Negotiate buffer: "));
-	
-	try{
-		while (m_NegotiatingState != ONS_COMPLETE && m_nReceiveBytesWanted > 0){		
-			if (m_nReceiveBytesWanted > 512){
-				wxASSERT( false );
+
+	try {
+		while (m_NegotiatingState != ONS_COMPLETE && m_nReceiveBytesWanted > 0) {
+			if (m_nReceiveBytesWanted > 512) {
+				wxFAIL;
 				return 0;
 			}
 
-			const uint32 nToRead =  std::min(nLen - nRead, m_nReceiveBytesWanted);
+			const uint32_t nToRead =  std::min(nLen - nRead, m_nReceiveBytesWanted);
 			//printf("Reading %i bytes, add from %i position on %i position\n",nToRead, nRead, (int)m_pfiReceiveBuffer.GetPosition());
 			//DumpMem(pBuffer + nRead, nToRead, wxT("Recv Buffer: "));
-			m_pfiReceiveBuffer.ResetData();
 			m_pfiReceiveBuffer.Write(pBuffer + nRead, nToRead);
 			nRead += nToRead;
 			m_nReceiveBytesWanted -= nToRead;
@@ -464,51 +464,50 @@
 				//printf("We have the keys, so decrypt away on %s\n", (const char*) unicode2char(DbgGetIPString()));
 				m_pfiReceiveBuffer.Encrypt();
 			}
-			
-			m_pfiReceiveBuffer.Seek(0);				
 
-			switch (m_NegotiatingState){
+			m_pfiReceiveBuffer.Seek(0);
+
+			switch (m_NegotiatingState) {
 				case ONS_NONE: // would be a bug
-					wxASSERT( false ); 
+					wxFAIL;
 					return 0;
 				case ONS_BASIC_CLIENTA_RANDOMPART: {
-					//printf("We are on ONS_BASIC_CLIENTA_RANDOMPART, create the keys on %s\n", (const char*) unicode2char(DbgGetIPString()));					
+					//printf("We are on ONS_BASIC_CLIENTA_RANDOMPART, create the keys on %s\n", (const char*) unicode2char(DbgGetIPString()));
 					// This creates the send/receive keys.
-					
-					uint8 achKeyData[21];
+
+					uint8_t achKeyData[21];
 					md4cpy(achKeyData, thePrefs::GetUserHash().GetHash());
 					m_pfiReceiveBuffer.Read(achKeyData + 17, 4);
-					
+
 					achKeyData[16] = MAGICVALUE_REQUESTER;
-					
+
 					//DumpMem(achKeyData, sizeof(achKeyData), wxT("ach:"));
-					
+
 					MD5Sum md5(achKeyData, sizeof(achKeyData));
 					//DumpMem(md5.GetRawHash(), 16, wxT("Md5:"));
 					m_pfiReceiveBuffer.SetKey(md5);
-					
+
 					achKeyData[16] = MAGICVALUE_SERVER;
 					md5.Calculate(achKeyData, sizeof(achKeyData));
 					m_pfiSendBuffer.SetKey(md5);
-					
+
 					m_NegotiatingState = ONS_BASIC_CLIENTA_MAGICVALUE;
 					m_nReceiveBytesWanted = 4;
 					break;
 				}
-				
 				case ONS_BASIC_CLIENTA_MAGICVALUE: {
 					// Check the magic value to confirm encryption works.
 					//printf("Creating magic value on negotiate on %s\n", (const char*) unicode2char(DbgGetIPString()));
-					
-					uint32 dwValue = m_pfiReceiveBuffer.ReadUInt32();
-					
-					if (dwValue == MAGICVALUE_SYNC){
+
+					uint32_t dwValue = m_pfiReceiveBuffer.ReadUInt32();
+
+					if (dwValue == MAGICVALUE_SYNC) {
 						// yup, the one or the other way it worked, this is an encrypted stream
 						//DEBUG_ONLY( DebugLog(_T("Received proper magic value, clientIP: %s"), DbgGetIPString()) );
 						// set the receiver key
 						//printf("Magic value works on %s\n", (const char*) unicode2char(DbgGetIPString()));
 						m_NegotiatingState = ONS_BASIC_CLIENTA_METHODTAGSPADLEN;
-						m_nReceiveBytesWanted = 3;	
+						m_nReceiveBytesWanted = 3;
 					} else {
 						//printf("Wrong magic value: 0x%x != 0x%x on %s\n",dwValue, MAGICVALUE_SYNC, (const char*)unicode2char(DbgGetIPString()));
 						//DebugLogError(_T("CEncryptedStreamSocket: Received wrong magic value from clientIP %s on a supposly encrytped stream / Wrong Header"), DbgGetIPString());
@@ -516,58 +515,54 @@
 						return (-1);
 					}
 					break;
-			    }
+				}
 				case ONS_BASIC_CLIENTA_METHODTAGSPADLEN: {
-					
 					// Get encryption method and padding.
 					// Might fall back to padding process, but the bytes will be ignored.
 					//printf("Getting encryption method on negotiation\n");
-					
+
 					m_dbgbyEncryptionSupported = m_pfiReceiveBuffer.ReadUInt8();
 					m_dbgbyEncryptionRequested = m_pfiReceiveBuffer.ReadUInt8();
-								
+
 					if (m_dbgbyEncryptionRequested != ENM_OBFUSCATION) {
-						//printf("Unsupported encryption method!\n");						
+						//printf("Unsupported encryption method!\n");
 //						AddDebugLogLine(DLP_LOW, false, _T("CEncryptedStreamSocket: Client %s preffered unsupported encryption method (%i)"), DbgGetIPString(), m_dbgbyEncryptionRequested);
 					}
-					
+
 					m_nReceiveBytesWanted = m_pfiReceiveBuffer.ReadUInt8();
-					
 					m_NegotiatingState = ONS_BASIC_CLIENTA_PADDING;
-					
+
 					if (m_nReceiveBytesWanted > 0) {
 						// No padding
 						break;
 					}
 				}
-				
-				case ONS_BASIC_CLIENTA_PADDING:{
+				case ONS_BASIC_CLIENTA_PADDING: {
 					//printf("Negotiating on padding, completing\n");
 					// ignore the random bytes, send the response, set status complete
 					CMemFile fileResponse(26);
 					fileResponse.WriteUInt32(MAGICVALUE_SYNC);
-					const uint8 bySelectedEncryptionMethod = ENM_OBFUSCATION; // we do not support any further encryption in this version, so no need to look which the other client preferred
+					const uint8_t bySelectedEncryptionMethod = ENM_OBFUSCATION; // we do not support any further encryption in this version, so no need to look which the other client preferred
 					fileResponse.WriteUInt8(bySelectedEncryptionMethod);
-					
+
 					amuleIPV4Address address;
-					GetPeer(address);					
-					const uint8 byPaddingLen = theApp->serverconnect->AwaitingTestFromIP(StringIPtoUint32(address.IPAddress())) ? 16 : (thePrefs::GetCryptTCPPaddingLength() + 1);
-					uint8 byPadding = (uint8)(GetRandomUint8() % byPaddingLen);
-					
+					GetPeer(address);
+					const uint8_t byPaddingLen = theApp->serverconnect->AwaitingTestFromIP(StringIPtoUint32(address.IPAddress())) ? 16 : (thePrefs::GetCryptTCPPaddingLength() + 1);
+					uint8_t byPadding = (uint8_t)(GetRandomUint8() % byPaddingLen);
+
 					fileResponse.WriteUInt8(byPadding);
 					for (int i = 0; i < byPadding; i++) {
-						fileResponse.WriteUInt8((uint8)rand());
+						fileResponse.WriteUInt8((uint8_t)rand());
 					}
-					SendNegotiatingData(fileResponse.GetRawBuffer(), (uint32)fileResponse.GetLength());
+					SendNegotiatingData(fileResponse.GetRawBuffer(), (uint32_t)fileResponse.GetLength());
 					m_NegotiatingState = ONS_COMPLETE;
 					m_StreamCryptState = ECS_ENCRYPTING;
 					//DEBUG_ONLY( DebugLog(_T("CEncryptedStreamSocket: Finished Obufscation handshake with client %s (incoming)"), DbgGetIPString()) );
 					break;
 				}
-				
-				case ONS_BASIC_CLIENTB_MAGICVALUE:{
+				case ONS_BASIC_CLIENTB_MAGICVALUE: {
 					//printf("Negotiating on magic value\n");
-					if (m_pfiReceiveBuffer.ReadUInt32() != MAGICVALUE_SYNC){
+					if (m_pfiReceiveBuffer.ReadUInt32() != MAGICVALUE_SYNC) {
 						//DebugLogError(_T("CEncryptedStreamSocket: EncryptedstreamSyncError: Client sent wrong Magic Value as answer, cannot complete handshake (%s)"), DbgGetIPString());
 						OnError(ERR_ENCRYPTION);
 						return (-1);
@@ -576,13 +571,13 @@
 					m_nReceiveBytesWanted = 2;
 					break;
 				}
-				case ONS_BASIC_CLIENTB_METHODTAGSPADLEN:{
+				case ONS_BASIC_CLIENTB_METHODTAGSPADLEN: {
 					//printf("Negotiating on client B pad length\n");
 					m_dbgbyEncryptionMethodSet = m_pfiReceiveBuffer.ReadUInt8();
-					if (m_dbgbyEncryptionMethodSet != ENM_OBFUSCATION){
+					if (m_dbgbyEncryptionMethodSet != ENM_OBFUSCATION) {
 						//DebugLogError( _T("CEncryptedStreamSocket: Client %s set unsupported encryption method (%i), handshake failed"), DbgGetIPString(), m_dbgbyEncryptionMethodSet);
 						OnError(ERR_ENCRYPTION);
-						return (-1);						
+						return (-1);
 					}
 					m_nReceiveBytesWanted = m_pfiReceiveBuffer.ReadUInt8();
 					m_NegotiatingState = ONS_BASIC_CLIENTB_PADDING;
@@ -597,20 +592,20 @@
 					m_StreamCryptState = ECS_ENCRYPTING;
 					//DEBUG_ONLY( DebugLog(_T("CEncryptedStreamSocket: Finished Obufscation handshake with client %s (outgoing)"), DbgGetIPString()) );
 					break;
-				case ONS_BASIC_SERVER_DHANSWER:{
+				case ONS_BASIC_SERVER_DHANSWER: {
 					wxASSERT( !m_cryptDHA.IsZero() );
-					uint8 aBuffer[PRIMESIZE_BYTES + 1];
+					uint8_t aBuffer[PRIMESIZE_BYTES + 1];
 					m_pfiReceiveBuffer.Read(aBuffer, PRIMESIZE_BYTES);
 					CryptoPP::Integer cryptDHAnswer((byte*)aBuffer, PRIMESIZE_BYTES);
 					CryptoPP::Integer cryptDHPrime((byte*)dh768_p, PRIMESIZE_BYTES);  // our fixed prime
 					CryptoPP::Integer cryptResult = a_exp_b_mod_c(cryptDHAnswer, m_cryptDHA, cryptDHPrime);
-					
+
 					m_cryptDHA = 0;
 					//DEBUG_ONLY( ZeroMemory(aBuffer, sizeof(aBuffer)) );
 					wxASSERT( cryptResult.MinEncodedSize() <= PRIMESIZE_BYTES );
-					
+
 					// create the keys
-					cryptResult.Encode(aBuffer, PRIMESIZE_BYTES);					
+					cryptResult.Encode(aBuffer, PRIMESIZE_BYTES);
 					aBuffer[PRIMESIZE_BYTES] = MAGICVALUE_REQUESTER;
 					MD5Sum md5(aBuffer, sizeof(aBuffer));
 					m_pfiSendBuffer.SetKey(md5);
@@ -622,21 +617,21 @@
 					m_nReceiveBytesWanted = 4;
 					break;
 				}
-				case ONS_BASIC_SERVER_MAGICVALUE:{
-					uint32 dwValue = m_pfiReceiveBuffer.ReadUInt32();
-					if (dwValue == MAGICVALUE_SYNC){
+				case ONS_BASIC_SERVER_MAGICVALUE: {
+					uint32_t dwValue = m_pfiReceiveBuffer.ReadUInt32();
+					if (dwValue == MAGICVALUE_SYNC) {
 						// yup, the one or the other way it worked, this is an encrypted stream
 						//DebugLog(_T("Received proper magic value after DH-Agreement from Serverconnection IP: %s"), DbgGetIPString());
 						// set the receiver key
 						m_NegotiatingState = ONS_BASIC_SERVER_METHODTAGSPADLEN;
-						m_nReceiveBytesWanted = 3;	
+						m_nReceiveBytesWanted = 3;
 					} else {
 						//DebugLogError(_T("CEncryptedStreamSocket: Received wrong magic value after DH-Agreement from Serverconnection"), DbgGetIPString());
 						OnError(ERR_ENCRYPTION);
 						return (-1);
 					}
 					break;
-			    }
+				}
 				case ONS_BASIC_SERVER_METHODTAGSPADLEN:
 					m_dbgbyEncryptionSupported = m_pfiReceiveBuffer.ReadUInt8();
 					m_dbgbyEncryptionRequested = m_pfiReceiveBuffer.ReadUInt8();
@@ -648,76 +643,75 @@
 					if (m_nReceiveBytesWanted > 0) {
 						break;
 					}
-				case ONS_BASIC_SERVER_PADDING:{
+				case ONS_BASIC_SERVER_PADDING: {
 					// ignore the random bytes (they are decrypted already), send the response, set status complete
 					CMemFile fileResponse(26);
 					fileResponse.WriteUInt32(MAGICVALUE_SYNC);
-					const uint8 bySelectedEncryptionMethod = ENM_OBFUSCATION; // we do not support any further encryption in this version, so no need to look which the other client preferred
+					const uint8_t bySelectedEncryptionMethod = ENM_OBFUSCATION; // we do not support any further encryption in this version, so no need to look which the other client preferred
 					fileResponse.WriteUInt8(bySelectedEncryptionMethod);
-					
+
 					// Server callback connection only allows 16 bytes of padding.
-					uint8 byPadding = (uint8)(GetRandomUint8() % 16);
+					uint8_t byPadding = (uint8_t)(GetRandomUint8() % 16);
 					fileResponse.WriteUInt8(byPadding);
-					
+
 					for (int i = 0; i < byPadding; i++) {
-						fileResponse.WriteUInt8((uint8)rand());
+						fileResponse.WriteUInt8((uint8_t)rand());
 					}
-					
+
 					m_NegotiatingState = ONS_BASIC_SERVER_DELAYEDSENDING;
-					SendNegotiatingData(fileResponse.GetRawBuffer(), (uint32)fileResponse.GetLength(), 0, true); // don't actually send it right now, store it in our sendbuffer
+					SendNegotiatingData(fileResponse.GetRawBuffer(), (uint32_t)fileResponse.GetLength(), 0, true); // don't actually send it right now, store it in our sendbuffer
 					m_StreamCryptState = ECS_ENCRYPTING;
 					//DEBUG_ONLY( DebugLog(_T("CEncryptedStreamSocket: Finished DH Obufscation handshake with Server %s"), DbgGetIPString()) );
 					break;
 				}
 				default:
-					wxASSERT( false );
+					wxFAIL;
 			}
-			
+			m_pfiReceiveBuffer.ResetData();
 		}
-		m_pfiReceiveBuffer.ResetData();
 		return nRead;
-	} catch(...){
+	} catch(...) {
 		// can only be caused by a bug in negationhandling, not by the datastream
 		//error->Delete();
 		//printf("Bug on negotiation?\n");
-		wxASSERT( false );
+		wxFAIL;
 		OnError(ERR_ENCRYPTION);
 		m_pfiReceiveBuffer.ResetData();
 		return (-1);
 	}
-
 }
 
-int CEncryptedStreamSocket::SendNegotiatingData(const void* lpBuf, uint32 nBufLen, uint32 nStartCryptFromByte, bool bDelaySend){	
+int CEncryptedStreamSocket::SendNegotiatingData(const void* lpBuf, uint32_t nBufLen, uint32_t nStartCryptFromByte, bool bDelaySend)
+{
 	wxASSERT( m_StreamCryptState == ECS_NEGOTIATING || m_StreamCryptState == ECS_ENCRYPTING );
 	wxASSERT( nStartCryptFromByte <= nBufLen );
 	wxASSERT( m_NegotiatingState == ONS_BASIC_SERVER_DELAYEDSENDING || !bDelaySend );
-	//printf("Send negotiation data on %s\n", (const char*) unicode2char(DbgGetIPString()));					
-	uint8* pBuffer = NULL;
+	//printf("Send negotiation data on %s\n", (const char*) unicode2char(DbgGetIPString()));
+	uint8_t* pBuffer = NULL;
 	bool bProcess = false;
 	if (lpBuf != NULL) {
-		pBuffer = new uint8[nBufLen];
+		pBuffer = new uint8_t[nBufLen];
 		if (pBuffer == NULL) {
-			throw CMuleException(wxT("Memory exception"), wxT("Memory exception on TCP encrypted socket"));				
+			throw CMuleException(wxT("Memory exception"), wxT("Memory exception on TCP encrypted socket"));
 		}
-		
+
 		if (nStartCryptFromByte > 0) {
 			memcpy(pBuffer, lpBuf, nStartCryptFromByte);
 		}
-		
+
 		if (nBufLen - nStartCryptFromByte > 0) {
-			//printf("Crypting negotiation data on %s starting on byte %i\n", (const char*) unicode2char(DbgGetIPString()), nStartCryptFromByte);					
+			//printf("Crypting negotiation data on %s starting on byte %i\n", (const char*) unicode2char(DbgGetIPString()), nStartCryptFromByte);
 			//DumpMem(lpBuf, nBufLen, wxT("Pre-encryption:"));
 			m_pfiSendBuffer.RC4Crypt((uint8*)lpBuf + nStartCryptFromByte, pBuffer + nStartCryptFromByte, nBufLen - nStartCryptFromByte);
 			//DumpMem(pBuffer, nBufLen, wxT("Post-encryption:"));
 		}
-		
+
 		if (!m_pfiSendBuffer.IsEmpty()) {
 			// we already have data pending. Attach it and try to send
 			if (m_NegotiatingState == ONS_BASIC_SERVER_DELAYEDSENDING) {
 				m_NegotiatingState = ONS_COMPLETE;
 			} else {
-				wxASSERT( false );
+				wxFAIL;
 			}
 			m_pfiSendBuffer.Append(pBuffer, nBufLen);
 			delete[] pBuffer;
@@ -726,52 +720,54 @@
 			bProcess = true; // we want to try to send it right now
 		}
 	}
-	
-	if (lpBuf == NULL || bProcess){
+
+	if (lpBuf == NULL || bProcess) {
 		// this call is for processing pending data
-		if (m_pfiSendBuffer.IsEmpty() || nStartCryptFromByte != 0){
-			wxASSERT( false );
+		if (m_pfiSendBuffer.IsEmpty() || nStartCryptFromByte != 0) {
+			wxFAIL;
 			return 0;							// or not
 		}
 		nBufLen = (uint32)m_pfiSendBuffer.GetLength();
 		pBuffer = m_pfiSendBuffer.Detach();
 	}
-	
-    wxASSERT( m_pfiSendBuffer.IsEmpty() );
-	
-	uint32 result = 0;	
+
+	wxASSERT( m_pfiSendBuffer.IsEmpty() );
+
+	uint32_t result = 0;
 	if (!bDelaySend) {
 		//printf("Writing negotiation data on %s: ", (const char*) unicode2char(DbgGetIPString()));					
 		CSocketClientProxy::Write(pBuffer, nBufLen);
 		result = CSocketClientProxy::LastCount();
 		//printf("Wrote %i bytes\n",result);
 	}
-	
-	if (result == (uint32)SOCKET_ERROR || bDelaySend){
+
+	if (result == (uint32_t)SOCKET_ERROR || bDelaySend) {
 		m_pfiSendBuffer.Write(pBuffer, nBufLen);
 		delete[] pBuffer;
 		return result;
-    } else {
-		if (result < nBufLen){
+	} else {
+		if (result < nBufLen) {
 			// Store the partial data pending
-			//printf("Partial negotiation pending on %s\n", (const char*) unicode2char(DbgGetIPString()));					
-			m_pfiSendBuffer.Write(pBuffer + result, nBufLen - result);			
+			//printf("Partial negotiation pending on %s\n", (const char*) unicode2char(DbgGetIPString()));
+			m_pfiSendBuffer.Write(pBuffer + result, nBufLen - result);
 		}
 		delete[] pBuffer;
 		return result;
 	}
 }
 
-wxString	CEncryptedStreamSocket::DbgGetIPString(){
+wxString CEncryptedStreamSocket::DbgGetIPString()
+{
 	amuleIPV4Address address;
 	GetPeer(address);
 	return address.IPAddress();
 }
 
-uint8 CEncryptedStreamSocket::GetSemiRandomNotProtocolMarker() const{
-	uint8 bySemiRandomNotProtocolMarker = 0;
+uint8_t CEncryptedStreamSocket::GetSemiRandomNotProtocolMarker() const
+{
+	uint8_t bySemiRandomNotProtocolMarker = 0;
 	bool bOk = false;
-	for (int i = 0; i < 128; i++){
+	for (int i = 0; i < 128; i++) {
 		bySemiRandomNotProtocolMarker = GetRandomUint8();
 		switch (bySemiRandomNotProtocolMarker) { // not allowed values
 				case OP_EDONKEYPROT:
@@ -781,15 +777,15 @@
 				default:
 					bOk = true;
 		}
-		
+
 		if (bOk) {
 			break;
 		}
 	}
-	
-	if (!bOk){
+
+	if (!bOk) {
 		// either we have _real_ bad luck or the randomgenerator is a bit messed up
-		wxASSERT( false );
+		wxFAIL;
 		bySemiRandomNotProtocolMarker = 0x01;
 	}
 	return bySemiRandomNotProtocolMarker;

aMule-2.2.6.tar.bz2/src/EncryptedStreamSocket.h -> aMule-2.3.1.tar.bz2/src/EncryptedStreamSocket.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -60,12 +60,12 @@
 
 enum ENegotiatingState {
 	ONS_NONE,
-	
+
 	ONS_BASIC_CLIENTA_RANDOMPART,
 	ONS_BASIC_CLIENTA_MAGICVALUE,
 	ONS_BASIC_CLIENTA_METHODTAGSPADLEN,
 	ONS_BASIC_CLIENTA_PADDING,
-	
+
 	ONS_BASIC_CLIENTB_MAGICVALUE,
 	ONS_BASIC_CLIENTB_METHODTAGSPADLEN,
 	ONS_BASIC_CLIENTB_PADDING,
@@ -83,74 +83,55 @@
 	ENM_OBFUSCATION = 0x00
 };
 
-class CRC4EncryptableBuffer;
 
 class CEncryptedStreamSocket : public CSocketClientProxy
 {
 public:
-	CEncryptedStreamSocket(
-		wxSocketFlags flags = wxSOCKET_NONE,
-		const CProxyData *proxyData = NULL);
+	CEncryptedStreamSocket(wxSocketFlags flags = wxSOCKET_NONE, const CProxyData *proxyData = NULL);
 	virtual ~CEncryptedStreamSocket();
 
-	void SetConnectionEncryption(
-		bool bEnabled,
-		const uint8 *pTargetClientHash,
-		bool bServerConnection);
+	void SetConnectionEncryption(bool bEnabled, const uint8_t *pTargetClientHash, bool bServerConnection);
 
-	//! Indicates how many bytes were received including obfusication
+	//! Indicates how many bytes were received including obfuscation,
 	//! so that the parent knows if the receive limit was reached
-	uint32 GetRealReceivedBytes() const
-	{
-		return m_nObfusicationBytesReceived;
-	}
-
-	bool IsObfusicating() const
-	{
-		return m_StreamCryptState == ECS_ENCRYPTING &&
-			m_EncryptionMethod == ENM_OBFUSCATION;
-	}
-	
-	bool IsServerCryptEnabledConnection() const { return m_bServerCrypt; }	
-
-	uint8	m_dbgbyEncryptionSupported;
-	uint8	m_dbgbyEncryptionRequested;
-	uint8	m_dbgbyEncryptionMethodSet;
+	uint32_t GetRealReceivedBytes() const		{ return m_nObfusicationBytesReceived; }
+
+	bool	IsObfusicating() const			{ return m_StreamCryptState == ECS_ENCRYPTING && m_EncryptionMethod == ENM_OBFUSCATION; }
+	bool	IsServerCryptEnabledConnection() const	{ return m_bServerCrypt; }
+
+	uint8_t	m_dbgbyEncryptionSupported;
+	uint8_t	m_dbgbyEncryptionRequested;
+	uint8_t	m_dbgbyEncryptionMethodSet;
 
 protected:
-	int Write(const void* lpBuf, wxUint32 nBufLen);
-	int Read(void* lpBuf, wxUint32 nBufLen);
+	int	Write(const void* lpBuf, uint32_t nBufLen);
+	int	Read(void* lpBuf, uint32_t nBufLen);
 
 	virtual void OnError(int /*nErrorCode*/) {};
 	virtual void OnSend(int nErrorCode);
 
 	wxString	DbgGetIPString();
-	void		CryptPrepareSendData(uint8* pBuffer, uint32 nLen);
+	void		CryptPrepareSendData(uint8_t* pBuffer, uint32_t nLen);
 	bool		IsEncryptionLayerReady();
-	uint8		GetSemiRandomNotProtocolMarker() const;
-	
-	uint32	m_nObfusicationBytesReceived;
-	EStreamCryptState m_StreamCryptState;
-	EEncryptionMethods  m_EncryptionMethod;
-	bool m_bFullReceive;
-	bool m_bServerCrypt;
+	uint8_t		GetSemiRandomNotProtocolMarker() const;
+
+	uint32_t		m_nObfusicationBytesReceived;
+	EStreamCryptState	m_StreamCryptState;
+	EEncryptionMethods	m_EncryptionMethod;
+	bool			m_bFullReceive;
+	bool			m_bServerCrypt;
 
 private:
-	int Negotiate(const uint8* pBuffer, uint32 nLen);
-	void StartNegotiation(bool bOutgoing);
-	int SendNegotiatingData(
-		const void *lpBuf,
-		uint32 nBufLen,
-		uint32 nStartCryptFromByte = 0,
-		bool bDelaySend = false);
+	int	Negotiate(const uint8_t* pBuffer, uint32_t nLen);
+	void	StartNegotiation(bool bOutgoing);
+	int	SendNegotiatingData(const void *lpBuf, uint32_t nBufLen, uint32_t nStartCryptFromByte = 0, bool bDelaySend = false);
 
 	ENegotiatingState	m_NegotiatingState;
 	CRC4EncryptableBuffer	m_pfiReceiveBuffer;
-	uint32			m_nReceiveBytesWanted;
+	uint32_t		m_nReceiveBytesWanted;
 	CRC4EncryptableBuffer	m_pfiSendBuffer;
-	uint32			m_nRandomKeyPart;
+	uint32_t		m_nRandomKeyPart;
 	CryptoPP::Integer	m_cryptDHA;
-
 };
 
 #endif // __ENCRYPTEDSTREAMSOCKET_H__

aMule-2.2.6.tar.bz2/src/ExternalConn.cpp -> aMule-2.3.1.tar.bz2/src/ExternalConn.cpp Changed

@@ -1,8 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 Kry ( elkry@sourceforge.net / http://www.amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Kry ( elkry@sourceforge.net / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-2011 Froenchenko Leonid (lfroen@gmail.com)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -32,6 +33,7 @@
 #include <common/Format.h>		// Needed for CFormat
 
 #include <common/ClientVersion.h>
+#include <common/MD5Sum.h>
 
 #include "ExternalConn.h"	// Interface declarations
 #include "updownclient.h"	// Needed for CUpDownClient
@@ -42,14 +44,154 @@
 #include "UploadQueue.h"	// Needed for CUploadQueue
 #include "amule.h"		// Needed for theApp
 #include "SearchList.h"		// Needed for GetSearchResults
-#include "IPFilter.h"		// Needed for CIPFilter
 #include "ClientList.h"
 #include "Preferences.h"	// Needed for CPreferences
 #include "Logger.h"
 #include "GuiEvents.h"		// Needed for Notify_* macros
 #include "Statistics.h"		// Needed for theStats
 #include "KnownFileList.h"	// Needed for CKnownFileList
+#include "Friend.h"
+#include "FriendList.h"
+#include "RandomFunctions.h"
 #include "kademlia/kademlia/Kademlia.h"
+#include "kademlia/kademlia/UDPFirewallTester.h"
+
+
+//-------------------- File_Encoder --------------------
+
+
+/*
+ * Encode 'obtained parts' info to be sent to remote gui
+ */
+class CKnownFile_Encoder {
+	// number of sources for each part for progress bar colouring
+	RLE_Data m_enc_data;
+protected:
+	const CKnownFile *m_file;
+public:
+	CKnownFile_Encoder(const CKnownFile *file = 0) { m_file = file; }
+
+	virtual ~CKnownFile_Encoder() {}
+
+	virtual void Encode(CECTag *parent_tag);
+
+	virtual void ResetEncoder()
+	{
+		m_enc_data.ResetEncoder();
+	}
+
+	virtual void SetShared() { }
+	virtual bool IsShared() { return true; }
+	virtual bool IsPartFile_Encoder() { return false; }
+	const CKnownFile * GetFile() { return m_file; }
+};
+
+/*!
+ * PartStatus strings and gap lists are quite long - RLE encoding will help.
+ * 
+ * Instead of sending each time full part-status string, send
+ * RLE encoded difference from previous one.
+ *
+ * PartFileEncoderData class is used for decode only,
+ * while CPartFile_Encoder is used for encode only.
+ */
+class CPartFile_Encoder : public CKnownFile_Encoder {
+	// blocks requested for download
+	RLE_Data m_req_status;
+	// gap list
+	RLE_Data m_gap_status;
+	// source names
+	SourcenameItemMap m_sourcenameItemMap;
+	// counter for unique source name ids
+	int m_sourcenameID;
+	// not all part files are shared (only when at least one part is complete)
+	bool m_shared;
+
+	// cast inherited member to CPartFile
+	CPartFile * m_PartFile() { wxASSERT(m_file->IsCPartFile()); return (CPartFile *)m_file; }
+public:
+	// encoder side
+	CPartFile_Encoder(const CPartFile *file = 0) : CKnownFile_Encoder(file)
+	{ 
+		m_sourcenameID = 0;
+		m_shared = false;
+	}
+
+	virtual ~CPartFile_Encoder() {}
+	
+	// encode - take data from m_file
+	virtual void Encode(CECTag *parent_tag);
+
+	// Encoder may reset history if full info requested
+	virtual void ResetEncoder();
+
+	virtual void SetShared() { m_shared = true; }
+	virtual bool IsShared() { return m_shared; }
+	virtual bool IsPartFile_Encoder() { return true; }
+};
+
+class CFileEncoderMap : public std::map<uint32, CKnownFile_Encoder*> {
+	typedef std::set<uint32> IDSet;
+public:
+	~CFileEncoderMap();
+	void UpdateEncoders();
+};
+
+CFileEncoderMap::~CFileEncoderMap()
+{
+	// DeleteContents() causes infinite recursion here!
+	for (iterator it = begin(); it != end(); it++) {
+		delete it->second;
+	}
+}
+
+// Check if encoder contains files that are no longer used
+// or if we have new files without encoder yet.
+void CFileEncoderMap::UpdateEncoders()
+{
+	IDSet curr_files, dead_files;
+	// Downloads
+	std::vector<CPartFile*> downloads;
+	theApp->downloadqueue->CopyFileList(downloads, true);
+	for (uint32 i = downloads.size(); i--;) {
+		uint32 id = downloads[i]->ECID();
+		curr_files.insert(id);
+		if (!count(id)) {
+			(*this)[id] = new CPartFile_Encoder(downloads[i]);
+		}
+	}
+	// Shares
+	std::vector<CKnownFile*> shares;
+	theApp->sharedfiles->CopyFileList(shares);
+	for (uint32 i = shares.size(); i--;) {
+		uint32 id = shares[i]->ECID();
+		// Check if it is already there.
+		// The curr_files.count(id) is enough, the IsCPartFile() is just a speedup.
+		if (shares[i]->IsCPartFile() && curr_files.count(id)) {
+			(*this)[id]->SetShared();
+			continue;
+		}
+		curr_files.insert(id);
+		if (!count(id)) {
+			(*this)[id] = new CKnownFile_Encoder(shares[i]);
+		}
+	}
+	// Check for removed files, and store them in a set for deletion.
+	// (std::map documentation is unclear if a construct like
+	//		iterator to_del = it++; erase(to_del) ;
+	// works or invalidates it too.)
+	for (iterator it = begin(); it != end(); it++) {
+		if (!curr_files.count(it->first)) {
+			dead_files.insert(it->first);
+		}
+	}
+	// then delete them
+	for (IDSet::iterator it = dead_files.begin(); it != dead_files.end(); it++) {
+		iterator it2 = find(*it);
+		delete it2->second;
+		erase(it2);
+	}
+}
 
 
 //-------------------- CECServerSocket --------------------
@@ -57,30 +199,46 @@
 class CECServerSocket : public CECMuleSocket
 {
 public:
-	CECServerSocket();
+	CECServerSocket(ECNotifier *notifier);
 	virtual ~CECServerSocket();
 
-	virtual const CECPacket *OnPacketReceived(const CECPacket *packet);
+	virtual const CECPacket *OnPacketReceived(const CECPacket *packet, uint32 trueSize);
 	virtual void OnLost();
 
+	virtual void WriteDoneAndQueueEmpty();
+
+	void	ResetLog() { m_LoggerAccess.Reset(); }
 private:
-	bool m_authenticated;
-	CPartFile_Encoder_Map	m_part_encoder;
-	CKnownFile_Encoder_Map	m_shared_encoder;
+	ECNotifier *m_ec_notifier;
+
+	const CECPacket *Authenticate(const CECPacket *);
+
+	enum {
+		CONN_INIT,
+		CONN_SALT_SENT,
+		CONN_ESTABLISHED,
+		CONN_FAILED
+	} m_conn_state;
+
+	uint64_t m_passwd_salt;
+	CLoggerAccess m_LoggerAccess;
+	CFileEncoderMap	m_FileEncoder;
 	CObjTagMap		m_obj_tagmap;
+	CECPacket *ProcessRequest2(const CECPacket *request);
+
+	virtual bool IsAuthorized() { return m_conn_state == CONN_ESTABLISHED; }
 };
 
 
-CECServerSocket::CECServerSocket()
+CECServerSocket::CECServerSocket(ECNotifier *notifier)
 :
 CECMuleSocket(true),
-m_authenticated(false),
-m_part_encoder(),
-m_shared_encoder(),
-m_obj_tagmap()
+m_conn_state(CONN_INIT),
+m_passwd_salt(GetRandomUint64())
 {
 	wxASSERT(theApp->ECServerHandler);
 	theApp->ECServerHandler->AddSocket(this);
+	m_ec_notifier = notifier;
 }
 
 
@@ -91,21 +249,25 @@
 }
 
 
-const CECPacket *CECServerSocket::OnPacketReceived(const CECPacket *packet)
+const CECPacket *CECServerSocket::OnPacketReceived(const CECPacket *packet, uint32 trueSize)
 {
+	packet->DebugPrint(true, trueSize);
+
 	const CECPacket *reply = NULL;
 
-	if (!m_authenticated) {
-		reply = ExternalConn::Authenticate(packet);
-		if (reply->GetOpCode() != EC_OP_AUTH_OK) {
-			// Access denied!
-			AddLogLineM(false, _("Unauthorized access attempt. Connection closed."));
-		} else {
-			m_authenticated = true;
-		}
+	if (m_conn_state == CONN_FAILED) {
+		// Client didn't close the socket when authentication failed.
+		AddLogLineN(_("Client sent packet after authentication failed."));
+		CloseSocket();
+	}
+
+	if (m_conn_state != CONN_ESTABLISHED) {
+		// This is called twice:
+		// 1) send salt
+		// 2) verify password
+		reply = Authenticate(packet);
 	} else {
-		reply = ExternalConn::ProcessRequest2(
-			packet, m_part_encoder, m_shared_encoder, m_obj_tagmap);
+		reply = ProcessRequest2(packet);
 	}
 	return reply;
 }
@@ -113,10 +275,22 @@
 
 void CECServerSocket::OnLost()
 {
-	AddLogLineM(false,_("External connection closed."));
+	AddLogLineN(_("External connection closed."));
+	theApp->ECServerHandler->m_ec_notifier->Remove_EC_Client(this);
 	DestroySocket();
 }
 
+void CECServerSocket::WriteDoneAndQueueEmpty()
+{
+	if ( HaveNotificationSupport() && (m_conn_state == CONN_ESTABLISHED) ) {
+		CECPacket *packet = m_ec_notifier->GetNextPacket(this);
+		if ( packet ) {
+			SendPacket(packet);
+		}
+	} else {
+		//printf("[EC] %p: WriteDoneAndQueueEmpty but notification disabled\n", this);
+	}
+}
 
 //-------------------- ExternalConn --------------------
 
@@ -140,7 +314,7 @@
 		// We must have a valid password, otherwise we will not allow EC connections
 		if (thePrefs::ECPassword().IsEmpty()) {
 			*msg += wxT("External connections disabled due to empty password!\n");
-			AddLogLineM(true, _("External connections disabled due to empty password!"));
+			AddLogLineC(_("External connections disabled due to empty password!"));
 			return;
 		}
 		
@@ -153,20 +327,19 @@
 		int port = addr.Service();
 		wxString ip = addr.IPAddress();
 		if (m_ECServer->Ok()) {
-			msgLocal = wxT("*** TCP socket (ECServer) listening on ") + ip + 
-				wxString::Format(wxT(":%d"), port);
+			msgLocal = CFormat(wxT("*** TCP socket (ECServer) listening on %s:%d")) % ip % port;
 			*msg += msgLocal + wxT("\n");
-			AddLogLineM(false, msgLocal);
+			AddLogLineN(msgLocal);
 		} else {
-			msgLocal = wxT("Could not listen for external connections at ") + ip + 
-				wxString::Format(wxT(":%d!"), port);
+			msgLocal = CFormat(wxT("Could not listen for external connections at %s:%d!")) % ip % port;
 			*msg += msgLocal + wxT("\n");
-			AddLogLineM(false, msgLocal);
+			AddLogLineN(msgLocal);
 		}
 	} else {
 		*msg += wxT("External connections disabled in config file\n");
-		AddLogLineM(false,_("External connections disabled in config file"));
+		AddLogLineN(_("External connections disabled in config file"));
 	}
+	m_ec_notifier = new ECNotifier();
 }
 
 
@@ -174,6 +347,7 @@
 {
 	KillAllSockets();
 	delete m_ECServer;
+	delete m_ec_notifier;
 }
 
 
@@ -193,7 +367,7 @@
 
 void ExternalConn::KillAllSockets()
 {
-	AddDebugLogLineM(false, logGeneral,
+	AddDebugLogLineN(logGeneral,
 		CFormat(wxT("ExternalConn::KillAllSockets(): %d sockets to destroy.")) %
 			socket_list.size());
 	SocketSet::iterator it = socket_list.begin();
@@ -201,23 +375,32 @@
 		CECServerSocket *s = *(it++);
 		s->Close();
 		s->Destroy();
-		delete s;
+	}
+}
+
+
+void ExternalConn::ResetAllLogs()
+{
+	SocketSet::iterator it = socket_list.begin();
+	while (it != socket_list.end()) {
+		CECServerSocket *s = *(it++);
+		s->ResetLog();
 	}
 }
 
 
 void ExternalConn::OnServerEvent(wxSocketEvent& WXUNUSED(event))
 {
-	CECServerSocket *sock = new CECServerSocket;
+	CECServerSocket *sock = new CECServerSocket(m_ec_notifier);
 	// Accept new connection if there is one in the pending
 	// connections queue, else exit. We use Accept(FALSE) for
 	// non-blocking accept (although if we got here, there
 	// should ALWAYS be a pending connection).
 	if ( m_ECServer->AcceptWith(*sock, false) ) {
-		AddLogLineM(false, _("New external connection accepted"));
+		AddLogLineN(_("New external connection accepted"));
 	} else {
 		delete sock;
-		AddLogLineM(false, _("ERROR: couldn't accept a new external connection"));
+		AddLogLineN(_("ERROR: couldn't accept a new external connection"));
 	}
 	
 }
@@ -225,36 +408,33 @@
 //
 // Authentication
 //
-CECPacket *ExternalConn::Authenticate(const CECPacket *request)
+const CECPacket *CECServerSocket::Authenticate(const CECPacket *request)
 {
 	CECPacket *response;
-
+	
 	if (request == NULL) {
-		response = new CECPacket(EC_OP_AUTH_FAIL);
-		return response;
+		return new CECPacket(EC_OP_AUTH_FAIL);
 	}
 
 	// Password must be specified if we are to allow remote connections
 	if ( thePrefs::ECPassword().IsEmpty() ) {
-		AddLogLineM(true, _("External connection refused due to empty password in preferences!"));	
+		AddLogLineC(_("External connection refused due to empty password in preferences!"));	
 		
 		return new CECPacket(EC_OP_AUTH_FAIL);
 	}
-	
-
-	if (request->GetOpCode() == EC_OP_AUTH_REQ) {
+		
+	if ((m_conn_state == CONN_INIT) && (request->GetOpCode() == EC_OP_AUTH_REQ) ) {
 		const CECTag *clientName = request->GetTagByName(EC_TAG_CLIENT_NAME);
 		const CECTag *clientVersion = request->GetTagByName(EC_TAG_CLIENT_VERSION);
 		
-		AddLogLineM(false, CFormat( _("Connecting client: %s %s") )
+		AddLogLineN(CFormat( _("Connecting client: %s %s") )
 			% ( clientName ? clientName->GetStringData() : wxString(_("Unknown")) )
 			% ( clientVersion ? clientVersion->GetStringData() : wxString(_("Unknown version")) ) );
-		const CECTag *passwd = request->GetTagByName(EC_TAG_PASSWD_HASH);
 		const CECTag *protocol = request->GetTagByName(EC_TAG_PROTOCOL_VERSION);
 #ifdef EC_VERSION_ID
 		// For SVN versions, both client and server must use SVNDATE, and they must be the same
 		CMD4Hash vhash;
-		if (not vhash.Decode(wxT(EC_VERSION_ID))) {
+		if (!vhash.Decode(wxT(EC_VERSION_ID))) {
 			response = new CECPacket(EC_OP_AUTH_FAIL);
 			response->AddTag(CECTag(EC_TAG_STRING, wxT("Fatal error, version hash is not a valid MD4-hash.")));
 		} else if (!request->GetTagByName(EC_TAG_VERSION_ID) || request->GetTagByNameSafe(EC_TAG_VERSION_ID)->GetMD4Data() != vhash) {
@@ -264,62 +444,136 @@
 		// For release versions, we don't want to allow connections from any arbitrary SVN client.
 		if (request->GetTagByName(EC_TAG_VERSION_ID)) { 
 			response = new CECPacket(EC_OP_AUTH_FAIL);
-			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("You cannot connect to a release version from an arbitrary SVN version! *sigh* possible crash prevented")));
+			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("You cannot connect to a release version from an arbitrary development snapshot! *sigh* possible crash prevented")));
 #endif
 		} else if (protocol != NULL) {
 			uint16 proto_version = protocol->GetInt();
 			if (proto_version == EC_CURRENT_PROTOCOL_VERSION) {
-				CMD4Hash passh;
-
-				if (!passh.Decode(thePrefs::ECPassword())) {
-					AddLogLineM(false, wxT("EC Auth failed, invalid hash specificed as EC password: ") + thePrefs::ECPassword());
-					response = new CECPacket(EC_OP_AUTH_FAIL);
-					response->AddTag(CECTag(EC_TAG_STRING, wxT("Authentication failed, invalid hash specified as EC password.")));				
-				} else if (passwd && passwd->GetMD4Data() == passh) {
-					response = new CECPacket(EC_OP_AUTH_OK);
-				} else {
-					if (passwd) {
-						AddLogLineM(false, wxT("EC Auth failed: (") + passwd->GetMD4Data().Encode() + wxT(" != ") + passh.Encode() + wxT(")."));
-					} else {
-						AddLogLineM(false, wxT("EC Auth failed. Password tag missing."));					
-					}
-
-					response = new CECPacket(EC_OP_AUTH_FAIL);
-					response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Authentication failed.")));
+				response = new CECPacket(EC_OP_AUTH_SALT);
+				response->AddTag(CECTag(EC_TAG_PASSWD_SALT, m_passwd_salt));
+				m_conn_state = CONN_SALT_SENT;
+				//
+				// So far ok, check capabilities of client
+				//
+				bool canZLIB = false, canUTF8numbers = false;
+				if (request->GetTagByName(EC_TAG_CAN_ZLIB)) {
+					canZLIB = true;
+					m_my_flags |= EC_FLAG_ZLIB;
 				}
+				if (request->GetTagByName(EC_TAG_CAN_UTF8_NUMBERS)) {
+					canUTF8numbers = true;
+					m_my_flags |= EC_FLAG_UTF8_NUMBERS;
+				}
+				m_haveNotificationSupport = request->GetTagByName(EC_TAG_CAN_NOTIFY) != NULL;
+				AddDebugLogLineN(logEC, CFormat(wxT("Client capabilities: ZLIB: %s  UTF8 numbers: %s  Push notification: %s") )
+					% (canZLIB ? wxT("yes") : wxT("no"))
+					% (canUTF8numbers ? wxT("yes") : wxT("no"))
+					% (m_haveNotificationSupport ? wxT("yes") : wxT("no")));
+				if (canZLIB && canUTF8numbers) {}	// get rid of unused variable warning
 			} else {
 				response = new CECPacket(EC_OP_AUTH_FAIL);
-				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid protocol version.") + wxString::Format(wxT("( %i != %i )"),proto_version,EC_CURRENT_PROTOCOL_VERSION)));
+				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid protocol version.")
+					+ CFormat(wxT("( %#.4x != %#.4x )")) % proto_version % (uint16_t)EC_CURRENT_PROTOCOL_VERSION));
 			}
 		} else {
 			response = new CECPacket(EC_OP_AUTH_FAIL);
 			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Missing protocol version tag.")));
 		}
+	} else if ((m_conn_state == CONN_SALT_SENT) && (request->GetOpCode() == EC_OP_AUTH_PASSWD)) {
+		const CECTag *passwd = request->GetTagByName(EC_TAG_PASSWD_HASH);
+		CMD4Hash passh;
+
+		if (!passh.Decode(thePrefs::ECPassword())) {
+			wxString err = wxTRANSLATE("Authentication failed: invalid hash specified as EC password.");
+			AddLogLineN(wxString(wxGetTranslation(err)) 
+						+ wxT(" ") + thePrefs::ECPassword());
+			response = new CECPacket(EC_OP_AUTH_FAIL);
+			response->AddTag(CECTag(EC_TAG_STRING, err));				
+		} else {
+			wxString saltHash = MD5Sum(CFormat(wxT("%lX")) % m_passwd_salt).GetHash();
+			wxString saltStr = CFormat(wxT("%lX")) % m_passwd_salt;
+			
+			passh.Decode(MD5Sum(thePrefs::ECPassword().Lower() + saltHash).GetHash());
+			
+			if (passwd && passwd->GetMD4Data() == passh) {
+				response = new CECPacket(EC_OP_AUTH_OK);
+				response->AddTag(CECTag(EC_TAG_SERVER_VERSION, wxT(VERSION)));
+			} else {
+				wxString err;
+				if (passwd) {
+					err = wxTRANSLATE("Authentication failed: wrong password.");
+				} else {
+					err = wxTRANSLATE("Authentication failed: missing password.");
+				}
+
+				response = new CECPacket(EC_OP_AUTH_FAIL);
+				response->AddTag(CECTag(EC_TAG_STRING, err));
+				AddLogLineN(wxGetTranslation(err));
+			}
+		}
 	} else {
 		response = new CECPacket(EC_OP_AUTH_FAIL);
-		response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid request, you should first authenticate.")));
+		response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid request, please authenticate first.")));
 	}
-
-	response->AddTag(CECTag(EC_TAG_SERVER_VERSION, wxT(VERSION)));
-
+	
 	if (response->GetOpCode() == EC_OP_AUTH_OK) {
-		AddLogLineM(false, _("Access granted."));
-	} else {
-		AddLogLineM(false, wxGetTranslation(response->GetTagByIndex(0)->GetStringData()));
+		m_conn_state = CONN_ESTABLISHED;
+		AddLogLineN(_("Access granted."));
+		// Establish notification handler if client supports it
+		if (HaveNotificationSupport()) {
+			theApp->ECServerHandler->m_ec_notifier->Add_EC_Client(this);
+		}
+	} else if (response->GetOpCode() == EC_OP_AUTH_FAIL) {
+		// Log message sent to client
+		if (response->GetFirstTagSafe()->IsString()) {
+			AddLogLineN(CFormat(_("Sent error message \"%s\" to client.")) % wxGetTranslation(response->GetFirstTagSafe()->GetStringData()));
+		}
+		// Access denied!
+		amuleIPV4Address address;
+		GetPeer(address);
+		AddLogLineN(CFormat(_("Unauthorized access attempt from %s. Connection closed.")) % address.IPAddress() );
+		m_conn_state = CONN_FAILED;
 	}
 
 	return response;
 }
 
-CECPacket *Get_EC_Response_StatRequest(const CECPacket *request)
+// Make a Logger tag (if there are any logging messages) and add it to the response
+static void AddLoggerTag(CECPacket *response, CLoggerAccess &LoggerAccess)
+{
+	if (LoggerAccess.HasString()) {
+		CECEmptyTag tag(EC_TAG_STATS_LOGGER_MESSAGE);
+		// Tag structure is fix: tag carries nothing, inside are the strings
+		// maximum of 200 log lines per message
+		int entries = 0;
+		wxString line;
+		while (entries < 200 && LoggerAccess.GetString(line)) {
+			tag.AddTag(CECTag(EC_TAG_STRING, line));
+			entries++;
+		}
+		response->AddTag(tag);
+		//printf("send Log tag %d %d\n", FirstEntry, entries);
+	}
+}
+
+static CECPacket *Get_EC_Response_StatRequest(const CECPacket *request, CLoggerAccess &LoggerAccess)
 {
 	CECPacket *response = new CECPacket(EC_OP_STATS);
 
 	switch (request->GetDetailLevel()) {
 		case EC_DETAIL_FULL:
+		// This is not an actual INC_UPDATE.
+		// amulegui only sets the detail level of the stats package to EC_DETAIL_INC_UPDATE
+		// so that the included conn state tag is created the way it is needed here.
+		case EC_DETAIL_INC_UPDATE:
 			response->AddTag(CECTag(EC_TAG_STATS_UP_OVERHEAD, (uint32)theStats::GetUpOverheadRate()));
 			response->AddTag(CECTag(EC_TAG_STATS_DOWN_OVERHEAD, (uint32)theStats::GetDownOverheadRate()));
 			response->AddTag(CECTag(EC_TAG_STATS_BANNED_COUNT, /*(uint32)*/theStats::GetBannedCount()));
+			AddLoggerTag(response, LoggerAccess);
+			// Needed only for the remote tray icon context menu
+			response->AddTag(CECTag(EC_TAG_STATS_TOTAL_SENT_BYTES, theStats::GetTotalSentBytes()));
+			response->AddTag(CECTag(EC_TAG_STATS_TOTAL_RECEIVED_BYTES, theStats::GetTotalReceivedBytes()));
+			response->AddTag(CECTag(EC_TAG_STATS_SHARED_FILE_COUNT, theStats::GetSharedFileCount()));
 		case EC_DETAIL_WEB:
 		case EC_DETAIL_CMD:
 			response->AddTag(CECTag(EC_TAG_STATS_UL_SPEED, (uint32)theStats::GetUploadRate()));
@@ -337,15 +591,34 @@
 				response->AddTag(CECTag(EC_TAG_STATS_ED2K_FILES, totalfile));
 				response->AddTag(CECTag(EC_TAG_STATS_KAD_FILES, Kademlia::CKademlia::GetKademliaFiles()));
 			}
+			// Kad stats
+			if (Kademlia::CKademlia::IsConnected()) {
+				response->AddTag(CECTag(EC_TAG_STATS_KAD_FIREWALLED_UDP, Kademlia::CUDPFirewallTester::IsFirewalledUDP(true)));
+				response->AddTag(CECTag(EC_TAG_STATS_KAD_INDEXED_SOURCES, Kademlia::CKademlia::GetIndexed()->m_totalIndexSource));
+				response->AddTag(CECTag(EC_TAG_STATS_KAD_INDEXED_KEYWORDS, Kademlia::CKademlia::GetIndexed()->m_totalIndexKeyword));
+				response->AddTag(CECTag(EC_TAG_STATS_KAD_INDEXED_NOTES, Kademlia::CKademlia::GetIndexed()->m_totalIndexNotes));
+				response->AddTag(CECTag(EC_TAG_STATS_KAD_INDEXED_LOAD, Kademlia::CKademlia::GetIndexed()->m_totalIndexLoad));
+				response->AddTag(CECTag(EC_TAG_STATS_KAD_IP_ADRESS, wxUINT32_SWAP_ALWAYS(Kademlia::CKademlia::GetPrefs()->GetIPAddress())));
+				response->AddTag(CECTag(EC_TAG_STATS_KAD_IN_LAN_MODE, Kademlia::CKademlia::IsRunningInLANMode()));
+				response->AddTag(CECTag(EC_TAG_STATS_BUDDY_STATUS, theApp->clientlist->GetBuddyStatus()));
+				uint32 BuddyIP = 0;
+				uint16 BuddyPort = 0;
+				CUpDownClient * Buddy = theApp->clientlist->GetBuddy();
+				if (Buddy) {
+					BuddyIP = Buddy->GetIP();
+					BuddyPort = Buddy->GetUDPPort();
+				}
+				response->AddTag(CECTag(EC_TAG_STATS_BUDDY_IP, BuddyIP));
+				response->AddTag(CECTag(EC_TAG_STATS_BUDDY_PORT, BuddyPort));
+			}
 		case EC_DETAIL_UPDATE:
-		case EC_DETAIL_INC_UPDATE:
 			break;
 	};
 
 	return response;
 }
 
-CECPacket *Get_EC_Response_GetSharedFiles(const CECPacket *request, CKnownFile_Encoder_Map &encoders)
+static CECPacket *Get_EC_Response_GetSharedFiles(const CECPacket *request, CFileEncoderMap &encoders)
 {
 	wxASSERT(request->GetOpCode() == EC_OP_GET_SHARED_FILES);
 
@@ -354,141 +627,121 @@
 	EC_DETAIL_LEVEL detail_level = request->GetDetailLevel();
 	//
 	// request can contain list of queried items
-	CTagSet<CMD4Hash, EC_TAG_KNOWNFILE> queryitems(request);
+	CTagSet<uint32, EC_TAG_KNOWNFILE> queryitems(request);
 
-	encoders.UpdateEncoders(theApp->sharedfiles);
+	encoders.UpdateEncoders();
 	
 	for (uint32 i = 0; i < theApp->sharedfiles->GetFileCount(); ++i) {
 		CKnownFile *cur_file = (CKnownFile *)theApp->sharedfiles->GetFileByIndex(i);
 
-		if ( !cur_file || (!queryitems.empty() && !queryitems.count(cur_file->GetFileHash())) ) {
+		if ( !cur_file || (!queryitems.empty() && !queryitems.count(cur_file->ECID())) ) {
 			continue;
 		}
 
 		CEC_SharedFile_Tag filetag(cur_file, detail_level);
-		CKnownFile_Encoder &enc = encoders[cur_file];
+		CKnownFile_Encoder *enc = encoders[cur_file->ECID()];
 		if ( detail_level != EC_DETAIL_UPDATE ) {
-			enc.ResetEncoder();
+			enc->ResetEncoder();
 		}
-		enc.Encode(&filetag);
+		enc->Encode(&filetag);
 		response->AddTag(filetag);
 	}
 	return response;
 }
 
-CECPacket *Get_EC_Response_GetSharedFiles(CKnownFile_Encoder_Map &encoders, CObjTagMap &tagmap)
+static CECPacket *Get_EC_Response_GetUpdate(CFileEncoderMap &encoders, CObjTagMap &tagmap)
 {
 	CECPacket *response = new CECPacket(EC_OP_SHARED_FILES);
 
-	encoders.UpdateEncoders(theApp->sharedfiles);
-	for (uint32 i = 0; i < theApp->sharedfiles->GetFileCount(); ++i) {
-		CKnownFile *cur_file = (CKnownFile *)theApp->sharedfiles->GetFileByIndex(i);
-		
-		//
-		// Hashes of tags are maintained on "per-object" basis. So, in this mode only
-		// same kind of objects can go into particular query type.
-		// Particulary here it means that files from download queue (aka partfiles)
-		// will not ne shown as shared files. Remote gui can do combine them if wishes
-		//
-		if ( !cur_file || cur_file->IsPartFile() ) continue;
-
-		CValueMap &valuemap = tagmap.GetValueMap(cur_file);
-		CEC_SharedFile_Tag filetag(cur_file, valuemap);
-		CKnownFile_Encoder &enc = encoders[cur_file];
-		enc.Encode(&filetag);
-		
-		response->AddTag(filetag);
+	encoders.UpdateEncoders();
+	for (CFileEncoderMap::iterator it = encoders.begin(); it != encoders.end(); ++it) {
+		const CKnownFile *cur_file = it->second->GetFile();
+		CValueMap &valuemap = tagmap.GetValueMap(cur_file->ECID());
+		// Completed cleared Partfiles are still stored as CPartfile,
+		// but encoded as KnownFile, so we have to check the encoder type
+		// instead of the file type.
+		if (it->second->IsPartFile_Encoder()) {
+			CEC_PartFile_Tag filetag((const CPartFile*) cur_file, EC_DETAIL_INC_UPDATE, &valuemap);
+			// Add information if partfile is shared
+			filetag.AddTag(EC_TAG_PARTFILE_SHARED, it->second->IsShared(), &valuemap);
+
+			CPartFile_Encoder * enc = (CPartFile_Encoder *) encoders[cur_file->ECID()];
+			enc->Encode(&filetag);
+			response->AddTag(filetag);
+		} else {
+			CEC_SharedFile_Tag filetag(cur_file, EC_DETAIL_INC_UPDATE, &valuemap);
+			CKnownFile_Encoder * enc = encoders[cur_file->ECID()];
+			enc->Encode(&filetag);
+			response->AddTag(filetag);
+		}
 	}
-	return response;
-}
-
-CECPacket *Get_EC_Response_GetWaitQueue(const CECPacket *request)
-{
-	wxASSERT(request->GetOpCode() == EC_OP_GET_WAIT_QUEUE);
-	
-	CECPacket *response = new CECPacket(EC_OP_WAIT_QUEUE);
-	
-	EC_DETAIL_LEVEL detail_level = request->GetDetailLevel();
-
-	//
-	// request can contain list of queried items
-	CTagSet<uint32, EC_TAG_CLIENT> queryitems(request);
-
-	const CClientPtrList& uploading = theApp->uploadqueue->GetWaitingList();
-	CClientPtrList::const_iterator it = uploading.begin();
-	for (; it != uploading.end(); ++it) {
-		CUpDownClient* cur_client = *it;
 
-		if ( !cur_client || (!queryitems.empty() && !queryitems.count(cur_client->GetUserIDHybrid())) ) {
+	// Add clients
+	CECEmptyTag clients(EC_TAG_CLIENT);
+	const CClientList::IDMap& clientList = theApp->clientlist->GetClientList();
+	bool onlyTransmittingClients = thePrefs::IsTransmitOnlyUploadingClients();
+	for (CClientList::IDMap::const_iterator it = clientList.begin(); it != clientList.end(); it++) {
+		const CUpDownClient* cur_client = it->second.GetClient();
+		if (onlyTransmittingClients && !cur_client->IsDownloading()) {
+			// For poor CPU cores only transmit uploading clients. This will save a lot of CPU.
+			// Set ExternalConnect/TransmitOnlyUploadingClients to 1 for it.
 			continue;
 		}
-		CEC_UpDownClient_Tag cli_tag(cur_client, detail_level);
-		
-		response->AddTag(cli_tag);
+		CValueMap &valuemap = tagmap.GetValueMap(cur_client->ECID());
+		clients.AddTag(CEC_UpDownClient_Tag(cur_client, EC_DETAIL_INC_UPDATE, &valuemap));
 	}
-
-	return response;
-}
-
-CECPacket *Get_EC_Response_GetWaitQueue(CObjTagMap &tagmap)
-{
-	CECPacket *response = new CECPacket(EC_OP_WAIT_QUEUE);
-	
-	const CClientPtrList& uploading = theApp->uploadqueue->GetWaitingList();
-	CClientPtrList::const_iterator it = uploading.begin();
-	for (; it != uploading.end(); ++it) {
-		CUpDownClient* cur_client = *it;
-
-		CValueMap &valuemap = tagmap.GetValueMap(cur_client);
-		CEC_UpDownClient_Tag cli_tag(cur_client, valuemap);
-		
-		response->AddTag(cli_tag);
+	response->AddTag(clients);
+
+	// Add servers
+	CECEmptyTag servers(EC_TAG_SERVER);
+	std::vector<const CServer*> serverlist = theApp->serverlist->CopySnapshot();
+	uint32 nrServers = serverlist.size();
+	for (uint32 i = 0; i < nrServers; i++) {
+		const CServer* cur_server = serverlist[i];
+		CValueMap &valuemap = tagmap.GetValueMap(cur_server->ECID());
+		servers.AddTag(CEC_Server_Tag(cur_server, &valuemap));
+	}
+	response->AddTag(servers);
+
+	// Add friends
+	CECEmptyTag friends(EC_TAG_FRIEND);
+	for (CFriendList::const_iterator it = theApp->friendlist->begin(); it != theApp->friendlist->end(); it++) {
+		const CFriend* cur_friend = *it;
+		CValueMap &valuemap = tagmap.GetValueMap(cur_friend->ECID());
+		friends.AddTag(CEC_Friend_Tag(cur_friend, &valuemap));
 	}
+	response->AddTag(friends);
 
 	return response;
 }
 
-CECPacket *Get_EC_Response_GetUpQueue(const CECPacket *request)
+static CECPacket *Get_EC_Response_GetClientQueue(const CECPacket *request, CObjTagMap &tagmap, int op)
 {
-	wxASSERT(request->GetOpCode() == EC_OP_GET_ULOAD_QUEUE);
-	
-	CECPacket *response = new CECPacket(EC_OP_ULOAD_QUEUE);
+	CECPacket *response = new CECPacket(op);
 	
 	EC_DETAIL_LEVEL detail_level = request->GetDetailLevel();
 
 	//
 	// request can contain list of queried items
+	// (not for incremental update of course)
 	CTagSet<uint32, EC_TAG_CLIENT> queryitems(request);
-	
 
-	const CClientPtrList& uploading = theApp->uploadqueue->GetUploadingList();
-	CClientPtrList::const_iterator it = uploading.begin();
-	for (; it != uploading.end(); ++it) {
-		CUpDownClient* cur_client = *it;
+	const CClientRefList& clients = theApp->uploadqueue->GetUploadingList();
+	CClientRefList::const_iterator it = clients.begin();
+	for (; it != clients.end(); ++it) {
+		CUpDownClient* cur_client = it->GetClient();
 
-		if ( !cur_client || (!queryitems.empty() && !queryitems.count(cur_client->GetUserIDHybrid())) ) {
+		if (!cur_client) {	// shouldn't happen
 			continue;
 		}
-		
-		CEC_UpDownClient_Tag cli_tag(cur_client, detail_level);
-		response->AddTag(cli_tag);
-	}
-	
-	return response;
-}	
-
-
-CECPacket *Get_EC_Response_GetUpQueue(CObjTagMap &tagmap)
-{
-	CECPacket *response = new CECPacket(EC_OP_ULOAD_QUEUE);
-
-	const CClientPtrList& uploading = theApp->uploadqueue->GetUploadingList();
-	CClientPtrList::const_iterator it = uploading.begin();
-	for (; it != uploading.end(); ++it) {
-		CUpDownClient* cur_client = *it;
-
-		CValueMap &valuemap = tagmap.GetValueMap(cur_client);
-		CEC_UpDownClient_Tag cli_tag(cur_client, valuemap);
+		if (!queryitems.empty() && !queryitems.count(cur_client->ECID())) {
+			continue;
+		}
+		CValueMap *valuemap = NULL;
+		if (detail_level == EC_DETAIL_INC_UPDATE) {
+			valuemap = &tagmap.GetValueMap(cur_client->ECID());
+		}
+		CEC_UpDownClient_Tag cli_tag(cur_client, detail_level, valuemap);
 		
 		response->AddTag(cli_tag);
 	}
@@ -497,71 +750,53 @@
 }
 
 
-CECPacket *Get_EC_Response_GetDownloadQueue(CPartFile_Encoder_Map &encoders, CObjTagMap &tagmap)
-{	
-	CECPacket *response = new CECPacket(EC_OP_DLOAD_QUEUE);
-
-	encoders.UpdateEncoders(theApp->downloadqueue);
-	for (unsigned int i = 0; i < theApp->downloadqueue->GetFileCount(); i++) {
-		CPartFile *cur_file = theApp->downloadqueue->GetFileByIndex(i);
-
-		CValueMap &valuemap = tagmap.GetValueMap(cur_file);
-		CEC_PartFile_Tag filetag(cur_file, valuemap);
-		CPartFile_Encoder &enc = encoders[cur_file];
-		enc.Encode(&filetag);
-		
-		response->AddTag(filetag);
-	}	
-	return 	response;
-}
-
-CECPacket *Get_EC_Response_GetDownloadQueue(const CECPacket *request, CPartFile_Encoder_Map &encoders, bool detail = false)
+static CECPacket *Get_EC_Response_GetDownloadQueue(const CECPacket *request, CFileEncoderMap &encoders)
 {	
 	CECPacket *response = new CECPacket(EC_OP_DLOAD_QUEUE);
 
 	EC_DETAIL_LEVEL detail_level = request->GetDetailLevel();
 	//
 	// request can contain list of queried items
-	CTagSet<CMD4Hash, EC_TAG_PARTFILE> queryitems(request);
+	CTagSet<uint32, EC_TAG_PARTFILE> queryitems(request);
 	
-	encoders.UpdateEncoders(theApp->downloadqueue);
+	encoders.UpdateEncoders();
 
 	for (unsigned int i = 0; i < theApp->downloadqueue->GetFileCount(); i++) {
 		CPartFile *cur_file = theApp->downloadqueue->GetFileByIndex(i);
 	
-		if ( !queryitems.empty() && !queryitems.count(cur_file->GetFileHash()) ) {
+		if ( !queryitems.empty() && !queryitems.count(cur_file->ECID()) ) {
 			continue;
 		}
 
-		CEC_PartFile_Tag filetag(cur_file, detail_level, detail);
+		CEC_PartFile_Tag filetag(cur_file, detail_level);
 		
-		CPartFile_Encoder &enc = encoders[cur_file];
+		CPartFile_Encoder * enc = (CPartFile_Encoder *) encoders[cur_file->ECID()];
 		if ( detail_level != EC_DETAIL_UPDATE ) {
-			enc.ResetEncoder();
+			enc->ResetEncoder();
 		}
-		enc.Encode(&filetag);
+		enc->Encode(&filetag);
 
 		response->AddTag(filetag);
 	}
-	return 	response;
+	return response;
 }
 
 
-CECPacket *Get_EC_Response_PartFile_Cmd(const CECPacket *request)
+static CECPacket *Get_EC_Response_PartFile_Cmd(const CECPacket *request)
 {
 	CECPacket *response = NULL;
 
 	// request can contain multiple files.
-	for (unsigned int i = 0; i < request->GetTagCount(); ++i) {
-		const CECTag *hashtag = request->GetTagByIndex(i);
+	for (CECPacket::const_iterator it1 = request->begin(); it1 != request->end(); it1++) {
+		const CECTag &hashtag = *it1;
 
-		wxASSERT(hashtag->GetTagName() == EC_TAG_PARTFILE);
+		wxASSERT(hashtag.GetTagName() == EC_TAG_PARTFILE);
 
-		CMD4Hash hash = hashtag->GetMD4Data();
+		CMD4Hash hash = hashtag.GetMD4Data();
 		CPartFile *pfile = theApp->downloadqueue->GetFileByID( hash );
 		
 		if ( !pfile ) {
-			AddLogLineM(false,CFormat(_("Remote PartFile command failed: FileHash not found: %s")) % hash.Encode());
+			AddLogLineN(CFormat(_("Remote PartFile command failed: FileHash not found: %s")) % hash.Encode());
 			response = new CECPacket(EC_OP_FAILED);
 			response->AddTag(CECTag(EC_TAG_STRING, CFormat(wxString(wxTRANSLATE("FileHash not found: %s"))) % hash.Encode()));
 			//return response;
@@ -569,29 +804,13 @@
 		}
 		switch (request->GetOpCode()) {
 			case EC_OP_PARTFILE_SWAP_A4AF_THIS:
-				if ((pfile->GetStatus(false) == PS_READY) ||
-					(pfile->GetStatus(false) == PS_EMPTY)) {
-					CPartFile::SourceSet::const_iterator it = pfile->GetA4AFList().begin();
-					while ( it != pfile->GetA4AFList().end() ) {
-						CUpDownClient *cur_source = *it++;
-						
-						cur_source->SwapToAnotherFile(true, false, false, pfile);
-					}
-				}
+				CoreNotify_PartFile_Swap_A4AF(pfile);
 				break;
 			case EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO:
-				pfile->SetA4AFAuto(!pfile->IsA4AFAuto());
+				CoreNotify_PartFile_Swap_A4AF_Auto(pfile);
 				break;
 			case EC_OP_PARTFILE_SWAP_A4AF_OTHERS:
-				if ((pfile->GetStatus(false) == PS_READY) ||
-				    (pfile->GetStatus(false) == PS_EMPTY)) {
-					CPartFile::SourceSet::const_iterator it = pfile->GetSourceList().begin();
-					while ( it != pfile->GetSourceList().end() ) {
-						CUpDownClient* cur_source = *it++;
-
-						cur_source->SwapToAnotherFile(false, false, false, NULL);
-					}
-				}
+				CoreNotify_PartFile_Swap_A4AF_Others(pfile);
 				break;
 			case EC_OP_PARTFILE_PAUSE:
 				pfile->PauseFile();
@@ -604,7 +823,7 @@
 				pfile->StopFile();
 				break;
 			case EC_OP_PARTFILE_PRIO_SET: {
-					uint8 prio = hashtag->GetTagByIndexSafe(0)->GetInt();
+					uint8 prio = hashtag.GetFirstTagSafe()->GetInt();
 					if ( prio == PR_AUTO ) {
 						pfile->SetAutoDownPriority(1);
 					} else {
@@ -621,7 +840,7 @@
 				break;
 
 			case EC_OP_PARTFILE_SET_CAT:
-				pfile->SetCategory(hashtag->GetTagByIndexSafe(0)->GetInt());
+				pfile->SetCategory(hashtag.GetFirstTagSafe()->GetInt());
 				break;
 
 			default:
@@ -636,14 +855,12 @@
 	return response;
 }
 
-CECPacket *Get_EC_Response_Server_Add(const CECPacket *request)
+static CECPacket *Get_EC_Response_Server_Add(const CECPacket *request)
 {
 	CECPacket *response = NULL;
 
-	const CECTag *srv_tag = request->GetTagByIndex(0);
-
-	wxString full_addr = srv_tag->GetTagByName(EC_TAG_SERVER_ADDRESS)->GetStringData();
-	wxString name = srv_tag->GetTagByName(EC_TAG_SERVER_NAME)->GetStringData();
+	wxString full_addr = request->GetTagByNameSafe(EC_TAG_SERVER_ADDRESS)->GetStringData();
+	wxString name = request->GetTagByNameSafe(EC_TAG_SERVER_NAME)->GetStringData();
 	
 	wxString s_ip = full_addr.Left(full_addr.Find(':'));
 	wxString s_port = full_addr.Mid(full_addr.Find(':') + 1);
@@ -663,10 +880,10 @@
 	return response;
 }
 
-CECPacket *Get_EC_Response_Server(const CECPacket *request)
+static CECPacket *Get_EC_Response_Server(const CECPacket *request)
 {
 	CECPacket *response = NULL;
-	const CECTag *srv_tag = request->GetTagByIndex(0);
+	const CECTag *srv_tag = request->GetTagByName(EC_TAG_SERVER);
 	CServer *srv = 0;
 	if ( srv_tag ) {
 		srv = theApp->serverlist->GetServerByIPTCP(srv_tag->GetIPv4Data().IP(), srv_tag->GetIPv4Data().m_port);
@@ -715,20 +932,92 @@
 	return response;
 }
 
-CECPacket *Get_EC_Response_Search_Results(const CECPacket *request)
+
+static CECPacket *Get_EC_Response_Friend(const CECPacket *request)
+{
+	CECPacket *response = NULL;
+	const CECTag *tag = request->GetTagByName(EC_TAG_FRIEND_ADD);
+	if (tag) {
+		const CECTag *subtag = tag->GetTagByName(EC_TAG_CLIENT);
+		if (subtag) {
+			CUpDownClient * client = theApp->clientlist->FindClientByECID(subtag->GetInt());
+			if (client) {
+				theApp->friendlist->AddFriend(CCLIENTREF(client, wxT("Get_EC_Response_Friend theApp->friendlist->AddFriend")));
+				response = new CECPacket(EC_OP_NOOP);
+			}
+		} else {
+			const CECTag *hashtag	= tag->GetTagByName(EC_TAG_FRIEND_HASH);
+			const CECTag *iptag		= tag->GetTagByName(EC_TAG_FRIEND_IP);
+			const CECTag *porttag	= tag->GetTagByName(EC_TAG_FRIEND_PORT);
+			const CECTag *nametag	= tag->GetTagByName(EC_TAG_FRIEND_NAME);
+			if (hashtag && iptag && porttag && nametag) {
+				theApp->friendlist->AddFriend(hashtag->GetMD4Data(), iptag->GetInt(), porttag->GetInt(), nametag->GetStringData());
+				response = new CECPacket(EC_OP_NOOP);
+			}
+		}
+	} else if ((tag = request->GetTagByName(EC_TAG_FRIEND_REMOVE))) {
+		const CECTag *subtag = tag->GetTagByName(EC_TAG_FRIEND);
+		if (subtag) {
+			CFriend * Friend = theApp->friendlist->FindFriend(subtag->GetInt());
+			if (Friend) {
+				theApp->friendlist->RemoveFriend(Friend);
+				response = new CECPacket(EC_OP_NOOP);
+			}
+		}
+	} else if ((tag = request->GetTagByName(EC_TAG_FRIEND_FRIENDSLOT))) {
+		const CECTag *subtag = tag->GetTagByName(EC_TAG_FRIEND);
+		if (subtag) {
+			CFriend * Friend = theApp->friendlist->FindFriend(subtag->GetInt());
+			if (Friend) {
+				theApp->friendlist->SetFriendSlot(Friend, tag->GetInt() != 0);
+				response = new CECPacket(EC_OP_NOOP);
+			}
+		}
+	} else if ((tag = request->GetTagByName(EC_TAG_FRIEND_SHARED))) {
+		response = new CECPacket(EC_OP_FAILED);
+		response->AddTag(CECTag(EC_TAG_STRING, wxT("Request shared files list not implemented yet.")));
+#if 0
+		// This works fine - but there is no way atm to transfer the results to amulegui, so disable it for now.
+
+		const CECTag *subtag = tag->GetTagByName(EC_TAG_FRIEND);
+		if (subtag) {
+			CFriend * Friend = theApp->friendlist->FindFriend(subtag->GetInt());
+			if (Friend) {
+				theApp->friendlist->RequestSharedFileList(Friend);
+				response = new CECPacket(EC_OP_NOOP);
+			}
+		} else if ((subtag = tag->GetTagByName(EC_TAG_CLIENT))) {
+			CUpDownClient * client = theApp->clientlist->FindClientByECID(subtag->GetInt());
+			if (client) {
+				client->RequestSharedFileList();
+				response = new CECPacket(EC_OP_NOOP);
+			}
+		}
+#endif
+	}
+
+	if (!response) {
+		response = new CECPacket(EC_OP_FAILED);
+		response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("OOPS! OpCode processing error!")));
+	}
+	return response;
+}
+
+
+static CECPacket *Get_EC_Response_Search_Results(const CECPacket *request)
 {
 	CECPacket *response = new CECPacket(EC_OP_SEARCH_RESULTS);
 		
 	EC_DETAIL_LEVEL detail_level = request->GetDetailLevel();
 	//
 	// request can contain list of queried items
-	CTagSet<CMD4Hash, EC_TAG_SEARCHFILE> queryitems(request);
+	CTagSet<uint32, EC_TAG_SEARCHFILE> queryitems(request);
 
 	const CSearchResultList& list = theApp->searchlist->GetSearchResults(0xffffffff);
 	CSearchResultList::const_iterator it = list.begin();
 	while (it != list.end()) {
 		CSearchFile* sf = *it++;
-		if ( !queryitems.empty() && !queryitems.count(sf->GetFileHash()) ) {
+		if ( !queryitems.empty() && !queryitems.count(sf->ECID()) ) {
 			continue;
 		}
 		response->AddTag(CEC_SearchFile_Tag(sf, detail_level));
@@ -736,7 +1025,7 @@
 	return response;
 }
 
-CECPacket *Get_EC_Response_Search_Results(CObjTagMap &tagmap)
+static CECPacket *Get_EC_Response_Search_Results(CObjTagMap &tagmap)
 {
 	CECPacket *response = new CECPacket(EC_OP_SEARCH_RESULTS);
 
@@ -744,36 +1033,45 @@
 	CSearchResultList::const_iterator it = list.begin();
 	while (it != list.end()) {
 		CSearchFile* sf = *it++;
-		CValueMap &valuemap = tagmap.GetValueMap(sf);
-		response->AddTag(CEC_SearchFile_Tag(sf, valuemap));
+		CValueMap &valuemap = tagmap.GetValueMap(sf->ECID());
+		response->AddTag(CEC_SearchFile_Tag(sf, EC_DETAIL_INC_UPDATE, &valuemap));
+		// Add the children
+		if (sf->HasChildren()) {
+			const CSearchResultList& children = sf->GetChildren();
+			for (size_t i = 0; i < children.size(); ++i) {
+				CSearchFile* sfc = children.at(i);
+				CValueMap &valuemap1 = tagmap.GetValueMap(sfc->ECID());
+				response->AddTag(CEC_SearchFile_Tag(sfc, EC_DETAIL_INC_UPDATE, &valuemap1));
+			}
+		}
 	}
 	return response;
 }
 
-CECPacket *Get_EC_Response_Search_Results_Download(const CECPacket *request)
+static CECPacket *Get_EC_Response_Search_Results_Download(const CECPacket *request)
 {
 	CECPacket *response = new CECPacket(EC_OP_STRINGS);
-	for (unsigned int i = 0;i < request->GetTagCount();i++) {
-		const CECTag *tag = request->GetTagByIndex(i);
-		CMD4Hash hash = tag->GetMD4Data();
-		uint8 category = tag->GetTagByIndexSafe(0)->GetInt();
+	for (CECPacket::const_iterator it = request->begin(); it != request->end(); it++) {
+		const CECTag &tag = *it;
+		CMD4Hash hash = tag.GetMD4Data();
+		uint8 category = tag.GetFirstTagSafe()->GetInt();
 		theApp->searchlist->AddFileToDownloadByHash(hash, category);
 	}
 	return response;
 }
 
-CECPacket *Get_EC_Response_Search_Stop(const CECPacket *WXUNUSED(request))
+static CECPacket *Get_EC_Response_Search_Stop(const CECPacket *WXUNUSED(request))
 {
 	CECPacket *reply = new CECPacket(EC_OP_MISC_DATA);
-	theApp->searchlist->StopGlobalSearch();
+	theApp->searchlist->StopSearch();
 	return reply;
 }
 
-CECPacket *Get_EC_Response_Search(const CECPacket *request)
+static CECPacket *Get_EC_Response_Search(const CECPacket *request)
 {
 	wxString response;
 	
-	CEC_Search_Tag *search_request = (CEC_Search_Tag *)request->GetTagByIndex(0);
+	CEC_Search_Tag *search_request = (CEC_Search_Tag *)request->GetFirstTagSafe();
 	theApp->searchlist->RemoveResults(0xffffffff);
 
 	CSearchList::CSearchParams params;
@@ -787,6 +1085,7 @@
 	
 	EC_SEARCH_TYPE search_type = search_request->SearchType();
 	SearchType core_search_type = LocalSearch;
+	uint32 op = EC_OP_FAILED;
 	switch (search_type) {
 		case EC_SEARCH_GLOBAL:
 			core_search_type = GlobalSearch;
@@ -800,7 +1099,8 @@
 			if (!error.IsEmpty()) {
 				response = error;
 			} else {
-				response = wxTRANSLATE("Search in progress. Refetch results in a moment!");			
+				response = wxTRANSLATE("Search in progress. Refetch results in a moment!");
+				op = EC_OP_STRINGS;
 			}
 			break;
 		}
@@ -809,20 +1109,20 @@
 			break;
 	}
 	
-	CECPacket *reply = new CECPacket(EC_OP_FAILED);
+	CECPacket *reply = new CECPacket(op);
 	// error or search in progress
 	reply->AddTag(CECTag(EC_TAG_STRING, response));
 		
 	return reply;
 }
 
-CECPacket *Get_EC_Response_Set_SharedFile_Prio(const CECPacket *request)
+static CECPacket *Get_EC_Response_Set_SharedFile_Prio(const CECPacket *request)
 {
 	CECPacket *response = new CECPacket(EC_OP_NOOP);
-	for (unsigned int i = 0;i < request->GetTagCount();i++) {
-		const CECTag *tag = request->GetTagByIndex(i);
-		CMD4Hash hash = tag->GetMD4Data();
-		uint8 prio = tag->GetTagByIndexSafe(0)->GetInt();
+	for (CECPacket::const_iterator it = request->begin(); it != request->end(); it++) {
+		const CECTag &tag = *it;
+		CMD4Hash hash = tag.GetMD4Data();
+		uint8 prio = tag.GetFirstTagSafe()->GetInt();
 		CKnownFile* cur_file = theApp->sharedfiles->GetFileByID(hash);
 		if ( !cur_file ) {
 			continue;
@@ -834,168 +1134,154 @@
 			cur_file->SetAutoUpPriority(0);
 			cur_file->SetUpPriority(prio);
 		}
+		Notify_SharedFilesUpdateItem(cur_file);
 	}
 
 	return response;
 }
 
-CECPacket *Get_EC_Response_Kad_Connect(const CECPacket *request)
-{
-	CECPacket *response;
-	if (thePrefs::GetNetworkKademlia()) {
-		response = new CECPacket(EC_OP_NOOP);
-		if ( !Kademlia::CKademlia::IsRunning() ) {
-			Kademlia::CKademlia::Start();
-			theApp->ShowConnectionState();
-		}
-		const CECTag *addrtag = request->GetTagByIndex(0);
-		if ( addrtag ) {
-			uint32 ip = addrtag->GetIPv4Data().IP();
-			uint16 port = addrtag->GetIPv4Data().m_port;
-			Kademlia::CKademlia::Bootstrap(ip, port, true);
-		}
-	} else {
-		response = new CECPacket(EC_OP_FAILED);
-		response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Kad is disabled in preferences.")));
-	}
-
-	return response;
-}
-
-// init with some default size
-CPartFile_Encoder::GapBuffer CPartFile_Encoder::m_gap_buffer(128);
-
-// encoder side
-CPartFile_Encoder::CPartFile_Encoder(CPartFile *file) :
-	m_enc_data(file->GetPartCount(), file->GetGapList().size() * 2)
-{
-	m_file = file;
-}
-
-// decoder side
-CPartFile_Encoder::CPartFile_Encoder(int size): m_enc_data(size, 0)
-{
-	m_file = 0;
-}
-
-CPartFile_Encoder::~CPartFile_Encoder()
-{
-}
-		
-// stl side :)
-CPartFile_Encoder::CPartFile_Encoder()
-{
-	m_file = 0;
-}
-
-CPartFile_Encoder::CPartFile_Encoder(const CPartFile_Encoder &obj) : m_enc_data(obj.m_enc_data)
-{
-	m_file = obj.m_file;
-}
-
-CPartFile_Encoder &CPartFile_Encoder::operator=(const CPartFile_Encoder &obj)
-{
-	m_file = obj.m_file;
-	m_enc_data = obj.m_enc_data;
-	return *this;
-}
-
 void CPartFile_Encoder::Encode(CECTag *parent)
 {
-	const CPartFile::CGapPtrList& gaplist = m_file->GetGapList();
-	const size_t gap_list_size = gaplist.size();
-	
-	if ( m_gap_buffer.size() < gap_list_size * 2 ) {
-		m_gap_buffer.clear();
-		m_gap_buffer.resize(gap_list_size * 2);
-	} 
+	//
+	// Source part frequencies
+	//
+	CKnownFile_Encoder::Encode(parent);
 
-	GapBuffer::iterator it = m_gap_buffer.begin();
+	//
+	// Gaps
+	//
+	const CGapList& gaplist = m_PartFile()->GetGapList();
+	const size_t gap_list_size = gaplist.size();
+	ArrayOfUInts64 gaps;
+	gaps.reserve(gap_list_size * 2);
 	
-	CPartFile::CGapPtrList::const_iterator curr_pos = gaplist.begin();
-	for (; curr_pos != gaplist.end(); ++curr_pos) {
-		Gap_Struct *curr = *curr_pos;
-		*it++ = ENDIAN_HTONLL(curr->start);
-		*it++ = ENDIAN_HTONLL(curr->end);
+	for (CGapList::const_iterator curr_pos = gaplist.begin(); 
+			curr_pos != gaplist.end(); ++curr_pos) {
+		gaps.push_back(curr_pos.start());
+		gaps.push_back(curr_pos.end());
 	}
 
-	m_enc_data.m_gap_status.Realloc(gap_list_size*2*sizeof(uint64));
 	int gap_enc_size = 0;
-	const unsigned char *gap_enc_data = m_enc_data.m_gap_status.Encode((unsigned char *)&m_gap_buffer[0], gap_enc_size);
-
-	int part_enc_size;
-	const unsigned char *part_enc_data = m_enc_data.m_part_status.Encode(m_file->m_SrcpartFrequency, part_enc_size);
-
-
-	parent->AddTag(CECTag(EC_TAG_PARTFILE_PART_STATUS, part_enc_size, part_enc_data));
+	bool changed;
+	const uint8 *gap_enc_data = m_gap_status.Encode(gaps, gap_enc_size, changed);
+	if (changed) {
+		parent->AddTag(CECTag(EC_TAG_PARTFILE_GAP_STATUS, gap_enc_size, (void *)gap_enc_data));
+	}
+	delete[] gap_enc_data;
 	
 	//
-	// Put data inside of tag in following order:
-	// [num_of_gaps] [gap_enc_data]
+	// Requested blocks
 	//
-	unsigned char *tagdata;
-	CECTag etag(EC_TAG_PARTFILE_GAP_STATUS,
-		sizeof(uint32) + gap_enc_size, (void **)&tagdata);
-
-	// real number of gaps - so remote size can realloc
-	RawPokeUInt32( tagdata, ENDIAN_HTONL( gap_list_size ) );
-	tagdata += sizeof(uint32);
-	memcpy(tagdata, gap_enc_data, gap_enc_size);
-
-	parent->AddTag(etag);
-	
-	it = m_gap_buffer.begin();
-
-	const CPartFile::CReqBlockPtrList& requestedblocks = m_file->GetRequestedBlockList();
+	ArrayOfUInts64 req_buffer;
+	const CPartFile::CReqBlockPtrList& requestedblocks = m_PartFile()->GetRequestedBlockList();
 	CPartFile::CReqBlockPtrList::const_iterator curr_pos2 = requestedblocks.begin();
 
-	wxASSERT(m_gap_buffer.size() >= requestedblocks.size() * 2);
 	for ( ; curr_pos2 != requestedblocks.end(); ++curr_pos2 ) {
 		Requested_Block_Struct* block = *curr_pos2;
-		*it++ = ENDIAN_HTONLL(block->StartOffset);
-		*it++ = ENDIAN_HTONLL(block->EndOffset);
+		req_buffer.push_back(block->StartOffset);
+		req_buffer.push_back(block->EndOffset);
 	}
-	parent->AddTag(CECTag(EC_TAG_PARTFILE_REQ_STATUS,
-		requestedblocks.size() * 2 * sizeof(uint64), (void *)&m_gap_buffer[0]));
-}
-
-// encoder side
-CKnownFile_Encoder::CKnownFile_Encoder(CKnownFile *file) :
-	m_enc_data(file->GetPartCount(), true)
-{
-	m_file = file;
-}
+	int req_enc_size = 0;
+	const uint8 *req_enc_data = m_req_status.Encode(req_buffer, req_enc_size, changed);
+	if (changed) {
+		parent->AddTag(CECTag(EC_TAG_PARTFILE_REQ_STATUS, req_enc_size, (void *)req_enc_data));
+	}
+	delete[] req_enc_data;
 
-CKnownFile_Encoder::CKnownFile_Encoder()
-{
-	m_file = 0;
-}
-
-CKnownFile_Encoder::~CKnownFile_Encoder()
-{
-}
+	//
+	// Source names
+	//
+	// First count occurrence of all source names
+	//
+	CECEmptyTag sourceNames(EC_TAG_PARTFILE_SOURCE_NAMES);
+	typedef std::map<wxString, int> strIntMap;
+	strIntMap nameMap;
+	const CPartFile::SourceSet &sources = m_PartFile()->GetSourceList();
+	for (CPartFile::SourceSet::const_iterator it = sources.begin(); it != sources.end(); ++it) {
+		const CClientRef &cur_src = *it; 
+		if (cur_src.GetRequestFile() != m_file || cur_src.GetClientFilename().Length() == 0) {
+			continue;
+		}
+		const wxString &name = cur_src.GetClientFilename();
+		strIntMap::iterator itm = nameMap.find(name);
+		if (itm == nameMap.end()) {
+			nameMap[name] = 1;
+		} else {
+			itm->second++;
+		}
+	}
+	//
+	// Go through our last list
+	//
+	for (SourcenameItemMap::iterator it1 = m_sourcenameItemMap.begin(); it1 != m_sourcenameItemMap.end();) {
+		SourcenameItemMap::iterator it2 = it1++;
+		strIntMap::iterator itm = nameMap.find(it2->second.name);
+		if (itm == nameMap.end()) {
+			// name doesn't exist anymore, tell client to forget it
+			CECTag tag(EC_TAG_PARTFILE_SOURCE_NAMES, it2->first);
+			tag.AddTag(CECIntTag(EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS, 0));
+			sourceNames.AddTag(tag);
+			// and forget it
+			m_sourcenameItemMap.erase(it2);
+		} else {
+			// update count if it changed
+			if (it2->second.count != itm->second) {
+				CECTag tag(EC_TAG_PARTFILE_SOURCE_NAMES, it2->first);
+				tag.AddTag(CECIntTag(EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS, itm->second));
+				sourceNames.AddTag(tag);
+				it2->second.count = itm->second;
+			}
+			// remove it from nameMap so that only new names are left there
+			nameMap.erase(itm);
+		}
+	}
+	//
+	// Add new names
+	//
+	for (strIntMap::iterator it3 = nameMap.begin(); it3 != nameMap.end(); it3++) {
+		int id = ++m_sourcenameID;
+		CECIntTag tag(EC_TAG_PARTFILE_SOURCE_NAMES, id);
+		tag.AddTag(CECTag(EC_TAG_PARTFILE_SOURCE_NAMES, it3->first));
+		tag.AddTag(CECIntTag(EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS, it3->second));
+		sourceNames.AddTag(tag);
+		// remember it
+		m_sourcenameItemMap[id] = SourcenameItem(it3->first, it3->second);
+	}
+	if (sourceNames.HasChildTags()) {
+		parent->AddTag(sourceNames);
+	}
 
-CKnownFile_Encoder::CKnownFile_Encoder(const CKnownFile_Encoder &obj) : m_enc_data(obj.m_enc_data)
-{
-	m_file = obj.m_file;
 }
 
-CKnownFile_Encoder &CKnownFile_Encoder::operator=(const CKnownFile_Encoder &obj)
+void CPartFile_Encoder::ResetEncoder()
 {
-	m_file = obj.m_file;
-	m_enc_data = obj.m_enc_data;
-	return *this;
+	CKnownFile_Encoder::ResetEncoder();
+	m_gap_status.ResetEncoder();
+	m_req_status.ResetEncoder();
 }
 
 void CKnownFile_Encoder::Encode(CECTag *parent)
 {
-	int part_enc_size;
-	const unsigned char *part_enc_data = m_enc_data.Encode(m_file->m_AvailPartFrequency, part_enc_size);
-
-	parent->AddTag(CECTag(EC_TAG_PARTFILE_PART_STATUS, part_enc_size, part_enc_data));
+	//
+	// Source part frequencies
+	//
+	// Reference to the availability list
+	const ArrayOfUInts16& list = m_file->IsPartFile() ?
+		((CPartFile*)m_file)->m_SrcpartFrequency :
+		m_file->m_AvailPartFrequency;
+	// Don't add tag if available parts aren't populated yet.
+	if (!list.empty()) {
+		int part_enc_size;
+		bool changed;
+		const uint8 *part_enc_data = m_enc_data.Encode(list, part_enc_size, changed);
+		if (changed) {
+			parent->AddTag(CECTag(EC_TAG_PARTFILE_PART_STATUS, part_enc_size, part_enc_data));
+		}
+		delete[] part_enc_data;
+	}
 }
 
-CECPacket *GetStatsGraphs(const CECPacket *request)
+static CECPacket *GetStatsGraphs(const CECPacket *request)
 {
 	CECPacket *response = NULL;
 
@@ -1037,8 +1323,7 @@
 	return response;
 }
 
-CECPacket *ExternalConn::ProcessRequest2(const CECPacket *request,
-	CPartFile_Encoder_Map &enc_part_map, CKnownFile_Encoder_Map &enc_shared_map, CObjTagMap &objmap)
+CECPacket *CECServerSocket::ProcessRequest2(const CECPacket *request)
 {
 
 	if ( !request ) {
@@ -1054,7 +1339,7 @@
 		case EC_OP_SHUTDOWN:
 			if (!theApp->IsOnShutDown()) {
 				response = new CECPacket(EC_OP_NOOP);
-				AddLogLineM(true, _("External Connection: shutdown requested"));
+				AddLogLineC(_("External Connection: shutdown requested"));
 #ifndef AMULE_DAEMON
 				{
 					wxCloseEvent evt;
@@ -1070,11 +1355,15 @@
 			}
 			break;
 		case EC_OP_ADD_LINK: 
-			for(unsigned int i = 0; i < request->GetTagCount();i++) {
-				const CECTag *tag = request->GetTagByIndex(i);
-				wxString link = tag->GetStringData();
-				int category = tag->GetTagByIndexSafe(0)->GetInt();
-				AddLogLineM(true, CFormat(_("ExternalConn: adding link '%s'.")) % link);
+			for (CECPacket::const_iterator it = request->begin(); it != request->end(); it++) {
+				const CECTag &tag = *it;
+				wxString link = tag.GetStringData();
+				int category = 0;
+				const CECTag *cattag = tag.GetTagByName(EC_TAG_PARTFILE_CAT);
+				if (cattag) {
+					category = cattag->GetInt();
+				}
+				AddLogLineC(CFormat(_("ExternalConn: adding link '%s'.")) % link);
 				if ( theApp->downloadqueue->AddLink(link, category) ) {
 					response = new CECPacket(EC_OP_NOOP);
 				} else {
@@ -1088,56 +1377,40 @@
 		// Status requests
 		//
 		case EC_OP_STAT_REQ:
-			response = Get_EC_Response_StatRequest(request);
+			response = Get_EC_Response_StatRequest(request, m_LoggerAccess);
+			response->AddTag(CEC_ConnState_Tag(request->GetDetailLevel()));
+			break;
 		case EC_OP_GET_CONNSTATE:
-			if (!response) {
-				response = new CECPacket(EC_OP_MISC_DATA);
-			}
+			response = new CECPacket(EC_OP_MISC_DATA);
 			response->AddTag(CEC_ConnState_Tag(request->GetDetailLevel()));
 			break;
 		//
 		//
 		//
 		case EC_OP_GET_SHARED_FILES:
-			if ( request->GetDetailLevel() == EC_DETAIL_INC_UPDATE ) {
-				response = Get_EC_Response_GetSharedFiles(enc_shared_map, objmap);
-			} else {
-				response = Get_EC_Response_GetSharedFiles(request, enc_shared_map);
+			if ( request->GetDetailLevel() != EC_DETAIL_INC_UPDATE ) {
+				response = Get_EC_Response_GetSharedFiles(request, m_FileEncoder);
 			}
 			break;
 		case EC_OP_GET_DLOAD_QUEUE:
-			if ( request->GetDetailLevel() == EC_DETAIL_INC_UPDATE ) {
-				response = Get_EC_Response_GetDownloadQueue(enc_part_map, objmap);
-			} else {
-				response = Get_EC_Response_GetDownloadQueue(request, enc_part_map);
+			if ( request->GetDetailLevel() != EC_DETAIL_INC_UPDATE ) {
+				response = Get_EC_Response_GetDownloadQueue(request, m_FileEncoder);
 			}
 			break;
-		// transmit source names and comments only if file detail dialog is open	
-		case EC_OP_GET_DLOAD_QUEUE_DETAIL:
+		//
+		// This will evolve into an update-all for inc tags
+		//
+		case EC_OP_GET_UPDATE:
 			if ( request->GetDetailLevel() == EC_DETAIL_INC_UPDATE ) {
-				response = Get_EC_Response_GetDownloadQueue(enc_part_map, objmap);
-			} else {
-				response = Get_EC_Response_GetDownloadQueue(request, enc_part_map, true);
+				response = Get_EC_Response_GetUpdate(m_FileEncoder, m_obj_tagmap);
 			}
 			break;
 		case EC_OP_GET_ULOAD_QUEUE:
-			if ( request->GetDetailLevel() == EC_DETAIL_INC_UPDATE ) {
-				response = Get_EC_Response_GetUpQueue(objmap);
-			} else {
-				response = Get_EC_Response_GetUpQueue(request);
-			}
-			break;
-		case EC_OP_GET_WAIT_QUEUE:
-			if ( request->GetDetailLevel() == EC_DETAIL_INC_UPDATE ) {
-				response = Get_EC_Response_GetWaitQueue(objmap);
-			} else {
-				response = Get_EC_Response_GetWaitQueue(request);
-			}
+			response = Get_EC_Response_GetClientQueue(request, m_obj_tagmap, EC_OP_ULOAD_QUEUE);
 			break;
 		case EC_OP_PARTFILE_REMOVE_NO_NEEDED:
 		case EC_OP_PARTFILE_REMOVE_FULL_QUEUE:
 		case EC_OP_PARTFILE_REMOVE_HIGH_QUEUE:
-		case EC_OP_PARTFILE_CLEANUP_SOURCES:
 		case EC_OP_PARTFILE_SWAP_A4AF_THIS:
 		case EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO:
 		case EC_OP_PARTFILE_SWAP_A4AF_OTHERS:
@@ -1158,10 +1431,11 @@
 			break;
 		case EC_OP_RENAME_FILE: {
 			CMD4Hash fileHash = request->GetTagByNameSafe(EC_TAG_KNOWNFILE)->GetMD4Data();
-			CKnownFile* file = theApp->knownfiles->FindKnownFileByID(fileHash);
 			wxString newName = request->GetTagByNameSafe(EC_TAG_PARTFILE_NAME)->GetStringData();
+			// search first in downloadqueue - it might be in known files as well
+			CKnownFile* file = theApp->downloadqueue->GetFileByID(fileHash);
 			if (!file) {
-				file = theApp->downloadqueue->GetFileByID(fileHash);
+				file = theApp->knownfiles->FindKnownFileByID(fileHash);
 			}
 			if (!file) {
 				response = new CECPacket(EC_OP_FAILED);
@@ -1183,7 +1457,40 @@
 
 			break;
 		}
-
+		case EC_OP_CLEAR_COMPLETED: {
+			ListOfUInts32 toClear;
+			for (CECTag::const_iterator it = request->begin(); it != request->end(); it++) {
+				if (it->GetTagName() == EC_TAG_ECID) {
+					toClear.push_back(it->GetInt());
+				}
+			}
+			theApp->downloadqueue->ClearCompleted(toClear);
+			response = new CECPacket(EC_OP_NOOP);
+			break;
+		}
+		case EC_OP_CLIENT_SWAP_TO_ANOTHER_FILE: {
+			theApp->sharedfiles->Reload();
+			uint32 idClient = request->GetTagByNameSafe(EC_TAG_CLIENT)->GetInt();
+			CUpDownClient * client = theApp->clientlist->FindClientByECID(idClient);
+			CMD4Hash idFile = request->GetTagByNameSafe(EC_TAG_PARTFILE)->GetMD4Data();
+			CPartFile * file = theApp->downloadqueue->GetFileByID(idFile);
+			if (client && file) {
+				client->SwapToAnotherFile( true, false, false, file);
+			}
+			response = new CECPacket(EC_OP_NOOP);
+			break;
+		}
+		case EC_OP_SHARED_FILE_SET_COMMENT: {
+			CMD4Hash hash = request->GetTagByNameSafe(EC_TAG_KNOWNFILE)->GetMD4Data();
+			CKnownFile * file = theApp->sharedfiles->GetFileByID(hash);
+			if (file) {
+				wxString newComment = request->GetTagByNameSafe(EC_TAG_KNOWNFILE_COMMENT)->GetStringData();
+				uint8 newRating = request->GetTagByNameSafe(EC_TAG_KNOWNFILE_RATING)->GetInt();
+				CoreNotify_KnownFile_Comment_Set(file, newComment, newRating);
+			}
+			response = new CECPacket(EC_OP_NOOP);
+			break;
+		}
 
 		//
 		// Server commands
@@ -1198,6 +1505,10 @@
 			break;
 		case EC_OP_GET_SERVER_LIST: {
 				response = new CECPacket(EC_OP_SERVER_LIST);
+				if (!thePrefs::GetNetworkED2K()) {
+					// Kad only: just send an empty list
+					break;
+				}
 				EC_DETAIL_LEVEL detail_level = request->GetDetailLevel();
 				std::vector<const CServer*> servers = theApp->serverlist->CopySnapshot();
 				for (
@@ -1210,7 +1521,7 @@
 			}
 			break;
 		case EC_OP_SERVER_UPDATE_FROM_URL: {
-			wxString url = request->GetTagByIndexSafe(0)->GetStringData();
+			wxString url = request->GetFirstTagSafe()->GetStringData();
 
 			// Save the new url, and update the UI (if not amuled).
 			Notify_ServersURLChanged(url);
@@ -1220,13 +1531,46 @@
 			response = new CECPacket(EC_OP_NOOP);
 			break;
 		}
+		case EC_OP_SERVER_SET_STATIC_PRIO: {
+			uint32 ecid = request->GetTagByNameSafe(EC_TAG_SERVER)->GetInt();
+			CServer * server = theApp->serverlist->GetServerByECID(ecid);
+			if (server) {
+				const CECTag * staticTag = request->GetTagByName(EC_TAG_SERVER_STATIC);
+				if (staticTag) {
+					theApp->serverlist->SetStaticServer(server, staticTag->GetInt() > 0);
+				}
+				const CECTag * prioTag = request->GetTagByName(EC_TAG_SERVER_PRIO);
+				if (prioTag) {
+					theApp->serverlist->SetServerPrio(server, prioTag->GetInt());
+				}
+			}
+			response = new CECPacket(EC_OP_NOOP);
+			break;
+		}
+		//
+		// Friends
+		//
+		case EC_OP_FRIEND:
+			response = Get_EC_Response_Friend(request);
+			break;
+
 		//
 		// IPFilter
 		//
 		case EC_OP_IPFILTER_RELOAD:
-			theApp->ipfilter->Reload();
+			NotifyAlways_IPFilter_Reload();
 			response = new CECPacket(EC_OP_NOOP);
 			break;
+
+		case EC_OP_IPFILTER_UPDATE: {
+			wxString url = request->GetFirstTagSafe()->GetStringData();
+			if (url.IsEmpty()) {
+				url = thePrefs::IPFilterURL();
+			}
+			NotifyAlways_IPFilter_Update(url);
+			response = new CECPacket(EC_OP_NOOP);
+			break;
+		}
 		//
 		// Search
 		//
@@ -1240,7 +1584,7 @@
 
 		case EC_OP_SEARCH_RESULTS:
 			if ( request->GetDetailLevel() == EC_DETAIL_INC_UPDATE ) {
-				response = Get_EC_Response_Search_Results(objmap);
+				response = Get_EC_Response_Search_Results(m_obj_tagmap);
 			} else {
 				response = Get_EC_Response_Search_Results(request);
 			}
@@ -1281,22 +1625,38 @@
 			
 		case EC_OP_CREATE_CATEGORY:
 			if ( request->GetTagCount() == 1 ) {
-				((CEC_Category_Tag *)request->GetTagByIndex(0))->Create();
+				CEC_Category_Tag *tag = (CEC_Category_Tag *)request->GetFirstTagSafe();
+				if (tag->Create()) {
+					response = new CECPacket(EC_OP_NOOP);
+				} else {
+					response = new CECPacket(EC_OP_FAILED);
+					response->AddTag(CECTag(EC_TAG_CATEGORY, theApp->glob_prefs->GetCatCount() - 1));
+					response->AddTag(CECTag(EC_TAG_CATEGORY_PATH, tag->Path()));
+				}
 				Notify_CategoryAdded();
+			} else {
+				response = new CECPacket(EC_OP_NOOP);
 			}
-			response = new CECPacket(EC_OP_NOOP);
 			break;
 		case EC_OP_UPDATE_CATEGORY:
 			if ( request->GetTagCount() == 1 ) {
-				CEC_Category_Tag *tag = (CEC_Category_Tag *)request->GetTagByIndex(0);
-				tag->Apply();
+				CEC_Category_Tag *tag = (CEC_Category_Tag *)request->GetFirstTagSafe();
+				if (tag->Apply()) {
+					response = new CECPacket(EC_OP_NOOP);
+				} else {
+					response = new CECPacket(EC_OP_FAILED);
+					response->AddTag(CECTag(EC_TAG_CATEGORY, tag->GetInt()));
+					response->AddTag(CECTag(EC_TAG_CATEGORY_PATH, tag->Path()));
+				}
 				Notify_CategoryUpdate(tag->GetInt());
+			} else {
+				response = new CECPacket(EC_OP_NOOP);
 			}
-			response = new CECPacket(EC_OP_NOOP);
 			break;
 		case EC_OP_DELETE_CATEGORY:
 			if ( request->GetTagCount() == 1 ) {
-				uint32 cat = request->GetTagByIndex(0)->GetInt();
+				uint32 cat = request->GetFirstTagSafe()->GetInt();
+				// this noes not only update the gui, but actually deletes the cat
 				Notify_CategoryDelete(cat);
 			}
 			response = new CECPacket(EC_OP_NOOP);
@@ -1306,11 +1666,19 @@
 		// Logging
 		//
 		case EC_OP_ADDLOGLINE:
-			AddLogLineM( (request->GetTagByName(EC_TAG_LOG_TO_STATUS) != NULL), request->GetTagByNameSafe(EC_TAG_STRING)->GetStringData() );
+			if (request->GetTagByName(EC_TAG_LOG_TO_STATUS) != NULL) {
+				AddLogLineC(request->GetTagByNameSafe(EC_TAG_STRING)->GetStringData());
+			} else {
+				AddLogLineN(request->GetTagByNameSafe(EC_TAG_STRING)->GetStringData());
+			}
 			response = new CECPacket(EC_OP_NOOP);
 			break;
 		case EC_OP_ADDDEBUGLOGLINE:
-			AddDebugLogLineM( (request->GetTagByName(EC_TAG_LOG_TO_STATUS) != NULL), logGeneral, request->GetTagByNameSafe(EC_TAG_STRING)->GetStringData() );
+			if (request->GetTagByName(EC_TAG_LOG_TO_STATUS) != NULL) {
+				AddDebugLogLineC(logGeneral, request->GetTagByNameSafe(EC_TAG_STRING)->GetStringData());
+			} else {
+				AddDebugLogLineN(logGeneral, request->GetTagByNameSafe(EC_TAG_STRING)->GetStringData());
+			}
 			response = new CECPacket(EC_OP_NOOP);
 			break;
 		case EC_OP_GET_LOG:
@@ -1372,14 +1740,24 @@
 		// Kad
 		//
 		case EC_OP_KAD_START:
-			response = Get_EC_Response_Kad_Connect(request);
+			if (thePrefs::GetNetworkKademlia()) {
+				response = new CECPacket(EC_OP_NOOP);
+				if ( !Kademlia::CKademlia::IsRunning() ) {
+					Kademlia::CKademlia::Start();
+					theApp->ShowConnectionState();
+				}
+			} else {
+				response = new CECPacket(EC_OP_FAILED);
+				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Kad is disabled in preferences.")));
+			}
 			break;
 		case EC_OP_KAD_STOP:
 			theApp->StopKad();
+			theApp->ShowConnectionState();
 			response = new CECPacket(EC_OP_NOOP);
 			break;
 		case EC_OP_KAD_UPDATE_FROM_URL: {
-			wxString url = request->GetTagByIndexSafe(0)->GetStringData();
+			wxString url = request->GetFirstTagSafe()->GetStringData();
 
 			// Save the new url, and update the UI (if not amuled).
 			Notify_NodesURLChanged(url);
@@ -1390,13 +1768,20 @@
 			break;
 		}
 		case EC_OP_KAD_BOOTSTRAP_FROM_IP:
-			theApp->BootstrapKad(request->GetTagByIndexSafe(0)->GetInt(),
-			                     request->GetTagByIndexSafe(1)->GetInt());
-			response = new CECPacket(EC_OP_NOOP);
+			if (thePrefs::GetNetworkKademlia()) {
+				theApp->BootstrapKad(request->GetTagByNameSafe(EC_TAG_BOOTSTRAP_IP)->GetInt(),
+									 request->GetTagByNameSafe(EC_TAG_BOOTSTRAP_PORT)->GetInt());
+				theApp->ShowConnectionState();
+				response = new CECPacket(EC_OP_NOOP);
+			} else {
+				response = new CECPacket(EC_OP_FAILED);
+				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Kad is disabled in preferences.")));
+			}
 			break;
 
 		//
 		// Networks
+		// These requests are currently used only in the text client
 		//
 		case EC_OP_CONNECT:
 			if (thePrefs::GetNetworkED2K()) {
@@ -1419,7 +1804,9 @@
 					response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Connecting to Kad...")));
 				}
 			}
-			if (!response) {
+			if (response) {
+				theApp->ShowConnectionState();
+			} else {
 				response = new CECPacket(EC_OP_FAILED);
 				response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("All networks are disabled.")));
 			}
@@ -1435,18 +1822,425 @@
 					theApp->StopKad();
 					response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Disconnected from Kad.")));
 				}
+				theApp->ShowConnectionState();
 			} else {
 				response = new CECPacket(EC_OP_NOOP);
 			}
 			break;
+	}
+	if (!response) {
+		AddLogLineN(CFormat(_("External Connection: invalid opcode received: %#x")) % request->GetOpCode());
+		wxFAIL;
+		response = new CECPacket(EC_OP_FAILED);
+		response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid opcode (wrong protocol version?)")));
+	}
+	return response;
+}
 
-		default:
-			AddLogLineM(false, wxString::Format(_("External Connection: invalid opcode received: %#x"), request->GetOpCode()));
-			wxFAIL;
-			response = new CECPacket(EC_OP_FAILED);
-			response->AddTag(CECTag(EC_TAG_STRING, wxTRANSLATE("Invalid opcode (wrong protocol version?)")));
-			break;
+/*
+ * Here notification-based EC. Notification will be sorted by priority for possible throttling. 
+ */
+ 
+/*
+ * Core general status
+ */
+ECStatusMsgSource::ECStatusMsgSource()
+{
+	m_last_ed2k_status_sent = 0xffffffff;
+	m_last_kad_status_sent = 0xffffffff;
+	m_server = (void *)0xffffffff;
+}
+
+uint32 ECStatusMsgSource::GetEd2kStatus()
+{
+	if ( theApp->IsConnectedED2K() ) {
+		return theApp->GetED2KID();
+	} else if ( theApp->serverconnect->IsConnecting() ) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+uint32 ECStatusMsgSource::GetKadStatus()
+{
+	if ( theApp->IsConnectedKad() ) {
+		return 1;
+	} else if ( Kademlia::CKademlia::IsFirewalled() ) {
+		return 2;
+	} else if ( Kademlia::CKademlia::IsRunning() ) {
+		return 3;
+	}
+	return 0;
+}
+
+CECPacket *ECStatusMsgSource::GetNextPacket()
+{
+	if ( (m_last_ed2k_status_sent != GetEd2kStatus()) ||
+		(m_last_kad_status_sent != GetKadStatus()) ||
+		(m_server != theApp->serverconnect->GetCurrentServer()) ) {
+
+		m_last_ed2k_status_sent = GetEd2kStatus();
+		m_last_kad_status_sent = GetKadStatus();
+		m_server = theApp->serverconnect->GetCurrentServer();
+		
+		CECPacket *response = new CECPacket(EC_OP_STATS);
+		response->AddTag(CEC_ConnState_Tag(EC_DETAIL_UPDATE));
+		return response;
+	}
+	return 0;
+}
+
+/*
+ * Downloading files
+*/
+ECPartFileMsgSource::ECPartFileMsgSource()
+{
+	for (unsigned int i = 0; i < theApp->downloadqueue->GetFileCount(); i++) {
+		CPartFile *cur_file = theApp->downloadqueue->GetFileByIndex(i);
+		PARTFILE_STATUS status = { true, false, false, false, true, cur_file };
+		m_dirty_status[cur_file->GetFileHash()] = status;
+	}
+}
+
+void ECPartFileMsgSource::SetDirty(CPartFile *file)
+{
+	CMD4Hash filehash = file->GetFileHash();
+	if ( m_dirty_status.find(filehash) != m_dirty_status.end() ) {
+		m_dirty_status[filehash].m_dirty = true;;
+	}
+}
+
+void ECPartFileMsgSource::SetNew(CPartFile *file)
+{
+	CMD4Hash filehash = file->GetFileHash();
+	wxASSERT ( m_dirty_status.find(filehash) == m_dirty_status.end() );
+	PARTFILE_STATUS status = { true, false, false, false, true, file };
+	m_dirty_status[filehash] = status;
+}
+
+void ECPartFileMsgSource::SetCompleted(CPartFile *file)
+{
+	CMD4Hash filehash = file->GetFileHash();
+	wxASSERT ( m_dirty_status.find(filehash) != m_dirty_status.end() );
+
+	m_dirty_status[filehash].m_finished = true;
+}
+
+void ECPartFileMsgSource::SetRemoved(CPartFile *file)
+{
+	CMD4Hash filehash = file->GetFileHash();
+	wxASSERT ( m_dirty_status.find(filehash) != m_dirty_status.end() );
+
+	m_dirty_status[filehash].m_removed = true;
+}
+
+CECPacket *ECPartFileMsgSource::GetNextPacket()
+{
+	for(std::map<CMD4Hash, PARTFILE_STATUS>::iterator it = m_dirty_status.begin();
+		it != m_dirty_status.end(); it++) {
+		if ( it->second.m_new || it->second.m_dirty || it->second.m_removed) {
+			CMD4Hash filehash = it->first;
+			
+			CPartFile *partfile = it->second.m_file;
+
+			CECPacket *packet = new CECPacket(EC_OP_DLOAD_QUEUE);
+			if ( it->second.m_removed ) {
+				CECTag tag(EC_TAG_PARTFILE, filehash);
+				packet->AddTag(tag);
+				m_dirty_status.erase(it);
+			} else {
+				CEC_PartFile_Tag tag(partfile, it->second.m_new ? EC_DETAIL_FULL : EC_DETAIL_UPDATE);
+				packet->AddTag(tag);
+			}
+			m_dirty_status[filehash].m_new = false;
+			m_dirty_status[filehash].m_dirty = false;
+
+			return packet;
+		}
+	}
+	return 0;
+}
+
+/*
+ * Shared files - similar to downloading
+ */
+ECKnownFileMsgSource::ECKnownFileMsgSource()
+{
+	for (unsigned int i = 0; i < theApp->sharedfiles->GetFileCount(); i++) {
+		CKnownFile *cur_file = (CKnownFile *)theApp->sharedfiles->GetFileByIndex(i);
+		KNOWNFILE_STATUS status = { true, false, false, true, cur_file };
+		m_dirty_status[cur_file->GetFileHash()] = status;
+	}
+}
+
+void ECKnownFileMsgSource::SetDirty(CKnownFile *file)
+{
+	CMD4Hash filehash = file->GetFileHash();
+	if ( m_dirty_status.find(filehash) != m_dirty_status.end() ) {
+		m_dirty_status[filehash].m_dirty = true;;
+	}
+}
+
+void ECKnownFileMsgSource::SetNew(CKnownFile *file)
+{
+	CMD4Hash filehash = file->GetFileHash();
+	wxASSERT ( m_dirty_status.find(filehash) == m_dirty_status.end() );
+	KNOWNFILE_STATUS status = { true, false, false, true, file };
+	m_dirty_status[filehash] = status;
+}
+	
+void ECKnownFileMsgSource::SetRemoved(CKnownFile *file)
+{
+	CMD4Hash filehash = file->GetFileHash();
+	wxASSERT ( m_dirty_status.find(filehash) != m_dirty_status.end() );
+	
+	m_dirty_status[filehash].m_removed = true;
+}
+
+CECPacket *ECKnownFileMsgSource::GetNextPacket()
+{
+	for(std::map<CMD4Hash, KNOWNFILE_STATUS>::iterator it = m_dirty_status.begin();
+		it != m_dirty_status.end(); it++) {
+		if ( it->second.m_new || it->second.m_dirty || it->second.m_removed) {
+			CMD4Hash filehash = it->first;
+			
+			CKnownFile *partfile = it->second.m_file;
+			
+			CECPacket *packet = new CECPacket(EC_OP_SHARED_FILES);
+			if ( it->second.m_removed ) {
+				CECTag tag(EC_TAG_PARTFILE, filehash);
+				packet->AddTag(tag);
+				m_dirty_status.erase(it);
+			} else {
+				CEC_SharedFile_Tag tag(partfile, it->second.m_new ? EC_DETAIL_FULL : EC_DETAIL_UPDATE);
+				packet->AddTag(tag);
+			}
+			m_dirty_status[filehash].m_new = false;
+			m_dirty_status[filehash].m_dirty = false;
+			
+			return packet;
+		}
 	}
+	return 0;
+}
+	
+/*
+ * Notification about search status
+*/
+ECSearchMsgSource::ECSearchMsgSource()
+{
+}
+
+CECPacket *ECSearchMsgSource::GetNextPacket()
+{
+	if ( m_dirty_status.empty() ) {
+		return 0;
+	}
+	
+	CECPacket *response = new CECPacket(EC_OP_SEARCH_RESULTS);
+	for(std::map<CMD4Hash, SEARCHFILE_STATUS>::iterator it = m_dirty_status.begin();
+		it != m_dirty_status.end(); it++) {
+		
+		if ( it->second.m_new ) {
+			response->AddTag(CEC_SearchFile_Tag(it->second.m_file, EC_DETAIL_FULL));
+			it->second.m_new = false;
+		} else if ( it->second.m_dirty ) {
+			response->AddTag(CEC_SearchFile_Tag(it->second.m_file, EC_DETAIL_UPDATE));
+		}
+		
+	}
+	
 	return response;
 }
+
+void ECSearchMsgSource::FlushStatus()
+{
+	m_dirty_status.clear();
+}
+
+void ECSearchMsgSource::SetDirty(CSearchFile *file)
+{
+	if ( m_dirty_status.count(file->GetFileHash()) ) {
+		m_dirty_status[file->GetFileHash()].m_dirty = true;
+	} else {
+		m_dirty_status[file->GetFileHash()].m_new = true;
+		m_dirty_status[file->GetFileHash()].m_dirty = true;
+		m_dirty_status[file->GetFileHash()].m_child_dirty = true;
+		m_dirty_status[file->GetFileHash()].m_file = file;		
+	}
+}
+
+void ECSearchMsgSource::SetChildDirty(CSearchFile *file)
+{
+	m_dirty_status[file->GetFileHash()].m_child_dirty = true;
+}
+	
+/*
+ * Notification about uploading clients
+ */
+CECPacket *ECClientMsgSource::GetNextPacket()
+{
+	return 0;
+}
+	
+//
+// Notification iface per-client
+//
+ECNotifier::ECNotifier()
+{
+}
+
+ECNotifier::~ECNotifier()
+{
+	while (m_msg_source.begin() != m_msg_source.end())
+		Remove_EC_Client(m_msg_source.begin()->first);
+}
+
+CECPacket *ECNotifier::GetNextPacket(ECUpdateMsgSource *msg_source_array[])
+{
+	CECPacket *packet = 0;
+	//
+	// priority 0 is highest
+	//
+	for(int i = 0; i < EC_STATUS_LAST_PRIO; i++) {
+		if ( (packet = msg_source_array[i]->GetNextPacket()) != 0 ) {
+			break;
+		}
+	}
+	return packet;
+}
+
+CECPacket *ECNotifier::GetNextPacket(CECServerSocket *sock)
+{
+	//
+	// OnOutput is called for a first time before
+	// socket is registered
+	// 
+	if ( m_msg_source.count(sock) ) {
+		ECUpdateMsgSource **notifier_array = m_msg_source[sock];
+		if ( !notifier_array ) {
+			return 0;
+		}
+		CECPacket *packet = GetNextPacket(notifier_array);
+		printf("[EC] next update packet; opcode=%x\n",packet ? packet->GetOpCode() : 0xff);
+		return packet;
+	} else {
+		return 0;
+	}
+}
+
+//
+// Interface to notification macros
+//
+void ECNotifier::DownloadFile_SetDirty(CPartFile *file)
+{
+	for(std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
+		i != m_msg_source.end(); i++) {
+		CECServerSocket *sock = i->first;
+		if ( sock->HaveNotificationSupport() ) {
+			ECUpdateMsgSource **notifier_array = i->second;
+			((ECPartFileMsgSource *)notifier_array[EC_PARTFILE])->SetDirty(file);
+		}
+	}
+	NextPacketToSocket();
+}
+
+void ECNotifier::DownloadFile_RemoveFile(CPartFile *file)
+{
+	for(std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
+		i != m_msg_source.end(); i++) {
+		ECUpdateMsgSource **notifier_array = i->second;
+		((ECPartFileMsgSource *)notifier_array[EC_PARTFILE])->SetRemoved(file);
+	}
+	NextPacketToSocket();
+}
+
+void ECNotifier::DownloadFile_RemoveSource(CPartFile *)
+{
+	// per-partfile source list is not supported (yet), and IMHO quite useless
+}
+
+void ECNotifier::DownloadFile_AddFile(CPartFile *file)
+{
+	for(std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
+		i != m_msg_source.end(); i++) {
+		ECUpdateMsgSource **notifier_array = i->second;
+		((ECPartFileMsgSource *)notifier_array[EC_PARTFILE])->SetNew(file);
+	}
+	NextPacketToSocket();
+}
+
+void ECNotifier::DownloadFile_AddSource(CPartFile *)
+{
+	// per-partfile source list is not supported (yet), and IMHO quite useless
+}
+
+void ECNotifier::SharedFile_AddFile(CKnownFile *file)
+{
+	for(std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
+		i != m_msg_source.end(); i++) {
+		ECUpdateMsgSource **notifier_array = i->second;
+		((ECKnownFileMsgSource *)notifier_array[EC_KNOWN])->SetNew(file);
+	}
+	NextPacketToSocket();
+}
+
+void ECNotifier::SharedFile_RemoveFile(CKnownFile *file)
+{
+	for(std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
+		i != m_msg_source.end(); i++) {
+		ECUpdateMsgSource **notifier_array = i->second;
+		((ECKnownFileMsgSource *)notifier_array[EC_KNOWN])->SetRemoved(file);
+	}
+	NextPacketToSocket();
+}
+
+void ECNotifier::SharedFile_RemoveAllFiles()
+{
+	// need to figure out what to do here
+}
+	
+void ECNotifier::Add_EC_Client(CECServerSocket *sock)
+{
+	ECUpdateMsgSource **notifier_array = new ECUpdateMsgSource *[EC_STATUS_LAST_PRIO];
+	notifier_array[EC_STATUS] = new ECStatusMsgSource();
+	notifier_array[EC_SEARCH] = new ECSearchMsgSource();
+	notifier_array[EC_PARTFILE] = new ECPartFileMsgSource();
+	notifier_array[EC_CLIENT] = new ECClientMsgSource();
+	notifier_array[EC_KNOWN] = new ECKnownFileMsgSource();
+
+	m_msg_source[sock] = notifier_array;
+}
+
+void ECNotifier::Remove_EC_Client(CECServerSocket *sock)
+{
+	if (m_msg_source.count(sock)) {
+		ECUpdateMsgSource **notifier_array = m_msg_source[sock];
+
+		m_msg_source.erase(sock);
+		
+		for(int i = 0; i < EC_STATUS_LAST_PRIO; i++) {
+			delete notifier_array[i];
+		}
+		delete [] notifier_array;
+	}
+}
+
+void ECNotifier::NextPacketToSocket()
+{
+	for(std::map<CECServerSocket *, ECUpdateMsgSource **>::iterator i = m_msg_source.begin();
+		i != m_msg_source.end(); i++) {
+		CECServerSocket *sock = i->first;
+		if ( sock->HaveNotificationSupport() && !sock->DataPending() ) {
+			ECUpdateMsgSource **notifier_array = i->second;
+			CECPacket *packet = GetNextPacket(notifier_array);
+			if ( packet ) {
+				printf("[EC] sending update packet; opcode=%x\n",packet->GetOpCode());
+				sock->SendPacket(packet);
+			}
+		}
+	}
+}
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/ExternalConn.h -> aMule-2.3.1.tar.bz2/src/ExternalConn.h Changed

@@ -1,8 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 Kry ( elkry@users.sourceforge.net / http://www.amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Kry ( elkry@users.sourceforge.net / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-2011 Froenchenko Leonid (lfroen@gmail.com)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -33,144 +34,28 @@
 #include "amuleIPV4Address.h"	// for amuleIPV4Address
 #include "RLE.h"	// for RLE
 #include "DownloadQueue.h"
+#include "PartFile.h"			// for SourcenameItemMap
 
 class wxSocketServer;
 class wxSocketEvent;
 
-//
-// T - type of item
-// E - type of encoder
-// C - type of container in theApp
-template <class T, class E, class C>
-class CFileEncoderMap : public std::map<T *, E> {
-	public:
-		void UpdateEncoders(C *container)
-		{
-			// check if encoder contains files that no longer in container
-			// or, we have new files without encoder yet
-			std::set<T *> curr_files, dead_files;
-			for (unsigned int i = 0; i < container->GetFileCount(); i++) {
-				// cast for case of 'const'
-				T *cur_file = (T *)container->GetFileByIndex(i);
-				curr_files.insert(cur_file);
-				if ( this->count(cur_file) == 0 ) {
-					this->operator [](cur_file) = E(cur_file);
-				}
-			}
-			//
-			// curr_files set is created to minimize lookup time in download queue,
-			// since GetFileByID have loop inside leading to O(n), in this case
-			// it will mean O(n^2)
-			typename std::map<T *, E>::iterator i;
-			for(i = this->begin(); i != this->end(); i++) {
-				if ( curr_files.count(i->first) == 0 ) {
-					dead_files.insert(i->first);
-				}
-			}
-			typename std::set<T *>::iterator j;
-			for(j = dead_files.begin(); j != dead_files.end(); j++) {
-				this->erase(*j);
-			}
-		}
-};
-
-/*!
- * PartStatus strings are quite long - RLE encoding will help.
- * 
- * Instead of sending each time full part-status string, send
- * RLE encoded difference from previous one.
- * 
- * However, gap status is different - it's already kind of RLE
- * encoding, so futher compression will help a litter (Shannon
- * theorem). Instead, calculate diff between list of gaps.
- */
-class CPartFile_Encoder {
-		//
-		// List of gaps sent to particular client. Since clients
-		// can request lists in different time, they can get
-		// different results
-		PartFileEncoderData m_enc_data;
-		
-		// gaps are also RLE encoded, but list have variable size by it's nature.
-		// so realloc buffer when needed.
-		// This buffer only needed on core-side, where list is turned into array
-		// before passing to RLE. Decoder will just use RLE internal buffer
-		// Buffer can be static, since it is accessed with mutex locked
-		typedef std::vector<uint64> GapBuffer;
-		static GapBuffer m_gap_buffer;
-		
-		CPartFile *m_file;
-	public:
-		// encoder side
-		CPartFile_Encoder(CPartFile *file);
-		
-		// decoder side
-		CPartFile_Encoder(int size);
-
-		~CPartFile_Encoder();
-		
-		// stl side :)
-		CPartFile_Encoder();
-		
-		CPartFile_Encoder(const CPartFile_Encoder &obj);
-
-		CPartFile_Encoder &operator=(const CPartFile_Encoder &obj);
-		
-		// encode - take data from m_file
-		void Encode(CECTag *parent_tag);
-		
-		void ResetEncoder()
-		{
-			m_enc_data.ResetEncoder();
-		}
-};
-
-typedef CFileEncoderMap<CPartFile , CPartFile_Encoder, CDownloadQueue> CPartFile_Encoder_Map;
-
-/*
- * Encode 'obtained parts' info to be sent to remote gui
- */
-class CKnownFile_Encoder {
-		RLE_Data m_enc_data;
-		CKnownFile *m_file;
-	public:
-		CKnownFile_Encoder(CKnownFile *file);
-		~CKnownFile_Encoder();
-
-		// stl side :)
-		CKnownFile_Encoder();
-		
-		CKnownFile_Encoder(const CKnownFile_Encoder &obj);
-
-		CKnownFile_Encoder &operator=(const CKnownFile_Encoder &obj);
-		// encode - take data from m_file
-		void Encode(CECTag *parent_tag);
-
-		void ResetEncoder()
-		{
-			m_enc_data.ResetEncoder();
-		}
-};
-
-typedef CFileEncoderMap<CKnownFile , CKnownFile_Encoder, CSharedFileList> CKnownFile_Encoder_Map;
-
 template <class T, ec_tagname_t OP>
 class CTagSet : public std::set<T> {
 		void InSet(const CECTag *tag, uint32)
 		{
-			this->insert(tag->GetInt());
+			this->insert(tag->GetInt());		// don't remove this->
 		}
-		void InSet(const CECTag *tag, CMD4Hash)
+		void InSet(const CECTag *tag, const CMD4Hash&)
 		{
-			this->insert(tag->GetMD4Data());
+			this->insert(tag->GetMD4Data());	// don't remove this->
 		}
 	public:
 		CTagSet(const CECPacket *request) : std::set<T>()
 		{
-			for (unsigned int i = 0;i < request->GetTagCount();i++) {
-				const CECTag *tag = request->GetTagByIndex(i);
+			for (CECPacket::const_iterator it = request->begin(); it != request->end(); it++) {
+				const CECTag *tag = & *it;
 				if ( tag->GetTagName() == OP ) {
-					this->InSet(tag, T());
+					InSet(tag, T());
 				}
 			}
 		}
@@ -178,32 +63,22 @@
 
 
 class CObjTagMap {
-		std::map<void *, CValueMap> m_obj_map;
+		std::map<uint32, CValueMap> m_obj_map;
 	public:
-		CValueMap &GetValueMap(void *object)
+		CValueMap &GetValueMap(uint32 ECID)
 		{
-			return m_obj_map[object];
+			return m_obj_map[ECID];
 		}
 		
 		size_t size()
 		{
 			return m_obj_map.size();
 		}
-		
-		void RemoveDeleted(std::set<void *>& WXUNUSED(current_set))
-		{/*
-			for(std::map<void *, CValueMap>::iterator i = m_obj_map.begin(); i != m_obj_map.end(); i++) {
-				if ( !current_set.count(i->first) ) {
-					m_obj_map.erase(i->first);
-				}
-			}
-			*/
-		}
 };
 
 
 class CECServerSocket;
-
+class ECNotifier;
 
 class ExternalConn : public wxEvtHandler
 {
@@ -216,18 +91,12 @@
 	~ExternalConn();
 	
 	wxSocketServer *m_ECServer;
-
-	static CECPacket *ProcessRequest2(
-		const CECPacket *request,
-		CPartFile_Encoder_Map &,
-		CKnownFile_Encoder_Map &,
-		CObjTagMap &);
-	
-	static CECPacket *Authenticate(const CECPacket *);
+	ECNotifier *m_ec_notifier;
 
 	void AddSocket(CECServerSocket *s);
 	void RemoveSocket(CECServerSocket *s);
 	void KillAllSockets();
+	void ResetAllLogs();
 
 private:
 	// event handlers (these functions should _not_ be virtual)
@@ -235,5 +104,139 @@
 	DECLARE_EVENT_TABLE()
 };
 
+class ECUpdateMsgSource {
+	public:
+		virtual ~ECUpdateMsgSource()
+		{
+		}
+		virtual CECPacket *GetNextPacket() = 0;
+};
+
+class ECPartFileMsgSource : public ECUpdateMsgSource {
+		typedef struct {
+			bool m_new;
+			bool m_comment_changed;
+			bool m_removed;
+			bool m_finished;
+			bool m_dirty;
+			CPartFile *m_file;
+		} PARTFILE_STATUS;
+		std::map<CMD4Hash, PARTFILE_STATUS> m_dirty_status;
+	public:
+		ECPartFileMsgSource();
+		
+		void SetDirty(CPartFile *file);
+		void SetNew(CPartFile *file);
+		void SetCompleted(CPartFile *file);
+		void SetRemoved(CPartFile *file);
+		
+		virtual CECPacket *GetNextPacket();
+	
+};
+
+class ECKnownFileMsgSource : public ECUpdateMsgSource {
+		typedef struct {
+			bool m_new;
+			bool m_comment_changed;
+			bool m_removed;
+			bool m_dirty;
+			CKnownFile *m_file;
+		} KNOWNFILE_STATUS;
+		std::map<CMD4Hash, KNOWNFILE_STATUS> m_dirty_status;
+	public:
+		ECKnownFileMsgSource();
+
+		void SetDirty(CKnownFile *file);
+		void SetNew(CKnownFile *file);
+		void SetRemoved(CKnownFile *file);
+		
+		virtual CECPacket *GetNextPacket();
+};
+
+class ECClientMsgSource : public ECUpdateMsgSource {
+	public:
+		virtual CECPacket *GetNextPacket();
+};
+
+class ECStatusMsgSource : public ECUpdateMsgSource {
+		uint32 m_last_ed2k_status_sent;
+		uint32 m_last_kad_status_sent;
+		void *m_server;
+
+		uint32 GetEd2kStatus();
+		uint32 GetKadStatus();
+	public:
+		ECStatusMsgSource();
+		
+		virtual CECPacket *GetNextPacket();
+};
+
+class ECSearchMsgSource : public ECUpdateMsgSource {
+		typedef struct {
+			bool m_new;
+			bool m_child_dirty;
+			bool m_dirty;
+			CSearchFile *m_file;
+		} SEARCHFILE_STATUS;
+		std::map<CMD4Hash, SEARCHFILE_STATUS> m_dirty_status;
+	public:
+		ECSearchMsgSource();
+		
+		void SetDirty(CSearchFile *file);
+		void SetChildDirty(CSearchFile *file);
+	
+		void FlushStatus();
+	
+		virtual CECPacket *GetNextPacket();
+};
+
+class ECNotifier {
+		//
+		// designated priority for each type of update
+		//
+		enum EC_SOURCE_PRIO {
+			EC_PARTFILE = 0,
+			EC_SEARCH,
+			EC_CLIENT,
+			EC_STATUS,
+			EC_KNOWN,
+			
+			EC_STATUS_LAST_PRIO
+		};
+		
+		//ECUpdateMsgSource *m_msg_source[EC_STATUS_LAST_PRIO];
+		std::map<CECServerSocket *, ECUpdateMsgSource **> m_msg_source;
+		
+		void NextPacketToSocket();
+		
+		CECPacket *GetNextPacket(ECUpdateMsgSource *msg_source_array[]);
+		// Make class non assignable
+		void operator=(const ECNotifier&);
+		ECNotifier(const ECNotifier&);
+	public:
+		ECNotifier();
+		~ECNotifier();
+		
+		void Add_EC_Client(CECServerSocket *sock);
+		void Remove_EC_Client(CECServerSocket *sock);
+		
+		CECPacket *GetNextPacket(CECServerSocket *sock);
+		
+		//
+		// Interface to notification macros
+		//
+		void DownloadFile_SetDirty(CPartFile *file);
+		void DownloadFile_RemoveFile(CPartFile *file);
+		void DownloadFile_RemoveSource(CPartFile *file);
+		void DownloadFile_AddFile(CPartFile *file);
+		void DownloadFile_AddSource(CPartFile *file);
+		
+		void SharedFile_AddFile(CKnownFile *file);
+		void SharedFile_RemoveFile(CKnownFile *file);
+		void SharedFile_RemoveAllFiles();
+
+};
+
+
 #endif // EXTERNALCONN_H
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/ExternalConnector.cpp -> aMule-2.3.1.tar.bz2/src/ExternalConnector.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-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
@@ -62,14 +62,15 @@
 #include <ec/cpp/ECFileConfig.h>	// Needed for CECFileConfig
 #include <common/MD5Sum.h>
 
+#ifdef _MSC_VER  // silly warnings about deprecated functions
+#pragma warning(disable:4996)
+#endif
+
 //-------------------------------------------------------------------
 
 CCommandTree::~CCommandTree()
 {
-	for (CmdPos_t it = m_subcommands.begin(); it != m_subcommands.end(); ++it) {
-		delete *it;
-	}
-	m_subcommands.clear();
+	DeleteContents(m_subcommands);
 }
 
 
@@ -201,15 +202,19 @@
 	  m_ECClient(NULL),
 	  m_InputLine(NULL),
 	  m_NeedsConfigSave(false),
-	  m_locale(NULL)
+	  m_locale(NULL),
+	  m_strFullVersion(NULL),
+	  m_strOSDescription(NULL)
 {
-	SetAppName(wxT("aMule"));
+	SetAppName(wxT("aMule"));	// Do not change!
 }
 
 CaMuleExternalConnector::~CaMuleExternalConnector()
 {
 	delete m_configFile;
 	delete m_locale;
+	free(m_strFullVersion);
+	free(m_strOSDescription);
 }
 
 void CaMuleExternalConnector::OnInitCommandSet()
@@ -312,18 +317,17 @@
 		m_InputLine = text;
 #else
 		Show(prompt + wxT("$ "));
-		fflush(stdin);
-		fgets(buffer, buffer_size, stdin);
-		const char *text = buffer;
+		const char *text = fgets(buffer, buffer_size, stdin);	// == buffer if ok, NULL if eof
 #endif /* HAVE_LIBREADLINE */
 		if ( text ) {
 			size_t len = strlen(text);
-			if (len > buffer_size - 2) {
-				len = buffer_size - 2;
+			if (len > buffer_size - 1) {
+				len = buffer_size - 1;
+			}
+			if (buffer != text) {
+				strncpy(buffer, text, len);
 			}
-			strncpy(buffer, text, len);
-			buffer[len] = '\n';
-			buffer[len + 1] = 0;
+			buffer[len] = 0;
 		} else {
 			strncpy(buffer, "quit", buffer_size);
 		}
@@ -331,12 +335,12 @@
 
 void CaMuleExternalConnector::TextShell(const wxString &prompt)
 {
-	char buffer[256];
+	char buffer[2048];
 	wxString buf;
 
 	bool The_End = false;
 	do {
-		GetCommand(prompt, buffer, 256);
+		GetCommand(prompt, buffer, sizeof buffer);
 		buf = char2unicode(buffer);
 		The_End = Parse_Command(buf);
 	} while ((!The_End) && (m_ECClient->IsSocketConnected()));
@@ -349,19 +353,10 @@
 		return;
 	}
 
-	wxString appName =
-		// Find out Application Name
-		#ifdef WEBSERVERDIR
-			wxT("amuleweb")
-		#else
-			wxT("amulecmd")
-		#endif
-	;
-
 	#ifdef SVNDATE
-		Show(CFormat(_("This is %s %s %s\n")) % appName % wxT(VERSION) % wxT(SVNDATE));
+		Show(CFormat(_("This is %s %s %s\n")) % wxString::FromAscii(m_appname) % wxT(VERSION) % wxT(SVNDATE));
 	#else
-		Show(CFormat(_("This is %s %s\n")) % appName % wxT(VERSION));
+		Show(CFormat(_("This is %s %s\n")) % wxString::FromAscii(m_appname) % wxT(VERSION));
 	#endif
 
 	// HostName, Port and Password
@@ -394,6 +389,7 @@
 		// Create the socket
 		Show(_("\nCreating client...\n"));
 		m_ECClient = new CRemoteConnect(NULL);
+		m_ECClient->SetCapabilities(m_ZLIB, true, false);	// ZLIB, UTF8 numbers, notification
 
 		// ConnectToCore is blocking since m_ECClient was initialized with NULL
 		if (!m_ECClient->ConnectToCore(m_host, m_port, wxT("foobar"), m_password.Encode(), ProgName, ProgVersion)) {
@@ -425,8 +421,10 @@
 	}
 }
 
-void CaMuleExternalConnector::OnInitCmdLine(wxCmdLineParser& parser)
+void CaMuleExternalConnector::OnInitCmdLine(wxCmdLineParser& parser, const char* appname)
 {
+	m_appname = appname;
+
 	parser.AddSwitch(wxEmptyString, wxT("help"),
 		_("Show this help text."),
 		wxCMD_LINE_PARAM_OPTIONAL);
@@ -465,15 +463,7 @@
 bool CaMuleExternalConnector::OnCmdLineParsed(wxCmdLineParser& parser)
 {
 	if (parser.Found(wxT("version"))) {
-		const char *appName =
-			// Find out Application Name
-			#ifdef WEBSERVERDIR
-				"amuleweb"
-			#else
-				"amulecmd"
-			#endif
-		;
-		printf("%s %s\n", appName, (const char *)unicode2char(GetMuleVersion()));
+		printf("%s %s\n", m_appname, (const char *)unicode2char(GetMuleVersion()));
 		return false;
 	}
 
@@ -553,6 +543,7 @@
 		m_host = m_configFile->Read(wxT("/EC/Host"), wxEmptyString);
 		m_port = m_configFile->Read(wxT("/EC/Port"), 4712l);
 		m_configFile->ReadHash(wxT("/EC/Password"), &m_password);
+		m_ZLIB = m_configFile->Read(wxT("/EC/ZLIB"), 1l) != 0;
 	}
 }
 
@@ -574,6 +565,19 @@
 
 bool CaMuleExternalConnector::OnInit()
 {
+#ifndef __WXMSW__
+	#if wxUSE_ON_FATAL_EXCEPTION
+		// catch fatal exceptions
+		wxHandleFatalExceptions(true);
+	#endif
+#endif
+
+	m_strFullVersion = strdup((const char *)unicode2char(GetMuleVersion()));
+	m_strOSDescription = strdup((const char *)unicode2char(wxGetOsDescription()));
+
+	// Handle uncaught exceptions
+	InstallMuleExceptionHandler();
+
 	bool retval = wxApp::OnInit();
 	OnInitCommandSet();
 	InitCustomLanguages();
@@ -595,7 +599,7 @@
 	return m_locale == NULL ? wxString() : m_locale->GetCanonicalName();
 }
 
-#if !wxUSE_GUI && defined(__WXMAC__)
+#if !wxUSE_GUI && defined(__WXMAC__) && !wxCHECK_VERSION(2, 9, 0)
 
 #include <wx/apptrait.h> // Do_not_auto_remove
 #include <wx/stdpaths.h> // Do_not_auto_remove
@@ -620,4 +624,45 @@
 }
 
 #endif
+
+#if wxUSE_ON_FATAL_EXCEPTION
+// Gracefully handle fatal exceptions and print backtrace if possible
+void CaMuleExternalConnector::OnFatalException()
+{
+	/* Print the backtrace */
+	fprintf(stderr, "\n--------------------------------------------------------------------------------\n");	
+	fprintf(stderr, "A fatal error has occurred and %s has crashed.\n", m_appname);
+	fprintf(stderr, "Please assist us in fixing this problem by posting the backtrace below in our\n");
+	fprintf(stderr, "'aMule Crashes' forum and include as much information as possible regarding the\n");
+	fprintf(stderr, "circumstances of this crash. The forum is located here:\n");
+	fprintf(stderr, "    http://forum.amule.org/index.php?board=67.0\n");
+	fprintf(stderr, "If possible, please try to generate a real backtrace of this crash:\n");
+	fprintf(stderr, "    http://wiki.amule.org/index.php/Backtraces\n\n");
+	fprintf(stderr, "----------------------------=| BACKTRACE FOLLOWS: |=----------------------------\n");
+	fprintf(stderr, "Current version is: %s %s\n", m_appname, m_strFullVersion);
+	fprintf(stderr, "Running on: %s\n\n", m_strOSDescription);
+	
+	print_backtrace(1); // 1 == skip this function.
+	
+	fprintf(stderr, "\n--------------------------------------------------------------------------------\n");	
+}
+#endif
+
+#ifdef __WXDEBUG__
+void CaMuleExternalConnector::OnAssertFailure(const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg)
+{
+#if !defined wxUSE_STACKWALKER || !wxUSE_STACKWALKER
+	wxString errmsg = CFormat( wxT("%s:%s:%d: Assertion '%s' failed. %s") ) % file % func % line % cond % ( msg ? msg : wxT("") );
+
+	fprintf(stderr, "Assertion failed: %s\n", (const char*)unicode2char(errmsg));
+
+	// Skip the function-calls directly related to the assert call.
+	fprintf(stderr, "\nBacktrace follows:\n");
+	print_backtrace(3);
+	fprintf(stderr, "\n");
+#else
+	wxApp::OnAssertFailure(file, line, func, cond, msg);
+#endif
+}
+#endif
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/ExternalConnector.h -> aMule-2.3.1.tar.bz2/src/ExternalConnector.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-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
@@ -136,15 +136,24 @@
 	bool Parse_Command(const wxString& buffer);
 	void GetCommand(const wxString &prompt, char* buffer, size_t buffer_size);
 	const CECPacket *SendRecvMsg_v2(const CECPacket *request) { return m_ECClient->SendRecvPacket(request); }
+	void SendPacket(const CECPacket *request) { m_ECClient->SendPacket(request); }
 	void ConnectAndRun(const wxString &ProgName, const wxString& ProgVersion);
 	void ShowGreet();
 
 	//
 	// Command line processing
 	// 
-	void OnInitCmdLine(wxCmdLineParser& amuleweb_parser);
+	void OnInitCmdLine(wxCmdLineParser& amuleweb_parser, const char* appname);
 	bool OnCmdLineParsed(wxCmdLineParser& parser);
 
+#if wxUSE_ON_FATAL_EXCEPTION
+	// Exception and assert handling
+	void OnFatalException();
+#endif
+#ifdef __WXDEBUG__
+	void OnAssertFailure(const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg);
+#endif
+
 	CECFileConfig*	m_configFile;
 	wxString	m_configFileName;
 
@@ -156,12 +165,14 @@
 	long	 	m_port;
 	wxString 	m_host;
 	CMD4Hash	m_password;
+	bool		m_ZLIB;
 	bool		m_KeepQuiet;
 	bool		m_Verbose;
 	bool		m_interactive;
 	CCommandTree	m_commands;
+	const char *	m_appname;
 
-#if !wxUSE_GUI && defined(__WXMAC__)
+#if !wxUSE_GUI && defined(__WXMAC__) && !wxCHECK_VERSION(2, 9, 0)
 	virtual wxAppTraits* CreateTraits();
 #endif
 
@@ -173,6 +184,8 @@
 	bool		m_NeedsConfigSave;
 	wxString	m_language;
 	wxLocale *	m_locale;
+	char *		m_strFullVersion;
+	char *		m_strOSDescription;
 };
 
 #endif // __EXTERNALCONNECTOR_H__

aMule-2.3.1.tar.bz2/src/FileArea.cpp Added

@@ -0,0 +1,303 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 1998 Vadim Zeitlin ( zeitlin@dptmaths.ens-cachan.fr )
+//
+// 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
+//
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_ERRNO_H
+#include <errno.h>
+#endif
+
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+
+#include "FileArea.h"		// Interface declarations.
+#include "FileAutoClose.h"	// Needed for CFileAutoClose
+
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+
+#ifdef HAVE_MMAP
+#	if defined(HAVE_SYSCONF) && defined(HAVE__SC_PAGESIZE)
+static const long gs_pageSize = sysconf(_SC_PAGESIZE);
+#	elif defined(HAVE_SYSCONF) && defined(HAVE__SC_PAGE_SIZE)
+static const long gs_pageSize = sysconf(_SC_PAGE_SIZE);
+#	elif defined(HAVE_GETPAGESIZE)
+static const int gs_pageSize = getpagesize();
+#	else
+#		error "Should use memory mapped files but don't know how to determine page size!"
+#	endif
+#endif
+
+#if !defined(HAVE_SIGACTION) || !defined(SA_SIGINFO) || !defined(HAVE_MMAP) || defined(__UCLIBC__)
+
+class CFileAreaSigHandler
+{
+public:
+	static void Init() {};
+	static void Add(CFileArea&) {};
+	static void Remove(CFileArea&) {};
+private:
+	CFileAreaSigHandler() {};
+};
+
+#else
+
+class CFileAreaSigHandler
+{
+public:
+	static void Init();
+	static void Add(CFileArea& area);
+	static void Remove(CFileArea& area);
+private:
+	CFileAreaSigHandler() {};
+	static wxMutex mutex;
+	static CFileArea *first;
+	static bool initialized;
+	static struct sigaction old_segv, old_bus;
+	static void Handler(int sig, siginfo_t *info, void *ctx);
+};
+
+wxMutex          CFileAreaSigHandler::mutex;
+CFileArea *      CFileAreaSigHandler::first;
+bool             CFileAreaSigHandler::initialized = false;
+struct sigaction CFileAreaSigHandler::old_segv;
+struct sigaction CFileAreaSigHandler::old_bus;
+
+/* define MAP_ANONYMOUS for Mac OS X */
+#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
+// Handle signals.
+// The idea is to replace faulted memory with zeroes and mark
+// the error in proper CFileArea
+void CFileAreaSigHandler::Handler(int sig, siginfo_t *info, void *ctx)
+{
+	CFileArea *cur;
+	// find the mapped section where violation occurred (if any)
+	{
+		wxMutexLocker lock(mutex);
+		cur = first;
+		while (cur) {
+			if (cur->m_mmap_buffer && info->si_addr >= cur->m_mmap_buffer && info->si_addr < cur->m_mmap_buffer + cur->m_length)
+				break;
+			cur = cur->m_next;
+		}
+	}
+
+	// mark error if found
+	if (cur && gs_pageSize > 0) {
+		cur->m_error = true;
+		char *start_addr = ((char *) info->si_addr) - (((unsigned long) info->si_addr) % gs_pageSize);
+		if (mmap(start_addr, gs_pageSize, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) != MAP_FAILED)
+			return;
+	}
+
+	// call old handler
+	struct sigaction* sa = (sig == SIGSEGV) ? &old_segv : &old_bus;
+	if (sa->sa_flags & SA_SIGINFO)
+		sa->sa_sigaction(sig, info, ctx);
+	else if (sa->sa_handler == SIG_DFL || sa->sa_handler == SIG_IGN)
+		abort();
+	else
+		sa->sa_handler(sig);
+}
+
+void CFileAreaSigHandler::Init()
+{
+	// init error handler if needed
+	wxMutexLocker lock(mutex);
+	if (initialized)
+		return;
+
+	// Set our new signal handler.
+	// Note that we safe old handlers (propably wx ones) in order
+	// to be able to call them if signal not handled as desired.
+	// These handler will be removed by wx code when wx will restore
+	// old ones
+	struct sigaction sa;
+	memset(&sa, 0, sizeof(sa));
+	sigemptyset(&sa.sa_mask);
+	sa.sa_sigaction = Handler;
+	sa.sa_flags = SA_NODEFER|SA_SIGINFO;
+	if (sigaction(SIGSEGV, &sa, &old_segv))
+		return;
+	if (sigaction(SIGBUS, &sa, &old_bus)) {
+		sigaction(SIGSEGV, &old_segv, NULL);
+		return;
+	}
+	initialized = true;
+}
+
+void CFileAreaSigHandler::Add(CFileArea& area)
+{
+	wxMutexLocker lock(mutex);
+	area.m_next = first;
+	first = &area;
+}
+
+void CFileAreaSigHandler::Remove(CFileArea& area)
+{
+	wxMutexLocker lock(mutex);
+	CFileArea **cur = &first;
+	while (*cur) {
+		if (*cur == &area) {
+			*cur = area.m_next;
+			area.m_next = NULL;
+			break;
+		}
+		cur = &(*cur)->m_next;
+	}
+}
+#endif
+
+CFileArea::CFileArea()
+	: m_buffer(NULL), m_mmap_buffer(NULL), m_length(0), m_next(NULL), m_file(NULL), m_error(false)
+{
+	CFileAreaSigHandler::Init();
+}
+
+
+CFileArea::~CFileArea()
+{
+	Close();
+	CheckError();
+}
+
+bool CFileArea::Close()
+{
+	if (m_buffer != NULL && m_mmap_buffer == NULL) 
+	{
+		delete[] m_buffer;
+		m_buffer = NULL;
+	}
+#ifdef HAVE_MMAP
+	if (m_mmap_buffer)
+	{
+		munmap(m_mmap_buffer, m_length);
+		// remove from list
+		CFileAreaSigHandler::Remove(*this);
+		m_buffer = NULL;
+		m_mmap_buffer = NULL;
+		if (m_file) {
+			m_file->Unlock();
+			m_file = NULL;
+		}
+	}
+#endif
+	return true;
+}
+
+
+void CFileArea::ReadAt(CFileAutoClose& file, uint64 offset, size_t count)
+{
+	Close();
+
+#ifdef HAVE_MMAP
+	uint64 offEnd = offset + count;
+	if (gs_pageSize > 0 && offEnd < 0x100000000ull) {
+		uint64 offStart = offset & (~((uint64)gs_pageSize-1));
+		m_length = offEnd - offStart;
+		void *p = mmap(NULL, m_length, PROT_READ, MAP_SHARED, file.fd(), offStart);
+		if (p != MAP_FAILED) {
+			m_file = &file;
+			m_mmap_buffer = (byte*) p;
+			m_buffer = m_mmap_buffer + (offset - offStart);
+
+			// add to list to catch errors correctly
+			CFileAreaSigHandler::Add(*this);
+			return;
+		}
+	}
+	file.Unlock();
+#endif
+	m_buffer = new byte[count];
+	file.ReadAt(m_buffer, offset, count);
+}
+
+#ifdef HAVE_MMAP
+void CFileArea::StartWriteAt(CFileAutoClose& file, uint64 offset, size_t count)
+{
+	Close();
+
+	uint64 offEnd = offset + count;
+	if (file.GetLength() >= offEnd && gs_pageSize > 0 && offEnd < 0x100000000ull) {
+		uint64 offStart = offset & (~((uint64)gs_pageSize-1));
+		m_length = offEnd - offStart;
+		void *p = mmap(NULL, m_length, PROT_READ|PROT_WRITE, MAP_SHARED, file.fd(), offStart);
+		if (p != MAP_FAILED)
+		{
+			m_file = &file;
+			m_mmap_buffer = (byte*) p;
+			m_buffer = m_mmap_buffer + (offset - offStart);
+
+			// add to list to catch errors correctly
+			CFileAreaSigHandler::Add(*this);
+			return;
+		}
+		file.Unlock();
+	}
+	m_buffer = new byte[count];
+}
+#else
+void CFileArea::StartWriteAt(CFileAutoClose&, uint64, size_t count)
+{
+	Close();
+	m_buffer = new byte[count];
+}
+#endif
+
+
+bool CFileArea::FlushAt(CFileAutoClose& file, uint64 offset, size_t count)
+{
+	if (!m_buffer)
+		return false;
+
+#ifdef HAVE_MMAP
+	if (m_mmap_buffer) {
+		if (msync(m_mmap_buffer, m_length, MS_SYNC))
+			return false;
+		Close();
+		return true;
+	}
+#endif
+	file.WriteAt(m_buffer, offset, count);
+	Close();
+	return true;
+}
+
+void CFileArea::CheckError()
+{
+	bool err = m_error;
+	m_error = false;
+	if (err)
+		throw CIOFailureException(wxT("Read error, failed to read from file."));
+}
+

aMule-2.3.1.tar.bz2/src/FileArea.h Added

@@ -0,0 +1,124 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2009-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2009-2011 Frediano Ziglio (freddy77@gamilc.com)
+//
+// 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 FILEAREA_H
+#define FILEAREA_H
+
+#include "Types.h"		// Needed for byte
+
+class CFileAreaSigHandler;
+class CFileAutoClose;
+
+/**
+ * This class is used to optimize file read/write using mapped memory
+ * if supported.
+ */
+class CFileArea
+{
+friend class CFileAreaSigHandler;
+public:
+	/**
+	 * Creates a uninitialized file area.
+	 */
+	CFileArea();
+
+	
+	/**
+	 * Destructor, closes the file if opened.
+	 */
+	virtual ~CFileArea();
+
+	/**
+	 * Closes the file.
+	 */
+        bool Close();
+
+	/**
+	 * Init area with a given piece of file.
+	 *
+	 * @param file   file to read.
+	 * @param offset seek address in file.
+	 * @param count  bytes to read.
+	 *
+	 * Initialize buffer. Buffer will contain data from current file
+	 * position for count length. Buffer will be a memory mapped area
+	 * or a allocated buffer depending on systems.
+	 */
+	void ReadAt(CFileAutoClose& file, uint64 offset, size_t count);
+
+	/**
+	 * Start a new write
+	 */
+	void StartWriteAt(CFileAutoClose& file, uint64 offset, size_t count);
+
+        /**
+	 * Flushes data not yet written.
+	 */
+	bool FlushAt(CFileAutoClose& file, uint64 offset, size_t count);
+
+	/**
+	 * Get buffer that contains data readed or to write.
+	 * @return allocated buffer or NULL if not initialized
+	 */
+	byte *GetBuffer() const { return m_buffer; };
+
+	/**
+	 * Report error pending
+	 */
+	void CheckError();
+
+private:
+	//! A CFileArea is neither copyable nor assignable.
+	//@{
+	CFileArea(const CFileArea&);
+	CFileArea& operator=(const CFileArea&);
+	//@}
+
+	/**
+	 * Pointer to buffer used for read/write operations.
+	 * If mapped points inside m_mmap_buffer area otherwise
+	 * point to an allocated buffer to be freed.
+	 */
+	byte *m_buffer;
+	/**
+	 * Pointer to memory mapped area or NULL if not mapped.
+	 */
+	byte *m_mmap_buffer;
+	/**
+	 * Length of the mapped region, currently used only for munmap.
+	 */
+	size_t m_length;
+	/**
+	 * Global chain
+	 */
+	CFileArea* m_next;
+	/**
+	 * File handle to release
+	 */
+	CFileAutoClose * m_file;
+	/**
+	 * true if error detected
+	 */
+	bool m_error;
+};
+
+#endif // FILEAREA_H
+// File_checked_for_headers

aMule-2.3.1.tar.bz2/src/FileAutoClose.cpp Added

@@ -0,0 +1,154 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2008-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-2011 Stu Redman ( sturedman@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
+//
+
+#include "FileAutoClose.h"
+#include "GetTickCount.h"	// for TheTime
+#include "Logger.h"			// Needed for AddDebugLogLineN
+
+
+static const uint32 ReleaseTime = 600;	// close file after 10 minutes of not being used
+
+CFileAutoClose::CFileAutoClose()
+	: m_mode(CFile::read),
+	  m_autoClosed(false),
+	  m_locked(0),
+	  m_size(0),
+	  m_lastAccess(TheTime)
+{}
+	
+CFileAutoClose::CFileAutoClose(const CPath& path, CFile::OpenMode mode)
+{
+	Open(path, mode);
+}
+
+bool CFileAutoClose::Open(const CPath& path, CFile::OpenMode mode)
+{
+	m_mode = mode;
+	m_autoClosed = false;
+	m_locked = 0;
+	m_size = 0;
+	m_lastAccess = TheTime;
+	return m_file.Open(path, mode);
+}
+	
+bool CFileAutoClose::Create(const CPath& path, bool overwrite)
+{
+	m_mode = CFile::write;
+	m_autoClosed = false;
+	m_lastAccess = TheTime;
+	return m_file.Create(path, overwrite);
+}
+	
+bool CFileAutoClose::Close()
+{
+	bool state = m_autoClosed ? true : m_file.Close();
+	m_autoClosed = false;
+	return state;
+}
+
+uint64 CFileAutoClose::GetLength() const
+{
+	return m_autoClosed ? m_size : m_file.GetLength();
+}
+	
+bool CFileAutoClose::SetLength(uint64 newLength)
+{
+	Reopen();
+	return m_file.SetLength(newLength);
+}
+
+const CPath& CFileAutoClose::GetFilePath() const
+{
+	return m_file.GetFilePath();
+}
+
+bool CFileAutoClose::IsOpened() const
+{
+	return m_autoClosed || m_file.IsOpened();
+}
+	
+void CFileAutoClose::ReadAt(void* buffer, uint64 offset, size_t count)
+{
+	Reopen();
+	m_file.Seek(offset);
+	m_file.Read(buffer, count);
+}
+
+void CFileAutoClose::WriteAt(const void* buffer, uint64 offset, size_t count)
+{
+	Reopen();
+	m_file.Seek(offset);
+	m_file.Write(buffer, count);
+}
+
+bool CFileAutoClose::Eof()
+{
+	Reopen();
+	return m_file.Eof();
+}
+
+int CFileAutoClose::fd()
+{
+	Reopen();
+	m_locked++;
+	return m_file.fd();
+}
+
+void CFileAutoClose::Unlock() 
+{
+	if (m_locked) {
+		m_locked--;
+	}
+}
+
+void CFileAutoClose::Reopen()
+{
+	if (m_autoClosed) {
+		AddDebugLogLineN(logCFile, wxT("Reopen AutoClosed file ") + GetFilePath().GetPrintable());
+		m_file.Reopen(m_mode); // throws on failure
+		// On open error m_autoClosed stays true, so if the app tries again
+		// it opens and throws again.
+		// Otherwise it would assert on an operation on a closed file and probably die.
+		m_autoClosed = false;
+	}
+	m_lastAccess = TheTime;
+}
+
+bool CFileAutoClose::Release(bool now)
+{
+	if (!m_autoClosed
+			&& (now || TheTime - m_lastAccess >= ReleaseTime)
+			&& !m_locked
+			&& m_file.IsOpened()) {
+		m_autoClosed = true;
+		m_size = m_file.GetLength();
+		m_file.Close();
+		AddDebugLogLineN(logCFile, wxT("AutoClosed file ") + GetFilePath().GetPrintable()
+			+ (now ? wxT("(immediately)") : wxT("(timed)")));
+	}
+	return m_autoClosed;
+}
+
+// File_checked_for_headers

aMule-2.3.1.tar.bz2/src/FileAutoClose.h Added

@@ -0,0 +1,191 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2008-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-2011 Stu Redman ( sturedman@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 FILEAUTOCLOSE_H
+#define FILEAUTOCLOSE_H
+
+#include "CFile.h"			// Needed for CFile
+
+/**
+ * This class encapsulates the CFile class.
+ *
+ * It allows to close the used file handle and reopen
+ * it on usage to minimize the number of used file handles. 
+ *
+ */
+class CFileAutoClose
+{
+public:
+	
+	/**
+	 * Creates a closed file.
+	 */
+	CFileAutoClose();
+	
+	/**
+	 * Constructor, calls Open on the specified file.
+	 *
+	 * To check if the file was successfully opened, a
+	 * call to IsOpened() is required.
+	 */
+	CFileAutoClose(const CPath& path, CFile::OpenMode mode = CFile::read);
+
+	/**
+	 * Request auto closing of the file handle.
+	 *
+	 * @param now true: close immediately  false: close when timeout has expired
+	 * @return True if the file has been (or has already been) autoclosed.
+	 */
+	bool Release(bool now = false);
+
+	/**
+	 * Opens a file.
+	 *
+	 * @param path The full or relative path to the file.
+	 * @param mode The opening mode (see CFile).
+	 * @return True if the file was opened, false otherwise.
+	 */
+	bool Open(const CPath& path, CFile::OpenMode mode = CFile::read);
+	
+	/**
+	 * Calling Create is equivilant of calling open with OpenMode 'write'.
+	 *
+	 * @param overwrite Specifies if the target file should be overwritten,
+	 *                  in case that it already exists.
+	 *
+	 * @see CFile::Open
+	 */
+	bool Create(const CPath& path, bool overwrite = false);
+	
+	/**
+	 * Closes the file.
+	 *
+	 * Note that calling Close on an closed file
+	 * is an illegal operation.
+	 */
+	bool Close();
+
+	/**
+	 * @see CSafeFileIO::GetLength
+	 *
+	 * Note that calling GetLength on a closed file 
+	 * is an illegal operation.
+	 */
+	uint64 GetLength() const;
+	
+	/**
+	 * Resizes the file to the specified length.
+	 *
+	 */
+	bool SetLength(uint64 newLength);
+	
+	/**
+	 * Returns the path of the currently opened file.
+	 * 
+	 */
+	const CPath& GetFilePath() const;
+
+	/**
+	 * Returns true if the file is opened, false otherwise.
+	 */
+	bool IsOpened() const;
+	
+	/**
+	 * Reads 'count' bytes into 'buffer'.
+	 *
+	 * @param buffer The target buffer.
+	 * @param offset The seek address in the file.
+	 * @param count The number of bytes to read.
+	 *
+	 * See CFileDataIO::Read
+	 */
+	void ReadAt(void* buffer, uint64 offset, size_t count);
+
+	/**
+	 * Write 'count' bytes from 'buffer' into the file.
+	 *
+	 * @param buffer The source-data buffer.
+	 * @param offset The seek address in the file.
+	 * @param count The number of bytes to write.
+	 *
+	 * See CFileDataIO::Write
+	 */
+	void WriteAt(const void* buffer, uint64 offset, size_t count);
+
+	/**
+	 * Returns true when the file-position is past or at the end of the file.
+	 */
+	bool Eof();
+
+	/**
+	 * Returns the file descriptior assosiated with the file.
+	 *
+	 * This breaks the purpose of this class of course. 
+	 * Therefore the AutoClose mechanism is disabled when fd() is called.
+	 * It's required for FileArea's mmap stuff.
+	 * Currently FileArea objects are shortlived enough for this not being 
+	 * a problem anyway, but that might change in the future.
+	 */
+	int fd();
+
+	/**
+	 * Reenables AutoClose disabled by fd() before.
+	 */
+	void Unlock();
+
+private:
+	//! A CFileAutoClose is neither copyable nor assignable.
+	//@{
+	CFileAutoClose(const CFileAutoClose&);
+	CFileAutoClose& operator=(const CFileAutoClose&);
+	//@}
+	
+	/**
+	 * Check if file was autoclosed, and reopen if needed.
+	 */
+	void Reopen();
+
+	//! The wrapped CFile.
+	CFile m_file;
+	
+	//! The mode used to open it.
+	CFile::OpenMode m_mode;
+
+	//! Is it temporarily closed?
+	bool m_autoClosed;
+
+	//! Autoclosing is disabled if != 0 
+	uint16 m_locked;
+
+	//! Size before it was closed.
+	uint64 m_size;
+
+	//! Last access time (s)
+	uint32 m_lastAccess;
+};
+
+
+#endif // FILEAUTOCLOSE_H
+// File_checked_for_headers

aMule-2.2.6.tar.bz2/src/FileDetailDialog.cpp -> aMule-2.3.1.tar.bz2/src/FileDetailDialog.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -32,12 +32,11 @@
 #include "FileDetailDialog.h"	// Interface declarations
 #include "FileDetailListCtrl.h"	// Needed for CFileDetailListCtrl
 #include "CommentDialogLst.h"	// Needed for CCommentDialogLst
-#include "updownclient.h"	// Needed for CUpDownClient
 #include "PartFile.h"		// Needed for CPartFile
-#include "Color.h"		// Needed for SYSCOLOR
 #include "amule.h"		// Needed for theApp
 #include "SharedFileList.h"	// Needed for CSharedFileList
 #include "OtherFunctions.h"
+#include "MuleColour.h"
 
 #define ID_MY_TIMER 1652
 
@@ -51,21 +50,25 @@
 	EVT_TEXT(IDC_FILENAME, CFileDetailDialog::OnTextFileNameChange)
 	EVT_BUTTON(IDC_APPLY_AND_CLOSE, CFileDetailDialog::OnBnClickedOk)
 	EVT_BUTTON(IDC_APPLY, CFileDetailDialog::OnBnClickedApply)
+	EVT_BUTTON(IDC_PREVFILE, CFileDetailDialog::OnBnClickedPrevFile)
+	EVT_BUTTON(IDC_NEXTFILE, CFileDetailDialog::OnBnClickedNextFile)
 	EVT_TIMER(ID_MY_TIMER,CFileDetailDialog::OnTimer)
 END_EVENT_TABLE()
 
-CFileDetailDialog::CFileDetailDialog(wxWindow *parent, CPartFile *file)
+CFileDetailDialog::CFileDetailDialog(wxWindow *parent, std::vector<CPartFile *> & files, int index)
 :
 wxDialog(parent, -1, _("File Details"), wxDefaultPosition, wxDefaultSize,
 	wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX),
-m_file(file),
+m_files(files),
+m_index(index),
 m_filenameChanged(false)
 {
 	theApp->m_FileDetailDialogActive++;
 	m_timer.SetOwner(this, ID_MY_TIMER);
 	m_timer.Start(5000);
 	wxSizer *content = fileDetails(this, true);
-	UpdateData();
+	m_file = m_files[m_index];
+	UpdateData(true);
 	content->SetSizeHints(this);
 	content->Show(this, true);
 }
@@ -76,8 +79,9 @@
 	m_timer.Stop();
 }
 
-void CFileDetailDialog::OnTimer(wxTimerEvent& WXUNUSED(evt)) {
-	UpdateData();
+void CFileDetailDialog::OnTimer(wxTimerEvent& WXUNUSED(evt))
+{
+	UpdateData(false);
 }
 
 void CFileDetailDialog::OnClosewnd(wxCommandEvent& WXUNUSED(evt))
@@ -85,43 +89,38 @@
 	EndModal(0);
 }
 
-void CFileDetailDialog::UpdateData()
+void CFileDetailDialog::UpdateData(bool resetFilename)
 {
 	wxString bufferS;
-	CastChild(IDC_FNAME,wxStaticText)->SetLabel(MakeStringEscaped(
-		TruncateFilename(m_file->GetFileName(),60)));
-	CastChild(IDC_METFILE,wxStaticText)->SetLabel(MakeStringEscaped(
-		TruncateFilename(m_file->GetFullName(),60,true)));
+	CastChild(IDC_FNAME,   wxStaticText)->SetLabel(MakeStringEscaped(m_file->GetFileName().TruncatePath(60)));
+	CastChild(IDC_METFILE, wxStaticText)->SetLabel(MakeStringEscaped(m_file->GetFullName().TruncatePath(60, true)));
 
-	wxString tmp = CastChild(IDC_FILENAME, wxTextCtrl)->GetValue();
-	if (tmp.Length() < 3) {
+	if (resetFilename) {
 		resetValueForFilenameTextEdit();
 	}
 
 	CastChild(IDC_FHASH,wxStaticText)->SetLabel(m_file->GetFileHash().Encode());
-	bufferS = wxString::Format(wxT("%llu bytes ("), m_file->GetFileSize())
-			+ CastItoXBytes(m_file->GetFileSize())
-			+ wxT(")");
+	bufferS = CFormat(wxT("%u bytes (%s)")) % m_file->GetFileSize() % CastItoXBytes(m_file->GetFileSize());
 	CastChild(IDC_FSIZE,wxControl)->SetLabel(bufferS);
 	CastChild(IDC_PFSTATUS,wxControl)->SetLabel(m_file->getPartfileStatus());
-	bufferS = wxString::Format(wxT("%i (%i)"),m_file->GetPartCount(),m_file->GetHashCount());
+	bufferS = CFormat(wxT("%i (%i)")) % m_file->GetPartCount() % m_file->GetHashCount();
 	CastChild(IDC_PARTCOUNT,wxControl)->SetLabel(bufferS);
 	CastChild(IDC_TRANSFERRED,wxControl)->SetLabel(CastItoXBytes(m_file->GetTransferred()));
 	CastChild(IDC_FD_STATS1,wxControl)->SetLabel(CastItoXBytes(m_file->GetLostDueToCorruption()));
 	CastChild(IDC_FD_STATS2,wxControl)->SetLabel(CastItoXBytes(m_file->GetGainDueToCompression()));
 	CastChild(IDC_FD_STATS3,wxControl)->SetLabel(CastItoIShort(m_file->TotalPacketsSavedDueToICH()));
 	CastChild(IDC_COMPLSIZE,wxControl)->SetLabel(CastItoXBytes(m_file->GetCompletedSize()));
-	bufferS = wxString::Format(_("%.2f%% done"),m_file->GetPercentCompleted());
+	bufferS = CFormat(_("%.1f%% done")) % m_file->GetPercentCompleted();
 	CastChild(IDC_PROCCOMPL,wxControl)->SetLabel(bufferS);
-	bufferS = wxString::Format(_("%.2f kB/s"),(float)m_file->GetKBpsDown());
+	bufferS = CFormat(_("%.2f kB/s")) % m_file->GetKBpsDown();
 	CastChild(IDC_DATARATE,wxControl)->SetLabel(bufferS);
-	bufferS = wxString::Format(wxT("%i"),m_file->GetSourceCount());
+	bufferS = CFormat(wxT("%i")) % m_file->GetSourceCount();
 	CastChild(IDC_SOURCECOUNT,wxControl)->SetLabel(bufferS);
-	bufferS = wxString::Format(wxT("%i"),m_file->GetTransferingSrcCount());
+	bufferS = CFormat(wxT("%i")) % m_file->GetTransferingSrcCount();
 	CastChild(IDC_SOURCECOUNT2,wxControl)->SetLabel(bufferS);
-	bufferS = wxString::Format(wxT("%i (%.1f%%)"),
-		m_file->GetAvailablePartCount(),
-		((m_file->GetAvailablePartCount() * 100.0f)/ m_file->GetPartCount()));
+	bufferS = CFormat(wxT("%i (%.1f%%)"))
+		% m_file->GetAvailablePartCount()
+		% ((m_file->GetAvailablePartCount() * 100.0)/ m_file->GetPartCount());
 	CastChild(IDC_PARTAVAILABLE,wxControl)->SetLabel(bufferS);
 	bufferS = CastSecondsToHM(m_file->GetDlActiveTime());
 	CastChild(IDC_DLACTIVETIME, wxControl)->SetLabel(bufferS);
@@ -136,16 +135,15 @@
 	CastChild(IDC_LASTSEENCOMPL,wxControl)->SetLabel(bufferS);
 	setEnableForApplyButton();
 	// disable "Show all comments" button if there are no comments
-	CastChild(IDC_CMTBT, wxControl)->Enable(!m_file->GetRatingAndComments().empty());
+	FileRatingList list;
+	m_file->GetRatingAndComments(list);
+	CastChild(IDC_CMTBT, wxControl)->Enable(!list.empty());
 	FillSourcenameList();
 	Layout();
 }
 
 // CFileDetailDialog message handlers
 
-#define LVCFMT_LEFT wxLIST_FORMAT_LEFT
-
-
 void CFileDetailDialog::FillSourcenameList()
 {
 	CFileDetailListCtrl* pmyListCtrl; 
@@ -161,9 +159,9 @@
 
 	// update
 #ifdef CLIENT_GUI
-	const SourcenameItemList &sources = m_file->GetSourcenameItemList();
-	for (SourcenameItemList::const_iterator it = sources.begin(); it != sources.end(); ++it) {
-		const SourcenameItem &cur_src = *it;
+	const SourcenameItemMap &sources = m_file->GetSourcenameItemMap();
+	for (SourcenameItemMap::const_iterator it = sources.begin(); it != sources.end(); ++it) {
+		const SourcenameItem &cur_src = it->second;
 		itempos = pmyListCtrl->FindItem(-1,cur_src.name);
 		if (itempos == -1) {
 			int itemid = pmyListCtrl->InsertItem(0, cur_src.name);
@@ -172,7 +170,7 @@
 			// background.. argh -- PA: was in old version - do we still need this?
 			wxListItem tmpitem;
 			tmpitem.m_itemId = itemid;
-			tmpitem.SetBackgroundColour(SYSCOLOR(wxSYS_COLOUR_LISTBOX));
+			tmpitem.SetBackgroundColour(CMuleColour(wxSYS_COLOUR_LISTBOX));
 			pmyListCtrl->SetItem(tmpitem);
 			inserted++;
 		} else { 
@@ -181,10 +179,10 @@
 		} 
 	}
 #else // CLIENT_GUI
-	const CPartFile::SourceSet& sources = m_file->GetSourceList();
-	CPartFile::SourceSet::const_iterator it = sources.begin();
+	const CKnownFile::SourceSet& sources = m_file->GetSourceList();
+	CKnownFile::SourceSet::const_iterator it = sources.begin();
 	for ( ; it != sources.end(); ++it ) {
-		const CUpDownClient &cur_src = **it; 
+		const CClientRef &cur_src = *it; 
 		if (cur_src.GetRequestFile() != m_file ||
 		    cur_src.GetClientFilename().Length() == 0) {
 			continue;
@@ -198,7 +196,7 @@
 			// background.. argh -- PA: was in old version - do we still need this?
 			wxListItem tmpitem;
 			tmpitem.m_itemId=itemid;
-			tmpitem.SetBackgroundColour(SYSCOLOR(wxSYS_COLOUR_LISTBOX));
+			tmpitem.SetBackgroundColour(CMuleColour(wxSYS_COLOUR_LISTBOX));
 			pmyListCtrl->SetItem(tmpitem);
 			inserted++;
 		} else { 
@@ -216,7 +214,7 @@
 			pmyListCtrl->DeleteItem(i);
 			i--;  // PA: one step back is enough, no need to go back to 0
 		} else {
-			pmyListCtrl->SetItem(i, 1, wxString::Format(wxT("%li"), item->count));
+			pmyListCtrl->SetItem(i, 1, CFormat(wxT("%i")) % item->count);
 		}
 	}
 
@@ -251,11 +249,13 @@
 
 void CFileDetailDialog::setEnableForApplyButton()
 {
-	CastChild(IDC_APPLY, wxControl)->Enable(
-		m_file->IsPartFile() && // Currently renaming of completed files causes problem with kad
+	bool enabled = 
 		m_file->GetStatus() != PS_COMPLETE &&
 		m_file->GetStatus() != PS_COMPLETING &&
-		m_filenameChanged);
+		m_filenameChanged;
+	CastChild(IDC_APPLY, wxControl)->Enable(enabled);
+	// Make OK button default so Text can be applied by hitting return
+	CastChild(enabled ? IDC_APPLY_AND_CLOSE : ID_CLOSEWNDFD, wxButton)->SetDefault();
 }
 
 
@@ -290,6 +290,26 @@
 }
 
 
+void CFileDetailDialog::OnBnClickedPrevFile(wxCommandEvent&)
+{
+	if (--m_index < 0) {
+		m_index = m_files.size() - 1;
+	}
+	m_file = m_files[m_index];
+	UpdateData(true);
+}
+
+
+void CFileDetailDialog::OnBnClickedNextFile(wxCommandEvent&)
+{
+	if (++m_index == (int) m_files.size()) {
+		m_index = 0;
+	}
+	m_file = m_files[m_index];
+	UpdateData(true);
+}
+
+
 bool IsDigit(const wxChar ch)
 {
 	switch (ch) {
@@ -440,12 +460,9 @@
 	CFileDetailListCtrl* pmyListCtrl;
 	pmyListCtrl = CastChild( IDC_LISTCTRLFILENAMES, CFileDetailListCtrl );
 	if (pmyListCtrl->GetSelectedItemCount() > 0) {
-		long pos=-1;
-		for(;;) {
-			pos=pmyListCtrl->GetNextItem(pos,wxLIST_NEXT_ALL,wxLIST_STATE_SELECTED);
-			if(pos==-1) {
-				break;
-			}
+		// get first selected item (there is only one)
+		long pos = pmyListCtrl->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		if (pos != -1) {	// shouldn't happen, we checked if something is selected
 			setValueForFilenameTextEdit(pmyListCtrl->GetItemText(pos));
 		}
 	}
@@ -453,17 +470,7 @@
 
 void CFileDetailDialog::OnListClickedTakeOver(wxListEvent& WXUNUSED(evt))
 {
-	CFileDetailListCtrl* pmyListCtrl;
-	pmyListCtrl = CastChild( IDC_LISTCTRLFILENAMES, CFileDetailListCtrl );
-	if (pmyListCtrl->GetSelectedItemCount() > 0) {
-		long pos=-1;
-		for(;;) {
-			pos=pmyListCtrl->GetNextItem(pos,wxLIST_NEXT_ALL,wxLIST_STATE_SELECTED);
-			if(pos==-1) {
-				break;
-			}
-			setValueForFilenameTextEdit(pmyListCtrl->GetItemText(pos));
-		}
-	}
+	wxCommandEvent ev;
+	OnBnClickedTakeOver(ev);
 }
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/FileDetailDialog.h -> aMule-2.3.1.tar.bz2/src/FileDetailDialog.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -26,6 +26,7 @@
 #ifndef FILEDETAILDIALOG_H
 #define FILEDETAILDIALOG_H
 
+#include <vector>
 
 class CPartFile;
 
@@ -34,7 +35,7 @@
 class CFileDetailDialog : public wxDialog
 {
 public:
-	CFileDetailDialog(wxWindow *parent, CPartFile *file);
+	CFileDetailDialog(wxWindow *parent, std::vector<CPartFile *> & files, int index);
 	virtual ~CFileDetailDialog();
 
 protected:
@@ -42,8 +43,10 @@
 	DECLARE_EVENT_TABLE()
 
 private:
-	void UpdateData();
+	void UpdateData(bool resetFilename);
+	std::vector<CPartFile *> & m_files;
 	CPartFile* m_file;
+	int m_index;
 	wxTimer m_timer;
 	bool m_filenameChanged;
 	
@@ -60,7 +63,8 @@
 	void OnTextFileNameChange(wxCommandEvent& evt);
 	void OnBnClickedOk(wxCommandEvent& evt);
 	void OnBnClickedApply(wxCommandEvent& evt);
-
+	void OnBnClickedPrevFile(wxCommandEvent& evt);
+	void OnBnClickedNextFile(wxCommandEvent& evt);
 };
 
 #endif // FILEDETAILDIALOG_H

aMule-2.2.6.tar.bz2/src/FileDetailListCtrl.cpp -> aMule-2.3.1.tar.bz2/src/FileDetailListCtrl.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -26,7 +26,6 @@
 #include "muuli_wdr.h"		// Needed for ID_CLOSEWNDFD
 #include "FileDetailListCtrl.h"	// Interface declarations
 
-#define LVCFMT_LEFT wxLIST_FORMAT_LEFT
 #define wxLIST_STATE_DESELECTED 0x0000
 
 BEGIN_EVENT_TABLE(CFileDetailListCtrl, CMuleListCtrl)
@@ -40,8 +39,8 @@
 	SetSortFunc(SortProc);
 	
 	// Initial sorting: Sources descending
-	InsertColumn(0, _("File Name"), LVCFMT_LEFT, 370);
-	InsertColumn(1, _("Sources"), LVCFMT_LEFT, 70);
+	InsertColumn(0, _("File Name"), wxLIST_FORMAT_LEFT, 370);
+	InsertColumn(1, _("Sources"), wxLIST_FORMAT_LEFT, 70);
 	
 	SetSorting(1, CMuleListCtrl::SORT_DES);
 
@@ -68,18 +67,15 @@
 {
 	// Damn wxLC_SINGLE_SEL does not work! So we have to care for single selection ourselfs:
 	long realpos = event.m_itemIndex;
-	long pos=-1;
-	for(;;) {
+	long pos = -1;
+	do {
 		// Loop through all selected items
-		pos=GetNextItem(pos,wxLIST_NEXT_ALL,wxLIST_STATE_SELECTED);
-		if(pos==-1) {
-			// No more selected items left
-			break;
-		} else if (pos != realpos) {
+		pos = GetNextItem(pos, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		if (pos != realpos && pos != -1) {
 			// Deselect all items except the one we have just clicked
 			SetItemState(pos, wxLIST_STATE_DESELECTED, wxLIST_STATE_SELECTED);
 		}
-	}
+	} while (pos != -1);
 
 	event.Skip();
 }

aMule-2.2.6.tar.bz2/src/FileDetailListCtrl.h -> aMule-2.3.1.tar.bz2/src/FileDetailListCtrl.h Changed

aMule-2.2.6.tar.bz2/src/FileLock.h -> aMule-2.3.1.tar.bz2/src/FileLock.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2006-2009 Mikkel Schubert ( xaignar@users.sourceforge.net )
-// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2006-2011 Mikkel Schubert ( xaignar@users.sourceforge.net )
+// Copyright (c) 2006-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
@@ -62,8 +62,8 @@
    	{
 		hd = CreateFileA((file + "_lock").c_str(),
 			GENERIC_READ | GENERIC_WRITE, 
-			0,       // share - not shareable
-			NULL,    // security - not inheritable
+			FILE_SHARE_READ | FILE_SHARE_WRITE,		// share - shareable
+			NULL,									// security - not inheritable
 			CREATE_ALWAYS,
 			FILE_ATTRIBUTE_ARCHIVE, 
 			NULL);
@@ -153,7 +153,7 @@
 		while (true) {
 			if (fcntl(m_fd, F_SETLKW, &lock) == 0) {
 				return true;
-			} else if ((errno != EACCES) and (errno != EAGAIN) and (errno != EINTR)) {
+			} else if ((errno != EACCES) && (errno != EAGAIN) && (errno != EINTR)) {
 				// Not an error we can recover from.
 				break;
 			}

aMule-2.2.6.tar.bz2/src/Friend.cpp -> aMule-2.3.1.tar.bz2/src/Friend.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 // 
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -25,18 +25,16 @@
 
 
 #include "Friend.h"			// Interface declarations.
-#include "PartFile.h"		// Needed for CPartFile
-#include "updownclient.h"	// Needed for CUpDownClient
+#include "SafeFile.h"		// Needed for CFileDataIO
 #include "GuiEvents.h"		// Needed for Notify_*
 
 
-CFriend::CFriend()
+void CFriend::Init()
 {
 	m_dwLastSeen = 0;
 	m_dwLastUsedIP = 0;
 	m_nLastUsedPort = 0;
 	m_dwLastChatted = 0;
-	m_LinkedClient = NULL;
 }
 
 
@@ -53,48 +51,65 @@
 	} else {
 		m_strName = tm_strName;
 	}	
-	
-	m_LinkedClient = NULL;
 }
 
 
-CFriend::CFriend(CUpDownClient* client)
+CFriend::CFriend(CClientRef client)
 {
-	wxASSERT( client );
-	
-	LinkClient(client, false); // On init, no need to unlink. BETTER not to unlink.	
+	LinkClient(client);
 	
 	m_dwLastChatted = 0;
 }
 
 
-void	CFriend::LinkClient(CUpDownClient* client, bool unlink) {
+void CFriend::LinkClient(CClientRef client)
+{
+	wxASSERT(client.IsLinked());
+
 	// Link the friend to that client
-	if (unlink && m_LinkedClient) { // What, is already linked?
-		if (m_LinkedClient != client){
-			bool bFriendSlot = m_LinkedClient->GetFriendSlot();
-			// avoid that an unwanted client instance keeps a friend slot
-			m_LinkedClient->SetFriendSlot(false);
-			m_LinkedClient->SetFriend(NULL);
-			m_LinkedClient = client;
-			// move an assigned friend slot between different client instances which are/were also friends
-			m_LinkedClient->SetFriendSlot(bFriendSlot);
+	if (m_LinkedClient != client) {		// do nothing if already linked to this client
+		bool hadFriendslot = false;
+		if (m_LinkedClient.IsLinked()) { // What, is already linked?
+			hadFriendslot = m_LinkedClient.GetFriendSlot();
+			UnLinkClient(false);
 		}
-	} else {
 		m_LinkedClient = client;
+		m_LinkedClient.SetFriend(this);
+		if (hadFriendslot) {
+			// move an assigned friend slot between different client instances which are/were also friends
+			m_LinkedClient.SetFriendSlot(true);
+		}
 	}
 
-	if ( !client->GetUserName().IsEmpty() ) {
-		m_strName = client->GetUserName();
-	} else {
+	// always update (even if client stays the same)
+	if ( !client.GetUserName().IsEmpty() ) {
+		m_strName = client.GetUserName();
+	} else if (m_strName.IsEmpty()) {
 		m_strName = wxT("?");
 	}	
-	m_UserHash = client->GetUserHash();
-	m_dwLastUsedIP = client->GetIP();
-	m_nLastUsedPort = client->GetUserPort();
+	m_UserHash = client.GetUserHash();
+	m_dwLastUsedIP = client.GetIP();
+	m_nLastUsedPort = client.GetUserPort();
 	m_dwLastSeen = time(NULL);
 	// This will update the Link status also on GUI.
-	Notify_ChatRefreshFriend(m_dwLastUsedIP, m_nLastUsedPort, m_strName);
+	Notify_ChatUpdateFriend(this);
+}
+
+
+void CFriend::UnLinkClient(bool notify)
+{
+	if (m_LinkedClient.IsLinked()) {
+		// avoid that an unwanted client instance keeps a friend slot
+		if (m_LinkedClient.GetFriendSlot()) {
+			m_LinkedClient.SetFriendSlot(false);
+			CoreNotify_Upload_Resort_Queue();
+		}
+		m_LinkedClient.SetFriend(NULL);
+		m_LinkedClient.Unlink();
+		if (notify) {
+			Notify_ChatUpdateFriend(this);
+		}
+	}
 }
 
 
@@ -142,8 +157,8 @@
 
 
 bool CFriend::HasFriendSlot() {
-	if (GetLinkedClient()) {
-		return GetLinkedClient()->GetFriendSlot();
+	if (m_LinkedClient.IsLinked()) {
+		return m_LinkedClient.GetFriendSlot();
 	} else {
 		return false;
 	}

aMule-2.2.6.tar.bz2/src/Friend.h -> aMule-2.3.1.tar.bz2/src/Friend.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,52 +27,58 @@
 #define FRIEND_H
 
 
+#include <ec/cpp/ECID.h>	// Needed for CECID
 #include "MD4Hash.h"
+#include "ClientRef.h"		// Needed for CClientRef
 
-class CUpDownClient;
 class CFile;
 class CFileDataIO;
 
 #define	FF_NAME		0x01
 
-class CFriend {
+class CFriend  : public CECID
+{
+friend class CFriendListRem;
 public:
-	CFriend();
+	CFriend()	{ Init(); }
 	~CFriend() {};
 	
-	CFriend(CUpDownClient* client);
+	CFriend(CClientRef client);
 	CFriend( const CMD4Hash& userhash, uint32 tm_dwLastSeen, uint32 tm_dwLastUsedIP, uint32 tm_nLastUsedPort, uint32 tm_dwLastChatted, const wxString& tm_strName);
+	CFriend(uint32 ecid) : CECID(ecid)	{ Init(); }
 	
 	void	SetUserHash(const CMD4Hash& userhash) { m_UserHash = userhash;}
-	bool	HasHash() { return !m_UserHash.IsEmpty(); }
+	bool	HasHash() const			{ return !m_UserHash.IsEmpty(); }
 	const	CMD4Hash& GetUserHash() const { return m_UserHash; }
 	
 	void SetName(const wxString& name) { m_strName = name; }
 	
-	void	LinkClient(CUpDownClient* client, bool unlink = true);
-	CUpDownClient* GetLinkedClient() const { return m_LinkedClient; }
-	void	UnLinkClient() {  m_LinkedClient = NULL; }
+	void	LinkClient(CClientRef client);
+	const CClientRef& GetLinkedClient() const { return m_LinkedClient; }
+	void	UnLinkClient(bool notify = true);
 	
 	bool	HasFriendSlot();
 
-	const wxString& GetName() { return m_strName; }
-	uint16 GetPort() const { return m_nLastUsedPort; }
-	uint32 GetIP() const { return m_dwLastUsedIP; }
+	const wxString& GetName() const	{ return m_strName; }
+	uint16 GetPort() const			{ return m_nLastUsedPort; }
+	uint32 GetIP() const			{ return m_dwLastUsedIP; }
 	
 	void	LoadFromFile(CFileDataIO* file);
 	void	WriteToFile(CFileDataIO* file);
 
 private:
-	
-	CUpDownClient* m_LinkedClient;
+	void	Init();
+
+	CClientRef	m_LinkedClient;
 
 	CMD4Hash	m_UserHash;
-	uint32	m_dwLastSeen;
-	uint32	m_dwLastUsedIP;
-	uint16	m_nLastUsedPort;
-	uint32	m_dwLastChatted;
+	uint32		m_dwLastUsedIP;
+	uint16		m_nLastUsedPort;
 	wxString	m_strName;
-		
+
+	// write-only info, never used (kept in order not to break the save file)
+	uint32		m_dwLastSeen;
+	uint32		m_dwLastChatted;
 };
 
 #endif

aMule-2.2.6.tar.bz2/src/FriendList.cpp -> aMule-2.3.1.tar.bz2/src/FriendList.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -34,58 +34,59 @@
 #include "Friend.h"		// Needed for CFriend
 #include "CFile.h"
 #include "Logger.h"
+#include "GuiEvents.h"
 
 CFriendList::CFriendList()
 { 
-	LoadList();
 }
 
 CFriendList::~CFriendList()
 {
 	SaveList();
 
-	while ( m_FriendList.size() ) {
-		delete m_FriendList.front();
-		m_FriendList.pop_front();
-	}
+	DeleteContents(m_FriendList);
 }
 
 
-void CFriendList::AddFriend(CFriend* toadd)
+void CFriendList::AddFriend(CFriend* toadd, bool notify)
 {
 	m_FriendList.push_back(toadd);
 	SaveList();
+	if (notify) {
+		Notify_ChatUpdateFriend(toadd);
+	}
 }
 
 
-void CFriendList::AddFriend(const CMD4Hash& userhash, uint32 lastSeen, uint32 lastUsedIP, uint32 lastUsedPort, uint32 lastChatted, const wxString& name)
+void CFriendList::AddFriend(const CMD4Hash& userhash, uint32 lastUsedIP, uint32 lastUsedPort, const wxString& name, uint32 lastSeen, uint32 lastChatted)
 {
 	CFriend* NewFriend = new CFriend( userhash, lastSeen, lastUsedIP, lastUsedPort, lastChatted, name);
 
 	AddFriend( NewFriend );
+
 }
 
 
-void CFriendList::AddFriend(CUpDownClient* toadd)
+void CFriendList::AddFriend(const CClientRef& toadd)
 {
-	if ( toadd->IsFriend() ) {
+	if ( toadd.IsFriend() ) {
 		return;
 	}
 	
 	CFriend* NewFriend = new CFriend( toadd );
-	toadd->SetFriend(NewFriend);
+	toadd.SetFriend(NewFriend);
 	
-	AddFriend( NewFriend );
+	AddFriend(NewFriend, false);	// has already notified
 }
 
 
-void CFriendList::RemoveFriend(const CMD4Hash& userhash, uint32 lastUsedIP, uint32 lastUsedPort)
+void CFriendList::RemoveFriend(CFriend* toremove)
 {
-	CFriend* toremove = FindFriend(userhash, lastUsedIP, lastUsedPort);
 	if (toremove) {
-		if ( toremove->GetLinkedClient() ){
-			toremove->GetLinkedClient()->SetFriendSlot(false);
-			toremove->GetLinkedClient()->SetFriend(NULL);
+		CClientRef client = toremove->GetLinkedClient();
+		if (client.IsLinked()) {
+			client.SetFriendSlot(false);
+			client.SetFriend(NULL);
 			toremove->UnLinkClient();
 		}
 
@@ -93,7 +94,7 @@
 	
 		SaveList();
 	
-		delete toremove;
+		Notify_ChatRemoveFriend(toremove);	// this deletes the friend
 	}
 }
 
@@ -114,15 +115,16 @@
 					CFriend* Record = new CFriend();
 					Record->LoadFromFile(&file);
 					m_FriendList.push_back(Record);
+					Notify_ChatUpdateFriend(Record);
 				}				
 			}
 		} else {
-			AddLogLineM(false, _("Failed to open friend list file 'emfriends.met' for reading!"));
+			AddLogLineN(_("Failed to open friend list file 'emfriends.met' for reading!"));
 		}
 	} catch (const CInvalidPacket& e) {
-		AddDebugLogLineM(true, logGeneral, wxT("Invalid entry in friend list, file may be corrupt: ") + e.what());		
+		AddDebugLogLineC(logGeneral, wxT("Invalid entry in friend list, file may be corrupt: ") + e.what());
 	} catch (const CSafeIOException& e) {
-		AddDebugLogLineM(true, logGeneral, wxT("IO error while reading 'emfriends.met': ") + e.what());
+		AddDebugLogLineC(logGeneral, wxT("IO error while reading 'emfriends.met': ") + e.what());
 	}
 	
 }
@@ -140,10 +142,10 @@
 				(*it)->WriteToFile(&file);
 			}
 		} catch (const CIOFailureException& e) {
-			AddDebugLogLineM(true, logGeneral, wxT("IO failure while saving 'emfriends.met': ") + e.what());
+			AddDebugLogLineC(logGeneral, wxT("IO failure while saving 'emfriends.met': ") + e.what());
 		}
 	} else {
-		AddLogLineM(false, _("Failed to open friend list file 'emfriends.met' for writing!"));
+		AddLogLineN(_("Failed to open friend list file 'emfriends.met' for writing!"));
 	}
 }
 
@@ -162,7 +164,26 @@
 				return cur_friend;
 			}
 		} else if (cur_friend->GetIP() == dwIP && cur_friend->GetPort() == nPort) {
-				return cur_friend;
+			if (!userhash.IsEmpty() && !cur_friend->HasHash() ) {
+				// Friend without hash (probably IP entered through dialog)
+				// -> save the hash
+				cur_friend->SetUserHash(userhash);
+				SaveList();
+			}
+			return cur_friend;
+		}
+	}
+
+	return NULL;
+}
+
+
+CFriend* CFriendList::FindFriend(uint32 ecid) 
+{
+	for (FriendList::iterator it = m_FriendList.begin(); it != m_FriendList.end(); ++it) {
+		CFriend* cur_friend = *it;
+		if (cur_friend->ECID() == ecid) {
+			return cur_friend;
 		}
 	}
 
@@ -180,53 +201,53 @@
 {
 	for(FriendList::iterator it = m_FriendList.begin(); it != m_FriendList.end(); ++it) {		
 		CFriend* cur_friend = *it;
-		if ( cur_friend->GetLinkedClient() ) {
-				cur_friend->GetLinkedClient()->SetFriendSlot(false);
+		if (cur_friend->GetLinkedClient().IsLinked()) {
+				cur_friend->GetLinkedClient().SetFriendSlot(false);
 		}
 	}
 }
 
-void	CFriendList::RequestSharedFileList(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort) {
-	CFriend* cur_friend = FindFriend(userhash, dwIP, nPort);
+
+void CFriendList::RequestSharedFileList(CFriend* cur_friend)
+{
 	if (cur_friend) {
-		CUpDownClient* client = cur_friend->GetLinkedClient();
+		CUpDownClient* client = cur_friend->GetLinkedClient().GetClient();
 		if (!client) {
 			client = new CUpDownClient(cur_friend->GetPort(), cur_friend->GetIP(), 0, 0, 0, true, true);
 			client->SetUserName(cur_friend->GetName());
 			theApp->clientlist->AddClient(client);
+			cur_friend->LinkClient(CCLIENTREF(client, wxT("CFriendList::RequestSharedFileList")));
 		}
 		client->RequestSharedFileList();
 	}
 }
 
-void CFriendList::SetFriendSlot(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort, bool new_state) {
-	CFriend* cur_friend = FindFriend(userhash, dwIP, nPort);
-	if (cur_friend && cur_friend->GetLinkedClient()) {
+
+void CFriendList::SetFriendSlot(CFriend* Friend, bool new_state)
+{
+	if (Friend && Friend->GetLinkedClient().IsLinked()) {
 		RemoveAllFriendSlots();
-		cur_friend->GetLinkedClient()->SetFriendSlot(new_state);
+		Friend->GetLinkedClient().SetFriendSlot(new_state);
+		CoreNotify_Upload_Resort_Queue();
 	}
 }
 
-void CFriendList::StartChatSession(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort) {
-	CFriend* friend_client = FindFriend(userhash, dwIP, nPort);
-	if (friend_client) {
-		CUpDownClient* client = friend_client->GetLinkedClient();
+
+void CFriendList::StartChatSession(CFriend* Friend)
+{
+	if (Friend) {
+		CUpDownClient* client = Friend->GetLinkedClient().GetClient();
 		if (!client) {
-			client = new CUpDownClient(friend_client->GetPort(), friend_client->GetIP(), 0, 0, 0, true, true);
-			client->SetIP(friend_client->GetIP());
-			client->SetUserName(friend_client->GetName());
+			client = new CUpDownClient(Friend->GetPort(), Friend->GetIP(), 0, 0, 0, true, true);
+			client->SetIP(Friend->GetIP());
+			client->SetUserName(Friend->GetName());
 			theApp->clientlist->AddClient(client);
-			friend_client->LinkClient(client);
+			Friend->LinkClient(CCLIENTREF(client, wxT("CFriendList::StartChatSession")));
 		}
 	} else {
-		printf("CRITICAL - no client on StartChatSession\n");
+		AddLogLineC(_("CRITICAL - no client on StartChatSession"));
 	}
 	
 }
-	
-void CFriendList::UpdateFriendName(const CMD4Hash& userhash, const wxString& name, uint32 dwIP, uint16 nPort) {
-	CFriend* friend_client = FindFriend(userhash, dwIP, nPort);
-	friend_client->SetName(name);
-	SaveList();
-}
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/FriendList.h -> aMule-2.3.1.tar.bz2/src/FriendList.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -31,35 +31,51 @@
 
 class wxString;
 class CFriend;
-class CUpDownClient;
 class CMD4Hash;
+class CClientRef;
 
-typedef std::list<CFriend*> FriendList;
-
-class CFriendList 
+class CFriendList
 {
+	typedef std::list<CFriend*> FriendList;
 public:
 	CFriendList();
 	~CFriendList();
 	
-	bool		IsAlreadyFriend( uint32 dwLastUsedIP, uint32 nLastUsedPort ); 
+	bool		IsAlreadyFriend(uint32 dwLastUsedIP, uint32 nLastUsedPort);
 	void		SaveList();
 	void		LoadList();
-	CFriend*	FindFriend( const CMD4Hash& userhash, uint32 dwIP, uint16 nPort);	
-	void 		AddFriend(CFriend* toadd);
-	void		AddFriend( CUpDownClient* toadd );
-	void		AddFriend( const CMD4Hash& userhash, uint32 lastSeen, uint32 lastUsedIP, uint32 lastUsedPort, uint32 lastChatted, const wxString& name);
-	void		RemoveFriend( const CMD4Hash& userhash, uint32 lastUsedIP, uint32 lastUsedPort);
-	void		RequestSharedFileList(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort);
-	void		UpdateFriendName(const CMD4Hash& userhash, const wxString& name, uint32 dwIP, uint16 nPort);
+	CFriend*	FindFriend(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort);
+	CFriend*	FindFriend(uint32 ecid);
+	void 		AddFriend(CFriend* toadd, bool notify = true);
+	void		AddFriend(const CClientRef& toadd);
+	void		AddFriend(const CMD4Hash& userhash, uint32 lastUsedIP, uint32 lastUsedPort, const wxString& name, uint32 lastSeen = 0, uint32 lastChatted = 0);
+	void		RemoveFriend(CFriend* toremove);
+	void		RequestSharedFileList(CFriend* Friend);
 
-	void		SetFriendSlot(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort, bool new_state);
-	void		StartChatSession(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort);
+	void		SetFriendSlot(CFriend* Friend, bool new_state);
+	void		StartChatSession(CFriend* Friend);
 	void		RemoveAllFriendSlots();
 
-//private:
+	// Iterator class
+	class const_iterator {
+		// iterator for internal list
+		FriendList::const_iterator m_it;
+	public:
+		// constructs
+		const_iterator() {};
+		const_iterator(const FriendList::const_iterator& it) { m_it = it; };
+		// operators
+		bool operator != (const const_iterator& it) const { return m_it != it.m_it; }
+		const_iterator& operator ++ ()	{ ++ m_it; return *this; }	// prefix  (assignable)
+		void operator ++ (int)			{ ++ m_it; }				// postfix (not assignable)
+		const CFriend* operator * () { return *m_it; }
+	};
+	// begin/end iterators for looping
+	const_iterator begin() const { return const_iterator(m_FriendList.begin()); }
+	const_iterator end() const { return const_iterator(m_FriendList.end()); }
+
 
-//	//#warning THIS MUST BE MADE PRIVATE AFTER EC IS CODED
+private:
 	FriendList m_FriendList;
 };

aMule-2.2.6.tar.bz2/src/FriendListCtrl.cpp -> aMule-2.3.1.tar.bz2/src/FriendListCtrl.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,18 +27,16 @@
 #include "FriendListCtrl.h"	// Interface declarations
 
 #include <common/MenuIDs.h>
+#include <common/MacrosProgramSpecific.h>
 
 #include "amule.h"		// Needed for theApp
 #include "amuleDlg.h"		// Needed for CamuleDlg
 #include "ClientDetailDialog.h"	// Needed for CClientDetailDialog
 #include "AddFriend.h"		// Needed for CAddFriend
 #include "ChatWnd.h"		// Needed for CChatWnd
-#include "updownclient.h"	// Needed for CUpDownClient
 #include "Friend.h"		// Needed for CFriend
 #include "muuli_wdr.h"
 #include "SafeFile.h"
-
-//#warning REMOVE WHEN EC IS CODED!
 #include "FriendList.h"		// Needed for the friends list
 
 BEGIN_EVENT_TABLE(CFriendListCtrl, CMuleListCtrl)
@@ -56,80 +54,18 @@
 END_EVENT_TABLE()
 
 
-CDlgFriend::CDlgFriend(const CMD4Hash& hash, const wxString& name, uint32 ip, uint16 port, bool IsLinked, bool HasFriendSlot)
-{
-	m_hash = hash;
-
-	if (name.IsEmpty()) {
-		m_name = wxT("?");
-	} else {
-		m_name = name;
-	}
-	
-	m_ip = ip;
-	m_port = port;
-	islinked = IsLinked;
-	hasfriendslot = HasFriendSlot;
-}
-
-
 CFriendListCtrl::CFriendListCtrl(wxWindow* parent, int id, const wxPoint& pos, wxSize siz, int flags)
 : CMuleListCtrl(parent, id, pos, siz, flags)
 {
   InsertColumn(0, _("Username"), wxLIST_FORMAT_LEFT, siz.GetWidth() - 4);
-
-  LoadList();
 }
 
 CFriendListCtrl::~CFriendListCtrl()
 {
-	for ( int i = 0; i < GetItemCount(); i++ )  {
-		delete (CDlgFriend*)GetItemData(i);
-	}
-}
-
-
-void CFriendListCtrl::AddFriend(CDlgFriend* toadd, bool send_to_core)
-{
-	uint32 itemnr = InsertItem(GetItemCount(), toadd->m_name);
-	SetItemPtrData(itemnr, reinterpret_cast<wxUIntPtr>(toadd));
-	
-	//#warning CORE/GUI
-	if (send_to_core) {
-	#ifndef CLIENT_GUI
-		theApp->friendlist->AddFriend(toadd->m_hash, 0, toadd->m_ip, toadd->m_port, 0,toadd->m_name);
-	#endif		
-	}
-}
-
-
-void CFriendListCtrl::AddFriend(const CMD4Hash& userhash, const wxString& name, uint32 lastUsedIP, uint32 lastUsedPort, bool IsLinked, bool HasFriendSlot, bool send_to_core)
-{
-	CDlgFriend* NewFriend = new CDlgFriend( userhash, name, lastUsedIP, lastUsedPort, IsLinked, HasFriendSlot);
-
-	AddFriend( NewFriend, send_to_core);
-}
-
-
-void CFriendListCtrl::AddFriend(CUpDownClient* toadd)
-{
-	if ( toadd->IsFriend() ) {
-		return;
-	}
-	
-	//#warning CORE/GUI
-	// This links the friend to the client also
-	#ifndef CLIENT_GUI
-	theApp->friendlist->AddFriend(toadd);
-	#endif
-	
-	CDlgFriend* NewFriend = new CDlgFriend( toadd->GetUserHash(), toadd->GetUserName(), toadd->GetIP(), toadd->GetUserPort(), true, false);
-	
-	AddFriend( NewFriend, false/*already sent to core*/ );
 }
 
 
-void CFriendListCtrl::RemoveFriend(CDlgFriend* toremove)
+void CFriendListCtrl::RemoveFriend(CFriend* toremove)
 {
 	if (!toremove) {
 		return;
@@ -140,25 +76,24 @@
 	if ( itemnr == -1 )
 		return;
 	
-	//#warning CORE/GUI
-	#ifndef CLIENT_GUI
-	theApp->friendlist->RemoveFriend(toremove->m_hash, toremove->m_ip, toremove->m_port);
-	#endif
-	
 	DeleteItem(itemnr);
 }
 
 
-void CFriendListCtrl::RefreshFriend(CDlgFriend* toupdate)
+void CFriendListCtrl::UpdateFriend(CFriend* toupdate)
 {
+	if (!toupdate) {
+		return;
+	}
+
 	sint32 itemnr = FindItem(-1, reinterpret_cast<wxUIntPtr>(toupdate));
-	if (itemnr != -1) {
-		SetItem(itemnr, 0, toupdate->m_name);
-	}	
-	//#warning CORE/GUI
-	#ifndef CLIENT_GUI
-	theApp->friendlist->UpdateFriendName(toupdate->m_hash, toupdate->m_name, toupdate->m_ip, toupdate->m_port);
-	#endif
+	if (itemnr == -1) {
+		itemnr = InsertItem(GetItemCount(), wxEmptyString);
+		SetItemPtrData(itemnr, reinterpret_cast<wxUIntPtr>(toupdate));
+	}
+
+	SetItem(itemnr, 0, toupdate->GetName());
+	SetItemTextColour(itemnr, toupdate->GetLinkedClient().IsLinked() ? *wxBLUE : *wxBLACK);
 }
 
 
@@ -166,7 +101,7 @@
 {
 	int cursel = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	
-	CDlgFriend* cur_friend = (CDlgFriend*)GetItemData(cursel);
+	CFriend* cur_friend = (CFriend*)GetItemData(cursel);
 	
 	/* ignore this one, it is not activated anymore :) */
 	if (cur_friend == NULL) {
@@ -178,57 +113,18 @@
 }
 
 
-void CFriendListCtrl::LoadList()
-{
-	//#warning EC: ASK THE LIST TO CORE!
-	
-	#ifndef CLIENT_GUI
-	for(FriendList::iterator it = theApp->friendlist->m_FriendList.begin(); it != theApp->friendlist->m_FriendList.end(); ++it) {
-		CFriend* core_friend = *it;
-		AddFriend(core_friend->GetUserHash(), core_friend->GetName(), core_friend->GetIP(), core_friend->GetPort(), (core_friend->GetLinkedClient() != NULL), core_friend->HasFriendSlot(), false);
-	}
-	#endif
-	
-}
-
-CDlgFriend* CFriendListCtrl::FindFriend(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort)
-{
-	for ( int i = 0; i < GetItemCount(); i++ ) {
-		CDlgFriend* cur_friend = (CDlgFriend*)GetItemData(i);
-		
-		// to avoid that unwanted clients become a friend, we have to distinguish between friends with
-		// a userhash and of friends which are identified by IP+port only.
-		if ( !userhash.IsEmpty() && !cur_friend->m_hash.IsEmpty() ) {
-			// check for a friend which has the same userhash as the specified one
-			if (cur_friend->m_hash == userhash) {
-				return cur_friend;
-			}
-		}
-		else if (cur_friend->m_ip == dwIP && cur_friend->m_port == nPort) {
-				return cur_friend;
-		}
-	}
-	
-	return NULL;
-}
-
-bool CFriendListCtrl::IsAlreadyFriend( uint32 dwLastUsedIP, uint32 nLastUsedPort )
-{
-	return (FindFriend( CMD4Hash(), dwLastUsedIP, nLastUsedPort ) != NULL);
-}
-
 void CFriendListCtrl::OnRightClick(wxMouseEvent& event)
 {
 	int cursel = CheckSelection(event);
 	
-	CDlgFriend* cur_friend = NULL;
+	CFriend* cur_friend = NULL;
 	
 	wxMenu* menu = new wxMenu(_("Friends"));
 	
 	if ( cursel != -1 ) {
-		cur_friend = (CDlgFriend*)GetItemData(cursel);
+		cur_friend = (CFriend*)GetItemData(cursel);
 		menu->Append(MP_DETAIL, _("Show &Details"));
-		menu->Enable(MP_DETAIL, cur_friend->islinked);
+		menu->Enable(MP_DETAIL, cur_friend->GetLinkedClient().IsLinked());
 	}
 	
 	menu->Append(MP_ADDFRIEND, _("Add a friend"));
@@ -238,27 +134,27 @@
 		menu->Append(MP_MESSAGE, _("Send &Message"));
 		menu->Append(MP_SHOWLIST, _("View Files"));
 		menu->AppendCheckItem(MP_FRIENDSLOT, _("Establish Friend Slot"));
-	
-		if (cur_friend->islinked) {
+		if (cur_friend->GetLinkedClient().IsLinked()) {
 			menu->Enable(MP_FRIENDSLOT, true);
-			menu->Check(MP_FRIENDSLOT, cur_friend->hasfriendslot);
+			menu->Check(MP_FRIENDSLOT, cur_friend->HasFriendSlot());
 		} else {
 			menu->Enable(MP_FRIENDSLOT, false);
 		}
 	}
 	
 	PopupMenu(menu, event.GetPosition());
+	delete menu;
 }
 
 void CFriendListCtrl::OnSendMessage(wxCommandEvent& WXUNUSED(event)) {
 	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	
 	while( index != -1 ) {
-		CDlgFriend* cur_friend = (CDlgFriend*)GetItemData(index);
+		CFriend* cur_friend = (CFriend*)GetItemData(index);
 		theApp->amuledlg->m_chatwnd->StartSession(cur_friend);			
 		//#warning CORE/GUI!			
 		#ifndef CLIENT_GUI
-		theApp->friendlist->StartChatSession(cur_friend->m_hash, cur_friend->m_ip, cur_friend->m_port);
+		theApp->friendlist->StartChatSession(cur_friend);
 		#endif		
 
 		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
@@ -279,8 +175,8 @@
 		long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	
 		while( index != -1 ) {
-			CDlgFriend* cur_friend = (CDlgFriend*)GetItemData(index);
-			RemoveFriend(cur_friend);
+			CFriend* cur_friend = (CFriend*)GetItemData(index);
+			theApp->friendlist->RemoveFriend(cur_friend);
 			// -1 because we changed the list and removed that item.
 			index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 		}
@@ -299,21 +195,9 @@
 	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	
 	while( index != -1 ) {
-		CDlgFriend* cur_friend = (CDlgFriend*)GetItemData(index);
-		if (cur_friend->islinked) {
-			//#warning EC: We need a reply packet with a full CUpDownClient
-			#ifndef CLIENT_GUI
-			CClientDetailDialog
-				(
-				this,
-				theApp->friendlist->FindFriend
-					(
-					cur_friend->m_hash,
-					cur_friend->m_ip,
-					cur_friend->m_port
-					)->GetLinkedClient()
-				).ShowModal();
-			#endif
+		CFriend* cur_friend = (CFriend*)GetItemData(index);
+		if (cur_friend->GetLinkedClient().IsLinked()) {
+			CClientDetailDialog(this, cur_friend->GetLinkedClient()).ShowModal();
 		}		
 		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	}	
@@ -326,11 +210,8 @@
 	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	
 	while( index != -1 ) {
-		//#warning CORE/GUI!
-		#ifndef CLIENT_GUI
-			CDlgFriend* cur_friend = (CDlgFriend*)GetItemData(index);
-			theApp->friendlist->RequestSharedFileList(cur_friend->m_hash, cur_friend->m_ip, cur_friend->m_port);
-		#endif
+		CFriend* cur_friend = (CFriend*)GetItemData(index);
+		theApp->friendlist->RequestSharedFileList(cur_friend);
 		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	}	
 	
@@ -339,34 +220,13 @@
 
 void CFriendListCtrl::OnSetFriendslot(wxCommandEvent& event)
 {
-	// Clean friendslots
-	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_DONTCARE);
-	while (index != -1) {
-		CDlgFriend* friend_item = (CDlgFriend*)GetItemData(index);
-		friend_item->hasfriendslot = false;
-		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_DONTCARE);
-	}
-	// Now set the proper one
-	index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	//#warning CORE/GUI!
-	#ifndef CLIENT_GUI
-		CDlgFriend* cur_friend = (CDlgFriend*)GetItemData(index);	
-		cur_friend->hasfriendslot = event.IsChecked();
-		theApp->friendlist->SetFriendSlot(cur_friend->m_hash, cur_friend->m_ip, cur_friend->m_port, cur_friend->hasfriendslot);
-	#endif
+	// Get item
+	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+	CFriend* cur_friend = (CFriend*)GetItemData(index);	
+	theApp->friendlist->SetFriendSlot(cur_friend, event.IsChecked());
 	index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	if (index != -1) {
-		wxMessageBox(_("You are not allowed to set more than one friendslot.\n Only one slot was assigned."), _("Multiple selection"), wxICON_ERROR, this);
-	}
-}
-
-
-void CFriendListCtrl::SetLinked(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort, bool new_state)
-{
-	CDlgFriend* client = FindFriend(CMD4Hash(), dwIP, nPort);
-	if (client) {
-		client->m_hash = userhash;
-		client->islinked = new_state;	
+		wxMessageBox(_("You are not allowed to set more than one friendslot.\n Only one slot was assigned."), _("Multiple selection"), wxOK | wxICON_ERROR, this);
 	}
 }

aMule-2.2.6.tar.bz2/src/FriendListCtrl.h -> aMule-2.3.1.tar.bz2/src/FriendListCtrl.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -30,19 +30,7 @@
 #include "MD4Hash.h"
 
 class wxString;
-class CUpDownClient;
-
-class CDlgFriend {
-public:
-	CDlgFriend(const CMD4Hash& hash, const wxString& name, uint32 ip, uint16 port, bool IsLinked, bool HasFriendSlot);
-
-	wxString m_name;
-	uint32 m_ip;
-	uint16 m_port;
-	CMD4Hash	m_hash;
-	bool islinked;
-	bool hasfriendslot;
-};
+class CFriend;
 
 class CFriendListCtrl : public CMuleListCtrl
 {
@@ -50,17 +38,9 @@
 	CFriendListCtrl(wxWindow* parent, int id, const wxPoint& pos, wxSize siz, int flags);
 	~CFriendListCtrl();
 	
-	bool		IsAlreadyFriend( uint32 dwLastUsedIP, uint32 nLastUsedPort ); 
-	void		LoadList();
-	CDlgFriend*	FindFriend( const CMD4Hash& userhash, uint32 dwIP, uint16 nPort);	
-	void 		AddFriend(CDlgFriend* toadd, bool send_to_core = true);
-	void		AddFriend( CUpDownClient* toadd );
-	void		AddFriend( const CMD4Hash& userhash, const wxString& name, uint32 lastUsedIP, uint32 lastUsedPort, bool IsLinked = false, bool HasFriendSlot = false, bool send_to_core = true);
-	void		RemoveFriend(CDlgFriend* todel);
-	void		RemoveFriend(CUpDownClient* todel);
-	void		RefreshFriend(CDlgFriend* toupdate);
-	void		SetLinked(const CMD4Hash& userhash, uint32 dwIP, uint16 nPort, bool new_state);
-	
+	void 		UpdateFriend(CFriend* toupdate);
+	void		RemoveFriend(CFriend* todel);
+
 protected:
 	DECLARE_EVENT_TABLE()

aMule-2.3.1.tar.bz2/src/GapList.cpp Added

@@ -0,0 +1,317 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2008-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
+//
+
+
+#include "Types.h"
+#include <protocol/ed2k/Constants.h>	// for PARTSIZE
+#include "GapList.h"
+
+#include "Logger.h"
+#include <common/Format.h>
+
+void CGapList::Init(uint64 fileSize, bool isEmpty)
+{
+	m_filesize = fileSize;
+	m_iPartCount = fileSize / PARTSIZE + 1;
+	m_sizeLastPart = fileSize % PARTSIZE;
+	// file with size of n * PARTSIZE
+	if (m_sizeLastPart == 0 
+		&& fileSize) {  // that's only for pre-init in ctor
+		m_sizeLastPart = PARTSIZE;
+		m_iPartCount--;
+	}
+	m_gaplist.clear();
+	m_partsComplete.clear();
+	if (isEmpty) {
+		m_partsComplete.resize(m_iPartCount, incomplete);
+		AddGap(0, fileSize - 1);
+	} else {
+		m_partsComplete.resize(m_iPartCount, complete);
+	}
+	m_totalGapSizeValid = false;
+}
+
+
+void CGapList::AddGap(uint64 gapstart, uint64 gapend)
+{
+	if (!ArgCheck(gapstart, gapend)) {
+		return;
+	}
+
+//	AddDebugLogLineN(logPartFile, CFormat(wxT("  AddGap: %5d - %5d")) % gapstart % gapend);
+
+	// mark involved part(s) as incomplete
+	uint16 partlast = gapend / PARTSIZE;
+	for (uint16 part = gapstart / PARTSIZE; part <= partlast; part++) {
+		m_partsComplete[part] = incomplete;
+	}
+	// total gap size has to be recalculated
+	m_totalGapSizeValid = false;
+
+	// find a place to start:
+	// first gap which ends >= our gap start - 1
+	// (-1 so we can join adjacent gaps)
+	iterator it = m_gaplist.lower_bound(gapstart > 0 ? gapstart - 1 : 0);
+	while (it != m_gaplist.end()) {
+		iterator it2 = it++;
+		uint64 curGapStart = it2->second;
+		uint64 curGapEnd   = it2->first;
+
+		if (curGapStart >= gapstart && curGapEnd <= gapend) {
+			// this gap is inside the new gap - delete
+			m_gaplist.erase(it2);
+		} else if (curGapStart >= gapstart && curGapStart <= gapend + 1) {
+			// head of this gap is in the new gap, or this gap is
+			// directly behind the new gap - extend limit and delete
+			gapend = curGapEnd;
+			m_gaplist.erase(it2);
+		} else if (curGapEnd <= gapend && curGapEnd >= gapstart - 1) {
+			// tail of this gap is in the new gap, or this gap is
+			// directly before the new gap - extend limit and delete
+			gapstart = curGapStart;
+			m_gaplist.erase(it2);
+		} else if (curGapStart <= gapstart && curGapEnd >= gapend) {
+			// new gap is already inside this gap - return
+			return;
+		// now all cases of overlap are ruled out
+		} else if (curGapStart > gapstart) {
+			// this gap is the first behind the new gap -> insert before it
+			it = it2;
+			break;
+		}
+	}
+	// for fastest insertion point to the element AFTER which we want to insert	
+	if (it != m_gaplist.begin()) {
+		--it;
+	}
+	m_gaplist.insert(it, std::pair<uint64,uint64>(gapend, gapstart));
+}
+
+void CGapList::AddGap(uint16 part)
+{
+	if (part >= m_iPartCount) {
+		wxFAIL;
+		return;
+	}
+	uint64 gapstart = part * PARTSIZE;
+	uint64 gapend = gapstart + GetPartSize(part) - 1;
+	AddGap(gapstart, gapend);
+	m_partsComplete[part] = incomplete;
+}
+
+void CGapList::FillGap(uint64 partstart, uint64 partend)
+{
+	if (!ArgCheck(partstart, partend)) {
+		return;
+	}
+
+//	AddDebugLogLineN(logPartFile, CFormat(wxT("  FillGap: %5d - %5d")) % partstart % partend);
+
+	// mark involved part(s) to be reexamined for completeness
+	uint16 partlast = partend / PARTSIZE;
+	for (uint16 part = partstart / PARTSIZE; part <= partlast; part++) {
+		m_partsComplete[part] = unknown;
+	}
+	// also total gap size
+	m_totalGapSizeValid = false;
+
+	// find a place to start:
+	// first gap which ends >= our part start
+	iterator it = m_gaplist.lower_bound(partstart);
+	while (it != m_gaplist.end()) {
+		iterator it2 = it++;
+		uint64 curGapStart = it2->second;
+		uint64 curGapEnd   = it2->first;
+
+		if (curGapStart >= partstart) {
+			if (curGapEnd <= partend) {
+				// our part fills this gap completly
+				m_gaplist.erase(it2);
+			} else if (curGapStart <= partend) {
+				// lower part of this gap is in the part - shrink gap:
+				//   (this is the most common case: curGapStart == partstart && curGapEnd > partend)
+				it2->second = partend + 1;
+				// end of our part was in the gap: we're done
+				break;
+			} else {
+				// gap starts behind our part end: we're done
+				break;
+			}
+		} else {
+			// curGapStart < partstart
+			if (curGapEnd > partend) {
+				// our part is completely enclosed by the gap
+				// cut it in two, leaving our part out:
+				// shrink the gap so it becomes the second gap
+				it2->second = partend + 1;
+				// insert new first gap
+				iterator it3(it2);
+				if (it3 != m_gaplist.begin()) {
+					--it3;
+				}
+				m_gaplist.insert(it3, std::pair<uint64,uint64>(partstart - 1, curGapStart));
+				// we're done
+				break;
+			} else if (curGapEnd >= partstart) {
+				// upper part of this gap is in the part - shrink gap:
+				// insert shorter gap
+				iterator it3(it2);
+				if (it3 != m_gaplist.begin()) {
+					--it3;
+				}
+				m_gaplist.insert(it3, std::pair<uint64,uint64>(partstart - 1, curGapStart));
+				// and delete the old one
+				m_gaplist.erase(it2);
+			}
+			// else: gap is before our part start (should not happen)
+		}
+	}
+}
+
+void CGapList::FillGap(uint16 part)
+{
+	if (part >= m_iPartCount) {
+		wxFAIL;
+		return;
+	}
+	uint64 gapstart = part * PARTSIZE;
+	uint64 gapend = gapstart + GetPartSize(part) - 1;
+	FillGap(gapstart, gapend);
+	m_partsComplete[part] = complete;
+}
+
+uint64 CGapList::GetGapSize()
+{
+	if (!m_totalGapSizeValid) {
+		m_totalGapSizeValid = true;
+   		m_totalGapSize = 0;
+
+		ListType::const_iterator it = m_gaplist.begin();
+		for (; it != m_gaplist.end(); it++) {
+			m_totalGapSize += it->first - it->second + 1;
+		}
+	}
+	return m_totalGapSize;
+}
+
+uint32 CGapList::GetGapSize(uint16 part) const
+{
+	uint64 uRangeStart = part * PARTSIZE;
+	uint64 uRangeEnd = uRangeStart + GetPartSize(part) - 1;
+	uint64 uTotalGapSize = 0;
+
+	// find a place to start:
+	// first gap which ends >= our gap start
+	ListType::const_iterator it = m_gaplist.lower_bound(uRangeStart);
+	for (; it != m_gaplist.end(); ++it) {
+		uint64 curGapStart = it->second;
+		uint64 curGapEnd   = it->first;
+
+		if (curGapStart <= uRangeStart && curGapEnd >= uRangeEnd) {
+			// total range is in this gap
+			uTotalGapSize += uRangeEnd - uRangeStart + 1;
+			break;
+		} else if (curGapStart >= uRangeStart) {
+			if (curGapStart <= uRangeEnd) {
+				// start of this gap is in our range
+				uTotalGapSize += std::min(curGapEnd, uRangeEnd) - curGapStart + 1;
+			} else {
+				// this gap starts behind our range
+				break;
+			}
+		} else if (curGapEnd >= uRangeStart && curGapEnd <= uRangeEnd) {
+			// end of this gap is in our range
+			uTotalGapSize += curGapEnd - uRangeStart + 1;
+		}
+	}
+
+	wxASSERT( uTotalGapSize <= uRangeEnd - uRangeStart + 1 );
+	return uTotalGapSize;
+}
+
+bool CGapList::IsComplete(uint64 gapstart, uint64 gapend) const
+{
+	if (!ArgCheck(gapstart, gapend)) {
+		return false;
+	}
+
+	// find a place to start:
+	// first gap which ends >= our gap start
+	ListType::const_iterator it = m_gaplist.lower_bound(gapstart);
+	for (; it != m_gaplist.end(); ++it) {
+		uint64 curGapStart = it->second;
+		uint64 curGapEnd   = it->first;
+
+		if (  (curGapStart >= gapstart    && curGapEnd   <= gapend)
+			||(curGapStart >= gapstart    && curGapStart <= gapend)
+			||(curGapEnd   <= gapend      && curGapEnd   >= gapstart)
+			||(gapstart    >= curGapStart && gapend      <= curGapEnd)) {
+			return false;	
+		}
+		if (curGapStart > gapend) {
+			break;
+		}
+	}
+	return true;
+}
+
+bool CGapList::IsComplete(uint16 part)
+{
+// There is a bug in the ED2K protocol:
+// For files of size n * PARTSIZE one part too much is transmitted in the availability bitfield.
+// Allow completion detection of this dummy part, and always report it as complete
+// (so it doesn't get asked for).
+	if (part == m_iPartCount && m_sizeLastPart == PARTSIZE) {
+		return true;
+	}
+// Remaining error check
+	if (part >= m_iPartCount) {
+		wxFAIL;
+		return false;
+	}
+	ePartComplete status = (ePartComplete) m_partsComplete[part];
+	if (status == unknown) {
+		uint64 partstart = part * PARTSIZE;
+		uint64 partend = partstart + GetPartSize(part) - 1;
+		status = IsComplete(partstart, partend) ? complete : incomplete;
+		m_partsComplete[part] = status;
+	}
+	return status == complete;
+}
+
+inline bool CGapList::ArgCheck(uint64 gapstart, uint64 &gapend) const
+{
+	// end < start: serious error
+	if (gapend < gapstart) {
+		wxFAIL;
+		return false;
+	}
+
+	// gaps shouldn't go past file anymore either
+	if (gapend >= m_filesize) {
+		wxFAIL;
+		gapend = m_filesize - 1;	// fix it
+	}
+	return true;
+}

aMule-2.3.1.tar.bz2/src/GapList.h Added

@@ -0,0 +1,113 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2008-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
+//
+
+#ifndef GAPLIST_H
+#define GAPLIST_H
+
+#include <map>
+
+class CGapList {
+private:
+	// The internal gap list:
+	// Each gap is stored as a map entry. 
+	// The first (key) is the end, the second (value) the start.
+	typedef std::map<uint64,uint64> ListType;
+	typedef ListType::iterator iterator;
+	ListType m_gaplist;
+	// size of the part file the list belongs to
+	uint64 m_filesize;
+	// number of parts
+	uint16 m_iPartCount;
+	// size of the last part
+	uint32 m_sizeLastPart;
+	// total gapsize
+	uint64 m_totalGapSize;
+	// flag if it's valid
+	bool m_totalGapSizeValid;
+
+	// cache completeness of parts
+	enum ePartComplete {
+		complete,
+		incomplete,
+		unknown
+	};
+	std::vector<byte> m_partsComplete;
+
+	// get size of any part
+	uint32 GetPartSize(uint16 part) const { return part == m_iPartCount - 1 ? m_sizeLastPart : PARTSIZE; }
+	// check arguments, clip end, false: error
+	inline bool ArgCheck(uint64 gapstart, uint64 &gapend) const;
+public:
+	// construct
+	CGapList() { Init(0, false); } // NO MORE uninitialized variables >:(
+	// setup (and eventually clear) list, optionally as empty (one large gap)
+	void Init(uint64 fileSize, bool empty);
+	// add a gap for a range
+	void AddGap(uint64 gapstart, uint64 gapend);
+	// add a gap for a part
+	void AddGap(uint16 part);
+	// fill a gap for a range
+	void FillGap(uint64 gapstart, uint64 gapend);
+	// fill a gap for a part
+	void FillGap(uint16 part);
+	// Is this range complete ?
+	bool IsComplete(uint64 gapstart, uint64 gapend) const;
+	// Is this part complete ?
+	bool IsComplete(uint16 part);
+	// Is the whole file complete ?
+	bool IsComplete() const { return m_gaplist.empty(); }
+	// number of gaps
+	uint32 size() const { return m_gaplist.size(); }
+	// no gaps ?
+	bool empty() const { return m_gaplist.empty(); }
+	// size of all gaps
+	uint64 GetGapSize();
+	// size of gaps inside one part
+	uint32 GetGapSize(uint16 part) const;
+
+	// Iterator class to loop through the gaps read-only
+	// Gaps are returned just as start/end value
+	class const_iterator {
+		// iterator for internal list
+		ListType::const_iterator m_it;
+	public:
+		// constructs
+		const_iterator() {};
+		const_iterator(const ListType::const_iterator& it) { m_it = it; };
+		// operators
+		bool operator != (const const_iterator& it) const { return m_it != it.m_it; }
+		const_iterator& operator ++ () { ++ m_it; return *this; }
+		// get start of gap pointed to
+		uint64 start() const { return (* m_it).second; }
+		// get end of gap pointed to
+		uint64 end() const { return (* m_it).first; }
+	};
+	// begin/end iterators for looping
+	const_iterator begin() const { return const_iterator(m_gaplist.begin()); }
+	const_iterator end() const { return const_iterator(m_gaplist.end()); }
+
+};
+
+#endif // GAPLIST_H
+// File_checked_for_headers

aMule-2.3.1.tar.bz2/src/GenericClientListCtrl.cpp Added

@@ -0,0 +1,1427 @@
+//
+// 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
+//
+#include "GenericClientListCtrl.h"
+
+#include <protocol/ed2k/ClientSoftware.h>
+#include <common/MenuIDs.h>
+
+#include <common/Format.h>	// Needed for CFormat
+#include "amule.h"		// Needed for theApp
+#include "amuleDlg.h"		// Needed for CamuleDlg
+#include "BarShader.h"		// Needed for CBarShader
+#include "BitVector.h"
+#include "ClientDetailDialog.h"	// Needed for CClientDetailDialog
+#include "ChatWnd.h"		// Needed for CChatWnd
+#include "CommentDialogLst.h"	// Needed for CCommentDialogLst
+#include "DataToText.h"		// Needed for PriorityToStr
+#include "FileDetailDialog.h"	// Needed for CFileDetailDialog
+#include "GetTickCount.h"	// Needed for GetTickCount
+#include "GuiEvents.h"		// Needed for CoreNotify_*
+#ifdef ENABLE_IP2COUNTRY
+	#include "IP2Country.h"	// Needed for IP2Country
+#endif
+#include "Logger.h"
+#include "muuli_wdr.h"		// Needed for ID_DLOADLIST
+#include "PartFile.h"		// Needed for CPartFile
+#include "Preferences.h"
+#include "SharedFileList.h"	// Needed for CSharedFileList
+#include "TerminationProcess.h"	// Needed for CTerminationProcess
+#include "ClientRef.h"		// Needed for CClientRef
+#include "FriendList.h"
+
+struct ClientCtrlItem_Struct
+{
+	ClientCtrlItem_Struct()
+		: dwUpdated(0),
+		  status(NULL),
+		  m_owner(NULL),
+		  m_type(UNAVAILABLE_SOURCE)
+	{ }
+	
+	~ClientCtrlItem_Struct() {
+		delete status;
+	}
+
+	SourceItemType GetType() const {
+		return m_type;
+	}
+
+	CKnownFile* GetOwner() const {
+		return m_owner;
+	}
+
+
+	CClientRef& GetSource() {
+		return m_sourceValue;
+	}
+
+	void SetContents(CKnownFile* owner, const CClientRef& source, SourceItemType type) {
+		m_owner = owner;
+		m_sourceValue = source;
+		m_type = type;
+	}
+	
+	void SetType(SourceItemType type) { m_type = type; }
+	
+	uint32		dwUpdated;
+	wxBitmap*	status;
+
+private:
+	CKnownFile*		m_owner;
+	CClientRef		m_sourceValue;
+	SourceItemType	m_type;
+};
+
+#define m_ImageList theApp->amuledlg->m_imagelist
+
+BEGIN_EVENT_TABLE(CGenericClientListCtrl, CMuleListCtrl)
+	EVT_LIST_ITEM_ACTIVATED(wxID_ANY,	CGenericClientListCtrl::OnItemActivated)
+	EVT_LIST_ITEM_RIGHT_CLICK(wxID_ANY, CGenericClientListCtrl::OnMouseRightClick)
+	EVT_LIST_ITEM_MIDDLE_CLICK(wxID_ANY, CGenericClientListCtrl::OnMouseMiddleClick)
+
+	EVT_CHAR( CGenericClientListCtrl::OnKeyPressed )
+
+	EVT_MENU( MP_CHANGE2FILE,		CGenericClientListCtrl::OnSwapSource )
+	EVT_MENU( MP_SHOWLIST,			CGenericClientListCtrl::OnViewFiles )
+	EVT_MENU( MP_ADDFRIEND,			CGenericClientListCtrl::OnAddFriend )
+	EVT_MENU( MP_FRIENDSLOT,		CGenericClientListCtrl::OnSetFriendslot )
+	EVT_MENU( MP_SENDMESSAGE,		CGenericClientListCtrl::OnSendMessage )
+	EVT_MENU( MP_DETAIL,			CGenericClientListCtrl::OnViewClientInfo )
+END_EVENT_TABLE()
+
+//! This listtype is used when gathering the selected items.
+typedef std::list<ClientCtrlItem_Struct*>	ItemList;
+
+CGenericClientListCtrl::CGenericClientListCtrl(
+    const wxString& tablename,
+	wxWindow *parent, wxWindowID winid, const wxPoint& pos, const wxSize& size,
+	long style, const wxValidator& validator, const wxString& name )
+:
+CMuleListCtrl( parent, winid, pos, size, style | wxLC_OWNERDRAW | wxLC_VRULES | wxLC_HRULES, validator, name ),
+m_columndata(0, NULL)
+{
+	// Setting the sorter function must be done in the derived class, to use the translation function correctly.
+	// SetSortFunc( SortProc );
+
+	// Set the table-name (for loading and saving preferences).
+	SetTableName( tablename );
+
+	m_menu = NULL;
+	m_showing = false;
+	
+	m_hilightBrush  = CMuleColour(wxSYS_COLOUR_HIGHLIGHT).Blend(125).GetBrush();
+
+	m_hilightUnfocusBrush = CMuleColour(wxSYS_COLOUR_BTNSHADOW).Blend(125).GetBrush();
+	
+	m_clientcount = 0;
+}
+
+wxString CGenericClientListCtrl::TranslateCIDToName(GenericColumnEnum cid)
+{
+	wxString name;
+
+	switch (cid) {
+		case ColumnUserName:
+			name = wxT("N");
+			break;
+		case ColumnUserDownloaded:
+			name = wxT("D");
+			break;
+		case ColumnUserUploaded:
+			name = wxT("U");
+			break;
+		case ColumnUserSpeedDown:
+			name = wxT("S");
+			break;
+		case ColumnUserSpeedUp:
+			name = wxT("s");
+			break;
+		case ColumnUserProgress:
+			name = wxT("P");
+			break;
+		case ColumnUserAvailable:
+			name = wxT("A");
+			break;
+		case ColumnUserVersion:
+			name = wxT("V");
+			break;
+		case ColumnUserQueueRankLocal:
+			name = wxT("Q");
+			break;
+		case ColumnUserQueueRankRemote:
+			name = wxT("q");
+			break;
+		case ColumnUserOrigin:
+			name = wxT("O");
+			break;
+		case ColumnUserFileNameDownload:
+			name = wxT("F");
+			break;
+		case ColumnUserFileNameUpload:
+			name = wxT("f");
+			break;
+		case ColumnUserFileNameDownloadRemote:
+			name = wxT("R");
+			break;
+		case ColumnUserSharedFiles:
+			name = wxT("m");
+			break;
+		case ColumnInvalid:
+		default:
+			wxFAIL;
+			break;
+	}
+
+	return name;
+}
+
+void CGenericClientListCtrl::InitColumnData()
+{
+	if (!m_columndata.n_columns) {
+		throw wxString(wxT("CRITICAL: Initialization of the column data lacks subclass information"));
+	}
+	
+	for (int i = 0; i < m_columndata.n_columns; ++i) { 
+		InsertColumn( i, wxGetTranslation(m_columndata.columns[i].title), wxLIST_FORMAT_LEFT, m_columndata.columns[i].width, TranslateCIDToName(m_columndata.columns[i].cid));
+	}
+
+	LoadSettings();	
+}
+
+CGenericClientListCtrl::~CGenericClientListCtrl()
+{
+	while ( !m_ListItems.empty() ) {
+		delete m_ListItems.begin()->second;
+		m_ListItems.erase( m_ListItems.begin() );
+	}
+}
+void CGenericClientListCtrl::RawAddSource(CKnownFile* owner, CClientRef source, SourceItemType type)
+{
+	ClientCtrlItem_Struct* newitem = new ClientCtrlItem_Struct;
+	newitem->SetContents(owner, source, type);
+	
+	m_ListItems.insert( ListItemsPair(source.ECID(), newitem) );
+	
+	long item = InsertItem( GetItemCount(), wxEmptyString );
+	SetItemPtrData( item, reinterpret_cast<wxUIntPtr>(newitem) );
+	SetItemBackgroundColour( item, GetBackgroundColour() );	
+}
+
+void CGenericClientListCtrl::AddSource(CKnownFile* owner, const CClientRef& source, SourceItemType type)
+{
+	wxCHECK_RET(owner, wxT("NULL owner in CGenericClientListCtrl::AddSource"));
+	wxCHECK_RET(source.IsLinked(), wxT("Unlinked source in CGenericClientListCtrl::AddSource"));
+	
+	// Update the other instances of this source
+	bool bFound = false;
+	ListIteratorPair rangeIt = m_ListItems.equal_range(source.ECID());
+	for ( ListItems::iterator it = rangeIt.first; it != rangeIt.second; ++it ) {
+		ClientCtrlItem_Struct* cur_item = it->second;
+
+		// Check if this source has been already added to this file => to be sure
+		if ( cur_item->GetOwner() == owner ) {
+			// Update this instance with its new setting
+			if ((type == A4AF_SOURCE) && 
+				cur_item->GetSource().GetRequestFile() 
+				&& std::binary_search(m_knownfiles.begin(), m_knownfiles.end(), cur_item->GetSource().GetRequestFile())) {				
+				cur_item->SetContents(owner, source, AVAILABLE_SOURCE);
+			} else {
+				cur_item->SetContents(owner, source, type);
+			}			
+			cur_item->dwUpdated = 0;
+			bFound = true;
+		} else if ( type == AVAILABLE_SOURCE ) {
+			// The state 'Available' is exclusive
+			cur_item->SetContents(cur_item->GetOwner(), source, A4AF_SOURCE);
+			cur_item->dwUpdated = 0;
+		}
+	}
+
+	if ( bFound ) {
+		return;
+	}
+
+	if ( std::binary_search(m_knownfiles.begin(), m_knownfiles.end(), owner) ) {
+		RawAddSource(owner, source, type);
+		
+		ShowSourcesCount( 1 );
+	}
+}
+
+void CGenericClientListCtrl::RawRemoveSource( ListItems::iterator& it)
+{
+	ClientCtrlItem_Struct* item = it->second;
+	
+	long index = FindItem( -1, reinterpret_cast<wxUIntPtr>(item) );
+	
+	if ( index > -1 ) {
+		DeleteItem( index );
+	}
+
+	delete item;
+
+	// Remove it from the m_ListItems
+	m_ListItems.erase( it );
+}
+
+void CGenericClientListCtrl::RemoveSource(uint32 source, const CKnownFile* owner)
+{
+	// A NULL owner means remove it no matter what.
+	wxCHECK_RET(source, wxT("NULL source in CGenericClientListCtrl::RemoveSource"));
+	
+	// Retrieve all entries matching the source
+	ListIteratorPair rangeIt = m_ListItems.equal_range(source);
+	
+	int removedItems = 0;
+	
+	for ( ListItems::iterator it = rangeIt.first; it != rangeIt.second;  /* no ++, it happens later */) {
+		ListItems::iterator tmp = it++;
+		
+		if ( owner == NULL || owner == tmp->second->GetOwner() ) {
+
+			RawRemoveSource(tmp);
+			
+			++removedItems;
+		}
+	}
+	
+	ShowSourcesCount((-1) * removedItems);
+}
+
+void CGenericClientListCtrl::UpdateItem(uint32 toupdate, SourceItemType type)
+{
+	// Retrieve all entries matching the source
+	ListIteratorPair rangeIt = m_ListItems.equal_range( toupdate );
+	
+	if ( rangeIt.first != rangeIt.second ) {
+		// Visible lines, default to all because not all platforms
+		// support the GetVisibleLines function
+		long first = 0, last = GetItemCount();
+
+	#ifndef __WXMSW__
+		// Get visible lines if we need them
+		GetVisibleLines( &first, &last );
+	#endif
+		
+		for ( ListItems::iterator it = rangeIt.first; it != rangeIt.second; ++it ) {
+			ClientCtrlItem_Struct* item = it->second;
+			
+			long index = FindItem( -1, reinterpret_cast<wxUIntPtr>(item) );
+
+			if ((type == A4AF_SOURCE) && 
+					item->GetSource().GetRequestFile() 
+					&& std::binary_search(m_knownfiles.begin(), m_knownfiles.end(), item->GetSource().GetRequestFile())) {
+				
+				item->SetType(AVAILABLE_SOURCE);	
+			} else {
+				item->SetType(type);
+			}
+			
+			item->dwUpdated = 0;
+			
+			// Only update visible lines
+			if ( index >= first && index <= last) {
+				RefreshItem( index );
+			}
+		}
+	}
+}
+
+void CGenericClientListCtrl::ShowSources( const CKnownFileVector& files )
+{	
+	Freeze();
+	
+	// The stored vector is sorted, as is the received one, so we can use binary_search
+
+	for (unsigned i = 0; i < m_knownfiles.size(); ++i) {
+		// Files that are not in the new list must have show set to false.
+		if (!std::binary_search(files.begin(), files.end(), m_knownfiles[i])) {
+			SetShowSources(m_knownfiles[i], false);
+		}
+	}
+	
+	// This will call again SetShowSources in files that were in both vectors. Right now
+	// that function is just a inline setter, so any way to prevent it would be wasteful,
+	// but this must be reviewed if that fact changes.
+
+	for (unsigned i = 0; i < files.size(); ++i) {
+		SetShowSources(files[i], true);
+	}
+	
+	// We must cleanup sources that are not in the received files. 
+	
+	int itemDiff = 0;
+	
+	for (ListItems::iterator it = m_ListItems.begin(); it != m_ListItems.end(); /* no ++, it happens later */) {
+		ListItems::iterator tmp = it++;
+		ClientCtrlItem_Struct* item = tmp->second;
+		if (!std::binary_search(files.begin(), files.end(), item->GetOwner())) {
+			// Remove it from the m_ListItems
+			RawRemoveSource(tmp);
+			--itemDiff;
+		}
+	}
+	
+	for (unsigned i = 0; i < files.size(); ++i) {
+		
+		// Only those that weren't showing already
+		if (!std::binary_search(m_knownfiles.begin(), m_knownfiles.end(), files[i])) {
+			
+			CKnownFile* file = files[i];
+
+			wxASSERT_MSG(file, wxT("NULL file in CGenericClientListCtrl::ShowSources"));
+			
+			if (file) {
+				
+				CKnownFile::SourceSet::const_iterator it;
+			
+				if (IsShowingDownloadSources()) {
+					const CKnownFile::SourceSet& normSources = (dynamic_cast<CPartFile*>( file ))->GetSourceList();
+					const CKnownFile::SourceSet& a4afSources = (dynamic_cast<CPartFile*>( file ))->GetA4AFList();
+						
+					// Adding normal sources
+					for ( it = normSources.begin(); it != normSources.end(); ++it ) {
+						switch (it->GetDownloadState()) {
+							case DS_DOWNLOADING:
+							case DS_ONQUEUE:
+								RawAddSource( file, *it, AVAILABLE_SOURCE );
+								++itemDiff;
+								break;
+							default:
+								// Any other state
+								RawAddSource( file, *it, UNAVAILABLE_SOURCE );
+								++itemDiff;
+						}
+					}
+			
+					// Adding A4AF sources
+					for ( it = a4afSources.begin(); it != a4afSources.end(); ++it ) {
+						// Only add if the A4AF file is not in the shown list.
+						if (!std::binary_search(files.begin(), files.end(), it->GetRequestFile())) {
+							RawAddSource( file, *it, A4AF_SOURCE );
+							++itemDiff;
+						}
+					}
+				} else {
+					// Known file
+					const CKnownFile::SourceSet& sources = file->m_ClientUploadList;
+					for ( it = sources.begin(); it != sources.end(); ++it ) {
+						switch (it->GetUploadState()) {
+							case US_UPLOADING:
+							case US_ONUPLOADQUEUE:
+								RawAddSource( file, *it, AVAILABLE_SOURCE );
+								++itemDiff;
+								break;
+							default:
+								// Any other state
+								RawAddSource( file, *it, UNAVAILABLE_SOURCE );
+								++itemDiff;
+						}
+					}			
+				}
+			}
+		}
+	}
+
+	m_knownfiles = files;	
+	
+	ShowSourcesCount( itemDiff );
+		 
+	SortList();
+	
+	Thaw();
+}
+
+/**
+ * Helper-function: This function is used to gather selected items.
+ *
+ * @param list A pointer to the list to gather items from.
+ * @return A list containing the selected items of the choosen types.
+ */
+ItemList GetSelectedItems( CGenericClientListCtrl* list )
+{
+	ItemList results;
+
+	long index = list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+	
+	while ( index > -1 ) {
+		ClientCtrlItem_Struct* item = (ClientCtrlItem_Struct*)list->GetItemData( index );
+
+		results.push_back( item );
+		
+		index = list->GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
+	}
+
+	return results;
+}
+
+void CGenericClientListCtrl::OnSwapSource( wxCommandEvent& WXUNUSED(event) )
+{
+	ItemList sources = ::GetSelectedItems( this );
+	
+	for ( ItemList::iterator it = sources.begin(); it != sources.end(); ++it ) {
+		CKnownFile * kf = (*it)->GetOwner();
+		if (!kf->IsPartFile()) {
+			wxFAIL_MSG(wxT("File is not a partfile when swapping sources"));
+			continue;
+		}
+		(*it)->GetSource().SwapToAnotherFile( true, false, false,  dynamic_cast<CPartFile*>(kf));
+	}
+}
+
+
+void CGenericClientListCtrl::OnViewFiles( wxCommandEvent& WXUNUSED(event) )
+{
+	ItemList sources = ::GetSelectedItems( this );
+
+	if ( sources.size() == 1 ) {		
+		sources.front()->GetSource().RequestSharedFileList();
+	}
+}
+
+
+void CGenericClientListCtrl::OnAddFriend( wxCommandEvent& WXUNUSED(event) )
+{
+	ItemList sources = ::GetSelectedItems( this );
+
+	for ( ItemList::iterator it = sources.begin(); it != sources.end(); ++it ) {
+		CClientRef &client = (*it)->GetSource();
+		if (client.IsFriend()) {
+			theApp->friendlist->RemoveFriend(client.GetFriend());
+		} else {
+			theApp->friendlist->AddFriend(client);
+		}
+	}
+}
+
+
+void CGenericClientListCtrl::OnSetFriendslot(wxCommandEvent& evt)
+{
+	ItemList sources = ::GetSelectedItems( this );
+
+	ItemList::iterator it = sources.begin(); 
+	if (it != sources.end()) {
+		CClientRef &client = (*it)->GetSource();
+		theApp->friendlist->SetFriendSlot(client.GetFriend(), evt.IsChecked());
+		it++;
+	}
+	if (it != sources.end()) {
+		wxMessageBox(_("You are not allowed to set more than one friendslot.\n Only one slot was assigned."), _("Multiple selection"), wxOK | wxICON_ERROR, this);
+	}
+}
+
+
+void CGenericClientListCtrl::OnSendMessage( wxCommandEvent& WXUNUSED(event) )
+{
+	ItemList sources = ::GetSelectedItems( this );
+
+	if ( sources.size() == 1 ) {
+		CClientRef & source = (sources.front())->GetSource();
+
+		// These values are cached, since calling wxGetTextFromUser will
+		// start an event-loop, in which the client may be deleted.
+		wxString userName = source.GetUserName();
+		uint64 userID = GUI_ID(source.GetIP(), source.GetUserPort());
+		
+		wxString message = ::wxGetTextFromUser(_("Send message to user"),
+			_("Message to send:"));
+		if ( !message.IsEmpty() ) {
+			theApp->amuledlg->m_chatwnd->SendMessage(message, userName, userID);
+		}
+	}
+}
+
+
+void CGenericClientListCtrl::OnViewClientInfo( wxCommandEvent& WXUNUSED(event) )
+{
+	ItemList sources = ::GetSelectedItems( this );
+
+	if ( sources.size() == 1 ) {
+		CClientDetailDialog( this, sources.front()->GetSource() ).ShowModal();
+	}
+}
+
+
+void CGenericClientListCtrl::OnItemActivated( wxListEvent& evt )
+{
+	CClientDetailDialog( this, ((ClientCtrlItem_Struct*)GetItemData( evt.GetIndex()))->GetSource() ).ShowModal();
+}
+
+
+void CGenericClientListCtrl::OnMouseRightClick(wxListEvent& evt)
+{
+	long index = CheckSelection(evt);
+	if (index < 0) {
+		return;
+	}	
+	
+	delete m_menu;
+	m_menu = NULL;
+	
+	ClientCtrlItem_Struct* item = (ClientCtrlItem_Struct*)GetItemData( index );
+	CClientRef& client = item->GetSource();
+	
+	m_menu = new wxMenu(wxT("Clients"));
+	m_menu->Append(MP_DETAIL, _("Show &Details"));
+	m_menu->Append(MP_ADDFRIEND, client.IsFriend() ? _("Remove from friends") : _("Add to Friends"));
+
+	m_menu->AppendCheckItem(MP_FRIENDSLOT, _("Establish Friend Slot"));
+	if (client.IsFriend()) {
+		m_menu->Enable(MP_FRIENDSLOT, true);
+		m_menu->Check(MP_FRIENDSLOT, client.GetFriendSlot());
+	} else {
+		m_menu->Enable(MP_FRIENDSLOT, false);
+	}
+
+	m_menu->Append(MP_SHOWLIST, _("View Files"));
+	m_menu->Append(MP_SENDMESSAGE, _("Send message"));
+	
+	m_menu->Append(MP_CHANGE2FILE, _("Swap to this file"));
+	
+	// Only enable the Swap option for A4AF sources
+	m_menu->Enable(MP_CHANGE2FILE, (item->GetType() == A4AF_SOURCE));
+	// We need a valid IP if we are to message the client
+	m_menu->Enable(MP_SENDMESSAGE, (client.GetIP() != 0));
+	
+	m_menu->Enable(MP_SHOWLIST, !client.HasDisabledSharedFiles());
+	
+	PopupMenu(m_menu, evt.GetPoint());
+	
+	delete m_menu;
+	m_menu = NULL;
+	
+}
+
+
+void CGenericClientListCtrl::OnMouseMiddleClick(wxListEvent& evt)
+{
+	// Check if clicked item is selected. If not, unselect all and select it.
+	long index = CheckSelection(evt);
+	if ( index < 0 ) {
+		return;
+	}
+	
+	CClientDetailDialog(this, ((ClientCtrlItem_Struct*)GetItemData( index ))->GetSource()).ShowModal();
+}
+
+
+void CGenericClientListCtrl::OnKeyPressed( wxKeyEvent& event )
+{
+	// No actions right now.
+	//switch (event.GetKeyCode()) {
+	//	default:
+			event.Skip();
+	//}
+}
+
+
+void CGenericClientListCtrl::OnDrawItem(
+	int item, wxDC* dc, const wxRect& rect, const wxRect& rectHL, bool highlighted)
+{
+	// Don't do any drawing if there's nobody to see it.
+	if ( !theApp->amuledlg->IsDialogVisible( GetParentDialog() ) ) {
+		return;
+	}
+
+	ClientCtrlItem_Struct* content = (ClientCtrlItem_Struct *)GetItemData(item);
+
+	// Define text-color and background
+	// and the border of the drawn area
+	if (highlighted) {
+		CMuleColour colour;
+		if (GetFocus()) {
+			dc->SetBackground(m_hilightBrush);
+			colour = m_hilightBrush.GetColour();
+		} else {
+			dc->SetBackground(m_hilightUnfocusBrush);
+			colour = m_hilightUnfocusBrush.GetColour();
+		}
+		dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+		dc->SetPen( colour.Blend(65).GetPen() );
+	} else {
+		dc->SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID)));
+		dc->SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
+		dc->SetPen(*wxTRANSPARENT_PEN);
+	}
+	dc->SetBrush( dc->GetBackground() );
+
+	dc->DrawRectangle( rectHL.x, rectHL.y, rectHL.width, rectHL.height );
+
+	dc->SetPen(*wxTRANSPARENT_PEN);
+
+	// Various constant values we use
+	const int iTextOffset = (( rect.GetHeight() - dc->GetCharHeight() ) / 2) + 1 /* Fixes rounding in the centering math, much easier than floor() */;
+	const int iOffset = 2;
+	wxASSERT(m_ImageList.GetImageCount() > 0);
+	int imageListBitmapYOffset = 0;
+	int imageListBitmapXSize = 0;
+	if (m_ImageList.GetSize(0, imageListBitmapXSize, imageListBitmapYOffset)) {
+		imageListBitmapXSize += 2; // Padding.
+		imageListBitmapYOffset = ((rect.GetHeight() - imageListBitmapYOffset) / 2) + 1 /* Fixes rounding like above */;
+	} else {
+		wxFAIL;
+	}
+
+	wxRect cur_rec( iOffset, rect.y, 0, rect.height );
+	
+	for (int i = 0; i < GetColumnCount(); ++i) {
+		
+		int columnwidth = GetColumnWidth(i);
+
+		if (columnwidth > 2*iOffset) {
+			// Make a copy of the current rectangle so we can apply specific tweaks
+			wxRect target_rec = cur_rec;
+			target_rec.width = columnwidth - 2*iOffset;
+
+			GenericColumnEnum cid = m_columndata.columns[i].cid;
+			
+			// Draw the item
+			DrawClientItem(dc, cid, target_rec, content, iTextOffset, imageListBitmapYOffset, imageListBitmapXSize);
+		}
+		
+		// Increment to the next column
+		cur_rec.x += columnwidth;
+	}
+}
+
+void CGenericClientListCtrl::DrawClientItem(wxDC* dc, int nColumn, const wxRect& rect, ClientCtrlItem_Struct* item, int iTextOffset, int iBitmapOffset, int iBitmapXSize ) const
+{
+	wxDCClipper clipper( *dc, rect.GetX(), rect.GetY(), rect.GetWidth(), rect.GetHeight() );
+	wxString buffer;
+	
+	const CClientRef& client = item->GetSource();
+
+	switch (nColumn) {
+		// Client name + various icons
+		case ColumnUserName: {
+			// Point will get shifted per drawing.
+
+			wxPoint point( rect.GetX(), rect.GetY() );
+
+			uint8 image = Client_Grey_Smiley;
+
+			if (item->GetType() != A4AF_SOURCE) {
+				
+				switch (client.GetDownloadState()) {
+					case DS_CONNECTING:
+					case DS_CONNECTED:
+					case DS_WAITCALLBACK:
+					case DS_TOOMANYCONNS:
+						image = Client_Red_Smiley;
+						break;
+					case DS_ONQUEUE:
+						if (client.IsRemoteQueueFull()) {
+							image = Client_Grey_Smiley;
+						} else {
+							image = Client_Yellow_Smiley;
+						}
+						break;
+					case DS_DOWNLOADING:
+					case DS_REQHASHSET:
+						image = Client_Green_Smiley;
+						break;
+					case DS_NONEEDEDPARTS:
+					case DS_LOWTOLOWIP:
+						image = Client_Grey_Smiley; // Redundant
+						break;
+					default: // DS_NONE i.e.
+						image = Client_White_Smiley;
+					}
+
+				} else {
+					// Default (Client_Grey_Smiley)
+				}
+
+				m_ImageList.Draw(image, *dc, point.x, point.y + iBitmapOffset, wxIMAGELIST_DRAW_TRANSPARENT);
+
+				// Next
+
+				point.x += iBitmapXSize; 
+
+				uint8 clientImage = Client_Unknown;
+				
+				if ( client.IsFriend() ) {
+					clientImage = Client_Friend_Smiley;
+				} else {
+					switch ( client.GetClientSoft() ) {
+						case SO_AMULE:
+							clientImage = Client_aMule_Smiley;
+							break;
+						case SO_MLDONKEY:
+						case SO_NEW_MLDONKEY:
+						case SO_NEW2_MLDONKEY:
+							clientImage = Client_mlDonkey_Smiley;
+							break;
+						case SO_EDONKEY:
+						case SO_EDONKEYHYBRID:
+							clientImage = Client_eDonkeyHybrid_Smiley;
+							break;
+						case SO_EMULE:
+							clientImage = Client_eMule_Smiley;
+							break;
+						case SO_LPHANT:
+							clientImage = Client_lphant_Smiley;
+							break;
+						case SO_SHAREAZA:
+						case SO_NEW_SHAREAZA:
+						case SO_NEW2_SHAREAZA:
+							clientImage = Client_Shareaza_Smiley;
+							break;
+						case SO_LXMULE:
+							clientImage = Client_xMule_Smiley;
+							break;
+						default:
+							// cDonkey, Compatible, Unknown
+							// No icon for those yet.
+							// Using the eMule one + '?'
+							// Which is a faillback to the default (Client_Unknown)
+							break;
+					}
+				}
+
+				int realY = point.y + iBitmapOffset;
+				m_ImageList.Draw(clientImage, *dc, point.x, realY, wxIMAGELIST_DRAW_TRANSPARENT);
+
+				if (client.GetScoreRatio() > 1) {
+					// Has credits, draw the gold star
+					m_ImageList.Draw(Client_CreditsYellow_Smiley, *dc, point.x, realY, 
+						wxIMAGELIST_DRAW_TRANSPARENT );
+				}	else if ( !client.ExtProtocolAvailable() ) {
+					// No Ext protocol -> Draw the '-'
+					m_ImageList.Draw(Client_ExtendedProtocol_Smiley, *dc, point.x, realY,
+						wxIMAGELIST_DRAW_TRANSPARENT);
+				}
+
+				if (client.IsIdentified()) {
+					// the 'v'
+					m_ImageList.Draw(Client_SecIdent_Smiley, *dc, point.x, realY,
+						wxIMAGELIST_DRAW_TRANSPARENT);					
+				} else if (client.IsBadGuy()) {
+					// the 'X'
+					m_ImageList.Draw(Client_BadGuy_Smiley, *dc, point.x, realY,
+						wxIMAGELIST_DRAW_TRANSPARENT);					
+				}
+							
+				if (client.GetObfuscationStatus() == OBST_ENABLED) {
+					// the "¿" except it's a key
+					m_ImageList.Draw(Client_Encryption_Smiley, *dc, point.x, realY,
+						wxIMAGELIST_DRAW_TRANSPARENT);					
+				}				
+				
+				// Next
+
+				point.x += iBitmapXSize; 
+
+				wxString userName;
+#ifdef ENABLE_IP2COUNTRY
+				if (theApp->amuledlg->m_IP2Country->IsEnabled() && thePrefs::IsGeoIPEnabled()) {
+					// Draw the flag. Size can't be precached.
+					const CountryData& countrydata = theApp->amuledlg->m_IP2Country->GetCountryData(client.GetFullIP());
+
+					realY = point.y + (rect.GetHeight() - countrydata.Flag.GetHeight())/2 + 1 /* floor() */;
+
+					dc->DrawBitmap(countrydata.Flag,
+						point.x, realY,
+						true);
+				
+					userName << countrydata.Name;
+				
+					userName << wxT(" - ");
+
+					point.x += countrydata.Flag.GetWidth() + 2 /*Padding*/;
+				}
+#endif // ENABLE_IP2COUNTRY
+				if (client.GetUserName().IsEmpty()) {
+					userName << wxT("?");
+				} else {
+					userName << client.GetUserName();
+				}
+
+				dc->DrawText(userName, point.x, rect.GetY() + iTextOffset);
+			}
+			break;
+
+		case ColumnUserDownloaded:
+			if (item->GetType() != A4AF_SOURCE && client.GetTransferredDown()) {
+				buffer = CastItoXBytes(client.GetTransferredDown());
+				dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+			}
+			break;
+		case ColumnUserUploaded:
+			if (item->GetType() != A4AF_SOURCE && client.GetTransferredUp()) {
+				buffer = CastItoXBytes(client.GetTransferredUp());
+				dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+			}
+			break;
+		case ColumnUserSpeedDown:
+			if (item->GetType() != A4AF_SOURCE && client.GetKBpsDown() > 0.001) {
+				buffer = CFormat(_("%.1f kB/s")) % client.GetKBpsDown();
+				dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+			}
+			break;
+		case ColumnUserSpeedUp:
+			// Datarate is in bytes.
+			if (item->GetType() != A4AF_SOURCE && client.GetUploadDatarate() > 1024) {
+				buffer = CFormat(_("%.1f kB/s")) % (client.GetUploadDatarate() / 1024.0);
+				dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+			}
+			break;
+		case ColumnUserProgress:
+			if ( thePrefs::ShowProgBar() ) {
+				int iWidth = rect.GetWidth() - 2;
+				int iHeight = rect.GetHeight() - 2;
+
+				// don't draw Text beyond the bar
+				dc->SetClippingRegion(rect.GetX(), rect.GetY() + 1, iWidth, iHeight);
+			
+				if ( item->GetType() != A4AF_SOURCE ) {
+					uint32 dwTicks = GetTickCount();
+					
+					wxMemoryDC cdcStatus;
+
+					if ( item->dwUpdated < dwTicks || !item->status || 
+							iWidth != item->status->GetWidth() ) {
+						
+						if (item->status == NULL) {
+							item->status = new wxBitmap(iWidth, iHeight);
+						} else if ( item->status->GetWidth() != iWidth ) {
+							// Only recreate if size has changed
+							item->status->Create(iWidth, iHeight);
+						}
+
+						cdcStatus.SelectObject(*(item->status));
+
+						if ( thePrefs::UseFlatBar() ) {
+							DrawSourceStatusBar( client, &cdcStatus,
+								wxRect(0, 0, iWidth, iHeight), true);
+						} else {
+							DrawSourceStatusBar( client, &cdcStatus,
+								wxRect(1, 1, iWidth - 2, iHeight - 2), false);
+				
+							// Draw black border
+							cdcStatus.SetPen( *wxBLACK_PEN );
+							cdcStatus.SetBrush( *wxTRANSPARENT_BRUSH );
+							cdcStatus.DrawRectangle( 0, 0, iWidth, iHeight );
+						}
+						
+						// Plus ten seconds
+						item->dwUpdated = dwTicks + 10000;
+					} else {
+						cdcStatus.SelectObject(*(item->status));
+					}
+
+					dc->Blit(rect.GetX(), rect.GetY() + 1, iWidth, iHeight, &cdcStatus, 0, 0);
+				} else {
+					wxString a4af;
+					CPartFile* p = client.GetRequestFile();
+					if (p) {
+						a4af = p->GetFileName().GetPrintable();
+					} else {
+						a4af = wxT("?");
+					}
+					buffer = CFormat(wxT("%s: %s")) % _("A4AF") % a4af;
+					
+					int midx = (2*rect.GetX() + rect.GetWidth()) >> 1;
+					int midy = (2*rect.GetY() + rect.GetHeight()) >> 1;
+					
+					wxCoord txtwidth, txtheight;
+					
+					dc->GetTextExtent(buffer, &txtwidth, &txtheight);
+					
+					dc->SetTextForeground(*wxBLACK);
+					dc->DrawText(buffer, wxMax(rect.GetX() + 2, midx - (txtwidth >> 1)), midy - (txtheight >> 1));
+
+					// Draw black border
+					dc->SetPen( *wxBLACK_PEN );
+					dc->SetBrush( *wxTRANSPARENT_BRUSH );
+					dc->DrawRectangle( rect.GetX(), rect.GetY() + 1, iWidth, iHeight );		
+				}
+			}
+			break;
+
+		case ColumnUserAvailable: {
+				if ( client.GetUpPartCount() ) {
+					DrawStatusBar( client, dc, rect );
+				}
+				break;
+			}
+
+		case ColumnUserVersion: {
+				dc->DrawText(client.GetClientVerString(), rect.GetX(), rect.GetY() + iTextOffset);
+				break;
+			}
+
+		case ColumnUserQueueRankRemote: {
+			sint16 qrDiff = 0;
+			wxColour savedColour = dc->GetTextForeground();	
+			// We only show the queue rank for sources actually queued for that file
+			if (	item->GetType() != A4AF_SOURCE && client.GetDownloadState() == DS_ONQUEUE ) {
+				if (client.IsRemoteQueueFull()) {
+					buffer = _("Queue Full");
+				} else {
+					uint16 rank = client.GetRemoteQueueRank();
+					if (rank) {
+						qrDiff = rank - client.GetOldRemoteQueueRank();
+						if (qrDiff == rank) {
+							qrDiff = 0;
+						}
+						if ( qrDiff < 0 ) {
+							dc->SetTextForeground(*wxBLUE);
+						}
+						if ( qrDiff > 0 ) {
+							dc->SetTextForeground(*wxRED);
+						}
+						buffer = CFormat(_("On Queue: %u (%i)")) % rank % qrDiff;
+					} else {
+						buffer = _("On Queue");
+					}
+				}
+			} else {
+				if (item->GetType() != A4AF_SOURCE) {
+					buffer = DownloadStateToStr( client.GetDownloadState(), 
+						client.IsRemoteQueueFull() );
+				} else {
+					buffer = _("Asked for another file");
+					if (	client.GetRequestFile() &&
+						client.GetRequestFile()->GetFileName().IsOk()) {
+						buffer += CFormat(wxT(" (%s)")) 
+							% client.GetRequestFile()->GetFileName();
+					}
+				}
+			}
+			dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+			if (qrDiff) {
+				dc->SetTextForeground(savedColour);
+			}
+			break;
+		}
+		case ColumnUserQueueRankLocal:	
+			if (item->GetType() != A4AF_SOURCE) {
+				if (client.GetUploadState() == US_ONUPLOADQUEUE ) {
+					uint16 nRank = client.GetUploadQueueWaitingPosition();
+					if (nRank == 0) {
+						buffer = _("Waiting for upload slot");
+					} else {
+						buffer = CFormat(_("On Queue: %u")) % nRank;
+					}
+				} else if (client.GetUploadState() == US_UPLOADING) {
+					buffer = _("Uploading");
+				} else {
+					buffer = _("None");
+				}
+			} else {
+				buffer = _("Asked for another file");
+			}
+			dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+			break;
+		// Source comes from?
+		case ColumnUserOrigin: {
+			buffer = wxGetTranslation(OriginToText(client.GetSourceFrom()));
+			dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+			break;
+		}
+		// Local file name to identify on multi select
+		case ColumnUserFileNameDownload: {
+			const CPartFile * pf = client.GetRequestFile();
+			if (pf) {
+				buffer = pf->GetFileName().GetPrintable();
+			} else {
+				buffer = _("Unknown");
+				buffer = wxT("[") + buffer + wxT("]");
+			}
+			dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+			break;
+		}
+		case ColumnUserFileNameUpload: {
+			const CKnownFile * kf = client.GetUploadFile();
+			if (kf) {
+				buffer = kf->GetFileName().GetPrintable();
+			} else {
+				buffer = _("Unknown");
+				buffer = wxT("[") + buffer + wxT("]");
+			}
+			dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+			break;
+		}
+		case ColumnUserFileNameDownloadRemote: {
+			bool nameMissmatch = false;
+			wxColour savedColour = dc->GetTextForeground();
+			if (client.GetClientFilename().IsEmpty() || item->GetType() == A4AF_SOURCE) {
+				buffer = _("Unknown");
+				buffer = wxT("[") + buffer + wxT("]");
+			} else {
+				buffer = client.GetClientFilename();
+				const CPartFile * pf = client.GetRequestFile();
+				if (pf && (pf->GetFileName().GetPrintable().CmpNoCase(buffer) != 0)) {
+					nameMissmatch = true;
+					dc->SetTextForeground(*wxRED);
+				}
+			}
+			dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+			if (nameMissmatch) {
+				dc->SetTextForeground(savedColour);
+			}
+			break;
+		}
+		case ColumnUserSharedFiles: {
+			if(client.HasDisabledSharedFiles()) {
+				buffer = _("No");
+			} else {
+				buffer = _("Yes");
+			}
+			dc->DrawText(buffer, rect.GetX(), rect.GetY() + iTextOffset);
+			break;
+		}
+	}
+}
+
+int CGenericClientListCtrl::SortProc(wxUIntPtr param1, wxUIntPtr param2, long sortData)
+{
+	ClientCtrlItem_Struct* item1 = (ClientCtrlItem_Struct*)param1;
+	ClientCtrlItem_Struct* item2 = (ClientCtrlItem_Struct*)param2;
+
+	int sortMod = (sortData & CMuleListCtrl::SORT_DES) ? -1 : 1;
+	sortData &= CMuleListCtrl::COLUMN_MASK;
+	int comp = 0;
+
+	// Two sources, some different possibilites
+	// Avilable sources first, if we have both an
+	// available and an unavailable
+	comp = ( item2->GetType() - item1->GetType() );
+
+	if (comp) {
+			// unavailable and available. The order is fixed regardless of sort-order.
+		return comp;
+	} else {
+		comp = Compare(item1->GetSource(), item2->GetSource(), sortData);
+	}
+
+	// We modify the result so that it matches with ascending or decending
+	return sortMod * comp;
+}
+
+int CGenericClientListCtrl::Compare(
+	const CClientRef& client1, const CClientRef& client2, long lParamSort)
+{
+	switch (lParamSort) {
+		// Sort by name
+		case ColumnUserName:
+			return CmpAny( client1.GetUserName(), client2.GetUserName() );
+	
+		// Sort by transferred in the following fields
+		case ColumnUserDownloaded:	
+			return CmpAny( client1.GetTransferredDown(), client2.GetTransferredDown() );
+
+		// Sort by transferred in the following fields
+		case ColumnUserUploaded:
+			return CmpAny( client1.GetTransferredUp(), client2.GetTransferredUp() );
+
+		// Sort by speed
+		case ColumnUserSpeedDown:
+			return CmpAny( client1.GetKBpsDown(), client2.GetKBpsDown() );
+		
+		// Sort by speed
+		case ColumnUserSpeedUp:
+			return CmpAny( client1.GetUploadDatarate(), client2.GetUploadDatarate() );
+
+		// Sort by parts offered
+		case ColumnUserProgress:
+			return CmpAny(
+				client1.GetAvailablePartCount(),
+				client2.GetAvailablePartCount() );
+		
+		// Sort by client version
+		case ColumnUserVersion: {
+			int cmp = client1.GetSoftStr().Cmp(client2.GetSoftStr());
+
+			if (cmp == 0) {
+				cmp = CmpAny(client1.GetVersion(), client2.GetVersion());
+			}
+			if (cmp == 0) {
+				cmp = client1.GetClientModString().Cmp(client2.GetClientModString());
+			}
+			return cmp;
+		}
+		
+		// Sort by Queue-Rank
+		case ColumnUserQueueRankRemote: {
+			// This will sort by download state: Downloading, OnQueue, Connecting ...
+			// However, Asked For Another will always be placed last, due to
+			// sorting in SortProc
+			if ( client1.GetDownloadState() != client2.GetDownloadState() ) {
+				return client1.GetDownloadState() - client2.GetDownloadState();
+			}
+
+			// Placing items on queue before items on full queues
+			if ( client1.IsRemoteQueueFull() ) {
+				if ( client2.IsRemoteQueueFull() ) {
+					return 0;
+				} else {
+					return  1;
+				}
+			} else if ( client2.IsRemoteQueueFull() ) {
+				return -1;
+			} else {
+				if ( client1.GetRemoteQueueRank() ) {
+					if ( client2.GetRemoteQueueRank() ) {
+						return CmpAny(
+							client1.GetRemoteQueueRank(),
+							client2.GetRemoteQueueRank() );
+					} else {
+						return -1;
+					}
+				} else {
+					if ( client2.GetRemoteQueueRank() ) {
+						return  1;
+					} else {
+						return  0;
+					}
+				}
+			}
+		}
+		
+		// Sort by Queue-Rank
+		case ColumnUserQueueRankLocal: {
+			// This will sort by download state: Downloading, OnQueue, Connecting ...
+			// However, Asked For Another will always be placed last, due to
+			// sorting in SortProc
+			if ( client1.GetUploadState() != client2.GetUploadState() ) {
+				return client1.GetUploadState() - client2.GetUploadState();
+			}
+
+			uint16 rank1 = client1.GetUploadQueueWaitingPosition();
+			uint16 rank2 = client2.GetUploadQueueWaitingPosition();
+			// Placing items on queue before items on full queues
+			if ( !rank1 ) {
+				if ( !rank2 ) {
+					return 0;
+				} else {
+					return 1;
+				}
+			} else if ( !rank2 ) {
+				return -1;
+			} else {
+				if ( rank1 ) {
+					if ( rank2 ) {
+						return CmpAny(
+							rank1,
+							rank2 );
+					} else {
+						return -1;
+					}
+				} else {
+					if ( rank2 ) {
+						return  1;
+					} else {
+						return  0;
+					}
+				}
+			}
+		}
+
+		// Source of source ;)
+		case ColumnUserOrigin:
+			return CmpAny(client1.GetSourceFrom(), client2.GetSourceFrom());
+		
+		// Sort by local filename (download)
+		case ColumnUserFileNameDownload: {
+			wxString buffer1, buffer2;
+			const CPartFile * pf1 = client1.GetRequestFile();
+			if (pf1) {
+				buffer1 = pf1->GetFileName().GetPrintable();
+			}
+			const CPartFile * pf2 = client2.GetRequestFile();
+			if (pf2) {
+				buffer2 = pf2->GetFileName().GetPrintable();
+			}
+			return CmpAny(buffer1, buffer2);
+		}
+
+		// Sort by local filename (upload)
+		case ColumnUserFileNameUpload: {
+			wxString buffer1, buffer2;
+			const CKnownFile * kf1 = client1.GetUploadFile();
+			if (kf1) {
+				buffer1 = kf1->GetFileName().GetPrintable();
+			}
+			const CKnownFile * kf2 = client2.GetUploadFile();
+			if (kf2) {
+				buffer2 = kf2->GetFileName().GetPrintable();
+			}
+			return CmpAny(buffer1, buffer2);
+		}
+
+		case ColumnUserFileNameDownloadRemote: {
+			return CmpAny(client1.GetClientFilename(), client2.GetClientFilename());
+		}
+
+		case ColumnUserSharedFiles: {
+			return CmpAny(client1.HasDisabledSharedFiles(), client2.HasDisabledSharedFiles());
+		}
+
+		default:
+			return 0;
+	}
+}
+
+
+void CGenericClientListCtrl::ShowSourcesCount( int diff )
+{
+	m_clientcount += diff;
+	wxStaticText* label = CastByID( ID_CLIENTCOUNT, GetParent(), wxStaticText );
+
+	if (label) {	
+		label->SetLabel(CFormat(wxT("%i")) % m_clientcount);
+		label->GetParent()->Layout();
+	}
+}
+
+static const CMuleColour crBoth(0, 192, 0);
+static const CMuleColour crFlatBoth(0, 150, 0);
+
+static const CMuleColour crNeither(240, 240, 240);
+static const CMuleColour crFlatNeither(224, 224, 224);
+
+static const CMuleColour crClientOnly(104, 104, 104);
+static const CMuleColour crFlatClientOnly(0, 0, 0);
+
+static const CMuleColour crPending(255, 208, 0);
+static const CMuleColour crNextPending(255, 255, 100);
+
+void CGenericClientListCtrl::DrawSourceStatusBar(
+	const CClientRef& source, wxDC* dc, const wxRect& rect, bool bFlat) const
+{
+	static CBarShader s_StatusBar(16);
+
+	CPartFile* reqfile = source.GetRequestFile();
+
+	s_StatusBar.SetHeight(rect.height);
+	s_StatusBar.SetWidth(rect.width);
+	s_StatusBar.Set3dDepth( thePrefs::Get3DDepth() );
+	const BitVector& partStatus = source.GetPartStatus();
+
+	if (reqfile && reqfile->GetPartCount() == partStatus.size()) {
+		s_StatusBar.SetFileSize(reqfile->GetFileSize());
+		uint16 lastDownloadingPart = source.GetDownloadState() == DS_DOWNLOADING 
+									? source.GetLastDownloadingPart() : 0xffff;
+		uint16 nextRequestedPart = source.GetNextRequestedPart();
+
+		for ( uint16 i = 0; i < partStatus.size(); i++ ) {
+			uint64 uStart = PARTSIZE * i;
+			uint64 uEnd = uStart + reqfile->GetPartSize(i) - 1;
+
+			CMuleColour colour;
+			if (!partStatus.get(i)) {
+				// client does not have this part
+				// light grey
+				colour = bFlat ? crFlatNeither : crNeither;
+			} else if ( reqfile->IsComplete(i)) {
+				// completed part
+				// green
+				colour = bFlat ? crFlatBoth : crBoth;
+			} else if (lastDownloadingPart == i) {
+				// downloading part
+				// yellow
+				colour = crPending;
+			} else if (nextRequestedPart == i) {
+				// requested part
+				// light yellow
+				colour = crNextPending;
+			} else {
+				// client has this part, we need it
+				// black
+				colour = bFlat ? crFlatClientOnly : crClientOnly;
+			}
+
+			if ( source.GetRequestFile()->IsStopped() ) {
+				colour.Blend(50);
+			}
+
+			s_StatusBar.FillRange(uStart, uEnd, colour);
+		}
+	} else {
+		s_StatusBar.SetFileSize(1);
+		s_StatusBar.FillRange(0, 1, bFlat ? crFlatNeither : crNeither);
+	}
+
+	s_StatusBar.Draw(dc, rect.x, rect.y, bFlat);
+}
+
+static const CMuleColour crUnavailable(240, 240, 240);
+static const CMuleColour crFlatUnavailable(224, 224, 224);
+
+static const CMuleColour crAvailable(104, 104, 104);
+static const CMuleColour crFlatAvailable(0, 0, 0);
+
+void CGenericClientListCtrl::DrawStatusBar( const CClientRef& client, wxDC* dc, const wxRect& rect1 ) const
+{
+	wxRect rect = rect1;
+	rect.y		+= 1;
+	rect.height	-= 2;
+
+	wxPen   old_pen   = dc->GetPen();
+	wxBrush old_brush = dc->GetBrush();
+	bool bFlat = thePrefs::UseFlatBar();
+
+	wxRect barRect = rect;
+	if (!bFlat) { // round bar has a black border, the bar itself is 1 pixel less on each border
+		barRect.x ++;
+		barRect.y ++;
+		barRect.height -= 2;
+		barRect.width -= 2;
+	}
+	static CBarShader s_StatusBar(16);
+
+	uint32 partCount = client.GetUpPartCount();
+
+	// Seems the partfile in the client object is not necessarily valid when bar is drawn for the first time.
+	// Keep it simple and make all parts same size.
+	s_StatusBar.SetFileSize(partCount * PARTSIZE);
+	s_StatusBar.SetHeight(barRect.height);
+	s_StatusBar.SetWidth(barRect.width);
+	s_StatusBar.Set3dDepth( thePrefs::Get3DDepth() );
+
+	uint64 uEnd = 0;
+	for ( uint64 i = 0; i < partCount; i++ ) {
+		uint64 uStart = PARTSIZE * i;
+		uEnd = uStart + PARTSIZE - 1;
+
+		s_StatusBar.FillRange(uStart, uEnd, client.IsUpPartAvailable(i) ? (bFlat ? crFlatAvailable : crAvailable) : (bFlat ? crFlatUnavailable : crUnavailable));
+	}
+	// fill the rest (if partStatus is empty)
+	s_StatusBar.FillRange(uEnd + 1, partCount * PARTSIZE - 1, bFlat ? crFlatUnavailable : crUnavailable);
+	s_StatusBar.Draw(dc, barRect.x, barRect.y, bFlat);
+
+	if (!bFlat) {
+		// Draw black border
+		dc->SetPen( *wxBLACK_PEN );
+		dc->SetBrush( *wxTRANSPARENT_BRUSH );
+		dc->DrawRectangle(rect);
+	}
+
+	dc->SetPen( old_pen );
+	dc->SetBrush( old_brush );
+}
+
+// File_checked_for_headers

aMule-2.3.1.tar.bz2/src/GenericClientListCtrl.h Added

@@ -0,0 +1,260 @@
+//
+// 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
+//
+
+#ifndef GENERICCLIENTLISTCTRL_H
+#define GENERICCLIENTLISTCTRL_H
+
+#include <map>				// Needed for std::multimap
+#include <vector>			// Needed for std::vector
+#include <wx/brush.h>
+
+#include "Types.h"			// Needed for uint8
+#include "Constants.h"		// Needed for DownloadItemType
+#include "MuleListCtrl.h"	// Needed for CMuleListCtrl
+#include "amuleDlg.h"		// Needed for CamuleDlg::DialogType
+
+class CPartFile;
+class CClientRef;
+class wxBitmap;
+class wxRect;
+class wxDC;
+
+struct ClientCtrlItem_Struct;
+
+enum GenericColumnEnum {
+	ColumnUserName = 0,
+	ColumnUserDownloaded,
+	ColumnUserUploaded,
+	ColumnUserSpeedDown,
+	ColumnUserSpeedUp,
+	ColumnUserProgress,
+	ColumnUserAvailable,
+	ColumnUserVersion,
+	ColumnUserQueueRankLocal,
+	ColumnUserQueueRankRemote,
+	ColumnUserOrigin,
+	ColumnUserFileNameDownload,
+	ColumnUserFileNameUpload,
+	ColumnUserFileNameDownloadRemote,
+	ColumnUserSharedFiles,
+	ColumnInvalid
+};
+
+struct CGenericClientListCtrlColumn {
+	GenericColumnEnum cid;
+	wxString title;
+	int width;
+};
+
+struct GenericColumnInfo {
+	GenericColumnInfo(int n, CGenericClientListCtrlColumn* col) : n_columns(n), columns(col) { };
+	int n_columns;
+	CGenericClientListCtrlColumn* columns;
+};
+
+typedef std::vector<CKnownFile*> CKnownFileVector;
+
+/**
+ * This class is responsible for representing clients in a generic way.
+ */
+
+class CGenericClientListCtrl : public CMuleListCtrl
+{
+public:
+	/**
+	 * Constructor.
+	 * 
+	 * @see CMuleListCtrl::CMuleListCtrl for documentation of parameters.
+	 */
+	 CGenericClientListCtrl(
+				const wxString& tablename,
+	            wxWindow *parent,
+                wxWindowID winid,
+                const wxPoint &pos,
+                const wxSize &size,
+                long style,
+                const wxValidator& validator,
+                const wxString &name);
+				
+	/**
+	 * Destructor.
+	 */	 
+	virtual	~CGenericClientListCtrl();	
+
+	/**
+	 * Initializes the control. We need a 2-stage initialization so the derived class members can be called.
+	 */
+	 void InitColumnData();
+
+	/**
+	 * Adds a source belonging to the specified file.
+	 *
+	 * @param owner The owner of this specific source-entry, must be a valid pointer.
+	 * @param source The client object to be added, must be a valid pointer.
+	 * @param type If the source is a current source, or a A4AF source.
+	 *
+	 * Please note that the specified client will only be added to the list if it's
+	 * owner is shown, otherwise the source will simply be ignored.
+	 * Duplicates wont be added.
+	 */
+	void AddSource( CKnownFile* owner, const CClientRef& source, SourceItemType type );
+
+	/**
+	 * Removes a source from the list.
+	 *
+	 * @param source ID of the source to be removed.
+	 * @param owner Either a specific file, or NULL to remove the source from all files.
+	 */
+	void RemoveSource( uint32 source, const CKnownFile* owner );
+	
+	/**
+	 * Shows the clients of specific files.
+	 *
+	 * @param file A valid, sorted vector of files whose clients will be shown.
+	 *
+	 * WARNING: The received vector *MUST* be odered with std::sort.
+	 *
+	 */
+	void ShowSources( const CKnownFileVector& files );
+
+	/**
+	 * Updates the state of the specified item, possibly causing a redrawing.
+	 *
+	 * @param toupdate ID of the client to be updated.
+	 * @param type If the source is a current source, or a A4AF source.	 
+	 *
+	 */
+	void UpdateItem(uint32 toupdate, SourceItemType type);
+
+	void SetShowing( bool status ) { m_showing = status; }
+	bool GetShowing() const { return m_showing; }
+
+protected:
+	// The columns with their attributes; MUST be defined by the derived class.
+	GenericColumnInfo m_columndata;
+	static int wxCALLBACK SortProc(wxUIntPtr item1, wxUIntPtr item2, long sortData);
+
+private:
+	/**
+     *
+	 * Must be overriden by the derived class and return the dialog where this list is.
+     * @see CamuleDlg::DialogType
+	 *
+     */
+	virtual CamuleDlg::DialogType GetParentDialog() = 0;
+
+	/**
+	 * Updates the displayed number representing the amount of clients currently shown.
+	 */
+	void ShowSourcesCount( int diff );
+
+	/**
+	 * Overloaded function needed for custom drawing of items.
+	 */
+	virtual void OnDrawItem( int item, wxDC* dc, const wxRect& rect, const wxRect& rectHL, bool highlighted );
+
+	/**
+	 * Draws a client item.
+	 */
+	void	DrawClientItem( wxDC* dc, int nColumn, const wxRect& rect, ClientCtrlItem_Struct* item, int iTextOffset, int iBitmapOffset, int iBitmapXSize ) const;
+
+	/**
+	 * Draws the download status (chunk) bar for a client.
+	 */
+	void	DrawSourceStatusBar( const CClientRef& source, wxDC* dc, const wxRect& rect, bool  bFlat) const;
+
+	/**
+	  * Draaws the file parts bar for a client.
+	  */
+	void	DrawStatusBar( const CClientRef& client, wxDC* dc, const wxRect& rect1 ) const;
+
+	/**
+	 * @see CMuleListCtrl::GetTTSText
+	 * Just a dummy
+	 */
+	virtual wxString GetTTSText(unsigned) const { return wxEmptyString; }
+
+	/**
+	 * Set "show sources" or "show peers" flag in Known File
+	 */
+	virtual void SetShowSources(CKnownFile *, bool) const = 0;
+
+	/**
+	 * Translate the CID to a unique string for saving column sizes
+	 * @see CMuleListCtrl::InsertColumn
+	 */
+	wxString TranslateCIDToName(GenericColumnEnum cid);
+
+	static int Compare( const CClientRef& client1, const CClientRef& client2, long lParamColumnSort);
+	
+	// Event-handlers for clients.
+	void	OnSwapSource( wxCommandEvent& event );
+	void	OnViewFiles( wxCommandEvent& event );
+	void	OnAddFriend( wxCommandEvent& event );
+	void	OnSetFriendslot( wxCommandEvent& event );
+	void	OnSendMessage( wxCommandEvent& event );
+	void	OnViewClientInfo( wxCommandEvent& event );
+
+	// Misc event-handlers
+	void	OnItemActivated( wxListEvent& event );
+	void 	OnMouseRightClick( wxListEvent& event );
+	void 	OnMouseMiddleClick( wxListEvent& event );
+	void	OnKeyPressed( wxKeyEvent& event );
+
+	//! The type of list used to store items on the listctrl. We use the unique ECID as key.
+	typedef std::multimap<uint32, ClientCtrlItem_Struct*> ListItems;
+	//! Shortcut to the pair-type used on the list.
+	typedef ListItems::value_type ListItemsPair;
+	//! This pair is used when searching for equal-ranges.
+	typedef std::pair< ListItems::iterator, ListItems::iterator > ListIteratorPair;
+
+	//! This list contains everything shown on the list. Sources are only to
+	//! be found on this list if they are being displayed
+	ListItems	m_ListItems;
+	
+	//! Pointer to the current menu object, used to avoid multiple menus.
+	wxMenu*		m_menu;
+	//! Cached brush object.
+	wxBrush	m_hilightBrush;
+	//! Cached brush object.
+	wxBrush	m_hilightUnfocusBrush;
+	
+	//! The number of displayed sources
+	int m_clientcount;
+
+	//! The files being shown, if any.
+	CKnownFileVector m_knownfiles;
+	
+	DECLARE_EVENT_TABLE()
+
+	bool m_showing;
+	
+	void RawAddSource(CKnownFile* owner, CClientRef source, SourceItemType type);
+	void RawRemoveSource( ListItems::iterator& it );
+
+	virtual bool IsShowingDownloadSources() const = 0;
+};
+
+#endif
+// File_checked_for_headers

aMule-2.2.6.tar.bz2/src/GetTickCount.cpp -> aMule-2.3.1.tar.bz2/src/GetTickCount.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Alo Sarv <madcat_@users.sourceforge.net>
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Timo Kujala <tiku@users.sourceforge.net>
+// Copyright (c) 2003-2011 Alo Sarv ( madcat_@users.sourceforge.net )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2002-2011 Timo Kujala ( tiku@users.sourceforge.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -26,6 +26,8 @@
 
 #include "GetTickCount.h" // Interface
 
+uint32 TheTime = 0;
+
 #ifdef __WXMSW__
 
 void StartTickTimer(){};
@@ -81,7 +83,7 @@
 
 #if wxUSE_GUI && wxUSE_TIMER && !defined(AMULE_DAEMON)
 /**
- * Copyright (c) 2004-2009 Alo Sarv <madcat_@users.sourceforge.net>
+ * Copyright (c) 2003-2011 Alo Sarv ( madcat_@users.sourceforge.net )
  * wxTimer based implementation. wxGetLocalTimeMillis() is called every 2
  * milliseconds and values stored in local variables. Upon requests for current
  * time, values of those variables are returned. This means wxGetLocalTimeMillis
@@ -131,7 +133,7 @@
 
 #else
 /**
- * Copyright (c) 2003-2009 Timo Kujala <tiku@users.sourceforge.net>
+ * Copyright (c) 2002-2011 Timo Kujala ( tiku@users.sourceforge.net )
  * gettimeofday() syscall based implementation. Upon request to GetTickCount(),
  * gettimeofday syscall is being used to retrieve system time and returned. This
  * means EACH GetTickCount() call will produce a new syscall, thus becoming

aMule-2.2.6.tar.bz2/src/GetTickCount.h -> aMule-2.3.1.tar.bz2/src/GetTickCount.h Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Alo Sarv <madcat_@users.sourceforge.net>
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Timo Kujala <tiku@users.sourceforge.net>
+// Copyright (c) 2003-2011 Alo Sarv ( madcat_@users.sourceforge.net )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2002-2011 Timo Kujala ( tiku@users.sourceforge.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -32,9 +32,6 @@
 #ifndef _WIN32
 	uint32 GetTickCount();
 #else
-	#ifndef _MSC_VER
-		#include <winbase.h> // Do_not_auto_remove
-	#endif
 	// System GetTickcount is lowres, so use fullres
 	#define GetTickCount GetTickCountFullRes
 	// GetTickCount64 is a system function in Vista so rename it
@@ -55,5 +52,8 @@
 
 void StopTickTimer();
 
+// A cheap global time (in s) without any function calls updated in OnCoreTimer
+extern uint32 TheTime;
+
 #endif // GETTICKCOUNT_H
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/GuiEvents.cpp -> aMule-2.3.1.tar.bz2/src/GuiEvents.cpp Changed

@@ -1,11 +1,38 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2004-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
+//
 
 #include "GuiEvents.h"
 #include "amule.h"
 #include "PartFile.h"
 #include "DownloadQueue.h"
-#include "updownclient.h"
 #include "ServerList.h"
 #include "Preferences.h"
+#include "ExternalConn.h"
+#include "SearchFile.h"
+#include "SearchList.h"
+#include "IPFilter.h"
+#include "Friend.h"
 
 #ifndef AMULE_DAEMON
 #	include "ChatWnd.h"
@@ -15,29 +42,22 @@
 #	include "TransferWnd.h"
 #	include "SharedFilesWnd.h"
 #	include "ServerListCtrl.h"
-#	include "ClientListCtrl.h"
+#	include "SourceListCtrl.h"
 #	include "SharedFilesCtrl.h"
 #	include "DownloadListCtrl.h"
 #	include "muuli_wdr.h"
-#	include "PartFileConvertDlg.h"
+#	include "SharedFilePeersListCtrl.h"
+#	ifndef CLIENT_GUI
+#		include "PartFileConvertDlg.h"
+#		include "PartFileConvert.h"
+#	endif
 #endif
 
 #ifndef CLIENT_GUI
-#	include "PartFileConvert.h"
-#endif
-
-#ifdef AMULE_DAEMON
-#	define NOT_ON_DAEMON(x) WXUNUSED(x)
-#else
-#	define NOT_ON_DAEMON(x) x
-#endif
-
-#ifdef CLIENT_GUI
-#	define NOT_ON_REMOTEGUI(x)	WXUNUSED(x)
-#else
-#	define NOT_ON_REMOTEGUI(x)	x
+#	include "UploadQueue.h"
 #endif
 
+#include <common/MacrosProgramSpecific.h>
 
 DEFINE_LOCAL_EVENT_TYPE(MULE_EVT_NOTIFY)
 
@@ -48,7 +68,7 @@
 	void HandleNotification(const CMuleNotiferBase& ntf)
 	{
 		if (wxThread::IsMain()) {
-#if defined(AMULE_DAEMON) || defined(REMOTE_GUI)
+#ifdef AMULE_DAEMON
 			ntf.Notify();
 #else
 			if (theApp->amuledlg) {
@@ -60,7 +80,15 @@
 			wxPostEvent(wxTheApp, evt);
 		}
 	}
-	
+
+
+	void HandleNotificationAlways(const CMuleNotiferBase& ntf)
+	{
+		CMuleGUIEvent evt(ntf.Clone());
+		wxPostEvent(wxTheApp, evt);
+	}
+
+
 	void Search_Add_Download(CSearchFile* file, uint8 category)
 	{
 		theApp->downloadqueue->AddSearchToDownload(file, category);
@@ -82,6 +110,9 @@
 			if (val == 0xffff) {
 				// Global search ended
 				theApp->amuledlg->m_searchwnd->ResetControls();
+			} else if (val == 0xfffe) {
+				// Kad search ended
+				theApp->amuledlg->m_searchwnd->KadSearchEnd(0);
 			} else {
 				theApp->amuledlg->m_searchwnd->UpdateProgress(val);
 			}
@@ -90,8 +121,11 @@
 	}
 
 	
-	void DownloadCtrlUpdateItem(const void* NOT_ON_DAEMON(item))
+	void DownloadCtrlUpdateItem(const void* item)
 	{
+#ifndef CLIENT_GUI
+		theApp->ECServerHandler->m_ec_notifier->DownloadFile_SetDirty((CPartFile *)item);
+#endif
 #ifndef AMULE_DAEMON
 		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
 			theApp->amuledlg->m_transferwnd->downloadlistctrl->UpdateItem(item);
@@ -100,6 +134,16 @@
 	}
 
 
+	void DownloadCtrlDoItemSelectionChanged()
+	{
+#ifndef AMULE_DAEMON
+		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
+			theApp->amuledlg->m_transferwnd->downloadlistctrl->DoItemSelectionChanged();
+		}
+#endif
+	}
+
+
 	void NodesURLChanged(wxString NOT_ON_DAEMON(url))
 	{
 #ifndef AMULE_DAEMON
@@ -114,55 +158,95 @@
 #endif
 	}
 
-	void ConvertUpdateProgress(float NOT_ON_DAEMON(percent), wxString NOT_ON_DAEMON(text), wxString NOT_ON_DAEMON(header))
+	void ShowGUI()
 	{
 #ifndef AMULE_DAEMON
-		CPartFileConvertDlg::UpdateProgress(percent, text, header);
+		theApp->amuledlg->Iconize(false);
 #endif
 	}
-
-	void ConvertUpdateJobInfo(ConvertInfo NOT_ON_DAEMON(info))
+	
+	void SourceCtrlUpdateSource(uint32 NOT_ON_DAEMON(source), SourceItemType NOT_ON_DAEMON(type))
 	{
 #ifndef AMULE_DAEMON
-		CPartFileConvertDlg::UpdateJobInfo(info);
+		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
+			theApp->amuledlg->m_transferwnd->clientlistctrl->UpdateItem(source, type);
+		}
 #endif
 	}
-
-	void ConvertRemoveJobInfo(unsigned NOT_ON_DAEMON(id))
+	
+	void SourceCtrlAddSource(CPartFile* NOT_ON_DAEMON(owner), CClientRef NOT_ON_DAEMON(source), SourceItemType NOT_ON_DAEMON(type))
 	{
 #ifndef AMULE_DAEMON
-		CPartFileConvertDlg::RemoveJobInfo(id);
+		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
+			theApp->amuledlg->m_transferwnd->clientlistctrl->AddSource(owner, source, type);
+		}
 #endif
 	}
-
-	void ConvertClearInfos()
+	
+	void SourceCtrlRemoveSource(uint32 NOT_ON_DAEMON(source), const CPartFile* NOT_ON_DAEMON(owner))
 	{
 #ifndef AMULE_DAEMON
-		CPartFileConvertDlg::ClearInfo();
+		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
+			theApp->amuledlg->m_transferwnd->clientlistctrl->RemoveSource(source, owner);
+		}
 #endif
 	}
-
-	void ConvertRemoveJob(unsigned NOT_ON_REMOTEGUI(id))
+	
+	void SharedCtrlAddClient(CKnownFile* NOT_ON_DAEMON(owner), CClientRef NOT_ON_DAEMON(source), SourceItemType NOT_ON_DAEMON(type))
 	{
-#ifndef CLIENT_GUI
-		CPartFileConvert::RemoveJob(id);
+#ifndef AMULE_DAEMON
+		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->peerslistctrl) {
+			theApp->amuledlg->m_sharedfileswnd->peerslistctrl->AddSource(owner, source, type);
+		}
 #endif
 	}
-
-	void ConvertRetryJob(unsigned NOT_ON_REMOTEGUI(id))
+	
+	void SharedCtrlRefreshClient(uint32 NOT_ON_DAEMON(client), SourceItemType NOT_ON_DAEMON(type))
 	{
-#ifndef CLIENT_GUI
-		CPartFileConvert::RetryJob(id);
+#ifndef AMULE_DAEMON
+		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->peerslistctrl) {
+			theApp->amuledlg->m_sharedfileswnd->peerslistctrl->UpdateItem(client, type);
+		}
 #endif
 	}
-
-	void ConvertReaddAllJobs()
+	
+	void SharedCtrlRemoveClient(uint32 NOT_ON_DAEMON(source), const CKnownFile* NOT_ON_DAEMON(owner))
 	{
-#ifndef CLIENT_GUI
-		CPartFileConvert::ReaddAllJobs();
+#ifndef AMULE_DAEMON
+		if (theApp->amuledlg->m_sharedfileswnd && theApp->amuledlg->m_sharedfileswnd->peerslistctrl) {
+			theApp->amuledlg->m_sharedfileswnd->peerslistctrl->RemoveSource(source, owner);
+		}
 #endif
 	}
-
+	
+	void ServerRefresh(CServer* NOT_ON_DAEMON(server))
+	{
+#ifndef AMULE_DAEMON
+		if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
+			theApp->amuledlg->m_serverwnd->serverlistctrl->RefreshServer(server);
+		}
+#endif
+	}
+	
+	void ChatUpdateFriend(CFriend * NOT_ON_DAEMON(toupdate))
+	{
+#ifndef AMULE_DAEMON
+		if (theApp->amuledlg->m_chatwnd) {
+			theApp->amuledlg->m_chatwnd->UpdateFriend(toupdate);
+		}
+#endif
+	}
+	
+	void ChatRemoveFriend(CFriend * toremove)
+	{
+#ifndef AMULE_DAEMON
+		if (theApp->amuledlg->m_chatwnd) {
+			theApp->amuledlg->m_chatwnd->RemoveFriend(toremove);
+		}
+#endif
+		delete toremove;
+	}
+	
 #ifdef CLIENT_GUI
 	
 	void PartFile_Swap_A4AF(CPartFile* file)
@@ -225,6 +309,11 @@
 		theApp->sharedfiles->SetFilePrio(file, PR_AUTO);
 	}
 
+	void KnownFile_Comment_Set(CKnownFile* file, wxString comment, int8 rating)
+	{
+		theApp->sharedfiles->SetFileCommentRating(file, comment, rating);
+	}
+	
 	void Download_Set_Cat_Prio(uint8, uint8)
 	{
 	}
@@ -233,6 +322,10 @@
 	{
 	}
 	
+	void Upload_Resort_Queue()
+	{
+	}
+
 #else
 
 	void SharedFilesShowFile(CKnownFile* NOT_ON_DAEMON(file))
@@ -283,8 +376,9 @@
 	}
 
 
-	void DownloadCtrlAddFile(CPartFile* NOT_ON_DAEMON(file))
+	void DownloadCtrlAddFile(CPartFile* file)
 	{
+		theApp->ECServerHandler->m_ec_notifier->DownloadFile_AddFile(file);
 #ifndef AMULE_DAEMON
 		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl ) {
 			theApp->amuledlg->m_transferwnd->downloadlistctrl->AddFile(file);
@@ -292,45 +386,15 @@
 #endif
 	}
 
-	void DownloadCtrlAddSource(CPartFile* NOT_ON_DAEMON(owner), CUpDownClient* NOT_ON_DAEMON(source), DownloadItemType NOT_ON_DAEMON(type))
-	{
-#ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
-			if (owner->ShowSources()) {
-				theApp->amuledlg->m_transferwnd->downloadlistctrl->AddSource(owner, source, type);
-			}
-		}
-#endif
-	}
-	
-	void DownloadCtrlRemoveFile(CPartFile* NOT_ON_DAEMON(file))
+	void DownloadCtrlRemoveFile(CPartFile* file)
 	{
+		theApp->ECServerHandler->m_ec_notifier->DownloadFile_RemoveFile(file);
 #ifndef AMULE_DAEMON
 		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
 			theApp->amuledlg->m_transferwnd->downloadlistctrl->RemoveFile(file);
 		}
 #endif
 	}
-	
-	void DownloadCtrlRemoveSource(const CUpDownClient* NOT_ON_DAEMON(source), const CPartFile* NOT_ON_DAEMON(owner))
-	{
-#ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
-			if ((owner == NULL) || owner->ShowSources()) {
-				theApp->amuledlg->m_transferwnd->downloadlistctrl->RemoveSource(source, owner);
-			}
-		}
-#endif
-	}
-	
-	void DownloadCtrlHideSource(CPartFile* NOT_ON_DAEMON(file))
-	{
-#ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->downloadlistctrl) {
-			theApp->amuledlg->m_transferwnd->downloadlistctrl->ShowSources(file, false);
-		}
-#endif
-	}
 
 	void DownloadCtrlSort()
 	{
@@ -341,35 +405,6 @@
 #endif
 	}
 	
-	
-	void ClientCtrlAddClient(CUpDownClient* NOT_ON_DAEMON(client), ViewType NOT_ON_DAEMON(type))
-	{
-#ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
-			theApp->amuledlg->m_transferwnd->clientlistctrl->InsertClient(client, type);
-		}
-#endif
-	}
-	
-	void ClientCtrlRefreshClient(CUpDownClient* NOT_ON_DAEMON(client), ViewType NOT_ON_DAEMON(type))
-	{
-#ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
-			theApp->amuledlg->m_transferwnd->clientlistctrl->UpdateClient(client, type);
-		}
-#endif
-	}
-	
-	void ClientCtrlRemoveClient(CUpDownClient* NOT_ON_DAEMON(client), ViewType NOT_ON_DAEMON(type))
-	{
-#ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd && theApp->amuledlg->m_transferwnd->clientlistctrl) {
-			theApp->amuledlg->m_transferwnd->clientlistctrl->RemoveClient(client, type);
-		}
-#endif
-	}
-	
-	
 	void ServerAdd(CServer* NOT_ON_DAEMON(server))
 	{
 #ifndef AMULE_DAEMON
@@ -413,15 +448,6 @@
 #endif
 	}
 	
-	void ServerRefresh(CServer* NOT_ON_DAEMON(server))
-	{
-#ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_serverwnd && theApp->amuledlg->m_serverwnd->serverlistctrl) {
-			theApp->amuledlg->m_serverwnd->serverlistctrl->RefreshServer(server);
-		}
-#endif
-	}
-	
 	void ServerFreeze()
 	{
 #ifndef AMULE_DAEMON
@@ -484,10 +510,12 @@
 			theApp->amuledlg->m_searchwnd->KadSearchEnd(id);
 		}
 #endif
+		theApp->searchlist->SetKadSearchFinished();
 	}
 	
-	void Search_Update_Sources(CSearchFile* NOT_ON_DAEMON(result))
+	void Search_Update_Sources(CSearchFile* result)
 	{
+		result->SetDownloadStatus();
 #ifndef AMULE_DAEMON
 		if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
 			theApp->amuledlg->m_searchwnd->UpdateResult(result);
@@ -505,15 +533,6 @@
 	}
 
 	
-	void ChatRefreshFriend(uint32 NOT_ON_DAEMON(lastUsedIP), uint32 NOT_ON_DAEMON(lastUsedPort), wxString NOT_ON_DAEMON(name))
-	{
-#ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_chatwnd) {
-			theApp->amuledlg->m_chatwnd->RefreshFriend(CMD4Hash(), name, lastUsedIP, lastUsedPort);
-		}
-#endif
-	}
-	
 	void ChatConnResult(bool NOT_ON_DAEMON(success), uint64 NOT_ON_DAEMON(id), wxString NOT_ON_DAEMON(message))
 	{
 #ifndef AMULE_DAEMON
@@ -533,23 +552,20 @@
 	}
 	
 
-	void ShowConnState(long NOT_ON_DAEMON(state))
+	void ChatSendCaptcha(wxString NOT_ON_DAEMON(captcha), uint64 NOT_ON_DAEMON(to_id))
 	{
 #ifndef AMULE_DAEMON
-#ifdef CLIENT_GUI
-		theApp->m_ConnState = state;
-#endif
-		
-		theApp->amuledlg->ShowConnectionState();
+		if (theApp->amuledlg->m_chatwnd) {
+			theApp->amuledlg->m_chatwnd->SendMessage(captcha, wxEmptyString, to_id);
+		}
 #endif
 	}
 	
-	void ShowQueueCount(uint32 NOT_ON_DAEMON(count))
+
+	void ShowConnState(long NOT_ON_DAEMON(forceUpdate))
 	{
 #ifndef AMULE_DAEMON
-		if (theApp->amuledlg->m_transferwnd) {
-			theApp->amuledlg->m_transferwnd->ShowQueueCount(count);
-		}
+		theApp->amuledlg->ShowConnectionState(forceUpdate != 0);
 #endif
 	}
 	
@@ -561,14 +577,6 @@
 		}
 #endif
 	}
-	
-	void ShowGUI()
-	{
-#ifndef AMULE_DAEMON
-		theApp->amuledlg->Iconize(false);
-#endif
-	}
-	
 
 	void CategoryAdded()
 	{
@@ -592,9 +600,18 @@
 #endif
 	}
 	
-	void CategoryDelete(uint32 NOT_ON_DAEMON(cat))
+	void CategoryDelete(uint32 cat)
 	{
-#ifndef AMULE_DAEMON
+#ifdef AMULE_DAEMON
+		if (cat > 0) {
+			theApp->downloadqueue->ResetCatParts(cat);
+			theApp->glob_prefs->RemoveCat(cat);
+			if ( theApp->glob_prefs->GetCatCount() == 1 ) {
+				thePrefs::SetAllcatFilter( acfAll );
+			}
+			theApp->glob_prefs->SaveCats();
+		}
+#else
 		if (theApp->amuledlg->m_transferwnd) {
 			theApp->amuledlg->m_transferwnd->RemoveCategory(cat);
 		}
@@ -607,9 +624,7 @@
 		if ((file->GetStatus(false) == PS_READY || file->GetStatus(false) == PS_EMPTY)) {
 			CPartFile::SourceSet::const_iterator it = file->GetA4AFList().begin();
 			for ( ; it != file->GetA4AFList().end(); ) {
-				CUpDownClient *cur_source = *it++;
-
-				cur_source->SwapToAnotherFile(true, false, false, file);
+				it++->SwapToAnotherFile(true, false, false, file);
 			}
 		}
 	}
@@ -624,9 +639,7 @@
 		if ((file->GetStatus(false) == PS_READY) || (file->GetStatus(false) == PS_EMPTY)) {
 			CPartFile::SourceSet::const_iterator it = file->GetSourceList().begin();
 			for( ; it != file->GetSourceList().end(); ) {
-				CUpDownClient* cur_source = *it++;
-
-				cur_source->SwapToAnotherFile(false, false, false, NULL);
+				it++->SwapToAnotherFile(false, false, false, NULL);
 			}
 		}
 	}
@@ -680,9 +693,10 @@
 		file->UpdateAutoUpPriority();
 	}
 	
-	void KnownFile_Comment_Set(CKnownFile* file, wxString comment)
+	void KnownFile_Comment_Set(CKnownFile* file, wxString comment, int8 rating)
 	{
-		file->SetFileComment(comment);
+		file->SetFileCommentRating(comment, rating);
+		SharedFilesUpdateItem(file);
 	}
 	
 
@@ -696,6 +710,63 @@
 		theApp->downloadqueue->SetCatStatus(cat, newstatus);
 	}
 
-#endif	// #ifdef CLIENT_GUI
+	void Upload_Resort_Queue()
+	{
+		theApp->uploadqueue->ResortQueue();
+	}
+
+	void IPFilter_Reload()
+	{
+		theApp->ipfilter->Reload();
+	}
+
+	void IPFilter_Update(wxString url)
+	{
+		theApp->ipfilter->Update(url);
+	}
+
+	void Client_Delete(CClientRef client)
+	{
+		client.Safe_Delete();
+	}
+
+#ifndef AMULE_DAEMON
+	void ConvertUpdateProgress(float percent, wxString text, wxString header)
+	{
+		CPartFileConvertDlg::UpdateProgress(percent, text, header);
+	}
+
+	void ConvertUpdateJobInfo(ConvertInfo info)
+	{
+		CPartFileConvertDlg::UpdateJobInfo(info);
+	}
+
+	void ConvertRemoveJobInfo(unsigned id)
+	{
+		CPartFileConvertDlg::RemoveJobInfo(id);
+	}
+
+	void ConvertClearInfos()
+	{
+		CPartFileConvertDlg::ClearInfo();
+	}
+
+	void ConvertRemoveJob(unsigned id)
+	{
+		CPartFileConvert::RemoveJob(id);
+	}
+
+	void ConvertRetryJob(unsigned id)
+	{
+		CPartFileConvert::RetryJob(id);
+	}
+
+	void ConvertReaddAllJobs()
+	{
+		CPartFileConvert::ReaddAllJobs();
+	}
+#endif	// #ifndef AMULE_DAEMON
+
+#endif	// #ifndef CLIENT_GUI
 }
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/GuiEvents.h -> aMule-2.3.1.tar.bz2/src/GuiEvents.h Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2004-2009 Angel Vidal Veiga (kry@users.sourceforge.net)
-// Copyright (c) 2004-2009 Froenchenko Leonid (lfroen@users.sourceforge.net)
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 Froenchenko Leonid (lfroen@users.sourceforge.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -27,7 +27,7 @@
 #ifndef GUIEVENTS_H
 #define GUIEVENTS_H
 
-#include <wx/app.h>
+#include <wx/event.h>
 
 #include "Types.h"
 #include "Constants.h"
@@ -38,6 +38,8 @@
 class CSearchFile;
 class CPartFile;
 class CServer;
+class CFriend;
+class CClientRef;
 
 
 DECLARE_LOCAL_EVENT_TYPE(MULE_EVT_NOTIFY, -1)
@@ -84,16 +86,18 @@
 	void SharedFilesUpdateItem(CKnownFile* file);
 
 	void DownloadCtrlUpdateItem(const void* item);
+	void SourceCtrlUpdateSource(uint32 source, SourceItemType type);
 	void DownloadCtrlAddFile(CPartFile* file);
-	void DownloadCtrlAddSource(CPartFile* owner, CUpDownClient* source, DownloadItemType type);
+	void SourceCtrlAddSource(CPartFile* owner, CClientRef source, SourceItemType type);
 	void DownloadCtrlRemoveFile(CPartFile* file);
-	void DownloadCtrlRemoveSource(const CUpDownClient* source, const CPartFile* owner);
+	void SourceCtrlRemoveSource(uint32 source, const CPartFile* owner);
 	void DownloadCtrlHideSource(CPartFile* file);
 	void DownloadCtrlSort();
+	void DownloadCtrlDoItemSelectionChanged();
 
-	void ClientCtrlAddClient(CUpDownClient* client, ViewType type);
-	void ClientCtrlRefreshClient(CUpDownClient* client, ViewType type);
-	void ClientCtrlRemoveClient(CUpDownClient* client, ViewType type);
+	void SharedCtrlAddClient(CKnownFile* owner, CClientRef client, SourceItemType type);
+	void SharedCtrlRefreshClient(uint32 client, SourceItemType type);
+	void SharedCtrlRemoveClient(uint32 client, const CKnownFile* owner);
 
 	void ServerAdd(CServer* server);
 	void ServerRemove(CServer* server);
@@ -112,13 +116,14 @@
 	void Search_Update_Sources(CSearchFile* result);
 	void Search_Add_Result(CSearchFile* result);
 
-	void ChatRefreshFriend(uint32 lastUsedIP, uint32 lastUsedPort, wxString name);
+	void ChatUpdateFriend(CFriend* Friend);
+	void ChatRemoveFriend(CFriend* Friend);
 	void ChatConnResult(bool success, uint64 id, wxString message);
 	void ChatProcessMsg(uint64 sender, wxString message);
+	void ChatSendCaptcha(wxString captcha, uint64 to_id);
 	
 	void ShowConnState(long state);
 	void ShowUserCount(wxString str);
-	void ShowQueueCount(uint32 count);
 	void ShowUpdateCatTabTitles();
 	void ShowGUI();
 
@@ -156,7 +161,7 @@
 
 	void KnownFile_Up_Prio_Set(CKnownFile* file, uint8 val);
 	void KnownFile_Up_Prio_Auto(CKnownFile* file);
-	void KnownFile_Comment_Set(CKnownFile* file, wxString comment);
+	void KnownFile_Comment_Set(CKnownFile* file, wxString comment, int8 rating);
 
 	void Search_Add_Download(CSearchFile* result, uint8 category);
 	void Search_Update_Progress(uint32 value);
@@ -164,6 +169,15 @@
 	void Download_Set_Cat_Prio(uint8 cat, uint8 newprio);
 	void Download_Set_Cat_Status(uint8 cat, int newstatus);
 
+	void Upload_Resort_Queue();
+
+	void Client_Delete(CClientRef client);
+
+	//
+	// Notifications that always create an event
+	//
+	void IPFilter_Reload();
+	void IPFilter_Update(wxString url);
 
 	////////////////////////////////////////////////////////////
 	// Notification utilities
@@ -391,6 +405,28 @@
 		HandleNotification(CMuleNotifier3<A1A, A2A, A3A>(func, arg1, arg2, arg3));
 	}
 	//@}
+
+	/**
+	 * The same as above, but these functions will always send an event,
+	 * even from the main thread.
+	 */
+	void HandleNotificationAlways(const CMuleNotiferBase& ntf);
+	
+	inline void DoNotifyAlways(void (*func)()) {
+		HandleNotificationAlways(CMuleNotifier0(func));
+	}
+	template <typename A1A, typename A1B>
+	inline void DoNotifyAlways(void (*func)(A1A), A1B arg1) {
+		HandleNotificationAlways(CMuleNotifier1<A1A>(func, arg1));
+	}
+	template <typename A1A, typename A1B, typename A2A, typename A2B>
+	inline void DoNotifyAlways(void (*func)(A1A, A2A), A1B arg1, A2B arg2) {
+		HandleNotificationAlways(CMuleNotifier2<A1A, A2A>(func, arg1, arg2));
+	}
+	template <typename A1A, typename A1B, typename A2A, typename A2B, typename A3A, typename A3B>
+	inline void DoNotifyAlways(void (*func)(A1A, A2A, A3A), A1B arg1, A2B arg2, A3B arg3) {
+		HandleNotificationAlways(CMuleNotifier3<A1A, A2A, A3A>(func, arg1, arg2, arg3));
+	}
 }
 
 
@@ -420,26 +456,19 @@
 // download ctrl
 #define Notify_DownloadCtrlUpdateItem(ptr)		MuleNotify::DoNotify(&MuleNotify::DownloadCtrlUpdateItem, ptr)
 #define Notify_DownloadCtrlAddFile(file)		MuleNotify::DoNotify(&MuleNotify::DownloadCtrlAddFile, file)
-#define Notify_DownloadCtrlAddSource(p0, p1, val)	MuleNotify::DoNotify(&MuleNotify::DownloadCtrlAddSource, p0, p1, val)
 #define Notify_DownloadCtrlRemoveFile(file)		MuleNotify::DoNotify(&MuleNotify::DownloadCtrlRemoveFile, file)
-#define Notify_DownloadCtrlRemoveSource(ptr0, ptr1)	MuleNotify::DoNotify(&MuleNotify::DownloadCtrlRemoveSource, ptr0, ptr1)
-#define Notify_DownloadCtrlHideSource(ptr)		MuleNotify::DoNotify(&MuleNotify::DownloadCtrlHideSource, ptr)
 #define Notify_DownloadCtrlSort()			MuleNotify::DoNotify(&MuleNotify::DownloadCtrlSort)
+#define Notify_DownloadCtrlDoItemSelectionChanged()	MuleNotify::DoNotifyAlways(&MuleNotify::DownloadCtrlDoItemSelectionChanged)
 
-// upload ctrl
-#define Notify_UploadCtrlAddClient(ptr)			MuleNotify::DoNotify(&MuleNotify::ClientCtrlAddClient, ptr, vtUploading)
-#define Notify_UploadCtrlRefreshClient(ptr)		MuleNotify::DoNotify(&MuleNotify::ClientCtrlRefreshClient, ptr, vtUploading)
-#define Notify_UploadCtrlRemoveClient(ptr)		MuleNotify::DoNotify(&MuleNotify::ClientCtrlRemoveClient, ptr, vtUploading)
-
-// client ctrl
-#define Notify_ClientCtrlAddClient(ptr)			MuleNotify::DoNotify(&MuleNotify::ClientCtrlAddClient, ptr, vtClients)
-#define Notify_ClientCtrlRefreshClient(ptr)		MuleNotify::DoNotify(&MuleNotify::ClientCtrlRefreshClient, ptr, vtClients)
-#define Notify_ClientCtrlRemoveClient(ptr)		MuleNotify::DoNotify(&MuleNotify::ClientCtrlRemoveClient, ptr, vtClients)
+// source ctrl
+#define Notify_SourceCtrlUpdateSource(ptr, val)		MuleNotify::DoNotify(&MuleNotify::SourceCtrlUpdateSource, ptr, val)
+#define Notify_SourceCtrlAddSource(p0, p1, val)	MuleNotify::DoNotify(&MuleNotify::SourceCtrlAddSource, p0, p1, val)
+#define Notify_SourceCtrlRemoveSource(ptr0, ptr1)	MuleNotify::DoNotify(&MuleNotify::SourceCtrlRemoveSource, ptr0, ptr1)
 
-// queue list
-#define Notify_QlistAddClient(ptr)			MuleNotify::DoNotify(&MuleNotify::ClientCtrlAddClient, ptr, vtQueued)
-#define Notify_QlistRefreshClient(ptr)			MuleNotify::DoNotify(&MuleNotify::ClientCtrlRefreshClient, ptr, vtQueued)
-#define Notify_QlistRemoveClient(ptr)			MuleNotify::DoNotify(&MuleNotify::ClientCtrlRemoveClient, ptr, vtQueued)
+// upload ctrl
+#define Notify_SharedCtrlAddClient(p0, p1, val)			MuleNotify::DoNotify(&MuleNotify::SharedCtrlAddClient, p0, p1, val)
+#define Notify_SharedCtrlRefreshClient(ptr, val)		MuleNotify::DoNotify(&MuleNotify::SharedCtrlRefreshClient, ptr, val)
+#define Notify_SharedCtrlRemoveClient(p0, p1)		MuleNotify::DoNotify(&MuleNotify::SharedCtrlRemoveClient, p0, p1)
 
 // server
 #define Notify_ServerAdd(ptr)				MuleNotify::DoNotify(&MuleNotify::ServerAdd, ptr)
@@ -461,14 +490,15 @@
 #define Notify_Search_Add_Result(s)			MuleNotify::DoNotify(&MuleNotify::Search_Add_Result, s)
 
 // chat
-#define Notify_ChatRefreshFriend(val0, val1, s)		MuleNotify::DoNotify(&MuleNotify::ChatRefreshFriend, val0, val1, s)
+#define Notify_ChatUpdateFriend(ptr)			MuleNotify::DoNotify(&MuleNotify::ChatUpdateFriend, ptr)
+#define Notify_ChatRemoveFriend(ptr)			MuleNotify::DoNotify(&MuleNotify::ChatRemoveFriend, ptr)
 #define Notify_ChatConnResult(val0, val1, s)		MuleNotify::DoNotify(&MuleNotify::ChatConnResult, val0, val1, s)
 #define Notify_ChatProcessMsg(val0, s)			MuleNotify::DoNotify(&MuleNotify::ChatProcessMsg, val0, s)
+#define Notify_ChatSendCaptcha(val0, s)			MuleNotify::DoNotify(&MuleNotify::ChatSendCaptcha, val0, s)
 
 // misc
 #define Notify_ShowConnState(val)			MuleNotify::DoNotify(&MuleNotify::ShowConnState, val)
 #define Notify_ShowUserCount(str)			MuleNotify::DoNotify(&MuleNotify::ShowUserCount, str)
-#define Notify_ShowQueueCount(val)			MuleNotify::DoNotify(&MuleNotify::ShowQueueCount, val)
 #define Notify_ShowUpdateCatTabTitles()			MuleNotify::DoNotify(&MuleNotify::ShowUpdateCatTabTitles)
 #define Notify_ShowGUI()				MuleNotify::DoNotify(&MuleNotify::ShowGUI)
 
@@ -511,7 +541,7 @@
 // KnownFile
 #define CoreNotify_KnownFile_Up_Prio_Set(ptr, val)	MuleNotify::DoNotify(&MuleNotify::KnownFile_Up_Prio_Set, ptr, val)
 #define CoreNotify_KnownFile_Up_Prio_Auto(ptr)		MuleNotify::DoNotify(&MuleNotify::KnownFile_Up_Prio_Auto, ptr)
-#define CoreNotify_KnownFile_Comment_Set(ptr, val)	MuleNotify::DoNotify(&MuleNotify::KnownFile_Comment_Set, ptr, val)
+#define CoreNotify_KnownFile_Comment_Set(ptr, v0, v1)	MuleNotify::DoNotify(&MuleNotify::KnownFile_Comment_Set, ptr, v0, v1)
 
 // Search
 #define CoreNotify_Search_Add_Download(ptr, val)	MuleNotify::DoNotify(&MuleNotify::Search_Add_Download, ptr, val)
@@ -521,6 +551,20 @@
 #define CoreNotify_Download_Set_Cat_Prio(cat, pri)	MuleNotify::DoNotify(&MuleNotify::Download_Set_Cat_Prio, cat, pri)
 #define CoreNotify_Download_Set_Cat_Status(cat, st)	MuleNotify::DoNotify(&MuleNotify::Download_Set_Cat_Status, cat, st)
 
+// upload queue
+#define CoreNotify_Upload_Resort_Queue()			MuleNotify::DoNotify(&MuleNotify::Upload_Resort_Queue)
+
+// client
+#define CoreNotify_Client_Delete(client)			MuleNotify::DoNotify(&MuleNotify::Client_Delete, client)
+
+//
+// Notifications that always create an event
+//
+
+// IP filter
+#define NotifyAlways_IPFilter_Reload()			MuleNotify::DoNotifyAlways(&MuleNotify::IPFilter_Reload)
+#define NotifyAlways_IPFilter_Update(url)		MuleNotify::DoNotifyAlways(&MuleNotify::IPFilter_Update, url)
+
 #endif // __GUIEVENTS_H__
 
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/HTTPDownload.cpp -> aMule-2.3.1.tar.bz2/src/HTTPDownload.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Tiku
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2002-2011 Timo Kujala ( tiku@users.sourceforge.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -35,6 +35,8 @@
 #include <common/Format.h>				// Needed for CFormat
 #include "InternalEvents.h"				// Needed for CMuleInternalEvent
 #include "Preferences.h"
+#include "ScopedPtr.h"
+#include <wx/filename.h>				// Needed for wxFileName
 
 
 #ifndef AMULE_DAEMON
@@ -72,7 +74,7 @@
 	}	
 
 	void UpdateGauge(int total, int current) {
-		CFormat label(_("( %s / %s )"));
+		CFormat label( wxT("( %s / %s )") );
 		
 		label % CastItoXBytes(current);
 		if (total > 0) {
@@ -104,7 +106,7 @@
 	}
 
 	void OnBtnCancel(wxCommandEvent& WXUNUSED(evt)) {
-		printf("HTTP download cancelled\n");
+		AddLogLineN(_("HTTP download cancelled"));
 		Show(false);
 		StopThread();
 	}
@@ -138,7 +140,8 @@
 #endif
 
 
-CHTTPDownloadThread::CHTTPDownloadThread(const wxChar* url, const wxChar* filename, HTTP_Download_File file_id, bool showDialog)
+CHTTPDownloadThread::CHTTPDownloadThread(const wxString& url, const wxString& filename, const wxString& oldfilename, HTTP_Download_File file_id,
+										bool showDialog, bool checkDownloadNewer)
 #ifdef AMULE_DAEMON
 	: CMuleThread(wxTHREAD_DETACHED),
 #else
@@ -157,6 +160,28 @@
 		m_companion = dialog;
 #endif
 	}
+	// Get the date on which the original file was last modified
+	// Only if it's the same URL we used for the last download and if the file exists.
+	if (checkDownloadNewer && thePrefs::GetLastHTTPDownloadURL(file_id) == url) {
+		wxFileName origFile = wxFileName(oldfilename);
+		if (origFile.FileExists()) {
+			AddDebugLogLineN(logHTTP, CFormat(wxT("URL %s matches and file %s exists, only download if newer")) % url % oldfilename);
+			m_lastmodified = origFile.GetModificationTime();
+		}
+	}
+	wxMutexLocker lock(s_allThreadsMutex);
+	s_allThreads.insert(this);
+}
+
+
+// Format the given date to a RFC-2616 compliant HTTP date
+// Example: Thu, 14 Jan 2010 15:40:23 GMT
+wxString CHTTPDownloadThread::FormatDateHTTP(const wxDateTime& date)
+{
+	static const wxChar* s_months[] = { wxT("Jan"), wxT("Feb"), wxT("Mar"), wxT("Apr"), wxT("May"), wxT("Jun"), wxT("Jul"), wxT("Aug"), wxT("Sep"), wxT("Oct"), wxT("Nov"), wxT("Dec") };
+	static const wxChar* s_dow[] = { wxT("Sun"), wxT("Mon"), wxT("Tue"), wxT("Wed"), wxT("Thu"), wxT("Fri"), wxT("Sat") };
+
+	return CFormat(wxT("%s, %02d %s %d %02d:%02d:%02d GMT")) % s_dow[date.GetWeekDay(wxDateTime::UTC)] % date.GetDay(wxDateTime::UTC) % s_months[date.GetMonth(wxDateTime::UTC)] % date.GetYear(wxDateTime::UTC) % date.GetHour(wxDateTime::UTC) % date.GetMinute(wxDateTime::UTC) % date.GetSecond(wxDateTime::UTC);
 }
 
 
@@ -167,46 +192,60 @@
 	}
 	
 	wxHTTP* url_handler = NULL;
-	wxInputStream* url_read_stream = NULL;
 	
-	printf("HTTP download thread started\n");
+	AddDebugLogLineN(logHTTP, wxT("HTTP download thread started"));
 	
 	const CProxyData* proxy_data = thePrefs::GetProxyData();
 	bool use_proxy = proxy_data != NULL && proxy_data->m_proxyEnable;
 	
 	try {	
 		wxFFileOutputStream outfile(m_tempfile);
-		
+
 		if (!outfile.Ok()) {
-			throw wxString(CFormat(wxT("Unable to create destination file %s for download!\n")) % m_tempfile);
+			throw wxString(CFormat(_("Unable to create destination file %s for download!")) % m_tempfile);
 		}
-			
-		if ( m_url.IsEmpty() ) {
+
+		if (m_url.IsEmpty()) {
 			// Nowhere to download from!
-			throw wxString(wxT("The URL to download can't be empty\n"));
+			throw wxString(_("The URL to download can't be empty"));
 		}
 
 		url_handler = new wxHTTP;
 		url_handler->SetProxyMode(use_proxy);
-	
-		url_read_stream = GetInputStream(&url_handler, m_url, use_proxy);
-		
-		if (!url_read_stream) {
-			throw wxString(CFormat(wxT("The URL %s returned: %i - Error (%i)!")) % m_url % url_handler->GetResponse() % url_handler->GetError());
+
+		// Build a conditional get request if the last modified date of the file being updated is known
+		if (m_lastmodified.IsValid()) {
+			// Set a flag in the HTTP header that we only download if the file is newer.
+			// see: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.25
+			AddDebugLogLineN(logHTTP, wxT("If-Modified-Since: ") + FormatDateHTTP(m_lastmodified));
+			url_handler->SetHeader(wxT("If-Modified-Since"), FormatDateHTTP(m_lastmodified));
 		}
-		
+
+		CScopedPtr<wxInputStream> url_read_stream(GetInputStream(url_handler, m_url, use_proxy));
+
+		if (!url_read_stream.get()) {
+			if (m_response == 304) {
+				m_result = HTTP_Skipped;
+				AddDebugLogLineN(logHTTP, wxT("Skipped download because requested file is not newer."));
+				throw wxString(wxEmptyString);
+			} else {
+				m_result = HTTP_Error;
+				throw wxString(CFormat(_("The URL %s returned: %i - Error (%i)!")) % m_url % m_response % m_error);
+			}
+		}
+
 		int download_size = url_read_stream->GetSize();
 		if (download_size == -1) {
-			printf("Download size not received, downloading until connection is closed\n");
+			AddDebugLogLineN(logHTTP, wxT("Download size not received, downloading until connection is closed"));
 		} else {
-			printf("Download size: %i\n", download_size);
+			AddDebugLogLineN(logHTTP, CFormat(wxT("Download size: %i")) % download_size);
 		}
-		
+
 		// Here is our read buffer
 		// <ken> Still, I'm sure 4092 is probably a better size.
-		// MP: Most people can download at least at 32kbs/s from http...
+		// MP: Most people can download at least at 32kb/s from http...
 		const unsigned MAX_HTTP_READ = 32768;
-		
+
 		char buffer[MAX_HTTP_READ];
 		int current_read = 0;
 		int total_read = 0;
@@ -218,7 +257,7 @@
 				outfile.Write(buffer,current_read);
 				int current_write = outfile.LastWrite();
 				if (current_read != current_write) {
-					throw wxString(wxT("Critical error while writing downloaded file"));
+					throw wxString(_("Critical error while writing downloaded file"));
 				} else if (m_companion) {
 #ifndef AMULE_DAEMON
 					CMuleInternalEvent evt(wxEVT_HTTP_PROGRESS);
@@ -233,30 +272,35 @@
 		if (current_read == 0) {
 			if (download_size == -1) {
 				// Download was probably succesful.
-				printf("Downloaded %d bytes\n", total_read);
-				m_result = 1;
+				AddLogLineN(CFormat(_("Downloaded %d bytes")) % total_read);
+				m_result = HTTP_Success;
 			} else if (total_read != download_size) {
+				m_result = HTTP_Error;
 				throw wxString(CFormat(_("Expected %d bytes, but downloaded %d bytes")) % download_size % total_read);
 			} else {
 				// Download was succesful.
-				m_result = 1;
+				m_result = HTTP_Success;
 			}
 		}
 	} catch (const wxString& error) {
 		if (wxFileExists(m_tempfile)) {
 			wxRemoveFile(m_tempfile);
 		}
+		if (!error.IsEmpty()) {
+			AddLogLineC(error);
+		}
+	}
 
-		AddLogLineM(false, error);
+	if (m_result == HTTP_Success) {
+		thePrefs::SetLastHTTPDownloadURL(m_file_id, m_url);
 	}
 
-	delete url_read_stream;
 	if (url_handler) {
 		url_handler->Destroy();
 	}
-	
-	printf("HTTP download thread ended\n");
-	
+
+	AddDebugLogLineN(logHTTP, wxT("HTTP download thread ended"));
+
 	return 0;
 }
 
@@ -275,11 +319,13 @@
 	evt.SetInt((int)m_file_id);
 	evt.SetExtraLong((long)m_result);
 	wxPostEvent(wxTheApp, evt);
+	wxMutexLocker lock(s_allThreadsMutex);
+	s_allThreads.erase(this);
 }
 
 
 //! This function's purpose is to handle redirections in a proper way.
-wxInputStream* CHTTPDownloadThread::GetInputStream(wxHTTP** url_handler, const wxString& location, bool proxy)
+wxInputStream* CHTTPDownloadThread::GetInputStream(wxHTTP * & url_handler, const wxString& location, bool proxy)
 {
 	if (TestDestroy()) {
 		return NULL;
@@ -287,14 +333,14 @@
 	
 	if (!location.StartsWith(wxT("http://"))) {
 		// This is not a http url
-		throw wxString(wxT("Invalid URL for http download or http redirection (did you forget 'http://' ?)"));
+		throw wxString(_("Invalid URL for HTTP download or HTTP redirection (did you forget 'http://' ?)"));
 	}
-	
+
 	// Get the host
-	
+
 	// Remove the "http://"
 	wxString host = location.Right(location.Len() - 7); // strlen("http://") -> 7
-	
+
 	// I belive this is a bug...
 	// Sometimes "Location" header looks like this:
 	// "http://www.whatever.com:8080http://www.whatever.com/downloads/something.zip"
@@ -318,7 +364,7 @@
 
 	// Build the cleaned url now
 	wxString url = wxT("http://") + host + wxT("/") + location_url;			
-	
+
 	int port = 80;
 	if (host.Find(wxT(':')) != -1) {
 		// This http url has a port
@@ -329,48 +375,79 @@
 	wxIPV4address addr;
 	addr.Hostname(host);
 	addr.Service(port);
-	if (!(*url_handler)->Connect(addr, true)) {
-		throw wxString(wxT("Unable to connect to http download server"));		
+	if (!url_handler->Connect(addr, true)) {
+		throw wxString(_("Unable to connect to HTTP download server"));		
 	}
 
-	wxInputStream* url_read_stream = (*url_handler)->GetInputStream(url);
+	wxInputStream* url_read_stream = url_handler->GetInputStream(url);
+
+	/* store the HTTP response code */
+	m_response = url_handler->GetResponse();
+
+	/* store the HTTP error code */
+	m_error = url_handler->GetError();
 
-	printf("Host: %s:%i\n",(const char*)unicode2char(host),port);
-	printf("URL: %s\n",(const char*)unicode2char(url));
-	printf("Response: %i (Error: %i)\n",(*url_handler)->GetResponse(), (*url_handler)->GetError());
+	AddDebugLogLineN(logHTTP, CFormat(wxT("Host: %s:%i\n")) % host % port);
+	AddDebugLogLineN(logHTTP, CFormat(wxT("URL: %s\n")) % url);
+	AddDebugLogLineN(logHTTP, CFormat(wxT("Response: %i (Error: %i)")) % m_response % m_error);
 
-	if (!(*url_handler)->GetResponse()) {
-		printf("WARNING: Void response on stream creation\n");
+	if (!m_response) {
+		AddDebugLogLineC(logHTTP, wxT("WARNING: Void response on stream creation"));
 		// WTF? Why does this happen?
 		// This is probably produced by an already existing connection, because
 		// the input stream is created nevertheless. However, data is not the same.
 		delete url_read_stream;
-		throw wxString(wxT("Invalid response from http download server"));
+		throw wxString(_("Invalid response from HTTP download server"));
 	}
 
-	if ((*url_handler)->GetResponse() == 301  // Moved permanently
-		|| (*url_handler)->GetResponse() == 302 // Moved temporarily
+	if (m_response == 301  // Moved permanently
+		|| m_response == 302 // Moved temporarily
 		// What about 300 (multiple choices)? Do we have to handle it?
-		) { 
-		
+		) {
+
 		// We have to remove the current stream.
 		delete url_read_stream;
-			
-		wxString new_location = (*url_handler)->GetHeader(wxT("Location"));
-		
-		(*url_handler)->Destroy();
+
+		wxString new_location = url_handler->GetHeader(wxT("Location"));
+
+		url_handler->Destroy();
 		if (!new_location.IsEmpty()) {
-			(*url_handler) = new wxHTTP;
-			(*url_handler)->SetProxyMode(proxy);
+			url_handler = new wxHTTP;
+			url_handler->SetProxyMode(proxy);
+			if (m_lastmodified.IsValid()) {
+				// Set a flag in the HTTP header that we only download if the file is newer.
+				// see: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.25
+				url_handler->SetHeader(wxT("If-Modified-Since"), FormatDateHTTP(m_lastmodified));
+			}
 			url_read_stream = GetInputStream(url_handler, new_location, proxy);
 		} else {
-			printf("ERROR: Redirection code received with no URL\n");
+			AddDebugLogLineC(logHTTP, wxT("ERROR: Redirection code received with no URL"));
 			url_handler = NULL;
 			url_read_stream = NULL;
 		}
+	} else if (m_response == 304) {		// "Not Modified"
+		delete url_read_stream;
+		url_handler->Destroy();
+		url_read_stream = NULL;
+		url_handler = NULL;
 	}
-		
+
 	return url_read_stream;
 }
 
+void CHTTPDownloadThread::StopAll()
+{
+	ThreadSet allThreads;
+	{
+		wxMutexLocker lock(s_allThreadsMutex);
+		std::swap(allThreads, s_allThreads);
+	}
+	for (ThreadSet::iterator it = allThreads.begin(); it != allThreads.end(); it++) {
+		(*it)->Stop();
+	}
+}
+
+CHTTPDownloadThread::ThreadSet CHTTPDownloadThread::s_allThreads;
+wxMutex CHTTPDownloadThread::s_allThreadsMutex;
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/HTTPDownload.h -> aMule-2.3.1.tar.bz2/src/HTTPDownload.h Changed

@@ -1,8 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Tiku & Hetfield ( hetfield@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2002-2011 Timo Kujala ( tiku@users.sourceforge.net )
+// Copyright (c) 2002-2011 Patrizio Bassi ( hetfield@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
@@ -26,31 +27,47 @@
 #ifndef HTTPDOWNLOAD_H
 #define HTTPDOWNLOAD_H
 
-#include "GuiEvents.h"	// Needed for HTTP_Download_File
-#include "MuleThread.h"	// Needed for CMuleThread
+#include "GuiEvents.h"		// Needed for HTTP_Download_File
+#include "MuleThread.h"		// Needed for CMuleThread
+#include <wx/datetime.h>	// Needed for wxDateTime
+#include <set>
 
 class wxEvtHandler;
 class wxHTTP;
 class wxInputStream;
 
+enum HTTPDownloadResult {
+	HTTP_Success = 0,
+	HTTP_Error,
+	HTTP_Skipped
+};
 
 class CHTTPDownloadThread : public CMuleThread
 {
 public:
-	/** Note: wxChar* is used to circument the thread-unsafe wxString reference counting. */
-	CHTTPDownloadThread(const wxChar* url, const wxChar* filename, HTTP_Download_File file_id, bool showDialog = true);
+	/** Note: wxChar* is used to circumvent the thread-unsafe wxString reference counting. */
+	CHTTPDownloadThread(const wxString& url, const wxString& filename, const wxString& oldfilename, HTTP_Download_File file_id, 
+						bool showDialog, bool checkDownloadNewer);
 
+	static void StopAll();
 private:
 	ExitCode		Entry();
 	virtual void 		OnExit();
 
 	wxString		m_url;
 	wxString		m_tempfile;
+	wxDateTime		m_lastmodified;	//! Date on which the file being updated was last modified.
 	int			m_result;
+	int			m_response;	//! HTTP response code (e.g. 200)
+	int			m_error;	//! Additional error code (@see wxProtocol class)
 	HTTP_Download_File	m_file_id;
 	wxEvtHandler*		m_companion;
+	typedef std::set<CHTTPDownloadThread *>	ThreadSet;
+	static ThreadSet	s_allThreads;
+	static wxMutex		s_allThreadsMutex;
 
-	wxInputStream* GetInputStream(wxHTTP** url_handler, const wxString& location, bool proxy);
+	wxInputStream* GetInputStream(wxHTTP * & url_handler, const wxString& location, bool proxy);
+	static wxString FormatDateHTTP(const wxDateTime& date);
 };
 
 #endif // HTTPDOWNLOAD_H

aMule-2.2.6.tar.bz2/src/IP2Country.cpp -> aMule-2.3.1.tar.bz2/src/IP2Country.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2006-2009 Marcelo Roberto Jimenez ( phoenix@amule.org )
-// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Marcelo Roberto Jimenez ( phoenix@amule.org )
+// Copyright (c) 2006-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
@@ -40,75 +40,147 @@
 // Contact: mjames@gmail.com
 //
 
+#ifdef HAVE_CONFIG_H
+#	include "config.h"		// Needed for ENABLE_IP2COUNTRY
+#endif
+
+#ifdef _MSC_VER
+// For MSVC we need to check here if geoip is available at all. MinGW needs the include below however.
 
+// Block unnecessary includes from GeoIP.h
+#define _WINDOWS_
+#define _WINSOCK2API_
+#define _WS2TCPIP_H_
+#define _WSPIAPI_H_
+#include <GeoIP.h>
+#endif
+
+#ifdef ENABLE_IP2COUNTRY
+
+#include "Preferences.h"	// For thePrefs
+#include "CFile.h"			// For CPath
+#include "HTTPDownload.h"
 #include "Logger.h"			// For AddLogLineM()
 #include <common/Format.h>		// For CFormat()
+#include "common/FileFunctions.h"	// For UnpackArchive
 #include <common/StringFunctions.h>	// For unicode2char()
 #include "pixmaps/flags_xpm/CountryFlags.h"
 
 #include <wx/intl.h>
 #include <wx/image.h>
 
-#ifdef __WXMAC__
-	#include <CoreFoundation/CFBundle.h>
-	#include <wx/mac/corefoundation/cfstring.h>
-#endif
-
 #include <GeoIP.h>
 #include "IP2Country.h"
 
-CIP2Country::CIP2Country()
+CIP2Country::CIP2Country(const wxString& configDir)
 {
 	m_geoip = NULL;
+	m_DataBaseName = wxT("GeoIP.dat");
+	m_DataBasePath = configDir + m_DataBaseName;
+}
+
+void CIP2Country::Enable()
+{
+	Disable();
+
+	if (m_CountryDataMap.empty()) {
+		LoadFlags();
+	}
+
+	if (!CPath::FileExists(m_DataBasePath)) {
+		Update();
+		return;
+	}
+
+	m_geoip = GeoIP_open(unicode2char(m_DataBasePath), GEOIP_STANDARD);
+}
+
+void CIP2Country::Update()
+{
+	AddLogLineN(CFormat(_("Download new GeoIP.dat from %s")) % thePrefs::GetGeoIPUpdateUrl());
+	CHTTPDownloadThread *downloader = new CHTTPDownloadThread(thePrefs::GetGeoIPUpdateUrl(), m_DataBasePath + wxT(".download"), m_DataBasePath, HTTP_GeoIP, true, true);
+	downloader->Create();
+	downloader->Run();
+}
+
+void CIP2Country::Disable()
+{
+	if (m_geoip) {
+		GeoIP_delete(m_geoip);
+		m_geoip = NULL;
+	}
+}
+
+void CIP2Country::DownloadFinished(uint32 result)
+{
+	if (result == HTTP_Success) {
+		Disable();
+		// download succeeded. Switch over to new database.
+		wxString newDat = m_DataBasePath + wxT(".download");
+
+		// Try to unpack the file, might be an archive
+		const wxChar* geoip_files[] = {
+			m_DataBaseName,
+			NULL
+		};
 
-#ifdef __WXMAC__
-	// For the Mac GUI application, look for GeoIP database in the bundle
-	CFURLRef GeoIPDBUrl = CFBundleCopyResourceURL(
-		CFBundleGetMainBundle(),
-		CFSTR("GeoIP"), CFSTR("dat"), CFSTR("GeoIP")
-		);
-	if (GeoIPDBUrl) {
-		CFURLRef absoluteURL =
-			CFURLCopyAbsoluteURL(GeoIPDBUrl);
-		CFRelease(GeoIPDBUrl);
-		if (absoluteURL) {
-			CFStringRef pathString =
-				CFURLCopyFileSystemPath(
-					absoluteURL,
-					kCFURLPOSIXPathStyle);
-			CFRelease(absoluteURL);
-			wxString GeoIPDB = wxMacCFStringHolder(pathString).
-				AsString(wxLocale::GetSystemEncoding());
-
-			m_geoip = GeoIP_open(unicode2char(GeoIPDB),
-					GEOIP_STANDARD);
+		if (UnpackArchive(CPath(newDat), geoip_files).second == EFT_Error) {
+			AddLogLineC(_("Download of GeoIP.dat file failed, aborting update."));
+			return;
+		}
+
+		if (wxFileExists(m_DataBasePath)) {
+			if (!wxRemoveFile(m_DataBasePath)) {
+				AddLogLineC(CFormat(_("Failed to remove %s file, aborting update.")) % m_DataBaseName);
+				return;
+			}
+		}
+
+		if (!wxRenameFile(newDat, m_DataBasePath)) {
+			AddLogLineC(CFormat(_("Failed to rename %s file, aborting update.")) % m_DataBaseName);
+			return;
+		}
+
+		Enable();
+		if (m_geoip) {
+			AddLogLineN(CFormat(_("Successfully updated %s")) % m_DataBaseName);
+		} else {
+			AddLogLineC(_("Error updating GeoIP.dat"));
+		}
+ 	} else if (result == HTTP_Skipped) {
+ 		AddLogLineN(CFormat(_("Skipped download of %s, because requested file is not newer.")) % m_DataBaseName);
+	} else {
+		AddLogLineC(CFormat(_("Failed to download %s from %s")) % m_DataBaseName % thePrefs::GetGeoIPUpdateUrl());
+		// if it failed and there is no database, turn it off
+		if (!wxFileExists(m_DataBasePath)) {
+			thePrefs::SetGeoIPEnabled(false);
 		}
 	}
-#endif
-	if (m_geoip == NULL)
-		m_geoip = GeoIP_new(GEOIP_STANDARD);
-		
+}
+
+void CIP2Country::LoadFlags()
+{
 	// Load data from xpm files
-	for (int i = 0; i < FLAGS_XPM_SIZE; ++i) {
+	for (int i = 0; i < flags::FLAGS_XPM_SIZE; ++i) {
 		CountryData countrydata;
-		countrydata.Name = char2unicode(flagXPMCodeVector[i].code);
-		countrydata.Flag = wxBitmap(flagXPMCodeVector[i].xpm);
+		countrydata.Name = char2unicode(flags::flagXPMCodeVector[i].code);
+		countrydata.Flag = wxImage(flags::flagXPMCodeVector[i].xpm);
 		
 		if (countrydata.Flag.IsOk()) {
 			m_CountryDataMap[countrydata.Name] = countrydata;
 		} else {
-			AddLogLineM(true, _("CIP2Country::CIP2Country(): Failed to load country data from ") + countrydata.Name);
+			AddLogLineC(CFormat(_("Failed to load country data for '%s'.")) % countrydata.Name);
 			continue;
 		}
 	}
-	
-	AddLogLineM(false, CFormat(wxPLURAL("Loaded %d flag bitmap.", "Loaded %d flag bitmaps.", m_CountryDataMap.size())) % m_CountryDataMap.size());
+
+	AddDebugLogLineN(logGeneral, CFormat(wxT("Loaded %d flag bitmaps.")) % m_CountryDataMap.size());  // there's never just one - no plural needed
 }
 
 
 CIP2Country::~CIP2Country()
 {
-	GeoIP_delete(m_geoip);
+	Disable();
 }
 
 
@@ -138,3 +210,23 @@
 	return it->second;	
 }
 
+#else
+
+#include "IP2Country.h"
+
+CIP2Country::CIP2Country(const wxString&)
+{
+	m_geoip = NULL;
+}
+
+CIP2Country::~CIP2Country() {}
+void CIP2Country::Enable() {}
+void CIP2Country::DownloadFinished(uint32) {}
+
+const CountryData& CIP2Country::GetCountryData(const wxString &)
+{
+	static CountryData dummy;
+	return dummy;
+}
+
+#endif // ENABLE_IP2COUNTRY

aMule-2.2.6.tar.bz2/src/IP2Country.h -> aMule-2.3.1.tar.bz2/src/IP2Country.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2006-2009 Marcelo Roberto Jimenez ( phoenix@amule.org )
-// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Marcelo Roberto Jimenez ( phoenix@amule.org )
+// Copyright (c) 2006-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
@@ -43,16 +43,17 @@
 #ifndef IP2COUNTRY_H
 #define IP2COUNTRY_H
 
+#include "Types.h"	// Needed for uint8, uint16 and uint32
 
 #include <map>
 
-#include <wx/bitmap.h>
+#include <wx/image.h>
 #include <wx/string.h>
 
 
 typedef struct {
 	wxString Name;
-	wxBitmap Flag;
+	wxImage  Flag;
 } CountryData;
 
 
@@ -61,13 +62,22 @@
 
 class CIP2Country {
 public:
-	CIP2Country();
+	CIP2Country(const wxString& configDir);
 	~CIP2Country();
 	const CountryData& GetCountryData(const wxString& ip);
+	void Enable();
+	void Disable();
+	void Update();
+	bool IsEnabled() { return m_geoip != NULL; }
+	void DownloadFinished(uint32 result);
 
 private:
 	struct GeoIPTag *m_geoip;
 	CountryDataMap m_CountryDataMap;
+	wxString m_DataBaseName;
+	wxString m_DataBasePath;
+
+	void LoadFlags();
 };
 
 #endif // IP2COUNTRY_H

aMule-2.2.6.tar.bz2/src/IPFilter.cpp -> aMule-2.3.1.tar.bz2/src/IPFilter.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -24,13 +24,15 @@
 //
 
 #include <wx/stdpaths.h>		// Needed for GetDataDir
+#include <wx/ffile.h>
 
 #include "IPFilter.h"			// Interface declarations.
+#include "IPFilterScanner.h"	// Interface for flexer
 #include "Preferences.h"		// Needed for thePrefs
 #include "amule.h"			// Needed for theApp
 #include "Statistics.h"			// Needed for theStats
 #include "HTTPDownload.h"		// Needed for CHTTPDownloadThread
-#include "Logger.h"			// Needed for AddDebugLogLineM
+#include "Logger.h"			// Needed for AddDebugLogLine{C,N}
 #include <common/Format.h>		// Needed for CFormat
 #include <common/StringFunctions.h>	// Needed for CSimpleTokenizer
 #include <common/FileFunctions.h>	// Needed for UnpackArchive
@@ -38,6 +40,10 @@
 #include "ThreadScheduler.h"		// Needed for CThreadScheduler and CThreadTask
 #include "ClientList.h"			// Needed for CClientList
 #include "ServerList.h"			// Needed for CServerList
+#include <common/Macros.h>		// Needed for DEBUG_ONLY()
+#include "RangeMap.h"			// Needed for CRangeMap
+#include "ServerConnect.h"		// Needed for ConnectToAnyServer()
+#include "DownloadQueue.h"		// Needed for theApp->downloadqueue
 
 
 ////////////////////////////////////////////////////////////
@@ -53,11 +59,14 @@
 class CIPFilterEvent : public wxEvent
 {
 public:
-	CIPFilterEvent(CIPFilter::IPMap& result) 
+	CIPFilterEvent(CIPFilter::RangeIPs rangeIPs, CIPFilter::RangeLengths rangeLengths, CIPFilter::RangeNames rangeNames) 
 		: wxEvent(-1, MULE_EVT_IPFILTER_LOADED)
 	{
-		// Avoid needles copying
-		std::swap(result, m_result);
+		// Physically copy the vectors, this will hopefully resize them back to their needed capacity.
+		m_rangeIPs = rangeIPs;
+		m_rangeLengths = rangeLengths;
+		// This one is usually empty, and should always be swapped, not copied.
+		std::swap(m_rangeNames, rangeNames);
 	}
 	
 	/** @see wxEvent::Clone */
@@ -65,7 +74,9 @@
 		return new CIPFilterEvent(*this);
 	}
 	
-	CIPFilter::IPMap m_result;
+	CIPFilter::RangeIPs m_rangeIPs;
+	CIPFilter::RangeLengths m_rangeLengths;
+	CIPFilter::RangeNames m_rangeNames;
 };
 
 
@@ -91,36 +102,138 @@
 public:
 	CIPFilterTask(wxEvtHandler* owner)
 		: CThreadTask(wxT("Load IPFilter"), wxEmptyString, ETP_Critical),
+		  m_storeDescriptions(false),
 		  m_owner(owner)
 	{
 	}
-	
-	void Entry() {
-		wxStandardPathsBase &spb(wxStandardPaths::Get());
+
+private:
+	void Entry()
+	{
+		AddLogLineN(_("Loading IP filters 'ipfilter.dat' and 'ipfilter_static.dat'."));
+		if ( !LoadFromFile(theApp->ConfigDir + wxT("ipfilter.dat")) &&
+		     thePrefs::UseIPFilterSystem() ) {
+			// Load from system wide IP filter file
+			wxStandardPathsBase &spb(wxStandardPaths::Get());
 #ifdef __WXMSW__
-		wxString dataDir(spb.GetPluginsDir());
+			wxString dataDir(spb.GetPluginsDir());
 #elif defined(__WXMAC__)
-		wxString dataDir(spb.GetDataDir());
+			wxString dataDir(spb.GetDataDir());
 #else
-		wxString dataDir(spb.GetDataDir().BeforeLast(wxT('/')) + wxT("/amule"));
+			wxString dataDir(spb.GetDataDir().BeforeLast(wxT('/')) + wxT("/amule"));
 #endif
-		wxString systemwideFile(JoinPaths(dataDir,wxT("ipfilter.dat")));
-
-		AddLogLineM(false, _("Loading IP-filters 'ipfilter.dat' and 'ipfilter_static.dat'."));
-		if ( !LoadFromFile(theApp->ConfigDir + wxT("ipfilter.dat")) &&
-		     thePrefs::UseIPFilterSystem() ) {
+			wxString systemwideFile(JoinPaths(dataDir,wxT("ipfilter.dat")));
 			LoadFromFile(systemwideFile);
 		}
 
 
 		LoadFromFile(theApp->ConfigDir + wxT("ipfilter_static.dat"));
 
-		CIPFilterEvent evt(m_result);
+		uint8 accessLevel = thePrefs::GetIPFilterLevel();
+		uint32 size = m_result.size();
+		// Reserve a little more so we don't have to resize the vector later.
+		// (Map ranges can exist that have to be stored in several parts.)
+		// Extra memory will be freed in the end.
+		m_rangeIPs.reserve(size + 1000);
+		m_rangeLengths.reserve(size + 1000);
+		if (m_storeDescriptions) {
+			m_rangeNames.reserve(size + 1000);
+		}
+		for (IPMap::iterator it = m_result.begin(); it != m_result.end(); ++it) {
+			if (it->AccessLevel < accessLevel) {
+				// Calculate range "length"
+				// (which is included-end - start and thus length - 1)
+				// Encoding:
+				// 0      - 0x7fff	same
+				// 0x8000 - 0xffff	0xfff	- 0x07ffffff
+				// that means: remove msb, shift left by 12 bit, add 0xfff
+				// so it can cover 8 consecutive class A nets
+				// larger ranges (or theoretical ranges with uneven ends) have to be split
+				uint32 startIP = it.keyStart();
+				uint32 realLength = it.keyEnd() - it.keyStart() + 1;
+#ifdef __DEBUG__
+				std::string * descp = 0;
+#endif
+				while (realLength) {
+					m_rangeIPs.push_back(startIP);
+					uint32 curLength = realLength;
+					uint16 pushLength;
+					if (realLength <= 0x8000) {
+						pushLength = realLength - 1;
+					} else {
+						if (curLength >= 0x08000000) {
+							// range to big, limit
+							curLength = 0x08000000;
+						} else {
+							// cut off LSBs
+							curLength &= 0x07FFF000;
+						}
+						pushLength = ((curLength - 1) >> 12) | 0x8000;
+					}
+					m_rangeLengths.push_back(pushLength);
+#ifdef __DEBUG__
+					if (m_storeDescriptions) {
+						// std::string has no ref counting, so swap it
+						// (it's used so we need half the space than wxString with wide chars)
+						if (descp) {
+							// we split the range so we have to duplicate it
+							m_rangeNames.push_back(*descp);
+						} else {
+							// push back empty string and swap
+							m_rangeNames.push_back(std::string());
+							descp = & * m_rangeNames.rbegin();
+							std::swap(*descp, it->Description);
+						}
+					}
+#endif
+					realLength -= curLength;
+					startIP += curLength;
+				}
+			}
+		}
+		// Numbers are probably different:
+		// - ranges from map that are not blocked because of their level are not added to the table
+		// - some ranges from the map have to be split for the table
+		AddDebugLogLineN(logIPFilter, CFormat(wxT("Ranges in map: %d  blocked ranges in table: %d")) % size % m_rangeIPs.size());
+
+		CIPFilterEvent evt(m_rangeIPs, m_rangeLengths, m_rangeNames);
 		wxPostEvent(m_owner, evt);
 	}
-private:
 
+	/**
+	 * This structure is used to contain the range-data in the rangemap.
+	 */
+	struct rangeObject
+	{
+		bool operator==( const rangeObject& other ) const {
+			return AccessLevel == other.AccessLevel;
+		}
+
+// Since descriptions are only used for debugging messages, there 
+// is no need to keep them in memory when running a non-debug build.
+#ifdef __DEBUG__
+		//! Contains the user-description of the range.
+		std::string	Description;
+#endif
+		
+		//! The AccessLevel for this filter.
+		uint8		AccessLevel;
+	};
+
+	//! The is the type of map used to store the IPs.
+	typedef CRangeMap<rangeObject, uint32> IPMap;
 	
+	bool m_storeDescriptions;
+
+	// the generated filter
+	CIPFilter::RangeIPs m_rangeIPs;
+	CIPFilter::RangeLengths m_rangeLengths;
+	CIPFilter::RangeNames m_rangeNames;
+
+	wxEvtHandler*		m_owner;
+	// temporary map for filter generation
+	IPMap				m_result;
+
 	/**
 	 * Helper function.
 	 *
@@ -134,14 +247,16 @@
 	 * ranges where the AccessLevel is not within the range 0..255, or
 	 * where IPEnd < IPstart not inserted.
 	 */	
-	bool AddIPRange(uint32 IPStart, uint32 IPEnd, uint16 AccessLevel, const wxString& Description)
+	bool AddIPRange(uint32 IPStart, uint32 IPEnd, uint16 AccessLevel, const char* DEBUG_ONLY(Description))
 	{
 		if (AccessLevel < 256) {
 			if (IPStart <= IPEnd) {
-				CIPFilter::rangeObject item;
+				rangeObject item;
 				item.AccessLevel = AccessLevel;
 #ifdef __DEBUG__
-				item.Description = Description;
+				if (m_storeDescriptions) {
+					item.Description = Description;
+				}
 #endif
 
 				m_result.insert(IPStart, IPEnd, item);
@@ -155,111 +270,6 @@
 
 
 	/**
-	 * Helper function.
-	 * 
-	 * @param str A string representation of an IP-range in the format "<ip>-<ip>".
-	 * @param ipA The target of the first IP in the range.
-	 * @param ipB The target of the second IP in the range.
-	 * @return True if the parsing succeded, false otherwise (results will be invalid).
-	 *
-	 * The IPs returned by this function are in host order, not network order.
-	 */
-	bool m_inet_atoh(const wxString &str, uint32& ipA, uint32& ipB)
-	{
-		wxString first = str.BeforeFirst(wxT('-'));
-		wxString second = str.Mid(first.Len() + 1);
-
-		bool result = StringIPtoUint32(first, ipA) && StringIPtoUint32(second, ipB);
-
-		// StringIPtoUint32 saves the ip in anti-host order, but in order
-		// to be able to make relational comparisons, we need to convert
-		// it back to host-order.
-		ipA = wxUINT32_SWAP_ALWAYS(ipA);
-		ipB = wxUINT32_SWAP_ALWAYS(ipB);
-		
-		return result;
-	}
-
-
-	/**
-	 * Helper-function for processing the PeerGuardian format.
-	 *
-	 * @return True if the line was valid, false otherwise.
-	 * 
-	 * This function will correctly parse files that follow the folllowing
-	 * format for specifying IP-ranges (whitespace is optional):
-	 *  <IPStart> - <IPEnd> , <AccessLevel> , <Description>
-	 */
-	bool ProcessPeerGuardianLine(const wxString& sLine)
-	{
-		CSimpleTokenizer tkz(sLine, wxT(','));
-		
-		wxString first	= tkz.next();
-		wxString second	= tkz.next();
-		wxString third  = tkz.remaining().Strip(wxString::both);
-
-		// If there were less than two tokens, fail
-		if (tkz.tokenCount() != 2) {
-			return false;
-		}
-
-		// Convert string IP's to host order IP numbers
-		uint32 IPStart = 0;
-		uint32 IPEnd   = 0;
-
-		// This will also fail if the line is commented out
-		if (!m_inet_atoh(first, IPStart, IPEnd)) {
-			return false;
-		}
-
-		// Second token is Access Level, default is 0.
-		unsigned long AccessLevel = 0;
-		if (!second.Strip(wxString::both).ToULong(&AccessLevel) || AccessLevel >= 255) {
-			return false;
-		}
-
-		// Add the filter
-		return AddIPRange(IPStart, IPEnd, AccessLevel, third);
-	}
-
-
-	/**
-	 * Helper-function for processing the AntiP2P format.
-	 *
-	 * @return True if the line was valid, false otherwise.
-	 * 
-	 * This function will correctly parse files that follow the folllowing
-	 * format for specifying IP-ranges (whitespace is optional):
-	 *  <Description> : <IPStart> - <IPEnd>
-	 */
-	bool ProcessAntiP2PLine(const wxString& sLine)
-	{
-		// remove spaces from the left and right.
-		const wxString line = sLine.Strip(wxString::leading);
-
-		// Extract description (first) and IP-range (second) form the line
-		int pos = line.Find(wxT(':'), true);
-		if (pos == -1) {
-			return false;
-		}
-
-		wxString Description = line.Left(pos).Strip(wxString::trailing);
-		wxString IPRange     = line.Right(line.Len() - pos - 1);
-
-		// Convert string IP's to host order IP numbers
-		uint32 IPStart = 0;
-		uint32 IPEnd   = 0;
-
-		if (!m_inet_atoh(IPRange ,IPStart, IPEnd)) {
-			return false;
-		}
-
-		// Add the filter
-		return AddIPRange(IPStart, IPEnd, 0, Description);
-	}
-
-	
-	/**
 	 * Loads a IP-list from the specified file, can be text or zip.
 	 *
 	 * @return True if the file was loaded, false otherwise.
@@ -268,10 +278,14 @@
 	{
 		const CPath path = CPath(file);
 
-		if (!path.FileExists() /* || TestDestroy() (see CIPFilter::Reload()) */) {
+		if (!path.FileExists() || TestDestroy()) {
 			return 0;
 		}
 
+#ifdef __DEBUG__
+		m_storeDescriptions = theLogger.IsEnabled(logIPFilter);
+#endif
+
 		const wxChar* ipfilter_files[] = {
 			wxT("ipfilter.dat"),
 			wxT("guardian.p2p"),
@@ -280,65 +294,46 @@
 		};
 		
 		// Try to unpack the file, might be an archive
+
 		if (UnpackArchive(path, ipfilter_files).second != EFT_Text) {
-			AddLogLineM(true, 
-				CFormat(_("Failed to load ipfilter.dat file '%s', unknown format encountered.")) % file);
+			AddLogLineC(CFormat(_("Failed to load ipfilter.dat file '%s', unknown format encountered.")) % file);
 			return 0;
 		}
 		
 		int filtercount = 0;
-		int discardedCount = 0;
-		
-		CTextFile readFile;
-		if (readFile.Open(path, CTextFile::read)) {
-			// Function pointer-type of the parse-functions we can use
-			typedef bool (CIPFilterTask::*ParseFunc)(const wxString&);
-
-			ParseFunc func = NULL;
-
-			while (!readFile.Eof()) {
-				wxString line = readFile.GetNextLine();
-
-				/* See CIPFilter::Reload()
-				  if (TestDestroy()) {
-					return 0;
-				} else */ if (func && (*this.*func)(line)) {
-					filtercount++;
-				} else if (ProcessPeerGuardianLine(line)) {
-					func = &CIPFilterTask::ProcessPeerGuardianLine;
-					filtercount++;
-				} else if (ProcessAntiP2PLine(line)) {
-					func = &CIPFilterTask::ProcessAntiP2PLine;
-					filtercount++;
-				} else {
-					// Comments and empty lines are ignored
-					line = line.Strip(wxString::both);
-					
-					if (!line.IsEmpty() && !line.StartsWith(wxT("#"))) {
-						discardedCount++;
-						AddDebugLogLineM(false, logIPFilter, wxT(
-							"Invalid line found while reading ipfilter file: ") + line);
-					}
-				}
+		yyip_Bad = 0;
+		wxFFile readFile;
+		if (readFile.Open(path.GetRaw())) {
+			yyip_Line = 1;
+			yyiprestart(readFile.fp());
+			uint32 IPStart = 0;
+			uint32 IPEnd   = 0;
+			uint32 IPAccessLevel = 0;
+			char * IPDescription;
+#ifdef __DEBUG__
+			uint32 time1 = GetTickCountFullRes();
+#endif
+			while (yyiplex(IPStart, IPEnd, IPAccessLevel, IPDescription)) {
+				AddIPRange(IPStart, IPEnd, IPAccessLevel, IPDescription);
+				filtercount++;
 			}
+#ifdef __DEBUG__
+			uint32 time2 = GetTickCountFullRes();
+			AddDebugLogLineN(logIPFilter, CFormat(wxT("time for lexer: %.3f")) % ((time2-time1) / 1000.0));
+#endif
 		} else {
-			AddLogLineM(true, CFormat(_(
-				"Failed to load ipfilter.dat file '%s', could not open file.")) % file);
+			AddLogLineC(CFormat(_("Failed to load ipfilter.dat file '%s', could not open file.")) % file);
 			return 0;
 		}
 
-		AddLogLineM(false,
-			( CFormat(wxPLURAL("Loaded %u IP-range from '%s'.", "Loaded %u IP-ranges from '%s'.", filtercount)) % filtercount % file )
-			+ wxT(" ") +
-			( CFormat(wxPLURAL("%u malformed line was discarded.", "%u malformed lines were discarded.", discardedCount)) % discardedCount )
-		);
+		wxString msg = CFormat(wxPLURAL("Loaded %u IP-range from '%s'.", "Loaded %u IP-ranges from '%s'.", filtercount)) % filtercount % file;
+		if (yyip_Bad) {
+			msg << wxT(" ") << ( CFormat(wxPLURAL("%u malformed line was discarded.", "%u malformed lines were discarded.", yyip_Bad)) % yyip_Bad );
+		}
+		AddLogLineN(msg);
 
 		return filtercount;
 	}
-	
-private:
-	wxEvtHandler*		m_owner;	
-	CIPFilter::IPMap	m_result;
 };
 
 
@@ -356,7 +351,7 @@
  * This function creates a text-file containing the specified text, 
  * but only if the file does not already exist.
  */
-void CreateDummyFile(const wxString& filename, const wxString& text)
+static bool CreateDummyFile(const wxString& filename, const wxString& text)
 {
 	// Create template files
 	if (!wxFileExists(filename)) {
@@ -364,12 +359,17 @@
 
 		if (file.Open(filename, CTextFile::write)) {
 			file.WriteLine(text);
+			return true;
 		}
 	}
+	return false;
 }
 
 
-CIPFilter::CIPFilter()
+CIPFilter::CIPFilter() :
+	m_ready(false),
+	m_startKADWhenReady(false),
+	m_connectToAnyServerWhenReady(false)
 {
 	// Setup dummy files for the curious user.
 	const wxString normalDat = theApp->ConfigDir + wxT("ipfilter.dat");
@@ -378,7 +378,10 @@
 		<< wxT("# through the auto-update functionality. Do not save ipfilter-\n")
 		<< wxT("# ranges here that should not be overwritten by aMule.\n");
 
-	CreateDummyFile(normalDat, normalMsg);
+	if (CreateDummyFile(normalDat, normalMsg)) {
+		// redownload if user deleted file
+		thePrefs::SetLastHTTPDownloadURL(HTTP_IPFilter, wxEmptyString);
+	}
 	
 	const wxString staticDat = theApp->ConfigDir + wxT("ipfilter_static.dat");
 	const wxString staticMsg = wxString()
@@ -390,23 +393,18 @@
 
 	CreateDummyFile(staticDat, staticMsg);
 
+	// First load currently available filter, so network connect is possible right after
+	// (in case filter download takes some time).
 	Reload();
+	// Check if update should be done only after that.
+	m_updateAfterLoading = thePrefs::IPFilterAutoLoad() && !thePrefs::IPFilterURL().IsEmpty();
 }
 
 
 void CIPFilter::Reload()
 {
 	// We keep the current filter till the new one has been loaded.
-	//CThreadScheduler::AddTask(new CIPFilterTask(this));
-	
-	// This procedure cannot be run as a task, 
-	// wxArchiveFSHandler::FindFirst() will eventually call wxExecute(),
-	// and this can only be done from the main task.
-	//
-	// This way, We call the Entry() routine manually and comment out the
-	// calls to TestDestroy().
-	CIPFilterTask ipf_task(this);
-	ipf_task.Entry();
+	CThreadScheduler::AddTask(new CIPFilterTask(this));
 }
 
 
@@ -414,35 +412,63 @@
 {
 	wxMutexLocker lock(m_mutex);
 
-	return m_iplist.size();
+	return m_rangeIPs.size();
 }
 
 
 bool CIPFilter::IsFiltered(uint32 IPTest, bool isServer)
 {
-	if ((thePrefs::IsFilteringClients() && !isServer) || (thePrefs::IsFilteringServers() && isServer)) {
-		wxMutexLocker lock(m_mutex);
-
-		// The IP needs to be in host order
-		IPMap::iterator it = m_iplist.find_range(wxUINT32_SWAP_ALWAYS(IPTest));
-
-		if (it != m_iplist.end()) {
-			if (it->AccessLevel < thePrefs::GetIPFilterLevel()) {
-#ifdef __DEBUG__
-				AddDebugLogLineM(false, logIPFilter, wxString(wxT("Filtered IP (AccLvl: ")) << (long)it->AccessLevel << wxT("): ")
-						<< Uint32toStringIP(IPTest) << wxT(" (") << it->Description + wxT(")"));
-#endif
-				
-				if (isServer) {
-					theStats::AddFilteredServer();
-				} else {
-					theStats::AddFilteredClient();
-				}
-				return true;
+	if ((!thePrefs::IsFilteringClients() && !isServer) || (!thePrefs::IsFilteringServers() && isServer)) {
+		return false;
+	}
+	if (!m_ready) {
+		// Somebody connected before we even started the networks.
+		// Filter is not up yet, so block him.
+		AddDebugLogLineN(logIPFilter, CFormat(wxT("Filtered IP %s because filter isn't ready yet.")) % Uint32toStringIP(IPTest));
+		if (isServer) {
+			theStats::AddFilteredServer();
+		} else {
+			theStats::AddFilteredClient();
+		}
+		return true;
+	}
+	wxMutexLocker lock(m_mutex);
+	// The IP needs to be in host order
+	uint32 ip = wxUINT32_SWAP_ALWAYS(IPTest);
+	int imin = 0;
+	int imax = m_rangeIPs.size() - 1;
+	int i;
+	bool found = false;
+	while (imin <= imax) {
+		i = (imin + imax) / 2;
+		uint32 curIP = m_rangeIPs[i];
+		if (curIP <= ip) {
+			uint32 curLength = m_rangeLengths[i];
+			if (curLength >= 0x8000) {
+				curLength = ((curLength & 0x7fff) << 12) + 0xfff;
 			}
+			if (curIP + curLength >= ip) {
+				found = true;
+				break;
+			}
+		}
+		if (curIP > ip) {
+			imax = i - 1;
+		} else {
+			imin = i + 1;
 		}
 	}
-
+	if (found) {
+		AddDebugLogLineN(logIPFilter, CFormat(wxT("Filtered IP %s%s")) % Uint32toStringIP(IPTest)
+			% (i < (int)m_rangeNames.size() ? (wxT(" (") + wxString(char2unicode(m_rangeNames[i].c_str())) + wxT(")")) 
+											: wxString(wxEmptyString)));
+		if (isServer) {
+			theStats::AddFilteredServer();
+		} else {
+			theStats::AddFilteredClient();
+		}
+		return true;
+	}
 	return false;
 }
 
@@ -450,8 +476,11 @@
 void CIPFilter::Update(const wxString& strURL)
 {
 	if (!strURL.IsEmpty()) {
+		m_URL = strURL;
+
 		wxString filename = theApp->ConfigDir + wxT("ipfilter.download");
-		CHTTPDownloadThread *downloader = new CHTTPDownloadThread(strURL, filename, HTTP_IPFilter);
+		wxString oldfilename = theApp->ConfigDir + wxT("ipfilter.dat");
+		CHTTPDownloadThread *downloader = new CHTTPDownloadThread(m_URL, filename, oldfilename, HTTP_IPFilter, true, true);
 
 		downloader->Create();
 		downloader->Run();
@@ -461,30 +490,30 @@
 
 void CIPFilter::DownloadFinished(uint32 result)
 {
-	if (result == 1) {
+	wxString datName = wxT("ipfilter.dat");
+	if (result == HTTP_Success) {
 		// download succeeded. proceed with ipfilter loading
 		wxString newDat = theApp->ConfigDir + wxT("ipfilter.download");
-		wxString oldDat = theApp->ConfigDir + wxT("ipfilter.dat");
-
-		if (wxFileExists(oldDat)) {
-			if (!wxRemoveFile(oldDat)) {
-				AddDebugLogLineM(true, logIPFilter,
-					wxT("Failed to remove ipfilter.dat file, aborting update."));
-				return;
-			}
-		}
-
-		if (!wxRenameFile(newDat, oldDat)) {
-			AddDebugLogLineM(true, logIPFilter,
-				wxT("Failed to rename new ipfilter.dat file, aborting update."));
-			return;
+		wxString oldDat = theApp->ConfigDir + datName;
+
+		if (wxFileExists(oldDat) && !wxRemoveFile(oldDat)) {
+			AddLogLineC(CFormat(_("Failed to remove %s file, aborting update.")) % datName);
+			result = HTTP_Error;
+		} else if (!wxRenameFile(newDat, oldDat)) {
+			AddLogLineC(CFormat(_("Failed to rename new %s file, aborting update.")) % datName);
+			result = HTTP_Error;
+		} else {
+			AddLogLineN(CFormat(_("Successfully updated %s")) % datName);
 		}
+	} else if (result == HTTP_Skipped) {
+		AddLogLineN(CFormat(_("Skipped download of %s, because requested file is not newer.")) % datName);
+	} else {
+		AddLogLineC(CFormat(_("Failed to download %s from %s")) % datName % m_URL);
+	}
 
-		// Reload both ipfilter files
+	if (result == HTTP_Success) {
+		// Reload both ipfilter files on success
 		Reload();
-	} else {
-		AddDebugLogLineM(true, logIPFilter,
-			wxT("Failed to download the ipfilter from ") + thePrefs::IPFilterURL());
 	}
 }
 
@@ -493,8 +522,15 @@
 {
 	{
 		wxMutexLocker lock(m_mutex);
-		std::swap(m_iplist, evt.m_result);
+		std::swap(m_rangeIPs, evt.m_rangeIPs);
+		std::swap(m_rangeLengths, evt.m_rangeLengths);
+		std::swap(m_rangeNames, evt.m_rangeNames);
+		m_ready = true;
 	}
+	if (theApp->IsOnShutDown()) {
+		return;
+	}
+	AddLogLineN(_("IP filter is ready"));
 	
 	if (thePrefs::IsFilteringClients()) {
 		theApp->clientlist->FilterQueues();
@@ -502,6 +538,27 @@
 	if (thePrefs::IsFilteringServers()) {
 		theApp->serverlist->FilterServers();
 	}
+	// Now start networks we didn't start earlier
+	if (m_connectToAnyServerWhenReady || m_startKADWhenReady) {
+		AddLogLineC(_("Connecting"));
+	}
+	if (m_connectToAnyServerWhenReady) {
+		m_connectToAnyServerWhenReady = false;
+		theApp->serverconnect->ConnectToAnyServer();
+	}
+	if (m_startKADWhenReady) {
+		m_startKADWhenReady = false;
+		theApp->StartKad();
+	}
+	theApp->ShowConnectionState(true);			// update connect button
+	if (thePrefs::GetSrcSeedsOn()) {
+		theApp->downloadqueue->LoadSourceSeeds();
+	}
+	// Trigger filter update if configured
+	if (m_updateAfterLoading) {
+		m_updateAfterLoading = false;
+		Update(thePrefs::IPFilterURL());
+	}
 }
 
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/IPFilter.h -> aMule-2.3.1.tar.bz2/src/IPFilter.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -29,12 +29,9 @@
 #include <wx/event.h>	// Needed for wxEvent
 
 #include "Types.h"	// Needed for uint8, uint16 and uint32
-#include "RangeMap.h"	// Needed for CRangeMap
-
 
 class CIPFilterEvent;
 
-
 /**
  * This class represents a list of IPs that should not be accepted
  * as valid connection destinations nor sources. It provides an
@@ -64,7 +61,6 @@
 	 * Note: IP2Test must be in anti-host order (BE on LE platform, LE on BE platform).
 	 */
 	bool	IsFiltered( uint32 IP2test, bool isServer = false );
-
 	
 	/**
 	 * Returns the number of banned ranges.
@@ -91,40 +87,46 @@
 	 */
 	void	DownloadFinished(uint32 result);
 	
-private:
-	/** Handles the result of loading the dat-files. */
-	void	OnIPFilterEvent(CIPFilterEvent&);
+	/**
+	 * True once initial startup has finished (stays true while reloading later).
+	 */
+	bool	IsReady() const { return m_ready; }
 	
 	/**
-	 * This structure is used to contain the range-data in the rangemap.
+	 * These functions are called to tell the filter to start networks once it 
+	 * has finished loading.
 	 */
-	struct rangeObject
-	{
-		bool operator==( const rangeObject& other ) const {
-			return AccessLevel == other.AccessLevel;
-		}
-
-// Since descriptions are only used for debugging messages, there 
-// is no need to keep them in memory when running a non-debug build.
-#ifdef __DEBUG__
-		//! Contains the user-description of the range.
-		wxString	Description;
-#endif
-		
-		//! The AccessLevel for this filter.
-		uint8		AccessLevel;
-	};
-
+	void	StartKADWhenReady() { m_startKADWhenReady = true; }
+	void	ConnectToAnyServerWhenReady() { m_connectToAnyServerWhenReady = true; }
+	
+private:
+	/** Handles the result of loading the dat-files. */
+	void	OnIPFilterEvent(CIPFilterEvent&);
 	
-	//! The is the type of map used to store the IPs.
-	typedef CRangeMap<rangeObject, uint32> IPMap;
+	//! The URL from which the IP filter was downloaded
+	wxString m_URL;
 	
-	//! The map of IP-ranges
-	IPMap m_iplist;
+	// The IP ranges
+	typedef std::vector<uint32> RangeIPs;
+	RangeIPs m_rangeIPs;
+	typedef std::vector<uint16> RangeLengths;
+	RangeLengths m_rangeLengths;
+	// Name for each range. This usually stays empty for memory reasons,
+	// except if IP-Filter debugging is active.
+	typedef std::vector<std::string> RangeNames;
+	RangeNames m_rangeNames;
 
 	//! Mutex used to ensure thread-safety of this class
 	mutable wxMutex	m_mutex;
 
+	// false if loading (on startup only)
+	bool m_ready;
+	// flags to start networks after loading
+	bool m_startKADWhenReady;
+	bool m_connectToAnyServerWhenReady;
+	// should update be performed after filter is loaded ?
+	bool m_updateAfterLoading;
+
 	friend class CIPFilterEvent;
 	friend class CIPFilterTask;

aMule-2.3.1.tar.bz2/src/IPFilterScanner.cpp Added

@@ -0,0 +1,2016 @@
+#line 2 "IPFilterScanner.cpp"
+
+#line 4 "IPFilterScanner.cpp"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define yy_create_buffer yyip_create_buffer
+#define yy_delete_buffer yyip_delete_buffer
+#define yy_flex_debug yyip_flex_debug
+#define yy_init_buffer yyip_init_buffer
+#define yy_flush_buffer yyip_flush_buffer
+#define yy_load_buffer_state yyip_load_buffer_state
+#define yy_switch_to_buffer yyip_switch_to_buffer
+#define yyin yyipin
+#define yyleng yyipleng
+#define yylex yyiplex
+#define yylineno yyiplineno
+#define yyout yyipout
+#define yyrestart yyiprestart
+#define yytext yyiptext
+#define yywrap yyipwrap
+#define yyalloc yyipalloc
+#define yyrealloc yyiprealloc
+#define yyfree yyipfree
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 35
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#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. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+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 short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else	/* ! __cplusplus */
+
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
+
+#define YY_USE_CONST
+
+#endif	/* defined (__STDC__) */
+#endif	/* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE yyiprestart(yyipin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t yyipleng;
+
+extern FILE *yyipin, *yyipout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#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 \
+		{ \
+		/* Undo effects of setting up yyiptext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
+		YY_RESTORE_YY_MORE_OFFSET \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up yyiptext again */ \
+		} \
+	while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+	{
+	FILE *yy_input_file;
+
+	char *yy_ch_buf;		/* input buffer */
+	char *yy_buf_pos;		/* current position in input buffer */
+
+	/* Size of input buffer in bytes, not including room for EOB
+	 * characters.
+	 */
+	yy_size_t yy_buf_size;
+
+	/* Number of characters read into yy_ch_buf, not including EOB
+	 * characters.
+	 */
+	yy_size_t yy_n_chars;
+
+	/* Whether we "own" the buffer - i.e., we know we created it,
+	 * and can realloc() it to grow it, and should free() it to
+	 * delete it.
+	 */
+	int yy_is_our_buffer;
+
+	/* Whether this is an "interactive" input source; if so, and
+	 * if we're using stdio for input, then we want to use getc()
+	 * instead of fread(), to make sure we stop fetching input after
+	 * each newline.
+	 */
+	int yy_is_interactive;
+
+	/* Whether we're considered to be at the beginning of a line.
+	 * If so, '^' rules will be active on the next match, otherwise
+	 * not.
+	 */
+	int yy_at_bol;
+
+    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.
+	 */
+	int yy_fill_buffer;
+
+	int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+	/* When an EOF's been seen but there's still some text to process
+	 * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+	 * shouldn't try reading from the input source any more.  We might
+	 * still have a bunch of tokens to match, though, because of
+	 * possible backing-up.
+	 *
+	 * When we actually see the EOF, we change the status to "new"
+	 * (via yyiprestart()), so that the user can continue scanning by
+	 * just pointing yyipin at a new input file.
+	 */
+#define YY_BUFFER_EOF_PENDING 2
+
+	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when yyiptext is formed. */
+static char yy_hold_char;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t yyipleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;		/* whether we need to initialize */
+static int yy_start = 0;	/* start state number */
+
+/* Flag which is used to allow yyipwrap()'s to do buffer switches
+ * instead of setting up a fresh yyipin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void yyiprestart (FILE *input_file  );
+void yyip_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yyip_create_buffer (FILE *file,int size  );
+void yyip_delete_buffer (YY_BUFFER_STATE b  );
+void yyip_flush_buffer (YY_BUFFER_STATE b  );
+void yyippush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yyippop_buffer_state (void );
+
+static void yyipensure_buffer_stack (void );
+static void yyip_load_buffer_state (void );
+static void yyip_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER yyip_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE yyip_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yyip_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yyip_scan_bytes (yyconst char *bytes,yy_size_t len  );
+
+void *yyipalloc (yy_size_t  );
+void *yyiprealloc (void *,yy_size_t  );
+void yyipfree (void *  );
+
+#define yy_new_buffer yyip_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        yyipensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yyip_create_buffer(yyipin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+	}
+
+#define yy_set_bol(at_bol) \
+	{ \
+	if ( ! YY_CURRENT_BUFFER ){\
+        yyipensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            yyip_create_buffer(yyipin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+	}
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define yyipwrap(n) 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+FILE *yyipin = (FILE *) 0, *yyipout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int yyiplineno;
+
+int yyiplineno = 1;
+
+extern char *yyiptext;
+#define yytext_ptr yyiptext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up yyiptext.
+ */
+#define YY_DO_BEFORE_ACTION \
+	(yytext_ptr) = yy_bp; \
+	yyipleng = (size_t) (yy_cp - yy_bp); \
+	(yy_hold_char) = *yy_cp; \
+	*yy_cp = '\0'; \
+	(yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 6
+#define YY_END_OF_BUFFER 7
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[169] =
+    {   0,
+        0,    0,    7,    6,    6,    4,    5,    5,    2,    5,
+        5,    0,    4,    0,    0,    0,    2,    0,    2,    2,
+        0,    0,    0,    0,    2,    2,    0,    0,    0,    0,
+        2,    2,    0,    0,    0,    0,    2,    2,    0,    0,
+        0,    0,    2,    2,    0,    0,    0,    0,    2,    2,
+        0,    0,    0,    0,    2,    2,    0,    0,    0,    0,
+        0,    2,    2,    0,    0,    0,    0,    0,    0,    2,
+        2,    2,    0,    0,    0,    0,    0,    2,    2,    2,
+        0,    0,    0,    0,    2,    2,    0,    0,    0,    0,
+        2,    2,    0,    0,    0,    0,    2,    2,    0,    0,
+
+        0,    0,    2,    2,    0,    0,    0,    0,    2,    2,
+        0,    0,    0,    3,    0,    2,    2,    0,    0,    0,
+        3,    3,    2,    2,    0,    1,    0,    3,    2,    1,
+        1,    0,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    0
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    1,    1,    4,    1,    1,    1,    1,    1,
+        1,    1,    1,    5,    6,    7,    1,    8,    8,    8,
+        8,    8,    8,    8,    8,    8,    8,    9,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[10] =
+    {   0,
+        1,    1,    2,    1,    1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[173] =
+    {   0,
+        0,    3,  231,  232,   11,  232,  221,   14,  220,   17,
+       25,    0,  232,  219,    0,    0,  218,    0,  217,   33,
+       36,  217,    0,   38,    0,   45,   47,  216,  215,  211,
+       54,  210,  209,  208,   56,  207,   58,  198,   60,  197,
+      196,  195,  194,  191,  189,  188,   62,  187,   64,  180,
+       71,  179,  178,  177,  176,  172,  171,   78,  170,   85,
+      169,   92,  165,    0,   94,  164,  163,  101,  162,  161,
+      108,  158,  157,  155,    0,  110,  154,    0,  112,  151,
+      114,  150,  149,  148,  147,  144,  143,  142,  116,  141,
+      118,  140,  120,  137,  136,  135,  134,  133,  130,  129,
+
+      122,  127,  124,  126,  131,  107,  106,  105,  104,  103,
+      100,  138,   99,  145,   98,  152,   97,    0,  159,   96,
+       91,   89,   88,   87,   84,   81,   81,   80,   77,   75,
+      166,   75,    0,  174,  181,   74,  183,   73,   70,   68,
+      185,   67,   66,   53,  192,   52,   51,  199,   50,    0,
+      201,   49,   43,   42,  203,   41,   40,   32,  205,   31,
+       30,   29,  212,   28,   24,   23,   22,  232,  220,   28,
+       27,    0
+    } ;
+
+static yyconst flex_int16_t yy_def[173] =
+    {   0,
+      169,  168,  168,  168,  168,  168,  170,  168,  171,  170,
+      170,    5,  168,  170,   11,    8,  171,   10,  171,  171,
+       10,   10,   11,   10,   20,   20,   10,   10,   21,   24,
+       20,   26,   21,   27,   27,   24,   26,   26,   24,   27,
+       21,   35,   31,   37,   21,   39,   39,   35,   37,   37,
+       21,   39,   21,   47,   31,   49,   51,   21,   51,   51,
+       47,   31,   49,   58,   47,   51,   60,   58,   60,   62,
+       31,   62,   21,   65,   68,   65,   60,   71,   31,   62,
+       65,   65,   21,   76,   31,   79,   21,   81,   81,   76,
+       79,   79,   76,   81,   21,   89,   31,   91,   21,   93,
+
+       93,   89,   91,   91,   21,   93,   21,  101,   31,  103,
+      105,   21,  105,   21,  101,   31,  103,  112,  112,  105,
+      114,  114,  116,  116,  119,  172,  119,  114,  116,  172,
+      172,  119,  131,  131,  131,  134,  134,  134,  135,  137,
+      137,  137,  135,  141,  135,  141,  145,  135,  145,  148,
+      135,  145,  135,  151,  151,  151,  135,  155,  155,  155,
+      135,  159,  135,  159,  163,  163,  163,    0,  168,  168,
+      168,  168
+    } ;
+
+static yyconst flex_int16_t yy_nxt[242] =
+    {   0,
+      130,    5,    6,    7,    8,    6,    9,    7,    7,    7,
+       10,   11,   12,   13,   14,   16,   13,   17,   14,   14,
+       14,   18,   15,   21,   22,   15,   23,   19,   14,  130,
+      167,  130,   24,   15,   25,  130,  164,  163,  130,  160,
+       26,   20,   14,   27,   29,   30,   19,  159,  130,  156,
+      155,   31,   32,   33,   34,   19,  130,  152,  130,  130,
+      146,   37,   41,   42,   43,   44,   45,   46,   53,   54,
+       55,   56,   57,  145,  130,  142,   58,  141,   59,   64,
+      130,  138,   14,  131,   19,   65,   67,   14,  132,  131,
+       68,   14,   69,   70,  129,   19,  128,   71,   14,   72,
+
+       73,   74,   75,   14,   19,   14,  120,   14,   76,   78,
+      117,  116,  115,  114,   14,   79,   83,   84,   85,   86,
+       87,   88,   95,   96,   97,   98,   99,  100,  107,  108,
+      109,  110,  111,   19,   14,  112,  106,  105,  113,  118,
+      104,  103,  102,  101,   14,  119,  121,   19,   14,   94,
+       93,   92,  122,  123,   91,   90,   89,   14,   19,  124,
+      125,   14,   82,  126,   81,   80,  127,  133,   19,   77,
+       14,   14,   19,  134,  131,  130,   14,   66,   14,   63,
+      135,  136,  130,   62,   61,   60,   14,   19,  137,  139,
+      140,  143,  144,  147,   14,   52,   51,  148,   50,  149,
+
+      150,   49,   48,   47,   14,   19,  151,  153,  154,  157,
+      158,  161,  162,  165,   14,   40,   39,   38,   36,  166,
+        4,    4,   35,   14,   28,   20,   20,   15,   20,   15,
+      168,    3,  168,  168,  168,  168,  168,  168,  168,  168,
+      168
+    } ;
+
+static yyconst flex_int16_t yy_chk[242] =
+    {   0,
+      172,    1,    1,    2,    2,    2,    2,    2,    2,    2,
+        2,    2,    5,    5,    8,    8,    8,    8,    8,    8,
+        8,    8,    8,   10,   10,   10,   11,  171,  170,  167,
+      166,  165,   11,   11,   20,  164,  162,  161,  160,  158,
+       20,   20,   21,   21,   24,   24,   26,  157,  156,  154,
+      153,   26,   26,   27,   27,   31,  152,  149,  147,  146,
+      144,   31,   35,   35,   37,   37,   39,   39,   47,   47,
+       49,   49,   51,  143,  142,  140,   51,  139,   51,   58,
+      138,  136,  132,  130,  129,   58,   60,  128,  127,  126,
+       60,  125,   60,   62,  124,  123,  122,   62,  121,   62,
+
+       65,   65,   68,  120,  117,  115,  113,  111,   68,   71,
+      110,  109,  108,  107,  106,   71,   76,   76,   79,   79,
+       81,   81,   89,   89,   91,   91,   93,   93,  101,  101,
+      103,  103,  105,  104,  102,  105,  100,   99,  105,  112,
+       98,   97,   96,   95,   94,  112,  114,   92,   90,   88,
+       87,   86,  114,  116,   85,   84,   83,   82,   80,  116,
+      119,   77,   74,  119,   73,   72,  119,  131,   70,   69,
+       67,   66,   63,  131,  131,  134,   61,   59,   57,   56,
+      134,  134,  135,   55,   54,   53,   52,   50,  135,  137,
+      137,  141,  141,  145,   48,   46,   45,  145,   44,  145,
+
+      148,   43,   42,   41,   40,   38,  148,  151,  151,  155,
+      155,  159,  159,  163,   36,   34,   33,   32,   30,  163,
+      169,  169,   29,   28,   22,   19,   17,   14,    9,    7,
+        3,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+      168
+    } ;
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int yyip_flex_debug;
+int yyip_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *yyiptext;
+#line 1 "./IPFilterScanner.l"
+#line 2 "./IPFilterScanner.l"
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2009-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2009-2011 Stu Redman ( sturedman@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
+//
+
+//
+// Read IP filters
+//
+// These have a silly "grammar". For example:
+// 1.2.3.4-1.2.3.5,100,Duh:2.3.4.5-2.3.4.6
+// Now - which format is it, and what range should it take?
+//
+// So just use the lexer to read the file and assure the line format.
+// The actual IP reading is done with the ScanIP() function.
+//
+
+#include <stdio.h>
+#include "Types.h"
+#include "Logger.h"
+#define IPFS_EXTERN
+#include "IPFilterScanner.h"
+#include <common/Format.h>
+#include <common/StringFunctions.h>
+
+#ifdef _MSC_VER
+#define isatty(DUMMY) 0
+#define YY_NO_UNISTD_H
+#pragma warning(disable:4003) 
+#endif
+
+#define YY_NEVER_INTERACTIVE 1
+
+// When we get here the IP has been lexed nicely,
+// so we can blaze through without any checks.
+// The total lexing time is more than twice as fast
+// with this than when using sscanf.
+static bool ScanIP(const char * buf, uint32 & ip)
+{
+	while (*buf < '0') {
+		buf++;	// skip whitespace
+	}
+	ip = 0;
+	int a = 0;
+	for (int i = 0; i < 4; buf++) {
+		if (*buf < '0' || *buf > '9') {
+			// finished a number, check it and add to the ip
+			if (a > 255) {
+				return false;
+			}
+			ip = (ip << 8) | a;
+			a = 0;
+			i++;
+		} else {
+			// build number
+			a = a * 10 + *buf - '0';
+		}
+	}
+	return true;
+}
+
+static bool ScanInt(const char * buf, uint32 & a)
+{
+	while (*buf < '0') {
+		buf++;	// skip whitespace
+	}
+	a = 0;
+	while (*buf >= '0' && *buf <= '9') {
+		a = a * 10 + *buf - '0';
+		if (a > 255) {
+			return false;
+		}
+		buf++;
+	}
+	return true;
+}
+
+#line 674 "IPFilterScanner.cpp"
+
+#define INITIAL 0
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int yyiplex_destroy (void );
+
+int yyipget_debug (void );
+
+void yyipset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE yyipget_extra (void );
+
+void yyipset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *yyipget_in (void );
+
+void yyipset_in  (FILE * in_str  );
+
+FILE *yyipget_out (void );
+
+void yyipset_out  (FILE * out_str  );
+
+yy_size_t yyipget_leng (void );
+
+char *yyipget_text (void );
+
+int yyipget_lineno (void );
+
+void yyipset_lineno (int line_number  );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int yyipwrap (void );
+#else
+extern int yyipwrap (void );
+#endif
+#endif
+
+    static void yyunput (int c,char *buf_ptr  );
+    
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO fwrite( yyiptext, yyipleng, 1, yyipout )
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+		{ \
+		int c = '*'; \
+		yy_size_t n; \
+		for ( n = 0; n < max_size && \
+			     (c = getc( yyipin )) != EOF && c != '\n'; ++n ) \
+			buf[n] = (char) c; \
+		if ( c == '\n' ) \
+			buf[n++] = (char) c; \
+		if ( c == EOF && ferror( yyipin ) ) \
+			YY_FATAL_ERROR( "input in flex scanner failed" ); \
+		result = n; \
+		} \
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, yyipin))==0 && ferror(yyipin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(yyipin); \
+			} \
+		}\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int yyiplex (void);
+
+#define YY_DECL int yyiplex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after yyiptext and yyipleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+	if ( yyipleng > 0 ) \
+		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
+				(yyiptext[yyipleng - 1] == '\n'); \
+	YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp, *yy_bp;
+	register int yy_act;
+    
+#line 106 "./IPFilterScanner.l"
+
+
+#line 862 "IPFilterScanner.cpp"
+
+	if ( !(yy_init) )
+		{
+		(yy_init) = 1;
+
+#ifdef YY_USER_INIT
+		YY_USER_INIT;
+#endif
+
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
+
+		if ( ! yyipin )
+			yyipin = stdin;
+
+		if ( ! yyipout )
+			yyipout = stdout;
+
+		if ( ! YY_CURRENT_BUFFER ) {
+			yyipensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				yyip_create_buffer(yyipin,YY_BUF_SIZE );
+		}
+
+		yyip_load_buffer_state( );
+		}
+
+	while ( 1 )		/* loops until end-of-file is reached */
+		{
+		yy_cp = (yy_c_buf_p);
+
+		/* Support of yyiptext. */
+		*yy_cp = (yy_hold_char);
+
+		/* yy_bp points to the position in yy_ch_buf of the start of
+		 * the current run.
+		 */
+		yy_bp = yy_cp;
+
+		yy_current_state = (yy_start);
+		yy_current_state += YY_AT_BOL();
+yy_match:
+		do
+			{
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
+			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+				{
+				yy_current_state = (int) yy_def[yy_current_state];
+				if ( yy_current_state >= 169 )
+					yy_c = yy_meta[(unsigned int) yy_c];
+				}
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			++yy_cp;
+			}
+		while ( yy_base[yy_current_state] != 232 );
+
+yy_find_action:
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_accept[yy_current_state];
+			}
+
+		YY_DO_BEFORE_ACTION;
+
+do_action:	/* This label is used only to access EOF actions. */
+
+		switch ( yy_act )
+	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+#line 108 "./IPFilterScanner.l"
+{
+		/* PeerGuardian filter line
+		   <IPStart> - <IPEnd> , <AccessLevel> , <Description> 
+		*/
+		char * ip1 = yyiptext;
+		char * ip2 = strchr(ip1 + 7, '-') + 1;
+		char * acc = strchr(ip2 + 7, ',') + 1;
+		char * dsc = strchr(acc + 1, ',') + 1;
+		if (!ScanIP(ip1, IPStart) || !ScanIP(ip2, IPEnd)
+			|| !ScanInt(acc, IPLevel)) {
+			yyip_Bad++;
+		} else {
+			IPDescription = dsc;
+			return 1;
+		}
+	}
+	YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 125 "./IPFilterScanner.l"
+{
+		/* Comment */
+	}
+	YY_BREAK
+case 3:
+YY_RULE_SETUP
+#line 129 "./IPFilterScanner.l"
+{
+		/* AntiP2P filter line
+		   <Description> : <IPStart> - <IPEnd>
+		*/
+		char * ip1 = strrchr(yyiptext, ':');
+		*ip1++ = 0;		// remove : and terminate comment
+		char * ip2 = strchr(ip1 + 7, '-') + 1;
+		if (!ScanIP(ip1, IPStart) || !ScanIP(ip2, IPEnd)) {
+			yyip_Bad++;
+		} else {
+			IPLevel = 0;
+			IPDescription = yyiptext;
+			return 1;
+		}
+	}
+	YY_BREAK
+case 4:
+/* rule 4 can match eol */
+YY_RULE_SETUP
+#line 145 "./IPFilterScanner.l"
+{
+		yyip_Line++;
+	}
+	YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 149 "./IPFilterScanner.l"
+{ 
+		/* Bad line */
+		yyip_Bad++;
+		AddDebugLogLineN(logIPFilter, CFormat(wxT("error in line %d: %s")) % yyip_Line % wxString(char2unicode(yyiptext)));
+	}
+	YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 155 "./IPFilterScanner.l"
+ECHO;
+	YY_BREAK
+#line 1014 "IPFilterScanner.cpp"
+case YY_STATE_EOF(INITIAL):
+	yyterminate();
+
+	case YY_END_OF_BUFFER:
+		{
+		/* Amount of text matched not including the EOB char. */
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+		/* Undo the effects of YY_DO_BEFORE_ACTION. */
+		*yy_cp = (yy_hold_char);
+		YY_RESTORE_YY_MORE_OFFSET
+
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+			{
+			/* We're scanning a new file or input source.  It's
+			 * possible that this happened because the user
+			 * just pointed yyipin at a new source and called
+			 * yyiplex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
+			 * globals.  Here is the right place to do so, because
+			 * this is the first action (other than possibly a
+			 * back-up) that will match for the new input source.
+			 */
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyipin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+			}
+
+		/* Note that here we test for yy_c_buf_p "<=" to the position
+		 * of the first EOB in the buffer, since yy_c_buf_p will
+		 * already have been incremented past the NUL character
+		 * (since all states make transitions on EOB to the
+		 * end-of-buffer state).  Contrast this with the test
+		 * in input().
+		 */
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			{ /* This was really a NUL. */
+			yy_state_type yy_next_state;
+
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+			yy_current_state = yy_get_previous_state(  );
+
+			/* Okay, we're now positioned to make the NUL
+			 * transition.  We couldn't have
+			 * yy_get_previous_state() go ahead and do it
+			 * for us because it doesn't know how to deal
+			 * with the possibility of jamming (and we don't
+			 * want to build jamming into it because then it
+			 * will run more slowly).
+			 */
+
+			yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+			if ( yy_next_state )
+				{
+				/* Consume the NUL. */
+				yy_cp = ++(yy_c_buf_p);
+				yy_current_state = yy_next_state;
+				goto yy_match;
+				}
+
+			else
+				{
+				yy_cp = (yy_c_buf_p);
+				goto yy_find_action;
+				}
+			}
+
+		else switch ( yy_get_next_buffer(  ) )
+			{
+			case EOB_ACT_END_OF_FILE:
+				{
+				(yy_did_buffer_switch_on_eof) = 0;
+
+				if ( yyipwrap( ) )
+					{
+					/* Note: because we've taken care in
+					 * yy_get_next_buffer() to have set up
+					 * yyiptext, we can now set up
+					 * yy_c_buf_p so that if some total
+					 * hoser (like flex itself) wants to
+					 * call the scanner after we return the
+					 * YY_NULL, it'll still work - another
+					 * YY_NULL will get returned.
+					 */
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+					yy_act = YY_STATE_EOF(YY_START);
+					goto do_action;
+					}
+
+				else
+					{
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+					}
+				break;
+				}
+
+			case EOB_ACT_CONTINUE_SCAN:
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_match;
+
+			case EOB_ACT_LAST_MATCH:
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+				yy_current_state = yy_get_previous_state(  );
+
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+				goto yy_find_action;
+			}
+		break;
+		}
+
+	default:
+		YY_FATAL_ERROR(
+			"fatal flex scanner internal error--no action found" );
+	} /* end of action switch */
+		} /* end of scanning one token */
+} /* end of yyiplex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *	EOB_ACT_LAST_MATCH -
+ *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *	EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
+	register int number_to_move, i;
+	int ret_val;
+
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+		YY_FATAL_ERROR(
+		"fatal flex scanner internal error--end of buffer missed" );
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+		{ /* Don't try to fill the buffer, so this is an EOF. */
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+			{
+			/* We matched a single character, the EOB, so
+			 * treat this as a final EOF.
+			 */
+			return EOB_ACT_END_OF_FILE;
+			}
+
+		else
+			{
+			/* We matched some text prior to the EOB, first
+			 * process it.
+			 */
+			return EOB_ACT_LAST_MATCH;
+			}
+		}
+
+	/* Try to read more data. */
+
+	/* First move last chars to start of buffer. */
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+	for ( i = 0; i < number_to_move; ++i )
+		*(dest++) = *(source++);
+
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+		/* don't do the read, it's not guaranteed to return an EOF,
+		 * just force an EOF
+		 */
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+	else
+		{
+			yy_size_t num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+		while ( num_to_read <= 0 )
+			{ /* Not enough room in the buffer - grow it. */
+
+			/* just a shorter name for the current buffer */
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+			int yy_c_buf_p_offset =
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+			if ( b->yy_is_our_buffer )
+				{
+				yy_size_t new_size = b->yy_buf_size * 2;
+
+				if ( new_size <= 0 )
+					b->yy_buf_size += b->yy_buf_size / 8;
+				else
+					b->yy_buf_size *= 2;
+
+				b->yy_ch_buf = (char *)
+					/* Include room in for 2 EOB chars. */
+					yyiprealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+				}
+			else
+				/* Can't grow it, we don't own it. */
+				b->yy_ch_buf = 0;
+
+			if ( ! b->yy_ch_buf )
+				YY_FATAL_ERROR(
+				"fatal error - scanner input buffer overflow" );
+
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+						number_to_move - 1;
+
+			}
+
+		if ( num_to_read > YY_READ_BUF_SIZE )
+			num_to_read = YY_READ_BUF_SIZE;
+
+		/* Read in more data. */
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
+
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	if ( (yy_n_chars) == 0 )
+		{
+		if ( number_to_move == YY_MORE_ADJ )
+			{
+			ret_val = EOB_ACT_END_OF_FILE;
+			yyiprestart(yyipin  );
+			}
+
+		else
+			{
+			ret_val = EOB_ACT_LAST_MATCH;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+				YY_BUFFER_EOF_PENDING;
+			}
+		}
+
+	else
+		ret_val = EOB_ACT_CONTINUE_SCAN;
+
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyiprealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+	return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+	register yy_state_type yy_current_state;
+	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
+	yy_current_state += YY_AT_BOL();
+
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+		{
+		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
+		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+			{
+			yy_current_state = (int) yy_def[yy_current_state];
+			if ( yy_current_state >= 169 )
+				yy_c = yy_meta[(unsigned int) yy_c];
+			}
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		}
+
+	return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *	next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
+
+	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
+	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+		{
+		yy_current_state = (int) yy_def[yy_current_state];
+		if ( yy_current_state >= 169 )
+			yy_c = yy_meta[(unsigned int) yy_c];
+		}
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_is_jam = (yy_current_state == 168);
+
+	return yy_is_jam ? 0 : yy_current_state;
+}
+
+    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 */
+	*yy_cp = (yy_hold_char);
+
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+		{ /* need to shift things up to make room */
+		/* +2 for EOB chars. */
+		register yy_size_t number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+		register char *source =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			*--dest = *--source;
+
+		yy_cp += (int) (dest - source);
+		yy_bp += (int) (dest - source);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
+
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
+			YY_FATAL_ERROR( "flex scanner push-back overflow" );
+		}
+
+	*--yy_cp = (char) c;
+
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
+
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+		{
+		/* yy_c_buf_p now points to the character we want to return.
+		 * If this occurs *before* the EOB characters, then it's a
+		 * valid NUL; if not, then we've hit the end of the buffer.
+		 */
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+			/* This was really a NUL. */
+			*(yy_c_buf_p) = '\0';
+
+		else
+			{ /* need more input */
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
+
+			switch ( yy_get_next_buffer(  ) )
+				{
+				case EOB_ACT_LAST_MATCH:
+					/* This happens because yy_g_n_b()
+					 * sees that we've accumulated a
+					 * token and flags that we need to
+					 * try matching the token before
+					 * proceeding.  But for input(),
+					 * there's no matching to consider.
+					 * So convert the EOB_ACT_LAST_MATCH
+					 * to EOB_ACT_END_OF_FILE.
+					 */
+
+					/* Reset buffer status. */
+					yyiprestart(yyipin );
+
+					/*FALLTHROUGH*/
+
+				case EOB_ACT_END_OF_FILE:
+					{
+					if ( yyipwrap( ) )
+						return 0;
+
+					if ( ! (yy_did_buffer_switch_on_eof) )
+						YY_NEW_FILE;
+#ifdef __cplusplus
+					return yyinput();
+#else
+					return input();
+#endif
+					}
+
+				case EOB_ACT_CONTINUE_SCAN:
+					(yy_c_buf_p) = (yytext_ptr) + offset;
+					break;
+				}
+			}
+		}
+
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve yyiptext */
+	(yy_hold_char) = *++(yy_c_buf_p);
+
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
+
+	return c;
+}
+#endif	/* ifndef YY_NO_INPUT */
+
+/** 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 =
+            yyip_create_buffer(yyipin,YY_BUF_SIZE );
+	}
+
+	yyip_init_buffer(YY_CURRENT_BUFFER,input_file );
+	yyip_load_buffer_state( );
+}
+
+/** 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();
+	 *		yyippush_buffer_state(new_buffer);
+     */
+	yyipensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
+		return;
+
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	yyip_load_buffer_state( );
+
+	/* We don't actually know whether we did this switch during
+	 * EOF (yyipwrap()) processing, but the only time this flag
+	 * is looked at is after yyipwrap() is called, so it's safe
+	 * to go ahead and always set it.
+	 */
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void yyip_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	yyipin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** 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()" );
+
+	b->yy_buf_size = size;
+
+	/* yy_ch_buf has to be 2 characters longer than the size given because
+	 * we need to put in 2 end-of-buffer characters.
+	 */
+	b->yy_ch_buf = (char *) yyipalloc(b->yy_buf_size + 2  );
+	if ( ! b->yy_ch_buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yyip_create_buffer()" );
+
+	b->yy_is_our_buffer = 1;
+
+	yyip_init_buffer(b,file );
+
+	return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with yyip_create_buffer()
+ * 
+ */
+    void yyip_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+	if ( ! b )
+		return;
+
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+	if ( b->yy_is_our_buffer )
+		yyipfree((void *) b->yy_ch_buf  );
+
+	yyipfree((void *) b  );
+}
+
+#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.
+ */
+    static void yyip_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+	int oerrno = errno;
+    
+	yyip_flush_buffer(b );
+
+	b->yy_input_file = file;
+	b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then yyip_init_buffer was _probably_
+     * called from yyiprestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        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 )
+{
+    	if ( ! b )
+		return;
+
+	b->yy_n_chars = 0;
+
+	/* We always need two end-of-buffer characters.  The first causes
+	 * a transition to the end-of-buffer state.  The second causes
+	 * a jam in that state.
+	 */
+	b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+	b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+	b->yy_buf_pos = &b->yy_ch_buf[0];
+
+	b->yy_at_bol = 1;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	if ( b == YY_CURRENT_BUFFER )
+		yyip_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  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 )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	yyipensure_buffer_stack();
+
+	/* This block is copied from yyip_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from yyip_switch_to_buffer. */
+	yyip_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yyippop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	yyip_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		yyip_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
+	}
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyipensure_buffer_stack (void)
+{
+	yy_size_t num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyipalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyipensure_buffer_stack()" );
+								  
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
+
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyiprealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in yyipensure_buffer_stack()" );
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yyip_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
+	if ( size < 2 ||
+	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
+	     base[size-1] != YY_END_OF_BUFFER_CHAR )
+		/* They forgot to leave room for the EOB's. */
+		return 0;
+
+	b = (YY_BUFFER_STATE) yyipalloc(sizeof( struct yy_buffer_state )  );
+	if ( ! b )
+		YY_FATAL_ERROR( "out of dynamic memory in yyip_scan_buffer()" );
+
+	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_pos = b->yy_ch_buf = base;
+	b->yy_is_our_buffer = 0;
+	b->yy_input_file = 0;
+	b->yy_n_chars = b->yy_buf_size;
+	b->yy_is_interactive = 0;
+	b->yy_at_bol = 1;
+	b->yy_fill_buffer = 0;
+	b->yy_buffer_status = YY_BUFFER_NEW;
+
+	yyip_switch_to_buffer(b  );
+
+	return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to yyiplex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yyip_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yyip_scan_string (yyconst char * yystr )
+{
+    
+	return yyip_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to yyiplex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yyip_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+{
+	YY_BUFFER_STATE b;
+	char *buf;
+	yy_size_t n, i;
+    
+	/* Get memory for full buffer, including space for trailing EOB's. */
+	n = _yybytes_len + 2;
+	buf = (char *) yyipalloc(n  );
+	if ( ! buf )
+		YY_FATAL_ERROR( "out of dynamic memory in yyip_scan_bytes()" );
+
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
+
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+	b = yyip_scan_buffer(buf,n );
+	if ( ! b )
+		YY_FATAL_ERROR( "bad buffer in yyip_scan_bytes()" );
+
+	/* It's okay to grow etc. this buffer, and we should throw it
+	 * away when we're done.
+	 */
+	b->yy_is_our_buffer = 1;
+
+	return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
+	exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+	do \
+		{ \
+		/* Undo effects of setting up yyiptext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		yyiptext[yyipleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yyiptext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		yyipleng = yyless_macro_arg; \
+		} \
+	while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int yyipget_lineno  (void)
+{
+        
+    return yyiplineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *yyipget_in  (void)
+{
+        return yyipin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *yyipget_out  (void)
+{
+        return yyipout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+yy_size_t yyipget_leng  (void)
+{
+        return yyipleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *yyipget_text  (void)
+{
+        return yyiptext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void yyipset_lineno (int  line_number )
+{
+    
+    yyiplineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see yyip_switch_to_buffer
+ */
+void yyipset_in (FILE *  in_str )
+{
+        yyipin = in_str ;
+}
+
+void yyipset_out (FILE *  out_str )
+{
+        yyipout = out_str ;
+}
+
+int yyipget_debug  (void)
+{
+        return yyip_flex_debug;
+}
+
+void yyipset_debug (int  bdebug )
+{
+        yyip_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from yyiplex_destroy(), so don't allocate here.
+     */
+
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyipin = stdin;
+    yyipout = stdout;
+#else
+    yyipin = (FILE *) 0;
+    yyipout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * yyiplex_init()
+     */
+    return 0;
+}
+
+/* yyiplex_destroy is for both reentrant and non-reentrant scanners. */
+int yyiplex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		yyip_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		yyippop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	yyipfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * yyiplex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+	register int i;
+	for ( i = 0; i < n; ++i )
+		s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+	register int n;
+	for ( n = 0; s[n]; ++n )
+		;
+
+	return n;
+}
+#endif
+
+void *yyipalloc (yy_size_t  size )
+{
+	return (void *) malloc( size );
+}
+
+void *yyiprealloc  (void * ptr, yy_size_t  size )
+{
+	/* The cast to (char *) in the following accommodates both
+	 * implementations that use char* generic pointers, and those
+	 * that use void* generic pointers.  It works with the latter
+	 * because both ANSI C and C++ allow castless assignment from
+	 * any pointer type to void*, and deal with argument conversions
+	 * as though doing an assignment.
+	 */
+	return (void *) realloc( (char *) ptr, size );
+}
+
+void yyipfree (void * ptr )
+{
+	free( (char *) ptr );	/* see yyiprealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 155 "./IPFilterScanner.l"
+
+
+

aMule-2.3.1.tar.bz2/src/IPFilterScanner.h Added

@@ -0,0 +1,40 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2009-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2009-2011 Stu Redman ( sturedman@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 IPFILTERSCANNER_H
+#define IPFILTERSCANNER_H
+
+#ifndef IPFS_EXTERN
+#define IPFS_EXTERN extern
+#endif
+
+#define YY_DECL int yyiplex(uint32 & IPStart, uint32 & IPEnd, uint32 & IPLevel, char * & IPDescription)
+YY_DECL;
+void yyiprestart(FILE *new_file);
+
+IPFS_EXTERN int yyip_Bad;
+IPFS_EXTERN int yyip_Line;
+
+#endif

aMule-2.3.1.tar.bz2/src/IPFilterScanner.l Added

@@ -0,0 +1,155 @@
+%{
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2009-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2009-2011 Stu Redman ( sturedman@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
+//
+
+//
+// Read IP filters
+//
+// These have a silly "grammar". For example:
+// 1.2.3.4-1.2.3.5,100,Duh:2.3.4.5-2.3.4.6
+// Now - which format is it, and what range should it take?
+//
+// So just use the lexer to read the file and assure the line format.
+// The actual IP reading is done with the ScanIP() function.
+//
+
+#include <stdio.h>
+#include "Types.h"
+#include "Logger.h"
+#define IPFS_EXTERN
+#include "IPFilterScanner.h"
+#include <common/Format.h>
+#include <common/StringFunctions.h>
+
+#ifdef _MSC_VER
+#define isatty(DUMMY) 0
+#define YY_NO_UNISTD_H
+#pragma warning(disable:4003) 
+#endif
+
+#define YY_NEVER_INTERACTIVE 1
+
+// When we get here the IP has been lexed nicely,
+// so we can blaze through without any checks.
+// The total lexing time is more than twice as fast
+// with this than when using sscanf.
+static bool ScanIP(const char * buf, uint32 & ip)
+{
+	while (*buf < '0') {
+		buf++;	// skip whitespace
+	}
+	ip = 0;
+	int a = 0;
+	for (int i = 0; i < 4; buf++) {
+		if (*buf < '0' || *buf > '9') {
+			// finished a number, check it and add to the ip
+			if (a > 255) {
+				return false;
+			}
+			ip = (ip << 8) | a;
+			a = 0;
+			i++;
+		} else {
+			// build number
+			a = a * 10 + *buf - '0';
+		}
+	}
+	return true;
+}
+
+static bool ScanInt(const char * buf, uint32 & a)
+{
+	while (*buf < '0') {
+		buf++;	// skip whitespace
+	}
+	a = 0;
+	while (*buf >= '0' && *buf <= '9') {
+		a = a * 10 + *buf - '0';
+		if (a > 255) {
+			return false;
+		}
+		buf++;
+	}
+	return true;
+}
+
+%}
+
+%option noyywrap
+
+NO		[0-9]{1,3}
+IP		{NO}"."{NO}"."{NO}"."{NO}
+WS		[ \t\r]*
+
+%%
+
+^{WS}{IP}{WS}-{WS}{IP}{WS},{WS}{NO}{WS},.*		{
+		/* PeerGuardian filter line
+		   <IPStart> - <IPEnd> , <AccessLevel> , <Description> 
+		*/
+		char * ip1 = yytext;
+		char * ip2 = strchr(ip1 + 7, '-') + 1;
+		char * acc = strchr(ip2 + 7, ',') + 1;
+		char * dsc = strchr(acc + 1, ',') + 1;
+		if (!ScanIP(ip1, IPStart) || !ScanIP(ip2, IPEnd)
+			|| !ScanInt(acc, IPLevel)) {
+			yyip_Bad++;
+		} else {
+			IPDescription = dsc;
+			return 1;
+		}
+	}
+
+^{WS}#.*	{
+		/* Comment */
+	}
+
+^.*:{WS}{IP}{WS}-{WS}{IP}{WS}		{
+		/* AntiP2P filter line
+		   <Description> : <IPStart> - <IPEnd>
+		*/
+		char * ip1 = strrchr(yytext, ':');
+		*ip1++ = 0;		// remove : and terminate comment
+		char * ip2 = strchr(ip1 + 7, '-') + 1;
+		if (!ScanIP(ip1, IPStart) || !ScanIP(ip2, IPEnd)) {
+			yyip_Bad++;
+		} else {
+			IPLevel = 0;
+			IPDescription = yytext;
+			return 1;
+		}
+	}
+
+{WS}"\n"	{
+		yyip_Line++;
+	}
+
+^.			{ 
+		/* Bad line */
+		yyip_Bad++;
+		AddDebugLogLineN(logIPFilter, CFormat(wxT("error in line %d: %s")) % yyip_Line % wxString(char2unicode(yytext)));
+	}
+
+%%

aMule-2.2.6.tar.bz2/src/InternalEvents.h -> aMule-2.3.1.tar.bz2/src/InternalEvents.h Changed

aMule-2.2.6.tar.bz2/src/KadDlg.cpp -> aMule-2.3.1.tar.bz2/src/KadDlg.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Angel Vidal (Kry) ( kry@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
@@ -34,7 +34,8 @@
 #include "StatisticsDlg.h"
 #include "ColorFrameCtrl.h"
 #include "amuleDlg.h"
-
+#include "MuleColour.h"
+#include "Statistics.h"
 
 #ifndef CLIENT_GUI
 #include "kademlia/kademlia/Kademlia.h"
@@ -71,6 +72,20 @@
 	m_kad_scope->SetRanges(0.0, thePrefs::GetStatsMax());
 	m_kad_scope->SetYUnits(wxT("Nodes"));
 
+#ifndef __WXMSW__
+	//
+	// Get label with line breaks out of muuli.wdr, because generated code fails 
+	// to compile in Windows.
+	//
+	// In Windows, setting a button label with a newline fails (the newline is ignored).
+	// Creating a button with such a label works however. :-/
+	// So leave the label from the muuli (without line breaks) here,
+	// so it can still be fixed in the translation.
+	//
+	wxButton* bootstrap = CastChild(ID_KNOWNNODECONNECT, wxButton);
+	bootstrap->SetLabel(_("Bootstrap from \nknown clients"));
+#endif
+
 	SetUpdatePeriod(thePrefs::GetTrafficOMeterInterval());
 	SetGraphColors();
 }
@@ -99,8 +114,8 @@
 		m_kad_scope->SetPlotColor(CStatisticsDlg::getColors(12 + i), aTrend[i]);
 		
 		CColorFrameCtrl* ctrl = CastChild(aRes[i], CColorFrameCtrl);
-		ctrl->SetBackgroundColor(CStatisticsDlg::getColors(12 + i));
-		ctrl->SetFrameColor((COLORREF)RGB(0,0,0));	
+		ctrl->SetBackgroundBrushColour(CMuleColour(CStatisticsDlg::getColors(12 + i)));
+		ctrl->SetFrameBrushColour(*wxBLACK);
 	}
 }
 
@@ -129,7 +144,7 @@
 	wxStaticText* label = CastChild( wxT("nodesListLabel"), wxStaticText );
 	wxCHECK_RET(label, wxT("Failed to find kad-nodes label"));
 
-	label->SetLabel(wxString::Format(_("Nodes (%u)"), nodeCount));
+	label->SetLabel(CFormat(_("Nodes (%u)")) % nodeCount);
 	label->GetParent()->Layout();
 }

aMule-2.2.6.tar.bz2/src/KadDlg.h -> aMule-2.3.1.tar.bz2/src/KadDlg.h Changed

aMule-2.2.6.tar.bz2/src/KnownFile.cpp -> aMule-2.3.1.tar.bz2/src/KnownFile.cpp Changed

@@ -3,8 +3,8 @@
 //
 // Parts of this file are based on work from pan One (http://home-3.tiscali.nl/~meost/pms/)
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -28,18 +28,21 @@
 
 #include "KnownFile.h"		// Do_not_auto_remove
 
-
 #include <protocol/kad/Constants.h>
 #include <protocol/ed2k/Client2Client/TCP.h>
+#include <protocol/ed2k/ClientSoftware.h>
 #include <protocol/Protocols.h>
 #include <tags/FileTags.h>
 
-
 #include <wx/config.h>
 
+#ifdef CLIENT_GUI
+#include "UpDownClientEC.h"	// Needed for CUpDownClient
+#else
+#include "updownclient.h"	// Needed for CUpDownClient
+#endif
 
 #include "MemFile.h"		// Needed for CMemFile
-#include "updownclient.h"	// Needed for CUpDownClient
 #include "Packet.h"		// Needed for CPacket
 #include "Preferences.h"	// Needed for CPreferences
 #include "KnownFileList.h"	// Needed for CKnownFileList
@@ -50,6 +53,9 @@
 #include "ScopedPtr.h"		// Needed for CScopedArray and CScopedPtr
 #include "GuiEvents.h"		// Needed for Notify_*
 #include "SearchFile.h"		// Needed for CSearchFile
+#include "FileArea.h"		// Needed for CFileArea
+#include "FileAutoClose.h"	// Needed for CFileAutoClose
+#include "Server.h"			// Needed for CServer
 
 #include "CryptoPP_Inc.h"       // Needed for MD4
 
@@ -271,9 +277,11 @@
 CKnownFile::CKnownFile()
 {
 	Init();
-	
-	m_bAutoUpPriority = thePrefs::GetNewAutoUp();
-	m_iUpPriority = ( m_bAutoUpPriority ) ? PR_HIGH : PR_NORMAL;
+}
+
+CKnownFile::CKnownFile(uint32 ecid) : CECID(ecid)
+{
+	Init();
 }
 
 
@@ -290,14 +298,13 @@
 
 	// Use CKnownFile::SetFileSize()
 	SetFileSize(searchFile.GetFileSize());
-	
-	m_bAutoUpPriority = thePrefs::GetNewAutoUp();
-	m_iUpPriority = ( m_bAutoUpPriority ) ? PR_HIGH : PR_NORMAL;
 }
 
 
 void CKnownFile::Init() 
 {
+	m_showSources = false;
+	m_showPeers = false;
 	m_nCompleteSourcesTime = time(NULL);
 	m_nCompleteSourcesCount = 0;
 	m_nCompleteSourcesCountLo = 0;
@@ -312,6 +319,8 @@
 	m_lastPublishTimeKadNotes = 0;
 	m_lastBuddyIP = 0;
 	m_lastDateChanged = 0;
+	m_bAutoUpPriority = thePrefs::GetNewAutoUp();
+	m_iUpPriority = ( m_bAutoUpPriority ) ? PR_HIGH : PR_NORMAL;
 
 	statistic.fileParent = this;
 
@@ -321,70 +330,12 @@
 }
 
 
-#ifdef CLIENT_GUI
-
-CKnownFile::CKnownFile(CEC_SharedFile_Tag *tag)
-{
-	Init();
-	
-	SetFileName(CPath(tag->FileName()));
-	m_abyFileHash = tag->ID();
-	SetFileSize(tag->SizeFull());
-	m_iPartCount = (GetFileSize() + (PARTSIZE - 1)) / PARTSIZE;
-	m_AvailPartFrequency.insert(m_AvailPartFrequency.end(), m_iPartCount, 0);
-	m_iUpPriority = tag->Prio();
-	if ( m_iUpPriority >= 10 ) {
-		m_iUpPriority-= 10;
-		m_bAutoUpPriority = true;
-	} else {
-		m_bAutoUpPriority = false;
-	}
-
-	m_AICHMasterHash = tag->GetAICHHash();
-}
-
-CKnownFile::~CKnownFile()
-{
-}
-
-#else // ! CLIENT_GUI
-
-CKnownFile::~CKnownFile()
-{
-	SourceSet::iterator it = m_ClientUploadList.begin();
-	for ( ; it != m_ClientUploadList.end(); ++it ) {
-		(*it)->ClearUploadFileID();
-	}
-	
-	delete m_pAICHHashSet;
-}
-
-void CKnownFile::AddUploadingClient(CUpDownClient* client)
-{
-	m_ClientUploadList.insert(client);
-	
-	UpdateAutoUpPriority();
-}
-
-
-void CKnownFile::RemoveUploadingClient(CUpDownClient* client)
-{
-	if (m_ClientUploadList.erase(client)) {
-		UpdateAutoUpPriority();
-	}
-}
-
-
-void CKnownFile::SetFilePath(const CPath& filePath)
-{
-	m_filePath = filePath;
-}
-
-
 void CKnownFile::SetFileSize(uint64 nFileSize)
 {
 	CAbstractFile::SetFileSize(nFileSize);
+#ifndef CLIENT_GUI
 	m_pAICHHashSet->SetFileSize(nFileSize);
+#endif
 	
 	// Examples of parthashs, hashsets and filehashs for different filesizes
 	// according the ed2k protocol
@@ -444,15 +395,23 @@
 	// PARTSIZE*2+1    3               3               3
 
 	if (nFileSize == 0){
-		//wxASSERT(0); // Kry - Why commented out by lemonfan? it can never be 0
+		//wxFAIL; // Kry - Why commented out by lemonfan? it can never be 0
 		m_iPartCount = 0;
 		m_iED2KPartCount = 0;
 		m_iED2KPartHashCount = 0;
+		m_sizeLastPart = 0;
 		return;
 	}
 
 	// nr. of data parts
-	m_iPartCount = (nFileSize + (PARTSIZE - 1)) / PARTSIZE;
+	m_iPartCount = nFileSize / PARTSIZE + 1;
+	// size of last part
+	m_sizeLastPart = nFileSize % PARTSIZE;
+	// file with size of n * PARTSIZE
+	if (m_sizeLastPart == 0) {
+		m_sizeLastPart = PARTSIZE;
+		m_iPartCount--;
+	}
 
 	// nr. of parts to be used with OP_FILESTATUS
 	m_iED2KPartCount = nFileSize / PARTSIZE + 1;
@@ -465,12 +424,83 @@
 }
 
 
+void CKnownFile::AddUploadingClient(CUpDownClient* client)
+{
+	m_ClientUploadList.insert(CCLIENTREF(client, wxT("CKnownFile::AddUploadingClient m_ClientUploadList")));
+	
+	SourceItemType type = UNAVAILABLE_SOURCE;
+	switch (client->GetUploadState()) {
+		case US_UPLOADING:
+		case US_ONUPLOADQUEUE:
+			type = AVAILABLE_SOURCE;
+			break;
+		default: {
+			// Any other state is UNAVAILABLE_SOURCE by default.
+		}
+	}
+
+	Notify_SharedCtrlAddClient(this, CCLIENTREF(client, wxT("CKnownFile::AddUploadingClient Notify_SharedCtrlAddClient")), type);
+	
+	UpdateAutoUpPriority();
+}
+
+
+void CKnownFile::RemoveUploadingClient(CUpDownClient* client)
+{
+	if (m_ClientUploadList.erase(CCLIENTREF(client, wxEmptyString))) {
+		Notify_SharedCtrlRemoveClient(client->ECID(), this);
+		UpdateAutoUpPriority();
+	}
+}
+
+
+#ifdef CLIENT_GUI
+
+CKnownFile::CKnownFile(CEC_SharedFile_Tag *tag) : CECID(tag->ID())
+{
+	Init();
+	
+	m_abyFileHash = tag->FileHash();
+	SetFileSize(tag->SizeFull());
+	m_AvailPartFrequency.insert(m_AvailPartFrequency.end(), m_iPartCount, 0);
+	m_queuedCount = 0;
+}
+
+CKnownFile::~CKnownFile()
+{
+}
+
+void CKnownFile::UpdateAutoUpPriority() 
+{
+}
+
+
+#else // ! CLIENT_GUI
+
+CKnownFile::~CKnownFile()
+{
+	SourceSet::iterator it = m_ClientUploadList.begin();
+	for ( ; it != m_ClientUploadList.end(); ++it ) {
+		it->ClearUploadFileID();
+	}
+	
+	delete m_pAICHHashSet;
+}
+
+
+void CKnownFile::SetFilePath(const CPath& filePath)
+{
+	m_filePath = filePath;
+}
+
+
 // needed for memfiles. its probably better to switch everything to CFile...
 bool CKnownFile::LoadHashsetFromFile(const CFileDataIO* file, bool checkhash)
 {
 	CMD4Hash checkid = file->ReadHash();
 	
 	uint16 parts = file->ReadUInt16();
+	m_hashlist.clear();
 	for (uint16 i = 0; i < parts; ++i){
 		CMD4Hash cur_hash = file->ReadHash();
 		m_hashlist.push_back(cur_hash);
@@ -513,6 +543,7 @@
 bool CKnownFile::LoadTagsFromFile(const CFileDataIO* file)
 {
 	uint32 tagcount = file->ReadUInt32();
+	m_taglist.clear();
 	for (uint32 j = 0; j != tagcount; ++j) {
 		CTag newtag(*file, true);
 		switch(newtag.GetNameID()){
@@ -768,21 +799,22 @@
 }
 
 
-void CKnownFile::CreateHashFromFile(CFileDataIO* file, uint32 Length, CMD4Hash* Output, CAICHHashTree* pShaHashOut)
+void CKnownFile::CreateHashFromFile(CFileAutoClose& file, uint64 offset, uint32 Length, CMD4Hash* Output, CAICHHashTree* pShaHashOut)
 {
-	wxCHECK_RET(file && Length, wxT("No input to hash from in CreateHashFromFile"));
-	
-	std::vector<byte> buffer(Length);
-	file->Read(&buffer[0], Length);
+	wxCHECK_RET(Length, wxT("No input to hash from in CreateHashFromFile"));
 
-	CreateHashFromInput(&buffer[0], Length, Output, pShaHashOut);
+	CFileArea area;
+	area.ReadAt(file, offset, Length);
+ 
+	CreateHashFromInput(area.GetBuffer(), Length, Output, pShaHashOut);
+	area.CheckError();
 }	
 
 
 void CKnownFile::CreateHashFromInput(const byte* input, uint32 Length, CMD4Hash* Output, CAICHHashTree* pShaHashOut )
 {
 	wxASSERT_MSG(Output || pShaHashOut, wxT("Nothing to do in CreateHashFromInput"));
-	wxCHECK_RET(input, wxT("No input to hash from in CreateHashFromInput"));
+	{ wxCHECK_RET(input, wxT("No input to hash from in CreateHashFromInput")); }
 	wxASSERT(Length <= PARTSIZE); // We never hash more than one PARTSIZE
 	
 	CMemFile data(input, Length);
@@ -891,7 +923,7 @@
 		if (GetFileName().IsOk()) {
 			file2 = GetFileName().GetPrintable();
 		}
-		AddDebugLogLineM(false, logKnownFiles, wxT("File missmatch on source packet (K) Sending: ") + file1 + wxT("  From: ") + file2);
+		AddDebugLogLineN(logKnownFiles, wxT("File mismatch on source packet (K) Sending: ") + file1 + wxT("  From: ") + file2);
 		return NULL;
 	}
 
@@ -900,7 +932,7 @@
 	//wxASSERT(rcvstatus.size() == GetPartCount()); // Obviously!
 	if (rcvstatus.size() != GetPartCount()) {
 		// Yuck. Same file but different part count? Seriously fucked up.
-		AddDebugLogLineM(false, logKnownFiles, wxString::Format(wxT("Impossible situation: different partcounts for the same known file: %i (client) and %i (file)"),rcvstatus.size(),GetPartCount()));
+		AddDebugLogLineN(logKnownFiles, CFormat(wxT("Impossible situation: different partcounts for the same known file: %i (client) and %i (file)")) % rcvstatus.size() % GetPartCount());
 		return NULL;
 	}
 
@@ -917,13 +949,13 @@
 
 		// we don't support any special SX2 options yet, reserved for later use
 		if (nRequestedOptions != 0) {
-			AddDebugLogLineM(false, logKnownFiles, CFormat(wxT("Client requested unknown options for SourceExchange2: %u")) % nRequestedOptions);
+			AddDebugLogLineN(logKnownFiles, CFormat(wxT("Client requested unknown options for SourceExchange2: %u")) % nRequestedOptions);
 		}
 	} else {
 		byUsedVersion = forClient->GetSourceExchange1Version();
 		bIsSX2Packet = false;
 		if (forClient->SupportsSourceExchange2()) {
-			AddDebugLogLineM(false, logKnownFiles, wxT("Client which announced to support SX2 sent SX1 packet instead"));
+			AddDebugLogLineN(logKnownFiles, wxT("Client which announced to support SX2 sent SX1 packet instead"));
 		}
 	}
 	
@@ -935,7 +967,7 @@
 
 	SourceSet::iterator it = m_ClientUploadList.begin();
 	for ( ; it != m_ClientUploadList.end(); it++ ) {
-		const CUpDownClient *cur_src = *it;
+		const CUpDownClient *cur_src = it->GetClient();
 		
 		if (	cur_src->HasLowID() ||
 			cur_src == forClient ||
@@ -955,7 +987,7 @@
 				}
 				if ( cur_src->GetUpPartCount() == forClient->GetUpPartCount() ) {
 					for (int x = 0; x < GetPartCount(); x++ ) {
-						if ( srcstatus.at(x) && !rcvstatus.at(x) ) {
+						if ( srcstatus.get(x) && !rcvstatus.get(x) ) {
 							// We know the receiving client needs
 							// a chunk from this client.
 							bNeeded = true;
@@ -983,7 +1015,7 @@
 					continue;
 				}
 				for (int x = 0; x < GetPartCount(); x++ ) {
-					if ( srcstatus.at(x) ) {
+					if ( srcstatus.get(x) ) {
 						// this client has at least one chunk
 						bNeeded = true;
 						break;
@@ -1049,6 +1081,152 @@
 }
 
 
+void CKnownFile::CreateOfferedFilePacket(
+	CMemFile *files,
+	CServer *pServer,
+	CUpDownClient *pClient) {
+		
+	// This function is used for offering files to the local server and for sending
+	// shared files to some other client. In each case we send our IP+Port only, if
+	// we have a HighID.
+
+	wxASSERT(!(pClient && pServer));
+		
+	SetPublishedED2K(true);
+	files->WriteHash(GetFileHash());
+
+	uint32 nClientID = 0;
+	uint16 nClientPort = 0;
+
+	if (pServer) {
+		if (pServer->GetTCPFlags() & SRV_TCPFLG_COMPRESSION) {
+			#define FILE_COMPLETE_ID		0xfbfbfbfb
+			#define FILE_COMPLETE_PORT	0xfbfb
+			#define FILE_INCOMPLETE_ID	0xfcfcfcfc
+			#define FILE_INCOMPLETE_PORT	0xfcfc
+			// complete   file: ip 251.251.251 (0xfbfbfbfb) port 0xfbfb
+			// incomplete file: op 252.252.252 (0xfcfcfcfc) port 0xfcfc
+			if (GetStatus() == PS_COMPLETE) {
+				nClientID = FILE_COMPLETE_ID;
+				nClientPort = FILE_COMPLETE_PORT;
+			} else {
+				nClientID = FILE_INCOMPLETE_ID;
+				nClientPort = FILE_INCOMPLETE_PORT;
+			}
+		} else {
+			if (theApp->IsConnectedED2K() && !::IsLowID(theApp->GetED2KID())){
+				nClientID = theApp->GetID();
+				nClientPort = thePrefs::GetPort();
+			}
+		}
+	} else {
+		// Do not merge this with the above case - this one
+		// also checks Kad status.
+		if (theApp->IsConnected() && !theApp->IsFirewalled()) {
+			nClientID = theApp->GetID();
+			nClientPort = thePrefs::GetPort();
+		}		
+	}
+
+	files->WriteUInt32(nClientID);
+	files->WriteUInt16(nClientPort);
+	
+	TagPtrList tags;
+
+	// The printable filename is used because it's destined for another user.
+	tags.push_back(new CTagString(FT_FILENAME, GetFileName().GetPrintable()));
+	
+	if (pClient && pClient->GetVBTTags()) {
+		tags.push_back(new CTagVarInt(FT_FILESIZE, GetFileSize()));
+	} else {
+		if (!IsLargeFile()){
+			tags.push_back(new CTagInt32(FT_FILESIZE, GetFileSize()));
+		} else {
+			// Large file
+			// we send 2*32 bit tags to servers, but a real 64 bit tag to other clients.
+			if (pServer) {
+				if (!pServer->SupportsLargeFilesTCP()){
+					wxFAIL;
+					tags.push_back(new CTagInt32(FT_FILESIZE, 0));
+				} else {
+					tags.push_back(new CTagInt32(FT_FILESIZE, (uint32)GetFileSize()));
+					tags.push_back(new CTagInt32(FT_FILESIZE_HI, (uint32)(GetFileSize() >> 32)));
+				}
+			} else {
+				if (!pClient->SupportsLargeFiles()) {
+					wxFAIL;
+					tags.push_back(new CTagInt32(FT_FILESIZE, 0));
+				} else {
+					tags.push_back(new CTagInt64(FT_FILESIZE, GetFileSize()));
+				}
+			}		
+		}
+	}
+	
+	if (GetFileRating()) {
+		tags.push_back(new CTagVarInt(FT_FILERATING, GetFileRating(), (pClient && pClient->GetVBTTags()) ? 0 : 32));
+	}
+
+	// NOTE: Archives and CD-Images are published+searched with file type "Pro"
+	bool bAddedFileType = false;
+	if (pServer && (pServer->GetTCPFlags() & SRV_TCPFLG_TYPETAGINTEGER)) {
+		// Send integer file type tags to newer servers
+		EED2KFileType eFileType = GetED2KFileTypeSearchID(GetED2KFileTypeID(GetFileName()));
+		if (eFileType >= ED2KFT_AUDIO && eFileType <= ED2KFT_CDIMAGE) {
+			tags.push_back(new CTagInt32(FT_FILETYPE, eFileType));
+			bAddedFileType = true;
+		}
+	}
+	if (!bAddedFileType) {
+		// Send string file type tags to:
+		//	- newer servers, in case there is no integer type available for the file type (e.g. emulecollection)
+		//	- older servers
+		//	- all clients
+		wxString strED2KFileType(GetED2KFileTypeSearchTerm(GetED2KFileTypeID(GetFileName())));
+		if (!strED2KFileType.IsEmpty()) {
+			tags.push_back(new CTagString(FT_FILETYPE, strED2KFileType));
+		}
+	}
+
+	// There, we could add MetaData info, if we ever get to have that.
+	
+	EUtf8Str eStrEncode;
+
+	bool unicode_support = 
+		// eservers that support UNICODE.
+		(pServer && (pServer->GetUnicodeSupport()))
+		||
+		// clients that support unicode
+		(pClient && pClient->GetUnicodeSupport());
+	eStrEncode = unicode_support ? utf8strRaw : utf8strNone;
+	
+	files->WriteUInt32(tags.size());
+
+	// Sadly, eMule doesn't use a MISCOPTIONS flag on hello packet for this, so we
+	// have to identify the support for new tags by version.
+	bool new_ed2k = 	
+		// eMule client > 0.42f
+		(pClient && pClient->IsEmuleClient() && pClient->GetVersion()  >= MAKE_CLIENT_VERSION(0,42,7))
+		||
+		// aMule >= 2.0.0rc8. Sadly, there's no way to check the rcN number, so I checked
+		// the rc8 changelog. On rc8 OSInfo was introduced, so...
+		(pClient && pClient->GetClientSoft() == SO_AMULE && !pClient->GetClientOSInfo().IsEmpty())
+		||
+		// eservers use a flag for this, at least.
+		(pServer && (pServer->GetTCPFlags() & SRV_TCPFLG_NEWTAGS));
+	
+	for (TagPtrList::iterator it = tags.begin(); it != tags.end(); ++it ) {
+		CTag* pTag = *it;
+		if (new_ed2k) {
+			pTag->WriteNewEd2kTag(files, eStrEncode);
+		} else {
+			pTag->WriteTagToFile(files, eStrEncode);
+		}
+		delete pTag;		
+	}
+}
+
+
 // Updates priority of file if autopriority is activated
 void CKnownFile::UpdateAutoUpPriority()
 {
@@ -1071,43 +1249,31 @@
 	}
 }
 
-void CKnownFile::SetFileComment(const wxString& strNewComment)
+void CKnownFile::SetFileCommentRating(const wxString& strNewComment, int8 iNewRating)
 { 
-	if (m_strComment != strNewComment) {
+	if (m_strComment != strNewComment || m_iRating != iNewRating) {
 		SetLastPublishTimeKadNotes(0);
 		wxString strCfgPath = wxT("/") + m_abyFileHash.Encode() + wxT("/");
 
 		wxConfigBase* cfg = wxConfigBase::Get();
-		cfg->Write( strCfgPath + wxT("Comment"), strNewComment);
+		if (strNewComment.IsEmpty() && iNewRating == 0) {
+			cfg->DeleteGroup(strCfgPath);
+		} else {
+			cfg->Write( strCfgPath + wxT("Comment"), strNewComment);
+			cfg->Write( strCfgPath + wxT("Rate"), (int)iNewRating);
+		}
      
 		m_strComment = strNewComment;
-  
+ 		m_iRating = iNewRating; 
+ 
 		SourceSet::iterator it = m_ClientUploadList.begin();
 		for ( ; it != m_ClientUploadList.end(); it++ ) {
-			(*it)->SetCommentDirty();
+			it->SetCommentDirty();
 		}
 	}
 }
 
 
-// For File rate 
-void CKnownFile::SetFileRating(int8 iNewRating)
-{ 
-	if (m_iRating != iNewRating) {
-		SetLastPublishTimeKadNotes(0);	
-		wxString strCfgPath = wxT("/") + m_abyFileHash.Encode() + wxT("/");
-		wxConfigBase* cfg = wxConfigBase::Get();
-		cfg->Write( strCfgPath + wxT("Rate"), (int)iNewRating);
-		m_iRating = iNewRating; 
-
-		SourceSet::iterator it = m_ClientUploadList.begin();
-		for ( ; it != m_ClientUploadList.end(); it++ ) {
-			(*it)->SetCommentDirty();
-		}
-	}
-} 
-
-
 void CKnownFile::SetUpPriority(uint8 iNewUpPriority, bool m_bsave){
 	m_iUpPriority = iNewUpPriority;
 	if( IsPartFile() && m_bsave ) {
@@ -1183,8 +1349,9 @@
 		
 		SourceSet::iterator it = m_ClientUploadList.begin();
 		for ( ; it != m_ClientUploadList.end(); it++ ) {
-			if ( !(*it)->GetUpPartStatus().empty() && (*it)->GetUpPartCount() == partcount ) {
-				count.push_back((*it)->GetUpCompleteSourcesCount());
+			CUpDownClient* client = it->GetClient();
+			if ( !client->GetUpPartStatus().empty() && client->GetUpPartCount() == partcount ) {
+				count.push_back(client->GetUpCompleteSourcesCount());
 			}
 		}
 	
@@ -1278,13 +1445,13 @@
 	
 	if ( increment ) {
 		for ( unsigned int i = 0; i < size; ++i ) {
-			if ( freq[i] ) {
+			if ( freq.get(i) ) {
 				m_AvailPartFrequency[i]++;
 			}
 		}
 	} else {
 		for ( unsigned int i = 0; i < size; ++i ) {
-			if ( freq[i] ) {
+			if ( freq.get(i) ) {
 				m_AvailPartFrequency[i]--;
 			}
 		}
@@ -1297,19 +1464,42 @@
 	UpdateAutoUpPriority();
 }
 
+void GuessAndRemoveExt(CPath& name)
+{
+	wxString ext = name.GetExt();
+
+	// Remove common two-part extensions, such as "tar.gz"
+	if (ext == wxT("gz") || ext == wxT("bz2")) {
+		name = name.RemoveExt();
+		if (name.GetExt() == wxT("tar")) {
+			name = name.RemoveExt();
+		}
+	// might be an extension if length == 3
+	// and also remove some common non-three-character extensions
+	} else if (ext.Length() == 3  ||
+		   ext == wxT("7z")   ||
+		   ext == wxT("rm")   ||
+		   ext == wxT("jpeg") ||
+		   ext == wxT("mpeg")
+		   ) {
+		name = name.RemoveExt();
+	}
+}
+
 void CKnownFile::SetFileName(const CPath& filename)
 { 
 	CAbstractFile::SetFileName(filename);
-#ifndef CLIENT_GUI
-		wordlist.clear();
-		Kademlia::CSearchManager::GetWords(GetFileName().GetPrintable(), &wordlist);
-#endif
+	wordlist.clear();
+	// Don't publish extension. That'd kill the node indexing e.g. "avi".
+	CPath tmpName = GetFileName();
+	GuessAndRemoveExt(tmpName);
+	Kademlia::CSearchManager::GetWords(tmpName.GetPrintable(), &wordlist);
 }
 
 #endif // CLIENT_GUI
 
 //For File Comment // 
-void CKnownFile::LoadComment()
+void CKnownFile::LoadComment() const
 {
 	#ifndef CLIENT_GUI
 	wxString strCfgPath = wxT("/") + m_abyFileHash.Encode() + wxT("/");
@@ -1318,14 +1508,9 @@
 	
 	m_strComment = cfg->Read( strCfgPath + wxT("Comment"), wxEmptyString);
 	m_iRating = cfg->Read( strCfgPath + wxT("Rate"), 0l);
-	m_bCommentLoaded = true;	
-	
-	#else
-	m_strComment = wxT("Comments are not allowed on remote gui yet");
-	m_bCommentLoaded = true;
-	m_iRating =0;
 	#endif
-	
+
+	m_bCommentLoaded = true;
 }
 
 
@@ -1346,7 +1531,7 @@
 bool CKnownFile::HasProperAICHHashSet() const
 {
 #ifdef CLIENT_GUI
-	return m_AICHMasterHash.Length();
+	return m_AICHMasterHash.Length() != 0;
 #else
 	return m_pAICHHashSet->HasValidMasterHash() &&
 		(m_pAICHHashSet->GetStatus() == AICH_HASHSETCOMPLETE ||
@@ -1358,10 +1543,12 @@
 {
 	return	  wxString(_("File name")) + wxT(": ") + GetFileName().GetPrintable() + wxT("\n")
 		+ _("File size") + wxT(": ") + CastItoXBytes(GetFileSize()) + wxT("\n")
-		+ _("Share ratio") + wxString::Format(wxT(": %.2f%%\n"), (((double)statistic.GetAllTimeTransferred() / (double)GetFileSize()) * 100.0))
+		+ _("Share ratio") + CFormat(wxT(": %.2f%%\n")) % (((double)statistic.GetAllTimeTransferred() / (double)GetFileSize()) * 100.0)
 		+ _("Uploaded") + wxT(": ") + CastItoXBytes(statistic.GetTransferred()) + wxT(" (") + CastItoXBytes(statistic.GetAllTimeTransferred()) + wxT(")\n")
 		+ _("Requested") + CFormat(wxT(": %u (%u)\n")) % statistic.GetRequests() % statistic.GetAllTimeRequests()
 		+ _("Accepted") + CFormat(wxT(": %u (%u)\n")) % statistic.GetAccepts() % statistic.GetAllTimeAccepts()
+		+ _("On Queue") + CFormat(wxT(": %u\n")) % GetQueuedCount()
 		+ _("Complete sources") + CFormat(wxT(": %u\n")) % m_nCompleteSourcesCount;
 }
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/KnownFile.h -> aMule-2.3.1.tar.bz2/src/KnownFile.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -17,7 +17,7 @@
 // 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
@@ -35,40 +35,17 @@
 #include <common/Path.h>
 
 #include "kademlia/kademlia/Indexed.h"
+#include <ec/cpp/ECID.h>	// Needed for CECID
 
 
 #ifdef CLIENT_GUI
 #include <ec/cpp/ECSpecialTags.h>
+#include "RLE.h"			// Needed for RLE_Data, PartFileEncoderData
 #endif
 
+#include "Constants.h"		// Needed for PS_*, PR_*
+#include "ClientRef.h"		// Needed for CClientRef
 
-#define	PS_READY			0
-#define	PS_EMPTY			1
-#define PS_WAITINGFORHASH		2
-#define PS_HASHING			3
-#define PS_ERROR			4
-#define	PS_INSUFFICIENT			5
-#define	PS_UNKNOWN			6
-#define PS_PAUSED			7
-#define PS_COMPLETING			8
-#define PS_COMPLETE			9
-#define PS_ALLOCATING			10
-
-
-#define PR_VERYLOW			4 // I Had to change this because
-					  // it didn't save negative number
-					  // correctly.. Had to modify the
-					  // sort function for this change..
-#define PR_LOW				0 //*
-#define PR_NORMAL			1 // Don't change this - needed for
-					  // edonkey clients and server!
-#define PR_HIGH				2 //*
-#define PR_VERYHIGH			3
-#define PR_AUTO				5
-#define PR_POWERSHARE			6 //added for powershare (deltaHF)
-
-
-class CUpDownClient;
 class CFileDataIO;
 class CPacket;
 class CTag;
@@ -89,7 +66,7 @@
 class CFileStatistic
 {
 	friend class CKnownFile;
-	friend class CSharedFilesRem;
+	friend class CKnownFilesRem;
 
 public:
 	CFileStatistic();
@@ -102,11 +79,11 @@
 	uint32	GetAllTimeRequests() const		{return alltimerequested;}
 	void	SetAllTimeRequests(uint32 new_value)	{ alltimerequested = new_value; };
 	uint32	GetAllTimeAccepts() const		{return alltimeaccepted;}
-	void	SetAllTimeAccepts(uint32 new_value)	{ alltimeaccepted = new_value; };	
+	void	SetAllTimeAccepts(uint32 new_value)	{ alltimeaccepted = new_value; };
 	uint64	GetAllTimeTransferred() const		{return alltimetransferred;}
 	void	SetAllTimeTransferred(uint64 new_value)	{ alltimetransferred = new_value; };
 	CKnownFile* fileParent;
-	
+
 private:
 	uint16 requested;
 	uint64 transferred;
@@ -122,7 +99,7 @@
                 CKnownFile
               /
 CAbstractFile
-              \ 
+              \
                 CSearchFile
 */
 class CAbstractFile
@@ -145,34 +122,34 @@
 	uint32 GetIntTagValue(uint8 tagname) const;
 	uint32 GetIntTagValue(const wxString& tagname) const;
 	bool GetIntTagValue(uint8 tagname, uint32& ruValue) const;
-	void SetIntTagValue(uint8 tagname, uint32 ruValue) const;
 	const wxString& GetStrTagValue(uint8 tagname) const;
 	const wxString& GetStrTagValue(const wxString& tagname) const;
-	const CTag *GetTag(const wxString& tagname) const;	
+	const CTag *GetTag(const wxString& tagname) const;
 	const CTag *GetTag(const wxString& tagname, uint8 tagtype) const;
 	const CTag *GetTag(uint8 tagname) const;
-	const CTag *GetTag(uint8 tagname, uint8 tagtype) const;	
+	const CTag *GetTag(uint8 tagname, uint8 tagtype) const;
 	void AddTagUnique(const CTag &pTag);
 	const ArrayOfCTag& GetTags() const { return m_taglist; }
 	void AddNote(Kademlia::CEntry* pEntry);
 	const CKadEntryPtrList& getNotes() const { return m_kadNotes; }
 
-	/* Comment and rating */	
+	/* Comment and rating */
 	virtual const wxString&	GetFileComment() const { return m_strComment; }
-	virtual int8	GetFileRating() 		const { return m_iRating; }	
-	
+	virtual int8	GetFileRating() 		const { return m_iRating; }
+
 	bool	HasComment() const		{ return m_hasComment; }
 	bool	HasRating() const		{ return (m_iUserRating != 0); }
 	int8	UserRating() const 		{ return m_iUserRating; }
-	void	UpdateFileRatingCommentAvail();
 
 protected:
 	//! CAbstractFile is not assignable.
 	CAbstractFile& operator=(const CAbstractFile);
-	
+
 	CMD4Hash	m_abyFileHash;
-	wxString	m_strComment;
-	int8		m_iRating;
+	// comment/rating are read from the config and cached in these variables,
+	// so make the mutable to allow GetFileComment() to be a const method
+	mutable	wxString	m_strComment;
+	mutable	int8		m_iRating;
 	bool		m_hasComment;
 	int8		m_iUserRating;
 	ArrayOfCTag	m_taglist;
@@ -185,25 +162,32 @@
 
 
 class CSearchFile;
+class CFile;
 
 
-class CKnownFile : public CAbstractFile
+class CKnownFile : public CAbstractFile, public CECID
 {
 friend class CHashingTask;
 public:
 	CKnownFile();
+	CKnownFile(uint32 ecid);
 	explicit CKnownFile(const CSearchFile &searchFile);
 
 	virtual ~CKnownFile();
 
 	void SetFilePath(const CPath& filePath);
 	const CPath& GetFilePath() const { return m_filePath; }
-	
-	virtual	bool	IsPartFile() const	{return false;}
+
+	// virtual functions for CKnownFile and CPartFile:
+	virtual	bool	IsPartFile() const	{return false;}		// true if not completed
+	virtual bool	IsCompleted() const	{ return true; }	// true if completed
+	virtual bool	IsCPartFile() const	{ return false; }	// true if it's a CPartFile
+
 	virtual bool	LoadFromFile(const CFileDataIO* file);	//load date, hashset and tags from a .met file
 	virtual uint8	GetStatus(bool WXUNUSED(ignorepause) = false) const { return PS_COMPLETE; }
-	bool	WriteToFile(CFileDataIO* file);	
+	bool	WriteToFile(CFileDataIO* file);
 	time_t GetLastChangeDatetime() const { return m_lastDateChanged; }
+	void SetLastChangeDatetime(time_t t) { m_lastDateChanged = t; }
 
 	virtual void SetFileSize(uint64 nFileSize);
 
@@ -219,66 +203,73 @@
 
 	// nr. of 9MB parts according the file size wrt ED2K protocol (OP_FILESTATUS)
 	inline uint16 GetED2KPartCount() const { return m_iED2KPartCount; }
-	
+
+	// size of a certain part, last is different, all others are PARTSIZE
+	uint32 GetPartSize(uint16 part) const { return part == m_iPartCount - 1 ? m_sizeLastPart : PARTSIZE; }
+
 	// file upload priority
 	uint8	GetUpPriority()	 const		{return m_iUpPriority;}
 	void	SetUpPriority(uint8 newUpPriority, bool bSave=true);
 	bool	IsAutoUpPriority() const		{return m_bAutoUpPriority;}
 	void	SetAutoUpPriority(bool flag)	{m_bAutoUpPriority = flag;}
 	void	UpdateAutoUpPriority();
-	size_t	GetQueuedCount() const {return m_ClientUploadList.size();}
+#ifdef CLIENT_GUI
+	uint16	GetQueuedCount() const { return m_queuedCount; }
+#else
+	uint16	GetQueuedCount() const { return (uint16) m_ClientUploadList.size(); }
+#endif
 
 	bool	LoadHashsetFromFile(const CFileDataIO* file, bool checkhash);
 	void	AddUploadingClient(CUpDownClient* client);
 	void	RemoveUploadingClient(CUpDownClient* client);
-	
-	// comment 
-	const wxString&	GetFileComment() { if (!m_bCommentLoaded) LoadComment(); return m_strComment; } 
-	int8	GetFileRating() 		{ if (!m_bCommentLoaded) LoadComment(); return m_iRating; }
 
-	void	SetFileComment(const wxString& strNewComment);
-	void	SetFileRating(int8 iNewRating); 
+	// comment
+	const wxString&	GetFileComment()	const	{ if (!m_bCommentLoaded) LoadComment(); return m_strComment; }
+	int8	GetFileRating() 			const	{ if (!m_bCommentLoaded) LoadComment(); return m_iRating; }
+
+	void	SetFileCommentRating(const wxString& strNewComment, int8 iNewRating);
 	void	SetPublishedED2K( bool val );
 	bool	GetPublishedED2K() const	{return m_PublishedED2K;}
 
-	/* Kad stuff */ 
+	/* Kad stuff */
 	uint32	GetKadFileSearchID() const { return kadFileSearchID; }
 	// KAD TODO: This must be used on KadSearchListCtrl too once imported
 	void	SetKadFileSearchID(uint32 id) { kadFileSearchID = id; } // John - Don't use this unless you know what your are DOING!! (Hopefully I do.. :)
 	const Kademlia::WordList& GetKadKeywords() const { return wordlist; }
 	// KAD TODO: If we add the proper column to SharedFilesCtrl, this is the funtion.
-	uint32	GetLastPublishTimeKadSrc() const { return m_lastPublishTimeKadSrc; }	
+	uint32	GetLastPublishTimeKadSrc() const { return m_lastPublishTimeKadSrc; }
 	void	SetLastPublishTimeKadSrc(uint32 time, uint32 buddyip) { m_lastPublishTimeKadSrc = time; m_lastBuddyIP = buddyip;}
 	// Another unused function, useful for the shared files control column
 	uint32	GetLastPublishBuddy() const { return m_lastBuddyIP; }
 	void	SetLastPublishTimeKadNotes(uint32 time) {m_lastPublishTimeKadNotes = time;}
-	uint32	GetLastPublishTimeKadNotes() const { return m_lastPublishTimeKadNotes; }	
-	
+	uint32	GetLastPublishTimeKadNotes() const { return m_lastPublishTimeKadNotes; }
+
 	bool	PublishSrc();
-	bool	PublishNotes();	
-	
+	bool	PublishNotes();
+
 	// TODO: This must be implemented if we ever want to have metadata.
 	uint32	GetMetaDataVer() const { return /*m_uMetaDataVer*/ 0; }
-	
+
 	// file sharing
 	virtual	CPacket*	CreateSrcInfoPacket(const CUpDownClient* forClient, uint8 byRequestedVersion, uint16 nRequestedOptions);
-	
-	virtual void	UpdatePartsInfo();	
+	void	CreateOfferedFilePacket(CMemFile* files, class CServer* pServer, CUpDownClient* pClient);
+
+	virtual void	UpdatePartsInfo();
+
 
-	
 	CFileStatistic statistic;
-	
+
 	time_t m_nCompleteSourcesTime;
 	uint16 m_nCompleteSourcesCount;
 	uint16 m_nCompleteSourcesCountLo;
 	uint16 m_nCompleteSourcesCountHi;
-	
-	// Maybe find a common place for this typedef?
-	typedef std::set<CUpDownClient*> SourceSet;
+
+	// Common for part and known files.
+	typedef std::set<CClientRef> SourceSet;
 	SourceSet m_ClientUploadList;
 	ArrayOfUInts16 m_AvailPartFrequency;
-	
-	/** 
+
+	/**
  	 * Returns a base-16 encoding of the master hash, or
  	 * an empty string if no such hash exists.
  	 */
@@ -292,24 +283,33 @@
 	 * @param client The clients whoose uploading parts should be considered.
 	 * @param increment If true, the counts are incremented, otherwise they are decremented.
 	 *
-	 * This functions updates the frequency list of file-upparts, using the clients 
+	 * This functions updates the frequency list of file-upparts, using the clients
 	 * upparts-status. This function should be called by clients every time they update their
 	 * upparts-status, or when they are added or removed from the file.
 	 */
 	void UpdateUpPartsFrequency( CUpDownClient* client, bool increment );
 
 	static void CreateHashFromHashlist(const ArrayOfCMD4Hash& hashes, CMD4Hash* Output);
-	
+
 	void	ClearPriority();
-	
+
 	time_t	m_lastDateChanged;
 
 	virtual wxString GetFeedback() const;
 
+	void	SetShowSources( bool val )	{ m_showSources = val; }
+	bool	ShowSources() const			{ return m_showSources; }
+	void	SetShowPeers( bool val )	{ m_showPeers = val; }
+	bool	ShowPeers()	const			{ return m_showPeers; }
 
 #ifdef CLIENT_GUI
 	CKnownFile(CEC_SharedFile_Tag *);
-	friend class CSharedFilesRem;
+	friend class CKnownFilesRem;
+	RLE_Data m_partStatus;
+
+private:
+	uint8	m_iUpPriorityEC;
+	uint16	m_queuedCount;
 
 protected:
 	//! The AICH master-hash, if it is known.
@@ -320,24 +320,25 @@
 	// AICH
 	CAICHHashSet* GetAICHHashset() const		{ return m_pAICHHashSet; }
 	void SetAICHHashset(CAICHHashSet* val)		{ m_pAICHHashSet = val; }
-	
+
 protected:
 	CAICHHashSet*	m_pAICHHashSet;
 #endif
 
 	bool	LoadTagsFromFile(const CFileDataIO* file);
 	bool	LoadDateFromFile(const CFileDataIO* file);
-	void	LoadComment();//comment
+	void	LoadComment() const;
 	ArrayOfCMD4Hash m_hashlist;
-	CPath	m_filePath;	
+	CPath	m_filePath;
 
-	static void CreateHashFromFile(CFileDataIO* file, uint32 Length, CMD4Hash* Output, CAICHHashTree* pShaHashOut);
+	static void CreateHashFromFile(class CFileAutoClose& file, uint64 offset, uint32 Length, CMD4Hash* Output, CAICHHashTree* pShaHashOut);
 	static void CreateHashFromInput(const byte* input, uint32 Length, CMD4Hash* Output, CAICHHashTree* pShaHashOut);
 
-	bool	m_bCommentLoaded;
+	mutable bool	m_bCommentLoaded;
 	uint16	m_iPartCount;
 	uint16  m_iED2KPartCount;
 	uint16	m_iED2KPartHashCount;
+	uint32	m_sizeLastPart;			// size of the last part
 	uint8	m_iUpPriority;
 	bool	m_bAutoUpPriority;
 	bool	m_PublishedED2K;
@@ -349,6 +350,8 @@
 	uint32	m_lastPublishTimeKadNotes;
 	uint32	m_lastBuddyIP;
 
+	bool	m_showSources;
+	bool	m_showPeers;
 private:
 	/** Common initializations for constructors. */
 	void Init();

aMule-2.2.6.tar.bz2/src/KnownFileList.cpp -> aMule-2.3.1.tar.bz2/src/KnownFileList.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -32,6 +32,9 @@
 #include "PartFile.h"		// Needed for CPartFile
 #include "amule.h"
 #include "Logger.h"
+#include "MemFile.h"
+#include "ScopedPtr.h"
+#include "SearchList.h"		// Needed for UpdateSearchFileByHash
 #include <common/Format.h>
 
 
@@ -43,7 +46,7 @@
 	uint64 in_size) const
 {
 	return
-		(knownFile->GetLastChangeDatetime() == in_date) &&
+		(knownFile->GetLastChangeDatetime() == (time_t)in_date) &&
 		(knownFile->GetFileSize() == in_size) &&
 		(knownFile->GetFileName() == filename);
 }
@@ -54,6 +57,9 @@
 	accepted = 0;
 	requested = 0;
 	transferred = 0;
+	m_filename = wxT("known.met");
+	m_knownSizeMap = NULL;
+	m_duplicateSizeMap = NULL;
 	Init();
 }
 
@@ -68,7 +74,7 @@
 {
 	CFile file;
 	
-	CPath fullpath = CPath(theApp->ConfigDir + wxT("known.met"));
+	CPath fullpath = CPath(theApp->ConfigDir + m_filename);
 	if (!fullpath.FileExists()) {
 		// This is perfectly normal. The file was probably either
 		// deleted, or this is the first time running aMule.
@@ -76,40 +82,38 @@
 	}
 
 	if (!file.Open(fullpath)) {
-		AddLogLineM(true, _("WARNING: known.met cannot be opened."));
+		AddLogLineC(CFormat(_("WARNING: %s cannot be opened.")) % m_filename);
 		return false;
 	}
 	
 	try {
 		uint8 version = file.ReadUInt8();
 		if ((version != MET_HEADER) && (version != MET_HEADER_WITH_LARGEFILES)) {
-			AddLogLineM(true, _("WARNING: Knownfile list corrupted, contains invalid header."));
+			AddLogLineC(_("WARNING: Known file list corrupted, contains invalid header."));
 			return false;
 		}
 		
 		wxMutexLocker sLock(list_mut);
 		uint32 RecordsNumber = file.ReadUInt32();
-		AddDebugLogLineM(false, logKnownFiles,
-			wxString::Format(wxT("Reading %i known files from file format 0x%2.2x."),
-			RecordsNumber, version));
+		AddDebugLogLineN(logKnownFiles, CFormat(wxT("Reading %i known files from file format 0x%2.2x."))
+			% RecordsNumber % version);
 		for (uint32 i = 0; i < RecordsNumber; i++) {
-			std::auto_ptr<CKnownFile> record(new CKnownFile());
+			CScopedPtr<CKnownFile> record;
 			if (record->LoadFromFile(&file)) {
-				AddDebugLogLineM(false, logKnownFiles,
+				AddDebugLogLineN(logKnownFiles,
 					CFormat(wxT("Known file read: %s")) % record->GetFileName());
 				Append(record.release());
 			} else {
-				AddLogLineM(true,
-					wxT("Failed to load entry in knownfilelist, file may be corrupt"));
+				AddLogLineC(_("Failed to load entry in known file list, file may be corrupt"));
 			}
 		}
-		AddDebugLogLineM(false, logKnownFiles, wxT("Finished reading known files"));
+		AddDebugLogLineN(logKnownFiles, wxT("Finished reading known files"));
 	
 		return true;
 	} catch (const CInvalidPacket& e) {
-		AddLogLineM(true, wxT("Invalid entry in knownfilelist, file may be corrupt: ") + e.what());
+		AddLogLineC(_("Invalid entry in known file list, file may be corrupt: ") + e.what());
 	} catch (const CSafeIOException& e) {
-		AddLogLineM(true, CFormat(_("IO error while reading known.met file: %s")) % e.what());
+		AddLogLineC(CFormat(_("IO error while reading %s file: %s")) % m_filename % e.what());
 	}	
 	
 	return false;
@@ -118,12 +122,13 @@
 
 void CKnownFileList::Save()
 {
-	CFile file(theApp->ConfigDir + wxT("known.met"), CFile::write);
+	CFile file(theApp->ConfigDir + m_filename, CFile::write_safe);
 	if (!file.IsOpened()) {
 		return;
 	}
 
 	wxMutexLocker sLock(list_mut);
+	AddDebugLogLineN(logKnownFiles, CFormat(wxT("start saving %s")) % m_filename);
 
 	try {
 		// Kry - This is the version, but we don't know it till
@@ -154,9 +159,11 @@
 		
 		file.Seek(0);
 		file.WriteUInt8(bContainsAnyLargeFiles ? MET_HEADER_WITH_LARGEFILES : MET_HEADER);
+		file.Close();
 	} catch (const CIOFailureException& e) {
-		AddLogLineM(true, CFormat(_("Error while saving known.met file: %s")) % e.what());
+		AddLogLineC(CFormat(_("Error while saving %s file: %s")) % m_filename % e.what());
 	}
+	AddDebugLogLineN(logKnownFiles, CFormat(wxT("finished saving %s")) % m_filename);
 }
 
 
@@ -164,17 +171,9 @@
 {	
 	wxMutexLocker sLock(list_mut);
 
-	for (CKnownFileMap::iterator it = m_knownFileMap.begin();
-	     it != m_knownFileMap.end(); ++it) {
-		delete it->second;
-	}
-	m_knownFileMap.clear();
-
-	for (KnownFileList::iterator it = m_duplicateFileList.begin();
-	     it != m_duplicateFileList.end(); ++it) {
-		delete *it;
-	}
-	m_duplicateFileList.clear();
+	DeleteContents(m_knownFileMap);
+	DeleteContents(m_duplicateFileList);
+	ReleaseIndex();
 }
 
 
@@ -185,11 +184,22 @@
 {
 	wxMutexLocker sLock(list_mut);
 	
-	for (CKnownFileMap::const_iterator it = m_knownFileMap.begin();
-	     it != m_knownFileMap.end(); ++it) {
-		CKnownFile *cur_file = it->second;
-		if (KnownFileMatches(cur_file, filename, in_date, in_size)) {
-			return cur_file;
+	if (m_knownSizeMap) {
+		std::pair<KnownFileSizeMap::const_iterator, KnownFileSizeMap::const_iterator> p;
+		p = m_knownSizeMap->equal_range((uint32) in_size);
+		for (KnownFileSizeMap::const_iterator it = p.first; it != p.second; it++) {
+			CKnownFile *cur_file = it->second;
+			if (KnownFileMatches(cur_file, filename, in_date, in_size)) {
+				return cur_file;
+			}
+		}
+	} else {
+		for (CKnownFileMap::const_iterator it = m_knownFileMap.begin();
+			 it != m_knownFileMap.end(); ++it) {
+			CKnownFile *cur_file = it->second;
+			if (KnownFileMatches(cur_file, filename, in_date, in_size)) {
+				return cur_file;
+			}
 		}
 	}
 
@@ -202,37 +212,25 @@
 	uint32 in_date,
 	uint64 in_size) const
 {
-	for (KnownFileList::const_iterator it = m_duplicateFileList.begin();
-	     it != m_duplicateFileList.end(); ++it) {
-		CKnownFile *cur_file = *it;
-		if (KnownFileMatches(cur_file, filename, in_date, in_size)) {
-			return cur_file;
+	if (m_duplicateSizeMap) {
+		std::pair<KnownFileSizeMap::const_iterator, KnownFileSizeMap::const_iterator> p;
+		p = m_duplicateSizeMap->equal_range((uint32) in_size);
+		for (KnownFileSizeMap::const_iterator it = p.first; it != p.second; it++) {
+			CKnownFile *cur_file = it->second;
+			if (KnownFileMatches(cur_file, filename, in_date, in_size)) {
+				return cur_file;
+			}
 		}
-	}
-	return NULL;
-}
-
-
-bool CKnownFileList::IsKnownFile(const CKnownFile *file) 
-{
-	wxCHECK(file, false);
-
-	wxMutexLocker sLock(list_mut);
-
-	// For the map, search with the key
-	const CMD4Hash &key = file->GetFileHash();
-	CKnownFileMap::const_iterator itMap = m_knownFileMap.find(key);
-	if (itMap != m_knownFileMap.end()) {
-		return true;
-	}
-	// For the list, we have to iterate to search
-	for (KnownFileList::iterator it = m_duplicateFileList.begin();
-	     it != m_duplicateFileList.end(); ++it) {
-		if (*it == file) {
-			return true;
+	} else {
+		for (KnownFileList::const_iterator it = m_duplicateFileList.begin();
+			 it != m_duplicateFileList.end(); ++it) {
+			CKnownFile *cur_file = *it;
+			if (KnownFileMatches(cur_file, filename, in_date, in_size)) {
+				return cur_file;
+			}
 		}
 	}
-	return false;
+	return NULL;
 }
 
 
@@ -252,14 +250,21 @@
 }
 
 
-bool CKnownFileList::SafeAddKFile(CKnownFile* toadd)
+bool CKnownFileList::SafeAddKFile(CKnownFile* toadd, bool afterHashing)
 {
-	wxMutexLocker sLock(list_mut);
-	return Append(toadd);
+	bool ret;
+	{
+		wxMutexLocker sLock(list_mut);
+		ret = Append(toadd, afterHashing);
+	}
+	if (ret) {
+		theApp->searchlist->UpdateSearchFileByHash(toadd->GetFileHash());
+	}
+	return ret;
 }
 
 
-bool CKnownFileList::Append(CKnownFile *Record)
+bool CKnownFileList::Append(CKnownFile *Record, bool afterHashing)
 {
 	if (Record->GetFileSize() > 0) {
 		const CMD4Hash& tkey = Record->GetFileHash();
@@ -268,28 +273,43 @@
 			m_knownFileMap[tkey] = Record;			
 			return true;
 		} else {
-			it->second;
-			time_t in_date =  it->second->GetLastChangeDatetime();
-			uint64 in_size =  it->second->GetFileSize();
-			CPath filename = it->second->GetFileName();
-			if (KnownFileMatches(Record, filename, in_date, in_size) ||
-			    IsOnDuplicates(filename, in_date, in_size)) {
+			CKnownFile *existing = it->second;
+			if (KnownFileMatches(Record, existing->GetFileName(), existing->GetLastChangeDatetime(), existing->GetFileSize())) {
 				// The file is already on the list, ignore it.
+				AddDebugLogLineN(logKnownFiles, CFormat(wxT("%s is already on the list")) % Record->GetFileName().GetPrintable());
+				return false;
+			} else if (IsOnDuplicates(Record->GetFileName(), Record->GetLastChangeDatetime(), Record->GetFileSize())) {
+				// The file is on the duplicates list, ignore it.
+				// Should not happen, at least not after hashing. Or why did it get hashed in the first place then?
+				AddDebugLogLineN(logKnownFiles, CFormat(wxT("%s is on the duplicates list")) % Record->GetFileName().GetPrintable());
 				return false;
 			} else {
+				if (afterHashing && existing->GetFileSize() == Record->GetFileSize()) {
+					// We just hashed a "new" shared file and find it's already known under a different name or date.
+					// Guess what - it was probably renamed or touched.
+					// So copy over all properties from the existing known file and just keep name/date.
+					time_t newDate = Record->GetLastChangeDatetime();
+					CPath newName = Record->GetFileName();
+					CMemFile f;
+					existing->WriteToFile(&f);
+					f.Reset();
+					Record->LoadFromFile(&f);
+					Record->SetLastChangeDatetime(newDate);
+					Record->SetFileName(newName);
+				}
 				// The file is a duplicated hash. Add THE OLD ONE to the duplicates list.
-				m_duplicateFileList.push_back(m_knownFileMap[tkey]);
-				// Is this thread-safe? If John is not sure and I'm not sure either...
+				// (This is used when reading the known file list where the duplicates are stored in front.)
+				m_duplicateFileList.push_back(existing);
 				if (theApp->sharedfiles) {
 					// Removing the old kad keywords created with the old filename
-					theApp->sharedfiles->RemoveKeywords(it->second);
+					theApp->sharedfiles->RemoveKeywords(existing);
 				}
 				m_knownFileMap[tkey] = Record;	
 				return true;
 			}
 		}
 	} else {
-		AddDebugLogLineM(false, logGeneral,
+		AddDebugLogLineN(logGeneral,
 			CFormat(wxT("%s is 0-size, not added")) %
 			Record->GetFileName());
 		
@@ -297,4 +317,28 @@
 	}
 }
 
+// Make an index by size to speed up FindKnownFile
+// Size modulo 2^32 is enough here
+void CKnownFileList::PrepareIndex()
+{
+	ReleaseIndex();
+	m_knownSizeMap = new KnownFileSizeMap;
+	for (CKnownFileMap::const_iterator it = m_knownFileMap.begin(); it != m_knownFileMap.end(); it++) {
+		m_knownSizeMap->insert(std::pair<uint32, CKnownFile*>((uint32) it->second->GetFileSize(), it->second));
+	}
+	m_duplicateSizeMap = new KnownFileSizeMap;
+	for (KnownFileList::const_iterator it = m_duplicateFileList.begin(); it != m_duplicateFileList.end(); it++) {
+		m_duplicateSizeMap->insert(std::pair<uint32, CKnownFile*>((uint32) (*it)->GetFileSize(), *it));
+	}
+}
+
+
+void CKnownFileList::ReleaseIndex()
+{
+	delete m_knownSizeMap;
+	delete m_duplicateSizeMap;
+	m_knownSizeMap = NULL;
+	m_duplicateSizeMap = NULL;
+}
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/KnownFileList.h -> aMule-2.3.1.tar.bz2/src/KnownFileList.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -38,7 +38,7 @@
 public:
 	CKnownFileList();
 	~CKnownFileList();
-	bool	SafeAddKFile(CKnownFile* toadd);
+	bool	SafeAddKFile(CKnownFile* toadd, bool afterHashing = false);
 	bool	Init();
 	void	Save();
 	void	Clear();
@@ -47,7 +47,8 @@
 		time_t in_date,
 		uint64 in_size);
 	CKnownFile* FindKnownFileByID(const CMD4Hash& hash);
-	bool	IsKnownFile(const CKnownFile* file);
+	void	PrepareIndex();
+	void	ReleaseIndex();
 
 	uint16 requested;
 	uint32 transferred;
@@ -56,7 +57,7 @@
 private:
 	wxMutex	list_mut;
 
-	bool	Append(CKnownFile*);
+	bool	Append(CKnownFile*, bool afterHashing = false);
 
 	CKnownFile *IsOnDuplicates(
 		const CPath& filename,
@@ -72,6 +73,12 @@
 	typedef std::list<CKnownFile*> KnownFileList;
 	KnownFileList	m_duplicateFileList;
 	CKnownFileMap	m_knownFileMap;
+	// The filename "known.met"
+	wxString	m_filename;
+	// Speed up shared files reload
+	typedef std::multimap<uint32, CKnownFile*> KnownFileSizeMap;
+	KnownFileSizeMap * m_knownSizeMap;
+	KnownFileSizeMap * m_duplicateSizeMap;
 };
 
 #endif // KNOWNFILELIST_H

aMule-2.2.6.tar.bz2/src/ListenSocket.cpp -> aMule-2.3.1.tar.bz2/src/ListenSocket.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -33,7 +33,6 @@
 #include "Preferences.h"	// Needed for CPreferences
 #include "amule.h"		// Needed for theApp
 #include "ServerConnect.h"	// Needed for CServerConnect
-#include "updownclient.h"	// Needed for CUpDownClient
 
 //-----------------------------------------------------------------------------
 // CListenSocket
@@ -63,10 +62,9 @@
  		SetNotify(wxSOCKET_CONNECTION_FLAG);
  		Notify(true);
 
-		printf("ListenSocket: Ok.\n");
+		AddLogLineNS(_("ListenSocket: Ok."));
 	} else {
-		AddLogLineM( true, _("ERROR: Could not listen to TCP port.") );
-		printf("ListenSocket: Could not listen to TCP port.");
+		AddLogLineCS(_("ERROR: Could not listen to TCP port.") );
 	}
 }
 
@@ -119,7 +117,7 @@
 	if (!nErrorCode) {
 		m_nPeningConnections++;
 		if (m_nPeningConnections < 1) {
-			wxASSERT(FALSE);
+			wxFAIL;
 			m_nPeningConnections = 1;
 		}
 		if (TooManySockets(true) && !theApp->serverconnect->IsConnecting()) {
@@ -220,7 +218,7 @@
 	for (SocketSet::iterator it = socket_list.begin(); it != socket_list.end(); ) {
 		CClientTCPSocket* cur_socket = *it++;
 		if (cur_socket->GetClient()) {
-			cur_socket->GetClient()->Safe_Delete();
+			cur_socket->Safe_Delete_Client();
 		} else {
 			cur_socket->Safe_Delete();
 			cur_socket->Destroy();

aMule-2.2.6.tar.bz2/src/ListenSocket.h -> aMule-2.3.1.tar.bz2/src/ListenSocket.h Changed

aMule-2.2.6.tar.bz2/src/Logger.cpp -> aMule-2.3.1.tar.bz2/src/Logger.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (C) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-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
@@ -25,44 +25,18 @@
 #include "Logger.h"
 #include "amule.h"
 #include "Preferences.h"
-
+#include <common/Macros.h>
+#include <common/MacrosProgramSpecific.h>
+#include <sstream>
+#include <wx/tokenzr.h>
+#include <wx/wfstream.h>
+#include <wx/sstream.h>
 #include <wx/filename.h>
 
 
 DEFINE_LOCAL_EVENT_TYPE(MULE_EVT_LOGLINE)
 
 
-CDebugCategory::CDebugCategory( DebugType type, const wxString& name )
-	: m_name( name ),
-	  m_type( type )
-{
-	m_enabled = false;
-}
-
-
-bool CDebugCategory::IsEnabled() const
-{
-	return m_enabled;
-}
-
-
-void CDebugCategory::SetEnabled( bool enabled )
-{
-	m_enabled = enabled;
-}
-
-
-const wxString& CDebugCategory::GetName() const
-{
-	return m_name;
-}
-
-
-DebugType CDebugCategory::GetType() const
-{
-	return m_type;
-}
-
 CDebugCategory g_debugcats[] = {
 	CDebugCategory( logGeneral,		wxT("General") ),
 	CDebugCategory( logHasher,		wxT("Hasher") ),
@@ -100,7 +74,9 @@
 	CDebugCategory( logUPnP,		wxT("Universal Plug and Play" ) ),
 	CDebugCategory( logKadUdpFwTester,	wxT("Kademlia UDP Firewall Tester") ),
 	CDebugCategory( logKadPacketTracking,	wxT("Kademlia Packet Tracking") ),
-	CDebugCategory( logKadEntryTracking,	wxT("Kademlia Entry Tracking") )
+	CDebugCategory( logKadEntryTracking,	wxT("Kademlia Entry Tracking") ),
+	CDebugCategory( logEC,			wxT("External Connect") ),
+	CDebugCategory( logHTTP,		wxT("HTTP") )
 };
 
 
@@ -108,9 +84,9 @@
 
 
 
-bool CLogger::IsEnabled( DebugType type )
-{
 #ifdef __DEBUG__
+bool CLogger::IsEnabled( DebugType type ) const
+{
 	int index = (int)type;
 	
 	if ( index >= 0 && index < categoryCount ) {
@@ -120,10 +96,10 @@
 		return ( cat.IsEnabled() && thePrefs::GetVerbose() );
 	} 
 
-	wxASSERT( false );
-#endif
+	wxFAIL;
 	return false;
 }
+#endif
 
 
 void CLogger::SetEnabled( DebugType type, bool enabled ) 
@@ -136,90 +112,53 @@
 
 		cat.SetEnabled( enabled );
 	} else {
-		wxASSERT( false );
+		wxFAIL;
 	}
 }
 
 
-struct LogEntry
-{
-	bool critical;
-	wxString entry;
-};
-
-
-static std::deque<LogEntry*> s_backLog;
-static wxMutex s_mutex;
-
-
-void PushEntry(bool critical, const wxString& str)
-{
-	wxMutexLocker lock(s_mutex);
-
-	LogEntry* item = new LogEntry;
-	item->critical = critical;
-	item->entry = str;
-	
-	s_backLog.push_back(item);
-}
-
-
-LogEntry* PopEntry()
+void CLogger::AddLogLine(
+	const wxString& DEBUG_ONLY(file),
+	int DEBUG_ONLY(line),
+	bool critical,
+	DebugType type,
+	const wxString &str,
+	bool toStdout,
+	bool toGUI)
 {
-	wxMutexLocker lock(s_mutex);
-
-	if (s_backLog.empty()) {
-		return NULL;
-	}
-
-	LogEntry* entry = s_backLog.front();
-	s_backLog.pop_front();
-
-	return entry;
-}
-
-
-
+	wxString msg(str);
+// handle Debug messages
+	if (type != logStandard) {
+		if (!critical && !IsEnabled(type)) {
+			return;
+		}
+		int index = (int)type;
+		
+		if ( index >= 0 && index < categoryCount ) {
+			const CDebugCategory& cat = g_debugcats[ index ];
+			wxASSERT(type == cat.GetType());
 
-void CLogger::FlushPendingEntries()
-{
-	wxCHECK_RET(wxThread::IsMain(), wxT("Must be called by main thread."));
-	
-	LogEntry* entry = NULL;
-	while ((entry = PopEntry())) {
-		CLoggingEvent event(entry->critical, entry->entry);
-	
-#ifdef CLIENT_GUI
-		theApp->ProcessEvent(event);
-#else
-		// Try to handle events immediatly when possible (to save to file).
-		if (theApp->applog) {
-			theApp->ProcessEvent(event);			
+			msg = cat.GetName() + wxT(": ") + msg;
 		} else {
-			theApp->AddPendingEvent(event);
+			wxFAIL;
 		}
-#endif
-
-		delete entry;
 	}
-}
-
 
-void CLogger::AddLogLine(
-	const wxString &file,
-	int line,
-	bool critical,
-	const wxString &str)
-{
-	wxString msg;
 #ifdef __DEBUG__
-       msg << file.AfterLast(wxFileName::GetPathSeparator()).AfterLast(wxT('/')) << wxT("(") << line << wxT("): ");
+	if (line) {
+		msg = file.AfterLast(wxFileName::GetPathSeparator()).AfterLast(wxT('/')) << wxT("(") << line << wxT("): ") + msg;
+	}
 #endif
-       msg << str;
-	PushEntry(critical, msg);
 
+	CLoggingEvent Event(critical, toStdout, toGUI, msg);
+
+	// Try to handle events immediatly when possible (to save to file).
 	if (wxThread::IsMain()) {
-		FlushPendingEntries();
+		// main thread and log file available: process directly
+		ProcessEvent(Event);			
+	} else {
+		// otherwise put to background
+		AddPendingEvent(Event);
 	}
 }
 
@@ -229,7 +168,7 @@
 	int line,
 	bool critical,
 	DebugType type,
-	const wxString& str)
+	const std::ostringstream &msg)
 {
 	int index = (int)type;
 	
@@ -237,9 +176,8 @@
 		const CDebugCategory& cat = g_debugcats[ index ];
 		wxASSERT(type == cat.GetType());
 
-		AddLogLine(file, line, critical, cat.GetName() + wxT(": ") + str);
-	} else {
-		wxASSERT( false );
+		AddLogLine(file, line, critical, logStandard, 
+			cat.GetName() + wxT(": ") + wxString(char2unicode(msg.str().c_str())));
 	}
 }
 
@@ -258,21 +196,221 @@
 }
 
 
+bool CLogger::OpenLogfile(const wxString & name)
+{
+	applog = new wxFFileOutputStream(name);
+	bool ret = applog->Ok();
+	if (ret) {
+		FlushApplog();
+		m_LogfileName = name;
+	} else {
+		CloseLogfile();
+	}
+	return ret; 
+}
+
+
+void CLogger::CloseLogfile()
+{
+	delete applog;
+	applog = NULL;
+	m_LogfileName.Clear();
+}
+
+
+void CLogger::OnLoggingEvent(class CLoggingEvent& evt)
+{
+	// Remove newspace at end
+	wxString bufferline = evt.Message().Strip(wxString::trailing);
+
+	// Create the timestamp
+	wxString stamp = wxDateTime::Now().FormatISODate() + wxT(" ") + wxDateTime::Now().FormatISOTime()
+#ifdef CLIENT_GUI
+ 					+ wxT(" (remote-GUI): ");
+#else
+ 					+ wxT(": ");
+#endif
+
+	// critical lines get a ! prepended, ordinary lines a blank
+	// logfile-only lines get a . to prevent transmission on EC
+	wxString prefix = !evt.ToGUI() ? wxT(".") : (evt.IsCritical() ? wxT("!") : wxT(" "));
+
+	if ( bufferline.IsEmpty() ) {
+		// If it's empty we just write a blank line with no timestamp.
+		DoLine(wxT(" \n"), evt.ToStdout(), evt.ToGUI());
+	} else {
+		// Split multi-line messages into individual lines
+		wxStringTokenizer tokens( bufferline, wxT("\n") );		
+		while ( tokens.HasMoreTokens() ) {
+			wxString fullline = prefix + stamp + tokens.GetNextToken() + wxT("\n");
+			DoLine(fullline, evt.ToStdout(), evt.ToGUI());
+		}
+	}
+}
+
+
+void CLogger::DoLine(const wxString & line, bool toStdout, bool GUI_ONLY(toGUI))
+{
+	++m_count;
+
+	// write to logfile
+	m_ApplogBuf += line;
+	FlushApplog();
+
+	// write to Stdout
+	if (m_StdoutLog || toStdout) {
+		printf("%s", (const char*)unicode2char(line));
+	}
+#ifndef AMULE_DAEMON
+	// write to Listcontrol
+	if (toGUI) {
+		theApp->AddGuiLogLine(line);
+	}
+#endif
+}
+
+
+void CLogger::FlushApplog()
+{
+	if (applog) { // Wait with output until logfile is actually opened
+		wxStringInputStream stream(m_ApplogBuf);
+		(*applog) << stream;
+		applog->Sync();
+		m_ApplogBuf.Clear();
+	}
+}
+
+CLogger theLogger;
+
+BEGIN_EVENT_TABLE(CLogger, wxEvtHandler)
+	EVT_MULE_LOGGING(CLogger::OnLoggingEvent)
+END_EVENT_TABLE()
+
+
 CLoggerTarget::CLoggerTarget()
 {
 }
 
+#if wxCHECK_VERSION(2, 9, 0)
+void CLoggerTarget::DoLogText(const wxString &msg)
+{
+	// prevent infinite recursion
+	static bool recursion = false;
+	if (recursion) {
+		return;
+	}
+	recursion = true;
 
+	// This is much simpler than manually handling all wx log-types.
+	if (msg.StartsWith(_("ERROR: ")) || msg.StartsWith(_("WARNING: "))) {
+		AddLogLineC(msg);
+	} else {
+		AddLogLineN(msg);
+	}
+
+	recursion = false;
+}
+#else
 void CLoggerTarget::DoLogString(const wxChar* msg, time_t)
 {
+	// prevent infinite recursion
+	static bool recursion = false;
+	if (recursion) {
+		return;
+	}
+	recursion = true;
+
 	wxCHECK_RET(msg, wxT("Log message is NULL in DoLogString!"));
 	
 	wxString str(msg);
 	
 	// This is much simpler than manually handling all wx log-types.
-	bool critical = str.StartsWith(_("ERROR: ")) || str.StartsWith(_("WARNING: "));
+	if (str.StartsWith(_("ERROR: ")) || str.StartsWith(_("WARNING: "))) {
+		AddLogLineC(str);
+	} else {
+		AddLogLineN(str);
+	}
+
+	recursion = false;
+}
+#endif
+
+CLoggerAccess::CLoggerAccess()
+{
+	m_bufferlen = 4096;
+	m_buffer = new wxCharBuffer(m_bufferlen);
+	m_logfile = NULL;
+	Reset();
+}
+
+
+void CLoggerAccess::Reset()
+{
+	delete m_logfile;
+	m_logfile = new wxFFileInputStream(theLogger.GetLogfileName());
+	m_pos = 0;
+	m_ready = false;
+}
+
+
+CLoggerAccess::~CLoggerAccess()
+{
+	delete m_buffer;
+	delete m_logfile;
+}
+
 
-	CLogger::AddLogLine(__TFILE__, __LINE__, critical, str);
+//
+// read a line of text from the logfile if available
+// (can't believe there's no library function for this >:( )
+//
+bool CLoggerAccess::HasString()
+{
+	while (!m_ready) {
+		int c = m_logfile->GetC();
+		if (c == wxEOF) {
+			break;
+		}
+		// check for buffer overrun
+		if (m_pos == m_bufferlen) {
+			m_bufferlen += 1024;
+			m_buffer->extend(m_bufferlen);
+		}
+		m_buffer->data()[m_pos++] = c;
+		if (c == '\n') {
+			if (m_buffer->data()[0] == '.') {
+				// Log-only line, skip
+				m_pos = 0;
+			} else {
+				m_ready = true;
+			}
+		}
+	}
+	return m_ready;
+}
+
+
+bool CLoggerAccess::GetString(wxString & s)
+{
+	if (!HasString()) {
+		return false;
+	}
+	s = wxString(m_buffer->data(), wxConvUTF8, m_pos);
+	m_pos = 0;
+	m_ready = false;
+	return true;
+}
+
+// Functions for EC logging
+bool ECLogIsEnabled()
+{
+	return theLogger.IsEnabled(logEC);
+}
+
+void DoECLogLine(const wxString &line)
+{
+	// without file/line
+	theLogger.AddLogLine(wxEmptyString, 0, false, logStandard, line, false, false);
 }
 
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/Logger.h -> aMule-2.3.1.tar.bz2/src/Logger.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (C) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-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
@@ -27,10 +27,13 @@
 
 #include <wx/log.h>
 #include <wx/event.h>
+#include <iosfwd>
 
 
 enum DebugType 
 {
+	//! Standard warning, not debug
+	logStandard = -1,
 	//! General warnings/errors.
 	logGeneral = 0,
 	//! Warnings/Errors for the main hashing thread.
@@ -104,7 +107,11 @@
 	//! Warnings/Errors related to Kad packet tracking.
 	logKadPacketTracking,
 	//! Warnings/Errors related to Kad entry tracking.
-	logKadEntryTracking
+	logKadEntryTracking,
+	//! Full log of external connection packets
+	logEC,
+	//! Warnings/Errors related to HTTP traffic
+	logHTTP
 	// IMPORTANT NOTE: when you add values to this enum, update the g_debugcats
 	// array in Logger.cpp!
 };
@@ -123,29 +130,31 @@
 	 * @param type The actual debug-category type.
 	 * @param name The user-readable name.
 	 */
-	CDebugCategory( DebugType type, const wxString& name );
+	CDebugCategory( DebugType type, const wxString& name )
+		: m_name(name), m_type(type), m_enabled(false)
+	{}
+
 
-	
 	/**
 	 * Returns true if the category is enabled.
 	 */
-	bool IsEnabled() const;
+	bool IsEnabled() const		{ return m_enabled; }
 
 	/**
 	 * Enables/Disables the category.
 	 */
-	void SetEnabled( bool );
-	
+	void SetEnabled( bool enabled )	{ m_enabled = enabled; }
+
 
 	/**
 	 * Returns the user-readable name.
 	 */
-	const wxString& GetName() const;
-	
+	const wxString& GetName() const	{ return m_name; }
+
 	/**
 	 * Returns the actual type.
 	 */
-	DebugType GetType() const;
+	DebugType GetType() const	{ return m_type; }
 
 private:
 	//! The user-readable name.
@@ -158,41 +167,39 @@
 
 
 /**
- * Namespace containing functions for logging operations.
+ * Functions for logging operations.
  */
-namespace CLogger
+class CLogger: public wxEvtHandler
 {
+public:
 	/**
 	 * Returns true if debug-messages should be generated for a specific category.
 	 */
-	bool IsEnabled( DebugType );
+#ifdef __DEBUG__
+	bool IsEnabled( DebugType ) const;
+#else
+	bool IsEnabled( DebugType ) const 	{ return false; }
+#endif
 	
 	/**
 	 * Enables or disables debug-messages for a specific category.
 	 */
 	void SetEnabled( DebugType type, bool enabled );
 
+	/**
+	 * Returns true if logging to stdout is enabled
+	 */
+	bool IsEnabledStdoutLog() const		{ return m_StdoutLog; }
 	
 	/**
-	 * Logs the specified line of text.
-	 *
-	 * @param file
-	 * @param line
-	 * @param critical If true, then the message will be made visible directly to the user.
-	 * @param str The actual line of text.
-	 *
-	 * This function is thread-safe. If it is called by the main thread, the 
-	 * event will be sent directly to the application, otherwise it will be
-	 * queued in the event-loop.
+	 * Enables or disables logging to stdout.
 	 */
-	void AddLogLine(
-		const wxString &file,
-		int line,
-		bool critical,
-		const wxString &str);
+	void SetEnabledStdoutLog(bool enabled)	{ m_StdoutLog = enabled; }
 
+	
 	/**
 	 * Logs the specified line of text, prefixed with the name of the DebugType.
+	 * (except for logStandard)
 	 *
 	 * @param file
 	 * @param line
@@ -209,18 +216,25 @@
 		int line,
 		bool critical,
 		DebugType type,
-		const wxString &str);
+		const wxString &str,
+		bool toStdout = false,
+		bool toGUI = true);
+
+	// for UPnP
+	void AddLogLine(
+		const wxString &file,
+		int line,
+		bool critical,
+		DebugType type,
+		const std::ostringstream &msg);
+
+	void AddLogLine(
+		const wxString &file,
+		int line,
+		bool critical,
+		const std::ostringstream &msg);
 
 
-	/**
-	 * Ensures that any pending entries are sent to the app.
-	 *
-	 * TODO: Ensure that entries are appended to the
-	 *       logfile even when queued to avoid risk of
-	 *       data loss.
-	 */
-	void FlushPendingEntries();
-	
 	/**
 	 * Returns a category specified by index.
 	 */
@@ -230,8 +244,59 @@
 	 * Returns the number of debug-categories.
 	 */
 	unsigned int GetDebugCategoryCount();
-}
 
+	/**
+	 * Open Logfile, true on success
+	 */
+	bool OpenLogfile(const wxString & name);
+
+	/**
+	 * Close Logfile
+	 */
+	void CloseLogfile();
+
+	/**
+	 * Get name of Logfile
+	 */
+	const wxString & GetLogfileName() const { 
+		return m_LogfileName; 
+	}
+
+	/**
+	 * Event handler
+	 */
+	void OnLoggingEvent(class CLoggingEvent& evt);
+
+	/**
+	 * Construct
+	 */
+	CLogger() {
+		applog = NULL;
+		m_StdoutLog = false;
+		m_count = 0;
+	}
+
+private:
+	class wxFFileOutputStream* applog; 	// the logfile
+	wxString m_LogfileName;
+	wxString m_ApplogBuf;
+	bool m_StdoutLog;
+	int  m_count;			// output line counter
+
+	/**
+	 * Write all waiting log info to the logfile
+	 */
+	void FlushApplog();
+
+	/**
+	 * Really output a single line
+	 */
+	void DoLine(const wxString & line, bool toStdout, bool toGUI);
+
+	DECLARE_EVENT_TABLE()
+};
+
+extern CLogger theLogger;
 
 /**
  * This class forwards log-lines from wxWidgets to CLogger.
@@ -244,7 +309,11 @@
 	/**
 	 * @see wxLog::DoLogString
 	 */
+#if wxCHECK_VERSION(2, 9, 0)
+	void DoLogText(const wxString &msg);
+#else
 	void DoLogString(const wxChar *msg, time_t);
+#endif
 };
 
 
@@ -255,9 +324,11 @@
 class CLoggingEvent : public wxEvent
 {
 public:
-	CLoggingEvent(bool critical, const wxString& msg)
+	CLoggingEvent(bool critical, bool toStdout, bool toGUI, const wxString& msg)
 		: wxEvent(-1, MULE_EVT_LOGLINE)
 		, m_critical(critical)
+		, m_stdout(toStdout)
+		, m_GUI(toGUI)
 		// Deep copy, to avoid thread-unsafe reference counting. */
 		, m_msg(msg.c_str(), msg.Length())
 	{
@@ -271,12 +342,22 @@
 		return m_critical;
 	}
 
+	bool ToStdout() const {
+		return m_stdout;
+	}
+
+	bool ToGUI() const {
+		return m_GUI;
+	}
+
 	wxEvent* Clone() const {
-		return new CLoggingEvent(m_critical, m_msg);
+		return new CLoggingEvent(m_critical, m_stdout, m_GUI, m_msg);
 	}
 	
 private:
 	bool		m_critical;
+	bool		m_stdout;
+	bool		m_GUI;
 	wxString	m_msg;
 };
 
@@ -290,36 +371,72 @@
 	wxStaticCastEvent(MuleLogEventFunction, &func), (wxObject*) NULL),
 
 
+// access the logfile for EC
+class CLoggerAccess
+{
+private:
+	class wxFFileInputStream * m_logfile;
+	class wxCharBuffer * m_buffer;
+	size_t m_bufferlen;
+	size_t m_pos;
+
+	bool m_ready;
+public:
+	//
+	// construct/destruct
+	//
+	CLoggerAccess();
+	~CLoggerAccess();
+	//
+	// Reset (used when logfile is cleared)
+	//
+	void Reset();
+	//
+	// get a String (if there is one)
+	//
+	bool GetString(wxString & s);
+	//
+	// is a String available ?
+	//
+	bool HasString();
+};
+
+
 /**
  * These macros should be used when logging. The 
  * AddLogLineM macro will simply call one of the
  * two CLogger::AddLogLine functions depending on
- * paramteres, but AddDebugLogLineM will only log
+ * parameters, but AddDebugLogLine* will only log
  * a message if the message is either critical or
  * the specified debug-type is enabled in the 
  * preferences.
+ * AddLogLineMS will also always print to stdout.
  */
-#if defined(MULEUNIT)
-	#define AddDebugLogLineM(critical, type, string) do {} while (false)
-	#define AddLogLineM(...) do {} while (false)
+#ifdef MULEUNIT
+	#define AddDebugLogLineN(...) do {} while (false)
+	#define AddLogLineN(...) do {} while (false)
+	#define AddLogLineNS(...) do {} while (false)
+	#define AddDebugLogLineC(...) do {} while (false)
+	#define AddLogLineC(...) do {} while (false)
+	#define AddLogLineCS(...) do {} while (false)
 #else
+// Macro for UPnP. This is not a debug macro, but wants its category printed nevertheless (sigh).
+	#define AddLogLineU(critical, type, string) theLogger.AddLogLine(__TFILE__, __LINE__, critical, type, string)
+// Macros for 'N'on critical logging
 	#ifdef __DEBUG__
-		#define AddDebugLogLineM(critical, type, string) \
-		do { \
-			if (critical || CLogger::IsEnabled(type)) { \
-				CLogger::AddLogLine(__TFILE__, __LINE__, critical, type, string); \
-			} \
-		} while (false)
+		#define AddDebugLogLineN(type, string) theLogger.AddLogLine(__TFILE__, __LINE__, false, type, string)
 	#else
-		#define AddDebugLogLineM(critical, type, string) \
-		do { \
-			if (critical) { \
-				CLogger::AddLogLine(__TFILE__, __LINE__, critical, type, string); \
-			} \
-		} while (false)
+		#define AddDebugLogLineN(type, string)	do {} while (false)
 	#endif
-
-	#define AddLogLineM(...) CLogger::AddLogLine(__TFILE__, __LINE__, __VA_ARGS__)
+	#define AddLogLineN(string) theLogger.AddLogLine(__TFILE__, __LINE__, false, logStandard, string)
+	#define AddLogLineNS(string) theLogger.AddLogLine(__TFILE__, __LINE__, false, logStandard, string, true)
+// Macros for 'C'ritical logging
+	#define AddDebugLogLineC(type, string) theLogger.AddLogLine(__TFILE__, __LINE__, true, type, string)
+	#define AddLogLineC(string) theLogger.AddLogLine(__TFILE__, __LINE__, true, logStandard, string)
+	#define AddLogLineCS(string) theLogger.AddLogLine(__TFILE__, __LINE__, true, logStandard, string, true)
+// Macros for logging to logfile only
+	#define AddDebugLogLineF(type, string) theLogger.AddLogLine(__TFILE__, __LINE__, false, type, string, false, false)
+	#define AddLogLineF(string) theLogger.AddLogLine(__TFILE__, __LINE__, false, logStandard, string, false, false)
 #endif
 
 #endif

aMule-2.3.1.tar.bz2/src/LoggerConsole.cpp Added

@@ -0,0 +1,89 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2004-2011 Marcelo Roberto Jimenez ( phoenix@amule.org )
+// 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
+//
+
+
+#include <sstream>
+#include <common/StringFunctions.h>	// for char2unicode()
+
+#include "Logger.h"				// for Add(Debug)LogLineM()
+
+
+#ifdef __DEBUG__
+bool CLogger::IsEnabled(DebugType /*type*/) const
+{
+	return true;
+}
+#endif
+
+
+void CLogger::AddLogLine(
+	const wxString &file,
+	int line,
+	bool critical,
+	const std::ostringstream &msg)
+{
+	AddLogLine(file, line, critical, static_cast<DebugType>(0), msg);
+}
+
+
+void CLogger::AddLogLine(
+	const wxString &file,
+	int line,
+	bool critical,
+	DebugType /* type */,
+	const wxString &str,
+	bool /*  toStdout */,
+	bool /* toGUI */)
+{
+	std::string s;
+	if (critical) {
+		s = "Critical message: ";
+	}
+	printf("%s(%d): %s%s\n",
+		(const char *)unicode2char(file),
+		line, s.c_str(), (const char *)unicode2char(str));
+}
+
+
+void CLogger::AddLogLine(
+	const wxString &file,
+	int line,
+	bool critical,
+	DebugType /*type*/,
+	const std::ostringstream &msg)
+{
+	std::string s;
+	if (critical) {
+		s = "Critical message: ";
+	}
+	printf("%s(%d): %s%s\n",
+		(const char *)unicode2char(file),
+		line, s.c_str(), msg.str().c_str());
+}
+
+CLogger theLogger;
+
+BEGIN_EVENT_TABLE(CLogger, wxEvtHandler)
+END_EVENT_TABLE()

aMule-2.2.6.tar.bz2/src/MD4Hash.h -> aMule-2.3.1.tar.bz2/src/MD4Hash.h Changed

aMule-2.2.6.tar.bz2/src/MagnetURI.cpp -> aMule-2.3.1.tar.bz2/src/MagnetURI.cpp Changed

aMule-2.2.6.tar.bz2/src/MagnetURI.h -> aMule-2.3.1.tar.bz2/src/MagnetURI.h Changed

aMule-2.2.6.tar.bz2/src/Makefile.am -> aMule-2.3.1.tar.bz2/src/Makefile.am Changed

@@ -18,6 +18,7 @@
 	Parser.y \
 	Scanner.h.in \
 	Scanner.l \
+	IPFilterScanner.l \
 	muuli.wdr 
 
 bin_PROGRAMS = 
@@ -61,19 +62,21 @@
 
 libmuleappcommon_a_SOURCES = \
 	CFile.cpp \
-	DataToText.cpp \
+	ClientCredits.cpp \
 	ED2KLink.cpp \
+	Friend.cpp \
+	GapList.cpp \
 	MagnetURI.cpp \
 	MemFile.cpp \
 	NetworkFunctions.cpp \
+	OtherFunctions.cpp \
 	Packet.cpp \
 	RLE.cpp \
 	SafeFile.cpp \
 	SHA.cpp \
 	Tag.cpp \
-	Timer.cpp \
-	RandomFunctions.cpp \
-	kademlia/utils/UInt128.cpp
+	TerminationProcess.cpp \
+	Timer.cpp
 
 libmuleappcommon_a_CPPFLAGS = $(AM_CPPFLAGS) $(WXBASE_CPPFLAGS) -I$(srcdir)/libs -I$(srcdir)/include $(CRYPTOPP_CPPFLAGS) $(LIBUPNP_CPPFLAGS)
 
@@ -83,14 +86,22 @@
 libmuleappcore_a_SOURCES = \
 	AsyncDNS.cpp \
 	DeadSourceList.cpp \
+	FileArea.cpp \
+	FileAutoClose.cpp \
+	IPFilterScanner.cpp \
 	Scanner.cpp \
 	Parser.cpp \
 	PlatformSpecific.cpp \
+	RandomFunctions.cpp \
+	RC4Encrypt.cpp \
+	StateMachine.cpp \
+	TerminationProcessAmuleweb.cpp \
+	ThreadScheduler.cpp \
+	UPnPBase.cpp \
 	kademlia/kademlia/Entry.cpp \
 	kademlia/kademlia/SearchManager.cpp \
 	kademlia/routing/RoutingBin.cpp \
-	StateMachine.cpp \
-	ThreadScheduler.cpp
+	kademlia/utils/UInt128.cpp
 
 libmuleappcore_a_CPPFLAGS = $(AM_CPPFLAGS) $(WXBASE_CPPFLAGS) -I$(srcdir)/libs -I$(srcdir)/include $(CRYPTOPP_CPPFLAGS) $(LIBUPNP_CPPFLAGS)
 
@@ -99,14 +110,12 @@
 
 libmuleappgui_a_SOURCES = \
 	BarShader.cpp \
-	ChatWnd.cpp \
 	ColorFrameCtrl.cpp \
-	CommentDialog.cpp \
-	CommentDialogLst.cpp \
-	DirectoryTreeCtrl.cpp \
 	EditServerListDlg.cpp \
 	extern/wxWidgets/listctrl.cpp \
 	FileDetailListCtrl.cpp \
+	IP2Country.cpp \
+	MuleColour.cpp \
 	MuleGifCtrl.cpp \
 	MuleListCtrl.cpp \
 	MuleNotebook.cpp \
@@ -117,13 +126,14 @@
 libmuleappgui_a_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) -I$(srcdir)/libs -I$(srcdir)/include $(LIBUPNP_CPPFLAGS) $(GEOIP_CPPFLAGS)
 
 core_sources = \
-	RC4Encrypt.cpp \
 	amule.cpp \
 	BaseClient.cpp \
+	CanceledFileList.cpp \
 	ClientList.cpp \
 	ClientCreditsList.cpp \
 	ClientTCPSocket.cpp \
 	ClientUDPSocket.cpp \
+	CorruptionBlackBox.cpp \
 	DownloadClient.cpp \
 	DownloadQueue.cpp \
 	ECSpecialCoreTags.cpp \
@@ -131,20 +141,18 @@
 	EncryptedStreamSocket.cpp \
 	EncryptedDatagramSocket.cpp \
 	ExternalConn.cpp \
-	Friend.cpp \
 	FriendList.cpp \
-	HTTPDownload.cpp \
 	IPFilter.cpp \
 	KnownFileList.cpp \
 	ListenSocket.cpp \
 	MuleUDPSocket.cpp \
-	PartFileConvert.cpp \
 	SearchFile.cpp \
 	SearchList.cpp \
 	ServerConnect.cpp \
 	ServerList.cpp \
 	ServerSocket.cpp \
 	ServerUDPSocket.cpp \
+	SHAHashSet.cpp \
 	SharedFileList.cpp \
 	ThreadTasks.cpp \
 	UploadBandwidthThrottler.cpp \
@@ -160,11 +168,6 @@
 	kademlia/routing/Contact.cpp \
 	kademlia/routing/RoutingZone.cpp
 
-if ENABLE_UPNP
-core_sources += \
-	UPnPBase.cpp \
-	UPnPCompatibility.cpp
-endif
 
 gui_sources = \
 	amule-gui.cpp \
@@ -172,11 +175,15 @@
 	AddFriend.cpp \
 	CatDialog.cpp \
 	ChatSelector.cpp \
+	ChatWnd.cpp \
+	CommentDialog.cpp \
+	CommentDialogLst.cpp \
+	GenericClientListCtrl.cpp \
 	ClientDetailDialog.cpp \
+	DirectoryTreeCtrl.cpp \
 	FileDetailDialog.cpp \
 	KadDlg.cpp \
 	OScopeCtrl.cpp \
-	PartFileConvertDlg.cpp \
 	PrefsUnifiedDlg.cpp \
 	SearchDlg.cpp \
 	ServerWnd.cpp \
@@ -184,29 +191,24 @@
 	StatisticsDlg.cpp \
 	SearchListCtrl.cpp \
 	DownloadListCtrl.cpp \
-	ClientListCtrl.cpp \
+	SourceListCtrl.cpp \
+	SharedFilePeersListCtrl.cpp \
 	FriendListCtrl.cpp \
 	ServerListCtrl.cpp \
 	SharedFilesCtrl.cpp \
 	MuleTrayIcon.cpp \
 	TransferWnd.cpp 
 
-if ENABLE_IP2COUNTRY
-gui_sources += \
-	IP2Country.cpp
-endif
-
-
-remote_common_sources = \
-	OtherFunctions.cpp \
-	NetworkFunctions.cpp 
 
 common_sources = \
-	ClientCredits.cpp \
+	amuleAppCommon.cpp \
+	ClientRef.cpp \
+	DataToText.cpp \
 	ECSpecialMuleTags.cpp \
 	KnownFile.cpp \
 	GetTickCount.cpp \
 	GuiEvents.cpp \
+	HTTPDownload.cpp \
 	Logger.cpp \
 	PartFile.cpp \
 	Preferences.cpp \
@@ -214,16 +216,12 @@
 	Server.cpp \
 	Statistics.cpp \
 	StatTree.cpp \
-	SHAHashSet.cpp \
-	TerminationProcess.cpp \
-	TerminationProcessAmuleweb.cpp \
-	UserEvents.cpp \
-	$(remote_common_sources)
+	UserEvents.cpp
 
 # Libs
 
 core_libs = -L. -lmuleappcore $(LIBUPNP_LDFLAGS) $(LIBUPNP_LIBS)
-gui_libs = -L. -lmuleappgui $(X11LIBS) $(WX_LIBS) $(GEOIP_LDFLAGS) $(GEOIP_LIBS)
+gui_libs = -L. -lmuleappgui $(WX_LIBS) $(GEOIP_LDFLAGS) $(GEOIP_LIBS)
 remote_common_libs = -Llibs/common -Llibs/ec/cpp -lmulecommon -lec $(BFD_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(RESOLV_LIB)
 common_libs = -L. -lmuleappcommon $(remote_common_libs) $(CRYPTOPP_LDFLAGS) $(CRYPTOPP_LIBS)
 
@@ -252,6 +250,10 @@
 	$(common_sources)
 
 amule_SOURCES = \
+	CaptchaDialog.cpp \
+	CaptchaGenerator.cpp \
+	PartFileConvert.cpp \
+	PartFileConvertDlg.cpp \
 	$(core_sources) \
 	$(gui_sources) \
 	$(ec_sources) \
@@ -259,7 +261,6 @@
 
 amuled_SOURCES = \
 	amuled.cpp \
-	Timer.cpp \
 	$(core_sources) \
 	$(ec_sources) \
 	$(common_sources)
@@ -270,7 +271,7 @@
 amule_LDADD = $(common_libs) $(core_libs) $(gui_libs)
 
 amulegui_DEPENDENCIES = $(common_deps) $(gui_deps)
-amulegui_CPPFLAGS = $(AM_CPPFLAGS) $(gui_flags) $(common_flags) -DCLIENT_GUI -DEC_REMOTE
+amulegui_CPPFLAGS = $(AM_CPPFLAGS) $(gui_flags) $(common_flags) -DCLIENT_GUI
 amulegui_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY)
 amulegui_LDADD = $(gui_libs) $(common_libs) $(WXBASE_LIBS)
 
@@ -298,10 +299,12 @@
 amulecmd_SOURCES = \
 	TextClient.cpp \
 	ExternalConnector.cpp \
-	$(remote_common_sources)
+	LoggerConsole.cpp \
+	OtherFunctions.cpp \
+	NetworkFunctions.cpp 
 
 amulecmd_DEPENDENCIES = $(remote_common_deps)
-amulecmd_CPPFLAGS = $(AM_CPPFLAGS) $(WXBASE_CPPFLAGS) $(common_flags) -DEC_REMOTE -DECSOCKET_USE_EVENTS=0
+amulecmd_CPPFLAGS = $(AM_CPPFLAGS) $(WXBASE_CPPFLAGS) $(common_flags)
 amulecmd_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY)
 #amulecmd_LDADD = $(WXBASE_LIBS) $(READLINE_LIBS) $(remote_common_libs)
 amulecmd_LDADD = -Llibs/common -Llibs/ec/cpp -lmulecommon -lec \
@@ -316,6 +319,10 @@
 		amuleIPV4Address.h \
 		ArchSpecific.h \
 		BarShader.h \
+		BitVector.h \
+		CanceledFileList.h \
+		CaptchaDialog.h \
+		CaptchaGenerator.h \
 		CatDialog.h \
 		CFile.h \
 		ChatSelector.h \
@@ -323,15 +330,16 @@
 		ClientCredits.h \
 		ClientCreditsList.h \
 		ClientDetailDialog.h \
-		ClientListCtrl.h \
+		SharedFilePeersListCtrl.h \
 		ClientList.h \
+		ClientRef.h \
 		ClientTCPSocket.h \
 		ClientUDPSocket.h \
 		ColorFrameCtrl.h \
-		Color.h \
 		CommentDialog.h \
 		CommentDialogLst.h \
 		Constants.h \
+		CorruptionBlackBox.h \
 		CryptoPP_Inc.h \
 		DataToText.h \
 		DeadSourceList.h \
@@ -345,19 +353,24 @@
 		EncryptedStreamSocket.h \
 		ExternalConnector.h \
 		ExternalConn.h \
+		FileArea.h \
+		FileAutoClose.h \
 		FileDetailDialog.h \
 		FileDetailListCtrl.h \
 		FileLock.h \
 		Friend.h \
 		FriendListCtrl.h \
 		FriendList.h \
+		GapList.h \
 		GetTickCount.h \
+		GenericClientListCtrl.h \
 		GuiEvents.h \
 		HTTPDownload.h \
 		inetdownload.h \
 		InternalEvents.h \
 		IP2Country.h \
 		IPFilter.h \
+		IPFilterScanner.h \
 		KadDlg.h \
 		KnownFile.h \
 		KnownFileList.h \
@@ -367,6 +380,7 @@
 		MD4Hash.h \
 		MemFile.h \
 		MuleCollection.h \
+		MuleColour.h \
 		MuleGifCtrl.h \
 		MuleListCtrl.h \
 		MuleNotebook.h \
@@ -414,6 +428,7 @@
 		SharedFileList.h \
 		SharedFilesCtrl.h \
 		SharedFilesWnd.h \
+		SourceListCtrl.h \
 		StateMachine.h \
 		StatisticsDlg.h \
 		Statistics.h \
@@ -429,6 +444,7 @@
 		TransferWnd.h \
 		Types.h \
 		updownclient.h \
+		UpDownClientEC.h \
 		UploadBandwidthThrottler.h \
 		UploadQueue.h \
 		UPnPBase.h \
@@ -446,10 +462,13 @@
 		$(LEX) --header-file=$(srcdir)/Scanner.h -o $@ $(srcdir)/Scanner.l
 else
 $(srcdir)/Scanner.cpp: Scanner.l Parser.cpp
-		$(LEX) -o$@ $(srcdir)/Scanner.l; \
+		$(LEX) -o $@ $(srcdir)/Scanner.l; \
 		echo "// Empty file generated by a flex version unable to create headers" > $(srcdir)/Scanner.h
 endif
 
+$(srcdir)/IPFilterScanner.cpp: IPFilterScanner.l
+		$(LEX) -Pyyip -o $@ $(srcdir)/IPFilterScanner.l;
+
 # Resources
 
 if NEED_RC
@@ -515,6 +534,6 @@
 endif
 
 
-EXTRA__DIST__SUBDIRS = include kademlia remote-gui.net
+EXTRA__DIST__SUBDIRS = include kademlia
 include $(top_srcdir)/automake/dist-hook.am

aMule-2.2.6.tar.bz2/src/Makefile.in -> aMule-2.3.1.tar.bz2/src/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +17,12 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -50,18 +48,11 @@
 @MONOLITHIC_TRUE@am__append_8 = libmuleappcore.a libmuleappgui.a libmuleappcommon.a
 @AMULE_DAEMON_TRUE@@MONOLITHIC_FALSE@am__append_9 = libmuleappcore.a libmuleappcommon.a
 @AMULE_DAEMON_FALSE@@AMULE_GUI_TRUE@@MONOLITHIC_FALSE@am__append_10 = libmuleappgui.a libmuleappcommon.a
-@ENABLE_UPNP_TRUE@am__append_11 = \
-@ENABLE_UPNP_TRUE@	UPnPBase.cpp \
-@ENABLE_UPNP_TRUE@	UPnPCompatibility.cpp
-
-@ENABLE_IP2COUNTRY_TRUE@am__append_12 = \
-@ENABLE_IP2COUNTRY_TRUE@	IP2Country.cpp
-
-@SYS_WIN32_TRUE@am__append_13 = -lshlwapi
-@NEED_RC_TRUE@am__append_14 = amulerc.$(OBJEXT)
-@NEED_RC_TRUE@am__append_15 = amulerc.$(OBJEXT)
-@NEED_RC_TRUE@am__append_16 = amuleguirc.$(OBJEXT)
-@NEED_RC_TRUE@am__append_17 = amuleguirc.$(OBJEXT)
+@SYS_WIN32_TRUE@am__append_11 = -lshlwapi
+@NEED_RC_TRUE@am__append_12 = amulerc.$(OBJEXT)
+@NEED_RC_TRUE@am__append_13 = amulerc.$(OBJEXT)
+@NEED_RC_TRUE@am__append_14 = amuleguirc.$(OBJEXT)
+@NEED_RC_TRUE@am__append_15 = amuleguirc.$(OBJEXT)
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/automake/dist-hook.am
 subdir = src
@@ -73,11 +64,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -87,49 +80,64 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 libmuleappcommon_a_AR = $(AR) $(ARFLAGS)
 libmuleappcommon_a_LIBADD =
 am_libmuleappcommon_a_OBJECTS = libmuleappcommon_a-CFile.$(OBJEXT) \
-	libmuleappcommon_a-DataToText.$(OBJEXT) \
+	libmuleappcommon_a-ClientCredits.$(OBJEXT) \
 	libmuleappcommon_a-ED2KLink.$(OBJEXT) \
+	libmuleappcommon_a-Friend.$(OBJEXT) \
+	libmuleappcommon_a-GapList.$(OBJEXT) \
 	libmuleappcommon_a-MagnetURI.$(OBJEXT) \
 	libmuleappcommon_a-MemFile.$(OBJEXT) \
 	libmuleappcommon_a-NetworkFunctions.$(OBJEXT) \
+	libmuleappcommon_a-OtherFunctions.$(OBJEXT) \
 	libmuleappcommon_a-Packet.$(OBJEXT) \
 	libmuleappcommon_a-RLE.$(OBJEXT) \
 	libmuleappcommon_a-SafeFile.$(OBJEXT) \
 	libmuleappcommon_a-SHA.$(OBJEXT) \
 	libmuleappcommon_a-Tag.$(OBJEXT) \
-	libmuleappcommon_a-Timer.$(OBJEXT) \
-	libmuleappcommon_a-RandomFunctions.$(OBJEXT) \
-	libmuleappcommon_a-UInt128.$(OBJEXT)
+	libmuleappcommon_a-TerminationProcess.$(OBJEXT) \
+	libmuleappcommon_a-Timer.$(OBJEXT)
 libmuleappcommon_a_OBJECTS = $(am_libmuleappcommon_a_OBJECTS)
 libmuleappcore_a_AR = $(AR) $(ARFLAGS)
 libmuleappcore_a_LIBADD =
 am_libmuleappcore_a_OBJECTS = libmuleappcore_a-AsyncDNS.$(OBJEXT) \
 	libmuleappcore_a-DeadSourceList.$(OBJEXT) \
+	libmuleappcore_a-FileArea.$(OBJEXT) \
+	libmuleappcore_a-FileAutoClose.$(OBJEXT) \
+	libmuleappcore_a-IPFilterScanner.$(OBJEXT) \
 	libmuleappcore_a-Scanner.$(OBJEXT) \
 	libmuleappcore_a-Parser.$(OBJEXT) \
 	libmuleappcore_a-PlatformSpecific.$(OBJEXT) \
+	libmuleappcore_a-RandomFunctions.$(OBJEXT) \
+	libmuleappcore_a-RC4Encrypt.$(OBJEXT) \
+	libmuleappcore_a-StateMachine.$(OBJEXT) \
+	libmuleappcore_a-TerminationProcessAmuleweb.$(OBJEXT) \
+	libmuleappcore_a-ThreadScheduler.$(OBJEXT) \
+	libmuleappcore_a-UPnPBase.$(OBJEXT) \
 	libmuleappcore_a-Entry.$(OBJEXT) \
 	libmuleappcore_a-SearchManager.$(OBJEXT) \
 	libmuleappcore_a-RoutingBin.$(OBJEXT) \
-	libmuleappcore_a-StateMachine.$(OBJEXT) \
-	libmuleappcore_a-ThreadScheduler.$(OBJEXT)
+	libmuleappcore_a-UInt128.$(OBJEXT)
 libmuleappcore_a_OBJECTS = $(am_libmuleappcore_a_OBJECTS)
 libmuleappgui_a_AR = $(AR) $(ARFLAGS)
 libmuleappgui_a_LIBADD =
 am_libmuleappgui_a_OBJECTS = libmuleappgui_a-BarShader.$(OBJEXT) \
-	libmuleappgui_a-ChatWnd.$(OBJEXT) \
 	libmuleappgui_a-ColorFrameCtrl.$(OBJEXT) \
-	libmuleappgui_a-CommentDialog.$(OBJEXT) \
-	libmuleappgui_a-CommentDialogLst.$(OBJEXT) \
-	libmuleappgui_a-DirectoryTreeCtrl.$(OBJEXT) \
 	libmuleappgui_a-EditServerListDlg.$(OBJEXT) \
 	libmuleappgui_a-listctrl.$(OBJEXT) \
 	libmuleappgui_a-FileDetailListCtrl.$(OBJEXT) \
+	libmuleappgui_a-IP2Country.$(OBJEXT) \
+	libmuleappgui_a-MuleColour.$(OBJEXT) \
 	libmuleappgui_a-MuleGifCtrl.$(OBJEXT) \
 	libmuleappgui_a-MuleListCtrl.$(OBJEXT) \
 	libmuleappgui_a-MuleNotebook.$(OBJEXT) \
@@ -143,58 +151,24 @@
 @AMULE_GUI_TRUE@am__EXEEXT_4 = amulegui$(EXEEXT)
 @AMULE_DAEMON_TRUE@am__EXEEXT_5 = amuled$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am__amule_SOURCES_DIST = RC4Encrypt.cpp amule.cpp BaseClient.cpp \
-	ClientList.cpp ClientCreditsList.cpp ClientTCPSocket.cpp \
-	ClientUDPSocket.cpp DownloadClient.cpp DownloadQueue.cpp \
-	ECSpecialCoreTags.cpp EMSocket.cpp EncryptedStreamSocket.cpp \
-	EncryptedDatagramSocket.cpp ExternalConn.cpp Friend.cpp \
-	FriendList.cpp HTTPDownload.cpp IPFilter.cpp KnownFileList.cpp \
-	ListenSocket.cpp MuleUDPSocket.cpp PartFileConvert.cpp \
-	SearchFile.cpp SearchList.cpp ServerConnect.cpp ServerList.cpp \
-	ServerSocket.cpp ServerUDPSocket.cpp SharedFileList.cpp \
-	ThreadTasks.cpp UploadBandwidthThrottler.cpp UploadClient.cpp \
-	UploadQueue.cpp kademlia/kademlia/Indexed.cpp \
-	kademlia/kademlia/Kademlia.cpp kademlia/kademlia/Prefs.cpp \
-	kademlia/kademlia/Search.cpp \
-	kademlia/kademlia/UDPFirewallTester.cpp \
-	kademlia/net/KademliaUDPListener.cpp \
-	kademlia/net/PacketTracking.cpp kademlia/routing/Contact.cpp \
-	kademlia/routing/RoutingZone.cpp UPnPBase.cpp \
-	UPnPCompatibility.cpp amule-gui.cpp amuleDlg.cpp AddFriend.cpp \
-	CatDialog.cpp ChatSelector.cpp ClientDetailDialog.cpp \
-	FileDetailDialog.cpp KadDlg.cpp OScopeCtrl.cpp \
-	PartFileConvertDlg.cpp PrefsUnifiedDlg.cpp SearchDlg.cpp \
-	ServerWnd.cpp SharedFilesWnd.cpp StatisticsDlg.cpp \
-	SearchListCtrl.cpp DownloadListCtrl.cpp ClientListCtrl.cpp \
-	FriendListCtrl.cpp ServerListCtrl.cpp SharedFilesCtrl.cpp \
-	MuleTrayIcon.cpp TransferWnd.cpp IP2Country.cpp \
-	ClientCredits.cpp ECSpecialMuleTags.cpp KnownFile.cpp \
-	GetTickCount.cpp GuiEvents.cpp Logger.cpp PartFile.cpp \
-	Preferences.cpp Proxy.cpp Server.cpp Statistics.cpp \
-	StatTree.cpp SHAHashSet.cpp TerminationProcess.cpp \
-	TerminationProcessAmuleweb.cpp UserEvents.cpp \
-	OtherFunctions.cpp NetworkFunctions.cpp
-@ENABLE_UPNP_TRUE@am__objects_1 = amule-UPnPBase.$(OBJEXT) \
-@ENABLE_UPNP_TRUE@	amule-UPnPCompatibility.$(OBJEXT)
-am__objects_2 = amule-RC4Encrypt.$(OBJEXT) amule-amule.$(OBJEXT) \
-	amule-BaseClient.$(OBJEXT) amule-ClientList.$(OBJEXT) \
+am__objects_1 = amule-amule.$(OBJEXT) amule-BaseClient.$(OBJEXT) \
+	amule-CanceledFileList.$(OBJEXT) amule-ClientList.$(OBJEXT) \
 	amule-ClientCreditsList.$(OBJEXT) \
 	amule-ClientTCPSocket.$(OBJEXT) \
-	amule-ClientUDPSocket.$(OBJEXT) amule-DownloadClient.$(OBJEXT) \
-	amule-DownloadQueue.$(OBJEXT) \
+	amule-ClientUDPSocket.$(OBJEXT) \
+	amule-CorruptionBlackBox.$(OBJEXT) \
+	amule-DownloadClient.$(OBJEXT) amule-DownloadQueue.$(OBJEXT) \
 	amule-ECSpecialCoreTags.$(OBJEXT) amule-EMSocket.$(OBJEXT) \
 	amule-EncryptedStreamSocket.$(OBJEXT) \
 	amule-EncryptedDatagramSocket.$(OBJEXT) \
-	amule-ExternalConn.$(OBJEXT) amule-Friend.$(OBJEXT) \
-	amule-FriendList.$(OBJEXT) amule-HTTPDownload.$(OBJEXT) \
+	amule-ExternalConn.$(OBJEXT) amule-FriendList.$(OBJEXT) \
 	amule-IPFilter.$(OBJEXT) amule-KnownFileList.$(OBJEXT) \
 	amule-ListenSocket.$(OBJEXT) amule-MuleUDPSocket.$(OBJEXT) \
-	amule-PartFileConvert.$(OBJEXT) amule-SearchFile.$(OBJEXT) \
-	amule-SearchList.$(OBJEXT) amule-ServerConnect.$(OBJEXT) \
-	amule-ServerList.$(OBJEXT) amule-ServerSocket.$(OBJEXT) \
-	amule-ServerUDPSocket.$(OBJEXT) amule-SharedFileList.$(OBJEXT) \
+	amule-SearchFile.$(OBJEXT) amule-SearchList.$(OBJEXT) \
+	amule-ServerConnect.$(OBJEXT) amule-ServerList.$(OBJEXT) \
+	amule-ServerSocket.$(OBJEXT) amule-ServerUDPSocket.$(OBJEXT) \
+	amule-SHAHashSet.$(OBJEXT) amule-SharedFileList.$(OBJEXT) \
 	amule-ThreadTasks.$(OBJEXT) \
 	amule-UploadBandwidthThrottler.$(OBJEXT) \
 	amule-UploadClient.$(OBJEXT) amule-UploadQueue.$(OBJEXT) \
@@ -203,35 +177,39 @@
 	amule-UDPFirewallTester.$(OBJEXT) \
 	amule-KademliaUDPListener.$(OBJEXT) \
 	amule-PacketTracking.$(OBJEXT) amule-Contact.$(OBJEXT) \
-	amule-RoutingZone.$(OBJEXT) $(am__objects_1)
-@ENABLE_IP2COUNTRY_TRUE@am__objects_3 = amule-IP2Country.$(OBJEXT)
-am__objects_4 = amule-amule-gui.$(OBJEXT) amule-amuleDlg.$(OBJEXT) \
+	amule-RoutingZone.$(OBJEXT)
+am__objects_2 = amule-amule-gui.$(OBJEXT) amule-amuleDlg.$(OBJEXT) \
 	amule-AddFriend.$(OBJEXT) amule-CatDialog.$(OBJEXT) \
-	amule-ChatSelector.$(OBJEXT) \
+	amule-ChatSelector.$(OBJEXT) amule-ChatWnd.$(OBJEXT) \
+	amule-CommentDialog.$(OBJEXT) amule-CommentDialogLst.$(OBJEXT) \
+	amule-GenericClientListCtrl.$(OBJEXT) \
 	amule-ClientDetailDialog.$(OBJEXT) \
+	amule-DirectoryTreeCtrl.$(OBJEXT) \
 	amule-FileDetailDialog.$(OBJEXT) amule-KadDlg.$(OBJEXT) \
-	amule-OScopeCtrl.$(OBJEXT) amule-PartFileConvertDlg.$(OBJEXT) \
-	amule-PrefsUnifiedDlg.$(OBJEXT) amule-SearchDlg.$(OBJEXT) \
-	amule-ServerWnd.$(OBJEXT) amule-SharedFilesWnd.$(OBJEXT) \
-	amule-StatisticsDlg.$(OBJEXT) amule-SearchListCtrl.$(OBJEXT) \
+	amule-OScopeCtrl.$(OBJEXT) amule-PrefsUnifiedDlg.$(OBJEXT) \
+	amule-SearchDlg.$(OBJEXT) amule-ServerWnd.$(OBJEXT) \
+	amule-SharedFilesWnd.$(OBJEXT) amule-StatisticsDlg.$(OBJEXT) \
+	amule-SearchListCtrl.$(OBJEXT) \
 	amule-DownloadListCtrl.$(OBJEXT) \
-	amule-ClientListCtrl.$(OBJEXT) amule-FriendListCtrl.$(OBJEXT) \
-	amule-ServerListCtrl.$(OBJEXT) amule-SharedFilesCtrl.$(OBJEXT) \
-	amule-MuleTrayIcon.$(OBJEXT) amule-TransferWnd.$(OBJEXT) \
-	$(am__objects_3)
-am__objects_5 = amule-OtherFunctions.$(OBJEXT) \
-	amule-NetworkFunctions.$(OBJEXT)
-am__objects_6 = amule-ClientCredits.$(OBJEXT) \
+	amule-SourceListCtrl.$(OBJEXT) \
+	amule-SharedFilePeersListCtrl.$(OBJEXT) \
+	amule-FriendListCtrl.$(OBJEXT) amule-ServerListCtrl.$(OBJEXT) \
+	amule-SharedFilesCtrl.$(OBJEXT) amule-MuleTrayIcon.$(OBJEXT) \
+	amule-TransferWnd.$(OBJEXT)
+am__objects_3 = amule-amuleAppCommon.$(OBJEXT) \
+	amule-ClientRef.$(OBJEXT) amule-DataToText.$(OBJEXT) \
 	amule-ECSpecialMuleTags.$(OBJEXT) amule-KnownFile.$(OBJEXT) \
 	amule-GetTickCount.$(OBJEXT) amule-GuiEvents.$(OBJEXT) \
-	amule-Logger.$(OBJEXT) amule-PartFile.$(OBJEXT) \
-	amule-Preferences.$(OBJEXT) amule-Proxy.$(OBJEXT) \
-	amule-Server.$(OBJEXT) amule-Statistics.$(OBJEXT) \
-	amule-StatTree.$(OBJEXT) amule-SHAHashSet.$(OBJEXT) \
-	amule-TerminationProcess.$(OBJEXT) \
-	amule-TerminationProcessAmuleweb.$(OBJEXT) \
-	amule-UserEvents.$(OBJEXT) $(am__objects_5)
-am_amule_OBJECTS = $(am__objects_2) $(am__objects_4) $(am__objects_6)
+	amule-HTTPDownload.$(OBJEXT) amule-Logger.$(OBJEXT) \
+	amule-PartFile.$(OBJEXT) amule-Preferences.$(OBJEXT) \
+	amule-Proxy.$(OBJEXT) amule-Server.$(OBJEXT) \
+	amule-Statistics.$(OBJEXT) amule-StatTree.$(OBJEXT) \
+	amule-UserEvents.$(OBJEXT)
+am_amule_OBJECTS = amule-CaptchaDialog.$(OBJEXT) \
+	amule-CaptchaGenerator.$(OBJEXT) \
+	amule-PartFileConvert.$(OBJEXT) \
+	amule-PartFileConvertDlg.$(OBJEXT) $(am__objects_1) \
+	$(am__objects_2) $(am__objects_3)
 amule_OBJECTS = $(am_amule_OBJECTS)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -240,57 +218,35 @@
 	$(am__DEPENDENCIES_1)
 am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-@NEED_RC_TRUE@am__DEPENDENCIES_5 = amulerc.$(OBJEXT)
-am__objects_7 = amulecmd-OtherFunctions.$(OBJEXT) \
-	amulecmd-NetworkFunctions.$(OBJEXT)
+amule_LINK = $(CXXLD) $(amule_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_amulecmd_OBJECTS = amulecmd-TextClient.$(OBJEXT) \
-	amulecmd-ExternalConnector.$(OBJEXT) $(am__objects_7)
+	amulecmd-ExternalConnector.$(OBJEXT) \
+	amulecmd-LoggerConsole.$(OBJEXT) \
+	amulecmd-OtherFunctions.$(OBJEXT) \
+	amulecmd-NetworkFunctions.$(OBJEXT)
 @NEED_RC_TRUE@nodist_amulecmd_OBJECTS = amulecmd-version.$(OBJEXT)
 amulecmd_OBJECTS = $(am_amulecmd_OBJECTS) $(nodist_amulecmd_OBJECTS)
-am__amuled_SOURCES_DIST = amuled.cpp Timer.cpp RC4Encrypt.cpp \
-	amule.cpp BaseClient.cpp ClientList.cpp ClientCreditsList.cpp \
-	ClientTCPSocket.cpp ClientUDPSocket.cpp DownloadClient.cpp \
-	DownloadQueue.cpp ECSpecialCoreTags.cpp EMSocket.cpp \
-	EncryptedStreamSocket.cpp EncryptedDatagramSocket.cpp \
-	ExternalConn.cpp Friend.cpp FriendList.cpp HTTPDownload.cpp \
-	IPFilter.cpp KnownFileList.cpp ListenSocket.cpp \
-	MuleUDPSocket.cpp PartFileConvert.cpp SearchFile.cpp \
-	SearchList.cpp ServerConnect.cpp ServerList.cpp \
-	ServerSocket.cpp ServerUDPSocket.cpp SharedFileList.cpp \
-	ThreadTasks.cpp UploadBandwidthThrottler.cpp UploadClient.cpp \
-	UploadQueue.cpp kademlia/kademlia/Indexed.cpp \
-	kademlia/kademlia/Kademlia.cpp kademlia/kademlia/Prefs.cpp \
-	kademlia/kademlia/Search.cpp \
-	kademlia/kademlia/UDPFirewallTester.cpp \
-	kademlia/net/KademliaUDPListener.cpp \
-	kademlia/net/PacketTracking.cpp kademlia/routing/Contact.cpp \
-	kademlia/routing/RoutingZone.cpp UPnPBase.cpp \
-	UPnPCompatibility.cpp ClientCredits.cpp ECSpecialMuleTags.cpp \
-	KnownFile.cpp GetTickCount.cpp GuiEvents.cpp Logger.cpp \
-	PartFile.cpp Preferences.cpp Proxy.cpp Server.cpp \
-	Statistics.cpp StatTree.cpp SHAHashSet.cpp \
-	TerminationProcess.cpp TerminationProcessAmuleweb.cpp \
-	UserEvents.cpp OtherFunctions.cpp NetworkFunctions.cpp
-@ENABLE_UPNP_TRUE@am__objects_8 = amuled-UPnPBase.$(OBJEXT) \
-@ENABLE_UPNP_TRUE@	amuled-UPnPCompatibility.$(OBJEXT)
-am__objects_9 = amuled-RC4Encrypt.$(OBJEXT) amuled-amule.$(OBJEXT) \
-	amuled-BaseClient.$(OBJEXT) amuled-ClientList.$(OBJEXT) \
+amulecmd_LINK = $(CXXLD) $(amulecmd_CXXFLAGS) $(CXXFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+am__objects_4 = amuled-amule.$(OBJEXT) amuled-BaseClient.$(OBJEXT) \
+	amuled-CanceledFileList.$(OBJEXT) amuled-ClientList.$(OBJEXT) \
 	amuled-ClientCreditsList.$(OBJEXT) \
 	amuled-ClientTCPSocket.$(OBJEXT) \
 	amuled-ClientUDPSocket.$(OBJEXT) \
+	amuled-CorruptionBlackBox.$(OBJEXT) \
 	amuled-DownloadClient.$(OBJEXT) amuled-DownloadQueue.$(OBJEXT) \
 	amuled-ECSpecialCoreTags.$(OBJEXT) amuled-EMSocket.$(OBJEXT) \
 	amuled-EncryptedStreamSocket.$(OBJEXT) \
 	amuled-EncryptedDatagramSocket.$(OBJEXT) \
-	amuled-ExternalConn.$(OBJEXT) amuled-Friend.$(OBJEXT) \
-	amuled-FriendList.$(OBJEXT) amuled-HTTPDownload.$(OBJEXT) \
+	amuled-ExternalConn.$(OBJEXT) amuled-FriendList.$(OBJEXT) \
 	amuled-IPFilter.$(OBJEXT) amuled-KnownFileList.$(OBJEXT) \
 	amuled-ListenSocket.$(OBJEXT) amuled-MuleUDPSocket.$(OBJEXT) \
-	amuled-PartFileConvert.$(OBJEXT) amuled-SearchFile.$(OBJEXT) \
-	amuled-SearchList.$(OBJEXT) amuled-ServerConnect.$(OBJEXT) \
-	amuled-ServerList.$(OBJEXT) amuled-ServerSocket.$(OBJEXT) \
-	amuled-ServerUDPSocket.$(OBJEXT) \
-	amuled-SharedFileList.$(OBJEXT) amuled-ThreadTasks.$(OBJEXT) \
+	amuled-SearchFile.$(OBJEXT) amuled-SearchList.$(OBJEXT) \
+	amuled-ServerConnect.$(OBJEXT) amuled-ServerList.$(OBJEXT) \
+	amuled-ServerSocket.$(OBJEXT) amuled-ServerUDPSocket.$(OBJEXT) \
+	amuled-SHAHashSet.$(OBJEXT) amuled-SharedFileList.$(OBJEXT) \
+	amuled-ThreadTasks.$(OBJEXT) \
 	amuled-UploadBandwidthThrottler.$(OBJEXT) \
 	amuled-UploadClient.$(OBJEXT) amuled-UploadQueue.$(OBJEXT) \
 	amuled-Indexed.$(OBJEXT) amuled-Kademlia.$(OBJEXT) \
@@ -298,88 +254,86 @@
 	amuled-UDPFirewallTester.$(OBJEXT) \
 	amuled-KademliaUDPListener.$(OBJEXT) \
 	amuled-PacketTracking.$(OBJEXT) amuled-Contact.$(OBJEXT) \
-	amuled-RoutingZone.$(OBJEXT) $(am__objects_8)
-am__objects_10 = amuled-OtherFunctions.$(OBJEXT) \
-	amuled-NetworkFunctions.$(OBJEXT)
-am__objects_11 = amuled-ClientCredits.$(OBJEXT) \
+	amuled-RoutingZone.$(OBJEXT)
+am__objects_5 = amuled-amuleAppCommon.$(OBJEXT) \
+	amuled-ClientRef.$(OBJEXT) amuled-DataToText.$(OBJEXT) \
 	amuled-ECSpecialMuleTags.$(OBJEXT) amuled-KnownFile.$(OBJEXT) \
 	amuled-GetTickCount.$(OBJEXT) amuled-GuiEvents.$(OBJEXT) \
-	amuled-Logger.$(OBJEXT) amuled-PartFile.$(OBJEXT) \
-	amuled-Preferences.$(OBJEXT) amuled-Proxy.$(OBJEXT) \
-	amuled-Server.$(OBJEXT) amuled-Statistics.$(OBJEXT) \
-	amuled-StatTree.$(OBJEXT) amuled-SHAHashSet.$(OBJEXT) \
-	amuled-TerminationProcess.$(OBJEXT) \
-	amuled-TerminationProcessAmuleweb.$(OBJEXT) \
-	amuled-UserEvents.$(OBJEXT) $(am__objects_10)
-am_amuled_OBJECTS = amuled-amuled.$(OBJEXT) amuled-Timer.$(OBJEXT) \
-	$(am__objects_9) $(am__objects_11)
+	amuled-HTTPDownload.$(OBJEXT) amuled-Logger.$(OBJEXT) \
+	amuled-PartFile.$(OBJEXT) amuled-Preferences.$(OBJEXT) \
+	amuled-Proxy.$(OBJEXT) amuled-Server.$(OBJEXT) \
+	amuled-Statistics.$(OBJEXT) amuled-StatTree.$(OBJEXT) \
+	amuled-UserEvents.$(OBJEXT)
+am_amuled_OBJECTS = amuled-amuled.$(OBJEXT) $(am__objects_4) \
+	$(am__objects_5)
 @NEED_RC_TRUE@nodist_amuled_OBJECTS = amuled-version.$(OBJEXT)
 amuled_OBJECTS = $(am_amuled_OBJECTS) $(nodist_amuled_OBJECTS)
-am__amulegui_SOURCES_DIST = amule-remote-gui.cpp amule-gui.cpp \
-	amuleDlg.cpp AddFriend.cpp CatDialog.cpp ChatSelector.cpp \
-	ClientDetailDialog.cpp FileDetailDialog.cpp KadDlg.cpp \
-	OScopeCtrl.cpp PartFileConvertDlg.cpp PrefsUnifiedDlg.cpp \
-	SearchDlg.cpp ServerWnd.cpp SharedFilesWnd.cpp \
-	StatisticsDlg.cpp SearchListCtrl.cpp DownloadListCtrl.cpp \
-	ClientListCtrl.cpp FriendListCtrl.cpp ServerListCtrl.cpp \
-	SharedFilesCtrl.cpp MuleTrayIcon.cpp TransferWnd.cpp \
-	IP2Country.cpp ClientCredits.cpp ECSpecialMuleTags.cpp \
-	KnownFile.cpp GetTickCount.cpp GuiEvents.cpp Logger.cpp \
-	PartFile.cpp Preferences.cpp Proxy.cpp Server.cpp \
-	Statistics.cpp StatTree.cpp SHAHashSet.cpp \
-	TerminationProcess.cpp TerminationProcessAmuleweb.cpp \
-	UserEvents.cpp OtherFunctions.cpp NetworkFunctions.cpp
-@ENABLE_IP2COUNTRY_TRUE@am__objects_12 =  \
-@ENABLE_IP2COUNTRY_TRUE@	amulegui-IP2Country.$(OBJEXT)
-am__objects_13 = amulegui-amule-gui.$(OBJEXT) \
+amuled_LINK = $(CXXLD) $(amuled_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+am__objects_6 = amulegui-amule-gui.$(OBJEXT) \
 	amulegui-amuleDlg.$(OBJEXT) amulegui-AddFriend.$(OBJEXT) \
 	amulegui-CatDialog.$(OBJEXT) amulegui-ChatSelector.$(OBJEXT) \
+	amulegui-ChatWnd.$(OBJEXT) amulegui-CommentDialog.$(OBJEXT) \
+	amulegui-CommentDialogLst.$(OBJEXT) \
+	amulegui-GenericClientListCtrl.$(OBJEXT) \
 	amulegui-ClientDetailDialog.$(OBJEXT) \
+	amulegui-DirectoryTreeCtrl.$(OBJEXT) \
 	amulegui-FileDetailDialog.$(OBJEXT) amulegui-KadDlg.$(OBJEXT) \
 	amulegui-OScopeCtrl.$(OBJEXT) \
-	amulegui-PartFileConvertDlg.$(OBJEXT) \
 	amulegui-PrefsUnifiedDlg.$(OBJEXT) \
 	amulegui-SearchDlg.$(OBJEXT) amulegui-ServerWnd.$(OBJEXT) \
 	amulegui-SharedFilesWnd.$(OBJEXT) \
 	amulegui-StatisticsDlg.$(OBJEXT) \
 	amulegui-SearchListCtrl.$(OBJEXT) \
 	amulegui-DownloadListCtrl.$(OBJEXT) \
-	amulegui-ClientListCtrl.$(OBJEXT) \
+	amulegui-SourceListCtrl.$(OBJEXT) \
+	amulegui-SharedFilePeersListCtrl.$(OBJEXT) \
 	amulegui-FriendListCtrl.$(OBJEXT) \
 	amulegui-ServerListCtrl.$(OBJEXT) \
 	amulegui-SharedFilesCtrl.$(OBJEXT) \
-	amulegui-MuleTrayIcon.$(OBJEXT) amulegui-TransferWnd.$(OBJEXT) \
-	$(am__objects_12)
-am__objects_14 = amulegui-OtherFunctions.$(OBJEXT) \
-	amulegui-NetworkFunctions.$(OBJEXT)
-am__objects_15 = amulegui-ClientCredits.$(OBJEXT) \
+	amulegui-MuleTrayIcon.$(OBJEXT) amulegui-TransferWnd.$(OBJEXT)
+am__objects_7 = amulegui-amuleAppCommon.$(OBJEXT) \
+	amulegui-ClientRef.$(OBJEXT) amulegui-DataToText.$(OBJEXT) \
 	amulegui-ECSpecialMuleTags.$(OBJEXT) \
 	amulegui-KnownFile.$(OBJEXT) amulegui-GetTickCount.$(OBJEXT) \
-	amulegui-GuiEvents.$(OBJEXT) amulegui-Logger.$(OBJEXT) \
-	amulegui-PartFile.$(OBJEXT) amulegui-Preferences.$(OBJEXT) \
-	amulegui-Proxy.$(OBJEXT) amulegui-Server.$(OBJEXT) \
-	amulegui-Statistics.$(OBJEXT) amulegui-StatTree.$(OBJEXT) \
-	amulegui-SHAHashSet.$(OBJEXT) \
-	amulegui-TerminationProcess.$(OBJEXT) \
-	amulegui-TerminationProcessAmuleweb.$(OBJEXT) \
-	amulegui-UserEvents.$(OBJEXT) $(am__objects_14)
+	amulegui-GuiEvents.$(OBJEXT) amulegui-HTTPDownload.$(OBJEXT) \
+	amulegui-Logger.$(OBJEXT) amulegui-PartFile.$(OBJEXT) \
+	amulegui-Preferences.$(OBJEXT) amulegui-Proxy.$(OBJEXT) \
+	amulegui-Server.$(OBJEXT) amulegui-Statistics.$(OBJEXT) \
+	amulegui-StatTree.$(OBJEXT) amulegui-UserEvents.$(OBJEXT)
 am_amulegui_OBJECTS = amulegui-amule-remote-gui.$(OBJEXT) \
-	$(am__objects_13) $(am__objects_15)
+	$(am__objects_6) $(am__objects_7)
 amulegui_OBJECTS = $(am_amulegui_OBJECTS)
-@NEED_RC_TRUE@am__DEPENDENCIES_6 = amuleguirc.$(OBJEXT)
+amulegui_LINK = $(CXXLD) $(amulegui_CXXFLAGS) $(CXXFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 am_ed2k_OBJECTS = ed2k-ED2KLinkParser.$(OBJEXT) \
 	ed2k-MagnetURI.$(OBJEXT) ed2k-MuleCollection.$(OBJEXT)
 @NEED_RC_TRUE@nodist_ed2k_OBJECTS = ed2k-version.$(OBJEXT)
 ed2k_OBJECTS = $(am_ed2k_OBJECTS) $(nodist_ed2k_OBJECTS)
 ed2k_DEPENDENCIES =
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ed2k_LINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(ed2k_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libmuleappcommon_a_SOURCES) $(libmuleappcore_a_SOURCES) \
 	$(libmuleappgui_a_SOURCES) $(amule_SOURCES) \
 	$(amulecmd_SOURCES) $(nodist_amulecmd_SOURCES) \
@@ -387,39 +341,60 @@
 	$(ed2k_SOURCES) $(nodist_ed2k_SOURCES)
 DIST_SOURCES = $(libmuleappcommon_a_SOURCES) \
 	$(libmuleappcore_a_SOURCES) $(libmuleappgui_a_SOURCES) \
-	$(am__amule_SOURCES_DIST) $(amulecmd_SOURCES) \
-	$(am__amuled_SOURCES_DIST) $(am__amulegui_SOURCES_DIST) \
-	$(ed2k_SOURCES)
+	$(amule_SOURCES) $(amulecmd_SOURCES) $(amuled_SOURCES) \
+	$(amulegui_SOURCES) $(ed2k_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = libs utils pixmaps webserver skins
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -434,17 +409,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -456,44 +425,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -515,13 +484,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -529,44 +495,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -575,7 +537,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -583,25 +544,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -613,29 +568,40 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = $(MULECPPFLAGS)
 AM_CFLAGS = $(MULECFLAGS)
 AM_CXXFLAGS = $(MULECXXFLAGS)
@@ -646,6 +612,7 @@
 	Parser.y \
 	Scanner.h.in \
 	Scanner.l \
+	IPFilterScanner.l \
 	muuli.wdr 
 
 
@@ -655,19 +622,21 @@
 # Common to core/gui/monolithic
 libmuleappcommon_a_SOURCES = \
 	CFile.cpp \
-	DataToText.cpp \
+	ClientCredits.cpp \
 	ED2KLink.cpp \
+	Friend.cpp \
+	GapList.cpp \
 	MagnetURI.cpp \
 	MemFile.cpp \
 	NetworkFunctions.cpp \
+	OtherFunctions.cpp \
 	Packet.cpp \
 	RLE.cpp \
 	SafeFile.cpp \
 	SHA.cpp \
 	Tag.cpp \
-	Timer.cpp \
-	RandomFunctions.cpp \
-	kademlia/utils/UInt128.cpp
+	TerminationProcess.cpp \
+	Timer.cpp
 
 libmuleappcommon_a_CPPFLAGS = $(AM_CPPFLAGS) $(WXBASE_CPPFLAGS) -I$(srcdir)/libs -I$(srcdir)/include $(CRYPTOPP_CPPFLAGS) $(LIBUPNP_CPPFLAGS)
 
@@ -675,28 +644,34 @@
 libmuleappcore_a_SOURCES = \
 	AsyncDNS.cpp \
 	DeadSourceList.cpp \
+	FileArea.cpp \
+	FileAutoClose.cpp \
+	IPFilterScanner.cpp \
 	Scanner.cpp \
 	Parser.cpp \
 	PlatformSpecific.cpp \
+	RandomFunctions.cpp \
+	RC4Encrypt.cpp \
+	StateMachine.cpp \
+	TerminationProcessAmuleweb.cpp \
+	ThreadScheduler.cpp \
+	UPnPBase.cpp \
 	kademlia/kademlia/Entry.cpp \
 	kademlia/kademlia/SearchManager.cpp \
 	kademlia/routing/RoutingBin.cpp \
-	StateMachine.cpp \
-	ThreadScheduler.cpp
+	kademlia/utils/UInt128.cpp
 
 libmuleappcore_a_CPPFLAGS = $(AM_CPPFLAGS) $(WXBASE_CPPFLAGS) -I$(srcdir)/libs -I$(srcdir)/include $(CRYPTOPP_CPPFLAGS) $(LIBUPNP_CPPFLAGS)
 
 # Common to gui/monolithic
 libmuleappgui_a_SOURCES = \
 	BarShader.cpp \
-	ChatWnd.cpp \
 	ColorFrameCtrl.cpp \
-	CommentDialog.cpp \
-	CommentDialogLst.cpp \
-	DirectoryTreeCtrl.cpp \
 	EditServerListDlg.cpp \
 	extern/wxWidgets/listctrl.cpp \
 	FileDetailListCtrl.cpp \
+	IP2Country.cpp \
+	MuleColour.cpp \
 	MuleGifCtrl.cpp \
 	MuleListCtrl.cpp \
 	MuleNotebook.cpp \
@@ -705,41 +680,88 @@
 	muuli_wdr.cpp 
 
 libmuleappgui_a_CPPFLAGS = $(AM_CPPFLAGS) $(WX_CPPFLAGS) -I$(srcdir)/libs -I$(srcdir)/include $(LIBUPNP_CPPFLAGS) $(GEOIP_CPPFLAGS)
-core_sources = RC4Encrypt.cpp amule.cpp BaseClient.cpp ClientList.cpp \
-	ClientCreditsList.cpp ClientTCPSocket.cpp ClientUDPSocket.cpp \
-	DownloadClient.cpp DownloadQueue.cpp ECSpecialCoreTags.cpp \
-	EMSocket.cpp EncryptedStreamSocket.cpp \
-	EncryptedDatagramSocket.cpp ExternalConn.cpp Friend.cpp \
-	FriendList.cpp HTTPDownload.cpp IPFilter.cpp KnownFileList.cpp \
-	ListenSocket.cpp MuleUDPSocket.cpp PartFileConvert.cpp \
-	SearchFile.cpp SearchList.cpp ServerConnect.cpp ServerList.cpp \
-	ServerSocket.cpp ServerUDPSocket.cpp SharedFileList.cpp \
-	ThreadTasks.cpp UploadBandwidthThrottler.cpp UploadClient.cpp \
-	UploadQueue.cpp kademlia/kademlia/Indexed.cpp \
-	kademlia/kademlia/Kademlia.cpp kademlia/kademlia/Prefs.cpp \
+core_sources = \
+	amule.cpp \
+	BaseClient.cpp \
+	CanceledFileList.cpp \
+	ClientList.cpp \
+	ClientCreditsList.cpp \
+	ClientTCPSocket.cpp \
+	ClientUDPSocket.cpp \
+	CorruptionBlackBox.cpp \
+	DownloadClient.cpp \
+	DownloadQueue.cpp \
+	ECSpecialCoreTags.cpp \
+	EMSocket.cpp \
+	EncryptedStreamSocket.cpp \
+	EncryptedDatagramSocket.cpp \
+	ExternalConn.cpp \
+	FriendList.cpp \
+	IPFilter.cpp \
+	KnownFileList.cpp \
+	ListenSocket.cpp \
+	MuleUDPSocket.cpp \
+	SearchFile.cpp \
+	SearchList.cpp \
+	ServerConnect.cpp \
+	ServerList.cpp \
+	ServerSocket.cpp \
+	ServerUDPSocket.cpp \
+	SHAHashSet.cpp \
+	SharedFileList.cpp \
+	ThreadTasks.cpp \
+	UploadBandwidthThrottler.cpp \
+	UploadClient.cpp \
+	UploadQueue.cpp \
+	kademlia/kademlia/Indexed.cpp \
+	kademlia/kademlia/Kademlia.cpp \
+	kademlia/kademlia/Prefs.cpp \
 	kademlia/kademlia/Search.cpp \
 	kademlia/kademlia/UDPFirewallTester.cpp \
 	kademlia/net/KademliaUDPListener.cpp \
-	kademlia/net/PacketTracking.cpp kademlia/routing/Contact.cpp \
-	kademlia/routing/RoutingZone.cpp $(am__append_11)
-gui_sources = amule-gui.cpp amuleDlg.cpp AddFriend.cpp CatDialog.cpp \
-	ChatSelector.cpp ClientDetailDialog.cpp FileDetailDialog.cpp \
-	KadDlg.cpp OScopeCtrl.cpp PartFileConvertDlg.cpp \
-	PrefsUnifiedDlg.cpp SearchDlg.cpp ServerWnd.cpp \
-	SharedFilesWnd.cpp StatisticsDlg.cpp SearchListCtrl.cpp \
-	DownloadListCtrl.cpp ClientListCtrl.cpp FriendListCtrl.cpp \
-	ServerListCtrl.cpp SharedFilesCtrl.cpp MuleTrayIcon.cpp \
-	TransferWnd.cpp $(am__append_12)
-remote_common_sources = \
-	OtherFunctions.cpp \
-	NetworkFunctions.cpp 
+	kademlia/net/PacketTracking.cpp \
+	kademlia/routing/Contact.cpp \
+	kademlia/routing/RoutingZone.cpp
+
+gui_sources = \
+	amule-gui.cpp \
+	amuleDlg.cpp \
+	AddFriend.cpp \
+	CatDialog.cpp \
+	ChatSelector.cpp \
+	ChatWnd.cpp \
+	CommentDialog.cpp \
+	CommentDialogLst.cpp \
+	GenericClientListCtrl.cpp \
+	ClientDetailDialog.cpp \
+	DirectoryTreeCtrl.cpp \
+	FileDetailDialog.cpp \
+	KadDlg.cpp \
+	OScopeCtrl.cpp \
+	PrefsUnifiedDlg.cpp \
+	SearchDlg.cpp \
+	ServerWnd.cpp \
+	SharedFilesWnd.cpp \
+	StatisticsDlg.cpp \
+	SearchListCtrl.cpp \
+	DownloadListCtrl.cpp \
+	SourceListCtrl.cpp \
+	SharedFilePeersListCtrl.cpp \
+	FriendListCtrl.cpp \
+	ServerListCtrl.cpp \
+	SharedFilesCtrl.cpp \
+	MuleTrayIcon.cpp \
+	TransferWnd.cpp 
 
 common_sources = \
-	ClientCredits.cpp \
+	amuleAppCommon.cpp \
+	ClientRef.cpp \
+	DataToText.cpp \
 	ECSpecialMuleTags.cpp \
 	KnownFile.cpp \
 	GetTickCount.cpp \
 	GuiEvents.cpp \
+	HTTPDownload.cpp \
 	Logger.cpp \
 	PartFile.cpp \
 	Preferences.cpp \
@@ -747,17 +769,13 @@
 	Server.cpp \
 	Statistics.cpp \
 	StatTree.cpp \
-	SHAHashSet.cpp \
-	TerminationProcess.cpp \
-	TerminationProcessAmuleweb.cpp \
-	UserEvents.cpp \
-	$(remote_common_sources)
+	UserEvents.cpp
 
 
 # Libs
 core_libs = -L. -lmuleappcore $(LIBUPNP_LDFLAGS) $(LIBUPNP_LIBS) \
-	$(am__append_13)
-gui_libs = -L. -lmuleappgui $(X11LIBS) $(WX_LIBS) $(GEOIP_LDFLAGS) $(GEOIP_LIBS)
+	$(am__append_11)
+gui_libs = -L. -lmuleappgui $(WX_LIBS) $(GEOIP_LDFLAGS) $(GEOIP_LIBS)
 remote_common_libs = -Llibs/common -Llibs/ec/cpp -lmulecommon -lec $(BFD_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(RESOLV_LIB)
 common_libs = -L. -lmuleappcommon $(remote_common_libs) $(CRYPTOPP_LDFLAGS) $(CRYPTOPP_LIBS)
 core_deps = libmuleappcore.a
@@ -780,6 +798,10 @@
 	$(common_sources)
 
 amule_SOURCES = \
+	CaptchaDialog.cpp \
+	CaptchaGenerator.cpp \
+	PartFileConvert.cpp \
+	PartFileConvertDlg.cpp \
 	$(core_sources) \
 	$(gui_sources) \
 	$(ec_sources) \
@@ -787,21 +809,20 @@
 
 amuled_SOURCES = \
 	amuled.cpp \
-	Timer.cpp \
 	$(core_sources) \
 	$(ec_sources) \
 	$(common_sources)
 
 amule_DEPENDENCIES = $(common_deps) $(core_deps) $(gui_deps) \
-	$(am__append_15)
+	$(am__append_13)
 amule_CPPFLAGS = $(AM_CPPFLAGS) $(core_flags) $(gui_flags) $(common_flags)
 amule_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CPPFLAGS_ONLY)
-amule_LDADD = $(common_libs) $(core_libs) $(gui_libs) $(am__append_14)
-amulegui_DEPENDENCIES = $(common_deps) $(gui_deps) $(am__append_17)
-amulegui_CPPFLAGS = $(AM_CPPFLAGS) $(gui_flags) $(common_flags) -DCLIENT_GUI -DEC_REMOTE
+amule_LDADD = $(common_libs) $(core_libs) $(gui_libs) $(am__append_12)
+amulegui_DEPENDENCIES = $(common_deps) $(gui_deps) $(am__append_15)
+amulegui_CPPFLAGS = $(AM_CPPFLAGS) $(gui_flags) $(common_flags) -DCLIENT_GUI
 amulegui_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY)
 amulegui_LDADD = $(gui_libs) $(common_libs) $(WXBASE_LIBS) \
-	$(am__append_16)
+	$(am__append_14)
 amuled_DEPENDENCIES = $(core_deps) $(common_deps)
 amuled_CPPFLAGS = $(AM_CPPFLAGS) $(WXBASE_CPPFLAGS) $(core_flags) $(common_flags) -DAMULE_DAEMON 
 amuled_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY)
@@ -820,10 +841,12 @@
 amulecmd_SOURCES = \
 	TextClient.cpp \
 	ExternalConnector.cpp \
-	$(remote_common_sources)
+	LoggerConsole.cpp \
+	OtherFunctions.cpp \
+	NetworkFunctions.cpp 
 
 amulecmd_DEPENDENCIES = $(remote_common_deps)
-amulecmd_CPPFLAGS = $(AM_CPPFLAGS) $(WXBASE_CPPFLAGS) $(common_flags) -DEC_REMOTE -DECSOCKET_USE_EVENTS=0
+amulecmd_CPPFLAGS = $(AM_CPPFLAGS) $(WXBASE_CPPFLAGS) $(common_flags)
 amulecmd_CXXFLAGS = $(AM_CXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY)
 #amulecmd_LDADD = $(WXBASE_LIBS) $(READLINE_LIBS) $(remote_common_libs)
 amulecmd_LDADD = -Llibs/common -Llibs/ec/cpp -lmulecommon -lec \
@@ -838,6 +861,10 @@
 		amuleIPV4Address.h \
 		ArchSpecific.h \
 		BarShader.h \
+		BitVector.h \
+		CanceledFileList.h \
+		CaptchaDialog.h \
+		CaptchaGenerator.h \
 		CatDialog.h \
 		CFile.h \
 		ChatSelector.h \
@@ -845,15 +872,16 @@
 		ClientCredits.h \
 		ClientCreditsList.h \
 		ClientDetailDialog.h \
-		ClientListCtrl.h \
+		SharedFilePeersListCtrl.h \
 		ClientList.h \
+		ClientRef.h \
 		ClientTCPSocket.h \
 		ClientUDPSocket.h \
 		ColorFrameCtrl.h \
-		Color.h \
 		CommentDialog.h \
 		CommentDialogLst.h \
 		Constants.h \
+		CorruptionBlackBox.h \
 		CryptoPP_Inc.h \
 		DataToText.h \
 		DeadSourceList.h \
@@ -867,19 +895,24 @@
 		EncryptedStreamSocket.h \
 		ExternalConnector.h \
 		ExternalConn.h \
+		FileArea.h \
+		FileAutoClose.h \
 		FileDetailDialog.h \
 		FileDetailListCtrl.h \
 		FileLock.h \
 		Friend.h \
 		FriendListCtrl.h \
 		FriendList.h \
+		GapList.h \
 		GetTickCount.h \
+		GenericClientListCtrl.h \
 		GuiEvents.h \
 		HTTPDownload.h \
 		inetdownload.h \
 		InternalEvents.h \
 		IP2Country.h \
 		IPFilter.h \
+		IPFilterScanner.h \
 		KadDlg.h \
 		KnownFile.h \
 		KnownFileList.h \
@@ -889,6 +922,7 @@
 		MD4Hash.h \
 		MemFile.h \
 		MuleCollection.h \
+		MuleColour.h \
 		MuleGifCtrl.h \
 		MuleListCtrl.h \
 		MuleNotebook.h \
@@ -936,6 +970,7 @@
 		SharedFileList.h \
 		SharedFilesCtrl.h \
 		SharedFilesWnd.h \
+		SourceListCtrl.h \
 		StateMachine.h \
 		StatisticsDlg.h \
 		Statistics.h \
@@ -951,6 +986,7 @@
 		TransferWnd.h \
 		Types.h \
 		updownclient.h \
+		UpDownClientEC.h \
 		UploadBandwidthThrottler.h \
 		UploadQueue.h \
 		UPnPBase.h \
@@ -966,7 +1002,7 @@
 @NEED_RC_TRUE@nodist_amulecmd_SOURCES = amulecmd-version.rc
 @NEED_RC_TRUE@nodist_ed2k_SOURCES = ed2k-version.rc
 @NEED_RC_TRUE@CLEANFILES = *-version.rc
-EXTRA__DIST__SUBDIRS = include kademlia remote-gui.net
+EXTRA__DIST__SUBDIRS = include kademlia
 all: all-recursive
 
 .SUFFIXES:
@@ -975,14 +1011,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -1000,59 +1036,74 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 libmuleappcommon.a: $(libmuleappcommon_a_OBJECTS) $(libmuleappcommon_a_DEPENDENCIES) 
-	-rm -f libmuleappcommon.a
-	$(libmuleappcommon_a_AR) libmuleappcommon.a $(libmuleappcommon_a_OBJECTS) $(libmuleappcommon_a_LIBADD)
-	$(RANLIB) libmuleappcommon.a
+	$(AM_V_at)-rm -f libmuleappcommon.a
+	$(AM_V_AR)$(libmuleappcommon_a_AR) libmuleappcommon.a $(libmuleappcommon_a_OBJECTS) $(libmuleappcommon_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmuleappcommon.a
 libmuleappcore.a: $(libmuleappcore_a_OBJECTS) $(libmuleappcore_a_DEPENDENCIES) 
-	-rm -f libmuleappcore.a
-	$(libmuleappcore_a_AR) libmuleappcore.a $(libmuleappcore_a_OBJECTS) $(libmuleappcore_a_LIBADD)
-	$(RANLIB) libmuleappcore.a
+	$(AM_V_at)-rm -f libmuleappcore.a
+	$(AM_V_AR)$(libmuleappcore_a_AR) libmuleappcore.a $(libmuleappcore_a_OBJECTS) $(libmuleappcore_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmuleappcore.a
 libmuleappgui.a: $(libmuleappgui_a_OBJECTS) $(libmuleappgui_a_DEPENDENCIES) 
-	-rm -f libmuleappgui.a
-	$(libmuleappgui_a_AR) libmuleappgui.a $(libmuleappgui_a_OBJECTS) $(libmuleappgui_a_LIBADD)
-	$(RANLIB) libmuleappgui.a
+	$(AM_V_at)-rm -f libmuleappgui.a
+	$(AM_V_AR)$(libmuleappgui_a_AR) libmuleappgui.a $(libmuleappgui_a_OBJECTS) $(libmuleappgui_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmuleappgui.a
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 amule$(EXEEXT): $(amule_OBJECTS) $(amule_DEPENDENCIES) 
 	@rm -f amule$(EXEEXT)
-	$(CXXLINK) $(amule_LDFLAGS) $(amule_OBJECTS) $(amule_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(amule_LINK) $(amule_OBJECTS) $(amule_LDADD) $(LIBS)
 amulecmd$(EXEEXT): $(amulecmd_OBJECTS) $(amulecmd_DEPENDENCIES) 
 	@rm -f amulecmd$(EXEEXT)
-	$(CXXLINK) $(amulecmd_LDFLAGS) $(amulecmd_OBJECTS) $(amulecmd_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(amulecmd_LINK) $(amulecmd_OBJECTS) $(amulecmd_LDADD) $(LIBS)
 amuled$(EXEEXT): $(amuled_OBJECTS) $(amuled_DEPENDENCIES) 
 	@rm -f amuled$(EXEEXT)
-	$(CXXLINK) $(amuled_LDFLAGS) $(amuled_OBJECTS) $(amuled_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(amuled_LINK) $(amuled_OBJECTS) $(amuled_LDADD) $(LIBS)
 amulegui$(EXEEXT): $(amulegui_OBJECTS) $(amulegui_DEPENDENCIES) 
 	@rm -f amulegui$(EXEEXT)
-	$(CXXLINK) $(amulegui_LDFLAGS) $(amulegui_OBJECTS) $(amulegui_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(amulegui_LINK) $(amulegui_OBJECTS) $(amulegui_LDADD) $(LIBS)
 ed2k$(EXEEXT): $(ed2k_OBJECTS) $(ed2k_DEPENDENCIES) 
 	@rm -f ed2k$(EXEEXT)
-	$(CXXLINK) $(ed2k_LDFLAGS) $(ed2k_OBJECTS) $(ed2k_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(ed2k_LINK) $(ed2k_OBJECTS) $(ed2k_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -1062,16 +1113,24 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-AddFriend.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-BaseClient.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-CanceledFileList.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-CaptchaDialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-CaptchaGenerator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-CatDialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ChatSelector.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ClientCredits.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ChatWnd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ClientCreditsList.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ClientDetailDialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ClientList.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ClientListCtrl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ClientRef.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ClientTCPSocket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ClientUDPSocket.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-CommentDialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-CommentDialogLst.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-Contact.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-CorruptionBlackBox.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-DataToText.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-DirectoryTreeCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-DownloadClient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-DownloadListCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-DownloadQueue.Po@am__quote@
@@ -1082,13 +1141,12 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-EncryptedStreamSocket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ExternalConn.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-FileDetailDialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-Friend.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-FriendList.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-FriendListCtrl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-GenericClientListCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-GetTickCount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-GuiEvents.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-HTTPDownload.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-IP2Country.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-IPFilter.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-Indexed.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-KadDlg.Po@am__quote@
@@ -1100,9 +1158,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-Logger.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-MuleTrayIcon.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-MuleUDPSocket.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-NetworkFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-OScopeCtrl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-OtherFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-PacketTracking.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-PartFile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-PartFileConvert.Po@am__quote@
@@ -1111,7 +1167,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-Prefs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-PrefsUnifiedDlg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-Proxy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-RC4Encrypt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-RoutingZone.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-SHAHashSet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-Search.Po@am__quote@
@@ -1127,36 +1182,39 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ServerUDPSocket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ServerWnd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-SharedFileList.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-SharedFilePeersListCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-SharedFilesCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-SharedFilesWnd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-SourceListCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-StatTree.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-Statistics.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-StatisticsDlg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-TerminationProcess.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-TerminationProcessAmuleweb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-ThreadTasks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-TransferWnd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-UDPFirewallTester.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-UPnPBase.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-UPnPCompatibility.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-UploadBandwidthThrottler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-UploadClient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-UploadQueue.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-UserEvents.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-amule-gui.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-amule.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-amuleAppCommon.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amule-amuleDlg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulecmd-ExternalConnector.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulecmd-LoggerConsole.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulecmd-NetworkFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulecmd-OtherFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulecmd-TextClient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-BaseClient.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-ClientCredits.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-CanceledFileList.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-ClientCreditsList.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-ClientList.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-ClientRef.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-ClientTCPSocket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-ClientUDPSocket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-Contact.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-CorruptionBlackBox.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-DataToText.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-DownloadClient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-DownloadQueue.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-ECSpecialCoreTags.Po@am__quote@
@@ -1165,7 +1223,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-EncryptedDatagramSocket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-EncryptedStreamSocket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-ExternalConn.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-Friend.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-FriendList.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-GetTickCount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-GuiEvents.Po@am__quote@
@@ -1179,15 +1236,11 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-ListenSocket.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-Logger.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-MuleUDPSocket.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-NetworkFunctions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-OtherFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-PacketTracking.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-PartFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-PartFileConvert.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-Preferences.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-Prefs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-Proxy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-RC4Encrypt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-RoutingZone.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-SHAHashSet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-Search.Po@am__quote@
@@ -1201,98 +1254,104 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-SharedFileList.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-StatTree.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-Statistics.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-TerminationProcess.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-TerminationProcessAmuleweb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-ThreadTasks.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-Timer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-UDPFirewallTester.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-UPnPBase.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-UPnPCompatibility.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-UploadBandwidthThrottler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-UploadClient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-UploadQueue.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-UserEvents.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-amule.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-amuleAppCommon.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuled-amuled.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-AddFriend.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-CatDialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-ChatSelector.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-ClientCredits.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-ChatWnd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-ClientDetailDialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-ClientListCtrl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-ClientRef.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-CommentDialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-CommentDialogLst.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-DataToText.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-DirectoryTreeCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-DownloadListCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-ECSpecialMuleTags.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-FileDetailDialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-FriendListCtrl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-GenericClientListCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-GetTickCount.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-GuiEvents.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-IP2Country.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-HTTPDownload.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-KadDlg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-KnownFile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-Logger.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-MuleTrayIcon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-NetworkFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-OScopeCtrl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-OtherFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-PartFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-PartFileConvertDlg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-Preferences.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-PrefsUnifiedDlg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-Proxy.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-SHAHashSet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-SearchDlg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-SearchListCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-Server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-ServerListCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-ServerWnd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-SharedFilePeersListCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-SharedFilesCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-SharedFilesWnd.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-SourceListCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-StatTree.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-Statistics.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-StatisticsDlg.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-TerminationProcess.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-TerminationProcessAmuleweb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-TransferWnd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-UserEvents.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-amule-gui.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-amule-remote-gui.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-amuleAppCommon.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amulegui-amuleDlg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ed2k-ED2KLinkParser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ed2k-MagnetURI.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ed2k-MuleCollection.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-CFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-DataToText.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-ClientCredits.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-ED2KLink.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-Friend.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-GapList.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-MagnetURI.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-MemFile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-OtherFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-Packet.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-RLE.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-RandomFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-SHA.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-SafeFile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-Tag.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-TerminationProcess.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-Timer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcommon_a-UInt128.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-AsyncDNS.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-DeadSourceList.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-Entry.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-FileArea.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-FileAutoClose.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-IPFilterScanner.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-Parser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-PlatformSpecific.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-RC4Encrypt.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-RandomFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-RoutingBin.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-Scanner.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-SearchManager.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-StateMachine.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-TerminationProcessAmuleweb.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-ThreadScheduler.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-UInt128.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappcore_a-UPnPBase.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-BarShader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-ChatWnd.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-CommentDialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-CommentDialogLst.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-DirectoryTreeCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-EditServerListDlg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-IP2Country.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-MuleCollection.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-MuleColour.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-MuleListCtrl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-MuleNotebook.Po@am__quote@
@@ -1301,3365 +1360,3972 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleappgui_a-muuli_wdr.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 libmuleappcommon_a-CFile.o: CFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-CFile.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-CFile.Tpo" -c -o libmuleappcommon_a-CFile.o `test -f 'CFile.cpp' || echo '$(srcdir)/'`CFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-CFile.Tpo" "$(DEPDIR)/libmuleappcommon_a-CFile.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-CFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-CFile.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-CFile.Tpo -c -o libmuleappcommon_a-CFile.o `test -f 'CFile.cpp' || echo '$(srcdir)/'`CFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-CFile.Tpo $(DEPDIR)/libmuleappcommon_a-CFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CFile.cpp' object='libmuleappcommon_a-CFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-CFile.o `test -f 'CFile.cpp' || echo '$(srcdir)/'`CFile.cpp
 
 libmuleappcommon_a-CFile.obj: CFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-CFile.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-CFile.Tpo" -c -o libmuleappcommon_a-CFile.obj `if test -f 'CFile.cpp'; then $(CYGPATH_W) 'CFile.cpp'; else $(CYGPATH_W) '$(srcdir)/CFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-CFile.Tpo" "$(DEPDIR)/libmuleappcommon_a-CFile.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-CFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-CFile.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-CFile.Tpo -c -o libmuleappcommon_a-CFile.obj `if test -f 'CFile.cpp'; then $(CYGPATH_W) 'CFile.cpp'; else $(CYGPATH_W) '$(srcdir)/CFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-CFile.Tpo $(DEPDIR)/libmuleappcommon_a-CFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CFile.cpp' object='libmuleappcommon_a-CFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-CFile.obj `if test -f 'CFile.cpp'; then $(CYGPATH_W) 'CFile.cpp'; else $(CYGPATH_W) '$(srcdir)/CFile.cpp'; fi`
 
-libmuleappcommon_a-DataToText.o: DataToText.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-DataToText.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-DataToText.Tpo" -c -o libmuleappcommon_a-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-DataToText.Tpo" "$(DEPDIR)/libmuleappcommon_a-DataToText.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-DataToText.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DataToText.cpp' object='libmuleappcommon_a-DataToText.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp
-
-libmuleappcommon_a-DataToText.obj: DataToText.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-DataToText.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-DataToText.Tpo" -c -o libmuleappcommon_a-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-DataToText.Tpo" "$(DEPDIR)/libmuleappcommon_a-DataToText.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-DataToText.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DataToText.cpp' object='libmuleappcommon_a-DataToText.obj' libtool=no @AMDEPBACKSLASH@
+libmuleappcommon_a-ClientCredits.o: ClientCredits.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-ClientCredits.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-ClientCredits.Tpo -c -o libmuleappcommon_a-ClientCredits.o `test -f 'ClientCredits.cpp' || echo '$(srcdir)/'`ClientCredits.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-ClientCredits.Tpo $(DEPDIR)/libmuleappcommon_a-ClientCredits.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientCredits.cpp' object='libmuleappcommon_a-ClientCredits.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-ClientCredits.o `test -f 'ClientCredits.cpp' || echo '$(srcdir)/'`ClientCredits.cpp
+
+libmuleappcommon_a-ClientCredits.obj: ClientCredits.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-ClientCredits.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-ClientCredits.Tpo -c -o libmuleappcommon_a-ClientCredits.obj `if test -f 'ClientCredits.cpp'; then $(CYGPATH_W) 'ClientCredits.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCredits.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-ClientCredits.Tpo $(DEPDIR)/libmuleappcommon_a-ClientCredits.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientCredits.cpp' object='libmuleappcommon_a-ClientCredits.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-ClientCredits.obj `if test -f 'ClientCredits.cpp'; then $(CYGPATH_W) 'ClientCredits.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCredits.cpp'; fi`
 
 libmuleappcommon_a-ED2KLink.o: ED2KLink.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-ED2KLink.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-ED2KLink.Tpo" -c -o libmuleappcommon_a-ED2KLink.o `test -f 'ED2KLink.cpp' || echo '$(srcdir)/'`ED2KLink.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-ED2KLink.Tpo" "$(DEPDIR)/libmuleappcommon_a-ED2KLink.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-ED2KLink.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-ED2KLink.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-ED2KLink.Tpo -c -o libmuleappcommon_a-ED2KLink.o `test -f 'ED2KLink.cpp' || echo '$(srcdir)/'`ED2KLink.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-ED2KLink.Tpo $(DEPDIR)/libmuleappcommon_a-ED2KLink.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ED2KLink.cpp' object='libmuleappcommon_a-ED2KLink.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-ED2KLink.o `test -f 'ED2KLink.cpp' || echo '$(srcdir)/'`ED2KLink.cpp
 
 libmuleappcommon_a-ED2KLink.obj: ED2KLink.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-ED2KLink.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-ED2KLink.Tpo" -c -o libmuleappcommon_a-ED2KLink.obj `if test -f 'ED2KLink.cpp'; then $(CYGPATH_W) 'ED2KLink.cpp'; else $(CYGPATH_W) '$(srcdir)/ED2KLink.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-ED2KLink.Tpo" "$(DEPDIR)/libmuleappcommon_a-ED2KLink.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-ED2KLink.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-ED2KLink.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-ED2KLink.Tpo -c -o libmuleappcommon_a-ED2KLink.obj `if test -f 'ED2KLink.cpp'; then $(CYGPATH_W) 'ED2KLink.cpp'; else $(CYGPATH_W) '$(srcdir)/ED2KLink.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-ED2KLink.Tpo $(DEPDIR)/libmuleappcommon_a-ED2KLink.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ED2KLink.cpp' object='libmuleappcommon_a-ED2KLink.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-ED2KLink.obj `if test -f 'ED2KLink.cpp'; then $(CYGPATH_W) 'ED2KLink.cpp'; else $(CYGPATH_W) '$(srcdir)/ED2KLink.cpp'; fi`
 
+libmuleappcommon_a-Friend.o: Friend.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Friend.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-Friend.Tpo -c -o libmuleappcommon_a-Friend.o `test -f 'Friend.cpp' || echo '$(srcdir)/'`Friend.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-Friend.Tpo $(DEPDIR)/libmuleappcommon_a-Friend.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Friend.cpp' object='libmuleappcommon_a-Friend.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-Friend.o `test -f 'Friend.cpp' || echo '$(srcdir)/'`Friend.cpp
+
+libmuleappcommon_a-Friend.obj: Friend.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Friend.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-Friend.Tpo -c -o libmuleappcommon_a-Friend.obj `if test -f 'Friend.cpp'; then $(CYGPATH_W) 'Friend.cpp'; else $(CYGPATH_W) '$(srcdir)/Friend.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-Friend.Tpo $(DEPDIR)/libmuleappcommon_a-Friend.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Friend.cpp' object='libmuleappcommon_a-Friend.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-Friend.obj `if test -f 'Friend.cpp'; then $(CYGPATH_W) 'Friend.cpp'; else $(CYGPATH_W) '$(srcdir)/Friend.cpp'; fi`
+
+libmuleappcommon_a-GapList.o: GapList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-GapList.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-GapList.Tpo -c -o libmuleappcommon_a-GapList.o `test -f 'GapList.cpp' || echo '$(srcdir)/'`GapList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-GapList.Tpo $(DEPDIR)/libmuleappcommon_a-GapList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GapList.cpp' object='libmuleappcommon_a-GapList.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-GapList.o `test -f 'GapList.cpp' || echo '$(srcdir)/'`GapList.cpp
+
+libmuleappcommon_a-GapList.obj: GapList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-GapList.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-GapList.Tpo -c -o libmuleappcommon_a-GapList.obj `if test -f 'GapList.cpp'; then $(CYGPATH_W) 'GapList.cpp'; else $(CYGPATH_W) '$(srcdir)/GapList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-GapList.Tpo $(DEPDIR)/libmuleappcommon_a-GapList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GapList.cpp' object='libmuleappcommon_a-GapList.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-GapList.obj `if test -f 'GapList.cpp'; then $(CYGPATH_W) 'GapList.cpp'; else $(CYGPATH_W) '$(srcdir)/GapList.cpp'; fi`
+
 libmuleappcommon_a-MagnetURI.o: MagnetURI.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-MagnetURI.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-MagnetURI.Tpo" -c -o libmuleappcommon_a-MagnetURI.o `test -f 'MagnetURI.cpp' || echo '$(srcdir)/'`MagnetURI.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-MagnetURI.Tpo" "$(DEPDIR)/libmuleappcommon_a-MagnetURI.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-MagnetURI.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-MagnetURI.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-MagnetURI.Tpo -c -o libmuleappcommon_a-MagnetURI.o `test -f 'MagnetURI.cpp' || echo '$(srcdir)/'`MagnetURI.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-MagnetURI.Tpo $(DEPDIR)/libmuleappcommon_a-MagnetURI.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MagnetURI.cpp' object='libmuleappcommon_a-MagnetURI.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-MagnetURI.o `test -f 'MagnetURI.cpp' || echo '$(srcdir)/'`MagnetURI.cpp
 
 libmuleappcommon_a-MagnetURI.obj: MagnetURI.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-MagnetURI.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-MagnetURI.Tpo" -c -o libmuleappcommon_a-MagnetURI.obj `if test -f 'MagnetURI.cpp'; then $(CYGPATH_W) 'MagnetURI.cpp'; else $(CYGPATH_W) '$(srcdir)/MagnetURI.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-MagnetURI.Tpo" "$(DEPDIR)/libmuleappcommon_a-MagnetURI.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-MagnetURI.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-MagnetURI.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-MagnetURI.Tpo -c -o libmuleappcommon_a-MagnetURI.obj `if test -f 'MagnetURI.cpp'; then $(CYGPATH_W) 'MagnetURI.cpp'; else $(CYGPATH_W) '$(srcdir)/MagnetURI.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-MagnetURI.Tpo $(DEPDIR)/libmuleappcommon_a-MagnetURI.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MagnetURI.cpp' object='libmuleappcommon_a-MagnetURI.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-MagnetURI.obj `if test -f 'MagnetURI.cpp'; then $(CYGPATH_W) 'MagnetURI.cpp'; else $(CYGPATH_W) '$(srcdir)/MagnetURI.cpp'; fi`
 
 libmuleappcommon_a-MemFile.o: MemFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-MemFile.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-MemFile.Tpo" -c -o libmuleappcommon_a-MemFile.o `test -f 'MemFile.cpp' || echo '$(srcdir)/'`MemFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-MemFile.Tpo" "$(DEPDIR)/libmuleappcommon_a-MemFile.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-MemFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-MemFile.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-MemFile.Tpo -c -o libmuleappcommon_a-MemFile.o `test -f 'MemFile.cpp' || echo '$(srcdir)/'`MemFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-MemFile.Tpo $(DEPDIR)/libmuleappcommon_a-MemFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MemFile.cpp' object='libmuleappcommon_a-MemFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-MemFile.o `test -f 'MemFile.cpp' || echo '$(srcdir)/'`MemFile.cpp
 
 libmuleappcommon_a-MemFile.obj: MemFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-MemFile.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-MemFile.Tpo" -c -o libmuleappcommon_a-MemFile.obj `if test -f 'MemFile.cpp'; then $(CYGPATH_W) 'MemFile.cpp'; else $(CYGPATH_W) '$(srcdir)/MemFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-MemFile.Tpo" "$(DEPDIR)/libmuleappcommon_a-MemFile.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-MemFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-MemFile.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-MemFile.Tpo -c -o libmuleappcommon_a-MemFile.obj `if test -f 'MemFile.cpp'; then $(CYGPATH_W) 'MemFile.cpp'; else $(CYGPATH_W) '$(srcdir)/MemFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-MemFile.Tpo $(DEPDIR)/libmuleappcommon_a-MemFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MemFile.cpp' object='libmuleappcommon_a-MemFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-MemFile.obj `if test -f 'MemFile.cpp'; then $(CYGPATH_W) 'MemFile.cpp'; else $(CYGPATH_W) '$(srcdir)/MemFile.cpp'; fi`
 
 libmuleappcommon_a-NetworkFunctions.o: NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-NetworkFunctions.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Tpo" -c -o libmuleappcommon_a-NetworkFunctions.o `test -f 'NetworkFunctions.cpp' || echo '$(srcdir)/'`NetworkFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Tpo" "$(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-NetworkFunctions.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Tpo -c -o libmuleappcommon_a-NetworkFunctions.o `test -f 'NetworkFunctions.cpp' || echo '$(srcdir)/'`NetworkFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Tpo $(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NetworkFunctions.cpp' object='libmuleappcommon_a-NetworkFunctions.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-NetworkFunctions.o `test -f 'NetworkFunctions.cpp' || echo '$(srcdir)/'`NetworkFunctions.cpp
 
 libmuleappcommon_a-NetworkFunctions.obj: NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-NetworkFunctions.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Tpo" -c -o libmuleappcommon_a-NetworkFunctions.obj `if test -f 'NetworkFunctions.cpp'; then $(CYGPATH_W) 'NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Tpo" "$(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-NetworkFunctions.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Tpo -c -o libmuleappcommon_a-NetworkFunctions.obj `if test -f 'NetworkFunctions.cpp'; then $(CYGPATH_W) 'NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctions.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Tpo $(DEPDIR)/libmuleappcommon_a-NetworkFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NetworkFunctions.cpp' object='libmuleappcommon_a-NetworkFunctions.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-NetworkFunctions.obj `if test -f 'NetworkFunctions.cpp'; then $(CYGPATH_W) 'NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctions.cpp'; fi`
 
+libmuleappcommon_a-OtherFunctions.o: OtherFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-OtherFunctions.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-OtherFunctions.Tpo -c -o libmuleappcommon_a-OtherFunctions.o `test -f 'OtherFunctions.cpp' || echo '$(srcdir)/'`OtherFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-OtherFunctions.Tpo $(DEPDIR)/libmuleappcommon_a-OtherFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OtherFunctions.cpp' object='libmuleappcommon_a-OtherFunctions.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-OtherFunctions.o `test -f 'OtherFunctions.cpp' || echo '$(srcdir)/'`OtherFunctions.cpp
+
+libmuleappcommon_a-OtherFunctions.obj: OtherFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-OtherFunctions.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-OtherFunctions.Tpo -c -o libmuleappcommon_a-OtherFunctions.obj `if test -f 'OtherFunctions.cpp'; then $(CYGPATH_W) 'OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/OtherFunctions.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-OtherFunctions.Tpo $(DEPDIR)/libmuleappcommon_a-OtherFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OtherFunctions.cpp' object='libmuleappcommon_a-OtherFunctions.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-OtherFunctions.obj `if test -f 'OtherFunctions.cpp'; then $(CYGPATH_W) 'OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/OtherFunctions.cpp'; fi`
+
 libmuleappcommon_a-Packet.o: Packet.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Packet.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-Packet.Tpo" -c -o libmuleappcommon_a-Packet.o `test -f 'Packet.cpp' || echo '$(srcdir)/'`Packet.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-Packet.Tpo" "$(DEPDIR)/libmuleappcommon_a-Packet.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-Packet.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Packet.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-Packet.Tpo -c -o libmuleappcommon_a-Packet.o `test -f 'Packet.cpp' || echo '$(srcdir)/'`Packet.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-Packet.Tpo $(DEPDIR)/libmuleappcommon_a-Packet.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Packet.cpp' object='libmuleappcommon_a-Packet.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-Packet.o `test -f 'Packet.cpp' || echo '$(srcdir)/'`Packet.cpp
 
 libmuleappcommon_a-Packet.obj: Packet.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Packet.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-Packet.Tpo" -c -o libmuleappcommon_a-Packet.obj `if test -f 'Packet.cpp'; then $(CYGPATH_W) 'Packet.cpp'; else $(CYGPATH_W) '$(srcdir)/Packet.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-Packet.Tpo" "$(DEPDIR)/libmuleappcommon_a-Packet.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-Packet.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Packet.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-Packet.Tpo -c -o libmuleappcommon_a-Packet.obj `if test -f 'Packet.cpp'; then $(CYGPATH_W) 'Packet.cpp'; else $(CYGPATH_W) '$(srcdir)/Packet.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-Packet.Tpo $(DEPDIR)/libmuleappcommon_a-Packet.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Packet.cpp' object='libmuleappcommon_a-Packet.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-Packet.obj `if test -f 'Packet.cpp'; then $(CYGPATH_W) 'Packet.cpp'; else $(CYGPATH_W) '$(srcdir)/Packet.cpp'; fi`
 
 libmuleappcommon_a-RLE.o: RLE.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-RLE.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-RLE.Tpo" -c -o libmuleappcommon_a-RLE.o `test -f 'RLE.cpp' || echo '$(srcdir)/'`RLE.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-RLE.Tpo" "$(DEPDIR)/libmuleappcommon_a-RLE.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-RLE.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-RLE.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-RLE.Tpo -c -o libmuleappcommon_a-RLE.o `test -f 'RLE.cpp' || echo '$(srcdir)/'`RLE.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-RLE.Tpo $(DEPDIR)/libmuleappcommon_a-RLE.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RLE.cpp' object='libmuleappcommon_a-RLE.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-RLE.o `test -f 'RLE.cpp' || echo '$(srcdir)/'`RLE.cpp
 
 libmuleappcommon_a-RLE.obj: RLE.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-RLE.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-RLE.Tpo" -c -o libmuleappcommon_a-RLE.obj `if test -f 'RLE.cpp'; then $(CYGPATH_W) 'RLE.cpp'; else $(CYGPATH_W) '$(srcdir)/RLE.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-RLE.Tpo" "$(DEPDIR)/libmuleappcommon_a-RLE.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-RLE.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-RLE.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-RLE.Tpo -c -o libmuleappcommon_a-RLE.obj `if test -f 'RLE.cpp'; then $(CYGPATH_W) 'RLE.cpp'; else $(CYGPATH_W) '$(srcdir)/RLE.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-RLE.Tpo $(DEPDIR)/libmuleappcommon_a-RLE.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RLE.cpp' object='libmuleappcommon_a-RLE.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-RLE.obj `if test -f 'RLE.cpp'; then $(CYGPATH_W) 'RLE.cpp'; else $(CYGPATH_W) '$(srcdir)/RLE.cpp'; fi`
 
 libmuleappcommon_a-SafeFile.o: SafeFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-SafeFile.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-SafeFile.Tpo" -c -o libmuleappcommon_a-SafeFile.o `test -f 'SafeFile.cpp' || echo '$(srcdir)/'`SafeFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-SafeFile.Tpo" "$(DEPDIR)/libmuleappcommon_a-SafeFile.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-SafeFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-SafeFile.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-SafeFile.Tpo -c -o libmuleappcommon_a-SafeFile.o `test -f 'SafeFile.cpp' || echo '$(srcdir)/'`SafeFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-SafeFile.Tpo $(DEPDIR)/libmuleappcommon_a-SafeFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SafeFile.cpp' object='libmuleappcommon_a-SafeFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-SafeFile.o `test -f 'SafeFile.cpp' || echo '$(srcdir)/'`SafeFile.cpp
 
 libmuleappcommon_a-SafeFile.obj: SafeFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-SafeFile.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-SafeFile.Tpo" -c -o libmuleappcommon_a-SafeFile.obj `if test -f 'SafeFile.cpp'; then $(CYGPATH_W) 'SafeFile.cpp'; else $(CYGPATH_W) '$(srcdir)/SafeFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-SafeFile.Tpo" "$(DEPDIR)/libmuleappcommon_a-SafeFile.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-SafeFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-SafeFile.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-SafeFile.Tpo -c -o libmuleappcommon_a-SafeFile.obj `if test -f 'SafeFile.cpp'; then $(CYGPATH_W) 'SafeFile.cpp'; else $(CYGPATH_W) '$(srcdir)/SafeFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-SafeFile.Tpo $(DEPDIR)/libmuleappcommon_a-SafeFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SafeFile.cpp' object='libmuleappcommon_a-SafeFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-SafeFile.obj `if test -f 'SafeFile.cpp'; then $(CYGPATH_W) 'SafeFile.cpp'; else $(CYGPATH_W) '$(srcdir)/SafeFile.cpp'; fi`
 
 libmuleappcommon_a-SHA.o: SHA.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-SHA.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-SHA.Tpo" -c -o libmuleappcommon_a-SHA.o `test -f 'SHA.cpp' || echo '$(srcdir)/'`SHA.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-SHA.Tpo" "$(DEPDIR)/libmuleappcommon_a-SHA.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-SHA.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-SHA.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-SHA.Tpo -c -o libmuleappcommon_a-SHA.o `test -f 'SHA.cpp' || echo '$(srcdir)/'`SHA.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-SHA.Tpo $(DEPDIR)/libmuleappcommon_a-SHA.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SHA.cpp' object='libmuleappcommon_a-SHA.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-SHA.o `test -f 'SHA.cpp' || echo '$(srcdir)/'`SHA.cpp
 
 libmuleappcommon_a-SHA.obj: SHA.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-SHA.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-SHA.Tpo" -c -o libmuleappcommon_a-SHA.obj `if test -f 'SHA.cpp'; then $(CYGPATH_W) 'SHA.cpp'; else $(CYGPATH_W) '$(srcdir)/SHA.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-SHA.Tpo" "$(DEPDIR)/libmuleappcommon_a-SHA.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-SHA.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-SHA.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-SHA.Tpo -c -o libmuleappcommon_a-SHA.obj `if test -f 'SHA.cpp'; then $(CYGPATH_W) 'SHA.cpp'; else $(CYGPATH_W) '$(srcdir)/SHA.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-SHA.Tpo $(DEPDIR)/libmuleappcommon_a-SHA.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SHA.cpp' object='libmuleappcommon_a-SHA.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-SHA.obj `if test -f 'SHA.cpp'; then $(CYGPATH_W) 'SHA.cpp'; else $(CYGPATH_W) '$(srcdir)/SHA.cpp'; fi`
 
 libmuleappcommon_a-Tag.o: Tag.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Tag.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-Tag.Tpo" -c -o libmuleappcommon_a-Tag.o `test -f 'Tag.cpp' || echo '$(srcdir)/'`Tag.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-Tag.Tpo" "$(DEPDIR)/libmuleappcommon_a-Tag.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-Tag.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Tag.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-Tag.Tpo -c -o libmuleappcommon_a-Tag.o `test -f 'Tag.cpp' || echo '$(srcdir)/'`Tag.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-Tag.Tpo $(DEPDIR)/libmuleappcommon_a-Tag.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Tag.cpp' object='libmuleappcommon_a-Tag.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-Tag.o `test -f 'Tag.cpp' || echo '$(srcdir)/'`Tag.cpp
 
 libmuleappcommon_a-Tag.obj: Tag.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Tag.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-Tag.Tpo" -c -o libmuleappcommon_a-Tag.obj `if test -f 'Tag.cpp'; then $(CYGPATH_W) 'Tag.cpp'; else $(CYGPATH_W) '$(srcdir)/Tag.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-Tag.Tpo" "$(DEPDIR)/libmuleappcommon_a-Tag.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-Tag.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Tag.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-Tag.Tpo -c -o libmuleappcommon_a-Tag.obj `if test -f 'Tag.cpp'; then $(CYGPATH_W) 'Tag.cpp'; else $(CYGPATH_W) '$(srcdir)/Tag.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-Tag.Tpo $(DEPDIR)/libmuleappcommon_a-Tag.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Tag.cpp' object='libmuleappcommon_a-Tag.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-Tag.obj `if test -f 'Tag.cpp'; then $(CYGPATH_W) 'Tag.cpp'; else $(CYGPATH_W) '$(srcdir)/Tag.cpp'; fi`
 
+libmuleappcommon_a-TerminationProcess.o: TerminationProcess.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-TerminationProcess.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-TerminationProcess.Tpo -c -o libmuleappcommon_a-TerminationProcess.o `test -f 'TerminationProcess.cpp' || echo '$(srcdir)/'`TerminationProcess.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-TerminationProcess.Tpo $(DEPDIR)/libmuleappcommon_a-TerminationProcess.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcess.cpp' object='libmuleappcommon_a-TerminationProcess.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-TerminationProcess.o `test -f 'TerminationProcess.cpp' || echo '$(srcdir)/'`TerminationProcess.cpp
+
+libmuleappcommon_a-TerminationProcess.obj: TerminationProcess.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-TerminationProcess.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-TerminationProcess.Tpo -c -o libmuleappcommon_a-TerminationProcess.obj `if test -f 'TerminationProcess.cpp'; then $(CYGPATH_W) 'TerminationProcess.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcess.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-TerminationProcess.Tpo $(DEPDIR)/libmuleappcommon_a-TerminationProcess.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcess.cpp' object='libmuleappcommon_a-TerminationProcess.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-TerminationProcess.obj `if test -f 'TerminationProcess.cpp'; then $(CYGPATH_W) 'TerminationProcess.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcess.cpp'; fi`
+
 libmuleappcommon_a-Timer.o: Timer.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Timer.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-Timer.Tpo" -c -o libmuleappcommon_a-Timer.o `test -f 'Timer.cpp' || echo '$(srcdir)/'`Timer.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-Timer.Tpo" "$(DEPDIR)/libmuleappcommon_a-Timer.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-Timer.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Timer.o -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-Timer.Tpo -c -o libmuleappcommon_a-Timer.o `test -f 'Timer.cpp' || echo '$(srcdir)/'`Timer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-Timer.Tpo $(DEPDIR)/libmuleappcommon_a-Timer.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Timer.cpp' object='libmuleappcommon_a-Timer.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-Timer.o `test -f 'Timer.cpp' || echo '$(srcdir)/'`Timer.cpp
 
 libmuleappcommon_a-Timer.obj: Timer.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Timer.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-Timer.Tpo" -c -o libmuleappcommon_a-Timer.obj `if test -f 'Timer.cpp'; then $(CYGPATH_W) 'Timer.cpp'; else $(CYGPATH_W) '$(srcdir)/Timer.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-Timer.Tpo" "$(DEPDIR)/libmuleappcommon_a-Timer.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-Timer.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-Timer.obj -MD -MP -MF $(DEPDIR)/libmuleappcommon_a-Timer.Tpo -c -o libmuleappcommon_a-Timer.obj `if test -f 'Timer.cpp'; then $(CYGPATH_W) 'Timer.cpp'; else $(CYGPATH_W) '$(srcdir)/Timer.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcommon_a-Timer.Tpo $(DEPDIR)/libmuleappcommon_a-Timer.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Timer.cpp' object='libmuleappcommon_a-Timer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-Timer.obj `if test -f 'Timer.cpp'; then $(CYGPATH_W) 'Timer.cpp'; else $(CYGPATH_W) '$(srcdir)/Timer.cpp'; fi`
 
-libmuleappcommon_a-RandomFunctions.o: RandomFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-RandomFunctions.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-RandomFunctions.Tpo" -c -o libmuleappcommon_a-RandomFunctions.o `test -f 'RandomFunctions.cpp' || echo '$(srcdir)/'`RandomFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-RandomFunctions.Tpo" "$(DEPDIR)/libmuleappcommon_a-RandomFunctions.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-RandomFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RandomFunctions.cpp' object='libmuleappcommon_a-RandomFunctions.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-RandomFunctions.o `test -f 'RandomFunctions.cpp' || echo '$(srcdir)/'`RandomFunctions.cpp
-
-libmuleappcommon_a-RandomFunctions.obj: RandomFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-RandomFunctions.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-RandomFunctions.Tpo" -c -o libmuleappcommon_a-RandomFunctions.obj `if test -f 'RandomFunctions.cpp'; then $(CYGPATH_W) 'RandomFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/RandomFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-RandomFunctions.Tpo" "$(DEPDIR)/libmuleappcommon_a-RandomFunctions.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-RandomFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RandomFunctions.cpp' object='libmuleappcommon_a-RandomFunctions.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-RandomFunctions.obj `if test -f 'RandomFunctions.cpp'; then $(CYGPATH_W) 'RandomFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/RandomFunctions.cpp'; fi`
-
-libmuleappcommon_a-UInt128.o: kademlia/utils/UInt128.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-UInt128.o -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-UInt128.Tpo" -c -o libmuleappcommon_a-UInt128.o `test -f 'kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`kademlia/utils/UInt128.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-UInt128.Tpo" "$(DEPDIR)/libmuleappcommon_a-UInt128.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-UInt128.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/utils/UInt128.cpp' object='libmuleappcommon_a-UInt128.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-UInt128.o `test -f 'kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`kademlia/utils/UInt128.cpp
-
-libmuleappcommon_a-UInt128.obj: kademlia/utils/UInt128.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcommon_a-UInt128.obj -MD -MP -MF "$(DEPDIR)/libmuleappcommon_a-UInt128.Tpo" -c -o libmuleappcommon_a-UInt128.obj `if test -f 'kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) 'kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/utils/UInt128.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcommon_a-UInt128.Tpo" "$(DEPDIR)/libmuleappcommon_a-UInt128.Po"; else rm -f "$(DEPDIR)/libmuleappcommon_a-UInt128.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/utils/UInt128.cpp' object='libmuleappcommon_a-UInt128.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcommon_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcommon_a-UInt128.obj `if test -f 'kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) 'kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/utils/UInt128.cpp'; fi`
-
 libmuleappcore_a-AsyncDNS.o: AsyncDNS.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-AsyncDNS.o -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-AsyncDNS.Tpo" -c -o libmuleappcore_a-AsyncDNS.o `test -f 'AsyncDNS.cpp' || echo '$(srcdir)/'`AsyncDNS.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-AsyncDNS.Tpo" "$(DEPDIR)/libmuleappcore_a-AsyncDNS.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-AsyncDNS.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-AsyncDNS.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-AsyncDNS.Tpo -c -o libmuleappcore_a-AsyncDNS.o `test -f 'AsyncDNS.cpp' || echo '$(srcdir)/'`AsyncDNS.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-AsyncDNS.Tpo $(DEPDIR)/libmuleappcore_a-AsyncDNS.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='AsyncDNS.cpp' object='libmuleappcore_a-AsyncDNS.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-AsyncDNS.o `test -f 'AsyncDNS.cpp' || echo '$(srcdir)/'`AsyncDNS.cpp
 
 libmuleappcore_a-AsyncDNS.obj: AsyncDNS.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-AsyncDNS.obj -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-AsyncDNS.Tpo" -c -o libmuleappcore_a-AsyncDNS.obj `if test -f 'AsyncDNS.cpp'; then $(CYGPATH_W) 'AsyncDNS.cpp'; else $(CYGPATH_W) '$(srcdir)/AsyncDNS.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-AsyncDNS.Tpo" "$(DEPDIR)/libmuleappcore_a-AsyncDNS.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-AsyncDNS.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-AsyncDNS.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-AsyncDNS.Tpo -c -o libmuleappcore_a-AsyncDNS.obj `if test -f 'AsyncDNS.cpp'; then $(CYGPATH_W) 'AsyncDNS.cpp'; else $(CYGPATH_W) '$(srcdir)/AsyncDNS.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-AsyncDNS.Tpo $(DEPDIR)/libmuleappcore_a-AsyncDNS.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='AsyncDNS.cpp' object='libmuleappcore_a-AsyncDNS.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-AsyncDNS.obj `if test -f 'AsyncDNS.cpp'; then $(CYGPATH_W) 'AsyncDNS.cpp'; else $(CYGPATH_W) '$(srcdir)/AsyncDNS.cpp'; fi`
 
 libmuleappcore_a-DeadSourceList.o: DeadSourceList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-DeadSourceList.o -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-DeadSourceList.Tpo" -c -o libmuleappcore_a-DeadSourceList.o `test -f 'DeadSourceList.cpp' || echo '$(srcdir)/'`DeadSourceList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-DeadSourceList.Tpo" "$(DEPDIR)/libmuleappcore_a-DeadSourceList.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-DeadSourceList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-DeadSourceList.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-DeadSourceList.Tpo -c -o libmuleappcore_a-DeadSourceList.o `test -f 'DeadSourceList.cpp' || echo '$(srcdir)/'`DeadSourceList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-DeadSourceList.Tpo $(DEPDIR)/libmuleappcore_a-DeadSourceList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DeadSourceList.cpp' object='libmuleappcore_a-DeadSourceList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-DeadSourceList.o `test -f 'DeadSourceList.cpp' || echo '$(srcdir)/'`DeadSourceList.cpp
 
 libmuleappcore_a-DeadSourceList.obj: DeadSourceList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-DeadSourceList.obj -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-DeadSourceList.Tpo" -c -o libmuleappcore_a-DeadSourceList.obj `if test -f 'DeadSourceList.cpp'; then $(CYGPATH_W) 'DeadSourceList.cpp'; else $(CYGPATH_W) '$(srcdir)/DeadSourceList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-DeadSourceList.Tpo" "$(DEPDIR)/libmuleappcore_a-DeadSourceList.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-DeadSourceList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-DeadSourceList.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-DeadSourceList.Tpo -c -o libmuleappcore_a-DeadSourceList.obj `if test -f 'DeadSourceList.cpp'; then $(CYGPATH_W) 'DeadSourceList.cpp'; else $(CYGPATH_W) '$(srcdir)/DeadSourceList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-DeadSourceList.Tpo $(DEPDIR)/libmuleappcore_a-DeadSourceList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DeadSourceList.cpp' object='libmuleappcore_a-DeadSourceList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-DeadSourceList.obj `if test -f 'DeadSourceList.cpp'; then $(CYGPATH_W) 'DeadSourceList.cpp'; else $(CYGPATH_W) '$(srcdir)/DeadSourceList.cpp'; fi`
 
+libmuleappcore_a-FileArea.o: FileArea.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-FileArea.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-FileArea.Tpo -c -o libmuleappcore_a-FileArea.o `test -f 'FileArea.cpp' || echo '$(srcdir)/'`FileArea.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-FileArea.Tpo $(DEPDIR)/libmuleappcore_a-FileArea.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileArea.cpp' object='libmuleappcore_a-FileArea.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-FileArea.o `test -f 'FileArea.cpp' || echo '$(srcdir)/'`FileArea.cpp
+
+libmuleappcore_a-FileArea.obj: FileArea.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-FileArea.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-FileArea.Tpo -c -o libmuleappcore_a-FileArea.obj `if test -f 'FileArea.cpp'; then $(CYGPATH_W) 'FileArea.cpp'; else $(CYGPATH_W) '$(srcdir)/FileArea.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-FileArea.Tpo $(DEPDIR)/libmuleappcore_a-FileArea.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileArea.cpp' object='libmuleappcore_a-FileArea.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-FileArea.obj `if test -f 'FileArea.cpp'; then $(CYGPATH_W) 'FileArea.cpp'; else $(CYGPATH_W) '$(srcdir)/FileArea.cpp'; fi`
+
+libmuleappcore_a-FileAutoClose.o: FileAutoClose.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-FileAutoClose.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-FileAutoClose.Tpo -c -o libmuleappcore_a-FileAutoClose.o `test -f 'FileAutoClose.cpp' || echo '$(srcdir)/'`FileAutoClose.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-FileAutoClose.Tpo $(DEPDIR)/libmuleappcore_a-FileAutoClose.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileAutoClose.cpp' object='libmuleappcore_a-FileAutoClose.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-FileAutoClose.o `test -f 'FileAutoClose.cpp' || echo '$(srcdir)/'`FileAutoClose.cpp
+
+libmuleappcore_a-FileAutoClose.obj: FileAutoClose.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-FileAutoClose.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-FileAutoClose.Tpo -c -o libmuleappcore_a-FileAutoClose.obj `if test -f 'FileAutoClose.cpp'; then $(CYGPATH_W) 'FileAutoClose.cpp'; else $(CYGPATH_W) '$(srcdir)/FileAutoClose.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-FileAutoClose.Tpo $(DEPDIR)/libmuleappcore_a-FileAutoClose.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileAutoClose.cpp' object='libmuleappcore_a-FileAutoClose.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-FileAutoClose.obj `if test -f 'FileAutoClose.cpp'; then $(CYGPATH_W) 'FileAutoClose.cpp'; else $(CYGPATH_W) '$(srcdir)/FileAutoClose.cpp'; fi`
+
+libmuleappcore_a-IPFilterScanner.o: IPFilterScanner.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-IPFilterScanner.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-IPFilterScanner.Tpo -c -o libmuleappcore_a-IPFilterScanner.o `test -f 'IPFilterScanner.cpp' || echo '$(srcdir)/'`IPFilterScanner.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-IPFilterScanner.Tpo $(DEPDIR)/libmuleappcore_a-IPFilterScanner.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IPFilterScanner.cpp' object='libmuleappcore_a-IPFilterScanner.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-IPFilterScanner.o `test -f 'IPFilterScanner.cpp' || echo '$(srcdir)/'`IPFilterScanner.cpp
+
+libmuleappcore_a-IPFilterScanner.obj: IPFilterScanner.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-IPFilterScanner.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-IPFilterScanner.Tpo -c -o libmuleappcore_a-IPFilterScanner.obj `if test -f 'IPFilterScanner.cpp'; then $(CYGPATH_W) 'IPFilterScanner.cpp'; else $(CYGPATH_W) '$(srcdir)/IPFilterScanner.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-IPFilterScanner.Tpo $(DEPDIR)/libmuleappcore_a-IPFilterScanner.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IPFilterScanner.cpp' object='libmuleappcore_a-IPFilterScanner.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-IPFilterScanner.obj `if test -f 'IPFilterScanner.cpp'; then $(CYGPATH_W) 'IPFilterScanner.cpp'; else $(CYGPATH_W) '$(srcdir)/IPFilterScanner.cpp'; fi`
+
 libmuleappcore_a-Scanner.o: Scanner.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-Scanner.o -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-Scanner.Tpo" -c -o libmuleappcore_a-Scanner.o `test -f 'Scanner.cpp' || echo '$(srcdir)/'`Scanner.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-Scanner.Tpo" "$(DEPDIR)/libmuleappcore_a-Scanner.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-Scanner.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-Scanner.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-Scanner.Tpo -c -o libmuleappcore_a-Scanner.o `test -f 'Scanner.cpp' || echo '$(srcdir)/'`Scanner.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-Scanner.Tpo $(DEPDIR)/libmuleappcore_a-Scanner.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Scanner.cpp' object='libmuleappcore_a-Scanner.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-Scanner.o `test -f 'Scanner.cpp' || echo '$(srcdir)/'`Scanner.cpp
 
 libmuleappcore_a-Scanner.obj: Scanner.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-Scanner.obj -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-Scanner.Tpo" -c -o libmuleappcore_a-Scanner.obj `if test -f 'Scanner.cpp'; then $(CYGPATH_W) 'Scanner.cpp'; else $(CYGPATH_W) '$(srcdir)/Scanner.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-Scanner.Tpo" "$(DEPDIR)/libmuleappcore_a-Scanner.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-Scanner.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-Scanner.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-Scanner.Tpo -c -o libmuleappcore_a-Scanner.obj `if test -f 'Scanner.cpp'; then $(CYGPATH_W) 'Scanner.cpp'; else $(CYGPATH_W) '$(srcdir)/Scanner.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-Scanner.Tpo $(DEPDIR)/libmuleappcore_a-Scanner.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Scanner.cpp' object='libmuleappcore_a-Scanner.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-Scanner.obj `if test -f 'Scanner.cpp'; then $(CYGPATH_W) 'Scanner.cpp'; else $(CYGPATH_W) '$(srcdir)/Scanner.cpp'; fi`
 
 libmuleappcore_a-Parser.o: Parser.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-Parser.o -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-Parser.Tpo" -c -o libmuleappcore_a-Parser.o `test -f 'Parser.cpp' || echo '$(srcdir)/'`Parser.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-Parser.Tpo" "$(DEPDIR)/libmuleappcore_a-Parser.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-Parser.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-Parser.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-Parser.Tpo -c -o libmuleappcore_a-Parser.o `test -f 'Parser.cpp' || echo '$(srcdir)/'`Parser.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-Parser.Tpo $(DEPDIR)/libmuleappcore_a-Parser.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Parser.cpp' object='libmuleappcore_a-Parser.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-Parser.o `test -f 'Parser.cpp' || echo '$(srcdir)/'`Parser.cpp
 
 libmuleappcore_a-Parser.obj: Parser.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-Parser.obj -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-Parser.Tpo" -c -o libmuleappcore_a-Parser.obj `if test -f 'Parser.cpp'; then $(CYGPATH_W) 'Parser.cpp'; else $(CYGPATH_W) '$(srcdir)/Parser.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-Parser.Tpo" "$(DEPDIR)/libmuleappcore_a-Parser.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-Parser.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-Parser.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-Parser.Tpo -c -o libmuleappcore_a-Parser.obj `if test -f 'Parser.cpp'; then $(CYGPATH_W) 'Parser.cpp'; else $(CYGPATH_W) '$(srcdir)/Parser.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-Parser.Tpo $(DEPDIR)/libmuleappcore_a-Parser.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Parser.cpp' object='libmuleappcore_a-Parser.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-Parser.obj `if test -f 'Parser.cpp'; then $(CYGPATH_W) 'Parser.cpp'; else $(CYGPATH_W) '$(srcdir)/Parser.cpp'; fi`
 
 libmuleappcore_a-PlatformSpecific.o: PlatformSpecific.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-PlatformSpecific.o -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-PlatformSpecific.Tpo" -c -o libmuleappcore_a-PlatformSpecific.o `test -f 'PlatformSpecific.cpp' || echo '$(srcdir)/'`PlatformSpecific.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-PlatformSpecific.Tpo" "$(DEPDIR)/libmuleappcore_a-PlatformSpecific.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-PlatformSpecific.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-PlatformSpecific.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-PlatformSpecific.Tpo -c -o libmuleappcore_a-PlatformSpecific.o `test -f 'PlatformSpecific.cpp' || echo '$(srcdir)/'`PlatformSpecific.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-PlatformSpecific.Tpo $(DEPDIR)/libmuleappcore_a-PlatformSpecific.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PlatformSpecific.cpp' object='libmuleappcore_a-PlatformSpecific.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-PlatformSpecific.o `test -f 'PlatformSpecific.cpp' || echo '$(srcdir)/'`PlatformSpecific.cpp
 
 libmuleappcore_a-PlatformSpecific.obj: PlatformSpecific.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-PlatformSpecific.obj -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-PlatformSpecific.Tpo" -c -o libmuleappcore_a-PlatformSpecific.obj `if test -f 'PlatformSpecific.cpp'; then $(CYGPATH_W) 'PlatformSpecific.cpp'; else $(CYGPATH_W) '$(srcdir)/PlatformSpecific.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-PlatformSpecific.Tpo" "$(DEPDIR)/libmuleappcore_a-PlatformSpecific.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-PlatformSpecific.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-PlatformSpecific.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-PlatformSpecific.Tpo -c -o libmuleappcore_a-PlatformSpecific.obj `if test -f 'PlatformSpecific.cpp'; then $(CYGPATH_W) 'PlatformSpecific.cpp'; else $(CYGPATH_W) '$(srcdir)/PlatformSpecific.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-PlatformSpecific.Tpo $(DEPDIR)/libmuleappcore_a-PlatformSpecific.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PlatformSpecific.cpp' object='libmuleappcore_a-PlatformSpecific.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-PlatformSpecific.obj `if test -f 'PlatformSpecific.cpp'; then $(CYGPATH_W) 'PlatformSpecific.cpp'; else $(CYGPATH_W) '$(srcdir)/PlatformSpecific.cpp'; fi`
 
+libmuleappcore_a-RandomFunctions.o: RandomFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-RandomFunctions.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-RandomFunctions.Tpo -c -o libmuleappcore_a-RandomFunctions.o `test -f 'RandomFunctions.cpp' || echo '$(srcdir)/'`RandomFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-RandomFunctions.Tpo $(DEPDIR)/libmuleappcore_a-RandomFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RandomFunctions.cpp' object='libmuleappcore_a-RandomFunctions.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-RandomFunctions.o `test -f 'RandomFunctions.cpp' || echo '$(srcdir)/'`RandomFunctions.cpp
+
+libmuleappcore_a-RandomFunctions.obj: RandomFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-RandomFunctions.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-RandomFunctions.Tpo -c -o libmuleappcore_a-RandomFunctions.obj `if test -f 'RandomFunctions.cpp'; then $(CYGPATH_W) 'RandomFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/RandomFunctions.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-RandomFunctions.Tpo $(DEPDIR)/libmuleappcore_a-RandomFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RandomFunctions.cpp' object='libmuleappcore_a-RandomFunctions.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-RandomFunctions.obj `if test -f 'RandomFunctions.cpp'; then $(CYGPATH_W) 'RandomFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/RandomFunctions.cpp'; fi`
+
+libmuleappcore_a-RC4Encrypt.o: RC4Encrypt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-RC4Encrypt.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-RC4Encrypt.Tpo -c -o libmuleappcore_a-RC4Encrypt.o `test -f 'RC4Encrypt.cpp' || echo '$(srcdir)/'`RC4Encrypt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-RC4Encrypt.Tpo $(DEPDIR)/libmuleappcore_a-RC4Encrypt.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RC4Encrypt.cpp' object='libmuleappcore_a-RC4Encrypt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-RC4Encrypt.o `test -f 'RC4Encrypt.cpp' || echo '$(srcdir)/'`RC4Encrypt.cpp
+
+libmuleappcore_a-RC4Encrypt.obj: RC4Encrypt.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-RC4Encrypt.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-RC4Encrypt.Tpo -c -o libmuleappcore_a-RC4Encrypt.obj `if test -f 'RC4Encrypt.cpp'; then $(CYGPATH_W) 'RC4Encrypt.cpp'; else $(CYGPATH_W) '$(srcdir)/RC4Encrypt.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-RC4Encrypt.Tpo $(DEPDIR)/libmuleappcore_a-RC4Encrypt.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RC4Encrypt.cpp' object='libmuleappcore_a-RC4Encrypt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-RC4Encrypt.obj `if test -f 'RC4Encrypt.cpp'; then $(CYGPATH_W) 'RC4Encrypt.cpp'; else $(CYGPATH_W) '$(srcdir)/RC4Encrypt.cpp'; fi`
+
+libmuleappcore_a-StateMachine.o: StateMachine.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-StateMachine.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-StateMachine.Tpo -c -o libmuleappcore_a-StateMachine.o `test -f 'StateMachine.cpp' || echo '$(srcdir)/'`StateMachine.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-StateMachine.Tpo $(DEPDIR)/libmuleappcore_a-StateMachine.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StateMachine.cpp' object='libmuleappcore_a-StateMachine.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-StateMachine.o `test -f 'StateMachine.cpp' || echo '$(srcdir)/'`StateMachine.cpp
+
+libmuleappcore_a-StateMachine.obj: StateMachine.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-StateMachine.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-StateMachine.Tpo -c -o libmuleappcore_a-StateMachine.obj `if test -f 'StateMachine.cpp'; then $(CYGPATH_W) 'StateMachine.cpp'; else $(CYGPATH_W) '$(srcdir)/StateMachine.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-StateMachine.Tpo $(DEPDIR)/libmuleappcore_a-StateMachine.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StateMachine.cpp' object='libmuleappcore_a-StateMachine.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-StateMachine.obj `if test -f 'StateMachine.cpp'; then $(CYGPATH_W) 'StateMachine.cpp'; else $(CYGPATH_W) '$(srcdir)/StateMachine.cpp'; fi`
+
+libmuleappcore_a-TerminationProcessAmuleweb.o: TerminationProcessAmuleweb.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-TerminationProcessAmuleweb.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-TerminationProcessAmuleweb.Tpo -c -o libmuleappcore_a-TerminationProcessAmuleweb.o `test -f 'TerminationProcessAmuleweb.cpp' || echo '$(srcdir)/'`TerminationProcessAmuleweb.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-TerminationProcessAmuleweb.Tpo $(DEPDIR)/libmuleappcore_a-TerminationProcessAmuleweb.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcessAmuleweb.cpp' object='libmuleappcore_a-TerminationProcessAmuleweb.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-TerminationProcessAmuleweb.o `test -f 'TerminationProcessAmuleweb.cpp' || echo '$(srcdir)/'`TerminationProcessAmuleweb.cpp
+
+libmuleappcore_a-TerminationProcessAmuleweb.obj: TerminationProcessAmuleweb.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-TerminationProcessAmuleweb.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-TerminationProcessAmuleweb.Tpo -c -o libmuleappcore_a-TerminationProcessAmuleweb.obj `if test -f 'TerminationProcessAmuleweb.cpp'; then $(CYGPATH_W) 'TerminationProcessAmuleweb.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcessAmuleweb.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-TerminationProcessAmuleweb.Tpo $(DEPDIR)/libmuleappcore_a-TerminationProcessAmuleweb.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcessAmuleweb.cpp' object='libmuleappcore_a-TerminationProcessAmuleweb.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-TerminationProcessAmuleweb.obj `if test -f 'TerminationProcessAmuleweb.cpp'; then $(CYGPATH_W) 'TerminationProcessAmuleweb.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcessAmuleweb.cpp'; fi`
+
+libmuleappcore_a-ThreadScheduler.o: ThreadScheduler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-ThreadScheduler.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-ThreadScheduler.Tpo -c -o libmuleappcore_a-ThreadScheduler.o `test -f 'ThreadScheduler.cpp' || echo '$(srcdir)/'`ThreadScheduler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-ThreadScheduler.Tpo $(DEPDIR)/libmuleappcore_a-ThreadScheduler.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ThreadScheduler.cpp' object='libmuleappcore_a-ThreadScheduler.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-ThreadScheduler.o `test -f 'ThreadScheduler.cpp' || echo '$(srcdir)/'`ThreadScheduler.cpp
+
+libmuleappcore_a-ThreadScheduler.obj: ThreadScheduler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-ThreadScheduler.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-ThreadScheduler.Tpo -c -o libmuleappcore_a-ThreadScheduler.obj `if test -f 'ThreadScheduler.cpp'; then $(CYGPATH_W) 'ThreadScheduler.cpp'; else $(CYGPATH_W) '$(srcdir)/ThreadScheduler.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-ThreadScheduler.Tpo $(DEPDIR)/libmuleappcore_a-ThreadScheduler.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ThreadScheduler.cpp' object='libmuleappcore_a-ThreadScheduler.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-ThreadScheduler.obj `if test -f 'ThreadScheduler.cpp'; then $(CYGPATH_W) 'ThreadScheduler.cpp'; else $(CYGPATH_W) '$(srcdir)/ThreadScheduler.cpp'; fi`
+
+libmuleappcore_a-UPnPBase.o: UPnPBase.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-UPnPBase.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-UPnPBase.Tpo -c -o libmuleappcore_a-UPnPBase.o `test -f 'UPnPBase.cpp' || echo '$(srcdir)/'`UPnPBase.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-UPnPBase.Tpo $(DEPDIR)/libmuleappcore_a-UPnPBase.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UPnPBase.cpp' object='libmuleappcore_a-UPnPBase.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-UPnPBase.o `test -f 'UPnPBase.cpp' || echo '$(srcdir)/'`UPnPBase.cpp
+
+libmuleappcore_a-UPnPBase.obj: UPnPBase.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-UPnPBase.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-UPnPBase.Tpo -c -o libmuleappcore_a-UPnPBase.obj `if test -f 'UPnPBase.cpp'; then $(CYGPATH_W) 'UPnPBase.cpp'; else $(CYGPATH_W) '$(srcdir)/UPnPBase.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-UPnPBase.Tpo $(DEPDIR)/libmuleappcore_a-UPnPBase.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UPnPBase.cpp' object='libmuleappcore_a-UPnPBase.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-UPnPBase.obj `if test -f 'UPnPBase.cpp'; then $(CYGPATH_W) 'UPnPBase.cpp'; else $(CYGPATH_W) '$(srcdir)/UPnPBase.cpp'; fi`
+
 libmuleappcore_a-Entry.o: kademlia/kademlia/Entry.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-Entry.o -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-Entry.Tpo" -c -o libmuleappcore_a-Entry.o `test -f 'kademlia/kademlia/Entry.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Entry.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-Entry.Tpo" "$(DEPDIR)/libmuleappcore_a-Entry.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-Entry.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-Entry.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-Entry.Tpo -c -o libmuleappcore_a-Entry.o `test -f 'kademlia/kademlia/Entry.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Entry.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-Entry.Tpo $(DEPDIR)/libmuleappcore_a-Entry.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Entry.cpp' object='libmuleappcore_a-Entry.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-Entry.o `test -f 'kademlia/kademlia/Entry.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Entry.cpp
 
 libmuleappcore_a-Entry.obj: kademlia/kademlia/Entry.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-Entry.obj -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-Entry.Tpo" -c -o libmuleappcore_a-Entry.obj `if test -f 'kademlia/kademlia/Entry.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Entry.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Entry.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-Entry.Tpo" "$(DEPDIR)/libmuleappcore_a-Entry.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-Entry.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-Entry.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-Entry.Tpo -c -o libmuleappcore_a-Entry.obj `if test -f 'kademlia/kademlia/Entry.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Entry.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Entry.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-Entry.Tpo $(DEPDIR)/libmuleappcore_a-Entry.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Entry.cpp' object='libmuleappcore_a-Entry.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-Entry.obj `if test -f 'kademlia/kademlia/Entry.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Entry.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Entry.cpp'; fi`
 
 libmuleappcore_a-SearchManager.o: kademlia/kademlia/SearchManager.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-SearchManager.o -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-SearchManager.Tpo" -c -o libmuleappcore_a-SearchManager.o `test -f 'kademlia/kademlia/SearchManager.cpp' || echo '$(srcdir)/'`kademlia/kademlia/SearchManager.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-SearchManager.Tpo" "$(DEPDIR)/libmuleappcore_a-SearchManager.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-SearchManager.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-SearchManager.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-SearchManager.Tpo -c -o libmuleappcore_a-SearchManager.o `test -f 'kademlia/kademlia/SearchManager.cpp' || echo '$(srcdir)/'`kademlia/kademlia/SearchManager.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-SearchManager.Tpo $(DEPDIR)/libmuleappcore_a-SearchManager.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/SearchManager.cpp' object='libmuleappcore_a-SearchManager.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-SearchManager.o `test -f 'kademlia/kademlia/SearchManager.cpp' || echo '$(srcdir)/'`kademlia/kademlia/SearchManager.cpp
 
 libmuleappcore_a-SearchManager.obj: kademlia/kademlia/SearchManager.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-SearchManager.obj -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-SearchManager.Tpo" -c -o libmuleappcore_a-SearchManager.obj `if test -f 'kademlia/kademlia/SearchManager.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/SearchManager.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/SearchManager.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-SearchManager.Tpo" "$(DEPDIR)/libmuleappcore_a-SearchManager.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-SearchManager.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-SearchManager.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-SearchManager.Tpo -c -o libmuleappcore_a-SearchManager.obj `if test -f 'kademlia/kademlia/SearchManager.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/SearchManager.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/SearchManager.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-SearchManager.Tpo $(DEPDIR)/libmuleappcore_a-SearchManager.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/SearchManager.cpp' object='libmuleappcore_a-SearchManager.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-SearchManager.obj `if test -f 'kademlia/kademlia/SearchManager.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/SearchManager.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/SearchManager.cpp'; fi`
 
 libmuleappcore_a-RoutingBin.o: kademlia/routing/RoutingBin.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-RoutingBin.o -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-RoutingBin.Tpo" -c -o libmuleappcore_a-RoutingBin.o `test -f 'kademlia/routing/RoutingBin.cpp' || echo '$(srcdir)/'`kademlia/routing/RoutingBin.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-RoutingBin.Tpo" "$(DEPDIR)/libmuleappcore_a-RoutingBin.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-RoutingBin.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-RoutingBin.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-RoutingBin.Tpo -c -o libmuleappcore_a-RoutingBin.o `test -f 'kademlia/routing/RoutingBin.cpp' || echo '$(srcdir)/'`kademlia/routing/RoutingBin.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-RoutingBin.Tpo $(DEPDIR)/libmuleappcore_a-RoutingBin.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/routing/RoutingBin.cpp' object='libmuleappcore_a-RoutingBin.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-RoutingBin.o `test -f 'kademlia/routing/RoutingBin.cpp' || echo '$(srcdir)/'`kademlia/routing/RoutingBin.cpp
 
 libmuleappcore_a-RoutingBin.obj: kademlia/routing/RoutingBin.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-RoutingBin.obj -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-RoutingBin.Tpo" -c -o libmuleappcore_a-RoutingBin.obj `if test -f 'kademlia/routing/RoutingBin.cpp'; then $(CYGPATH_W) 'kademlia/routing/RoutingBin.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/RoutingBin.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-RoutingBin.Tpo" "$(DEPDIR)/libmuleappcore_a-RoutingBin.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-RoutingBin.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-RoutingBin.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-RoutingBin.Tpo -c -o libmuleappcore_a-RoutingBin.obj `if test -f 'kademlia/routing/RoutingBin.cpp'; then $(CYGPATH_W) 'kademlia/routing/RoutingBin.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/RoutingBin.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-RoutingBin.Tpo $(DEPDIR)/libmuleappcore_a-RoutingBin.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/routing/RoutingBin.cpp' object='libmuleappcore_a-RoutingBin.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-RoutingBin.obj `if test -f 'kademlia/routing/RoutingBin.cpp'; then $(CYGPATH_W) 'kademlia/routing/RoutingBin.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/RoutingBin.cpp'; fi`
 
-libmuleappcore_a-StateMachine.o: StateMachine.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-StateMachine.o -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-StateMachine.Tpo" -c -o libmuleappcore_a-StateMachine.o `test -f 'StateMachine.cpp' || echo '$(srcdir)/'`StateMachine.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-StateMachine.Tpo" "$(DEPDIR)/libmuleappcore_a-StateMachine.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-StateMachine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StateMachine.cpp' object='libmuleappcore_a-StateMachine.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-StateMachine.o `test -f 'StateMachine.cpp' || echo '$(srcdir)/'`StateMachine.cpp
-
-libmuleappcore_a-StateMachine.obj: StateMachine.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-StateMachine.obj -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-StateMachine.Tpo" -c -o libmuleappcore_a-StateMachine.obj `if test -f 'StateMachine.cpp'; then $(CYGPATH_W) 'StateMachine.cpp'; else $(CYGPATH_W) '$(srcdir)/StateMachine.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-StateMachine.Tpo" "$(DEPDIR)/libmuleappcore_a-StateMachine.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-StateMachine.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StateMachine.cpp' object='libmuleappcore_a-StateMachine.obj' libtool=no @AMDEPBACKSLASH@
+libmuleappcore_a-UInt128.o: kademlia/utils/UInt128.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-UInt128.o -MD -MP -MF $(DEPDIR)/libmuleappcore_a-UInt128.Tpo -c -o libmuleappcore_a-UInt128.o `test -f 'kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`kademlia/utils/UInt128.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-UInt128.Tpo $(DEPDIR)/libmuleappcore_a-UInt128.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/utils/UInt128.cpp' object='libmuleappcore_a-UInt128.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-UInt128.o `test -f 'kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`kademlia/utils/UInt128.cpp
+
+libmuleappcore_a-UInt128.obj: kademlia/utils/UInt128.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-UInt128.obj -MD -MP -MF $(DEPDIR)/libmuleappcore_a-UInt128.Tpo -c -o libmuleappcore_a-UInt128.obj `if test -f 'kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) 'kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/utils/UInt128.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappcore_a-UInt128.Tpo $(DEPDIR)/libmuleappcore_a-UInt128.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/utils/UInt128.cpp' object='libmuleappcore_a-UInt128.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-StateMachine.obj `if test -f 'StateMachine.cpp'; then $(CYGPATH_W) 'StateMachine.cpp'; else $(CYGPATH_W) '$(srcdir)/StateMachine.cpp'; fi`
-
-libmuleappcore_a-ThreadScheduler.o: ThreadScheduler.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-ThreadScheduler.o -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-ThreadScheduler.Tpo" -c -o libmuleappcore_a-ThreadScheduler.o `test -f 'ThreadScheduler.cpp' || echo '$(srcdir)/'`ThreadScheduler.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-ThreadScheduler.Tpo" "$(DEPDIR)/libmuleappcore_a-ThreadScheduler.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-ThreadScheduler.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ThreadScheduler.cpp' object='libmuleappcore_a-ThreadScheduler.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-ThreadScheduler.o `test -f 'ThreadScheduler.cpp' || echo '$(srcdir)/'`ThreadScheduler.cpp
-
-libmuleappcore_a-ThreadScheduler.obj: ThreadScheduler.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappcore_a-ThreadScheduler.obj -MD -MP -MF "$(DEPDIR)/libmuleappcore_a-ThreadScheduler.Tpo" -c -o libmuleappcore_a-ThreadScheduler.obj `if test -f 'ThreadScheduler.cpp'; then $(CYGPATH_W) 'ThreadScheduler.cpp'; else $(CYGPATH_W) '$(srcdir)/ThreadScheduler.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappcore_a-ThreadScheduler.Tpo" "$(DEPDIR)/libmuleappcore_a-ThreadScheduler.Po"; else rm -f "$(DEPDIR)/libmuleappcore_a-ThreadScheduler.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ThreadScheduler.cpp' object='libmuleappcore_a-ThreadScheduler.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-ThreadScheduler.obj `if test -f 'ThreadScheduler.cpp'; then $(CYGPATH_W) 'ThreadScheduler.cpp'; else $(CYGPATH_W) '$(srcdir)/ThreadScheduler.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappcore_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappcore_a-UInt128.obj `if test -f 'kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) 'kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/utils/UInt128.cpp'; fi`
 
 libmuleappgui_a-BarShader.o: BarShader.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-BarShader.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-BarShader.Tpo" -c -o libmuleappgui_a-BarShader.o `test -f 'BarShader.cpp' || echo '$(srcdir)/'`BarShader.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-BarShader.Tpo" "$(DEPDIR)/libmuleappgui_a-BarShader.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-BarShader.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-BarShader.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-BarShader.Tpo -c -o libmuleappgui_a-BarShader.o `test -f 'BarShader.cpp' || echo '$(srcdir)/'`BarShader.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-BarShader.Tpo $(DEPDIR)/libmuleappgui_a-BarShader.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='BarShader.cpp' object='libmuleappgui_a-BarShader.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-BarShader.o `test -f 'BarShader.cpp' || echo '$(srcdir)/'`BarShader.cpp
 
 libmuleappgui_a-BarShader.obj: BarShader.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-BarShader.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-BarShader.Tpo" -c -o libmuleappgui_a-BarShader.obj `if test -f 'BarShader.cpp'; then $(CYGPATH_W) 'BarShader.cpp'; else $(CYGPATH_W) '$(srcdir)/BarShader.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-BarShader.Tpo" "$(DEPDIR)/libmuleappgui_a-BarShader.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-BarShader.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-BarShader.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-BarShader.Tpo -c -o libmuleappgui_a-BarShader.obj `if test -f 'BarShader.cpp'; then $(CYGPATH_W) 'BarShader.cpp'; else $(CYGPATH_W) '$(srcdir)/BarShader.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-BarShader.Tpo $(DEPDIR)/libmuleappgui_a-BarShader.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='BarShader.cpp' object='libmuleappgui_a-BarShader.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-BarShader.obj `if test -f 'BarShader.cpp'; then $(CYGPATH_W) 'BarShader.cpp'; else $(CYGPATH_W) '$(srcdir)/BarShader.cpp'; fi`
 
-libmuleappgui_a-ChatWnd.o: ChatWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-ChatWnd.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-ChatWnd.Tpo" -c -o libmuleappgui_a-ChatWnd.o `test -f 'ChatWnd.cpp' || echo '$(srcdir)/'`ChatWnd.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-ChatWnd.Tpo" "$(DEPDIR)/libmuleappgui_a-ChatWnd.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-ChatWnd.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ChatWnd.cpp' object='libmuleappgui_a-ChatWnd.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-ChatWnd.o `test -f 'ChatWnd.cpp' || echo '$(srcdir)/'`ChatWnd.cpp
-
-libmuleappgui_a-ChatWnd.obj: ChatWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-ChatWnd.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-ChatWnd.Tpo" -c -o libmuleappgui_a-ChatWnd.obj `if test -f 'ChatWnd.cpp'; then $(CYGPATH_W) 'ChatWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/ChatWnd.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-ChatWnd.Tpo" "$(DEPDIR)/libmuleappgui_a-ChatWnd.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-ChatWnd.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ChatWnd.cpp' object='libmuleappgui_a-ChatWnd.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-ChatWnd.obj `if test -f 'ChatWnd.cpp'; then $(CYGPATH_W) 'ChatWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/ChatWnd.cpp'; fi`
-
 libmuleappgui_a-ColorFrameCtrl.o: ColorFrameCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-ColorFrameCtrl.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Tpo" -c -o libmuleappgui_a-ColorFrameCtrl.o `test -f 'ColorFrameCtrl.cpp' || echo '$(srcdir)/'`ColorFrameCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Tpo" "$(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-ColorFrameCtrl.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Tpo -c -o libmuleappgui_a-ColorFrameCtrl.o `test -f 'ColorFrameCtrl.cpp' || echo '$(srcdir)/'`ColorFrameCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Tpo $(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ColorFrameCtrl.cpp' object='libmuleappgui_a-ColorFrameCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-ColorFrameCtrl.o `test -f 'ColorFrameCtrl.cpp' || echo '$(srcdir)/'`ColorFrameCtrl.cpp
 
 libmuleappgui_a-ColorFrameCtrl.obj: ColorFrameCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-ColorFrameCtrl.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Tpo" -c -o libmuleappgui_a-ColorFrameCtrl.obj `if test -f 'ColorFrameCtrl.cpp'; then $(CYGPATH_W) 'ColorFrameCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ColorFrameCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Tpo" "$(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-ColorFrameCtrl.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Tpo -c -o libmuleappgui_a-ColorFrameCtrl.obj `if test -f 'ColorFrameCtrl.cpp'; then $(CYGPATH_W) 'ColorFrameCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ColorFrameCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Tpo $(DEPDIR)/libmuleappgui_a-ColorFrameCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ColorFrameCtrl.cpp' object='libmuleappgui_a-ColorFrameCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-ColorFrameCtrl.obj `if test -f 'ColorFrameCtrl.cpp'; then $(CYGPATH_W) 'ColorFrameCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ColorFrameCtrl.cpp'; fi`
 
-libmuleappgui_a-CommentDialog.o: CommentDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-CommentDialog.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-CommentDialog.Tpo" -c -o libmuleappgui_a-CommentDialog.o `test -f 'CommentDialog.cpp' || echo '$(srcdir)/'`CommentDialog.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-CommentDialog.Tpo" "$(DEPDIR)/libmuleappgui_a-CommentDialog.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-CommentDialog.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CommentDialog.cpp' object='libmuleappgui_a-CommentDialog.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-CommentDialog.o `test -f 'CommentDialog.cpp' || echo '$(srcdir)/'`CommentDialog.cpp
-
-libmuleappgui_a-CommentDialog.obj: CommentDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-CommentDialog.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-CommentDialog.Tpo" -c -o libmuleappgui_a-CommentDialog.obj `if test -f 'CommentDialog.cpp'; then $(CYGPATH_W) 'CommentDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CommentDialog.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-CommentDialog.Tpo" "$(DEPDIR)/libmuleappgui_a-CommentDialog.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-CommentDialog.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CommentDialog.cpp' object='libmuleappgui_a-CommentDialog.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-CommentDialog.obj `if test -f 'CommentDialog.cpp'; then $(CYGPATH_W) 'CommentDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CommentDialog.cpp'; fi`
-
-libmuleappgui_a-CommentDialogLst.o: CommentDialogLst.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-CommentDialogLst.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-CommentDialogLst.Tpo" -c -o libmuleappgui_a-CommentDialogLst.o `test -f 'CommentDialogLst.cpp' || echo '$(srcdir)/'`CommentDialogLst.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-CommentDialogLst.Tpo" "$(DEPDIR)/libmuleappgui_a-CommentDialogLst.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-CommentDialogLst.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CommentDialogLst.cpp' object='libmuleappgui_a-CommentDialogLst.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-CommentDialogLst.o `test -f 'CommentDialogLst.cpp' || echo '$(srcdir)/'`CommentDialogLst.cpp
-
-libmuleappgui_a-CommentDialogLst.obj: CommentDialogLst.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-CommentDialogLst.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-CommentDialogLst.Tpo" -c -o libmuleappgui_a-CommentDialogLst.obj `if test -f 'CommentDialogLst.cpp'; then $(CYGPATH_W) 'CommentDialogLst.cpp'; else $(CYGPATH_W) '$(srcdir)/CommentDialogLst.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-CommentDialogLst.Tpo" "$(DEPDIR)/libmuleappgui_a-CommentDialogLst.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-CommentDialogLst.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CommentDialogLst.cpp' object='libmuleappgui_a-CommentDialogLst.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-CommentDialogLst.obj `if test -f 'CommentDialogLst.cpp'; then $(CYGPATH_W) 'CommentDialogLst.cpp'; else $(CYGPATH_W) '$(srcdir)/CommentDialogLst.cpp'; fi`
-
-libmuleappgui_a-DirectoryTreeCtrl.o: DirectoryTreeCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-DirectoryTreeCtrl.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-DirectoryTreeCtrl.Tpo" -c -o libmuleappgui_a-DirectoryTreeCtrl.o `test -f 'DirectoryTreeCtrl.cpp' || echo '$(srcdir)/'`DirectoryTreeCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-DirectoryTreeCtrl.Tpo" "$(DEPDIR)/libmuleappgui_a-DirectoryTreeCtrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-DirectoryTreeCtrl.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DirectoryTreeCtrl.cpp' object='libmuleappgui_a-DirectoryTreeCtrl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-DirectoryTreeCtrl.o `test -f 'DirectoryTreeCtrl.cpp' || echo '$(srcdir)/'`DirectoryTreeCtrl.cpp
-
-libmuleappgui_a-DirectoryTreeCtrl.obj: DirectoryTreeCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-DirectoryTreeCtrl.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-DirectoryTreeCtrl.Tpo" -c -o libmuleappgui_a-DirectoryTreeCtrl.obj `if test -f 'DirectoryTreeCtrl.cpp'; then $(CYGPATH_W) 'DirectoryTreeCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/DirectoryTreeCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-DirectoryTreeCtrl.Tpo" "$(DEPDIR)/libmuleappgui_a-DirectoryTreeCtrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-DirectoryTreeCtrl.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DirectoryTreeCtrl.cpp' object='libmuleappgui_a-DirectoryTreeCtrl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-DirectoryTreeCtrl.obj `if test -f 'DirectoryTreeCtrl.cpp'; then $(CYGPATH_W) 'DirectoryTreeCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/DirectoryTreeCtrl.cpp'; fi`
-
 libmuleappgui_a-EditServerListDlg.o: EditServerListDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-EditServerListDlg.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-EditServerListDlg.Tpo" -c -o libmuleappgui_a-EditServerListDlg.o `test -f 'EditServerListDlg.cpp' || echo '$(srcdir)/'`EditServerListDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-EditServerListDlg.Tpo" "$(DEPDIR)/libmuleappgui_a-EditServerListDlg.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-EditServerListDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-EditServerListDlg.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-EditServerListDlg.Tpo -c -o libmuleappgui_a-EditServerListDlg.o `test -f 'EditServerListDlg.cpp' || echo '$(srcdir)/'`EditServerListDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-EditServerListDlg.Tpo $(DEPDIR)/libmuleappgui_a-EditServerListDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EditServerListDlg.cpp' object='libmuleappgui_a-EditServerListDlg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-EditServerListDlg.o `test -f 'EditServerListDlg.cpp' || echo '$(srcdir)/'`EditServerListDlg.cpp
 
 libmuleappgui_a-EditServerListDlg.obj: EditServerListDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-EditServerListDlg.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-EditServerListDlg.Tpo" -c -o libmuleappgui_a-EditServerListDlg.obj `if test -f 'EditServerListDlg.cpp'; then $(CYGPATH_W) 'EditServerListDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/EditServerListDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-EditServerListDlg.Tpo" "$(DEPDIR)/libmuleappgui_a-EditServerListDlg.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-EditServerListDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-EditServerListDlg.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-EditServerListDlg.Tpo -c -o libmuleappgui_a-EditServerListDlg.obj `if test -f 'EditServerListDlg.cpp'; then $(CYGPATH_W) 'EditServerListDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/EditServerListDlg.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-EditServerListDlg.Tpo $(DEPDIR)/libmuleappgui_a-EditServerListDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EditServerListDlg.cpp' object='libmuleappgui_a-EditServerListDlg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-EditServerListDlg.obj `if test -f 'EditServerListDlg.cpp'; then $(CYGPATH_W) 'EditServerListDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/EditServerListDlg.cpp'; fi`
 
 libmuleappgui_a-listctrl.o: extern/wxWidgets/listctrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-listctrl.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-listctrl.Tpo" -c -o libmuleappgui_a-listctrl.o `test -f 'extern/wxWidgets/listctrl.cpp' || echo '$(srcdir)/'`extern/wxWidgets/listctrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-listctrl.Tpo" "$(DEPDIR)/libmuleappgui_a-listctrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-listctrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-listctrl.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-listctrl.Tpo -c -o libmuleappgui_a-listctrl.o `test -f 'extern/wxWidgets/listctrl.cpp' || echo '$(srcdir)/'`extern/wxWidgets/listctrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-listctrl.Tpo $(DEPDIR)/libmuleappgui_a-listctrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='extern/wxWidgets/listctrl.cpp' object='libmuleappgui_a-listctrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-listctrl.o `test -f 'extern/wxWidgets/listctrl.cpp' || echo '$(srcdir)/'`extern/wxWidgets/listctrl.cpp
 
 libmuleappgui_a-listctrl.obj: extern/wxWidgets/listctrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-listctrl.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-listctrl.Tpo" -c -o libmuleappgui_a-listctrl.obj `if test -f 'extern/wxWidgets/listctrl.cpp'; then $(CYGPATH_W) 'extern/wxWidgets/listctrl.cpp'; else $(CYGPATH_W) '$(srcdir)/extern/wxWidgets/listctrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-listctrl.Tpo" "$(DEPDIR)/libmuleappgui_a-listctrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-listctrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-listctrl.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-listctrl.Tpo -c -o libmuleappgui_a-listctrl.obj `if test -f 'extern/wxWidgets/listctrl.cpp'; then $(CYGPATH_W) 'extern/wxWidgets/listctrl.cpp'; else $(CYGPATH_W) '$(srcdir)/extern/wxWidgets/listctrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-listctrl.Tpo $(DEPDIR)/libmuleappgui_a-listctrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='extern/wxWidgets/listctrl.cpp' object='libmuleappgui_a-listctrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-listctrl.obj `if test -f 'extern/wxWidgets/listctrl.cpp'; then $(CYGPATH_W) 'extern/wxWidgets/listctrl.cpp'; else $(CYGPATH_W) '$(srcdir)/extern/wxWidgets/listctrl.cpp'; fi`
 
 libmuleappgui_a-FileDetailListCtrl.o: FileDetailListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-FileDetailListCtrl.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Tpo" -c -o libmuleappgui_a-FileDetailListCtrl.o `test -f 'FileDetailListCtrl.cpp' || echo '$(srcdir)/'`FileDetailListCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Tpo" "$(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-FileDetailListCtrl.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Tpo -c -o libmuleappgui_a-FileDetailListCtrl.o `test -f 'FileDetailListCtrl.cpp' || echo '$(srcdir)/'`FileDetailListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Tpo $(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileDetailListCtrl.cpp' object='libmuleappgui_a-FileDetailListCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-FileDetailListCtrl.o `test -f 'FileDetailListCtrl.cpp' || echo '$(srcdir)/'`FileDetailListCtrl.cpp
 
 libmuleappgui_a-FileDetailListCtrl.obj: FileDetailListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-FileDetailListCtrl.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Tpo" -c -o libmuleappgui_a-FileDetailListCtrl.obj `if test -f 'FileDetailListCtrl.cpp'; then $(CYGPATH_W) 'FileDetailListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/FileDetailListCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Tpo" "$(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-FileDetailListCtrl.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Tpo -c -o libmuleappgui_a-FileDetailListCtrl.obj `if test -f 'FileDetailListCtrl.cpp'; then $(CYGPATH_W) 'FileDetailListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/FileDetailListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Tpo $(DEPDIR)/libmuleappgui_a-FileDetailListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileDetailListCtrl.cpp' object='libmuleappgui_a-FileDetailListCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-FileDetailListCtrl.obj `if test -f 'FileDetailListCtrl.cpp'; then $(CYGPATH_W) 'FileDetailListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/FileDetailListCtrl.cpp'; fi`
 
+libmuleappgui_a-IP2Country.o: IP2Country.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-IP2Country.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-IP2Country.Tpo -c -o libmuleappgui_a-IP2Country.o `test -f 'IP2Country.cpp' || echo '$(srcdir)/'`IP2Country.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-IP2Country.Tpo $(DEPDIR)/libmuleappgui_a-IP2Country.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IP2Country.cpp' object='libmuleappgui_a-IP2Country.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-IP2Country.o `test -f 'IP2Country.cpp' || echo '$(srcdir)/'`IP2Country.cpp
+
+libmuleappgui_a-IP2Country.obj: IP2Country.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-IP2Country.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-IP2Country.Tpo -c -o libmuleappgui_a-IP2Country.obj `if test -f 'IP2Country.cpp'; then $(CYGPATH_W) 'IP2Country.cpp'; else $(CYGPATH_W) '$(srcdir)/IP2Country.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-IP2Country.Tpo $(DEPDIR)/libmuleappgui_a-IP2Country.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IP2Country.cpp' object='libmuleappgui_a-IP2Country.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-IP2Country.obj `if test -f 'IP2Country.cpp'; then $(CYGPATH_W) 'IP2Country.cpp'; else $(CYGPATH_W) '$(srcdir)/IP2Country.cpp'; fi`
+
+libmuleappgui_a-MuleColour.o: MuleColour.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleColour.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-MuleColour.Tpo -c -o libmuleappgui_a-MuleColour.o `test -f 'MuleColour.cpp' || echo '$(srcdir)/'`MuleColour.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-MuleColour.Tpo $(DEPDIR)/libmuleappgui_a-MuleColour.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleColour.cpp' object='libmuleappgui_a-MuleColour.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-MuleColour.o `test -f 'MuleColour.cpp' || echo '$(srcdir)/'`MuleColour.cpp
+
+libmuleappgui_a-MuleColour.obj: MuleColour.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleColour.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-MuleColour.Tpo -c -o libmuleappgui_a-MuleColour.obj `if test -f 'MuleColour.cpp'; then $(CYGPATH_W) 'MuleColour.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleColour.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-MuleColour.Tpo $(DEPDIR)/libmuleappgui_a-MuleColour.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleColour.cpp' object='libmuleappgui_a-MuleColour.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-MuleColour.obj `if test -f 'MuleColour.cpp'; then $(CYGPATH_W) 'MuleColour.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleColour.cpp'; fi`
+
 libmuleappgui_a-MuleGifCtrl.o: MuleGifCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleGifCtrl.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Tpo" -c -o libmuleappgui_a-MuleGifCtrl.o `test -f 'MuleGifCtrl.cpp' || echo '$(srcdir)/'`MuleGifCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Tpo" "$(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleGifCtrl.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Tpo -c -o libmuleappgui_a-MuleGifCtrl.o `test -f 'MuleGifCtrl.cpp' || echo '$(srcdir)/'`MuleGifCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Tpo $(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleGifCtrl.cpp' object='libmuleappgui_a-MuleGifCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-MuleGifCtrl.o `test -f 'MuleGifCtrl.cpp' || echo '$(srcdir)/'`MuleGifCtrl.cpp
 
 libmuleappgui_a-MuleGifCtrl.obj: MuleGifCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleGifCtrl.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Tpo" -c -o libmuleappgui_a-MuleGifCtrl.obj `if test -f 'MuleGifCtrl.cpp'; then $(CYGPATH_W) 'MuleGifCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleGifCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Tpo" "$(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleGifCtrl.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Tpo -c -o libmuleappgui_a-MuleGifCtrl.obj `if test -f 'MuleGifCtrl.cpp'; then $(CYGPATH_W) 'MuleGifCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleGifCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Tpo $(DEPDIR)/libmuleappgui_a-MuleGifCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleGifCtrl.cpp' object='libmuleappgui_a-MuleGifCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-MuleGifCtrl.obj `if test -f 'MuleGifCtrl.cpp'; then $(CYGPATH_W) 'MuleGifCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleGifCtrl.cpp'; fi`
 
 libmuleappgui_a-MuleListCtrl.o: MuleListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleListCtrl.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-MuleListCtrl.Tpo" -c -o libmuleappgui_a-MuleListCtrl.o `test -f 'MuleListCtrl.cpp' || echo '$(srcdir)/'`MuleListCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-MuleListCtrl.Tpo" "$(DEPDIR)/libmuleappgui_a-MuleListCtrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-MuleListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleListCtrl.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-MuleListCtrl.Tpo -c -o libmuleappgui_a-MuleListCtrl.o `test -f 'MuleListCtrl.cpp' || echo '$(srcdir)/'`MuleListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-MuleListCtrl.Tpo $(DEPDIR)/libmuleappgui_a-MuleListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleListCtrl.cpp' object='libmuleappgui_a-MuleListCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-MuleListCtrl.o `test -f 'MuleListCtrl.cpp' || echo '$(srcdir)/'`MuleListCtrl.cpp
 
 libmuleappgui_a-MuleListCtrl.obj: MuleListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleListCtrl.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-MuleListCtrl.Tpo" -c -o libmuleappgui_a-MuleListCtrl.obj `if test -f 'MuleListCtrl.cpp'; then $(CYGPATH_W) 'MuleListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleListCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-MuleListCtrl.Tpo" "$(DEPDIR)/libmuleappgui_a-MuleListCtrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-MuleListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleListCtrl.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-MuleListCtrl.Tpo -c -o libmuleappgui_a-MuleListCtrl.obj `if test -f 'MuleListCtrl.cpp'; then $(CYGPATH_W) 'MuleListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-MuleListCtrl.Tpo $(DEPDIR)/libmuleappgui_a-MuleListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleListCtrl.cpp' object='libmuleappgui_a-MuleListCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-MuleListCtrl.obj `if test -f 'MuleListCtrl.cpp'; then $(CYGPATH_W) 'MuleListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleListCtrl.cpp'; fi`
 
 libmuleappgui_a-MuleNotebook.o: MuleNotebook.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleNotebook.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-MuleNotebook.Tpo" -c -o libmuleappgui_a-MuleNotebook.o `test -f 'MuleNotebook.cpp' || echo '$(srcdir)/'`MuleNotebook.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-MuleNotebook.Tpo" "$(DEPDIR)/libmuleappgui_a-MuleNotebook.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-MuleNotebook.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleNotebook.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-MuleNotebook.Tpo -c -o libmuleappgui_a-MuleNotebook.o `test -f 'MuleNotebook.cpp' || echo '$(srcdir)/'`MuleNotebook.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-MuleNotebook.Tpo $(DEPDIR)/libmuleappgui_a-MuleNotebook.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleNotebook.cpp' object='libmuleappgui_a-MuleNotebook.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-MuleNotebook.o `test -f 'MuleNotebook.cpp' || echo '$(srcdir)/'`MuleNotebook.cpp
 
 libmuleappgui_a-MuleNotebook.obj: MuleNotebook.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleNotebook.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-MuleNotebook.Tpo" -c -o libmuleappgui_a-MuleNotebook.obj `if test -f 'MuleNotebook.cpp'; then $(CYGPATH_W) 'MuleNotebook.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleNotebook.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-MuleNotebook.Tpo" "$(DEPDIR)/libmuleappgui_a-MuleNotebook.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-MuleNotebook.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleNotebook.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-MuleNotebook.Tpo -c -o libmuleappgui_a-MuleNotebook.obj `if test -f 'MuleNotebook.cpp'; then $(CYGPATH_W) 'MuleNotebook.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleNotebook.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-MuleNotebook.Tpo $(DEPDIR)/libmuleappgui_a-MuleNotebook.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleNotebook.cpp' object='libmuleappgui_a-MuleNotebook.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-MuleNotebook.obj `if test -f 'MuleNotebook.cpp'; then $(CYGPATH_W) 'MuleNotebook.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleNotebook.cpp'; fi`
 
 libmuleappgui_a-MuleTextCtrl.o: MuleTextCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleTextCtrl.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Tpo" -c -o libmuleappgui_a-MuleTextCtrl.o `test -f 'MuleTextCtrl.cpp' || echo '$(srcdir)/'`MuleTextCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Tpo" "$(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleTextCtrl.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Tpo -c -o libmuleappgui_a-MuleTextCtrl.o `test -f 'MuleTextCtrl.cpp' || echo '$(srcdir)/'`MuleTextCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Tpo $(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleTextCtrl.cpp' object='libmuleappgui_a-MuleTextCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-MuleTextCtrl.o `test -f 'MuleTextCtrl.cpp' || echo '$(srcdir)/'`MuleTextCtrl.cpp
 
 libmuleappgui_a-MuleTextCtrl.obj: MuleTextCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleTextCtrl.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Tpo" -c -o libmuleappgui_a-MuleTextCtrl.obj `if test -f 'MuleTextCtrl.cpp'; then $(CYGPATH_W) 'MuleTextCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleTextCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Tpo" "$(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleTextCtrl.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Tpo -c -o libmuleappgui_a-MuleTextCtrl.obj `if test -f 'MuleTextCtrl.cpp'; then $(CYGPATH_W) 'MuleTextCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleTextCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Tpo $(DEPDIR)/libmuleappgui_a-MuleTextCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleTextCtrl.cpp' object='libmuleappgui_a-MuleTextCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-MuleTextCtrl.obj `if test -f 'MuleTextCtrl.cpp'; then $(CYGPATH_W) 'MuleTextCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleTextCtrl.cpp'; fi`
 
 libmuleappgui_a-MuleCollection.o: MuleCollection.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleCollection.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-MuleCollection.Tpo" -c -o libmuleappgui_a-MuleCollection.o `test -f 'MuleCollection.cpp' || echo '$(srcdir)/'`MuleCollection.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-MuleCollection.Tpo" "$(DEPDIR)/libmuleappgui_a-MuleCollection.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-MuleCollection.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleCollection.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-MuleCollection.Tpo -c -o libmuleappgui_a-MuleCollection.o `test -f 'MuleCollection.cpp' || echo '$(srcdir)/'`MuleCollection.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-MuleCollection.Tpo $(DEPDIR)/libmuleappgui_a-MuleCollection.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleCollection.cpp' object='libmuleappgui_a-MuleCollection.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-MuleCollection.o `test -f 'MuleCollection.cpp' || echo '$(srcdir)/'`MuleCollection.cpp
 
 libmuleappgui_a-MuleCollection.obj: MuleCollection.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleCollection.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-MuleCollection.Tpo" -c -o libmuleappgui_a-MuleCollection.obj `if test -f 'MuleCollection.cpp'; then $(CYGPATH_W) 'MuleCollection.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleCollection.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-MuleCollection.Tpo" "$(DEPDIR)/libmuleappgui_a-MuleCollection.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-MuleCollection.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-MuleCollection.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-MuleCollection.Tpo -c -o libmuleappgui_a-MuleCollection.obj `if test -f 'MuleCollection.cpp'; then $(CYGPATH_W) 'MuleCollection.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleCollection.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-MuleCollection.Tpo $(DEPDIR)/libmuleappgui_a-MuleCollection.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleCollection.cpp' object='libmuleappgui_a-MuleCollection.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-MuleCollection.obj `if test -f 'MuleCollection.cpp'; then $(CYGPATH_W) 'MuleCollection.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleCollection.cpp'; fi`
 
 libmuleappgui_a-muuli_wdr.o: muuli_wdr.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-muuli_wdr.o -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-muuli_wdr.Tpo" -c -o libmuleappgui_a-muuli_wdr.o `test -f 'muuli_wdr.cpp' || echo '$(srcdir)/'`muuli_wdr.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-muuli_wdr.Tpo" "$(DEPDIR)/libmuleappgui_a-muuli_wdr.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-muuli_wdr.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-muuli_wdr.o -MD -MP -MF $(DEPDIR)/libmuleappgui_a-muuli_wdr.Tpo -c -o libmuleappgui_a-muuli_wdr.o `test -f 'muuli_wdr.cpp' || echo '$(srcdir)/'`muuli_wdr.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-muuli_wdr.Tpo $(DEPDIR)/libmuleappgui_a-muuli_wdr.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='muuli_wdr.cpp' object='libmuleappgui_a-muuli_wdr.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-muuli_wdr.o `test -f 'muuli_wdr.cpp' || echo '$(srcdir)/'`muuli_wdr.cpp
 
 libmuleappgui_a-muuli_wdr.obj: muuli_wdr.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-muuli_wdr.obj -MD -MP -MF "$(DEPDIR)/libmuleappgui_a-muuli_wdr.Tpo" -c -o libmuleappgui_a-muuli_wdr.obj `if test -f 'muuli_wdr.cpp'; then $(CYGPATH_W) 'muuli_wdr.cpp'; else $(CYGPATH_W) '$(srcdir)/muuli_wdr.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleappgui_a-muuli_wdr.Tpo" "$(DEPDIR)/libmuleappgui_a-muuli_wdr.Po"; else rm -f "$(DEPDIR)/libmuleappgui_a-muuli_wdr.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libmuleappgui_a-muuli_wdr.obj -MD -MP -MF $(DEPDIR)/libmuleappgui_a-muuli_wdr.Tpo -c -o libmuleappgui_a-muuli_wdr.obj `if test -f 'muuli_wdr.cpp'; then $(CYGPATH_W) 'muuli_wdr.cpp'; else $(CYGPATH_W) '$(srcdir)/muuli_wdr.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleappgui_a-muuli_wdr.Tpo $(DEPDIR)/libmuleappgui_a-muuli_wdr.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='muuli_wdr.cpp' object='libmuleappgui_a-muuli_wdr.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleappgui_a_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libmuleappgui_a-muuli_wdr.obj `if test -f 'muuli_wdr.cpp'; then $(CYGPATH_W) 'muuli_wdr.cpp'; else $(CYGPATH_W) '$(srcdir)/muuli_wdr.cpp'; fi`
 
-amule-RC4Encrypt.o: RC4Encrypt.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-RC4Encrypt.o -MD -MP -MF "$(DEPDIR)/amule-RC4Encrypt.Tpo" -c -o amule-RC4Encrypt.o `test -f 'RC4Encrypt.cpp' || echo '$(srcdir)/'`RC4Encrypt.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-RC4Encrypt.Tpo" "$(DEPDIR)/amule-RC4Encrypt.Po"; else rm -f "$(DEPDIR)/amule-RC4Encrypt.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RC4Encrypt.cpp' object='amule-RC4Encrypt.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-RC4Encrypt.o `test -f 'RC4Encrypt.cpp' || echo '$(srcdir)/'`RC4Encrypt.cpp
-
-amule-RC4Encrypt.obj: RC4Encrypt.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-RC4Encrypt.obj -MD -MP -MF "$(DEPDIR)/amule-RC4Encrypt.Tpo" -c -o amule-RC4Encrypt.obj `if test -f 'RC4Encrypt.cpp'; then $(CYGPATH_W) 'RC4Encrypt.cpp'; else $(CYGPATH_W) '$(srcdir)/RC4Encrypt.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-RC4Encrypt.Tpo" "$(DEPDIR)/amule-RC4Encrypt.Po"; else rm -f "$(DEPDIR)/amule-RC4Encrypt.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RC4Encrypt.cpp' object='amule-RC4Encrypt.obj' libtool=no @AMDEPBACKSLASH@
+amule-CaptchaDialog.o: CaptchaDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CaptchaDialog.o -MD -MP -MF $(DEPDIR)/amule-CaptchaDialog.Tpo -c -o amule-CaptchaDialog.o `test -f 'CaptchaDialog.cpp' || echo '$(srcdir)/'`CaptchaDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CaptchaDialog.Tpo $(DEPDIR)/amule-CaptchaDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CaptchaDialog.cpp' object='amule-CaptchaDialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CaptchaDialog.o `test -f 'CaptchaDialog.cpp' || echo '$(srcdir)/'`CaptchaDialog.cpp
+
+amule-CaptchaDialog.obj: CaptchaDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CaptchaDialog.obj -MD -MP -MF $(DEPDIR)/amule-CaptchaDialog.Tpo -c -o amule-CaptchaDialog.obj `if test -f 'CaptchaDialog.cpp'; then $(CYGPATH_W) 'CaptchaDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CaptchaDialog.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CaptchaDialog.Tpo $(DEPDIR)/amule-CaptchaDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CaptchaDialog.cpp' object='amule-CaptchaDialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CaptchaDialog.obj `if test -f 'CaptchaDialog.cpp'; then $(CYGPATH_W) 'CaptchaDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CaptchaDialog.cpp'; fi`
+
+amule-CaptchaGenerator.o: CaptchaGenerator.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CaptchaGenerator.o -MD -MP -MF $(DEPDIR)/amule-CaptchaGenerator.Tpo -c -o amule-CaptchaGenerator.o `test -f 'CaptchaGenerator.cpp' || echo '$(srcdir)/'`CaptchaGenerator.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CaptchaGenerator.Tpo $(DEPDIR)/amule-CaptchaGenerator.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CaptchaGenerator.cpp' object='amule-CaptchaGenerator.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CaptchaGenerator.o `test -f 'CaptchaGenerator.cpp' || echo '$(srcdir)/'`CaptchaGenerator.cpp
+
+amule-CaptchaGenerator.obj: CaptchaGenerator.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CaptchaGenerator.obj -MD -MP -MF $(DEPDIR)/amule-CaptchaGenerator.Tpo -c -o amule-CaptchaGenerator.obj `if test -f 'CaptchaGenerator.cpp'; then $(CYGPATH_W) 'CaptchaGenerator.cpp'; else $(CYGPATH_W) '$(srcdir)/CaptchaGenerator.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CaptchaGenerator.Tpo $(DEPDIR)/amule-CaptchaGenerator.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CaptchaGenerator.cpp' object='amule-CaptchaGenerator.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CaptchaGenerator.obj `if test -f 'CaptchaGenerator.cpp'; then $(CYGPATH_W) 'CaptchaGenerator.cpp'; else $(CYGPATH_W) '$(srcdir)/CaptchaGenerator.cpp'; fi`
+
+amule-PartFileConvert.o: PartFileConvert.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PartFileConvert.o -MD -MP -MF $(DEPDIR)/amule-PartFileConvert.Tpo -c -o amule-PartFileConvert.o `test -f 'PartFileConvert.cpp' || echo '$(srcdir)/'`PartFileConvert.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-PartFileConvert.Tpo $(DEPDIR)/amule-PartFileConvert.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFileConvert.cpp' object='amule-PartFileConvert.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PartFileConvert.o `test -f 'PartFileConvert.cpp' || echo '$(srcdir)/'`PartFileConvert.cpp
+
+amule-PartFileConvert.obj: PartFileConvert.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PartFileConvert.obj -MD -MP -MF $(DEPDIR)/amule-PartFileConvert.Tpo -c -o amule-PartFileConvert.obj `if test -f 'PartFileConvert.cpp'; then $(CYGPATH_W) 'PartFileConvert.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFileConvert.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-PartFileConvert.Tpo $(DEPDIR)/amule-PartFileConvert.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFileConvert.cpp' object='amule-PartFileConvert.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PartFileConvert.obj `if test -f 'PartFileConvert.cpp'; then $(CYGPATH_W) 'PartFileConvert.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFileConvert.cpp'; fi`
+
+amule-PartFileConvertDlg.o: PartFileConvertDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PartFileConvertDlg.o -MD -MP -MF $(DEPDIR)/amule-PartFileConvertDlg.Tpo -c -o amule-PartFileConvertDlg.o `test -f 'PartFileConvertDlg.cpp' || echo '$(srcdir)/'`PartFileConvertDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-PartFileConvertDlg.Tpo $(DEPDIR)/amule-PartFileConvertDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFileConvertDlg.cpp' object='amule-PartFileConvertDlg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-RC4Encrypt.obj `if test -f 'RC4Encrypt.cpp'; then $(CYGPATH_W) 'RC4Encrypt.cpp'; else $(CYGPATH_W) '$(srcdir)/RC4Encrypt.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PartFileConvertDlg.o `test -f 'PartFileConvertDlg.cpp' || echo '$(srcdir)/'`PartFileConvertDlg.cpp
+
+amule-PartFileConvertDlg.obj: PartFileConvertDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PartFileConvertDlg.obj -MD -MP -MF $(DEPDIR)/amule-PartFileConvertDlg.Tpo -c -o amule-PartFileConvertDlg.obj `if test -f 'PartFileConvertDlg.cpp'; then $(CYGPATH_W) 'PartFileConvertDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFileConvertDlg.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-PartFileConvertDlg.Tpo $(DEPDIR)/amule-PartFileConvertDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFileConvertDlg.cpp' object='amule-PartFileConvertDlg.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PartFileConvertDlg.obj `if test -f 'PartFileConvertDlg.cpp'; then $(CYGPATH_W) 'PartFileConvertDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFileConvertDlg.cpp'; fi`
 
 amule-amule.o: amule.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amule.o -MD -MP -MF "$(DEPDIR)/amule-amule.Tpo" -c -o amule-amule.o `test -f 'amule.cpp' || echo '$(srcdir)/'`amule.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-amule.Tpo" "$(DEPDIR)/amule-amule.Po"; else rm -f "$(DEPDIR)/amule-amule.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amule.o -MD -MP -MF $(DEPDIR)/amule-amule.Tpo -c -o amule-amule.o `test -f 'amule.cpp' || echo '$(srcdir)/'`amule.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-amule.Tpo $(DEPDIR)/amule-amule.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amule.cpp' object='amule-amule.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-amule.o `test -f 'amule.cpp' || echo '$(srcdir)/'`amule.cpp
 
 amule-amule.obj: amule.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amule.obj -MD -MP -MF "$(DEPDIR)/amule-amule.Tpo" -c -o amule-amule.obj `if test -f 'amule.cpp'; then $(CYGPATH_W) 'amule.cpp'; else $(CYGPATH_W) '$(srcdir)/amule.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-amule.Tpo" "$(DEPDIR)/amule-amule.Po"; else rm -f "$(DEPDIR)/amule-amule.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amule.obj -MD -MP -MF $(DEPDIR)/amule-amule.Tpo -c -o amule-amule.obj `if test -f 'amule.cpp'; then $(CYGPATH_W) 'amule.cpp'; else $(CYGPATH_W) '$(srcdir)/amule.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-amule.Tpo $(DEPDIR)/amule-amule.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amule.cpp' object='amule-amule.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-amule.obj `if test -f 'amule.cpp'; then $(CYGPATH_W) 'amule.cpp'; else $(CYGPATH_W) '$(srcdir)/amule.cpp'; fi`
 
 amule-BaseClient.o: BaseClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-BaseClient.o -MD -MP -MF "$(DEPDIR)/amule-BaseClient.Tpo" -c -o amule-BaseClient.o `test -f 'BaseClient.cpp' || echo '$(srcdir)/'`BaseClient.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-BaseClient.Tpo" "$(DEPDIR)/amule-BaseClient.Po"; else rm -f "$(DEPDIR)/amule-BaseClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-BaseClient.o -MD -MP -MF $(DEPDIR)/amule-BaseClient.Tpo -c -o amule-BaseClient.o `test -f 'BaseClient.cpp' || echo '$(srcdir)/'`BaseClient.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-BaseClient.Tpo $(DEPDIR)/amule-BaseClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='BaseClient.cpp' object='amule-BaseClient.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-BaseClient.o `test -f 'BaseClient.cpp' || echo '$(srcdir)/'`BaseClient.cpp
 
 amule-BaseClient.obj: BaseClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-BaseClient.obj -MD -MP -MF "$(DEPDIR)/amule-BaseClient.Tpo" -c -o amule-BaseClient.obj `if test -f 'BaseClient.cpp'; then $(CYGPATH_W) 'BaseClient.cpp'; else $(CYGPATH_W) '$(srcdir)/BaseClient.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-BaseClient.Tpo" "$(DEPDIR)/amule-BaseClient.Po"; else rm -f "$(DEPDIR)/amule-BaseClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-BaseClient.obj -MD -MP -MF $(DEPDIR)/amule-BaseClient.Tpo -c -o amule-BaseClient.obj `if test -f 'BaseClient.cpp'; then $(CYGPATH_W) 'BaseClient.cpp'; else $(CYGPATH_W) '$(srcdir)/BaseClient.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-BaseClient.Tpo $(DEPDIR)/amule-BaseClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='BaseClient.cpp' object='amule-BaseClient.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-BaseClient.obj `if test -f 'BaseClient.cpp'; then $(CYGPATH_W) 'BaseClient.cpp'; else $(CYGPATH_W) '$(srcdir)/BaseClient.cpp'; fi`
 
+amule-CanceledFileList.o: CanceledFileList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CanceledFileList.o -MD -MP -MF $(DEPDIR)/amule-CanceledFileList.Tpo -c -o amule-CanceledFileList.o `test -f 'CanceledFileList.cpp' || echo '$(srcdir)/'`CanceledFileList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CanceledFileList.Tpo $(DEPDIR)/amule-CanceledFileList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CanceledFileList.cpp' object='amule-CanceledFileList.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CanceledFileList.o `test -f 'CanceledFileList.cpp' || echo '$(srcdir)/'`CanceledFileList.cpp
+
+amule-CanceledFileList.obj: CanceledFileList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CanceledFileList.obj -MD -MP -MF $(DEPDIR)/amule-CanceledFileList.Tpo -c -o amule-CanceledFileList.obj `if test -f 'CanceledFileList.cpp'; then $(CYGPATH_W) 'CanceledFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/CanceledFileList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CanceledFileList.Tpo $(DEPDIR)/amule-CanceledFileList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CanceledFileList.cpp' object='amule-CanceledFileList.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CanceledFileList.obj `if test -f 'CanceledFileList.cpp'; then $(CYGPATH_W) 'CanceledFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/CanceledFileList.cpp'; fi`
+
 amule-ClientList.o: ClientList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientList.o -MD -MP -MF "$(DEPDIR)/amule-ClientList.Tpo" -c -o amule-ClientList.o `test -f 'ClientList.cpp' || echo '$(srcdir)/'`ClientList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientList.Tpo" "$(DEPDIR)/amule-ClientList.Po"; else rm -f "$(DEPDIR)/amule-ClientList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientList.o -MD -MP -MF $(DEPDIR)/amule-ClientList.Tpo -c -o amule-ClientList.o `test -f 'ClientList.cpp' || echo '$(srcdir)/'`ClientList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ClientList.Tpo $(DEPDIR)/amule-ClientList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientList.cpp' object='amule-ClientList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientList.o `test -f 'ClientList.cpp' || echo '$(srcdir)/'`ClientList.cpp
 
 amule-ClientList.obj: ClientList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientList.obj -MD -MP -MF "$(DEPDIR)/amule-ClientList.Tpo" -c -o amule-ClientList.obj `if test -f 'ClientList.cpp'; then $(CYGPATH_W) 'ClientList.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientList.Tpo" "$(DEPDIR)/amule-ClientList.Po"; else rm -f "$(DEPDIR)/amule-ClientList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientList.obj -MD -MP -MF $(DEPDIR)/amule-ClientList.Tpo -c -o amule-ClientList.obj `if test -f 'ClientList.cpp'; then $(CYGPATH_W) 'ClientList.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ClientList.Tpo $(DEPDIR)/amule-ClientList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientList.cpp' object='amule-ClientList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientList.obj `if test -f 'ClientList.cpp'; then $(CYGPATH_W) 'ClientList.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientList.cpp'; fi`
 
 amule-ClientCreditsList.o: ClientCreditsList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientCreditsList.o -MD -MP -MF "$(DEPDIR)/amule-ClientCreditsList.Tpo" -c -o amule-ClientCreditsList.o `test -f 'ClientCreditsList.cpp' || echo '$(srcdir)/'`ClientCreditsList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientCreditsList.Tpo" "$(DEPDIR)/amule-ClientCreditsList.Po"; else rm -f "$(DEPDIR)/amule-ClientCreditsList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientCreditsList.o -MD -MP -MF $(DEPDIR)/amule-ClientCreditsList.Tpo -c -o amule-ClientCreditsList.o `test -f 'ClientCreditsList.cpp' || echo '$(srcdir)/'`ClientCreditsList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ClientCreditsList.Tpo $(DEPDIR)/amule-ClientCreditsList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientCreditsList.cpp' object='amule-ClientCreditsList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientCreditsList.o `test -f 'ClientCreditsList.cpp' || echo '$(srcdir)/'`ClientCreditsList.cpp
 
 amule-ClientCreditsList.obj: ClientCreditsList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientCreditsList.obj -MD -MP -MF "$(DEPDIR)/amule-ClientCreditsList.Tpo" -c -o amule-ClientCreditsList.obj `if test -f 'ClientCreditsList.cpp'; then $(CYGPATH_W) 'ClientCreditsList.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCreditsList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientCreditsList.Tpo" "$(DEPDIR)/amule-ClientCreditsList.Po"; else rm -f "$(DEPDIR)/amule-ClientCreditsList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientCreditsList.obj -MD -MP -MF $(DEPDIR)/amule-ClientCreditsList.Tpo -c -o amule-ClientCreditsList.obj `if test -f 'ClientCreditsList.cpp'; then $(CYGPATH_W) 'ClientCreditsList.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCreditsList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ClientCreditsList.Tpo $(DEPDIR)/amule-ClientCreditsList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientCreditsList.cpp' object='amule-ClientCreditsList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientCreditsList.obj `if test -f 'ClientCreditsList.cpp'; then $(CYGPATH_W) 'ClientCreditsList.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCreditsList.cpp'; fi`
 
 amule-ClientTCPSocket.o: ClientTCPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientTCPSocket.o -MD -MP -MF "$(DEPDIR)/amule-ClientTCPSocket.Tpo" -c -o amule-ClientTCPSocket.o `test -f 'ClientTCPSocket.cpp' || echo '$(srcdir)/'`ClientTCPSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientTCPSocket.Tpo" "$(DEPDIR)/amule-ClientTCPSocket.Po"; else rm -f "$(DEPDIR)/amule-ClientTCPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientTCPSocket.o -MD -MP -MF $(DEPDIR)/amule-ClientTCPSocket.Tpo -c -o amule-ClientTCPSocket.o `test -f 'ClientTCPSocket.cpp' || echo '$(srcdir)/'`ClientTCPSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ClientTCPSocket.Tpo $(DEPDIR)/amule-ClientTCPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientTCPSocket.cpp' object='amule-ClientTCPSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientTCPSocket.o `test -f 'ClientTCPSocket.cpp' || echo '$(srcdir)/'`ClientTCPSocket.cpp
 
 amule-ClientTCPSocket.obj: ClientTCPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientTCPSocket.obj -MD -MP -MF "$(DEPDIR)/amule-ClientTCPSocket.Tpo" -c -o amule-ClientTCPSocket.obj `if test -f 'ClientTCPSocket.cpp'; then $(CYGPATH_W) 'ClientTCPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientTCPSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientTCPSocket.Tpo" "$(DEPDIR)/amule-ClientTCPSocket.Po"; else rm -f "$(DEPDIR)/amule-ClientTCPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientTCPSocket.obj -MD -MP -MF $(DEPDIR)/amule-ClientTCPSocket.Tpo -c -o amule-ClientTCPSocket.obj `if test -f 'ClientTCPSocket.cpp'; then $(CYGPATH_W) 'ClientTCPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientTCPSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ClientTCPSocket.Tpo $(DEPDIR)/amule-ClientTCPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientTCPSocket.cpp' object='amule-ClientTCPSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientTCPSocket.obj `if test -f 'ClientTCPSocket.cpp'; then $(CYGPATH_W) 'ClientTCPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientTCPSocket.cpp'; fi`
 
 amule-ClientUDPSocket.o: ClientUDPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientUDPSocket.o -MD -MP -MF "$(DEPDIR)/amule-ClientUDPSocket.Tpo" -c -o amule-ClientUDPSocket.o `test -f 'ClientUDPSocket.cpp' || echo '$(srcdir)/'`ClientUDPSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientUDPSocket.Tpo" "$(DEPDIR)/amule-ClientUDPSocket.Po"; else rm -f "$(DEPDIR)/amule-ClientUDPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientUDPSocket.o -MD -MP -MF $(DEPDIR)/amule-ClientUDPSocket.Tpo -c -o amule-ClientUDPSocket.o `test -f 'ClientUDPSocket.cpp' || echo '$(srcdir)/'`ClientUDPSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ClientUDPSocket.Tpo $(DEPDIR)/amule-ClientUDPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientUDPSocket.cpp' object='amule-ClientUDPSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientUDPSocket.o `test -f 'ClientUDPSocket.cpp' || echo '$(srcdir)/'`ClientUDPSocket.cpp
 
 amule-ClientUDPSocket.obj: ClientUDPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientUDPSocket.obj -MD -MP -MF "$(DEPDIR)/amule-ClientUDPSocket.Tpo" -c -o amule-ClientUDPSocket.obj `if test -f 'ClientUDPSocket.cpp'; then $(CYGPATH_W) 'ClientUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientUDPSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientUDPSocket.Tpo" "$(DEPDIR)/amule-ClientUDPSocket.Po"; else rm -f "$(DEPDIR)/amule-ClientUDPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientUDPSocket.obj -MD -MP -MF $(DEPDIR)/amule-ClientUDPSocket.Tpo -c -o amule-ClientUDPSocket.obj `if test -f 'ClientUDPSocket.cpp'; then $(CYGPATH_W) 'ClientUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientUDPSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ClientUDPSocket.Tpo $(DEPDIR)/amule-ClientUDPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientUDPSocket.cpp' object='amule-ClientUDPSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientUDPSocket.obj `if test -f 'ClientUDPSocket.cpp'; then $(CYGPATH_W) 'ClientUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientUDPSocket.cpp'; fi`
 
+amule-CorruptionBlackBox.o: CorruptionBlackBox.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CorruptionBlackBox.o -MD -MP -MF $(DEPDIR)/amule-CorruptionBlackBox.Tpo -c -o amule-CorruptionBlackBox.o `test -f 'CorruptionBlackBox.cpp' || echo '$(srcdir)/'`CorruptionBlackBox.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CorruptionBlackBox.Tpo $(DEPDIR)/amule-CorruptionBlackBox.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CorruptionBlackBox.cpp' object='amule-CorruptionBlackBox.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CorruptionBlackBox.o `test -f 'CorruptionBlackBox.cpp' || echo '$(srcdir)/'`CorruptionBlackBox.cpp
+
+amule-CorruptionBlackBox.obj: CorruptionBlackBox.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CorruptionBlackBox.obj -MD -MP -MF $(DEPDIR)/amule-CorruptionBlackBox.Tpo -c -o amule-CorruptionBlackBox.obj `if test -f 'CorruptionBlackBox.cpp'; then $(CYGPATH_W) 'CorruptionBlackBox.cpp'; else $(CYGPATH_W) '$(srcdir)/CorruptionBlackBox.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CorruptionBlackBox.Tpo $(DEPDIR)/amule-CorruptionBlackBox.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CorruptionBlackBox.cpp' object='amule-CorruptionBlackBox.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CorruptionBlackBox.obj `if test -f 'CorruptionBlackBox.cpp'; then $(CYGPATH_W) 'CorruptionBlackBox.cpp'; else $(CYGPATH_W) '$(srcdir)/CorruptionBlackBox.cpp'; fi`
+
 amule-DownloadClient.o: DownloadClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DownloadClient.o -MD -MP -MF "$(DEPDIR)/amule-DownloadClient.Tpo" -c -o amule-DownloadClient.o `test -f 'DownloadClient.cpp' || echo '$(srcdir)/'`DownloadClient.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-DownloadClient.Tpo" "$(DEPDIR)/amule-DownloadClient.Po"; else rm -f "$(DEPDIR)/amule-DownloadClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DownloadClient.o -MD -MP -MF $(DEPDIR)/amule-DownloadClient.Tpo -c -o amule-DownloadClient.o `test -f 'DownloadClient.cpp' || echo '$(srcdir)/'`DownloadClient.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-DownloadClient.Tpo $(DEPDIR)/amule-DownloadClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DownloadClient.cpp' object='amule-DownloadClient.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-DownloadClient.o `test -f 'DownloadClient.cpp' || echo '$(srcdir)/'`DownloadClient.cpp
 
 amule-DownloadClient.obj: DownloadClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DownloadClient.obj -MD -MP -MF "$(DEPDIR)/amule-DownloadClient.Tpo" -c -o amule-DownloadClient.obj `if test -f 'DownloadClient.cpp'; then $(CYGPATH_W) 'DownloadClient.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadClient.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-DownloadClient.Tpo" "$(DEPDIR)/amule-DownloadClient.Po"; else rm -f "$(DEPDIR)/amule-DownloadClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DownloadClient.obj -MD -MP -MF $(DEPDIR)/amule-DownloadClient.Tpo -c -o amule-DownloadClient.obj `if test -f 'DownloadClient.cpp'; then $(CYGPATH_W) 'DownloadClient.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadClient.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-DownloadClient.Tpo $(DEPDIR)/amule-DownloadClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DownloadClient.cpp' object='amule-DownloadClient.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-DownloadClient.obj `if test -f 'DownloadClient.cpp'; then $(CYGPATH_W) 'DownloadClient.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadClient.cpp'; fi`
 
 amule-DownloadQueue.o: DownloadQueue.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DownloadQueue.o -MD -MP -MF "$(DEPDIR)/amule-DownloadQueue.Tpo" -c -o amule-DownloadQueue.o `test -f 'DownloadQueue.cpp' || echo '$(srcdir)/'`DownloadQueue.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-DownloadQueue.Tpo" "$(DEPDIR)/amule-DownloadQueue.Po"; else rm -f "$(DEPDIR)/amule-DownloadQueue.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DownloadQueue.o -MD -MP -MF $(DEPDIR)/amule-DownloadQueue.Tpo -c -o amule-DownloadQueue.o `test -f 'DownloadQueue.cpp' || echo '$(srcdir)/'`DownloadQueue.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-DownloadQueue.Tpo $(DEPDIR)/amule-DownloadQueue.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DownloadQueue.cpp' object='amule-DownloadQueue.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-DownloadQueue.o `test -f 'DownloadQueue.cpp' || echo '$(srcdir)/'`DownloadQueue.cpp
 
 amule-DownloadQueue.obj: DownloadQueue.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DownloadQueue.obj -MD -MP -MF "$(DEPDIR)/amule-DownloadQueue.Tpo" -c -o amule-DownloadQueue.obj `if test -f 'DownloadQueue.cpp'; then $(CYGPATH_W) 'DownloadQueue.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadQueue.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-DownloadQueue.Tpo" "$(DEPDIR)/amule-DownloadQueue.Po"; else rm -f "$(DEPDIR)/amule-DownloadQueue.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DownloadQueue.obj -MD -MP -MF $(DEPDIR)/amule-DownloadQueue.Tpo -c -o amule-DownloadQueue.obj `if test -f 'DownloadQueue.cpp'; then $(CYGPATH_W) 'DownloadQueue.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadQueue.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-DownloadQueue.Tpo $(DEPDIR)/amule-DownloadQueue.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DownloadQueue.cpp' object='amule-DownloadQueue.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-DownloadQueue.obj `if test -f 'DownloadQueue.cpp'; then $(CYGPATH_W) 'DownloadQueue.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadQueue.cpp'; fi`
 
 amule-ECSpecialCoreTags.o: ECSpecialCoreTags.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ECSpecialCoreTags.o -MD -MP -MF "$(DEPDIR)/amule-ECSpecialCoreTags.Tpo" -c -o amule-ECSpecialCoreTags.o `test -f 'ECSpecialCoreTags.cpp' || echo '$(srcdir)/'`ECSpecialCoreTags.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ECSpecialCoreTags.Tpo" "$(DEPDIR)/amule-ECSpecialCoreTags.Po"; else rm -f "$(DEPDIR)/amule-ECSpecialCoreTags.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ECSpecialCoreTags.o -MD -MP -MF $(DEPDIR)/amule-ECSpecialCoreTags.Tpo -c -o amule-ECSpecialCoreTags.o `test -f 'ECSpecialCoreTags.cpp' || echo '$(srcdir)/'`ECSpecialCoreTags.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ECSpecialCoreTags.Tpo $(DEPDIR)/amule-ECSpecialCoreTags.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ECSpecialCoreTags.cpp' object='amule-ECSpecialCoreTags.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ECSpecialCoreTags.o `test -f 'ECSpecialCoreTags.cpp' || echo '$(srcdir)/'`ECSpecialCoreTags.cpp
 
 amule-ECSpecialCoreTags.obj: ECSpecialCoreTags.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ECSpecialCoreTags.obj -MD -MP -MF "$(DEPDIR)/amule-ECSpecialCoreTags.Tpo" -c -o amule-ECSpecialCoreTags.obj `if test -f 'ECSpecialCoreTags.cpp'; then $(CYGPATH_W) 'ECSpecialCoreTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialCoreTags.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ECSpecialCoreTags.Tpo" "$(DEPDIR)/amule-ECSpecialCoreTags.Po"; else rm -f "$(DEPDIR)/amule-ECSpecialCoreTags.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ECSpecialCoreTags.obj -MD -MP -MF $(DEPDIR)/amule-ECSpecialCoreTags.Tpo -c -o amule-ECSpecialCoreTags.obj `if test -f 'ECSpecialCoreTags.cpp'; then $(CYGPATH_W) 'ECSpecialCoreTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialCoreTags.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ECSpecialCoreTags.Tpo $(DEPDIR)/amule-ECSpecialCoreTags.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ECSpecialCoreTags.cpp' object='amule-ECSpecialCoreTags.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ECSpecialCoreTags.obj `if test -f 'ECSpecialCoreTags.cpp'; then $(CYGPATH_W) 'ECSpecialCoreTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialCoreTags.cpp'; fi`
 
 amule-EMSocket.o: EMSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-EMSocket.o -MD -MP -MF "$(DEPDIR)/amule-EMSocket.Tpo" -c -o amule-EMSocket.o `test -f 'EMSocket.cpp' || echo '$(srcdir)/'`EMSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-EMSocket.Tpo" "$(DEPDIR)/amule-EMSocket.Po"; else rm -f "$(DEPDIR)/amule-EMSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-EMSocket.o -MD -MP -MF $(DEPDIR)/amule-EMSocket.Tpo -c -o amule-EMSocket.o `test -f 'EMSocket.cpp' || echo '$(srcdir)/'`EMSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-EMSocket.Tpo $(DEPDIR)/amule-EMSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EMSocket.cpp' object='amule-EMSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-EMSocket.o `test -f 'EMSocket.cpp' || echo '$(srcdir)/'`EMSocket.cpp
 
 amule-EMSocket.obj: EMSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-EMSocket.obj -MD -MP -MF "$(DEPDIR)/amule-EMSocket.Tpo" -c -o amule-EMSocket.obj `if test -f 'EMSocket.cpp'; then $(CYGPATH_W) 'EMSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EMSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-EMSocket.Tpo" "$(DEPDIR)/amule-EMSocket.Po"; else rm -f "$(DEPDIR)/amule-EMSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-EMSocket.obj -MD -MP -MF $(DEPDIR)/amule-EMSocket.Tpo -c -o amule-EMSocket.obj `if test -f 'EMSocket.cpp'; then $(CYGPATH_W) 'EMSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EMSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-EMSocket.Tpo $(DEPDIR)/amule-EMSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EMSocket.cpp' object='amule-EMSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-EMSocket.obj `if test -f 'EMSocket.cpp'; then $(CYGPATH_W) 'EMSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EMSocket.cpp'; fi`
 
 amule-EncryptedStreamSocket.o: EncryptedStreamSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-EncryptedStreamSocket.o -MD -MP -MF "$(DEPDIR)/amule-EncryptedStreamSocket.Tpo" -c -o amule-EncryptedStreamSocket.o `test -f 'EncryptedStreamSocket.cpp' || echo '$(srcdir)/'`EncryptedStreamSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-EncryptedStreamSocket.Tpo" "$(DEPDIR)/amule-EncryptedStreamSocket.Po"; else rm -f "$(DEPDIR)/amule-EncryptedStreamSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-EncryptedStreamSocket.o -MD -MP -MF $(DEPDIR)/amule-EncryptedStreamSocket.Tpo -c -o amule-EncryptedStreamSocket.o `test -f 'EncryptedStreamSocket.cpp' || echo '$(srcdir)/'`EncryptedStreamSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-EncryptedStreamSocket.Tpo $(DEPDIR)/amule-EncryptedStreamSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EncryptedStreamSocket.cpp' object='amule-EncryptedStreamSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-EncryptedStreamSocket.o `test -f 'EncryptedStreamSocket.cpp' || echo '$(srcdir)/'`EncryptedStreamSocket.cpp
 
 amule-EncryptedStreamSocket.obj: EncryptedStreamSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-EncryptedStreamSocket.obj -MD -MP -MF "$(DEPDIR)/amule-EncryptedStreamSocket.Tpo" -c -o amule-EncryptedStreamSocket.obj `if test -f 'EncryptedStreamSocket.cpp'; then $(CYGPATH_W) 'EncryptedStreamSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EncryptedStreamSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-EncryptedStreamSocket.Tpo" "$(DEPDIR)/amule-EncryptedStreamSocket.Po"; else rm -f "$(DEPDIR)/amule-EncryptedStreamSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-EncryptedStreamSocket.obj -MD -MP -MF $(DEPDIR)/amule-EncryptedStreamSocket.Tpo -c -o amule-EncryptedStreamSocket.obj `if test -f 'EncryptedStreamSocket.cpp'; then $(CYGPATH_W) 'EncryptedStreamSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EncryptedStreamSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-EncryptedStreamSocket.Tpo $(DEPDIR)/amule-EncryptedStreamSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EncryptedStreamSocket.cpp' object='amule-EncryptedStreamSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-EncryptedStreamSocket.obj `if test -f 'EncryptedStreamSocket.cpp'; then $(CYGPATH_W) 'EncryptedStreamSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EncryptedStreamSocket.cpp'; fi`
 
 amule-EncryptedDatagramSocket.o: EncryptedDatagramSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-EncryptedDatagramSocket.o -MD -MP -MF "$(DEPDIR)/amule-EncryptedDatagramSocket.Tpo" -c -o amule-EncryptedDatagramSocket.o `test -f 'EncryptedDatagramSocket.cpp' || echo '$(srcdir)/'`EncryptedDatagramSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-EncryptedDatagramSocket.Tpo" "$(DEPDIR)/amule-EncryptedDatagramSocket.Po"; else rm -f "$(DEPDIR)/amule-EncryptedDatagramSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-EncryptedDatagramSocket.o -MD -MP -MF $(DEPDIR)/amule-EncryptedDatagramSocket.Tpo -c -o amule-EncryptedDatagramSocket.o `test -f 'EncryptedDatagramSocket.cpp' || echo '$(srcdir)/'`EncryptedDatagramSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-EncryptedDatagramSocket.Tpo $(DEPDIR)/amule-EncryptedDatagramSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EncryptedDatagramSocket.cpp' object='amule-EncryptedDatagramSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-EncryptedDatagramSocket.o `test -f 'EncryptedDatagramSocket.cpp' || echo '$(srcdir)/'`EncryptedDatagramSocket.cpp
 
 amule-EncryptedDatagramSocket.obj: EncryptedDatagramSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-EncryptedDatagramSocket.obj -MD -MP -MF "$(DEPDIR)/amule-EncryptedDatagramSocket.Tpo" -c -o amule-EncryptedDatagramSocket.obj `if test -f 'EncryptedDatagramSocket.cpp'; then $(CYGPATH_W) 'EncryptedDatagramSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EncryptedDatagramSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-EncryptedDatagramSocket.Tpo" "$(DEPDIR)/amule-EncryptedDatagramSocket.Po"; else rm -f "$(DEPDIR)/amule-EncryptedDatagramSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-EncryptedDatagramSocket.obj -MD -MP -MF $(DEPDIR)/amule-EncryptedDatagramSocket.Tpo -c -o amule-EncryptedDatagramSocket.obj `if test -f 'EncryptedDatagramSocket.cpp'; then $(CYGPATH_W) 'EncryptedDatagramSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EncryptedDatagramSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-EncryptedDatagramSocket.Tpo $(DEPDIR)/amule-EncryptedDatagramSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EncryptedDatagramSocket.cpp' object='amule-EncryptedDatagramSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-EncryptedDatagramSocket.obj `if test -f 'EncryptedDatagramSocket.cpp'; then $(CYGPATH_W) 'EncryptedDatagramSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EncryptedDatagramSocket.cpp'; fi`
 
 amule-ExternalConn.o: ExternalConn.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ExternalConn.o -MD -MP -MF "$(DEPDIR)/amule-ExternalConn.Tpo" -c -o amule-ExternalConn.o `test -f 'ExternalConn.cpp' || echo '$(srcdir)/'`ExternalConn.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ExternalConn.Tpo" "$(DEPDIR)/amule-ExternalConn.Po"; else rm -f "$(DEPDIR)/amule-ExternalConn.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ExternalConn.o -MD -MP -MF $(DEPDIR)/amule-ExternalConn.Tpo -c -o amule-ExternalConn.o `test -f 'ExternalConn.cpp' || echo '$(srcdir)/'`ExternalConn.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ExternalConn.Tpo $(DEPDIR)/amule-ExternalConn.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ExternalConn.cpp' object='amule-ExternalConn.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ExternalConn.o `test -f 'ExternalConn.cpp' || echo '$(srcdir)/'`ExternalConn.cpp
 
 amule-ExternalConn.obj: ExternalConn.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ExternalConn.obj -MD -MP -MF "$(DEPDIR)/amule-ExternalConn.Tpo" -c -o amule-ExternalConn.obj `if test -f 'ExternalConn.cpp'; then $(CYGPATH_W) 'ExternalConn.cpp'; else $(CYGPATH_W) '$(srcdir)/ExternalConn.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ExternalConn.Tpo" "$(DEPDIR)/amule-ExternalConn.Po"; else rm -f "$(DEPDIR)/amule-ExternalConn.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ExternalConn.obj -MD -MP -MF $(DEPDIR)/amule-ExternalConn.Tpo -c -o amule-ExternalConn.obj `if test -f 'ExternalConn.cpp'; then $(CYGPATH_W) 'ExternalConn.cpp'; else $(CYGPATH_W) '$(srcdir)/ExternalConn.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ExternalConn.Tpo $(DEPDIR)/amule-ExternalConn.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ExternalConn.cpp' object='amule-ExternalConn.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ExternalConn.obj `if test -f 'ExternalConn.cpp'; then $(CYGPATH_W) 'ExternalConn.cpp'; else $(CYGPATH_W) '$(srcdir)/ExternalConn.cpp'; fi`
 
-amule-Friend.o: Friend.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Friend.o -MD -MP -MF "$(DEPDIR)/amule-Friend.Tpo" -c -o amule-Friend.o `test -f 'Friend.cpp' || echo '$(srcdir)/'`Friend.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Friend.Tpo" "$(DEPDIR)/amule-Friend.Po"; else rm -f "$(DEPDIR)/amule-Friend.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Friend.cpp' object='amule-Friend.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Friend.o `test -f 'Friend.cpp' || echo '$(srcdir)/'`Friend.cpp
-
-amule-Friend.obj: Friend.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Friend.obj -MD -MP -MF "$(DEPDIR)/amule-Friend.Tpo" -c -o amule-Friend.obj `if test -f 'Friend.cpp'; then $(CYGPATH_W) 'Friend.cpp'; else $(CYGPATH_W) '$(srcdir)/Friend.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Friend.Tpo" "$(DEPDIR)/amule-Friend.Po"; else rm -f "$(DEPDIR)/amule-Friend.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Friend.cpp' object='amule-Friend.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Friend.obj `if test -f 'Friend.cpp'; then $(CYGPATH_W) 'Friend.cpp'; else $(CYGPATH_W) '$(srcdir)/Friend.cpp'; fi`
-
 amule-FriendList.o: FriendList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-FriendList.o -MD -MP -MF "$(DEPDIR)/amule-FriendList.Tpo" -c -o amule-FriendList.o `test -f 'FriendList.cpp' || echo '$(srcdir)/'`FriendList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-FriendList.Tpo" "$(DEPDIR)/amule-FriendList.Po"; else rm -f "$(DEPDIR)/amule-FriendList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-FriendList.o -MD -MP -MF $(DEPDIR)/amule-FriendList.Tpo -c -o amule-FriendList.o `test -f 'FriendList.cpp' || echo '$(srcdir)/'`FriendList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-FriendList.Tpo $(DEPDIR)/amule-FriendList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FriendList.cpp' object='amule-FriendList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-FriendList.o `test -f 'FriendList.cpp' || echo '$(srcdir)/'`FriendList.cpp
 
 amule-FriendList.obj: FriendList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-FriendList.obj -MD -MP -MF "$(DEPDIR)/amule-FriendList.Tpo" -c -o amule-FriendList.obj `if test -f 'FriendList.cpp'; then $(CYGPATH_W) 'FriendList.cpp'; else $(CYGPATH_W) '$(srcdir)/FriendList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-FriendList.Tpo" "$(DEPDIR)/amule-FriendList.Po"; else rm -f "$(DEPDIR)/amule-FriendList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-FriendList.obj -MD -MP -MF $(DEPDIR)/amule-FriendList.Tpo -c -o amule-FriendList.obj `if test -f 'FriendList.cpp'; then $(CYGPATH_W) 'FriendList.cpp'; else $(CYGPATH_W) '$(srcdir)/FriendList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-FriendList.Tpo $(DEPDIR)/amule-FriendList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FriendList.cpp' object='amule-FriendList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-FriendList.obj `if test -f 'FriendList.cpp'; then $(CYGPATH_W) 'FriendList.cpp'; else $(CYGPATH_W) '$(srcdir)/FriendList.cpp'; fi`
 
-amule-HTTPDownload.o: HTTPDownload.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-HTTPDownload.o -MD -MP -MF "$(DEPDIR)/amule-HTTPDownload.Tpo" -c -o amule-HTTPDownload.o `test -f 'HTTPDownload.cpp' || echo '$(srcdir)/'`HTTPDownload.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-HTTPDownload.Tpo" "$(DEPDIR)/amule-HTTPDownload.Po"; else rm -f "$(DEPDIR)/amule-HTTPDownload.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HTTPDownload.cpp' object='amule-HTTPDownload.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-HTTPDownload.o `test -f 'HTTPDownload.cpp' || echo '$(srcdir)/'`HTTPDownload.cpp
-
-amule-HTTPDownload.obj: HTTPDownload.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-HTTPDownload.obj -MD -MP -MF "$(DEPDIR)/amule-HTTPDownload.Tpo" -c -o amule-HTTPDownload.obj `if test -f 'HTTPDownload.cpp'; then $(CYGPATH_W) 'HTTPDownload.cpp'; else $(CYGPATH_W) '$(srcdir)/HTTPDownload.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-HTTPDownload.Tpo" "$(DEPDIR)/amule-HTTPDownload.Po"; else rm -f "$(DEPDIR)/amule-HTTPDownload.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HTTPDownload.cpp' object='amule-HTTPDownload.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-HTTPDownload.obj `if test -f 'HTTPDownload.cpp'; then $(CYGPATH_W) 'HTTPDownload.cpp'; else $(CYGPATH_W) '$(srcdir)/HTTPDownload.cpp'; fi`
-
 amule-IPFilter.o: IPFilter.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-IPFilter.o -MD -MP -MF "$(DEPDIR)/amule-IPFilter.Tpo" -c -o amule-IPFilter.o `test -f 'IPFilter.cpp' || echo '$(srcdir)/'`IPFilter.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-IPFilter.Tpo" "$(DEPDIR)/amule-IPFilter.Po"; else rm -f "$(DEPDIR)/amule-IPFilter.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-IPFilter.o -MD -MP -MF $(DEPDIR)/amule-IPFilter.Tpo -c -o amule-IPFilter.o `test -f 'IPFilter.cpp' || echo '$(srcdir)/'`IPFilter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-IPFilter.Tpo $(DEPDIR)/amule-IPFilter.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IPFilter.cpp' object='amule-IPFilter.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-IPFilter.o `test -f 'IPFilter.cpp' || echo '$(srcdir)/'`IPFilter.cpp
 
 amule-IPFilter.obj: IPFilter.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-IPFilter.obj -MD -MP -MF "$(DEPDIR)/amule-IPFilter.Tpo" -c -o amule-IPFilter.obj `if test -f 'IPFilter.cpp'; then $(CYGPATH_W) 'IPFilter.cpp'; else $(CYGPATH_W) '$(srcdir)/IPFilter.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-IPFilter.Tpo" "$(DEPDIR)/amule-IPFilter.Po"; else rm -f "$(DEPDIR)/amule-IPFilter.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-IPFilter.obj -MD -MP -MF $(DEPDIR)/amule-IPFilter.Tpo -c -o amule-IPFilter.obj `if test -f 'IPFilter.cpp'; then $(CYGPATH_W) 'IPFilter.cpp'; else $(CYGPATH_W) '$(srcdir)/IPFilter.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-IPFilter.Tpo $(DEPDIR)/amule-IPFilter.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IPFilter.cpp' object='amule-IPFilter.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-IPFilter.obj `if test -f 'IPFilter.cpp'; then $(CYGPATH_W) 'IPFilter.cpp'; else $(CYGPATH_W) '$(srcdir)/IPFilter.cpp'; fi`
 
 amule-KnownFileList.o: KnownFileList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KnownFileList.o -MD -MP -MF "$(DEPDIR)/amule-KnownFileList.Tpo" -c -o amule-KnownFileList.o `test -f 'KnownFileList.cpp' || echo '$(srcdir)/'`KnownFileList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-KnownFileList.Tpo" "$(DEPDIR)/amule-KnownFileList.Po"; else rm -f "$(DEPDIR)/amule-KnownFileList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KnownFileList.o -MD -MP -MF $(DEPDIR)/amule-KnownFileList.Tpo -c -o amule-KnownFileList.o `test -f 'KnownFileList.cpp' || echo '$(srcdir)/'`KnownFileList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-KnownFileList.Tpo $(DEPDIR)/amule-KnownFileList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KnownFileList.cpp' object='amule-KnownFileList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-KnownFileList.o `test -f 'KnownFileList.cpp' || echo '$(srcdir)/'`KnownFileList.cpp
 
 amule-KnownFileList.obj: KnownFileList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KnownFileList.obj -MD -MP -MF "$(DEPDIR)/amule-KnownFileList.Tpo" -c -o amule-KnownFileList.obj `if test -f 'KnownFileList.cpp'; then $(CYGPATH_W) 'KnownFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFileList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-KnownFileList.Tpo" "$(DEPDIR)/amule-KnownFileList.Po"; else rm -f "$(DEPDIR)/amule-KnownFileList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KnownFileList.obj -MD -MP -MF $(DEPDIR)/amule-KnownFileList.Tpo -c -o amule-KnownFileList.obj `if test -f 'KnownFileList.cpp'; then $(CYGPATH_W) 'KnownFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFileList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-KnownFileList.Tpo $(DEPDIR)/amule-KnownFileList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KnownFileList.cpp' object='amule-KnownFileList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-KnownFileList.obj `if test -f 'KnownFileList.cpp'; then $(CYGPATH_W) 'KnownFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFileList.cpp'; fi`
 
 amule-ListenSocket.o: ListenSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ListenSocket.o -MD -MP -MF "$(DEPDIR)/amule-ListenSocket.Tpo" -c -o amule-ListenSocket.o `test -f 'ListenSocket.cpp' || echo '$(srcdir)/'`ListenSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ListenSocket.Tpo" "$(DEPDIR)/amule-ListenSocket.Po"; else rm -f "$(DEPDIR)/amule-ListenSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ListenSocket.o -MD -MP -MF $(DEPDIR)/amule-ListenSocket.Tpo -c -o amule-ListenSocket.o `test -f 'ListenSocket.cpp' || echo '$(srcdir)/'`ListenSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ListenSocket.Tpo $(DEPDIR)/amule-ListenSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ListenSocket.cpp' object='amule-ListenSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ListenSocket.o `test -f 'ListenSocket.cpp' || echo '$(srcdir)/'`ListenSocket.cpp
 
 amule-ListenSocket.obj: ListenSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ListenSocket.obj -MD -MP -MF "$(DEPDIR)/amule-ListenSocket.Tpo" -c -o amule-ListenSocket.obj `if test -f 'ListenSocket.cpp'; then $(CYGPATH_W) 'ListenSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ListenSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ListenSocket.Tpo" "$(DEPDIR)/amule-ListenSocket.Po"; else rm -f "$(DEPDIR)/amule-ListenSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ListenSocket.obj -MD -MP -MF $(DEPDIR)/amule-ListenSocket.Tpo -c -o amule-ListenSocket.obj `if test -f 'ListenSocket.cpp'; then $(CYGPATH_W) 'ListenSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ListenSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ListenSocket.Tpo $(DEPDIR)/amule-ListenSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ListenSocket.cpp' object='amule-ListenSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ListenSocket.obj `if test -f 'ListenSocket.cpp'; then $(CYGPATH_W) 'ListenSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ListenSocket.cpp'; fi`
 
 amule-MuleUDPSocket.o: MuleUDPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-MuleUDPSocket.o -MD -MP -MF "$(DEPDIR)/amule-MuleUDPSocket.Tpo" -c -o amule-MuleUDPSocket.o `test -f 'MuleUDPSocket.cpp' || echo '$(srcdir)/'`MuleUDPSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-MuleUDPSocket.Tpo" "$(DEPDIR)/amule-MuleUDPSocket.Po"; else rm -f "$(DEPDIR)/amule-MuleUDPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-MuleUDPSocket.o -MD -MP -MF $(DEPDIR)/amule-MuleUDPSocket.Tpo -c -o amule-MuleUDPSocket.o `test -f 'MuleUDPSocket.cpp' || echo '$(srcdir)/'`MuleUDPSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-MuleUDPSocket.Tpo $(DEPDIR)/amule-MuleUDPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleUDPSocket.cpp' object='amule-MuleUDPSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-MuleUDPSocket.o `test -f 'MuleUDPSocket.cpp' || echo '$(srcdir)/'`MuleUDPSocket.cpp
 
 amule-MuleUDPSocket.obj: MuleUDPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-MuleUDPSocket.obj -MD -MP -MF "$(DEPDIR)/amule-MuleUDPSocket.Tpo" -c -o amule-MuleUDPSocket.obj `if test -f 'MuleUDPSocket.cpp'; then $(CYGPATH_W) 'MuleUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleUDPSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-MuleUDPSocket.Tpo" "$(DEPDIR)/amule-MuleUDPSocket.Po"; else rm -f "$(DEPDIR)/amule-MuleUDPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-MuleUDPSocket.obj -MD -MP -MF $(DEPDIR)/amule-MuleUDPSocket.Tpo -c -o amule-MuleUDPSocket.obj `if test -f 'MuleUDPSocket.cpp'; then $(CYGPATH_W) 'MuleUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleUDPSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-MuleUDPSocket.Tpo $(DEPDIR)/amule-MuleUDPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleUDPSocket.cpp' object='amule-MuleUDPSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-MuleUDPSocket.obj `if test -f 'MuleUDPSocket.cpp'; then $(CYGPATH_W) 'MuleUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleUDPSocket.cpp'; fi`
 
-amule-PartFileConvert.o: PartFileConvert.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PartFileConvert.o -MD -MP -MF "$(DEPDIR)/amule-PartFileConvert.Tpo" -c -o amule-PartFileConvert.o `test -f 'PartFileConvert.cpp' || echo '$(srcdir)/'`PartFileConvert.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-PartFileConvert.Tpo" "$(DEPDIR)/amule-PartFileConvert.Po"; else rm -f "$(DEPDIR)/amule-PartFileConvert.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFileConvert.cpp' object='amule-PartFileConvert.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PartFileConvert.o `test -f 'PartFileConvert.cpp' || echo '$(srcdir)/'`PartFileConvert.cpp
-
-amule-PartFileConvert.obj: PartFileConvert.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PartFileConvert.obj -MD -MP -MF "$(DEPDIR)/amule-PartFileConvert.Tpo" -c -o amule-PartFileConvert.obj `if test -f 'PartFileConvert.cpp'; then $(CYGPATH_W) 'PartFileConvert.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFileConvert.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-PartFileConvert.Tpo" "$(DEPDIR)/amule-PartFileConvert.Po"; else rm -f "$(DEPDIR)/amule-PartFileConvert.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFileConvert.cpp' object='amule-PartFileConvert.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PartFileConvert.obj `if test -f 'PartFileConvert.cpp'; then $(CYGPATH_W) 'PartFileConvert.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFileConvert.cpp'; fi`
-
 amule-SearchFile.o: SearchFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchFile.o -MD -MP -MF "$(DEPDIR)/amule-SearchFile.Tpo" -c -o amule-SearchFile.o `test -f 'SearchFile.cpp' || echo '$(srcdir)/'`SearchFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SearchFile.Tpo" "$(DEPDIR)/amule-SearchFile.Po"; else rm -f "$(DEPDIR)/amule-SearchFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchFile.o -MD -MP -MF $(DEPDIR)/amule-SearchFile.Tpo -c -o amule-SearchFile.o `test -f 'SearchFile.cpp' || echo '$(srcdir)/'`SearchFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SearchFile.Tpo $(DEPDIR)/amule-SearchFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchFile.cpp' object='amule-SearchFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SearchFile.o `test -f 'SearchFile.cpp' || echo '$(srcdir)/'`SearchFile.cpp
 
 amule-SearchFile.obj: SearchFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchFile.obj -MD -MP -MF "$(DEPDIR)/amule-SearchFile.Tpo" -c -o amule-SearchFile.obj `if test -f 'SearchFile.cpp'; then $(CYGPATH_W) 'SearchFile.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SearchFile.Tpo" "$(DEPDIR)/amule-SearchFile.Po"; else rm -f "$(DEPDIR)/amule-SearchFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchFile.obj -MD -MP -MF $(DEPDIR)/amule-SearchFile.Tpo -c -o amule-SearchFile.obj `if test -f 'SearchFile.cpp'; then $(CYGPATH_W) 'SearchFile.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SearchFile.Tpo $(DEPDIR)/amule-SearchFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchFile.cpp' object='amule-SearchFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SearchFile.obj `if test -f 'SearchFile.cpp'; then $(CYGPATH_W) 'SearchFile.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchFile.cpp'; fi`
 
 amule-SearchList.o: SearchList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchList.o -MD -MP -MF "$(DEPDIR)/amule-SearchList.Tpo" -c -o amule-SearchList.o `test -f 'SearchList.cpp' || echo '$(srcdir)/'`SearchList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SearchList.Tpo" "$(DEPDIR)/amule-SearchList.Po"; else rm -f "$(DEPDIR)/amule-SearchList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchList.o -MD -MP -MF $(DEPDIR)/amule-SearchList.Tpo -c -o amule-SearchList.o `test -f 'SearchList.cpp' || echo '$(srcdir)/'`SearchList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SearchList.Tpo $(DEPDIR)/amule-SearchList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchList.cpp' object='amule-SearchList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SearchList.o `test -f 'SearchList.cpp' || echo '$(srcdir)/'`SearchList.cpp
 
 amule-SearchList.obj: SearchList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchList.obj -MD -MP -MF "$(DEPDIR)/amule-SearchList.Tpo" -c -o amule-SearchList.obj `if test -f 'SearchList.cpp'; then $(CYGPATH_W) 'SearchList.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SearchList.Tpo" "$(DEPDIR)/amule-SearchList.Po"; else rm -f "$(DEPDIR)/amule-SearchList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchList.obj -MD -MP -MF $(DEPDIR)/amule-SearchList.Tpo -c -o amule-SearchList.obj `if test -f 'SearchList.cpp'; then $(CYGPATH_W) 'SearchList.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SearchList.Tpo $(DEPDIR)/amule-SearchList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchList.cpp' object='amule-SearchList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SearchList.obj `if test -f 'SearchList.cpp'; then $(CYGPATH_W) 'SearchList.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchList.cpp'; fi`
 
 amule-ServerConnect.o: ServerConnect.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerConnect.o -MD -MP -MF "$(DEPDIR)/amule-ServerConnect.Tpo" -c -o amule-ServerConnect.o `test -f 'ServerConnect.cpp' || echo '$(srcdir)/'`ServerConnect.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ServerConnect.Tpo" "$(DEPDIR)/amule-ServerConnect.Po"; else rm -f "$(DEPDIR)/amule-ServerConnect.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerConnect.o -MD -MP -MF $(DEPDIR)/amule-ServerConnect.Tpo -c -o amule-ServerConnect.o `test -f 'ServerConnect.cpp' || echo '$(srcdir)/'`ServerConnect.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ServerConnect.Tpo $(DEPDIR)/amule-ServerConnect.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerConnect.cpp' object='amule-ServerConnect.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ServerConnect.o `test -f 'ServerConnect.cpp' || echo '$(srcdir)/'`ServerConnect.cpp
 
 amule-ServerConnect.obj: ServerConnect.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerConnect.obj -MD -MP -MF "$(DEPDIR)/amule-ServerConnect.Tpo" -c -o amule-ServerConnect.obj `if test -f 'ServerConnect.cpp'; then $(CYGPATH_W) 'ServerConnect.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerConnect.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ServerConnect.Tpo" "$(DEPDIR)/amule-ServerConnect.Po"; else rm -f "$(DEPDIR)/amule-ServerConnect.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerConnect.obj -MD -MP -MF $(DEPDIR)/amule-ServerConnect.Tpo -c -o amule-ServerConnect.obj `if test -f 'ServerConnect.cpp'; then $(CYGPATH_W) 'ServerConnect.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerConnect.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ServerConnect.Tpo $(DEPDIR)/amule-ServerConnect.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerConnect.cpp' object='amule-ServerConnect.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ServerConnect.obj `if test -f 'ServerConnect.cpp'; then $(CYGPATH_W) 'ServerConnect.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerConnect.cpp'; fi`
 
 amule-ServerList.o: ServerList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerList.o -MD -MP -MF "$(DEPDIR)/amule-ServerList.Tpo" -c -o amule-ServerList.o `test -f 'ServerList.cpp' || echo '$(srcdir)/'`ServerList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ServerList.Tpo" "$(DEPDIR)/amule-ServerList.Po"; else rm -f "$(DEPDIR)/amule-ServerList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerList.o -MD -MP -MF $(DEPDIR)/amule-ServerList.Tpo -c -o amule-ServerList.o `test -f 'ServerList.cpp' || echo '$(srcdir)/'`ServerList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ServerList.Tpo $(DEPDIR)/amule-ServerList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerList.cpp' object='amule-ServerList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ServerList.o `test -f 'ServerList.cpp' || echo '$(srcdir)/'`ServerList.cpp
 
 amule-ServerList.obj: ServerList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerList.obj -MD -MP -MF "$(DEPDIR)/amule-ServerList.Tpo" -c -o amule-ServerList.obj `if test -f 'ServerList.cpp'; then $(CYGPATH_W) 'ServerList.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ServerList.Tpo" "$(DEPDIR)/amule-ServerList.Po"; else rm -f "$(DEPDIR)/amule-ServerList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerList.obj -MD -MP -MF $(DEPDIR)/amule-ServerList.Tpo -c -o amule-ServerList.obj `if test -f 'ServerList.cpp'; then $(CYGPATH_W) 'ServerList.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ServerList.Tpo $(DEPDIR)/amule-ServerList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerList.cpp' object='amule-ServerList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ServerList.obj `if test -f 'ServerList.cpp'; then $(CYGPATH_W) 'ServerList.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerList.cpp'; fi`
 
 amule-ServerSocket.o: ServerSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerSocket.o -MD -MP -MF "$(DEPDIR)/amule-ServerSocket.Tpo" -c -o amule-ServerSocket.o `test -f 'ServerSocket.cpp' || echo '$(srcdir)/'`ServerSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ServerSocket.Tpo" "$(DEPDIR)/amule-ServerSocket.Po"; else rm -f "$(DEPDIR)/amule-ServerSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerSocket.o -MD -MP -MF $(DEPDIR)/amule-ServerSocket.Tpo -c -o amule-ServerSocket.o `test -f 'ServerSocket.cpp' || echo '$(srcdir)/'`ServerSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ServerSocket.Tpo $(DEPDIR)/amule-ServerSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerSocket.cpp' object='amule-ServerSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ServerSocket.o `test -f 'ServerSocket.cpp' || echo '$(srcdir)/'`ServerSocket.cpp
 
 amule-ServerSocket.obj: ServerSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerSocket.obj -MD -MP -MF "$(DEPDIR)/amule-ServerSocket.Tpo" -c -o amule-ServerSocket.obj `if test -f 'ServerSocket.cpp'; then $(CYGPATH_W) 'ServerSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ServerSocket.Tpo" "$(DEPDIR)/amule-ServerSocket.Po"; else rm -f "$(DEPDIR)/amule-ServerSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerSocket.obj -MD -MP -MF $(DEPDIR)/amule-ServerSocket.Tpo -c -o amule-ServerSocket.obj `if test -f 'ServerSocket.cpp'; then $(CYGPATH_W) 'ServerSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ServerSocket.Tpo $(DEPDIR)/amule-ServerSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerSocket.cpp' object='amule-ServerSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ServerSocket.obj `if test -f 'ServerSocket.cpp'; then $(CYGPATH_W) 'ServerSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerSocket.cpp'; fi`
 
 amule-ServerUDPSocket.o: ServerUDPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerUDPSocket.o -MD -MP -MF "$(DEPDIR)/amule-ServerUDPSocket.Tpo" -c -o amule-ServerUDPSocket.o `test -f 'ServerUDPSocket.cpp' || echo '$(srcdir)/'`ServerUDPSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ServerUDPSocket.Tpo" "$(DEPDIR)/amule-ServerUDPSocket.Po"; else rm -f "$(DEPDIR)/amule-ServerUDPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerUDPSocket.o -MD -MP -MF $(DEPDIR)/amule-ServerUDPSocket.Tpo -c -o amule-ServerUDPSocket.o `test -f 'ServerUDPSocket.cpp' || echo '$(srcdir)/'`ServerUDPSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ServerUDPSocket.Tpo $(DEPDIR)/amule-ServerUDPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerUDPSocket.cpp' object='amule-ServerUDPSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ServerUDPSocket.o `test -f 'ServerUDPSocket.cpp' || echo '$(srcdir)/'`ServerUDPSocket.cpp
 
 amule-ServerUDPSocket.obj: ServerUDPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerUDPSocket.obj -MD -MP -MF "$(DEPDIR)/amule-ServerUDPSocket.Tpo" -c -o amule-ServerUDPSocket.obj `if test -f 'ServerUDPSocket.cpp'; then $(CYGPATH_W) 'ServerUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerUDPSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ServerUDPSocket.Tpo" "$(DEPDIR)/amule-ServerUDPSocket.Po"; else rm -f "$(DEPDIR)/amule-ServerUDPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerUDPSocket.obj -MD -MP -MF $(DEPDIR)/amule-ServerUDPSocket.Tpo -c -o amule-ServerUDPSocket.obj `if test -f 'ServerUDPSocket.cpp'; then $(CYGPATH_W) 'ServerUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerUDPSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ServerUDPSocket.Tpo $(DEPDIR)/amule-ServerUDPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerUDPSocket.cpp' object='amule-ServerUDPSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ServerUDPSocket.obj `if test -f 'ServerUDPSocket.cpp'; then $(CYGPATH_W) 'ServerUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerUDPSocket.cpp'; fi`
 
+amule-SHAHashSet.o: SHAHashSet.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SHAHashSet.o -MD -MP -MF $(DEPDIR)/amule-SHAHashSet.Tpo -c -o amule-SHAHashSet.o `test -f 'SHAHashSet.cpp' || echo '$(srcdir)/'`SHAHashSet.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SHAHashSet.Tpo $(DEPDIR)/amule-SHAHashSet.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SHAHashSet.cpp' object='amule-SHAHashSet.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SHAHashSet.o `test -f 'SHAHashSet.cpp' || echo '$(srcdir)/'`SHAHashSet.cpp
+
+amule-SHAHashSet.obj: SHAHashSet.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SHAHashSet.obj -MD -MP -MF $(DEPDIR)/amule-SHAHashSet.Tpo -c -o amule-SHAHashSet.obj `if test -f 'SHAHashSet.cpp'; then $(CYGPATH_W) 'SHAHashSet.cpp'; else $(CYGPATH_W) '$(srcdir)/SHAHashSet.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SHAHashSet.Tpo $(DEPDIR)/amule-SHAHashSet.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SHAHashSet.cpp' object='amule-SHAHashSet.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SHAHashSet.obj `if test -f 'SHAHashSet.cpp'; then $(CYGPATH_W) 'SHAHashSet.cpp'; else $(CYGPATH_W) '$(srcdir)/SHAHashSet.cpp'; fi`
+
 amule-SharedFileList.o: SharedFileList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFileList.o -MD -MP -MF "$(DEPDIR)/amule-SharedFileList.Tpo" -c -o amule-SharedFileList.o `test -f 'SharedFileList.cpp' || echo '$(srcdir)/'`SharedFileList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SharedFileList.Tpo" "$(DEPDIR)/amule-SharedFileList.Po"; else rm -f "$(DEPDIR)/amule-SharedFileList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFileList.o -MD -MP -MF $(DEPDIR)/amule-SharedFileList.Tpo -c -o amule-SharedFileList.o `test -f 'SharedFileList.cpp' || echo '$(srcdir)/'`SharedFileList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SharedFileList.Tpo $(DEPDIR)/amule-SharedFileList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFileList.cpp' object='amule-SharedFileList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SharedFileList.o `test -f 'SharedFileList.cpp' || echo '$(srcdir)/'`SharedFileList.cpp
 
 amule-SharedFileList.obj: SharedFileList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFileList.obj -MD -MP -MF "$(DEPDIR)/amule-SharedFileList.Tpo" -c -o amule-SharedFileList.obj `if test -f 'SharedFileList.cpp'; then $(CYGPATH_W) 'SharedFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFileList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SharedFileList.Tpo" "$(DEPDIR)/amule-SharedFileList.Po"; else rm -f "$(DEPDIR)/amule-SharedFileList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFileList.obj -MD -MP -MF $(DEPDIR)/amule-SharedFileList.Tpo -c -o amule-SharedFileList.obj `if test -f 'SharedFileList.cpp'; then $(CYGPATH_W) 'SharedFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFileList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SharedFileList.Tpo $(DEPDIR)/amule-SharedFileList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFileList.cpp' object='amule-SharedFileList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SharedFileList.obj `if test -f 'SharedFileList.cpp'; then $(CYGPATH_W) 'SharedFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFileList.cpp'; fi`
 
 amule-ThreadTasks.o: ThreadTasks.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ThreadTasks.o -MD -MP -MF "$(DEPDIR)/amule-ThreadTasks.Tpo" -c -o amule-ThreadTasks.o `test -f 'ThreadTasks.cpp' || echo '$(srcdir)/'`ThreadTasks.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ThreadTasks.Tpo" "$(DEPDIR)/amule-ThreadTasks.Po"; else rm -f "$(DEPDIR)/amule-ThreadTasks.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ThreadTasks.o -MD -MP -MF $(DEPDIR)/amule-ThreadTasks.Tpo -c -o amule-ThreadTasks.o `test -f 'ThreadTasks.cpp' || echo '$(srcdir)/'`ThreadTasks.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ThreadTasks.Tpo $(DEPDIR)/amule-ThreadTasks.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ThreadTasks.cpp' object='amule-ThreadTasks.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ThreadTasks.o `test -f 'ThreadTasks.cpp' || echo '$(srcdir)/'`ThreadTasks.cpp
 
 amule-ThreadTasks.obj: ThreadTasks.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ThreadTasks.obj -MD -MP -MF "$(DEPDIR)/amule-ThreadTasks.Tpo" -c -o amule-ThreadTasks.obj `if test -f 'ThreadTasks.cpp'; then $(CYGPATH_W) 'ThreadTasks.cpp'; else $(CYGPATH_W) '$(srcdir)/ThreadTasks.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ThreadTasks.Tpo" "$(DEPDIR)/amule-ThreadTasks.Po"; else rm -f "$(DEPDIR)/amule-ThreadTasks.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ThreadTasks.obj -MD -MP -MF $(DEPDIR)/amule-ThreadTasks.Tpo -c -o amule-ThreadTasks.obj `if test -f 'ThreadTasks.cpp'; then $(CYGPATH_W) 'ThreadTasks.cpp'; else $(CYGPATH_W) '$(srcdir)/ThreadTasks.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ThreadTasks.Tpo $(DEPDIR)/amule-ThreadTasks.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ThreadTasks.cpp' object='amule-ThreadTasks.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ThreadTasks.obj `if test -f 'ThreadTasks.cpp'; then $(CYGPATH_W) 'ThreadTasks.cpp'; else $(CYGPATH_W) '$(srcdir)/ThreadTasks.cpp'; fi`
 
 amule-UploadBandwidthThrottler.o: UploadBandwidthThrottler.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UploadBandwidthThrottler.o -MD -MP -MF "$(DEPDIR)/amule-UploadBandwidthThrottler.Tpo" -c -o amule-UploadBandwidthThrottler.o `test -f 'UploadBandwidthThrottler.cpp' || echo '$(srcdir)/'`UploadBandwidthThrottler.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UploadBandwidthThrottler.Tpo" "$(DEPDIR)/amule-UploadBandwidthThrottler.Po"; else rm -f "$(DEPDIR)/amule-UploadBandwidthThrottler.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UploadBandwidthThrottler.o -MD -MP -MF $(DEPDIR)/amule-UploadBandwidthThrottler.Tpo -c -o amule-UploadBandwidthThrottler.o `test -f 'UploadBandwidthThrottler.cpp' || echo '$(srcdir)/'`UploadBandwidthThrottler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-UploadBandwidthThrottler.Tpo $(DEPDIR)/amule-UploadBandwidthThrottler.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UploadBandwidthThrottler.cpp' object='amule-UploadBandwidthThrottler.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UploadBandwidthThrottler.o `test -f 'UploadBandwidthThrottler.cpp' || echo '$(srcdir)/'`UploadBandwidthThrottler.cpp
 
 amule-UploadBandwidthThrottler.obj: UploadBandwidthThrottler.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UploadBandwidthThrottler.obj -MD -MP -MF "$(DEPDIR)/amule-UploadBandwidthThrottler.Tpo" -c -o amule-UploadBandwidthThrottler.obj `if test -f 'UploadBandwidthThrottler.cpp'; then $(CYGPATH_W) 'UploadBandwidthThrottler.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadBandwidthThrottler.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UploadBandwidthThrottler.Tpo" "$(DEPDIR)/amule-UploadBandwidthThrottler.Po"; else rm -f "$(DEPDIR)/amule-UploadBandwidthThrottler.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UploadBandwidthThrottler.obj -MD -MP -MF $(DEPDIR)/amule-UploadBandwidthThrottler.Tpo -c -o amule-UploadBandwidthThrottler.obj `if test -f 'UploadBandwidthThrottler.cpp'; then $(CYGPATH_W) 'UploadBandwidthThrottler.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadBandwidthThrottler.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-UploadBandwidthThrottler.Tpo $(DEPDIR)/amule-UploadBandwidthThrottler.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UploadBandwidthThrottler.cpp' object='amule-UploadBandwidthThrottler.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UploadBandwidthThrottler.obj `if test -f 'UploadBandwidthThrottler.cpp'; then $(CYGPATH_W) 'UploadBandwidthThrottler.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadBandwidthThrottler.cpp'; fi`
 
 amule-UploadClient.o: UploadClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UploadClient.o -MD -MP -MF "$(DEPDIR)/amule-UploadClient.Tpo" -c -o amule-UploadClient.o `test -f 'UploadClient.cpp' || echo '$(srcdir)/'`UploadClient.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UploadClient.Tpo" "$(DEPDIR)/amule-UploadClient.Po"; else rm -f "$(DEPDIR)/amule-UploadClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UploadClient.o -MD -MP -MF $(DEPDIR)/amule-UploadClient.Tpo -c -o amule-UploadClient.o `test -f 'UploadClient.cpp' || echo '$(srcdir)/'`UploadClient.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-UploadClient.Tpo $(DEPDIR)/amule-UploadClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UploadClient.cpp' object='amule-UploadClient.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UploadClient.o `test -f 'UploadClient.cpp' || echo '$(srcdir)/'`UploadClient.cpp
 
 amule-UploadClient.obj: UploadClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UploadClient.obj -MD -MP -MF "$(DEPDIR)/amule-UploadClient.Tpo" -c -o amule-UploadClient.obj `if test -f 'UploadClient.cpp'; then $(CYGPATH_W) 'UploadClient.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadClient.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UploadClient.Tpo" "$(DEPDIR)/amule-UploadClient.Po"; else rm -f "$(DEPDIR)/amule-UploadClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UploadClient.obj -MD -MP -MF $(DEPDIR)/amule-UploadClient.Tpo -c -o amule-UploadClient.obj `if test -f 'UploadClient.cpp'; then $(CYGPATH_W) 'UploadClient.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadClient.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-UploadClient.Tpo $(DEPDIR)/amule-UploadClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UploadClient.cpp' object='amule-UploadClient.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UploadClient.obj `if test -f 'UploadClient.cpp'; then $(CYGPATH_W) 'UploadClient.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadClient.cpp'; fi`
 
 amule-UploadQueue.o: UploadQueue.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UploadQueue.o -MD -MP -MF "$(DEPDIR)/amule-UploadQueue.Tpo" -c -o amule-UploadQueue.o `test -f 'UploadQueue.cpp' || echo '$(srcdir)/'`UploadQueue.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UploadQueue.Tpo" "$(DEPDIR)/amule-UploadQueue.Po"; else rm -f "$(DEPDIR)/amule-UploadQueue.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UploadQueue.o -MD -MP -MF $(DEPDIR)/amule-UploadQueue.Tpo -c -o amule-UploadQueue.o `test -f 'UploadQueue.cpp' || echo '$(srcdir)/'`UploadQueue.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-UploadQueue.Tpo $(DEPDIR)/amule-UploadQueue.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UploadQueue.cpp' object='amule-UploadQueue.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UploadQueue.o `test -f 'UploadQueue.cpp' || echo '$(srcdir)/'`UploadQueue.cpp
 
 amule-UploadQueue.obj: UploadQueue.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UploadQueue.obj -MD -MP -MF "$(DEPDIR)/amule-UploadQueue.Tpo" -c -o amule-UploadQueue.obj `if test -f 'UploadQueue.cpp'; then $(CYGPATH_W) 'UploadQueue.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadQueue.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UploadQueue.Tpo" "$(DEPDIR)/amule-UploadQueue.Po"; else rm -f "$(DEPDIR)/amule-UploadQueue.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UploadQueue.obj -MD -MP -MF $(DEPDIR)/amule-UploadQueue.Tpo -c -o amule-UploadQueue.obj `if test -f 'UploadQueue.cpp'; then $(CYGPATH_W) 'UploadQueue.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadQueue.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-UploadQueue.Tpo $(DEPDIR)/amule-UploadQueue.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UploadQueue.cpp' object='amule-UploadQueue.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UploadQueue.obj `if test -f 'UploadQueue.cpp'; then $(CYGPATH_W) 'UploadQueue.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadQueue.cpp'; fi`
 
 amule-Indexed.o: kademlia/kademlia/Indexed.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Indexed.o -MD -MP -MF "$(DEPDIR)/amule-Indexed.Tpo" -c -o amule-Indexed.o `test -f 'kademlia/kademlia/Indexed.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Indexed.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Indexed.Tpo" "$(DEPDIR)/amule-Indexed.Po"; else rm -f "$(DEPDIR)/amule-Indexed.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Indexed.o -MD -MP -MF $(DEPDIR)/amule-Indexed.Tpo -c -o amule-Indexed.o `test -f 'kademlia/kademlia/Indexed.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Indexed.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Indexed.Tpo $(DEPDIR)/amule-Indexed.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Indexed.cpp' object='amule-Indexed.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Indexed.o `test -f 'kademlia/kademlia/Indexed.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Indexed.cpp
 
 amule-Indexed.obj: kademlia/kademlia/Indexed.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Indexed.obj -MD -MP -MF "$(DEPDIR)/amule-Indexed.Tpo" -c -o amule-Indexed.obj `if test -f 'kademlia/kademlia/Indexed.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Indexed.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Indexed.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Indexed.Tpo" "$(DEPDIR)/amule-Indexed.Po"; else rm -f "$(DEPDIR)/amule-Indexed.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Indexed.obj -MD -MP -MF $(DEPDIR)/amule-Indexed.Tpo -c -o amule-Indexed.obj `if test -f 'kademlia/kademlia/Indexed.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Indexed.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Indexed.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Indexed.Tpo $(DEPDIR)/amule-Indexed.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Indexed.cpp' object='amule-Indexed.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Indexed.obj `if test -f 'kademlia/kademlia/Indexed.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Indexed.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Indexed.cpp'; fi`
 
 amule-Kademlia.o: kademlia/kademlia/Kademlia.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Kademlia.o -MD -MP -MF "$(DEPDIR)/amule-Kademlia.Tpo" -c -o amule-Kademlia.o `test -f 'kademlia/kademlia/Kademlia.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Kademlia.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Kademlia.Tpo" "$(DEPDIR)/amule-Kademlia.Po"; else rm -f "$(DEPDIR)/amule-Kademlia.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Kademlia.o -MD -MP -MF $(DEPDIR)/amule-Kademlia.Tpo -c -o amule-Kademlia.o `test -f 'kademlia/kademlia/Kademlia.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Kademlia.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Kademlia.Tpo $(DEPDIR)/amule-Kademlia.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Kademlia.cpp' object='amule-Kademlia.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Kademlia.o `test -f 'kademlia/kademlia/Kademlia.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Kademlia.cpp
 
 amule-Kademlia.obj: kademlia/kademlia/Kademlia.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Kademlia.obj -MD -MP -MF "$(DEPDIR)/amule-Kademlia.Tpo" -c -o amule-Kademlia.obj `if test -f 'kademlia/kademlia/Kademlia.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Kademlia.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Kademlia.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Kademlia.Tpo" "$(DEPDIR)/amule-Kademlia.Po"; else rm -f "$(DEPDIR)/amule-Kademlia.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Kademlia.obj -MD -MP -MF $(DEPDIR)/amule-Kademlia.Tpo -c -o amule-Kademlia.obj `if test -f 'kademlia/kademlia/Kademlia.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Kademlia.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Kademlia.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Kademlia.Tpo $(DEPDIR)/amule-Kademlia.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Kademlia.cpp' object='amule-Kademlia.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Kademlia.obj `if test -f 'kademlia/kademlia/Kademlia.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Kademlia.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Kademlia.cpp'; fi`
 
 amule-Prefs.o: kademlia/kademlia/Prefs.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Prefs.o -MD -MP -MF "$(DEPDIR)/amule-Prefs.Tpo" -c -o amule-Prefs.o `test -f 'kademlia/kademlia/Prefs.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Prefs.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Prefs.Tpo" "$(DEPDIR)/amule-Prefs.Po"; else rm -f "$(DEPDIR)/amule-Prefs.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Prefs.o -MD -MP -MF $(DEPDIR)/amule-Prefs.Tpo -c -o amule-Prefs.o `test -f 'kademlia/kademlia/Prefs.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Prefs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Prefs.Tpo $(DEPDIR)/amule-Prefs.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Prefs.cpp' object='amule-Prefs.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Prefs.o `test -f 'kademlia/kademlia/Prefs.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Prefs.cpp
 
 amule-Prefs.obj: kademlia/kademlia/Prefs.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Prefs.obj -MD -MP -MF "$(DEPDIR)/amule-Prefs.Tpo" -c -o amule-Prefs.obj `if test -f 'kademlia/kademlia/Prefs.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Prefs.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Prefs.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Prefs.Tpo" "$(DEPDIR)/amule-Prefs.Po"; else rm -f "$(DEPDIR)/amule-Prefs.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Prefs.obj -MD -MP -MF $(DEPDIR)/amule-Prefs.Tpo -c -o amule-Prefs.obj `if test -f 'kademlia/kademlia/Prefs.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Prefs.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Prefs.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Prefs.Tpo $(DEPDIR)/amule-Prefs.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Prefs.cpp' object='amule-Prefs.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Prefs.obj `if test -f 'kademlia/kademlia/Prefs.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Prefs.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Prefs.cpp'; fi`
 
 amule-Search.o: kademlia/kademlia/Search.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Search.o -MD -MP -MF "$(DEPDIR)/amule-Search.Tpo" -c -o amule-Search.o `test -f 'kademlia/kademlia/Search.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Search.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Search.Tpo" "$(DEPDIR)/amule-Search.Po"; else rm -f "$(DEPDIR)/amule-Search.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Search.o -MD -MP -MF $(DEPDIR)/amule-Search.Tpo -c -o amule-Search.o `test -f 'kademlia/kademlia/Search.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Search.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Search.Tpo $(DEPDIR)/amule-Search.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Search.cpp' object='amule-Search.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Search.o `test -f 'kademlia/kademlia/Search.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Search.cpp
 
 amule-Search.obj: kademlia/kademlia/Search.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Search.obj -MD -MP -MF "$(DEPDIR)/amule-Search.Tpo" -c -o amule-Search.obj `if test -f 'kademlia/kademlia/Search.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Search.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Search.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Search.Tpo" "$(DEPDIR)/amule-Search.Po"; else rm -f "$(DEPDIR)/amule-Search.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Search.obj -MD -MP -MF $(DEPDIR)/amule-Search.Tpo -c -o amule-Search.obj `if test -f 'kademlia/kademlia/Search.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Search.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Search.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Search.Tpo $(DEPDIR)/amule-Search.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Search.cpp' object='amule-Search.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Search.obj `if test -f 'kademlia/kademlia/Search.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Search.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Search.cpp'; fi`
 
 amule-UDPFirewallTester.o: kademlia/kademlia/UDPFirewallTester.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UDPFirewallTester.o -MD -MP -MF "$(DEPDIR)/amule-UDPFirewallTester.Tpo" -c -o amule-UDPFirewallTester.o `test -f 'kademlia/kademlia/UDPFirewallTester.cpp' || echo '$(srcdir)/'`kademlia/kademlia/UDPFirewallTester.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UDPFirewallTester.Tpo" "$(DEPDIR)/amule-UDPFirewallTester.Po"; else rm -f "$(DEPDIR)/amule-UDPFirewallTester.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UDPFirewallTester.o -MD -MP -MF $(DEPDIR)/amule-UDPFirewallTester.Tpo -c -o amule-UDPFirewallTester.o `test -f 'kademlia/kademlia/UDPFirewallTester.cpp' || echo '$(srcdir)/'`kademlia/kademlia/UDPFirewallTester.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-UDPFirewallTester.Tpo $(DEPDIR)/amule-UDPFirewallTester.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/UDPFirewallTester.cpp' object='amule-UDPFirewallTester.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UDPFirewallTester.o `test -f 'kademlia/kademlia/UDPFirewallTester.cpp' || echo '$(srcdir)/'`kademlia/kademlia/UDPFirewallTester.cpp
 
 amule-UDPFirewallTester.obj: kademlia/kademlia/UDPFirewallTester.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UDPFirewallTester.obj -MD -MP -MF "$(DEPDIR)/amule-UDPFirewallTester.Tpo" -c -o amule-UDPFirewallTester.obj `if test -f 'kademlia/kademlia/UDPFirewallTester.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/UDPFirewallTester.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/UDPFirewallTester.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UDPFirewallTester.Tpo" "$(DEPDIR)/amule-UDPFirewallTester.Po"; else rm -f "$(DEPDIR)/amule-UDPFirewallTester.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UDPFirewallTester.obj -MD -MP -MF $(DEPDIR)/amule-UDPFirewallTester.Tpo -c -o amule-UDPFirewallTester.obj `if test -f 'kademlia/kademlia/UDPFirewallTester.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/UDPFirewallTester.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/UDPFirewallTester.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-UDPFirewallTester.Tpo $(DEPDIR)/amule-UDPFirewallTester.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/UDPFirewallTester.cpp' object='amule-UDPFirewallTester.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UDPFirewallTester.obj `if test -f 'kademlia/kademlia/UDPFirewallTester.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/UDPFirewallTester.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/UDPFirewallTester.cpp'; fi`
 
 amule-KademliaUDPListener.o: kademlia/net/KademliaUDPListener.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KademliaUDPListener.o -MD -MP -MF "$(DEPDIR)/amule-KademliaUDPListener.Tpo" -c -o amule-KademliaUDPListener.o `test -f 'kademlia/net/KademliaUDPListener.cpp' || echo '$(srcdir)/'`kademlia/net/KademliaUDPListener.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-KademliaUDPListener.Tpo" "$(DEPDIR)/amule-KademliaUDPListener.Po"; else rm -f "$(DEPDIR)/amule-KademliaUDPListener.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KademliaUDPListener.o -MD -MP -MF $(DEPDIR)/amule-KademliaUDPListener.Tpo -c -o amule-KademliaUDPListener.o `test -f 'kademlia/net/KademliaUDPListener.cpp' || echo '$(srcdir)/'`kademlia/net/KademliaUDPListener.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-KademliaUDPListener.Tpo $(DEPDIR)/amule-KademliaUDPListener.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/net/KademliaUDPListener.cpp' object='amule-KademliaUDPListener.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-KademliaUDPListener.o `test -f 'kademlia/net/KademliaUDPListener.cpp' || echo '$(srcdir)/'`kademlia/net/KademliaUDPListener.cpp
 
 amule-KademliaUDPListener.obj: kademlia/net/KademliaUDPListener.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KademliaUDPListener.obj -MD -MP -MF "$(DEPDIR)/amule-KademliaUDPListener.Tpo" -c -o amule-KademliaUDPListener.obj `if test -f 'kademlia/net/KademliaUDPListener.cpp'; then $(CYGPATH_W) 'kademlia/net/KademliaUDPListener.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/net/KademliaUDPListener.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-KademliaUDPListener.Tpo" "$(DEPDIR)/amule-KademliaUDPListener.Po"; else rm -f "$(DEPDIR)/amule-KademliaUDPListener.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KademliaUDPListener.obj -MD -MP -MF $(DEPDIR)/amule-KademliaUDPListener.Tpo -c -o amule-KademliaUDPListener.obj `if test -f 'kademlia/net/KademliaUDPListener.cpp'; then $(CYGPATH_W) 'kademlia/net/KademliaUDPListener.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/net/KademliaUDPListener.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-KademliaUDPListener.Tpo $(DEPDIR)/amule-KademliaUDPListener.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/net/KademliaUDPListener.cpp' object='amule-KademliaUDPListener.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-KademliaUDPListener.obj `if test -f 'kademlia/net/KademliaUDPListener.cpp'; then $(CYGPATH_W) 'kademlia/net/KademliaUDPListener.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/net/KademliaUDPListener.cpp'; fi`
 
 amule-PacketTracking.o: kademlia/net/PacketTracking.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PacketTracking.o -MD -MP -MF "$(DEPDIR)/amule-PacketTracking.Tpo" -c -o amule-PacketTracking.o `test -f 'kademlia/net/PacketTracking.cpp' || echo '$(srcdir)/'`kademlia/net/PacketTracking.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-PacketTracking.Tpo" "$(DEPDIR)/amule-PacketTracking.Po"; else rm -f "$(DEPDIR)/amule-PacketTracking.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PacketTracking.o -MD -MP -MF $(DEPDIR)/amule-PacketTracking.Tpo -c -o amule-PacketTracking.o `test -f 'kademlia/net/PacketTracking.cpp' || echo '$(srcdir)/'`kademlia/net/PacketTracking.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-PacketTracking.Tpo $(DEPDIR)/amule-PacketTracking.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/net/PacketTracking.cpp' object='amule-PacketTracking.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PacketTracking.o `test -f 'kademlia/net/PacketTracking.cpp' || echo '$(srcdir)/'`kademlia/net/PacketTracking.cpp
 
 amule-PacketTracking.obj: kademlia/net/PacketTracking.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PacketTracking.obj -MD -MP -MF "$(DEPDIR)/amule-PacketTracking.Tpo" -c -o amule-PacketTracking.obj `if test -f 'kademlia/net/PacketTracking.cpp'; then $(CYGPATH_W) 'kademlia/net/PacketTracking.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/net/PacketTracking.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-PacketTracking.Tpo" "$(DEPDIR)/amule-PacketTracking.Po"; else rm -f "$(DEPDIR)/amule-PacketTracking.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PacketTracking.obj -MD -MP -MF $(DEPDIR)/amule-PacketTracking.Tpo -c -o amule-PacketTracking.obj `if test -f 'kademlia/net/PacketTracking.cpp'; then $(CYGPATH_W) 'kademlia/net/PacketTracking.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/net/PacketTracking.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-PacketTracking.Tpo $(DEPDIR)/amule-PacketTracking.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/net/PacketTracking.cpp' object='amule-PacketTracking.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PacketTracking.obj `if test -f 'kademlia/net/PacketTracking.cpp'; then $(CYGPATH_W) 'kademlia/net/PacketTracking.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/net/PacketTracking.cpp'; fi`
 
 amule-Contact.o: kademlia/routing/Contact.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Contact.o -MD -MP -MF "$(DEPDIR)/amule-Contact.Tpo" -c -o amule-Contact.o `test -f 'kademlia/routing/Contact.cpp' || echo '$(srcdir)/'`kademlia/routing/Contact.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Contact.Tpo" "$(DEPDIR)/amule-Contact.Po"; else rm -f "$(DEPDIR)/amule-Contact.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Contact.o -MD -MP -MF $(DEPDIR)/amule-Contact.Tpo -c -o amule-Contact.o `test -f 'kademlia/routing/Contact.cpp' || echo '$(srcdir)/'`kademlia/routing/Contact.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Contact.Tpo $(DEPDIR)/amule-Contact.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/routing/Contact.cpp' object='amule-Contact.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Contact.o `test -f 'kademlia/routing/Contact.cpp' || echo '$(srcdir)/'`kademlia/routing/Contact.cpp
 
 amule-Contact.obj: kademlia/routing/Contact.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Contact.obj -MD -MP -MF "$(DEPDIR)/amule-Contact.Tpo" -c -o amule-Contact.obj `if test -f 'kademlia/routing/Contact.cpp'; then $(CYGPATH_W) 'kademlia/routing/Contact.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/Contact.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Contact.Tpo" "$(DEPDIR)/amule-Contact.Po"; else rm -f "$(DEPDIR)/amule-Contact.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Contact.obj -MD -MP -MF $(DEPDIR)/amule-Contact.Tpo -c -o amule-Contact.obj `if test -f 'kademlia/routing/Contact.cpp'; then $(CYGPATH_W) 'kademlia/routing/Contact.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/Contact.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Contact.Tpo $(DEPDIR)/amule-Contact.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/routing/Contact.cpp' object='amule-Contact.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Contact.obj `if test -f 'kademlia/routing/Contact.cpp'; then $(CYGPATH_W) 'kademlia/routing/Contact.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/Contact.cpp'; fi`
 
 amule-RoutingZone.o: kademlia/routing/RoutingZone.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-RoutingZone.o -MD -MP -MF "$(DEPDIR)/amule-RoutingZone.Tpo" -c -o amule-RoutingZone.o `test -f 'kademlia/routing/RoutingZone.cpp' || echo '$(srcdir)/'`kademlia/routing/RoutingZone.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-RoutingZone.Tpo" "$(DEPDIR)/amule-RoutingZone.Po"; else rm -f "$(DEPDIR)/amule-RoutingZone.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-RoutingZone.o -MD -MP -MF $(DEPDIR)/amule-RoutingZone.Tpo -c -o amule-RoutingZone.o `test -f 'kademlia/routing/RoutingZone.cpp' || echo '$(srcdir)/'`kademlia/routing/RoutingZone.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-RoutingZone.Tpo $(DEPDIR)/amule-RoutingZone.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/routing/RoutingZone.cpp' object='amule-RoutingZone.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-RoutingZone.o `test -f 'kademlia/routing/RoutingZone.cpp' || echo '$(srcdir)/'`kademlia/routing/RoutingZone.cpp
 
 amule-RoutingZone.obj: kademlia/routing/RoutingZone.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-RoutingZone.obj -MD -MP -MF "$(DEPDIR)/amule-RoutingZone.Tpo" -c -o amule-RoutingZone.obj `if test -f 'kademlia/routing/RoutingZone.cpp'; then $(CYGPATH_W) 'kademlia/routing/RoutingZone.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/RoutingZone.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-RoutingZone.Tpo" "$(DEPDIR)/amule-RoutingZone.Po"; else rm -f "$(DEPDIR)/amule-RoutingZone.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-RoutingZone.obj -MD -MP -MF $(DEPDIR)/amule-RoutingZone.Tpo -c -o amule-RoutingZone.obj `if test -f 'kademlia/routing/RoutingZone.cpp'; then $(CYGPATH_W) 'kademlia/routing/RoutingZone.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/RoutingZone.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-RoutingZone.Tpo $(DEPDIR)/amule-RoutingZone.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/routing/RoutingZone.cpp' object='amule-RoutingZone.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-RoutingZone.obj `if test -f 'kademlia/routing/RoutingZone.cpp'; then $(CYGPATH_W) 'kademlia/routing/RoutingZone.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/RoutingZone.cpp'; fi`
 
-amule-UPnPBase.o: UPnPBase.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UPnPBase.o -MD -MP -MF "$(DEPDIR)/amule-UPnPBase.Tpo" -c -o amule-UPnPBase.o `test -f 'UPnPBase.cpp' || echo '$(srcdir)/'`UPnPBase.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UPnPBase.Tpo" "$(DEPDIR)/amule-UPnPBase.Po"; else rm -f "$(DEPDIR)/amule-UPnPBase.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UPnPBase.cpp' object='amule-UPnPBase.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UPnPBase.o `test -f 'UPnPBase.cpp' || echo '$(srcdir)/'`UPnPBase.cpp
-
-amule-UPnPBase.obj: UPnPBase.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UPnPBase.obj -MD -MP -MF "$(DEPDIR)/amule-UPnPBase.Tpo" -c -o amule-UPnPBase.obj `if test -f 'UPnPBase.cpp'; then $(CYGPATH_W) 'UPnPBase.cpp'; else $(CYGPATH_W) '$(srcdir)/UPnPBase.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UPnPBase.Tpo" "$(DEPDIR)/amule-UPnPBase.Po"; else rm -f "$(DEPDIR)/amule-UPnPBase.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UPnPBase.cpp' object='amule-UPnPBase.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UPnPBase.obj `if test -f 'UPnPBase.cpp'; then $(CYGPATH_W) 'UPnPBase.cpp'; else $(CYGPATH_W) '$(srcdir)/UPnPBase.cpp'; fi`
-
-amule-UPnPCompatibility.o: UPnPCompatibility.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UPnPCompatibility.o -MD -MP -MF "$(DEPDIR)/amule-UPnPCompatibility.Tpo" -c -o amule-UPnPCompatibility.o `test -f 'UPnPCompatibility.cpp' || echo '$(srcdir)/'`UPnPCompatibility.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UPnPCompatibility.Tpo" "$(DEPDIR)/amule-UPnPCompatibility.Po"; else rm -f "$(DEPDIR)/amule-UPnPCompatibility.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UPnPCompatibility.cpp' object='amule-UPnPCompatibility.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UPnPCompatibility.o `test -f 'UPnPCompatibility.cpp' || echo '$(srcdir)/'`UPnPCompatibility.cpp
-
-amule-UPnPCompatibility.obj: UPnPCompatibility.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UPnPCompatibility.obj -MD -MP -MF "$(DEPDIR)/amule-UPnPCompatibility.Tpo" -c -o amule-UPnPCompatibility.obj `if test -f 'UPnPCompatibility.cpp'; then $(CYGPATH_W) 'UPnPCompatibility.cpp'; else $(CYGPATH_W) '$(srcdir)/UPnPCompatibility.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UPnPCompatibility.Tpo" "$(DEPDIR)/amule-UPnPCompatibility.Po"; else rm -f "$(DEPDIR)/amule-UPnPCompatibility.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UPnPCompatibility.cpp' object='amule-UPnPCompatibility.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UPnPCompatibility.obj `if test -f 'UPnPCompatibility.cpp'; then $(CYGPATH_W) 'UPnPCompatibility.cpp'; else $(CYGPATH_W) '$(srcdir)/UPnPCompatibility.cpp'; fi`
-
 amule-amule-gui.o: amule-gui.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amule-gui.o -MD -MP -MF "$(DEPDIR)/amule-amule-gui.Tpo" -c -o amule-amule-gui.o `test -f 'amule-gui.cpp' || echo '$(srcdir)/'`amule-gui.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-amule-gui.Tpo" "$(DEPDIR)/amule-amule-gui.Po"; else rm -f "$(DEPDIR)/amule-amule-gui.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amule-gui.o -MD -MP -MF $(DEPDIR)/amule-amule-gui.Tpo -c -o amule-amule-gui.o `test -f 'amule-gui.cpp' || echo '$(srcdir)/'`amule-gui.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-amule-gui.Tpo $(DEPDIR)/amule-amule-gui.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amule-gui.cpp' object='amule-amule-gui.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-amule-gui.o `test -f 'amule-gui.cpp' || echo '$(srcdir)/'`amule-gui.cpp
 
 amule-amule-gui.obj: amule-gui.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amule-gui.obj -MD -MP -MF "$(DEPDIR)/amule-amule-gui.Tpo" -c -o amule-amule-gui.obj `if test -f 'amule-gui.cpp'; then $(CYGPATH_W) 'amule-gui.cpp'; else $(CYGPATH_W) '$(srcdir)/amule-gui.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-amule-gui.Tpo" "$(DEPDIR)/amule-amule-gui.Po"; else rm -f "$(DEPDIR)/amule-amule-gui.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amule-gui.obj -MD -MP -MF $(DEPDIR)/amule-amule-gui.Tpo -c -o amule-amule-gui.obj `if test -f 'amule-gui.cpp'; then $(CYGPATH_W) 'amule-gui.cpp'; else $(CYGPATH_W) '$(srcdir)/amule-gui.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-amule-gui.Tpo $(DEPDIR)/amule-amule-gui.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amule-gui.cpp' object='amule-amule-gui.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-amule-gui.obj `if test -f 'amule-gui.cpp'; then $(CYGPATH_W) 'amule-gui.cpp'; else $(CYGPATH_W) '$(srcdir)/amule-gui.cpp'; fi`
 
 amule-amuleDlg.o: amuleDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amuleDlg.o -MD -MP -MF "$(DEPDIR)/amule-amuleDlg.Tpo" -c -o amule-amuleDlg.o `test -f 'amuleDlg.cpp' || echo '$(srcdir)/'`amuleDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-amuleDlg.Tpo" "$(DEPDIR)/amule-amuleDlg.Po"; else rm -f "$(DEPDIR)/amule-amuleDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amuleDlg.o -MD -MP -MF $(DEPDIR)/amule-amuleDlg.Tpo -c -o amule-amuleDlg.o `test -f 'amuleDlg.cpp' || echo '$(srcdir)/'`amuleDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-amuleDlg.Tpo $(DEPDIR)/amule-amuleDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amuleDlg.cpp' object='amule-amuleDlg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-amuleDlg.o `test -f 'amuleDlg.cpp' || echo '$(srcdir)/'`amuleDlg.cpp
 
 amule-amuleDlg.obj: amuleDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amuleDlg.obj -MD -MP -MF "$(DEPDIR)/amule-amuleDlg.Tpo" -c -o amule-amuleDlg.obj `if test -f 'amuleDlg.cpp'; then $(CYGPATH_W) 'amuleDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/amuleDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-amuleDlg.Tpo" "$(DEPDIR)/amule-amuleDlg.Po"; else rm -f "$(DEPDIR)/amule-amuleDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amuleDlg.obj -MD -MP -MF $(DEPDIR)/amule-amuleDlg.Tpo -c -o amule-amuleDlg.obj `if test -f 'amuleDlg.cpp'; then $(CYGPATH_W) 'amuleDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/amuleDlg.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-amuleDlg.Tpo $(DEPDIR)/amule-amuleDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amuleDlg.cpp' object='amule-amuleDlg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-amuleDlg.obj `if test -f 'amuleDlg.cpp'; then $(CYGPATH_W) 'amuleDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/amuleDlg.cpp'; fi`
 
 amule-AddFriend.o: AddFriend.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-AddFriend.o -MD -MP -MF "$(DEPDIR)/amule-AddFriend.Tpo" -c -o amule-AddFriend.o `test -f 'AddFriend.cpp' || echo '$(srcdir)/'`AddFriend.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-AddFriend.Tpo" "$(DEPDIR)/amule-AddFriend.Po"; else rm -f "$(DEPDIR)/amule-AddFriend.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-AddFriend.o -MD -MP -MF $(DEPDIR)/amule-AddFriend.Tpo -c -o amule-AddFriend.o `test -f 'AddFriend.cpp' || echo '$(srcdir)/'`AddFriend.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-AddFriend.Tpo $(DEPDIR)/amule-AddFriend.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='AddFriend.cpp' object='amule-AddFriend.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-AddFriend.o `test -f 'AddFriend.cpp' || echo '$(srcdir)/'`AddFriend.cpp
 
 amule-AddFriend.obj: AddFriend.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-AddFriend.obj -MD -MP -MF "$(DEPDIR)/amule-AddFriend.Tpo" -c -o amule-AddFriend.obj `if test -f 'AddFriend.cpp'; then $(CYGPATH_W) 'AddFriend.cpp'; else $(CYGPATH_W) '$(srcdir)/AddFriend.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-AddFriend.Tpo" "$(DEPDIR)/amule-AddFriend.Po"; else rm -f "$(DEPDIR)/amule-AddFriend.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-AddFriend.obj -MD -MP -MF $(DEPDIR)/amule-AddFriend.Tpo -c -o amule-AddFriend.obj `if test -f 'AddFriend.cpp'; then $(CYGPATH_W) 'AddFriend.cpp'; else $(CYGPATH_W) '$(srcdir)/AddFriend.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-AddFriend.Tpo $(DEPDIR)/amule-AddFriend.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='AddFriend.cpp' object='amule-AddFriend.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-AddFriend.obj `if test -f 'AddFriend.cpp'; then $(CYGPATH_W) 'AddFriend.cpp'; else $(CYGPATH_W) '$(srcdir)/AddFriend.cpp'; fi`
 
 amule-CatDialog.o: CatDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CatDialog.o -MD -MP -MF "$(DEPDIR)/amule-CatDialog.Tpo" -c -o amule-CatDialog.o `test -f 'CatDialog.cpp' || echo '$(srcdir)/'`CatDialog.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-CatDialog.Tpo" "$(DEPDIR)/amule-CatDialog.Po"; else rm -f "$(DEPDIR)/amule-CatDialog.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CatDialog.o -MD -MP -MF $(DEPDIR)/amule-CatDialog.Tpo -c -o amule-CatDialog.o `test -f 'CatDialog.cpp' || echo '$(srcdir)/'`CatDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CatDialog.Tpo $(DEPDIR)/amule-CatDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CatDialog.cpp' object='amule-CatDialog.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CatDialog.o `test -f 'CatDialog.cpp' || echo '$(srcdir)/'`CatDialog.cpp
 
 amule-CatDialog.obj: CatDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CatDialog.obj -MD -MP -MF "$(DEPDIR)/amule-CatDialog.Tpo" -c -o amule-CatDialog.obj `if test -f 'CatDialog.cpp'; then $(CYGPATH_W) 'CatDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CatDialog.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-CatDialog.Tpo" "$(DEPDIR)/amule-CatDialog.Po"; else rm -f "$(DEPDIR)/amule-CatDialog.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CatDialog.obj -MD -MP -MF $(DEPDIR)/amule-CatDialog.Tpo -c -o amule-CatDialog.obj `if test -f 'CatDialog.cpp'; then $(CYGPATH_W) 'CatDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CatDialog.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CatDialog.Tpo $(DEPDIR)/amule-CatDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CatDialog.cpp' object='amule-CatDialog.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CatDialog.obj `if test -f 'CatDialog.cpp'; then $(CYGPATH_W) 'CatDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CatDialog.cpp'; fi`
 
 amule-ChatSelector.o: ChatSelector.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ChatSelector.o -MD -MP -MF "$(DEPDIR)/amule-ChatSelector.Tpo" -c -o amule-ChatSelector.o `test -f 'ChatSelector.cpp' || echo '$(srcdir)/'`ChatSelector.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ChatSelector.Tpo" "$(DEPDIR)/amule-ChatSelector.Po"; else rm -f "$(DEPDIR)/amule-ChatSelector.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ChatSelector.o -MD -MP -MF $(DEPDIR)/amule-ChatSelector.Tpo -c -o amule-ChatSelector.o `test -f 'ChatSelector.cpp' || echo '$(srcdir)/'`ChatSelector.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ChatSelector.Tpo $(DEPDIR)/amule-ChatSelector.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ChatSelector.cpp' object='amule-ChatSelector.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ChatSelector.o `test -f 'ChatSelector.cpp' || echo '$(srcdir)/'`ChatSelector.cpp
 
 amule-ChatSelector.obj: ChatSelector.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ChatSelector.obj -MD -MP -MF "$(DEPDIR)/amule-ChatSelector.Tpo" -c -o amule-ChatSelector.obj `if test -f 'ChatSelector.cpp'; then $(CYGPATH_W) 'ChatSelector.cpp'; else $(CYGPATH_W) '$(srcdir)/ChatSelector.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ChatSelector.Tpo" "$(DEPDIR)/amule-ChatSelector.Po"; else rm -f "$(DEPDIR)/amule-ChatSelector.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ChatSelector.obj -MD -MP -MF $(DEPDIR)/amule-ChatSelector.Tpo -c -o amule-ChatSelector.obj `if test -f 'ChatSelector.cpp'; then $(CYGPATH_W) 'ChatSelector.cpp'; else $(CYGPATH_W) '$(srcdir)/ChatSelector.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ChatSelector.Tpo $(DEPDIR)/amule-ChatSelector.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ChatSelector.cpp' object='amule-ChatSelector.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ChatSelector.obj `if test -f 'ChatSelector.cpp'; then $(CYGPATH_W) 'ChatSelector.cpp'; else $(CYGPATH_W) '$(srcdir)/ChatSelector.cpp'; fi`
 
+amule-ChatWnd.o: ChatWnd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ChatWnd.o -MD -MP -MF $(DEPDIR)/amule-ChatWnd.Tpo -c -o amule-ChatWnd.o `test -f 'ChatWnd.cpp' || echo '$(srcdir)/'`ChatWnd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ChatWnd.Tpo $(DEPDIR)/amule-ChatWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ChatWnd.cpp' object='amule-ChatWnd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ChatWnd.o `test -f 'ChatWnd.cpp' || echo '$(srcdir)/'`ChatWnd.cpp
+
+amule-ChatWnd.obj: ChatWnd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ChatWnd.obj -MD -MP -MF $(DEPDIR)/amule-ChatWnd.Tpo -c -o amule-ChatWnd.obj `if test -f 'ChatWnd.cpp'; then $(CYGPATH_W) 'ChatWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/ChatWnd.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ChatWnd.Tpo $(DEPDIR)/amule-ChatWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ChatWnd.cpp' object='amule-ChatWnd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ChatWnd.obj `if test -f 'ChatWnd.cpp'; then $(CYGPATH_W) 'ChatWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/ChatWnd.cpp'; fi`
+
+amule-CommentDialog.o: CommentDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CommentDialog.o -MD -MP -MF $(DEPDIR)/amule-CommentDialog.Tpo -c -o amule-CommentDialog.o `test -f 'CommentDialog.cpp' || echo '$(srcdir)/'`CommentDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CommentDialog.Tpo $(DEPDIR)/amule-CommentDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CommentDialog.cpp' object='amule-CommentDialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CommentDialog.o `test -f 'CommentDialog.cpp' || echo '$(srcdir)/'`CommentDialog.cpp
+
+amule-CommentDialog.obj: CommentDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CommentDialog.obj -MD -MP -MF $(DEPDIR)/amule-CommentDialog.Tpo -c -o amule-CommentDialog.obj `if test -f 'CommentDialog.cpp'; then $(CYGPATH_W) 'CommentDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CommentDialog.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CommentDialog.Tpo $(DEPDIR)/amule-CommentDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CommentDialog.cpp' object='amule-CommentDialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CommentDialog.obj `if test -f 'CommentDialog.cpp'; then $(CYGPATH_W) 'CommentDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CommentDialog.cpp'; fi`
+
+amule-CommentDialogLst.o: CommentDialogLst.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CommentDialogLst.o -MD -MP -MF $(DEPDIR)/amule-CommentDialogLst.Tpo -c -o amule-CommentDialogLst.o `test -f 'CommentDialogLst.cpp' || echo '$(srcdir)/'`CommentDialogLst.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CommentDialogLst.Tpo $(DEPDIR)/amule-CommentDialogLst.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CommentDialogLst.cpp' object='amule-CommentDialogLst.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CommentDialogLst.o `test -f 'CommentDialogLst.cpp' || echo '$(srcdir)/'`CommentDialogLst.cpp
+
+amule-CommentDialogLst.obj: CommentDialogLst.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-CommentDialogLst.obj -MD -MP -MF $(DEPDIR)/amule-CommentDialogLst.Tpo -c -o amule-CommentDialogLst.obj `if test -f 'CommentDialogLst.cpp'; then $(CYGPATH_W) 'CommentDialogLst.cpp'; else $(CYGPATH_W) '$(srcdir)/CommentDialogLst.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-CommentDialogLst.Tpo $(DEPDIR)/amule-CommentDialogLst.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CommentDialogLst.cpp' object='amule-CommentDialogLst.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-CommentDialogLst.obj `if test -f 'CommentDialogLst.cpp'; then $(CYGPATH_W) 'CommentDialogLst.cpp'; else $(CYGPATH_W) '$(srcdir)/CommentDialogLst.cpp'; fi`
+
+amule-GenericClientListCtrl.o: GenericClientListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-GenericClientListCtrl.o -MD -MP -MF $(DEPDIR)/amule-GenericClientListCtrl.Tpo -c -o amule-GenericClientListCtrl.o `test -f 'GenericClientListCtrl.cpp' || echo '$(srcdir)/'`GenericClientListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-GenericClientListCtrl.Tpo $(DEPDIR)/amule-GenericClientListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GenericClientListCtrl.cpp' object='amule-GenericClientListCtrl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-GenericClientListCtrl.o `test -f 'GenericClientListCtrl.cpp' || echo '$(srcdir)/'`GenericClientListCtrl.cpp
+
+amule-GenericClientListCtrl.obj: GenericClientListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-GenericClientListCtrl.obj -MD -MP -MF $(DEPDIR)/amule-GenericClientListCtrl.Tpo -c -o amule-GenericClientListCtrl.obj `if test -f 'GenericClientListCtrl.cpp'; then $(CYGPATH_W) 'GenericClientListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/GenericClientListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-GenericClientListCtrl.Tpo $(DEPDIR)/amule-GenericClientListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GenericClientListCtrl.cpp' object='amule-GenericClientListCtrl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-GenericClientListCtrl.obj `if test -f 'GenericClientListCtrl.cpp'; then $(CYGPATH_W) 'GenericClientListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/GenericClientListCtrl.cpp'; fi`
+
 amule-ClientDetailDialog.o: ClientDetailDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientDetailDialog.o -MD -MP -MF "$(DEPDIR)/amule-ClientDetailDialog.Tpo" -c -o amule-ClientDetailDialog.o `test -f 'ClientDetailDialog.cpp' || echo '$(srcdir)/'`ClientDetailDialog.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientDetailDialog.Tpo" "$(DEPDIR)/amule-ClientDetailDialog.Po"; else rm -f "$(DEPDIR)/amule-ClientDetailDialog.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientDetailDialog.o -MD -MP -MF $(DEPDIR)/amule-ClientDetailDialog.Tpo -c -o amule-ClientDetailDialog.o `test -f 'ClientDetailDialog.cpp' || echo '$(srcdir)/'`ClientDetailDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ClientDetailDialog.Tpo $(DEPDIR)/amule-ClientDetailDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientDetailDialog.cpp' object='amule-ClientDetailDialog.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientDetailDialog.o `test -f 'ClientDetailDialog.cpp' || echo '$(srcdir)/'`ClientDetailDialog.cpp
 
 amule-ClientDetailDialog.obj: ClientDetailDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientDetailDialog.obj -MD -MP -MF "$(DEPDIR)/amule-ClientDetailDialog.Tpo" -c -o amule-ClientDetailDialog.obj `if test -f 'ClientDetailDialog.cpp'; then $(CYGPATH_W) 'ClientDetailDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientDetailDialog.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientDetailDialog.Tpo" "$(DEPDIR)/amule-ClientDetailDialog.Po"; else rm -f "$(DEPDIR)/amule-ClientDetailDialog.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientDetailDialog.obj -MD -MP -MF $(DEPDIR)/amule-ClientDetailDialog.Tpo -c -o amule-ClientDetailDialog.obj `if test -f 'ClientDetailDialog.cpp'; then $(CYGPATH_W) 'ClientDetailDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientDetailDialog.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ClientDetailDialog.Tpo $(DEPDIR)/amule-ClientDetailDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientDetailDialog.cpp' object='amule-ClientDetailDialog.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientDetailDialog.obj `if test -f 'ClientDetailDialog.cpp'; then $(CYGPATH_W) 'ClientDetailDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientDetailDialog.cpp'; fi`
 
+amule-DirectoryTreeCtrl.o: DirectoryTreeCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DirectoryTreeCtrl.o -MD -MP -MF $(DEPDIR)/amule-DirectoryTreeCtrl.Tpo -c -o amule-DirectoryTreeCtrl.o `test -f 'DirectoryTreeCtrl.cpp' || echo '$(srcdir)/'`DirectoryTreeCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-DirectoryTreeCtrl.Tpo $(DEPDIR)/amule-DirectoryTreeCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DirectoryTreeCtrl.cpp' object='amule-DirectoryTreeCtrl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-DirectoryTreeCtrl.o `test -f 'DirectoryTreeCtrl.cpp' || echo '$(srcdir)/'`DirectoryTreeCtrl.cpp
+
+amule-DirectoryTreeCtrl.obj: DirectoryTreeCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DirectoryTreeCtrl.obj -MD -MP -MF $(DEPDIR)/amule-DirectoryTreeCtrl.Tpo -c -o amule-DirectoryTreeCtrl.obj `if test -f 'DirectoryTreeCtrl.cpp'; then $(CYGPATH_W) 'DirectoryTreeCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/DirectoryTreeCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-DirectoryTreeCtrl.Tpo $(DEPDIR)/amule-DirectoryTreeCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DirectoryTreeCtrl.cpp' object='amule-DirectoryTreeCtrl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-DirectoryTreeCtrl.obj `if test -f 'DirectoryTreeCtrl.cpp'; then $(CYGPATH_W) 'DirectoryTreeCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/DirectoryTreeCtrl.cpp'; fi`
+
 amule-FileDetailDialog.o: FileDetailDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-FileDetailDialog.o -MD -MP -MF "$(DEPDIR)/amule-FileDetailDialog.Tpo" -c -o amule-FileDetailDialog.o `test -f 'FileDetailDialog.cpp' || echo '$(srcdir)/'`FileDetailDialog.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-FileDetailDialog.Tpo" "$(DEPDIR)/amule-FileDetailDialog.Po"; else rm -f "$(DEPDIR)/amule-FileDetailDialog.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-FileDetailDialog.o -MD -MP -MF $(DEPDIR)/amule-FileDetailDialog.Tpo -c -o amule-FileDetailDialog.o `test -f 'FileDetailDialog.cpp' || echo '$(srcdir)/'`FileDetailDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-FileDetailDialog.Tpo $(DEPDIR)/amule-FileDetailDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileDetailDialog.cpp' object='amule-FileDetailDialog.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-FileDetailDialog.o `test -f 'FileDetailDialog.cpp' || echo '$(srcdir)/'`FileDetailDialog.cpp
 
 amule-FileDetailDialog.obj: FileDetailDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-FileDetailDialog.obj -MD -MP -MF "$(DEPDIR)/amule-FileDetailDialog.Tpo" -c -o amule-FileDetailDialog.obj `if test -f 'FileDetailDialog.cpp'; then $(CYGPATH_W) 'FileDetailDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/FileDetailDialog.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-FileDetailDialog.Tpo" "$(DEPDIR)/amule-FileDetailDialog.Po"; else rm -f "$(DEPDIR)/amule-FileDetailDialog.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-FileDetailDialog.obj -MD -MP -MF $(DEPDIR)/amule-FileDetailDialog.Tpo -c -o amule-FileDetailDialog.obj `if test -f 'FileDetailDialog.cpp'; then $(CYGPATH_W) 'FileDetailDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/FileDetailDialog.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-FileDetailDialog.Tpo $(DEPDIR)/amule-FileDetailDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileDetailDialog.cpp' object='amule-FileDetailDialog.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-FileDetailDialog.obj `if test -f 'FileDetailDialog.cpp'; then $(CYGPATH_W) 'FileDetailDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/FileDetailDialog.cpp'; fi`
 
 amule-KadDlg.o: KadDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KadDlg.o -MD -MP -MF "$(DEPDIR)/amule-KadDlg.Tpo" -c -o amule-KadDlg.o `test -f 'KadDlg.cpp' || echo '$(srcdir)/'`KadDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-KadDlg.Tpo" "$(DEPDIR)/amule-KadDlg.Po"; else rm -f "$(DEPDIR)/amule-KadDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KadDlg.o -MD -MP -MF $(DEPDIR)/amule-KadDlg.Tpo -c -o amule-KadDlg.o `test -f 'KadDlg.cpp' || echo '$(srcdir)/'`KadDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-KadDlg.Tpo $(DEPDIR)/amule-KadDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KadDlg.cpp' object='amule-KadDlg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-KadDlg.o `test -f 'KadDlg.cpp' || echo '$(srcdir)/'`KadDlg.cpp
 
 amule-KadDlg.obj: KadDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KadDlg.obj -MD -MP -MF "$(DEPDIR)/amule-KadDlg.Tpo" -c -o amule-KadDlg.obj `if test -f 'KadDlg.cpp'; then $(CYGPATH_W) 'KadDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/KadDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-KadDlg.Tpo" "$(DEPDIR)/amule-KadDlg.Po"; else rm -f "$(DEPDIR)/amule-KadDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KadDlg.obj -MD -MP -MF $(DEPDIR)/amule-KadDlg.Tpo -c -o amule-KadDlg.obj `if test -f 'KadDlg.cpp'; then $(CYGPATH_W) 'KadDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/KadDlg.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-KadDlg.Tpo $(DEPDIR)/amule-KadDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KadDlg.cpp' object='amule-KadDlg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-KadDlg.obj `if test -f 'KadDlg.cpp'; then $(CYGPATH_W) 'KadDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/KadDlg.cpp'; fi`
 
 amule-OScopeCtrl.o: OScopeCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-OScopeCtrl.o -MD -MP -MF "$(DEPDIR)/amule-OScopeCtrl.Tpo" -c -o amule-OScopeCtrl.o `test -f 'OScopeCtrl.cpp' || echo '$(srcdir)/'`OScopeCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-OScopeCtrl.Tpo" "$(DEPDIR)/amule-OScopeCtrl.Po"; else rm -f "$(DEPDIR)/amule-OScopeCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-OScopeCtrl.o -MD -MP -MF $(DEPDIR)/amule-OScopeCtrl.Tpo -c -o amule-OScopeCtrl.o `test -f 'OScopeCtrl.cpp' || echo '$(srcdir)/'`OScopeCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-OScopeCtrl.Tpo $(DEPDIR)/amule-OScopeCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OScopeCtrl.cpp' object='amule-OScopeCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-OScopeCtrl.o `test -f 'OScopeCtrl.cpp' || echo '$(srcdir)/'`OScopeCtrl.cpp
 
 amule-OScopeCtrl.obj: OScopeCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-OScopeCtrl.obj -MD -MP -MF "$(DEPDIR)/amule-OScopeCtrl.Tpo" -c -o amule-OScopeCtrl.obj `if test -f 'OScopeCtrl.cpp'; then $(CYGPATH_W) 'OScopeCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/OScopeCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-OScopeCtrl.Tpo" "$(DEPDIR)/amule-OScopeCtrl.Po"; else rm -f "$(DEPDIR)/amule-OScopeCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-OScopeCtrl.obj -MD -MP -MF $(DEPDIR)/amule-OScopeCtrl.Tpo -c -o amule-OScopeCtrl.obj `if test -f 'OScopeCtrl.cpp'; then $(CYGPATH_W) 'OScopeCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/OScopeCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-OScopeCtrl.Tpo $(DEPDIR)/amule-OScopeCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OScopeCtrl.cpp' object='amule-OScopeCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-OScopeCtrl.obj `if test -f 'OScopeCtrl.cpp'; then $(CYGPATH_W) 'OScopeCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/OScopeCtrl.cpp'; fi`
 
-amule-PartFileConvertDlg.o: PartFileConvertDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PartFileConvertDlg.o -MD -MP -MF "$(DEPDIR)/amule-PartFileConvertDlg.Tpo" -c -o amule-PartFileConvertDlg.o `test -f 'PartFileConvertDlg.cpp' || echo '$(srcdir)/'`PartFileConvertDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-PartFileConvertDlg.Tpo" "$(DEPDIR)/amule-PartFileConvertDlg.Po"; else rm -f "$(DEPDIR)/amule-PartFileConvertDlg.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFileConvertDlg.cpp' object='amule-PartFileConvertDlg.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PartFileConvertDlg.o `test -f 'PartFileConvertDlg.cpp' || echo '$(srcdir)/'`PartFileConvertDlg.cpp
-
-amule-PartFileConvertDlg.obj: PartFileConvertDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PartFileConvertDlg.obj -MD -MP -MF "$(DEPDIR)/amule-PartFileConvertDlg.Tpo" -c -o amule-PartFileConvertDlg.obj `if test -f 'PartFileConvertDlg.cpp'; then $(CYGPATH_W) 'PartFileConvertDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFileConvertDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-PartFileConvertDlg.Tpo" "$(DEPDIR)/amule-PartFileConvertDlg.Po"; else rm -f "$(DEPDIR)/amule-PartFileConvertDlg.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFileConvertDlg.cpp' object='amule-PartFileConvertDlg.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PartFileConvertDlg.obj `if test -f 'PartFileConvertDlg.cpp'; then $(CYGPATH_W) 'PartFileConvertDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFileConvertDlg.cpp'; fi`
-
 amule-PrefsUnifiedDlg.o: PrefsUnifiedDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PrefsUnifiedDlg.o -MD -MP -MF "$(DEPDIR)/amule-PrefsUnifiedDlg.Tpo" -c -o amule-PrefsUnifiedDlg.o `test -f 'PrefsUnifiedDlg.cpp' || echo '$(srcdir)/'`PrefsUnifiedDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-PrefsUnifiedDlg.Tpo" "$(DEPDIR)/amule-PrefsUnifiedDlg.Po"; else rm -f "$(DEPDIR)/amule-PrefsUnifiedDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PrefsUnifiedDlg.o -MD -MP -MF $(DEPDIR)/amule-PrefsUnifiedDlg.Tpo -c -o amule-PrefsUnifiedDlg.o `test -f 'PrefsUnifiedDlg.cpp' || echo '$(srcdir)/'`PrefsUnifiedDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-PrefsUnifiedDlg.Tpo $(DEPDIR)/amule-PrefsUnifiedDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PrefsUnifiedDlg.cpp' object='amule-PrefsUnifiedDlg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PrefsUnifiedDlg.o `test -f 'PrefsUnifiedDlg.cpp' || echo '$(srcdir)/'`PrefsUnifiedDlg.cpp
 
 amule-PrefsUnifiedDlg.obj: PrefsUnifiedDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PrefsUnifiedDlg.obj -MD -MP -MF "$(DEPDIR)/amule-PrefsUnifiedDlg.Tpo" -c -o amule-PrefsUnifiedDlg.obj `if test -f 'PrefsUnifiedDlg.cpp'; then $(CYGPATH_W) 'PrefsUnifiedDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/PrefsUnifiedDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-PrefsUnifiedDlg.Tpo" "$(DEPDIR)/amule-PrefsUnifiedDlg.Po"; else rm -f "$(DEPDIR)/amule-PrefsUnifiedDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PrefsUnifiedDlg.obj -MD -MP -MF $(DEPDIR)/amule-PrefsUnifiedDlg.Tpo -c -o amule-PrefsUnifiedDlg.obj `if test -f 'PrefsUnifiedDlg.cpp'; then $(CYGPATH_W) 'PrefsUnifiedDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/PrefsUnifiedDlg.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-PrefsUnifiedDlg.Tpo $(DEPDIR)/amule-PrefsUnifiedDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PrefsUnifiedDlg.cpp' object='amule-PrefsUnifiedDlg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PrefsUnifiedDlg.obj `if test -f 'PrefsUnifiedDlg.cpp'; then $(CYGPATH_W) 'PrefsUnifiedDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/PrefsUnifiedDlg.cpp'; fi`
 
 amule-SearchDlg.o: SearchDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchDlg.o -MD -MP -MF "$(DEPDIR)/amule-SearchDlg.Tpo" -c -o amule-SearchDlg.o `test -f 'SearchDlg.cpp' || echo '$(srcdir)/'`SearchDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SearchDlg.Tpo" "$(DEPDIR)/amule-SearchDlg.Po"; else rm -f "$(DEPDIR)/amule-SearchDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchDlg.o -MD -MP -MF $(DEPDIR)/amule-SearchDlg.Tpo -c -o amule-SearchDlg.o `test -f 'SearchDlg.cpp' || echo '$(srcdir)/'`SearchDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SearchDlg.Tpo $(DEPDIR)/amule-SearchDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchDlg.cpp' object='amule-SearchDlg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SearchDlg.o `test -f 'SearchDlg.cpp' || echo '$(srcdir)/'`SearchDlg.cpp
 
 amule-SearchDlg.obj: SearchDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchDlg.obj -MD -MP -MF "$(DEPDIR)/amule-SearchDlg.Tpo" -c -o amule-SearchDlg.obj `if test -f 'SearchDlg.cpp'; then $(CYGPATH_W) 'SearchDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SearchDlg.Tpo" "$(DEPDIR)/amule-SearchDlg.Po"; else rm -f "$(DEPDIR)/amule-SearchDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchDlg.obj -MD -MP -MF $(DEPDIR)/amule-SearchDlg.Tpo -c -o amule-SearchDlg.obj `if test -f 'SearchDlg.cpp'; then $(CYGPATH_W) 'SearchDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchDlg.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SearchDlg.Tpo $(DEPDIR)/amule-SearchDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchDlg.cpp' object='amule-SearchDlg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SearchDlg.obj `if test -f 'SearchDlg.cpp'; then $(CYGPATH_W) 'SearchDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchDlg.cpp'; fi`
 
 amule-ServerWnd.o: ServerWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerWnd.o -MD -MP -MF "$(DEPDIR)/amule-ServerWnd.Tpo" -c -o amule-ServerWnd.o `test -f 'ServerWnd.cpp' || echo '$(srcdir)/'`ServerWnd.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ServerWnd.Tpo" "$(DEPDIR)/amule-ServerWnd.Po"; else rm -f "$(DEPDIR)/amule-ServerWnd.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerWnd.o -MD -MP -MF $(DEPDIR)/amule-ServerWnd.Tpo -c -o amule-ServerWnd.o `test -f 'ServerWnd.cpp' || echo '$(srcdir)/'`ServerWnd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ServerWnd.Tpo $(DEPDIR)/amule-ServerWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerWnd.cpp' object='amule-ServerWnd.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ServerWnd.o `test -f 'ServerWnd.cpp' || echo '$(srcdir)/'`ServerWnd.cpp
 
 amule-ServerWnd.obj: ServerWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerWnd.obj -MD -MP -MF "$(DEPDIR)/amule-ServerWnd.Tpo" -c -o amule-ServerWnd.obj `if test -f 'ServerWnd.cpp'; then $(CYGPATH_W) 'ServerWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerWnd.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ServerWnd.Tpo" "$(DEPDIR)/amule-ServerWnd.Po"; else rm -f "$(DEPDIR)/amule-ServerWnd.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerWnd.obj -MD -MP -MF $(DEPDIR)/amule-ServerWnd.Tpo -c -o amule-ServerWnd.obj `if test -f 'ServerWnd.cpp'; then $(CYGPATH_W) 'ServerWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerWnd.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ServerWnd.Tpo $(DEPDIR)/amule-ServerWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerWnd.cpp' object='amule-ServerWnd.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ServerWnd.obj `if test -f 'ServerWnd.cpp'; then $(CYGPATH_W) 'ServerWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerWnd.cpp'; fi`
 
 amule-SharedFilesWnd.o: SharedFilesWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFilesWnd.o -MD -MP -MF "$(DEPDIR)/amule-SharedFilesWnd.Tpo" -c -o amule-SharedFilesWnd.o `test -f 'SharedFilesWnd.cpp' || echo '$(srcdir)/'`SharedFilesWnd.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SharedFilesWnd.Tpo" "$(DEPDIR)/amule-SharedFilesWnd.Po"; else rm -f "$(DEPDIR)/amule-SharedFilesWnd.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFilesWnd.o -MD -MP -MF $(DEPDIR)/amule-SharedFilesWnd.Tpo -c -o amule-SharedFilesWnd.o `test -f 'SharedFilesWnd.cpp' || echo '$(srcdir)/'`SharedFilesWnd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SharedFilesWnd.Tpo $(DEPDIR)/amule-SharedFilesWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFilesWnd.cpp' object='amule-SharedFilesWnd.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SharedFilesWnd.o `test -f 'SharedFilesWnd.cpp' || echo '$(srcdir)/'`SharedFilesWnd.cpp
 
 amule-SharedFilesWnd.obj: SharedFilesWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFilesWnd.obj -MD -MP -MF "$(DEPDIR)/amule-SharedFilesWnd.Tpo" -c -o amule-SharedFilesWnd.obj `if test -f 'SharedFilesWnd.cpp'; then $(CYGPATH_W) 'SharedFilesWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilesWnd.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SharedFilesWnd.Tpo" "$(DEPDIR)/amule-SharedFilesWnd.Po"; else rm -f "$(DEPDIR)/amule-SharedFilesWnd.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFilesWnd.obj -MD -MP -MF $(DEPDIR)/amule-SharedFilesWnd.Tpo -c -o amule-SharedFilesWnd.obj `if test -f 'SharedFilesWnd.cpp'; then $(CYGPATH_W) 'SharedFilesWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilesWnd.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SharedFilesWnd.Tpo $(DEPDIR)/amule-SharedFilesWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFilesWnd.cpp' object='amule-SharedFilesWnd.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SharedFilesWnd.obj `if test -f 'SharedFilesWnd.cpp'; then $(CYGPATH_W) 'SharedFilesWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilesWnd.cpp'; fi`
 
 amule-StatisticsDlg.o: StatisticsDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-StatisticsDlg.o -MD -MP -MF "$(DEPDIR)/amule-StatisticsDlg.Tpo" -c -o amule-StatisticsDlg.o `test -f 'StatisticsDlg.cpp' || echo '$(srcdir)/'`StatisticsDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-StatisticsDlg.Tpo" "$(DEPDIR)/amule-StatisticsDlg.Po"; else rm -f "$(DEPDIR)/amule-StatisticsDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-StatisticsDlg.o -MD -MP -MF $(DEPDIR)/amule-StatisticsDlg.Tpo -c -o amule-StatisticsDlg.o `test -f 'StatisticsDlg.cpp' || echo '$(srcdir)/'`StatisticsDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-StatisticsDlg.Tpo $(DEPDIR)/amule-StatisticsDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StatisticsDlg.cpp' object='amule-StatisticsDlg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-StatisticsDlg.o `test -f 'StatisticsDlg.cpp' || echo '$(srcdir)/'`StatisticsDlg.cpp
 
 amule-StatisticsDlg.obj: StatisticsDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-StatisticsDlg.obj -MD -MP -MF "$(DEPDIR)/amule-StatisticsDlg.Tpo" -c -o amule-StatisticsDlg.obj `if test -f 'StatisticsDlg.cpp'; then $(CYGPATH_W) 'StatisticsDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/StatisticsDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-StatisticsDlg.Tpo" "$(DEPDIR)/amule-StatisticsDlg.Po"; else rm -f "$(DEPDIR)/amule-StatisticsDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-StatisticsDlg.obj -MD -MP -MF $(DEPDIR)/amule-StatisticsDlg.Tpo -c -o amule-StatisticsDlg.obj `if test -f 'StatisticsDlg.cpp'; then $(CYGPATH_W) 'StatisticsDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/StatisticsDlg.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-StatisticsDlg.Tpo $(DEPDIR)/amule-StatisticsDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StatisticsDlg.cpp' object='amule-StatisticsDlg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-StatisticsDlg.obj `if test -f 'StatisticsDlg.cpp'; then $(CYGPATH_W) 'StatisticsDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/StatisticsDlg.cpp'; fi`
 
 amule-SearchListCtrl.o: SearchListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchListCtrl.o -MD -MP -MF "$(DEPDIR)/amule-SearchListCtrl.Tpo" -c -o amule-SearchListCtrl.o `test -f 'SearchListCtrl.cpp' || echo '$(srcdir)/'`SearchListCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SearchListCtrl.Tpo" "$(DEPDIR)/amule-SearchListCtrl.Po"; else rm -f "$(DEPDIR)/amule-SearchListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchListCtrl.o -MD -MP -MF $(DEPDIR)/amule-SearchListCtrl.Tpo -c -o amule-SearchListCtrl.o `test -f 'SearchListCtrl.cpp' || echo '$(srcdir)/'`SearchListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SearchListCtrl.Tpo $(DEPDIR)/amule-SearchListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchListCtrl.cpp' object='amule-SearchListCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SearchListCtrl.o `test -f 'SearchListCtrl.cpp' || echo '$(srcdir)/'`SearchListCtrl.cpp
 
 amule-SearchListCtrl.obj: SearchListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchListCtrl.obj -MD -MP -MF "$(DEPDIR)/amule-SearchListCtrl.Tpo" -c -o amule-SearchListCtrl.obj `if test -f 'SearchListCtrl.cpp'; then $(CYGPATH_W) 'SearchListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchListCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SearchListCtrl.Tpo" "$(DEPDIR)/amule-SearchListCtrl.Po"; else rm -f "$(DEPDIR)/amule-SearchListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SearchListCtrl.obj -MD -MP -MF $(DEPDIR)/amule-SearchListCtrl.Tpo -c -o amule-SearchListCtrl.obj `if test -f 'SearchListCtrl.cpp'; then $(CYGPATH_W) 'SearchListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SearchListCtrl.Tpo $(DEPDIR)/amule-SearchListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchListCtrl.cpp' object='amule-SearchListCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SearchListCtrl.obj `if test -f 'SearchListCtrl.cpp'; then $(CYGPATH_W) 'SearchListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchListCtrl.cpp'; fi`
 
 amule-DownloadListCtrl.o: DownloadListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DownloadListCtrl.o -MD -MP -MF "$(DEPDIR)/amule-DownloadListCtrl.Tpo" -c -o amule-DownloadListCtrl.o `test -f 'DownloadListCtrl.cpp' || echo '$(srcdir)/'`DownloadListCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-DownloadListCtrl.Tpo" "$(DEPDIR)/amule-DownloadListCtrl.Po"; else rm -f "$(DEPDIR)/amule-DownloadListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DownloadListCtrl.o -MD -MP -MF $(DEPDIR)/amule-DownloadListCtrl.Tpo -c -o amule-DownloadListCtrl.o `test -f 'DownloadListCtrl.cpp' || echo '$(srcdir)/'`DownloadListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-DownloadListCtrl.Tpo $(DEPDIR)/amule-DownloadListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DownloadListCtrl.cpp' object='amule-DownloadListCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-DownloadListCtrl.o `test -f 'DownloadListCtrl.cpp' || echo '$(srcdir)/'`DownloadListCtrl.cpp
 
 amule-DownloadListCtrl.obj: DownloadListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DownloadListCtrl.obj -MD -MP -MF "$(DEPDIR)/amule-DownloadListCtrl.Tpo" -c -o amule-DownloadListCtrl.obj `if test -f 'DownloadListCtrl.cpp'; then $(CYGPATH_W) 'DownloadListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadListCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-DownloadListCtrl.Tpo" "$(DEPDIR)/amule-DownloadListCtrl.Po"; else rm -f "$(DEPDIR)/amule-DownloadListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DownloadListCtrl.obj -MD -MP -MF $(DEPDIR)/amule-DownloadListCtrl.Tpo -c -o amule-DownloadListCtrl.obj `if test -f 'DownloadListCtrl.cpp'; then $(CYGPATH_W) 'DownloadListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-DownloadListCtrl.Tpo $(DEPDIR)/amule-DownloadListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DownloadListCtrl.cpp' object='amule-DownloadListCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-DownloadListCtrl.obj `if test -f 'DownloadListCtrl.cpp'; then $(CYGPATH_W) 'DownloadListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadListCtrl.cpp'; fi`
 
-amule-ClientListCtrl.o: ClientListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientListCtrl.o -MD -MP -MF "$(DEPDIR)/amule-ClientListCtrl.Tpo" -c -o amule-ClientListCtrl.o `test -f 'ClientListCtrl.cpp' || echo '$(srcdir)/'`ClientListCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientListCtrl.Tpo" "$(DEPDIR)/amule-ClientListCtrl.Po"; else rm -f "$(DEPDIR)/amule-ClientListCtrl.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientListCtrl.cpp' object='amule-ClientListCtrl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientListCtrl.o `test -f 'ClientListCtrl.cpp' || echo '$(srcdir)/'`ClientListCtrl.cpp
-
-amule-ClientListCtrl.obj: ClientListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientListCtrl.obj -MD -MP -MF "$(DEPDIR)/amule-ClientListCtrl.Tpo" -c -o amule-ClientListCtrl.obj `if test -f 'ClientListCtrl.cpp'; then $(CYGPATH_W) 'ClientListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientListCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientListCtrl.Tpo" "$(DEPDIR)/amule-ClientListCtrl.Po"; else rm -f "$(DEPDIR)/amule-ClientListCtrl.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientListCtrl.cpp' object='amule-ClientListCtrl.obj' libtool=no @AMDEPBACKSLASH@
+amule-SourceListCtrl.o: SourceListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SourceListCtrl.o -MD -MP -MF $(DEPDIR)/amule-SourceListCtrl.Tpo -c -o amule-SourceListCtrl.o `test -f 'SourceListCtrl.cpp' || echo '$(srcdir)/'`SourceListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SourceListCtrl.Tpo $(DEPDIR)/amule-SourceListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SourceListCtrl.cpp' object='amule-SourceListCtrl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SourceListCtrl.o `test -f 'SourceListCtrl.cpp' || echo '$(srcdir)/'`SourceListCtrl.cpp
+
+amule-SourceListCtrl.obj: SourceListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SourceListCtrl.obj -MD -MP -MF $(DEPDIR)/amule-SourceListCtrl.Tpo -c -o amule-SourceListCtrl.obj `if test -f 'SourceListCtrl.cpp'; then $(CYGPATH_W) 'SourceListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SourceListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SourceListCtrl.Tpo $(DEPDIR)/amule-SourceListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SourceListCtrl.cpp' object='amule-SourceListCtrl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SourceListCtrl.obj `if test -f 'SourceListCtrl.cpp'; then $(CYGPATH_W) 'SourceListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SourceListCtrl.cpp'; fi`
+
+amule-SharedFilePeersListCtrl.o: SharedFilePeersListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFilePeersListCtrl.o -MD -MP -MF $(DEPDIR)/amule-SharedFilePeersListCtrl.Tpo -c -o amule-SharedFilePeersListCtrl.o `test -f 'SharedFilePeersListCtrl.cpp' || echo '$(srcdir)/'`SharedFilePeersListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SharedFilePeersListCtrl.Tpo $(DEPDIR)/amule-SharedFilePeersListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFilePeersListCtrl.cpp' object='amule-SharedFilePeersListCtrl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SharedFilePeersListCtrl.o `test -f 'SharedFilePeersListCtrl.cpp' || echo '$(srcdir)/'`SharedFilePeersListCtrl.cpp
+
+amule-SharedFilePeersListCtrl.obj: SharedFilePeersListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFilePeersListCtrl.obj -MD -MP -MF $(DEPDIR)/amule-SharedFilePeersListCtrl.Tpo -c -o amule-SharedFilePeersListCtrl.obj `if test -f 'SharedFilePeersListCtrl.cpp'; then $(CYGPATH_W) 'SharedFilePeersListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilePeersListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SharedFilePeersListCtrl.Tpo $(DEPDIR)/amule-SharedFilePeersListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFilePeersListCtrl.cpp' object='amule-SharedFilePeersListCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientListCtrl.obj `if test -f 'ClientListCtrl.cpp'; then $(CYGPATH_W) 'ClientListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientListCtrl.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SharedFilePeersListCtrl.obj `if test -f 'SharedFilePeersListCtrl.cpp'; then $(CYGPATH_W) 'SharedFilePeersListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilePeersListCtrl.cpp'; fi`
 
 amule-FriendListCtrl.o: FriendListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-FriendListCtrl.o -MD -MP -MF "$(DEPDIR)/amule-FriendListCtrl.Tpo" -c -o amule-FriendListCtrl.o `test -f 'FriendListCtrl.cpp' || echo '$(srcdir)/'`FriendListCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-FriendListCtrl.Tpo" "$(DEPDIR)/amule-FriendListCtrl.Po"; else rm -f "$(DEPDIR)/amule-FriendListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-FriendListCtrl.o -MD -MP -MF $(DEPDIR)/amule-FriendListCtrl.Tpo -c -o amule-FriendListCtrl.o `test -f 'FriendListCtrl.cpp' || echo '$(srcdir)/'`FriendListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-FriendListCtrl.Tpo $(DEPDIR)/amule-FriendListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FriendListCtrl.cpp' object='amule-FriendListCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-FriendListCtrl.o `test -f 'FriendListCtrl.cpp' || echo '$(srcdir)/'`FriendListCtrl.cpp
 
 amule-FriendListCtrl.obj: FriendListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-FriendListCtrl.obj -MD -MP -MF "$(DEPDIR)/amule-FriendListCtrl.Tpo" -c -o amule-FriendListCtrl.obj `if test -f 'FriendListCtrl.cpp'; then $(CYGPATH_W) 'FriendListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/FriendListCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-FriendListCtrl.Tpo" "$(DEPDIR)/amule-FriendListCtrl.Po"; else rm -f "$(DEPDIR)/amule-FriendListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-FriendListCtrl.obj -MD -MP -MF $(DEPDIR)/amule-FriendListCtrl.Tpo -c -o amule-FriendListCtrl.obj `if test -f 'FriendListCtrl.cpp'; then $(CYGPATH_W) 'FriendListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/FriendListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-FriendListCtrl.Tpo $(DEPDIR)/amule-FriendListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FriendListCtrl.cpp' object='amule-FriendListCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-FriendListCtrl.obj `if test -f 'FriendListCtrl.cpp'; then $(CYGPATH_W) 'FriendListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/FriendListCtrl.cpp'; fi`
 
 amule-ServerListCtrl.o: ServerListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerListCtrl.o -MD -MP -MF "$(DEPDIR)/amule-ServerListCtrl.Tpo" -c -o amule-ServerListCtrl.o `test -f 'ServerListCtrl.cpp' || echo '$(srcdir)/'`ServerListCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ServerListCtrl.Tpo" "$(DEPDIR)/amule-ServerListCtrl.Po"; else rm -f "$(DEPDIR)/amule-ServerListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerListCtrl.o -MD -MP -MF $(DEPDIR)/amule-ServerListCtrl.Tpo -c -o amule-ServerListCtrl.o `test -f 'ServerListCtrl.cpp' || echo '$(srcdir)/'`ServerListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ServerListCtrl.Tpo $(DEPDIR)/amule-ServerListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerListCtrl.cpp' object='amule-ServerListCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ServerListCtrl.o `test -f 'ServerListCtrl.cpp' || echo '$(srcdir)/'`ServerListCtrl.cpp
 
 amule-ServerListCtrl.obj: ServerListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerListCtrl.obj -MD -MP -MF "$(DEPDIR)/amule-ServerListCtrl.Tpo" -c -o amule-ServerListCtrl.obj `if test -f 'ServerListCtrl.cpp'; then $(CYGPATH_W) 'ServerListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerListCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ServerListCtrl.Tpo" "$(DEPDIR)/amule-ServerListCtrl.Po"; else rm -f "$(DEPDIR)/amule-ServerListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ServerListCtrl.obj -MD -MP -MF $(DEPDIR)/amule-ServerListCtrl.Tpo -c -o amule-ServerListCtrl.obj `if test -f 'ServerListCtrl.cpp'; then $(CYGPATH_W) 'ServerListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ServerListCtrl.Tpo $(DEPDIR)/amule-ServerListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerListCtrl.cpp' object='amule-ServerListCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ServerListCtrl.obj `if test -f 'ServerListCtrl.cpp'; then $(CYGPATH_W) 'ServerListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerListCtrl.cpp'; fi`
 
 amule-SharedFilesCtrl.o: SharedFilesCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFilesCtrl.o -MD -MP -MF "$(DEPDIR)/amule-SharedFilesCtrl.Tpo" -c -o amule-SharedFilesCtrl.o `test -f 'SharedFilesCtrl.cpp' || echo '$(srcdir)/'`SharedFilesCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SharedFilesCtrl.Tpo" "$(DEPDIR)/amule-SharedFilesCtrl.Po"; else rm -f "$(DEPDIR)/amule-SharedFilesCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFilesCtrl.o -MD -MP -MF $(DEPDIR)/amule-SharedFilesCtrl.Tpo -c -o amule-SharedFilesCtrl.o `test -f 'SharedFilesCtrl.cpp' || echo '$(srcdir)/'`SharedFilesCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SharedFilesCtrl.Tpo $(DEPDIR)/amule-SharedFilesCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFilesCtrl.cpp' object='amule-SharedFilesCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SharedFilesCtrl.o `test -f 'SharedFilesCtrl.cpp' || echo '$(srcdir)/'`SharedFilesCtrl.cpp
 
 amule-SharedFilesCtrl.obj: SharedFilesCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFilesCtrl.obj -MD -MP -MF "$(DEPDIR)/amule-SharedFilesCtrl.Tpo" -c -o amule-SharedFilesCtrl.obj `if test -f 'SharedFilesCtrl.cpp'; then $(CYGPATH_W) 'SharedFilesCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilesCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SharedFilesCtrl.Tpo" "$(DEPDIR)/amule-SharedFilesCtrl.Po"; else rm -f "$(DEPDIR)/amule-SharedFilesCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SharedFilesCtrl.obj -MD -MP -MF $(DEPDIR)/amule-SharedFilesCtrl.Tpo -c -o amule-SharedFilesCtrl.obj `if test -f 'SharedFilesCtrl.cpp'; then $(CYGPATH_W) 'SharedFilesCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilesCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-SharedFilesCtrl.Tpo $(DEPDIR)/amule-SharedFilesCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFilesCtrl.cpp' object='amule-SharedFilesCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SharedFilesCtrl.obj `if test -f 'SharedFilesCtrl.cpp'; then $(CYGPATH_W) 'SharedFilesCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilesCtrl.cpp'; fi`
 
 amule-MuleTrayIcon.o: MuleTrayIcon.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-MuleTrayIcon.o -MD -MP -MF "$(DEPDIR)/amule-MuleTrayIcon.Tpo" -c -o amule-MuleTrayIcon.o `test -f 'MuleTrayIcon.cpp' || echo '$(srcdir)/'`MuleTrayIcon.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-MuleTrayIcon.Tpo" "$(DEPDIR)/amule-MuleTrayIcon.Po"; else rm -f "$(DEPDIR)/amule-MuleTrayIcon.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-MuleTrayIcon.o -MD -MP -MF $(DEPDIR)/amule-MuleTrayIcon.Tpo -c -o amule-MuleTrayIcon.o `test -f 'MuleTrayIcon.cpp' || echo '$(srcdir)/'`MuleTrayIcon.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-MuleTrayIcon.Tpo $(DEPDIR)/amule-MuleTrayIcon.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleTrayIcon.cpp' object='amule-MuleTrayIcon.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-MuleTrayIcon.o `test -f 'MuleTrayIcon.cpp' || echo '$(srcdir)/'`MuleTrayIcon.cpp
 
 amule-MuleTrayIcon.obj: MuleTrayIcon.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-MuleTrayIcon.obj -MD -MP -MF "$(DEPDIR)/amule-MuleTrayIcon.Tpo" -c -o amule-MuleTrayIcon.obj `if test -f 'MuleTrayIcon.cpp'; then $(CYGPATH_W) 'MuleTrayIcon.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleTrayIcon.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-MuleTrayIcon.Tpo" "$(DEPDIR)/amule-MuleTrayIcon.Po"; else rm -f "$(DEPDIR)/amule-MuleTrayIcon.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-MuleTrayIcon.obj -MD -MP -MF $(DEPDIR)/amule-MuleTrayIcon.Tpo -c -o amule-MuleTrayIcon.obj `if test -f 'MuleTrayIcon.cpp'; then $(CYGPATH_W) 'MuleTrayIcon.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleTrayIcon.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-MuleTrayIcon.Tpo $(DEPDIR)/amule-MuleTrayIcon.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleTrayIcon.cpp' object='amule-MuleTrayIcon.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-MuleTrayIcon.obj `if test -f 'MuleTrayIcon.cpp'; then $(CYGPATH_W) 'MuleTrayIcon.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleTrayIcon.cpp'; fi`
 
 amule-TransferWnd.o: TransferWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-TransferWnd.o -MD -MP -MF "$(DEPDIR)/amule-TransferWnd.Tpo" -c -o amule-TransferWnd.o `test -f 'TransferWnd.cpp' || echo '$(srcdir)/'`TransferWnd.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-TransferWnd.Tpo" "$(DEPDIR)/amule-TransferWnd.Po"; else rm -f "$(DEPDIR)/amule-TransferWnd.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-TransferWnd.o -MD -MP -MF $(DEPDIR)/amule-TransferWnd.Tpo -c -o amule-TransferWnd.o `test -f 'TransferWnd.cpp' || echo '$(srcdir)/'`TransferWnd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-TransferWnd.Tpo $(DEPDIR)/amule-TransferWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TransferWnd.cpp' object='amule-TransferWnd.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-TransferWnd.o `test -f 'TransferWnd.cpp' || echo '$(srcdir)/'`TransferWnd.cpp
 
 amule-TransferWnd.obj: TransferWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-TransferWnd.obj -MD -MP -MF "$(DEPDIR)/amule-TransferWnd.Tpo" -c -o amule-TransferWnd.obj `if test -f 'TransferWnd.cpp'; then $(CYGPATH_W) 'TransferWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/TransferWnd.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-TransferWnd.Tpo" "$(DEPDIR)/amule-TransferWnd.Po"; else rm -f "$(DEPDIR)/amule-TransferWnd.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-TransferWnd.obj -MD -MP -MF $(DEPDIR)/amule-TransferWnd.Tpo -c -o amule-TransferWnd.obj `if test -f 'TransferWnd.cpp'; then $(CYGPATH_W) 'TransferWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/TransferWnd.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-TransferWnd.Tpo $(DEPDIR)/amule-TransferWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TransferWnd.cpp' object='amule-TransferWnd.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-TransferWnd.obj `if test -f 'TransferWnd.cpp'; then $(CYGPATH_W) 'TransferWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/TransferWnd.cpp'; fi`
 
-amule-IP2Country.o: IP2Country.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-IP2Country.o -MD -MP -MF "$(DEPDIR)/amule-IP2Country.Tpo" -c -o amule-IP2Country.o `test -f 'IP2Country.cpp' || echo '$(srcdir)/'`IP2Country.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-IP2Country.Tpo" "$(DEPDIR)/amule-IP2Country.Po"; else rm -f "$(DEPDIR)/amule-IP2Country.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IP2Country.cpp' object='amule-IP2Country.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-IP2Country.o `test -f 'IP2Country.cpp' || echo '$(srcdir)/'`IP2Country.cpp
-
-amule-IP2Country.obj: IP2Country.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-IP2Country.obj -MD -MP -MF "$(DEPDIR)/amule-IP2Country.Tpo" -c -o amule-IP2Country.obj `if test -f 'IP2Country.cpp'; then $(CYGPATH_W) 'IP2Country.cpp'; else $(CYGPATH_W) '$(srcdir)/IP2Country.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-IP2Country.Tpo" "$(DEPDIR)/amule-IP2Country.Po"; else rm -f "$(DEPDIR)/amule-IP2Country.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IP2Country.cpp' object='amule-IP2Country.obj' libtool=no @AMDEPBACKSLASH@
+amule-amuleAppCommon.o: amuleAppCommon.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amuleAppCommon.o -MD -MP -MF $(DEPDIR)/amule-amuleAppCommon.Tpo -c -o amule-amuleAppCommon.o `test -f 'amuleAppCommon.cpp' || echo '$(srcdir)/'`amuleAppCommon.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-amuleAppCommon.Tpo $(DEPDIR)/amule-amuleAppCommon.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amuleAppCommon.cpp' object='amule-amuleAppCommon.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-amuleAppCommon.o `test -f 'amuleAppCommon.cpp' || echo '$(srcdir)/'`amuleAppCommon.cpp
+
+amule-amuleAppCommon.obj: amuleAppCommon.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-amuleAppCommon.obj -MD -MP -MF $(DEPDIR)/amule-amuleAppCommon.Tpo -c -o amule-amuleAppCommon.obj `if test -f 'amuleAppCommon.cpp'; then $(CYGPATH_W) 'amuleAppCommon.cpp'; else $(CYGPATH_W) '$(srcdir)/amuleAppCommon.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-amuleAppCommon.Tpo $(DEPDIR)/amule-amuleAppCommon.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amuleAppCommon.cpp' object='amule-amuleAppCommon.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-amuleAppCommon.obj `if test -f 'amuleAppCommon.cpp'; then $(CYGPATH_W) 'amuleAppCommon.cpp'; else $(CYGPATH_W) '$(srcdir)/amuleAppCommon.cpp'; fi`
+
+amule-ClientRef.o: ClientRef.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientRef.o -MD -MP -MF $(DEPDIR)/amule-ClientRef.Tpo -c -o amule-ClientRef.o `test -f 'ClientRef.cpp' || echo '$(srcdir)/'`ClientRef.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ClientRef.Tpo $(DEPDIR)/amule-ClientRef.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientRef.cpp' object='amule-ClientRef.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientRef.o `test -f 'ClientRef.cpp' || echo '$(srcdir)/'`ClientRef.cpp
+
+amule-ClientRef.obj: ClientRef.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientRef.obj -MD -MP -MF $(DEPDIR)/amule-ClientRef.Tpo -c -o amule-ClientRef.obj `if test -f 'ClientRef.cpp'; then $(CYGPATH_W) 'ClientRef.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientRef.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ClientRef.Tpo $(DEPDIR)/amule-ClientRef.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientRef.cpp' object='amule-ClientRef.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientRef.obj `if test -f 'ClientRef.cpp'; then $(CYGPATH_W) 'ClientRef.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientRef.cpp'; fi`
+
+amule-DataToText.o: DataToText.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DataToText.o -MD -MP -MF $(DEPDIR)/amule-DataToText.Tpo -c -o amule-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-DataToText.Tpo $(DEPDIR)/amule-DataToText.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DataToText.cpp' object='amule-DataToText.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp
+
+amule-DataToText.obj: DataToText.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-DataToText.obj -MD -MP -MF $(DEPDIR)/amule-DataToText.Tpo -c -o amule-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-DataToText.Tpo $(DEPDIR)/amule-DataToText.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DataToText.cpp' object='amule-DataToText.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-IP2Country.obj `if test -f 'IP2Country.cpp'; then $(CYGPATH_W) 'IP2Country.cpp'; else $(CYGPATH_W) '$(srcdir)/IP2Country.cpp'; fi`
-
-amule-ClientCredits.o: ClientCredits.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientCredits.o -MD -MP -MF "$(DEPDIR)/amule-ClientCredits.Tpo" -c -o amule-ClientCredits.o `test -f 'ClientCredits.cpp' || echo '$(srcdir)/'`ClientCredits.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientCredits.Tpo" "$(DEPDIR)/amule-ClientCredits.Po"; else rm -f "$(DEPDIR)/amule-ClientCredits.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientCredits.cpp' object='amule-ClientCredits.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientCredits.o `test -f 'ClientCredits.cpp' || echo '$(srcdir)/'`ClientCredits.cpp
-
-amule-ClientCredits.obj: ClientCredits.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ClientCredits.obj -MD -MP -MF "$(DEPDIR)/amule-ClientCredits.Tpo" -c -o amule-ClientCredits.obj `if test -f 'ClientCredits.cpp'; then $(CYGPATH_W) 'ClientCredits.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCredits.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ClientCredits.Tpo" "$(DEPDIR)/amule-ClientCredits.Po"; else rm -f "$(DEPDIR)/amule-ClientCredits.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientCredits.cpp' object='amule-ClientCredits.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ClientCredits.obj `if test -f 'ClientCredits.cpp'; then $(CYGPATH_W) 'ClientCredits.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCredits.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi`
 
 amule-ECSpecialMuleTags.o: ECSpecialMuleTags.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ECSpecialMuleTags.o -MD -MP -MF "$(DEPDIR)/amule-ECSpecialMuleTags.Tpo" -c -o amule-ECSpecialMuleTags.o `test -f 'ECSpecialMuleTags.cpp' || echo '$(srcdir)/'`ECSpecialMuleTags.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ECSpecialMuleTags.Tpo" "$(DEPDIR)/amule-ECSpecialMuleTags.Po"; else rm -f "$(DEPDIR)/amule-ECSpecialMuleTags.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ECSpecialMuleTags.o -MD -MP -MF $(DEPDIR)/amule-ECSpecialMuleTags.Tpo -c -o amule-ECSpecialMuleTags.o `test -f 'ECSpecialMuleTags.cpp' || echo '$(srcdir)/'`ECSpecialMuleTags.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ECSpecialMuleTags.Tpo $(DEPDIR)/amule-ECSpecialMuleTags.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ECSpecialMuleTags.cpp' object='amule-ECSpecialMuleTags.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ECSpecialMuleTags.o `test -f 'ECSpecialMuleTags.cpp' || echo '$(srcdir)/'`ECSpecialMuleTags.cpp
 
 amule-ECSpecialMuleTags.obj: ECSpecialMuleTags.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ECSpecialMuleTags.obj -MD -MP -MF "$(DEPDIR)/amule-ECSpecialMuleTags.Tpo" -c -o amule-ECSpecialMuleTags.obj `if test -f 'ECSpecialMuleTags.cpp'; then $(CYGPATH_W) 'ECSpecialMuleTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialMuleTags.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-ECSpecialMuleTags.Tpo" "$(DEPDIR)/amule-ECSpecialMuleTags.Po"; else rm -f "$(DEPDIR)/amule-ECSpecialMuleTags.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-ECSpecialMuleTags.obj -MD -MP -MF $(DEPDIR)/amule-ECSpecialMuleTags.Tpo -c -o amule-ECSpecialMuleTags.obj `if test -f 'ECSpecialMuleTags.cpp'; then $(CYGPATH_W) 'ECSpecialMuleTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialMuleTags.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-ECSpecialMuleTags.Tpo $(DEPDIR)/amule-ECSpecialMuleTags.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ECSpecialMuleTags.cpp' object='amule-ECSpecialMuleTags.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-ECSpecialMuleTags.obj `if test -f 'ECSpecialMuleTags.cpp'; then $(CYGPATH_W) 'ECSpecialMuleTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialMuleTags.cpp'; fi`
 
 amule-KnownFile.o: KnownFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KnownFile.o -MD -MP -MF "$(DEPDIR)/amule-KnownFile.Tpo" -c -o amule-KnownFile.o `test -f 'KnownFile.cpp' || echo '$(srcdir)/'`KnownFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-KnownFile.Tpo" "$(DEPDIR)/amule-KnownFile.Po"; else rm -f "$(DEPDIR)/amule-KnownFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KnownFile.o -MD -MP -MF $(DEPDIR)/amule-KnownFile.Tpo -c -o amule-KnownFile.o `test -f 'KnownFile.cpp' || echo '$(srcdir)/'`KnownFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-KnownFile.Tpo $(DEPDIR)/amule-KnownFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KnownFile.cpp' object='amule-KnownFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-KnownFile.o `test -f 'KnownFile.cpp' || echo '$(srcdir)/'`KnownFile.cpp
 
 amule-KnownFile.obj: KnownFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KnownFile.obj -MD -MP -MF "$(DEPDIR)/amule-KnownFile.Tpo" -c -o amule-KnownFile.obj `if test -f 'KnownFile.cpp'; then $(CYGPATH_W) 'KnownFile.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-KnownFile.Tpo" "$(DEPDIR)/amule-KnownFile.Po"; else rm -f "$(DEPDIR)/amule-KnownFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-KnownFile.obj -MD -MP -MF $(DEPDIR)/amule-KnownFile.Tpo -c -o amule-KnownFile.obj `if test -f 'KnownFile.cpp'; then $(CYGPATH_W) 'KnownFile.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-KnownFile.Tpo $(DEPDIR)/amule-KnownFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KnownFile.cpp' object='amule-KnownFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-KnownFile.obj `if test -f 'KnownFile.cpp'; then $(CYGPATH_W) 'KnownFile.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFile.cpp'; fi`
 
 amule-GetTickCount.o: GetTickCount.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-GetTickCount.o -MD -MP -MF "$(DEPDIR)/amule-GetTickCount.Tpo" -c -o amule-GetTickCount.o `test -f 'GetTickCount.cpp' || echo '$(srcdir)/'`GetTickCount.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-GetTickCount.Tpo" "$(DEPDIR)/amule-GetTickCount.Po"; else rm -f "$(DEPDIR)/amule-GetTickCount.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-GetTickCount.o -MD -MP -MF $(DEPDIR)/amule-GetTickCount.Tpo -c -o amule-GetTickCount.o `test -f 'GetTickCount.cpp' || echo '$(srcdir)/'`GetTickCount.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-GetTickCount.Tpo $(DEPDIR)/amule-GetTickCount.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GetTickCount.cpp' object='amule-GetTickCount.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-GetTickCount.o `test -f 'GetTickCount.cpp' || echo '$(srcdir)/'`GetTickCount.cpp
 
 amule-GetTickCount.obj: GetTickCount.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-GetTickCount.obj -MD -MP -MF "$(DEPDIR)/amule-GetTickCount.Tpo" -c -o amule-GetTickCount.obj `if test -f 'GetTickCount.cpp'; then $(CYGPATH_W) 'GetTickCount.cpp'; else $(CYGPATH_W) '$(srcdir)/GetTickCount.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-GetTickCount.Tpo" "$(DEPDIR)/amule-GetTickCount.Po"; else rm -f "$(DEPDIR)/amule-GetTickCount.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-GetTickCount.obj -MD -MP -MF $(DEPDIR)/amule-GetTickCount.Tpo -c -o amule-GetTickCount.obj `if test -f 'GetTickCount.cpp'; then $(CYGPATH_W) 'GetTickCount.cpp'; else $(CYGPATH_W) '$(srcdir)/GetTickCount.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-GetTickCount.Tpo $(DEPDIR)/amule-GetTickCount.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GetTickCount.cpp' object='amule-GetTickCount.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-GetTickCount.obj `if test -f 'GetTickCount.cpp'; then $(CYGPATH_W) 'GetTickCount.cpp'; else $(CYGPATH_W) '$(srcdir)/GetTickCount.cpp'; fi`
 
 amule-GuiEvents.o: GuiEvents.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-GuiEvents.o -MD -MP -MF "$(DEPDIR)/amule-GuiEvents.Tpo" -c -o amule-GuiEvents.o `test -f 'GuiEvents.cpp' || echo '$(srcdir)/'`GuiEvents.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-GuiEvents.Tpo" "$(DEPDIR)/amule-GuiEvents.Po"; else rm -f "$(DEPDIR)/amule-GuiEvents.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-GuiEvents.o -MD -MP -MF $(DEPDIR)/amule-GuiEvents.Tpo -c -o amule-GuiEvents.o `test -f 'GuiEvents.cpp' || echo '$(srcdir)/'`GuiEvents.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-GuiEvents.Tpo $(DEPDIR)/amule-GuiEvents.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GuiEvents.cpp' object='amule-GuiEvents.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-GuiEvents.o `test -f 'GuiEvents.cpp' || echo '$(srcdir)/'`GuiEvents.cpp
 
 amule-GuiEvents.obj: GuiEvents.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-GuiEvents.obj -MD -MP -MF "$(DEPDIR)/amule-GuiEvents.Tpo" -c -o amule-GuiEvents.obj `if test -f 'GuiEvents.cpp'; then $(CYGPATH_W) 'GuiEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/GuiEvents.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-GuiEvents.Tpo" "$(DEPDIR)/amule-GuiEvents.Po"; else rm -f "$(DEPDIR)/amule-GuiEvents.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-GuiEvents.obj -MD -MP -MF $(DEPDIR)/amule-GuiEvents.Tpo -c -o amule-GuiEvents.obj `if test -f 'GuiEvents.cpp'; then $(CYGPATH_W) 'GuiEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/GuiEvents.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-GuiEvents.Tpo $(DEPDIR)/amule-GuiEvents.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GuiEvents.cpp' object='amule-GuiEvents.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-GuiEvents.obj `if test -f 'GuiEvents.cpp'; then $(CYGPATH_W) 'GuiEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/GuiEvents.cpp'; fi`
 
+amule-HTTPDownload.o: HTTPDownload.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-HTTPDownload.o -MD -MP -MF $(DEPDIR)/amule-HTTPDownload.Tpo -c -o amule-HTTPDownload.o `test -f 'HTTPDownload.cpp' || echo '$(srcdir)/'`HTTPDownload.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-HTTPDownload.Tpo $(DEPDIR)/amule-HTTPDownload.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HTTPDownload.cpp' object='amule-HTTPDownload.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-HTTPDownload.o `test -f 'HTTPDownload.cpp' || echo '$(srcdir)/'`HTTPDownload.cpp
+
+amule-HTTPDownload.obj: HTTPDownload.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-HTTPDownload.obj -MD -MP -MF $(DEPDIR)/amule-HTTPDownload.Tpo -c -o amule-HTTPDownload.obj `if test -f 'HTTPDownload.cpp'; then $(CYGPATH_W) 'HTTPDownload.cpp'; else $(CYGPATH_W) '$(srcdir)/HTTPDownload.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-HTTPDownload.Tpo $(DEPDIR)/amule-HTTPDownload.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HTTPDownload.cpp' object='amule-HTTPDownload.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-HTTPDownload.obj `if test -f 'HTTPDownload.cpp'; then $(CYGPATH_W) 'HTTPDownload.cpp'; else $(CYGPATH_W) '$(srcdir)/HTTPDownload.cpp'; fi`
+
 amule-Logger.o: Logger.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Logger.o -MD -MP -MF "$(DEPDIR)/amule-Logger.Tpo" -c -o amule-Logger.o `test -f 'Logger.cpp' || echo '$(srcdir)/'`Logger.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Logger.Tpo" "$(DEPDIR)/amule-Logger.Po"; else rm -f "$(DEPDIR)/amule-Logger.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Logger.o -MD -MP -MF $(DEPDIR)/amule-Logger.Tpo -c -o amule-Logger.o `test -f 'Logger.cpp' || echo '$(srcdir)/'`Logger.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Logger.Tpo $(DEPDIR)/amule-Logger.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Logger.cpp' object='amule-Logger.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Logger.o `test -f 'Logger.cpp' || echo '$(srcdir)/'`Logger.cpp
 
 amule-Logger.obj: Logger.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Logger.obj -MD -MP -MF "$(DEPDIR)/amule-Logger.Tpo" -c -o amule-Logger.obj `if test -f 'Logger.cpp'; then $(CYGPATH_W) 'Logger.cpp'; else $(CYGPATH_W) '$(srcdir)/Logger.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Logger.Tpo" "$(DEPDIR)/amule-Logger.Po"; else rm -f "$(DEPDIR)/amule-Logger.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Logger.obj -MD -MP -MF $(DEPDIR)/amule-Logger.Tpo -c -o amule-Logger.obj `if test -f 'Logger.cpp'; then $(CYGPATH_W) 'Logger.cpp'; else $(CYGPATH_W) '$(srcdir)/Logger.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Logger.Tpo $(DEPDIR)/amule-Logger.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Logger.cpp' object='amule-Logger.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Logger.obj `if test -f 'Logger.cpp'; then $(CYGPATH_W) 'Logger.cpp'; else $(CYGPATH_W) '$(srcdir)/Logger.cpp'; fi`
 
 amule-PartFile.o: PartFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PartFile.o -MD -MP -MF "$(DEPDIR)/amule-PartFile.Tpo" -c -o amule-PartFile.o `test -f 'PartFile.cpp' || echo '$(srcdir)/'`PartFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-PartFile.Tpo" "$(DEPDIR)/amule-PartFile.Po"; else rm -f "$(DEPDIR)/amule-PartFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PartFile.o -MD -MP -MF $(DEPDIR)/amule-PartFile.Tpo -c -o amule-PartFile.o `test -f 'PartFile.cpp' || echo '$(srcdir)/'`PartFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-PartFile.Tpo $(DEPDIR)/amule-PartFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFile.cpp' object='amule-PartFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PartFile.o `test -f 'PartFile.cpp' || echo '$(srcdir)/'`PartFile.cpp
 
 amule-PartFile.obj: PartFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PartFile.obj -MD -MP -MF "$(DEPDIR)/amule-PartFile.Tpo" -c -o amule-PartFile.obj `if test -f 'PartFile.cpp'; then $(CYGPATH_W) 'PartFile.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-PartFile.Tpo" "$(DEPDIR)/amule-PartFile.Po"; else rm -f "$(DEPDIR)/amule-PartFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-PartFile.obj -MD -MP -MF $(DEPDIR)/amule-PartFile.Tpo -c -o amule-PartFile.obj `if test -f 'PartFile.cpp'; then $(CYGPATH_W) 'PartFile.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-PartFile.Tpo $(DEPDIR)/amule-PartFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFile.cpp' object='amule-PartFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-PartFile.obj `if test -f 'PartFile.cpp'; then $(CYGPATH_W) 'PartFile.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFile.cpp'; fi`
 
 amule-Preferences.o: Preferences.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Preferences.o -MD -MP -MF "$(DEPDIR)/amule-Preferences.Tpo" -c -o amule-Preferences.o `test -f 'Preferences.cpp' || echo '$(srcdir)/'`Preferences.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Preferences.Tpo" "$(DEPDIR)/amule-Preferences.Po"; else rm -f "$(DEPDIR)/amule-Preferences.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Preferences.o -MD -MP -MF $(DEPDIR)/amule-Preferences.Tpo -c -o amule-Preferences.o `test -f 'Preferences.cpp' || echo '$(srcdir)/'`Preferences.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Preferences.Tpo $(DEPDIR)/amule-Preferences.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Preferences.cpp' object='amule-Preferences.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Preferences.o `test -f 'Preferences.cpp' || echo '$(srcdir)/'`Preferences.cpp
 
 amule-Preferences.obj: Preferences.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Preferences.obj -MD -MP -MF "$(DEPDIR)/amule-Preferences.Tpo" -c -o amule-Preferences.obj `if test -f 'Preferences.cpp'; then $(CYGPATH_W) 'Preferences.cpp'; else $(CYGPATH_W) '$(srcdir)/Preferences.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Preferences.Tpo" "$(DEPDIR)/amule-Preferences.Po"; else rm -f "$(DEPDIR)/amule-Preferences.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Preferences.obj -MD -MP -MF $(DEPDIR)/amule-Preferences.Tpo -c -o amule-Preferences.obj `if test -f 'Preferences.cpp'; then $(CYGPATH_W) 'Preferences.cpp'; else $(CYGPATH_W) '$(srcdir)/Preferences.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Preferences.Tpo $(DEPDIR)/amule-Preferences.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Preferences.cpp' object='amule-Preferences.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Preferences.obj `if test -f 'Preferences.cpp'; then $(CYGPATH_W) 'Preferences.cpp'; else $(CYGPATH_W) '$(srcdir)/Preferences.cpp'; fi`
 
 amule-Proxy.o: Proxy.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Proxy.o -MD -MP -MF "$(DEPDIR)/amule-Proxy.Tpo" -c -o amule-Proxy.o `test -f 'Proxy.cpp' || echo '$(srcdir)/'`Proxy.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Proxy.Tpo" "$(DEPDIR)/amule-Proxy.Po"; else rm -f "$(DEPDIR)/amule-Proxy.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Proxy.o -MD -MP -MF $(DEPDIR)/amule-Proxy.Tpo -c -o amule-Proxy.o `test -f 'Proxy.cpp' || echo '$(srcdir)/'`Proxy.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Proxy.Tpo $(DEPDIR)/amule-Proxy.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Proxy.cpp' object='amule-Proxy.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Proxy.o `test -f 'Proxy.cpp' || echo '$(srcdir)/'`Proxy.cpp
 
 amule-Proxy.obj: Proxy.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Proxy.obj -MD -MP -MF "$(DEPDIR)/amule-Proxy.Tpo" -c -o amule-Proxy.obj `if test -f 'Proxy.cpp'; then $(CYGPATH_W) 'Proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/Proxy.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Proxy.Tpo" "$(DEPDIR)/amule-Proxy.Po"; else rm -f "$(DEPDIR)/amule-Proxy.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Proxy.obj -MD -MP -MF $(DEPDIR)/amule-Proxy.Tpo -c -o amule-Proxy.obj `if test -f 'Proxy.cpp'; then $(CYGPATH_W) 'Proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/Proxy.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Proxy.Tpo $(DEPDIR)/amule-Proxy.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Proxy.cpp' object='amule-Proxy.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Proxy.obj `if test -f 'Proxy.cpp'; then $(CYGPATH_W) 'Proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/Proxy.cpp'; fi`
 
 amule-Server.o: Server.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Server.o -MD -MP -MF "$(DEPDIR)/amule-Server.Tpo" -c -o amule-Server.o `test -f 'Server.cpp' || echo '$(srcdir)/'`Server.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Server.Tpo" "$(DEPDIR)/amule-Server.Po"; else rm -f "$(DEPDIR)/amule-Server.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Server.o -MD -MP -MF $(DEPDIR)/amule-Server.Tpo -c -o amule-Server.o `test -f 'Server.cpp' || echo '$(srcdir)/'`Server.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Server.Tpo $(DEPDIR)/amule-Server.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Server.cpp' object='amule-Server.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Server.o `test -f 'Server.cpp' || echo '$(srcdir)/'`Server.cpp
 
 amule-Server.obj: Server.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Server.obj -MD -MP -MF "$(DEPDIR)/amule-Server.Tpo" -c -o amule-Server.obj `if test -f 'Server.cpp'; then $(CYGPATH_W) 'Server.cpp'; else $(CYGPATH_W) '$(srcdir)/Server.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Server.Tpo" "$(DEPDIR)/amule-Server.Po"; else rm -f "$(DEPDIR)/amule-Server.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Server.obj -MD -MP -MF $(DEPDIR)/amule-Server.Tpo -c -o amule-Server.obj `if test -f 'Server.cpp'; then $(CYGPATH_W) 'Server.cpp'; else $(CYGPATH_W) '$(srcdir)/Server.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Server.Tpo $(DEPDIR)/amule-Server.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Server.cpp' object='amule-Server.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Server.obj `if test -f 'Server.cpp'; then $(CYGPATH_W) 'Server.cpp'; else $(CYGPATH_W) '$(srcdir)/Server.cpp'; fi`
 
 amule-Statistics.o: Statistics.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Statistics.o -MD -MP -MF "$(DEPDIR)/amule-Statistics.Tpo" -c -o amule-Statistics.o `test -f 'Statistics.cpp' || echo '$(srcdir)/'`Statistics.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Statistics.Tpo" "$(DEPDIR)/amule-Statistics.Po"; else rm -f "$(DEPDIR)/amule-Statistics.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Statistics.o -MD -MP -MF $(DEPDIR)/amule-Statistics.Tpo -c -o amule-Statistics.o `test -f 'Statistics.cpp' || echo '$(srcdir)/'`Statistics.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Statistics.Tpo $(DEPDIR)/amule-Statistics.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Statistics.cpp' object='amule-Statistics.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Statistics.o `test -f 'Statistics.cpp' || echo '$(srcdir)/'`Statistics.cpp
 
 amule-Statistics.obj: Statistics.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Statistics.obj -MD -MP -MF "$(DEPDIR)/amule-Statistics.Tpo" -c -o amule-Statistics.obj `if test -f 'Statistics.cpp'; then $(CYGPATH_W) 'Statistics.cpp'; else $(CYGPATH_W) '$(srcdir)/Statistics.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-Statistics.Tpo" "$(DEPDIR)/amule-Statistics.Po"; else rm -f "$(DEPDIR)/amule-Statistics.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-Statistics.obj -MD -MP -MF $(DEPDIR)/amule-Statistics.Tpo -c -o amule-Statistics.obj `if test -f 'Statistics.cpp'; then $(CYGPATH_W) 'Statistics.cpp'; else $(CYGPATH_W) '$(srcdir)/Statistics.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-Statistics.Tpo $(DEPDIR)/amule-Statistics.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Statistics.cpp' object='amule-Statistics.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-Statistics.obj `if test -f 'Statistics.cpp'; then $(CYGPATH_W) 'Statistics.cpp'; else $(CYGPATH_W) '$(srcdir)/Statistics.cpp'; fi`
 
 amule-StatTree.o: StatTree.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-StatTree.o -MD -MP -MF "$(DEPDIR)/amule-StatTree.Tpo" -c -o amule-StatTree.o `test -f 'StatTree.cpp' || echo '$(srcdir)/'`StatTree.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-StatTree.Tpo" "$(DEPDIR)/amule-StatTree.Po"; else rm -f "$(DEPDIR)/amule-StatTree.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-StatTree.o -MD -MP -MF $(DEPDIR)/amule-StatTree.Tpo -c -o amule-StatTree.o `test -f 'StatTree.cpp' || echo '$(srcdir)/'`StatTree.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-StatTree.Tpo $(DEPDIR)/amule-StatTree.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StatTree.cpp' object='amule-StatTree.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-StatTree.o `test -f 'StatTree.cpp' || echo '$(srcdir)/'`StatTree.cpp
 
 amule-StatTree.obj: StatTree.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-StatTree.obj -MD -MP -MF "$(DEPDIR)/amule-StatTree.Tpo" -c -o amule-StatTree.obj `if test -f 'StatTree.cpp'; then $(CYGPATH_W) 'StatTree.cpp'; else $(CYGPATH_W) '$(srcdir)/StatTree.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-StatTree.Tpo" "$(DEPDIR)/amule-StatTree.Po"; else rm -f "$(DEPDIR)/amule-StatTree.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-StatTree.obj -MD -MP -MF $(DEPDIR)/amule-StatTree.Tpo -c -o amule-StatTree.obj `if test -f 'StatTree.cpp'; then $(CYGPATH_W) 'StatTree.cpp'; else $(CYGPATH_W) '$(srcdir)/StatTree.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-StatTree.Tpo $(DEPDIR)/amule-StatTree.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StatTree.cpp' object='amule-StatTree.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-StatTree.obj `if test -f 'StatTree.cpp'; then $(CYGPATH_W) 'StatTree.cpp'; else $(CYGPATH_W) '$(srcdir)/StatTree.cpp'; fi`
 
-amule-SHAHashSet.o: SHAHashSet.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SHAHashSet.o -MD -MP -MF "$(DEPDIR)/amule-SHAHashSet.Tpo" -c -o amule-SHAHashSet.o `test -f 'SHAHashSet.cpp' || echo '$(srcdir)/'`SHAHashSet.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SHAHashSet.Tpo" "$(DEPDIR)/amule-SHAHashSet.Po"; else rm -f "$(DEPDIR)/amule-SHAHashSet.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SHAHashSet.cpp' object='amule-SHAHashSet.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SHAHashSet.o `test -f 'SHAHashSet.cpp' || echo '$(srcdir)/'`SHAHashSet.cpp
-
-amule-SHAHashSet.obj: SHAHashSet.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-SHAHashSet.obj -MD -MP -MF "$(DEPDIR)/amule-SHAHashSet.Tpo" -c -o amule-SHAHashSet.obj `if test -f 'SHAHashSet.cpp'; then $(CYGPATH_W) 'SHAHashSet.cpp'; else $(CYGPATH_W) '$(srcdir)/SHAHashSet.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-SHAHashSet.Tpo" "$(DEPDIR)/amule-SHAHashSet.Po"; else rm -f "$(DEPDIR)/amule-SHAHashSet.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SHAHashSet.cpp' object='amule-SHAHashSet.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-SHAHashSet.obj `if test -f 'SHAHashSet.cpp'; then $(CYGPATH_W) 'SHAHashSet.cpp'; else $(CYGPATH_W) '$(srcdir)/SHAHashSet.cpp'; fi`
-
-amule-TerminationProcess.o: TerminationProcess.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-TerminationProcess.o -MD -MP -MF "$(DEPDIR)/amule-TerminationProcess.Tpo" -c -o amule-TerminationProcess.o `test -f 'TerminationProcess.cpp' || echo '$(srcdir)/'`TerminationProcess.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-TerminationProcess.Tpo" "$(DEPDIR)/amule-TerminationProcess.Po"; else rm -f "$(DEPDIR)/amule-TerminationProcess.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcess.cpp' object='amule-TerminationProcess.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-TerminationProcess.o `test -f 'TerminationProcess.cpp' || echo '$(srcdir)/'`TerminationProcess.cpp
-
-amule-TerminationProcess.obj: TerminationProcess.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-TerminationProcess.obj -MD -MP -MF "$(DEPDIR)/amule-TerminationProcess.Tpo" -c -o amule-TerminationProcess.obj `if test -f 'TerminationProcess.cpp'; then $(CYGPATH_W) 'TerminationProcess.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcess.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-TerminationProcess.Tpo" "$(DEPDIR)/amule-TerminationProcess.Po"; else rm -f "$(DEPDIR)/amule-TerminationProcess.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcess.cpp' object='amule-TerminationProcess.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-TerminationProcess.obj `if test -f 'TerminationProcess.cpp'; then $(CYGPATH_W) 'TerminationProcess.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcess.cpp'; fi`
-
-amule-TerminationProcessAmuleweb.o: TerminationProcessAmuleweb.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-TerminationProcessAmuleweb.o -MD -MP -MF "$(DEPDIR)/amule-TerminationProcessAmuleweb.Tpo" -c -o amule-TerminationProcessAmuleweb.o `test -f 'TerminationProcessAmuleweb.cpp' || echo '$(srcdir)/'`TerminationProcessAmuleweb.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-TerminationProcessAmuleweb.Tpo" "$(DEPDIR)/amule-TerminationProcessAmuleweb.Po"; else rm -f "$(DEPDIR)/amule-TerminationProcessAmuleweb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcessAmuleweb.cpp' object='amule-TerminationProcessAmuleweb.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-TerminationProcessAmuleweb.o `test -f 'TerminationProcessAmuleweb.cpp' || echo '$(srcdir)/'`TerminationProcessAmuleweb.cpp
-
-amule-TerminationProcessAmuleweb.obj: TerminationProcessAmuleweb.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-TerminationProcessAmuleweb.obj -MD -MP -MF "$(DEPDIR)/amule-TerminationProcessAmuleweb.Tpo" -c -o amule-TerminationProcessAmuleweb.obj `if test -f 'TerminationProcessAmuleweb.cpp'; then $(CYGPATH_W) 'TerminationProcessAmuleweb.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcessAmuleweb.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-TerminationProcessAmuleweb.Tpo" "$(DEPDIR)/amule-TerminationProcessAmuleweb.Po"; else rm -f "$(DEPDIR)/amule-TerminationProcessAmuleweb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcessAmuleweb.cpp' object='amule-TerminationProcessAmuleweb.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-TerminationProcessAmuleweb.obj `if test -f 'TerminationProcessAmuleweb.cpp'; then $(CYGPATH_W) 'TerminationProcessAmuleweb.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcessAmuleweb.cpp'; fi`
-
 amule-UserEvents.o: UserEvents.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UserEvents.o -MD -MP -MF "$(DEPDIR)/amule-UserEvents.Tpo" -c -o amule-UserEvents.o `test -f 'UserEvents.cpp' || echo '$(srcdir)/'`UserEvents.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UserEvents.Tpo" "$(DEPDIR)/amule-UserEvents.Po"; else rm -f "$(DEPDIR)/amule-UserEvents.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UserEvents.o -MD -MP -MF $(DEPDIR)/amule-UserEvents.Tpo -c -o amule-UserEvents.o `test -f 'UserEvents.cpp' || echo '$(srcdir)/'`UserEvents.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-UserEvents.Tpo $(DEPDIR)/amule-UserEvents.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UserEvents.cpp' object='amule-UserEvents.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UserEvents.o `test -f 'UserEvents.cpp' || echo '$(srcdir)/'`UserEvents.cpp
 
 amule-UserEvents.obj: UserEvents.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UserEvents.obj -MD -MP -MF "$(DEPDIR)/amule-UserEvents.Tpo" -c -o amule-UserEvents.obj `if test -f 'UserEvents.cpp'; then $(CYGPATH_W) 'UserEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/UserEvents.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-UserEvents.Tpo" "$(DEPDIR)/amule-UserEvents.Po"; else rm -f "$(DEPDIR)/amule-UserEvents.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-UserEvents.obj -MD -MP -MF $(DEPDIR)/amule-UserEvents.Tpo -c -o amule-UserEvents.obj `if test -f 'UserEvents.cpp'; then $(CYGPATH_W) 'UserEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/UserEvents.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amule-UserEvents.Tpo $(DEPDIR)/amule-UserEvents.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UserEvents.cpp' object='amule-UserEvents.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-UserEvents.obj `if test -f 'UserEvents.cpp'; then $(CYGPATH_W) 'UserEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/UserEvents.cpp'; fi`
 
-amule-OtherFunctions.o: OtherFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-OtherFunctions.o -MD -MP -MF "$(DEPDIR)/amule-OtherFunctions.Tpo" -c -o amule-OtherFunctions.o `test -f 'OtherFunctions.cpp' || echo '$(srcdir)/'`OtherFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-OtherFunctions.Tpo" "$(DEPDIR)/amule-OtherFunctions.Po"; else rm -f "$(DEPDIR)/amule-OtherFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OtherFunctions.cpp' object='amule-OtherFunctions.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-OtherFunctions.o `test -f 'OtherFunctions.cpp' || echo '$(srcdir)/'`OtherFunctions.cpp
-
-amule-OtherFunctions.obj: OtherFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-OtherFunctions.obj -MD -MP -MF "$(DEPDIR)/amule-OtherFunctions.Tpo" -c -o amule-OtherFunctions.obj `if test -f 'OtherFunctions.cpp'; then $(CYGPATH_W) 'OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/OtherFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-OtherFunctions.Tpo" "$(DEPDIR)/amule-OtherFunctions.Po"; else rm -f "$(DEPDIR)/amule-OtherFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OtherFunctions.cpp' object='amule-OtherFunctions.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-OtherFunctions.obj `if test -f 'OtherFunctions.cpp'; then $(CYGPATH_W) 'OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/OtherFunctions.cpp'; fi`
-
-amule-NetworkFunctions.o: NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-NetworkFunctions.o -MD -MP -MF "$(DEPDIR)/amule-NetworkFunctions.Tpo" -c -o amule-NetworkFunctions.o `test -f 'NetworkFunctions.cpp' || echo '$(srcdir)/'`NetworkFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-NetworkFunctions.Tpo" "$(DEPDIR)/amule-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/amule-NetworkFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NetworkFunctions.cpp' object='amule-NetworkFunctions.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-NetworkFunctions.o `test -f 'NetworkFunctions.cpp' || echo '$(srcdir)/'`NetworkFunctions.cpp
-
-amule-NetworkFunctions.obj: NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -MT amule-NetworkFunctions.obj -MD -MP -MF "$(DEPDIR)/amule-NetworkFunctions.Tpo" -c -o amule-NetworkFunctions.obj `if test -f 'NetworkFunctions.cpp'; then $(CYGPATH_W) 'NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amule-NetworkFunctions.Tpo" "$(DEPDIR)/amule-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/amule-NetworkFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NetworkFunctions.cpp' object='amule-NetworkFunctions.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amule_CPPFLAGS) $(CPPFLAGS) $(amule_CXXFLAGS) $(CXXFLAGS) -c -o amule-NetworkFunctions.obj `if test -f 'NetworkFunctions.cpp'; then $(CYGPATH_W) 'NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctions.cpp'; fi`
-
 amulecmd-TextClient.o: TextClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-TextClient.o -MD -MP -MF "$(DEPDIR)/amulecmd-TextClient.Tpo" -c -o amulecmd-TextClient.o `test -f 'TextClient.cpp' || echo '$(srcdir)/'`TextClient.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulecmd-TextClient.Tpo" "$(DEPDIR)/amulecmd-TextClient.Po"; else rm -f "$(DEPDIR)/amulecmd-TextClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-TextClient.o -MD -MP -MF $(DEPDIR)/amulecmd-TextClient.Tpo -c -o amulecmd-TextClient.o `test -f 'TextClient.cpp' || echo '$(srcdir)/'`TextClient.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-TextClient.Tpo $(DEPDIR)/amulecmd-TextClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TextClient.cpp' object='amulecmd-TextClient.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-TextClient.o `test -f 'TextClient.cpp' || echo '$(srcdir)/'`TextClient.cpp
 
 amulecmd-TextClient.obj: TextClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-TextClient.obj -MD -MP -MF "$(DEPDIR)/amulecmd-TextClient.Tpo" -c -o amulecmd-TextClient.obj `if test -f 'TextClient.cpp'; then $(CYGPATH_W) 'TextClient.cpp'; else $(CYGPATH_W) '$(srcdir)/TextClient.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulecmd-TextClient.Tpo" "$(DEPDIR)/amulecmd-TextClient.Po"; else rm -f "$(DEPDIR)/amulecmd-TextClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-TextClient.obj -MD -MP -MF $(DEPDIR)/amulecmd-TextClient.Tpo -c -o amulecmd-TextClient.obj `if test -f 'TextClient.cpp'; then $(CYGPATH_W) 'TextClient.cpp'; else $(CYGPATH_W) '$(srcdir)/TextClient.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-TextClient.Tpo $(DEPDIR)/amulecmd-TextClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TextClient.cpp' object='amulecmd-TextClient.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-TextClient.obj `if test -f 'TextClient.cpp'; then $(CYGPATH_W) 'TextClient.cpp'; else $(CYGPATH_W) '$(srcdir)/TextClient.cpp'; fi`
 
 amulecmd-ExternalConnector.o: ExternalConnector.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-ExternalConnector.o -MD -MP -MF "$(DEPDIR)/amulecmd-ExternalConnector.Tpo" -c -o amulecmd-ExternalConnector.o `test -f 'ExternalConnector.cpp' || echo '$(srcdir)/'`ExternalConnector.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulecmd-ExternalConnector.Tpo" "$(DEPDIR)/amulecmd-ExternalConnector.Po"; else rm -f "$(DEPDIR)/amulecmd-ExternalConnector.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-ExternalConnector.o -MD -MP -MF $(DEPDIR)/amulecmd-ExternalConnector.Tpo -c -o amulecmd-ExternalConnector.o `test -f 'ExternalConnector.cpp' || echo '$(srcdir)/'`ExternalConnector.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-ExternalConnector.Tpo $(DEPDIR)/amulecmd-ExternalConnector.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ExternalConnector.cpp' object='amulecmd-ExternalConnector.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-ExternalConnector.o `test -f 'ExternalConnector.cpp' || echo '$(srcdir)/'`ExternalConnector.cpp
 
 amulecmd-ExternalConnector.obj: ExternalConnector.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-ExternalConnector.obj -MD -MP -MF "$(DEPDIR)/amulecmd-ExternalConnector.Tpo" -c -o amulecmd-ExternalConnector.obj `if test -f 'ExternalConnector.cpp'; then $(CYGPATH_W) 'ExternalConnector.cpp'; else $(CYGPATH_W) '$(srcdir)/ExternalConnector.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulecmd-ExternalConnector.Tpo" "$(DEPDIR)/amulecmd-ExternalConnector.Po"; else rm -f "$(DEPDIR)/amulecmd-ExternalConnector.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-ExternalConnector.obj -MD -MP -MF $(DEPDIR)/amulecmd-ExternalConnector.Tpo -c -o amulecmd-ExternalConnector.obj `if test -f 'ExternalConnector.cpp'; then $(CYGPATH_W) 'ExternalConnector.cpp'; else $(CYGPATH_W) '$(srcdir)/ExternalConnector.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-ExternalConnector.Tpo $(DEPDIR)/amulecmd-ExternalConnector.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ExternalConnector.cpp' object='amulecmd-ExternalConnector.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-ExternalConnector.obj `if test -f 'ExternalConnector.cpp'; then $(CYGPATH_W) 'ExternalConnector.cpp'; else $(CYGPATH_W) '$(srcdir)/ExternalConnector.cpp'; fi`
 
+amulecmd-LoggerConsole.o: LoggerConsole.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-LoggerConsole.o -MD -MP -MF $(DEPDIR)/amulecmd-LoggerConsole.Tpo -c -o amulecmd-LoggerConsole.o `test -f 'LoggerConsole.cpp' || echo '$(srcdir)/'`LoggerConsole.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-LoggerConsole.Tpo $(DEPDIR)/amulecmd-LoggerConsole.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='LoggerConsole.cpp' object='amulecmd-LoggerConsole.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-LoggerConsole.o `test -f 'LoggerConsole.cpp' || echo '$(srcdir)/'`LoggerConsole.cpp
+
+amulecmd-LoggerConsole.obj: LoggerConsole.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-LoggerConsole.obj -MD -MP -MF $(DEPDIR)/amulecmd-LoggerConsole.Tpo -c -o amulecmd-LoggerConsole.obj `if test -f 'LoggerConsole.cpp'; then $(CYGPATH_W) 'LoggerConsole.cpp'; else $(CYGPATH_W) '$(srcdir)/LoggerConsole.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-LoggerConsole.Tpo $(DEPDIR)/amulecmd-LoggerConsole.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='LoggerConsole.cpp' object='amulecmd-LoggerConsole.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-LoggerConsole.obj `if test -f 'LoggerConsole.cpp'; then $(CYGPATH_W) 'LoggerConsole.cpp'; else $(CYGPATH_W) '$(srcdir)/LoggerConsole.cpp'; fi`
+
 amulecmd-OtherFunctions.o: OtherFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-OtherFunctions.o -MD -MP -MF "$(DEPDIR)/amulecmd-OtherFunctions.Tpo" -c -o amulecmd-OtherFunctions.o `test -f 'OtherFunctions.cpp' || echo '$(srcdir)/'`OtherFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulecmd-OtherFunctions.Tpo" "$(DEPDIR)/amulecmd-OtherFunctions.Po"; else rm -f "$(DEPDIR)/amulecmd-OtherFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-OtherFunctions.o -MD -MP -MF $(DEPDIR)/amulecmd-OtherFunctions.Tpo -c -o amulecmd-OtherFunctions.o `test -f 'OtherFunctions.cpp' || echo '$(srcdir)/'`OtherFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-OtherFunctions.Tpo $(DEPDIR)/amulecmd-OtherFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OtherFunctions.cpp' object='amulecmd-OtherFunctions.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-OtherFunctions.o `test -f 'OtherFunctions.cpp' || echo '$(srcdir)/'`OtherFunctions.cpp
 
 amulecmd-OtherFunctions.obj: OtherFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-OtherFunctions.obj -MD -MP -MF "$(DEPDIR)/amulecmd-OtherFunctions.Tpo" -c -o amulecmd-OtherFunctions.obj `if test -f 'OtherFunctions.cpp'; then $(CYGPATH_W) 'OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/OtherFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulecmd-OtherFunctions.Tpo" "$(DEPDIR)/amulecmd-OtherFunctions.Po"; else rm -f "$(DEPDIR)/amulecmd-OtherFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-OtherFunctions.obj -MD -MP -MF $(DEPDIR)/amulecmd-OtherFunctions.Tpo -c -o amulecmd-OtherFunctions.obj `if test -f 'OtherFunctions.cpp'; then $(CYGPATH_W) 'OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/OtherFunctions.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-OtherFunctions.Tpo $(DEPDIR)/amulecmd-OtherFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OtherFunctions.cpp' object='amulecmd-OtherFunctions.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-OtherFunctions.obj `if test -f 'OtherFunctions.cpp'; then $(CYGPATH_W) 'OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/OtherFunctions.cpp'; fi`
 
 amulecmd-NetworkFunctions.o: NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-NetworkFunctions.o -MD -MP -MF "$(DEPDIR)/amulecmd-NetworkFunctions.Tpo" -c -o amulecmd-NetworkFunctions.o `test -f 'NetworkFunctions.cpp' || echo '$(srcdir)/'`NetworkFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulecmd-NetworkFunctions.Tpo" "$(DEPDIR)/amulecmd-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/amulecmd-NetworkFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-NetworkFunctions.o -MD -MP -MF $(DEPDIR)/amulecmd-NetworkFunctions.Tpo -c -o amulecmd-NetworkFunctions.o `test -f 'NetworkFunctions.cpp' || echo '$(srcdir)/'`NetworkFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-NetworkFunctions.Tpo $(DEPDIR)/amulecmd-NetworkFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NetworkFunctions.cpp' object='amulecmd-NetworkFunctions.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-NetworkFunctions.o `test -f 'NetworkFunctions.cpp' || echo '$(srcdir)/'`NetworkFunctions.cpp
 
 amulecmd-NetworkFunctions.obj: NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-NetworkFunctions.obj -MD -MP -MF "$(DEPDIR)/amulecmd-NetworkFunctions.Tpo" -c -o amulecmd-NetworkFunctions.obj `if test -f 'NetworkFunctions.cpp'; then $(CYGPATH_W) 'NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulecmd-NetworkFunctions.Tpo" "$(DEPDIR)/amulecmd-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/amulecmd-NetworkFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -MT amulecmd-NetworkFunctions.obj -MD -MP -MF $(DEPDIR)/amulecmd-NetworkFunctions.Tpo -c -o amulecmd-NetworkFunctions.obj `if test -f 'NetworkFunctions.cpp'; then $(CYGPATH_W) 'NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctions.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulecmd-NetworkFunctions.Tpo $(DEPDIR)/amulecmd-NetworkFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NetworkFunctions.cpp' object='amulecmd-NetworkFunctions.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulecmd_CPPFLAGS) $(CPPFLAGS) $(amulecmd_CXXFLAGS) $(CXXFLAGS) -c -o amulecmd-NetworkFunctions.obj `if test -f 'NetworkFunctions.cpp'; then $(CYGPATH_W) 'NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctions.cpp'; fi`
 
 amuled-amuled.o: amuled.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-amuled.o -MD -MP -MF "$(DEPDIR)/amuled-amuled.Tpo" -c -o amuled-amuled.o `test -f 'amuled.cpp' || echo '$(srcdir)/'`amuled.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-amuled.Tpo" "$(DEPDIR)/amuled-amuled.Po"; else rm -f "$(DEPDIR)/amuled-amuled.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-amuled.o -MD -MP -MF $(DEPDIR)/amuled-amuled.Tpo -c -o amuled-amuled.o `test -f 'amuled.cpp' || echo '$(srcdir)/'`amuled.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-amuled.Tpo $(DEPDIR)/amuled-amuled.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amuled.cpp' object='amuled-amuled.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-amuled.o `test -f 'amuled.cpp' || echo '$(srcdir)/'`amuled.cpp
 
 amuled-amuled.obj: amuled.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-amuled.obj -MD -MP -MF "$(DEPDIR)/amuled-amuled.Tpo" -c -o amuled-amuled.obj `if test -f 'amuled.cpp'; then $(CYGPATH_W) 'amuled.cpp'; else $(CYGPATH_W) '$(srcdir)/amuled.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-amuled.Tpo" "$(DEPDIR)/amuled-amuled.Po"; else rm -f "$(DEPDIR)/amuled-amuled.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-amuled.obj -MD -MP -MF $(DEPDIR)/amuled-amuled.Tpo -c -o amuled-amuled.obj `if test -f 'amuled.cpp'; then $(CYGPATH_W) 'amuled.cpp'; else $(CYGPATH_W) '$(srcdir)/amuled.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-amuled.Tpo $(DEPDIR)/amuled-amuled.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amuled.cpp' object='amuled-amuled.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-amuled.obj `if test -f 'amuled.cpp'; then $(CYGPATH_W) 'amuled.cpp'; else $(CYGPATH_W) '$(srcdir)/amuled.cpp'; fi`
 
-amuled-Timer.o: Timer.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Timer.o -MD -MP -MF "$(DEPDIR)/amuled-Timer.Tpo" -c -o amuled-Timer.o `test -f 'Timer.cpp' || echo '$(srcdir)/'`Timer.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Timer.Tpo" "$(DEPDIR)/amuled-Timer.Po"; else rm -f "$(DEPDIR)/amuled-Timer.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Timer.cpp' object='amuled-Timer.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Timer.o `test -f 'Timer.cpp' || echo '$(srcdir)/'`Timer.cpp
-
-amuled-Timer.obj: Timer.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Timer.obj -MD -MP -MF "$(DEPDIR)/amuled-Timer.Tpo" -c -o amuled-Timer.obj `if test -f 'Timer.cpp'; then $(CYGPATH_W) 'Timer.cpp'; else $(CYGPATH_W) '$(srcdir)/Timer.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Timer.Tpo" "$(DEPDIR)/amuled-Timer.Po"; else rm -f "$(DEPDIR)/amuled-Timer.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Timer.cpp' object='amuled-Timer.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Timer.obj `if test -f 'Timer.cpp'; then $(CYGPATH_W) 'Timer.cpp'; else $(CYGPATH_W) '$(srcdir)/Timer.cpp'; fi`
-
-amuled-RC4Encrypt.o: RC4Encrypt.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-RC4Encrypt.o -MD -MP -MF "$(DEPDIR)/amuled-RC4Encrypt.Tpo" -c -o amuled-RC4Encrypt.o `test -f 'RC4Encrypt.cpp' || echo '$(srcdir)/'`RC4Encrypt.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-RC4Encrypt.Tpo" "$(DEPDIR)/amuled-RC4Encrypt.Po"; else rm -f "$(DEPDIR)/amuled-RC4Encrypt.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RC4Encrypt.cpp' object='amuled-RC4Encrypt.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-RC4Encrypt.o `test -f 'RC4Encrypt.cpp' || echo '$(srcdir)/'`RC4Encrypt.cpp
-
-amuled-RC4Encrypt.obj: RC4Encrypt.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-RC4Encrypt.obj -MD -MP -MF "$(DEPDIR)/amuled-RC4Encrypt.Tpo" -c -o amuled-RC4Encrypt.obj `if test -f 'RC4Encrypt.cpp'; then $(CYGPATH_W) 'RC4Encrypt.cpp'; else $(CYGPATH_W) '$(srcdir)/RC4Encrypt.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-RC4Encrypt.Tpo" "$(DEPDIR)/amuled-RC4Encrypt.Po"; else rm -f "$(DEPDIR)/amuled-RC4Encrypt.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='RC4Encrypt.cpp' object='amuled-RC4Encrypt.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-RC4Encrypt.obj `if test -f 'RC4Encrypt.cpp'; then $(CYGPATH_W) 'RC4Encrypt.cpp'; else $(CYGPATH_W) '$(srcdir)/RC4Encrypt.cpp'; fi`
-
 amuled-amule.o: amule.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-amule.o -MD -MP -MF "$(DEPDIR)/amuled-amule.Tpo" -c -o amuled-amule.o `test -f 'amule.cpp' || echo '$(srcdir)/'`amule.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-amule.Tpo" "$(DEPDIR)/amuled-amule.Po"; else rm -f "$(DEPDIR)/amuled-amule.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-amule.o -MD -MP -MF $(DEPDIR)/amuled-amule.Tpo -c -o amuled-amule.o `test -f 'amule.cpp' || echo '$(srcdir)/'`amule.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-amule.Tpo $(DEPDIR)/amuled-amule.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amule.cpp' object='amuled-amule.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-amule.o `test -f 'amule.cpp' || echo '$(srcdir)/'`amule.cpp
 
 amuled-amule.obj: amule.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-amule.obj -MD -MP -MF "$(DEPDIR)/amuled-amule.Tpo" -c -o amuled-amule.obj `if test -f 'amule.cpp'; then $(CYGPATH_W) 'amule.cpp'; else $(CYGPATH_W) '$(srcdir)/amule.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-amule.Tpo" "$(DEPDIR)/amuled-amule.Po"; else rm -f "$(DEPDIR)/amuled-amule.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-amule.obj -MD -MP -MF $(DEPDIR)/amuled-amule.Tpo -c -o amuled-amule.obj `if test -f 'amule.cpp'; then $(CYGPATH_W) 'amule.cpp'; else $(CYGPATH_W) '$(srcdir)/amule.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-amule.Tpo $(DEPDIR)/amuled-amule.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amule.cpp' object='amuled-amule.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-amule.obj `if test -f 'amule.cpp'; then $(CYGPATH_W) 'amule.cpp'; else $(CYGPATH_W) '$(srcdir)/amule.cpp'; fi`
 
 amuled-BaseClient.o: BaseClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-BaseClient.o -MD -MP -MF "$(DEPDIR)/amuled-BaseClient.Tpo" -c -o amuled-BaseClient.o `test -f 'BaseClient.cpp' || echo '$(srcdir)/'`BaseClient.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-BaseClient.Tpo" "$(DEPDIR)/amuled-BaseClient.Po"; else rm -f "$(DEPDIR)/amuled-BaseClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-BaseClient.o -MD -MP -MF $(DEPDIR)/amuled-BaseClient.Tpo -c -o amuled-BaseClient.o `test -f 'BaseClient.cpp' || echo '$(srcdir)/'`BaseClient.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-BaseClient.Tpo $(DEPDIR)/amuled-BaseClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='BaseClient.cpp' object='amuled-BaseClient.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-BaseClient.o `test -f 'BaseClient.cpp' || echo '$(srcdir)/'`BaseClient.cpp
 
 amuled-BaseClient.obj: BaseClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-BaseClient.obj -MD -MP -MF "$(DEPDIR)/amuled-BaseClient.Tpo" -c -o amuled-BaseClient.obj `if test -f 'BaseClient.cpp'; then $(CYGPATH_W) 'BaseClient.cpp'; else $(CYGPATH_W) '$(srcdir)/BaseClient.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-BaseClient.Tpo" "$(DEPDIR)/amuled-BaseClient.Po"; else rm -f "$(DEPDIR)/amuled-BaseClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-BaseClient.obj -MD -MP -MF $(DEPDIR)/amuled-BaseClient.Tpo -c -o amuled-BaseClient.obj `if test -f 'BaseClient.cpp'; then $(CYGPATH_W) 'BaseClient.cpp'; else $(CYGPATH_W) '$(srcdir)/BaseClient.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-BaseClient.Tpo $(DEPDIR)/amuled-BaseClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='BaseClient.cpp' object='amuled-BaseClient.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-BaseClient.obj `if test -f 'BaseClient.cpp'; then $(CYGPATH_W) 'BaseClient.cpp'; else $(CYGPATH_W) '$(srcdir)/BaseClient.cpp'; fi`
 
+amuled-CanceledFileList.o: CanceledFileList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-CanceledFileList.o -MD -MP -MF $(DEPDIR)/amuled-CanceledFileList.Tpo -c -o amuled-CanceledFileList.o `test -f 'CanceledFileList.cpp' || echo '$(srcdir)/'`CanceledFileList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-CanceledFileList.Tpo $(DEPDIR)/amuled-CanceledFileList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CanceledFileList.cpp' object='amuled-CanceledFileList.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-CanceledFileList.o `test -f 'CanceledFileList.cpp' || echo '$(srcdir)/'`CanceledFileList.cpp
+
+amuled-CanceledFileList.obj: CanceledFileList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-CanceledFileList.obj -MD -MP -MF $(DEPDIR)/amuled-CanceledFileList.Tpo -c -o amuled-CanceledFileList.obj `if test -f 'CanceledFileList.cpp'; then $(CYGPATH_W) 'CanceledFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/CanceledFileList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-CanceledFileList.Tpo $(DEPDIR)/amuled-CanceledFileList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CanceledFileList.cpp' object='amuled-CanceledFileList.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-CanceledFileList.obj `if test -f 'CanceledFileList.cpp'; then $(CYGPATH_W) 'CanceledFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/CanceledFileList.cpp'; fi`
+
 amuled-ClientList.o: ClientList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientList.o -MD -MP -MF "$(DEPDIR)/amuled-ClientList.Tpo" -c -o amuled-ClientList.o `test -f 'ClientList.cpp' || echo '$(srcdir)/'`ClientList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ClientList.Tpo" "$(DEPDIR)/amuled-ClientList.Po"; else rm -f "$(DEPDIR)/amuled-ClientList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientList.o -MD -MP -MF $(DEPDIR)/amuled-ClientList.Tpo -c -o amuled-ClientList.o `test -f 'ClientList.cpp' || echo '$(srcdir)/'`ClientList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ClientList.Tpo $(DEPDIR)/amuled-ClientList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientList.cpp' object='amuled-ClientList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientList.o `test -f 'ClientList.cpp' || echo '$(srcdir)/'`ClientList.cpp
 
 amuled-ClientList.obj: ClientList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientList.obj -MD -MP -MF "$(DEPDIR)/amuled-ClientList.Tpo" -c -o amuled-ClientList.obj `if test -f 'ClientList.cpp'; then $(CYGPATH_W) 'ClientList.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ClientList.Tpo" "$(DEPDIR)/amuled-ClientList.Po"; else rm -f "$(DEPDIR)/amuled-ClientList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientList.obj -MD -MP -MF $(DEPDIR)/amuled-ClientList.Tpo -c -o amuled-ClientList.obj `if test -f 'ClientList.cpp'; then $(CYGPATH_W) 'ClientList.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ClientList.Tpo $(DEPDIR)/amuled-ClientList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientList.cpp' object='amuled-ClientList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientList.obj `if test -f 'ClientList.cpp'; then $(CYGPATH_W) 'ClientList.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientList.cpp'; fi`
 
 amuled-ClientCreditsList.o: ClientCreditsList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientCreditsList.o -MD -MP -MF "$(DEPDIR)/amuled-ClientCreditsList.Tpo" -c -o amuled-ClientCreditsList.o `test -f 'ClientCreditsList.cpp' || echo '$(srcdir)/'`ClientCreditsList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ClientCreditsList.Tpo" "$(DEPDIR)/amuled-ClientCreditsList.Po"; else rm -f "$(DEPDIR)/amuled-ClientCreditsList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientCreditsList.o -MD -MP -MF $(DEPDIR)/amuled-ClientCreditsList.Tpo -c -o amuled-ClientCreditsList.o `test -f 'ClientCreditsList.cpp' || echo '$(srcdir)/'`ClientCreditsList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ClientCreditsList.Tpo $(DEPDIR)/amuled-ClientCreditsList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientCreditsList.cpp' object='amuled-ClientCreditsList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientCreditsList.o `test -f 'ClientCreditsList.cpp' || echo '$(srcdir)/'`ClientCreditsList.cpp
 
 amuled-ClientCreditsList.obj: ClientCreditsList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientCreditsList.obj -MD -MP -MF "$(DEPDIR)/amuled-ClientCreditsList.Tpo" -c -o amuled-ClientCreditsList.obj `if test -f 'ClientCreditsList.cpp'; then $(CYGPATH_W) 'ClientCreditsList.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCreditsList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ClientCreditsList.Tpo" "$(DEPDIR)/amuled-ClientCreditsList.Po"; else rm -f "$(DEPDIR)/amuled-ClientCreditsList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientCreditsList.obj -MD -MP -MF $(DEPDIR)/amuled-ClientCreditsList.Tpo -c -o amuled-ClientCreditsList.obj `if test -f 'ClientCreditsList.cpp'; then $(CYGPATH_W) 'ClientCreditsList.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCreditsList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ClientCreditsList.Tpo $(DEPDIR)/amuled-ClientCreditsList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientCreditsList.cpp' object='amuled-ClientCreditsList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientCreditsList.obj `if test -f 'ClientCreditsList.cpp'; then $(CYGPATH_W) 'ClientCreditsList.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCreditsList.cpp'; fi`
 
 amuled-ClientTCPSocket.o: ClientTCPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientTCPSocket.o -MD -MP -MF "$(DEPDIR)/amuled-ClientTCPSocket.Tpo" -c -o amuled-ClientTCPSocket.o `test -f 'ClientTCPSocket.cpp' || echo '$(srcdir)/'`ClientTCPSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ClientTCPSocket.Tpo" "$(DEPDIR)/amuled-ClientTCPSocket.Po"; else rm -f "$(DEPDIR)/amuled-ClientTCPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientTCPSocket.o -MD -MP -MF $(DEPDIR)/amuled-ClientTCPSocket.Tpo -c -o amuled-ClientTCPSocket.o `test -f 'ClientTCPSocket.cpp' || echo '$(srcdir)/'`ClientTCPSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ClientTCPSocket.Tpo $(DEPDIR)/amuled-ClientTCPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientTCPSocket.cpp' object='amuled-ClientTCPSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientTCPSocket.o `test -f 'ClientTCPSocket.cpp' || echo '$(srcdir)/'`ClientTCPSocket.cpp
 
 amuled-ClientTCPSocket.obj: ClientTCPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientTCPSocket.obj -MD -MP -MF "$(DEPDIR)/amuled-ClientTCPSocket.Tpo" -c -o amuled-ClientTCPSocket.obj `if test -f 'ClientTCPSocket.cpp'; then $(CYGPATH_W) 'ClientTCPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientTCPSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ClientTCPSocket.Tpo" "$(DEPDIR)/amuled-ClientTCPSocket.Po"; else rm -f "$(DEPDIR)/amuled-ClientTCPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientTCPSocket.obj -MD -MP -MF $(DEPDIR)/amuled-ClientTCPSocket.Tpo -c -o amuled-ClientTCPSocket.obj `if test -f 'ClientTCPSocket.cpp'; then $(CYGPATH_W) 'ClientTCPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientTCPSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ClientTCPSocket.Tpo $(DEPDIR)/amuled-ClientTCPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientTCPSocket.cpp' object='amuled-ClientTCPSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientTCPSocket.obj `if test -f 'ClientTCPSocket.cpp'; then $(CYGPATH_W) 'ClientTCPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientTCPSocket.cpp'; fi`
 
 amuled-ClientUDPSocket.o: ClientUDPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientUDPSocket.o -MD -MP -MF "$(DEPDIR)/amuled-ClientUDPSocket.Tpo" -c -o amuled-ClientUDPSocket.o `test -f 'ClientUDPSocket.cpp' || echo '$(srcdir)/'`ClientUDPSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ClientUDPSocket.Tpo" "$(DEPDIR)/amuled-ClientUDPSocket.Po"; else rm -f "$(DEPDIR)/amuled-ClientUDPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientUDPSocket.o -MD -MP -MF $(DEPDIR)/amuled-ClientUDPSocket.Tpo -c -o amuled-ClientUDPSocket.o `test -f 'ClientUDPSocket.cpp' || echo '$(srcdir)/'`ClientUDPSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ClientUDPSocket.Tpo $(DEPDIR)/amuled-ClientUDPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientUDPSocket.cpp' object='amuled-ClientUDPSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientUDPSocket.o `test -f 'ClientUDPSocket.cpp' || echo '$(srcdir)/'`ClientUDPSocket.cpp
 
 amuled-ClientUDPSocket.obj: ClientUDPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientUDPSocket.obj -MD -MP -MF "$(DEPDIR)/amuled-ClientUDPSocket.Tpo" -c -o amuled-ClientUDPSocket.obj `if test -f 'ClientUDPSocket.cpp'; then $(CYGPATH_W) 'ClientUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientUDPSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ClientUDPSocket.Tpo" "$(DEPDIR)/amuled-ClientUDPSocket.Po"; else rm -f "$(DEPDIR)/amuled-ClientUDPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientUDPSocket.obj -MD -MP -MF $(DEPDIR)/amuled-ClientUDPSocket.Tpo -c -o amuled-ClientUDPSocket.obj `if test -f 'ClientUDPSocket.cpp'; then $(CYGPATH_W) 'ClientUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientUDPSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ClientUDPSocket.Tpo $(DEPDIR)/amuled-ClientUDPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientUDPSocket.cpp' object='amuled-ClientUDPSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientUDPSocket.obj `if test -f 'ClientUDPSocket.cpp'; then $(CYGPATH_W) 'ClientUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientUDPSocket.cpp'; fi`
 
+amuled-CorruptionBlackBox.o: CorruptionBlackBox.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-CorruptionBlackBox.o -MD -MP -MF $(DEPDIR)/amuled-CorruptionBlackBox.Tpo -c -o amuled-CorruptionBlackBox.o `test -f 'CorruptionBlackBox.cpp' || echo '$(srcdir)/'`CorruptionBlackBox.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-CorruptionBlackBox.Tpo $(DEPDIR)/amuled-CorruptionBlackBox.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CorruptionBlackBox.cpp' object='amuled-CorruptionBlackBox.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-CorruptionBlackBox.o `test -f 'CorruptionBlackBox.cpp' || echo '$(srcdir)/'`CorruptionBlackBox.cpp
+
+amuled-CorruptionBlackBox.obj: CorruptionBlackBox.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-CorruptionBlackBox.obj -MD -MP -MF $(DEPDIR)/amuled-CorruptionBlackBox.Tpo -c -o amuled-CorruptionBlackBox.obj `if test -f 'CorruptionBlackBox.cpp'; then $(CYGPATH_W) 'CorruptionBlackBox.cpp'; else $(CYGPATH_W) '$(srcdir)/CorruptionBlackBox.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-CorruptionBlackBox.Tpo $(DEPDIR)/amuled-CorruptionBlackBox.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CorruptionBlackBox.cpp' object='amuled-CorruptionBlackBox.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-CorruptionBlackBox.obj `if test -f 'CorruptionBlackBox.cpp'; then $(CYGPATH_W) 'CorruptionBlackBox.cpp'; else $(CYGPATH_W) '$(srcdir)/CorruptionBlackBox.cpp'; fi`
+
 amuled-DownloadClient.o: DownloadClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-DownloadClient.o -MD -MP -MF "$(DEPDIR)/amuled-DownloadClient.Tpo" -c -o amuled-DownloadClient.o `test -f 'DownloadClient.cpp' || echo '$(srcdir)/'`DownloadClient.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-DownloadClient.Tpo" "$(DEPDIR)/amuled-DownloadClient.Po"; else rm -f "$(DEPDIR)/amuled-DownloadClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-DownloadClient.o -MD -MP -MF $(DEPDIR)/amuled-DownloadClient.Tpo -c -o amuled-DownloadClient.o `test -f 'DownloadClient.cpp' || echo '$(srcdir)/'`DownloadClient.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-DownloadClient.Tpo $(DEPDIR)/amuled-DownloadClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DownloadClient.cpp' object='amuled-DownloadClient.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-DownloadClient.o `test -f 'DownloadClient.cpp' || echo '$(srcdir)/'`DownloadClient.cpp
 
 amuled-DownloadClient.obj: DownloadClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-DownloadClient.obj -MD -MP -MF "$(DEPDIR)/amuled-DownloadClient.Tpo" -c -o amuled-DownloadClient.obj `if test -f 'DownloadClient.cpp'; then $(CYGPATH_W) 'DownloadClient.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadClient.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-DownloadClient.Tpo" "$(DEPDIR)/amuled-DownloadClient.Po"; else rm -f "$(DEPDIR)/amuled-DownloadClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-DownloadClient.obj -MD -MP -MF $(DEPDIR)/amuled-DownloadClient.Tpo -c -o amuled-DownloadClient.obj `if test -f 'DownloadClient.cpp'; then $(CYGPATH_W) 'DownloadClient.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadClient.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-DownloadClient.Tpo $(DEPDIR)/amuled-DownloadClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DownloadClient.cpp' object='amuled-DownloadClient.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-DownloadClient.obj `if test -f 'DownloadClient.cpp'; then $(CYGPATH_W) 'DownloadClient.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadClient.cpp'; fi`
 
 amuled-DownloadQueue.o: DownloadQueue.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-DownloadQueue.o -MD -MP -MF "$(DEPDIR)/amuled-DownloadQueue.Tpo" -c -o amuled-DownloadQueue.o `test -f 'DownloadQueue.cpp' || echo '$(srcdir)/'`DownloadQueue.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-DownloadQueue.Tpo" "$(DEPDIR)/amuled-DownloadQueue.Po"; else rm -f "$(DEPDIR)/amuled-DownloadQueue.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-DownloadQueue.o -MD -MP -MF $(DEPDIR)/amuled-DownloadQueue.Tpo -c -o amuled-DownloadQueue.o `test -f 'DownloadQueue.cpp' || echo '$(srcdir)/'`DownloadQueue.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-DownloadQueue.Tpo $(DEPDIR)/amuled-DownloadQueue.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DownloadQueue.cpp' object='amuled-DownloadQueue.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-DownloadQueue.o `test -f 'DownloadQueue.cpp' || echo '$(srcdir)/'`DownloadQueue.cpp
 
 amuled-DownloadQueue.obj: DownloadQueue.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-DownloadQueue.obj -MD -MP -MF "$(DEPDIR)/amuled-DownloadQueue.Tpo" -c -o amuled-DownloadQueue.obj `if test -f 'DownloadQueue.cpp'; then $(CYGPATH_W) 'DownloadQueue.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadQueue.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-DownloadQueue.Tpo" "$(DEPDIR)/amuled-DownloadQueue.Po"; else rm -f "$(DEPDIR)/amuled-DownloadQueue.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-DownloadQueue.obj -MD -MP -MF $(DEPDIR)/amuled-DownloadQueue.Tpo -c -o amuled-DownloadQueue.obj `if test -f 'DownloadQueue.cpp'; then $(CYGPATH_W) 'DownloadQueue.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadQueue.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-DownloadQueue.Tpo $(DEPDIR)/amuled-DownloadQueue.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DownloadQueue.cpp' object='amuled-DownloadQueue.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-DownloadQueue.obj `if test -f 'DownloadQueue.cpp'; then $(CYGPATH_W) 'DownloadQueue.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadQueue.cpp'; fi`
 
 amuled-ECSpecialCoreTags.o: ECSpecialCoreTags.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ECSpecialCoreTags.o -MD -MP -MF "$(DEPDIR)/amuled-ECSpecialCoreTags.Tpo" -c -o amuled-ECSpecialCoreTags.o `test -f 'ECSpecialCoreTags.cpp' || echo '$(srcdir)/'`ECSpecialCoreTags.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ECSpecialCoreTags.Tpo" "$(DEPDIR)/amuled-ECSpecialCoreTags.Po"; else rm -f "$(DEPDIR)/amuled-ECSpecialCoreTags.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ECSpecialCoreTags.o -MD -MP -MF $(DEPDIR)/amuled-ECSpecialCoreTags.Tpo -c -o amuled-ECSpecialCoreTags.o `test -f 'ECSpecialCoreTags.cpp' || echo '$(srcdir)/'`ECSpecialCoreTags.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ECSpecialCoreTags.Tpo $(DEPDIR)/amuled-ECSpecialCoreTags.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ECSpecialCoreTags.cpp' object='amuled-ECSpecialCoreTags.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ECSpecialCoreTags.o `test -f 'ECSpecialCoreTags.cpp' || echo '$(srcdir)/'`ECSpecialCoreTags.cpp
 
 amuled-ECSpecialCoreTags.obj: ECSpecialCoreTags.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ECSpecialCoreTags.obj -MD -MP -MF "$(DEPDIR)/amuled-ECSpecialCoreTags.Tpo" -c -o amuled-ECSpecialCoreTags.obj `if test -f 'ECSpecialCoreTags.cpp'; then $(CYGPATH_W) 'ECSpecialCoreTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialCoreTags.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ECSpecialCoreTags.Tpo" "$(DEPDIR)/amuled-ECSpecialCoreTags.Po"; else rm -f "$(DEPDIR)/amuled-ECSpecialCoreTags.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ECSpecialCoreTags.obj -MD -MP -MF $(DEPDIR)/amuled-ECSpecialCoreTags.Tpo -c -o amuled-ECSpecialCoreTags.obj `if test -f 'ECSpecialCoreTags.cpp'; then $(CYGPATH_W) 'ECSpecialCoreTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialCoreTags.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ECSpecialCoreTags.Tpo $(DEPDIR)/amuled-ECSpecialCoreTags.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ECSpecialCoreTags.cpp' object='amuled-ECSpecialCoreTags.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ECSpecialCoreTags.obj `if test -f 'ECSpecialCoreTags.cpp'; then $(CYGPATH_W) 'ECSpecialCoreTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialCoreTags.cpp'; fi`
 
 amuled-EMSocket.o: EMSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-EMSocket.o -MD -MP -MF "$(DEPDIR)/amuled-EMSocket.Tpo" -c -o amuled-EMSocket.o `test -f 'EMSocket.cpp' || echo '$(srcdir)/'`EMSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-EMSocket.Tpo" "$(DEPDIR)/amuled-EMSocket.Po"; else rm -f "$(DEPDIR)/amuled-EMSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-EMSocket.o -MD -MP -MF $(DEPDIR)/amuled-EMSocket.Tpo -c -o amuled-EMSocket.o `test -f 'EMSocket.cpp' || echo '$(srcdir)/'`EMSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-EMSocket.Tpo $(DEPDIR)/amuled-EMSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EMSocket.cpp' object='amuled-EMSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-EMSocket.o `test -f 'EMSocket.cpp' || echo '$(srcdir)/'`EMSocket.cpp
 
 amuled-EMSocket.obj: EMSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-EMSocket.obj -MD -MP -MF "$(DEPDIR)/amuled-EMSocket.Tpo" -c -o amuled-EMSocket.obj `if test -f 'EMSocket.cpp'; then $(CYGPATH_W) 'EMSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EMSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-EMSocket.Tpo" "$(DEPDIR)/amuled-EMSocket.Po"; else rm -f "$(DEPDIR)/amuled-EMSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-EMSocket.obj -MD -MP -MF $(DEPDIR)/amuled-EMSocket.Tpo -c -o amuled-EMSocket.obj `if test -f 'EMSocket.cpp'; then $(CYGPATH_W) 'EMSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EMSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-EMSocket.Tpo $(DEPDIR)/amuled-EMSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EMSocket.cpp' object='amuled-EMSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-EMSocket.obj `if test -f 'EMSocket.cpp'; then $(CYGPATH_W) 'EMSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EMSocket.cpp'; fi`
 
 amuled-EncryptedStreamSocket.o: EncryptedStreamSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-EncryptedStreamSocket.o -MD -MP -MF "$(DEPDIR)/amuled-EncryptedStreamSocket.Tpo" -c -o amuled-EncryptedStreamSocket.o `test -f 'EncryptedStreamSocket.cpp' || echo '$(srcdir)/'`EncryptedStreamSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-EncryptedStreamSocket.Tpo" "$(DEPDIR)/amuled-EncryptedStreamSocket.Po"; else rm -f "$(DEPDIR)/amuled-EncryptedStreamSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-EncryptedStreamSocket.o -MD -MP -MF $(DEPDIR)/amuled-EncryptedStreamSocket.Tpo -c -o amuled-EncryptedStreamSocket.o `test -f 'EncryptedStreamSocket.cpp' || echo '$(srcdir)/'`EncryptedStreamSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-EncryptedStreamSocket.Tpo $(DEPDIR)/amuled-EncryptedStreamSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EncryptedStreamSocket.cpp' object='amuled-EncryptedStreamSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-EncryptedStreamSocket.o `test -f 'EncryptedStreamSocket.cpp' || echo '$(srcdir)/'`EncryptedStreamSocket.cpp
 
 amuled-EncryptedStreamSocket.obj: EncryptedStreamSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-EncryptedStreamSocket.obj -MD -MP -MF "$(DEPDIR)/amuled-EncryptedStreamSocket.Tpo" -c -o amuled-EncryptedStreamSocket.obj `if test -f 'EncryptedStreamSocket.cpp'; then $(CYGPATH_W) 'EncryptedStreamSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EncryptedStreamSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-EncryptedStreamSocket.Tpo" "$(DEPDIR)/amuled-EncryptedStreamSocket.Po"; else rm -f "$(DEPDIR)/amuled-EncryptedStreamSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-EncryptedStreamSocket.obj -MD -MP -MF $(DEPDIR)/amuled-EncryptedStreamSocket.Tpo -c -o amuled-EncryptedStreamSocket.obj `if test -f 'EncryptedStreamSocket.cpp'; then $(CYGPATH_W) 'EncryptedStreamSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EncryptedStreamSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-EncryptedStreamSocket.Tpo $(DEPDIR)/amuled-EncryptedStreamSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EncryptedStreamSocket.cpp' object='amuled-EncryptedStreamSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-EncryptedStreamSocket.obj `if test -f 'EncryptedStreamSocket.cpp'; then $(CYGPATH_W) 'EncryptedStreamSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EncryptedStreamSocket.cpp'; fi`
 
 amuled-EncryptedDatagramSocket.o: EncryptedDatagramSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-EncryptedDatagramSocket.o -MD -MP -MF "$(DEPDIR)/amuled-EncryptedDatagramSocket.Tpo" -c -o amuled-EncryptedDatagramSocket.o `test -f 'EncryptedDatagramSocket.cpp' || echo '$(srcdir)/'`EncryptedDatagramSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-EncryptedDatagramSocket.Tpo" "$(DEPDIR)/amuled-EncryptedDatagramSocket.Po"; else rm -f "$(DEPDIR)/amuled-EncryptedDatagramSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-EncryptedDatagramSocket.o -MD -MP -MF $(DEPDIR)/amuled-EncryptedDatagramSocket.Tpo -c -o amuled-EncryptedDatagramSocket.o `test -f 'EncryptedDatagramSocket.cpp' || echo '$(srcdir)/'`EncryptedDatagramSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-EncryptedDatagramSocket.Tpo $(DEPDIR)/amuled-EncryptedDatagramSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EncryptedDatagramSocket.cpp' object='amuled-EncryptedDatagramSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-EncryptedDatagramSocket.o `test -f 'EncryptedDatagramSocket.cpp' || echo '$(srcdir)/'`EncryptedDatagramSocket.cpp
 
 amuled-EncryptedDatagramSocket.obj: EncryptedDatagramSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-EncryptedDatagramSocket.obj -MD -MP -MF "$(DEPDIR)/amuled-EncryptedDatagramSocket.Tpo" -c -o amuled-EncryptedDatagramSocket.obj `if test -f 'EncryptedDatagramSocket.cpp'; then $(CYGPATH_W) 'EncryptedDatagramSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EncryptedDatagramSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-EncryptedDatagramSocket.Tpo" "$(DEPDIR)/amuled-EncryptedDatagramSocket.Po"; else rm -f "$(DEPDIR)/amuled-EncryptedDatagramSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-EncryptedDatagramSocket.obj -MD -MP -MF $(DEPDIR)/amuled-EncryptedDatagramSocket.Tpo -c -o amuled-EncryptedDatagramSocket.obj `if test -f 'EncryptedDatagramSocket.cpp'; then $(CYGPATH_W) 'EncryptedDatagramSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EncryptedDatagramSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-EncryptedDatagramSocket.Tpo $(DEPDIR)/amuled-EncryptedDatagramSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='EncryptedDatagramSocket.cpp' object='amuled-EncryptedDatagramSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-EncryptedDatagramSocket.obj `if test -f 'EncryptedDatagramSocket.cpp'; then $(CYGPATH_W) 'EncryptedDatagramSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/EncryptedDatagramSocket.cpp'; fi`
 
 amuled-ExternalConn.o: ExternalConn.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ExternalConn.o -MD -MP -MF "$(DEPDIR)/amuled-ExternalConn.Tpo" -c -o amuled-ExternalConn.o `test -f 'ExternalConn.cpp' || echo '$(srcdir)/'`ExternalConn.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ExternalConn.Tpo" "$(DEPDIR)/amuled-ExternalConn.Po"; else rm -f "$(DEPDIR)/amuled-ExternalConn.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ExternalConn.o -MD -MP -MF $(DEPDIR)/amuled-ExternalConn.Tpo -c -o amuled-ExternalConn.o `test -f 'ExternalConn.cpp' || echo '$(srcdir)/'`ExternalConn.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ExternalConn.Tpo $(DEPDIR)/amuled-ExternalConn.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ExternalConn.cpp' object='amuled-ExternalConn.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ExternalConn.o `test -f 'ExternalConn.cpp' || echo '$(srcdir)/'`ExternalConn.cpp
 
 amuled-ExternalConn.obj: ExternalConn.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ExternalConn.obj -MD -MP -MF "$(DEPDIR)/amuled-ExternalConn.Tpo" -c -o amuled-ExternalConn.obj `if test -f 'ExternalConn.cpp'; then $(CYGPATH_W) 'ExternalConn.cpp'; else $(CYGPATH_W) '$(srcdir)/ExternalConn.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ExternalConn.Tpo" "$(DEPDIR)/amuled-ExternalConn.Po"; else rm -f "$(DEPDIR)/amuled-ExternalConn.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ExternalConn.obj -MD -MP -MF $(DEPDIR)/amuled-ExternalConn.Tpo -c -o amuled-ExternalConn.obj `if test -f 'ExternalConn.cpp'; then $(CYGPATH_W) 'ExternalConn.cpp'; else $(CYGPATH_W) '$(srcdir)/ExternalConn.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ExternalConn.Tpo $(DEPDIR)/amuled-ExternalConn.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ExternalConn.cpp' object='amuled-ExternalConn.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ExternalConn.obj `if test -f 'ExternalConn.cpp'; then $(CYGPATH_W) 'ExternalConn.cpp'; else $(CYGPATH_W) '$(srcdir)/ExternalConn.cpp'; fi`
 
-amuled-Friend.o: Friend.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Friend.o -MD -MP -MF "$(DEPDIR)/amuled-Friend.Tpo" -c -o amuled-Friend.o `test -f 'Friend.cpp' || echo '$(srcdir)/'`Friend.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Friend.Tpo" "$(DEPDIR)/amuled-Friend.Po"; else rm -f "$(DEPDIR)/amuled-Friend.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Friend.cpp' object='amuled-Friend.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Friend.o `test -f 'Friend.cpp' || echo '$(srcdir)/'`Friend.cpp
-
-amuled-Friend.obj: Friend.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Friend.obj -MD -MP -MF "$(DEPDIR)/amuled-Friend.Tpo" -c -o amuled-Friend.obj `if test -f 'Friend.cpp'; then $(CYGPATH_W) 'Friend.cpp'; else $(CYGPATH_W) '$(srcdir)/Friend.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Friend.Tpo" "$(DEPDIR)/amuled-Friend.Po"; else rm -f "$(DEPDIR)/amuled-Friend.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Friend.cpp' object='amuled-Friend.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Friend.obj `if test -f 'Friend.cpp'; then $(CYGPATH_W) 'Friend.cpp'; else $(CYGPATH_W) '$(srcdir)/Friend.cpp'; fi`
-
 amuled-FriendList.o: FriendList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-FriendList.o -MD -MP -MF "$(DEPDIR)/amuled-FriendList.Tpo" -c -o amuled-FriendList.o `test -f 'FriendList.cpp' || echo '$(srcdir)/'`FriendList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-FriendList.Tpo" "$(DEPDIR)/amuled-FriendList.Po"; else rm -f "$(DEPDIR)/amuled-FriendList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-FriendList.o -MD -MP -MF $(DEPDIR)/amuled-FriendList.Tpo -c -o amuled-FriendList.o `test -f 'FriendList.cpp' || echo '$(srcdir)/'`FriendList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-FriendList.Tpo $(DEPDIR)/amuled-FriendList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FriendList.cpp' object='amuled-FriendList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-FriendList.o `test -f 'FriendList.cpp' || echo '$(srcdir)/'`FriendList.cpp
 
 amuled-FriendList.obj: FriendList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-FriendList.obj -MD -MP -MF "$(DEPDIR)/amuled-FriendList.Tpo" -c -o amuled-FriendList.obj `if test -f 'FriendList.cpp'; then $(CYGPATH_W) 'FriendList.cpp'; else $(CYGPATH_W) '$(srcdir)/FriendList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-FriendList.Tpo" "$(DEPDIR)/amuled-FriendList.Po"; else rm -f "$(DEPDIR)/amuled-FriendList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-FriendList.obj -MD -MP -MF $(DEPDIR)/amuled-FriendList.Tpo -c -o amuled-FriendList.obj `if test -f 'FriendList.cpp'; then $(CYGPATH_W) 'FriendList.cpp'; else $(CYGPATH_W) '$(srcdir)/FriendList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-FriendList.Tpo $(DEPDIR)/amuled-FriendList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FriendList.cpp' object='amuled-FriendList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-FriendList.obj `if test -f 'FriendList.cpp'; then $(CYGPATH_W) 'FriendList.cpp'; else $(CYGPATH_W) '$(srcdir)/FriendList.cpp'; fi`
 
-amuled-HTTPDownload.o: HTTPDownload.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-HTTPDownload.o -MD -MP -MF "$(DEPDIR)/amuled-HTTPDownload.Tpo" -c -o amuled-HTTPDownload.o `test -f 'HTTPDownload.cpp' || echo '$(srcdir)/'`HTTPDownload.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-HTTPDownload.Tpo" "$(DEPDIR)/amuled-HTTPDownload.Po"; else rm -f "$(DEPDIR)/amuled-HTTPDownload.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HTTPDownload.cpp' object='amuled-HTTPDownload.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-HTTPDownload.o `test -f 'HTTPDownload.cpp' || echo '$(srcdir)/'`HTTPDownload.cpp
-
-amuled-HTTPDownload.obj: HTTPDownload.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-HTTPDownload.obj -MD -MP -MF "$(DEPDIR)/amuled-HTTPDownload.Tpo" -c -o amuled-HTTPDownload.obj `if test -f 'HTTPDownload.cpp'; then $(CYGPATH_W) 'HTTPDownload.cpp'; else $(CYGPATH_W) '$(srcdir)/HTTPDownload.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-HTTPDownload.Tpo" "$(DEPDIR)/amuled-HTTPDownload.Po"; else rm -f "$(DEPDIR)/amuled-HTTPDownload.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HTTPDownload.cpp' object='amuled-HTTPDownload.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-HTTPDownload.obj `if test -f 'HTTPDownload.cpp'; then $(CYGPATH_W) 'HTTPDownload.cpp'; else $(CYGPATH_W) '$(srcdir)/HTTPDownload.cpp'; fi`
-
 amuled-IPFilter.o: IPFilter.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-IPFilter.o -MD -MP -MF "$(DEPDIR)/amuled-IPFilter.Tpo" -c -o amuled-IPFilter.o `test -f 'IPFilter.cpp' || echo '$(srcdir)/'`IPFilter.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-IPFilter.Tpo" "$(DEPDIR)/amuled-IPFilter.Po"; else rm -f "$(DEPDIR)/amuled-IPFilter.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-IPFilter.o -MD -MP -MF $(DEPDIR)/amuled-IPFilter.Tpo -c -o amuled-IPFilter.o `test -f 'IPFilter.cpp' || echo '$(srcdir)/'`IPFilter.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-IPFilter.Tpo $(DEPDIR)/amuled-IPFilter.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IPFilter.cpp' object='amuled-IPFilter.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-IPFilter.o `test -f 'IPFilter.cpp' || echo '$(srcdir)/'`IPFilter.cpp
 
 amuled-IPFilter.obj: IPFilter.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-IPFilter.obj -MD -MP -MF "$(DEPDIR)/amuled-IPFilter.Tpo" -c -o amuled-IPFilter.obj `if test -f 'IPFilter.cpp'; then $(CYGPATH_W) 'IPFilter.cpp'; else $(CYGPATH_W) '$(srcdir)/IPFilter.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-IPFilter.Tpo" "$(DEPDIR)/amuled-IPFilter.Po"; else rm -f "$(DEPDIR)/amuled-IPFilter.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-IPFilter.obj -MD -MP -MF $(DEPDIR)/amuled-IPFilter.Tpo -c -o amuled-IPFilter.obj `if test -f 'IPFilter.cpp'; then $(CYGPATH_W) 'IPFilter.cpp'; else $(CYGPATH_W) '$(srcdir)/IPFilter.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-IPFilter.Tpo $(DEPDIR)/amuled-IPFilter.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IPFilter.cpp' object='amuled-IPFilter.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-IPFilter.obj `if test -f 'IPFilter.cpp'; then $(CYGPATH_W) 'IPFilter.cpp'; else $(CYGPATH_W) '$(srcdir)/IPFilter.cpp'; fi`
 
 amuled-KnownFileList.o: KnownFileList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-KnownFileList.o -MD -MP -MF "$(DEPDIR)/amuled-KnownFileList.Tpo" -c -o amuled-KnownFileList.o `test -f 'KnownFileList.cpp' || echo '$(srcdir)/'`KnownFileList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-KnownFileList.Tpo" "$(DEPDIR)/amuled-KnownFileList.Po"; else rm -f "$(DEPDIR)/amuled-KnownFileList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-KnownFileList.o -MD -MP -MF $(DEPDIR)/amuled-KnownFileList.Tpo -c -o amuled-KnownFileList.o `test -f 'KnownFileList.cpp' || echo '$(srcdir)/'`KnownFileList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-KnownFileList.Tpo $(DEPDIR)/amuled-KnownFileList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KnownFileList.cpp' object='amuled-KnownFileList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-KnownFileList.o `test -f 'KnownFileList.cpp' || echo '$(srcdir)/'`KnownFileList.cpp
 
 amuled-KnownFileList.obj: KnownFileList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-KnownFileList.obj -MD -MP -MF "$(DEPDIR)/amuled-KnownFileList.Tpo" -c -o amuled-KnownFileList.obj `if test -f 'KnownFileList.cpp'; then $(CYGPATH_W) 'KnownFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFileList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-KnownFileList.Tpo" "$(DEPDIR)/amuled-KnownFileList.Po"; else rm -f "$(DEPDIR)/amuled-KnownFileList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-KnownFileList.obj -MD -MP -MF $(DEPDIR)/amuled-KnownFileList.Tpo -c -o amuled-KnownFileList.obj `if test -f 'KnownFileList.cpp'; then $(CYGPATH_W) 'KnownFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFileList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-KnownFileList.Tpo $(DEPDIR)/amuled-KnownFileList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KnownFileList.cpp' object='amuled-KnownFileList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-KnownFileList.obj `if test -f 'KnownFileList.cpp'; then $(CYGPATH_W) 'KnownFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFileList.cpp'; fi`
 
 amuled-ListenSocket.o: ListenSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ListenSocket.o -MD -MP -MF "$(DEPDIR)/amuled-ListenSocket.Tpo" -c -o amuled-ListenSocket.o `test -f 'ListenSocket.cpp' || echo '$(srcdir)/'`ListenSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ListenSocket.Tpo" "$(DEPDIR)/amuled-ListenSocket.Po"; else rm -f "$(DEPDIR)/amuled-ListenSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ListenSocket.o -MD -MP -MF $(DEPDIR)/amuled-ListenSocket.Tpo -c -o amuled-ListenSocket.o `test -f 'ListenSocket.cpp' || echo '$(srcdir)/'`ListenSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ListenSocket.Tpo $(DEPDIR)/amuled-ListenSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ListenSocket.cpp' object='amuled-ListenSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ListenSocket.o `test -f 'ListenSocket.cpp' || echo '$(srcdir)/'`ListenSocket.cpp
 
 amuled-ListenSocket.obj: ListenSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ListenSocket.obj -MD -MP -MF "$(DEPDIR)/amuled-ListenSocket.Tpo" -c -o amuled-ListenSocket.obj `if test -f 'ListenSocket.cpp'; then $(CYGPATH_W) 'ListenSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ListenSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ListenSocket.Tpo" "$(DEPDIR)/amuled-ListenSocket.Po"; else rm -f "$(DEPDIR)/amuled-ListenSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ListenSocket.obj -MD -MP -MF $(DEPDIR)/amuled-ListenSocket.Tpo -c -o amuled-ListenSocket.obj `if test -f 'ListenSocket.cpp'; then $(CYGPATH_W) 'ListenSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ListenSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ListenSocket.Tpo $(DEPDIR)/amuled-ListenSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ListenSocket.cpp' object='amuled-ListenSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ListenSocket.obj `if test -f 'ListenSocket.cpp'; then $(CYGPATH_W) 'ListenSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ListenSocket.cpp'; fi`
 
 amuled-MuleUDPSocket.o: MuleUDPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-MuleUDPSocket.o -MD -MP -MF "$(DEPDIR)/amuled-MuleUDPSocket.Tpo" -c -o amuled-MuleUDPSocket.o `test -f 'MuleUDPSocket.cpp' || echo '$(srcdir)/'`MuleUDPSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-MuleUDPSocket.Tpo" "$(DEPDIR)/amuled-MuleUDPSocket.Po"; else rm -f "$(DEPDIR)/amuled-MuleUDPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-MuleUDPSocket.o -MD -MP -MF $(DEPDIR)/amuled-MuleUDPSocket.Tpo -c -o amuled-MuleUDPSocket.o `test -f 'MuleUDPSocket.cpp' || echo '$(srcdir)/'`MuleUDPSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-MuleUDPSocket.Tpo $(DEPDIR)/amuled-MuleUDPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleUDPSocket.cpp' object='amuled-MuleUDPSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-MuleUDPSocket.o `test -f 'MuleUDPSocket.cpp' || echo '$(srcdir)/'`MuleUDPSocket.cpp
 
 amuled-MuleUDPSocket.obj: MuleUDPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-MuleUDPSocket.obj -MD -MP -MF "$(DEPDIR)/amuled-MuleUDPSocket.Tpo" -c -o amuled-MuleUDPSocket.obj `if test -f 'MuleUDPSocket.cpp'; then $(CYGPATH_W) 'MuleUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleUDPSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-MuleUDPSocket.Tpo" "$(DEPDIR)/amuled-MuleUDPSocket.Po"; else rm -f "$(DEPDIR)/amuled-MuleUDPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-MuleUDPSocket.obj -MD -MP -MF $(DEPDIR)/amuled-MuleUDPSocket.Tpo -c -o amuled-MuleUDPSocket.obj `if test -f 'MuleUDPSocket.cpp'; then $(CYGPATH_W) 'MuleUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleUDPSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-MuleUDPSocket.Tpo $(DEPDIR)/amuled-MuleUDPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleUDPSocket.cpp' object='amuled-MuleUDPSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-MuleUDPSocket.obj `if test -f 'MuleUDPSocket.cpp'; then $(CYGPATH_W) 'MuleUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleUDPSocket.cpp'; fi`
 
-amuled-PartFileConvert.o: PartFileConvert.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-PartFileConvert.o -MD -MP -MF "$(DEPDIR)/amuled-PartFileConvert.Tpo" -c -o amuled-PartFileConvert.o `test -f 'PartFileConvert.cpp' || echo '$(srcdir)/'`PartFileConvert.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-PartFileConvert.Tpo" "$(DEPDIR)/amuled-PartFileConvert.Po"; else rm -f "$(DEPDIR)/amuled-PartFileConvert.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFileConvert.cpp' object='amuled-PartFileConvert.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-PartFileConvert.o `test -f 'PartFileConvert.cpp' || echo '$(srcdir)/'`PartFileConvert.cpp
-
-amuled-PartFileConvert.obj: PartFileConvert.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-PartFileConvert.obj -MD -MP -MF "$(DEPDIR)/amuled-PartFileConvert.Tpo" -c -o amuled-PartFileConvert.obj `if test -f 'PartFileConvert.cpp'; then $(CYGPATH_W) 'PartFileConvert.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFileConvert.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-PartFileConvert.Tpo" "$(DEPDIR)/amuled-PartFileConvert.Po"; else rm -f "$(DEPDIR)/amuled-PartFileConvert.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFileConvert.cpp' object='amuled-PartFileConvert.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-PartFileConvert.obj `if test -f 'PartFileConvert.cpp'; then $(CYGPATH_W) 'PartFileConvert.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFileConvert.cpp'; fi`
-
 amuled-SearchFile.o: SearchFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SearchFile.o -MD -MP -MF "$(DEPDIR)/amuled-SearchFile.Tpo" -c -o amuled-SearchFile.o `test -f 'SearchFile.cpp' || echo '$(srcdir)/'`SearchFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-SearchFile.Tpo" "$(DEPDIR)/amuled-SearchFile.Po"; else rm -f "$(DEPDIR)/amuled-SearchFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SearchFile.o -MD -MP -MF $(DEPDIR)/amuled-SearchFile.Tpo -c -o amuled-SearchFile.o `test -f 'SearchFile.cpp' || echo '$(srcdir)/'`SearchFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-SearchFile.Tpo $(DEPDIR)/amuled-SearchFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchFile.cpp' object='amuled-SearchFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-SearchFile.o `test -f 'SearchFile.cpp' || echo '$(srcdir)/'`SearchFile.cpp
 
 amuled-SearchFile.obj: SearchFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SearchFile.obj -MD -MP -MF "$(DEPDIR)/amuled-SearchFile.Tpo" -c -o amuled-SearchFile.obj `if test -f 'SearchFile.cpp'; then $(CYGPATH_W) 'SearchFile.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-SearchFile.Tpo" "$(DEPDIR)/amuled-SearchFile.Po"; else rm -f "$(DEPDIR)/amuled-SearchFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SearchFile.obj -MD -MP -MF $(DEPDIR)/amuled-SearchFile.Tpo -c -o amuled-SearchFile.obj `if test -f 'SearchFile.cpp'; then $(CYGPATH_W) 'SearchFile.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-SearchFile.Tpo $(DEPDIR)/amuled-SearchFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchFile.cpp' object='amuled-SearchFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-SearchFile.obj `if test -f 'SearchFile.cpp'; then $(CYGPATH_W) 'SearchFile.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchFile.cpp'; fi`
 
 amuled-SearchList.o: SearchList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SearchList.o -MD -MP -MF "$(DEPDIR)/amuled-SearchList.Tpo" -c -o amuled-SearchList.o `test -f 'SearchList.cpp' || echo '$(srcdir)/'`SearchList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-SearchList.Tpo" "$(DEPDIR)/amuled-SearchList.Po"; else rm -f "$(DEPDIR)/amuled-SearchList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SearchList.o -MD -MP -MF $(DEPDIR)/amuled-SearchList.Tpo -c -o amuled-SearchList.o `test -f 'SearchList.cpp' || echo '$(srcdir)/'`SearchList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-SearchList.Tpo $(DEPDIR)/amuled-SearchList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchList.cpp' object='amuled-SearchList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-SearchList.o `test -f 'SearchList.cpp' || echo '$(srcdir)/'`SearchList.cpp
 
 amuled-SearchList.obj: SearchList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SearchList.obj -MD -MP -MF "$(DEPDIR)/amuled-SearchList.Tpo" -c -o amuled-SearchList.obj `if test -f 'SearchList.cpp'; then $(CYGPATH_W) 'SearchList.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-SearchList.Tpo" "$(DEPDIR)/amuled-SearchList.Po"; else rm -f "$(DEPDIR)/amuled-SearchList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SearchList.obj -MD -MP -MF $(DEPDIR)/amuled-SearchList.Tpo -c -o amuled-SearchList.obj `if test -f 'SearchList.cpp'; then $(CYGPATH_W) 'SearchList.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-SearchList.Tpo $(DEPDIR)/amuled-SearchList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchList.cpp' object='amuled-SearchList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-SearchList.obj `if test -f 'SearchList.cpp'; then $(CYGPATH_W) 'SearchList.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchList.cpp'; fi`
 
 amuled-ServerConnect.o: ServerConnect.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerConnect.o -MD -MP -MF "$(DEPDIR)/amuled-ServerConnect.Tpo" -c -o amuled-ServerConnect.o `test -f 'ServerConnect.cpp' || echo '$(srcdir)/'`ServerConnect.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ServerConnect.Tpo" "$(DEPDIR)/amuled-ServerConnect.Po"; else rm -f "$(DEPDIR)/amuled-ServerConnect.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerConnect.o -MD -MP -MF $(DEPDIR)/amuled-ServerConnect.Tpo -c -o amuled-ServerConnect.o `test -f 'ServerConnect.cpp' || echo '$(srcdir)/'`ServerConnect.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ServerConnect.Tpo $(DEPDIR)/amuled-ServerConnect.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerConnect.cpp' object='amuled-ServerConnect.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ServerConnect.o `test -f 'ServerConnect.cpp' || echo '$(srcdir)/'`ServerConnect.cpp
 
 amuled-ServerConnect.obj: ServerConnect.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerConnect.obj -MD -MP -MF "$(DEPDIR)/amuled-ServerConnect.Tpo" -c -o amuled-ServerConnect.obj `if test -f 'ServerConnect.cpp'; then $(CYGPATH_W) 'ServerConnect.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerConnect.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ServerConnect.Tpo" "$(DEPDIR)/amuled-ServerConnect.Po"; else rm -f "$(DEPDIR)/amuled-ServerConnect.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerConnect.obj -MD -MP -MF $(DEPDIR)/amuled-ServerConnect.Tpo -c -o amuled-ServerConnect.obj `if test -f 'ServerConnect.cpp'; then $(CYGPATH_W) 'ServerConnect.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerConnect.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ServerConnect.Tpo $(DEPDIR)/amuled-ServerConnect.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerConnect.cpp' object='amuled-ServerConnect.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ServerConnect.obj `if test -f 'ServerConnect.cpp'; then $(CYGPATH_W) 'ServerConnect.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerConnect.cpp'; fi`
 
 amuled-ServerList.o: ServerList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerList.o -MD -MP -MF "$(DEPDIR)/amuled-ServerList.Tpo" -c -o amuled-ServerList.o `test -f 'ServerList.cpp' || echo '$(srcdir)/'`ServerList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ServerList.Tpo" "$(DEPDIR)/amuled-ServerList.Po"; else rm -f "$(DEPDIR)/amuled-ServerList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerList.o -MD -MP -MF $(DEPDIR)/amuled-ServerList.Tpo -c -o amuled-ServerList.o `test -f 'ServerList.cpp' || echo '$(srcdir)/'`ServerList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ServerList.Tpo $(DEPDIR)/amuled-ServerList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerList.cpp' object='amuled-ServerList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ServerList.o `test -f 'ServerList.cpp' || echo '$(srcdir)/'`ServerList.cpp
 
 amuled-ServerList.obj: ServerList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerList.obj -MD -MP -MF "$(DEPDIR)/amuled-ServerList.Tpo" -c -o amuled-ServerList.obj `if test -f 'ServerList.cpp'; then $(CYGPATH_W) 'ServerList.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ServerList.Tpo" "$(DEPDIR)/amuled-ServerList.Po"; else rm -f "$(DEPDIR)/amuled-ServerList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerList.obj -MD -MP -MF $(DEPDIR)/amuled-ServerList.Tpo -c -o amuled-ServerList.obj `if test -f 'ServerList.cpp'; then $(CYGPATH_W) 'ServerList.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ServerList.Tpo $(DEPDIR)/amuled-ServerList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerList.cpp' object='amuled-ServerList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ServerList.obj `if test -f 'ServerList.cpp'; then $(CYGPATH_W) 'ServerList.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerList.cpp'; fi`
 
 amuled-ServerSocket.o: ServerSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerSocket.o -MD -MP -MF "$(DEPDIR)/amuled-ServerSocket.Tpo" -c -o amuled-ServerSocket.o `test -f 'ServerSocket.cpp' || echo '$(srcdir)/'`ServerSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ServerSocket.Tpo" "$(DEPDIR)/amuled-ServerSocket.Po"; else rm -f "$(DEPDIR)/amuled-ServerSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerSocket.o -MD -MP -MF $(DEPDIR)/amuled-ServerSocket.Tpo -c -o amuled-ServerSocket.o `test -f 'ServerSocket.cpp' || echo '$(srcdir)/'`ServerSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ServerSocket.Tpo $(DEPDIR)/amuled-ServerSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerSocket.cpp' object='amuled-ServerSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ServerSocket.o `test -f 'ServerSocket.cpp' || echo '$(srcdir)/'`ServerSocket.cpp
 
 amuled-ServerSocket.obj: ServerSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerSocket.obj -MD -MP -MF "$(DEPDIR)/amuled-ServerSocket.Tpo" -c -o amuled-ServerSocket.obj `if test -f 'ServerSocket.cpp'; then $(CYGPATH_W) 'ServerSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ServerSocket.Tpo" "$(DEPDIR)/amuled-ServerSocket.Po"; else rm -f "$(DEPDIR)/amuled-ServerSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerSocket.obj -MD -MP -MF $(DEPDIR)/amuled-ServerSocket.Tpo -c -o amuled-ServerSocket.obj `if test -f 'ServerSocket.cpp'; then $(CYGPATH_W) 'ServerSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ServerSocket.Tpo $(DEPDIR)/amuled-ServerSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerSocket.cpp' object='amuled-ServerSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ServerSocket.obj `if test -f 'ServerSocket.cpp'; then $(CYGPATH_W) 'ServerSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerSocket.cpp'; fi`
 
 amuled-ServerUDPSocket.o: ServerUDPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerUDPSocket.o -MD -MP -MF "$(DEPDIR)/amuled-ServerUDPSocket.Tpo" -c -o amuled-ServerUDPSocket.o `test -f 'ServerUDPSocket.cpp' || echo '$(srcdir)/'`ServerUDPSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ServerUDPSocket.Tpo" "$(DEPDIR)/amuled-ServerUDPSocket.Po"; else rm -f "$(DEPDIR)/amuled-ServerUDPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerUDPSocket.o -MD -MP -MF $(DEPDIR)/amuled-ServerUDPSocket.Tpo -c -o amuled-ServerUDPSocket.o `test -f 'ServerUDPSocket.cpp' || echo '$(srcdir)/'`ServerUDPSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ServerUDPSocket.Tpo $(DEPDIR)/amuled-ServerUDPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerUDPSocket.cpp' object='amuled-ServerUDPSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ServerUDPSocket.o `test -f 'ServerUDPSocket.cpp' || echo '$(srcdir)/'`ServerUDPSocket.cpp
 
 amuled-ServerUDPSocket.obj: ServerUDPSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerUDPSocket.obj -MD -MP -MF "$(DEPDIR)/amuled-ServerUDPSocket.Tpo" -c -o amuled-ServerUDPSocket.obj `if test -f 'ServerUDPSocket.cpp'; then $(CYGPATH_W) 'ServerUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerUDPSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ServerUDPSocket.Tpo" "$(DEPDIR)/amuled-ServerUDPSocket.Po"; else rm -f "$(DEPDIR)/amuled-ServerUDPSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ServerUDPSocket.obj -MD -MP -MF $(DEPDIR)/amuled-ServerUDPSocket.Tpo -c -o amuled-ServerUDPSocket.obj `if test -f 'ServerUDPSocket.cpp'; then $(CYGPATH_W) 'ServerUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerUDPSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ServerUDPSocket.Tpo $(DEPDIR)/amuled-ServerUDPSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerUDPSocket.cpp' object='amuled-ServerUDPSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ServerUDPSocket.obj `if test -f 'ServerUDPSocket.cpp'; then $(CYGPATH_W) 'ServerUDPSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerUDPSocket.cpp'; fi`
 
+amuled-SHAHashSet.o: SHAHashSet.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SHAHashSet.o -MD -MP -MF $(DEPDIR)/amuled-SHAHashSet.Tpo -c -o amuled-SHAHashSet.o `test -f 'SHAHashSet.cpp' || echo '$(srcdir)/'`SHAHashSet.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-SHAHashSet.Tpo $(DEPDIR)/amuled-SHAHashSet.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SHAHashSet.cpp' object='amuled-SHAHashSet.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-SHAHashSet.o `test -f 'SHAHashSet.cpp' || echo '$(srcdir)/'`SHAHashSet.cpp
+
+amuled-SHAHashSet.obj: SHAHashSet.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SHAHashSet.obj -MD -MP -MF $(DEPDIR)/amuled-SHAHashSet.Tpo -c -o amuled-SHAHashSet.obj `if test -f 'SHAHashSet.cpp'; then $(CYGPATH_W) 'SHAHashSet.cpp'; else $(CYGPATH_W) '$(srcdir)/SHAHashSet.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-SHAHashSet.Tpo $(DEPDIR)/amuled-SHAHashSet.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SHAHashSet.cpp' object='amuled-SHAHashSet.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-SHAHashSet.obj `if test -f 'SHAHashSet.cpp'; then $(CYGPATH_W) 'SHAHashSet.cpp'; else $(CYGPATH_W) '$(srcdir)/SHAHashSet.cpp'; fi`
+
 amuled-SharedFileList.o: SharedFileList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SharedFileList.o -MD -MP -MF "$(DEPDIR)/amuled-SharedFileList.Tpo" -c -o amuled-SharedFileList.o `test -f 'SharedFileList.cpp' || echo '$(srcdir)/'`SharedFileList.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-SharedFileList.Tpo" "$(DEPDIR)/amuled-SharedFileList.Po"; else rm -f "$(DEPDIR)/amuled-SharedFileList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SharedFileList.o -MD -MP -MF $(DEPDIR)/amuled-SharedFileList.Tpo -c -o amuled-SharedFileList.o `test -f 'SharedFileList.cpp' || echo '$(srcdir)/'`SharedFileList.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-SharedFileList.Tpo $(DEPDIR)/amuled-SharedFileList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFileList.cpp' object='amuled-SharedFileList.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-SharedFileList.o `test -f 'SharedFileList.cpp' || echo '$(srcdir)/'`SharedFileList.cpp
 
 amuled-SharedFileList.obj: SharedFileList.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SharedFileList.obj -MD -MP -MF "$(DEPDIR)/amuled-SharedFileList.Tpo" -c -o amuled-SharedFileList.obj `if test -f 'SharedFileList.cpp'; then $(CYGPATH_W) 'SharedFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFileList.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-SharedFileList.Tpo" "$(DEPDIR)/amuled-SharedFileList.Po"; else rm -f "$(DEPDIR)/amuled-SharedFileList.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SharedFileList.obj -MD -MP -MF $(DEPDIR)/amuled-SharedFileList.Tpo -c -o amuled-SharedFileList.obj `if test -f 'SharedFileList.cpp'; then $(CYGPATH_W) 'SharedFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFileList.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-SharedFileList.Tpo $(DEPDIR)/amuled-SharedFileList.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFileList.cpp' object='amuled-SharedFileList.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-SharedFileList.obj `if test -f 'SharedFileList.cpp'; then $(CYGPATH_W) 'SharedFileList.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFileList.cpp'; fi`
 
 amuled-ThreadTasks.o: ThreadTasks.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ThreadTasks.o -MD -MP -MF "$(DEPDIR)/amuled-ThreadTasks.Tpo" -c -o amuled-ThreadTasks.o `test -f 'ThreadTasks.cpp' || echo '$(srcdir)/'`ThreadTasks.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ThreadTasks.Tpo" "$(DEPDIR)/amuled-ThreadTasks.Po"; else rm -f "$(DEPDIR)/amuled-ThreadTasks.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ThreadTasks.o -MD -MP -MF $(DEPDIR)/amuled-ThreadTasks.Tpo -c -o amuled-ThreadTasks.o `test -f 'ThreadTasks.cpp' || echo '$(srcdir)/'`ThreadTasks.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ThreadTasks.Tpo $(DEPDIR)/amuled-ThreadTasks.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ThreadTasks.cpp' object='amuled-ThreadTasks.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ThreadTasks.o `test -f 'ThreadTasks.cpp' || echo '$(srcdir)/'`ThreadTasks.cpp
 
 amuled-ThreadTasks.obj: ThreadTasks.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ThreadTasks.obj -MD -MP -MF "$(DEPDIR)/amuled-ThreadTasks.Tpo" -c -o amuled-ThreadTasks.obj `if test -f 'ThreadTasks.cpp'; then $(CYGPATH_W) 'ThreadTasks.cpp'; else $(CYGPATH_W) '$(srcdir)/ThreadTasks.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ThreadTasks.Tpo" "$(DEPDIR)/amuled-ThreadTasks.Po"; else rm -f "$(DEPDIR)/amuled-ThreadTasks.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ThreadTasks.obj -MD -MP -MF $(DEPDIR)/amuled-ThreadTasks.Tpo -c -o amuled-ThreadTasks.obj `if test -f 'ThreadTasks.cpp'; then $(CYGPATH_W) 'ThreadTasks.cpp'; else $(CYGPATH_W) '$(srcdir)/ThreadTasks.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ThreadTasks.Tpo $(DEPDIR)/amuled-ThreadTasks.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ThreadTasks.cpp' object='amuled-ThreadTasks.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ThreadTasks.obj `if test -f 'ThreadTasks.cpp'; then $(CYGPATH_W) 'ThreadTasks.cpp'; else $(CYGPATH_W) '$(srcdir)/ThreadTasks.cpp'; fi`
 
 amuled-UploadBandwidthThrottler.o: UploadBandwidthThrottler.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UploadBandwidthThrottler.o -MD -MP -MF "$(DEPDIR)/amuled-UploadBandwidthThrottler.Tpo" -c -o amuled-UploadBandwidthThrottler.o `test -f 'UploadBandwidthThrottler.cpp' || echo '$(srcdir)/'`UploadBandwidthThrottler.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UploadBandwidthThrottler.Tpo" "$(DEPDIR)/amuled-UploadBandwidthThrottler.Po"; else rm -f "$(DEPDIR)/amuled-UploadBandwidthThrottler.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UploadBandwidthThrottler.o -MD -MP -MF $(DEPDIR)/amuled-UploadBandwidthThrottler.Tpo -c -o amuled-UploadBandwidthThrottler.o `test -f 'UploadBandwidthThrottler.cpp' || echo '$(srcdir)/'`UploadBandwidthThrottler.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-UploadBandwidthThrottler.Tpo $(DEPDIR)/amuled-UploadBandwidthThrottler.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UploadBandwidthThrottler.cpp' object='amuled-UploadBandwidthThrottler.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UploadBandwidthThrottler.o `test -f 'UploadBandwidthThrottler.cpp' || echo '$(srcdir)/'`UploadBandwidthThrottler.cpp
 
 amuled-UploadBandwidthThrottler.obj: UploadBandwidthThrottler.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UploadBandwidthThrottler.obj -MD -MP -MF "$(DEPDIR)/amuled-UploadBandwidthThrottler.Tpo" -c -o amuled-UploadBandwidthThrottler.obj `if test -f 'UploadBandwidthThrottler.cpp'; then $(CYGPATH_W) 'UploadBandwidthThrottler.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadBandwidthThrottler.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UploadBandwidthThrottler.Tpo" "$(DEPDIR)/amuled-UploadBandwidthThrottler.Po"; else rm -f "$(DEPDIR)/amuled-UploadBandwidthThrottler.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UploadBandwidthThrottler.obj -MD -MP -MF $(DEPDIR)/amuled-UploadBandwidthThrottler.Tpo -c -o amuled-UploadBandwidthThrottler.obj `if test -f 'UploadBandwidthThrottler.cpp'; then $(CYGPATH_W) 'UploadBandwidthThrottler.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadBandwidthThrottler.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-UploadBandwidthThrottler.Tpo $(DEPDIR)/amuled-UploadBandwidthThrottler.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UploadBandwidthThrottler.cpp' object='amuled-UploadBandwidthThrottler.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UploadBandwidthThrottler.obj `if test -f 'UploadBandwidthThrottler.cpp'; then $(CYGPATH_W) 'UploadBandwidthThrottler.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadBandwidthThrottler.cpp'; fi`
 
 amuled-UploadClient.o: UploadClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UploadClient.o -MD -MP -MF "$(DEPDIR)/amuled-UploadClient.Tpo" -c -o amuled-UploadClient.o `test -f 'UploadClient.cpp' || echo '$(srcdir)/'`UploadClient.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UploadClient.Tpo" "$(DEPDIR)/amuled-UploadClient.Po"; else rm -f "$(DEPDIR)/amuled-UploadClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UploadClient.o -MD -MP -MF $(DEPDIR)/amuled-UploadClient.Tpo -c -o amuled-UploadClient.o `test -f 'UploadClient.cpp' || echo '$(srcdir)/'`UploadClient.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-UploadClient.Tpo $(DEPDIR)/amuled-UploadClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UploadClient.cpp' object='amuled-UploadClient.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UploadClient.o `test -f 'UploadClient.cpp' || echo '$(srcdir)/'`UploadClient.cpp
 
 amuled-UploadClient.obj: UploadClient.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UploadClient.obj -MD -MP -MF "$(DEPDIR)/amuled-UploadClient.Tpo" -c -o amuled-UploadClient.obj `if test -f 'UploadClient.cpp'; then $(CYGPATH_W) 'UploadClient.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadClient.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UploadClient.Tpo" "$(DEPDIR)/amuled-UploadClient.Po"; else rm -f "$(DEPDIR)/amuled-UploadClient.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UploadClient.obj -MD -MP -MF $(DEPDIR)/amuled-UploadClient.Tpo -c -o amuled-UploadClient.obj `if test -f 'UploadClient.cpp'; then $(CYGPATH_W) 'UploadClient.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadClient.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-UploadClient.Tpo $(DEPDIR)/amuled-UploadClient.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UploadClient.cpp' object='amuled-UploadClient.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UploadClient.obj `if test -f 'UploadClient.cpp'; then $(CYGPATH_W) 'UploadClient.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadClient.cpp'; fi`
 
 amuled-UploadQueue.o: UploadQueue.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UploadQueue.o -MD -MP -MF "$(DEPDIR)/amuled-UploadQueue.Tpo" -c -o amuled-UploadQueue.o `test -f 'UploadQueue.cpp' || echo '$(srcdir)/'`UploadQueue.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UploadQueue.Tpo" "$(DEPDIR)/amuled-UploadQueue.Po"; else rm -f "$(DEPDIR)/amuled-UploadQueue.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UploadQueue.o -MD -MP -MF $(DEPDIR)/amuled-UploadQueue.Tpo -c -o amuled-UploadQueue.o `test -f 'UploadQueue.cpp' || echo '$(srcdir)/'`UploadQueue.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-UploadQueue.Tpo $(DEPDIR)/amuled-UploadQueue.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UploadQueue.cpp' object='amuled-UploadQueue.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UploadQueue.o `test -f 'UploadQueue.cpp' || echo '$(srcdir)/'`UploadQueue.cpp
 
 amuled-UploadQueue.obj: UploadQueue.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UploadQueue.obj -MD -MP -MF "$(DEPDIR)/amuled-UploadQueue.Tpo" -c -o amuled-UploadQueue.obj `if test -f 'UploadQueue.cpp'; then $(CYGPATH_W) 'UploadQueue.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadQueue.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UploadQueue.Tpo" "$(DEPDIR)/amuled-UploadQueue.Po"; else rm -f "$(DEPDIR)/amuled-UploadQueue.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UploadQueue.obj -MD -MP -MF $(DEPDIR)/amuled-UploadQueue.Tpo -c -o amuled-UploadQueue.obj `if test -f 'UploadQueue.cpp'; then $(CYGPATH_W) 'UploadQueue.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadQueue.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-UploadQueue.Tpo $(DEPDIR)/amuled-UploadQueue.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UploadQueue.cpp' object='amuled-UploadQueue.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UploadQueue.obj `if test -f 'UploadQueue.cpp'; then $(CYGPATH_W) 'UploadQueue.cpp'; else $(CYGPATH_W) '$(srcdir)/UploadQueue.cpp'; fi`
 
 amuled-Indexed.o: kademlia/kademlia/Indexed.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Indexed.o -MD -MP -MF "$(DEPDIR)/amuled-Indexed.Tpo" -c -o amuled-Indexed.o `test -f 'kademlia/kademlia/Indexed.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Indexed.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Indexed.Tpo" "$(DEPDIR)/amuled-Indexed.Po"; else rm -f "$(DEPDIR)/amuled-Indexed.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Indexed.o -MD -MP -MF $(DEPDIR)/amuled-Indexed.Tpo -c -o amuled-Indexed.o `test -f 'kademlia/kademlia/Indexed.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Indexed.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Indexed.Tpo $(DEPDIR)/amuled-Indexed.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Indexed.cpp' object='amuled-Indexed.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Indexed.o `test -f 'kademlia/kademlia/Indexed.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Indexed.cpp
 
 amuled-Indexed.obj: kademlia/kademlia/Indexed.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Indexed.obj -MD -MP -MF "$(DEPDIR)/amuled-Indexed.Tpo" -c -o amuled-Indexed.obj `if test -f 'kademlia/kademlia/Indexed.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Indexed.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Indexed.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Indexed.Tpo" "$(DEPDIR)/amuled-Indexed.Po"; else rm -f "$(DEPDIR)/amuled-Indexed.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Indexed.obj -MD -MP -MF $(DEPDIR)/amuled-Indexed.Tpo -c -o amuled-Indexed.obj `if test -f 'kademlia/kademlia/Indexed.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Indexed.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Indexed.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Indexed.Tpo $(DEPDIR)/amuled-Indexed.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Indexed.cpp' object='amuled-Indexed.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Indexed.obj `if test -f 'kademlia/kademlia/Indexed.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Indexed.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Indexed.cpp'; fi`
 
 amuled-Kademlia.o: kademlia/kademlia/Kademlia.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Kademlia.o -MD -MP -MF "$(DEPDIR)/amuled-Kademlia.Tpo" -c -o amuled-Kademlia.o `test -f 'kademlia/kademlia/Kademlia.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Kademlia.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Kademlia.Tpo" "$(DEPDIR)/amuled-Kademlia.Po"; else rm -f "$(DEPDIR)/amuled-Kademlia.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Kademlia.o -MD -MP -MF $(DEPDIR)/amuled-Kademlia.Tpo -c -o amuled-Kademlia.o `test -f 'kademlia/kademlia/Kademlia.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Kademlia.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Kademlia.Tpo $(DEPDIR)/amuled-Kademlia.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Kademlia.cpp' object='amuled-Kademlia.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Kademlia.o `test -f 'kademlia/kademlia/Kademlia.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Kademlia.cpp
 
 amuled-Kademlia.obj: kademlia/kademlia/Kademlia.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Kademlia.obj -MD -MP -MF "$(DEPDIR)/amuled-Kademlia.Tpo" -c -o amuled-Kademlia.obj `if test -f 'kademlia/kademlia/Kademlia.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Kademlia.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Kademlia.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Kademlia.Tpo" "$(DEPDIR)/amuled-Kademlia.Po"; else rm -f "$(DEPDIR)/amuled-Kademlia.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Kademlia.obj -MD -MP -MF $(DEPDIR)/amuled-Kademlia.Tpo -c -o amuled-Kademlia.obj `if test -f 'kademlia/kademlia/Kademlia.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Kademlia.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Kademlia.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Kademlia.Tpo $(DEPDIR)/amuled-Kademlia.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Kademlia.cpp' object='amuled-Kademlia.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Kademlia.obj `if test -f 'kademlia/kademlia/Kademlia.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Kademlia.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Kademlia.cpp'; fi`
 
 amuled-Prefs.o: kademlia/kademlia/Prefs.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Prefs.o -MD -MP -MF "$(DEPDIR)/amuled-Prefs.Tpo" -c -o amuled-Prefs.o `test -f 'kademlia/kademlia/Prefs.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Prefs.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Prefs.Tpo" "$(DEPDIR)/amuled-Prefs.Po"; else rm -f "$(DEPDIR)/amuled-Prefs.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Prefs.o -MD -MP -MF $(DEPDIR)/amuled-Prefs.Tpo -c -o amuled-Prefs.o `test -f 'kademlia/kademlia/Prefs.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Prefs.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Prefs.Tpo $(DEPDIR)/amuled-Prefs.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Prefs.cpp' object='amuled-Prefs.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Prefs.o `test -f 'kademlia/kademlia/Prefs.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Prefs.cpp
 
 amuled-Prefs.obj: kademlia/kademlia/Prefs.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Prefs.obj -MD -MP -MF "$(DEPDIR)/amuled-Prefs.Tpo" -c -o amuled-Prefs.obj `if test -f 'kademlia/kademlia/Prefs.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Prefs.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Prefs.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Prefs.Tpo" "$(DEPDIR)/amuled-Prefs.Po"; else rm -f "$(DEPDIR)/amuled-Prefs.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Prefs.obj -MD -MP -MF $(DEPDIR)/amuled-Prefs.Tpo -c -o amuled-Prefs.obj `if test -f 'kademlia/kademlia/Prefs.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Prefs.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Prefs.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Prefs.Tpo $(DEPDIR)/amuled-Prefs.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Prefs.cpp' object='amuled-Prefs.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Prefs.obj `if test -f 'kademlia/kademlia/Prefs.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Prefs.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Prefs.cpp'; fi`
 
 amuled-Search.o: kademlia/kademlia/Search.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Search.o -MD -MP -MF "$(DEPDIR)/amuled-Search.Tpo" -c -o amuled-Search.o `test -f 'kademlia/kademlia/Search.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Search.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Search.Tpo" "$(DEPDIR)/amuled-Search.Po"; else rm -f "$(DEPDIR)/amuled-Search.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Search.o -MD -MP -MF $(DEPDIR)/amuled-Search.Tpo -c -o amuled-Search.o `test -f 'kademlia/kademlia/Search.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Search.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Search.Tpo $(DEPDIR)/amuled-Search.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Search.cpp' object='amuled-Search.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Search.o `test -f 'kademlia/kademlia/Search.cpp' || echo '$(srcdir)/'`kademlia/kademlia/Search.cpp
 
 amuled-Search.obj: kademlia/kademlia/Search.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Search.obj -MD -MP -MF "$(DEPDIR)/amuled-Search.Tpo" -c -o amuled-Search.obj `if test -f 'kademlia/kademlia/Search.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Search.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Search.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Search.Tpo" "$(DEPDIR)/amuled-Search.Po"; else rm -f "$(DEPDIR)/amuled-Search.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Search.obj -MD -MP -MF $(DEPDIR)/amuled-Search.Tpo -c -o amuled-Search.obj `if test -f 'kademlia/kademlia/Search.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Search.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Search.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Search.Tpo $(DEPDIR)/amuled-Search.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/Search.cpp' object='amuled-Search.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Search.obj `if test -f 'kademlia/kademlia/Search.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/Search.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/Search.cpp'; fi`
 
 amuled-UDPFirewallTester.o: kademlia/kademlia/UDPFirewallTester.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UDPFirewallTester.o -MD -MP -MF "$(DEPDIR)/amuled-UDPFirewallTester.Tpo" -c -o amuled-UDPFirewallTester.o `test -f 'kademlia/kademlia/UDPFirewallTester.cpp' || echo '$(srcdir)/'`kademlia/kademlia/UDPFirewallTester.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UDPFirewallTester.Tpo" "$(DEPDIR)/amuled-UDPFirewallTester.Po"; else rm -f "$(DEPDIR)/amuled-UDPFirewallTester.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UDPFirewallTester.o -MD -MP -MF $(DEPDIR)/amuled-UDPFirewallTester.Tpo -c -o amuled-UDPFirewallTester.o `test -f 'kademlia/kademlia/UDPFirewallTester.cpp' || echo '$(srcdir)/'`kademlia/kademlia/UDPFirewallTester.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-UDPFirewallTester.Tpo $(DEPDIR)/amuled-UDPFirewallTester.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/UDPFirewallTester.cpp' object='amuled-UDPFirewallTester.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UDPFirewallTester.o `test -f 'kademlia/kademlia/UDPFirewallTester.cpp' || echo '$(srcdir)/'`kademlia/kademlia/UDPFirewallTester.cpp
 
 amuled-UDPFirewallTester.obj: kademlia/kademlia/UDPFirewallTester.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UDPFirewallTester.obj -MD -MP -MF "$(DEPDIR)/amuled-UDPFirewallTester.Tpo" -c -o amuled-UDPFirewallTester.obj `if test -f 'kademlia/kademlia/UDPFirewallTester.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/UDPFirewallTester.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/UDPFirewallTester.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UDPFirewallTester.Tpo" "$(DEPDIR)/amuled-UDPFirewallTester.Po"; else rm -f "$(DEPDIR)/amuled-UDPFirewallTester.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UDPFirewallTester.obj -MD -MP -MF $(DEPDIR)/amuled-UDPFirewallTester.Tpo -c -o amuled-UDPFirewallTester.obj `if test -f 'kademlia/kademlia/UDPFirewallTester.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/UDPFirewallTester.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/UDPFirewallTester.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-UDPFirewallTester.Tpo $(DEPDIR)/amuled-UDPFirewallTester.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/kademlia/UDPFirewallTester.cpp' object='amuled-UDPFirewallTester.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UDPFirewallTester.obj `if test -f 'kademlia/kademlia/UDPFirewallTester.cpp'; then $(CYGPATH_W) 'kademlia/kademlia/UDPFirewallTester.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/kademlia/UDPFirewallTester.cpp'; fi`
 
 amuled-KademliaUDPListener.o: kademlia/net/KademliaUDPListener.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-KademliaUDPListener.o -MD -MP -MF "$(DEPDIR)/amuled-KademliaUDPListener.Tpo" -c -o amuled-KademliaUDPListener.o `test -f 'kademlia/net/KademliaUDPListener.cpp' || echo '$(srcdir)/'`kademlia/net/KademliaUDPListener.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-KademliaUDPListener.Tpo" "$(DEPDIR)/amuled-KademliaUDPListener.Po"; else rm -f "$(DEPDIR)/amuled-KademliaUDPListener.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-KademliaUDPListener.o -MD -MP -MF $(DEPDIR)/amuled-KademliaUDPListener.Tpo -c -o amuled-KademliaUDPListener.o `test -f 'kademlia/net/KademliaUDPListener.cpp' || echo '$(srcdir)/'`kademlia/net/KademliaUDPListener.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-KademliaUDPListener.Tpo $(DEPDIR)/amuled-KademliaUDPListener.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/net/KademliaUDPListener.cpp' object='amuled-KademliaUDPListener.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-KademliaUDPListener.o `test -f 'kademlia/net/KademliaUDPListener.cpp' || echo '$(srcdir)/'`kademlia/net/KademliaUDPListener.cpp
 
 amuled-KademliaUDPListener.obj: kademlia/net/KademliaUDPListener.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-KademliaUDPListener.obj -MD -MP -MF "$(DEPDIR)/amuled-KademliaUDPListener.Tpo" -c -o amuled-KademliaUDPListener.obj `if test -f 'kademlia/net/KademliaUDPListener.cpp'; then $(CYGPATH_W) 'kademlia/net/KademliaUDPListener.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/net/KademliaUDPListener.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-KademliaUDPListener.Tpo" "$(DEPDIR)/amuled-KademliaUDPListener.Po"; else rm -f "$(DEPDIR)/amuled-KademliaUDPListener.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-KademliaUDPListener.obj -MD -MP -MF $(DEPDIR)/amuled-KademliaUDPListener.Tpo -c -o amuled-KademliaUDPListener.obj `if test -f 'kademlia/net/KademliaUDPListener.cpp'; then $(CYGPATH_W) 'kademlia/net/KademliaUDPListener.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/net/KademliaUDPListener.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-KademliaUDPListener.Tpo $(DEPDIR)/amuled-KademliaUDPListener.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/net/KademliaUDPListener.cpp' object='amuled-KademliaUDPListener.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-KademliaUDPListener.obj `if test -f 'kademlia/net/KademliaUDPListener.cpp'; then $(CYGPATH_W) 'kademlia/net/KademliaUDPListener.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/net/KademliaUDPListener.cpp'; fi`
 
 amuled-PacketTracking.o: kademlia/net/PacketTracking.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-PacketTracking.o -MD -MP -MF "$(DEPDIR)/amuled-PacketTracking.Tpo" -c -o amuled-PacketTracking.o `test -f 'kademlia/net/PacketTracking.cpp' || echo '$(srcdir)/'`kademlia/net/PacketTracking.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-PacketTracking.Tpo" "$(DEPDIR)/amuled-PacketTracking.Po"; else rm -f "$(DEPDIR)/amuled-PacketTracking.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-PacketTracking.o -MD -MP -MF $(DEPDIR)/amuled-PacketTracking.Tpo -c -o amuled-PacketTracking.o `test -f 'kademlia/net/PacketTracking.cpp' || echo '$(srcdir)/'`kademlia/net/PacketTracking.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-PacketTracking.Tpo $(DEPDIR)/amuled-PacketTracking.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/net/PacketTracking.cpp' object='amuled-PacketTracking.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-PacketTracking.o `test -f 'kademlia/net/PacketTracking.cpp' || echo '$(srcdir)/'`kademlia/net/PacketTracking.cpp
 
 amuled-PacketTracking.obj: kademlia/net/PacketTracking.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-PacketTracking.obj -MD -MP -MF "$(DEPDIR)/amuled-PacketTracking.Tpo" -c -o amuled-PacketTracking.obj `if test -f 'kademlia/net/PacketTracking.cpp'; then $(CYGPATH_W) 'kademlia/net/PacketTracking.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/net/PacketTracking.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-PacketTracking.Tpo" "$(DEPDIR)/amuled-PacketTracking.Po"; else rm -f "$(DEPDIR)/amuled-PacketTracking.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-PacketTracking.obj -MD -MP -MF $(DEPDIR)/amuled-PacketTracking.Tpo -c -o amuled-PacketTracking.obj `if test -f 'kademlia/net/PacketTracking.cpp'; then $(CYGPATH_W) 'kademlia/net/PacketTracking.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/net/PacketTracking.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-PacketTracking.Tpo $(DEPDIR)/amuled-PacketTracking.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/net/PacketTracking.cpp' object='amuled-PacketTracking.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-PacketTracking.obj `if test -f 'kademlia/net/PacketTracking.cpp'; then $(CYGPATH_W) 'kademlia/net/PacketTracking.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/net/PacketTracking.cpp'; fi`
 
 amuled-Contact.o: kademlia/routing/Contact.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Contact.o -MD -MP -MF "$(DEPDIR)/amuled-Contact.Tpo" -c -o amuled-Contact.o `test -f 'kademlia/routing/Contact.cpp' || echo '$(srcdir)/'`kademlia/routing/Contact.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Contact.Tpo" "$(DEPDIR)/amuled-Contact.Po"; else rm -f "$(DEPDIR)/amuled-Contact.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Contact.o -MD -MP -MF $(DEPDIR)/amuled-Contact.Tpo -c -o amuled-Contact.o `test -f 'kademlia/routing/Contact.cpp' || echo '$(srcdir)/'`kademlia/routing/Contact.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Contact.Tpo $(DEPDIR)/amuled-Contact.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/routing/Contact.cpp' object='amuled-Contact.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Contact.o `test -f 'kademlia/routing/Contact.cpp' || echo '$(srcdir)/'`kademlia/routing/Contact.cpp
 
 amuled-Contact.obj: kademlia/routing/Contact.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Contact.obj -MD -MP -MF "$(DEPDIR)/amuled-Contact.Tpo" -c -o amuled-Contact.obj `if test -f 'kademlia/routing/Contact.cpp'; then $(CYGPATH_W) 'kademlia/routing/Contact.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/Contact.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Contact.Tpo" "$(DEPDIR)/amuled-Contact.Po"; else rm -f "$(DEPDIR)/amuled-Contact.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Contact.obj -MD -MP -MF $(DEPDIR)/amuled-Contact.Tpo -c -o amuled-Contact.obj `if test -f 'kademlia/routing/Contact.cpp'; then $(CYGPATH_W) 'kademlia/routing/Contact.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/Contact.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Contact.Tpo $(DEPDIR)/amuled-Contact.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/routing/Contact.cpp' object='amuled-Contact.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Contact.obj `if test -f 'kademlia/routing/Contact.cpp'; then $(CYGPATH_W) 'kademlia/routing/Contact.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/Contact.cpp'; fi`
 
 amuled-RoutingZone.o: kademlia/routing/RoutingZone.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-RoutingZone.o -MD -MP -MF "$(DEPDIR)/amuled-RoutingZone.Tpo" -c -o amuled-RoutingZone.o `test -f 'kademlia/routing/RoutingZone.cpp' || echo '$(srcdir)/'`kademlia/routing/RoutingZone.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-RoutingZone.Tpo" "$(DEPDIR)/amuled-RoutingZone.Po"; else rm -f "$(DEPDIR)/amuled-RoutingZone.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-RoutingZone.o -MD -MP -MF $(DEPDIR)/amuled-RoutingZone.Tpo -c -o amuled-RoutingZone.o `test -f 'kademlia/routing/RoutingZone.cpp' || echo '$(srcdir)/'`kademlia/routing/RoutingZone.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-RoutingZone.Tpo $(DEPDIR)/amuled-RoutingZone.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/routing/RoutingZone.cpp' object='amuled-RoutingZone.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-RoutingZone.o `test -f 'kademlia/routing/RoutingZone.cpp' || echo '$(srcdir)/'`kademlia/routing/RoutingZone.cpp
 
 amuled-RoutingZone.obj: kademlia/routing/RoutingZone.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-RoutingZone.obj -MD -MP -MF "$(DEPDIR)/amuled-RoutingZone.Tpo" -c -o amuled-RoutingZone.obj `if test -f 'kademlia/routing/RoutingZone.cpp'; then $(CYGPATH_W) 'kademlia/routing/RoutingZone.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/RoutingZone.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-RoutingZone.Tpo" "$(DEPDIR)/amuled-RoutingZone.Po"; else rm -f "$(DEPDIR)/amuled-RoutingZone.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-RoutingZone.obj -MD -MP -MF $(DEPDIR)/amuled-RoutingZone.Tpo -c -o amuled-RoutingZone.obj `if test -f 'kademlia/routing/RoutingZone.cpp'; then $(CYGPATH_W) 'kademlia/routing/RoutingZone.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/RoutingZone.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-RoutingZone.Tpo $(DEPDIR)/amuled-RoutingZone.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='kademlia/routing/RoutingZone.cpp' object='amuled-RoutingZone.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-RoutingZone.obj `if test -f 'kademlia/routing/RoutingZone.cpp'; then $(CYGPATH_W) 'kademlia/routing/RoutingZone.cpp'; else $(CYGPATH_W) '$(srcdir)/kademlia/routing/RoutingZone.cpp'; fi`
 
-amuled-UPnPBase.o: UPnPBase.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UPnPBase.o -MD -MP -MF "$(DEPDIR)/amuled-UPnPBase.Tpo" -c -o amuled-UPnPBase.o `test -f 'UPnPBase.cpp' || echo '$(srcdir)/'`UPnPBase.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UPnPBase.Tpo" "$(DEPDIR)/amuled-UPnPBase.Po"; else rm -f "$(DEPDIR)/amuled-UPnPBase.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UPnPBase.cpp' object='amuled-UPnPBase.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UPnPBase.o `test -f 'UPnPBase.cpp' || echo '$(srcdir)/'`UPnPBase.cpp
-
-amuled-UPnPBase.obj: UPnPBase.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UPnPBase.obj -MD -MP -MF "$(DEPDIR)/amuled-UPnPBase.Tpo" -c -o amuled-UPnPBase.obj `if test -f 'UPnPBase.cpp'; then $(CYGPATH_W) 'UPnPBase.cpp'; else $(CYGPATH_W) '$(srcdir)/UPnPBase.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UPnPBase.Tpo" "$(DEPDIR)/amuled-UPnPBase.Po"; else rm -f "$(DEPDIR)/amuled-UPnPBase.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UPnPBase.cpp' object='amuled-UPnPBase.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UPnPBase.obj `if test -f 'UPnPBase.cpp'; then $(CYGPATH_W) 'UPnPBase.cpp'; else $(CYGPATH_W) '$(srcdir)/UPnPBase.cpp'; fi`
-
-amuled-UPnPCompatibility.o: UPnPCompatibility.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UPnPCompatibility.o -MD -MP -MF "$(DEPDIR)/amuled-UPnPCompatibility.Tpo" -c -o amuled-UPnPCompatibility.o `test -f 'UPnPCompatibility.cpp' || echo '$(srcdir)/'`UPnPCompatibility.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UPnPCompatibility.Tpo" "$(DEPDIR)/amuled-UPnPCompatibility.Po"; else rm -f "$(DEPDIR)/amuled-UPnPCompatibility.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UPnPCompatibility.cpp' object='amuled-UPnPCompatibility.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UPnPCompatibility.o `test -f 'UPnPCompatibility.cpp' || echo '$(srcdir)/'`UPnPCompatibility.cpp
-
-amuled-UPnPCompatibility.obj: UPnPCompatibility.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UPnPCompatibility.obj -MD -MP -MF "$(DEPDIR)/amuled-UPnPCompatibility.Tpo" -c -o amuled-UPnPCompatibility.obj `if test -f 'UPnPCompatibility.cpp'; then $(CYGPATH_W) 'UPnPCompatibility.cpp'; else $(CYGPATH_W) '$(srcdir)/UPnPCompatibility.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UPnPCompatibility.Tpo" "$(DEPDIR)/amuled-UPnPCompatibility.Po"; else rm -f "$(DEPDIR)/amuled-UPnPCompatibility.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UPnPCompatibility.cpp' object='amuled-UPnPCompatibility.obj' libtool=no @AMDEPBACKSLASH@
+amuled-amuleAppCommon.o: amuleAppCommon.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-amuleAppCommon.o -MD -MP -MF $(DEPDIR)/amuled-amuleAppCommon.Tpo -c -o amuled-amuleAppCommon.o `test -f 'amuleAppCommon.cpp' || echo '$(srcdir)/'`amuleAppCommon.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-amuleAppCommon.Tpo $(DEPDIR)/amuled-amuleAppCommon.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amuleAppCommon.cpp' object='amuled-amuleAppCommon.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-amuleAppCommon.o `test -f 'amuleAppCommon.cpp' || echo '$(srcdir)/'`amuleAppCommon.cpp
+
+amuled-amuleAppCommon.obj: amuleAppCommon.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-amuleAppCommon.obj -MD -MP -MF $(DEPDIR)/amuled-amuleAppCommon.Tpo -c -o amuled-amuleAppCommon.obj `if test -f 'amuleAppCommon.cpp'; then $(CYGPATH_W) 'amuleAppCommon.cpp'; else $(CYGPATH_W) '$(srcdir)/amuleAppCommon.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-amuleAppCommon.Tpo $(DEPDIR)/amuled-amuleAppCommon.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amuleAppCommon.cpp' object='amuled-amuleAppCommon.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-amuleAppCommon.obj `if test -f 'amuleAppCommon.cpp'; then $(CYGPATH_W) 'amuleAppCommon.cpp'; else $(CYGPATH_W) '$(srcdir)/amuleAppCommon.cpp'; fi`
+
+amuled-ClientRef.o: ClientRef.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientRef.o -MD -MP -MF $(DEPDIR)/amuled-ClientRef.Tpo -c -o amuled-ClientRef.o `test -f 'ClientRef.cpp' || echo '$(srcdir)/'`ClientRef.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ClientRef.Tpo $(DEPDIR)/amuled-ClientRef.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientRef.cpp' object='amuled-ClientRef.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientRef.o `test -f 'ClientRef.cpp' || echo '$(srcdir)/'`ClientRef.cpp
+
+amuled-ClientRef.obj: ClientRef.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientRef.obj -MD -MP -MF $(DEPDIR)/amuled-ClientRef.Tpo -c -o amuled-ClientRef.obj `if test -f 'ClientRef.cpp'; then $(CYGPATH_W) 'ClientRef.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientRef.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ClientRef.Tpo $(DEPDIR)/amuled-ClientRef.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientRef.cpp' object='amuled-ClientRef.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientRef.obj `if test -f 'ClientRef.cpp'; then $(CYGPATH_W) 'ClientRef.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientRef.cpp'; fi`
+
+amuled-DataToText.o: DataToText.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-DataToText.o -MD -MP -MF $(DEPDIR)/amuled-DataToText.Tpo -c -o amuled-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-DataToText.Tpo $(DEPDIR)/amuled-DataToText.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DataToText.cpp' object='amuled-DataToText.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp
+
+amuled-DataToText.obj: DataToText.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-DataToText.obj -MD -MP -MF $(DEPDIR)/amuled-DataToText.Tpo -c -o amuled-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-DataToText.Tpo $(DEPDIR)/amuled-DataToText.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DataToText.cpp' object='amuled-DataToText.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UPnPCompatibility.obj `if test -f 'UPnPCompatibility.cpp'; then $(CYGPATH_W) 'UPnPCompatibility.cpp'; else $(CYGPATH_W) '$(srcdir)/UPnPCompatibility.cpp'; fi`
-
-amuled-ClientCredits.o: ClientCredits.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientCredits.o -MD -MP -MF "$(DEPDIR)/amuled-ClientCredits.Tpo" -c -o amuled-ClientCredits.o `test -f 'ClientCredits.cpp' || echo '$(srcdir)/'`ClientCredits.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ClientCredits.Tpo" "$(DEPDIR)/amuled-ClientCredits.Po"; else rm -f "$(DEPDIR)/amuled-ClientCredits.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientCredits.cpp' object='amuled-ClientCredits.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientCredits.o `test -f 'ClientCredits.cpp' || echo '$(srcdir)/'`ClientCredits.cpp
-
-amuled-ClientCredits.obj: ClientCredits.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ClientCredits.obj -MD -MP -MF "$(DEPDIR)/amuled-ClientCredits.Tpo" -c -o amuled-ClientCredits.obj `if test -f 'ClientCredits.cpp'; then $(CYGPATH_W) 'ClientCredits.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCredits.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ClientCredits.Tpo" "$(DEPDIR)/amuled-ClientCredits.Po"; else rm -f "$(DEPDIR)/amuled-ClientCredits.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientCredits.cpp' object='amuled-ClientCredits.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ClientCredits.obj `if test -f 'ClientCredits.cpp'; then $(CYGPATH_W) 'ClientCredits.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCredits.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi`
 
 amuled-ECSpecialMuleTags.o: ECSpecialMuleTags.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ECSpecialMuleTags.o -MD -MP -MF "$(DEPDIR)/amuled-ECSpecialMuleTags.Tpo" -c -o amuled-ECSpecialMuleTags.o `test -f 'ECSpecialMuleTags.cpp' || echo '$(srcdir)/'`ECSpecialMuleTags.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ECSpecialMuleTags.Tpo" "$(DEPDIR)/amuled-ECSpecialMuleTags.Po"; else rm -f "$(DEPDIR)/amuled-ECSpecialMuleTags.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ECSpecialMuleTags.o -MD -MP -MF $(DEPDIR)/amuled-ECSpecialMuleTags.Tpo -c -o amuled-ECSpecialMuleTags.o `test -f 'ECSpecialMuleTags.cpp' || echo '$(srcdir)/'`ECSpecialMuleTags.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ECSpecialMuleTags.Tpo $(DEPDIR)/amuled-ECSpecialMuleTags.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ECSpecialMuleTags.cpp' object='amuled-ECSpecialMuleTags.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ECSpecialMuleTags.o `test -f 'ECSpecialMuleTags.cpp' || echo '$(srcdir)/'`ECSpecialMuleTags.cpp
 
 amuled-ECSpecialMuleTags.obj: ECSpecialMuleTags.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ECSpecialMuleTags.obj -MD -MP -MF "$(DEPDIR)/amuled-ECSpecialMuleTags.Tpo" -c -o amuled-ECSpecialMuleTags.obj `if test -f 'ECSpecialMuleTags.cpp'; then $(CYGPATH_W) 'ECSpecialMuleTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialMuleTags.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-ECSpecialMuleTags.Tpo" "$(DEPDIR)/amuled-ECSpecialMuleTags.Po"; else rm -f "$(DEPDIR)/amuled-ECSpecialMuleTags.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-ECSpecialMuleTags.obj -MD -MP -MF $(DEPDIR)/amuled-ECSpecialMuleTags.Tpo -c -o amuled-ECSpecialMuleTags.obj `if test -f 'ECSpecialMuleTags.cpp'; then $(CYGPATH_W) 'ECSpecialMuleTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialMuleTags.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-ECSpecialMuleTags.Tpo $(DEPDIR)/amuled-ECSpecialMuleTags.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ECSpecialMuleTags.cpp' object='amuled-ECSpecialMuleTags.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-ECSpecialMuleTags.obj `if test -f 'ECSpecialMuleTags.cpp'; then $(CYGPATH_W) 'ECSpecialMuleTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialMuleTags.cpp'; fi`
 
 amuled-KnownFile.o: KnownFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-KnownFile.o -MD -MP -MF "$(DEPDIR)/amuled-KnownFile.Tpo" -c -o amuled-KnownFile.o `test -f 'KnownFile.cpp' || echo '$(srcdir)/'`KnownFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-KnownFile.Tpo" "$(DEPDIR)/amuled-KnownFile.Po"; else rm -f "$(DEPDIR)/amuled-KnownFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-KnownFile.o -MD -MP -MF $(DEPDIR)/amuled-KnownFile.Tpo -c -o amuled-KnownFile.o `test -f 'KnownFile.cpp' || echo '$(srcdir)/'`KnownFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-KnownFile.Tpo $(DEPDIR)/amuled-KnownFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KnownFile.cpp' object='amuled-KnownFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-KnownFile.o `test -f 'KnownFile.cpp' || echo '$(srcdir)/'`KnownFile.cpp
 
 amuled-KnownFile.obj: KnownFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-KnownFile.obj -MD -MP -MF "$(DEPDIR)/amuled-KnownFile.Tpo" -c -o amuled-KnownFile.obj `if test -f 'KnownFile.cpp'; then $(CYGPATH_W) 'KnownFile.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-KnownFile.Tpo" "$(DEPDIR)/amuled-KnownFile.Po"; else rm -f "$(DEPDIR)/amuled-KnownFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-KnownFile.obj -MD -MP -MF $(DEPDIR)/amuled-KnownFile.Tpo -c -o amuled-KnownFile.obj `if test -f 'KnownFile.cpp'; then $(CYGPATH_W) 'KnownFile.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-KnownFile.Tpo $(DEPDIR)/amuled-KnownFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KnownFile.cpp' object='amuled-KnownFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-KnownFile.obj `if test -f 'KnownFile.cpp'; then $(CYGPATH_W) 'KnownFile.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFile.cpp'; fi`
 
 amuled-GetTickCount.o: GetTickCount.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-GetTickCount.o -MD -MP -MF "$(DEPDIR)/amuled-GetTickCount.Tpo" -c -o amuled-GetTickCount.o `test -f 'GetTickCount.cpp' || echo '$(srcdir)/'`GetTickCount.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-GetTickCount.Tpo" "$(DEPDIR)/amuled-GetTickCount.Po"; else rm -f "$(DEPDIR)/amuled-GetTickCount.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-GetTickCount.o -MD -MP -MF $(DEPDIR)/amuled-GetTickCount.Tpo -c -o amuled-GetTickCount.o `test -f 'GetTickCount.cpp' || echo '$(srcdir)/'`GetTickCount.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-GetTickCount.Tpo $(DEPDIR)/amuled-GetTickCount.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GetTickCount.cpp' object='amuled-GetTickCount.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-GetTickCount.o `test -f 'GetTickCount.cpp' || echo '$(srcdir)/'`GetTickCount.cpp
 
 amuled-GetTickCount.obj: GetTickCount.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-GetTickCount.obj -MD -MP -MF "$(DEPDIR)/amuled-GetTickCount.Tpo" -c -o amuled-GetTickCount.obj `if test -f 'GetTickCount.cpp'; then $(CYGPATH_W) 'GetTickCount.cpp'; else $(CYGPATH_W) '$(srcdir)/GetTickCount.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-GetTickCount.Tpo" "$(DEPDIR)/amuled-GetTickCount.Po"; else rm -f "$(DEPDIR)/amuled-GetTickCount.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-GetTickCount.obj -MD -MP -MF $(DEPDIR)/amuled-GetTickCount.Tpo -c -o amuled-GetTickCount.obj `if test -f 'GetTickCount.cpp'; then $(CYGPATH_W) 'GetTickCount.cpp'; else $(CYGPATH_W) '$(srcdir)/GetTickCount.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-GetTickCount.Tpo $(DEPDIR)/amuled-GetTickCount.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GetTickCount.cpp' object='amuled-GetTickCount.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-GetTickCount.obj `if test -f 'GetTickCount.cpp'; then $(CYGPATH_W) 'GetTickCount.cpp'; else $(CYGPATH_W) '$(srcdir)/GetTickCount.cpp'; fi`
 
 amuled-GuiEvents.o: GuiEvents.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-GuiEvents.o -MD -MP -MF "$(DEPDIR)/amuled-GuiEvents.Tpo" -c -o amuled-GuiEvents.o `test -f 'GuiEvents.cpp' || echo '$(srcdir)/'`GuiEvents.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-GuiEvents.Tpo" "$(DEPDIR)/amuled-GuiEvents.Po"; else rm -f "$(DEPDIR)/amuled-GuiEvents.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-GuiEvents.o -MD -MP -MF $(DEPDIR)/amuled-GuiEvents.Tpo -c -o amuled-GuiEvents.o `test -f 'GuiEvents.cpp' || echo '$(srcdir)/'`GuiEvents.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-GuiEvents.Tpo $(DEPDIR)/amuled-GuiEvents.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GuiEvents.cpp' object='amuled-GuiEvents.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-GuiEvents.o `test -f 'GuiEvents.cpp' || echo '$(srcdir)/'`GuiEvents.cpp
 
 amuled-GuiEvents.obj: GuiEvents.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-GuiEvents.obj -MD -MP -MF "$(DEPDIR)/amuled-GuiEvents.Tpo" -c -o amuled-GuiEvents.obj `if test -f 'GuiEvents.cpp'; then $(CYGPATH_W) 'GuiEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/GuiEvents.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-GuiEvents.Tpo" "$(DEPDIR)/amuled-GuiEvents.Po"; else rm -f "$(DEPDIR)/amuled-GuiEvents.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-GuiEvents.obj -MD -MP -MF $(DEPDIR)/amuled-GuiEvents.Tpo -c -o amuled-GuiEvents.obj `if test -f 'GuiEvents.cpp'; then $(CYGPATH_W) 'GuiEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/GuiEvents.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-GuiEvents.Tpo $(DEPDIR)/amuled-GuiEvents.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GuiEvents.cpp' object='amuled-GuiEvents.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-GuiEvents.obj `if test -f 'GuiEvents.cpp'; then $(CYGPATH_W) 'GuiEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/GuiEvents.cpp'; fi`
 
+amuled-HTTPDownload.o: HTTPDownload.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-HTTPDownload.o -MD -MP -MF $(DEPDIR)/amuled-HTTPDownload.Tpo -c -o amuled-HTTPDownload.o `test -f 'HTTPDownload.cpp' || echo '$(srcdir)/'`HTTPDownload.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-HTTPDownload.Tpo $(DEPDIR)/amuled-HTTPDownload.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HTTPDownload.cpp' object='amuled-HTTPDownload.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-HTTPDownload.o `test -f 'HTTPDownload.cpp' || echo '$(srcdir)/'`HTTPDownload.cpp
+
+amuled-HTTPDownload.obj: HTTPDownload.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-HTTPDownload.obj -MD -MP -MF $(DEPDIR)/amuled-HTTPDownload.Tpo -c -o amuled-HTTPDownload.obj `if test -f 'HTTPDownload.cpp'; then $(CYGPATH_W) 'HTTPDownload.cpp'; else $(CYGPATH_W) '$(srcdir)/HTTPDownload.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-HTTPDownload.Tpo $(DEPDIR)/amuled-HTTPDownload.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HTTPDownload.cpp' object='amuled-HTTPDownload.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-HTTPDownload.obj `if test -f 'HTTPDownload.cpp'; then $(CYGPATH_W) 'HTTPDownload.cpp'; else $(CYGPATH_W) '$(srcdir)/HTTPDownload.cpp'; fi`
+
 amuled-Logger.o: Logger.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Logger.o -MD -MP -MF "$(DEPDIR)/amuled-Logger.Tpo" -c -o amuled-Logger.o `test -f 'Logger.cpp' || echo '$(srcdir)/'`Logger.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Logger.Tpo" "$(DEPDIR)/amuled-Logger.Po"; else rm -f "$(DEPDIR)/amuled-Logger.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Logger.o -MD -MP -MF $(DEPDIR)/amuled-Logger.Tpo -c -o amuled-Logger.o `test -f 'Logger.cpp' || echo '$(srcdir)/'`Logger.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Logger.Tpo $(DEPDIR)/amuled-Logger.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Logger.cpp' object='amuled-Logger.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Logger.o `test -f 'Logger.cpp' || echo '$(srcdir)/'`Logger.cpp
 
 amuled-Logger.obj: Logger.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Logger.obj -MD -MP -MF "$(DEPDIR)/amuled-Logger.Tpo" -c -o amuled-Logger.obj `if test -f 'Logger.cpp'; then $(CYGPATH_W) 'Logger.cpp'; else $(CYGPATH_W) '$(srcdir)/Logger.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Logger.Tpo" "$(DEPDIR)/amuled-Logger.Po"; else rm -f "$(DEPDIR)/amuled-Logger.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Logger.obj -MD -MP -MF $(DEPDIR)/amuled-Logger.Tpo -c -o amuled-Logger.obj `if test -f 'Logger.cpp'; then $(CYGPATH_W) 'Logger.cpp'; else $(CYGPATH_W) '$(srcdir)/Logger.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Logger.Tpo $(DEPDIR)/amuled-Logger.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Logger.cpp' object='amuled-Logger.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Logger.obj `if test -f 'Logger.cpp'; then $(CYGPATH_W) 'Logger.cpp'; else $(CYGPATH_W) '$(srcdir)/Logger.cpp'; fi`
 
 amuled-PartFile.o: PartFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-PartFile.o -MD -MP -MF "$(DEPDIR)/amuled-PartFile.Tpo" -c -o amuled-PartFile.o `test -f 'PartFile.cpp' || echo '$(srcdir)/'`PartFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-PartFile.Tpo" "$(DEPDIR)/amuled-PartFile.Po"; else rm -f "$(DEPDIR)/amuled-PartFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-PartFile.o -MD -MP -MF $(DEPDIR)/amuled-PartFile.Tpo -c -o amuled-PartFile.o `test -f 'PartFile.cpp' || echo '$(srcdir)/'`PartFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-PartFile.Tpo $(DEPDIR)/amuled-PartFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFile.cpp' object='amuled-PartFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-PartFile.o `test -f 'PartFile.cpp' || echo '$(srcdir)/'`PartFile.cpp
 
 amuled-PartFile.obj: PartFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-PartFile.obj -MD -MP -MF "$(DEPDIR)/amuled-PartFile.Tpo" -c -o amuled-PartFile.obj `if test -f 'PartFile.cpp'; then $(CYGPATH_W) 'PartFile.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-PartFile.Tpo" "$(DEPDIR)/amuled-PartFile.Po"; else rm -f "$(DEPDIR)/amuled-PartFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-PartFile.obj -MD -MP -MF $(DEPDIR)/amuled-PartFile.Tpo -c -o amuled-PartFile.obj `if test -f 'PartFile.cpp'; then $(CYGPATH_W) 'PartFile.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-PartFile.Tpo $(DEPDIR)/amuled-PartFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFile.cpp' object='amuled-PartFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-PartFile.obj `if test -f 'PartFile.cpp'; then $(CYGPATH_W) 'PartFile.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFile.cpp'; fi`
 
 amuled-Preferences.o: Preferences.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Preferences.o -MD -MP -MF "$(DEPDIR)/amuled-Preferences.Tpo" -c -o amuled-Preferences.o `test -f 'Preferences.cpp' || echo '$(srcdir)/'`Preferences.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Preferences.Tpo" "$(DEPDIR)/amuled-Preferences.Po"; else rm -f "$(DEPDIR)/amuled-Preferences.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Preferences.o -MD -MP -MF $(DEPDIR)/amuled-Preferences.Tpo -c -o amuled-Preferences.o `test -f 'Preferences.cpp' || echo '$(srcdir)/'`Preferences.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Preferences.Tpo $(DEPDIR)/amuled-Preferences.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Preferences.cpp' object='amuled-Preferences.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Preferences.o `test -f 'Preferences.cpp' || echo '$(srcdir)/'`Preferences.cpp
 
 amuled-Preferences.obj: Preferences.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Preferences.obj -MD -MP -MF "$(DEPDIR)/amuled-Preferences.Tpo" -c -o amuled-Preferences.obj `if test -f 'Preferences.cpp'; then $(CYGPATH_W) 'Preferences.cpp'; else $(CYGPATH_W) '$(srcdir)/Preferences.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Preferences.Tpo" "$(DEPDIR)/amuled-Preferences.Po"; else rm -f "$(DEPDIR)/amuled-Preferences.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Preferences.obj -MD -MP -MF $(DEPDIR)/amuled-Preferences.Tpo -c -o amuled-Preferences.obj `if test -f 'Preferences.cpp'; then $(CYGPATH_W) 'Preferences.cpp'; else $(CYGPATH_W) '$(srcdir)/Preferences.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Preferences.Tpo $(DEPDIR)/amuled-Preferences.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Preferences.cpp' object='amuled-Preferences.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Preferences.obj `if test -f 'Preferences.cpp'; then $(CYGPATH_W) 'Preferences.cpp'; else $(CYGPATH_W) '$(srcdir)/Preferences.cpp'; fi`
 
 amuled-Proxy.o: Proxy.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Proxy.o -MD -MP -MF "$(DEPDIR)/amuled-Proxy.Tpo" -c -o amuled-Proxy.o `test -f 'Proxy.cpp' || echo '$(srcdir)/'`Proxy.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Proxy.Tpo" "$(DEPDIR)/amuled-Proxy.Po"; else rm -f "$(DEPDIR)/amuled-Proxy.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Proxy.o -MD -MP -MF $(DEPDIR)/amuled-Proxy.Tpo -c -o amuled-Proxy.o `test -f 'Proxy.cpp' || echo '$(srcdir)/'`Proxy.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Proxy.Tpo $(DEPDIR)/amuled-Proxy.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Proxy.cpp' object='amuled-Proxy.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Proxy.o `test -f 'Proxy.cpp' || echo '$(srcdir)/'`Proxy.cpp
 
 amuled-Proxy.obj: Proxy.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Proxy.obj -MD -MP -MF "$(DEPDIR)/amuled-Proxy.Tpo" -c -o amuled-Proxy.obj `if test -f 'Proxy.cpp'; then $(CYGPATH_W) 'Proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/Proxy.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Proxy.Tpo" "$(DEPDIR)/amuled-Proxy.Po"; else rm -f "$(DEPDIR)/amuled-Proxy.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Proxy.obj -MD -MP -MF $(DEPDIR)/amuled-Proxy.Tpo -c -o amuled-Proxy.obj `if test -f 'Proxy.cpp'; then $(CYGPATH_W) 'Proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/Proxy.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Proxy.Tpo $(DEPDIR)/amuled-Proxy.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Proxy.cpp' object='amuled-Proxy.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Proxy.obj `if test -f 'Proxy.cpp'; then $(CYGPATH_W) 'Proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/Proxy.cpp'; fi`
 
 amuled-Server.o: Server.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Server.o -MD -MP -MF "$(DEPDIR)/amuled-Server.Tpo" -c -o amuled-Server.o `test -f 'Server.cpp' || echo '$(srcdir)/'`Server.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Server.Tpo" "$(DEPDIR)/amuled-Server.Po"; else rm -f "$(DEPDIR)/amuled-Server.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Server.o -MD -MP -MF $(DEPDIR)/amuled-Server.Tpo -c -o amuled-Server.o `test -f 'Server.cpp' || echo '$(srcdir)/'`Server.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Server.Tpo $(DEPDIR)/amuled-Server.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Server.cpp' object='amuled-Server.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Server.o `test -f 'Server.cpp' || echo '$(srcdir)/'`Server.cpp
 
 amuled-Server.obj: Server.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Server.obj -MD -MP -MF "$(DEPDIR)/amuled-Server.Tpo" -c -o amuled-Server.obj `if test -f 'Server.cpp'; then $(CYGPATH_W) 'Server.cpp'; else $(CYGPATH_W) '$(srcdir)/Server.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Server.Tpo" "$(DEPDIR)/amuled-Server.Po"; else rm -f "$(DEPDIR)/amuled-Server.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Server.obj -MD -MP -MF $(DEPDIR)/amuled-Server.Tpo -c -o amuled-Server.obj `if test -f 'Server.cpp'; then $(CYGPATH_W) 'Server.cpp'; else $(CYGPATH_W) '$(srcdir)/Server.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Server.Tpo $(DEPDIR)/amuled-Server.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Server.cpp' object='amuled-Server.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Server.obj `if test -f 'Server.cpp'; then $(CYGPATH_W) 'Server.cpp'; else $(CYGPATH_W) '$(srcdir)/Server.cpp'; fi`
 
 amuled-Statistics.o: Statistics.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Statistics.o -MD -MP -MF "$(DEPDIR)/amuled-Statistics.Tpo" -c -o amuled-Statistics.o `test -f 'Statistics.cpp' || echo '$(srcdir)/'`Statistics.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Statistics.Tpo" "$(DEPDIR)/amuled-Statistics.Po"; else rm -f "$(DEPDIR)/amuled-Statistics.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Statistics.o -MD -MP -MF $(DEPDIR)/amuled-Statistics.Tpo -c -o amuled-Statistics.o `test -f 'Statistics.cpp' || echo '$(srcdir)/'`Statistics.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Statistics.Tpo $(DEPDIR)/amuled-Statistics.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Statistics.cpp' object='amuled-Statistics.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Statistics.o `test -f 'Statistics.cpp' || echo '$(srcdir)/'`Statistics.cpp
 
 amuled-Statistics.obj: Statistics.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Statistics.obj -MD -MP -MF "$(DEPDIR)/amuled-Statistics.Tpo" -c -o amuled-Statistics.obj `if test -f 'Statistics.cpp'; then $(CYGPATH_W) 'Statistics.cpp'; else $(CYGPATH_W) '$(srcdir)/Statistics.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-Statistics.Tpo" "$(DEPDIR)/amuled-Statistics.Po"; else rm -f "$(DEPDIR)/amuled-Statistics.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-Statistics.obj -MD -MP -MF $(DEPDIR)/amuled-Statistics.Tpo -c -o amuled-Statistics.obj `if test -f 'Statistics.cpp'; then $(CYGPATH_W) 'Statistics.cpp'; else $(CYGPATH_W) '$(srcdir)/Statistics.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-Statistics.Tpo $(DEPDIR)/amuled-Statistics.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Statistics.cpp' object='amuled-Statistics.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-Statistics.obj `if test -f 'Statistics.cpp'; then $(CYGPATH_W) 'Statistics.cpp'; else $(CYGPATH_W) '$(srcdir)/Statistics.cpp'; fi`
 
 amuled-StatTree.o: StatTree.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-StatTree.o -MD -MP -MF "$(DEPDIR)/amuled-StatTree.Tpo" -c -o amuled-StatTree.o `test -f 'StatTree.cpp' || echo '$(srcdir)/'`StatTree.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-StatTree.Tpo" "$(DEPDIR)/amuled-StatTree.Po"; else rm -f "$(DEPDIR)/amuled-StatTree.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-StatTree.o -MD -MP -MF $(DEPDIR)/amuled-StatTree.Tpo -c -o amuled-StatTree.o `test -f 'StatTree.cpp' || echo '$(srcdir)/'`StatTree.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-StatTree.Tpo $(DEPDIR)/amuled-StatTree.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StatTree.cpp' object='amuled-StatTree.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-StatTree.o `test -f 'StatTree.cpp' || echo '$(srcdir)/'`StatTree.cpp
 
 amuled-StatTree.obj: StatTree.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-StatTree.obj -MD -MP -MF "$(DEPDIR)/amuled-StatTree.Tpo" -c -o amuled-StatTree.obj `if test -f 'StatTree.cpp'; then $(CYGPATH_W) 'StatTree.cpp'; else $(CYGPATH_W) '$(srcdir)/StatTree.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-StatTree.Tpo" "$(DEPDIR)/amuled-StatTree.Po"; else rm -f "$(DEPDIR)/amuled-StatTree.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-StatTree.obj -MD -MP -MF $(DEPDIR)/amuled-StatTree.Tpo -c -o amuled-StatTree.obj `if test -f 'StatTree.cpp'; then $(CYGPATH_W) 'StatTree.cpp'; else $(CYGPATH_W) '$(srcdir)/StatTree.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-StatTree.Tpo $(DEPDIR)/amuled-StatTree.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StatTree.cpp' object='amuled-StatTree.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-StatTree.obj `if test -f 'StatTree.cpp'; then $(CYGPATH_W) 'StatTree.cpp'; else $(CYGPATH_W) '$(srcdir)/StatTree.cpp'; fi`
 
-amuled-SHAHashSet.o: SHAHashSet.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SHAHashSet.o -MD -MP -MF "$(DEPDIR)/amuled-SHAHashSet.Tpo" -c -o amuled-SHAHashSet.o `test -f 'SHAHashSet.cpp' || echo '$(srcdir)/'`SHAHashSet.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-SHAHashSet.Tpo" "$(DEPDIR)/amuled-SHAHashSet.Po"; else rm -f "$(DEPDIR)/amuled-SHAHashSet.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SHAHashSet.cpp' object='amuled-SHAHashSet.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-SHAHashSet.o `test -f 'SHAHashSet.cpp' || echo '$(srcdir)/'`SHAHashSet.cpp
-
-amuled-SHAHashSet.obj: SHAHashSet.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-SHAHashSet.obj -MD -MP -MF "$(DEPDIR)/amuled-SHAHashSet.Tpo" -c -o amuled-SHAHashSet.obj `if test -f 'SHAHashSet.cpp'; then $(CYGPATH_W) 'SHAHashSet.cpp'; else $(CYGPATH_W) '$(srcdir)/SHAHashSet.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-SHAHashSet.Tpo" "$(DEPDIR)/amuled-SHAHashSet.Po"; else rm -f "$(DEPDIR)/amuled-SHAHashSet.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SHAHashSet.cpp' object='amuled-SHAHashSet.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-SHAHashSet.obj `if test -f 'SHAHashSet.cpp'; then $(CYGPATH_W) 'SHAHashSet.cpp'; else $(CYGPATH_W) '$(srcdir)/SHAHashSet.cpp'; fi`
-
-amuled-TerminationProcess.o: TerminationProcess.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-TerminationProcess.o -MD -MP -MF "$(DEPDIR)/amuled-TerminationProcess.Tpo" -c -o amuled-TerminationProcess.o `test -f 'TerminationProcess.cpp' || echo '$(srcdir)/'`TerminationProcess.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-TerminationProcess.Tpo" "$(DEPDIR)/amuled-TerminationProcess.Po"; else rm -f "$(DEPDIR)/amuled-TerminationProcess.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcess.cpp' object='amuled-TerminationProcess.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-TerminationProcess.o `test -f 'TerminationProcess.cpp' || echo '$(srcdir)/'`TerminationProcess.cpp
-
-amuled-TerminationProcess.obj: TerminationProcess.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-TerminationProcess.obj -MD -MP -MF "$(DEPDIR)/amuled-TerminationProcess.Tpo" -c -o amuled-TerminationProcess.obj `if test -f 'TerminationProcess.cpp'; then $(CYGPATH_W) 'TerminationProcess.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcess.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-TerminationProcess.Tpo" "$(DEPDIR)/amuled-TerminationProcess.Po"; else rm -f "$(DEPDIR)/amuled-TerminationProcess.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcess.cpp' object='amuled-TerminationProcess.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-TerminationProcess.obj `if test -f 'TerminationProcess.cpp'; then $(CYGPATH_W) 'TerminationProcess.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcess.cpp'; fi`
-
-amuled-TerminationProcessAmuleweb.o: TerminationProcessAmuleweb.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-TerminationProcessAmuleweb.o -MD -MP -MF "$(DEPDIR)/amuled-TerminationProcessAmuleweb.Tpo" -c -o amuled-TerminationProcessAmuleweb.o `test -f 'TerminationProcessAmuleweb.cpp' || echo '$(srcdir)/'`TerminationProcessAmuleweb.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-TerminationProcessAmuleweb.Tpo" "$(DEPDIR)/amuled-TerminationProcessAmuleweb.Po"; else rm -f "$(DEPDIR)/amuled-TerminationProcessAmuleweb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcessAmuleweb.cpp' object='amuled-TerminationProcessAmuleweb.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-TerminationProcessAmuleweb.o `test -f 'TerminationProcessAmuleweb.cpp' || echo '$(srcdir)/'`TerminationProcessAmuleweb.cpp
-
-amuled-TerminationProcessAmuleweb.obj: TerminationProcessAmuleweb.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-TerminationProcessAmuleweb.obj -MD -MP -MF "$(DEPDIR)/amuled-TerminationProcessAmuleweb.Tpo" -c -o amuled-TerminationProcessAmuleweb.obj `if test -f 'TerminationProcessAmuleweb.cpp'; then $(CYGPATH_W) 'TerminationProcessAmuleweb.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcessAmuleweb.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-TerminationProcessAmuleweb.Tpo" "$(DEPDIR)/amuled-TerminationProcessAmuleweb.Po"; else rm -f "$(DEPDIR)/amuled-TerminationProcessAmuleweb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcessAmuleweb.cpp' object='amuled-TerminationProcessAmuleweb.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-TerminationProcessAmuleweb.obj `if test -f 'TerminationProcessAmuleweb.cpp'; then $(CYGPATH_W) 'TerminationProcessAmuleweb.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcessAmuleweb.cpp'; fi`
-
 amuled-UserEvents.o: UserEvents.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UserEvents.o -MD -MP -MF "$(DEPDIR)/amuled-UserEvents.Tpo" -c -o amuled-UserEvents.o `test -f 'UserEvents.cpp' || echo '$(srcdir)/'`UserEvents.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UserEvents.Tpo" "$(DEPDIR)/amuled-UserEvents.Po"; else rm -f "$(DEPDIR)/amuled-UserEvents.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UserEvents.o -MD -MP -MF $(DEPDIR)/amuled-UserEvents.Tpo -c -o amuled-UserEvents.o `test -f 'UserEvents.cpp' || echo '$(srcdir)/'`UserEvents.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-UserEvents.Tpo $(DEPDIR)/amuled-UserEvents.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UserEvents.cpp' object='amuled-UserEvents.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UserEvents.o `test -f 'UserEvents.cpp' || echo '$(srcdir)/'`UserEvents.cpp
 
 amuled-UserEvents.obj: UserEvents.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UserEvents.obj -MD -MP -MF "$(DEPDIR)/amuled-UserEvents.Tpo" -c -o amuled-UserEvents.obj `if test -f 'UserEvents.cpp'; then $(CYGPATH_W) 'UserEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/UserEvents.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-UserEvents.Tpo" "$(DEPDIR)/amuled-UserEvents.Po"; else rm -f "$(DEPDIR)/amuled-UserEvents.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-UserEvents.obj -MD -MP -MF $(DEPDIR)/amuled-UserEvents.Tpo -c -o amuled-UserEvents.obj `if test -f 'UserEvents.cpp'; then $(CYGPATH_W) 'UserEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/UserEvents.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuled-UserEvents.Tpo $(DEPDIR)/amuled-UserEvents.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UserEvents.cpp' object='amuled-UserEvents.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-UserEvents.obj `if test -f 'UserEvents.cpp'; then $(CYGPATH_W) 'UserEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/UserEvents.cpp'; fi`
 
-amuled-OtherFunctions.o: OtherFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-OtherFunctions.o -MD -MP -MF "$(DEPDIR)/amuled-OtherFunctions.Tpo" -c -o amuled-OtherFunctions.o `test -f 'OtherFunctions.cpp' || echo '$(srcdir)/'`OtherFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-OtherFunctions.Tpo" "$(DEPDIR)/amuled-OtherFunctions.Po"; else rm -f "$(DEPDIR)/amuled-OtherFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OtherFunctions.cpp' object='amuled-OtherFunctions.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-OtherFunctions.o `test -f 'OtherFunctions.cpp' || echo '$(srcdir)/'`OtherFunctions.cpp
-
-amuled-OtherFunctions.obj: OtherFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-OtherFunctions.obj -MD -MP -MF "$(DEPDIR)/amuled-OtherFunctions.Tpo" -c -o amuled-OtherFunctions.obj `if test -f 'OtherFunctions.cpp'; then $(CYGPATH_W) 'OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/OtherFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-OtherFunctions.Tpo" "$(DEPDIR)/amuled-OtherFunctions.Po"; else rm -f "$(DEPDIR)/amuled-OtherFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OtherFunctions.cpp' object='amuled-OtherFunctions.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-OtherFunctions.obj `if test -f 'OtherFunctions.cpp'; then $(CYGPATH_W) 'OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/OtherFunctions.cpp'; fi`
-
-amuled-NetworkFunctions.o: NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-NetworkFunctions.o -MD -MP -MF "$(DEPDIR)/amuled-NetworkFunctions.Tpo" -c -o amuled-NetworkFunctions.o `test -f 'NetworkFunctions.cpp' || echo '$(srcdir)/'`NetworkFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-NetworkFunctions.Tpo" "$(DEPDIR)/amuled-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/amuled-NetworkFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NetworkFunctions.cpp' object='amuled-NetworkFunctions.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-NetworkFunctions.o `test -f 'NetworkFunctions.cpp' || echo '$(srcdir)/'`NetworkFunctions.cpp
-
-amuled-NetworkFunctions.obj: NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -MT amuled-NetworkFunctions.obj -MD -MP -MF "$(DEPDIR)/amuled-NetworkFunctions.Tpo" -c -o amuled-NetworkFunctions.obj `if test -f 'NetworkFunctions.cpp'; then $(CYGPATH_W) 'NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuled-NetworkFunctions.Tpo" "$(DEPDIR)/amuled-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/amuled-NetworkFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NetworkFunctions.cpp' object='amuled-NetworkFunctions.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuled_CPPFLAGS) $(CPPFLAGS) $(amuled_CXXFLAGS) $(CXXFLAGS) -c -o amuled-NetworkFunctions.obj `if test -f 'NetworkFunctions.cpp'; then $(CYGPATH_W) 'NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctions.cpp'; fi`
-
 amulegui-amule-remote-gui.o: amule-remote-gui.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amule-remote-gui.o -MD -MP -MF "$(DEPDIR)/amulegui-amule-remote-gui.Tpo" -c -o amulegui-amule-remote-gui.o `test -f 'amule-remote-gui.cpp' || echo '$(srcdir)/'`amule-remote-gui.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-amule-remote-gui.Tpo" "$(DEPDIR)/amulegui-amule-remote-gui.Po"; else rm -f "$(DEPDIR)/amulegui-amule-remote-gui.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amule-remote-gui.o -MD -MP -MF $(DEPDIR)/amulegui-amule-remote-gui.Tpo -c -o amulegui-amule-remote-gui.o `test -f 'amule-remote-gui.cpp' || echo '$(srcdir)/'`amule-remote-gui.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-amule-remote-gui.Tpo $(DEPDIR)/amulegui-amule-remote-gui.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amule-remote-gui.cpp' object='amulegui-amule-remote-gui.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-amule-remote-gui.o `test -f 'amule-remote-gui.cpp' || echo '$(srcdir)/'`amule-remote-gui.cpp
 
 amulegui-amule-remote-gui.obj: amule-remote-gui.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amule-remote-gui.obj -MD -MP -MF "$(DEPDIR)/amulegui-amule-remote-gui.Tpo" -c -o amulegui-amule-remote-gui.obj `if test -f 'amule-remote-gui.cpp'; then $(CYGPATH_W) 'amule-remote-gui.cpp'; else $(CYGPATH_W) '$(srcdir)/amule-remote-gui.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-amule-remote-gui.Tpo" "$(DEPDIR)/amulegui-amule-remote-gui.Po"; else rm -f "$(DEPDIR)/amulegui-amule-remote-gui.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amule-remote-gui.obj -MD -MP -MF $(DEPDIR)/amulegui-amule-remote-gui.Tpo -c -o amulegui-amule-remote-gui.obj `if test -f 'amule-remote-gui.cpp'; then $(CYGPATH_W) 'amule-remote-gui.cpp'; else $(CYGPATH_W) '$(srcdir)/amule-remote-gui.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-amule-remote-gui.Tpo $(DEPDIR)/amulegui-amule-remote-gui.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amule-remote-gui.cpp' object='amulegui-amule-remote-gui.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-amule-remote-gui.obj `if test -f 'amule-remote-gui.cpp'; then $(CYGPATH_W) 'amule-remote-gui.cpp'; else $(CYGPATH_W) '$(srcdir)/amule-remote-gui.cpp'; fi`
 
 amulegui-amule-gui.o: amule-gui.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amule-gui.o -MD -MP -MF "$(DEPDIR)/amulegui-amule-gui.Tpo" -c -o amulegui-amule-gui.o `test -f 'amule-gui.cpp' || echo '$(srcdir)/'`amule-gui.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-amule-gui.Tpo" "$(DEPDIR)/amulegui-amule-gui.Po"; else rm -f "$(DEPDIR)/amulegui-amule-gui.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amule-gui.o -MD -MP -MF $(DEPDIR)/amulegui-amule-gui.Tpo -c -o amulegui-amule-gui.o `test -f 'amule-gui.cpp' || echo '$(srcdir)/'`amule-gui.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-amule-gui.Tpo $(DEPDIR)/amulegui-amule-gui.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amule-gui.cpp' object='amulegui-amule-gui.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-amule-gui.o `test -f 'amule-gui.cpp' || echo '$(srcdir)/'`amule-gui.cpp
 
 amulegui-amule-gui.obj: amule-gui.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amule-gui.obj -MD -MP -MF "$(DEPDIR)/amulegui-amule-gui.Tpo" -c -o amulegui-amule-gui.obj `if test -f 'amule-gui.cpp'; then $(CYGPATH_W) 'amule-gui.cpp'; else $(CYGPATH_W) '$(srcdir)/amule-gui.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-amule-gui.Tpo" "$(DEPDIR)/amulegui-amule-gui.Po"; else rm -f "$(DEPDIR)/amulegui-amule-gui.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amule-gui.obj -MD -MP -MF $(DEPDIR)/amulegui-amule-gui.Tpo -c -o amulegui-amule-gui.obj `if test -f 'amule-gui.cpp'; then $(CYGPATH_W) 'amule-gui.cpp'; else $(CYGPATH_W) '$(srcdir)/amule-gui.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-amule-gui.Tpo $(DEPDIR)/amulegui-amule-gui.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amule-gui.cpp' object='amulegui-amule-gui.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-amule-gui.obj `if test -f 'amule-gui.cpp'; then $(CYGPATH_W) 'amule-gui.cpp'; else $(CYGPATH_W) '$(srcdir)/amule-gui.cpp'; fi`
 
 amulegui-amuleDlg.o: amuleDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amuleDlg.o -MD -MP -MF "$(DEPDIR)/amulegui-amuleDlg.Tpo" -c -o amulegui-amuleDlg.o `test -f 'amuleDlg.cpp' || echo '$(srcdir)/'`amuleDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-amuleDlg.Tpo" "$(DEPDIR)/amulegui-amuleDlg.Po"; else rm -f "$(DEPDIR)/amulegui-amuleDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amuleDlg.o -MD -MP -MF $(DEPDIR)/amulegui-amuleDlg.Tpo -c -o amulegui-amuleDlg.o `test -f 'amuleDlg.cpp' || echo '$(srcdir)/'`amuleDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-amuleDlg.Tpo $(DEPDIR)/amulegui-amuleDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amuleDlg.cpp' object='amulegui-amuleDlg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-amuleDlg.o `test -f 'amuleDlg.cpp' || echo '$(srcdir)/'`amuleDlg.cpp
 
 amulegui-amuleDlg.obj: amuleDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amuleDlg.obj -MD -MP -MF "$(DEPDIR)/amulegui-amuleDlg.Tpo" -c -o amulegui-amuleDlg.obj `if test -f 'amuleDlg.cpp'; then $(CYGPATH_W) 'amuleDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/amuleDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-amuleDlg.Tpo" "$(DEPDIR)/amulegui-amuleDlg.Po"; else rm -f "$(DEPDIR)/amulegui-amuleDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amuleDlg.obj -MD -MP -MF $(DEPDIR)/amulegui-amuleDlg.Tpo -c -o amulegui-amuleDlg.obj `if test -f 'amuleDlg.cpp'; then $(CYGPATH_W) 'amuleDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/amuleDlg.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-amuleDlg.Tpo $(DEPDIR)/amulegui-amuleDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amuleDlg.cpp' object='amulegui-amuleDlg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-amuleDlg.obj `if test -f 'amuleDlg.cpp'; then $(CYGPATH_W) 'amuleDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/amuleDlg.cpp'; fi`
 
 amulegui-AddFriend.o: AddFriend.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-AddFriend.o -MD -MP -MF "$(DEPDIR)/amulegui-AddFriend.Tpo" -c -o amulegui-AddFriend.o `test -f 'AddFriend.cpp' || echo '$(srcdir)/'`AddFriend.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-AddFriend.Tpo" "$(DEPDIR)/amulegui-AddFriend.Po"; else rm -f "$(DEPDIR)/amulegui-AddFriend.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-AddFriend.o -MD -MP -MF $(DEPDIR)/amulegui-AddFriend.Tpo -c -o amulegui-AddFriend.o `test -f 'AddFriend.cpp' || echo '$(srcdir)/'`AddFriend.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-AddFriend.Tpo $(DEPDIR)/amulegui-AddFriend.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='AddFriend.cpp' object='amulegui-AddFriend.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-AddFriend.o `test -f 'AddFriend.cpp' || echo '$(srcdir)/'`AddFriend.cpp
 
 amulegui-AddFriend.obj: AddFriend.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-AddFriend.obj -MD -MP -MF "$(DEPDIR)/amulegui-AddFriend.Tpo" -c -o amulegui-AddFriend.obj `if test -f 'AddFriend.cpp'; then $(CYGPATH_W) 'AddFriend.cpp'; else $(CYGPATH_W) '$(srcdir)/AddFriend.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-AddFriend.Tpo" "$(DEPDIR)/amulegui-AddFriend.Po"; else rm -f "$(DEPDIR)/amulegui-AddFriend.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-AddFriend.obj -MD -MP -MF $(DEPDIR)/amulegui-AddFriend.Tpo -c -o amulegui-AddFriend.obj `if test -f 'AddFriend.cpp'; then $(CYGPATH_W) 'AddFriend.cpp'; else $(CYGPATH_W) '$(srcdir)/AddFriend.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-AddFriend.Tpo $(DEPDIR)/amulegui-AddFriend.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='AddFriend.cpp' object='amulegui-AddFriend.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-AddFriend.obj `if test -f 'AddFriend.cpp'; then $(CYGPATH_W) 'AddFriend.cpp'; else $(CYGPATH_W) '$(srcdir)/AddFriend.cpp'; fi`
 
 amulegui-CatDialog.o: CatDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-CatDialog.o -MD -MP -MF "$(DEPDIR)/amulegui-CatDialog.Tpo" -c -o amulegui-CatDialog.o `test -f 'CatDialog.cpp' || echo '$(srcdir)/'`CatDialog.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-CatDialog.Tpo" "$(DEPDIR)/amulegui-CatDialog.Po"; else rm -f "$(DEPDIR)/amulegui-CatDialog.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-CatDialog.o -MD -MP -MF $(DEPDIR)/amulegui-CatDialog.Tpo -c -o amulegui-CatDialog.o `test -f 'CatDialog.cpp' || echo '$(srcdir)/'`CatDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-CatDialog.Tpo $(DEPDIR)/amulegui-CatDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CatDialog.cpp' object='amulegui-CatDialog.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-CatDialog.o `test -f 'CatDialog.cpp' || echo '$(srcdir)/'`CatDialog.cpp
 
 amulegui-CatDialog.obj: CatDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-CatDialog.obj -MD -MP -MF "$(DEPDIR)/amulegui-CatDialog.Tpo" -c -o amulegui-CatDialog.obj `if test -f 'CatDialog.cpp'; then $(CYGPATH_W) 'CatDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CatDialog.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-CatDialog.Tpo" "$(DEPDIR)/amulegui-CatDialog.Po"; else rm -f "$(DEPDIR)/amulegui-CatDialog.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-CatDialog.obj -MD -MP -MF $(DEPDIR)/amulegui-CatDialog.Tpo -c -o amulegui-CatDialog.obj `if test -f 'CatDialog.cpp'; then $(CYGPATH_W) 'CatDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CatDialog.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-CatDialog.Tpo $(DEPDIR)/amulegui-CatDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CatDialog.cpp' object='amulegui-CatDialog.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-CatDialog.obj `if test -f 'CatDialog.cpp'; then $(CYGPATH_W) 'CatDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CatDialog.cpp'; fi`
 
 amulegui-ChatSelector.o: ChatSelector.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ChatSelector.o -MD -MP -MF "$(DEPDIR)/amulegui-ChatSelector.Tpo" -c -o amulegui-ChatSelector.o `test -f 'ChatSelector.cpp' || echo '$(srcdir)/'`ChatSelector.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ChatSelector.Tpo" "$(DEPDIR)/amulegui-ChatSelector.Po"; else rm -f "$(DEPDIR)/amulegui-ChatSelector.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ChatSelector.o -MD -MP -MF $(DEPDIR)/amulegui-ChatSelector.Tpo -c -o amulegui-ChatSelector.o `test -f 'ChatSelector.cpp' || echo '$(srcdir)/'`ChatSelector.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ChatSelector.Tpo $(DEPDIR)/amulegui-ChatSelector.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ChatSelector.cpp' object='amulegui-ChatSelector.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ChatSelector.o `test -f 'ChatSelector.cpp' || echo '$(srcdir)/'`ChatSelector.cpp
 
 amulegui-ChatSelector.obj: ChatSelector.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ChatSelector.obj -MD -MP -MF "$(DEPDIR)/amulegui-ChatSelector.Tpo" -c -o amulegui-ChatSelector.obj `if test -f 'ChatSelector.cpp'; then $(CYGPATH_W) 'ChatSelector.cpp'; else $(CYGPATH_W) '$(srcdir)/ChatSelector.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ChatSelector.Tpo" "$(DEPDIR)/amulegui-ChatSelector.Po"; else rm -f "$(DEPDIR)/amulegui-ChatSelector.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ChatSelector.obj -MD -MP -MF $(DEPDIR)/amulegui-ChatSelector.Tpo -c -o amulegui-ChatSelector.obj `if test -f 'ChatSelector.cpp'; then $(CYGPATH_W) 'ChatSelector.cpp'; else $(CYGPATH_W) '$(srcdir)/ChatSelector.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ChatSelector.Tpo $(DEPDIR)/amulegui-ChatSelector.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ChatSelector.cpp' object='amulegui-ChatSelector.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ChatSelector.obj `if test -f 'ChatSelector.cpp'; then $(CYGPATH_W) 'ChatSelector.cpp'; else $(CYGPATH_W) '$(srcdir)/ChatSelector.cpp'; fi`
 
+amulegui-ChatWnd.o: ChatWnd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ChatWnd.o -MD -MP -MF $(DEPDIR)/amulegui-ChatWnd.Tpo -c -o amulegui-ChatWnd.o `test -f 'ChatWnd.cpp' || echo '$(srcdir)/'`ChatWnd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ChatWnd.Tpo $(DEPDIR)/amulegui-ChatWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ChatWnd.cpp' object='amulegui-ChatWnd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ChatWnd.o `test -f 'ChatWnd.cpp' || echo '$(srcdir)/'`ChatWnd.cpp
+
+amulegui-ChatWnd.obj: ChatWnd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ChatWnd.obj -MD -MP -MF $(DEPDIR)/amulegui-ChatWnd.Tpo -c -o amulegui-ChatWnd.obj `if test -f 'ChatWnd.cpp'; then $(CYGPATH_W) 'ChatWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/ChatWnd.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ChatWnd.Tpo $(DEPDIR)/amulegui-ChatWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ChatWnd.cpp' object='amulegui-ChatWnd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ChatWnd.obj `if test -f 'ChatWnd.cpp'; then $(CYGPATH_W) 'ChatWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/ChatWnd.cpp'; fi`
+
+amulegui-CommentDialog.o: CommentDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-CommentDialog.o -MD -MP -MF $(DEPDIR)/amulegui-CommentDialog.Tpo -c -o amulegui-CommentDialog.o `test -f 'CommentDialog.cpp' || echo '$(srcdir)/'`CommentDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-CommentDialog.Tpo $(DEPDIR)/amulegui-CommentDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CommentDialog.cpp' object='amulegui-CommentDialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-CommentDialog.o `test -f 'CommentDialog.cpp' || echo '$(srcdir)/'`CommentDialog.cpp
+
+amulegui-CommentDialog.obj: CommentDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-CommentDialog.obj -MD -MP -MF $(DEPDIR)/amulegui-CommentDialog.Tpo -c -o amulegui-CommentDialog.obj `if test -f 'CommentDialog.cpp'; then $(CYGPATH_W) 'CommentDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CommentDialog.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-CommentDialog.Tpo $(DEPDIR)/amulegui-CommentDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CommentDialog.cpp' object='amulegui-CommentDialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-CommentDialog.obj `if test -f 'CommentDialog.cpp'; then $(CYGPATH_W) 'CommentDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/CommentDialog.cpp'; fi`
+
+amulegui-CommentDialogLst.o: CommentDialogLst.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-CommentDialogLst.o -MD -MP -MF $(DEPDIR)/amulegui-CommentDialogLst.Tpo -c -o amulegui-CommentDialogLst.o `test -f 'CommentDialogLst.cpp' || echo '$(srcdir)/'`CommentDialogLst.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-CommentDialogLst.Tpo $(DEPDIR)/amulegui-CommentDialogLst.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CommentDialogLst.cpp' object='amulegui-CommentDialogLst.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-CommentDialogLst.o `test -f 'CommentDialogLst.cpp' || echo '$(srcdir)/'`CommentDialogLst.cpp
+
+amulegui-CommentDialogLst.obj: CommentDialogLst.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-CommentDialogLst.obj -MD -MP -MF $(DEPDIR)/amulegui-CommentDialogLst.Tpo -c -o amulegui-CommentDialogLst.obj `if test -f 'CommentDialogLst.cpp'; then $(CYGPATH_W) 'CommentDialogLst.cpp'; else $(CYGPATH_W) '$(srcdir)/CommentDialogLst.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-CommentDialogLst.Tpo $(DEPDIR)/amulegui-CommentDialogLst.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CommentDialogLst.cpp' object='amulegui-CommentDialogLst.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-CommentDialogLst.obj `if test -f 'CommentDialogLst.cpp'; then $(CYGPATH_W) 'CommentDialogLst.cpp'; else $(CYGPATH_W) '$(srcdir)/CommentDialogLst.cpp'; fi`
+
+amulegui-GenericClientListCtrl.o: GenericClientListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-GenericClientListCtrl.o -MD -MP -MF $(DEPDIR)/amulegui-GenericClientListCtrl.Tpo -c -o amulegui-GenericClientListCtrl.o `test -f 'GenericClientListCtrl.cpp' || echo '$(srcdir)/'`GenericClientListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-GenericClientListCtrl.Tpo $(DEPDIR)/amulegui-GenericClientListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GenericClientListCtrl.cpp' object='amulegui-GenericClientListCtrl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-GenericClientListCtrl.o `test -f 'GenericClientListCtrl.cpp' || echo '$(srcdir)/'`GenericClientListCtrl.cpp
+
+amulegui-GenericClientListCtrl.obj: GenericClientListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-GenericClientListCtrl.obj -MD -MP -MF $(DEPDIR)/amulegui-GenericClientListCtrl.Tpo -c -o amulegui-GenericClientListCtrl.obj `if test -f 'GenericClientListCtrl.cpp'; then $(CYGPATH_W) 'GenericClientListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/GenericClientListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-GenericClientListCtrl.Tpo $(DEPDIR)/amulegui-GenericClientListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GenericClientListCtrl.cpp' object='amulegui-GenericClientListCtrl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-GenericClientListCtrl.obj `if test -f 'GenericClientListCtrl.cpp'; then $(CYGPATH_W) 'GenericClientListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/GenericClientListCtrl.cpp'; fi`
+
 amulegui-ClientDetailDialog.o: ClientDetailDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ClientDetailDialog.o -MD -MP -MF "$(DEPDIR)/amulegui-ClientDetailDialog.Tpo" -c -o amulegui-ClientDetailDialog.o `test -f 'ClientDetailDialog.cpp' || echo '$(srcdir)/'`ClientDetailDialog.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ClientDetailDialog.Tpo" "$(DEPDIR)/amulegui-ClientDetailDialog.Po"; else rm -f "$(DEPDIR)/amulegui-ClientDetailDialog.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ClientDetailDialog.o -MD -MP -MF $(DEPDIR)/amulegui-ClientDetailDialog.Tpo -c -o amulegui-ClientDetailDialog.o `test -f 'ClientDetailDialog.cpp' || echo '$(srcdir)/'`ClientDetailDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ClientDetailDialog.Tpo $(DEPDIR)/amulegui-ClientDetailDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientDetailDialog.cpp' object='amulegui-ClientDetailDialog.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ClientDetailDialog.o `test -f 'ClientDetailDialog.cpp' || echo '$(srcdir)/'`ClientDetailDialog.cpp
 
 amulegui-ClientDetailDialog.obj: ClientDetailDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ClientDetailDialog.obj -MD -MP -MF "$(DEPDIR)/amulegui-ClientDetailDialog.Tpo" -c -o amulegui-ClientDetailDialog.obj `if test -f 'ClientDetailDialog.cpp'; then $(CYGPATH_W) 'ClientDetailDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientDetailDialog.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ClientDetailDialog.Tpo" "$(DEPDIR)/amulegui-ClientDetailDialog.Po"; else rm -f "$(DEPDIR)/amulegui-ClientDetailDialog.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ClientDetailDialog.obj -MD -MP -MF $(DEPDIR)/amulegui-ClientDetailDialog.Tpo -c -o amulegui-ClientDetailDialog.obj `if test -f 'ClientDetailDialog.cpp'; then $(CYGPATH_W) 'ClientDetailDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientDetailDialog.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ClientDetailDialog.Tpo $(DEPDIR)/amulegui-ClientDetailDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientDetailDialog.cpp' object='amulegui-ClientDetailDialog.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ClientDetailDialog.obj `if test -f 'ClientDetailDialog.cpp'; then $(CYGPATH_W) 'ClientDetailDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientDetailDialog.cpp'; fi`
 
+amulegui-DirectoryTreeCtrl.o: DirectoryTreeCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-DirectoryTreeCtrl.o -MD -MP -MF $(DEPDIR)/amulegui-DirectoryTreeCtrl.Tpo -c -o amulegui-DirectoryTreeCtrl.o `test -f 'DirectoryTreeCtrl.cpp' || echo '$(srcdir)/'`DirectoryTreeCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-DirectoryTreeCtrl.Tpo $(DEPDIR)/amulegui-DirectoryTreeCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DirectoryTreeCtrl.cpp' object='amulegui-DirectoryTreeCtrl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-DirectoryTreeCtrl.o `test -f 'DirectoryTreeCtrl.cpp' || echo '$(srcdir)/'`DirectoryTreeCtrl.cpp
+
+amulegui-DirectoryTreeCtrl.obj: DirectoryTreeCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-DirectoryTreeCtrl.obj -MD -MP -MF $(DEPDIR)/amulegui-DirectoryTreeCtrl.Tpo -c -o amulegui-DirectoryTreeCtrl.obj `if test -f 'DirectoryTreeCtrl.cpp'; then $(CYGPATH_W) 'DirectoryTreeCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/DirectoryTreeCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-DirectoryTreeCtrl.Tpo $(DEPDIR)/amulegui-DirectoryTreeCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DirectoryTreeCtrl.cpp' object='amulegui-DirectoryTreeCtrl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-DirectoryTreeCtrl.obj `if test -f 'DirectoryTreeCtrl.cpp'; then $(CYGPATH_W) 'DirectoryTreeCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/DirectoryTreeCtrl.cpp'; fi`
+
 amulegui-FileDetailDialog.o: FileDetailDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-FileDetailDialog.o -MD -MP -MF "$(DEPDIR)/amulegui-FileDetailDialog.Tpo" -c -o amulegui-FileDetailDialog.o `test -f 'FileDetailDialog.cpp' || echo '$(srcdir)/'`FileDetailDialog.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-FileDetailDialog.Tpo" "$(DEPDIR)/amulegui-FileDetailDialog.Po"; else rm -f "$(DEPDIR)/amulegui-FileDetailDialog.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-FileDetailDialog.o -MD -MP -MF $(DEPDIR)/amulegui-FileDetailDialog.Tpo -c -o amulegui-FileDetailDialog.o `test -f 'FileDetailDialog.cpp' || echo '$(srcdir)/'`FileDetailDialog.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-FileDetailDialog.Tpo $(DEPDIR)/amulegui-FileDetailDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileDetailDialog.cpp' object='amulegui-FileDetailDialog.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-FileDetailDialog.o `test -f 'FileDetailDialog.cpp' || echo '$(srcdir)/'`FileDetailDialog.cpp
 
 amulegui-FileDetailDialog.obj: FileDetailDialog.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-FileDetailDialog.obj -MD -MP -MF "$(DEPDIR)/amulegui-FileDetailDialog.Tpo" -c -o amulegui-FileDetailDialog.obj `if test -f 'FileDetailDialog.cpp'; then $(CYGPATH_W) 'FileDetailDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/FileDetailDialog.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-FileDetailDialog.Tpo" "$(DEPDIR)/amulegui-FileDetailDialog.Po"; else rm -f "$(DEPDIR)/amulegui-FileDetailDialog.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-FileDetailDialog.obj -MD -MP -MF $(DEPDIR)/amulegui-FileDetailDialog.Tpo -c -o amulegui-FileDetailDialog.obj `if test -f 'FileDetailDialog.cpp'; then $(CYGPATH_W) 'FileDetailDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/FileDetailDialog.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-FileDetailDialog.Tpo $(DEPDIR)/amulegui-FileDetailDialog.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileDetailDialog.cpp' object='amulegui-FileDetailDialog.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-FileDetailDialog.obj `if test -f 'FileDetailDialog.cpp'; then $(CYGPATH_W) 'FileDetailDialog.cpp'; else $(CYGPATH_W) '$(srcdir)/FileDetailDialog.cpp'; fi`
 
 amulegui-KadDlg.o: KadDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-KadDlg.o -MD -MP -MF "$(DEPDIR)/amulegui-KadDlg.Tpo" -c -o amulegui-KadDlg.o `test -f 'KadDlg.cpp' || echo '$(srcdir)/'`KadDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-KadDlg.Tpo" "$(DEPDIR)/amulegui-KadDlg.Po"; else rm -f "$(DEPDIR)/amulegui-KadDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-KadDlg.o -MD -MP -MF $(DEPDIR)/amulegui-KadDlg.Tpo -c -o amulegui-KadDlg.o `test -f 'KadDlg.cpp' || echo '$(srcdir)/'`KadDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-KadDlg.Tpo $(DEPDIR)/amulegui-KadDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KadDlg.cpp' object='amulegui-KadDlg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-KadDlg.o `test -f 'KadDlg.cpp' || echo '$(srcdir)/'`KadDlg.cpp
 
 amulegui-KadDlg.obj: KadDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-KadDlg.obj -MD -MP -MF "$(DEPDIR)/amulegui-KadDlg.Tpo" -c -o amulegui-KadDlg.obj `if test -f 'KadDlg.cpp'; then $(CYGPATH_W) 'KadDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/KadDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-KadDlg.Tpo" "$(DEPDIR)/amulegui-KadDlg.Po"; else rm -f "$(DEPDIR)/amulegui-KadDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-KadDlg.obj -MD -MP -MF $(DEPDIR)/amulegui-KadDlg.Tpo -c -o amulegui-KadDlg.obj `if test -f 'KadDlg.cpp'; then $(CYGPATH_W) 'KadDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/KadDlg.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-KadDlg.Tpo $(DEPDIR)/amulegui-KadDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KadDlg.cpp' object='amulegui-KadDlg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-KadDlg.obj `if test -f 'KadDlg.cpp'; then $(CYGPATH_W) 'KadDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/KadDlg.cpp'; fi`
 
 amulegui-OScopeCtrl.o: OScopeCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-OScopeCtrl.o -MD -MP -MF "$(DEPDIR)/amulegui-OScopeCtrl.Tpo" -c -o amulegui-OScopeCtrl.o `test -f 'OScopeCtrl.cpp' || echo '$(srcdir)/'`OScopeCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-OScopeCtrl.Tpo" "$(DEPDIR)/amulegui-OScopeCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-OScopeCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-OScopeCtrl.o -MD -MP -MF $(DEPDIR)/amulegui-OScopeCtrl.Tpo -c -o amulegui-OScopeCtrl.o `test -f 'OScopeCtrl.cpp' || echo '$(srcdir)/'`OScopeCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-OScopeCtrl.Tpo $(DEPDIR)/amulegui-OScopeCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OScopeCtrl.cpp' object='amulegui-OScopeCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-OScopeCtrl.o `test -f 'OScopeCtrl.cpp' || echo '$(srcdir)/'`OScopeCtrl.cpp
 
 amulegui-OScopeCtrl.obj: OScopeCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-OScopeCtrl.obj -MD -MP -MF "$(DEPDIR)/amulegui-OScopeCtrl.Tpo" -c -o amulegui-OScopeCtrl.obj `if test -f 'OScopeCtrl.cpp'; then $(CYGPATH_W) 'OScopeCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/OScopeCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-OScopeCtrl.Tpo" "$(DEPDIR)/amulegui-OScopeCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-OScopeCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-OScopeCtrl.obj -MD -MP -MF $(DEPDIR)/amulegui-OScopeCtrl.Tpo -c -o amulegui-OScopeCtrl.obj `if test -f 'OScopeCtrl.cpp'; then $(CYGPATH_W) 'OScopeCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/OScopeCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-OScopeCtrl.Tpo $(DEPDIR)/amulegui-OScopeCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OScopeCtrl.cpp' object='amulegui-OScopeCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-OScopeCtrl.obj `if test -f 'OScopeCtrl.cpp'; then $(CYGPATH_W) 'OScopeCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/OScopeCtrl.cpp'; fi`
 
-amulegui-PartFileConvertDlg.o: PartFileConvertDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-PartFileConvertDlg.o -MD -MP -MF "$(DEPDIR)/amulegui-PartFileConvertDlg.Tpo" -c -o amulegui-PartFileConvertDlg.o `test -f 'PartFileConvertDlg.cpp' || echo '$(srcdir)/'`PartFileConvertDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-PartFileConvertDlg.Tpo" "$(DEPDIR)/amulegui-PartFileConvertDlg.Po"; else rm -f "$(DEPDIR)/amulegui-PartFileConvertDlg.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFileConvertDlg.cpp' object='amulegui-PartFileConvertDlg.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-PartFileConvertDlg.o `test -f 'PartFileConvertDlg.cpp' || echo '$(srcdir)/'`PartFileConvertDlg.cpp
-
-amulegui-PartFileConvertDlg.obj: PartFileConvertDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-PartFileConvertDlg.obj -MD -MP -MF "$(DEPDIR)/amulegui-PartFileConvertDlg.Tpo" -c -o amulegui-PartFileConvertDlg.obj `if test -f 'PartFileConvertDlg.cpp'; then $(CYGPATH_W) 'PartFileConvertDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFileConvertDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-PartFileConvertDlg.Tpo" "$(DEPDIR)/amulegui-PartFileConvertDlg.Po"; else rm -f "$(DEPDIR)/amulegui-PartFileConvertDlg.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFileConvertDlg.cpp' object='amulegui-PartFileConvertDlg.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-PartFileConvertDlg.obj `if test -f 'PartFileConvertDlg.cpp'; then $(CYGPATH_W) 'PartFileConvertDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFileConvertDlg.cpp'; fi`
-
 amulegui-PrefsUnifiedDlg.o: PrefsUnifiedDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-PrefsUnifiedDlg.o -MD -MP -MF "$(DEPDIR)/amulegui-PrefsUnifiedDlg.Tpo" -c -o amulegui-PrefsUnifiedDlg.o `test -f 'PrefsUnifiedDlg.cpp' || echo '$(srcdir)/'`PrefsUnifiedDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-PrefsUnifiedDlg.Tpo" "$(DEPDIR)/amulegui-PrefsUnifiedDlg.Po"; else rm -f "$(DEPDIR)/amulegui-PrefsUnifiedDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-PrefsUnifiedDlg.o -MD -MP -MF $(DEPDIR)/amulegui-PrefsUnifiedDlg.Tpo -c -o amulegui-PrefsUnifiedDlg.o `test -f 'PrefsUnifiedDlg.cpp' || echo '$(srcdir)/'`PrefsUnifiedDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-PrefsUnifiedDlg.Tpo $(DEPDIR)/amulegui-PrefsUnifiedDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PrefsUnifiedDlg.cpp' object='amulegui-PrefsUnifiedDlg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-PrefsUnifiedDlg.o `test -f 'PrefsUnifiedDlg.cpp' || echo '$(srcdir)/'`PrefsUnifiedDlg.cpp
 
 amulegui-PrefsUnifiedDlg.obj: PrefsUnifiedDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-PrefsUnifiedDlg.obj -MD -MP -MF "$(DEPDIR)/amulegui-PrefsUnifiedDlg.Tpo" -c -o amulegui-PrefsUnifiedDlg.obj `if test -f 'PrefsUnifiedDlg.cpp'; then $(CYGPATH_W) 'PrefsUnifiedDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/PrefsUnifiedDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-PrefsUnifiedDlg.Tpo" "$(DEPDIR)/amulegui-PrefsUnifiedDlg.Po"; else rm -f "$(DEPDIR)/amulegui-PrefsUnifiedDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-PrefsUnifiedDlg.obj -MD -MP -MF $(DEPDIR)/amulegui-PrefsUnifiedDlg.Tpo -c -o amulegui-PrefsUnifiedDlg.obj `if test -f 'PrefsUnifiedDlg.cpp'; then $(CYGPATH_W) 'PrefsUnifiedDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/PrefsUnifiedDlg.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-PrefsUnifiedDlg.Tpo $(DEPDIR)/amulegui-PrefsUnifiedDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PrefsUnifiedDlg.cpp' object='amulegui-PrefsUnifiedDlg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-PrefsUnifiedDlg.obj `if test -f 'PrefsUnifiedDlg.cpp'; then $(CYGPATH_W) 'PrefsUnifiedDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/PrefsUnifiedDlg.cpp'; fi`
 
 amulegui-SearchDlg.o: SearchDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SearchDlg.o -MD -MP -MF "$(DEPDIR)/amulegui-SearchDlg.Tpo" -c -o amulegui-SearchDlg.o `test -f 'SearchDlg.cpp' || echo '$(srcdir)/'`SearchDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-SearchDlg.Tpo" "$(DEPDIR)/amulegui-SearchDlg.Po"; else rm -f "$(DEPDIR)/amulegui-SearchDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SearchDlg.o -MD -MP -MF $(DEPDIR)/amulegui-SearchDlg.Tpo -c -o amulegui-SearchDlg.o `test -f 'SearchDlg.cpp' || echo '$(srcdir)/'`SearchDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-SearchDlg.Tpo $(DEPDIR)/amulegui-SearchDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchDlg.cpp' object='amulegui-SearchDlg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SearchDlg.o `test -f 'SearchDlg.cpp' || echo '$(srcdir)/'`SearchDlg.cpp
 
 amulegui-SearchDlg.obj: SearchDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SearchDlg.obj -MD -MP -MF "$(DEPDIR)/amulegui-SearchDlg.Tpo" -c -o amulegui-SearchDlg.obj `if test -f 'SearchDlg.cpp'; then $(CYGPATH_W) 'SearchDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-SearchDlg.Tpo" "$(DEPDIR)/amulegui-SearchDlg.Po"; else rm -f "$(DEPDIR)/amulegui-SearchDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SearchDlg.obj -MD -MP -MF $(DEPDIR)/amulegui-SearchDlg.Tpo -c -o amulegui-SearchDlg.obj `if test -f 'SearchDlg.cpp'; then $(CYGPATH_W) 'SearchDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchDlg.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-SearchDlg.Tpo $(DEPDIR)/amulegui-SearchDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchDlg.cpp' object='amulegui-SearchDlg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SearchDlg.obj `if test -f 'SearchDlg.cpp'; then $(CYGPATH_W) 'SearchDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchDlg.cpp'; fi`
 
 amulegui-ServerWnd.o: ServerWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ServerWnd.o -MD -MP -MF "$(DEPDIR)/amulegui-ServerWnd.Tpo" -c -o amulegui-ServerWnd.o `test -f 'ServerWnd.cpp' || echo '$(srcdir)/'`ServerWnd.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ServerWnd.Tpo" "$(DEPDIR)/amulegui-ServerWnd.Po"; else rm -f "$(DEPDIR)/amulegui-ServerWnd.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ServerWnd.o -MD -MP -MF $(DEPDIR)/amulegui-ServerWnd.Tpo -c -o amulegui-ServerWnd.o `test -f 'ServerWnd.cpp' || echo '$(srcdir)/'`ServerWnd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ServerWnd.Tpo $(DEPDIR)/amulegui-ServerWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerWnd.cpp' object='amulegui-ServerWnd.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ServerWnd.o `test -f 'ServerWnd.cpp' || echo '$(srcdir)/'`ServerWnd.cpp
 
 amulegui-ServerWnd.obj: ServerWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ServerWnd.obj -MD -MP -MF "$(DEPDIR)/amulegui-ServerWnd.Tpo" -c -o amulegui-ServerWnd.obj `if test -f 'ServerWnd.cpp'; then $(CYGPATH_W) 'ServerWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerWnd.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ServerWnd.Tpo" "$(DEPDIR)/amulegui-ServerWnd.Po"; else rm -f "$(DEPDIR)/amulegui-ServerWnd.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ServerWnd.obj -MD -MP -MF $(DEPDIR)/amulegui-ServerWnd.Tpo -c -o amulegui-ServerWnd.obj `if test -f 'ServerWnd.cpp'; then $(CYGPATH_W) 'ServerWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerWnd.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ServerWnd.Tpo $(DEPDIR)/amulegui-ServerWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerWnd.cpp' object='amulegui-ServerWnd.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ServerWnd.obj `if test -f 'ServerWnd.cpp'; then $(CYGPATH_W) 'ServerWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerWnd.cpp'; fi`
 
 amulegui-SharedFilesWnd.o: SharedFilesWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SharedFilesWnd.o -MD -MP -MF "$(DEPDIR)/amulegui-SharedFilesWnd.Tpo" -c -o amulegui-SharedFilesWnd.o `test -f 'SharedFilesWnd.cpp' || echo '$(srcdir)/'`SharedFilesWnd.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-SharedFilesWnd.Tpo" "$(DEPDIR)/amulegui-SharedFilesWnd.Po"; else rm -f "$(DEPDIR)/amulegui-SharedFilesWnd.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SharedFilesWnd.o -MD -MP -MF $(DEPDIR)/amulegui-SharedFilesWnd.Tpo -c -o amulegui-SharedFilesWnd.o `test -f 'SharedFilesWnd.cpp' || echo '$(srcdir)/'`SharedFilesWnd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-SharedFilesWnd.Tpo $(DEPDIR)/amulegui-SharedFilesWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFilesWnd.cpp' object='amulegui-SharedFilesWnd.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SharedFilesWnd.o `test -f 'SharedFilesWnd.cpp' || echo '$(srcdir)/'`SharedFilesWnd.cpp
 
 amulegui-SharedFilesWnd.obj: SharedFilesWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SharedFilesWnd.obj -MD -MP -MF "$(DEPDIR)/amulegui-SharedFilesWnd.Tpo" -c -o amulegui-SharedFilesWnd.obj `if test -f 'SharedFilesWnd.cpp'; then $(CYGPATH_W) 'SharedFilesWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilesWnd.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-SharedFilesWnd.Tpo" "$(DEPDIR)/amulegui-SharedFilesWnd.Po"; else rm -f "$(DEPDIR)/amulegui-SharedFilesWnd.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SharedFilesWnd.obj -MD -MP -MF $(DEPDIR)/amulegui-SharedFilesWnd.Tpo -c -o amulegui-SharedFilesWnd.obj `if test -f 'SharedFilesWnd.cpp'; then $(CYGPATH_W) 'SharedFilesWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilesWnd.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-SharedFilesWnd.Tpo $(DEPDIR)/amulegui-SharedFilesWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFilesWnd.cpp' object='amulegui-SharedFilesWnd.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SharedFilesWnd.obj `if test -f 'SharedFilesWnd.cpp'; then $(CYGPATH_W) 'SharedFilesWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilesWnd.cpp'; fi`
 
 amulegui-StatisticsDlg.o: StatisticsDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-StatisticsDlg.o -MD -MP -MF "$(DEPDIR)/amulegui-StatisticsDlg.Tpo" -c -o amulegui-StatisticsDlg.o `test -f 'StatisticsDlg.cpp' || echo '$(srcdir)/'`StatisticsDlg.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-StatisticsDlg.Tpo" "$(DEPDIR)/amulegui-StatisticsDlg.Po"; else rm -f "$(DEPDIR)/amulegui-StatisticsDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-StatisticsDlg.o -MD -MP -MF $(DEPDIR)/amulegui-StatisticsDlg.Tpo -c -o amulegui-StatisticsDlg.o `test -f 'StatisticsDlg.cpp' || echo '$(srcdir)/'`StatisticsDlg.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-StatisticsDlg.Tpo $(DEPDIR)/amulegui-StatisticsDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StatisticsDlg.cpp' object='amulegui-StatisticsDlg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-StatisticsDlg.o `test -f 'StatisticsDlg.cpp' || echo '$(srcdir)/'`StatisticsDlg.cpp
 
 amulegui-StatisticsDlg.obj: StatisticsDlg.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-StatisticsDlg.obj -MD -MP -MF "$(DEPDIR)/amulegui-StatisticsDlg.Tpo" -c -o amulegui-StatisticsDlg.obj `if test -f 'StatisticsDlg.cpp'; then $(CYGPATH_W) 'StatisticsDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/StatisticsDlg.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-StatisticsDlg.Tpo" "$(DEPDIR)/amulegui-StatisticsDlg.Po"; else rm -f "$(DEPDIR)/amulegui-StatisticsDlg.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-StatisticsDlg.obj -MD -MP -MF $(DEPDIR)/amulegui-StatisticsDlg.Tpo -c -o amulegui-StatisticsDlg.obj `if test -f 'StatisticsDlg.cpp'; then $(CYGPATH_W) 'StatisticsDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/StatisticsDlg.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-StatisticsDlg.Tpo $(DEPDIR)/amulegui-StatisticsDlg.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StatisticsDlg.cpp' object='amulegui-StatisticsDlg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-StatisticsDlg.obj `if test -f 'StatisticsDlg.cpp'; then $(CYGPATH_W) 'StatisticsDlg.cpp'; else $(CYGPATH_W) '$(srcdir)/StatisticsDlg.cpp'; fi`
 
 amulegui-SearchListCtrl.o: SearchListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SearchListCtrl.o -MD -MP -MF "$(DEPDIR)/amulegui-SearchListCtrl.Tpo" -c -o amulegui-SearchListCtrl.o `test -f 'SearchListCtrl.cpp' || echo '$(srcdir)/'`SearchListCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-SearchListCtrl.Tpo" "$(DEPDIR)/amulegui-SearchListCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-SearchListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SearchListCtrl.o -MD -MP -MF $(DEPDIR)/amulegui-SearchListCtrl.Tpo -c -o amulegui-SearchListCtrl.o `test -f 'SearchListCtrl.cpp' || echo '$(srcdir)/'`SearchListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-SearchListCtrl.Tpo $(DEPDIR)/amulegui-SearchListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchListCtrl.cpp' object='amulegui-SearchListCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SearchListCtrl.o `test -f 'SearchListCtrl.cpp' || echo '$(srcdir)/'`SearchListCtrl.cpp
 
 amulegui-SearchListCtrl.obj: SearchListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SearchListCtrl.obj -MD -MP -MF "$(DEPDIR)/amulegui-SearchListCtrl.Tpo" -c -o amulegui-SearchListCtrl.obj `if test -f 'SearchListCtrl.cpp'; then $(CYGPATH_W) 'SearchListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchListCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-SearchListCtrl.Tpo" "$(DEPDIR)/amulegui-SearchListCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-SearchListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SearchListCtrl.obj -MD -MP -MF $(DEPDIR)/amulegui-SearchListCtrl.Tpo -c -o amulegui-SearchListCtrl.obj `if test -f 'SearchListCtrl.cpp'; then $(CYGPATH_W) 'SearchListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-SearchListCtrl.Tpo $(DEPDIR)/amulegui-SearchListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SearchListCtrl.cpp' object='amulegui-SearchListCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SearchListCtrl.obj `if test -f 'SearchListCtrl.cpp'; then $(CYGPATH_W) 'SearchListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SearchListCtrl.cpp'; fi`
 
 amulegui-DownloadListCtrl.o: DownloadListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-DownloadListCtrl.o -MD -MP -MF "$(DEPDIR)/amulegui-DownloadListCtrl.Tpo" -c -o amulegui-DownloadListCtrl.o `test -f 'DownloadListCtrl.cpp' || echo '$(srcdir)/'`DownloadListCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-DownloadListCtrl.Tpo" "$(DEPDIR)/amulegui-DownloadListCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-DownloadListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-DownloadListCtrl.o -MD -MP -MF $(DEPDIR)/amulegui-DownloadListCtrl.Tpo -c -o amulegui-DownloadListCtrl.o `test -f 'DownloadListCtrl.cpp' || echo '$(srcdir)/'`DownloadListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-DownloadListCtrl.Tpo $(DEPDIR)/amulegui-DownloadListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DownloadListCtrl.cpp' object='amulegui-DownloadListCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-DownloadListCtrl.o `test -f 'DownloadListCtrl.cpp' || echo '$(srcdir)/'`DownloadListCtrl.cpp
 
 amulegui-DownloadListCtrl.obj: DownloadListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-DownloadListCtrl.obj -MD -MP -MF "$(DEPDIR)/amulegui-DownloadListCtrl.Tpo" -c -o amulegui-DownloadListCtrl.obj `if test -f 'DownloadListCtrl.cpp'; then $(CYGPATH_W) 'DownloadListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadListCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-DownloadListCtrl.Tpo" "$(DEPDIR)/amulegui-DownloadListCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-DownloadListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-DownloadListCtrl.obj -MD -MP -MF $(DEPDIR)/amulegui-DownloadListCtrl.Tpo -c -o amulegui-DownloadListCtrl.obj `if test -f 'DownloadListCtrl.cpp'; then $(CYGPATH_W) 'DownloadListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-DownloadListCtrl.Tpo $(DEPDIR)/amulegui-DownloadListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DownloadListCtrl.cpp' object='amulegui-DownloadListCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-DownloadListCtrl.obj `if test -f 'DownloadListCtrl.cpp'; then $(CYGPATH_W) 'DownloadListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/DownloadListCtrl.cpp'; fi`
 
-amulegui-ClientListCtrl.o: ClientListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ClientListCtrl.o -MD -MP -MF "$(DEPDIR)/amulegui-ClientListCtrl.Tpo" -c -o amulegui-ClientListCtrl.o `test -f 'ClientListCtrl.cpp' || echo '$(srcdir)/'`ClientListCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ClientListCtrl.Tpo" "$(DEPDIR)/amulegui-ClientListCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-ClientListCtrl.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientListCtrl.cpp' object='amulegui-ClientListCtrl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ClientListCtrl.o `test -f 'ClientListCtrl.cpp' || echo '$(srcdir)/'`ClientListCtrl.cpp
-
-amulegui-ClientListCtrl.obj: ClientListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ClientListCtrl.obj -MD -MP -MF "$(DEPDIR)/amulegui-ClientListCtrl.Tpo" -c -o amulegui-ClientListCtrl.obj `if test -f 'ClientListCtrl.cpp'; then $(CYGPATH_W) 'ClientListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientListCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ClientListCtrl.Tpo" "$(DEPDIR)/amulegui-ClientListCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-ClientListCtrl.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientListCtrl.cpp' object='amulegui-ClientListCtrl.obj' libtool=no @AMDEPBACKSLASH@
+amulegui-SourceListCtrl.o: SourceListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SourceListCtrl.o -MD -MP -MF $(DEPDIR)/amulegui-SourceListCtrl.Tpo -c -o amulegui-SourceListCtrl.o `test -f 'SourceListCtrl.cpp' || echo '$(srcdir)/'`SourceListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-SourceListCtrl.Tpo $(DEPDIR)/amulegui-SourceListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SourceListCtrl.cpp' object='amulegui-SourceListCtrl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SourceListCtrl.o `test -f 'SourceListCtrl.cpp' || echo '$(srcdir)/'`SourceListCtrl.cpp
+
+amulegui-SourceListCtrl.obj: SourceListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SourceListCtrl.obj -MD -MP -MF $(DEPDIR)/amulegui-SourceListCtrl.Tpo -c -o amulegui-SourceListCtrl.obj `if test -f 'SourceListCtrl.cpp'; then $(CYGPATH_W) 'SourceListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SourceListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-SourceListCtrl.Tpo $(DEPDIR)/amulegui-SourceListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SourceListCtrl.cpp' object='amulegui-SourceListCtrl.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SourceListCtrl.obj `if test -f 'SourceListCtrl.cpp'; then $(CYGPATH_W) 'SourceListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SourceListCtrl.cpp'; fi`
+
+amulegui-SharedFilePeersListCtrl.o: SharedFilePeersListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SharedFilePeersListCtrl.o -MD -MP -MF $(DEPDIR)/amulegui-SharedFilePeersListCtrl.Tpo -c -o amulegui-SharedFilePeersListCtrl.o `test -f 'SharedFilePeersListCtrl.cpp' || echo '$(srcdir)/'`SharedFilePeersListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-SharedFilePeersListCtrl.Tpo $(DEPDIR)/amulegui-SharedFilePeersListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFilePeersListCtrl.cpp' object='amulegui-SharedFilePeersListCtrl.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SharedFilePeersListCtrl.o `test -f 'SharedFilePeersListCtrl.cpp' || echo '$(srcdir)/'`SharedFilePeersListCtrl.cpp
+
+amulegui-SharedFilePeersListCtrl.obj: SharedFilePeersListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SharedFilePeersListCtrl.obj -MD -MP -MF $(DEPDIR)/amulegui-SharedFilePeersListCtrl.Tpo -c -o amulegui-SharedFilePeersListCtrl.obj `if test -f 'SharedFilePeersListCtrl.cpp'; then $(CYGPATH_W) 'SharedFilePeersListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilePeersListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-SharedFilePeersListCtrl.Tpo $(DEPDIR)/amulegui-SharedFilePeersListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFilePeersListCtrl.cpp' object='amulegui-SharedFilePeersListCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ClientListCtrl.obj `if test -f 'ClientListCtrl.cpp'; then $(CYGPATH_W) 'ClientListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientListCtrl.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SharedFilePeersListCtrl.obj `if test -f 'SharedFilePeersListCtrl.cpp'; then $(CYGPATH_W) 'SharedFilePeersListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilePeersListCtrl.cpp'; fi`
 
 amulegui-FriendListCtrl.o: FriendListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-FriendListCtrl.o -MD -MP -MF "$(DEPDIR)/amulegui-FriendListCtrl.Tpo" -c -o amulegui-FriendListCtrl.o `test -f 'FriendListCtrl.cpp' || echo '$(srcdir)/'`FriendListCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-FriendListCtrl.Tpo" "$(DEPDIR)/amulegui-FriendListCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-FriendListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-FriendListCtrl.o -MD -MP -MF $(DEPDIR)/amulegui-FriendListCtrl.Tpo -c -o amulegui-FriendListCtrl.o `test -f 'FriendListCtrl.cpp' || echo '$(srcdir)/'`FriendListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-FriendListCtrl.Tpo $(DEPDIR)/amulegui-FriendListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FriendListCtrl.cpp' object='amulegui-FriendListCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-FriendListCtrl.o `test -f 'FriendListCtrl.cpp' || echo '$(srcdir)/'`FriendListCtrl.cpp
 
 amulegui-FriendListCtrl.obj: FriendListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-FriendListCtrl.obj -MD -MP -MF "$(DEPDIR)/amulegui-FriendListCtrl.Tpo" -c -o amulegui-FriendListCtrl.obj `if test -f 'FriendListCtrl.cpp'; then $(CYGPATH_W) 'FriendListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/FriendListCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-FriendListCtrl.Tpo" "$(DEPDIR)/amulegui-FriendListCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-FriendListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-FriendListCtrl.obj -MD -MP -MF $(DEPDIR)/amulegui-FriendListCtrl.Tpo -c -o amulegui-FriendListCtrl.obj `if test -f 'FriendListCtrl.cpp'; then $(CYGPATH_W) 'FriendListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/FriendListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-FriendListCtrl.Tpo $(DEPDIR)/amulegui-FriendListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FriendListCtrl.cpp' object='amulegui-FriendListCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-FriendListCtrl.obj `if test -f 'FriendListCtrl.cpp'; then $(CYGPATH_W) 'FriendListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/FriendListCtrl.cpp'; fi`
 
 amulegui-ServerListCtrl.o: ServerListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ServerListCtrl.o -MD -MP -MF "$(DEPDIR)/amulegui-ServerListCtrl.Tpo" -c -o amulegui-ServerListCtrl.o `test -f 'ServerListCtrl.cpp' || echo '$(srcdir)/'`ServerListCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ServerListCtrl.Tpo" "$(DEPDIR)/amulegui-ServerListCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-ServerListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ServerListCtrl.o -MD -MP -MF $(DEPDIR)/amulegui-ServerListCtrl.Tpo -c -o amulegui-ServerListCtrl.o `test -f 'ServerListCtrl.cpp' || echo '$(srcdir)/'`ServerListCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ServerListCtrl.Tpo $(DEPDIR)/amulegui-ServerListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerListCtrl.cpp' object='amulegui-ServerListCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ServerListCtrl.o `test -f 'ServerListCtrl.cpp' || echo '$(srcdir)/'`ServerListCtrl.cpp
 
 amulegui-ServerListCtrl.obj: ServerListCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ServerListCtrl.obj -MD -MP -MF "$(DEPDIR)/amulegui-ServerListCtrl.Tpo" -c -o amulegui-ServerListCtrl.obj `if test -f 'ServerListCtrl.cpp'; then $(CYGPATH_W) 'ServerListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerListCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ServerListCtrl.Tpo" "$(DEPDIR)/amulegui-ServerListCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-ServerListCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ServerListCtrl.obj -MD -MP -MF $(DEPDIR)/amulegui-ServerListCtrl.Tpo -c -o amulegui-ServerListCtrl.obj `if test -f 'ServerListCtrl.cpp'; then $(CYGPATH_W) 'ServerListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerListCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ServerListCtrl.Tpo $(DEPDIR)/amulegui-ServerListCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ServerListCtrl.cpp' object='amulegui-ServerListCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ServerListCtrl.obj `if test -f 'ServerListCtrl.cpp'; then $(CYGPATH_W) 'ServerListCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/ServerListCtrl.cpp'; fi`
 
 amulegui-SharedFilesCtrl.o: SharedFilesCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SharedFilesCtrl.o -MD -MP -MF "$(DEPDIR)/amulegui-SharedFilesCtrl.Tpo" -c -o amulegui-SharedFilesCtrl.o `test -f 'SharedFilesCtrl.cpp' || echo '$(srcdir)/'`SharedFilesCtrl.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-SharedFilesCtrl.Tpo" "$(DEPDIR)/amulegui-SharedFilesCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-SharedFilesCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SharedFilesCtrl.o -MD -MP -MF $(DEPDIR)/amulegui-SharedFilesCtrl.Tpo -c -o amulegui-SharedFilesCtrl.o `test -f 'SharedFilesCtrl.cpp' || echo '$(srcdir)/'`SharedFilesCtrl.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-SharedFilesCtrl.Tpo $(DEPDIR)/amulegui-SharedFilesCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFilesCtrl.cpp' object='amulegui-SharedFilesCtrl.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SharedFilesCtrl.o `test -f 'SharedFilesCtrl.cpp' || echo '$(srcdir)/'`SharedFilesCtrl.cpp
 
 amulegui-SharedFilesCtrl.obj: SharedFilesCtrl.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SharedFilesCtrl.obj -MD -MP -MF "$(DEPDIR)/amulegui-SharedFilesCtrl.Tpo" -c -o amulegui-SharedFilesCtrl.obj `if test -f 'SharedFilesCtrl.cpp'; then $(CYGPATH_W) 'SharedFilesCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilesCtrl.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-SharedFilesCtrl.Tpo" "$(DEPDIR)/amulegui-SharedFilesCtrl.Po"; else rm -f "$(DEPDIR)/amulegui-SharedFilesCtrl.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SharedFilesCtrl.obj -MD -MP -MF $(DEPDIR)/amulegui-SharedFilesCtrl.Tpo -c -o amulegui-SharedFilesCtrl.obj `if test -f 'SharedFilesCtrl.cpp'; then $(CYGPATH_W) 'SharedFilesCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilesCtrl.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-SharedFilesCtrl.Tpo $(DEPDIR)/amulegui-SharedFilesCtrl.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SharedFilesCtrl.cpp' object='amulegui-SharedFilesCtrl.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SharedFilesCtrl.obj `if test -f 'SharedFilesCtrl.cpp'; then $(CYGPATH_W) 'SharedFilesCtrl.cpp'; else $(CYGPATH_W) '$(srcdir)/SharedFilesCtrl.cpp'; fi`
 
 amulegui-MuleTrayIcon.o: MuleTrayIcon.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-MuleTrayIcon.o -MD -MP -MF "$(DEPDIR)/amulegui-MuleTrayIcon.Tpo" -c -o amulegui-MuleTrayIcon.o `test -f 'MuleTrayIcon.cpp' || echo '$(srcdir)/'`MuleTrayIcon.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-MuleTrayIcon.Tpo" "$(DEPDIR)/amulegui-MuleTrayIcon.Po"; else rm -f "$(DEPDIR)/amulegui-MuleTrayIcon.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-MuleTrayIcon.o -MD -MP -MF $(DEPDIR)/amulegui-MuleTrayIcon.Tpo -c -o amulegui-MuleTrayIcon.o `test -f 'MuleTrayIcon.cpp' || echo '$(srcdir)/'`MuleTrayIcon.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-MuleTrayIcon.Tpo $(DEPDIR)/amulegui-MuleTrayIcon.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleTrayIcon.cpp' object='amulegui-MuleTrayIcon.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-MuleTrayIcon.o `test -f 'MuleTrayIcon.cpp' || echo '$(srcdir)/'`MuleTrayIcon.cpp
 
 amulegui-MuleTrayIcon.obj: MuleTrayIcon.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-MuleTrayIcon.obj -MD -MP -MF "$(DEPDIR)/amulegui-MuleTrayIcon.Tpo" -c -o amulegui-MuleTrayIcon.obj `if test -f 'MuleTrayIcon.cpp'; then $(CYGPATH_W) 'MuleTrayIcon.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleTrayIcon.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-MuleTrayIcon.Tpo" "$(DEPDIR)/amulegui-MuleTrayIcon.Po"; else rm -f "$(DEPDIR)/amulegui-MuleTrayIcon.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-MuleTrayIcon.obj -MD -MP -MF $(DEPDIR)/amulegui-MuleTrayIcon.Tpo -c -o amulegui-MuleTrayIcon.obj `if test -f 'MuleTrayIcon.cpp'; then $(CYGPATH_W) 'MuleTrayIcon.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleTrayIcon.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-MuleTrayIcon.Tpo $(DEPDIR)/amulegui-MuleTrayIcon.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleTrayIcon.cpp' object='amulegui-MuleTrayIcon.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-MuleTrayIcon.obj `if test -f 'MuleTrayIcon.cpp'; then $(CYGPATH_W) 'MuleTrayIcon.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleTrayIcon.cpp'; fi`
 
 amulegui-TransferWnd.o: TransferWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-TransferWnd.o -MD -MP -MF "$(DEPDIR)/amulegui-TransferWnd.Tpo" -c -o amulegui-TransferWnd.o `test -f 'TransferWnd.cpp' || echo '$(srcdir)/'`TransferWnd.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-TransferWnd.Tpo" "$(DEPDIR)/amulegui-TransferWnd.Po"; else rm -f "$(DEPDIR)/amulegui-TransferWnd.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-TransferWnd.o -MD -MP -MF $(DEPDIR)/amulegui-TransferWnd.Tpo -c -o amulegui-TransferWnd.o `test -f 'TransferWnd.cpp' || echo '$(srcdir)/'`TransferWnd.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-TransferWnd.Tpo $(DEPDIR)/amulegui-TransferWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TransferWnd.cpp' object='amulegui-TransferWnd.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-TransferWnd.o `test -f 'TransferWnd.cpp' || echo '$(srcdir)/'`TransferWnd.cpp
 
 amulegui-TransferWnd.obj: TransferWnd.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-TransferWnd.obj -MD -MP -MF "$(DEPDIR)/amulegui-TransferWnd.Tpo" -c -o amulegui-TransferWnd.obj `if test -f 'TransferWnd.cpp'; then $(CYGPATH_W) 'TransferWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/TransferWnd.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-TransferWnd.Tpo" "$(DEPDIR)/amulegui-TransferWnd.Po"; else rm -f "$(DEPDIR)/amulegui-TransferWnd.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-TransferWnd.obj -MD -MP -MF $(DEPDIR)/amulegui-TransferWnd.Tpo -c -o amulegui-TransferWnd.obj `if test -f 'TransferWnd.cpp'; then $(CYGPATH_W) 'TransferWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/TransferWnd.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-TransferWnd.Tpo $(DEPDIR)/amulegui-TransferWnd.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TransferWnd.cpp' object='amulegui-TransferWnd.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-TransferWnd.obj `if test -f 'TransferWnd.cpp'; then $(CYGPATH_W) 'TransferWnd.cpp'; else $(CYGPATH_W) '$(srcdir)/TransferWnd.cpp'; fi`
 
-amulegui-IP2Country.o: IP2Country.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-IP2Country.o -MD -MP -MF "$(DEPDIR)/amulegui-IP2Country.Tpo" -c -o amulegui-IP2Country.o `test -f 'IP2Country.cpp' || echo '$(srcdir)/'`IP2Country.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-IP2Country.Tpo" "$(DEPDIR)/amulegui-IP2Country.Po"; else rm -f "$(DEPDIR)/amulegui-IP2Country.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IP2Country.cpp' object='amulegui-IP2Country.o' libtool=no @AMDEPBACKSLASH@
+amulegui-amuleAppCommon.o: amuleAppCommon.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amuleAppCommon.o -MD -MP -MF $(DEPDIR)/amulegui-amuleAppCommon.Tpo -c -o amulegui-amuleAppCommon.o `test -f 'amuleAppCommon.cpp' || echo '$(srcdir)/'`amuleAppCommon.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-amuleAppCommon.Tpo $(DEPDIR)/amulegui-amuleAppCommon.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amuleAppCommon.cpp' object='amulegui-amuleAppCommon.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-amuleAppCommon.o `test -f 'amuleAppCommon.cpp' || echo '$(srcdir)/'`amuleAppCommon.cpp
+
+amulegui-amuleAppCommon.obj: amuleAppCommon.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-amuleAppCommon.obj -MD -MP -MF $(DEPDIR)/amulegui-amuleAppCommon.Tpo -c -o amulegui-amuleAppCommon.obj `if test -f 'amuleAppCommon.cpp'; then $(CYGPATH_W) 'amuleAppCommon.cpp'; else $(CYGPATH_W) '$(srcdir)/amuleAppCommon.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-amuleAppCommon.Tpo $(DEPDIR)/amulegui-amuleAppCommon.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='amuleAppCommon.cpp' object='amulegui-amuleAppCommon.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-amuleAppCommon.obj `if test -f 'amuleAppCommon.cpp'; then $(CYGPATH_W) 'amuleAppCommon.cpp'; else $(CYGPATH_W) '$(srcdir)/amuleAppCommon.cpp'; fi`
+
+amulegui-ClientRef.o: ClientRef.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ClientRef.o -MD -MP -MF $(DEPDIR)/amulegui-ClientRef.Tpo -c -o amulegui-ClientRef.o `test -f 'ClientRef.cpp' || echo '$(srcdir)/'`ClientRef.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ClientRef.Tpo $(DEPDIR)/amulegui-ClientRef.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientRef.cpp' object='amulegui-ClientRef.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ClientRef.o `test -f 'ClientRef.cpp' || echo '$(srcdir)/'`ClientRef.cpp
+
+amulegui-ClientRef.obj: ClientRef.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ClientRef.obj -MD -MP -MF $(DEPDIR)/amulegui-ClientRef.Tpo -c -o amulegui-ClientRef.obj `if test -f 'ClientRef.cpp'; then $(CYGPATH_W) 'ClientRef.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientRef.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ClientRef.Tpo $(DEPDIR)/amulegui-ClientRef.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientRef.cpp' object='amulegui-ClientRef.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ClientRef.obj `if test -f 'ClientRef.cpp'; then $(CYGPATH_W) 'ClientRef.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientRef.cpp'; fi`
+
+amulegui-DataToText.o: DataToText.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-DataToText.o -MD -MP -MF $(DEPDIR)/amulegui-DataToText.Tpo -c -o amulegui-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-DataToText.Tpo $(DEPDIR)/amulegui-DataToText.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DataToText.cpp' object='amulegui-DataToText.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-DataToText.o `test -f 'DataToText.cpp' || echo '$(srcdir)/'`DataToText.cpp
+
+amulegui-DataToText.obj: DataToText.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-DataToText.obj -MD -MP -MF $(DEPDIR)/amulegui-DataToText.Tpo -c -o amulegui-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-DataToText.Tpo $(DEPDIR)/amulegui-DataToText.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='DataToText.cpp' object='amulegui-DataToText.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-IP2Country.o `test -f 'IP2Country.cpp' || echo '$(srcdir)/'`IP2Country.cpp
-
-amulegui-IP2Country.obj: IP2Country.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-IP2Country.obj -MD -MP -MF "$(DEPDIR)/amulegui-IP2Country.Tpo" -c -o amulegui-IP2Country.obj `if test -f 'IP2Country.cpp'; then $(CYGPATH_W) 'IP2Country.cpp'; else $(CYGPATH_W) '$(srcdir)/IP2Country.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-IP2Country.Tpo" "$(DEPDIR)/amulegui-IP2Country.Po"; else rm -f "$(DEPDIR)/amulegui-IP2Country.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='IP2Country.cpp' object='amulegui-IP2Country.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-IP2Country.obj `if test -f 'IP2Country.cpp'; then $(CYGPATH_W) 'IP2Country.cpp'; else $(CYGPATH_W) '$(srcdir)/IP2Country.cpp'; fi`
-
-amulegui-ClientCredits.o: ClientCredits.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ClientCredits.o -MD -MP -MF "$(DEPDIR)/amulegui-ClientCredits.Tpo" -c -o amulegui-ClientCredits.o `test -f 'ClientCredits.cpp' || echo '$(srcdir)/'`ClientCredits.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ClientCredits.Tpo" "$(DEPDIR)/amulegui-ClientCredits.Po"; else rm -f "$(DEPDIR)/amulegui-ClientCredits.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientCredits.cpp' object='amulegui-ClientCredits.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ClientCredits.o `test -f 'ClientCredits.cpp' || echo '$(srcdir)/'`ClientCredits.cpp
-
-amulegui-ClientCredits.obj: ClientCredits.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ClientCredits.obj -MD -MP -MF "$(DEPDIR)/amulegui-ClientCredits.Tpo" -c -o amulegui-ClientCredits.obj `if test -f 'ClientCredits.cpp'; then $(CYGPATH_W) 'ClientCredits.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCredits.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ClientCredits.Tpo" "$(DEPDIR)/amulegui-ClientCredits.Po"; else rm -f "$(DEPDIR)/amulegui-ClientCredits.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ClientCredits.cpp' object='amulegui-ClientCredits.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ClientCredits.obj `if test -f 'ClientCredits.cpp'; then $(CYGPATH_W) 'ClientCredits.cpp'; else $(CYGPATH_W) '$(srcdir)/ClientCredits.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-DataToText.obj `if test -f 'DataToText.cpp'; then $(CYGPATH_W) 'DataToText.cpp'; else $(CYGPATH_W) '$(srcdir)/DataToText.cpp'; fi`
 
 amulegui-ECSpecialMuleTags.o: ECSpecialMuleTags.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ECSpecialMuleTags.o -MD -MP -MF "$(DEPDIR)/amulegui-ECSpecialMuleTags.Tpo" -c -o amulegui-ECSpecialMuleTags.o `test -f 'ECSpecialMuleTags.cpp' || echo '$(srcdir)/'`ECSpecialMuleTags.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ECSpecialMuleTags.Tpo" "$(DEPDIR)/amulegui-ECSpecialMuleTags.Po"; else rm -f "$(DEPDIR)/amulegui-ECSpecialMuleTags.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ECSpecialMuleTags.o -MD -MP -MF $(DEPDIR)/amulegui-ECSpecialMuleTags.Tpo -c -o amulegui-ECSpecialMuleTags.o `test -f 'ECSpecialMuleTags.cpp' || echo '$(srcdir)/'`ECSpecialMuleTags.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ECSpecialMuleTags.Tpo $(DEPDIR)/amulegui-ECSpecialMuleTags.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ECSpecialMuleTags.cpp' object='amulegui-ECSpecialMuleTags.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ECSpecialMuleTags.o `test -f 'ECSpecialMuleTags.cpp' || echo '$(srcdir)/'`ECSpecialMuleTags.cpp
 
 amulegui-ECSpecialMuleTags.obj: ECSpecialMuleTags.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ECSpecialMuleTags.obj -MD -MP -MF "$(DEPDIR)/amulegui-ECSpecialMuleTags.Tpo" -c -o amulegui-ECSpecialMuleTags.obj `if test -f 'ECSpecialMuleTags.cpp'; then $(CYGPATH_W) 'ECSpecialMuleTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialMuleTags.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-ECSpecialMuleTags.Tpo" "$(DEPDIR)/amulegui-ECSpecialMuleTags.Po"; else rm -f "$(DEPDIR)/amulegui-ECSpecialMuleTags.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-ECSpecialMuleTags.obj -MD -MP -MF $(DEPDIR)/amulegui-ECSpecialMuleTags.Tpo -c -o amulegui-ECSpecialMuleTags.obj `if test -f 'ECSpecialMuleTags.cpp'; then $(CYGPATH_W) 'ECSpecialMuleTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialMuleTags.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-ECSpecialMuleTags.Tpo $(DEPDIR)/amulegui-ECSpecialMuleTags.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ECSpecialMuleTags.cpp' object='amulegui-ECSpecialMuleTags.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-ECSpecialMuleTags.obj `if test -f 'ECSpecialMuleTags.cpp'; then $(CYGPATH_W) 'ECSpecialMuleTags.cpp'; else $(CYGPATH_W) '$(srcdir)/ECSpecialMuleTags.cpp'; fi`
 
 amulegui-KnownFile.o: KnownFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-KnownFile.o -MD -MP -MF "$(DEPDIR)/amulegui-KnownFile.Tpo" -c -o amulegui-KnownFile.o `test -f 'KnownFile.cpp' || echo '$(srcdir)/'`KnownFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-KnownFile.Tpo" "$(DEPDIR)/amulegui-KnownFile.Po"; else rm -f "$(DEPDIR)/amulegui-KnownFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-KnownFile.o -MD -MP -MF $(DEPDIR)/amulegui-KnownFile.Tpo -c -o amulegui-KnownFile.o `test -f 'KnownFile.cpp' || echo '$(srcdir)/'`KnownFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-KnownFile.Tpo $(DEPDIR)/amulegui-KnownFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KnownFile.cpp' object='amulegui-KnownFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-KnownFile.o `test -f 'KnownFile.cpp' || echo '$(srcdir)/'`KnownFile.cpp
 
 amulegui-KnownFile.obj: KnownFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-KnownFile.obj -MD -MP -MF "$(DEPDIR)/amulegui-KnownFile.Tpo" -c -o amulegui-KnownFile.obj `if test -f 'KnownFile.cpp'; then $(CYGPATH_W) 'KnownFile.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-KnownFile.Tpo" "$(DEPDIR)/amulegui-KnownFile.Po"; else rm -f "$(DEPDIR)/amulegui-KnownFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-KnownFile.obj -MD -MP -MF $(DEPDIR)/amulegui-KnownFile.Tpo -c -o amulegui-KnownFile.obj `if test -f 'KnownFile.cpp'; then $(CYGPATH_W) 'KnownFile.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-KnownFile.Tpo $(DEPDIR)/amulegui-KnownFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KnownFile.cpp' object='amulegui-KnownFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-KnownFile.obj `if test -f 'KnownFile.cpp'; then $(CYGPATH_W) 'KnownFile.cpp'; else $(CYGPATH_W) '$(srcdir)/KnownFile.cpp'; fi`
 
 amulegui-GetTickCount.o: GetTickCount.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-GetTickCount.o -MD -MP -MF "$(DEPDIR)/amulegui-GetTickCount.Tpo" -c -o amulegui-GetTickCount.o `test -f 'GetTickCount.cpp' || echo '$(srcdir)/'`GetTickCount.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-GetTickCount.Tpo" "$(DEPDIR)/amulegui-GetTickCount.Po"; else rm -f "$(DEPDIR)/amulegui-GetTickCount.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-GetTickCount.o -MD -MP -MF $(DEPDIR)/amulegui-GetTickCount.Tpo -c -o amulegui-GetTickCount.o `test -f 'GetTickCount.cpp' || echo '$(srcdir)/'`GetTickCount.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-GetTickCount.Tpo $(DEPDIR)/amulegui-GetTickCount.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GetTickCount.cpp' object='amulegui-GetTickCount.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-GetTickCount.o `test -f 'GetTickCount.cpp' || echo '$(srcdir)/'`GetTickCount.cpp
 
 amulegui-GetTickCount.obj: GetTickCount.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-GetTickCount.obj -MD -MP -MF "$(DEPDIR)/amulegui-GetTickCount.Tpo" -c -o amulegui-GetTickCount.obj `if test -f 'GetTickCount.cpp'; then $(CYGPATH_W) 'GetTickCount.cpp'; else $(CYGPATH_W) '$(srcdir)/GetTickCount.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-GetTickCount.Tpo" "$(DEPDIR)/amulegui-GetTickCount.Po"; else rm -f "$(DEPDIR)/amulegui-GetTickCount.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-GetTickCount.obj -MD -MP -MF $(DEPDIR)/amulegui-GetTickCount.Tpo -c -o amulegui-GetTickCount.obj `if test -f 'GetTickCount.cpp'; then $(CYGPATH_W) 'GetTickCount.cpp'; else $(CYGPATH_W) '$(srcdir)/GetTickCount.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-GetTickCount.Tpo $(DEPDIR)/amulegui-GetTickCount.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GetTickCount.cpp' object='amulegui-GetTickCount.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-GetTickCount.obj `if test -f 'GetTickCount.cpp'; then $(CYGPATH_W) 'GetTickCount.cpp'; else $(CYGPATH_W) '$(srcdir)/GetTickCount.cpp'; fi`
 
 amulegui-GuiEvents.o: GuiEvents.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-GuiEvents.o -MD -MP -MF "$(DEPDIR)/amulegui-GuiEvents.Tpo" -c -o amulegui-GuiEvents.o `test -f 'GuiEvents.cpp' || echo '$(srcdir)/'`GuiEvents.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-GuiEvents.Tpo" "$(DEPDIR)/amulegui-GuiEvents.Po"; else rm -f "$(DEPDIR)/amulegui-GuiEvents.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-GuiEvents.o -MD -MP -MF $(DEPDIR)/amulegui-GuiEvents.Tpo -c -o amulegui-GuiEvents.o `test -f 'GuiEvents.cpp' || echo '$(srcdir)/'`GuiEvents.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-GuiEvents.Tpo $(DEPDIR)/amulegui-GuiEvents.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GuiEvents.cpp' object='amulegui-GuiEvents.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-GuiEvents.o `test -f 'GuiEvents.cpp' || echo '$(srcdir)/'`GuiEvents.cpp
 
 amulegui-GuiEvents.obj: GuiEvents.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-GuiEvents.obj -MD -MP -MF "$(DEPDIR)/amulegui-GuiEvents.Tpo" -c -o amulegui-GuiEvents.obj `if test -f 'GuiEvents.cpp'; then $(CYGPATH_W) 'GuiEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/GuiEvents.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-GuiEvents.Tpo" "$(DEPDIR)/amulegui-GuiEvents.Po"; else rm -f "$(DEPDIR)/amulegui-GuiEvents.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-GuiEvents.obj -MD -MP -MF $(DEPDIR)/amulegui-GuiEvents.Tpo -c -o amulegui-GuiEvents.obj `if test -f 'GuiEvents.cpp'; then $(CYGPATH_W) 'GuiEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/GuiEvents.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-GuiEvents.Tpo $(DEPDIR)/amulegui-GuiEvents.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='GuiEvents.cpp' object='amulegui-GuiEvents.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-GuiEvents.obj `if test -f 'GuiEvents.cpp'; then $(CYGPATH_W) 'GuiEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/GuiEvents.cpp'; fi`
 
+amulegui-HTTPDownload.o: HTTPDownload.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-HTTPDownload.o -MD -MP -MF $(DEPDIR)/amulegui-HTTPDownload.Tpo -c -o amulegui-HTTPDownload.o `test -f 'HTTPDownload.cpp' || echo '$(srcdir)/'`HTTPDownload.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-HTTPDownload.Tpo $(DEPDIR)/amulegui-HTTPDownload.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HTTPDownload.cpp' object='amulegui-HTTPDownload.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-HTTPDownload.o `test -f 'HTTPDownload.cpp' || echo '$(srcdir)/'`HTTPDownload.cpp
+
+amulegui-HTTPDownload.obj: HTTPDownload.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-HTTPDownload.obj -MD -MP -MF $(DEPDIR)/amulegui-HTTPDownload.Tpo -c -o amulegui-HTTPDownload.obj `if test -f 'HTTPDownload.cpp'; then $(CYGPATH_W) 'HTTPDownload.cpp'; else $(CYGPATH_W) '$(srcdir)/HTTPDownload.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-HTTPDownload.Tpo $(DEPDIR)/amulegui-HTTPDownload.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='HTTPDownload.cpp' object='amulegui-HTTPDownload.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-HTTPDownload.obj `if test -f 'HTTPDownload.cpp'; then $(CYGPATH_W) 'HTTPDownload.cpp'; else $(CYGPATH_W) '$(srcdir)/HTTPDownload.cpp'; fi`
+
 amulegui-Logger.o: Logger.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Logger.o -MD -MP -MF "$(DEPDIR)/amulegui-Logger.Tpo" -c -o amulegui-Logger.o `test -f 'Logger.cpp' || echo '$(srcdir)/'`Logger.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-Logger.Tpo" "$(DEPDIR)/amulegui-Logger.Po"; else rm -f "$(DEPDIR)/amulegui-Logger.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Logger.o -MD -MP -MF $(DEPDIR)/amulegui-Logger.Tpo -c -o amulegui-Logger.o `test -f 'Logger.cpp' || echo '$(srcdir)/'`Logger.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-Logger.Tpo $(DEPDIR)/amulegui-Logger.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Logger.cpp' object='amulegui-Logger.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-Logger.o `test -f 'Logger.cpp' || echo '$(srcdir)/'`Logger.cpp
 
 amulegui-Logger.obj: Logger.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Logger.obj -MD -MP -MF "$(DEPDIR)/amulegui-Logger.Tpo" -c -o amulegui-Logger.obj `if test -f 'Logger.cpp'; then $(CYGPATH_W) 'Logger.cpp'; else $(CYGPATH_W) '$(srcdir)/Logger.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-Logger.Tpo" "$(DEPDIR)/amulegui-Logger.Po"; else rm -f "$(DEPDIR)/amulegui-Logger.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Logger.obj -MD -MP -MF $(DEPDIR)/amulegui-Logger.Tpo -c -o amulegui-Logger.obj `if test -f 'Logger.cpp'; then $(CYGPATH_W) 'Logger.cpp'; else $(CYGPATH_W) '$(srcdir)/Logger.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-Logger.Tpo $(DEPDIR)/amulegui-Logger.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Logger.cpp' object='amulegui-Logger.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-Logger.obj `if test -f 'Logger.cpp'; then $(CYGPATH_W) 'Logger.cpp'; else $(CYGPATH_W) '$(srcdir)/Logger.cpp'; fi`
 
 amulegui-PartFile.o: PartFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-PartFile.o -MD -MP -MF "$(DEPDIR)/amulegui-PartFile.Tpo" -c -o amulegui-PartFile.o `test -f 'PartFile.cpp' || echo '$(srcdir)/'`PartFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-PartFile.Tpo" "$(DEPDIR)/amulegui-PartFile.Po"; else rm -f "$(DEPDIR)/amulegui-PartFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-PartFile.o -MD -MP -MF $(DEPDIR)/amulegui-PartFile.Tpo -c -o amulegui-PartFile.o `test -f 'PartFile.cpp' || echo '$(srcdir)/'`PartFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-PartFile.Tpo $(DEPDIR)/amulegui-PartFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFile.cpp' object='amulegui-PartFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-PartFile.o `test -f 'PartFile.cpp' || echo '$(srcdir)/'`PartFile.cpp
 
 amulegui-PartFile.obj: PartFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-PartFile.obj -MD -MP -MF "$(DEPDIR)/amulegui-PartFile.Tpo" -c -o amulegui-PartFile.obj `if test -f 'PartFile.cpp'; then $(CYGPATH_W) 'PartFile.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-PartFile.Tpo" "$(DEPDIR)/amulegui-PartFile.Po"; else rm -f "$(DEPDIR)/amulegui-PartFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-PartFile.obj -MD -MP -MF $(DEPDIR)/amulegui-PartFile.Tpo -c -o amulegui-PartFile.obj `if test -f 'PartFile.cpp'; then $(CYGPATH_W) 'PartFile.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-PartFile.Tpo $(DEPDIR)/amulegui-PartFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PartFile.cpp' object='amulegui-PartFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-PartFile.obj `if test -f 'PartFile.cpp'; then $(CYGPATH_W) 'PartFile.cpp'; else $(CYGPATH_W) '$(srcdir)/PartFile.cpp'; fi`
 
 amulegui-Preferences.o: Preferences.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Preferences.o -MD -MP -MF "$(DEPDIR)/amulegui-Preferences.Tpo" -c -o amulegui-Preferences.o `test -f 'Preferences.cpp' || echo '$(srcdir)/'`Preferences.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-Preferences.Tpo" "$(DEPDIR)/amulegui-Preferences.Po"; else rm -f "$(DEPDIR)/amulegui-Preferences.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Preferences.o -MD -MP -MF $(DEPDIR)/amulegui-Preferences.Tpo -c -o amulegui-Preferences.o `test -f 'Preferences.cpp' || echo '$(srcdir)/'`Preferences.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-Preferences.Tpo $(DEPDIR)/amulegui-Preferences.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Preferences.cpp' object='amulegui-Preferences.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-Preferences.o `test -f 'Preferences.cpp' || echo '$(srcdir)/'`Preferences.cpp
 
 amulegui-Preferences.obj: Preferences.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Preferences.obj -MD -MP -MF "$(DEPDIR)/amulegui-Preferences.Tpo" -c -o amulegui-Preferences.obj `if test -f 'Preferences.cpp'; then $(CYGPATH_W) 'Preferences.cpp'; else $(CYGPATH_W) '$(srcdir)/Preferences.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-Preferences.Tpo" "$(DEPDIR)/amulegui-Preferences.Po"; else rm -f "$(DEPDIR)/amulegui-Preferences.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Preferences.obj -MD -MP -MF $(DEPDIR)/amulegui-Preferences.Tpo -c -o amulegui-Preferences.obj `if test -f 'Preferences.cpp'; then $(CYGPATH_W) 'Preferences.cpp'; else $(CYGPATH_W) '$(srcdir)/Preferences.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-Preferences.Tpo $(DEPDIR)/amulegui-Preferences.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Preferences.cpp' object='amulegui-Preferences.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-Preferences.obj `if test -f 'Preferences.cpp'; then $(CYGPATH_W) 'Preferences.cpp'; else $(CYGPATH_W) '$(srcdir)/Preferences.cpp'; fi`
 
 amulegui-Proxy.o: Proxy.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Proxy.o -MD -MP -MF "$(DEPDIR)/amulegui-Proxy.Tpo" -c -o amulegui-Proxy.o `test -f 'Proxy.cpp' || echo '$(srcdir)/'`Proxy.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-Proxy.Tpo" "$(DEPDIR)/amulegui-Proxy.Po"; else rm -f "$(DEPDIR)/amulegui-Proxy.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Proxy.o -MD -MP -MF $(DEPDIR)/amulegui-Proxy.Tpo -c -o amulegui-Proxy.o `test -f 'Proxy.cpp' || echo '$(srcdir)/'`Proxy.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-Proxy.Tpo $(DEPDIR)/amulegui-Proxy.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Proxy.cpp' object='amulegui-Proxy.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-Proxy.o `test -f 'Proxy.cpp' || echo '$(srcdir)/'`Proxy.cpp
 
 amulegui-Proxy.obj: Proxy.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Proxy.obj -MD -MP -MF "$(DEPDIR)/amulegui-Proxy.Tpo" -c -o amulegui-Proxy.obj `if test -f 'Proxy.cpp'; then $(CYGPATH_W) 'Proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/Proxy.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-Proxy.Tpo" "$(DEPDIR)/amulegui-Proxy.Po"; else rm -f "$(DEPDIR)/amulegui-Proxy.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Proxy.obj -MD -MP -MF $(DEPDIR)/amulegui-Proxy.Tpo -c -o amulegui-Proxy.obj `if test -f 'Proxy.cpp'; then $(CYGPATH_W) 'Proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/Proxy.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-Proxy.Tpo $(DEPDIR)/amulegui-Proxy.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Proxy.cpp' object='amulegui-Proxy.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-Proxy.obj `if test -f 'Proxy.cpp'; then $(CYGPATH_W) 'Proxy.cpp'; else $(CYGPATH_W) '$(srcdir)/Proxy.cpp'; fi`
 
 amulegui-Server.o: Server.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Server.o -MD -MP -MF "$(DEPDIR)/amulegui-Server.Tpo" -c -o amulegui-Server.o `test -f 'Server.cpp' || echo '$(srcdir)/'`Server.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-Server.Tpo" "$(DEPDIR)/amulegui-Server.Po"; else rm -f "$(DEPDIR)/amulegui-Server.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Server.o -MD -MP -MF $(DEPDIR)/amulegui-Server.Tpo -c -o amulegui-Server.o `test -f 'Server.cpp' || echo '$(srcdir)/'`Server.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-Server.Tpo $(DEPDIR)/amulegui-Server.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Server.cpp' object='amulegui-Server.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-Server.o `test -f 'Server.cpp' || echo '$(srcdir)/'`Server.cpp
 
 amulegui-Server.obj: Server.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Server.obj -MD -MP -MF "$(DEPDIR)/amulegui-Server.Tpo" -c -o amulegui-Server.obj `if test -f 'Server.cpp'; then $(CYGPATH_W) 'Server.cpp'; else $(CYGPATH_W) '$(srcdir)/Server.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-Server.Tpo" "$(DEPDIR)/amulegui-Server.Po"; else rm -f "$(DEPDIR)/amulegui-Server.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Server.obj -MD -MP -MF $(DEPDIR)/amulegui-Server.Tpo -c -o amulegui-Server.obj `if test -f 'Server.cpp'; then $(CYGPATH_W) 'Server.cpp'; else $(CYGPATH_W) '$(srcdir)/Server.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-Server.Tpo $(DEPDIR)/amulegui-Server.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Server.cpp' object='amulegui-Server.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-Server.obj `if test -f 'Server.cpp'; then $(CYGPATH_W) 'Server.cpp'; else $(CYGPATH_W) '$(srcdir)/Server.cpp'; fi`
 
 amulegui-Statistics.o: Statistics.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Statistics.o -MD -MP -MF "$(DEPDIR)/amulegui-Statistics.Tpo" -c -o amulegui-Statistics.o `test -f 'Statistics.cpp' || echo '$(srcdir)/'`Statistics.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-Statistics.Tpo" "$(DEPDIR)/amulegui-Statistics.Po"; else rm -f "$(DEPDIR)/amulegui-Statistics.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Statistics.o -MD -MP -MF $(DEPDIR)/amulegui-Statistics.Tpo -c -o amulegui-Statistics.o `test -f 'Statistics.cpp' || echo '$(srcdir)/'`Statistics.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-Statistics.Tpo $(DEPDIR)/amulegui-Statistics.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Statistics.cpp' object='amulegui-Statistics.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-Statistics.o `test -f 'Statistics.cpp' || echo '$(srcdir)/'`Statistics.cpp
 
 amulegui-Statistics.obj: Statistics.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Statistics.obj -MD -MP -MF "$(DEPDIR)/amulegui-Statistics.Tpo" -c -o amulegui-Statistics.obj `if test -f 'Statistics.cpp'; then $(CYGPATH_W) 'Statistics.cpp'; else $(CYGPATH_W) '$(srcdir)/Statistics.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-Statistics.Tpo" "$(DEPDIR)/amulegui-Statistics.Po"; else rm -f "$(DEPDIR)/amulegui-Statistics.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-Statistics.obj -MD -MP -MF $(DEPDIR)/amulegui-Statistics.Tpo -c -o amulegui-Statistics.obj `if test -f 'Statistics.cpp'; then $(CYGPATH_W) 'Statistics.cpp'; else $(CYGPATH_W) '$(srcdir)/Statistics.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-Statistics.Tpo $(DEPDIR)/amulegui-Statistics.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Statistics.cpp' object='amulegui-Statistics.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-Statistics.obj `if test -f 'Statistics.cpp'; then $(CYGPATH_W) 'Statistics.cpp'; else $(CYGPATH_W) '$(srcdir)/Statistics.cpp'; fi`
 
 amulegui-StatTree.o: StatTree.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-StatTree.o -MD -MP -MF "$(DEPDIR)/amulegui-StatTree.Tpo" -c -o amulegui-StatTree.o `test -f 'StatTree.cpp' || echo '$(srcdir)/'`StatTree.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-StatTree.Tpo" "$(DEPDIR)/amulegui-StatTree.Po"; else rm -f "$(DEPDIR)/amulegui-StatTree.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-StatTree.o -MD -MP -MF $(DEPDIR)/amulegui-StatTree.Tpo -c -o amulegui-StatTree.o `test -f 'StatTree.cpp' || echo '$(srcdir)/'`StatTree.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-StatTree.Tpo $(DEPDIR)/amulegui-StatTree.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StatTree.cpp' object='amulegui-StatTree.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-StatTree.o `test -f 'StatTree.cpp' || echo '$(srcdir)/'`StatTree.cpp
 
 amulegui-StatTree.obj: StatTree.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-StatTree.obj -MD -MP -MF "$(DEPDIR)/amulegui-StatTree.Tpo" -c -o amulegui-StatTree.obj `if test -f 'StatTree.cpp'; then $(CYGPATH_W) 'StatTree.cpp'; else $(CYGPATH_W) '$(srcdir)/StatTree.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-StatTree.Tpo" "$(DEPDIR)/amulegui-StatTree.Po"; else rm -f "$(DEPDIR)/amulegui-StatTree.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-StatTree.obj -MD -MP -MF $(DEPDIR)/amulegui-StatTree.Tpo -c -o amulegui-StatTree.obj `if test -f 'StatTree.cpp'; then $(CYGPATH_W) 'StatTree.cpp'; else $(CYGPATH_W) '$(srcdir)/StatTree.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-StatTree.Tpo $(DEPDIR)/amulegui-StatTree.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='StatTree.cpp' object='amulegui-StatTree.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-StatTree.obj `if test -f 'StatTree.cpp'; then $(CYGPATH_W) 'StatTree.cpp'; else $(CYGPATH_W) '$(srcdir)/StatTree.cpp'; fi`
 
-amulegui-SHAHashSet.o: SHAHashSet.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SHAHashSet.o -MD -MP -MF "$(DEPDIR)/amulegui-SHAHashSet.Tpo" -c -o amulegui-SHAHashSet.o `test -f 'SHAHashSet.cpp' || echo '$(srcdir)/'`SHAHashSet.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-SHAHashSet.Tpo" "$(DEPDIR)/amulegui-SHAHashSet.Po"; else rm -f "$(DEPDIR)/amulegui-SHAHashSet.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SHAHashSet.cpp' object='amulegui-SHAHashSet.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SHAHashSet.o `test -f 'SHAHashSet.cpp' || echo '$(srcdir)/'`SHAHashSet.cpp
-
-amulegui-SHAHashSet.obj: SHAHashSet.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-SHAHashSet.obj -MD -MP -MF "$(DEPDIR)/amulegui-SHAHashSet.Tpo" -c -o amulegui-SHAHashSet.obj `if test -f 'SHAHashSet.cpp'; then $(CYGPATH_W) 'SHAHashSet.cpp'; else $(CYGPATH_W) '$(srcdir)/SHAHashSet.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-SHAHashSet.Tpo" "$(DEPDIR)/amulegui-SHAHashSet.Po"; else rm -f "$(DEPDIR)/amulegui-SHAHashSet.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='SHAHashSet.cpp' object='amulegui-SHAHashSet.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-SHAHashSet.obj `if test -f 'SHAHashSet.cpp'; then $(CYGPATH_W) 'SHAHashSet.cpp'; else $(CYGPATH_W) '$(srcdir)/SHAHashSet.cpp'; fi`
-
-amulegui-TerminationProcess.o: TerminationProcess.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-TerminationProcess.o -MD -MP -MF "$(DEPDIR)/amulegui-TerminationProcess.Tpo" -c -o amulegui-TerminationProcess.o `test -f 'TerminationProcess.cpp' || echo '$(srcdir)/'`TerminationProcess.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-TerminationProcess.Tpo" "$(DEPDIR)/amulegui-TerminationProcess.Po"; else rm -f "$(DEPDIR)/amulegui-TerminationProcess.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcess.cpp' object='amulegui-TerminationProcess.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-TerminationProcess.o `test -f 'TerminationProcess.cpp' || echo '$(srcdir)/'`TerminationProcess.cpp
-
-amulegui-TerminationProcess.obj: TerminationProcess.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-TerminationProcess.obj -MD -MP -MF "$(DEPDIR)/amulegui-TerminationProcess.Tpo" -c -o amulegui-TerminationProcess.obj `if test -f 'TerminationProcess.cpp'; then $(CYGPATH_W) 'TerminationProcess.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcess.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-TerminationProcess.Tpo" "$(DEPDIR)/amulegui-TerminationProcess.Po"; else rm -f "$(DEPDIR)/amulegui-TerminationProcess.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcess.cpp' object='amulegui-TerminationProcess.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-TerminationProcess.obj `if test -f 'TerminationProcess.cpp'; then $(CYGPATH_W) 'TerminationProcess.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcess.cpp'; fi`
-
-amulegui-TerminationProcessAmuleweb.o: TerminationProcessAmuleweb.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-TerminationProcessAmuleweb.o -MD -MP -MF "$(DEPDIR)/amulegui-TerminationProcessAmuleweb.Tpo" -c -o amulegui-TerminationProcessAmuleweb.o `test -f 'TerminationProcessAmuleweb.cpp' || echo '$(srcdir)/'`TerminationProcessAmuleweb.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-TerminationProcessAmuleweb.Tpo" "$(DEPDIR)/amulegui-TerminationProcessAmuleweb.Po"; else rm -f "$(DEPDIR)/amulegui-TerminationProcessAmuleweb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcessAmuleweb.cpp' object='amulegui-TerminationProcessAmuleweb.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-TerminationProcessAmuleweb.o `test -f 'TerminationProcessAmuleweb.cpp' || echo '$(srcdir)/'`TerminationProcessAmuleweb.cpp
-
-amulegui-TerminationProcessAmuleweb.obj: TerminationProcessAmuleweb.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-TerminationProcessAmuleweb.obj -MD -MP -MF "$(DEPDIR)/amulegui-TerminationProcessAmuleweb.Tpo" -c -o amulegui-TerminationProcessAmuleweb.obj `if test -f 'TerminationProcessAmuleweb.cpp'; then $(CYGPATH_W) 'TerminationProcessAmuleweb.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcessAmuleweb.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-TerminationProcessAmuleweb.Tpo" "$(DEPDIR)/amulegui-TerminationProcessAmuleweb.Po"; else rm -f "$(DEPDIR)/amulegui-TerminationProcessAmuleweb.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TerminationProcessAmuleweb.cpp' object='amulegui-TerminationProcessAmuleweb.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-TerminationProcessAmuleweb.obj `if test -f 'TerminationProcessAmuleweb.cpp'; then $(CYGPATH_W) 'TerminationProcessAmuleweb.cpp'; else $(CYGPATH_W) '$(srcdir)/TerminationProcessAmuleweb.cpp'; fi`
-
 amulegui-UserEvents.o: UserEvents.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-UserEvents.o -MD -MP -MF "$(DEPDIR)/amulegui-UserEvents.Tpo" -c -o amulegui-UserEvents.o `test -f 'UserEvents.cpp' || echo '$(srcdir)/'`UserEvents.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-UserEvents.Tpo" "$(DEPDIR)/amulegui-UserEvents.Po"; else rm -f "$(DEPDIR)/amulegui-UserEvents.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-UserEvents.o -MD -MP -MF $(DEPDIR)/amulegui-UserEvents.Tpo -c -o amulegui-UserEvents.o `test -f 'UserEvents.cpp' || echo '$(srcdir)/'`UserEvents.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-UserEvents.Tpo $(DEPDIR)/amulegui-UserEvents.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UserEvents.cpp' object='amulegui-UserEvents.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-UserEvents.o `test -f 'UserEvents.cpp' || echo '$(srcdir)/'`UserEvents.cpp
 
 amulegui-UserEvents.obj: UserEvents.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-UserEvents.obj -MD -MP -MF "$(DEPDIR)/amulegui-UserEvents.Tpo" -c -o amulegui-UserEvents.obj `if test -f 'UserEvents.cpp'; then $(CYGPATH_W) 'UserEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/UserEvents.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-UserEvents.Tpo" "$(DEPDIR)/amulegui-UserEvents.Po"; else rm -f "$(DEPDIR)/amulegui-UserEvents.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-UserEvents.obj -MD -MP -MF $(DEPDIR)/amulegui-UserEvents.Tpo -c -o amulegui-UserEvents.obj `if test -f 'UserEvents.cpp'; then $(CYGPATH_W) 'UserEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/UserEvents.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amulegui-UserEvents.Tpo $(DEPDIR)/amulegui-UserEvents.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UserEvents.cpp' object='amulegui-UserEvents.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-UserEvents.obj `if test -f 'UserEvents.cpp'; then $(CYGPATH_W) 'UserEvents.cpp'; else $(CYGPATH_W) '$(srcdir)/UserEvents.cpp'; fi`
 
-amulegui-OtherFunctions.o: OtherFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-OtherFunctions.o -MD -MP -MF "$(DEPDIR)/amulegui-OtherFunctions.Tpo" -c -o amulegui-OtherFunctions.o `test -f 'OtherFunctions.cpp' || echo '$(srcdir)/'`OtherFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-OtherFunctions.Tpo" "$(DEPDIR)/amulegui-OtherFunctions.Po"; else rm -f "$(DEPDIR)/amulegui-OtherFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OtherFunctions.cpp' object='amulegui-OtherFunctions.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-OtherFunctions.o `test -f 'OtherFunctions.cpp' || echo '$(srcdir)/'`OtherFunctions.cpp
-
-amulegui-OtherFunctions.obj: OtherFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-OtherFunctions.obj -MD -MP -MF "$(DEPDIR)/amulegui-OtherFunctions.Tpo" -c -o amulegui-OtherFunctions.obj `if test -f 'OtherFunctions.cpp'; then $(CYGPATH_W) 'OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/OtherFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-OtherFunctions.Tpo" "$(DEPDIR)/amulegui-OtherFunctions.Po"; else rm -f "$(DEPDIR)/amulegui-OtherFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='OtherFunctions.cpp' object='amulegui-OtherFunctions.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-OtherFunctions.obj `if test -f 'OtherFunctions.cpp'; then $(CYGPATH_W) 'OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/OtherFunctions.cpp'; fi`
-
-amulegui-NetworkFunctions.o: NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-NetworkFunctions.o -MD -MP -MF "$(DEPDIR)/amulegui-NetworkFunctions.Tpo" -c -o amulegui-NetworkFunctions.o `test -f 'NetworkFunctions.cpp' || echo '$(srcdir)/'`NetworkFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-NetworkFunctions.Tpo" "$(DEPDIR)/amulegui-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/amulegui-NetworkFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NetworkFunctions.cpp' object='amulegui-NetworkFunctions.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-NetworkFunctions.o `test -f 'NetworkFunctions.cpp' || echo '$(srcdir)/'`NetworkFunctions.cpp
-
-amulegui-NetworkFunctions.obj: NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -MT amulegui-NetworkFunctions.obj -MD -MP -MF "$(DEPDIR)/amulegui-NetworkFunctions.Tpo" -c -o amulegui-NetworkFunctions.obj `if test -f 'NetworkFunctions.cpp'; then $(CYGPATH_W) 'NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amulegui-NetworkFunctions.Tpo" "$(DEPDIR)/amulegui-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/amulegui-NetworkFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NetworkFunctions.cpp' object='amulegui-NetworkFunctions.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amulegui_CPPFLAGS) $(CPPFLAGS) $(amulegui_CXXFLAGS) $(CXXFLAGS) -c -o amulegui-NetworkFunctions.obj `if test -f 'NetworkFunctions.cpp'; then $(CYGPATH_W) 'NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctions.cpp'; fi`
-
 ed2k-ED2KLinkParser.o: ED2KLinkParser.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ed2k-ED2KLinkParser.o -MD -MP -MF "$(DEPDIR)/ed2k-ED2KLinkParser.Tpo" -c -o ed2k-ED2KLinkParser.o `test -f 'ED2KLinkParser.cpp' || echo '$(srcdir)/'`ED2KLinkParser.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ed2k-ED2KLinkParser.Tpo" "$(DEPDIR)/ed2k-ED2KLinkParser.Po"; else rm -f "$(DEPDIR)/ed2k-ED2KLinkParser.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ed2k-ED2KLinkParser.o -MD -MP -MF $(DEPDIR)/ed2k-ED2KLinkParser.Tpo -c -o ed2k-ED2KLinkParser.o `test -f 'ED2KLinkParser.cpp' || echo '$(srcdir)/'`ED2KLinkParser.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ed2k-ED2KLinkParser.Tpo $(DEPDIR)/ed2k-ED2KLinkParser.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ED2KLinkParser.cpp' object='ed2k-ED2KLinkParser.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ed2k-ED2KLinkParser.o `test -f 'ED2KLinkParser.cpp' || echo '$(srcdir)/'`ED2KLinkParser.cpp
 
 ed2k-ED2KLinkParser.obj: ED2KLinkParser.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ed2k-ED2KLinkParser.obj -MD -MP -MF "$(DEPDIR)/ed2k-ED2KLinkParser.Tpo" -c -o ed2k-ED2KLinkParser.obj `if test -f 'ED2KLinkParser.cpp'; then $(CYGPATH_W) 'ED2KLinkParser.cpp'; else $(CYGPATH_W) '$(srcdir)/ED2KLinkParser.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ed2k-ED2KLinkParser.Tpo" "$(DEPDIR)/ed2k-ED2KLinkParser.Po"; else rm -f "$(DEPDIR)/ed2k-ED2KLinkParser.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ed2k-ED2KLinkParser.obj -MD -MP -MF $(DEPDIR)/ed2k-ED2KLinkParser.Tpo -c -o ed2k-ED2KLinkParser.obj `if test -f 'ED2KLinkParser.cpp'; then $(CYGPATH_W) 'ED2KLinkParser.cpp'; else $(CYGPATH_W) '$(srcdir)/ED2KLinkParser.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ed2k-ED2KLinkParser.Tpo $(DEPDIR)/ed2k-ED2KLinkParser.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ED2KLinkParser.cpp' object='ed2k-ED2KLinkParser.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ed2k-ED2KLinkParser.obj `if test -f 'ED2KLinkParser.cpp'; then $(CYGPATH_W) 'ED2KLinkParser.cpp'; else $(CYGPATH_W) '$(srcdir)/ED2KLinkParser.cpp'; fi`
 
 ed2k-MagnetURI.o: MagnetURI.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ed2k-MagnetURI.o -MD -MP -MF "$(DEPDIR)/ed2k-MagnetURI.Tpo" -c -o ed2k-MagnetURI.o `test -f 'MagnetURI.cpp' || echo '$(srcdir)/'`MagnetURI.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ed2k-MagnetURI.Tpo" "$(DEPDIR)/ed2k-MagnetURI.Po"; else rm -f "$(DEPDIR)/ed2k-MagnetURI.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ed2k-MagnetURI.o -MD -MP -MF $(DEPDIR)/ed2k-MagnetURI.Tpo -c -o ed2k-MagnetURI.o `test -f 'MagnetURI.cpp' || echo '$(srcdir)/'`MagnetURI.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ed2k-MagnetURI.Tpo $(DEPDIR)/ed2k-MagnetURI.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MagnetURI.cpp' object='ed2k-MagnetURI.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ed2k-MagnetURI.o `test -f 'MagnetURI.cpp' || echo '$(srcdir)/'`MagnetURI.cpp
 
 ed2k-MagnetURI.obj: MagnetURI.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ed2k-MagnetURI.obj -MD -MP -MF "$(DEPDIR)/ed2k-MagnetURI.Tpo" -c -o ed2k-MagnetURI.obj `if test -f 'MagnetURI.cpp'; then $(CYGPATH_W) 'MagnetURI.cpp'; else $(CYGPATH_W) '$(srcdir)/MagnetURI.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ed2k-MagnetURI.Tpo" "$(DEPDIR)/ed2k-MagnetURI.Po"; else rm -f "$(DEPDIR)/ed2k-MagnetURI.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ed2k-MagnetURI.obj -MD -MP -MF $(DEPDIR)/ed2k-MagnetURI.Tpo -c -o ed2k-MagnetURI.obj `if test -f 'MagnetURI.cpp'; then $(CYGPATH_W) 'MagnetURI.cpp'; else $(CYGPATH_W) '$(srcdir)/MagnetURI.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ed2k-MagnetURI.Tpo $(DEPDIR)/ed2k-MagnetURI.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MagnetURI.cpp' object='ed2k-MagnetURI.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ed2k-MagnetURI.obj `if test -f 'MagnetURI.cpp'; then $(CYGPATH_W) 'MagnetURI.cpp'; else $(CYGPATH_W) '$(srcdir)/MagnetURI.cpp'; fi`
 
 ed2k-MuleCollection.o: MuleCollection.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ed2k-MuleCollection.o -MD -MP -MF "$(DEPDIR)/ed2k-MuleCollection.Tpo" -c -o ed2k-MuleCollection.o `test -f 'MuleCollection.cpp' || echo '$(srcdir)/'`MuleCollection.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ed2k-MuleCollection.Tpo" "$(DEPDIR)/ed2k-MuleCollection.Po"; else rm -f "$(DEPDIR)/ed2k-MuleCollection.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ed2k-MuleCollection.o -MD -MP -MF $(DEPDIR)/ed2k-MuleCollection.Tpo -c -o ed2k-MuleCollection.o `test -f 'MuleCollection.cpp' || echo '$(srcdir)/'`MuleCollection.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ed2k-MuleCollection.Tpo $(DEPDIR)/ed2k-MuleCollection.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleCollection.cpp' object='ed2k-MuleCollection.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ed2k-MuleCollection.o `test -f 'MuleCollection.cpp' || echo '$(srcdir)/'`MuleCollection.cpp
 
 ed2k-MuleCollection.obj: MuleCollection.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ed2k-MuleCollection.obj -MD -MP -MF "$(DEPDIR)/ed2k-MuleCollection.Tpo" -c -o ed2k-MuleCollection.obj `if test -f 'MuleCollection.cpp'; then $(CYGPATH_W) 'MuleCollection.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleCollection.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ed2k-MuleCollection.Tpo" "$(DEPDIR)/ed2k-MuleCollection.Po"; else rm -f "$(DEPDIR)/ed2k-MuleCollection.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ed2k-MuleCollection.obj -MD -MP -MF $(DEPDIR)/ed2k-MuleCollection.Tpo -c -o ed2k-MuleCollection.obj `if test -f 'MuleCollection.cpp'; then $(CYGPATH_W) 'MuleCollection.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleCollection.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ed2k-MuleCollection.Tpo $(DEPDIR)/ed2k-MuleCollection.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='MuleCollection.cpp' object='ed2k-MuleCollection.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ed2k_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ed2k-MuleCollection.obj `if test -f 'MuleCollection.cpp'; then $(CYGPATH_W) 'MuleCollection.cpp'; else $(CYGPATH_W) '$(srcdir)/MuleCollection.cpp'; fi`
-uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -4668,7 +5334,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -4685,16 +5351,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -4720,16 +5385,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -4737,14 +5402,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -4756,82 +5421,101 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../automake $(distdir)/extern/wxWidgets
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -4845,7 +5529,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -4868,6 +5552,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -4890,18 +5575,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -4921,23 +5626,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
-	clean-recursive ctags ctags-recursive dist-hook distclean \
-	distclean-compile distclean-generic distclean-recursive \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-noinstLIBRARIES ctags ctags-recursive \
+	dist-hook distclean distclean-compile distclean-generic \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-binPROGRAMS
 
 
 $(srcdir)/Parser.cpp: Parser.y
@@ -4946,9 +5653,12 @@
 @GENERATE_FLEX_HEADER_TRUE@$(srcdir)/Scanner.cpp: Scanner.l Parser.cpp
 @GENERATE_FLEX_HEADER_TRUE@		$(LEX) --header-file=$(srcdir)/Scanner.h -o $@ $(srcdir)/Scanner.l
 @GENERATE_FLEX_HEADER_FALSE@$(srcdir)/Scanner.cpp: Scanner.l Parser.cpp
-@GENERATE_FLEX_HEADER_FALSE@		$(LEX) -o$@ $(srcdir)/Scanner.l; \
+@GENERATE_FLEX_HEADER_FALSE@		$(LEX) -o $@ $(srcdir)/Scanner.l; \
 @GENERATE_FLEX_HEADER_FALSE@		echo "// Empty file generated by a flex version unable to create headers" > $(srcdir)/Scanner.h
 
+$(srcdir)/IPFilterScanner.cpp: IPFilterScanner.l
+		$(LEX) -Pyyip -o $@ $(srcdir)/IPFilterScanner.l;
+
 @NEED_RC_TRUE@.rc.$(OBJEXT):
 @NEED_RC_TRUE@	$(RC) $(MULERCFLAGS) -I$(top_srcdir) $(RCFLAGS) -O COFF -i "$<" -o "$@"
 
@@ -5006,6 +5716,7 @@
 			fi ; \
 		done ; \
 	done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/src/MemFile.cpp -> aMule-2.3.1.tar.bz2/src/MemFile.cpp Changed

aMule-2.2.6.tar.bz2/src/MemFile.h -> aMule-2.3.1.tar.bz2/src/MemFile.h Changed

aMule-2.2.6.tar.bz2/src/MuleCollection.cpp -> aMule-2.3.1.tar.bz2/src/MuleCollection.cpp Changed

aMule-2.2.6.tar.bz2/src/MuleCollection.h -> aMule-2.3.1.tar.bz2/src/MuleCollection.h Changed

aMule-2.3.1.tar.bz2/src/MuleColour.cpp Added

@@ -0,0 +1,88 @@
+//
+// 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
+//
+
+#include "MuleColour.h"
+
+#include <wx/pen.h>
+#include <wx/brush.h>
+
+#include <map>
+
+#define USE_MULE_PEN_CACHE 1
+#define USE_MULE_BRUSH_CACHE 1
+
+std::map<uint32_t, wxPen*> wxPenCache; 
+std::map<uint32_t, wxBrush*> wxBrushCache;
+
+const wxPen& CMuleColour::GetPen(int width, int style) const
+{
+#if USE_MULE_PEN_CACHE
+	wxPen* result = NULL;
+	
+	if (m_cachedpen && (m_cachedpen->GetWidth() == width) && (m_cachedpen->GetStyle() == style)) {
+		result = m_cachedpen;
+	} else {
+		const uint32_t hash = ((width & 0xF) << 28) | ((style & 0xF) << 24) | (GetULong() & 0xFFFFFF);
+		std::map<uint32_t, wxPen*>::iterator it = wxPenCache.find(hash);
+		if (it != wxPenCache.end()) {
+			result = it->second;
+			m_cachedpen = result;
+		} else {
+			result = wxThePenList->FindOrCreatePen(wxColour(m_red, m_green, m_blue), width, style);
+			m_cachedpen = result;
+			wxPenCache.insert(std::pair<uint32_t, wxPen*>(hash, result));
+		}
+	}
+	
+	return *result;
+#else 
+	return *wxThePenList->FindOrCreatePen(wxColour(m_red, m_green, m_blue), width, style);
+#endif
+}
+
+const wxBrush& CMuleColour::GetBrush(int style) const
+{
+#if USE_MULE_BRUSH_CACHE	
+	wxBrush* result = NULL;
+	
+	if (m_cachedbrush && (m_cachedbrush->GetStyle() == style)) {
+		result = m_cachedbrush;
+	} else {
+		const uint32_t hash = ((style & 0xF) << 24) | (GetULong() & 0xFFFFFF);
+		std::map<uint32_t, wxBrush*>::iterator it = wxBrushCache.find(hash);
+		if (it != wxBrushCache.end()) {
+			result = it->second;
+			m_cachedbrush = result;
+		} else {
+			result = wxTheBrushList->FindOrCreateBrush(wxColour(m_red, m_green, m_blue), style);
+			m_cachedbrush = result;
+			wxBrushCache.insert(std::pair<uint32_t, wxBrush*>(hash, result));
+		}
+	}
+	
+	return *result;
+#else
+	return *wxTheBrushList->FindOrCreateBrush(wxColour(m_red, m_green, m_blue), style);
+#endif
+}

aMule-2.3.1.tar.bz2/src/MuleColour.h Added

@@ -0,0 +1,110 @@
+//
+// 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
+//
+
+#ifndef MULECOLOR_H
+#define MULECOLOR_H
+
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include "Types.h"
+
+class wxPen;
+class wxBrush;
+
+class CMuleColour 
+{
+public:
+
+	enum ColourComponent { COLOUR_R = 1, COLOUR_G = 2, COLOUR_B = 4 };
+
+	CMuleColour() { Init(); Set(0,0,0); }	
+	CMuleColour(const wxColour& colour) { Init(); Set(colour.Red(), colour.Green(), colour.Blue()); }
+	CMuleColour(byte r, byte g, byte b) { Init(); Set(r,g,b); }
+	CMuleColour(unsigned long rgb)
+	{ 
+		Init();
+		Set((rgb & 0xFF), (rgb >> 8) & 0xFF, (rgb >> 16) & 0xFF);
+	}
+	
+	CMuleColour(wxSystemColour colour)
+	{
+		Init();
+		const wxColour& wxcolour = wxSystemSettings::GetColour(colour);
+		Set(wxcolour.Red(), wxcolour.Green(), wxcolour.Blue());
+	}
+
+	void Init() {
+		m_cachedpen = NULL;
+		m_cachedbrush = NULL;
+	}
+	
+	~CMuleColour() { }
+	
+	void Set(byte red, byte green, byte blue) { m_red = red; m_green = green; m_blue = blue; }
+	
+	inline byte Red() const { return m_red; }
+	inline byte Green() const { return m_green; }
+	inline byte Blue() const { return m_blue; }
+	
+	const CMuleColour& Blend(byte percentage, ColourComponent flags = (ColourComponent)(COLOUR_R | COLOUR_G | COLOUR_B) )
+	{
+		unsigned int red = (unsigned int)(Red() * ((flags & COLOUR_R) ? ((float)percentage/(float)100) : (float)1));
+		unsigned int green = (unsigned int)(Green() * ((flags & COLOUR_G) ? ((float)percentage/(float)100) : (float)1));
+		unsigned int blue = (unsigned int)(Blue() * ((flags & COLOUR_B) ? ((float)percentage/(float)100) : (float)1));
+		Set((red < 255) ? red : 255, (green < 255) ? green : 255, (blue < 255) ? blue : 255);
+		return *this;
+	}
+	
+	const CMuleColour& BlendWith(const CMuleColour& colour, double covered)
+	{
+		unsigned int red = (unsigned int)(Red() + (colour.Red() * covered) + 0.5);
+		unsigned int green = (unsigned int)(Green() + (colour.Green() * covered) + 0.5);
+		unsigned int blue = (unsigned int)(Blue() + (colour.Blue() * covered) + 0.5);
+		Set((red < 255) ? red : 255, (green < 255) ? green : 255, (blue < 255) ? blue : 255);
+		return *this;
+	}
+	
+	unsigned long GetULong() const { return (Blue() << 16) | (Green() << 8) | Red(); }
+		
+	bool IsBlack() const { return !Red() && !Blue() && !Green(); }
+	
+	bool IsSameAs(const CMuleColour& colour) const { return (Red() == colour.Red()) && (Green() == colour.Green()) && (Blue() == colour.Blue()); }
+	
+	operator wxColour() const {
+		return wxColor(m_red, m_green, m_blue);
+	}
+	
+	const wxPen& GetPen(int width = 1, int style = wxSOLID) const;
+	const wxBrush& GetBrush(int style = wxSOLID) const;
+	
+private:
+	byte m_red;
+	byte m_green;
+	byte m_blue;
+
+	mutable wxPen* m_cachedpen;
+	mutable wxBrush* m_cachedbrush;
+};
+
+#endif

aMule-2.2.6.tar.bz2/src/MuleGifCtrl.cpp -> aMule-2.3.1.tar.bz2/src/MuleGifCtrl.cpp Changed

aMule-2.2.6.tar.bz2/src/MuleGifCtrl.h -> aMule-2.3.1.tar.bz2/src/MuleGifCtrl.h Changed

aMule-2.2.6.tar.bz2/src/MuleListCtrl.cpp -> aMule-2.3.1.tar.bz2/src/MuleListCtrl.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -59,6 +59,7 @@
 	EVT_LIST_COL_CLICK( -1, 		CMuleListCtrl::OnColumnLClick)
 	EVT_LIST_COL_RIGHT_CLICK( -1,	CMuleListCtrl::OnColumnRClick)
 	EVT_LIST_ITEM_SELECTED(-1,		CMuleListCtrl::OnItemSelected)
+	EVT_LIST_ITEM_DESELECTED(-1,	CMuleListCtrl::OnItemSelected)
 	EVT_LIST_DELETE_ITEM(-1,		CMuleListCtrl::OnItemDeleted)
 	EVT_LIST_DELETE_ALL_ITEMS(-1,	CMuleListCtrl::OnAllItemsDeleted)
 	EVT_CHAR(						CMuleListCtrl::OnChar)
@@ -77,6 +78,7 @@
 	m_sort_func = NULL;
 	m_tts_time = 0;
 	m_tts_item = -1;
+	m_isSorting = false;
 
 	if (imgList.GetImageCount() == 0) {
 		imgList.Add(wxBitmap(sort_dn_xpm));
@@ -99,6 +101,35 @@
 	}
 }
 
+long CMuleListCtrl::InsertColumn(long col, const wxString& heading, int format, int width, const wxString& name)
+{
+	if (!name.IsEmpty()) {
+#ifdef __DEBUG__
+		// Check for valid names
+		wxASSERT_MSG(name.Find(wxT(':')) == wxNOT_FOUND, wxT("Column name \"") + name + wxT("\" contains invalid characters!"));
+		wxASSERT_MSG(name.Find(wxT(',')) == wxNOT_FOUND, wxT("Column name \"") + name + wxT("\" contains invalid characters!"));
+
+		// Check for uniqueness of names.
+		for (ColNameList::const_iterator it = m_column_names.begin(); it != m_column_names.end(); ++it) {
+			if (name == it->name) {
+				wxFAIL_MSG(wxT("Column name \"") + name + wxT("\" is not unique!"));
+			}
+		}
+#endif
+		// Insert name at position col.
+		ColNameList::iterator it = m_column_names.begin();
+		while (it != m_column_names.end() && it->index < col) {
+			++it;
+		}
+		m_column_names.insert(it, ColNameEntry(col, width, name));
+		while (it != m_column_names.end()) {
+			++it;
+			++(it->index);
+		}
+	}
+
+	return MuleExtern::wxGenericListCtrl::InsertColumn(col, heading, format, width);
+}
 
 void CMuleListCtrl::SaveSettings()
 {
@@ -108,83 +139,137 @@
 
 	// Save sorting, column and order
 	wxString sortOrder;
-	for (CSortingList::iterator it = m_sort_orders.begin(); it != m_sort_orders.end(); ++it) {
-		sortOrder += wxString::Format(wxT("%u %u, "), it->first, it->second);
+	for (CSortingList::iterator it = m_sort_orders.begin(); it != m_sort_orders.end();) {
+		wxString columnName = GetColumnName(it->first);
+		if (!columnName.IsEmpty()) {
+			sortOrder += columnName;
+			sortOrder += wxT(":");
+			sortOrder += it->second & SORT_DES ? wxT("1") : wxT("0");
+			sortOrder += wxT(":");
+			sortOrder += it->second & SORT_ALT ? wxT("1") : wxT("0");
+			if (++it != m_sort_orders.end()) {
+				sortOrder += wxT(",");
+			}
+		} else {
+			++it;
+		}
 	}
 	
 	cfg->Write(wxT("/eMule/TableOrdering") + m_name, sortOrder);
 
 	// Save column widths. ATM this is also used to signify hidden columns.
 	wxString buffer;
-	for ( int i = 0; i < GetColumnCount(); ++i ) {
-		if ( i ) buffer << wxT(",");
-
-		buffer << GetColumnWidth(i);
+	for (int i = 0; i < GetColumnCount(); ++i) {
+		wxString columnName = GetColumnName(i);
+		if (!columnName.IsEmpty()) {
+			if (!buffer.IsEmpty()) {
+				buffer << wxT(",");
+			}
+			int currentwidth = GetColumnWidth(i);
+			int savedsize = (m_column_sizes.size() && (i < (int) m_column_sizes.size())) ? m_column_sizes[i] : 0;
+			buffer << columnName << wxT(":") << ((currentwidth > 0) ? currentwidth : (-1 * savedsize));
+		}
 	}
 
-	cfg->Write( wxT("/eMule/TableWidths") +m_name, buffer );
+	cfg->Write(wxT("/eMule/TableWidths") + m_name, buffer);
 }	
 
-
-void CMuleListCtrl::LoadSettings()
+void CMuleListCtrl::ParseOldConfigEntries(const wxString& sortOrders, const wxString& columnWidths)
 {
-	wxCHECK_RET(!m_name.IsEmpty(), wxT("Cannot load settings for unnamed list"));
+	// Set sort order (including sort column)
+	wxStringTokenizer tokens(sortOrders, wxT(","));
+	while (tokens.HasMoreTokens()) {
+		wxString token = tokens.GetNextToken();
 
-	wxConfigBase* cfg = wxConfigBase::Get();
+		long column = 0;
+		unsigned long order = 0;
 
-	// Set the column widths
-	wxString buffer;
-	if (cfg->Read( wxT("/eMule/TableWidths") + m_name, &buffer, wxEmptyString)) {
-		if (buffer.IsEmpty() || !(buffer[0] >= wxT('0') && buffer[0] <= wxT('9'))) {
-			// Unknown format, skip
-			return;
+		if (token.BeforeFirst(wxT(' ')).Strip(wxString::both).ToLong(&column)) {
+			if (token.AfterFirst(wxT(' ')).Strip(wxString::both).ToULong(&order)) {
+				column = GetNewColumnIndex(column);
+				// Sanity checking, to avoid asserting if column count changes.
+				if (column >= 0 && column < GetColumnCount()) {
+					// Sanity checking, to avoid asserting if data-format changes.
+					if ((order & ~SORTING_MASK) == 0) {
+						// SetSorting will take care of duplicate entries
+						SetSorting(column, order);
+					}
+				}
+			}
 		}
-		int counter = 0;
-		
-		wxStringTokenizer tokenizer( buffer, wxT(",") );
-		while (tokenizer.HasMoreTokens() && (counter < GetColumnCount())) {
-			SetColumnWidth(counter++, StrToLong( tokenizer.GetNextToken()));
+	}
+
+	// Set column widths
+	int counter = 0;
+	wxStringTokenizer tokenizer(columnWidths, wxT(","));
+	while (tokenizer.HasMoreTokens()) {
+		long idx = GetNewColumnIndex(counter++);
+		long width = StrToLong(tokenizer.GetNextToken());
+		if (idx >= 0) {
+			SetColumnWidth(idx, width);
 		}
 	}
+}
+
+void CMuleListCtrl::LoadSettings()
+{
+	wxCHECK_RET(!m_name.IsEmpty(), wxT("Cannot load settings for unnamed list"));
+
+	wxConfigBase* cfg = wxConfigBase::Get();
 
 	// Load sort order (including sort-column)
 	m_sort_orders.clear();
-	wxString setting = cfg->Read(wxT("/eMule/TableOrdering") + m_name, wxEmptyString);
-	
+	wxString sortOrders = cfg->Read(wxT("/eMule/TableOrdering") + m_name, wxEmptyString);
+	wxString columnWidths = cfg->Read(wxT("/eMule/TableWidths") + m_name, wxEmptyString);
+
 	// Prevent sorting from occuring when calling SetSorting
 	MuleListCtrlCompare sortFunc = m_sort_func;
 	m_sort_func = NULL;
-	
-	wxStringTokenizer tokens(setting, wxT(","));
-	while (tokens.HasMoreTokens()) {
-		wxString token = tokens.GetNextToken();
 
-		unsigned long column = 0, order = 0;
+	if (columnWidths.Find(wxT(':')) == wxNOT_FOUND) {
+		// Old-style config entries...
+		ParseOldConfigEntries(sortOrders, columnWidths);
+	} else {
+		// Sort orders
+		wxStringTokenizer tokens(sortOrders, wxT(","));
+		// Sort orders are stored in order primary, secondary, ...
+		// We want to apply them with SetSorting(), so we have to apply them in reverse order,
+		// so that the primary order is applied last and wins.
+		// Read them with tokenizer and store them in a list in reverse order.
+		CStringList tokenList;
+		while (tokens.HasMoreTokens()) {
+			tokenList.push_front(tokens.GetNextToken());
+		}
+		for (CStringList::iterator it = tokenList.begin(); it != tokenList.end(); it++) {
+			wxString token = *it;
+			wxString name = token.BeforeFirst(wxT(':'));
+			long order = StrToLong(token.AfterFirst(wxT(':')).BeforeLast(wxT(':')));
+			long alt = StrToLong(token.AfterLast(wxT(':')));
+			int col = GetColumnIndex(name);
+			if (col >= 0) {
+				SetSorting(col, (order ? SORT_DES : 0) | (alt ? SORT_ALT : 0));
+			}
+		}
 
-		if (token.BeforeFirst(wxT(' ')).Strip(wxString::both).ToULong(&column)) {
-			if (token.AfterFirst(wxT(' ')).Strip(wxString::both).ToULong(&order)) {
-				// Sanity checking, to avoid asserting if column count changes.
-				if (column < (unsigned)GetColumnCount()) {
-					// Sanity checking, to avoid asserting if data-format changes.
-					if ((order & ~SORTING_MASK) == 0) {
-						// SetSorting will take care of duplicate entries
-						SetSorting(column, order);
-					}
+		// Column widths
+		wxStringTokenizer tkz(columnWidths, wxT(","));
+		while (tkz.HasMoreTokens()) {
+			wxString token = tkz.GetNextToken();
+			wxString name = token.BeforeFirst(wxT(':'));
+			long width = StrToLong(token.AfterFirst(wxT(':')));
+			int col = GetColumnIndex(name);
+			if (col >= 0) {
+				if (col >= (int) m_column_sizes.size()) {
+					m_column_sizes.resize(col + 1, 0);
 				}
+				m_column_sizes[col] = abs(width);
+				SetColumnWidth(col, (width > 0) ? width : 0);
 			}
 		}
 	}
-	
-	// Make sure that sort by name is in the sort order list, 
-	// so clients don't get sorted under the wrong download.
-	// (It should always be anyway, but you can remove it by editing the config.)
-	// This also makes sure there's at least one entry in the list.
-	CSortingList::const_iterator it = m_sort_orders.begin();
-	bool ok = false;
-	for (; !ok && it != m_sort_orders.end(); ++it) {
-		ok = it->first == 0;
-	}
-	if (!ok) { // not found - append sort by name to the end
+
+	// Must have at least one sort-order specified
+	if (m_sort_orders.empty()) {
 		m_sort_orders.push_back(CColPair(0, 0));
 	}
 
@@ -194,22 +279,69 @@
 }
 
 
+const wxString& CMuleListCtrl::GetColumnName(int index) const
+{
+	for (ColNameList::const_iterator it = m_column_names.begin(); it != m_column_names.end(); ++it) {
+		if (it->index == index) {
+			return it->name;
+		}
+	}
+	return EmptyString;
+}
+
+int CMuleListCtrl::GetColumnDefaultWidth(int index) const
+{
+	for (ColNameList::const_iterator it = m_column_names.begin(); it != m_column_names.end(); ++it) {
+		if (it->index == index) {
+			return it->defaultWidth;
+		}
+	}
+	return wxLIST_AUTOSIZE;
+}
+
+int CMuleListCtrl::GetColumnIndex(const wxString& name) const
+{
+	for (ColNameList::const_iterator it = m_column_names.begin(); it != m_column_names.end(); ++it) {
+		if (it->name == name) {
+			return it->index;
+		}
+	}
+	return -1;
+}
+
+int CMuleListCtrl::GetNewColumnIndex(int oldindex) const
+{
+	wxStringTokenizer oldcolumns(GetOldColumnOrder(), wxT(","), wxTOKEN_RET_EMPTY_ALL);
+
+	while (oldcolumns.HasMoreTokens()) {
+		wxString name = oldcolumns.GetNextToken();
+		if (oldindex == 0) {
+			return GetColumnIndex(name);
+		}
+		--oldindex;
+	}
+	return -1;
+}
+
 long CMuleListCtrl::GetInsertPos(wxUIntPtr data)
 {
 	// Find the best place to position the item through a binary search
 	int Min = 0;
 	int Max = GetItemCount();
 
-	// Only do this if there are any items and a sorter function
+	// Only do this if there are any items and a sorter function.
+	// Otherwise insert at end.
 	if (Max && m_sort_func) {
-		// This search will narrow down the best place to position the new
-		// item. The result will be the item after that position, which is
-		// the format expected by the insertion function.
+		// This search will find the place to position the new item
+		// so it matches current sorting.
+		// The result will be the position the new item will have
+		// after insertion, which is the format expected by the InsertItem function.
+		// If the item equals another item it will be inserted after it.
 		do {
 			int cur_pos = ( Max - Min ) / 2 + Min;
 			int cmp = CompareItems(data, GetItemData(cur_pos));
 			
-			// Value is lesser than the one at the current pos
+			// Value is less than the one at the current pos
 			if ( cmp < 0 ) {
 				Max = cur_pos;
 			} else {
@@ -222,7 +354,6 @@
 }
 
 
-
 int CMuleListCtrl::CompareItems(wxUIntPtr item1, wxUIntPtr item2)
 {
 	CSortingList::const_iterator it = m_sort_orders.begin();
@@ -237,18 +368,14 @@
 	return CmpAny(item1, item2);
 }
 
-
-MuleListCtrlCompare	g_sort_func = NULL;
-CMuleListCtrl*		g_sort_list = NULL;
-
-
-int CMuleListCtrl::SortProc(wxUIntPtr item1, wxUIntPtr item2, long)
+int CMuleListCtrl::SortProc(wxUIntPtr item1, wxUIntPtr item2, long data)
 {
-	const CSortingList& orders = g_sort_list->m_sort_orders;
+	MuleSortData* sortdata = (MuleSortData*) data;
+	const CSortingList& orders = sortdata->m_sort_orders;
 	
 	CSortingList::const_iterator it = orders.begin();
 	for (; it != orders.end(); ++it) {
-		int result = g_sort_func(item1, item2, it->first | it->second);
+		int result = sortdata->m_sort_func(item1, item2, it->first | it->second);
 		if (result != 0) {
 			return result;
 		}
@@ -258,27 +385,68 @@
 	return CmpAny(item1, item2);
 }
 
-
 void CMuleListCtrl::SortList()
 {
-	wxCHECK_RET(g_sort_func == NULL, wxT("Sort-function already set"));
-	wxCHECK_RET(g_sort_list == NULL, wxT("Sort-list already set"));
+	if (!IsSorting() && (m_sort_func && GetColumnCount())) {
+
+		m_isSorting = true;
 	
-	if (m_sort_func && GetColumnCount()) {
+		MuleSortData sortdata(m_sort_orders, m_sort_func);
+
+		// In many cases control already has correct order, and sorting causes nasty flickering.
+		// Make one pass through it to check if sorting is necessary at all.
+		int nrItems = GetItemCount();
+		bool clean = true;
+		long lastItemdata = 0;
+		if (nrItems > 1) {
+			lastItemdata = GetItemData(0);
+		}
+		for (int i = 1; i < nrItems; i++) {
+			long nextItemdata = GetItemData(i);
+			if (SortProc(lastItemdata, nextItemdata, (long int)&sortdata) > 0) {
+				// ok - we need to sort
+				clean = false;
+				break;
+			}
+			lastItemdata = nextItemdata;
+		}
+		if (clean) {
+			// no need to sort
+			m_isSorting = false;
+			return;
+		}
+
 		// Positions are likely to be invalid after sorting.
 		ResetTTS();
 		
-		g_sort_func = m_sort_func;
-		g_sort_list = this;
+		// Store the current selected items
+		ItemDataList selectedItems = GetSelectedItems();
+		// Store the focused item
+		long pos = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED );
+		wxUIntPtr focused = (pos == -1) ? 0 : GetItemData(pos);
 		
-		SortItems(SortProc, 0);
+		SortItems(SortProc, (long int)&sortdata);
+		
+		// Re-select the selected items.
+		for (unsigned i = 0; i < selectedItems.size(); ++i) {
+			long it_pos = FindItem(-1, selectedItems[i]);
+			if (it_pos != -1) {
+				SetItemState(it_pos, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+			}
+		}
+		
+		// Set focus on item if any was focused
+		if (focused) {
+			long it_pos = FindItem(-1, focused);
+			if (it_pos != -1) {
+				SetItemState(it_pos, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+			}
+		}
 
-		g_sort_func = NULL;
-		g_sort_list = NULL;
+		m_isSorting = false;
 	}
 }
 
-
 CMuleListCtrl::ItemDataList CMuleListCtrl::GetSelectedItems() const
 {
 	// Create the initial vector with as many items as are selected
@@ -318,12 +486,18 @@
 
 void CMuleListCtrl::OnMenuSelected( wxCommandEvent& evt )
 {
-	int col = evt.GetId() - MP_LISTCOL_1;
+	unsigned int col = evt.GetId() - MP_LISTCOL_1;
+
+	if (col >= m_column_sizes.size()) {
+		m_column_sizes.resize(col + 1, 0);
+	}
 
 	if (GetColumnWidth(col) > COL_SIZE_MIN) {
+		m_column_sizes[col] = GetColumnWidth(col);
 		SetColumnWidth(col, 0);
 	} else {
-		SetColumnWidth(col, wxLIST_AUTOSIZE);
+		int oldsize = m_column_sizes[col];
+		SetColumnWidth(col, (oldsize > 0) ? oldsize : GetColumnDefaultWidth(col));
 	}	
 }
 
@@ -338,14 +512,6 @@
   		return;
 	}
 
-	// Get the currently focused item
-	long pos = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED );
-	wxUIntPtr item = 0;
-	if (pos != -1) {
-		item = GetItemData(pos);
-	}
-
-
 	unsigned sort_order = 0;
 	if (m_sort_orders.front().first == (unsigned)evt.GetColumn()) {
 		// Same column as before, flip the sort-order
@@ -370,19 +536,11 @@
 				sort_order = it->second;
 				break;
 			}
-		}	
+		}
 	}
 	
-	SetSorting(evt.GetColumn(), sort_order);
 	
-	
-	// Set focus on item if any was focused
-	if (item != 0) {
-		long it_pos = FindItem(-1, item);
-		if (it_pos != -1) {
-			SetItemState(it_pos,wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED | wxLIST_STATE_SELECTED);
-		}
-	}
+	SetSorting(evt.GetColumn(), sort_order);	
 }
 
 
@@ -398,30 +556,6 @@
 }
 
 
-void CMuleListCtrl::SetTableName(const wxString& name)
-{
-	m_name = name;
-}
-
-
-unsigned CMuleListCtrl::GetSortColumn() const
-{
-	return m_sort_orders.front().first;
-}
-
-
-unsigned CMuleListCtrl::GetSortOrder() const
-{
-	return m_sort_orders.front().second;
-}
-
-
-void CMuleListCtrl::SetSortFunc(MuleListCtrlCompare func)
-{
-	m_sort_func = func;
-}
-
-
 bool CMuleListCtrl::AltSortAllowed(unsigned WXUNUSED(column)) const
 {
 	return false;
@@ -488,10 +622,10 @@
 
 void CMuleListCtrl::SetColumnImage(unsigned col, int image)
 {
-    wxListItem item;
-    item.SetMask(wxLIST_MASK_IMAGE);
+	wxListItem item;
+	item.SetMask(wxLIST_MASK_IMAGE);
 	item.SetImage(image);
-    SetColumn(col, item);	
+	SetColumn(col, item);	
 }
 
 
@@ -532,7 +666,7 @@
 
 void CMuleListCtrl::OnChar(wxKeyEvent& evt)
 {
-	wxChar key = evt.GetKeyCode();
+	int key = evt.GetKeyCode();
 	if (key == 0) {
 		// We prefer GetKeyCode() to GetUnicodeKey(), in order to work
 		// around a bug in the GetUnicodeKey(), that causes values to
@@ -543,7 +677,7 @@
 		key = evt.GetUnicodeKey();
 	} else if (key >= WXK_START) {
 		// wxKeycodes are ignored, as they signify events such as the 'home'
-		// button. Unicoded chars are not checke as there is an overlap valid
+		// button. Unicoded chars are not checked as there is an overlap valid
 		// chars and the wx keycodes.
 		evt.Skip();
 		return;
@@ -568,8 +702,8 @@
 	m_tts_text.Append(wxTolower(key));
 
 	// May happen if the subclass does not forward deletion events.
+	// Or rather when single-char-repeated (see below) wraps around, so don't assert.
 	if (m_tts_item >= GetItemCount()) {
-		wxASSERT(0);
 		m_tts_item = -1;
 	}
 	
@@ -615,15 +749,19 @@
 
 void CMuleListCtrl::OnItemSelected(wxListEvent& evt)
 {
-	// We reset the current TTS session if the user manually changes the selection
-	if (m_tts_item != evt.GetIndex()) {
-		ResetTTS();
+	if (IsSorting()) {
+		// Selection/Deselection that happened while sorting.
+		evt.Veto();
+	} else {
+			// We reset the current TTS session if the user manually changes the selection
+		if (m_tts_item != evt.GetIndex()) {
+			ResetTTS();
 
-		// The item is changed so that the next TTS starts from the selected item.
-		m_tts_item = evt.GetIndex();
+			// The item is changed so that the next TTS starts from the selected item.
+			m_tts_item = evt.GetIndex();
+		}
+		evt.Skip();
 	}
-
-	evt.Skip();
 }
 
 
@@ -650,4 +788,9 @@
 	m_tts_item = -1;
 	m_tts_time =  0;
 }
+
+wxString CMuleListCtrl::GetOldColumnOrder() const
+{
+	return wxEmptyString;
+}
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/MuleListCtrl.h -> aMule-2.3.1.tar.bz2/src/MuleListCtrl.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -36,7 +36,6 @@
 #include <vector>
 #include <list>
 
-
 /**
  * Enhanced wxListCtrl provided custom-drawing among other things.
  *
@@ -80,14 +79,14 @@
 	 * @see wxGenericListCtrl::wxGenericListCtrl for documentation of parameters.
 	 */
 	 CMuleListCtrl(
-	            wxWindow *parent,
-                wxWindowID winid = -1,
-                const wxPoint &pos = wxDefaultPosition,
-                const wxSize &size = wxDefaultSize,
-                long style = wxLC_ICON,
-                const wxValidator& validator = wxDefaultValidator,
-                const wxString &name = wxT("mulelistctrl") );
-	
+		       wxWindow *parent,
+		       wxWindowID winid = -1,
+		       const wxPoint &pos = wxDefaultPosition,
+		       const wxSize &size = wxDefaultSize,
+		       long style = wxLC_ICON,
+		       const wxValidator& validator = wxDefaultValidator,
+		       const wxString &name = wxT("mulelistctrl") );
+
 	/**
 	 * Destructor.
 	 *
@@ -96,7 +95,6 @@
 	 */ 
 	virtual ~CMuleListCtrl();
 
-
 	/**
 	 * Saves column settings.
 	 *
@@ -114,7 +112,6 @@
 	 */
 	virtual void LoadSettings();
 
-
 	/**
 	 * This function tries to locate the best place to insert an item.
 	 *
@@ -123,12 +120,11 @@
 	 * This function does a binary type search to locate the best place to
 	 * insert the new item with the specified userdata. It then returns the 
 	 * item after this position. To do this, the sorter-function must be set
-	 * though the SetSortFunc function, otherwise it will just return the 
+	 * through the SetSortFunc function, otherwise it will just return the 
 	 * position after the last item.
 	 */
 	long GetInsertPos( wxUIntPtr data );
 
-
 	/**
 	 * Sorts the list.
 	 *
@@ -138,14 +134,13 @@
 	 */
 	virtual void SortList();
 
-
 	//! The type of the list of item specific data
 	typedef std::vector<wxUIntPtr> ItemDataList;
 
 	/**
 	 * Returns a list the user-data of all selected items.
 	 *
-	 * @return A list of data assosiated with the selected items.
+	 * @return A list of data associated with the selected items.
 	 *
 	 * This function will return the user-data for each selected item in a
 	 * vector, which can then be manipulated with regards to changes made
@@ -153,7 +148,6 @@
 	 */
 	ItemDataList GetSelectedItems() const;	
 
-	
 	/**
 	 * Sets the sorter function.
 	 *
@@ -162,13 +156,75 @@
 	 * See the documentation on wxListCtrl::SortItems for more information
 	 * about the expected function type.
 	 */
-	void SetSortFunc(MuleListCtrlCompare func);
-
+	void SetSortFunc(MuleListCtrlCompare func)	{ m_sort_func = func; }
 
 	/**
 	 * Deselects all selected items, but does not change focus.
 	 */
 	void ClearSelection();
+
+	/**
+	 * Insert a new column.
+	 *
+	 * @param[in] col	Column will be inserted at this position.
+	 * @param[in] heading	Heading text for the column.
+	 * @param[in] format	Format (alignment) of the column.
+	 * @param[in] width	The column width.
+	 * @param[in] name	Internal name of the column.
+	 *
+	 * We override this method to allow a name to be specified for each
+	 * column. The name is used for saving/loading column settings
+	 * independently of their index. It is necessary to set a unique name
+	 * for each column, to let column settings be saved/loaded. If you
+	 * don't set a name for a column, settings for that column won't be
+	 * saved.
+	 *
+	 * Requirements about column names:
+	 * - they must not contain the ':' (colon) and ',' (comma) characters,
+	 * - they should be at least one character long.
+	 *
+	 * @note Changing the internal name of one column results in width of
+	 * that column being reset to default, and if sorting was done by that
+	 * column, sorting being forgotten. If you change the name of a column,
+	 * don't forget to update the list GetOldColumnOrder() returns, if
+	 * necessary.
+	 *
+	 * For more information refer to the wxWidgets documentation of
+	 * wxListCtrl::InsertColumn()
+	 */
+	long InsertColumn(
+			  long col,
+			  const wxString& heading,
+			  int format = wxLIST_FORMAT_LEFT,
+			  int width = -1,
+			  const wxString& name = wxEmptyString
+			  );
+
+	/**
+	 * Clears all items and all columns.
+	 *
+	 * Intercepted to clear column name list.
+	 *
+	 * For more information see the wxWidgets documentation of
+	 * wxListCtrl::ClearAll()
+	 */
+	void ClearAll()
+	{
+		m_column_names.clear();
+		MuleExtern::wxGenericListCtrl::ClearAll();
+	}
+
+	/**
+	 * Delete one column from the list.
+	 *
+	 * Not implemented yet, intercepted here just as a sanity check.
+	 */
+	bool DeleteColumn(int WXUNUSED(col))	{ wxFAIL; return false; }
+
+	/**
+	 * Indicates if we're in the process of sorting.
+	 */
+	bool IsSorting() const { return m_isSorting; }
 	
 protected:
 
@@ -194,7 +250,6 @@
 	 * enabled, this function _must_ be overriden.
 	 */
 	virtual wxString GetTTSText(unsigned item) const;
-	
 
 	/**
 	 * Sets the internally used table-name.
@@ -205,17 +260,34 @@
 	 * make use of the LoadSettings/SaveSettings functions. CMuleListCtrl
 	 * uses the name specified in this command to create unique keynames.
 	 */
-	void SetTableName(const wxString& name);
+	void SetTableName(const wxString& name)		{ m_name = name; }
+
+	/**
+	 * Return old column order.
+	 *
+	 * @return The pre-2.2.2 column order.
+	 *
+	 * This function should be overridden in descendant classes to return a
+	 * comma-separated list of the old column order, when column data was
+	 * saved/loaded by index. The default implementation returns an empty
+	 * string, meaning that old settings (if any) should be discarded.
+	 *
+	 * @note When you add or remove columns from the list control, DO NOT
+	 * change this list. This list may only be updated if you changed a
+	 * column name that is already in this list, to reflect the name
+	 * change. List order also must be preserved.
+	 */
+	virtual wxString GetOldColumnOrder() const;
 
 	/**
 	 * Returns the column which is currently used to sort the list.
 	 */
-	unsigned GetSortColumn() const;
+	unsigned GetSortColumn() const	{ return m_sort_orders.front().first; }
 
 	/**
 	 * Returns the current sorting order, a combination of the DES and ALT flags.
 	 */
-	unsigned GetSortOrder() const;
+	unsigned GetSortOrder() const	{ return m_sort_orders.front().second; }
 
 	/**
 	 * Set the sort column
@@ -226,15 +298,13 @@
 	 * Note that attempting to sort a column in an unsupported order
 	 * is an illegal operation.
 	 */
-	void SetSorting(unsigned column, unsigned order);
+	virtual void SetSorting(unsigned column, unsigned order);
 
 	/**
-	 * Returns true if the item is sorted compared to its neighbohrs.
+	 * Returns true if the item is sorted compared to its neighbours.
 	 */
 	bool IsItemSorted(long item);
 
-	
-	
 	/**
 	 * Check and fix selection state.
 	 * 
@@ -249,28 +319,32 @@
 	long CheckSelection(wxListEvent& event);
 	long CheckSelection(wxMouseEvent& event);
 	//@}
-	
 
 	/**
 	 * Event handler for right-clicks on the column headers.
 	 */
 	void OnColumnRClick(wxListEvent& evt);
+
 	/**
 	 * Event handler for left-clicks on the column headers.
 	 */
 	void OnColumnLClick(wxListEvent& evt);
+
 	/**
 	 * Event handler for the hide/show menu items.
 	 */
 	void OnMenuSelected(wxCommandEvent& evt);
+
 	/**
 	 * Event handler for the mouse wheel.
 	 */
 	void OnMouseWheel(wxMouseEvent &event);
+
 	/**
 	 * Event handler for key-presses, needed by TTS.
 	 */
 	void OnChar(wxKeyEvent& evt);
+
 	/**
 	 * Event handler for item selection/deletion, needed by TTS.
 	 */
@@ -278,13 +352,12 @@
 	void OnItemDeleted(wxListEvent& evt);
 	void OnAllItemsDeleted(wxListEvent& evt);
 
-	
 private:
 	/**
 	 * Resets the current TTS session.
 	 */
 	void ResetTTS();
-	
+
 	/**
 	 * Sets the image of a specific column.
 	 *
@@ -293,19 +366,20 @@
 	 */
 	void SetColumnImage(unsigned col, int image);
 
-	
 	//! The name of the table. Used to load/save settings.
-	wxString			m_name;
+	wxString		m_name;
+
 	//! The sorter function needed by wxListCtrl.
 	MuleListCtrlCompare	m_sort_func;
 
 	//! Contains the current search string.
-	wxString			m_tts_text;
+	wxString		m_tts_text;
+
 	//! Timestamp for the last TTS event.
-	unsigned			m_tts_time;
-	//! The index of the last item selected via TTS.
-	int					m_tts_item;
+	unsigned		m_tts_time;
 
+	//! The index of the last item selected via TTS.
+	int			m_tts_item;
 
 	/**
 	 * Wrapper around the user-provided sorter function.
@@ -321,19 +395,96 @@
 
 	/** Compares two items in the list, using the current sort sequence. */
 	int CompareItems(wxUIntPtr item1, wxUIntPtr item2);
-	
-	
+
 	//! This pair contains a column number and its sorting order.
 	typedef std::pair<unsigned, unsigned> CColPair;
 	typedef std::list<CColPair> CSortingList;
+
+	class MuleSortData {
+	public:
+		MuleSortData(CSortingList sort_orders, MuleListCtrlCompare sort_func) : m_sort_orders(sort_orders), m_sort_func(sort_func) { };
+		
+		CSortingList m_sort_orders;
+		MuleListCtrlCompare m_sort_func;
+	};	
 	
 	//! This list contains in order the columns sequence to sort by.
 	CSortingList m_sort_orders;
+
+	/**
+	 * Get the column name by index.
+	 *
+	 * @param[in] column Index of the column whose name we're looking for.
+	 *
+	 * @return The column name or an empty string if index is invalid
+	 * (out of range), or the column name hasn't been set.
+	 */
+	const wxString& GetColumnName(int column) const;
+
+	/**
+	 * Get the column default width by index.
+	 *
+	 * @param[in] column Index of the column whose name we're looking for.
+	 *
+	 * @return The column default width or wx default width if index is invalid
+	 * (out of range), or the column name hasn't been set.
+	 */
+	int GetColumnDefaultWidth(int column) const;
+
+	/**
+	 * Get column index by name.
+	 *
+	 * @param[in] name Internal name of the colunm whose index is needed.
+	 *
+	 * @return The column index, or -1 in case the name was invalid.
+	 */
+	int GetColumnIndex(const wxString& name) const;
+
+	/**
+	 * Find out the new index of the column by the old index.
+	 *
+	 * @param[in] oldindex Old column index which we want to turn into a
+	 * new index.
+	 *
+	 * @return The new index of the column, or -1 if an error occured.
+	 */
+	int GetNewColumnIndex(int oldindex) const;
+
+	/**
+	 * Parses old config entries.
+	 *
+	 * @param[in] sortOrders	Old sort orders line.
+	 * @param[in] columnWidths	Old column widths line.
+	 */
+	void ParseOldConfigEntries(const wxString& sortOrders, const wxString& columnWidths);
+
+	/// This class contains a column index, its default width and its name.
+	class ColNameEntry {
+	public:
+		int index;
+		int	defaultWidth;
+		wxString name;
+		ColNameEntry(int _index, int _defaultWidth, const wxString& _name) 
+			:	index(_index), defaultWidth(_defaultWidth), name(_name) {}
+	};
+
+	/// This list contains the columns' names.
+	typedef std::list<ColNameEntry>		ColNameList;
+
+	/// Container for column names, sorted by column index.
+	ColNameList	m_column_names;
+
+	/// This vector contains a cache of the columns' sizes.
+	typedef std::vector<int>		ColSizeVector;
 	
+	/// Container for column sizes cache.
+	ColSizeVector	m_column_sizes;
+
+	// True while sorting.
+	bool m_isSorting;
 	
 	DECLARE_EVENT_TABLE()
 };
 
-
 #endif // MULELISTCTRL_H
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/MuleNotebook.cpp -> aMule-2.3.1.tar.bz2/src/MuleNotebook.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal Veiga (kry@users.sourceforge.net)
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-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
@@ -82,7 +82,13 @@
 	// is identical with deleted page (wx sends a page change event during deletion, 
 	// but the control is still the one to be deleted at that moment).
 	if (GetPageCount()) {
-		wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, GetId(), nPage );
+		// Select the tab that took the place of the one we just deleted.
+		size_t page = nPage;
+		// Except if we deleted the last one - then select the one that is last now.
+		if (page == GetPageCount()) {
+			page--;
+		}
+		wxNotebookEvent event( wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED, GetId(), page );
 		event.SetEventObject(this);
 		ProcessEvent( event );
 	} else {
@@ -156,7 +162,7 @@
 		evt.m_x = point.x;
 		evt.m_y = point.y;
 			
-		m_popup_widget->AddPendingEvent( evt );
+		m_popup_widget->GetEventHandler()->AddPendingEvent( evt );
 	} else {
 		wxMenu menu(_("Close"));
 		menu.Append(MP_CLOSE_TAB, wxString(_("Close tab")));

aMule-2.2.6.tar.bz2/src/MuleNotebook.h -> aMule-2.3.1.tar.bz2/src/MuleNotebook.h Changed

aMule-2.2.6.tar.bz2/src/MuleTextCtrl.cpp -> aMule-2.3.1.tar.bz2/src/MuleTextCtrl.cpp Changed

aMule-2.2.6.tar.bz2/src/MuleTextCtrl.h -> aMule-2.3.1.tar.bz2/src/MuleTextCtrl.h Changed

aMule-2.2.6.tar.bz2/src/MuleThread.h -> aMule-2.3.1.tar.bz2/src/MuleThread.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-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
@@ -32,7 +32,9 @@
 {
 public:
 	//! @see wxThread::wxThread
-	CMuleThread(wxThreadKind kind = wxTHREAD_DETACHED);
+	CMuleThread(wxThreadKind kind = wxTHREAD_DETACHED)
+		: wxThread(kind),
+		m_stop(false) {}
 
 	/**
 	 * Stops the thread.
@@ -45,44 +47,27 @@
 	 *
 	 * @see wxThread::Delete
 	 */
-	void Stop();
+	void Stop()
+	{
+		m_stop = true;
+		if (IsDetached()) {
+			Delete();
+		} else {
+			Wait();
+		}
+	}
 
 	//! Returns true if Delete or Stop has been called.
-	virtual bool TestDestroy();
+	virtual bool TestDestroy()
+	{
+		// m_stop is checked last, because some functionality is
+		// dependant upon wxThread::TestDestroy() being called,
+		// for instance Pause().
+		return wxThread::TestDestroy() || m_stop;
+	}
 private:
 	//! Is set if Stop is called.
 	bool	m_stop;
 };
 
-
-
-////////////////////////////////////////////////////////////
-// Implementations
-
-inline CMuleThread::CMuleThread(wxThreadKind kind)
-	: wxThread(kind)
-	, m_stop(false)
-{
-}
-
-
-inline void CMuleThread::Stop()
-{
-	m_stop = true;
-	if (IsDetached()) {
-		Delete();
-	} else {
-		Wait();
-	}
-}
-
-
-inline bool CMuleThread::TestDestroy()
-{
-	// m_stop is checked last, because some functionality is
-	// dependant upon wxThread::TestDestroy() being called,
-	// for instance Pause().
-	return wxThread::TestDestroy() || m_stop;
-}
-
 #endif

aMule-2.2.6.tar.bz2/src/MuleTrayIcon.cpp -> aMule-2.3.1.tar.bz2/src/MuleTrayIcon.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2003-2009 Patrizio Bassi (Hetfield) ( hetfield@amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2003-2011 Patrizio Bassi ( hetfield@amule.org )
+// 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
@@ -38,38 +38,15 @@
 #include <wx/menu.h>
 
 #include "amule.h" 			// Needed for theApp
-#include "amuleDlg.h" 			// Needed for IsShown
-#include "Preferences.h"		// Needed for thePrefs
-#include "ServerConnect.h"		// Needed for CServerConnect
+#include "amuleDlg.h" 		// Needed for IsShown
+#include "Preferences.h"	// Needed for thePrefs
+#include "ServerConnect.h"	// Needed for CServerConnect
 #include "Server.h"			// Needed for CServer
-#include "StatisticsDlg.h"		// Needed for CStatisticsDlg::getColors()
-#include "Statistics.h"			// Needed for theStats
-#include <common/Format.h>			// Needed for CFormat
-
-
-// Pop-up menu clickable entries
-enum {
-	TRAY_MENU_INFO = 0,
-	TRAY_MENU_CLIENTINFO=0,
-	TRAY_MENU_CLIENTINFO_ITEM = 13007,
-	TRAY_MENU_DISCONNECT,
-	TRAY_MENU_CONNECT,
-	TRAY_MENU_HIDE,
-	TRAY_MENU_SHOW,
-	TRAY_MENU_EXIT,
-	UPLOAD_ITEM1=12340,
-	UPLOAD_ITEM2=12341,
-	UPLOAD_ITEM3=12342,
-	UPLOAD_ITEM4=12343,
-	UPLOAD_ITEM5=12344,
-	UPLOAD_ITEM6=12345,
-	DOWNLOAD_ITEM1=54320,
-	DOWNLOAD_ITEM2=54321,
-	DOWNLOAD_ITEM3=54322,
-	DOWNLOAD_ITEM4=54323,
-	DOWNLOAD_ITEM5=54324,
-	DOWNLOAD_ITEM6=54325
-};
+#include "StatisticsDlg.h"	// Needed for CStatisticsDlg::getColors()
+#include "Statistics.h"		// Needed for theStats
+#include <common/Format.h>	// Needed for CFormat
+#include "Logger.h"
+#include <common/MenuIDs.h>	// Needed to access menu item constants
 
 /****************************************************/
 /******************* Event Table ********************/
@@ -102,7 +79,7 @@
 
 long GetSpeedFromString(wxString label){
 	long temp;
-	label.Replace(wxT("kB/s"),wxT(""),TRUE);
+	label.Replace(_("kB/s"),wxT(""),TRUE);
 	label.Trim(FALSE);
 	label.Trim(TRUE);
 	label.ToLong(&temp);
@@ -118,11 +95,11 @@
 			wxMenuItem* item=menu->FindItem(event.GetId());
 			if (item!=NULL) {
 				long temp;
-				if (item->GetLabel()==(_("Unlimited"))) {
+				if (item->GetItemLabelText()==(_("Unlimited"))) {
 					temp=UNLIMITED;
 				}
 				else {
-					temp=GetSpeedFromString(item->GetLabel());
+					temp=GetSpeedFromString(item->GetItemLabelText());
 				}
 				thePrefs::SetMaxUpload(temp);
 
@@ -144,11 +121,11 @@
 			wxMenuItem* item=menu->FindItem(event.GetId());
 			if (item!=NULL) {
 				long temp;
-				if (item->GetLabel()==(_("Unlimited"))) {
+				if (item->GetItemLabelText()==(_("Unlimited"))) {
 					temp=UNLIMITED;
 				}
 				else {
-					temp=GetSpeedFromString(item->GetLabel());
+					temp=GetSpeedFromString(item->GetItemLabelText());
 				}
 				thePrefs::SetMaxDownload(temp);
 
@@ -187,6 +164,7 @@
 {
 	Old_Icon = -1;
 	Old_SpeedSize = 0xFFFF; // must be > any possible one.
+
 	// Create the background icons (speed improvement)
 	HighId_Icon_size = wxIcon(mule_TrayIcon_big_ico_xpm).GetHeight();
 	LowId_Icon_size = wxIcon(mule_Tr_yellow_big_ico_xpm).GetHeight();
@@ -195,16 +173,6 @@
 
 CMuleTrayIcon::~CMuleTrayIcon() 
 {
-#ifdef __WXGTK__
-	// FIXME: EVIL HACK: We need to ensure that the superclass doesn't
-	// try to destroy a dangling pointer. See also CMuleTrayIcon::UpdateTray
-	// for comments on this issue.
-	if (m_iconWnd) {
-		if (wxTopLevelWindows.IndexOf((wxWindow*)m_iconWnd) == wxNOT_FOUND) {
-			m_iconWnd = NULL;
-		}
-	}
-#endif
 }
 
 /****************************************************/
@@ -227,7 +195,7 @@
 			Bar_ySize = Disconnected_Icon_size; 
 			break;
 		default:
-			wxASSERT(0);
+			wxFAIL;
 	}
 
 	// Lookup this values for speed improvement: don't draw if not needed
@@ -249,7 +217,7 @@
 					CurrentIcon = wxIcon(mule_Tr_grey_big_ico_xpm);
 					break;
 				default:
-					wxASSERT(0);
+					wxFAIL;
 			}
 		}
 
@@ -273,9 +241,7 @@
 		int Bar_xSize = 4; 
 		int Bar_xPos = CurrentIcon.GetWidth() - 5; 
 		
-		wxColour col= WxColourFromCr( CStatisticsDlg::getColors(11) );
-		wxBrush	brush(col);
-		IconWithSpeed.SetBrush(brush);
+		IconWithSpeed.SetBrush(*(wxTheBrushList->FindOrCreateBrush(CStatisticsDlg::getColors(11))));
 		IconWithSpeed.SetPen(*wxTRANSPARENT_PEN);
 		
 		IconWithSpeed.DrawRectangle(Bar_xPos + 1, Bar_ySize - NewSize, Bar_xSize -2 , NewSize);
@@ -307,27 +273,11 @@
 
 void CMuleTrayIcon::UpdateTray()
 {
-#ifdef __WXGTK__
-	// FIXME: EVIL HACK: As of wxGTK-2.8.7, closing of the trayicon
-	// window (caused for instance by a crashing kicker) is not
-	// handled, with the result that the pointer to the trayicon
-	// window becomes a dangling pointer. Since we have access to
-	// the pointer, and it's created as a top-level window, it's
-	// relatively easy to force the recreation of a valid window.
-	// Ugly as hell though ....
-	//
-	// This has been repported as bug #1872724:
-	// http://sourceforge.net/tracker/index.php?func=detail&aid=1872724&group_id=9863&atid=109863
-	if (m_iconWnd) {
-		if (wxTopLevelWindows.IndexOf((wxWindow*)m_iconWnd) == wxNOT_FOUND) {
-			printf("Traybar-icon lost, trying to recreate ...\n");
-			m_iconWnd = NULL;
-		}
-	}
-#endif
-
 	// Icon update and Tip update
-	if (IsOk()) {
+#ifndef __WXCOCOA__
+	if (IsOk()) 
+#endif
+	{
 		SetIcon(CurrentIcon, CurrentTip);
 	}	
 }
@@ -351,7 +301,7 @@
 		label += _("UL: None");
 	}
 	else { 
-		label += wxString::Format(_("UL: %u"), max_upload);
+		label += CFormat(_("UL: %u")) % max_upload;
 	}
 	label += wxT(", ");
 
@@ -361,13 +311,13 @@
 		label += _("DL: None");
 	}
 	else {
-		label += wxString::Format(_("DL: %u"), max_download);
+		label += CFormat(_("DL: %u")) % max_download;
 	}
 
 	traymenu->Append(TRAY_MENU_INFO, label);
-	label = wxString::Format(_("Download speed: %.1f"), theStats::GetDownloadRate() / 1024.0);
+	label = CFormat(_("Download speed: %.1f")) % (theStats::GetDownloadRate() / 1024.0);
 	traymenu->Append(TRAY_MENU_INFO, label);
-	label = wxString::Format(_("Upload speed: %.1f"), theStats::GetUploadRate() / 1024.0);
+	label = CFormat(_("Upload speed: %.1f")) % (theStats::GetUploadRate() / 1024.0);
 	traymenu->Append(TRAY_MENU_INFO, label);
 	traymenu->AppendSeparator();
 
@@ -387,8 +337,7 @@
 		wxString temp = _("ClientID: ");
 		
 		if (theApp->IsConnectedED2K()) {
-			unsigned long id = theApp->GetED2KID();
-			temp += wxString::Format(wxT("%lu"), id);
+			temp += CFormat(wxT("%u")) % theApp->GetED2KID();
 		} else {
 			temp += _("Not connected");
 		}
@@ -472,14 +421,14 @@
 	
 	// Total Downloaded
 	{
-		wxString temp = CastItoXBytes( theStats::GetSessionReceivedBytes() + thePrefs::GetTotalDownloaded() );
+		wxString temp = CastItoXBytes(theStats::GetTotalReceivedBytes());
 		temp = CFormat(_("Total DL: %s")) % temp;
 		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
 	}
 	
 	// Total Uploaded
 	{
-		wxString temp = CastItoXBytes( theStats::GetSessionSentBytes() + thePrefs::GetTotalUploaded() );
+		wxString temp = CastItoXBytes(theStats::GetTotalSentBytes());
 		temp = CFormat(_("Total UL: %s")) % temp;
 		ClientInfoMenu->Append(TRAY_MENU_CLIENTINFO_ITEM,temp);
 	}
@@ -512,7 +461,7 @@
 			
 		for ( int i = 0; i < 5; i++ ) {
 			unsigned int tempspeed = (unsigned int)((double)max_ul_speed / 5) * (5 - i);
-			wxString temp = wxString::Format(wxT("%u kB/s"), tempspeed);
+			wxString temp = CFormat(wxT("%u %s")) % tempspeed % _("kB/s");
 			UploadSpeedMenu->Append((int)UPLOAD_ITEM1+i+1,temp);
 		}
 	}
@@ -533,7 +482,7 @@
 	
 		for ( int i = 0; i < 5; i++ ) {
 			unsigned int tempspeed = (unsigned int)((double)max_dl_speed / 5) * (5 - i);
-			wxString temp = wxString::Format(wxT("%d kB/s"), tempspeed);
+			wxString temp = CFormat(wxT("%d %s")) % tempspeed % _("kB/s");
 			DownloadSpeedMenu->Append((int)DOWNLOAD_ITEM1+i+1,temp);
 		}
 	}

aMule-2.2.6.tar.bz2/src/MuleTrayIcon.h -> aMule-2.3.1.tar.bz2/src/MuleTrayIcon.h Changed

aMule-2.2.6.tar.bz2/src/MuleUDPSocket.cpp -> aMule-2.3.1.tar.bz2/src/MuleUDPSocket.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (C) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-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
@@ -29,13 +29,12 @@
 
 #include <protocol/ed2k/Constants.h>
 
-#include "Logger.h"                     // Needed for AddDebugLogLineM
 #include "amule.h"                      // Needed for theApp
 #include "GetTickCount.h"               // Needed for GetTickCount()
 #include "Packet.h"                     // Needed for CPacket
 #include <common/StringFunctions.h>     // Needed for unicode2char
 #include "Proxy.h"                      // Needed for CDatagramSocketProxy
-#include "Logger.h"                     // Needed for AddDebugLogLineM
+#include "Logger.h"                     // Needed for AddDebugLogLine{C,N}
 #include "UploadBandwidthThrottler.h"
 #include "EncryptedDatagramSocket.h"
 #include "OtherFunctions.h"
@@ -75,10 +74,10 @@
 	m_socket->Notify(true);
 
 	if (!m_socket->Ok()) {
-		AddDebugLogLineM(true, logMuleUDP, wxT("Failed to create valid ") + m_name);
+		AddDebugLogLineC(logMuleUDP, wxT("Failed to create valid ") + m_name);
 		DestroySocket();
 	} else {
-		AddLogLineM(false, wxString(wxT("Created ")) << m_name << wxT(" at port ") << m_addr.Service());
+		AddLogLineN(wxString(wxT("Created ")) << m_name << wxT(" at port ") << m_addr.Service());
 	}
 }
 
@@ -86,7 +85,7 @@
 void CMuleUDPSocket::DestroySocket()
 {
 	if (m_socket) {
-		AddDebugLogLineM(false, logMuleUDP, wxT("Shutting down ") + m_name);
+		AddDebugLogLineN(logMuleUDP, wxT("Shutting down ") + m_name);
 		m_socket->SetNotify(0);
 		m_socket->Notify(false);
 		m_socket->Close();
@@ -135,9 +134,8 @@
 
 void CMuleUDPSocket::OnReceive(int errorCode)
 {
-	AddDebugLogLineM(false, logMuleUDP, wxString::Format(
-		wxT("Got UDP callback for read: Error %i Socket state %i"),
-		errorCode, Ok() ? 1 : 0));
+	AddDebugLogLineN(logMuleUDP, CFormat(wxT("Got UDP callback for read: Error %i Socket state %i"))
+		% errorCode % Ok());
 	
 	char buffer[UDP_BUFFER_SIZE];
 	wxIPV4address addr;
@@ -167,18 +165,17 @@
 		OnReceiveError(lastError, ip, port);
 	} else if (length < 2) {
 		// 2 bytes (protocol and opcode) is the smallets possible packet.
-		AddDebugLogLineM(false, logMuleUDP, m_name + wxT(": Invalid Packet received"));
+		AddDebugLogLineN(logMuleUDP, m_name + wxT(": Invalid Packet received"));
 	} else if (!ip) {
-		// wxASSERT(0);
-		printf("Unknown ip receiving on UDP packet! Ignoring: '%s'\n",
-			(const char*)unicode2char(addr.IPAddress()));
+		// wxFAIL;
+		AddLogLineNS(wxT("Unknown ip receiving a UDP packet! Ignoring: '") + addr.IPAddress() + wxT("'"));
 	} else if (!port) {
-		// wxASSERT(0);
-		printf("Unknown port receiving an UDP packet! Ignoring\n");
+		// wxFAIL;
+		AddLogLineNS(wxT("Unknown port receiving a UDP packet! Ignoring"));
 	} else if (theApp->clientlist->IsBannedClient(ip)) {
-		AddDebugLogLineM(false, logMuleUDP, m_name + wxT(": Dropped packet from banned IP ") + addr.IPAddress());
+		AddDebugLogLineN(logMuleUDP, m_name + wxT(": Dropped packet from banned IP ") + addr.IPAddress());
 	} else {
-		AddDebugLogLineM(false, logMuleUDP, (m_name + wxT(": Packet received (")) 
+		AddDebugLogLineN(logMuleUDP, (m_name + wxT(": Packet received ("))
 			<< addr.IPAddress() << wxT(":") << port << wxT("): ")
 			<< length << wxT("b"));
 		OnPacketReceived(ip, port, (byte*)buffer, length);
@@ -186,9 +183,9 @@
 }
 
 
-void CMuleUDPSocket::OnReceiveError(int errorCode, uint32 WXUNUSED(ip), uint16 WXUNUSED(port))
+void CMuleUDPSocket::OnReceiveError(int DEBUG_ONLY(errorCode), uint32 WXUNUSED(ip), uint16 WXUNUSED(port))
 {
-	AddDebugLogLineM(false, logMuleUDP, (m_name + wxT(": Error while reading: ")) << errorCode);	
+	AddDebugLogLineN(logMuleUDP, (m_name + wxT(": Error while reading: ")) << errorCode);
 }
 
 
@@ -202,7 +199,7 @@
 	 * This has been reported as patch #1885472:
 	 * http://sourceforge.net/tracker/index.php?func=detail&aid=1885472&group_id=9863&atid=309863
 	 */
-	AddDebugLogLineM(true, logMuleUDP, m_name + wxT("Socket died, recreating."));
+	AddDebugLogLineC(logMuleUDP, m_name + wxT("Socket died, recreating."));
 	DestroySocket();
 	CreateSocket();
 }
@@ -220,17 +217,15 @@
 	}
 	
 	if (!Ok()) {
-		AddDebugLogLineM(false, logMuleUDP, (m_name + wxT(": Packet discarded (socket not Ok): ")) 
-			<< Uint32toStringIP(IP) << wxT(":") << port << wxT(" ") << packet->GetPacketSize()
-			<< wxT("b"));
+		AddDebugLogLineN(logMuleUDP, (m_name + wxT(": Packet discarded, socket not Ok ("))
+			<< Uint32_16toStringIP_Port(IP, port) << wxT("): ") << packet->GetPacketSize() << wxT("b"));
 		delete packet;
 
 		return;
 	}
 	
-	AddDebugLogLineM(false, logMuleUDP, (m_name + wxT(": Packet queued: ")) 
-		<< Uint32toStringIP(IP) << wxT(":") << port << wxT(" ") 
-		<< packet->GetPacketSize() << wxT("b"));
+	AddDebugLogLineN(logMuleUDP, (m_name + wxT(": Packet queued ("))
+		<< Uint32_16toStringIP_Port(IP, port) << wxT("): ") << packet->GetPacketSize() << wxT("b"));
 	
 	UDPPack newpending;
 	newpending.IP = IP;
@@ -331,13 +326,14 @@
 		} else {
 			// An error which we can't handle happended, so we drop 
 			// the packet rather than risk entering an infinite loop.
-			printf("WARNING! %s discarded packet due to errors (%i) while sending.\n",
-				(const char*)unicode2char(m_name), error);
+			AddLogLineN((wxT("WARNING! ") + m_name + wxT(": Packet to ")) 
+				<< Uint32_16toStringIP_Port(ip, port)
+				<< wxT(" discarded due to error (") << error << wxT(") while sending."));
 			sent = true;
 		}
 	} else {
-		AddDebugLogLineM(false, logMuleUDP, (m_name + wxT(": Packet sent to ")) 
-			<< ip << wxT(":") << port << wxT(": ")
+		AddDebugLogLineN(logMuleUDP, (m_name + wxT(": Packet sent ("))
+			<< Uint32_16toStringIP_Port(ip, port) << wxT("): ")
 			<< length << wxT("b"));
 		sent = true;
 	}

aMule-2.2.6.tar.bz2/src/MuleUDPSocket.h -> aMule-2.3.1.tar.bz2/src/MuleUDPSocket.h Changed

aMule-2.2.6.tar.bz2/src/NetworkFunctions.cpp -> aMule-2.3.1.tar.bz2/src/NetworkFunctions.cpp Changed

aMule-2.2.6.tar.bz2/src/NetworkFunctions.h -> aMule-2.3.1.tar.bz2/src/NetworkFunctions.h Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal Veiga - Kry (kry@amule.org)
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -28,21 +28,32 @@
 #define NETWORK_FUNCTIONS_H
 
 #include "Types.h"		// Needed for uint16 and uint32
+#include <common/Format.h>	// Needed for CFormat
 #include <wx/socket.h>
 
 // Network ip/host handling functions
-// These functions takes IPs in anti-host order and IPs in anti-host order
+// These functions take IPs in anti-host order
 
 inline wxString Uint32toStringIP(uint32 ip)
 {
-	return wxString::Format(wxT("%u.%u.%u.%u"),(uint8)ip,(uint8)(ip>>8),(uint8)(ip>>16),(uint8)(ip>>24));	
+	return CFormat(wxT("%u.%u.%u.%u")) % (uint8)ip % (uint8)(ip>>8) % (uint8)(ip>>16) % (uint8)(ip>>24);
 }
 
 inline wxString Uint32_16toStringIP_Port(uint32 ip, uint16 port)
 {
-	return wxString::Format(wxT("%u.%u.%u.%u:%u"),(uint8)ip,(uint8)(ip>>8),(uint8)(ip>>16),(uint8)(ip>>24),port);	
+	return CFormat(wxT("%u.%u.%u.%u:%u")) % (uint8)ip % (uint8)(ip>>8) % (uint8)(ip>>16) % (uint8)(ip>>24) % port;	
 }
 
+// These functions take IPs in host-order
+inline wxString KadIPToString(uint32_t ip)
+{
+	return CFormat(wxT("%u.%u.%u.%u")) % (uint8_t)(ip >> 24) % (uint8_t)(ip >> 16) % (uint8_t)(ip >> 8) % (uint8_t)ip;
+}
+
+inline wxString KadIPPortToString(uint32_t ip, uint16_t port)
+{
+	return CFormat(wxT("%u.%u.%u.%u:%u")) % (uint8_t)(ip >> 24) % (uint8_t)(ip >> 16) % (uint8_t)(ip >> 8) % (uint8_t)ip % port;
+}
 
 /**
  * Parses a String-IP and saves the IP in the referenced variable.

aMule-2.2.6.tar.bz2/src/OScopeCtrl.cpp -> aMule-2.3.1.tar.bz2/src/OScopeCtrl.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -35,30 +35,29 @@
 #include "Logger.h"		// Needed for AddLogLineM
 #include "OScopeCtrl.h"		// Interface declarations
 #include "OtherFunctions.h"	// Needed for CastSecondsToHM
+#include "Statistics.h"
 
 
 BEGIN_EVENT_TABLE(COScopeCtrl,wxControl)
 	EVT_PAINT(COScopeCtrl::OnPaint)
 	EVT_SIZE(COScopeCtrl::OnSize)
-	EVT_TIMER(TIMER_OSCOPE,COScopeCtrl::OnTimer)
 END_EVENT_TABLE()
 
 
-const COLORREF crPreset [ 16 ] = {
-	RGB( 0xFF, 0x00, 0x00 ),  RGB( 0xFF, 0xC0, 0xC0 ),  
-	RGB( 0xFF, 0xFF, 0x00 ),  RGB( 0xFF, 0xA0, 0x00 ),  
-	RGB( 0xA0, 0x60, 0x00 ),  RGB( 0x00, 0xFF, 0x00 ),
-	RGB( 0x00, 0xA0, 0x00 ),  RGB( 0x00, 0x00, 0xFF ),
-	RGB( 0x00, 0xA0, 0xFF ),  RGB( 0x00, 0xFF, 0xFF ),
-	RGB( 0x00, 0xA0, 0xA0 ),  RGB( 0xC0, 0xC0, 0xFF ),
-	RGB( 0xFF, 0x00, 0xFF ),  RGB( 0xA0, 0x00, 0xA0 ),
-	RGB( 0xFF, 0xFF, 0xFF ),  RGB( 0x80, 0x80, 0x80 )
+const wxColour crPreset [ 16 ] = {
+	wxColour( 0xFF, 0x00, 0x00 ),  wxColour( 0xFF, 0xC0, 0xC0 ),  
+	wxColour( 0xFF, 0xFF, 0x00 ),  wxColour( 0xFF, 0xA0, 0x00 ),  
+	wxColour( 0xA0, 0x60, 0x00 ),  wxColour( 0x00, 0xFF, 0x00 ),
+	wxColour( 0x00, 0xA0, 0x00 ),  wxColour( 0x00, 0x00, 0xFF ),
+	wxColour( 0x00, 0xA0, 0xFF ),  wxColour( 0x00, 0xFF, 0xFF ),
+	wxColour( 0x00, 0xA0, 0xA0 ),  wxColour( 0xC0, 0xC0, 0xFF ),
+	wxColour( 0xFF, 0x00, 0xFF ),  wxColour( 0xA0, 0x00, 0xA0 ),
+	wxColour( 0xFF, 0xFF, 0xFF ),  wxColour( 0x80, 0x80, 0x80 )
 };
 
-
 COScopeCtrl::COScopeCtrl(int cntTrends, int nDecimals, StatsGraphType type, wxWindow* parent)
 	: wxControl(parent, -1, wxDefaultPosition, wxDefaultSize)
-	, timerRedraw(this, TIMER_OSCOPE)
+	, timerRedraw(this)
 {
 	// since plotting is based on a LineTo for each new point
 	// we need a starting point (i.e. a "previous" point)
@@ -74,12 +73,13 @@
 
 	PlotData_t* ppds = pdsTrends;
 	for(unsigned i=0; i<nTrends; ++i, ++ppds){
-		ppds->crPlot = (i<15 ? crPreset[i] : RGB(255, 255, 255)); 
-		ppds->penPlot=*(wxThePenList->FindOrCreatePen(WxColourFromCr(ppds->crPlot), 1, wxSOLID));
+		ppds->crPlot = (i<15 ? crPreset[i] : *wxWHITE); 
+		ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxSOLID));
 		ppds->fPrev = ppds->fLowerLimit = ppds->fUpperLimit = 0.0;
 	}
 
-	bRecreateGraph = bRecreateGrid = bStopped = false;
+	bRecreateGraph = bRecreateGrid = bRecreateAll = bStopped = false;
+	m_onPaint = false;
 	nDelayedPoints = 0;
 	sLastTimestamp = 0.0;
 	sLastPeriod = 1.0;
@@ -87,7 +87,7 @@
 	nYDecimals = nDecimals;
 	m_bgColour  = wxColour(  0,   0,   0) ;  // see also SetBackgroundColor
 	m_gridColour  = wxColour(  0, 255, 255) ;  // see also SetGridColor
-	brushBack=*(wxTheBrushList->FindOrCreateBrush(m_bgColour, wxSOLID));
+	brushBack = *wxBLACK_BRUSH;
 
 	strXUnits = wxT("X");  // can also be set with SetXUnits
 	strYUnits = wxT("Y");  // can also be set with SetYUnits
@@ -96,7 +96,12 @@
 	nYGrids = 5;
 	
 	graph_type = type;
-	
+
+	// Connect the timer (dynamically, so the Controls don't have to share a common timer id)
+	Connect(timerRedraw.GetId(), wxEVT_TIMER, (wxObjectEventFunction) &COScopeCtrl::OnTimer);
+	// Don't draw background (avoid ugly flickering on wxMSW on resize)
+	SetBackgroundStyle(wxBG_STYLE_CUSTOM);
+
 	// Ensure that various size-constraints are calculated (via OnSize).
 	SetClientSize(GetClientSize());
 }
@@ -143,38 +148,38 @@
 }
 
 
-void COScopeCtrl::SetGridColor(COLORREF cr)
+void COScopeCtrl::SetGridColor(const wxColour& cr)
 {
-	wxColour newCol = WxColourFromCr(cr);
-	if (newCol == m_gridColour) {
+
+	if (cr == m_gridColour) {
 		return;
 	}
 	
-	m_gridColour = newCol;
+	m_gridColour = cr;
 	InvalidateGrid() ;
 }
 
 
-void COScopeCtrl::SetPlotColor(COLORREF cr, unsigned iTrend)
+void COScopeCtrl::SetPlotColor(const wxColour& cr, unsigned iTrend)
 {
 	PlotData_t* ppds = pdsTrends+iTrend;
 	if (ppds->crPlot == cr)
 		return;
 	ppds->crPlot = cr;
-	ppds->penPlot=*(wxThePenList->FindOrCreatePen(WxColourFromCr(ppds->crPlot), 1, wxSOLID));
+	ppds->penPlot=*(wxThePenList->FindOrCreatePen(ppds->crPlot, 1, wxSOLID));
 	InvalidateGraph();
 }
 
 
-void COScopeCtrl::SetBackgroundColor(COLORREF cr)
+void COScopeCtrl::SetBackgroundColor(const wxColour& cr)
 {
-	wxColour newCol(WxColourFromCr(cr));
-	if (m_bgColour == newCol) {
+
+	if (m_bgColour == cr) {
 		return;
 	}
 
-	m_bgColour = newCol;
-	brushBack= *(wxTheBrushList->FindOrCreateBrush(newCol, wxSOLID));
+	m_bgColour = cr;
+	brushBack= *(wxTheBrushList->FindOrCreateBrush(cr, wxSOLID));
 	InvalidateCtrl() ;
 }
 
@@ -192,7 +197,7 @@
 	wxMemoryDC dcGrid(m_bmapGrid);
 
 	int nCharacters ;
-	wxPen solidPen=*(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxSOLID));
+	wxPen solidPen = *(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxSOLID));
 	wxString strTemp;
 
 	// fill the grid background
@@ -285,17 +290,21 @@
 
 void COScopeCtrl::OnPaint(wxPaintEvent& WXUNUSED(evt))
 {
+	m_onPaint = true;
+
 	// no real plotting work is performed here unless we are coming out of a hidden state;
 	// normally, just putting the existing bitmaps on the client to avoid flicker, 
 	// establish a memory dc and then BitBlt it to the client
-	if (bRecreateGrid || bRecreateGraph) {
-		timerRedraw.Stop();
-		
-		if (bRecreateGrid) {
-			RecreateGrid();  // this will also recreate the graph if that flag is set
-		} else if (bRecreateGraph) {
-			RecreateGraph(true);
-		}
+	wxBufferedPaintDC dc(this);
+
+	if (bRecreateAll) {
+		return;
+	}
+
+	if (bRecreateGrid) {
+		RecreateGrid();  // this will also recreate the graph if that flag is set
+	} else if (bRecreateGraph) {
+		RecreateGraph(true);
 	}
 	
 	if (nDelayedPoints) {				// we've just come out of hiding, so catch up
@@ -304,8 +313,6 @@
 		PlotHistory(n, true, false);	// background because the bitmap is shifted only 
 	}									// once for all delayed points together)
 	
-	wxBufferedPaintDC dc(this);
-
 	// We have assured that we have a valid and resized if needed 
 	// wxDc and bitmap. Proceed to blit.
 	dc.DrawBitmap(m_bmapGrid, 0, 0, false);
@@ -317,9 +324,8 @@
 	// This is done last because wxMAC does't support the wxOR logical
 	// operation, preventing us from simply blitting the plot on top of
 	// the grid bitmap.
-	wxColour col(m_gridColour);
-	wxPen grPen(col, 1, wxLONG_DASH);
-	dc.SetPen(grPen);
+
+	dc.SetPen(*(wxThePenList->FindOrCreatePen(m_gridColour, 1, wxLONG_DASH)));
 	for (unsigned j = 1; j < (nYGrids + 1); ++j) {
 		unsigned GridPos = (m_rectPlot.GetHeight())*j/( nYGrids + 1 ) + m_rectPlot.GetTop();
 		
@@ -465,7 +471,7 @@
 			}
 		} catch(std::bad_alloc) {
 			// Failed memory allocation
-			AddLogLineM(true, wxString(
+			AddLogLineC(wxString(
 				wxT("Error: COScopeCtrl::PlotHistory: Insuficient memory, cntPoints == ")) <<
 				cntPoints << wxT("."));
 			for (i = 0; i < nTrends; ++i) {
@@ -518,13 +524,17 @@
 
 void COScopeCtrl::InvalidateCtrl(bool bInvalidateGraph, bool bInvalidateGrid) 
 {
-	timerRedraw.Stop();
-	timerRedraw.SetOwner(this, TIMER_OSCOPE);
-	
 	bRecreateGraph |= bInvalidateGraph;
 	bRecreateGrid |= bInvalidateGrid;
-
-	timerRedraw.Start(100);
+	// It appears the timerRedraw logic screws up Mac, disable it there
+#ifndef __WXMAC__
+	// To prevent startup problems don't start timer logic until
+	// a native OnPaint event has been generated.
+	if (m_onPaint) {
+		bRecreateAll  |= bInvalidateGraph && bInvalidateGrid;
+		timerRedraw.Start(100, true);	// One-shot timer
+	}
+#endif
 }
 
 
@@ -540,12 +550,9 @@
 	if( !theApp->amuledlg || !theApp->amuledlg->SafeState()) {
 		return;
 	}
-	timerRedraw.Stop();
-	if (bRecreateGrid) {
-		RecreateGrid();	// this will also recreate the graph if that flag is set
-	} else if (bRecreateGraph) {
-		RecreateGraph(true);
-	}
+	bRecreateAll = false;
+	wxPaintEvent paint;
+	ProcessEvent(paint);
 }
 
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/OScopeCtrl.h -> aMule-2.3.1.tar.bz2/src/OScopeCtrl.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -30,21 +30,20 @@
 #define NULL 0
 #endif
 
+#include <vector>
 #include <wx/control.h>		// Needed for wxControl
 #include <wx/timer.h>		// Needed for wxTimer
 #include <wx/pen.h>
 #include <wx/bitmap.h>
+#include <wx/colour.h>
 
-#include "Color.h"		// Needed for COLORREF and RGB
-#include "Statistics.h"		// Needed for StatsGraphType
+#include "Constants.h"		// Needed for StatsGraphType
 
 class wxMemoryDC;
 
 /////////////////////////////////////////////////////////////////////////////
 // COScopeCtrl window
 
-#define TIMER_OSCOPE 7641
-
 class COScopeCtrl : public wxControl
 {
 	friend class CStatisticsDlg;
@@ -57,9 +56,9 @@
 	void SetRanges(float dLower, float dUpper);
 	void SetYUnits(const wxString& string,
 		const wxString& YMin = wxEmptyString, const wxString& YMax = wxEmptyString);
-	void SetBackgroundColor(COLORREF color);
-	void SetGridColor(COLORREF color);
-	void SetPlotColor(COLORREF color, unsigned iTrend = 0);
+	void SetBackgroundColor(const wxColour& color);
+	void SetGridColor(const wxColour& color);
+	void SetPlotColor(const wxColour& color, unsigned iTrend = 0);
 	float GetUpperLimit()		{ return pdsTrends[0].fUpperLimit; }
 	void Reset(double sNewPeriod);
 	void Stop();
@@ -83,7 +82,7 @@
 	wxColour m_gridColour;
 
 	typedef struct PlotDataStruct {
-		COLORREF crPlot;	       // data plot color  
+		wxColour crPlot;	       // data plot color  
 		wxPen  penPlot;
 		unsigned yPrev;
 		float fPrev;
@@ -107,11 +106,13 @@
 	void InvalidateGrid()	{ InvalidateCtrl(false, true); }
 
 private:
-	bool bRecreateGrid, bRecreateGraph, bStopped;
+	bool bRecreateGrid, bRecreateGraph, bRecreateAll, bStopped;
 	int nDelayedPoints;
 	double sLastTimestamp;
 	double sLastPeriod;
 	wxTimer timerRedraw;
+	bool m_onPaint;
+
 	void OnTimer(wxTimerEvent& evt);
 	void OnPaint(wxPaintEvent& evt);
 	void OnSize(wxSizeEvent& evt);

aMule-2.2.6.tar.bz2/src/Observable.h -> aMule-2.3.1.tar.bz2/src/Observable.h Changed

aMule-2.2.6.tar.bz2/src/ObservableQueue.h -> aMule-2.3.1.tar.bz2/src/ObservableQueue.h Changed

aMule-2.2.6.tar.bz2/src/OtherFunctions.cpp -> aMule-2.3.1.tar.bz2/src/OtherFunctions.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -42,6 +42,7 @@
 #include <common/Path.h>
 #include "MD4Hash.h"
 #include "Logger.h"
+#include "BitVector.h"		// Needed for BitVector
 
 #include "OtherFunctions.h"	// Interface declarations
 
@@ -58,66 +59,59 @@
 {
 	wxString ver(wxT(VERSION));
 	
-	ver += wxT(" using ");
+	ver += wxT(" compiled with ");
 
 	
 	// Figure out the wx build-type
-	#ifdef __WXGTK__
-		#ifdef __WXGTK20__
-			ver += wxT("wxGTK2");
-		#else
-			ver += wxT("wxGTK1");
-		#endif
+	#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(__WXMSW__) && defined(__VISUALC__)
+		ver += wxT("wxMSW VC");
 	#elif defined(__WXMSW__)
 		ver += wxT("wxMSW");
-	#elif defined(__WXCOCOA__)
-		ver += wxT("wxCocoa");
 	#endif
 
-	ver += wxString::Format(wxT(" v%d.%d.%d"), wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER );
+	ver += CFormat(wxT(" v%d.%d.%d")) % wxMAJOR_VERSION % wxMINOR_VERSION % wxRELEASE_NUMBER;
 
-#if defined(__WXDEBUG__)
+#ifdef __DEBUG__
 	ver += wxT(" (Debugging)");
 #endif
 	
 #ifdef SVNDATE
-	ver += wxString::Format( wxT(" (Snapshot: %s)"), wxT(SVNDATE));
+	ver += CFormat(wxT(" (Snapshot: %s)")) % wxT(SVNDATE);
 #endif
 	
 	return ver;
 }
 
 
-wxString GetFullMuleVersion()
-{
-#ifdef AMULE_DAEMON
-	wxString app = wxT("aMuled");
-#elif defined(CLIENT_GUI)
-	wxString app = wxT("Remote aMule-GUI");
-#else
-	wxString app = wxT("aMule");
-#endif
-
-	return app + wxT(" ") + GetMuleVersion();
-}
-
-
 // Formats a filesize in bytes to make it suitable for displaying
 wxString CastItoXBytes( uint64 count )
 {
 
 	if (count < 1024)
-		return wxString::Format( wxT("%u "), (unsigned)count) + wxPLURAL("byte", "bytes", count) ;
+		return CFormat(wxT("%u ")) % count + wxPLURAL("byte", "bytes", count) ;
 	else if (count < 1048576)
-		return wxString::Format( wxT("%u "), (unsigned)count >> 10) + _("kB") ;
+		return CFormat(wxT("%u ")) % (count >> 10) + _("kB") ;
 	else if (count < 1073741824)
-		return wxString::Format( wxT("%.2f "), (float)(uint32)count/1048576) + _("MB") ;
+		return CFormat(wxT("%.2f ")) % ((float)(uint32)count/1048576) + _("MB") ;
 	else if (count < 1099511627776LL)
-		return wxString::Format( wxT("%.3f "), (float)((uint32)(count/1024))/1048576) + _("GB") ;
+		return CFormat(wxT("%.3f ")) % ((float)((uint32)(count/1024))/1048576) + _("GB") ;
 	else
-		return wxString::Format( wxT("%.3f "), (float)count/1099511627776LL) + _("TB") ;
+		return CFormat(wxT("%.3f ")) % ((float)count/1099511627776LL) + _("TB") ;
 }
 
 
@@ -125,66 +119,49 @@
 {
 
 	if (count < 1000)
-		return wxString::Format(wxT("%u"), (uint32)count);
+		return CFormat(wxT("%u")) % count;
 	else if (count < 1000000)
-		return wxString::Format(wxT("%.0f"),(float)(uint32)count/1000) + _("k") ;
+		return CFormat(wxT("%.0f")) % ((float)(uint32)count/1000) + _("k") ;
 	else if (count < 1000000000)
-		return wxString::Format(wxT("%.2f"),(float)(uint32)count/1000000) + _("M") ;
+		return CFormat(wxT("%.2f")) % ((float)(uint32)count/1000000) + _("M") ;
 	else if (count < 1000000000000LL)
-		return wxString::Format(wxT("%.2f"),(float)((uint32)(count/1000))/1000000) + _("G") ;
+		return CFormat(wxT("%.2f")) % ((float)((uint32)(count/1000))/1000000) + _("G") ;
 	else
-		return wxString::Format(wxT("%.2f"),(float)count/1000000000000LL) + _("T");
+		return CFormat(wxT("%.2f")) % ((float)count/1000000000000LL) + _("T");
 }
 
 
 wxString CastItoSpeed(uint32 bytes)
 {
 	if (bytes < 1024)
-		return wxString::Format(wxT("%u "), bytes) + wxPLURAL("byte/sec", "bytes/sec", bytes);
+		return CFormat(wxT("%u ")) % bytes + wxPLURAL("byte/sec", "bytes/sec", bytes);
 	else if (bytes < 1048576)
-		return wxString::Format(wxT("%.2f "), bytes / 1024.0) + _("kB/s");
+		return CFormat(wxT("%.2f ")) % (bytes / 1024.0) + _("kB/s");
 	else
-		return wxString::Format(wxT("%.2f "), bytes / 1048576.0) + _("MB/s");
+		return CFormat(wxT("%.2f ")) % (bytes / 1048576.0) + _("MB/s");
 }
 
 
 // Make a time value in seconds suitable for displaying
-wxString CastSecondsToHM(uint64 count, uint16 msecs)
+wxString CastSecondsToHM(uint32 count, uint16 msecs)
 {
 	if (count < 60) {
 		if (!msecs) {
-			return wxString::Format(
-				wxT("%02") wxLongLongFmtSpec wxT("u "),
-				count) + _("secs");
+			return CFormat(wxT("%02u %s")) % count % _("secs");
 		} else {
-			return wxString::Format(
-				wxT("%.3f"),
-				(count + ((float)msecs/1000))) + _("secs");
+			return CFormat(wxT("%.3f %s"))
+				% (count + ((float)msecs/1000)) % _("secs");
 		}
 	} else if (count < 3600) {
-		return wxString::Format(
-			wxT("%")
-			wxLongLongFmtSpec wxT("u:%02")
-			wxLongLongFmtSpec wxT("u "), 
-			count/60,
-			(count % 60)) + _("mins");
+		return CFormat(wxT("%u:%02u %s")) 
+			% (count/60) % (count % 60) % _("mins");
 	} else if (count < 86400) {
-		return wxString::Format(
-			wxT("%")
-			wxLongLongFmtSpec wxT("u:%02")
-			wxLongLongFmtSpec wxT("u "),
-			count/3600,
-			(count % 3600)/60) + _("hours");
+		return CFormat(wxT("%u:%02u %s"))
+			% (count/3600) % ((count % 3600)/60) % _("hours");
 	} else {
-		return wxString::Format(
-			wxT("%")
-			wxLongLongFmtSpec wxT("u %s %02")
-			wxLongLongFmtSpec wxT("u:%02")
-			wxLongLongFmtSpec wxT("u "), 
-			count/86400,
-			_("Days"),
-			(count % 86400)/3600,
-			(count % 3600)/60) + _("hours");
+		return CFormat(wxT("%u %s %02u:%02u %s"))
+			% (count/86400) % _("Days")
+			% ((count % 86400)/3600) % ((count % 3600)/60) % _("hours");
 	}
 }
 
@@ -494,8 +471,9 @@
  *
  * Base64 encoding/decoding command line filter
  *
- * Copyright (c) 2002 Matthias Gaertner 29.06.2002
- * Adapted by (C) 2005-2009 Phoenix to use wxWidgets.
+ * Copyright (c) 2002-2011 Matthias Gaertner
+ * Adapted to use wxWidgets by
+ * Copyright (c) 2005-2011 Marcelo Roberto Jimenez ( phoenix@amule.org )
  *
  */
 static const wxString to_b64(
@@ -687,25 +665,25 @@
 
 
 // Returns the text assosiated with a category type
-wxString GetCatTitle(int catid)
+wxString GetCatTitle(AllCategoryFilter cat)
 {
-	switch (catid) {
-		case 0:	 return _("all");
-		case 1:  return _("all others");
-		case 2:  return _("Incomplete");
-		case 3:  return _("Completed");
-		case 4:  return _("Waiting");
-		case 5:  return _("Downloading");
-		case 6:  return _("Erroneous");
-		case 7:  return _("Paused");
-		case 8:  return _("Stopped");		
-		case 9:  return _("Video");
-		case 10: return _("Audio");
-		case 11: return _("Archive");
-		case 12: return _("CD-Images");
-		case 13: return _("Pictures");
-		case 14: return _("Text");
-		case 15: return _("Active");		
+	switch (cat) {
+		case acfAll:	 	 return _("all");
+		case acfAllOthers:   return _("all others");
+		case acfIncomplete:	 return _("Incomplete");
+		case acfCompleted:	 return _("Completed");
+		case acfWaiting:	 return _("Waiting");
+		case acfDownloading: return _("Downloading");
+		case acfErroneous:	 return _("Erroneous");
+		case acfPaused:		 return _("Paused");
+		case acfStopped:	 return _("Stopped");		
+		case acfVideo:		 return _("Video");
+		case acfAudio:		 return _("Audio");
+		case acfArchive:	 return _("Archive");
+		case acfCDImages:	 return _("CD-Images");
+		case acfPictures:	 return _("Pictures");
+		case acfText:		 return _("Text");
+		case acfActive:		 return _("Active");		
 		default: return wxT("?");
 	}
 }
@@ -720,155 +698,242 @@
 public:
 	CED2KFileTypes()
 	{
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".669"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".aac"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".aif"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".aiff"),  ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".amf"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ams"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ape"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".au"),    ED2KFT_AUDIO));
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".669"),   ED2KFT_AUDIO));		// 8 channel tracker module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".aac"),   ED2KFT_AUDIO));		// Advanced Audio Coding File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ac3"),   ED2KFT_AUDIO));		// Audio Codec 3 File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".aif"),   ED2KFT_AUDIO));		// Audio Interchange File Format
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".aifc"),  ED2KFT_AUDIO));		// Audio Interchange File Format
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".aiff"),  ED2KFT_AUDIO));		// Audio Interchange File Format
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".amf"),   ED2KFT_AUDIO));		// DSMI Advanced Module Format
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".amr"),   ED2KFT_AUDIO));		// Adaptive Multi-Rate Codec File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ams"),   ED2KFT_AUDIO));		// Extreme Tracker Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ape"),   ED2KFT_AUDIO));		// Monkey's Audio Lossless Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".au"),    ED2KFT_AUDIO));		// Audio File (Sun, Unix)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".aud"),   ED2KFT_AUDIO));		// General Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".audio"), ED2KFT_AUDIO));		// General Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".cda"),   ED2KFT_AUDIO));		// CD Audio Track
 		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dbm"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dmf"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dsm"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".far"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".flac"),  ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".it"),    ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mdl"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".med"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mid"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".midi"),  ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mod"),   ED2KFT_AUDIO));
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dmf"),   ED2KFT_AUDIO));		// Delusion Digital Music File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dsm"),   ED2KFT_AUDIO));		// Digital Sound Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dts"),   ED2KFT_AUDIO));		// DTS Encoded Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".far"),   ED2KFT_AUDIO));		// Farandole Composer Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".flac"),  ED2KFT_AUDIO));		// Free Lossless Audio Codec File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".it"),    ED2KFT_AUDIO));		// Impulse Tracker Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".m1a"),   ED2KFT_AUDIO));		// MPEG-1 Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".m2a"),   ED2KFT_AUDIO));		// MPEG-2 Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".m4a"),   ED2KFT_AUDIO));		// MPEG-4 Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mdl"),   ED2KFT_AUDIO));		// DigiTrakker Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".med"),   ED2KFT_AUDIO));		// Amiga MED Sound File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mid"),   ED2KFT_AUDIO));		// MIDI File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".midi"),  ED2KFT_AUDIO));		// MIDI File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mka"),   ED2KFT_AUDIO));		// Matroska Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mod"),   ED2KFT_AUDIO));		// Amiga Music Module File
 		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mol"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mp1"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mp2"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mp3"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mp4"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpa"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpc"),   ED2KFT_AUDIO));
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mp1"),   ED2KFT_AUDIO));		// MPEG-1 Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mp2"),   ED2KFT_AUDIO));		// MPEG-2 Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mp3"),   ED2KFT_AUDIO));		// MPEG-3 Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpa"),   ED2KFT_AUDIO));		// MPEG Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpc"),   ED2KFT_AUDIO));		// Musepack Compressed Audio File
 		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpp"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mtm"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".nst"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ogg"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".okt"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".psm"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ptm"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ra"),    ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rmi"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".s3m"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".stm"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ult"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".umx"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wav"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wma"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wow"),   ED2KFT_AUDIO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xm"),    ED2KFT_AUDIO));
-
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".asf"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".avi"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".divx"),  ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".m1v"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".m2v"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mkv"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mov"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mp1v"),  ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mp2v"),  ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpe"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpeg"),  ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpg"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mps"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpv"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpv1"),  ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpv2"),  ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ogm"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".qt"),    ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ram"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rm"),    ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rv"),    ED2KFT_VIDEO));
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mtm"),   ED2KFT_AUDIO));		// MultiTracker Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".nst"),   ED2KFT_AUDIO));		// NoiseTracker
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ogg"),   ED2KFT_AUDIO));		// Ogg Vorbis Compressed Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".okt"),   ED2KFT_AUDIO));		// Oktalyzer Module (Amiga)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".psm"),   ED2KFT_AUDIO));		// Protracker Studio Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ptm"),   ED2KFT_AUDIO));		// PolyTracker Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ra"),    ED2KFT_AUDIO));		// Real Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rmi"),   ED2KFT_AUDIO));		// MIDI File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".s3m"),   ED2KFT_AUDIO));		// Scream Tracker 3 Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".snd"),   ED2KFT_AUDIO));		// Audio File (Sun, Unix)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".stm"),   ED2KFT_AUDIO));		// Scream Tracker 2 Module
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ult"),   ED2KFT_AUDIO));		// UltraTracker
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".umx"),   ED2KFT_AUDIO));		// Unreal Music Package
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wav"),   ED2KFT_AUDIO));		// WAVE Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wma"),   ED2KFT_AUDIO));		// Windows Media Audio File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wow"),   ED2KFT_AUDIO));		// Grave Composer audio tracker
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xm"),    ED2KFT_AUDIO));		// Fasttracker 2 Extended Module
+
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".3g2"),   ED2KFT_VIDEO));		// 3GPP Multimedia File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".3gp"),   ED2KFT_VIDEO));		// 3GPP Multimedia File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".3gp2"),  ED2KFT_VIDEO));		// 3GPP Multimedia File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".3gpp"),  ED2KFT_VIDEO));		// 3GPP Multimedia File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".asf"),   ED2KFT_VIDEO));		// Advanced Systems Format (MS)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".amv"),   ED2KFT_VIDEO));		// Anime Music Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".asf"),   ED2KFT_VIDEO));		// Advanced Systems Format File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".avi"),   ED2KFT_VIDEO));		// Audio Video Interleave File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bik"),   ED2KFT_VIDEO));		// BINK Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".divx"),  ED2KFT_VIDEO));		// DivX-Encoded Movie File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dvr-ms"),ED2KFT_VIDEO));		// Microsoft Digital Video Recording
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".flc"),   ED2KFT_VIDEO));		// FLIC Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".fli"),   ED2KFT_VIDEO));		// FLIC Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".flic"),  ED2KFT_VIDEO));		// FLIC Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".flv"),   ED2KFT_VIDEO));		// Flash Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".hdmov"), ED2KFT_VIDEO));		// High-Definition QuickTime Movie
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ifo"),   ED2KFT_VIDEO));		// DVD-Video Disc Information File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".m1v"),   ED2KFT_VIDEO));		// MPEG-1 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".m2t"),   ED2KFT_VIDEO));		// MPEG-2 Video Transport Stream
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".m2ts"),  ED2KFT_VIDEO));		// MPEG-2 Video Transport Stream
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".m2v"),   ED2KFT_VIDEO));		// MPEG-2 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".m4b"),   ED2KFT_VIDEO));		// MPEG-4 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".m4v"),   ED2KFT_VIDEO));		// MPEG-4 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mkv"),   ED2KFT_VIDEO));		// Matroska Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mov"),   ED2KFT_VIDEO));		// QuickTime Movie File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".movie"), ED2KFT_VIDEO));		// QuickTime Movie File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mp1v"),  ED2KFT_VIDEO));		// QuickTime Movie File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mp2v"),  ED2KFT_VIDEO));		// MPEG-1 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mp4"),   ED2KFT_VIDEO));		// MPEG-2 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpe"),   ED2KFT_VIDEO));		// MPEG-4 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpeg"),  ED2KFT_VIDEO));		// MPEG Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpg"),   ED2KFT_VIDEO));		// MPEG Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mps"),   ED2KFT_VIDEO));		// MPEG Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpv"),   ED2KFT_VIDEO));		// MPEG Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpv1"),  ED2KFT_VIDEO));		// MPEG-1 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mpv2"),  ED2KFT_VIDEO));		// MPEG-2 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ogm"),   ED2KFT_VIDEO));		// Ogg Media File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ogv"),   ED2KFT_VIDEO));		// Ogg Theora Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pva"),   ED2KFT_VIDEO));		// MPEG Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".qt"),    ED2KFT_VIDEO));		// QuickTime Movie
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ram"),   ED2KFT_VIDEO));		// Real Audio Media
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ratdvd"),ED2KFT_VIDEO));		// RatDVD Disk Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rm"),    ED2KFT_VIDEO));		// Real Media File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rmm"),   ED2KFT_VIDEO));		// Real Media File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rmvb"),  ED2KFT_VIDEO));		// Real Video Variable Bit Rate File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rv"),    ED2KFT_VIDEO));		// Real Video File
 		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rv9"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ts"),    ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".vivo"),  ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".vob"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wmv"),   ED2KFT_VIDEO));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xvid"),  ED2KFT_VIDEO));
-
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bmp"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dcx"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".emf"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".gif"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ico"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".jpeg"),  ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".jpg"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pct"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pcx"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pic"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pict"),  ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".png"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".psd"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".psp"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".tga"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".tif"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".tiff"),  ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wmf"),   ED2KFT_IMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xif"),   ED2KFT_IMAGE));
-
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".7z"),    ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ace"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".arj"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bz2"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".cab"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".gz"),    ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".hqx"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".lha"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".msi"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rar"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".sea"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".sit"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".tar"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".tgz"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".uc2"),   ED2KFT_ARCHIVE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".zip"),   ED2KFT_ARCHIVE));
-
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bat"),   ED2KFT_PROGRAM));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".cmd"),   ED2KFT_PROGRAM));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".com"),   ED2KFT_PROGRAM));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".exe"),   ED2KFT_PROGRAM));
-
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bin"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bwa"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bwi"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bws"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bwt"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ccd"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".cue"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dmg"),   ED2KFT_CDIMAGE));
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".smil"),  ED2KFT_VIDEO));		// SMIL Presentation File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".smk"),   ED2KFT_VIDEO));		// Smacker Compressed Movie File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".swf"),   ED2KFT_VIDEO));		// Macromedia Flash Movie
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".tp"),    ED2KFT_VIDEO));		// Video Transport Stream File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ts"),    ED2KFT_VIDEO));		// Video Transport Stream File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".vid"),   ED2KFT_VIDEO));		// General Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".video"), ED2KFT_VIDEO));		// General Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".vivo"),  ED2KFT_VIDEO));		// VivoActive Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".vob"),   ED2KFT_VIDEO));		// DVD Video Object File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".vp6"),   ED2KFT_VIDEO));		// TrueMotion VP6 Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".webm"),  ED2KFT_VIDEO));		// WebM Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wm"),    ED2KFT_VIDEO));		// Windows Media Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wmv"),   ED2KFT_VIDEO));		// Windows Media Video File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xvid"),  ED2KFT_VIDEO));		// Xvid-Encoded Video File
+
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bmp"),   ED2KFT_IMAGE));		// Bitmap Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dcx"),   ED2KFT_IMAGE));		// FAXserve Fax Document
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".emf"),   ED2KFT_IMAGE));		// Enhanced Windows Metafile
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".gif"),   ED2KFT_IMAGE));		// Graphical Interchange Format File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ico"),   ED2KFT_IMAGE));		// Icon File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".jfif"),  ED2KFT_IMAGE));		// JPEG File Interchange Format
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".jpe"),   ED2KFT_IMAGE));		// JPEG Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".jpeg"),  ED2KFT_IMAGE));		// JPEG Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".jpg"),   ED2KFT_IMAGE));		// JPEG Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pct"),   ED2KFT_IMAGE));		// PICT Picture File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pcx"),   ED2KFT_IMAGE));		// Paintbrush Bitmap Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pic"),   ED2KFT_IMAGE));		// PICT Picture File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pict"),  ED2KFT_IMAGE));		// PICT Picture File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".png"),   ED2KFT_IMAGE));		// Portable Network Graphic
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".psd"),   ED2KFT_IMAGE));		// Photoshop Document
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".psp"),   ED2KFT_IMAGE));		// Paint Shop Pro Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".tga"),   ED2KFT_IMAGE));		// Targa Graphic
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".tif"),   ED2KFT_IMAGE));		// Tagged Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".tiff"),  ED2KFT_IMAGE));		// Tagged Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wbmp"),  ED2KFT_IMAGE));		// Wireless Application Protocol Bitmap Format
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".webp"),  ED2KFT_IMAGE));		// Weppy Photo File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wmf"),   ED2KFT_IMAGE));		// Windows Metafile
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wmp"),   ED2KFT_IMAGE));		// Windows Media Photo File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xif"),   ED2KFT_IMAGE));		// ScanSoft Pagis Extended Image Format File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xpm"),   ED2KFT_IMAGE));		// X-Windows Pixmap
+
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".7z"),    ED2KFT_ARCHIVE));	// 7-Zip Compressed File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ace"),   ED2KFT_ARCHIVE));	// WinAce Compressed File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".alz"),   ED2KFT_ARCHIVE));	// ALZip Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".arc"),   ED2KFT_ARCHIVE));	// Compressed File Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".arj"),   ED2KFT_ARCHIVE));	// ARJ Compressed File Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bz2"),   ED2KFT_ARCHIVE));	// Bzip Compressed File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".cab"),   ED2KFT_ARCHIVE));	// Cabinet File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".cbr"),   ED2KFT_ARCHIVE));	// Comic Book RAR Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".cbt"),   ED2KFT_ARCHIVE));	// Comic Book Tarball
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".cbz"),   ED2KFT_ARCHIVE));	// Comic Book ZIP Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".gz"),    ED2KFT_ARCHIVE));	// Gnu Zipped File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".hqx"),   ED2KFT_ARCHIVE));	// BinHex 4.0 Encoded File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".lha"),   ED2KFT_ARCHIVE));	// LHARC Compressed Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".lzh"),   ED2KFT_ARCHIVE));	// LZH Compressed File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".msi"),   ED2KFT_ARCHIVE));	// Microsoft Installer File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pak"),   ED2KFT_ARCHIVE));	// PAK (Packed) File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".par"),   ED2KFT_ARCHIVE));	// Parchive Index File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".par2"),  ED2KFT_ARCHIVE));	// Parchive 2 Index File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rar"),   ED2KFT_ARCHIVE));	// WinRAR Compressed Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".sea"),   ED2KFT_ARCHIVE));	// Self-Extracting Archive (Mac)
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".sit"),   ED2KFT_ARCHIVE));	// Stuffit Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".sitx"),  ED2KFT_ARCHIVE));	// Stuffit X Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".tar"),   ED2KFT_ARCHIVE));	// Consolidated Unix File Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".tbz2"),  ED2KFT_ARCHIVE));	// Tar BZip 2 Compressed File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".tgz"),   ED2KFT_ARCHIVE));	// Gzipped Tar File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".uc2"),   ED2KFT_ARCHIVE));	// UltraCompressor 2 Archive
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xpi"),   ED2KFT_ARCHIVE));	// Mozilla Installer Package
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".z"),     ED2KFT_ARCHIVE));	// Unix Compressed File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".zip"),   ED2KFT_ARCHIVE));	// Zipped File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".zoo"),   ED2KFT_ARCHIVE));	// Zoo Archive
+
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bat"),   ED2KFT_PROGRAM));	// Batch File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".cmd"),   ED2KFT_PROGRAM));	// Command File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".com"),   ED2KFT_PROGRAM));	// COM File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".exe"),   ED2KFT_PROGRAM));	// Executable File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".hta"),   ED2KFT_PROGRAM));	// HTML Application
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".js"),    ED2KFT_PROGRAM));	// Java Script
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".jse"),   ED2KFT_PROGRAM));	// Encoded  Java Script
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".msc"),   ED2KFT_PROGRAM));	// Microsoft Common Console File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".vbe"),   ED2KFT_PROGRAM));	// Encoded Visual Basic Script File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".vbs"),   ED2KFT_PROGRAM));	// Visual Basic Script File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wsf"),   ED2KFT_PROGRAM));	// Windows Script File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wsh"),   ED2KFT_PROGRAM));	// Windows Scripting Host File
+
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bin"),   ED2KFT_CDIMAGE));	// CD Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bwa"),   ED2KFT_CDIMAGE));	// BlindWrite Disk Information File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bwi"),   ED2KFT_CDIMAGE));	// BlindWrite CD/DVD Disc Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bws"),   ED2KFT_CDIMAGE));	// BlindWrite Sub Code File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".bwt"),   ED2KFT_CDIMAGE));	// BlindWrite 4 Disk Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ccd"),   ED2KFT_CDIMAGE));	// CloneCD Disk Image
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".cue"),   ED2KFT_CDIMAGE));	// Cue Sheet File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dmg"),   ED2KFT_CDIMAGE));	// Mac OS X Disk Image
 		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dmz"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".img"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".iso"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mdf"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mds"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".nrg"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".sub"),   ED2KFT_CDIMAGE));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".toast"), ED2KFT_CDIMAGE));
-
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".chm"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".css"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".diz"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".doc"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dot"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".hlp"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".htm"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".html"),  ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".nfo"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pdf"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pps"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ppt"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ps"),    ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rtf"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wri"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".txt"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xls"),   ED2KFT_DOCUMENT));
-		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xlt"),   ED2KFT_DOCUMENT));
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".img"),   ED2KFT_CDIMAGE));	// Disk Image Data File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".iso"),   ED2KFT_CDIMAGE));	// Disc Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mdf"),   ED2KFT_CDIMAGE));	// Media Disc Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".mds"),   ED2KFT_CDIMAGE));	// Media Descriptor File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".nrg"),   ED2KFT_CDIMAGE));	// Nero CD/DVD Image File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".sub"),   ED2KFT_CDIMAGE));	// Subtitle File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".toast"), ED2KFT_CDIMAGE));	// Toast Disc Image
+
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".chm"),   ED2KFT_DOCUMENT));	// Compiled HTML Help File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".css"),   ED2KFT_DOCUMENT));	// Cascading Style Sheet
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".diz"),   ED2KFT_DOCUMENT));	// Description in Zip File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".doc"),   ED2KFT_DOCUMENT));	// Document File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".dot"),   ED2KFT_DOCUMENT));	// Document Template File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".hlp"),   ED2KFT_DOCUMENT));	// Help File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".htm"),   ED2KFT_DOCUMENT));	// HTML File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".html"),  ED2KFT_DOCUMENT));	// HTML File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".nfo"),   ED2KFT_DOCUMENT));	// Warez Information File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".odp"),   ED2KFT_DOCUMENT));	// OpenDocument Presentation
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ods"),   ED2KFT_DOCUMENT));	// OpenDocument Spreadsheet
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".odt"),   ED2KFT_DOCUMENT));	// OpenDocument File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".otp"),   ED2KFT_DOCUMENT));	// OpenDocument Presentation Template
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ott"),   ED2KFT_DOCUMENT));	// OpenDocument Template File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ots"),   ED2KFT_DOCUMENT));	// OpenDocument Spreadsheet Template
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pdf"),   ED2KFT_DOCUMENT));	// Portable Document Format File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".pps"),   ED2KFT_DOCUMENT));	// PowerPoint Slide Show
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ppt"),   ED2KFT_DOCUMENT));	// PowerPoint Presentation
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".ps"),    ED2KFT_DOCUMENT));	// PostScript File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".rtf"),   ED2KFT_DOCUMENT));	// Rich Text Format File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".stc"),   ED2KFT_DOCUMENT));	// OpenOffice.org 1.0 Spreadsheet Template
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".sti"),   ED2KFT_DOCUMENT));	// OpenOffice.org 1.0 Presentation Template
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".stw"),   ED2KFT_DOCUMENT));	// OpenOffice.org 1.0 Document Template File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".sxc"),   ED2KFT_DOCUMENT));	// OpenOffice.org 1.0 Spreadsheet
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".sxi"),   ED2KFT_DOCUMENT));	// OpenOffice.org 1.0 Presentation
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".sxw"),   ED2KFT_DOCUMENT));	// OpenOffice.org 1.0 Document File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".text"),  ED2KFT_DOCUMENT));	// General Text File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".txt"),   ED2KFT_DOCUMENT));	// Text File
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".wri"),   ED2KFT_DOCUMENT));	// Windows Write Document
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xls"),   ED2KFT_DOCUMENT));	// Microsoft Excel Spreadsheet
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xlt"),   ED2KFT_DOCUMENT));	// Microsoft Excel Template
+		ED2KFileTypesMap.insert(SED2KFileTypeMapElement(wxT(".xml"),   ED2KFT_DOCUMENT));	// XML File
 	}
 };
 
@@ -958,10 +1023,10 @@
 		result += msg + wxT(" - ok=") + ( ok ? wxT("true, ") : wxT("false, ") );
 	}
 
-	result += wxString::Format( wxT("%d bytes\n"), n );
+	result += CFormat(wxT("%d bytes\n")) % n;
 	for ( int i = 0; i < lines; ++i) {
 		// Show address
-		result += wxString::Format( wxT("%08x  "), i * 16 );
+		result += CFormat(wxT("%08x  ")) % (i * 16);
 		
 		// Show two columns of hex-values
 		for ( int j = 0; j < 2; ++j) {
@@ -969,7 +1034,7 @@
 				int pos = 16 * i + 8 * j + k;
 				
 				if ( pos < n ) {
-					result += wxString::Format( wxT("%02x "), p[pos] );
+					result += CFormat(wxT("%02x ")) % p[pos];
 				} else {
 					result += wxT("   ");
 				}
@@ -1022,28 +1087,25 @@
 }
 
 
-wxString GetConfigDir()
+wxString GetConfigDir(const wxString &configFileBase)
 {
 	// Cache the path.
 	static wxString configPath;
 
 	if (configPath.IsEmpty()) {
-#ifndef EC_REMOTE
 		// "Portable aMule" - Use aMule from an external USB drive
-		// Check for ./config/amule.conf and use this configuration if found
+		// Check for ./config/amule.conf (or whatever gets passed as configFile)
+		// and use this configuration if found
 		const wxString configDir = JoinPaths(wxFileName::GetCwd(), wxT("config"));
-		const wxString configFile = JoinPaths(configDir, wxT("amule.conf"));
+		const wxString configFile = JoinPaths(configDir, configFileBase);
 
 		if (CPath::DirExists(configDir) && CPath::FileExists(configFile)) {
-			AddLogLineM(true, CFormat(wxT("Using configDir: %s")) % configDir);
+			AddLogLineN(CFormat(_("Using config dir: %s")) % configDir);
 
 			configPath = configDir;
 		} else {
 			configPath = wxStandardPaths::Get().GetUserDataDir();
 		}
-#else
-		configPath = wxStandardPaths::Get().GetUserDataDir();
-#endif
 
 		configPath += wxFileName::GetPathSeparator();
 	}
@@ -1052,43 +1114,42 @@
 }
 
 
+/*************************** Locale specific stuff ***************************/
+
+#ifndef __WXMSW__
+#	define	SETWINLANG(LANG, SUBLANG)
+#else
+#	define	SETWINLANG(LANG, SUBLANG) \
+	info.WinLang = LANG; \
+	info.WinSublang = SUBLANG;
+#endif
+
+#define CUSTOMLANGUAGE(wxid, iso, winlang, winsublang, dir, desc) \
+	info.Language = wxid;		\
+	info.CanonicalName = wxT(iso);	\
+	info.LayoutDirection = dir;	\
+	info.Description = wxT(desc);	\
+	SETWINLANG(winlang, winsublang)	\
+	wxLocale::AddLanguage(info);
+
 void InitCustomLanguages()
 {
-	wxLanguageInfo CustomLanguage;
-	CustomLanguage.Language = wxLANGUAGE_ITALIAN_NAPOLITAN;
-	CustomLanguage.CanonicalName = wxT("it_NA");
-	CustomLanguage.Description = wxT("sNeo's Custom Napolitan Language");
-	wxLocale::AddLanguage(CustomLanguage);
-
-	CustomLanguage.Language = wxLANGUAGE_ASTURIAN;
-	CustomLanguage.CanonicalName = wxT("ast_ES");
-	CustomLanguage.Description = wxT("Asturian");
-	wxLocale::AddLanguage(CustomLanguage);
+	wxLanguageInfo info;
+
+#if !wxCHECK_VERSION(2, 9, 0)
+	CUSTOMLANGUAGE(wxLANGUAGE_ASTURIAN,	"ast",	0,	0,	wxLayout_LeftToRight,	"Asturian");
+#endif
 }
 
 
 void InitLocale(wxLocale& locale, int language)
 {
-	int language_flags = 0;
-	if ((wxLANGUAGE_CUSTOM != language) && 
-		(wxLANGUAGE_ASTURIAN != language) &&
-		(wxLANGUAGE_ITALIAN_NAPOLITAN != language)) {
-		language_flags = wxLOCALE_LOAD_DEFAULT | wxLOCALE_CONV_ENCODING;
-	}
-	
-	locale.Init(language,language_flags); 
+	locale.Init(language, wxLOCALE_LOAD_DEFAULT); 
 	
-	if (language != wxLANGUAGE_CUSTOM) {
-
 #if defined(__WXMAC__) || defined(__WXMSW__)
-		locale.AddCatalogLookupPathPrefix(JoinPaths(wxStandardPaths::Get().GetDataDir(), wxT("locale")));
+	locale.AddCatalogLookupPathPrefix(JoinPaths(wxStandardPaths::Get().GetDataDir(), wxT("locale")));
 #endif
-		locale.AddCatalog(wxT(PACKAGE));
-
-	} else {
-		locale.AddCatalogLookupPathPrefix(GetConfigDir());
-		locale.AddCatalog(wxT("custom"));
-	}
+	locale.AddCatalog(wxT(PACKAGE));
 }
 
 
@@ -1100,7 +1161,20 @@
 	if (!lang.IsEmpty()) {
 		const wxLanguageInfo *lng = wxLocale::FindLanguageInfo(lang);
 		if (lng) {
-			return lng->Language;
+			int langID = lng->Language;
+			// Traditional Chinese: original Chinese, used in Taiwan, Hong Kong and Macau.
+			// Simplified Chinese: simplified Chinese characters used in Mainland China since 1950s, and in some other places such as Singapore and Malaysia.
+			//
+			// Chinese (Traditional) contains zh_TW, zh_HK and zh_MO (but there are differences in some words). 
+			// Because of most Traditional Chinese user are in Taiwan, zh_TW becomes the representation of Traditional Chinese.
+			// Chinese (Simplified) contains zh_CN, zh_SG and zh_MY. In the same reason, zh_CN becomes the representation of Simplified Chinese.
+			// (see http://forum.amule.org/index.php?topic=13208.msg98043#msg98043 )
+			//
+			// wx maps "Traditional Chinese" to "Chinese" however. This must me corrected:
+			if (langID == wxLANGUAGE_CHINESE) {
+				langID = wxLANGUAGE_CHINESE_TRADITIONAL;
+			}
+			return langID;
 		} else {
 			return wxLANGUAGE_DEFAULT;
 		}
@@ -1124,6 +1198,8 @@
 	}
 }
 
+/*****************************************************************************/
+
 wxString GetPassword() {
 wxString pass_plain;
 CMD4Hash password;
@@ -1150,4 +1226,8 @@
 return password.Encode();
 }
 
+
+const uint8 BitVector::s_posMask[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
+const uint8 BitVector::s_negMask[] = {0xFE, 0xFD, 0xFB, 0xF7, 0xEF, 0xDF, 0xBF, 0x7F};
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/OtherFunctions.h -> aMule-2.3.1.tar.bz2/src/OtherFunctions.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -29,6 +29,7 @@
 #include <wx/intl.h>		// Needed for wxLANGUAGE_ constants
 
 #include "Types.h"		// Needed for uint16, uint32 and uint64
+#include "Preferences.h"	// Needed for AllCategoryFilter enumeration
 
 #include <algorithm>		// Needed for std::for_each	// Do_not_auto_remove (mingw-gcc-3.4.5)
 
@@ -63,13 +64,21 @@
 //! Overloaded version of CmpAny for use with wxStrings.
 inline int CmpAny(const wxString& ArgA, const wxString& ArgB)
 {
-	return ArgA.CmpNoCase( ArgB );
+	if (ArgA.IsEmpty() && !ArgB.IsEmpty()) {
+		return -1;
+	} else if (!ArgA.IsEmpty() && ArgB.IsEmpty()) {
+		return 1;
+	} else if (ArgA.IsEmpty() && ArgB.IsEmpty()) {
+		return 0;
+	} else {
+		return ArgA.CmpNoCase( ArgB );
+	}
 }
 
 //! Overloaded version of CmpAny for use with C-Strings (Unicoded).
 inline int CmpAny(const wxChar* ArgA, const wxChar* ArgB)
 {
-	return wxString( ArgA ).CmpNoCase( ArgB );
+	return CmpAny(wxString( ArgA ), wxString( ArgB ));
 }
 
 
@@ -174,17 +183,6 @@
  */
 wxString GetMuleVersion();
 
-/**
- * This functions is like the GetMuleVersion function above, with the exception
- * that it also includes the name of the application. This can be one of the
- * following:
- *
- *  - aMule
- *  - aMuled
- *  - Remote aMule-GUI
- */
-wxString GetFullMuleVersion();
-
 
 /**
  * Helperfunction for accessing a child of the calling widget.
@@ -244,7 +242,7 @@
 // Converts a number of bytes to a human readable speed value.
 wxString CastItoSpeed(uint32 bytes);
 // Converts an amount of seconds to human readable time.
-wxString CastSecondsToHM(uint64 seconds, uint16 msecs = 0);
+wxString CastSecondsToHM(uint32 seconds, uint16 msecs = 0);
 // Returns the amount of Bytes the provided size-type represents
 uint32 GetTypeSize(uint8 type);
 // Returns the string associated with a file-rating value.
@@ -262,7 +260,7 @@
 
 
 // Returns the name associated with a category value.
-wxString GetCatTitle(int catid);
+wxString GetCatTitle(AllCategoryFilter cat);
 
 /* Other */
 
@@ -355,11 +353,13 @@
 }
 
 
-wxString GetConfigDir();
+wxString GetConfigDir(const wxString &configFile = wxT("amule.conf"));
 
-#define  wxLANGUAGE_CUSTOM 		wxLANGUAGE_USER_DEFINED+1
-#define  wxLANGUAGE_ITALIAN_NAPOLITAN 	wxLANGUAGE_USER_DEFINED+2
-#define  wxLANGUAGE_ASTURIAN 	wxLANGUAGE_USER_DEFINED+3
+#if !wxCHECK_VERSION(2, 9, 0)
+enum {
+	wxLANGUAGE_ASTURIAN	= wxLANGUAGE_USER_DEFINED + 1
+};
+#endif
 
 /**
  * Adds aMule's custom languages to db.

aMule-2.2.6.tar.bz2/src/OtherStructs.h -> aMule-2.3.1.tar.bz2/src/OtherStructs.h Changed

aMule-2.2.6.tar.bz2/src/Packet.cpp -> aMule-2.3.1.tar.bz2/src/Packet.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -29,6 +29,7 @@
 
 #include <protocol/Protocols.h>
 
+#include "Logger.h"			// Neeed for AddDebugLogLineN
 #include "MemFile.h"			// Needed for CMemFile
 #include "OtherStructs.h"		// Needed for Header_Struct
 #include "ArchSpecific.h"		// Needed for ENDIAN_*
@@ -76,7 +77,7 @@
 }
 
 // only used for receiving packets
-CPacket::CPacket(byte* rawHeader)
+CPacket::CPacket(byte* rawHeader, byte *buf)
 {
 	memset(head, 0, sizeof head);
 	Header_Struct* header = (Header_Struct*)rawHeader;
@@ -89,7 +90,7 @@
 	m_bFromPF 	= false;
 	tempbuffer	= NULL;
 	completebuffer 	= NULL;
-	pBuffer 	= NULL;
+	pBuffer 	= buf;
 }
 
 CPacket::CPacket(const CMemFile& datafile, uint8 protocol, uint8 ucOpcode)
@@ -165,10 +166,13 @@
 	}
 }
 
-void CPacket::AllocDataBuffer(void)
+uint32 CPacket::GetPacketSizeFromHeader(const byte* rawHeader)
 {
-	wxASSERT(completebuffer == NULL);
-	pBuffer = new byte[size + 1];
+	Header_Struct* header = (Header_Struct*)rawHeader;
+	uint32 size = ENDIAN_SWAP_32(header->packetlength);
+	if (size < 1 || size >= 0x7ffffff0u)
+		return 0;
+	return size - 1;
 }
 
 void CPacket::CopyToDataBuffer(unsigned int offset, const byte* data, unsigned int n)
@@ -269,7 +273,13 @@
 
 
 bool CPacket::UnPackPacket(uint32 uMaxDecompressedSize) {
-	wxASSERT( prot == OP_PACKEDPROT );
+	wxASSERT( prot == OP_PACKEDPROT || prot == OP_ED2KV2PACKEDPROT);
+	// OP_ED2KV2PACKEDPROT is experimental aMule test code,
+	// this should not happen yet. Leave a warining in the log.
+	if (prot == OP_ED2KV2PACKEDPROT) {
+		AddDebugLogLineN(logPacketErrors,
+			wxT("Received OP_ED2KV2PACKEDPROT."));
+	}
 
 	uint32 nNewSize = size * 10 + 300;

aMule-2.2.6.tar.bz2/src/Packet.h -> aMule-2.3.1.tar.bz2/src/Packet.h Changed

@@ -1,8 +1,9 @@
+
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -40,19 +41,19 @@
 public:
 	CPacket(CPacket &p);
 	CPacket(uint8 protocol);
-	CPacket(byte* header); // only used for receiving packets
+	CPacket(byte* header, byte *buf); // only used for receiving packets
 	CPacket(const CMemFile& datafile, uint8 protocol, uint8 ucOpcode);
 	CPacket(int8 in_opcode, uint32 in_size, uint8 protocol, bool bFromPF = true);
 	CPacket(byte* pPacketPart, uint32 nSize, bool bLast, bool bFromPF = true); // only used for splitted packets!
 
 	~CPacket();
 	
-	void 			AllocDataBuffer();	
 	byte*			GetHeader();
 	byte*			GetUDPHeader();
 	byte*			GetPacket();
 	byte*			DetachPacket();
 	uint32 			GetRealPacketSize() const	{ return size + 6; }
+	static uint32		GetPacketSizeFromHeader(const byte* rawHeader);
 	bool			IsSplitted()		{ return m_bSplitted; }
 	bool			IsLastSplitted()	{ return m_bLastSplitted; }
 	void			PackPacket();

aMule-2.2.6.tar.bz2/src/Parser.cpp -> aMule-2.3.1.tar.bz2/src/Parser.cpp Changed

aMule-2.2.6.tar.bz2/src/Parser.hpp -> aMule-2.3.1.tar.bz2/src/Parser.hpp Changed

aMule-2.2.6.tar.bz2/src/PartFile.cpp -> aMule-2.3.1.tar.bz2/src/PartFile.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -42,11 +42,18 @@
 #include <wx/tokenzr.h>		// Needed for wxStringTokenizer
 
 #include "KnownFileList.h"	// Needed for CKnownFileList
+#include "CanceledFileList.h"
 #include "UploadQueue.h"	// Needed for CFileHash
 #include "IPFilter.h"		// Needed for CIPFilter
 #include "Server.h"		// Needed for CServer
 #include "ServerConnect.h"	// Needed for CServerConnect
+
+#ifdef CLIENT_GUI
+#include "UpDownClientEC.h"	// Needed for CUpDownClient
+#else
 #include "updownclient.h"	// Needed for CUpDownClient
+#endif
+
 #include "MemFile.h"		// Needed for CMemFile
 #include "Preferences.h"	// Needed for CPreferences
 #include "DownloadQueue.h"	// Needed for CDownloadQueue
@@ -63,6 +70,9 @@
 #include "GuiEvents.h"		// Needed for Notify_*
 #include "DataToText.h"		// Needed for OriginToText()
 #include "PlatformSpecific.h"	// Needed for CreateSparseFile()
+#include "FileArea.h"		// Needed for CFileArea
+#include "ScopedPtr.h"		// Needed for CScopedArray
+#include "CorruptionBlackBox.h"
 
 #include "kademlia/kademlia/Kademlia.h"
 #include "kademlia/kademlia/Search.h"
@@ -88,6 +98,7 @@
 }
 
 
+#ifndef CLIENT_GUI
 SFileRating::SFileRating(const CUpDownClient &client)
 :
 UserName(client.GetUserName()),
@@ -96,6 +107,7 @@
 Comment(client.GetFileComment())
 {
 }
+#endif
 
 
 SFileRating::~SFileRating()
@@ -103,6 +115,23 @@
 }
 
 
+class PartFileBufferedData
+{
+public:
+	CFileArea area;				// File area to be written
+	uint64 start;					// This is the start offset of the data
+	uint64 end;						// This is the end offset of the data
+	Requested_Block_Struct *block;	// This is the requested block that this data relates to
+
+	PartFileBufferedData(CFileAutoClose& file, byte * data, uint64 _start, uint64 _end, Requested_Block_Struct *_block)
+		: start(_start), end(_end), block(_block)
+	{
+		area.StartWriteAt(file, start, end-start+1);
+		memcpy(area.GetBuffer(), data, end-start+1);
+	}
+};
+
+
 typedef std::list<Chunk> ChunkList;
 
 
@@ -160,7 +189,7 @@
 						break;
 					}
 
-					AddDebugLogLineM( false, logPartFile,
+					AddDebugLogLineN( logPartFile,
 						wxT("CPartFile::CPartFile(CSearchFile*): added tag ") +
 						pTag.GetFullInfo() );
 					m_taglist.push_back(pTag);
@@ -184,7 +213,7 @@
 						break;
 					}
 
-					AddDebugLogLineM( false, logPartFile,
+					AddDebugLogLineN( logPartFile,
 						wxT("CPartFile::CPartFile(CSearchFile*): added tag ") +
 						pTag.GetFullInfo() );
 					m_taglist.push_back(pTag);
@@ -195,7 +224,7 @@
 		}
 
 		if (!bTagAdded) {
-			AddDebugLogLineM( false, logPartFile,
+			AddDebugLogLineN( logPartFile,
 				wxT("CPartFile::CPartFile(CSearchFile*): ignored tag ") +
 				pTag.GetFullInfo() );
 		}
@@ -217,7 +246,7 @@
 
 	if (fileLink->m_hashset) {
 		if (!LoadHashsetFromFile(fileLink->m_hashset, true)) {
-			AddDebugLogLineM(true, logPartFile, wxT("eD2K link contained invalid hashset: ") + fileLink->GetLink());
+			AddDebugLogLineC(logPartFile, wxT("eD2K link contained invalid hashset: ") + fileLink->GetLink());
 		}
 	}
 }
@@ -225,34 +254,16 @@
 
 CPartFile::~CPartFile()
 {
-	
-	// Barry - Ensure all buffered data is written
-
-	// Kry - WTF? 
-	// eMule had same problem with lseek error ... and override with a simple 
-	// check for INVALID_HANDLE_VALUE (that, btw, does not exist on linux)
-	// So we just guess is < 0 on error and > 2 if ok (0 stdin, 1 stdout, 2 stderr)
-	// But, where does this wrong handle comes from?
-	
-	if (m_hpartfile.IsOpened() && (m_hpartfile.fd() > 2)) { 
-		FlushBuffer(true);
-	}
-	
-	if (m_hpartfile.IsOpened() && (m_hpartfile.fd() > 2)) {
+	// if it's not opened, it was completed or deleted
+	if (m_hpartfile.IsOpened()) { 
+		FlushBuffer();
 		m_hpartfile.Close();
 		// Update met file (with current directory entry)
 		SavePartFile();			
 	}
 
-	DeleteContents(m_gaplist);
-
-	std::list<PartFileBufferedData*>::iterator it = m_BufferedData_list.begin();
-	for (; it != m_BufferedData_list.end(); ++it) {
-		PartFileBufferedData* item = *it;
-
-		delete[] item->data;
-		delete item;
-	}
+	DeleteContents(m_BufferedData_list);
+	delete m_CorruptionBlackBox;
 
 	wxASSERT(m_SrcList.empty());
 	wxASSERT(m_A4AFsrclist.empty());
@@ -260,41 +271,38 @@
 
 void CPartFile::CreatePartFile()
 {
-#ifndef CLIENT_GUI
 	// use lowest free partfilenumber for free file (InterCeptor)
 	int i = 0; 
 	do { 
 		++i; 
-		m_partmetfilename = CPath(wxString::Format(wxT("%03i.part.met"), i));
+		m_partmetfilename = CPath(CFormat(wxT("%03i.part.met")) % i);
 		m_fullname = thePrefs::GetTempDir().JoinPaths(m_partmetfilename);
 	} while (m_fullname.FileExists());
+
+	m_CorruptionBlackBox->SetPartFileInfo(GetFileName().GetPrintable(), m_partmetfilename.RemoveAllExt().GetPrintable());
 	
 	wxString strPartName = m_partmetfilename.RemoveExt().GetRaw();
 	m_taglist.push_back(CTagString(FT_PARTFILENAME, strPartName ));
 	
-	Gap_Struct* gap = new Gap_Struct;
-	gap->start = 0;
-	gap->end = GetFileSize() - 1;
-	
-	m_gaplist.push_back(gap);
+	m_gaplist.Init(GetFileSize(), true);	// Init empty
 	
-	CPath partPath = m_fullname.RemoveExt();
+	m_PartPath = m_fullname.RemoveExt();
 	bool fileCreated;
 	if (thePrefs::GetAllocFullFile()) {
-		fileCreated = m_hpartfile.Create(partPath.GetRaw(), true);
+		fileCreated = m_hpartfile.Create(m_PartPath, true);
 		m_hpartfile.Close();
 	} else {
-		fileCreated = PlatformSpecific::CreateSparseFile(partPath, GetFileSize());
+		fileCreated = PlatformSpecific::CreateSparseFile(m_PartPath, GetFileSize());
 	}
 	if (!fileCreated) {
-		AddLogLineM(false,_("ERROR: Failed to create partfile)"));
-		SetPartFileStatus(PS_ERROR);
+		AddLogLineN(_("ERROR: Failed to create partfile"));
+		SetStatus(PS_ERROR);
 	}
 
 	SetFilePath(thePrefs::GetTempDir());
 			
 	if (thePrefs::GetAllocFullFile()) {
-		SetPartFileStatus(PS_ALLOCATING);
+		SetStatus(PS_ALLOCATING);
 		CThreadScheduler::AddTask(new CAllocateFileTask(this, thePrefs::AddNewFilesPaused()));
 	} else {
 		AllocationFinished();
@@ -304,7 +312,6 @@
 	
 	SavePartFile(true);
 	SetActive(theApp->IsConnected());
-#endif
 }
 
 
@@ -317,27 +324,29 @@
 	transferred = 0;
 	
 	m_partmetfilename = filename;
+	m_CorruptionBlackBox->SetPartFileInfo(GetFileName().GetPrintable(), m_partmetfilename.RemoveAllExt().GetPrintable());
 	m_filePath = in_directory;
 	m_fullname = m_filePath.JoinPaths(m_partmetfilename);
+	m_PartPath = m_fullname.RemoveExt();
 	
 	// readfile data form part.met file
 	CPath curMetFilename = m_fullname;
 	if (from_backup) {
 		curMetFilename = curMetFilename.AppendExt(PARTMET_BAK_EXT);
-		AddLogLineM(false, CFormat( _("Trying to load backup of met-file from %s") )
+		AddLogLineN(CFormat( _("Trying to load backup of met-file from %s") )
 			% curMetFilename );
 	}
 	
 	try {
 		CFile metFile(curMetFilename, CFile::read);
 		if (!metFile.IsOpened()) {
-			AddLogLineM(false, CFormat( _("ERROR: Failed to open part.met file: %s ==> %s") )
+			AddLogLineN(CFormat( _("ERROR: Failed to open part.met file: %s ==> %s") )
 				% curMetFilename
 				% GetFileName() );
 
 			return false;
 		} else if (metFile.GetLength() == 0) {
-			AddLogLineM(false, CFormat( _("ERROR: part.met file is 0 size: %s ==> %s") )
+			AddLogLineN(CFormat( _("ERROR: part.met file is 0 size: %s ==> %s") )
 				% m_partmetfilename
 				% GetFileName() );
 			
@@ -348,7 +357,7 @@
 		if (version != PARTFILE_VERSION && version != PARTFILE_SPLITTEDVERSION && version != PARTFILE_VERSION_LARGEFILE){
 			metFile.Close();
 			//if (version == 83) return ImportShareazaTempFile(...)
-			AddLogLineM(false, CFormat( _("ERROR: Invalid part.met fileversion: %s ==> %s") )
+			AddLogLineN(CFormat( _("ERROR: Invalid part.met file version: %s ==> %s") )
 				% m_partmetfilename 
 				% GetFileName() );
 			return false;
@@ -357,8 +366,8 @@
 		isnewstyle = (version == PARTFILE_SPLITTEDVERSION);
 		partmettype = isnewstyle ? PMT_SPLITTED : PMT_DEFAULTOLD;
 		
-		if (!isnewstyle) {
-			uint8 test[4];
+		if (version == PARTFILE_VERSION) {// Do we still need this check ?
+			uint8 test[4];									// It will fail for certain files.
 			metFile.Seek(24, wxFromStart);
 			metFile.Read(test,4);
 		
@@ -549,8 +558,8 @@
 									gap->end = newtag.GetInt()-1;
 								}
 							} else {
-								printf("Wrong gap map key while reading met file!\n");
-								wxASSERT(0);
+								AddDebugLogLineN(logPartFile, wxT("Wrong gap map key while reading met file!"));
+								wxFAIL;
 							}
 							// End Changes by Slugfiller for better exception handling
 						} else {
@@ -578,30 +587,26 @@
 			if (!m_hashlist.empty()) {
 				CreateHashFromHashlist(m_hashlist, &checkhash);
 			}
-			bool flag=false;
-			if (m_abyFileHash == checkhash) {
-				flag=true;
-			} else {
+			if (m_abyFileHash != checkhash) {
 				m_hashlist.clear();
-				flag=false;
 			}
 		}			
 	} catch (const CInvalidPacket& e) {
-		AddLogLineM(true, CFormat(wxT("Error: %s (%s) is corrupt (bad tags: %s), unable to load file.")) 
+		AddLogLineC(CFormat(_("Error: %s (%s) is corrupt (bad tags: %s), unable to load file.")) 
 			% m_partmetfilename
 			% GetFileName()
 			% e.what());
 		return false;		
 	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM(true, logPartFile, CFormat( wxT("IO failure while loading '%s': %s") )
+		AddDebugLogLineC(logPartFile, CFormat( wxT("IO failure while loading '%s': %s") )
 			% m_partmetfilename
 			% e.what() );
 		return false;
 	} catch (const CEOFException& WXUNUSED(e)) {
-		AddLogLineM(true, CFormat( _("ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file.") )
+		AddLogLineC(CFormat( _("ERROR: %s (%s) is corrupt (wrong tagcount), unable to load file.") )
 			% m_partmetfilename
 			% GetFileName() );
-		AddLogLineM(true, _("Trying to recover file info..."));
+		AddLogLineC(_("Trying to recover file info..."));
 		
 		// Safe file is that who have 
 		// - FileSize
@@ -615,15 +620,14 @@
 			// -Filename
 			if (!GetFileName().IsOk()) {
 				// Not critical, let's put a random filename.
-				AddLogLineM(true, _(
+				AddLogLineC(_(
 					"Recovering no-named file - will try to recover it as RecoveredFile.dat"));
 				SetFileName(CPath(wxT("RecoveredFile.dat")));
 			}
 		
-			AddLogLineM(true,
-				_("Recovered all available file info :D - Trying to use it..."));
+			AddLogLineC(_("Recovered all available file info :D - Trying to use it..."));
 		} else {
-			AddLogLineM(true, _("Unable to recover file info :("));
+			AddLogLineC(_("Unable to recover file info :("));
 			return false;			
 		}		
 	}
@@ -631,6 +635,8 @@
 	if (getsizeonly) {
 		return partmettype;
 	}
+	// Init Gaplist
+	m_gaplist.Init(GetFileSize(), false);	// Init full, then add gaps
 	// Now to flush the map into the list (Slugfiller)
 	std::map<uint16, Gap_Struct*>::iterator it = gap_map.begin();
 	for ( ; it != gap_map.end(); ++it ) {
@@ -643,7 +649,7 @@
 			if (gap->end >= GetFileSize()) {
 				gap->end = GetFileSize()-1; // Clipping
 			}
-			AddGap(gap->start, gap->end); // All tags accounted for, use safe adding
+			m_gaplist.AddGap(gap->start, gap->end); // All tags accounted for, use safe adding
 		}
 		delete gap;
 		// SLUGFILLER: SafeHash
@@ -655,15 +661,14 @@
 	}
 
 	// open permanent handle
-	CPath partFilePath = m_fullname.RemoveExt();
-	if ( !m_hpartfile.Open(partFilePath, CFile::read_write)) {
-		AddLogLineM(false, CFormat( _("Failed to open %s (%s)") )
+	if ( !m_hpartfile.Open(m_PartPath, CFile::read_write)) {
+		AddLogLineN(CFormat( _("Failed to open %s (%s)") )
 			% m_fullname
 			% GetFileName() );
 		return false;
 	}
 	
-	SetPartFileStatus(PS_EMPTY);
+	SetStatus(PS_EMPTY);
 
 	try {
 		// SLUGFILLER: SafeHash - final safety, make sure any missing part of the file is gap
@@ -671,15 +676,17 @@
 			AddGap(m_hpartfile.GetLength(), GetFileSize()-1);
 		// Goes both ways - Partfile should never be too large
 		if (m_hpartfile.GetLength() > GetFileSize()) {
-			AddDebugLogLineM( true, logPartFile, CFormat( wxT("Partfile \"%s\" is too large! Truncating %llu bytes.") ) % GetFileName() % (m_hpartfile.GetLength() - GetFileSize()));
+			AddDebugLogLineC(logPartFile, CFormat( wxT("Partfile \"%s\" is too large! Truncating %llu bytes.") ) % GetFileName() % (m_hpartfile.GetLength() - GetFileSize()));
 			m_hpartfile.SetLength(GetFileSize());
 		}
 		// SLUGFILLER: SafeHash
 	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM( true, logPartFile, CFormat( wxT("Error while accessing partfile \"%s\": %s") ) % GetFileName() % e.what());
-		SetPartFileStatus(PS_ERROR);
+		AddDebugLogLineC(logPartFile, CFormat( wxT("Error while accessing partfile \"%s\": %s") ) % GetFileName() % e.what());
+		SetStatus(PS_ERROR);
 	}
 
+	// now close the file again until needed
+	m_hpartfile.Release(true);
 	
 	// check hashcount, file status etc
 	if (GetHashCount() != GetED2KPartHashCount()){	
@@ -688,28 +695,28 @@
 	} else {
 		m_hashsetneeded = false;
 		for (size_t i = 0; i < m_hashlist.size(); ++i) {
-			if (IsComplete(i*PARTSIZE,((i+1)*PARTSIZE)-1)) {
-				SetPartFileStatus(PS_READY);
+			if (IsComplete(i)) {
+				SetStatus(PS_READY);
 			}
 		}
 	}
 	
-	if (m_gaplist.empty()) { // is this file complete already?
+	if (m_gaplist.IsComplete()) { // is this file complete already?
 		CompleteFile(false);
 		return true;
 	}
 
 	if (!isnewstyle) { // not for importing	
-		const time_t file_date = CPath::GetModificationTime(partFilePath);
+		const time_t file_date = CPath::GetModificationTime(m_PartPath);
 		if (m_lastDateChanged != file_date) {
 			// It's pointless to rehash an empty file, since the case
 			// where a user has zero'd a file is handled above ...
 			if (m_hpartfile.GetLength()) {
-				AddLogLineM(false, CFormat( _("WARNING: %s might be corrupted (%i)") )
-					% partFilePath
+				AddLogLineN(CFormat( _("WARNING: %s might be corrupted (%i)") )
+					% m_PartPath
 					% (m_lastDateChanged - file_date) );
 				// rehash
-				SetPartFileStatus(PS_WAITINGFORHASH);
+				SetStatus(PS_WAITINGFORHASH);
 			
 				CPath partFileName = m_partmetfilename.RemoveExt();
 				CThreadScheduler::AddTask(new CHashingTask(m_filePath, partFileName, this));
@@ -745,7 +752,7 @@
 	
 	CFile file;
 	try {
-		if (!m_fullname.RemoveExt().FileExists()) {
+		if (!m_PartPath.FileExists()) {
 			throw wxString(wxT(".part file not found"));
 		}
 		
@@ -764,7 +771,7 @@
 		// version
 		file.WriteUInt8(IsLargeFile() ? PARTFILE_VERSION_LARGEFILE : PARTFILE_VERSION);
 		
-		file.WriteUInt32(CPath::GetModificationTime(m_fullname.RemoveExt()));
+		file.WriteUInt32(CPath::GetModificationTime(m_PartPath));
 		// hash
 		file.WriteHash(m_abyFileHash);
 		uint16 parts = m_hashlist.size();
@@ -842,7 +849,7 @@
 				if (!strCorruptedParts.IsEmpty()) {
 					strCorruptedParts += wxT(",");
 				}
-				strCorruptedParts += wxString::Format(wxT("%u"), (unsigned)uCorruptedPart);
+				strCorruptedParts += CFormat(wxT("%u")) % uCorruptedPart;
 			}
 			wxASSERT( !strCorruptedParts.IsEmpty() );
 			
@@ -873,37 +880,28 @@
 		
 		// gaps
 		unsigned i_pos = 0;
-		std::list<Gap_Struct*>::iterator it = m_gaplist.begin();
-		for (; it != m_gaplist.end(); ++it) {
-			wxString tagName = wxString::Format(wxT(" %u"), i_pos);
+		for (CGapList::const_iterator it = m_gaplist.begin(); it != m_gaplist.end(); ++it) {
+			wxString tagName = CFormat(wxT(" %u")) % i_pos;
 			
 			// gap start = first missing byte but gap ends = first non-missing byte
 			// in edonkey but I think its easier to user the real limits
 			tagName[0] = FT_GAPSTART;
-			CTagIntSized(tagName, (*it)->start		, IsLargeFile() ? 64 : 32).WriteTagToFile( &file );
+			CTagIntSized(tagName, it.start(),	IsLargeFile() ? 64 : 32).WriteTagToFile( &file );
 			
 			tagName[0] = FT_GAPEND;
-			CTagIntSized(tagName, ((*it)->end + 1), IsLargeFile() ? 64 : 32).WriteTagToFile( &file );
+			CTagIntSized(tagName, it.end() + 1, IsLargeFile() ? 64 : 32).WriteTagToFile( &file );
 			
 			++i_pos;
 		}
 	} catch (const wxString& error) {
-		AddLogLineM(false, CFormat( _("ERROR while saving partfile: %s (%s ==> %s)") )
+		AddLogLineNS(CFormat( _("ERROR while saving partfile: %s (%s ==> %s)") )
 			% error
 			% m_partmetfilename
 			% GetFileName() );
 
-		wxString err = CFormat( _("ERROR while saving partfile: %s (%s ==> %s)") )
-			% error
-			% m_partmetfilename
-			% GetFileName();
-		
-		printf("%s\n", (const char*)unicode2char(err));
-		
 		return false;
 	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM(true, logPartFile, wxT("IO failure while saving partfile: ") + e.what());
-		printf("IO failure while saving partfile: %s\n", (const char*)unicode2char(e.what()));
+		AddLogLineCS(_("IO failure while saving partfile: ") + e.what());
 		
 		return false;
 	}
@@ -959,14 +957,13 @@
 		return;	
 	}	
 	
-	CClientPtrList source_seeds;
+	CClientRefList source_seeds;
 	int n_sources = 0;
 	
-	CClientPtrList::iterator it = m_downloadingSourcesList.begin();
+	CClientRefList::iterator it = m_downloadingSourcesList.begin();
 	for( ; it != m_downloadingSourcesList.end() && n_sources < MAX_SAVED_SOURCES; ++it) {
-		CUpDownClient *cur_src = *it;
-		if (!cur_src->HasLowID()) {
-			source_seeds.push_back(cur_src);
+		if (!it->HasLowID()) {
+			source_seeds.push_back(*it);
 			++n_sources;
 		}
 	}
@@ -976,9 +973,8 @@
 		if (GetSourceCount() > 0) {
 			SourceSet::reverse_iterator rit = m_SrcList.rbegin();
 			for ( ; ((rit != m_SrcList.rend()) && (n_sources<MAX_SAVED_SOURCES)); ++rit) {
-				CUpDownClient* cur_src = *rit;
-				if (!cur_src->HasLowID()) {
-					source_seeds.push_back(cur_src);
+				if (!rit->HasLowID()) {
+					source_seeds.push_back(*rit);
 					++n_sources;
 				}
 			}
@@ -995,7 +991,7 @@
 	CFile file;
 	file.Create(seedsPath, true);
 	if (!file.IsOpened()) {
-		AddLogLineM(false, CFormat( _("Failed to save part.met.seeds file for %s") )
+		AddLogLineN(CFormat( _("Failed to save part.met.seeds file for %s") )
 			% m_fullname);
 		return;
 	}	
@@ -1004,9 +1000,9 @@
 		file.WriteUInt8(0); // v3, to avoid v2 clients choking on it.
 		file.WriteUInt8(source_seeds.size());
 		
-		CClientPtrList::iterator it2 = source_seeds.begin();
+		CClientRefList::iterator it2 = source_seeds.begin();
 		for (; it2 != source_seeds.end(); ++it2) {
-			CUpDownClient* cur_src = *it2;		
+			CUpDownClient* cur_src = it2->GetClient();		
 			file.WriteUInt32(cur_src->GetUserIDHybrid());
 			file.WriteUInt16(cur_src->GetUserPort());
 			file.WriteHash(cur_src->GetUserHash());
@@ -1021,12 +1017,12 @@
 		/* v2: Added to keep track of too old seeds */
 		file.WriteUInt32(wxDateTime::Now().GetTicks());
 		
-		AddLogLineM(false, CFormat( wxPLURAL("Saved %i source seed for partfile: %s (%s)", "Saved %i source seeds for partfile: %s (%s)", n_sources) )
+		AddLogLineN(CFormat( wxPLURAL("Saved %i source seed for partfile: %s (%s)", "Saved %i source seeds for partfile: %s (%s)", n_sources) )
 			% n_sources
 			% m_fullname
 			% GetFileName());
 	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM(true, logPartFile, CFormat( wxT("Error saving partfile's seeds file (%s - %s): %s") )
+		AddDebugLogLineC( logPartFile, CFormat( wxT("Error saving partfile's seeds file (%s - %s): %s") )
 				% m_partmetfilename
 				% GetFileName()
 				% e.what() );
@@ -1050,7 +1046,7 @@
 	
 	CFile file(seedsPath, CFile::read);
 	if (!file.IsOpened()) {
-		AddLogLineM(false, CFormat( _("Partfile %s (%s) has no seeds file") )
+		AddLogLineN(CFormat( _("Partfile %s (%s) has no seeds file") )
 			% m_partmetfilename
 			% GetFileName() );
 		return;
@@ -1059,7 +1055,7 @@
 		
 	try {
 		if (file.GetLength() <= 1) {
-			AddLogLineM(false, CFormat( _("Partfile %s (%s) has a void seeds file") )
+			AddLogLineN(CFormat( _("Partfile %s (%s) has a void seeds file") )
 				% m_partmetfilename
 				% GetFileName() );
 			return;
@@ -1115,7 +1111,7 @@
 		}
 	
 	} catch (const CSafeIOException& e) {
-		AddLogLineM(false, CFormat( _("Error reading partfile's seeds file (%s - %s): %s") )
+		AddLogLineN(CFormat( _("Error reading partfile's seeds file (%s - %s): %s") )
 				% m_partmetfilename
 				% GetFileName()
 				% e.what() );		
@@ -1131,8 +1127,7 @@
 	if (GetED2KPartHashCount() == 0){
 		if (IsComplete(0, GetFileSize()-1)){
 			if (result->GetFileHash() != GetFileHash()){
-				AddLogLineM(false,
-					CFormat(wxPLURAL(
+				AddLogLineN(CFormat(wxPLURAL(
 						"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |%s|",
 						"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash |%s|",
 						0)
@@ -1153,14 +1148,15 @@
 			// Very nice feature, if a file is completed but .part.met don't believe it,
 			// update it.
 			
+			uint64 partStart = i * PARTSIZE;
+			uint64 partEnd   = partStart + GetPartSize(i) - 1;
 			if (!( i < result->GetHashCount() && (result->GetPartHash(i) == GetPartHash(i)))){
-				if (IsComplete(i*PARTSIZE,((i+1)*PARTSIZE)-1)) {
+				if (IsComplete(i)) {
 					CMD4Hash wronghash;
 					if ( i < result->GetHashCount() )
 						wronghash = result->GetPartHash(i);
 			
-					AddLogLineM(false,
-						CFormat(wxPLURAL(
+					AddLogLineN(CFormat(wxPLURAL(
 							"Found corrupted part (%d) in %d part file %s - FileResultHash |%s| FileHash |%s|",
 							"Found corrupted part (%d) in %d parts file %s - FileResultHash |%s| FileHash |%s|",
 							GetED2KPartHashCount())
@@ -1171,23 +1167,17 @@
 						% wronghash.Encode()
 						% GetPartHash(i).Encode() );
 				
-					AddGap(i*PARTSIZE,
-						((uint64)(((i+1)*PARTSIZE)-1) >= GetFileSize()) ?
-							GetFileSize()-1 : ((i+1)*PARTSIZE)-1);
+					AddGap(i);
 					errorfound = true;
 				}
 			} else {
-				if (!IsComplete(i*PARTSIZE,((i+1)*PARTSIZE)-1)){
-					AddLogLineM(false, CFormat( _("Found completed part (%i) in %s") )
+				if (!IsComplete(i)){
+					AddLogLineN(CFormat( _("Found completed part (%i) in %s") )
 						% ( i + 1 )
 						% GetFileName() );
 
-					FillGap(i*PARTSIZE,
-						((uint64)(((i+1)*PARTSIZE)-1) >= GetFileSize()) ?
-							GetFileSize()-1 : ((i+1)*PARTSIZE)-1);
-					RemoveBlockFromList(i*PARTSIZE,
-						((uint64)(((i+1)*PARTSIZE)-1) >= GetFileSize()) ?
-							GetFileSize()-1 : ((i+1)*PARTSIZE)-1);
+					FillGap(i);
+					RemoveBlockFromList(partStart, partEnd);
 				}
 			}						
 		}
@@ -1202,7 +1192,7 @@
 		m_pAICHHashSet->SetOwner(this); 
 	}
 	else if (status == PS_COMPLETING) {
-		AddDebugLogLineM(false, logPartFile,
+		AddDebugLogLineN(logPartFile,
 			CFormat(wxT("Failed to store new AICH Hashset for completed file: %s"))
 				% GetFileName());
 	}
@@ -1215,7 +1205,7 @@
 			return;
 		}
 		else {
-			AddLogLineM(false, CFormat( _("Finished rehashing %s") ) % GetFileName());
+			AddLogLineN(CFormat( _("Finished rehashing %s") ) % GetFileName());
 		}
 	}
 	else{
@@ -1230,45 +1220,13 @@
 
 void CPartFile::AddGap(uint64 start, uint64 end)
 {
-	std::list<Gap_Struct*>::iterator it = m_gaplist.begin();
-	while (it != m_gaplist.end()) {
-		std::list<Gap_Struct*>::iterator it2 = it++;
-		Gap_Struct* cur_gap = *it2;
-	
-		if (cur_gap->start >= start && cur_gap->end <= end) {
-			// this gap is inside the new gap - delete
-			m_gaplist.erase(it2);
-			delete cur_gap;
-			continue;
-		} else if (cur_gap->start >= start && cur_gap->start <= end + 1) {
-			// head of this gap is in the new gap, or this gap is
-			// directly behind the new gap - extend limit and delete
-			end = cur_gap->end;
-			m_gaplist.erase(it2);
-			delete cur_gap;
-			continue;
-		} else if (cur_gap->end <= end && cur_gap->end >= start - 1) {
-			// tail of this gap is in the new gap, or this gap is
-			// directly before the new gap - extend limit and delete
-			start = cur_gap->start;
-			m_gaplist.erase(it2);
-			delete cur_gap;
-			continue;
-		} else if (start >= cur_gap->start && end <= cur_gap->end){
-			// new gap is already inside this gap - return
-			return;
-		// now all cases of overlap are ruled out
-		} else if (cur_gap->start > start) {
-			// this gap is the first behind the new gap -> insert before it
-			it = it2;
-			break;
-		}
-	}
-	
-	Gap_Struct* new_gap = new Gap_Struct;
-	new_gap->start = start;
-	new_gap->end = end;
-	m_gaplist.insert(it, new_gap);
+	m_gaplist.AddGap(start, end);
+	UpdateDisplayedInfo();
+}
+
+void CPartFile::AddGap(uint16 part)
+{
+	m_gaplist.AddGap(part);
 	UpdateDisplayedInfo();
 }
 
@@ -1287,53 +1245,42 @@
 
 bool CPartFile::GetNextEmptyBlockInPart(uint16 partNumber, Requested_Block_Struct *result)
 {
-	Gap_Struct *firstGap;
-	Gap_Struct *currentGap;
-	uint64 end;
-	uint64 blockLimit;
-
 	// Find start of this part
 	uint64 partStart = (PARTSIZE * partNumber);
 	uint64 start = partStart;
 
 	// What is the end limit of this block, i.e. can't go outside part (or filesize)
-	uint64 partEnd = (PARTSIZE * (partNumber + 1)) - 1;
-	if (partEnd >= GetFileSize()) {
-		partEnd = GetFileSize() - 1;
-	}
+	uint64 partEnd = partStart + GetPartSize(partNumber) - 1;
 	// Loop until find a suitable gap and return true, or no more gaps and return false
+	CGapList::const_iterator it = m_gaplist.begin();
 	while (true) {
-		firstGap = NULL;
+		bool noGap = true;
+		uint64 gapStart, end;
 
 		// Find the first gap from the start position
-		std::list<Gap_Struct*>::iterator it = m_gaplist.begin();
 		for (; it != m_gaplist.end(); ++it) {
-			currentGap = *it;
+			gapStart = it.start();
+			end = it.end();
 			
 			// Want gaps that overlap start<->partEnd
-			if ((currentGap->start <= partEnd) && (currentGap->end >= start)) {
-				// Is this the first gap?
-				if ((firstGap == NULL) || (currentGap->start < firstGap->start)) {
-					firstGap = currentGap;
-				}
+			if (gapStart <= partEnd && end >= start) {
+				noGap = false;
+				break;
+			} else if (gapStart > partEnd) {
+				break;
 			}
 		}
 
 		// If no gaps after start, exit
-		if (firstGap == NULL) {
+		if (noGap) {
 			return false;
 		}
 		// Update start position if gap starts after current pos
-		if (start < firstGap->start) {
-			start = firstGap->start;
-		}
-		// If this is not within part, exit
-		if (start > partEnd) {
-			return false;
+		if (start < gapStart) {
+			start = gapStart;
 		}
 		// Find end, keeping within the max block size and the part limit
-		end = firstGap->end;
-		blockLimit = partStart + (BLOCKSIZE * (((start - partStart) / BLOCKSIZE) + 1)) - 1;
+		uint64 blockLimit = partStart + (BLOCKSIZE * (((start - partStart) / BLOCKSIZE) + 1)) - 1;
 		if (end > blockLimit) {
 			end = blockLimit;
 		}
@@ -1366,60 +1313,25 @@
 
 void CPartFile::FillGap(uint64 start, uint64 end)
 {
-	std::list<Gap_Struct*>::iterator it = m_gaplist.begin();
-	while (it != m_gaplist.end()) {
-		std::list<Gap_Struct*>::iterator it2 = it++;
-		Gap_Struct* cur_gap = *it2;
-	
-		if (cur_gap->start >= start && cur_gap->end <= end) {
-			// our part fills this gap completly
-			m_gaplist.erase(it2);
-			delete cur_gap;
-			continue;
-		} else if (cur_gap->start >= start && cur_gap->start <= end) {
-			// a part of this gap is in the part - set limit
-			cur_gap->start = end+1;
-		} else if (cur_gap->end <= end && cur_gap->end >= start) {
-			// a part of this gap is in the part - set limit
-			cur_gap->end = start-1;
-		} else if (start >= cur_gap->start && end <= cur_gap->end) {
-			uint64 buffer = cur_gap->end;
-			cur_gap->end = start-1;
-			cur_gap = new Gap_Struct;
-			cur_gap->start = end+1;
-			cur_gap->end = buffer;
-			m_gaplist.insert(++it2, cur_gap);
-			break;
-		}
-	}
+	m_gaplist.FillGap(start, end);
 	UpdateCompletedInfos();
 	UpdateDisplayedInfo();
 }
 
-
-void CPartFile::UpdateCompletedInfos()
+void CPartFile::FillGap(uint16 part)
 {
-   	uint64 allgaps = 0;
+	m_gaplist.FillGap(part);
+	UpdateCompletedInfos();
+	UpdateDisplayedInfo();
+}
 
-	std::list<Gap_Struct*>::iterator it = m_gaplist.begin();
-	for (; it != m_gaplist.end(); ) {
-		std::list<Gap_Struct*>::iterator it2 = it++;
-		Gap_Struct* cur_gap = *it2;
 
-		if ((cur_gap->end > GetFileSize()) || (cur_gap->start >= GetFileSize())) {
-			m_gaplist.erase(it2);
-		} else {
-			allgaps += cur_gap->end - cur_gap->start + 1;
-		}
-	}
+void CPartFile::UpdateCompletedInfos()
+{
+	uint64 allgaps = m_gaplist.GetGapSize();
 
-	if ((!m_gaplist.empty()) || (!m_requestedblocks_list.empty())) {
-		percentcompleted = (1.0f-(double)allgaps/GetFileSize()) * 100;
-		completedsize = GetFileSize() - allgaps;
-	} else {
-		percentcompleted = 100;
-		completedsize = GetFileSize();
-	}
+	percentcompleted = (1.0 - (double)allgaps/GetFileSize()) * 100.0;
+	completedsize = GetFileSize() - allgaps;
 }
 
 
@@ -1431,7 +1343,7 @@
 	while (done != parts){
 		uint8 towrite = 0;
 		for (uint32 i = 0;i != 8;++i) {
-			if (IsComplete(done*PARTSIZE,((done+1)*PARTSIZE)-1)) {
+			if (IsComplete(done)) {
 				towrite |= (1<<i);
 			}
 			++done;
@@ -1456,10 +1368,7 @@
 	// If buffer size exceeds limit, or if not written within time limit, flush data
 	if (	(m_nTotalBufferData > thePrefs::GetFileBufferSize()) ||
 		(dwCurTick > (m_nLastBufferFlushTime + BUFFER_TIME_LIMIT))) {
-		// Avoid flushing while copying preview file
-		if (!m_bPreviewing) {
-			FlushBuffer();
-		}
+		FlushBuffer();
 	}
 
 
@@ -1470,9 +1379,9 @@
 
 	if (m_icounter < 10) {
 		// Update only downloading sources.
-		CClientPtrList::iterator it = m_downloadingSourcesList.begin();
+		CClientRefList::iterator it = m_downloadingSourcesList.begin();
 		for( ; it != m_downloadingSourcesList.end(); ) {
-			CUpDownClient *cur_src = *it++;
+			CUpDownClient *cur_src = it++->GetClient();
 			if(cur_src->GetDownloadState() == DS_DOWNLOADING) {
 				++transferingsrc;
 				kBpsDown += cur_src->SetDownloadLimit(reducedownload);
@@ -1481,7 +1390,7 @@
 	} else {
 		// Update all sources (including downloading sources)
 		for ( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ) {
-			CUpDownClient* cur_src = *it++;
+			CUpDownClient* cur_src = it++->GetClient();
 			switch (cur_src->GetDownloadState()) {
 				case DS_DOWNLOADING: {
 					++transferingsrc;
@@ -1495,13 +1404,13 @@
 					break;
 				}
 				case DS_LOWTOLOWIP: {
-					if ( cur_src->HasLowID() && !theApp->DoCallback( cur_src ) ) {
+					if (cur_src->HasLowID() && !theApp->CanDoCallback(cur_src->GetServerIP(), cur_src->GetServerPort())) {
 						// If we are almost maxed on sources,
 						// slowly remove these client to see 
 						// if we can find a better source.
-						if( 	((dwCurTick - lastpurgetime) > 30000) &&
+						if (((dwCurTick - lastpurgetime) > 30000) &&
 							(GetSourceCount() >= (thePrefs::GetMaxSourcePerFile()*.8))) {
-							RemoveSource( cur_src );
+							RemoveSource(cur_src);
 							lastpurgetime = dwCurTick;
 							break;
 						}
@@ -1580,7 +1489,7 @@
 		if (IsA4AFAuto() && ((!m_LastNoNeededCheck) || (dwCurTick - m_LastNoNeededCheck > 900000))) {
 			m_LastNoNeededCheck = dwCurTick;
 			for ( SourceSet::iterator it = m_A4AFsrclist.begin(); it != m_A4AFsrclist.end(); ) {
-				CUpDownClient *cur_source = *it++;
+				CUpDownClient *cur_source = it++->GetClient();
 				uint8 download_state=cur_source->GetDownloadState();
 				if( download_state != DS_DOWNLOADING
 				&& cur_source->GetRequestFile() 
@@ -1595,7 +1504,7 @@
 		// swap No needed partfiles if possible
 
 		if (((old_trans==0) && (transferingsrc>0)) || ((old_trans>0) && (transferingsrc==0))) {
-			SetPartFileStatus(status);
+			SetStatus(status);
 		}
 	
 		// Kad source search		
@@ -1613,9 +1522,9 @@
 			
 				Kademlia::CUInt128 kadFileID(GetFileHash().GetHash());
 				Kademlia::CSearch* pSearch = Kademlia::CSearchManager::PrepareLookup(Kademlia::CSearch::FILE, true, kadFileID);
-				AddDebugLogLineM(false, logKadSearch, CFormat(wxT("Preparing a Kad Search for '%s'")) % GetFileName());
+				AddDebugLogLineN(logKadSearch, CFormat(wxT("Preparing a Kad Search for '%s'")) % GetFileName());
 				if (pSearch) {
-					AddDebugLogLineM(false, logKadSearch, CFormat(wxT("Kad lookup started for '%s'")) % GetFileName());
+					AddDebugLogLineN(logKadSearch, CFormat(wxT("Kad lookup started for '%s'")) % GetFileName());
 					if(m_TotalSearchesKad < 7) {
 						m_TotalSearchesKad++;
 					}
@@ -1654,10 +1563,10 @@
 			UpdateCompletedInfos();
 		}
 		m_bPercentUpdated = false;
-		if (thePrefs::ShowCatTabInfos()) {
-			Notify_ShowUpdateCatTabTitles();
-		}				
 	}
+
+	// release file handle if unused for some time
+	m_hpartfile.Release();
 	
 	return (uint32)(kBpsDown*1024.0);
 }
@@ -1724,7 +1633,7 @@
 	
 	if (m_stopped) {
 		// since we may received multiple search source UDP results we have to "consume" all data of that packet
-		AddDebugLogLineM(false, logPartFile, wxT("Trying to add sources for a stopped file"));
+		AddDebugLogLineN(logPartFile, wxT("Trying to add sources for a stopped file"));
 		sources.Seek(count*(4+2), wxFromCurrent);
 		return;
 	}
@@ -1742,9 +1651,9 @@
 
 			if ((thePrefs::IsClientCryptLayerRequested() && (byCryptOptions & 0x01/*supported*/) > 0 && (byCryptOptions & 0x80) == 0)
 				|| (thePrefs::IsClientCryptLayerSupported() && (byCryptOptions & 0x02/*requested*/) > 0 && (byCryptOptions & 0x80) == 0)) {
-				AddDebugLogLineM(false, logPartFile, wxString::Format(wxT("Server didn't provide UserHash for source %u, even if it was expected to (or local obfuscationsettings changed during serverconnect"), userid));
+				AddDebugLogLineN(logPartFile, CFormat(wxT("Server didn't provide UserHash for source %u, even if it was expected to (or local obfuscationsettings changed during serverconnect")) % userid);
 			} else if (!thePrefs::IsClientCryptLayerRequested() && (byCryptOptions & 0x02/*requested*/) == 0 && (byCryptOptions & 0x80) != 0) {
-				AddDebugLogLineM(false, logPartFile, wxString::Format(wxT("Server provided UserHash for source %u, even if it wasn't expected to (or local obfuscationsettings changed during serverconnect"), userid));
+				AddDebugLogLineN(logPartFile, CFormat(wxT("Server provided UserHash for source %u, even if it wasn't expected to (or local obfuscationsettings changed during serverconnect")) % userid);
 			}
 		}
 			
@@ -1777,7 +1686,7 @@
 
 			theApp->downloadqueue->CheckAndAddSource(this,newsource);
 		} else {
-			AddDebugLogLineM(false, logPartFile, wxT("Consuming a packet because of max sources reached"));
+			AddDebugLogLineN(logPartFile, wxT("Consuming a packet because of max sources reached"));
 			// Since we may receive multiple search source UDP results we have to "consume" all data of that packet
 			// This '+1' is added because 'i' counts from 0.
 			sources.Seek((count-(i+1))*(4+2), wxFromCurrent);
@@ -1825,8 +1734,9 @@
 		count.reserve(GetSourceCount());	
 	
 		for ( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ++it ) {
-			if ( !(*it)->GetUpPartStatus().empty() && (*it)->GetUpPartCount() == partcount ) {
-				count.push_back((*it)->GetUpCompleteSourcesCount());
+			CUpDownClient* client = it->GetClient();
+			if ( !client->GetUpPartStatus().empty() && client->GetUpPartCount() == partcount ) {
+				count.push_back(client->GetUpCompleteSourcesCount());
 			}
 		}
 	
@@ -2039,9 +1949,7 @@
 					
 					// Offsets of chunk
 					const uint64 uStart = cur_chunk.part * PARTSIZE;
-					const uint64 uEnd  =
-						((GetFileSize() - 1) < (uStart + PARTSIZE - 1)) ?
-							(GetFileSize() - 1) : (uStart + PARTSIZE - 1);
+					const uint64 uEnd   = uStart + GetPartSize(cur_chunk.part) - 1;
 					// Criterion 2. Parts used for preview
 					// Remark: - We need to download the first part and the last part(s).
 					//        - When the last part is very small, it's necessary to 
@@ -2068,27 +1976,8 @@
 						IsAlreadyRequested(uStart, uEnd);
 
 					// Criterion 4. Completion
-					uint64 partSize = PARTSIZE;
-
-					std::list<Gap_Struct*>::iterator it2 = m_gaplist.begin();
-					for (; it2 != m_gaplist.end(); ++it2) {
-						const Gap_Struct* cur_gap = *it2;
-						// Check if Gap is into the limit
-						if(cur_gap->start < uStart) {
-							if(cur_gap->end > uStart && cur_gap->end < uEnd) {
-								partSize -= cur_gap->end - uStart + 1;
-							} else if(cur_gap->end >= uEnd) {
-								partSize = 0;
-								break; // exit loop for()
-							}
-						} else if(cur_gap->start <= uEnd) {
-							if(cur_gap->end < uEnd) {
-								partSize -= cur_gap->end - cur_gap->start + 1;
-							} else {
-								partSize -= uEnd - cur_gap->start + 1;
-							}
-						}
-					}
+					// PARTSIZE instead of GetPartSize() favours the last chunk - but that may be intentional
+					uint32 partSize = PARTSIZE - m_gaplist.GetGapSize(cur_chunk.part);
 					const uint16 critCompletion = (uint16)(partSize/(PARTSIZE/100)); // in [%]
 
 					// Calculate priority with all criteria
@@ -2202,10 +2091,10 @@
 
 	theApp->downloadqueue->RemoveLocalServerRequest(this);
 
-	AddDebugLogLineM( false, logPartFile, wxString( wxT("CPartFile::CompleteFile: Hash ") ) + ( bIsHashingDone ? wxT("done") : wxT("not done") ) );
+	AddDebugLogLineN( logPartFile, wxString( wxT("CPartFile::CompleteFile: Hash ") ) + ( bIsHashingDone ? wxT("done") : wxT("not done") ) );
 			  
 	if (!bIsHashingDone) {
-		SetPartFileStatus(PS_COMPLETING);
+		SetStatus(PS_COMPLETING);
 		kBpsDown = 0.0;
 
 		CPath partFile = m_partmetfilename.RemoveExt();
@@ -2214,7 +2103,7 @@
 	} else {
 		StopFile();
 		m_is_A4AF_auto=false;
-		SetPartFileStatus(PS_COMPLETING);
+		SetStatus(PS_COMPLETING);
 		// guess I was wrong about not need to spaw a thread ...
 		// It is if the temp and incoming dirs are on different
 		// partitions/drives and the file is large...[oz]
@@ -2235,8 +2124,8 @@
 {	
 	if (errorOccured) {
 		m_paused = true;
-		SetPartFileStatus(PS_ERROR);
-		AddLogLineM(true, CFormat( _("Unexpected error while completing %s. File paused") )% GetFileName() );
+		SetStatus(PS_ERROR);
+		AddLogLineC(CFormat( _("Unexpected error while completing %s. File paused") )% GetFileName() );
 	} else {
 		m_fullname = newname;
 
@@ -2244,16 +2133,23 @@
 		SetFileName(m_fullname.GetFullName());
 		m_lastDateChanged = CPath::GetModificationTime(m_fullname);
 		
-		SetPartFileStatus(PS_COMPLETE);
+		SetStatus(PS_COMPLETE);
 		m_paused = false;
 		ClearPriority();
 		
-		// TODO: What the f*** if it is already known?
-		theApp->knownfiles->SafeAddKFile(this);
-		
+
+		// Remove from list of canceled files in case it was canceled once upon a time
+		if (theApp->canceledfiles->Remove(GetFileHash())) {
+			theApp->canceledfiles->Save();
+		}
+
+		// Mark as known (checks if it's already known),
+		// also updates search files
+		theApp->knownfiles->SafeAddKFile(this);		
+
 		// remove the file from the suspended uploads list
 		theApp->uploadqueue->ResumeUpload(GetFileHash());		
-		theApp->downloadqueue->RemoveFile(this);
+		theApp->downloadqueue->RemoveFile(this, true);
 		theApp->sharedfiles->SafeAddKFile(this);
 		UpdateDisplayedInfo(true);
 
@@ -2263,7 +2159,10 @@
 		// Ensure that completed shows the correct value
 		completedsize = GetFileSize();
 
-		AddLogLineM(true, CFormat( _("Finished downloading: %s") ) % GetFileName() );
+		// clear the blackbox to free up memory
+		m_CorruptionBlackBox->Free();
+
+		AddLogLineC(CFormat( _("Finished downloading: %s") ) % GetFileName() );
 	}
 	
 	theApp->downloadqueue->StartNextFile(this);	
@@ -2273,7 +2172,7 @@
 void CPartFile::PerformFileComplete()
 {
 	// add this file to the suspended uploads list
-	theApp->uploadqueue->SuspendUpload(GetFileHash());
+	theApp->uploadqueue->SuspendUpload(GetFileHash(), false);
 	FlushBuffer();
 
 	// close permanent handle
@@ -2289,7 +2188,7 @@
 void  CPartFile::RemoveAllSources(bool bTryToSwap)
 {
 	for( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end();) {
-		CUpDownClient* cur_src = *it++;
+		CUpDownClient* cur_src = it++->GetClient();
 		if (bTryToSwap) {
 			if (!cur_src->SwapToAnotherFile(true, true, true, NULL)) {
 				RemoveSource(cur_src,true,false);
@@ -2306,9 +2205,9 @@
 	// remove all links A4AF in sources to this file
 	if(!m_A4AFsrclist.empty()) {
 		for( SourceSet::iterator it = m_A4AFsrclist.begin(); it != m_A4AFsrclist.end(); ) {
-			CUpDownClient* cur_src = *it++;
+			CUpDownClient* cur_src = it++->GetClient();
 			if ( cur_src->DeleteFileRequest( this ) ) {
-				Notify_DownloadCtrlRemoveSource(cur_src, this);
+				Notify_SourceCtrlRemoveSource(cur_src->ECID(), this);
 			}
 		}
 		m_A4AFsrclist.clear();
@@ -2320,58 +2219,63 @@
 
 void CPartFile::Delete()
 {
-	AddLogLineM(false, CFormat(_("Deleting file: %s")) % GetFileName());
+	AddLogLineN(CFormat(_("Deleting file: %s")) % GetFileName());
 	// Barry - Need to tell any connected clients to stop sending the file
 	StopFile(true);
-	AddDebugLogLineM(false, logPartFile, wxT("\tStopped"));
-	
+	AddDebugLogLineN(logPartFile, wxT("\tStopped"));
+
+#ifdef __DEBUG__
+	uint16 removed =
+#endif
+		theApp->uploadqueue->SuspendUpload(GetFileHash(), true);
+	AddDebugLogLineN(logPartFile, CFormat(wxT("\tSuspended upload to %d clients")) % removed);
 	theApp->sharedfiles->RemoveFile(this);
-	AddDebugLogLineM(false, logPartFile, wxT("\tRemoved from shared"));
+	AddDebugLogLineN(logPartFile, wxT("\tRemoved from shared"));
 	theApp->downloadqueue->RemoveFile(this);
-	AddDebugLogLineM(false, logPartFile, wxT("\tRemoved from download queue"));
+	AddDebugLogLineN(logPartFile, wxT("\tRemoved from download queue"));
 	Notify_DownloadCtrlRemoveFile(this);
-	AddDebugLogLineM(false, logPartFile, wxT("\tRemoved transferwnd"));
+	AddDebugLogLineN(logPartFile, wxT("\tRemoved from transferwnd"));
+	if (theApp->canceledfiles->Add(GetFileHash())) {
+		theApp->canceledfiles->Save();
+	}
+	AddDebugLogLineN(logPartFile, wxT("\tAdded to canceled file list"));
+	theApp->searchlist->UpdateSearchFileByHash(GetFileHash()); 	// Update file in the search dialog if it's still open
 
-	// Kry - WTF? 
-	// eMule had same problem with lseek error ... and override with a simple 
-	// check for INVALID_HANDLE_VALUE (that, btw, does not exist on linux)
-	// So we just guess is < 0 on error and > 2 if ok (0 stdin, 1 stdout, 2 stderr)
-	if (m_hpartfile.fd() > 2) {  // 0 stdin, 1 stdout, 2 stderr
+	if (m_hpartfile.IsOpened()) {
 		m_hpartfile.Close();
 	}
 
-	AddDebugLogLineM(false, logPartFile, wxT("\tClosed"));
+	AddDebugLogLineN(logPartFile, wxT("\tClosed"));
 	
 	if (!CPath::RemoveFile(m_fullname)) {
-		AddDebugLogLineM(true, logPartFile, CFormat(wxT("\tFailed to delete '%s'")) % m_fullname);
+		AddDebugLogLineC(logPartFile, CFormat(wxT("\tFailed to delete '%s'")) % m_fullname);
 	} else {
-		AddDebugLogLineM(false, logPartFile, wxT("\tRemoved .part.met"));
+		AddDebugLogLineN(logPartFile, wxT("\tRemoved .part.met"));
 	}
 
-	CPath partFile = m_fullname.RemoveExt();
-	if (!CPath::RemoveFile(partFile)) {
-		AddDebugLogLineM(true, logPartFile, CFormat(wxT("Failed to delete '%s'")) % partFile);
+	if (!CPath::RemoveFile(m_PartPath)) {
+		AddDebugLogLineC(logPartFile, CFormat(wxT("Failed to delete '%s'")) % m_PartPath);
 	} else {
-		AddDebugLogLineM(false, logPartFile, wxT("\tRemoved .part"));
+		AddDebugLogLineN(logPartFile, wxT("\tRemoved .part"));
 	}
 	
 	CPath BAKName = m_fullname.AppendExt(PARTMET_BAK_EXT);
 	if (!CPath::RemoveFile(BAKName)) {
-		AddDebugLogLineM(true, logPartFile, CFormat(wxT("Failed to delete '%s'")) % BAKName);
+		AddDebugLogLineC(logPartFile, CFormat(wxT("Failed to delete '%s'")) % BAKName);
 	} else {
-		AddDebugLogLineM(false, logPartFile, wxT("\tRemoved .BAK"));
+		AddDebugLogLineN(logPartFile, wxT("\tRemoved .bak"));
 	}
 	
 	CPath SEEDSName = m_fullname.AppendExt(wxT(".seeds"));
 	if (SEEDSName.FileExists()) {
 		if (CPath::RemoveFile(SEEDSName)) {
-			AddDebugLogLineM(false, logPartFile, wxT("\tRemoved .seeds"));
+			AddDebugLogLineN(logPartFile, wxT("\tRemoved .seeds"));
 		} else {
-			AddDebugLogLineM(true, logPartFile, CFormat(wxT("Failed to delete '%s'")) % SEEDSName);
+			AddDebugLogLineC(logPartFile, CFormat(wxT("Failed to delete '%s'")) % SEEDSName);
 		}
 	}
 
-	AddDebugLogLineM(false, logPartFile, wxT("Done"));
+	AddDebugLogLineN(logPartFile, wxT("Done"));
 	
 	delete this;
 }
@@ -2380,41 +2284,36 @@
 bool CPartFile::HashSinglePart(uint16 partnumber)
 {
 	if ((GetHashCount() <= partnumber) && (GetPartCount() > 1)) {
-		AddLogLineM(true,
-			CFormat( _("WARNING: Unable to hash downloaded part - hashset incomplete for '%s'") )
+		AddLogLineC(CFormat( _("WARNING: Unable to hash downloaded part - hashset incomplete for '%s'") )
 				% GetFileName() );
 		m_hashsetneeded = true;
 		return true;
 	} else if ((GetHashCount() <= partnumber) && GetPartCount() != 1) {
-		AddLogLineM(true, CFormat( _("ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen")) % GetFileName() );
+		AddLogLineC(CFormat( _("ERROR: Unable to hash downloaded part - hashset incomplete (%s). This should never happen")) % GetFileName() );
 		m_hashsetneeded = true;
 		return true;		
 	} else {
 		CMD4Hash hashresult;
-		uint64 length = PARTSIZE;
-		const uint64 offset = length * partnumber;
+		uint64 offset = PARTSIZE * partnumber;
+		uint32 length = GetPartSize(partnumber);
 		try {
-			m_hpartfile.Seek(offset, wxFromStart);
-			if (offset + PARTSIZE > m_hpartfile.GetLength()) {
-				length = m_hpartfile.GetLength() - offset;
-				wxASSERT( length <= PARTSIZE );
-			}
-			CreateHashFromFile(&m_hpartfile, length, &hashresult, NULL);
+			CreateHashFromFile(m_hpartfile, offset, length, &hashresult, NULL);
 		} catch (const CIOFailureException& e) {
-			AddLogLineM(true, CFormat( wxT("EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"))
+			AddLogLineC(CFormat( _("EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"))
 				% partnumber % length % (offset+length) % GetFileName() % GetFileSize() % e.what());
-			SetPartFileStatus(PS_ERROR);
+			SetStatus(PS_ERROR);
 			return false;
 		} catch (const CEOFException& e) {
-			AddLogLineM(true, CFormat( wxT("EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"))
+			AddLogLineC(CFormat( _("EOF while hashing downloaded part %u with length %u (max %u) of partfile '%s' with length %u: %s"))
 				% partnumber % length % (offset+length) % GetFileName() % GetFileSize() % e.what());
+			SetStatus(PS_ERROR);
 			return false;
 		}
 
 		if (GetPartCount() > 1) {
 			if (hashresult != GetPartHash(partnumber)) {
-				AddDebugLogLineM(false, logPartFile, CFormat( wxT("%s: Expected part-hash: %s")) % GetFileName() % GetPartHash(partnumber).Encode() );
-				AddDebugLogLineM(false, logPartFile, CFormat( wxT("%s: Actual part-hash: %s")) % GetFileName() % hashresult.Encode() );
+				AddDebugLogLineN(logPartFile, CFormat( wxT("%s: Expected hash of part %d: %s")) % GetFileName() % partnumber % GetPartHash(partnumber).Encode() );
+				AddDebugLogLineN(logPartFile, CFormat( wxT("%s: Actual   hash of part %d: %s")) % GetFileName() % partnumber % hashresult.Encode() );
 				return false;
 			} else {
 				return true;
@@ -2451,7 +2350,7 @@
 
 void CPartFile::StopFile(bool bCancel)
 {
-	// Kry - Need to set it here to get into SetPartFileStatus(status) correctly
+	// Kry - Need to set it here to get into SetStatus(status) correctly
 	m_stopped = true; 
 	
 	// Barry - Need to tell any connected clients to stop sending the file
@@ -2463,10 +2362,9 @@
 	RemoveAllSources(true);
 	kBpsDown = 0.0;
 	transferingsrc = 0;
-	memset(m_anStates,0,sizeof(m_anStates));
 	
 	if (!bCancel) {
-		FlushBuffer(true);
+		FlushBuffer();
 	}
 	
 	UpdateDisplayedInfo(true);
@@ -2485,8 +2383,11 @@
 					m_iLastPausePurge = time(NULL);
 					StopFile();
 				}
+				kBpsDown = 0.0;
 		}
 	}
+	// release file handle if unused for some time
+	m_hpartfile.Release();
 }
 
 
@@ -2510,15 +2411,17 @@
 
 	CPacket packet( OP_CANCELTRANSFER, 0, OP_EDONKEYPROT );
 	for( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ) {
-		CUpDownClient* cur_src = *it++;
+		CUpDownClient* cur_src = it++->GetClient();
 		if (cur_src->GetDownloadState() == DS_DOWNLOADING) {
 			if (!cur_src->GetSentCancelTransfer()) {				
 				theStats::AddUpOverheadOther( packet.GetPacketSize() );
-				AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + cur_src->GetFullIP() );
+				AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_CANCELTRANSFER to ") + cur_src->GetFullIP() );
 				cur_src->SendPacket( &packet, false, true );
 				cur_src->SetSentCancelTransfer( true );
 			}
 			cur_src->SetDownloadState(DS_ONQUEUE);
+			// Allow immediate reconnect on resume
+			cur_src->ResetLastAskedTime();
 		}
 	}
 
@@ -2529,7 +2432,6 @@
 	
 	kBpsDown = 0.0;
 	transferingsrc = 0;
-	m_anStates[DS_DOWNLOADING] = 0;
 
 	SetStatus(status);
 }
@@ -2554,7 +2456,7 @@
 	SetStatus(status);
 	SetActive(theApp->IsConnected());
 
-	if (m_gaplist.empty() && (GetStatus() == PS_ERROR)) {
+	if (m_gaplist.IsComplete() && (GetStatus() == PS_ERROR)) {
 		// The file has already been hashed at this point
 		CompleteFile(true);
 	}
@@ -2626,7 +2528,7 @@
 		if (GetFileName().IsOk()) {
 			file2 = GetFileName().GetPrintable();
 		}
-		AddDebugLogLineM(false, logPartFile, wxT("File mismatch on source packet (P) Sending: ") + file1 + wxT("  From: ") + file2);
+		AddDebugLogLineN(logPartFile, wxT("File mismatch on source packet (P) Sending: ") + file1 + wxT("  From: ") + file2);
 		return NULL;
 	}
 
@@ -2639,7 +2541,10 @@
 	//wxASSERT(rcvstatus.size() == GetPartCount()); // Obviously!
 	if (KnowNeededParts && (reqstatus.size() != GetPartCount())) {
 		// Yuck. Same file but different part count? Seriously fucked up.
-		AddDebugLogLineM(false, logPartFile, wxString::Format(wxT("Impossible situation: different partcounts for the same part file: %i (client) and %i (file)"),reqstatus.size(),GetPartCount()));
+		// This happens rather often with reqstatus.size() == 0. Don't log then.
+		if (reqstatus.size()) {
+			AddDebugLogLineN(logKnownFiles, CFormat(wxT("Impossible situation: different partcounts: %i (client) and %i (file) for %s")) % reqstatus.size() % GetPartCount() % GetFileName());
+		}
 		return NULL;
 	}	
 	
@@ -2656,13 +2561,13 @@
 
 		// we don't support any special SX2 options yet, reserved for later use
 		if (nRequestedOptions != 0) {
-			AddDebugLogLineM(false, logKnownFiles, CFormat(wxT("Client requested unknown options for SourceExchange2: %u")) % nRequestedOptions);
+			AddDebugLogLineN(logKnownFiles, CFormat(wxT("Client requested unknown options for SourceExchange2: %u")) % nRequestedOptions);
 		}
 	} else {
 		byUsedVersion = forClient->GetSourceExchange1Version();
 		bIsSX2Packet = false;
 		if (forClient->SupportsSourceExchange2()) {
-			AddDebugLogLineM(false, logKnownFiles, wxT("Client which announced to support SX2 sent SX1 packet instead"));
+			AddDebugLogLineN(logKnownFiles, wxT("Client which announced to support SX2 sent SX1 packet instead"));
 		}
 	}
 	
@@ -2673,7 +2578,7 @@
 	bool bNeeded;
 	for (SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ++it ) {
 		bNeeded = false;
-		CUpDownClient* cur_src = *it;
+		CUpDownClient* cur_src = it->GetClient();
 		
 		int state = cur_src->GetDownloadState();
 		int valid = ( state == DS_DOWNLOADING ) || ( state == DS_ONQUEUE && !cur_src->IsRemoteQueueFull() );
@@ -2692,7 +2597,7 @@
 			if ( KnowNeededParts ) {
 				// only send sources which have needed parts for this client
 				for (int x = 0; x < GetPartCount(); ++x) {
-					if (srcstatus[x] && !reqstatus[x]) {
+					if (srcstatus.get(x) && !reqstatus.get(x)) {
 						bNeeded = true;
 						break;
 					}
@@ -2705,7 +2610,7 @@
 					continue;
 				}
 				for (int x = 0; x < GetPartCount(); ++x){
-					if (srcstatus[x]) {
+					if (srcstatus.get(x)) {
 						bNeeded = true;
 						break;
 					}
@@ -2803,7 +2708,7 @@
 			// If v5 inserts additional data (like v2), the above code will correctly filter those packets.
 			// If v5 appends additional data after <count>(<Sources>)[count], we are in trouble with the 
 			// above code. Though a client which does not understand v5+ should never receive such a packet.
-			AddDebugLogLineM(false, logClient, CFormat(wxT("Received invalid source exchange packet (v%u) of data size %u for %s")) % uClientSXVersion % uDataSize % GetFileName());
+			AddDebugLogLineN(logClient, CFormat(wxT("Received invalid source exchange packet (v%u) of data size %u for %s")) % uClientSXVersion % uDataSize % GetFileName());
 			return;
 		}
 	} else {
@@ -2811,7 +2716,7 @@
 		// We only check if the version is known by us and do a quick sanitize check on known version
 		// other then SX1, the packet will be ignored if any error appears, sicne it can't be a "misunderstanding" anymore
 		if (uClientSXVersion > SOURCEEXCHANGE2_VERSION || uClientSXVersion == 0 ){
-			AddDebugLogLineM(false, logPartFile, CFormat(wxT("Invalid source exchange type version: %i")) % uClientSXVersion);
+			AddDebugLogLineN(logPartFile, CFormat(wxT("Invalid source exchange type version: %i")) % uClientSXVersion);
 			return;
 		}
 		
@@ -2831,12 +2736,12 @@
 				bError = nCount*(4+2+4+2+16+1) != uDataSize;
 				break;
 			default:
-				wxASSERT( 0 );
+				wxFAIL;
 		}
 
 		if (bError){
-			wxASSERT( 0 );
-			AddDebugLogLineM(false, logPartFile, wxT("Invalid source exchange data size."));
+			wxFAIL;
+			AddDebugLogLineN(logPartFile, wxT("Invalid source exchange data size."));
 			return;
 		}
 		uPacketSXVersion = uClientSXVersion;		
@@ -2871,11 +2776,11 @@
 		if (!IsLowID(dwID)) {
 			if (!IsGoodIP(dwIDED2K, thePrefs::FilterLanIPs())) {
 				// check for 0-IP, localhost and optionally for LAN addresses
-				AddDebugLogLineM(false, logIPFilter, CFormat(wxT("Ignored source (IP=%s) received via %s - bad IP")) % Uint32toStringIP(dwIDED2K) % OriginToText(nSourceFrom));
+				AddDebugLogLineN(logIPFilter, CFormat(wxT("Ignored source (IP=%s) received via %s - bad IP")) % Uint32toStringIP(dwIDED2K) % OriginToText(nSourceFrom));
 				continue;
 			}
 			if (theApp->ipfilter->IsFiltered(dwIDED2K)) {
-				AddDebugLogLineM(false, logIPFilter, CFormat(wxT("Ignored source (IP=%s) received via %s - IPFilter")) % Uint32toStringIP(dwIDED2K) % OriginToText(nSourceFrom));
+				AddDebugLogLineN(logIPFilter, CFormat(wxT("Ignored source (IP=%s) received via %s - IPFilter")) % Uint32toStringIP(dwIDED2K) % OriginToText(nSourceFrom));
 				continue;
 			}
 			if (theApp->clientlist->IsBannedClient(dwIDED2K)){
@@ -2885,7 +2790,7 @@
 
 		// additionally check for LowID and own IP
 		if (!CanAddSource(dwID, nPort, dwServerIP, nServerPort, NULL, false)) {
-			AddDebugLogLineM(false, logIPFilter, CFormat(wxT("Ignored source (IP=%s) received via source exchange")) % Uint32toStringIP(dwIDED2K));
+			AddDebugLogLineN(logIPFilter, CFormat(wxT("Ignored source (IP=%s) received via source exchange")) % Uint32toStringIP(dwIDED2K));
 			continue;
 		}
 		
@@ -2913,10 +2818,10 @@
 	if (!IsAutoDownPriority()) {
 		return;
 	}
-	if (GetSourceCount() <= RARE_FILE) {
+	if (GetSourceCount() <= theApp->downloadqueue->GetRareFileThreshold()) {
 		if ( GetDownPriority() != PR_HIGH )
 			SetDownPriority(PR_HIGH, false, false);
-	} else if (GetSourceCount() < 100) {
+	} else if (GetSourceCount() < theApp->downloadqueue->GetCommonFileThreshold()) {
 		if ( GetDownPriority() != PR_NORMAL )
 			SetDownPriority(PR_NORMAL, false, false);
 	} else {
@@ -2955,7 +2860,7 @@
 // Kry - transize is 32bits, no packet can be more than that (this is
 // compressed size). Even 32bits is too much imho.As for the return size,
 // look at the lenData below.
-uint32 CPartFile::WriteToBuffer(uint32 transize, byte* data, uint64 start, uint64 end, Requested_Block_Struct *block)
+uint32 CPartFile::WriteToBuffer(uint32 transize, byte* data, uint64 start, uint64 end, Requested_Block_Struct *block, const CUpDownClient* client)
 {
 	// Increment transferred bytes counter for this file
 	transferred += transize;
@@ -2971,41 +2876,32 @@
 
 	// Occasionally packets are duplicated, no point writing it twice
 	if (IsComplete(start, end)) {
-		AddDebugLogLineM(false, logPartFile,	
+		AddDebugLogLineN(logPartFile,
 			CFormat(wxT("File '%s' has already been written from %u to %u"))
 				% GetFileName() % start % end);
 		return 0;
 	}
 
-       // security sanitize check to make sure we do not write anything into an already hashed complete chunk
-       const uint64 nStartChunk = start / PARTSIZE;
-       const uint64 nEndChunk = end / PARTSIZE;
-       if (IsComplete(PARTSIZE * (uint64)nStartChunk, (PARTSIZE * (uint64)(nStartChunk + 1)) - 1)) {
-               AddDebugLogLineM(false, logPartFile, CFormat(wxT("Received data touches already hashed chunk - ignored (start): %u-%u; File=%s")) % start % end % GetFileName());
-               return 0;
-       } else if (nStartChunk != nEndChunk) {
-               if (IsComplete(PARTSIZE * (uint64)nEndChunk, (PARTSIZE * (uint64)(nEndChunk + 1)) - 1)) {
-                       AddDebugLogLineM(false, logPartFile, CFormat(wxT("Received data touches already hashed chunk - ignored (end): %u-%u; File=%s")) % start % end % GetFileName());
-                       return 0;
-               }
-#ifdef __DEBUG__
-               else {
-                       AddDebugLogLineM(false, logPartFile, CFormat(wxT("Received data crosses chunk boundaries: %u-%u; File=%s")) % start % end % GetFileName());
-               }
-#endif
-       }
-
+	// security sanitize check to make sure we do not write anything into an already hashed complete chunk
+	const uint64 nStartChunk = start / PARTSIZE;
+	const uint64 nEndChunk = end / PARTSIZE;
+	if (IsComplete(nStartChunk)) {
+		AddDebugLogLineN(logPartFile, CFormat(wxT("Received data touches already hashed chunk - ignored (start): %u-%u; File=%s")) % start % end % GetFileName());
+		return 0;
+	} else if (nStartChunk != nEndChunk) {
+		if (IsComplete(nEndChunk)) {
+			AddDebugLogLineN(logPartFile, CFormat(wxT("Received data touches already hashed chunk - ignored (end): %u-%u; File=%s")) % start % end % GetFileName());
+			return 0;
+		} else {
+			AddDebugLogLineN(logPartFile, CFormat(wxT("Received data crosses chunk boundaries: %u-%u; File=%s")) % start % end % GetFileName());
+		}
+	}
 
-	// Create copy of data as new buffer
-	byte *buffer = new byte[lenData];
-	memcpy(buffer, data, lenData);
+	// log transferinformation in our "blackbox"
+	m_CorruptionBlackBox->TransferredData(start, end, client->GetIP());
 
 	// Create a new buffered queue entry
-	PartFileBufferedData *item = new PartFileBufferedData;
-	item->data = buffer;
-	item->start = start;
-	item->end = end;
-	item->block = block;
+	PartFileBufferedData *item = new PartFileBufferedData(m_hpartfile, data, start, end, block);
 
 	// Add to the queue in the correct position (most likely the end)
 	bool added = false;
@@ -3045,15 +2941,15 @@
 		}
 	}
 
-	if (m_gaplist.empty()) {
-		FlushBuffer(true);
+	if (m_gaplist.IsComplete()) {
+		FlushBuffer();
 	}
 
 	// Return the length of data written to the buffer
 	return lenData;
 }
 
-void CPartFile::FlushBuffer(bool /*forcewait*/, bool bForceICH, bool bNoAICH)
+void CPartFile::FlushBuffer(bool fromAICHRecoveryDataAvailable)
 {
 	m_nLastBufferFlushTime = GetTickCount();
 	
@@ -3063,27 +2959,13 @@
 
 	
 	uint32 partCount = GetPartCount();
-	std::vector<bool> changedPart(partCount);
-	
 	// Remember which parts need to be checked at the end of the flush
-	for ( uint32 i = 0; i < partCount; ++i ) {
-		changedPart[ i ] = false;
-	}
-
+	std::vector<bool> changedPart(partCount, false);
 	
 	// Ensure file is big enough to write data to (the last item will be the furthest from the start)
-	uint32 newData = 0;
-
-	std::list<PartFileBufferedData*>::iterator it = m_BufferedData_list.begin();
-	for (; it != m_BufferedData_list.end(); ++it) {
-		PartFileBufferedData* item = *it;
-		wxASSERT((item->end - item->start) < 0xFFFFFFFF);
-		newData += (uint32) (item->end - item->start + 1);
-	}
-	
-	if ( !CheckFreeDiskSpace( newData ) ) {
+	if (!CheckFreeDiskSpace(m_nTotalBufferData)) {
 		// Not enough free space to write the last item, bail
-		AddLogLineM(true, CFormat( _("WARNING: Not enough free disk-space! Pausing file: %s") ) % GetFileName());
+		AddLogLineC(CFormat( _("WARNING: Not enough free disk-space! Pausing file: %s") ) % GetFileName());
 	
 		PauseFile( true );
 		return;
@@ -3092,7 +2974,7 @@
 	// Loop through queue
 	while ( !m_BufferedData_list.empty() ) {
 		// Get top item and remove it from the queue
-		PartFileBufferedData* item = m_BufferedData_list.front();
+		CScopedPtr<PartFileBufferedData> item(m_BufferedData_list.front());
 		m_BufferedData_list.pop_front();
 
 		// This is needed a few times
@@ -3108,19 +2990,17 @@
 		
 		// Go to the correct position in file and write block of data			
 		try {
-			m_hpartfile.Seek(item->start);
-			m_hpartfile.Write(item->data, lenData);
+			item->area.FlushAt(m_hpartfile, item->start, lenData);
+			// Decrease buffer size
+			m_nTotalBufferData -= lenData;
 		} catch (const CIOFailureException& e) {
-			AddDebugLogLineM(true, logPartFile, wxT("Error while saving part-file: ") + e.what());
-			SetPartFileStatus(PS_ERROR);
+			AddDebugLogLineC(logPartFile, wxT("Error while saving part-file: ") + e.what());
+			SetStatus(PS_ERROR);
+			// No need to bang your head against it again and again if it has already failed.
+			DeleteContents(m_BufferedData_list);
+			m_nTotalBufferData = 0;
+			return;
 		}
-
-		// Decrease buffer size
-		m_nTotalBufferData -= lenData;
-
-		// Release memory used by this item
-		delete [] item->data;
-		delete item;
 	}
 	
 	
@@ -3134,58 +3014,49 @@
 			m_hpartfile.SetLength(GetFileSize());
 		}
 	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM(true, logPartFile,
+		AddDebugLogLineC(logPartFile,
 			CFormat(wxT("Error while truncating part-file (%s): %s"))
-				% m_fullname.RemoveExt() % e.what());
-		SetPartFileStatus(PS_ERROR);
+				% m_PartPath % e.what());
+		SetStatus(PS_ERROR);
 	}
 
 
 	
 	// Check each part of the file
-	uint32 partRange = 0;
-	try {
-		uint64 curLength = m_hpartfile.GetLength();
-
-		partRange = (uint32)((curLength % PARTSIZE > 0) ? ((curLength % PARTSIZE) - 1) : (PARTSIZE - 1));
-	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM(true, logPartFile,
-			CFormat(wxT("Error while accessing part-file (%s): %s"))
-				% m_fullname.RemoveExt() % e.what());
-		SetPartFileStatus(PS_ERROR);
-	}
-	
-	wxASSERT(partRange);
-	for (int partNumber = partCount-1; partRange && partNumber >= 0; partNumber--) {
+	for (uint16 partNumber = 0; partNumber < partCount; ++partNumber) {
 		if (changedPart[partNumber] == false) {
-			// Any parts other than last must be full size
-			partRange = PARTSIZE - 1;
 			continue;
 		}
 
+		uint32 partRange = GetPartSize(partNumber) - 1;
+	
 		// Is this 9MB part complete
-		if (IsComplete(PARTSIZE * partNumber, (PARTSIZE * (partNumber + 1)) - 1)) {
+		if (IsComplete(partNumber)) {
 			// Is part corrupt
 			if (!HashSinglePart(partNumber)) {
-				AddLogLineM(true, CFormat(
+				AddLogLineC(CFormat(
 					_("Downloaded part %i is corrupt in file: %s") ) % partNumber % GetFileName() );
-				AddGap(PARTSIZE*partNumber, (PARTSIZE*partNumber + partRange));
+				AddGap(partNumber);
 				// add part to corrupted list, if not already there
 				if (!IsCorruptedPart(partNumber)) {
 					m_corrupted_list.push_back(partNumber);
 				}
 				// request AICH recovery data
-				if (!bNoAICH) {
-					RequestAICHRecovery((uint16)partNumber);					
+				// Don't if called from the AICHRecovery. It's already there and would lead to an infinite recursion.
+				if (!fromAICHRecoveryDataAvailable) { 
+					RequestAICHRecovery(partNumber);					
 				}
 				// Reduce transferred amount by corrupt amount
 				m_iLostDueToCorruption += (partRange + 1);
 			} else {
 				if (!m_hashsetneeded) {
-					AddDebugLogLineM(false, logPartFile, CFormat(
+					AddDebugLogLineN(logPartFile, CFormat(
 						wxT("Finished part %u of '%s'")) % partNumber % GetFileName());
 				}
 				
+				// tell the blackbox about the verified data
+				m_CorruptionBlackBox->VerifiedData(true, partNumber, 0, partRange);
+
 				// if this part was successfully completed (although ICH is active), remove from corrupted list
 				EraseFirstValue(m_corrupted_list, partNumber);
 				
@@ -3199,19 +3070,24 @@
 					}
 				}
 			}
-		} else if ( IsCorruptedPart(partNumber) && (thePrefs::IsICHEnabled() || bForceICH)) {
+		} else if ( IsCorruptedPart(partNumber) &&		// corrupted part:
+					(thePrefs::IsICHEnabled()			// old ICH:  rehash whenever we have new data hoping it will be good now
+					|| fromAICHRecoveryDataAvailable)) {// new AICH: one rehash right before performing it (maybe it's already good)
 			// Try to recover with minimal loss
 			if (HashSinglePart(partNumber)) {
 				++m_iTotalPacketsSavedDueToICH;
 				
-				uint64 uMissingInPart = GetTotalGapSizeInPart(partNumber);					
-				FillGap(PARTSIZE*partNumber,(PARTSIZE*partNumber+partRange));
+				uint64 uMissingInPart = m_gaplist.GetGapSize(partNumber);					
+				FillGap(partNumber);
 				RemoveBlockFromList(PARTSIZE*partNumber,(PARTSIZE*partNumber + partRange));
 
+				// tell the blackbox about the verified data
+				m_CorruptionBlackBox->VerifiedData(true, partNumber, 0, partRange);
+
 				// remove from corrupted list
 				EraseFirstValue(m_corrupted_list, partNumber);
 				
-				AddLogLineM(true, CFormat( _("ICH: Recovered corrupted part %i for %s -> Saved bytes: %s") )
+				AddLogLineC(CFormat( _("ICH: Recovered corrupted part %i for %s -> Saved bytes: %s") )
 					% partNumber
 					% GetFileName()
 					% CastItoXBytes(uMissingInPart));
@@ -3226,8 +3102,6 @@
 				}
 			}
 		}
-		// Any parts other than last must be full size
-		partRange = PARTSIZE - 1;
 	}
 
 	// Update met file
@@ -3235,13 +3109,30 @@
 
 	if (theApp->IsRunning()) { // may be called during shutdown!
 		// Is this file finished ?
-		if (m_gaplist.empty()) {
+		if (m_gaplist.IsComplete()) {
 			CompleteFile(false);
 		}
 	}
 }
 
 
+// read data for upload, return false on error
+bool CPartFile::ReadData(CFileArea & area, uint64 offset, uint32 toread)
+{
+	// Sanity check
+	if (offset + toread > GetFileSize()) {
+		AddDebugLogLineN(logPartFile, CFormat(wxT("tried to read %d bytes past eof of %s"))
+			% (offset + toread - GetFileSize()) % GetFileName());
+		wxFAIL;
+		return false;
+	}
+
+	area.ReadAt(m_hpartfile, offset, toread);
+	// if it fails it throws (which the caller should catch)
+	return true;
+}
+
+
 void CPartFile::UpdateFileRatingCommentAvail()
 {
 	bool prevComment = m_hasComment;
@@ -3253,7 +3144,7 @@
 
 	SourceSet::iterator it = m_SrcList.begin();
 	for (; it != m_SrcList.end(); ++it) {
-		CUpDownClient* cur_src = *it;
+		CUpDownClient* cur_src = it->GetClient();
 		
 		if (!cur_src->GetFileComment().IsEmpty()) {
 			if (thePrefs::IsCommentFiltered(cur_src->GetFileComment())) {
@@ -3308,36 +3199,24 @@
 
 void CPartFile::AddDownloadingSource(CUpDownClient* client)
 {
-	CClientPtrList::iterator it = 
-		std::find(m_downloadingSourcesList.begin(), m_downloadingSourcesList.end(), client);
+	CClientRefList::iterator it = 
+		std::find(m_downloadingSourcesList.begin(), m_downloadingSourcesList.end(), CCLIENTREF(client, wxEmptyString));
 	if (it == m_downloadingSourcesList.end()) {
-		m_downloadingSourcesList.push_back(client);
+		m_downloadingSourcesList.push_back(CCLIENTREF(client, wxT("CPartFile::AddDownloadingSource")));
 	}
 }
 
 
 void CPartFile::RemoveDownloadingSource(CUpDownClient* client)
 {
-	CClientPtrList::iterator it = 
-		std::find(m_downloadingSourcesList.begin(), m_downloadingSourcesList.end(), client);
+	CClientRefList::iterator it = 
+		std::find(m_downloadingSourcesList.begin(), m_downloadingSourcesList.end(), CCLIENTREF(client, wxEmptyString));
 	if (it != m_downloadingSourcesList.end()) {
 		m_downloadingSourcesList.erase(it);
 	}
 }
 
 
-void CPartFile::SetPartFileStatus(uint8 newstatus)
-{
-	status=newstatus;
-	
-	if (thePrefs::GetAllcatType()) {
-		Notify_DownloadCtrlUpdateItem(this);
-	}
-
-	Notify_DownloadCtrlSort();
-}
-
-
 uint64 CPartFile::GetNeededSpace()
 {
 	try {
@@ -3349,16 +3228,18 @@
 	
 		return GetFileSize() - length;
 	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM(true, logPartFile,
+		AddDebugLogLineC(logPartFile,
 			CFormat(wxT("Error while retrieving file-length (%s): %s"))
-				% m_fullname.RemoveExt() % e.what());
-		SetPartFileStatus(PS_ERROR);
+				% m_PartPath % e.what());
+		SetStatus(PS_ERROR);
 		return 0;
 	}
 }
 
 void CPartFile::SetStatus(uint8 in)
 {
+	// PAUSED and INSUFFICIENT have extra flag variables m_paused and m_insufficient
+	// - they are never to be stored in status
 	wxASSERT( in != PS_PAUSED && in != PS_INSUFFICIENT );
 	
 	status = in;
@@ -3369,69 +3250,29 @@
 		if ( thePrefs::ShowCatTabInfos() ) {
 			Notify_ShowUpdateCatTabTitles();
 		}
+		Notify_DownloadCtrlSort();
 	}
 }
 
 
-uint64 CPartFile::GetTotalGapSizeInRange(uint64 uRangeStart, uint64 uRangeEnd) const
-{
-	uint64 uTotalGapSize = 0;
-
-	if (uRangeEnd >= GetFileSize()) {
-		uRangeEnd = GetFileSize() - 1;
-	}
-
-	std::list<Gap_Struct*>::const_iterator it = m_gaplist.begin();
-	for (; it != m_gaplist.end(); ++it) {
-		const Gap_Struct* pGap = *it;
-
-		if (pGap->start < uRangeStart && pGap->end > uRangeEnd) {
-			uTotalGapSize += uRangeEnd - uRangeStart + 1;
-			break;
-		}
-
-		if (pGap->start >= uRangeStart && pGap->start <= uRangeEnd) {
-			uint64 uEnd = (pGap->end > uRangeEnd) ? uRangeEnd : pGap->end;
-			uTotalGapSize += uEnd - pGap->start + 1;
-		} else if (pGap->end >= uRangeStart && pGap->end <= uRangeEnd) {
-			uTotalGapSize += pGap->end - uRangeStart + 1;
-		}
-	}
-
-	wxASSERT( uTotalGapSize <= uRangeEnd - uRangeStart + 1 );
-
-	return uTotalGapSize;
-}
-
-uint64 CPartFile::GetTotalGapSizeInPart(uint32 uPart) const
-{
-	uint64 uRangeStart = uPart * PARTSIZE;
-	uint64 uRangeEnd = uRangeStart + PARTSIZE - 1;
-	if (uRangeEnd >= GetFileSize()) {
-		uRangeEnd = GetFileSize();
-	}
-	return GetTotalGapSizeInRange(uRangeStart, uRangeEnd);
-}
-
-
 void CPartFile::RequestAICHRecovery(uint16 nPart)
 {
 
 	if (	!m_pAICHHashSet->HasValidMasterHash() ||
 		(m_pAICHHashSet->GetStatus() != AICH_TRUSTED && m_pAICHHashSet->GetStatus() != AICH_VERIFIED)){
-		AddDebugLogLineM( false, logAICHRecovery, wxT("Unable to request AICH Recoverydata because we have no trusted Masterhash") );
+		AddDebugLogLineN( logAICHRecovery, wxT("Unable to request AICH Recoverydata because we have no trusted Masterhash") );
 		return;
 	}
-	if (GetFileSize() <= EMBLOCKSIZE || GetFileSize() - PARTSIZE*nPart <= EMBLOCKSIZE)
+	if (GetPartSize(nPart) <= EMBLOCKSIZE)
 		return;
 	if (CAICHHashSet::IsClientRequestPending(this, nPart)){
-		AddDebugLogLineM( false, logAICHRecovery, wxT("RequestAICHRecovery: Already a request for this part pending"));
+		AddDebugLogLineN( logAICHRecovery, wxT("RequestAICHRecovery: Already a request for this part pending"));
 		return;
 	}
 
 	// first check if we have already the recoverydata, no need to rerequest it then
 	if (m_pAICHHashSet->IsPartDataAvailable(nPart*PARTSIZE)){
-		AddDebugLogLineM( false, logAICHRecovery, wxT("Found PartRecoveryData in memory"));
+		AddDebugLogLineN( logAICHRecovery, wxT("Found PartRecoveryData in memory"));
 		AICHRecoveryDataAvailable(nPart);
 		return;
 	}
@@ -3442,7 +3283,7 @@
 	uint32 cAICHClients = 0;
 	uint32 cAICHLowIDClients = 0;
 	for ( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ++it) {	
-		CUpDownClient* pCurClient = *(it);
+		CUpDownClient* pCurClient = it->GetClient();
 		if (	pCurClient->IsSupportingAICH() &&
 			pCurClient->GetReqFileAICHHash() != NULL &&
 			!pCurClient->IsAICHReqPending()
@@ -3456,7 +3297,7 @@
 		}
 	}
 	if ((cAICHClients | cAICHLowIDClients) == 0){
-		AddDebugLogLineM( false, logAICHRecovery, wxT("Unable to request AICH Recoverydata because found no client who supports it and has the same hash as the trusted one"));
+		AddDebugLogLineN( logAICHRecovery, wxT("Unable to request AICH Recoverydata because found no client who supports it and has the same hash as the trusted one"));
 		return;
 	}
 	uint32 nSeclectedClient;
@@ -3467,7 +3308,7 @@
 	}
 	CUpDownClient* pClient = NULL;
 	for ( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ++it) {	
-		CUpDownClient* pCurClient = *(it);
+		CUpDownClient* pCurClient = it->GetClient();
 		if (pCurClient->IsSupportingAICH() && pCurClient->GetReqFileAICHHash() != NULL && !pCurClient->IsAICHReqPending()
 			&& (*pCurClient->GetReqFileAICHHash()) == m_pAICHHashSet->GetMasterHash())
 		{
@@ -3486,11 +3327,11 @@
 		}
 	}
 	if (pClient == NULL){
-		wxASSERT( false );
+		wxFAIL;
 		return;
 	}
 
-	AddDebugLogLineM( false, logAICHRecovery, CFormat( wxT("Requesting AICH Hash (%s) form client %s") ) % ( cAICHClients ? wxT("HighId") : wxT("LowID") ) % pClient->GetClientFullInfo() );
+	AddDebugLogLineN( logAICHRecovery, CFormat( wxT("Requesting AICH Hash (%s) form client %s") ) % ( cAICHClients ? wxT("HighId") : wxT("LowID") ) % pClient->GetClientFullInfo() );
 	pClient->SendAICHRequest(this, nPart);
 	
 }
@@ -3499,31 +3340,15 @@
 void CPartFile::AICHRecoveryDataAvailable(uint16 nPart)
 {
 	if (GetPartCount() < nPart){
-		wxASSERT( false );
+		wxFAIL;
 		return;
 	}
 
-	FlushBuffer(true, true, true);
-	
-	uint64 length = PARTSIZE;
-
-	try {
-		if ((unsigned)(PARTSIZE * (nPart + 1)) > m_hpartfile.GetLength()){
-			length = (m_hpartfile.GetLength() - (PARTSIZE * nPart));
-			wxASSERT( length <= PARTSIZE );
-		}
-	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM(true, logPartFile,
-			CFormat(wxT("Error while retrieving file-length (%s): %s"))
-				% m_fullname.RemoveExt() % e.what());
-		SetPartFileStatus(PS_ERROR);
-		return;
-	}
-	
+	FlushBuffer(true);
+	uint32 length = GetPartSize(nPart);
 	// if the part was already ok, it would now be complete
-	if (IsComplete(nPart*PARTSIZE, ((nPart*PARTSIZE)+length)-1)){
-		AddDebugLogLineM( false, logAICHRecovery,
-			wxString::Format( wxT("Processing AICH Recovery data: The part (%u) is already complete, canceling"), nPart ) );
+	if (IsComplete(nPart)) {
+		AddDebugLogLineN(logAICHRecovery, CFormat(wxT("Processing AICH Recovery data: The part (%u) is already complete, canceling")) % nPart);
 		return;
 	}
 	
@@ -3531,25 +3356,24 @@
 
 	CAICHHashTree* pVerifiedHash = m_pAICHHashSet->m_pHashTree.FindHash(nPart*PARTSIZE, length);
 	if (pVerifiedHash == NULL || !pVerifiedHash->GetHashValid()){
-		AddDebugLogLineM( true, logAICHRecovery, wxT("Processing AICH Recovery data: Unable to get verified hash from hashset (should never happen)") );
-		wxASSERT( false );
+		AddDebugLogLineC( logAICHRecovery, wxT("Processing AICH Recovery data: Unable to get verified hash from hashset (should never happen)") );
+		wxFAIL;
 		return;
 	}
 	CAICHHashTree htOurHash(pVerifiedHash->GetNDataSize(), pVerifiedHash->GetIsLeftBranch(), pVerifiedHash->GetNBaseSize());
 	try {
-		m_hpartfile.Seek(PARTSIZE * nPart,wxFromStart);
-		CreateHashFromFile(&m_hpartfile,length, NULL, &htOurHash);
+		CreateHashFromFile(m_hpartfile, PARTSIZE * nPart, length, NULL, &htOurHash);
 	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM(true, logAICHRecovery,
+		AddDebugLogLineC(logAICHRecovery,
 			CFormat(wxT("IO failure while hashing part-file '%s': %s"))
 				% m_hpartfile.GetFilePath() % e.what());
-		SetPartFileStatus(PS_ERROR);
+		SetStatus(PS_ERROR);
 		return;
 	}
 	
 	if (!htOurHash.GetHashValid()){
-		AddDebugLogLineM( false, logAICHRecovery, wxT("Processing AICH Recovery data: Failed to retrieve AICH Hashset of corrupt part") );
-		wxASSERT( false );
+		AddDebugLogLineN( logAICHRecovery, wxT("Processing AICH Recovery data: Failed to retrieve AICH Hashset of corrupt part") );
+		wxFAIL;
 		return;
 	}
 
@@ -3560,55 +3384,61 @@
 		CAICHHashTree* pVerifiedBlock = pVerifiedHash->FindHash(pos, nBlockSize);
 		CAICHHashTree* pOurBlock = htOurHash.FindHash(pos, nBlockSize);
 		if ( pVerifiedBlock == NULL || pOurBlock == NULL || !pVerifiedBlock->GetHashValid() || !pOurBlock->GetHashValid()){
-			wxASSERT( false );
+			wxFAIL;
 			continue;
 		}
 		if (pOurBlock->GetHash() == pVerifiedBlock->GetHash()){
 			FillGap(PARTSIZE*nPart+pos, PARTSIZE*nPart + pos + (nBlockSize-1));
 			RemoveBlockFromList(PARTSIZE*nPart, PARTSIZE*nPart + (nBlockSize-1));
 			nRecovered += nBlockSize;
+			// tell the blackbox about the verified data
+			m_CorruptionBlackBox->VerifiedData(true, nPart, pos, pos + nBlockSize - 1);
+		} else {
+			// inform our "blackbox" about the corrupted block which may ban clients who sent it
+			m_CorruptionBlackBox->VerifiedData(false, nPart, pos, pos + nBlockSize - 1);
 		}
 	}
+	m_CorruptionBlackBox->EvaluateData();
 
 	// ok now some sanity checks
-	if (IsComplete(nPart*PARTSIZE, ((nPart*PARTSIZE)+length)-1)){
-		// this is a bad, but it could probably happen under some rare circumstances
-		// make sure that MD4 agrres to this fact too
-		if (!HashSinglePart(nPart)){
-			AddDebugLogLineM( false, logAICHRecovery, 
-				wxString::Format(wxT("Processing AICH Recovery data: The part (%u) got completed while recovering - but MD4 says it corrupt! Setting hashset to error state, deleting part"), nPart));
+	if (IsComplete(nPart)) {
+		// this is bad, but it could probably happen under some rare circumstances
+		// make sure that MD4 agrees to this fact too
+		if (!HashSinglePart(nPart)) {
+			AddDebugLogLineN(logAICHRecovery, 
+				CFormat(wxT("Processing AICH Recovery data: The part (%u) got completed while recovering - but MD4 says it corrupt! Setting hashset to error state, deleting part")) % nPart);
 			// now we are fu... unhappy
 			m_pAICHHashSet->SetStatus(AICH_ERROR);
-			AddGap(PARTSIZE*nPart, ((nPart*PARTSIZE)+length)-1);
-			wxASSERT( false );
+			AddGap(nPart);
+			wxFAIL;
 			return;
-		}
-		else{
-			AddDebugLogLineM( false, logAICHRecovery, wxString::Format( 
-				wxT("Processing AICH Recovery data: The part (%u) got completed while recovering and MD4 agrees"), nPart) );
-			// alrighty not so bad
-			EraseFirstValue(m_corrupted_list, nPart);
-			if (status == PS_EMPTY && theApp->IsRunning()){
-				if (GetHashCount() == GetED2KPartHashCount() && !m_hashsetneeded){
+		} else {
+			AddDebugLogLineN(logAICHRecovery,
+				CFormat(wxT("Processing AICH Recovery data: The part (%u) got completed while recovering and MD4 agrees")) % nPart);
+			if (status == PS_EMPTY && theApp->IsRunning()) {
+				if (GetHashCount() == GetED2KPartHashCount() && !m_hashsetneeded) {
 					// Successfully recovered part, make it available for sharing
 					SetStatus(PS_READY);
 					theApp->sharedfiles->SafeAddKFile(this);
 				}
 			}
 
-			if (theApp->IsRunning()){
+			if (theApp->IsRunning()) {
 				// Is this file finished?
-				if (m_gaplist.empty()) {
+				if (m_gaplist.IsComplete()) {
 					CompleteFile(false);
 				}
 			}
 		}
 	} // end sanity check
+	// We did the best we could. If it's still incomplete, then no need to keep
+	// bashing it with ICH. So remove it from the list of corrupted parts.
+	EraseFirstValue(m_corrupted_list, nPart);
 	// Update met file
 	SavePartFile();
 	
 	// make sure the user appreciates our great recovering work :P
-	AddDebugLogLineM( true, logAICHRecovery, CFormat( 
+	AddDebugLogLineC( logAICHRecovery, CFormat(
 		wxT("AICH successfully recovered %s of %s from part %u for %s") )
 		% CastItoXBytes(nRecovered) 
 		% CastItoXBytes(length)
@@ -3654,7 +3484,7 @@
 
 bool CPartFile::AddSource( CUpDownClient* client )
 {
-	if (m_SrcList.insert( client ).second) {
+	if (m_SrcList.insert(CCLIENTREF(client, wxT("CPartFile::AddSource"))).second) {
 		theStats::AddFoundSource();
 		theStats::AddSourceOrigin(client->GetSourceFrom());
 		return true;
@@ -3666,7 +3496,7 @@
 	
 bool CPartFile::DelSource( CUpDownClient* client )
 {
-	if (m_SrcList.erase( client )) {
+	if (m_SrcList.erase(CCLIENTREF(client, wxEmptyString))) {
 		theStats::RemoveSourceOrigin(client->GetSourceFrom());
 		theStats::RemoveFoundSource();
 		return true;
@@ -3696,65 +3526,54 @@
 	
 	if ( increment ) {
 		for ( unsigned int i = 0; i < size; i++ ) {
-			if ( freq[i] ) {
+			if ( freq.get(i) ) {
 				m_SrcpartFrequency[i]++;
 			}
 		}
 	} else {
 		for ( unsigned int i = 0; i < size; i++ ) {
-			if ( freq[i] ) {
+			if ( freq.get(i) ) {
 				m_SrcpartFrequency[i]--;
 			}
 		}
 	}
 }
 
-const FileRatingList &CPartFile::GetRatingAndComments()
+void CPartFile::GetRatingAndComments(FileRatingList & list) const
 {
-	m_FileRatingList.clear();
+	list.clear();
 	// This can be pre-processed, but is it worth the CPU?
-	CPartFile::SourceSet::iterator it = m_SrcList.begin();
+	CPartFile::SourceSet::const_iterator it = m_SrcList.begin();
 	for ( ; it != m_SrcList.end(); ++it ) {
-		CUpDownClient *cur_src = *it;
+		CUpDownClient *cur_src = it->GetClient();
 		if (cur_src->GetFileComment().Length()>0 || cur_src->GetFileRating()>0) {
-			// AddDebugLogLineM(false, logPartFile, wxString(wxT("found a comment for ")) << GetFileName());
-			m_FileRatingList.push_back(SFileRating(*cur_src));
+			// AddDebugLogLineN(logPartFile, wxString(wxT("found a comment for ")) << GetFileName());
+			list.push_back(SFileRating(*cur_src));
 		}
 	}
-
-	return m_FileRatingList; 
 }
 
 #else   // CLIENT_GUI
 
-CPartFile::CPartFile(CEC_PartFile_Tag *tag)
+CPartFile::CPartFile(CEC_PartFile_Tag *tag) : CKnownFile(tag)
 {
 	Init();
 	
 	SetFileName(CPath(tag->FileName()));
-	m_abyFileHash = tag->ID();
+	m_abyFileHash = tag->FileHash();
 	SetFileSize(tag->SizeFull());
+	m_gaplist.Init(GetFileSize(), true);	// Init empty
 	m_partmetfilename = CPath(tag->PartMetName());
-	transferred = tag->SizeXfer();
-	percentcompleted = (100.0*completedsize) / GetFileSize();
-	completedsize = tag->SizeDone();
-
-	m_category = tag->FileCat();
-
-	m_iPartCount = ((uint64)GetFileSize() + (PARTSIZE - 1)) / PARTSIZE;
-	m_SrcpartFrequency.insert(m_SrcpartFrequency.end(), m_iPartCount, 0);
-	m_iDownPriority = tag->Prio();
-	if ( m_iDownPriority >= 10 ) {
-		m_iDownPriority-= 10;
-		m_bAutoDownPriority = true;
-	} else {
-		m_bAutoDownPriority = false;
-	}
-	// FIXME: !
-	m_category = 0;
-	
+	m_fullname = m_partmetfilename;		// We have only the met number, so show it without path in the detail dialog.
+
+	m_SrcpartFrequency.insert(m_SrcpartFrequency.end(), GetPartCount(), 0);
+
+	// these are only in CLIENT_GUI and not covered by Init()
 	m_source_count = 0;
+	m_kbpsDown = 0;
+	m_iDownPriorityEC = 0;
 	m_a4af_source_count = 0;
+	m_isShared = false;
 }
 
 /*
@@ -3764,37 +3583,46 @@
 {
 }
 
-const FileRatingList &CPartFile::GetRatingAndComments() 
+void CPartFile::GetRatingAndComments(FileRatingList & list) const
 { 
-	return m_FileRatingList; 
+	list = m_FileRatingList; 
 }
 
 void CPartFile::SetCategory(uint8 cat)
 {
-	wxASSERT( cat < theApp->glob_prefs->GetCatCount() );
-	
 	m_category = cat; 
 }
+
+
+bool CPartFile::AddSource(CUpDownClient* client)
+{
+	return m_SrcList.insert(CCLIENTREF(client, wxT("CPartFile::AddSource"))).second != 0;
+}
+
+	
+bool CPartFile::DelSource(CUpDownClient* client)
+{
+	return m_SrcList.erase(CCLIENTREF(client, wxEmptyString)) != 0;
+}
+
+
 #endif // !CLIENT_GUI
 
 
 void CPartFile::UpdateDisplayedInfo(bool force)
 {
 	uint32 curTick = ::GetTickCount();
-	m_CommentUpdated = true;
 
-	 // Wait 1.5s between each redraw
-	 if(force || curTick-m_lastRefreshedDLDisplay > MINWAIT_BEFORE_DLDISPLAY_WINDOWUPDATE ) {
-		 Notify_DownloadCtrlUpdateItem(this);
+	// Wait 1.5s between each redraw
+	if (force || curTick-m_lastRefreshedDLDisplay > MINWAIT_BEFORE_DLDISPLAY_WINDOWUPDATE) {
+		Notify_DownloadCtrlUpdateItem(this);
 		m_lastRefreshedDLDisplay = curTick;
 	}
-	
 }
 
 
 void CPartFile::Init()
 {
-	m_showSources = false;
 	m_lastsearchtime = 0;
 	lastpurgetime = ::GetTickCount();
 	m_paused = false;
@@ -3814,18 +3642,14 @@
 		m_bAutoDownPriority = false;
 	}
 	
-	memset(m_anStates,0,sizeof(m_anStates));
-	
 	transferingsrc = 0; // new
 	
 	kBpsDown = 0.0;
 	
-	m_CommentUpdated = false;
 	m_hashsetneeded = true;
 	m_count = 0;
 	percentcompleted = 0;
 	completedsize=0;
-	m_bPreviewing = false;
 	lastseencomplete = 0;
 	m_availablePartsCount=0;
 	m_ClientSrcAnswered = 0;
@@ -3834,7 +3658,6 @@
 	m_nTotalBufferData = 0;
 	m_nLastBufferFlushTime = 0;
 	m_bPercentUpdated = false;
-	m_bRecoveringArchive = false;
 	m_iGainDueToCompression = 0;
 	m_iLostDueToCorruption = 0;
 	m_iTotalPacketsSavedDueToICH = 0;
@@ -3854,8 +3677,11 @@
 
 	// Kad
 	m_LastSearchTimeKad = 0;
-	m_TotalSearchesKad = 0;	
-	
+	m_TotalSearchesKad = 0;
+
+#ifndef CLIENT_GUI
+	m_CorruptionBlackBox = new CCorruptionBlackBox();
+#endif
 }
 
 wxString CPartFile::getPartfileStatus() const
@@ -3931,8 +3757,8 @@
 {
 	wxString retval = CKnownFile::GetFeedback();
 	if (GetStatus() != PS_COMPLETE) {
-		retval += wxString(_("Downloaded")) + wxT(": ") + CastItoXBytes(GetCompletedSize()) + wxString::Format(wxT(" (%.2f%%)\n"), GetPercentCompleted())
-			+ _("Sources") + CFormat(wxT(": %u\n")) % GetSourceCount();
+		retval += CFormat(wxT("%s: %s (%.2f%%)\n%s: %u\n"))
+			% _("Downloaded") % CastItoXBytes(GetCompletedSize()) % GetPercentCompleted() % _("Sources") % GetSourceCount();
 	}
 	return retval + _("Status") + wxT(": ") + getPartfileStatus() + wxT("\n");
 }
@@ -3948,90 +3774,92 @@
 
 bool CPartFile::PreviewAvailable()
 {
+	const uint64 minSizeForPreview = 256 * 1024;
 	FileType type = GetFiletype(GetFileName());
 
-	return (((type == ftVideo) || (type == ftAudio)) && IsComplete(0, 256*1024));
+	return (type == ftVideo || type == ftAudio) &&
+	       GetFileSize() >= minSizeForPreview &&
+	       IsComplete(0, minSizeForPreview);
 }
 
 bool CPartFile::CheckShowItemInGivenCat(int inCategory)
 {
-	// easy normal cases
-	bool IsInCat;
-	bool IsNotFiltered = true;
-
-	IsInCat = ((inCategory==0) || (inCategory>0 && inCategory==GetCategory()));
-
-	switch (thePrefs::GetAllcatType()) {
-		case 1:
-			IsNotFiltered = GetCategory() == 0 || inCategory > 0;
+	// first check if item belongs in this cat in principle
+	if (inCategory > 0 && inCategory != GetCategory()) {
+		return false;
+	}
+
+	// if yes apply filter
+	bool show = true;
+
+	switch (thePrefs::GetAllcatFilter()) {
+		case acfAllOthers:
+			show = GetCategory() == 0 || inCategory > 0;
 			break;
-		case 2:
-			IsNotFiltered = IsPartFile();
+		case acfIncomplete:
+			show = IsPartFile();
 			break;
-		case 3:
-			IsNotFiltered = !IsPartFile();
+		case acfCompleted:
+			show = !IsPartFile();
 			break;
-		case 4:
-			IsNotFiltered = 
+		case acfWaiting:
+			show = 
 				(GetStatus() == PS_READY || GetStatus() == PS_EMPTY) &&
 				GetTransferingSrcCount() == 0;
 			break;
-		case 5:
-			IsNotFiltered =
-				(GetStatus() == PS_READY || GetStatus()==PS_EMPTY) &&
+		case acfDownloading:
+			show =
+				(GetStatus() == PS_READY || GetStatus() == PS_EMPTY) &&
 				GetTransferingSrcCount() > 0;
 			break;
-		case 6:
-			IsNotFiltered = GetStatus() == PS_ERROR;
+		case acfErroneous:
+			show = GetStatus() == PS_ERROR;
+			break;
+		case acfPaused:
+			show = GetStatus() == PS_PAUSED && !IsStopped();
 			break;
-		case 7:
-			IsNotFiltered = GetStatus() == PS_PAUSED && !IsStopped();
+		case acfStopped:
+			show = IsStopped();
 			break;
-		case 8:
-			IsNotFiltered = IsStopped();
+		case acfVideo:
+			show = GetFiletype(GetFileName()) == ftVideo;
 			break;
-		case 9:
-			IsNotFiltered = GetFiletype(GetFileName()) == ftVideo;
+		case acfAudio:
+			show = GetFiletype(GetFileName()) == ftAudio;
 			break;
-		case 10:
-			IsNotFiltered = GetFiletype(GetFileName()) == ftAudio;
+		case acfArchive:
+			show = GetFiletype(GetFileName()) == ftArchive;
 			break;
-		case 11:
-			IsNotFiltered = GetFiletype(GetFileName()) == ftArchive;
+		case acfCDImages:
+			show = GetFiletype(GetFileName()) == ftCDImage;
 			break;
-		case 12:
-			IsNotFiltered = GetFiletype(GetFileName()) == ftCDImage;
+		case acfPictures:
+			show = GetFiletype(GetFileName()) == ftPicture;
 			break;
-		case 13:
-			IsNotFiltered = GetFiletype(GetFileName()) == ftPicture;
+		case acfText:
+			show = GetFiletype(GetFileName()) == ftText;
 			break;
-		case 14:
-			IsNotFiltered = GetFiletype(GetFileName()) == ftText;
+		case acfActive:
+			show = !IsStopped() && GetStatus() != PS_PAUSED;
 			break;
-		case 15:
-			IsNotFiltered = !IsStopped() && GetStatus() != PS_PAUSED;
+		default:
+			show = true;
 			break;
 	}
 	
-	return IsNotFiltered && IsInCat;
+	return show;
 }
 
-bool CPartFile::IsComplete(uint64 start, uint64 end)
-{
-	if (end >= GetFileSize()) {
-		end = GetFileSize()-1;
-	}
 
-	std::list<Gap_Struct*>::iterator it = m_gaplist.begin();
-	for (; it != m_gaplist.end(); ++it) {
-		Gap_Struct* cur_gap = *it;
-		if ((cur_gap->start >= start && cur_gap->end <= end)||(cur_gap->start >= start 
-		&& cur_gap->start <= end)||(cur_gap->end <= end && cur_gap->end >= start)
-		||(start >= cur_gap->start && end <= cur_gap->end)) {
-			return false;	
-		}
+void CPartFile::RemoveCategory(uint8 cat)
+{
+	if (m_category == cat) {
+		// Reset the category
+		m_category = 0;
+	} else if (m_category > cat) {
+		// Set to the new position of the original category
+		m_category--;
 	}
-	return true;
 }
 
 
@@ -4063,6 +3891,13 @@
 }
 
 
+uint16 CPartFile::GetPartMetNumber() const
+{
+	long nr;
+	return m_partmetfilename.RemoveAllExt().GetRaw().ToLong(&nr) ? nr : 0;
+}
+
+
 #ifndef CLIENT_GUI
 
 uint8 CPartFile::GetStatus(bool ignorepause) const
@@ -4144,7 +3979,7 @@
 CUpDownClient* CPartFile::GetSlowerDownloadingClient(uint32 speed, CUpDownClient* caller) {
 //	printf("Start slower source calculation\n");
 	for( SourceSet::iterator it = m_SrcList.begin(); it != m_SrcList.end(); ) {
-		CUpDownClient* cur_src = *it++;
+		CUpDownClient* cur_src = it++->GetClient();
 		if ((cur_src->GetDownloadState() == DS_DOWNLOADING) && (cur_src != caller)) {
 			uint32 factored_bytes_per_second = static_cast<uint32>(
 				(cur_src->GetKBpsDown() * 1024) * DROP_FACTOR);
@@ -4163,10 +3998,13 @@
 
 void CPartFile::AllocationFinished()
 {
-	if (!m_hpartfile.Open(GetFullName().RemoveExt(), CFile::read_write)) {
-		AddLogLineM(false, CFormat(_("ERROR: Failed to open partfile '%s'")) % GetFullName());
-		SetPartFileStatus(PS_ERROR);
+	// see if it can be opened
+	if (!m_hpartfile.Open(m_PartPath, CFile::read_write)) {
+		AddLogLineN(CFormat(_("ERROR: Failed to open partfile '%s'")) % GetFullName());
+		SetStatus(PS_ERROR);
 	}
+	// then close the handle again
+	m_hpartfile.Release(true);
 }
 
 #endif

aMule-2.2.6.tar.bz2/src/PartFile.h -> aMule-2.3.1.tar.bz2/src/PartFile.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -28,15 +28,13 @@
 
 
 #include "KnownFile.h"		// Needed for CKnownFile
-#include "CFile.h"		// Needed for CFile
+#include "FileAutoClose.h"	// Needed for CFileAutoClose
 
-#include "OtherStructs.h"	// Needed for Gap_Struct
+#include "OtherStructs.h"	// Needed for Requested_Block_Struct
 #include "DeadSourceList.h"	// Needed for CDeadSourceList
-
-
+#include "GapList.h"
 
 class CSearchFile;
-class CUpDownClient;
 class CMemFile;
 class CFileDataIO;
 class CED2KFileLink;
@@ -44,8 +42,6 @@
 //#define BUFFER_SIZE_LIMIT	500000 // Max bytes before forcing a flush
 #define BUFFER_TIME_LIMIT	60000   // Max milliseconds before forcing a flush
 
-#define	STATES_COUNT			13
-
 // Ok, eMule and aMule are building incompatible backup files because 
 // of the different name. aMule was using ".BAK" and eMule ".bak". 
 // This should fix it.
@@ -60,14 +56,6 @@
 	PMT_BADFORMAT
 };
 
-struct PartFileBufferedData
-{
-	byte *data;						// Barry - This is the data to be written
-	uint64 start;					// Barry - This is the start offset of the data
-	uint64 end;						// Barry - This is the end offset of the data
-	Requested_Block_Struct *block;	// Barry - This is the requested block that this data relates to
-};
-
 
 class SFileRating
 {
@@ -89,20 +77,18 @@
 {
 public:
 	wxString	name;
-	long		count;
+	int			count;
 public:
-	SourcenameItem(const wxString &n, long c)
+	SourcenameItem(const wxString &n = EmptyString, int c = 0)
 	:
 	name(n), count(c) {}
 };
 
-typedef std::list<SourcenameItem> SourcenameItemList;
+typedef std::map<uint32,SourcenameItem> SourcenameItemMap;
 
 class CPartFile : public CKnownFile {
 public:
-	typedef std::list<Gap_Struct*> CGapPtrList;
 	typedef std::list<Requested_Block_Struct*> CReqBlockPtrList;
-
 	
 	CPartFile();
 #ifdef CLIENT_GUI
@@ -114,11 +100,14 @@
 	CPartFile(const CED2KFileLink* fileLink);
 	virtual ~CPartFile();
 	
-	bool	CreateFromFile(wxString WXUNUSED(directory), wxString WXUNUSED(filename), void* WXUNUSED(pvProgressParam)) {return false;}// not supported in this class
-	void 	SetPartFileStatus(uint8 newstatus);
 	virtual bool LoadFromFile(const CFileDataIO* WXUNUSED(file)) { return false; }
 	bool	WriteToFile(CFileDataIO* WXUNUSED(file))	{ return false; }
-	bool	IsPartFile() const		{ return !(status == PS_COMPLETE); }
+
+	// virtual functions for CKnownFile and CPartFile:
+	bool	IsPartFile() const		{ return status != PS_COMPLETE; }	// true if not completed
+	bool	IsCompleted() const		{ return status == PS_COMPLETE; }	// true if completed
+	bool	IsCPartFile() const		{ return true; }					// true if it's a CPartFile
+
 	uint32	Process(uint32 reducedownload, uint8 m_icounter);
 	uint8	LoadPartFile(const CPath& in_directory, const CPath& filename, bool from_backup = false, bool getsizeonly = false);
 	bool	SavePartFile(bool Initial = false);
@@ -127,7 +116,8 @@
 	
 	bool    CheckShowItemInGivenCat(int inCategory);
 
-	bool	IsComplete(uint64 start, uint64 end);
+	bool	IsComplete(uint64 start, uint64 end)	{ return m_gaplist.IsComplete(start, end); }
+	bool	IsComplete(uint16 part)			{ return m_gaplist.IsComplete(part); }
 	
 	void	UpdateCompletedInfos();
 
@@ -144,9 +134,10 @@
 #endif
 	virtual void	UpdatePartsInfo();
 	const CPath& GetPartMetFileName() const { return m_partmetfilename; }
+	uint16	GetPartMetNumber() const;
 	uint64	GetTransferred() const		{ return transferred; }
 	const CPath& GetFullName() const	{ return m_fullname; }
-	float	GetKBpsDown() const		{ return kBpsDown; }
+	float	GetKBpsDown() const			{ return kBpsDown; }
 	double	GetPercentCompleted() const	{ return percentcompleted; }
 
 #ifndef CLIENT_GUI
@@ -159,7 +150,6 @@
 #endif
 	uint16	GetTransferingSrcCount() const	{ return transferingsrc; }
 	uint16  GetNotCurrentSourcesCount()	const	{ return m_notCurrentSources; };
-	void	SetNotCurrentSourcesCount(uint16 new_count)	{ m_notCurrentSources = new_count; };	
 	uint16	GetValidSourcesCount() const	{ return m_validSources; };
 	
 	uint64	GetNeededSpace();
@@ -172,11 +162,8 @@
 	int	getPartfileStatusRang() const;
 
 	// Barry - Added as replacement for BlockReceived to buffer data before writing to disk
-	uint32	WriteToBuffer(uint32 transize, byte *data, uint64 start, uint64 end, Requested_Block_Struct *block);
-	void	FlushBuffer(bool forcewait=false, bool bForceICH = false, bool bNoAICH = false);	
-
-	// Barry - Is archive recovery in progress
-	volatile bool m_bRecoveringArchive;
+	uint32	WriteToBuffer(uint32 transize, byte *data, uint64 start, uint64 end, Requested_Block_Struct *block, const CUpDownClient* client);
+	void	FlushBuffer(bool fromAICHRecoveryDataAvailable = false);	
 
 	// Barry - Added to prevent list containing deleted blocks on shutdown
 	void	RemoveAllRequestedBlocks(void);
@@ -202,16 +189,14 @@
 	bool	IsStopped() const		{ return this ? m_stopped : true; }
 	bool	IsPaused() const		{ return m_paused; }
 	void	UpdateFileRatingCommentAvail();
-	bool	m_CommentUpdated;
 
 	int	GetCommonFilePenalty();
 	void	UpdateDisplayedInfo(bool force = false);
 	
 	uint8	GetCategory() const { return m_category; }
 	void	SetCategory(uint8 cat);
+	void	RemoveCategory(uint8 cat);
 
-	CFile	m_hpartfile;	//permanent opened handle to avoid write conflicts
-	volatile bool m_bPreviewing;
 	void	SetDownPriority(uint8 newDownPriority, bool bSave = true, bool bRefresh = true);
 	bool	IsAutoDownPriority() const	{ return m_bAutoDownPriority; }
 	void	SetAutoDownPriority(bool flag)	{ m_bAutoDownPriority = flag; }
@@ -260,17 +245,13 @@
 
 	ArrayOfUInts16	m_SrcpartFrequency;
 
-	void	SetShowSources( bool val )	{ m_showSources = val; }
-	bool	ShowSources()				const { return m_showSources; }
-
-	typedef std::set<CUpDownClient*> SourceSet;
-	
 	const SourceSet& GetSourceList()	const { return m_SrcList; }
 	const SourceSet& GetA4AFList()		const { return m_A4AFsrclist; }
+	void	ClearA4AFList()				{ m_A4AFsrclist.clear(); }
 
-	const CGapPtrList		GetGapList() const	{ return m_gaplist; }
 	const CReqBlockPtrList	GetRequestedBlockList() const { return m_requestedblocks_list; }
 
+	const CGapList& GetGapList() const { return m_gaplist; }
 
 	/**
 	 * Adds a source to the list of dead sources.
@@ -295,23 +276,27 @@
 	uint16	GetMaxSourcePerFileSoft() const;
 	uint16	GetMaxSourcePerFileUDP() const;		 
 
-	const FileRatingList &GetRatingAndComments();
+	void GetRatingAndComments(FileRatingList & list) const;
 
 	void	AllocationFinished();
 private:
-	//! A local list of sources that are invalid for this file.
 #ifndef CLIENT_GUI
+	// partfile handle (opened on demand)
+	CFileAutoClose	m_hpartfile;
+	//! A local list of sources that are invalid for this file.
 	CDeadSourceList	m_deadSources;
+
+	class CCorruptionBlackBox* m_CorruptionBlackBox;
 #endif
 
 	uint16	m_notCurrentSources;
-
-	bool	m_showSources;
 	
 	uint32	m_validSources;
 
 	void	AddGap(uint64 start, uint64 end);
+	void	AddGap(uint16 part);
 	void	FillGap(uint64 start, uint64 end);
+	void	FillGap(uint16 part);
 	bool	GetNextEmptyBlockInPart(uint16 partnumber,Requested_Block_Struct* result);
 	bool	IsAlreadyRequested(uint64 start, uint64 end);
 	void	CompleteFile(bool hashingdone);
@@ -322,13 +307,8 @@
 	
 	bool	IsCorruptedPart(uint16 partnumber);
 	
-	uint64	GetTotalGapSizeInPart(uint32 uPart) const;
-
-	uint64	GetTotalGapSizeInRange(uint64 uRangeStart, uint64 uRangeEnd) const;	
-	
 	uint32	m_iLastPausePurge;
 	uint16	m_count;
-	uint16	m_anStates[STATES_COUNT];
 	uint16	transferingsrc;
 	uint64  completedsize;
 	uint64	transferred;
@@ -337,8 +317,9 @@
 	uint64	m_iGainDueToCompression;
 	uint32  m_iTotalPacketsSavedDueToICH;
 	float 	kBpsDown;
-	CPath	m_fullname;
-	CPath	m_partmetfilename;
+	CPath	m_fullname;			// path/name of the met file
+	CPath	m_partmetfilename;	// name of the met file
+	CPath 	m_PartPath; 		// path/name of the partfile
 	bool	m_paused;
 	bool	m_stopped;
 	bool	m_insufficient;
@@ -347,7 +328,7 @@
 	uint8	status;
 	uint32	lastpurgetime;
 	uint32	m_LastNoNeededCheck;
-	CGapPtrList m_gaplist;
+	CGapList m_gaplist;
 	CReqBlockPtrList m_requestedblocks_list;
 	double	percentcompleted;
 	std::list<uint16> m_corrupted_list;
@@ -359,8 +340,8 @@
 
 	uint32		m_lastRefreshedDLDisplay;
 
-	// Barry - Buffered data to be written
-	std::list<PartFileBufferedData*> m_BufferedData_list;
+	// Buffered data to be written
+	std::list<class PartFileBufferedData*> m_BufferedData_list;
 	
 	uint32 m_nTotalBufferData;
 	uint32 m_nLastBufferFlushTime;
@@ -375,21 +356,27 @@
 	bool		m_hashsetneeded;
 	uint32		m_lastsearchtime;
 	bool		m_localSrcReqQueued;
-	
-	FileRatingList m_FileRatingList;
+
 #ifdef CLIENT_GUI
-	SourcenameItemList m_SourcenameItem_list;
-public:
-	const SourcenameItemList &GetSourcenameItemList() { return m_SourcenameItem_list; }
-	void ClearSourcenameItemList() { m_SourcenameItem_list.clear(); }
-	void AddSourcenameItemList(const wxString &name, long count) { m_SourcenameItem_list.push_back(SourcenameItem(name, count)); }
-#endif
-public:
+	FileRatingList m_FileRatingList;
 	const FileRatingList &GetFileRatingList() { return m_FileRatingList; }
 	void ClearFileRatingList() { m_FileRatingList.clear(); }
 	void AddFileRatingList(const wxString & u, const wxString & f, sint16 r, const wxString & c) { 
 	       m_FileRatingList.push_back(SFileRating(u, f, r, c)); }
 
+	uint32 	m_kbpsDown;
+	uint8   m_iDownPriorityEC;
+	bool	m_isShared;
+	SourcenameItemMap m_SourcenameItemMap;
+
+	ListOfUInts32	m_A4AFClientIDs;
+	ListOfUInts32 & GetA4AFClientIDs()			{ return m_A4AFClientIDs; }
+public:
+	bool	IsShared() const					{ return m_isShared; }
+	SourcenameItemMap &GetSourcenameItemMap()	{ return m_SourcenameItemMap; }
+	PartFileEncoderData m_PartFileEncoderData;
+#endif
+public:
 	bool IsHashSetNeeded() const				{ return m_hashsetneeded; }
 	void SetHashSetNeeded(bool value)			{ m_hashsetneeded = value; }
 	
@@ -399,15 +386,12 @@
 	bool IsLocalSrcRequestQueued() const		{ return m_localSrcReqQueued; }
 	void SetLocalSrcRequestQueued(bool value) 	{ m_localSrcReqQueued = value; }
 
-	void AddA4AFSource(CUpDownClient* src)		{ m_A4AFsrclist.insert(src); }
-	bool RemoveA4AFSource(CUpDownClient* src)	{ return (m_A4AFsrclist.erase(src) > 0); }
+	void AddA4AFSource(CUpDownClient* src)		{ m_A4AFsrclist.insert(CCLIENTREF(src, wxT("A4AFSource"))); }
+	bool RemoveA4AFSource(CUpDownClient* src)	{ return (m_A4AFsrclist.erase(CCLIENTREF(src, wxEmptyString)) > 0); }
 
 	uint32 GetLastSearchTime() const			{ return m_lastsearchtime; }
 	void SetLastSearchTime(uint32 time)			{ m_lastsearchtime = time; }
 	
-
-//	void CleanUpSources( bool noNeeded, bool fullQueue = false, bool highQueue = false );
-
 	void AddDownloadingSource(CUpDownClient* client);
           
 	void RemoveDownloadingSource(CUpDownClient* client);
@@ -423,18 +407,20 @@
 	void LoadSourceSeeds();
 	
 	// Dropping slow sources
-	
-	CUpDownClient* GetSlowerDownloadingClient(uint32 speed, CUpDownClient* caller) ;
+	CUpDownClient* GetSlowerDownloadingClient(uint32 speed, CUpDownClient* caller);
+
+  // Read data for sharing
+	bool ReadData(class CFileArea & area, uint64 offset, uint32 toread);
 
 private:
 	/* downloading sources list */
-	CClientPtrList m_downloadingSourcesList;
+	CClientRefList m_downloadingSourcesList;
 
 	/* Kad Stuff */
 	uint32	m_LastSearchTimeKad;
 	uint8	m_TotalSearchesKad;
 
-friend class CDownQueueRem;
+friend class CKnownFilesRem;
 friend class CPartFileConvert;
 };

aMule-2.2.6.tar.bz2/src/PartFileConvert.cpp -> aMule-2.3.1.tar.bz2/src/PartFileConvert.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -126,16 +126,16 @@
 	
 		switch ( s_convertPfThread->Create() ) {
 			case wxTHREAD_NO_ERROR:
-				AddDebugLogLineM( false, logPfConvert, wxT("A new thread has been created.") );
+				AddDebugLogLineN( logPfConvert, wxT("A new thread has been created.") );
 				break;
 			case wxTHREAD_RUNNING:
-				AddDebugLogLineM( true, logPfConvert, wxT("Error, attempt to create an already running thread!") );
+				AddDebugLogLineC( logPfConvert, wxT("Error, attempt to create an already running thread!") );
 				break;
 			case wxTHREAD_NO_RESOURCE:
-				AddDebugLogLineM( true, logPfConvert, wxT("Error, attempt to create a thread without resources!") );
+				AddDebugLogLineC( logPfConvert, wxT("Error, attempt to create a thread without resources!") );
 				break;
 			default:
-				AddDebugLogLineM( true, logPfConvert, wxT("Error, unknown error attempting to create a thread!") );
+				AddDebugLogLineC( logPfConvert, wxT("Error, unknown error attempting to create a thread!") );
 		}
 
 		// The thread shouldn't hog the CPU, as it will already be hogging the HD
@@ -153,7 +153,7 @@
 		return;
 	}
 
-	printf("Waiting for partfile convert thread to die...\n");
+	AddLogLineNS(_("Waiting for partfile convert thread to die..."));
 	while (s_convertPfThread) {
 		wxSleep(1);
 	}
@@ -170,11 +170,9 @@
 			wxMutexLocker lock(s_mutex);
 			s_pfconverting = NULL;
 			for (std::list<ConvertJob*>::iterator it = s_jobs.begin(); it != s_jobs.end(); ++it) {
-				s_pfconverting = *it;
-				if (s_pfconverting->state == CONV_QUEUE) {
+				if ((*it)->state == CONV_QUEUE) {
+					s_pfconverting = *it;
 					break;
-				} else {
-					s_pfconverting = NULL;
 				}
 			}
 		}
@@ -197,15 +195,15 @@
 				++imported;
 			}
 
+			Notify_ConvertUpdateJobInfo(s_pfconverting);
+
+			AddLogLineC(CFormat(_("Importing %s: %s")) % s_pfconverting->folder % GetConversionState(s_pfconverting->state));
+
 			if (TestDestroy()) {
 				wxMutexLocker lock(s_mutex);
 				DeleteContents(s_jobs);
 				break;
 			}
-
-			Notify_ConvertUpdateJobInfo(s_pfconverting);
-
-			AddLogLineM(true, CFormat(_("Importing %s: %s")) % s_pfconverting->folder % GetConversionState(s_pfconverting->state));
 		} else {
 			break; // nothing more to do now
 		}
@@ -218,7 +216,7 @@
 		theApp->sharedfiles->PublishNextTurn();
 	}
 
-	AddDebugLogLineM(false, logPfConvert, wxT("No more jobs on queue, exiting from thread."));
+	AddDebugLogLineN(logPfConvert, wxT("No more jobs on queue, exiting from thread."));
 
 	s_convertPfThread = NULL;
 
@@ -284,8 +282,6 @@
 				filePath.GetFullName().RemoveExt().GetExt().ToLong(&l);
 				fileindex = (unsigned)l;
 				filePath = finder.GetNextFile();
-				// GonoszTopi - why the hell does eMule need this??
-				//if (fileindex == 0) continue;
 				if (fileindex > maxindex) maxindex = fileindex;
 			}
 			float stepperpart;
@@ -296,7 +292,7 @@
 					if (maxindex * PARTSIZE <= s_pfconverting->size) {
 						s_pfconverting->spaceneeded = maxindex * PARTSIZE;
 					} else {
-						s_pfconverting->spaceneeded = ((s_pfconverting->size / PARTSIZE) * PARTSIZE) + (s_pfconverting->size % PARTSIZE);
+						s_pfconverting->spaceneeded = s_pfconverting->size;
 					}
 				} else {
 					stepperpart = 80.0f;
@@ -328,7 +324,7 @@
 			while (filename.IsOk()) {
 				// stats
 				++curindex;
-				buffer = wxString::Format(_("Loading data from old download file (%u of %u)"), curindex, partfilecount);
+				buffer = CFormat(_("Loading data from old download file (%u of %u)")) % curindex % partfilecount;
 
 				Notify_ConvertUpdateProgress(10 + (curindex * stepperpart), buffer);
 
@@ -348,19 +344,18 @@
 				inputfile.Read(ba, toReadWrite);
 				inputfile.Close();
 
-				buffer = wxString::Format(_("Saving data block into new single download file (%u of %u)"), curindex, partfilecount);
+				buffer = CFormat(_("Saving data block into new single download file (%u of %u)")) % curindex % partfilecount;
 
 				Notify_ConvertUpdateProgress(10 + (curindex * stepperpart), buffer);
 
 				// write the buffered data
-				file->m_hpartfile.Seek(chunkstart, wxFromStart);
-				file->m_hpartfile.Write(ba, toReadWrite);
+				file->m_hpartfile.WriteAt(ba, chunkstart, toReadWrite);
 
 				filename = finder.GetNextFile();
 			}
 			delete[] ba;
 		} catch (const CSafeIOException& e) {
-			AddDebugLogLineM(true, logPfConvert, wxT("IO error while converting partfiles: ") + e.what());
+			AddDebugLogLineC(logPfConvert, wxT("IO error while converting partfiles: ") + e.what());
 			
 			delete[] ba;
 			file->Delete();
@@ -383,7 +378,7 @@
 		if (freespace == wxInvalidOffset) {
 			delete file;
 			return CONV_IOERROR;
-		} else if (!s_pfconverting->removeSource && (freespace < s_pfconverting->spaceneeded)) {
+		} else if (freespace < s_pfconverting->spaceneeded) {
 			delete file;
 			return CONV_OUTOFDISKSPACE;
 		}
@@ -426,15 +421,13 @@
 
 	file->m_hashlist.clear();
 
-	DeleteContents(file->m_gaplist);
-
 	if (!file->LoadPartFile(thePrefs::GetTempDir(), file->GetPartMetFileName(), false)) {
 		//delete file;
 		file->Delete();
 		return CONV_BADFORMAT;
 	}
 
-	if (s_pfconverting->partmettype == PMT_NEWOLD || s_pfconverting->partmettype == PMT_SPLITTED ) {
+	if (s_pfconverting->partmettype == PMT_NEWOLD || s_pfconverting->partmettype == PMT_SPLITTED) {
 		file->SetCompletedSize(file->transferred);
 		file->m_iGainDueToCompression = 0;
 		file->m_iLostDueToCorruption = 0;

aMule-2.2.6.tar.bz2/src/PartFileConvert.h -> aMule-2.3.1.tar.bz2/src/PartFileConvert.h Changed

aMule-2.2.6.tar.bz2/src/PartFileConvertDlg.cpp -> aMule-2.3.1.tar.bz2/src/PartFileConvertDlg.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -73,9 +73,7 @@
 // CPartFileConvertDlg dialog
 
 BEGIN_EVENT_TABLE(CPartFileConvertDlg, wxDialog)
-#ifndef CLIENT_GUI
 	EVT_BUTTON(IDC_ADDITEM,		CPartFileConvertDlg::OnAddFolder)
-#endif
 	EVT_BUTTON(IDC_RETRY,		CPartFileConvertDlg::RetrySel)
 	EVT_BUTTON(IDC_CONVREMOVE,	CPartFileConvertDlg::RemoveSel)
 	EVT_BUTTON(wxID_CANCEL,		CPartFileConvertDlg::OnCloseButton)
@@ -96,11 +94,6 @@
 	m_joblist->InsertColumn(3, _("Filehash"),	wxLIST_FORMAT_LEFT, 100);
 
 	SetIcon(wxICON(convert));
-
-#ifdef CLIENT_GUI
-	// There's no remote directory browser (yet)
-	CastChild(IDC_ADDITEM, wxButton)->Enable(false);
-#endif
 }
 
 // Static methods
@@ -130,7 +123,7 @@
 {
 	if (s_convertgui) {
 		s_convertgui->m_pb_current->SetValue((int)percent);
-		wxString buffer = wxString::Format(wxT("%.2f %%"), percent);
+		wxString buffer = CFormat(wxT("%.2f %%")) % percent;
 		wxStaticText* percentlabel = dynamic_cast<wxStaticText*>(s_convertgui->FindWindow(IDC_CONV_PROZENT));
 		percentlabel->SetLabel(buffer);
 
@@ -194,7 +187,6 @@
 
 // CPartFileConvertDlg message handlers
 
-#ifndef CLIENT_GUI
 void CPartFileConvertDlg::OnAddFolder(wxCommandEvent& WXUNUSED(event))
 {
 	// TODO: use MuleRemoteDirSelector
@@ -212,7 +204,6 @@
 		}
 	}
 }
-#endif
 
 void CPartFileConvertDlg::OnClose(wxCloseEvent& WXUNUSED(event))
 {

aMule-2.2.6.tar.bz2/src/PartFileConvertDlg.h -> aMule-2.3.1.tar.bz2/src/PartFileConvertDlg.h Changed

aMule-2.2.6.tar.bz2/src/PlatformSpecific.cpp -> aMule-2.3.1.tar.bz2/src/PlatformSpecific.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-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
@@ -74,12 +74,12 @@
 		FILE_ATTRIBUTE_ARCHIVE, 
 		NULL);
 	if (hd == INVALID_HANDLE_VALUE) {
-		AddDebugLogLineM(true, logPartFile, CFormat(wxT("converting %s to sparse failed (OPEN): %s ")) % name % SystemError());
+		AddDebugLogLineC(logPartFile, CFormat(wxT("converting %s to sparse failed (OPEN): %s ")) % name % SystemError());
 		return false;
 	}
 
 	if (!DeviceIoControl(hd, FSCTL_SET_SPARSE, NULL, 0, NULL, 0, &dwReturnedBytes, NULL)) {
-		AddDebugLogLineM(true, logPartFile, CFormat(wxT("converting %s to sparse failed (SET_SPARSE): %s ")) % name % SystemError());
+		AddDebugLogLineC(logPartFile, CFormat(wxT("converting %s to sparse failed (SET_SPARSE): %s ")) % name % SystemError());
 	} else {
 		// FILE_ZERO_DATA_INFORMATION is not defined here
 		struct {
@@ -93,9 +93,9 @@
 		
 		// zero the data
 		if (!DeviceIoControl(hd, FSCTL_SET_ZERO_DATA, (LPVOID) &fzdi, sizeof(fzdi), NULL, 0, &dwReturnedBytes, NULL)) {
-			AddDebugLogLineM(true, logPartFile, CFormat(wxT("converting %s to sparse failed (ZERO): %s")) % name % SystemError());
+			AddDebugLogLineC(logPartFile, CFormat(wxT("converting %s to sparse failed (ZERO): %s")) % name % SystemError());
 		} else if (!SetFilePointerEx(hd, largo, NULL, FILE_BEGIN) || !SetEndOfFile(hd)) {
-			AddDebugLogLineM(true, logPartFile, CFormat(wxT("converting %s to sparse failed (SEEK): %s")) % name % SystemError());
+			AddDebugLogLineC(logPartFile, CFormat(wxT("converting %s to sparse failed (SEEK): %s")) % name % SystemError());
 		}
 	}
 	CloseHandle(hd);
@@ -231,54 +231,56 @@
 	fclose(mnttab);
 	return retval;
 }
+
 #elif defined(HAVE_GETMNTENT) && defined(HAVE_SYS_MNTENT_H) && defined(HAVE_SYS_MNTTAB_H)
 #include <stdio.h>
 #include <string.h>
 #include <sys/mntent.h>
 #include <sys/mnttab.h>
 #ifndef MNTTAB
-#      define MNTTAB   "/etc/mnttab"
+#	define MNTTAB	"/etc/mnttab"
 #endif
 #include <common/StringFunctions.h>
 
 static PlatformSpecific::EFSType doGetFilesystemType(const CPath& path)
 {
-       struct mnttab *entry = NULL;
-       PlatformSpecific::EFSType retval = PlatformSpecific::fsOther;
-       FILE *mnttab = fopen(MNTTAB, "r");
-       unsigned bestPrefixLen = 0;
-
-       if (mnttab == NULL) {
-               return PlatformSpecific::fsOther;
-       }
-
-       while (getmntent(mnttab, entry) == 0) {
-               if (entry->mnt_mountp) {
-                       wxString dir = char2unicode(entry->mnt_mountp);
-                       if (dir == path.GetRaw().Mid(0, dir.Length())) {
-                               if (dir.Length() >= bestPrefixLen) {
-                                       if (entry->mnt_fstype == NULL) {
-                                               break;
-                                       } else if (!strcmp(entry->mnt_fstype, MNTTYPE_PCFS)) {
-                                               retval = PlatformSpecific::fsFAT;
-                                       } else if (hasmntopt(entry, MNTOPT_NOLARGEFILES)) {
-                                               // MINIX is a file system that can handle special chars but has no large files.
-                                               retval = PlatformSpecific::fsMINIX;
-                                       } else if (dir.Length() > bestPrefixLen) {
-                                               retval = PlatformSpecific::fsOther;
-                                       }
-                                       bestPrefixLen = dir.Length();
-                               }
-                       }
-               }
-       }
-       fclose(mnttab);
-       return retval;
+	struct mnttab entryStatic;
+	struct mnttab *entry = &entryStatic;
+	PlatformSpecific::EFSType retval = PlatformSpecific::fsOther;
+	FILE *fmnttab = fopen(MNTTAB, "r");
+	unsigned bestPrefixLen = 0;
+
+	if (fmnttab == NULL) {
+		return PlatformSpecific::fsOther;
+	}
+
+	while (getmntent(fmnttab, entry) == 0) {
+		if (entry->mnt_mountp) {
+			wxString dir = char2unicode(entry->mnt_mountp);
+			if (dir == path.GetRaw().Mid(0, dir.Length())) {
+				if (dir.Length() >= bestPrefixLen) {
+					if (entry->mnt_fstype == NULL) {
+						break;
+					} else if (!strcmp(entry->mnt_fstype, MNTTYPE_PCFS)) {
+						retval = PlatformSpecific::fsFAT;
+					} else if (hasmntopt(entry, MNTOPT_NOLARGEFILES)) {
+						// MINIX is a file system that can handle special chars but has no large files.
+						retval = PlatformSpecific::fsMINIX;
+					} else if (dir.Length() > bestPrefixLen) {
+						retval = PlatformSpecific::fsOther;
+					}
+					bestPrefixLen = dir.Length();
+				}
+			}
+		}
+	}
+	fclose(fmnttab);
+	return retval;
 }
 
 #else
 
-// No way to determine filesystem type, all restrictions apply.
+// No way to determine filesystem type, no restrictions apply.
 static inline PlatformSpecific::EFSType doGetFilesystemType(const CPath& WXUNUSED(path))
 {
 	return PlatformSpecific::fsOther;
@@ -308,3 +310,55 @@
 
 	return s_fscache[path.GetRaw()] = doGetFilesystemType(path);
 }
+
+
+// Power event vetoing
+
+static bool m_preventingSleepMode = false;
+
+#if defined(__WXMAC__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1050	// 10.5 only
+	#include <IOKit/pwr_mgt/IOPMLib.h>
+	static IOPMAssertionID assertionID;
+#endif
+
+void PlatformSpecific::PreventSleepMode()
+{
+	if (!m_preventingSleepMode) {
+		#ifdef _MSC_VER
+			SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED);
+			m_preventingSleepMode = true;
+		#elif defined(__WXMAC__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1050	// 10.5 only
+			IOReturn success = IOPMAssertionCreate(kIOPMAssertionTypeNoDisplaySleep, 
+												kIOPMAssertionLevelOn, &assertionID); 
+			if (success == kIOReturnSuccess) {
+				// Correctly vetoed, flag so we don't do it again.
+				m_preventingSleepMode = true;
+			} else {
+				// ??
+			}
+		#else
+			#warning Power event vetoing not implemented.
+			// Not implemented	
+		#endif
+	}
+}
+
+void PlatformSpecific::AllowSleepMode()
+{
+	if (m_preventingSleepMode) {
+		#ifdef _MSC_VER
+			SetThreadExecutionState(ES_CONTINUOUS); // Clear the system request flag.
+			m_preventingSleepMode = false;
+		#elif defined(__WXMAC__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 1050	// 10.5 only
+			IOReturn success = IOPMAssertionRelease(assertionID); 
+			if (success == kIOReturnSuccess) {
+				// Correctly restored, flag so we don't do it again.
+				m_preventingSleepMode = false;
+			} else {
+				// ??
+			}
+		#else
+			// Not implemented
+		#endif
+	}
+}

aMule-2.2.6.tar.bz2/src/PlatformSpecific.h -> aMule-2.3.1.tar.bz2/src/PlatformSpecific.h Changed

aMule-2.2.6.tar.bz2/src/Preferences.cpp -> aMule-2.3.1.tar.bz2/src/Preferences.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -17,7 +17,7 @@
 // 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
@@ -35,6 +35,7 @@
 #include <wx/stdpaths.h>
 #include <wx/stopwatch.h>
 #include <wx/tokenzr.h>
+#include <wx/utils.h>		// Needed for wxBusyCursor
 
 #include "amule.h"
 #ifdef HAVE_CONFIG_H
@@ -54,19 +55,26 @@
 #include <wx/valgen.h>
 #include "muuli_wdr.h"
 #include "StatisticsDlg.h"
+#include "MuleColour.h"
 #endif
 
-#include "RandomFunctions.h"
 #ifndef CLIENT_GUI
+#include "RandomFunctions.h"
 #include "PlatformSpecific.h"		// Needed for PlatformSpecific::GetMaxConnections()
+#include "SharedFileList.h"			// Needed for theApp->sharedfiles->Reload()
 #endif
 
+// Needed for IP filtering prefs
+#include "ClientList.h"
+#include "ServerList.h"
+#include "GuiEvents.h"
+
 #define DEFAULT_TCP_PORT 4662
 #define DEFAULT_UDP_PORT 4672
 
 // Static variables
-COLORREF		CPreferences::s_colors[cntStatColors];
-COLORREF		CPreferences::s_colors_ref[cntStatColors];
+unsigned long		CPreferences::s_colors[cntStatColors];
+unsigned long		CPreferences::s_colors_ref[cntStatColors];
 
 CPreferences::CFGMap	CPreferences::s_CfgList;
 CPreferences::CFGList	CPreferences::s_MiscList;
@@ -77,13 +85,14 @@
 
 /* The rest, organize it! */
 wxString	CPreferences::s_nick;
+Cfg_Lang_Base * CPreferences::s_cfgLang;
 uint16		CPreferences::s_maxupload;
 uint16		CPreferences::s_maxdownload;
 uint16		CPreferences::s_slotallocation;
 wxString	CPreferences::s_Addr;
 uint16		CPreferences::s_port;
 uint16		CPreferences::s_udpport;
-bool		CPreferences::s_UDPDisable;
+bool		CPreferences::s_UDPEnable;
 uint16		CPreferences::s_maxconnections;
 bool		CPreferences::s_reconnect;
 bool		CPreferences::s_autoconnect;
@@ -99,6 +108,7 @@
 bool		CPreferences::s_ICH;
 uint8		CPreferences::s_depth3D;
 bool		CPreferences::s_scorsystem;
+bool		CPreferences::s_hideonclose;
 bool		CPreferences::s_mintotray;
 bool		CPreferences::s_trayiconenabled;
 bool		CPreferences::s_addnewfilespaused;
@@ -115,8 +125,6 @@
 bool		CPreferences::s_IPFilterSys;
 bool		CPreferences::s_onlineSig;
 uint16		CPreferences::s_OSUpdate;
-uint64		CPreferences::s_totalDownloadedBytes;
-uint64		CPreferences::s_totalUploadedBytes;
 wxString	CPreferences::s_languageID;
 uint8		CPreferences::s_iSeeShares;
 uint8		CPreferences::s_iToolDelayTime;
@@ -136,15 +144,17 @@
 wxString	CPreferences::s_yourHostname;
 bool		CPreferences::s_bVerbose;
 bool		CPreferences::s_bmanualhighprio;
-bool		CPreferences::s_btransferfullchunks;
 bool		CPreferences::s_bstartnextfile;
 bool		CPreferences::s_bstartnextfilesame;
+bool		CPreferences::s_bstartnextfilealpha;
 bool		CPreferences::s_bshowoverhead;
 bool		CPreferences::s_bDAP;
 bool		CPreferences::s_bUAP;
-bool		CPreferences::s_ShowRatesOnTitle;
+#ifndef __SVN__
+bool		CPreferences::s_showVersionOnTitle;
+#endif
+uint8_t		CPreferences::s_showRatesOnTitle;
 wxString	CPreferences::s_VideoPlayer;
-bool		CPreferences::s_moviePreviewBackup;
 bool		CPreferences::s_showAllNotCats;
 bool		CPreferences::s_msgonlyfriends;
 bool		CPreferences::s_msgsecure;
@@ -152,6 +162,7 @@
 uint8		CPreferences::s_iFileBufferSize;
 uint8		CPreferences::s_iQueueSize;
 wxString 	CPreferences::s_datetimeformat;
+wxString	CPreferences::s_sWebPath;
 wxString	CPreferences::s_sWebPassword;
 wxString	CPreferences::s_sWebLowPassword;
 uint16		CPreferences::s_nWebPort;
@@ -162,7 +173,7 @@
 bool		CPreferences::s_bWebLowEnabled;
 wxString	CPreferences::s_WebTemplate;
 bool		CPreferences::s_showCatTabInfos;
-uint32		CPreferences::s_allcatType;
+AllCategoryFilter CPreferences::s_allcatFilter;
 uint8		CPreferences::s_NoNeededSources;
 bool		CPreferences::s_DropFullQueueSources;
 bool		CPreferences::s_DropHighQueueRankingSources;
@@ -172,6 +183,7 @@
 wxString	CPreferences::s_ECAddr;
 uint32		CPreferences::s_ECPort;
 wxString	CPreferences::s_ECPassword;
+bool		CPreferences::s_TransmitOnlyUploadingClients;
 bool		CPreferences::s_IPFilterClients;
 bool		CPreferences::s_IPFilterServers;
 bool		CPreferences::s_UseSrcSeeds;
@@ -180,15 +192,12 @@
 bool		CPreferences::s_SecIdent;
 bool		CPreferences::s_ExtractMetaData;
 bool		CPreferences::s_allocFullFile;
-uint16		CPreferences::s_Browser;
 wxString	CPreferences::s_CustomBrowser;
 bool		CPreferences::s_BrowserTab;
 CPath		CPreferences::s_OSDirectory;
 wxString	CPreferences::s_Skin;
-bool		CPreferences::s_UseSkinFiles;
 bool		CPreferences::s_FastED2KLinksHandler;
 bool		CPreferences::s_ToolbarOrientation;
-bool		CPreferences::s_ShowPartFileNumber;
 bool		CPreferences::s_AICHTrustEveryHash;
 wxString 	CPreferences::s_CommentFilterString;
 bool		CPreferences::s_IPFilterAutoLoad;
@@ -199,6 +208,9 @@
 bool		CPreferences::s_FilterAllMessages;
 bool 		CPreferences::s_FilterComments;
 bool		CPreferences::s_FilterSomeMessages;
+bool		CPreferences::s_ShowMessagesInLog;
+bool		CPreferences::s_IsAdvancedSpamfilterEnabled;
+bool		CPreferences::s_IsChatCaptchaEnabled;
 bool		CPreferences::s_ShareHiddenFiles;
 bool		CPreferences::s_AutoSortDownload;
 bool		CPreferences::s_NewVersionCheck;
@@ -209,19 +221,23 @@
 bool		CPreferences::s_IsClientCryptLayerSupported;
 bool		CPreferences::s_bCryptLayerRequested;
 bool		CPreferences::s_IsClientCryptLayerRequired;
-uint32	CPreferences::s_dwKadUDPKey;
-uint8	CPreferences::s_byCryptTCPPaddingLength;
-
-wxString CPreferences::s_Ed2kURL;
-wxString CPreferences::s_KadURL;
+uint32		CPreferences::s_dwKadUDPKey;
+uint8		CPreferences::s_byCryptTCPPaddingLength;
 
+wxString 	CPreferences::s_Ed2kURL;
+wxString 	CPreferences::s_KadURL;
+bool	 	CPreferences::s_GeoIPEnabled;
+wxString 	CPreferences::s_GeoIPUpdateUrl;
+bool		CPreferences::s_preventSleepWhileDownloading;
+wxString 	CPreferences::s_StatsServerName;
+wxString 	CPreferences::s_StatsServerURL;
 
 /**
  * Template Cfg class for connecting with widgets.
  *
- * This template provides the base functionionality needed to syncronize a 
+ * This template provides the base functionionality needed to syncronize a
  * variable with a widget. However, please note that wxGenericValidator only
- * supports a few types (int, wxString, bool and wxArrayInt), so this template 
+ * supports a few types (int, wxString, bool and wxArrayInt), so this template
  * can't always be used directly.
  *
  * Cfg_Str and Cfg_Bool are able to use this template directly, whereas Cfg_Int
@@ -249,7 +265,7 @@
 #ifndef AMULE_DAEMON
 	/**
 	 * Connects the Cfg to a widget.
-	 * 
+	 *
 	 * @param id The ID of the widget to be connected.
 	 * @param parent The parent of the widget. Use this to speed up searches.
 	 *
@@ -262,12 +278,12 @@
 	{
 		if ( id ) {
 			m_widget = wxWindow::FindWindowById( id, parent );
-		
+
 			if ( m_widget ) {
 				wxGenericValidator validator( &m_value );
 
 				m_widget->SetValidator( validator );
-			
+
 				return true;
 			}
 		} else {
@@ -276,8 +292,8 @@
 
 		return false;
 	}
-	
-	
+
+
 	/** Updates the assosiated variable, returning true on success. */
 	virtual bool TransferFromWindow()
 	{
@@ -286,18 +302,18 @@
 
 			if ( validator ) {
 				TYPE temp = m_value;
-			
+
 				if ( validator->TransferFromWindow() ) {
 					SetChanged( temp != m_value );
 
 					return true;
 				}
 			}
-		} 
-		
+		}
+
 		return false;
 	}
-	
+
 	/** Updates the assosiated widget, returning true on success. */
 	virtual bool TransferToWindow()
 	{
@@ -325,7 +341,7 @@
 
 	//! Default variable value
 	TYPE	m_default;
-	
+
 	//! Pointer to the widget assigned to the Cfg instance
 	wxWindow*	m_widget;
 };
@@ -336,7 +352,7 @@
 {
 public:
 	/** Constructor. */
-	Cfg_Str( const wxString& keyname, wxString& value, const wxString& defaultVal = wxEmptyString )
+	Cfg_Str( const wxString& keyname, wxString& value, const wxString& defaultVal = EmptyString )
 	 : Cfg_Tmpl<wxString>( keyname, value, defaultVal )
 	{}
 
@@ -346,7 +362,7 @@
 		cfg->Read( GetKey(), &m_value, m_default );
 	}
 
-	
+
 	/** Saves the string to the specified wxConfig object. */
 	virtual void SaveToFile(wxConfigBase* cfg)
 	{
@@ -361,7 +377,7 @@
 class Cfg_Str_Encrypted : public Cfg_Str
 {
 public:
-	Cfg_Str_Encrypted( const wxString& keyname, wxString& value, const wxString& defaultVal = wxEmptyString )
+	Cfg_Str_Encrypted( const wxString& keyname, wxString& value, const wxString& defaultVal = EmptyString )
 	 : Cfg_Str( keyname, value, defaultVal )
 	{}
 
@@ -391,7 +407,7 @@
 {
 public:
 	/** Constructor. */
-	Cfg_Path(const wxString& keyname, CPath& value, const wxString& defaultVal = wxEmptyString )
+	Cfg_Path(const wxString& keyname, CPath& value, const wxString& defaultVal = EmptyString )
 	 : Cfg_Str(keyname, m_temp_path, defaultVal)
 	 , m_real_path(value)
 	{}
@@ -404,7 +420,7 @@
 		m_real_path = CPath::FromUniv(m_temp_path);
 	}
 
-	
+
 	/** @see Cfg_Str::SaveToFile. */
 	virtual void SaveToFile(wxConfigBase* cfg)
 	{
@@ -421,7 +437,7 @@
 
 		return Cfg_Str::TransferToWindow();
 	}
-	
+
 	/** @see Cfg_Tmpl::TransferFromWindow. */
 	virtual bool TransferFromWindow()
 	{
@@ -442,14 +458,14 @@
 /**
  * Cfg class that takes care of integer types.
  *
- * This template is needed since wxValidator only supports normals ints, and 
+ * This template is needed since wxValidator only supports normals ints, and
  * wxConfig for the matter only supports longs, thus some worksarounds are
- * needed. 
+ * needed.
  *
  * There are two work-arounds:
  *  1) wxValidator only supports int*, so we need a immediate variable to act
  *     as a storage. Thus we use Cfg_Tmpl<int> as base class. Thus this class
- *     contains a integer which we use to pass the value back and forth 
+ *     contains a integer which we use to pass the value back and forth
  *     between the widgets.
  *
  *  2) wxConfig uses longs to save and read values, thus we need an immediate
@@ -469,8 +485,8 @@
 	virtual void LoadFromFile(wxConfigBase* cfg)
 	{
 		long tmp = 0;
-		cfg->Read( GetKey(), &tmp, m_default ); 
-		
+		cfg->Read( GetKey(), &tmp, m_default );
+
 		// Set the temp value
 		m_temp_value = (int)tmp;
 		// Set the actual value
@@ -486,12 +502,12 @@
 #ifndef AMULE_DAEMON
 	virtual bool TransferFromWindow()
 	{
-		if ( Cfg_Tmpl<int>::TransferFromWindow() ) { 
+		if ( Cfg_Tmpl<int>::TransferFromWindow() ) {
 			m_real_value = (TYPE)m_temp_value;
 
 			return true;
-		} 
-		
+		}
+
 		return false;
 	}
 
@@ -500,19 +516,19 @@
 		m_temp_value = (int)m_real_value;
 
 		if ( Cfg_Tmpl<int>::TransferToWindow() ) {
-			
+
 			// In order to let us update labels on slider-changes, we trigger a event
 			wxSlider *slider = dynamic_cast<wxSlider *>(m_widget);
 			if (slider) {
 				int id = m_widget->GetId();
 				int pos = slider->GetValue();
 				wxScrollEvent evt( wxEVT_SCROLL_THUMBRELEASE, id, pos );
-				m_widget->ProcessEvent( evt );
+				m_widget->GetEventHandler()->ProcessEvent( evt );
 			}
 
 			return true;
 		}
-		
+
 		return false;
 	}
 #endif
@@ -532,7 +548,7 @@
  * @param defaultVal The default value if the key isn't found when loading the value.
  * @return A pointer to the new Cfg_Int object. The caller is responsible for deleting it.
  *
- * This template-function returns a Cfg_Int of the appropriate type for the 
+ * This template-function returns a Cfg_Int of the appropriate type for the
  * variable used as argument and should be used to avoid having to specify
  * the integer type when adding a new Cfg_Int, since that's just increases
  * the maintainence burden.
@@ -554,7 +570,7 @@
 	 : Cfg_Tmpl<bool>( keyname, value, defaultVal )
 	{}
 
-	
+
 	virtual void LoadFromFile(wxConfigBase* cfg)
 	{
 		cfg->Read( GetKey(), &m_value, m_default );
@@ -567,50 +583,35 @@
 };
 
 
-/**
- * Cfg-class for uint64s, with no assisiated widgets.
- */
-class Cfg_Counter : public Cfg_Base
+#ifndef AMULE_DAEMON
+
+class Cfg_Colour : public Cfg_Base
 {
-public:
-	Cfg_Counter( const wxString& keyname, uint64& value )
-	 : Cfg_Base( keyname ),
-	   m_value( value )
+      public:
+	Cfg_Colour(const wxString& key, wxColour& colour)
+		: Cfg_Base(key),
+		  m_colour(colour),
+		  m_default(CMuleColour(colour).GetULong())
 	{}
 
 	virtual void LoadFromFile(wxConfigBase* cfg)
 	{
-		wxString buffer;
-	
-		cfg->Read( GetKey(), &buffer, wxT("0") );
-
-		uint64 tmp = 0;
-		for (unsigned int i = 0; i < buffer.Length(); ++i) {
-			if ((buffer[i] >= wxChar('0')) &&(buffer[i] <= wxChar('9'))) {
-				tmp = tmp * 10 + (buffer[i] - wxChar('0'));
-			} else {
-				tmp = 0;
-				break;
-			}
-		}
-		m_value = tmp;
+		long int rgb;
+		cfg->Read(GetKey(), &rgb, m_default);
+		m_colour.Set(rgb);
 	}
 
 	virtual void SaveToFile(wxConfigBase* cfg)
 	{
-		wxString str = CFormat( wxT("%llu") ) % m_value;
-	
-		cfg->Write( GetKey(), str );
+		cfg->Write(GetKey(), static_cast<long int>(CMuleColour(m_colour).GetULong()));
 	}
 
-	
-protected:
-	uint64& m_value;
+      private:
+	wxColour&	m_colour;
+	long int	m_default;
 };
 
 
-#ifndef AMULE_DAEMON
-
 typedef struct {
 	int	 id;
 	bool	 available;
@@ -622,57 +623,60 @@
 /**
  * The languages aMule has translation for.
  *
- * Add new languages here, as this list overrides the one defined in muuli.wdr
+ * Add new languages here.
+ * Then activate the test code in Cfg_Lang::UpdateChoice below!
  */
 static LangInfo aMuleLanguages[] = {
 	{ wxLANGUAGE_DEFAULT,				true,	wxEmptyString,	wxTRANSLATE("System default") },
-	{ wxLANGUAGE_ALBANIAN,				true,	wxEmptyString,	wxTRANSLATE("Albanian") },
-	{ wxLANGUAGE_ARABIC,				true,	wxEmptyString,	wxTRANSLATE("Arabic") },
-	{ wxLANGUAGE_ASTURIAN,				true,	wxEmptyString,	wxTRANSLATE("Asturian") },
-	{ wxLANGUAGE_BASQUE,				true,	wxEmptyString,	wxTRANSLATE("Basque") },
-	{ wxLANGUAGE_BULGARIAN,				true,	wxEmptyString,	wxTRANSLATE("Bulgarian") },
-	{ wxLANGUAGE_CATALAN,				true,	wxEmptyString,	wxTRANSLATE("Catalan") },
-	{ wxLANGUAGE_CHINESE_SIMPLIFIED,		true,	wxEmptyString,	wxTRANSLATE("Chinese (Simplified)") },
-	{ wxLANGUAGE_CHINESE_TRADITIONAL,		true,	wxEmptyString,	wxTRANSLATE("Chinese (Traditional)") },
-	{ wxLANGUAGE_CROATIAN,				true,	wxEmptyString,	wxTRANSLATE("Croatian") },
-	{ wxLANGUAGE_CZECH,				true,	wxEmptyString,	wxTRANSLATE("Czech") },
-	{ wxLANGUAGE_DANISH,				true,	wxEmptyString,	wxTRANSLATE("Danish") },
-	{ wxLANGUAGE_DUTCH,				true,	wxEmptyString,	wxTRANSLATE("Dutch") },
-	{ wxLANGUAGE_ENGLISH_UK,			true,	wxEmptyString,	wxTRANSLATE("English (U.K.)") },
-	{ wxLANGUAGE_ESTONIAN,				true,	wxEmptyString,	wxTRANSLATE("Estonian") },
-	{ wxLANGUAGE_FINNISH,				true,	wxEmptyString,	wxTRANSLATE("Finnish") },
-	{ wxLANGUAGE_FRENCH,				true,	wxEmptyString,	wxTRANSLATE("French") },
-	{ wxLANGUAGE_GALICIAN,				true,	wxEmptyString,	wxTRANSLATE("Galician") },
-	{ wxLANGUAGE_GERMAN,				true,	wxEmptyString,	wxTRANSLATE("German") },
-	{ wxLANGUAGE_GREEK,				true,	wxEmptyString,	wxTRANSLATE("Greek") },
-	{ wxLANGUAGE_HEBREW,				true,	wxEmptyString,	wxTRANSLATE("Hebrew") },
-	{ wxLANGUAGE_HUNGARIAN,				true,	wxEmptyString,	wxTRANSLATE("Hungarian") },
-	{ wxLANGUAGE_ITALIAN,				true,	wxEmptyString,	wxTRANSLATE("Italian") },
-	{ wxLANGUAGE_ITALIAN_SWISS,			true,	wxEmptyString,	wxTRANSLATE("Italian (Swiss)") },
-	{ wxLANGUAGE_JAPANESE,				true,	wxEmptyString,	wxTRANSLATE("Japanese") },
-	{ wxLANGUAGE_KOREAN,				true,	wxEmptyString,	wxTRANSLATE("Korean") },
-	{ wxLANGUAGE_LITHUANIAN,			true,	wxEmptyString,	wxTRANSLATE("Lithuanian") },
-	{ wxLANGUAGE_NORWEGIAN_NYNORSK,			true,	wxEmptyString,	wxTRANSLATE("Norwegian (Nynorsk)") },
-	{ wxLANGUAGE_POLISH,				true,	wxEmptyString,	wxTRANSLATE("Polish") },
-	{ wxLANGUAGE_PORTUGUESE,			true,	wxEmptyString,	wxTRANSLATE("Portuguese") },
-	{ wxLANGUAGE_PORTUGUESE_BRAZILIAN,		true,	wxEmptyString,	wxTRANSLATE("Portuguese (Brazilian)") },
-	{ wxLANGUAGE_RUSSIAN,				true,	wxEmptyString,	wxTRANSLATE("Russian") },
-	{ wxLANGUAGE_SLOVENIAN,				true,	wxEmptyString,	wxTRANSLATE("Slovenian") },
-	{ wxLANGUAGE_SPANISH,				true,	wxEmptyString,	wxTRANSLATE("Spanish") },
-	{ wxLANGUAGE_SWEDISH,				true,	wxEmptyString,	wxTRANSLATE("Swedish") },
-	{ wxLANGUAGE_TURKISH,				true,	wxEmptyString,	wxTRANSLATE("Turkish") },
-	{ wxLANGUAGE_UKRAINIAN,				true,	wxEmptyString,	wxTRANSLATE("Ukrainian") },
+	{ wxLANGUAGE_ALBANIAN,				false,	wxEmptyString,	wxTRANSLATE("Albanian") },
+	{ wxLANGUAGE_ARABIC,				false,	wxEmptyString,	wxTRANSLATE("Arabic") },
+	{ wxLANGUAGE_ASTURIAN,				false,	wxEmptyString,	wxTRANSLATE("Asturian") },
+	{ wxLANGUAGE_BASQUE,				false,	wxEmptyString,	wxTRANSLATE("Basque") },
+	{ wxLANGUAGE_BULGARIAN,				false,	wxEmptyString,	wxTRANSLATE("Bulgarian") },
+	{ wxLANGUAGE_CATALAN,				false,	wxEmptyString,	wxTRANSLATE("Catalan") },
+	{ wxLANGUAGE_CHINESE_SIMPLIFIED,	false,	wxEmptyString,	wxTRANSLATE("Chinese (Simplified)") },
+	{ wxLANGUAGE_CHINESE_TRADITIONAL,	false,	wxEmptyString,	wxTRANSLATE("Chinese (Traditional)") },
+	{ wxLANGUAGE_CROATIAN,				false,	wxEmptyString,	wxTRANSLATE("Croatian") },
+	{ wxLANGUAGE_CZECH,					false,	wxEmptyString,	wxTRANSLATE("Czech") },
+	{ wxLANGUAGE_DANISH,				false,	wxEmptyString,	wxTRANSLATE("Danish") },
+	{ wxLANGUAGE_DUTCH,					false,	wxEmptyString,	wxTRANSLATE("Dutch") },
+	{ wxLANGUAGE_ENGLISH,				false,	wxEmptyString,	wxTRANSLATE("English (U.K.)") },
+	{ wxLANGUAGE_ESTONIAN,				false,	wxEmptyString,	wxTRANSLATE("Estonian") },
+	{ wxLANGUAGE_FINNISH,				false,	wxEmptyString,	wxTRANSLATE("Finnish") },
+	{ wxLANGUAGE_FRENCH,				false,	wxEmptyString,	wxTRANSLATE("French") },
+	{ wxLANGUAGE_GALICIAN,				false,	wxEmptyString,	wxTRANSLATE("Galician") },
+	{ wxLANGUAGE_GERMAN,				false,	wxEmptyString,	wxTRANSLATE("German") },
+	{ wxLANGUAGE_GREEK,					false,	wxEmptyString,	wxTRANSLATE("Greek") },
+	{ wxLANGUAGE_HEBREW,				false,	wxEmptyString,	wxTRANSLATE("Hebrew") },
+	{ wxLANGUAGE_HUNGARIAN,				false,	wxEmptyString,	wxTRANSLATE("Hungarian") },
+	{ wxLANGUAGE_ITALIAN,				false,	wxEmptyString,	wxTRANSLATE("Italian") },
+	{ wxLANGUAGE_ITALIAN_SWISS,			false,	wxEmptyString,	wxTRANSLATE("Italian (Swiss)") },
+	{ wxLANGUAGE_JAPANESE,				false,	wxEmptyString,	wxTRANSLATE("Japanese") },
+	{ wxLANGUAGE_KOREAN,				false,	wxEmptyString,	wxTRANSLATE("Korean") },
+	{ wxLANGUAGE_LITHUANIAN,			false,	wxEmptyString,	wxTRANSLATE("Lithuanian") },
+	{ wxLANGUAGE_NORWEGIAN_NYNORSK,		false,	wxEmptyString,	wxTRANSLATE("Norwegian (Nynorsk)") },
+	{ wxLANGUAGE_POLISH,				false,	wxEmptyString,	wxTRANSLATE("Polish") },
+	{ wxLANGUAGE_PORTUGUESE,			false,	wxEmptyString,	wxTRANSLATE("Portuguese") },
+	{ wxLANGUAGE_PORTUGUESE_BRAZILIAN,	false,	wxEmptyString,	wxTRANSLATE("Portuguese (Brazilian)") },
+	{ wxLANGUAGE_RUSSIAN,				false,	wxEmptyString,	wxTRANSLATE("Russian") },
+	{ wxLANGUAGE_SLOVENIAN,				false,	wxEmptyString,	wxTRANSLATE("Slovenian") },
+	{ wxLANGUAGE_SPANISH,				false,	wxEmptyString,	wxTRANSLATE("Spanish") },
+	{ wxLANGUAGE_SWEDISH,				false,	wxEmptyString,	wxTRANSLATE("Swedish") },
+	{ wxLANGUAGE_TURKISH,				false,	wxEmptyString,	wxTRANSLATE("Turkish") },
+	{ wxLANGUAGE_UKRAINIAN,				false,	wxEmptyString,	wxTRANSLATE("Ukrainian") },
 };
 
 
 typedef Cfg_Int<int> Cfg_PureInt;
 
-class Cfg_Lang : public Cfg_PureInt
+class Cfg_Lang : public Cfg_PureInt, public Cfg_Lang_Base
 {
 public:
 	Cfg_Lang()
 		: Cfg_PureInt( wxEmptyString, m_selection, 0 )
 	{
+		m_languagesReady = false;
+		m_changePos = 0;
 	}
 
 	virtual void LoadFromFile(wxConfigBase* WXUNUSED(cfg)) {}
@@ -681,7 +685,11 @@
 
 	virtual bool TransferFromWindow()
 	{
-		if ( Cfg_PureInt::TransferFromWindow() ) { 
+		if (!m_languagesReady) {
+			return true;	// nothing changed, no problem
+		}
+
+		if ( Cfg_PureInt::TransferFromWindow() ) {
 			// find wx ID of selected language
 			int i = 0;
 			while (m_selection > 0) {
@@ -704,77 +712,117 @@
 
 	virtual bool TransferToWindow()
 	{
-		wxChoice *langSelector = dynamic_cast<wxChoice*>(m_widget);
-		// clear existing list
-		langSelector->Clear();
-
-		m_selection = 0;
-		int wxId = StrLang2wx(thePrefs::GetLanguageID());
+		m_langSelector = dynamic_cast<wxChoice*>(m_widget);	// doesn't work in ctor!
+		if (m_languagesReady) {
+			FillChoice();
+		} else {
+			int wxId = StrLang2wx(thePrefs::GetLanguageID());
+			m_langSelector->Clear();
+			m_selection = 0;
+			for (uint32 i = 0; i < itemsof(aMuleLanguages); i++) {
+				if ( aMuleLanguages[i].id == wxId ) {
+					m_langSelector->Append(wxString(wxGetTranslation(aMuleLanguages[i].name)) + wxT(" [") + aMuleLanguages[i].name + wxT("]"));
+					break;
+				}
+			}
+			m_langSelector->Append(_("Change Language"));
+			m_changePos = m_langSelector->GetCount() - 1;
+		}
 
-		// Find available languages and translate them
-		aMuleLanguages[0].displayname = wxGetTranslation(aMuleLanguages[0].name);
-		for (unsigned int i = 1; i < itemsof(aMuleLanguages); ++i)
-		{
-			// This supresses error-messages about invalid locales.
-			wxLogNull	logTarget;
-			wxLocale 	locale_to_check;
+		return Cfg_PureInt::TransferToWindow();
+	}
 
-			InitLocale(locale_to_check, aMuleLanguages[i].id);
-			if (locale_to_check.IsOk() && locale_to_check.IsLoaded(wxT(PACKAGE))) {
-				aMuleLanguages[i].displayname = wxString(wxGetTranslation(aMuleLanguages[i].name)) + wxT(" [") + aMuleLanguages[i].name + wxT("]");
-			} else {
-				aMuleLanguages[i].available = false;
+	virtual void UpdateChoice(int pos)
+	{
+		if (!m_languagesReady && pos == m_changePos) {
+			// Find available languages and translate them.
+			// This is only done when the user selects "Change Language"
+			// Language is changed rarely, and the go-through-all locales takes a considerable
+			// time when the settings dialog is opened for the first time.
+			wxBusyCursor busyCursor;
+			aMuleLanguages[0].displayname = wxGetTranslation(aMuleLanguages[0].name);
+
+			// This supresses error-messages about invalid locales
+			for (unsigned int i = 1; i < itemsof(aMuleLanguages); ++i) {
+				if ((aMuleLanguages[i].id > wxLANGUAGE_USER_DEFINED) || wxLocale::IsAvailable(aMuleLanguages[i].id)) {
+					wxLogNull	logTarget;
+					wxLocale 	locale_to_check;
+					InitLocale(locale_to_check, aMuleLanguages[i].id);
+					if (locale_to_check.IsOk() && locale_to_check.IsLoaded(wxT(PACKAGE))) {
+						aMuleLanguages[i].displayname = wxString(wxGetTranslation(aMuleLanguages[i].name)) + wxT(" [") + aMuleLanguages[i].name + wxT("]");
+						aMuleLanguages[i].available = true;
+#if 0
+						// Check for language problems
+						// Activate this code temporarily after messing with the languages!
+						int wxid = StrLang2wx(wxLang2Str(aMuleLanguages[i].id));
+						if (wxid != aMuleLanguages[i].id) {
+							AddDebugLogLineN(logGeneral, CFormat(wxT("Language problem for %s : aMule id %d != wx id %d"))
+								% aMuleLanguages[i].name % aMuleLanguages[i].id % wxid);
+						}
+#endif
+					}
+				}
 			}
+			// Restore original locale
+			wxLocale tmpLocale;
+			InitLocale(tmpLocale, theApp->m_locale.GetLanguage());
+			FillChoice();
+			if (m_langSelector->GetCount() == 1) {
+				wxMessageBox(_("There are no translations installed for aMule"), _("No languages available"), wxICON_INFORMATION | wxOK);
+			}
+			m_langSelector->SetSelection(m_selection);
+			m_languagesReady = true;
 		}
+	}
+
+protected:
+	int	m_selection;
 
+private:
+	void FillChoice()
+	{
+		int wxId = StrLang2wx(thePrefs::GetLanguageID());
+		m_langSelector->Clear();
 		// Add all available languages and find the index of the selected language.
 		for ( unsigned int i = 0, j = 0; i < itemsof(aMuleLanguages); i++) {
 			if (aMuleLanguages[i].available) {
-				langSelector->Append(aMuleLanguages[i].displayname);
+				m_langSelector->Append(aMuleLanguages[i].displayname);
 				if ( aMuleLanguages[i].id == wxId ) {
 					m_selection = j;
 				}
 				j++;
 			}
 		}
-
-		// Restore original locale
-		{
-			wxLocale tmpLocale;
-			InitLocale(tmpLocale, theApp->m_locale.GetLanguage());
-		}
-
-		return Cfg_PureInt::TransferToWindow();
 	}
 
-
-protected:
-	int	m_selection;
+	bool m_languagesReady;	// true: all translations calculated
+	int	 m_changePos;
+	wxChoice * m_langSelector;
 };
 
 #endif /* ! AMULE_DAEMON */
 
+void Cfg_Lang_Base::UpdateChoice(int) {}	// dummy
+
 class Cfg_Skin : public Cfg_Str
 {
 public:
-//	Cfg_Tmpl( const wxString& keyname, TYPE& value, const TYPE& defaultVal )
-//	 : Cfg_Base( keyname ),
-//	   m_value( value ),
-//	   m_default( defaultVal ),
-//	   m_widget( NULL )
-//	{}
-//	Cfg_Str( const wxString& keyname, wxString& value, const wxString& defaultVal = wxEmptyString )
-//	 : Cfg_Tmpl<wxString>( keyname, value, defaultVal )
-//	{}
-	Cfg_Skin( const wxString& keyname, wxString& value, const wxString& defaultVal = wxEmptyString )
-	 : Cfg_Str( keyname, value, defaultVal )
-	{
-	}
+	Cfg_Skin( const wxString& keyname, wxString& value, const wxString& defaultVal = EmptyString )
+		: Cfg_Str( keyname, value, defaultVal ),
+		  m_is_skin(false)
+	{}
 
 #ifndef AMULE_DAEMON
 	virtual bool TransferFromWindow()
 	{
 		if ( Cfg_Str::TransferFromWindow() ) {
+			if (m_is_skin) {
+				wxChoice *skinSelector = dynamic_cast<wxChoice*>(m_widget);
+				// "- default -" is always the first
+				if (skinSelector->GetSelection() == 0) {
+					m_value.Clear();
+				}
+			}
 			return true;
 		}
 
@@ -789,22 +837,23 @@
 		skinSelector->Clear();
 
 		wxString folder;
-		bool skins = false;
 		int flags = wxDIR_DIRS;
-		wxString filespec = wxEmptyString;
+		wxString filespec;
+		wxString defaultSelection = _("- default -");
 //#warning there has to be a better way...
 		if ( GetKey() == wxT("/SkinGUIOptions/Skin") ) {
 			folder = wxT("skins");
-			skins = true;
+			m_is_skin = true;
 			flags = wxDIR_FILES;
 			filespec = wxT("*.zip");
+			skinSelector->Append(defaultSelection);
 		} else {
 			folder = wxT("webserver");
 		}
-		wxString dirName(JoinPaths(GetConfigDir(), folder));
+		wxString dirName(JoinPaths(GetConfigDir(theApp->m_configFile), folder));
 		wxString Filename;
 		wxDir d;
-		
+
 		if (wxDir::Exists(dirName) &&
 			d.Open(dirName) &&
 			d.GetFirst(& Filename, filespec, flags)
@@ -812,7 +861,7 @@
 		{
 			do
 			{
-				if (skins == true) {
+				if (m_is_skin) {
 					Filename = wxT("User:") + Filename;
 				}
 				skinSelector->Append(Filename);
@@ -820,13 +869,14 @@
 			while (d.GetNext(&Filename));
 		}
 
-		wxStandardPathsBase &spb(wxStandardPaths::Get());
-#ifdef __WXMSW__
-		wxString dataDir(spb.GetPluginsDir());
-#elif defined(__WXMAC__)
-		wxString dataDir(spb.GetDataDir());
-#else
-	wxString dataDir(spb.GetDataDir().BeforeLast(wxT('/')) + wxT("/amule"));
+		wxString dataDir;
+		if (m_is_skin) {
+			dataDir = wxStandardPaths::Get().GetDataDir();
+		} else {
+			dataDir = wxStandardPaths::Get().GetResourcesDir();
+		}
+#if !defined(__WXMSW__) && !defined(__WXMAC__)
+		dataDir = dataDir.BeforeLast(wxT('/')) + wxT("/amule");
 #endif
 		wxString systemDir(JoinPaths(dataDir,folder));
 
@@ -837,7 +887,7 @@
 		{
 			do
 			{
-				if (skins == true) {
+				if (m_is_skin) {
 					Filename = wxT("System:") +  Filename;
 				}
 				// avoid duplicates for webserver templates
@@ -846,15 +896,18 @@
 				}
 			}
 			while (d.GetNext(&Filename));
-		}			
+		}
 
 		if ( skinSelector->GetCount() == 0 ) {
-			skinSelector->Append(wxT("no options available"));	
+			skinSelector->Append(_("no options available"));
 		}
 
 		int id = skinSelector->FindString(m_value);
 		if ( id == wxNOT_FOUND ) {
 			id = 0;
+			if (m_is_skin) {
+				m_value = defaultSelection;
+			}
 		}
 		skinSelector->SetSelection(id);
 
@@ -862,6 +915,8 @@
 	}
 #endif /* ! AMULE_DAEMON */
 
+      protected:
+	bool	m_is_skin;
 };
 
 
@@ -870,7 +925,7 @@
 {
 	srand( wxGetLocalTimeMillis().GetLo() ); // we need random numbers sometimes
 
-	// load preferences.dat or set standart values
+	// load preferences.dat or set standard values
 	wxString fullpath(theApp->ConfigDir + wxT("preferences.dat"));
 	CFile preffile;
 	if (wxFileExists(fullpath)) {
@@ -879,7 +934,7 @@
 				preffile.ReadUInt8(); // Version. Value is not used.
 				s_userhash = preffile.ReadHash();
 			} catch (const CSafeIOException& e) {
-				AddDebugLogLineM(true, logGeneral,
+				AddDebugLogLineC(logGeneral,
 					wxT("Error while reading userhash: ") + e.what());
 			}
 		}
@@ -892,12 +947,12 @@
 
 		Save();
 	}
-	
+
 	// Mark hash as an eMule-type hash
 	// See also CUpDownClient::GetHashType
 	s_userhash[5] = 14;
 	s_userhash[14] = 111;
-	
+
 #ifndef CLIENT_GUI
 	LoadPreferences();
 	ReloadSharedFolders();
@@ -912,7 +967,7 @@
 
 //
 // Gets called at init time
-// 
+//
 void CPreferences::BuildItemList( const wxString& appdir )
 {
 #ifndef AMULE_DAEMON
@@ -921,29 +976,26 @@
 	int current_id = 0;
 	#define NewCfgItem(ID, COMMAND)	s_CfgList[++current_id] = COMMAND
 #endif /* AMULE_DAEMON */
-	
+
 	/**
 	 * User settings
 	 **/
 	NewCfgItem(IDC_NICK,		(new Cfg_Str(  wxT("/eMule/Nick"), s_nick, wxT("http://www.aMule.org") )));
 #ifndef AMULE_DAEMON
-	NewCfgItem(IDC_LANGUAGE,	(new Cfg_Lang()));
+	Cfg_Lang * cfgLang = new Cfg_Lang();
+	s_cfgLang = cfgLang;
+	NewCfgItem(IDC_LANGUAGE,	cfgLang);
 #endif
 
 	/**
 	 * Browser options
 	 **/
 	#ifdef __WXMAC__
-		int			browser = 9; // this is a "magic number" and will break if
-								 // more browser choices are added in the interface,
-								 // but there isn't a symbolic name defined
 		wxString	customBrowser = wxT("/usr/bin/open");
-	#else 
-		int			browser = 0;
+	#else
 		wxString	customBrowser; // left empty
 	#endif
 
-	NewCfgItem(IDC_BROWSER,		(MkCfg_Int( wxT("/Browser/DefaultBrowser"), s_Browser, browser )));
 	NewCfgItem(IDC_BROWSERTABS,	(new Cfg_Bool( wxT("/Browser/OpenPageInTab"), s_BrowserTab, true )));
 	NewCfgItem(IDC_BROWSERSELF,	(new Cfg_Str(  wxT("/Browser/CustomBrowserString"), s_CustomBrowser, customBrowser )));
 
@@ -969,7 +1021,7 @@
 	NewCfgItem(IDC_SLOTALLOC,	(MkCfg_Int( wxT("/eMule/SlotAllocation"), s_slotallocation, 2 )));
 	NewCfgItem(IDC_PORT,		(MkCfg_Int( wxT("/eMule/Port"), s_port, DEFAULT_TCP_PORT )));
 	NewCfgItem(IDC_UDPPORT,		(MkCfg_Int( wxT("/eMule/UDPPort"), s_udpport, DEFAULT_UDP_PORT )));
-	NewCfgItem(IDC_UDPDISABLE,	(new Cfg_Bool( wxT("/eMule/UDPDisable"), s_UDPDisable, false )));
+	NewCfgItem(IDC_UDPENABLE,	(new Cfg_Bool( wxT("/eMule/UDPEnable"), s_UDPEnable, true )));
 	NewCfgItem(IDC_ADDRESS,		(new Cfg_Str( wxT("/eMule/Address"), s_Addr, wxEmptyString)));
 	NewCfgItem(IDC_AUTOCONNECT,	(new Cfg_Bool( wxT("/eMule/Autoconnect"), s_autoconnect, true )));
 	NewCfgItem(IDC_MAXSOURCEPERFILE,	(MkCfg_Int( wxT("/eMule/MaxSourcesPerFile"), s_maxsourceperfile, 300 )));
@@ -988,10 +1040,10 @@
 	NewCfgItem(ID_PROXY_PASSWORD,		(new Cfg_Str( wxT("/Proxy/ProxyPassword"), s_ProxyData.m_password, wxEmptyString )));
 // These were copied from eMule config file, maybe someone with windows can complete this?
 //	NewCfgItem(ID_PROXY_AUTO_SERVER_CONNECT_WITHOUT_PROXY,	(new Cfg_Bool( wxT("/Proxy/Proxy????"), s_Proxy????, false )));
-	
+
 	/**
 	 * Servers
-	 **/ 
+	 **/
 	NewCfgItem(IDC_REMOVEDEAD,	(new Cfg_Bool( wxT("/eMule/RemoveDeadServer"), s_deadserver, 1 )));
 	NewCfgItem(IDC_SERVERRETRIES,	(MkCfg_Int( wxT("/eMule/DeadServerRetry"), s_deadserverretries, 3 )));
 	NewCfgItem(IDC_SERVERKEEPALIVE,	(MkCfg_Int( wxT("/eMule/ServerKeepAliveTimeout"), s_dwServerKeepAliveTimeoutMins, 0 )));
@@ -1014,7 +1066,7 @@
 	 * Files
 	 **/
 	NewCfgItem(IDC_TEMPFILES,	(new Cfg_Path(  wxT("/eMule/TempDir"), 	s_tempdir, appdir + wxT("Temp") )));
-	
+
 	#if defined(__WXMAC__) || defined(__WXMSW__)
 		wxString incpath = wxStandardPaths::Get().GetDocumentsDir();
 		if (incpath.IsEmpty()) {
@@ -1023,11 +1075,11 @@
 		} else {
 			incpath = JoinPaths(incpath, wxT("aMule Downloads"));
 		}
-	#else 
+	#else
 		wxString incpath = appdir + wxT("Incoming");
 	#endif
 	NewCfgItem(IDC_INCFILES,	(new Cfg_Path(  wxT("/eMule/IncomingDir"), s_incomingdir, incpath )));
-	
+
 	NewCfgItem(IDC_ICH,		(new Cfg_Bool( wxT("/eMule/ICH"), s_ICH, true )));
 	NewCfgItem(IDC_AICHTRUST,	(new Cfg_Bool( wxT("/eMule/AICHTrust"), s_AICHTrustEveryHash, false )));
 	NewCfgItem(IDC_CHECKDISKSPACE,	(new Cfg_Bool( wxT("/eMule/CheckDiskspace"), s_checkDiskspace, true )));
@@ -1035,9 +1087,9 @@
 	NewCfgItem(IDC_ADDNEWFILESPAUSED,	(new Cfg_Bool( wxT("/eMule/AddNewFilesPaused"), s_addnewfilespaused, false )));
 	NewCfgItem(IDC_PREVIEWPRIO,	(new Cfg_Bool( wxT("/eMule/PreviewPrio"), s_bpreviewprio, false )));
 	NewCfgItem(IDC_MANUALSERVERHIGHPRIO,	(new Cfg_Bool( wxT("/eMule/ManualHighPrio"), s_bmanualhighprio, false )));
-	NewCfgItem(IDC_FULLCHUNKTRANS,	(new Cfg_Bool( wxT("/eMule/FullChunkTransfers"), s_btransferfullchunks, true )));
 	NewCfgItem(IDC_STARTNEXTFILE,	(new Cfg_Bool( wxT("/eMule/StartNextFile"), s_bstartnextfile, false )));
 	NewCfgItem(IDC_STARTNEXTFILE_SAME,	(new Cfg_Bool( wxT("/eMule/StartNextFileSameCat"), s_bstartnextfilesame, false )));
+	NewCfgItem(IDC_STARTNEXTFILE_ALPHA,	(new Cfg_Bool( wxT("/eMule/StartNextFileAlpha"), s_bstartnextfilealpha, false )));
 	NewCfgItem(IDC_SRCSEEDS,	(new Cfg_Bool( wxT("/ExternalConnect/UseSrcSeeds"), s_UseSrcSeeds, false )));
 	NewCfgItem(IDC_FILEBUFFERSIZE,	(MkCfg_Int( wxT("/eMule/FileBufferSizePref"), s_iFileBufferSize, 16 )));
 	NewCfgItem(IDC_DAP,		(new Cfg_Bool( wxT("/eMule/DAPPref"), s_bDAP, true )));
@@ -1074,6 +1126,7 @@
 	/**
 	 * GUI behavior
 	 **/
+	NewCfgItem(IDC_MACHIDEONCLOSE,	(new Cfg_Bool( wxT("/GUI/HideOnClose"), s_hideonclose, false )));
 	NewCfgItem(IDC_ENABLETRAYICON,	(new Cfg_Bool( wxT("/eMule/EnableTrayIcon"), s_trayiconenabled, false )));
 	NewCfgItem(IDC_MINTRAY,		(new Cfg_Bool( wxT("/eMule/MinToTray"), s_mintotray, false )));
 	NewCfgItem(IDC_EXIT,		(new Cfg_Bool( wxT("/eMule/ConfirmExit"), s_confirmExit, true )));
@@ -1089,17 +1142,17 @@
 	NewCfgItem(IDC_FED2KLH,		(new Cfg_Bool( wxT("/Razor_Preferences/FastED2KLinksHandler"), s_FastED2KLinksHandler, true )));
 	NewCfgItem(IDC_PROGBAR,		(new Cfg_Bool( wxT("/ExternalConnect/ShowProgressBar"), s_ProgBar, true )));
 	NewCfgItem(IDC_PERCENT,		(new Cfg_Bool( wxT("/ExternalConnect/ShowPercent"), s_Percent, true )));
-	NewCfgItem(IDC_USESKINFILES,	(new Cfg_Bool( wxT("/SkinGUIOptions/UseSkinFiles"), s_UseSkinFiles, false )));
 	NewCfgItem(IDC_SKIN,		(new Cfg_Skin(  wxT("/SkinGUIOptions/Skin"), s_Skin, wxEmptyString )));
-	NewCfgItem(IDC_SHOWRATEONTITLE,	(new Cfg_Bool( wxT("/eMule/ShowRatesOnTitle"), s_ShowRatesOnTitle, false )));
 	NewCfgItem(IDC_VERTTOOLBAR,	(new Cfg_Bool( wxT("/eMule/VerticalToolbar"), s_ToolbarOrientation, false )));
-	NewCfgItem(IDC_SHOWPARTFILENUMBER,(new Cfg_Bool( wxT("/eMule/ShowPartFileNumber"), s_ShowPartFileNumber, false )));
-	
+	NewCfgItem(IDC_SHOW_COUNTRY_FLAGS,	(new Cfg_Bool( wxT("/eMule/GeoIPEnabled"), s_GeoIPEnabled, true )));
+#ifndef __SVN__
+	NewCfgItem(IDC_SHOWVERSIONONTITLE,	(new Cfg_Bool( wxT("/eMule/ShowVersionOnTitle"), s_showVersionOnTitle, false )));
+#endif
+
 	/**
 	 * External Apps
 	 */
 	NewCfgItem(IDC_VIDEOPLAYER,	(new Cfg_Str(  wxT("/eMule/VideoPlayer"), s_VideoPlayer, wxEmptyString )));
-	NewCfgItem(IDC_VIDEOBACKUP,	(new Cfg_Bool( wxT("/eMule/VideoPreviewBackupped"), s_moviePreviewBackup, true )));
 
 	/**
 	 * Statistics
@@ -1125,9 +1178,9 @@
 	NewCfgItem(IDC_IPFILTERURL,	(new Cfg_Str(  wxT("/eMule/IPFilterURL"), s_IPFilterURL, wxEmptyString )));
 	NewCfgItem(ID_IPFILTERLEVEL,	(MkCfg_Int( wxT("/eMule/FilterLevel"), s_filterlevel, 127 )));
 	NewCfgItem(IDC_IPFILTERSYS,	(new Cfg_Bool( wxT("/eMule/IPFilterSystem"), s_IPFilterSys, false )));
-		
-	/** 
-	 * Message Filter 
+
+	/**
+	 * Message Filter
 	 **/
 	NewCfgItem(IDC_MSGFILTER,	(new Cfg_Bool( wxT("/eMule/FilterMessages"), s_MustFilterMessages, true )));
 	NewCfgItem(IDC_MSGFILTER_ALL,	(new Cfg_Bool( wxT("/eMule/FilterAllMessages"), s_FilterAllMessages, false )));
@@ -1135,13 +1188,18 @@
 	NewCfgItem(IDC_MSGFILTER_NONSECURE,	(new Cfg_Bool( wxT("/eMule/MessageFromValidSourcesOnly"),	s_msgsecure, true )));
 	NewCfgItem(IDC_MSGFILTER_WORD,	(new Cfg_Bool( wxT("/eMule/FilterWordMessages"), s_FilterSomeMessages, false )));
 	NewCfgItem(IDC_MSGWORD,		(new Cfg_Str(  wxT("/eMule/MessageFilter"), s_MessageFilterString, wxEmptyString )));
+	NewCfgItem(IDC_MSGLOG,	(new Cfg_Bool( wxT("/eMule/ShowMessagesInLog"), s_ShowMessagesInLog, true )));
+	//Todo NewCfgItem(IDC_MSGADVSPAM,	(new Cfg_Bool( wxT("/eMule/AdvancedSpamFilter"), s_IsAdvancedSpamfilterEnabled, true )));
+	//Todo NewCfgItem(IDC_MSGCAPTCHA,	(new Cfg_Bool( wxT("/eMule/MessageUseCaptchas"), s_IsChatCaptchaEnabled, true )));
+	s_MiscList.push_back( new Cfg_Bool( wxT("/eMule/AdvancedSpamFilter"), s_IsAdvancedSpamfilterEnabled, true ) );
+	s_MiscList.push_back( new Cfg_Bool( wxT("/eMule/MessageUseCaptchas"), s_IsChatCaptchaEnabled, true ) );
 
 	NewCfgItem(IDC_FILTERCOMMENTS,	(new Cfg_Bool( wxT("/eMule/FilterComments"), s_FilterComments, false )));
 	NewCfgItem(IDC_COMMENTWORD,		(new Cfg_Str(  wxT("/eMule/CommentFilter"), s_CommentFilterString, wxEmptyString )));
-	 
+
 	/**
 	 * Hidden files sharing
-	 **/	  
+	 **/
 	NewCfgItem(IDC_SHAREHIDDENFILES,	(new Cfg_Bool( wxT("/eMule/ShareHiddenFiles"), s_ShareHiddenFiles, false )));
 
 	/**
@@ -1153,44 +1211,58 @@
 	 * Version check
 	 **/
 	 NewCfgItem(IDC_NEWVERSION,	(new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, true )));
-	 
+
 	 /**
 	  * Obfuscation
 	  **/
-	 
 	NewCfgItem( IDC_SUPPORT_PO, ( new Cfg_Bool( wxT("/Obfuscation/IsClientCryptLayerSupported"), s_IsClientCryptLayerSupported, true )));
 	NewCfgItem( IDC_ENABLE_PO_OUTGOING, ( new Cfg_Bool( wxT("/Obfuscation/IsCryptLayerRequested"), s_bCryptLayerRequested, true )));
 	NewCfgItem( IDC_ENFORCE_PO_INCOMING, ( new Cfg_Bool( wxT("/Obfuscation/IsClientCryptLayerRequired"), s_IsClientCryptLayerRequired, false )));
+#ifndef CLIENT_GUI
 	// There is no need for GUI items for this two.
 	s_MiscList.push_back( MkCfg_Int( wxT("/Obfuscation/CryptoPaddingLenght"), s_byCryptTCPPaddingLength, 254 ) );
-	s_MiscList.push_back( MkCfg_Int( wxT("/Obfuscation/CryptoKadUDPKey"), s_dwKadUDPKey, GetRandomUint32() ) );	 
-	 
+	s_MiscList.push_back( MkCfg_Int( wxT("/Obfuscation/CryptoKadUDPKey"), s_dwKadUDPKey, GetRandomUint32() ) );
+#endif
+
+	/**
+	 * Power management
+	 **/
+	NewCfgItem( IDC_PREVENT_SLEEP, ( new Cfg_Bool( wxT("/PowerManagement/PreventSleepWhileDownloading"), s_preventSleepWhileDownloading, false )));
+
 	/**
 	 * The following doesn't have an associated widget or section
 	 **/
 	s_MiscList.push_back( new Cfg_Str(  wxT("/eMule/Language"),			s_languageID ) );
-	s_MiscList.push_back( new Cfg_Counter( wxT("/Statistics/TotalDownloadedBytes"), s_totalDownloadedBytes ) );
-	s_MiscList.push_back( new Cfg_Counter( wxT("/Statistics/TotalUploadedBytes"),	s_totalUploadedBytes ) );
 	s_MiscList.push_back(    MkCfg_Int( wxT("/eMule/SplitterbarPosition"),		s_splitterbarPosition, 75 ) );
 	s_MiscList.push_back( new Cfg_Str(  wxT("/eMule/YourHostname"),			s_yourHostname, wxEmptyString ) );
 	s_MiscList.push_back( new Cfg_Str(  wxT("/eMule/DateTimeFormat"),		s_datetimeformat, wxT("%A, %x, %X") ) );
 
-	s_MiscList.push_back(    MkCfg_Int( wxT("/eMule/AllcatType"),			s_allcatType, 0 ) );
+	s_MiscList.push_back(    MkCfg_Int( wxT("/eMule/AllcatType"),			s_allcatFilter, 0 ) );
 	s_MiscList.push_back( new Cfg_Bool( wxT("/eMule/ShowAllNotCats"),		s_showAllNotCats, false ) );
 
 	s_MiscList.push_back( MkCfg_Int( wxT("/eMule/SmartIdState"), s_smartidstate, 0 ) );
-	
+
 	s_MiscList.push_back( new Cfg_Bool( wxT("/eMule/DropSlowSources"), 		s_DropSlowSources, false ) );
-		
-	s_MiscList.push_back( new Cfg_Str(  wxT("/eMule/KadNodesUrl"),			s_KadURL, wxT("http://emule-inside.net/nodes.dat") ) );
+
+	s_MiscList.push_back( new Cfg_Str(  wxT("/eMule/KadNodesUrl"),			s_KadURL, wxT("http://download.tuxfamily.org/technosalad/utils/nodes.dat") ) );
 	s_MiscList.push_back( new Cfg_Str(  wxT("/eMule/Ed2kServersUrl"),		s_Ed2kURL, wxT("http://gruk.org/server.met.gz") ) );
-	
+	s_MiscList.push_back( MkCfg_Int( wxT("/eMule/ShowRatesOnTitle"),		s_showRatesOnTitle, 0 ));
+
+	s_MiscList.push_back( new Cfg_Str(  wxT("/eMule/GeoLiteCountryUpdateUrl"),		s_GeoIPUpdateUrl, wxT("http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz") ) );
+	wxConfigBase::Get()->DeleteEntry(wxT("/eMule/GeoIPUpdateUrl")); // get rid of the old one for a while
+
+	s_MiscList.push_back( new Cfg_Str( wxT("/WebServer/Path"),				s_sWebPath, wxT("amuleweb") ) );
+
+	s_MiscList.push_back( new Cfg_Str( wxT("/eMule/StatsServerName"),		s_StatsServerName,	wxT("Shorty's ED2K stats") ) );
+	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 ) );
+
 #ifndef AMULE_DAEMON
 	// Colors have been moved from global prefs to CStatisticsDlg
-	for ( int i = 0; i < cntStatColors; i++ ) {  
-		wxString str = wxString::Format(wxT("/eMule/StatColor%i"),i);
-		
-		s_MiscList.push_back( MkCfg_Int( str, CStatisticsDlg::acrStat[i], CStatisticsDlg::acrStat[i] ) );
+	for ( int i = 0; i < cntStatColors; i++ ) {
+		wxString str = CFormat(wxT("/eMule/StatColor%i")) % i;
+		s_MiscList.push_back( new Cfg_Colour( str, CStatisticsDlg::acrStat[i] ) );
 	}
 #endif
 
@@ -1214,7 +1286,7 @@
 		delete s_CfgList.begin()->second;
 		s_CfgList.erase( s_CfgList.begin() );
 	}
-	
+
 	CFGList::iterator it = s_MiscList.begin();
 	for ( ; it != s_MiscList.end();  ) {
 		delete *it;
@@ -1228,13 +1300,19 @@
 #ifndef CLIENT_GUI
 	// Preserve values from old config. The global config object may not be set yet
 	// when BuildItemList() is called, so we need to provide defaults later - here.
-	bool ExecOnCompletion;
-	wxString ExecOnCompletionCommand;
-	cfg->Read(wxT("/eMule/ExecOnCompletion"), &ExecOnCompletion, false);
-	cfg->Read(wxT("/eMule/ExecOnCompletionCommand"), &ExecOnCompletionCommand, wxEmptyString);
-	// Assign to core command, that's the most likely it was.
-	static_cast<Cfg_Bool*>(s_CfgList[USEREVENTS_FIRST_ID + CUserEvents::DownloadCompleted * USEREVENTS_IDS_PER_EVENT + 1])->SetDefault(ExecOnCompletion);
-	static_cast<Cfg_Str*>(s_CfgList[USEREVENTS_FIRST_ID + CUserEvents::DownloadCompleted * USEREVENTS_IDS_PER_EVENT + 2])->SetDefault(ExecOnCompletionCommand);
+	if (cfg->HasEntry(wxT("/eMule/ExecOnCompletion"))) {
+		bool ExecOnCompletion;
+		cfg->Read(wxT("/eMule/ExecOnCompletion"), &ExecOnCompletion, false);
+		// Assign to core command, that's the most likely it was.
+		static_cast<Cfg_Bool*>(s_CfgList[USEREVENTS_FIRST_ID + CUserEvents::DownloadCompleted * USEREVENTS_IDS_PER_EVENT + 1])->SetDefault(ExecOnCompletion);
+		cfg->DeleteEntry(wxT("/eMule/ExecOnCompletion"));
+	}
+	if (cfg->HasEntry(wxT("/eMule/ExecOnCompletionCommand"))) {
+		wxString ExecOnCompletionCommand;
+		cfg->Read(wxT("/eMule/ExecOnCompletionCommand"), &ExecOnCompletionCommand, wxEmptyString);
+		static_cast<Cfg_Str*>(s_CfgList[USEREVENTS_FIRST_ID + CUserEvents::DownloadCompleted * USEREVENTS_IDS_PER_EVENT + 2])->SetDefault(ExecOnCompletionCommand);
+		cfg->DeleteEntry(wxT("/eMule/ExecOnCompletionCommand"));
+	}
 #endif
 	CFGMap::iterator it_a = s_CfgList.begin();
 	for ( ; it_a != s_CfgList.end(); ++it_a ) {
@@ -1243,29 +1321,50 @@
 
 	CFGList::iterator it_b = s_MiscList.begin();
 	for ( ; it_b != s_MiscList.end(); ++it_b ) {
-		(*it_b)->LoadFromFile( cfg ); 
+		(*it_b)->LoadFromFile( cfg );
+	}
+
+	// Preserve old value of UDPDisable
+	if (cfg->HasEntry(wxT("/eMule/UDPDisable"))) {
+		bool UDPDisable;
+		cfg->Read(wxT("/eMule/UDPDisable"), &UDPDisable, false);
+		SetUDPDisable(UDPDisable);
+		cfg->DeleteEntry(wxT("/eMule/UDPDisable"));
+	}
+
+	// Preserve old value of UseSkinFiles
+	if (cfg->HasEntry(wxT("/SkinGUIOptions/UseSkinFiles"))) {
+		bool UseSkinFiles;
+		cfg->Read(wxT("/SkinGUIOptions/UseSkinFiles"), &UseSkinFiles, false);
+		if (!UseSkinFiles) {
+			s_Skin.Clear();
+		}
+		cfg->DeleteEntry(wxT("/SkinGUIOptions/UseSkinFiles"));
 	}
 
-// Load debug-categories
 #ifdef __DEBUG__
-	int count = CLogger::GetDebugCategoryCount();
+	// Load debug-categories
+	int count = theLogger.GetDebugCategoryCount();
 
 	for ( int i = 0; i < count; i++ ) {
-		const CDebugCategory& cat = CLogger::GetDebugCategory( i );
-		
+		const CDebugCategory& cat = theLogger.GetDebugCategory( i );
+
 		bool enabled = false;
 		cfg->Read( wxT("/Debug/Cat_") + cat.GetName(), &enabled );
 
-		CLogger::SetEnabled( cat.GetType(), enabled );
-	}	
+		theLogger.SetEnabled( cat.GetType(), enabled );
+	}
 #endif
-	
+
 	// Now do some post-processing / sanity checking on the values we just loaded
+#ifndef CLIENT_GUI
 	CheckUlDlRatio();
 	SetPort(s_port);
 	if (s_byCryptTCPPaddingLength > 254) {
 		s_byCryptTCPPaddingLength = GetRandomUint8() % 254;
 	}
+	SetSlotAllocation(s_slotallocation);
+#endif
 }
 
 
@@ -1278,18 +1377,18 @@
 
 	CFGList::iterator it_b = s_MiscList.begin();
 	for ( ; it_b != s_MiscList.end(); ++it_b )
-		(*it_b)->SaveToFile( cfg ); 
+		(*it_b)->SaveToFile( cfg );
 
 
 // Save debug-categories
 #ifdef __DEBUG__
-	int count = CLogger::GetDebugCategoryCount();
+	int count = theLogger.GetDebugCategoryCount();
 
 	for ( int i = 0; i < count; i++ ) {
-		const CDebugCategory& cat = CLogger::GetDebugCategory( i );
+		const CDebugCategory& cat = theLogger.GetDebugCategory( i );
 
 		cfg->Write( wxT("/Debug/Cat_") + cat.GetName(), cat.IsEnabled() );
-	}	
+	}
 #endif
 }
 
@@ -1322,9 +1421,9 @@
 
 
 // Here we slightly limit the users' ability to be a bad citizen: for very low upload rates
-// we force a low download rate, so as to discourage this type of leeching.  
-// We're Open Source, and whoever wants it can do his own mod to get around this, but the 
-// packaged product will try to enforce good behavior. 
+// we force a low download rate, so as to discourage this type of leeching.
+// We're Open Source, and whoever wants it can do his own mod to get around this, but the
+// packaged product will try to enforce good behavior.
 //
 // Kry note: of course, any leecher mod will be banned asap.
 void CPreferences::CheckUlDlRatio()
@@ -1336,10 +1435,10 @@
 	// Backwards compatibility
 	if ( s_maxdownload == 0xFFFF )
 		s_maxdownload = UNLIMITED;
-		
+
 	if ( s_maxupload == UNLIMITED )
 		return;
-	
+
 	// Enforce the limits
 	if ( s_maxupload < 4  ) {
 		if ( ( s_maxupload * 3 < s_maxdownload ) || ( s_maxdownload == 0 ) )
@@ -1359,13 +1458,13 @@
 	if (!wxFileExists(fullpath)) {
 		preffile.Create(fullpath);
 	}
-	
+
 	if (preffile.Open(fullpath, CFile::read_write)) {
 		try {
 			preffile.WriteUInt8(PREFFILE_VERSION);
 			preffile.WriteHash(s_userhash);
 		} catch (const CIOFailureException& e) {
-			AddDebugLogLineM(true, logGeneral, wxT("IO failure while saving user-hash: ") + e.what());
+			AddDebugLogLineC(logGeneral, wxT("IO failure while saving user-hash: ") + e.what());
 		}
 	}
 
@@ -1385,12 +1484,7 @@
 
 CPreferences::~CPreferences()
 {
-	while ( !m_CatList.empty() ) {
-		delete m_CatList.front();
-		m_CatList.erase( m_CatList.begin() );
-	}
-
-	m_CatList.clear();
+	DeleteContents(m_CatList);
 }
 
 
@@ -1434,22 +1528,25 @@
 		wxConfigBase* cfg = wxConfigBase::Get();
 
 		// Save the main cat.
-		cfg->Write( wxT("/eMule/AllcatType"), (int)s_allcatType);
-		
+		cfg->Write( wxT("/eMule/AllcatType"), (int)s_allcatFilter);
+
 		// The first category is the default one and should not be counted
 
 		cfg->Write( wxT("/General/Count"), (long)(m_CatList.size() - 1) );
 
-		for ( size_t i = 1; i < m_CatList.size(); i++ ) {
-			cfg->SetPath( wxString::Format(wxT("/Cat#%i"), i) );
+		uint32 maxcat = m_CatList.size();
+		for (uint32 i = 1; i < maxcat; i++) {
+			cfg->SetPath(CFormat(wxT("/Cat#%i")) % i);
 
 			cfg->Write( wxT("Title"),	m_CatList[i]->title );
 			cfg->Write( wxT("Incoming"),	CPath::ToUniv(m_CatList[i]->path) );
 			cfg->Write( wxT("Comment"),	m_CatList[i]->comment );
-			cfg->Write( wxT("Color"),	wxString::Format(wxT("%u"), m_CatList[i]->color) );
+			cfg->Write( wxT("Color"),	wxString(CFormat(wxT("%u")) % m_CatList[i]->color));
 			cfg->Write( wxT("Priority"),	(int)m_CatList[i]->prio );
 		}
-		
+		// remove deleted cats from config
+		while (cfg->DeleteGroup(CFormat(wxT("/Cat#%i")) % maxcat++)) {}
+
 		cfg->Flush();
 	}
 }
@@ -1475,17 +1572,17 @@
 	long max = cfg->Read( wxT("/General/Count"), 0l );
 
 	for ( int i = 1; i <= max ; i++ ) {
-		cfg->SetPath( wxString::Format(wxT("/Cat#%i"), i) );
+		cfg->SetPath(CFormat(wxT("/Cat#%i")) % i);
 
 		Category_Struct* newcat = new Category_Struct;
 
 		newcat->title = cfg->Read( wxT("Title"), wxEmptyString );
 		newcat->path  = CPath::FromUniv(cfg->Read(wxT("Incoming"), wxEmptyString));
 
-		// Some sainity checking
+		// Some sanity checking
 		if ( newcat->title.IsEmpty() || !newcat->path.IsOk() ) {
-			printf("Invalid category found, skipping\n");
-			
+			AddLogLineN(_("Invalid category found, skipping"));
+
 			delete newcat;
 			continue;
 		}
@@ -1495,7 +1592,7 @@
 		newcat->color = StrToULong(cfg->Read(wxT("Color"), wxT("0")));
 
 		AddCat(newcat);
-		
+
 		if (!newcat->path.DirExists()) {
 			CPath::MakeDir(newcat->path);
 		}
@@ -1512,7 +1609,7 @@
 uint32 CPreferences::AddCat(Category_Struct* cat)
 {
 	m_CatList.push_back( cat );
-	
+
 	return m_CatList.size() - 1;
 }
 
@@ -1521,10 +1618,13 @@
 {
 	if ( index < m_CatList.size() ) {
 		CatList::iterator it = m_CatList.begin() + index;
-	
+
 		delete *it;
-		
+
 		m_CatList.erase( it );
+
+		// remove cat directory from shares
+		theApp->sharedfiles->Reload();
 	}
 }
 
@@ -1546,7 +1646,7 @@
 const CPath& CPreferences::GetCatPath(uint8 index)
 {
 	wxASSERT( index < m_CatList.size() );
-	
+
 	return m_CatList[index]->path;
 }
 
@@ -1558,29 +1658,22 @@
 	return m_CatList[index]->color;
 }
 
-Category_Struct *CPreferences::CreateCategory(
+bool CPreferences::CreateCategory(
+	Category_Struct *& category,
 	const wxString& name,
 	const CPath& path,
 	const wxString& comment,
 	uint32 color,
 	uint8 prio)
 {
-	Category_Struct *category = new Category_Struct();
-	category->path		= path;
-	category->title		= name;
-	category->comment	= comment;
-	category->color		= color;
-	category->prio		= prio;
-			
-	AddCat(category);
-	
-	SaveCats();
-	
-	return category;
+	category = new Category_Struct();
+	category->path = thePrefs::GetIncomingDir();	// set a default in case path is invalid
+	uint32 cat = AddCat(category);
+	return UpdateCategory(cat, name, path, comment, color, prio);
 }
 
-void CPreferences::UpdateCategory(
-	uint8 cat, 
+bool CPreferences::UpdateCategory(
+	uint8 cat,
 	const wxString& name,
 	const CPath& path,
 	const wxString& comment,
@@ -1589,96 +1682,89 @@
 {
 	Category_Struct *category = m_CatList[cat];
 
-	category->path			= path;
+	// return true if path is ok, false if not
+	bool ret = true;
+	if (!path.IsOk() || (!path.DirExists() && !CPath::MakeDir(path))) {
+		ret = false;
+		// keep path as it was
+	} else if (category->path != path) {
+		// path changed: reload shared files, adding files in the new path and removing those from the old path
+		category->path		= path;
+		theApp->sharedfiles->Reload();
+	}
 	category->title			= name;
 	category->comment		= comment;
 	category->color			= color;
 	category->prio			= prio;
-	
+
 	SaveCats();
+	return ret;
 }
 
-// Jacobo221 - Several issues on the browsers:
-// netscape is named Netscape on some systems
-// MozillaFirebird is named mozilla-firebird and also firebird on some systems
-// Niether Galeon tabs nor epiphany tabs have been tested
-// Konqueror alternatives is (Open on current window, fails if no konq already open):
-//	dcop `dcop konqueror-* | head -n1` konqueror-mainwindow#1 openURL '%s'
-// IMPORTANT: if you add cases to the switches and change the number which
-//			  corresponds to s_CustomBrowser, you must change the default
-//			  set for the Mac in BuildItemList, above.
+
 wxString CPreferences::GetBrowser()
 {
-	wxString cmd;
+	wxString cmd(s_CustomBrowser);
 #ifndef __WXMSW__
-	if( s_BrowserTab )
-		switch ( s_Browser ) {
-			case 0: cmd = wxEmptyString; break;
-			case 1: cmd = wxT("kfmclient exec '%s'"); break;
-			case 2: cmd = wxT("sh -c \"if ! mozilla -remote 'openURL(%s, new-tab)'; then mozilla '%s'; fi\""); break;
-			case 3: cmd = wxT("sh -c \"if ! firefox -remote 'openURL(%s, new-tab)'; then firefox '%s'; fi\""); break;
-			case 4: cmd = wxT("sh -c \"if ! MozillaFirebird -remote 'openURL(%s, new-tab)'; then MozillaFirebird '%s'; fi\""); break;
-			case 5: cmd = wxT("opera --newpage '%s'"); break;
-			case 6: cmd = wxT("sh -c \"if ! netscape -remote 'openURLs(%s,new-tab)'; then netscape '%s'; fi\""); break;
-			case 7: cmd = wxT("galeon -n '%s'"); break;
-			case 8: cmd = wxT("epiphany -n '%s'"); break;
-			case 9: cmd = s_CustomBrowser; break;
-			default:
-				AddLogLineM( true, _("Unable to determine selected browser!") );
+	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))
+			|| (wxT("MozillaFirebird") == cmd.Right(15))) {
+			cmd += wxT(" -remote 'openURL(%s, new-tab)'");
 		}
-	else
-		switch ( s_Browser ) {
-			case 0: cmd = wxEmptyString; break;
-			case 1: cmd = wxT("konqueror '%s'"); break;
-			case 2: cmd = wxT("sh -c 'mozilla %s'"); break;
-			case 3: cmd = wxT("firefox '%s'"); break;
-			case 4:	cmd = wxT("MozillaFirebird '%s'"); break;
-			case 5:	cmd = wxT("opera '%s'"); break;
-			case 6: cmd = wxT("netscape '%s'"); break;
-			case 7: cmd = wxT("galeon '%s'"); break;
-			case 8: cmd = wxT("epiphany '%s'"); break;
-			case 9: cmd = s_CustomBrowser; break;
-			default:
-				AddLogLineM( true, _("Unable to determine selected browser!") );
+		if ((wxT("galeon") == cmd.Right(6)) || (wxT("epiphany") == cmd.Right(8))) {
+			cmd += wxT(" -n '%s'");
+		}
+		if (wxT("opera") == cmd.Right(5)) {
+			cmd += wxT(" --newpage '%s'");
+		}
+		if (wxT("netscape") == cmd.Right(8)) {
+			cmd += wxT(" -remote 'openURLs(%s,new-tab)'");
 		}
-#else
-	switch ( s_Browser ) {
-		case 0: cmd = wxEmptyString; break;
-		case 1: cmd = s_CustomBrowser; break;
-		default:
-			AddLogLineM( true, _("Unable to determine selected browser!") );
 	}
-#endif /* !__WXMSW__ / __WXMSW__ */
+#endif /* !__WXMSW__ */
 	return cmd;
 }
 
+void CPreferences::SetFilteringClients(bool val)
+{
+	if (val != s_IPFilterClients) {
+		s_IPFilterClients = val;
+		if (val) {
+			theApp->clientlist->FilterQueues();
+		}
+	}
+}
+
+void CPreferences::SetFilteringServers(bool val)
+{
+	if (val != s_IPFilterServers) {
+		s_IPFilterServers = val;
+		if (val) {
+			theApp->serverlist->FilterServers();
+		}
+	}
+}
 
-#include "ClientList.h"
-#include "ServerList.h"
 void CPreferences::SetIPFilterLevel(uint8 level)
 {
 	if (level != s_filterlevel) {
-		// We only need to recheck if the new level is more restrictive
-		bool filter = level > s_filterlevel;
-		
 		// Set the new access-level
 		s_filterlevel = level;
-		
-		if ( filter ) {
-			theApp->clientlist->FilterQueues();
-			theApp->serverlist->FilterServers();
-		}
+#ifndef CLIENT_GUI
+		// and reload the filter
+		NotifyAlways_IPFilter_Reload();
+#endif
 	}
 }
 
-
 void CPreferences::SetPort(uint16 val)
-{ 
+{
 	// Warning: Check for +3, because server UDP is TCP+3
-	
+
 	if (val +3 > 65535) {
-		AddLogLineM(true, _("TCP port can't be higher than 65532 due to server UDP socket being TCP+3"));
-		AddLogLineM(false, wxString::Format(_("Default port will be used (%d)"),DEFAULT_TCP_PORT));
+		AddLogLineC(_("TCP port can't be higher than 65532 due to server UDP socket being TCP+3"));
+		AddLogLineN(CFormat(_("Default port will be used (%d)")) % DEFAULT_TCP_PORT);
 		s_port = DEFAULT_TCP_PORT;
 	} else {
 		s_port = val;
@@ -1701,8 +1787,7 @@
 			if (path.DirExists()) {
 				shareddir_list.push_back(path);
 			} else {
-				printf("Dropping non-existing shared directory: %s\n",
-					(const char*)unicode2char(path.GetRaw()));
+				AddLogLineN(CFormat(_("Dropping non-existing shared directory: %s")) % path.GetRaw());
 			}
 		}
 	}
@@ -1711,12 +1796,12 @@
 
 
 bool CPreferences::IsMessageFiltered(const wxString& message)
-{ 
-	if (s_FilterAllMessages) { 
+{
+	if (s_FilterAllMessages) {
 		return true;
 	} else {
 		if (s_FilterSomeMessages) {
-			if (s_MessageFilterString.IsSameAs(wxT("*"))){  
+			if (s_MessageFilterString.IsSameAs(wxT("*"))){
 				// Filter anything
 				return true;
 			} else {
@@ -1728,7 +1813,7 @@
 					}
 				}
 				return false;
-			}			
+			}
 		} else {
 			return false;
 		}
@@ -1737,8 +1822,8 @@
 
 
 bool CPreferences::IsCommentFiltered(const wxString& comment)
-{ 
-	if (s_FilterComments) { 
+{
+	if (s_FilterComments) {
 		wxStringTokenizer tokenizer( s_CommentFilterString, wxT(",") );
 		while (tokenizer.HasMoreTokens()) {
 			if ( comment.Lower().Trim(false).Trim(true).Contains(
@@ -1750,4 +1835,18 @@
 	return false;
 }
 
+wxString CPreferences::GetLastHTTPDownloadURL(uint8 t)
+{
+	wxConfigBase* cfg = wxConfigBase::Get();
+	wxString key = CFormat(wxT("/HTTPDownload/URL_%d")) % t;
+	return cfg->Read(key, wxEmptyString);
+}
+
+void CPreferences::SetLastHTTPDownloadURL(uint8 t, const wxString& val)
+{
+	wxConfigBase* cfg = wxConfigBase::Get();
+	wxString key = CFormat(wxT("/HTTPDownload/URL_%d")) % t;
+	cfg->Write(key, val);
+}
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/Preferences.h -> aMule-2.3.1.tar.bz2/src/Preferences.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -17,7 +17,7 @@
 // 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
@@ -27,7 +27,6 @@
 #define PREFERENCES_H
 
 #include "MD4Hash.h"			// Needed for CMD4Hash
-#include "Color.h"			// Needed for COLORREF
 
 #include <wx/arrstr.h>			// Needed for wxArrayString
 
@@ -36,17 +35,37 @@
 #include "Proxy.h"
 #include "OtherStructs.h"
 
+#include <common/ClientVersion.h>	// Needed for __SVN__
+
 class CPreferences;
 class wxConfigBase;
 class wxWindow;
 
-
-enum EViewSharedFilesAccess{
+enum EViewSharedFilesAccess {
 	vsfaEverybody = 0,
 	vsfaFriends = 1,
 	vsfaNobody = 2
 };
 
+enum AllCategoryFilter {
+	acfAll = 0,
+	acfAllOthers,
+	acfIncomplete,
+	acfCompleted,
+	acfWaiting,
+	acfDownloading,
+	acfErroneous,
+	acfPaused,
+	acfStopped,
+	acfVideo,
+	acfAudio,
+	acfArchive,
+	acfCDImages,
+	acfPictures,
+	acfText,
+	acfActive
+};
+
 /**
  * Base-class for automatically loading and saving of preferences.
  *
@@ -113,7 +132,7 @@
 	 *
 	 * This function only makes sense for Cfg-classes that have the capability
 	 * to interact with a widget, see Cfg_Tmpl::ConnectToWidget().
-	 */	 
+	 */
 	virtual	bool ConnectToWidget( int WXUNUSED(id), wxWindow* WXUNUSED(parent) = NULL )	{ return false; }
 
 	/**
@@ -139,10 +158,10 @@
 	 * @param changed The new status.
 	 */
 	virtual void SetChanged( bool changed )
-	{ 
+	{
 		m_changed = changed;
 	};
-	
+
 private:
 
 	//! The Config-key under which to save the variable
@@ -153,6 +172,10 @@
 };
 
 
+class Cfg_Lang_Base {
+public:
+	virtual void UpdateChoice(int pos);
+};
 
 const int cntStatColors = 15;
 
@@ -182,15 +205,16 @@
 	static void		SetDeadServer(bool val)		{ s_deadserver = val; }
 	static const wxString&	GetUserNick()			{ return s_nick; }
 	static void		SetUserNick(const wxString& nick) { s_nick = nick; }
+	static Cfg_Lang_Base * GetCfgLang()		{ return s_cfgLang; }
 
 	static const wxString&	GetAddress()			{ return s_Addr; }
 	static uint16		GetPort()			{ return s_port; }
 	static void		SetPort(uint16 val);
 	static uint16		GetUDPPort()			{ return s_udpport; }
-	static uint16		GetEffectiveUDPPort()	{ return s_UDPDisable ? 0 : s_udpport; }
+	static uint16		GetEffectiveUDPPort()	{ return s_UDPEnable ? s_udpport : 0; }
 	static void		SetUDPPort(uint16 val)		{ s_udpport = val; }
-	static bool		IsUDPDisabled()			{ return s_UDPDisable; }
-	static void		SetUDPDisable(bool val)		{ s_UDPDisable = val; }
+	static bool		IsUDPDisabled()			{ return !s_UDPEnable; }
+	static void		SetUDPDisable(bool val)		{ s_UDPEnable = !val; }
 	static const CPath&	GetIncomingDir()		{ return s_incomingdir; }
 	static void		SetIncomingDir(const CPath& dir){ s_incomingdir = dir; }
 	static const CPath&	GetTempDir()			{ return s_tempdir; }
@@ -209,6 +233,8 @@
 	static void		SetMinToTray(bool val)		{ s_mintotray = val; }
 	static bool		UseTrayIcon()			{ return s_trayiconenabled; }
 	static void		SetUseTrayIcon(bool val)	{ s_trayiconenabled = val; }
+	static bool		HideOnClose()			{ return s_hideonclose; }
+	static void		SetHideOnClose(bool val)	{ s_hideonclose = val; }
 	static bool		DoAutoConnect()			{ return s_autoconnect; }
 	static void		SetAutoConnect(bool inautoconnect)
        					{s_autoconnect = inautoconnect; }
@@ -221,10 +247,6 @@
        					{ s_trafficOMeterInterval = in; }
 	static uint16		GetStatsInterval()		{ return s_statsInterval;}
 	static void		SetStatsInterval(uint16 in)	{ s_statsInterval = in; }
-	static void		Add2TotalDownloaded(uint64 in)	{ s_totalDownloadedBytes += in; }
-	static void		Add2TotalUploaded(uint64 in)	{ s_totalUploadedBytes += in; }
-	static uint64		GetTotalDownloaded()		{ return s_totalDownloadedBytes; }
-	static uint64		GetTotalUploaded()		{ return s_totalUploadedBytes; }
 	static bool		IsConfirmExitEnabled()		{ return s_confirmExit; }
 	static bool		FilterLanIPs()			{ return s_filterLanIP; }
 	static void		SetFilterLanIPs(bool val)	{ s_filterLanIP = val; }
@@ -251,7 +273,7 @@
                                         return temp; }
 	static uint16		GetDeadserverRetries()		{ return s_deadserverretries; }
 	static void		SetDeadserverRetries(uint16 val) { s_deadserverretries = val; }
-	static uint32	GetServerKeepAliveTimeout()	{ return s_dwServerKeepAliveTimeoutMins*60000; }
+	static uint32		GetServerKeepAliveTimeout()	{ return s_dwServerKeepAliveTimeoutMins*60000; }
 	static void		SetServerKeepAliveTimeout(uint32 val)	{ s_dwServerKeepAliveTimeoutMins = val/60000; }
 
 	static const wxString&	GetLanguageID()			{ return s_languageID; }
@@ -277,13 +299,12 @@
 	static void		SetVerbose(bool val)		{ s_bVerbose = val; }
 	static bool		GetPreviewPrio()		{ return s_bpreviewprio; }
 	static void		SetPreviewPrio(bool in)		{ s_bpreviewprio = in; }
-	static bool		TransferFullChunks()		{ return s_btransferfullchunks; }
-	static void		SetTransferFullChunks( bool m_bintransferfullchunks ) 
-					{s_btransferfullchunks = m_bintransferfullchunks; }
 	static bool		StartNextFile()			{ return s_bstartnextfile; }
 	static bool		StartNextFileSame()		{ return s_bstartnextfilesame; }
+	static bool		StartNextFileAlpha()		{ return s_bstartnextfilealpha; }
 	static void		SetStartNextFile(bool val)	{ s_bstartnextfile = val; }
 	static void		SetStartNextFileSame(bool val)	{ s_bstartnextfilesame = val; }
+	static void		SetStartNextFileAlpha(bool val)	{ s_bstartnextfilealpha = val; }
 	static bool		ShowOverhead()			{ return s_bshowoverhead; }
 	static void		SetNewAutoUp(bool m_bInUAP) 	{ s_bUAP = m_bInUAP; }
 	static bool		GetNewAutoUp() 			{ return s_bUAP; }
@@ -308,12 +329,11 @@
 
 	static bool		IsSafeServerConnectEnabled()	{ return s_safeServerConnect; }
 	static void		SetSafeServerConnectEnabled(bool val) { s_safeServerConnect = val; }
-	static bool		IsMoviePreviewBackup()		{ return s_moviePreviewBackup; }
 
-	static bool		IsCheckDiskspaceEnabled()	{ return s_checkDiskspace; }
+	static bool		IsCheckDiskspaceEnabled()			{ return s_checkDiskspace; }
 	static void		SetCheckDiskspaceEnabled(bool val)	{ s_checkDiskspace = val; }
-	static uint32		GetMinFreeDiskSpaceMB()		{ return s_uMinFreeDiskSpace; }
-	static uint64		GetMinFreeDiskSpace()		{ return s_uMinFreeDiskSpace * 1048576ull; }
+	static uint32	GetMinFreeDiskSpaceMB()				{ return s_uMinFreeDiskSpace; }
+	static uint64	GetMinFreeDiskSpace()				{ return s_uMinFreeDiskSpace * 1048576ull; }
 	static void		SetMinFreeDiskSpaceMB(uint32 val)	{ s_uMinFreeDiskSpace = val; }
 
 	static const wxString&	GetYourHostname() 		{ return s_yourHostname; }
@@ -321,7 +341,7 @@
 
 	static void		SetMaxUpload(uint16 in);
 	static void		SetMaxDownload(uint16 in);
-	static void		SetSlotAllocation(uint16 in) 	{ s_slotallocation = in; };
+	static void		SetSlotAllocation(uint16 in) 	{ s_slotallocation = (in >= 1) ? in : 1; };
 
 	typedef std::vector<CPath> PathList;
 	PathList shareddir_list;
@@ -349,13 +369,14 @@
 	Category_Struct* GetCategory(size_t index);
 	const CPath&	GetCatPath(uint8 index);
 	uint32			GetCatColor(size_t index);
-	Category_Struct *CreateCategory(const wxString& name, const CPath& path,
+	bool			CreateCategory(Category_Struct *& category, const wxString& name, const CPath& path,
 						const wxString& comment, uint32 color, uint8 prio);
-	void			UpdateCategory(uint8 cat, const wxString& name, const CPath& path,
+	bool			UpdateCategory(uint8 cat, const wxString& name, const CPath& path,
 						const wxString& comment, uint32 color, uint8 prio);
 
-	static uint32		GetAllcatType() 		{ return s_allcatType; }
-	static void		SetAllcatType(uint32 in)	{ s_allcatType = in; }
+	static AllCategoryFilter	GetAllcatFilter() 		{ return s_allcatFilter; }
+	static void		SetAllcatFilter(AllCategoryFilter in)	{ s_allcatFilter = in; }
+
 	static bool		ShowAllNotCats() 		{ return s_showAllNotCats; }
 
 	// WebServer
@@ -365,6 +386,8 @@
 	static void		SetWebUPnPTCPPort(uint16 val)	{ s_nWebUPnPTCPPort = val; }
 	static const wxString&	GetWSPass() 			{ return s_sWebPassword; }
 	static void		SetWSPass(const wxString& pass)	{ s_sWebPassword = pass; }
+	static const wxString&	GetWSPath() 			{ return s_sWebPath; }
+	static void		SetWSPath(const wxString& path)	{ s_sWebPath = path; }
 	static bool		GetWSIsEnabled() 		{ return s_bWebEnabled; }
 	static void		SetWSIsEnabled(bool bEnable) 	{ s_bWebEnabled=bEnable; }
 	static bool		GetWebUseGzip() 		{ return s_bWebUseGzip; }
@@ -406,14 +429,16 @@
 	static void			SetECPort(uint32 val) { s_ECPort = val; }
 	static const wxString&	ECPassword()			{ return s_ECPassword; }
 	static void		SetECPass(const wxString& pass)	{ s_ECPassword = pass; }
+	static bool		IsTransmitOnlyUploadingClients() { return s_TransmitOnlyUploadingClients; }
+
 	// Fast ED2K Links Handler Toggling
 	static bool 		GetFED2KLH()			{ return s_FastED2KLinksHandler; }
 
-	// Ip filter 
+	// Ip filter
 	static bool		IsFilteringClients()		{ return s_IPFilterClients; }
-	static void		SetFilteringClients(bool val)	{ s_IPFilterClients = val; }
+	static void		SetFilteringClients(bool val);
 	static bool		IsFilteringServers()		{ return s_IPFilterServers; }
-	static void		SetFilteringServers(bool val)	{ s_IPFilterServers = val; }
+	static void		SetFilteringServers(bool val);
 	static uint8		GetIPFilterLevel()		{ return s_filterlevel;}
 	static void		SetIPFilterLevel(uint8 level);
 	static bool		IPFilterAutoLoad()		{ return s_IPFilterAutoLoad; }
@@ -434,7 +459,7 @@
 	static void		SetExtractMetaData(bool val)	{ s_ExtractMetaData = val; }
 
 	static bool		ShowProgBar()			{ return s_ProgBar; }
-	static bool		ShowPercent()			{ return s_Percent; }	
+	static bool		ShowPercent()			{ return s_Percent; }
 
 	static bool		GetAllocFullFile()		{ return s_allocFullFile; };
 	static void		SetAllocFullFile(bool val)	{ s_allocFullFile = val; }
@@ -443,12 +468,8 @@
 
 	static const wxString&	GetSkin()			{ return s_Skin; }
 
-	static bool		UseSkins()			{ return s_UseSkinFiles; }
-
 	static bool		VerticalToolbar()		{ return s_ToolbarOrientation; }
 
-	static bool		ShowPartFileNumber()		{ return s_ShowPartFileNumber; }
-
 	static const CPath&	GetOSDir()			{ return s_OSDirectory; }
 	static uint16		GetOSUpdate()			{ return s_OSUpdate; }
 
@@ -463,7 +484,13 @@
 	static void LoadAllItems(wxConfigBase* cfg);
 	static void SaveAllItems(wxConfigBase* cfg);
 
-	static bool 		GetShowRatesOnTitle()		{ return s_ShowRatesOnTitle; }
+#ifndef __SVN__
+	static bool		ShowVersionOnTitle()		{ return s_showVersionOnTitle; }
+#else
+	static bool		ShowVersionOnTitle()		{ return true; }
+#endif
+	static uint8_t		GetShowRatesOnTitle()		{ return s_showRatesOnTitle; }
+	static void		SetShowRatesOnTitle(uint8_t val) { s_showRatesOnTitle = val; }
 
 	// Message Filters
 
@@ -480,6 +507,9 @@
 	static const wxString&	GetMessageFilterString()	{ return s_MessageFilterString; }
 	static void		SetMessageFilterString(const wxString& val) { s_MessageFilterString = val; }
 	static bool		IsMessageFiltered(const wxString& message);
+	static bool		ShowMessagesInLog()		{ return s_ShowMessagesInLog; }
+	static bool		IsAdvancedSpamfilterEnabled()	{ return s_IsAdvancedSpamfilterEnabled;}
+	static bool		IsChatCaptchaEnabled()	{ return IsAdvancedSpamfilterEnabled() && s_IsChatCaptchaEnabled; }
 
 	static bool		FilterComments()		{ return s_FilterComments; }
 	static void		SetFilterComments(bool val)	{ s_FilterComments = val; }
@@ -493,13 +523,15 @@
 	// Hidden files
 
 	static bool ShareHiddenFiles() { return s_ShareHiddenFiles; }
+	static void SetShareHiddenFiles(bool val) { s_ShareHiddenFiles = val; }
 
 	static bool AutoSortDownload()		{ return s_AutoSortDownload; }
 	static bool AutoSortDownload(bool val)	{ bool tmp = s_AutoSortDownload; s_AutoSortDownload = val; return tmp; }
 
 	// Version check
 
-	static bool CheckNewVersion() { return s_NewVersionCheck; }
+	static bool GetCheckNewVersion() { return s_NewVersionCheck; }
+	static void SetCheckNewVersion(bool val) { s_NewVersionCheck = val; }
 
 	// Networks
 	static bool GetNetworkKademlia()		{ return s_ConnectToKad; }
@@ -522,26 +554,42 @@
 
 	// Crypt
 	static bool		IsClientCryptLayerSupported()		{return s_IsClientCryptLayerSupported;}
-	static bool		IsClientCryptLayerRequested()		{return IsClientCryptLayerSupported() && s_bCryptLayerRequested;}	
+	static bool		IsClientCryptLayerRequested()		{return IsClientCryptLayerSupported() && s_bCryptLayerRequested;}
 	static bool		IsClientCryptLayerRequired()		{return IsClientCryptLayerRequested() && s_IsClientCryptLayerRequired;}
 	static bool		IsClientCryptLayerRequiredStrict()	{return false;} // not even incoming test connections will be answered
 	static bool		IsServerCryptLayerUDPEnabled()		{return IsClientCryptLayerSupported();}
 	static bool		IsServerCryptLayerTCPRequested()	{return IsClientCryptLayerRequested();}
 	static bool		IsServerCryptLayerTCPRequired()		{return IsClientCryptLayerRequired();}
-	static uint32		GetKadUDPKey()				{return s_dwKadUDPKey;}
-	static uint8		GetCryptTCPPaddingLength()		{return s_byCryptTCPPaddingLength;}
+	static uint32	GetKadUDPKey()						{return s_dwKadUDPKey;}
+	static uint8	GetCryptTCPPaddingLength()			{return s_byCryptTCPPaddingLength;}
 
 	static void		SetClientCryptLayerSupported(bool v)	{s_IsClientCryptLayerSupported = v;}
 	static void		SetClientCryptLayerRequested(bool v)	{s_bCryptLayerRequested = v; }
-	static void		SetClientCryptLayerRequired(bool v)	{s_IsClientCryptLayerRequired = v;}
+	static void		SetClientCryptLayerRequired(bool v)		{s_IsClientCryptLayerRequired = v;}
+
+	// GeoIP
+	static bool				IsGeoIPEnabled()		{return s_GeoIPEnabled;}
+	static void				SetGeoIPEnabled(bool v)	{s_GeoIPEnabled = v;}
+	static const wxString&	GetGeoIPUpdateUrl()		{return s_GeoIPUpdateUrl;}
+
+	// Stats server
+	static const wxString&	GetStatsServerName()		{return s_StatsServerName;}
+	static const wxString&	GetStatsServerURL()		{return s_StatsServerURL;}
 
+	// HTTP download
+	static wxString	GetLastHTTPDownloadURL(uint8 t);
+	static void		SetLastHTTPDownloadURL(uint8 t, const wxString& val);
+
+	// Sleep
+	static bool		GetPreventSleepWhileDownloading() { return s_preventSleepWhileDownloading; }
+	static void		SetPreventSleepWhileDownloading(bool status) { s_preventSleepWhileDownloading = status; }
 protected:
 	static	int32 GetRecommendedMaxConnections();
 
 	//! Temporary storage for statistic-colors.
-	static COLORREF	s_colors[cntStatColors];
+	static unsigned long	s_colors[cntStatColors];
 	//! Reference for checking if the colors has changed.
-	static COLORREF	s_colors_ref[cntStatColors];
+	static unsigned long	s_colors_ref[cntStatColors];
 
 	typedef std::vector<Cfg_Base*>			CFGList;
 	typedef std::map<int, Cfg_Base*>		CFGMap;
@@ -562,6 +610,8 @@
 
 	static CMD4Hash s_userhash;
 
+	static Cfg_Lang_Base * s_cfgLang;
+
 ////////////// CONNECTION
 	static uint16	s_maxupload;
 	static uint16	s_maxdownload;
@@ -569,7 +619,7 @@
 	static wxString s_Addr;
 	static uint16	s_port;
 	static uint16	s_udpport;
-	static bool	s_UDPDisable;
+	static bool	s_UDPEnable;
 	static uint16	s_maxconnections;
 	static bool	s_reconnect;
 	static bool	s_autoconnect;
@@ -596,6 +646,7 @@
 	static uint8	s_depth3D;
 
 	static bool	s_scorsystem;
+	static bool	s_hideonclose;
 	static bool	s_mintotray;
 	static bool	s_trayiconenabled;
 	static bool	s_addnewfilespaused;
@@ -613,8 +664,6 @@
 	static bool	s_paranoidfilter;
 	static bool	s_onlineSig;
 
-	static uint64  	s_totalDownloadedBytes;
-	static uint64	s_totalUploadedBytes;
 	static wxString	s_languageID;
 	static uint8	s_iSeeShares;		// 0=everybody 1=friends only 2=noone
 	static uint8	s_iToolDelayTime;	// tooltip delay time in seconds
@@ -636,17 +685,19 @@
 	static wxString	s_yourHostname;
 	static bool	s_bVerbose;
 	static bool	s_bmanualhighprio;
-	static bool	s_btransferfullchunks;
 	static bool	s_bstartnextfile;
-	static bool	s_bstartnextfilesame;	
+	static bool	s_bstartnextfilesame;
+	static bool	s_bstartnextfilealpha;
 	static bool	s_bshowoverhead;
 	static bool	s_bDAP;
 	static bool	s_bUAP;
 
-	static bool	s_ShowRatesOnTitle;
+#ifndef __SVN__
+	static bool	s_showVersionOnTitle;
+#endif
+	static uint8_t	s_showRatesOnTitle;	// 0=no, 1=after app name, 2=before app name
 
 	static wxString	s_VideoPlayer;
-	static bool	s_moviePreviewBackup;
 	static bool	s_showAllNotCats;
 
 	static bool	s_msgonlyfriends;
@@ -658,10 +709,10 @@
 	static wxString	s_datetimeformat;
 
 	static bool	s_ToolbarOrientation;
-	static bool	s_ShowPartFileNumber;
 
 	// Web Server [kuchin]
 	static wxString	s_sWebPassword;
+	static wxString	s_sWebPath;
 	static wxString	s_sWebLowPassword;
 	static uint16	s_nWebPort;
 	static uint16	s_nWebUPnPTCPPort;
@@ -672,7 +723,7 @@
 	static wxString s_WebTemplate;
 
 	static bool	s_showCatTabInfos;
-	static uint32	s_allcatType;
+	static AllCategoryFilter s_allcatFilter;
 
 	// Madcat - Sources Dropping Tweaks
 	static uint8	s_NoNeededSources; // 0: Keep, 1: Drop, 2:Swap
@@ -686,8 +737,9 @@
 	static wxString s_ECAddr;
 	static uint32	s_ECPort;
 	static wxString	s_ECPassword;
+	static bool		s_TransmitOnlyUploadingClients;
 
-	// Kry - IPFilter 
+	// Kry - IPFilter
 	static bool	s_IPFilterClients;
 	static bool	s_IPFilterServers;
 	static uint8	s_filterlevel;
@@ -699,7 +751,7 @@
 	static bool	s_UseSrcSeeds;
 
 	static bool	s_ProgBar;
-	static bool	s_Percent;	
+	static bool	s_Percent;
 
 	static bool s_SecIdent;
 
@@ -707,7 +759,6 @@
 
 	static bool	s_allocFullFile;
 
-	static uint16	s_Browser;
 	static wxString	s_CustomBrowser;
 	static bool	s_BrowserTab;     // Jacobo221 - Open in tabs if possible
 
@@ -715,7 +766,6 @@
 	static uint16	s_OSUpdate;
 
 	static wxString	s_Skin;
-	static bool	s_UseSkinFiles;
 
 	static bool	s_FastED2KLinksHandler;	// Madcat - Toggle Fast ED2K Links Handler
 
@@ -724,6 +774,9 @@
 	static wxString 	s_MessageFilterString;
 	static bool		s_FilterAllMessages;
 	static bool		s_FilterSomeMessages;
+	static bool		s_ShowMessagesInLog;
+	static bool		s_IsAdvancedSpamfilterEnabled;
+	static bool		s_IsChatCaptchaEnabled;
 
 	static bool 		s_FilterComments;
 	static wxString 	s_CommentFilterString;
@@ -753,9 +806,20 @@
 	// Crypt
 	static bool s_IsClientCryptLayerSupported;
 	static bool s_IsClientCryptLayerRequired;
-	static bool s_bCryptLayerRequested;	
+	static bool s_bCryptLayerRequested;
 	static uint32	s_dwKadUDPKey;
-	static uint8 s_byCryptTCPPaddingLength;	
+	static uint8 s_byCryptTCPPaddingLength;
+
+	// GeoIP
+	static bool s_GeoIPEnabled;
+	static wxString s_GeoIPUpdateUrl;
+
+	// Sleep vetoing
+	static bool s_preventSleepWhileDownloading;
+
+	// Stats server
+	static wxString s_StatsServerName;
+	static wxString s_StatsServerURL;
 };

aMule-2.2.6.tar.bz2/src/PrefsUnifiedDlg.cpp -> aMule-2.3.1.tar.bz2/src/PrefsUnifiedDlg.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Original author: Emilio Sandoz
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -17,7 +17,7 @@
 // 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
@@ -33,7 +33,7 @@
 
 #include "amule.h"				// Needed for theApp
 #include "amuleDlg.h"
-#include "Color.h"
+#include "MuleColour.h"
 #include "EditServerListDlg.h"
 #include "SharedFileList.h"		// Needed for CSharedFileList
 #include "StatisticsDlg.h"		// Needed for graph parameters, colors
@@ -49,7 +49,9 @@
 #include "KadDlg.h"				// Needed for CKadDlg
 #include "OScopeCtrl.h"			// Needed for OScopeCtrl
 #include "ServerList.h"
+#include "Statistics.h"
 #include "UserEvents.h"
+#include "PlatformSpecific.h"
 
 BEGIN_EVENT_TABLE(PrefsUnifiedDlg,wxDialog)
 	// Events
@@ -68,9 +70,8 @@
 	EVT_SPINCTRL(IDC_PORT,			PrefsUnifiedDlg::OnTCPClientPortChange)
 
 	// The rest. Organize it!
-	EVT_CHECKBOX(IDC_UDPDISABLE,		PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_UDPENABLE,		PrefsUnifiedDlg::OnCheckBoxChange)
 	EVT_CHECKBOX(IDC_CHECKDISKSPACE,	PrefsUnifiedDlg::OnCheckBoxChange)
-	EVT_CHECKBOX(IDC_USESKINFILES,		PrefsUnifiedDlg::OnCheckBoxChange)
 	EVT_CHECKBOX(IDC_ONLINESIG,		PrefsUnifiedDlg::OnCheckBoxChange)
 	EVT_CHECKBOX(IDC_REMOVEDEAD,		PrefsUnifiedDlg::OnCheckBoxChange)
 	EVT_CHECKBOX(IDC_AUTOSERVER,		PrefsUnifiedDlg::OnCheckBoxChange)
@@ -81,11 +82,17 @@
 	EVT_CHECKBOX(IDC_FILTERCOMMENTS,	PrefsUnifiedDlg::OnCheckBoxChange)
 	EVT_CHECKBOX(IDC_STARTNEXTFILE,		PrefsUnifiedDlg::OnCheckBoxChange)
 	EVT_CHECKBOX(IDC_ENABLETRAYICON,	PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_MACHIDEONCLOSE,	PrefsUnifiedDlg::OnCheckBoxChange)
 	EVT_CHECKBOX(IDC_VERTTOOLBAR,		PrefsUnifiedDlg::OnCheckBoxChange)
 	EVT_CHECKBOX(IDC_SUPPORT_PO,		PrefsUnifiedDlg::OnCheckBoxChange)
 	EVT_CHECKBOX(IDC_ENABLE_PO_OUTGOING,	PrefsUnifiedDlg::OnCheckBoxChange)
 	EVT_CHECKBOX(IDC_ENFORCE_PO_INCOMING,	PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_SHOWRATEONTITLE,	PrefsUnifiedDlg::OnCheckBoxChange)
 	EVT_CHECKBOX(IDC_NETWORKED2K,		PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_NETWORKKAD,		PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_UPNP_ENABLED,		PrefsUnifiedDlg::OnCheckBoxChange)
+	EVT_CHECKBOX(IDC_UPNP_WEBSERVER_ENABLED,PrefsUnifiedDlg::OnCheckBoxChange)
+
 
 	EVT_BUTTON(ID_PREFS_OK_TOP,		PrefsUnifiedDlg::OnOk)
 	EVT_BUTTON(ID_PREFS_CANCEL_TOP,		PrefsUnifiedDlg::OnCancel)
@@ -105,7 +112,6 @@
 	EVT_BUTTON(IDC_COLOR_BUTTON,		PrefsUnifiedDlg::OnButtonColorChange)
 	EVT_BUTTON(IDC_IPFILTERUPDATE,		PrefsUnifiedDlg::OnButtonIPFilterUpdate)
 	EVT_CHOICE(IDC_COLORSELECTOR,		PrefsUnifiedDlg::OnColorCategorySelected)
-	EVT_CHOICE(IDC_BROWSER,			PrefsUnifiedDlg::OnBrowserChange)
 	EVT_LIST_ITEM_SELECTED(ID_PREFSLISTCTRL,PrefsUnifiedDlg::OnPrefsPageChange)
 
 	EVT_INIT_DIALOG(PrefsUnifiedDlg::OnInitDialog)
@@ -122,6 +128,8 @@
 
 	EVT_LIST_ITEM_SELECTED(IDC_EVENTLIST,	PrefsUnifiedDlg::OnUserEventSelected)
 
+	EVT_CHOICE(IDC_LANGUAGE,		PrefsUnifiedDlg::OnLanguageChoice)
+
 	EVT_CLOSE(PrefsUnifiedDlg::OnClose)
 
 END_EVENT_TABLE()
@@ -132,7 +140,7 @@
  *
  * This can be used enforce logical constraints by passing by
  * sending a check-box event for each checkbox, when transfering
- * to the UI. However, it should also be used for checkboxes that 
+ * to the UI. However, it should also be used for checkboxes that
  * have no side-effects other than enabling/disabling other
  * widgets in the preferences dialogs.
  */
@@ -144,7 +152,7 @@
 	wxCommandEvent evt(wxEVT_COMMAND_CHECKBOX_CLICKED, id);
 	evt.SetInt(widget->IsChecked() ? 1 : 0);
 
-	parent->ProcessEvent(evt);
+	parent->GetEventHandler()->ProcessEvent(evt);
 }
 
 
@@ -174,7 +182,7 @@
 	{ wxTRANSLATE("Interface"),			PreferencesGuiTweaksTab,	19 },
 	{ wxTRANSLATE("Statistics"),		PreferencesStatisticsTab,	10 },
 	{ wxTRANSLATE("Proxy"),				PreferencesProxyTab,		24 },
-	{ wxTRANSLATE("Filters"),			PreferencesMessagesTab,	23 },
+	{ wxTRANSLATE("Filters"),			PreferencesFilteringTab,	23 },
 	{ wxTRANSLATE("Remote Controls"),	PreferencesRemoteControlsTab,	11 },
 	{ wxTRANSLATE("Online Signature"),	PreferencesOnlineSigTab,	21 },
 	{ wxTRANSLATE("Advanced"),			PreferencesaMuleTweaksTab,	12 },
@@ -192,7 +200,7 @@
 	wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER)
 {
 	preferencesDlgTop(this, false);
-	
+
 	m_PrefsIcons = CastChild(ID_PREFSLISTCTRL, wxListCtrl);
 	wxImageList *icon_list = new wxImageList(16, 16);
 	m_PrefsIcons->AssignImageList(icon_list, wxIMAGE_LIST_SMALL);
@@ -212,14 +220,14 @@
 		icon_list->Add(amuleSpecial(pages[i].m_imageidx));
 		m_PrefsIcons->InsertItem(i, wxGetTranslation(pages[i].m_title), i);
 	}
-	
+
 	// Set list-width so that there aren't any scrollers
 	m_PrefsIcons->SetColumnWidth(0, wxLIST_AUTOSIZE);
 	m_PrefsIcons->SetMinSize(wxSize(m_PrefsIcons->GetColumnWidth(0) + 10, -1));
 	m_PrefsIcons->SetMaxSize(wxSize(m_PrefsIcons->GetColumnWidth(0) + 10, -1));
 
 	// Now add the pages and calculate the minimum size
-	wxPanel * DefaultWidget;
+	wxPanel * DefaultWidget = NULL;
 	for (unsigned int i = 0; i < itemsof(pages); ++i) {
 		// Create a container widget and the contents of the page
 		wxPanel * Widget = new wxPanel(this, -1);
@@ -235,13 +243,16 @@
 
 		if (pages[i].m_function == PreferencesGeneralTab) {
 			// This must be done now or pages won't Fit();
-			#ifdef __WXMSW__ 
+			#ifdef __WXMSW__
 				CastChild(IDC_BROWSERTABS, wxCheckBox)->Enable(false);
-				wxChoice *browserCheck = CastChild(IDC_BROWSER, wxChoice);
-				browserCheck->Clear();
-				browserCheck->Append(_("System default"));
-				browserCheck->Append(_("User Defined"));
 			#endif /* __WXMSW__ */
+			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);
+				FindWindow(IDC_MINTRAY)->Show(false);
+			#else
+				FindWindow(IDC_MACHIDEONCLOSE)->Show(false);
+			#endif
 		} else if (pages[i].m_function == PreferencesEventsTab) {
 
 #define USEREVENTS_REPLACE_VAR(VAR, DESC, CODE)	+ wxString(wxT("\n  %") VAR wxT(" - ")) + wxGetTranslation(DESC)
@@ -258,6 +269,11 @@
 						USEREVENTS_FIRST_ID + idx * USEREVENTS_IDS_PER_EVENT);
 					switch (idx) {
 						USEREVENTS_EVENTLIST()
+						/* This macro expands to handle all user event types. Here is an example:
+						   case CUserEvents::NewChatSession: {
+						       CreateEventPanels(idx, wxString(wxT("\n %SENDER - ")) + wxTRANSLATE("Message sender."), Widget);
+						       break;
+						   } */
 					}
 				}
 			}
@@ -267,13 +283,22 @@
 			m_IndexServerTab = i;
 			m_ServerWidget = Widget;
 		}
+		else if (pages[i].m_function == PreferencesaMuleTweaksTab) {
+			wxStaticText *txt = CastChild(IDC_AMULE_TWEAKS_WARNING, wxStaticText);
+			// Do not wrap this line, Windows _() can't handle wrapped strings
+			txt->SetLabel(_("Do not change these setting unless you know\nwhat you are doing, otherwise you can easily\nmake things worse for yourself.\n\naMule will run fine without adjusting any of\nthese settings."));
+			#if defined CLIENT_GUI || !PLATFORMSPECIFIC_CAN_PREVENT_SLEEP_MODE
+				CastChild(IDC_PREVENT_SLEEP, wxCheckBox)->Enable(false);
+				thePrefs::SetPreventSleepWhileDownloading(false);
+			#endif
+		}
 #ifdef __DEBUG__
 		else if (pages[i].m_function == PreferencesDebug) {
-			int count = CLogger::GetDebugCategoryCount();
+			int count = theLogger.GetDebugCategoryCount();
 			wxCheckListBox* list = CastChild( ID_DEBUGCATS, wxCheckListBox );
 
 			for ( int j = 0; j < count; j++ ) {
-				list->Append( CLogger::GetDebugCategory( j ).GetName() );
+				list->Append( theLogger.GetDebugCategory( j ).GetName() );
 			}
 		}
 #endif
@@ -296,7 +321,7 @@
 		prefs_sizer->Detach(Widget);
 		Widget->Show(false);
 	}
-	
+
 	// Default to the General tab
 	m_CurrentPanel = DefaultWidget;
 	prefs_sizer->Add(DefaultWidget, 0, wxGROW|wxEXPAND);
@@ -322,8 +347,8 @@
 	for ( ; it != thePrefs::s_CfgList.end(); ++it ) {
 		// Checking for failures
 		if ( !it->second->ConnectToWidget(it->first, this) ) {
-			printf("Failed to connect Cfg to widget with the ID %d and key %s\n",
-				it->first, (const char *)unicode2char(it->second->GetKey()));
+			AddLogLineNS(CFormat(_("Failed to connect Cfg to widget with the ID %d and key %s"))
+				% it->first % it->second->GetKey());
 		}
 	}
 	Fit();
@@ -331,10 +356,6 @@
 	// It must not be resized to something smaller than what it currently is
 	wxSize size = GetClientSize();
 	SetSizeHints(size.GetWidth(), size.GetHeight());
-	
-	#ifdef __WXMSW__
-		FindWindow(IDC_VERTTOOLBAR)->Enable(false);
-	#endif
 
 	// Position the dialog.
 	Center();
@@ -375,23 +396,24 @@
 	for ( ; it != thePrefs::s_CfgList.end(); ++it ) {
 		// Checking for failures
 		if ( !it->second->TransferToWindow() ) {
-			printf("Failed to transfer data from Cfg to Widget with the ID %d and key %s\n",
-				it->first, (const char *)unicode2char(it->second->GetKey()));
+			AddLogLineNS(CFormat(_("Failed to transfer data from Cfg to Widget with the ID %d and key %s"))
+				% it->first % it->second->GetKey());
 		}
 	}
 
 	m_ShareSelector->SetSharedDirectories(&theApp->glob_prefs->shareddir_list);
 
 	for ( int i = 0; i < cntStatColors; i++ ) {
-		thePrefs::s_colors[i] = CStatisticsDlg::acrStat[i];
-		thePrefs::s_colors_ref[i] = CStatisticsDlg::acrStat[i];
+		thePrefs::s_colors[i] = CMuleColour(CStatisticsDlg::acrStat[i]).GetULong();
+		thePrefs::s_colors_ref[i] = CMuleColour(CStatisticsDlg::acrStat[i]).GetULong();
 	}
-	
+
 	// Connection tab
 	wxSpinEvent e;
 	OnTCPClientPortChange(e);
-	
+
 	// Proxy tab initialization
+	FindWindow(ID_PROXY_TYPE)->SetToolTip(_("The type of proxy you are connecting to"));
 	if (!CastChild(ID_PROXY_ENABLE_PROXY, wxCheckBox)->IsChecked()) {
 		FindWindow(ID_PROXY_TYPE)->Enable(false);
 		FindWindow(ID_PROXY_NAME)->Enable(false);
@@ -403,75 +425,101 @@
 	}
 	// This option from the proxy tab is currently unused
 	FindWindow(ID_PROXY_AUTO_SERVER_CONNECT_WITHOUT_PROXY)->Enable(false);
-	
+
 	// Enable/Disable some controls
-	bool customBrowser =
-		CastChild(IDC_BROWSER, wxChoice)->GetSelection() ==
-		(int)CastChild(IDC_BROWSER, wxChoice)->GetCount() - 1;
-	FindWindow( IDC_BROWSERSELF )->Enable( customBrowser );
-	FindWindow( IDC_SELBROWSER )->Enable( customBrowser );
-	#ifndef __WXMSW__
-		FindWindow( IDC_BROWSERTABS )->Enable( !customBrowser );
-	#endif
 	FindWindow( IDC_MINDISKSPACE )->Enable( thePrefs::IsCheckDiskspaceEnabled() );
-	FindWindow( IDC_SKIN )->Enable( thePrefs::UseSkins() );
 	FindWindow( IDC_OSDIR )->Enable( thePrefs::IsOnlineSignatureEnabled() );
 	FindWindow( IDC_OSUPDATE )->Enable( thePrefs::IsOnlineSignatureEnabled() );
-	FindWindow( IDC_UDPPORT )->Enable( !thePrefs::s_UDPDisable );
+	FindWindow( IDC_UDPENABLE )->Enable( !thePrefs::GetNetworkKademlia());
+	FindWindow( IDC_UDPPORT )->Enable( thePrefs::s_UDPEnable );
 	FindWindow( IDC_SERVERRETRIES )->Enable( thePrefs::DeadServer() );
 	FindWindow( IDC_STARTNEXTFILE_SAME )->Enable(thePrefs::StartNextFile());
+	FindWindow( IDC_STARTNEXTFILE_ALPHA )->Enable(thePrefs::StartNextFile());
+
+	FindWindow(IDC_MACHIDEONCLOSE)->Enable(true);
+	FindWindow(IDC_EXIT)->Enable(!thePrefs::HideOnClose());
+	if (!thePrefs::HideOnClose()) {
+		CastChild(IDC_EXIT, wxCheckBox)->SetValue(false);
+	}
 
-#ifdef __WXMAC__
-	FindWindow(IDC_ENABLETRAYICON)->Enable(false);
-	FindWindow(IDC_MINTRAY)->Enable(false);
-#else
 	FindWindow(IDC_MINTRAY)->Enable(thePrefs::UseTrayIcon());
-#endif
 
 	if (!CastChild(IDC_MSGFILTER, wxCheckBox)->IsChecked()) {
 		FindWindow(IDC_MSGFILTER_ALL)->Enable(false);
 		FindWindow(IDC_MSGFILTER_NONSECURE)->Enable(false);
 		FindWindow(IDC_MSGFILTER_NONFRIENDS)->Enable(false);
-		FindWindow(IDC_MSGFILTER_WORD)->Enable(false);		
+		FindWindow(IDC_MSGFILTER_WORD)->Enable(false);
 		FindWindow(IDC_MSGWORD)->Enable(false);
 	} else if (CastChild(IDC_MSGFILTER_ALL, wxCheckBox)->IsChecked()) {
 		FindWindow(IDC_MSGFILTER_NONSECURE)->Enable(false);
 		FindWindow(IDC_MSGFILTER_NONFRIENDS)->Enable(false);
-		FindWindow(IDC_MSGFILTER_WORD)->Enable(false);		
-		FindWindow(IDC_MSGWORD)->Enable(false);	
+		FindWindow(IDC_MSGFILTER_WORD)->Enable(false);
+		FindWindow(IDC_MSGWORD)->Enable(false);
 	}
 
 	FindWindow(IDC_MSGWORD)->Enable(CastChild(IDC_MSGFILTER_WORD, wxCheckBox)->IsChecked());
 	FindWindow(IDC_COMMENTWORD)->Enable(CastChild(IDC_FILTERCOMMENTS, wxCheckBox)->IsChecked());
 
+#ifdef CLIENT_GUI
+	// Disable dirpickers unless it's a localhost connection
+	if (!theApp->m_connect->IsConnectedToLocalHost()) {
+		FindWindow(IDC_SELINCDIR)->Enable(false);
+		FindWindow(IDC_SELTEMPDIR)->Enable(false);
+	}
+#endif
+
 	// Protocol obfuscation
 	::SendCheckBoxEvent(this, IDC_SUPPORT_PO);
 	::SendCheckBoxEvent(this, IDC_ENABLE_PO_OUTGOING);
 	::SendCheckBoxEvent(this, IDC_ENFORCE_PO_INCOMING);
 
+#ifndef ENABLE_IP2COUNTRY
+	CastChild(IDC_SHOW_COUNTRY_FLAGS, wxCheckBox)->Enable(false);
+	thePrefs::SetGeoIPEnabled(false);
+#endif
+
+#ifdef __SVN__
+	// Version is always shown on the title in development versions
+	CastChild(IDC_SHOWVERSIONONTITLE, wxCheckBox)->SetValue(true);
+	CastChild(IDC_SHOWVERSIONONTITLE, wxCheckBox)->Enable(false);
+#endif
+
+	// Show rates on title
+	FindWindow(IDC_RATESBEFORETITLE)->Enable(thePrefs::GetShowRatesOnTitle() != 0);
+	FindWindow(IDC_RATESAFTERTITLE)->Enable(thePrefs::GetShowRatesOnTitle() != 0);
+	CastChild(IDC_SHOWRATEONTITLE, wxCheckBox)->SetValue(thePrefs::GetShowRatesOnTitle() != 0);
+	CastChild(IDC_RATESBEFORETITLE, wxRadioButton)->SetValue(thePrefs::GetShowRatesOnTitle() == 2);
+	CastChild(IDC_RATESAFTERTITLE, wxRadioButton)->SetValue(thePrefs::GetShowRatesOnTitle() != 2);
+
 	// UPNP
 #ifndef ENABLE_UPNP
-	FindWindow(IDC_UPNP_ENABLED)->Enable(false);	
+	FindWindow(IDC_UPNP_ENABLED)->Enable(false);
 	FindWindow(IDC_UPNPTCPPORT)->Enable(false);
+	FindWindow(IDC_UPNPTCPPORTTEXT)->Enable(false);
 	thePrefs::SetUPnPEnabled(false);
-	// TODO: grey out "UPnP TCP Port", "Webserver UPnP TCP Port"
-	FindWindow(IDC_UPNP_WEBSERVER_ENABLED)->Enable(false);	
+	FindWindow(IDC_UPNP_WEBSERVER_ENABLED)->Enable(false);
 	FindWindow(IDC_WEBUPNPTCPPORT)->Enable(false);
+	FindWindow(IDC_WEBUPNPTCPPORTTEXT)->Enable(false);
 	thePrefs::SetUPnPWebServerEnabled(false);
 	FindWindow(IDC_UPNP_EC_ENABLED)->Enable(false);
 	thePrefs::SetUPnPECEnabled(false);
+#else
+	FindWindow(IDC_UPNPTCPPORT)->Enable(thePrefs::GetUPnPEnabled());
+	FindWindow(IDC_UPNPTCPPORTTEXT)->Enable(thePrefs::GetUPnPEnabled());
+	FindWindow(IDC_WEBUPNPTCPPORT)->Enable(thePrefs::GetUPnPWebServerEnabled());
+	FindWindow(IDC_WEBUPNPTCPPORTTEXT)->Enable(thePrefs::GetUPnPWebServerEnabled());
 #endif
 
 #ifdef __DEBUG__
 	// Set debugging toggles
-	int count = CLogger::GetDebugCategoryCount();
+	int count = theLogger.GetDebugCategoryCount();
 	wxCheckListBox* list = CastChild( ID_DEBUGCATS, wxCheckListBox );
 
 	for ( int i = 0; i < count; i++ ) {
-		list->Check( i, CLogger::GetDebugCategory( i ).IsEnabled() );
+		list->Check( i, theLogger.GetDebugCategory( i ).IsEnabled() );
 	}
 #endif
-	
+
 	return true;
 }
 
@@ -483,8 +531,8 @@
 	for ( ; it != thePrefs::s_CfgList.end(); ++it ) {
 		// Checking for failures
 		if ( !it->second->TransferFromWindow() ) {
-			printf("Failed to transfer data from Widget to Cfg with the ID %d and key %s\n",
-				it->first, (const char *)unicode2char(it->second->GetKey()));
+			AddLogLineNS(CFormat(_("Failed to transfer data from Widget to Cfg with the ID %d and key %s"))
+				% it->first % it->second->GetKey());
 		}
 	}
 
@@ -502,19 +550,21 @@
 
 #ifdef __DEBUG__
 	// Get debugging toggles
-	int count = CLogger::GetDebugCategoryCount();
+	int count = theLogger.GetDebugCategoryCount();
 	wxCheckListBox* list = CastChild( ID_DEBUGCATS, wxCheckListBox );
 
 	for ( int i = 0; i < count; i++ ) {
-		CLogger::SetEnabled( CLogger::GetDebugCategory( i ).GetType(), list->IsChecked( i ) );
+		theLogger.SetEnabled( theLogger.GetDebugCategory( i ).GetType(), list->IsChecked( i ) );
 	}
 #endif
 
+	thePrefs::SetShowRatesOnTitle(CastChild(IDC_SHOWRATEONTITLE, wxCheckBox)->GetValue() ? (CastChild(IDC_RATESBEFORETITLE, wxRadioButton)->GetValue() ? 2 : 1) : 0);
+
 	#ifdef CLIENT_GUI
 	// Send preferences to core.
 	theApp->glob_prefs->SendToRemote();
 	#endif
-	
+
 	return true;
 }
 
@@ -537,7 +587,7 @@
 
 	bool restart_needed = false;
 	wxString restart_needed_msg = _("aMule must be restarted to enable these changes:\n\n");
-	
+
 	// do sanity checking, special processing, and user notifications here
 	thePrefs::CheckUlDlRatio();
 
@@ -551,13 +601,26 @@
 		restart_needed_msg += _("- UDP port changed.\n");
 	}
 
+	if (CfgChanged(IDC_EXT_CONN_TCP_PORT)) {
+		restart_needed = true;
+		restart_needed_msg += _("- External connect port changed.\n");
+	}
+	if (CfgChanged(IDC_EXT_CONN_ACCEPT)) {
+		restart_needed = true;
+		restart_needed_msg += _("- External connect acceptance changed.\n");
+	}
+	if (CfgChanged(IDC_EXT_CONN_IP)) {
+		restart_needed = true;
+		restart_needed_msg += _("- External connect interface changed.\n");
+	}
+
 	// Force port checking
 	thePrefs::SetPort(thePrefs::GetPort());
-	
-	if ((CPath::GetFileSize(theApp->ConfigDir + wxT("addresses.dat")) == 0) && 
+
+	if ((CPath::GetFileSize(theApp->ConfigDir + wxT("addresses.dat")) == 0) &&
 		CastChild(IDC_AUTOSERVER, wxCheckBox)->IsChecked() ) {
 		thePrefs::UnsetAutoServerStart();
-		wxMessageBox(_("Your Auto-update server list is empty.\n'Auto-update server list at startup will be disabled."),
+		wxMessageBox(_("Your Auto-update server list is empty.\n'Auto-update server list at startup' will be disabled."),
 			_("Message"), wxOK | wxICON_INFORMATION, this);
 	}
 
@@ -566,7 +629,7 @@
 
 		wxMessageBox( _("You have enabled external connections but have not specified a password.\nExternal connections cannot be enabled unless a valid password is specified."));
 	}
-	
+
 	// save the preferences on ok
 	theApp->glob_prefs->Save();
 
@@ -600,18 +663,23 @@
 		theApp->SetOSFiles( widget->GetValue() );
 	}
 
-	if (CfgChanged(IDC_IPFCLIENTS) || CfgChanged(IDC_IPFSERVERS) || CfgChanged(ID_IPFILTERLEVEL)) {
-		if (thePrefs::IsFilteringClients()) {
-			theApp->clientlist->FilterQueues();
-		}
-		if (thePrefs::IsFilteringServers()) {
-			theApp->serverlist->FilterServers();
-		}
+	if (CfgChanged(IDC_IPFCLIENTS) && thePrefs::IsFilteringClients()) {
+		theApp->clientlist->FilterQueues();
+	}
+
+	if (CfgChanged(IDC_IPFSERVERS) && thePrefs::IsFilteringServers()) {
+		theApp->serverlist->FilterServers();
+	}
+
+	if (CfgChanged(ID_IPFILTERLEVEL)) {
+		theApp->ipfilter->Reload();
 	}
 
+	theApp->ResetTitle();
+
 	if (thePrefs::GetShowRatesOnTitle()) {
 		// This avoids a 5 seconds delay to show the title
-		theApp->amuledlg->SetTitle(theApp->m_FrameTitle + wxT(" -- ") + _("Up: 0.0 | Down: 0.0"));
+		theApp->amuledlg->ShowTransferRate();
 	} else {
 		// This resets the title
 		theApp->amuledlg->SetTitle(theApp->m_FrameTitle);
@@ -639,36 +707,41 @@
 		theApp->amuledlg->m_statisticswnd->SetARange( false, thePrefs::GetMaxGraphUploadRate() );
 	}
 
-	if (CfgChanged(IDC_SKIN) || CfgChanged(IDC_USESKINFILES)) {
+	if (CfgChanged(IDC_SKIN)) {
 		theApp->amuledlg->Create_Toolbar(thePrefs::VerticalToolbar());
 	}
 
 	if (!thePrefs::GetNetworkED2K() && theApp->IsConnectedED2K()) {
 		theApp->DisconnectED2K();
 	}
-	
+
 	if (!thePrefs::GetNetworkKademlia() && theApp->IsConnectedKad()) {
 		theApp->StopKad();
-	}	
+	}
 
 	if (!thePrefs::GetNetworkED2K() && !thePrefs::GetNetworkKademlia()) {
 		wxMessageBox(
 			_("Both eD2k and Kad network are disabled.\nYou won't be able to connect until you enable at least one of them."));
-	}	
-	
+	}
+
 	if (thePrefs::GetNetworkKademlia() && thePrefs::IsUDPDisabled()) {
 		wxMessageBox(_("Kad will not start if your UDP port is disabled.\nEnable UDP port or disable Kad."),
 			 _("Message"), wxOK | wxICON_INFORMATION, this);
 	}
-	
+
 	if (CfgChanged(IDC_NETWORKKAD) || CfgChanged(IDC_NETWORKED2K)) {
 		theApp->amuledlg->DoNetworkRearrange();
 	}
-	
+
+	if (CfgChanged(IDC_SHOW_COUNTRY_FLAGS)) {
+		theApp->amuledlg->EnableIP2Country();
+	}
+
 	if (restart_needed) {
-		wxMessageBox(restart_needed_msg + _("\nYou MUST restart aMule now.\nIf you do not restart now, don't complain if anything bad happens.\n"), _("WARNING"),wxICON_EXCLAMATION,this);
+		wxMessageBox(restart_needed_msg + _("\nYou MUST restart aMule now.\nIf you do not restart now, don't complain if anything bad happens.\n"), 
+			_("WARNING"), wxOK | wxICON_EXCLAMATION, this);
 	}
-	
+
 	Show(false);
 }
 
@@ -676,7 +749,7 @@
 void PrefsUnifiedDlg::OnClose(wxCloseEvent& event)
 {
 	Show(false);
-	
+
 	// Try to keep the window alive when possible
 	if (event.CanVeto()) {
 		event.Veto();
@@ -684,14 +757,14 @@
 		if (theApp->amuledlg) {
 			theApp->amuledlg->m_prefsDialog = NULL;
 		}
-	
+
 		// Un-Connect the Cfgs
 		thePrefs::CFGMap::iterator it = thePrefs::s_CfgList.begin();
 		for (; it != thePrefs::s_CfgList.end(); ++it) {
 			// Checking for failures
 			it->second->ConnectToWidget( 0 );
 		}
-		
+
 		Destroy();
 	}
 }
@@ -708,7 +781,7 @@
 void PrefsUnifiedDlg::OnCheckBoxChange(wxCommandEvent& event)
 {
 	bool	value = event.IsChecked();
-	int	id = event.GetId();	
+	int	id = event.GetId();
 
 	// Check if this checkbox is one of the User Events checkboxes
 	if (id >= USEREVENTS_FIRST_ID &&
@@ -721,17 +794,36 @@
 	}
 
 	switch ( id ) {
-		case IDC_UDPDISABLE:
-			// UDP is disable rather than enable, so we flip the value
-			FindWindow( IDC_UDPPORT )->Enable(!value);
+		case IDC_UDPENABLE:
+			FindWindow( IDC_UDPPORT )->Enable(value);
+			break;
+
+		case IDC_UPNP_ENABLED:
+			FindWindow(IDC_UPNPTCPPORT)->Enable(value);
+			FindWindow(IDC_UPNPTCPPORTTEXT)->Enable(value);
 			break;
-			
+
+		case IDC_UPNP_WEBSERVER_ENABLED:
+			FindWindow(IDC_WEBUPNPTCPPORT)->Enable(value);
+			FindWindow(IDC_WEBUPNPTCPPORTTEXT)->Enable(value);
+			break;
+
+		case IDC_NETWORKKAD: {
+			wxCheckBox * udpPort = (wxCheckBox *) FindWindow(IDC_UDPENABLE);
+			if (value) {
+				// Kad enabled: disable check box, turn UDP on, enable port spin control
+				udpPort->Enable(false);
+				udpPort->SetValue(true);
+				FindWindow(IDC_UDPPORT)->Enable(true);
+			} else {
+				// Kad disabled: enable check box
+				udpPort->Enable(true);
+			}
+			break;
+		}
+
 		case IDC_CHECKDISKSPACE:
 			FindWindow( IDC_MINDISKSPACE )->Enable(value);
-			break;	
-		
-		case IDC_USESKINFILES:
-			FindWindow( IDC_SKIN )->Enable(value);;
 			break;
 
 		case IDC_ONLINESIG:
@@ -744,7 +836,7 @@
 			break;
 
 		case IDC_AUTOSERVER:
-			if ((CPath::GetFileSize(theApp->ConfigDir + wxT("addresses.dat")) == 0) && 
+			if ((CPath::GetFileSize(theApp->ConfigDir + wxT("addresses.dat")) == 0) &&
 				CastChild(event.GetId(), wxCheckBox)->IsChecked() ) {
 				wxMessageBox(_("Your Auto-update servers list is in blank.\nPlease fill in at least one URL to point to a valid server.met file.\nClick on the button \"List\" by this checkbox to enter an URL."),
 					_("Message"), wxOK | wxICON_INFORMATION);
@@ -757,7 +849,7 @@
 			FindWindow(IDC_MSGFILTER_ALL)->Enable(value);
 			FindWindow(IDC_MSGFILTER_NONSECURE)->Enable(value);
 			FindWindow(IDC_MSGFILTER_NONFRIENDS)->Enable(value);
-			FindWindow(IDC_MSGFILTER_WORD)->Enable(value);		
+			FindWindow(IDC_MSGFILTER_WORD)->Enable(value);
 			if (value) {
 				FindWindow(IDC_MSGWORD)->Enable(
 					CastChild(IDC_MSGFILTER_WORD, wxCheckBox)->IsChecked());
@@ -765,12 +857,12 @@
 				FindWindow(IDC_MSGWORD)->Enable(false);
 			}
 			break;
-		
+
 		case IDC_MSGFILTER_ALL:
 			// Toogle filtering by data.
 			FindWindow(IDC_MSGFILTER_NONSECURE)->Enable(!value);
 			FindWindow(IDC_MSGFILTER_NONFRIENDS)->Enable(!value);
-			FindWindow(IDC_MSGFILTER_WORD)->Enable(!value);		
+			FindWindow(IDC_MSGFILTER_WORD)->Enable(!value);
 			if (!value) {
 				FindWindow(IDC_MSGWORD)->Enable(
 					CastChild(IDC_MSGFILTER_WORD, wxCheckBox)->IsChecked());
@@ -778,7 +870,7 @@
 				FindWindow(IDC_MSGWORD)->Enable(false);
 			}
 			break;
-		
+
 		case IDC_MSGFILTER_WORD:
 			// Toogle filter word list.
 			FindWindow(IDC_MSGWORD)->Enable(value);
@@ -793,16 +885,22 @@
 			FindWindow(ID_PROXY_NAME)->Enable(value);
 			FindWindow(ID_PROXY_PORT)->Enable(value);
 			break;
-			
+
 		case ID_PROXY_ENABLE_PASSWORD:
 			FindWindow(ID_PROXY_USER)->Enable(value);
 			FindWindow(ID_PROXY_PASSWORD)->Enable(value);
 			break;
-			
+
 		case IDC_STARTNEXTFILE:
 			FindWindow(IDC_STARTNEXTFILE_SAME)->Enable(value);
+			FindWindow(IDC_STARTNEXTFILE_ALPHA)->Enable(value);
+			break;
+
+		case IDC_MACHIDEONCLOSE:
+			FindWindow(IDC_EXIT)->Enable(!value);
+			CastChild(IDC_EXIT, wxCheckBox)->SetValue(!value && thePrefs::IsConfirmExitEnabled());
 			break;
-		
+
 		case IDC_ENABLETRAYICON:
 			FindWindow(IDC_MINTRAY)->Enable(value);
 			if (value) {
@@ -812,15 +910,17 @@
 			}
 			thePrefs::SetUseTrayIcon(value);
 			break;
-		
+
 		case ID_PROXY_AUTO_SERVER_CONNECT_WITHOUT_PROXY:
 			break;
+
 		case IDC_VERTTOOLBAR:
 			theApp->amuledlg->Create_Toolbar(value);
 			// Update the first tool (conn button)
 			theApp->amuledlg->ShowConnectionState();
+			theApp->amuledlg->Layout();
 			break;
-	
+
 		case IDC_ENFORCE_PO_INCOMING:
 			FindWindow(IDC_ENABLE_PO_OUTGOING)->Enable(!value);
 			break;
@@ -833,7 +933,12 @@
 		case IDC_SUPPORT_PO:
 			FindWindow(IDC_ENABLE_PO_OUTGOING)->Enable(value);
 			break;
-		
+
+		case IDC_SHOWRATEONTITLE:
+			FindWindow(IDC_RATESBEFORETITLE)->Enable(value);
+			FindWindow(IDC_RATESAFTERTITLE)->Enable(value);
+			break;
+
 		case IDC_NETWORKED2K: {
 			EnableServerTab(value);
 			wxSpinEvent e;
@@ -850,39 +955,17 @@
 void PrefsUnifiedDlg::OnButtonColorChange(wxCommandEvent& WXUNUSED(event))
 {
 	int index = m_choiceColor->GetSelection();
-	wxColour col = WxColourFromCr( thePrefs::s_colors[index] );
-	col = wxGetColourFromUser( this, col );
+	wxColour col = wxGetColourFromUser( this, CMuleColour(thePrefs::s_colors[index]) );
 	if ( col.Ok() ) {
 		m_buttonColor->SetBackgroundColour( col );
-		thePrefs::s_colors[index] = CrFromWxColour(col);
+		thePrefs::s_colors[index] = CMuleColour(col).GetULong();
 	}
 }
 
 
 void PrefsUnifiedDlg::OnColorCategorySelected(wxCommandEvent& WXUNUSED(evt))
 {
-	m_buttonColor->SetBackgroundColour(
-		WxColourFromCr( thePrefs::s_colors[ m_choiceColor->GetSelection() ] ) );
-}
-
-
-void PrefsUnifiedDlg::OnBrowserChange( wxCommandEvent& evt )
-{
-	wxTextCtrl* textctrl = CastChild( IDC_BROWSERSELF, wxTextCtrl );
-	wxButton* btn = CastChild( IDC_SELBROWSER, wxButton );
-	bool enable =
-		evt.GetSelection() ==
-		(int)CastChild( IDC_BROWSER, wxChoice )->GetCount() - 1;
-
-	if (textctrl) {
-		textctrl->Enable( enable );
-	}
-	if (btn) {
-		btn->Enable( enable );
-	}
-#ifndef __WXMSW__
-	FindWindow( IDC_BROWSERTABS )->Enable( !enable );
-#endif
+	m_buttonColor->SetBackgroundColour(CMuleColour(thePrefs::s_colors[ m_choiceColor->GetSelection() ] ) );
 }
 
 
@@ -913,7 +996,7 @@
 //		break;
 
 	default:
-		wxASSERT(false);
+		wxFAIL;
 		return;
 	}
 
@@ -944,7 +1027,7 @@
 			title = _("Select browser");
 			break;
 		default:
-			wxASSERT( false );
+			wxFAIL;
 			return;
 	}
 	wxString wildcard = CFormat(_("Executable%s"))
@@ -953,7 +1036,7 @@
 #else
 		% wxT("|*");
 #endif
-	
+
 	wxString str = wxFileSelector( title, wxEmptyString, wxEmptyString,
 		wxEmptyString, wildcard, 0, this );
 
@@ -1028,47 +1111,47 @@
 	switch ( event.GetId() ) {
 	case IDC_SLIDER:
 		id = IDC_SLIDERINFO;
-		label = wxString::Format( wxPLURAL("Update delay: %d second", "Update delay: %d seconds", event.GetPosition()), event.GetPosition() );
+		label = CFormat(wxPLURAL("Update delay: %d second", "Update delay: %d seconds", event.GetPosition())) % event.GetPosition();
 		theApp->amuledlg->m_statisticswnd->SetUpdatePeriod(event.GetPosition());
 		theApp->amuledlg->m_kademliawnd->SetUpdatePeriod(event.GetPosition());
 		break;
 
 	case IDC_SLIDER3:
 		id = IDC_SLIDERINFO3;
-		label = wxString::Format( wxPLURAL("Time for average graph: %d minute", "Time for average graph: %d minutes", event.GetPosition()), event.GetPosition() );
+		label = CFormat(wxPLURAL("Time for average graph: %d minute", "Time for average graph: %d minutes", event.GetPosition())) % event.GetPosition();
 		theApp->m_statistics->SetAverageMinutes(event.GetPosition());
 		break;
 
 	case IDC_SLIDER4:
 		id = IDC_SLIDERINFO4;
-		label = wxString::Format( _("Connections Graph Scale: %d"), event.GetPosition() );
-		theApp->amuledlg->m_statisticswnd->GetConnScope()->SetRanges(0,event.GetPosition());
+		label = CFormat(_("Connections Graph Scale: %d")) % event.GetPosition();
+		theApp->amuledlg->m_statisticswnd->GetConnScope()->SetRanges(0, event.GetPosition());
 		break;
 
 	case IDC_SLIDER2:
 		id = IDC_SLIDERINFO2;
-		label = wxString::Format( wxPLURAL("Update delay : %d second", "Update delay : %d seconds", event.GetPosition()), event.GetPosition() );
+		label = CFormat(wxPLURAL("Update delay: %d second", "Update delay: %d seconds", event.GetPosition())) % event.GetPosition();
 		break;
 
 	case IDC_FILEBUFFERSIZE:
 		id = IDC_FILEBUFFERSIZE_STATIC;
 		// Yes, it seems odd to add the singular form here, but other languages might need to know the number to select the appropriate translation
-		label = wxString::Format( wxPLURAL("File Buffer Size: %d byte", "File Buffer Size: %d bytes", event.GetPosition() * 15000), event.GetPosition() * 15000 );
+		label = CFormat(wxPLURAL("File Buffer Size: %d byte", "File Buffer Size: %d bytes", event.GetPosition() * 15000)) % (event.GetPosition() * 15000);
 		break;
 
 	case IDC_QUEUESIZE:
 		id = IDC_QUEUESIZE_STATIC;
 		// Yes, it seems odd to add the singular form here, but other languages might need to know the number to select the appropriate translation
-		label = wxString::Format( wxPLURAL("Upload Queue Size: %d client", "Upload Queue Size: %d clients", event.GetPosition() * 100), event.GetPosition() * 100 );
+		label = CFormat(wxPLURAL("Upload Queue Size: %d client", "Upload Queue Size: %d clients", event.GetPosition() * 100)) % (event.GetPosition() * 100);
 		break;
 
 	case IDC_SERVERKEEPALIVE:
 		id = IDC_SERVERKEEPALIVE_LABEL;
 
 		if ( event.GetPosition() ) {
-			label = wxString::Format( wxPLURAL("Server connection refresh interval: %d minute", "Server connection refresh interval: %d minutes", event.GetPosition()), event.GetPosition() );
+			label = CFormat(wxPLURAL("Server connection refresh interval: %d minute", "Server connection refresh interval: %d minutes", event.GetPosition())) % event.GetPosition();
 		} else {
-			label = wxString::Format( _("Server connection refresh interval: Disabled") );
+			label = _("Server connection refresh interval: Disabled");
 		}
 		break;
 
@@ -1087,13 +1170,13 @@
 
 void PrefsUnifiedDlg::OnRateLimitChanged( wxSpinEvent& event )
 {
-	// Here we do immediate sainity checking of the up/down ratio,
+	// Here we do immediate sanity checking of the up/down ratio,
 	// so that the user can see if his choice is illegal
 
 	// We only do checks if the rate is limited
 	if ( event.GetPosition() != (int)UNLIMITED ) {
 		wxSpinCtrl* dlrate = CastChild( IDC_MAXDOWN, wxSpinCtrl );
-	
+
 		if ( event.GetPosition() < 4 ) {
 			if (	( event.GetPosition() * 3 < dlrate->GetValue() ) ||
 				( dlrate->GetValue() == (int)UNLIMITED ) ) {
@@ -1111,13 +1194,9 @@
 
 void PrefsUnifiedDlg::OnTCPClientPortChange(wxSpinEvent& WXUNUSED(event))
 {
-	wxString txt(_("UDP port for extended server requests (TCP+3): "));
-	if (m_ServerTabVisible) {
-		txt << (CastChild(IDC_PORT, wxSpinCtrl)->GetValue() + 3);
-	} else {
-		txt << _("disabled");
-	}
-	CastChild(ID_TEXT_CLIENT_UDP_PORT, wxStaticText)->SetLabel(txt);
+	CastChild(ID_TEXT_CLIENT_UDP_PORT, wxStaticText)->SetLabel(
+		m_ServerTabVisible ? (wxString() << (CastChild(IDC_PORT, wxSpinCtrl)->GetValue() + 3))
+							: wxString(_("disabled")));
 }
 
 void PrefsUnifiedDlg::OnUserEventSelected(wxListEvent& event)
@@ -1133,9 +1212,14 @@
 	event.Skip();
 }
 
+void PrefsUnifiedDlg::OnLanguageChoice(wxCommandEvent &evt)
+{
+	thePrefs::GetCfgLang()->UpdateChoice(evt.GetSelection());
+}
+
 void PrefsUnifiedDlg::CreateEventPanels(const int idx, const wxString& vars, wxWindow* parent)
 {
-	wxStaticBox *item8 = new wxStaticBox( parent, -1, CFormat(_("Execute command on `%s' event")) % wxGetTranslation(CUserEvents::GetDisplayName(static_cast<enum CUserEvents::EventType>(idx))) );
+	wxStaticBox *item8 = new wxStaticBox( parent, -1, CFormat(_("Execute command on '%s' event")) % wxGetTranslation(CUserEvents::GetDisplayName(static_cast<enum CUserEvents::EventType>(idx))) );
 	wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxVERTICAL );
 
 	wxCheckBox *item9 = new wxCheckBox( parent, USEREVENTS_FIRST_ID + idx * USEREVENTS_IDS_PER_EVENT + 1, _("Enable command execution on core"), wxDefaultPosition, wxDefaultSize, 0 );

aMule-2.2.6.tar.bz2/src/PrefsUnifiedDlg.h -> aMule-2.3.1.tar.bz2/src/PrefsUnifiedDlg.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Original author: Emilio Sandoz
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -116,13 +116,13 @@
 	void OnButtonIPFilterUpdate(wxCommandEvent &event);
 	void OnColorCategorySelected(wxCommandEvent &event);
 	void OnCheckBoxChange(wxCommandEvent &event);
-	void OnBrowserChange(wxCommandEvent &event);
 	void OnPrefsPageChange(wxListEvent& event);
 	void OnToolTipDelayChange(wxSpinEvent& event);
 	void OnScrollBarChange( wxScrollEvent& event );
 	void OnRateLimitChanged( wxSpinEvent& event );
 	void OnTCPClientPortChange(wxSpinEvent& event);
 	void OnUserEventSelected(wxListEvent& event);
+	void OnLanguageChoice(wxCommandEvent &event);
 	void CreateEventPanels(const int idx, const wxString& vars, wxWindow* parent);
 
 	void OnInitDialog( wxInitDialogEvent& evt );

aMule-2.2.6.tar.bz2/src/Proxy.cpp -> aMule-2.3.1.tar.bz2/src/Proxy.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2004-2009 Marcelo Jimenez ( phoenix@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Marcelo Roberto Jimenez ( phoenix@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
@@ -29,7 +29,7 @@
 #include <common/EventIDs.h>
 
 #include "ArchSpecific.h"	/* for ENDIAN_HTONS()		*/
-#include "Logger.h"		/* for AddDebugLogLineM		*/
+#include "Logger.h"		/* for AddDebugLogLineN		*/
 #include "OtherFunctions.h"	/* for EncodeBase64()		*/
 #include <common/StringFunctions.h>	/* for unicode2char */
 
@@ -174,8 +174,8 @@
 		m_peerAddress = new amuleIPV4Address(peer);
 	} catch (const std::bad_cast& WXUNUSED(e)) {
 		// Should process other types of wxIPAddres before quitting
-		AddDebugLogLineM(false, logProxy, wxT("(1)bad_cast exception!"));
-		wxASSERT(false);
+		AddDebugLogLineN(logProxy, wxT("(1)bad_cast exception!"));
+		wxFAIL;
 		return false;
 	}
 	
@@ -190,28 +190,28 @@
 	switch(event)
 	{
 	case wxSOCKET_CONNECTION:
-		AddDebugLogLineM(false, logProxy, wxT("Connection event"));
+		AddDebugLogLineN(logProxy, wxT("Connection event"));
 		m_isConnected = true;
 		break;
 		
 	case wxSOCKET_INPUT:
-		AddDebugLogLineM(false, logProxy, wxT("Input event"));
+		AddDebugLogLineN(logProxy, wxT("Input event"));
 		m_canReceive = true;
 		break;
 		
 	case wxSOCKET_OUTPUT:
-		AddDebugLogLineM(false, logProxy, wxT("Output event"));
+		AddDebugLogLineN(logProxy, wxT("Output event"));
 		m_canSend = true;
 		break;
 		
 	case wxSOCKET_LOST:
-		AddDebugLogLineM(false, logProxy, wxT("Lost connection event"));
+		AddDebugLogLineN(logProxy, wxT("Lost connection event"));
 		m_isLost = true;
 		m_ok = false;
 		break;
 		
 	default:
-		AddDebugLogLineM(false, logProxy, wxT("Unknown event"));
+		AddDebugLogLineN(logProxy, wxT("Unknown event"));
 		break;
 	}
 	
@@ -255,7 +255,7 @@
 	// If that is not true, we are in serious trouble...
 	wxASSERT(s);
 	if (CDatagramSocketProxy *udp = s->GetUDPSocket()) {
-		// The original socket was an UDP socket
+		// The original socket was a UDP socket
 		if(m_ok) {
 			// From now on, the UDP socket can be used,
 			// remove the protection.
@@ -319,6 +319,24 @@
 	return ret;
 }
 
+bool CProxyStateMachine::CanReceive() const	
+{
+#ifdef AMULE_DAEMON
+	return true;
+#else
+	return m_canReceive; 
+#endif
+}
+
+bool CProxyStateMachine::CanSend() const	
+{
+#ifdef AMULE_DAEMON
+	return true;
+#else
+	return m_canSend; 
+#endif
+}
+
 //------------------------------------------------------------------------------
 // CSocks5StateMachine
 //------------------------------------------------------------------------------
@@ -403,7 +421,7 @@
 	if (entry) {
 		DumpMem(m_buffer, n, m_state_name[state], m_ok);
 	} else {
-		AddDebugLogLineM(false, logProxy,
+		AddDebugLogLineN(logProxy,
 			wxString(wxT("wait state -- ")) << m_state_name[state]);
 	}
 #endif // __DEBUG__
@@ -459,7 +477,7 @@
 					break;
 				}
 			} else {
-				AddDebugLogLineM(false, logProxy, wxT("Cant send"));
+				AddDebugLogLineN(logProxy, wxT("Can't send"));
 			}
 		} else {
 			ret = SOCKS5_STATE_END;
@@ -809,7 +827,7 @@
 	if (entry) {
 		DumpMem(m_buffer, n, m_state_name[state], m_ok);
 	} else {
-		AddDebugLogLineM(false, logProxy,
+		AddDebugLogLineN(logProxy,
 			wxString(wxT("wait state -- ")) << m_state_name[state]);
 	}
 #endif // __DEBUG__
@@ -1004,7 +1022,7 @@
 	if (entry) {
 		DumpMem(m_buffer, n, m_state_name[state], m_ok);
 	} else {
-		AddDebugLogLineM(false, logProxy,
+		AddDebugLogLineN(logProxy,
 			wxString(wxT("wait state -- ")) << m_state_name[state]);
 	}
 #endif // __DEBUG__
@@ -1070,7 +1088,7 @@
 		if (m_proxyData.m_enablePassword) {
 			userPass = m_proxyData.m_userName + wxT(":") + m_proxyData.m_password;
 			userPassEncoded =
-				EncodeBase64(unicode2char(userPass), PROXY_BUFFER_SIZE);
+				EncodeBase64(unicode2char(userPass), userPass.Length());
 		}
 		wxString msg;
 		
@@ -1083,9 +1101,8 @@
 				msg << 
 				wxT("Authorization: Basic ")       << userPassEncoded << wxT("\r\n") <<
 				wxT("Proxy-Authorization: Basic ") << userPassEncoded << wxT("\r\n");
-			} else {
-				msg << wxT("\r\n");
 			}
+			msg << wxT("\r\n");
 			break;
 			
 		case PROXY_CMD_BIND:
@@ -1375,9 +1392,9 @@
 					a.Hostname( PeekUInt32( m_proxyTCPSocket.GetBuffer()+4 ) );
 					a.Service( ENDIAN_NTOHS( RawPeekUInt16( m_proxyTCPSocket.GetBuffer()+8) ) );
 				} catch (const std::bad_cast& WXUNUSED(e)) {
-					AddDebugLogLineM(false, logProxy,
+					AddDebugLogLineN(logProxy,
 						wxT("(2)bad_cast exception!"));
-					wxASSERT(false);
+					wxFAIL;
 				}
 			}
 				break;

aMule-2.2.6.tar.bz2/src/Proxy.h -> aMule-2.3.1.tar.bz2/src/Proxy.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2004-2009 Marcelo Jimenez ( phoenix@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Marcelo Roberto Jimenez ( phoenix@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
@@ -254,13 +254,8 @@
 protected:
 	wxSocketBase		&ProxyWrite(wxSocketBase &socket, const void *buffer, wxUint32 nbytes);
 	wxSocketBase		&ProxyRead(wxSocketBase &socket, void *buffer);
-#ifndef AMULE_DAEMON
-	bool			CanReceive() const	{ return m_canReceive; };
-	bool			CanSend() const		{ return m_canSend; };
-#else
-	bool			CanReceive() const	{ return true; };
-	bool			CanSend() const		{ return true; };
-#endif
+	bool		CanReceive() const;
+	bool		CanSend() const;
 	//
 	// Initialized at constructor
 	//

aMule-2.2.6.tar.bz2/src/RC4Encrypt.cpp -> aMule-2.3.1.tar.bz2/src/RC4Encrypt.cpp Changed

aMule-2.2.6.tar.bz2/src/RC4Encrypt.h -> aMule-2.3.1.tar.bz2/src/RC4Encrypt.h Changed

aMule-2.2.6.tar.bz2/src/RLE.cpp -> aMule-2.3.1.tar.bz2/src/RLE.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// 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
@@ -24,7 +24,8 @@
 
 #include "RLE.h"
 #include "ArchSpecific.h"
-
+#include "ScopedPtr.h"
+#include <ec/cpp/ECTag.h>		// Needed for CECTag
 
 /*
  * RLE encoder implementation. This is RLE implementation for very specific
@@ -35,69 +36,62 @@
  * We can't use implementation with "control char" since this encoder
  * will process binary data - not ascii (or unicode) strings
  */
-RLE_Data::RLE_Data(int len, bool use_diff)
+void RLE_Data::setup(int len, bool use_diff, uint8 * content)
 {
 	m_len = len;
 	m_use_diff = use_diff;
-	
-	m_buff = new unsigned char[m_len];
-	memset(m_buff, 0, m_len);
-	//
-	// in worst case 2-byte sequence encoded as 3. So, data can grow at 1/3
-	m_enc_buff = new unsigned char[m_len*4/3 + 1];
-}
-
-RLE_Data::RLE_Data()
-{
-	m_buff = 0;
-	m_enc_buff = 0;
-	m_len = 0;
-	m_use_diff = 0;
-}
-
-RLE_Data::RLE_Data(const RLE_Data &obj)
-{
-	m_len = obj.m_len;
-	m_use_diff = obj.m_use_diff;
 
-	m_buff = new unsigned char[m_len];
-	memcpy(m_buff, obj.m_buff, m_len);
-	
-	m_enc_buff = new unsigned char[m_len*4/3 + 1];
+	if (m_len) {
+		m_buff = new uint8[m_len];
+		if (content) {
+			memcpy(m_buff, content, m_len);
+		} else {
+			memset(m_buff, 0, m_len);
+		}
+		//
+	} else {
+		m_buff = 0;
+	}
 }
 
 RLE_Data &RLE_Data::operator=(const RLE_Data &obj)
 {
-	m_len = obj.m_len;
-	
-	m_use_diff = obj.m_use_diff;
+	if (this == &obj)
+		return *this;
+
+	delete [] m_buff;
+	setup(obj.m_len, obj.m_use_diff, obj.m_buff);
 
-	m_buff = new unsigned char[m_len];
-	memcpy(m_buff, obj.m_buff, m_len);
-	
-	m_enc_buff = new unsigned char[m_len*4/3 + 1];
-	
 	return *this;
 }
 
 RLE_Data::~RLE_Data()
 {
-	if ( m_buff ) {
-		delete [] m_buff;
-	}
-	if ( m_enc_buff ) {
-		delete [] m_enc_buff;
-	}
+	delete [] m_buff;
 }
 
-void RLE_Data::Realloc(int size)
+void RLE_Data::ResetEncoder()
+{
+	delete m_buff;
+	m_len = 0;
+	m_buff = 0;
+}
+
+bool RLE_Data::Realloc(int size)
 {
 	if ( size == m_len ) {
-		return;
+		return false;
 	}
-
-	unsigned char *buff = new unsigned char[size];
-	if ( size > m_len ) {
+	if (size == 0) {
+		delete [] m_buff;
+		m_buff = 0;
+		m_len = 0;
+		return true;
+	}
+	uint8 *buff = new uint8[size];
+	if (m_len == 0) {
+		memset(buff, 0, size);
+	} else if ( size > m_len ) {
 		memset(buff + m_len, 0, size - m_len);
 		memcpy(buff, m_buff, m_len);
 	} else {
@@ -106,95 +100,195 @@
 	delete [] m_buff;
 	m_buff = buff;
 	
-	buff = new unsigned char[size*4/3 + 1];
-	if ( size > m_len ) {
-		memset(buff + m_len*4/3 + 1, 0, (size - m_len)*4/3);
-		memcpy(buff, m_enc_buff, m_len*4/3 + 1);
-	} else {
-		memcpy(buff, m_enc_buff, size*4/3 + 1);
-	}
-	delete [] m_enc_buff;
-	m_enc_buff = buff;
-
 	m_len = size;
+	return true;
 }
 
-const unsigned char *RLE_Data::Decode(const unsigned char *buff, int len)
+const uint8 *RLE_Data::Decode(const uint8 *buff, int len)
 {
-	//
-	// Open RLE
-	//
+	uint8 * decBuf = m_len ? new uint8[m_len] : 0;
 
-	int i = 0, j = 0;
-	while ( j != m_len ) {
-
-		if ( i < (len -1) ) {
-			if (buff[i+1] == buff[i]) {
-				// this is sequence
-				memset(m_enc_buff + j, buff[i], buff[i + 2]);
-				j += buff[i + 2];
+	// If data exceeds the buffer, switch to counting only.
+	// Then resize and make a second pass.
+	for (bool overrun = true; overrun;) {
+		overrun = false;
+		int j = 0;
+		for (int i = 0; i < len;) {
+			if (i < len - 2 && buff[i+1] == buff[i]) {
+				// This is a sequence.
+				uint8 seqLen = buff[i + 2];
+				if (j + seqLen <= m_len) {
+					memset(decBuf + j, buff[i], seqLen);
+				}
+				j += seqLen;
 				i += 3;
 			} else {
-				// this is single byte
-				m_enc_buff[j++] = buff[i++];
+				// This is a single byte.
+				if (j < m_len) {
+					decBuf[j] = buff[i];
+				}
+				j++;
+				i++;
 			}
-		} else {
-			// only 1 byte left in encoded data - it can't be sequence
-			m_enc_buff[j++] = buff[i++];
-			// if there's no more data, but buffer end is not reached,
-			// it must be error in some point
-			if ( j != m_len ) {
-				printf("RLE_Data: decoding error. %d bytes decoded to %d instead of %d\n", len, j, m_len);
+		}
+		if (j != m_len) {
+			overrun = j > m_len;	// overrun, make a second pass
+			Realloc(j);				// size has changed, adjust
+			if (overrun) {
+				delete[] decBuf;
+				decBuf = new uint8[m_len];
 			}
-			break;
 		}
-	}	
+	}
 	//
 	// Recreate data from diff
 	//
 	if ( m_use_diff ) {
 		for (int k = 0; k < m_len; k++) {
-			m_buff[k] ^= m_enc_buff[k];
+			m_buff[k] ^= decBuf[k];
 		}
+	} else {
+		memcpy(m_buff, decBuf, m_len);
 	}
-		
+	delete[] decBuf;
 	return m_buff;
 }
 
-void PartFileEncoderData::Decode(unsigned char *gapdata, int gaplen, unsigned char *partdata, int partlen)
+const uint8 * RLE_Data::Encode(const uint8 *data, int inlen, int &outlen, bool &changed)
 {
-	m_part_status.Decode(partdata, partlen);
+	changed = Realloc(inlen);		// adjust size if necessary
 
-	// in a first dword - real size
-	uint32 gapsize = ENDIAN_NTOHL( RawPeekUInt32( gapdata ) );
-	gapdata += sizeof(uint32);
-	m_gap_status.Realloc(gapsize*2*sizeof(uint64));
+	if (m_len == 0) {
+		outlen = 0;
+		return NULL;
+	}
+	//
+	// calculate difference from prev
+	//
+	if ( m_use_diff ) {
+		for (int i = 0; i < m_len; i++) {
+			m_buff[i] ^= data[i];
+			if (m_buff[i]) {
+				changed = true;
+			}
+		}
+	} else {
+		memcpy(m_buff, data, m_len);
+		changed = true;
+	}
+	
+	//
+	// now RLE
+	//
+	// In worst case 2-byte sequence is encoded as 3. So, data can grow by 50%.
+	uint8 * enc_buff = new uint8[m_len * 3/2 + 1];
+	int i = 0, j = 0;
+	while ( i != m_len ) {
+		uint8 curr_val = m_buff[i];
+		int seq_start = i;
+		while ( (i != m_len) && (curr_val == m_buff[i]) && ((i - seq_start) < 0xff)) {
+			i++;
+		}
+		if (i - seq_start > 1) {
+			// if there's 2 or more equal vals - put it twice in stream
+			enc_buff[j++] = curr_val;
+			enc_buff[j++] = curr_val;
+			enc_buff[j++] = i - seq_start;
+		} else {
+			// single value - put it as is
+			enc_buff[j++] = curr_val;
+		}
+	}
 
-	m_gap_status.Decode(gapdata, gaplen - sizeof(uint32));
+	outlen = j;
+	
+	//
+	// If using differential encoder, remember current data for
+	// later use
+	if ( m_use_diff ) {
+		memcpy(m_buff, data, m_len);
+	}
+	
+	return enc_buff;
 }
 
-unsigned char RLE_Data_BV::m_buff[256];
+const uint8 * RLE_Data::Encode(const ArrayOfUInts16 &data, int &outlen, bool &changed)
+{
+	// To encode, first copy the UInts16 to a uint8 array
+	// and limit them to 0xff.
+	// The encoded size is the size of data.
+	int size = (int) data.size();
+	if (size == 0) {
+		return Encode(0, 0, outlen, changed);
+	}
+	CScopedArray<uint8> buf(size);
+	uint8 * bufPtr = buf.get();
+
+	for (int i = 0; i < size; i++) {
+		uint16 ui = data[i];
+		bufPtr[i] = (ui > 0xff) ? 0xff : (uint8) ui;
+	}
+	return Encode(bufPtr, size, outlen, changed);
+}
 
-RLE_Data_BV::RLE_Data_BV(int len) : m_last_buff(len)
+const uint8 * RLE_Data::Encode(const ArrayOfUInts64 &data, int &outlen, bool &changed)
 {
+	// uint64 is copied to a uint8 buffer
+	// first all low bytes, then all second low bytes and so on
+	// so inital RLE will benefit from high bytes being equal (zero)
+	// 0x000003045A6A7A8A, 0x000003045B6B7B8B
+	// 8A8B7A7B6A6B5A5B0404030300000000
+	int size = (int) data.size();
+	if (size == 0) {
+		return Encode(0, 0, outlen, changed);
+	}
+	CScopedArray<uint8> buf(size * 8);
+	uint8 * bufPtr = buf.get();
+	for (int i = 0; i < size; i++) {
+		uint64 u = data[i];
+		for (int j = 0; j < 8; j++) {
+			bufPtr[i + j * size] = u & 0xff;
+			u >>= 8;
+		}
+	}
+	return Encode(bufPtr, size * 8, outlen, changed);
 }
 
-int RLE_Data_BV::Encode(std::vector<bool> &data)
+void RLE_Data::Decode(const uint8 *data, int len, ArrayOfUInts64 &outdata)
 {
-	unsigned char *curr = m_buff;
-	std::vector<bool>::const_iterator i = data.begin();
-	std::vector<bool>::const_iterator j = m_last_buff.begin();
-	while( i != data.end() ) {
-		unsigned char count = 0;
-		while ( (i != data.end()) && ( (*i ^ *j) == false) ) {
-			count++;
-			i++;
-			j++;
+	const uint8 * decoded = Decode(data, len);
+	wxASSERT(m_len % 8 == 0);
+	int size = m_len / 8;
+	outdata.resize(size);
+	for (int i = 0; i < size; i++) {
+		uint64 u = 0;
+		for (int j = 8; j--;) {
+			u <<= 8;
+			u |= decoded[i + j * size];
 		}
-		*curr++ = count;
+		outdata[i] = u;
 	}
-	m_last_buff = data;
-	return 0;
 }
 
+void PartFileEncoderData::DecodeParts(const CECTag * tag, ArrayOfUInts16 &outdata)
+{
+	const uint8 * buf = m_part_status.Decode((uint8 *)tag->GetTagData(), tag->GetTagDataLen());
+	int size = m_part_status.Size();
+	outdata.resize(size);
+	for (int i = 0; i < size; i++) {
+		outdata[i] = buf[i];
+	}
+}
+
+void PartFileEncoderData::DecodeGaps(const CECTag * tag, ArrayOfUInts64 &outdata)
+{
+	m_gap_status.Decode((uint8 *)tag->GetTagData(), tag->GetTagDataLen(), outdata);
+}
+
+void PartFileEncoderData::DecodeReqs(const CECTag * tag, ArrayOfUInts64 &outdata)
+{
+	m_req_status.Decode((uint8 *)tag->GetTagData(), tag->GetTagDataLen(), outdata);
+}
+
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/RLE.h -> aMule-2.3.1.tar.bz2/src/RLE.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// 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
@@ -35,133 +35,53 @@
 class RLE_Data
 {
 public:
-	RLE_Data(int len, bool use_diff);
+	RLE_Data(int len = 0, bool use_diff = true)	{ setup(len, use_diff); }
 	
 	// those constructors are for stl containers
-	RLE_Data();
-	RLE_Data(const RLE_Data &);
+	RLE_Data(const RLE_Data & obj)	{ setup(obj.m_len, obj.m_use_diff, obj.m_buff); }
 	RLE_Data &operator=(const RLE_Data &);
 	
 	~RLE_Data();
+
+	const uint8 *Encode(const ArrayOfUInts16 &data, int &outlen, bool &changed);
+	const uint8 *Encode(const ArrayOfUInts64 &data, int &outlen, bool &changed);
 	
-	const unsigned char *Encode(unsigned char *data, int &outlen)
-	{
-		return EncodeT<unsigned char *>(data, m_len, outlen);
-	}
-	
-	const unsigned char *Encode(ArrayOfUInts16 &data, int &outlen)
-	{
-		return EncodeT<ArrayOfUInts16>(data, data.size(), outlen);
-	}
-	
-	const unsigned char *Decode(const unsigned char *data, int len);	
+	const uint8 *Decode(const uint8 *data, int len);
+	void Decode(const uint8 *data, int len, ArrayOfUInts64 &outdata);
 	
-	void ResetEncoder()
-	{
-		memset(m_buff, 0, m_len);
-	}
+	void ResetEncoder();
 
-	// change size of internal buffers
-	void Realloc(int size);
-	
 	// decoder will need access to data
-	const unsigned char *Buffer() { return m_buff; }
-	int Size() { return m_len; }
+	const uint8 *Buffer() const	{ return m_buff; }
+	int Size() const	{ return m_len; }
 
-private:	
-	unsigned char *m_buff, *m_enc_buff;
-	bool m_use_diff;
-	int m_len, m_enc_len;
-	
-	// data is bounded by srclen. everything above considered == 0
-	template <class T> const unsigned char *EncodeT(T &buff, int srclen, int &outlen)
-	{
-		//
-		// calculate difference from prev
-		//
-		if ( m_use_diff ) {
-			for (int i = 0; i < m_len; i++) {
-				m_buff[i] ^= (i < srclen ) ? ((unsigned char)buff[i]) : 0;
-			}
-		} else {
-			//
-			// can't use memcpy - in case of generic class T this
-			// will rely on "operator []" implementation
-			for(int i = 0; i < m_len;i++) {
-				m_buff[i] = (i < srclen ) ? ((unsigned char)buff[i]) : 0;
-			}
-		}
-		
-		//
-		// now RLE
-		//
-		int i = 0, j = 0;
-		while ( i != m_len ) {
-			unsigned char curr_val = m_buff[i];
-			int seq_start = i;
-			while ( (i != m_len) && (curr_val == m_buff[i]) && ((i - seq_start) < 0xff)) {
-				i++;
-			}
-			if (i - seq_start > 1) {
-				// if there's 2 or more equal vals - put it twice in stream
-				m_enc_buff[j++] = curr_val;
-				m_enc_buff[j++] = curr_val;
-				m_enc_buff[j++] = i - seq_start;
-			} else {
-				// single value - put it as is
-				m_enc_buff[j++] = curr_val;
-			}
-		}
-
-		outlen = j;
-		
-		//
-		// If using differential encoder, remember current data for
-		// later use
-		if ( m_use_diff ) {
-			//
-			// can't use memcpy - in case of generic class T this
-			// will rely on "operator []" implementation
-			for(int k = 0; k < m_len;k++) {
-				m_buff[k] = (k < srclen ) ? ((unsigned char)buff[k]) : 0;
-			}
-		}
-		
-		return m_enc_buff;
-	}
-};
+private:
+	void setup(int len, bool use_diff, uint8 * content = 0);
 
+	// change size of internal buffers
+	// returns true if size was changed
+	bool Realloc(int size);
 
-/*
- * Another implementation of RLE, optimized for bit-vector. In this RLE flavor we
- * have only 2 values, so we don't need to transmit the value itself. Since most
- * of the time, bitmap will contail all zeros with few 1's, only zeros will be encoded.
- * Meaning that '0000110010000' is encoded as '4024'
- */
-class RLE_Data_BV
-{
-public:
-	RLE_Data_BV(int len);
-	RLE_Data_BV();
-	RLE_Data_BV(const RLE_Data_BV &);
-	
-	~RLE_Data_BV();
-	
-	RLE_Data_BV &operator=(const RLE_Data_BV &);
-	
-	int Encode(std::vector<bool> &data);
-	void Decode(unsigned char *data, int datalen, std::vector<bool> &outbuff);
-	
-	const unsigned char *Buffer() { return m_buff; }
-private:
-	// maximum file size in amule is 4G since it uses uint32 as filesize. So, it
-	// can be up to 4Gb/PARTSIZE=442 parts. Worst case is 1/0 interleaving,
-	// producing 221 byte RLE encoded output.
-	static unsigned char m_buff[256];
+	//
+	// Encode some raw data
+	//
+	// data:	block to encode
+	// inlen:	number of bytes to encode. May be zero, then data can also be 0.
+	// outlen:	here the number of encoded bytes gets stored (0 if inlen is 0)
+	// changed:	becomes true if the size has changed or a change in the data occured,
+	//          so the differential data (before encoding) is not all zero
+	//
+	// return:	new buffer with encoded data, must be deleted after use!
+	//
+	const uint8 *Encode(const uint8 *data, int inlen, int &outlen, bool &changed);
 
-	std::vector<bool> m_last_buff;
-	
-	void Realloc(int size);
+	// Encode: source data (original or diff in diff mode)
+	// Decode: store decoded data
+	uint8 *m_buff;
+	// Unpacked size
+	int m_len;
+	// Use differential encoding
+	bool m_use_diff;
 };
 
 
@@ -169,40 +89,20 @@
  * Data difference is different for each EC client
  */
 class PartFileEncoderData {
-public:
+protected:
+	// number of sources for each part for progress bar colouring
 	RLE_Data m_part_status;
+	// gap list
 	RLE_Data m_gap_status;
-	
-	//
-	// Encoder may reset history if full info requested
-	void ResetEncoder()
-	{
-		m_part_status.ResetEncoder();
-		m_gap_status.ResetEncoder();
-	}
-	
+	// blocks requested for download
+	RLE_Data m_req_status;
+
+public:
 	//
 	// decoder side - can be used everywhere
-	void Decode(unsigned char *gapdata, int gaplen, unsigned char *partdata, int partlen);
-	
-	PartFileEncoderData() { }
-	PartFileEncoderData(int part_count, int gap_count) :
-		m_part_status(part_count, true), m_gap_status(gap_count*sizeof(uint64), true)
-	{
-	}
-		
-	// for stl
-	PartFileEncoderData(const PartFileEncoderData &obj) :
-		m_part_status(obj.m_part_status), m_gap_status(obj.m_gap_status)
-	{
-	}
-	
-	PartFileEncoderData &operator=(const PartFileEncoderData &obj)
-	{
-		m_part_status = obj.m_part_status;
-		m_gap_status = obj.m_gap_status;
-		return *this;
-	}
+	void DecodeParts(const class CECTag * tag, ArrayOfUInts16 &outdata);
+	void DecodeGaps(const class CECTag * tag, ArrayOfUInts64 &outdata);
+	void DecodeReqs(const class CECTag * tag, ArrayOfUInts64 &outdata);
 };
 
 #endif

aMule-2.2.6.tar.bz2/src/RandomFunctions.cpp -> aMule-2.3.1.tar.bz2/src/RandomFunctions.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// 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
@@ -26,24 +26,39 @@
 // You can check libYaMa at http://personal.pavanashree.org/libyama/
 
 #include "RandomFunctions.h"	// Interface declarations
+#include "CryptoPP_Inc.h"	// Needed for Crypto functions
 
 static CryptoPP::AutoSeededRandomPool cryptRandomGen;
 
 const CryptoPP::AutoSeededRandomPool& GetRandomPool() { return cryptRandomGen; }
 
-uint8 GetRandomUint8()
+uint8_t GetRandomUint8()
 {
 	return cryptRandomGen.GenerateByte();
 }
 
-uint16 GetRandomUint16()
+uint16_t GetRandomUint16()
 {
-	return (uint16)cryptRandomGen.GenerateWord32(0x0000, 0xFFFF);
+	return (uint16_t)cryptRandomGen.GenerateWord32(0x0000, 0xFFFF);
 }
 
-uint32 GetRandomUint32()
+uint32_t GetRandomUint32()
 {
 	return cryptRandomGen.GenerateWord32();
 }
 
+uint64_t GetRandomUint64()
+{
+	return ((uint64_t)GetRandomUint32() << 32) + GetRandomUint32();
+}
+
+namespace Kademlia {
+	CUInt128 GetRandomUint128()
+	{
+		uint8_t randomBytes[16];
+		cryptRandomGen.GenerateBlock(randomBytes, 16);
+		return CUInt128(randomBytes);
+	}
+}
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/RandomFunctions.h -> aMule-2.3.1.tar.bz2/src/RandomFunctions.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// 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
@@ -25,18 +25,25 @@
 #ifndef RANDOMFUNCTIONS_H
 #define RANDOMFUNCTIONS_H
 
-#include "Types.h"		// Needed for uint16, uint32 and uint64
-#include "CryptoPP_Inc.h"	// Needed for Crypto functions
+#include "Types.h"			// Needed for uint16, uint32 and uint64
+#include "kademlia/utils/UInt128.h"	// Needed for CUInt128
+
+namespace CryptoPP {
+	class AutoSeededRandomPool;
+}
+const CryptoPP::AutoSeededRandomPool& GetRandomPool();
 
 /* 
  * Random numbers generation
  */
  
-const CryptoPP::AutoSeededRandomPool& GetRandomPool();
-
-uint8 GetRandomUint8();
-uint16 GetRandomUint16();
-uint32 GetRandomUint32();
+uint8_t GetRandomUint8();
+uint16_t GetRandomUint16();
+uint32_t GetRandomUint32();
+uint64_t GetRandomUint64();
+namespace Kademlia {
+	CUInt128 GetRandomUint128();
+}
 
 #endif // RANDOMFUNCTIONS_H
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/RangeMap.h -> aMule-2.3.1.tar.bz2/src/RangeMap.h Changed

aMule-2.2.6.tar.bz2/src/SHA.cpp -> aMule-2.3.1.tar.bz2/src/SHA.cpp Changed

aMule-2.2.6.tar.bz2/src/SHA.h -> aMule-2.3.1.tar.bz2/src/SHA.h Changed

aMule-2.2.6.tar.bz2/src/SHAHashSet.cpp -> aMule-2.3.1.tar.bz2/src/SHAHashSet.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -107,7 +107,7 @@
 		return this;
 	} else if (m_nDataSize <= m_nBaseSize) { // sanity
 		// this is already the last level, cant go deeper
-		wxASSERT( false );
+		wxFAIL;
 		return NULL;
 	} else {
 		uint64 nBlocks = m_nDataSize / m_nBaseSize + ((m_nDataSize % m_nBaseSize != 0 )? 1:0); 
@@ -115,7 +115,7 @@
 		uint64 nRight = m_nDataSize - nLeft;
 		if (nStartPos < nLeft) {
 			if (nStartPos + nSize > nLeft) { // sanity
-				wxASSERT ( false );
+				wxFAIL;
 				return NULL;
 			}
 			
@@ -129,7 +129,7 @@
 		} else {
 			nStartPos -= nLeft;
 			if (nStartPos + nSize > nRight) { // sanity
-				wxASSERT ( false );
+				wxFAIL;
 				return NULL;
 			}
 			
@@ -146,12 +146,11 @@
 
 
 // recursive
-// calculates missing hash fromt he existing ones
+// calculates missing hash from the existing ones
 // overwrites existing hashs
 // fails if no hash is found for any branch
 bool CAICHHashTree::ReCalculateHash(CAICHHashAlgo* hashalg, bool bDontReplace)
 {
-	wxASSERT ( !( (m_pLeftTree != NULL) ^ (m_pRightTree != NULL)) ); 
 	if (m_pLeftTree && m_pRightTree) {
 		if ( !m_pLeftTree->ReCalculateHash(hashalg, bDontReplace) || !m_pRightTree->ReCalculateHash(hashalg, bDontReplace) ) {
 			return false;
@@ -169,15 +168,18 @@
 		} else {
 			return m_bHashValid;
 		}
-	} else {
+	} else if (m_pLeftTree == NULL && m_pRightTree == NULL) {
 		return true;
+	} else {
+		AddDebugLogLineN(logSHAHashSet, wxT("ReCalculateHash failed - Hashtree incomplete"));
+		return false;
 	}
 }
 
 bool CAICHHashTree::VerifyHashTree(CAICHHashAlgo* hashalg, bool bDeleteBadTrees)
 {
 	if (!m_bHashValid) {
-		wxASSERT ( false );
+		wxFAIL;
 		if (bDeleteBadTrees) {
 			if (m_pLeftTree) {
 				delete m_pLeftTree;
@@ -188,7 +190,7 @@
 				m_pRightTree = NULL;
 			}
 		}
-		AddDebugLogLineM( false, logSHAHashSet, wxT("VerifyHashTree - No masterhash available"));
+		AddDebugLogLineN(logSHAHashSet, wxT("VerifyHashTree - No masterhash available"));
 		return false;
 	}
 	
@@ -212,7 +214,7 @@
 					m_pRightTree = NULL;
 				}
 			}
-			AddDebugLogLineM( false, logSHAHashSet, wxT("VerifyHashSet failed - Hashtree incomplete"));
+			AddDebugLogLineN(logSHAHashSet, wxT("VerifyHashSet failed - Hashtree incomplete"));
 			return false;
 		}
 	if ((m_pRightTree && m_pRightTree->m_bHashValid) && (m_pLeftTree && m_pLeftTree->m_bHashValid)) {			
@@ -250,15 +252,15 @@
 	wxASSERT ( nSize <= EMBLOCKSIZE );
 	CAICHHashTree* pToInsert = FindHash(nStartPos, nSize);
 	if (pToInsert == NULL) { // sanity
-		wxASSERT ( false );
-		AddDebugLogLineM( false, logSHAHashSet, wxT("Critical Error: Failed to Insert SHA-HashBlock, FindHash() failed!"));
+		wxFAIL;
+		AddDebugLogLineN(logSHAHashSet, wxT("Critical Error: Failed to Insert SHA-HashBlock, FindHash() failed!"));
 		return;
 	}
 	
 	//sanity
 	if (pToInsert->m_nBaseSize != EMBLOCKSIZE || pToInsert->m_nDataSize != nSize) {
-		wxASSERT ( false );
-		AddDebugLogLineM( false, logSHAHashSet, wxT("Critical Error: Logical error on values in SetBlockHashFromData"));
+		wxFAIL;
+		AddDebugLogLineN(logSHAHashSet, wxT("Critical Error: Logical error on values in SetBlockHashFromData"));
 		return;
 	}
 
@@ -278,7 +280,7 @@
 		return WriteLowestLevelHashs(fileDataOut, wHashIdent, false, b32BitIdent);
 	} else if (m_nDataSize <= m_nBaseSize) { // sanity
 		// this is already the last level, cant go deeper
-		wxASSERT( false );
+		wxFAIL;
 		return false;
 	} else {
 		wHashIdent <<= 1;
@@ -288,12 +290,12 @@
 		uint64 nLeft = ( ((m_bIsLeftBranch) ? nBlocks+1:nBlocks) / 2)* m_nBaseSize;
 		uint64 nRight = m_nDataSize - nLeft;
 		if (m_pLeftTree == NULL || m_pRightTree == NULL) {
-			wxASSERT( false );
+			wxFAIL;
 			return false;
 		}
 		if (nStartPos < nLeft) {
 			if (nStartPos + nSize > nLeft || !m_pRightTree->m_bHashValid) { // sanity
-				wxASSERT ( false );
+				wxFAIL;
 				return false;
 			}
 			m_pRightTree->WriteHash(fileDataOut, wHashIdent, b32BitIdent);
@@ -301,7 +303,7 @@
 		} else {
 			nStartPos -= nLeft;
 			if (nStartPos + nSize > nRight || !m_pLeftTree->m_bHashValid) { // sanity
-				wxASSERT ( false );
+				wxFAIL;
 				return false;
 			}
 			m_pLeftTree->WriteHash(fileDataOut, wHashIdent, b32BitIdent);
@@ -346,11 +348,11 @@
 			m_Hash.Write(fileDataOut);
 			return true;
 		} else {
-			wxASSERT( false );
+			wxFAIL;
 			return false;
 		}
 	} else if (m_pLeftTree == NULL || m_pRightTree == NULL) {
-		wxASSERT( false );
+		wxFAIL;
 		return false;
 	} else {
 		return m_pLeftTree->WriteLowestLevelHashs(fileDataOut, wHashIdent, bNoIdent, b32BitIdent)
@@ -396,7 +398,7 @@
 			wHashIdent <<= 1;
 		}
 		if (i > 31) {
-			AddDebugLogLineM( false, logSHAHashSet, wxT("CAICHHashTree::SetHash - found invalid HashIdent (0)"));
+			AddDebugLogLineN(logSHAHashSet, wxT("CAICHHashTree::SetHash - found invalid HashIdent (0)"));
 			return false;
 		} else {
 			nLevel = 31 - i;
@@ -414,7 +416,7 @@
 		return true;
 	} else if (m_nDataSize <= m_nBaseSize) { // sanity
 		// this is already the last level, cant go deeper
-		wxASSERT( false );
+		wxFAIL;
 		return false;
 	} else {
 		// adjust ident to point the path to the next node
@@ -470,16 +472,16 @@
 {
 	wxASSERT( m_pOwner );
 	if (m_pOwner->IsPartFile() || m_eStatus != AICH_HASHSETCOMPLETE) {
-		wxASSERT( false );
+		wxFAIL;
 		return false;
 	}
 	if (m_pHashTree.m_nDataSize <= EMBLOCKSIZE) {
-		wxASSERT( false );
+		wxFAIL;
 		return false;
 	}
 	if (!bDbgDontLoad) {
 		if (!LoadHashSet()) {
-			AddDebugLogLineM(false, logSHAHashSet,
+			AddDebugLogLineN(logSHAHashSet,
 				CFormat(wxT("Created RecoveryData error: failed to load hashset. File: %s")) % m_pOwner->GetFileName());
 			SetStatus(AICH_ERROR);
 			return false;
@@ -500,8 +502,8 @@
 	uint64 nCheckFilePos = fileDataOut->GetPosition();
 	if (m_pHashTree.CreatePartRecoveryData(nPartStartPos, nPartSize, fileDataOut, 0, bUse32BitIdentifier)) {
 		if (nHashsToWrite*(HASHSIZE+(bUse32BitIdentifier? 4u:2u)) != fileDataOut->GetPosition() - nCheckFilePos) {
-			wxASSERT( false );
-			AddDebugLogLineM( false, logSHAHashSet,
+			wxFAIL;
+			AddDebugLogLineN( logSHAHashSet,
 				CFormat(wxT("Created RecoveryData has wrong length. File: %s")) % m_pOwner->GetFileName() );
 			bResult = false;
 			SetStatus(AICH_ERROR);
@@ -509,7 +511,7 @@
 			bResult = true;
 		}
 	} else {
-		AddDebugLogLineM(false, logSHAHashSet,
+		AddDebugLogLineN(logSHAHashSet,
 			CFormat(wxT("Failed to create RecoveryData for '%s'")) % m_pOwner->GetFileName());
 		bResult = false;
 		SetStatus(AICH_ERROR);
@@ -527,7 +529,7 @@
 bool CAICHHashSet::ReadRecoveryData(uint64 nPartStartPos, CMemFile* fileDataIn)
 {
 	if (/*eMule TODO !m_pOwner->IsPartFile() ||*/ !(m_eStatus == AICH_VERIFIED || m_eStatus == AICH_TRUSTED) ) {
-		wxASSERT( false );
+		wxFAIL;
 		return false;
 	}
 	
@@ -550,7 +552,7 @@
 	uint16 nHashsAvailable = fileDataIn->ReadUInt16();
 	if (fileDataIn->GetLength()-fileDataIn->GetPosition() < nHashsToRead*(HASHSIZE+2u) || (nHashsToRead != nHashsAvailable && nHashsAvailable != 0)) {
 		// this check is redunant, CSafememfile would catch such an error too
-		AddDebugLogLineM( false, logSHAHashSet,
+		AddDebugLogLineN(logSHAHashSet,
 			CFormat(wxT("Failed to read RecoveryData for '%s' - Received datasize/amounts of hashs was invalid"))
 				% m_pOwner->GetFileName());
 		return false;
@@ -560,10 +562,10 @@
 		if (wHashIdent == 1 /*never allow masterhash to be overwritten*/
 			|| !m_pHashTree.SetHash(fileDataIn, wHashIdent,(-1), false))
 		{
-			AddDebugLogLineM( false, logSHAHashSet,
+			AddDebugLogLineN(logSHAHashSet,
 				CFormat(wxT("Failed to read RecoveryData for '%s' - Error when trying to read hash into tree"))
 					% m_pOwner->GetFileName());
-			VerifyHashTree(true); // remove invalid hashs which we have already written
+			VerifyHashTree(true); // remove invalid hashes which we have already written
 			return false;
 		}
 	}
@@ -586,7 +588,7 @@
 				|| !m_pHashTree.SetHash(fileDataIn, wHashIdent,(-1), false))
 			{
 // TODO:		theApp->QueueDebugLogLine(/*DLP_VERYHIGH,*/ false, _T("Failed to read RecoveryData for %s - Error when trying to read hash into tree (2)"), m_pOwner->GetFileName() );
-				VerifyHashTree(true); // remove invalid hashs which we have already written
+				VerifyHashTree(true); // remove invalid hashes which we have already written
 				return false;
 			}
 		}
@@ -603,8 +605,8 @@
 		for (uint32 nPartPos = 0; nPartPos < nPartSize; nPartPos += EMBLOCKSIZE) {
 			CAICHHashTree* phtToCheck = m_pHashTree.FindHash(nPartStartPos+nPartPos, min<uint64>(EMBLOCKSIZE, nPartSize-nPartPos));
 			if (phtToCheck == NULL || !phtToCheck->m_bHashValid) {
-				AddDebugLogLineM( false, logSHAHashSet,
-					CFormat(wxT("Failed to read RecoveryData for '%s' - Error while verifying presence of all lowest level hashs"))
+				AddDebugLogLineN(logSHAHashSet,
+					CFormat(wxT("Failed to read RecoveryData for '%s' - Error while verifying presence of all lowest level hashes"))
 						% m_pOwner->GetFileName());
 				return false;
 			}
@@ -612,7 +614,7 @@
 		// all done
 		return true;
 	} else {
-		AddDebugLogLineM(false, logSHAHashSet,
+		AddDebugLogLineN(logSHAHashSet,
 			CFormat(wxT("Failed to read RecoveryData for '%s' - Verifying received hashtree failed"))
 				% m_pOwner->GetFileName());
 		return false;
@@ -624,11 +626,11 @@
 bool CAICHHashSet::SaveHashSet()
 {
 	if (m_eStatus != AICH_HASHSETCOMPLETE) {
-		wxASSERT( false );
+		wxFAIL;
 		return false;
 	}
 	if ( !m_pHashTree.m_bHashValid || m_pHashTree.m_nDataSize != m_pOwner->GetFileSize()) {
-		wxASSERT( false );
+		wxFAIL;
 		return false;
 	}
 
@@ -639,7 +641,7 @@
 
 		CFile file(fullpath, exists ? CFile::read_write : CFile::write);
 		if (!file.IsOpened()) {
-			AddDebugLogLineM( true, logSHAHashSet, wxT("Failed to save HashSet: opening met file failed!"));
+			AddDebugLogLineC(logSHAHashSet, wxT("Failed to save HashSet: opening met file failed!"));
 			return false;
 		}
 
@@ -647,11 +649,11 @@
 		if (nExistingSize) {
 			uint8 header = file.ReadUInt8();
 			if (header != KNOWN2_MET_VERSION) {
-				AddDebugLogLineM( true, logSHAHashSet, wxT("Saving failed: Current file is not a met-file!"));
+				AddDebugLogLineC(logSHAHashSet, wxT("Saving failed: Current file is not a met-file!"));
 				return false;
 			}
 			
-			AddDebugLogLineM( false, logSHAHashSet, wxString::Format(wxT("Met file is version 0x%2.2x."),header));
+			AddDebugLogLineN(logSHAHashSet, CFormat(wxT("Met file is version 0x%2.2x.")) % header);
 		} else {
 			file.WriteUInt8(KNOWN2_MET_VERSION);
 			// Update the recorded size, in order for the sanity check below to work.
@@ -668,7 +670,7 @@
 			}
 			uint32 nHashCount = file.ReadUInt32();
 			if (file.GetPosition() + nHashCount*HASHSIZE > nExistingSize) {
-				AddDebugLogLineM( true, logSHAHashSet, wxT("Saving failed: File contains fewer entries than specified!"));
+				AddDebugLogLineC(logSHAHashSet, wxT("Saving failed: File contains fewer entries than specified!"));
 				return false;
 			}
 			// skip the rest of this hashset
@@ -685,18 +687,18 @@
 		if (!m_pHashTree.WriteLowestLevelHashs(&file, 0, true, true)) {
 			// thats bad... really
 			file.SetLength(nExistingSize);
-			AddDebugLogLineM( true, logSHAHashSet, wxT("Failed to save HashSet: WriteLowestLevelHashs() failed!"));
+			AddDebugLogLineC(logSHAHashSet, wxT("Failed to save HashSet: WriteLowestLevelHashs() failed!"));
 			return false;
 		}
 		if (file.GetLength() != nExistingSize + (nHashCount+1)*HASHSIZE + 4) {
 			// thats even worse
 			file.SetLength(nExistingSize);
-			AddDebugLogLineM( true, logSHAHashSet, wxT("Failed to save HashSet: Calculated and real size of hashset differ!"));
+			AddDebugLogLineC(logSHAHashSet, wxT("Failed to save HashSet: Calculated and real size of hashset differ!"));
 			return false;
 		}
-		AddDebugLogLineM( false, logSHAHashSet, wxString::Format(wxT("Sucessfully saved eMuleAC Hashset, %u Hashs + 1 Masterhash written"), nHashCount));
+		AddDebugLogLineN(logSHAHashSet, CFormat(wxT("Successfully saved eMuleAC Hashset, %u Hashs + 1 Masterhash written")) % nHashCount);
 	} catch (const CSafeIOException& e) {
-		AddDebugLogLineM(true, logSHAHashSet, wxT("IO error while saving AICH HashSet: ") + e.what());
+		AddDebugLogLineC(logSHAHashSet, wxT("IO error while saving AICH HashSet: ") + e.what());
 		return false;
 	}
 			
@@ -708,11 +710,11 @@
 bool CAICHHashSet::LoadHashSet()
 {
 	if (m_eStatus != AICH_HASHSETCOMPLETE) {
-		wxASSERT( false );
+		wxFAIL;
 		return false;
 	}
 	if ( !m_pHashTree.m_bHashValid || m_pHashTree.m_nDataSize != m_pOwner->GetFileSize() || m_pHashTree.m_nDataSize == 0) {
-		wxASSERT( false );
+		wxFAIL;
 		return false;
 	}
 	wxString fullpath = theApp->ConfigDir + KNOWN2_MET_FILENAME;
@@ -720,7 +722,7 @@
 	if (!file.IsOpened()) {
 		if (wxFileExists(fullpath)) {
 			wxString strError(wxT("Failed to load ") KNOWN2_MET_FILENAME wxT(" file"));
-			AddDebugLogLineM( true, logSHAHashSet, strError);
+			AddDebugLogLineC(logSHAHashSet, strError);
 		}
 		return false;
 	}
@@ -728,7 +730,7 @@
 	try {
 		uint8 header = file.ReadUInt8();
 		if (header != KNOWN2_MET_VERSION) {
-			AddDebugLogLineM( true, logSHAHashSet, wxT("Loading failed: Current file is not a met-file!"));
+			AddDebugLogLineC(logSHAHashSet, wxT("Loading failed: Current file is not a met-file!"));
 			return false;
 		}		
 		
@@ -745,34 +747,34 @@
 				}
 				nHashCount = file.ReadUInt32();
 				if (nHashCount != nExpectedCount) {
-					AddDebugLogLineM( true, logSHAHashSet, wxT("Failed to load HashSet: Available Hashs and expected hashcount differ!"));
+					AddDebugLogLineC(logSHAHashSet, wxT("Failed to load HashSet: Available Hashs and expected hashcount differ!"));
 					return false;
 				}
 				if (!m_pHashTree.LoadLowestLevelHashs(&file)) {
-					AddDebugLogLineM( true, logSHAHashSet, wxT("Failed to load HashSet: LoadLowestLevelHashs failed!"));
+					AddDebugLogLineC(logSHAHashSet, wxT("Failed to load HashSet: LoadLowestLevelHashs failed!"));
 					return false;
 				}
 				if (!ReCalculateHash(false)) {
-					AddDebugLogLineM( true, logSHAHashSet, wxT("Failed to load HashSet: Calculating loaded hashs failed!"));
+					AddDebugLogLineC(logSHAHashSet, wxT("Failed to load HashSet: Calculating loaded hashs failed!"));
 					return false;
 				}
 				if (CurrentHash != m_pHashTree.m_Hash) {
-					AddDebugLogLineM( true, logSHAHashSet, wxT("Failed to load HashSet: Calculated Masterhash differs from given Masterhash - hashset corrupt!"));
+					AddDebugLogLineC(logSHAHashSet, wxT("Failed to load HashSet: Calculated Masterhash differs from given Masterhash - hashset corrupt!"));
 					return false;
 				}
 				return true;
 			}
 			nHashCount = file.ReadUInt32();
 			if (file.GetPosition() + nHashCount*HASHSIZE > nExistingSize) {
-				AddDebugLogLineM( true, logSHAHashSet, wxT("Saving failed: File contains fewer entries than specified!"));
+				AddDebugLogLineC(logSHAHashSet, wxT("Saving failed: File contains fewer entries than specified!"));
 				return false;
 			}
 			// skip the rest of this hashset
 			file.Seek(nHashCount*HASHSIZE, wxFromCurrent);
 		}
-		AddDebugLogLineM( true, logSHAHashSet, wxT("Failed to load HashSet: HashSet not found!"));
+		AddDebugLogLineC(logSHAHashSet, wxT("Failed to load HashSet: HashSet not found!"));
 	} catch (const CSafeIOException& e) {
-		AddDebugLogLineM(true, logSHAHashSet, wxT("IO error while loading AICH HashSet: ") + e.what());
+		AddDebugLogLineC(logSHAHashSet, wxT("IO error while loading AICH HashSet: ") + e.what());
 	}
 
 	return false;
@@ -865,15 +867,15 @@
 		}
 	}
 	if (nMostTrustedPos == (-1) || nSigningIPsTotal == 0) {
-		wxASSERT( false );
+		wxFAIL;
 		return;
 	}
 	// the check if we trust any hash
 	if ( thePrefs::IsTrustingEveryHash() ||
 		(nMostTrustedIPs >= MINUNIQUEIPS_TOTRUST && (100 * nMostTrustedIPs)/nSigningIPsTotal >= MINPERCENTAGE_TOTRUST)) {
 		//trusted
-		AddDebugLogLineM(false, logSHAHashSet, 
-			CFormat(wxT("IACH Hash received (%sadded), We have now %u hash(es) from %u unique IP(s). ")
+		AddDebugLogLineN(logSHAHashSet,
+			CFormat(wxT("AICH Hash received (%sadded), We have now %u hash(es) from %u unique IP(s). ")
 			   		wxT("We trust the Hash %s from %u client(s) (%u%%). File: %s"))
 				% (bAdded ? wxT("") : wxT("not "))
 				% m_aUntrustedHashs.size()
@@ -890,9 +892,9 @@
 		}
 	} else {
 		// untrusted
-		AddDebugLogLineM(false, logSHAHashSet,
-			CFormat(wxT("IACH Hash received (%sadded), We have now %u hash(es) from %u unique IP(s). ")
-					wxT("Best Hash %s from %u clients (%u%%) - but we dont trust it yet. File: %s"))
+		AddDebugLogLineN(logSHAHashSet,
+			CFormat(wxT("AICH Hash received (%sadded), We have now %u hash(es) from %u unique IP(s). ")
+					wxT("Best Hash %s from %u clients (%u%%) - but we don't trust it yet. File: %s"))
 				% (bAdded ? wxT(""): wxT("not "))
 				% m_aUntrustedHashs.size()
 				% nSigningIPsTotal
@@ -907,37 +909,36 @@
 			FreeHashSet();
 		}
 	}
+	if (bAdded) {}	// get rid of unused variable warning
 }
 
-#ifndef CLIENT_GUI
 
 void CAICHHashSet::ClientAICHRequestFailed(CUpDownClient* pClient)
 {
 	pClient->SetReqFileAICHHash(NULL);
 	CAICHRequestedData data = GetAICHReqDetails(pClient);
 	RemoveClientAICHRequest(pClient);
-	if (data.m_pClient != pClient) {
+	if (data.m_pClient.GetClient() != pClient) {
 		return;
 	}
 	if( theApp->downloadqueue->IsPartFile(data.m_pPartFile)) {
-		AddDebugLogLineM(false, logSHAHashSet,
-			CFormat(wxT("IACH Request failed, Trying to ask another client (File: '%s', Part: %u, Client '%s'"))
+		AddDebugLogLineN(logSHAHashSet,
+			CFormat(wxT("AICH Request failed, Trying to ask another client (File: '%s', Part: %u, Client '%s'"))
 				% data.m_pPartFile->GetFileName() % data.m_nPart % pClient->GetClientFullInfo());
 		data.m_pPartFile->RequestAICHRecovery(data.m_nPart);
 	}
 }
 
-#endif
 
 void CAICHHashSet::RemoveClientAICHRequest(const CUpDownClient* pClient)
 {
 	for (CAICHRequestedDataList::iterator it = m_liRequestedData.begin();it != m_liRequestedData.end(); ++it) {
-		if (it->m_pClient == pClient) {
+		if (it->m_pClient.GetClient() == pClient) {
 			m_liRequestedData.erase(it);
 			return;
 		}
 	}
-	wxASSERT( false );
+	wxFAIL;
 }
 
 bool CAICHHashSet::IsClientRequestPending(const CPartFile* pForFile, uint16 nPart)
@@ -953,11 +954,11 @@
 CAICHRequestedData CAICHHashSet::GetAICHReqDetails(const  CUpDownClient* pClient)
 {
 	for (CAICHRequestedDataList::iterator it = m_liRequestedData.begin();it != m_liRequestedData.end(); ++it) {
-		if (it->m_pClient == pClient) {
+		if (it->m_pClient.GetClient() == pClient) {
 			return *(it);
 		}
 	}	
-	wxASSERT( false );
+	wxFAIL;
 	CAICHRequestedData empty;
 	return empty;
 }
@@ -965,7 +966,7 @@
 bool CAICHHashSet::IsPartDataAvailable(uint64 nPartStartPos)
 {
 	if (!(m_eStatus == AICH_VERIFIED || m_eStatus == AICH_TRUSTED || m_eStatus == AICH_HASHSETCOMPLETE) ) {
-		wxASSERT( false );
+		wxFAIL;
 		return false;
 	}
 	uint64 nPartSize = min<uint64>(PARTSIZE, m_pOwner->GetFileSize()-nPartStartPos);

aMule-2.2.6.tar.bz2/src/SHAHashSet.h -> aMule-2.3.1.tar.bz2/src/SHAHashSet.h Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -76,6 +76,7 @@
 #include <set>
 
 #include "Types.h"
+#include "ClientRef.h"
 
 #define HASHSIZE			20
 #define KNOWN2_MET_FILENAME		wxT("known2_64.met")
@@ -210,7 +211,6 @@
 	{
 		m_nPart = 0;
 		m_pPartFile = NULL;
-		m_pClient= NULL;
 	}
 	CAICHRequestedData& operator=(const CAICHRequestedData& k1)
 	{
@@ -221,7 +221,7 @@
 	}
 	uint16 m_nPart;
 	CPartFile* m_pPartFile;
-	CUpDownClient* m_pClient;
+	CClientRef m_pClient;
 };

aMule-2.2.6.tar.bz2/src/SafeFile.cpp -> aMule-2.3.1.tar.bz2/src/SafeFile.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,6 +27,8 @@
 #include "MD4Hash.h"				// Needed for CMD4Hash
 #include "kademlia/utils/UInt128.h"	// Needed for CUInt128
 #include "ScopedPtr.h"				// Needed for CScopedPtr and CScopedArray
+#include "Logger.h"
+#include <common/Format.h>	// Needed for CFormat
 
 #if defined(__SUNPRO_CC)
 #define __FUNCTION__ __FILE__+__LINE__
@@ -199,7 +201,7 @@
 
 	*puSize = ReadUInt8();
 	
-	CScopedArray<unsigned char> bsob(new unsigned char[*puSize]);
+	CScopedArray<unsigned char> bsob(*puSize);
 	Read(bsob.get(), *puSize);
 	
 	return bsob.release();
@@ -466,13 +468,15 @@
 			}
 
 			default:
-				throw wxString(wxT("Invalid Kad tag type on packet"));
+				throw wxString(CFormat(wxT("Invalid Kad tag type; type=0x%02x name=%s\n")) % type % name);
 		}
-	} catch (...) {
-		printf("Invalid Kad tag; type=0x%02x name=%s\n",
-			type, (const char *)unicode2char(name));
+	} catch(const CMuleException& e) {
+		AddLogLineN(e.what());
 		delete retVal;
 		throw;
+	} catch(const wxString& e) {
+		AddLogLineN(e);
+		throw;
 	}
 	
 	return retVal;
@@ -541,13 +545,12 @@
 			default:
 				//TODO: Support more tag types
 				// With the if above, this should NEVER happen.
-				printf("%s; Unknown tag: type=0x%02X\n", __FUNCTION__, tag.GetType());
-				wxASSERT(0);
+				AddLogLineNS(CFormat(wxT("CFileDataIO::WriteTag: Unknown tag: type=0x%02X")) % tag.GetType());
+				wxFAIL;
 				break;
 		}				
 	} catch (...) {
-		//AddDebugLogLine(false, wxT("Exception in CDataIO:WriteTag"));
-		printf("Exception in CDataIO:WriteTag");
+		AddLogLineNS(wxT("Exception in CDataIO:WriteTag"));
 		throw;
 	}
 }

aMule-2.2.6.tar.bz2/src/SafeFile.h -> aMule-2.3.1.tar.bz2/src/SafeFile.h Changed

aMule-2.2.6.tar.bz2/src/ScopedPtr.h -> aMule-2.3.1.tar.bz2/src/ScopedPtr.h Changed

@@ -1,8 +1,8 @@
-//
+//							-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2006-2009 Mikkel Schubert ( xaignar@users.sourceforge.net )
-// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2006-2011 Mikkel Schubert ( xaignar@users.sourceforge.net )
+// Copyright (c) 2006-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
@@ -26,6 +26,7 @@
 #ifndef SCOPEDPTR_H
 #define SCOPEDPTR_H
 
+#include "OtherFunctions.h"		// Needed for DeleteContents()
 
 /**
  * CScopedPtr is a simple smart pointer.
@@ -40,35 +41,46 @@
 {
 public:
 	/** Constructor. Note that CScopedPtr takes ownership of the pointer. */
-	CScopedPtr(TYPE* ptr);
-	
+	CScopedPtr(TYPE* ptr)
+		: m_ptr(ptr)
+	{}
+
+	CScopedPtr()
+	{
+		m_ptr = new TYPE;
+	}
+
 	/** Frees the pointer owned by the instance. */
-	~CScopedPtr();
-	
-	
+	~CScopedPtr()			{ delete m_ptr; }
+
 	//@{
 	/** Deference operators. */
-	TYPE& operator*() const;
-	TYPE* operator->() const;
+	TYPE& operator*() const		{ return *m_ptr; }
+	TYPE* operator->() const	{ return m_ptr; }
 	//@}
-	
-	
+
+
 	/** Returns the actual pointer value. */
-	TYPE* get() const;
-	
+	TYPE* get() const		{ return m_ptr; }
+
 	/** Sets the actual pointer to a different value. The old pointer is freed. */
-	void reset(TYPE* ptr = 0);
-	
+	void reset(TYPE* ptr = 0)	{ delete m_ptr; m_ptr = ptr; }
+
 	/** Returns the actual pointer. The scoped-ptr will thereafter contain NULL. */
-	TYPE* release();
-	
+	TYPE* release()
+	{
+		TYPE* ptr = m_ptr;
+		m_ptr = 0;
+		return ptr;
+	}
+
 private:
 	//@{
 	//! A scoped pointer is neither copyable, nor assignable.
 	CScopedPtr(const CScopedPtr<TYPE>&);
 	CScopedPtr<TYPE>& operator=(const CScopedPtr<TYPE>&);
 	//@}
-	
+
 	TYPE* m_ptr;
 };
 
@@ -83,138 +95,96 @@
 {
 public:
 	/** Constructor. Note that CScopedArray takes ownership of the array. */
-	CScopedArray(TYPE* ptr);
-	
+	CScopedArray(TYPE* ptr)
+		: m_ptr(ptr)
+	{}
+
+	/** Constructor, allocating nr elements. */
+	CScopedArray(size_t nr)			{ m_ptr = new TYPE[nr]; }
+
 	/** Frees the array owned by this instance. */
-	~CScopedArray();
-	
-	
+	~CScopedArray()				{ delete[] m_ptr; }
+
+
 	/** Accessor. */
-	TYPE& operator[](unsigned i) const;
-	
-	
+	TYPE& operator[](unsigned i) const	{ return m_ptr[i]; }
+
+
 	/** @see CScopedPtr::get */
-	TYPE* get() const;
-	
+	TYPE* get() const			{ return m_ptr; }
+
 	/** @see CScopedPtr::reset */
-	void reset(TYPE* ptr = 0);
-	
+	void reset(TYPE* ptr = 0)		{ delete[] m_ptr; m_ptr = ptr; }
+
+	/** free the existing array and allocate a new one with nr elements */
+	void reset(size_t nr)			{ delete[] m_ptr; m_ptr = new TYPE[nr]; }
+
 	/** @see CScopedPtr::release */
-	TYPE* release();
-	
+	TYPE* release()
+	{
+		TYPE* ptr = m_ptr;
+		m_ptr = 0;
+		return ptr;
+	}
+
+
 private:
 	//@{
 	//! A scoped array is neither copyable, nor assignable.
 	CScopedArray(const CScopedArray<TYPE>&);
 	CScopedArray<TYPE>& operator=(const CScopedArray<TYPE>&);
 	//@}
-	
+
 	TYPE* m_ptr;
 };
 
 
-
-
-////////////////////////////////////////////////////////////
-// Implementations
-
-template <typename TYPE>
-CScopedPtr<TYPE>::CScopedPtr(TYPE* ptr)
-	: m_ptr(ptr)
-{
-}
-
-
-template <typename TYPE>
-CScopedPtr<TYPE>::~CScopedPtr()
-{
-	delete m_ptr;
-}
-
-
-template <typename TYPE>
-TYPE& CScopedPtr<TYPE>::operator*() const
-{
-	return *m_ptr;
-}
-
-
-template <typename TYPE>
-TYPE* CScopedPtr<TYPE>::operator->() const
-{
-	return m_ptr;
-}
-
-
-template <typename TYPE>
-TYPE* CScopedPtr<TYPE>::get() const
-{
-	return m_ptr;
-}
-
-
-template <typename TYPE>
-void CScopedPtr<TYPE>::reset(TYPE* ptr)
-{
-	delete m_ptr;
-	m_ptr = ptr;
-}
-
-
-template <typename TYPE>
-TYPE* CScopedPtr<TYPE>::release()
-{
-	TYPE* ptr = m_ptr;
-	m_ptr = 0;
-	return ptr;
-}
-
-
-
-template <typename TYPE>
-CScopedArray<TYPE>::CScopedArray(TYPE* ptr)
-	: m_ptr(ptr)
-{
-}
-
-	
-template <typename TYPE>
-CScopedArray<TYPE>::~CScopedArray()
-{
-	delete[] m_ptr;
-}
-
-
-template <typename TYPE>
-TYPE& CScopedArray<TYPE>::operator[](unsigned i) const
-{
-	return m_ptr[i];
-}
-	
-	
-template <typename TYPE>
-TYPE* CScopedArray<TYPE>::get() const
+/**
+ * Similar to CScopedPtr, except that a STL container of pointers is expected
+ * which has to be freed with DeleteContents.
+ *
+ * @see CScopedPtr
+ */
+template <typename STL_CONTAINER>
+class CScopedContainer
 {
-	return m_ptr;
-}
+public:
+	/** Constructor. Note that CScopedContainer takes ownership of the array. */
+	CScopedContainer(STL_CONTAINER* ptr)
+		: m_ptr(ptr)
+	{}
+
+	CScopedContainer()
+	{
+		m_ptr = new STL_CONTAINER;
+	}
+
+	~CScopedContainer()	
+	{
+		if (m_ptr) {
+			DeleteContents(*m_ptr);
+			delete m_ptr;
+		}
+	}
 
+	//@{
+	/** Deference operators. */
+	STL_CONTAINER& operator*() const	{ return *m_ptr; }
+	//@}
 
-template <typename TYPE>
-void CScopedArray<TYPE>::reset(TYPE* ptr)
-{
-	delete[] m_ptr;
-	m_ptr = ptr;
-}
 
+	/** Returns the actual pointer value. */
+	STL_CONTAINER* get() const			{ return m_ptr; }
 
-template <typename TYPE>
-TYPE* CScopedArray<TYPE>::release()
-{
-	TYPE* ptr = m_ptr;
-	m_ptr = 0;
-	return ptr;
-}
+private:
+	//@{
+	//! A scoped container is neither copyable, nor assignable.
+	CScopedContainer(const CScopedContainer<STL_CONTAINER>&);
+	CScopedContainer<STL_CONTAINER>& operator=(const CScopedContainer<STL_CONTAINER>&);
+	//@}
 
+	STL_CONTAINER* m_ptr;
+};
 
 #endif // SCOPEDPTR_H
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/SearchDlg.cpp -> aMule-2.3.1.tar.bz2/src/SearchDlg.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -17,7 +17,7 @@
 // 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
@@ -49,27 +49,27 @@
 BEGIN_EVENT_TABLE(CSearchDlg, wxPanel)
 	EVT_BUTTON(		IDC_STARTS,		CSearchDlg::OnBnClickedStart)
 	EVT_TEXT_ENTER(	IDC_SEARCHNAME,	CSearchDlg::OnBnClickedStart)
-	
+
 	EVT_BUTTON(IDC_CANCELS, CSearchDlg::OnBnClickedStop)
-	
+
 	EVT_LIST_ITEM_SELECTED(ID_SEARCHLISTCTRL, CSearchDlg::OnListItemSelected)
-	
+
 	EVT_BUTTON(IDC_SDOWNLOAD, CSearchDlg::OnBnClickedDownload)
 	EVT_BUTTON(IDC_SEARCH_RESET, CSearchDlg::OnBnClickedReset)
 	EVT_BUTTON(IDC_CLEAR_RESULTS, CSearchDlg::OnBnClickedClear)
 
 	EVT_CHECKBOX(IDC_EXTENDEDSEARCHCHECK,CSearchDlg::OnExtendedSearchChange)
 	EVT_CHECKBOX(IDC_FILTERCHECK,CSearchDlg::OnFilterCheckChange)
-	
+
 	EVT_MULENOTEBOOK_PAGE_CLOSING(ID_NOTEBOOK, CSearchDlg::OnSearchClosing)
 	EVT_NOTEBOOK_PAGE_CHANGED(ID_NOTEBOOK, CSearchDlg::OnSearchPageChanged)
 
 	// Event handlers for the parameter fields getting changed
-	EVT_CUSTOM( wxEVT_COMMAND_TEXT_UPDATED,     IDC_SEARCHNAME, CSearchDlg::OnFieldChanged) 
-	EVT_CUSTOM( wxEVT_COMMAND_TEXT_UPDATED,     IDC_EDITSEARCHEXTENSION, CSearchDlg::OnFieldChanged) 
+	EVT_CUSTOM( wxEVT_COMMAND_TEXT_UPDATED,     IDC_SEARCHNAME, CSearchDlg::OnFieldChanged)
+	EVT_CUSTOM( wxEVT_COMMAND_TEXT_UPDATED,     IDC_EDITSEARCHEXTENSION, CSearchDlg::OnFieldChanged)
 	EVT_CUSTOM( wxEVT_COMMAND_SPINCTRL_UPDATED, wxID_ANY, CSearchDlg::OnFieldChanged)
 	EVT_CUSTOM( wxEVT_COMMAND_CHOICE_SELECTED, wxID_ANY, CSearchDlg::OnFieldChanged)
-	
+
 	// Event handlers for the filter fields getting changed.
 	EVT_TEXT_ENTER(ID_FILTER_TEXT,	CSearchDlg::OnFilteringChange)
 	EVT_CHECKBOX(ID_FILTER_INVERT,	CSearchDlg::OnFilteringChange)
@@ -89,10 +89,10 @@
 
 	m_progressbar = CastChild( ID_SEARCHPROGRESS, wxGauge );
 	m_progressbar->SetRange(100);
-	
+
 	m_notebook = CastChild( ID_NOTEBOOK, CMuleNotebook );
 
-#if defined(__WXMAC__)
+#ifdef __WXMAC__
 	//#warning TODO: restore the image list if/when wxMac supports locating the image
 #else
 	// Initialise the image list
@@ -101,16 +101,16 @@
 	m_ImageList->Add(amuleSpecial(4));
 	m_notebook->AssignImageList(m_ImageList);
 #endif
-	
+
 	// Sanity sanity
 	wxChoice* searchchoice = CastChild( ID_SEARCHTYPE, wxChoice );
 	wxASSERT(searchchoice);
 	wxASSERT(searchchoice->GetString(0) == _("Local"));
 	wxASSERT(searchchoice->GetString(2) == _("Kad"));
 	wxASSERT(searchchoice->GetCount() == 4);
-	
+
 	m_searchchoices = searchchoice->GetStrings();
-	
+
 	// Let's break it now.
 
 	FixSearchTypes();
@@ -118,11 +118,11 @@
 	CastChild( IDC_TypeSearch, wxChoice )->SetSelection(0);
 	CastChild( IDC_SEARCHMINSIZE, wxChoice )->SetSelection(2);
 	CastChild( IDC_SEARCHMAXSIZE, wxChoice )->SetSelection(2);
-	
+
 	// Not there initially.
 	s_searchsizer->Show(s_extendedsizer, false);
 	s_searchsizer->Show(s_filtersizer, false);
-	
+
 	Layout();
 }
 
@@ -134,13 +134,13 @@
 void CSearchDlg::FixSearchTypes()
 {
 	wxChoice* searchchoice = CastChild( ID_SEARCHTYPE, wxChoice );
-	
+
 	searchchoice->Clear();
-	
+
 	// We should have only filedonkey now. Let's insert stuff.
-	
+
 	int pos = 0;
-	
+
 	if (thePrefs::GetNetworkED2K()){
 		searchchoice->Insert(m_searchchoices[0], pos++);
 		searchchoice->Insert(m_searchchoices[1], pos++);
@@ -151,7 +151,7 @@
 	}
 
 	searchchoice->Insert(m_searchchoices[3], pos++);
-	
+
 	searchchoice->SetSelection(0);
 }
 
@@ -173,10 +173,10 @@
 void CSearchDlg::AddResult(CSearchFile* toadd)
 {
 	CSearchListCtrl* outputwnd = GetSearchList( toadd->GetSearchID() );
-	
+
 	if ( outputwnd ) {
 		outputwnd->AddResult( toadd );
-		
+
 		// Update the result count
 		UpdateHitCount( outputwnd );
 	}
@@ -186,10 +186,10 @@
 void CSearchDlg::UpdateResult(CSearchFile* toupdate)
 {
 	CSearchListCtrl* outputwnd = GetSearchList( toupdate->GetSearchID() );
-	
+
 	if ( outputwnd ) {
 		outputwnd->UpdateResult( toupdate );
-	
+
 		// Update the result count
 		UpdateHitCount( outputwnd );
 	}
@@ -207,7 +207,7 @@
 void CSearchDlg::OnExtendedSearchChange(wxCommandEvent& event)
 {
 	s_searchsizer->Show(s_extendedsizer, event.IsChecked());
-	
+
 	Layout();
 }
 
@@ -223,12 +223,12 @@
 
 		page->EnableFiltering(event.IsChecked());
 
-		UpdateHitCount(page);		
+		UpdateHitCount(page);
 	}
 }
 
 
-void CSearchDlg::OnSearchClosing(wxNotebookEvent& evt) 
+void CSearchDlg::OnSearchClosing(wxBookCtrlEvent& evt)
 {
 	// Abort global search if it was last tab that was closed.
 	if ( evt.GetSelection() == ((int)m_notebook->GetPageCount() - 1 ) ) {
@@ -240,7 +240,7 @@
 	// Zero to avoid results added while destructing.
 	ctrl->ShowResults(0);
 	theApp->searchlist->RemoveResults(ctrl->GetSearchId());
-	
+
 	// Do cleanups if this was the last tab
 	if ( m_notebook->GetPageCount() == 1 ) {
 		FindWindow(IDC_SDOWNLOAD)->Enable(FALSE);
@@ -249,7 +249,7 @@
 }
 
 
-void CSearchDlg::OnSearchPageChanged(wxNotebookEvent& WXUNUSED(evt))
+void CSearchDlg::OnSearchPageChanged(wxBookCtrlEvent& WXUNUSED(evt))
 {
 	int selection = m_notebook->GetSelection();
 
@@ -266,28 +266,7 @@
 
 		bool enable = (ctrl->GetSelectedItemCount() > 0);
 		FindWindow(IDC_SDOWNLOAD)->Enable( enable );
-
-		// set IDC_SEARCHNAME control to search text of currently selected tab
-		wxString SearchText = m_notebook->GetPageText(selection).BeforeLast(wxT(' '));
-		wxString rest;
-		if (SearchText.StartsWith(wxT("!"), &rest)) {
-		    SearchText = rest;
-		}
-
-		// This check is needed because some wxWidgets (tested with
-		// 2.8.7) will return an empty string during the page-changed
-		// event resulting from the first page to being inserted. This
-		// has been reported as patch #1895161:
-		// http://sourceforge.net/tracker/index.php?func=detail&aid=1895161&group_id=9863&atid=309863
-		if (SearchText.Length()) {
-			CastChild(IDC_SEARCHNAME, wxTextCtrl)->SetValue(SearchText);
-
-		}
-		
-		// Select everything.
-		CastChild(IDC_SEARCHNAME, wxTextCtrl)->SetSelection(-1, -1);
 	}
-
 }
 
 
@@ -295,8 +274,8 @@
 {
 	wxString searchString = CastChild( IDC_SEARCHNAME, wxTextCtrl )->GetValue();
 	searchString.Trim(true);
-	searchString.Trim(false);	
-	
+	searchString.Trim(false);
+
 	if ( searchString.IsEmpty() ) {
 		return;
 	}
@@ -304,20 +283,20 @@
 	wxChoice* choice = CastChild( ID_SEARCHTYPE, wxChoice );
 
 	// Magic.
-	
+
 	int searchtype = choice->GetSelection();
-	
+
 	if (!thePrefs::GetNetworkED2K()) {
 		searchtype += 2;
 	}
-	
+
 	if (!thePrefs::GetNetworkKademlia()) {
 		searchtype += 1;
 	}
 
 	switch ( searchtype ) {
 		// Local Search
-		case 0: 
+		case 0:
 		// Global Search
 		case 1:
 		// Kad Search
@@ -325,9 +304,9 @@
 			// We musn't search more often than once every 2 secs
 			if ((GetTickCount() - m_last_search_time) > 2000) {
 				m_last_search_time = GetTickCount();
-		
+
 				OnBnClickedStop(nullEvent);
-		
+
 				StartNewSearch();
 			}
 
@@ -340,7 +319,7 @@
 
 		// Error
 		default:
-			wxASSERT(0);
+			wxFAIL;
 	}
 }
 
@@ -348,8 +327,8 @@
 void CSearchDlg::OnFieldChanged( wxEvent& WXUNUSED(evt) )
 {
 	bool enable = false;
-	
-	// These are the IDs of the search-fields 
+
+	// These are the IDs of the search-fields
 	int textfields[] = { IDC_SEARCHNAME, IDC_EDITSEARCHEXTENSION };
 
 	for ( uint16 i = 0; i < itemsof(textfields); i++ ) {
@@ -361,7 +340,7 @@
 	enable |= (CastChild(IDC_SEARCHMAXSIZE, wxChoice)->GetSelection() != 2);
 	enable |= (CastChild(IDC_TypeSearch, wxChoice)->GetSelection() > 0);
 	enable |= (CastChild(ID_AUTOCATASSIGN, wxChoice)->GetSelection() > 0);
-	
+
 	// These are the IDs of the search-fields
 	int spinfields[] = { IDC_SPINSEARCHMIN, IDC_SPINSEARCHMAX, IDC_SPINSEARCHAVAIBILITY };
 	for ( uint16 i = 0; i < itemsof(spinfields); i++ ) {
@@ -370,7 +349,7 @@
 
 	// Enable the "Reset" button if any fields contain text
 	FindWindow(IDC_SEARCH_RESET)->Enable( enable );
-	
+
 	// Enable the Server Search button if the Name field contains text
 	enable = !CastChild( IDC_SEARCHNAME, wxTextCtrl )->GetValue().IsEmpty();
 	FindWindow(IDC_STARTS)->Enable( enable );
@@ -389,16 +368,16 @@
 		int nPages = m_notebook->GetPageCount();
 		for ( int i = 0; i < nPages; i++ ) {
 			CSearchListCtrl* page = dynamic_cast<CSearchListCtrl*>(m_notebook->GetPage(i));
-			
+
 			page->SetFilter(filter, invert, known);
-		
+
 			UpdateHitCount(page);
 		}
 	}
 }
 
 
-bool CSearchDlg::CheckTabNameExists(const wxString& searchString) 
+bool CSearchDlg::CheckTabNameExists(const wxString& searchString)
 {
 	int nPages = m_notebook->GetPageCount();
 	for ( int i = 0; i < nPages; i++ ) {
@@ -407,7 +386,7 @@
 			return true;
 		}
 	}
-	
+
 	return false;
 }
 
@@ -421,12 +400,12 @@
 	bool     enable = CastChild(IDC_FILTERCHECK, wxCheckBox)->GetValue();
 	wxString filter = CastChild(ID_FILTER_TEXT, wxTextCtrl)->GetValue();
 	bool     invert = CastChild(ID_FILTER_INVERT, wxCheckBox)->GetValue();
-	bool     known = CastChild(ID_FILTER_KNOWN, wxCheckBox)->GetValue();	
-	
+	bool     known = CastChild(ID_FILTER_KNOWN, wxCheckBox)->GetValue();
+
 	list->SetFilter(filter, invert, known);
 	list->EnableFiltering(enable);
 	list->ShowResults(nSearchID);
-	
+
 	Layout();
 	FindWindow(IDC_CLEAR_RESULTS)->Enable(true);
 }
@@ -434,7 +413,7 @@
 
 void CSearchDlg::OnBnClickedStop(wxCommandEvent& WXUNUSED(evt))
 {
-	theApp->searchlist->StopGlobalSearch();
+	theApp->searchlist->StopSearch();
 	ResetControls();
 }
 
@@ -442,7 +421,7 @@
 void CSearchDlg::ResetControls()
 {
 	m_progressbar->SetValue(0);
-	
+
 	FindWindow(IDC_CANCELS)->Disable();
 	FindWindow(IDC_STARTS)->Enable(!CastChild( IDC_SEARCHNAME, wxTextCtrl )->GetValue().IsEmpty());
 }
@@ -459,11 +438,11 @@
 	for (int i = 0; i < nPages; ++i) {
 		CSearchListCtrl* page =
 			dynamic_cast<CSearchListCtrl*>(m_notebook->GetPage(i));
-		if (page->GetSearchId() == id) {
+		if (page->GetSearchId() == id || id == 0) {	// 0: just update all pages (there is only one KAD search running at a time anyway)
 			wxString rest;
 			if (m_notebook->GetPageText(i).StartsWith(wxT("!"),&rest)) {
 				m_notebook->SetPageText(i,rest);
-			}			
+			}
 		}
 	}
 }
@@ -473,7 +452,7 @@
 	int sel = m_notebook->GetSelection();
 	if (sel != -1) {
 		CSearchListCtrl* list = dynamic_cast<CSearchListCtrl*>(m_notebook->GetPage(sel));
-	
+
 		// Download with items added to category specified in the drop-down menu
 		list->DownloadSelected();
 	}
@@ -483,7 +462,7 @@
 void CSearchDlg::OnBnClickedClear(wxCommandEvent& WXUNUSED(ev))
 {
 	OnBnClickedStop(nullEvent);
-	
+
 	m_notebook->DeleteAllPages();
 
 	FindWindow(IDC_CLEAR_RESULTS)->Enable(FALSE);
@@ -495,17 +474,17 @@
 {
 	static uint32 m_nSearchID = 0;
 	m_nSearchID++;
-	
+
 	FindWindow(IDC_STARTS)->Disable();
 	FindWindow(IDC_SDOWNLOAD)->Disable();
 	FindWindow(IDC_CANCELS)->Enable();
 
 	CSearchList::CSearchParams params;
-	
+
 	params.searchString = CastChild( IDC_SEARCHNAME, wxTextCtrl )->GetValue();
 	params.searchString.Trim(true);
 	params.searchString.Trim(false);
-	
+
 	if (params.searchString.IsEmpty()) {
 		return;
 	}
@@ -513,7 +492,7 @@
 	if (CastChild(IDC_EXTENDEDSEARCHCHECK, wxCheckBox)->GetValue()) {
 		params.extension = CastChild( IDC_EDITSEARCHEXTENSION, wxTextCtrl )->GetValue();
 
-		uint32 sizemin = GetTypeSize( (uint8) CastChild( IDC_SEARCHMINSIZE, wxChoice )->GetSelection() ); 
+		uint32 sizemin = GetTypeSize( (uint8) CastChild( IDC_SEARCHMINSIZE, wxChoice )->GetSelection() );
 		uint32 sizemax = GetTypeSize( (uint8) CastChild( IDC_SEARCHMAXSIZE, wxChoice )->GetSelection() );
 
 		// Parameter Minimum Size
@@ -527,15 +506,15 @@
 				_("Min size must be smaller than max size. Max size ignored."),
 				_("Search warning"), wxOK|wxCENTRE|wxICON_INFORMATION);
 			dlg.ShowModal();
-			
+
 			params.maxSize = 0;
 		}
 
 		// Parameter Availability
 		params.availability = CastChild( IDC_SPINSEARCHAVAIBILITY, wxSpinCtrl )->GetValue();
-		
+
 		switch ( CastChild( IDC_TypeSearch, wxChoice )->GetSelection() ) {
-		case 0:	params.typeText = wxEmptyString;	break;
+		case 0:	params.typeText.Clear();	break;
 		case 1:	params.typeText = ED2KFTSTR_ARCHIVE;	break;
 		case 2: params.typeText = ED2KFTSTR_AUDIO;	break;
 		case 3:	params.typeText = ED2KFTSTR_CDIMAGE;	break;
@@ -544,7 +523,7 @@
 		case 6:	params.typeText = ED2KFTSTR_DOCUMENT;	break;
 		case 7:	params.typeText = ED2KFTSTR_VIDEO;	break;
 		default:
-			AddDebugLogLineM( true, logGeneral,
+			AddDebugLogLineC( logGeneral,
 				CFormat( wxT("Warning! Unknown search-category (%s) selected!") )
 					% params.typeText
 			);
@@ -553,33 +532,33 @@
 	}
 
 	SearchType search_type = KadSearch;
-	
+
 	int selection = CastChild( ID_SEARCHTYPE, wxChoice )->GetSelection();
-	
+
 	if (!thePrefs::GetNetworkED2K()) {
 		selection += 2;
 	}
-	
+
 	if (!thePrefs::GetNetworkKademlia()) {
 		selection += 1;
 	}
-	
+
 	switch (selection) {
-		case 0: // Local Search	
+		case 0: // Local Search
 			search_type = LocalSearch;
 			break;
 		case 1: // Global Search
 			search_type = GlobalSearch;
 			break;
-		case 2: // Kad search 
+		case 2: // Kad search
 			search_type = KadSearch;
 			break;
 		default:
 			// Should never happen
-			wxASSERT(0);
+			wxFAIL;
 			break;
 	}
-	
+
 	uint32 real_id = m_nSearchID;
 	wxString error = theApp->searchlist->StartNewSearch(&real_id, search_type, params);
 	if (!error.IsEmpty()) {
@@ -603,20 +582,20 @@
 	for ( uint32 i = 0; i < (uint32)m_notebook->GetPageCount(); ++i ) {
 		if ( m_notebook->GetPage(i) == page ) {
 			wxString searchtxt = m_notebook->GetPageText(i).BeforeLast(wxT(' '));
-		
+
 			if ( !searchtxt.IsEmpty() ) {
 				size_t shown = page->GetItemCount();
 				size_t hidden = page->GetHiddenItemCount();
-				
+
 				if (hidden) {
-					searchtxt += wxString::Format(wxT(" (%u/%u)"), shown, shown + hidden);
+					searchtxt += CFormat(wxT(" (%u/%u)")) % shown % (shown + hidden);
 				} else {
-					searchtxt += wxString::Format(wxT(" (%u)"), shown);
+					searchtxt += CFormat(wxT(" (%u)")) % shown;
 				}
-				
+
 				m_notebook->SetPageText(i, searchtxt);
 			}
-		
+
 			break;
 		}
 	}
@@ -634,7 +613,7 @@
 	CastChild( IDC_SPINSEARCHAVAIBILITY, wxSpinCtrl )->SetValue(0);
 	CastChild( IDC_TypeSearch, wxChoice )->SetSelection(0);
 	CastChild( ID_AUTOCATASSIGN, wxChoice )->SetSelection(0);
-	
+
 	FindWindow(IDC_SEARCH_RESET)->Enable(FALSE);
 }
 
@@ -643,13 +622,13 @@
 {
 	wxChoice* c_cat = CastChild( ID_AUTOCATASSIGN, wxChoice );
 	c_cat->Clear();
-	
+
 	c_cat->Append(_("Main"));
 
 	for ( unsigned i = 1; i < theApp->glob_prefs->GetCatCount(); i++ ) {
 		c_cat->Append( theApp->glob_prefs->GetCategory( i )->title );
 	}
-	
+
 	c_cat->SetSelection( 0 );
 }

aMule-2.2.6.tar.bz2/src/SearchDlg.h -> aMule-2.3.1.tar.bz2/src/SearchDlg.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,6 +27,7 @@
 #define SEARCHDLG_H
 
 #include <wx/panel.h>		// Needed for wxPanel
+#include <wx/notebook.h>	// needed for wxBookCtrlEvent in wx 2.8
 
 #include "Types.h"		// Needed for uint16 and uint32
 
@@ -35,7 +36,6 @@
 class CSearchListCtrl;
 class CMuleNotebookEvent;
 class wxListEvent;
-class wxNotebookEvent;
 class wxSpinEvent;
 class wxGauge;
 class CSearchFile;
@@ -149,7 +149,7 @@
 	void		OnFilterCheckChange(wxCommandEvent& ev);
 	void		OnFilteringChange(wxCommandEvent& ev);
 	
-	void		OnSearchClosing(wxNotebookEvent& evt);
+	void		OnSearchClosing(wxBookCtrlEvent& evt);
 
 	void		OnBnClickedStart(wxCommandEvent& evt);
 	void		OnBnClickedStop(wxCommandEvent& evt);
@@ -158,7 +158,7 @@
 	/**
 	 * Event-handler for page-chages which takes care of enabling/disabling the download button.
 	 */
-	void		OnSearchPageChanged(wxNotebookEvent& evt);
+	void		OnSearchPageChanged(wxBookCtrlEvent& evt);
 	
 	uint32		m_last_search_time;

aMule-2.2.6.tar.bz2/src/SearchExpr.h -> aMule-2.3.1.tar.bz2/src/SearchExpr.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -69,14 +69,14 @@
 	void Add(const CSearchExpr* pexpr)
 	{
 		//m_aExpr.Append(pexpr->m_aExpr);
-		for (unsigned int i=0; i < pexpr->m_aExpr.Count(); ++i) {
+		for (unsigned int i=0; i < pexpr->m_aExpr.GetCount(); ++i) {
 			m_aExpr.Add(pexpr->m_aExpr[i]);
 		}
 	}
 	
 	void Concatenate(const wxString& pstrString)
 	{
-		wxASSERT( m_aExpr.Count() == 1 );
+		wxASSERT( m_aExpr.GetCount() == 1 );
 		m_aExpr[0] += ' ';
 		m_aExpr[0] += pstrString;
 	}

aMule-2.2.6.tar.bz2/src/SearchFile.cpp -> aMule-2.3.1.tar.bz2/src/SearchFile.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,11 +27,15 @@
 
 #include <tags/FileTags.h>
 
+#include "amule.h"				// Needed for theApp
+#include "CanceledFileList.h"
 #include "MemFile.h"			// Needed for CMemFile
 #include "Preferences.h"		// Needed for thePrefs
 #include "GuiEvents.h"
 #include "Logger.h"
-#include "PartFile.h"                  // Needed for CPartFile::CanAddSource
+#include "PartFile.h"			// Needed for CPartFile::CanAddSource
+#include "DownloadQueue.h"		// Needed for CDownloadQueue
+#include "KnownFileList.h"		// Needed for CKnownFileList
 
 CSearchFile::CSearchFile(const CMemFile& data, bool optUTF8, wxUIntPtr searchID, uint32_t serverIP, uint16_t serverPort, const wxString& directory, bool kademlia)
 	: m_parent(NULL),
@@ -40,22 +44,22 @@
 	  m_sourceCount(0),
 	  m_completeSourceCount(0),
 	  m_kademlia(kademlia),
+	  m_downloadStatus(NEW),
 	  m_directory(directory),
-          m_clientServerIP(serverIP),
-          m_clientServerPort(serverPort),
+	  m_clientServerIP(serverIP),
+	  m_clientServerPort(serverPort),
 	  m_kadPublishInfo(0)
 {
 	m_abyFileHash = data.ReadHash();
+	SetDownloadStatus();
 	m_clientID = data.ReadUInt32();
 	m_clientPort = data.ReadUInt16();
 
-	if ((!m_clientID) || (!m_clientPort)) {
-		m_clientID = m_clientPort = 0;
-	} else if (!IsGoodIP(m_clientID, thePrefs::FilterLanIPs())) {
-		m_clientID = m_clientPort = 0;
+	if (!m_clientID || !m_clientPort || !IsGoodIP(m_clientID, thePrefs::FilterLanIPs())) {
+		m_clientID = 0;
+		m_clientPort = 0;
 	}
 	
-	
 	uint32 tagcount = data.ReadUInt32();
 	for (unsigned int i = 0; i < tagcount; ++i) {
 		CTag tag(data, optUTF8);
@@ -91,14 +95,16 @@
 
 CSearchFile::CSearchFile(const CSearchFile& other)
 	: CAbstractFile(other),
+	  CECID(),	// create a new ID for now
 	  m_parent(other.m_parent),
 	  m_showChildren(other.m_showChildren),
 	  m_searchID(other.m_searchID),
 	  m_sourceCount(other.m_sourceCount),
 	  m_completeSourceCount(other.m_completeSourceCount),
 	  m_kademlia(other.m_kademlia),
+	  m_downloadStatus(other.m_downloadStatus),
 	  m_directory(other.m_directory),
-          m_clients(other.m_clients),
+	  m_clients(other.m_clients),
 	  m_clientID(other.m_clientID),
 	  m_clientPort(other.m_clientPort),
 	  m_clientServerIP(other.m_clientServerIP),
@@ -121,13 +127,12 @@
 
 void CSearchFile::AddClient(const ClientStruct& client)
 {
-       for (std::list<ClientStruct>::const_iterator it = m_clients.begin(); it != m_clients.end(); ++it) {
-               if (client.m_ip == it->m_ip && client.m_port == it->m_port) return;
-       }
-       m_clients.push_back(client);
+	for (std::list<ClientStruct>::const_iterator it = m_clients.begin(); it != m_clients.end(); ++it) {
+		if (client.m_ip == it->m_ip && client.m_port == it->m_port) return;
+	}
+	m_clients.push_back(client);
 }
 
-
 void CSearchFile::MergeResults(const CSearchFile& other)
 {
 	// Sources
@@ -164,16 +169,17 @@
 		}
 	}
 
-       // copy possible available sources from new result
-       if (other.GetClientID() && other.GetClientPort()) {
-               // pre-filter sources which would be dropped by CPartFile::AddSources
-               if (CPartFile::CanAddSource(other.GetClientID(), other.GetClientPort(), other.GetClientServerIP(), other.GetClientServerPort())) {
-                       CSearchFile::ClientStruct client(other.GetClientID(), other.GetClientPort(), other.GetClientServerIP(), other.GetClientServerPort());
-                       AddClient(client);
-               }
-       }
+	// copy possible available sources from new result
+	if (other.GetClientID() && other.GetClientPort()) {
+		// pre-filter sources which would be dropped by CPartFile::AddSources
+		if (CPartFile::CanAddSource(other.GetClientID(), other.GetClientPort(), other.GetClientServerIP(), other.GetClientServerPort())) {
+			CSearchFile::ClientStruct client(other.GetClientID(), other.GetClientPort(), other.GetClientServerIP(), other.GetClientServerPort());
+			AddClient(client);
+		}
+	}
 }
 
+
 void CSearchFile::AddChild(CSearchFile* file)
 {
 	wxCHECK_RET(file, wxT("Not a valid child!"));
@@ -187,13 +193,13 @@
 	if (GetChildren().empty()) {
 		// Merging duplicate names instead of adding a new one
 		if (file->GetFileName() == GetFileName()) {
-			AddDebugLogLineM( false, logSearch, CFormat(wxT("Merged results for '%s'")) % GetFileName());
+			AddDebugLogLineN(logSearch, CFormat(wxT("Merged results for '%s'")) % GetFileName());
 			MergeResults(*file);
 			delete file;
 			return;
 		} else {
 			// The first child will always be the first result we received.
-			AddDebugLogLineM(false, logSearch, CFormat(wxT("Created initial child for result '%s'")) % GetFileName());
+			AddDebugLogLineN(logSearch, CFormat(wxT("Created initial child for result '%s'")) % GetFileName());
 			m_children.push_back(new CSearchFile(*this));
 			m_children.back()->m_parent = this;
 		}
@@ -265,15 +271,15 @@
 			ratingCount++;
 			ratingTotal += child->UserRating();
 		}
-	
-	 	// Available sources
-               if (child->GetClientID() && child->GetClientPort()) {
-                       CSearchFile::ClientStruct client(child->GetClientID(), child->GetClientPort(), child->GetClientServerIP(), child->GetClientServerPort());
-                       AddClient(client);
-               }
-               for (std::list<ClientStruct>::const_iterator cit = child->m_clients.begin(); cit != child->m_clients.end(); ++cit) {
-                       AddClient(*cit);
-               }
+
+		// Available sources
+		if (child->GetClientID() && child->GetClientPort()) {
+			CSearchFile::ClientStruct client(child->GetClientID(), child->GetClientPort(), child->GetClientServerIP(), child->GetClientServerPort());
+			AddClient(client);
+		}
+		for (std::list<ClientStruct>::const_iterator cit = child->m_clients.begin(); cit != child->m_clients.end(); ++cit) {
+			AddClient(*cit);
+		}
 	}
 
 	m_sourceCount = sourceCount;
@@ -293,4 +299,28 @@
 
 	SetFileName((*best)->GetFileName());
 }
+
+void CSearchFile::SetDownloadStatus()
+{
+	bool isPart		= theApp->downloadqueue->GetFileByID(m_abyFileHash) != NULL;
+	bool isKnown	= theApp->knownfiles->FindKnownFileByID(m_abyFileHash) != NULL;
+	bool isCanceled	= theApp->canceledfiles->IsCanceledFile(m_abyFileHash);
+
+	if (isCanceled && isPart) {
+		m_downloadStatus = QUEUEDCANCELED;
+	} else if (isCanceled) {
+		m_downloadStatus = CANCELED;
+	} else if (isPart) {
+		m_downloadStatus = QUEUED;
+	} else if (isKnown) {
+		m_downloadStatus = DOWNLOADED;
+	} else {
+		m_downloadStatus = NEW;
+	}
+	// Update status of children too
+	for (CSearchResultList::iterator it = m_children.begin(); it != m_children.end(); it++) {
+		Notify_Search_Update_Sources(*it);
+	}
+}
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/SearchFile.h -> aMule-2.3.1.tar.bz2/src/SearchFile.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -54,9 +54,8 @@
  *
  * TODO: Server IP/Port are currently not used.
  * TODO: Client ID/Port are currently not used.
- * TODO: Directories are currently not used.
  */
-class CSearchFile : public CAbstractFile
+class CSearchFile : public CAbstractFile, public CECID
 {	
 public:
 	/** Constructor used to create results on the remote GUI. */
@@ -100,25 +99,40 @@
 	void MergeResults(const CSearchFile& other);
 
 	/** Returns the total number of sources. */
-	uint32 GetSourceCount() const;
+	uint32 GetSourceCount() const			{ return m_sourceCount; }
 	/** Returns the number of sources that have the entire file. */
-	uint32 GetCompleteSourceCount() const;
+	uint32 GetCompleteSourceCount() const	{ return m_completeSourceCount; }
 	/** Returns the ID of the search, used to select the right list when displaying. */
-	wxUIntPtr GetSearchID() const;
+	wxUIntPtr GetSearchID() const			{ return m_searchID; }
 	/** Returns true if the result is from a Kademlia search. */
-	bool IsKademlia() const;
-	
+	bool IsKademlia() const					{ return m_kademlia; }
+
+	// Possible download status of a file
+	enum DownloadStatus {
+		NEW,				// not known
+		DOWNLOADED,			// successfully downloaded or shared
+		QUEUED,				// downloading (Partfile)
+		CANCELED,			// canceled
+		QUEUEDCANCELED		// canceled once, but now downloading again
+	};
+
+	/** Returns the download status. */
+	enum DownloadStatus GetDownloadStatus() const	{ return m_downloadStatus; }
+	/** Set download status according to the global lists of knownfile, partfiles, canceledfiles. */
+	void SetDownloadStatus();
+	/** Set download status directly. */
+	void SetDownloadStatus(enum DownloadStatus s)	{ m_downloadStatus = s; }
 		
 	/** Returns the parent of this file. */
-	CSearchFile *GetParent() const;
+	CSearchFile *GetParent() const			{ return m_parent; }
 	/** Returns the list of children belonging to this file. */
-	const CSearchResultList &GetChildren() const;
+	const CSearchResultList &GetChildren() const	{ return m_children; }
 	/** Returns true if this item has children. */
-	bool HasChildren() const;
+	bool HasChildren() const				{ return !m_children.empty(); }
 	/** Returns true if children should be displayed. */
-	bool ShowChildren() const;
+	bool ShowChildren() const				{ return m_showChildren; }
 	/** Enable/Disable displaying of children (set in CSearchListCtrl). */
-	void SetShowChildren(bool show);
+	void SetShowChildren(bool show)			{ m_showChildren = show; }
 	
 	/**
 	 * Adds the given file as a child of this file.
@@ -131,38 +145,39 @@
 	 */
 	void		AddChild(CSearchFile* file);
 
-       struct ClientStruct {
-               ClientStruct()
-                       : m_ip(0), m_port(0), m_serverIP(0), m_serverPort(0)
-               {}
-
-               ClientStruct(uint32_t ip, uint16_t port, uint32_t serverIP, uint16_t serverPort)
-                       : m_ip(ip), m_port(port), m_serverIP(serverIP), m_serverPort(serverPort)
-               {}
-
-               uint32_t m_ip;
-               uint16_t m_port;
-               uint32_t m_serverIP;
-               uint32_t m_serverPort;
-       };
-
-       void     AddClient(const ClientStruct& client);
-       const std::list<ClientStruct>& GetClients() const       { return m_clients; }
+	struct ClientStruct {
+		ClientStruct()
+			: m_ip(0), m_port(0), m_serverIP(0), m_serverPort(0)
+		{}
+
+		ClientStruct(uint32_t ip, uint16_t port, uint32_t serverIP, uint16_t serverPort)
+			: m_ip(ip), m_port(port), m_serverIP(serverIP), m_serverPort(serverPort)
+		{}
+
+		uint32_t m_ip;
+		uint16_t m_port;
+		uint32_t m_serverIP;
+		uint32_t m_serverPort;
+	};
+
+	void	 AddClient(const ClientStruct& client);
+	const std::list<ClientStruct>& GetClients() const	{ return m_clients; }
+
+	uint32_t GetClientID() const throw()			{ return m_clientID; }
+	void	 SetClientID(uint32_t clientID) throw()		{ m_clientID = clientID; }
+	uint16_t GetClientPort() const throw()			{ return m_clientPort; }
+	void	 SetClientPort(uint16_t port) throw()		{ m_clientPort = port; }
+	uint32_t GetClientServerIP() const throw()		{ return m_clientServerIP; }
+	void	 SetClientServerIP(uint32_t serverIP) throw()	{ m_clientServerIP = serverIP; }
+	uint16_t GetClientServerPort() const throw()		{ return m_clientServerPort; }
+	void	 SetClientServerPort(uint16_t port) throw()	{ m_clientServerPort = port; }
+	int	 GetClientsCount() const			{ return ((GetClientID() && GetClientPort()) ? 1 : 0) + m_clients.size(); }
 
-       uint32_t GetClientID() const throw()                    { return m_clientID; }
-       void     SetClientID(uint32_t clientID) throw()         { m_clientID = clientID; }
-       uint16_t GetClientPort() const throw()                  { return m_clientPort; }
-       void     SetClientPort(uint16_t port) throw()           { m_clientPort = port; }
-       uint32_t GetClientServerIP() const throw()              { return m_clientServerIP; }
-       void     SetClientServerIP(uint32_t serverIP) throw()   { m_clientServerIP = serverIP; }
-       uint16_t GetClientServerPort() const throw()            { return m_clientServerPort; }
-       void     SetClientServerPort(uint16_t port) throw()     { m_clientServerPort = port; }
-       int      GetClientsCount() const                        { return ((GetClientID() && GetClientPort()) ? 1 : 0) + m_clients.size(); }
-
-	
 	void	 SetKadPublishInfo(uint32_t val) throw()	{ m_kadPublishInfo = val; }
 	uint32_t GetKadPublishInfo() const throw()		{ return m_kadPublishInfo; }
 
+	const wxString& GetDirectory() const throw()	{ return m_directory; }
+
 private:
 	//! CSearchFile is not assignable.
 	CSearchFile& operator=(const CSearchFile& other);
@@ -189,17 +204,17 @@
 	uint32			m_completeSourceCount;
 	//! Specifies if the result is from a kademlia search.
 	bool			m_kademlia;
+	//! The download status.
+	enum DownloadStatus m_downloadStatus;
 
-	//@{
-	//! TODO: Currently not used.
+	//! Directory where file is stored (when it is part of a remote shared files list).
 	wxString		m_directory;
-	//@}
 
-       std::list<ClientStruct> m_clients;
-       uint32_t                m_clientID;
-       uint16_t                m_clientPort;
-       uint32_t                m_clientServerIP;
-       uint16_t                m_clientServerPort;
+	std::list<ClientStruct>	m_clients;
+	uint32_t		m_clientID;
+	uint16_t		m_clientPort;
+	uint32_t		m_clientServerIP;
+	uint16_t		m_clientServerPort;
 
 	//! Kademlia publish information.
 	uint32_t		m_kadPublishInfo;
@@ -209,63 +224,5 @@
 };
 
 
-////////////////////////////////////////////////////////////
-// Implementations
-
-
-inline uint32 CSearchFile::GetSourceCount() const
-{
-	return m_sourceCount;
-}
-
-
-inline uint32 CSearchFile::GetCompleteSourceCount() const
-{
-	return m_completeSourceCount; 
-}
-
-
-inline wxUIntPtr CSearchFile::GetSearchID() const
-{
-	return m_searchID;
-}
-
-
-inline bool CSearchFile::IsKademlia() const
-{
-	return m_kademlia;
-}
-
-
-inline CSearchFile* CSearchFile::GetParent() const
-{
-	return m_parent;
-}
-
-
-inline bool CSearchFile::ShowChildren() const
-{
-	return m_showChildren;
-}
-
-
-inline void CSearchFile::SetShowChildren(bool show)
-{
-	m_showChildren = show;
-}
-
-
-inline const CSearchResultList& CSearchFile::GetChildren() const
-{
-	return m_children;
-}
-
-
-inline bool CSearchFile::HasChildren() const
-{
-	return !m_children.empty();
-}
-
-
 #endif // SEARCHLIST_H
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/SearchList.cpp -> aMule-2.3.1.tar.bz2/src/SearchList.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -74,7 +74,7 @@
 	int iOpOr = 0;
 	int iOpNot = 0;
 
-	for (unsigned int i = 0; i < pexpr->m_aExpr.Count(); i++) {
+	for (unsigned int i = 0; i < pexpr->m_aExpr.GetCount(); i++) {
 		wxString str(pexpr->m_aExpr[i]);
 		if (str == SEARCHOPTOK_AND) {
 			iOpAnd++;
@@ -109,7 +109,7 @@
 	// optimize search expression, if no OR nor NOT specified
 	if (iOpAnd > 0 && iOpOr == 0 && iOpNot == 0) {
 		wxString strAndTerms;
-		for (unsigned int i = 0; i < pexpr->m_aExpr.Count(); i++) {
+		for (unsigned int i = 0; i < pexpr->m_aExpr.GetCount(); i++) {
 			if (pexpr->m_aExpr[i] != SEARCHOPTOK_AND) {
 				// Minor optimization: Because we added the Kad keyword to the boolean search expression,
 				// we remove it here (and only here) again because we know that the entire search expression
@@ -122,7 +122,7 @@
 				}
 			}
 		}
-		wxASSERT( _SearchExpr.m_aExpr.Count() == 0);
+		wxASSERT( _SearchExpr.m_aExpr.GetCount() == 0);
 		_SearchExpr.m_aExpr.Add(strAndTerms);
 	} else {
 		if (pexpr->m_aExpr.GetCount() != 1 || pexpr->m_aExpr[0] != s_strCurKadKeyword)			
@@ -259,7 +259,7 @@
 
 CSearchList::~CSearchList()
 {
-	StopGlobalSearch();
+	StopSearch();
 
 	while (!m_results.empty()) {
 		RemoveResults(m_results.begin()->first);
@@ -313,10 +313,10 @@
 	CMemFilePtr data = CreateSearchData(params, type, supports64bit, packetUsing64bit);
 	
 	if (data.get() == NULL) {
-		wxASSERT(_astrParserErrors.Count());
+		wxASSERT(_astrParserErrors.GetCount());
 		wxString error;
 		
-		for (unsigned int i = 0; i < _astrParserErrors.Count(); ++i) {
+		for (unsigned int i = 0; i < _astrParserErrors.GetCount(); ++i) {
 			error += _astrParserErrors[i] + wxT("\n");
 		}
 		
@@ -331,13 +331,15 @@
 			}
 		
 			// searchstring will get tokenized there
-			// The tab must be created with the Kad search ID, so seardhID is updated.
+			// The tab must be created with the Kad search ID, so searchID is updated.
 			Kademlia::CSearch* search = Kademlia::CSearchManager::PrepareFindKeywords(
 										 params.searchString, data->GetLength(), data->GetRawBuffer(), *searchID);
 
 			*searchID = search->GetSearchID();
+			m_currentSearch = *searchID;
+			m_KadSearchFinished = false;
 		} catch (const wxString& what) {
-			AddLogLineM(true, what);
+			AddLogLineC(what);
 			return _("Unexpected error while attempting Kad search: ") + what;				
 		}
 	} else {
@@ -351,6 +353,7 @@
 		theApp->serverconnect->SendPacket(searchPacket, (type == LocalSearch));
 
 		if (type == GlobalSearch) {
+			delete m_searchPacket;
 			m_searchPacket = searchPacket;
 			m_64bitSearchPacket = packetUsing64bit;
 			m_searchPacket->SetOpCode(OP_GLOBSEARCHREQ); // will be changed later when actually sending the packet!!
@@ -378,7 +381,12 @@
 
 uint32 CSearchList::GetSearchProgress() const
 {
-	if (m_searchInProgress == false) {
+	if (m_searchType == KadSearch) {
+		// We cannot measure the progress of Kad searches.
+		// But we can tell when they are over.
+		return m_KadSearchFinished ? 0xfffe : 0;
+	}
+	if (m_searchInProgress == false) {	// true only for ED2K search
 		// No search, no progress ;)
 		return 0;
 	}
@@ -390,14 +398,11 @@
 		case GlobalSearch:
 			return 100 - (m_serverQueue.GetRemaining() * 100) 
 					/ theApp->serverlist->GetServerCount();
-
-		case KadSearch:
-			// We cannot measure the progress of Kad searches.
-			return 0;
 		
 		default:
-			wxCHECK(false, 0);
+			wxFAIL;
 	}
+	return 0;
 }
 
 
@@ -435,24 +440,24 @@
 					extSearchPacket->CopyToDataBuffer(data.GetLength(), m_searchPacket->GetDataBuffer(), m_searchPacket->GetPacketSize());
 					theStats::AddUpOverheadServer(extSearchPacket->GetPacketSize());
 					theApp->serverconnect->SendUDPPacket(extSearchPacket, server, true);
-					AddDebugLogLineM(false, logServerUDP, wxT("Sending OP_GLOBSEARCHREQ3 to server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()));
+					AddDebugLogLineN(logServerUDP, wxT("Sending OP_GLOBSEARCHREQ3 to server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()));
 				} else if (server->GetUDPFlags() & SRV_UDPFLG_EXT_GETFILES) {
 					if (!m_64bitSearchPacket || server->SupportsLargeFilesUDP()) {
 						m_searchPacket->SetOpCode(OP_GLOBSEARCHREQ2);
-						AddDebugLogLineM(false, logServerUDP, wxT("Sending OP_GLOBSEARCHREQ2 to server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()));
+						AddDebugLogLineN(logServerUDP, wxT("Sending OP_GLOBSEARCHREQ2 to server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()));
 						theStats::AddUpOverheadServer(m_searchPacket->GetPacketSize());
 						theApp->serverconnect->SendUDPPacket(m_searchPacket, server, false);
 					} else {
-						AddDebugLogLineM(false, logServerUDP, wxT("Skipped UDP search on server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()) + wxT(": No large file support"));
+						AddDebugLogLineN(logServerUDP, wxT("Skipped UDP search on server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()) + wxT(": No large file support"));
 					}
 				} else {
 					if (!m_64bitSearchPacket || server->SupportsLargeFilesUDP()) {
 						m_searchPacket->SetOpCode(OP_GLOBSEARCHREQ);
-						AddDebugLogLineM(false, logServerUDP, wxT("Sending OP_GLOBSEARCHREQ to server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()));
+						AddDebugLogLineN(logServerUDP, wxT("Sending OP_GLOBSEARCHREQ to server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()));
 						theStats::AddUpOverheadServer(m_searchPacket->GetPacketSize());
 						theApp->serverconnect->SendUDPPacket(m_searchPacket, server, false);
 					} else {
-						AddDebugLogLineM(false, logServerUDP, wxT("Skipped UDP search on server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()) + wxT(": No large file support"));
+						AddDebugLogLineN(logServerUDP, wxT("Skipped UDP search on server ") + Uint32_16toStringIP_Port(server->GetIP(), server->GetPort()) + wxT(": No large file support"));
 					}
 				}
 				CoreNotify_Search_Update_Progress(GetSearchProgress());
@@ -461,7 +466,7 @@
 		}
 	}	
 	// No more servers left to ask.
-	StopGlobalSearch();
+	StopSearch(true);
 }
 
 
@@ -483,7 +488,7 @@
 	bool unicoded = (sender->GetUnicodeSupport() != utf8strNone);
 	for (unsigned int i = 0; i != results; ++i){			
 		CSearchFile* toadd = new CSearchFile(packet, unicoded, searchID, 0, 0, directory);
-		if (sender){
+		if (sender) {
 			toadd->SetClientID(sender->GetUserIDHybrid());
 			toadd->SetClientPort(sender->GetUserPort());
 		}
@@ -510,9 +515,9 @@
 {
 	CMemFile packet(in_packet, size);
 
-       uint32_t results = packet.ReadUInt32();
-       for (; results > 0; --results) {
-               AddToList(new CSearchFile(packet, optUTF8, m_currentSearch, serverIP, serverPort), false);
+	uint32_t results = packet.ReadUInt32();
+	for (; results > 0; --results) {
+		AddToList(new CSearchFile(packet, optUTF8, m_currentSearch, serverIP, serverPort), false);
 	}
 }
 
@@ -528,7 +533,7 @@
 	const uint64 fileSize = toadd->GetFileSize();
 	// If filesize is 0, or file is too large for the network, drop it 
 	if ((fileSize == 0) || (fileSize > MAX_FILE_SIZE)) {
-		AddDebugLogLineM(false, logSearch,
+		AddDebugLogLineN(logSearch,
 				CFormat(wxT("Dropped result with filesize %u: %s"))
 					% fileSize
 					% toadd->GetFileName());
@@ -540,7 +545,7 @@
 	// If the result was not the type the user wanted, drop it.
 	if ((clientResponse == false) && !m_resultType.IsEmpty()) {
 		if (GetFileTypeByName(toadd->GetFileName()) != m_resultType) {
-			AddDebugLogLineM( false, logSearch,
+			AddDebugLogLineN(logSearch,
 				CFormat( wxT("Dropped result type %s != %s, file %s") )
 					% GetFileTypeByName(toadd->GetFileName())
 					% m_resultType
@@ -559,7 +564,7 @@
 		CSearchFile* item = results.at(i);
 		
 		if ((toadd->GetFileHash() == item->GetFileHash()) && (toadd->GetFileSize() == item->GetFileSize())) {
-			AddDebugLogLineM(false, logSearch, CFormat(wxT("Received duplicate results for '%s' : %s")) % item->GetFileName() % item->GetFileHash().Encode());
+			AddDebugLogLineN(logSearch, CFormat(wxT("Received duplicate results for '%s' : %s")) % item->GetFileName() % item->GetFileHash().Encode());
 			// Add the child, possibly updating the parents filename.
 			item->AddChild(toadd);
 			Notify_Search_Update_Sources(item);
@@ -567,7 +572,7 @@
 		}
 	}
 
-	AddDebugLogLineM(false, logSearch,
+	AddDebugLogLineN(logSearch,
 		CFormat(wxT("Added new result '%s' : %s")) 
 			% toadd->GetFileName() % toadd->GetFileHash().Encode());
 	
@@ -609,23 +614,28 @@
 }
 
 
-void CSearchList::StopGlobalSearch()
+void CSearchList::StopSearch(bool globalOnly)
 {
-	m_currentSearch = -1;
-	delete m_searchPacket;
-	m_searchPacket = NULL;
-	m_searchInProgress = false;
-	
-	// Order is crucial here: on wx_MSW an additional event can be generated during the stop.
-	// So the packet has to be deleted first, so that OnGlobalSearchTimer() returns immediately
-	// without calling StopGlobalSearch() again.
-	m_searchTimer.Stop();
+	if (m_searchType == GlobalSearch) {
+		m_currentSearch = -1;
+		delete m_searchPacket;
+		m_searchPacket = NULL;
+		m_searchInProgress = false;
+
+		// Order is crucial here: on wx_MSW an additional event can be generated during the stop.
+		// So the packet has to be deleted first, so that OnGlobalSearchTimer() returns immediately
+		// without calling StopGlobalSearch() again.
+		m_searchTimer.Stop();
 
-	CoreNotify_Search_Update_Progress(0xffff);
+		CoreNotify_Search_Update_Progress(0xffff);
+	} else if (m_searchType == KadSearch && !globalOnly) {
+		Kademlia::CSearchManager::StopSearch(m_currentSearch, false);
+		m_currentSearch = -1;
+	}
 }
 
 
-CSearchList::CMemFilePtr CSearchList::CreateSearchData(const CSearchParams& params, SearchType type, bool supports64bit, bool& packetUsing64bit)
+CSearchList::CMemFilePtr CSearchList::CreateSearchData(const CSearchParams& params, SearchType WXUNUSED(type), bool supports64bit, bool& packetUsing64bit)
 {
 	// Count the number of used parameters
 	unsigned int parametercount = 0;
@@ -657,35 +667,36 @@
 	LexFree();
 	
 #ifdef __DEBUG__
-	printf("Search parsing result for \"%s\": %i\n",
-		(const char*)unicode2UTF8(params.searchString),iParseResult);
+	AddLogLineNS(CFormat(wxT("Search parsing result for \"%s\": %i"))
+		% params.searchString % iParseResult);
 #endif
-	if (_astrParserErrors.Count() > 0) {
-		for (unsigned int i=0; i < _astrParserErrors.Count(); ++i) {
-			printf("Error %u: %s\n",i,(const char*)unicode2UTF8(_astrParserErrors[i]));
+	if (_astrParserErrors.GetCount() > 0) {
+		for (unsigned int i=0; i < _astrParserErrors.GetCount(); ++i) {
+			AddLogLineNS(CFormat(wxT("Error %u: %s\n")) % i % _astrParserErrors[i]);
 		}
 		
 		return CMemFilePtr(NULL);
 	}
 
 	if (iParseResult != 0) {
-		_astrParserErrors.Add(wxString::Format(wxT("Undefined error %i on search expression"),iParseResult));
+		_astrParserErrors.Add(CFormat(wxT("Undefined error %i on search expression")) % iParseResult);
 	
 		return CMemFilePtr(NULL);
 	}
 	
 	#ifdef __DEBUG__
-	printf("Search expression: ");
-	for (unsigned int i = 0; i < _SearchExpr.m_aExpr.Count(); i++){
-		printf("%s ",(const char*)unicode2char(_SearchExpr.m_aExpr[i]));
+	wxString mes(wxT("Search expression:"));
+	for (unsigned int i = 0; i < _SearchExpr.m_aExpr.GetCount(); i++) {
+		mes << wxT(" ") << _SearchExpr.m_aExpr[i];
 	}
-	printf("\nExpression count: %i\n",(int)_SearchExpr.m_aExpr.GetCount());
+	AddLogLineNS(mes);
+	AddLogLineNS(CFormat(wxT("Expression count: %i")) % _SearchExpr.m_aExpr.GetCount());
 	#endif
 
 	parametercount += _SearchExpr.m_aExpr.GetCount();
 	
 	#ifdef __DEBUG__
-	printf("Parameters: %i\n",parametercount);
+	AddLogLineNS(CFormat(wxT("Parameters: %i")) % parametercount);
 	#endif
 	
 	/* Leave the unicode comment there, please... */
@@ -1003,4 +1014,20 @@
 	AddToList(tempFile);
 }
 
+void CSearchList::UpdateSearchFileByHash(const CMD4Hash& hash)
+{
+	for (ResultMap::iterator it = m_results.begin(); it != m_results.end(); it++) {
+		CSearchResultList& results = it->second;
+		for (size_t i = 0; i < results.size(); ++i) {
+			CSearchFile* item = results.at(i);
+			
+			if (hash == item->GetFileHash()) {
+				// This covers only parent items,
+				// child items have to be updated separately.
+				Notify_Search_Update_Sources(item);
+			}
+		}
+	}
+}
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/SearchList.h -> aMule-2.3.1.tar.bz2/src/SearchList.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -92,8 +92,8 @@
 	 */ 	
 	wxString StartNewSearch(uint32* searchID, SearchType type, const CSearchParams& params);
 
-	/** Stops the current search, if any is in progress. */
-	void StopGlobalSearch();
+	/** Stops the current search (global or Kad), if any is in progress. */
+	void StopSearch(bool globalOnly = false);
 
 	/** Returns the completion percentage of the current search. */
 	uint32 GetSearchProgress() const;
@@ -137,8 +137,8 @@
 	 * @param serverIP The IP of the server sending the results.
 	 * @param serverPort The Port of the server sending the results.
 	 */
-	void    ProcessSearchAnswer(const uint8_t* packet, uint32_t size, bool optUTF8, uint32_t serverIP, uint16_t serverPort);
-
+	void	ProcessSearchAnswer(const uint8_t* packet, uint32_t size, bool optUTF8, uint32_t serverIP, uint16_t serverPort);
+	
 	/**
 	 * Processes a search-result sent via UDP. Only one result is read from the packet.
 	 *
@@ -163,6 +163,11 @@
 	 */
 	void	KademliaSearchKeyword(uint32_t searchID, const Kademlia::CUInt128 *fileID, const wxString& name, uint64_t size, const wxString& type, uint32_t kadPublishInfo, const TagPtrList& taglist);
 	
+	/** Update a certain search result in all lists */
+	void UpdateSearchFileByHash(const CMD4Hash& hash);
+	
+	/** Mark current KAD search as finished */
+	void SetKadSearchFinished() { m_KadSearchFinished = true; }
 	
 private:
 	/** Event-handler for global searches. */
@@ -205,6 +210,9 @@
 	//! Does the current search packet contain 64bit values?
 	bool		m_64bitSearchPacket;
 
+	//! If the current search is a KAD search this signals if it is finished.
+	bool		m_KadSearchFinished;
+
 	//! Queue of servers to ask when doing global searches.
 	//! TODO: Replace with 'cookie' system.
 	CQueueObserver<CServer*> m_serverQueue;

aMule-2.2.6.tar.bz2/src/SearchListCtrl.cpp -> aMule-2.3.1.tar.bz2/src/SearchListCtrl.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,17 +27,15 @@
 
 #include <common/MenuIDs.h>
 
-#include "amule.h"		// Needed for theApp
-#include "DownloadQueue.h"	// Needed for CDownloadQueue
+#include "amule.h"			// Needed for theApp
 #include "KnownFileList.h"	// Needed for CKnownFileList
-#include "PartFile.h"		// Needed for CPartFile and CKnownFile
 #include "SearchList.h"		// Needed for CSearchFile
 #include "SearchDlg.h"		// Needed for CSearchDlg
 #include "amuleDlg.h"		// Needed for CamuleDlg
 #include "muuli_wdr.h"		// Needed for clientImages
 #include "Preferences.h"	// Needed for thePrefs
 #include "GuiEvents.h"		// Needed for CoreNotify_Search_Add_Download
-
+#include "MuleColour.h"
 
 BEGIN_EVENT_TABLE(CSearchListCtrl, CMuleListCtrl)
 	EVT_LIST_ITEM_RIGHT_CLICK(-1, CSearchListCtrl::OnRightClick)
@@ -63,7 +61,9 @@
 	ID_SEARCH_COL_SIZE,
 	ID_SEARCH_COL_SOURCES,
 	ID_SEARCH_COL_TYPE,
-	ID_SEARCH_COL_FILEID
+	ID_SEARCH_COL_FILEID,
+	ID_SEARCH_COL_STATUS,
+	ID_SEARCH_COL_DIRECTORY
 };
 
 
@@ -84,11 +84,13 @@
 	// Setting the sorter function.
 	SetSortFunc( SortProc );
 
-	InsertColumn( ID_SEARCH_COL_NAME,    _("File Name"), wxLIST_FORMAT_LEFT, 500);
-	InsertColumn( ID_SEARCH_COL_SIZE,    _("Size"),      wxLIST_FORMAT_LEFT, 100);
-	InsertColumn( ID_SEARCH_COL_SOURCES, _("Sources"),   wxLIST_FORMAT_LEFT, 50);
-	InsertColumn( ID_SEARCH_COL_TYPE,    _("Type"),      wxLIST_FORMAT_LEFT, 65);
-	InsertColumn( ID_SEARCH_COL_FILEID,  _("FileID"),    wxLIST_FORMAT_LEFT, 280);
+	InsertColumn( ID_SEARCH_COL_NAME,    _("File Name"), wxLIST_FORMAT_LEFT, 500, wxT("N") );
+	InsertColumn( ID_SEARCH_COL_SIZE,    _("Size"),      wxLIST_FORMAT_LEFT, 100, wxT("Z") );
+	InsertColumn( ID_SEARCH_COL_SOURCES, _("Sources"),   wxLIST_FORMAT_LEFT,  50, wxT("u") );
+	InsertColumn( ID_SEARCH_COL_TYPE,    _("Type"),      wxLIST_FORMAT_LEFT,  65, wxT("Y") );
+	InsertColumn( ID_SEARCH_COL_FILEID,  _("FileID"),    wxLIST_FORMAT_LEFT, 280, wxT("I") );
+	InsertColumn( ID_SEARCH_COL_STATUS,  _("Status"),    wxLIST_FORMAT_LEFT, 100, wxT("S") );
+	InsertColumn( ID_SEARCH_COL_DIRECTORY,  _("Directories"),    wxLIST_FORMAT_LEFT, 280, wxT("D") );  // I would have prefered "Directory" but this is already translated
 
 	m_nResultsID = 0;
 
@@ -111,6 +113,12 @@
 }
 
 
+wxString CSearchListCtrl::GetOldColumnOrder() const
+{
+	return wxT("N,Z,u,Y,I,S");
+}
+
+
 CSearchListCtrl::~CSearchListCtrl()
 {
 	std::list<CSearchListCtrl*>::iterator it = std::find( s_lists.begin(), s_lists.end(), this );
@@ -131,11 +139,12 @@
 	wxCHECK_RET(toshow->GetSearchID() == m_nResultsID, wxT("Wrong search-id for result-list"));
 
 	const wxUIntPtr toshowdata = reinterpret_cast<wxUIntPtr>(toshow);
+	CSearchFile* parent = toshow->GetParent();
 
 	// Check if the result should be shown
 	if (FindItem(-1, toshowdata) != -1) {
 		return;
-	} else if (toshow->GetParent() && !toshow->GetParent()->ShowChildren()) {
+	} else if (parent && !parent->ShowChildren()) {
 		return;
 	} else if (!IsFiltered(toshow)) {
 		if (toshow->HasChildren() && toshow->ShowChildren()) {
@@ -161,13 +170,23 @@
 	}
 
 	// Insert the item before the item found by the search
-	uint32 newid = InsertItem(GetInsertPos(toshowdata), toshow->GetFileName().GetPrintable());
+	long insertPos;
+	if (parent) {
+		insertPos = FindItem(-1, (wxUIntPtr)parent);
+		if (insertPos == -1) {
+			wxFAIL;
+			insertPos = GetItemCount();
+		} else {
+			insertPos++;
+		}
+	} else {
+		insertPos = GetInsertPos(toshowdata);
+	}
+	long newid = InsertItem(insertPos, toshow->GetFileName().GetPrintable());
 
 	// Sanity checks to ensure that results/children are properly positioned.
 #ifdef __WXDEBUG__
 	{
-		CSearchFile* parent = toshow->GetParent();
-
 		if (newid > 0) {
 			CSearchFile* before = (CSearchFile*)GetItemData(newid - 1);
 			wxASSERT(before);
@@ -196,18 +215,21 @@
 	SetItem(newid, ID_SEARCH_COL_SIZE, CastItoXBytes( toshow->GetFileSize() ) );
 
 	// Source count
-       wxString temp = wxString::Format(wxT("%d"), toshow->GetSourceCount());
-       if (toshow->GetCompleteSourceCount()) {
-               temp += wxString::Format(wxT(" (%d)"), toshow->GetCompleteSourceCount());
-       }
-       if (toshow->GetClientsCount()) {
-               temp += wxString::Format(wxT(" [%d]"), toshow->GetClientsCount());
-       }
-#ifdef __DEBUG__
+	wxString temp = CFormat(wxT("%d")) % toshow->GetSourceCount();
+	if (toshow->GetCompleteSourceCount()) {
+		temp += CFormat(wxT(" (%d)")) % toshow->GetCompleteSourceCount();
+	}
+	if (toshow->GetClientsCount()) {
+		temp += CFormat(wxT(" [%d]")) % toshow->GetClientsCount();
+	}
+#if defined(__DEBUG__) && !defined(CLIENT_GUI)
 	if (toshow->GetKadPublishInfo() == 0) {
 		temp += wxT(" | -");
 	} else {
-		temp += wxString::Format(wxT(" | N:%u, P:%u, T:%0.2f"), (toshow->GetKadPublishInfo() & 0xFF000000) >> 24, (toshow->GetKadPublishInfo() & 0x00FF0000) >> 16, (toshow->GetKadPublishInfo() & 0x0000FFFF) / 100.0);
+		temp += CFormat(wxT(" | N:%u, P:%u, T:%0.2f"))
+			% ((toshow->GetKadPublishInfo() & 0xFF000000) >> 24)
+			% ((toshow->GetKadPublishInfo() & 0x00FF0000) >> 16)
+			% ((toshow->GetKadPublishInfo() & 0x0000FFFF) / 100.0);
 	}
 #endif
 	SetItem( newid, ID_SEARCH_COL_SOURCES, temp );
@@ -218,6 +240,12 @@
 	// File-hash
 	SetItem(newid, ID_SEARCH_COL_FILEID, toshow->GetFileHash().Encode() );
 
+	// File status
+	SetItem(newid, ID_SEARCH_COL_STATUS, DetermineStatusPrintable(toshow));
+
+	// Directory where file is located (has a value when search file comes from a "view shared files" request)
+	SetItem(newid, ID_SEARCH_COL_DIRECTORY, toshow->GetDirectory());
+
 	// Set the color of the item
 	UpdateItemColor( newid );
 }
@@ -246,22 +274,27 @@
 		// Update the filename, which may be changed in case of multiple variants.
 		SetItem(index, ID_SEARCH_COL_NAME, toupdate->GetFileName().GetPrintable());
 
-               wxString temp = wxString::Format(wxT("%d"), toupdate->GetSourceCount());
-               if (toupdate->GetCompleteSourceCount()) {
-                       temp += wxString::Format(wxT(" (%d)"), toupdate->GetCompleteSourceCount());
-               }
-               if (toupdate->GetClientsCount()) {
-                       temp += wxString::Format(wxT(" [%d]"), toupdate->GetClientsCount());
-               }
-#ifdef __DEBUG__
+		wxString temp = CFormat(wxT("%d")) % toupdate->GetSourceCount();
+		if (toupdate->GetCompleteSourceCount()) {
+			temp += CFormat(wxT(" (%d)")) % toupdate->GetCompleteSourceCount();
+		}
+		if (toupdate->GetClientsCount()) {
+			temp += CFormat(wxT(" [%d]")) % toupdate->GetClientsCount();
+		}
+#if defined(__DEBUG__) && !defined(CLIENT_GUI)
 		if (toupdate->GetKadPublishInfo() == 0) {
 			temp += wxT(" | -");
 		} else {
-			temp += wxString::Format(wxT(" | N:%u, P:%u, T:%0.2f"), (toupdate->GetKadPublishInfo() & 0xFF000000) >> 24, (toupdate->GetKadPublishInfo() & 0x00FF0000) >> 16, (toupdate->GetKadPublishInfo() & 0x0000FFFF) / 100.0);
+			temp += CFormat(wxT(" | N:%u, P:%u, T:%0.2f"))
+				% ((toupdate->GetKadPublishInfo() & 0xFF000000) >> 24)
+				% ((toupdate->GetKadPublishInfo() & 0x00FF0000) >> 16)
+				% ((toupdate->GetKadPublishInfo() & 0x0000FFFF) / 100.0);
 		}
 #endif
 		SetItem(index, ID_SEARCH_COL_SOURCES, temp);
 
+		SetItem(index, ID_SEARCH_COL_STATUS, DetermineStatusPrintable(toupdate));
+
 		UpdateItemColor(index);
 
 		// Deletions of items causes rather large amount of flicker, so to
@@ -273,40 +306,46 @@
 }
 
 
-void CSearchListCtrl::UpdateItemColor( long index )
+void CSearchListCtrl::UpdateItemColor(long index)
 {
 	wxListItem item;
 	item.SetId( index );
 	item.SetColumn( ID_SEARCH_COL_SIZE );
-	item.SetMask( wxLIST_MASK_STATE|wxLIST_MASK_TEXT|wxLIST_MASK_IMAGE|wxLIST_MASK_DATA|wxLIST_MASK_WIDTH|wxLIST_MASK_FORMAT );
+	item.SetMask(
+		wxLIST_MASK_STATE |
+		wxLIST_MASK_TEXT |
+		wxLIST_MASK_IMAGE |
+		wxLIST_MASK_DATA |
+		wxLIST_MASK_WIDTH |
+		wxLIST_MASK_FORMAT);
 
-	if ( GetItem(item) ) {
-		wxColour newcol = SYSCOLOR(wxSYS_COLOUR_WINDOWTEXT);
+	if (GetItem(item)) {
+		CMuleColour newcol(wxSYS_COLOUR_WINDOWTEXT);
 
 		CSearchFile* file = (CSearchFile*)GetItemData(index);
-		CKnownFile* sameFile = theApp->downloadqueue->GetFileByID(file->GetFileHash());
-		if ( !sameFile ) {
-			sameFile = theApp->knownfiles->FindKnownFileByID(file->GetFileHash());
-		}
 
 		int red		= newcol.Red();
 		int green	= newcol.Green();
 		int blue	= newcol.Blue();
 
-		if ( sameFile ) {
-			if ( sameFile->IsPartFile() ) {
-				// File is already being downloaded. Mark as red.
-				red = 255;
-			} else if ( sameFile->GetStatus() == PS_COMPLETE ) {
-				// File has already been downloaded. Mark as green.
-				green = 200;
-			} else {
-				// File has been cancelled or removed. Mark as grey.
-				red = 128;
-				green = 128;
-				blue = 128;
-			}
-		} else {
+		switch (file->GetDownloadStatus()) {
+		case CSearchFile::DOWNLOADED:
+			// File has already been downloaded. Mark as green.
+			green = 255;
+			break;
+		case CSearchFile::QUEUED:
+			// File is downloading.
+		case CSearchFile::QUEUEDCANCELED:
+			// File is downloading and has been canceled before.
+			// Mark as red
+			red = 255;
+			break;
+		case CSearchFile::CANCELED:
+			// File has been canceled. Mark as magenta.
+			red = 255;
+			blue = 255;
+			break;
+		default:
 			// File is new, colour after number of files
 			blue += file->GetSourceCount() * 5;
 			if ( blue > 255 ) {
@@ -323,26 +362,6 @@
 }
 
 
-// Update the colors of all assosiated items, which means parents and/or siblings.
-void CSearchListCtrl::UpdateAllRelativesColor(
-	CSearchFile *file,
-	long index)
-{
-	if ((file->ShowChildren() && file->HasChildren()) ||
-	    file->GetParent()) {
-		CSearchFile *parent = file->GetParent() ?
-			file->GetParent() : file;
-		const CSearchResultList &list = parent->GetChildren();
-		for (size_t j = 0; j < list.size(); ++j) {
-			UpdateItemColor(FindItem(-1, reinterpret_cast<wxUIntPtr>(list.at(j))));
-		}
-		UpdateItemColor(FindItem(-1, reinterpret_cast<wxUIntPtr>(parent)));
-	} else {		
-		UpdateItemColor(index);
-	}
-}
-
-
 void CSearchListCtrl::ShowResults( long ResultsID )
 {
 	DeleteAllItems();
@@ -438,13 +457,8 @@
 	if (m_filterEnabled && m_filter.IsValid()) {
 		result = m_filter.Matches(file->GetFileName().GetPrintable());
 		result = ((result && !m_invert) || (!result && m_invert));
-	
 		if (result && m_filterKnown) {
-			result = !theApp->downloadqueue->GetFileByID(file->GetFileHash());
-
-			if (result) {
-				result = !theApp->knownfiles->FindKnownFileByID(file->GetFileHash());
-			}
+			result = file->GetDownloadStatus() == CSearchFile::NEW;
 		}
 	}
 
@@ -530,12 +544,44 @@
 		// Sort by file-hash
 		case ID_SEARCH_COL_FILEID:
 			result = CmpAny(file2->GetFileHash(), file1->GetFileHash());
+			break;
+		
+		// Sort by file status
+		case ID_SEARCH_COL_STATUS:
+			result = CmpAny(DetermineStatusPrintable(file2), DetermineStatusPrintable(file1));
+			break;
+
+		// Sort by directory
+		case ID_SEARCH_COL_DIRECTORY:
+			result = CmpAny(file1->GetDirectory(), file2->GetDirectory());
+			if (result == 0) {	// if equal sort by name
+				result = CmpAny(file1->GetFileName(), file2->GetFileName());
+			}
+			break;
 	}
 
 	return modifier * result;
 }
 
 
+void CSearchListCtrl::SetSorting(unsigned column, unsigned order)
+{
+	Freeze();
+	// First collapse all parent items
+	// Backward order means our index won't be influenced by items getting collapsed.
+	for (int i = GetItemCount(); i--;) {
+		CSearchFile* file = ((CSearchFile*)GetItemData(i));
+		if (file->ShowChildren()) {
+			ShowChildren(file, false);
+		}
+	}
+
+	// Then do the sorting
+	CMuleListCtrl::SetSorting(column, order);
+	Thaw();
+}
+
+
 void CSearchListCtrl::SyncLists( CSearchListCtrl* src, CSearchListCtrl* dst )
 {
 	wxCHECK_RET(src && dst, wxT("NULL argument in SyncLists"));
@@ -557,12 +603,12 @@
 }
 
 
-void CSearchListCtrl::SyncOtherLists( CSearchListCtrl* src )
+void CSearchListCtrl::SyncOtherLists(CSearchListCtrl *src)
 {
 	std::list<CSearchListCtrl*>::iterator it;
 
-	for ( it = s_lists.begin(); it != s_lists.end(); ++it ) {
-		if ( (*it) != src ) {
+	for (it = s_lists.begin(); it != s_lists.end(); ++it) {
+		if ((*it) != src) {
 			SyncLists( src, *it );
 		}
 	}
@@ -587,10 +633,13 @@
 		
 		menu.Append(MP_MENU_CATS, _("Download in category"), cats);
 		menu.AppendSeparator();
-/* Commented out while it's gone
-		menu.Append(MP_RAZORSTATS, _("Get Razorback 2's stats for this file"));
-		menu.AppendSeparator();
-*/
+
+		const wxString & statsServer = thePrefs::GetStatsServerName();
+		if (!statsServer.IsEmpty()) {
+			menu.Append(MP_RAZORSTATS, CFormat(_("Get %s for this file")) % statsServer);
+			menu.AppendSeparator();
+		}
+
 		menu.Append(MP_SEARCHRELATED, _("Search related files (eD2k, local server)"));
 		menu.AppendSeparator();
 
@@ -635,7 +684,7 @@
 	
 	long index = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	
-	while( index != -1 ) {
+	while (index != -1) {
 		CSearchFile* file = (CSearchFile*)GetItemData( index );
 
 		URIs += theApp->CreateED2kLink( file ) + wxT("\n");
@@ -643,7 +692,7 @@
 		index = GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	}
 
-	if ( !URIs.IsEmpty() ) {
+	if (!URIs.IsEmpty()) {
 		theApp->CopyTextToClipboard( URIs.RemoveLast() );
 	}
 }
@@ -652,24 +701,24 @@
 void CSearchListCtrl::OnRazorStatsCheck( wxCommandEvent& WXUNUSED(event) )
 {
 	int item = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	if ( item == -1 ) {
+	if (item == -1) {
 		return;
 	}
 
 	CSearchFile* file = (CSearchFile*)GetItemData( item );
-	theApp->amuledlg->LaunchUrl(wxT("http://stats.razorback2.com/ed2khistory?ed2k=") + file->GetFileHash().Encode());
+	theApp->amuledlg->LaunchUrl(thePrefs::GetStatsServerURL() + file->GetFileHash().Encode());
 }
 
 
 void CSearchListCtrl::OnRelatedSearch( wxCommandEvent& WXUNUSED(event) )
 {
 	int item = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	if ( item == -1 ) {
+	if (item == -1) {
 		return;
 	}
 
 	CSearchFile* file = (CSearchFile*)GetItemData( item );
-	theApp->searchlist->StopGlobalSearch();
+	theApp->searchlist->StopSearch(true);
 	theApp->amuledlg->m_searchwnd->ResetControls();
 	CastByID( IDC_SEARCHNAME, theApp->amuledlg->m_searchwnd, wxTextCtrl )->
 		SetValue(wxT("related::") + file->GetFileHash().Encode());
@@ -685,7 +734,6 @@
 		CSearchFile *searchFile = (CSearchFile *)GetItemData(index);
 		CKnownFile *knownFile(new CKnownFile(*searchFile));
 		theApp->knownfiles->SafeAddKFile(knownFile);
-		UpdateAllRelativesColor(searchFile, index);
 		index = GetNextItem(index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	}
 #endif
@@ -717,12 +765,11 @@
 
 bool CSearchListCtrl::AltSortAllowed(unsigned column) const
 {
-	switch ( column ) {
-		case ID_SEARCH_COL_SOURCES:
-			return true;
-		
-		default:
-			return false;
+	switch (column) {
+	case ID_SEARCH_COL_SOURCES:
+		return true;
+	default:
+		return false;
 	}
 }
 
@@ -741,19 +788,20 @@
 		}		
 	}
 	
+	// Process all selections
 	long index = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	while (index > -1) {
 		CSearchFile* file = (CSearchFile*)GetItemData(index);
 		CoreNotify_Search_Add_Download(file, category);
-		UpdateAllRelativesColor(file, index);
 		index = GetNextItem(index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	}
+	// Listcontrol gets updated by notification when download is started
 }
 
 
 const wxBrush& GetBrush(wxSystemColour index)
 {
-	return *wxTheBrushList->FindOrCreateBrush(SYSCOLOR(index));
+	return CMuleColour(index).GetBrush();
 }
 
 
@@ -766,19 +814,19 @@
 	if (highlighted) {
 		if (GetFocus()) {
 			dc->SetBackground(GetBrush(wxSYS_COLOUR_HIGHLIGHT));
-			dc->SetTextForeground(SYSCOLOR(wxSYS_COLOUR_HIGHLIGHTTEXT));
+			dc->SetTextForeground(CMuleColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
 		} else {
 			dc->SetBackground(GetBrush(wxSYS_COLOUR_BTNSHADOW));
-			dc->SetTextForeground(SYSCOLOR(wxSYS_COLOUR_HIGHLIGHTTEXT));
+			dc->SetTextForeground(CMuleColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
 		}
 	} else {
 		dc->SetBackground(GetBrush(wxSYS_COLOUR_LISTBOX));
-		dc->SetTextForeground(SYSCOLOR(wxSYS_COLOUR_WINDOWTEXT));
+		dc->SetTextForeground(CMuleColour(wxSYS_COLOUR_WINDOWTEXT));
 	}
 
 	// Define the border of the drawn area
-	if ( highlighted ) {
-		dc->SetPen(wxPen(BLEND(dc->GetBackground().GetColour(), 65)));
+	if (highlighted) {
+		dc->SetPen(*(wxThePenList->FindOrCreatePen(CMuleColour(dc->GetBackground().GetColour()).Blend(65), 1, wxSOLID)));
 	} else {
 		dc->SetPen(*wxTRANSPARENT_PEN);
 		dc->SetTextForeground(GetItemTextColour(item));
@@ -856,7 +904,7 @@
 	}
 
 	// Draw tree last so it draws over selected and focus (looks better)
-	if ( tree_show ) {
+	if (tree_show) {
 		// Gather some information
 		const bool notLast = (item + 1 < GetItemCount());
 		const bool notFirst = (item != 0);
@@ -884,7 +932,7 @@
 				// Draw empty circle
 				dc->SetBrush(*wxTRANSPARENT_BRUSH);
 			} else {
-				dc->SetBrush(GetItemTextColour(item));
+				dc->SetBrush(*(wxTheBrushList->FindOrCreateBrush(GetItemTextColour(item))));
 			}
 
 			dc->DrawCircle( treeCenter, middle, 3 );
@@ -948,4 +996,25 @@
 {
 	return GetItemText(item);
 }
+
+
+wxString CSearchListCtrl::DetermineStatusPrintable(CSearchFile *toshow)
+{
+	switch (toshow->GetDownloadStatus()) {
+	case CSearchFile::DOWNLOADED:
+		// File has already been downloaded.
+		return _("Downloaded");
+	case CSearchFile::QUEUED:
+		// File is downloading.
+	case CSearchFile::QUEUEDCANCELED:
+		// File is downloading and has been canceled before.
+		return _("Queued");
+	case CSearchFile::CANCELED:
+		// File has been canceled.
+		return _("Canceled");
+	default:
+		// File is new.
+		return _("New");
+	}
+}
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/SearchListCtrl.h -> aMule-2.3.1.tar.bz2/src/SearchListCtrl.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -107,19 +107,15 @@
 	 *
 	 * @param index The zero-based index of the item.
 	 *
-	 * This function returns the color of the item based on the following:
+	 * This function sets the color of the item based on the following:
 	 *  - Downloading files are marked in red.
 	 *  - Known (shared/completed) files are marked in green.
 	 *  - New files are marked in blue depending on the number of sources.
+	 *  - Canceled files are marked in magenta.
 	 */
 	void UpdateItemColor(long index);
 
 	/**
-	 * Updates the colors of all assosiated items, which means parents and/or siblings.
-	 */
-	void UpdateAllRelativesColor(CSearchFile *file, long index);
-
-	/**
 	 * Returns the current Search Id. 
 	 *
 	 * @return The Search Id of the displayed results (set through ShowResults()).
@@ -138,7 +134,7 @@
 	void	SetFilter(const wxString& regExp, bool invert, bool filterKnown);
 
 	/**
-	 * Toggels the use of filtering on and off.
+	 * Toggles the use of filtering on and off.
 	 */
 	void	EnableFiltering(bool enabled);
 	
@@ -153,7 +149,24 @@
 	 * @param category The target category, or -1 to use the drop-down selection.
 	 */
 	void	DownloadSelected(int category = -1);	
-	
+
+	static wxString DetermineStatusPrintable(CSearchFile *toshow);
+
+protected:
+	/// Return old column order.
+	wxString GetOldColumnOrder() const;
+
+	/**
+	 * Set the sort column
+	 *
+	 * @param column The column with which the list should be sorted.
+	 * @param order The order in which to sort the column.
+	 *
+	 * Note that attempting to sort a column in an unsupported order
+	 * is an illegal operation.
+	 */
+	void SetSorting(unsigned column, unsigned order);
+
 protected:
 	typedef std::list<CSearchFile*> ResultList;

aMule-2.2.6.tar.bz2/src/Server.cpp -> aMule-2.3.1.tar.bz2/src/Server.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -55,32 +55,9 @@
 	}
 }
 
-#ifdef CLIENT_GUI
-CServer::CServer(CEC_Server_Tag *tag)
-{
-	ip = tag->GetIPv4Data().IP();
-	
-	port = tag->GetIPv4Data().m_port;
-	
-	Init();
-	
-	listname = tag->ServerName();
-	description = tag->ServerDesc();
-	maxusers = tag->GetMaxUsers();
-	
-	files = tag->GetFiles();
-	users = tag->GetUsers();
-   
-	preferences = tag->GetPrio(); // SRV_PR_NORMAL = 0, so it's ok
-    staticservermember = tag->GetStatic();
-
-	ping = tag->GetPing();
-	failedcount = tag->GetFailed();	
-}
-#endif
 
 // copy constructor
-CServer::CServer(CServer* pOld)
+CServer::CServer(CServer* pOld) : CECID(pOld->ECID())
 {
 	wxASSERT(pOld != NULL);
 	
@@ -125,11 +102,7 @@
 
 CServer::~CServer()
 {
-	TagPtrList::iterator it = m_taglist.begin();
-	for ( ; it != m_taglist.end(); ++it ) {
-		delete *it;
-	}
-
+	deleteTagPtrListEntries(&m_taglist);
 	m_taglist.clear();
 }
 
@@ -236,9 +209,9 @@
 				m_strVersion = tag.GetStr();
 			}
 		} else if (tag.IsInt()) {
-			m_strVersion = wxString::Format(wxT("%u.%u"), tag.GetInt() >> 16, tag.GetInt() & 0xFFFF);
+			m_strVersion = CFormat(wxT("%u.%u")) % (tag.GetInt() >> 16) % (tag.GetInt() & 0xFFFF);
 		} else {
-			wxASSERT(0);
+			wxFAIL;
 		}
 		break;
 		
@@ -284,7 +257,7 @@
 				users = tag.GetInt();
 			}
 		} else {
-			wxASSERT(0);
+			wxFAIL;
 		}
 	}
 	
@@ -326,7 +299,7 @@
 
 uint32 CServer::GetServerKeyUDP(bool bForce) const
 {
-	if (m_dwIPServerKeyUDP != 0 && m_dwIPServerKeyUDP == theApp->GetPublicIP() || bForce) {
+	if ((m_dwIPServerKeyUDP != 0 && m_dwIPServerKeyUDP == theApp->GetPublicIP()) || bForce) {
 		return m_dwServerKeyUDP;
 	} else {
 		return 0;

aMule-2.2.6.tar.bz2/src/Server.h -> aMule-2.3.1.tar.bz2/src/Server.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -28,14 +28,11 @@
 
 #include "Tag.h"
 #include "OtherStructs.h"
+#include <ec/cpp/ECID.h>	// Needed for CECID
 
 #include <protocol/ed2k/Client2Server/TCP.h> 
 #include <protocol/ed2k/Client2Server/UDP.h> 
 
-#ifdef CLIENT_GUI
-#include <ec/cpp/ECSpecialTags.h>
-#endif
-
 class CFileDataIO;
 
 // Server priority
@@ -47,16 +44,14 @@
 #define SRV_PR_MID			1
 #define SRV_PR_MIN			0
 
-class CServer
+class CServer : public CECID
 {
+friend class CServerListRem;
 public:
 	CServer(ServerMet_Struct* in_data);
 	CServer(uint16 in_port, const wxString i_addr);
 	CServer(CServer* pOld);
-
-#ifdef CLIENT_GUI
-	CServer(CEC_Server_Tag *);
-#endif
+	CServer(class CEC_Server_Tag *);
 
 	~CServer();
 	void		AddTag(CTag* in_tag)	{m_taglist.push_back(in_tag);}

aMule-2.2.6.tar.bz2/src/ServerConnect.cpp -> aMule-2.3.1.tar.bz2/src/ServerConnect.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -45,6 +45,7 @@
 #include "Statistics.h"		// Needed for theStats
 #include "Logger.h"
 #include "GuiEvents.h"		// Needed for Notify_*
+#include "IPFilter.h"		// Needed for theApp->ipfilter->IsReady()
 #include <common/Format.h>
 
 
@@ -53,6 +54,9 @@
 
 void CServerConnect::TryAnotherConnectionrequest()
 {
+	if (m_recurseTryAnotherConnectionrequest) {
+		return;
+	}
 	if ( connectionattemps.size() < (unsigned)(( thePrefs::IsSafeServerConnectEnabled()) ? 1 : 2) ) {
 	
 		CServer*  next_server = used_list->GetNextServer(m_bTryObfuscated);
@@ -65,15 +69,17 @@
 
 		if (!next_server) {
 			if ( connectionattemps.empty() ) {
+				m_recurseTryAnotherConnectionrequest = true;
 				if (m_bTryObfuscated && !thePrefs::IsClientCryptLayerRequired()){
-					AddLogLineM(true, _("Failed to connect to all obfuscated servers listed. Making another pass without obfuscation."));					
+					AddLogLineC(_("Failed to connect to all obfuscated servers listed. Making another pass without obfuscation."));					
 					// try all servers on the non-obfuscated port next
 					m_bTryObfuscated = false;
 					ConnectToAnyServer( false, true);
 				} else {					
-					AddLogLineM(true, _("Failed to connect to all servers listed. Making another pass."));
+					AddLogLineC(_("Failed to connect to all servers listed. Making another pass."));
 					ConnectToAnyServer( false );
 				}
+				m_recurseTryAnotherConnectionrequest = false;
 			}
 			return;
 		}
@@ -85,7 +91,12 @@
 void CServerConnect::ConnectToAnyServer(bool prioSort, bool bNoCrypt)
 {
 	if (!thePrefs::GetNetworkED2K()){
-		AddLogLineM(true,_("eD2k network disabled on preferences, not connecting."));
+		AddLogLineC(_("eD2k network disabled on preferences, not connecting."));
+		return;
+	}
+	if (!theApp->ipfilter->IsReady()) {
+		// do it later when ipfilter is up
+		theApp->ipfilter->ConnectToAnyServerWhenReady();
 		return;
 	}
 
@@ -108,7 +119,7 @@
 		}
 		if (!anystatic) {
 			connecting = false;
-			AddLogLineM(true,_("No valid servers to which to connect found in server list"));
+			AddLogLineC(_("No valid servers to which to connect found in server list"));
 			return;
 		}
 	}
@@ -121,7 +132,7 @@
 
 	if (used_list->GetServerCount()==0 ) {
 		connecting = false;
-		AddLogLineM(true,_("No valid servers to which to connect found in server list"));
+		AddLogLineC(_("No valid servers to which to connect found in server list"));
 		return;
 	}
 	
@@ -134,7 +145,7 @@
 void CServerConnect::ConnectToServer(CServer* server, bool multiconnect, bool bNoCrypt)
 {	
 	if (!thePrefs::GetNetworkED2K()){
-		AddLogLineM(true,_("eD2k network disabled on preferences, not connecting."));
+		AddLogLineC(_("eD2k network disabled on preferences, not connecting."));
 		return;
 	}
 	
@@ -184,7 +195,7 @@
 	}	
 	
 	if (sender->GetConnectionState() == CS_WAITFORLOGIN) {
-		AddLogLineM(false, CFormat( _("Connected to %s (%s:%i)") )
+		AddLogLineN(CFormat( _("Connected to %s (%s:%i)") )
 			% sender->cur_server->GetListName()
 			% sender->cur_server->GetFullIP()
 			% sender->cur_server->GetPort() );
@@ -247,12 +258,12 @@
 
 		CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_LOGINREQUEST);
 		#ifdef DEBUG_CLIENT_PROTOCOL
-		AddLogLineM(true,wxT("Client: OP_LOGINREQUEST"));
-		AddLogLineM(true,wxString(wxT("        Hash     : ")) << thePrefs::GetUserHash().Encode());
-		AddLogLineM(true,wxString(wxT("        ClientID : ")) << GetClientID());
-		AddLogLineM(true,wxString(wxT("        Port     : ")) << thePrefs::GetPort());
-		AddLogLineM(true,wxString(wxT("        User Nick: ")) << thePrefs::GetUserNick());
-		AddLogLineM(true,wxString(wxT("        Edonkey  : ")) << EDONKEYVERSION);
+		AddLogLineC(wxT("Client: OP_LOGINREQUEST"));
+		AddLogLineC(wxString(wxT("        Hash     : ")) << thePrefs::GetUserHash().Encode());
+		AddLogLineC(wxString(wxT("        ClientID : ")) << GetClientID());
+		AddLogLineC(wxString(wxT("        Port     : ")) << thePrefs::GetPort());
+		AddLogLineC(wxString(wxT("        User Nick: ")) << thePrefs::GetUserNick());
+		AddLogLineC(wxString(wxT("        Edonkey  : ")) << EDONKEYVERSION);
 		#endif
 		theStats::AddUpOverheadServer(packet->GetPacketSize());
 		SendPacket(packet, true, sender);
@@ -260,7 +271,7 @@
 		theStats::AddReconnect();
 		theStats::GetServerConnectTimer()->ResetTimer();
 		connected = true;
-		AddLogLineM(true, CFormat( _("Connection established on: %s") ) % sender->cur_server->GetListName());
+		AddLogLineC(CFormat( _("Connection established on: %s") ) % sender->cur_server->GetListName());
 		connectedsocket = sender;
 		
 		StopConnectionTry();
@@ -280,7 +291,7 @@
 			theStats::AddUpOverheadServer(packet->GetPacketSize());
 			SendPacket(packet, true);
 			#ifdef DEBUG_CLIENT_PROTOCOL
-			AddLogLineM(true,wxT("Client: OP_GETSERVERLIST"));
+			AddLogLineC(wxT("Client: OP_GETSERVERLIST"));
 			#endif
 		}
 	}
@@ -332,11 +343,11 @@
 	CServer* pServer = theApp->serverlist->GetServerByAddress(sender->cur_server->GetAddress(), sender->cur_server->GetPort());
 	switch (sender->GetConnectionState()){
 		case CS_FATALERROR:
-			AddLogLineM(true, _("Fatal Error while trying to connect. Internet connection might be down"));
+			AddLogLineC(_("Fatal Error while trying to connect. Internet connection might be down"));
 			break;
 		case CS_DISCONNECTED:
 			theApp->sharedfiles->ClearED2KPublishInfo();
-			AddLogLineM(false,CFormat( _("Lost connection to %s (%s:%i)") )
+			AddLogLineN(CFormat( _("Lost connection to %s (%s:%i)") )
 				% sender->cur_server->GetListName()
 				% sender->cur_server->GetFullIP()
 				% sender->cur_server->GetPort() );
@@ -346,7 +357,7 @@
 			}
 			break;
 		case CS_SERVERDEAD:
-			AddLogLineM(false, CFormat( _("%s (%s:%i) appears to be dead.") )
+			AddLogLineN(CFormat( _("%s (%s:%i) appears to be dead.") )
 				% sender->cur_server->GetListName()
 				% sender->cur_server->GetFullIP()
 				% sender->cur_server->GetPort() );
@@ -359,7 +370,7 @@
 		case CS_ERROR:
 			break;
 		case CS_SERVERFULL:
-			AddLogLineM(false, CFormat( _("%s (%s:%i) appears to be full.") )
+			AddLogLineN(CFormat( _("%s (%s:%i) appears to be full.") )
 				% sender->cur_server->GetListName()
 				% sender->cur_server->GetFullIP()
 				% sender->cur_server->GetPort() );
@@ -377,8 +388,8 @@
 		case CS_FATALERROR:{
 			bool autoretry= !singleconnecting;
 			StopConnectionTry();
-			if ((thePrefs::Reconnect()) && (autoretry) && (!m_idRetryTimer.IsRunning())){ 
-				AddLogLineM(false, wxString::Format(wxPLURAL("Automatic connection to server will retry in %d second", "Automatic connection to server will retry in %d seconds", CS_RETRYCONNECTTIME), CS_RETRYCONNECTTIME)); 
+			if ((thePrefs::Reconnect()) && (autoretry) && (!m_idRetryTimer.IsRunning())) { 
+				AddLogLineN(CFormat(wxPLURAL("Automatic connection to server will retry in %d second", "Automatic connection to server will retry in %d seconds", CS_RETRYCONNECTTIME)) % CS_RETRYCONNECTTIME);
 				m_idRetryTimer.Start(1000*CS_RETRYCONNECTTIME);
 			}
 			break;
@@ -391,21 +402,21 @@
 				connectedsocket->Close();
 			}
 			connectedsocket = NULL;
-			theApp->searchlist->StopGlobalSearch();			
+			theApp->searchlist->StopSearch(true);			
 			Notify_SearchCancel();
 			theStats::GetServerConnectTimer()->StopTimer();
 			if (thePrefs::Reconnect() && !connecting){
 				ConnectToAnyServer();		
 			}
 			
-			AddLogLineM( true, _("Connection lost") );
+			AddLogLineC(_("Connection lost") );
 			break;
 		}
 		case CS_ERROR:
 		case CS_NOTCONNECTED:{
 			if (!connecting)
 				break;
-			AddLogLineM(false, CFormat( _("Connecting to %s (%s:%i) failed.") )
+			AddLogLineN(CFormat( _("Connecting to %s (%s:%i) failed.") )
 				% sender->info
 				% sender->cur_server->GetFullIP()
 				% sender->cur_server->GetPort() );
@@ -447,7 +458,7 @@
 	ServerSocketMap::iterator it = connectionattemps.begin();
 	while ( it != connectionattemps.end() ){
 		if ( !it->second ) {
-			AddLogLineM(false, _("ERROR: Socket invalid at timeout check"));
+			AddLogLineN(_("ERROR: Socket invalid at timeout check"));
 			connectionattemps.erase( it );
 			return;
 		}
@@ -457,7 +468,7 @@
 			CServerSocket* value = it->second;
 			++it;
 			if (!value->IsSolving()) {
-				AddLogLineM(false, CFormat( _("Connection attempt to %s (%s:%i) timed out.") )
+				AddLogLineN(CFormat( _("Connection attempt to %s (%s:%i) timed out.") )
 					% value->info
 					% value->cur_server->GetFullIP()
 					% value->cur_server->GetPort() );
@@ -507,6 +518,7 @@
 	connected = false;
 	clientid = 0;
 	singleconnecting = false;
+	m_recurseTryAnotherConnectionrequest = false;
 
 	// initalize socket for udp packets
 	if (thePrefs::GetNetworkED2K()) {
@@ -583,7 +595,7 @@
 	
 		CPacket* packet = new CPacket(files, OP_EDONKEYPROT, OP_OFFERFILES);
 		#ifdef DEBUG_CLIENT_PROTOCOL
-		AddLogLineM(true,wxT("Client: OP_OFFERFILES"));
+		AddLogLineC(wxT("Client: OP_OFFERFILES"));
 		#endif
 		// compress packet
 		//   - this kind of data is highly compressable (N * (1 MD4 and at least 3 string meta data tags and 1 integer meta data tag))
@@ -594,7 +606,7 @@
 		theStats::AddUpOverheadServer(packet->GetPacketSize());
 		connectedsocket->SendPacket(packet,true);
 		
-		AddDebugLogLineM(false, logServer, wxT("Refreshing server connection"));
+		AddDebugLogLineN(logServer, wxT("Refreshing server connection"));
  	}
 }
 
@@ -630,7 +642,7 @@
 	if (it != m_lstOpenSockets.end()) {
 		(*it)->OnHostnameResolved(ip);
 	} else {
-		printf("Received late result of DNS lookup, discarding.\n");
+		AddLogLineNS(_("Received late result of DNS lookup, discarding."));
 	}
 }

aMule-2.2.6.tar.bz2/src/ServerConnect.h -> aMule-2.3.1.tar.bz2/src/ServerConnect.h Changed

aMule-2.2.6.tar.bz2/src/ServerList.cpp -> aMule-2.3.1.tar.bz2/src/ServerList.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -52,12 +52,14 @@
 #include <common/Format.h>
 #include "IPFilter.h"
 #include <common/FileFunctions.h>	// Needed for UnpackArchive
+#include <common/TextFile.h>	// Needed for CTextFile
 
 CServerList::CServerList()
 {
 	m_serverpos = m_servers.end();
 	m_statserverpos = m_servers.end();
 	m_nLastED2KServerLinkCheck = ::GetTickCount();
+	m_initialized = false;
 }
 
 
@@ -67,7 +69,8 @@
 	bool bRes = LoadServerMet(CPath(theApp->ConfigDir + wxT("server.met")));
 
 	// insert static servers from textfile
-	LoadStaticServers(theApp->ConfigDir + wxT("staticservers.dat"));
+	m_staticServersConfig = theApp->ConfigDir + wxT("staticservers.dat");
+	LoadStaticServers();
 	
 	// Send the auto-update of server.met via HTTPThread requests
 	current_url_index = 0;
@@ -75,18 +78,19 @@
 		AutoUpdate();
 	}	
 	
+	m_initialized = true;
 	return bRes;
 }
 
 
 bool CServerList::LoadServerMet(const CPath& path)
 {
-	AddLogLineM(false, CFormat(_("Loading server.met file: %s")) % path);
+	AddLogLineN(CFormat(_("Loading server.met file: %s")) % path);
 	
 	bool merge = !m_servers.empty();
 	
 	if (!path.FileExists()) {
-		AddLogLineM(false, _("Server.met file not found!"));
+		AddLogLineN(_("Server.met file not found!"));
 		return false;
 	}
 
@@ -94,13 +98,13 @@
 	const wxChar* mets[] = { wxT("server.met"), NULL };
 	// Try to unpack the file, might be an archive
 	if (UnpackArchive(path, mets).second != EFT_Met) {
-		AddLogLineM(true, CFormat(_("Failed to load server.met file '%s', unknown format encountered.")) % path);
+		AddLogLineC(CFormat(_("Failed to load server.met file '%s', unknown format encountered.")) % path);
 		return false;
 	}	
 
 	CFile servermet(path, CFile::read);
 	if ( !servermet.IsOpened() ){ 
-		AddLogLineM( false, _("Failed to open server.met!") );
+		AddLogLineN(_("Failed to open server.met!") );
 		return false;
 	}
 
@@ -111,7 +115,7 @@
 		byte version = servermet.ReadUInt8();
 		
 		if (version != 0xE0 && version != MET_HEADER) {
-			AddLogLineM(true, wxString::Format(_("Server.met file corrupt, found invalid versiontag: 0x%x, size %i"), version, sizeof(version)));
+			AddLogLineC(CFormat(_("Server.met file corrupt, found invalid versiontag: 0x%x, size %i")) % version % sizeof(version));
 			Notify_ServerThaw();
 			return false;
 		}
@@ -166,16 +170,16 @@
 		Notify_ServerThaw();
     
 		if (!merge) {
-			AddLogLineM(true, wxString::Format(wxPLURAL("%i server in server.met found", "%i servers in server.met found", fservercount), fservercount));
+			AddLogLineC(CFormat(wxPLURAL("%i server in server.met found", "%i servers in server.met found", fservercount)) % fservercount);
 		} else {
-			AddLogLineM(true, wxString::Format(wxPLURAL("%d server added", "%d servers added", iAddCount), iAddCount));
+			AddLogLineC(CFormat(wxPLURAL("%d server added", "%d servers added", iAddCount)) % iAddCount);
 		}
 	} catch (const CInvalidPacket& err) {
-		AddLogLineM(true, wxT("Error: the file server.met is corrupted: ") + err.what());
+		AddLogLineC(_("Error: the file 'server.met' is corrupted: ") + err.what());
 		Notify_ServerThaw();
 		return false;
 	} catch (const CSafeIOException& err) {
-		AddLogLineM(true, wxT("IO error while reading 'server.met': ") + err.what());
+		AddLogLineC(_("IO error while reading 'server.met': ") + err.what());
 		Notify_ServerThaw();
 		return false;
 	}
@@ -188,8 +192,7 @@
 {
 	if ( !in_server->GetPort() ) {
 		if ( fromUser ) {
-			AddLogLineM( true,
-				CFormat( _("Server not added: [%s:%d] does not specify a valid port.") )
+			AddLogLineC(CFormat( _("Server not added: [%s:%d] does not specify a valid port.") )
 					% in_server->GetAddress()
 					% in_server->GetPort()
 			);
@@ -200,12 +203,14 @@
 				!in_server->HasDynIP() &&
 				(
 					!IsGoodIP( in_server->GetIP(), thePrefs::FilterLanIPs() ) ||
-					theApp->ipfilter->IsFiltered( in_server->GetIP(), true )
+					(	// don't test for filtered while ipfilter is still loading,
+						// it will be filtered when filter loading is finished
+						theApp->ipfilter->IsReady()
+						&& theApp->ipfilter->IsFiltered(in_server->GetIP(), true))
 				)
 	          ) {
 		if ( fromUser ) {
-			AddLogLineM( true,
-				CFormat( _("Server not added: The IP of [%s:%d] is filtered or invalid.") )
+			AddLogLineC(CFormat( _("Server not added: The IP of [%s:%d] is filtered or invalid.") )
 					% in_server->GetAddress()
 					% in_server->GetPort()
 			);
@@ -224,8 +229,7 @@
 	
 	if (test_server) {
 		if ( fromUser ) {
-			AddLogLineM( true,
-				CFormat( _("Server not added: Server with matching IP:Port [%s:%d] found in list.") )
+			AddLogLineC(CFormat( _("Server not added: Server with matching IP:Port [%s:%d] found in list.") )
 					% in_server->GetAddress()
 					% in_server->GetPort()
 			);
@@ -243,8 +247,7 @@
 	NotifyObservers( EventType( EventType::INSERTED, in_server ) );
 
 	if ( fromUser ) {
-		AddLogLineM( true,
-			CFormat( _("Server added: Server at [%s:%d] using the name '%s'.") )
+		AddLogLineC(CFormat( _("Server added: Server at [%s:%d] using the name '%s'.") )
 				% in_server->GetAddress()
 				% in_server->GetPort()
 				% in_server->GetListName()
@@ -286,7 +289,7 @@
 			// if it doesn't get responsed, we don't count it as error but continue with a normal ping
 			ping_server->SetCryptPingReplyPending(true);
 			uint32 nPacketLen = 4 + (uint8)(rand() % 16); // max padding 16 bytes
-			CScopedArray<byte> pRawPacket(new byte[nPacketLen]);
+			CScopedArray<byte> pRawPacket(nPacketLen);
 			uint32 dwChallenge = (rand() << 17) | (rand() << 2) | (rand() & 0x03);
 			if (dwChallenge == 0) {
 				dwChallenge++;
@@ -301,7 +304,7 @@
 			ping_server->SetLastPinged(tNow);
 			ping_server->SetLastPingedTime((tNow - (uint32)UDPSERVSTATREASKTIME) + 20); // give it 20 seconds to respond
 			
-			AddDebugLogLineM(false, logServerUDP, CFormat(wxT(">> Sending OP__GlobServStatReq (obfuscated) to server %s:%u")) % ping_server->GetAddress() % ping_server->GetPort());
+			AddDebugLogLineN(logServerUDP, CFormat(wxT(">> Sending OP__GlobServStatReq (obfuscated) to server %s:%u")) % ping_server->GetAddress() % ping_server->GetPort());
 
 			CPacket* packet = new CPacket(pRawPacket[1], nPacketLen - 2, pRawPacket[0]);
 			packet->CopyToDataBuffer(0, pRawPacket.get() + 2, nPacketLen - 2);
@@ -312,9 +315,9 @@
 			// our obfsucation ping request was not answered, so probably the server doesn'T supports obfuscation
 			// continue with a normal request
 			if (ping_server->GetCryptPingReplyPending() && thePrefs::IsServerCryptLayerUDPEnabled()) {
-				AddDebugLogLineM(false, logServerUDP, wxT("CryptPing failed for server ") + ping_server->GetListName());
+				AddDebugLogLineN(logServerUDP, wxT("CryptPing failed for server ") + ping_server->GetListName());
 			} else if (thePrefs::IsServerCryptLayerUDPEnabled()) {
-				AddDebugLogLineM(false, logServerUDP, wxT("CryptPing skipped because our public IP is unknown for server ") + ping_server->GetListName());
+				AddDebugLogLineN(logServerUDP, wxT("CryptPing skipped because our public IP is unknown for server ") + ping_server->GetListName());
 			}
 			
 			ping_server->SetCryptPingReplyPending(false);			
@@ -330,7 +333,7 @@
 			theStats::AddUpOverheadServer(packet->GetPacketSize());
 			theApp->serverconnect->SendUDPPacket(packet, ping_server, true);
 		} else {
-			wxASSERT( false );
+			wxFAIL;
 		}
 	}
 }
@@ -429,7 +432,9 @@
 
 CServerList::~CServerList()
 {
-	SaveServerMet();
+	if (thePrefs::GetNetworkED2K() && IsInitialized()) {
+		SaveServerMet();
+	}
 	while ( !m_servers.empty() ) {
 		delete m_servers.back();
 		m_servers.pop_back();
@@ -437,13 +442,13 @@
 }
 
 
-void CServerList::LoadStaticServers( const wxString& filename )
+void CServerList::LoadStaticServers()
 {
-	if ( !CPath::FileExists( filename ) ) {
+	if ( !CPath::FileExists(m_staticServersConfig) ) {
 		return;
 	}
 	
-	wxFileInputStream stream( filename );
+	wxFileInputStream stream(m_staticServersConfig);
 	wxTextInputStream f(stream);
 
 	while ( !stream.Eof() ) {
@@ -505,6 +510,26 @@
 	}
 }
 
+void CServerList::SaveStaticServers()
+{
+	CTextFile file;
+	if (!file.Open(m_staticServersConfig, CTextFile::write)) {
+		AddLogLineN(CFormat( _("Failed to open '%s'") ) % m_staticServersConfig );
+		return;
+	}
+
+	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it) {
+		const CServer* server = *it;
+
+		if (server->IsStaticMember()) {
+			file.WriteLine(CFormat(wxT("%s:%u,%u,%s"))
+				% server->GetAddress() % server->GetPort()
+				% server->GetPreferences() % server->GetListName());
+		}
+	}
+
+	file.Close();
+}
 
 struct ServerPriorityComparator {
 	// Return true iff lhs should strictly appear earlier in the list than rhs.
@@ -524,7 +549,7 @@
 			case SRV_PR_HIGH:
 				return rhs->GetPreferences() != SRV_PR_HIGH;
 			default:
-				wxASSERT(0);
+				wxFAIL;
 				return false;
 		}
 	}
@@ -609,28 +634,58 @@
 	return NULL;
 }
 
+
 CServer* CServerList::GetServerByIPUDP(uint32 nIP, uint16 nUDPPort, bool bObfuscationPorts) const
 {
 	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it){
         CServer* const s =*it;
-		if (s->GetIP() == nIP && (s->GetPort() == nUDPPort-4 ||
-			(bObfuscationPorts && (s->GetObfuscationPortUDP() == nUDPPort) || (s->GetPort() == nUDPPort - 12))))
+		if (s->GetIP() == nIP 
+			&& (s->GetPort() == nUDPPort-4 
+				|| (bObfuscationPorts && s->GetObfuscationPortUDP() == nUDPPort) 
+				|| s->GetPort() == nUDPPort - 12))
 			return s;
 	}
 	return NULL;
 }
 
+
+CServer* CServerList::GetServerByECID(uint32 ecid) const
+{
+	for (CInternalList::const_iterator it = m_servers.begin(); it != m_servers.end(); ++it){
+        CServer* const s = *it;
+		if (s->ECID() == ecid) {
+			return s;
+		}
+	}
+	return NULL;
+}
+
+
+void CServerList::SetStaticServer(CServer* server, bool isStatic)
+{
+	server->SetIsStaticMember(isStatic);
+	Notify_ServerRefresh(server);
+	SaveStaticServers();
+}
+
+
+void CServerList::SetServerPrio(CServer* server, uint32 prio)
+{
+	server->SetPreference(prio);
+	Notify_ServerRefresh(server);
+}
+
+
 bool CServerList::SaveServerMet()
 {
-	CPath newservermet = CPath(theApp->ConfigDir + wxT("server.met.new"));
+	CPath curservermet = CPath(theApp->ConfigDir + wxT("server.met"));
 	
-	CFile servermet( newservermet, CFile::write );
+	CFile servermet(curservermet, CFile::write_safe);
 	if (!servermet.IsOpened()) {
-		AddLogLineM(false,_("Failed to save server.met!"));
+		AddLogLineN(_("Failed to save server.met!"));
 		return false;
 	}
 
-
 	try {
 		servermet.WriteUInt8(0xE0);
 		servermet.WriteUInt32( m_servers.size() );
@@ -725,41 +780,36 @@
 			CTagInt32( ST_LOWIDUSERS, server->GetLowIDUsers()    ).WriteTagToFile( &servermet );
 			
 			if (server->GetServerKeyUDP(true)) {
-				CTagInt32(ST_UDPKEY, server->GetServerKeyUDP(true)).WriteTagToFile( &servermet );;
+				CTagInt32(ST_UDPKEY, server->GetServerKeyUDP(true)).WriteTagToFile( &servermet );
 			}
 
 			if (server->GetServerKeyUDPIP()) {
-				CTagInt32(ST_UDPKEYIP, server->GetServerKeyUDPIP()).WriteTagToFile( &servermet );;;
+				CTagInt32(ST_UDPKEYIP, server->GetServerKeyUDPIP()).WriteTagToFile( &servermet );
 			}
 
 			if (server->GetObfuscationPortTCP()) {
-				CTagInt16(ST_TCPPORTOBFUSCATION, server->GetObfuscationPortTCP()).WriteTagToFile( &servermet );;;
+				CTagInt16(ST_TCPPORTOBFUSCATION, server->GetObfuscationPortTCP()).WriteTagToFile( &servermet );
 			}
 
 			if (server->GetObfuscationPortUDP()) {
-				CTagInt16(ST_UDPPORTOBFUSCATION, server->GetObfuscationPortUDP()).WriteTagToFile( &servermet );;;
+				CTagInt16(ST_UDPPORTOBFUSCATION, server->GetObfuscationPortUDP()).WriteTagToFile( &servermet );
 			}
 			
 		}
+		// Now server.met.new is ready to be closed and renamed to server.met.
+		// But first rename existing server.met to server.met.bak (replacing old .bak file).
+		const CPath oldservermet = CPath(theApp->ConfigDir + wxT("server.met.bak"));
+		if (curservermet.FileExists()) {
+			CPath::RenameFile(curservermet, oldservermet, true);
+		}
+
+		servermet.Close();
+
 	} catch (const CIOFailureException& e) {
-		AddLogLineM(true, wxT("IO failure while writing 'server.met': ") + e.what());
+		AddLogLineC(wxT("IO failure while writing 'server.met': ") + e.what());
 		return false;
 	}
 	
-	servermet.Close();
-	const CPath curservermet = CPath(theApp->ConfigDir + wxT("server.met"));
-	const CPath oldservermet = CPath(theApp->ConfigDir + wxT("server_met.old"));
-	
-	if (oldservermet.FileExists()) {
-		CPath::RemoveFile(oldservermet);
-	}
-	
-	if (curservermet.FileExists()) {
-		CPath::RenameFile(curservermet, oldservermet);
-	}
-	
-	CPath::RenameFile(newservermet, curservermet);
-	
 	return true;
 }
 
@@ -779,12 +829,12 @@
 void CServerList::UpdateServerMetFromURL(const wxString& strURL)
 {
 	if (strURL.Find(wxT("://")) == -1) {
-		AddLogLineM(true, _("Invalid URL"));
+		AddLogLineC(_("Invalid URL"));
 		return;
 	}
-	URLUpdate = strURL;
+	m_URLUpdate = strURL;
 	wxString strTempFilename(theApp->ConfigDir + wxT("server.met.download"));
-	CHTTPDownloadThread *downloader = new CHTTPDownloadThread(strURL,strTempFilename, HTTP_ServerMet);
+	CHTTPDownloadThread *downloader = new CHTTPDownloadThread(strURL, strTempFilename, theApp->ConfigDir + wxT("server.met"), HTTP_ServerMet, false, false);
 	downloader->Create();
 	downloader->Run();
 }
@@ -792,7 +842,7 @@
 
 void CServerList::DownloadFinished(uint32 result) 
 {
-	if(result == 1) {
+	if(result == HTTP_Success) {
 		const CPath tempFilename = CPath(theApp->ConfigDir + wxT("server.met.download"));
 
 		// curl succeeded. proceed with server.met loading
@@ -801,10 +851,11 @@
 
 		// So, file is loaded and merged, and also saved
 		CPath::RemoveFile(tempFilename);
-		AddLogLineM(true, CFormat(
-			_("Finished to download the server list from %s")) % URLUpdate);
+		AddLogLineN(CFormat(_("Finished downloading the server list from %s")) % m_URLUpdate);
+	} else if (result == HTTP_Skipped) {
+		AddLogLineN(CFormat(_("Skipped download of %s, because requested file is not newer.")) % wxT("server.met"));
 	} else {
-		AddLogLineM(true, CFormat( _("Failed to download the server list from %s") ) % URLUpdate);
+		AddLogLineC(CFormat(_("Failed to download %s from %s")) % wxT("server.met") % m_URLUpdate);
 	}
 }
 
@@ -815,7 +866,7 @@
 	uint8 url_count = theApp->glob_prefs->adresses_list.GetCount();
 	
 	if (!url_count) {
-		AddLogLineM(true, _("No server list address entry in 'addresses.dat' found. Please paste a valid server list address into this file in order to auto-update your server list"));
+		AddLogLineC(_("No server list address entry in 'addresses.dat' found. Please paste a valid server list address into this file in order to auto-update your server list"));
 		return;
 	}
 	// Do current URL. Callback function will take care of the others.
@@ -824,31 +875,30 @@
 		// We use wxURL to validate the URI
 		if ( wxURL( URI ).GetError() == wxURL_NOERR ) {
 			// Ok, got a valid URI
-			URLAutoUpdate = URI;
+			m_URLUpdate = URI;
 			wxString strTempFilename =
 				theApp->ConfigDir + wxT("server_auto.met");
-			AddLogLineM(true, CFormat(
+			AddLogLineC(CFormat(
 				_("Start downloading server list from %s")) % URI);
 			CHTTPDownloadThread *downloader = new CHTTPDownloadThread(
-				URI, strTempFilename, HTTP_ServerMetAuto);
+				URI, strTempFilename, theApp->ConfigDir + wxT("server.met"), HTTP_ServerMetAuto, false, false);
 			downloader->Create();
 			downloader->Run();
 		
 			return;
 		} else {
-			AddLogLineM(true, CFormat(
+			AddLogLineC(CFormat(
 				_("WARNING: invalid URL specified for auto-updating of servers: %s") ) % URI);
 		}
 		current_url_index++;
 	}
-	AddLogLineM(true, _("No valid server.met auto-download url on addresses.dat"));
+	AddLogLineC(_("No valid server.met auto-download url on addresses.dat"));
 }
 
 
 void CServerList::AutoDownloadFinished(uint32 result) 
 {
-	
-	if (result == 1) {
+	if (result == HTTP_Success) {
 		CPath tempFilename = CPath(theApp->ConfigDir + wxT("server_auto.met"));
 		
 		// curl succeeded. proceed with server.met loading
@@ -858,17 +908,15 @@
 		// So, file is loaded and merged, and also saved
 		CPath::RemoveFile(tempFilename);
 	} else {
-		AddLogLineM(true, CFormat(_("Failed to download the server list from %s") ) % URLUpdate);
+		AddLogLineC(CFormat(_("Failed to download the server list from %s") ) % m_URLUpdate);
 	}
 	
 	++current_url_index;
 	
-
 	if (current_url_index < theApp->glob_prefs->adresses_list.GetCount()) {		
 		// Next!	
 		AutoUpdate();
 	}
-	
 }
 
 
@@ -934,7 +982,7 @@
 		
 		if (theApp->ipfilter->IsFiltered(server->GetIP(), true)) {
 			if (server == theApp->serverconnect->GetCurrentServer()) {
-				AddLogLineM(true, _("Local server is filtered by the IPFilters, reconnecting to a different server!"));
+				AddLogLineC(_("Local server is filtered by the IPFilters, reconnecting to a different server!"));
 				theApp->serverconnect->Disconnect();
 				RemoveServer(server);
 				theApp->serverconnect->ConnectToAnyServer();

aMule-2.2.6.tar.bz2/src/ServerList.h -> aMule-2.3.1.tar.bz2/src/ServerList.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -53,8 +53,10 @@
 	CServer*	GetServerByIP(uint32 nIP) const;
 	CServer*	GetServerByIPTCP(uint32 nIP, uint16 nPort) const;
 	CServer*	GetServerByIPUDP(uint32 nIP, uint16 nUDPPort, bool bObfuscationPorts = true) const;
+	CServer*	GetServerByECID(uint32 ecid) const;
 	void		GetStatus(uint32 &failed, uint32 &user, uint32 &file, uint32 &tuser, uint32 &tfile, float &occ);
 	void		GetUserFileStatus( uint32 &user, uint32 &file);
+	bool		IsInitialized() const { return m_initialized; }
 	void		Sort();
 	void 		UpdateServerMetFromURL(const wxString& strURL);	
 	void		DownloadFinished(uint32 result);	
@@ -67,13 +69,27 @@
 	void FilterServers();
 
 	void CheckForExpiredUDPKeys();
+
+	/**
+	 * Marks the specified server as static or not.
+	 *
+	 * @param The server to be marked or unmarked as static.
+	 * @param The new static state.
+	 *
+	 * Other than setting the static setting of the specified server, it
+	 * also adds or removes the server from the static-list file.
+	 */
+	void		SetStaticServer(CServer* server, bool isStatic);
+	void		SetServerPrio(CServer* server, uint32 prio);
 	
 private:
 	virtual void 	ObserverAdded( ObserverType* );
 	void		AutoUpdate();
 	CServer*	GetNextStatServer();
 	
-	void		LoadStaticServers( const wxString& filename );
+	wxString	m_staticServersConfig;
+	void		LoadStaticServers();
+	void		SaveStaticServers();
 	uint8		current_url_index;
 
 	typedef std::list<CServer*>	CInternalList;
@@ -82,8 +98,8 @@
 	CInternalList::const_iterator	m_statserverpos;
 
 	uint32		m_nLastED2KServerLinkCheck;// emanuelw(20030924) added
-	wxString	URLUpdate;
-	wxString	URLAutoUpdate;
+	wxString	m_URLUpdate;
+	bool		m_initialized;
 };
 
 #endif // SERVERLIST_H

aMule-2.2.6.tar.bz2/src/ServerListCtrl.cpp -> aMule-2.3.1.tar.bz2/src/ServerListCtrl.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -43,10 +43,9 @@
 #include "Server.h"		// Needed for CServer and SRV_PR_*
 #include "Logger.h"
 #include <common/Format.h>	// Needed for CFormat
-#include <common/TextFile.h>	// Needed for CTextFile
 
 
-#define SYSCOLOR(x) (wxSystemSettings::GetColour(x))
+#define CMuleColour(x) (wxSystemSettings::GetColour(x))
 
 
 BEGIN_EVENT_TABLE(CServerListCtrl,CMuleListCtrl)
@@ -84,20 +83,20 @@
 
 	m_connected = 0;
 
-	InsertColumn( COLUMN_SERVER_NAME, _("Server Name"),	wxLIST_FORMAT_LEFT, 150);
-	InsertColumn( COLUMN_SERVER_ADDR, _("Address"),			wxLIST_FORMAT_LEFT, 140);
-	InsertColumn( COLUMN_SERVER_PORT, _("Port"),			wxLIST_FORMAT_LEFT, 25);
-	InsertColumn( COLUMN_SERVER_DESC, _("Description"),	wxLIST_FORMAT_LEFT, 150);
-	InsertColumn( COLUMN_SERVER_PING, _("Ping"),			wxLIST_FORMAT_LEFT, 25);
-	InsertColumn( COLUMN_SERVER_USERS, _("Users"),		wxLIST_FORMAT_LEFT, 40);
-	InsertColumn( COLUMN_SERVER_FILES, _("Files"),		wxLIST_FORMAT_LEFT, 45);
-	InsertColumn( COLUMN_SERVER_PRIO, _("Priority"),		wxLIST_FORMAT_LEFT, 60);
-	InsertColumn( COLUMN_SERVER_FAILS, _("Failed"),		wxLIST_FORMAT_LEFT, 40);
-	InsertColumn( COLUMN_SERVER_STATIC, _("Static"),		wxLIST_FORMAT_LEFT, 40);
-	InsertColumn( COLUMN_SERVER_VERSION, _("Version"),		wxLIST_FORMAT_LEFT, 80);
+	InsertColumn( COLUMN_SERVER_NAME,	_("Server Name"),	wxLIST_FORMAT_LEFT, 150, wxT("N") );
+	InsertColumn( COLUMN_SERVER_ADDR,	_("Address"),		wxLIST_FORMAT_LEFT, 140, wxT("A") );
+	InsertColumn( COLUMN_SERVER_PORT,	_("Port"),		wxLIST_FORMAT_LEFT,  25, wxT("P") );
+	InsertColumn( COLUMN_SERVER_DESC,	_("Description"),	wxLIST_FORMAT_LEFT, 150, wxT("D") );
+	InsertColumn( COLUMN_SERVER_PING,	_("Ping"),		wxLIST_FORMAT_LEFT,  25, wxT("p") );
+	InsertColumn( COLUMN_SERVER_USERS,	_("Users"),		wxLIST_FORMAT_LEFT,  40, wxT("U") );
+	InsertColumn( COLUMN_SERVER_FILES,	_("Files"),		wxLIST_FORMAT_LEFT,  45, wxT("F") );
+	InsertColumn( COLUMN_SERVER_PRIO,	_("Priority"),		wxLIST_FORMAT_LEFT,  60, wxT("r") );
+	InsertColumn( COLUMN_SERVER_FAILS,	_("Failed"),		wxLIST_FORMAT_LEFT,  40, wxT("f") );
+	InsertColumn( COLUMN_SERVER_STATIC,	_("Static"),		wxLIST_FORMAT_LEFT,  40, wxT("S") );
+	InsertColumn( COLUMN_SERVER_VERSION,	_("Version"),		wxLIST_FORMAT_LEFT,  80, wxT("V") );
 	#ifdef __DEBUG__
-	InsertColumn( COLUMN_SERVER_TCPFLAGS, wxT("TCP Flags"),		wxLIST_FORMAT_LEFT, 80);
-	InsertColumn( COLUMN_SERVER_UDPFLAGS, wxT("UDP Flags"),		wxLIST_FORMAT_LEFT, 80);
+	InsertColumn( COLUMN_SERVER_TCPFLAGS,	wxT("TCP Flags"),	wxLIST_FORMAT_LEFT,  80, wxT("t") );
+	InsertColumn( COLUMN_SERVER_UDPFLAGS,	wxT("UDP Flags"),	wxLIST_FORMAT_LEFT,  80, wxT("u") );
 	#endif
 	
 	
@@ -105,9 +104,14 @@
 }
 
 
-CServerListCtrl::~CServerListCtrl()
+wxString CServerListCtrl::GetOldColumnOrder() const
 {
+	return wxT("N,A,P,D,p,U,F,r,f,S,V,t,u");
+}
+
 
+CServerListCtrl::~CServerListCtrl()
+{
 }
 
 
@@ -140,14 +144,14 @@
 	while ( pos != -1 ) {
 		CServer* server = (CServer*)GetItemData(pos);
 		
-		if (reinterpret_cast<wxUIntPtr>(server) == m_connected && connected) {
+		if (server == m_connected && connected) {
 			wxMessageBox(_("You are connected to a server you are trying to delete. Please disconnect first. The server was NOT deleted."), _("Info"), wxOK, this);
 			++pos;
 		} else if (server->IsStaticMember()) {
 			const wxString name = (!server->GetListName() ? wxString(_("(Unknown name)")) : server->GetListName());
 			
 			if (wxMessageBox(CFormat(_("Are you sure you want to delete the static server %s")) % name, _("Cancel"), wxICON_QUESTION | wxYES_NO, this) == wxYES) {
-				SetStaticServer(server, false);
+				theApp->serverlist->SetStaticServer(server, false);
 				DeleteItem( pos );
 				theApp->serverlist->RemoveServer( server );
 			} else {
@@ -181,27 +185,28 @@
 	
 		wxListItem item;
 		item.SetId( itemnr );
-		item.SetBackgroundColour(SYSCOLOR(wxSYS_COLOUR_LISTBOX));
+		item.SetBackgroundColour(CMuleColour(wxSYS_COLOUR_LISTBOX));
 		SetItem( item );
 	}
 	
 	wxString serverName;
 #ifdef ENABLE_IP2COUNTRY
 	// Get the country name
-	const CountryData& countrydata = theApp->amuledlg->m_IP2Country->GetCountryData(server->GetFullIP());
-	serverName << countrydata.Name;
-	serverName << wxT(" - ");
+	if (theApp->amuledlg->m_IP2Country->IsEnabled() && thePrefs::IsGeoIPEnabled()) {
+		const CountryData& countrydata = theApp->amuledlg->m_IP2Country->GetCountryData(server->GetFullIP());
+		serverName << countrydata.Name;
+		serverName << wxT(" - ");
+	}
 #endif // ENABLE_IP2COUNTRY
 	serverName << server->GetListName();
 	SetItem(itemnr, COLUMN_SERVER_NAME, serverName);
 	SetItem(itemnr, COLUMN_SERVER_ADDR, server->GetAddress());
 	if (server->GetAuxPortsList().IsEmpty()) {
 		SetItem( itemnr, COLUMN_SERVER_PORT,
-			wxString::Format(wxT("%u"), server->GetPort()));
+			CFormat(wxT("%u")) % server->GetPort());
 	} else {
 		SetItem( itemnr, COLUMN_SERVER_PORT,
-			wxString::Format(wxT("%u ("),
-				server->GetPort()) + server->GetAuxPortsList() + wxT(")") );
+			CFormat(wxT("%u (%s)")) % server->GetPort() % server->GetAuxPortsList());
 	}
 	SetItem( itemnr, COLUMN_SERVER_DESC, server->GetDescription() );
 	
@@ -214,14 +219,14 @@
 
 	if ( server->GetUsers() ) {
 		SetItem( itemnr, COLUMN_SERVER_USERS,
-			wxString::Format( wxT("%u"), server->GetUsers() ) );
+			CFormat(wxT("%u")) % server->GetUsers());
 	} else {
 		SetItem( itemnr, COLUMN_SERVER_USERS, wxEmptyString );
 	}
 
 	if ( server->GetFiles() ) {
 		SetItem( itemnr, COLUMN_SERVER_FILES,
-			wxString::Format( wxT("%u"), server->GetFiles() ) );
+			CFormat(wxT("%u")) % server->GetFiles());
 	} else {
 		SetItem( itemnr, COLUMN_SERVER_FILES, wxEmptyString );
 	}
@@ -233,11 +238,11 @@
 		default:		SetItem(itemnr, COLUMN_SERVER_PRIO, wxT("---"));	// this should never happen
 	}
 
-	SetItem( itemnr, COLUMN_SERVER_FAILS, wxString::Format( wxT("%u"),server->GetFailedCount() ) );
+	SetItem( itemnr, COLUMN_SERVER_FAILS, CFormat(wxT("%u")) % server->GetFailedCount());
 	SetItem( itemnr, COLUMN_SERVER_STATIC, ( server->IsStaticMember() ? _("Yes") : _("No") ) );
 	SetItem( itemnr, COLUMN_SERVER_VERSION, server->GetVersion() );
 
-	#ifdef __DEBUG__
+	#if defined(__DEBUG__) && !defined(CLIENT_GUI)
 	wxString flags;
 	/* TCP */
 	if (server->GetTCPFlags() & SRV_TCPFLG_COMPRESSION) {
@@ -265,7 +270,7 @@
 	SetItem( itemnr, COLUMN_SERVER_TCPFLAGS, flags );
 	
 	/* UDP */
-	flags = wxEmptyString;
+	flags.Clear();
 	if (server->GetUDPFlags() & SRV_UDPFLG_EXT_GETSOURCES) {
 		flags += wxT("g");
 	}
@@ -307,7 +312,7 @@
 	// Unset the old highlighted server if we are going to set a new one
 	if ( m_connected && highlight ) {
 		// A recursive call to do the real work. 
-		HighlightServer( (CServer*)m_connected, false );
+		HighlightServer( m_connected, false );
 
 		m_connected = 0;
 	}
@@ -323,7 +328,7 @@
 			if ( highlight ) {
 				font.SetWeight( wxBOLD );
 
-				m_connected = reinterpret_cast<wxUIntPtr>(server);
+				m_connected = server;
 			}
 
 			item.SetFont( font );
@@ -333,40 +338,13 @@
 	}
 }
 
-//#warning Kry TODO: Dude, this gotta be moved to core
-bool CServerListCtrl::SetStaticServer( CServer* server, bool isStatic )
-{
-	server->SetIsStaticMember( isStatic );
-	RefreshServer( server );
-
-	wxString filename = theApp->ConfigDir + wxT("staticservers.dat");
-
-	CTextFile file;
-	if (!file.Open(filename, CTextFile::write)) {
-		AddLogLineM( false, CFormat( _("Failed to open '%s'") ) % filename );
-		return false;
-	}
-
-	for (int i = 0; i < GetItemCount(); ++i) {
-		server = reinterpret_cast<CServer*>(GetItemData(i));
-
-		if (server->IsStaticMember()) {
-			file.WriteLine(CFormat(wxT("%s:%u,%u,%s"))
-				% server->GetAddress() % server->GetPort()
-				% server->GetPreferences() % server->GetListName());
-		}
-	}
-
-	return true;
-}
-
 
 void CServerListCtrl::ShowServerCount()
 {
 	wxStaticText* label = CastByName( wxT("serverListLabel"), GetParent(), wxStaticText );
 
 	if ( label ) {
-		label->SetLabel( wxString::Format( _("Servers (%i)"), GetItemCount() ) );
+		label->SetLabel(CFormat(_("Servers (%i)")) % GetItemCount());
 		label->GetParent()->Layout();
 	}
 }
@@ -403,8 +381,9 @@
 		CServer* server = (CServer*)GetItemData( index );
 
 		// The current server is selected, so we might display the reconnect option
-		if ( reinterpret_cast<wxUIntPtr>(server) == m_connected ) 
+		if (server == m_connected) {
 			enable_reconnect = true;
+		}
 
 		// We want to know which options should be enabled, either one or both
 		enable_static_on	|= !server->IsStaticMember();
@@ -461,12 +440,13 @@
 
 
 	PopupMenu( serverMenu, event.GetPoint() );
+	delete serverMenu;
 }
 
 
 void CServerListCtrl::OnPriorityChange( wxCommandEvent& event )
 {
-	int priority = 0;
+	uint32 priority = 0;
 
 	switch ( event.GetId() ) {
 		case MP_PRIOLOW:		priority = SRV_PR_LOW;		break;
@@ -482,9 +462,7 @@
 	
 	for ( unsigned int i = 0; i < items.size(); ++i ) {
 		CServer* server = (CServer*)items[ i ];
-		
-		server->SetPreference( priority );
-		RefreshServer( server );	
+		theApp->serverlist->SetServerPrio(server, priority);
 	}
 }
 
@@ -500,14 +478,7 @@
 
 		// Only update items that have the wrong setting
 		if ( server->IsStaticMember() != isStatic ) {
-			if ( !SetStaticServer( server, isStatic ) ) {
-				wxASSERT( false );
-
-				return;
-			}
-				
-			server->SetIsStaticMember( isStatic );
-			RefreshServer( server );
+			theApp->serverlist->SetStaticServer(server, isStatic);
 		}
 	}
 }
@@ -536,7 +507,7 @@
 	while ( pos != -1 ) {
 		CServer* server = (CServer*)GetItemData(pos);
 		
-		URL += wxT("ed2k://|server|") + server->GetFullIP() + wxString::Format(wxT("|%d|"), server->GetPort()) + wxT("/\n");		
+		URL += CFormat(wxT("ed2k://|server|%s|%d|/\n"))	% server->GetFullIP() % server->GetPort();
 		
 		pos = GetNextItem( pos, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	}

aMule-2.2.6.tar.bz2/src/ServerListCtrl.h -> aMule-2.3.1.tar.bz2/src/ServerListCtrl.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -126,23 +126,17 @@
 	 */
 	void	HighlightServer( const CServer* server, bool highlight );
 
-	/**
-	 * Marks the specified server as static or not.
-	 *
-	 * @param The server to be marked or unmarked as static.
-	 * @param The new static state.
-	 *
-	 * Other than setting the static setting of the specified server, it
-	 * also adds or removes the server from the static-list file.
-	 */
-	bool	SetStaticServer( CServer* server, bool isStatic );
 
 	
 	/**
 	 * This function updates the server-count in the server-wnd.
 	 */
 	void	ShowServerCount();
-	
+
+protected:
+	/// Return old column order.
+	wxString GetOldColumnOrder() const;
+
 private:
 
 	/**
@@ -194,7 +188,7 @@
 
 
 	//! Used to keep track of the last high-lighted item.
-	wxUIntPtr m_connected;
+	const CServer* m_connected;
 	
 	
 	DECLARE_EVENT_TABLE()

aMule-2.2.6.tar.bz2/src/ServerSocket.cpp -> aMule-2.3.1.tar.bz2/src/ServerSocket.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -102,7 +102,7 @@
 			socket->OnSend(wxSOCKET_NOERROR);
 			break;
 		default:
-			wxASSERT(0);
+			wxFAIL;
 			break;
 	}
 	
@@ -173,7 +173,7 @@
 				if (pServer) {
 					pServer->SetID(server_ip);
 				} else {
-					AddDebugLogLineM(false, logServer, wxT("theApp->serverlist->GetServerByAddress() returned NULL"));
+					AddDebugLogLineN(logServer, wxT("theApp->serverlist->GetServerByAddress() returned NULL"));
 					return;
 				}
 			}
@@ -215,12 +215,12 @@
 bool CServerSocket::ProcessPacket(const byte* packet, uint32 size, int8 opcode)
 {
 	try {
-		AddDebugLogLineM( false, logServer, wxT("Processing Server Packet: ") );
+		AddDebugLogLineN( logServer, wxT("Processing Server Packet: ") );
 		
 		switch(opcode) {
 			case OP_SERVERMESSAGE: {
 				/* Kry import of lugdunum 16.40 new features */
-				AddDebugLogLineM( false, logServer, wxT("Server: OP_SERVERMESSAGE") );
+				AddDebugLogLineN( logServer, wxT("Server: OP_SERVERMESSAGE") );
 				
 				theStats::AddDownOverheadServer(size);
 				char* buffer = new char[size-1];
@@ -256,7 +256,7 @@
 						} else {	
 							servername = _("Server");
 						}
-						AddLogLineM(false, CFormat( _("ERROR: %s (%s) - %s") )
+						AddLogLineN(CFormat( _("ERROR: %s (%s) - %s") )
 							% servername
 							% Uint32_16toStringIP_Port(cur_server->GetIP(), cur_server->GetPort())
 							% message.Mid(5,message.Len()).Trim(wxT(" :")));
@@ -271,7 +271,7 @@
 						} else {	
 							servername = _("Server");
 						}
-						AddLogLineM(false, CFormat( _("WARNING: %s (%s) - %s") )
+						AddLogLineN(CFormat( _("WARNING: %s (%s) - %s") )
 							% servername
 							% Uint32_16toStringIP_Port(cur_server->GetIP(), cur_server->GetPort())
 							% message.Mid(5,message.Len()).Trim(wxT(" :")));
@@ -299,7 +299,7 @@
 				break;
 			}
 			case OP_IDCHANGE: {
-				AddDebugLogLineM(false,logServer,wxT("Server: OP_IDCHANGE"));
+				AddDebugLogLineN(logServer, wxT("Server: OP_IDCHANGE"));
 				
 				theStats::AddDownOverheadServer(size);
 				
@@ -325,9 +325,7 @@
 							ConnPort = data.ReadUInt32();
 							cur_server->SetPort(ConnPort);
 							if (cur_server->GetAuxPortsList().IsEmpty()) {
-								cur_server->SetAuxPortsList(wxString::Format(wxT("%u"), rport));
-//							} else {
-//								cur_server->SetAuxPortsList(wxString::Format(wxT("%u"), rport) + wxT(",") + cur_server->GetAuxPortsList());
+								cur_server->SetAuxPortsList(CFormat(wxT("%u")) % rport);
 							}
 						}
 					} else {
@@ -339,9 +337,7 @@
 						if (ConnPort) {
 							pServer->SetPort(ConnPort);
 							if (pServer->GetAuxPortsList().IsEmpty()) {
-								pServer->SetAuxPortsList(wxString::Format(wxT("%u"), pServer->GetConnPort()));
-//							} else {
-//								pServer->SetAuxPortsList(wxString::Format(wxT("%u"), pServer->GetConnPort()) + wxT(",") + pServer->GetAuxPortsList());
+								pServer->SetAuxPortsList(CFormat(wxT("%u")) % pServer->GetConnPort());
 							}
 							Notify_ServerRefresh(pServer);
 							Notify_ServerUpdateED2KInfo();
@@ -354,7 +350,7 @@
 				if (size >= 4 + 4 + 4 + 4 + 4 /* All of the above + reported ip + obfuscation port */) {
 					dwServerReportedIP = data.ReadUInt32();
 					if (::IsLowID(dwServerReportedIP)){
-						wxASSERT( false );
+						wxFAIL;
 						dwServerReportedIP = 0;
 					}
 					wxASSERT( dwServerReportedIP == new_id || ::IsLowID(new_id) );
@@ -406,7 +402,7 @@
 				}
 				
 				if (connectionstate != CS_CONNECTED) {
-					AddDebugLogLineM(false,logServer,wxT("Connected"));
+					AddDebugLogLineN(logServer, wxT("Connected"));
 					
 					SetConnectionState(CS_CONNECTED);
 					theApp->OnlineSig();       // Added By Bouc7
@@ -414,18 +410,18 @@
 
 				theApp->ShowConnectionState();
 
-				AddLogLineM(false, wxString::Format(_("New clientid is %u"),new_id));
+				AddLogLineN(CFormat(_("New clientid is %u")) % new_id);
 				if (::IsLowID(new_id)) {
-					AddLogLineM(true,  _("WARNING: You have received Low-ID!"));
-					AddLogLineM(false, _("\tMost likely this is because you're behind a firewall or router."));
-					AddLogLineM(false, _("\tFor more information, please refer to http://wiki.amule.org"));
+					AddLogLineC(_("WARNING: You have received Low-ID!"));
+					AddLogLineN(_("\tMost likely this is because you're behind a firewall or router."));
+					AddLogLineN(_("\tFor more information, please refer to http://wiki.amule.org"));
 				}
 								
 				theApp->downloadqueue->ResetLocalServerRequests();
 				break;
 			}
 			case OP_SEARCHRESULT: {
-				AddDebugLogLineM(false,logServer,wxT("Server: OP_SEARCHRESULT"));
+				AddDebugLogLineN(logServer, wxT("Server: OP_SEARCHRESULT"));
 				
 				theStats::AddDownOverheadServer(size);
 				CServer* cur_srv = (serverconnect) ? 
@@ -441,19 +437,19 @@
 			}
 			case OP_FOUNDSOURCES_OBFU:			
 			case OP_FOUNDSOURCES: {
-				AddDebugLogLineM(false,logServer,wxString::Format(wxT("ServerMsg - OP_FoundSources; sources = %u"), (uint32)(byte)packet[16]));
+				AddDebugLogLineN(logServer, CFormat(wxT("ServerMsg - OP_FoundSources; sources = %u")) % packet[16]);
 				theStats::AddDownOverheadServer(size);
 				CMemFile sources(packet,size);
 				CMD4Hash fileid = sources.ReadHash();
 				if (CPartFile* file = theApp->downloadqueue->GetFileByID(fileid)) {
 					file->AddSources(sources, cur_server->GetIP(), cur_server->GetPort(), SF_LOCAL_SERVER, (opcode == OP_FOUNDSOURCES_OBFU));
 				} else {
-					AddDebugLogLineM(false, logServer, wxT("Sources received for unknown file: ") + fileid.Encode());			
+					AddDebugLogLineN(logServer, wxT("Sources received for unknown file: ") + fileid.Encode());
 				}
 				break;
 			}
 			case OP_SERVERSTATUS: {
-				AddDebugLogLineM(false,logServer,wxT("Server: OP_SERVERSTATUS"));
+				AddDebugLogLineN(logServer, wxT("Server: OP_SERVERSTATUS"));
 				// FIXME some statuspackets have a different size -> why? structur?
 				if (size < 8) {
 					throw wxString(wxT("Invalid server status packet"));
@@ -471,11 +467,11 @@
 			}
 			// Cleaned.
 			case OP_SERVERIDENT: {
-				AddDebugLogLineM(false,logServer,wxT("Server: OP_SERVERIDENT"));
+				AddDebugLogLineN(logServer, wxT("Server: OP_SERVERIDENT"));
 
 				theStats::AddDownOverheadServer(size);
 				if (size<38) {
-					AddLogLineM(false, _("Unknown server info received! - too short"));
+					AddLogLineN(_("Unknown server info received! - too short"));
 					// throw wxString(wxT("Unknown server info received!"));
 					break;
 				}
@@ -512,7 +508,7 @@
 			}
 			// tecxx 1609 2002 - add server's serverlist to own serverlist
 			case OP_SERVERLIST: {
-				AddDebugLogLineM(false,logServer,wxT("Server: OP_SERVERLIST"));
+				AddDebugLogLineN(logServer, wxT("Server: OP_SERVERLIST"));
 				
 				CMemFile* servers = new CMemFile(packet,size);
 				uint8 count = servers->ReadUInt8();
@@ -536,17 +532,17 @@
 				}
 				delete servers;
 				if (addcount) {
-					AddLogLineM(false, wxString::Format(wxPLURAL("Received %d new server", "Received %d new servers", addcount), addcount));
+					AddLogLineN(CFormat(wxPLURAL("Received %d new server", "Received %d new servers", addcount)) % addcount);
 				}
 				theApp->serverlist->SaveServerMet();
-				AddLogLineM(false, _("Saving of server-list completed."));
+				AddLogLineN(_("Saving of server-list completed."));
 				break;
 			}
 			case OP_CALLBACKREQUESTED: {
-				AddDebugLogLineM(false,logServer,wxT("Server: OP_CALLBACKREQUESTED"));
+				AddDebugLogLineN(logServer, wxT("Server: OP_CALLBACKREQUESTED"));
 				
 				theStats::AddDownOverheadServer(size);
-				if (size == 6) {
+				if (size >= 6) {
 					CMemFile data(packet,size);
 					uint32 dwIP = data.ReadUInt32();
 					uint16 nPort = data.ReadUInt16();
@@ -559,9 +555,14 @@
 					}
 					
 					CUpDownClient* client = theApp->clientlist->FindClientByIP(dwIP,nPort);
+
+					if (!client) {
+						client = new CUpDownClient(nPort,dwIP,0,0,0, true, true);
+						theApp->clientlist->AddClient(client);
+					}
 					if (size >= 23 && client->HasValidHash()){
 						if (client->GetUserHash() != achUserHash){
-							AddDebugLogLineM(false, logServer, wxT("Reported Userhash from OP_CALLBACKREQUESTED differs with our stored hash"));
+							AddDebugLogLineN(logServer, wxT("Reported Userhash from OP_CALLBACKREQUESTED differs with our stored hash"));
 							// disable crypt support since we dont know which hash is true
 							client->SetCryptLayerRequest(false);
 							client->SetCryptLayerSupport(false);
@@ -574,37 +575,29 @@
 						client->SetConnectOptions(byCryptOptions, true, false);
 					}
 					
-					if (client) {
-						client->TryToConnect();
-					} else {
-						client = new CUpDownClient(nPort,dwIP,0,0,0, true, true);
-						theApp->clientlist->AddClient(client);
-						client->TryToConnect();
-					}
+					client->TryToConnect();
 				}
 				break;
 			}
 			case OP_CALLBACK_FAIL: {
-				AddDebugLogLineM(false,logServer,wxT("Server: OP_CALLBACK_FAIL"));
+				AddDebugLogLineN(logServer, wxT("Server: OP_CALLBACK_FAIL"));
 				break;
 			}
 			case OP_REJECT: {
-				AddDebugLogLineM(false,logServer,wxT("Server: OP_REJECT"));
-				AddLogLineM(false, _("Server rejected last command"));
+				AddDebugLogLineN(logServer, wxT("Server: OP_REJECT"));
+				AddLogLineN(_("Server rejected last command"));
 				break;
 			}
 			default:
-				AddDebugLogLineM( false, logPacketErrors, 
-					wxString::Format( wxT("Unknown server packet with OPcode %x"), opcode )
-				);
+				AddDebugLogLineN(logPacketErrors, CFormat(wxT("Unknown server packet with OPcode %x")) % opcode);
 		}
 		return true;
 	} catch (const CInvalidPacket& e) {
-		AddLogLineM(false,CFormat( _("Bogus packet received from server: %s") ) % e.what());
+		AddLogLineN(CFormat( _("Bogus packet received from server: %s") ) % e.what());
 	} catch (const CEOFException& e) {
-		AddLogLineM(false,CFormat( _("Bogus packet received from server: %s") ) % e.what());
+		AddLogLineN(CFormat( _("Bogus packet received from server: %s") ) % e.what());
 	} catch (const wxString& error) {
-		AddLogLineM(false,CFormat( _("Unhandled error while processing packet from server: %s") ) % error);
+		AddLogLineN(CFormat( _("Unhandled error while processing packet from server: %s") ) % error);
 	}
 
 	// Don't disconnect because of wrong sources.
@@ -618,10 +611,10 @@
 
 void CServerSocket::ConnectToServer(CServer* server, bool bNoCrypt)
 {
-	AddDebugLogLineM(false,logServer,wxT("Trying to connect"));
+	AddDebugLogLineN(logServer, wxT("Trying to connect"));
 	
 	if (cur_server){
-		wxASSERT(0);
+		wxFAIL;
 		delete cur_server;
 		cur_server = NULL;
 	}
@@ -643,11 +636,11 @@
 		if ( dns->Create() == wxTHREAD_NO_ERROR ) {
 			if ( dns->Run() != wxTHREAD_NO_ERROR ) {
 				dns->Delete();
-				AddLogLineM(false, CFormat( _("Cannot create DNS solving thread for connecting to %s") ) % cur_server->GetAddress());
+				AddLogLineN(CFormat( _("Cannot create DNS solving thread for connecting to %s") ) % cur_server->GetAddress());
 			}
 		} else {
 			dns->Delete();
-			AddLogLineM(false, CFormat( _("Cannot create DNS solving thread for connecting to %s") ) % cur_server->GetAddress());
+			AddLogLineN(CFormat( _("Cannot create DNS solving thread for connecting to %s") ) % cur_server->GetAddress());
 		}
 	} else {
 		// Nothing to solve, we already have the IP
@@ -656,20 +649,22 @@
 
 }
 
-void CServerSocket::OnError(wxSocketError nErrorCode)
+void CServerSocket::OnError(wxSocketError DEBUG_ONLY(nErrorCode))
 {
-	AddDebugLogLineM(false, logServer, wxT("Error in serversocket: ") + cur_server->GetListName() + wxT("(") + cur_server->GetFullIP() + wxString::Format(wxT(":%i): %u"),cur_server->GetPort(), (int)nErrorCode));
+	AddDebugLogLineN(logServer, CFormat(wxT("Error in serversocket: %s(%s:%i): %u"))
+		% cur_server->GetListName() % cur_server->GetFullIP() % cur_server->GetPort() % (int)nErrorCode);
 	SetConnectionState(CS_DISCONNECTED);
 }
 
 
 bool CServerSocket::PacketReceived(CPacket* packet)
 {
-	AddDebugLogLineM(false, logServer, wxString::Format(wxT("Server: Packet Received: Prot %x, Opcode %x, Length %u"), packet->GetProtocol(), packet->GetOpCode(), packet->GetPacketSize()));
+	AddDebugLogLineN(logServer, CFormat(wxT("Server: Packet Received: Prot %x, Opcode %x, Length %u")) % packet->GetProtocol() % packet->GetOpCode() % packet->GetPacketSize());
 	
 	if (packet->GetProtocol() == OP_PACKEDPROT) {
 		if (!packet->UnPackPacket(250000)){
-			AddDebugLogLineM(false, logZLib, wxString::Format(wxT("Failed to decompress server TCP packet: protocol=0x%02x  opcode=0x%02x  size=%u"), packet ? packet->GetProtocol() : 0, packet ? packet->GetOpCode() : 0, packet ? packet->GetPacketSize() : 0));
+			AddDebugLogLineN(logZLib, CFormat(wxT("Failed to decompress server TCP packet: protocol=0x%02x  opcode=0x%02x  size=%u"))
+				% packet->GetProtocol() % packet->GetOpCode() % packet->GetPacketSize());
 			theStats::AddDownOverheadServer(packet->GetPacketSize());
 			return true;
 		}
@@ -680,7 +675,8 @@
 	if (packet->GetProtocol() == OP_EDONKEYPROT) {
 		ProcessPacket(packet->GetDataBuffer(), packet->GetPacketSize(), packet->GetOpCode());
 	} else {
-		AddDebugLogLineM(false, logServer, wxString::Format(wxT("Received server TCP packet with unknown protocol: protocol=0x%02x  opcode=0x%02x  size=%u"), packet ? packet->GetProtocol() : 0, packet ? packet->GetOpCode() : 0, packet ? packet->GetPacketSize() : 0));
+		AddDebugLogLineN(logServer, CFormat(wxT("Received server TCP packet with unknown protocol: protocol=0x%02x  opcode=0x%02x  size=%u"))
+			% packet->GetProtocol() % packet->GetOpCode() % packet->GetPacketSize());
 		theStats::AddDownOverheadServer(packet->GetPacketSize());
 	}
 	
@@ -726,7 +722,7 @@
 	m_IsSolving = false;
 	if (ip) {
 		if (theApp->ipfilter->IsFiltered(ip, true)) {
-			AddLogLineM(true, CFormat( _("Server IP %s (%s) is filtered.  Not connecting.") )
+			AddLogLineC(CFormat( _("Server IP %s (%s) is filtered.  Not connecting.") )
 				% Uint32toStringIP(ip) % cur_server->GetAddress() );
 			OnConnect(wxSOCKET_INVADDR);
 		} else {
@@ -745,7 +741,7 @@
 			
 			addr.Service(nPort);			
 			
-			AddLogLineM(false, CFormat( _("Connecting to %s (%s - %s:%i) %s") )
+			AddLogLineN(CFormat( _("Connecting to %s (%s - %s:%i) %s") )
 				% cur_server->GetListName()
 				% cur_server->GetAddress()
 				% cur_server->GetFullIP()
@@ -753,11 +749,12 @@
 				% useObfuscation
 			);
 			
-			AddDebugLogLineM(false, logServer, wxT("Server ") + cur_server->GetAddress() + wxT("(") + Uint32toStringIP(ip) + wxT(")") + wxString::Format(wxT(" Port %i"), cur_server->GetConnPort()));
+			AddDebugLogLineN(logServer, CFormat(wxT("Server %s(%s) Port %i"))
+				% cur_server->GetAddress() % Uint32toStringIP(ip) % cur_server->GetConnPort());
 			Connect(addr, false);
 		}
 	} else {
-		AddLogLineM(true, CFormat( _("Could not solve dns for server %s: Unable to connect!") )
+		AddLogLineC(CFormat( _("Could not solve dns for server %s: Unable to connect!") )
 			% cur_server->GetAddress() );
 		OnConnect(wxSOCKET_NOHOST);
 	}

aMule-2.2.6.tar.bz2/src/ServerSocket.h -> aMule-2.3.1.tar.bz2/src/ServerSocket.h Changed

aMule-2.2.6.tar.bz2/src/ServerUDPSocket.cpp -> aMule-2.3.1.tar.bz2/src/ServerUDPSocket.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -81,9 +81,9 @@
 		wxASSERT( dwKey != 0 );
 		nPayLoadLen = CEncryptedDatagramSocket::DecryptReceivedServer(buffer, length, &pBuffer, dwKey, serverip);
 		if (nPayLoadLen == length) {
-			AddDebugLogLineM( false, logServerUDP,CFormat(wxT("Expected encrypted packet, but received unencrytped from server %s, UDPKey %u, Challenge: %u")) % pServer->GetListName() % pServer->GetServerKeyUDP() % pServer->GetChallenge());
+			AddDebugLogLineN(logServerUDP, CFormat(wxT("Expected encrypted packet, but received unencrytped from server %s, UDPKey %u, Challenge: %u")) % pServer->GetListName() % pServer->GetServerKeyUDP() % pServer->GetChallenge());
 		} else {
-			AddDebugLogLineM( false, logServerUDP,CFormat(wxT("Received encrypted packet from server %s, UDPKey %u, Challenge: %u")) % pServer->GetListName() % pServer->GetServerKeyUDP() % pServer->GetChallenge());
+			AddDebugLogLineN(logServerUDP, CFormat(wxT("Received encrypted packet from server %s, UDPKey %u, Challenge: %u")) % pServer->GetListName() % pServer->GetServerKeyUDP() % pServer->GetChallenge());
 		}
 	}
 	
@@ -94,8 +94,7 @@
 		CMemFile data(pBuffer + 2, nPayLoadLen - 2);
 		ProcessPacket(data, opcode, serverip, serverport);
 	} else {
-		AddDebugLogLineM( false, logServerUDP,
-			wxString::Format( wxT("Received invalid packet, protocol (0x%x) and opcode (0x%x)"), protocol, opcode ));
+		AddDebugLogLineN(logServerUDP, CFormat(wxT("Received invalid packet, protocol (0x%x) and opcode (0x%x)")) % protocol % opcode);
 			
 		theStats::AddDownOverheadOther(length);
 	}
@@ -108,7 +107,7 @@
 	unsigned size = packet.GetLength();
 	
 	theStats::AddDownOverheadOther(size);
-	AddDebugLogLineM( false, logServerUDP,
+	AddDebugLogLineN( logServerUDP,
 					CFormat( wxT("Received UDP server packet from %s:%u, opcode (0x%x)")) % 
 							Uint32toStringIP(ip) % port % opcode );
 	
@@ -130,11 +129,11 @@
 						uint8 new_opcode = packet.ReadUInt8();
 					
 						if (protocol != OP_EDONKEYPROT || new_opcode != OP_GLOBSEARCHRES) {
-							AddDebugLogLineM( true, logServerUDP,
+							AddDebugLogLineC( logServerUDP,
 								wxT("Server search reply got additional bogus bytes.") );
 							break;
 						} else {
-							AddDebugLogLineM( true, logServerUDP, 
+							AddDebugLogLineC( logServerUDP,
 								wxT("Got server search reply with additional packet.") );
 						}
 					}					
@@ -150,7 +149,7 @@
 					if (CPartFile* file = theApp->downloadqueue->GetFileByID(fileid)) {
 						file->AddSources(packet, ip, port-4, SF_REMOTE_SERVER, false);
 					} else {
-						AddDebugLogLineM( true, logServerUDP, wxT("Sources received for unknown file") );
+						AddDebugLogLineC( logServerUDP, wxT("Sources received for unknown file") );
 						// skip sources for that file
 						uint8 count = packet.ReadUInt8();
 						packet.Seek(count*(4+2), wxFromCurrent);
@@ -162,7 +161,7 @@
 						uint8 new_opcode = packet.ReadUInt8();
 					
 						if (protocol != OP_EDONKEYPROT || new_opcode != OP_GLOBFOUNDSOURCES) {
-							AddDebugLogLineM( true, logServerUDP,
+							AddDebugLogLineC( logServerUDP,
 								wxT("Server sources reply got additional bogus bytes.") );
 							break;
 						} 
@@ -174,14 +173,14 @@
  			case OP_GLOBSERVSTATRES:{
 				// Reviewed with 0.47c
 				if (!update) {
-					throw wxString(wxT("Unknown server on a OP_GLOBSERVSTATRES packet (") + Uint32toStringIP(ip) + wxString::Format(wxT(":%d)"), port-4));
+					throw wxString(CFormat(wxT("Unknown server on a OP_GLOBSERVSTATRES packet (%s:%d)")) % Uint32toStringIP(ip) % (port-4));
 				}
-				if( size < 12) {
-					throw(wxString(wxString::Format(wxT("Invalid OP_GLOBSERVSTATRES packet (size=%u)"),size)));
+				if (size < 12) {
+					throw wxString(CFormat(wxT("Invalid OP_GLOBSERVSTATRES packet (size=%u)")) % size);
 				}
 				uint32 challenge = packet.ReadUInt32();
 				if (challenge != update->GetChallenge()) {
-					throw(wxString(wxString::Format(wxT("Invalid challenge on OP_GLOBSERVSTATRES packet (0x%x != 0x%x)"),challenge,update->GetChallenge())));
+					throw wxString(CFormat(wxT("Invalid challenge on OP_GLOBSERVSTATRES packet (0x%x != 0x%x)")) % challenge % update->GetChallenge());
 				}
 				
 				update->SetChallenge(0);
@@ -243,7 +242,7 @@
 					update->SetDescReqChallenge(uDescReqChallenge);
 					sendpacket->CopyUInt32ToDataBuffer(uDescReqChallenge);
 					//theStats.AddUpDataOverheadServer(packet->size);
-					AddDebugLogLineM(false, logServerUDP, CFormat(wxT(">>> Sending OP__ServDescReq     to server %s:%u, challenge %08x\n")) % update->GetAddress() % update->GetPort() % uDescReqChallenge);
+					AddDebugLogLineN(logServerUDP, CFormat(wxT(">>> Sending OP__ServDescReq     to server %s:%u, challenge %08x\n")) % update->GetAddress() % update->GetPort() % uDescReqChallenge);
 					theApp->serverconnect->SendUDPPacket(sendpacket, update, true);					
 				} else {
 					update->SetLastDescPingedCount(true);
@@ -291,8 +290,7 @@
 									if (tag.IsStr()) {
 										update->SetVersion(tag.GetStr());
 									} else if (tag.IsInt()) {
-										wxString strVersion = wxString::Format(wxT("%u.%u"), tag.GetInt() >> 16, tag.GetInt() & 0xFFFF);
-										update->SetVersion(strVersion);
+										update->SetVersion(CFormat(wxT("%u.%u")) % (tag.GetInt() >> 16) % (tag.GetInt() & 0xFFFF));
 									}
 									break;
 								case ST_AUXPORTSLIST:
@@ -318,15 +316,14 @@
 				break;
 			}
 			default:
-				AddDebugLogLineM( true, logServerUDP,
-					wxString::Format( wxT("Unknown Server UDP opcode %x"), opcode ) );
+				AddDebugLogLineC(logServerUDP, CFormat(wxT("Unknown Server UDP opcode %x")) % opcode);
 		}
-	} catch (const wxString& error) {
-		AddDebugLogLineM(false, logServerUDP, wxT("Error while processing incoming UDP Packet: ") + error);
-	} catch (const CInvalidPacket& error) {
-		AddDebugLogLineM(false, logServerUDP, wxT("Invalid UDP packet encountered: ") + error.what());
-	} catch (const CEOFException& e) {
-		AddDebugLogLineM(false, logServerUDP, wxT("IO error while processing incoming UDP Packet: ") + e.what());
+	} catch (const wxString& DEBUG_ONLY(error)) {
+		AddDebugLogLineN(logServerUDP, wxT("Error while processing incoming UDP Packet: ") + error);
+	} catch (const CInvalidPacket& DEBUG_ONLY(error)) {
+		AddDebugLogLineN(logServerUDP, wxT("Invalid UDP packet encountered: ") + error.what());
+	} catch (const CEOFException& DEBUG_ONLY(e)) {
+		AddDebugLogLineN(logServerUDP, wxT("IO error while processing incoming UDP Packet: ") + e.what());
 	}
 	
 	if (update) {
@@ -371,7 +368,7 @@
 		memcpy(pRawPacket + 2, packet->GetDataBuffer(), packet->GetPacketSize());
 		
 		uRawPacketSize = CEncryptedDatagramSocket::EncryptSendServer(&pRawPacket, uRawPacketSize, host->GetServerKeyUDP());
-		AddDebugLogLineM(false, logServerUDP, CFormat(wxT("Sending encrypted packet to server %s, UDPKey %u, port %u, original OPCode 0x%02x")) % host->GetListName() % host->GetServerKeyUDP() % host->GetObfuscationPortUDP() % packet->GetOpCode());
+		AddDebugLogLineN(logServerUDP, CFormat(wxT("Sending encrypted packet to server %s, UDPKey %u, port %u, original OPCode 0x%02x")) % host->GetListName() % host->GetServerKeyUDP() % host->GetObfuscationPortUDP() % packet->GetOpCode());
 		item.port = host->GetObfuscationPortUDP();
 		
 		CMemFile encryptedpacket(pRawPacket + 2, uRawPacketSize - 2);
@@ -383,7 +380,7 @@
 		}
 		
 	} else {
-		AddDebugLogLineM(false, logServerUDP, CFormat(wxT("Sending regular packet to server %s, port %u (raw = %s), OPCode 0x%02x")) % host->GetListName() % host->GetObfuscationPortUDP() % (rawpacket ? wxT("True") : wxT("False")) % packet->GetOpCode());
+		AddDebugLogLineN(logServerUDP, CFormat(wxT("Sending regular packet to server %s, port %u (raw = %s), OPCode 0x%02x")) % host->GetListName() % host->GetObfuscationPortUDP() % (rawpacket ? wxT("True") : wxT("False")) % packet->GetOpCode());
 		if (delPacket) {
 			item.packet = packet;
 		} else {
@@ -430,19 +427,19 @@
 					// It has been checked recently, don't re-check yet.
 					if (update->GetDNSError()) {
 						// Drop the packet, dns failed last time
-						AddDebugLogLineM(false, logServerUDP, wxT("Trying to send an UDP packet to a server host that failed DNS: ")+item.addr);
+						AddDebugLogLineN(logServerUDP, wxT("Trying to send a UDP packet to a server host that failed DNS: ")+item.addr);
 						m_queue.pop_front();
 						continue;
 					} else {
 						// It has been solved or is solving.
 						if (update->GetIP()) {
 							// It has been solved and ok
-							AddDebugLogLineM(false, logServerUDP, wxT("Sending a UDP packet to a resolved DNS server host: ")+item.addr);
+							AddDebugLogLineN(logServerUDP, wxT("Sending a UDP packet to a resolved DNS server host: ")+item.addr);
 							// Update the item IP
 							item.ip = update->GetIP();
 							// It'll fallback to the sending.
 						} else {
-							AddDebugLogLineM(false, logServerUDP, wxT("Trying to send an UDP packet to a server host that is checking DNS: ")+item.addr);
+							AddDebugLogLineN(logServerUDP, wxT("Trying to send a UDP packet to a server host that is checking DNS: ")+item.addr);
 							// Let the packet queued, and wait for resolution
 							// Meanwhile, send other packets.
 							m_queue.pop_front();
@@ -452,7 +449,7 @@
 					}
 				}
 			} else {
-				AddDebugLogLineM(false, logServerUDP, wxT("Trying to send an UDP packet to a server host that is not on serverlist"));
+				AddDebugLogLineN(logServerUDP, wxT("Trying to send a UDP packet to a server host that is not on serverlist"));
 				// Not much we can do here, just drop the packet.
 				m_queue.pop_front();
 				continue;
@@ -461,11 +458,11 @@
 		
 		CServer* update = theApp->serverlist->GetServerByIPUDP(item.ip, item.port, true);
 		if (update) {
-			AddDebugLogLineM(false, logServerUDP, wxT("Sending an UDP packet to a server: ")+update->GetAddress());
+			AddDebugLogLineN(logServerUDP, wxT("Sending a UDP packet to a server: ")+update->GetAddress());
 			// Don't encrypt, as this is already either encrypted or refused to encrypt.
 			CMuleUDPSocket::SendPacket(packet, item.ip, item.port, false, NULL, false, 0);
 		} else {
-			AddDebugLogLineM(false, logServerUDP, wxT("Sending an UDP packet to a server no in serverlist: ")+Uint32_16toStringIP_Port(item.ip,item.port));
+			AddDebugLogLineN(logServerUDP, wxT("Sending a UDP packet to a server no in serverlist: ")+Uint32_16toStringIP_Port(item.ip,item.port));
 		}
 		
 		m_queue.pop_front();

aMule-2.2.6.tar.bz2/src/ServerUDPSocket.h -> aMule-2.3.1.tar.bz2/src/ServerUDPSocket.h Changed

aMule-2.2.6.tar.bz2/src/ServerWnd.cpp -> aMule-2.3.1.tar.bz2/src/ServerWnd.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -35,9 +35,7 @@
 #include "amule.h"			// Needed for theApp
 #include "Logger.h"
 
-#include "kademlia/kademlia/Kademlia.h"
 #include "ClientList.h"
-#include "updownclient.h"
 
 BEGIN_EVENT_TABLE(CServerWnd,wxPanel)
 	EVT_BUTTON(ID_ADDTOLIST,CServerWnd::OnBnClickedAddserver)
@@ -101,12 +99,12 @@
 	long port = StrToULong( CastChild( IDC_SPORT, wxTextCtrl )->GetValue() );
 
 	if ( serveraddr.IsEmpty() ) {
-		AddLogLineM( true, _("Server not added: No IP or hostname specified."));
+		AddLogLineC(_("Server not added: No IP or hostname specified."));
 		return;
 	}
 	
 	if ( port <= 0 || port > 65535 ) {
-		AddLogLineM( true, _("Server not added: Invalid server-port specified."));
+		AddLogLineC(_("Server not added: Invalid server-port specified."));
 		return;
 	}
   
@@ -172,7 +170,7 @@
 
 		ED2KInfoList->InsertItem(2, _("ID"));
 		// No need to test the server connect, it's already true
-		ED2KInfoList->SetItem(2, 1, wxString::Format(wxT("%u"), theApp->GetED2KID()));
+		ED2KInfoList->SetItem(2, 1, CFormat(wxT("%u")) % theApp->GetED2KID());
 		
 		ED2KInfoList->InsertItem(3, wxEmptyString);		
 
@@ -197,62 +195,78 @@
 void CServerWnd::UpdateKadInfo()
 {
 	wxListCtrl* KadInfoList = CastChild( ID_KADINFO, wxListCtrl );
-	
+
 	int next_row = 0;
-	
+
 	KadInfoList->DeleteAllItems();
-	
+
 	KadInfoList->InsertItem(next_row, _("Kademlia Status:"));
 
 	if (theApp->IsKadRunning()) {
-		KadInfoList->SetItem(next_row, 1, _("Running"));
-			
-		++next_row;
-			
-		// Connection data		
-			
+		KadInfoList->SetItem(next_row++, 1, (theApp->IsKadRunningInLanMode() ? _("Running in LAN mode") : _("Running")));
+
+		// Connection data
 		KadInfoList->InsertItem(next_row, _("Status:"));
-		KadInfoList->SetItem(next_row, 1, theApp->IsConnectedKad() ? _("Connected"): _("Disconnected"));
-		++next_row;
+		KadInfoList->SetItem(next_row++, 1, theApp->IsConnectedKad() ? _("Connected"): _("Disconnected"));
 		if (theApp->IsConnectedKad()) {
 			KadInfoList->InsertItem(next_row, _("Connection State:"));
-			KadInfoList->SetItem(next_row, 1, theApp->IsFirewalledKad() ? _("Firewalled") : _("OK"));
-			++next_row;
-			#ifndef CLIENT_GUI
-			if (theApp->IsFirewalledKad()) {
+			KadInfoList->SetItem(next_row++, 1, theApp->IsFirewalledKad() ?
+				wxString(CFormat(_("Firewalled - open TCP port %d in your router or firewall")) % thePrefs::GetPort())
+				: wxString(_("OK")));
+			KadInfoList->InsertItem(next_row, _("UDP Connection State:"));
+			bool UDPFirewalled = theApp->IsFirewalledKadUDP();
+			KadInfoList->SetItem(next_row++, 1, UDPFirewalled ?
+				wxString(CFormat(_("Firewalled - open UDP port %d in your router or firewall")) % thePrefs::GetUDPPort())
+				: wxString(_("OK")));
+
+			if (theApp->IsFirewalledKad() || UDPFirewalled) {
 				KadInfoList->InsertItem(next_row, _("Firewalled state: "));
-				KadInfoList->SetItem(next_row, 1, theApp->clientlist->GetBuddy() ? _("Connected to buddy") : _("No buddy"));
-				++next_row;
-				#ifdef __DEBUG__
-				if (theApp->clientlist->GetBuddy()) {
-					KadInfoList->InsertItem(next_row, wxT("Buddy address: "));
-					KadInfoList->SetItem(next_row, 1, Uint32_16toStringIP_Port(theApp->clientlist->GetBuddy()->GetIP(), theApp->clientlist->GetBuddy()->GetUDPPort()));
-					++next_row;		
+				wxString BuddyState;
+				switch ( theApp->GetBuddyStatus() )
+				{
+					case Disconnected:
+						if (!theApp->IsFirewalledKad()) {
+							BuddyState = _("No buddy required - TCP port open");
+						} else if (!UDPFirewalled) {
+							BuddyState = _("No buddy required - UDP port open");
+						} else {
+							BuddyState = _("No buddy");
+						}
+						break;
+					case Connecting:
+						BuddyState = _("Connecting to buddy");
+						break;
+					case Connected:
+						BuddyState = CFormat(_("Connected to buddy at %s")) % Uint32_16toStringIP_Port(theApp->GetBuddyIP(), theApp->GetBuddyPort());
+						break;
 				}
-				#endif
+				KadInfoList->SetItem(next_row++, 1, BuddyState);
 			}
-			uint32 KademliaUsers = Kademlia::CKademlia::GetKademliaUsers();
-			uint32 KademliaFiles = Kademlia::CKademlia::GetKademliaFiles();
-			#else 
-			uint32 KademliaUsers = theStats::GetKadUsers();
-			uint32 KademliaFiles = theStats::GetKadFiles();
-			//#warning TODO: Buddy state on remote GUI
-			/* Maybe Averages too, but that would be redundant 
-			   they are already on the status bar */
-			#endif
+
+			KadInfoList->InsertItem(next_row, _("IP address:"));
+			KadInfoList->SetItem(next_row++, 1, Uint32toStringIP(theApp->GetKadIPAdress()));
+
+			// Index info
+			KadInfoList->InsertItem(next_row, _("Indexed sources:"));
+			KadInfoList->SetItem(next_row++, 1, CFormat(wxT("%d")) % theApp->GetKadIndexedSources());
+			KadInfoList->InsertItem(next_row, _("Indexed keywords:"));
+			KadInfoList->SetItem(next_row++, 1, CFormat(wxT("%d")) % theApp->GetKadIndexedKeywords());
+			KadInfoList->InsertItem(next_row, _("Indexed notes:"));
+			KadInfoList->SetItem(next_row++, 1, CFormat(wxT("%d")) % theApp->GetKadIndexedNotes());
+			KadInfoList->InsertItem(next_row, _("Indexed load:"));
+			KadInfoList->SetItem(next_row++, 1, CFormat(wxT("%d")) % theApp->GetKadIndexedLoad());
+
 			KadInfoList->InsertItem(next_row, _("Average Users:"));
-			KadInfoList->SetItem(next_row, 1, CastItoIShort(KademliaUsers));
+			KadInfoList->SetItem(next_row, 1, CastItoIShort(theApp->GetKadUsers()));
 			++next_row;
 			KadInfoList->InsertItem(next_row, _("Average Files:"));
-			KadInfoList->SetItem(next_row, 1, CastItoIShort(KademliaFiles));
-			
-		} 
-			
+			KadInfoList->SetItem(next_row, 1, CastItoIShort(theApp->GetKadFiles()));
+		}
 	} else {
 		// No data
 		KadInfoList->SetItem(next_row, 1, _("Not running"));
 	}
-	
+
 	// Fit the width of the columns
 	KadInfoList->SetColumnWidth(0, -1);
 	KadInfoList->SetColumnWidth(1, -1);

aMule-2.2.6.tar.bz2/src/ServerWnd.h -> aMule-2.3.1.tar.bz2/src/ServerWnd.h Changed

aMule-2.2.6.tar.bz2/src/SharedFileList.cpp -> aMule-2.3.1.tar.bz2/src/SharedFileList.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -26,7 +26,6 @@
 #include "SharedFileList.h"	// Interface declarations  // Do_not_auto_remove
 
 #include <protocol/Protocols.h>
-#include <protocol/ed2k/ClientSoftware.h>
 #include <protocol/kad/Constants.h>
 #include <tags/FileTags.h>
 
@@ -42,7 +41,6 @@
 #include "amule.h"		// Needed for theApp
 #include "PartFile.h"		// Needed for PartFile
 #include "Server.h"		// Needed for CServer
-#include "updownclient.h"
 #include "Statistics.h"		// Needed for theStats
 #include "Logger.h"
 #include <common/Format.h>
@@ -88,7 +86,7 @@
 
 	bool AddRef(CKnownFile* pFile) {
 		if (std::find(m_aFiles.begin(), m_aFiles.end(), pFile) != m_aFiles.end()) {
-			wxASSERT(0);
+			wxFAIL;
 			return false;
 		}
 		m_aFiles.push_back(pFile);
@@ -132,7 +130,9 @@
 	CPublishKeywordList();
 	~CPublishKeywordList();
 
+	void AddKeyword(const wxString& keyword, CKnownFile *file);
 	void AddKeywords(CKnownFile* pFile);
+	void RemoveKeyword(const wxString& keyword, CKnownFile *file);
 	void RemoveKeywords(CKnownFile* pFile);
 	void RemoveAllKeywords();
 
@@ -202,20 +202,40 @@
 	return NULL;
 }
 
+void CPublishKeywordList::AddKeyword(const wxString& keyword, CKnownFile *file)
+{
+	CPublishKeyword* pubKw = FindKeyword(keyword);
+	if (pubKw == NULL) {
+		pubKw = new CPublishKeyword(keyword);
+		m_lstKeywords.push_back(pubKw);
+		SetNextPublishTime(0);
+	}
+	pubKw->AddRef(file);
+}
+
 void CPublishKeywordList::AddKeywords(CKnownFile* pFile)
 {
 	const Kademlia::WordList& wordlist = pFile->GetKadKeywords();
 
 	Kademlia::WordList::const_iterator it;
 	for (it = wordlist.begin(); it != wordlist.end(); ++it) {
-		const wxString& strKeyword = *it;
-		CPublishKeyword* pPubKw = FindKeyword(strKeyword);
-		if (pPubKw == NULL) {
-			pPubKw = new CPublishKeyword(strKeyword);
-			m_lstKeywords.push_back(pPubKw);
+		AddKeyword(*it, pFile);
+	}
+}
+
+void CPublishKeywordList::RemoveKeyword(const wxString& keyword, CKnownFile *file)
+{
+	CKeyWordList::iterator pos;
+	CPublishKeyword* pubKw = FindKeyword(keyword, &pos);
+	if (pubKw != NULL) {
+		if (pubKw->RemoveRef(file) == 0) {
+			if (pos == m_posNextKeyword) {
+				++m_posNextKeyword;
+			}
+			m_lstKeywords.erase(pos);
+			delete pubKw;
 			SetNextPublishTime(0);
 		}
-		pPubKw->AddRef(pFile);
 	}
 }
 
@@ -224,19 +244,7 @@
 	const Kademlia::WordList& wordlist = pFile->GetKadKeywords();
 	Kademlia::WordList::const_iterator it;
 	for (it = wordlist.begin(); it != wordlist.end(); ++it) {
-		const wxString& strKeyword = *it;
-		CKeyWordList::iterator pos;
-		CPublishKeyword* pPubKw = FindKeyword(strKeyword, &pos);
-		if (pPubKw != NULL) {
-			if (pPubKw->RemoveRef(pFile) == 0) {
-				if (pos == m_posNextKeyword) {
-					++m_posNextKeyword;
-				}
-				m_lstKeywords.erase(pos);
-				delete pPubKw;
-				SetNextPublishTime(0);
-			}
-		}
+		RemoveKeyword(*it, pFile);
 	}
 }
 
@@ -321,8 +329,8 @@
 		CPartFile* file = theApp->downloadqueue->GetFileByIndex( i );
 		
 		if ( file->GetStatus(true) == PS_READY ) {
-			printf("Adding file %s to shares\n",
-				(const char *)unicode2char(file->GetFullName().GetPrintable()));
+			AddLogLineNS(CFormat(_("Adding file %s to shares"))
+				% file->GetFullName().GetPrintable());
 			AddFile(file);
 		}
 	}
@@ -342,20 +350,31 @@
 	sharedPaths.sort();
 	sharedPaths.unique();
 
+	filelist->PrepareIndex();
+	// Gathering is done in the foreground and can be slowed down severely by parallel background hashing.
+	// So just store the hashing tasks for now.
+	TaskList hashTasks;
+	for (std::list<CPath>::iterator it = sharedPaths.begin(); it != sharedPaths.end(); ++it) {
+		AddFilesFromDirectory(*it, hashTasks);
+	}
+	filelist->ReleaseIndex();
+
+	// Now that the shared files are gathered feed the hashing tasks to the scheduler to start hashing.
 	unsigned addedFiles = 0;
-	std::list<CPath>::iterator it = sharedPaths.begin();
-	for (; it != sharedPaths.end(); ++it) {
-		addedFiles += AddFilesFromDirectory(*it);
+	for (TaskList::iterator it = hashTasks.begin(); it != hashTasks.end(); ++it) {
+		if (CThreadScheduler::AddTask(*it)) {
+			addedFiles++;
+		}
 	}
 	
 	if (addedFiles == 0) {
-		AddLogLineM(false, wxString::Format(wxPLURAL("Found %i known shared file", "Found %i known shared files", GetCount()), GetCount()));
+		AddLogLineN(CFormat(wxPLURAL("Found %i known shared file", "Found %i known shared files", GetCount())) % GetCount());
 
 		// Make sure the AICH-hashes are up to date.
 		CThreadScheduler::AddTask(new CAICHSyncTask());
 	} else {	
 		// New files, AICH thread will be run at the end of the hashing thread.
-		AddLogLineM(false, wxString::Format(wxPLURAL("Found %i known shared file, %i unknown", "Found %i known shared files, %i unknown", GetCount()), GetCount(), addedFiles));
+		AddLogLineN(CFormat(wxPLURAL("Found %i known shared file, %i unknown", "Found %i known shared files, %i unknown", GetCount())) % GetCount() % addedFiles);
 	}
 }
 
@@ -364,7 +383,7 @@
 bool CheckDirectory(const wxString& a, const CPath& b)
 {
 	if (CPath(a).IsSameDir(b)) {
-		AddLogLineM(true, CFormat( _("ERROR: Attempted to share %s") ) % a);
+		AddLogLineC(CFormat( _("ERROR: Attempted to share %s") ) % a);
 
 		return true;
 	}
@@ -373,7 +392,7 @@
 }
 		
 
-unsigned CSharedFileList::AddFilesFromDirectory(const CPath& directory)
+unsigned CSharedFileList::AddFilesFromDirectory(const CPath& directory, TaskList & hashTasks)
 {
 	// Do not allow these folders to be shared:
 	//  - The .aMule folder
@@ -388,8 +407,8 @@
 	}
 
 	if (!directory.DirExists()) {
-		printf("Shared directory not found, skipping: %s\n",
-			(const char *)unicode2char(directory.GetPrintable()));
+		AddLogLineNS(CFormat(_("Shared directory not found, skipping: %s"))
+			% directory.GetPrintable());
 		
 		return 0;
 	}
@@ -404,19 +423,16 @@
 
 	CDirIterator SharedDir(directory); 
 
-	CPath fname = SharedDir.GetFirstFile(searchFor);
-	while (fname.IsOk()) {
+	for (CPath fname = SharedDir.GetFirstFile(searchFor); fname.IsOk(); fname = SharedDir.GetNextFile()) {
 		CPath fullPath = directory.JoinPaths(fname);
 	
 		if (!fullPath.FileExists()) {
-			AddDebugLogLineM(false, logKnownFiles,
+			AddDebugLogLineN(logKnownFiles,
 				CFormat(wxT("Shared file does not exist (possibly a broken link): %s")) % fullPath);
-			
-			fname = SharedDir.GetNextFile();
 			continue;
 		}
 
-		AddDebugLogLineM(false, logKnownFiles,
+		AddDebugLogLineN(logKnownFiles,
 			CFormat(wxT("Found shared file: %s")) % fullPath);
 
 		time_t fdate = CPath::GetModificationTime(fullPath);
@@ -424,10 +440,14 @@
 
 		// This will also catch files with too strict permissions.
 		if ((fdate == (time_t)-1) || (fsize == wxInvalidOffset)) {
-			AddDebugLogLineM(false, logKnownFiles,
-				CFormat(wxT("Failed to retrive modification time or size for '%s', skipping.")) % fullPath);
-			
-			fname = SharedDir.GetNextFile();
+			AddDebugLogLineN(logKnownFiles,
+				CFormat(wxT("Failed to retrieve modification time or size for '%s', skipping.")) % fullPath);
+			continue;
+		}
+
+		if (fsize == 0) {
+			AddDebugLogLineN(logKnownFiles,
+				CFormat(wxT("Skip zero size file '%s'")) % fullPath);
 			continue;
 		}
 
@@ -436,32 +456,29 @@
 		if (toadd) {
 			knownFiles++;
 			if (AddFile(toadd)) {
-				AddDebugLogLineM(false, logKnownFiles,
+				AddDebugLogLineN(logKnownFiles,
 					CFormat(wxT("Added known file '%s' to shares"))
 						% fname);
 
 				toadd->SetFilePath(directory);
 			} else {
-				AddDebugLogLineM(false, logKnownFiles,
+				AddDebugLogLineN(logKnownFiles,
 					CFormat(wxT("File already shared, skipping: %s"))
 						% fname);
 			}
 		} else {
 			//not in knownfilelist - start adding thread to hash file
-			AddDebugLogLineM(false, logKnownFiles,
+			AddDebugLogLineN(logKnownFiles,
 				CFormat(wxT("Hashing new unknown shared file '%s'")) % fname);
 			
-			if (CThreadScheduler::AddTask(new CHashingTask(directory, fname))) {
-				addedFiles++;
-			}
+			hashTasks.push_back(new CHashingTask(directory, fname));
+			addedFiles++;
 		}
-
-		fname = SharedDir.GetNextFile();
 	}
 
 	if ((addedFiles == 0) && (knownFiles == 0)) {
-		printf("No shareable files found in directory: %s\n",
-			(const char *)unicode2char(directory.GetPrintable()));
+		AddLogLineN(CFormat(_("No shareable files found in directory: %s"))
+			% directory.GetPrintable());
 	}
 
 	return addedFiles;
@@ -520,12 +537,16 @@
 	// deltaHF - removed the old ugly button and changed the code to use the new small one
 	// Kry - bah, let's use a var. 
 	if (!reloading) {
+		AddDebugLogLineN(logKnownFiles, wxT("Reload shared files"));
 		reloading = true;
 		Notify_SharedFilesRemoveAllItems();
 		
 		/* All Kad keywords must be removed */
 		m_keywords->RemoveAllKeywordReferences();
-		
+
+		/* Public identifiers must be erased as they might be invalid now */
+		m_PublicSharedDirNames.clear();
+
 		FindSharedFiles();
 		
 		/* And now the unreferenced keywords must be removed also */
@@ -572,13 +593,13 @@
 }
 
 
-void CSharedFileList::CopyFileList(std::vector<CKnownFile*>& out_list)
+void CSharedFileList::CopyFileList(std::vector<CKnownFile*>& out_list) const
 {
 	wxMutexLocker lock(list_mut);
 
 	out_list.reserve(m_Files_map.size());
 	for (
-		CKnownFileMap::iterator it = m_Files_map.begin();
+		CKnownFileMap::const_iterator it = m_Files_map.begin();
 		it != m_Files_map.end();
 		++it
 		) {
@@ -711,7 +732,7 @@
 	for ( ; (sorted_it != SortedList.end()) && (count < limit); ++sorted_it ) {
 		CKnownFile* file = *sorted_it;
 		if (!file->IsLargeFile() || (server && server->SupportsLargeFilesTCP())) {
-			CreateOfferedFilePacket(file, &files, server, NULL);
+			file->CreateOfferedFilePacket(&files, server, NULL);
 		}
 		file->SetPublishedED2K(true);	
 		++count;
@@ -735,153 +756,6 @@
 }
 
 
-void CSharedFileList::CreateOfferedFilePacket(
-	CKnownFile *cur_file,
-	CMemFile *files,
-	CServer *pServer,
-	CUpDownClient *pClient) {
-		
-	// This function is used for offering files to the local server and for sending
-	// shared files to some other client. In each case we send our IP+Port only, if
-	// we have a HighID.
-
-	wxASSERT(!(pClient && pServer));
-		
-	cur_file->SetPublishedED2K(true);
-	files->WriteHash(cur_file->GetFileHash());
-
-	uint32 nClientID = 0;
-	uint16 nClientPort = 0;
-
-	if (pServer) {
-		if (pServer->GetTCPFlags() & SRV_TCPFLG_COMPRESSION) {
-			#define FILE_COMPLETE_ID		0xfbfbfbfb
-			#define FILE_COMPLETE_PORT	0xfbfb
-			#define FILE_INCOMPLETE_ID	0xfcfcfcfc
-			#define FILE_INCOMPLETE_PORT	0xfcfc
-			// complete   file: ip 251.251.251 (0xfbfbfbfb) port 0xfbfb
-			// incomplete file: op 252.252.252 (0xfcfcfcfc) port 0xfcfc
-			if (cur_file->GetStatus() == PS_COMPLETE) {
-				nClientID = FILE_COMPLETE_ID;
-				nClientPort = FILE_COMPLETE_PORT;
-			} else {
-				nClientID = FILE_INCOMPLETE_ID;
-				nClientPort = FILE_INCOMPLETE_PORT;
-			}
-		} else {
-			if (theApp->IsConnectedED2K() && !::IsLowID(theApp->GetED2KID())){
-				nClientID = theApp->GetID();
-				nClientPort = thePrefs::GetPort();
-			}
-		}
-	} else {
-		// Do not merge this with the above case - this one
-		// also checks Kad status.
-		if (theApp->IsConnected() && !theApp->IsFirewalled()) {
-			nClientID = theApp->GetID();
-			nClientPort = thePrefs::GetPort();
-		}		
-	}
-
-	files->WriteUInt32(nClientID);
-	files->WriteUInt16(nClientPort);
-	
-	TagPtrList tags;
-
-	// The printable filename is used because it's destined for another user.
-	tags.push_back(new CTagString(FT_FILENAME, cur_file->GetFileName().GetPrintable()));
-	
-	if (pClient && pClient->GetVBTTags()) {
-		tags.push_back(new CTagVarInt(FT_FILESIZE, cur_file->GetFileSize()));
-	} else {
-		if (!cur_file->IsLargeFile()){
-			tags.push_back(new CTagInt32(FT_FILESIZE, cur_file->GetFileSize()));
-		} else {
-			// Large file
-			// we send 2*32 bit tags to servers, but a real 64 bit tag to other clients.
-			if (pServer) {
-				if (!pServer->SupportsLargeFilesTCP()){
-					wxASSERT( false );
-					tags.push_back(new CTagInt32(FT_FILESIZE, 0));
-				}else {
-					tags.push_back(new CTagInt32(FT_FILESIZE, (uint32)cur_file->GetFileSize()));
-					tags.push_back(new CTagInt32(FT_FILESIZE_HI, (uint32)(cur_file->GetFileSize() >> 32)));
-				}
-			} else {
-				if (!pClient->SupportsLargeFiles()) {
-					wxASSERT( false );
-					tags.push_back(new CTagInt32(FT_FILESIZE, 0));
-				} else {
-					tags.push_back(new CTagInt64(FT_FILESIZE, cur_file->GetFileSize()));
-				}
-			}		
-		}
-	}
-	
-	if (cur_file->GetFileRating()) {
-		tags.push_back(new CTagVarInt(FT_FILERATING, cur_file->GetFileRating(), (pClient && pClient->GetVBTTags()) ? 0 : 32));
-	}
-
-	// NOTE: Archives and CD-Images are published+searched with file type "Pro"
-	bool bAddedFileType = false;
-	if (pServer && (pServer->GetTCPFlags() & SRV_TCPFLG_TYPETAGINTEGER)) {
-		// Send integer file type tags to newer servers
-		EED2KFileType eFileType = GetED2KFileTypeSearchID(GetED2KFileTypeID(cur_file->GetFileName()));
-		if (eFileType >= ED2KFT_AUDIO && eFileType <= ED2KFT_CDIMAGE) {
-			tags.push_back(new CTagInt32(FT_FILETYPE, eFileType));
-			bAddedFileType = true;
-		}
-	}
-	if (!bAddedFileType) {
-		// Send string file type tags to:
-		//	- newer servers, in case there is no integer type available for the file type (e.g. emulecollection)
-		//	- older servers
-		//	- all clients
-		wxString strED2KFileType(GetED2KFileTypeSearchTerm(GetED2KFileTypeID(cur_file->GetFileName())));
-		if (!strED2KFileType.IsEmpty()) {
-			tags.push_back(new CTagString(FT_FILETYPE, strED2KFileType));
-		}
-	}
-
-	// There, we could add MetaData info, if we ever get to have that.
-	
-	EUtf8Str eStrEncode;
-
-	bool unicode_support = 
-		// eservers that support UNICODE.
-		(pServer && (pServer->GetUnicodeSupport()))
-		||
-		// clients that support unicode
-		(pClient && pClient->GetUnicodeSupport());
-	eStrEncode = unicode_support ? utf8strRaw : utf8strNone;
-	
-	files->WriteUInt32(tags.size());
-
-	// Sadly, eMule doesn't use a MISCOPTIONS flag on hello packet for this, so we
-	// have to identify the support for new tags by version.
-	bool new_ed2k = 	
-		// eMule client > 0.42f
-		(pClient && pClient->IsEmuleClient() && pClient->GetVersion()  >= MAKE_CLIENT_VERSION(0,42,7))
-		||
-		// aMule >= 2.0.0rc8. Sadly, there's no way to check the rcN number, so I checked
-		// the rc8 changelog. On rc8 OSInfo was introduced, so...
-		(pClient && pClient->GetClientSoft() == SO_AMULE && !pClient->GetClientOSInfo().IsEmpty())
-		||
-		// eservers use a flag for this, at least.
-		(pServer && (pServer->GetTCPFlags() & SRV_TCPFLG_NEWTAGS));
-	
-	for (TagPtrList::iterator it = tags.begin(); it != tags.end(); ++it ) {
-		CTag* pTag = *it;
-		if (new_ed2k) {
-			pTag->WriteNewEd2kTag(files, eStrEncode);
-		} else {
-			pTag->WriteTagToFile(files, eStrEncode);
-		}
-		delete pTag;		
-	}
-}
-
-
 void CSharedFileList::Process()
 {
 	Publish();
@@ -1036,31 +910,164 @@
 			return true;
 		}
 	} else {
-//#warning Renaming of completed files causes problems on kad. Enable when reviewed.
-#if 0
-		wxString oldPath = JoinPaths(file->GetFilePath(), file->GetFileName());
-		wxString newPath = JoinPaths(file->GetFilePath(), newName);
-
-		if (UTF8_MoveFile(oldPath, newPath)) {
-			RemoveKeywords(file);
+		CPath oldPath = file->GetFilePath().JoinPaths(file->GetFileName());
+		CPath newPath = file->GetFilePath().JoinPaths(newName);
+
+		if (CPath::RenameFile(oldPath, newPath)) {
+			// Must create a copy of the word list because:
+			// 1) it will be reset on SetFileName()
+			// 2) we will want to edit it
+			Kademlia::WordList oldwords = file->GetKadKeywords();
 			file->SetFileName(newName);
-			AddKeywords(file);
 			theApp->knownfiles->Save();
 			UpdateItem(file);
 			RepublishFile(file);
 
+			const Kademlia::WordList& newwords = file->GetKadKeywords();
+			Kademlia::WordList::iterator itold;
+			Kademlia::WordList::const_iterator itnew;
+			// compare keywords in old and new names
+			for (itnew = newwords.begin(); itnew != newwords.end(); ++itnew) {
+				for (itold = oldwords.begin(); itold != oldwords.end(); ++itold) {
+					if (*itold == *itnew) {
+						break;
+					}
+				}
+				if (itold != oldwords.end()) {
+					// Remove keyword from old name which also exist in new name
+					oldwords.erase(itold);
+				} else {
+					// This is a new keyword not present in the old name
+					m_keywords->AddKeyword(*itnew, file);
+				}
+			}
+			// Remove all remaining old keywords not present in the new name
+			for (itold = oldwords.begin(); itold != oldwords.end(); ++itold) {
+				m_keywords->RemoveKeyword(*itold, file);
+			}
+
 			Notify_DownloadCtrlUpdateItem(file);
 			Notify_SharedFilesUpdateItem(file);
 			
 			return true;
 		}
-#endif
 	}
 	
 	return false;
 }
 
 
+const CPath* CSharedFileList::GetDirForPublicSharedDirName(const wxString& strSharedDir) const
+{
+	StringPathMap::const_iterator it = m_PublicSharedDirNames.find(strSharedDir);
+
+	if (it != m_PublicSharedDirNames.end()) {
+		return &(it->second);
+	} else {
+		return NULL;
+	}
+}
+
+
+wxString CSharedFileList::GetPublicSharedDirName(const CPath& dir)
+{
+	// safety check: is the directory supposed to be shared after all?
+	if (!IsShared(dir))	{
+		wxFAIL;
+		return wxT("");
+	}
+	// check if the public name for the directory is cached in our Map
+	StringPathMap::const_iterator it;
+	for (it = m_PublicSharedDirNames.begin(); it != m_PublicSharedDirNames.end(); ++it) {
+		if (it->second.IsSameDir(dir)) {
+			// public name for directory was determined earlier
+			return it->first;
+		}
+	}
+
+	// we store the path separator (forward or back slash) for quick access
+	wxChar cPathSepa = wxFileName::GetPathSeparator();
+
+	// determine and cache the public name for "dir" ...
+	// We need to use the 'raw' filename, so the receiving client can recognize it.
+	wxString strDirectoryTmp = dir.GetRaw();
+	if (strDirectoryTmp.EndsWith(&cPathSepa)) {
+		strDirectoryTmp.RemoveLast();
+	}
+	
+	wxString strPublicName;
+	int iPos;
+	// check all the subdirectories in the path for being shared
+	// the public name will consist of these concatenated
+	while ((iPos = strDirectoryTmp.Find( cPathSepa, true )) != wxNOT_FOUND)	{
+		strPublicName = strDirectoryTmp.Right(strDirectoryTmp.Length() - iPos) + strPublicName;
+		strDirectoryTmp.Truncate(iPos);
+		if (!IsShared(CPath(strDirectoryTmp)))
+			break;
+	}
+	if (!strPublicName.IsEmpty()) {
+		// remove first path separator ???
+		wxASSERT( strPublicName.GetChar(0) == cPathSepa );
+		strPublicName = strPublicName.Right(strPublicName.Length() - 1);
+	} else {
+		// must be a rootdirectory on Windos
+		wxASSERT( strDirectoryTmp.Length() == 2 );
+		strPublicName = strDirectoryTmp;
+	}
+	// we have the name, make sure it is unique by appending an index if necessary
+	if (m_PublicSharedDirNames.find(strPublicName) != m_PublicSharedDirNames.end())	{
+		wxString strUniquePublicName;
+		for (iPos = 2; ; ++iPos) {
+			strUniquePublicName = CFormat(wxT("%s_%i")) % strPublicName % iPos;
+
+			if (m_PublicSharedDirNames.find(strUniquePublicName) == m_PublicSharedDirNames.end()) {
+				AddDebugLogLineN(logClient, CFormat(wxT("Using public name '%s' for directory '%s'"))
+				                            % strUniquePublicName
+				                            % dir.GetPrintable());
+				m_PublicSharedDirNames.insert(std::pair<wxString, CPath> (strUniquePublicName, dir));
+				return strUniquePublicName;
+			}
+			// This is from eMule and it checks if there are more than 200 shared folders with the same public name.
+			// The condition can be true if many shared subfolders with the same name exist in folders that are not
+			// shared. So they get the names of each shared subfolders concatenated. But those might all be the same!
+			// It's here for safety reasons so we should not run out of memory.
+			else if (iPos > 200)  // Only 200 identical names are indexed.
+			{
+				wxASSERT( false );
+				return wxT("");
+			}
+		}
+	} else {
+		AddDebugLogLineN(logClient, CFormat(wxT("Using public name '%s' for directory '%s'")) % strPublicName % dir.GetPrintable());
+		m_PublicSharedDirNames.insert(std::pair<wxString, CPath> (strPublicName, dir));
+		return strPublicName;
+	}
+}
+
+
+bool CSharedFileList::IsShared(const CPath& path) const
+{ 
+	if( path.IsDir(CPath::exists) ) {
+		// check if it's a shared folder
+		const unsigned folderCount = theApp->glob_prefs->shareddir_list.size();
+		for (unsigned i = 0; i < folderCount; ++i) {
+			if (path.IsSameDir(theApp->glob_prefs->shareddir_list[i])) {
+				return true;
+			}
+		}
+	
+		// check if it's one of the categories folders (category 0 = incoming)
+		for (unsigned i = 0; i < theApp->glob_prefs->GetCatCount(); ++i) {
+			if (path.IsSameDir(theApp->glob_prefs->GetCategory(i)->path)) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+
 void CSharedFileList::CheckAICHHashes(const std::list<CAICHHash>& hashes)
 {
 	wxMutexLocker locker(list_mut);

aMule-2.2.6.tar.bz2/src/SharedFileList.h -> aMule-2.3.1.tar.bz2/src/SharedFileList.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -26,6 +26,7 @@
 #ifndef SHAREDFILELIST_H
 #define SHAREDFILELIST_H
 
+#include <list>
 #include <map>
 #include <wx/thread.h>		// Needed for wxMutex
 
@@ -38,13 +39,15 @@
 class CMemFile;
 class CMD4Hash;
 class CServer;
-class CUpDownClient;
 class CPublishKeywordList;
 class CPath;
 class CAICHHash;
+class CThreadTask;
 
 
 typedef std::map<CMD4Hash,CKnownFile*> CKnownFileMap;
+typedef std::map<wxString, CPath> StringPathMap;
+typedef std::list<CPath> PathList;
 
 class CSharedFileList {
 public:
@@ -56,18 +59,34 @@
 	CKnownFile*	GetFileByID(const CMD4Hash& filehash);
 	short	GetFilePriorityByID(const CMD4Hash& filehash);
 	const CKnownFile* GetFileByIndex(unsigned int index) const;
-	void	CreateOfferedFilePacket(CKnownFile* cur_file, CMemFile* files, CServer* pServer, CUpDownClient* pClient);
 	size_t	GetCount()	{ wxMutexLocker lock(list_mut); return m_Files_map.size(); }
 	size_t  GetFileCount()	{ wxMutexLocker lock(list_mut); return m_Files_map.size(); }
-	void	CopyFileList(std::vector<CKnownFile*>& out_list);
+	void	CopyFileList(std::vector<CKnownFile*>& out_list) const;
 	void	UpdateItem(CKnownFile* toupdate);
-	unsigned	AddFilesFromDirectory(const CPath& directory);
 	void    GetSharedFilesByDirectory(const wxString& directory, CKnownFilePtrList& list);
 	void	ClearED2KPublishInfo();
 	void	RepublishFile(CKnownFile* pFile);
 	void	Process();
 	void	PublishNextTurn()	{ m_lastPublishED2KFlag = true; }
 	bool	RenameFile(CKnownFile* pFile, const CPath& newName);
+
+	/**
+	 * Returns the name of a folder visible to the public.
+	 *
+	 * @param dir The full path to a shared directory.
+	 * @return The name of the shared directory that will be visible to the public.
+	 *
+	 * This function is used to hide sensitive data considering the directory structure of the client.
+	 * The returned public name consists of only subdirectories that are shared.
+	 * Example: /ed2k/shared/games/tetris -> "games/tetris" if /ed2k/shared are not marked as shared
+	 */
+	wxString		GetPublicSharedDirName(const CPath& dir);
+	const CPath*	GetDirForPublicSharedDirName(const wxString& strSharedDir) const;
+	
+	/**
+	 * Returns true, if the specified path points to a shared directory or single shared file.
+	 */
+	bool			IsShared(const CPath& path) const;
 	
 	/* Kad Stuff */
 	void	Publish();
@@ -83,7 +102,10 @@
 	void CheckAICHHashes(const std::list<CAICHHash>& hashes);
 	
 private:
+	typedef std::list<CThreadTask *> TaskList;
+
 	bool	AddFile(CKnownFile* pFile);
+	unsigned	AddFilesFromDirectory(const CPath& directory, TaskList & hashTasks);
 	void	FindSharedFiles();
 	bool	reloading;
 	
@@ -96,7 +118,8 @@
 	CKnownFileMap		m_Files_map;
 	mutable wxMutex		list_mut;
 
-	
+	StringPathMap m_PublicSharedDirNames;  //! used for mapping strings to shared directories
+
 	/* Kad Stuff */
 	CPublishKeywordList* m_keywords;
 	unsigned int m_currFileSrc;

aMule-2.3.1.tar.bz2/src/SharedFilePeersListCtrl.cpp Added

@@ -0,0 +1,74 @@
+//
+// 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
+//
+#include "SharedFilePeersListCtrl.h"
+#include "KnownFile.h"		// Do_not_auto_remove
+
+static CGenericClientListCtrlColumn s_sources_column_info[] = { 
+	{ ColumnUserName,		wxTRANSLATE("User Name"),	260 },
+	{ ColumnUserDownloaded,		wxTRANSLATE("Downloaded"),	65 },
+	{ ColumnUserSpeedDown,		wxTRANSLATE("Download Speed"),	65 },
+	{ ColumnUserUploaded,		wxTRANSLATE("Uploaded"),	65 },
+	{ ColumnUserSpeedUp,		wxTRANSLATE("Upload Speed"),	65 },
+	{ ColumnUserAvailable,		wxTRANSLATE("Available Parts"),	170 },
+	{ ColumnUserVersion,		wxTRANSLATE("Version"),		50 },
+	{ ColumnUserQueueRankLocal,	wxTRANSLATE("Upload Status"),	70 },
+	{ ColumnUserQueueRankRemote,	wxTRANSLATE("Download Status"),	70 },
+	{ ColumnUserOrigin,		wxTRANSLATE("Origin"),		110 },
+	{ ColumnUserFileNameUpload,	wxTRANSLATE("Local File Name"),	200 },
+	{ ColumnUserSharedFiles,	wxTRANSLATE("Shares File List"), 100 }
+};
+
+BEGIN_EVENT_TABLE(CSharedFilePeersListCtrl, CGenericClientListCtrl)
+END_EVENT_TABLE()
+
+CSharedFilePeersListCtrl::CSharedFilePeersListCtrl(
+	wxWindow *parent, wxWindowID winid, const wxPoint& pos, const wxSize& size,
+	long style, const wxValidator& validator, const wxString& name )
+:
+CGenericClientListCtrl( wxT("Peers"), parent, winid, pos, size, style | wxLC_OWNERDRAW, validator, name )
+{
+	// Setting the sorter function.
+	SetSortFunc( SourceSortProc );
+
+	m_columndata.n_columns = sizeof(s_sources_column_info) / sizeof(CGenericClientListCtrlColumn);
+	m_columndata.columns = s_sources_column_info;
+
+	InitColumnData();
+}
+
+CSharedFilePeersListCtrl::~CSharedFilePeersListCtrl()
+{
+}
+
+int CSharedFilePeersListCtrl::SourceSortProc(wxUIntPtr param1, wxUIntPtr param2, long sortData)
+{
+	return CGenericClientListCtrl::SortProc(param1, param2, s_sources_column_info[sortData & CMuleListCtrl::COLUMN_MASK].cid | (sortData & CMuleListCtrl::SORT_DES));
+}
+
+void CSharedFilePeersListCtrl::SetShowSources(CKnownFile * f, bool b) const
+{
+	f->SetShowPeers(b);
+}
+
+// File_checked_for_headers

aMule-2.3.1.tar.bz2/src/SharedFilePeersListCtrl.h Added

@@ -0,0 +1,67 @@
+//
+// 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
+//
+
+#ifndef SHAREDFILEPEERSLISTCTRL_H
+#define SHAREDFILEPEERSLISTCTRL_H
+
+#include "GenericClientListCtrl.h"	// Needed for CGenericClientListCtrl
+
+/**
+ * This class is responsible for representing the peers for a shared file.
+ */
+class CSharedFilePeersListCtrl : public CGenericClientListCtrl
+{
+public:
+	/**
+	 * Constructor.
+	 * 
+	 * @see CGenericClientListCtrl::CGenericClientListCtrl for documentation of parameters.
+	 */
+	 CSharedFilePeersListCtrl(
+	            wxWindow *parent,
+                wxWindowID winid = -1,
+                const wxPoint &pos = wxDefaultPosition,
+                const wxSize &size = wxDefaultSize,
+                long style = wxLC_ICON,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString &name = wxT("peerslistctrl") );
+				
+	/**
+	 * Destructor.
+	 */	 
+	virtual	~CSharedFilePeersListCtrl();	
+
+private:
+	virtual CamuleDlg::DialogType GetParentDialog() { return CamuleDlg::DT_SHARED_WND; }
+
+	virtual void SetShowSources(CKnownFile * f, bool b) const;
+
+	static int wxCALLBACK SourceSortProc(wxUIntPtr item1, wxUIntPtr item2, long sortData);
+	
+	bool IsShowingDownloadSources() const { return false; }
+	
+	DECLARE_EVENT_TABLE()
+};
+
+#endif

aMule-2.2.6.tar.bz2/src/SharedFilesCtrl.cpp -> aMule-2.3.1.tar.bz2/src/SharedFilesCtrl.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -56,7 +56,6 @@
 	EVT_MENU( MP_PRIOAUTO,		CSharedFilesCtrl::OnSetPriorityAuto )
 
 	EVT_MENU( MP_CMT,			CSharedFilesCtrl::OnEditComment )
-	EVT_MENU( MP_RAZORSTATS, 		CSharedFilesCtrl::OnGetRazorStats )
 	EVT_MENU( MP_ADDCOLLECTION,		CSharedFilesCtrl::OnAddCollection )
 	EVT_MENU( MP_GETMAGNETLINK,		CSharedFilesCtrl::OnCreateURI )
 	EVT_MENU( MP_GETED2KLINK,				CSharedFilesCtrl::OnCreateURI )
@@ -99,26 +98,31 @@
 
 	m_menu=NULL;
 
-	InsertColumn(ID_SHARED_COL_NAME,  _("File Name"),			wxLIST_FORMAT_LEFT, 250);
-	InsertColumn(ID_SHARED_COL_SIZE,  _("Size"),					wxLIST_FORMAT_LEFT, 100);
-	InsertColumn(ID_SHARED_COL_TYPE,  _("Type"),					wxLIST_FORMAT_LEFT,  50);
-	InsertColumn(ID_SHARED_COL_PRIO,  _("Priority"),				wxLIST_FORMAT_LEFT,  70);
-	InsertColumn(ID_SHARED_COL_ID,  _("FileID"),				wxLIST_FORMAT_LEFT, 220);
-	InsertColumn(ID_SHARED_COL_REQ,  _("Requests"),				wxLIST_FORMAT_LEFT, 100);
-	InsertColumn(ID_SHARED_COL_AREQ,  _("Accepted Requests"),	wxLIST_FORMAT_LEFT, 100);
-	InsertColumn(ID_SHARED_COL_TRA,  _("Transferred Data"),		wxLIST_FORMAT_LEFT, 120);
-	InsertColumn(ID_SHARED_COL_RTIO,  _("Share Ratio"),			wxLIST_FORMAT_LEFT, 100);
-	InsertColumn(ID_SHARED_COL_PART,  _("Obtained Parts"),		wxLIST_FORMAT_LEFT, 120);
-	InsertColumn(ID_SHARED_COL_CMPL, _("Complete Sources"),		wxLIST_FORMAT_LEFT, 120);
-	InsertColumn(ID_SHARED_COL_PATH, _("Directory Path"),		wxLIST_FORMAT_LEFT, 220);
+	InsertColumn(ID_SHARED_COL_NAME, _("File Name"),		wxLIST_FORMAT_LEFT, 250, wxT("N") );
+	InsertColumn(ID_SHARED_COL_SIZE, _("Size"),			wxLIST_FORMAT_LEFT, 100, wxT("Z") );
+	InsertColumn(ID_SHARED_COL_TYPE, _("Type"),			wxLIST_FORMAT_LEFT,  50, wxT("Y") );
+	InsertColumn(ID_SHARED_COL_PRIO, _("Priority"),			wxLIST_FORMAT_LEFT,  70, wxT("p") );
+	InsertColumn(ID_SHARED_COL_ID,   _("FileID"),			wxLIST_FORMAT_LEFT, 220, wxT("I") );
+	InsertColumn(ID_SHARED_COL_REQ,  _("Requests"),			wxLIST_FORMAT_LEFT, 100, wxT("Q") );
+	InsertColumn(ID_SHARED_COL_AREQ, _("Accepted Requests"),	wxLIST_FORMAT_LEFT, 100, wxT("A") );
+	InsertColumn(ID_SHARED_COL_TRA,  _("Transferred Data"),		wxLIST_FORMAT_LEFT, 120, wxT("T") );
+	InsertColumn(ID_SHARED_COL_RTIO, _("Share Ratio"),		wxLIST_FORMAT_LEFT, 100, wxT("R") );
+	InsertColumn(ID_SHARED_COL_PART, _("Obtained Parts"),		wxLIST_FORMAT_LEFT, 120, wxT("P") );
+	InsertColumn(ID_SHARED_COL_CMPL, _("Complete Sources"),		wxLIST_FORMAT_LEFT, 120, wxT("C") );
+	InsertColumn(ID_SHARED_COL_PATH, _("Directory Path"),		wxLIST_FORMAT_LEFT, 220, wxT("D") );
 
 	LoadSettings();
 }
 
 
-CSharedFilesCtrl::~CSharedFilesCtrl()
+wxString CSharedFilesCtrl::GetOldColumnOrder() const
 {
+	return wxT("N,Z,Y,p,I,Q,A,T,R,P,C,D");
+}
 
+
+CSharedFilesCtrl::~CSharedFilesCtrl()
+{
 }
 
 
@@ -129,13 +133,13 @@
 	if ( (m_menu == NULL) && (item_hit != -1)) {
 		m_menu = new wxMenu(_("Shared Files"));
 		wxMenu* prioMenu = new wxMenu();
-		prioMenu->Append(MP_PRIOVERYLOW, _("Very low"));
-		prioMenu->Append(MP_PRIOLOW, _("Low"));
-		prioMenu->Append(MP_PRIONORMAL, _("Normal"));
-		prioMenu->Append(MP_PRIOHIGH, _("High"));
-		prioMenu->Append(MP_PRIOVERYHIGH, _("Very High"));
-		prioMenu->Append(MP_POWERSHARE, _("Release"));
-		prioMenu->Append(MP_PRIOAUTO, _("Auto"));
+		prioMenu->AppendCheckItem(MP_PRIOVERYLOW, _("Very low"));
+		prioMenu->AppendCheckItem(MP_PRIOLOW, _("Low"));
+		prioMenu->AppendCheckItem(MP_PRIONORMAL, _("Normal"));
+		prioMenu->AppendCheckItem(MP_PRIOHIGH, _("High"));
+		prioMenu->AppendCheckItem(MP_PRIOVERYHIGH, _("Very High"));
+		prioMenu->AppendCheckItem(MP_POWERSHARE, _("Release"));
+		prioMenu->AppendCheckItem(MP_PRIOAUTO, _("Auto"));
 
 		m_menu->Append(0,_("Priority"),prioMenu);
 		m_menu->AppendSeparator();
@@ -150,10 +154,7 @@
 		m_menu->AppendSeparator();
 		m_menu->Append(MP_RENAME, _("Rename"));
 		m_menu->AppendSeparator();
-/* Commented out while it's gone
-		m_menu->Append( MP_RAZORSTATS, _("Get Razorback 2's stats for this file"));
-		m_menu->AppendSeparator();
-*/
+
 		if (file->GetFileName().GetExt() == wxT("emulecollection")) {
 			m_menu->Append( MP_ADDCOLLECTION, _("Add files in collection to transfer list"));
 			m_menu->AppendSeparator();
@@ -170,8 +171,17 @@
 		m_menu->Enable(MP_GETAICHED2KLINK, file->HasProperAICHHashSet());
 		m_menu->Enable(MP_GETHOSTNAMESOURCEED2KLINK, !thePrefs::GetYourHostname().IsEmpty());
 		m_menu->Enable(MP_GETHOSTNAMECRYPTSOURCEED2KLINK, !thePrefs::GetYourHostname().IsEmpty());
-		m_menu->Enable(MP_RENAME, file->IsPartFile());
-		
+
+		int priority = file->IsAutoUpPriority() ? PR_AUTO : file->GetUpPriority();
+
+		prioMenu->Check(MP_PRIOVERYLOW,	priority == PR_VERYLOW);
+		prioMenu->Check(MP_PRIOLOW,	priority == PR_LOW);
+		prioMenu->Check(MP_PRIONORMAL,	priority == PR_NORMAL);
+		prioMenu->Check(MP_PRIOHIGH,	priority == PR_HIGH);
+		prioMenu->Check(MP_PRIOVERYHIGH,priority == PR_VERYHIGH);
+		prioMenu->Check(MP_POWERSHARE,	priority == PR_POWERSHARE);
+		prioMenu->Check(MP_PRIOAUTO,	priority == PR_AUTO);
+
 		PopupMenu( m_menu, event.GetPoint() );
 
 		delete m_menu;
@@ -187,7 +197,7 @@
 	long index = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	while (index != -1) {
 		if (feed.IsEmpty()) {
-			feed = CFormat(_("Feedback from: %s (%s)\n\n")) % thePrefs::GetUserNick() % GetFullMuleVersion();
+			feed = CFormat(_("Feedback from: %s (%s)\n\n")) % thePrefs::GetUserNick() % theApp->GetFullMuleVersion();
 		} else {
 			feed += wxT("\n");
 		}
@@ -201,7 +211,6 @@
 }
 
 
-#ifndef CLIENT_GUI
 void CSharedFilesCtrl::ShowFileList()
 {
 	Freeze();
@@ -218,7 +227,6 @@
 	
 	Thaw();
 }
-#endif
 
 
 void CSharedFilesCtrl::RemoveFile(CKnownFile *toRemove)
@@ -302,9 +310,9 @@
 	wxString URIs;
 
 	if ( event.GetId() == MP_GETSOURCEED2KLINK || event.GetId() == MP_GETCRYPTSOURCEDED2KLINK) {
-		if ( !theApp->IsConnectedED2K() || theApp->serverconnect->IsLowID() ) {
+		if ( !(	(theApp->IsConnectedED2K() && !theApp->serverconnect->IsLowID())
+				|| (theApp->IsConnectedKad() && !theApp->IsFirewalledKad() ))) {
 			wxMessageBox(_("You need a HighID to create a valid sourcelink"), _("WARNING"), wxOK | wxICON_ERROR, this);
-
 			return;
 		}
 	}
@@ -448,11 +456,13 @@
 
 void CSharedFilesCtrl::ShowFilesCount()
 {
-	wxString str = wxString::Format(_("Shared Files (%i)"), GetItemCount());
 	wxStaticText* label = CastByName( wxT("sharedFilesLabel"), GetParent(), wxStaticText );
 	
-	label->SetLabel( str );
+	label->SetLabel(CFormat(_("Shared Files (%i)")) % GetItemCount());
 	label->GetParent()->Layout();
+	// If file list was updated, the "selection" is involved too, if we chose to show clients for all files.
+	// So update client list here too.
+	theApp->amuledlg->m_sharedfileswnd->SelectionUpdated();
 }
 
 
@@ -462,34 +472,14 @@
 	wxASSERT( file );
 
 	if ( highlighted ) {
-		wxColour newcol;
-		wxBrush hilBrush;
-
-		if (GetFocus()) {
-			newcol = SYSCOLOR(wxSYS_COLOUR_HIGHLIGHT);
-			newcol = wxColour(G_BLEND(newcol.Red(),125),
-			                  G_BLEND(newcol.Green(),125),
-			                  G_BLEND(newcol.Blue(),125));
-			hilBrush = wxBrush(newcol, wxSOLID);
-			dc->SetBackground(hilBrush);
-		} else {
-			newcol = SYSCOLOR(wxSYS_COLOUR_BTNSHADOW);
-			newcol = wxColour(G_BLEND(newcol.Red(),125),
-			                  G_BLEND(newcol.Green(),125),
-			                  G_BLEND(newcol.Blue(),125));
-			hilBrush = wxBrush(newcol, wxSOLID);
-			dc->SetBackground(hilBrush);
-		}
-		
-		dc->SetTextForeground( SYSCOLOR(wxSYS_COLOUR_HIGHLIGHTTEXT));
-
-		newcol = wxColour( G_BLEND(newcol.Red(), 65),
-		                   G_BLEND(newcol.Green(), 65),
-		                   G_BLEND(newcol.Blue(), 65) );
-		dc->SetPen(wxPen(newcol,1,wxSOLID));
+		CMuleColour newcol(GetFocus() ? wxSYS_COLOUR_HIGHLIGHT : wxSYS_COLOUR_BTNSHADOW);	
+		dc->SetBackground(newcol.Blend(125).GetBrush());
+		dc->SetTextForeground( CMuleColour(wxSYS_COLOUR_HIGHLIGHTTEXT));
+		// The second blending goes over the first one.
+		dc->SetPen(newcol.Blend(65).GetPen());
 	} else {
-		dc->SetBackground( wxBrush(SYSCOLOR(wxSYS_COLOUR_LISTBOX), wxSOLID) );
-		dc->SetTextForeground(SYSCOLOR(wxSYS_COLOUR_WINDOWTEXT));
+		dc->SetBackground( CMuleColour(wxSYS_COLOUR_LISTBOX).GetBrush() );
+		dc->SetTextForeground(CMuleColour(wxSYS_COLOUR_WINDOWTEXT));
 		dc->SetPen(*wxTRANSPARENT_PEN);
 	}
 	
@@ -557,15 +547,15 @@
 					break;
 				
 				case ID_SHARED_COL_REQ:
-					textBuffer = wxString::Format(wxT("%u (%u)"),
-							file->statistic.GetRequests(),
-							file->statistic.GetAllTimeRequests());
+					textBuffer = CFormat(wxT("%u (%u)"))
+							% file->statistic.GetRequests()
+							% file->statistic.GetAllTimeRequests();
 					break;
 
 				case ID_SHARED_COL_AREQ:
-					textBuffer = wxString::Format(wxT("%u (%u)"),
-							file->statistic.GetAccepts(),
-							file->statistic.GetAllTimeAccepts());
+					textBuffer = CFormat(wxT("%u (%u)"))
+							% file->statistic.GetAccepts()
+							% file->statistic.GetAllTimeAccepts();
 					break;
 
 				case ID_SHARED_COL_TRA:
@@ -574,8 +564,7 @@
 					break;
 					
 				case ID_SHARED_COL_RTIO:
-					textBuffer = wxString::Format(wxT("%.2f"),
-							(double)file->statistic.GetAllTimeTransferred() / file->GetFileSize() );
+					textBuffer = CFormat(wxT("%.2f")) %	((double)file->statistic.GetAllTimeTransferred() / file->GetFileSize());
 					break;
 				
 				case ID_SHARED_COL_PART:
@@ -590,16 +579,14 @@
 				case ID_SHARED_COL_CMPL:
 					if ( file->m_nCompleteSourcesCountLo == 0 ) {
 						if ( file->m_nCompleteSourcesCountHi ) {
-							textBuffer = wxString::Format(wxT("< %u"), file->m_nCompleteSourcesCountHi );
+							textBuffer = CFormat(wxT("< %u")) % file->m_nCompleteSourcesCountHi;
 						} else {
 							textBuffer = wxT("0");
 						}
 					} else if (file->m_nCompleteSourcesCountLo == file->m_nCompleteSourcesCountHi) {
-						textBuffer = wxString::Format(wxT("%u"), file->m_nCompleteSourcesCountLo);
+						textBuffer = CFormat(wxT("%u")) % file->m_nCompleteSourcesCountLo;
 					} else {
-						textBuffer = wxString::Format(wxT("%u - %u"),
-								file->m_nCompleteSourcesCountLo,
-								file->m_nCompleteSourcesCountHi);
+						textBuffer = CFormat(wxT("%u - %u")) % file->m_nCompleteSourcesCountLo % file->m_nCompleteSourcesCountHi;
 					}
 					
 					break;				
@@ -667,13 +654,11 @@
 	s_ChunkBar.Set3dDepth( CPreferences::Get3DDepth() );
 	uint64 end = 0;
 	for ( unsigned int i = 0; i < list.size(); ++i ) {
-		COLORREF color = list[i] ? (RGB(0, (210-(22*( list[i] - 1 ) ) < 0) ? 0 : 210-(22*( list[i] - 1 ) ), 255))
-								 : RGB(255, 0, 0);
 		uint64 start = PARTSIZE * static_cast<uint64>(i);
-		       end   = PARTSIZE * static_cast<uint64>(i + 1);
-		s_ChunkBar.FillRange(start, end, color);
+		end   = PARTSIZE * static_cast<uint64>(i + 1);
+		s_ChunkBar.FillRange(start, end, CMuleColour(list[i] ? 0 : 255, list[i] ? ((210-(22*( list[i] - 1 ) ) < 0) ? 0 : (210-(22*( list[i] - 1 ) ))) : 0, list[i] ? 255 : 0));
 	}
-	s_ChunkBar.FillRange(end + 1, file->GetFileSize() - 1, RGB(255, 0, 0));
+	s_ChunkBar.FillRange(end + 1, file->GetFileSize() - 1, CMuleColour(255, 0, 0));
 	s_ChunkBar.Draw(dc, barRect.x, barRect.y, bFlat); 
 
 	if (!bFlat) {
@@ -687,33 +672,19 @@
 	dc->SetBrush( old_brush );
 }
 
-void CSharedFilesCtrl::OnGetRazorStats( wxCommandEvent& WXUNUSED(event) )
-{
-	int item = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-	if ( item != -1 ) {
-		CKnownFile* file = (CKnownFile*)GetItemData( item );
-	
-		theApp->amuledlg->LaunchUrl(wxT("http://stats.razorback2.com/ed2khistory?ed2k=") + file->GetFileHash().Encode());
-	}
-}
-
-
 void CSharedFilesCtrl::OnRename( wxCommandEvent& WXUNUSED(event) )
 {
 	int item = GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
 	if ( item != -1 ) {
 		CKnownFile* file = (CKnownFile*)GetItemData(item);
 
-		// Currently renaming of completed files causes problem with kad
-		if (file->IsPartFile()) {
-			wxString strNewName = ::wxGetTextFromUser(
-				_("Enter new name for this file:"),
-				_("File rename"), file->GetFileName().GetPrintable());
-				
-			CPath newName = CPath(strNewName);
-			if (newName.IsOk() && (newName != file->GetFileName())) {
-				theApp->sharedfiles->RenameFile(file, newName);
-			}
+		wxString strNewName = ::wxGetTextFromUser(
+			_("Enter new name for this file:"),
+			_("File rename"), file->GetFileName().GetPrintable());
+
+		CPath newName = CPath(strNewName);
+		if (newName.IsOk() && (newName != file->GetFileName())) {
+			theApp->sharedfiles->RenameFile(file, newName);
 		}
 	}
 }

aMule-2.2.6.tar.bz2/src/SharedFilesCtrl.h -> aMule-2.3.1.tar.bz2/src/SharedFilesCtrl.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -53,10 +53,8 @@
 	~CSharedFilesCtrl();
 
 
-#ifndef CLIENT_GUI
 	/** Reloads the list of shared files. */
 	void	ShowFileList();
-#endif
 
 	/**
 	 * Adds the specified file to the list, updating filecount and more.
@@ -86,6 +84,10 @@
 	 */
 	void	ShowFilesCount();
 	
+protected:
+	/// Return old column order.
+	wxString GetOldColumnOrder() const;
+
 private:
 	/**
 	 * Adds the specified file to the list. 
@@ -161,11 +163,6 @@
 	 * Event-handler for the Create ED2K/Magnet URI items.
 	 */
 	void	OnCreateURI( wxCommandEvent& event );
-	
-	/**
-	 * Event handler for get-razorback stats menu item
-	 */	 
-	void OnGetRazorStats( wxCommandEvent& evt );
 	 
 	/**
 	 * Event-handler for the Edit Comment menu item.

aMule-2.2.6.tar.bz2/src/SharedFilesWnd.cpp -> aMule-2.3.1.tar.bz2/src/SharedFilesWnd.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -23,25 +23,30 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
+#include <wx/config.h>
 #include <wx/gauge.h>		// Do_not_auto_remove (win32)
+#include <wx/radiobox.h>
 
 #include "SharedFilesWnd.h"	// Interface declarations
 #include "SharedFilesCtrl.h"
+#include "SharedFilePeersListCtrl.h"
 #include "muuli_wdr.h"		// Needed for ID_SHFILELIST
 #include "KnownFileList.h"	// Needed for CKnownFileList
 #include "KnownFile.h"		// Needed for CKnownFile
 #include "amule.h"			// Needed for theApp
-
+#include "UploadQueue.h"	// Needed for theApp->uploadqueue
 
 
 BEGIN_EVENT_TABLE(CSharedFilesWnd, wxPanel)
-	EVT_LIST_ITEM_SELECTED( ID_SHFILELIST,	CSharedFilesWnd::OnItemActivated )
+	EVT_LIST_ITEM_SELECTED( ID_SHFILELIST,	CSharedFilesWnd::OnItemSelectionChanged )
+	EVT_LIST_ITEM_DESELECTED( ID_SHFILELIST,	CSharedFilesWnd::OnItemSelectionChanged )
 	EVT_BUTTON( ID_BTNRELSHARED,			CSharedFilesWnd::OnBtnReloadShared )
+ 	EVT_BUTTON(ID_SHAREDCLIENTTOGGLE,		CSharedFilesWnd::OnToggleClientList)
+	EVT_RADIOBOX(ID_SHOW_CLIENTS_MODE,		CSharedFilesWnd::OnSelectClientsMode)
+	
+	EVT_SPLITTER_SASH_POS_CHANGING(ID_SHARESSPLATTER, CSharedFilesWnd::OnSashPositionChanging)
 END_EVENT_TABLE()
 
-
-
 CSharedFilesWnd::CSharedFilesWnd( wxWindow* pParent )
 	: wxPanel(pParent, -1)
 {
@@ -51,41 +56,65 @@
 	m_bar_requests	= CastChild( wxT("popbar"), wxGauge );
 	m_bar_accepted	= CastChild( wxT("popbarAccept"), wxGauge );
 	m_bar_transfer	= CastChild( wxT("popbarTrans"), wxGauge );
+	m_radioClientMode = CastChild( ID_SHOW_CLIENTS_MODE, wxRadioBox );
 	sharedfilesctrl = CastChild( wxT("sharedFilesCt"), CSharedFilesCtrl );
+	peerslistctrl   = CastChild( ID_SHAREDCLIENTLIST, CSharedFilePeersListCtrl );
 	wxASSERT(sharedfilesctrl);
+	wxASSERT(peerslistctrl);
+	m_prepared		= false;
+	
+	m_splitter = 0;	
+	
+	wxConfigBase *config = wxConfigBase::Get();
+	
+	// Check if the clientlist is hidden
+	bool show = true;
+	config->Read( wxT("/GUI/SharedWnd/ShowClientList"), &show, true );
+	peerslistctrl->SetShowing(show);
+	// Load the last used splitter position
+	m_splitter = config->Read( wxT("/GUI/SharedWnd/Splitter"), 463l );
+	m_clientShow = (EClientShow) config->Read(wxT("/GUI/SharedWnd/ClientShowMode"), ClientShowSelected);
+	m_radioClientMode->SetSelection(m_clientShow);
 }
 
 
 CSharedFilesWnd::~CSharedFilesWnd()
 {
+	if (m_prepared) {
+		wxConfigBase *config = wxConfigBase::Get();
+
+		if ( !peerslistctrl->GetShowing() ) {
+			// Save the splitter position
+			config->Write( wxT("/GUI/SharedWnd/Splitter"), m_splitter );
+	
+			// Save the visible status of the list
+			config->Write( wxT("/GUI/SharedWnd/ShowClientList"), false );
+		} else {
+			wxSplitterWindow* splitter = CastChild( wxT("sharedsplitterWnd"), wxSplitterWindow );
+		
+			// Save the splitter position
+			config->Write(wxT("/GUI/SharedWnd/Splitter"), splitter->GetSashPosition());
+		
+			// Save the visible status of the list
+			config->Write( wxT("/GUI/SharedWnd/ShowClientList"), true );
+		}
+		config->Write(wxT("/GUI/SharedWnd/ClientShowMode"), (int)m_clientShow);
+	}
 }
 
 
 void CSharedFilesWnd::SelectionUpdated()
 {
-	uint64 lTransferred = theApp->knownfiles->transferred;
-	uint32 lAccepted = theApp->knownfiles->accepted;
-	uint32 lRequested = theApp->knownfiles->requested;
-	m_bar_requests->SetRange( lRequested );
-	m_bar_accepted->SetRange( lAccepted );
-	m_bar_transfer->SetRange( lTransferred / 1024 );
-	
-	if ( !sharedfilesctrl->GetSelectedItemCount() ) {
-		// Requests
-		m_bar_requests->SetValue( 0 );
-		CastChild(IDC_SREQUESTED, wxStaticText)->SetLabel( wxT("-") );
-		CastChild(IDC_SREQUESTED2, wxStaticText)->SetLabel( wxT("-") );
-
-		// Accepted requets
-		m_bar_accepted->SetValue( 0 );
-		CastChild(IDC_SACCEPTED, wxStaticText)->SetLabel( wxT("-") );
-		CastChild(IDC_SACCEPTED2, wxStaticText)->SetLabel( wxT("-") );
-
-		// Transferred
-		m_bar_transfer->SetValue( 0 );
-		CastChild(IDC_STRANSFERRED, wxStaticText)->SetLabel( wxT("-") );
-		CastChild(IDC_STRANSFERRED2, wxStaticText)->SetLabel( wxT("-") );
-	} else {
+	if (!sharedfilesctrl->IsSorting()) {
+		uint64 lTransferred = theApp->knownfiles->transferred;
+		uint32 lAccepted = theApp->knownfiles->accepted;
+		uint32 lRequested = theApp->knownfiles->requested;
+		m_bar_requests->SetRange( lRequested );
+		m_bar_accepted->SetRange( lAccepted );
+		m_bar_transfer->SetRange( lTransferred / 1024 );
+		
+		CKnownFileVector fileVector;
+		
 		// Create a total statistic for the selected item(s)
 		uint32 session_requests = 0;
 		uint32 session_accepted = 0;
@@ -94,41 +123,88 @@
 		uint32 all_accepted = 0;
 		uint64 all_transferred = 0;
 		
-		long index = sharedfilesctrl->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-		while ( index > -1 ) {
-			if ( sharedfilesctrl->GetItemState( index, wxLIST_STATE_SELECTED ) ) {
-				CKnownFile* file = (CKnownFile*)sharedfilesctrl->GetItemData( index );
-			
+		long index = -1;
+		int filter = (m_clientShow == ClientShowSelected) ? wxLIST_STATE_SELECTED : wxLIST_STATE_DONTCARE;
+		while ( (index = sharedfilesctrl->GetNextItem( index, wxLIST_NEXT_ALL, filter)) != -1) {
+			CKnownFile* file = (CKnownFile*)sharedfilesctrl->GetItemData( index );
+			wxASSERT(file);
+				
+			// Bars are always for selected files
+			if (sharedfilesctrl->GetItemState(index, wxLIST_STATE_SELECTED)) {
 				session_requests   += file->statistic.GetRequests();
 				session_accepted   += file->statistic.GetAccepts();
 				session_transferred += file->statistic.GetTransferred();
-		
+			
 				all_requests   += file->statistic.GetAllTimeRequests();
 				all_accepted   += file->statistic.GetAllTimeAccepts();
 				all_transferred += file->statistic.GetAllTimeTransferred();
 			}
-			index = sharedfilesctrl->GetNextItem( index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-		};
+					
+			if (m_clientShow != ClientShowUploading) {
+				fileVector.push_back(file);
+			}
+		}
+
+		if (fileVector.empty()) {
+			// Requests
+			m_bar_requests->SetValue( 0 );
+			CastChild(IDC_SREQUESTED, wxStaticText)->SetLabel( wxT("- / -") );
+
+			// Accepted requets
+			m_bar_accepted->SetValue( 0 );
+			CastChild(IDC_SACCEPTED, wxStaticText)->SetLabel( wxT("- / -") );
+
+			// Transferred
+			m_bar_transfer->SetValue( 0 );
+			CastChild(IDC_STRANSFERRED, wxStaticText)->SetLabel( wxT("- / -") );
+			
+		} else {
+			std::sort(fileVector.begin(), fileVector.end());			
+			
+			// Store text lengths, and layout() when the texts have grown
+			static uint32 lReq = 0, lAcc = 0, lTrans = 0;
+			// Requests
+			session_requests = session_requests > lRequested ? lRequested : session_requests;
+			m_bar_requests->SetValue( session_requests );
+			wxString labelReq = CFormat(wxT("%d / %d")) % session_requests % all_requests;
+			CastChild(IDC_SREQUESTED, wxStaticText)->SetLabel(labelReq);
 		
-		// Requests
-		session_requests = session_requests > lRequested ? lRequested : session_requests;
-		m_bar_requests->SetValue( session_requests );
-		CastChild(IDC_SREQUESTED, wxStaticText)->SetLabel( wxString::Format(wxT("%u"), session_requests ) );
-		CastChild(IDC_SREQUESTED2, wxStaticText)->SetLabel( wxString::Format(wxT("%u"), all_requests ) );
+			// Accepted requets
+			session_accepted = session_accepted > lAccepted ? lAccepted : session_accepted;
+			m_bar_accepted->SetValue( session_accepted );
+			wxString labelAcc = CFormat(wxT("%d / %d")) % session_accepted % all_accepted;
+			CastChild(IDC_SACCEPTED, wxStaticText)->SetLabel(labelAcc);
+
+			// Transferred
+			session_transferred = session_transferred > lTransferred ? lTransferred : session_transferred;
+			m_bar_transfer->SetValue( session_transferred / 1024 );
+			wxString labelTrans = CastItoXBytes( session_transferred ) + wxT(" / ") + CastItoXBytes( all_transferred );
+			CastChild(IDC_STRANSFERRED, wxStaticText)->SetLabel(labelTrans);
+
+			if (labelReq.Len() > lReq || labelAcc.Len() > lAcc || labelTrans.Len() > lTrans) {
+				lReq = labelReq.Len();
+				lAcc = labelAcc.Len();
+				lTrans = labelTrans.Len();
+				s_sharedfilespeerHeader->Layout();
+			}
+		}
 	
-		// Accepted requets
-		session_accepted = session_accepted > lAccepted ? lAccepted : session_accepted;
-		m_bar_accepted->SetValue( session_accepted );
-		CastChild(IDC_SACCEPTED, wxStaticText)->SetLabel( wxString::Format(wxT("%u"), session_accepted ) );
-		CastChild(IDC_SACCEPTED2, wxStaticText)->SetLabel( wxString::Format(wxT("%u"), all_accepted ) );
-
-		// Transferred
-		session_transferred = session_transferred > lTransferred ? lTransferred : session_transferred;
-		m_bar_transfer->SetValue( session_transferred / 1024 );
-		CastChild(IDC_STRANSFERRED, wxStaticText)->SetLabel( CastItoXBytes( session_transferred ) );
-		CastChild(IDC_STRANSFERRED2, wxStaticText)->SetLabel( CastItoXBytes( all_transferred ) );
+		if (m_clientShow == ClientShowUploading) {
+			// The GenericClientListCtrl is designed to show clients associated with a KnownFile.
+			// So the uploadqueue carries a special known file with all ongoing uploads in its upload list.
+			// This is a hack, but easier than trying to bend the class into a shape it was not intended for
+			// to show all clients currently uploading.
+#ifdef CLIENT_GUI
+			fileVector.push_back(theApp->m_allUploadingKnownFile);
+#else
+			fileVector.push_back(theApp->uploadqueue->GetAllUploadingKnownFile());
+#endif
+		}
+		peerslistctrl->ShowSources(fileVector);
+		
+		Refresh();
+		Layout();
 	}
-	Layout();
 }
 
 
@@ -142,9 +218,14 @@
 }
 
 
-void CSharedFilesWnd::OnItemActivated(wxListEvent& evt)
+void CSharedFilesWnd::OnItemSelectionChanged(wxListEvent& evt)
 {
-	SelectionUpdated();
+	EClientShow clientShowMode = (EClientShow) m_radioClientMode->GetSelection();
+
+	// Only update the list of clients if that list shows clients related to the selected shared files
+	if ( clientShowMode == ClientShowSelected ) {
+		SelectionUpdated();
+	}
 
 	evt.Skip();
 }
@@ -155,4 +236,117 @@
 	sharedfilesctrl->ShowFilesCount();
 	SelectionUpdated();
 }
+
+void CSharedFilesWnd::Prepare()
+{
+	if (m_prepared) {
+		return;
+	}
+	m_prepared = true;
+	wxSplitterWindow* splitter = CastChild( wxT("sharedsplitterWnd"), wxSplitterWindow );
+	int height = splitter->GetSize().GetHeight();
+	int header_height = s_sharedfilespeerHeader->GetSize().GetHeight();	
+	
+	if ( m_splitter ) {
+		// Some sanity checking
+		if ( m_splitter < s_splitterMin ) {
+			m_splitter = s_splitterMin;
+		} else if ( m_splitter > height - header_height * 2 ) {
+			m_splitter = height - header_height * 2;
+		}
+		splitter->SetSashPosition( m_splitter );
+		m_splitter = 0;
+	}
+
+	if ( !peerslistctrl->GetShowing() ) {
+		// use a toggle event to close it (calculate size, change button)
+		peerslistctrl->SetShowing( true );	// so it will be toggled to false
+		wxCommandEvent evt1;
+		OnToggleClientList( evt1 );
+	}
+}
+
+void CSharedFilesWnd::OnToggleClientList(wxCommandEvent& WXUNUSED(evt))
+{
+	wxSplitterWindow* splitter = CastChild( wxT("sharedsplitterWnd"), wxSplitterWindow );
+	wxBitmapButton*   button = CastChild( ID_SHAREDCLIENTTOGGLE, wxBitmapButton );
+	
+	if ( !peerslistctrl->GetShowing() ) {
+		splitter->SetSashPosition( m_splitter );
+		m_splitter = 0;
+		
+		peerslistctrl->SetShowing( true );
+		
+		button->SetBitmapLabel( amuleDlgImages( 10 ) );
+		button->SetBitmapFocus( amuleDlgImages( 10 ) );
+		button->SetBitmapSelected( amuleDlgImages( 10 ) );
+		button->SetBitmapHover( amuleDlgImages( 10 ) );
+	} else {
+		peerslistctrl->SetShowing( false );
+	
+		m_splitter = splitter->GetSashPosition();
+	
+		// Add the height of the listctrl to the top-window
+		int height = peerslistctrl->GetSize().GetHeight()
+					 + splitter->GetWindow1()->GetSize().GetHeight();
+	
+		splitter->SetSashPosition( height );
+
+		button->SetBitmapLabel( amuleDlgImages( 11 ) );
+		button->SetBitmapFocus( amuleDlgImages( 11 ) );
+		button->SetBitmapSelected( amuleDlgImages( 11 ) );
+		button->SetBitmapHover( amuleDlgImages( 11 ) );
+	}
+}
+
+void CSharedFilesWnd::OnSashPositionChanging(wxSplitterEvent& evt)
+{
+	if ( evt.GetSashPosition() < s_splitterMin ) {
+		evt.SetSashPosition( s_splitterMin );
+	} else {
+		wxSplitterWindow* splitter = wxStaticCast( evt.GetEventObject(), wxSplitterWindow);
+		wxCHECK_RET(splitter, wxT("ERROR: NULL splitter in CSharedFilesWnd::OnSashPositionChanging"));
+		
+		int height = splitter->GetSize().GetHeight();
+		int header_height = s_sharedfilespeerHeader->GetSize().GetHeight();	
+		int mousey = wxGetMousePosition().y - splitter->GetScreenRect().GetTop();
+
+		if ( !peerslistctrl->GetShowing() ) {
+			// lower window hidden
+			if ( height - mousey < header_height * 2 ) {
+				// no moving down if already hidden
+				evt.Veto();
+			} else {
+				// show it
+				m_splitter = mousey;	// prevent jumping if it was minimized and is then shown by dragging the sash
+				wxCommandEvent evt1;
+				OnToggleClientList( evt1 );
+			}
+		} else {
+			// lower window showing
+			if ( height - mousey < header_height * 2 ) {
+				// hide it
+				wxCommandEvent evt1;
+				OnToggleClientList( evt1 );
+			} else {
+				// normal resize
+				// If several events queue up, setting the sash to the current mouse position
+				// will speed up things and make sash moving more smoothly.
+				evt.SetSashPosition( mousey );
+			}
+		}
+	}
+}
+
+
+void CSharedFilesWnd::OnSelectClientsMode(wxCommandEvent& WXUNUSED(evt))
+{
+	EClientShow clientShowLast = m_clientShow;
+	m_clientShow = (EClientShow) m_radioClientMode->GetSelection();
+
+	if (m_clientShow != clientShowLast) {
+		SelectionUpdated();
+	}
+}
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/SharedFilesWnd.h -> aMule-2.3.1.tar.bz2/src/SharedFilesWnd.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -31,9 +31,11 @@
 
 class CKnownFile;
 class CSharedFilesCtrl;
+class CSharedFilePeersListCtrl;
 class wxListEvent;
 class wxGauge;
-
+class wxSplitterEvent;
+class wxRadioBox;
 
 /**
  * This class represents the window containing the list of shared files.
@@ -66,9 +68,21 @@
 	 */
 	void RemoveAllSharedFiles();
 
+	/**
+	 * Call this function before displaying the dialog.
+	 *
+	 * This functions does a few tasks to ensure that the dialog is looking the right way.
+	 */
+	void	Prepare();
+
 	//! Pointer to the widget containing the list of shared files.
 	CSharedFilesCtrl* sharedfilesctrl;
-
+	
+	//! Pointer to the list of clients.
+	CSharedFilePeersListCtrl*	peerslistctrl;
+	
+	//! Contains the current (or last if the clientlist is hidden) position of the splitter.
+	int m_splitter;
 private:
 	/**
 	 * Event-handler for reloading the list of shared files.
@@ -76,10 +90,24 @@
 	void OnBtnReloadShared(wxCommandEvent &evt);
 
 	/**
-	 * Event-handler for showing details about a shared file.
+	 * Event-handler for showing details about a shared file(s).
 	 */
-	void OnItemActivated(wxListEvent& evt);
+	void OnItemSelectionChanged(wxListEvent& evt);
 
+	/**
+	 * Event-handler for the list-toggle button.
+	 */
+	void OnToggleClientList( wxCommandEvent& event );
+
+	/**
+	 * Event-handler for changes in the sash divider position.
+	 */
+	void OnSashPositionChanging(wxSplitterEvent& evt);
+
+	/**
+	 * Event-handler for changes in the clients mode radio box.
+	 */
+	void OnSelectClientsMode( wxCommandEvent& WXUNUSED(evt) );
 
 	//! Pointer to the gauge used for showing requests ratio.
 	wxGauge* m_bar_requests;
@@ -87,6 +115,22 @@
 	wxGauge* m_bar_accepted;
 	//! Pointer to the gauge used for showing the transferred ratio.
 	wxGauge* m_bar_transfer;
+	//! Pointer to the radio box selecting the client mode.
+	wxRadioBox* m_radioClientMode;
+	//! Flag if window has been prepared
+	bool	m_prepared;
+	//! Minimum position of splitter bar
+	static const int s_splitterMin = 90;
+
+	/**
+	 * Mode which clients are shown
+	 */
+	enum EClientShow {
+		ClientShowAll = 0,
+		ClientShowSelected,
+		ClientShowUploading
+	};
+	EClientShow m_clientShow;
 
 	
 	DECLARE_EVENT_TABLE()

aMule-2.3.1.tar.bz2/src/SourceListCtrl.cpp Added

@@ -0,0 +1,73 @@
+//
+// 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
+//
+#include "SourceListCtrl.h"
+#include "KnownFile.h"
+
+static CGenericClientListCtrlColumn s_sources_column_info[] = { 
+	{ ColumnUserName,		wxTRANSLATE("User Name"),	260 },
+	{ ColumnUserDownloaded,		wxTRANSLATE("Downloaded"),	65 },
+	{ ColumnUserSpeedDown,		wxTRANSLATE("Speed"),		65 },
+	{ ColumnUserUploaded,		wxTRANSLATE("Uploaded"),	65 },
+	{ ColumnUserProgress,		wxTRANSLATE("Available Parts"),	170 },
+	{ ColumnUserVersion,		wxTRANSLATE("Version"),		50 },
+	{ ColumnUserQueueRankRemote,	wxTRANSLATE("Download Status"),	55 },
+	{ ColumnUserOrigin,		wxTRANSLATE("Origin"),		110 },
+	{ ColumnUserFileNameDownload,	wxTRANSLATE("Local File Name"),	200 },
+	{ ColumnUserFileNameDownloadRemote, wxTRANSLATE("Remote File Name"), 200 },
+	{ ColumnUserSharedFiles,	wxTRANSLATE("Shares File List"), 100 }
+};
+
+BEGIN_EVENT_TABLE(CSourceListCtrl, CGenericClientListCtrl)
+END_EVENT_TABLE()
+
+CSourceListCtrl::CSourceListCtrl(
+	wxWindow *parent, wxWindowID winid, const wxPoint& pos, const wxSize& size,
+	long style, const wxValidator& validator, const wxString& name )
+:
+CGenericClientListCtrl( wxT("Sources"), parent, winid, pos, size, style | wxLC_OWNERDRAW, validator, name )
+{
+	// Setting the sorter function.
+	SetSortFunc( SourceSortProc );
+
+	m_columndata.n_columns = sizeof(s_sources_column_info) / sizeof(CGenericClientListCtrlColumn);
+	m_columndata.columns = s_sources_column_info;
+
+	InitColumnData();
+}
+
+CSourceListCtrl::~CSourceListCtrl()
+{
+}
+
+int CSourceListCtrl::SourceSortProc(wxUIntPtr param1, wxUIntPtr param2, long sortData)
+{
+	return CGenericClientListCtrl::SortProc(param1, param2, s_sources_column_info[sortData & CMuleListCtrl::COLUMN_MASK].cid | (sortData & CMuleListCtrl::SORT_DES));
+}
+
+void CSourceListCtrl::SetShowSources(CKnownFile * f, bool b) const
+{
+	f->SetShowSources(b);
+}
+
+// File_checked_for_headers

aMule-2.3.1.tar.bz2/src/SourceListCtrl.h Added

@@ -0,0 +1,69 @@
+//
+// 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
+//
+
+#ifndef SOURCELISTCTRL_H
+#define SOURCELISTCTRL_H
+
+#include "GenericClientListCtrl.h"	// Needed for CGenericClientListCtrl
+
+/**
+ * This class is responsible for representing the sources for a file.
+
+ */
+class CSourceListCtrl : public CGenericClientListCtrl
+{
+public:
+	/**
+	 * Constructor.
+	 * 
+	 * @see CGenericClientListCtrl::CGenericClientListCtrl for documentation of parameters.
+	 */
+	 CSourceListCtrl(
+	            wxWindow *parent,
+                wxWindowID winid = -1,
+                const wxPoint &pos = wxDefaultPosition,
+                const wxSize &size = wxDefaultSize,
+                long style = wxLC_ICON,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString &name = wxT("sourcelistctrl") );
+				
+	/**
+	 * Destructor.
+	 */	 
+	virtual	~CSourceListCtrl();	
+
+private:
+	virtual CamuleDlg::DialogType GetParentDialog() { return CamuleDlg::DT_TRANSFER_WND; }
+
+	virtual void SetShowSources(CKnownFile * f, bool b) const;
+
+	static int wxCALLBACK SourceSortProc(wxUIntPtr item1, wxUIntPtr item2, long sortData);
+	
+	bool IsShowingDownloadSources() const { return true; }
+	
+	DECLARE_EVENT_TABLE()
+};
+
+#endif
+// File_checked_for_headers

aMule-2.2.6.tar.bz2/src/StatTree.cpp -> aMule-2.3.1.tar.bz2/src/StatTree.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2005-2009 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-2011 DÃ©vai TamÃ¡s ( gonosztopi@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
@@ -28,25 +28,21 @@
 #include <wx/intl.h>
 #include "OtherFunctions.h"
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 
-#ifndef AMULE_DAEMON
 #include <common/Format.h>			// Needed for CFormat
 
 #define a_brackets_b(a,b) (a + wxT(" (") + b + wxT(")"))
 
-#endif /* !AMULE_DAEMON */
-
-#endif /* !EC_REMOTE */
+#endif /* !CLIENT_GUI */
 
 #include <ec/cpp/ECTag.h>			// Needed for CECTag
 
-#ifdef EC_REMOTE
+#ifdef CLIENT_GUI
 	#include <ec/cpp/ECSpecialTags.h>	// Needed for CEC_StatTree_Node_Tag
-#endif
 
+#else
 
-#ifndef EC_REMOTE
 uint32_t NewStatTreeItemId()
 {
 	static uint32_t lastid = 0;
@@ -57,32 +53,28 @@
 
 /* CStatTreeItemBase */
 
-#ifdef EC_REMOTE
+#ifdef CLIENT_GUI
 CStatTreeItemBase::CStatTreeItemBase(const CECTag *tag)
 	: m_label(((CEC_StatTree_Node_Tag*)tag)->GetDisplayString())
 	  , m_uniqueid(tag->GetTagByNameSafe(EC_TAG_STATTREE_NODEID)->GetInt())
 {
 	wxASSERT(tag->GetTagName() == EC_TAG_STATTREE_NODE);
 
-	for (int i = 0; i < tag->GetTagCount(); ++i) {
-		const CECTag *tmp = tag->GetTagByIndex(i);
+	for (CECTag::const_iterator it = tag->begin(); it != tag->end(); it++) {
+		const CECTag *tmp = & *it;
 		if (tmp->GetTagName() == EC_TAG_STATTREE_NODE) {
 			m_children.push_back(new CStatTreeItemBase(tmp));
 		}
 	}
 }
-#endif /* EC_REMOTE */
+#endif /* CLIENT_GUI */
 
 CStatTreeItemBase::~CStatTreeItemBase()
 {
-	for (std::list<CStatTreeItemBase*>::iterator it = m_children.begin();
-	     it != m_children.end(); ++it) {
-		delete *it;
-	}
-	m_children.clear();
+	DeleteContents(m_children);
 }
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 CStatTreeItemBase* CStatTreeItemBase::AddChild(
 	CStatTreeItemBase* child,
 	uint32_t id,
@@ -108,7 +100,7 @@
 	}
 	return child;
 }
-#endif /* !EC_REMOTE */
+#endif /* !CLIENT_GUI */
 
 bool CStatTreeItemBase::HasVisibleChildren()
 {
@@ -123,7 +115,7 @@
 	return false;
 }
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 bool CStatTreeItemBase::HasChildWithId(uint32_t id)
 {
 	wxMutexLocker lock(m_lock);
@@ -149,10 +141,8 @@
 	}
 	return NULL;
 }
-#endif /* !EC_REMOTE */
 
 // Note: these functions do not lock the list, because it is already locked at the time they're called
-#ifndef EC_REMOTE
 StatTreeItemIterator CStatTreeItemBase::GetFirstVisibleChild(uint32_t max_children)
 {
 	StatTreeItemIterator it = m_children.begin();
@@ -174,12 +164,10 @@
 	if (it != m_children.end()) ++it;
 	while (it != m_children.end() && !(*it)->IsVisible()) ++it;
 }
-#endif
 
 //
 // Anything below is only for core.
 //
-#ifndef EC_REMOTE
 
 bool CStatTreeItemBase::ValueSort(const CStatTreeItemBase* a, const CStatTreeItemBase* b)
 {
@@ -239,7 +227,7 @@
 				case dmBytes:	return CFormat(wxGetTranslation(m_label)) % CastItoXBytes(m_intvalue);
 				default:	return CFormat(wxGetTranslation(m_label)) % m_intvalue;
 			}
-		case vtFloat:	return wxString::Format(wxGetTranslation(m_label), m_floatvalue);
+		case vtFloat:	return CFormat(wxGetTranslation(m_label)) % m_floatvalue;
 		case vtString:	return CFormat(wxGetTranslation(m_label)) % m_stringvalue;
 		default:	return wxGetTranslation(m_label);
 	}
@@ -315,8 +303,7 @@
 	} else {
 		wxString result = CFormat(wxT("%u")) % m_value;
 		if ((m_flags & stShowPercent) && m_parent) {
-			result.append(wxString::Format(wxT(" (%.2f%%)"),
-				((double)m_value / ((CStatTreeItemCounterTmpl<_Tp>*)m_parent)->m_value) * 100.0));
+			result += CFormat(wxT(" (%.2f%%)")) % (((double)m_value / ((CStatTreeItemCounterTmpl<_Tp>*)m_parent)->m_value) * 100.0);
 		}
 		return label % result;
 	}
@@ -374,7 +361,7 @@
 #ifndef AMULE_DAEMON
 wxString CStatTreeItemCounterMax::GetDisplayString() const
 {
-	return wxString::Format(wxGetTranslation(m_label), m_value);
+	return CFormat(wxGetTranslation(m_label)) % m_value;
 }
 #endif
 
@@ -538,39 +525,43 @@
 
 /* CStatTreeItemRatio */
 
-#ifndef AMULE_DAEMON
-wxString CStatTreeItemRatio::GetDisplayString() const
+wxString CStatTreeItemRatio::GetString() const
 {
-	if (m_counter1->GetValue() && m_counter2->GetValue()) {
-		if ((*m_counter2) < (*m_counter1)) {
-			return CFormat(wxGetTranslation(m_label)) %
-				wxString::Format(wxT("%.2f : 1"),
-					(float)(*m_counter1)/(*m_counter2));
+	wxString ret;
+	double v1 = m_counter1->GetValue();
+	double v2 = m_counter2->GetValue();
+	if (v1 > 0 && v2 > 0) {
+		if (v2 < v1) {
+			ret = CFormat(wxT("%.2f : 1")) % (v1 / v2);
 		} else {
-			return CFormat(wxGetTranslation(m_label)) %
-				wxString::Format(wxT("1 : %.2f"),
-					(float)(*m_counter2)/(*m_counter1));
+			ret = CFormat(wxT("1 : %.2f")) % (v2 / v1);
+		}
+
+		if (m_totalfunc1 && m_totalfunc2) {
+			double t1 = m_totalfunc1() + v1;
+			double t2 = m_totalfunc2() + v2;
+			if (t2 < t1) {
+				ret += CFormat(wxT(" (%.2f : 1)")) % (t1 / t2);
+			} else {
+				ret += CFormat(wxT(" (1 : %.2f)")) % (t2 / t1);
+			}
 		}
 	} else {
-		return CFormat(wxGetTranslation(m_label)) % _("Not available");
+		ret = _("Not available");
 	}
+	return ret;
 }
-#endif
+
+#ifndef AMULE_DAEMON
+wxString CStatTreeItemRatio::GetDisplayString() const 
+{ 
+	return CFormat(wxGetTranslation(m_label)) % GetString();
+}
+#endif	
 
 void CStatTreeItemRatio::AddECValues(CECTag *tag) const
 {
-	wxString result;
-	if (m_counter1->GetValue() && m_counter2->GetValue()) {
-		if ((*m_counter2) < (*m_counter1)) {
-			result = wxString::Format(wxT("%.2f : 1"), (float)(*m_counter1)/(*m_counter2));
-		} else {
-			result = wxString::Format(wxT("1 : %.2f"), (float)(*m_counter2)/(*m_counter1));
-		}
-	} else {
-		result = wxTRANSLATE("Not available");
-	}
-
-	CECTag value(EC_TAG_STAT_NODE_VALUE, result);
+	CECTag value(EC_TAG_STAT_NODE_VALUE, GetString());
 	value.AddTag(CECTag(EC_TAG_STAT_VALUE_TYPE, (uint8)EC_VALUE_STRING));
 	tag->AddTag(value);
 }
@@ -598,10 +589,7 @@
 {
 	if (m_count) {
 		return CFormat(wxGetTranslation(m_label)) %
-			(wxString::Format(wxT("%i : "), m_count) +
-				m_time.FormatISODate() +
-				wxT(" ") +
-				m_time.FormatISOTime());
+			(CFormat(wxT("%i : %s %s")) % m_count % m_time.FormatISODate() % m_time.FormatISOTime());
 	} else {
 		return CFormat(wxGetTranslation(m_label)) % _("Never");
 	}
@@ -612,10 +600,7 @@
 {
 	wxString result;
 	if (m_count) {
-		result = wxString::Format(wxT("%i : "), m_count) +
-			m_time.FormatISODate() +
-			wxT(" ") +
-			m_time.FormatISOTime();
+		result = CFormat(wxT("%i : %s %s")) % m_count % m_time.FormatISODate() % m_time.FormatISOTime();
 	} else {
 		result = wxTRANSLATE("Never");
 	}
@@ -645,5 +630,5 @@
 	tag->AddTag(value2);
 }
 
-#endif /* !EC_REMOTE */
+#endif /* !CLIENT_GUI */
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/StatTree.h -> aMule-2.3.1.tar.bz2/src/StatTree.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2005-2009 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-2011 DÃ©vai TamÃ¡s ( gonosztopi@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
@@ -36,7 +36,7 @@
  */
 
 
-#ifndef EC_REMOTE	// i.e. not CLIENT_GUI
+#ifndef CLIENT_GUI
 #	define VIRTUAL virtual
 #else
 #	define VIRTUAL
@@ -48,7 +48,7 @@
 #include <wx/thread.h>		// Needed for wxMutex
 #include "Types.h" 
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 
 #include <wx/datetime.h>	// Needed for wxDateTime
 #include "GetTickCount.h"	// Needed for GetTickCount64()
@@ -98,7 +98,7 @@
 	dmBytes			///< Treat integer value as bytes count.
 };
 
-#endif /* !EC_REMOTE */
+#endif /* !CLIENT_GUI */
 
 
 class CStatTreeItemBase;
@@ -117,7 +117,7 @@
 {
 public:
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 	/**
 	 * Creates an item with a constant label.
 	 *
@@ -151,7 +151,7 @@
 	 */
 	VIRTUAL	~CStatTreeItemBase();
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 	/**
 	 * Adds a new child node.
 	 *
@@ -181,7 +181,7 @@
 	 */
 	bool HasVisibleChildren();
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 
 	/**
 	 * Check for a given child.
@@ -211,7 +211,7 @@
 	 */
 	void GetNextVisibleChild(StatTreeItemIterator& it);
 
-#else /* EC_REMOTE */
+#else /* CLIENT_GUI */
 
 	/**
 	 * Get the first visible child.
@@ -229,14 +229,14 @@
 	 */
 	void GetNextVisibleChild(StatTreeItemIterator& it) { ++it; }
 
-#endif /* !EC_REMOTE / EC_REMOTE */
+#endif /* !CLIENT_GUI / CLIENT_GUI */
 
 	/**
 	 * Check if we are past the end of child list.
 	 */
 	bool IsAtEndOfList(StatTreeItemIterator& it) { return it == m_children.end(); }
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 	/**
 	 * Resorts children for the stSortByValue flag.
 	 */
@@ -244,7 +244,7 @@
 #endif
 
 #ifndef AMULE_DAEMON
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 	/**
 	 * Returns a string that will be displayed on the GUI tree.
 	 */
@@ -254,7 +254,7 @@
 	 * Returns the associated text (GUI item label).
 	 */
 	const wxString& GetDisplayString() const { return m_label; }
-#endif /* !EC_REMOTE / EC_REMOTE */
+#endif /* !CLIENT_GUI / CLIENT_GUI */
 
 	/**
 	 * Returns the mutex used to lock the child list of this node.
@@ -275,7 +275,7 @@
 	 */
 	VIRTUAL	bool IsVisible() const { return true; }
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 	/**
 	 * Create an EC tag from this node (and children).
 	 *
@@ -288,7 +288,7 @@
 
 protected:
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 	/**
 	 * Add values to the EC tag being generated.
 	 *
@@ -300,7 +300,7 @@
 
 	//! Unformatted and untranslated label of the node. Note: On remote gui it is already formatted and translated.
 	const wxString m_label;
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 
 	//! Parent of this node.
 	CStatTreeItemBase *m_parent;
@@ -311,7 +311,7 @@
 
 private:
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 	//! Function used when sorting children by value.
 	static bool ValueSort(const CStatTreeItemBase* a, const CStatTreeItemBase* b);
 
@@ -337,7 +337,7 @@
 //
 // Anything below is only for core.
 //
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 
 /**
  * Simple tree item.
@@ -1025,11 +1025,15 @@
 	CStatTreeItemRatio(
 		const wxString &label,
 		const CStatTreeItemCounter *cnt1,
-		const CStatTreeItemCounter* cnt2)
+		const CStatTreeItemCounter* cnt2,
+		uint64_t (*totalfunc1)() = NULL,
+		uint64_t (*totalfunc2)() = NULL)
 	:
 	CStatTreeItemBase(label, stNone),
 	m_counter1(cnt1),
-	m_counter2(cnt2) {}
+	m_counter2(cnt2),
+	m_totalfunc1(totalfunc1),
+	m_totalfunc2(totalfunc2){}
 
 #ifndef AMULE_DAEMON
 	/**
@@ -1053,6 +1057,14 @@
 
 	//! Second counter.
 	const CStatTreeItemCounter *m_counter2;
+
+	//! A function for each whose return value is the total (without current) value.
+	uint64_t (*m_totalfunc1)();
+	uint64_t (*m_totalfunc2)();
+
+private:
+	//! Formatted String for display or EC
+	wxString GetString() const;
 };
 
 
@@ -1182,7 +1194,7 @@
 	const CStatTreeItemCounter *m_unknown;
 };
 
-#endif /* !EC_REMOTE */
+#endif /* !CLIENT_GUI */
 
 #endif /* STATTREE_H */
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/StateMachine.cpp -> aMule-2.3.1.tar.bz2/src/StateMachine.cpp Changed

aMule-2.2.6.tar.bz2/src/StateMachine.h -> aMule-2.3.1.tar.bz2/src/StateMachine.h Changed

aMule-2.2.6.tar.bz2/src/Statistics.cpp -> aMule-2.3.1.tar.bz2/src/Statistics.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
-// Copyright (C) 2005-2009  Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2002-2011 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2005-2011 DÃ©vai TamÃ¡s ( gonosztopi@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
@@ -18,7 +18,7 @@
 // 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
@@ -30,22 +30,26 @@
 
 #include <ec/cpp/ECTag.h>		// Needed for CECTag
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 	#ifndef AMULE_DAEMON
 		#include <common/Format.h>		// Needed for CFormat
 	#endif
+	#include "CFile.h"		// Needed for CFile access
+	#include <common/Path.h>	// Needed for JoinPaths
+	#include <wx/config.h>		// Needed for wxConfig
 	#include "DataToText.h"		// Needed for GetSoftName()
 	#include "Preferences.h"	// Needed for thePrefs
-	#include "amule.h"		// Needed for theApp
 	#include "ListenSocket.h"	// (tree, GetAverageConnections)
 	#include "ServerList.h"		// Needed for CServerList (tree)
 	#include <cmath>		// Needed for std::floor
 	#include "updownclient.h"	// Needed for CUpDownClient
 #else
+	#include "GetTickCount.h"	// Needed for GetTickCount64()
 	#include "Preferences.h"
 	#include <ec/cpp/RemoteConnect.h>		// Needed for CRemoteConnect
 #endif
 
+#include "amule.h"		// Needed for theApp
 #include <wx/intl.h>
 
 #ifdef __BSD__
@@ -56,7 +60,7 @@
 #endif /* __BSD__ */
 
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 
 /*----- CPreciseRateCounter -----*/
 
@@ -119,7 +123,7 @@
 #ifndef AMULE_DAEMON
 wxString CStatTreeItemPeakConnections::GetDisplayString() const
 {
-	return wxString::Format(wxGetTranslation(m_label), theStats::GetPeakConnections());
+	return CFormat(wxGetTranslation(m_label)) % theStats::GetPeakConnections();
 }
 #endif
 
@@ -139,17 +143,17 @@
 CStatTreeItemRateCounter*	CStatistics::s_uploadrate;
 CStatTreeItemRateCounter*	CStatistics::s_downloadrate;
 
-#else /* EC_REMOTE */
+#else /* CLIENT_GUI */
 
 uint64	CStatistics::s_start_time;
 uint64	CStatistics::s_statData[sdTotalItems];
 
-#endif /* !EC_REMOTE / EC_REMOTE */
+#endif /* !CLIENT_GUI / CLIENT_GUI */
 
 // Tree root
 CStatTreeItemBase*		CStatistics::s_statTree;
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 // Uptime
 CStatTreeItemTimer*		CStatistics::s_uptime;
 
@@ -214,8 +218,14 @@
 CStatTreeItemCounter*		CStatistics::s_sizeOfShare;
 
 // Kad
-uint64						CStatistics::s_kadNodesTotal;
-uint16						CStatistics::s_kadNodesCur;
+uint64_t			CStatistics::s_kadNodesTotal;
+uint16_t			CStatistics::s_kadNodesCur;
+
+// Totals
+uint64_t			CStatistics::s_totalSent;
+uint64_t			CStatistics::s_totalReceived;
+
+bool				CStatistics::s_statsNeedSave;
 
 
 CStatistics::CStatistics()
@@ -228,11 +238,11 @@
 	// Init graphs
 
 	average_minutes = thePrefs::GetStatsAverageMinutes();
-	
+
 	HR hr = {0.0, 0.0, 0.0, 0.0, 0.0, 0, 0, 0, 0, 0};
 	hrInit = hr;
 	nHistRanges = 7;	// =ceil(log(max_update_delay)/log(2))
-	nPointsPerRange = GetPointsPerRange(); 
+	nPointsPerRange = GetPointsPerRange();
 	bitsHistClockMask = (1 << (nHistRanges-1)) - 1;
 	aposRecycle = new listPOS[nHistRanges];
 	listPOS *ppos = aposRecycle+nHistRanges-1;
@@ -241,7 +251,7 @@
 		*ppos-- = --listHR.end();
 		for (int j=nPointsPerRange; j>1; --j)
 			listHR.push_back(hr);
-	}	
+	}
 
 	// Init rate counters outside the tree
 
@@ -252,6 +262,10 @@
 
 	InitStatsTree();
 	s_uptime->SetStartTime(start_time);
+
+	// Load saved statistics
+	Load();
+	s_statsNeedSave = false;
 }
 
 
@@ -272,6 +286,74 @@
 }
 
 
+uint64_t ReadUInt64FromCfg(wxConfigBase* cfg, const wxString& key)
+{
+	wxString buffer;
+
+	cfg->Read(key, &buffer, wxT("0"));
+
+	uint64 tmp = 0;
+	for (unsigned int i = 0; i < buffer.Length(); ++i) {
+		if ((buffer[i] >= wxChar('0')) &&(buffer[i] <= wxChar('9'))) {
+			tmp = tmp * 10 + (buffer[i] - wxChar('0'));
+		} else {
+			tmp = 0;
+			break;
+		}
+	}
+
+	return tmp;
+}
+
+void CStatistics::Load()
+{
+	CFile f;
+
+	s_totalSent = 0;
+	s_totalReceived = 0;
+	if (f.Open(JoinPaths(theApp->ConfigDir, wxT("statistics.dat")))) {
+		uint8_t version = f.ReadUInt8();
+		if (version == 0) {
+			s_totalSent = f.ReadUInt64();
+			s_totalReceived = f.ReadUInt64();
+		}
+	}
+
+	// Load old values from config
+	bool cfgChanged = false;
+	wxConfigBase* cfg = wxConfigBase::Get();
+	if (cfg->HasEntry(wxT("/Statistics/TotalUploadedBytes"))) {
+		s_totalSent += ReadUInt64FromCfg(cfg, wxT("/Statistics/TotalUploadedBytes"));
+		cfg->DeleteEntry(wxT("/Statistics/TotalUploadedBytes"));
+		cfgChanged = true;
+	}
+	if (cfg->HasEntry(wxT("/Statistics/TotalDownloadedBytes"))) {
+		s_totalReceived += ReadUInt64FromCfg(cfg, wxT("/Statistics/TotalDownloadedBytes"));
+		cfg->DeleteEntry(wxT("/Statistics/TotalDownloadedBytes"));
+		cfgChanged = true;
+	}
+	if (cfgChanged) {
+		cfg->Flush();
+		s_statsNeedSave = s_totalSent > 0 || s_totalReceived > 0;
+		Save();
+	}
+}
+
+
+void CStatistics::Save()
+{
+	if (s_statsNeedSave) {
+		CFile f;
+
+		if (f.Open(JoinPaths(theApp->ConfigDir, wxT("statistics.dat")), CFile::write)) {
+			f.WriteUInt8(0);	/* version */
+			f.WriteUInt64(s_totalSent);
+			f.WriteUInt64(s_totalReceived);
+		}
+		s_statsNeedSave = false;
+	}
+}
+
 void CStatistics::CalculateRates()
 {
 	uint64_t now = GetTickCount64();
@@ -282,24 +364,25 @@
 }
 
 
+
 /* ------------------------------- GRAPHS ---------------------------- */
 
 /*
 History List
 
-  The basic idea here is that we want to keep as much history as we can without paying 
-a high price in terms of memory space.  Because we keep the history for display purposes, 
-we can take advantage of the fact that when the period shown in the graphs is long 
-then each pixel represents a long period.  So as the most recent history we keep one 
-window full of points at a resolution of 1 second, the next window full at 2 seconds, 
-the next at 4 seconds and so on, up to the maximum desired.  This way there is always 
-at least one sample point per pixel for any update delay set by the user, and the 
+  The basic idea here is that we want to keep as much history as we can without paying
+a high price in terms of memory space.  Because we keep the history for display purposes,
+we can take advantage of the fact that when the period shown in the graphs is long
+then each pixel represents a long period.  So as the most recent history we keep one
+window full of points at a resolution of 1 second, the next window full at 2 seconds,
+the next at 4 seconds and so on, up to the maximum desired.  This way there is always
+at least one sample point per pixel for any update delay set by the user, and the
 memory required grows with the *log* of the total time period covered.
-  The history is kept in a doubly-linked list, with the most recent snapshot at the tail.  
-The number of nodes in the list is fixed, and there are no calls to RemoveHead() and 
-AddTail() which would add overhead and contribute to memory fragmentation.  Instead, 
-every second when a new point gets recorded, one of the existing nodes is recycled; 
-it is disjoined from its present place, put at the tail of the list, and then gets 
+  The history is kept in a doubly-linked list, with the most recent snapshot at the tail.
+The number of nodes in the list is fixed, and there are no calls to RemoveHead() and
+AddTail() which would add overhead and contribute to memory fragmentation.  Instead,
+every second when a new point gets recorded, one of the existing nodes is recycled;
+it is disjoined from its present place, put at the tail of the list, and then gets
 filled with new data.   [Emilio Sandoz]
   This unfortunately does not work with stl classes, as none of them supports moving
 a node to another place, so we have to erase and re-add nodes.
@@ -307,32 +390,32 @@
 
 void CStatistics::RecordHistory()
 {	// First we query and compute some values, then we store them in the history list
-	
+
 	// A few comments about the use of double and float in computations:
 	// Even on a hi-res screen our graphs will have 10 bits of resolution at most,
 	// so the 24 bits resolution of a float on 32 bit Intel processors is more than
-	// enough for all displayed values.  Rate computations however, and especially 
-	// running average computations, use differences (delta bytes/ delta time), and 
-	// for long uptimes the difference between two timestamps can lose too much 
+	// enough for all displayed values.  Rate computations however, and especially
+	// running average computations, use differences (delta bytes/ delta time), and
+	// for long uptimes the difference between two timestamps can lose too much
 	// accuracy because the large mantissa causes less significant bits to be dropped
-	// (same for the difference between two cumulative byte counts).  [We don't store 
+	// (same for the difference between two cumulative byte counts).  [We don't store
 	// these values as integers because they will be used in floating point calculations,
-	// and we want to perform the conversion only once).  Therefore timestamps and 
+	// and we want to perform the conversion only once).  Therefore timestamps and
 	// Kbyte counts are stored in the history as doubles, while computed values use
 	// float (to save space and execution time).
 
 /*
 	Store values; first determine the node to be recycled (using the bits in iClock)
-	
+
     oldest records ----------------- listHR ------------------ youngest records
-	
+
 	O-[Range 2^n sec]-O- ... -O-[Range 4 sec]-O-[Range 2 sec]-O-[Range 1 sec]-O
 	|                 |       |               |               > every 2 secs -^
 	|                 |  ...  |                >--------------- every 4 secs -^
 	|                 |       >------------------------ recycle every 8 secs -^
 	|                 |                                                 ...
-	|                 >-the node at this position is recycled every 2^n secs -^	
-	>-------------------(ditto for the oldest node at the head of the list) --^	
+	|                 >-the node at this position is recycled every 2^n secs -^
+	>-------------------(ditto for the oldest node at the head of the list) --^
 	^                                                         ^
     aposRecycle[nHistRanges-1]               ...              aposRecycle[0]  Tail
 */
@@ -343,7 +426,7 @@
 	if (bits <= bitsHistClockMask) {
 		ppos = aposRecycle;
 		while ((bits /= 2) != 0)  // count to the highest bit that was just toggled to 1
-			++ppos;	
+			++ppos;
 		// recycle one node and jump over the next to move it to the next higher range
 		listHR.push_back(**ppos);
 		*ppos = ++listHR.erase(*ppos);
@@ -353,7 +436,7 @@
 		listHR.push_back(**ppos);
 		*ppos = listHR.erase(*ppos);
 	}
-	
+
 	// now save the latest data point in this node
  	listPOS phr = --listHR.end();
 	phr->kBytesSent = GetSessionSentBytes() / 1024.0;
@@ -364,7 +447,7 @@
 	phr->cntConnections = GetActiveConnections();
 	phr->cntDownloads = GetDownloadingSources();
 	phr->sTimestamp = GetUptimeMillis() / 1000.0;
-	
+
 	s_kadNodesTotal += s_kadNodesCur;
 	phr->kadNodesTotal = s_kadNodesTotal;
 	phr->kadNodesCur = s_kadNodesCur;
@@ -377,18 +460,18 @@
 	double sFinal,			// latest allowed timestamp
 	const std::vector<float *> &ppf,// an array of pointers to arrays of floats for the result
 	StatsGraphType which_graph)	// the graph which will receive the points
-{	
+{
 	if (sStep==0.0 || cntPoints==0) {
 		return(0);
 	}
-	
+
 	float *pf1 = ppf[0];
 	float *pf2 = ppf[1];
 	float *pf3 = ppf[2];
 	unsigned cntFilled = 0;
 	listRPOS pos = listHR.rbegin();
 
-	// start of list should be an integer multiple of the sampling period for samples 
+	// start of list should be an integer multiple of the sampling period for samples
 	// to be consistent when the graphs are resized horizontally
 	double	sTarget;
 	if (sFinal >= 0.0) {
@@ -405,7 +488,7 @@
 		ahr = new HR* [cntPoints];
 		pphr = ahr;
 	}
-	
+
 	while (pos != listHR.rend()) {
 		if (pos->sTimestamp > sTarget) {
 			++pos;
@@ -418,7 +501,7 @@
 			*pf2++ = (float)pos->cntConnections;
 			*pf3++ = (float)pos->cntDownloads;
 		}
-		if (++cntFilled  == cntPoints) {	// enough points 
+		if (++cntFilled  == cntPoints) {	// enough points
 			break;
 		}
 		if (pos->sTimestamp == 0.0) {		// reached beginning of uptime
@@ -451,7 +534,7 @@
 	double sStep,			// time difference between sample points
 	double *sStart,			// earliest allowed timestamp
 	uint32 **graphData)		// a pointer to a pointer that will point to the graph data array
-{	
+{
 	if (*sStart < 0.0) {
 		*sStart = 0.0;
 	}
@@ -461,7 +544,7 @@
 	listRPOS	pos = listHR.rbegin();
 	double		LastTimeStamp = pos->sTimestamp;
 	double		sTarget = LastTimeStamp;
-	
+
 	HR	**pphr = new HR *[cntPoints];
 
 	while (pos != listHR.rend()) {
@@ -470,7 +553,7 @@
 			continue;
 		}
 		pphr[cntFilled] = &(*pos);
-		if (++cntFilled  == cntPoints)		// enough points 
+		if (++cntFilled  == cntPoints)		// enough points
 			break;
 		if (pos->sTimestamp <= *sStart)		// reached beginning of requested time
 			break;
@@ -515,7 +598,7 @@
 	double		sStep,		// time difference between two samples
 	const std::vector<float *> &ppf,// an array of pointers to arrays of floats with sample data
 	StatsGraphType	which_graph)	// the graph which will receive the points
-{	
+{
 	double		sTarget, kValueRun;
 	uint64 		avgTime = average_minutes * 60;
 	unsigned	nBtPoints = (unsigned)(avgTime / sStep);
@@ -528,7 +611,7 @@
 		default:
 			wxCHECK_RET(false, wxT("ComputeAverages called with unsupported graph type."));
 	}
-	
+
 	runningAvg->m_timespan = avgTime * 1000;
 	runningAvg->m_tick_history.clear();
 	runningAvg->m_byte_history.clear();
@@ -540,12 +623,12 @@
 	} else {
 		sTarget = std::max(0.0, pos->sTimestamp - sStep);
 	}
-	
+
 	while (nBtPoints--) {
 		while (pos != listHR.rend() && pos->sTimestamp > sTarget) ++pos;	// find next history record
 		if (pos != listHR.rend()) {
 			runningAvg->m_tick_history.push_front((uint64)(pos->sTimestamp * 1000.0));
-			
+
 			uint32 value = 0;
 			switch (which_graph) {
 			case GRAPH_DOWN:
@@ -558,9 +641,9 @@
 				value = (uint32)(pos->kadNodesCur * 1024.0);
 				break;
 			default:
-				wxCHECK_RET(false, wxT("ComputeAverages called with unsupported graph type."));		
-			}		
-			
+				wxCHECK_RET(false, wxT("ComputeAverages called with unsupported graph type."));
+			}
+
 			runningAvg->m_byte_history.push_front(value);
 			runningAvg->m_total += value;
 		} else {
@@ -588,7 +671,7 @@
 			kValueRun = phr->kadNodesTotal;
 			*pf3 = phr->kadNodesCur;
 		}
-		
+
 		*pf1 = kValueRun / phr->sTimestamp;
 		(*runningAvg) += (uint32)(*pf3 * 1024.0);
 		runningAvg->CalculateRate((uint64)(phr->sTimestamp * 1000.0));
@@ -627,7 +710,7 @@
 	update.kadnodes[0] = phr->kadNodesTotal / phr->sTimestamp;
 	update.kadnodes[1] = m_graphRunningAvgKad.GetRate() / 1024.0;
 	update.kadnodes[2] = phr->kadNodesCur;
-		
+
 	return update;
 }
 
@@ -646,7 +729,7 @@
 	tmpRoot1 = s_statTree->AddChild(new CStatTreeItemBase(wxTRANSLATE("Transfer"), stSortChildren));
 
 	tmpRoot2 = tmpRoot1->AddChild(new CStatTreeItemBase(wxTRANSLATE("Uploads")), 2);
-	s_sessionUpload = (CStatTreeItemUlDlCounter*)tmpRoot2->AddChild(new CStatTreeItemUlDlCounter(wxTRANSLATE("Uploaded Data (Session (Total)): %s"), thePrefs::GetTotalUploaded, stSortChildren | stSortByValue));
+	s_sessionUpload = (CStatTreeItemUlDlCounter*)tmpRoot2->AddChild(new CStatTreeItemUlDlCounter(wxTRANSLATE("Uploaded Data (Session (Total)): %s"), theStats::GetTotalSentBytes, stSortChildren | stSortByValue));
 	// Children will be added on-the-fly
 	s_totalUpOverhead = (CStatTreeItemPacketTotals*)tmpRoot2->AddChild(new CStatTreeItemPacketTotals(wxTRANSLATE("Total Overhead (Packets): %s")));
 	s_fileReqUpOverhead = (CStatTreeItemPackets*)tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("File Request Overhead (Packets): %s")));
@@ -667,7 +750,7 @@
 	tmpRoot2->AddChild(new CStatTreeItemAverage(wxTRANSLATE("Average upload time: %s"), s_totalUploadTime, s_totalSuccUploads, dmTime));
 
 	tmpRoot2 = tmpRoot1->AddChild(new CStatTreeItemBase(wxTRANSLATE("Downloads")), 1);
-	s_sessionDownload = (CStatTreeItemUlDlCounter*)tmpRoot2->AddChild(new CStatTreeItemUlDlCounter(wxTRANSLATE("Downloaded Data (Session (Total)): %s"), thePrefs::GetTotalDownloaded, stSortChildren | stSortByValue));
+	s_sessionDownload = (CStatTreeItemUlDlCounter*)tmpRoot2->AddChild(new CStatTreeItemUlDlCounter(wxTRANSLATE("Downloaded Data (Session (Total)): %s"), theStats::GetTotalReceivedBytes, stSortChildren | stSortByValue));
 	// Children will be added on-the-fly
 	s_totalDownOverhead = (CStatTreeItemPacketTotals*)tmpRoot2->AddChild(new CStatTreeItemPacketTotals(wxTRANSLATE("Total Overhead (Packets): %s")));
 	s_fileReqDownOverhead = (CStatTreeItemPackets*)tmpRoot2->AddChild(new CStatTreeItemPackets(wxTRANSLATE("File Request Overhead (Packets): %s")));
@@ -683,7 +766,7 @@
 	s_foundSources = (CStatTreeItemNativeCounter*)tmpRoot2->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Found Sources: %s"), stSortChildren | stSortByValue));
 	s_activeDownloads = (CStatTreeItemNativeCounter*)tmpRoot2->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Active Downloads (chunks): %s")));
 
-	tmpRoot1->AddChild(new CStatTreeItemRatio(wxTRANSLATE("Session UL:DL Ratio (Total): %s"), s_sessionUpload, s_sessionDownload), 3);
+	tmpRoot1->AddChild(new CStatTreeItemRatio(wxTRANSLATE("Session UL:DL Ratio (Total): %s"), s_sessionUpload, s_sessionDownload, theStats::GetTotalSentBytes, theStats::GetTotalReceivedBytes), 3);
 
 	tmpRoot1 = s_statTree->AddChild(new CStatTreeItemBase(wxTRANSLATE("Connection")));
 	tmpRoot1->AddChild(new CStatTreeItemAverageSpeed(wxTRANSLATE("Average download rate (Session): %s"), s_sessionDownload, s_uptime));
@@ -700,14 +783,14 @@
 	tmpRoot1->AddChild(new CStatTreeItemPeakConnections(wxTRANSLATE("Peak Connections (estimate): %i")));
 
 	s_clients = (CStatTreeItemHiddenCounter*)s_statTree->AddChild(new CStatTreeItemHiddenCounter(wxTRANSLATE("Clients"), stSortChildren | stSortByValue));
-	s_unknown = (CStatTreeItemCounter*)s_clients->AddChild(new CStatTreeItemCounter(wxString(wxTRANSLATE("Unknown")) + wxT(": %s")), 6);
+	s_unknown = (CStatTreeItemCounter*)s_clients->AddChild(new CStatTreeItemCounter(wxTRANSLATE("Unknown: %s")), 6);
 	//s_lowID = (CStatTreeItem*)s_clients->AddChild(new CStatTreeItem(wxTRANSLATE("LowID: %u (%.2f%% Total %.2f%% Known)")), 5);
 	//s_secIdentOnOff = (CStatTreeItem*)s_clients->AddChild(new CStatTreeItem(wxTRANSLATE("SecIdent On/Off: %u (%.2f%%) : %u (%.2f%%)")), 4);
 #ifdef __DEBUG__
 	s_hasSocket = (CStatTreeItemNativeCounter*)s_clients->AddChild(new CStatTreeItemNativeCounter(wxT("HasSocket: %s")), 3);
 #endif
-	s_filtered = (CStatTreeItemNativeCounter*)s_clients->AddChild(new CStatTreeItemNativeCounter(wxString(wxTRANSLATE("Filtered")) +  wxT(": %s")), 2);
-	s_banned = (CStatTreeItemNativeCounter*)s_clients->AddChild(new CStatTreeItemNativeCounter(wxString(wxTRANSLATE("Banned")) + wxT(": %s")), 1);
+	s_filtered = (CStatTreeItemNativeCounter*)s_clients->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Filtered: %s")), 2);
+	s_banned = (CStatTreeItemNativeCounter*)s_clients->AddChild(new CStatTreeItemNativeCounter(wxTRANSLATE("Banned: %s")), 1);
 	s_clients->AddChild(new CStatTreeItemTotalClients(wxTRANSLATE("Total: %i Known: %i"), s_clients, s_unknown), 0x80000000);
 
 	// TODO: Use counters?
@@ -844,7 +927,7 @@
                 id ^= old_id;
                 id -= old_id;
         }
-	return ((id >> 1) + id | 0x00000100) & 0x7fffffff;
+	return (((id >> 1) + id) | 0x00000100) & 0x7fffffff;
 }
 
 void CStatistics::AddKnownClient(CUpDownClient *pClient)
@@ -925,7 +1008,7 @@
 	}
 }
 
-#else /* EC_REMOTE (CLIENT_GUI) */
+#else /* CLIENT_GUI */
 
 CStatistics::CStatistics(CRemoteConnect &conn)
 :
@@ -961,26 +1044,52 @@
 	s_statData[sdKadUsers] = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_USERS)->GetInt();
 	s_statData[sdED2KFiles] = stats->GetTagByNameSafe(EC_TAG_STATS_ED2K_FILES)->GetInt();
 	s_statData[sdKadFiles] = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_FILES)->GetInt();
+	s_statData[sdKadFirewalledUDP] = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_FIREWALLED_UDP)->GetInt();
+	s_statData[sdKadIndexedSources] = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_INDEXED_SOURCES)->GetInt();
+	s_statData[sdKadIndexedKeywords] = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_INDEXED_KEYWORDS)->GetInt();
+	s_statData[sdKadIndexedNotes] = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_INDEXED_NOTES)->GetInt();
+	s_statData[sdKadIndexedLoad] = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_INDEXED_LOAD)->GetInt();
+	s_statData[sdKadIPAdress] = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_IP_ADRESS)->GetInt();
+	s_statData[sdBuddyStatus] = stats->GetTagByNameSafe(EC_TAG_STATS_BUDDY_STATUS)->GetInt();
+	s_statData[sdBuddyIP] = stats->GetTagByNameSafe(EC_TAG_STATS_BUDDY_IP)->GetInt();
+	s_statData[sdBuddyPort] = stats->GetTagByNameSafe(EC_TAG_STATS_BUDDY_PORT)->GetInt();
+	s_statData[sdKadInLanMode] = stats->GetTagByNameSafe(EC_TAG_STATS_KAD_IN_LAN_MODE)->GetInt();
+	s_statData[sdTotalSentBytes] = stats->GetTagByNameSafe(EC_TAG_STATS_TOTAL_SENT_BYTES)->GetInt();
+	s_statData[sdTotalReceivedBytes] = stats->GetTagByNameSafe(EC_TAG_STATS_TOTAL_RECEIVED_BYTES)->GetInt();
+	s_statData[sdSharedFileCount] = stats->GetTagByNameSafe(EC_TAG_STATS_SHARED_FILE_COUNT)->GetInt();
+
+	const CECTag * LoggerTag = stats->GetTagByName(EC_TAG_STATS_LOGGER_MESSAGE);
+	if (LoggerTag) {
+		for (CECTag::const_iterator it = LoggerTag->begin(); it != LoggerTag->end(); it++) {
+			theApp->AddRemoteLogLine(it->GetStringData());
+		}
+	}
 }
 
 
 void CStatistics::UpdateStatsTree()
 {
-	CECPacket request(EC_OP_GET_STATSTREE);
-	if (thePrefs::GetMaxClientVersions() != 0) {
-		request.AddTag(CECTag(EC_TAG_STATTREE_CAPPING, (uint8)thePrefs::GetMaxClientVersions()));
-	}
-	const CECPacket* reply = m_conn.SendRecvPacket(&request);
-	if (reply) {
-		const CECTag* treeRoot = reply->GetTagByName(EC_TAG_STATTREE_NODE);
-		if (treeRoot) {
-			delete s_statTree;
-			s_statTree = new CStatTreeItemBase(treeRoot);
-		}
-	}
-	delete reply;
 }
 
-#endif /* !EC_REMOTE */
+
+void CStatistics::RebuildStatTreeRemote(const CECTag * tag)
+{
+	delete s_statTree;
+	s_statTree = new CStatTreeItemBase(tag);
+}
+
+
+uint64 CStatistics::GetUptimeMillis()
+{
+	return GetTickCount64() - s_start_time;
+}
+
+
+uint64 CStatistics::GetUptimeSeconds()
+{
+	return (GetTickCount64() - s_start_time) / 1000;
+}
+
+#endif /* !CLIENT_GUI */
 
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/Statistics.h -> aMule-2.3.1.tar.bz2/src/Statistics.h Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
-// Copyright (C) 2005-2009 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2002-2011 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2005-2011 DÃ©vai TamÃ¡s ( gonosztopi@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
@@ -18,7 +18,7 @@
 // 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
@@ -27,19 +27,11 @@
 #ifndef STATISTICS_H
 #define STATISTICS_H
 
+#include "Constants.h"		// Needed for StatsGraphType
 #include "StatTree.h"		// Needed for CStatTreeItem* classes
-#include "GetTickCount.h"	// Needed for GetTickCount64()
 
 #include <deque>		// Needed for std::deque
 
-enum StatsGraphType {
-	GRAPH_INVALID = 0,
-	GRAPH_DOWN,
-	GRAPH_UP,
-	GRAPH_CONN,
-	GRAPH_KAD
-};
-
 typedef struct UpdateInfo {
 	double timestamp;
 	float downloads[3];
@@ -62,7 +54,7 @@
 } HR;
 
 
-#ifndef EC_REMOTE
+#ifndef CLIENT_GUI
 
 /**
  * Counts precise rate/average on added bytes/values.
@@ -223,10 +215,13 @@
 
 class CStatistics {
 	friend class CStatisticsDlg;	// to access CStatistics::GetTreeRoot()
- public: 
+ public:
 	CStatistics();
 	~CStatistics();
 
+	static void	Load();
+	static void	Save();
+
 	/* Statistics graph functions */
 
 	void	 RecordHistory();
@@ -246,6 +241,7 @@
 	static	uint64	GetStartTime()				{ return s_uptime->GetTimerStart(); }
 
 	// Upload
+	static	uint64	GetTotalSentBytes()			{ return s_totalSent; }
 	static	uint64	GetSessionSentBytes()			{ return (*s_sessionUpload); }
 	static	void	AddUpOverheadFileRequest(uint32 size)	{ (*s_fileReqUpOverhead) += size; (*s_upOverheadRate) += size; }
 	static	void	AddUpOverheadSourceExchange(uint32 size){ (*s_sourceXchgUpOverhead) += size; (*s_upOverheadRate) += size; }
@@ -266,6 +262,7 @@
 	static	double	GetUploadRate()				{ return s_uploadrate->GetRate(); }
 
 	// Download
+	static	uint64	GetTotalReceivedBytes()			{ return s_totalReceived; }
 	static	uint64	GetSessionReceivedBytes()		{ return (*s_sessionDownload); }
 	static	void	AddDownOverheadFileRequest(uint32 size)	{ (*s_fileReqDownOverhead) += size; (*s_downOverheadRate) += size; }
 	static	void	AddDownOverheadSourceExchange(uint32 size){ (*s_sourceXchgDownOverhead) += size; (*s_downOverheadRate) += size; }
@@ -320,9 +317,9 @@
 	static	uint32	GetSharedFileCount()			{ return (*s_numberOfShared); }
 
 	// Kad nodes
-	static void		AddKadNode()					{ ++s_kadNodesCur; }
-	static void		RemoveKadNode()					{ --s_kadNodesCur; }
-	
+	static void	AddKadNode()				{ ++s_kadNodesCur; }
+	static void	RemoveKadNode()				{ --s_kadNodesCur; }
+
 
 	// Other
 	static	void	CalculateRates();
@@ -335,6 +332,8 @@
 
 			(*s_sessionDownload) += bytes;
 			(*s_downloadrate) += bytes;
+			s_totalReceived += bytes;
+			s_statsNeedSave = true;
 		}
 
 	static	void	AddSentBytes(uint32 bytes)
@@ -345,6 +344,8 @@
 
 			(*s_sessionUpload) += bytes;
 			(*s_uploadrate) += bytes;
+			s_totalSent += bytes;
+			s_statsNeedSave = true;
 		}
 
 	static	void	AddDownloadFromSoft(uint8 SoftType, uint32 bytes);
@@ -354,7 +355,7 @@
 	static	CECTag*	GetECStatTree(uint8 tree_capping_value)	{ return s_statTree->CreateECTag(tree_capping_value); }
 
 	void SetAverageMinutes(uint8 minutes) { average_minutes = minutes; }
-	
+
  private:
  	std::list<HR>	listHR;
 	typedef std::list<HR>::iterator		listPOS;
@@ -364,7 +365,7 @@
 
 	void ComputeAverages(HR **pphr, listRPOS pos, unsigned cntFilled,
 		double sStep, const std::vector<float *> &ppf, StatsGraphType which_graph);
- 
+
 	int GetPointsPerRange()
 	{
 		return (1280/2) - 80; // This used to be a calc. based on GUI width
@@ -376,7 +377,7 @@
 	CPreciseRateCounter	m_graphRunningAvgUp;
 	CPreciseRateCounter	m_graphRunningAvgKad;
 
-	
+
 	uint8 average_minutes;
 	int	nHistRanges;
 	int	bitsHistClockMask;
@@ -392,7 +393,7 @@
 	static	CStatTreeItemRateCounter*	s_downloadrate;
 
 	/* Tree-related functions */
-	
+
 	static	void	InitStatsTree();
 
 	static	CStatTreeItemBase*	GetTreeRoot()	{ return s_statTree; }
@@ -466,11 +467,17 @@
 	static	CStatTreeItemCounter*		s_sizeOfShare;
 
 	// Kad nodes
-	static uint64 s_kadNodesTotal;
-	static uint16 s_kadNodesCur;
+	static	uint64_t	s_kadNodesTotal;
+	static	uint16_t	s_kadNodesCur;
+
+	// Total sent/received bytes
+	static	uint64_t	s_totalSent;
+	static	uint64_t	s_totalReceived;
+
+	static	bool		s_statsNeedSave;
 };
 
-#else /* EC_REMOTE == CLIENT_GUI */
+#else /* CLIENT_GUI */
 
 class CECPacket;
 class CRemoteConnect;
@@ -486,6 +493,19 @@
 	sdKadUsers,
 	sdED2KFiles,
 	sdKadFiles,
+	sdKadFirewalledUDP,
+	sdKadIndexedSources,
+	sdKadIndexedKeywords,
+	sdKadIndexedNotes,
+	sdKadIndexedLoad,
+	sdKadIPAdress,
+	sdBuddyStatus,
+	sdBuddyIP,
+	sdBuddyPort,
+	sdKadInLanMode,
+	sdTotalSentBytes,
+	sdTotalReceivedBytes,
+	sdSharedFileCount,
 
 	sdTotalItems
 };
@@ -499,42 +519,54 @@
 	static uint64 s_start_time;
 	static uint64 s_statData[sdTotalItems];
 	uint8 average_minutes;
-	
+
  public:
 	CStatistics(CRemoteConnect &conn);
 	~CStatistics();
 
-	static	uint64	GetUptimeMillis()			{ return GetTickCount64() - s_start_time; }
-	static	uint64	GetUptimeSeconds()			{ return (GetTickCount64() - s_start_time) / 1000; }
+	static	uint64	GetUptimeMillis();
+	static	uint64	GetUptimeSeconds();
 
-	static	uint64	GetSessionSentBytes()			{ return 0; } // TODO
+	static	uint64	GetTotalSentBytes()			{ return s_statData[sdTotalSentBytes]; }
 	static	double	GetUploadRate()				{ return (double)s_statData[sdUpload]; }
 	static	double	GetUpOverheadRate()			{ return (double)s_statData[sdUpOverhead]; }
 
-	static	uint64	GetSessionReceivedBytes()		{ return 0; } // TODO
+	static	uint64	GetTotalReceivedBytes()			{ return s_statData[sdTotalReceivedBytes]; }
 	static	double	GetDownloadRate()			{ return (double)s_statData[sdDownload]; }
 	static	double	GetDownOverheadRate()			{ return (double)s_statData[sdDownOverhead]; }
 
 	static	uint32	GetWaitingUserCount()			{ return s_statData[sdWaitingClients]; }
 	static	uint32	GetBannedCount()			{ return s_statData[sdBannedClients]; }
 
-	static	uint32	GetSharedFileCount()			{ return 0; } // TODO
+	static	uint32	GetSharedFileCount()			{ return s_statData[sdSharedFileCount]; }
 
 	static	uint32	GetED2KUsers()			{ return s_statData[sdED2KUsers]; }
 	static	uint32	GetKadUsers() 			{ return s_statData[sdKadUsers]; }
 	static	uint32	GetED2KFiles()			{ return s_statData[sdED2KFiles]; }
 	static	uint32	GetKadFiles() 			{ return s_statData[sdKadFiles]; }
 
+	static	bool	IsFirewalledKadUDP()	{ return s_statData[sdKadFirewalledUDP] != 0; }
+	static	uint32	GetKadIndexedSources()	{ return s_statData[sdKadIndexedSources]; }
+	static	uint32	GetKadIndexedKeywords()	{ return s_statData[sdKadIndexedKeywords]; }
+	static	uint32	GetKadIndexedNotes()	{ return s_statData[sdKadIndexedNotes]; }
+	static	uint32	GetKadIndexedLoad()		{ return s_statData[sdKadIndexedLoad]; }
+	static	uint32	GetKadIPAdress()		{ return s_statData[sdKadIPAdress]; }
+	static	uint8	GetBuddyStatus()		{ return s_statData[sdBuddyStatus]; }
+	static	uint32	GetBuddyIP()			{ return s_statData[sdBuddyIP]; }
+	static	uint32	GetBuddyPort()			{ return s_statData[sdBuddyPort]; }
+	static	bool	IsKadRunningInLanMode()	{ return s_statData[sdKadInLanMode] != 0; }
+
 	static	void	UpdateStats(const CECPacket* stats);
 
-		void	UpdateStatsTree();
-		void	SetAverageMinutes(uint8 minutes)	{ average_minutes = minutes; }
-	
+	void	UpdateStatsTree();
+	void	RebuildStatTreeRemote(const CECTag *);
+	void	SetAverageMinutes(uint8 minutes)	{ average_minutes = minutes; }
+
  private:
 	static	CStatTreeItemBase*	GetTreeRoot()		{ return s_statTree; }
 };
 
-#endif /* !EC_REMOTE / EC_REMOTE */
+#endif /* !CLIENT_GUI / CLIENT_GUI */
 
 
 /**

aMule-2.2.6.tar.bz2/src/StatisticsDlg.cpp -> aMule-2.3.1.tar.bz2/src/StatisticsDlg.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -32,6 +32,7 @@
 #include "Preferences.h"	// Needed for thePrefs
 #include "muuli_wdr.h"		// Needed for statsDlg()
 #include "StatisticsDlg.h"	// Interface declarations
+#include "Statistics.h"
 
 
 class CTreeItemData : public wxTreeItemData
@@ -51,9 +52,9 @@
 
 // CStatisticsDlg panel
 
-COLORREF CStatisticsDlg::getColors(unsigned num)
+const wxColour& CStatisticsDlg::getColors(unsigned num)
 {
-	wxCHECK(num < 15, RGB(0, 0, 0));
+	wxCHECK(num < 15, *wxBLACK);
 	
 	return acrStat[num];
 }
@@ -108,34 +109,34 @@
 
 
 // this array is now used to store the current color settings and to define the defaults
-COLORREF CStatisticsDlg::acrStat[cntStatColors] =
+wxColour CStatisticsDlg::acrStat[cntStatColors] =
 	{ 
-		RGB(0,0,64),		RGB(192,192,255),	RGB(128, 255, 128),	RGB(0, 210, 0),
-		RGB(0, 128, 0),		RGB(255, 128, 128),	RGB(200, 0, 0),		RGB(140, 0, 0),
-	  	RGB(150, 150, 255),	RGB(192, 0, 192),	RGB(255, 255, 128),	RGB(0, 0, 0), 
-	  	RGB(128, 255, 128),	RGB(0, 210, 0),		RGB(0, 128, 0)
+		wxColour(0,0,64), wxColour(192,192,255), wxColour(128, 255, 128), wxColour(0, 210, 0),
+		wxColour(0, 128, 0), wxColour(255, 128, 128), wxColour(200, 0, 0), wxColour(140, 0, 0),
+	  	wxColour(150, 150, 255), wxColour(192, 0, 192), wxColour(255, 255, 128), wxColour(0, 0, 0), 
+	  	wxColour(128, 255, 128), wxColour(0, 210, 0), wxColour(0, 128, 0)
 	};
 
-
-
 void CStatisticsDlg::ApplyStatsColor(int index)
 {
 	static char aTrend[] = { 0,0,  2,     1,     0,           2,     1,     0,          1,    2,    0 };
 	static int aRes[] = { 0,0, IDC_C0,IDC_C0_3,IDC_C0_2,  IDC_C1,IDC_C1_3,IDC_C1_2,  IDC_S0,IDC_S3,IDC_S1 };
 	static COScopeCtrl** apscope[] = { NULL, NULL, &pscopeDL,&pscopeDL,&pscopeDL, &pscopeUL,&pscopeUL,&pscopeUL, &pscopeConn,&pscopeConn,&pscopeConn };
 
-	COLORREF cr = acrStat[index];  
+	const wxColour& cr = acrStat[index];  
 
 	int iRes = aRes[index];
 	int iTrend = aTrend[index];
 	COScopeCtrl** ppscope = apscope[index];
 	CColorFrameCtrl* ctrl;
 	switch (index) {
-		case 0:	pscopeDL->SetBackgroundColor(cr);
+		case 0:	
+				pscopeDL->SetBackgroundColor(cr);
 				pscopeUL->SetBackgroundColor(cr);
 				pscopeConn->SetBackgroundColor(cr);
 				break;
-		case 1:	pscopeDL->SetGridColor(cr);
+		case 1:	
+				pscopeDL->SetGridColor(cr);
 				pscopeUL->SetGridColor(cr);
 				pscopeConn->SetGridColor(cr);
 				break;
@@ -143,12 +144,11 @@
 		case 5:  case 6:  case 7:	
 		case 8:  case 9:  case 10:
 				(*ppscope)->SetPlotColor(cr, iTrend);
-				if ((ctrl= CastChild(iRes, CColorFrameCtrl)) == NULL) {
-					printf("CStatisticsDlg::ApplyStatsColor: control missing (%d)\n",iRes);
-					exit(1);
+				if ((ctrl = CastChild(iRes, CColorFrameCtrl)) == NULL) {
+					throw wxString(CFormat(wxT("CStatisticsDlg::ApplyStatsColor: control missing (%d)\n")) % iRes);
 				}
-				ctrl->SetBackgroundColor(cr);
-				ctrl->SetFrameColor((COLORREF)RGB(0,0,0));
+				ctrl->SetBackgroundBrushColour(cr);
+				ctrl->SetFrameBrushColour(*wxBLACK);
 				break;
 		default:
 				break; // ignore unknown index, like SysTray speedbar color
@@ -186,7 +186,7 @@
 		nScalePrev = nScale;
 		wxStaticText* label = CastChild( ID_ACTIVEC, wxStaticText );
 		
-		label->SetLabel(wxString::Format(_("Active connections (1:%u)"), nScale));
+		label->SetLabel(CFormat(_("Active connections (1:%u)")) % nScale);
 		label->GetParent()->Layout();
 		
 		pscopeConn->SetRange(0.0, (float)nScale*pscopeConn->GetUpperLimit(), 1);
@@ -237,7 +237,10 @@
 
 void  CStatisticsDlg::InitTree()
 {
-	wxTreeItemId root=stattree->AddRoot(theStats::GetTreeRoot()->GetDisplayString());
+#ifndef CLIENT_GUI
+	wxTreeItemId root = 
+#endif
+		stattree->AddRoot(theStats::GetTreeRoot()->GetDisplayString());
 
 	ShowStatistics(true);
 
@@ -311,6 +314,14 @@
 }
 
 
+#ifdef CLIENT_GUI
+void CStatisticsDlg::RebuildStatTreeRemote(const CECTag * tag)
+{
+	m_stats->RebuildStatTreeRemote(tag);
+}
+#endif
+
+
 void CStatisticsDlg::FillTree(CStatTreeItemBase* statssubtree, wxTreeItemId& StatsGUITree, const NodeIdSet& expandednodes)
 {
 	wxMutexLocker lock(statssubtree->GetLock());

aMule-2.2.6.tar.bz2/src/StatisticsDlg.h -> aMule-2.3.1.tar.bz2/src/StatisticsDlg.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,15 +27,16 @@
 #define STATISTICSDLG_H
 
 #include <wx/panel.h>		// Needed for wxPanel
+#include <wx/colour.h>
 
 #include <set>			// Needed for std::set
 
 typedef std::set<uint32_t>	NodeIdSet;
 
-
 class COScopeCtrl;
 class CStatistics;
 class CStatTreeItemBase;
+class CECTag;
 class wxTreeCtrl;
 class wxTreeItemId;
 //struct UpdateInfo;
@@ -63,12 +64,13 @@
 	void InitTree();
 	void InitGraphs();
 	void ApplyStatsColor(int index);
-	static COLORREF getColors(unsigned num);	
+	void RebuildStatTreeRemote(const CECTag *);
+	static const wxColour& getColors(unsigned num);	
 	COScopeCtrl* GetDLScope() { return pscopeDL; };
 	COScopeCtrl* GetConnScope() { return pscopeConn; };
 
 protected:
-	static COLORREF	acrStat[15];
+	static wxColour acrStat[15];
 	COScopeCtrl* pscopeDL,*pscopeUL,*pscopeConn;
 	wxTreeCtrl* stattree;
 	CStatistics* m_stats;

aMule-2.2.6.tar.bz2/src/Tag.cpp -> aMule-2.3.1.tar.bz2/src/Tag.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -26,11 +26,12 @@
 
 #include "Tag.h"				// Interface declarations
 
+#include <common/Format.h>		// Needed for WXLONGLONGFMTSPEC
 
 #include "SafeFile.h"		// Needed for CFileDataIO
 #include "MD4Hash.h"			// Needed for CMD4Hash
 
-#if defined(__SUNPRO_CC)
+#ifdef __SUNPRO_CC
 #define __FUNCTION__ __FILE__+__LINE__
 #endif
 
@@ -77,7 +78,7 @@
 		m_pData = new unsigned char[rTag.GetBsobSize()];
 		memcpy(m_pData, rTag.GetBsob(), rTag.GetBsobSize());
 	} else {
-		wxASSERT(0);
+		wxFAIL;
 		m_uVal = 0;
 	}
 }
@@ -177,7 +178,7 @@
 				} else {
 					// Since we cannot determine the length of this tag, we
 					// simply have to abort reading the file.
-					throw CInvalidPacket(wxString::Format(wxT("Unknown tag type encounted %x, cannot proceed!"),m_uType));
+					throw CInvalidPacket(CFormat(wxT("Unknown tag type encounted %x, cannot proceed!")) % m_uType);
 				}
 		}
 	} catch (...) {
@@ -234,7 +235,7 @@
 			m_pData = p;
 			memcpy(m_pData, rhs.GetBsob(), rhs.GetBsobSize());
 		} else {
-			wxASSERT(0);
+			wxFAIL;
 			m_uVal = 0;
 		}
 	}
@@ -383,7 +384,7 @@
 				data->WriteString(*m_pstrVal,eStrEncode,0); 
 			} else {
 				printf("%s; Unknown tag: type=0x%02X\n", __FUNCTION__, uType);
-				wxASSERT(0);
+				wxFAIL;
 				return false;
 			}
 			break;
@@ -416,14 +417,14 @@
 	if (!m_Name.IsEmpty()) {
 		// Special case: Kad tags, and some ED2k tags ...
 		if (m_Name.Length() == 1) {
-			strTag = wxString::Format(wxT("0x%02X"), m_Name[0]);
+			strTag = CFormat(wxT("0x%02X")) % (unsigned)m_Name[0];
 		} else {
 			strTag = wxT('\"');
 			strTag += m_Name;
 			strTag += wxT('\"');
 		}
 	} else {
-		strTag = wxString::Format(wxT("0x%02X"), m_uName);
+		strTag = CFormat(wxT("0x%02X")) % m_uName;
 	}
 	strTag += wxT("=");
 	if (m_uType == TAGTYPE_STRING) {
@@ -431,24 +432,24 @@
 		strTag += *m_pstrVal;
 		strTag += wxT("\"");
 	} else if (m_uType >= TAGTYPE_STR1 && m_uType <= TAGTYPE_STR16) {
-		strTag += wxString::Format(wxT("(Str%u)\""), m_uType - TAGTYPE_STR1 + 1)
+		strTag += CFormat(wxT("(Str%u)\"")) % (m_uType - TAGTYPE_STR1 + 1)
 					+  *m_pstrVal + wxT("\"");
 	} else if (m_uType == TAGTYPE_UINT64) {
-		strTag += wxString::Format(wxT("(Int64)%") wxLongLongFmtSpec wxT("u"), m_uVal);
+		strTag += CFormat(wxT("(Int64)%u")) % m_uVal;
 	} else if (m_uType == TAGTYPE_UINT32) {
-		strTag += wxString::Format(wxT("(Int32)%u"), (unsigned)m_uVal);
+		strTag += CFormat(wxT("(Int32)%u")) % m_uVal;
 	} else if (m_uType == TAGTYPE_UINT16) {
-		strTag += wxString::Format(wxT("(Int16)%u"), (unsigned)m_uVal);
+		strTag += CFormat(wxT("(Int16)%u")) % m_uVal;
 	} else if (m_uType == TAGTYPE_UINT8) {
-		strTag += wxString::Format(wxT("(Int8)%u"), (unsigned)m_uVal);
+		strTag += CFormat(wxT("(Int8)%u")) % m_uVal;
 	} else if (m_uType == TAGTYPE_FLOAT32) {
-		strTag += wxString::Format(wxT("(Float32)%f"), m_fVal);
+		strTag += CFormat(wxT("(Float32)%f")) % m_fVal;
 	} else if (m_uType == TAGTYPE_BLOB) {
-		strTag += wxString::Format(wxT("(Blob)%u"), m_nSize);
+		strTag += CFormat(wxT("(Blob)%u")) % m_nSize;
 	} else if (m_uType == TAGTYPE_BSOB) {
-		strTag += wxString::Format(wxT("(Bsob)%u"), m_nSize);
+		strTag += CFormat(wxT("(Bsob)%u")) % m_nSize;
 	} else {
-		strTag += wxString::Format(wxT("Type=%u"), m_uType);
+		strTag += CFormat(wxT("Type=%u")) % m_uType;
 	}
 	return strTag;
 }
@@ -467,10 +468,6 @@
 
 void deleteTagPtrListEntries(TagPtrList* taglist)
 {
-	TagPtrList::const_iterator it;
-	for (it = taglist->begin(); it != taglist->end(); it++) {
-		delete *it;
-	}
-	taglist->clear();
+	DeleteContents(*taglist);
 }
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/Tag.h -> aMule-2.3.1.tar.bz2/src/Tag.h Changed

aMule-2.2.6.tar.bz2/src/TerminationProcess.cpp -> aMule-2.3.1.tar.bz2/src/TerminationProcess.cpp Changed

aMule-2.2.6.tar.bz2/src/TerminationProcess.h -> aMule-2.3.1.tar.bz2/src/TerminationProcess.h Changed

aMule-2.2.6.tar.bz2/src/TerminationProcessAmuleweb.cpp -> aMule-2.3.1.tar.bz2/src/TerminationProcessAmuleweb.cpp Changed

aMule-2.2.6.tar.bz2/src/TerminationProcessAmuleweb.h -> aMule-2.3.1.tar.bz2/src/TerminationProcessAmuleweb.h Changed

aMule-2.2.6.tar.bz2/src/TextClient.cpp -> aMule-2.3.1.tar.bz2/src/TextClient.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 Angel Vidal (Kry) ( kry@amule.org / http://www.amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Angel Vidal ( kry@amule.org )
+// 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
@@ -74,7 +74,8 @@
 	CMD_ID_DISCONNECT_ED2K,
 	CMD_ID_DISCONNECT_KAD,
 	CMD_ID_RELOAD_SHARED,
-	CMD_ID_RELOAD_IPFILTER,
+	CMD_ID_RELOAD_IPFILTER_LOCAL,
+	CMD_ID_RELOAD_IPFILTER_NET,
 	CMD_ID_SET_IPFILTER_ON,
 	CMD_ID_SET_IPFILTER_OFF,
  	CMD_ID_SET_IPFILTER_CLIENTS_ON,
@@ -128,7 +129,7 @@
 
 void CamulecmdApp::OnInitCmdLine(wxCmdLineParser& parser)
 {
-	CaMuleExternalConnector::OnInitCmdLine(parser);
+	CaMuleExternalConnector::OnInitCmdLine(parser, "amulecmd");
 	parser.AddOption(wxT("c"), wxT("command"), 
 		_("Execute <str> and exit."), 
 		wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
@@ -137,6 +138,13 @@
 bool CamulecmdApp::OnCmdLineParsed(wxCmdLineParser& parser)
 {
 	m_HasCmdOnCmdLine = parser.Found(wxT("command"), &m_CmdString);
+	if (m_CmdString.Lower().StartsWith(wxT("help")))
+	{
+		OnInitCommandSet();
+		printf("%s %s\n", m_appname, (const char *)unicode2char(GetMuleVersion()));
+		Parse_Command(m_CmdString);
+		exit(0);
+	}
 	m_interactive = !m_HasCmdOnCmdLine;
 	return CaMuleExternalConnector::OnCmdLineParsed(parser);
 }
@@ -240,10 +248,16 @@
 			request_list.push_back(new CECPacket(EC_OP_SHAREDFILES_RELOAD));
 			break;
 
-		case CMD_ID_RELOAD_IPFILTER:
+		case CMD_ID_RELOAD_IPFILTER_LOCAL:
 			request_list.push_back(new CECPacket(EC_OP_IPFILTER_RELOAD));
 			break;
 
+		case CMD_ID_RELOAD_IPFILTER_NET:
+			request = new CECPacket(EC_OP_IPFILTER_UPDATE);
+			request->AddTag(EC_TAG_STRING, args);
+			request_list.push_back(request);
+			break;
+
 		case CMD_ID_SET_IPFILTER_ON:
 		case CMD_ID_SET_IPFILTER_CLIENTS_ON:
 		case CMD_ID_SET_IPFILTER_SERVERS_ON:
@@ -318,15 +332,15 @@
 				const CECPacket *reply_all = SendRecvMsg_v2(&request_all);
 
 				if (reply_all) { 
-                                        switch(CmdId) {
-                                                case CMD_ID_PAUSE:
-                                                        request = new CECPacket(EC_OP_PARTFILE_PAUSE); break;
-                                                case CMD_ID_CANCEL:
-                                                        request = new CECPacket(EC_OP_PARTFILE_DELETE); break;
-                                                case CMD_ID_RESUME:
-                                                        request = new CECPacket(EC_OP_PARTFILE_RESUME); break;
-                                                default: wxASSERT(0);
-                                        }
+					switch(CmdId) {
+						case CMD_ID_PAUSE:
+								request = new CECPacket(EC_OP_PARTFILE_PAUSE); break;
+						case CMD_ID_CANCEL:
+								request = new CECPacket(EC_OP_PARTFILE_DELETE); break;
+						case CMD_ID_RESUME:
+								request = new CECPacket(EC_OP_PARTFILE_RESUME); break;
+						default: wxFAIL;
+					}
 
 					// We loop through all the arguments
 					while(argsTokenizer.HasMoreTokens()) {
@@ -335,33 +349,29 @@
 						// If the user requested all, then we select all files and exit the loop
 						// since there is little point to add anything more to "everything"
 						if( token == wxT("all") ) {
-							for(int i = 0;i < reply_all->GetTagCount();i++) {
-	                                                	const CECTag *tag = reply_all->GetTagByIndex(i);
-	                                                	if (tag) {
-	                                                        	request->AddTag(CECTag(EC_TAG_PARTFILE, tag->GetMD4Data()));
-	                                                	}
-								break;
+							for (CECPacket::const_iterator it = reply_all->begin(); it != reply_all->end(); it++) {
+								CEC_PartFile_Tag *tag = (CEC_PartFile_Tag *) & *it;
+								request->AddTag(CECTag(EC_TAG_PARTFILE, tag->FileHash()));
 							}
-	                                        } else if ( hash.Decode(token.Trim(false).Trim(true)) ) {
+							break;
+						} else if ( hash.Decode(token.Trim(false).Trim(true)) ) {
 							if ( !hash.IsEmpty() ) {
 								Show(_("Processing by hash: "+token+wxT("\n")));
 								request->AddTag(CECTag(EC_TAG_PARTFILE, hash));
 							}
 						} else {
 							 // Go through the dl queue and look at each filename
-							for(int i = 0; i < reply_all->GetTagCount(); i++) {
-								CEC_PartFile_Tag *tag = (CEC_PartFile_Tag *)reply_all->GetTagByIndex(i);
-								if (tag) {
-									wxString partmetname = tag->PartMetName();
+							for (CECPacket::const_iterator it = reply_all->begin(); it != reply_all->end(); it++) {
+								CEC_PartFile_Tag *tag = (CEC_PartFile_Tag *) & *it;
+								wxString partmetname = tag->PartMetName();
 
-									// We check for filename, XXX.pat.met, XXX.part, XXX
-									if( tag->FileName() == token ||
+								// We check for filename, XXX.pat.met, XXX.part, XXX
+								if( tag->FileName() == token ||
 									partmetname == token ||
 									partmetname.Truncate(partmetname.Len()-4) == token ||
 									partmetname.Truncate(partmetname.Len()-5) == token) {
-										Show(_("Processing by filename: "+token+wxT("\n")));
-										request->AddTag(CECTag(EC_TAG_PARTFILE, tag->GetMD4Data()));
-									}	
+									Show(_("Processing by filename: "+token+wxT("\n")));
+									request->AddTag(CECTag(EC_TAG_PARTFILE, tag->FileHash()));
 								}		
 							}	
 						} // End of filename check else	
@@ -403,7 +413,7 @@
 							case CMD_ID_PRIORITY_AUTO:
 								hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)PR_AUTO));
 								break;
-							default: wxASSERT(0);
+							default: wxFAIL;
 						}
 						request->AddTag(hashtag);
 						request_list.push_back(request);
@@ -439,11 +449,15 @@
 			break;
 
 		case CMD_ID_ADDLINK:
-			if (args.compare(0, 7, wxT("ed2k://")) == 0) {
+			if (args.StartsWith(wxT("ed2k://"))) {
 				//aMule doesn't like AICH links without |/| in front of h=
 				if (args.Find(wxT("|h=")) > -1 && args.Find(wxT("|/|h=")) == -1) {
 					args.Replace(wxT("|h="),wxT("|/|h="));
 				}
+				// repair links where | is replaced with %7C (Firefox)
+				if (args.StartsWith(wxT("ed2k://%7C"))) {
+					args.Replace(wxT("%7C"),wxT("|"));
+				}
 			}
 			request = new CECPacket(EC_OP_ADD_LINK);
 			request->AddTag(CECTag(EC_TAG_STRING, args));
@@ -503,8 +517,8 @@
 			if (!args.IsEmpty()) 
 			{	
 				wxString search = args; 
-				wxString type =  wxT("");
-				wxString extention = wxT(""); 
+				wxString type;
+				wxString extention; 
 				uint32 avail = 0; 
 				uint32 min_size = 0; 
 				uint32 max_size = 0;
@@ -558,6 +572,11 @@
 		std::list<CECPacket *>::iterator it = request_list.begin();
 		while ( it != request_list.end() ) {
 			CECPacket *curr = *it++;
+			if (curr->GetOpCode() == EC_OP_SHUTDOWN) {
+				SendPacket(curr);
+				delete curr;
+				return CMD_ID_QUIT;
+			}
 			const CECPacket *reply = SendRecvMsg_v2(curr);
 			delete curr;
 			if ( reply ) {
@@ -568,10 +587,7 @@
 		request_list.resize(0);
 	}
 
-	if (CmdId == CMD_ID_SHUTDOWN)
-		return CMD_ID_QUIT;
-	else
-		return CMD_OK;
+	return CMD_OK;
 }
 
  /*
@@ -609,8 +625,8 @@
 		return wxEmptyString;
 	}
 	wxString result = wxString(wxChar(' '), depth) + tree->GetDisplayString() + wxT("\n");
-	for (int i = 0; i < tree->GetTagCount(); ++i) {
-		CEC_StatTree_Node_Tag *tmp = (CEC_StatTree_Node_Tag*)tree->GetTagByIndex(i);
+	for (CECTag::const_iterator it = tree->begin(); it != tree->end(); it++) {
+		CEC_StatTree_Node_Tag *tmp = (CEC_StatTree_Node_Tag*) & *it;
 		if (tmp->GetTagName() == EC_TAG_STATTREE_NODE) {
 			result += StatTree2Text(tmp, depth + 1);
 		}
@@ -631,15 +647,13 @@
 			s << _("Operation was successful.");
 			break;
 		case EC_OP_FAILED:
-			if (response->GetTagCount()) {
-				const CECTag *tag = response->GetTagByIndex(0);
-				if (tag) {
+			{
+				const CECTag *tag = response->GetFirstTagSafe();
+				if (tag->IsString()) {
 					s <<	CFormat(_("Request failed with the following error: %s")) % wxGetTranslation(tag->GetStringData());
 				} else {
 					s << msgFailedUnknown;
 				}
-			} else {
-				s << msgFailedUnknown;
 			}
 			break;
 		case EC_OP_SET_PREFERENCES:
@@ -650,14 +664,14 @@
 					if (m_last_cmd_id == CMD_ID_GET_IPFILTER ||
 					    m_last_cmd_id == CMD_ID_GET_IPFILTER_STATE ||
 					    m_last_cmd_id == CMD_ID_GET_IPFILTER_STATE_CLIENTS) {
-						s << wxString::Format(_("IP filtering for clients is %s.\n"),
-								      (tab->GetTagByName(EC_TAG_IPFILTER_CLIENTS) == NULL) ? _("OFF") : _("ON"));
+						s += CFormat(_("IP filtering for clients is %s.\n"))
+								% ((tab->GetTagByName(EC_TAG_IPFILTER_CLIENTS) == NULL) ? _("OFF") : _("ON"));
 					}
 					if (m_last_cmd_id == CMD_ID_GET_IPFILTER ||
 					    m_last_cmd_id == CMD_ID_GET_IPFILTER_STATE ||
 					    m_last_cmd_id == CMD_ID_GET_IPFILTER_STATE_SERVERS) {
-						s << wxString::Format(_("IP filtering for servers is %s.\n"),
-								      (tab->GetTagByName(EC_TAG_IPFILTER_SERVERS) == NULL) ? _("OFF") : _("ON"));
+						s += CFormat(_("IP filtering for servers is %s.\n"))
+								% ((tab->GetTagByName(EC_TAG_IPFILTER_SERVERS) == NULL) ? _("OFF") : _("ON"));
 					}
 					if (m_last_cmd_id == CMD_ID_GET_IPFILTER ||
 					    m_last_cmd_id == CMD_ID_GET_IPFILTER_LEVEL) {
@@ -674,12 +688,9 @@
 			}
 			break;
 		case EC_OP_STRINGS:
-			for (int i = 0; i < response->GetTagCount(); ++i) {
-				const CECTag *tag = response->GetTagByIndex(i);
-				if (tag) {
-					s << tag->GetStringData() << wxT("\n");
-				} else {
-				}
+			for (CECPacket::const_iterator it = response->begin(); it != response->end(); it++) {
+				const CECTag &tag = *it;
+				s << tag.GetStringData() << wxT("\n");
 			}
 			break;
 		case EC_OP_STATS: {
@@ -734,43 +745,40 @@
 			break;
 		}
 		case EC_OP_DLOAD_QUEUE:
-			for(int i = 0; i < response->GetTagCount(); ++i) {
-				CEC_PartFile_Tag *tag =
-					(CEC_PartFile_Tag *)response->GetTagByIndex(i);
-				if (tag) {
+			for (CECPacket::const_iterator it = response->begin(); it != response->end(); it++) {
+				CEC_PartFile_Tag *tag =	(CEC_PartFile_Tag *) & *it;
 					uint64 filesize, donesize;
 					filesize = tag->SizeFull();
 					donesize = tag->SizeDone();
 					s <<	tag->FileHashString() << wxT(" ") <<
 						tag->FileName() <<
-						wxString::Format(wxT("\n\t [%.1f%%] %4i/%4i "),
-							((float)donesize) / ((float)filesize)*100.0,
-							(int)tag->SourceCount() - (int)tag->SourceNotCurrCount(),
-							(int)tag->SourceCount()) <<
-							((int)tag->SourceCountA4AF() ? wxString::Format(wxT("+%2.2i "),(int)tag->SourceCountA4AF()) : wxString(wxT("    "))) <<
-							((int)tag->SourceXferCount() ? wxString::Format(wxT("(%2.2i) - "),(int)tag->SourceXferCount()) : wxString(wxT("     - "))) <<
+						(CFormat(wxT("\n\t [%.1f%%] %4i/%4i "))
+							% ((float)donesize / ((float)filesize)*100.0)
+							% ((int)tag->SourceCount() - (int)tag->SourceNotCurrCount())
+							% (int)tag->SourceCount()) <<
+						((int)tag->SourceCountA4AF() ? wxString(CFormat(wxT("+%2.2i ")) % (int)tag->SourceCountA4AF()) : wxString(wxT("    "))) <<
+						((int)tag->SourceXferCount() ? wxString(CFormat(wxT("(%2.2i) - ")) % (int)tag->SourceXferCount()) : wxString(wxT("     - "))) <<
 						tag->GetFileStatusString();
-						s << wxT(" - ") << tag->PartMetName();
-                                                if (tag->Prio() < 10) {
-                                                        s << wxT(" - ") << PriorityToStr((int)tag->Prio(), 0);
-                                                } else {
-                                                        s << wxT(" - ") << PriorityToStr((tag->Prio() - 10), 1);
-                                                }
-						if ( tag->SourceXferCount() > 0) {
-							s << wxT(" - ") + CastItoSpeed(tag->Speed());
-						}
+					s << wxT(" - ") << tag->PartMetName();
+                    if (tag->DownPrio() < 10) {
+                            s << wxT(" - ") << PriorityToStr((int)tag->DownPrio(), 0);
+                    } else {
+                            s << wxT(" - ") << PriorityToStr((tag->DownPrio() - 10), 1);
+                    }
+					if ( tag->SourceXferCount() > 0) {
+						s << wxT(" - ") + CastItoSpeed(tag->Speed());
+					}
 					s << wxT("\n");
-				}
 			}
 			break;
 		case EC_OP_ULOAD_QUEUE:
-			for(int i = 0; i < response->GetTagCount(); ++i) {
-				const CECTag *tag = response->GetTagByIndex(i);
-				const CECTag *clientName = tag ? tag->GetTagByName(EC_TAG_CLIENT_NAME) : NULL;
-				const CECTag *partfileName = tag ? tag->GetTagByName(EC_TAG_PARTFILE_NAME) : NULL;
-				const CECTag *partfileSizeXfer = tag ? tag->GetTagByName(EC_TAG_PARTFILE_SIZE_XFER) : NULL;
-				const CECTag *partfileSpeed = tag ? tag->GetTagByName(EC_TAG_CLIENT_UP_SPEED) : NULL;
-				if (tag && clientName && partfileName && partfileSizeXfer && partfileSpeed) {
+			for (CECPacket::const_iterator it = response->begin(); it != response->end(); it++) {
+				const CECTag *tag = & *it;
+				const CECTag *clientName = tag->GetTagByName(EC_TAG_CLIENT_NAME);
+				const CECTag *partfileName = tag->GetTagByName(EC_TAG_PARTFILE_NAME);
+				const CECTag *partfileSizeXfer = tag->GetTagByName(EC_TAG_PARTFILE_SIZE_XFER);
+				const CECTag *partfileSpeed = tag->GetTagByName(EC_TAG_CLIENT_UP_SPEED);
+				if (clientName && partfileName && partfileSizeXfer && partfileSpeed) {
 					s <<	wxT("\n") <<
 						CFormat(wxT("%10u ")) % tag->GetInt() <<
 						clientName->GetStringData() << wxT(" ") <<
@@ -781,20 +789,17 @@
 			}
 			break;
 		case EC_OP_LOG:
-			for (int i = 0; i < response->GetTagCount(); ++i) {
-				const CECTag *tag = response->GetTagByIndex(i);
-				if (tag) {
-					s << tag->GetStringData() << wxT("\n");
-				} else {
-				}
+			for (CECPacket::const_iterator it = response->begin(); it != response->end(); it++) {
+				const CECTag &tag = *it;
+				s << tag.GetStringData() << wxT("\n");
 			}
 			break;
 		case EC_OP_SERVER_LIST:
-			for(int i = 0; i < response->GetTagCount(); i ++) {
-				const CECTag *tag = response->GetTagByIndex(i);
-				const CECTag *serverName = tag ? tag->GetTagByName(EC_TAG_SERVER_NAME) : NULL;
-				if (tag && serverName) {
-					wxString ip = tag->GetIPv4Data().StringIP();
+			for (CECPacket::const_iterator it = response->begin(); it != response->end(); it++) {
+				const CECTag &tag = *it;
+				const CECTag *serverName = tag.GetTagByName(EC_TAG_SERVER_NAME);
+				if (serverName) {
+					wxString ip = tag.GetIPv4Data().StringIP();
 					ip.Append(' ', 24 - ip.Length());
 					s << ip << serverName->GetStringData() << wxT("\n");
 				}
@@ -805,27 +810,31 @@
 			break;
 
 		case EC_OP_SEARCH_RESULTS:
+		{
+			int i = 0;
 			m_Results_map.clear();
-			s << CFormat(_("Number of search results: %i\n")) % response->GetTagCount();
-			for (int i = 0;i < response->GetTagCount();i++) {
-				CEC_SearchFile_Tag *tag = (CEC_SearchFile_Tag *)response->GetTagByIndex(i);
+			s += CFormat(_("Number of search results: %i\n")) % response->GetTagCount();
+			for (CECPacket::const_iterator it = response->begin(); it != response->end(); it++) {
+				CEC_SearchFile_Tag *tag = (CEC_SearchFile_Tag *) & *it;
 				//printf("Tag FileName: %s \n",(const char*)unicode2char(tag->FileName()));
-				//if (tag != NULL)
-					m_Results_map[i] = new SearchFile(tag);
-				//const CECTag *tag = response->GetTagByIndex(i);
-				
+				m_Results_map[i++] = new SearchFile(tag);
 			}
 			ShowResults(m_Results_map);
 			break;
-
+		}
 		case EC_OP_SEARCH_PROGRESS:
-			s << _("TODO - show progress of a search");
-			// gives compilation error!!
-			// const CECTag *tab = response->GetTagByNameSafe(EC_TAG_SEARCH_STATUS);
-			//s << wxString::Format(_("Search progress: %u %% \n"),(const char*)unicode2char(tab->GetStringData()));
+		{
+			const CECTag *tab = response->GetTagByNameSafe(EC_TAG_SEARCH_STATUS);
+			uint32 progress = tab->GetInt();
+			if (progress <= 100) {
+				s += CFormat(_("Search progress: %u %% \n")) % progress;
+			} else {
+				s += _("Search progress not available");
+			}
 			break;
+		}
 		default:
-			s << wxString::Format(_("Received an unknown reply from the server, OpCode = %#x."), response->GetOpCode());
+			s += CFormat(_("Received an unknown reply from the server, OpCode = %#x.")) % response->GetOpCode();
 	}
 	Process_Answer(s);
 }
@@ -847,9 +856,13 @@
 	m_commands.AddCommand(wxT("Shutdown"), CMD_ID_SHUTDOWN, wxTRANSLATE("Shut down aMule."),
 			      wxTRANSLATE("Shut down the remote running core (amule/amuled).\nThis will also shut down the text client, since it is unusable without a\nrunning core.\n"), CMD_PARAM_NEVER);
 
-	tmp = m_commands.AddCommand(wxT("Reload"), CMD_ERR_INCOMPLETE, wxTRANSLATE("Reloads the given object."), wxEmptyString, CMD_PARAM_NEVER);
-	tmp->AddCommand(wxT("Shared"), CMD_ID_RELOAD_SHARED, wxTRANSLATE("Reloads shared files list."), wxEmptyString, CMD_PARAM_NEVER);
-	tmp->AddCommand(wxT("IPFilter"), CMD_ID_RELOAD_IPFILTER, wxTRANSLATE("Reloads IP Filter table from file."), wxEmptyString, CMD_PARAM_NEVER);
+	tmp = m_commands.AddCommand(wxT("Reload"), CMD_ERR_INCOMPLETE, wxTRANSLATE("Reload the given object."), wxEmptyString, CMD_PARAM_NEVER);
+	tmp->AddCommand(wxT("Shared"), CMD_ID_RELOAD_SHARED, wxTRANSLATE("Reload shared files list."), wxEmptyString, CMD_PARAM_NEVER);
+
+	tmp2 = tmp->AddCommand(wxT("IPFilter"), CMD_ID_RELOAD_IPFILTER_LOCAL, wxTRANSLATE("Reload IP filtering table."), wxEmptyString, CMD_PARAM_OPTIONAL);
+	tmp2->AddCommand(wxT("File"), CMD_ID_RELOAD_IPFILTER_LOCAL, wxTRANSLATE("Reload current IP filtering table."), wxEmptyString, CMD_PARAM_NEVER);
+	tmp2->AddCommand(wxT("Net"), CMD_ID_RELOAD_IPFILTER_NET, wxTRANSLATE("Update IP filtering table from URL."), 
+					wxTRANSLATE("If URL is omitted the URL from the preferences is used."), CMD_PARAM_OPTIONAL);
 
 	tmp = m_commands.AddCommand(wxT("Connect"), CMD_ID_CONNECT, wxTRANSLATE("Connect to the network."),
 				    wxTRANSLATE("This will connect to all networks that are enabled in Preferences.\nYou may also optionally specify a server address in IP:Port form, to connect to\nthat server only. The IP must be a dotted decimal IPv4 address,\nor a resolvable DNS name."), CMD_PARAM_OPTIONAL);
@@ -861,13 +874,13 @@
 	tmp->AddCommand(wxT("ED2K"), CMD_ID_DISCONNECT_ED2K, wxTRANSLATE("Disconnect from eD2k only."), wxEmptyString, CMD_PARAM_NEVER);
 	tmp->AddCommand(wxT("Kad"), CMD_ID_DISCONNECT_KAD, wxTRANSLATE("Disconnect from Kad only."), wxEmptyString, CMD_PARAM_NEVER);
 
- 	m_commands.AddCommand(wxT("Add"), CMD_ID_ADDLINK, wxTRANSLATE("Adds an eD2k or magnet link to core."),
+ 	m_commands.AddCommand(wxT("Add"), CMD_ID_ADDLINK, wxTRANSLATE("Add an eD2k or magnet link to core."),
 			      wxTRANSLATE("The eD2k link to be added can be:\n*) a file link (ed2k://|file|...), it will be added to the download queue,\n*) a server link (ed2k://|server|...), it will be added to the server list,\n*) or a serverlist link, in which case all servers in the list will be added to the\n   server list.\n\nThe magnet link must contain the eD2k hash and file length.\n"), CMD_PARAM_ALWAYS);
 
 	tmp = m_commands.AddCommand(wxT("Set"), CMD_ERR_INCOMPLETE, wxTRANSLATE("Set a preference value."),
 				    wxEmptyString, CMD_PARAM_NEVER);
 
-	tmp2 = tmp->AddCommand(wxT("IPFilter"), CMD_ERR_INCOMPLETE, wxTRANSLATE("Set IPFilter preferences."), wxEmptyString, CMD_PARAM_NEVER);
+	tmp2 = tmp->AddCommand(wxT("IPFilter"), CMD_ERR_INCOMPLETE, wxTRANSLATE("Set IP filtering preferences."), wxEmptyString, CMD_PARAM_NEVER);
 	tmp2->AddCommand(wxT("On"), CMD_ID_SET_IPFILTER_ON, wxTRANSLATE("Turn IP filtering on for both clients and servers."), wxEmptyString, CMD_PARAM_NEVER);
 	tmp2->AddCommand(wxT("Off"), CMD_ID_SET_IPFILTER_OFF, wxTRANSLATE("Turn IP filtering off for both clients and servers."), wxEmptyString, CMD_PARAM_NEVER);
 	tmp3 = tmp2->AddCommand(wxT("Clients"), CMD_ERR_INCOMPLETE, wxTRANSLATE("Enable/Disable IP filtering for clients."), wxEmptyString, CMD_PARAM_NEVER);
@@ -889,25 +902,25 @@
 	tmp = m_commands.AddCommand(wxT("Get"), CMD_ERR_INCOMPLETE, wxTRANSLATE("Get and display a preference value."),
 				    wxEmptyString, CMD_PARAM_NEVER);
 
-	tmp2 = tmp->AddCommand(wxT("IPFilter"), CMD_ID_GET_IPFILTER, wxTRANSLATE("Get IPFilter preferences."), wxEmptyString, CMD_PARAM_NEVER);
-	tmp3 = tmp2->AddCommand(wxT("State"), CMD_ID_GET_IPFILTER_STATE, wxTRANSLATE("Get IPFilter state for both clients and servers."), wxEmptyString, CMD_PARAM_NEVER);
-	tmp3->AddCommand(wxT("Clients"), CMD_ID_GET_IPFILTER_STATE_CLIENTS, wxTRANSLATE("Get IPFilter state for clients only."), wxEmptyString, CMD_PARAM_NEVER);
-	tmp3->AddCommand(wxT("Servers"), CMD_ID_GET_IPFILTER_STATE_SERVERS, wxTRANSLATE("Get IPFilter state for servers only."), wxEmptyString, CMD_PARAM_NEVER);
-	tmp2->AddCommand(wxT("Level"), CMD_ID_GET_IPFILTER_LEVEL, wxTRANSLATE("Get IPFilter level."), wxEmptyString, CMD_PARAM_NEVER);
+	tmp2 = tmp->AddCommand(wxT("IPFilter"), CMD_ID_GET_IPFILTER, wxTRANSLATE("Get IP filtering preferences."), wxEmptyString, CMD_PARAM_NEVER);
+	tmp3 = tmp2->AddCommand(wxT("State"), CMD_ID_GET_IPFILTER_STATE, wxTRANSLATE("Get IP filtering state for both clients and servers."), wxEmptyString, CMD_PARAM_NEVER);
+	tmp3->AddCommand(wxT("Clients"), CMD_ID_GET_IPFILTER_STATE_CLIENTS, wxTRANSLATE("Get IP filtering state for clients only."), wxEmptyString, CMD_PARAM_NEVER);
+	tmp3->AddCommand(wxT("Servers"), CMD_ID_GET_IPFILTER_STATE_SERVERS, wxTRANSLATE("Get IP filtering state for servers only."), wxEmptyString, CMD_PARAM_NEVER);
+	tmp2->AddCommand(wxT("Level"), CMD_ID_GET_IPFILTER_LEVEL, wxTRANSLATE("Get IP filtering level."), wxEmptyString, CMD_PARAM_NEVER);
 
 	tmp->AddCommand(wxT("BwLimits"), CMD_ID_GET_BWLIMITS, wxTRANSLATE("Get bandwidth limits."), wxEmptyString, CMD_PARAM_NEVER);
 
-	tmp = m_commands.AddCommand(wxT("Search"), CMD_ID_SEARCH, wxTRANSLATE("Makes a search."),
+	tmp = m_commands.AddCommand(wxT("Search"), CMD_ID_SEARCH, wxTRANSLATE("Execute a search."),
 			      wxTRANSLATE("A search type has to be specified by giving the type:\n    GLOBAL\n    LOCAL\n    KAD\nExample: 'search kad file' will execute a kad search for \"file\".\n"), CMD_PARAM_ALWAYS);
-	tmp->AddCommand(wxT("global"), CMD_ID_SEARCH_GLOBAL, wxTRANSLATE("Executes a global search."), wxEmptyString, CMD_PARAM_ALWAYS);
-	tmp->AddCommand(wxT("local"), CMD_ID_SEARCH_LOCAL, wxTRANSLATE("Executes a local search"), wxEmptyString, CMD_PARAM_ALWAYS);
-	tmp->AddCommand(wxT("kad"), CMD_ID_SEARCH_KAD, wxTRANSLATE("Executes a kad search"), wxEmptyString, CMD_PARAM_ALWAYS);
+	tmp->AddCommand(wxT("global"), CMD_ID_SEARCH_GLOBAL, wxTRANSLATE("Execute a global search."), wxEmptyString, CMD_PARAM_ALWAYS);
+	tmp->AddCommand(wxT("local"), CMD_ID_SEARCH_LOCAL, wxTRANSLATE("Execute a local search"), wxEmptyString, CMD_PARAM_ALWAYS);
+	tmp->AddCommand(wxT("kad"), CMD_ID_SEARCH_KAD, wxTRANSLATE("Execute a kad search"), wxEmptyString, CMD_PARAM_ALWAYS);
 
-	m_commands.AddCommand(wxT("Results"), CMD_ID_SEARCH_RESULTS, wxTRANSLATE("Shows the results of the last search."),
-			      wxTRANSLATE("Returns the results of the previous search.\n"), CMD_PARAM_NEVER);
+	m_commands.AddCommand(wxT("Results"), CMD_ID_SEARCH_RESULTS, wxTRANSLATE("Show the results of the last search."),
+			      wxTRANSLATE("Return the results of the previous search.\n"), CMD_PARAM_NEVER);
 
-	m_commands.AddCommand(wxT("Progress"), CMD_ID_SEARCH_PROGRESS, wxTRANSLATE("Shows the progress of a search."),
-			      wxTRANSLATE("Shows the progress of a search.\n"), CMD_PARAM_NEVER);
+	m_commands.AddCommand(wxT("Progress"), CMD_ID_SEARCH_PROGRESS, wxTRANSLATE("Show the progress of a search."),
+			      wxTRANSLATE("Show the progress of a search.\n"), CMD_PARAM_NEVER);
 
 	m_commands.AddCommand(wxT("Download"), CMD_ID_DOWNLOAD, wxTRANSLATE("Start downloading a file"),
 			      wxTRANSLATE("The number of a file from the last search has to be given.\nExample: 'download 12' will start to download the file with the number 12 of the previous search.\n"), CMD_PARAM_ALWAYS);
@@ -934,7 +947,7 @@
 	tmp->AddCommand(wxT("Auto"), CMD_ID_PRIORITY_AUTO, wxTRANSLATE("Set priority to auto."), wxEmptyString, CMD_PARAM_ALWAYS);
 				  
 	tmp = m_commands.AddCommand(wxT("Show"), CMD_ERR_INCOMPLETE, wxTRANSLATE("Show queues/lists."),
-				    wxTRANSLATE("Shows upload/download queue, server list or shared files list.\n"), CMD_PARAM_NEVER);
+				    wxTRANSLATE("Show upload/download queue, server list or shared files list.\n"), CMD_PARAM_ALWAYS);
 	tmp->AddCommand(wxT("UL"), CMD_ID_SHOW_UL, wxTRANSLATE("Show upload queue."), wxEmptyString, CMD_PARAM_NEVER);
 	tmp->AddCommand(wxT("DL"), CMD_ID_SHOW_DL, wxTRANSLATE("Show download queue."), wxEmptyString, CMD_PARAM_NEVER);
 	tmp->AddCommand(wxT("Log"), CMD_ID_SHOW_LOG, wxTRANSLATE("Show log."), wxEmptyString, CMD_PARAM_NEVER);
@@ -967,4 +980,14 @@
 	ConnectAndRun(wxT("aMulecmd"), wxT(VERSION));
 	return 0;
 }
+
+// Dummy functions for EC logging
+bool ECLogIsEnabled()
+{
+	return false;
+}
+
+void DoECLogLine(const wxString &)
+{
+}
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/TextClient.h -> aMule-2.3.1.tar.bz2/src/TextClient.h Changed

aMule-2.2.6.tar.bz2/src/ThreadScheduler.cpp -> aMule-2.3.1.tar.bz2/src/ThreadScheduler.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2006-2009 Mikkel Schubert ( xaignar@amule.org / http://www.amule.org )
+// Copyright (c) 2006-2011 Mikkel Schubert ( xaignar@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
@@ -23,7 +23,7 @@
 //
 
 #include "ThreadScheduler.h"	// Interface declarations
-#include "Logger.h"				// Needed for Add(Debug)LogLineM
+#include "Logger.h"				// Needed for Add(Debug)LogLine{C,N}
 #include <common/Format.h>		// Needed for CFormat
 #include "ScopedPtr.h"			// Needed for CScopedPtr
 
@@ -76,7 +76,7 @@
 
 	// Ensures that a thread is started if tasks are already waiting.
 	if (s_scheduler) {
-		AddDebugLogLineM(false, logThreads, wxT("Starting scheduler"));
+		AddDebugLogLineN(logThreads, wxT("Starting scheduler"));
 		s_scheduler->CreateSchedulerThread();
 	}
 }
@@ -84,7 +84,7 @@
 
 void CThreadScheduler::Terminate()
 {
-	AddDebugLogLineM(false, logThreads, wxT("Terminating scheduler"));
+	AddDebugLogLineN(logThreads, wxT("Terminating scheduler"));
 	CThreadScheduler* ptr = NULL;
 
 	{	
@@ -98,7 +98,7 @@
 	}
 		
 	delete ptr;
-	AddDebugLogLineM(false, logThreads, wxT("Scheduler terminated"));
+	AddDebugLogLineN(logThreads, wxT("Scheduler terminated"));
 }
 
 
@@ -108,12 +108,12 @@
 
 	// When terminated (on shutdown), all tasks are ignored.
 	if (s_terminated) {
-		AddDebugLogLineM(false, logThreads, wxT("Task discared: ") + task->GetDesc());
+		AddDebugLogLineN(logThreads, wxT("Task discarded: ") + task->GetDesc());
 		delete task;
 		return false;
 	} else if (s_scheduler == NULL) {
 		s_scheduler = new CThreadScheduler();
-		AddDebugLogLineM(false, logThreads, wxT("Scheduler created."));
+		AddDebugLogLineN(logThreads, wxT("Scheduler created."));
 	}
 
 	return s_scheduler->DoAddTask(task, overwrite);
@@ -144,7 +144,7 @@
 
 	// A thread can only be run once, so the old one must be safely disposed of
 	if (m_thread) {
-		AddDebugLogLineM(false, logThreads, wxT("CreateSchedulerThread: Disposing of old thread."));
+		AddDebugLogLineN(logThreads, wxT("CreateSchedulerThread: Disposing of old thread."));
 		m_thread->Stop();
 		delete m_thread;
 	}
@@ -158,13 +158,13 @@
 		
 		err = m_thread->Run();
 		if (err == wxTHREAD_NO_ERROR) {
-			AddDebugLogLineM(false, logThreads, wxT("Scheduler thread started"));
+			AddDebugLogLineN(logThreads, wxT("Scheduler thread started"));
 			return;
 		} else {
-			AddDebugLogLineM(true, logThreads, wxT("Error while starting scheduler thread: ") + GetErrMsg(err));
+			AddDebugLogLineC(logThreads, wxT("Error while starting scheduler thread: ") + GetErrMsg(err));
 		}
 	} else {
-		AddDebugLogLineM(true, logThreads, wxT("Error while creating scheduler thread: ") + GetErrMsg(err));
+		AddDebugLogLineC(logThreads, wxT("Error while creating scheduler thread: ") + GetErrMsg(err));
 	}
 	
 	// Creation or running failed.
@@ -226,11 +226,11 @@
 	
 	CDescMap::value_type entry(task->GetDesc(), task);
 	if (map.insert(entry).second) {
-		AddDebugLogLineM(false, logThreads, wxT("Task scheduled: ") + task->GetType() + wxT(" - ") + task->GetDesc());
+		AddDebugLogLineN(logThreads, wxT("Task scheduled: ") + task->GetType() + wxT(" - ") + task->GetDesc());
 		m_tasks.push_back(CEntryPair(task, taskAge++));
 		m_tasksDirty = true;
 	} else if (overwrite) {
-		AddDebugLogLineM(false, logThreads, wxT("Task overwritten: ") + task->GetType() + wxT(" - ") + task->GetDesc());
+		AddDebugLogLineN(logThreads, wxT("Task overwritten: ") + task->GetType() + wxT(" - ") + task->GetDesc());
 
 		CThreadTask* existingTask = map[task->GetDesc()];
 		if (m_currentTask == existingTask) {
@@ -246,7 +246,7 @@
 		map[task->GetDesc()] = task;
 		m_tasksDirty = true;
 	} else {
-		AddDebugLogLineM(false, logThreads, wxT("Duplicate task, discarding: ") + task->GetType() + wxT(" - ") + task->GetDesc());
+		AddDebugLogLineN(logThreads, wxT("Duplicate task, discarding: ") + task->GetType() + wxT(" - ") + task->GetDesc());
 		delete task;
 		return false;
 	}
@@ -261,7 +261,7 @@
 
 void* CThreadScheduler::Entry()
 {
-	AddDebugLogLineM(false, logThreads, wxT("Entering scheduling loop"));
+	AddDebugLogLineN(logThreads, wxT("Entering scheduling loop"));
 	
 	while (!m_thread->TestDestroy()) {
 		CScopedPtr<CThreadTask> task(NULL);
@@ -271,11 +271,11 @@
 			
 			// Resort tasks by priority/age if list has been modified.
 			if (m_tasksDirty) {
-				AddDebugLogLineM(false, logThreads, wxT("Resorting tasks"));
+				AddDebugLogLineN(logThreads, wxT("Resorting tasks"));
 				std::sort(m_tasks.begin(), m_tasks.end(), CTaskSorter());
 				m_tasksDirty = false;
 			} else if (m_tasks.empty()) {
-				AddDebugLogLineM(false, logThreads, wxT("No more tasks, stopping"));
+				AddDebugLogLineN(logThreads, wxT("No more tasks, stopping"));
 				break;
 			}
 			
@@ -285,7 +285,7 @@
 			m_currentTask = task.get();
 		}
 
-		AddDebugLogLineM(false, logThreads, wxT("Current task: ") + task->GetType() + wxT(" - ") + task->GetDesc());
+		AddDebugLogLineN(logThreads, wxT("Current task: ") + task->GetType() + wxT(" - ") + task->GetDesc());
 		// Execute the task
 		task->m_owner = m_thread;
 		task->Entry();
@@ -301,7 +301,7 @@
 			// a different task, so dont remove it. That also means 
 			// that it cant be the last task of this type.
 			if (!task->m_abort) {
-				AddLogLineM(false, logThreads,
+				AddDebugLogLineN(logThreads,
 					CFormat(wxT("Completed task '%s%s', %u tasks remaining.")) 
 						% task->GetType()
 						% (task->GetDesc().IsEmpty() ? wxString() : (wxT(" - ") + task->GetDesc()))
@@ -309,7 +309,7 @@
 				
 				CDescMap& map = m_taskDescs[task->GetType()];
 				if (!map.erase(task->GetDesc())) {
-					wxASSERT(0);
+					wxFAIL;
 				} else if (map.empty()) {
 					m_taskDescs.erase(task->GetType());
 					isLastTask = true;
@@ -321,12 +321,12 @@
 
 		if (isLastTask) {
 			// Allow the task to signal that all sub-tasks have been completed
-			AddDebugLogLineM(false, logThreads, wxT("Last task, calling OnLastTask"));
+			AddDebugLogLineN(logThreads, wxT("Last task, calling OnLastTask"));
 			task->OnLastTask();
 		}
 	}
 	
-	AddDebugLogLineM(false, logThreads, wxT("Leaving scheduling loop"));
+	AddDebugLogLineN(logThreads, wxT("Leaving scheduling loop"));
 
 	return 0;
 }

aMule-2.2.6.tar.bz2/src/ThreadScheduler.h -> aMule-2.3.1.tar.bz2/src/ThreadScheduler.h Changed

aMule-2.2.6.tar.bz2/src/ThreadTasks.cpp -> aMule-2.3.1.tar.bz2/src/ThreadTasks.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2006-2009 Mikkel Schubert ( xaignar@amule.org / http:://www.amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2006-2011 Mikkel Schubert ( xaignar@amule.org / http:://www.amule.org )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -29,7 +29,7 @@
 
 #include "ThreadTasks.h"		// Interface declarations
 #include "PartFile.h"			// Needed for CPartFile
-#include "Logger.h"			// Needed for Add(Debug)LogLineM
+#include "Logger.h"			// Needed for Add(Debug)LogLine{C,N}
 #include <common/Format.h>		// Needed for CFormat
 #include "amule.h"			// Needed for theApp
 #include "KnownFileList.h"		// Needed for theApp->knownfiles
@@ -82,11 +82,11 @@
 
 void CHashingTask::Entry()
 {
-	CFile file;
+	CFileAutoClose file;
 
 	CPath fullPath = m_path.JoinPaths(m_filename);
 	if (!file.Open(fullPath, CFile::read)) {
-		AddDebugLogLineM(true, logHasher,
+		AddDebugLogLineC(logHasher,
 			CFormat(wxT("Warning, failed to open file, skipping: %s")) % fullPath);
 		return;
 	}
@@ -95,22 +95,22 @@
 	try {
 		fileLength = file.GetLength();
 	} catch (const CIOFailureException&) {
-		AddDebugLogLineM(true, logHasher,
+		AddDebugLogLineC(logHasher,
 			CFormat(wxT("Warning, failed to retrieve file-length, skipping: %s")) % fullPath);
 		return;
 	}
 
 	if (fileLength > MAX_FILE_SIZE) {
-		AddDebugLogLineM(true, logHasher,
+		AddDebugLogLineC(logHasher,
 			CFormat(wxT("Warning, file is larger than supported size, skipping: %s")) % fullPath);
 		return;
 	} else if (fileLength == 0) {
 		if (m_owner) {
 			// It makes no sense to try to hash empty partfiles ...
-			wxASSERT(0);
+			wxFAIL;
 		} else {
 			// Zero-size partfiles should be hashed, but not zero-sized shared-files.
-			AddDebugLogLineM( true, logHasher,
+			AddDebugLogLineC(logHasher,
 				CFormat(wxT("Warning, 0-size file, skipping: %s")) % fullPath);
 		}
 		
@@ -118,7 +118,7 @@
 	}
 	
 	// For thread-safety, results are passed via a temporary file object.
-	CScopedPtr<CKnownFile> knownfile(new CKnownFile());
+	CScopedPtr<CKnownFile> knownfile;
 	knownfile->m_filePath = m_path;
 	knownfile->SetFileName(m_filename);
 	knownfile->SetFileSize(fileLength);
@@ -129,16 +129,16 @@
 	
 	if ((m_toHash & EH_MD4) && (m_toHash & EH_AICH)) {
 		knownfile->GetAICHHashset()->FreeHashSet();
-		AddLogLineM( false, logHasher, CFormat( 
-			_("Starting to create MD4 and AICH hash for file: %s")) %
+		AddDebugLogLineN( logHasher, CFormat(
+			wxT("Starting to create MD4 and AICH hash for file: %s")) %
 			m_filename );
 	} else if ((m_toHash & EH_MD4)) {
-		AddLogLineM( false, logHasher, CFormat(
-			_("Starting to create MD4 hash for file: %s")) % m_filename );
+		AddDebugLogLineN( logHasher, CFormat(
+			wxT("Starting to create MD4 hash for file: %s")) % m_filename );
 	} else if ((m_toHash & EH_AICH)) {
 		knownfile->GetAICHHashset()->FreeHashSet();
-		AddLogLineM( false, logHasher, CFormat(
-			_("Starting to create AICH hash for file: %s")) % m_filename );
+		AddDebugLogLineN( logHasher, CFormat(
+			wxT("Starting to create AICH hash for file: %s")) % m_filename );
 	} else {
 		wxCHECK_RET(0, (CFormat(wxT("No hashes requested for file, skipping: %s"))
 			% m_filename).GetString());
@@ -147,9 +147,9 @@
 	
 	// This loops creates the part-hashes, loop-de-loop.
 	try {
-		while (!file.Eof() && !TestDestroy()) {
-			if (CreateNextPartHash(&file, knownfile.get(), m_toHash) == false) {
-				AddDebugLogLineM(true, logHasher,
+		for (uint16 part = 0; part < knownfile->GetPartCount() && !TestDestroy(); part++) {
+			if (CreateNextPartHash(file, part, knownfile.get(), m_toHash) == false) {
+				AddDebugLogLineC(logHasher,
 					CFormat(wxT("Error while hashing file, skipping: %s"))
 						% m_filename);
 			
@@ -157,7 +157,7 @@
 			}
 		}
 	} catch (const CSafeIOException& e) {
-		AddDebugLogLineM(true, logHasher, wxT("IO exception while hashing file: ") + e.what());
+		AddDebugLogLineC(logHasher, wxT("IO exception while hashing file: ") + e.what());
 		return;
 	}
 
@@ -173,7 +173,7 @@
 			knownfile->m_abyFileHash = hash;
 		} else {
 			// This should not happen!
-			wxASSERT(0);
+			wxFAIL;
 		}
 	}
 	
@@ -185,7 +185,7 @@
 		if (AICHHashSet->VerifyHashTree(true) ) {
 			AICHHashSet->SetStatus(AICH_HASHSETCOMPLETE);
 			if (!AICHHashSet->SaveHashSet()) {
-				AddDebugLogLineM( true, logHasher,
+				AddDebugLogLineC( logHasher,
 					CFormat(wxT("Warning, failed to save AICH hashset for file: %s"))
 						% m_filename );
 			}
@@ -204,12 +204,13 @@
 }
 
 
-bool CHashingTask::CreateNextPartHash(CFile* file, CKnownFile* owner, EHashes toHash)
+bool CHashingTask::CreateNextPartHash(CFileAutoClose& file, uint16 part, CKnownFile* owner, EHashes toHash)
 {
-	wxCHECK_MSG(!file->Eof(), false, wxT("Unexpected EOF in CreateNextPartHash"));
+	wxCHECK_MSG(!file.Eof(), false, wxT("Unexpected EOF in CreateNextPartHash"));
 	
+	const uint64 offset = part * PARTSIZE;
 	// We'll read at most PARTSIZE bytes per cycle
-	const uint64 partLength = std::min<uint64>(PARTSIZE, file->GetLength() - file->GetPosition());
+	const uint64 partLength = owner->GetPartSize(part);
 	
 	CMD4Hash hash;
 	CMD4Hash* md4Hash = ((toHash & EH_MD4) ? &hash : NULL);
@@ -217,10 +218,10 @@
 
 	// Setup for AICH hashing
 	if (toHash & EH_AICH) {
-		aichHash = owner->GetAICHHashset()->m_pHashTree.FindHash(file->GetPosition(), partLength);
+		aichHash = owner->GetAICHHashset()->m_pHashTree.FindHash(offset, partLength);
 	}
 
-	owner->CreateHashFromFile(file, partLength, md4Hash, aichHash);
+	owner->CreateHashFromFile(file, offset, partLength, md4Hash, aichHash);
 	
 	if (toHash & EH_MD4) {
 		// Store the md4 hash
@@ -230,7 +231,7 @@
 		// file i.e. will have 3 parts (see CKnownFile::SetFileSize for comments). 
 		// So we have to create the hash for the 0-size data, which will be the default
 		// md4 hash for null data: 31D6CFE0D16AE931B73C59D7E0C089C0	
-		if ((partLength == PARTSIZE) && file->Eof()) {
+		if ((partLength == PARTSIZE) && file.Eof()) {
 			owner->m_hashlist.push_back(CMD4Hash(g_emptyMD4Hash));
 		}
 	}
@@ -265,23 +266,33 @@
 {
 	ConvertToKnown2ToKnown264();
 	
-	AddDebugLogLineM( false, logAICHThread, wxT("Syncronization thread started.") );
+	AddDebugLogLineN( logAICHThread, wxT("Syncronization thread started.") );
 	
 	// We collect all masterhashs which we find in the known2.met and store them in a list
 	std::list<CAICHHash> hashlist;
 	const CPath fullpath = CPath(theApp->ConfigDir + KNOWN2_MET_FILENAME);
 	
 	CFile file;
-	if (!file.Open(fullpath, (fullpath.FileExists() ? CFile::read_write : CFile::write))) {
-		AddDebugLogLineM( true, logAICHThread, wxT("Error, failed to open 'known2_64.met' file!") );
-		return;
-	}
-
-	uint32 nLastVerifiedPos = 0;
-	try {
-		if (file.Eof()) {
+	if (!fullpath.FileExists()) {
+		// File does not exist. Try to create it to see if it can be created at all (and don't start hashing otherwise).
+		if (!file.Open(fullpath, CFile::write)) {
+			AddDebugLogLineC( logAICHThread, wxT("Error, failed to open 'known2_64.met' file!") );
+			return;
+		}
+		try {
 			file.WriteUInt8(KNOWN2_MET_VERSION);
-		} else {
+		} catch (const CIOFailureException& e) {
+			AddDebugLogLineC(logAICHThread, wxT("IO failure while creating hashlist (Aborting): ") + e.what());
+			return;		
+		}
+	} else {
+		if (!file.Open(fullpath, CFile::read)) {
+			AddDebugLogLineC( logAICHThread, wxT("Error, failed to open 'known2_64.met' file!") );
+			return;
+		}
+
+		uint32 nLastVerifiedPos = 0;
+		try {
 			if (file.ReadUInt8() != KNOWN2_MET_VERSION) {
 				throw CEOFException(wxT("Invalid met-file header found, removing file."));
 			}
@@ -299,17 +310,19 @@
 				// skip the rest of this hashset
 				nLastVerifiedPos = file.Seek(nHashCount * HASHSIZE, wxFromCurrent);
 			}
-		}
-	} catch (const CEOFException&) {
-		AddDebugLogLineM(true, logAICHThread, wxT("Hashlist corrupted, truncating file."));
-		file.SetLength(nLastVerifiedPos);
-	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM(true, logAICHThread, wxT("IO failure while reading hashlist (Aborting): ") + e.what());
+		} catch (const CEOFException&) {
+			AddDebugLogLineC(logAICHThread, wxT("Hashlist corrupted, truncating file."));
+			file.Close();
+			file.Reopen(CFile::read_write);
+			file.SetLength(nLastVerifiedPos);
+		} catch (const CIOFailureException& e) {
+			AddDebugLogLineC(logAICHThread, wxT("IO failure while reading hashlist (Aborting): ") + e.what());
 		
-		return;		
-	}
+			return;		
+		}
 	
-	AddDebugLogLineM( false, logAICHThread, wxT("Masterhashes of known files have been loaded.") );
+		AddDebugLogLineN( logAICHThread, wxT("Masterhashes of known files have been loaded.") );
+	}
 
 	// Now we check that all files which are in the sharedfilelist have a
 	// corresponding hash in our list. Those how don't are queued for hashing.
@@ -334,7 +347,7 @@
 	CFile newfile;
 
 	if (!oldfile.Open(oldfullpath, CFile::read)) {
-		AddDebugLogLineM(true, logAICHThread, wxT("Failed to open 'known2.met' file."));
+		AddDebugLogLineC(logAICHThread, wxT("Failed to open 'known2.met' file."));
 		
 		// else -> known2.met also doesn't exists, so nothing to convert
 		return false;
@@ -342,12 +355,12 @@
 
 
 	if (!newfile.Open(newfullpath, CFile::write_excl)) {
-		AddDebugLogLineM(true, logAICHThread, wxT("Failed to create 'known2_64.met' file."));
+		AddDebugLogLineC(logAICHThread, wxT("Failed to create 'known2_64.met' file."));
 		
 		return false;
 	}
 
-	AddLogLineM(false, CFormat(_("Converting old AICH hashsets in '%s' to 64b in '%s'."))
+	AddLogLineN(CFormat(_("Converting old AICH hashsets in '%s' to 64b in '%s'."))
 			% OLD_KNOWN2_MET_FILENAME % KNOWN2_MET_FILENAME);
 
 	try {
@@ -357,7 +370,7 @@
 			CAICHHash aichHash(&oldfile);
 			uint32 nHashCount = oldfile.ReadUInt16();
 			
-			CScopedArray<byte> buffer(new byte[nHashCount * CAICHHash::GetHashSize()]);
+			CScopedArray<byte> buffer(nHashCount * CAICHHash::GetHashSize());
 			
 			oldfile.Read(buffer.get(), nHashCount * CAICHHash::GetHashSize());
 			newfile.Write(aichHash.GetRawHash(), CAICHHash::GetHashSize());
@@ -366,10 +379,10 @@
 		}
 		newfile.Flush();
 	} catch (const CEOFException& e) {
-		AddDebugLogLineM(true, logAICHThread, wxT("Error reading old 'known2.met' file.") + e.what());
+		AddDebugLogLineC(logAICHThread, wxT("Error reading old 'known2.met' file.") + e.what());
 		return false;
 	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM(true, logAICHThread, wxT("IO error while converting 'known2.met' file: ") + e.what());
+		AddDebugLogLineC(logAICHThread, wxT("IO error while converting 'known2.met' file: ") + e.what());
 		return false;
 	}
 	
@@ -426,21 +439,19 @@
 	}
 
 	if (m_filename != dstName) {
-		AddLogLineM(true, logPartFile, CFormat(_("WARNING: The filename '%s' is invalid and has been renamed to '%s'."))
-			% m_filename % dstName);
+		AddLogLineC(CFormat(_("WARNING: The filename '%s' is invalid and has been renamed to '%s'.")) % m_filename % dstName);
 	}
 	
 	// Avoid saving to an already existing filename
 	CPath newName = targetPath.JoinPaths(dstName);
 	for (unsigned count = 0; newName.FileExists(); ++count) {
-		wxString postfix = wxString::Format(wxT("(%u)"), count);
+		wxString postfix = CFormat(wxT("(%u)")) % count;
 
 		newName = targetPath.JoinPaths(dstName.AddPostfix(postfix));
 	}
 
 	if (newName != targetPath.JoinPaths(dstName)) {
-		AddLogLineM(true, logPartFile, CFormat(_("WARNING: The file '%s' already exists, new file renamed to '%s'."))
-			% dstName % newName.GetFullName());
+		AddLogLineC(CFormat(_("WARNING: The file '%s' already exists, new file renamed to '%s'.")) % dstName % newName.GetFullName());
 	}
 
 	// Move will handle dirs on the same partition, otherwise copy is needed.
@@ -452,8 +463,7 @@
 		}
 		
 		if (!CPath::RemoveFile(partfilename)) {
-			AddLogLineM(true, logPartFile, CFormat(_("WARNING: Could not remove original '%s' after creating backup"))
-				% partfilename);
+			AddDebugLogLineC(logPartFile, CFormat(wxT("WARNING: Could not remove original '%s' after creating backup")) % partfilename);
 		}
 	}
 
@@ -464,7 +474,7 @@
 
 		if (toRemove.FileExists()) {
 			if (!CPath::RemoveFile(toRemove)) {
-				AddLogLineM(true, logPartFile, CFormat(_("WARNING: Failed to delete %s")) % toRemove);
+				AddDebugLogLineC(logPartFile, CFormat(wxT("WARNING: Failed to delete %s")) % toRemove);
 			}
 		}
 	}
@@ -487,7 +497,9 @@
 // CAllocateFileTask
 
 #ifdef HAVE_FALLOCATE
-#	define _GNU_SOURCE
+#	ifndef _GNU_SOURCE
+#		define _GNU_SOURCE
+#	endif
 #	ifdef HAVE_FCNTL_H
 #		include <fcntl.h>
 #	endif

aMule-2.2.6.tar.bz2/src/ThreadTasks.h -> aMule-2.3.1.tar.bz2/src/ThreadTasks.h Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2006-2009 Mikkel Schubert ( xaignar@amule.org / http:://www.amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2006-2011 Mikkel Schubert ( xaignar@amule.org / http:://www.amule.org )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -32,7 +32,7 @@
 
 class CKnownFile;
 class CPartFile;
-class CFile;
+class CFileAutoClose;
 
 
 /**
@@ -87,9 +87,10 @@
 	virtual void Entry();
 
 	/**
-	 * Helper function for hashing the next PARTSIZE chunk of a file.
+	 * Helper function for hashing a PARTSIZE chunk of a file.
 	 *
 	 * @param file The file to read from.
+	 * @param part The number of the part to hash.
 	 * @param owner The known- (or part) file representing that file.
 	 * @bool createAICH Specifies if AICH hash-sets should be created as well.
 	 * @return Returns false on read-errors, true otherwise.
@@ -98,7 +99,7 @@
 	 * the next part of the file. This function makes the assumption that it wont
 	 * be called for closed or EOF files.
 	 */
-	bool CreateNextPartHash(CFile* file, CKnownFile* owner, EHashes toHash);
+	bool CreateNextPartHash(CFileAutoClose& file, uint16 part, CKnownFile* owner, EHashes toHash);
 
 
 	//! The path to the file to be hashed (shared or part), without filename.

aMule-2.2.6.tar.bz2/src/ThrottledSocket.h -> aMule-2.3.1.tar.bz2/src/ThrottledSocket.h Changed

aMule-2.2.6.tar.bz2/src/Timer.cpp -> aMule-2.3.1.tar.bz2/src/Timer.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// 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
@@ -40,20 +40,22 @@
 	void* Entry() {
 		CTimerEvent evt(m_id);
 
-		uint64 lastEvent = GetTickCountFullRes();
+		uint32 lastEvent = GetTickCountFullRes();
 		do {
-			uint64 now = GetTickCountFullRes();
-			uint64 sinceLast = now - lastEvent;
-			if (sinceLast > 100 * m_period) {
+			// current time
+			uint32 now = GetTickCountFullRes();
+			// This is typically zero, because lastEvent was already incremented by one period. 
+			sint32 delta = now - lastEvent;
+			if (delta > 100 * m_period) {
 				// We're way too far behind.  Probably what really happened is
-				// the system time was adjusted backwards a bit, or (less
-				// likely) the time wrapped past the limit of a uint64.  So,
-				// the calculation of sinceLast has produced an absurd value.
-				sinceLast = 100 * m_period;
-				lastEvent = now - sinceLast;
+				// the system time was adjusted backwards a bit.  So,
+				// the calculation of delta has produced an absurd value.
+				delta = 100 * m_period;
+				lastEvent = now - delta;
 			}
 
-			unsigned long timeout = ((m_period < sinceLast) ? 0 : (m_period - sinceLast));
+			// Wait one period (adjusted by the difference just calculated)
+			sint32 timeout = ((m_period < delta) ? 0 : (m_period - delta));
 			
 			// In normal operation, we will never actually acquire the
 			// semaphore; we will always timeout.  This is used to
@@ -74,7 +76,7 @@
 		return NULL;
 	}
 	
-	unsigned long	m_period;
+	sint32			m_period;
 	bool			m_oneShot;
 	wxEvtHandler*	m_owner;
 	int				m_id;

aMule-2.2.6.tar.bz2/src/Timer.h -> aMule-2.3.1.tar.bz2/src/Timer.h Changed

aMule-2.2.6.tar.bz2/src/TransferWnd.cpp -> aMule-2.3.1.tar.bz2/src/TransferWnd.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -41,7 +41,7 @@
 #include "DownloadQueue.h"		// Needed for CDownloadQueue
 #include "CatDialog.h"			// Needed for CCatDialog
 #include "DownloadListCtrl.h"		// Needed for CDownloadListCtrl
-#include "ClientListCtrl.h"		// Needed for CClientListCtrl
+#include "SourceListCtrl.h"		// Needed for CSourceListCtrl
 #include "amule.h"			// Needed for theApp
 #include "muuli_wdr.h"			// Needed for ID_CATEGORIES
 #include "SearchDlg.h"			// Needed for CSearchDlg->UpdateCatChoice()
@@ -56,10 +56,9 @@
 	EVT_RIGHT_DOWN(CTransferWnd::OnNMRclickDLtab)
 	EVT_NOTEBOOK_PAGE_CHANGED(ID_CATEGORIES,	CTransferWnd::OnCategoryChanged)
 	
- 	EVT_SPLITTER_SASH_POS_CHANGING(ID_SPLATTER, CTransferWnd::OnSashPositionChanging)
+ 	EVT_SPLITTER_SASH_POS_CHANGING(ID_DOWNLOADSSPLATTER, CTransferWnd::OnSashPositionChanging)
 
 	EVT_BUTTON(ID_BTNCLRCOMPL,		CTransferWnd::OnBtnClearDownloads)
- 	EVT_BUTTON(ID_BTNSWITCHUP, 		CTransferWnd::SwitchUploadList)
  	EVT_BUTTON(ID_CLIENTTOGGLE,		CTransferWnd::OnToggleClientList)
 
 	EVT_MENU_RANGE(MP_CAT_SET0, MP_CAT_SET0 + 15, CTransferWnd::OnSetDefaultCat)
@@ -85,15 +84,17 @@
 	content->Show(this, true);
 
 	downloadlistctrl = CastChild( wxT("downloadList"), CDownloadListCtrl );
-	clientlistctrl   = CastChild( ID_CLIENTLIST, CClientListCtrl );
+	clientlistctrl   = CastChild( ID_CLIENTLIST, CSourceListCtrl );
 	m_dlTab          = CastChild( ID_CATEGORIES, CMuleNotebook );
+
+	// Set disabled image for clear complete button
+	CastChild(ID_BTNCLRCOMPL, wxBitmapButton)->SetBitmapDisabled(amuleDlgImages(34));
 	
-	CMuleNotebook* nb = CastChild( ID_CATEGORIES, CMuleNotebook );
 	// We want to use our own popup
-	nb->SetPopupHandler( this );
-	
+	m_dlTab->SetPopupHandler( this );
+
 	// Set default category
-	theApp->glob_prefs->GetCategory(0)->title = GetCatTitle(thePrefs::GetAllcatType());
+	theApp->glob_prefs->GetCategory(0)->title = GetCatTitle(thePrefs::GetAllcatFilter());
 	theApp->glob_prefs->GetCategory(0)->path = thePrefs::GetIncomingDir();
 	
 	// Show default + userdefined categories
@@ -103,20 +104,13 @@
 
 	m_menu = NULL;
 	m_splitter = 0;
-
 	
 	wxConfigBase *config = wxConfigBase::Get();
 	
 	// Check if the clientlist is hidden
 	bool show = true;
 	config->Read( wxT("/GUI/TransferWnd/ShowClientList"), &show, true );
-
-	if ( !show ) {
-		// Disable the client-list
-		wxCommandEvent event;
-		OnToggleClientList( event );	
-	}
-
+	clientlistctrl->SetShowing(show);
 	// Load the last used splitter position
 	m_splitter = config->Read( wxT("/GUI/TransferWnd/Splitter"), 463l );
 }
@@ -126,7 +120,7 @@
 {
 	wxConfigBase *config = wxConfigBase::Get();
 
-	if ( clientlistctrl->GetListView() == vtNone ) {
+	if ( !clientlistctrl->GetShowing() ) {
 		// Save the splitter position
 		config->Write( wxT("/GUI/TransferWnd/Splitter"), m_splitter );
 	
@@ -155,36 +149,57 @@
 	theApp->amuledlg->m_searchwnd->UpdateCatChoice();
 }
 
-void CTransferWnd::UpdateCategory( int index, bool titleChanged )
+void CTransferWnd::UpdateCategory(int index)
 {
-	wxString label = theApp->glob_prefs->GetCategory( index )->title;
-
-	if ( thePrefs::ShowCatTabInfos() ) {
-		uint16 files = 0;
-		uint16 download = 0;
+	uint32 nrCats = theApp->glob_prefs->GetCatCount();
+	std::vector<uint16> files, downloads;
+	bool showCatTabInfos = thePrefs::ShowCatTabInfos();
+	if (showCatTabInfos) {
+		files.insert(files.begin(), nrCats, 0);
+		downloads.insert(downloads.begin(), nrCats, 0);
 		
-		for ( unsigned int i = 0; i < theApp->downloadqueue->GetFileCount(); ++i ) {
-			CPartFile *cur_file = theApp->downloadqueue->GetFileByIndex(i);
-			
-			if ( cur_file && cur_file->CheckShowItemInGivenCat(index) ) {
-				files++;
-				
-				if ( cur_file->GetTransferingSrcCount() ) {
-					download++;
+#ifdef CLIENT_GUI
+		for (CDownQueueRem::const_iterator it = theApp->downloadqueue->begin(); it != theApp->downloadqueue->end(); ++it) {
+			CPartFile *cur_file = it->second;
+#else
+		std::vector<CPartFile*> fileList;
+		theApp->downloadqueue->CopyFileList(fileList, true);
+		int size = fileList.size();
+		for (int i = 0; i < size; ++i ) {
+			CPartFile *cur_file = fileList[i];
+#endif
+			bool downloading = cur_file->GetTransferingSrcCount() > 0;
+			int fileCat = cur_file->GetCategory();
+			if ((index == -1 || fileCat == index) && cur_file->CheckShowItemInGivenCat(fileCat)) {
+				files[fileCat]++;
+				if (downloading) {
+					downloads[fileCat]++;
+				}
+			}
+			if (index == -1 && fileCat > 0 && cur_file->CheckShowItemInGivenCat(0)) {
+				files[0]++;
+				if (downloading) {
+					downloads[0]++;
 				}
 			}
 		}
 		
-		label += wxString::Format(wxT(" (%u/%u)"), download, files );
 	}
-	
-	m_dlTab->SetPageText( index, label );
-
-
-	if ( titleChanged ) {
-		theApp->amuledlg->m_searchwnd->UpdateCatChoice();
+	int start, end;
+	if (index == -1) {
+		start = 0;
+		end = nrCats - 1;
+	} else {
+		start = index;
+		end = index;
+	}
+	for (int i = start; i <= end; i++) {
+		wxString label = theApp->glob_prefs->GetCategory(i)->title;
+		if (showCatTabInfos) {
+			label += CFormat(wxT(" (%u/%u)")) % downloads[i] % files[i];
+		}
+		m_dlTab->SetPageText(i, label);
 	}
-	
 }
 
 
@@ -219,6 +234,10 @@
 
 void CTransferWnd::OnAddCategory(wxCommandEvent& WXUNUSED(event))
 {
+	if (theApp->glob_prefs->GetCatCount() >= 99) {
+		wxMessageBox(_("Only 99 categories are supported."), _("Too many categories!"), wxOK | wxICON_EXCLAMATION);
+		return;
+	}
 	CCatDialog dialog( this,
 	// Allow browse?
 #ifdef CLIENT_GUI	
@@ -227,14 +246,7 @@
 	true
 #endif	
 	);
-	if (dialog.ShowModal() == wxOK) {
-		// Add the files on this folder.
-		Category_Struct* newcat =
-			theApp->glob_prefs->GetCategory(
-				theApp->glob_prefs->GetCatCount()-1);
-		theApp->sharedfiles->AddFilesFromDirectory(newcat->path);
-		theApp->sharedfiles->Reload();		
-	}
+	dialog.ShowModal();
 }
 
 
@@ -247,11 +259,11 @@
 void CTransferWnd::RemoveCategory(int index)
 {
 	if ( index > 0 ) {
-		downloadlistctrl->ResetCatParts(index);
+		theApp->downloadqueue->ResetCatParts(index);
 		theApp->glob_prefs->RemoveCat(index);
 		RemoveCategoryPage(index);
 		if ( theApp->glob_prefs->GetCatCount() == 1 ) {
-			thePrefs::SetAllcatType(0);
+			thePrefs::SetAllcatFilter( acfAll );
 		}
 		theApp->glob_prefs->SaveCats();
 		theApp->amuledlg->m_searchwnd->UpdateCatChoice();
@@ -269,8 +281,6 @@
 
 void CTransferWnd::OnEditCategory( wxCommandEvent& WXUNUSED(event) )
 {
-	Category_Struct* cat = theApp->glob_prefs->GetCategory(m_dlTab->GetSelection());
-	CPath oldpath = cat->path;
 	CCatDialog dialog( this, 
 	// Allow browse?
 #ifdef CLIENT_GUI	
@@ -280,19 +290,14 @@
 #endif
 		, m_dlTab->GetSelection());
 	
-	if (dialog.ShowModal() == wxOK) {
-		if (!oldpath.IsSameDir(cat->path)) {
-			theApp->sharedfiles->AddFilesFromDirectory(cat->path);
-			theApp->sharedfiles->Reload();			
-		}
-	}
+	dialog.ShowModal();
 }
 
 
 void CTransferWnd::OnSetDefaultCat( wxCommandEvent& event )
 {
-	thePrefs::SetAllcatType( event.GetId() - MP_CAT_SET0 );
-	theApp->glob_prefs->GetCategory(0)->title = GetCatTitle( thePrefs::GetAllcatType() );
+	thePrefs::SetAllcatFilter( static_cast<AllCategoryFilter>(event.GetId() - MP_CAT_SET0) );
+	theApp->glob_prefs->GetCategory(0)->title = GetCatTitle( thePrefs::GetAllcatFilter() );
 	
 	UpdateCategory( 0 );
 	
@@ -304,20 +309,14 @@
 }
 
 
-void CTransferWnd::ShowQueueCount(uint32 number)
-{
-	wxString str = wxString::Format( wxT("%u (%u %s)"), number, theStats::GetBannedCount(), _("Banned") );
-	wxStaticText* label = CastChild( ID_CLIENTCOUNT, wxStaticText );
-	
-	label->SetLabel( str );
-	label->GetParent()->Layout();
-}
-
-
 void CTransferWnd::OnCategoryChanged(wxNotebookEvent& evt)
 {
-  downloadlistctrl->ChangeCategory(evt.GetSelection());
-  downloadlistctrl->SortList();
+	// First remove currently showing sources (switching cat will deselect all)
+	CKnownFileVector filesVector;
+	clientlistctrl->ShowSources(filesVector);
+	// Then change cat
+	downloadlistctrl->ChangeCategory(evt.GetSelection());
+	downloadlistctrl->SortList();
 }
 
 
@@ -394,143 +393,99 @@
 }
 
 
-void CTransferWnd::UpdateCatTabTitles()
-{
-	for ( uint8 i = 0; i < m_dlTab->GetPageCount(); i++ ) {
-		UpdateCategory( i, false );
-	}
-}
-
-
 void CTransferWnd::Prepare()
 {
-	int header_height = s_clientlistHeader->GetSize().GetHeight();
 	wxSplitterWindow* splitter = CastChild( wxT("splitterWnd"), wxSplitterWindow );
+	int height = splitter->GetSize().GetHeight();
+	int header_height = s_clientlistHeader->GetSize().GetHeight();	
 	
-	if ( clientlistctrl->GetListView() == vtNone ) {
-		int height = splitter->GetWindow1()->GetSize().GetHeight();
-	    	height += splitter->GetWindow2()->GetSize().GetHeight();
-	
-		splitter->SetSashPosition( height - header_height );
-	} else if ( m_splitter ) {
-		// Some sainity checking
-		if ( m_splitter < 90 ) {
-			m_splitter = 90;
-		} else {
-			int height = splitter->GetWindow1()->GetSize().GetHeight();
-		    	height += splitter->GetWindow2()->GetSize().GetHeight();
-		
-			if ( height - header_height * 2 < m_splitter ) {
-				m_splitter = height - header_height * 2;
-			}
+	if ( m_splitter ) {
+		// Some sanity checking
+		if ( m_splitter < s_splitterMin ) {
+			m_splitter = s_splitterMin;
+		} else if ( m_splitter > height - header_height * 2 ) {
+			m_splitter = height - header_height * 2;
 		}
-		
 		splitter->SetSashPosition( m_splitter );
-
 		m_splitter = 0;
 	}
-}
-
-
-void CTransferWnd::SwitchUploadList(wxCommandEvent& WXUNUSED(evt))
-{
- 	clientlistctrl->ToggleView();
-	UpdateBottomPaneTitle(clientlistctrl->GetListView());
-}
 
-
-void CTransferWnd::UpdateBottomPaneTitle(ViewType view)
-{
-	wxStaticText* label = CastChild( wxT("uploadTitle"), wxStaticText );
- 	
- 	switch (view) {
- 		case vtNone:
- 			return;
- 		
- 		case vtUploading:
- 			label->SetLabel( _("Uploads") );
- 			break;
- 			
- 		case vtQueued:
- 			label->SetLabel( _("On Queue") );
- 			break;
- 
- 		case vtClients:
- 			label->SetLabel( _("Clients") );
- 			break;
- 	}
-
-	label->GetParent()->Layout();
+	if ( !clientlistctrl->GetShowing() ) {
+		// use a toggle event to close it (calculate size, change button)
+		clientlistctrl->SetShowing( true );	// so it will be toggled to false
+		wxCommandEvent evt1;
+		OnToggleClientList( evt1 );
+	}
 }
 
-
 void CTransferWnd::OnToggleClientList(wxCommandEvent& WXUNUSED(evt))
 {
 	wxSplitterWindow* splitter = CastChild( wxT("splitterWnd"), wxSplitterWindow );
 	wxBitmapButton*   button = CastChild( ID_CLIENTTOGGLE, wxBitmapButton );
 
-	// Keeps track of what was last selected.
-	static ViewType lastView = vtNone;
-		
-		
-	if ( clientlistctrl->GetListView() == vtNone ) {
+	if ( !clientlistctrl->GetShowing() ) {
 		splitter->SetSashPosition( m_splitter );		
+		m_splitter = 0;
 		
-		clientlistctrl->SetListView( lastView );
+		clientlistctrl->SetShowing( true );
 		
 		button->SetBitmapLabel( amuleDlgImages( 10 ) );
 		button->SetBitmapFocus( amuleDlgImages( 10 ) );
 		button->SetBitmapSelected( amuleDlgImages( 10 ) );
-
-		m_splitter = 0;
+		button->SetBitmapHover( amuleDlgImages( 10 ) );
 	} else {
-		lastView = clientlistctrl->GetListView();
-		clientlistctrl->SetListView( vtNone );
+		clientlistctrl->SetShowing( false );
 	
-		int pos = splitter->GetSashPosition();
+		m_splitter = splitter->GetSashPosition();
 	
 		// Add the height of the listctrl to the top-window
-		int height  = clientlistctrl->GetSize().GetHeight();
-		height += splitter->GetWindow1()->GetSize().GetHeight();
+		int height = clientlistctrl->GetSize().GetHeight()
+					 + splitter->GetWindow1()->GetSize().GetHeight();
 	
 		splitter->SetSashPosition( height );
 		
-		m_splitter = pos;
-
 		button->SetBitmapLabel( amuleDlgImages( 11 ) );
 		button->SetBitmapFocus( amuleDlgImages( 11 ) );
 		button->SetBitmapSelected( amuleDlgImages( 11 ) );
+		button->SetBitmapHover( amuleDlgImages( 11 ) );
 	}
-
-	FindWindow(ID_BTNSWITCHUP)->Enable( clientlistctrl->GetListView() != vtNone );
 }
 
 
 void CTransferWnd::OnSashPositionChanging(wxSplitterEvent& evt)
 {
-	int header_height = s_clientlistHeader->GetSize().GetHeight();
-	
-	if ( evt.GetSashPosition() < 90 ) {
-		evt.SetSashPosition( 90 );
+	if ( evt.GetSashPosition() < s_splitterMin ) {
+		evt.SetSashPosition( s_splitterMin );
 	} else {
 		wxSplitterWindow* splitter = wxStaticCast( evt.GetEventObject(), wxSplitterWindow);
+		wxCHECK_RET(splitter, wxT("ERROR: NULL splitter in CTransferWnd::OnSashPositionChanging"));
 			
-		int height = splitter->GetWindow1()->GetSize().GetHeight();
-		    height += splitter->GetWindow2()->GetSize().GetHeight();
-
-		if ( clientlistctrl->GetListView() == vtNone ) {
-			if ( height - evt.GetSashPosition() < header_height * 2 ) {
+		int height = splitter->GetSize().GetHeight();
+		int header_height = s_clientlistHeader->GetSize().GetHeight();	
+		int mousey = wxGetMousePosition().y - splitter->GetScreenRect().GetTop();
+
+		if ( !clientlistctrl->GetShowing() ) {
+			// lower window hidden
+			if ( height - mousey < header_height * 2 ) {
+				// no moving down if already hidden
 				evt.Veto();
 			} else {
+				// show it
+				m_splitter = mousey;	// prevent jumping if it was minimized and is then shown by dragging the sash
 				wxCommandEvent event;
 				OnToggleClientList( event );
 			}
 		} else {
-			if ( height - evt.GetSashPosition() < header_height * 2 ) {
-				evt.SetSashPosition( height - header_height );
-
+			// lower window showing
+			if ( height - mousey < header_height * 2 ) {
+				// hide it
 				wxCommandEvent event;
 				OnToggleClientList( event );
+			} else {
+				// normal resize
+				// If several events queue up, setting the sash to the current mouse position
+				// will speed up things and make sash moving more smoothly.
+				evt.SetSashPosition( mousey );
 			}
 		}
 	}

aMule-2.2.6.tar.bz2/src/TransferWnd.h -> aMule-2.3.1.tar.bz2/src/TransferWnd.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 // Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
@@ -27,23 +27,20 @@
 #define TRANSFERWND_H
 
 #include <wx/panel.h>	// Needed for wxPanel
+#include <wx/notebook.h>	// needed for wxBookCtrlEvent in wx 2.8
 #include "Types.h"		// Needed for uint32
 #include "OtherStructs.h"
-#include "Constants.h"		// Needed for ViewType
 
-class CClientListCtrl;
+class CSourceListCtrl;
 class CDownloadListCtrl;
 class CMuleNotebook;
 class wxListCtrl;
 class wxSplitterEvent;
-class wxNotebookEvent;
 class wxCommandEvent;
 class wxMouseEvent;
 class wxEvent;
 class wxMenu;
 
-
-
 /**
  * This class takes care of managing the lists and other controls contained 
  * in the transfer-window. It's primary function is to manage the user-defined
@@ -78,17 +75,9 @@
 	/**
 	 * Updates the title of the specified category.
 	 *
-	 * @param index The index of the category on the notebook.
-	 * @param titleChanged Set to true if the actual title has changed.
-	 *
-	 * The second paramerter will make the UpdateCategory function signal
-	 * to the searchdlg page that the lists of categories has been changed,
-	 * and force it to refresh its list of categories. 
-	 *
-	 * This however should only be done when the title has actually changed, 
-	 * since it will cause the user-selection to be reset.
+	 * @param index The index of the category on the notebook. -1 will update all categories.
 	 */
-	void UpdateCategory( int index, bool titleChanged = false );
+	void UpdateCategory(int index);
 
 	/**
 	 * Remove category
@@ -97,25 +86,9 @@
 	void RemoveCategoryPage(int index);
 
 	/**
-	 * This functions updates the displayed client-numbers*
-	 *
-	 * @param number The number of clients on the upload queue.
-	 *
-	 * This function updates both the number of clients on the queue,
-	 * as well as the number of banned clients.
-	 */
-	void	ShowQueueCount(uint32 number);
-	
-	/**
-	 * This function switches between showing the upload-queue and the list of
-	 * client who are currently recieving files.
-	 */
-	void	SwitchUploadList(wxCommandEvent& evt);
-	
-	/**
 	 * Helper-function which updates the displayed titles of all existing categories.
 	 */
-	void	UpdateCatTabTitles();
+	void	UpdateCatTabTitles() { UpdateCategory(-1); }
 
 	
 	/**
@@ -125,21 +98,17 @@
 	 */
 	void	Prepare();
 
-	/**
-	 * Call this function to update the title of the bottom pane after the view
-	 * has been changed.
-	 */
-	void UpdateBottomPaneTitle(ViewType view);
-
 	//! Pointer to the download-queue.
 	CDownloadListCtrl*	downloadlistctrl;
 	//! Pointer to the list of clients.
-	CClientListCtrl*	clientlistctrl;
+	CSourceListCtrl*	clientlistctrl;
 	
+private:
 	//! Contains the current (or last if the clientlist is hidden) position of the splitter.
 	int m_splitter;
+	//! Minimum position of splitter bar
+	static const int s_splitterMin = 90;
 
-private:
 	/**
 	 * Event-handler for the set status by category menu-item.
 	 */
@@ -178,7 +147,7 @@
 	/**
 	 * Event-handler for changing categories.
 	 */
-	void OnCategoryChanged(wxNotebookEvent& evt);
+	void OnCategoryChanged(wxBookCtrlEvent& evt);
 	
 	/**
 	 * Event-handler for displaying the category-popup menu.
@@ -191,7 +160,7 @@
 	void OnToggleClientList( wxCommandEvent& event );
     
 	/**
-	 * Event-handler for automatic show/hide of the clientlistctrl.
+	 * Event-handler for changes in the sash divider position.
 	 */
 	void OnSashPositionChanging(wxSplitterEvent& evt);

aMule-2.2.6.tar.bz2/src/Types.h -> aMule-2.3.1.tar.bz2/src/Types.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -111,7 +111,6 @@
 
 
 class CKnownFile;
-class CUpDownClient;
 
 //! Various common list-types.
 //@{ 
@@ -119,10 +118,14 @@
 typedef std::list<wxString> CStringList;
 #endif
 typedef std::list<CKnownFile*> CKnownFilePtrList;
-typedef std::list<CUpDownClient*> CClientPtrList;
 //@}
 
+typedef std::vector<uint8>  ArrayOfUInts8;
 typedef std::vector<uint16> ArrayOfUInts16;
+typedef std::vector<uint32> ArrayOfUInts32;
+typedef std::vector<uint64> ArrayOfUInts64;
+
+typedef std::list<uint32>	ListOfUInts32;
 
 /* This is the Evil Void String For Returning On Const References From Hell */
 // IT MEANS I WANT TO USE IT EVERYWHERE. DO NOT MOVE IT. 
@@ -139,14 +142,16 @@
 #endif
 
 
-#ifdef __WXMSW__
+#ifdef _WIN32			// Used in non-wx-apps too (ed2k), so don't use __WXMSW__ here !
 #ifdef _MSC_VER
 	#define NOMINMAX
 	#include <windows.h> // Needed for RECT  // Do_not_auto_remove
-#endif
+#else
 	#include <windef.h>	// Needed for RECT  // Do_not_auto_remove
 	#include <wingdi.h>	// Do_not_auto_remove
 	#include <winuser.h>	// Do_not_auto_remove
+	#include <winbase.h> // Do_not_auto_remove
+#endif
 	// Windows compilers don't have these constants
 	#ifndef W_OK
 		enum
@@ -157,15 +162,18 @@
 			R_OK = 4    //          read
 		};
 	#endif // W_OK
-	#include <wx/msw/winundef.h>	// Do_not_auto_remove
-#elif !defined(_MSC_VER)
+	#ifdef __WXMSW__
+		#include <wx/msw/winundef.h>	// Do_not_auto_remove
+	#endif
+	#undef GetUserName
+#else // _WIN32
 	typedef struct sRECT {
 	  uint32 left;
 	  uint32 top;
 	  uint32 right;
 	  uint32 bottom;
 	} RECT;
-#endif /* __WXMSW__ */
+#endif /* _WIN32 */
 
 
 #endif /* TYPES_H */

aMule-2.2.6.tar.bz2/src/UPnPBase.cpp -> aMule-2.3.1.tar.bz2/src/UPnPBase.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Marcelo Roberto Jimenez ( phoenix@amule.org )
-// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Marcelo Roberto Jimenez ( phoenix@amule.org )
+// Copyright (c) 2006-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
@@ -23,6 +23,12 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#ifdef HAVE_CONFIG_H
+#	include "config.h"		// Needed for ENABLE_UPNP
+#endif
+
+#ifdef ENABLE_UPNP
+
 #define UPNP_C
 
 #include "UPnPBase.h"
@@ -136,14 +142,14 @@
 				errorString <<
 				"'.";
 		}
-		AddLogLineM(false, logUPnP, msg);
+		AddLogLineU(false, logUPnP, msg);
 	} else {
 		msg << "Error: " <<
 			messsage <<
 			": UPnP SDK error: " <<
 			GetUPnPErrorMessage(errorCode) << 
 			" (" << errorCode << ").";
-		AddLogLineM(false, logUPnP, msg);
+		AddLogLineU(false, logUPnP, msg);
 	}
 	
 	return msg.str();
@@ -171,7 +177,7 @@
 		msg << "\n    Empty response for action '" <<
 			actionName << "'.";
 	}
-	AddDebugLogLineM(false, logUPnP, msg);
+	AddDebugLogLineN(logUPnP, msg);
 }
 
 
@@ -355,7 +361,7 @@
 		"\n        direction: "            << m_direction <<
 		"\n        retval: "               << m_retval <<
 		"\n        relatedStateVariable: " << m_relatedStateVariable;
-	AddDebugLogLineM(false, logUPnP, msg);
+	AddDebugLogLineN(logUPnP, msg);
 }
 
 
@@ -372,7 +378,7 @@
 	std::ostringstream msg;
 	msg <<	"\n    Action:"    <<
 		"\n        name: " << m_name;
-	AddDebugLogLineM(false, logUPnP, msg);
+	AddDebugLogLineN(logUPnP, msg);
 }
 
 
@@ -388,7 +394,7 @@
 	std::ostringstream msg;
 	msg <<	"\n    AllowedValue:"      <<
 		"\n        allowedValue: " << m_allowedValue;
-	AddDebugLogLineM(false, logUPnP, msg);
+	AddDebugLogLineN(logUPnP, msg);
 }
 
 
@@ -411,7 +417,7 @@
 		"\n        dataType: "     << m_dataType <<
 		"\n        defaultValue: " << m_defaultValue <<
 		"\n        sendEvents: "   << m_sendEvents;
-	AddDebugLogLineM(false, logUPnP, msg);
+	AddDebugLogLineN(logUPnP, msg);
 }
 
 
@@ -475,7 +481,7 @@
 		msg << "Error generating scpdURL from " <<
 			"|" << URLBase << "|" <<
 			m_SCPDURL << "|.";
-		AddDebugLogLineM(false, logUPnP, msg);
+		AddDebugLogLineN(logUPnP, msg);
 	} else {
 		m_absSCPDURL = scpdURL;
 	}
@@ -491,7 +497,7 @@
 		msg << "Error generating controlURL from " <<
 			"|" << URLBase << "|" <<
 			m_controlURL << "|.";
-		AddDebugLogLineM(false, logUPnP, msg);
+		AddDebugLogLineN(logUPnP, msg);
 	} else {
 		m_absControlURL = controlURL;
 	}
@@ -507,7 +513,7 @@
 		msg << "Error generating eventURL from " <<
 			"|" << URLBase << "|" <<
 			m_eventSubURL << "|.";
-		AddDebugLogLineM(false, logUPnP, msg);
+		AddDebugLogLineN(logUPnP, msg);
 	} else {
 		m_absEventSubURL = eventURL;
 	}
@@ -521,7 +527,7 @@
 		"\n        absControlURL: "  << m_absControlURL <<
 		"\n        eventSubURL: "    << m_eventSubURL <<
 		"\n        absEventSubURL: " << m_absEventSubURL;
-	AddDebugLogLineM(false, logUPnP, msg);
+	AddDebugLogLineN(logUPnP, msg);
 
 	if (m_serviceType == upnpLib.UPNP_SERVICE_WAN_IP_CONNECTION ||
 	    m_serviceType == upnpLib.UPNP_SERVICE_WAN_PPP_CONNECTION) {
@@ -542,7 +548,7 @@
 			msg.str("");
 			msg << "WAN Service Detected: '" <<
 				m_serviceType << "'.";
-			AddDebugLogLineM(true, logUPnP, msg);
+			AddDebugLogLineC(logUPnP, msg);
 			// Subscribe
 			upnpLib.m_ctrlPoint.Subscribe(*this);
 #if 0
@@ -552,14 +558,14 @@
 			msg << "WAN service detected again: '" <<
 				m_serviceType <<
 				"'. Will only use the first instance.";
-			AddDebugLogLineM(true, logUPnP, msg);
+			AddDebugLogLineC(logUPnP, msg);
 		}
 #endif
 	} else {
 		msg.str("");
 		msg << "Uninteresting service detected: '" <<
 			m_serviceType << "'. Ignoring.";
-		AddDebugLogLineM(true, logUPnP, msg);
+		AddDebugLogLineC(logUPnP, msg);
 	}
 }
 
@@ -577,7 +583,7 @@
 	if (m_SCPD.get() == NULL) {
 		msg << "Service without SCPD Document, cannot execute action '" << ActionName <<
 			"' for service '" << GetServiceType() << "'.";
-		AddDebugLogLineM(false, logUPnP, msg);
+		AddDebugLogLineN(logUPnP, msg);
 		return false;
 	}
 	std::ostringstream msgAction("Sending action ");
@@ -587,7 +593,7 @@
 	if (itAction == m_SCPD->GetActionList().end()) {
 		msg << "Invalid action name '" << ActionName <<
 			"' for service '" << GetServiceType() << "'.";
-		AddDebugLogLineM(false, logUPnP, msg);
+		AddDebugLogLineN(logUPnP, msg);
 		return false;
 	}
 	msgAction << ActionName << "(";
@@ -601,7 +607,7 @@
 			msg << "Invalid argument name '" << ArgValue[i].GetArgument() <<
 				"' for action '" << action.GetName() <<
 				"' for service '" << GetServiceType() << "'.";
-			AddDebugLogLineM(false, logUPnP, msg);
+			AddDebugLogLineN(logUPnP, msg);
 			return false;
 		}
 		const CUPnPArgument &argument = *(itArg->second);
@@ -611,7 +617,7 @@
 				ArgValue[i].GetArgument() <<
 				"' for action '" << action.GetName() <<
 				"' for service '" << GetServiceType() << "'.";
-			AddDebugLogLineM(false, logUPnP, msg);
+			AddDebugLogLineN(logUPnP, msg);
 			return false;
 		}
 		const std::string relatedStateVariableName =
@@ -626,7 +632,7 @@
 					"' for argument '" << argument.GetName() <<
 					"' for action '" << action.GetName() <<
 					"' for service '" << GetServiceType() << "'.";
-				AddDebugLogLineM(false, logUPnP, msg);
+				AddDebugLogLineN(logUPnP, msg);
 				return false;
 			}
 			const CUPnPStateVariable &stateVariable = *(itSVT->second);
@@ -638,7 +644,7 @@
 					"' for argument '" << argument.GetName() <<
 					"' for action '" << action.GetName() <<
 					"' for service '" << GetServiceType() << "'.";
-				AddDebugLogLineM(false, logUPnP, msg);
+				AddDebugLogLineN(logUPnP, msg);
 				return false;
 			}
 		}
@@ -654,7 +660,7 @@
 			"'";
 	}
 	msgAction << ")";		
-	AddDebugLogLineM(false, logUPnP, msgAction);
+	AddDebugLogLineN(logUPnP, msgAction);
 	// Everything is ok, make the action
 	IXML_Document *ActionDoc = NULL;
 	if (ArgValue.size()) {
@@ -678,7 +684,7 @@
 			0, NULL);
 		if (!ActionDoc) {
 			msg << "Error: UpnpMakeAction returned NULL.";
-			AddLogLineM(false, logUPnP, msg);
+			AddLogLineU(false, logUPnP, msg);
 			return false;
 		}
 	}
@@ -744,7 +750,7 @@
 		"='" <<
 		StVarVal <<
 		"'.";
-	AddDebugLogLineM(false, logUPnP, msg);
+	AddDebugLogLineN(logUPnP, msg);
 	return stdEmptyString;
 }
 
@@ -784,7 +790,7 @@
 		msg << "Error generating presentationURL from " <<
 			"|" << URLBase << "|" <<
 			m_presentationURL << "|.";
-		AddDebugLogLineM(false, logUPnP, msg);
+		AddDebugLogLineN(logUPnP, msg);
 	} else {
 		m_presentationURL = presURL;
 	}
@@ -803,7 +809,7 @@
 		"\n        UDN: "               << m_UDN <<
 		"\n        UPC: "               << m_UPC <<
 		"\n        presentationURL: "   << m_presentationURL;
-	AddDebugLogLineM(false, logUPnP, msg);
+	AddDebugLogLineN(logUPnP, msg);
 }
 
 
@@ -829,7 +835,7 @@
 		"\n        Fixed URLBase: " << FixedURLBase <<
 		"\n        location: "      << m_location <<
 		"\n        expires: "       << m_expires;
-	AddDebugLogLineM(false, logUPnP, msg);
+	AddDebugLogLineN(logUPnP, msg);
 }
 
 
@@ -865,7 +871,7 @@
 	ipAddress = UpnpGetServerIpAddress();
 	msg << "bound to " << ipAddress << ":" <<
 		port << ".";
-	AddLogLineM(false, logUPnP, msg);
+	AddLogLineU(false, logUPnP, msg);
 	msg.str("");
 	ret = UpnpRegisterClient(
 		static_cast<Upnp_FunPtr>(&CUPnPControlPoint::Callback),
@@ -936,7 +942,7 @@
 		msg <<  "UPnP Error: "
 			"CUPnPControlPoint::AddPortMapping: "
 			"WAN Service not detected.";
-		AddLogLineM(true, logUPnP, msg);
+		AddLogLineU(true, logUPnP, msg);
 		return false;
 	}
 	
@@ -998,7 +1004,7 @@
 	msg << "CUPnPControlPoint::DeletePortMappings: "
 		"m_ActivePortMappingsMap.size() == " <<
 		m_ActivePortMappingsMap.size();
-	AddDebugLogLineM(false, logUPnP, msg);
+	AddDebugLogLineN(logUPnP, msg);
 	
 	// Not very good, must find a better test
 	PortMappingNumberOfEntries.str(
@@ -1072,7 +1078,7 @@
 		msg <<  "UPnP Error: "
 			"CUPnPControlPoint::DeletePortMapping: "
 			"WAN Service not detected.";
-		AddLogLineM(true, logUPnP, msg);
+		AddLogLineU(true, logUPnP, msg);
 		return false;
 	}
 	
@@ -1101,7 +1107,7 @@
 					"CUPnPControlPoint::DeletePortMapping: "
 					"Mapping was not found in the active "
 					"mapping map.";
-				AddLogLineM(true, logUPnP, msg);
+				AddLogLineU(true, logUPnP, msg);
 			}
 			
 			// Delete the port mapping
@@ -1114,7 +1120,7 @@
 	msg << "CUPnPControlPoint::DeletePortMappings: "
 		"m_ActivePortMappingsMap.size() == " <<
 		m_ActivePortMappingsMap.size();
-	AddDebugLogLineM(false, logUPnP, msg);
+	AddDebugLogLineN(logUPnP, msg);
 	
 	// Not very good, must find a better test
 	PortMappingNumberOfEntries.str(
@@ -1182,19 +1188,20 @@
 		int ret;
 		if (d_event->ErrCode != UPNP_E_SUCCESS) {
 			msg << upnpCP->m_upnpLib.GetUPnPErrorMessage(d_event->ErrCode) << ".";
-			AddDebugLogLineM(true, logUPnP, msg);
+			AddDebugLogLineC(logUPnP, msg);
 		}
 		// Get the XML tree device description in doc
 		ret = UpnpDownloadXmlDoc(d_event->Location, &doc); 
 		if (ret != UPNP_E_SUCCESS) {
 			msg << "Error retrieving device description from " <<
 				d_event->Location << ": " <<
-				upnpCP->m_upnpLib.GetUPnPErrorMessage(ret) << ".";
-			AddDebugLogLineM(true, logUPnP, msg);
+				upnpCP->m_upnpLib.GetUPnPErrorMessage(ret) <<
+				"(" << ret << ").";
+			AddDebugLogLineC(logUPnP, msg);
 		} else {
 			msg2 << "Retrieving device description from " <<
 				d_event->Location << ".";
-			AddDebugLogLineM(false, logUPnP, msg2);
+			AddDebugLogLineN(logUPnP, msg2);
 		}
 		if (doc) {
 			// Get the root node
@@ -1222,7 +1229,7 @@
 				// we don't want to spam our logs.
 				if (EventType != UPNP_DISCOVERY_ADVERTISEMENT_ALIVE) {
 					msg.str("Internet Gateway Device Detected.");
-					AddLogLineM(true, logUPnP, msg);
+					AddLogLineU(true, logUPnP, msg);
 				}
 				// Add the root device to our list
 				upnpCP->AddRootDevice(rootDevice, urlBase,
@@ -1237,7 +1244,7 @@
 		//fprintf(stderr, "Callback: UPNP_DISCOVERY_SEARCH_TIMEOUT\n");
 		// Search timeout
 		msg << "UPNP_DISCOVERY_SEARCH_TIMEOUT.";
-		AddDebugLogLineM(false, logUPnP, msg);
+		AddDebugLogLineN(logUPnP, msg);
 		
 		// Unlock the search timeout mutex
 		upnpCP->m_WaitForSearchTimeoutMutex.Unlock();
@@ -1252,7 +1259,7 @@
 			msg << "error(UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE): " <<
 				upnpCP->m_upnpLib.GetUPnPErrorMessage(dab_event->ErrCode) <<
 				".";
-			AddDebugLogLineM(true, logUPnP, msg);
+			AddDebugLogLineC(logUPnP, msg);
 		}
 		std::string devType = dab_event->DeviceType;
 		// Check for an InternetGatewayDevice and removes it from the list
@@ -1335,7 +1342,7 @@
 					es_event->PublisherUrl <<
 					"' with SID == '" <<
 					newSID << "'.";
-				AddDebugLogLineM(true, logUPnP, msg2);
+				AddDebugLogLineC(logUPnP, msg2);
 				// In principle, we should test to see if the
 				// service is the same. But here we only have one
 				// service, so...
@@ -1343,7 +1350,7 @@
 			} else {
 				msg << "Error: did not find service " <<
 					newSID << " in the service map.";
-				AddDebugLogLineM(true, logUPnP, msg);
+				AddDebugLogLineC(logUPnP, msg);
 			}
 		}
 		break;
@@ -1405,7 +1412,7 @@
 		msg << "error(UPNP_EVENT_SUBSCRIPTION_REQUEST): ";
 eventSubscriptionRequest:
 		msg << "This is not a UPnP Device, this is a UPnP Control Point, event ignored.";
-		AddDebugLogLineM(true, logUPnP, msg);
+		AddDebugLogLineC(logUPnP, msg);
 		break;
 	default:
 		// Humm, this is not good, we forgot to handle something...
@@ -1415,7 +1422,7 @@
 		msg << "error(UPnP::Callback): Event not handled:'" <<
 			EventType << "'.";
 		fprintf(stderr, "%s\n", msg.str().c_str());
-		AddDebugLogLineM(true, logUPnP, msg);
+		AddDebugLogLineC(logUPnP, msg);
 		// Better not throw in the callback. Who would catch it?
 		//throw CUPnPException(msg);
 		break;
@@ -1455,7 +1462,7 @@
 	} else {
 		msg << "\n    Empty property list.";
 	}
-	AddDebugLogLineM(true, logUPnP, msg);
+	AddDebugLogLineC(logUPnP, msg);
 	// Freeing that doc segfaults. Probably should not be freed.
 	//ixmlDocument_free(ChangedVariablesDoc);
 }
@@ -1526,7 +1533,7 @@
 		msg << "Successfully retrieved SCPD Document for service " <<
 			service.GetServiceType() << ", absEventSubURL: " <<
 			service.GetAbsEventSubURL() << ".";
-		AddLogLineM(true, logUPnP, msg);
+		AddLogLineU(true, logUPnP, msg);
 		msg.str("");
 
 		// Now try to subscribe to this service. If the subscription
@@ -1540,7 +1547,7 @@
 			msg << "Successfully subscribed to service " <<
 				service.GetServiceType() << ", absEventSubURL: " <<
 				service.GetAbsEventSubURL() << ".";
-			AddLogLineM(true, logUPnP, msg);
+			AddLogLineU(true, logUPnP, msg);
 		} else {
 			msg << "Error subscribing to service " <<
 				service.GetServiceType() << ", absEventSubURL: " <<
@@ -1551,14 +1558,14 @@
 	} else {
 		msg << "Error getting SCPD Document from " <<
 			service.GetAbsSCPDURL() << ".";
-		AddLogLineM(true, logUPnP, msg);
+		AddLogLineU(true, logUPnP, msg);
 	}
 	
 	return;
 
 	// Error processing	
 error:
-	AddLogLineM(true, logUPnP, msg);
+	AddLogLineU(true, logUPnP, msg);
 }
 
 
@@ -1571,5 +1578,4 @@
 	}
 }
 
-
-// File_checked_for_headers
+#endif /* ENABLE_UPNP */

aMule-2.2.6.tar.bz2/src/UPnPBase.h -> aMule-2.3.1.tar.bz2/src/UPnPBase.h Changed

aMule-2.2.6.tar.bz2/src/UPnPCompatibility.h -> aMule-2.3.1.tar.bz2/src/UPnPCompatibility.h Changed

aMule-2.3.1.tar.bz2/src/UpDownClientEC.h Added

@@ -0,0 +1,188 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Stu Redman ( sturedman@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 UPDOWNCLIENTEC_H
+#define UPDOWNCLIENTEC_H
+
+#include <ec/cpp/ECID.h>	// Needed for CECID
+#include "BitVector.h"		// Needed for BitVector
+#include "ClientRef.h"		// Needed for debug defines
+
+class CKnownFile;
+class CPartFile;
+class CFriend;
+
+
+class CUpDownClient : public CECID
+{
+	friend class CUpDownClientListRem;
+	friend class CClientRef;
+private:
+	/**
+	 * Please note that only the ClientList is allowed to delete the clients.
+	 */
+	~CUpDownClient();
+
+	/**
+	 * Reference count which is increased whenever client is linked to a clientref.
+	 * Clients are to be stored only by ClientRefs, CUpDownClient * are for temporary 
+	 * use only.
+	 * Linking is done only by CClientRef which is friend, so methods are private.
+	 */
+	uint16	m_linked;
+#ifdef DEBUG_ZOMBIE_CLIENTS
+	bool	m_linkedDebug;
+	std::multiset<wxString> m_linkedFrom;
+	void	Link(const wxString& from)		{ m_linked++; m_linkedFrom.insert(from); }
+	void	Unlink(const wxString& from);
+	wxString GetLinkedFrom() {
+		wxString ret;
+		for (std::multiset<wxString>::iterator it = m_linkedFrom.begin(); it != m_linkedFrom.end(); it++) {
+			ret += *it + wxT(", ");
+		}
+		return ret;
+	}
+#else
+	void	Link()		{ m_linked++; }
+	void	Unlink();
+#endif
+
+public:
+	CUpDownClient(class CEC_UpDownClient_Tag *);
+
+	void	RequestSharedFileList();
+
+
+// Wrapped by CClientRef
+	bool				ExtProtocolAvailable() const			{ return m_bEmuleProtocol; }
+	uint16				GetAvailablePartCount() const			{ return m_AvailPartCount; }
+	const wxString&		GetClientFilename() const				{ return m_clientFilename; }
+	const wxString&		GetClientModString() const				{ return m_strModVersion; }
+	const wxString&		GetClientOSInfo() const					{ return m_sClientOSInfo; }
+	uint8				GetClientSoft() const					{ return m_clientSoft; }
+	const wxString&		GetClientVerString() const				{ return m_fullClientVerString; }
+	uint64				GetDownloadedTotal() const;
+	uint8				GetDownloadState() const				{ return m_nDownloadState; }
+	CFriend*			GetFriend() const						{ return m_Friend; }
+	bool				GetFriendSlot() const					{ return m_bFriendSlot; }
+	wxString			GetFullIP() const						{ return Uint32toStringIP(m_dwUserIP); }
+	uint16				GetKadPort() const						{ return m_nKadPort; }
+	float				GetKBpsDown() const						{ return m_kBpsDown; }
+	uint32				GetIP() const							{ return m_dwUserIP; }
+	uint16				GetLastDownloadingPart() const			{ return m_lastDownloadingPart; }
+	uint16				GetNextRequestedPart() const			{ return m_nextRequestedPart; }
+	uint8				GetObfuscationStatus() const			{ return m_obfuscationStatus; }
+	uint16				GetOldRemoteQueueRank() const			{ return m_nOldRemoteQueueRank; }
+	const BitVector&	GetPartStatus() const					{ return m_downPartStatus; }
+	uint16				GetRemoteQueueRank() const				{ return m_nRemoteQueueRank; }
+	CPartFile*			GetRequestFile() const					{ return m_reqfile; }
+	uint32				GetScore() const						{ return m_score; }
+	double 				GetScoreRatio() const;
+	uint32				GetServerIP() const						{ return m_dwServerIP; }
+	const wxString		GetServerName() const					{ return m_ServerName; }
+	uint16				GetServerPort() const					{ return m_nServerPort; }
+	const wxString&		GetSoftStr() const						{ return m_clientSoftString; }
+	const wxString&		GetSoftVerStr() const					{ return m_clientVerString; }
+	ESourceFrom			GetSourceFrom() const					{ return m_nSourceFrom; }
+	uint64				GetTransferredDown() const				{ return m_nTransferredDown; }
+	uint64				GetTransferredUp() const				{ return m_nTransferredUp; }
+	uint32				GetUploadDatarate() const				{ return m_nUpDatarate; }
+	uint64				GetUploadedTotal() const;
+	const CKnownFile*	GetUploadFile() const					{ return m_uploadingfile; }
+	uint16				GetUploadQueueWaitingPosition() const	{ return m_waitingPosition; }
+	uint8				GetUploadState() const					{ return m_nUploadState; }
+	size_t				GetUpPartCount() const					{ return m_upPartStatus.size(); }
+	const CMD4Hash&		GetUserHash() const						{ return m_UserHash; }
+	uint32				GetUserIDHybrid() const					{ return m_nUserIDHybrid; }
+	const wxString&		GetUserName() const						{ return m_Username; }
+	uint16				GetUserPort() const						{ return m_nUserPort; }
+	uint32				GetVersion() const						{ return m_nClientVersion; }
+	bool				HasDisabledSharedFiles() const			{ return m_fNoViewSharedFiles; }
+	bool				HasLowID() const						{ return IsLowID(m_nUserIDHybrid); }
+	bool				IsBadGuy() const						{ return m_identState == IS_IDBADGUY; }
+	bool				IsFriend() const						{ return m_Friend != NULL; }
+	bool				IsIdentified() const					{ return m_identState == IS_IDENTIFIED; }
+	bool				IsRemoteQueueFull() const				{ return m_bRemoteQueueFull; }
+	bool				IsUpPartAvailable(uint16 iPart) const	{ return ( iPart < m_upPartStatus.size() ) ? m_upPartStatus.get(iPart) : 0; }
+	void				RequestSharedFileList() const;
+	void				SetFriend(CFriend* newfriend)			{ m_Friend = newfriend; }
+	void				SetFriendSlot(bool bNV)					{ m_bFriendSlot = bNV; }
+	bool				SUIFailed() const						{ return m_identState == IS_IDFAILED; }
+	bool				SUINeeded() const						{ return m_identState == IS_IDNEEDED; }
+	bool				SUINotSupported() const					{ return m_identState == IS_NOTAVAILABLE; }
+	bool				SwapToAnotherFile(bool bIgnoreNoNeeded, bool ignoreSuspensions, bool bRemoveCompletely, CPartFile* toFile = NULL);
+
+
+private:
+	bool		m_bEmuleProtocol;
+	uint16		m_AvailPartCount;
+	wxString	m_clientFilename;
+	wxString	m_strModVersion;
+	wxString	m_sClientOSInfo;
+	uint8		m_clientSoft;
+	wxString	m_fullClientVerString;
+	uint8		m_nDownloadState;
+	CFriend*	m_Friend;
+	bool		m_bFriendSlot;
+	uint16		m_nKadPort;
+	float		m_kBpsDown;
+	uint32		m_dwUserIP;
+	uint16		m_lastDownloadingPart;
+	uint16		m_nextRequestedPart;
+	uint8		m_obfuscationStatus;
+	uint16		m_nOldRemoteQueueRank;
+	BitVector	m_downPartStatus;
+	uint16		m_nRemoteQueueRank;
+	CPartFile*	m_reqfile;
+	uint32		m_score;
+	uint32		m_dwServerIP;
+	wxString	m_ServerName;
+	uint16		m_nServerPort;
+	wxString	m_clientSoftString;
+	wxString	m_clientVerString;
+	ESourceFrom	m_nSourceFrom;
+	uint64		m_nTransferredDown;
+	uint64		m_nTransferredUp;
+	uint32		m_nUpDatarate;
+	CKnownFile*	m_uploadingfile;
+	uint16		m_waitingPosition;
+	uint8		m_nUploadState;
+	BitVector	m_upPartStatus;
+	CMD4Hash	m_UserHash;
+	uint32		m_nUserIDHybrid;
+	wxString	m_Username;
+	uint16		m_nUserPort;
+	uint32		m_nClientVersion;
+	bool		m_fNoViewSharedFiles;
+	EIdentState	m_identState;
+	bool		m_bRemoteQueueFull;
+
+// other stuff
+	CClientCredits	*credits;
+};
+
+
+#endif
+

aMule-2.2.6.tar.bz2/src/UploadBandwidthThrottler.cpp -> aMule-2.3.1.tar.bz2/src/UploadBandwidthThrottler.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 // 
-// Copyright (C) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2005-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -35,7 +35,6 @@
 #include "ThrottledSocket.h"
 #include "Logger.h"
 #include "Preferences.h"
-#include "amule.h"
 #include "Statistics.h"
 
 #ifndef _MSC_VER
@@ -256,14 +255,16 @@
  */
 void UploadBandwidthThrottler::EndThread()
 {
-	{
-		wxMutexLocker lock(m_sendLocker);
+	if (m_doRun) {	// do it only once
+		{
+			wxMutexLocker lock(m_sendLocker);
 
-		// signal the thread to stop looping and exit.
-		m_doRun = false;
+			// signal the thread to stop looping and exit.
+			m_doRun = false;
+		}
+		
+		Wait();
 	}
-	
-	Wait();
 }
 
 
@@ -281,24 +282,20 @@
 {
 	const uint32 TIME_BETWEEN_UPLOAD_LOOPS = 1;
 	
-	uint32 lastLoopTick = ::GetTickCountFullRes();
-	sint64 realBytesToSpend = 0;
+	uint32 lastLoopTick = GetTickCountFullRes();
+	// Bytes to spend in current cycle. If we spend more this becomes negative and causes a wait next time.
+	sint32 bytesToSpend = 0;
 	uint32 allowedDataRate = 0;
 	uint32 rememberedSlotCounter = 0;
 	uint32 extraSleepTime = TIME_BETWEEN_UPLOAD_LOOPS;
 	
-	while (m_doRun) {
-		uint32 timeSinceLastLoop = ::GetTickCountFullRes() - lastLoopTick;
+	while (m_doRun && !TestDestroy()) {
+		uint32 timeSinceLastLoop = GetTickCountFullRes() - lastLoopTick;
 
-		// Get current speed from UploadSpeedSense
+		// Calculate data rate
 		if (thePrefs::GetMaxUpload() == UNLIMITED) {
-			// Try to increase the upload rate
-			if (theApp->uploadqueue) {
-				allowedDataRate = (uint32)theStats::GetUploadRate() + 5 * 1024;
-			} else {
-				// App not created yet or already destroyed.
-				allowedDataRate = (uint32)(-1);
-			}
+			// Try to increase the upload rate from UploadSpeedSense
+			allowedDataRate = (uint32)theStats::GetUploadRate() + 5 * 1024;
 		} else {
 			allowedDataRate = thePrefs::GetMaxUpload() * 1024;
 		}
@@ -312,54 +309,43 @@
 
 
 		uint32 sleepTime;
-		if(allowedDataRate == 0 || allowedDataRate == _UI32_MAX || realBytesToSpend >= 1000) {
-			// we could send at once, but sleep a while to not suck up all cpu
-			sleepTime = extraSleepTime;
+		if (bytesToSpend < 1) {
+			// We have sent more than allowed in last cycle so we have to wait now
+			// until we can send at least 1 byte.
+			sleepTime = std::max((-bytesToSpend + 1) * 1000 / allowedDataRate + 2, // add 2 ms to allow for rounding inaccuracies
+									extraSleepTime);
 		} else {
-			// sleep for just as long as we need to get back to having one byte to send
-			sleepTime = std::max((uint32)ceil((double)(-realBytesToSpend + 1000)/allowedDataRate), extraSleepTime);
+			// We could send at once, but sleep a while to not suck up all cpu
+			sleepTime = extraSleepTime;
 		}
 
-		if(timeSinceLastLoop < sleepTime) {
+		if (timeSinceLastLoop < sleepTime) {
 			Sleep(sleepTime-timeSinceLastLoop);
 		}
 
-		const uint32 thisLoopTick = ::GetTickCountFullRes();
-		timeSinceLastLoop = thisLoopTick - lastLoopTick;
+		// Check after sleep in case the thread has been signaled to end
+		if (!m_doRun || TestDestroy()) {
+			break;
+		}
 
-		// Calculate how many bytes we can spend
-		sint64 bytesToSpend = 0;
-
-		if(allowedDataRate != 0 && allowedDataRate != _UI32_MAX) {
-			// prevent overflow
-			if(timeSinceLastLoop == 0) {
-				// no time has passed, so don't add any bytes. Shouldn't happen.
-				bytesToSpend = 0; //realBytesToSpend/1000;
-			} else if(_I64_MAX/timeSinceLastLoop > allowedDataRate && _I64_MAX-allowedDataRate*timeSinceLastLoop > realBytesToSpend) {
-				if(timeSinceLastLoop > sleepTime + 2000) {
-					AddDebugLogLineM(false, logGeneral, wxString::Format(wxT("UploadBandwidthThrottler: Time since last loop too long. time: %ims wanted: %ims Max: %ims"), timeSinceLastLoop, sleepTime, sleepTime + 2000));
-		
-					timeSinceLastLoop = sleepTime + 2000;
-					lastLoopTick = thisLoopTick - timeSinceLastLoop;
-				}
+		const uint32 thisLoopTick = GetTickCountFullRes();
+		timeSinceLastLoop = thisLoopTick - lastLoopTick;
+		lastLoopTick = thisLoopTick;
 
-				realBytesToSpend += allowedDataRate*timeSinceLastLoop;
+		if (timeSinceLastLoop > sleepTime + 2000) {
+			AddDebugLogLineN(logGeneral, CFormat(wxT("UploadBandwidthThrottler: Time since last loop too long. time: %ims wanted: %ims Max: %ims")) 
+				% timeSinceLastLoop % sleepTime % (sleepTime + 2000));
 
-				bytesToSpend = realBytesToSpend/1000;
-			} else {
-				realBytesToSpend = _I64_MAX;
-				bytesToSpend = _I32_MAX;
-			}
-		} else {
-			realBytesToSpend = 0; //_I64_MAX;
-			bytesToSpend = _I32_MAX;
+			timeSinceLastLoop = sleepTime + 2000;
 		}
 
-		lastLoopTick = thisLoopTick;
+		// Calculate how many bytes we can spend
 
-		if(bytesToSpend >= 1) {
-			uint64 spentBytes = 0;
-			uint64 spentOverhead = 0;
+		bytesToSpend += (sint32) (allowedDataRate / 1000.0 * timeSinceLastLoop);
+
+		if (bytesToSpend >= 1) {
+			sint32 spentBytes = 0;
+			sint32 spentOverhead = 0;
 
 			wxMutexLocker sendLock(m_sendLocker);
 
@@ -380,105 +366,89 @@
 			}
 	
 			// Send any queued up control packets first
-			while(bytesToSpend > 0 && spentBytes < (uint64)bytesToSpend && (!m_ControlQueueFirst_list.empty() || !m_ControlQueue_list.empty())) {
+			while (spentBytes < bytesToSpend && (!m_ControlQueueFirst_list.empty() || !m_ControlQueue_list.empty())) {
 				ThrottledControlSocket* socket = NULL;
 	
-				if(!m_ControlQueueFirst_list.empty()) {
+				if (!m_ControlQueueFirst_list.empty()) {
 					socket = m_ControlQueueFirst_list.front();
 					m_ControlQueueFirst_list.pop_front();
-				} else if(!m_ControlQueue_list.empty()) {
+				} else if (!m_ControlQueue_list.empty()) {
 					socket = m_ControlQueue_list.front();
 					m_ControlQueue_list.pop_front();
 				}
 	
-				if(socket != NULL) {
+				if (socket != NULL) {
 					SocketSentBytes socketSentBytes = socket->SendControlData(bytesToSpend-spentBytes, minFragSize);
-					uint32 lastSpentBytes = socketSentBytes.sentBytesControlPackets + socketSentBytes.sentBytesStandardPackets;
-					spentBytes += lastSpentBytes;
+					spentBytes += socketSentBytes.sentBytesControlPackets + socketSentBytes.sentBytesStandardPackets;
 					spentOverhead += socketSentBytes.sentBytesControlPackets;
 				}
 			}
 	
 			// Check if any sockets haven't gotten data for a long time. Then trickle them a package.
-			for ( uint32 slotCounter = 0; slotCounter < m_StandardOrder_list.size(); slotCounter++) {
+			uint32 slots = m_StandardOrder_list.size();
+			for (uint32 slotCounter = 0; slotCounter < slots; slotCounter++) {
 				ThrottledFileSocket* socket = m_StandardOrder_list[ slotCounter ];
 	
-				if(socket != NULL) {
-					if(thisLoopTick-socket->GetLastCalledSend() > SEC2MS(1)) {
+				if (socket != NULL) {
+					if (thisLoopTick-socket->GetLastCalledSend() > SEC2MS(1)) {
 						// trickle
 						uint32 neededBytes = socket->GetNeededBytes();
 	
-						if(neededBytes > 0) {
+						if (neededBytes > 0) {
 							SocketSentBytes socketSentBytes = socket->SendFileAndControlData(neededBytes, minFragSize);
-							uint32 lastSpentBytes = socketSentBytes.sentBytesControlPackets + socketSentBytes.sentBytesStandardPackets;
-							spentBytes += lastSpentBytes;
+							spentBytes += socketSentBytes.sentBytesControlPackets + socketSentBytes.sentBytesStandardPackets;
 							spentOverhead += socketSentBytes.sentBytesControlPackets;
 						}
 					}
 				} else {
-					AddDebugLogLineM(false, logGeneral, wxString::Format( wxT("There was a NULL socket in the UploadBandwidthThrottler Standard list (trickle)! Prevented usage. Index: %i Size: %i"), slotCounter, m_StandardOrder_list.size()) );
+					AddDebugLogLineN(logGeneral, CFormat( wxT("There was a NULL socket in the UploadBandwidthThrottler Standard list (trickle)! Prevented usage. Index: %i Size: %i"))
+						% slotCounter % m_StandardOrder_list.size());
 				}
 			}
 	
-			// Equal bandwidth for all slots
-			uint32 maxSlot = m_StandardOrder_list.size();
-			if(maxSlot > 0 && allowedDataRate/maxSlot < UPLOAD_CLIENT_DATARATE) {
-				maxSlot = allowedDataRate/UPLOAD_CLIENT_DATARATE;
-			}
-
-			for(uint32 maxCounter = 0; maxCounter < std::min(maxSlot, (uint32)m_StandardOrder_list.size()) && bytesToSpend > 0 && spentBytes < (uint64)bytesToSpend; maxCounter++) {
-				if(rememberedSlotCounter >= m_StandardOrder_list.size() ||
-				   rememberedSlotCounter >= maxSlot) {
+			// Give available bandwidth to slots, starting with the one we ended with last time.
+			// There are two passes. First pass gives packets of doubleSendSize, second pass
+			// gives as much as possible.
+			// Second pass starts with the last slot of the first pass actually.
+			for (uint32 slotCounter = 0; (slotCounter < slots * 2) && spentBytes < bytesToSpend; slotCounter++) {
+				if (rememberedSlotCounter >= slots) {	// wrap around pointer
 					rememberedSlotCounter = 0;
 				}
 
-				ThrottledFileSocket* socket = m_StandardOrder_list[ rememberedSlotCounter ];
+				uint32 data = (slotCounter < slots - 1)	? doubleSendSize				// pass 1
+															: (bytesToSpend - spentBytes);	// pass 2
 
-				if(socket != NULL) {
-					SocketSentBytes socketSentBytes = socket->SendFileAndControlData(std::min(doubleSendSize, (uint32)(bytesToSpend-spentBytes)), doubleSendSize);
-					uint32 lastSpentBytes = socketSentBytes.sentBytesControlPackets + socketSentBytes.sentBytesStandardPackets;
+				ThrottledFileSocket* socket = m_StandardOrder_list[ rememberedSlotCounter ];
 
-					spentBytes += lastSpentBytes;
+				if (socket != NULL) {
+					SocketSentBytes socketSentBytes = socket->SendFileAndControlData(data, doubleSendSize);
+					spentBytes += socketSentBytes.sentBytesControlPackets + socketSentBytes.sentBytesStandardPackets;
 					spentOverhead += socketSentBytes.sentBytesControlPackets;
 				} else {
-					AddDebugLogLineM(false, logGeneral, wxString::Format( wxT("There was a NULL socket in the UploadBandwidthThrottler Standard list (equal-for-all)! Prevented usage. Index: %i Size: %i"), rememberedSlotCounter, m_StandardOrder_list.size()));
+					AddDebugLogLineN(logGeneral, CFormat(wxT("There was a NULL socket in the UploadBandwidthThrottler Standard list (equal-for-all)! Prevented usage. Index: %i Size: %i"))
+						% rememberedSlotCounter % m_StandardOrder_list.size());
 				}
 
 				rememberedSlotCounter++;
 			}
 
-			// Any bandwidth that hasn't been used yet are used first to last.
-			for(uint32 slotCounter = 0; slotCounter < m_StandardOrder_list.size() && bytesToSpend > 0 && spentBytes < (uint64)bytesToSpend; slotCounter++) {
-				ThrottledFileSocket* socket = m_StandardOrder_list[ slotCounter ];
-
-				if(socket != NULL) {
-					uint32 bytesToSpendTemp = bytesToSpend-spentBytes;
-					SocketSentBytes socketSentBytes = socket->SendFileAndControlData(bytesToSpendTemp, doubleSendSize);
-					uint32 lastSpentBytes = socketSentBytes.sentBytesControlPackets + socketSentBytes.sentBytesStandardPackets;
-					spentBytes += lastSpentBytes;
-					spentOverhead += socketSentBytes.sentBytesControlPackets;
-				} else {
-					AddDebugLogLineM( false, logGeneral, wxString::Format( wxT("There was a NULL socket in the UploadBandwidthThrottler Standard list (fully activated)! Prevented usage. Index: %i Size: %i"), slotCounter, m_StandardOrder_list.size()));
-				}
-			}
-			realBytesToSpend -= spentBytes*1000;
+			// Do some limiting of what we keep for the next loop.
+			bytesToSpend -= spentBytes;
+			sint32 minBytesToSpend = (slots + 1) * minFragSize;
 
-			if(realBytesToSpend < -(((sint64)m_StandardOrder_list.size()+1)*minFragSize)*1000) {
-				sint64 newRealBytesToSpend = -(((sint64)m_StandardOrder_list.size()+1)*minFragSize)*1000;
-	
-				realBytesToSpend = newRealBytesToSpend;
+			if (bytesToSpend < - minBytesToSpend) {
+				bytesToSpend = - minBytesToSpend;
 			} else {
-				uint64 bandwidthSavedTolerance = m_StandardOrder_list.size()*512*1000;
-				if(realBytesToSpend > 0 && (uint64)realBytesToSpend > 999+bandwidthSavedTolerance) {
-					sint64 newRealBytesToSpend = 999+bandwidthSavedTolerance;
-					realBytesToSpend = newRealBytesToSpend;
+				sint32 bandwidthSavedTolerance = slots * 512 + 1;
+				if (bytesToSpend > bandwidthSavedTolerance) {
+					bytesToSpend = bandwidthSavedTolerance;
 				}
 			}
 			
 			m_SentBytesSinceLastCall += spentBytes;
 			m_SentBytesSinceLastCallOverhead += spentOverhead;
 
-			if ((spentBytes == 0) && (spentOverhead == 0)) {
+			if (spentBytes == 0) {	// spentBytes includes the overhead
 				extraSleepTime = std::min<uint32>(extraSleepTime * 5, 1000); // 1s at most
 			} else {
 				extraSleepTime = TIME_BETWEEN_UPLOAD_LOOPS;

aMule-2.2.6.tar.bz2/src/UploadBandwidthThrottler.h -> aMule-2.3.1.tar.bz2/src/UploadBandwidthThrottler.h Changed

aMule-2.2.6.tar.bz2/src/UploadClient.cpp -> aMule-2.3.1.tar.bz2/src/UploadClient.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -23,7 +23,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#include "updownclient.h"	// Interface
+#include "updownclient.h"		// Needed for CUpDownClient
 
 #include <protocol/Protocols.h>
 #include <protocol/ed2k/Client2Client/TCP.h>
@@ -42,9 +42,9 @@
 #include "ClientList.h"
 #include "Statistics.h"		// Needed for theStats
 #include "Logger.h"
-#include <common/Format.h>
 #include "ScopedPtr.h"		// Needed for CScopedArray
 #include "GuiEvents.h"		// Needed for Notify_*
+#include "FileArea.h"		// Needed for CFileArea
 
 
 //	members of CUpDownClient
@@ -69,8 +69,7 @@
 	}
 }
 
-#ifndef CLIENT_GUI
-uint32 CUpDownClient::GetScore(bool sysvalue, bool isdownloading, bool onlybasevalue) const
+uint32 CUpDownClient::CalculateScoreInternal()
 {
 	//TODO: complete this (friends, uploadspeed, amuleuser etc etc)
 	if (m_Username.IsEmpty()) {
@@ -99,67 +98,52 @@
 	if (IsBanned())
 		return 0;
 
-	if (sysvalue && HasLowID() && !IsConnected()){
+	// score applies only to waiting clients, not to downloading clients
+	if (IsDownloading()) {
 		return 0;
-	}	
-
-	// TODO coded by tecxx & herbert, one yet unsolved problem here:
-	// sometimes a client asks for 2 files and there is no way to decide, which file the 
-	// client finally gets. so it could happen that he is queued first because of a 
-	// high prio file, but then asks for something completely different.
-	int filepriority = 10; // standard
-	if(pFile != NULL){ 
-		switch(pFile->GetUpPriority()) {
-		        case PR_POWERSHARE: //added for powershare (deltaHF)
-				filepriority = 2500; 
-				break; //end
-			case PR_VERYHIGH:
-				filepriority = 18;
-				break;
-			case PR_HIGH:
-				filepriority = 9;
-				break;
-			case PR_LOW:
-				filepriority = 6;
-				break;
-			case PR_VERYLOW:
-				filepriority = 2;
-				break;
-			case PR_NORMAL:
-			default:
-				filepriority = 7;
-				break;
-		}
 	}
+
 	// calculate score, based on waitingtime and other factors
-	float fBaseValue;
-	if (onlybasevalue) {
-		fBaseValue = 100;
-	} else if (!isdownloading) {
-		fBaseValue = (float)(::GetTickCount()-GetWaitStartTime())/1000;
-	} else {
-		// we dont want one client to download forever
-		// the first 15 min downloadtime counts as 15 min waitingtime and you get
-		// a 15 min bonus while you are in the first 15 min :)
-		// (to avoid 20 sec downloads) after this the score won't raise anymore 
-		fBaseValue = (float)(m_dwUploadTime-GetWaitStartTime());
-		wxASSERT( m_dwUploadTime > GetWaitStartTime()); // Obviously
-		fBaseValue += (float)(::GetTickCount() - m_dwUploadTime > 900000)? 900000:1800000;
-		fBaseValue /= 1000;
-	}
+	float fBaseValue = (float)(::GetTickCount()-GetWaitStartTime())/1000;
 	
-	float modif = GetScoreRatio();
-	fBaseValue *= modif;
+	fBaseValue *= GetScoreRatio();	// credits
 	
-	if (!onlybasevalue) {
-		fBaseValue *= (float(filepriority)/10.0f);
-	}
-	if( (IsEmuleClient() || GetClientSoft() < 10) && m_byEmuleVersion <= 0x19) {
+	// Take file upload priority into account
+	//
+	// One yet unsolved problem here:
+	// sometimes a client asks for 2 files and there is no way to decide, which file the 
+	// client finally gets. so it could happen that he is queued first because of a 
+	// high prio file, but then asks for something completely different.
+	float filepriority;
+	switch (pFile->GetUpPriority()) {
+		case PR_POWERSHARE:
+			filepriority = 250.0f; 
+			break;
+		case PR_VERYHIGH:
+			filepriority = 1.8f;
+			break;
+		case PR_HIGH:
+			filepriority = 0.9f;
+			break;
+		case PR_LOW:
+			filepriority = 0.6f;
+			break;
+		case PR_VERYLOW:
+			filepriority = 0.2f;
+			break;
+		case PR_NORMAL:
+		default:
+			filepriority = 0.7f;
+			break;
+	}
+	fBaseValue *= filepriority;
+
+	if ( (IsEmuleClient() || GetClientSoft() < 10) && m_byEmuleVersion <= 0x19) {
 		fBaseValue *= 0.5f;
 	}
 	return (uint32)fBaseValue;
 }
-#endif
+
 
 // Checks if it is next requested block from another chunk of the actual file or from another file 
 // 
@@ -190,12 +174,12 @@
 		// Test is we are asking same file and same part
 		if ( last_done_part != next_requested_part) { 
 			different_part = true;
-			AddDebugLogLineM(false, logClient, wxT("Session ended due to new chunk."));
+			AddDebugLogLineN(logClient, wxT("Session ended due to new chunk."));
 		}
 	
 		if (md4cmp(last_done_block->FileID, next_requested_block->FileID) != 0) { 
 			different_part = true;
-			AddDebugLogLineM(false, logClient, wxT("Session ended due to different file."));
+			AddDebugLogLineN(logClient, wxT("Session ended due to different file."));
 		}
 	} 
 
@@ -205,18 +189,10 @@
 
 void CUpDownClient::CreateNextBlockPackage()
 {
-	// See if we can do an early return. There may be no new blocks to load from disk and add to buffer, or buffer may be large enough allready.
-	if(m_BlockRequests_queue.empty() || // There are no new blocks requested
-		m_addedPayloadQueueSession > GetQueueSessionPayloadUp() && m_addedPayloadQueueSession-GetQueueSessionPayloadUp() > 50*1024) { // the buffered data is large enough allready
-		return;
-	}
-
-	CFile file;
-	CPath fullname;
 	try {
-	// Buffer new data if current buffer is less than 100 KBytes
-	while ((!m_BlockRequests_queue.empty()) &&
-		(m_addedPayloadQueueSession <= GetQueueSessionPayloadUp() || m_addedPayloadQueueSession-GetQueueSessionPayloadUp() < 100*1024)) {
+		// Buffer new data if current buffer is less than 100 KBytes
+		while (!m_BlockRequests_queue.empty()
+			   && m_addedPayloadQueueSession - m_nCurQueueSessionPayloadUp < 100*1024) {
 
 			Requested_Block_Struct* currentblock = m_BlockRequests_queue.front();
 			CKnownFile* srcfile = theApp->sharedfiles->GetFileByID(CMD4Hash(currentblock->FileID));
@@ -225,86 +201,58 @@
 				throw wxString(wxT("requested file not found"));
 			}
 
-			if (srcfile->IsPartFile() && ((CPartFile*)srcfile)->GetStatus() != PS_COMPLETE) {
-				//#warning This seems a good idea from eMule. We must import this.
-				#if 0
-				// Do not access a part file, if it is currently moved into the incoming directory.
-				// Because the moving of part file into the incoming directory may take a noticable 
-				// amount of time, we can not wait for 'm_FileCompleteMutex' and block the main thread.
-				if (!((CPartFile*)srcfile)->m_FileCompleteMutex.Lock(0)){ // just do a quick test of the mutex's state and return if it's locked.
-					return;
-				}
-				lockFile.m_pObject = &((CPartFile*)srcfile)->m_FileCompleteMutex;
-				// If it's a part file which we are uploading the file remains locked until we've read the
-				// current block. This way the file completion thread can not (try to) "move" the file into
-				// the incoming directory.
-				#endif
-
-				// Get the full path to the '.part' file
-				fullname = dynamic_cast<CPartFile*>(srcfile)->GetFullName().RemoveExt();
-			} else {
-				fullname = srcfile->GetFilePath().JoinPaths(srcfile->GetFileName());
-			}
-		
-			uint64 togo;
+			// Check if this know file is a CPartFile. 
+			// For completed part files IsPartFile() returns false, so they are 
+			// correctly treated as plain CKnownFile.
+			CPartFile* srcPartFile = srcfile->IsPartFile() ? (CPartFile*)srcfile : NULL;
+
 			// THIS EndOffset points BEHIND the last byte requested
 			// (other than the offsets used in the PartFile code)
 			if (currentblock->EndOffset > srcfile->GetFileSize()) {
-				throw wxString(wxT("Asked for data beyond end of file"));
+				throw wxString(CFormat(wxT("Asked for data up to %d beyond end of file (%d)"))
+									% currentblock->EndOffset % srcfile->GetFileSize());
 			} else if (currentblock->StartOffset > currentblock->EndOffset) { 
-				throw wxString(wxT("Asked for invalid block (start > end)"));
-			} else {
-				togo = currentblock->EndOffset - currentblock->StartOffset;
-				
-				if (srcfile->IsPartFile() && !((CPartFile*)srcfile)->IsComplete(currentblock->StartOffset,currentblock->EndOffset-1)) {
-					throw wxString(wxT("Asked for incomplete block "));
-				}
+				throw wxString(CFormat(wxT("Asked for invalid block (start %d > end %d)"))
+									% currentblock->StartOffset % currentblock->EndOffset);
 			}
 
+			uint64 togo = currentblock->EndOffset - currentblock->StartOffset;
+
 			if (togo > EMBLOCKSIZE * 3) {
-				throw wxString(wxT("Client requested too large of a block."));
+				throw wxString(CFormat(wxT("Client requested too large block (%d > %d)"))
+									% togo % (EMBLOCKSIZE * 3));
 			}
-		
-			CScopedArray<byte> filedata(NULL);	
-			if (!srcfile->IsPartFile()){
+
+			CFileArea area;
+			if (srcPartFile) {
+				if (!srcPartFile->IsComplete(currentblock->StartOffset,currentblock->EndOffset-1)) {
+					throw wxString(CFormat(wxT("Asked for incomplete block (%d - %d)"))
+									% currentblock->StartOffset % (currentblock->EndOffset-1));
+				}
+				if (!srcPartFile->ReadData(area, currentblock->StartOffset, togo)) {
+					throw wxString(wxT("Failed to read from requested partfile"));
+				}
+			} else {
+				CFileAutoClose file;
+				CPath fullname = srcfile->GetFilePath().JoinPaths(srcfile->GetFileName());
 				if ( !file.Open(fullname, CFile::read) ) {
-					// The file was most likely moved/deleted. However it is likely that the
-					// same is true for other files, so we recheck all shared files. 
-					AddLogLineM( false, CFormat( _("Failed to open file (%s), removing from list of shared files.") ) % srcfile->GetFileName() );
+					// The file was most likely moved/deleted. So remove it from the list of shared files.
+					AddLogLineN(CFormat( _("Failed to open file (%s), removing from list of shared files.") ) % srcfile->GetFileName() );
 					theApp->sharedfiles->RemoveFile(srcfile);
 					
 					throw wxString(wxT("Failed to open requested file: Removing from list of shared files!"));
-				}			
-			
-				file.Seek(currentblock->StartOffset, wxFromStart);
-				
-				filedata.reset(new byte[togo + 500]);
-				file.Read(filedata.get(), togo);
-				file.Close();
-			} else {
-				CPartFile* partfile = (CPartFile*)srcfile;
-				partfile->m_hpartfile.Seek(currentblock->StartOffset);
-				
-				filedata.reset(new byte[togo + 500]);
-				partfile->m_hpartfile.Read(filedata.get(), togo); 
-				// Partfile should NOT be closed!!!
+				}
+				area.ReadAt(file, currentblock->StartOffset, togo);
 			}
+			area.CheckError();
 
-			//#warning Part of the above import.
-			#if 0
-			if (lockFile.m_pObject){
-				lockFile.m_pObject->Unlock(); // Unlock the (part) file as soon as we are done with accessing it.
-				lockFile.m_pObject = NULL;
-			}
-			#endif
-	
 			SetUploadFileID(srcfile);
 
 			// check extention to decide whether to compress or not
 			if (m_byDataCompVer == 1 && GetFiletype(srcfile->GetFileName()) != ftArchive) {
-				CreatePackedPackets(filedata.get(), togo,currentblock);
+				CreatePackedPackets(area.GetBuffer(), togo, currentblock);
 			} else {
-				CreateStandartPackets(filedata.get(), togo,currentblock);
+				CreateStandardPackets(area.GetBuffer(), togo, currentblock);
 			}
 			
 			// file statistic
@@ -319,12 +267,14 @@
 		}
 
 		return;
-	} catch (const wxString& error) {
-		AddDebugLogLineM(false, logClient, wxT("Client '") + GetUserName() + wxT("' caused error while creating packet (") + error + wxT(") - disconnecting client"));
+	} catch (const wxString& DEBUG_ONLY(error)) {
+		AddDebugLogLineN(logClient, 
+			CFormat(wxT("Client '%s' (%s) caused error while creating packet (%s) - disconnecting client"))
+				% GetUserName() % GetFullIP() % error);
 	} catch (const CIOFailureException& error) {
-		AddDebugLogLineM(true, logClient, wxT("IO failure while reading requested file: ") + error.what());
+		AddDebugLogLineC(logClient, wxT("IO failure while reading requested file: ") + error.what());
 	} catch (const CEOFException& WXUNUSED(error)) {
-		AddDebugLogLineM(true, logClient, GetClientFullInfo() + wxT(" requested file-data at an invalid position - disconnecting"));
+		AddDebugLogLineC(logClient, GetClientFullInfo() + wxT(" requested file-data at an invalid position - disconnecting"));
 	}
 	
 	// Error occured.	
@@ -332,7 +282,7 @@
 }
 
 
-void CUpDownClient::CreateStandartPackets(const byte* buffer, uint32 togo, Requested_Block_Struct* currentblock)
+void CUpDownClient::CreateStandardPackets(const byte* buffer, uint32 togo, Requested_Block_Struct* currentblock)
 {
 	uint32 nPacketSize;
 
@@ -372,7 +322,9 @@
 		CPacket* packet = new CPacket(data, (bLargeBlocks ? OP_EMULEPROT : OP_EDONKEYPROT), (bLargeBlocks ? (uint8)OP_SENDINGPART_I64 : (uint8)OP_SENDINGPART));	
 		theStats::AddUpOverheadFileRequest(16 + 2 * (bLargeBlocks ? 8 :4));
 		theStats::AddUploadToSoft(GetClientSoft(), nPacketSize);
-		AddDebugLogLineM( false, logLocalClient, wxString::Format(wxT("Local Client: %s to "),(bLargeBlocks ? wxT("OP_SENDINGPART_I64") : wxT("OP_SENDINGPART"))) + GetFullIP() );
+		AddDebugLogLineN(logLocalClient, 
+			CFormat(wxT("Local Client: %s to %s"))
+				% (bLargeBlocks ? wxT("OP_SENDINGPART_I64") : wxT("OP_SENDINGPART")) % GetFullIP() );
 		m_socket->SendPacket(packet,true,false, nPacketSize);
 	}
 }
@@ -380,16 +332,15 @@
 
 void CUpDownClient::CreatePackedPackets(const byte* buffer, uint32 togo, Requested_Block_Struct* currentblock)
 {
-	byte* output = new byte[togo+300];
 	uLongf newsize = togo+300;
-	uint16 result = compress2(output, &newsize, buffer, togo,9);
+	CScopedArray<byte> output(newsize);
+	uint16 result = compress2(output.get(), &newsize, buffer, togo, 9);
 	if (result != Z_OK || togo <= newsize){
-		delete[] output;
-		CreateStandartPackets(buffer, togo, currentblock);
+		CreateStandardPackets(buffer, togo, currentblock);
 		return;
 	}
 	
-	CMemFile memfile(output,newsize);
+	CMemFile memfile(output.get(), newsize);
 	
 	uint32 totalPayloadSize = 0;
 	uint32 oldSize = togo;
@@ -435,10 +386,11 @@
 		// put packet directly on socket
 		theStats::AddUpOverheadFileRequest(24);
 		theStats::AddUploadToSoft(GetClientSoft(), nPacketSize);
-		AddDebugLogLineM( false, logLocalClient, wxString::Format(wxT("Local Client: %s to "), (isLargeBlock ? wxT("OP_COMPRESSEDPART_I64") : wxT("OP_COMPRESSEDPART"))) + GetFullIP() );
+		AddDebugLogLineN(logLocalClient, 
+			CFormat(wxT("Local Client: %s to %s"))
+				% (isLargeBlock ? wxT("OP_COMPRESSEDPART_I64") : wxT("OP_COMPRESSEDPART")) % GetFullIP() );
 		m_socket->SendPacket(packet,true,false, payloadSize);			
 	}
-	delete[] output;
 }
 
 
@@ -461,7 +413,7 @@
 	
 	uint16 nED2KUpPartCount = data->ReadUInt16();
 	if (!nED2KUpPartCount) {
-		m_upPartStatus.resize( tempreqfile->GetPartCount(), 0 );
+		m_upPartStatus.setsize( tempreqfile->GetPartCount(), 0 );
 	} else {
 		if (tempreqfile->GetED2KPartCount() != nED2KUpPartCount) {
 			// We already checked if we are talking about the same file.. So if we get here, something really strange happened!
@@ -469,14 +421,14 @@
 			return;
 		}
 	
-		m_upPartStatus.resize( tempreqfile->GetPartCount(), 0 );
+		m_upPartStatus.setsize( tempreqfile->GetPartCount(), 0 );
 	
 		try {
 			uint16 done = 0;
 			while (done != m_upPartStatus.size()) {
 				uint8 toread = data->ReadUInt8();
 				for (sint32 i = 0;i != 8;i++){
-					m_upPartStatus[done] = (toread>>i)&1;
+					m_upPartStatus.set(done, (toread>>i)&1);
 					//	We may want to use this for another feature..
 					//	if (m_upPartStatus[done] && !tempreqfile->IsComplete(done*PARTSIZE,((done+1)*PARTSIZE)-1))
 					// bPartsNeeded = true;
@@ -505,7 +457,7 @@
 	
 	m_uploadingfile->UpdateUpPartsFrequency( this, true ); // Increment
 	
-	Notify_QlistRefreshClient(this);
+	Notify_SharedCtrlRefreshClient(ECID(), AVAILABLE_SOURCE);
 }
 
 
@@ -524,8 +476,7 @@
 		
 		if (m_requpfileid != newreqfile->GetFileHash()) {
 			m_requpfileid = newreqfile->GetFileHash();
-			m_upPartStatus.clear();
-			m_upPartStatus.resize( newreqfile->GetPartCount(), 0 );
+			m_upPartStatus.setsize( newreqfile->GetPartCount(), 0 );
 		} else {
 			// this is the same file we already had assigned. Only update data.
 			newreqfile->UpdateUpPartsFrequency(this, true); // Increment
@@ -544,7 +495,7 @@
 void CUpDownClient::AddReqBlock(Requested_Block_Struct* reqblock)
 {
 	if (GetUploadState() != US_UPLOADING) {
-		AddDebugLogLineM(false, logRemoteClient, wxT("UploadClient: Client tried to add requested block when not in upload slot! Prevented requested blocks from being added."));
+		AddDebugLogLineN(logRemoteClient, wxT("UploadClient: Client tried to add requested block when not in upload slot! Prevented requested blocks from being added."));
 		delete reqblock;
 		return;
 	}
@@ -606,6 +557,20 @@
 }
 
 
+void CUpDownClient::ResetSessionUp()
+{
+	m_nCurSessionUp = m_nTransferredUp;
+	m_addedPayloadQueueSession = 0;
+	m_nCurQueueSessionPayloadUp = 0;
+	// If upload was resumed there can be a remaining payload in the socket
+	// causing (prepared - sent) getting negative. So reset the counter here.
+	if (m_socket) {
+		CEMSocket* s = m_socket;
+		s->GetSentPayloadSinceLastCallAndReset();
+	}
+}
+
+
 uint32 CUpDownClient::SendBlockData()
 {
     uint32 curTick = ::GetTickCount();
@@ -631,7 +596,7 @@
         m_nCurQueueSessionPayloadUp += sentBytesPayload;
 
         if (theApp->uploadqueue->CheckForTimeOver(this)) {
-            theApp->uploadqueue->RemoveFromUploadQueue(this, true);
+            theApp->uploadqueue->RemoveFromUploadQueue(this);
 			SendOutOfPartReqsAndAddToWaitingQueue();
         } else {
             // read blocks from file and put on socket
@@ -668,7 +633,7 @@
 	m_cSendblock++;
 	if (m_cSendblock == 30){
 		m_cSendblock = 0;
-		Notify_UploadCtrlRefreshClient(this);
+		Notify_SharedCtrlRefreshClient(ECID(), AVAILABLE_SOURCE);
 	}
 
     return sentBytesCompleteFile + sentBytesPartFile;
@@ -689,7 +654,7 @@
 	// Send this inmediately, don't queue.
 	CPacket* pPacket = new CPacket(OP_OUTOFPARTREQS, 0, OP_EDONKEYPROT);
 	theStats::AddUpOverheadFileRequest(pPacket->GetPacketSize());
-	AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_OUTOFPARTREQS to ") + GetFullIP() );
+	AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_OUTOFPARTREQS to ") + GetFullIP() );
 	SendPacket(pPacket, true, true);
 	
 	theApp->uploadqueue->AddClientToQueue(this);
@@ -715,7 +680,7 @@
 	if ( !file ) {
 		from_dq = true;
 		if ((file = theApp->downloadqueue->GetFileByID(forfileid)) == NULL) {
-			AddLogLineM(false, CFormat( _("Hashset requested for unknown file: %s") ) % forfileid.Encode() );
+			AddLogLineN(CFormat( _("Hashset requested for unknown file: %s") ) % forfileid.Encode() );
 		
 			return;
 		}
@@ -723,13 +688,13 @@
 	
 	if ( !file->GetHashCount() ) {
 		if (from_dq) {
-			AddDebugLogLineM(false, logRemoteClient, wxT("Requested hashset could not be found"));	
+			AddDebugLogLineN(logRemoteClient, wxT("Requested hashset could not be found"));
 			return;
 		} else {
 			file = theApp->downloadqueue->GetFileByID(forfileid);
 			if (!(file && file->GetHashCount())) {
-				AddDebugLogLineM(false, logRemoteClient, wxT("Requested hashset could not be found"));	
-				return;				
+				AddDebugLogLineN(logRemoteClient, wxT("Requested hashset could not be found"));
+				return;
 			}
 		}
 	}	
@@ -743,7 +708,7 @@
 	}
 	CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_HASHSETANSWER);	
 	theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-	AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_HASHSETANSWER to ") + GetFullIP());
+	AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_HASHSETANSWER to ") + GetFullIP());
 	SendPacket(packet,true,true);
 }
 
@@ -755,13 +720,12 @@
 	DeleteContents(m_DoneBlocks_list);
 }
 
-
 void CUpDownClient::SendRankingInfo(){
 	if (!ExtProtocolAvailable()) {
 		return;
 	}
 
-	uint16 nRank = theApp->uploadqueue->GetWaitingPosition(this);
+	uint16 nRank = GetUploadQueueWaitingPosition();
 	if (!nRank) {
 		return;
 	}
@@ -773,7 +737,7 @@
 	data.WriteUInt32(0); data.WriteUInt32(0); data.WriteUInt16(0);
 	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_QUEUERANKING);
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
-	AddDebugLogLineM(false, logLocalClient, wxT("Local Client: OP_QUEUERANKING to ") + GetFullIP());
+	AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_QUEUERANKING to ") + GetFullIP());
 	SendPacket(packet,true,true);
 }
 
@@ -799,7 +763,7 @@
 	
 	CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_FILEDESC);
 	theStats::AddUpOverheadOther(packet->GetPacketSize());
-	AddDebugLogLineM(false, logLocalClient, wxT("Local Client: OP_FILEDESC to ") + GetFullIP());	
+	AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_FILEDESC to ") + GetFullIP());
 	SendPacket(packet,true);
 }
 
@@ -810,20 +774,17 @@
 	theApp->clientlist->RemoveBannedClient( GetIP() );
 	SetUploadState(US_NONE);
 	ClearWaitStartTime();
-	
-	Notify_ShowQueueCount(theStats::GetWaitingUserCount());
 }
 
 void CUpDownClient::Ban(){
 	theApp->clientlist->AddTrackClient(this);
 	theApp->clientlist->AddBannedClient( GetIP() );
 	
-	AddDebugLogLineM( false, logClient, wxT("Client '") + GetUserName() + wxT("' seems to be an aggressive client and is banned from the uploadqueue"));
+	AddDebugLogLineN(logClient, wxT("Client '") + GetUserName() + wxT("' seems to be an aggressive client and is banned from the uploadqueue"));
 	
 	SetUploadState(US_BANNED);
 	
-	Notify_ShowQueueCount(theStats::GetWaitingUserCount());
-	Notify_QlistRefreshClient(this);
+	Notify_SharedCtrlRefreshClient(ECID(), UNAVAILABLE_SOURCE);
 }
 
 bool CUpDownClient::IsBanned() const
@@ -847,7 +808,7 @@
 		
 		// Is the client EVIL?
 		if ( m_Aggressiveness >= 10 && (!IsBanned() && m_nDownloadState != DS_DOWNLOADING )) {
-			AddDebugLogLineM( false, logClient, CFormat( wxT("Aggressive client banned (score: %d): %s -- %s -- %s") ) 
+			AddDebugLogLineN(logClient, CFormat( wxT("Aggressive client banned (score: %d): %s -- %s -- %s") )
 				% m_Aggressiveness
 				% m_Username
 				% m_strModVersion
@@ -903,10 +864,10 @@
 	}
 	
 	for (unsigned int i = 0; i < itemsof(auStartOffsets); i++) {
-		AddDebugLogLineM(false, logClient,
-			wxString::Format(wxT("Client requests %u"), i)
-			+ wxT(" ") + wxString::Format(wxT("File block %u-%u (%d bytes):"), auStartOffsets[i], auEndOffsets[i], auEndOffsets[i] - auStartOffsets[i])
-			+ wxT(" ") + GetFullIP());
+		AddDebugLogLineN(logClient,
+			CFormat(wxT("Client %s requests %d File block %d-%d (%d bytes):"))
+				% GetFullIP() % i % auStartOffsets[i] % auEndOffsets[i] 
+				% (auEndOffsets[i] - auStartOffsets[i]));
 		if (auEndOffsets[i] > auStartOffsets[i]) {
 			Requested_Block_Struct* reqblock = new Requested_Block_Struct;
 			reqblock->StartOffset = auStartOffsets[i];
@@ -916,7 +877,7 @@
 			AddReqBlock(reqblock);
 		} else {
 			if (auEndOffsets[i] != 0 || auStartOffsets[i] != 0) {
-				AddDebugLogLineM(false, logClient, wxT("Client request is invalid!"));
+				AddDebugLogLineN(logClient, wxT("Client request is invalid!"));
 			}
 		}
 	}	
@@ -935,14 +896,15 @@
 			// We have to do +1, because the block matching uses that.
 			reqblock->EndOffset = data.GetIntTagValue() + 1;
 			if ((reqblock->StartOffset || reqblock->EndOffset) && (reqblock->StartOffset > reqblock->EndOffset)) {
-				AddDebugLogLineM(false, logClient, wxString::Format(wxT("Client request is invalid! %i / %i"),reqblock->StartOffset, reqblock->EndOffset));
+				AddDebugLogLineN(logClient, CFormat(wxT("Client %s request is invalid! %d / %d"))
+					% GetFullIP() % reqblock->StartOffset % reqblock->EndOffset);
 				throw wxString(wxT("Client request is invalid!"));
 			}
 			
-			AddDebugLogLineM(false, logClient,
-				wxString::Format(wxT("Client requests %u"), i)
-				+ wxT(" ") + wxString::Format(wxT("File block %u-%u (%d bytes):"),reqblock->StartOffset, reqblock->EndOffset, reqblock->EndOffset - reqblock->StartOffset)
-				+= wxT(" ") + GetFullIP());
+			AddDebugLogLineN(logClient,
+				CFormat(wxT("Client %s requests %d File block %d-%d (%d bytes):"))
+					% GetFullIP() % i % reqblock->StartOffset % reqblock->EndOffset
+					% (reqblock->EndOffset - reqblock->StartOffset));
 			
 			md4cpy(reqblock->FileID, reqfilehash.GetHash());
 			reqblock->transferred = 0;

aMule-2.2.6.tar.bz2/src/UploadQueue.cpp -> aMule-2.3.1.tar.bz2/src/UploadQueue.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -56,6 +56,9 @@
 #include <common/Format.h>
 #include "UploadBandwidthThrottler.h"
 #include "GuiEvents.h"		// Needed for Notify_*
+#include "ListenSocket.h"
+#include "DownloadQueue.h"
+#include "PartFile.h"
 
 
 //TODO rewrite the whole networkcode, use overlapped sockets
@@ -63,90 +66,133 @@
 CUploadQueue::CUploadQueue()
 {
 	m_nLastStartUpload = 0;
-
+	m_lastSort = 0;
 	lastupslotHighID = true;
+	m_allowKicking = true;
+	m_allUploadingKnownFile = new CKnownFile;
 }
 
 
-void CUploadQueue::AddUpNextClient(CUpDownClient* directadd)
+void CUploadQueue::SortGetBestClient(CClientRef * bestClient)
 {
-	CClientPtrList::iterator toadd = m_waitinglist.end();
-	CClientPtrList::iterator toaddlow = m_waitinglist.end();
-	
-	uint32_t bestscore = 0;
-	uint32_t bestlowscore = 0;
-
-	CUpDownClient* newclient;
-	// select next client or use given client
-	if (!directadd) {
-		// Track if we purged any clients from the queue, as to only send one notify in total
-		bool purged = false;
-		
-		CClientPtrList::iterator it = m_waitinglist.begin();
-		for (; it != m_waitinglist.end(); ) {
-			CClientPtrList::iterator tmp_it = it++;
-			CUpDownClient* cur_client = *tmp_it;
-
-			// clear dead clients
-			if ( (::GetTickCount() - cur_client->GetLastUpRequest() > MAX_PURGEQUEUETIME) || !theApp->sharedfiles->GetFileByID(cur_client->GetUploadFileID()) ) {
-				purged = true;
-				cur_client->ClearWaitStartTime();
-				RemoveFromWaitingQueue(tmp_it);
-				if (!cur_client->GetSocket()) {
-					if(cur_client->Disconnected(wxT("AddUpNextClient - purged"))) {
-						cur_client->Safe_Delete();
-						cur_client = NULL;
-					}
+	uint32 tick = GetTickCount();
+	m_lastSort = tick;
+	CClientRefList::iterator it = m_waitinglist.begin();
+	for (; it != m_waitinglist.end(); ) {
+		CClientRefList::iterator it2 = it++;
+		CUpDownClient* cur_client = it2->GetClient();
+
+		// clear dead clients
+		if (tick - cur_client->GetLastUpRequest() > MAX_PURGEQUEUETIME 
+			|| !theApp->sharedfiles->GetFileByID(cur_client->GetUploadFileID())) {
+			cur_client->ClearWaitStartTime();
+			RemoveFromWaitingQueue(it2);
+			if (!cur_client->GetSocket()) {
+				if (cur_client->Disconnected(wxT("AddUpNextClient - purged"))) {
+					cur_client->Safe_Delete();
+					cur_client = NULL;
 				}
-				continue;
-			} 
+			}
+			continue;
+		} 
 
-			suspendlist::iterator it2 = std::find( suspended_uploads_list.begin(),
-			                                      suspended_uploads_list.end(),
-			                                      cur_client->GetUploadFileID() );
-			if (cur_client->IsBanned() || it2 != suspended_uploads_list.end() ) { // Banned client or suspended upload ?
-			        continue;
+		if (cur_client->IsBanned() || IsSuspended(cur_client->GetUploadFileID())) { // Banned client or suspended upload ?
+			cur_client->ClearScore();
+			continue;
+		}
+		// finished clearing
+
+		// Calculate score of current client
+		uint32 cur_score = cur_client->CalculateScore();
+		// Check if it's better than that of a previous one, and move it up then.
+		CClientRefList::iterator it1 = it2;
+		while (it1 != m_waitinglist.begin()) {
+			it1--;
+			if (cur_score > it1->GetClient()->GetScore()) {
+				// swap them
+				std::swap(*it2, *it1);
+				it2--;
+			} else {
+				// no need to check further since list is already sorted
+				break;
 			}
-			// finished clearing
-			
-			uint32_t cur_score = cur_client->GetScore(true);
-			if (cur_score > bestscore) {
-				bestscore = cur_score;
-				toadd = tmp_it;
+		}
+	}
+
+	// Second Pass:
+	// - calculate queue rank
+	// - find best high id client
+	// - mark all better low id clients as enabled for upload
+	uint16 rank = 1;
+	bool bestClientFound = false;
+	for (it = m_waitinglist.begin(); it != m_waitinglist.end(); ) {
+		CClientRefList::iterator it2 = it++;
+		CUpDownClient* cur_client = it2->GetClient();
+		cur_client->SetUploadQueueWaitingPosition(rank++);
+		if (bestClientFound) {
+			// There's a better high id client
+			cur_client->m_bAddNextConnect = false;
+		} else {
+			if (cur_client->HasLowID() && !cur_client->IsConnected()) {
+				// No better high id client, so start upload to this one once it connects
+				cur_client->m_bAddNextConnect = true;
 			} else {
-				cur_score = cur_client->GetScore(false);
-				if ((cur_score > bestlowscore) && !cur_client->m_bAddNextConnect){
-					bestlowscore = cur_score;
-					toaddlow = tmp_it;
+				// We found a high id client (or a currently connected low id client)
+				bestClientFound = true;
+				cur_client->m_bAddNextConnect = false;
+				if (bestClient) {
+					bestClient->Link(cur_client CLIENT_DEBUGSTRING("CUploadQueue::SortGetBestClient"));
+					RemoveFromWaitingQueue(it2);
+					rank--;
+					lastupslotHighID = true; // VQB LowID alternate
 				}
 			}
 		}
+	}
 
-		// Update the count on GUI if any clients were purged
-		if (purged) {
-			Notify_ShowQueueCount(m_waitinglist.size());
-		}
+#ifdef __DEBUG__
+	AddDebugLogLineN(logLocalClient, CFormat(wxT("Current UL queue (%d):")) % (rank - 1));
+	for (it = m_waitinglist.begin(); it != m_waitinglist.end(); it++) {
+		CUpDownClient* c = it->GetClient();
+		AddDebugLogLineN(logLocalClient, CFormat(wxT("%4d %7d  %s %5d  %s"))
+			% c->GetUploadQueueWaitingPosition()
+			% c->GetScore()
+			% (c->HasLowID() ? (c->IsConnected() ? wxT("LoCon") : wxT("LowId")) : wxT("High "))
+			% c->ECID()
+			% c->GetUserName()
+			);
+	}
+#endif	// __DEBUG__
+}
 
-		if (bestlowscore > bestscore){
-			newclient = *toaddlow;
-			newclient->m_bAddNextConnect = true;
-		}
 
-		if (toadd == m_waitinglist.end()) {
+void CUploadQueue::AddUpNextClient(CUpDownClient* directadd)
+{
+	CUpDownClient* newclient = NULL;
+	CClientRef newClientRef;
+	// select next client or use given client
+	if (!directadd) {
+		SortGetBestClient(&newClientRef);
+		newclient = newClientRef.GetClient();
+#if EXTENDED_UPLOADQUEUE
+		if (!newclient) {
+			// Nothing to upload. Try to find something from the sources.
+			if (PopulatePossiblyWaitingList() > 0) {
+				newClientRef = * m_possiblyWaitingList.begin();
+				m_possiblyWaitingList.pop_front();
+				newclient = newClientRef.GetClient();
+				AddDebugLogLineN( logLocalClient, wxT("Added client from possiblyWaitingList ") + newclient->GetFullIP() );
+			}
+		}
+#endif
+		if (!newclient) {
 			return;
 		}
-		
-		newclient = *toadd;
-		lastupslotHighID = true; // VQB LowID alternate
-		RemoveFromWaitingQueue(toadd);
-		Notify_ShowQueueCount(m_waitinglist.size());
 	} else {
-		//prevent another potential access of a suspended upload
+		// Check if requested file is suspended or not shared (maybe deleted recently)
 
-		suspendlist::iterator it = std::find( suspended_uploads_list.begin(),
-		                                      suspended_uploads_list.end(),
-		                                      directadd->GetUploadFileID() );
-		if ( it != suspended_uploads_list.end() ) {
+		if (IsSuspended(directadd->GetUploadFileID())
+			|| !theApp->sharedfiles->GetFileByID(directadd->GetUploadFileID())) {
 			return;
 		} else {
 			newclient = directadd;
@@ -165,7 +211,7 @@
 	} else {
 		CPacket* packet = new CPacket(OP_ACCEPTUPLOADREQ, 0, OP_EDONKEYPROT);
 		theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-		AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ACCEPTUPLOADREQ to ") + newclient->GetFullIP() );
+		AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ACCEPTUPLOADREQ to ") + newclient->GetFullIP() );
 		newclient->SendPacket(packet,true);
 		newclient->SetUploadState(US_UPLOADING);
 	}
@@ -173,7 +219,8 @@
 	newclient->ResetSessionUp();
 
 	theApp->uploadBandwidthThrottler->AddToStandardList(m_uploadinglist.size(), newclient->GetSocket());
-	m_uploadinglist.push_back(newclient);
+	m_uploadinglist.push_back(CCLIENTREF(newclient, wxT("CUploadQueue::AddUpNextClient")));
+	m_allUploadingKnownFile->AddUploadingClient(newclient);
 	theStats::AddUploadingClient();
 
 	// Statistic
@@ -181,25 +228,48 @@
 	if (reqfile) {
 		reqfile->statistic.AddAccepted();
 	}
-	Notify_UploadCtrlAddClient(newclient);
+
+	Notify_SharedCtrlRefreshClient(newclient->ECID(), AVAILABLE_SOURCE);
 }
 
 void CUploadQueue::Process()
 {
-	if (AcceptNewClient() && !m_waitinglist.empty()) {
-		m_nLastStartUpload = ::GetTickCount();
+	// Check if someone's waiting, if there is a slot for him, 
+	// or if we should try to free a slot for him
+	uint32 tick = GetTickCount();
+	// Nobody waiting or upload started recently
+	// (Actually instead of "empty" it should check for "no HighID clients queued",
+	//  but the cost for that outweights the benefit. As it is, a slot will be freed
+	//  even if it can't be taken because all of the queue is LowID. But just one,
+	//  and the kicked client will instantly get it back if he has HighID.)
+	// Also, if we are running out of sockets, don't add new clients, but also don't kick existing ones,
+	// or uploading will cease right away.
+#if EXTENDED_UPLOADQUEUE
+	if (tick - m_nLastStartUpload < 1000
+#else
+	if (m_waitinglist.empty() || tick - m_nLastStartUpload < 1000
+#endif
+		|| theApp->listensocket->TooManySockets()) {
+		m_allowKicking = false;
+	// Already a slot free, try to fill it
+	} else if (m_uploadinglist.size() < GetMaxSlots()) {
+		m_allowKicking = false;
+		m_nLastStartUpload = tick;
 		AddUpNextClient();
+	// All slots taken, try to free one
+	} else {
+		m_allowKicking = true;
 	}
 
 	// The loop that feeds the upload slots with data.
-	CClientPtrList::iterator it = m_uploadinglist.begin();
+	CClientRefList::iterator it = m_uploadinglist.begin();
 	while (it != m_uploadinglist.end()) {
 		// Get the client. Note! Also updates pos as a side effect.
-		CUpDownClient* cur_client = *it++;
+		CUpDownClient* cur_client = it++->GetClient();
 		
 		// It seems chatting or friend slots can get stuck at times in upload.. This needs looked into..
 		if (!cur_client->GetSocket()) {
-			RemoveFromUploadQueue(cur_client, true);
+			RemoveFromUploadQueue(cur_client);
 			if(cur_client->Disconnected(_T("CUploadQueue::Process"))){
 				cur_client->Safe_Delete();
 			}
@@ -216,24 +286,22 @@
 	if (sentBytes) {
 		theStats::AddSentBytes(sentBytes);
 	}
+
+	// Periodically resort queue if it doesn't happen anyway
+	if ((sint32) (tick - m_lastSort) > MIN2MS(2)) {
+		SortGetBestClient();
+	}
 }
 
 
-bool CUploadQueue::AcceptNewClient()
+uint16 CUploadQueue::GetMaxSlots() const
 {
-	// check if we can allow a new client to start downloading from us
-	if (::GetTickCount() - m_nLastStartUpload < 1000 || m_uploadinglist.size() >= MAX_UP_CLIENTS_ALLOWED) {
-		return false;
-	}
-
+	uint16 nMaxSlots = 0;
 	float kBpsUpPerClient = (float)thePrefs::GetSlotAllocation();
-	float kBpsUp = theStats::GetUploadRate() / 1024.0f;
 	if (thePrefs::GetMaxUpload() == UNLIMITED) {
-		if (m_uploadinglist.size() < ((uint32)((kBpsUp)/kBpsUpPerClient)+2)) {
-			return true;
-		}
+		float kBpsUp = theStats::GetUploadRate() / 1024.0f;
+		nMaxSlots = (uint16)(kBpsUp / kBpsUpPerClient) + 2;
 	} else {
-		uint16 nMaxSlots = 0;
 		if (thePrefs::GetMaxUpload() >= 10) {
 			nMaxSlots = (uint16)floor((float)thePrefs::GetMaxUpload() / kBpsUpPerClient + 0.5);
 				// floor(x + 0.5) is a way of doing round(x) that works with gcc < 3 ...
@@ -243,12 +311,11 @@
 		} else {
 			nMaxSlots = MIN_UP_CLIENTS_ALLOWED;
 		}
-
-		if (m_uploadinglist.size() < nMaxSlots) {
-			return true;
-		}
 	}
-	return false;
+	if (nMaxSlots > MAX_UP_CLIENTS_ALLOWED) {
+		nMaxSlots = MAX_UP_CLIENTS_ALLOWED;
+	}
+	return nMaxSlots;
 }
 
 
@@ -256,20 +323,29 @@
 {
 	wxASSERT(m_waitinglist.empty());
 	wxASSERT(m_uploadinglist.empty());
+	delete m_allUploadingKnownFile;
 }
 
 
 bool CUploadQueue::IsOnUploadQueue(const CUpDownClient* client) const
 {
-	return std::find(m_waitinglist.begin(), m_waitinglist.end(), client)
-		!= m_waitinglist.end();
+	for (CClientRefList::const_iterator it = m_waitinglist.begin(); it != m_waitinglist.end(); it++) {
+		if (it->GetClient() == client) {
+			return true;
+		}
+	}
+	return false;
 }
 
 
-bool CUploadQueue::IsDownloading(CUpDownClient* client) const
+bool CUploadQueue::IsDownloading(const CUpDownClient* client) const
 {
-	return std::find(m_uploadinglist.begin(), m_uploadinglist.end(), client)
-		!= m_uploadinglist.end();
+	for (CClientRefList::const_iterator it = m_uploadinglist.begin(); it != m_uploadinglist.end(); it++) {
+		if (it->GetClient() == client) {
+			return true;
+		}
+	}
+	return false;
 }	
 
 
@@ -279,9 +355,9 @@
 	
 	int cMatches = 0;
 	
-	CClientPtrList::iterator it = m_waitinglist.begin();
+	CClientRefList::iterator it = m_waitinglist.begin();
 	for (; it != m_waitinglist.end(); ++it) {
-		CUpDownClient* cur_client = *it;
+		CUpDownClient* cur_client = it->GetClient();
 		
 		if ((dwIP == cur_client->GetIP()) && (nUDPPort == cur_client->GetUDPPort())) {
 			return cur_client;
@@ -322,14 +398,28 @@
 
 	CClientList::SourceList::iterator it = found.begin();
 	while (it != found.end()) {
-		CUpDownClient* cur_client = *it++;
+		CUpDownClient* cur_client = it++->GetClient();
 		
 		if ( IsOnUploadQueue( cur_client ) ) {
 			if ( cur_client == client ) {
-				if ( client->m_bAddNextConnect && ( ( m_uploadinglist.size() < thePrefs::GetMaxUpload() ) || ( thePrefs::GetMaxUpload() == UNLIMITED ) ) ) {
+				// This is where LowID clients get their upload slot assigned.
+				// They can't be contacted if they reach top of the queue, so they are just marked for uploading.
+				// When they reconnect next time AddClientToQueue() is called, and they get their slot
+				// through the connection they initiated.
+				// Since at that time no slot is free they get assigned an extra slot,
+				// so then the number of slots exceeds the configured number by one.
+				// To prevent a further increase no more LowID clients get a slot, until 
+				// - a HighID client has got one (which happens only after two clients 
+				//   have been kicked so a slot is free again)
+				// - or there is a free slot, which means there is no HighID client on queue
+				if (client->m_bAddNextConnect) {
+					uint16 maxSlots = GetMaxSlots();
 					if (lastupslotHighID) {
+						maxSlots++;
+					}
+					if (m_uploadinglist.size() < maxSlots) {
 						client->m_bAddNextConnect = false;
-						RemoveFromWaitingQueue(client, true);
+						RemoveFromWaitingQueue(client);
 						AddUpNextClient(client);
 						lastupslotHighID = false; // LowID alternate
 						return;
@@ -337,9 +427,8 @@
 				}
 
 				client->SendRankingInfo();
-				Notify_QlistRefreshClient(client);
+				Notify_SharedCtrlRefreshClient(client->ECID(), AVAILABLE_SOURCE);
 				return;
-
 			} else {
 				// Hash-clash, remove unidentified clients (possibly both)
 				
@@ -376,7 +465,7 @@
 
 	int ipCount = 0;
 	for ( it = found.begin(); it != found.end(); it++ ) {
-		if ( ( *it == client ) || IsOnUploadQueue( *it ) ) {
+		if ( ( it->GetClient() == client ) || IsOnUploadQueue( it->GetClient() ) ) {
 			ipCount++;
 		}
 	}
@@ -394,49 +483,53 @@
 		reqfile->statistic.AddRequest();
 	}
 
-	// TODO find better ways to cap the list
-	if (m_waitinglist.size() >= (thePrefs::GetQueueSize())) {
-		return;
-	}
-
 	if (client->IsDownloading()) {
 		// he's already downloading and wants probably only another file
 		CPacket* packet = new CPacket(OP_ACCEPTUPLOADREQ, 0, OP_EDONKEYPROT);
 		theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
-		AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_ACCEPTUPLOADREQ to ") + client->GetFullIP() );
+		AddDebugLogLineN( logLocalClient, wxT("Local Client: OP_ACCEPTUPLOADREQ to ") + client->GetFullIP() );
 		client->SendPacket(packet,true);
 		return;
 	}
 
-	if (m_waitinglist.empty() && AcceptNewClient()) {
+	// TODO find better ways to cap the list
+	if (m_waitinglist.size() >= (thePrefs::GetQueueSize())) {
+		return;
+	}
+
+	uint32 tick = GetTickCount();
+	client->ClearWaitStartTime();
+	// if possible start upload right away
+	if (m_waitinglist.empty() && tick - m_nLastStartUpload >= 1000 
+		&& m_uploadinglist.size() < GetMaxSlots()
+		 && !theApp->listensocket->TooManySockets()) {
 		AddUpNextClient(client);
-		m_nLastStartUpload = ::GetTickCount();
+		m_nLastStartUpload = tick;
 	} else {
-		m_waitinglist.push_back(client);
+		// add to waiting queue
+		m_waitinglist.push_back(CCLIENTREF(client, wxT("CUploadQueue::AddClientToQueue m_waitinglist.push_back")));
+		// and sort it to update queue ranks
+		SortGetBestClient();
 		theStats::AddWaitingClient();
-		client->ClearWaitStartTime();
 		client->ClearAskedCount();
 		client->SetUploadState(US_ONUPLOADQUEUE);
 		client->SendRankingInfo();
-		Notify_QlistAddClient(client);
-		Notify_ShowQueueCount(m_waitinglist.size());
+		//Notify_QlistAddClient(client);
 	}
 }
 
 
-bool CUploadQueue::RemoveFromUploadQueue(CUpDownClient* client, bool updatewindow)
+bool CUploadQueue::RemoveFromUploadQueue(CUpDownClient* client)
 {
 	// Keep track of this client
 	theApp->clientlist->AddTrackClient(client);
 	
-	CClientPtrList::iterator it = std::find(m_uploadinglist.begin(),
-			m_uploadinglist.end(), client);
+	CClientRefList::iterator it = std::find(m_uploadinglist.begin(),
+		m_uploadinglist.end(), CCLIENTREF(client, wxEmptyString));
 	
 	if (it != m_uploadinglist.end()) {
-		if (updatewindow) {
-			Notify_UploadCtrlRemoveClient(client);
-		}
 		m_uploadinglist.erase(it);
+		m_allUploadingKnownFile->RemoveUploadingClient(client);
 		theStats::RemoveUploadingClient();
 		if( client->GetTransferredUp() ) {
 			theStats::AddSuccessfulUpload();
@@ -455,44 +548,42 @@
 
 bool CUploadQueue::CheckForTimeOver(CUpDownClient* client)
 {
-	if (thePrefs::TransferFullChunks()) {
-		if( client->GetUpStartTimeDelay() > 3600000 ) { // Try to keep the clients from downloading forever.
-			return true;
-		}
-		// For some reason, some clients can continue to download after a chunk size.
-		// Are they redownloading the same chunk over and over????
-		if( client->GetSessionUp() > 10485760 ) {
-			return true;
-		}
-	} else {
-		CClientPtrList::iterator it = m_waitinglist.begin();
-		for (; it != m_waitinglist.end(); ++it ) {
-			if (client->GetScore(true,true) < (*it)->GetScore(true,false)) {
-				return true;
+	// Don't kick anybody if there's no need to
+	if (!m_allowKicking) {
+		return false;
+	}
+	// First, check if it is a VIP slot (friend or Release-Prio).
+	if (client->GetFriendSlot()) {
+		return false;	// never drop the friend
+	}
+	// Release-Prio and nobody on queue for it?
+	if (client->GetUploadFile()->GetUpPriority() == PR_POWERSHARE) {
+		// Keep it unless half of the UL slots are occupied with friends or Release uploads.
+		uint16 vips = 0;
+		for (CClientRefList::iterator it = m_uploadinglist.begin(); it != m_uploadinglist.end(); ++it) {
+			CUpDownClient* cur_client = it->GetClient();
+			if (cur_client->GetFriendSlot() || cur_client->GetUploadFile()->GetUpPriority() == PR_POWERSHARE) {
+				vips++;
 			}
 		}
-	}
-	
-	return false;
-}
-
-
-uint16 CUploadQueue::GetWaitingPosition(const CUpDownClient *client) const
-{
-	if ( !IsOnUploadQueue(client) ) {
-		return 0;
+		// allow if VIP uploads occupy at most half of the possible upload slots
+		if (vips <= GetMaxSlots() / 2) {
+			return false;
+		}
+		// Otherwise normal rules apply.
 	}
 
-	uint16 rank = 1;
-	const uint32 myscore = client->GetScore(false);
-	CClientPtrList::const_iterator it = m_waitinglist.begin();
-	for (; it != m_waitinglist.end(); ++it) {
-		if ((*it)->GetScore(false) > myscore) {
-			rank++;
-		}
+	// Ordinary slots
+	// "Transfer full chunks": drop client after 10 MB upload, or after an hour.
+	// (so average UL speed should at least be 2.84 kB/s)
+	// We don't track what he is downloading, but if it's all from one chunk he gets it.
+	if (client->GetUpStartTimeDelay() > 3600000 	// time: 1h
+		|| client->GetSessionUp() > 10485760) {		// data: 10MB
+		m_allowKicking = false;		// kick max one client per cycle
+		return true;
 	}
 	
-	return rank;
+	return false;
 }
 
 
@@ -501,74 +592,155 @@
  */
 void CUploadQueue::ResumeUpload( const CMD4Hash& filehash )
 {
-	//Find the position of the filehash in the list and remove it.
-	suspendlist::iterator it = std::find( suspended_uploads_list.begin(), 
-			                              suspended_uploads_list.end(),
-			                              filehash );
-	if ( it != suspended_uploads_list.end() )
-		suspended_uploads_list.erase( it );
-	
-	AddLogLineM( false, CFormat( _("Resuming uploads of file: %s" ) )
+	suspendedUploadsSet.erase(filehash);
+	AddLogLineN(CFormat( _("Resuming uploads of file: %s" ) )
 				% filehash.Encode() );
 }
 
 /*
- * This function adds a file indicated by filehash to suspended_uploads_list
+ * This function stops upload of a file indicated by filehash.
+ *
+ * a) teminate == false:
+ *    File is suspended while a download completes. Then it is resumed after completion,
+ *    so it makes sense to keep the client. Such files are kept in suspendedUploadsSet.
+ * b) teminate == true:
+ *    File is deleted. Then the client is not added to the waiting list.
+ *    Waiting clients are swept out with next run of AddUpNextClient,
+ *    because their file is not shared anymore.
  */
-void CUploadQueue::SuspendUpload( const CMD4Hash& filehash )
+uint16 CUploadQueue::SuspendUpload(const CMD4Hash& filehash, bool terminate)
 {
-	AddLogLineM( false, CFormat( _("Suspending upload of file: %s" ) )
+	AddLogLineN(CFormat( _("Suspending upload of file: %s" ) )
 				% filehash.Encode() );
+	uint16 removed = 0;
 
 	//Append the filehash to the list.
-	suspended_uploads_list.push_back(filehash);
-	wxString base16hash = filehash.Encode();
+	if (!terminate) {
+		suspendedUploadsSet.insert(filehash);
+	}
 
-	CClientPtrList::iterator it = m_uploadinglist.begin();
+	CClientRefList::iterator it = m_uploadinglist.begin();
 	while (it != m_uploadinglist.end()) {
-		CUpDownClient *potential = *it++;
+		CUpDownClient *potential = it++->GetClient();
 		//check if the client is uploading the file we need to suspend
-		if(potential->GetUploadFileID() == filehash) {
-			//remove the unlucky client from the upload queue and add to the waiting queue
-			RemoveFromUploadQueue(potential, true);
-
-			m_waitinglist.push_back(potential);
-			theStats::AddWaitingClient();
-			potential->SetUploadState(US_ONUPLOADQUEUE);
-			potential->SendRankingInfo();
-			Notify_QlistRefreshClient(potential);
-			Notify_ShowQueueCount(m_waitinglist.size());
+		if (potential->GetUploadFileID() == filehash) {
+			// remove the unlucky client from the upload queue
+			RemoveFromUploadQueue(potential);
+			// if suspend isn't permanent add it to the waiting queue
+			if (terminate) {
+				potential->SetUploadState(US_NONE);
+			} else {
+				m_waitinglist.push_back(CCLIENTREF(potential, wxT("CUploadQueue::SuspendUpload")));
+				theStats::AddWaitingClient();
+				potential->SetUploadState(US_ONUPLOADQUEUE);
+				potential->SendRankingInfo();
+				Notify_SharedCtrlRefreshClient(potential->ECID(), AVAILABLE_SOURCE);
+			}
+			removed++;
 		}
 	}
+	return removed;
 }
 
-bool CUploadQueue::RemoveFromWaitingQueue(CUpDownClient* client, bool updatewindow)
+bool CUploadQueue::RemoveFromWaitingQueue(CUpDownClient* client)
 {
-	CClientPtrList::iterator it = std::find(m_waitinglist.begin(),
-			m_waitinglist.end(), client);
-	
-	if (it != m_waitinglist.end()) {
-		RemoveFromWaitingQueue(it);
-		if (updatewindow) {
-			Notify_ShowQueueCount(m_waitinglist.size());
+	CClientRefList::iterator it = m_waitinglist.begin();
+
+	uint16 rank = 1;
+	while (it != m_waitinglist.end()) {
+		CClientRefList::iterator it1 = it++;
+		if (it1->GetClient() == client) {
+			RemoveFromWaitingQueue(it1);
+			// update ranks of remaining queue
+			while (it != m_waitinglist.end()) {
+				it->GetClient()->SetUploadQueueWaitingPosition(rank++);
+				it++;
+			}
+			return true;
 		}
-		return true;
-	} else {
-		return false;
+		rank++;
 	}
+	return false;
 }
 
 
-void CUploadQueue::RemoveFromWaitingQueue(CClientPtrList::iterator pos)
+void CUploadQueue::RemoveFromWaitingQueue(CClientRefList::iterator pos)
 {
-	CUpDownClient* todelete = *pos;
+	CUpDownClient* todelete = pos->GetClient();
 	m_waitinglist.erase(pos);
 	theStats::RemoveWaitingClient();
 	if( todelete->IsBanned() ) {
 		todelete->UnBan();
 	}
-	Notify_QlistRemoveClient(todelete);
+	//Notify_QlistRemoveClient(todelete);
 	todelete->SetUploadState(US_NONE);
+	todelete->ClearScore();
+	todelete->SetUploadQueueWaitingPosition(0);
 }
 
+#if EXTENDED_UPLOADQUEUE
+
+int CUploadQueue::PopulatePossiblyWaitingList()
+{
+	static uint32 lastPopulate = 0;
+	uint32 tick = GetTickCount();
+	int ret = m_possiblyWaitingList.size();
+	if (tick - lastPopulate > MIN2MS(15)) {
+		// repopulate in any case after this time
+		m_possiblyWaitingList.clear();
+	} else if (ret || tick - lastPopulate < SEC2MS(30)) {
+		// don't retry too fast if list is empty
+		return ret;
+	}
+	lastPopulate = tick;
+
+	// Get our downloads
+	int nrDownloads = theApp->downloadqueue->GetFileCount();
+	for (int idownload = 0; idownload < nrDownloads; idownload++) {
+		CPartFile * download = theApp->downloadqueue->GetFileByIndex(idownload);
+		if (!download || download->GetAvailablePartCount() == 0) {
+			continue;
+		}
+		const CKnownFile::SourceSet& sources = download->GetSourceList();
+		if (sources.empty()) {
+			continue;
+		}
+		// Make a table which parts are available. No need to notify a client 
+		// which needs nothing we have.
+		uint16 parts = download->GetPartCount();
+		std::vector<bool> partsAvailable;
+		partsAvailable.resize(parts);
+		for (uint32 i = parts; i--;) {
+			partsAvailable[i] = download->IsComplete(i);
+		}
+		for (CKnownFile::SourceSet::const_iterator it = sources.begin(); it != sources.end(); it++) {
+			// Iterate over our sources, find those where download == upload
+			CUpDownClient * client = it->GetClient();
+			if (!client || client->GetUploadFile() != download || client->HasLowID()) {
+				continue;
+			}
+			const BitVector& partStatus = client->GetPartStatus();
+			if (partStatus.size() != parts) {
+				continue;
+			}
+			// Do we have something for him?
+			bool haveSomething = false;
+			for (uint32 i = parts; i--;) {
+				if (partsAvailable[i] && !partStatus.get(i)) {
+					haveSomething = true;
+					break;
+				}
+			}
+			if (haveSomething) {
+				m_possiblyWaitingList.push_back(*it);
+			}
+		}
+	}
+	ret = m_possiblyWaitingList.size();
+	AddDebugLogLineN(logLocalClient, CFormat(wxT("Populated PossiblyWaitingList: %d")) % ret);
+	return ret;
+}
+
+#endif // EXTENDED_UPLOADQUEUE
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/UploadQueue.h -> aMule-2.3.1.tar.bz2/src/UploadQueue.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -26,10 +26,23 @@
 #ifndef UPLOADQUEUE_H
 #define UPLOADQUEUE_H
 
+#include "ClientRef.h"		// Needed for CClientRefList
 #include "MD4Hash.h"		// Needed for CMD4Hash
 
+// Experimental extended upload queue population
+//
+// When a client is set up from scratch (no shares, all downloads empty)
+// it takes a while after completion of the first downloaded chunks until
+// uploads start. Problem is, upload queue is empty, because clients that
+// find nothing to download don't stay queued.
+//
+// Set this to 1 for faster finding of upload slots in this case.
+// aMule will then try to contact its sources for uploading if the
+// upload queue is empty.
+#define EXTENDED_UPLOADQUEUE 0
 
 class CUpDownClient;
+class CKnownFile;
 
 class CUploadQueue
 {
@@ -38,34 +51,44 @@
 	~CUploadQueue();
 	void	Process();
 	void	AddClientToQueue(CUpDownClient* client);
-	bool	RemoveFromUploadQueue(CUpDownClient* client,bool updatewindow = true);
-	bool	RemoveFromWaitingQueue(CUpDownClient* client,bool updatewindow = true);
+	bool	RemoveFromUploadQueue(CUpDownClient* client);
+	bool	RemoveFromWaitingQueue(CUpDownClient* client);
 	bool	IsOnUploadQueue(const CUpDownClient* client) const;
-	bool	IsDownloading(CUpDownClient* client) const;
+	bool	IsDownloading(const CUpDownClient* client) const;
 	bool	CheckForTimeOver(CUpDownClient* client);
+	void	ResortQueue() { SortGetBestClient(); }
 	
-	const CClientPtrList& GetWaitingList() const { return m_waitinglist; }
-	const CClientPtrList& GetUploadingList() const { return m_uploadinglist; }
+	const CClientRefList& GetWaitingList() const { return m_waitinglist; }
+	const CClientRefList& GetUploadingList() const { return m_uploadinglist; }
 	
-	CUpDownClient* GetWaitingClientByIP(uint32 dwIP);
 	CUpDownClient* GetWaitingClientByIP_UDP(uint32 dwIP, uint16 nUDPPort, bool bIgnorePortOnUniqueIP, bool* pbMultipleIPs = NULL);
 
-	uint16	GetWaitingPosition(const CUpDownClient *client) const;
-	void	SuspendUpload(const CMD4Hash &);
+	uint16	SuspendUpload(const CMD4Hash &, bool terminate);
 	void	ResumeUpload(const CMD4Hash &);
+	CKnownFile* GetAllUploadingKnownFile() { return m_allUploadingKnownFile; }
 
 private:
-	void	RemoveFromWaitingQueue(CClientPtrList::iterator pos);
-	bool	AcceptNewClient();
+	void	RemoveFromWaitingQueue(CClientRefList::iterator pos);
+	uint16	GetMaxSlots() const;
 	void	AddUpNextClient(CUpDownClient* directadd = 0);
+	bool	IsSuspended(const CMD4Hash& hash) { return suspendedUploadsSet.find(hash) != suspendedUploadsSet.end(); }
+	void	SortGetBestClient(CClientRef * bestClient = NULL);
 
-	CClientPtrList m_waitinglist;
-	CClientPtrList m_uploadinglist;
-	
-	typedef std::list<CMD4Hash> suspendlist;
-	suspendlist suspended_uploads_list;  //list for suspended uploads
+	CClientRefList m_waitinglist;
+	CClientRefList m_uploadinglist;
+
+#if EXTENDED_UPLOADQUEUE
+	CClientRefList m_possiblyWaitingList;
+	int		PopulatePossiblyWaitingList();
+#endif
+
+	std::set<CMD4Hash> suspendedUploadsSet;  // set for suspended uploads
 	uint32	m_nLastStartUpload;
+	uint32	m_lastSort;
 	bool	lastupslotHighID; // VQB lowID alternation
+	bool	m_allowKicking;
+	// This KnownFile collects all currently uploading clients for display in the upload list control
+	CKnownFile * m_allUploadingKnownFile;
 };
 
 #endif // UPLOADQUEUE_H

aMule-2.2.6.tar.bz2/src/UserEvents.cpp -> aMule-2.3.1.tar.bz2/src/UserEvents.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2006-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
@@ -46,6 +46,8 @@
 	wxString gui_command;
 } s_EventList[] = {
 	USEREVENTS_EVENTLIST()
+	/* This macro expands to initialise the list of user event types. Example:
+	   { wxT("NewChatSession"), wxTRANSLATE("New chat session started"), false, wxEmptyString, false, wxEmptyString }, */
 };
 #undef USEREVENTS_EVENT
 
@@ -121,6 +123,11 @@
 	wxString command = cmd;
 	switch (event) {
 		USEREVENTS_EVENTLIST()
+		/* This macro expands to handle all user event types. Example:
+		   case CUserEvents::NewChatSession: {
+		       command.Replace( wxT("%SENDER"), *((wxString*)object) );
+			   break;
+		   } */
 	}
 	if (!command.empty()) {
 		CTerminationProcess *p = new CTerminationProcess(cmd);
@@ -128,8 +135,7 @@
 			// If wxExecute fails, we need to delete the CTerminationProcess
 			// otherwise it will leak.
 			delete p;
-			AddLogLineM(true,
-				CFormat(_("Failed to execute command `%s' on `%s' event.")) %
+			AddLogLineC(CFormat(_("Failed to execute command `%s' on `%s' event.")) %
 				command % s_EventList[event].name);
 		}
 	}

aMule-2.2.6.tar.bz2/src/UserEvents.h -> aMule-2.3.1.tar.bz2/src/UserEvents.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2006-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
@@ -54,7 +54,7 @@
  * have to maintain these five places in sync. They are:
  * - one in PrefsUnifiedDlg.cpp (EVENT_LIST, PrefsUnifiedDlg::PrefsUnifiedDlg())
  * - one in this header (CUserEvents::EventType)
- * - two in UserEvents.cpp (static struct EventList[]; CUserEvent::ProcessEvent())
+ * - two in UserEvents.cpp (static struct EventList[]; CUserEvent::ExecuteCommand())
  */
 #define USEREVENTS_EVENTLIST() \
 	USEREVENTS_EVENT(DownloadCompleted, wxTRANSLATE("Download completed"), \
@@ -93,7 +93,7 @@
 		USEREVENTS_REPLACE_VAR( \
 			wxT("PARTITION"), \
 			wxTRANSLATE("Disk partition."), \
-			*((wxString*)object) ) \
+			wxString((wxChar*)object) ) \
 	) \
 	USEREVENTS_EVENT( \
 		ErrorOnCompletion, \
@@ -119,6 +119,8 @@
 	//! Event list
 	enum EventType {
 		USEREVENTS_EVENTLIST()
+		/* This macro expands to the following list of user event types:
+		   DownloadCompleted, NewChatSession, OutOfDiskSpace, ErrorOnCompletion */
 	};
 
 	/**

aMule-2.2.6.tar.bz2/src/aMule.xpm -> aMule-2.3.1.tar.bz2/src/aMule.xpm Changed

@@ -1,634 +1,304 @@
 /* XPM */
 static const char * aMule_xpm[] = {
-"32 42 589 2",
+/* columns rows colors chars-per-pixel */
+"32 42 256 2",
 "  	c None",
-". 	c #EFEFEF",
-"+ 	c #FFFFFF",
-"@ 	c #DF7F34",
-"# 	c #994C15",
-"$ 	c #C3742E",
-"% 	c #8A5E2E",
-"& 	c #C47B48",
-"* 	c #A36E35",
-"= 	c #E9E7E6",
-"- 	c #A85E27",
-"; 	c #F1AE75",
-"> 	c #975F32",
-", 	c #FBFFFF",
-"' 	c #81491C",
-") 	c #C0793C",
-"! 	c #B9763F",
-"~ 	c #A37B52",
-"{ 	c #6D401C",
-"] 	c #95653A",
-"^ 	c #C7BBB9",
-"/ 	c #9D531D",
-"( 	c #EDAD75",
-"_ 	c #9D531C",
-": 	c #D2D2D0",
-"< 	c #814629",
-"[ 	c #5F391A",
-"} 	c #86561A",
-"| 	c #E1E9F0",
-"1 	c #834A1C",
-"2 	c #B46D2F",
-"3 	c #E4A071",
-"4 	c #8E4E16",
-"5 	c #E9F2FA",
-"6 	c #B7B4AE",
-"7 	c #6B341A",
-"8 	c #633F21",
-"9 	c #944F1F",
-"0 	c #B69C8D",
-"a 	c #DDE5ED",
-"b 	c #904F17",
-"c 	c #D89962",
-"d 	c #C08851",
-"e 	c #834608",
-"f 	c #FEFFFF",
-"g 	c #6F3316",
-"h 	c #5D3B26",
-"i 	c #7B4E27",
-"j 	c #885124",
-"k 	c #885A1D",
-"l 	c #FCFFFF",
-"m 	c #C7C6CF",
-"n 	c #9C500E",
-"o 	c #EDB67B",
-"p 	c #B77642",
-"q 	c #834B1F",
-"r 	c #D1D8DC",
-"s 	c #674128",
-"t 	c #63412C",
-"u 	c #874C26",
-"v 	c #B17A54",
-"w 	c #91571C",
-"x 	c #CDCFD1",
-"y 	c #B4B2A4",
-"z 	c #9D510F",
-"A 	c #ECB67C",
-"B 	c #BF6B2D",
-"C 	c #8A5F37",
-"D 	c #41271E",
-"E 	c #49261B",
-"F 	c #62402B",
-"G 	c #825821",
-"H 	c #E8BE9E",
-"I 	c #855A2F",
-"J 	c #B5BABE",
-"K 	c #BDC0B7",
-"L 	c #B4BFBC",
-"M 	c #A0541E",
-"N 	c #EAAB74",
-"O 	c #B36120",
-"P 	c #BECBCA",
-"Q 	c #3D2319",
-"R 	c #3E2721",
-"S 	c #694224",
-"T 	c #A36227",
-"U 	c #FFF1D9",
-"V 	c #ADB7B3",
-"W 	c #3C2615",
-"X 	c #6F6668",
-"Y 	c #7A450F",
-"Z 	c #E9A76D",
-"` 	c #9C4E15",
-" .	c #B7B5BD",
-"..	c #DADBDB",
-"+.	c #272119",
-"@.	c #252420",
-"#.	c #744823",
-"$.	c #3C1D18",
-"%.	c #72431E",
-"&.	c #8A5429",
-"*.	c #9D602A",
-"=.	c #E2B794",
-"-.	c #FFF0E2",
-";.	c #7C440D",
-">.	c #A5AEB7",
-",.	c #C7C8C9",
-"'.	c #B8AEAF",
-").	c #020504",
-"!.	c #4C2921",
-"~.	c #865D27",
-"{.	c #A06430",
-"].	c #A56B39",
-"^.	c #B67135",
-"/.	c #B16B2F",
-"(.	c #A76C2F",
-"_.	c #94601F",
-":.	c #A0A095",
-"<.	c #D0D3D7",
-"[.	c #B7B8B9",
-"}.	c #9AA2A8",
-"|.	c #6F4321",
-"1.	c #9F6431",
-"2.	c #BC7C48",
-"3.	c #BF7C43",
-"4.	c #BC7A42",
-"5.	c #C6813A",
-"6.	c #B97134",
-"7.	c #BD7132",
-"8.	c #AF6922",
-"9.	c #96837A",
-"0.	c #9B5C1C",
-"a.	c #B76F3B",
-"b.	c #C68044",
-"c.	c #D08349",
-"d.	c #CE8D49",
-"e.	c #E28F45",
-"f.	c #CB7C3C",
-"g.	c #B1ACA6",
-"h.	c #C18345",
-"i.	c #F8AD6B",
-"j.	c #E19D56",
-"k.	c #DF9157",
-"l.	c #F3A557",
-"m.	c #FFE3B9",
-"n.	c #ADA5A7",
-"o.	c #EA9447",
-"p.	c #D69156",
-"q.	c #BBBEC0",
-"r.	c #A0A1A1",
-"s.	c #D8DCE0",
-"t.	c #EC904D",
-"u.	c #0C0C09",
-"v.	c #C8AB8D",
-"w.	c #969799",
-"x.	c #FFF6EB",
-"y.	c #000000",
-"z.	c #7D5129",
-"A.	c #AE6F3F",
-"B.	c #D7BBA0",
-"C.	c #A2A4A6",
-"D.	c #E0C9A7",
-"E.	c #EEF0F2",
-"F.	c #CFD3D7",
-"G.	c #D9D2D5",
-"H.	c #D5D8D9",
-"I.	c #E0E0DF",
-"J.	c #D1D2D3",
-"K.	c #EDEEEF",
-"L.	c #9A9B9C",
-"M.	c #7F7B76",
-"N.	c #FBFCF2",
-"O.	c #E9EAEC",
-"P.	c #AFAFAF",
-"Q.	c #F6F6F6",
-"R.	c #F4F4FF",
-"S.	c #F5F5FF",
-"T.	c #F6F7F6",
-"U.	c #DEDFDF",
-"V.	c #2D2822",
-"W.	c #A7A8A8",
-"X.	c #B3B3B4",
-"Y.	c #A4A4A5",
-"Z.	c #A4A4A4",
-"`.	c #A1A2A2",
-" +	c #A0A0A0",
-".+	c #A9A9A9",
-"++	c #9B9B9A",
-"@+	c #A7A7A6",
-"#+	c #9C9C9C",
-"$+	c #B7ADAD",
-"%+	c #252727",
-"&+	c #EDE3E3",
-"*+	c #F3E8E8",
-"=+	c #342F2A",
-"-+	c #A3A3A4",
-";+	c #B4B5B5",
-">+	c #AFA4A4",
-",+	c #A5A5A5",
-"'+	c #A4A5A5",
-")+	c #BAAFAF",
-"!+	c #322D28",
-"~+	c #D3D4D4",
-"{+	c #ECEDED",
-"]+	c #868787",
-"^+	c #6F6A65",
-"/+	c #EBEBE1",
-"(+	c #575859",
-"_+	c #3A2F25",
-":+	c #B1B1B1",
-"<+	c #A6A6A6",
-"[+	c #A8A9A9",
-"}+	c #ACADAE",
-"|+	c #848586",
-"1+	c #C3C4C4",
-"2+	c #D2D2D3",
-"3+	c #827C77",
-"4+	c #8D8E8E",
-"5+	c #E0E0E1",
-"6+	c #D5D6CA",
-"7+	c #515252",
-"8+	c #B0A4A5",
-"9+	c #AAAB9E",
-"0+	c #9B9B9B",
-"a+	c #A89C9C",
-"b+	c #9E9E9E",
-"c+	c #57574C",
-"d+	c #BDBDB3",
-"e+	c #B7B7B7",
-"f+	c #C9CACA",
-"g+	c #747475",
-"h+	c #8C888E",
-"i+	c #CFD3D6",
-"j+	c #BFC0C0",
-"k+	c #363637",
-"l+	c #959696",
-"m+	c #949494",
-"n+	c #949595",
-"o+	c #979797",
-"p+	c #939494",
-"q+	c #ACAEAF",
-"r+	c #B2B7BB",
-"s+	c #5D656D",
-"t+	c #677270",
-"u+	c #838587",
-"v+	c #909599",
-"w+	c #A8A9AA",
-"x+	c #CFCFCF",
-"y+	c #736C67",
-"z+	c #B5ACB0",
-"A+	c #B8C3BF",
-"B+	c #FAA152",
-"C+	c #F09145",
-"D+	c #C56C1C",
-"E+	c #C1CBD3",
-"F+	c #AAACAE",
-"G+	c #B2B2B2",
-"H+	c #ABABAB",
-"I+	c #8C8C8C",
-"J+	c #8D8D8D",
-"K+	c #898A8A",
-"L+	c #B5ACAE",
-"M+	c #A5ACB2",
-"N+	c #BD9B83",
-"O+	c #BB6624",
-"P+	c #DC8830",
-"Q+	c #E79042",
-"R+	c #A49795",
-"S+	c #8F9396",
-"T+	c #A9A99E",
-"U+	c #ABACAC",
-"V+	c #AAAEB1",
-"W+	c #9C571B",
-"X+	c #E8964D",
-"Y+	c #D98F4C",
-"Z+	c #C9752A",
-"`+	c #C2926F",
-" @	c #A2AAB3",
-".@	c #AFB3B7",
-"+@	c #B3A9AB",
-"@@	c #7E7E7E",
-"#@	c #838484",
-"$@	c #838485",
-"%@	c #80887B",
-"&@	c #7B8989",
-"*@	c #8BA0A2",
-"=@	c #7E4B19",
-"-@	c #925923",
-";@	c #BD702B",
-">@	c #DA8442",
-",@	c #E79953",
-"'@	c #BD702D",
-")@	c #ADB4BA",
-"!@	c #B2B3B3",
-"~@	c #E3E3E3",
-"{@	c #636464",
-"]@	c #CCCFD2",
-"^@	c #BFC1C1",
-"/@	c #D18A41",
-"(@	c #D98E4B",
-"_@	c #C58441",
-":@	c #AA6326",
-"<@	c #8C571F",
-"[@	c #B29981",
-"}@	c #B4BDC6",
-"|@	c #7D858D",
-"1@	c #838991",
-"2@	c #837D85",
-"3@	c #807B83",
-"4@	c #90999D",
-"5@	c #CA2425",
-"6@	c #C32425",
-"7@	c #FB9E97",
-"8@	c #9C5B27",
-"9@	c #CC7C34",
-"0@	c #D98E4C",
-"a@	c #DC9951",
-"b@	c #A76734",
-"c@	c #D1CACF",
-"d@	c #D4D5D5",
-"e@	c #807A75",
-"f@	c #B0B1B2",
-"g@	c #A6ADB3",
-"h@	c #C0733C",
-"i@	c #E99A48",
-"j@	c #D0844D",
-"k@	c #C2732E",
-"l@	c #8F5F2E",
-"m@	c #85501B",
-"n@	c #A6642D",
-"o@	c #9A6420",
-"p@	c #794D17",
-"q@	c #845A22",
-"r@	c #8B5820",
-"s@	c #B57F3D",
-"t@	c #E52A4C",
-"u@	c #EC7179",
-"v@	c #F2B0BF",
-"w@	c #9B652C",
-"x@	c #D07D31",
-"y@	c #E29149",
-"z@	c #DA8F4D",
-"A@	c #8E98A1",
-"B@	c #9DA0A2",
-"C@	c #BFBFBF",
-"D@	c #55504B",
-"E@	c #7E7F80",
-"F@	c #797774",
-"G@	c #67727C",
-"H@	c #EA9C4D",
-"I@	c #E69145",
-"J@	c #C77D31",
-"K@	c #704727",
-"L@	c #9D6230",
-"M@	c #AE7546",
-"N@	c #C27D44",
-"O@	c #CD8843",
-"P@	c #D6924D",
-"Q@	c #DD8F56",
-"R@	c #E49554",
-"S@	c #DF254C",
-"T@	c #E95762",
-"U@	c #F08387",
-"V@	c #AB753A",
-"W@	c #525254",
-"X@	c #E79746",
-"Y@	c #656A6D",
-"Z@	c #686C6F",
-"`@	c #7B7671",
-" #	c #635A5A",
-".#	c #66615C",
-"+#	c #584E4F",
-"@#	c #494846",
-"##	c #3F4243",
-"$#	c #E2EEF7",
-"%#	c #3A4855",
-"&#	c #8E5923",
-"*#	c #9B612F",
-"=#	c #C17D43",
-"-#	c #CA854B",
-";#	c #E19552",
-">#	c #DF9E5A",
-",#	c #DEA25A",
-"'#	c #DE9E4F",
-")#	c #DE224B",
-"!#	c #E53556",
-"~#	c #C6833D",
-"{#	c #38424A",
-"]#	c #FDF6F9",
-"^#	c #4D4E4E",
-"/#	c #3B3B3B",
-"(#	c #45403A",
-"_#	c #4F4545",
-":#	c #443A3A",
-"<#	c #3D373B",
-"[#	c #38353C",
-"}#	c #383842",
-"|#	c #3C3A43",
-"1#	c #39363E",
-"2#	c #3B383E",
-"3#	c #353640",
-"4#	c #905A2F",
-"5#	c #A56B3A",
-"6#	c #BF7C42",
-"7#	c #C8844A",
-"8#	c #D78B53",
-"9#	c #DF9E5B",
-"0#	c #EAA76A",
-"a#	c #DDA770",
-"b#	c #DEA15A",
-"c#	c #E09D52",
-"d#	c #C58A49",
-"e#	c #C48141",
-"f#	c #7B5933",
-"g#	c #DEDCE5",
-"h#	c #D8E1E9",
-"i#	c #D1DBE4",
-"j#	c #D5E0EA",
-"k#	c #DBE3EA",
-"l#	c #EEE6EA",
-"m#	c #F4F4F4",
-"n#	c #FFFFFE",
-"o#	c #635E5A",
-"p#	c #A8ABAD",
-"q#	c #A3AEB7",
-"r#	c #E89033",
-"s#	c #C37130",
-"t#	c #B2712E",
-"u#	c #94682F",
-"v#	c #8C4D24",
-"w#	c #713C25",
-"x#	c #996730",
-"y#	c #C8844B",
-"z#	c #DE9E5B",
-"A#	c #DDA76F",
-"B#	c #DE9D59",
-"C#	c #E29652",
-"D#	c #C7834A",
-"E#	c #C27D42",
-"F#	c #9B6235",
-"G#	c #834D22",
-"H#	c #A05E1B",
-"I#	c #BB7024",
-"J#	c #DA852E",
-"K#	c #DD8435",
-"L#	c #848E97",
-"M#	c #888B8E",
-"N#	c #A2A3A3",
-"O#	c #9C9494",
-"P#	c #42423D",
-"Q#	c #B4B5B6",
-"R#	c #A8ABAE",
-"S#	c #7B4012",
-"T#	c #E3853C",
-"U#	c #BE722F",
-"V#	c #A46B31",
-"W#	c #946432",
-"X#	c #835B33",
-"Y#	c #784D2B",
-"Z#	c #8C5A27",
-"`#	c #A6602F",
-" $	c #C07D37",
-".$	c #C68540",
-"+$	c #D88D49",
-"@$	c #E09451",
-"#$	c #DE9D5A",
-"$$	c #EB9D67",
-"%$	c #DF945B",
-"&$	c #D88C53",
-"*$	c #C8854B",
-"=$	c #C37E44",
-"-$	c #90612F",
-";$	c #865631",
-">$	c #A36A30",
-",$	c #CB7A34",
-"'$	c #D88D4C",
-")$	c #E99953",
-"!$	c #9E5A21",
-"~$	c #A9AEB3",
-"{$	c #B2B2B3",
-"]$	c #4A4242",
-"^$	c #554F4A",
-"/$	c #D7DAD1",
-"($	c #B7C4C4",
-"_$	c #CC853C",
-":$	c #BE722E",
-"<$	c #AE6A31",
-"[$	c #926331",
-"}$	c #8D5A27",
-"|$	c #764D2B",
-"1$	c #9D6431",
-"2$	c #BA7B48",
-"3$	c #C98742",
-"4$	c #D0844B",
-"5$	c #D88C49",
-"6$	c #E19653",
-"7$	c #E19652",
-"8$	c #D78C47",
-"9$	c #D08F4A",
-"0$	c #BE7B42",
-"a$	c #BC763A",
-"b$	c #7C5625",
-"c$	c #915C27",
-"d$	c #B76C33",
-"e$	c #D18737",
-"f$	c #D88D4B",
-"g$	c #DD9851",
-"h$	c #9C632B",
-"i$	c #C8CDD2",
-"j$	c #535354",
-"k$	c #5A5252",
-"l$	c #B5B6B7",
-"m$	c #9FA0A1",
-"n$	c #99959C",
-"o$	c #C47736",
-"p$	c #D17D32",
-"q$	c #AC6930",
-"r$	c #9C6231",
-"s$	c #8D5A32",
-"t$	c #8A4E27",
-"u$	c #753F28",
-"v$	c #965426",
-"w$	c #B2723B",
-"x$	c #C27E47",
-"y$	c #C68541",
-"z$	c #CB864B",
-"A$	c #D38A4D",
-"B$	c #CA8244",
-"C$	c #C37A39",
-"D$	c #7F5831",
-"E$	c #7F5827",
-"F$	c #9B6232",
-"G$	c #C0732F",
-"H$	c #C48543",
-"I$	c #E68D49",
-"J$	c #D58C41",
-"K$	c #ADB8C1",
-"L$	c #BFC2C5",
-"M$	c #C9C9C9",
-"N$	c #6B6B63",
-"O$	c #737373",
-"P$	c #8E8E8E",
-"Q$	c #858585",
-"R$	c #787C80",
-"S$	c #757C80",
-"T$	c #E38633",
-"U$	c #B77736",
-"V$	c #B4702D",
-"W$	c #986B30",
-"X$	c #704932",
-"Y$	c #2F343A",
-"Z$	c #312F2A",
-"`$	c #2D2B29",
-" %	c #534032",
-".%	c #BC7940",
-"+%	c #D98D3F",
-"@%	c #D88C4B",
-"#%	c #C4834B",
-"$%	c #725335",
-"%%	c #242B36",
-"&%	c #574333",
-"*%	c #7F512D",
-"=%	c #9A6033",
-"-%	c #B57330",
-";%	c #CE772B",
-">%	c #EB994F",
-",%	c #EAA054",
-"'%	c #997868",
-")%	c #898387",
-"!%	c #8A8A8A",
-"~%	c #959596",
-"{%	c #6B6B6B",
-"]%	c #636363",
-"^%	c #5D5D5D",
-"/%	c #666767",
-"(%	c #554E47",
-"_%	c #201F21",
-":%	c #242932",
-"<%	c #E2E9F2",
-"[%	c #A8B1AE",
-"}%	c #252933",
-"|%	c #222934",
-"1%	c #AA7948",
-"2%	c #5E656C",
-"3%	c #6C6F70",
-"4%	c #757777",
-"5%	c #787879",
-"6%	c #DEDED6",
-"7%	c #847B7B",
-"8%	c #2D2724",
-"                                      .                         ",
-"                                    + @                         ",
-"                                  + # $                         ",
-"                                  % & *                         ",
-"                                = - ; >                         ",
-"      + ,                     + ' ) ! ~                         ",
-"        { ] +                 ^ / ( _ :                         ",
-"        < [ } |             + 1 2 3 4 5                         ",
-"        6 7 8 9 0 +         a b c d e f                         ",
-"        + g h i j k l       m n o p q +                         ",
-"          r s t u v w + x   y z A B C                           ",
-"            D E F G H I J K L M N O P                           ",
-"            + Q R S T U V W X Y Z `  ...                        ",
-"              + +.@.#.$.%.&.*.=.-.;.>.,.                        ",
-"                '.).!.~.{.].^./.(._.:.<.                        ",
-"                [.}.|.1.2.3.4.5.6.7.8.                          ",
-"                  9.0.a.b.c.d.e.+ + f.                          ",
-"                  g.h.  i.j.k.l.    m.+                         ",
-"                  n.      o.p.+       q.                        ",
-"                  r.    s.+ t.+ u.    v.                        ",
-"                  w.x.  y.+ z.A.      B.                        ",
-"                  C.D.  + E.F.G.H.I.J.K.L.                      ",
-"                  M.N.O.P.P.Q.R.S.T.U.V.+ W.                    ",
-"                  X.Y.Z.`. +.+++@+#+$+%+&+*+                    ",
-"                + + =+-+;+>+Z.Z.,+'+)+!+~+{+]+                  ",
-"                ^+/+(+_+[.'+:+<+<+[+}+|+1+2+3+                  ",
-"                4+5+6+7+8+9+0+0+a+b+c+d+e+f+g+                  ",
-"                h+i+e+j+k+l+m+m+n+o+p+X.q+r+s+t+u+v+w+x+        ",
-"      y+z+A+B+C+D+E+F+G+H+I+I+I+J+g+K+L+M+N+O+P+Q+R+S+T+        ",
-"      U+V+W+X+Y+Z+`+ @.@+@@@#@#@$@%@&@*@=@-@;@>@,@'@)@!@~@      ",
-"      {@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@c@d@        ",
-"      e@f@g@h@i@j@k@l@m@n@o@p@q@r@s@t@u@v@w@x@y@z@A@B@C@        ",
-"      D@E@F@G@H@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@4+        ",
-"       #.#+#@###$#%#&#*#=#-#d.;#>#,#'#)#!#~#{#  ]#^#/#(#        ",
-"  _#:#<#[#}#|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#l#m#n#  ",
-"o#!@p#q#r#s#t#u#v#w#x#5#3.y#8#z#0#A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#",
-"P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>$,$'$)$!$~${$]$",
-"P#^$/$($_$:$<$[$}$Y#|$1$2$3$4$5$6$7$8$9$0$a$b$c$d$e$f$g$h$i$j$P#",
-"k$l$m$n$o$p$q$r$s$t$u$v$w$x$=#y$y#z$A$B$C$D$E$F$G$H$I$J$K$L$M$N$",
-"O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%>%,%'%)%!%~%{%",
-"  ]%^%/%(%_%:%<%                              [%}%|%1%2%3%4%5%6%",
-"  #+,+                                                  7%8%8%  "};
+".  c #CC8234",
+"X  c #84420C",
+"o  c #44464C",
+"O  c #C46214",
+"+  c #94969C",
+"@  c #C41A1C",
+"#  c #34220C",
+"$  c #944A0C",
+"%  c #7C827C",
+"&  c #14222C",
+"*  c #8C623C",
+"=  c #FCD6A4",
+"-  c #E45654",
+";  c #613514",
+":  c #676664",
+">  c #61452C",
+",  c #DC9654",
+"<  c #AEB3B4",
+"1  c #0C120C",
+"2  c #C4824C",
+"3  c #CC9E74",
+"4  c #BC7224",
+"5  c #CC4634",
+"6  c #C27334",
+"7  c #5C6A74",
+"8  c #8B4F1C",
+"9  c #B48A6C",
+"0  c #27231C",
+"q  c #C4CED4",
+"w  c #483424",
+"e  c #E98F44",
+"r  c #AC5614",
+"t  c #ECEAE4",
+"y  c #B46424",
+"u  c #7C766C",
+"i  c #595754",
+"p  c #F49EAC",
+"a  c #74828C",
+"s  c #68421C",
+"d  c #A6A7A4",
+"f  c #08131C",
+"g  c #CE7834",
+"h  c #C16824",
+"j  c #E78334",
+"k  c #492A1C",
+"l  c #67381C",
+"z  c #7C522C",
+"x  c #80441C",
+"c  c #070D14",
+"v  c #C1C3C4",
+"b  c #979694",
+"n  c #342A1C",
+"m  c #A45A1C",
+"M  c #141A1C",
+"N  c #6C5E54",
+"B  c #38322C",
+"V  c #CC623C",
+"C  c #ECDED4",
+"Z  c #F4F6F4",
+"A  c #69777C",
+"S  c #CC7E34",
+"D  c #B25E1C",
+"F  c #DC8E4C",
+"G  c #D87424",
+"H  c #64727C",
+"J  c #3A241C",
+"K  c #B06B2C",
+"L  c #8F8C8C",
+"P  c #9CAAB4",
+"I  c #0C0A04",
+"U  c #DB8544",
+"Y  c #9C9E9C",
+"T  c #542604",
+"R  c #944F1C",
+"E  c #9C7654",
+"W  c #F4A65C",
+"Q  c #985C2C",
+"!  c #74726C",
+"~  c #8C5624",
+"^  c #5C3A1C",
+"/  c #C46E24",
+"(  c #E48A44",
+")  c #6A3E1C",
+"_  c #74524C",
+"`  c #942E14",
+"'  c #4C423C",
+"]  c #BCBAB4",
+"[  c #BF7B44",
+"{  c #824E24",
+"}  c #EC8A94",
+"|  c #F1F1F4",
+" . c #744A1C",
+".. c #B0AEAC",
+"X. c #EC8A3C",
+"o. c #845A34",
+"O. c #804A1C",
+"+. c #A05E24",
+"@. c #413D3C",
+"#. c #D7E1E4",
+"$. c #7E7C7C",
+"%. c #945E3C",
+"&. c #54514C",
+"*. c #A46E3C",
+"=. c #A87A54",
+"-. c #743E0C",
+";. c #EC9E64",
+":. c #BC9674",
+">. c #5C341C",
+",. c #A8642C",
+"<. c #684224",
+"1. c #17161C",
+"2. c #CF763C",
+"3. c #E7863C",
+"4. c #8C542C",
+"5. c #CCCAC4",
+"6. c #211D1C",
+"7. c #585E64",
+"8. c #A45E34",
+"9. c #A45214",
+"0. c #AC9274",
+"q. c #9C724C",
+"w. c #DC9E54",
+"e. c #2C1E14",
+"r. c #B47244",
+"t. c #292524",
+"y. c #4C5A64",
+"u. c #AAAAAC",
+"i. c #040D1C",
+"p. c #CC323C",
+"a. c #FC6E74",
+"s. c #E4B68C",
+"d. c #CCCECC",
+"f. c #BC9E8C",
+"g. c #E46464",
+"h. c #9C826C",
+"j. c #E4D2BC",
+"k. c #5C3E2C",
+"l. c #7C3E0C",
+"z. c #C41634",
+"x. c #2C2E34",
+"c. c #5C4A34",
+"v. c #B86D34",
+"b. c #D43A44",
+"n. c #D9894C",
+"m. c #B4927C",
+"M. c #4F2C14",
+"N. c #8C7E64",
+"B. c #D47A2C",
+"V. c #C49A7C",
+"C. c #9C8A7C",
+"Z. c #C45E0C",
+"A. c #F4E6D4",
+"S. c #B4BEC4",
+"D. c #747E84",
+"F. c #A46234",
+"G. c #6D6D6C",
+"H. c #FC923C",
+"J. c #878484",
+"K. c #EC924C",
+"L. c #744E2C",
+"P. c #CC6A1C",
+"I. c #FCFEFC",
+"U. c #A48A74",
+"Y. c #C4926C",
+"T. c #D4D6D4",
+"R. c #4C4A44",
+"E. c #D4966C",
+"W. c #DC833C",
+"Q. c #994B14",
+"!. c #DC985C",
+"~. c #C7732C",
+"^. c #B4723C",
+"/. c #ECEBEC",
+"(. c #442E24",
+"). c #2C2A24",
+"_. c #985924",
+"`. c #848E94",
+"'. c #343E44",
+"]. c #907054",
+"[. c #9C9A94",
+"{. c #DC8A44",
+"}. c #615E5C",
+"|. c #DCDEDC",
+" X c #D57E3C",
+".X c #697274",
+"XX c #4C3A24",
+"oX c #C06E2C",
+"OX c #673E24",
+"+X c #7C4A24",
+"@X c #AC9E94",
+"#X c #844614",
+"$X c #B0B6BC",
+"%X c #131414",
+"&X c #5C5A5C",
+"*X c #041224",
+"=X c #BC6A2C",
+"-X c #7C4624",
+";X c #C0C6CC",
+":X c #3C3634",
+">X c #AC5A24",
+",X c #DA9054",
+"<X c #D4762C",
+"1X c #342624",
+"2X c #090B0C",
+"3X c #A1A2A4",
+"4X c #ECA264",
+"5X c #505254",
+"6X c #583624",
+"7X c #845634",
+"8X c #1C1E24",
+"9X c #9C663C",
+"0X c #04040C",
+"qX c #9C9A9C",
+"wX c #A44E0C",
+"eX c #24262C",
+"rX c #D4D2D4",
+"tX c #FCEEE4",
+"yX c #7C7874",
+"uX c #74451C",
+"iX c #F48634",
+"pX c #542E1C",
+"aX c #ACAEB4",
+"sX c #A4521C",
+"dX c #A45E2C",
+"fX c #4C4644",
+"gX c #8C5124",
+"hX c #E4E2E4",
+"jX c #B4642C",
+"kX c #646264",
+"lX c #F4D6BC",
+"zX c #E43E44",
+"xX c #5C2E14",
+"cX c #E47E2C",
+"vX c #3C2E24",
+"bX c #A45A24",
+"nX c #312214",
+"mX c #BC8254",
+"MX c #785234",
+"NX c #0C1A24",
+"BX c #A06E44",
+"VX c #703E14",
+"CX c #DC8234",
+"ZX c #EC9654",
+"AX c #CC7224",
+"SX c #DC7E34",
+"DX c #9C765C",
+"FX c #743E1C",
+"GX c #BCBABC",
+"HX c #8C4A1C",
+"JX c #948E94",
+"KX c #747274",
+"LX c #CC6E2C",
+"PX c #8C460C",
+"IX c #4C4A4C",
+"UX c #919A9C",
+/* pixels */
+"                                      M.nX                      ",
+"                                    e.e nX                      ",
+"                                  0Xm ( 6.                      ",
+"                                  M.U jX                        ",
+"        %X                      2XR ZXHX0X                      ",
+"        ^ nX                    s =Xn.gX                        ",
+"        J x +X0               c Q.,XjXMX                        ",
+"          <.l R XX0X          ^ >X4XQ.c.                        ",
+"          ).; l R z 2X        { 2.,X$ x.                        ",
+"          2X>.k FXQ BX        x , U HXM                         ",
+"            M J M.VXE.V.  t.  uX;. X)                           ",
+"              e.nXxX#X= J nXvXxX2 =X>                           ",
+"                t.e.; ; M.VXHX~ 9 Q ^.                          ",
+"                %X%Xe.l 8 _.Q dX^.F.%.                          ",
+"                %X8Xl R Q jXv.=Xy D / f                         ",
+"                    l.PXwXy 6 LXg s.g n                         ",
+"                    X A.C O g G tXI.I.xX                        ",
+"                    Y.I.I.lXB.e I.I.I.E                         ",
+"                  0XV.I.#.I.e W *X: I.m.                        ",
+"                    =.I.  '.2 *.u.| I.j.'                       ",
+"                    0.I.I.I.T.#.d.d.|./.|                       ",
+"                    t Z rXd < hX/.| t L i d                     ",
+"                    I.d L L JX+ b b 3X}.M I.i                   ",
+"                  [.yX5Xu.qXb b b b u.@.R./.5.                  ",
+"                  | J.I 3XY [.qXUX[.3Xt.u.v |                   ",
+"                %XI.v B 5XqXb L L L L ! ] u.t %X                ",
+"                f | GXu.R.J.J.J.J.J.$.b 3X3XS.& f     2X        ",
+"      t.}.7.N MX<.#.u.u.u.! $.$.yXyXKXL d P q.9.2.,X+ + $.      ",
+"      G.< C.3.j Z.f.aXUX3XyXG.KX: 7 ! .XaXN.X D <XcX[ $Xb       ",
+"      R.u.U./ SXh wXh...$XD.H H H A G.&.g.` PXy g cX0.;X&.      ",
+"      IXd.aX[ SX<Xm -.T 8 L.z 4.Q K @ zXa.} PX/ iX=.`...L       ",
+"      fXL .X7 3.iXh uXVX8 +.y K oX. 5 p.g.p sXv.X.}.7.G.kX      ",
+"      6.}.5Xo * XXx.w O._.F.6 6 W.{.U z.b.- Q i.0 x.:XR.t.      ",
+"                  0XM.8 Q K v. XU ,Xw.F V 6 S c                 ",
+"  J.UXUX2 +.+X+X-X>.>.8 +.v.6 S U !.!.F W.g S > k.L.7X* ].H yXkX",
+"  ..UXo.P.P._.gXuX>.M.8 Q =Xv. XU F ,XU  X6 6  .O.m <XiXj DX3Xu.",
+"  : v ].D y _.8 uX) k HX~ ,.v.6  XW.U  X2.6 ,.^ +Xm LX X/ BXS.$.",
+"  ..v b ,.P.m gXO.) M.s gX,.K v.6 2.g g 2.oX .s 8 y ~.W./ @Xq L ",
+"  J.$..XG.B.h >X~ x l J ^ gX~.g S CXW.6 _.O.O.O.bXh S j u a L [.",
+"  IXi i 5XF.O.w 0 %Xc c 2Xc 0Xt.t.t.f f i.f t.vXOX_.W.e y.}.: }.",
+"  1 B 6.0X                                          0X2X6.B ' :X",
+"                                                            2X2X"
+};

aMule-2.2.6.tar.bz2/src/amule-gui.cpp -> aMule-2.3.1.tar.bz2/src/amule-gui.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-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
@@ -16,7 +16,7 @@
 // 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
@@ -33,7 +33,6 @@
 #include "SharedFilesWnd.h"		// Needed for CSharedFilesWnd
 #include "Timer.h"				// Needed for CTimer
 #include "PartFile.h"			// Needed for CPartFile
-#include "updownclient.h"		// Needed for CUpDownClient
 
 #include "muuli_wdr.h"			// Needed for IDs
 #include "amuleDlg.h"			// Needed for CamuleDlg
@@ -68,8 +67,7 @@
 	EVT_MULE_TIMER(ID_CORE_TIMER_EVENT, CamuleGuiApp::OnCoreTimer)
 
 	EVT_MULE_NOTIFY(CamuleGuiApp::OnNotifyEvent)
-	EVT_MULE_LOGGING(CamuleGuiApp::OnLoggingEvent)
-	
+
 	// Async dns handling
 	EVT_MULE_INTERNAL(wxEVT_CORE_UDP_DNS_DONE, -1, CamuleGuiApp::OnUDPDnsDone)
 
@@ -111,9 +109,9 @@
 }
 
 
-void CamuleGuiBase::ShowAlert(wxString msg, wxString title, int flags)
+int CamuleGuiBase::ShowAlert(wxString msg, wxString title, int flags)
 {
-	wxMessageBox(msg, title, flags);
+	return wxMessageBox(msg, title, flags);
 }
 
 
@@ -183,21 +181,10 @@
 			}
 		}
 	}
-	
+
+	ResetTitle();
+
 	// Should default/last-used position be overridden?
-#ifdef SVNDATE
-	#ifdef CLIENT_GUI
-		m_FrameTitle = wxString::Format(wxT("aMule remote control %s %s"), wxT( VERSION ), wxT( SVNDATE ));
-	#else
-		m_FrameTitle = wxString::Format(wxT("aMule %s %s"), wxT( VERSION ), wxT( SVNDATE ));
-	#endif
-#else
-	#ifdef CLIENT_GUI
-		m_FrameTitle = wxString::Format(wxT("aMule remote control %s"), wxT( VERSION ));
-	#else
-		m_FrameTitle = wxString::Format(wxT("aMule %s"), wxT( VERSION ));
-	#endif
-#endif
 	if ( geometry_enabled ) {
 		amuledlg = new CamuleDlg(NULL, m_FrameTitle,
 		                         wxPoint(geometry_x,geometry_y),
@@ -209,6 +196,29 @@
 	return 0;
 }
 
+// Sets m_FrameTitle
+void CamuleGuiBase::ResetTitle()
+{
+#ifdef SVNDATE
+	#ifdef CLIENT_GUI
+		m_FrameTitle = CFormat(wxT("aMule remote control %s %s")) % wxT( VERSION ) % wxT( SVNDATE );
+	#else
+		m_FrameTitle = CFormat(wxT("aMule %s %s")) % wxT( VERSION ) % wxT( SVNDATE );
+	#endif
+#else
+	#ifdef CLIENT_GUI
+		m_FrameTitle = _("aMule remote control");
+	#else
+		m_FrameTitle = _("aMule");
+	#endif
+
+	if (thePrefs::ShowVersionOnTitle()) {
+		m_FrameTitle += wxT(' ');
+		m_FrameTitle += wxT( VERSION );
+	}
+#endif
+}
+
 
 // Sets the contents of the clipboard. Prior content  erased.
 bool CamuleGuiBase::CopyTextToClipboard(wxString strText)
@@ -219,11 +229,25 @@
 		wxTheClipboard->SetData(new wxTextDataObject(strText));
 		wxTheClipboard->Close();
 	}
-	
+
 	return ClipBoardOpen;
 }
 
 
+void CamuleGuiBase::AddGuiLogLine(const wxString& line)
+{
+	if (amuledlg) {
+		while ( !m_logLines.empty() ) {
+			amuledlg->AddLogLine(m_logLines.front());
+			m_logLines.pop_front();
+		}
+		amuledlg->AddLogLine(line);
+	} else {
+		m_logLines.push_back(line);
+	}
+}
+
+
 #ifndef CLIENT_GUI
 
 int CamuleGuiApp::InitGui(bool geometry_enable, wxString &geometry_string)
@@ -234,9 +258,9 @@
 }
 
 
-void CamuleGuiApp::ShowAlert(wxString msg, wxString title, int flags)
+int CamuleGuiApp::ShowAlert(wxString msg, wxString title, int flags)
 {
-	CamuleGuiBase::ShowAlert(msg, title, flags);
+	return CamuleGuiBase::ShowAlert(msg, title, flags);
 }
 
 
@@ -267,7 +291,7 @@
 	// Create the Core timer
 	core_timer = new CTimer(this,ID_CORE_TIMER_EVENT);
 	if (!core_timer) {
-		printf("Fatal Error: Failed to create Core Timer");
+		AddLogLineCS(_("Fatal Error: Failed to create Core Timer"));
 		OnExit();
 	}
 
@@ -324,24 +348,5 @@
 	CamuleApp::AddServerMessageLine(msg);
 }
 
-
-void CamuleGuiApp::OnLoggingEvent(CLoggingEvent& evt)
-{
-	if (amuledlg) {
-		while ( !m_logLines.empty() ) {
-			QueuedLogLine entry = m_logLines.front();
-			amuledlg->AddLogLine( entry.show, entry.line );
-			m_logLines.pop_front();
-		}
-		
-		amuledlg->AddLogLine(evt.IsCritical(), evt.Message());
-	} else {
-		QueuedLogLine entry = { evt.Message(), evt.IsCritical() };
-		m_logLines.push_back( entry );
-	}
-			
-	CamuleApp::AddLogLine( evt.Message() );
-}
-
 #endif /* CLIENT_GUI */
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/amule-remote-gui.cpp -> aMule-2.3.1.tar.bz2/src/amule-remote-gui.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (C) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-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
@@ -23,13 +23,6 @@
 //
 
 
-#define AMULE_REMOTE_GUI_CPP
-
-
-#include <memory>			// Needed for auto_ptr
-using std::auto_ptr;
-
-
 #include <wx/ipc.h>
 #include <wx/cmdline.h>			// Needed for wxCmdLineParser
 #include <wx/config.h>			// Do_not_auto_remove (win32)
@@ -47,13 +40,17 @@
 #include "amule.h"			// Interface declarations.
 #include "amuleDlg.h"			// Needed for CamuleDlg
 #include "ClientCredits.h"
-#include "ClientListCtrl.h"
+#include "SourceListCtrl.h"
+#include "ChatWnd.h"
 #include "DataToText.h"			// Needed for GetSoftName()
 #include "DownloadListCtrl.h"		// Needed for CDownloadListCtrl
+#include "Friend.h"
+#include "GetTickCount.h"	// Needed for GetTickCount
 #include "GuiEvents.h"
 #ifdef ENABLE_IP2COUNTRY
 	#include "IP2Country.h"		// Needed for IP2Country
 #endif
+#include "InternalEvents.h"	// Needed for wxEVT_CORE_FINISHED_HTTP_DOWNLOAD
 #include "Logger.h"
 #include "muuli_wdr.h"			// Needed for IDs
 #include "PartFile.h"			// Needed for CPartFile
@@ -63,9 +60,10 @@
 #include "SharedFilesCtrl.h"		// Needed for CSharedFilesCtrl
 #include "SharedFilesWnd.h"		// Needed for CSharedFilesWnd
 #include "TransferWnd.h"		// Needed for CTransferWnd
-#include "updownclient.h"
+#include "UpDownClientEC.h"		// Needed for CUpDownClient
 #include "ServerListCtrl.h"		// Needed for CServerListCtrl
-#include "MagnetURI.h"			// Needed for CMagnetURI
+#include "ScopedPtr.h"
+#include "StatisticsDlg.h"	// Needed for CStatisticsDlg
 
 
 CEConnectDlg::CEConnectDlg()
@@ -125,7 +123,11 @@
 	EVT_CUSTOM(wxEVT_EC_INIT_DONE, -1, CamuleRemoteGuiApp::OnECInitDone)
 	
 	EVT_MULE_NOTIFY(CamuleRemoteGuiApp::OnNotifyEvent)
-	EVT_MULE_LOGGING(CamuleRemoteGuiApp::OnLoggingEvent)
+
+#ifdef ENABLE_IP2COUNTRY
+	// HTTPDownload finished
+	EVT_MULE_INTERNAL(wxEVT_CORE_FINISHED_HTTP_DOWNLOAD, -1, CamuleRemoteGuiApp::OnFinishedHTTPDownload)
+#endif
 END_EVENT_TABLE()
 
 
@@ -143,6 +145,7 @@
 void CamuleRemoteGuiApp::OnPollTimer(wxTimerEvent&)
 {
 	static int request_step = 0;
+	static uint32 msPrevStats = 0;
 	
 	if (m_connect->RequestFifoFull()) {
 		return;
@@ -150,54 +153,60 @@
 	
 	switch (request_step) {
 	case 0:
-		serverconnect->ReQuery();
-		serverlist->UpdateUserFileStatus(serverconnect->GetCurrentServer());
+		// We used to update the connection state here, but that's done with the stats in the next step now.
 		request_step++;
 		break;
 	case 1: {
-		CECPacket stats_req(EC_OP_STAT_REQ);
+		CECPacket stats_req(EC_OP_STAT_REQ, EC_DETAIL_INC_UPDATE);
 		m_connect->SendRequest(&m_stats_updater, &stats_req);
-		amuledlg->ShowTransferRate();			
 		request_step++;
 		break;
 	}
 	case 2:
-		if (amuledlg->m_sharedfileswnd->IsShown()) {
-			sharedfiles->DoRequery(EC_OP_GET_SHARED_FILES, EC_TAG_KNOWNFILE);
-		} else if (amuledlg->m_serverwnd->IsShown()) {
-			//serverlist->FullReload(EC_OP_GET_SERVER_LIST);
+		if (amuledlg->m_sharedfileswnd->IsShown()
+			|| amuledlg->m_chatwnd->IsShown()
+			|| amuledlg->m_serverwnd->IsShown()) {
+			// update downloads, shared files and servers
+			knownfiles->DoRequery(EC_OP_GET_UPDATE, EC_TAG_KNOWNFILE);
 		} else if (amuledlg->m_transferwnd->IsShown()) {
-			static bool firstcall = true;
-			downloadqueue->DoRequery(
-				theApp->m_FileDetailDialogActive || firstcall ?
-					EC_OP_GET_DLOAD_QUEUE_DETAIL : EC_OP_GET_DLOAD_QUEUE,
-				EC_TAG_PARTFILE);
-			firstcall = false;
-			switch(amuledlg->m_transferwnd->clientlistctrl->GetListView()) {
-			case vtUploading:
-				uploadqueue->ReQueryUp();
-				break;
-			case vtQueued:
-				uploadqueue->ReQueryWait();
-				break;
-			case vtClients:
-				break;
-			case vtNone:
-				break;
-			}
-			amuledlg->m_transferwnd->ShowQueueCount(theStats::GetWaitingUserCount());
+			// update both downloads and shared files
+			knownfiles->DoRequery(EC_OP_GET_UPDATE, EC_TAG_KNOWNFILE);
 		} else if (amuledlg->m_searchwnd->IsShown()) {
 			if (searchlist->m_curr_search != -1) {
 				searchlist->DoRequery(EC_OP_SEARCH_RESULTS, EC_TAG_SEARCHFILE);
 			}
+		} else if (amuledlg->m_statisticswnd->IsShown()) {
+			int sStatsUpdate = thePrefs::GetStatsInterval();
+			uint32 msCur = theStats::GetUptimeMillis();
+			if ((sStatsUpdate > 0) && ((int)(msCur - msPrevStats) > sStatsUpdate*1000)) {
+				msPrevStats = msCur;
+				stattree->DoRequery();
+			}
 		}
 		// Back to the roots
 		request_step = 0;
 		break;
 	default:
-		printf("WTF?\n");
+		wxFAIL;
 		request_step = 0;
 	}
+
+	// Check for new links once per second.
+	static uint32 lastED2KLinkCheck = 0;
+	if (GetTickCount() - lastED2KLinkCheck >= 1000) {
+		AddLinksFromFile();
+		lastED2KLinkCheck = GetTickCount();
+	}
+}
+
+
+void CamuleRemoteGuiApp::OnFinishedHTTPDownload(CMuleInternalEvent& event)
+{
+	if (event.GetInt() == HTTP_GeoIP) {
+		amuledlg->IP2CountryDownloadFinished(event.GetExtraLong());
+		// If we updated, the dialog is already up. Redraw it to show the flags.
+		amuledlg->Refresh();
+	}
 }
 
 
@@ -217,6 +226,8 @@
 		amuledlg->Destroy();
 		amuledlg = NULL;
 	}
+	delete m_allUploadingKnownFile;
+	delete stattree;
 }
 
 
@@ -224,9 +235,6 @@
 {
 	StartTickTimer();
 	amuledlg = NULL;
-	if ( !wxApp::OnInit() ) {
-		return false;
-	}
 	
 	// Get theApp
 	theApp = &wxGetApp();
@@ -234,55 +242,56 @@
 	// Handle uncaught exceptions
 	InstallMuleExceptionHandler();
 
+	// Parse cmdline arguments.
+	if (!InitCommon(AMULE_APP_BASE::argc, AMULE_APP_BASE::argv)) {
+		return false;
+	}
+
 	// Create the polling timer
 	poll_timer = new wxTimer(this,ID_CORE_TIMER_EVENT);
 	if (!poll_timer) {
-		printf("Fatal Error: Failed to create Poll Timer");
+		AddLogLineCS(_("Fatal Error: Failed to create Poll Timer"));
 		OnExit();
 	}
 
 	m_connect = new CRemoteConnect(this);
-	SetAppName(wxT("aMule"));
 	
-	// Load Preferences
-	// This creates the CFG file we shall use
-	ConfigDir = GetConfigDir();
-	if (!wxDirExists(ConfigDir)) {
-		wxMkdir(ConfigDir);
-	}
-
-	wxConfig::Set(new wxFileConfig(wxEmptyString, wxEmptyString,
-		ConfigDir + wxT("remote.conf")));
-
-	glob_prefs = new CPreferencesRem(m_connect);	
+	glob_prefs = new CPreferencesRem(m_connect);
+	long enableZLIB;
+	wxConfig::Get()->Read(wxT("/EC/ZLIB"), &enableZLIB, 1);
+	m_connect->SetCapabilities(enableZLIB != 0, true, false);	// ZLIB, UTF8 numbers, notification
 	
 	InitCustomLanguages();
 	InitLocale(m_locale, StrLang2wx(thePrefs::GetLanguageID()));
 
-	bool result = ShowConnectionDialog();
-
-	printf("Going to event loop...\n");
+	if (ShowConnectionDialog()) {
+		AddLogLineNS(_("Going to event loop..."));
+		return true;
+	}
 	
-	return result;
+	return false;
 }
 
 
 bool CamuleRemoteGuiApp::CryptoAvailable() const
 {
-	return clientcredits && clientcredits->CryptoAvailable();
+	return thePrefs::IsSecureIdentEnabled(); // good enough
 }
 
 
-bool CamuleRemoteGuiApp::ShowConnectionDialog() {
-	
+bool CamuleRemoteGuiApp::ShowConnectionDialog()
+{
 	dialog = new CEConnectDlg;
 
-	if (dialog->ShowModal() != wxID_OK) {
+	if (m_skipConnectionDialog) {
+		wxCommandEvent evt;
+		dialog->OnOK(evt);
+	} else if (dialog->ShowModal() != wxID_OK) {
 		dialog->Destroy();
 		
 		return false;
 	}
-	printf("Connecting...\n");
+	AddLogLineNS(_("Connecting..."));
 	if (!m_connect->ConnectToCore(dialog->Host(), dialog->Port(),
 		dialog->Login(), dialog->PassHash(),
 		wxT("amule-remote"), wxT("0x0001"))) {
@@ -297,17 +306,21 @@
 
 void CamuleRemoteGuiApp::OnECConnection(wxEvent& event) {
 	wxECSocketEvent& evt = *((wxECSocketEvent*)&event);
-	printf("Remote GUI EC event handler\n");
+	AddLogLineNS(_("Remote GUI EC event handler"));
 	wxString reply = evt.GetServerReply();
-	AddLogLineM(true, reply);
+	AddLogLineC(reply);
 	if (evt.GetResult() == true) {
 		// Connected - go to next init step
 		glob_prefs->LoadRemote();
 	} else {
-		printf("Going down\n");
-		wxMessageBox(
+		AddLogLineNS(_("Going down"));
+		if (dialog) {	// connect failed
+			wxMessageBox(
 			(CFormat(_("Connection Failed. Unable to connect to %s:%d\n")) % dialog->Host() % dialog->Port()) + reply,
 			_("ERROR"), wxOK);
+		} else {		// server disconnected (probably terminated) later
+			wxMessageBox(_("Connection closed - aMule has terminated probably."), _("ERROR"), wxOK);
+		}
 		ExitMainLoop();
 	}
 }
@@ -319,12 +332,6 @@
 }
 
 
-void CamuleRemoteGuiApp::OnLoggingEvent(CLoggingEvent& evt)
-{
-	printf("LOG: %s\n", unicode2char(evt.Message()).data());
-}
-
-
 void CamuleRemoteGuiApp::OnNotifyEvent(CMuleGUIEvent& evt)
 {
 	evt.Notify();
@@ -339,66 +346,65 @@
 		wxConfig::Get()->Write(wxT("/EC/Password"), dialog->PassHash());
 	}
 	dialog->Destroy();
+	dialog = NULL;
 	
 	m_ConnState = 0;
 	m_clientID  = 0;
 
 	serverconnect = new CServerConnectRem(m_connect);
 	m_statistics = new CStatistics(*m_connect);
+	stattree = new CStatTreeRem(m_connect);
 	
-	clientlist = new CClientListRem(m_connect);
+	clientlist = new CUpDownClientListRem(m_connect);
 	searchlist = new CSearchListRem(m_connect);
 	serverlist = new CServerListRem(m_connect);
+	friendlist = new CFriendListRem(m_connect);
+
 	
 	sharedfiles	= new CSharedFilesRem(m_connect);
-	knownfiles = new CKnownFilesRem(sharedfiles);
+	knownfiles = new CKnownFilesRem(m_connect);
 
-	clientcredits = new CClientCreditsRem();
-	
-	// bugfix - do this before creating the uploadqueue
 	downloadqueue = new CDownQueueRem(m_connect);
-	uploadqueue = new CUpQueueRem(m_connect);
 	ipfilter = new CIPFilterRem(m_connect);
 
-	// Parse cmdline arguments.
-	wxCmdLineParser cmdline(wxApp::argc, wxApp::argv);
-	cmdline.AddSwitch(wxT("v"), wxT("version"),
-		wxT("Displays the current version number."));
-	cmdline.AddSwitch(wxT("h"), wxT("help"),
-		wxT("Displays this information."));
-	cmdline.AddOption(wxT("geometry"), wxEmptyString, wxT("Sets the geometry of the app.\n\t\t\t<str> uses the same format as standard X11 apps:\n\t\t\t[=][<width>{xX}<height>][{+-}<xoffset>{+-}<yoffset>]"));
-	cmdline.Parse();
-	
-	bool geometry_enabled = false;
-	wxString geom_string;
-	if (cmdline.Found(wxT("geometry"), &geom_string)) {
-		geometry_enabled = true;
-	}
-	
+	m_allUploadingKnownFile = new CKnownFile;
+
 	// Create main dialog
-	InitGui(0, geom_string);
+	InitGui(m_geometryEnabled, m_geometryString);
 
 	// Forward wxLog events to CLogger
 	wxLog::SetActiveTarget(new CLoggerTarget);
-	serverlist->FullReload(EC_OP_GET_SERVER_LIST);
-	sharedfiles->DoRequery(EC_OP_GET_SHARED_FILES, EC_TAG_KNOWNFILE);
+	knownfiles->DoRequery(EC_OP_GET_UPDATE, EC_TAG_KNOWNFILE);
 
 	// Start the Poll Timer
 	poll_timer->Start(1000);	
 	amuledlg->StartGuiTimer();
+
+	// Now activate GeoIP, so that the download dialog doesn't get destroyed immediately 
+#ifdef ENABLE_IP2COUNTRY
+	if (thePrefs::IsGeoIPEnabled()) {
+		amuledlg->m_IP2Country->Enable();
+	}
+#endif
 }
 
 
-void CamuleRemoteGuiApp::ShowAlert(wxString msg, wxString title, int flags)
+int CamuleRemoteGuiApp::ShowAlert(wxString msg, wxString title, int flags)
 {
-	CamuleGuiBase::ShowAlert(msg, title, flags);
+	return CamuleGuiBase::ShowAlert(msg, title, flags);
 }
 
 
+void CamuleRemoteGuiApp::AddRemoteLogLine(const wxString& line)
+{
+	amuledlg->AddLogLine(line);
+}
+
 int CamuleRemoteGuiApp::InitGui(bool geometry_enabled, wxString &geom_string)
 {
 	CamuleGuiBase::InitGui(geometry_enabled, geom_string);
 	SetTopWindow(amuledlg);
+	AddLogLineN(_("Ready")); // The first log line after the window is up triggers output of all the ones before
 	return 0;
 }
 
@@ -415,8 +421,13 @@
 }
 
 
-wxString CamuleRemoteGuiApp::GetLog(bool)
+wxString CamuleRemoteGuiApp::GetLog(bool reset)
 {
+	if (reset) {
+		amuledlg->ResetLog(ID_LOGVIEW);
+		CECPacket req(EC_OP_RESET_LOG);
+		m_connect->SendPacket(&req);
+	}
 	return wxEmptyString;
 }
 
@@ -427,87 +438,13 @@
 }
 
 
-wxString CamuleRemoteGuiApp::CreateMagnetLink(const CAbstractFile* f)
-{
-	// TODO: Remove duplicate code (also in amule.cpp) ... 
-	CMagnetURI uri;
-
-	uri.AddField(wxT("dn"), f->GetFileName().Cleanup(false).GetPrintable());
-	uri.AddField(wxT("xt"), wxString(wxT("urn:ed2k:")) + f->GetFileHash().Encode().Lower());
-	uri.AddField(wxT("xt"), wxString(wxT("urn:ed2khash:")) + f->GetFileHash().Encode().Lower());
-	uri.AddField(wxT("xl"), wxString::Format(wxT("%") wxLongLongFmtSpec wxT("u"), f->GetFileSize()));
-
-	return uri.GetLink();
-}
-
-wxString CamuleRemoteGuiApp::CreateED2kLink(const CAbstractFile* f, bool add_source, bool use_hostname, bool addcryptoptions)
-{
-	// TODO: Avoid duplicate code (also in amule.cpp) ... 
-	wxASSERT(!(!add_source && (use_hostname || addcryptoptions)));
-	// Construct URL like this: ed2k://|file|<filename>|<size>|<hash>|/
-	wxString strURL = CFormat(wxT("ed2k://|file|%s|%i|%s|/"))
-		% f->GetFileName().Cleanup(false)
-		% f->GetFileSize() % f->GetFileHash().Encode();
-	
-	if (add_source && IsConnected() && !IsFirewalled()) {
-		// Create the first part of the URL
-		strURL << wxT("|sources,");
-
-		if (use_hostname) {
-			strURL << thePrefs::GetYourHostname();
-		} else {
-			uint32 clientID = GetID();
-			strURL << (uint8) clientID << wxT(".") <<
-			(uint8)(clientID >> 8) << wxT(".") <<
-			(uint8)(clientID >> 16) << wxT(".") <<
-			(uint8)(clientID >> 24);
-		}
-		
- 		strURL << wxT(":") <<
-			thePrefs::GetPort();
-		
-		if (addcryptoptions) {
-			const uint8 uSupportsCryptLayer	= thePrefs::IsClientCryptLayerSupported() ? 1 : 0;
-			const uint8 uRequestsCryptLayer	= thePrefs::IsClientCryptLayerRequested() ? 1 : 0;
-			const uint8 uRequiresCryptLayer	= thePrefs::IsClientCryptLayerRequired() ? 1 : 0;
-			const uint8 byCryptOptions = (uRequiresCryptLayer << 2) | (uRequestsCryptLayer << 1) | (uSupportsCryptLayer << 0) | (uSupportsCryptLayer ? 0x80 : 0x00);
-			
-			strURL << wxT(":") << byCryptOptions;
-			
-			if (byCryptOptions & 0x80) {
-				strURL << wxT(":") << thePrefs::GetUserHash().Encode();
-			}
-			
-		}
-		strURL << wxT("|/");
-	} else if (add_source) {
-		AddLogLineM(true, _("WARNING: You can't add yourself as a source for an eD2k link while having a lowid."));
-	}
-
-	// Result is "ed2k://|file|<filename>|<size>|<hash>|/|sources,[(<ip>|<hostname>):<port>[:cryptoptions[:hash]]]|/"
-	return strURL;
-}
-
-
-wxString CamuleRemoteGuiApp::CreateED2kAICHLink(const CKnownFile* f)
+bool CamuleRemoteGuiApp::AddServer(CServer * server, bool)
 {
-	// TODO: Avoid duplicate code (also in amule.cpp) ... 
-	// Create the first part of the URL
-	wxString strURL = CreateED2kLink(f);
-	// Append the AICH info
-	if (f->HasProperAICHHashSet()) {
-		strURL.RemoveLast();		// remove trailing '/'
-		strURL << wxT("h=") << f->GetAICHMasterHash() << wxT("|/");
-	}	
-
-	// Result is "ed2k://|file|<filename>|<size>|<hash>|h=<AICH master hash>|/"
-	return strURL;
-}
-
+	CECPacket req(EC_OP_SERVER_ADD);
+	req.AddTag(CECTag(EC_TAG_SERVER_ADDRESS, CFormat(wxT("%s:%d")) % server->GetAddress() % server->GetPort()));
+	req.AddTag(CECTag(EC_TAG_SERVER_NAME, server->GetListName()));
+	m_connect->SendPacket(&req);
 
-bool CamuleRemoteGuiApp::AddServer(CServer *, bool)
-{
-	// #warning TODO: Add remote command
 	return true;
 }
 
@@ -576,10 +513,21 @@
 
 
 void CamuleRemoteGuiApp::ShowUserCount() {
-	wxString buffer =
-		CFormat(_("Users: E: %s K: %s | Files E: %s K: %s")) % CastItoIShort(theStats::GetED2KUsers()) % 
-		CastItoIShort(theStats::GetKadUsers()) % CastItoIShort(theStats::GetED2KFiles()) % CastItoIShort(theStats::GetKadFiles());
+	wxString buffer;
+	
+	static const wxString s_singlenetstatusformat = _("Users: %s | Files: %s");
+	static const wxString s_bothnetstatusformat = _("Users: E: %s K: %s | Files: E: %s K: %s");
 	
+	if (thePrefs::GetNetworkED2K() && thePrefs::GetNetworkKademlia()) {
+		buffer = CFormat(s_bothnetstatusformat) % CastItoIShort(theStats::GetED2KUsers()) % CastItoIShort(theStats::GetKadUsers()) % CastItoIShort(theStats::GetED2KFiles()) % CastItoIShort(theStats::GetKadFiles());
+	} else if (thePrefs::GetNetworkED2K()) {
+		buffer = CFormat(s_singlenetstatusformat) % CastItoIShort(theStats::GetED2KUsers()) % CastItoIShort(theStats::GetED2KFiles());
+	} else if (thePrefs::GetNetworkKademlia()) {
+		buffer = CFormat(s_singlenetstatusformat) % CastItoIShort(theStats::GetKadUsers()) % CastItoIShort(theStats::GetKadFiles());
+	} else {
+		buffer = _("No networks selected");
+	}
+
 	Notify_ShowUserCount(buffer);
 }
 
@@ -594,9 +542,6 @@
 {
 	m_conn = conn;
 
-	CPreferences::BuildItemList(theApp->ConfigDir);
-	CPreferences::LoadAllItems(wxConfigBase::Get());
-	
 	//
 	// Settings queried from remote side
 	//
@@ -608,6 +553,7 @@
 		EC_PREFS_SERVERS |
 		EC_PREFS_FILES |
 		EC_PREFS_SRCDROP |
+		EC_PREFS_DIRECTORIES |
 		EC_PREFS_SECURITY |
 		EC_PREFS_CORETWEAKS |
 		EC_PREFS_REMOTECONTROLS |
@@ -622,15 +568,16 @@
 {
 	((CEC_Prefs_Packet *)packet)->Apply();
 
-	if ( packet->GetTagByName(EC_TAG_PREFS_CATEGORIES) != 0 ) {
-		for (int i = 0; i < packet->GetTagByName(EC_TAG_PREFS_CATEGORIES)->GetTagCount(); i++) {
-			const CECTag *cat_tag = packet->GetTagByName(EC_TAG_PREFS_CATEGORIES)->GetTagByIndex(i);
+	const CECTag *cat_tags = packet->GetTagByName(EC_TAG_PREFS_CATEGORIES);
+	if (cat_tags) {
+		for (CECTag::const_iterator it = cat_tags->begin(); it != cat_tags->end(); it++) {
+			const CECTag &cat_tag = *it;
 			Category_Struct *cat = new Category_Struct;
-			cat->title = cat_tag->GetTagByName(EC_TAG_CATEGORY_TITLE)->GetStringData();
-			cat->path = CPath(cat_tag->GetTagByName(EC_TAG_CATEGORY_PATH)->GetStringData());
-			cat->comment = cat_tag->GetTagByName(EC_TAG_CATEGORY_COMMENT)->GetStringData();
-			cat->color =  cat_tag->GetTagByName(EC_TAG_CATEGORY_COLOR)->GetInt();
-			cat->prio = cat_tag->GetTagByName(EC_TAG_CATEGORY_PRIO)->GetInt();
+			cat->title = cat_tag.GetTagByName(EC_TAG_CATEGORY_TITLE)->GetStringData();
+			cat->path = CPath(cat_tag.GetTagByName(EC_TAG_CATEGORY_PATH)->GetStringData());
+			cat->comment = cat_tag.GetTagByName(EC_TAG_CATEGORY_COMMENT)->GetStringData();
+			cat->color =  cat_tag.GetTagByName(EC_TAG_CATEGORY_COLOR)->GetInt();
+			cat->prio = cat_tag.GetTagByName(EC_TAG_CATEGORY_PRIO)->GetInt();
 			theApp->glob_prefs->AddCat(cat);
 		}
 	} else {
@@ -668,7 +615,33 @@
 }
 
 
-Category_Struct *CPreferencesRem::CreateCategory(
+class CCatHandler : public CECPacketHandlerBase {
+	virtual void HandlePacket(const CECPacket *packet);
+};
+
+
+void CCatHandler::HandlePacket(const CECPacket *packet)
+{
+	if (packet->GetOpCode() == EC_OP_FAILED) {
+		const CECTag * catTag = packet->GetTagByName(EC_TAG_CATEGORY);
+		const CECTag * pathTag = packet->GetTagByName(EC_TAG_CATEGORY_PATH);
+		if (catTag && pathTag && catTag->GetInt() < theApp->glob_prefs->GetCatCount()) {
+			int cat = catTag->GetInt();
+			Category_Struct* cs = theApp->glob_prefs->GetCategory(cat);
+			wxMessageBox(CFormat(_("Can't create directory '%s' for category '%s', keeping directory '%s'."))
+				% cs->path.GetPrintable() % cs->title % pathTag->GetStringData(), 
+				_("ERROR"), wxOK);
+			cs->path = CPath(pathTag->GetStringData());
+			theApp->amuledlg->m_transferwnd->UpdateCategory(cat);
+			theApp->amuledlg->m_transferwnd->downloadlistctrl->Refresh();
+		}
+	}
+	delete this;
+}
+
+
+bool CPreferencesRem::CreateCategory(
+	Category_Struct *& category,
 	const wxString& name,
 	const CPath& path,
 	const wxString& comment,
@@ -678,9 +651,9 @@
 	CECPacket req(EC_OP_CREATE_CATEGORY);
 	CEC_Category_Tag tag(0xffffffff, name, path.GetRaw(), comment, color, prio);
 	req.AddTag(tag);
-	m_conn->SendPacket(&req);
+	m_conn->SendRequest(new CCatHandler, &req);
 
-	Category_Struct *category = new Category_Struct();
+	category = new Category_Struct();
 	category->path		= path;
 	category->title		= name;
 	category->comment	= comment;
@@ -689,11 +662,11 @@
 			
 	AddCat(category);
 	
-	return category;
+	return true;
 }
 
 
-void CPreferencesRem::UpdateCategory(
+bool CPreferencesRem::UpdateCategory(
 	uint8 cat,
 	const wxString& name,
 	const CPath& path,
@@ -704,7 +677,7 @@
 	CECPacket req(EC_OP_UPDATE_CATEGORY);
 	CEC_Category_Tag tag(cat, name, path.GetRaw(), comment, color, prio);
 	req.AddTag(tag);
-	m_conn->SendPacket(&req);
+	m_conn->SendRequest(new CCatHandler, &req);
 
 	Category_Struct *category = m_CatList[cat];
 	category->path		= path;
@@ -712,6 +685,8 @@
 	category->comment	= comment;
 	category->color		= color;
 	category->prio		= prio;
+
+	return true;
 }
 
 
@@ -761,15 +736,6 @@
 }
 
 
-bool CServerConnectRem::ReQuery()
-{
-	CECPacket stat_req(EC_OP_STAT_REQ);
-	m_Conn->SendRequest(this, &stat_req);
-
-	return true;
-}
-	
-
 void CServerConnectRem::HandlePacket(const CECPacket *packet)
 {
 	CEC_ConnState_Tag *tag =
@@ -785,24 +751,17 @@
 	
 	if (tag->IsConnectedED2K()) {
 		CECTag *srvtag = tag->GetTagByName(EC_TAG_SERVER);
-		if (!srvtag) {
-			return;
-		}
-		server = theApp->serverlist->GetByID(srvtag->GetIPv4Data().IP());
-		if (m_CurrServer && (server != m_CurrServer)) {
-			theApp->amuledlg->m_serverwnd->serverlistctrl->
-				HighlightServer(m_CurrServer, false);
+		if (srvtag) {
+			server = theApp->serverlist->GetByID(srvtag->GetInt());
+			if (server != m_CurrServer) {
+				theApp->amuledlg->m_serverwnd->serverlistctrl->HighlightServer(server, true);
+				m_CurrServer = server;
+			}
 		}
-		theApp->amuledlg->m_serverwnd->serverlistctrl->
-			HighlightServer(server, true);
-		m_CurrServer = server;
 		theApp->m_ConnState |= CONNECTED_ED2K;
-	} else {
-	    	if ( m_CurrServer ) {
-	    		theApp->amuledlg->m_serverwnd->serverlistctrl->
-				HighlightServer(m_CurrServer, false);
-	    		m_CurrServer = 0;
-	    	}
+	} else if ( m_CurrServer ) {
+	    theApp->amuledlg->m_serverwnd->serverlistctrl->HighlightServer(m_CurrServer, false);
+	    m_CurrServer = 0;
 	}
 
 	if (tag->IsConnectedKademlia()) {
@@ -826,15 +785,16 @@
  */
 CServerListRem::CServerListRem(CRemoteConnect *conn)
 :
-CRemoteContainer<CServer, uint32, CEC_Server_Tag>(conn)
+CRemoteContainer<CServer, uint32, CEC_Server_Tag>(conn, true)
 {
 }
 
 
-void CServerListRem::HandlePacket(const CECPacket *packet)
+void CServerListRem::HandlePacket(const CECPacket *)
 {
-	CRemoteContainer<CServer, uint32, CEC_Server_Tag>::HandlePacket(packet);
-	ReloadControl();
+	// There is no packet for the server list, it is part of the general update packet
+	wxFAIL;
+	// CRemoteContainer<CServer, uint32, CEC_Server_Tag>::HandlePacket(packet);
 }
 
 
@@ -847,16 +807,31 @@
 }
 
 
-void CServerListRem::SaveServerMet()
+void CServerListRem::SetStaticServer(CServer* server, bool isStatic)
 {
-	// lfroen: stub, nothing to do
+	// update display right away
+	server->SetIsStaticMember(isStatic);
+	Notify_ServerRefresh(server);
+
+	CECPacket req(EC_OP_SERVER_SET_STATIC_PRIO);
+	req.AddTag(CECTag(EC_TAG_SERVER, server->ECID()));
+	req.AddTag(CECTag(EC_TAG_SERVER_STATIC, isStatic));
+	
+	m_conn->SendPacket(&req);
 }
 
 
-void CServerListRem::FilterServers()
+void CServerListRem::SetServerPrio(CServer* server, uint32 prio)
 {
-	// FIXME: add code
-	//wxASSERT(0);
+	// update display right away
+	server->SetPreference(prio);
+	Notify_ServerRefresh(server);
+
+	CECPacket req(EC_OP_SERVER_SET_STATIC_PRIO);
+	req.AddTag(CECTag(EC_TAG_SERVER, server->ECID()));
+	req.AddTag(CECTag(EC_TAG_SERVER_PRIO, prio));
+	
+	m_conn->SendPacket(&req);
 }
 
 
@@ -871,11 +846,6 @@
 	if (server) {
 		m_TotalUser = server->GetUsers();
 		m_TotalFile = server->GetFiles();
-		
-		wxString buffer = 
-			CFormat(_("Total Users: %s | Total Files: %s")) % CastItoIShort(m_TotalUser) % CastItoIShort(m_TotalFile);
-		
-		Notify_ShowUserCount(buffer);
 	}
 }
 
@@ -894,39 +864,60 @@
 
 CServer *CServerListRem::CreateItem(CEC_Server_Tag *tag)
 {
-	return new CServer(tag);
+	CServer * server = new CServer(tag);
+	ProcessItemUpdate(tag, server);
+	return server;
 }
 
 
 void CServerListRem::DeleteItem(CServer *in_srv)
 {
-	auto_ptr<CServer> srv(in_srv);
+	CScopedPtr<CServer> srv(in_srv);
 	theApp->amuledlg->m_serverwnd->serverlistctrl->RemoveServer(srv.get());
 }
 
 
 uint32 CServerListRem::GetItemID(CServer *server)
 {
-	return server->GetIP();
+	return server->ECID();
 }
 
 
-void CServerListRem::ProcessItemUpdate(CEC_Server_Tag *, CServer *)
+void CServerListRem::ProcessItemUpdate(CEC_Server_Tag * tag, CServer * server)
 {
-	// server list is always realoaded from scratch
-	wxASSERT(0);
+	if (!tag->HasChildTags()) {
+		return;
+	}
+	tag->ServerName(& server->listname);
+	tag->ServerDesc(& server->description);
+	tag->ServerVersion(& server->m_strVersion);
+	tag->GetMaxUsers(& server->maxusers);
+	
+	tag->GetFiles(& server->files);
+	tag->GetUsers(& server->users);
+   
+	tag->GetPrio(& server->preferences); // SRV_PR_NORMAL = 0, so it's ok
+    tag->GetStatic(& server->staticservermember);
+
+	tag->GetPing(& server->ping);
+	tag->GetFailed(& server->failedcount);	
+
+	theApp->amuledlg->m_serverwnd->serverlistctrl->RefreshServer(server);
 }
 
 
-void CServerListRem::ReloadControl()
+CServer::CServer(CEC_Server_Tag *tag) : CECID(tag->GetInt())
 {
-	for(uint32 i = 0;i < GetCount(); i++) {
-		CServer *srv = GetByIndex(i);
-		theApp->amuledlg->m_serverwnd->serverlistctrl->RefreshServer(srv);
-	}
+	ip = tag->GetTagByNameSafe(EC_TAG_SERVER_IP)->GetInt();
+	port = tag->GetTagByNameSafe(EC_TAG_SERVER_PORT)->GetInt();
+	
+	Init();
 }
 
 
+/*
+ * IP filter
+ */
 CIPFilterRem::CIPFilterRem(CRemoteConnect* conn)
 {
 	m_conn = conn;
@@ -940,19 +931,21 @@
 }
 
 
-void CIPFilterRem::Update(wxString WXUNUSED(url))
+void CIPFilterRem::Update(wxString url)
 {
-	// FIXME: add command
-	//wxASSERT(0);
+	CECPacket req(EC_OP_IPFILTER_UPDATE);
+	req.AddTag(CECTag(EC_TAG_STRING, url));
+	
+	m_conn->SendPacket(&req);
 }
 
 
 /*
  * Shared files list
  */
-CSharedFilesRem::CSharedFilesRem(CRemoteConnect *conn) : CRemoteContainer<CKnownFile, CMD4Hash, CEC_SharedFile_Tag>(conn, true)
+CSharedFilesRem::CSharedFilesRem(CRemoteConnect *conn)
 {
-	m_rename_file = NULL;
+	m_conn = conn;
 }
 
 
@@ -964,16 +957,6 @@
 }
 
 
-void CSharedFilesRem::AddFilesFromDirectory(const CPath& path)
-{
-	CECPacket req(EC_OP_SHAREDFILES_ADD_DIRECTORY);
-
-	req.AddTag(CECTag(EC_TAG_PREFS_DIRECTORIES, path.GetRaw()));
-	
-	m_conn->SendPacket(&req);
-}
-
-
 bool CSharedFilesRem::RenameFile(CKnownFile* file, const CPath& newName)
 {
 	// We use the printable name, as the filename originated from user input,
@@ -984,103 +967,107 @@
 	request.AddTag(CECTag(EC_TAG_KNOWNFILE, file->GetFileHash()));
 	request.AddTag(CECTag(EC_TAG_PARTFILE_NAME, strNewName));
 
-	m_conn->SendRequest(this, &request);
-	m_rename_file = file;
-	m_new_name = strNewName;
+	m_conn->SendPacket(&request);
 	
 	return true;
 }
 
 
-void CSharedFilesRem::HandlePacket(const CECPacket *packet)
+void CSharedFilesRem::SetFileCommentRating(CKnownFile* file, const wxString& newComment, int8 newRating)
 {
-	if (m_rename_file && (packet->GetOpCode() == EC_OP_NOOP)) {
-		m_rename_file->SetFileName(CPath(m_new_name));
-		m_rename_file = NULL;
-	} else if (packet->GetOpCode() != EC_OP_FAILED) {
-		CRemoteContainer<CKnownFile, CMD4Hash, CEC_SharedFile_Tag>::HandlePacket(packet);
-	}
+	CECPacket request(EC_OP_SHARED_FILE_SET_COMMENT);
+	request.AddTag(CECTag(EC_TAG_KNOWNFILE, file->GetFileHash()));
+	request.AddTag(CECTag(EC_TAG_KNOWNFILE_COMMENT, newComment));
+	request.AddTag(CECTag(EC_TAG_KNOWNFILE_RATING, newRating));
+
+	m_conn->SendPacket(&request);
 }
 
 
-CKnownFile *CSharedFilesRem::CreateItem(CEC_SharedFile_Tag *tag)
+void CSharedFilesRem::CopyFileList(std::vector<CKnownFile*>& out_list) const
 {
-	CKnownFile *file = new CKnownFile(tag);
-
-	m_enc_map[file->GetFileHash()] = RLE_Data(file->GetPartCount(), true);
-
-	ProcessItemUpdate(tag, file);
-	
-	theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ShowFile(file);
-	
-	return file;
+	out_list.reserve(size());
+	for (const_iterator it = begin(); it != end(); it++) {
+		out_list.push_back(it->second);
+	}
 }
 
 
-void CSharedFilesRem::DeleteItem(CKnownFile *in_file)
+void CKnownFilesRem::DeleteItem(CKnownFile * file)
 {
-	auto_ptr<CKnownFile> file(in_file);
-
-	m_enc_map.erase(file->GetFileHash());
-	
-	theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->RemoveFile(file.get());
+	uint32 id = file->ECID();
+	if (theApp->sharedfiles->count(id)) {
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->RemoveFile(file);
+		theApp->sharedfiles->erase(id);
+	}
+	if (theApp->downloadqueue->count(id)) {
+		theApp->amuledlg->m_transferwnd->downloadlistctrl->RemoveFile((CPartFile *) file);
+		theApp->downloadqueue->erase(id);
+	}
+	delete file;
 }
 
 
-CMD4Hash CSharedFilesRem::GetItemID(CKnownFile *file)
+uint32 CKnownFilesRem::GetItemID(CKnownFile *file)
 {
-	return file->GetFileHash();
+	return file->ECID();
 }
 
 
-void CSharedFilesRem::ProcessItemUpdate(CEC_SharedFile_Tag *tag, CKnownFile *file)
+void CKnownFilesRem::ProcessItemUpdate(CEC_SharedFile_Tag *tag, CKnownFile *file)
 {
 	CECTag *parttag = tag->GetTagByName(EC_TAG_PARTFILE_PART_STATUS);
-	const unsigned char *data =
-		m_enc_map[file->GetFileHash()].Decode(
-			(unsigned char *)parttag->GetTagData(),
-			parttag->GetTagDataLen());
-	for(int i = 0; i < file->GetPartCount(); ++i) {
-		file->m_AvailPartFrequency[i] = data[i];
-	}
-	if (m_inc_tags) {
-		tag->SetRequests(file->statistic.requested);
-		tag->SetAllRequests(file->statistic.alltimerequested);
-		tag->SetAccepts(file->statistic.accepted);
-		tag->SetAllAccepts(file->statistic.alltimeaccepted);
-		tag->SetXferred(file->statistic.transferred );
-		tag->SetAllXferred(file->statistic.alltimetransferred);
-		tag->SetPrio(file->m_iUpPriority);
-	} else {
-		file->statistic.requested = tag->GetRequests();
-		file->statistic.alltimerequested = tag->GetAllRequests();
-		file->statistic.accepted = tag->GetAccepts();
-		file->statistic.alltimeaccepted = tag->GetAllAccepts();
-		file->statistic.transferred = tag->GetXferred();
-		file->statistic.alltimetransferred = tag->GetAllXferred();
-		file->m_iUpPriority = tag->Prio();
-	}
-	if (file->m_iUpPriority >= 10) {
-		file->m_iUpPriority -= 10;
+	if (parttag) {
+		const uint8 *data =	file->m_partStatus.Decode(
+				(uint8 *)parttag->GetTagData(),
+				parttag->GetTagDataLen());
+		for(int i = 0; i < file->GetPartCount(); ++i) {
+			file->m_AvailPartFrequency[i] = data[i];
+		}
+	}
+	wxString fileName;
+	if (tag->FileName(fileName)) {
+		file->SetFileName(CPath(fileName));
+	}
+	if (tag->FilePath(fileName)) {
+		file->m_filePath = CPath(fileName);
+	}
+	tag->UpPrio(&file->m_iUpPriorityEC);
+	tag->GetAICHHash(file->m_AICHMasterHash);
+	tag->GetRequests(&file->statistic.requested);
+	tag->GetAllRequests(&file->statistic.alltimerequested);
+	tag->GetAccepts(&file->statistic.accepted);
+	tag->GetAllAccepts(&file->statistic.alltimeaccepted);
+	tag->GetXferred(&file->statistic.transferred);
+	tag->GetAllXferred(&file->statistic.alltimetransferred);
+	tag->UpPrio(&file->m_iUpPriorityEC);
+	if (file->m_iUpPriorityEC >= 10) {
+		file->m_iUpPriority = file->m_iUpPriorityEC - 10;
 		file->m_bAutoUpPriority = true;
 	} else {
+		file->m_iUpPriority = file->m_iUpPriorityEC;
 		file->m_bAutoUpPriority = false;
 	}
+	tag->GetCompleteSourcesLow(&file->m_nCompleteSourcesCountLo);
+	tag->GetCompleteSourcesHigh(&file->m_nCompleteSourcesCountHi);
+	tag->GetCompleteSources(&file->m_nCompleteSourcesCount);
 
-	theApp->knownfiles->requested += file->statistic.requested;
-	theApp->knownfiles->transferred += file->statistic.transferred;
-	theApp->knownfiles->accepted += file->statistic.transferred;
-	
-	theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->UpdateItem(file);
-}
+	tag->GetOnQueue(&file->m_queuedCount);
 
-bool CSharedFilesRem::Phase1Done(const CECPacket *)
-{
-	theApp->knownfiles->requested = 0;
-	theApp->knownfiles->transferred = 0;
-	theApp->knownfiles->accepted = 0;
+	tag->GetComment(file->m_strComment);
+	tag->GetRating(file->m_iRating);
+
+	requested += file->statistic.requested;
+	transferred += file->statistic.transferred;
+	accepted += file->statistic.transferred;
 	
-	return true;
+	if (!m_initialUpdate) {
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->UpdateItem(file);
+	}
+
+	if (file->IsPartFile()) {
+		ProcessItemUpdatePartfile((CEC_PartFile_Tag *) tag, (CPartFile *) file);
+	}
 }
 
 void CSharedFilesRem::SetFilePrio(CKnownFile *file, uint8 prio)
@@ -1095,122 +1082,188 @@
 	m_conn->SendPacket(&req);
 }
 
-/*
- * List of uploading and waiting clients.
- */
-CUpDownClientListRem::CUpDownClientListRem(CRemoteConnect *conn, int viewtype)
-:
-CRemoteContainer<CUpDownClient, uint32, CEC_UpDownClient_Tag>(conn)
-{
-	m_viewtype = viewtype;
-}
-
-
-CUpDownClient::CUpDownClient(CEC_UpDownClient_Tag *tag)
-{
-	m_bRemoteQueueFull = false;
-	m_nUserIDHybrid = tag->ID();
-	m_Username = tag->ClientName();
-	m_score = tag->Score();
-	m_clientSoft = tag->ClientSoftware();
-	m_clientVersionString = GetSoftName(m_clientSoft);
-	m_clientSoftString = m_clientVersionString;
-
-	// The functions to retrieve m_clientVerString information are
-	// currently in BaseClient.cpp, which is not linked in remote-gui app.
-	// So, in the meantime, we use a tag sent from core.
-	m_clientVerString = tag->SoftVerStr();
-	m_strModVersion = wxEmptyString;
-	wxString clientModString;
-	if (!clientModString.IsEmpty()) {
-		m_clientVerString += wxT(" - ") + clientModString;
+void CKnownFilesRem::ProcessUpdate(const CECTag *reply, CECPacket *, int)
+{
+	requested = 0;
+	transferred = 0;
+	accepted = 0;
+
+	std::set<uint32> core_files;
+	for (CECPacket::const_iterator it = reply->begin(); it != reply->end(); it++) {
+		const CECTag * curTag = &*it;
+		ec_tagname_t tagname = curTag->GetTagName();
+		if (tagname == EC_TAG_CLIENT) {
+			theApp->clientlist->ProcessUpdate(curTag, NULL, EC_TAG_CLIENT);
+		} else if (tagname == EC_TAG_SERVER) {
+			theApp->serverlist->ProcessUpdate(curTag, NULL, EC_TAG_SERVER);
+		} else if (tagname == EC_TAG_FRIEND) {
+			theApp->friendlist->ProcessUpdate(curTag, NULL, EC_TAG_FRIEND);
+		} else if (tagname == EC_TAG_KNOWNFILE || tagname == EC_TAG_PARTFILE) {
+			CEC_SharedFile_Tag *tag = (CEC_SharedFile_Tag *) curTag;
+			uint32 id = tag->ID();
+			bool isNew = true;
+			if (!m_initialUpdate) {
+				core_files.insert(id);
+				std::map<uint32, CKnownFile*>::iterator it2 = m_items_hash.find(id);
+				if (it2 != m_items_hash.end() ) {
+					// Item already known: update it
+					if (tag->HasChildTags()) {
+						ProcessItemUpdate(tag, it2->second);
+					}
+					isNew = false;
+				}
+			}
+			if (isNew) {
+				CKnownFile * newFile;
+				if (tag->GetTagName() == EC_TAG_PARTFILE) {
+					CPartFile *file = new CPartFile((CEC_PartFile_Tag *) tag);
+					ProcessItemUpdate(tag, file);
+					(*theApp->downloadqueue)[id] = file;
+					theApp->amuledlg->m_transferwnd->downloadlistctrl->AddFile(file);
+					newFile = file;
+				} else {
+					newFile = new CKnownFile(tag);
+					ProcessItemUpdate(tag, newFile);
+					(*theApp->sharedfiles)[id] = newFile;
+					if (!m_initialUpdate) {
+						theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ShowFile(newFile);
+					}
+				}
+				AddItem(newFile);
+			}
+		}
 	}
-	m_fullClientVerString = m_clientSoftString + wxT(" ") + m_clientVerString;
-
-	// User hash
-	m_UserHash = tag->UserID();
-
-	// User IP:Port
-	m_nConnectIP = m_dwUserIP = tag->UserIP();
-	m_nUserPort = tag->UserPort();
-	m_FullUserIP = Uint32toStringIP(m_nConnectIP);
 
-	// Server IP:Port
-	m_dwServerIP = tag->ServerIP();
-	m_nServerPort = tag->ServerPort();
-	m_ServerName = tag->ServerName();
-
-	m_waitingPosition = tag->WaitingPosition();
-	
-	m_Friend = 0;
-	if (tag->HaveFile()) {
-		CMD4Hash filehash = tag->FileID();
-		m_uploadingfile = theApp->sharedfiles->GetByID(filehash);
-		if (!m_uploadingfile) {
-			m_uploadingfile = theApp->downloadqueue->GetByID(filehash);
-		}
+	if (m_initialUpdate) {
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ShowFileList();
+		m_initialUpdate = false;
 	} else {
-		m_uploadingfile = NULL;
+		// remove items no longer present
+		for(iterator it = begin(); it != end();) {
+			iterator it2 = it++;
+			if (!core_files.count(GetItemID(*it2))) {
+				RemoveItem(it2);	// This calls DeleteItem, where it is removed from lists and views.
+			}
+		}
 	}
-
-	m_nCurSessionUp = 0;
-
-	credits = new CClientCredits(new CreditStruct());
 }
 
-uint16 CUpQueueRem::GetWaitingPosition(const CUpDownClient *client) const
+CKnownFilesRem::CKnownFilesRem(CRemoteConnect * conn) : CRemoteContainer<CKnownFile, uint32, CEC_SharedFile_Tag>(conn, true)
 {
-	return client->GetWaitingPosition();
+	requested = 0;
+	transferred = 0;
+	accepted = 0;
+	m_initialUpdate = true;
 }
 
-/* Warning: do common base */
 
-
-bool CUpDownClient::IsIdentified() const 
+/*
+ * List of uploading and waiting clients.
+ */
+CUpDownClientListRem::CUpDownClientListRem(CRemoteConnect *conn)
+:
+CRemoteContainer<CClientRef, uint32, CEC_UpDownClient_Tag>(conn, true)
 {
-	return (credits && credits->GetCurrentIdentState(GetIP()) == IS_IDENTIFIED);
 }
 
 
-bool CUpDownClient::IsBadGuy() const 
+CClientRef::CClientRef(CEC_UpDownClient_Tag *tag)
 {
-	return (credits && credits->GetCurrentIdentState(GetIP()) == IS_IDBADGUY);
+	m_client = new CUpDownClient(tag);
+#ifdef DEBUG_ZOMBIE_CLIENTS
+	m_client->Link(wxT("TAG"));
+#else
+	m_client->Link();
+#endif
 }
 
 
-bool CUpDownClient::SUIFailed() const 
+CUpDownClient::CUpDownClient(CEC_UpDownClient_Tag *tag) : CECID(tag->ID())
 {
-	return (credits && credits->GetCurrentIdentState(GetIP()) == IS_IDFAILED);
-}
+	m_linked = 0;
+#ifdef DEBUG_ZOMBIE_CLIENTS
+	m_linkedDebug = false;
+#endif
+	// Clients start up empty, then get asked for their data.
+	// So all data here is processed in ProcessItemUpdate and thus updatable.
+	m_bEmuleProtocol		= false;
+	m_AvailPartCount		= 0;
+	m_clientSoft			= 0;
+	m_nDownloadState		= 0;
+	m_Friend				= NULL;
+	m_bFriendSlot			= false;
+	m_nKadPort				= 0;
+	m_kBpsDown				= 0;
+	m_dwUserIP				= 0;
+	m_lastDownloadingPart	= 0xffff;
+	m_nextRequestedPart		= 0xffff;
+	m_obfuscationStatus		= 0;
+	m_nOldRemoteQueueRank	= 0;
+	m_nRemoteQueueRank		= 0;
+	m_reqfile				= NULL;
+	m_score					= 0;
+	m_dwServerIP			= 0;
+	m_nServerPort			= 0;
+	m_nSourceFrom			= SF_NONE;
+	m_nTransferredDown		= 0;
+	m_nTransferredUp		= 0;
+	m_nUpDatarate			= 0;
+	m_uploadingfile			= NULL;
+	m_waitingPosition		= 0;
+	m_nUploadState			= 0;
+	m_nUserIDHybrid			= 0;
+	m_nUserPort				= 0;
+	m_nClientVersion		= 0;
+	m_fNoViewSharedFiles	= true;
+	m_identState			= IS_NOTAVAILABLE;
+	m_bRemoteQueueFull		= false;
 
+	credits = new CClientCredits(new CreditStruct());
+}
 
-bool CUpDownClient::SUINeeded() const 
+#ifdef DEBUG_ZOMBIE_CLIENTS
+void CUpDownClient::Unlink(const wxString& from)
 {
-	return (credits && credits->GetCurrentIdentState(GetIP()) == IS_IDNEEDED);
+	std::multiset<wxString>::iterator it = m_linkedFrom.find(from);
+	if (it != m_linkedFrom.end()) {
+		m_linkedFrom.erase(it);
+	}
+	m_linked--;
+	if (!m_linked) {
+		if (m_linkedDebug) {
+			AddLogLineN(CFormat(wxT("Last reference to client %d %p unlinked, delete it.")) % ECID() % this);
+		}
+		delete this;
+	}
 }
 
+#else
 
-bool CUpDownClient::SUINotSupported() const 
+void CUpDownClient::Unlink()
 {
-	return (credits && credits->GetCurrentIdentState(GetIP()) == IS_NOTAVAILABLE);
+	m_linked--;
+	if (!m_linked) {
+		delete this;
+	}
 }
+#endif
 
 
 uint64 CUpDownClient::GetDownloadedTotal() const 
 {
-	return credits ? credits->GetDownloadedTotal() : 0;
+	return credits->GetDownloadedTotal();
 }
 
 
 uint64 CUpDownClient::GetUploadedTotal() const 
 {
-	return credits ? credits->GetUploadedTotal() : 0;
+	return credits->GetUploadedTotal();
 }
 
 
 double CUpDownClient::GetScoreRatio() const
 {
-	return credits ? credits->GetScoreRatio(GetIP(), theApp->CryptoAvailable()) : 0;
+	return credits->GetScoreRatio(GetIP(), theApp->CryptoAvailable());
 }
 
 /* End Warning */
@@ -1218,204 +1271,314 @@
 
 CUpDownClient::~CUpDownClient()
 {
-	if (credits) {
-		delete credits;
-	}
+	delete credits;
 }
 
 
-CUpDownClient *CUpDownClientListRem::CreateItem(CEC_UpDownClient_Tag *tag)
+CClientRef *CUpDownClientListRem::CreateItem(CEC_UpDownClient_Tag *tag)
 {
-	CUpDownClient *client = new CUpDownClient(tag);
+	CClientRef *client = new CClientRef(tag);
 	ProcessItemUpdate(tag, client);
 	
-	theApp->amuledlg->m_transferwnd->clientlistctrl->InsertClient(client, (ViewType)m_viewtype);
-	
 	return client;
 }
 
 
-void CUpDownClientListRem::DeleteItem(CUpDownClient *client)
+void CUpDownClientListRem::DeleteItem(CClientRef *clientref)
 {
-	theApp->amuledlg->m_transferwnd->clientlistctrl->
-		RemoveClient(client, (ViewType)m_viewtype);
-	delete client;
+	CUpDownClient* client = clientref->GetClient();
+	if (client->m_reqfile) {
+		client->m_reqfile->DelSource(client);
+		client->m_reqfile = NULL;
+	}
+	Notify_SourceCtrlRemoveSource(client->ECID(), (CPartFile*) NULL);
+
+	if (client->m_uploadingfile) {
+		client->m_uploadingfile->RemoveUploadingClient(client);	// this notifies
+		client->m_uploadingfile = NULL;
+	}
+	theApp->m_allUploadingKnownFile->RemoveUploadingClient(client);	// in case it vanished directly while uploading
+	Notify_SharedCtrlRemoveClient(client->ECID(), (CKnownFile*) NULL);
+
+	if (client->m_Friend) {
+		client->m_Friend->UnLinkClient();	// this notifies
+		client->m_Friend = NULL;
+	}
+
+#ifdef DEBUG_ZOMBIE_CLIENTS
+	if (client->m_linked > 1) {
+		AddLogLineC(CFormat(wxT("Client %d still linked in %d places: %s")) % client->ECID() % (client->m_linked - 1) % client->GetLinkedFrom());
+		client->m_linkedDebug = true;
+	}
+#endif
+
+	delete clientref;
 }
 
 
-uint32 CUpDownClientListRem::GetItemID(CUpDownClient *client)
+uint32 CUpDownClientListRem::GetItemID(CClientRef *client)
 {
-	return client->GetUserIDHybrid();
+	return client->ECID();
 }
 
 
 void CUpDownClientListRem::ProcessItemUpdate(
 	CEC_UpDownClient_Tag *tag,
-	CUpDownClient *client)
+	CClientRef *clientref)
 {
-	uint16 state = tag->ClientState();
-	
-	client->m_nDownloadState = state & 0xff;
-	client->m_nUploadState = (state >> 8) & 0xff;
+	if (!tag->HasChildTags()) {
+		return;		// speed exit for clients without any change
+	}
+	CUpDownClient *client = clientref->GetClient();
+
+	tag->UserID(&client->m_nUserIDHybrid);
+	tag->ClientName(&client->m_Username);
+	// Client Software
+	bool sw_updated = false;
+	if (tag->ClientSoftware(client->m_clientSoft)) {
+		client->m_clientSoftString = GetSoftName(client->m_clientSoft);
+		sw_updated = true;
+	}
+	if (tag->SoftVerStr(client->m_clientVerString) || sw_updated) {
+		if (client->m_clientSoftString == _("Unknown")) {
+			client->m_fullClientVerString = client->m_clientSoftString;
+		} else {
+			client->m_fullClientVerString = client->m_clientSoftString + wxT(" ") + client->m_clientVerString;
+		}
+	}
+	// User hash
+	tag->UserHash(&client->m_UserHash);
+
+	// User IP:Port
+	tag->UserIP(client->m_dwUserIP);
+	tag->UserPort(&client->m_nUserPort);
+
+	// Server IP:Port
+	tag->ServerIP(&client->m_dwServerIP);
+	tag->ServerPort(&client->m_nServerPort);
+	tag->ServerName(&client->m_ServerName);
+
+	tag->KadPort(client->m_nKadPort);
+	tag->FriendSlot(client->m_bFriendSlot);
+
+	tag->GetCurrentIdentState(&client->m_identState);
+	tag->ObfuscationStatus(client->m_obfuscationStatus);
+	tag->HasExtendedProtocol(&client->m_bEmuleProtocol);
+
+	tag->WaitingPosition(&client->m_waitingPosition);
+	tag->RemoteQueueRank(&client->m_nRemoteQueueRank);
+	client->m_bRemoteQueueFull = client->m_nRemoteQueueRank == 0xffff;
+	tag->OldRemoteQueueRank(&client->m_nOldRemoteQueueRank);
+	
+	tag->ClientDownloadState(client->m_nDownloadState);
+	if (tag->ClientUploadState(client->m_nUploadState)) {
+		if (client->m_nUploadState == US_UPLOADING) {
+			theApp->m_allUploadingKnownFile->AddUploadingClient(client);
+		} else {
+			theApp->m_allUploadingKnownFile->RemoveUploadingClient(client);
+		}
+	}
 	
-	client->m_nUpDatarate = tag->SpeedUp();
+	tag->SpeedUp(&client->m_nUpDatarate);
 	if ( client->m_nDownloadState == DS_DOWNLOADING ) {
-		client->kBpsDown = tag->SpeedDown() / 1024.0;
+		tag->SpeedDown(&client->m_kBpsDown);
 	} else {
-		client->kBpsDown = 0;
+		client->m_kBpsDown = 0;
 	}
 
-	client->m_WaitTime = tag->WaitTime();
-	client->m_UpStartTimeDelay = tag->XferTime();
-	client->m_dwLastUpRequest = tag->LastReqTime();
-	client->m_WaitStartTime = tag->QueueTime();
+	//tag->WaitTime(&client->m_WaitTime);
+	//tag->XferTime(&client->m_UpStartTimeDelay);
+	//tag->LastReqTime(&client->m_dwLastUpRequest);
+	//tag->QueueTime(&client->m_WaitStartTime);
 	
 	CreditStruct *credit_struct =
 		(CreditStruct *)client->credits->GetDataStruct();
-	credit_struct->uploaded = tag->XferUp();
-	client->m_nTransferredUp = tag->XferUpSession();
+	tag->XferUp(&credit_struct->uploaded);
+	tag->XferUpSession(&client->m_nTransferredUp);
 
-	credit_struct->downloaded = tag->XferDown();
-}
+	tag->XferDown(&credit_struct->downloaded);
+	tag->XferDownSession(&client->m_nTransferredDown);
 
+	tag->Score(&client->m_score);
 
-CUpQueueRem::CUpQueueRem(CRemoteConnect *conn)
-:
-m_up_list(conn, vtUploading), m_wait_list(conn, vtQueued)
-{
-}
+	tag->NextRequestedPart(client->m_nextRequestedPart);
+	tag->LastDownloadingPart(client->m_lastDownloadingPart);
 
+	uint8 sourceFrom = 0;
+	if (tag->GetSourceFrom(sourceFrom)) {
+		client->m_nSourceFrom = (ESourceFrom)sourceFrom;
+	}
 
-/*
- * Download queue container: hold PartFiles with progress status
- * 
- */
-
-
-CDownQueueRem::CDownQueueRem(CRemoteConnect *conn)
-:
-CRemoteContainer<CPartFile, CMD4Hash, CEC_PartFile_Tag>(conn, true)
-{
-}
-
-
-bool CDownQueueRem::AddLink(const wxString &link, int)
-{
-	CECPacket req(EC_OP_ADD_LINK);
-	req.AddTag(CECTag(EC_TAG_STRING, link));
-	
-	m_conn->SendPacket(&req);
-	return true;
-}
-
+	tag->RemoteFilename(client->m_clientFilename);
+	tag->DisableViewShared(client->m_fNoViewSharedFiles);
+	tag->Version(client->m_nClientVersion);
+	tag->ModVersion(client->m_strModVersion);
+	tag->OSInfo(client->m_sClientOSInfo);
+	tag->AvailableParts(client->m_AvailPartCount);
+
+	// Download client
+	uint32 fileID;
+	bool notified = false;
+	if (tag->RequestFile(fileID)) {
+		if (client->m_reqfile) {
+			Notify_SourceCtrlRemoveSource(client->ECID(), client->m_reqfile);
+			client->m_reqfile->DelSource(client);
+			client->m_reqfile = NULL;
+			client->m_downPartStatus.clear();
+		}
+		CKnownFile * kf = theApp->knownfiles->GetByID(fileID);
+		if (kf && kf->IsCPartFile()) {
+			client->m_reqfile = (CPartFile *) kf;
+			client->m_reqfile->AddSource(client);
+			client->m_downPartStatus.setsize(kf->GetPartCount(), 0);
+			Notify_SourceCtrlAddSource(client->m_reqfile, CCLIENTREF(client, wxT("AddSource")), A4AF_SOURCE);
+			notified = true;
+		}
+	}
 
-void CDownQueueRem::StopUDPRequests()
-{
-	// have no idea what is it about
-}
+	// Part status
+	CECTag * partStatusTag = tag->GetTagByName(EC_TAG_CLIENT_PART_STATUS);
+	if (partStatusTag) {
+		if (partStatusTag->GetTagDataLen() == 0) {
+			// empty tag means full source
+			client->m_downPartStatus.SetAllTrue();
+		} else if (partStatusTag->GetTagDataLen() == client->m_downPartStatus.SizeBuffer()) {
+			client->m_downPartStatus.SetBuffer(partStatusTag->GetTagData());
+		}
+		notified = false;
+	}
 
+	if (!notified && client->m_reqfile && client->m_reqfile->ShowSources()) {
+		SourceItemType type;
+		switch (client->GetDownloadState()) {
+			case DS_DOWNLOADING:
+			case DS_ONQUEUE:
+				// We will send A4AF, which will be checked.
+				type = A4AF_SOURCE;
+				break;
+			default:
+				type = UNAVAILABLE_SOURCE;
+				break;
+		}
+			
+		Notify_SourceCtrlUpdateSource(client->ECID(), type);
+	}
 
-void CDownQueueRem::ResetCatParts(int)
-{
-	// called when category being deleted. Command will be performed on remote side
-}
+	// Upload client
+	notified = false;
+	if (tag->UploadFile(fileID)) {
+		if (client->m_uploadingfile) {
+			client->m_uploadingfile->RemoveUploadingClient(client);	// this notifies
+			notified = true;
+			client->m_uploadingfile = NULL;
+		}
+		CKnownFile * kf = theApp->knownfiles->GetByID(fileID);
+		if (kf) {
+			client->m_uploadingfile = kf;
+			client->m_upPartStatus.setsize(kf->GetPartCount(), 0);
+			client->m_uploadingfile->AddUploadingClient(client);	// this notifies
+			notified = true;
+		}
+	}
 
+	// Part status
+	partStatusTag = tag->GetTagByName(EC_TAG_CLIENT_UPLOAD_PART_STATUS);
+	if (partStatusTag) {
+		if (partStatusTag->GetTagDataLen() == client->m_upPartStatus.SizeBuffer()) {
+			client->m_upPartStatus.SetBuffer(partStatusTag->GetTagData());
+		}
+		notified = false;
+	}
 
-bool CDownQueueRem::IsPartFile(const CKnownFile *) const
-{
-	// hope i understand it right
-	return true;
+	if (!notified && client->m_uploadingfile 
+		&& (client->m_uploadingfile->ShowPeers() || (client->m_nUploadState == US_UPLOADING))) {
+			// notify if KnowFile is selected, or if it's uploading (in case clients are in show uploading mode)
+		SourceItemType type;
+		switch (client->GetUploadState()) {
+			case US_UPLOADING:
+			case US_ONUPLOADQUEUE:
+				type = AVAILABLE_SOURCE;
+				break;
+			default:
+				type = UNAVAILABLE_SOURCE;
+				break;
+		}
+		Notify_SharedCtrlRefreshClient(client->ECID(), type);
+	}
 }
 
 
-void CDownQueueRem::OnConnectionState(bool)
-{
-}
+/*
+ * Download queue container: hold PartFiles with progress status
+ * 
+ */
 
 
-CPartFile *CDownQueueRem::CreateItem(CEC_PartFile_Tag *tag)
+bool CDownQueueRem::AddLink(const wxString &link, uint8 cat)
 {
-	CPartFile *file = new CPartFile(tag);
-	m_enc_map[file->GetFileHash()] = PartFileEncoderData(file->GetPartCount(), 10);
-	ProcessItemUpdate(tag, file);
+	CECPacket req(EC_OP_ADD_LINK);
+	CECTag link_tag(EC_TAG_STRING, link);
+	link_tag.AddTag(CECTag(EC_TAG_PARTFILE_CAT, cat));
+	req.AddTag(link_tag);
 	
-	theApp->amuledlg->m_transferwnd->downloadlistctrl->AddFile(file);
-	return file;
+	m_conn->SendPacket(&req);
+	return true;
 }
 
 
-void CDownQueueRem::DeleteItem(CPartFile *in_file)
+void CDownQueueRem::ResetCatParts(int cat)
 {
-	auto_ptr<CPartFile> file(in_file);
-
-	theApp->amuledlg->m_transferwnd->downloadlistctrl->RemoveFile(file.get());
-	
-	m_enc_map.erase(file->GetFileHash());
+	// Called when category is deleted. Command will be performed on the remote side,
+	// but files still should be updated here right away, or drawing errors (colour not available)
+	// will happen.
+	for (iterator it = begin(); it != end(); it++) {
+		CPartFile* file = it->second;
+		file->RemoveCategory(cat);
+	}
 }
 
 
-CMD4Hash CDownQueueRem::GetItemID(CPartFile *file)
-{
-	return file->GetFileHash();
-}
-
 
-void CDownQueueRem::ProcessItemUpdate(CEC_PartFile_Tag *tag, CPartFile *file)
+void CKnownFilesRem::ProcessItemUpdatePartfile(CEC_PartFile_Tag *tag, CPartFile *file)
 {
 	//
 	// update status
 	//
-	if (m_inc_tags) {
-		uint32 tmpval = (uint32)(file->kBpsDown * 1024);
-		tag->SetSpeed(tmpval);
-		file->kBpsDown = tmpval / 1024.0;
-		
-		tag->SetSizeXfer(file->transferred);
-		tag->SetSizeDone(file->completedsize);
-		tag->SetSourceXferCount(file->transferingsrc);
-		tag->SetSourceNotCurrCount(file->m_notCurrentSources);
-		tag->SetSourceCount(file->m_source_count);
-		tag->SetSourceCountA4AF(file->m_a4af_source_count);
-		tag->SetFileStatus(file->status);
-	
-		tag->SetLastSeenComplete(file->lastseencomplete);
-		
-		tag->SetFileCat(file->m_category);
-		
-		tag->SetPrio(file->m_iDownPriority);
+	tag->Speed(&file->m_kbpsDown);
+	file->kBpsDown = file->m_kbpsDown / 1024.0;
+	
+	tag->SizeXfer(&file->transferred);
+	tag->SizeDone(&file->completedsize);
+	tag->SourceXferCount(&file->transferingsrc);
+	tag->SourceNotCurrCount(&file->m_notCurrentSources);
+	tag->SourceCount(&file->m_source_count);
+	tag->SourceCountA4AF(&file->m_a4af_source_count);
+	tag->FileStatus(&file->status);
+	tag->Stopped(&file->m_stopped);
+
+	tag->LastSeenComplete(&file->lastseencomplete);
+	tag->LastDateChanged(&file->m_lastDateChanged);
+	tag->DownloadActiveTime(&file->m_nDlActiveTime);
+	tag->AvailablePartCount(&file->m_availablePartsCount);
+	tag->Shared(&file->m_isShared);
+	tag->A4AFAuto(file->m_is_A4AF_auto);
+
+	tag->GetLostDueToCorruption(&file->m_iLostDueToCorruption);
+	tag->GetGainDueToCompression(&file->m_iGainDueToCompression);
+	tag->TotalPacketsSavedDueToICH(&file->m_iTotalPacketsSavedDueToICH);
+
+	tag->FileCat(&file->m_category);
+	
+	tag->DownPrio(&file->m_iDownPriorityEC);
+	if ( file->m_iDownPriorityEC >= 10 ) {
+		file->m_iDownPriority = file->m_iDownPriorityEC - 10;
+		file->m_bAutoDownPriority = true;
 	} else {
-		file->kBpsDown = tag->Speed() / 1024.0;
-	
-		if ( file->kBpsDown > 0 ) {
-			file->transferred = tag->SizeXfer();
-			file->SetCompletedSize(tag->SizeDone());
-		}
-	
-		file->transferingsrc = tag->SourceXferCount();
-		file->m_notCurrentSources = tag->SourceNotCurrCount();
-		file->m_source_count = tag->SourceCount();
-		file->m_a4af_source_count = tag->SourceCountA4AF();
-		file->status = tag->FileStatus();
-	
-		file->lastseencomplete = tag->LastSeenComplete();
-		
-		file->m_category = tag->FileCat();
-		
-		file->m_iDownPriority = tag->Prio();
-		if ( file->m_iDownPriority >= 10 ) {
-			file->m_iDownPriority-= 10;
-			file->m_bAutoDownPriority = true;
-		} else {
-			file->m_bAutoDownPriority = false;
-		}
+		file->m_iDownPriority = file->m_iDownPriorityEC;
+		file->m_bAutoDownPriority = false;
 	}
+
 	file->percentcompleted = (100.0*file->GetCompletedSize()) / file->GetFileSize();
-	if ( file->m_iDownPriority >= 10 ) {
-		file->m_iDownPriority -= 10;
-		file->m_bAutoUpPriority = true;
-	} else {
-		file->m_bAutoUpPriority = false;
-	}
 
 	//
 	// Copy part/gap status
@@ -1423,67 +1586,60 @@
 	CECTag *gaptag = tag->GetTagByName(EC_TAG_PARTFILE_GAP_STATUS);
 	CECTag *parttag = tag->GetTagByName(EC_TAG_PARTFILE_PART_STATUS);
 	CECTag *reqtag = tag->GetTagByName(EC_TAG_PARTFILE_REQ_STATUS);
-	if (gaptag && parttag && reqtag) {
-		wxASSERT(m_enc_map.count(file->GetFileHash()));
-		
-		PartFileEncoderData &encoder = m_enc_map[file->GetFileHash()];
-		encoder.Decode(
-			(unsigned char *)gaptag->GetTagData(), gaptag->GetTagDataLen(),
-			(unsigned char *)parttag->GetTagData(), parttag->GetTagDataLen());
-			
-		const Gap_Struct *reqparts = (const Gap_Struct *)reqtag->GetTagData();
-		unsigned reqcount = reqtag->GetTagDataLen() / sizeof(Gap_Struct);
-		
-		// adjust size of gaplist to reqcount
-		unsigned gap_size = encoder.m_gap_status.Size() / (2 * sizeof(uint64));
-		while ( file->m_gaplist.size() > gap_size ) {
-			file->m_gaplist.pop_front();
-		}
-		while ( file->m_gaplist.size() != gap_size ) {
-			file->m_gaplist.push_front(new Gap_Struct);
-		}
-		const uint64 *gap_info = (const uint64 *)encoder.m_gap_status.Buffer();
-		
-		
-		std::list<Gap_Struct*>::iterator it = file->m_gaplist.begin();
-		for (unsigned j = 0; j < gap_size;j++) {
-			Gap_Struct* gap = *it++;
-			gap->start = ENDIAN_NTOHLL(gap_info[2*j]);
-			gap->end = ENDIAN_NTOHLL(gap_info[2*j+1]);
-		}
-		
-		// adjust size of requested block list
-		while ( file->m_requestedblocks_list.size() > reqcount ) {
-			file->m_requestedblocks_list.pop_front();
-		}
-		while ( file->m_requestedblocks_list.size() != reqcount ) {
-			file->m_requestedblocks_list.push_front(new Requested_Block_Struct);
+	if (gaptag || parttag || reqtag) {
+		PartFileEncoderData &encoder = file->m_PartFileEncoderData;
+
+		if (gaptag) {
+			ArrayOfUInts64 gaps;
+			encoder.DecodeGaps(gaptag, gaps);
+			int gap_size = gaps.size() / 2;
+			// clear gaplist
+			file->m_gaplist.Init(file->GetFileSize(), false);
+
+			// and refill it
+			for (int j = 0; j < gap_size; j++) {
+				file->m_gaplist.AddGap(gaps[2*j], gaps[2*j+1]);
+			}
 		}
-
-		std::list<Requested_Block_Struct*>::iterator it2 = file->m_requestedblocks_list.begin();
-		for (unsigned i = 0; i < reqcount; ++i) {
-			Requested_Block_Struct* block = *it2++;
-			block->StartOffset = ENDIAN_NTOHLL(reqparts[i].start);
-			block->EndOffset = ENDIAN_NTOHLL(reqparts[i].end);
+		if (parttag) {
+			encoder.DecodeParts(parttag, file->m_SrcpartFrequency);
+			// sanity check
+			wxASSERT (file->m_SrcpartFrequency.size() == file->GetPartCount());
 		}
-		// copy parts frequency
-		const unsigned char *part_info = encoder.m_part_status.Buffer();
-		for(int i = 0; i < file->GetPartCount(); ++i) {
-			file->m_SrcpartFrequency[i] = part_info[i];
+		if (reqtag) {
+			ArrayOfUInts64 reqs;
+			encoder.DecodeReqs(reqtag, reqs);
+			int req_size = reqs.size() / 2;
+			// clear reqlist
+			DeleteContents(file->m_requestedblocks_list);
+
+			// and refill it
+			for (int j = 0; j < req_size; j++) {
+				Requested_Block_Struct* block = new Requested_Block_Struct;
+				block->StartOffset = reqs[2*j];
+				block->EndOffset   = reqs[2*j+1];
+				file->m_requestedblocks_list.push_back(block);
+			}
 		}
-	} else {
-		printf("ERROR: %p %p %p\n", (void*)gaptag, (void*)parttag, (void*)reqtag);
 	}
 	
-	// Get source names
+	// Get source names and counts
 	CECTag *srcnametag = tag->GetTagByName(EC_TAG_PARTFILE_SOURCE_NAMES);
 	if (srcnametag) {
-		file->ClearSourcenameItemList();
-		int max = srcnametag->GetTagCount();
-		for (int i = 0; i < max - 1; ) {
-			wxString name = srcnametag->GetTagByIndex(i++)->GetStringData();
-			long count = srcnametag->GetTagByIndex(i++)->GetInt();
-			file->AddSourcenameItemList(name, count);
+		SourcenameItemMap &map = file->GetSourcenameItemMap();
+		for (CECTag::const_iterator it = srcnametag->begin(); it != srcnametag->end(); it++) {
+			uint32 key = it->GetInt();
+			int count = it->GetTagByNameSafe(EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS)->GetInt();
+			if (count == 0) {
+				map.erase(key);
+			} else {
+				SourcenameItem &item = map[key];
+				item.count = count;
+				const CECTag *nametag = it->GetTagByName(EC_TAG_PARTFILE_SOURCE_NAMES);
+				if (nametag) {
+					item.name = nametag->GetStringData();
+				}
+			}
 		}
 	}
 	
@@ -1491,24 +1647,56 @@
 	CECTag *commenttag = tag->GetTagByName(EC_TAG_PARTFILE_COMMENTS);
 	if (commenttag) {
 		file->ClearFileRatingList();
-		int max = commenttag->GetTagCount();
-		for (int i = 0; i < max - 3; ) {
-			wxString u = commenttag->GetTagByIndex(i++)->GetStringData();
-			wxString f = commenttag->GetTagByIndex(i++)->GetStringData();
-			int r = commenttag->GetTagByIndex(i++)->GetInt();
-			wxString c = commenttag->GetTagByIndex(i++)->GetStringData();
+		for (CECTag::const_iterator it = commenttag->begin(); it != commenttag->end(); ) {
+			wxString u = (it++)->GetStringData();
+			wxString f = (it++)->GetStringData();
+			int r = (it++)->GetInt();
+			wxString c = (it++)->GetStringData();
 			file->AddFileRatingList(u, f, r, c);
 		}
 		file->UpdateFileRatingCommentAvail();
 	}
 		
+	// Update A4AF sources
+	ListOfUInts32 & clientIDs = file->GetA4AFClientIDs();
+	CECTag *a4aftag = tag->GetTagByName(EC_TAG_PARTFILE_A4AF_SOURCES);
+	if (a4aftag) {
+		file->ClearA4AFList();
+		clientIDs.clear();
+		for (CECTag::const_iterator it = a4aftag->begin(); it != a4aftag->end(); it++) {
+			if (it->GetTagName() != EC_TAG_ECID) {	// should always be this
+				continue;
+			}
+			uint32 id = it->GetInt();
+			CClientRef * src = theApp->clientlist->GetByID(id);
+			if (src) {
+				file->AddA4AFSource(src->GetClient());
+			} else {
+				// client wasn't transmitted yet, try it later
+				clientIDs.push_back(id);
+			}
+		}
+	} else if (!clientIDs.empty()) {
+		// Process clients from the last pass whose ids were still unknown then
+		for (ListOfUInts32::iterator it = clientIDs.begin(); it != clientIDs.end(); ) {
+			ListOfUInts32::iterator it1 = it++;
+			uint32 id = *it1;
+			CClientRef * src = theApp->clientlist->GetByID(id);
+			if (src) {
+				file->AddA4AFSource(src->GetClient());
+				clientIDs.erase(it1);
+			}
+		}
+	}
+		
 	theApp->amuledlg->m_transferwnd->downloadlistctrl->UpdateItem(file);
-}
-
 
-bool CDownQueueRem::Phase1Done(const CECPacket *)
-{
-	return true;
+	// If file is shared check if it is already listed in shared files.
+	// If not, add it and show it.
+	if (file->IsShared() && !theApp->sharedfiles->count(file->ECID())) {
+		(*theApp->sharedfiles)[file->ECID()] = file;
+		theApp->amuledlg->m_sharedfileswnd->sharedfilesctrl->ShowFile(file);
+	}
 }
 
 
@@ -1550,7 +1738,7 @@
 void CDownQueueRem::Category(CPartFile *file, uint8 cat)
 {
 	CECPacket req(EC_OP_PARTFILE_SET_CAT);
-	file->m_category = cat;
+	file->SetCategory(cat);
 	
 	CECTag hashtag(EC_TAG_PARTFILE, file->GetFileHash());
 	hashtag.AddTag(CECTag(EC_TAG_PARTFILE_CAT, cat));
@@ -1571,20 +1759,163 @@
 }
 
 
-CClientListRem::CClientListRem(CRemoteConnect *conn)
+void CDownQueueRem::ClearCompleted(const ListOfUInts32 & ecids)
+{
+	CECPacket req(EC_OP_CLEAR_COMPLETED);
+	for (ListOfUInts32::const_iterator it = ecids.begin(); it != ecids.end(); it++) {
+		req.AddTag(CECTag(EC_TAG_ECID, *it));
+	}
+	
+	m_conn->SendPacket(&req);
+}
+
+
+/*
+ * List of friends.
+ */
+CFriendListRem::CFriendListRem(CRemoteConnect *conn)
+:
+CRemoteContainer<CFriend, uint32, CEC_Friend_Tag>(conn, true)
 {
-	m_conn = conn;
 }
 
 
-void CClientListRem::FilterQueues()
+void CFriendListRem::HandlePacket(const CECPacket *)
 {
-	// FIXME: add code
-	//wxASSERT(0);
+	wxFAIL;		// not needed
 }
 
 
-CSearchListRem::CSearchListRem(CRemoteConnect *conn) : CRemoteContainer<CSearchFile, CMD4Hash, CEC_SearchFile_Tag>(conn)
+CFriend * CFriendListRem::CreateItem(CEC_Friend_Tag * tag)
+{
+	CFriend * Friend = new CFriend(tag->ID());
+	ProcessItemUpdate(tag, Friend);
+	return Friend;
+}
+
+
+void CFriendListRem::DeleteItem(CFriend * Friend)
+{
+	Friend->UnLinkClient(false);
+	Notify_ChatRemoveFriend(Friend);
+}
+
+
+uint32 CFriendListRem::GetItemID(CFriend * Friend)
+{
+	return Friend->ECID();
+}
+
+
+void CFriendListRem::ProcessItemUpdate(CEC_Friend_Tag * tag, CFriend * Friend)
+{
+	if (!tag->HasChildTags()) {
+		return;
+	}
+	tag->Name(Friend->m_strName);
+	tag->UserHash(Friend->m_UserHash);
+	tag->IP(Friend->m_dwLastUsedIP);
+	tag->Port(Friend->m_nLastUsedPort);
+	uint32 clientID;
+	bool notified = false;
+	if (tag->Client(clientID)) {
+		if (clientID) {
+			CClientRef * client = theApp->clientlist->GetByID(clientID);
+			if (client) {
+				Friend->LinkClient(*client);	// this notifies
+				notified = true;
+			}
+		} else {
+			// Unlink
+			Friend->UnLinkClient(false);
+		}
+	} 
+	if (!notified) {
+		Notify_ChatUpdateFriend(Friend);
+	}
+}
+
+
+void CFriendListRem::AddFriend(const CClientRef& toadd)
+{
+	CECPacket req(EC_OP_FRIEND);
+	
+	CECEmptyTag addtag(EC_TAG_FRIEND_ADD);
+	addtag.AddTag(CECTag(EC_TAG_CLIENT, toadd.ECID()));
+	req.AddTag(addtag);
+	
+	m_conn->SendPacket(&req);
+}
+
+
+void CFriendListRem::AddFriend(const CMD4Hash& userhash, uint32 lastUsedIP, uint32 lastUsedPort, const wxString& name)
+{
+	CECPacket req(EC_OP_FRIEND);
+	
+	CECEmptyTag addtag(EC_TAG_FRIEND_ADD);
+	addtag.AddTag(CECTag(EC_TAG_FRIEND_HASH, userhash));
+	addtag.AddTag(CECTag(EC_TAG_FRIEND_IP, lastUsedIP));
+	addtag.AddTag(CECTag(EC_TAG_FRIEND_PORT, lastUsedPort));
+	addtag.AddTag(CECTag(EC_TAG_FRIEND_NAME, name));
+	req.AddTag(addtag);
+	
+	m_conn->SendPacket(&req);
+}
+
+
+void CFriendListRem::RemoveFriend(CFriend* toremove)
+{
+	CECPacket req(EC_OP_FRIEND);
+	
+	CECEmptyTag removetag(EC_TAG_FRIEND_REMOVE);
+	removetag.AddTag(CECTag(EC_TAG_FRIEND, toremove->ECID()));
+	req.AddTag(removetag);
+	
+	m_conn->SendPacket(&req);
+}
+
+
+void CFriendListRem::SetFriendSlot(CFriend* Friend, bool new_state)
+{
+	CECPacket req(EC_OP_FRIEND);
+	
+	CECTag slottag(EC_TAG_FRIEND_FRIENDSLOT, new_state);
+	slottag.AddTag(CECTag(EC_TAG_FRIEND, Friend->ECID()));
+	req.AddTag(slottag);
+	
+	m_conn->SendPacket(&req);
+}
+
+
+void CFriendListRem::RequestSharedFileList(CFriend* Friend)
+{
+	CECPacket req(EC_OP_FRIEND);
+	
+	CECEmptyTag sharedtag(EC_TAG_FRIEND_SHARED);
+	sharedtag.AddTag(CECTag(EC_TAG_FRIEND, Friend->ECID()));
+	req.AddTag(sharedtag);
+	
+	m_conn->SendPacket(&req);
+}
+
+
+void CFriendListRem::RequestSharedFileList(CClientRef& client)
+{
+	CECPacket req(EC_OP_FRIEND);
+	
+	CECEmptyTag sharedtag(EC_TAG_FRIEND_SHARED);
+	sharedtag.AddTag(CECTag(EC_TAG_CLIENT, client.ECID()));
+	req.AddTag(sharedtag);
+	
+	m_conn->SendPacket(&req);
+}
+
+
+
+/*
+ * Search results
+ */
+CSearchListRem::CSearchListRem(CRemoteConnect *conn) : CRemoteContainer<CSearchFile, uint32, CEC_SearchFile_Tag>(conn, true)
 {
 	m_curr_search = -1;
 }
@@ -1615,7 +1946,7 @@
 }
 
 
-void CSearchListRem::StopGlobalSearch()
+void CSearchListRem::StopSearch(bool)
 {
 	if (m_curr_search != -1) {
 		CECPacket search_req(EC_OP_SEARCH_STOP);
@@ -1627,29 +1958,45 @@
 void CSearchListRem::HandlePacket(const CECPacket *packet)
 {
 	if ( packet->GetOpCode() == EC_OP_SEARCH_PROGRESS ) {
-		CoreNotify_Search_Update_Progress(packet->GetTagByIndex(0)->GetInt());
+		CoreNotify_Search_Update_Progress(packet->GetFirstTagSafe()->GetInt());
 	} else {
-		CRemoteContainer<CSearchFile, CMD4Hash, CEC_SearchFile_Tag>::HandlePacket(packet);
+		CRemoteContainer<CSearchFile, uint32, CEC_SearchFile_Tag>::HandlePacket(packet);
 	}
 }
 
 
 CSearchFile::CSearchFile(CEC_SearchFile_Tag *tag)
 :
+CECID(tag->ID()),
 m_parent(NULL),
 m_showChildren(false),
 m_sourceCount(0),
 m_completeSourceCount(0),
 m_kademlia(false),
+m_downloadStatus(NEW),
 m_clientID(0),
-m_clientPort(0)
+m_clientPort(0),
+m_kadPublishInfo(0)
 {
 	SetFileName(CPath(tag->FileName()));
-	m_abyFileHash = tag->ID();
+	m_abyFileHash = tag->FileHash();
 	SetFileSize(tag->SizeFull());
 	
 	m_searchID = theApp->searchlist->m_curr_search;
+	uint32 parentID = tag->ParentID();
+	if (parentID) {
+		CSearchFile * parent = theApp->searchlist->GetByID(parentID);
+		if (parent) {
+			parent->AddChild(this);
+		}
+	}
+}
 
+
+void CSearchFile::AddChild(CSearchFile* file)
+{
+	m_children.push_back(file);
+	file->m_parent = this;
 }
 
 
@@ -1676,16 +2023,28 @@
 }
 
 
-CMD4Hash CSearchListRem::GetItemID(CSearchFile *file)
+uint32 CSearchListRem::GetItemID(CSearchFile *file)
 {
-	return file->GetFileHash();
+	return file->ECID();
 }
 
 
 void CSearchListRem::ProcessItemUpdate(CEC_SearchFile_Tag *tag, CSearchFile *file)
 {
-	file->m_sourceCount = tag->SourceCount();
-	file->m_completeSourceCount = tag->CompleteSourceCount();
+	uint32 sourceCount = file->m_sourceCount;
+	uint32 completeSourceCount = file->m_completeSourceCount;
+	CSearchFile::DownloadStatus status = file->m_downloadStatus;
+	tag->SourceCount(&file->m_sourceCount);
+	tag->CompleteSourceCount(&file->m_completeSourceCount);
+	tag->DownloadStatus((uint32 *) &file->m_downloadStatus);
+
+	if (file->m_sourceCount != sourceCount
+			|| file->m_completeSourceCount != completeSourceCount
+			|| file->m_downloadStatus != status) {
+		if (theApp->amuledlg && theApp->amuledlg->m_searchwnd) {
+			theApp->amuledlg->m_searchwnd->UpdateResult(file);
+		}
+	}
 }
 
 
@@ -1727,59 +2086,17 @@
 void CStatsUpdaterRem::HandlePacket(const CECPacket *packet)
 {
 	theStats::UpdateStats(packet);
-  theApp->ShowUserCount(); // maybe there should be a check if a usercount changed ?
-}
-
-
-bool CUpDownClient::IsBanned() const
-{
-	// FIXME: add code
-	return false;
-}
-
-
-//
-// Those functions have different implementation in remote gui
-//
-void  CUpDownClient::Ban()
-{
-	// FIXME: add code
-	wxASSERT(0);
-}
-
-
-void  CUpDownClient::UnBan()
-{
-	// FIXME: add code
-	wxASSERT(0);
+	theApp->amuledlg->ShowTransferRate();			
+	theApp->ShowUserCount(); // maybe there should be a check if a usercount changed ?
+	// handle the connstate tag which is included in the stats packet
+	theApp->serverconnect->HandlePacket(packet);
 }
 
 
 void CUpDownClient::RequestSharedFileList()
 {
-	// FIXME: add code
-	wxASSERT(0);
-}
-
-
-void CKnownFile::SetFileComment(const wxString &)
-{
-	// FIXME: add code
-	wxASSERT(0);
-}
-
-
-void CKnownFile::SetFileRating(unsigned char)
-{
-	// FIXME: add code
-	wxASSERT(0);
-}
-
-
-// I don't think it will be implemented - too match data transfer. But who knows ?
-wxString CUpDownClient::ShowDownloadingParts() const
-{
-	return wxEmptyString;
+	CClientRef ref = CCLIENTREF(this, wxEmptyString);
+	theApp->friendlist->RequestSharedFileList(ref);
 }
 
 
@@ -1787,11 +2104,20 @@
 	bool WXUNUSED(bIgnoreNoNeeded),
 	bool WXUNUSED(ignoreSuspensions),
 	bool WXUNUSED(bRemoveCompletely),
-	CPartFile* WXUNUSED(toFile))
+	CPartFile* toFile)
 {
-	// FIXME: add code
-	wxASSERT(0);
-	return false;
+	CECPacket req(EC_OP_CLIENT_SWAP_TO_ANOTHER_FILE);
+	req.AddTag(CECTag(EC_TAG_CLIENT, ECID()));
+	req.AddTag(CECTag(EC_TAG_PARTFILE, toFile->GetFileHash()));
+	theApp->m_connect->SendPacket(&req);
+	
+	return true;
+}
+
+
+wxString CAICHHash::GetString() const
+{
+	return EncodeBase32(m_abyBuffer, HASHSIZE);
 }
 
 
@@ -1801,43 +2127,38 @@
 //
 CPacket* CKnownFile::CreateSrcInfoPacket(const CUpDownClient *, uint8 /*byRequestedVersion*/, uint16 /*nRequestedOptions*/)
 {
-	wxASSERT(0);
+	wxFAIL;
 	return 0;
 }
 
 
 bool CKnownFile::LoadFromFile(const class CFileDataIO*)
 {
-	wxASSERT(0);
+	wxFAIL;
 	return false;
 }
 
 
 void CKnownFile::UpdatePartsInfo()
 {
-	wxASSERT(0);
-}
-
-
-void CKnownFile::SetFileSize(uint64 nFileSize)
-{
-	CAbstractFile::SetFileSize(nFileSize);
+	wxFAIL;
 }
 
 
 CPacket* CPartFile::CreateSrcInfoPacket(CUpDownClient const *, uint8 /*byRequestedVersion*/, uint16 /*nRequestedOptions*/)
 {
-	wxASSERT(0);
+	wxFAIL;
 	return 0;
 }
 
 
 void CPartFile::UpdatePartsInfo()
 {
-	wxASSERT(0);
+	wxFAIL;
 }
 
 
+
 void CPartFile::UpdateFileRatingCommentAvail()
 {
 	bool prevComment = m_hasComment;
@@ -1874,12 +2195,26 @@
 	}
 }
 
-bool CPartFile::SavePartFile(bool)
+
+void CStatTreeRem::DoRequery()
+{
+	CECPacket request(EC_OP_GET_STATSTREE);
+	if (thePrefs::GetMaxClientVersions() != 0) {
+		request.AddTag(CECTag(EC_TAG_STATTREE_CAPPING, (uint8)thePrefs::GetMaxClientVersions()));
+	}
+	m_conn->SendRequest(this, &request);
+}
+
+void CStatTreeRem::HandlePacket(const CECPacket * p)
 {
-	wxASSERT(0);
-	return false;
+	const CECTag* treeRoot = p->GetTagByName(EC_TAG_STATTREE_NODE);
+	if (treeRoot) {
+		theApp->amuledlg->m_statisticswnd->RebuildStatTreeRemote(treeRoot);
+		theApp->amuledlg->m_statisticswnd->ShowStatistics();
+	}
 }
 
+CamuleRemoteGuiApp *theApp;
 
 //
 // since gui is not linked with amule.cpp - define events here

aMule-2.2.6.tar.bz2/src/amule-remote-gui.h -> aMule-2.3.1.tar.bz2/src/amule-remote-gui.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (C) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-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
@@ -41,7 +41,7 @@
 class CKnownFile;
 class CSearchFile;
 class CPartFile;
-class CUpDownClient;
+class CClientRef;
 class CStatistics;
 class CPath;
 
@@ -59,12 +59,12 @@
 	wxString login, passwd;
 	bool m_save_user_pass;
 	
-	void OnOK(wxCommandEvent& event);
-	
 	DECLARE_EVENT_TABLE()
 public:
 	CEConnectDlg();
 	
+	void OnOK(wxCommandEvent& event);
+	
 	wxString Host() { return host; }
 	int Port() { return port; }
 
@@ -96,9 +96,9 @@
 public:
 	CPreferencesRem(CRemoteConnect *);
 
-	Category_Struct *CreateCategory(const wxString& name, const CPath& path,
+	bool CreateCategory(Category_Struct *& category, const wxString& name, const CPath& path,
 						const wxString& comment, uint32 color, uint8 prio);
-	void UpdateCategory(uint8 cat, const wxString& name, const CPath& path,
+	bool UpdateCategory(uint8 cat, const wxString& name, const CPath& path,
 						const wxString& comment, uint32 color, uint8 prio);
 
 	void RemoveCat(uint8 cat);
@@ -126,9 +126,6 @@
 	std::list<T *> m_items;
 	std::map<I, T *> m_items_hash;
 	
-	// for GetByIndex
-	std::vector<T *> m_idx_items;
-	
 	// .size() is O(N) operation in stl
 	int m_item_count;
 	
@@ -141,18 +138,23 @@
 	virtual void HandlePacket(const CECPacket *packet)
 	{
 		switch(this->m_state) {
-			case IDLE: wxASSERT(0); // not expecting anything
+			case IDLE: wxFAIL; // not expecting anything
 			case STATUS_REQ_SENT:
 				// if derived class choose not to proceed, return - but with good status
 				this->m_state = IDLE;
 				if ( this->Phase1Done(packet) ) {
-					CECPacket req_full(this->m_full_req_cmd);
+					if (this->m_inc_tags) {
+						// Incremental tags: new items always carry full info.
+						ProcessUpdate(packet, NULL, m_full_req_tag);
+					} else {
+						// Non-incremental tags: we might get partial info on new items.
+						// Collect all this items in a tag, and then request full info about them.
+						CECPacket req_full(this->m_full_req_cmd);
 				
-					ProcessUpdate(packet, &req_full, m_full_req_tag);
+						ProcessUpdate(packet, &req_full, m_full_req_tag);
 					
-					if ( !this->m_inc_tags ) {
 						// Phase 3: request full info about files we don't have yet
-						if ( req_full.GetTagCount() ) {
+						if ( req_full.HasChildTags() ) {
 							m_conn->SendRequest(this, &req_full);
 							this->m_state = FULL_REQ_SENT;
 						}
@@ -166,27 +168,23 @@
 		}
 	}
 public:
-	CRemoteContainer(CRemoteConnect *conn, bool /*inc_tags*/ = false)
+	CRemoteContainer(CRemoteConnect *conn, bool inc_tags)
 	{
 		m_state = IDLE;
 		
 		m_conn = conn;
 		m_item_count = 0;
-		
-		// FIXME:
-		// The CRemoteContainer has two ways of transfer: with "inc_tags" or without.
-		// I found that with inc_tags the update of transferred/completed is broken,
-		// therefore I disabled them.
-		// Either the inc-tag-mode should be fixed (but I can't to that without some 
-		// more insight how it's supposed to be working), or removed alltogether.
-		//m_inc_tags = inc_tags;
-		m_inc_tags = false;
+		m_inc_tags = inc_tags;
 	}
 	
 	virtual ~CRemoteContainer()
 	{
 	}
 	
+	typedef typename std::list<T *>::iterator iterator;
+	iterator begin() { return m_items.begin(); }
+	iterator end() { return m_items.end(); }
+
 	uint32 GetCount()
 	{
 		return m_item_count;
@@ -196,8 +194,6 @@
 	{
 		m_items.push_back(item);
 		m_items_hash[GetItemID(item)] = item;
-		m_idx_items.resize(m_item_count+1);
-		m_idx_items[m_item_count] = item;
 		m_item_count++;
 	}
 
@@ -206,16 +202,11 @@
 		// avoid creating nodes
 		return m_items_hash.count(id) ? m_items_hash[id] : NULL;
 	}
-	
-	T *GetByIndex(int index)
-	{
-		return ( (index >= 0) && (index < m_item_count) ) ? m_idx_items[index] : NULL;
-	}
-	
+
 	void Flush()
 	{
-		m_items.erase(this->m_items.begin(), this->m_items.end());
-		m_items_hash.erase(this->m_items_hash.begin(), this->m_items_hash.end());
+		m_items.clear();
+		m_items_hash.clear();
 		m_item_count = 0;
 	}
 			
@@ -223,10 +214,13 @@
 	// Flush & reload
 	//
 	/*
+	We usually don't keep outdated code as comments, but this blocking implementation
+	shows the overall procedure well. It had to be scattered for the event driven implementation.
+
 	bool FullReload(int cmd)
 	{
 		CECPacket req(cmd);
-		std::auto_ptr<const CECPacket> reply(this->m_conn->SendRecvPacket(&req));
+		CScopedPtr<const CECPacket> reply(this->m_conn->SendRecvPacket(&req));
 		if ( !reply.get() ) {
 			return false;
 		}
@@ -275,13 +269,16 @@
 		this->m_full_req_tag = tag;
 	}
 	/*
+	We usually don't keep outdated code as comments, but this blocking implementation
+	shows the overall procedure well. It had to be scattered for the event driven implementation.
+
 	bool DoRequery(int cmd, int tag)
 	{
 		CECPacket req_sts(cmd, m_inc_tags ? EC_DETAIL_INC_UPDATE : EC_DETAIL_UPDATE);
 	
 		//
 		// Phase 1: request status
-		std::auto_ptr<const CECPacket> reply(this->m_conn->SendRecvPacket(&req_sts));
+		CScopedPtr<const CECPacket> reply(this->m_conn->SendRecvPacket(&req_sts));
 		if ( !reply.get() ) {
 			return false;
 		}
@@ -314,62 +311,58 @@
 
 	void ProcessFull(const CECPacket *reply)
 	{
-		for (size_t i = 0;i < reply->GetTagCount();i++) {
-			G *tag = (G *)reply->GetTagByIndex(i);
+		for (CECPacket::const_iterator it = reply->begin(); it != reply->end(); it++) {
+			G *tag = (G *) & *it;
 			// initialize item data from EC tag
-			T *item = this->CreateItem(tag);
-			AddItem(item);
+			AddItem(CreateItem(tag));
 		}
 	}
 
-	void ProcessUpdate(const CECPacket *reply, CECPacket *full_req, int req_type)
+	void RemoveItem(iterator & it)
+	{
+		I item_id = GetItemID(*it);
+		// reduce count
+		m_item_count--;
+		// remove from map
+		m_items_hash.erase(item_id);
+		// item may contain data that need to be freed externally, before
+		// dtor is called and memory freed
+		DeleteItem(*it);
+
+		m_items.erase(it);
+	}
+
+	virtual void ProcessUpdate(const CECTag *reply, CECPacket *full_req, int req_type)
 	{
 		std::set<I> core_files;
-		for (size_t i = 0;i < reply->GetTagCount();i++) {
-			G *tag = (G *)reply->GetTagByIndex(i);
+		for (CECPacket::const_iterator it = reply->begin(); it != reply->end(); it++) {
+			G *tag = (G *) & *it;
 			if ( tag->GetTagName() != req_type ) {
 				continue;
 			}
 	
 			core_files.insert(tag->ID());
 			if ( m_items_hash.count(tag->ID()) ) {
+				// Item already known: update it
 				T *item = m_items_hash[tag->ID()];
 				ProcessItemUpdate(tag, item);
 			} else {
-				if ( m_inc_tags ) {
-					T *item = this->CreateItem(tag);
-					AddItem(item);
-				} else {
+				// New item
+				if (full_req) {
+					// Non-incremental mode: we have only partial info
+					// so we need to request full info before we can use the item
 					full_req->AddTag(CECTag(req_type, tag->ID()));
+				} else {
+					// Incremental mode: new items always carry full info,
+					// so we can add it right away
+					AddItem(CreateItem(tag));
 				}
 			}
 		}
-		std::list<I> del_ids;
-		for(typename std::list<T *>::iterator j = this->m_items.begin(); j != this->m_items.end(); j++) {
-			I item_id = GetItemID(*j);
-			if ( core_files.count(item_id) == 0 ) {
-				del_ids.push_back(item_id);
-			}
-		}
-		for(typename std::list<I>::iterator j = del_ids.begin(); j != del_ids.end(); j++) {
-			for(int idx = 0;idx < m_item_count;idx++) {
-				if ( this->GetItemID(m_idx_items[idx]) == *j ) {
-					m_idx_items[idx] = m_idx_items[m_item_count-1];
-					break;
-				}
-			}
-			m_item_count--;
-			m_items_hash.erase(*j);
-			for(typename std::list<T *>::iterator k = this->m_items.begin(); k != this->m_items.end(); k++) {
-				if ( *j == GetItemID(*k) ) {
-					// item may contain data that need to be freed externally, before
-					// dtor is called and memory freed
-					this->DeleteItem(*k);
-
-					this->m_items.erase(k);
-
-					break;
-				}
+		for(iterator it = begin(); it != end();) {
+			iterator it2 = it++;
+			if ( core_files.count(GetItemID(*it2)) == 0 ) {
+				RemoveItem(it2);
 			}
 		}
 	}
@@ -395,17 +388,16 @@
 	}
 };
 
-class CServerConnectRem : public CECPacketHandlerBase {
+class CServerConnectRem {
 	CRemoteConnect *m_Conn;
 	uint32 m_ID;
 	
 	CServer *m_CurrServer;
-	
-	virtual void HandlePacket(const CECPacket *packet);
-	
+
 public:
+	void HandlePacket(const CECPacket *packet);
+	
 	CServerConnectRem(CRemoteConnect *);
-	bool ReQuery();
 	
 	bool IsConnected() { return (m_ID != 0) && (m_ID != 0xffffffff); }
 	bool IsConnecting() { return m_ID == 0xffffffff; }
@@ -439,15 +431,15 @@
 	CServer* GetServerByAddress(const wxString& address, uint16 port) const;
 	CServer* GetServerByIPTCP(uint32 nIP, uint16 nPort) const;
 
-	void ReloadControl();
-
 	//
 	// Actions
 	//
 	void RemoveServer(CServer* server);
 	void UpdateServerMetFromURL(wxString url);
-	void SaveServerMet();
-	void FilterServers();
+	void SetStaticServer(CServer* server, bool isStatic);
+	void SetServerPrio(CServer* server, uint32 prio);
+	void SaveServerMet() {}	// not needed here
+	void FilterServers() {}	// not needed here
 	
 	//
 	// template
@@ -458,46 +450,26 @@
 	void ProcessItemUpdate(CEC_Server_Tag *, CServer *);
 };
 
-class CUpDownClientListRem : public CRemoteContainer<CUpDownClient, uint32, CEC_UpDownClient_Tag> {
-	int m_viewtype;
+class CUpDownClientListRem : public CRemoteContainer<CClientRef, uint32, CEC_UpDownClient_Tag> {
 public:
-	CUpDownClientListRem(CRemoteConnect *, int viewtype);
-
-	const CClientPtrList& GetList() const { return m_items; };
+	CUpDownClientListRem(CRemoteConnect *);
 
+	void FilterQueues() {}	// not needed here
 	//
 	// template
 	//
-	CUpDownClient *CreateItem(CEC_UpDownClient_Tag *);
-	void DeleteItem(CUpDownClient *);
-	uint32 GetItemID(CUpDownClient *);
-	void ProcessItemUpdate(CEC_UpDownClient_Tag *, CUpDownClient *);
+	CClientRef *CreateItem(CEC_UpDownClient_Tag *);
+	void DeleteItem(CClientRef *);
+	uint32 GetItemID(CClientRef *);
+	void ProcessItemUpdate(CEC_UpDownClient_Tag *, CClientRef *);
 };
 
-class CUpQueueRem {
-	CUpDownClientListRem m_up_list, m_wait_list;
-public:
-	CUpQueueRem(CRemoteConnect *);
-	
-	void ReQueryUp() { m_up_list.DoRequery(EC_OP_GET_ULOAD_QUEUE, EC_TAG_CLIENT); }
-	void ReQueryWait() { m_wait_list.DoRequery(EC_OP_GET_WAIT_QUEUE, EC_TAG_CLIENT); }
-
-	const CClientPtrList& GetWaitingList() const { return m_wait_list.GetList(); }
-	const CClientPtrList& GetUploadingList() const { return m_up_list.GetList(); }
-	uint16 GetWaitingPosition(const CUpDownClient *client) const;
-};
-
-class CDownQueueRem : public CRemoteContainer<CPartFile, CMD4Hash, CEC_PartFile_Tag> {
-	std::map<CMD4Hash, PartFileEncoderData> m_enc_map;
+class CDownQueueRem : public std::map<uint32, CPartFile*> {
+	CRemoteConnect *m_conn;
 public:
-	CDownQueueRem(CRemoteConnect *);
-	
-	uint32 GetFileCount() { return GetCount(); }
-	CPartFile* GetFileByID(const CMD4Hash& id) { return GetByID(id); }
-	CPartFile* GetFileByIndex(unsigned int idx) { return GetByIndex(idx); }
+	CDownQueueRem(CRemoteConnect * conn) { m_conn = conn; }
 	
-	bool IsPartFile(const CKnownFile* totest) const;
-	void OnConnectionState(bool bConnected);
+	CPartFile* GetFileByID(uint32 id);
 	
 	//
 	// User actions
@@ -510,101 +482,58 @@
 	//
 	// Actions
 	//
-	void StopUDPRequests();
+	void StopUDPRequests() {}
 	void AddFileLinkToDownload(CED2KFileLink*, uint8);
-	bool AddLink(const wxString &link, int category = 0);
+	bool AddLink(const wxString &link, uint8 category = 0);
 	void UnsetCompletedFilesExist();
 	void ResetCatParts(int cat);
 	void AddSearchToDownload(CSearchFile* toadd, uint8 category);
-	
-	//
-	// template
-	//
-	CPartFile *CreateItem(CEC_PartFile_Tag *);
-	void DeleteItem(CPartFile *);
-	CMD4Hash GetItemID(CPartFile *);
-	void ProcessItemUpdate(CEC_PartFile_Tag *, CPartFile *);
-	bool Phase1Done(const CECPacket *);
+	void ClearCompleted(const ListOfUInts32 & ecids);
 };
 
-class CSharedFilesRem : public CRemoteContainer<CKnownFile, CMD4Hash, CEC_SharedFile_Tag> {
-	std::map<CMD4Hash, RLE_Data> m_enc_map;
-	
-	virtual void HandlePacket(const CECPacket *);
-	
-	//
-	// For file renaming operation
-	//
-	CKnownFile* m_rename_file;
-	wxString m_new_name;
+class CSharedFilesRem  : public std::map<uint32, CKnownFile*> {
+	CRemoteConnect *m_conn;
 public:
-	CSharedFilesRem(CRemoteConnect *);
+	CSharedFilesRem(CRemoteConnect * conn);
 	
-	CKnownFile *GetFileByID(CMD4Hash id) { return GetByID(id); }
+	CKnownFile *GetFileByID(uint32 id);
 
 	void SetFilePrio(CKnownFile *file, uint8 prio);
 
 	//
 	// Actions
 	//
-	void AddFilesFromDirectory(const CPath&);
 	void Reload(bool sendtoserver = true, bool firstload = false);
 	bool RenameFile(CKnownFile* file, const CPath& newName);
-
-	//
-	// template
-	//
-	CKnownFile *CreateItem(CEC_SharedFile_Tag *);
-	void DeleteItem(CKnownFile *);
-	CMD4Hash GetItemID(CKnownFile *);
-	void ProcessItemUpdate(CEC_SharedFile_Tag *, CKnownFile *);
-	bool Phase1Done(const CECPacket *);
+	void SetFileCommentRating(CKnownFile* file, const wxString& newComment, int8 newRating);
+	void CopyFileList(std::vector<CKnownFile*>& out_list) const;
 };
 
-class CKnownFilesRem {
-	CSharedFilesRem *m_shared_files;
+class CKnownFilesRem : public CRemoteContainer<CKnownFile, uint32, CEC_SharedFile_Tag> {
+	CKnownFile * CreateKnownFile(CEC_SharedFile_Tag *tag, CKnownFile *file = NULL);
+	CPartFile  * CreatePartFile(CEC_PartFile_Tag *tag);
+
+	bool m_initialUpdate;	// improved handling for first data transfer
 public:
-	CKnownFilesRem(CSharedFilesRem *shared)
-	{
-		m_shared_files = shared;
-		
-		requested = 0;
-		transferred = 0;
-		accepted = 0;
-	}
+	CKnownFilesRem(CRemoteConnect * conn);
 	
-	CKnownFile *FindKnownFileByID(const CMD4Hash& id)
-	{
-		return m_shared_files->GetByID(id); 
-	}
+	CKnownFile *FindKnownFileByID(uint32 id) { return GetByID(id); }
 
 	uint16 requested;
 	uint32 transferred;
 	uint16 accepted;
-};
-
-class CClientCreditsRem {
-	bool m_crypt_avail;
-public:
-	bool CryptoAvailable() { return m_crypt_avail; }
-};
 
-class CClientListRem {
-	CRemoteConnect *m_conn;
-
-	//
-	// map of user_ID -> client
-	std::multimap<uint32, CUpDownClient*> m_client_list;
-public:
-	CClientListRem(CRemoteConnect *);
-	
-	const std::multimap<uint32, CUpDownClient*>& GetClientList() { return m_client_list; }
-	
 	//
-	// Actions
+	// template
 	//
-	void AddClient(CUpDownClient *);
-	void FilterQueues();
+	CKnownFile *CreateItem(CEC_SharedFile_Tag *) { wxFAIL; return NULL; }	// unused, required by template
+	void DeleteItem(CKnownFile *);
+	uint32 GetItemID(CKnownFile *);
+	void ProcessItemUpdate(CEC_SharedFile_Tag *, CKnownFile *);
+	bool Phase1Done(const CECPacket *) { return true; }
+	void ProcessUpdate(const CECTag *reply, CECPacket *full_req, int req_type);
+
+	void ProcessItemUpdatePartfile(CEC_PartFile_Tag *, CPartFile *);
 };
 
 class CIPFilterRem {
@@ -617,9 +546,10 @@
 	//
 	void Reload();
 	void Update(wxString strURL = wxEmptyString);
+	bool IsReady() const { return true; }
 };
 
-class CSearchListRem : public CRemoteContainer<CSearchFile, CMD4Hash, CEC_SearchFile_Tag> {
+class CSearchListRem : public CRemoteContainer<CSearchFile, uint32, CEC_SearchFile_Tag> {
 	virtual void HandlePacket(const CECPacket *);
 public:
 	CSearchListRem(CRemoteConnect *);
@@ -638,32 +568,61 @@
 	wxString StartNewSearch(uint32* nSearchID, SearchType search_type,
 		const CSearchList::CSearchParams& params);
 		
-	void StopGlobalSearch();
+	void StopSearch(bool globalOnly = false);
 	
 	//
 	// template
 	//
 	CSearchFile *CreateItem(CEC_SearchFile_Tag *);
 	void DeleteItem(CSearchFile *);
-	CMD4Hash GetItemID(CSearchFile *);
+	uint32 GetItemID(CSearchFile *);
 	void ProcessItemUpdate(CEC_SearchFile_Tag *, CSearchFile *);
 	bool Phase1Done(const CECPacket *);
 };
 
+class CFriendListRem : public CRemoteContainer<CFriend, uint32, CEC_Friend_Tag> {
+	virtual void HandlePacket(const CECPacket *);
+public:
+	CFriendListRem(CRemoteConnect *);
+
+	void		AddFriend(const CClientRef& toadd);
+	void		AddFriend(const CMD4Hash& userhash, uint32 lastUsedIP, uint32 lastUsedPort, const wxString& name);
+	void		RemoveFriend(CFriend* toremove);
+	void		RequestSharedFileList(CFriend* Friend);
+	void		RequestSharedFileList(CClientRef& client);
+	void		SetFriendSlot(CFriend* Friend, bool new_state);
+
+	//
+	// template
+	//
+	CFriend *CreateItem(CEC_Friend_Tag *);
+	void DeleteItem(CFriend *);
+	uint32 GetItemID(CFriend *);
+	void ProcessItemUpdate(CEC_Friend_Tag *, CFriend *);
+};
+
 class CStatsUpdaterRem : public CECPacketHandlerBase {
 	virtual void HandlePacket(const CECPacket *);
 public:
 	CStatsUpdaterRem() {}
 };
 
+class CStatTreeRem : public CECPacketHandlerBase {
+	virtual void HandlePacket(const CECPacket *);
+	CRemoteConnect *m_conn;
+public:
+	CStatTreeRem(CRemoteConnect * conn) { m_conn = conn; }
+	void DoRequery();
+};
+
 class CListenSocketRem {
 	uint32 m_peak_connections;
 public:
 	uint32 GetPeakConnections() { return m_peak_connections; }
 };
 
-class CamuleRemoteGuiApp : public wxApp, public CamuleGuiBase {
-	wxTimer* poll_timer;
+class CamuleRemoteGuiApp : public wxApp, public CamuleGuiBase, public CamuleAppCommon {
+	wxTimer*	poll_timer;
 
 	virtual int InitGui(bool geometry_enable, wxString &geometry_string);
 
@@ -675,9 +634,9 @@
 	
 	void OnECConnection(wxEvent& event);
 	void OnECInitDone(wxEvent& event);
-	void OnLoggingEvent(CLoggingEvent& evt);
 	void OnNotifyEvent(CMuleGUIEvent& evt);
-	
+	void OnFinishedHTTPDownload(CMuleInternalEvent& event);
+
 	CStatsUpdaterRem m_stats_updater;
 public:
 
@@ -691,40 +650,37 @@
 
 	bool CopyTextToClipboard(wxString strText);
 
-	virtual void ShowAlert(wxString msg, wxString title, int flags);
+	virtual int ShowAlert(wxString msg, wxString title, int flags);
 
 	void ShutDown(wxCloseEvent &evt);
 
 	CPreferencesRem *glob_prefs;
-	wxString ConfigDir;
 
 	//
 	// Provide access to core data thru EC
 	CServerConnectRem *serverconnect;
 	CServerListRem *serverlist;
-	CUpQueueRem *uploadqueue;
 	CDownQueueRem *downloadqueue;
 	CSharedFilesRem *sharedfiles;
 	CKnownFilesRem *knownfiles;
-	CClientCreditsRem *clientcredits;
-	CClientListRem *clientlist;
+	CUpDownClientListRem *clientlist;
 	CIPFilterRem *ipfilter;
 	CSearchListRem *searchlist;
+	CFriendListRem *friendlist;
 	CListenSocketRem *listensocket;
+	CStatTreeRem * stattree;
 
 	CStatistics *m_statistics;
 
 	bool AddServer(CServer *srv, bool fromUser = false);
 
 	uint32 GetPublicIP();
-	wxString CreateMagnetLink(const CAbstractFile *f);
-	wxString CreateED2kLink(const CAbstractFile* f, bool add_source = false, bool use_hostname = false, bool addcryptoptions = false);
-	wxString CreateED2kAICHLink(const CKnownFile* f);
 
 	wxString GetLog(bool reset = false);
 	wxString GetServerLog(bool reset = false);
 
 	void AddServerMessageLine(wxString &msg);
+	void AddRemoteLogLine(const wxString& line);
 
 	void SetOSFiles(wxString ) { /* onlinesig is created on remote side */ }
 
@@ -741,7 +697,24 @@
 	bool IsKadRunning() const { return ((m_ConnState & CONNECTED_KAD_OK) 
 				|| (m_ConnState & CONNECTED_KAD_FIREWALLED)
 				|| (m_ConnState & CONNECTED_KAD_NOT)); }
-				
+
+	// Check Kad state (UDP)
+	bool IsFirewalledKadUDP() const		{ return theStats::IsFirewalledKadUDP(); }
+	bool IsKadRunningInLanMode() const	{ return theStats::IsKadRunningInLanMode(); }
+	// Kad stats
+	uint32 GetKadUsers() const			{ return theStats::GetKadUsers(); }
+	uint32 GetKadFiles() const			{ return theStats::GetKadFiles(); }
+	uint32 GetKadIndexedSources() const	{ return theStats::GetKadIndexedSources(); }
+	uint32 GetKadIndexedKeywords() const{ return theStats::GetKadIndexedKeywords(); }
+	uint32 GetKadIndexedNotes() const	{ return theStats::GetKadIndexedNotes(); }
+	uint32 GetKadIndexedLoad() const	{ return theStats::GetKadIndexedLoad(); }
+	// True IP of machine
+	uint32 GetKadIPAdress() const		{ return theStats::GetKadIPAdress(); }
+	// Buddy status
+	uint8	GetBuddyStatus() const		{ return theStats::GetBuddyStatus(); }
+	uint32	GetBuddyIP() const			{ return theStats::GetBuddyIP(); }
+	uint32	GetBuddyPort() const		{ return theStats::GetBuddyPort(); }
+
 	void StartKad();
 	void StopKad();
 	
@@ -762,17 +735,15 @@
 	uint32 m_clientID;
 
 	wxLocale	m_locale;
+	// This KnownFile collects all currently uploading clients for display in the upload list control
+	CKnownFile * m_allUploadingKnownFile;
 
 	DECLARE_EVENT_TABLE()
 };
 
 DECLARE_APP(CamuleRemoteGuiApp)
-#ifdef AMULE_REMOTE_GUI_CPP
-	CamuleRemoteGuiApp *theApp;
-#else
-	extern CamuleRemoteGuiApp *theApp;
-#endif
 
+extern CamuleRemoteGuiApp *theApp;
 
 #endif /* AMULE_REMOTE_GUI_H */

aMule-2.2.6.tar.bz2/src/amule.cpp -> aMule-2.3.1.tar.bz2/src/amule.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -24,9 +24,6 @@
 //
 
 
-#define AMULE_CPP
-
-
 #include "amule.h"			// Interface declarations.
 
 #include <csignal>
@@ -45,7 +42,6 @@
 #include <wx/cmdline.h>			// Needed for wxCmdLineParser
 #include <wx/config.h>			// Do_not_auto_remove (win32)
 #include <wx/fileconf.h>
-#include <wx/snglinst.h>
 #include <wx/tokenzr.h>
 #include <wx/wfstream.h>
 
@@ -53,6 +49,8 @@
 #include <common/Format.h>		// Needed for CFormat
 #include "kademlia/kademlia/Kademlia.h"
 #include "kademlia/kademlia/Prefs.h"
+#include "kademlia/kademlia/UDPFirewallTester.h"
+#include "CanceledFileList.h"
 #include "ClientCreditsList.h"		// Needed for CClientCreditsList
 #include "ClientList.h"			// Needed for CClientList
 #include "ClientUDPSocket.h"		// Needed for CClientUDPSocket & CMuleUDPSocket
@@ -68,6 +66,7 @@
 #include "MagnetURI.h"			// Needed for CMagnetURI
 #include "OtherFunctions.h"
 #include "PartFile.h"			// Needed for CPartFile
+#include "PlatformSpecific.h"   // Needed for PlatformSpecific::AllowSleepMode();
 #include "Preferences.h"		// Needed for CPreferences
 #include "SearchList.h"			// Needed for CSearchList
 #include "Server.h"			// Needed for GetListName
@@ -77,10 +76,10 @@
 #include "Statistics.h"			// Needed for CStatistics
 #include "TerminationProcessAmuleweb.h"	// Needed for CTerminationProcessAmuleweb
 #include "ThreadTasks.h"
-#include "updownclient.h"		// Needed for CUpDownClient
 #include "UploadQueue.h"		// Needed for CUploadQueue
 #include "UploadBandwidthThrottler.h"
 #include "UserEvents.h"
+#include "ScopedPtr.h"
 
 #ifdef ENABLE_UPNP
 #include "UPnPBase.h"			// Needed for UPnP
@@ -93,7 +92,11 @@
 #ifndef AMULE_DAEMON
 	#ifdef __WXMAC__
 		#include <CoreFoundation/CFBundle.h>  // Do_not_auto_remove
-		#include <wx/mac/corefoundation/cfstring.h>  // Do_not_auto_remove
+		#if wxCHECK_VERSION(2, 9, 0)
+			#include <wx/osx/core/cfstring.h>  // Do_not_auto_remove
+		#else
+			#include <wx/mac/corefoundation/cfstring.h>  // Do_not_auto_remove
+		#endif
 	#endif
 	#include <wx/msgdlg.h>
 
@@ -116,6 +119,12 @@
 # define RLIMIT_RESOURCE int
 #endif
 
+#ifdef AMULE_DAEMON
+CamuleDaemonApp *theApp;
+#else
+CamuleGuiApp *theApp;
+#endif
+
 static void UnlimitResource(RLIMIT_RESOURCE resType)
 {
 #if defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT)
@@ -131,7 +140,9 @@
 {
 #ifdef HAVE_SYS_RESOURCE_H
 	UnlimitResource(RLIMIT_DATA);
+#ifndef __UCLIBC__
 	UnlimitResource(RLIMIT_FSIZE);
+#endif
 	UnlimitResource(RLIMIT_NOFILE);
 #ifdef RLIMIT_RSS
 	UnlimitResource(RLIMIT_RSS);
@@ -170,6 +181,7 @@
 	clientlist	= NULL;
 	searchlist	= NULL;
 	knownfiles	= NULL;
+	canceledfiles	= NULL;
 	serverlist	= NULL;
 	serverconnect	= NULL;
 	sharedfiles	= NULL;
@@ -181,7 +193,6 @@
 	uploadqueue	= NULL;
 	ipfilter	= NULL;
 	ECServerHandler = NULL;
-	m_singleInstance= NULL;
 	glob_prefs	= NULL;
 	m_statistics	= NULL;
 	uploadBandwidthThrottler = NULL;
@@ -190,13 +201,11 @@
 	m_upnpMappings.resize(4);
 #endif
 	core_timer	= NULL;
-	applog		= NULL;
 	
 	m_localip	= 0;
 	m_dwPublicIP	= 0;
 	webserver_pid	= 0;
 
-	enable_stdout_log = false;
 	enable_daemon_fork = false;
 
 	strFullMuleVersion = NULL;
@@ -204,23 +213,30 @@
 	
 	// Apprently needed for *BSD
 	SetResourceLimits();
+
+#ifdef _MSC_VER
+	_CrtSetDbgFlag(0);		// Disable useless memleak debugging
+#endif
 }
 
 CamuleApp::~CamuleApp()
 {
 	// Closing the log-file as the very last thing, since
 	// wxWidgets log-events are saved in it as well.
-	delete applog;
-	applog = NULL;
+	theLogger.CloseLogfile();
 
-	free(strFullMuleVersion);
-	free(strOSDescription);
+	if (strFullMuleVersion) {
+		free(strFullMuleVersion);
+	}
+	if (strOSDescription) {
+		free(strOSDescription);
+	}
 }
 
 int CamuleApp::OnExit()
 {
 	if (m_app_state!=APP_STATE_STARTING) {
-		printf("Now, exiting main app...\n");
+		AddLogLineNS(_("Now, exiting main app..."));
 	}
 
 	// From wxWidgets docs, wxConfigBase:
@@ -239,14 +255,18 @@
 
 	// Kill amuleweb if running
 	if (webserver_pid) {
-		printf("Killing amuleweb instance with pid `%ld' ... ", webserver_pid);
+		AddLogLineNS(CFormat(_("Terminating amuleweb instance with pid '%ld' ... ")) % webserver_pid);
 		wxKillError rc;
-		wxKill(webserver_pid, wxSIGTERM, &rc);
-		printf("Killed!\n");
+		if (wxKill(webserver_pid, wxSIGTERM, &rc) == -1) {
+			AddLogLineNS(CFormat(_("Killing amuleweb instance with pid '%ld' ... ")) % webserver_pid);
+			if (wxKill(webserver_pid, wxSIGKILL, &rc) == -1) {
+				AddLogLineNS(_("Failed"));
+			}
+		}
 	}
 
 	if (m_app_state!=APP_STATE_STARTING) {
-		printf("aMule OnExit: Terminating core.\n");
+		AddLogLineNS(_("aMule OnExit: Terminating core."));
 	}
 
 	delete serverlist;
@@ -278,6 +298,9 @@
 	delete knownfiles;
 	knownfiles = NULL;
 
+	delete canceledfiles;
+	canceledfiles = NULL;
+
 	delete clientlist;
 	clientlist = NULL;
 
@@ -305,31 +328,22 @@
 	glob_prefs = NULL;
 	CPreferences::EraseItemList();
 
-#if defined(__WXMAC__) && defined(AMULE_DAEMON)
-	//#warning TODO: fix wxSingleInstanceChecker for amuled on Mac (wx link problems)
-#else
-	delete m_singleInstance;
-#endif
-	m_singleInstance = NULL;
-
 	delete uploadBandwidthThrottler;
 	uploadBandwidthThrottler = NULL;
 
 	if (m_app_state!=APP_STATE_STARTING) {
-		printf("aMule shutdown completed.\n");
+		AddLogLineNS(_("aMule shutdown completed."));
 	}
 
 #if wxUSE_MEMORY_TRACING
-	printf("Memory debug results for aMule exit:\n");
+	AddLogLineNS(_("Memory debug results for aMule exit:"));
 	// Log mem debug mesages to wxLogStderr
 	wxLog* oldLog = wxLog::SetActiveTarget(new wxLogStderr);
-	/*
-	printf("**************Classes**************\n");
-	wxDebugContext::PrintClasses();
-	*/
-	//printf("***************Dump***************\n");
+	//AddLogLineNS(wxT("**************Classes**************");
+	//wxDebugContext::PrintClasses();
+	//AddLogLineNS(wxT("***************Dump***************");
 	//wxDebugContext::Dump();
-	printf("***************Stats**************\n");
+	AddLogLineNS(wxT("***************Stats**************"));
 	wxDebugContext::PrintStatistics(true);
 
 	// Set back to wxLogGui
@@ -349,54 +363,14 @@
 }
 
 
-/**
- * Checks permissions on a aMule directory, creating if needed.
- *
- * @param desc A description of the directory in question, used for error messages.
- * @param directory The directory in question.
- * @param fallback If the dir specified with 'directory' could not be created, try this instead.
- * @return The bool is false on error. The wxString contains the used path.
- */
-std::pair<bool, CPath> CheckMuleDirectory(const wxString& desc, const CPath& directory, const wxString& alternative)
-{
-	wxString msg;
-
-	if (directory.IsDir(CPath::readwritable)) {
-		return std::pair<bool, CPath>(true, directory);
-	} else if (directory.DirExists()) {
-		msg = CFormat(wxT("Permissions on the %s directory too strict!\n")
-			wxT("aMule cannot proceed. To fix this, you must set read/write/exec\n")
-			wxT("permissions for the folder '%s'"))
-				% desc % directory;
-	} else if (CPath::MakeDir(directory)) {
-		return std::pair<bool, CPath>(true, directory);
-	} else {
-		msg << CFormat(wxT("Could not create the %s directory at '%s'."))
-			% desc % directory;
-	}
-
-	// Attempt to use fallback directory.
-	const CPath fallback = CPath(alternative);
-	if (fallback.IsOk() && (directory != fallback)) {
-		msg << wxT("\nAttempting to use default directory at location \n'")
-			<< alternative << wxT("'.");
-		theApp->ShowAlert(msg, wxT("Error accessing directory."), wxICON_ERROR | wxOK);
-
-		return CheckMuleDirectory(desc, fallback, wxEmptyString);
-	} 
-	
-	theApp->ShowAlert(msg, wxT("Fatal error."), wxICON_ERROR | wxOK);
-	return std::pair<bool, CPath>(false, CPath(wxEmptyString));
-}
-
-
 //
 // Application initialization
 //
 bool CamuleApp::OnInit()
 {
 #if wxUSE_MEMORY_TRACING
-	printf("Checkpoint set on app init for memory debug\n");
+	// any text before call of Localize_mule needs not to be translated.
+	AddLogLineNS(wxT("Checkpoint set on app init for memory debug"));	// debug output
 	wxDebugContext::SetCheckpoint();
 #endif
 
@@ -408,219 +382,37 @@
 #ifndef __WXMSW__
 	// get rid of sigpipe
 	signal(SIGPIPE, SIG_IGN);
+#else
+	// Handle CTRL-Break
+	signal(SIGBREAK, OnShutdownSignal);
+#endif
 	// Handle sigint and sigterm
 	signal(SIGINT, OnShutdownSignal);
 	signal(SIGTERM, OnShutdownSignal);
-#endif
 
 #ifdef __WXMAC__
 	// For listctrl's to behave on Mac
 	wxSystemOptions::SetOption(wxT("mac.listctrl.always_use_generic"), 1);
 #endif
 
-	// This can't be on constructor or wx2.4.2 doesn't set it.	
-	#if !wxCHECK_VERSION(2, 9, 0)
-	SetVendorName(wxT("TikuWarez"));
-	#endif
-	SetAppName(wxT("aMule"));
-	
-	wxString FullMuleVersion = GetFullMuleVersion();
-	wxString OSDescription = wxGetOsDescription();
-	strFullMuleVersion = strdup((const char *)unicode2char(FullMuleVersion));
-	strOSDescription = strdup((const char *)unicode2char(OSDescription));
-	OSType = OSDescription.BeforeFirst( wxT(' ') );
-	if ( OSType.IsEmpty() ) {
-		OSType = wxT("Unknown");
-	}
-
 	// Handle uncaught exceptions
 	InstallMuleExceptionHandler();
 
-	// Parse cmdline arguments.
-	wxCmdLineParser cmdline(AMULE_APP_BASE::argc, AMULE_APP_BASE::argv);
-
-	// Handle these arguments.
-	cmdline.AddSwitch(wxT("v"), wxT("version"), wxT("Displays the current version number."));
-	cmdline.AddSwitch(wxT("h"), wxT("help"), wxT("Displays this information."));
-	cmdline.AddSwitch(wxT("i"), wxT("enable-stdin"), wxT("Does not disable stdin."));
-#ifdef AMULE_DAEMON
-	cmdline.AddSwitch(wxT("f"), wxT("full-daemon"), wxT("Fork to background."));
-	cmdline.AddOption(wxT("c"), wxT("config-dir"), wxT("read config from <dir> instead of home"));
-	cmdline.AddSwitch(wxT("e"), wxT("ec-config"), wxT("Configure EC (External Connections)."));
-#else
-	cmdline.AddOption(wxT("geometry"), wxEmptyString,
-			wxT("Sets the geometry of the app.\n")
-			wxT("\t\t\t<str> uses the same format as standard X11 apps:\n")
-			wxT("\t\t\t[=][<width>{xX}<height>][{+-}<xoffset>{+-}<yoffset>]"));
-#endif
-	cmdline.AddSwitch(wxT("d"), wxT("disable-fatal"), wxT("Does not handle fatal exception."));
-	cmdline.AddSwitch(wxT("o"), wxT("log-stdout"), wxT("Print log messages to stdout."));
-	cmdline.AddSwitch(wxT("r"), wxT("reset-config"), wxT("Resets config to default values."));
-	
-	// Show help on --help or invalid commands
-	if ( cmdline.Parse() ) {
-		return false;		
-	} else if ( cmdline.Found(wxT("help")) ) {
-		cmdline.Usage();
-		return false;
-	}	
-
-	bool ec_config = false;	
-	
-#ifdef AMULE_DAEMON
-	ec_config = cmdline.Found(wxT("ec-config"));
-	if ( cmdline.Found(wxT("config-dir"), &ConfigDir) ) {
-		if (ConfigDir.Last() != wxFileName::GetPathSeparator()) {
-			ConfigDir += wxFileName::GetPathSeparator();
-		}
-	} else {
-		ConfigDir = GetConfigDir();
-	}
-#else
-	ConfigDir = GetConfigDir();
-#endif
-
-	if ( !cmdline.Found(wxT("disable-fatal")) ) {
-#ifndef __WXMSW__
-		// catch fatal exceptions
-		wxHandleFatalExceptions(true);
-#endif
-	}
-
-	bool reset_config = cmdline.Found(wxT("reset-config"));
-	
-	enable_stdout_log = cmdline.Found(wxT("log-stdout"));
-#ifdef AMULE_DAEMON		
-	enable_daemon_fork = cmdline.Found(wxT("full-daemon"));
-#else
-	enable_daemon_fork = false;
-#endif
-	
-	if ( enable_stdout_log ) {
-		if ( enable_daemon_fork ) {
-			printf("Daemon will fork to background - log to stdout disabled\n");
-			enable_stdout_log = false;
-		} else {
-			printf("Logging to stdout enabled\n");
-		}
-	}
-	
-	if ( cmdline.Found(wxT("version")) ) {
-		printf("%s (OS: %s)\n", strFullMuleVersion, (const char*)unicode2char(OSType));
-		
-		return false;
-	}
-	
-	// Default geometry of the GUI. Can be changed with a cmdline argument...
-	bool geometry_enabled = false;
-	wxString geom_string;
-#ifndef AMULE_DAEMON
-	if ( cmdline.Found(wxT("geometry"), &geom_string) ) {
-		geometry_enabled = true;
-	}
-#endif
-
-	printf("Initialising %s\n", strFullMuleVersion);
-
-	// Ensure that "~/.aMule/" is accessible.
-	if (!CheckMuleDirectory(wxT("configuration"), CPath(ConfigDir), wxEmptyString).first) {
+	if (!InitCommon(AMULE_APP_BASE::argc, AMULE_APP_BASE::argv)) {
 		return false;
 	}
-	
-	if (reset_config) {
-		// Make a backup first.
-		wxRemoveFile(ConfigDir + wxT("amule.conf.backup"));
-		wxRenameFile(ConfigDir + wxT("amule.conf"), ConfigDir + wxT("amule.conf.backup"));
-		printf("Your settings have been reset to default values.\nOld config file has been saved as amule.conf.backup\n");
-	}
-	
-#if defined(__WXMAC__) && defined(AMULE_DAEMON)
-	//#warning TODO: fix wxSingleInstanceChecker for amuled on Mac (wx link problems)
-	printf("WARNING: The check for other instances is currently disabled in amuled.\n"
-		"Please make sure that no other instance of aMule is running or your files might be corrupted.\n");
-#else
-	printf("Checking if there is an instance already running...\n");
-
-	m_singleInstance = new wxSingleInstanceChecker();
-	if (m_singleInstance->Create(wxT("muleLock"), ConfigDir)
-		&& m_singleInstance->IsAnotherRunning()) {
-		printf("There is an instance of aMule already running\n");
-		printf("%s", (const char*)unicode2UTF8(wxString(CFormat(wxT("(lock file: %s%s)")) % ConfigDir % wxT("muleLock"))));
-		
-		// This is very tricky. The most secure way to communicate is via ED2K links file
-		wxTextFile ed2kFile(ConfigDir + wxT("ED2KLinks"));
-		if (!ed2kFile.Exists()) {
-			ed2kFile.Create();
-		}
-			
-		if (ed2kFile.Open()) {
-			ed2kFile.AddLine(wxT("RAISE_DIALOG"));
-			ed2kFile.Write();
-			
-			printf("Raising current running instance.\n");
-		} else {
-			printf("Failed to open 'ED2KFile', cannot signal running instance.\n");
-		}
-			
-		return false;
-	} else {
-		printf("No other instances are running.\n");
-	}
-#endif
-
-	// Close standard-input
-	if ( !cmdline.Found(wxT("enable-stdin")) ) {
-		// The full daemon will close all std file-descriptors by itself,
-		// so closing it here would lead to the closing on the first open
-		// file, which is the logfile opened below
-		if (!enable_daemon_fork) {
-			close(0);
-		}
-	}
-
-	// This creates the CFG file we shall use
-	wxConfigBase* cfg = new wxFileConfig( wxEmptyString, wxEmptyString, ConfigDir + wxT("amule.conf") );
-	
-	// Set the config object as the global cfg file
-	wxConfig::Set( cfg );
-
-	// Make a backup of the log file
-	CPath logfileName = CPath(ConfigDir + wxT("logfile"));
-	if (logfileName.FileExists()) {
-		CPath::BackupFile(logfileName, wxT(".bak"));
-	}
-
-	// Open the log file
-	applog = new wxFFileOutputStream(logfileName.GetRaw());
-	if (!applog->Ok()) {
-		// use std err as last resolt to indicate problem
-		fputs("ERROR: unable to open log file\n", stderr);
-		delete applog;
-		applog = NULL;
-		// failure to open log is serious problem
-		return false;
-	}
-
-	// This cannot be translated, as localization is not set up yet.
-	AddLogLineM(false, wxT("Starting ") + FullMuleVersion);
-
-	// Load Preferences
-	CPreferences::BuildItemList(ConfigDir);
-	CPreferences::LoadAllItems( wxConfigBase::Get() );
 
 	glob_prefs = new CPreferences();
 
-	std::pair<bool, CPath> checkResult;
-	checkResult = CheckMuleDirectory(wxT("temp"), thePrefs::GetTempDir(), ConfigDir + wxT("Temp"));
-	if (checkResult.first) {
-		thePrefs::SetTempDir(checkResult.second);
+	CPath outDir;
+	if (CheckMuleDirectory(wxT("temp"), thePrefs::GetTempDir(), ConfigDir + wxT("Temp"), outDir)) {
+		thePrefs::SetTempDir(outDir);
 	} else {
 		return false;
 	}
 	
-	checkResult = CheckMuleDirectory(wxT("incoming"), thePrefs::GetIncomingDir(), ConfigDir + wxT("Incoming"));
-	if (checkResult.first) {
-		thePrefs::SetIncomingDir(checkResult.second);
+	if (CheckMuleDirectory(wxT("incoming"), thePrefs::GetIncomingDir(), ConfigDir + wxT("Incoming"), outDir)) {
+		thePrefs::SetIncomingDir(outDir);
 	} else {
 		return false;
 	}
@@ -640,10 +432,10 @@
 
 	// Configure EC for amuled when invoked with ec-config
 	if (ec_config) {
-		printf("\nEC configuration\n");
+		AddLogLineNS(_("\nEC configuration"));
 		thePrefs::SetECPass(GetPassword());
 		thePrefs::EnableExternalConnections(true);
-		printf("Password set and external connections enabled.\n");
+		AddLogLineNS(_("Password set and external connections enabled."));
 	}
 	
 #ifndef __WXMSW__
@@ -711,6 +503,7 @@
 	friendlist	= new CFriendList();
 	searchlist	= new CSearchList();
 	knownfiles	= new CKnownFileList();
+	canceledfiles	= new CCanceledFileList;
 	serverlist	= new CServerList();
 	
 	sharedfiles	= new CSharedFileList(knownfiles);
@@ -724,28 +517,27 @@
 	// Creates all needed listening sockets
 	wxString msg;
 	if (!ReinitializeNetwork(&msg)) {
-		printf("\n%s\n", (const char *)unicode2char(msg));
+		AddLogLineNS(wxT("\n"));
+		AddLogLineNS(msg);
 	}
 
 	// Test if there's any new version
-	if (thePrefs::CheckNewVersion()) {
+	if (thePrefs::GetCheckNewVersion()) {
 		// We use the thread base because I don't want a dialog to pop up.
 		CHTTPDownloadThread* version_check = 
 			new CHTTPDownloadThread(wxT("http://amule.sourceforge.net/lastversion"),
-				theApp->ConfigDir + wxT("last_version_check"), HTTP_VersionCheck, false);
+				theApp->ConfigDir + wxT("last_version_check"), theApp->ConfigDir + wxT("last_version"), HTTP_VersionCheck, false, false);
 		version_check->Create();
 		version_check->Run();
 	}
 
 	// Create main dialog, or fork to background (daemon).
-	InitGui(geometry_enabled, geom_string);
+	InitGui(m_geometryEnabled, m_geometryString);
 	
-#if !defined(__WXMAC__) && defined(AMULE_DAEMON)
+#ifdef AMULE_DAEMON
 	// Need to refresh wxSingleInstanceChecker after the daemon fork() !
 	if (enable_daemon_fork) {
-        	//#warning TODO: fix wxSingleInstanceChecker for amuled on Mac (wx link problems)
-	        delete m_singleInstance;
-	        m_singleInstance = new wxSingleInstanceChecker(wxT("muleLock"), ConfigDir);
+		RefreshSingleInstanceChecker();
 		// No need to check IsAnotherRunning() - we've done it before.
 	}
 #endif
@@ -755,27 +547,29 @@
 	// and the UBT constructor creates a thread.
 	uploadBandwidthThrottler = new UploadBandwidthThrottler();
 	
+	// Start performing background tasks
+	// This will start loading the IP filter. It will start right away.
+	// Log is confusing, because log entries from background will only be printed
+	// once foreground becomes idle, and that will only be after loading 
+	// of the partfiles has finished.
+	CThreadScheduler::Start();
+	
 	// These must be initialized after the gui is loaded.
-	serverlist->Init();
+	if (thePrefs::GetNetworkED2K()) {
+		serverlist->Init();
+	}
 	downloadqueue->LoadMetFiles(thePrefs::GetTempDir());
 	sharedfiles->Reload();
 	
-	if (thePrefs::IPFilterAutoLoad()) {
-		ipfilter->Update(thePrefs::IPFilterURL());
-	}	
-
-	
 	// Ensure that the up/down ratio is used
 	CPreferences::CheckUlDlRatio();
 
+	// Load saved friendlist (now, so it can update in GUI right away)
+	friendlist->LoadList();
+
 	// The user can start pressing buttons like mad if he feels like it.
 	m_app_state = APP_STATE_RUNNING;
 	
-	// Kry - Load the sources seeds on app init
-	if (thePrefs::GetSrcSeedsOn()) {
-		downloadqueue->LoadSourceSeeds();
-	}
-	
 	if (!serverlist->GetServerCount() && thePrefs::GetNetworkED2K()) {
 		// There are no servers and ED2K active -> ask for download.
 		// As we cannot ask in amuled, we just update there
@@ -799,22 +593,26 @@
 	
 	
 	// Autoconnect if that option is enabled
-	if (thePrefs::DoAutoConnect() && (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia())) {
-		AddLogLineM(true, _("Connecting"));
+	if (thePrefs::DoAutoConnect()) {
+		// IP filter is still loading and will be finished on event.
+		// Tell it to autoconnect.
 		if (thePrefs::GetNetworkED2K()) {
-			theApp->serverconnect->ConnectToAnyServer();
+			ipfilter->ConnectToAnyServerWhenReady();
+		}
+		if (thePrefs::GetNetworkKademlia()) {
+			ipfilter->StartKADWhenReady();
 		}
-
-		StartKad();
-
 	}
 
-	// No webserver on Win at all (yet)
-#ifndef __WXMSW__
+	// Enable GeoIP
+#ifdef ENABLE_IP2COUNTRY
+	theApp->amuledlg->EnableIP2Country();
+#endif
+
 	// Run webserver?
 	if (thePrefs::GetWSIsEnabled()) {
-		wxString aMuleConfigFile = ConfigDir + wxT("amule.conf");
-		wxString amulewebPath = wxT("amuleweb");
+		wxString aMuleConfigFile = ConfigDir + m_configFile;
+		wxString amulewebPath = thePrefs::GetWSPath();
 
 #if defined(__WXMAC__) && !defined(AMULE_DAEMON)
 		// For the Mac GUI application, look for amuleweb in the bundle
@@ -828,22 +626,32 @@
 			if (absoluteUrl) {
 				CFStringRef amulewebCfstr = CFURLCopyFileSystemPath(absoluteUrl, kCFURLPOSIXPathStyle);
 				CFRelease(absoluteUrl);
+	#if wxCHECK_VERSION(2, 9, 0)
+				amulewebPath = wxCFStringRef(amulewebCfstr).AsString(wxLocale::GetSystemEncoding());
+	#else
 				amulewebPath = wxMacCFStringHolder(amulewebCfstr).AsString(wxLocale::GetSystemEncoding());
+	#endif
 			}
 		}
 #endif
 
+#ifdef __WXMSW__
+#	define QUOTE	wxT("\"")
+#else
+#	define QUOTE	wxT("\'")
+#endif
+
 		wxString cmd =
-			wxT("'") +
+			QUOTE +
 			amulewebPath +
-			wxT("' '--amule-config-file=") +
+			QUOTE wxT(" ") QUOTE wxT("--amule-config-file=") +
 			aMuleConfigFile +
-			wxT("'");
+			QUOTE;
 		CTerminationProcessAmuleweb *p = new CTerminationProcessAmuleweb(cmd, &webserver_pid);
 		webserver_pid = wxExecute(cmd, wxEXEC_ASYNC, p);
 		bool webserver_ok = webserver_pid > 0;
 		if (webserver_ok) {
-			AddLogLineM(true, CFormat(_("web server running on pid %d")) % webserver_pid);
+			AddLogLineC(CFormat(_("web server running on pid %d")) % webserver_pid);
 		} else {
 			delete p;
 			ShowAlert(_(
@@ -851,11 +659,7 @@
 				_("ERROR"), wxOK | wxICON_ERROR);
 		}
 	}
-#endif /* ! __WXMSW__ */
 
-	// Start performing background tasks
-	CThreadScheduler::Start();
-	
 	return true;
 }
 
@@ -885,9 +689,9 @@
 			wxT("preferences for the new value.\n");
 		*msg << err;
 
-		AddLogLineM( false, wxEmptyString );
-		AddLogLineM( true, err );
-		AddLogLineM( false, wxEmptyString );
+		AddLogLineN(wxEmptyString );
+		AddLogLineC(err );
+		AddLogLineN(wxEmptyString );
 
 		ok = false;
 	}
@@ -908,9 +712,9 @@
 			wxT("preferences for the new value\n");
 		*msg << err;
 
-		AddLogLineM( false, wxEmptyString );
-		AddLogLineM( true, err );
-		AddLogLineM( false, wxEmptyString );
+		AddLogLineN(wxEmptyString );
+		AddLogLineC(err );
+		AddLogLineN(wxEmptyString );
 		
 		ok = false;
 	}
@@ -934,7 +738,7 @@
 		myaddr[1].AnyAddress();
 	} else if (!myaddr[1].Hostname(thePrefs::GetAddress())) {
 		myaddr[1].AnyAddress();
-		AddLogLineM(true, CFormat(_("Could not bind ports to the specified address: %s"))
+		AddLogLineC(CFormat(_("Could not bind ports to the specified address: %s"))
 			% thePrefs::GetAddress());				
 	}
 
@@ -964,7 +768,7 @@
 		err = CFormat(_("Port %u is not available. You will be LOWID\n")) %
 			(unsigned int)(thePrefs::GetPort());
 		*msg << err;
-		AddLogLineM(true, err);
+		AddLogLineC(err);
 		err.Clear();
 		err = CFormat(
 			_("Port %u is not available!\n\nThis means that you will be LOWID.\n\nCheck your network to make sure the port is open for output and input.")) % 
@@ -1014,7 +818,7 @@
 		} catch(CUPnPException &e) {
 			wxString error_msg;
 			error_msg << e.what();
-			AddLogLineM(true, error_msg);
+			AddLogLineC(error_msg);
 			fprintf(stderr, "%s\n", (const char *)unicode2char(error_msg));
 		}
 	}
@@ -1023,80 +827,6 @@
 	return ok;
 }
 
-// Returns a magnet ed2k URI
-wxString CamuleApp::CreateMagnetLink(const CAbstractFile *f)
-{
-	CMagnetURI uri;
-
-	uri.AddField(wxT("dn"), f->GetFileName().Cleanup(false).GetPrintable());
-	uri.AddField(wxT("xt"), wxString(wxT("urn:ed2k:")) + f->GetFileHash().Encode().Lower());
-	uri.AddField(wxT("xt"), wxString(wxT("urn:ed2khash:")) + f->GetFileHash().Encode().Lower());
-	uri.AddField(wxT("xl"), wxString::Format(wxT("%") wxLongLongFmtSpec wxT("u"), f->GetFileSize()));
-
-	return uri.GetLink();
-}
-
-// Returns a ed2k file URL
-wxString CamuleApp::CreateED2kLink(const CAbstractFile *f, bool add_source, bool use_hostname, bool addcryptoptions)
-{
-	wxASSERT(!(!add_source && (use_hostname || addcryptoptions)));
-	// Construct URL like this: ed2k://|file|<filename>|<size>|<hash>|/
-	wxString strURL = CFormat(wxT("ed2k://|file|%s|%i|%s|/"))
-		% f->GetFileName().Cleanup(false)
-		% f->GetFileSize() % f->GetFileHash().Encode();
-	
-	if (add_source && IsConnected() && !IsFirewalled()) {
-		// Create the first part of the URL
-		strURL << wxT("|sources,");
-		if (use_hostname) {
-			strURL << thePrefs::GetYourHostname();
-		} else {
-			uint32 clientID = GetID();
-			strURL << (uint8) clientID << wxT(".") <<
-			(uint8)(clientID >> 8) << wxT(".") <<
-			(uint8)(clientID >> 16) << wxT(".") <<
-			(uint8)(clientID >> 24);
-		}
-		
- 		strURL << wxT(":") <<
-			thePrefs::GetPort();
-		
-		if (addcryptoptions) {
-			const uint8 uSupportsCryptLayer	= thePrefs::IsClientCryptLayerSupported() ? 1 : 0;
-			const uint8 uRequestsCryptLayer	= thePrefs::IsClientCryptLayerRequested() ? 1 : 0;
-			const uint8 uRequiresCryptLayer	= thePrefs::IsClientCryptLayerRequired() ? 1 : 0;
-			const uint8 byCryptOptions = (uRequiresCryptLayer << 2) | (uRequestsCryptLayer << 1) | (uSupportsCryptLayer << 0) | (uSupportsCryptLayer ? 0x80 : 0x00);
-			
-			strURL << wxT(":") << byCryptOptions;
-			
-			if (byCryptOptions & 0x80) {
-				strURL << wxT(":") << thePrefs::GetUserHash().Encode();
-			}
-		}
-		strURL << wxT("|/");
-	} else if (add_source) {
-		AddLogLineM(true, _("WARNING: You can't add yourself as a source for an eD2k link while having a lowid."));
-	}
-
-	// Result is "ed2k://|file|<filename>|<size>|<hash>|/|sources,[(<ip>|<hostname>):<port>[:cryptoptions[:hash]]]|/"
-	return strURL;
-}
-
-// Returns a ed2k link with AICH info if available
-wxString CamuleApp::CreateED2kAICHLink(const CKnownFile* f)
-{
-	// Create the first part of the URL
-	wxString strURL = CreateED2kLink(f);
-	// Append the AICH info
-	if (f->HasProperAICHHashSet()) {
-		strURL.RemoveLast();		// remove trailing '/'
-		strURL << wxT("h=") << f->GetAICHMasterHash() << wxT("|/");
-	}	
-
-	// Result is "ed2k://|file|<filename>|<size>|<hash>|h=<AICH master hash>|/"
-	return strURL;
-}
-
 /* Original implementation by Bouc7 of the eMule Project.
    aMule Signature idea was designed by BigBob and implemented
    by Un-Thesis, with design inputs and suggestions from bothie.
@@ -1120,7 +850,7 @@
 	
 	// Open both files if needed
 	if ( !emulesig_out.Create( m_emulesig_path) ) {
-		AddLogLineM(true, _("Failed to create OnlineSig File"));
+		AddLogLineC(_("Failed to create OnlineSig File"));
 		// Will never try again.
 		m_amulesig_path.Clear();
 		m_emulesig_path.Clear();
@@ -1128,7 +858,7 @@
 	}
 
 	if ( !amulesig_out.Create(m_amulesig_path) ) {
-		AddLogLineM(true, _("Failed to create aMule OnlineSig File"));
+		AddLogLineC(_("Failed to create aMule OnlineSig File"));
 		// Will never try again.
 		m_amulesig_path.Clear();
 		m_emulesig_path.Clear();
@@ -1144,7 +874,7 @@
 	} else {
 		if (IsConnectedED2K()) {
 
-			temp = wxString::Format(wxT("%d"),serverconnect->GetCurrentServer()->GetPort());
+			temp = CFormat(wxT("%d")) % serverconnect->GetCurrentServer()->GetPort();
 			
 			// We are online
 			emulesig_string =
@@ -1203,25 +933,25 @@
 		emulesig_string += wxT("\xA");
 
 		// Datarate for downloads
-		temp = wxString::Format(wxT("%.1f"), theStats::GetDownloadRate() / 1024.0);
+		temp = CFormat(wxT("%.1f")) % (theStats::GetDownloadRate() / 1024.0);
 
 		emulesig_string += temp + wxT("|");
 		amulesig_out.AddLine(temp);
 
 		// Datarate for uploads
-		temp = wxString::Format(wxT("%.1f"), theStats::GetUploadRate() / 1024.0);
+		temp = CFormat(wxT("%.1f")) % (theStats::GetUploadRate() / 1024.0);
 
 		emulesig_string += temp + wxT("|");
 		amulesig_out.AddLine(temp);
 
 		// Number of users waiting for upload
-		temp = wxString::Format(wxT("%d"), theStats::GetWaitingUserCount());
+		temp = CFormat(wxT("%d")) % theStats::GetWaitingUserCount();
 
 		emulesig_string += temp; 
 		amulesig_out.AddLine(temp);
 
 		// Number of shared files (not on eMule)
-		amulesig_out.AddLine(wxString::Format(wxT("%d"), theStats::GetSharedFileCount()));
+		amulesig_out.AddLine(CFormat(wxT("%d")) % theStats::GetSharedFileCount());
 	}
 
 	// eMule signature finished here. Write the line to the wxTextFile.
@@ -1233,10 +963,10 @@
 	amulesig_out.AddLine(thePrefs::GetUserNick());
 
 	// Total received in bytes
-	amulesig_out.AddLine( CFormat( wxT("%llu") ) % (theStats::GetSessionReceivedBytes() + thePrefs::GetTotalDownloaded()) );
+	amulesig_out.AddLine(CFormat(wxT("%llu")) % theStats::GetTotalReceivedBytes());
 
 	// Total sent in bytes
-	amulesig_out.AddLine( CFormat( wxT("%llu") ) % (theStats::GetSessionSentBytes() + thePrefs::GetTotalUploaded()) );
+	amulesig_out.AddLine(CFormat(wxT("%llu")) % theStats::GetTotalSentBytes());
 
 	// amule version
 #ifdef SVNDATE
@@ -1268,6 +998,7 @@
 } //End Added By Bouc7
 
 
+#if wxUSE_ON_FATAL_EXCEPTION
 // Gracefully handle fatal exceptions and print backtrace if possible
 void CamuleApp::OnFatalException()
 {
@@ -1288,6 +1019,7 @@
 	
 	fprintf(stderr, "\n--------------------------------------------------------------------------------\n");	
 }
+#endif
 
 
 // Sets the localization of aMule
@@ -1296,7 +1028,7 @@
 	InitCustomLanguages();
 	InitLocale(m_locale, StrLang2wx(thePrefs::GetLanguageID()));
 	if (!m_locale.IsOk()) {
-		AddLogLineM(false,_("The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"));
+		AddLogLineN(_("The selected locale seems not to be installed on your box. (Note: I'll try to set it anyway)"));
 	}
 }
 
@@ -1310,14 +1042,6 @@
 		info += _("This version is a testing version, updated daily, and\n");
 		info += _("we give no warranty it won't break anything, burn your house,\n");
 		info += _("or kill your dog. But it *should* be safe to use anyway.\n");
-	} else if (new_version == wxT("2.2.1")) {
-		thePrefs::SetAddServersFromServer(false);
-		thePrefs::SetAddServersFromClient(false);
-		info += _("The following options have been changed in this release for security reasons:\n");
-		info += _("\n* Enabled Protocol Obfuscation support for incoming and outgoing connections.\n");
-		info += _("\n* Disabled updating the server list from other server and clients.\n");
-		info += _("\nFor more information on the reason for this changes, seach\nthe aMule wiki at http://wiki.amule.org for \"fake servers\" info.\nIt's important that you clear any fake server from your server list for aMule to work properly.");
-		info += _("\n\nAdditionally, the browser settings have been reset to the system default. Please configure your browser options again if needed.\n"); 
 	}
 	
 	// General info
@@ -1393,7 +1117,7 @@
 
 void CamuleApp::OnServerDnsDone(CMuleInternalEvent& evt)
 {
-	printf("Server hostname notified\n");
+	AddLogLineNS(_("Server hostname notified"));
 	serverconnect->OnServerHostnameResolved(evt.GetClientData(), evt.GetExtraLong());
 }
 
@@ -1416,6 +1140,7 @@
 	// Former TimerProc section
 	static uint64 msPrev1, msPrev5, msPrevSave, msPrevHist, msPrevOS, msPrevKnownMet;
 	uint64 msCur = theStats::GetUptimeMillis();
+	TheTime = msCur / 1000;
 
 	if (!IsRunning()) {
 		return;
@@ -1435,8 +1160,18 @@
 	}
 #endif
 
-	CLogger::FlushPendingEntries();
-	
+	// There is a theoretical chance that the core time function can recurse:
+	// if an event function gets blocked on a mutex (communicating with the 
+	// UploadBandwidthThrottler) wx spawns a new event loop and processes more events.
+	// If CPU load gets high a new core timer event could be generated before the last
+	// one was finished and so recursion could occur, which would be bad.
+	// Detect this and do an early return then.
+	static bool recurse = false;
+	if (recurse) {
+		return;
+	}
+	recurse = true;
+
 	uploadqueue->Process();
 	downloadqueue->Process();
 	//theApp->clientcredits->Process();
@@ -1493,19 +1228,7 @@
 
 	if (msCur-msPrevSave >= 60000) {
 		msPrevSave = msCur;
-		wxString buffer;
-		
-		// Save total upload/download to preferences
-		wxConfigBase* cfg = wxConfigBase::Get();
-		buffer = CFormat(wxT("%llu")) % (theStats::GetSessionReceivedBytes() + thePrefs::GetTotalDownloaded());
-		cfg->Write(wxT("/Statistics/TotalDownloadedBytes"), buffer);
-
-		buffer = CFormat(wxT("%llu")) % (theStats::GetSessionSentBytes() + thePrefs::GetTotalUploaded());
-		cfg->Write(wxT("/Statistics/TotalUploadedBytes"), buffer);
-
-		// Write changes to file
-		cfg->Flush();
-
+		theStats::Save();
 	}
 
 	// Special
@@ -1524,6 +1247,8 @@
 	// Recomended by lugdunummaster himself - from emule 0.30c
 	serverconnect->KeepConnectionAlive();
 
+	// Disarm recursion protection
+	recurse = false;
 }
 
 
@@ -1543,27 +1268,24 @@
 			dynamic_cast<CPartFile*>(owner)->PartFileHashFinished(result);
 		}
 	} else {
-		static int filecount;
-		static uint64 bytecount;
+		static uint64 bytecount = 0;
 
-		if (knownfiles->SafeAddKFile(result)) {
-			AddDebugLogLineM(false, logKnownFiles,
+		if (knownfiles->SafeAddKFile(result, true)) {
+			AddDebugLogLineN(logKnownFiles,
 				CFormat(wxT("Safe adding file to sharedlist: %s")) % result->GetFileName());
 			sharedfiles->SafeAddKFile(result);
 
-			filecount++;
 			bytecount += result->GetFileSize();
-			// If we have added 30 files or files with a total size of ~300mb
-			if ( ( filecount == 30 ) || ( bytecount >= 314572800 ) ) {
-				AddDebugLogLineM(false, logKnownFiles, wxT("Failsafe for crash on file hashing creation"));
+			// If we have added files with a total size of ~300mb
+			if (bytecount >= 314572800) {
+				AddDebugLogLineN(logKnownFiles, wxT("Failsafe for crash on file hashing creation"));
 				if ( m_app_state != APP_STATE_SHUTTINGDOWN ) {
 					knownfiles->Save();
-					filecount = 0;
 					bytecount = 0;
 				}
 			}
 		} else {
-			AddDebugLogLineM(false, logKnownFiles,
+			AddDebugLogLineN(logKnownFiles,
 				CFormat(wxT("File not added to sharedlist: %s")) % result->GetFileName());
 			delete result;
 		}
@@ -1576,20 +1298,17 @@
 	wxCHECK_RET(evt.GetResult(), wxT("No result of AICH-hashing"));
 	
 	CKnownFile* owner = const_cast<CKnownFile*>(evt.GetOwner());
-	std::auto_ptr<CKnownFile> result(evt.GetResult());
+	CScopedPtr<CKnownFile> result(evt.GetResult());
 	
-	// Check that the owner is still valid
-	if (knownfiles->IsKnownFile(owner)) {
-		if (result->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE) {
-			CAICHHashSet* oldSet = owner->GetAICHHashset();
-			CAICHHashSet* newSet = result->GetAICHHashset();
+	if (result->GetAICHHashset()->GetStatus() == AICH_HASHSETCOMPLETE) {
+		CAICHHashSet* oldSet = owner->GetAICHHashset();
+		CAICHHashSet* newSet = result->GetAICHHashset();
 
-			owner->SetAICHHashset(newSet);
-			newSet->SetOwner(owner);
+		owner->SetAICHHashset(newSet);
+		newSet->SetOwner(owner);
 
-			result->SetAICHHashset(oldSet);
-			oldSet->SetOwner(result.get());
-		}
+		result->SetAICHHashset(oldSet);
+		oldSet->SetOwner(result.get());
 	}
 }
 
@@ -1615,7 +1334,7 @@
 	wxCHECK_RET(file, wxT("Allocation finished event sent for unspecified file"));
 	wxASSERT_MSG(downloadqueue->IsPartFile(file), wxT("CAllocFinishedEvent for unknown partfile"));
 
-	file->SetPartFileStatus(PS_EMPTY);
+	file->SetStatus(PS_EMPTY);
 
 	if (evt.Succeeded()) {
 		if (evt.IsPaused()) {
@@ -1624,7 +1343,7 @@
 			file->ResumeFile();
 		}
 	} else {
-		AddLogLineM(false, CFormat(_("Disk space preallocation for file '%s' failed: %s")) % file->GetFileName() % wxString(UTF82unicode(std::strerror(evt.GetResult()))));
+		AddLogLineN(CFormat(_("Disk space preallocation for file '%s' failed: %s")) % file->GetFileName() % wxString(UTF82unicode(std::strerror(evt.GetResult()))));
 		file->StopFile();
 	}
 
@@ -1633,7 +1352,7 @@
 
 void CamuleApp::OnNotifyEvent(CMuleGUIEvent& evt)
 {
-#if defined(AMULE_DAEMON)
+#ifdef AMULE_DAEMON
 	evt.Notify();
 #else
 	if (theApp->amuledlg) {
@@ -1645,8 +1364,11 @@
 
 void CamuleApp::ShutDown()
 {
+	// Just in case
+	PlatformSpecific::AllowSleepMode();
+
 	// Log
-	AddDebugLogLineM(false, logGeneral, wxT("CamuleApp::ShutDown() has started."));
+	AddDebugLogLineN(logGeneral, wxT("CamuleApp::ShutDown() has started."));
 
 	// Signal the hashing thread to terminate
 	m_app_state = APP_STATE_SHUTTINGDOWN;
@@ -1660,6 +1382,15 @@
 
 	OnlineSig(true); // Added By Bouc7
 
+	// Exit HTTP downloads
+	CHTTPDownloadThread::StopAll();
+
+	// Exit thread scheduler and upload thread
+	CThreadScheduler::Terminate();
+
+	AddDebugLogLineN(logGeneral, wxT("Terminate upload thread."));
+	uploadBandwidthThrottler->EndThread();
+
 	// Close sockets to avoid new clients coming in
 	if (listensocket) {
 		listensocket->Close();
@@ -1685,23 +1416,17 @@
 		knownfiles->Save();
 	}
 
-	thePrefs::Add2TotalDownloaded(theStats::GetSessionReceivedBytes());
-	thePrefs::Add2TotalUploaded(theStats::GetSessionSentBytes());
+	theStats::Save();
 
-	if (glob_prefs) {
-		glob_prefs->Save();
-	}
+	CPath configFileName = CPath(ConfigDir + m_configFile);
+	CPath::BackupFile(configFileName, wxT(".bak"));
 
 	if (clientlist) {
 		clientlist->DeleteAll();
 	}
 	
-	CThreadScheduler::Terminate();
-	
-	theApp->uploadBandwidthThrottler->EndThread();
-
 	// Log
-	AddDebugLogLineM(false, logGeneral, wxT("CamuleApp::ShutDown() has ended."));
+	AddDebugLogLineN(logGeneral, wxT("CamuleApp::ShutDown() has ended."));
 }
 
 
@@ -1715,30 +1440,6 @@
 }
 
 
-void CamuleApp::AddLogLine(const wxString &msg)
-{
-	// At most one trailing new-line, which we add
-	wxString message = msg;
-	while ( !message.IsEmpty() && message.Last() == wxT('\n') ) {
-		message.RemoveLast();
-	}
-	
-	wxString full_line = wxDateTime::Now().FormatISODate() + wxT(" ") + 
-		wxDateTime::Now().FormatISOTime() + wxT(": ") + message + wxT("\n");
-	
-	wxStringInputStream stream(full_line);
-	
-	if (applog) { // This check is needed, because if we assert before the logger is created, it will crash.
-		(*applog) << stream;
-		applog->Sync();
-	}
-	
-	if (enable_stdout_log) { 
-		printf("%s", (const char*)unicode2char(full_line));
-	}
-}
-
-
 uint32 CamuleApp::GetPublicIP(bool ignorelocal) const
 {
 	if (m_dwPublicIP == 0) {
@@ -1768,15 +1469,14 @@
 
 wxString CamuleApp::GetLog(bool reset)
 {
-	ConfigDir = GetConfigDir();
 	wxFile logfile;
 	logfile.Open(ConfigDir + wxT("logfile"));
 	if ( !logfile.IsOpened() ) {
-		return wxTRANSLATE("ERROR: can't open logfile");
+		return _("ERROR: can't open logfile");
 	}
 	int len = logfile.Length();
 	if ( len == 0 ) {
-		return wxTRANSLATE("WARNING: logfile is empty. Something is wrong.");
+		return _("WARNING: logfile is empty. Something is wrong.");
 	}
 	char *tmp_buffer = new char[len + sizeof(wxChar)];
 	logfile.Read(tmp_buffer, len);
@@ -1787,19 +1487,16 @@
 	if (tmp_buffer[0] && tmp_buffer[1]) {
 		str = wxString(UTF82unicode(tmp_buffer));
 	} else {
-		str = wxString((wxWCharBuffer&)tmp_buffer);
+		str = wxWCharBuffer((wchar_t *)tmp_buffer);
 	}
 
 	delete [] tmp_buffer;
 	if ( reset ) {
-		delete applog;
-		applog = new wxFFileOutputStream(ConfigDir + wxT("logfile"));
-		if ( applog->Ok() ) {
-			AddLogLine(_("Log has been reset"));
-		} else {
-			delete applog;
-			applog = 0;
+		theLogger.CloseLogfile();
+		if (theLogger.OpenLogfile(ConfigDir + wxT("logfile"))) {
+			AddLogLineN(_("Log has been reset"));
 		}
+		ECServerHandler->ResetAllLogs();
 	}
 	return str;
 }
@@ -1823,7 +1520,7 @@
 void CamuleApp::AddServerMessageLine(wxString &msg)
 {
 	server_msg += msg + wxT("\n");
-	AddLogLine(CFormat(_("ServerMessage: %s")) % msg);
+	AddLogLineN(CFormat(_("ServerMessage: %s")) % msg);
 }
 
 
@@ -1844,7 +1541,7 @@
 			CheckNewVersion(event.GetExtraLong());
 			break;
 		case HTTP_NodesDat:
-			if (event.GetExtraLong() != -1) {
+			if (event.GetExtraLong() == HTTP_Success) {
 				
 				wxString file = ConfigDir + wxT("nodes.dat");
 				if (wxFileExists(file)) {
@@ -1860,40 +1557,49 @@
 				Kademlia::CKademlia::Start();
 				theApp->ShowConnectionState();
 				
+			} else if (event.GetExtraLong() == HTTP_Skipped) {
+				AddLogLineN(CFormat(_("Skipped download of %s, because requested file is not newer.")) % wxT("nodes.dat"));
 			} else {
-				AddLogLineM(true, _("Failed to download the nodes list."));
+				AddLogLineC(_("Failed to download the nodes list."));
 			}
 			break;
+#ifdef ENABLE_IP2COUNTRY
+		case HTTP_GeoIP:
+			theApp->amuledlg->IP2CountryDownloadFinished(event.GetExtraLong());
+			// If we updated, the dialog is already up. Redraw it to show the flags.
+			theApp->amuledlg->Refresh();
+			break;
+#endif
 	}
 }
 
 void CamuleApp::CheckNewVersion(uint32 result)
 {	
-	if (result == 1) {
+	if (result == HTTP_Success) {
 		wxString filename = ConfigDir + wxT("last_version_check");
 		wxTextFile file;
 		
 		if (!file.Open(filename)) {
-			AddLogLineM(true, _("Failed to open the downloaded version check file") );
+			AddLogLineC(_("Failed to open the downloaded version check file") );
 			return;
 		} else if (!file.GetLineCount()) {
-			AddLogLineM(true, _("Corrupted version check file"));
+			AddLogLineC(_("Corrupted version check file"));
 		} else {
 			wxString versionLine = file.GetFirstLine();
 			wxStringTokenizer tkz(versionLine, wxT("."));
 			
-			AddDebugLogLineM(false, logGeneral, wxString(wxT("Running: ")) + wxT(VERSION) + wxT(", Version check: ") + versionLine);
+			AddDebugLogLineN(logGeneral, wxString(wxT("Running: ")) + wxT(VERSION) + wxT(", Version check: ") + versionLine);
 			
 			long fields[] = {0, 0, 0};
 			for (int i = 0; i < 3; ++i) {
 				if (!tkz.HasMoreTokens()) {
-					AddLogLineM(true, _("Corrupted version check file"));
+					AddLogLineC(_("Corrupted version check file"));
 					return;
 				} else {
 					wxString token = tkz.GetNextToken();
 					
 					if (!token.ToLong(&fields[i])) {
-						AddLogLineM(true, _("Corrupted version check file"));
+						AddLogLineC(_("Corrupted version check file"));
 						return;
 					}
 				}
@@ -1903,47 +1609,46 @@
 			long newVer = make_full_ed2k_version(fields[0], fields[1], fields[2]);
 			
 			if (curVer < newVer) {
-				AddLogLineM(true, _("You are using an outdated version of aMule!"));
-				AddLogLineM(false, wxString::Format(_("Your aMule version is %i.%i.%i and the latest version is %li.%li.%li"), VERSION_MJR, VERSION_MIN, VERSION_UPDATE, fields[0], fields[1], fields[2]));
-				AddLogLineM(false, _("The latest version can always be found at http://www.amule.org"));
+				AddLogLineC(_("You are using an outdated version of aMule!"));
+				AddLogLineN(CFormat(_("Your aMule version is %i.%i.%i and the latest version is %li.%li.%li")) % VERSION_MJR % VERSION_MIN % VERSION_UPDATE % fields[0] % fields[1] % fields[2]);
+				AddLogLineN(_("The latest version can always be found at http://www.amule.org"));
 				#ifdef AMULE_DAEMON
-				printf("%s\n", (const char*)unicode2UTF8(wxString::Format(
-					_("WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"),
-					VERSION_MJR, VERSION_MIN, VERSION_UPDATE, fields[0], fields[1], fields[2])));
+				AddLogLineCS(CFormat(_("WARNING: Your aMuled version is outdated: %i.%i.%i < %li.%li.%li"))
+					% VERSION_MJR % VERSION_MIN % VERSION_UPDATE % fields[0] % fields[1] % fields[2]);
 				#endif
 			} else {
-				AddLogLineM(false, _("Your copy of aMule is up to date."));
+				AddLogLineN(_("Your copy of aMule is up to date."));
 			}
 		}
 		
 		file.Close();
 		wxRemoveFile(filename);
 	} else {
-		AddLogLineM(true, _("Failed to download the version check file") );
+		AddLogLineC(_("Failed to download the version check file"));
 	}	
 	
 }
 
 
-bool CamuleApp::IsConnected()
+bool CamuleApp::IsConnected() const
 {
 	return (IsConnectedED2K() || IsConnectedKad());
 }
 
 
-bool CamuleApp::IsConnectedED2K()
+bool CamuleApp::IsConnectedED2K() const
 {
 	return serverconnect && serverconnect->IsConnected();
 }
 
 
-bool CamuleApp::IsConnectedKad()
+bool CamuleApp::IsConnectedKad() const
 {
 	return Kademlia::CKademlia::IsConnected(); 
 }
 
 
-bool CamuleApp::IsFirewalled()
+bool CamuleApp::IsFirewalled() const
 {
 	if (theApp->IsConnectedED2K() && !theApp->serverconnect->IsLowID()) {
 		return false; // we have an eD2K HighID -> not firewalled
@@ -1952,31 +1657,93 @@
 	return IsFirewalledKad(); // If kad says ok, it's ok.
 }
 
-bool CamuleApp::IsFirewalledKad()
+bool CamuleApp::IsFirewalledKad() const
 {
-	if (Kademlia::CKademlia::IsConnected() && !Kademlia::CKademlia::IsFirewalled()) {
-		return false; // we have an Kad HighID -> not firewalled
-	}
+	return !Kademlia::CKademlia::IsConnected()		// not connected counts as firewalled
+			|| Kademlia::CKademlia::IsFirewalled();
+}
 
-	return true; // firewalled	
+bool CamuleApp::IsFirewalledKadUDP() const
+{
+	return !Kademlia::CKademlia::IsConnected()		// not connected counts as firewalled
+			|| Kademlia::CUDPFirewallTester::IsFirewalledUDP(true);
 }
 
-bool CamuleApp::IsKadRunning()
+bool CamuleApp::IsKadRunning() const
 {
 	return Kademlia::CKademlia::IsRunning();
 }
 
-bool CamuleApp::DoCallback( CUpDownClient *client )
+bool CamuleApp::IsKadRunningInLanMode() const
+{
+	return Kademlia::CKademlia::IsRunningInLANMode();
+}
+
+// Kad stats
+uint32 CamuleApp::GetKadUsers() const
+{
+	return Kademlia::CKademlia::GetKademliaUsers();
+}
+
+uint32 CamuleApp::GetKadFiles() const
+{
+	return Kademlia::CKademlia::GetKademliaFiles();
+}
+
+uint32 CamuleApp::GetKadIndexedSources() const
+{
+	return Kademlia::CKademlia::GetIndexed()->m_totalIndexSource;
+}
+
+uint32 CamuleApp::GetKadIndexedKeywords() const
+{
+	return Kademlia::CKademlia::GetIndexed()->m_totalIndexKeyword;
+}
+
+uint32 CamuleApp::GetKadIndexedNotes() const
 {
-	if(Kademlia::CKademlia::IsConnected()) {
-		if(IsConnectedED2K()) {
-			if(serverconnect->IsLowID()) {
-				if(Kademlia::CKademlia::IsFirewalled()) {
+	return Kademlia::CKademlia::GetIndexed()->m_totalIndexNotes;
+}
+
+uint32 CamuleApp::GetKadIndexedLoad() const
+{
+	return Kademlia::CKademlia::GetIndexed()->m_totalIndexLoad;
+}
+
+
+// True IP of machine
+uint32 CamuleApp::GetKadIPAdress() const
+{
+	return wxUINT32_SWAP_ALWAYS(Kademlia::CKademlia::GetPrefs()->GetIPAddress());
+}
+
+// Buddy status
+uint8	CamuleApp::GetBuddyStatus() const
+{
+	return clientlist->GetBuddyStatus();
+}
+
+uint32	CamuleApp::GetBuddyIP() const
+{
+	return clientlist->GetBuddyIP();
+}
+
+uint32	CamuleApp::GetBuddyPort() const
+{
+	return clientlist->GetBuddyPort();
+}
+
+bool CamuleApp::CanDoCallback(uint32 clientServerIP, uint16 clientServerPort)
+{
+	if (Kademlia::CKademlia::IsConnected()) {
+		if (IsConnectedED2K()) {
+			if (serverconnect->IsLowID()) {
+				if (Kademlia::CKademlia::IsFirewalled()) {
 					//Both Connected - Both Firewalled
 					return false;
 				} else {
-					if(client->GetServerIP() == theApp->serverconnect->GetCurrentServer()->GetIP() &&
-					   client->GetServerPort() == theApp->serverconnect->GetCurrentServer()->GetPort()) {
+					if (clientServerIP == theApp->serverconnect->GetCurrentServer()->GetIP() &&
+					   clientServerPort == theApp->serverconnect->GetCurrentServer()->GetPort()) {
 						// Both Connected - Server lowID, Kad Open - Client on same server
 						// We prevent a callback to the server as this breaks the protocol
 						// and will get you banned.
@@ -1991,7 +1758,7 @@
 				return true;
 			}
 		} else {
-			if(Kademlia::CKademlia::IsFirewalled()) {
+			if (Kademlia::CKademlia::IsFirewalled()) {
 				//Only Kad Connected - Kad Firewalled
 				return false;
 			} else {
@@ -2000,8 +1767,8 @@
 			}
 		}
 	} else {
-		if( IsConnectedED2K() ) {
-			if( serverconnect->IsLowID() ) {
+		if (IsConnectedED2K()) {
+			if (serverconnect->IsLowID()) {
 				//Only Server Connected - Server LowID
 				return false;
 			} else {
@@ -2041,9 +1808,9 @@
 
 void CamuleApp::ListenSocketHandler(wxSocketEvent& event)
 {
-	wxCHECK_RET(listensocket, wxT("Connection-event for NULL'd listen-socket"));
-	wxCHECK_RET(event.GetSocketEvent() == wxSOCKET_CONNECTION,
-		wxT("Invalid event received for listen-socket"));
+	{ wxCHECK_RET(listensocket, wxT("Connection-event for NULL'd listen-socket")); }
+	{ wxCHECK_RET(event.GetSocketEvent() == wxSOCKET_CONNECTION,
+		wxT("Invalid event received for listen-socket")); }
 	
 	if (m_app_state == APP_STATE_RUNNING) {
 		listensocket->OnAccept(0);
@@ -2060,7 +1827,7 @@
 }
 
 
-void CamuleApp::ShowConnectionState()
+void CamuleApp::ShowConnectionState(bool forceUpdate)
 {
 	static uint8 old_state = (1<<7); // This flag doesn't exist
 	
@@ -2082,8 +1849,6 @@
 		}
 	}
 	
-	Notify_ShowConnState(state);
-	
 	if (old_state != state) {
 		// Get the changed value 
 		int changed_flags = old_state ^ state;
@@ -2099,33 +1864,33 @@
 				// We connected to some server
 				const wxString id = theApp->serverconnect->IsLowID() ? _("with LowID") : _("with HighID");
 
-				AddLogLine(CFormat(_("Connected to %s %s")) % connected_server % id);
+				AddLogLineC(CFormat(_("Connected to %s %s")) % connected_server % id);
 			} else {
 				if ( theApp->serverconnect->IsConnecting() ) {
-					AddLogLine(CFormat(_("Connecting to %s")) % connected_server);
+					AddLogLineC(CFormat(_("Connecting to %s")) % connected_server);
 				} else {
-					AddLogLine(_("Disconnected from eD2k"));
+					AddLogLineC(_("Disconnected from eD2k"));
 				}
 			}
 		}
 		
 		if (changed_flags & CONNECTED_KAD_NOT) {
 			if (state & CONNECTED_KAD_NOT) {
-				AddLogLine(_("Kad started."));
+				AddLogLineC(_("Kad started."));
 			} else {
-				AddLogLine(_("Kad stopped."));
+				AddLogLineC(_("Kad stopped."));
 			}
 		}
 		
 		if (changed_flags & (CONNECTED_KAD_OK | CONNECTED_KAD_FIREWALLED)) {
 			if (state & (CONNECTED_KAD_OK | CONNECTED_KAD_FIREWALLED)) {
 				if (state & CONNECTED_KAD_OK) {
-					AddLogLine(_("Connected to Kad (ok)"));
+					AddLogLineC(_("Connected to Kad (ok)"));
 				} else {
-					AddLogLine(_("Connected to Kad (firewalled)"));
+					AddLogLineC(_("Connected to Kad (firewalled)"));
 				}
 			} else {
-				AddLogLine(_("Disconnected from Kad"));
+				AddLogLineC(_("Disconnected from Kad"));
 			}
 		}
 		
@@ -2135,7 +1900,7 @@
 	}
 	
 	ShowUserCount();
-	Notify_ShowConnState(state);
+	Notify_ShowConnState(forceUpdate);
 }
 
 
@@ -2168,7 +1933,7 @@
 			break;
 
 		default:
-			wxASSERT(0);
+			wxFAIL;
 			break;
 	}
 }
@@ -2186,12 +1951,16 @@
 	if (!Kademlia::CKademlia::IsRunning() && thePrefs::GetNetworkKademlia()) {
 		// Kad makes no sense without the Client-UDP socket.
 		if (!thePrefs::IsUDPDisabled()) {
-			Kademlia::CKademlia::Start();
+			if (ipfilter->IsReady()) {
+				Kademlia::CKademlia::Start();
+			} else {
+				ipfilter->StartKADWhenReady();
+			}
 		} else {
-			AddLogLineM(true,_("Kad network cannot be used if UDP port is disabled on preferences, not starting."));
+			AddLogLineC(_("Kad network cannot be used if UDP port is disabled on preferences, not starting."));
 		}
 	} else if (!thePrefs::GetNetworkKademlia()) {
-		AddLogLineM(true,_("Kad network disabled on preferences, not connecting."));
+		AddLogLineC(_("Kad network disabled on preferences, not connecting."));
 	}
 }
 
@@ -2211,7 +1980,7 @@
 		theApp->ShowConnectionState();
 	}
 	
-	Kademlia::CKademlia::Bootstrap(ip, port, true);
+	Kademlia::CKademlia::Bootstrap(ip, port);
 }
 
 
@@ -2219,7 +1988,7 @@
 {
 	wxString strTempFilename(theApp->ConfigDir + wxT("nodes.dat.download"));
 		
-	CHTTPDownloadThread *downloader = new CHTTPDownloadThread(url, strTempFilename, HTTP_NodesDat);
+	CHTTPDownloadThread *downloader = new CHTTPDownloadThread(url, strTempFilename, theApp->ConfigDir + wxT("nodes.dat"), HTTP_NodesDat, true, false);
 	downloader->Create();
 	downloader->Run();
 }

aMule-2.2.6.tar.bz2/src/amule.h -> aMule-2.3.1.tar.bz2/src/amule.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -17,7 +17,7 @@
 // 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
@@ -33,10 +33,10 @@
 
 
 #include "Types.h"		// Needed for int32, uint16 and uint64
+#include <map>
 #ifndef __WXMSW__
-	#include <map>
 	#include <signal.h>
-	#include <wx/unix/execute.h>
+//	#include <wx/unix/execute.h>
 #endif // __WXMSW__
 
 
@@ -56,6 +56,7 @@
 class CListenSocket;
 class CClientList;
 class CKnownFileList;
+class CCanceledFileList;
 class CSearchList;
 class CClientCreditsList;
 class CFriendList;
@@ -69,8 +70,8 @@
 class CStatistics;
 class wxSocketEvent;
 class wxCommandEvent;
+class wxCloseEvent;
 class wxFFileOutputStream;
-class CUpDownClient;
 class CTimer;
 class CTimerEvent;
 class wxSingleInstanceChecker;
@@ -104,7 +105,59 @@
 #define CONNECTED_KAD_FIREWALLED (1<<3)
 
 
-class CamuleApp : public AMULE_APP_BASE
+// Base class common to amule, aamuled and amulegui
+class CamuleAppCommon
+{
+private:
+	// Used to detect a previous running instance of aMule
+	wxSingleInstanceChecker*	m_singleInstance;
+
+	bool		CheckPassedLink(const wxString &in, wxString &out, int cat);
+protected:
+	char		*strFullMuleVersion;
+	char		*strOSDescription;
+	wxString	OSType;
+	bool		enable_daemon_fork;
+	bool		ec_config;
+	bool		m_skipConnectionDialog;
+	bool		m_geometryEnabled;
+	wxString	m_geometryString;
+	wxString	m_logFile;
+	wxString	m_appName;
+	wxString	m_PidFile;
+
+	bool		InitCommon(int argc, wxChar ** argv);
+	void		RefreshSingleInstanceChecker();
+	bool		CheckMuleDirectory(const wxString& desc, const class CPath& directory, const wxString& alternative, class CPath& outDir);
+public:
+	wxString	ConfigDir;
+	wxString	m_configFile;
+
+	CamuleAppCommon();
+	~CamuleAppCommon();
+	void		AddLinksFromFile();
+	// URL functions
+	wxString	CreateMagnetLink(const CAbstractFile *f);
+	wxString	CreateED2kLink(const CAbstractFile* f, bool add_source = false, bool use_hostname = false, bool addcryptoptions = false);
+	wxString	CreateED2kAICHLink(const CKnownFile* f);
+	// Who am I ?
+#ifdef AMULE_DAEMON
+	bool		IsDaemon() const { return true; }
+#else
+	bool		IsDaemon() const { return false; }
+#endif
+
+#ifdef CLIENT_GUI
+	bool		IsRemoteGui() const { return true; }
+#else
+	bool		IsRemoteGui() const { return false; }
+#endif
+
+	const wxString&	GetMuleAppName() const { return m_appName; }
+	const wxString	GetFullMuleVersion() const;
+};
+
+class CamuleApp : public AMULE_APP_BASE, public CamuleAppCommon
 {
 private:
 	enum APPState {
@@ -119,7 +172,9 @@
 
 	virtual bool	OnInit();
 	int		OnExit();
+#if wxUSE_ON_FATAL_EXCEPTION
 	void		OnFatalException();
+#endif
 	bool		ReinitializeNetwork(wxString *msg);
 
 	// derived classes may override those
@@ -130,33 +185,45 @@
 	void ServerSocketHandler(wxSocketEvent& event);
 	void UDPSocketHandler(wxSocketEvent& event);
 
-	virtual void ShowAlert(wxString msg, wxString title, int flags) = 0;
+	virtual int ShowAlert(wxString msg, wxString title, int flags) = 0;
 
 	// Barry - To find out if app is running or shutting/shut down
 	bool IsRunning() const { return (m_app_state == APP_STATE_RUNNING); }
 	bool IsOnShutDown() const { return (m_app_state == APP_STATE_SHUTTINGDOWN); }
 
 	// Check ED2K and Kademlia state
-	bool IsFirewalled();
-	// Check Kad state
-	bool IsFirewalledKad();
-	// Check if we should callback this client
-	bool DoCallback( CUpDownClient *client );
-
-	// Connection to ED2K
-	bool IsConnectedED2K();
-	// Connection to Kad
-	bool IsConnectedKad();
+	bool IsFirewalled() const;
 	// Are we connected to at least one network?
-	bool IsConnected();
+	bool IsConnected() const;
+	// Connection to ED2K
+	bool IsConnectedED2K() const;
 
 	// What about Kad? Is it running?
-	bool IsKadRunning();
+	bool IsKadRunning() const;
+	// Connection to Kad
+	bool IsConnectedKad() const;
+	// Check Kad state (TCP)
+	bool IsFirewalledKad() const;
+	// Check Kad state (UDP)
+	bool IsFirewalledKadUDP() const;
+	// Check Kad state (LAN mode)
+	bool IsKadRunningInLanMode() const;
+	// Kad stats
+	uint32	GetKadUsers() const;
+	uint32	GetKadFiles() const;
+	uint32	GetKadIndexedSources() const;
+	uint32	GetKadIndexedKeywords() const;
+	uint32	GetKadIndexedNotes() const;
+	uint32	GetKadIndexedLoad() const;
+	// True IP of machine
+	uint32	GetKadIPAdress() const;
+	// Buddy status
+	uint8	GetBuddyStatus() const;
+	uint32	GetBuddyIP() const;
+	uint32	GetBuddyPort() const;
 
-	// URL functions
-	wxString	CreateMagnetLink(const CAbstractFile *f);
-	wxString	CreateED2kLink(const CAbstractFile* f, bool add_source = false, bool use_hostname = false, bool addcryptoptions = false);	
-	wxString	CreateED2kAICHLink(const CKnownFile* f);
+	// Check if we should callback this client
+	bool CanDoCallback(uint32 clientServerIP, uint16 clientServerPort);
 
 	// Misc functions
 	void		OnlineSig(bool zero = false);
@@ -168,11 +235,11 @@
 
 	// return current (valid) public IP or 0 if unknown
 	// If ignorelocal is true, don't use m_localip
-	uint32	GetPublicIP(bool ignorelocal = false) const; 
+	uint32	GetPublicIP(bool ignorelocal = false) const;
 	void		SetPublicIP(const uint32 dwIP);
-	
+
 	uint32	GetED2KID() const;
-	uint32	GetID() const;	
+	uint32	GetID() const;
 
 	// Other parts of the interface and such
 	CPreferences*		glob_prefs;
@@ -184,6 +251,7 @@
 	CListenSocket*		listensocket;
 	CClientList*		clientlist;
 	CKnownFileList*		knownfiles;
+	CCanceledFileList*	canceledfiles;
 	CSearchList*		searchlist;
 	CClientCreditsList*	clientcredits;
 	CFriendList*		friendlist;
@@ -210,15 +278,11 @@
 #endif
 	void SetOSFiles(const wxString new_path);
 
-	wxString ConfigDir;
-
-	void AddLogLine(const wxString &msg);
-
 	const wxString& GetOSType() const { return OSType; }
 
 	void ShowUserCount();
 
-	void ShowConnectionState();
+	void ShowConnectionState(bool forceUpdate = false);
 
 	void StartKad();
 	void StopKad();
@@ -230,15 +294,11 @@
 
 
 	void DisconnectED2K();
-	
+
 	bool CryptoAvailable() const;
-	
-	//! TODO: Move to CLogger
-	wxFFileOutputStream* applog;
+
 protected:
-	// Used to detect a previous running instance of aMule
-	wxSingleInstanceChecker*	m_singleInstance;
-	
+
 #ifdef __WXDEBUG__
 	/**
 	 * Handles asserts in a thread-safe manner.
@@ -247,19 +307,6 @@
 		const wxChar* func, const wxChar* cond, const wxChar* msg);
 #endif
 
-	/**
-	 * This class is used to contain log messages that are to be displayed
-	 * on the GUI, when it is currently impossible to do so. This is in order
-	 * to allows us to queue messages till after the dialog has been created.
-	 */
-	struct QueuedLogLine
-	{
-		//! The text line to be displayed
-		wxString 	line;
-		//! True if the line should be shown on the status bar, false otherwise.
-		bool		show;
-	};
-
 	void OnUDPDnsDone(CMuleInternalEvent& evt);
 	void OnSourceDnsDone(CMuleInternalEvent& evt);
 	void OnServerDnsDone(CMuleInternalEvent& evt);
@@ -277,23 +324,15 @@
 
 	void SetTimeOnTransfer();
 
-	std::list<QueuedLogLine> m_logLines;
-
 	APPState m_app_state;
 
 	wxString m_emulesig_path;
 	wxString m_amulesig_path;
 
-	char *strFullMuleVersion;
-	char *strOSDescription;
-	wxString OSType;
-
 	uint32 m_dwPublicIP;
 
 	long webserver_pid;
 
-	bool enable_stdout_log;
-	bool enable_daemon_fork;
 	wxString server_msg;
 
 	CTimer* core_timer;
@@ -317,12 +356,22 @@
 
 	wxString	m_FrameTitle;
 	CamuleDlg*	amuledlg;
-	int m_FileDetailDialogActive;
+	int		m_FileDetailDialogActive;
 
 	bool CopyTextToClipboard( wxString strText );
+	void ResetTitle();
 
 	virtual int InitGui(bool geometry_enable, wxString &geometry_string);
-	virtual void ShowAlert(wxString msg, wxString title, int flags);
+	virtual int ShowAlert(wxString msg, wxString title, int flags);
+
+	void AddGuiLogLine(const wxString& line);
+protected:
+	/**
+	 * This list is used to contain log messages that are to be displayed
+	 * on the GUI, when it is currently impossible to do so. This is in order
+	 * to allows us to queue messages till after the dialog has been created.
+	 */
+	std::list<wxString> m_logLines;
 };
 
 
@@ -336,13 +385,12 @@
 
 	int OnExit();
 	bool OnInit();
-	
+
 public:
 
-	virtual void ShowAlert(wxString msg, wxString title, int flags);
+	virtual int ShowAlert(wxString msg, wxString title, int flags);
 
 	void ShutDown(wxCloseEvent &evt);
-	void OnLoggingEvent(CLoggingEvent& evt);
 
 	wxString GetLog(bool reset = false);
 	wxString GetServerLog(bool reset = false);
@@ -352,11 +400,7 @@
 
 
 DECLARE_APP(CamuleGuiApp)
-#ifdef AMULE_CPP
-	CamuleGuiApp *theApp;
-#else
-	extern CamuleGuiApp *theApp;
-#endif
+extern CamuleGuiApp *theApp;
 
 
 #else /* !CLIENT_GUI */
@@ -373,11 +417,24 @@
 
 #else /* ! AMULE_DAEMON */
 
+// wxWidgets 2.8 requires special code for event handling and sockets.
+// 2.9 doesn't, so standard event loop and sockets can be used
+//
+// Windows: aMuled compiles with 2.8 (without the special code),
+// but works only with 2.9
+
+#if !wxCHECK_VERSION(2, 9, 0)
+	#ifdef __WXMSW__
+		// MSW: can't run amuled with 2.8 anyway, just get it compiled
+		#define AMULED_DUMMY
+	#else
+		#define AMULED28
+	#endif
+#endif
 
-#include <wx/apptrait.h>
+#ifdef AMULED28
 #include <wx/socket.h>
 
-
 class CSocketSet;
 
 
@@ -406,20 +463,25 @@
 };
 
 
-typedef std::map<int, wxEndProcessData *> EndProcessDataMap;
+#endif // AMULED28
+
+// no AppTraits used on Windows
+#ifndef __WXMSW__
+
+typedef std::map<int, class wxEndProcessData *> EndProcessDataMap;
 
+#include <wx/apptrait.h>
 
 class CDaemonAppTraits : public wxConsoleAppTraits
 {
 private:
-	CAmuledGSocketFuncTable *m_table;
-	wxMutex m_lock;
-	std::list<wxObject *> m_sched_delete;
-#ifndef __WXMSW__
 	struct sigaction m_oldSignalChildAction;
 	struct sigaction m_newSignalChildAction;
-#endif
 
+#ifdef AMULED28
+	CAmuledGSocketFuncTable *m_table;
+	wxMutex m_lock;
+	std::list<wxObject *> m_sched_delete;
 public:
 	CDaemonAppTraits(CAmuledGSocketFuncTable *table);
 	virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
@@ -427,60 +489,64 @@
 	virtual void RemoveFromPendingDelete(wxObject *object);
 
 	void DeletePending();
+#else	// AMULED28
+public:
+	CDaemonAppTraits();
+#endif	// !AMULED28
 
-#ifndef __WXMSW__
 	virtual int WaitForChild(wxExecuteData& execData);
-#endif
-#ifdef __WXMAC__
+
+#if defined(__WXMAC__) && !wxCHECK_VERSION(2, 9, 0)
 	virtual wxStandardPathsBase& GetStandardPaths();
 #endif
 };
 
-
-#ifndef __WXMSW__
-	void OnSignalChildHandler(int signal, siginfo_t *siginfo, void *ucontext);
-	pid_t AmuleWaitPid(pid_t pid, int *status, int options, wxString *msg);
+void OnSignalChildHandler(int signal, siginfo_t *siginfo, void *ucontext);
+pid_t AmuleWaitPid(pid_t pid, int *status, int options, wxString *msg);
 #endif // __WXMSW__
 
 
 class CamuleDaemonApp : public CamuleApp
 {
 private:
+#ifdef AMULED28
 	bool m_Exit;
 	CAmuledGSocketFuncTable *m_table;
-#ifndef __WXMSW__
-	struct sigaction m_oldSignalChildAction;
-	struct sigaction m_newSignalChildAction;
-#endif // __WXMSW__
-
+#endif
 	bool OnInit();
 	int OnRun();
 	int OnExit();
 
 	virtual int InitGui(bool geometry_enable, wxString &geometry_string);
-	
+
+#ifndef __WXMSW__
+	struct sigaction m_oldSignalChildAction;
+	struct sigaction m_newSignalChildAction;
+public:
+	wxAppTraits *CreateTraits();
+#endif // __WXMSW__
+
 public:
+
+#ifdef AMULED28
 	CamuleDaemonApp();
-	
+
 	void ExitMainLoop() { m_Exit = true; }
-	
+#endif
+
+#ifdef AMULED_DUMMY
+	void ExitMainLoop() {}
+#endif
+
 	bool CopyTextToClipboard(wxString strText);
-	
-	virtual void ShowAlert(wxString msg, wxString title, int flags);
-	
-	void OnLoggingEvent(CLoggingEvent& evt);
-	
+
+	virtual int ShowAlert(wxString msg, wxString title, int flags);
+
 	DECLARE_EVENT_TABLE()
-	
-	wxAppTraits *CreateTraits();
 };
 
 DECLARE_APP(CamuleDaemonApp)
-#ifdef AMULE_CPP
-	CamuleDaemonApp *theApp;
-#else
-	extern CamuleDaemonApp *theApp;
-#endif
+extern CamuleDaemonApp *theApp;
 
 #endif /* ! AMULE_DAEMON */

aMule-2.3.1.tar.bz2/src/amuleAppCommon.cpp Added

@@ -0,0 +1,547 @@
+//
+// 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
+//
+
+//
+// This file is for functions common to all three apps (amule, amuled, amulegui),
+// but preprocessor-dependent (using theApp, thePrefs), so it is compiled seperately for each app.
+//
+
+
+#include <wx/wx.h>
+#include <wx/cmdline.h>			// Needed for wxCmdLineParser
+#include <wx/snglinst.h>		// Needed for wxSingleInstanceChecker
+#include <wx/textfile.h>		// Needed for wxTextFile
+#include <wx/config.h>			// Do_not_auto_remove (win32)
+#include <wx/fileconf.h>
+
+#include "amule.h"				// Interface declarations.
+#include <common/Format.h>		// Needed for CFormat
+#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_*
+#include "KnownFile.h"
+#include "Logger.h"
+#include "MagnetURI.h"			// Needed for CMagnetURI
+#include "Preferences.h"
+#include "ScopedPtr.h"
+
+#ifndef CLIENT_GUI
+#include "DownloadQueue.h"
+#endif
+
+CamuleAppCommon::CamuleAppCommon()
+{
+	m_singleInstance = NULL;
+	ec_config = false;
+	m_geometryEnabled = false;
+	if (IsRemoteGui()) {
+		m_appName		= wxT("aMuleGUI");
+		m_configFile	= wxT("remote.conf");
+		m_logFile		= wxT("remotelogfile");
+	} else {
+		m_configFile	= wxT("amule.conf");
+		m_logFile		= wxT("logfile");
+
+		if (IsDaemon()) {
+			m_appName	= wxT("aMuleD");
+		} else {
+			m_appName	= wxT("aMule");
+		}
+	}
+}
+
+CamuleAppCommon::~CamuleAppCommon()
+{
+#if defined(__WXMAC__) && defined(AMULE_DAEMON)
+	//#warning TODO: fix wxSingleInstanceChecker for amuled on Mac (wx link problems)
+#else
+	delete m_singleInstance;
+#endif
+}
+
+void CamuleAppCommon::RefreshSingleInstanceChecker()
+{
+#if defined(__WXMAC__) && defined(AMULE_DAEMON)
+	//#warning TODO: fix wxSingleInstanceChecker for amuled on Mac (wx link problems)
+#else
+	delete m_singleInstance;
+	m_singleInstance = new wxSingleInstanceChecker(wxT("muleLock"), ConfigDir);
+#endif
+}
+
+void CamuleAppCommon::AddLinksFromFile()
+{
+	const wxString fullPath = ConfigDir + wxT("ED2KLinks");
+	if (!wxFile::Exists(fullPath)) {
+		return;
+	}
+	
+	// Attempt to lock the ED2KLinks file.
+	CFileLock lock((const char*)unicode2char(fullPath));
+
+	wxTextFile file(fullPath);
+	if ( file.Open() ) {
+		for ( unsigned int i = 0; i < file.GetLineCount(); i++ ) {
+			wxString line = file.GetLine( i ).Strip( wxString::both );
+			
+			if ( !line.IsEmpty() ) {
+				// Special case! used by a secondary running mule to raise this one.
+				if (line == wxT("RAISE_DIALOG")) {
+					Notify_ShowGUI();
+					continue;
+				}
+				unsigned long category = 0;
+				if (line.AfterLast(wxT(':')).ToULong(&category) == true) {
+					line = line.BeforeLast(wxT(':'));
+				} else { // If ToULong returns false the category still can have been changed!
+						 // This is fixed in wx 2.9
+					category = 0;
+				}
+				theApp->downloadqueue->AddLink(line, category);
+			}
+		}
+
+		file.Close();
+	} else {
+		AddLogLineNS(_("Failed to open ED2KLinks file."));
+	}
+	
+	// Delete the file.
+	wxRemoveFile(theApp->ConfigDir + wxT("ED2KLinks"));
+}
+
+
+// Returns a magnet ed2k URI
+wxString CamuleAppCommon::CreateMagnetLink(const CAbstractFile *f)
+{
+	CMagnetURI uri;
+
+	uri.AddField(wxT("dn"), f->GetFileName().Cleanup(false).GetPrintable());
+	uri.AddField(wxT("xt"), wxString(wxT("urn:ed2k:")) + f->GetFileHash().Encode().Lower());
+	uri.AddField(wxT("xt"), wxString(wxT("urn:ed2khash:")) + f->GetFileHash().Encode().Lower());
+	uri.AddField(wxT("xl"), CFormat(wxT("%d")) % f->GetFileSize());
+
+	return uri.GetLink();
+}
+
+// Returns a ed2k file URL
+wxString CamuleAppCommon::CreateED2kLink(const CAbstractFile *f, bool add_source, bool use_hostname, bool addcryptoptions)
+{
+	wxASSERT(!(!add_source && (use_hostname || addcryptoptions)));
+	// Construct URL like this: ed2k://|file|<filename>|<size>|<hash>|/
+	wxString strURL = CFormat(wxT("ed2k://|file|%s|%i|%s|/"))
+		% f->GetFileName().Cleanup(false)
+		% f->GetFileSize() % f->GetFileHash().Encode();
+	
+	if (add_source && theApp->IsConnected() && !theApp->IsFirewalled()) {
+		// Create the first part of the URL
+		strURL << wxT("|sources,");
+		if (use_hostname) {
+			strURL << thePrefs::GetYourHostname();
+		} else {
+			uint32 clientID = theApp->GetID();
+			strURL = CFormat(wxT("%s%u.%u.%u.%u"))
+				% strURL
+				% (clientID & 0xff)
+				% ((clientID >> 8) & 0xff)
+				% ((clientID >> 16) & 0xff)
+				% ((clientID >> 24) & 0xff);
+		}
+		
+ 		strURL << wxT(":") <<
+			thePrefs::GetPort();
+		
+		if (addcryptoptions) {
+			uint8 uSupportsCryptLayer = thePrefs::IsClientCryptLayerSupported() ? 1 : 0;
+			uint8 uRequestsCryptLayer = thePrefs::IsClientCryptLayerRequested() ? 1 : 0;
+			uint8 uRequiresCryptLayer = thePrefs::IsClientCryptLayerRequired() ? 1 : 0;
+			uint16 byCryptOptions = (uRequiresCryptLayer << 2) | (uRequestsCryptLayer << 1) | (uSupportsCryptLayer << 0) | (uSupportsCryptLayer ? 0x80 : 0x00);
+			
+			strURL << wxT(":") << byCryptOptions;
+			
+			if (byCryptOptions & 0x80) {
+				strURL << wxT(":") << thePrefs::GetUserHash().Encode();
+			}
+		}
+		strURL << wxT("|/");
+	} else if (add_source) {
+		AddLogLineC(_("WARNING: You can't add yourself as a source for an eD2k link while having a lowid."));
+	}
+
+	// Result is "ed2k://|file|<filename>|<size>|<hash>|/|sources,[(<ip>|<hostname>):<port>[:cryptoptions[:hash]]]|/"
+	return strURL;
+}
+
+// Returns a ed2k link with AICH info if available
+wxString CamuleAppCommon::CreateED2kAICHLink(const CKnownFile* f)
+{
+	// Create the first part of the URL
+	wxString strURL = CreateED2kLink(f);
+	// Append the AICH info
+	if (f->HasProperAICHHashSet()) {
+		strURL.RemoveLast();		// remove trailing '/'
+		strURL << wxT("h=") << f->GetAICHMasterHash() << wxT("|/");
+	}	
+
+	// Result is "ed2k://|file|<filename>|<size>|<hash>|h=<AICH master hash>|/"
+	return strURL;
+}
+
+bool CamuleAppCommon::InitCommon(int argc, wxChar ** argv)
+{
+	theApp->SetAppName(wxT("aMule"));
+	wxString FullMuleVersion = GetFullMuleVersion();
+	wxString OSDescription = wxGetOsDescription();
+	strFullMuleVersion = strdup((const char *)unicode2char(FullMuleVersion));
+	strOSDescription = strdup((const char *)unicode2char(OSDescription));
+	OSType = OSDescription.BeforeFirst( wxT(' ') );
+	if ( OSType.IsEmpty() ) {
+		OSType = wxT("Unknown");
+	}
+
+	// Parse cmdline arguments.
+	wxCmdLineParser cmdline(argc, argv);
+
+	// Handle these arguments.
+	cmdline.AddSwitch(wxT("v"), wxT("version"), wxT("Displays the current version number."));
+	cmdline.AddSwitch(wxT("h"), wxT("help"), wxT("Displays this information."));
+	cmdline.AddOption(wxT("c"), wxT("config-dir"), wxT("read config from <dir> instead of home"));
+#ifdef AMULE_DAEMON
+	cmdline.AddSwitch(wxT("f"), wxT("full-daemon"), wxT("Fork to background."));
+	cmdline.AddOption(wxT("p"), wxT("pid-file"), wxT("After fork, create a pid-file in the given fullname file."));
+	cmdline.AddSwitch(wxT("e"), wxT("ec-config"), wxT("Configure EC (External Connections)."));
+#else
+
+#ifdef __WXMSW__
+	// MSW shows help otions in a dialog box, and the formatting doesn't fit there
+#define HELPTAB wxT("\t")
+#else
+#define HELPTAB wxT("\t\t\t")
+#endif
+
+	cmdline.AddOption(wxT("geometry"), wxEmptyString,
+			wxT("Sets the geometry of the app.\n")
+			HELPTAB wxT("<str> uses the same format as standard X11 apps:\n")
+			HELPTAB wxT("[=][<width>{xX}<height>][{+-}<xoffset>{+-}<yoffset>]"));
+#endif // !AMULE_DAEMON
+
+	cmdline.AddSwitch(wxT("o"), wxT("log-stdout"), wxT("Print log messages to stdout."));
+	cmdline.AddSwitch(wxT("r"), wxT("reset-config"), wxT("Resets config to default values."));
+
+#ifdef CLIENT_GUI
+	cmdline.AddSwitch(wxT("s"), wxT("skip"), wxT("Skip connection dialog."));
+#else
+	// 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 __WXMSW__
+	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."));
+#endif
+
+	// Allow passing of links to the app
+	cmdline.AddOption(wxT("t"), wxT("category"), wxT("Set category for passed ED2K links."), wxCMD_LINE_VAL_NUMBER);
+	cmdline.AddParam(wxT("ED2K link"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE);
+
+	// wx asserts in debug mode if there is a check for an option that wasn't added.
+	// So we have to wrap around the same #ifdefs as above. >:(
+
+	// Show help on --help or invalid commands
+	if ( cmdline.Parse() ) {
+		return false;		
+	} else if (cmdline.Found(wxT("help"))) {
+		cmdline.Usage();
+		return false;
+	}	
+
+	if ( cmdline.Found(wxT("version"))) {
+		// This looks silly with logging macros that add a timestamp.
+		printf("%s\n", (const char*)unicode2char(wxString(CFormat(wxT("%s (OS: %s)")) % FullMuleVersion % OSType)));
+		return false;
+	}
+	
+	if ( cmdline.Found(wxT("config-dir"), &ConfigDir) ) {
+		// Make an absolute path from the config dir
+		wxFileName fn(ConfigDir);
+		fn.MakeAbsolute();
+		ConfigDir = fn.GetFullPath();
+		if (ConfigDir.Last() != wxFileName::GetPathSeparator()) {
+			ConfigDir += wxFileName::GetPathSeparator();
+		}
+	} else {
+		ConfigDir = GetConfigDir();
+	}
+
+#ifndef __WXMSW__
+	#if wxUSE_ON_FATAL_EXCEPTION
+		if ( !cmdline.Found(wxT("disable-fatal")) ) {
+			// catch fatal exceptions
+			wxHandleFatalExceptions(true);
+		}
+	#endif
+#endif
+
+	theLogger.SetEnabledStdoutLog(cmdline.Found(wxT("log-stdout")));
+#ifdef AMULE_DAEMON		
+	enable_daemon_fork = cmdline.Found(wxT("full-daemon"));
+	if ( cmdline.Found(wxT("pid-file"), &m_PidFile) ) {
+		// Remove any existing PidFile
+		if ( wxFileExists (m_PidFile) ) wxRemoveFile (m_PidFile);
+	}
+	ec_config = cmdline.Found(wxT("ec-config"));
+#else
+	enable_daemon_fork = false;
+
+	// Default geometry of the GUI. Can be changed with a cmdline argument...
+	if ( cmdline.Found(wxT("geometry"), &m_geometryString) ) {
+		m_geometryEnabled = true;
+	}
+#endif
+
+	if (theLogger.IsEnabledStdoutLog()) {
+		if ( enable_daemon_fork ) {
+			AddLogLineNS(wxT("Daemon will fork to background - log to stdout disabled"));	// localization not active yet
+			theLogger.SetEnabledStdoutLog(false);
+		} else {
+			AddLogLineNS(wxT("Logging to stdout enabled"));
+		}
+	}
+	
+	AddLogLineNS(wxT("Initialising ") + FullMuleVersion);
+
+	// Ensure that "~/.aMule/" is accessible.
+	CPath outDir;
+	if (!CheckMuleDirectory(wxT("configuration"), CPath(ConfigDir), wxEmptyString, outDir)) {
+		return false;
+	}
+	
+	if (cmdline.Found(wxT("reset-config"))) {
+		// Make a backup first.
+		wxRemoveFile(ConfigDir + m_configFile + wxT(".backup"));
+		wxRenameFile(ConfigDir + m_configFile, ConfigDir + m_configFile + wxT(".backup"));
+		AddLogLineNS(CFormat(wxT("Your settings have been reset to default values.\nThe old config file has been saved as %s.backup\n")) % m_configFile);
+	}
+
+	size_t linksPassed = cmdline.GetParamCount();	// number of links from the command line
+	int linksActuallyPassed = 0;					// number of links that pass the syntax check
+	if (linksPassed) {
+		long cat = 0;
+		if (!cmdline.Found(wxT("t"), &cat)) {
+			cat = 0;
+		}
+
+		wxTextFile ed2kFile(ConfigDir + wxT("ED2KLinks"));
+		if (!ed2kFile.Exists()) {
+			ed2kFile.Create();
+		}
+		if (ed2kFile.Open()) {
+			for (size_t i = 0; i < linksPassed; i++) {
+				wxString link;
+				if (CheckPassedLink(cmdline.GetParam(i), link, cat)) {
+					ed2kFile.AddLine(link);
+					linksActuallyPassed++;
+				}
+			}
+			ed2kFile.Write();
+		} else {
+			AddLogLineCS(wxT("Failed to open 'ED2KLinks', cannot add links."));
+		}
+	}
+	
+#if defined(__WXMAC__) && defined(AMULE_DAEMON)
+	//#warning TODO: fix wxSingleInstanceChecker for amuled on Mac (wx link problems)
+	AddLogLineCS(wxT("WARNING: The check for other instances is currently disabled in amuled.\n"
+		"Please make sure that no other instance of aMule is running or your files might be corrupted.\n"));
+#else
+	AddLogLineNS(wxT("Checking if there is an instance already running..."));
+
+	m_singleInstance = new wxSingleInstanceChecker();
+	wxString lockfile = IsRemoteGui() ? wxT("muleLockRGUI") : wxT("muleLock");
+	if (m_singleInstance->Create(lockfile, ConfigDir)
+		&& m_singleInstance->IsAnotherRunning()) {
+		AddLogLineCS(CFormat(wxT("There is an instance of %s already running")) % m_appName);
+		AddLogLineNS(CFormat(wxT("(lock file: %s%s)")) % ConfigDir % lockfile);
+		if (linksPassed) {
+			AddLogLineNS(CFormat(wxT("passed %d %s to it, finished")) % linksActuallyPassed 
+				% (linksPassed == 1 ? wxT("link") : wxT("links")));
+			return false;
+		}
+		
+		// This is very tricky. The most secure way to communicate is via ED2K links file
+		wxTextFile ed2kFile(ConfigDir + wxT("ED2KLinks"));
+		if (!ed2kFile.Exists()) {
+			ed2kFile.Create();
+		}
+			
+		if (ed2kFile.Open()) {
+			ed2kFile.AddLine(wxT("RAISE_DIALOG"));
+			ed2kFile.Write();
+			
+			AddLogLineNS(wxT("Raising current running instance."));
+		} else {
+			AddLogLineCS(wxT("Failed to open 'ED2KFile', cannot signal running instance."));
+		}
+			
+		return false;
+	} else {
+		AddLogLineNS(wxT("No other instances are running."));
+	}
+#endif
+
+#ifndef __WXMSW__
+	// Close standard-input
+	if ( !cmdline.Found(wxT("enable-stdin")) ) 	{
+		// The full daemon will close all std file-descriptors by itself,
+		// so closing it here would lead to the closing on the first open
+		// file, which is the logfile opened below
+		if (!enable_daemon_fork) {
+			close(0);
+		}
+	}
+#endif
+
+	// Create the CFG file we shall use and set the config object as the global cfg file
+	wxConfig::Set(new wxFileConfig( wxEmptyString, wxEmptyString, ConfigDir + m_configFile));
+	
+	// Make a backup of the log file
+	CPath logfileName = CPath(ConfigDir + m_logFile);
+	if (logfileName.FileExists()) {
+		CPath::BackupFile(logfileName, wxT(".bak"));
+	}
+
+	// Open the log file
+	if (!theLogger.OpenLogfile(logfileName.GetRaw())) {
+		// use std err as last resolt to indicate problem
+		fputs("ERROR: unable to open log file\n", stderr);
+		// failure to open log is serious problem
+		return false;
+	}
+
+	// Load Preferences
+	CPreferences::BuildItemList(ConfigDir);
+	CPreferences::LoadAllItems( wxConfigBase::Get() );
+
+#ifdef CLIENT_GUI
+	m_skipConnectionDialog = cmdline.Found(wxT("skip"));
+#else
+	wxString amulewebPath;
+	if (cmdline.Found(wxT("use-amuleweb"), &amulewebPath)) {
+		thePrefs::SetWSPath(amulewebPath);
+		AddLogLineNS(CFormat(wxT("Using amuleweb in '%s'.")) % amulewebPath);
+	}
+#endif
+
+	return true;
+}
+
+/**
+ * Returns a description of the version of aMule being used.
+ *
+ * @return A detailed description of the aMule version, including application
+ *         name and wx information.
+ */
+const wxString CamuleAppCommon::GetFullMuleVersion() const
+{
+	return GetMuleAppName() + wxT(" ") + GetMuleVersion();
+}
+
+bool CamuleAppCommon::CheckPassedLink(const wxString &in, wxString &out, int cat)
+{
+	wxString link(in);
+
+	// restore ASCII-encoded pipes
+	link.Replace(wxT("%7C"), wxT("|"));
+	link.Replace(wxT("%7c"), wxT("|"));
+
+	if (link.compare(0, 7, wxT("magnet:")) == 0) {
+		link = CMagnetED2KConverter(link);
+		if (link.empty()) {
+			AddLogLineCS(CFormat(wxT("Cannot convert magnet link to eD2k: %s")) % in);
+			return false;
+		}
+	}
+
+	try {
+		CScopedPtr<CED2KLink> uri(CED2KLink::CreateLinkFromUrl(link));
+		out = uri.get()->GetLink();
+		if (cat && uri.get()->GetKind() == CED2KLink::kFile) {
+			out += CFormat(wxT(":%d")) % cat;
+		}
+		return true;
+	} catch ( const wxString& err ) {
+		AddLogLineCS(CFormat(wxT("Invalid eD2k link \"%s\" - ERROR: %s")) % link % err);
+	}
+	return false;
+}
+
+
+/**
+ * Checks permissions on a aMule directory, creating if needed.
+ *
+ * @param desc A description of the directory in question, used for error messages.
+ * @param directory The directory in question.
+ * @param alternative If the dir specified with 'directory' could not be created, try this instead.
+ * @param outDir Returns the used path.
+ * @return False on error.
+ */
+bool CamuleAppCommon::CheckMuleDirectory(const wxString& desc, const CPath& directory, const wxString& alternative, CPath& outDir)
+{
+	wxString msg;
+
+	if (directory.IsDir(CPath::readwritable)) {
+		outDir = directory;
+		return true;
+	} else if (directory.DirExists()) {
+		// Strings are not translated here because translation isn't up yet.
+		msg = CFormat(wxT("Permissions on the %s directory too strict!\n")
+			wxT("aMule cannot proceed. To fix this, you must set read/write/exec\n")
+			wxT("permissions for the folder '%s'"))
+				% desc % directory;
+	} else if (CPath::MakeDir(directory)) {
+		outDir = directory;
+		return true;
+	} else {
+		msg << CFormat(wxT("Could not create the %s directory at '%s'."))
+			% desc % directory;
+	}
+
+	// Attempt to use fallback directory.
+	const CPath fallback(alternative);
+	if (fallback.IsOk() && (directory != fallback)) {
+		msg << wxT("\nAttempting to use default directory at location \n'")
+			<< alternative << wxT("'.");
+		if (theApp->ShowAlert(msg, wxT("Error accessing directory."), wxICON_ERROR | wxOK | wxCANCEL) == wxCANCEL) {
+			outDir = CPath(wxEmptyString);
+			return false;
+		}
+
+		return CheckMuleDirectory(desc, fallback, wxEmptyString, outDir);
+	} 
+	
+	theApp->ShowAlert(msg, wxT("Fatal error."), wxICON_ERROR | wxOK);
+	outDir = CPath(wxEmptyString);
+	return false;
+}

aMule-2.2.6.tar.bz2/src/amuleDlg.cpp -> aMule-2.3.1.tar.bz2/src/amuleDlg.cpp Changed

@@ -1,8 +1,9 @@
+
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -17,7 +18,7 @@
 // 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
@@ -38,7 +39,6 @@
 #include <wx/zipstrm.h>
 #include <wx/sysopt.h>
 #include <wx/wupdlock.h>	// Needed for wxWindowUpdateLocker
-#include <wx/utils.h>		// Needed for wxBusyCursor
 
 #include <common/EventIDs.h>
 
@@ -53,7 +53,7 @@
 #include <common/Format.h>	// Needed for CFormat
 #include "amule.h"		// Needed for theApp
 #include "ChatWnd.h"		// Needed for CChatWnd
-#include "ClientListCtrl.h"	// Needed for CClientListCtrl
+#include "SourceListCtrl.h"	// Needed for CSourceListCtrl
 #include "DownloadListCtrl.h"	// Needed for CDownloadListCtrl
 #include "DownloadQueue.h"	// Needed for CDownloadQueue
 #include "KadDlg.h"		// Needed for CKadDlg
@@ -67,11 +67,15 @@
 #include "ServerConnect.h"	// Needed for CServerConnect
 #include "ServerWnd.h"		// Needed for CServerWnd
 #include "SharedFilesWnd.h"	// Needed for CSharedFilesWnd
+#include "SharedFilePeersListCtrl.h" // Needed for CSharedFilePeersListCtrl
 #include "Statistics.h"		// Needed for theStats
 #include "StatisticsDlg.h"	// Needed for CStatisticsDlg
 #include "TerminationProcess.h"	// Needed for CTerminationProcess
 #include "TransferWnd.h"	// Needed for CTransferWnd
+#ifndef CLIENT_GUI
 #include "PartFileConvertDlg.h"
+#endif
+#include "IPFilter.h"
 
 #ifndef __WXMSW__
 #include "aMule.xpm"
@@ -80,14 +84,35 @@
 #include "kademlia/kademlia/Kademlia.h"
 
 #ifdef ENABLE_IP2COUNTRY
-	#include "IP2Country.h"		// Needed for IP2Country
+#include "IP2Country.h"		// Needed for IP2Country
+#endif
+
+#ifdef ENABLE_IP2COUNTRY	// That's no bug. MSVC has ENABLE_IP2COUNTRY always on,
+							// but dummy GeoIP.h turns ENABLE_IP2COUNTRY off again.
+void CamuleDlg::IP2CountryDownloadFinished(uint32 result)
+{
+	m_IP2Country->DownloadFinished(result);
+}
+
+void CamuleDlg::EnableIP2Country()
+{
+	if (thePrefs::IsGeoIPEnabled()) {
+		m_IP2Country->Enable();
+	}
+}
+
+#else
+
+void CamuleDlg::IP2CountryDownloadFinished(uint32){}
+void CamuleDlg::EnableIP2Country(){}
+
 #endif
 
 BEGIN_EVENT_TABLE(CamuleDlg, wxFrame)
 
 	EVT_TOOL(ID_BUTTONNETWORKS, CamuleDlg::OnToolBarButton)
 	EVT_TOOL(ID_BUTTONSEARCH, CamuleDlg::OnToolBarButton)
-	EVT_TOOL(ID_BUTTONTRANSFER, CamuleDlg::OnToolBarButton)
+	EVT_TOOL(ID_BUTTONDOWNLOADS, CamuleDlg::OnToolBarButton)
 	EVT_TOOL(ID_BUTTONSHARED, CamuleDlg::OnToolBarButton)
 	EVT_TOOL(ID_BUTTONMESSAGES, CamuleDlg::OnToolBarButton)
 	EVT_TOOL(ID_BUTTONSTATISTICS, CamuleDlg::OnToolBarButton)
@@ -110,7 +135,7 @@
 	EVT_KEY_UP(CamuleDlg::OnKeyPressed)
 
 	EVT_MENU(wxID_EXIT, CamuleDlg::OnExit)
-	
+
 END_EVENT_TABLE()
 
 #ifndef wxCLOSE_BOX
@@ -179,18 +204,21 @@
 	m_clientSkinNames[Client_ExcellentRating_Smiley]  = wxT("ExcellentRatingOnFile");
 	m_clientSkinNames[Client_CommentOnly_Smiley]      = wxT("CommentOnly");
 	m_clientSkinNames[Client_Encryption_Smiley]       = wxT("Encrypted");
-	
+
 	// wxWidgets send idle events to ALL WINDOWS by default... *SIGH*
 	wxIdleEvent::SetMode(wxIDLE_PROCESS_SPECIFIED);
 	wxUpdateUIEvent::SetMode(wxUPDATE_UI_PROCESS_SPECIFIED);
 	wxInitAllImageHandlers();
 	Apply_Clients_Skin();
-	
+
 #ifdef __WXMSW__
-       wxSystemOptions::SetOption(wxT("msw.remap"), 0);
+	wxSystemOptions::SetOption(wxT("msw.remap"), 0);
 #endif
 
+#if !(wxCHECK_VERSION(2, 9, 0) && defined(__WXMAC__))
+	// this crashes on Mac with wx 2.9
 	SetIcon(wxICON(aMule));
+#endif
 
 	srand(time(NULL));
 
@@ -205,17 +233,20 @@
 	SetSizer(s_main, true);
 
 	m_serverwnd = new CServerWnd(p_cnt, m_srv_split_pos);
-	AddLogLineM(false, wxEmptyString);
-	AddLogLineM(false, wxT(" - ") +
+	AddLogLineN(wxEmptyString);
+	AddLogLineN(wxT(" - ") +
 		CFormat(_("This is aMule %s based on eMule.")) % GetMuleVersion());
-	AddLogLineM(false, wxT("   ") +
+	AddLogLineN(wxT("   ") +
 		CFormat(_("Running on %s")) % wxGetOsDescription());
-	AddLogLineM(false, wxT(" - ") +
+	AddLogLineN(wxT(" - ") +
 		wxString(_("Visit http://www.amule.org to check if a new version is available.")));
-	AddLogLineM(false, wxEmptyString);
+	AddLogLineN(wxEmptyString);
 
 #ifdef ENABLE_IP2COUNTRY
-	m_IP2Country = new CIP2Country();
+	m_GeoIPavailable = true;
+	m_IP2Country = new CIP2Country(theApp->ConfigDir);
+#else
+	m_GeoIPavailable = false;
 #endif
 	m_searchwnd = new CSearchDlg(p_cnt);
 	m_transferwnd = new CTransferWnd(p_cnt);
@@ -234,14 +265,14 @@
 	// Create the GUI timer
 	gui_timer=new wxTimer(this,ID_GUI_TIMER_EVENT);
 	if (!gui_timer) {
-		AddLogLine(false, _("FATAL ERROR: Failed to create Timer"));
+		AddLogLineN(_("FATAL ERROR: Failed to create Timer"));
 		exit(1);
 	}
 
 	// Set transfers as active window
 	Create_Toolbar(thePrefs::VerticalToolbar());
 	SetActiveDialog(DT_TRANSFER_WND, m_transferwnd);
-	m_wndToolbar->ToggleTool(ID_BUTTONTRANSFER, true );
+	m_wndToolbar->ToggleTool(ID_BUTTONDOWNLOADS, true );
 
 	bool override_where = (where != wxDefaultPosition);
 	bool override_size = (
@@ -249,7 +280,7 @@
 		(dlg_size.y != DEFAULT_SIZE_Y) );
 	if (!LoadGUIPrefs(override_where, override_size)) {
 		// Prefs not loaded for some reason, exit
-		AddLogLineM( true, wxT("Error! Unable to load Preferences") );
+		AddLogLineC(wxT("Error! Unable to load Preferences") );
 		return;
 	}
 
@@ -262,40 +293,41 @@
 	m_statisticswnd->Init();
 	m_kademliawnd->Init();
 	m_searchwnd->UpdateCatChoice();
+
 	if (thePrefs::UseTrayIcon()) {
 		CreateSystray();
 	}
 
 	Show(true);
 	// Must we start minimized?
-	if (thePrefs::GetStartMinimized()) { 
+	if (thePrefs::GetStartMinimized()) {
 		DoIconize(true);
 	}
 
 	// Set shortcut keys
-	wxAcceleratorEntry entries[] = { 
+	wxAcceleratorEntry entries[] = {
 		wxAcceleratorEntry(wxACCEL_CTRL, wxT('Q'), wxID_EXIT)
 	};
-	
-	SetAcceleratorTable(wxAcceleratorTable(itemsof(entries), entries));	
+
+	SetAcceleratorTable(wxAcceleratorTable(itemsof(entries), entries));
 	ShowED2KLinksHandler( thePrefs::GetFED2KLH() );
-	
+
 	wxNotebook* logs_notebook = CastChild( ID_SRVLOG_NOTEBOOK, wxNotebook);
 	wxNotebook* networks_notebook = CastChild( ID_NETNOTEBOOK, wxNotebook);
-	
+
 	wxASSERT(logs_notebook->GetPageCount() == 4);
 	wxASSERT(networks_notebook->GetPageCount() == 2);
-	
-	for (size_t i = 0; i < logs_notebook->GetPageCount(); ++i) {
+
+	for (uint32 i = 0; i < logs_notebook->GetPageCount(); ++i) {
 		m_logpages[i].page = logs_notebook->GetPage(i);
 		m_logpages[i].name = logs_notebook->GetPageText(i);
 	}
 
-	for (size_t i = 0; i < networks_notebook->GetPageCount(); ++i) {
+	for (uint32 i = 0; i < networks_notebook->GetPageCount(); ++i) {
 		m_networkpages[i].page = networks_notebook->GetPage(i);
 		m_networkpages[i].name = networks_notebook->GetPageText(i);
 	}
-	
+
 	DoNetworkRearrange();
 }
 
@@ -308,7 +340,7 @@
 		wxLogWarning(wxT("Unable to find Fast ED2K Links handler sizer! Hiding FED2KLH aborted."));
 		return;
 	}
-	
+
 	s_dlgcnt->Show( s_fed2klh, show );
 	s_dlgcnt->Layout();
 }
@@ -327,13 +359,13 @@
 void CamuleDlg::SetActiveDialog(DialogType type, wxWindow* dlg)
 {
 	m_nActiveDialog = type;
-	
+
 	if ( type == DT_TRANSFER_WND ) {
 		if (thePrefs::ShowCatTabInfos()) {
 			m_transferwnd->UpdateCatTabTitles();
 		}
 	}
-	
+
 	if ( m_activewnd ) {
 		m_activewnd->Show(false);
 		contentSizer->Detach(m_activewnd);
@@ -348,6 +380,11 @@
 	// we have to refresh it once it is visible again
 	dlg->Refresh( true );
 	dlg->SetFocus();
+
+	if ( type == DT_SHARED_WND ) {
+		// set up splitter now that window sizes are defined
+		m_sharedfileswnd->Prepare();
+	}
 }
 
 
@@ -360,12 +397,12 @@
 		if(theApp->IsConnectedED2K() && theApp->serverconnect->IsLowID()) {
 			m_wndTaskbarNotifier->SetTrayIcon(TRAY_ICON_LOWID, percent);
 		} else {
-			m_wndTaskbarNotifier->SetTrayIcon(TRAY_ICON_HIGHID, percent);					
+			m_wndTaskbarNotifier->SetTrayIcon(TRAY_ICON_HIGHID, percent);
 		}
 	}
 }
 
-		
+
 void CamuleDlg::CreateSystray()
 {
 	wxCHECK_RET(m_wndTaskbarNotifier == NULL,
@@ -374,8 +411,8 @@
 	m_wndTaskbarNotifier = new CMuleTrayIcon();
 	// This will effectively show the Tray Icon.
 	UpdateTrayIcon(0);
-}	
-	
+}
+
 
 void CamuleDlg::RemoveSystray()
 {
@@ -386,7 +423,7 @@
 
 void CamuleDlg::OnToolBarButton(wxCommandEvent& ev)
 {
-	static int lastbutton = ID_BUTTONTRANSFER;
+	static int lastbutton = ID_BUTTONDOWNLOADS;
 
 	// Kry - just if the GUI is ready for it
 	if ( m_is_safe_state ) {
@@ -417,7 +454,7 @@
 					SetActiveDialog(DT_SEARCH_WND, m_searchwnd);
 					break;
 
-				case ID_BUTTONTRANSFER:
+				case ID_BUTTONDOWNLOADS:
 					SetActiveDialog(DT_TRANSFER_WND, m_transferwnd);
 					// Prepare the dialog, sets the splitter-position
 					m_transferwnd->Prepare();
@@ -438,7 +475,7 @@
 
 				// This shouldn't happen, but just in case
 				default:
-					AddLogLineM( true, wxT("Unknown button triggered CamuleApp::OnToolBarButton().") );
+					AddLogLineC(wxT("Unknown button triggered CamuleApp::OnToolBarButton().") );
 					break;
 			}
 		}
@@ -461,17 +498,17 @@
 #ifdef SVNDATE
 	msg << _("Snapshot:") << wxT("\n ") << wxT(SVNDATE);
 #endif
-	msg << wxT("\n\n") << _(" 'All-Platform' p2p client based on eMule \n\n") <<
-		_(" Website: http://www.amule.org \n") <<
-		_(" Forum: http://forum.amule.org \n") << 
-		_(" FAQ: http://wiki.amule.org \n\n") <<
-		_(" Contact: admin@amule.org (administrative issues) \n") <<
-		_(" Copyright (C) 2003-2009 aMule Team \n\n") <<
-		_(" Part of aMule is based on \n") <<
+	msg << wxT("\n\n") << _("'All-Platform' p2p client based on eMule \n\n") <<
+		_("Website: http://www.amule.org \n") <<
+		_("Forum: http://forum.amule.org \n") <<
+		_("FAQ: http://wiki.amule.org \n\n") <<
+		_("Contact: admin@amule.org (administrative issues) \n") <<
+		_("Copyright (c) 2003-2011 aMule Team \n\n") <<
+		_("Part of aMule is based on \n") <<
 		_("Kademlia: Peer-to-peer routing based on the XOR metric.\n") <<
-		_(" Copyright (C) 2002 Petar Maymounkov\n") <<
-		_(" http://kademlia.scs.cs.nyu.edu\n");
-	
+                _(" Copyright (c) 2002-2011 Petar Maymounkov ( petar@post.harvard.edu )\n") <<
+		_("http://kademlia.scs.cs.nyu.edu\n");
+
 	if (m_is_safe_state) {
 		wxMessageBox(msg, _("Message"), wxOK | wxICON_INFORMATION, this);
 	}
@@ -481,11 +518,10 @@
 void CamuleDlg::OnPrefButton(wxCommandEvent& WXUNUSED(ev))
 {
 	if (m_is_safe_state) {
-		wxBusyCursor busyCursor;
 		if (m_prefsDialog == NULL) {
 			m_prefsDialog = new PrefsUnifiedDlg(this);
 		}
-		
+
 		m_prefsDialog->TransferToWindow();
 		m_prefsDialog->Show(true);
 		m_prefsDialog->Raise();
@@ -495,36 +531,36 @@
 
 void CamuleDlg::OnImportButton(wxCommandEvent& WXUNUSED(ev))
 {
+#ifndef CLIENT_GUI
 	if (m_is_safe_state) {
 		CPartFileConvertDlg::ShowGUI(NULL);
 	}
+#endif
 }
 
 
 CamuleDlg::~CamuleDlg()
 {
-	printf("Shutting down aMule...\n");
-	
-	SaveGUIPrefs();
-
 	theApp->amuledlg = NULL;
 
 #ifdef ENABLE_IP2COUNTRY
 	delete m_IP2Country;
 #endif
-	
-	printf("aMule dialog destroyed\n");
+
+	AddLogLineN(_("aMule dialog destroyed"));
 }
 
 
 void CamuleDlg::OnBnConnect(wxCommandEvent& WXUNUSED(evt))
 {
 
-	bool disconnect = (theApp->IsConnectedED2K() || theApp->serverconnect->IsConnecting()) 
-						#ifndef CLIENT_GUI
+	bool disconnect = (theApp->IsConnectedED2K() || theApp->serverconnect->IsConnecting())
+						#ifdef CLIENT_GUI
+						|| theApp->IsConnectedKad()		// there's no Kad running state atm
+						#else
 						|| (Kademlia::CKademlia::IsRunning())
 						#endif
-						;	
+						;
 	if (thePrefs::GetNetworkED2K()) {
 		if (disconnect) {
 			//disconnect if currently connected
@@ -533,9 +569,9 @@
 			} else {
 				theApp->serverconnect->Disconnect();
 			}
-		} else {		
+		} else {
 			//connect if not currently connected
-			AddLogLine(true, _("Connecting"));
+			AddLogLineC(_("Connecting"));
 			theApp->serverconnect->ConnectToAnyServer();
 		}
 	} else {
@@ -565,7 +601,7 @@
 	wxCHECK_RET(ct, wxT("Resetting unknown log"));
 
 	ct->Clear();
-	
+
 	if (id == ID_LOGVIEW) {
 		// Also clear the log line
 		wxStaticText* text = CastChild(wxT("infoLabel"), wxStaticText);
@@ -575,41 +611,28 @@
 }
 
 
-void CamuleDlg::AddLogLine(bool addtostatusbar, const wxString& line)
+void CamuleDlg::AddLogLine(const wxString& line)
 {
-	// Remove newspace at end, it causes problems with the layout...
-	wxString bufferline = line.Strip(wxString::trailing);
-
-	// Create the timestamp
-	wxString stamp = wxDateTime::Now().FormatISODate() + wxT(" ") + wxDateTime::Now().FormatISOTime() + wxT(": ");
+	bool addtostatusbar = line[0] == '!';
+	wxString bufferline = line.Mid(1);
 
 	// Add the message to the log-view
 	wxTextCtrl* ct = CastByID( ID_LOGVIEW, m_serverwnd, wxTextCtrl );
 	if ( ct ) {
-		if ( bufferline.IsEmpty() ) {
-			// If it's empty we just write a blank line with no timestamp.
-			ct->AppendText( wxT("\n") );
-		} else {
-			// Bold critical log-lines
-			// Windows doesn't support this feature, and it causes GDI resource leaks
-#ifndef __WXMSW__
-			wxTextAttr style = ct->GetDefaultStyle();
-			wxFont font = style.GetFont();
-			font.SetWeight(addtostatusbar ? wxFONTWEIGHT_BOLD : wxFONTWEIGHT_NORMAL);
-			style.SetFont(font);
-			ct->SetDefaultStyle(style);
+		// Bold critical log-lines
+		// Works in Windows too thanks to wxTE_RICH2 style in muuli
+		wxTextAttr style = ct->GetDefaultStyle();
+		wxFont font = style.GetFont();
+		font.SetWeight(addtostatusbar ? wxFONTWEIGHT_BOLD : wxFONTWEIGHT_NORMAL);
+		style.SetFont(font);
+#if wxCHECK_VERSION(2, 9, 0)
+		style.SetFontSize(8);
 #endif
-			
-			// Split multi-line messages into individual lines
-			wxStringTokenizer tokens( bufferline, wxT("\n") );		
-			while ( tokens.HasMoreTokens() ) {
-				ct->AppendText( stamp + tokens.GetNextToken() + wxT("\n") );
-			}
-		}
-			
+		ct->SetDefaultStyle(style);
+		ct->AppendText(bufferline);
 		ct->ShowPosition( ct->GetLastPosition() - 1 );
 	}
-	
+
 
 	// Set the status-bar if the event warrents it
 	if ( addtostatusbar ) {
@@ -621,7 +644,7 @@
 		text->SetToolTip( bufferline );
 		text->GetParent()->Layout();
 	}
-	
+
 }
 
 
@@ -648,21 +671,21 @@
 			status_arrows.Add(connImages(t));
 		}
 	}
-	
+
 	m_serverwnd->UpdateED2KInfo();
 	m_serverwnd->UpdateKadInfo();
 
 
-	////////////////////////////////////////////////////////////	
+	////////////////////////////////////////////////////////////
 	// Determine the status of the networks
 	//
-	enum ED2KState { ED2KOff = 0, ED2KLowID = 1, ED2KConnecting = 2, ED2KHighID = 3 };
-	enum EKadState { EKadOff = 4, EKadFW = 5, EKadConnecting = 5, EKadOK = 6 };
+	enum ED2KState { ED2KOff = 0, ED2KLowID = 1, ED2KConnecting = 2, ED2KHighID = 3, ED2KUndef = -1 };
+	enum EKadState { EKadOff = 4, EKadFW = 5, EKadConnecting = 5, EKadOK = 6, EKadUndef = -1 };
 
 	ED2KState ed2kState = ED2KOff;
 	EKadState kadState  = EKadOff;
 
-	////////////////////////////////////////////////////////////	
+	////////////////////////////////////////////////////////////
 	// Update the label on the status-bar and determine
 	// the states of the two networks.
 	//
@@ -694,7 +717,7 @@
 			kadState = EKadFW;
 		} else {
 			msgKad = _("Kad: Connected");
-			
+
 			kadState = EKadOK;
 		}
 	} else if (theApp->IsKadRunning()) {
@@ -704,9 +727,9 @@
 	} else if (thePrefs::GetNetworkKademlia()) {
 		msgKad = _("Kad: Off");
 	}
-	
+
 	wxStaticText* connLabel = CastChild( wxT("connLabel"), wxStaticText );
-	wxCHECK_RET(connLabel, wxT("'connLabel' widget not found"));
+	{ wxCHECK_RET(connLabel, wxT("'connLabel' widget not found")); }
 
 	wxString labelMsg;
 	if (msgED2K.Length() && msgKad.Length()) {
@@ -719,7 +742,7 @@
 	connLabel->GetParent()->Layout();
 
 
-	////////////////////////////////////////////////////////////	
+	////////////////////////////////////////////////////////////
 	// Update the connect/disconnect/cancel button.
 	//
 	enum EConnState {
@@ -741,9 +764,9 @@
 		currentState = ECS_Disconnected;
 	}
 
-	if ( (true == skinChanged) || (currentState != s_oldState)) {
+	if ( (true == skinChanged) || (currentState != s_oldState) ) {
 		wxWindowUpdateLocker freezer(m_wndToolbar);
-		
+
 		wxToolBarToolBase* toolbarTool = m_wndToolbar->RemoveTool(ID_BUTTONCONNECT);
 
 		switch (currentState) {
@@ -767,34 +790,47 @@
 
 		m_wndToolbar->InsertTool(0, toolbarTool);
 		m_wndToolbar->Realize();
+		m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()) && theApp->ipfilter->IsReady());
 
 		s_oldState = currentState;
 	}
 
 
-	////////////////////////////////////////////////////////////	
+	////////////////////////////////////////////////////////////
 	// Update the globe-icon in the lower-right corner.
-	// 	
-	wxStaticBitmap* connBitmap = CastChild( wxT("connImage"), wxStaticBitmap );
-	wxCHECK_RET(connBitmap, wxT("'connImage' widget not found"));
+	// (only if connection state has changed)
+	//
+	static ED2KState s_ED2KOldState = ED2KUndef;
+	static EKadState s_EKadOldState = EKadUndef;
+	if (ed2kState != s_ED2KOldState || kadState != s_EKadOldState) {
+		s_ED2KOldState = ed2kState;
+		s_EKadOldState = kadState;
+		wxStaticBitmap* connBitmap = CastChild( wxT("connImage"), wxStaticBitmap );
+		wxCHECK_RET(connBitmap, wxT("'connImage' widget not found"));
+
+		wxBitmap statusIcon = connBitmap->GetBitmap();
+		// Sanity check - otherwise there's a crash here if aMule runs out of resources
+		if (statusIcon.GetRefData() == NULL) {
+			return;
+		}
 
-	wxBitmap statusIcon = connBitmap->GetBitmap();
-	wxMemoryDC bitmapDC(statusIcon);
+		wxMemoryDC bitmapDC(statusIcon);
 
-	status_arrows.Draw(kadState, bitmapDC, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT);
-	status_arrows.Draw(ed2kState, bitmapDC, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT);
+		status_arrows.Draw(kadState, bitmapDC, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT);
+		status_arrows.Draw(ed2kState, bitmapDC, 0, 0, wxIMAGELIST_DRAW_TRANSPARENT);
 
-	connBitmap->SetBitmap(statusIcon);
+		connBitmap->SetBitmap(statusIcon);
+	}
 }
 
 
 void CamuleDlg::ShowUserCount(const wxString& info)
 {
 	wxStaticText* label = CastChild( wxT("userLabel"), wxStaticText );
-	
+
 	// Update Kad tab
 	m_serverwnd->UpdateKadInfo();
-	
+
 	label->SetLabel(info);
 	label->GetParent()->Layout();
 }
@@ -807,9 +843,9 @@
 	wxString buffer;
 	if( thePrefs::ShowOverhead() )
 	{
-		buffer = wxString::Format(_("Up: %.1f(%.1f) | Down: %.1f(%.1f)"), kBpsUp, theStats::GetUpOverheadRate() / 1024.0, kBpsDown, theStats::GetDownOverheadRate() / 1024.0);
+		buffer = CFormat(_("Up: %.1f(%.1f) | Down: %.1f(%.1f)")) % kBpsUp % (theStats::GetUpOverheadRate() / 1024.0) % kBpsDown % (theStats::GetDownOverheadRate() / 1024.0);
 	} else {
-		buffer = wxString::Format(_("Up: %.1f | Down: %.1f"), kBpsUp, kBpsDown);
+		buffer = CFormat(_("Up: %.1f | Down: %.1f")) % kBpsUp % kBpsDown;
 	}
 	buffer.Truncate(50); // Max size 50
 
@@ -819,8 +855,12 @@
 
 	// Show upload/download speed in title
 	if (thePrefs::GetShowRatesOnTitle()) {
-		wxString UpDownSpeed = wxString::Format(wxT(" -- Up: %.1f | Down: %.1f"), kBpsUp, kBpsDown);
-		SetTitle(theApp->m_FrameTitle + UpDownSpeed);
+		wxString UpDownSpeed = CFormat(wxT("Up: %.1f | Down: %.1f")) % kBpsUp % kBpsDown;
+		if (thePrefs::GetShowRatesOnTitle() == 1) {
+			SetTitle(theApp->m_FrameTitle + wxT(" -- ") + UpDownSpeed);
+		} else {
+			SetTitle(UpDownSpeed + wxT(" -- ") + theApp->m_FrameTitle);
+		}
 	}
 
 	wxASSERT((m_wndTaskbarNotifier != NULL) == thePrefs::UseTrayIcon());
@@ -828,7 +868,7 @@
 		// set trayicon-icon
 		int percentDown = (int)ceil((kBpsDown*100) / thePrefs::GetMaxGraphDownloadRate());
 		UpdateTrayIcon( ( percentDown > 100 ) ? 100 : percentDown);
-	
+
 		wxString buffer2;
 		if ( theApp->IsConnected() ) {
 			buffer2 = CFormat(_("aMule (%s | Connected)")) % buffer;
@@ -862,15 +902,23 @@
 
 void CamuleDlg::OnClose(wxCloseEvent& evt)
 {
+	if (thePrefs::HideOnClose() && evt.CanVeto()) {
+		Show(false);
+		evt.Veto();
+		return;
+	}
+
 	// This will be here till the core close is != app close
 	if (evt.CanVeto() && thePrefs::IsConfirmExitEnabled() ) {
-		if (wxNO == wxMessageBox(wxString(_("Do you really want to exit aMule?")),
+		if (wxNO == wxMessageBox(wxString(CFormat(_("Do you really want to exit %s?")) % theApp->GetMuleAppName()),
 				wxString(_("Exit confirmation")), wxYES_NO, this)) {
 			evt.Veto();
 			return;
 		}
 	}
-	
+
+	SaveGUIPrefs();
+
 	Enable(false);
 	Show(false);
 
@@ -890,7 +938,7 @@
 			theApp->downloadqueue->AddLink( strlink, m_transferwnd->downloadlistctrl->GetCategory() );
 		}
 	}
-	
+
 	ctl->SetValue(wxEmptyString);
 }
 
@@ -990,7 +1038,7 @@
 }
 
 
-void CamuleDlg::DoIconize(bool iconize) 
+void CamuleDlg::DoIconize(bool iconize)
 {
 	if (m_wndTaskbarNotifier && thePrefs::DoMinToTray()) {
 		if (iconize) {
@@ -1013,25 +1061,29 @@
 {
 // Evil Hack: check if the mouse is inside the window
 #ifndef __WXMSW__
-       if (GetScreenRect().Contains(wxGetMousePosition()))
+	if (GetScreenRect().Contains(wxGetMousePosition()))
 #endif
-       {
+	{
 		if (m_prefsDialog && m_prefsDialog->IsShown()) {
 			// Veto.
 		} else {
 			if (m_wndTaskbarNotifier) {
+#if wxCHECK_VERSION(2, 9, 0)
+				DoIconize(evt.IsIconized());
+#else
 				DoIconize(evt.Iconized());
+#endif
 			}
 			evt.Skip();
 		}
-       }
+	}
 }
 
 void CamuleDlg::OnGUITimer(wxTimerEvent& WXUNUSED(evt))
 {
 	// Former TimerProc section
 
-	static uint32	msPrev1, msPrev5, msPrevStats;
+	static uint32	msPrev1, msPrev5;
 
 	uint32 			msCur = theStats::GetUptimeMillis();
 
@@ -1041,21 +1093,18 @@
 	}
 
 #ifndef CLIENT_GUI
-	static uint32 msPrevGraph;
+	static uint32 msPrevGraph, msPrevStats;
 	int msGraphUpdate = thePrefs::GetTrafficOMeterInterval() * 1000;
 	if ((msGraphUpdate > 0)  && ((msCur / msGraphUpdate) > (msPrevGraph / msGraphUpdate))) {
 		// trying to get the graph shifts evenly spaced after a change in the update period
 		msPrevGraph = msCur;
-		
+
 		GraphUpdateInfo update = theApp->m_statistics->GetPointsForUpdate();
-		
+
 		m_statisticswnd->UpdateStatGraphs(theStats::GetPeakConnections(), update);
 		m_kademliawnd->UpdateGraph(update);
 	}
-#else
-	//#warning TODO: CORE/GUI -- EC needed
-#endif
-	
+
 	int sStatsUpdate = thePrefs::GetStatsInterval();
 	if ((sStatsUpdate > 0) && ((int)(msCur - msPrevStats) > sStatsUpdate*1000)) {
 		if (m_statisticswnd->IsShownOnScreen()) {
@@ -1063,6 +1112,7 @@
 			m_statisticswnd->ShowStatistics();
 		}
 	}
+#endif
 
 	if (msCur-msPrev5 > 5000) {  // every 5 seconds
 		msPrev5 = msCur;
@@ -1072,41 +1122,37 @@
 		}
 		if (thePrefs::AutoSortDownload()) {
 			m_transferwnd->downloadlistctrl->SortList();
+			m_transferwnd->clientlistctrl->SortList();
+			m_sharedfileswnd->peerslistctrl->SortList();
 		}
 	}
-	
+
 	if (msCur-msPrev1 > 1000) {  // every second
 		msPrev1 = msCur;
 		if (m_CurrentBlinkBitmap == 12) {
 			m_CurrentBlinkBitmap = 7;
-			SetMessagesTool();		
+			SetMessagesTool();
 		} else {
 			if (m_BlinkMessages) {
 				m_CurrentBlinkBitmap = 12;
 				SetMessagesTool();
 			}
 		}
-		
+
 	}
 }
 
 
 void CamuleDlg::SetMessagesTool()
 {
-	int pos = m_wndToolbar->GetToolPos(ID_BUTTONMESSAGES);
-	wxASSERT(pos == 6); // so we don't miss a change on wx2.4
-	
 	wxWindowUpdateLocker freezer(m_wndToolbar);
+#ifdef __WXCOCOA__
+	m_wndToolbar->FindById(ID_BUTTONMESSAGES)->SetNormalBitmap(m_tblist.GetBitmap(m_CurrentBlinkBitmap));
+#else
 	m_wndToolbar->SetToolNormalBitmap(ID_BUTTONMESSAGES, m_tblist.GetBitmap(m_CurrentBlinkBitmap));
+#endif
 }
 
-
-/*
-	Try to launch the specified url:
-	 - Windows: Default or custom browser will be used.
-	 - Mac: Currently not implemented
-	 - Anything else: Try a number of hardcoded browsers. Should be made configurable...
-*/
 void CamuleDlg::LaunchUrl( const wxString& url )
 {
 	wxString cmd;
@@ -1124,7 +1170,7 @@
 
 		CTerminationProcess *p = new CTerminationProcess(cmd);
 		if (wxExecute(cmd, wxEXEC_ASYNC, p)) {
-			printf( "Launch Command: %s\n", (const char *)unicode2char(cmd));
+			AddLogLineN(_("Launch Command: ") + cmd);
 			return;
 		} else {
 			delete p;
@@ -1147,10 +1193,10 @@
 			URL = wxT("http://www.filehash.com/search.html?pattern=FILENAME&submit=Find");
 			break;
 		default:
-			wxASSERT(0);
+			wxFAIL;
 	}
 	URL.Replace(wxT("FILENAME"), filename);
-	
+
 	return URL;
 }
 
@@ -1160,8 +1206,12 @@
 	bool ret = true;
 	wxString skinFileName(thePrefs::GetSkin());
 
+	if (skinFileName.IsEmpty() || skinFileName.IsSameAs(_("- default -"))) {
+		return false;
+	}
+
 	wxString userDir(JoinPaths(GetConfigDir(), wxT("skins")) + wxFileName::GetPathSeparator());
-	
+
 	wxStandardPathsBase &spb(wxStandardPaths::Get());
 #ifdef __WXMSW__
 	wxString dataDir(spb.GetPluginsDir());
@@ -1172,31 +1222,31 @@
 #endif
 	wxString systemDir(JoinPaths(dataDir,wxT("skins")) + wxFileName::GetPathSeparator());
 
-		
+
 	skinFileName.Replace(wxT("User:"), userDir );
 	skinFileName.Replace(wxT("System:"), systemDir );
 
 	m_skinFileName.Assign(skinFileName);
 	if (!m_skinFileName.FileExists()) {
-		AddLogLineM(true, CFormat(
+		AddLogLineC(CFormat(
 			_("Skin directory '%s' does not exist")) %
 			skinFileName );
 		ret = false;
 	} else if (!m_skinFileName.IsFileReadable()) {
-		AddLogLineM(true, CFormat(
+		AddLogLineC(CFormat(
 			_("WARNING: Unable to open skin file '%s' for read")) %
 			skinFileName);
 		ret = false;
 	}
 
-		wxFFileInputStream in(m_skinFileName.GetFullPath());
-		wxZipInputStream zip(in);
+	wxFFileInputStream in(m_skinFileName.GetFullPath());
+	wxZipInputStream zip(in);
 
-		while ((entry = zip.GetNextEntry()) != NULL) {
-			wxZipEntry*& current = cat[entry->GetInternalName()];
-			delete current;
-			current = entry;
-		}
+	while ((entry = zip.GetNextEntry()) != NULL) {
+		wxZipEntry*& current = cat[entry->GetInternalName()];
+		delete current;
+		current = entry;
+	}
 
 	return ret;
 }
@@ -1211,25 +1261,23 @@
 	if (useSkins) {
 		wxFFileInputStream in(m_skinFileName.GetFullPath());
 		wxZipInputStream zip(in);
-		
+
 		it = cat.find(wxZipEntry::GetInternalName(iconName + wxT(".png")));
 		if ( it != cat.end() ) {
 			zip.OpenEntry(*it->second);
 			if ( !new_image.LoadFile(zip,wxBITMAP_TYPE_PNG) ) {
-				AddLogLineM(false,
-					wxT("Warning: Error loading icon for ") +
+				AddLogLineN(wxT("Warning: Error loading icon for ") +
 						iconName);
 				useSkins = false;
 			}
 		}else {
-				AddLogLineM(false,
-					wxT("Warning: Can't load icon for ") +
+				AddLogLineN(wxT("Warning: Can't load icon for ") +
 						iconName);
 				useSkins = false;
 		}
-		
+
 	}
-	
+
 	wxBitmap bmp(useSkins ? new_image : stdIcon);
 	if (iconName.StartsWith(wxT("Client_"))) {
 		m_imagelist.Add(bmp);
@@ -1241,11 +1289,11 @@
 
 void CamuleDlg::Apply_Clients_Skin()
 {
-	bool useSkins = thePrefs::UseSkins() && Check_and_Init_Skin();
-	
+	bool useSkins = Check_and_Init_Skin();
+
 	// Clear the client image list
 	m_imagelist.RemoveAll();
-	
+
 	// Add the images to the image list
 	for (int i = 0; i < CLIENT_SKIN_SIZE; ++i) {
 		Add_Skin_Icon(wxT("Client_") + m_clientSkinNames[i],
@@ -1256,11 +1304,12 @@
 
 void CamuleDlg::Apply_Toolbar_Skin(wxToolBar *wndToolbar)
 {
-	bool useSkins = thePrefs::UseSkins() && Check_and_Init_Skin();
-	
+	bool useSkins = Check_and_Init_Skin();
+
+
 	// Clear the toolbar image list
 	m_tblist.RemoveAll();
-	
+
 	// Add the images to the image list
 	Add_Skin_Icon(wxT("Toolbar_Connect"),    connButImg(0),      useSkins);
 	Add_Skin_Icon(wxT("Toolbar_Disconnect"), connButImg(1),      useSkins);
@@ -1274,59 +1323,34 @@
 	Add_Skin_Icon(wxT("Toolbar_Prefs"),      amuleDlgImages(26), useSkins);
 	Add_Skin_Icon(wxT("Toolbar_Import"),     amuleDlgImages(32), useSkins);
 	Add_Skin_Icon(wxT("Toolbar_About"),      amuleDlgImages(29), useSkins);
-	Add_Skin_Icon(wxT("Toolbar_Blink"),	     amuleDlgImages(33), useSkins);
-	
+	Add_Skin_Icon(wxT("Toolbar_Blink"),	 amuleDlgImages(33), useSkins);
+
 	// Build aMule toolbar
 	wndToolbar->SetMargins(0, 0);
-		
+
 	// Placeholder. Gets updated by ShowConnectionState
 	wndToolbar->AddTool(ID_BUTTONCONNECT, wxT("..."), m_tblist.GetBitmap(0));
 
 	wndToolbar->AddSeparator();
-	wndToolbar->AddTool(ID_BUTTONNETWORKS,
-		_("Networks"), m_tblist.GetBitmap(3),
-		wxNullBitmap, wxITEM_CHECK,
-		_("Networks window"));
-	wndToolbar->AddTool(ID_BUTTONSEARCH,
-		_("Searches"), m_tblist.GetBitmap(5),
-		wxNullBitmap, wxITEM_CHECK,
-		_("Searches window"));
-	wndToolbar->AddTool(ID_BUTTONTRANSFER,
-		_("Transfers"), m_tblist.GetBitmap(4),
-		wxNullBitmap, wxITEM_CHECK,
-		_("Files transfers window"));
-	wndToolbar->AddTool(ID_BUTTONSHARED,
-		_("Shared files"), m_tblist.GetBitmap(6),
-		wxNullBitmap, wxITEM_CHECK,
-		_("Shared files window"));
-	wndToolbar->AddTool(ID_BUTTONMESSAGES,
-		_("Messages"), m_tblist.GetBitmap(7),
-		wxNullBitmap, wxITEM_CHECK,
-		_("Messages window"));
-	wndToolbar->AddTool(ID_BUTTONSTATISTICS,
-		_("Statistics"), m_tblist.GetBitmap(8),
-		wxNullBitmap, wxITEM_CHECK,
-		_("Statistics graph window"));
+	wndToolbar->AddTool(ID_BUTTONNETWORKS, _("Networks"), m_tblist.GetBitmap(3), wxNullBitmap, wxITEM_CHECK, _("Networks Window"));
+	wndToolbar->AddTool(ID_BUTTONSEARCH, _("Searches"), m_tblist.GetBitmap(5), wxNullBitmap, wxITEM_CHECK, _("Searches Window"));
+	wndToolbar->AddTool(ID_BUTTONDOWNLOADS, _("Downloads"), m_tblist.GetBitmap(4), wxNullBitmap, wxITEM_CHECK, _("Downloads Window"));
+	wndToolbar->AddTool(ID_BUTTONSHARED, _("Shared files"), m_tblist.GetBitmap(6), wxNullBitmap, wxITEM_CHECK, _("Shared Files Window"));
+	wndToolbar->AddTool(ID_BUTTONMESSAGES, _("Messages"), m_tblist.GetBitmap(7), wxNullBitmap, wxITEM_CHECK, _("Messages Window"));
+	wndToolbar->AddTool(ID_BUTTONSTATISTICS, _("Statistics"), m_tblist.GetBitmap(8), wxNullBitmap, wxITEM_CHECK, _("Statistics Graph Window"));
 	wndToolbar->AddSeparator();
-	wndToolbar->AddTool(ID_BUTTONNEWPREFERENCES,
-		_("Preferences"), m_tblist.GetBitmap(9),
-		wxNullBitmap, wxITEM_NORMAL,
-		_("Preferences settings window"));
-	wndToolbar->AddTool(ID_BUTTONIMPORT,
-		_("Import"), m_tblist.GetBitmap(10),
-		wxNullBitmap, wxITEM_NORMAL,
-		_("The partfile importer tool"));
-	wndToolbar->AddTool(ID_ABOUT,
-		_("About"), m_tblist.GetBitmap(11),
-		wxNullBitmap, wxITEM_NORMAL,
-		_("About/Help"));
-	
-	wndToolbar->ToggleTool(ID_BUTTONTRANSFER, true);
+	wndToolbar->AddTool(ID_BUTTONNEWPREFERENCES, _("Preferences"), m_tblist.GetBitmap(9), wxNullBitmap, wxITEM_NORMAL, _("Preferences Settings Window"));
+#ifndef CLIENT_GUI
+	wndToolbar->AddTool(ID_BUTTONIMPORT, _("Import"), m_tblist.GetBitmap(10), wxNullBitmap, wxITEM_NORMAL, _("The partfile importer tool"));
+#endif
+	wndToolbar->AddTool(ID_ABOUT, _("About"), m_tblist.GetBitmap(11), wxNullBitmap, wxITEM_NORMAL, _("About/Help"));
+
+	wndToolbar->ToggleTool(ID_BUTTONDOWNLOADS, true);
 
 	// Needed for non-GTK platforms, where the
 	// items don't get added immediatly.
 	wndToolbar->Realize();
-	
+
 	// Updates the "Connect" button, and so on.
 	ShowConnectionState(true);
 }
@@ -1361,10 +1385,7 @@
 			m_wndToolbar->SetToolBitmapSize(wxSize(32, 32));
 	}
 
-	Apply_Toolbar_Skin(m_wndToolbar);		
-	#ifdef CLIENT_GUI
-		m_wndToolbar->DeleteTool(ID_BUTTONIMPORT);
-	#endif
+	Apply_Toolbar_Skin(m_wndToolbar);
 
 	Thaw();
 }
@@ -1372,10 +1393,10 @@
 
 void CamuleDlg::OnMainGUISizeChange(wxSizeEvent& evt)
 {
-	wxFrame::OnSize(evt);	
+	wxFrame::OnSize(evt);
 	if (m_transferwnd && m_transferwnd->clientlistctrl) {
 		// Transfer window's splitter set again if it's hidden.
-		if (m_transferwnd->clientlistctrl->GetListView() == vtNone) {
+		if (!m_transferwnd->clientlistctrl->GetShowing()) {
 			int height = m_transferwnd->clientlistctrl->GetSize().GetHeight();
 			wxSplitterWindow* splitter =
 				CastChild(wxT("splitterWnd"), wxSplitterWindow);
@@ -1383,7 +1404,6 @@
 			splitter->SetSashPosition( height );
 		}
 	}
-	
 }
 
 
@@ -1397,60 +1417,61 @@
 			return;
 		}
 	}
-	
+
 	event.Skip();
 }
 
 
 void CamuleDlg::OnExit(wxCommandEvent& WXUNUSED(evt))
 {
-	Close();
+	Close(true);
 }
 
 void CamuleDlg::DoNetworkRearrange()
 {
-	
 	wxWindowUpdateLocker freezer(this);
-	
+
 	wxToolBarToolBase* toolbarTool = m_wndToolbar->RemoveTool(ID_BUTTONNETWORKS);
 
 	wxNotebook* logs_notebook = CastChild( ID_SRVLOG_NOTEBOOK, wxNotebook);
 	wxNotebook* networks_notebook = CastChild( ID_NETNOTEBOOK, wxNotebook);
-	
+
 	while (logs_notebook->GetPageCount() > 1) {
 		logs_notebook->RemovePage(logs_notebook->GetPageCount() - 1);
 	}
-	
+
 	while (networks_notebook->GetPageCount() > 0) {
 		networks_notebook->RemovePage(networks_notebook->GetPageCount() - 1);
 	}
 
 	if (thePrefs::GetNetworkED2K()) {
+#ifndef CLIENT_GUI
 		logs_notebook->AddPage(m_logpages[1].page, m_logpages[1].name);
+#endif
 		logs_notebook->AddPage(m_logpages[2].page, m_logpages[2].name);
 	}
-		
+
 	m_networkpages[0].page->Show(thePrefs::GetNetworkED2K());
-	
+
 	if (thePrefs::GetNetworkKademlia()) {
 		logs_notebook->AddPage(m_logpages[3].page, m_logpages[3].name);
 	}
-	
-	m_networkpages[1].page->Show(thePrefs::GetNetworkKademlia());		
+
+	m_networkpages[1].page->Show(thePrefs::GetNetworkKademlia());
 
 	networks_notebook->Show(thePrefs::GetNetworkED2K() && thePrefs::GetNetworkKademlia());
-	
+
 	wxWindow* replacement = NULL;
-	
+
 	m_networknotebooksizer->Clear();
-	
+
 	if (thePrefs::GetNetworkED2K() && thePrefs::GetNetworkKademlia()) {
 		toolbarTool->SetLabel(_("Networks"));
-		
+
 		m_networkpages[0].page->Reparent(networks_notebook);
 		m_networkpages[1].page->Reparent(networks_notebook);
-		
-		networks_notebook->AddPage(m_networkpages[0].page, m_networkpages[0].name);		
+
+		networks_notebook->AddPage(m_networkpages[0].page, m_networkpages[0].name);
 		networks_notebook->AddPage(m_networkpages[1].page, m_networkpages[1].name);
 
 		replacement = networks_notebook;
@@ -1467,20 +1488,20 @@
 		// No networks.
 		toolbarTool->SetLabel(_("No network"));
 	}
-	
+
 	if (replacement) {
 		replacement->Reparent(m_networknotebooksizer->GetContainingWindow());
 		m_networknotebooksizer->Add( replacement, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
 		m_networknotebooksizer->Layout();
-	} 
-	
+	}
+
 	m_wndToolbar->InsertTool(2, toolbarTool);
-	
+
 	m_wndToolbar->EnableTool(ID_BUTTONNETWORKS, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()));
-	m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()));
-	
+	m_wndToolbar->EnableTool(ID_BUTTONCONNECT, (thePrefs::GetNetworkED2K() || thePrefs::GetNetworkKademlia()) && theApp->ipfilter->IsReady());
+
 	m_wndToolbar->Realize();
-	
+
 	m_searchwnd->FixSearchTypes();
 }

aMule-2.2.6.tar.bz2/src/amuleDlg.h -> aMule-2.3.1.tar.bz2/src/amuleDlg.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -113,7 +113,7 @@
 		wxSize dlg_size = wxSize(DEFAULT_SIZE_X,DEFAULT_SIZE_Y));
 	~CamuleDlg();
 
-	void AddLogLine(bool addtostatusbar, const wxString& line);
+	void AddLogLine(const wxString& line);
 	void AddServerMessageLine(wxString& message);
 	void ResetLog(int id);
 	
@@ -183,9 +183,10 @@
 	
 	void DoNetworkRearrange();
 	
-#ifdef ENABLE_IP2COUNTRY	
 	CIP2Country*		m_IP2Country;
-#endif	
+	void IP2CountryDownloadFinished(uint32 result);
+	void EnableIP2Country();
+
 	wxWindow*		m_activewnd;
 	CTransferWnd*		m_transferwnd;
 	CServerWnd*		m_serverwnd;
@@ -226,6 +227,7 @@
 	uint32 m_last_iconizing;
 	wxFileName m_skinFileName;
 	std::vector<wxString> m_clientSkinNames;
+	bool m_GeoIPavailable;
 
 	WX_DECLARE_STRING_HASH_MAP(wxZipEntry*, ZipCatalog);
 	ZipCatalog::iterator it;

aMule-2.2.6.tar.bz2/src/amuleIPV4Address.h -> aMule-2.3.1.tar.bz2/src/amuleIPV4Address.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Carlo Wood ( carlo@alinoe.com )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Carlo Wood ( carlo@alinoe.com )
+// Copyright (c) 2004-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
@@ -30,35 +30,30 @@
 
 #include "NetworkFunctions.h"	// Needed for StringIPtoUint32
 
-
-// This is fscking hard to maintain. wxWidgets 2.5.2 has changed internal
-// ipaddress structs.
-// prevent fscking dns queries
 class amuleIPV4Address : public wxIPV4address
 {
 public:
 	amuleIPV4Address() {}
 	amuleIPV4Address(const wxIPV4address &a) : wxIPV4address(a) {}
 
-	virtual bool Hostname(const wxString& name) {
+	virtual bool Hostname(const wxString& name)
+	{
 		// Some people are sometimes fools.
 		if (name.IsEmpty()) {
-//			wxASSERT(0);
 			return false;
 		}
 		
-		return Hostname(StringIPtoUint32(name));
+		return wxIPV4address::Hostname(name);
 	}
 
-	virtual bool Hostname(uint32 ip) {
+	virtual bool Hostname(uint32 ip) 
+	{
 		// Some people are sometimes fools.
 		if (!ip) {
-//			wxASSERT(0);
 			return false;
 		}
 		
-		// We have to take care that wxIPV4address's internals changed on 2.5.2
-		return GAddress_INET_SetHostAddress(m_address,wxUINT32_SWAP_ALWAYS(ip))==GSOCK_NOERROR;
+		return wxIPV4address::Hostname(Uint32toStringIP(ip));
 	}
 };

aMule-2.2.6.tar.bz2/src/amuled.cpp -> aMule-2.3.1.tar.bz2/src/amuled.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// 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
@@ -28,7 +28,7 @@
 #include <include/common/EventIDs.h>
 
 #ifdef HAVE_CONFIG_H
-	#include "config.h"		// Needed for HAVE_SYS_RESOURCE_H, HAVE_STRERROR_R and STRERROR_R_CHAR_P, etc
+	#include "config.h"		// Needed for HAVE_SYS_RESOURCE_H, etc
 #endif
 
 // Include the necessary headers for select(2), properly guarded
@@ -46,10 +46,6 @@
 #	endif
 #endif
 
-// Prefer the POSIX interface to strerror_r()
-#define _XOPEN_SOURCE	600
-#include <string.h>			// Do_not_auto_remove
-
 #include <wx/utils.h>
 
 #include "Preferences.h"		// Needed for CPreferences
@@ -65,7 +61,6 @@
 #include "ListenSocket.h"		// Do_not_auto_remove (forward declaration not enough)
 
 
-#include <errno.h>
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h> // Do_not_auto_remove
 #endif
@@ -78,53 +73,6 @@
 	#include <wx/unix/execute.h>
 #endif
 
-#ifndef HAVE_STRERROR_R
-
-// Replacement strerror_r() function for systems that don't have any.
-// Note that this replacement function is NOT thread-safe!
-static int rpl_strerror_r(int errnum, char *buf, size_t buflen)
-{
-	char *tmp = strerror(errnum);
-	if (tmp == NULL) {
-		errno = EINVAL;
-		return -1;
-	} else {
-		strncpy(buf, tmp, buflen - 1);
-		buf[buflen - 1] = '\0';
-		if (strlen(tmp) >= buflen) {
-			errno = ERANGE;
-			return -1;
-		}
-	}
-	return 0;
-}
-
-#	define strerror_r(errnum, buf, buflen)	rpl_strerror_r(errnum, buf, buflen)
-#else
-#	ifdef STRERROR_R_CHAR_P
-
-// Replacement strerror_r() function for systems that return a char*.
-static int rpl_strerror_r(int errnum, char *buf, size_t buflen)
-{
-	char *tmp = strerror_r(errnum, buf, buflen);
-	if (tmp == NULL) {
-		errno = EINVAL;
-		return -1;
-	} else if (tmp != buf) {
-		strncpy(buf, tmp, buflen - 1);
-		buf[buflen - 1] = '\0';
-		if (strlen(tmp) >= buflen) {
-			errno = ERANGE;
-			return -1;
-		}
-	}
-	return 0;
-}
-
-#		define strerror_r(errnum, buf, buflen)	rpl_strerror_r(errnum, buf, buflen)
-#	endif
-#endif
-
 BEGIN_EVENT_TABLE(CamuleDaemonApp, wxAppConsole)
 	//
 	// Socket handlers
@@ -145,7 +93,6 @@
 	EVT_MULE_TIMER(ID_CORE_TIMER_EVENT, CamuleDaemonApp::OnCoreTimer)
 
 	EVT_MULE_NOTIFY(CamuleDaemonApp::OnNotifyEvent)
-	EVT_MULE_LOGGING(CamuleDaemonApp::OnLoggingEvent)
 
 	// Async dns handling
 	EVT_MULE_INTERNAL(wxEVT_CORE_UDP_DNS_DONE, -1, CamuleDaemonApp::OnUDPDnsDone)
@@ -170,6 +117,7 @@
 
 IMPLEMENT_APP(CamuleDaemonApp)
 
+#ifdef AMULED28
 /*
  * Socket handling in wxBase
  * 
@@ -317,7 +265,6 @@
 		m_in_set->Detected(&GSocket::Detected_Read);
 		m_out_set->Detected(&GSocket::Detected_Write);
 	}
-	
 }
 
 GSocketGUIFunctionsTable *CDaemonAppTraits::GetSocketGUIFunctionsTable()
@@ -374,15 +321,20 @@
 	Uninstall_Callback(socket, GSOCK_OUTPUT);
 }
 
+#endif	// AMULED28
+
+#ifndef __WXMSW__
+
+#ifdef AMULED28
 
 CDaemonAppTraits::CDaemonAppTraits(CAmuledGSocketFuncTable *table)
 :
 wxConsoleAppTraits(),
+m_oldSignalChildAction(),
+m_newSignalChildAction(),
 m_table(table),
 m_lock(wxMUTEX_RECURSIVE),
-m_sched_delete(),
-m_oldSignalChildAction(),
-m_newSignalChildAction()
+m_sched_delete()
 {
 	m_lock.Unlock();
 }
@@ -421,8 +373,31 @@
 	//m_sched_delete.erase(m_sched_delete.begin(), m_sched_delete.end());
 }
 
+wxAppTraits *CamuleDaemonApp::CreateTraits()
+{
+	return new CDaemonAppTraits(m_table);
+}
+
+#else	// AMULED28
+
+CDaemonAppTraits::CDaemonAppTraits()
+:
+wxConsoleAppTraits(),
+m_oldSignalChildAction(),
+m_newSignalChildAction()
+{
+}
+
+wxAppTraits *CamuleDaemonApp::CreateTraits()
+{
+	return new CDaemonAppTraits();
+}
+
+#endif	// !AMULED28
+
+#endif	// __WXMSW__
 
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !wxCHECK_VERSION(2, 9, 0)
 #include <wx/stdpaths.h> // Do_not_auto_remove (guess)
 static wxStandardPathsCF gs_stdPaths;
 wxStandardPathsBase& CDaemonAppTraits::GetStandardPaths()
@@ -432,6 +407,8 @@
 #endif
 
 
+#ifdef AMULED28
+
 CamuleDaemonApp::CamuleDaemonApp()
 :
 m_Exit(false),
@@ -440,11 +417,7 @@
 	wxPendingEventsLocker = new wxCriticalSection;
 }
 
-
-wxAppTraits *CamuleDaemonApp::CreateTraits()
-{
-	return new CDaemonAppTraits(m_table);
-}
+#endif	// !AMULED28
 
 
 #ifndef __WXMSW__
@@ -467,7 +440,7 @@
 		result = AmuleWaitPid(execData.pid, &status, 0, &msg);
 		if (result == -1 || (!WIFEXITED(status) && !WIFSIGNALED(status))) {
 			msg << wxT(" Waiting for subprocess termination failed.");
-			AddDebugLogLineM(false, logGeneral, msg);			
+			AddDebugLogLineN(logGeneral, msg);
 		}	
 	} else {
 		/** wxEXEC_ASYNC */
@@ -494,7 +467,7 @@
 	}
 
 	// Log our passage here
-	AddDebugLogLineM(false, logGeneral, msg);
+	AddDebugLogLineN(logGeneral, msg);
 
 	return status;
 }
@@ -532,23 +505,16 @@
 	}
 
 	// Log our passage here
-	AddDebugLogLineM(false, logGeneral, msg);
+	AddDebugLogLineN(logGeneral, msg);
 }
 
 
 pid_t AmuleWaitPid(pid_t pid, int *status, int options, wxString *msg)
 {
-	// strerror_r() buffer
-	const int ERROR_BUFFER_LEN = 256;
-	char errorBuffer[ERROR_BUFFER_LEN];
-
 	*status = 0;
 	pid_t result = waitpid(pid, status, options);
 	if (result == -1) {
-		strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
-		*msg << wxT("Error: waitpid() call failed: ") <<
-			char2unicode(errorBuffer) <<
-			wxT(".");
+		*msg << CFormat(wxT("Error: waitpid() call failed: %m."));
 	} else if (result == 0) {
 		if (options & WNOHANG)  {
 			*msg << wxT("The child is alive.");
@@ -591,34 +557,14 @@
 int CamuleDaemonApp::OnRun()
 {
 	if (!thePrefs::AcceptExternalConnections()) {
-		wxString warning = _("ERROR: aMule daemon cannot be used when external connections are disabled. "
-			"To enable External Connections, use either a normal aMule, start amuled with the option --ec-config or set the key"
-			"\"AcceptExternalConnections\" to 1 in the file ~/.aMule/amule.conf");
-		
-		AddLogLineM(true, warning);
-		printf("\n%s\n\n", (const char*)unicode2char(warning));
-		
+		AddLogLineCS(_("ERROR: aMule daemon cannot be used when external connections are disabled. To enable External Connections, use either a normal aMule, start amuled with the option --ec-config or set the key \"AcceptExternalConnections\" to 1 in the file ~/.aMule/amule.conf"));
 		return 0;
 	} else if (thePrefs::ECPassword().IsEmpty()) {
-		wxString warning = wxT("ERROR: A valid password is required to use "
-			"external connections, and aMule daemon cannot be used without "
-			"external connections. To run aMule deamon, you must set the "
-			"\"ECPassword\" field in the file ~/.aMule/amule.conf with an "
-			"appropriate value. Execute amuled with the flag --ec-config to set the password. More information can be found at "
-			"http://wiki.amule.org");
-	
-		AddLogLineM(true, warning);
-		printf("\n%s\n\n", (const char*)unicode2char(warning));
-		
+		AddLogLineCS(_("ERROR: A valid password is required to use external connections, and aMule daemon cannot be used without external connections. To run aMule deamon, you must set the \"ECPassword\" field in the file ~/.aMule/amule.conf with an appropriate value. Execute amuled with the flag --ec-config to set the password. More information can be found at http://wiki.amule.org"));
 		return 0;
 	}
 
 #ifndef __WXMSW__
-	// strerror_r() buffer
-	const int ERROR_BUFFER_LEN = 256;
-	char errorBuffer[ERROR_BUFFER_LEN];
-	wxString msg;
-
 	// Process the return code of dead children so that we do not create 
 	// zombies. wxBase does not implement wxProcess callbacks, so no one
 	// actualy calls wxHandleProcessTermination() in console applications.
@@ -631,19 +577,14 @@
 	m_newSignalChildAction.sa_flags &= ~SA_RESETHAND;
 	ret = sigaction(SIGCHLD, &m_newSignalChildAction, NULL);
 	if (ret == -1) {
-		strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
-		msg << wxT("CamuleDaemonApp::OnRun(): "
-			"Installation of SIGCHLD callback with sigaction() failed: ") <<
-			char2unicode(errorBuffer) <<
-			wxT(".");
-		AddLogLineM(true, msg);
+		AddDebugLogLineC(logStandard, CFormat(wxT("CamuleDaemonApp::OnRun(): Installation of SIGCHLD callback with sigaction() failed: %m.")));
 	} else {
-		msg << wxT("CamuleDaemonApp::OnRun(): Installation of SIGCHLD "
-			"callback with sigaction() succeeded.");
-		AddDebugLogLineM(false, logGeneral, msg);
+		AddDebugLogLineN(logGeneral, wxT("CamuleDaemonApp::OnRun(): Installation of SIGCHLD callback with sigaction() succeeded."));
 	}
 #endif // __WXMSW__
 	
+#ifdef AMULED28
+
 	while ( !m_Exit ) {
 		m_table->RunSelect();
 		ProcessPendingEvents();
@@ -653,34 +594,28 @@
 	// ShutDown is beeing called twice. Once here and again in OnExit().
 	ShutDown();
 
-#ifndef __WXMSW__
-	msg.Empty();
-	ret = sigaction(SIGCHLD, &m_oldSignalChildAction, NULL);
-	if (ret == -1) {
-		strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
-		msg << wxT("CamuleDaemonApp::OnRun(): second sigaction() failed: ") <<
-			char2unicode(errorBuffer) <<
-			wxT(".");
-		AddLogLineM(true, msg);
-	} else {
-		msg << wxT("CamuleDaemonApp::OnRun(): Uninstallation of SIGCHLD "
-			"callback with sigaction() succeeded.");
-		AddDebugLogLineM(false, logGeneral, msg);
-	}
-#endif // __WXMSW__
+	return 0;
+
+#else
 
+#ifdef AMULED_DUMMY
 	return 0;
+#else
+	return wxApp::OnRun();
+#endif
+
+#endif
 }
 
 bool CamuleDaemonApp::OnInit()
 {
-	printf("amuled: OnInit - starting timer\n");
 	if ( !CamuleApp::OnInit() ) {
 		return false;
 	}
+	AddLogLineNS(_("amuled: OnInit - starting timer"));
 	core_timer = new CTimer(this,ID_CORE_TIMER_EVENT);
 	core_timer->Start(CORE_TIMER_PERIOD);
-	glob_prefs->GetCategory(0)->title = GetCatTitle(thePrefs::GetAllcatType());
+	glob_prefs->GetCategory(0)->title = GetCatTitle(thePrefs::GetAllcatFilter());
 	glob_prefs->GetCategory(0)->path = thePrefs::GetIncomingDir();
 	
 	return true;
@@ -692,25 +627,40 @@
 	if ( !enable_daemon_fork ) {
 		return 0;
 	}
-	printf("amuled: forking to background - see you\n");
+	AddLogLineNS(_("amuled: forking to background - see you"));
+	theLogger.SetEnabledStdoutLog(false);
 	//
-	// fork to background and detouch from controlling tty
+	// fork to background and detach from controlling tty
 	// while redirecting stdout to /dev/null
 	//
 	for(int i_fd = 0;i_fd < 3; i_fd++) {
 		close(i_fd);
 	}
   	int fd = open("/dev/null",O_RDWR);
-  	dup(fd);
-  	dup(fd);
-  	int pid = fork();
+	if (dup(fd)){}	// prevent GCC warning
+	if (dup(fd)){}
+  	pid_t pid = fork();
 
 	wxASSERT(pid != -1);
 
   	if ( pid ) {
   		exit(0);
   	} else {
-		setsid();
+		pid = setsid();
+		//
+		// Create a Pid file with the Pid of the Child, so any daemon-manager
+		// can easily manage the process
+		//
+		if (!m_PidFile.IsEmpty()) {
+			wxString temp = CFormat(wxT("%d\n")) % pid;
+			wxFFile ff(m_PidFile, wxT("w"));
+			if (!ff.Error()) {
+				ff.Write(temp);
+				ff.Close();
+			} else {
+				AddLogLineNS(_("Cannot Create Pid File"));
+			}
+		}
   	}
   	
 #endif
@@ -720,6 +670,7 @@
 
 int CamuleDaemonApp::OnExit()
 {
+#ifdef AMULED28
 	/*
 	 * Stop all socket threads before entering
 	 * shutdown sequence.
@@ -730,8 +681,18 @@
 		delete clientudp;
 		clientudp = NULL;
 	}
-	
+#endif
+
 	ShutDown();
+
+#ifndef __WXMSW__
+	int ret = sigaction(SIGCHLD, &m_oldSignalChildAction, NULL);
+	if (ret == -1) {
+		AddDebugLogLineC(logStandard, CFormat(wxT("CamuleDaemonApp::OnRun(): second sigaction() failed: %m.")));
+	} else {
+		AddDebugLogLineN(logGeneral, wxT("CamuleDaemonApp::OnRun(): Uninstallation of SIGCHLD callback with sigaction() succeeded."));
+	}
+#endif // __WXMSW__
 	
 	// lfroen: delete socket threads
 	if (ECServerHandler) {
@@ -744,24 +705,14 @@
 }
 
 
-void CamuleDaemonApp::ShowAlert(wxString msg, wxString title, int flags)
+int CamuleDaemonApp::ShowAlert(wxString msg, wxString title, int flags)
 {
 	if ( flags | wxICON_ERROR ) {
 		title = CFormat(_("ERROR: %s")) % title;
 	}
-	
-	// Ensure that alerts are always visible on the console (when possible).
-	if ((not enable_stdout_log) and (not enable_daemon_fork)) {
-		printf("%s\n", unicode2UTF8(title + wxT(" ") + msg).data());
-	}
-	
-	AddLogLineM(true, title + wxT(" ") + msg);
-}
+	AddLogLineCS(title + wxT(" ") + msg);
 
-
-void CamuleDaemonApp::OnLoggingEvent(CLoggingEvent& evt)
-{
-	CamuleApp::AddLogLine(evt.Message());
+	return 0;	// That's neither yes nor no, ok, cancel
 }
 
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/extern/wxWidgets/listctrl.cpp -> aMule-2.3.1.tar.bz2/src/extern/wxWidgets/listctrl.cpp Changed

@@ -3,8 +3,8 @@
 // Purpose:     generic implementation of wxListCtrl
 // Author:      Robert Roebling
 //              Vadim Zeitlin (virtual list control support)
-// Id:          $Id: listctrl.cpp 9137 2008-09-27 20:15:09Z gonosztopi $
-// Copyright:   (c) 1998 Robert Roebling
+// Id:          $Id: listctrl.cpp 10612 2011-09-18 11:01:52Z sturedman $
+// Copyright:   Copyright (c) 1998-2011 Robert Roebling
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -40,8 +40,12 @@
 #include <wx/renderer.h>
 #include <wx/dcbuffer.h>
 
-#ifdef __WXMAC__
-    #include <wx/mac/private.h>
+#if wxCHECK_VERSION(2, 9, 0)
+// wxWidgets 2.9+ does not include a mac/private anymore.
+#else
+	#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && (wxOSX_USE_CARBON || TARGET_CARBON)
+		#include <wx/mac/private.h>
+	#endif
 #endif
 
 
@@ -619,6 +623,8 @@
         }
     }
 
+    void OnChildFocus(wxChildFocusEvent& event);
+    
     void DrawImage( int index, wxDC *dc, int x, int y );
     void GetImageSize( int index, int &width, int &height ) const;
     int GetTextLength( const wxString &s ) const;
@@ -727,7 +733,7 @@
     wxCoord GetLineY(size_t line) const;
 
     // get the brush to use for the item highlighting
-    wxBrush *GetHighlightBrush() const
+    const wxBrush& GetHighlightBrush() const
     {
         return m_hasFocus ? m_highlightBrush : m_highlightUnfocusedBrush;
     }
@@ -844,8 +850,8 @@
            m_lineTo;
 
     // the brushes to use for item highlighting when we do/don't have focus
-    wxBrush *m_highlightBrush,
-            *m_highlightUnfocusedBrush;
+    wxBrush m_highlightBrush,
+            m_highlightUnfocusedBrush;
 
     // if this is > 0, the control is frozen and doesn't redraw itself
     size_t m_freezeCount;
@@ -1413,7 +1419,7 @@
 #ifdef __WXMAC__
     {
         if (m_owner->HasFocus()
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
                 && IsControlActive( (ControlRef)m_owner->GetHandle() )
 #endif
         )
@@ -1445,9 +1451,9 @@
     if ( highlighted || hasBgCol )
     {
         if ( highlighted )
-            dc->SetBrush( *m_owner->GetHighlightBrush() );
+            dc->SetBrush( m_owner->GetHighlightBrush() );
         else
-            dc->SetBrush(wxBrush(attr->GetBackgroundColour(), wxSOLID));
+            dc->SetBrush(*(wxTheBrushList->FindOrCreateBrush(attr->GetBackgroundColour(), wxSOLID)));
 
         dc->SetPen( *wxTRANSPARENT_PEN );
 
@@ -1477,7 +1483,7 @@
         {
             int flags = wxCONTROL_SELECTED;
             if (m_owner->HasFocus()
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
                 && IsControlActive( (ControlRef)m_owner->GetHandle() )
 #endif
             )
@@ -1540,7 +1546,7 @@
         {
             int flags = wxCONTROL_SELECTED;
             if (m_owner->HasFocus()
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
                 && IsControlActive( (ControlRef)m_owner->GetHandle() )
 #endif
             )
@@ -1574,14 +1580,6 @@
         int xOld = x;
         x += width;
 
-	// Fix for a bug in wxWidgets.
-	// This has been reported as patch 1898914:
-	// http://sourceforge.net/tracker/index.php?func=detail&aid=1898914&group_id=9863&atid=309863
-	//
-        // Prevents the drawing of images into the
-        // next collumn, in case of small widths.
-        wxDCClipper clipper(*dc, xOld, rect.y, width - 8, rect.height);
-
         if ( item->HasImage() )
         {
             int ix, iy;
@@ -1907,6 +1905,19 @@
 
         x += wCol;
     }
+
+    // Fill in what's missing to the right of the columns, otherwise we will
+    // leave an unpainted area when columns are removed (and it looks better)
+    if ( x < w )
+    {
+        wxRendererNative::Get().DrawHeaderButton
+                                (
+                                    this,
+                                    dc,
+                                    wxRect(x, HEADER_OFFSET_Y, w - x, h),
+                                    0
+                                );
+    }
 }
 
 void wxListHeaderWindow::DrawCurrent()
@@ -1925,7 +1936,7 @@
 
     wxScreenDC dc;
     dc.SetLogicalFunction( wxINVERT );
-    dc.SetPen( wxPen( *wxBLACK, 2, wxSOLID ) );
+    dc.SetPen( *(wxThePenList->FindOrCreatePen(*wxBLACK, 2, wxSOLID ) ));
     dc.SetBrush( *wxTRANSPARENT_BRUSH );
 
     AdjustDC(dc);
@@ -2257,6 +2268,7 @@
   EVT_SET_FOCUS      (wxListMainWindow::OnSetFocus)
   EVT_KILL_FOCUS     (wxListMainWindow::OnKillFocus)
   EVT_SCROLLWIN      (wxListMainWindow::OnScroll)
+  EVT_CHILD_FOCUS    (wxListMainWindow::OnChildFocus)
 END_EVENT_TABLE()
 
 void wxListMainWindow::Init()
@@ -2295,9 +2307,6 @@
 wxListMainWindow::wxListMainWindow()
 {
     Init();
-
-    m_highlightBrush =
-    m_highlightUnfocusedBrush = (wxBrush *) NULL;
 }
 
 wxListMainWindow::wxListMainWindow( wxWindow *parent,
@@ -2311,23 +2320,21 @@
 {
     Init();
 
-    m_highlightBrush = new wxBrush
-                         (
+    m_highlightBrush = *(wxTheBrushList->FindOrCreateBrush(
                             wxSystemSettings::GetColour
                             (
                                 wxSYS_COLOUR_HIGHLIGHT
                             ),
                             wxSOLID
-                         );
+                         ));
 
-    m_highlightUnfocusedBrush = new wxBrush
-                              (
+    m_highlightUnfocusedBrush = *(wxTheBrushList->FindOrCreateBrush(
                                  wxSystemSettings::GetColour
                                  (
                                      wxSYS_COLOUR_BTNSHADOW
                                  ),
                                  wxSOLID
-                              );
+                              ));
 
     SetScrollbars( 0, 0, 0, 0, 0, 0 );
 
@@ -2344,8 +2351,6 @@
     WX_CLEAR_LIST(wxListHeaderDataList, m_columns);
     WX_CLEAR_ARRAY(m_aColWidths);
 
-    delete m_highlightBrush;
-    delete m_highlightUnfocusedBrush;
     delete m_renameTimer;
 }
 
@@ -2723,26 +2728,17 @@
 
 void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
-    // wxBufferedPaintDC falls over in the case of dimensions that
-    // are zero, as cann happen when a splitter is moved so that 
-    // the entire window is hidden (e.g. on the transfers window).
-    //
-    // This has been reported as patch #1899643:
-    // http://sourceforge.net/tracker/index.php?func=detail&aid=1899643&group_id=9863&atid=309863
-    wxSize size = GetClientSize();
-    if ((size.x <= 0) || (size.y <= 0)) {
-	wxPaintDC dc(this);
-	return;
-    }
-
     // Note: a wxPaintDC must be constructed even if no drawing is
     // done (a Windows requirement).
     wxBufferedPaintDC dc( this );
 
     // Ensure an uniform background color, as to avoid differences between
     // the automatically cleared parts and the rest of the canvas.
-    dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(
-	wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID)));
+    dc.SetBackground(*(wxTheBrushList->FindOrCreateBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX), wxSOLID)));
+
+    // We need to clear the DC manually, since we intercept BG-erase events.
+    // Clearing must be done first thing because caching of the double-buffering causes artifacts otherwise.
+    dc.Clear();
 
     if ( m_freezeCount )
         return;
@@ -2753,9 +2749,6 @@
 
     PrepareDC( dc );
 
-    // We need to clear the DC manually, since we intercept BG-erase events.
-    dc.Clear();
-
     // IsEmpty is checked now, after clearing, to avoid garbage on empty lists.
     if ( IsEmpty() ) {
         return;
@@ -2812,7 +2805,7 @@
 
         if ( HasFlag(wxLC_HRULES) )
         {
-            wxPen pen(GetRuleColour(), 1, wxSOLID);
+            wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxSOLID));
             wxSize clientSize = GetClientSize();
 
             size_t i = visibleFrom;
@@ -2838,7 +2831,7 @@
         // Draw vertical rules if required
         if ( HasFlag(wxLC_VRULES) && !IsEmpty() )
         {
-            wxPen pen(GetRuleColour(), 1, wxSOLID);
+            wxPen pen = *(wxThePenList->FindOrCreatePen(GetRuleColour(), 1, wxSOLID));
             wxRect firstItemRect, lastItemRect;
 
             GetItemRect(visibleFrom, firstItemRect);
@@ -2907,6 +2900,13 @@
     }
 }
 
+void wxListMainWindow::OnChildFocus(wxChildFocusEvent& WXUNUSED(event))
+{
+    // Do nothing here.  This prevents the default handler in wxScrolledWindow
+    // from needlessly scrolling the window when the edit control is
+    // dismissed.  See ticket #9563.
+}
+
 void wxListMainWindow::SendNotify( size_t line,
                                    wxEventType command,
                                    const wxPoint& point )
@@ -3407,23 +3407,9 @@
     wxWindow *parent = GetParent();
 
     // propagate the key event upwards
-    wxKeyEvent ke( wxEVT_KEY_DOWN );
-#if 0
-    ke.m_shiftDown = event.m_shiftDown;
-    ke.m_controlDown = event.m_controlDown;
-    ke.m_altDown = event.m_altDown;
-    ke.m_metaDown = event.m_metaDown;
-    ke.m_keyCode = event.m_keyCode;
-    ke.m_x = event.m_x;
-    ke.m_y = event.m_y;
-#else
-    // This is a fix for a bug in wxWidgets, where m_uniChar isn't
-    // set in the new event object, thus breaking GetUnicodeKey()
-    // http://sourceforge.net/tracker/index.php?func=detail&aid=1863312&group_id=9863&atid=109863
-    ke = event;
-#endif
-    ke.SetEventObject( parent );
-    if (parent->GetEventHandler()->ProcessEvent( ke )) return;
+    wxKeyEvent ke(event);
+    if (parent->GetEventHandler()->ProcessEvent( ke ))
+        return;
 
     event.Skip();
 }
@@ -3433,23 +3419,10 @@
     wxWindow *parent = GetParent();
 
     // propagate the key event upwards
-    wxKeyEvent ke( wxEVT_KEY_UP );
-#if 0
-    ke.m_shiftDown = event.m_shiftDown;
-    ke.m_controlDown = event.m_controlDown;
-    ke.m_altDown = event.m_altDown;
-    ke.m_metaDown = event.m_metaDown;
-    ke.m_keyCode = event.m_keyCode;
-    ke.m_x = event.m_x;
-    ke.m_y = event.m_y;
-#else
-    // This is a fix for a bug in wxWidgets, where m_uniChar isn't
-    // set in the new event object, thus breaking GetUnicodeKey()
-    // http://sourceforge.net/tracker/index.php?func=detail&aid=1863312&group_id=9863&atid=109863
-    ke = event;
-#endif
+    wxKeyEvent ke(event);
     ke.SetEventObject( parent );
-    if (parent->GetEventHandler()->ProcessEvent( ke )) return;
+    if (parent->GetEventHandler()->ProcessEvent( ke ))
+        return;
 
     event.Skip();
 }
@@ -3470,23 +3443,9 @@
     }
 
     // propagate the char event upwards
-    wxKeyEvent ke( wxEVT_CHAR );
-#if 0
-    ke.m_shiftDown = event.m_shiftDown;
-    ke.m_controlDown = event.m_controlDown;
-    ke.m_altDown = event.m_altDown;
-    ke.m_metaDown = event.m_metaDown;
-    ke.m_keyCode = event.m_keyCode;
-    ke.m_x = event.m_x;
-    ke.m_y = event.m_y;
-#else
-    // This is a fix for a bug in wxWidgets, where m_uniChar isn't
-    // set in the new event object, thus breaking GetUnicodeKey()
-    // http://sourceforge.net/tracker/index.php?func=detail&aid=1863312&group_id=9863&atid=109863
-    ke = event;
-#endif
-    ke.SetEventObject( parent );
-    if (parent->GetEventHandler()->ProcessEvent( ke )) return;
+    wxKeyEvent ke(event);
+    if (parent->GetEventHandler()->ProcessEvent( ke ))
+        return;
 
     if (event.GetKeyCode() == WXK_TAB)
     {
@@ -3782,11 +3741,11 @@
 
 void wxListMainWindow::SetColumnWidth( int col, int width )
 {
-    wxCHECK_RET( col >= 0 && col < GetColumnCount(),
-                 _T("invalid column index") );
+    { wxCHECK_RET( col >= 0 && col < GetColumnCount(),
+                 _T("invalid column index") ); }
 
-    wxCHECK_RET( InReportView(),
-                 _T("SetColumnWidth() can only be called in report mode.") );
+    { wxCHECK_RET( InReportView(),
+                 _T("SetColumnWidth() can only be called in report mode.") ); }
 
     m_dirty = true;
     wxListHeaderWindow *headerWin = GetListCtrl()->m_headerWin;
@@ -3794,7 +3753,7 @@
         headerWin->m_dirty = true;
 
     wxListHeaderDataList::compatibility_iterator node = m_columns.Item( col );
-    wxCHECK_RET( node, _T("no column?") );
+	{ wxCHECK_RET( node, _T("no column?") ); }
 
     wxListHeaderData *column = node->GetData();
 
@@ -4167,8 +4126,9 @@
     {
         for ( int i = 0; i < count; i++ )
         {
-            wxRect r;
-            GetItemRect(i, r);
+            // we need logical, not physical, coordinates here, so use
+            // GetLineRect() instead of GetItemRect()
+            wxRect r = GetLineRect(i);
 
             wxCoord x = r.GetRight(),
                     y = r.GetBottom();
@@ -4236,9 +4196,9 @@
     const size_t count = GetItemCount();
 
     int iconSpacing;
-    if ( HasFlag(wxLC_ICON) )
+    if ( HasFlag(wxLC_ICON) && m_normal_image_list )
         iconSpacing = m_normal_spacing;
-    else if ( HasFlag(wxLC_SMALL_ICON) )
+    else if ( HasFlag(wxLC_SMALL_ICON) && m_small_image_list )
         iconSpacing = m_small_spacing;
     else
         iconSpacing = 0;
@@ -5006,7 +4966,7 @@
 {
     if ( m_headerWin )
     {
-#ifdef __WXMAC__
+#if defined( __WXMAC__ ) && !defined(__WXUNIVERSAL__) && wxOSX_USE_CARBON
         SInt32 h;
         GetThemeMetric( kThemeMetricListHeaderHeight, &h );
 #else
@@ -5139,7 +5099,17 @@
     else
         flag &= ~style;
 
-    SetWindowStyleFlag( flag );
+    // some styles can be set without recreating everything (as happens in
+    // SetWindowStyleFlag() which calls wxListMainWindow::DeleteEverything())
+    if ( !(style & ~(wxLC_HRULES | wxLC_VRULES)) )
+    {
+        Refresh();
+        wxWindow::SetWindowStyleFlag(flag);
+    }
+    else
+    {
+        SetWindowStyleFlag( flag );
+    }
 }
 
 void wxGenericListCtrl::SetWindowStyleFlag( long flag )
@@ -5784,7 +5754,7 @@
 #else
     wxUnusedVar(variant);
     wxVisualAttributes attr;
-    attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
+    attr.colFg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOXTEXT);
     attr.colBg = wxSystemSettings::GetColour(wxSYS_COLOUR_LISTBOX);
     attr.font  = wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT);
     return attr;

aMule-2.2.6.tar.bz2/src/extern/wxWidgets/listctrl.h -> aMule-2.3.1.tar.bz2/src/extern/wxWidgets/listctrl.h Changed

aMule-2.2.6.tar.bz2/src/include/common/ClientVersion.h -> aMule-2.3.1.tar.bz2/src/include/common/ClientVersion.h Changed

aMule-2.2.6.tar.bz2/src/include/common/Constants.h -> aMule-2.3.1.tar.bz2/src/include/common/Constants.h Changed

aMule-2.2.6.tar.bz2/src/include/common/DataFileVersion.h -> aMule-2.3.1.tar.bz2/src/include/common/DataFileVersion.h Changed

aMule-2.2.6.tar.bz2/src/include/common/EventIDs.h -> aMule-2.3.1.tar.bz2/src/include/common/EventIDs.h Changed

aMule-2.2.6.tar.bz2/src/include/common/Macros.h -> aMule-2.3.1.tar.bz2/src/include/common/Macros.h Changed

aMule-2.3.1.tar.bz2/src/include/common/MacrosProgramSpecific.h Added

@@ -0,0 +1,50 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2003-2011 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,
+// 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 MACROSPROGRAMSPECIFIC_H
+#define MACROSPROGRAMSPECIFIC_H
+
+// Built program specific macros
+
+#ifdef AMULE_DAEMON
+#	define ONLY_ON_DAEMON(x)	x
+#	define NOT_ON_DAEMON(x)
+#else
+#	define ONLY_ON_DAEMON(x)
+#	define NOT_ON_DAEMON(x)		x
+#endif
+
+#ifdef CLIENT_GUI
+#	define ONLY_ON_REMOTEGUI(x)	x
+#	define NOT_ON_REMOTEGUI(x)
+#else
+#	define ONLY_ON_REMOTEGUI(x)
+#	define NOT_ON_REMOTEGUI(x)	x
+#endif
+
+#define GUI_ONLY(x)	NOT_ON_DAEMON(x)
+#define CORE_ONLY(x)	NOT_ON_REMOTEGUI(x)
+
+#endif // MACROSPROGRAMSPECIFIC_H

aMule-2.2.6.tar.bz2/src/include/common/MenuIDs.h -> aMule-2.3.1.tar.bz2/src/include/common/MenuIDs.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -26,8 +26,10 @@
 #ifndef COMMONMENUIDS_H
 #define COMMONMENUIDS_H
 
+#include <wx/defs.h>	// To access wxID_HIGHEST menu item constant
+
 enum {
-	MP_MESSAGE = 11000, // Random start ID that doesn't conflict with wxDesigner
+	MP_MESSAGE = wxID_HIGHEST + 1, // Start ID at next free value (defined by wx)
 	MP_DETAIL,
 	MP_ADDFRIEND,
 	MP_REMOVEFRIEND,
@@ -120,11 +122,32 @@
 	MP_LISTCOL_14,
 	MP_LISTCOL_15,
 
+	MP_ASSIGNCAT 	= MP_LISTCOL_15   + 1,   // reserve some for categories (about 100)
+	MP_CAT_SET0		= MP_ASSIGNCAT    + 100, // reserve some for change all-cats (about 50)
+	MP_SWITCHCTRL_0 = MP_CAT_SET0     + 50,
+	MP_SWITCHCTRL_9	= MP_SWITCHCTRL_0 + 9,
 
-	MP_ASSIGNCAT = 10800, // reserve some for categories!
-	MP_CAT_SET0 = 10900, // reserve some for change all-cats (about 50)
-	MP_SWITCHCTRL_0 = 10950,
-	MP_SWITCHCTRL_9	= 10959
+// Pop-up menu clickable entries
+	TRAY_MENU_INFO = 0,
+	TRAY_MENU_CLIENTINFO = 0,
+	TRAY_MENU_CLIENTINFO_ITEM = MP_SWITCHCTRL_9 + 1,  // continue from MP_SWITCHCTRL_9
+	TRAY_MENU_DISCONNECT,
+	TRAY_MENU_CONNECT,
+	TRAY_MENU_HIDE,
+	TRAY_MENU_SHOW,
+	TRAY_MENU_EXIT,
+	UPLOAD_ITEM1,
+	UPLOAD_ITEM2,
+	UPLOAD_ITEM3,
+	UPLOAD_ITEM4,
+	UPLOAD_ITEM5,
+	UPLOAD_ITEM6,
+	DOWNLOAD_ITEM1,
+	DOWNLOAD_ITEM2,
+	DOWNLOAD_ITEM3,
+	DOWNLOAD_ITEM4,
+	DOWNLOAD_ITEM5,
+	DOWNLOAD_ITEM6
 };
 
 #endif // COMMONMENUIDS_H

aMule-2.2.6.tar.bz2/src/include/protocol/Protocols.h -> aMule-2.3.1.tar.bz2/src/include/protocol/Protocols.h Changed

aMule-2.2.6.tar.bz2/src/include/protocol/ed2k/Client2Client/TCP.h -> aMule-2.3.1.tar.bz2/src/include/protocol/ed2k/Client2Client/TCP.h Changed

aMule-2.2.6.tar.bz2/src/include/protocol/ed2k/Client2Client/UDP.h -> aMule-2.3.1.tar.bz2/src/include/protocol/ed2k/Client2Client/UDP.h Changed

aMule-2.2.6.tar.bz2/src/include/protocol/ed2k/Client2Server/TCP.h -> aMule-2.3.1.tar.bz2/src/include/protocol/ed2k/Client2Server/TCP.h Changed

aMule-2.2.6.tar.bz2/src/include/protocol/ed2k/Client2Server/UDP.h -> aMule-2.3.1.tar.bz2/src/include/protocol/ed2k/Client2Server/UDP.h Changed

aMule-2.2.6.tar.bz2/src/include/protocol/ed2k/ClientSoftware.h -> aMule-2.3.1.tar.bz2/src/include/protocol/ed2k/ClientSoftware.h Changed

aMule-2.2.6.tar.bz2/src/include/protocol/ed2k/Constants.h -> aMule-2.3.1.tar.bz2/src/include/protocol/ed2k/Constants.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -55,12 +55,11 @@
 
 #define	MIN_UP_CLIENTS_ALLOWED			2	// min. clients allowed to download regardless UPLOAD_CLIENT_DATARATE or any other factors. Don't set this too high
 
-#define	SOURCEEXCHANGE2_VERSION			4		// replaces the version sent in MISC_OPTIONS flag fro SX1
+#define	SOURCEEXCHANGE2_VERSION			4		// replaces the version sent in MISC_OPTIONS flag from SX1
 
 // MOD Note: end
 
 #define	MAXCONPER5SEC				20
-#define	UPLOAD_CLIENT_DATARATE			3072
 #define	MAX_UP_CLIENTS_ALLOWED			250	// max. clients allowed regardless UPLOAD_CLIENT_DATARATE or any other factors. Don't set this too low, use DATARATE to adjust uploadspeed per client
 #define	DOWNLOADTIMEOUT				100000
 #define	CONSERVTIMEOUT				25000	// agelimit for pending connection attempts
@@ -75,18 +74,10 @@
 #define	CLIENTLIST_CLEANUP_TIME	MIN2MS(34)	// 34 min
 
 // (4294967295/PARTSIZE)*PARTSIZE = ~4GB
-#ifdef _MSC_VER
-#define OLD_MAX_FILE_SIZE 4290048000ui64
-#else
 #define OLD_MAX_FILE_SIZE 4290048000ull
-#endif
 
 // = 2^38 = 256GB
-#ifdef _MSC_VER
-	#define MAX_FILE_SIZE 0x4000000000ui64
-#else
-	#define MAX_FILE_SIZE 0x4000000000ull
-#endif
+#define MAX_FILE_SIZE 0x4000000000ull
 
 const uint64 PARTSIZE		= 9728000ull;
 const uint32 BLOCKSIZE		= 184320u;

aMule-2.2.6.tar.bz2/src/include/protocol/kad/Client2Client/UDP.h -> aMule-2.3.1.tar.bz2/src/include/protocol/kad/Client2Client/UDP.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,35 +27,35 @@
 #define KADC2CUDP_H
 
 enum KademliaV1OPcodes {
-	KADEMLIA_BOOTSTRAP_REQ		= 0x00,	// <PEER (sender) [25]>
-	KADEMLIA_BOOTSTRAP_RES		= 0x08,	// <CNT [2]> <PEER [25]>*(CNT)
+	KADEMLIA_BOOTSTRAP_REQ_DEPRECATED	= 0x00,	// <PEER (sender) [25]>
+	KADEMLIA_BOOTSTRAP_RES_DEPRECATED	= 0x08,	// <CNT [2]> <PEER [25]>*(CNT)
 
-	KADEMLIA_HELLO_REQ		= 0x10,	// <PEER (sender) [25]>
-	KADEMLIA_HELLO_RES		= 0x18,	// <PEER (receiver) [25]>
+	KADEMLIA_HELLO_REQ_DEPRECATED		= 0x10,	// <PEER (sender) [25]>
+	KADEMLIA_HELLO_RES_DEPRECATED		= 0x18,	// <PEER (receiver) [25]>
 
-	KADEMLIA_REQ			= 0x20,	// <TYPE [1]> <HASH (target) [16]> <HASH (receiver) 16>
-	KADEMLIA_RES			= 0x28,	// <HASH (target) [16]> <CNT> <PEER [25]>*(CNT)
+	KADEMLIA_REQ_DEPRECATED			= 0x20,	// <TYPE [1]> <HASH (target) [16]> <HASH (receiver) 16>
+	KADEMLIA_RES_DEPRECATED			= 0x28,	// <HASH (target) [16]> <CNT> <PEER [25]>*(CNT)
 
-	KADEMLIA_SEARCH_REQ		= 0x30,	// <HASH (key) [16]> <ext 0/1 [1]> <SEARCH_TREE>[ext]
+	KADEMLIA_SEARCH_REQ			= 0x30,	// <HASH (key) [16]> <ext 0/1 [1]> <SEARCH_TREE>[ext]
 	// UNUSED				= 0x31,	// Old Opcode, don't use.
-	KADEMLIA_SEARCH_NOTES_REQ	= 0x32,	// <HASH (key) [16]>
-	KADEMLIA_SEARCH_RES		= 0x38,	// <HASH (key) [16]> <CNT1 [2]> (<HASH (answer) [16]> <CNT2 [2]> <META>*(CNT2))*(CNT1)
+	KADEMLIA_SEARCH_NOTES_REQ		= 0x32,	// <HASH (key) [16]>
+	KADEMLIA_SEARCH_RES			= 0x38,	// <HASH (key) [16]> <CNT1 [2]> (<HASH (answer) [16]> <CNT2 [2]> <META>*(CNT2))*(CNT1)
 	// UNUSED				= 0x39,	// Old Opcode, don't use.
-	KADEMLIA_SEARCH_NOTES_RES	= 0x3A,	// <HASH (key) [16]> <CNT1 [2]> (<HASH (answer) [16]> <CNT2 [2]> <META>*(CNT2))*(CNT1)
+	KADEMLIA_SEARCH_NOTES_RES		= 0x3A,	// <HASH (key) [16]> <CNT1 [2]> (<HASH (answer) [16]> <CNT2 [2]> <META>*(CNT2))*(CNT1)
 
-	KADEMLIA_PUBLISH_REQ		= 0x40,	// <HASH (key) [16]> <CNT1 [2]> (<HASH (target) [16]> <CNT2 [2]> <META>*(CNT2))*(CNT1)
+	KADEMLIA_PUBLISH_REQ			= 0x40,	// <HASH (key) [16]> <CNT1 [2]> (<HASH (target) [16]> <CNT2 [2]> <META>*(CNT2))*(CNT1)
 	// UNUSED				= 0x41,	// Old Opcode, don't use.
-	KADEMLIA_PUBLISH_NOTES_REQ	= 0x42,	// <HASH (key) [16]> <HASH (target) [16]> <CNT2 [2]> <META>*(CNT2))*(CNT1)
-	KADEMLIA_PUBLISH_RES		= 0x48,	// <HASH (key) [16]>
+	KADEMLIA_PUBLISH_NOTES_REQ_DEPRECATED	= 0x42,	// <HASH (key) [16]> <HASH (target) [16]> <CNT2 [2]> <META>*(CNT2))*(CNT1)
+	KADEMLIA_PUBLISH_RES			= 0x48,	// <HASH (key) [16]>
 	// UNUSED				= 0x49,	// Old Opcode, don't use.
-	KADEMLIA_PUBLISH_NOTES_RES	= 0x4A,	// <HASH (key) [16]>
-
-	KADEMLIA_FIREWALLED_REQ		= 0x50,	// <TCPPORT (sender) [2]>
-	KADEMLIA_FINDBUDDY_REQ		= 0x51,	// <TCPPORT (sender) [2]>
-	KADEMLIA_CALLBACK_REQ		= 0x52,	// <TCPPORT (sender) [2]>
-	KADEMLIA_FIREWALLED_RES		= 0x58,	// <IP (sender) [4]>
-	KADEMLIA_FIREWALLED_ACK_RES	= 0x59,	// (null)
-	KADEMLIA_FINDBUDDY_RES		= 0x5A	// <TCPPORT (sender) [2]>
+	KADEMLIA_PUBLISH_NOTES_RES_DEPRECATED	= 0x4A,	// <HASH (key) [16]>
+
+	KADEMLIA_FIREWALLED_REQ			= 0x50,	// <TCPPORT (sender) [2]>
+	KADEMLIA_FINDBUDDY_REQ			= 0x51,	// <TCPPORT (sender) [2]>
+	KADEMLIA_CALLBACK_REQ			= 0x52,	// <TCPPORT (sender) [2]>
+	KADEMLIA_FIREWALLED_RES			= 0x58,	// <IP (sender) [4]>
+	KADEMLIA_FIREWALLED_ACK_RES		= 0x59,	// (null)
+	KADEMLIA_FINDBUDDY_RES			= 0x5A	// <TCPPORT (sender) [2]>
 };
 
 #endif // KADC2CUDP_H

aMule-2.2.6.tar.bz2/src/include/protocol/kad/Constants.h -> aMule-2.3.1.tar.bz2/src/include/protocol/kad/Constants.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -45,12 +45,13 @@
 #define	KADEMLIAMAXENTRIES		60000		//Total keyword entries.
 #define	KADEMLIAMAXSOURCEPERFILE	1000		//Max number of sources per file in index.
 #define	KADEMLIAMAXNOTESPERFILE		150		//Max number of notes per entry in index.
-#define KADEMLIAFIREWALLCHECKS		4		//Firewallcheck Request at a time
+#define	KADEMLIAFIREWALLCHECKS		4		//Firewallcheck Request at a time
 // MOD Note: end
 
 // Kad parameters
 #define	KADEMLIA_FIND_VALUE		0x02
 #define	KADEMLIA_STORE			0x04
 #define	KADEMLIA_FIND_NODE		0x0B
+#define	KADEMLIA_FIND_VALUE_MORE	KADEMLIA_FIND_NODE
 
 #endif // KADCONSTANTS_H

aMule-2.2.6.tar.bz2/src/include/protocol/kad2/Client2Client/TCP.h -> aMule-2.3.1.tar.bz2/src/include/protocol/kad2/Client2Client/TCP.h Changed

aMule-2.2.6.tar.bz2/src/include/protocol/kad2/Client2Client/UDP.h -> aMule-2.3.1.tar.bz2/src/include/protocol/kad2/Client2Client/UDP.h Changed

aMule-2.2.6.tar.bz2/src/include/protocol/kad2/Constants.h -> aMule-2.3.1.tar.bz2/src/include/protocol/kad2/Constants.h Changed

aMule-2.2.6.tar.bz2/src/include/tags/ClientTags.h -> aMule-2.3.1.tar.bz2/src/include/tags/ClientTags.h Changed

aMule-2.2.6.tar.bz2/src/include/tags/FileTags.h -> aMule-2.3.1.tar.bz2/src/include/tags/FileTags.h Changed

aMule-2.2.6.tar.bz2/src/include/tags/ServerTags.h -> aMule-2.3.1.tar.bz2/src/include/tags/ServerTags.h Changed

aMule-2.2.6.tar.bz2/src/include/tags/TagTypes.h -> aMule-2.3.1.tar.bz2/src/include/tags/TagTypes.h Changed

aMule-2.2.6.tar.bz2/src/inetdownload.h -> aMule-2.3.1.tar.bz2/src/inetdownload.h Changed

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/Defines.h -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/Defines.h Changed

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/Entry.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/Entry.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 Dévai Tamás ( gonosztopi@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -55,9 +55,7 @@
 ////// CEntry
 CEntry::~CEntry()
 {
-	for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end(); ++it) {
-		delete *it;
-	}
+	deleteTagPtrListEntries(&m_taglist);
 }
 
 CEntry* CEntry::Copy() const
@@ -80,13 +78,6 @@
 	return entry;
 }
 
-uint64_t CEntry::GetIntTagValue(const wxString& tagname, bool includeVirtualTags) const
-{
-	uint64_t result = 0;
-	GetIntTagValue(tagname, result, includeVirtualTags);
-	return result;
-}
-
 bool CEntry::GetIntTagValue(const wxString& tagname, uint64_t& value, bool includeVirtualTags) const
 {
 	for (TagPtrList::const_iterator it = m_taglist.begin(); it != m_taglist.end(); ++it) {
@@ -325,11 +316,11 @@
 	return false;
 }
 
-void CKeyEntry::AdjustGlobalPublishTracking(uint32_t ip, bool increase, const wxString& dbgReason)
+void CKeyEntry::AdjustGlobalPublishTracking(uint32_t ip, bool increase, const wxString& DEBUG_ONLY(dbgReason))
 {
 	uint32_t count = 0;
 	bool found = false;
-	GlobalPublishIPMap::const_iterator it = s_globalPublishIPs.find(ip & 0xFFFFFF00 /* /24 netmask, take care of endian if needed*/);
+	GlobalPublishIPMap::const_iterator it = s_globalPublishIPs.find(ip & 0xFFFFFF00 /* /24 netmask, take care of endian if needed */ );
 	if (it != s_globalPublishIPs.end()) {
 		count = it->second;
 		found = true;
@@ -341,14 +332,19 @@
 		count--;
 	}
 
-	if (found || increase) {
+	if (count > 0) {
 		s_globalPublishIPs[ip & 0xFFFFFF00] = count;
+	} else if (found) {
+		s_globalPublishIPs.erase(ip & 0xFFFFFF00);
 	} else {
 		wxFAIL;
 	}
-	//LOGTODO
-	//if (!dbgReason.IsEmpty())
-	//	AddDebugLogLineM(false, logKadEntryTracking, (increase ? wxT("Adding ") : wxT("Removing ")) + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip & 0xFFFFFF00)) + wxT(" (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(") - (") + dbgReason + wxString::Format(wxT("), new count %u"),count));
+#ifdef __DEBUG__
+	if (!dbgReason.IsEmpty()) {
+		AddDebugLogLineN(logKadEntryTracking, CFormat(wxT("%s %s (%s) - (%s), new count %u"))
+			% (increase ? wxT("Adding") : wxT("Removing")) % KadIPToString(ip & 0xFFFFFF00) % KadIPToString(ip) % dbgReason % count);
+	}
+#endif
 }
 
 void CKeyEntry::MergeIPsAndFilenames(CKeyEntry* fromEntry)
@@ -373,8 +369,6 @@
 		}
 		// update the global track map below
 	} else {
-		delete m_publishingIPs; // should be always NULL, already ASSERTed above if not
-
 		// merge the tracked IPs, add this one if not already on the list
 		m_publishingIPs = fromEntry->m_publishingIPs;
 		fromEntry->m_publishingIPs = NULL;	
@@ -383,7 +377,7 @@
 			if (it->m_ip == m_uIP) {
 				refresh = true;
 				if ((time(NULL) - it->m_lastPublish) < (KADEMLIAREPUBLISHTIMES - HR2S(1))) {
-					//AddDebugLogLineM(false, logKadEntryTracking, wxT("FastRefresh publish, ip: ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(m_uIP)));
+					AddDebugLogLineN(logKadEntryTracking, wxT("FastRefresh publish, ip: ") + KadIPToString(m_uIP));
 					fastRefresh = true; // refreshed faster than expected, will not count into filenamepopularity index
 				}
 				it->m_lastPublish = time(NULL);
@@ -441,9 +435,8 @@
 		// since we added a new publisher, we want to (re)calculate the trust value for this entry		
 		ReCalculateTrustValue();
 	}
-// #ifdef __DEBUG__
-// 	AddDebugLogLineM(false, logKadEntryTracking, wxString(wxT("Indexed Keyword, Refresh: ")) + (refresh ? wxT("Yes") : wxT("No")) + wxT(", Current Publisher: ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(m_uIP)) + wxString::Format(wxT(", Total Publishers: %u, Total different Names: %u, TrustValue: %.2f, file: "), m_publishingIPs->size(), m_filenames.size(), m_trustValue) + m_uSourceID.ToHexString());
-// #endif
+	AddDebugLogLineN(logKadEntryTracking, CFormat(wxT("Indexed Keyword, Refresh: %s, Current Publisher: %s, Total Publishers: %u, Total different Names: %u, TrustValue: %.2f, file: %s"))
+		% (refresh ? wxT("Yes") : wxT("No")) % KadIPToString(m_uIP) % m_publishingIPs->size() % m_filenames.size() % m_trustValue % m_uSourceID.ToHexString());
 }
 
 void CKeyEntry::ReCalculateTrustValue()
@@ -478,7 +471,7 @@
 		if (count > 0) {
 			m_trustValue += PUBLISHPOINTSSPERSUBNET / count;
 		} else {
-			AddDebugLogLineM(false, logKadEntryTracking, wxT("Inconsistency in RecalcualteTrustValue()"));
+			AddDebugLogLineN(logKadEntryTracking, wxT("Inconsistency in RecalcualteTrustValue()"));
 			wxFAIL;
 		}
 	}
@@ -549,14 +542,18 @@
 	wxASSERT(m_publishingIPs == NULL);
 	m_publishingIPs = new PublishingIPList();
 	uint32_t ipCount = data->ReadUInt32();
+#ifdef __WXDEBUG__
 	uint32_t dbgLastTime = 0;
+#endif
 	for (uint32_t i = 0; i < ipCount; i++) {
 		sPublishingIP toAdd;
 		toAdd.m_ip = data->ReadUInt32();
 		wxASSERT(toAdd.m_ip != 0);
 		toAdd.m_lastPublish = data->ReadUInt32();
+#ifdef __WXDEBUG__
 		wxASSERT(dbgLastTime <= (uint32_t)toAdd.m_lastPublish); // should always be sorted oldest first
 		dbgLastTime = toAdd.m_lastPublish;
+#endif
 
 		AdjustGlobalPublishTracking(toAdd.m_ip, true, wxEmptyString);
 
@@ -565,7 +562,8 @@
 	ReCalculateTrustValue();
 // #ifdef __DEBUG__
 // 	if (GetTrustValue() < 1.0) {
-// 		AddDebugLogLineM(false, logKadEntryTracking, wxString::Format(wxT("Loaded %u different names, %u different publishIPs (trustvalue = %.2f) for file "), nameCount, ipCount, GetTrustValue()) + m_uSourceID.ToHexString());
+// 		AddDebugLogLineN(logKadEntryTracking,CFormat(wxT("Loaded %u different names, %u different publishIPs (trustvalue = %.2f) for file %s"))
+// 			% nameCount % ipCount % GetTrustValue() % m_uSourceID.ToHexString());
 // 	}
 // #endif
 }

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/Entry.h -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/Entry.h Changed

@@ -1,9 +1,9 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -76,7 +76,6 @@
 	virtual CEntry*	Copy() const;
 	virtual bool	IsKeyEntry() const throw()	{ return false; }
 	
-	uint64_t GetIntTagValue(const wxString& tagname, bool includeVirtualTags = true) const;
 	bool	 GetIntTagValue(const wxString& tagname, uint64_t& value, bool includeVirtualTags = true) const;
 	wxString GetStrTagValue(const wxString& tagname) const;

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/Error.h -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/Error.h Changed

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/Indexed.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/Indexed.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -234,14 +234,14 @@
 			m_totalIndexSource = totalSource;
 			m_totalIndexKeyword = totalKeyword;
 			m_totalIndexLoad = totalLoad;
-			AddDebugLogLineM(false, logKadIndex, wxString::Format(wxT("Read %u source, %u keyword, and %u load entries"),totalSource,totalKeyword,totalLoad));
+			AddDebugLogLineN(logKadIndex, CFormat(wxT("Read %u source, %u keyword, and %u load entries")) % totalSource % totalKeyword % totalLoad);
 		}
 	} catch (const CSafeIOException& err) {
-		AddDebugLogLineM(true, logKadIndex, wxT("CSafeIOException in CIndexed::readFile: ") + err.what());
+		AddDebugLogLineC(logKadIndex, wxT("CSafeIOException in CIndexed::readFile: ") + err.what());
 	} catch (const CInvalidPacket& err) {
-		AddDebugLogLineM(true, logKadIndex, wxT("CInvalidPacket Exception in CIndexed::readFile: ") + err.what());		
+		AddDebugLogLineC(logKadIndex, wxT("CInvalidPacket Exception in CIndexed::readFile: ") + err.what());
 	} catch (const wxString& e) {
-		AddDebugLogLineM(true, logKadIndex, wxT("Exception in CIndexed::readFile: ") + e);
+		AddDebugLogLineC(logKadIndex, wxT("Exception in CIndexed::readFile: ") + e);
 	}
 }
 
@@ -350,7 +350,7 @@
 			}
 			k_file.Close();
 		}
-		AddDebugLogLineM( false, logKadIndex, wxString::Format(wxT("Wrote %u source, %u keyword, and %u load entries"), s_total, k_total, l_total));
+		AddDebugLogLineN(logKadIndex, CFormat(wxT("Wrote %u source, %u keyword, and %u load entries")) % s_total % k_total % l_total);
 
 		for (SrcHashMap::iterator itNoteHash = m_Notes_map.begin(); itNoteHash != m_Notes_map.end(); ++itNoteHash) {
 			SrcHash* currNoteHash = itNoteHash->second;
@@ -369,11 +369,11 @@
 
 		m_Notes_map.clear();
 	} catch (const CSafeIOException& err) {
-		AddDebugLogLineM(true, logKadIndex, wxT("CSafeIOException in CIndexed::~CIndexed: ") + err.what());
+		AddDebugLogLineC(logKadIndex, wxT("CSafeIOException in CIndexed::~CIndexed: ") + err.what());
 	} catch (const CInvalidPacket& err) {
-		AddDebugLogLineM(true, logKadIndex, wxT("CInvalidPacket Exception in CIndexed::~CIndexed: ") + err.what());		
+		AddDebugLogLineC(logKadIndex, wxT("CInvalidPacket Exception in CIndexed::~CIndexed: ") + err.what());
 	} catch (const wxString& e) {
-		AddDebugLogLineM(true, logKadIndex, wxT("Exception in CIndexed::~CIndexed: ") + e);
+		AddDebugLogLineC(logKadIndex, wxT("Exception in CIndexed::~CIndexed: ") + e);
 	}
 }
 
@@ -468,7 +468,7 @@
 
 	m_totalIndexSource = s_Total - s_Removed;
 	m_totalIndexKeyword = k_Total - k_Removed;
-	AddDebugLogLineM( false, logKadIndex, wxString::Format(wxT("Removed %u keyword out of %u and %u source out of %u"),  k_Removed, k_Total, s_Removed, s_Total));
+	AddDebugLogLineN(logKadIndex, CFormat(wxT("Removed %u keyword out of %u and %u source out of %u")) % k_Removed % k_Total % s_Removed % s_Total);
 	m_lastClean = tNow + MIN2S(30);
 }
 
@@ -536,7 +536,7 @@
 				entry->MergeIPsAndFilenames(oldEntry);	// oldEntry can be NULL, that's ok and we still need to do this call in this case
 				if (oldEntry == NULL) {
 					m_totalIndexKeyword++;
-					AddDebugLogLineM(false, logKadIndex, wxT("Multiple sizes published for file ") + entry->m_uSourceID.ToHexString());
+					AddDebugLogLineN(logKadIndex, wxT("Multiple sizes published for file ") + entry->m_uSourceID.ToHexString());
 				}
 				delete oldEntry;
 				oldEntry = NULL;
@@ -732,16 +732,14 @@
 	return true;
 }
 
-void CIndexed::SendValidKeywordResult(const CUInt128& keyID, const SSearchTerm* pSearchTerms, uint32_t ip, uint16_t port, bool oldClient, bool kad2, uint16_t startPosition, const CKadUDPKey& senderKey)
+void CIndexed::SendValidKeywordResult(const CUInt128& keyID, const SSearchTerm* pSearchTerms, uint32_t ip, uint16_t port, bool oldClient, uint16_t startPosition, const CKadUDPKey& senderKey)
 {
 	KeyHash* currKeyHash = NULL;
 	KeyHashMap::iterator itKeyHash = m_Keyword_map.find(keyID);
 	if (itKeyHash != m_Keyword_map.end()) {
 		currKeyHash = itKeyHash->second;
 		CMemFile packetdata(1024 * 50);
-		if (kad2) {
-			packetdata.WriteUInt128(Kademlia::CKademlia::GetPrefs()->GetKadID());
-		}
+		packetdata.WriteUInt128(Kademlia::CKademlia::GetPrefs()->GetKadID());
 		packetdata.WriteUInt128(keyID);
 		packetdata.WriteUInt16(50);
 		const uint16_t maxResults = 300;
@@ -752,8 +750,8 @@
 		// of spam entries. We could also sort by trustvalue, but we would risk to only send popular files this way
 		// on very hot keywords
 		bool onlyTrusted = true;
-		//uint32_t dbgResultsTrusted = 0;
-		//uint32_t dbgResultsUntrusted = 0;
+		DEBUG_ONLY( uint32_t dbgResultsTrusted = 0; )
+		DEBUG_ONLY( uint32_t dbgResultsUntrusted = 0; )
 
 		do {
 			for (CSourceKeyMap::iterator itSource = currKeyHash->m_Source_map.begin(); itSource != currKeyHash->m_Source_map.end(); ++itSource) {
@@ -768,31 +766,20 @@
 						} else if ((uint16_t)count < maxResults) {
 							if (!oldClient || currName->m_uSize <= OLD_MAX_FILE_SIZE) {
 								count++;
-								//if (onlyTrusted) {
-								//	dbgResultsTrusted++;
-								//} else {
-								//	dbgResultsUntrusted++;
-								//}
-								packetdata.WriteUInt128(currName->m_uSourceID);
-								if (kad2) {
-									currName->WriteTagListWithPublishInfo(&packetdata);
+#ifdef __DEBUG__
+								if (onlyTrusted) {
+									dbgResultsTrusted++;
 								} else {
-									currName->WriteTagList(&packetdata);
+									dbgResultsUntrusted++;
 								}
+#endif
+								packetdata.WriteUInt128(currName->m_uSourceID);
+								currName->WriteTagListWithPublishInfo(&packetdata);
 								if (count % 50 == 0) {
-									if (kad2) {
-										DebugSend(Kad2SearchRes, ip, port);
-										CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
-									} else {
-										DebugSend(KadSearchRes, ip, port);
-										CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA_SEARCH_RES, ip, port, senderKey, NULL);
-									}
-									packetdata.Reset();
-									if (kad2) {
-										packetdata.WriteUInt128(Kademlia::CKademlia::GetPrefs()->GetKadID());
-									}
-									packetdata.WriteUInt128(keyID);
-									packetdata.WriteUInt16(50);
+									DebugSend(Kad2SearchRes, ip, port);
+									CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
+									// Reset the packet, keeping the header (Kad id, key id, number of entries)
+									packetdata.SetLength(16 + 16 + 2);
 								}
 							}
 						} else {
@@ -811,39 +798,29 @@
 			}
 		} while (!onlyTrusted);
 
-		// LOGTODO: Remove log
-		//AddDebugLogLineM(false, logKadIndex, wxString::Format(wxT("Kad keyword search result request: Sent %u trusted and %u untrusted results"), dbgResultsTrusted, dbgResultsUntrusted));
+		AddDebugLogLineN(logKadIndex, CFormat(wxT("Kad keyword search result request: Sent %u trusted and %u untrusted results")) % dbgResultsTrusted % dbgResultsUntrusted);
 
 		if (count > 0) {
 			uint16_t countLeft = (uint16_t)count % 50;
 			if (countLeft) {
-				if (kad2) {
-					packetdata.Seek(16 + 16);
-					packetdata.WriteUInt16(countLeft);
-					DebugSend(Kad2SearchRes, ip, port);
-					CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
-				} else {
-					packetdata.Seek(16);
-					packetdata.WriteUInt16(countLeft);
-					DebugSend(KadSearchRes, ip, port);
-					CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA_SEARCH_RES, ip, port, senderKey, NULL);
-				}
+				packetdata.Seek(16 + 16);
+				packetdata.WriteUInt16(countLeft);
+				DebugSend(Kad2SearchRes, ip, port);
+				CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
 			}
 		}
 	}
 	Clean();
 }
 
-void CIndexed::SendValidSourceResult(const CUInt128& keyID, uint32_t ip, uint16_t port, bool kad2, uint16_t startPosition, uint64_t fileSize, const CKadUDPKey& senderKey)
+void CIndexed::SendValidSourceResult(const CUInt128& keyID, uint32_t ip, uint16_t port, uint16_t startPosition, uint64_t fileSize, const CKadUDPKey& senderKey)
 {
 	SrcHash* currSrcHash = NULL;
 	SrcHashMap::iterator itSrcHash = m_Sources_map.find(keyID);
 	if (itSrcHash != m_Sources_map.end()) {
 		currSrcHash = itSrcHash->second;
 		CMemFile packetdata(1024*50);
-		if (kad2) {
-			packetdata.WriteUInt128(Kademlia::CKademlia::GetPrefs()->GetKadID());
-		}
+		packetdata.WriteUInt128(Kademlia::CKademlia::GetPrefs()->GetKadID());
 		packetdata.WriteUInt128(keyID);
 		packetdata.WriteUInt16(50);
 		uint16_t maxResults = 300;
@@ -861,19 +838,10 @@
 						currName->WriteTagList(&packetdata);
 						count++;
 						if (count % 50 == 0) {
-							if (kad2) {
-								DebugSend(Kad2SearchRes, ip, port);
-								CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
-							} else {
-								DebugSend(KadSearchRes, ip, port);
-								CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA_SEARCH_RES, ip, port, senderKey, NULL);
-							}
-							packetdata.Reset();
-							if (kad2) {
-								packetdata.WriteUInt128(Kademlia::CKademlia::GetPrefs()->GetKadID());
-							}
-							packetdata.WriteUInt128(keyID);
-							packetdata.WriteUInt16(50);
+							DebugSend(Kad2SearchRes, ip, port);
+							CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
+							// Reset the packet, keeping the header (Kad id, key id, number of entries)
+							packetdata.SetLength(16 + 16 + 2);
 						}
 					}
 				} else {
@@ -885,33 +853,24 @@
 		if (count > 0) {
 			uint16_t countLeft = (uint16_t)count % 50;
 			if (countLeft) {
-				if (kad2) {
-					packetdata.Seek(16 + 16);
-					packetdata.WriteUInt16(countLeft);
-					DebugSend(Kad2SearchRes, ip, port);
-					CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
-				} else {
-					packetdata.Seek(16);
-					packetdata.WriteUInt16(countLeft);
-					DebugSend(KadSearchRes, ip, port);
-					CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA_SEARCH_RES, ip, port, senderKey, NULL);
-				}
+				packetdata.Seek(16 + 16);
+				packetdata.WriteUInt16(countLeft);
+				DebugSend(Kad2SearchRes, ip, port);
+				CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
 			}
 		}
 	}
 	Clean();
 }
 
-void CIndexed::SendValidNoteResult(const CUInt128& keyID, uint32_t ip, uint16_t port, bool kad2, uint64_t fileSize, const CKadUDPKey& senderKey)
+void CIndexed::SendValidNoteResult(const CUInt128& keyID, uint32_t ip, uint16_t port, uint64_t fileSize, const CKadUDPKey& senderKey)
 {
 	SrcHash* currNoteHash = NULL;
 	SrcHashMap::iterator itNote = m_Notes_map.find(keyID);
 	if (itNote != m_Notes_map.end()) {
 		currNoteHash = itNote->second;		
 		CMemFile packetdata(1024*50);
-		if (kad2) {
-			packetdata.WriteUInt128(Kademlia::CKademlia::GetPrefs()->GetKadID());
-		}
+		packetdata.WriteUInt128(Kademlia::CKademlia::GetPrefs()->GetKadID());
 		packetdata.WriteUInt128(keyID);
 		packetdata.WriteUInt16(50);
 		uint16_t maxResults = 150;
@@ -927,19 +886,10 @@
 						currName->WriteTagList(&packetdata);
 						count++;
 						if (count % 50 == 0) {
-							if (kad2) {
-								DebugSend(Kad2SearchRes, ip, port);
-								CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
-							} else {
-								DebugSend(KadSearchNotesRes, ip, port);
-								CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA_SEARCH_NOTES_RES, ip, port, senderKey, NULL);
-							}
-							packetdata.Reset();
-							if (kad2) {
-								packetdata.WriteUInt128(Kademlia::CKademlia::GetPrefs()->GetKadID());
-							}
-							packetdata.WriteUInt128(keyID);
-							packetdata.WriteUInt16(50);
+							DebugSend(Kad2SearchRes, ip, port);
+							CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
+							// Reset the packet, keeping the header (Kad id, key id, number of entries)
+							packetdata.SetLength(16 + 16 + 2);
 						}
 					}
 				} else {
@@ -950,17 +900,10 @@
 
 		uint16_t countLeft = count % 50;
 		if (countLeft) {
-			if (kad2) {
-				packetdata.Seek(16 + 16);
-				packetdata.WriteUInt16(countLeft);
-				DebugSend(Kad2SearchRes, ip, port);
-				CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
-			} else {
-				packetdata.Seek(16);
-				packetdata.WriteUInt16(countLeft);
-				DebugSend(KadSearchNotesRes, ip, port);
-				CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA_SEARCH_NOTES_RES, ip, port, senderKey, NULL);
-			}
+			packetdata.Seek(16 + 16);
+			packetdata.WriteUInt16(countLeft);
+			DebugSend(Kad2SearchRes, ip, port);
+			CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_SEARCH_RES, ip, port, senderKey, NULL);
 		}
 	}
 }

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/Indexed.h -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/Indexed.h Changed

@@ -1,9 +1,9 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -124,9 +124,9 @@
 	bool AddNotes(const CUInt128& keyID, const CUInt128& sourceID, Kademlia::CEntry* entry, uint8_t& load);
 	bool AddLoad(const CUInt128& keyID, uint32_t time);
 	size_t GetFileKeyCount() const throw() { return m_Keyword_map.size(); }
-	void SendValidKeywordResult(const CUInt128& keyID, const SSearchTerm* pSearchTerms, uint32_t ip, uint16_t port, bool oldClient, bool kad2, uint16_t startPosition, const CKadUDPKey& senderKey);
-	void SendValidSourceResult(const CUInt128& keyID, uint32_t ip, uint16_t port, bool kad2, uint16_t startPosition, uint64_t fileSize, const CKadUDPKey& senderKey);
-	void SendValidNoteResult(const CUInt128& keyID, uint32_t ip, uint16_t port, bool kad2, uint64_t fileSize, const CKadUDPKey& senderKey);
+	void SendValidKeywordResult(const CUInt128& keyID, const SSearchTerm* pSearchTerms, uint32_t ip, uint16_t port, bool oldClient, uint16_t startPosition, const CKadUDPKey& senderKey);
+	void SendValidSourceResult(const CUInt128& keyID, uint32_t ip, uint16_t port, uint16_t startPosition, uint64_t fileSize, const CKadUDPKey& senderKey);
+	void SendValidNoteResult(const CUInt128& keyID, uint32_t ip, uint16_t port, uint64_t fileSize, const CKadUDPKey& senderKey);
 	bool SendStoreRequest(const CUInt128& keyID);
 	uint32_t m_totalIndexSource;
 	uint32_t m_totalIndexKeyword;

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/Kademlia.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/Kademlia.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -50,6 +50,9 @@
 #include "../../Logger.h"
 #include <protocol/kad2/Client2Client/UDP.h>
 
+#ifdef _MSC_VER  // silly warnings about deprecated functions
+#pragma warning(disable:4996)
+#endif
 
 ////////////////////////////////////////
 using namespace Kademlia;
@@ -66,8 +69,11 @@
 time_t		CKademlia::m_bootstrap;
 time_t		CKademlia::m_consolidate;
 time_t		CKademlia::m_externPortLookup;
+time_t		CKademlia::m_lanModeCheck = 0;
 bool		CKademlia::m_running = false;
+bool		CKademlia::m_lanMode = false;
 ContactList	CKademlia::s_bootstrapList;
+std::list<uint32_t>	CKademlia::m_statsEstUsersProbes;
 
 void CKademlia::Start(CPrefs *prefs)
 {
@@ -84,7 +90,7 @@
 		return;
 	}
 
-	AddDebugLogLineM(false, logKadMain, wxT("Starting Kademlia"));
+	AddDebugLogLineN(logKadMain, wxT("Starting Kademlia"));
 
 	// Init jump start timer.
 	m_nextSearchJumpStart = time(NULL);
@@ -125,7 +131,7 @@
 		return;
 	}
 
-	AddDebugLogLineM(false, logKadMain, wxT("Stopping Kademlia"));
+	AddDebugLogLineN(logKadMain, wxT("Stopping Kademlia"));
 
 	// Mark Kad as being in the stop state to make sure nothing else is used.
 	m_running = false;
@@ -203,11 +209,11 @@
 		// If our UDP firewallcheck is running and we don't know our external port, we send a request every 15 seconds
 		CContact *contact = GetRoutingZone()->GetRandomContact(3, 6);
 		if (contact != NULL) {
-			AddDebugLogLineM(false, logKadMain, wxT("Requesting our external port from ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress())));
+			AddDebugLogLineN(logKadPrefs, wxT("Requesting our external port from ") + KadIPToString(contact->GetIPAddress()));
 			DebugSend(Kad2Ping, contact->GetIPAddress(), contact->GetUDPPort());
 			GetUDPListener()->SendNullPacket(KADEMLIA2_PING, contact->GetIPAddress(), contact->GetUDPPort(), contact->GetUDPKey(), &contact->GetClientID());
 		} else {
-			AddDebugLogLineM(false, logKadMain, wxT("No valid client for requesting external port available"));
+			AddDebugLogLineN(logKadPrefs, wxT("No valid client for requesting external port available"));
 		}
 		m_externPortLookup = 15 + now;
 	}
@@ -215,7 +221,13 @@
 	for (EventMap::const_iterator it = m_events.begin(); it != m_events.end(); ++it) {
 		CRoutingZone *zone = it->first;
 		if (updateUserFile) {
-			tempUsers = zone->EstimateCount();
+			// The EstimateCount function is not made for really small networks, if we are in LAN mode, it is actually
+			// better to assume that all users of the network are in our routing table and use the real count function
+			if (IsRunningInLANMode()) {
+				tempUsers = zone->GetNumContacts();
+			} else {
+				tempUsers = zone->EstimateCount();
+			}
 			if (maxUsers < tempUsers) {
 				maxUsers = tempUsers;
 			}
@@ -253,7 +265,7 @@
 	if (m_consolidate <= now) {
 		uint32_t mergedCount = instance->m_routingZone->Consolidate();
 		if (mergedCount) {
-			AddDebugLogLineM(false, logKadRouting, wxString::Format(wxT("Kad merged %u zones"), mergedCount));
+			AddDebugLogLineN(logKadRouting, CFormat(wxT("Kad merged %u zones")) % mergedCount);
 		}
 		m_consolidate = MIN2S(45) + now;
 	}
@@ -271,8 +283,9 @@
 		CContact *contact = s_bootstrapList.front();
 		s_bootstrapList.pop_front();
 		m_bootstrap = now;
-		AddDebugLogLineM(false, logKadMain, wxT("Trying to bootstrap Kad from ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress())) + wxT(", Distance: ") + contact->GetDistance().ToHexString() + wxString::Format(wxT(" Version: %u, %u contacts left"), contact->GetVersion(), s_bootstrapList.size()));
-		instance->m_udpListener->Bootstrap(contact->GetIPAddress(), contact->GetUDPPort(), contact->GetVersion() > 1, contact->GetVersion(), &contact->GetClientID());
+		AddDebugLogLineN(logKadMain, CFormat(wxT("Trying to bootstrap Kad from %s, Distance: %s Version: %u, %u contacts left"))
+			% KadIPToString(contact->GetIPAddress()) % contact->GetDistance().ToHexString() % contact->GetVersion() % s_bootstrapList.size());
+		instance->m_udpListener->Bootstrap(contact->GetIPAddress(), contact->GetUDPPort(), contact->GetVersion(), &contact->GetClientID());
 		delete contact;
 	}
 
@@ -287,19 +300,20 @@
 		if( instance && instance->m_udpListener ) {
 			instance->m_udpListener->ProcessPacket(data, lenData, ip, port, validReceiverKey, senderKey);
 		}
-	} catch (const wxString& error) {
-		AddDebugLogLineM(false, logKadMain, wxString::Format(wxT("Exception on Kad ProcessPacket while processing packet (length = %u) from "), lenData) + Uint32_16toStringIP_Port(wxUINT32_SWAP_ALWAYS(ip), port) + wxT(':'));
-		AddDebugLogLineM(false, logKadMain, error);
+	} catch (const wxString& DEBUG_ONLY(error)) {
+		AddDebugLogLineN(logKadMain, CFormat(wxT("Exception on Kad ProcessPacket while processing packet (length = %u) from %s:"))
+			% lenData % KadIPPortToString(ip, port));
+		AddDebugLogLineN(logKadMain, error);
 		throw;
 	} catch (...) {
-		AddDebugLogLineM(false, logKadMain, wxT("Unhandled exception on Kad ProcessPacket"));
+		AddDebugLogLineN(logKadMain, wxT("Unhandled exception on Kad ProcessPacket"));
 		throw;
 	}
 }
 
 void CKademlia::RecheckFirewalled()
 {
-	if (instance && instance->m_prefs) {
+	if (instance && instance->m_prefs && !IsRunningInLANMode()) {
 		// Something is forcing a new firewall check
 		// Stop any new buddy requests, and tell the client
 		// to recheck it's IP which in turns rechecks firewall.
@@ -354,6 +368,128 @@
 	CSearchManager::CancelNodeSpecial(&fromRequester);
 }
 
+void CKademlia::StatsAddClosestDistance(const CUInt128& distance)
+{
+	if (distance.Get32BitChunk(0) > 0) {
+		uint32_t toAdd = (0xFFFFFFFF / distance.Get32BitChunk(0)) / 2;
+		std::list<uint32_t>::iterator it = m_statsEstUsersProbes.begin();
+		for (; it != m_statsEstUsersProbes.end(); ++it) {
+			if (*it == toAdd) {
+				break;
+			}
+		}
+		if (it == m_statsEstUsersProbes.end()) {
+			m_statsEstUsersProbes.push_front(toAdd);
+		}
+	}
+	if (m_statsEstUsersProbes.size() > 100) {
+		m_statsEstUsersProbes.pop_back();
+	}
+}
+
+uint32_t CKademlia::CalculateKadUsersNew()
+{
+	// the idea of calculating the user count with this method is simple:
+	// whenever we do a search for any NodeID (except in certain cases where the result is not usable),
+	// we remember the distance of the closest node we found. Because we assume all NodeIDs are distributed
+	// equally, we can calculate based on this distance how "filled" the possible NodesID room is and by this
+	// calculate how many users there are. Of course this only works if we have enough samples, because
+	// each single sample will be wrong, but the average of them should produce a usable number. To avoid
+	// drifts caused by a a single (or more) really close or really far away hits, we do use median-average instead through
+
+	// doesn't work well if we have no files to index and nothing to download and the numbers seems to be a bit too low
+	// compared to our other method. So let's stay with the old one for now, but keep this here as an alternative
+
+	if (m_statsEstUsersProbes.size() < 10) {
+		return 0;
+	}
+	uint32_t median = 0;
+
+	std::list<uint32_t> medianList;
+	for (std::list<uint32_t>::iterator it1 = m_statsEstUsersProbes.begin(); it1 != m_statsEstUsersProbes.end(); ++it1) {
+		uint32_t probe = *it1;
+		bool inserted = false;
+		for (std::list<uint32_t>::iterator it2 = medianList.begin(); it2 != medianList.end(); ++it2) {
+			if (*it2 > probe) {
+				medianList.insert(it2, probe);
+				inserted = true;
+				break;
+			}
+		}
+		if (!inserted) {
+			medianList.push_back(probe);
+		}
+	}
+	// cut away 1/3 of the values - 1/6 of the top and 1/6 of the bottom  to avoid spikes having too much influence, build the average of the rest
+	std::list<uint32_t>::size_type cut = medianList.size() / 6;
+	for (std::list<uint32_t>::size_type i = 0; i != cut; ++i) {
+		medianList.pop_front();
+		medianList.pop_back();
+	}
+	uint64_t average = 0;
+	for (std::list<uint32_t>::iterator it = medianList.begin(); it != medianList.end(); ++it) {
+		average += *it;
+	}
+	median = (uint32_t)(average / medianList.size());
+
+	// LowIDModififier
+	// Modify count by assuming 20% of the users are firewalled and can't be a contact for < 0.49b nodes
+	// Modify count by actual statistics of Firewalled ratio for >= 0.49b if we are not firewalled ourself
+	// Modify count by 40% for >= 0.49b if we are firewalled ourself (the actual Firewalled count at this date on kad is 35-55%)
+	const float firewalledModifyOld = 1.20f;
+	float firewalledModifyNew = 0.0;
+	if (CUDPFirewallTester::IsFirewalledUDP(true)) {
+		firewalledModifyNew = 1.40f; // we are firewalled and can't get the real statistics, assume 40% firewalled >=0.49b nodes
+	} else if (GetPrefs()->StatsGetFirewalledRatio(true) > 0) {
+		firewalledModifyNew = 1.0 + (CKademlia::GetPrefs()->StatsGetFirewalledRatio(true)); // apply the firewalled ratio to the modify
+		wxASSERT(firewalledModifyNew > 1.0 && firewalledModifyNew < 1.90);
+	}
+	float newRatio = CKademlia::GetPrefs()->StatsGetKadV8Ratio();
+	float firewalledModifyTotal = 0.0;
+	if (newRatio > 0 && firewalledModifyNew > 0) { // weigth the old and the new modifier based on how many new contacts we have
+		firewalledModifyTotal = (newRatio * firewalledModifyNew) + ((1 - newRatio) * firewalledModifyOld);
+	} else {
+		firewalledModifyTotal = firewalledModifyOld;
+	}
+	wxASSERT(firewalledModifyTotal > 1.0 && firewalledModifyTotal < 1.90);
+
+	return (uint32_t)((float)median * firewalledModifyTotal);
+}
+
+bool CKademlia::IsRunningInLANMode()
+{
+	if (thePrefs::FilterLanIPs() || !IsRunning()) {
+		return false;
+	}
+
+	time_t now = time(NULL);
+	if (m_lanModeCheck + 10 <= now) {
+		m_lanModeCheck = now;
+		uint32_t count = GetRoutingZone()->GetNumContacts();
+		// Limit to 256 nodes, if we have more we don't want to use the LAN mode which is assuming we use a small home LAN
+		// (otherwise we might need to do firewallcheck, external port requests etc after all)
+		if (count == 0 || count > 256) {
+			m_lanMode = false;
+		} else {
+			if (GetRoutingZone()->HasOnlyLANNodes()) {
+				if (!m_lanMode) {
+					m_lanMode = true;
+					theApp->ShowConnectionState();
+					AddDebugLogLineN(logKadMain, wxT("Activating LAN mode"));
+				}
+			} else {
+				if (m_lanMode) {
+					m_lanMode = false;
+					theApp->ShowConnectionState();
+					AddDebugLogLineN(logKadMain, wxT("Deactivating LAN mode"));
+				}
+			}
+		}
+	}
+	return m_lanMode;
+}
+
+
 // Global function.
 
 #include "../../CryptoPP_Inc.h"
@@ -377,4 +513,3 @@
 	
 	pKadID->SetValueBE(Output);
 }
-// File_checked_for_headers

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/Kademlia.h -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/Kademlia.h Changed

@@ -1,9 +1,9 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -36,12 +36,13 @@
 there client on the eMule forum..
 */
 
+#include "Prefs.h"
+
 #ifndef __KAD_KADEMLIA_H__
 #define __KAD_KADEMLIA_H__
 
 #include <map>
 #include "../utils/UInt128.h"
-#include "Prefs.h"
 #include "../routing/Maps.h"
 #include "../net/KademliaUDPListener.h"
 #include <common/Macros.h>
@@ -66,14 +67,16 @@
 	static void Stop();
  
 	static CPrefs *			GetPrefs() throw()		{ if (instance == NULL || instance->m_prefs == NULL) return NULL; else return instance->m_prefs; }
-	static CRoutingZone *		GetRoutingZone() throw()	{ wxCHECK(instance && instance->m_routingZone, NULL); return instance->m_routingZone; }
-	static CKademliaUDPListener *	GetUDPListener() throw()	{ wxCHECK(instance && instance->m_udpListener, NULL); return instance->m_udpListener; }
-	static CIndexed *		GetIndexed() throw()		{ wxCHECK(instance && instance->m_indexed, NULL); return instance->m_indexed; }
+	static CRoutingZone *		GetRoutingZone()		{ wxCHECK(instance && instance->m_routingZone, NULL); return instance->m_routingZone; }
+	static CKademliaUDPListener *	GetUDPListener()		{ wxCHECK(instance && instance->m_udpListener, NULL); return instance->m_udpListener; }
+	static CIndexed *		GetIndexed()			{ wxCHECK(instance && instance->m_indexed, NULL); return instance->m_indexed; }
 	static bool			IsRunning() throw()		{ return m_running; }
 	static bool			IsConnected() throw()		{ return instance && instance->m_prefs ? instance->m_prefs->HasHadContact() : false; }
-	static bool			IsFirewalled() throw()		{ return instance && instance->m_prefs ? instance->m_prefs->GetFirewalled() : true; }
+	static bool			IsFirewalled()
+		{ return instance && instance->m_prefs ? instance->m_prefs->GetFirewalled() && !IsRunningInLANMode() : true; }
 	static void			RecheckFirewalled();
-	static uint32_t			GetKademliaUsers() throw()	{ return instance && instance->m_prefs ? instance->m_prefs->GetKademliaUsers() : 0; }
+	static uint32_t			GetKademliaUsers(bool newMethod = false)
+		{ return instance && instance->m_prefs ? (newMethod ? CalculateKadUsersNew() : instance->m_prefs->GetKademliaUsers()) : 0; }
 	static uint32_t			GetKademliaFiles() throw()	{ return instance && instance->m_prefs ? instance->m_prefs->GetKademliaFiles() : 0; }
 	static uint32_t			GetTotalStoreKey() throw()	{ return instance && instance->m_prefs ? instance->m_prefs->GetTotalStoreKey() : 0; }
 	static uint32_t			GetTotalStoreSrc() throw()	{ return instance && instance->m_prefs ? instance->m_prefs->GetTotalStoreSrc() : 0; }
@@ -81,12 +84,12 @@
 	static uint32_t			GetTotalFile() throw()		{ return instance && instance->m_prefs ? instance->m_prefs->GetTotalFile() : 0; }
 	static bool			GetPublish() throw()		{ return instance && instance->m_prefs ? instance->m_prefs->GetPublish() : false; }
 	static uint32_t			GetIPAddress() throw()		{ return instance && instance->m_prefs ? instance->m_prefs->GetIPAddress() : 0; }
-	static void Bootstrap(uint32_t ip, uint16_t port, bool kad2)
+	static void Bootstrap(uint32_t ip, uint16_t port)
 	{
 		time_t now = time(NULL);
 		if (instance && instance->m_udpListener && !IsConnected() && now - m_bootstrap > 10) {
 			m_bootstrap = now;
-			instance->m_udpListener->Bootstrap(ip, port, kad2);
+			instance->m_udpListener->Bootstrap(ip, port);
 		}
 	}
 
@@ -95,15 +98,19 @@
 	static void AddEvent(CRoutingZone *zone) throw()		{ m_events[zone] = zone; }
 	static void RemoveEvent(CRoutingZone *zone)			{ m_events.erase(zone); }
 	static void Process();
+	static void StatsAddClosestDistance(const CUInt128& distance);
 	static bool FindNodeIDByIP(CKadClientSearcher& requester, uint32_t ip, uint16_t tcpPort, uint16_t udpPort);
 	static bool FindIPByNodeID(CKadClientSearcher& requester, const uint8_t *nodeID);
 	static void CancelClientSearch(CKadClientSearcher& fromRequester);
+	static bool IsRunningInLANMode();
 
 	static ContactList	s_bootstrapList;
 
 private:
 	CKademlia() {}
 
+	static uint32_t	CalculateKadUsersNew();
+
 	static CKademlia *instance;
 	static EventMap	m_events;
 	static time_t	m_nextSearchJumpStart;
@@ -115,7 +122,10 @@
 	static time_t	m_bootstrap;
 	static time_t	m_consolidate;
 	static time_t	m_externPortLookup;
+	static time_t	m_lanModeCheck;
 	static bool	m_running;
+	static bool	m_lanMode;
+	static std::list<uint32_t>	m_statsEstUsersProbes;
 
 	CPrefs *		m_prefs;
 	CRoutingZone *		m_routingZone;

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/Prefs.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/Prefs.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -40,7 +40,6 @@
 
 #include <common/MD5Sum.h>
 
-#include "Kademlia.h"
 #include "Indexed.h"
 #include "UDPFirewallTester.h"
 #include "../routing/RoutingZone.h"
@@ -49,6 +48,7 @@
 #include "../../ServerList.h"
 #include "../../Logger.h"
 #include "../../ArchSpecific.h"
+#include "../../RandomFunctions.h"		// Needed for GetRandomUint128()
 
 
 ////////////////////////////////////////
@@ -72,7 +72,7 @@
 
 void CPrefs::Init(const wxString& filename)
 {
-	m_clientID.SetValueRandom();
+	m_clientID = GetRandomUint128();
 	m_lastContact = 0;
 	m_recheckip = 0;
 	m_firewalled = 0;
@@ -116,11 +116,11 @@
 			m_clientID = file.ReadUInt128();
 			// get rid of invalid kad IDs which may have been stored by older versions
 			if (m_clientID == 0)
-				m_clientID.SetValueRandom();
+				m_clientID = GetRandomUint128();
 			file.Close();
 		}
 	} catch (const CSafeIOException& e) {
-		AddDebugLogLineM(true, logKadPrefs, wxT("IO error while reading prefs: ") + e.what());
+		AddDebugLogLineC(logKadPrefs, wxT("IO error while reading prefs: ") + e.what());
 	}
 }
 
@@ -136,7 +136,7 @@
 			file.Close();
 		}
 	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM(true, logKadPrefs, wxT("IO failure while saving kad-prefs: ") + e.what());
+		AddDebugLogLineC(logKadPrefs, wxT("IO failure while saving kad-prefs: ") + e.what());
 	}
 }
 
@@ -196,29 +196,21 @@
 	uint32_t nServerAverage = theApp->serverlist->GetAvgFile();
 	uint32_t nKadAverage = Kademlia::CKademlia::GetIndexed()->GetFileKeyCount();
 
-#ifdef __DEBUG__
-	wxString method;
-#endif
+	DEBUG_ONLY( wxString method; )
+
 	if (nServerAverage > nKadAverage) {
-#ifdef __DEBUG__
-		method = wxString::Format(wxT("Kad file estimate used Server avg(%u)"), nServerAverage);
-#endif
+		DEBUG_ONLY( method = CFormat(wxT("Kad file estimate used Server avg(%u)")) % nServerAverage; )
 		nKadAverage = nServerAverage;
+	} else {
+		DEBUG_ONLY( method = CFormat(wxT("Kad file estimate used Kad avg(%u)")) % nKadAverage; )
 	}
-#ifdef __DEBUG__
-	   else {
-		method = wxString::Format(wxT("Kad file estimate used Kad avg(%u)"), nKadAverage);
-	}
-#endif
+
 	if( nKadAverage < 108 ) {
-#ifdef __DEBUG__
-		method = wxString(wxT("Kad file estimate used default avg(108, min value)"));
-#endif
+		DEBUG_ONLY( method = wxString(wxT("Kad file estimate used default avg(108, min value)")); )
 		nKadAverage = 108;
 	}
-#ifdef ___DEBUG__
-	AddDebugLogLineM(false, logKadPrefs, method);
-#endif
+
+	AddDebugLogLineN(logKadPrefs, method);
 	m_kademliaFiles = nKadAverage * m_kademliaUsers;
 }
 
@@ -239,7 +231,7 @@
 	       | (thePrefs::IsClientCryptLayerSupported() && encryption) ? 0x01 : 0;
 }
 
-uint32_t CPrefs::GetUDPVerifyKey(uint32_t targetIP) throw()
+uint32_t CPrefs::GetUDPVerifyKey(uint32_t targetIP)
 {
 	uint64_t buffer = (uint64_t)thePrefs::GetKadUDPKey() << 32 | targetIP;
 	MD5Sum md5((const uint8_t *)&buffer, 8);
@@ -274,7 +266,8 @@
 		uint32_t nV8Contacts = 0;
 		uint32_t nNonV8Contacts = 0;
 		CKademlia::GetRoutingZone()->GetNumContacts(nV8Contacts, nNonV8Contacts, 8);
-		AddDebugLogLineM(false, logKadRouting, wxString::Format(wxT("Counted Kad V8 Contacts: %u out of %u in routing table. FirewalledRatios: UDP - %.02f%% | TCP - %.02f%%"), nV8Contacts, nNonV8Contacts + nV8Contacts, StatsGetFirewalledRatio(true) * 100, StatsGetFirewalledRatio(false) * 100));
+		AddDebugLogLineN(logKadRouting, CFormat(wxT("Counted Kad V8 Contacts: %u out of %u in routing table. FirewalledRatios: UDP - %.02f%% | TCP - %.02f%%"))
+			% nV8Contacts % (nNonV8Contacts + nV8Contacts) % (StatsGetFirewalledRatio(true) * 100) % (StatsGetFirewalledRatio(false) * 100));
 		if (nV8Contacts > 0) {
 			m_statsKadV8Ratio = ((float)nV8Contacts / (float)(nV8Contacts + nNonV8Contacts));
 		} else {
@@ -293,12 +286,12 @@
 			}
 		}
 		m_externPortIPs.push_back(fromIP);
-		AddDebugLogLineM(false, logKadPrefs, wxString::Format(wxT("Received possible external Kad port %u from "), port) + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(fromIP)));
+		AddDebugLogLineN(logKadPrefs, CFormat(wxT("Received possible external Kad port %u from %s")) % port % KadIPToString(fromIP));
 		// if 2 out of 3 tries result in the same external port it's fine, otherwise consider it unreliable
 		for (unsigned i = 0; i < m_externPorts.size(); i++) {
 			if (m_externPorts[i] == port) {
 				m_externKadPort = port;
-				AddDebugLogLineM(false, logKadPrefs, wxString::Format(wxT("Set external Kad port to %u"), port));
+				AddDebugLogLineN(logKadPrefs, CFormat(wxT("Set external Kad port to %u")) % port);
 				while (m_externPortIPs.size() < EXTERNAL_PORT_ASKIPS) {
 					// add empty entries so we know the check has finished even if we asked less than max IPs
 					m_externPortIPs.push_back(0);
@@ -308,7 +301,7 @@
 		}
 		m_externPorts.push_back(port);
 		if (!FindExternKadPort(false)) {
-			AddDebugLogLineM(false, logKadPrefs, wxT("Our external port seems unreliable, not using it for firewallchecks"));
+			AddDebugLogLineN(logKadPrefs, wxT("Our external port seems unreliable, not using it for firewallchecks"));
 			m_externKadPort = 0;
 		}
 	}
@@ -317,7 +310,7 @@
 bool CPrefs::FindExternKadPort(bool reset)
 {
 	if (!reset) {
-		return m_externPortIPs.size() < EXTERNAL_PORT_ASKIPS;
+		return m_externPortIPs.size() < EXTERNAL_PORT_ASKIPS && !CKademlia::IsRunningInLANMode();
 	} else {
 		m_externPortIPs.clear();
 		m_externPorts.clear();

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/Prefs.h -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/Prefs.h Changed

@@ -1,9 +1,9 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -107,7 +107,7 @@
 	bool	GetFindBuddy() throw()				{ return m_findBuddy ? m_findBuddy = false, true : false; }
 	void	SetFindBuddy(bool val = true) throw()		{ m_findBuddy = val; }
 
-	bool	GetUseExternKadPort() const throw()		{ return m_useExternKadPort; }
+	bool	GetUseExternKadPort() const;
 	void	SetUseExternKadPort(bool val) throw()		{ m_useExternKadPort = val; }
 
 	uint16_t GetExternalKadPort() const throw()		{ return m_externKadPort; }
@@ -116,7 +116,7 @@
 	bool	 FindExternKadPort(bool reset = false);
 
 	static uint8_t	GetMyConnectOptions(bool encryption = true, bool callback = true);
-	static uint32_t GetUDPVerifyKey(uint32_t targetIP) throw();
+	static uint32_t GetUDPVerifyKey(uint32_t targetIP);
 
 	// Statistics
 	void	StatsIncUDPFirewalledNodes(bool firewalled) throw()	{ firewalled ? ++m_statsUDPFirewalledNodes : ++m_statsUDPOpenNodes; }
@@ -167,5 +167,12 @@
 
 } // End namespace
 
+#include "Kademlia.h"
+
+inline bool Kademlia::CPrefs::GetUseExternKadPort() const
+{
+	return m_useExternKadPort && !Kademlia::CKademlia::IsRunningInLANMode();
+}
+
 #endif //__PREFS_H__
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/Search.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/Search.cpp Changed

@@ -1,9 +1,10 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Merkur ( strEmail.Format("%s@%s", "devteam", "emule-project.net") / http://www.emule-project.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -80,10 +81,31 @@
 	m_searchTermsData = NULL;
 	m_searchTermsDataSize = 0;
 	m_nodeSpecialSearchRequester = NULL;
+	m_closestDistantFound = 0;
+	m_requestedMoreNodesContact = NULL;
 }
 
 CSearch::~CSearch()
 {
+	// remember the closest node we found and tried to contact (if any) during this search
+	// for statistical caluclations, but only if its a certain type
+	switch (m_type) {
+		case NODECOMPLETE:
+		case FILE:
+		case KEYWORD:
+		case NOTES:
+		case STOREFILE:
+		case STOREKEYWORD:
+		case STORENOTES:
+		case FINDSOURCE: // maybe also exclude
+			if (m_closestDistantFound != 0) {
+				CKademlia::StatsAddClosestDistance(m_closestDistantFound);
+			}
+			break;
+		default: // NODE, NODESPECIAL, NODEFWCHECKUDP, FINDBUDDY
+			break;
+	}
+
 	if (m_nodeSpecialSearchRequester != NULL) {
 		// inform requester that our search failed
 		m_nodeSpecialSearchRequester->KadSearchIPByNodeIDResult(KCSR_NOTFOUND, 0, 0);
@@ -104,7 +126,9 @@
 
 	// Delete any temp contacts...
 	for (ContactList::const_iterator it = m_delete.begin(); it != m_delete.end(); ++it) {
-		delete *it;
+		if (!(*it)->InUse()) {
+			delete *it;
+		}
 	}
 
 	// Check if this search was containing an overload node and adjust time of next time we use that node.
@@ -213,15 +237,42 @@
 
 void CSearch::JumpStart()
 {
+	// If we had a response within the last 3 seconds, no need to jumpstart the search.
+	if ((time_t)(m_lastResponse + SEC(3)) > time(NULL)) {
+		return;
+	}
+
 	// If we ran out of contacts, stop search.
 	if (m_possible.empty()) {
 		PrepareToStop();
 		return;
 	}
 
-	// If we had a response within the last 3 seconds, no need to jumpstart the search.
-	if ((time_t)(m_lastResponse + SEC(3)) > time(NULL)) {
-		return;
+	// Is this a find lookup and are the best two (=KADEMLIA_FIND_VALUE) nodes dead/unreachable?
+	// In this case try to discover more close nodes before using our other results
+	// The reason for this is that we may not have found the closest node alive due to results being limited to 2 contacts,
+	// which could very well have been the duplicates of our dead closest nodes
+	bool lookupCloserNodes = false;
+	if (m_requestedMoreNodesContact == NULL && GetRequestContactCount() == KADEMLIA_FIND_VALUE && m_tried.size() >= 3 * KADEMLIA_FIND_VALUE) {
+		ContactMap::const_iterator it = m_tried.begin();
+		lookupCloserNodes = true;
+		for (unsigned i = 0; i < KADEMLIA_FIND_VALUE; i++) {
+			if (m_responded.count(it->first) > 0) {
+				lookupCloserNodes = false;
+				break;
+			}
+			++it;
+		}
+		if (lookupCloserNodes) {
+			while (it != m_tried.end()) {
+				if (m_responded.count(it->first) > 0) {
+					AddDebugLogLineN(logKadSearch, CFormat(wxT("Best %d nodes for lookup (id=%x) were unreachable or dead, reasking closest for more")) % KADEMLIA_FIND_VALUE % GetSearchID());
+					SendFindValue(it->second, true);
+					return;
+				}
+				++it;
+			}
+		}
 	}
 
 	// Search for contacts that can be used to jumpstart a stalled search.
@@ -251,7 +302,7 @@
 
 void CSearch::ProcessResponse(uint32_t fromIP, uint16_t fromPort, ContactList *results)
 {
-	AddDebugLogLineM(false, logKadSearch, wxT("Processing search response from ") + Uint32_16toStringIP_Port(wxUINT32_SWAP_ALWAYS(fromIP), fromPort));
+	AddDebugLogLineN(logKadSearch, wxT("Processing search response from ") + KadIPPortToString(fromIP, fromPort));
 
 	ContactList::iterator response;
 	// Remember the contacts to be deleted when finished
@@ -259,124 +310,133 @@
 		m_delete.push_back(*response);
 	}
 
+	m_lastResponse = time(NULL);
+
+	// Find contact that is responding.
+	CUInt128 fromDistance(0u);
+	CContact *fromContact = NULL;
+	for (ContactMap::const_iterator it = m_tried.begin(); it != m_tried.end(); ++it) {
+		CContact *tmpContact = it->second;
+		if ((tmpContact->GetIPAddress() == fromIP) && (tmpContact->GetUDPPort() == fromPort)) {
+			fromDistance = it->first;
+			fromContact = tmpContact;
+			break;
+		}
+	}
+
 	// Make sure the node is not sending more results than we requested, which is not only a protocol violation
 	// but most likely a malicious answer
-	if (results->size() > GetRequestContactCount()) {
-		AddDebugLogLineM(false, logKadSearch, wxT("Node ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(fromIP)) + wxT(" sent more contacts than requested on a routing query, ignoring response"));
+	if (results->size() > GetRequestContactCount() && !(m_requestedMoreNodesContact == fromContact && results->size() <= KADEMLIA_FIND_VALUE_MORE)) {
+		AddDebugLogLineN(logKadSearch, wxT("Node ") + KadIPToString(fromIP) + wxT(" sent more contacts than requested on a routing query, ignoring response"));
 		return;
 	}
 
-	m_lastResponse = time(NULL);
-
 	if (m_type == NODEFWCHECKUDP) {
 		m_answers++;
-		delete results;
 		return;
 	}
 
 	// Not interested in responses for FIND_NODE, will be added to contacts by udp listener
 	if (m_type == NODE) {
-		AddDebugLogLineM(false, logKadSearch, wxT("Node type search result, discarding."));
+		AddDebugLogLineN(logKadSearch, wxT("Node type search result, discarding."));
 		// Note that we got an answer.
 		m_answers++;
 		// We clear the possible list to force the search to stop.
 		m_possible.clear();
-		delete results;
 		return;
 	}
 
-	// Find contact that is responding.
-	for (ContactMap::const_iterator tried = m_tried.begin(); tried != m_tried.end(); ++tried) {
-		CUInt128 fromDistance(tried->first);
-		CContact *from = tried->second;
-
-		if ((from->GetIPAddress() == fromIP) && (from->GetUDPPort() == fromPort)) {
-			// Add to list of people who responded
-			m_responded[fromDistance] = from;
-
-			std::map<uint32_t, uint32_t> mapReceivedIPs;
-			std::map<uint32_t, uint32_t> mapReceivedSubnets;
-			// A node is not allowed to answer with contacts to itself
-			mapReceivedIPs[fromIP] = 1;
-			mapReceivedSubnets[fromIP & 0xFFFFFF00] = 1;
-			// Loop through their responses
-			for (response = results->begin(); response != results->end(); ++response) {
-				CContact *c = *response;
-				CUInt128 distance(c->GetClientID() ^ m_target);
-
-				// Ignore this contact if already known or tried it.
-				if (m_possible.count(distance) > 0) {
-					AddDebugLogLineM(false, logKadSearch, wxT("Search result from already known client: ignore"));
-					continue;
-				}
-				if (m_tried.count(distance) > 0) {
-					AddDebugLogLineM(false, logKadSearch, wxT("Search result from already tried client: ignore"));
-					continue;
-				}
+	if (fromContact != NULL) {
+		bool providedCloserContacts = false;
+		std::map<uint32_t, unsigned> receivedIPs;
+		std::map<uint32_t, unsigned> receivedSubnets;
+		// A node is not allowed to answer with contacts to itself
+		receivedIPs[fromIP] = 1;
+		receivedSubnets[fromIP & 0xFFFFFF00] = 1;
+		// Loop through their responses
+		for (ContactList::iterator it = results->begin(); it != results->end(); ++it) {
+			// Get next result
+			CContact *c = *it;
+			// calc distance this result is to the target
+			CUInt128 distance(c->GetClientID() ^ m_target);
+
+			if (distance < fromDistance) {
+				providedCloserContacts = true;
+			}
 
-				// We only accept unique IPs in the answer, having multiple IDs pointing to one IP in the routing tables
-				// is no longer allowed since eMule0.49a, aMule-2.2.1 anyway
-				if (mapReceivedIPs.count(c->GetIPAddress()) > 0) {
-					AddDebugLogLineM(false, logKadSearch, wxT("Multiple KadIDs pointing to same IP (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(c->GetIPAddress())) + wxT(") in Kad(2)Res answer - ignored, sent by ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(from->GetIPAddress())));
-					continue;
-				} else {
-					mapReceivedIPs[c->GetIPAddress()] = 1;
-				}
+			// Ignore this contact if already known or tried it.
+			if (m_possible.count(distance) > 0) {
+				AddDebugLogLineN(logKadSearch, wxT("Search result from already known client: ignore"));
+				continue;
+			}
+			if (m_tried.count(distance) > 0) {
+				AddDebugLogLineN(logKadSearch, wxT("Search result from already tried client: ignore"));
+				continue;
+			}
+
+			// We only accept unique IPs in the answer, having multiple IDs pointing to one IP in the routing tables
+			// is no longer allowed since eMule0.49a, aMule-2.2.1 anyway
+			if (receivedIPs.count(c->GetIPAddress()) > 0) {
+				AddDebugLogLineN(logKadSearch, wxT("Multiple KadIDs pointing to same IP (") + KadIPToString(c->GetIPAddress()) + wxT(") in Kad2Res answer - ignored, sent by ") + KadIPToString(fromContact->GetIPAddress()));
+				continue;
+			} else {
+				receivedIPs[c->GetIPAddress()] = 1;
+			}
 				// and no more than 2 IPs from the same /24 subnet
-				if (mapReceivedSubnets.count(c->GetIPAddress() & 0xFFFFFF00) > 0 && !::IsLanIP(wxUINT32_SWAP_ALWAYS(c->GetIPAddress()))) {
-					wxASSERT(mapReceivedSubnets.find(c->GetIPAddress() & 0xFFFFFF00) != mapReceivedSubnets.end());
-					int subnetCount = mapReceivedSubnets.find(c->GetIPAddress() & 0xFFFFFF00)->second;
-					if (subnetCount >= 2) {
-						AddDebugLogLineM(false, logKadSearch, wxT("More than 2 KadIDs pointing to same subnet (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(c->GetIPAddress() & 0xFFFFFF00)) + wxT("/24) in Kad(2)Res answer - ignored, sent by ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(from->GetIPAddress())));
-						continue;
-					} else {
-						mapReceivedSubnets[c->GetIPAddress() & 0xFFFFFF00] = subnetCount + 1;
-					}
+			if (receivedSubnets.count(c->GetIPAddress() & 0xFFFFFF00) > 0 && !::IsLanIP(wxUINT32_SWAP_ALWAYS(c->GetIPAddress()))) {
+				wxASSERT(receivedSubnets.find(c->GetIPAddress() & 0xFFFFFF00) != receivedSubnets.end());
+				int subnetCount = receivedSubnets.find(c->GetIPAddress() & 0xFFFFFF00)->second;
+				if (subnetCount >= 2) {
+					AddDebugLogLineN(logKadSearch, wxT("More than 2 KadIDs pointing to same subnet (") + KadIPToString(c->GetIPAddress() & 0xFFFFFF00) + wxT("/24) in Kad2Res answer - ignored, sent by ") + KadIPToString(fromContact->GetIPAddress()));
+					continue;
 				} else {
-					mapReceivedSubnets[c->GetIPAddress() & 0xFFFFFF00] = 1;
+					receivedSubnets[c->GetIPAddress() & 0xFFFFFF00] = subnetCount + 1;
 				}
+			} else {
+				receivedSubnets[c->GetIPAddress() & 0xFFFFFF00] = 1;
+			}
 
-				// Add to possible
-				m_possible[distance] = c;
+			// Add to possible
+			m_possible[distance] = c;
 
-				// Verify if the result is closer to the target than the one we just checked.
-				if (distance < fromDistance) {
-					// The top ALPHA_QUERY of results are used to determin if we send a request.
-					bool top = false;
-					if (m_best.size() < ALPHA_QUERY) {
-						top = true;
+			// Verify if the result is closer to the target than the one we just checked.
+			if (distance < fromDistance) {
+				// The top ALPHA_QUERY of results are used to determine if we send a request.
+				bool top = false;
+				if (m_best.size() < ALPHA_QUERY) {
+					top = true;
+					m_best[distance] = c;
+				} else {
+					ContactMap::iterator worst = m_best.end();
+					--worst;
+					if (distance < worst->first) {
+						// Prevent having more than ALPHA_QUERY within the Best list.
+						m_best.erase(worst);
 						m_best[distance] = c;
-					} else {
-						ContactMap::iterator it = m_best.end();
-						--it;
-						if (distance < it->first) {
-							// Prevent having more than ALPHA_QUERY within the Best list.
-							m_best.erase(it);
-							m_best[distance] = c;
-							top = true;
-						}
+						top = true;
 					}
+				}
 
-					if (top) {
-						// We determined this contact is a candidate for a request.
-						// Add to tried
-						m_tried[distance] = c;
-						// Send the KadID so other side can check if I think it has the right KadID.
-						// Send request
-						SendFindValue(c);
-					}
+				if (top) {
+					// We determined this contact is a candidate for a request.
+					// Add to tried
+					m_tried[distance] = c;
+					// Send the KadID so other side can check if I think it has the right KadID.
+					// Send request
+					SendFindValue(c);
 				}
 			}
+		}
 
-			// Complete node search, just increment the counter.
-			if (m_type == NODECOMPLETE || m_type == NODESPECIAL) {
-				AddDebugLogLineM(false, logKadSearch, wxString(wxT("Search result type: Node")) + (m_type == NODECOMPLETE ? wxT("Complete") : wxT("Special")));
-				m_answers++;
-			}
-			break;
+		// Add to list of people who responded.
+		m_responded[fromDistance] = providedCloserContacts;
+
+		// Complete node search, just increment the counter.
+		if (m_type == NODECOMPLETE || m_type == NODESPECIAL) {
+			AddDebugLogLineN(logKadSearch, wxString(wxT("Search result type: Node")) + (m_type == NODECOMPLETE ? wxT("Complete") : wxT("Special")));
+			m_answers++;
 		}
 	}
-	delete results;
 }
 
 void CSearch::StorePacket()
@@ -388,16 +448,19 @@
 	CUInt128 fromDistance(possible->first);
 	CContact *from = possible->second;
 
+	if (fromDistance < m_closestDistantFound || m_closestDistantFound == 0) {
+		m_closestDistantFound = fromDistance;
+	}
+
 	// Make sure this is a valid node to store.
-	if(thePrefs::FilterLanIPs() && fromDistance.Get32BitChunk(0) > SEARCHTOLERANCE) {
-		AddDebugLogLineM(false, logKadSearch, wxT("Not stored: filtered lan ip"));
+	if (fromDistance.Get32BitChunk(0) > SEARCHTOLERANCE && !::IsLanIP(wxUINT32_SWAP_ALWAYS(from->GetIPAddress()))) {
 		return;
 	}
 
 	// What kind of search are we doing?
 	switch (m_type) {
 		case FILE: {
-			AddDebugLogLineM(false, logKadSearch, wxT("Search request type: File"));
+			AddDebugLogLineN(logKadSearch, wxT("Search request type: File"));
 			CMemFile searchTerms;
 			searchTerms.WriteUInt128(m_target);
 			if (from->GetVersion() >= 3) {
@@ -430,7 +493,7 @@
 			break;
 		}
 		case KEYWORD: {
-			AddDebugLogLineM(false, logKadSearch, wxT("Search request type: Keyword"));
+			AddDebugLogLineN(logKadSearch, wxT("Search request type: Keyword"));
 			CMemFile searchTerms;
 			searchTerms.WriteUInt128(m_target);
 			if (from->GetVersion() >= 3) {
@@ -468,7 +531,7 @@
 			break;
 		}
 		case NOTES: {
-			AddDebugLogLineM(false, logKadSearch, wxT("Search request type: Notes"));
+			AddDebugLogLineN(logKadSearch, wxT("Search request type: Notes"));
 			// Write complete packet.
 			CMemFile searchTerms;
 			searchTerms.WriteUInt128(m_target);
@@ -501,7 +564,7 @@
 			break;
 		}
 		case STOREFILE: {
-			AddDebugLogLineM(false, logKadSearch, wxT("Search request type: StoreFile"));
+			AddDebugLogLineN(logKadSearch, wxT("Search request type: StoreFile"));
 			// Try to store ourselves as a source to a Node.
 			// As a safeguard, check to see if we already stored to the max nodes.
 			if (m_answers > SEARCHSTOREFILE_TOTAL) {
@@ -583,16 +646,14 @@
 				CKademlia::GetUDPListener()->SendPublishSourcePacket(*from, m_target, id, taglist);
 				m_totalRequestAnswers++;
 				// Delete all tags.
-				for (TagPtrList::const_iterator it = taglist.begin(); it != taglist.end(); ++it) {
-					delete *it;
-				}
+				deleteTagPtrListEntries(&taglist);
 			} else {
 				PrepareToStop();
 			}
 			break;
 		}
 		case STOREKEYWORD: {
-			AddDebugLogLineM(false, logKadSearch, wxT("Search request type: StoreKeyword"));
+			AddDebugLogLineN(logKadSearch, wxT("Search request type: StoreKeyword"));
 			// Try to store keywords to a Node.
 			// As a safeguard, check to see if we already stored to the max nodes.
 			if (m_answers > SEARCHSTOREKEYWORD_TOTAL) {
@@ -645,15 +706,14 @@
 					CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_PUBLISH_KEY_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
 					wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
 				} else {
-					DebugSend(KadPublishReq, from->GetIPAddress(), from->GetUDPPort());
-					CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA_PUBLISH_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
+					wxFAIL;
 				}
 			}
 			m_totalRequestAnswers++;
 			break;
 		}
 		case STORENOTES: {
-			AddDebugLogLineM(false, logKadSearch, wxT("Search request type: StoreNotes"));
+			AddDebugLogLineN(logKadSearch, wxT("Search request type: StoreNotes"));
 			// Find file we are storing info about.
 			uint8_t fileid[16];
 			m_target.ToByteArray(fileid);
@@ -690,14 +750,11 @@
 					CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA2_PUBLISH_NOTES_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
 					wxASSERT(from->GetUDPKey() == CKadUDPKey(0));
 				} else {
-					DebugSend(KadPublishNotesReq, from->GetIPAddress(), from->GetUDPPort());
-					CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA_PUBLISH_NOTES_REQ, from->GetIPAddress(), from->GetUDPPort(), 0, NULL);
+					wxFAIL;
 				}
 				m_totalRequestAnswers++;
 				// Delete all tags.
-				for (TagPtrList::const_iterator it = taglist.begin(); it != taglist.end(); ++it) {
-					delete *it;
-				}
+				deleteTagPtrListEntries(&taglist);
 			} else {
 				PrepareToStop();
 			}
@@ -705,7 +762,7 @@
 		}
 		case FINDBUDDY:
 		{
-			AddDebugLogLineM(false, logKadSearch, wxT("Search request type: FindBuddy"));
+			AddDebugLogLineN(logKadSearch, wxT("Search request type: FindBuddy"));
 			// Send a buddy request as we are firewalled.
 			// As a safeguard, check to see if we already requested the max nodes.
 			if (m_answers > SEARCHFINDBUDDY_TOTAL) {
@@ -734,7 +791,7 @@
 		}
 		case FINDSOURCE:
 		{
-			AddDebugLogLineM(false, logKadSearch, wxT("Search request type: FindSource"));
+			AddDebugLogLineN(logKadSearch, wxT("Search request type: FindSource"));
 			// Try to find if this is a buddy to someone we want to contact.
 			// As a safeguard, check to see if we already requested the max nodes.
 			if (m_answers > SEARCHFINDSOURCE_TOTAL) {
@@ -768,20 +825,20 @@
 			// we are looking for the IP of a given NodeID, so we just check if we 0 distance and if so, report the
 			// tip to the requester
 			if (fromDistance == 0) {
-				m_nodeSpecialSearchRequester-> KadSearchIPByNodeIDResult(KCSR_SUCCEEDED, wxUINT32_SWAP_ALWAYS(from->GetIPAddress()), from->GetTCPPort());
+				m_nodeSpecialSearchRequester->KadSearchIPByNodeIDResult(KCSR_SUCCEEDED, wxUINT32_SWAP_ALWAYS(from->GetIPAddress()), from->GetTCPPort());
 				m_nodeSpecialSearchRequester = NULL;
 				PrepareToStop();
 			}
 			break;
 		 }
 		case NODECOMPLETE:
-			AddDebugLogLineM(false, logKadSearch, wxT("Search request type: NodeComplete"));
+			AddDebugLogLineN(logKadSearch, wxT("Search request type: NodeComplete"));
 			break;
 		case NODE:
-			AddDebugLogLineM(false, logKadSearch, wxT("Search request type: Node"));
+			AddDebugLogLineN(logKadSearch, wxT("Search request type: Node"));
 			break;
 		default:
-			AddDebugLogLineM(false, logKadSearch, wxString::Format(wxT("Search result type: Unknown (%i)"),m_type));
+			AddDebugLogLineN(logKadSearch, CFormat(wxT("Search result type: Unknown (%i)")) % m_type);
 			break;
 	}
 }
@@ -803,7 +860,7 @@
 			ProcessResultNotes(answer, info);
 			break;
 	}
-	AddDebugLogLineM(false, logKadSearch, wxT("Got result (") + type + wxT(")"));
+	AddDebugLogLineN(logKadSearch, wxT("Got result (") + type + wxT(")"));
 }
 
 void CSearch::ProcessResultFile(const CUInt128& answer, TagPtrList *info)
@@ -845,10 +902,7 @@
 		} else if (!tag->GetName().Cmp(TAG_ENCRYPTION)) {
 			byCryptOptions = (uint8)tag->GetInt();
 		}
-
-		delete tag;
 	}
-	delete info;
 
 	// Process source based on its type. Currently only one method is needed to process all types.
 	switch( type ) {
@@ -857,7 +911,7 @@
 		case 4:
 		case 5:
 		case 6:
-			AddDebugLogLineM(false, logKadSearch, wxString::Format(wxT("Trying to add a source type %i, ip "), type) + Uint32_16toStringIP_Port(wxUINT32_SWAP_ALWAYS(ip), udp));
+			AddDebugLogLineN(logKadSearch, CFormat(wxT("Trying to add a source type %i, ip %s")) % type % KadIPPortToString(ip, udp));
 			m_answers++;
 			theApp->downloadqueue->KademliaSearchFile(m_searchID, &answer, &buddy, type, ip, tcp, udp, buddyip, buddyport, byCryptOptions);
 			break;
@@ -879,28 +933,24 @@
 	bool bFilterComment = false;
 
 	// Loop through tags and pull wanted into. Currently we only keep Filename, Rating, Comment.
-	for (TagPtrList::const_iterator it = info->begin(); it != info->end(); ++it) {
+	for (TagPtrList::iterator it = info->begin(); it != info->end(); ++it) {
 		CTag *tag = *it;
 		if (!tag->GetName().Cmp(TAG_SOURCEIP)) {
 			entry->m_uIP = tag->GetInt();
-			delete tag;
 		} else if (!tag->GetName().Cmp(TAG_SOURCEPORT)) {
 			entry->m_uTCPport = tag->GetInt();
-			delete tag;
 		} else if (!tag->GetName().Cmp(TAG_FILENAME)) {
 			entry->SetFileName(tag->GetStr());
-			delete tag;
 		} else if (!tag->GetName().Cmp(TAG_DESCRIPTION)) {
 			wxString strComment(tag->GetStr());
 			bFilterComment = thePrefs::IsMessageFiltered(strComment);
 			entry->AddTag(tag);
+			*it = NULL;	// Prevent actual data being freed
 		} else if (!tag->GetName().Cmp(TAG_FILERATING)) {
 			entry->AddTag(tag);
-		} else {
-			delete tag;
+			*it = NULL;	// Prevent actual data being freed
 		}
 	}
-	delete info;
 
 	if (bFilterComment) {
 		delete entry;
@@ -924,7 +974,7 @@
 		file->AddNote(entry);
 		m_answers++;
 	} else {
-		AddDebugLogLineM(false, logKadSearch, wxT("Comment received for unknown file"));
+		AddDebugLogLineN(logKadSearch, wxT("Comment received for unknown file"));
 		delete entry;
 	}
 }
@@ -993,56 +1043,78 @@
 			uint32_t differentNames = (publishInfo & 0xFF000000) >> 24;
 			uint32_t publishersKnown = (publishInfo & 0x00FF0000) >> 16;
 			uint32_t trustValue = publishInfo & 0x0000FFFF;
-			AddDebugLogLineM(false, logKadSearch, wxString::Format(wxT("Received PublishInfo Tag: %u different names, %u publishers, %.2f trustvalue"), differentNames, publishersKnown, (double)trustValue/ 100.0));
+			AddDebugLogLineN(logKadSearch, CFormat(wxT("Received PublishInfo Tag: %u different names, %u publishers, %.2f trustvalue")) % differentNames % publishersKnown % ((double)trustValue/ 100.0));
 #endif
 		}
-		delete tag;
 	}
-	delete info;
 
 	// If we don't have a valid filename and filesize, drop this keyword.
 	if (!bFileName || !bFileSize) {
-		AddDebugLogLineM(false, logKadSearch, wxString(wxT("No ")) + (!bFileName ? wxT("filename") : wxT("filesize")) + wxT(" on search result, ignoring"));	
+		AddDebugLogLineN(logKadSearch, wxString(wxT("No ")) + (!bFileName ? wxT("filename") : wxT("filesize")) + wxT(" on search result, ignoring"));
 		return;
 	}
 
-	// TODO: Check that this result matches original criteria.
+	// 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):
 
-	TagPtrList taglist;
+	// Step 1: Get the words of the response file name
+	WordList listFileNameWords;
+	CSearchManager::GetWords(name, &listFileNameWords, true);
 
-	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));
+	// 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;
+		}
 	}
 
-	m_answers++;
-	theApp->searchlist->KademliaSearchKeyword(m_searchID, &answer, name, size, type, publishInfo, taglist);
+	// Step 3: Accept result only if all(!) words are found
+	if (bFileNameMatchesSearch) {
+		TagPtrList taglist;
 
-	// Free tags memory
-	for (TagPtrList::iterator it = taglist.begin(); it != taglist.end(); ++it) {
-		delete (*it);
-	}	
-	
+		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);
+
+		// Free tags memory
+		deleteTagPtrListEntries(&taglist);
+	}
 }
 
-void CSearch::SendFindValue(CContact *contact)
+void CSearch::SendFindValue(CContact *contact, bool reaskMore)
 {
 	// Found a node that we think has contacts closer to our target.
 	try {
@@ -1053,11 +1125,23 @@
 		CMemFile packetdata(33);
 		// The number of returned contacts is based on the type of search.
 		uint8_t contactCount = GetRequestContactCount();
+
+		if (reaskMore) {
+			if (m_requestedMoreNodesContact == NULL) {
+				m_requestedMoreNodesContact = contact;
+				wxASSERT(contactCount == KADEMLIA_FIND_VALUE);
+				contactCount = KADEMLIA_FIND_VALUE_MORE;
+			} else {
+				wxFAIL;
+			}
+		}
+
 		if (contactCount > 0) {
 			packetdata.WriteUInt8(contactCount);
 		} else {
 			return;
 		}
+
 		// Put the target we want into the packet.
 		packetdata.WriteUInt128(m_target);
 		// Add the ID of the contact we're contacting for sanity checks on the other end.
@@ -1108,51 +1192,14 @@
 			}
 #endif
 		} else {
-			CKademlia::GetUDPListener()->SendPacket(packetdata, KADEMLIA_REQ, contact->GetIPAddress(), contact->GetUDPPort(), 0, NULL);
-#ifdef __DEBUG__
-			switch (m_type) {
-				case NODE:
-					DebugSendF(wxT("KadReq(Node)"), contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case NODECOMPLETE:
-					DebugSendF(wxT("KadReq(NodeComplete)"), contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case NODESPECIAL:
-					DebugSendF(wxT("KadReq(NodeSpecial)"), contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case NODEFWCHECKUDP:
-					DebugSendF(wxT("KadReq(NodeFWCheckUDP)"), contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case FILE:
-					DebugSendF(wxT("KadReq(File)"), contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case KEYWORD:
-					DebugSendF(wxT("KadReq(Keyword)"), contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case STOREFILE:
-					DebugSendF(wxT("KadReq(StoreFile)"), contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case STOREKEYWORD:
-					DebugSendF(wxT("KadReq(StoreKeyword)"), contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case STORENOTES:
-					DebugSendF(wxT("KadReq(StoreNotes)"), contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				case NOTES:
-					DebugSendF(wxT("KadReq(Notes)"), contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-				default:
-					DebugSend(KadReq, contact->GetIPAddress(), contact->GetUDPPort());
-					break;
-			}
-#endif
+			wxFAIL;
 		}
 	} catch (const CEOFException& err) {
-		AddDebugLogLineM(true, logKadSearch, wxT("CEOFException in CSearch::SendFindValue: ") + err.what());
+		AddDebugLogLineC(logKadSearch, wxT("CEOFException in CSearch::SendFindValue: ") + err.what());
 	} catch (const CInvalidPacket& err) {
-		AddDebugLogLineM(true, logKadSearch, wxT("CInvalidPacket Exception in CSearch::SendFindValue: ") + err.what());		
+		AddDebugLogLineC(logKadSearch, wxT("CInvalidPacket Exception in CSearch::SendFindValue: ") + err.what());
 	} catch (const wxString& e) {
-		AddDebugLogLineM(true, logKadSearch, wxT("Exception in CSearch::SendFindValue: ") + e);
+		AddDebugLogLineC(logKadSearch, wxT("Exception in CSearch::SendFindValue: ") + e);
 	}
 }
 
@@ -1166,14 +1213,7 @@
 		if (file && bio) {
 			// Name, Size
 			taglist.push_back(new CTagString(TAG_FILENAME, file->GetFileName().GetPrintable()));
-			if (file->IsLargeFile()) {
-				// TODO: As soon as we drop Kad1 support, we should switch to Int64 tags (we could do now already for kad2 nodes only but no advantage in that)
-				uint8_t size64[sizeof(uint64_t)];
-				PokeUInt64(size64, file->GetFileSize());
-				taglist.push_back(new CTagBsob(TAG_FILESIZE, size64, sizeof(uint64_t)));	
-			} else {
-				taglist.push_back(new CTagVarInt(TAG_FILESIZE, file->GetFileSize()));
-			}
+			taglist.push_back(new CTagVarInt(TAG_FILESIZE, file->GetFileSize()));
 			taglist.push_back(new CTagVarInt(TAG_SOURCES, file->m_nCompleteSourcesCount));
 
 			// eD2K file type (Audio, Video, ...)
@@ -1183,12 +1223,6 @@
 				taglist.push_back(new CTagString(TAG_FILETYPE, strED2KFileType));
 			}
 			
-// 			// file format (filename extension)
-// 			const wxString strExt = file->GetFileName().GetExt();
-// 			if (!strExt.IsEmpty()) {
-// 				taglist.push_back(new CTagString(TAG_FILEFORMAT, strExt));
-// 			}
-
 			// additional meta data (Artist, Album, Codec, Length, ...)
 			// only send verified meta data to nodes
 			if (file->GetMetaDataVer() > 0) {
@@ -1215,7 +1249,7 @@
 						if (pTag->IsInt() && pTag->GetInt() == 0) {
 							continue;
 						}
-						wxString szKadTagName = wxString::Format(wxT("%c"),pTag->GetNameID());					
+						wxString szKadTagName = CFormat(wxT("%c")) % pTag->GetNameID();
 						if (pTag->IsStr()) {
 							taglist.push_back(new CTagString(szKadTagName, pTag->GetStr()));
 						} else {
@@ -1230,16 +1264,14 @@
 			wxFAIL;
 		}
 	} catch (const CEOFException& err) {
-		AddDebugLogLineM(true, logKadSearch, wxT("CEOFException in CSearch::PreparePacketForTags: ") + err.what());
+		AddDebugLogLineC(logKadSearch, wxT("CEOFException in CSearch::PreparePacketForTags: ") + err.what());
 	} catch (const CInvalidPacket& err) {
-		AddDebugLogLineM(true, logKadSearch, wxT("CInvalidPacket Exception in CSearch::PreparePacketForTags: ") + err.what());		
+		AddDebugLogLineC(logKadSearch, wxT("CInvalidPacket Exception in CSearch::PreparePacketForTags: ") + err.what());
 	} catch (const wxString& e) {
-		AddDebugLogLineM(true, logKadSearch, wxT("Exception in CSearch::PreparePacketForTags: ") + e);
+		AddDebugLogLineC(logKadSearch, wxT("Exception in CSearch::PreparePacketForTags: ") + e);
 	} 
 
-	for (TagPtrList::const_iterator it = taglist.begin(); it != taglist.end(); ++it) {
-		delete *it;
-	}
+	deleteTagPtrListEntries(&taglist);
 }
 
 void CSearch::SetSearchTermData(uint32_t searchTermsDataSize, const uint8_t *searchTermsData)
@@ -1249,7 +1281,7 @@
 	memcpy(m_searchTermsData, searchTermsData, searchTermsDataSize);
 }
 
-uint8_t CSearch::GetRequestContactCount() const throw()
+uint8_t CSearch::GetRequestContactCount() const
 {
 	// Returns the amount of contacts we request on routing queries based on the search type
 	switch (m_type) {
@@ -1269,7 +1301,7 @@
 		case STORENOTES:
 			return KADEMLIA_STORE;
 		default:
-			AddDebugLogLineM(false, logKadSearch, wxT("Invalid search type. (CSearch::GetRequestContactCount())"));
+			AddDebugLogLineN(logKadSearch, wxT("Invalid search type. (CSearch::GetRequestContactCount())"));
 			wxFAIL;
 			return 0;
 	}

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/Search.h -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/Search.h Changed

@@ -1,9 +1,9 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -108,11 +108,11 @@
 	void ProcessResultKeyword(const CUInt128 &answer, TagPtrList *info);
 	void ProcessResultNotes(const CUInt128 &answer, TagPtrList *info);
 	void JumpStart();
-	void SendFindValue(CContact *contact);
+	void SendFindValue(CContact *contact, bool reaskMore = false);
 	void PrepareToStop() throw();
 	void StorePacket();
 
-	uint8_t	GetRequestContactCount() const throw();
+	uint8_t	GetRequestContactCount() const;
 
 	bool		m_stopping;
 	time_t		m_created;
@@ -127,17 +127,21 @@
 	CUInt128	m_target;
 	uint32_t	m_searchTermsDataSize;
 	uint8_t *	m_searchTermsData;
-	WordList	m_words;
+	WordList	m_words;  // list of words in the search string (populated in CSearchManager::PrepareFindKeywords)
 	wxString	m_fileName;
 	UIntList	m_fileIDs;
 	CKadClientSearcher *m_nodeSpecialSearchRequester; // used to callback result for NODESPECIAL searches
 
+	typedef std::map<CUInt128, bool>	RespondedMap;
+
 	ContactMap	m_possible;
 	ContactMap	m_tried;
-	ContactMap	m_responded;
+	RespondedMap	m_responded;
 	ContactMap	m_best;
 	ContactList	m_delete;
 	ContactMap	m_inUse;
+	CUInt128	m_closestDistantFound; // not used for the search itself, but for statistical data collecting
+	CContact *	m_requestedMoreNodesContact;
 };
 
 } // End namespace

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/SearchManager.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/SearchManager.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -46,6 +46,8 @@
 #include "../routing/Contact.h"
 #include "../../MemFile.h"
 #include "../../Logger.h"
+#include "../../RandomFunctions.h"		// Needed for GetRandomUInt128()
+#include "../../OtherFunctions.h"		// Needed for DeleteContents()
 
 #include <wx/tokenzr.h>
 
@@ -94,10 +96,7 @@
 void CSearchManager::StopAllSearches()
 {
 	// Stop and delete all searches.
-	for (SearchMap::iterator it = m_searches.begin(); it != m_searches.end(); ++it) {
-		delete it->second;
-	}
-	m_searches.clear();
+	DeleteContents(m_searches);
 }
 
 bool CSearchManager::StartSearch(CSearch* search)
@@ -124,14 +123,14 @@
 		s->SetSearchTypes(CSearch::KEYWORD);
 
 		// Make sure we have a keyword list
-		GetWords(keyword, &s->m_words);
+		GetWords(keyword, &s->m_words, true);
 		if (s->m_words.size() == 0) {
 			throw wxString(_("Kademlia: search keyword too short"));
 		}
 
 		wxString wstrKeyword = s->m_words.front();
 
-		printf("Keyword for search: %s\n",(const char*)unicode2char(wstrKeyword));
+		AddLogLineNS(CFormat(_("Keyword for search: %s")) % wstrKeyword);
 
 		// Kry - I just decided to assume everyone is unicoded
 		// GonoszTopi - seconded
@@ -139,7 +138,7 @@
 
 		// Verify that we are not already searching for this target.
 		if (AlreadySearchingFor(s->m_target)) {
-			throw wxT("Kademlia: Search keyword is already on search list: ") + wstrKeyword;
+			throw _("Kademlia: Search keyword is already on search list: ") + wstrKeyword;
 		}
 
 		s->SetSearchTermData(searchTermsDataSize, searchTermsData);
@@ -195,12 +194,12 @@
 			m_searches[id] = s;
 			s->Go();
 		}
-	}catch (const CEOFException& err) {
+	} catch (const CEOFException& DEBUG_ONLY(err)) {
 		delete s;
-		AddDebugLogLineM( false, logKadSearch, wxT("CEOFException in ") + wxString::FromAscii(__FUNCTION__) + wxT(": ") + err.what());
+		AddDebugLogLineN(logKadSearch, wxT("CEOFException in CSearchManager::PrepareLookup: ") + err.what());
 		return NULL;
 	} catch (...) {
-		AddDebugLogLineM(false, logKadSearch, wxT("Exception in CSearchManager::prepareLookup"));
+		AddDebugLogLineN(logKadSearch, wxT("Exception in CSearchManager::PrepareLookup"));
 		delete s;
 		throw;
 	}
@@ -231,24 +230,26 @@
 	return false;
 }
 
-void CSearchManager::GetWords(const wxString& str, WordList *words)
+void CSearchManager::GetWords(const wxString& str, WordList *words, bool allowDuplicates)
 {
-	size_t len = 0;
 	wxString current_word;
 	wxStringTokenizer tkz(str, GetInvalidKeywordChars());
 	while (tkz.HasMoreTokens()) {
 		current_word = tkz.GetNextToken();
-		
-		if ((len = current_word.Length()) > 2) {
+		// TODO: We'd need a safe way to determine if a sequence which contains only 3 chars is a real word.
+		// Currently we do this by evaluating the UTF-8 byte count. This will work well for Western locales,
+		// AS LONG AS the min. byte count is 3(!). If the byte count is once changed to 2, this will not
+		// work properly any longer because there are a lot of Western characters which need 2 bytes in UTF-8.
+		// Maybe we need to evaluate the Unicode character values itself whether the characters are located
+		// in code ranges where single characters are known to represent words.
+		if (strlen((const char *)(current_word.utf8_str())) >= 3) {
 			current_word.MakeLower();
-			words->remove(current_word);
+			if (!allowDuplicates) {
+				words->remove(current_word);
+			}
 			words->push_back(current_word);
 		}
 	}
-	// If the last word is 3 bytes long, chances are it's a file extension.
-	if(words->size() > 1 && len == 3) {
-		words->pop_back();
-	}
 }
 
 void CSearchManager::JumpStart()
@@ -406,7 +407,7 @@
 	uint8_t m_totalNotes = 0;
 	uint8_t m_totalStoreNotes = 0;
 		
-	for (SearchMap::iterator it = m_searches.begin(); it != m_searches.end(); ++it) {
+	for (SearchMap::const_iterator it = m_searches.begin(); it != m_searches.end(); ++it) {
 		switch(it->second->GetSearchTypes()){
 			case CSearch::FILE: {
 				m_totalFile++;
@@ -486,16 +487,13 @@
 
 	// If this search was deleted before this response, delete contacts and abort, otherwise process them.
 	if (s == NULL) {
-		AddDebugLogLineM(false, logKadSearch,
+		AddDebugLogLineN(logKadSearch,
 			wxT("Search either never existed or receiving late results (CSearchManager::ProcessResponse)"));
-		for (ContactList::const_iterator it2 = results->begin(); it2 != results->end(); ++it2) {
-			delete *it2;
-		}
-		delete results;
-		return;
+		DeleteContents(*results);
 	} else {
 		s->ProcessResponse(fromIP, fromPort, results);
 	}
+	delete results;
 }
 
 void CSearchManager::ProcessResult(const CUInt128& target, const CUInt128& answer, TagPtrList *info)
@@ -509,12 +507,8 @@
 
 	// If this search was deleted before these results, delete contacts and abort, otherwise process them.
 	if (s == NULL) {
-		AddDebugLogLineM (false, logKadSearch,
+		AddDebugLogLineN(logKadSearch,
 			wxT("Search either never existed or receiving late results (CSearchManager::ProcessResult)"));
-		for (TagPtrList::const_iterator tagIt = info->begin(); tagIt != info->end(); tagIt++) {
-			delete *tagIt;
-		}
-		delete info;
 	} else {
 		s->ProcessResult(answer, info);
 	}
@@ -523,7 +517,7 @@
 bool CSearchManager::FindNodeSpecial(const CUInt128& id, CKadClientSearcher *requester)
 {
 	// Do a node lookup.
-	AddDebugLogLineM(false, logKadSearch, wxT("Starting NODESPECIAL Kad Search for ") + id.ToHexString());
+	AddDebugLogLineN(logKadSearch, wxT("Starting NODESPECIAL Kad Search for ") + id.ToHexString());
 	CSearch *search = new CSearch;
 	search->SetSearchTypes(CSearch::NODESPECIAL);
 	search->SetTargetID(id);
@@ -534,9 +528,8 @@
 bool CSearchManager::FindNodeFWCheckUDP()
 {
 	CancelNodeFWCheckUDPSearch();
-	CUInt128 id;
-	id.SetValueRandom();
-	AddDebugLogLineM(false, logKadSearch, wxT("Starting NODEFWCHECKUDP Kad Search"));
+	CUInt128 id(GetRandomUint128());
+	AddDebugLogLineN(logKadSearch, wxT("Starting NODEFWCHECKUDP Kad Search"));
 	CSearch *search = new CSearch;
 	search->SetSearchTypes(CSearch::NODEFWCHECKUDP);
 	search->SetTargetID(id);

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/SearchManager.h -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/SearchManager.h Changed

@@ -1,9 +1,9 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -80,13 +80,13 @@
 	static void ProcessResult(const CUInt128& target, const CUInt128& answer, TagPtrList *info);
 	static void ProcessPublishResult(const CUInt128& target, const uint8_t load, const bool loadResponse);
 
-	static void GetWords(const wxString& str, WordList *words);
+	static void GetWords(const wxString& str, WordList *words, bool allowDuplicates = false);
 
 	static void UpdateStats() throw();
 
 	static bool AlreadySearchingFor(const CUInt128& target) throw() { return m_searches.count(target) > 0; }
 
-	static const wxChar* GetInvalidKeywordChars() { return wxT(" ()[]{}<>,._-!?:;\\/"); }
+	static const wxChar* GetInvalidKeywordChars() { return wxT(" ()[]{}<>,._-!?:;\\/\""); }
 
 	static void CancelNodeFWCheckUDPSearch();
 	static bool FindNodeFWCheckUDP();

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/UDPFirewallTester.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/UDPFirewallTester.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 Dévai Tamás ( gonosztopi@amule.org )
-// Copyright (c) 2008-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002-2008 Merkur ( strEmail.Format("%s@%s", "devteam", "emule-project.net") / http://www.emule-project.net )
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2008-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -24,14 +24,11 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-#define need_UDP_FIREWALLTEST_CLIENTSTOASK
-
 #include "UDPFirewallTester.h"
 #include "../utils/UInt128.h"
 #include "../utils/KadUDPKey.h"
 #include "../routing/RoutingZone.h"
 #include <common/Macros.h>
-#include "Kademlia.h"
 #include "Prefs.h"
 #include "SearchManager.h"
 #include "../../Logger.h"
@@ -57,12 +54,15 @@
 
 
 bool CUDPFirewallTester::IsFirewalledUDP(bool lastStateIfTesting)
-{ 
+{
+	if (CKademlia::IsRunningInLANMode()) {
+		return false;
+	}
 	if (!m_timedOut && IsFWCheckUDPRunning()) {
 		if (!m_firewalledUDP && CKademlia::IsFirewalled() && m_testStart != 0 && ::GetTickCount() - m_testStart > MIN2MS(6)
 			&& !m_isFWVerifiedUDP /*For now we don't allow to get firewalled by timeouts if we have succeded a test before, might be changed later*/)
 		{
-			AddDebugLogLineM(false, logKadUdpFwTester, wxT("Timeout: Setting UDP status to firewalled after being unable to get results for 6 minutes"));
+			AddDebugLogLineN(logKadUdpFwTester, wxT("Timeout: Setting UDP status to firewalled after being unable to get results for 6 minutes"));
 			m_timedOut = true;
 			theApp->ShowConnectionState();
 		}
@@ -83,6 +83,11 @@
 
 void CUDPFirewallTester::SetUDPFWCheckResult(bool succeeded, bool testCancelled, uint32_t fromIP, uint16_t incomingPort)
 {
+	// can be called on shutdown after KAD has been stopped
+	if (!CKademlia::IsRunning()) {
+		return;
+	}
+
 	// check if we actually requested a firewallcheck from this client
 	bool requested = false;
 	for (UsedClientList::iterator it = m_usedTestClients.begin(); it != m_usedTestClients.end(); ++it) {
@@ -95,7 +100,7 @@
 				// Because a proper forwarded intern port is more reliable to stay open than an extern port set by the NAT, we prefer
 				// intern ports and change the setting.
 				CKademlia::GetPrefs()->SetUseExternKadPort(false);
-				AddDebugLogLineM(false, logKadUdpFwTester, wxString::Format(wxT("Corrected UDP firewall result: Using open internal (%u) instead of open external port"), incomingPort));
+				AddDebugLogLineN(logKadUdpFwTester, CFormat(wxT("Corrected UDP firewall result: Using open internal (%u) instead of open external port")) % incomingPort);
 				theApp->ShowConnectionState();
 				return;
 			} else if (it->answered) {
@@ -111,7 +116,7 @@
 	}
 
 	if (!requested){
-		AddDebugLogLineM(false, logKadUdpFwTester, wxT("Unrequested UDPFWCheckResult from ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(fromIP)));
+		AddDebugLogLineN(logKadUdpFwTester, wxT("Unrequested UDPFWCheckResult from ") + KadIPToString(fromIP));
 		return;
 	}
 
@@ -140,17 +145,17 @@
 			// if this packet came to our internal port, explict set the interal port as used port from now on
 			if (incomingPort == CKademlia::GetPrefs()->GetInternKadPort()) {
 				CKademlia::GetPrefs()->SetUseExternKadPort(false);
-				AddDebugLogLineM(false, logKadUdpFwTester, wxT("New Kad Firewallstate (UDP): Open, using intern port"));
+				AddDebugLogLineN(logKadUdpFwTester, wxT("New Kad Firewallstate (UDP): Open, using intern port"));
 			} else if (incomingPort == CKademlia::GetPrefs()->GetExternalKadPort() && incomingPort != 0) {
 				CKademlia::GetPrefs()->SetUseExternKadPort(true);
-				AddDebugLogLineM(false, logKadUdpFwTester, wxT("New Kad Firewallstate (UDP): Open, using extern port"));
+				AddDebugLogLineN(logKadUdpFwTester, wxT("New Kad Firewallstate (UDP): Open, using extern port"));
 			}
 			theApp->ShowConnectionState();
 			return;
 		} else if (m_fwChecksFinishedUDP >= UDP_FIREWALLTEST_CLIENTSTOASK) {
 			// seems we are firewalled
 			m_testStart = 0;
-			AddDebugLogLineM(false, logKadUdpFwTester, wxT("New KAD Firewallstate (UDP): Firewalled"));
+			AddDebugLogLineN(logKadUdpFwTester, wxT("New KAD Firewallstate (UDP): Firewalled"));
 			m_firewalledUDP = true;
 			m_isFWVerifiedUDP = true;
 			m_timedOut = false;
@@ -159,9 +164,9 @@
 			CSearchManager::CancelNodeFWCheckUDPSearch(); // cancel firewallnode searches if any are still active
 			return;
 		} else
-			AddDebugLogLineM(false, logKadUdpFwTester, wxT("Kad UDP firewalltest from ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(fromIP)) + wxT(" result: Firewalled, continue testing"));
+			AddDebugLogLineN(logKadUdpFwTester, wxT("Kad UDP firewalltest from ") + KadIPToString(fromIP) + wxT(" result: Firewalled, continue testing"));
 	} else {
-		AddDebugLogLineM(false, logKadUdpFwTester, wxT("Kad UDP firewalltest from ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(fromIP)) + wxT(" cancelled"));
+		AddDebugLogLineN(logKadUdpFwTester, wxT("Kad UDP firewalltest from ") + KadIPToString(fromIP) + wxT(" cancelled"));
 	}
 	QueryNextClient();
 }

aMule-2.2.6.tar.bz2/src/kademlia/kademlia/UDPFirewallTester.h -> aMule-2.3.1.tar.bz2/src/kademlia/kademlia/UDPFirewallTester.h Changed

@@ -1,9 +1,9 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 Dévai Tamás ( gonosztopi@amule.org )
-// Copyright (c) 2008-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002-2008 Merkur ( strEmail.Format("%s@%s", "devteam", "emule-project.net") / http://www.emule-project.net )
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2008-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -27,6 +27,7 @@
 #ifndef KADEMLIA_KADEMLIA_UDPFIREWALLTESTER_H
 #define KADEMLIA_KADEMLIA_UDPFIREWALLTESTER_H
 
+#include "Kademlia.h"
 #include "../routing/Contact.h"
 #include <list>
 
@@ -49,8 +50,8 @@
 	static bool	IsFirewalledUDP(bool lastStateIfTesting); // Are we UDP firewalled - if unknown open is assumed unless onlyVerified == true
 	static void	SetUDPFWCheckResult(bool succeeded, bool testCancelled, uint32_t fromIP, uint16_t incomingPort);
 	static void	ReCheckFirewallUDP(bool setUnverified);
-	static bool	IsFWCheckUDPRunning() throw()		{ return m_fwChecksFinishedUDP < UDP_FIREWALLTEST_CLIENTSTOASK; }
-	static bool	IsVerified() throw()			{ return m_isFWVerifiedUDP; }
+	static bool	IsFWCheckUDPRunning() throw()		{ return m_fwChecksFinishedUDP < UDP_FIREWALLTEST_CLIENTSTOASK && !CKademlia::IsRunningInLANMode(); }
+	static bool	IsVerified() throw()			{ return m_isFWVerifiedUDP || CKademlia::IsRunningInLANMode(); }
 
 	static void	AddPossibleTestContact(const CUInt128& clientID, uint32_t ip, uint16_t port, uint16_t tport, const CUInt128& target, uint8_t version, const CKadUDPKey& udpKey, bool ipVerified)
 	{
@@ -84,10 +85,6 @@
 	static UsedClientList	m_usedTestClients;
 };
 
-#ifndef need_UDP_FIREWALLTEST_CLIENTSTOASK
-#	undef UDP_FIREWALLTEST_CLIENTSTOASK
-#endif
-
 } // namespace Kademlia
 
 #endif /* KADEMLIA_KADEMLIA_UDPFIREWALLTESTER */

aMule-2.2.6.tar.bz2/src/kademlia/net/KademliaUDPListener.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/net/KademliaUDPListener.cpp Changed

@@ -1,10 +1,10 @@
 //
 // This file is part of aMule Project
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Project ( http://www.amule-project.net )
-// Copyright (C)2003 Barry Dunne (http://www.emule-project.net)
-// Copyright (C)2007-2008 Merkur ( strEmail.Format("%s@%s", "devteam", "emule-project.net") / http://www.emule-project.net )
+// 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-2011 Barry Dunne ( http://www.emule-project.net )
+// Copyright (C)2007-2011 Merkur ( strEmail.Format("%s@%s", "devteam", "emule-project.net") / http://www.emule-project.net )
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -65,6 +65,7 @@
 #include "../../Preferences.h"
 #include "../../ScopedPtr.h"
 #include "../../IPFilter.h"
+#include "../../RandomFunctions.h"		// Needed for GetRandomUint128()
 
 #include <wx/tokenzr.h>
 
@@ -76,14 +77,14 @@
 
 #define CHECK_PACKET_SIZE(OP, SIZE) \
 	if (lenPacket OP (uint32_t)(SIZE)) \
-		throw wxString::Format(wxT("***NOTE: Received wrong size (%u) packet in "), lenPacket) + wxString::FromAscii(__FUNCTION__)
+		throw wxString(CFormat(wxT("***NOTE: Received wrong size (%u) packet in %s")) % lenPacket % wxString::FromAscii(__FUNCTION__))
 
 #define CHECK_PACKET_MIN_SIZE(SIZE)	CHECK_PACKET_SIZE(<, SIZE)
 #define CHECK_PACKET_EXACT_SIZE(SIZE)	CHECK_PACKET_SIZE(!=, SIZE)
 
 #define CHECK_TRACKED_PACKET(OPCODE) \
 	if (!IsOnOutTrackList(ip, OPCODE)) \
-		throw wxString::Format(wxT("***NOTE: Received unrequested response packet, size (%u) in "), lenPacket) + wxString::FromAscii(__FUNCTION__)
+		throw wxString(CFormat(wxT("***NOTE: Received unrequested response packet, size (%u) in %s")) % lenPacket % wxString::FromAscii(__FUNCTION__))
 
 
 ////////////////////////////////////////
@@ -99,21 +100,16 @@
 }
 
 // Used by Kad1.0 and Kad2.0
-void CKademliaUDPListener::Bootstrap(uint32_t ip, uint16_t port, bool kad2, uint8_t kadVersion, const CUInt128* cryptTargetID)
+void CKademliaUDPListener::Bootstrap(uint32_t ip, uint16_t port, uint8_t kadVersion, const CUInt128* cryptTargetID)
 {
 	wxASSERT(ip);
 
-	if (kad2) {
-		DebugSend(Kad2BootstrapReq, ip, port);
-		CMemFile bio(0);
-		if (kadVersion >= 6) {
-			SendPacket(bio, KADEMLIA2_BOOTSTRAP_REQ, ip, port, 0, cryptTargetID);
-		} else {
-			SendPacket(bio, KADEMLIA2_BOOTSTRAP_REQ, ip, port, 0, NULL);
-		}
+	DebugSend(Kad2BootstrapReq, ip, port);
+	CMemFile bio(0);
+	if (kadVersion >= 6) {
+		SendPacket(bio, KADEMLIA2_BOOTSTRAP_REQ, ip, port, 0, cryptTargetID);
 	} else {
-		DebugSend(KadBootstrapReq, ip, port);
-		SendMyDetails(KADEMLIA_BOOTSTRAP_REQ, ip, port, 0, 0, NULL, false);
+		SendPacket(bio, KADEMLIA2_BOOTSTRAP_REQ, ip, port, 0, NULL);
 	}
 }
 
@@ -123,7 +119,7 @@
 	CMemFile packetdata;
 	packetdata.WriteUInt128(CKademlia::GetPrefs()->GetKadID());
 	
-	if (kadVersion > 0) {
+	if (kadVersion > 1) {
 		packetdata.WriteUInt16(thePrefs::GetPort());
 		packetdata.WriteUInt8(KADEMLIA_VERSION);
 		// Tag Count.
@@ -150,11 +146,9 @@
 				(CUDPFirewallTester::IsFirewalledUDP(true) ? 1 : 0)
 			)));
 		}
-		// packetdata.WriteTag(CKadTagUInt(TAG_USER_COUNT, CKademlia::GetPrefs()->GetKademliaUsers()));
-		// packetdata.WriteTag(CKadTagUInt(TAG_FILE_COUNT, CKademlia::GetPrefs()->GetKademliaFiles()));
 		if (kadVersion >= 6) {
 			if (cryptTargetID == NULL || *cryptTargetID == 0) {
-				AddDebugLogLineM(false, logClientKadUDP, wxT("Sending hello response to crypt enabled Kad Node which provided an empty NodeID: ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxString::Format(wxT(" (%u)"), kadVersion));
+				AddDebugLogLineN(logClientKadUDP, CFormat(wxT("Sending hello response to crypt enabled Kad Node which provided an empty NodeID: %s (%u)")) % KadIPToString(ip) % kadVersion);
 				SendPacket(packetdata, opcode, ip, port, targetKey, NULL);
 			} else {
 				SendPacket(packetdata, opcode, ip, port, targetKey, cryptTargetID);
@@ -164,12 +158,7 @@
 			wxASSERT(targetKey.IsEmpty());
 		}
 	} else {
-		wxASSERT(!requestAckPacket);
-		packetdata.WriteUInt32(CKademlia::GetPrefs()->GetIPAddress());
-		packetdata.WriteUInt16(thePrefs::GetEffectiveUDPPort());
-		packetdata.WriteUInt16(thePrefs::GetPort());
-		packetdata.WriteUInt8(0);
-		SendPacket(packetdata, opcode, ip, port, 0, NULL);
+		wxFAIL;
 	}
 }
 
@@ -229,9 +218,7 @@
 {
 	// we do not accept (<= 0.48a) unencrypted incoming packets from port 53 (DNS) to avoid attacks based on DNS protocol confusion
 	if (port == 53 && senderKey.IsEmpty()) {
-#ifdef __DEBUG__
-		AddDebugLogLineM(false, logKadPacketTracking, wxT("Dropping incoming unencrypted packet on port 53 (DNS), IP: ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)));
-#endif
+		AddDebugLogLineN(logKadPacketTracking, wxT("Dropping incoming unencrypted packet on port 53 (DNS), IP: ") + KadIPToString(ip));
 		return;
 	}
 
@@ -252,34 +239,18 @@
 	}
 
 	switch (opcode) {
-		case KADEMLIA_BOOTSTRAP_REQ:
-			DebugRecv(KadBootstrapReq, ip, port);
-			ProcessBootstrapRequest(packetData, lenPacket, ip, port);
-			break;
 		case KADEMLIA2_BOOTSTRAP_REQ:
 			DebugRecv(Kad2BootstrapReq, ip, port);
 			Process2BootstrapRequest(ip, port, senderKey);
 			break;
-		case KADEMLIA_BOOTSTRAP_RES:
-			DebugRecv(KadBootstrapRes, ip, port);
-			ProcessBootstrapResponse(packetData, lenPacket, ip);
-			break;
 		case KADEMLIA2_BOOTSTRAP_RES:
 			DebugRecv(Kad2BootstrapRes, ip, port);
 			Process2BootstrapResponse(packetData, lenPacket, ip, port, senderKey, validReceiverKey);
 			break;
-		case KADEMLIA_HELLO_REQ:
-			DebugRecv(KadHelloReq, ip, port);
-			ProcessHelloRequest(packetData, lenPacket, ip, port);
-			break;
 		case KADEMLIA2_HELLO_REQ:
 			DebugRecv(Kad2HelloReq, ip, port);
 			Process2HelloRequest(packetData, lenPacket, ip, port, senderKey, validReceiverKey);
 			break;
-		case KADEMLIA_HELLO_RES:
-			DebugRecv(KadHelloRes, ip, port);
-			ProcessHelloResponse(packetData, lenPacket, ip, port);
-			break;
 		case KADEMLIA2_HELLO_RES:
 			DebugRecv(Kad2HelloRes, ip, port);
 			Process2HelloResponse(packetData, lenPacket, ip, port, senderKey, validReceiverKey);
@@ -288,30 +259,14 @@
 			DebugRecv(Kad2HelloResAck, ip, port);
 			Process2HelloResponseAck(packetData, lenPacket, ip, validReceiverKey);
 			break;
-		case KADEMLIA_REQ:
-			DebugRecv(KadReq, ip, port);
-			ProcessKademliaRequest(packetData, lenPacket, ip, port);
-			break;
 		case KADEMLIA2_REQ:
 			DebugRecv(Kad2Req, ip, port);
 			ProcessKademlia2Request(packetData, lenPacket, ip, port, senderKey);
 			break;
-		case KADEMLIA_RES:
-			DebugRecv(KadRes, ip, port);
-			ProcessKademliaResponse(packetData, lenPacket, ip, port);
-			break;
 		case KADEMLIA2_RES:
 			DebugRecv(Kad2Res, ip, port);
 			ProcessKademlia2Response(packetData, lenPacket, ip, port, senderKey);
 			break;
-		case KADEMLIA_SEARCH_REQ:
-			DebugRecv(KadSearchReq, ip, port);
-			ProcessSearchRequest(packetData, lenPacket, ip, port);
-			break;
-		case KADEMLIA_SEARCH_NOTES_REQ:
-			DebugRecv(KadSearchNotesReq, ip, port);
-			ProcessSearchNotesRequest(packetData, lenPacket, ip, port);
-			break;
 		case KADEMLIA2_SEARCH_NOTES_REQ:
 			DebugRecv(Kad2SearchNotesReq, ip, port);
 			Process2SearchNotesRequest(packetData, lenPacket, ip, port, senderKey);
@@ -336,14 +291,6 @@
 			DebugRecv(Kad2SearchRes, ip, port);
 			Process2SearchResponse(packetData, lenPacket, senderKey);
 			break;
-		case KADEMLIA_PUBLISH_REQ:
-			DebugRecv(KadPublishReq, ip, port);
-			ProcessPublishRequest(packetData, lenPacket, ip, port);
-			break;
-		case KADEMLIA_PUBLISH_NOTES_REQ:
-			DebugRecv(KadPublishNotesReq, ip, port);
-			ProcessPublishNotesRequest(packetData, lenPacket, ip, port);
-			break;
 		case KADEMLIA2_PUBLISH_NOTES_REQ:
 			DebugRecv(Kad2PublishNotesReq, ip, port);
 			Process2PublishNotesRequest(packetData, lenPacket, ip, port, senderKey);
@@ -360,10 +307,6 @@
 			DebugRecv(KadPublishRes, ip, port);
 			ProcessPublishResponse(packetData, lenPacket, ip);
 			break;
-		case KADEMLIA_PUBLISH_NOTES_RES:
-			DebugRecv(KadPublishNotesRes, ip, port);
-			ProcessPublishNotesResponse(packetData, lenPacket, ip);
-			break;
 		case KADEMLIA2_PUBLISH_RES:
 			DebugRecv(Kad2PublishRes, ip, port);
 			Process2PublishResponse(packetData, lenPacket, ip, port, senderKey);
@@ -408,33 +351,27 @@
 			DebugRecv(Kad2FirewallUDP, ip, port);
 			Process2FirewallUDP(packetData, lenPacket, ip);
 			break;
+
+		// old Kad1 opcodes which we don't handle anymore
+		case KADEMLIA_BOOTSTRAP_REQ_DEPRECATED:
+		case KADEMLIA_BOOTSTRAP_RES_DEPRECATED:
+		case KADEMLIA_HELLO_REQ_DEPRECATED:
+		case KADEMLIA_HELLO_RES_DEPRECATED:
+		case KADEMLIA_REQ_DEPRECATED:
+		case KADEMLIA_RES_DEPRECATED:
+		case KADEMLIA_PUBLISH_NOTES_REQ_DEPRECATED:
+		case KADEMLIA_PUBLISH_NOTES_RES_DEPRECATED:
+		case KADEMLIA_SEARCH_REQ:
+		case KADEMLIA_PUBLISH_REQ:
+		case KADEMLIA_SEARCH_NOTES_REQ:
+			break;
+
 		default: {
-			throw wxString::Format(wxT("Unknown opcode %02x on CKademliaUDPListener::ProcessPacket()"), opcode);
+			throw wxString(CFormat(wxT("Unknown opcode %02x on CKademliaUDPListener::ProcessPacket()")) % opcode);
 		}
 	}
 }
 
-// Used only for Kad1.0
-bool CKademliaUDPListener::AddContact(const uint8_t *data, uint32_t lenData, uint32_t ip, uint16_t port, uint16_t tport, const CKadUDPKey& udpKey, bool& ipVerified, bool update, CUInt128* outContactID)
-{
-	CMemFile bio(data, lenData);
-	CUInt128 id = bio.ReadUInt128();
-	if (outContactID != NULL) {
-		*outContactID = id;
-	}
-	bio.ReadUInt32();
-	bio.ReadUInt16();
-	if (tport) {
-		bio.ReadUInt16();
-	} else {
-		tport = bio.ReadUInt16();
-	}
-	bio.ReadUInt8();
-	//AddDebugLogLineM(false, logKadMain, wxT("Adding a contact with ip ") + Uint32_16toStringIP_Port(wxUINT32_SWAP_ALWAYS(ip),port));
-	// Ignore stated ip and port, use the address the packet came from
-	return CKademlia::GetRoutingZone()->Add(id, ip, port, tport, 0, udpKey, ipVerified, update, false, true);
-}
-
 // Used only for Kad2.0
 bool CKademliaUDPListener::AddContact2(const uint8_t *data, uint32_t lenData, uint32_t ip, uint16_t& port, uint8_t *outVersion, const CKadUDPKey& udpKey, bool& ipVerified, bool update, bool fromHelloReq, bool* outRequestsACK, CUInt128* outContactID)
 {
@@ -450,7 +387,7 @@
 	uint16_t tport = bio.ReadUInt16();
 	uint8_t version = bio.ReadUInt8();
 	if (version == 0) {
-		throw wxString::Format(wxT("***NOTE: Received invalid Kademlia2 version (%u) in "), version) + wxString::FromAscii(__FUNCTION__);
+		throw wxString(CFormat(wxT("***NOTE: Received invalid Kademlia2 version (%u) in %s")) % version % wxString::FromAscii(__FUNCTION__));
 	}
 	if (outVersion != NULL) {
 		*outVersion = version;
@@ -486,7 +423,7 @@
 	// check if we are waiting for informations (nodeid) about this client and if so inform the requester
 	for (FetchNodeIDList::iterator it = m_fetchNodeIDRequests.begin(); it != m_fetchNodeIDRequests.end(); ++it) {
 		if (it->ip == ip && it->tcpPort == tport) {
-			//AddDebugLogLineM(false, logKadMain, wxT("Result Addcontact: ") + id.ToHexString());
+			//AddDebugLogLineN(logKadMain, wxT("Result Addcontact: ") + id.ToHexString());
 			uint8_t uchID[16];
 			id.ToByteArray(uchID);
 			it->requester->KadSearchNodeIDByIPResult(KCSR_SUCCEEDED, uchID);
@@ -505,74 +442,13 @@
 	}
 
 	if (!udpFirewalled) {	// do not add (or update) UDP firewalled sources to our routing table
-		return CKademlia::GetRoutingZone()->Add(id, ip, port, tport, version, udpKey, ipVerified, update, false, true);
+		return CKademlia::GetRoutingZone()->Add(id, ip, port, tport, version, udpKey, ipVerified, update, true);
 	} else {
-		AddDebugLogLineM(false, logKadRouting, wxT("Not adding firewalled client to routing table (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(")"));
+		AddDebugLogLineN(logKadRouting, wxT("Not adding firewalled client to routing table (") + KadIPToString(ip) + wxT(")"));
 		return false;
 	}
 }
 
-// Used only for Kad1.0
-void CKademliaUDPListener::AddContacts(const uint8_t *data, uint32_t lenData, uint16_t numContacts, bool update)
-{
-	CMemFile bio(data, lenData);
-	CRoutingZone *routingZone = CKademlia::GetRoutingZone();
-	for (uint16_t i = 0; i < numContacts; i++) {
-		CUInt128 id = bio.ReadUInt128();
-		uint32_t ip = bio.ReadUInt32();
-		ip = wxUINT32_SWAP_ALWAYS(ip);
-		uint16_t port = bio.ReadUInt16();
-		uint16_t tport = bio.ReadUInt16();
-		bio.ReadUInt8();
-		bool verified = false;
-		//AddDebugLogLineM(false, logKadMain, wxT("Adding contact(s) with ip ") + Uint32_16toStringIP_Port(wxUINT32_SWAP_ALWAYS(ip),port));
-		routingZone->Add(id, ip, port, tport, 0, 0, verified, update, false, false);
-	}
-}
-
-// KADEMLIA_BOOTSTRAP_REQ
-// Used only for Kad1.0
-void CKademliaUDPListener::ProcessBootstrapRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port)
-{
-	// Verify packet is expected size
-	CHECK_PACKET_EXACT_SIZE(25);
-
-	// Add the sender to the list of contacts
-	bool verified = false;
-	AddContact(packetData, lenPacket, ip, port, 0, 0, verified, true, NULL);
-
-	// Get some contacts to return
-	ContactList contacts;
-	uint16_t numContacts = 1 + (uint16_t)CKademlia::GetRoutingZone()->GetBootstrapContacts(&contacts, 20);
-
-	// Create response packet
-	//We only collect a max of 20 contacts here.. Max size is 527.
-	//2 + 25(20) + 25
-	CMemFile packetdata(527);
-
-	// Write packet info
-	packetdata.WriteUInt16(numContacts);
-	CContact *contact;
-	for (ContactList::const_iterator it = contacts.begin(); it != contacts.end(); ++it) {
-		contact = *it;
-		packetdata.WriteUInt128(contact->GetClientID());
-		packetdata.WriteUInt32(contact->GetIPAddress());
-		packetdata.WriteUInt16(contact->GetUDPPort());
-		packetdata.WriteUInt16(contact->GetTCPPort());
-		packetdata.WriteUInt8(contact->GetType());
-	}
-
-	packetdata.WriteUInt128(CKademlia::GetPrefs()->GetKadID());
-	packetdata.WriteUInt32(CKademlia::GetPrefs()->GetIPAddress());
-	packetdata.WriteUInt16(thePrefs::GetEffectiveUDPPort());
-	packetdata.WriteUInt16(thePrefs::GetPort());
-	packetdata.WriteUInt8(0);
-
-	// Send response
-	DebugSend(KadBootstrapRes, ip, port);
-	SendPacket(packetdata, KADEMLIA_BOOTSTRAP_RES, ip, port, 0, NULL);
-}
-
 // KADEMLIA2_BOOTSTRAP_REQ
 // Used only for Kad2.0
 void CKademliaUDPListener::Process2BootstrapRequest(uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
@@ -607,27 +483,6 @@
 	SendPacket(packetdata, KADEMLIA2_BOOTSTRAP_RES, ip, port, senderKey, NULL);
 }
 
-// KADEMLIA_BOOTSTRAP_RES
-// Used only for Kad1.0
-void CKademliaUDPListener::ProcessBootstrapResponse(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip)
-{
-	// Verify packet is expected size
-	CHECK_PACKET_MIN_SIZE(27);
-	CHECK_TRACKED_PACKET(KADEMLIA_BOOTSTRAP_REQ);
-
-	// How many contacts were given
-	CMemFile bio(packetData, lenPacket);
-	uint16_t numContacts = bio.ReadUInt16();
-
-	// Verify packet is expected size
-	if (lenPacket != (uint32_t)(2 + 25 * numContacts)) {
-		return;
-	}
-
-	// Add these contacts to the list.
-	AddContacts(packetData + 2, lenPacket - 2, numContacts, false);
-}
-
 // KADEMLIA2_BOOTSTRAP_RES
 // Used only for Kad2.0
 void CKademliaUDPListener::Process2BootstrapResponse(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey, bool validReceiverKey)
@@ -647,8 +502,9 @@
 	bool assumeVerified = CKademlia::GetRoutingZone()->GetNumContacts() == 0;
 
 	if (CKademlia::s_bootstrapList.empty()) {
-		routingZone->Add(contactID, ip, port, tport, version, senderKey, validReceiverKey, true, false, false);
+		routingZone->Add(contactID, ip, port, tport, version, senderKey, validReceiverKey, true, false);
 	}
+	//AddDebugLogLineN(logClientKadUDP, wxT("Inc Kad2 Bootstrap packet from ") + KadIPToString(ip));
 
 	uint16_t numContacts = bio.ReadUInt16();
 	while (numContacts) {
@@ -658,50 +514,23 @@
 		tport = bio.ReadUInt16();
 		version = bio.ReadUInt8();
 		bool verified = assumeVerified;
-		routingZone->Add(contactID, ip, port, tport, version, 0, verified, false, false, false);
+		routingZone->Add(contactID, ip, port, tport, version, 0, verified, false, false);
 		numContacts--;
 	}
 }
 
-// KADEMLIA_HELLO_REQ
-// Used in Kad1.0 only
-void CKademliaUDPListener::ProcessHelloRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port)
-{
-	// Verify packet is expected size
-	CHECK_PACKET_EXACT_SIZE(25);
-
-	// Add the sender to the list of contacts
-	bool validReceiverKey = false;
-	CUInt128 contactID;
-	bool addedOrUpdated = AddContact(packetData, lenPacket, ip, port, 0, 0, validReceiverKey, true, &contactID);
-
-	// Send response
-	DebugSend(KadHelloRes, ip, port);	
-	SendMyDetails(KADEMLIA_HELLO_RES, ip, port, 0, 0, NULL, false);
-
-	if (addedOrUpdated && !validReceiverKey) {
-		// we need to verify this contact but it doesn't support HELLO_RES_ACK nor keys, do a little workaround
-		SendLegacyChallenge(ip, port, contactID, false);
-	}
-
-	// Check if firewalled
-	if (CKademlia::GetPrefs()->GetRecheckIP()) {
-		FirewalledCheck(ip, port, 0, 0);
-	}
-}
-
 // KADEMLIA2_HELLO_REQ
 // Used in Kad2.0 only
 void CKademliaUDPListener::Process2HelloRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey, bool validReceiverKey)
 {
-	uint16_t dbgOldUDPPort = port;
+	DEBUG_ONLY( uint16_t dbgOldUDPPort = port; )
 	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 >= 1);
+	wxASSERT(contactVersion >= 2);
 #ifdef __DEBUG__
 	if (dbgOldUDPPort != port) {
-		AddDebugLogLineM(false, logClientKadUDP, wxT("KadContact ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxString::Format(wxT(" uses his internal (%u) instead external (%u) UDP Port"), port, dbgOldUDPPort));
+		AddDebugLogLineN(logClientKadUDP, CFormat(wxT("KadContact %s uses his internal (%u) instead external (%u) UDP Port")) % KadIPToString(ip) % port % dbgOldUDPPort);
 	}
 #endif
 
@@ -719,7 +548,7 @@
 		CContact* contact = CKademlia::GetRoutingZone()->GetContact(contactID);
 		if (contact != NULL) {
 			if (contact->GetType() < 2) {
-				AddDebugLogLineM(false, logClientKadUDP, wxT("Sending (ping) challenge to a long known contact (should be verified already) - ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)));
+				AddDebugLogLineN(logKadRouting, wxT("Sending (ping) challenge to a long known contact (should be verified already) - ") + KadIPToString(ip));
 			}
 		} else {
 			wxFAIL;
@@ -732,7 +561,7 @@
 
 	if (addedOrUpdated && !validReceiverKey && contactVersion < 7 && !HasActiveLegacyChallenge(ip)) {
 		// we need to verify this contact but it doesn't support HELLO_RES_ACK nor keys, do a little workaround
-		SendLegacyChallenge(ip, port, contactID, true);
+		SendLegacyChallenge(ip, port, contactID);
 	}
 
 	// Check if firewalled
@@ -741,27 +570,6 @@
 	}
 }
 
-// KADEMLIA_HELLO_RES
-// Used in Kad1.0 only
-void CKademliaUDPListener::ProcessHelloResponse(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port)
-{
-	CHECK_TRACKED_PACKET(KADEMLIA_HELLO_REQ);
-
-	// Verify packet is expected size
-	CHECK_PACKET_EXACT_SIZE(25);
-
-	// Add or Update contact.
-	bool validReceiverKey = false;
-	CUInt128 contactID;
-	bool addedOrUpdated = AddContact(packetData, lenPacket, ip, port, 0, 0, validReceiverKey, true, &contactID);
-	if (addedOrUpdated && !validReceiverKey) {
-		// even though this is supposably an answer to a request from us, there are still possibilities to spoof
-		// it, as long as the attacker knows that we would send a HELLO_REQ (which in this case is quite often),
-		// so for old Kad Version which doesn't support keys, we need
-		SendLegacyChallenge(ip, port, contactID, false);
-	}
-}
-
 // KADEMLIA2_HELLO_RES_ACK
 // Used in Kad2.0 only
 void CKademliaUDPListener::Process2HelloResponseAck(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, bool validReceiverKey)
@@ -770,7 +578,7 @@
 	CHECK_TRACKED_PACKET(KADEMLIA2_HELLO_RES);
 
 	if (!validReceiverKey) {
-		AddDebugLogLineM(false, logClientKadUDP, wxT("Receiver key is invalid! (sender: ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(")"));
+		AddDebugLogLineN(logClientKadUDP, wxT("Receiver key is invalid! (sender: ") + KadIPToString(ip) + wxT(")"));
 		return;
 	}
 
@@ -778,13 +586,10 @@
 	CMemFile bio(packetData, lenPacket);
 	CUInt128 remoteID = bio.ReadUInt128();
 	if (!CKademlia::GetRoutingZone()->VerifyContact(remoteID, ip)) {
-		AddDebugLogLineM(false, logKadRouting, wxT("Unable to find valid sender in routing table (sender: ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(")"));
-	}
-#ifdef __DEBUG__
-	else {
-		AddDebugLogLineM(false, logKadRouting, wxT("Verified contact (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(") by HELLO_RES_ACK"));
+		AddDebugLogLineN(logKadRouting, wxT("Unable to find valid sender in routing table (sender: ") + KadIPToString(ip) + wxT(")"));
+	} else {
+		AddDebugLogLineN(logKadRouting, wxT("Verified contact (") + KadIPToString(ip) + wxT(") by HELLO_RES_ACK"));
 	}
-#endif
 }
 
 // KADEMLIA2_HELLO_RES
@@ -805,7 +610,7 @@
 		if (senderKey.IsEmpty()) {
 			// but we don't have a valid sender key - there is no point to reply in this case
 			// most likely a bug in the remote client
-			AddDebugLogLineM(false, logClientKadUDP, wxT("Remote client demands ACK, but didn't send any sender key! (sender: ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(")"));
+			AddDebugLogLineN(logClientKadUDP, wxT("Remote client demands ACK, but didn't send any sender key! (sender: ") + KadIPToString(ip) + wxT(")"));
 		} else {
 			CMemFile packet(17);
 			packet.WriteUInt128(CKademlia::GetPrefs()->GetKadID());
@@ -817,7 +622,7 @@
 		// even though this is supposably an answer to a request from us, there are still possibilities to spoof
 		// it, as long as the attacker knows that we would send a HELLO_REQ (which in this case is quite often),
 		// so for old Kad Version which doesn't support keys, we need
-		SendLegacyChallenge(ip, port, contactID, true);
+		SendLegacyChallenge(ip, port, contactID);
 	}
 
 	// do we need to find out our extern port?
@@ -832,68 +637,6 @@
 	}
 }
 
-// KADEMLIA_REQ
-// Used in Kad1.0 only
-void CKademliaUDPListener::ProcessKademliaRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port)
-{
-	// Verify packet is expected size
-	CHECK_PACKET_EXACT_SIZE(33);
-
-	// RecheckIP and firewall status
-	if (CKademlia::GetPrefs()->GetRecheckIP()) {
-		FirewalledCheck(ip, port, 0, 0);
-		DebugSend(KadHelloReq, ip, port);
-		SendMyDetails(KADEMLIA_HELLO_REQ, ip, port, 0, 0, NULL, false);
-	}
-
-	// Get target and type
-	CMemFile bio(packetData, lenPacket);
-	uint8_t type = bio.ReadUInt8();
-//		bool flag1 = (type >> 6); //Reserved
-//		bool flag2 = (type >> 7); //Reserved
-//		bool flag3 = (type >> 8); //Reserved
-
-	type &= 0x1F;
-	if( type == 0 ) {
-		throw wxString::Format(wxT("***NOTE: Received wrong type (0x%02x) in "), type) + wxString::FromAscii(__FUNCTION__);
-	}
-
-	// This is the target node trying to be found.
-	CUInt128 target = bio.ReadUInt128();
-	CUInt128 distance(CKademlia::GetPrefs()->GetKadID());
-	distance.XOR(target);
-
-	// This makes sure we are not mistaken identify. Some client may have fresh installed and have a new hash.
-	CUInt128 check = bio.ReadUInt128();
-	if (CKademlia::GetPrefs()->GetKadID().CompareTo(check)) {
-		return;
-	}
-
-	// Get required number closest to target
-	ContactMap results;
-	CKademlia::GetRoutingZone()->GetClosestTo(2, target, distance, type, &results);
-	uint16_t count = (uint16_t)results.size();
-
-	// Write response
-	// Max count is 32. size 817.. 
-	// 16 + 1 + 25(32)
-	CMemFile packetdata(817);
-	packetdata.WriteUInt128(target);
-	packetdata.WriteUInt8((uint8_t)count);
-	CContact *c;
-	for (ContactMap::const_iterator it = results.begin(); it != results.end(); ++it) {
-		c = it->second;
-		packetdata.WriteUInt128(c->GetClientID());
-		packetdata.WriteUInt32(c->GetIPAddress());
-		packetdata.WriteUInt16(c->GetUDPPort());
-		packetdata.WriteUInt16(c->GetTCPPort());
-		packetdata.WriteUInt8(c->GetType());
-	}
-
-	DebugSendF(wxString::Format(wxT("KadRes (count=%u)"), count), ip, port);
-	SendPacket(packetdata, KADEMLIA_RES, ip, port, 0, NULL);
-}
-
 // KADEMLIA2_REQ
 // Used in Kad2.0 only
 void CKademliaUDPListener::ProcessKademlia2Request(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
@@ -903,7 +646,7 @@
 	uint8_t type = bio.ReadUInt8();
 	type &= 0x1F;
 	if (type == 0) {
-		throw wxString::Format(wxT("***NOTE: Received wrong type (0x%02x) in "), type) + wxString::FromAscii(__FUNCTION__);
+		throw wxString(CFormat(wxT("***NOTE: Received wrong type (0x%02x) in %s")) % type % wxString::FromAscii(__FUNCTION__));
 	}
 
 	// This is the target node trying to be found.
@@ -936,87 +679,11 @@
 			packetdata.WriteUInt8(c->GetVersion()); //<- Kad Version inserted to allow backward compatibility.
 		}
 
-		DebugSendF(wxString::Format(wxT("Kad2Res (count=%u)"), count), ip, port);
+		DebugSendF(CFormat(wxT("Kad2Res (count=%u)")) % count, ip, port);
 		SendPacket(packetdata, KADEMLIA2_RES, ip, port, senderKey, NULL);
 	}
 }
 
-// KADEMLIA_RES
-// Used in Kad1.0 only
-void CKademliaUDPListener::ProcessKademliaResponse(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port)
-{
-	// Verify packet is expected size
-	CHECK_PACKET_MIN_SIZE(17);
-	CHECK_TRACKED_PACKET(KADEMLIA_REQ);
-
-	// Used Pointers
-	CRoutingZone *routingZone = CKademlia::GetRoutingZone();
-
-	if (CKademlia::GetPrefs()->GetRecheckIP()) {
-		FirewalledCheck(ip, port, 0, 0);
-		DebugSend(KadHelloReq, ip, port);
-		SendMyDetails(KADEMLIA_HELLO_REQ, ip, port, 0, 0, NULL, false);
-	}
-
-	// What search does this relate to
-	CMemFile bio(packetData, lenPacket);
-	CUInt128 target = bio.ReadUInt128();
-	uint8_t numContacts = bio.ReadUInt8();
-
-	// Is this one of our legacy challenge packets?
-	CUInt128 contactID;
-	if (IsLegacyChallenge(target, ip, KADEMLIA_REQ, contactID)) {
-		// yup it is, set the contact as verified
-		if (!routingZone->VerifyContact(contactID, ip)) {
-			AddDebugLogLineM(false, logKadRouting, wxT("Unable to find valid sender in routing table (sender: ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(")"));
-		}
-#ifdef __DEBUG__
-		else {
-			AddDebugLogLineM(false, logClientKadUDP, wxT("Verified contact with legacy challenge (KadReq) - ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)));
-		}
-#endif
-		return;	// we do not actually care for its other content
-	}
-
-	// Verify packet is expected size
-	CHECK_PACKET_EXACT_SIZE(16+1 + (16+4+2+2+1)*numContacts);
-
-	uint32_t ignoredCount = 0;
-	CScopedPtr<ContactList> results(new ContactList);
-	
-	for (uint16_t i = 0; i < numContacts; i++) {
-		CUInt128 id = bio.ReadUInt128();
-		uint32_t contactIP = bio.ReadUInt32();
-		uint16_t contactPort = bio.ReadUInt16();
-		uint16_t tport = bio.ReadUInt16();
-		bio.ReadUInt8();
-		uint32_t hostIP = wxUINT32_SWAP_ALWAYS(contactIP);
-		if(::IsGoodIPPort(hostIP, contactPort) && contactPort != 53 /*No DNS Port without encryption*/) {
-			if (!theApp->ipfilter->IsFiltered(hostIP)) {
-				bool verified = false;
-				// we are now setting all version for received contact to "2" which means we assume full Kad2 when adding
-				// the contact to the routing table. If this should be an old Kad1 contact, we won't be able to keep it, but
-				// we avoid having to send double hello packets to the 90% Kad2 nodes
-				// This is the first step of dropping Kad1 support
-				bool wasAdded = routingZone->AddUnfiltered(id, contactIP, contactPort, tport, 2, 0, verified, false, false, false);
-				CContact *temp = new CContact(id, contactIP, contactPort, tport, 0, 0, false, target);
-				if (wasAdded || routingZone->IsAcceptableContact(temp)) {
-					results->push_back(temp);
-				} else {
-					ignoredCount++;
-					delete temp;
-				}
-			}
-		}
-	}
-
-	if (ignoredCount > 0) {
-		AddDebugLogLineM(false, logClientKadUDP, wxString::Format(wxT("Ignored %u bad contacts in routing answer from "), ignoredCount) + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)));
-	}
-
-	CSearchManager::ProcessResponse(target, ip, port, results.release());
-}
-
 // KADEMLIA2_RES
 // Used in Kad2.0 only
 void CKademliaUDPListener::ProcessKademlia2Response(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& WXUNUSED(senderKey))
@@ -1026,13 +693,6 @@
 	// Used Pointers
 	CRoutingZone *routingZone = CKademlia::GetRoutingZone();
 
-	// don't do firewallchecks on this opcode anymore, since we need the contacts kad version - hello opcodes are good enough
-// 	if (CKademlia::GetPrefs()->GetRecheckIP()) {
-// 		FirewalledCheck(ip, port, senderKey);
-// 		DebugSend(Kad2HelloReq, ip, port);
-// 		SendMyDetails(KADEMLIA2_HELLO_REQ, ip, port, true, senderKey, NULL);
-// 	}
-
 	// What search does this relate to
 	CMemFile bio(packetData, lenPacket);
 	CUInt128 target = bio.ReadUInt128();
@@ -1043,13 +703,10 @@
 	if (IsLegacyChallenge(target, ip, KADEMLIA2_REQ, contactID)) {
 		// yup it is, set the contact as verified
 		if (!routingZone->VerifyContact(contactID, ip)) {
-			AddDebugLogLineM(false, logKadRouting, wxT("Unable to find valid sender in routing table (sender: ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(")"));
-		}
-#ifdef __DEBUG__
-		else {
-			AddDebugLogLineM(false, logClientKadUDP, wxT("Verified contact with legacy challenge (Kad2Req) - ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)));
+			AddDebugLogLineN(logKadRouting, wxT("Unable to find valid sender in routing table (sender: ") + KadIPToString(ip) + wxT(")"));
+		} else {
+			AddDebugLogLineN(logKadRouting, wxT("Verified contact with legacy challenge (Kad2Req) - ") + KadIPToString(ip));
 		}
-#endif
 		return;	// we do not actually care for its other content
 	}
 	// Verify packet is expected size
@@ -1061,8 +718,9 @@
 		isFirewallUDPCheckSearch = true;
 	}
 
-	uint32_t ignoredCount = 0;
-	CScopedPtr<ContactList> results(new ContactList);
+	DEBUG_ONLY( uint32_t ignoredCount = 0; )
+	DEBUG_ONLY( uint32_t kad1Count = 0; )
+	CScopedPtr<ContactList> results;
 	for (uint8_t i = 0; i < numContacts; i++) {
 		CUInt128 id = bio.ReadUInt128();
 		uint32_t contactIP = bio.ReadUInt32();
@@ -1070,33 +728,42 @@
 		uint16_t tport = bio.ReadUInt16();
 		uint8_t version = bio.ReadUInt8();
 		uint32_t hostIP = wxUINT32_SWAP_ALWAYS(contactIP);
-		if (::IsGoodIPPort(hostIP, contactPort)) {
-			if (!theApp->ipfilter->IsFiltered(hostIP) && !(contactPort == 53 && version <= 5) /*No DNS Port without encryption*/) {
-				if (isFirewallUDPCheckSearch) {
-					// UDP FirewallCheck searches are special. The point is we need an IP which we didn't sent an UDP message yet
-					// (or in the near future), so we do not try to add those contacts to our routingzone and we also don't
-					// deliver them back to the searchmanager (because he would UDP-ask them for further results), but only report
-					// them to FirewallChecker - this will of course cripple the search but thats not the point, since we only 
-					// care for IPs and not the random set target
-					CUDPFirewallTester::AddPossibleTestContact(id, contactIP, contactPort, tport, target, version, 0, false);
-				} else {
-					bool verified = false;
-					bool wasAdded = routingZone->AddUnfiltered(id, contactIP, contactPort, tport, version, 0, verified, false, false, false);
-					CContact *temp = new CContact(id, contactIP, contactPort, tport, version, 0, false, target);
-					if (wasAdded || routingZone->IsAcceptableContact(temp)) {
-						results->push_back(temp);
+		if (version > 1) {	// Kad1 nodes are no longer accepted and ignored
+			if (::IsGoodIPPort(hostIP, contactPort)) {
+				if (!theApp->ipfilter->IsFiltered(hostIP) && !(contactPort == 53 && version <= 5) /*No DNS Port without encryption*/) {
+					if (isFirewallUDPCheckSearch) {
+						// UDP FirewallCheck searches are special. The point is we need an IP which we didn't sent a UDP message yet
+						// (or in the near future), so we do not try to add those contacts to our routingzone and we also don't
+						// deliver them back to the searchmanager (because he would UDP-ask them for further results), but only report
+						// them to FirewallChecker - this will of course cripple the search but thats not the point, since we only
+						// care for IPs and not the random set target
+						CUDPFirewallTester::AddPossibleTestContact(id, contactIP, contactPort, tport, target, version, 0, false);
 					} else {
-						ignoredCount++;
-						delete temp;
+						bool verified = false;
+						bool wasAdded = routingZone->AddUnfiltered(id, contactIP, contactPort, tport, version, 0, verified, false, false);
+						CContact *temp = new CContact(id, contactIP, contactPort, tport, version, 0, false, target);
+						if (wasAdded || routingZone->IsAcceptableContact(temp)) {
+							results->push_back(temp);
+						} else {
+							DEBUG_ONLY( ignoredCount++; )
+							delete temp;
+						}
 					}
 				}
 			}
+		} else {
+			DEBUG_ONLY( kad1Count++; )
 		}
 	}
 
+#ifdef __DEBUG__
 	if (ignoredCount > 0) {
-		AddDebugLogLineM(false, logClientKadUDP, wxString::Format(wxT("Ignored %u bad contacts in routing answer from "), ignoredCount) + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)));
+		AddDebugLogLineN(logKadRouting, CFormat(wxT("Ignored %u bad %s in routing answer from %s")) % ignoredCount % (ignoredCount > 1 ? wxT("contacts") : wxT("contact")) % KadIPToString(ip));
 	}
+	if (kad1Count > 0) {
+		AddDebugLogLineN(logKadRouting, CFormat(wxT("Ignored %u kad1 %s in routing answer from %s")) % kad1Count % (kad1Count > 1 ? wxT("contacts") : wxT("contact")) % KadIPToString(ip));
+	}
+#endif
 
 	CSearchManager::ProcessResponse(target, ip, port, results.release());
 }
@@ -1115,7 +782,7 @@
 	// the max. depth has to match our own limit for creating the search expression 
 	// (see also 'ParsedSearchExpression' and 'GetSearchPacket')
 	if (iLevel >= 24){
-		AddDebugLogLineM(false, logKadSearch, wxT("***NOTE: Search expression tree exceeds depth limit!"));
+		AddDebugLogLineN(logKadSearch, wxT("***NOTE: Search expression tree exceeds depth limit!"));
 		return NULL;
 	}
 	iLevel++;
@@ -1171,8 +838,8 @@
 				return NULL;
 			}
 			return pSearchTerm;
-		} else{
-			AddDebugLogLineM(false, logKadSearch, wxString::Format(wxT("*** Unknown boolean search operator 0x%02x (CreateSearchExpressionTree)"), boolop));
+		} else {
+			AddDebugLogLineN(logKadSearch, CFormat(wxT("*** Unknown boolean search operator 0x%02x (CreateSearchExpressionTree)")) % boolop);
 			return NULL;
 		}
 	} else if (op == 0x01) { // String
@@ -1230,7 +897,7 @@
 		// read integer operator
 		uint8_t mmop = bio.ReadUInt8();
 		if (mmop >= itemsof(_aOps)){
-			AddDebugLogLineM(false, logKadSearch, wxString::Format(wxT("*** Unknown integer search op=0x%02x (CreateSearchExpressionTree)"), mmop));
+			AddDebugLogLineN(logKadSearch, CFormat(wxT("*** Unknown integer search op=0x%02x (CreateSearchExpressionTree)")) % mmop);
 			return NULL;
 		}
 
@@ -1243,51 +910,11 @@
 
 		return pSearchTerm;
 	} else {
-		AddDebugLogLineM(false, logKadSearch, wxString::Format(wxT("*** Unknown search op=0x%02x (CreateSearchExpressionTree)"), op));
+		AddDebugLogLineN(logKadSearch, CFormat(wxT("*** Unknown search op=0x%02x (CreateSearchExpressionTree)")) % op);
 		return NULL;
 	}
 }
 
-// KADEMLIA_SEARCH_REQ
-// Used in Kad1.0 only
-void CKademliaUDPListener::ProcessSearchRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port)
-{
-	// Verify packet is expected size
-	CHECK_PACKET_MIN_SIZE(17);
-
-	CMemFile bio(packetData, lenPacket);
-	CUInt128 target = bio.ReadUInt128();
-	uint8_t restrictive = bio.ReadUInt8();
-
-	if (lenPacket == 17) {
-		if (restrictive) {
-			// Source request
-			CKademlia::GetIndexed()->SendValidSourceResult(target, ip, port, false, 0, 0, 0);
-		} else {
-			// Single keyword request
-			CKademlia::GetIndexed()->SendValidKeywordResult(target, NULL, ip, port, true, false, 0, 0);
-		}
-	} else if (lenPacket > 17) {
-		SSearchTerm* pSearchTerms = NULL;
-		bool oldClient = true;
-		if (restrictive) {
-			pSearchTerms = CreateSearchExpressionTree(bio, 0);
-			if (pSearchTerms == NULL) {
-				throw wxString(wxT("Invalid search expression"));
-			}
-			if (restrictive > 1) {
-				oldClient = false;
-			}
-		} else {
-			oldClient = false;
-		}
-
-		// Keyword request with added options.
-		CKademlia::GetIndexed()->SendValidKeywordResult(target, pSearchTerms, ip, port, oldClient, false, 0, 0); 
-		Free(pSearchTerms);
-	}
-}
-
 // KADEMLIA2_SEARCH_KEY_REQ
 // Used in Kad2.0 only
 void CKademliaUDPListener::Process2SearchKeyRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
@@ -1304,7 +931,7 @@
 			throw wxString(wxT("Invalid search expression"));
 		}
 	}
-	CKademlia::GetIndexed()->SendValidKeywordResult(target, pSearchTerms, ip, port, false, true, startPosition, senderKey);
+	CKademlia::GetIndexed()->SendValidKeywordResult(target, pSearchTerms, ip, port, false, startPosition, senderKey);
 	if (pSearchTerms) {
 		Free(pSearchTerms);
 	}
@@ -1318,21 +945,15 @@
 	CUInt128 target = bio.ReadUInt128();
 	uint16_t startPosition = (bio.ReadUInt16() & 0x7FFF);
 	uint64_t fileSize = bio.ReadUInt64();
-	CKademlia::GetIndexed()->SendValidSourceResult(target, ip, port, true, startPosition, fileSize, senderKey);
+	CKademlia::GetIndexed()->SendValidSourceResult(target, ip, port, startPosition, fileSize, senderKey);
 }
 
-// KADEMLIA_SEARCH_RES
-// Used in Kad1.0 only
-void CKademliaUDPListener::ProcessSearchResponse(const uint8_t *packetData, uint32_t lenPacket)
+void CKademliaUDPListener::ProcessSearchResponse(CMemFile& bio)
 {
-	// Verify packet is expected size
-	CHECK_PACKET_MIN_SIZE(37);
-
 	// What search does this relate to
-	CMemFile bio(packetData, lenPacket);
 	CUInt128 target = bio.ReadUInt128();
 
-	// How many results.. Not supported yet..
+	// How many results..
 	uint16_t count = bio.ReadUInt16();
 	while (count > 0) {
 		// What is the answer
@@ -1344,199 +965,35 @@
 		// supposed to be 'viewed' by user only and not feed into the Kad engine again!
 		// If that tag list is once used for something else than for viewing, special care has to be taken for any
 		// string conversion!
-		TagPtrList* tags = new TagPtrList;
-		try {
-			bio.ReadTagPtrList(tags, true/*bOptACP*/);
-		} catch(...) {
-			//DebugClientOutput(wxT("CKademliaUDPListener::processSearchResponse"),ip,port,packetData,lenPacket);
-			deleteTagPtrListEntries(tags);
-			delete tags;
-			tags = NULL;
-			throw;
-		}
-		CSearchManager::ProcessResult(target, answer, tags);
+ 		CScopedContainer<TagPtrList> tags;
+		bio.ReadTagPtrList(tags.get(), true/*bOptACP*/);
+		CSearchManager::ProcessResult(target, answer, tags.get());
 		count--;
 	}
 }
 
-// KADEMLIA2_SEARCH_RES
-// Used in Kad2.0 only
-void CKademliaUDPListener::Process2SearchResponse(const uint8_t *packetData, uint32_t lenPacket, const CKadUDPKey& WXUNUSED(senderKey))
-{
-	CMemFile bio(packetData, lenPacket);
-
-	// Who sent this packet.
-	CUInt128 source = bio.ReadUInt128();
 
-	// What search does this relate to
-	CUInt128 target = bio.ReadUInt128();
-
-	// Total results.
-	uint16_t count = bio.ReadUInt16();
-	while (count > 0) {
-		// What is the answer
-		CUInt128 answer = bio.ReadUInt128();
-
-		// Get info about answer
-		// NOTE: this is the one and only place in Kad where we allow string conversion to local code page in
-		// case we did not receive an UTF8 string. this is for backward compatibility for search results which are
-		// supposed to be 'viewed' by user only and not feed into the Kad engine again!
-		// If that tag list is once used for something else than for viewing, special care has to be taken for any
-		// string conversion!
-		TagPtrList* tags = new TagPtrList;
-		try {
-			bio.ReadTagPtrList(tags, true);
-		} catch(...) {
-			deleteTagPtrListEntries(tags);
-			delete tags;
-			tags = NULL;
-			throw;
-		}
-		CSearchManager::ProcessResult(target, answer, tags);
-		count--;
-	}
-}
-
-// KADEMLIA_PUBLISH_REQ
+// KADEMLIA_SEARCH_RES
 // Used in Kad1.0 only
-void CKademliaUDPListener::ProcessPublishRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port)
+void CKademliaUDPListener::ProcessSearchResponse(const uint8_t *packetData, uint32_t lenPacket)
 {
-	//There are different types of publishing..
-	//Keyword and File are Stored..
 	// Verify packet is expected size
 	CHECK_PACKET_MIN_SIZE(37);
 
-	//Used Pointers
-	CIndexed *indexed = CKademlia::GetIndexed();
-
-	// check if we are UDP firewalled
-	if (CUDPFirewallTester::IsFirewalledUDP(true)) {
-		//We are firewalled. We should not index this entry and give publisher a false report.
-		return;
-	}
-
 	CMemFile bio(packetData, lenPacket);
-	CUInt128 file = bio.ReadUInt128();
-
-	CUInt128 distance(CKademlia::GetPrefs()->GetKadID());
-	distance.XOR(file);
-
-	if (thePrefs::FilterLanIPs() && distance.Get32BitChunk(0) > SEARCHTOLERANCE) {
-		return;
-	}
-
-	wxString strInfo;
-	uint16_t count = bio.ReadUInt16();
-	bool flag = false;
-	uint8_t load = 0;
-	while (count > 0) {
-		strInfo.Clear();
-
-		CUInt128 target = bio.ReadUInt128();
+	ProcessSearchResponse(bio);
+}
 
-		Kademlia::CKeyEntry* entry = new Kademlia::CKeyEntry();
-		try {
-			entry->m_uIP = ip;
-			entry->m_uUDPport = port;
-			entry->m_uKeyID.SetValue(file);
-			entry->m_uSourceID.SetValue(target);
-			uint32_t tags = bio.ReadUInt8();
-			while (tags > 0) {
-				CTag* tag = bio.ReadTag();
-				if (tag) {
-					if (!tag->GetName().Cmp(TAG_SOURCETYPE)) {
-						if (entry->m_bSource == false) {
-							entry->AddTag(new CTagVarInt(TAG_SOURCEIP, entry->m_uIP));
-							entry->AddTag(new CTagVarInt(TAG_SOURCEUPORT, entry->m_uUDPport));
-							entry->AddTag(tag);
-							entry->m_bSource = true;
-						} else {
-							//More than one sourcetype tag found.
-							delete tag;
-						}
-					} else if (!tag->GetName().Cmp(TAG_FILENAME)) {
-						if (entry->GetCommonFileName().IsEmpty()) {
-							entry->SetFileName(tag->GetStr());
-							strInfo += CFormat(wxT("  Name=\"%s\"")) % tag->GetStr();
-						}
-						delete tag;
-					} else if (!tag->GetName().Cmp(TAG_FILESIZE)) {
-						if (entry->m_uSize == 0) {
-							if (tag->IsBsob() && (tag->GetBsobSize() == 8)) {
-								// Kad1.0 uint64 type using a BSOB.
-								entry->m_uSize = PeekUInt64(tag->GetBsob());
-							} else {
-								wxASSERT(tag->IsInt());
-								entry->m_uSize = tag->GetInt();	
-							}
-							strInfo += wxString::Format(wxT("  Size=%") wxLongLongFmtSpec wxT("u"), entry->m_uSize);
-						}
-						delete tag;
-					} else if (!tag->GetName().Cmp(TAG_SOURCEPORT)) {
-						if (entry->m_uTCPport == 0) {
-							entry->m_uTCPport = tag->GetInt();
-							entry->AddTag(tag);
-						} else {
-							//More than one port tag found
-							delete tag;
-						}
-					} else {
-						//TODO: Filter tags
-						entry->AddTag(tag);
-					}
-				}
-				tags--;
-			}
-			if (!strInfo.IsEmpty()) {
-				AddDebugLogLineM(false, logClientKadUDP, strInfo);
-			}
-		} catch(...) {
-			//printf("Error on count %i tag %i\n",totalcount-count, totaltags-tags);
-			//DebugClientOutput(wxT("CKademliaUDPListener::processPublishRequest"),ip,port,packetData,lenPacket);
-			delete entry;
-			throw;
-		}
+// KADEMLIA2_SEARCH_RES
+// Used in Kad2.0 only
+void CKademliaUDPListener::Process2SearchResponse(const uint8_t *packetData, uint32_t lenPacket, const CKadUDPKey& WXUNUSED(senderKey))
+{
+	CMemFile bio(packetData, lenPacket);
 
-		if (entry->m_bSource == true) {
-			entry->m_tLifeTime = (uint32_t)time(NULL) + KADEMLIAREPUBLISHTIMES;
-			CEntry *sourceEntry = entry->Copy(); // "downcast" since we didnt knew before if this was a keyword, Kad1 support gets removed soon anyway no need for a beautiful solution here
-			delete entry;
-			entry = NULL;
-			if (indexed->AddSources(file, target, sourceEntry, load)) {
-				flag = true;
-			} else {
-				delete sourceEntry;
-				sourceEntry = NULL;
-			}
-		} else {
-			entry->m_tLifeTime = (uint32_t)time(NULL) + KADEMLIAREPUBLISHTIMEK;
-			if (indexed->AddKeyword(file, target, entry, load)) {
-				// This makes sure we send a publish response.. 
-				// This also makes sure we index all the files for this keyword.
-				flag = true;
-			} else {
-				//We already indexed the maximum number of keywords.
-				//We do not index anymore but we still send a success..
-				//Reason: Because if a VERY busy node tells the publisher it failed,
-				//this busy node will spread to all the surrounding nodes causing popular
-				//keywords to be stored on MANY nodes..
-				//So, once we are full, we will periodically clean our list until we can
-				//begin storing again..
-				flag = true;
-				delete entry;
-				entry = NULL;
-			}
-		}
-		count--;
-	}
-	if (flag) {
-		CMemFile packetdata(17);
-		packetdata.WriteUInt128(file);
-		packetdata.WriteUInt8(load);
+	// Who sent this packet.
+	bio.ReadUInt128();
 
-		DebugSend(KadPublishRes, ip, port);
-		SendPacket(packetdata, KADEMLIA_PUBLISH_RES, ip, port, 0, NULL);
-	}
+	ProcessSearchResponse(bio);
 }
 
 // KADEMLIA2_PUBLISH_KEY_REQ
@@ -1558,16 +1015,15 @@
 	CUInt128 distance(CKademlia::GetPrefs()->GetKadID());
 	distance.XOR(file);
 
-	// Shouldn't LAN IPs already be filtered?
-	if (thePrefs::FilterLanIPs() && distance.Get32BitChunk(0) > SEARCHTOLERANCE) {
+	if (distance.Get32BitChunk(0) > SEARCHTOLERANCE && !::IsLanIP(wxUINT32_SWAP_ALWAYS(ip))) {
 		return;
 	}
 
-	wxString strInfo;
+	DEBUG_ONLY( wxString strInfo; )
 	uint16_t count = bio.ReadUInt16();
 	uint8_t load = 0;
 	while (count > 0) {
-		strInfo.Clear();
+		DEBUG_ONLY( strInfo.Clear(); )
 
 		CUInt128 target = bio.ReadUInt128();
 
@@ -1587,7 +1043,7 @@
 					if (!tag->GetName().Cmp(TAG_FILENAME)) {
 						if (entry->GetCommonFileName().IsEmpty()) {
 							entry->SetFileName(tag->GetStr());
-							strInfo += CFormat(wxT("  Name=\"%s\"")) % entry->GetCommonFileName();
+							DEBUG_ONLY( strInfo += CFormat(wxT("  Name=\"%s\"")) % entry->GetCommonFileName(); )
 						}
 						delete tag; // tag is no longer stored, but membervar is used
 					} else if (!tag->GetName().Cmp(TAG_FILESIZE)) {
@@ -1597,7 +1053,7 @@
 							} else {
 								entry->m_uSize = tag->GetInt();
 							}
-							strInfo += wxString::Format(wxT("  Size=%") wxLongLongFmtSpec wxT("u"), entry->m_uSize);
+							DEBUG_ONLY( strInfo += CFormat(wxT("  Size=%u")) % entry->m_uSize; )
 						}
 						delete tag; // tag is no longer stored, but membervar is used
 					} else {
@@ -1607,9 +1063,11 @@
 				}
 				tags--;
 			}
+#ifdef __DEBUG__
 			if (!strInfo.IsEmpty()) {
-				AddDebugLogLineM(false, logClientKadUDP, strInfo);
+				AddDebugLogLineN(logClientKadUDP, strInfo);
 			}
+#endif
 		} catch(...) {
 			//DebugClientOutput(wxT("CKademliaUDPListener::Process2PublishKeyRequest"),ip,port,packetData,lenPacket);
 			delete entry;
@@ -1655,11 +1113,11 @@
 	CUInt128 distance(CKademlia::GetPrefs()->GetKadID());
 	distance.XOR(file);
 
-	if (thePrefs::FilterLanIPs() && distance.Get32BitChunk(0) > SEARCHTOLERANCE) {
+	if (distance.Get32BitChunk(0) > SEARCHTOLERANCE && !::IsLanIP(wxUINT32_SWAP_ALWAYS(ip))) {
 		return;
 	}
 
-	wxString strInfo;
+	DEBUG_ONLY( wxString strInfo; )
 	uint8_t load = 0;
 	bool flag = false;
 	CUInt128 target = bio.ReadUInt128();
@@ -1692,7 +1150,7 @@
 						} else {
 							entry->m_uSize = tag->GetInt();
 						}
-						strInfo += wxString::Format(wxT("  Size=%") wxLongLongFmtSpec wxT("u"), entry->m_uSize);
+						DEBUG_ONLY( strInfo += CFormat(wxT("  Size=%u")) % entry->m_uSize; )
 					}
 					delete tag;
 				} else if (!tag->GetName().Cmp(TAG_SOURCEPORT)) {
@@ -1722,9 +1180,11 @@
 		if (addUDPPortTag) {
 			entry->AddTag(new CTagVarInt(TAG_SOURCEUPORT, entry->m_uUDPport));
 		}
+#ifdef __DEBUG__
 		if (!strInfo.IsEmpty()) {
-			AddDebugLogLineM(false, logClientKadUDP, strInfo);
+			AddDebugLogLineN(logClientKadUDP, strInfo);
 		}
+#endif
 	} catch(...) {
 		//DebugClientOutput(wxT("CKademliaUDPListener::Process2PublishSourceRequest"),ip,port,packetData,lenPacket);
 		delete entry;
@@ -1777,7 +1237,7 @@
 void CKademliaUDPListener::Process2PublishResponse(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
 {
 	if (!IsOnOutTrackList(ip, KADEMLIA2_PUBLISH_KEY_REQ) && !IsOnOutTrackList(ip, KADEMLIA2_PUBLISH_SOURCE_REQ) && !IsOnOutTrackList(ip, KADEMLIA2_PUBLISH_NOTES_REQ)) {
-		throw wxString::Format(wxT("***NOTE: Received unrequested response packet, size (%u) in "), lenPacket) + wxString::FromAscii(__FUNCTION__);
+		throw wxString(CFormat(wxT("***NOTE: Received unrequested response packet, size (%u) in %s")) % lenPacket % wxString::FromAscii(__FUNCTION__));
 	}
 	CMemFile bio(packetData, lenPacket);
 	CUInt128 file = bio.ReadUInt128();
@@ -1794,21 +1254,6 @@
 	}
 }
 
-// KADEMLIA_SEARCH_NOTES_REQ
-// Used only by Kad1.0
-void CKademliaUDPListener::ProcessSearchNotesRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port)
-{
-	// Verify packet is expected size
-	CHECK_PACKET_MIN_SIZE(32);
-
-	CMemFile bio(packetData, lenPacket);
-	CUInt128 target = bio.ReadUInt128();
-	// This info is currently not used.
-	// CUInt128 source = bio.ReadUInt128();
-
-	CKademlia::GetIndexed()->SendValidNoteResult(target, ip, port, false, 0, 0);
-}
-
 // KADEMLIA2_SEARCH_NOTES_REQ
 // Used only by Kad2.0
 void CKademliaUDPListener::Process2SearchNotesRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
@@ -1816,7 +1261,7 @@
 	CMemFile bio(packetData, lenPacket);
 	CUInt128 target = bio.ReadUInt128();
 	uint64_t fileSize = bio.ReadUInt64();
-	CKademlia::GetIndexed()->SendValidNoteResult(target, ip, port, true, fileSize, senderKey);
+	CKademlia::GetIndexed()->SendValidNoteResult(target, ip, port, fileSize, senderKey);
 }
 
 // KADEMLIA_SEARCH_NOTES_RES
@@ -1829,111 +1274,7 @@
 
 	// What search does this relate to
 	CMemFile bio(packetData, lenPacket);
-	CUInt128 target = bio.ReadUInt128();
-
-	uint16_t count = bio.ReadUInt16();
-	while (count > 0) {
-		// What is the answer
-		CUInt128 answer = bio.ReadUInt128();
-
-		// Get info about answer
-		// NOTE: this is the one and only place in Kad where we allow string conversion to local code page in
-		// case we did not receive an UTF8 string. this is for backward compatibility for search results which are 
-		// supposed to be 'viewed' by user only and not feed into the Kad engine again!
-		// If that tag list is once used for something else than for viewing, special care has to be taken for any
-		// string conversion!
-		TagPtrList* tags = new TagPtrList;
-		try {
-			bio.ReadTagPtrList(tags, true/*bOptACP*/);
-		} catch(...){
-			//DebugClientOutput(wxT("CKademliaUDPListener::processSearchNotesResponse"),ip,port,packetData,lenPacket);
-			deleteTagPtrListEntries(tags);
-			delete tags;
-			tags = NULL;
-			throw;
-		}
-		CSearchManager::ProcessResult(target, answer, tags);
-		count--;
-	}
-}
-
-// KADEMLIA_PUBLISH_NOTES_REQ
-// Used only by Kad1.0
-void CKademliaUDPListener::ProcessPublishNotesRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port)
-{
-	// Verify packet is expected size
-	CHECK_PACKET_MIN_SIZE(37);
-
-	// check if we are UDP firewalled
-	if (CUDPFirewallTester::IsFirewalledUDP(true)) {
-		//We are firewalled. We should not index this entry and give publisher a false report.
-		return;
-	}
-
-	CMemFile bio(packetData, lenPacket);
-	CUInt128 target = bio.ReadUInt128();
-
-	CUInt128 distance(CKademlia::GetPrefs()->GetKadID());
-	distance.XOR(target);
-
-	if( thePrefs::FilterLanIPs() && distance.Get32BitChunk(0) > SEARCHTOLERANCE) {
-		return;
-	}
-
-	CUInt128 source = bio.ReadUInt128();
-
-	Kademlia::CEntry* entry = new Kademlia::CEntry();
-	try {
-		entry->m_uIP = ip;
-		entry->m_uUDPport = port;
-		entry->m_uKeyID.SetValue(target);
-		entry->m_uSourceID.SetValue(source);
-		uint32_t tagCount = bio.ReadUInt8();
-		while (tagCount > 0) {
-			CTag *tag = bio.ReadTag();
-			if (tag) {
-				if (!tag->GetName().Cmp(TAG_FILENAME)) {
-					if (entry->GetCommonFileName().IsEmpty()) {
-						entry->SetFileName(tag->GetStr());
-					}
-					delete tag;
-				} else if (!tag->GetName().Cmp(TAG_FILESIZE)) {
-					if (entry->m_uSize == 0) {
-						entry->m_uSize = tag->GetInt();
-					}
-					delete tag;
-				} else {
-					//TODO: Filter tags
-					entry->AddTag(tag);
-				}
-			}
-			tagCount--;
-		}
-		entry->m_bSource = false;
-	} catch(...) {
-		//DebugClientOutput(wxT("CKademliaUDPListener::processPublishNotesRequest"),ip,port,packetData,lenPacket);
-		delete entry;
-		entry = NULL;
-		throw;
-	}
-
-	if (entry == NULL) {
-		throw wxString(wxT("CKademliaUDPListener::processPublishNotesRequest: entry == NULL"));
-	} else if (entry->GetTagCount() == 0 || entry->GetTagCount() > 5) {
-		delete entry;
-		throw wxString(wxT("CKademliaUDPListener::processPublishNotesRequest: entry->GetTagCount() == 0 || entry->GetTagCount() > 5"));
-	}
-
-	uint8_t load = 0;
-	if (CKademlia::GetIndexed()->AddNotes(target, source, entry, load)) {
-		CMemFile packetdata(17);
-		packetdata.WriteUInt128(target);
-		packetdata.WriteUInt8(load);
-		DebugSend(KadPublishNotesRes, ip, port);
-		SendPacket(packetdata, KADEMLIA_PUBLISH_NOTES_RES, ip, port, 0, NULL);
-	} else {
-		delete entry;
-	}
+	ProcessSearchResponse(bio);
 }
 
 // KADEMLIA2_PUBLISH_NOTES_REQ
@@ -1952,8 +1293,7 @@
 	CUInt128 distance(CKademlia::GetPrefs()->GetKadID());
 	distance.XOR(target);
 
-	// Shouldn't LAN IPs already be filtered?
-	if (thePrefs::FilterLanIPs() && distance.Get32BitChunk(0) > SEARCHTOLERANCE) {
+	if (distance.Get32BitChunk(0) > SEARCHTOLERANCE && !::IsLanIP(wxUINT32_SWAP_ALWAYS(ip))) {
 		return;
 	}
 
@@ -2006,27 +1346,6 @@
 	}
 }
 
-// KADEMLIA_PUBLISH_NOTES_RES
-// Used only by Kad1.0
-void CKademliaUDPListener::ProcessPublishNotesResponse(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip)
-{
-	// Verify packet is expected size
-	CHECK_PACKET_MIN_SIZE(16);
-	CHECK_TRACKED_PACKET(KADEMLIA_PUBLISH_NOTES_REQ);
-
-	CMemFile bio(packetData, lenPacket);
-	CUInt128 file = bio.ReadUInt128();
-
-	bool loadResponse = false;
-	uint8_t load = 0;
-	if( bio.GetLength() > bio.GetPosition() ) {
-		loadResponse = true;
-		load = bio.ReadUInt8();
-	}
-
-	CSearchManager::ProcessPublishResult(file, load, loadResponse);
-}
-
 // KADEMLIA_FIREWALLED_REQ
 // Used by Kad1.0 and Kad2.0
 void CKademliaUDPListener::ProcessFirewalledRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey)
@@ -2176,7 +1495,7 @@
 
 // KADEMLIA_CALLBACK_REQ
 // Used by Kad1.0 and Kad2.0
-void CKademliaUDPListener::ProcessCallbackRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& WXUNUSED(senderKey))
+void CKademliaUDPListener::ProcessCallbackRequest(const uint8_t *packetData, uint32_t lenPacket, uint32_t ip, uint16_t WXUNUSED(port), const CKadUDPKey& WXUNUSED(senderKey))
 {
 	// Verify packet is expected size
 	CHECK_PACKET_MIN_SIZE(34);
@@ -2197,7 +1516,7 @@
 			packetdata.WriteUInt32(ip);
 			packetdata.WriteUInt16(tcp);
 			CPacket* packet = new CPacket(packetdata, OP_EMULEPROT, OP_CALLBACK);
-			DebugSend(KadCallbackReq, ip, port);
+			AddDebugLogLineN(logLocalClient, wxT("Local Client: OP_CALLBACK to ") + KadIPToString(ip));
 			buddy->GetSocket()->SendPacket(packet);
 			theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
 		} else {
@@ -2227,13 +1546,10 @@
 	if (IsLegacyChallenge(CUInt128((uint32_t)0), ip, KADEMLIA2_PING, contactID)) {
 		// yup it is, set the contact as verified
 		if (!CKademlia::GetRoutingZone()->VerifyContact(contactID, ip)) {
-			AddDebugLogLineM(false, logKadRouting, wxT("Unable to find valid sender in routing table (sender: ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(")"));
-		}
-#ifdef __DEBUG__
-		else {
-			AddDebugLogLineM(false, logClientKadUDP, wxT("Verified contact with legacy challenge (Kad2Ping) - ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)));
+			AddDebugLogLineN(logKadRouting, wxT("Unable to find valid sender in routing table (sender: ") + KadIPToString(ip) + wxT(")"));
+		} else {
+			AddDebugLogLineN(logKadRouting, wxT("Verified contact with legacy challenge (Kad2Ping) - ") + KadIPToString(ip));
 		}
-#endif
 		return;	// we do not actually care for its other content
 	}
 
@@ -2259,14 +1575,15 @@
 
 	uint8_t errorCode = PeekUInt8(packetData);
 	uint16_t incomingPort = PeekUInt16(packetData + 1);
-	if (incomingPort != CKademlia::GetPrefs()->GetExternalKadPort() && incomingPort != CKademlia::GetPrefs()->GetInternKadPort() || incomingPort == 0) {
-		AddDebugLogLineM(false, logClientKadUDP, wxString::Format(wxT("Received UDP FirewallCheck on unexpected incoming port %u (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(")"), incomingPort));
+	if ((incomingPort != CKademlia::GetPrefs()->GetExternalKadPort() && incomingPort != CKademlia::GetPrefs()->GetInternKadPort()) || incomingPort == 0) {
+		AddDebugLogLineN(logClientKadUDP, CFormat(wxT("Received UDP FirewallCheck on unexpected incoming port %u from %s")) % incomingPort % KadIPToString(ip));
 		CUDPFirewallTester::SetUDPFWCheckResult(false, true, ip, 0);
 	} else if (errorCode == 0) {
-		AddDebugLogLineM(false, logClientKadUDP, wxString::Format(wxT("Received UDP FirewallCheck packet from ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(" with incoming port %u"), incomingPort));
+		AddDebugLogLineN(logClientKadUDP, CFormat(wxT("Received UDP FirewallCheck packet from %s with incoming port %u")) % KadIPToString(ip) % incomingPort);
 		CUDPFirewallTester::SetUDPFWCheckResult(true, false, ip, incomingPort);
 	} else {
-		AddDebugLogLineM(false, logClientKadUDP, wxString::Format(wxT("Received UDP FirewallCheck packet from ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(" with incoming port %u with remote errorcode %u - ignoring result"), incomingPort, errorCode));
+		AddDebugLogLineN(logClientKadUDP, CFormat(wxT("Received UDP FirewallCheck packet from %s with incoming port %u with remote errorcode %u - ignoring result"))
+			% KadIPToString(ip) % incomingPort % errorCode);
 		CUDPFirewallTester::SetUDPFWCheckResult(false, true, ip, 0);
 	}
 }
@@ -2293,10 +1610,7 @@
 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
-
-	// we will drop support for Kad1 soon, so don't bother sending two packets in case we don't know if kad2 is supported
-	// (if we know that it's not, this function isn't called in the first place)
-	AddDebugLogLineM(false, logClientKadUDP, wxT("FindNodeIDByIP: Requesting NodeID from ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(" by sending Kad2HelloReq"));
+	AddDebugLogLineN(logClientKadUDP, wxT("FindNodeIDByIP: Requesting NodeID from ") + KadIPToString(ip) + wxT(" by sending Kad2HelloReq"));
 	DebugSend(Kad2HelloReq, ip, udpPort);
 	SendMyDetails(KADEMLIA2_HELLO_REQ, ip, udpPort, 1, 0, NULL, false); // todo: we send this unobfuscated, which is not perfect, see this can be avoided in the future
 	FetchNodeID_Struct sRequest = { ip, tcpPort, ::GetTickCount() + SEC2MS(60), requester };
@@ -2319,7 +1633,7 @@
 	}
 }
 
-void CKademliaUDPListener::SendLegacyChallenge(uint32_t ip, uint16_t port, const CUInt128& contactID, bool kad2)
+void CKademliaUDPListener::SendLegacyChallenge(uint32_t ip, uint16_t port, const CUInt128& contactID)
 {
 	// We want to verify that a pre-0.49a contact is valid and not sent from a spoofed IP.
 	// Because those versions don't support any direct validating, we send a KAD_REQ with a random ID,
@@ -2329,7 +1643,7 @@
 	CContact* contact = CKademlia::GetRoutingZone()->GetContact(contactID);
 	if (contact != NULL) {
 		if (contact->GetType() < 2) {
-			AddDebugLogLineM(false, logClientKadUDP, wxT("Sending challenge to a long known contact (should be verified already) - ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)));
+			AddDebugLogLineN(logKadRouting, wxT("Sending challenge to a long known contact (should be verified already) - ") + KadIPToString(ip));
 		}
 	} else {
 		wxFAIL;
@@ -2342,8 +1656,7 @@
 	}
 	CMemFile packetdata(33);
 	packetdata.WriteUInt8(KADEMLIA_FIND_VALUE);
-	CUInt128 challenge;
-	challenge.SetValueRandom();
+	CUInt128 challenge(GetRandomUint128());
 	if (challenge == 0) {
 		// hey there is a 2^128 chance that this happens ;)
 		wxFAIL;
@@ -2353,16 +1666,10 @@
 	packetdata.WriteUInt128(challenge);
 	// Add the ID of the contact we are contacting for sanity checks on the other end.
 	packetdata.WriteUInt128(contactID);
-	if (kad2) {
-		DebugSendF(wxT("Kad2Req(SendLegacyChallenge)"), ip, port);
-		// those versions we send those requests to don't support encryption / obfuscation
-		SendPacket(packetdata, KADEMLIA2_REQ, ip, port, 0, NULL);
-		AddLegacyChallenge(contactID, challenge, ip, KADEMLIA2_REQ);
-	} else {
-		DebugSendF(wxT("KadReq(SendLegacyChallenge)"), ip, port);
-		SendPacket(packetdata, KADEMLIA_REQ, ip, port, 0, NULL);
-		AddLegacyChallenge(contactID, challenge, ip, KADEMLIA_REQ);
-	}
+	DebugSendF(wxT("Kad2Req(SendLegacyChallenge)"), ip, port);
+	// those versions we send those requests to don't support encryption / obfuscation
+	SendPacket(packetdata, KADEMLIA2_REQ, ip, port, 0, NULL);
+	AddLegacyChallenge(contactID, challenge, ip, KADEMLIA2_REQ);
 }
 
 void CKademliaUDPListener::DebugClientOutput(const wxString& place, uint32 kad_ip, uint32 port, const byte* data, int len)

aMule-2.2.6.tar.bz2/src/kademlia/net/KademliaUDPListener.h -> aMule-2.3.1.tar.bz2/src/kademlia/net/KademliaUDPListener.h Changed

@@ -1,9 +1,9 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -64,13 +64,8 @@
 	CKadClientSearcher* requester;
 };
 
-#ifdef __DEBUG__
-#	define DebugSendF(what, ip, port)	AddDebugLogLineM(false, logClientKadUDP, what + wxString(wxT(" to ")) + Uint32_16toStringIP_Port(wxUINT32_SWAP_ALWAYS(ip), port))
-#	define DebugRecvF(what, ip, port)	AddDebugLogLineM(false, logClientKadUDP, what + wxString(wxT(" from ")) + Uint32_16toStringIP_Port(wxUINT32_SWAP_ALWAYS(ip), port))
-#else
-#	define DebugSendF(what, ip, port)
-#	define DebugRecvF(what, ip, port)
-#endif
+#define DebugSendF(what, ip, port)	AddDebugLogLineN(logClientKadUDP, what + wxString(wxT(" to ")) + KadIPPortToString(ip, port))
+#define DebugRecvF(what, ip, port)	AddDebugLogLineN(logClientKadUDP, what + wxString(wxT(" from ")) + KadIPPortToString(ip, port))
 
 #define DebugSend(what, ip, port)	DebugSendF(wxSTRINGIZE_T(what), ip, port)
 #define DebugRecv(what, ip, port)	DebugRecvF(wxSTRINGIZE_T(what), ip, port)
@@ -80,7 +75,7 @@
 {
 public:
 	~CKademliaUDPListener();
-	void Bootstrap(uint32_t ip, uint16_t port, bool kad2, uint8_t kadVersion = 0, const CUInt128* cryptTargetID = NULL);
+	void Bootstrap(uint32_t ip, uint16_t port, uint8_t kadVersion = 0, const CUInt128* cryptTargetID = NULL);
 	void FirewalledCheck(uint32_t ip, uint16_t port, const CKadUDPKey& senderKey, uint8_t kadVersion);
 	void SendMyDetails(uint8_t opcode, uint32_t ip, uint16_t port, uint8_t kadVersion, const CKadUDPKey& targetKey, const CUInt128* cryptTargetID, bool requestAckPacket);
 	void SendNullPacket(uint8_t opcode, uint32_t ip, uint16_t port, const CKadUDPKey& targetKey, const CUInt128* cryptTargetID);
@@ -95,24 +90,12 @@
 	static void Free(SSearchTerm* pSearchTerms);
 
 	// Kad1.0
-	bool AddContact (const uint8_t* data, uint32_t lenData, uint32_t ip, uint16_t port, uint16_t tport, const CKadUDPKey& key, bool& ipVerified, bool update, CUInt128* outContactID);
-	void AddContacts(const uint8_t* data, uint32_t lenData, uint16_t numContacts, bool update);
-	void SendLegacyChallenge(uint32_t ip, uint16_t port, const CUInt128& contactID, bool kad2);
-
-	void ProcessBootstrapRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port);
-	void ProcessBootstrapResponse		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip);
-	void ProcessHelloRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port);
-	void ProcessHelloResponse		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port);
-	void ProcessKademliaRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port);
-	void ProcessKademliaResponse		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port);
-	void ProcessSearchRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port);
+	void SendLegacyChallenge(uint32_t ip, uint16_t port, const CUInt128& contactID);
+
+	void ProcessSearchResponse		(CMemFile &bio);
 	void ProcessSearchResponse		(const uint8_t* packetData, uint32_t lenPacket);
-	void ProcessPublishRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port);
 	void ProcessPublishResponse		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip);
-	void ProcessSearchNotesRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port);
 	void ProcessSearchNotesResponse		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip);
-	void ProcessPublishNotesRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port);
-	void ProcessPublishNotesResponse	(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip);
 	void ProcessFirewalledRequest		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, uint16_t port, const CKadUDPKey& senderKey);
 	void ProcessFirewalledResponse		(const uint8_t* packetData, uint32_t lenPacket, uint32_t ip, const CKadUDPKey& senderKey);
 	void ProcessFirewalledAckResponse	(uint32_t lenPacket);

aMule-2.2.6.tar.bz2/src/kademlia/net/PacketTracking.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/net/PacketTracking.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 Dévai Tamás ( gonosztopi@amule.org )
-// Copyright (c) 2008-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002-2008 Merkur ( strEmail.Format("%s@%s", "devteam", "emule-project.net") / http://www.emule-project.net )
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2008-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -25,6 +25,7 @@
 //
 
 #include "PacketTracking.h"
+#include "../kademlia/Kademlia.h"
 #include "../../amule.h"
 #include "../../Logger.h"
 #include "../../OtherFunctions.h"
@@ -41,10 +42,7 @@
 
 CPacketTracking::~CPacketTracking()
 {
-	for (TrackedPacketInMap::iterator it = m_mapTrackPacketsIn.begin(); it != m_mapTrackPacketsIn.end(); ++it) {
-		delete it->second;
-	}
-	m_mapTrackPacketsIn.clear();
+	DeleteContents(m_mapTrackPacketsIn);
 }
 
 void CPacketTracking::AddTrackedOutPacket(uint32_t ip, uint8_t opcode)
@@ -69,17 +67,13 @@
 bool CPacketTracking::IsTrackedOutListRequestPacket(uint8_t opcode) throw()
 {
 	switch (opcode) {
-	 case KADEMLIA_BOOTSTRAP_REQ:
 	 case KADEMLIA2_BOOTSTRAP_REQ:
-	 case KADEMLIA_HELLO_REQ:
 	 case KADEMLIA2_HELLO_REQ:
 	 case KADEMLIA2_HELLO_RES:
-	 case KADEMLIA_REQ:
 	 case KADEMLIA2_REQ:
 	 case KADEMLIA_SEARCH_NOTES_REQ:
 	 case KADEMLIA2_SEARCH_NOTES_REQ:
 	 case KADEMLIA_PUBLISH_REQ:
-	 case KADEMLIA_PUBLISH_NOTES_REQ:
 	 case KADEMLIA2_PUBLISH_KEY_REQ:
 	 case KADEMLIA2_PUBLISH_SOURCE_REQ:
 	 case KADEMLIA2_PUBLISH_NOTES_REQ:
@@ -122,47 +116,33 @@
 	// (those limits are not meant to be fine to be used by normal usage, but only supposed to be a flood detection)
 
 	uint32_t allowedPacketsPerMinute;
-	const uint8_t dbgOrgOpcode = opcode;
+	DEBUG_ONLY( const uint8_t dbgOrgOpcode = opcode; )
 
 	switch (opcode) {
-		case KADEMLIA_BOOTSTRAP_REQ:
-			opcode = KADEMLIA2_BOOTSTRAP_REQ;
 		case KADEMLIA2_BOOTSTRAP_REQ:
 			allowedPacketsPerMinute = 2;
 			break;
-		case KADEMLIA_HELLO_REQ:
-			opcode = KADEMLIA2_HELLO_REQ; 
 		case KADEMLIA2_HELLO_REQ:
 			allowedPacketsPerMinute = 3;
 			break;
-		case KADEMLIA_REQ:
-			opcode = KADEMLIA2_REQ;
 		case KADEMLIA2_REQ:
 			allowedPacketsPerMinute = 10;
 			break;
-		case KADEMLIA_SEARCH_NOTES_REQ:
-			opcode = KADEMLIA2_SEARCH_NOTES_REQ;
 		case KADEMLIA2_SEARCH_NOTES_REQ:
 			allowedPacketsPerMinute = 3;
 			break;
-		case KADEMLIA_SEARCH_REQ:
-			opcode = KADEMLIA2_SEARCH_KEY_REQ;
 		case KADEMLIA2_SEARCH_KEY_REQ:
 			allowedPacketsPerMinute = 3;
 			break;
 		case KADEMLIA2_SEARCH_SOURCE_REQ:
 			allowedPacketsPerMinute = 3;
 			break;
-		case KADEMLIA_PUBLISH_REQ:
-			opcode = KADEMLIA2_PUBLISH_KEY_REQ;
 		case KADEMLIA2_PUBLISH_KEY_REQ:
 			allowedPacketsPerMinute = 3;
 			break;
 		case KADEMLIA2_PUBLISH_SOURCE_REQ:
 			allowedPacketsPerMinute = 2;
 			break;
-		case KADEMLIA_PUBLISH_NOTES_REQ:
-			opcode = KADEMLIA2_PUBLISH_NOTES_REQ;
 		case KADEMLIA2_PUBLISH_NOTES_REQ:
 			allowedPacketsPerMinute = 2;
 			break;
@@ -181,7 +161,7 @@
 			allowedPacketsPerMinute = 2;
 			break;
 		default:
-			// not any request packets, so its a response packet - no further checks on this point
+			// not any request packets, so it's a response packet - no further checks on this point
 			return true;
 	}
 
@@ -223,18 +203,22 @@
 			// remember only for easier cleanup
 			trackEntry->m_lastExpire = std::max(trackEntry->m_lastExpire, it->m_firstAdded + SEC2MS(secondsPerPacket) * it->m_count);
 
+			if (CKademlia::IsRunningInLANMode() && ::IsLanIP(wxUINT32_SWAP_ALWAYS(ip))) {
+				return true;	// no flood detection in LAN mode
+			}
+
 			// now the actual check if this request is allowed
 			if (it->m_count > allowedPacketsPerMinute * 5) {
 				// this is so far above the limit that it has to be an intentional flood / misuse in any case
 				// so we take the next higher punishment and ban the IP
-				AddDebugLogLineM(false, logKadPacketTracking, wxString::Format(wxT("Massive request flood detected for opcode 0x%X (0x%X) from IP "), opcode, dbgOrgOpcode) + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(" - Banning IP"));
+				AddDebugLogLineN(logKadPacketTracking, CFormat(wxT("Massive request flood detected for opcode 0x%X (0x%X) from IP %s - Banning IP")) % opcode % dbgOrgOpcode % KadIPToString(ip));
 				theApp->clientlist->AddBannedClient(wxUINT32_SWAP_ALWAYS(ip));
 				return false; // drop packet
 			} else if (it->m_count > allowedPacketsPerMinute) {
 				// over the limit, drop the packet but do nothing else
 				if (!it->m_dbgLogged) {
 					it->m_dbgLogged = true;
-					AddDebugLogLineM(false, logKadPacketTracking, wxString::Format(wxT("Request flood detected for opcode 0x%X (0x%X) from IP "), opcode, dbgOrgOpcode) + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(" - Droping packets with this opcode"));
+					AddDebugLogLineN(logKadPacketTracking, CFormat(wxT("Request flood detected for opcode 0x%X (0x%X) from IP %s - Dropping packets with this opcode")) % opcode % dbgOrgOpcode % KadIPToString(ip));
 				}
 				return false; // drop packet
 			} else {
@@ -259,7 +243,7 @@
 void CPacketTracking::InTrackListCleanup()
 {
 	const uint32_t currentTick = ::GetTickCount();
-	const uint32_t dbgOldSize = m_mapTrackPacketsIn.size();
+	DEBUG_ONLY( const uint32_t dbgOldSize = m_mapTrackPacketsIn.size(); )
 	lastTrackInCleanup = currentTick;
 	for (TrackedPacketInMap::iterator it = m_mapTrackPacketsIn.begin(); it != m_mapTrackPacketsIn.end();) {
 		TrackedPacketInMap::iterator it2 = it++;
@@ -268,7 +252,7 @@
 			m_mapTrackPacketsIn.erase(it2);
 		}
 	}
-	AddDebugLogLineM(false, logKadPacketTracking, wxString::Format(wxT("Cleaned up Kad Incoming Requests Tracklist, entries before: %u, after %u"), dbgOldSize, m_mapTrackPacketsIn.size()));
+	AddDebugLogLineN(logKadPacketTracking, CFormat(wxT("Cleaned up Kad Incoming Requests Tracklist, entries before: %u, after %u")) % dbgOldSize % m_mapTrackPacketsIn.size());
 }
 
 void CPacketTracking::AddLegacyChallenge(const CUInt128& contactID, const CUInt128& challengeID, uint32_t ip, uint8_t opcode)
@@ -278,7 +262,7 @@
 	listChallengeRequests.push_front(sTrack);
 	while (!listChallengeRequests.empty()) {
 		if (now - listChallengeRequests.back().inserted > SEC2MS(180)) {
-			AddDebugLogLineM(false, logKadPacketTracking, wxT("Challenge timed out, client not verified - ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(listChallengeRequests.back().ip)));
+			AddDebugLogLineN(logKadPacketTracking, wxT("Challenge timed out, client not verified - ") + KadIPToString(listChallengeRequests.back().ip));
 			listChallengeRequests.pop_back();
 		} else {
 			break;
@@ -289,7 +273,7 @@
 bool CPacketTracking::IsLegacyChallenge(const CUInt128& challengeID, uint32_t ip, uint8_t opcode, CUInt128& contactID)
 {
 	uint32_t now = ::GetTickCount();
-	bool warning = false;
+	DEBUG_ONLY( bool warning = false; )
 	for (TrackChallengeList::iterator it = listChallengeRequests.begin(); it != listChallengeRequests.end();) {
 		TrackChallengeList::iterator it2 = it++;
 		if (it2->ip == ip && it2->opcode == opcode && now - it2->inserted < SEC2MS(180)) {
@@ -299,13 +283,15 @@
 				listChallengeRequests.erase(it2);
 				return true;
 			} else {
-				warning = true;
+				DEBUG_ONLY( warning = true; )
 			}
 		}
 	}
+#ifdef __DEBUG__
 	if (warning) {
-		AddDebugLogLineM(false, logKadPacketTracking, wxT("Wrong challenge answer received, client not verified (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(")"));
+		AddDebugLogLineN(logKadPacketTracking, wxT("Wrong challenge answer received, client not verified (") + KadIPToString(ip) + wxT(")"));
 	}
+#endif
 	return false;
 }

aMule-2.2.6.tar.bz2/src/kademlia/net/PacketTracking.h -> aMule-2.3.1.tar.bz2/src/kademlia/net/PacketTracking.h Changed

aMule-2.2.6.tar.bz2/src/kademlia/routing/Contact.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/routing/Contact.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of aMule Project
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Project ( http://www.amule-project.net )
-// Copyright (C)2003 Barry Dunne (http://www.emule-project.net)
+// 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-2011 Barry Dunne ( http://www.emule-project.net )
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -21,7 +21,7 @@
 
 // This work is based on the java implementation of the Kademlia protocol.
 // Kademlia: Peer-to-peer routing based on the XOR metric
-// Copyright (C) 2002  Petar Maymounkov [petar@post.harvard.edu]
+// Copyright (c) 2002  Petar Maymounkov ( petar@post.harvard.edu )
 // http://kademlia.scs.cs.nyu.edu
 
 // Note To Mods //
@@ -63,7 +63,6 @@
 	  m_created(m_lastTypeSet),
 	  m_inUse(0),
 	  m_version(version),
-	  m_checkKad2(true),
 	  m_ipVerified(ipVerified),
 	  m_receivedHelloPacket(false),
 	  m_udpKey(key)

aMule-2.2.6.tar.bz2/src/kademlia/routing/Contact.h -> aMule-2.3.1.tar.bz2/src/kademlia/routing/Contact.h Changed

@@ -1,9 +1,9 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -81,7 +81,7 @@
 
 	bool	 InUse() const throw()				{ return m_inUse > 0; }
 	void	 IncUse() throw()				{ m_inUse++; }
-	void	 DecUse() throw()				{ if (m_inUse) m_inUse--; else wxFAIL; }
+	void	 DecUse()					{ if (m_inUse) m_inUse--; else { wxFAIL; } }
 
 	time_t	 GetCreatedTime() const throw()			{ return m_created; }
 
@@ -95,8 +95,6 @@
 	uint8_t	 GetVersion() const throw()			{ return m_version; }
 	void	 SetVersion(uint8_t value) throw()		{ m_version = value; }
 
-	bool	 CheckIfKad2() throw()				{ return m_checkKad2 ? m_checkKad2 = false, true : false; }
-
 	const CKadUDPKey& GetUDPKey() const throw()		{ return m_udpKey; }
 	void	 SetUDPKey(const CKadUDPKey& key) throw()	{ m_udpKey = key; }
 
@@ -118,7 +116,6 @@
 	time_t		m_created;
 	uint32_t	m_inUse;
 	uint8_t		m_version;
-	bool		m_checkKad2;
 	bool		m_ipVerified;
 	bool		m_receivedHelloPacket;
 	CKadUDPKey	m_udpKey;

aMule-2.2.6.tar.bz2/src/kademlia/routing/Maps.h -> aMule-2.3.1.tar.bz2/src/kademlia/routing/Maps.h Changed

aMule-2.2.6.tar.bz2/src/kademlia/routing/RoutingBin.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/routing/RoutingBin.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of aMule Project
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Project ( http://www.amule-project.net )
-// Copyright (C)2003 Barry Dunne (http://www.emule-project.net)
+// 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-2011 Barry Dunne ( http://www.emule-project.net )
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -21,7 +21,7 @@
 
 // This work is based on the java implementation of the Kademlia protocol.
 // Kademlia: Peer-to-peer routing based on the XOR metric
-// Copyright (C) 2002  Petar Maymounkov [petar@post.harvard.edu]
+// Copyright (c) 2002-2011  Petar Maymounkov ( petar@post.harvard.edu )
 // http://kademlia.scs.cs.nyu.edu
 
 // Note To Mods //
@@ -87,7 +87,7 @@
 
 	// no more than 2 IPs from the same /24 netmask in one bin, except if its a LANIP (if we don't accept LANIPs they already have been filtered before)
 	if (sameSubnets >= 2 && !::IsLanIP(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress()))) {
-		AddDebugLogLineM(false, logKadRouting, wxT("Ignored kad contact (IP=") + Uint32_16toStringIP_Port(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress()), contact->GetUDPPort()) + wxT(") - too many contact with the same subnet in RoutingBin"));
+		AddDebugLogLineN(logKadRouting, wxT("Ignored kad contact (IP=") + KadIPPortToString(contact->GetIPAddress(), contact->GetUDPPort()) + wxT(") - too many contact with the same subnet in RoutingBin"));
 		return false;
 	}
 
@@ -152,7 +152,7 @@
 	return NULL;
 }
 
-void CRoutingBin::GetNumContacts(uint32_t& nInOutContacts, uint32_t& nInOutFilteredContacts, uint8_t minVersion) const
+void CRoutingBin::GetNumContacts(uint32_t& nInOutContacts, uint32_t& nInOutFilteredContacts, uint8_t minVersion) const throw()
 {
 	// count all nodes which meet the search criteria and also report those who don't
 	for (ContactList::const_iterator it = m_entries.begin(); it != m_entries.end(); ++it) {
@@ -223,13 +223,13 @@
 	}
 	if (increase) {
 		if (sameIPCount >= MAX_CONTACTS_IP) {
-			AddDebugLogLineM(false, logKadRouting, wxT("Global IP Tracking inconsistency on increase (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(")"));
+			AddDebugLogLineN(logKadRouting, wxT("Global IP Tracking inconsistency on increase (") + KadIPToString(ip) + wxT(")"));
 			wxFAIL;
 		}
 		sameIPCount++;
 	} else /* if (!increase) */ {
 		if (sameIPCount == 0) {
-			AddDebugLogLineM(false, logKadRouting, wxT("Global IP Tracking inconsistency on decrease (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(")"));
+			AddDebugLogLineN(logKadRouting, wxT("Global IP Tracking inconsistency on decrease (") + KadIPToString(ip) + wxT(")"));
 			wxFAIL;
 		}
 		sameIPCount--;
@@ -248,13 +248,13 @@
 	}
 	if (increase) {
 		if (sameSubnetCount >= MAX_CONTACTS_SUBNET && !::IsLanIP(wxUINT32_SWAP_ALWAYS(ip))) {
-			AddDebugLogLineM(false, logKadRouting, wxT("Global Subnet Tracking inconsistency on increase (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT("/24)"));
+			AddDebugLogLineN(logKadRouting, wxT("Global Subnet Tracking inconsistency on increase (") + KadIPToString(ip) + wxT("/24)"));
 			wxFAIL;
 		}
 		sameSubnetCount++;
 	} else /* if (!increase) */ {
 		if (sameSubnetCount == 0) {
-			AddDebugLogLineM(false, logKadRouting, wxT("Global Subnet Tracking inconsistency on decrease (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT("/24)"));
+			AddDebugLogLineN(logKadRouting, wxT("Global Subnet Tracking inconsistency on decrease (") + KadIPToString(ip) + wxT("/24)"));
 			wxFAIL;
 		}
 		sameSubnetCount--;
@@ -285,7 +285,7 @@
 		sameIPCount = itIP->second;
 	}
 	if (sameIPCount >= MAX_CONTACTS_IP) {
-		AddDebugLogLineM(false, logKadRouting, wxT("Rejected kad contact IP change on update (old IP=") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress())) + wxT(", requested IP=") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(newIP)) + wxT(") - too many contacts with the same IP (global)"));
+		AddDebugLogLineN(logKadRouting, wxT("Rejected kad contact IP change on update (old IP=") + KadIPToString(contact->GetIPAddress()) + wxT(", requested IP=") + KadIPToString(newIP) + wxT(") - too many contacts with the same IP (global)"));
 		return false;
 	}
 
@@ -297,7 +297,7 @@
 			sameSubnetGlobalCount = itGlobalSubnet->second;
 		}
 		if (sameSubnetGlobalCount >= MAX_CONTACTS_SUBNET && !::IsLanIP(wxUINT32_SWAP_ALWAYS(newIP))) {
-			AddDebugLogLineM(false, logKadRouting, wxT("Rejected kad contact IP change on update (old IP=") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress())) + wxT(", requested IP=") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(newIP)) + wxT(") - too many contacts with the same Subnet (global)"));
+			AddDebugLogLineN(logKadRouting, wxT("Rejected kad contact IP change on update (old IP=") + KadIPToString(contact->GetIPAddress()) + wxT(", requested IP=") + KadIPToString(newIP) + wxT(") - too many contacts with the same Subnet (global)"));
 			return false;
 		}
 
@@ -310,13 +310,13 @@
 			}
 		}
 		if (sameSubnets >= 2 && !::IsLanIP(wxUINT32_SWAP_ALWAYS(newIP))) {
-			AddDebugLogLineM(false, logKadRouting, wxT("Rejected kad contact IP change on update (old IP=") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress())) + wxT(", requested IP=") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(newIP)) + wxT(") - too many contacts with the same Subnet (local)"));
+			AddDebugLogLineN(logKadRouting, wxT("Rejected kad contact IP change on update (old IP=") + KadIPToString(contact->GetIPAddress()) + wxT(", requested IP=") + KadIPToString(newIP) + wxT(") - too many contacts with the same Subnet (local)"));
 			return false;
 		}
 	}
 
 	// everything fine
-	AddDebugLogLineM(false, logKadRouting, wxT("Index contact IP change allowed ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress())) + wxT(" -> ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(newIP)));
+	AddDebugLogLineN(logKadRouting, wxT("Index contact IP change allowed ") + KadIPToString(contact->GetIPAddress()) + wxT(" -> ") + KadIPToString(newIP));
 	AdjustGlobalTracking(contact->GetIPAddress(), false);
 	contact->SetIPAddress(newIP);
 	AdjustGlobalTracking(contact->GetIPAddress(), true);
@@ -331,7 +331,7 @@
 	m_entries.push_back(contact);
 }
 
-CContact *CRoutingBin::GetRandomContact(uint32_t maxType, uint32_t minKadVersion) const throw()
+CContact *CRoutingBin::GetRandomContact(uint32_t maxType, uint32_t minKadVersion) const
 {
 	if (m_entries.empty()) {
 		return NULL;
@@ -363,7 +363,7 @@
 	}
 }
 
-bool CRoutingBin::CheckGlobalIPLimits(uint32_t ip, uint16_t port)
+bool CRoutingBin::CheckGlobalIPLimits(uint32_t ip, uint16_t DEBUG_ONLY(port))
 {
 	// no more than 1 KadID per IP
 	uint32_t sameIPCount = 0;
@@ -372,7 +372,7 @@
 		sameIPCount = itIP->second;
 	}
 	if (sameIPCount >= MAX_CONTACTS_IP) {
-		AddDebugLogLineM(false, logKadRouting, wxT("Ignored kad contact (IP=") + Uint32_16toStringIP_Port(wxUINT32_SWAP_ALWAYS(ip), port) + wxT(") - too many contacts with the same IP (global)"));
+		AddDebugLogLineN(logKadRouting, wxT("Ignored kad contact (IP=") + KadIPPortToString(ip, port) + wxT(") - too many contacts with the same IP (global)"));
 		return false;
 	}
 	//  no more than 10 IPs from the same /24 netmask global, except if its a LANIP (if we don't accept LANIPs they already have been filtered before)
@@ -382,8 +382,18 @@
 		sameSubnetGlobalCount = itSubnet->second;
 	}
 	if (sameSubnetGlobalCount >= MAX_CONTACTS_SUBNET && !::IsLanIP(wxUINT32_SWAP_ALWAYS(ip))) {
-		AddDebugLogLineM(false, logKadRouting, wxT("Ignored kad contact (IP=") + Uint32_16toStringIP_Port(wxUINT32_SWAP_ALWAYS(ip), port) + wxT(") - too many contacts with the same subnet (global)"));
+		AddDebugLogLineN(logKadRouting, wxT("Ignored kad contact (IP=") + KadIPPortToString(ip, port) + wxT(") - too many contacts with the same subnet (global)"));
 		return false;
 	}
 	return true;
 }
+
+bool CRoutingBin::HasOnlyLANNodes() const throw()
+{
+	for (ContactList::const_iterator it = m_entries.begin(); it != m_entries.end(); ++it) {
+		if (!::IsLanIP(wxUINT32_SWAP_ALWAYS((*it)->GetIPAddress()))) {
+			return false;
+		}
+	}
+	return true;
+}

aMule-2.2.6.tar.bz2/src/kademlia/routing/RoutingBin.h -> aMule-2.3.1.tar.bz2/src/kademlia/routing/RoutingBin.h Changed

@@ -1,9 +1,9 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -67,18 +67,19 @@
 	CContact *GetOldest() const throw()		{ return m_entries.size() ? m_entries.front() : NULL; }
 
 	uint32_t  GetSize() const throw()		{ return m_entries.size(); }
-	void	  GetNumContacts(uint32_t& nInOutContacts, uint32_t& nInOutFilteredContacts, uint8_t minVersion) const;
+	void	  GetNumContacts(uint32_t& nInOutContacts, uint32_t& nInOutFilteredContacts, uint8_t minVersion) const throw();
 	uint32_t  GetRemaining() const throw()		{ return K - m_entries.size(); }
 	void	  GetEntries(ContactList *result, bool emptyFirst = true) const;
 	void	  GetClosestTo(uint32_t maxType, const CUInt128 &target, uint32_t maxRequired, ContactMap *result, bool emptyFirst = true, bool setInUse = false) const;
 	bool	  ChangeContactIPAddress(CContact *contact, uint32_t newIP);
 	void	  PushToBottom(CContact *contact); // puts an existing contact from X to the end of the list
-	CContact *GetRandomContact(uint32_t maxType, uint32_t minKadVersion) const throw();
+	CContact *GetRandomContact(uint32_t maxType, uint32_t minKadVersion) const;
 	void	  SetAllContactsVerified();
+	bool	  HasOnlyLANNodes() const throw();
 
 	static bool	CheckGlobalIPLimits(uint32_t ip, uint16_t port);
 
-	bool m_dontDeleteContacts;
+	bool	m_dontDeleteContacts;
 
 protected:
 	static void AdjustGlobalTracking(uint32_t ip, bool increase);

aMule-2.2.6.tar.bz2/src/kademlia/routing/RoutingZone.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/routing/RoutingZone.cpp Changed

@@ -1,10 +1,10 @@
 //
 // This file is part of aMule Project
 //
-// Copyright (c) 2004-2009 Angel Vidal ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Project ( http://www.amule-project.net )
-// Copyright (C)2003 Barry Dunne (http://www.emule-project.net)
-// Copyright (C)2007-2008 Merkur ( strEmail.Format("%s@%s", "devteam", "emule-project.net") / http://www.emule-project.net )
+// 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-2011 Barry Dunne ( http://www.emule-project.net )
+// Copyright (C)2007-2011 Merkur ( strEmail.Format("%s@%s", "devteam", "emule-project.net") / http://www.emule-project.net )
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -22,7 +22,7 @@
 
 // This work is based on the java implementation of the Kademlia protocol.
 // Kademlia: Peer-to-peer routing based on the XOR metric
-// Copyright (C) 2002  Petar Maymounkov [petar@post.harvard.edu]
+// Copyright (c) 2002-2011  Petar Maymounkov ( petar@post.harvard.edu )
 // http://kademlia.scs.cs.nyu.edu
 
 // Note To Mods //
@@ -167,20 +167,20 @@
 						numContacts = file.ReadUInt32();
 					}
 				}
+			} else {
+				// Don't read version 0 nodes.dat files, because they can't tell the kad version of the contacts stored.
+				AddLogLineC(_("Failed to read nodes.dat file - too old. This version (0) is not supported anymore."));
+				numContacts = 0;
 			}
+			DEBUG_ONLY( unsigned kad1Count = 0; )
 			if (numContacts != 0 && numContacts * 25 <= (file.GetLength() - file.GetPosition())) {
 				for (uint32_t i = 0; i < numContacts; i++) {
 					CUInt128 id = file.ReadUInt128();
 					uint32_t ip = file.ReadUInt32();
 					uint16_t udpPort = file.ReadUInt16();
 					uint16_t tcpPort = file.ReadUInt16();
-					uint8_t type = 0;
 					uint8_t contactVersion = 0;
-					if (fileVersion >= 1) {
-						contactVersion = file.ReadUInt8();
-					} else {
-						type = file.ReadUInt8();
-					}
+					contactVersion = file.ReadUInt8();
 					CKadUDPKey kadUDPKey;
 					bool verified = false;
 					if (fileVersion >= 2) {
@@ -191,31 +191,38 @@
 						}
 					}
 					// IP appears valid
-					if (type < 4) {
+					if (contactVersion > 1) {
 						if(IsGoodIPPort(wxUINT32_SWAP_ALWAYS(ip),udpPort)) {
 							if (!theApp->ipfilter->IsFiltered(wxUINT32_SWAP_ALWAYS(ip)) &&
 							    !(udpPort == 53 && contactVersion <= 5 /*No DNS Port without encryption*/)) {
 								// This was not a dead contact, inc counter if add was successful
-								if (AddUnfiltered(id, ip, udpPort, tcpPort, contactVersion, kadUDPKey, verified, false, true, false)) {
+								if (AddUnfiltered(id, ip, udpPort, tcpPort, contactVersion, kadUDPKey, verified, false, false)) {
 									validContacts++;
 								}
 							}
 						}
+					} else {
+						DEBUG_ONLY( kad1Count++; )
 					}
 				}
 			}
 			file.Close();
-			AddLogLineM(false, wxString::Format(wxPLURAL("Read %u Kad contact", "Read %u Kad contacts", validContacts), validContacts));
+			AddLogLineN(CFormat(wxPLURAL("Read %u Kad contact", "Read %u Kad contacts", validContacts)) % validContacts);
+#ifdef __DEBUG__
+			if (kad1Count > 0) {
+				AddDebugLogLineN(logKadRouting, CFormat(wxT("Ignored %u kad1 %s in nodes.dat file.")) % kad1Count % (kad1Count > 1 ? wxT("contacts"): wxT("contact")));
+			}
+#endif
 			if (!doHaveVerifiedContacts) {
-				AddDebugLogLineM(false, logKadRouting, wxT("No verified contacts found in nodes.dat - might be an old file version. Setting all contacts verified for this time to speed up Kad bootstrapping."));
+				AddDebugLogLineN(logKadRouting, wxT("No verified contacts found in nodes.dat - might be an old file version. Setting all contacts verified for this time to speed up Kad bootstrapping."));
 				SetAllContactsVerified();
 			}
 		}
-		if (numContacts == 0) {
-			AddDebugLogLineM(false, logKadRouting, wxT("Error while reading Kad contacts - 0 entries"));
+		if (validContacts == 0) {
+			AddLogLineC(_("No contacts found, please bootstrap, or download a nodes.dat file."));
 		}
-	} catch (const CSafeIOException& e) {
-		AddDebugLogLineM(false, logKadRouting, wxT("IO error in CRoutingZone::readFile: ") + e.what());
+	} catch (const CSafeIOException& DEBUG_ONLY(e)) {
+		AddDebugLogLineN(logKadRouting, wxT("IO error in CRoutingZone::readFile: ") + e.what());
 	}
 }
 
@@ -275,8 +282,11 @@
 			}
 			numContacts--;
 		}
-		AddLogLineM(false, wxString::Format(wxPLURAL("Read %u Kad contact", "Read %u Kad contacts", CKademlia::s_bootstrapList.size()), CKademlia::s_bootstrapList.size()));
-		AddDebugLogLineM(false, logKadRouting, wxString::Format(wxT("Loaded Bootstrap nodes.dat, selected %u out of %u valid contacts"), CKademlia::s_bootstrapList.size(), validContacts));
+		AddLogLineN(CFormat(wxPLURAL("Read %u Kad contact", "Read %u Kad contacts", CKademlia::s_bootstrapList.size())) % CKademlia::s_bootstrapList.size());
+		AddDebugLogLineN(logKadRouting, CFormat(wxT("Loaded Bootstrap nodes.dat, selected %u out of %u valid contacts")) % CKademlia::s_bootstrapList.size() % validContacts);
+	}
+	if (CKademlia::s_bootstrapList.size() == 0) {
+		AddLogLineC(_("No contacts found, please bootstrap, or download a nodes.dat file."));
 	}
 }
 
@@ -284,7 +294,7 @@
 {
 	// don't overwrite a bootstrap nodes.dat with an empty one, if we didn't finish probing
 	if (!CKademlia::s_bootstrapList.empty() && GetNumContacts() == 0) {
-		AddDebugLogLineM(false, logKadRouting, wxT("Skipped storing nodes.dat, because we have an unfinished bootstrap of the nodes.dat version and no contacts in our routing table"));
+		AddDebugLogLineN(logKadRouting, wxT("Skipped storing nodes.dat, because we have an unfinished bootstrap of the nodes.dat version and no contacts in our routing table"));
 		return;
 	}
 
@@ -294,17 +304,18 @@
 	ContactList::size_type numContacts = contacts.size();
 	numContacts = std::min<ContactList::size_type>(numContacts, CONTACT_FILE_LIMIT); // safety precaution, should not be above
 	if (numContacts < 25) {
-		AddLogLineM(false, wxString::Format(wxPLURAL("Only %d Kad contact available, nodes.dat not written", "Only %d Kad contacts available, nodes.dat not written", numContacts), numContacts));
+		AddLogLineN(CFormat(wxPLURAL("Only %d Kad contact available, nodes.dat not written", "Only %d Kad contacts available, nodes.dat not written", numContacts)) % numContacts);
 		return;
 	}
 	try {
 		unsigned int count = 0;
 		CFile file;
-		if (file.Open(m_filename, CFile::write)) {
+		if (file.Open(m_filename, CFile::write_safe)) {
 			// Start file with 0 to prevent older clients from reading it.
 			file.WriteUInt32(0);
 			// Now tag it with a version which happens to be 2.
 			file.WriteUInt32(2);
+			// file.WriteUInt32(0); // if we would use version >= 3 this would mean that this is a normal nodes.dat
 			file.WriteUInt32(numContacts);
 			for (ContactList::const_iterator it = contacts.begin(); it != contacts.end(); ++it) {
 				CContact *c = *it;
@@ -322,13 +333,63 @@
 				c->GetUDPKey().StoreToFile(file);
 				file.WriteUInt8(c->IsIPVerified() ? 1 : 0);
 			}
+			file.Close();
 		}
-		AddLogLineM(false, wxString::Format(wxPLURAL("Wrote %d Kad contact", "Wrote %d Kad contacts", count), count));
+		AddLogLineN(CFormat(wxPLURAL("Wrote %d Kad contact", "Wrote %d Kad contacts", count)) % count);
 	} catch (const CIOFailureException& e) {
-		AddDebugLogLineM(true, logKadRouting, wxT("IO failure in CRoutingZone::writeFile: ") + e.what());
+		AddDebugLogLineC(logKadRouting, wxT("IO failure in CRoutingZone::writeFile: ") + e.what());
 	}
 }
 
+#if 0
+void CRoutingZone::WriteBootstrapFile()
+{
+	AddDebugLogLineC(logKadRouting, wxT("Writing special bootstrap nodes.dat - not intended for normal use"));
+	try {
+		// Write a saved contact list.
+		CUInt128 id;
+		CFile file;
+		if (file.Open(m_filename, CFile::write)) {
+			// The bootstrap method gets a very nice sample of contacts to save.
+			ContactMap mapContacts;
+			CUInt128 random(CUInt128((uint32_t)0), 0);
+			CUInt128 distance = random;
+			distance ^= me;
+			GetClosestTo(2, random, distance, 1200, &mapContacts, false, false);
+			// filter out Kad1 nodes
+			for (ContactMap::iterator it = mapContacts.begin(); it != mapContacts.end(); ) {
+				ContactMap::iterator itCur = it++;
+				CContact* contact = itCur->second;
+				if (contact->GetVersion() <= 1) {
+					mapContacts.erase(itCur);
+				}
+			}
+			// Start file with 0 to prevent older clients from reading it.
+			file.WriteUInt32(0);
+			// Now tag it with a version which happens to be 3.
+			file.WriteUInt32(3);
+			file.WriteUInt32(1); // using version >= 3, this means that this is not a normal nodes.dat
+			file.WriteUInt32((uint32_t)mapContacts.size());
+			for (ContactMap::const_iterator it = mapContacts.begin(); it != mapContacts.end(); ++it)
+			{
+				CContact* contact = it->second;
+				file.WriteUInt128(contact->GetClientID());
+				file.WriteUInt32(contact->GetIPAddress());
+				file.WriteUInt16(contact->GetUDPPort());
+				file.WriteUInt16(contact->GetTCPPort());
+				file.WriteUInt8(contact->GetVersion());
+			}
+			file.Close();
+			AddDebugLogLineN(logKadRouting, CFormat(wxT("Wrote %u contacts to bootstrap file.")) % mapContacts.size());
+		} else {
+			AddDebugLogLineC(logKadRouting, wxT("Unable to store Kad file: ") + m_filename);
+		}
+	} catch (const CIOFailureException& e) {
+		AddDebugLogLineC(logKadRouting, wxT("CFileException in CRoutingZone::writeFile") + e.what());
+	}
+}
+#endif
+
 bool CRoutingZone::CanSplit() const throw()
 {
 	// Max levels allowed.
@@ -341,24 +402,22 @@
 }
 
 // Returns true if a contact was added or updated, false if the routing table was not touched.
-bool CRoutingZone::Add(const CUInt128& id, uint32_t ip, uint16_t port, uint16_t tport, uint8_t version, const CKadUDPKey& key, bool& ipVerified, bool update, bool fromNodesDat, bool fromHello)
+bool CRoutingZone::Add(const CUInt128& id, uint32_t ip, uint16_t port, uint16_t tport, uint8_t version, const CKadUDPKey& key, bool& ipVerified, bool update, bool fromHello)
 {
 	if (IsGoodIPPort(wxUINT32_SWAP_ALWAYS(ip), port)) {
 		if (!theApp->ipfilter->IsFiltered(wxUINT32_SWAP_ALWAYS(ip)) && !(port == 53 && version <= 5) /*No DNS Port without encryption*/) {
-			return AddUnfiltered(id, ip, port, tport, version, key, ipVerified, update, fromNodesDat, fromHello);
+			return AddUnfiltered(id, ip, port, tport, version, key, ipVerified, update, fromHello);
 		}
 	}
 	return false;
 }
 
 // Returns true if a contact was added or updated, false if the routing table was not touched.
-bool CRoutingZone::AddUnfiltered(const CUInt128& id, uint32_t ip, uint16_t port, uint16_t tport, uint8_t version, const CKadUDPKey& key, bool& ipVerified, bool update, bool fromNodesDat, bool fromHello)
+bool CRoutingZone::AddUnfiltered(const CUInt128& id, uint32_t ip, uint16_t port, uint16_t tport, uint8_t version, const CKadUDPKey& key, bool& ipVerified, bool update, bool fromHello)
 {
 	if (id != me) {
 		CContact *contact = new CContact(id, ip, port, tport, version, key, ipVerified);
-		if (fromNodesDat) {
-			contact->CheckIfKad2();	// do not test nodes which we loaded from our nodes.dat for Kad2 again
-		} else if (fromHello) {
+		if (fromHello) {
 			contact->SetReceivedHelloPacket();
 		}
 		if (Add(contact, update, ipVerified)) {
@@ -387,7 +446,7 @@
 					// except if our IP has changed recently, we demand that the key is the same as the key we received
 					// from the packet which wants to update this contact in order to make sure this is not a try to
 					// hijack this entry
-					AddDebugLogLineM(false, logKadRouting, wxT("Sender (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress())) + wxT(") tried to update contact entry but failed to provide the proper sender key (Sent Empty: ") + (contact->GetUDPKey().GetKeyValue(theApp->GetPublicIP(false)) == 0 ? wxT("Yes") : wxT("No")) + wxT(") for the entry (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contactUpdate->GetIPAddress())) + wxT(") - denying update"));
+					AddDebugLogLineN(logKadRouting, wxT("Sender (") + KadIPToString(contact->GetIPAddress()) + wxT(") tried to update contact entry but failed to provide the proper sender key (Sent Empty: ") + (contact->GetUDPKey().GetKeyValue(theApp->GetPublicIP(false)) == 0 ? wxT("Yes") : wxT("No")) + wxT(") for the entry (") + KadIPToString(contactUpdate->GetIPAddress()) + wxT(") - denying update"));
 					update = false;
 				} else if (contactUpdate->GetVersion() >= 1 && contactUpdate->GetVersion() < 6 && contactUpdate->GetReceivedHelloPacket()) {
 					// legacy kad2 contacts are allowed only to update their RefreshTimer to avoid having them hijacked/corrupted by an attacker
@@ -397,9 +456,10 @@
 						wxASSERT(!contact->IsIPVerified());	// legacy kad2 nodes should be unable to verify their IP on a HELLO
 						outIpVerified = contactUpdate->IsIPVerified();
 						m_bin->SetAlive(contactUpdate);
-						AddDebugLogLineM(false, logKadRouting, wxString::Format(wxT("Updated kad contact refreshtimer only for legacy kad2 contact (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contactUpdate->GetIPAddress())) + wxT(", %u)"), contactUpdate->GetVersion()));
+						AddDebugLogLineN(logKadRouting, CFormat(wxT("Updated kad contact refreshtimer only for legacy kad2 contact (%s, %u)")) % KadIPToString(contactUpdate->GetIPAddress()) % contactUpdate->GetVersion());
 					} else {
-						AddDebugLogLineM(false, logKadRouting, wxString::Format(wxT("Rejected value update for legacy kad2 contact (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contactUpdate->GetIPAddress())) + wxT(" -> ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress())) + wxT(", %u -> %u)"), contactUpdate->GetVersion(), contact->GetVersion()));
+						AddDebugLogLineN(logKadRouting, CFormat(wxT("Rejected value update for legacy kad2 contact (%s -> %s, %u -> %u)")) 
+							% KadIPToString(contactUpdate->GetIPAddress()) % KadIPToString(contact->GetIPAddress()) % contactUpdate->GetVersion() % contact->GetVersion());
 						update = false;
 					}
 				} else {
@@ -408,15 +468,16 @@
 					//debug logging stuff - remove later
 					if (contact->GetUDPKey().GetKeyValue(theApp->GetPublicIP(false)) == 0) {
 						if (contact->GetVersion() >= 6 && contact->GetType() < 2) {
-							AddDebugLogLineM(false, logKadRouting, wxT("Updating > 0.49a + type < 2 contact without valid key stored ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress())));
+							AddDebugLogLineN(logKadRouting, wxT("Updating > 0.49a + type < 2 contact without valid key stored ") + KadIPToString(contact->GetIPAddress()));
 						}
 					} else {
-						AddDebugLogLineM(false, logKadRouting, wxT("Updating contact, passed key check ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress())));
+						AddDebugLogLineN(logKadRouting, wxT("Updating contact, passed key check ") + KadIPToString(contact->GetIPAddress()));
 					}
 
 					if (contactUpdate->GetVersion() >= 1 && contactUpdate->GetVersion() < 6) {
 						wxASSERT(!contactUpdate->GetReceivedHelloPacket());
-						AddDebugLogLineM(false, logKadRouting, wxString::Format(wxT("Accepted update for legacy kad2 contact, because of first HELLO (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contactUpdate->GetIPAddress())) + wxT(" -> ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(contact->GetIPAddress())) + wxT(", %u -> %u)"), contactUpdate->GetVersion(), contact->GetVersion()));
+						AddDebugLogLineN(logKadRouting, CFormat(wxT("Accepted update for legacy kad2 contact, because of first HELLO (%s -> %s, %u -> %u)"))
+							% KadIPToString(contactUpdate->GetIPAddress()) % KadIPToString(contact->GetIPAddress()) % contactUpdate->GetVersion() % contact->GetVersion());
 					}
 #endif
 					// All other nodes (Kad1, Kad2 > 0.49a with UDPKey checked or not set, first hello updates) are allowed to do full updates
@@ -477,7 +538,7 @@
 	}
 }
 
-CContact *CRoutingZone::GetRandomContact(uint32_t maxType, uint32_t minKadVersion) const throw()
+CContact *CRoutingZone::GetRandomContact(uint32_t maxType, uint32_t minKadVersion) const
 {
 	if (IsLeaf()) {
 		return m_bin->GetRandomContact(maxType, minKadVersion);
@@ -651,7 +712,7 @@
 //This is used when we find a leaf and want to know what this sample looks like.
 //We fall back two levels and take a sample to try to minimize any areas of the 
 //tree that will give very bad results.
-uint32_t CRoutingZone::EstimateCount() const throw()
+uint32_t CRoutingZone::EstimateCount() const
 {
 	if (!IsLeaf()) {
 		return 0;
@@ -674,10 +735,10 @@
 	// Modify count by assuming 20% of the users are firewalled and can't be a contact for < 0.49b nodes
 	// Modify count by actual statistics of Firewalled ratio for >= 0.49b if we are not firewalled ourself
 	// Modify count by 40% for >= 0.49b if we are firewalled ourself (the actual Firewalled count at this date on kad is 35-55%)
-	const float firewalledModifyOld = 1.20;
+	const float firewalledModifyOld = 1.20f;
 	float firewalledModifyNew = 0;
 	if (CUDPFirewallTester::IsFirewalledUDP(true)) {
-		firewalledModifyNew = 1.40;	// we are firewalled and can't get the real statistics, assume 40% firewalled >=0.49b nodes
+		firewalledModifyNew = 1.40f;	// we are firewalled and can't get the real statistics, assume 40% firewalled >=0.49b nodes
 	} else if (CKademlia::GetPrefs()->StatsGetFirewalledRatio(true) > 0) {
 		firewalledModifyNew = 1.0 + (CKademlia::GetPrefs()->StatsGetFirewalledRatio(true));	// apply the firewalled ratio to the modify
 		wxASSERT(firewalledModifyNew > 1.0 && firewalledModifyNew < 1.90);
@@ -751,12 +812,7 @@
 			CKademlia::GetUDPListener()->SendMyDetails(KADEMLIA2_HELLO_REQ, c->GetIPAddress(), c->GetUDPPort(), c->GetVersion(), 0, NULL, false);
 			wxASSERT(c->GetUDPKey() == CKadUDPKey(0));
 		} else {
-			DebugSend(KadHelloReq, c->GetIPAddress(), c->GetUDPPort());
-			CKademlia::GetUDPListener()->SendMyDetails(KADEMLIA_HELLO_REQ, c->GetIPAddress(), c->GetUDPPort(), 0, 0, NULL, false);
-			if (c->CheckIfKad2()) {
-				DebugSend(Kad2HelloReq, c->GetIPAddress(), c->GetUDPPort());
-				CKademlia::GetUDPListener()->SendMyDetails(KADEMLIA2_HELLO_REQ, c->GetIPAddress(), c->GetUDPPort(), 1, 0, NULL, false);
-			}
+			wxFAIL;
 		}
 	}
 }
@@ -780,7 +836,7 @@
 	}
 }
 
-void CRoutingZone::GetNumContacts(uint32_t& nInOutContacts, uint32_t& nInOutFilteredContacts, uint8_t minVersion) const
+void CRoutingZone::GetNumContacts(uint32_t& nInOutContacts, uint32_t& nInOutFilteredContacts, uint8_t minVersion) const throw()
 {
 	if (IsLeaf()) {
 		m_bin->GetNumContacts(nInOutContacts, nInOutFilteredContacts, minVersion);
@@ -821,7 +877,7 @@
 		return false;
 	} else {
 		if (contact->IsIPVerified()) {
-			AddDebugLogLineM(false, logKadRouting, wxT("Sender already verified (sender: ") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) + wxT(")"));
+			AddDebugLogLineN(logKadRouting, wxT("Sender already verified (sender: ") + KadIPToString(ip) + wxT(")"));
 		} else {
 			contact->SetIPVerified(true);
 		}
@@ -843,9 +899,13 @@
 {
 	// Check if we know a contact with the same ID or IP but notmatching IP/ID and other limitations, similar checks like when adding a node to the table except allowing duplicates
 	// we use this to check KADEMLIA_RES routing answers on searches
+	if (toCheck->GetVersion() <= 1) {
+		// No Kad1 contacts allowed
+		return false;
+	}
 	CContact *duplicate = GetContact(toCheck->GetClientID());
 	if (duplicate != NULL) {
-		if (duplicate->IsIPVerified() && duplicate->GetIPAddress() != toCheck->GetIPAddress() || duplicate->GetUDPPort() != toCheck->GetUDPPort()) {
+		if ((duplicate->IsIPVerified() && duplicate->GetIPAddress() != toCheck->GetIPAddress()) || duplicate->GetUDPPort() != toCheck->GetUDPPort()) {
 			// already existing verified node with different IP
 			return false;
 		} else {
@@ -856,3 +916,12 @@
 	// if the node is not yet known, check if our IP limitations would hit
 	return CRoutingBin::CheckGlobalIPLimits(toCheck->GetIPAddress(), toCheck->GetUDPPort());
 }
+
+bool CRoutingZone::HasOnlyLANNodes() const throw()
+{
+	if (IsLeaf()) {
+		return m_bin->HasOnlyLANNodes();
+	} else {
+		return m_subZones[0]->HasOnlyLANNodes() && m_subZones[1]->HasOnlyLANNodes();
+	}
+}

aMule-2.2.6.tar.bz2/src/kademlia/routing/RoutingZone.h -> aMule-2.3.1.tar.bz2/src/kademlia/routing/RoutingZone.h Changed

@@ -1,9 +1,9 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -72,8 +72,8 @@
 	void	 OnSmallTimer();
 	uint32_t Consolidate();
 
-	bool	 Add(const CUInt128 &id, uint32_t ip, uint16_t port, uint16_t tport, uint8_t version, const CKadUDPKey& key, bool& ipVerified, bool update, bool fromNodesDat, bool fromHello);
-	bool	 AddUnfiltered(const CUInt128 &id, uint32_t ip, uint16_t port, uint16_t tport, uint8_t version, const CKadUDPKey& key, bool& ipVerified, bool update, bool fromNodesDat, bool fromHello);
+	bool	 Add(const CUInt128 &id, uint32_t ip, uint16_t port, uint16_t tport, uint8_t version, const CKadUDPKey& key, bool& ipVerified, bool update, bool fromHello);
+	bool	 AddUnfiltered(const CUInt128 &id, uint32_t ip, uint16_t port, uint16_t tport, uint8_t version, const CKadUDPKey& key, bool& ipVerified, bool update, bool fromHello);
 	bool	 Add(CContact *contact, bool& update, bool& outIpVerified);
 
 	void	 ReadFile(const wxString& specialNodesdat = wxEmptyString);
@@ -81,9 +81,9 @@
 	bool	 VerifyContact(const CUInt128& id, uint32_t ip);
 	CContact *GetContact(const CUInt128& id) const throw();
 	CContact *GetContact(uint32_t ip, uint16_t port, bool tcpPort) const throw();
-	CContact *GetRandomContact(uint32_t maxType, uint32_t minKadVersion) const throw();
+	CContact *GetRandomContact(uint32_t maxType, uint32_t minKadVersion) const;
 	uint32_t GetNumContacts() const throw();
-	void	 GetNumContacts(uint32_t& nInOutContacts, uint32_t& nInOutFilteredContacts, uint8_t minVersion) const;
+	void	 GetNumContacts(uint32_t& nInOutContacts, uint32_t& nInOutFilteredContacts, uint8_t minVersion) const throw();
 
 	// Check if we know a contact with the same IP or ID but not matching IP/ID and other limitations, similar checks like when adding a node to the table except allowing duplicates
 	bool	IsAcceptableContact(const CContact *toCheck) const;
@@ -98,7 +98,8 @@
 	// In practice: returns the contacts from the top (2^{logBase+1}) buckets.
 	uint32_t GetBootstrapContacts(ContactList *results, uint32_t maxRequired) const;
 
-	uint32_t EstimateCount() const throw();
+	uint32_t EstimateCount() const;
+	bool	 HasOnlyLANNodes() const throw();
 
 	time_t	 m_nextBigTimer;
 	time_t	 m_nextSmallTimer;
@@ -108,6 +109,9 @@
 	CRoutingZone(CRoutingZone *super_zone, int level, const CUInt128& zone_index) { Init(super_zone, level, zone_index); }
 	void Init(CRoutingZone *super_zone, int level, const CUInt128& zone_index);
 	void ReadBootstrapNodesDat(CFileDataIO& file);
+#if 0
+	void WriteBootstrapFile();
+#endif
 
 	void WriteFile();

aMule-2.2.6.tar.bz2/src/kademlia/utils/KadClientSearcher.h -> aMule-2.3.1.tar.bz2/src/kademlia/utils/KadClientSearcher.h Changed

aMule-2.2.6.tar.bz2/src/kademlia/utils/KadUDPKey.h -> aMule-2.3.1.tar.bz2/src/kademlia/utils/KadUDPKey.h Changed

@@ -1,9 +1,9 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 Dévai Tamás ( gonosztopi@amule.org )
-// Copyright (c) 2008-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002-2008 Merkur ( strEmail.Format("%s@%s", "devteam", "emule-project.net") / http://www.emule-project.net )
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2008-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -35,11 +35,11 @@
 class CKadUDPKey
 {
       public:
-	CKadUDPKey(uint32_t zero = 0) throw()					{ wxASSERT(zero == 0); m_key = m_ip = 0; }
+	CKadUDPKey(uint32_t WXUNUSED_UNLESS_DEBUG(zero) = 0)			{ wxASSERT(zero == 0); m_key = m_ip = 0; }
 	CKadUDPKey(uint32_t key, uint32_t ip) throw()				{ m_key = key; m_ip = ip; }
 	CKadUDPKey(CFileDataIO& file)						{ ReadFromFile(file); }
 	CKadUDPKey& operator=(const CKadUDPKey& k1) throw()			{ m_key = k1.m_key; m_ip = k1.m_ip; return *this; }
-	CKadUDPKey& operator=(const uint32_t zero) throw()			{ wxASSERT(zero == 0); m_key = m_ip = 0; return *this; }
+	CKadUDPKey& operator=(const uint32_t WXUNUSED_UNLESS_DEBUG(zero))	{ wxASSERT(zero == 0); m_key = m_ip = 0; return *this; }
 	friend bool operator==(const CKadUDPKey& k1, const CKadUDPKey& k2) throw() { return k1.GetKeyValue(k1.m_ip) == k2.GetKeyValue(k2.m_ip);}
 
 	uint32_t	GetKeyValue(uint32_t myIP) const throw()		{ return (myIP == m_ip) ? m_key : 0; }

aMule-2.2.6.tar.bz2/src/kademlia/utils/UInt128.cpp -> aMule-2.3.1.tar.bz2/src/kademlia/utils/UInt128.cpp Changed

@@ -1,10 +1,10 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 Dévai Tamás (GonoszTopi) ( gonosztopi@amule.org )
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -40,15 +40,15 @@
 
 #include "UInt128.h"
 
-#include "../../CryptoPP_Inc.h"
 #include "../../ArchSpecific.h"
+#include <common/Format.h>	// Needed for CFormat
 
 
 ////////////////////////////////////////
 using namespace Kademlia;
 ////////////////////////////////////////
 
-CUInt128::CUInt128(const CUInt128 &value, uint32_t numBits) throw()
+CUInt128::CUInt128(const CUInt128 &value, uint32_t numBits)
 {
 	// Copy the whole uint32s
 	uint32_t numULONGs = numBits / 32;
@@ -76,21 +76,13 @@
 	return *this;
 }
 
-CUInt128& CUInt128::SetValueRandom()
-{
-	CryptoPP::AutoSeededRandomPool rng;
-	uint8_t randomBytes[16];
-	rng.GenerateBlock(randomBytes, 16);
-	SetValueBE(randomBytes);
-	return *this;
-}
-
 wxString CUInt128::ToHexString() const
 {
 	wxString str;
 
-	for (int i = 0; i < 4; ++i)
-		str.Append(wxString::Format(wxT("%08X"), m_data[i]));
+	for (int i = 0; i < 4; ++i) {
+		str.Append(CFormat(wxT("%08X")) % m_data[i]);
+	}
 
 	return str;
 }
@@ -98,11 +90,12 @@
 wxString CUInt128::ToBinaryString(bool trim) const
 {
 	wxString str;
+	str.Alloc(128);
 	int b;
 	for (int i = 0; i < 128; ++i) {
 		b = GetBitNumber(i);
 		if ((!trim) || (b != 0)) {
-			str.Append(wxString::Format(wxT("%d"), b));
+			str.Append(b ? wxT("1") : wxT("0"));
 			trim = false;
 		}
 	}
@@ -112,9 +105,9 @@
 	return str;
 }
 
-void CUInt128::ToByteArray(uint8_t *b) const throw()
+void CUInt128::ToByteArray(uint8_t *b) const
 {
-	wxASSERT(b != NULL);
+	wxCHECK_RET(b != NULL, wxT("Destination buffer missing."));
 
 	RawPokeUInt32(b,      wxUINT32_SWAP_ON_LE(m_data[0]));
 	RawPokeUInt32(b + 4,  wxUINT32_SWAP_ON_LE(m_data[1]));
@@ -122,9 +115,9 @@
 	RawPokeUInt32(b + 12, wxUINT32_SWAP_ON_LE(m_data[3]));
 }
 
-void CUInt128::StoreCryptValue(uint8_t *buf) const throw()
+void CUInt128::StoreCryptValue(uint8_t *buf) const
 {
-	wxASSERT(buf != NULL);
+	wxCHECK_RET(buf != NULL, wxT("Destination buffer missing."));
 
 	RawPokeUInt32(buf,      wxUINT32_SWAP_ON_BE(m_data[0]));
 	RawPokeUInt32(buf + 4,  wxUINT32_SWAP_ON_BE(m_data[1]));

aMule-2.2.6.tar.bz2/src/kademlia/utils/UInt128.h -> aMule-2.3.1.tar.bz2/src/kademlia/utils/UInt128.h Changed

@@ -1,10 +1,10 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 Dévai Tamás (GonoszTopi) ( gonosztopi@amule.org )
-// Copyright (c) 2004-2009 Angel Vidal (Kry) ( kry@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2003 Barry Dunne (http://www.emule-project.net)
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Barry Dunne (http://www.emule-project.net)
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -73,7 +73,7 @@
 	 * Generates a new number, copying the most significant 'numBits' bits from 'value'.
 	 * The remaining bits are randomly generated.
 	 */
-	CUInt128(const CUInt128& value, uint32_t numBits) throw();
+	CUInt128(const CUInt128& value, uint32_t numBits);
 
 	/** Bit at level 0 being most significant. */
 	unsigned GetBitNumber(unsigned bit) const throw()
@@ -86,18 +86,16 @@
 
 	wxString ToHexString() const;
 	wxString ToBinaryString(bool trim = false) const;
-	void ToByteArray(uint8_t *b) const throw();
+	void ToByteArray(uint8_t *b) const;
 
 	uint32_t Get32BitChunk(unsigned val) const throw()
 	{
-		wxASSERT(val < 4);
-
-		return m_data[val];
+		return val < 4 ? m_data[val] : 0;
 	}
 
-	void Set32BitChunk(unsigned chunk, uint32_t value) throw()
+	void Set32BitChunk(unsigned chunk, uint32_t value)
 	{
-		wxASSERT(chunk < 4);
+		wxCHECK2(chunk < 4, return);
 
 		m_data[chunk] = value;
 	}
@@ -120,8 +118,6 @@
 
 	CUInt128& SetValueBE(const uint8_t *valueBE) throw();
 
-	CUInt128& SetValueRandom();
-
 	/**
 	 * Stores value used by the crypt functions.
 	 *
@@ -131,12 +127,12 @@
 	 * @param buf Buffer to hold the value. Must be large enough to hold the data (16 bytes at least),
 	 *	and must not be NULL.
 	 */
-	void StoreCryptValue(uint8_t *buf) const throw();
+	void StoreCryptValue(uint8_t *buf) const;
 
 	/** Bit at level 0 being most significant. */
-	CUInt128& SetBitNumber(unsigned bit, unsigned value) throw()
+	CUInt128& SetBitNumber(unsigned bit, unsigned value)
 	{
-		wxASSERT(bit <= 127);
+		wxCHECK(bit <= 127, *this);
 
 		if (value)
 			m_data[bit / 32] |= 1 << (31 - (bit % 32));

aMule-2.2.6.tar.bz2/src/libs/Makefile.am -> aMule-2.3.1.tar.bz2/src/libs/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/libs/Makefile.in -> aMule-2.3.1.tar.bz2/src/libs/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,6 +33,8 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@COMPILE_LIB_COMMON_TRUE@am__append_1 = common
+@COMPILE_LIB_EC_TRUE@am__append_2 = ec
 subdir = src/libs
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -45,11 +45,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -59,37 +61,66 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
+DIST_SUBDIRS = common ec
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -104,17 +135,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -126,44 +151,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -185,13 +210,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -199,44 +221,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -245,7 +263,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -253,25 +270,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -283,30 +294,41 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = ec common
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = $(am__append_1) $(am__append_2)
 MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 
@@ -315,14 +337,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/libs/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/libs/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/libs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -340,7 +362,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -349,7 +371,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -366,16 +388,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -401,16 +422,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -418,14 +439,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -437,81 +458,101 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -541,6 +582,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -560,18 +602,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -590,21 +652,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.2.6.tar.bz2/src/libs/common/FileFunctions.cpp -> aMule-2.3.1.tar.bz2/src/libs/common/FileFunctions.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -93,18 +93,22 @@
 EFileType GuessFiletype(const wxString& file)
 {
 	wxFile archive(file, wxFile::read);
-	char head[10] = {0};
+	if (!archive.IsOpened()) {
+		return EFT_Error;
+	}
+	static const uint8 UTF8bom[3] = {0xEF, 0xBB, 0xBF};
+	uint8 head[10] = {0, 0};
 	int read = archive.Read(head, std::min<off_t>(10, archive.Length()));
 
-	if (read == wxInvalidOffset) {
+	if (read == wxInvalidOffset || read == 0) {
 		return EFT_Unknown;
 	} else if ((head[0] == 'P') && (head[1] == 'K')) {
 		// Zip-archives have a header of "PK".
 		return EFT_Zip;
-	} else if (head[0] == '\x1F' && head[1] == '\x8B') {
+	} else if (head[0] == 0x1F && head[1] == 0x8B) {
 		// Gzip-archives have a header of 0x1F8B
 		return EFT_GZip;
-	} else if (head[0] == '\xE0' || head[0] == '\x0E') {
+	} else if (head[0] == 0xE0 || head[0] == 0x0E) {
 		// MET files have either of these headers
 		return EFT_Met;
 	}
@@ -112,7 +116,9 @@
 	// Check at most the first ten chars, if all are printable, 
 	// then we can probably assume it is ascii text-file.
 	for (int i = 0; i < read; ++i) {
-		if (!isprint(head[i]) && !isspace(head[i])) {
+		if (!(		isprint(head[i]) 
+				||	isspace(head[i])
+				||	(i < 3 && head[i] == UTF8bom[i]))) {
 			return EFT_Unknown;
 		}
 	}
@@ -130,7 +136,7 @@
 	wxZipFSHandler archive; 
 	wxString filename = archive.FindFirst(
 		wxT("file:") + file + wxT("#zip:/*"), wxFILE);
-
+	
 	wxTempFile target(file);
 
 	while (!filename.IsEmpty() && !target.Length()) {
@@ -152,15 +158,16 @@
 						while (!zip.Eof()) {
 							zip.Read(buffer, sizeof(buffer));
 							target.Write(buffer, zip.LastRead());
-						}
+						}						
 						break;
 					}
 				}
 			}
 		}
+
 		filename = archive.FindNext();
 	}
-
+	
 	if (target.Length()) {
 		target.Commit();
 		return true;
@@ -181,7 +188,7 @@
 	bool write = false;
 
 #ifdef __WXMAC__
-	// AddDebugLogLineM( false, logFileIO, wxT("Reading gzip stream") );
+	// AddDebugLogLineN( logFileIO, wxT("Reading gzip stream") );
 
 	gzFile inputFile = gzopen(filename2char(file), "rb");
 	if (inputFile != NULL) {
@@ -189,7 +196,7 @@
 
 		while (int bytesRead = gzread(inputFile, buffer, sizeof(buffer))) {
 			if (bytesRead > 0) {
-				// AddDebugLogLineM( false, logFileIO, wxString::Format(wxT("Read %u bytes"), bytesRead) );
+				// AddDebugLogLineN(logFileIO, CFormat(wxT("Read %u bytes")) % bytesRead);
 				target.Write(buffer, bytesRead);
 			} else if (bytesRead < 0) {
 				wxString errString;
@@ -201,20 +208,20 @@
 					errString = wxString::FromAscii(gzerrstr);
 				}
 				
-				// AddDebugLogLineM( false, logFileIO, wxT("Error reading gzip stream (") + errString + wxT(")") );
+				// AddDebugLogLineN( logFileIO, wxT("Error reading gzip stream (") + errString + wxT(")") );
 				write = false;
 				break;
 			}
 		}
 
-		// AddDebugLogLineM( false, logFileIO, wxT("End reading gzip stream") );
+		// AddDebugLogLineN( logFileIO, wxT("End reading gzip stream") );
 		gzclose(inputFile);
 	} else {
-		// AddDebugLogLineM( false, logFileIO, wxT("Error opening gzip file (") + wxString(wxSysErrorMsg()) + wxT(")") );
+		// AddDebugLogLineN( logFileIO, wxT("Error opening gzip file (") + wxString(wxSysErrorMsg()) + wxT(")") );
 	}
 #else
 	{
-		// AddDebugLogLineM( false, logFileIO, wxT("Reading gzip stream") );
+		// AddDebugLogLineN( logFileIO, wxT("Reading gzip stream") );
 
 		wxFileInputStream source(file);
 		wxZlibInputStream inputStream(source);
@@ -222,7 +229,7 @@
 		while (!inputStream.Eof()) {
 			inputStream.Read(buffer, sizeof(buffer));
 
-			// AddDebugLogLineM( false, logFileIO, wxString::Format(wxT("Read %u bytes"),inputStream.LastRead()) );
+			// AddDebugLogLineN(logFileIO, CFormat(wxT("Read %u bytes")) % inputStream.LastRead());
 			if (inputStream.LastRead()) {
 				target.Write(buffer, inputStream.LastRead());
 			} else {
@@ -230,7 +237,7 @@
 			}
 		};
 
-		// AddDebugLogLineM( false, logFileIO, wxT("End reading gzip stream") );
+		// AddDebugLogLineN( logFileIO, wxT("End reading gzip stream") );
 
 		write = inputStream.IsOk() || inputStream.Eof();
 	}
@@ -238,7 +245,7 @@
 
 	if (write) {
 		target.Commit();
-		// AddDebugLogLineM( false, logFileIO, wxT("Commited gzip stream") );
+		// AddDebugLogLineN( logFileIO, wxT("Commited gzip stream") );
 	}
 
 	return write;
@@ -257,7 +264,7 @@
 				// Unpack nested archives if needed.
 				return UnpackResult(true, UnpackArchive(path, files).second);
 			} else {
-				return UnpackResult(false, EFT_Zip);
+				return UnpackResult(false, EFT_Error);
 			}
 
 		case EFT_GZip:
@@ -265,7 +272,7 @@
 				// Unpack nested archives if needed.
 				return UnpackResult(true, UnpackArchive(path, files).second);
 			} else {
-				return UnpackResult(false, EFT_GZip);
+				return UnpackResult(false, EFT_Error);
 			}
 
 		default:

aMule-2.2.6.tar.bz2/src/libs/common/FileFunctions.h -> aMule-2.3.1.tar.bz2/src/libs/common/FileFunctions.h Changed

aMule-2.2.6.tar.bz2/src/libs/common/Format.cpp -> aMule-2.3.1.tar.bz2/src/libs/common/Format.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (C) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-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
@@ -28,58 +28,19 @@
 #	include "config.h"
 #endif
 
-#include <ctype.h>
-
 #if defined HAVE_STDINT_H
-#       include <stdint.h>
+#	include <stdint.h>
 #elif defined HAVE_INTTYPES_H
 #	include <inttypes.h>
 #endif
 
+#include <wx/intl.h>			// Needed for _()
 
-//! Known type-modifiers. 
-enum Modifiers
-{
-	//! No modifier field.
-	modNone,
-	//! Argument is interpreted as short int (integer types).
-	modShort,
-	//! Argument is interpreted as long int (integer types).
-	modLong,
-	//! Two 'long' modifieres, arguments is interpreted as long long (integer types).
-	modLongLong,
-	//! Argument is interpreted as long double (floating point types). Not supported.
-	modLongDouble
-};
-
-
-/**
- * Extracts modifiers from the argument.
- *
- * Note that this function will possibly return wrong results
- * for malformed format strings.
- */
-Modifiers getModifier(const wxString& str)
-{
-	switch ( (wxChar)str[str.Len() - 2]) {
-		case wxT('h'):		// short int (integer types).
-			return modShort;
-		case wxT('l'):		// long int (interger types) or double (floating point types).
-			if ( str.Len() > 3 && str.GetChar( str.Len() - 3 ) == wxT('l') ) {
-				return modLongLong;
-			} else {
-				return modLong;
-			}
-		case wxT('L'):		// long double (floating point types).
-			return modLongDouble;
-		default:
-			return modNone;
-	}
-}
-
+#include <errno.h>			// Needed for errno and EINVAL
+#include "strerror_r.h"			// Needed for mule_strerror_r()
 
 /** Returns true if the char is a format-type. */
-bool isTypeChar(wxChar c)
+inline bool isTypeChar(wxChar c)
 {
 	switch (c) {
 		case wxT('s'):		// String of characters
@@ -95,9 +56,15 @@
 		case wxT('e'):		// Scientific notation (mantise/exponent) using e character
 		case wxT('E'):		// Scientific notation (mantise/exponent) using E character
 		case wxT('g'):		// Use shorter %e or %f
-		case wxT('G'):		// Use shorter %E or %f
-		case wxT('p'):		// Not supported, still needs to be caught though
+		case wxT('G'):		// Use shorter %E or %F
+		case wxT('p'):		// Pointer
 		case wxT('n'):		// Not supported, still needs to be caught though
+		case wxT('a'):		// (C99; not in SUSv2) Double in hexadecimal notation.
+		case wxT('A'):		// (C99; not in SUSv2) Double in hexadecimal notation (capital letters).
+		case wxT('C'):		// (Not in C99, but in SUSv2.)  Synonym for lc.  Don't use. Not supported.
+		case wxT('S'):		// (Not in C99, but in SUSv2.)  Synonym for ls.  Don't use. Not supported.
+		case wxT('m'):		// (Glibc extension.)  Print output of strerror(errno).  No argument is required.
+//		case wxT('%'):		// A `%' is written.  No argument is converted.  The complete conversion specification is `%%'.
 			return true;
 	}
 
@@ -105,29 +72,27 @@
 }
 
 /** Returns true if the char is a valid flag. */
-bool isFlagChar(wxChar c)
+inline bool isFlagChar(wxChar c)
 {
 	switch (c) {
+		// C standard flags
 		case wxT('+'):		// Include sign for integers
 		case wxT('-'):		// Left-align output
 		case wxT('#'):		// Alternate form, varies
 		case wxT(' '):		// Pad with spaces
 		case wxT('0'):		// Pad with zeros
+		// SUSv2
+		case wxT('\''):		// For decimal conversion (i, d, u, f, F, g, G) the output is to be grouped with thousands' grouping characters if the locale information indicates any.
+		// glibc 2.2
+		case wxT('I'):		// For decimal integer conversion (i, d, u) the output uses the locale's alternative output digits, if any.
 			return true;
 	}
 
 	return false;
 }
 
-/** Returns true if the char is an integer (for width + precision). */
-bool isIntChar(wxChar c)
-{
-	return ((c >= wxT('0')) && (c <= wxT('9')));
-}
-
-
 /** Returns true if the char is a valid length modifier. */
-bool isLengthChar(wxChar c)
+inline bool isLengthChar(wxChar c)
 {
 	switch (c) {
 		case wxT('h'):		// Short ('hh') and char ('h')
@@ -136,318 +101,483 @@
 		case wxT('z'):		// size_t
 		case wxT('j'):		// intmax_t
 		case wxT('t'):		// ptrdiff_t
+		case wxT('q'):		// quad. Synonym for 'll'. Don't use.
 			return true;
 	}
 
-	// Catches widths, precisons and zero-padding
-	return (c >= wxT('0')) && (c <= wxT('9'));
+	return false;
 }
 
-
-CFormat::CFormat(const wxChar* str)
+/** Returns true if the argument is a valid length modifier */
+inline bool isValidLength(const wxString& str)
 {
-	m_fieldStart = 0;
-	m_fieldLength = 0;
-	m_skipCount = 0;
-	m_format = str;
-
-	if (m_format.Length()) {
-		SetCurrentField(wxEmptyString);
-	}
+	return ((str == wxT("hh")) || (str == wxT("h")) ||
+		(str == wxT("l")) || (str == wxT("ll")) ||
+		(str == wxT("L")) || (str == wxT("z")) ||
+		(str == wxT("j")) || (str == wxT("t")) ||
+		(str == wxT("q")));
 }
 
 
-bool CFormat::IsReady() const
-{
-	return (m_fieldStart == m_format.Length());
-}
+enum eStringParserStates {
+	esNonFormat = 0,	// Not in a format string
+	esFormatStart,		// Start of a format string
+	esFormat,		// Inside a format string
+	esFormatEnd,		// Finished reading a format string
+	esInvalidFormat		// Invalid (incomplete) format specifier
+};
 
+/**
+ * State machine to extract format specifiers from the string
+ *
+ * All format strings will be extracted, regardless whether they are valid or
+ * not. Also '%%' is considered to be special format string which requires no
+ * arguments, thus it will be extracted too (that is because it has to be
+ * converted to '%').
+ */
+static eStringParserStates stringParser[][3] = {
+			/* %-sign, 		type-char, 	other */
+/* esNonFormat */	{ esFormatStart,	esNonFormat,	esNonFormat	},
+/* esFormatStart */	{ esFormatEnd,		esFormatEnd,	esFormat	},
+/* esFormat */		{ esInvalidFormat,	esFormatEnd,	esFormat	},
+/* esFormatEnd */	{ esFormatStart,	esNonFormat,	esNonFormat	},
+/* esInvalidFormat */	{ esFormatEnd,		esFormatEnd,	esFormat	}
+};
 
-wxString CFormat::GetString() const
-{
-	if (IsReady()) {
-		return m_result;
-	} else {
-		wxFAIL_MSG(wxT("Called GetString() before all values were passed: ") + m_format);
+enum eFormatParserStates {
+	efStart = 0,	// Format string start
+	efArgIndex,	// Argument index
+	efArgIndexEnd,	// End of the argument index ('$' sign)
+	efFlagChar,	// Flag character
+	efWidth,	// Width field
+	efPrecStart,	// Precision field start ('.' character)
+	efPrecision,	// Precision field
+	efLength,	// Length field
+	// The following two are terminal states, they terminate processing
+	efType,		// Type character
+	efError		// Invalid format specifier
+};
 
-		// Return as much as possible ...
-		return m_result + m_format.Mid(m_fieldStart);
-	}
-}
+/**
+ * State machine to parse format specifiers
+ *
+ * Format specifiers are expected to follow the following structure:
+ * 	%[argIndex$][Flags][Width][.Precision][Length]<Type>
+ */
+static eFormatParserStates formatParser[][7] = {
+			/* [1-9],	'0',		flagChar,	'.',		lengthChar,	typeChar,	'$' */
+/* efStart */		{ efArgIndex,	efFlagChar,	efFlagChar,	efPrecStart,	efLength,	efType,		efError, },
+/* efArgIndex */	{ efArgIndex,	efArgIndex,	efError,	efPrecStart,	efLength,	efType,		efArgIndexEnd, },
+/* efArgIndexEnd */	{ efWidth,	efFlagChar,	efFlagChar,	efPrecStart,	efLength,	efType,		efError, },
+/* efFlagChar */	{ efWidth,	efError,	efError,	efPrecStart,	efLength,	efType,		efError, },
+/* efWidth */		{ efWidth,	efWidth,	efError,	efPrecStart,	efLength,	efType,		efError, },
+/* efPrecStart */	{ efPrecision,	efPrecision,	efError,	efError,	efLength,	efType,		efError, },
+/* efPrecision */	{ efPrecision,	efPrecision,	efError,	efError,	efLength,	efType,		efError, },
+/* efLength */		{ efError,	efError,	efError,	efError,	efLength,	efType,		efError, }
+};
 
+// Forward-declare the specialization for const wxString&, needed by the parser
+template<> void CFormat::ProcessArgument(FormatList::iterator, const wxString&);
 
-void CFormat::SetCurrentField(const wxString& value)
+void CFormat::Init(const wxString& str)
 {
-	wxCHECK_RET(m_fieldStart < m_format.Length(),
-		wxT("Setting field in already completed string: ") + m_format);
-
-	if (value.Length()) {
-		m_result += value;
-	}
-
-	enum {
-		PosNone = 0,
-		PosStart,
-		PosFlags,
-		PosWidth,
-		PosPrecision,
-		PosLength,
-		PosEnd
-	} pos = PosNone;
-
-	// Format strings are expected to follow the folllowing structure:
-	// 	%[Flags][Width][.Precision][Length]<Type>
-	for (size_t i = m_fieldStart + m_fieldLength; i < m_format.Length(); ++i) {
-		const wxChar c = m_format[i];
-
-		if (pos >= PosStart) {
-			m_fieldLength++;
-
-			if ((pos <= PosFlags) && isFlagChar(c)) {
-				pos = PosFlags;
-			} else if ((pos <= PosWidth) && isIntChar(c)) {
-				pos = PosWidth;
-			} else if ((pos < PosPrecision) && (c == wxT('.'))) {
-				pos = PosPrecision;
-			} else if ((pos == PosPrecision) && isIntChar(c)) {
-				// Nothing to do ...
-			} else if ((pos < PosLength) && isLengthChar(c)) {
-				pos = PosLength;
-			} else if ((pos == PosLength) && isLengthChar(c) && (c == m_format[i - 1])) {
-				// Nothing to do ...
-			} else if ((pos <= PosLength) && isTypeChar(c)) {
-				pos = PosEnd;
-				break;
-			} else if ((pos <= PosLength) && (c == wxT('%'))) {
-				// Append the %*% to the result
-				m_result += wxT("%");
-				
-				pos = PosNone;
+	m_formatString = str;
+	m_argIndex = 0;
+
+	// Extract format-string-like substrings from the input
+	{
+		size_t formatStart = 0;
+		eStringParserStates state = esNonFormat;
+		for (size_t pos = 0; pos < str.length(); ++pos) {
+			if (str[pos] == wxT('%')) {
+				state = stringParser[state][0];
+			} else if (isTypeChar(str[pos])) {
+				state = stringParser[state][1];
 			} else {
-				// Field is broken ...
-				break;
+				state = stringParser[state][2];
 			}
-		} else if (c == wxT('%')) {
-			const size_t offset = m_fieldStart + m_fieldLength;
-			// If there was anything before this, then prepend it.
-			if (offset < i) {
-				m_result += m_format.Mid(offset, i - offset);
+			switch (state) {
+				case esInvalidFormat:
+					wxFAIL_MSG(wxT("Invalid format specifier: ") + str.Mid(formatStart, pos - formatStart + 1));
+				case esFormatStart:
+					formatStart = pos;
+					break;
+				case esFormatEnd:
+					{
+						FormatSpecifier fs;
+						fs.startPos = formatStart;
+						fs.endPos = pos;
+						fs.result = str.Mid(formatStart, pos - formatStart + 1);
+						m_formats.push_back(fs);
+					}
+				default:
+					break;
 			}
-
-			// Starting a new format string
-			pos = PosStart;
-			m_fieldStart = i;
-			m_fieldLength = 1;
-		} else {
-			// Normal text, nothing to do ...
 		}
+		wxASSERT_MSG((state == esFormatEnd) || (state == esNonFormat), wxT("Incomplete format specifier: ") + str.Mid(formatStart));
 	}
 
-	if (pos == PosNone) {
-		// No fields left
-		m_result += m_format.Mid(m_fieldStart + m_fieldLength);
-		
-		m_fieldStart = m_fieldLength = m_format.Length();
-	} else if (pos != PosEnd) {
-		// A partial field was found ...
-		wxFAIL_MSG(wxT("Invalid field in format string: ") + m_format);
-		wxASSERT_MSG(m_fieldStart + m_fieldLength <= m_format.Length(),
-			wxT("Invalid field-start/length in format string: ") + m_format);
-
-		// Prepend the parsed part of the format-string
-		m_result += m_format.Mid(m_fieldStart, m_fieldLength);
-
-		// Return an empty string the next time GetCurrentField is called
-		m_skipCount++;
-
-		// Anything left to do?
-		if (!IsReady()) {
-			// Find the next format string
-			SetCurrentField(wxEmptyString);
+	// Parse the extracted format specifiers, removing invalid ones
+	unsigned formatCount = 0;
+	for (FormatList::iterator it = m_formats.begin(); it != m_formats.end();) {
+		if (it->result == wxT("%%")) {
+			it->argIndex = 0;
+			it->result = wxT("%");
+			++it;
+		} else {
+			it->argIndex = ++formatCount;
+			it->flag = '\0';
+			it->width = 0;
+			it->precision = -1;
+			it->type = '\0';
+			unsigned num = 0;
+			wxString lengthModifier;
+			bool isPrecision = false;
+			eFormatParserStates state = efStart;
+			for (size_t pos = 1; pos < it->result.length(); ++pos) {
+				wxChar c = it->result[pos];
+				if ((c >= wxT('1')) && (c <= wxT('9'))) {
+					state = formatParser[state][0];
+				} else if (c == wxT('0')) {
+					state = formatParser[state][1];
+				} else if (isFlagChar(c)) {
+					state = formatParser[state][2];
+				} else if (c == wxT('.')) {
+					state = formatParser[state][3];
+				} else if (isLengthChar(c)) {
+					state = formatParser[state][4];
+				} else if (isTypeChar(c)) {
+					state = formatParser[state][5];
+				} else if (c == wxT('$')) {
+					state = formatParser[state][6];
+				} else {
+					state = efError;
+				}
+				if ((c >= wxT('0')) && (c <= wxT('9'))) {
+					num *= 10;
+					num += (c - wxT('0'));
+				}
+				switch (state) {
+					case efArgIndexEnd:
+						it->argIndex = num;
+						num = 0;
+						break;
+					case efFlagChar:
+						it->flag = c;
+						break;
+					case efPrecStart:
+						it->width = num;
+						num = 0;
+						isPrecision = true;
+						break;
+					case efLength:
+						if (isPrecision) {
+							it->precision = num;
+						} else if (num > 0) {
+							it->width = num;
+						}
+						num = 0;
+						lengthModifier += c;
+						if (!isValidLength(lengthModifier)) {
+							state = efError;
+						}
+						break;
+					case efType:
+						if (isPrecision) {
+							it->precision = num;
+						} else if (num > 0) {
+							it->width = num;
+						}
+						if (c == wxT('m')) {
+							it->argIndex = 0;
+							it->type = wxT('s');
+							int errnum = errno;
+#if defined(HAVE_STRERROR) || defined(HAVE_STRERROR_R)
+							unsigned buflen = 256;
+							bool done = false;
+							do {
+								errno = 0;
+								char* buf = new char[buflen];
+								*buf = '\0';
+								int result = mule_strerror_r(errnum, buf, buflen);
+								if ((result == 0) || (buflen > 1024)) {
+									ProcessArgument<const wxString&>(it, wxString(buf, wxConvLocal));
+								} else if (errno == EINVAL) {
+									if (*buf == '\0') {
+										ProcessArgument<const wxString&>(it, wxString::Format(_("Unknown error %d"), errnum));
+									} else {
+										ProcessArgument<const wxString&>(it, wxString(buf, wxConvLocal));
+									}
+								} else if (errno != ERANGE) {
+									ProcessArgument<const wxString&>(it, wxString::Format(_("Unable to get error description for error %d"), errnum));
+								} else {
+									buflen <<= 1;
+								}
+								delete [] buf;
+								done = ((result == 0) || (errno != ERANGE));
+							} while (!done);
+#else
+							wxFAIL_MSG(wxString::Format(wxT("Unable to get error description for error %d."), errnum));
+							ProcessArgument<const wxString&>(it, wxString::Format(_("Unable to get error description for error %d"), errnum));
+#endif
+						} else {
+							it->type = c;
+						}
+					default:
+						break;
+				}
+				wxCHECK2_MSG(state != efError, break, wxT("Invalid format specifier: ") + it->result);
+				if (state == efType) {
+					// Needed by the '%m' conversion, which takes place immediately,
+					// overwriting it->result
+					break;
+				}
+			}
+			if (state == efError) {
+				it = m_formats.erase(it);
+				--formatCount;
+			} else {
+				++it;
+			}
 		}
 	}
 }
 
-
-wxString CFormat::GetCurrentField()
+wxString CFormat::GetString() const
 {
-	wxCHECK_MSG(m_fieldStart < m_format.Length(), wxEmptyString,
-		wxT("Passing argument to already completed string: ") + m_format);
-	wxASSERT_MSG(m_fieldStart + m_fieldLength <= m_format.Length(),
-		wxT("Invalid field-start/length in format string: ") + m_format);
-
-	if (m_skipCount) {
-		// The current field was invalid, so we skip it.
-		m_skipCount--;
-
-		return wxEmptyString;
+	wxString result;
+	FormatList::const_iterator it = m_formats.begin();
+	if (it == m_formats.end()) {
+		result = m_formatString;
+	} else {
+		unsigned lastEnd = 0;
+		for (; it != m_formats.end(); ++it) {
+			result += m_formatString.Mid(lastEnd, it->startPos - lastEnd);
+			result += it->result;
+			lastEnd = it->endPos + 1;
+		}
+		result += m_formatString.Mid(lastEnd);
 	}
-
-	return m_format.Mid(m_fieldStart, m_fieldLength);
+	return result;
 }
 
-
-wxString CFormat::GetIntegerField(const wxChar* fieldType)
+wxString CFormat::GetModifiers(FormatList::const_iterator it) const
 {
-	const wxString field = GetCurrentField();
-	if (field.IsEmpty()) {
-		// Invalid or missing field ...
-		return field;
+	wxString result = wxT("%");
+	if (it->flag != wxT('\0')) {
+		result += it->flag;
 	}
-
-	// Drop type and length
-	wxString newField = field;
-	while (isalpha(newField.Last())) {
-		newField.RemoveLast();
+	if (it->width > 0) {
+		result += wxString::Format(wxT("%u"), it->width);
 	}
-	
-	// Set the correct integer type
-	newField += fieldType;
-
-	switch ((wxChar)field.Last()) {
-		case wxT('o'):		// Unsigned octal
-		case wxT('x'):		// Unsigned hexadecimal integer
-		case wxT('X'):		// Unsigned hexadecimal integer (capital letters)
-			// Override the default type
-			newField.Last() = field.Last();
-		
-		case wxT('d'):		// Signed decimal integer
-		case wxT('i'):		// Signed decimal integer
-		case wxT('u'):		// Unsigned decimal integer
-			return newField;
-		
-		default:
-			wxFAIL_MSG(wxT("Integer value passed to non-integer format string: ") + m_format);
-			SetCurrentField(field);
-			return wxEmptyString;
+	if (it->precision >= 0) {
+		result += wxString::Format(wxT(".%u"), it->precision);
 	}
+	return result;
 }
 
+// Forward-declare the specialization for unsigned long long
+template<> void CFormat::ProcessArgument(FormatList::iterator, unsigned long long);
 
-CFormat& CFormat::operator%(double value)
+// Processing a double-precision floating-point argument
+template<>
+void CFormat::ProcessArgument(FormatList::iterator it, double value)
 {
-	wxString field = GetCurrentField();
-	if (field.IsEmpty()) {
-		return *this;
-	}
-
-	switch ( (wxChar)field.Last() ) {
-		case wxT('e'):		// Scientific notation (mantise/exponent) using e character
-		case wxT('E'):		// Scientific notation (mantise/exponent) using E character
-		case wxT('f'):		// Decimal floating point
-		case wxT('F'):		// Decimal floating point
-		case wxT('g'):		// Use shorter %e or %f
-		case wxT('G'):		// Use shorter %E or %f
-			wxASSERT_MSG(getModifier(field) == modNone, wxT("Invalid modifier specified for floating-point format: ") + m_format);
-			
-			SetCurrentField(wxString::Format(field, value));
+	switch (it->type) {
+		case wxT('a'):
+		case wxT('A'):
+		case wxT('e'):
+		case wxT('E'):
+		case wxT('f'):
+		case wxT('F'):
+		case wxT('g'):
+		case wxT('G'):
+			break;
+		case wxT('s'):
+			it->type = wxT('g');
 			break;
-		
 		default:
-			wxFAIL_MSG(wxT("Floating-point value passed to non-float format string: ") + m_format);
-			SetCurrentField(field);
+			wxFAIL_MSG(wxT("Floating-point value passed for non-floating-point format field: ") + it->result);
+			return;
 	}
-
-	return *this;
+	it->result = wxString::Format(GetModifiers(it) + it->type, value);
 }
 
-
-CFormat& CFormat::operator%(wxChar value)
+// Processing a wxChar argument
+template<>
+void CFormat::ProcessArgument(FormatList::iterator it, wxChar value)
 {
-	wxString field = GetCurrentField();
-	
-	if (field.IsEmpty()) {
-		// We've already asserted in GetCurrentField.
-	} else if (field.Last() != wxT('c')) {
-		wxFAIL_MSG(wxT("Char value passed to non-char format string: ") + m_format);
-		SetCurrentField(field);
-	} else {
-		SetCurrentField(wxString::Format(field, value));
+	switch (it->type) {
+		case wxT('c'):
+			break;
+		case wxT('s'):
+			it->type = wxT('c');
+			break;
+		case wxT('u'):
+		case wxT('d'):
+		case wxT('i'):
+		case wxT('o'):
+		case wxT('x'):
+		case wxT('X'):
+			ProcessArgument(it, (unsigned long long)value);
+			return;
+		case wxT('a'):
+		case wxT('A'):
+		case wxT('e'):
+		case wxT('E'):
+		case wxT('f'):
+		case wxT('F'):
+		case wxT('g'):
+		case wxT('G'):
+			ProcessArgument(it, (double)value);
+			return;
+		default:
+			wxFAIL_MSG(wxT("Character value passed to non-character format field: ") + it->result);
+			return;
 	}
-
-	return *this;
+	it->result = wxString::Format(GetModifiers(it) + it->type, value);
 }
 
-
-CFormat& CFormat::operator%(signed long long value)
+// Processing a signed long long argument
+template<>
+void CFormat::ProcessArgument(FormatList::iterator it, signed long long value)
 {
-	wxString field = GetIntegerField(wxLongLongFmtSpec  wxT("i"));
-	if (!field.IsEmpty()) {
-		SetCurrentField(wxString::Format(field, value));
+	switch (it->type) {
+		case wxT('c'):
+			ProcessArgument(it, (wxChar)value);
+			return;
+		case wxT('i'):
+			break;
+		case wxT('o'):
+		case wxT('x'):
+		case wxT('X'):
+			ProcessArgument(it, (unsigned long long)value);
+			return;
+		case wxT('u'):
+		case wxT('d'):
+		case wxT('s'):
+			it->type = wxT('i');
+			break;
+		case wxT('a'):
+		case wxT('A'):
+		case wxT('e'):
+		case wxT('E'):
+		case wxT('f'):
+		case wxT('F'):
+		case wxT('g'):
+		case wxT('G'):
+			ProcessArgument(it, (double)value);
+			return;
+		default:
+			wxFAIL_MSG(wxT("Integer value passed for non-integer format field: ") + it->result);
+			return;
 	}
-
-	return *this;
+	it->result = wxString::Format(GetModifiers(it) + WXLONGLONGFMTSPEC + it->type, value);
 }
 
-
-CFormat& CFormat::operator%(unsigned long long value)
+// Processing an unsigned long long argument
+template<>
+void CFormat::ProcessArgument(FormatList::iterator it, unsigned long long value)
 {
-	wxString field = GetIntegerField(wxLongLongFmtSpec  wxT("u"));
-	if (!field.IsEmpty()) {
-		SetCurrentField(wxString::Format(field, value));
+	switch (it->type) {
+		case wxT('c'):
+			ProcessArgument(it, (wxChar)value);
+			return;
+		case wxT('u'):
+		case wxT('o'):
+		case wxT('x'):
+		case wxT('X'):
+			break;
+		case wxT('i'):
+		case wxT('d'):
+		case wxT('s'):
+			it->type = wxT('u');
+			break;
+		case wxT('a'):
+		case wxT('A'):
+		case wxT('e'):
+		case wxT('E'):
+		case wxT('f'):
+		case wxT('F'):
+		case wxT('g'):
+		case wxT('G'):
+			ProcessArgument(it, (double)value);
+			return;
+		default:
+			wxFAIL_MSG(wxT("Integer value passed for non-integer format field: ") + it->result);
+			return;
 	}
-
-	return *this;
+	it->result = wxString::Format(GetModifiers(it) + WXLONGLONGFMTSPEC + it->type, value);
 }
 
-
-CFormat& CFormat::operator%(const wxString& val)
+// Processing a wxString argument
+template<>
+void CFormat::ProcessArgument(FormatList::iterator it, const wxString& value)
 {
-	wxString field = GetCurrentField();
-	
-	if (field.IsEmpty()) {
-		// We've already asserted in GetCurrentField
-	} else if (field.Last() != wxT('s')) {
-		wxFAIL_MSG(wxT("String value passed to non-string format string:") + m_format);
-		SetCurrentField(field);
-	} else if (field.GetChar(1) == wxT('.')) {
-		// A max-length is specified
-		wxString size = field.Mid( 2, field.Len() - 3 );
-		long lSize = 0;
-
-		// Try to convert the length-field.
-		if ((size.IsEmpty() || size.ToLong(&lSize)) && (lSize >= 0)) {
-			SetCurrentField(val.Left(lSize));
+	if (it->type != wxT('s')) {
+		wxFAIL_MSG(wxT("String value passed for non-string format field: ") + it->result);
+	} else {
+		if (it->precision >= 0) {
+			it->result = value.Left(it->precision);
 		} else {
-			wxFAIL_MSG(wxT("Invalid value found in 'precision' field: ") + m_format);
-			SetCurrentField(field);
+			it->result = value;
+		}
+		if ((it->width > 0) && (it->result.length() < it->width)) {
+			if (it->flag == wxT('-')) {
+				it->result += wxString(it->width - it->result.length(), wxT(' '));
+			} else {
+				it->result = wxString(it->width -it->result.length(), wxT(' ')) + it->result;
+			}
 		}
-	} else if (field.GetChar(1) == wxT('s')) {
-		// No limit on size, just set the string
-		SetCurrentField(val);
-	} else {
-		SetCurrentField(field);
-		wxFAIL_MSG(wxT("Malformed string format field: ") + m_format);
 	}
-
-	return *this;
 }
 
-CFormat& CFormat::operator%(void * value)
+// Processing pointer arguments
+template<>
+void CFormat::ProcessArgument(FormatList::iterator it, void * value)
 {
-	wxString field = GetCurrentField();
-	
-	if (field.IsEmpty()) {
-		// We've already asserted in GetCurrentField.
-	} else if (field.Last() != wxT('p')) {
-		wxFAIL_MSG(wxT("Pointer value passed to non-pointer format string: ") + m_format);
-		SetCurrentField(field);
-	} else if (field != wxT("%p")) {
-		wxFAIL_MSG(wxT("Modifiers are not allowed for pointer format string: ") + m_format);
-		SetCurrentField(field);
-	} else {
-		// built-in Format for pointer is not optimal:
+	if ((it->type == wxT('p')) || (it->type == wxT('s'))) {
+		// Modifiers (if any) are ignored for pointer conversions
+		// built-in Format for pointer is not consistent:
 		// - Windows: uppercase, no leading 0x
-		// - Linux:   leading zeros missing 
+		// - Linux:   leading zeros missing
 		// -> format it as hex
-		if (sizeof (void *) == 8) { // 64 bit
-			SetCurrentField(wxString::Format(wxT("0x%016x"), (uintptr_t) value));
-		} else { // 32 bit
-			SetCurrentField(wxString::Format(wxT("0x%08x"),  (uintptr_t) value));
+		if (sizeof(void*) == 8) {
+			// 64 bit
+			it->result = wxString::Format(wxT("0x%016x"), (uintptr_t)value);
+		} else {
+			// 32 bit
+			it->result = wxString::Format(wxT("0x%08x"), (uintptr_t)value);
 		}
+	} else {
+		wxFAIL_MSG(wxT("Pointer value passed for non-pointer format field: ") + it->result);
 	}
+}
 
+
+// Generic argument processor template
+template<typename _Tp>
+CFormat& CFormat::operator%(_Tp value)
+{
+	m_argIndex++;
+	for (FormatList::iterator it = m_formats.begin(); it != m_formats.end(); ++it) {
+		if (it->argIndex == m_argIndex) {
+			if ((it->type != wxT('n')) && (it->type != wxT('C')) && (it->type != wxT('S'))) {
+				ProcessArgument<_Tp>(it, value);
+			} else {
+				wxFAIL_MSG(wxT("Not supported conversion type in format field: ") + it->result);
+			}
+		}
+	}
 	return *this;
 }
 
+// explicit instatiation for the types we handle
+template CFormat& CFormat::operator%<double>(double);
+template CFormat& CFormat::operator%<wxChar>(wxChar);
+template CFormat& CFormat::operator%<signed long long>(signed long long);
+template CFormat& CFormat::operator%<unsigned long long>(unsigned long long);
+template CFormat& CFormat::operator%<const wxString&>(const wxString&);
+template CFormat& CFormat::operator%<void *>(void *);
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/libs/common/Format.h -> aMule-2.3.1.tar.bz2/src/libs/common/Format.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (C) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-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
@@ -25,113 +25,122 @@
 #ifndef FORMAT_H
 #define FORMAT_H
 
-
+#include <list>
 #include "MuleDebug.h"
 
-#ifdef __GNUC__
-    #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-#else
-    /* Assume that other compilers don't have this bug */
-    #define GCC_VERSION	99999
-#endif
-
-
-/**
- * Classes that implement this interface are usable as
- * arguments for %s format strings. This is needed because
- * CFormat objects are typically created as temporary objects,
- * which makes external declarations of operator% impossible,
- * due to the fact that a non-const reference to a temporary
- * object is prohibited, as in:
- * 	CFormat& operator%(CFormat& fmt, ...)
- *
- * With this approch, it is possible to use CFormat as usual:
- * 	CFormat(...) % <some CPrintable object>;
- */
-class CPrintable
-{
-public:
-	/** Must return a "pretty" string representation of the object. */
-	virtual wxString GetPrintableString() const = 0;
-
-protected:
-	virtual ~CPrintable() {}
-};
-
-
-
 
 /**
  * This class offers a typesafe alternative to wxString::Format.
  *
- * Unlike normal format and printf, this class does not care about the
- * type of integer values passed to it, and will handle a value correctly,
- * even if the format-string and the actual type dissagree. Therefore, it
- * is suggested that only %i and %u be used for integers, for the sake of
- * clarity, though %i alone is enough. 
+ * %CFormat has been implemented against the description of printf found
+ * in the "man 3 printf" manual page.
+ *
+ * %CFormat lacks the following capabilities:
+ *  - The @c "*" width-modifier, because only one argument is fed at a time.
+ *  - The @c "n" type, just unsafe and won't be implemented.
+ *  - The @c "C" and @c "S" types, which are considered obsolete.
+ *  - The Long Double type, which is extremly slow and shouldn't be used.
  *
- * The other integer type-fields are supported, but will have no inpact on
- * how the value is represented. The only exception to this is the 'o', 'x'
- * and 'X' fields, which will always be considered to be unsigned!
+ * Support for the C99 @c a, @c A conversions and the non-standard @c ', @c I
+ * flags depend on the underlying C library. Do not use them.
  *
- * CFormat lacks the following capabilities:
- *  * The "*" width-modifier, because only one argument is fed at a time.
- *  * The "p" type, could be implemented using void* or templates.
- *  * The "n" type, just unsafe, wont be implemented.
- *  * The Long Double type, which is extremly slow and shouldn't be used.
+ * Supports the glibc-specific @c m conversion on all platforms, where there's
+ * a way to get the error description. If the underlying C library has a
+ * thread-safe way to get the error description, then this conversion is
+ * thread-safe, too.
  *
- *  CFormat has been implemented against the description of printf found
- *  in the "man 3 printf" manual page.
+ * Deviations from printf(3):
+ *
+ * %CFormat tries hard to format the passed POD-type according to the
+ * conversion type. Basic type conversions may take place to accomplish this
+ * goal. This results in formats accepting a variety of types, namely:
+ *  - @c c, @c i, @c d, @c u, @c o, @c x, @c X accept @c wxChar and all integer
+ *    types,
+ *  - @c a, @c A, @c e, @c E, @c f, @c F, @c g, @c G accept @c wxChar, integer
+ *    and floating-point types,
+ *  - @c p accepts only pointers,
+ *  - @c s accepts all the above mentioned types in addition to @c wxString and
+ *    @c wxChar* types.
+ *
+ * The only exception from this rule is integer (@c d, @c i, @c u) conversion.
+ * It will always use the correct conversion (@c i or @c u) depending on the
+ * signedness of the passed argument.
+ *
+ * @c 's' conversions are inspired by the <em>"we're converting to string,
+ * anyway"</em> mood. Thus they use a 'default' conversion for each accepted
+ * type: @c 'c' for @c wxChar, @c 'i' and @c 'u' for signed and unsigned
+ * integers, respectively, @c 'g' for floating-point numbers and @c 'p' for
+ * pointers.
+ *
+ * Other relaxations / differences from printf(3):
+ *  - Length modifiers are read and validated, but always ignored.
+ *  - As a consequence, invalid combinations of length modifiers and conversion
+ *    types are silently ignored (i.e. for example the invalid @c '%%qs'
+ *    format-specifier is silently treated as @c '%%s').
+ *  - @c 'p' conversion ignores all modifiers except the argument index reference.
+ *  - You can mix positional and indexed argument references. (You actually can't,
+ *    because msgfmt will treat this as an error.)
+ *  - With indexed argument references we allow to leave gaps in the indices.
  */
 class CFormat
 {
+      private:
+	/**
+	 * Structure to hold a format specifier.
+	 */
+	struct FormatSpecifier {
+		unsigned	argIndex;	//!< Argument index. (Position, unless specified otherwise.)
+		wxChar		flag;		//!< The optional flag character.
+		unsigned	width;		//!< The optional field width.
+		signed 		precision;	//!< The optional precision value.
+		// length is not stored
+		wxChar		type;		//!< The conversion type.
+		size_t		startPos;	//!< Position of the first character of the format-specifier in the format-string.
+		size_t		endPos;		//!< Position of the last character of the format-specifier in the format-string.
+		wxString	result;		//!< Result of the conversion. Initialized to the format-specifier.
+	};
+
 public:
 	/**
 	 * Constructor.
 	 *
 	 * @param str The format-string to be used.
 	 */
-	CFormat(const wxChar* str);
+	CFormat(const wxChar* str)	{ Init(str); }
 
 	/**
-	 * Returns true if the resulting string is ready for use.
+	 * Constructor.
 	 *
-	 * For a string to be ready to use, all format fields must have
-	 * had a value assigned through the operator% functions.
+	 * This form is required to construct from a plain char * 
+	 * with wx 2.9
+	 *
+	 * @param str The format-string to be used.
 	 */
-	bool IsReady() const;
-
+	CFormat(const wxString& str)	{ Init(str); }
 
 	/**
-	 * Feeds an value into the format-string.
+	 * Feeds a value into the format-string.
+	 *
+	 * Passing a type that isn't compatible with the current format
+	 * field results in the field being skipped, and an exception raised.
 	 *
-	 * Passing an type that isn't compatible with the current format
-	 * field results in field being skipped, and an exception is raised.
-	 * Passing any type to an CFormat with no free fields results an
-	 * assertion, and the argument being ignored.
-	 * 
-	 * Special rules apply to integers, see above.
+	 * Passing any type to a CFormat with no free fields results in the
+	 * argument being ignored.
+	 *
+	 * Specialize this member template to teach CFormat how to handle
+	 * other types.
 	 */
-	// \{
-	CFormat& operator%(wxChar value);
-	CFormat& operator%(signed short value);
-	CFormat& operator%(unsigned short value);
-	CFormat& operator%(signed int value);
-	CFormat& operator%(unsigned int value);
-	CFormat& operator%(signed long value);
-	CFormat& operator%(unsigned long value);
-	CFormat& operator%(signed long long value);
-	CFormat& operator%(unsigned long long value);	
-	CFormat& operator%(double value);
-	CFormat& operator%(const wxChar* value);
-	CFormat& operator%(const wxString& value);
-	CFormat& operator%(const CPrintable& value);	
-	CFormat& operator%(void * value);	
-	// \}
+	template<typename _Tp> CFormat& operator%(_Tp value);
+
+	// Overload hack to map all pointer types to void*
+	template<typename _Tp> CFormat& operator%(_Tp* value)	{ return this->operator%<void*>(value); }
 
+	// explicit overloads to avoid pass-by-value even in debug builds.
+	CFormat& operator%(const wxString& value)		{ return this->operator%<const wxString&>(value); }
+	CFormat& operator%(const CFormat& value)		{ return this->operator%<const wxString&>(value); }
 
 	/**
-	 * Returns the resulting string, should only be used when all arguments have been given.
+	 * Returns the resulting string.
 	 */
 	wxString GetString() const;
 	
@@ -142,92 +151,52 @@
 	 
 private:
 	/**
-	 * Sets the value of the current field, and locates
-	 * the next format field in the string.
-	 */
-	void		SetCurrentField(const wxString& value);
-
-	/**
- 	 * Returns the current format-field, or an empty 
- 	 * string if no field was found.
-	 */
-	wxString	GetCurrentField();
-
-	/**
-	 * Returns the next field modified to fit the given integer type.
+	 * Initialize internal structures.
 	 *
-	 * @param fieldType A modifier and type for an integer value.
-	 * @return The resulting format-string.
-	 *
-	 * This function is used to generate the integer-type independant
-	 * fields, by modifying the existing format-string to fit the type
-	 * of the integer value that has been passed to it.
+	 * Initializes member variables and parses the given format string.
 	 */
-	wxString	GetIntegerField(const wxChar* fieldType);
-
-	//! Index to the current format field.
-	size_t 	m_fieldStart;
-	//! Length of the current format field.
-	size_t	m_fieldLength;
-	//! The number of fields to skip in GetCurrentField
-	size_t	m_skipCount;
-
-	//! The format-string fed to the parser.
-	wxString	m_format;
-	//! The current result of arguments fed to the parser.
-	wxString	m_result;
-};
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-
-inline CFormat& CFormat::operator%(signed short value)
-{
-	return *this % (signed long long)value;
-}
-
-
-inline CFormat& CFormat::operator%(unsigned short value)
-{
-	return *this % (unsigned long long)value;
-}
-
-
-inline CFormat& CFormat::operator%(signed int value)
-{
-	return *this % (signed long long)value;
-}
-
-
-inline CFormat& CFormat::operator%(unsigned int value)
-{
-	return *this % (unsigned long long)value;
-}
-
+	void	Init(const wxString& str);
 
-inline CFormat& CFormat::operator%(signed long value)
-{
-	return *this % (signed long long)value;
-}
+	//! Type holding format specifiers.
+	typedef std::list<FormatSpecifier>	FormatList;
 
+	//! Retrieve the modifiers for the given format specifier.
+	wxString GetModifiers(FormatList::const_iterator it) const;
 
-inline CFormat& CFormat::operator%(unsigned long value)
-{
-	return *this % (unsigned long long)value;
-}
+	//! Do one argument conversion.
+	template<typename _Tp>
+	void	ProcessArgument(FormatList::iterator it, _Tp value);
 
+	//! List of the valid format-specifiers found in the format string.
+	FormatList	m_formats;
 
-inline CFormat& CFormat::operator%(const wxChar* val)
-{
-	return *this % wxString(val);
-}
+	//! Number of the previous argument.
+	unsigned	m_argIndex;
 
-inline CFormat& CFormat::operator%(const CPrintable& value)
-{
-	return *this % value.GetPrintableString();
-}
+	//! The format-string fed to the parser.
+	wxString	m_formatString;
+};
 
+// type mappings
+template<> inline CFormat& CFormat::operator%(char value)		{ return *this % (wxChar)value; }
+template<> inline CFormat& CFormat::operator%(signed char value)	{ return *this % (wxChar)value; }
+template<> inline CFormat& CFormat::operator%(unsigned char value)	{ return *this % (wxChar)value; }
+template<> inline CFormat& CFormat::operator%(bool value)		{ return *this % (signed long long)value; }
+template<> inline CFormat& CFormat::operator%(signed short value)	{ return *this % (signed long long)value; }
+template<> inline CFormat& CFormat::operator%(unsigned short value)	{ return *this % (unsigned long long)value; }
+template<> inline CFormat& CFormat::operator%(signed int value)		{ return *this % (signed long long)value; }
+template<> inline CFormat& CFormat::operator%(unsigned int value)	{ return *this % (unsigned long long)value; }
+template<> inline CFormat& CFormat::operator%(signed long value)	{ return *this % (signed long long)value; }
+template<> inline CFormat& CFormat::operator%(unsigned long value)	{ return *this % (unsigned long long)value; }
+template<> inline CFormat& CFormat::operator%(float value)		{ return *this % (double)value; }
+template<> inline CFormat& CFormat::operator%(const wxChar* value)	{ return this->operator%<const wxString&>(wxString(value)); }
+
+
+#if wxCHECK_VERSION(2, 9, 0)
+#define WXLONGLONGFMTSPEC wxT(wxLongLongFmtSpec)
+#else
+#define WXLONGLONGFMTSPEC wxLongLongFmtSpec
+#endif
 
 #endif
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/libs/common/MD5Sum.cpp -> aMule-2.3.1.tar.bz2/src/libs/common/MD5Sum.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// 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
@@ -24,6 +24,7 @@
 
 
 #include "StringFunctions.h"
+#include "Format.h"		// Needed for CFormat
 
 #include "MD5Sum.h"		// Interface declarations.
 
@@ -69,7 +70,7 @@
 	m_sHash.Clear();
 	for (int i = 0; i < 16; ++i) {
 		wxString sT;
-		sT = wxString::Format(wxT("%02x"), digest[i]);
+		sT = CFormat(wxT("%02x")) % digest[i];
 		m_sHash += sT;
 	}
 
@@ -104,7 +105,7 @@
 static void Encode (unsigned char *, uint32_t *, size_t);
 static void Decode (uint32_t *, const unsigned char *, size_t);
 
-static unsigned char PADDING[64] = {
+static const unsigned char PADDING[64] = {
   0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0

aMule-2.2.6.tar.bz2/src/libs/common/MD5Sum.h -> aMule-2.3.1.tar.bz2/src/libs/common/MD5Sum.h Changed

aMule-2.2.6.tar.bz2/src/libs/common/Makefile.am -> aMule-2.3.1.tar.bz2/src/libs/common/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/libs/common/Makefile.in -> aMule-2.3.1.tar.bz2/src/libs/common/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +16,12 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -48,11 +46,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -62,22 +62,50 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 libmulecommon_a_AR = $(AR) $(ARFLAGS)
 libmulecommon_a_LIBADD =
-am_libmulecommon_a_OBJECTS = Format.$(OBJEXT) MD5Sum.$(OBJEXT) \
-	MuleDebug.$(OBJEXT) StringFunctions.$(OBJEXT) \
-	FileFunctions.$(OBJEXT) TextFile.$(OBJEXT) Path.$(OBJEXT)
+am_libmulecommon_a_OBJECTS = FileFunctions.$(OBJEXT) Format.$(OBJEXT) \
+	MD5Sum.$(OBJEXT) MuleDebug.$(OBJEXT) Path.$(OBJEXT) \
+	strerror_r.$(OBJEXT) StringFunctions.$(OBJEXT) \
+	TextFile.$(OBJEXT)
 libmulecommon_a_OBJECTS = $(am_libmulecommon_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libmulecommon_a_SOURCES)
 DIST_SOURCES = $(libmulecommon_a_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -85,24 +113,15 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -117,17 +136,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -139,44 +152,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -198,13 +211,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -212,44 +222,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -258,7 +264,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -266,25 +271,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -296,30 +295,41 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AM_CPPFLAGS = $(MULECPPFLAGS) $(BFD_CPPFLAGS) $(WX_CPPFLAGS)
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = $(MULECPPFLAGS) $(BFD_CPPFLAGS) $(WXBASE_CPPFLAGS)
 AM_CXXFLAGS = $(MULECXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY)
 
 # Sources
@@ -329,40 +339,42 @@
 
 # Common to external apps and core/gui/monolithic
 libmulecommon_a_SOURCES = \
+	FileFunctions.cpp \
 	Format.cpp \
 	MD5Sum.cpp \
 	MuleDebug.cpp \
+	Path.cpp \
+	strerror_r.c \
 	StringFunctions.cpp \
-	FileFunctions.cpp \
-	TextFile.cpp \
-	Path.cpp
+	TextFile.cpp
 
 noinst_HEADERS = \
-		Format.h \
-		MD5Sum.h \
-		MuleDebug.h \
-		StringFunctions.h \
-		FileFunctions.h \
-		TextFile.h \
-		Path.h
+	FileFunctions.h \
+	Format.h \
+	MD5Sum.h \
+	MuleDebug.h \
+	Path.h \
+	strerror_r.h \
+	StringFunctions.h \
+	TextFile.h
 
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .o .obj
+.SUFFIXES: .c .cpp .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/libs/common/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/libs/common/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libs/common/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/libs/common/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -380,13 +392,14 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 libmulecommon.a: $(libmulecommon_a_OBJECTS) $(libmulecommon_a_DEPENDENCIES) 
-	-rm -f libmulecommon.a
-	$(libmulecommon_a_AR) libmulecommon.a $(libmulecommon_a_OBJECTS) $(libmulecommon_a_LIBADD)
-	$(RANLIB) libmulecommon.a
+	$(AM_V_at)-rm -f libmulecommon.a
+	$(AM_V_AR)$(libmulecommon_a_AR) libmulecommon.a $(libmulecommon_a_OBJECTS) $(libmulecommon_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmulecommon.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -401,94 +414,119 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Path.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StringFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextFile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror_r.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -516,6 +554,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -537,18 +576,38 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -568,18 +627,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-noinstLIBRARIES ctags distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
+	uninstall-am
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.2.6.tar.bz2/src/libs/common/MuleDebug.cpp -> aMule-2.3.1.tar.bz2/src/libs/common/MuleDebug.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (C) 2005-2009 Mikkel Schubert ( xaignar@users.sourceforge.net )
-// Copyright (C) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-2011 Mikkel Schubert ( xaignar@users.sourceforge.net )
+// Copyright (c) 2005-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
@@ -31,6 +31,7 @@
 
 #include "MuleDebug.h"			// Interface declaration
 #include "StringFunctions.h"		// Needed for unicode2char
+#include "Format.h"			// Needed for CFormat
 
 #ifdef HAVE_EXECINFO
 #	include <execinfo.h>
@@ -125,7 +126,7 @@
 
 	void OnStackFrame(const wxStackFrame& frame)
 	{
-		wxString btLine = wxString::Format(wxT("[%u] "), frame.GetLevel());
+		wxString btLine = CFormat(wxT("[%u] ")) % frame.GetLevel();
 		wxString filename = frame.GetName();
 
 		if (!filename.IsEmpty()) {
@@ -137,7 +138,7 @@
 #endif
 			        + wxT(")");
 		} else {
-			btLine += wxString::Format(wxT("0x%lx"), frame.GetAddress());
+			btLine += CFormat(wxT("%p")) % frame.GetAddress();
 		}
 
 		if (frame.HasSourceLocation()) {
@@ -147,7 +148,7 @@
 #else
 				frame.GetFileName().AfterLast(wxT('/'))
 #endif
-			        + wxString::Format(wxT(":%u"),frame.GetLine());
+			        + CFormat(wxT(":%u")) % frame.GetLine();
 		} else {
 			btLine += wxT(" (Unknown file/line)");
 		}
@@ -401,7 +402,7 @@
 				funcname[i] = demangled;
 			}
 			out.Insert(wxConvCurrent->cMB2WX(s_function_name),i*2);
-			out.Insert(wxConvCurrent->cMB2WX(s_file_name) + wxString::Format(wxT(":%u"), s_line_number),i*2+1);
+			out.Insert(CFormat(wxT("%s:%u")) % wxString(wxConvCurrent->cMB2WX(s_file_name)) % s_line_number, i*2+1);
 		} else {
 			out.Insert(wxT("??"),i*2);
 			out.Insert(wxT("??"),i*2+1);
@@ -460,7 +461,107 @@
 #endif /* HAVE_EXECINFO */
 }
 
-#else	/* !__LINUX__ */
+#elif defined( __APPLE__ )
+
+// According to sources, parts of this code originate at http://www.tlug.org.za/wiki/index.php/Obtaining_a_stack_trace_in_C_upon_SIGSEGV
+// which doesn't exist anymore. 
+
+// Other code (stack frame list and demangle related) has been modified from code with license:
+
+// Copyright 2007 Edd Dawson.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <string>
+#include <dlfcn.h>
+#include <cxxabi.h>
+#include <sstream>
+
+class stack_frame
+{
+public:
+	stack_frame(const void * f_instruction, const std::string& f_function) : frame_instruction(f_instruction), frame_function(f_function) {};
+
+	const void *instruction() const { return frame_instruction; }
+	const std::string& function() const { return frame_function; }
+
+private:
+	const void * frame_instruction;
+	const std::string frame_function;
+};
+
+std::string demangle(const char *name)
+{
+	int status = 0;
+	char *d = 0;
+	std::string ret = name;
+	try {
+		if ((d = abi::__cxa_demangle(name, 0, 0, &status))) {
+			ret = d;
+		}
+	} catch(...) {  }
+
+	std::free(d);
+	return ret;
+}
+
+
+void fill_frames(std::list<stack_frame> &frames)
+{
+	try {
+		void **fp = (void **) __builtin_frame_address (1);
+		void *saved_pc = NULL;
+
+		// First frame is skipped
+		while (fp != NULL) {
+   			fp = (void**)(*fp);
+			if (*fp == NULL) {
+    				break;
+			}
+	
+#if defined(__i386__)
+			saved_pc = fp[1];
+#elif defined(__ppc__)
+			saved_pc = *(fp + 2);
+#else
+			// ?
+			saved_pc = *(fp + 2);
+#endif
+			if (saved_pc) {
+				Dl_info info;
+
+				if (dladdr(saved_pc, &info)) {
+					frames.push_back(stack_frame(saved_pc, demangle(info.dli_sname) + " in " + info.dli_fname));
+				}
+			}
+		}
+	} catch (...) {
+		// Nothing to be done here, just leave.
+	}
+}
+
+wxString get_backtrace(unsigned n)
+{
+	std::list<stack_frame> frames;
+	fill_frames(frames);
+	std::ostringstream backtrace;
+	std::list<stack_frame>::iterator it = frames.begin();
+
+	int count = 0;
+	while (it != frames.end()) {
+		if (count >= n) {
+			backtrace << (*it).instruction() << " : " << (*it).function() << std::endl;
+ 			++it;
+		}
+
+		++count;
+	}
+
+	return wxString(backtrace.str().c_str(), wxConvUTF8);
+}
+
+#else /* ! __APPLE__ */
 
 wxString get_backtrace(unsigned WXUNUSED(n))
 {

aMule-2.2.6.tar.bz2/src/libs/common/MuleDebug.h -> aMule-2.3.1.tar.bz2/src/libs/common/MuleDebug.h Changed

aMule-2.2.6.tar.bz2/src/libs/common/Path.cpp -> aMule-2.3.1.tar.bz2/src/libs/common/Path.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-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
@@ -23,8 +23,7 @@
 //
 
 #include "Path.h"
-#include "MuleDebug.h"
-#include "StringFunctions.h"
+#include "StringFunctions.h"		// Needed for filename2char()
 
 #include <wx/file.h>
 #if defined __WXMSW__ || defined __IRIX__
@@ -36,7 +35,7 @@
 
 // This is required in order to ensure that wx can "handle" filenames
 // using a different encoding than the current system-wide setting. If
-// this is not done, such filenames will fail during convertion to/from
+// this is not done, such filenames will fail during conversion to/from
 // multibyte (as in cWC2MB/cMB2WC).
 #if !wxUSE_GUI && !defined(__WXMSW__)
 void* setFNConv()
@@ -58,7 +57,7 @@
 // Windows has case-insensitive paths, so we use a
 // case-insensitive cmp for that platform. TODO:
 // Perhaps it would be better to simply lowercase
-// m_filesystem in the contructor ...
+// m_filesystem in the constructor ...
 #ifdef __WXMSW__
 	#define PATHCMP(a, b)		wxStricmp(a, b)
 	#define PATHNCMP(a, b, n)	wxStrnicmp(a, b, n)
@@ -270,11 +269,17 @@
 		// saved as UTF8, even if the system is not unicode enabled,
 		// preserving the original filename till the user has fixed
 		// his system ...
+#ifdef __WXMSW__
+		// Magic fails on Windows where we always work with wide char file names.
+		m_filesystem = DeepCopy(filename);
+		m_printable = m_filesystem;
+#else
 		fn = wxConvUTF8.cWC2MB(filename);
 		m_filesystem = wxConvFile.cMB2WC(fn);
 
 		// There's no need to try to unmangle the filename here.
 		m_printable = DeepCopy(filename);
+#endif
 	}
 
 	wxASSERT(m_filesystem.Length());
@@ -283,17 +288,11 @@
 
 
 CPath::CPath(const CPath& other)
-	: CPrintable()
-	, m_printable(DeepCopy(other.m_printable))
+	: m_printable(DeepCopy(other.m_printable))
 	, m_filesystem(DeepCopy(other.m_filesystem))
-{
-}
+{}
 
 
-CPath::~CPath()
-{
-}
-
 
 CPath CPath::FromUniv(const wxString& path)
 {
@@ -542,7 +541,7 @@
 {
 	CPath last, current = RemoveExt();
 
-	// Loop untill all extensions are removed
+	// Loop until all extensions are removed
 	do {
 		last = current;
 
@@ -578,12 +577,6 @@
 }
 
 
-wxString CPath::GetPrintableString() const
-{
-	return DeepCopy(m_printable);
-}
-
-
 bool CPath::CloneFile(const CPath& src, const CPath& dst, bool overwrite)
 {
 	return ::wxCopyFile(src.m_filesystem, dst.m_filesystem, overwrite);
@@ -610,8 +603,6 @@
 
 	if (CPath::CloneFile(src, dst, true)) {
 		// Try to ensure that the backup gets physically written 
-		// Now - does this have any effect reopening a already closed file
-		// to flush it ???
 #if defined __WXMSW__ || defined __IRIX__
 		wxFFile backupFile;
 #else
@@ -674,3 +665,79 @@
 	return wxInvalidOffset;
 }
 
+
+wxString CPath::TruncatePath(size_t length, bool isFilePath) const
+{
+	wxString file = GetPrintable();
+
+	// Check if there's anything to do
+	if (file.Length() <= length) {
+		return file;
+	}
+
+	// If the path is a file name, then prefer to remove from the path, rather than the filename
+	if (isFilePath) {
+		wxString path = wxFileName(file).GetPath();
+		file          = wxFileName(file).GetFullName();
+
+		if (path.Length() >= length) {
+			path.Clear();
+		} else if (file.Length() >= length) {
+			path.Clear();
+		} else {
+			// Minus 6 for "[...]" + separator
+			int pathlen = (int)(length - file.Length() - 6);
+
+			if (pathlen > 0) {
+				path = wxT("[...]") + path.Right( pathlen );
+			} else {
+				path.Clear();
+			}
+		}
+
+		file = ::JoinPaths(path, file);
+	}
+
+	if (file.Length() > length) {
+		if (length > 5) {		
+			file = file.Left(length - 5) + wxT("[...]");
+		} else {
+			file.Clear();
+		}
+	}
+
+	return file;
+}
+
+
+wxString StripSeparators(wxString path, wxString::stripType type)
+{
+	wxASSERT((type == wxString::leading) || (type == wxString::trailing));
+	const wxString seps = wxFileName::GetPathSeparators();
+
+	while (!path.IsEmpty()) {
+		size_t pos = ((type == wxString::leading) ? 0 : path.Length() - 1);
+
+		if (seps.Contains(path.GetChar(pos))) {
+			path.Remove(pos, 1);
+		} else {
+			break;
+		}
+	}
+
+	return path;
+}
+
+
+wxString JoinPaths(const wxString& path, const wxString& file)
+{
+	if (path.IsEmpty()) {
+		return file;
+	} else if (file.IsEmpty()) {
+		return path;
+	}
+
+	return StripSeparators(path, wxString::trailing)
+	   + wxFileName::GetPathSeparator()
+	   + StripSeparators(file, wxString::leading);
+}

aMule-2.2.6.tar.bz2/src/libs/common/Path.h -> aMule-2.3.1.tar.bz2/src/libs/common/Path.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-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
@@ -47,7 +47,7 @@
  * that cross-platform issues can be worked around in a
  * single place.
  */
-class CPath : public CPrintable
+class CPath
 {
 public:
 	/** Default constructor. */
@@ -59,12 +59,9 @@
 	/** Copy constructor. Creates a deep-copy of the passed object. */
 	CPath(const CPath& other);
 
-	/** Destructor. */
-	~CPath();
-
 
 	/**
-	 * Creates a path from one saved in the 'universial' format.
+	 * Creates a path from one saved in the 'universal' format.
 	 *
 	 * These are to be used when the filenames/paths are saved to
 	 * the local machine, and ensure that locale-changes does not
@@ -73,9 +70,9 @@
 	 * or (currently) the core/gui.
 	 **/
 	static CPath FromUniv(const wxString& path);
-	/** Creates an 'universial' path from the specifed CPath. */
+	/** Creates an 'universal' path from the specified CPath. */
 	static wxString ToUniv(const CPath& path);
-	
+
 
 	/** Assignment operator. */
 	CPath& operator=(const CPath& other);
@@ -86,7 +83,7 @@
 	/** Note that only exact matches are considered equal, see IsSameDir. */
 	bool operator!=(const CPath& other) const;
 
-	
+
 	/** Returns true if the filename is valid, false otherwise. */
 	bool IsOk() const;
 	/** Returns true if the path exists and is a file, false otherwise. */
@@ -94,7 +91,7 @@
 	/** Returns true if the path exists and is a directory, false otherwise. */
 	bool DirExists() const;
 
-	
+
 	enum EAccess {
 		//! Only check of the file or dir exists.
 		exists,
@@ -123,7 +120,7 @@
 	CPath GetPath() const;
 	/** Returns the full filename, excluding the path. */
 	CPath GetFullName() const;
-	
+
 	/** Returns the size of the specified file, or wxInvalidSize on failure. */
 	sint64 GetFileSize() const;
 
@@ -140,7 +137,7 @@
 	CPath Cleanup(bool keepSpaces = true, bool isFAT32 = false) const;
 	/** Returns a CPath with a postfix before the file-extension. Must be ASCII. */
 	CPath AddPostfix(const wxString& postfix) const;
-	
+
 	/** Returns a CPath object with the extension appended. Empty strings are ignored. */
 	CPath AppendExt(const wxString& ext) const;
 	/** Returns a CPath with the (last, if multiple) extension removed. */
@@ -151,10 +148,19 @@
 
 	/** Returns true if the the passed path makes up an prefix of this object. */
 	bool StartsWith(const CPath& other) const;
-	
-	/** @see cprintable::getprintablestring */
-	wxString GetPrintableString() const;
 
+	/**
+	 * Get truncated path.
+	 *
+	 * @note This function truncates the @em name of the file, not the file
+	 * itself.
+	 *
+	 * @param length	The truncated path should not exceed this length.
+	 * @param isFilePath	Indicates whether the last part of the path (the
+	 *			file name) should be kept or not, if possible.
+	 * @return	The truncated path, at most @a length long.
+	 */
+	wxString TruncatePath(size_t length, bool isFilePath = false) const;
 
 	/** 
 	 * Renames the file 'src' to the file 'dst', overwriting if specified. Note that
@@ -170,7 +176,7 @@
 
 	/** Makes a backup of a file, by copying the original file to 'src' + 'appendix' */
 	static bool BackupFile(const CPath& src, const wxString& appendix);
-	
+
 	/** Deletes the specified file, returning true on success. */
 	static bool RemoveFile(const CPath& file);
 	/** Deletes the specified directory, returning true on success. */
@@ -201,6 +207,12 @@
 	friend int CmpAny(const CPath& ArgA, const CPath& ArgB);
 };
 
+// Make CPath printable in CFormat
+template<>
+inline CFormat& CFormat::operator%(CPath value)
+{
+	return this->operator%<const wxString&>(value.GetPrintable());
+}
 
 /**
  * Overloaded version of CmpAny for use with CPaths. As this is
@@ -213,5 +225,20 @@
 }
 
 
+/**
+ * Strips all path separators from the specified end of a path.
+ *
+ * Note: type must be either leading or trailing.
+ */
+wxString StripSeparators(wxString path, wxString::stripType type);
+
+
+/**
+ * Joins two paths with the operating system specific path-separator.
+ *
+ * If any of the parameters are empty, the other parameter is
+ * returned unchanged.
+ */
+wxString JoinPaths(const wxString& path, const wxString& file);
 
 #endif

aMule-2.2.6.tar.bz2/src/libs/common/StringFunctions.cpp -> aMule-2.3.1.tar.bz2/src/libs/common/StringFunctions.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal Veiga - Kry (kry@amule.org)
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// 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
@@ -23,17 +23,47 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
-
-#define STRINGFUNCTIONS_CPP
-
-
 #include "StringFunctions.h"
-#include "Path.h"
 
 #include <wx/filename.h>	// Needed for wxFileName
 #include <wx/uri.h>		// Needed for wxURI
 
+#include <cstring>		// Needed for std::strlen()
+
 // Implementation of the non-inlines
+
+//
+// Conversion of wxString so it can be used by printf() in a console
+// On some platforms (Windows) the console allows only "plain" characters,
+// so try to convert as much as possible and replace the others with '?'.
+// On other platforms (some Linux) wxConvLocal silently converts to UTF8
+// so the console can show even Chinese chars.
+//
+Unicode2CharBuf unicode2char(const wxChar* s)
+{
+	// First try the straight way.
+	Unicode2CharBuf buf1(wxConvLocal.cWX2MB(s));
+	if ((const char *) buf1) {
+		return buf1;
+	}
+	// Failed. Try to convert as much as possible.
+	size_t len = wxStrlen(s);
+	size_t maxlen = len * 4;		// Allow for an encoding of up to 4 byte per char.
+	wxCharBuffer buf(maxlen + 1);	// This is wasteful, but the string is used temporary anyway.
+	char * data = buf.data();
+	for (size_t i = 0, pos = 0; i < len; i++) {
+		size_t len_char = wxConvLocal.FromWChar(data + pos, maxlen - pos, s + i, 1);
+		if (len_char != wxCONV_FAILED) {
+			pos += len_char - 1;
+		} else if (pos < maxlen) {
+			data[pos++] = '?';
+			data[pos] = 0;
+		}
+	}
+	return buf;
+}
+
+
 static byte base16Chars[17] = "0123456789ABCDEF";
 
 wxString URLEncode(const wxString& sIn)
@@ -59,83 +89,6 @@
 	return sOut;
 }
 
-wxString TruncateFilename(const CPath& filename, size_t length, bool isFilePath)
-{
-	wxString file = filename.GetPrintable();
-
-	// Check if there's anything to do
-	if (file.Length() <= length)
-		return file;
-	
-	// If the filename is a path, then prefer to remove from the path, rather than the filename
-	if ( isFilePath ) {
-		wxString path = wxFileName(file).GetPath();
-		file          = wxFileName(file).GetFullName();
-
-		if ( path.Length() >= length ) {
-			path.Clear();
-		} else if ( file.Length() >= length ) {
-			path.Clear();
-		} else {
-			// Minus 6 for "[...]" + separator
-			int pathlen = (int)(length - file.Length() - 6);
-			
-			if ( pathlen > 0 ) {
-				path = wxT("[...]") + path.Right( pathlen );
-			} else {
-				path.Clear();
-			}
-		}
-		
-		file = JoinPaths(path, file);
-	}
-
-	if ( file.Length() > length ) {
-		if ( length > 5 ) {		
-			file = file.Left( length - 5 ) + wxT("[...]");
-		} else {
-			file.Clear();
-		}
-	}
-	
-
-	return file;
-}
-
-
-
-wxString StripSeparators(wxString path, wxString::stripType type)
-{
-	wxASSERT((type == wxString::leading) || (type == wxString::trailing));
-	const wxString seps = wxFileName::GetPathSeparators();
-
-	while (!path.IsEmpty()) {
-		size_t pos = ((type == wxString::leading) ? 0 : path.Length() - 1);
-
-		if (seps.Contains(path.GetChar(pos))) {
-			path.Remove(pos, 1);
-		} else {
-			break;
-		}
-	}
-	
-	return path;
-}
-
-
-wxString JoinPaths(const wxString& path, const wxString& file)
-{
-	if (path.IsEmpty()) {
-		return file;
-	} else if (file.IsEmpty()) {
-		return path;
-	} 
-
-	return StripSeparators(path, wxString::trailing)
-	   + wxFileName::GetPathSeparator()
-	   + StripSeparators(file, wxString::leading);
-}
-
 
 wxChar HexToDec( const wxString& hex )
 {
@@ -159,28 +112,38 @@
 }
 
 
-wxString UnescapeHTML( const wxString& str )
+wxString UnescapeHTML(const wxString& str)
 {
-	wxString result;
-	result.Alloc( str.Len() );
-	
-	for ( size_t i = 0; i < str.Len(); ++i ) {
-		if ( str.GetChar(i) == wxT('%') && ( i + 2 < str.Len() ) ) {
-			wxChar unesc = HexToDec( str.Mid( i + 1, 2 ) );
+	wxWritableCharBuffer buf = str.char_str(wxConvUTF8);
 
-			if ( unesc ) {
-				i += 2;
+	// Work around wxWritableCharBuffer's operator[] not being writable
+	char *buffer = (char *)buf;
 
-				result += unesc;
+	size_t len = std::strlen(buffer);
+	size_t j = 0;
+	for (size_t i = 0; i < len; ++i, ++j) {
+		if (buffer[i] == '%' && (len > i + 2)) {
+			wxChar unesc = HexToDec(str.Mid(i + 1, 2));
+			if (unesc) {
+				i += 2;
+				buffer[j] = (char)unesc;
 			} else {
 				// If conversion failed, then we just add the escape-code
 				// and continue past it like nothing happened.
-				result += str.at(i);
+				buffer[j] = buffer[i];
 			}
 		} else {
-			result += str.at(i);
+			buffer[j] = buffer[i];
 		}
 	}
+	buffer[j] = '\0';
+
+	// Try to interpret the result as UTF-8
+	wxString result(buffer, wxConvUTF8);
+	if (len > 0 && result.length() == 0) {
+		// Fall back to ISO-8859-1
+		result = wxString(buffer, wxConvISO8859_1);
+	}
 
 	return result;
 }
@@ -309,6 +272,3 @@
 {
 	return m_count;
 }
-
-
-// File_checked_for_headers

aMule-2.2.6.tar.bz2/src/libs/common/StringFunctions.h -> aMule-2.3.1.tar.bz2/src/libs/common/StringFunctions.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 Angel Vidal Veiga - Kry (kry@amule.org)
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// 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
@@ -29,8 +29,6 @@
 
 #include "../../Types.h"		// Needed for uint16 and uint32
 
-class CPath;
-
 
 // UTF8 types: No UTF8, BOM prefix, or Raw UTF8
 enum EUtf8Str
@@ -76,7 +74,7 @@
 typedef const wxWX2MBbuf Unicode2CharBuf;
 typedef const wxMB2WXbuf Char2UnicodeBuf;
 
-inline Unicode2CharBuf unicode2char(const wxChar* x)	{ return wxConvLocal.cWX2MB(x); }
+Unicode2CharBuf unicode2char(const wxChar* x);
 inline Char2UnicodeBuf char2unicode(const char* x)	{ return wxConvLocal.cMB2WX(x); }
 
 inline Unicode2CharBuf unicode2UTF8(const wxChar* x)	{ return wxConvUTF8.cWX2MB(x); }
@@ -121,24 +119,45 @@
 // Replacements for atoi and atol that removes the need for converting
 // a string to normal chars with unicode2char. The value returned is the
 // value represented in the string or 0 if the conversion failed.
-inline long StrToLong( const wxString& str ) {
+inline long StrToLong(const wxString& str)
+{
 	long value = 0;
-	str.ToLong( &value );
+	if (!str.ToLong(&value)) {	// value may be changed even if it failes according to wx docu
+		value = 0;
+	}
 	return value;
 }
 
-inline unsigned long StrToULong( const wxString& str ) {
+inline unsigned long StrToULong(const wxString& str)
+{
 	unsigned long value = 0;
-	str.ToULong( &value );
+	if (!str.ToULong(&value)) {
+		value = 0;
+	}
 	return value;
 }
 
-inline unsigned long long StrToULongLong( const wxString& str ) {
+inline unsigned long long StrToULongLong(const wxString& str)
+{
+#if wxCHECK_VERSION(2, 9, 0)
+	unsigned long long value = 0;
+	if (!str.ToULongLong(&value)) {
+		value = 0;
+	}
+	return value;
+
+#else	// wx 2.8
+
+	Unicode2CharBuf buf = unicode2char(str);
+	if (!buf) {		// something went wrong
+		return 0;
+	}
 #ifdef _MSC_VER
-	return _atoi64(unicode2char(str));
+	return _atoi64(buf);
 #else
-	return atoll(unicode2char(str));
+	return atoll(buf);
 #endif
+#endif	// wx 2.8
 }
 
 inline size_t GetRawSize(const wxString& rstr, EUtf8Str eEncode)
@@ -172,31 +191,6 @@
 /***************** Non-inlines **********************/
 /****************************************************/
 
-/**
- * Truncates a filename to the specified length.
- *
- * @param filename The original filename.
- * @param length The max length of the resulting filename.
- * @param isFilePath If true, then the path will be truncated rather than the filename if possible.
- * @return The truncated filename.
- */
-wxString TruncateFilename(const CPath& filename, size_t length, bool isFilePath = false);
-
-/**
- * Strips all path separators from the specified end of a path.
- *
- * Note: type must be either leading or trailing.
- */
-wxString StripSeparators(wxString path, wxString::stripType type);
-
-
-/**
- * Joins two path with the operating system specific path-separator.
- *
- * If any of the parameters are empty, the other parameter is
- * returned unchanged.
- */
-wxString JoinPaths(const wxString& path, const wxString& file);
 
 // Makes sIn suitable for inclusion in an URL, by escaping all chars that could cause trouble.
 wxString URLEncode(const wxString& sIn);

aMule-2.2.6.tar.bz2/src/libs/common/TextFile.cpp -> aMule-2.3.1.tar.bz2/src/libs/common/TextFile.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2006-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
@@ -57,7 +57,7 @@
 	} else if (mode == write) {
 		m_file.Open(path.GetRaw(), wxT("w"));
 	} else {
-		wxASSERT(0);
+		wxFAIL;
 	}
 
 	return IsOpened();
@@ -90,42 +90,83 @@
 }
 
 
-wxString CTextFile::GetNextLine(const wxMBConv& conv)
+wxString CTextFile::GetNextLine(EReadTextFile flags, const wxMBConv& conv, bool* result)
 {
 	wxCHECK_MSG(m_file.IsOpened(), wxEmptyString, wxT("Trying to read from closed file."));
 	wxCHECK_MSG(!m_file.Eof(), wxEmptyString, wxT("Trying to read past EOF"));
 	wxCHECK_MSG((m_mode == read), wxEmptyString, wxT("Trying to read from non-readable file."));
 
+	bool is_filtered = false;
 
 	wxString line;
 	char buffer[TXTBUF_SIZE];
 
 	// Loop until EOF (fgets will then return NULL) or a newline is read.
 	while (fgets(buffer, TXTBUF_SIZE, m_file.fp())) {
-		// NB: The majority of the time spent by this function is
-		//     spent converting the multibyte string to wide-char.
-		line += conv.cMB2WC(buffer);
-
-		// Remove any newlines, carriage returns, etc.
-		if (line.Length() && (line.Last() == wxT('\n'))) {
-			if ((line.Length() > 1)) {
-				if (line[line.Length() - 2] == wxT('\r')) {
-					// Carriage return + newline
-					line.RemoveLast(2);
-				} else {
-					// Only a newline.
-					line.RemoveLast(1);					
+		// Filters must be first applied here to avoid unnecessary CPU usage.
+		
+		if (line.IsEmpty()) {
+			if (buffer[0] == '\0') {
+				// Empty line.
+				break;
+			} else if (flags & txtIgnoreComments) {
+				int i = 0;
+				char t = buffer[i];
+				while (t) {
+					if ((t == ' ') || (t == '\t')) {
+						++i;
+						t = buffer[i];
+					} else {
+						is_filtered = (buffer[i] == '#');
+						break;
+					}
 				}
-			} else {
-				// Empty line
-				line.Clear();
 			}
+		}
 
-			// We've read an entire line.
+		if (!is_filtered) {
+			// NB: The majority of the time spent by this function is
+			//     spent converting the multibyte string to wide-char.
+			line += conv.cMB2WC(buffer);
+
+			// Remove any newlines, carriage returns, etc.
+			if (line.Length() && (line.Last() == wxT('\n'))) {
+				if ((line.Length() > 1)) {
+					if (line[line.Length() - 2] == wxT('\r')) {
+						// Carriage return + newline
+						line.RemoveLast(2);
+					} else {
+						// Only a newline.
+						line.RemoveLast(1);					
+					}
+				} else {
+					// Empty line
+					line.Clear();
+				}
+
+				// We've read an entire line.
+				break;
+			}
+		} else {
+			// Filtered line.
 			break;
 		}
 	}
 
+	if (!is_filtered) {
+		if (flags & txtStripWhitespace) {
+			line = line.Strip(wxString::both);
+		}
+
+		if ((flags & txtIgnoreEmptyLines) && line.IsEmpty()) {
+			is_filtered = true;
+		}
+	}
+	
+	if (result) {
+		*result = !is_filtered;
+	}
+	
 	return line;
 }
 
@@ -161,29 +202,13 @@
 	wxArrayString lines;
 
 	while (!Eof()) {
-		wxString line = GetNextLine(conv);
-
-		if (flags & txtStripWhitespace) {
-			line = line.Strip(wxString::both);
-		}
-
-		if (flags & txtIgnoreEmptyLines) {
-			if (line.IsEmpty()) {
-				continue;
-			}
-		}
+		bool result = true;
 		
-		if (flags & txtIgnoreComments) {
-			if (flags & txtStripWhitespace) {
-				if (line.StartsWith(wxT("#"))) {
-					continue;
-				}
-			} else if (line.Strip(wxString::leading).StartsWith(wxT("#"))) {
-				continue;
-			}
-		}
+		wxString line = GetNextLine(flags, conv, &result);
 
-		lines.Add(line);
+		if (result) {
+			lines.Add(line);
+		}
 	}
 
 	return lines;
@@ -194,7 +219,7 @@
 {
 	bool result = true;
 
-	for (size_t i = 0; i < lines.Count(); ++i) {
+	for (size_t i = 0; i < lines.GetCount(); ++i) {
 		result &= WriteLine(lines[i], conv);
 	}

aMule-2.2.6.tar.bz2/src/libs/common/TextFile.h -> aMule-2.3.1.tar.bz2/src/libs/common/TextFile.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2006-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2006-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
@@ -35,6 +35,8 @@
 /** Criteria used when reading an entire file to an array of strings. */
 enum EReadTextFile
 {
+	/** Do not filter anything */
+	txtReadAll = 0,	
 	/** Do not return empty lines. Can be combined with txtStripWhiteSpace */
 	txtIgnoreEmptyLines = 1,
 	/** Do not return lines starting with a '#' */
@@ -96,10 +98,10 @@
 	 *
 	 * Note that GetNextLine will return an empty string if the file has reached
 	 * EOF, or if the file is closed, or not readable. However, empty lines in
-	 * the file will also be returned, so this cannot be used to test for EOF.
+	 * the file will also be returned unless otherwise specified, so this cannot be used to test for EOF.
 	 * Instead, use the function Eof().
 	 **/
-	wxString	GetNextLine(const wxMBConv& conv = wxConvLibc);
+	wxString	GetNextLine(EReadTextFile flags = txtReadAll, const wxMBConv& conv = wxConvLibc, bool* result = NULL);
 
 	/** 
 	 * Writes the line to a writable file, returning true on success.

aMule-2.3.1.tar.bz2/src/libs/common/strerror_r.c Added

@@ -0,0 +1,112 @@
+/*
+ * This file is part of the aMule Project.
+ *
+ * Copyright (c) 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
+ */
+
+#ifdef HAVE_CONFIG_H
+#	include "config.h"
+#endif
+
+#ifndef _XOPEN_SOURCE
+#	define _XOPEN_SOURCE	600
+#endif
+
+#include <string.h>			// Needed for strerror_r() and size_t
+
+#ifdef HAVE_ERRNO_H
+#	include <errno.h>			// Needed for errno
+#endif
+
+#ifndef HAVE_STRERROR_R
+#	ifdef HAVE_STRERROR
+
+/* Replacement strerror_r() function for systems that don't have any.
+   Note that this replacement function is NOT thread-safe! */
+int mule_strerror_r(int errnum, char *buf, size_t buflen)
+{
+	char *tmp;
+	if ((buf == NULL) || (buflen == 0)) {
+		errno = ERANGE;
+		return -1;
+	}
+	tmp = strerror(errnum);
+	if (tmp == NULL) {
+		errno = EINVAL;
+		return -1;
+	} else {
+		strncpy(buf, tmp, buflen - 1);
+		buf[buflen - 1] = '\0';
+		if (strlen(tmp) >= buflen) {
+			errno = ERANGE;
+			return -1;
+		}
+	}
+	return 0;
+}
+
+#	else
+
+/* No way to get error description */
+int mule_strerror_r()
+{
+#ifdef HAVE_ERRNO_H
+	errno = ENOSYS;	/* not implemented */
+#endif
+	return -1;
+}
+
+#	endif
+#else
+#	ifdef STRERROR_R_CHAR_P
+
+/* Replacement strerror_r() function for systems that return a char*. */
+int mule_strerror_r(int errnum, char *buf, size_t buflen)
+{
+	char *tmp = strerror_r(errnum, buf, buflen);
+	if (tmp == NULL) {
+		errno = EINVAL;
+		return -1;
+	} else if (tmp != buf) {
+		if ((buf == NULL) || (buflen == 0)) {
+			errno = ERANGE;
+			return -1;
+		} else {
+			strncpy(buf, tmp, buflen - 1);
+			buf[buflen - 1] = '\0';
+			if (strlen(tmp) >= buflen) {
+				errno = ERANGE;
+				return -1;
+			}
+		}
+	}
+	return 0;
+}
+
+#	else
+
+/* Nothing to do, library strerror_r() is XSI-compliant. */
+int mule_strerror_r(int errnum, char *buf, size_t buflen)
+{
+	return strerror_r(errnum, buf, buflen);
+}
+#	endif
+#endif

aMule-2.3.1.tar.bz2/src/libs/common/strerror_r.h Added

@@ -0,0 +1,44 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 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
+//
+
+#ifndef MULE_STRERROR_R_H
+#define MULE_STRERROR_R_H
+
+/**
+ * Return string describing error number.
+ *
+ * This function implements the XSI-compliant strerror_r() function whenever
+ * it's possible. Also it is thread safe if there is a thread-safe function
+ * to get the error description.
+ *
+ * @param errnum Error number for which the description is needed.
+ * @param buf    Buffer to store the error description.
+ * @param buflen Length of the buffer.
+ *
+ * @return 0 on success; on error, -1 is returned and errno is set to indicate
+ *	   the error.
+ */
+extern "C" int mule_strerror_r(int errnum, char *buf, size_t buflen);
+
+#endif /* MULE_STRERROR_R_H */

aMule-2.2.6.tar.bz2/src/libs/ec/Makefile.am -> aMule-2.3.1.tar.bz2/src/libs/ec/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/libs/ec/Makefile.in -> aMule-2.3.1.tar.bz2/src/libs/ec/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -46,11 +44,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -60,37 +60,66 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -105,17 +134,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -127,44 +150,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -186,13 +209,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -200,44 +220,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -246,7 +262,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -254,25 +269,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -284,40 +293,51 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = cpp
 
 # Sources
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in 
 BUILT_SOURCES = ECGeneratedFiles
 ECGeneratedFilesSources = \
 	abstracts/ECTagTypes.abstract \
 	abstracts/ECCodes.abstract
 
 EXTRA_DIST = file_generator.pl
-EXTRA__DIST__SUBDIRS = abstracts java		# c# cannot be included because of the # in the name
+EXTRA__DIST__SUBDIRS = abstracts java
 DISTCLEANFILES = $(BUILT_SOURCES)
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -327,14 +347,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/libs/ec/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/libs/ec/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libs/ec/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/libs/ec/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -352,7 +372,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -361,7 +381,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -378,16 +398,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -413,16 +432,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -430,14 +449,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -449,82 +468,101 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../../automake
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -559,6 +597,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -566,8 +605,6 @@
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-recursive
-
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
@@ -580,18 +617,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -610,21 +667,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
+	ctags-recursive install install-am install-strip \
+	tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	dist-hook distclean distclean-generic distclean-recursive \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive dist-hook distclean distclean-generic \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am
 
 
 ECGeneratedFiles: $(ECGeneratedFilesSources)
@@ -642,6 +702,10 @@
 			fi ; \
 		done ; \
 	done
+
+clean:
+	rm -f ECGeneratedFiles
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/src/libs/ec/abstracts/ECCodes.abstract -> aMule-2.3.1.tar.bz2/src/libs/ec/abstracts/ECCodes.abstract Changed

@@ -17,7 +17,7 @@
 Type Enum
 Name ProtocolVersion
 DataType uint16
-EC_CURRENT_PROTOCOL_VERSION	0x0200
+EC_CURRENT_PROTOCOL_VERSION	0x0204
 [/Section]
 
 # This flags are used on the transmission layer.
@@ -27,8 +27,6 @@
 DataType uint32
 EC_FLAG_ZLIB		0x00000001
 EC_FLAG_UTF8_NUMBERS	0x00000002
-EC_FLAG_HAS_ID		0x00000004
-EC_FLAG_ACCEPTS		0x00000010
 EC_FLAG_UNKNOWN_MASK	0xff7f7f08
 [/Section]
 
@@ -56,7 +54,6 @@
 
 EC_OP_GET_DLOAD_QUEUE               0x0D
 EC_OP_GET_ULOAD_QUEUE               0x0E
-EC_OP_GET_WAIT_QUEUE                0x0F
 
 EC_OP_GET_SHARED_FILES              0x10
 EC_OP_SHARED_SET_PRIO               0x11
@@ -64,7 +61,7 @@
 EC_OP_PARTFILE_REMOVE_NO_NEEDED     0x12
 EC_OP_PARTFILE_REMOVE_FULL_QUEUE    0x13
 EC_OP_PARTFILE_REMOVE_HIGH_QUEUE    0x14
-EC_OP_PARTFILE_CLEANUP_SOURCES      0x15
+EC_OP_PARTFILE_UNUSED               0x15
 EC_OP_PARTFILE_SWAP_A4AF_THIS       0x16
 EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO  0x17
 EC_OP_PARTFILE_SWAP_A4AF_OTHERS     0x18
@@ -77,11 +74,9 @@
 
 EC_OP_DLOAD_QUEUE                   0x1F
 EC_OP_ULOAD_QUEUE                   0x20
-EC_OP_WAIT_QUEUE                    0x21
 
 EC_OP_SHARED_FILES                  0x22
 EC_OP_SHAREDFILES_RELOAD            0x23
-EC_OP_SHAREDFILES_ADD_DIRECTORY     0x24
 
 EC_OP_RENAME_FILE                   0x25
 
@@ -132,10 +127,27 @@
 
 EC_OP_CONNECT                       0x4A
 EC_OP_DISCONNECT                    0x4B
-EC_OP_GET_DLOAD_QUEUE_DETAIL        0x4C
 
 EC_OP_KAD_UPDATE_FROM_URL           0x4D
 EC_OP_KAD_BOOTSTRAP_FROM_IP         0x4E
+
+EC_OP_AUTH_SALT                     0x4F
+EC_OP_AUTH_PASSWD                   0x50
+
+EC_OP_IPFILTER_UPDATE               0x51
+
+EC_OP_GET_UPDATE                    0x52
+
+EC_OP_CLEAR_COMPLETED               0x53
+
+EC_OP_CLIENT_SWAP_TO_ANOTHER_FILE   0x54
+
+EC_OP_SHARED_FILE_SET_COMMENT       0x55
+
+EC_OP_SERVER_SET_STATIC_PRIO        0x56
+
+EC_OP_FRIEND                        0x57
+
 [/Section]
 
 [Section Content]
@@ -154,6 +166,11 @@
 EC_TAG_BOOTSTRAP_IP                       0x0008
 EC_TAG_BOOTSTRAP_PORT                     0x0009
 EC_TAG_CLIENT_ID                          0x000A
+EC_TAG_PASSWD_SALT                        0x000B
+EC_TAG_CAN_ZLIB                           0x000C
+EC_TAG_CAN_UTF8_NUMBERS                   0x000D
+EC_TAG_CAN_NOTIFY                         0x000E
+EC_TAG_ECID                               0x000F
 
 
 EC_TAG_CLIENT_NAME                        0x0100
@@ -173,6 +190,20 @@
 	EC_TAG_STATS_KAD_USERS                    0x020A
 	EC_TAG_STATS_ED2K_FILES                   0x020B
 	EC_TAG_STATS_KAD_FILES                    0x020C
+	EC_TAG_STATS_LOGGER_MESSAGE               0x020D
+	EC_TAG_STATS_KAD_FIREWALLED_UDP           0x020E
+	EC_TAG_STATS_KAD_INDEXED_SOURCES          0x020F
+	EC_TAG_STATS_KAD_INDEXED_KEYWORDS         0x0210
+	EC_TAG_STATS_KAD_INDEXED_NOTES            0x0211
+	EC_TAG_STATS_KAD_INDEXED_LOAD             0x0212
+	EC_TAG_STATS_KAD_IP_ADRESS                0x0213
+	EC_TAG_STATS_BUDDY_STATUS                 0x0214
+	EC_TAG_STATS_BUDDY_IP                     0x0215
+	EC_TAG_STATS_BUDDY_PORT                   0x0216
+	EC_TAG_STATS_KAD_IN_LAN_MODE              0x0217
+	EC_TAG_STATS_TOTAL_SENT_BYTES             0x0218
+	EC_TAG_STATS_TOTAL_RECEIVED_BYTES         0x0219
+	EC_TAG_STATS_SHARED_FILE_COUNT            0x021A
 
 EC_TAG_PARTFILE                           0x0300
 	EC_TAG_PARTFILE_NAME                      0x0301
@@ -197,6 +228,18 @@
 	EC_TAG_PARTFILE_REQ_STATUS                0x0314
 	EC_TAG_PARTFILE_SOURCE_NAMES              0x0315
 	EC_TAG_PARTFILE_COMMENTS                  0x0316
+	EC_TAG_PARTFILE_STOPPED                   0x0317
+	EC_TAG_PARTFILE_DOWNLOAD_ACTIVE           0x0318
+	EC_TAG_PARTFILE_LOST_CORRUPTION           0x0319
+	EC_TAG_PARTFILE_GAINED_COMPRESSION        0x031A
+	EC_TAG_PARTFILE_SAVED_ICH                 0x031B
+	EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS       0x031C
+	EC_TAG_PARTFILE_AVAILABLE_PARTS           0x031D
+	EC_TAG_PARTFILE_HASH                      0x031E
+	EC_TAG_PARTFILE_SHARED                    0x031F
+	EC_TAG_PARTFILE_HASHED_PART_COUNT         0x0320
+	EC_TAG_PARTFILE_A4AFAUTO                  0x0321
+	EC_TAG_PARTFILE_A4AF_SOURCES              0x0322
 
 EC_TAG_KNOWNFILE                          0x0400
 	EC_TAG_KNOWNFILE_XFERRED                  0x0401
@@ -206,6 +249,14 @@
 	EC_TAG_KNOWNFILE_ACCEPT_COUNT             0x0405
 	EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL         0x0406
 	EC_TAG_KNOWNFILE_AICH_MASTERHASH          0x0407
+	EC_TAG_KNOWNFILE_FILENAME                 0x0408
+	EC_TAG_KNOWNFILE_COMPLETE_SOURCES_LOW     0x0409
+	EC_TAG_KNOWNFILE_COMPLETE_SOURCES_HIGH    0x040A
+	EC_TAG_KNOWNFILE_PRIO                     0x040B
+	EC_TAG_KNOWNFILE_ON_QUEUE                 0x040C
+	EC_TAG_KNOWNFILE_COMPLETE_SOURCES         0x040D
+	EC_TAG_KNOWNFILE_COMMENT                  0x040E
+	EC_TAG_KNOWNFILE_RATING                   0x040F
 
 EC_TAG_SERVER                             0x0500
 	EC_TAG_SERVER_NAME                        0x0501
@@ -214,17 +265,19 @@
 	EC_TAG_SERVER_PING                        0x0504
 	EC_TAG_SERVER_USERS                       0x0505
 	EC_TAG_SERVER_USERS_MAX                   0x0506
-	EC_TAG_SERVER_FILES		          0x0507
-	EC_TAG_SERVER_PRIO	                  0x0508
+	EC_TAG_SERVER_FILES                       0x0507
+	EC_TAG_SERVER_PRIO                        0x0508
 	EC_TAG_SERVER_FAILED                      0x0509
 	EC_TAG_SERVER_STATIC                      0x050A
 	EC_TAG_SERVER_VERSION                     0x050B
+	EC_TAG_SERVER_IP                          0x050C
+	EC_TAG_SERVER_PORT                        0x050D
 
 EC_TAG_CLIENT                             0x0600
 	EC_TAG_CLIENT_SOFTWARE                    0x0601
 	EC_TAG_CLIENT_SCORE                       0x0602
 	EC_TAG_CLIENT_HASH                        0x0603
-	EC_TAG_CLIENT_FRIEND                      0x0604
+	EC_TAG_CLIENT_FRIEND_SLOT                 0x0604
 	EC_TAG_CLIENT_WAIT_TIME                   0x0605
 	EC_TAG_CLIENT_XFER_TIME                   0x0606
 	EC_TAG_CLIENT_QUEUE_TIME                  0x0607
@@ -232,7 +285,7 @@
 	EC_TAG_CLIENT_UPLOAD_SESSION              0x0609
 	EC_TAG_CLIENT_UPLOAD_TOTAL                0x060A
 	EC_TAG_CLIENT_DOWNLOAD_TOTAL              0x060B
-	EC_TAG_CLIENT_STATE                       0x060C
+	EC_TAG_CLIENT_DOWNLOAD_STATE              0x060C
 	EC_TAG_CLIENT_UP_SPEED                    0x060D
 	EC_TAG_CLIENT_DOWN_SPEED                  0x060E
 	EC_TAG_CLIENT_FROM                        0x060F
@@ -243,6 +296,27 @@
 	EC_TAG_CLIENT_SERVER_NAME                 0x0614
 	EC_TAG_CLIENT_SOFT_VER_STR                0x0615
 	EC_TAG_CLIENT_WAITING_POSITION            0x0616
+	EC_TAG_CLIENT_IDENT_STATE                 0x0617
+	EC_TAG_CLIENT_OBFUSCATION_STATUS          0x0618
+	EC_TAG_CLIENT_CURRENTLYUNUSED1            0x0619
+	EC_TAG_CLIENT_REMOTE_QUEUE_RANK           0x061A
+	EC_TAG_CLIENT_DISABLE_VIEW_SHARED         0x061B
+	EC_TAG_CLIENT_UPLOAD_STATE                0x061C
+	EC_TAG_CLIENT_EXT_PROTOCOL                0x061D
+	EC_TAG_CLIENT_USER_ID                     0x061E
+	EC_TAG_CLIENT_UPLOAD_FILE                 0x061F
+	EC_TAG_CLIENT_REQUEST_FILE                0x0620
+	EC_TAG_CLIENT_A4AF_FILES                  0x0621
+	EC_TAG_CLIENT_OLD_REMOTE_QUEUE_RANK       0x0622
+	EC_TAG_CLIENT_KAD_PORT                    0x0623
+	EC_TAG_CLIENT_PART_STATUS                 0x0624
+	EC_TAG_CLIENT_NEXT_REQUESTED_PART         0x0625
+	EC_TAG_CLIENT_LAST_DOWNLOADING_PART       0x0626
+	EC_TAG_CLIENT_REMOTE_FILENAME             0x0627
+	EC_TAG_CLIENT_MOD_VERSION                 0x0628
+	EC_TAG_CLIENT_OS_INFO                     0x0629
+	EC_TAG_CLIENT_AVAILABLE_PARTS             0x062A
+	EC_TAG_CLIENT_UPLOAD_PART_STATUS          0x062B
 
 EC_TAG_SEARCHFILE                         0x0700
 	EC_TAG_SEARCH_TYPE                        0x0701
@@ -253,6 +327,18 @@
 	EC_TAG_SEARCH_EXTENSION                   0x0706
 	EC_TAG_SEARCH_AVAILABILITY                0x0707
 	EC_TAG_SEARCH_STATUS                      0x0708
+	EC_TAG_SEARCH_PARENT                      0x0709
+
+EC_TAG_FRIEND                             0x0800
+	EC_TAG_FRIEND_NAME                        0x0801
+	EC_TAG_FRIEND_HASH                        0x0802
+	EC_TAG_FRIEND_IP                          0x0803
+	EC_TAG_FRIEND_PORT                        0x0804
+	EC_TAG_FRIEND_CLIENT                      0x0805
+	EC_TAG_FRIEND_ADD                         0x0806
+	EC_TAG_FRIEND_REMOVE                      0x0807
+	EC_TAG_FRIEND_FRIENDSLOT                  0x0808
+	EC_TAG_FRIEND_SHARED                      0x0809
 
 EC_TAG_SELECT_PREFS                       0x1000
 
@@ -268,21 +354,22 @@
 		EC_TAG_USER_NICK                          0x1201
 		EC_TAG_USER_HASH                          0x1202
 		EC_TAG_USER_HOST                          0x1203
+		EC_TAG_GENERAL_CHECK_NEW_VERSION          0x1204
 
 	EC_TAG_PREFS_CONNECTIONS                  0x1300
 		EC_TAG_CONN_DL_CAP                        0x1301
-		EC_TAG_CONN_UL_CAP	                  0x1302
-		EC_TAG_CONN_MAX_DL	                  0x1303
-		EC_TAG_CONN_MAX_UL	                  0x1304
+		EC_TAG_CONN_UL_CAP                        0x1302
+		EC_TAG_CONN_MAX_DL                        0x1303
+		EC_TAG_CONN_MAX_UL                        0x1304
 		EC_TAG_CONN_SLOT_ALLOCATION               0x1305
 		EC_TAG_CONN_TCP_PORT                      0x1306
 		EC_TAG_CONN_UDP_PORT	                  0x1307
 		EC_TAG_CONN_UDP_DISABLE                   0x1308
 		EC_TAG_CONN_MAX_FILE_SOURCES              0x1309
-		EC_TAG_CONN_MAX_CONN	                  0x130A
+		EC_TAG_CONN_MAX_CONN                      0x130A
 		EC_TAG_CONN_AUTOCONNECT                   0x130B
-		EC_TAG_CONN_RECONNECT	                  0x130C
-		EC_TAG_NETWORK_ED2K		          0x130D
+		EC_TAG_CONN_RECONNECT                     0x130C
+		EC_TAG_NETWORK_ED2K                       0x130D
 		EC_TAG_NETWORK_KADEMLIA                   0x130E
 
 	EC_TAG_PREFS_MESSAGEFILTER                0x1400
@@ -332,7 +419,7 @@
 		EC_TAG_FILES_EXTRACT_METADATA             0x180B
 		EC_TAG_FILES_ALLOC_FULL_SIZE              0x180C
 		EC_TAG_FILES_CHECK_FREE_SPACE             0x180D
-		EC_TAG_FILES_MIN_FREE_SPACE	          0x180E
+		EC_TAG_FILES_MIN_FREE_SPACE               0x180E
 
 	EC_TAG_PREFS_SRCDROP                      0x1900
 		EC_TAG_SRCDROP_NONEEDED                   0x1901
@@ -342,6 +429,10 @@
 		EC_TAG_SRCDROP_AUTODROP_TIMER             0x1905
 
 	EC_TAG_PREFS_DIRECTORIES                  0x1A00
+		EC_TAG_DIRECTORIES_INCOMING               0x1A01
+		EC_TAG_DIRECTORIES_TEMP                   0x1A02
+		EC_TAG_DIRECTORIES_SHARED                 0x1A03
+		EC_TAG_DIRECTORIES_SHARE_HIDDEN           0x1A04
 
 	EC_TAG_PREFS_STATISTICS                   0x1B00
 		EC_TAG_STATSGRAPH_WIDTH                   0x1B01

aMule-2.2.6.tar.bz2/src/libs/ec/abstracts/License.abstract -> aMule-2.3.1.tar.bz2/src/libs/ec/abstracts/License.abstract Changed

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECCodes.h -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECCodes.h Changed

@@ -1,7 +1,7 @@
 // 
 //  This file is part of the aMule Project.
 // 
-//  Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+//  Copyright (c) 2004-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
@@ -33,14 +33,12 @@
 typedef uint32_t ec_taglen_t;
 
 enum ProtocolVersion {
-	EC_CURRENT_PROTOCOL_VERSION = 0x0200
+	EC_CURRENT_PROTOCOL_VERSION = 0x0204
 };
 
 enum ECFlags {
 	EC_FLAG_ZLIB	 = 0x00000001,
 	EC_FLAG_UTF8_NUMBERS = 0x00000002,
-	EC_FLAG_HAS_ID	 = 0x00000004,
-	EC_FLAG_ACCEPTS	 = 0x00000010,
 	EC_FLAG_UNKNOWN_MASK = 0xff7f7f08
 };
 
@@ -59,13 +57,12 @@
 	EC_OP_STATS                         = 0x0C,
 	EC_OP_GET_DLOAD_QUEUE               = 0x0D,
 	EC_OP_GET_ULOAD_QUEUE               = 0x0E,
-	EC_OP_GET_WAIT_QUEUE                = 0x0F,
 	EC_OP_GET_SHARED_FILES              = 0x10,
 	EC_OP_SHARED_SET_PRIO               = 0x11,
 	EC_OP_PARTFILE_REMOVE_NO_NEEDED     = 0x12,
 	EC_OP_PARTFILE_REMOVE_FULL_QUEUE    = 0x13,
 	EC_OP_PARTFILE_REMOVE_HIGH_QUEUE    = 0x14,
-	EC_OP_PARTFILE_CLEANUP_SOURCES      = 0x15,
+	EC_OP_PARTFILE_UNUSED               = 0x15,
 	EC_OP_PARTFILE_SWAP_A4AF_THIS       = 0x16,
 	EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO  = 0x17,
 	EC_OP_PARTFILE_SWAP_A4AF_OTHERS     = 0x18,
@@ -77,10 +74,8 @@
 	EC_OP_PARTFILE_SET_CAT              = 0x1E,
 	EC_OP_DLOAD_QUEUE                   = 0x1F,
 	EC_OP_ULOAD_QUEUE                   = 0x20,
-	EC_OP_WAIT_QUEUE                    = 0x21,
 	EC_OP_SHARED_FILES                  = 0x22,
 	EC_OP_SHAREDFILES_RELOAD            = 0x23,
-	EC_OP_SHAREDFILES_ADD_DIRECTORY     = 0x24,
 	EC_OP_RENAME_FILE                   = 0x25,
 	EC_OP_SEARCH_START                  = 0x26,
 	EC_OP_SEARCH_STOP                   = 0x27,
@@ -120,9 +115,17 @@
 	EC_OP_KAD_STOP                      = 0x49,
 	EC_OP_CONNECT                       = 0x4A,
 	EC_OP_DISCONNECT                    = 0x4B,
-	EC_OP_GET_DLOAD_QUEUE_DETAIL        = 0x4C,
 	EC_OP_KAD_UPDATE_FROM_URL           = 0x4D,
-	EC_OP_KAD_BOOTSTRAP_FROM_IP         = 0x4E
+	EC_OP_KAD_BOOTSTRAP_FROM_IP         = 0x4E,
+	EC_OP_AUTH_SALT                     = 0x4F,
+	EC_OP_AUTH_PASSWD                   = 0x50,
+	EC_OP_IPFILTER_UPDATE               = 0x51,
+	EC_OP_GET_UPDATE                    = 0x52,
+	EC_OP_CLEAR_COMPLETED               = 0x53,
+	EC_OP_CLIENT_SWAP_TO_ANOTHER_FILE   = 0x54,
+	EC_OP_SHARED_FILE_SET_COMMENT       = 0x55,
+	EC_OP_SERVER_SET_STATIC_PRIO        = 0x56,
+	EC_OP_FRIEND                        = 0x57
 };
 
 enum ECTagNames {
@@ -137,6 +140,11 @@
 	EC_TAG_BOOTSTRAP_IP                       = 0x0008,
 	EC_TAG_BOOTSTRAP_PORT                     = 0x0009,
 	EC_TAG_CLIENT_ID                          = 0x000A,
+	EC_TAG_PASSWD_SALT                        = 0x000B,
+	EC_TAG_CAN_ZLIB                           = 0x000C,
+	EC_TAG_CAN_UTF8_NUMBERS                   = 0x000D,
+	EC_TAG_CAN_NOTIFY                         = 0x000E,
+	EC_TAG_ECID                               = 0x000F,
 	EC_TAG_CLIENT_NAME                        = 0x0100,
 		EC_TAG_CLIENT_VERSION                     = 0x0101,
 		EC_TAG_CLIENT_MOD                         = 0x0102,
@@ -153,6 +161,20 @@
 		EC_TAG_STATS_KAD_USERS                    = 0x020A,
 		EC_TAG_STATS_ED2K_FILES                   = 0x020B,
 		EC_TAG_STATS_KAD_FILES                    = 0x020C,
+		EC_TAG_STATS_LOGGER_MESSAGE               = 0x020D,
+		EC_TAG_STATS_KAD_FIREWALLED_UDP           = 0x020E,
+		EC_TAG_STATS_KAD_INDEXED_SOURCES          = 0x020F,
+		EC_TAG_STATS_KAD_INDEXED_KEYWORDS         = 0x0210,
+		EC_TAG_STATS_KAD_INDEXED_NOTES            = 0x0211,
+		EC_TAG_STATS_KAD_INDEXED_LOAD             = 0x0212,
+		EC_TAG_STATS_KAD_IP_ADRESS                = 0x0213,
+		EC_TAG_STATS_BUDDY_STATUS                 = 0x0214,
+		EC_TAG_STATS_BUDDY_IP                     = 0x0215,
+		EC_TAG_STATS_BUDDY_PORT                   = 0x0216,
+		EC_TAG_STATS_KAD_IN_LAN_MODE              = 0x0217,
+		EC_TAG_STATS_TOTAL_SENT_BYTES             = 0x0218,
+		EC_TAG_STATS_TOTAL_RECEIVED_BYTES         = 0x0219,
+		EC_TAG_STATS_SHARED_FILE_COUNT            = 0x021A,
 	EC_TAG_PARTFILE                           = 0x0300,
 		EC_TAG_PARTFILE_NAME                      = 0x0301,
 		EC_TAG_PARTFILE_PARTMETID                 = 0x0302,
@@ -176,6 +198,18 @@
 		EC_TAG_PARTFILE_REQ_STATUS                = 0x0314,
 		EC_TAG_PARTFILE_SOURCE_NAMES              = 0x0315,
 		EC_TAG_PARTFILE_COMMENTS                  = 0x0316,
+		EC_TAG_PARTFILE_STOPPED                   = 0x0317,
+		EC_TAG_PARTFILE_DOWNLOAD_ACTIVE           = 0x0318,
+		EC_TAG_PARTFILE_LOST_CORRUPTION           = 0x0319,
+		EC_TAG_PARTFILE_GAINED_COMPRESSION        = 0x031A,
+		EC_TAG_PARTFILE_SAVED_ICH                 = 0x031B,
+		EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS       = 0x031C,
+		EC_TAG_PARTFILE_AVAILABLE_PARTS           = 0x031D,
+		EC_TAG_PARTFILE_HASH                      = 0x031E,
+		EC_TAG_PARTFILE_SHARED                    = 0x031F,
+		EC_TAG_PARTFILE_HASHED_PART_COUNT         = 0x0320,
+		EC_TAG_PARTFILE_A4AFAUTO                  = 0x0321,
+		EC_TAG_PARTFILE_A4AF_SOURCES              = 0x0322,
 	EC_TAG_KNOWNFILE                          = 0x0400,
 		EC_TAG_KNOWNFILE_XFERRED                  = 0x0401,
 		EC_TAG_KNOWNFILE_XFERRED_ALL              = 0x0402,
@@ -184,6 +218,14 @@
 		EC_TAG_KNOWNFILE_ACCEPT_COUNT             = 0x0405,
 		EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL         = 0x0406,
 		EC_TAG_KNOWNFILE_AICH_MASTERHASH          = 0x0407,
+		EC_TAG_KNOWNFILE_FILENAME                 = 0x0408,
+		EC_TAG_KNOWNFILE_COMPLETE_SOURCES_LOW     = 0x0409,
+		EC_TAG_KNOWNFILE_COMPLETE_SOURCES_HIGH    = 0x040A,
+		EC_TAG_KNOWNFILE_PRIO                     = 0x040B,
+		EC_TAG_KNOWNFILE_ON_QUEUE                 = 0x040C,
+		EC_TAG_KNOWNFILE_COMPLETE_SOURCES         = 0x040D,
+		EC_TAG_KNOWNFILE_COMMENT                  = 0x040E,
+		EC_TAG_KNOWNFILE_RATING                   = 0x040F,
 	EC_TAG_SERVER                             = 0x0500,
 		EC_TAG_SERVER_NAME                        = 0x0501,
 		EC_TAG_SERVER_DESC                        = 0x0502,
@@ -191,16 +233,18 @@
 		EC_TAG_SERVER_PING                        = 0x0504,
 		EC_TAG_SERVER_USERS                       = 0x0505,
 		EC_TAG_SERVER_USERS_MAX                   = 0x0506,
-		EC_TAG_SERVER_FILES		          = 0x0507,
-		EC_TAG_SERVER_PRIO	                  = 0x0508,
+		EC_TAG_SERVER_FILES                       = 0x0507,
+		EC_TAG_SERVER_PRIO                        = 0x0508,
 		EC_TAG_SERVER_FAILED                      = 0x0509,
 		EC_TAG_SERVER_STATIC                      = 0x050A,
 		EC_TAG_SERVER_VERSION                     = 0x050B,
+		EC_TAG_SERVER_IP                          = 0x050C,
+		EC_TAG_SERVER_PORT                        = 0x050D,
 	EC_TAG_CLIENT                             = 0x0600,
 		EC_TAG_CLIENT_SOFTWARE                    = 0x0601,
 		EC_TAG_CLIENT_SCORE                       = 0x0602,
 		EC_TAG_CLIENT_HASH                        = 0x0603,
-		EC_TAG_CLIENT_FRIEND                      = 0x0604,
+		EC_TAG_CLIENT_FRIEND_SLOT                 = 0x0604,
 		EC_TAG_CLIENT_WAIT_TIME                   = 0x0605,
 		EC_TAG_CLIENT_XFER_TIME                   = 0x0606,
 		EC_TAG_CLIENT_QUEUE_TIME                  = 0x0607,
@@ -208,7 +252,7 @@
 		EC_TAG_CLIENT_UPLOAD_SESSION              = 0x0609,
 		EC_TAG_CLIENT_UPLOAD_TOTAL                = 0x060A,
 		EC_TAG_CLIENT_DOWNLOAD_TOTAL              = 0x060B,
-		EC_TAG_CLIENT_STATE                       = 0x060C,
+		EC_TAG_CLIENT_DOWNLOAD_STATE              = 0x060C,
 		EC_TAG_CLIENT_UP_SPEED                    = 0x060D,
 		EC_TAG_CLIENT_DOWN_SPEED                  = 0x060E,
 		EC_TAG_CLIENT_FROM                        = 0x060F,
@@ -219,6 +263,27 @@
 		EC_TAG_CLIENT_SERVER_NAME                 = 0x0614,
 		EC_TAG_CLIENT_SOFT_VER_STR                = 0x0615,
 		EC_TAG_CLIENT_WAITING_POSITION            = 0x0616,
+		EC_TAG_CLIENT_IDENT_STATE                 = 0x0617,
+		EC_TAG_CLIENT_OBFUSCATION_STATUS          = 0x0618,
+		EC_TAG_CLIENT_CURRENTLYUNUSED1            = 0x0619,
+		EC_TAG_CLIENT_REMOTE_QUEUE_RANK           = 0x061A,
+		EC_TAG_CLIENT_DISABLE_VIEW_SHARED         = 0x061B,
+		EC_TAG_CLIENT_UPLOAD_STATE                = 0x061C,
+		EC_TAG_CLIENT_EXT_PROTOCOL                = 0x061D,
+		EC_TAG_CLIENT_USER_ID                     = 0x061E,
+		EC_TAG_CLIENT_UPLOAD_FILE                 = 0x061F,
+		EC_TAG_CLIENT_REQUEST_FILE                = 0x0620,
+		EC_TAG_CLIENT_A4AF_FILES                  = 0x0621,
+		EC_TAG_CLIENT_OLD_REMOTE_QUEUE_RANK       = 0x0622,
+		EC_TAG_CLIENT_KAD_PORT                    = 0x0623,
+		EC_TAG_CLIENT_PART_STATUS                 = 0x0624,
+		EC_TAG_CLIENT_NEXT_REQUESTED_PART         = 0x0625,
+		EC_TAG_CLIENT_LAST_DOWNLOADING_PART       = 0x0626,
+		EC_TAG_CLIENT_REMOTE_FILENAME             = 0x0627,
+		EC_TAG_CLIENT_MOD_VERSION                 = 0x0628,
+		EC_TAG_CLIENT_OS_INFO                     = 0x0629,
+		EC_TAG_CLIENT_AVAILABLE_PARTS             = 0x062A,
+		EC_TAG_CLIENT_UPLOAD_PART_STATUS          = 0x062B,
 	EC_TAG_SEARCHFILE                         = 0x0700,
 		EC_TAG_SEARCH_TYPE                        = 0x0701,
 		EC_TAG_SEARCH_NAME                        = 0x0702,
@@ -228,6 +293,17 @@
 		EC_TAG_SEARCH_EXTENSION                   = 0x0706,
 		EC_TAG_SEARCH_AVAILABILITY                = 0x0707,
 		EC_TAG_SEARCH_STATUS                      = 0x0708,
+		EC_TAG_SEARCH_PARENT                      = 0x0709,
+	EC_TAG_FRIEND                             = 0x0800,
+		EC_TAG_FRIEND_NAME                        = 0x0801,
+		EC_TAG_FRIEND_HASH                        = 0x0802,
+		EC_TAG_FRIEND_IP                          = 0x0803,
+		EC_TAG_FRIEND_PORT                        = 0x0804,
+		EC_TAG_FRIEND_CLIENT                      = 0x0805,
+		EC_TAG_FRIEND_ADD                         = 0x0806,
+		EC_TAG_FRIEND_REMOVE                      = 0x0807,
+		EC_TAG_FRIEND_FRIENDSLOT                  = 0x0808,
+		EC_TAG_FRIEND_SHARED                      = 0x0809,
 	EC_TAG_SELECT_PREFS                       = 0x1000,
 		EC_TAG_PREFS_CATEGORIES                   = 0x1100,
 			EC_TAG_CATEGORY                           = 0x1101,
@@ -240,20 +316,21 @@
 			EC_TAG_USER_NICK                          = 0x1201,
 			EC_TAG_USER_HASH                          = 0x1202,
 			EC_TAG_USER_HOST                          = 0x1203,
+			EC_TAG_GENERAL_CHECK_NEW_VERSION          = 0x1204,
 		EC_TAG_PREFS_CONNECTIONS                  = 0x1300,
 			EC_TAG_CONN_DL_CAP                        = 0x1301,
-			EC_TAG_CONN_UL_CAP	                  = 0x1302,
-			EC_TAG_CONN_MAX_DL	                  = 0x1303,
-			EC_TAG_CONN_MAX_UL	                  = 0x1304,
+			EC_TAG_CONN_UL_CAP                        = 0x1302,
+			EC_TAG_CONN_MAX_DL                        = 0x1303,
+			EC_TAG_CONN_MAX_UL                        = 0x1304,
 			EC_TAG_CONN_SLOT_ALLOCATION               = 0x1305,
 			EC_TAG_CONN_TCP_PORT                      = 0x1306,
 			EC_TAG_CONN_UDP_PORT	                  = 0x1307,
 			EC_TAG_CONN_UDP_DISABLE                   = 0x1308,
 			EC_TAG_CONN_MAX_FILE_SOURCES              = 0x1309,
-			EC_TAG_CONN_MAX_CONN	                  = 0x130A,
+			EC_TAG_CONN_MAX_CONN                      = 0x130A,
 			EC_TAG_CONN_AUTOCONNECT                   = 0x130B,
-			EC_TAG_CONN_RECONNECT	                  = 0x130C,
-			EC_TAG_NETWORK_ED2K		          = 0x130D,
+			EC_TAG_CONN_RECONNECT                     = 0x130C,
+			EC_TAG_NETWORK_ED2K                       = 0x130D,
 			EC_TAG_NETWORK_KADEMLIA                   = 0x130E,
 		EC_TAG_PREFS_MESSAGEFILTER                = 0x1400,
 			EC_TAG_MSGFILTER_ENABLED                  = 0x1401,
@@ -298,7 +375,7 @@
 			EC_TAG_FILES_EXTRACT_METADATA             = 0x180B,
 			EC_TAG_FILES_ALLOC_FULL_SIZE              = 0x180C,
 			EC_TAG_FILES_CHECK_FREE_SPACE             = 0x180D,
-			EC_TAG_FILES_MIN_FREE_SPACE	          = 0x180E,
+			EC_TAG_FILES_MIN_FREE_SPACE               = 0x180E,
 		EC_TAG_PREFS_SRCDROP                      = 0x1900,
 			EC_TAG_SRCDROP_NONEEDED                   = 0x1901,
 			EC_TAG_SRCDROP_DROP_FQS                   = 0x1902,
@@ -306,6 +383,10 @@
 			EC_TAG_SRCDROP_HQRS_VALUE                 = 0x1904,
 			EC_TAG_SRCDROP_AUTODROP_TIMER             = 0x1905,
 		EC_TAG_PREFS_DIRECTORIES                  = 0x1A00,
+			EC_TAG_DIRECTORIES_INCOMING               = 0x1A01,
+			EC_TAG_DIRECTORIES_TEMP                   = 0x1A02,
+			EC_TAG_DIRECTORIES_SHARED                 = 0x1A03,
+			EC_TAG_DIRECTORIES_SHARE_HIDDEN           = 0x1A04,
 		EC_TAG_PREFS_STATISTICS                   = 0x1B00,
 			EC_TAG_STATSGRAPH_WIDTH                   = 0x1B01,
 			EC_TAG_STATSGRAPH_SCALE                   = 0x1B02,
@@ -381,4 +462,470 @@
 	EC_PREFS_KADEMLIA       = 0x00002000
 };
 
+#ifdef DEBUG_EC_IMPLEMENTATION
+
+wxString GetDebugNameProtocolVersion(uint16 arg)
+{
+	switch (arg) {
+		case 0x0204: return wxT("EC_CURRENT_PROTOCOL_VERSION");
+		default: return CFormat(wxT("unknown %d 0x%x")) % arg % arg;
+	}
+}
+
+wxString GetDebugNameECFlags(uint32 arg)
+{
+	switch (arg) {
+		case 0x00000001: return wxT("EC_FLAG_ZLIB");
+		case 0x00000002: return wxT("EC_FLAG_UTF8_NUMBERS");
+		case 0xff7f7f08: return wxT("EC_FLAG_UNKNOWN_MASK");
+		default: return CFormat(wxT("unknown %d 0x%x")) % arg % arg;
+	}
+}
+
+wxString GetDebugNameECOpCodes(uint8 arg)
+{
+	switch (arg) {
+		case 0x01: return wxT("EC_OP_NOOP");
+		case 0x02: return wxT("EC_OP_AUTH_REQ");
+		case 0x03: return wxT("EC_OP_AUTH_FAIL");
+		case 0x04: return wxT("EC_OP_AUTH_OK");
+		case 0x05: return wxT("EC_OP_FAILED");
+		case 0x06: return wxT("EC_OP_STRINGS");
+		case 0x07: return wxT("EC_OP_MISC_DATA");
+		case 0x08: return wxT("EC_OP_SHUTDOWN");
+		case 0x09: return wxT("EC_OP_ADD_LINK");
+		case 0x0A: return wxT("EC_OP_STAT_REQ");
+		case 0x0B: return wxT("EC_OP_GET_CONNSTATE");
+		case 0x0C: return wxT("EC_OP_STATS");
+		case 0x0D: return wxT("EC_OP_GET_DLOAD_QUEUE");
+		case 0x0E: return wxT("EC_OP_GET_ULOAD_QUEUE");
+		case 0x10: return wxT("EC_OP_GET_SHARED_FILES");
+		case 0x11: return wxT("EC_OP_SHARED_SET_PRIO");
+		case 0x12: return wxT("EC_OP_PARTFILE_REMOVE_NO_NEEDED");
+		case 0x13: return wxT("EC_OP_PARTFILE_REMOVE_FULL_QUEUE");
+		case 0x14: return wxT("EC_OP_PARTFILE_REMOVE_HIGH_QUEUE");
+		case 0x15: return wxT("EC_OP_PARTFILE_UNUSED");
+		case 0x16: return wxT("EC_OP_PARTFILE_SWAP_A4AF_THIS");
+		case 0x17: return wxT("EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO");
+		case 0x18: return wxT("EC_OP_PARTFILE_SWAP_A4AF_OTHERS");
+		case 0x19: return wxT("EC_OP_PARTFILE_PAUSE");
+		case 0x1A: return wxT("EC_OP_PARTFILE_RESUME");
+		case 0x1B: return wxT("EC_OP_PARTFILE_STOP");
+		case 0x1C: return wxT("EC_OP_PARTFILE_PRIO_SET");
+		case 0x1D: return wxT("EC_OP_PARTFILE_DELETE");
+		case 0x1E: return wxT("EC_OP_PARTFILE_SET_CAT");
+		case 0x1F: return wxT("EC_OP_DLOAD_QUEUE");
+		case 0x20: return wxT("EC_OP_ULOAD_QUEUE");
+		case 0x22: return wxT("EC_OP_SHARED_FILES");
+		case 0x23: return wxT("EC_OP_SHAREDFILES_RELOAD");
+		case 0x25: return wxT("EC_OP_RENAME_FILE");
+		case 0x26: return wxT("EC_OP_SEARCH_START");
+		case 0x27: return wxT("EC_OP_SEARCH_STOP");
+		case 0x28: return wxT("EC_OP_SEARCH_RESULTS");
+		case 0x29: return wxT("EC_OP_SEARCH_PROGRESS");
+		case 0x2A: return wxT("EC_OP_DOWNLOAD_SEARCH_RESULT");
+		case 0x2B: return wxT("EC_OP_IPFILTER_RELOAD");
+		case 0x2C: return wxT("EC_OP_GET_SERVER_LIST");
+		case 0x2D: return wxT("EC_OP_SERVER_LIST");
+		case 0x2E: return wxT("EC_OP_SERVER_DISCONNECT");
+		case 0x2F: return wxT("EC_OP_SERVER_CONNECT");
+		case 0x30: return wxT("EC_OP_SERVER_REMOVE");
+		case 0x31: return wxT("EC_OP_SERVER_ADD");
+		case 0x32: return wxT("EC_OP_SERVER_UPDATE_FROM_URL");
+		case 0x33: return wxT("EC_OP_ADDLOGLINE");
+		case 0x34: return wxT("EC_OP_ADDDEBUGLOGLINE");
+		case 0x35: return wxT("EC_OP_GET_LOG");
+		case 0x36: return wxT("EC_OP_GET_DEBUGLOG");
+		case 0x37: return wxT("EC_OP_GET_SERVERINFO");
+		case 0x38: return wxT("EC_OP_LOG");
+		case 0x39: return wxT("EC_OP_DEBUGLOG");
+		case 0x3A: return wxT("EC_OP_SERVERINFO");
+		case 0x3B: return wxT("EC_OP_RESET_LOG");
+		case 0x3C: return wxT("EC_OP_RESET_DEBUGLOG");
+		case 0x3D: return wxT("EC_OP_CLEAR_SERVERINFO");
+		case 0x3E: return wxT("EC_OP_GET_LAST_LOG_ENTRY");
+		case 0x3F: return wxT("EC_OP_GET_PREFERENCES");
+		case 0x40: return wxT("EC_OP_SET_PREFERENCES");
+		case 0x41: return wxT("EC_OP_CREATE_CATEGORY");
+		case 0x42: return wxT("EC_OP_UPDATE_CATEGORY");
+		case 0x43: return wxT("EC_OP_DELETE_CATEGORY");
+		case 0x44: return wxT("EC_OP_GET_STATSGRAPHS");
+		case 0x45: return wxT("EC_OP_STATSGRAPHS");
+		case 0x46: return wxT("EC_OP_GET_STATSTREE");
+		case 0x47: return wxT("EC_OP_STATSTREE");
+		case 0x48: return wxT("EC_OP_KAD_START");
+		case 0x49: return wxT("EC_OP_KAD_STOP");
+		case 0x4A: return wxT("EC_OP_CONNECT");
+		case 0x4B: return wxT("EC_OP_DISCONNECT");
+		case 0x4D: return wxT("EC_OP_KAD_UPDATE_FROM_URL");
+		case 0x4E: return wxT("EC_OP_KAD_BOOTSTRAP_FROM_IP");
+		case 0x4F: return wxT("EC_OP_AUTH_SALT");
+		case 0x50: return wxT("EC_OP_AUTH_PASSWD");
+		case 0x51: return wxT("EC_OP_IPFILTER_UPDATE");
+		case 0x52: return wxT("EC_OP_GET_UPDATE");
+		case 0x53: return wxT("EC_OP_CLEAR_COMPLETED");
+		case 0x54: return wxT("EC_OP_CLIENT_SWAP_TO_ANOTHER_FILE");
+		case 0x55: return wxT("EC_OP_SHARED_FILE_SET_COMMENT");
+		case 0x56: return wxT("EC_OP_SERVER_SET_STATIC_PRIO");
+		case 0x57: return wxT("EC_OP_FRIEND");
+		default: return CFormat(wxT("unknown %d 0x%x")) % arg % arg;
+	}
+}
+
+wxString GetDebugNameECTagNames(uint16 arg)
+{
+	switch (arg) {
+		case 0x0000: return wxT("EC_TAG_STRING");
+		case 0x0001: return wxT("EC_TAG_PASSWD_HASH");
+		case 0x0002: return wxT("EC_TAG_PROTOCOL_VERSION");
+		case 0x0003: return wxT("EC_TAG_VERSION_ID");
+		case 0x0004: return wxT("EC_TAG_DETAIL_LEVEL");
+		case 0x0005: return wxT("EC_TAG_CONNSTATE");
+		case 0x0006: return wxT("EC_TAG_ED2K_ID");
+		case 0x0007: return wxT("EC_TAG_LOG_TO_STATUS");
+		case 0x0008: return wxT("EC_TAG_BOOTSTRAP_IP");
+		case 0x0009: return wxT("EC_TAG_BOOTSTRAP_PORT");
+		case 0x000A: return wxT("EC_TAG_CLIENT_ID");
+		case 0x000B: return wxT("EC_TAG_PASSWD_SALT");
+		case 0x000C: return wxT("EC_TAG_CAN_ZLIB");
+		case 0x000D: return wxT("EC_TAG_CAN_UTF8_NUMBERS");
+		case 0x000E: return wxT("EC_TAG_CAN_NOTIFY");
+		case 0x000F: return wxT("EC_TAG_ECID");
+		case 0x0100: return wxT("EC_TAG_CLIENT_NAME");
+		case 0x0101: return wxT("EC_TAG_CLIENT_VERSION");
+		case 0x0102: return wxT("EC_TAG_CLIENT_MOD");
+		case 0x0200: return wxT("EC_TAG_STATS_UL_SPEED");
+		case 0x0201: return wxT("EC_TAG_STATS_DL_SPEED");
+		case 0x0202: return wxT("EC_TAG_STATS_UL_SPEED_LIMIT");
+		case 0x0203: return wxT("EC_TAG_STATS_DL_SPEED_LIMIT");
+		case 0x0204: return wxT("EC_TAG_STATS_UP_OVERHEAD");
+		case 0x0205: return wxT("EC_TAG_STATS_DOWN_OVERHEAD");
+		case 0x0206: return wxT("EC_TAG_STATS_TOTAL_SRC_COUNT");
+		case 0x0207: return wxT("EC_TAG_STATS_BANNED_COUNT");
+		case 0x0208: return wxT("EC_TAG_STATS_UL_QUEUE_LEN");
+		case 0x0209: return wxT("EC_TAG_STATS_ED2K_USERS");
+		case 0x020A: return wxT("EC_TAG_STATS_KAD_USERS");
+		case 0x020B: return wxT("EC_TAG_STATS_ED2K_FILES");
+		case 0x020C: return wxT("EC_TAG_STATS_KAD_FILES");
+		case 0x020D: return wxT("EC_TAG_STATS_LOGGER_MESSAGE");
+		case 0x020E: return wxT("EC_TAG_STATS_KAD_FIREWALLED_UDP");
+		case 0x020F: return wxT("EC_TAG_STATS_KAD_INDEXED_SOURCES");
+		case 0x0210: return wxT("EC_TAG_STATS_KAD_INDEXED_KEYWORDS");
+		case 0x0211: return wxT("EC_TAG_STATS_KAD_INDEXED_NOTES");
+		case 0x0212: return wxT("EC_TAG_STATS_KAD_INDEXED_LOAD");
+		case 0x0213: return wxT("EC_TAG_STATS_KAD_IP_ADRESS");
+		case 0x0214: return wxT("EC_TAG_STATS_BUDDY_STATUS");
+		case 0x0215: return wxT("EC_TAG_STATS_BUDDY_IP");
+		case 0x0216: return wxT("EC_TAG_STATS_BUDDY_PORT");
+		case 0x0217: return wxT("EC_TAG_STATS_KAD_IN_LAN_MODE");
+		case 0x0218: return wxT("EC_TAG_STATS_TOTAL_SENT_BYTES");
+		case 0x0219: return wxT("EC_TAG_STATS_TOTAL_RECEIVED_BYTES");
+		case 0x021A: return wxT("EC_TAG_STATS_SHARED_FILE_COUNT");
+		case 0x0300: return wxT("EC_TAG_PARTFILE");
+		case 0x0301: return wxT("EC_TAG_PARTFILE_NAME");
+		case 0x0302: return wxT("EC_TAG_PARTFILE_PARTMETID");
+		case 0x0303: return wxT("EC_TAG_PARTFILE_SIZE_FULL");
+		case 0x0304: return wxT("EC_TAG_PARTFILE_SIZE_XFER");
+		case 0x0305: return wxT("EC_TAG_PARTFILE_SIZE_XFER_UP");
+		case 0x0306: return wxT("EC_TAG_PARTFILE_SIZE_DONE");
+		case 0x0307: return wxT("EC_TAG_PARTFILE_SPEED");
+		case 0x0308: return wxT("EC_TAG_PARTFILE_STATUS");
+		case 0x0309: return wxT("EC_TAG_PARTFILE_PRIO");
+		case 0x030A: return wxT("EC_TAG_PARTFILE_SOURCE_COUNT");
+		case 0x030B: return wxT("EC_TAG_PARTFILE_SOURCE_COUNT_A4AF");
+		case 0x030C: return wxT("EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT");
+		case 0x030D: return wxT("EC_TAG_PARTFILE_SOURCE_COUNT_XFER");
+		case 0x030E: return wxT("EC_TAG_PARTFILE_ED2K_LINK");
+		case 0x030F: return wxT("EC_TAG_PARTFILE_CAT");
+		case 0x0310: return wxT("EC_TAG_PARTFILE_LAST_RECV");
+		case 0x0311: return wxT("EC_TAG_PARTFILE_LAST_SEEN_COMP");
+		case 0x0312: return wxT("EC_TAG_PARTFILE_PART_STATUS");
+		case 0x0313: return wxT("EC_TAG_PARTFILE_GAP_STATUS");
+		case 0x0314: return wxT("EC_TAG_PARTFILE_REQ_STATUS");
+		case 0x0315: return wxT("EC_TAG_PARTFILE_SOURCE_NAMES");
+		case 0x0316: return wxT("EC_TAG_PARTFILE_COMMENTS");
+		case 0x0317: return wxT("EC_TAG_PARTFILE_STOPPED");
+		case 0x0318: return wxT("EC_TAG_PARTFILE_DOWNLOAD_ACTIVE");
+		case 0x0319: return wxT("EC_TAG_PARTFILE_LOST_CORRUPTION");
+		case 0x031A: return wxT("EC_TAG_PARTFILE_GAINED_COMPRESSION");
+		case 0x031B: return wxT("EC_TAG_PARTFILE_SAVED_ICH");
+		case 0x031C: return wxT("EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS");
+		case 0x031D: return wxT("EC_TAG_PARTFILE_AVAILABLE_PARTS");
+		case 0x031E: return wxT("EC_TAG_PARTFILE_HASH");
+		case 0x031F: return wxT("EC_TAG_PARTFILE_SHARED");
+		case 0x0320: return wxT("EC_TAG_PARTFILE_HASHED_PART_COUNT");
+		case 0x0321: return wxT("EC_TAG_PARTFILE_A4AFAUTO");
+		case 0x0322: return wxT("EC_TAG_PARTFILE_A4AF_SOURCES");
+		case 0x0400: return wxT("EC_TAG_KNOWNFILE");
+		case 0x0401: return wxT("EC_TAG_KNOWNFILE_XFERRED");
+		case 0x0402: return wxT("EC_TAG_KNOWNFILE_XFERRED_ALL");
+		case 0x0403: return wxT("EC_TAG_KNOWNFILE_REQ_COUNT");
+		case 0x0404: return wxT("EC_TAG_KNOWNFILE_REQ_COUNT_ALL");
+		case 0x0405: return wxT("EC_TAG_KNOWNFILE_ACCEPT_COUNT");
+		case 0x0406: return wxT("EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL");
+		case 0x0407: return wxT("EC_TAG_KNOWNFILE_AICH_MASTERHASH");
+		case 0x0408: return wxT("EC_TAG_KNOWNFILE_FILENAME");
+		case 0x0409: return wxT("EC_TAG_KNOWNFILE_COMPLETE_SOURCES_LOW");
+		case 0x040A: return wxT("EC_TAG_KNOWNFILE_COMPLETE_SOURCES_HIGH");
+		case 0x040B: return wxT("EC_TAG_KNOWNFILE_PRIO");
+		case 0x040C: return wxT("EC_TAG_KNOWNFILE_ON_QUEUE");
+		case 0x040D: return wxT("EC_TAG_KNOWNFILE_COMPLETE_SOURCES");
+		case 0x040E: return wxT("EC_TAG_KNOWNFILE_COMMENT");
+		case 0x040F: return wxT("EC_TAG_KNOWNFILE_RATING");
+		case 0x0500: return wxT("EC_TAG_SERVER");
+		case 0x0501: return wxT("EC_TAG_SERVER_NAME");
+		case 0x0502: return wxT("EC_TAG_SERVER_DESC");
+		case 0x0503: return wxT("EC_TAG_SERVER_ADDRESS");
+		case 0x0504: return wxT("EC_TAG_SERVER_PING");
+		case 0x0505: return wxT("EC_TAG_SERVER_USERS");
+		case 0x0506: return wxT("EC_TAG_SERVER_USERS_MAX");
+		case 0x0507: return wxT("EC_TAG_SERVER_FILES");
+		case 0x0508: return wxT("EC_TAG_SERVER_PRIO");
+		case 0x0509: return wxT("EC_TAG_SERVER_FAILED");
+		case 0x050A: return wxT("EC_TAG_SERVER_STATIC");
+		case 0x050B: return wxT("EC_TAG_SERVER_VERSION");
+		case 0x050C: return wxT("EC_TAG_SERVER_IP");
+		case 0x050D: return wxT("EC_TAG_SERVER_PORT");
+		case 0x0600: return wxT("EC_TAG_CLIENT");
+		case 0x0601: return wxT("EC_TAG_CLIENT_SOFTWARE");
+		case 0x0602: return wxT("EC_TAG_CLIENT_SCORE");
+		case 0x0603: return wxT("EC_TAG_CLIENT_HASH");
+		case 0x0604: return wxT("EC_TAG_CLIENT_FRIEND_SLOT");
+		case 0x0605: return wxT("EC_TAG_CLIENT_WAIT_TIME");
+		case 0x0606: return wxT("EC_TAG_CLIENT_XFER_TIME");
+		case 0x0607: return wxT("EC_TAG_CLIENT_QUEUE_TIME");
+		case 0x0608: return wxT("EC_TAG_CLIENT_LAST_TIME");
+		case 0x0609: return wxT("EC_TAG_CLIENT_UPLOAD_SESSION");
+		case 0x060A: return wxT("EC_TAG_CLIENT_UPLOAD_TOTAL");
+		case 0x060B: return wxT("EC_TAG_CLIENT_DOWNLOAD_TOTAL");
+		case 0x060C: return wxT("EC_TAG_CLIENT_DOWNLOAD_STATE");
+		case 0x060D: return wxT("EC_TAG_CLIENT_UP_SPEED");
+		case 0x060E: return wxT("EC_TAG_CLIENT_DOWN_SPEED");
+		case 0x060F: return wxT("EC_TAG_CLIENT_FROM");
+		case 0x0610: return wxT("EC_TAG_CLIENT_USER_IP");
+		case 0x0611: return wxT("EC_TAG_CLIENT_USER_PORT");
+		case 0x0612: return wxT("EC_TAG_CLIENT_SERVER_IP");
+		case 0x0613: return wxT("EC_TAG_CLIENT_SERVER_PORT");
+		case 0x0614: return wxT("EC_TAG_CLIENT_SERVER_NAME");
+		case 0x0615: return wxT("EC_TAG_CLIENT_SOFT_VER_STR");
+		case 0x0616: return wxT("EC_TAG_CLIENT_WAITING_POSITION");
+		case 0x0617: return wxT("EC_TAG_CLIENT_IDENT_STATE");
+		case 0x0618: return wxT("EC_TAG_CLIENT_OBFUSCATION_STATUS");
+		case 0x0619: return wxT("EC_TAG_CLIENT_CURRENTLYUNUSED1");
+		case 0x061A: return wxT("EC_TAG_CLIENT_REMOTE_QUEUE_RANK");
+		case 0x061B: return wxT("EC_TAG_CLIENT_DISABLE_VIEW_SHARED");
+		case 0x061C: return wxT("EC_TAG_CLIENT_UPLOAD_STATE");
+		case 0x061D: return wxT("EC_TAG_CLIENT_EXT_PROTOCOL");
+		case 0x061E: return wxT("EC_TAG_CLIENT_USER_ID");
+		case 0x061F: return wxT("EC_TAG_CLIENT_UPLOAD_FILE");
+		case 0x0620: return wxT("EC_TAG_CLIENT_REQUEST_FILE");
+		case 0x0621: return wxT("EC_TAG_CLIENT_A4AF_FILES");
+		case 0x0622: return wxT("EC_TAG_CLIENT_OLD_REMOTE_QUEUE_RANK");
+		case 0x0623: return wxT("EC_TAG_CLIENT_KAD_PORT");
+		case 0x0624: return wxT("EC_TAG_CLIENT_PART_STATUS");
+		case 0x0625: return wxT("EC_TAG_CLIENT_NEXT_REQUESTED_PART");
+		case 0x0626: return wxT("EC_TAG_CLIENT_LAST_DOWNLOADING_PART");
+		case 0x0627: return wxT("EC_TAG_CLIENT_REMOTE_FILENAME");
+		case 0x0628: return wxT("EC_TAG_CLIENT_MOD_VERSION");
+		case 0x0629: return wxT("EC_TAG_CLIENT_OS_INFO");
+		case 0x062A: return wxT("EC_TAG_CLIENT_AVAILABLE_PARTS");
+		case 0x062B: return wxT("EC_TAG_CLIENT_UPLOAD_PART_STATUS");
+		case 0x0700: return wxT("EC_TAG_SEARCHFILE");
+		case 0x0701: return wxT("EC_TAG_SEARCH_TYPE");
+		case 0x0702: return wxT("EC_TAG_SEARCH_NAME");
+		case 0x0703: return wxT("EC_TAG_SEARCH_MIN_SIZE");
+		case 0x0704: return wxT("EC_TAG_SEARCH_MAX_SIZE");
+		case 0x0705: return wxT("EC_TAG_SEARCH_FILE_TYPE");
+		case 0x0706: return wxT("EC_TAG_SEARCH_EXTENSION");
+		case 0x0707: return wxT("EC_TAG_SEARCH_AVAILABILITY");
+		case 0x0708: return wxT("EC_TAG_SEARCH_STATUS");
+		case 0x0709: return wxT("EC_TAG_SEARCH_PARENT");
+		case 0x0800: return wxT("EC_TAG_FRIEND");
+		case 0x0801: return wxT("EC_TAG_FRIEND_NAME");
+		case 0x0802: return wxT("EC_TAG_FRIEND_HASH");
+		case 0x0803: return wxT("EC_TAG_FRIEND_IP");
+		case 0x0804: return wxT("EC_TAG_FRIEND_PORT");
+		case 0x0805: return wxT("EC_TAG_FRIEND_CLIENT");
+		case 0x0806: return wxT("EC_TAG_FRIEND_ADD");
+		case 0x0807: return wxT("EC_TAG_FRIEND_REMOVE");
+		case 0x0808: return wxT("EC_TAG_FRIEND_FRIENDSLOT");
+		case 0x0809: return wxT("EC_TAG_FRIEND_SHARED");
+		case 0x1000: return wxT("EC_TAG_SELECT_PREFS");
+		case 0x1100: return wxT("EC_TAG_PREFS_CATEGORIES");
+		case 0x1101: return wxT("EC_TAG_CATEGORY");
+		case 0x1102: return wxT("EC_TAG_CATEGORY_TITLE");
+		case 0x1103: return wxT("EC_TAG_CATEGORY_PATH");
+		case 0x1104: return wxT("EC_TAG_CATEGORY_COMMENT");
+		case 0x1105: return wxT("EC_TAG_CATEGORY_COLOR");
+		case 0x1106: return wxT("EC_TAG_CATEGORY_PRIO");
+		case 0x1200: return wxT("EC_TAG_PREFS_GENERAL");
+		case 0x1201: return wxT("EC_TAG_USER_NICK");
+		case 0x1202: return wxT("EC_TAG_USER_HASH");
+		case 0x1203: return wxT("EC_TAG_USER_HOST");
+		case 0x1204: return wxT("EC_TAG_GENERAL_CHECK_NEW_VERSION");
+		case 0x1300: return wxT("EC_TAG_PREFS_CONNECTIONS");
+		case 0x1301: return wxT("EC_TAG_CONN_DL_CAP");
+		case 0x1302: return wxT("EC_TAG_CONN_UL_CAP");
+		case 0x1303: return wxT("EC_TAG_CONN_MAX_DL");
+		case 0x1304: return wxT("EC_TAG_CONN_MAX_UL");
+		case 0x1305: return wxT("EC_TAG_CONN_SLOT_ALLOCATION");
+		case 0x1306: return wxT("EC_TAG_CONN_TCP_PORT");
+		case 0x1307: return wxT("EC_TAG_CONN_UDP_PORT");
+		case 0x1308: return wxT("EC_TAG_CONN_UDP_DISABLE");
+		case 0x1309: return wxT("EC_TAG_CONN_MAX_FILE_SOURCES");
+		case 0x130A: return wxT("EC_TAG_CONN_MAX_CONN");
+		case 0x130B: return wxT("EC_TAG_CONN_AUTOCONNECT");
+		case 0x130C: return wxT("EC_TAG_CONN_RECONNECT");
+		case 0x130D: return wxT("EC_TAG_NETWORK_ED2K");
+		case 0x130E: return wxT("EC_TAG_NETWORK_KADEMLIA");
+		case 0x1400: return wxT("EC_TAG_PREFS_MESSAGEFILTER");
+		case 0x1401: return wxT("EC_TAG_MSGFILTER_ENABLED");
+		case 0x1402: return wxT("EC_TAG_MSGFILTER_ALL");
+		case 0x1403: return wxT("EC_TAG_MSGFILTER_FRIENDS");
+		case 0x1404: return wxT("EC_TAG_MSGFILTER_SECURE");
+		case 0x1405: return wxT("EC_TAG_MSGFILTER_BY_KEYWORD");
+		case 0x1406: return wxT("EC_TAG_MSGFILTER_KEYWORDS");
+		case 0x1500: return wxT("EC_TAG_PREFS_REMOTECTRL");
+		case 0x1501: return wxT("EC_TAG_WEBSERVER_AUTORUN");
+		case 0x1502: return wxT("EC_TAG_WEBSERVER_PORT");
+		case 0x1503: return wxT("EC_TAG_WEBSERVER_GUEST");
+		case 0x1504: return wxT("EC_TAG_WEBSERVER_USEGZIP");
+		case 0x1505: return wxT("EC_TAG_WEBSERVER_REFRESH");
+		case 0x1506: return wxT("EC_TAG_WEBSERVER_TEMPLATE");
+		case 0x1600: return wxT("EC_TAG_PREFS_ONLINESIG");
+		case 0x1601: return wxT("EC_TAG_ONLINESIG_ENABLED");
+		case 0x1700: return wxT("EC_TAG_PREFS_SERVERS");
+		case 0x1701: return wxT("EC_TAG_SERVERS_REMOVE_DEAD");
+		case 0x1702: return wxT("EC_TAG_SERVERS_DEAD_SERVER_RETRIES");
+		case 0x1703: return wxT("EC_TAG_SERVERS_AUTO_UPDATE");
+		case 0x1704: return wxT("EC_TAG_SERVERS_URL_LIST");
+		case 0x1705: return wxT("EC_TAG_SERVERS_ADD_FROM_SERVER");
+		case 0x1706: return wxT("EC_TAG_SERVERS_ADD_FROM_CLIENT");
+		case 0x1707: return wxT("EC_TAG_SERVERS_USE_SCORE_SYSTEM");
+		case 0x1708: return wxT("EC_TAG_SERVERS_SMART_ID_CHECK");
+		case 0x1709: return wxT("EC_TAG_SERVERS_SAFE_SERVER_CONNECT");
+		case 0x170A: return wxT("EC_TAG_SERVERS_AUTOCONN_STATIC_ONLY");
+		case 0x170B: return wxT("EC_TAG_SERVERS_MANUAL_HIGH_PRIO");
+		case 0x170C: return wxT("EC_TAG_SERVERS_UPDATE_URL");
+		case 0x1800: return wxT("EC_TAG_PREFS_FILES");
+		case 0x1801: return wxT("EC_TAG_FILES_ICH_ENABLED");
+		case 0x1802: return wxT("EC_TAG_FILES_AICH_TRUST");
+		case 0x1803: return wxT("EC_TAG_FILES_NEW_PAUSED");
+		case 0x1804: return wxT("EC_TAG_FILES_NEW_AUTO_DL_PRIO");
+		case 0x1805: return wxT("EC_TAG_FILES_PREVIEW_PRIO");
+		case 0x1806: return wxT("EC_TAG_FILES_NEW_AUTO_UL_PRIO");
+		case 0x1807: return wxT("EC_TAG_FILES_UL_FULL_CHUNKS");
+		case 0x1808: return wxT("EC_TAG_FILES_START_NEXT_PAUSED");
+		case 0x1809: return wxT("EC_TAG_FILES_RESUME_SAME_CAT");
+		case 0x180A: return wxT("EC_TAG_FILES_SAVE_SOURCES");
+		case 0x180B: return wxT("EC_TAG_FILES_EXTRACT_METADATA");
+		case 0x180C: return wxT("EC_TAG_FILES_ALLOC_FULL_SIZE");
+		case 0x180D: return wxT("EC_TAG_FILES_CHECK_FREE_SPACE");
+		case 0x180E: return wxT("EC_TAG_FILES_MIN_FREE_SPACE");
+		case 0x1900: return wxT("EC_TAG_PREFS_SRCDROP");
+		case 0x1901: return wxT("EC_TAG_SRCDROP_NONEEDED");
+		case 0x1902: return wxT("EC_TAG_SRCDROP_DROP_FQS");
+		case 0x1903: return wxT("EC_TAG_SRCDROP_DROP_HQRS");
+		case 0x1904: return wxT("EC_TAG_SRCDROP_HQRS_VALUE");
+		case 0x1905: return wxT("EC_TAG_SRCDROP_AUTODROP_TIMER");
+		case 0x1A00: return wxT("EC_TAG_PREFS_DIRECTORIES");
+		case 0x1A01: return wxT("EC_TAG_DIRECTORIES_INCOMING");
+		case 0x1A02: return wxT("EC_TAG_DIRECTORIES_TEMP");
+		case 0x1A03: return wxT("EC_TAG_DIRECTORIES_SHARED");
+		case 0x1A04: return wxT("EC_TAG_DIRECTORIES_SHARE_HIDDEN");
+		case 0x1B00: return wxT("EC_TAG_PREFS_STATISTICS");
+		case 0x1B01: return wxT("EC_TAG_STATSGRAPH_WIDTH");
+		case 0x1B02: return wxT("EC_TAG_STATSGRAPH_SCALE");
+		case 0x1B03: return wxT("EC_TAG_STATSGRAPH_LAST");
+		case 0x1B04: return wxT("EC_TAG_STATSGRAPH_DATA");
+		case 0x1B05: return wxT("EC_TAG_STATTREE_CAPPING");
+		case 0x1B06: return wxT("EC_TAG_STATTREE_NODE");
+		case 0x1B07: return wxT("EC_TAG_STAT_NODE_VALUE");
+		case 0x1B08: return wxT("EC_TAG_STAT_VALUE_TYPE");
+		case 0x1B09: return wxT("EC_TAG_STATTREE_NODEID");
+		case 0x1C00: return wxT("EC_TAG_PREFS_SECURITY");
+		case 0x1C01: return wxT("EC_TAG_SECURITY_CAN_SEE_SHARES");
+		case 0x1C02: return wxT("EC_TAG_IPFILTER_CLIENTS");
+		case 0x1C03: return wxT("EC_TAG_IPFILTER_SERVERS");
+		case 0x1C04: return wxT("EC_TAG_IPFILTER_AUTO_UPDATE");
+		case 0x1C05: return wxT("EC_TAG_IPFILTER_UPDATE_URL");
+		case 0x1C06: return wxT("EC_TAG_IPFILTER_LEVEL");
+		case 0x1C07: return wxT("EC_TAG_IPFILTER_FILTER_LAN");
+		case 0x1C08: return wxT("EC_TAG_SECURITY_USE_SECIDENT");
+		case 0x1C09: return wxT("EC_TAG_SECURITY_OBFUSCATION_SUPPORTED");
+		case 0x1C0A: return wxT("EC_TAG_SECURITY_OBFUSCATION_REQUESTED");
+		case 0x1C0B: return wxT("EC_TAG_SECURITY_OBFUSCATION_REQUIRED");
+		case 0x1D00: return wxT("EC_TAG_PREFS_CORETWEAKS");
+		case 0x1D01: return wxT("EC_TAG_CORETW_MAX_CONN_PER_FIVE");
+		case 0x1D02: return wxT("EC_TAG_CORETW_VERBOSE");
+		case 0x1D03: return wxT("EC_TAG_CORETW_FILEBUFFER");
+		case 0x1D04: return wxT("EC_TAG_CORETW_UL_QUEUE");
+		case 0x1D05: return wxT("EC_TAG_CORETW_SRV_KEEPALIVE_TIMEOUT");
+		case 0x1E00: return wxT("EC_TAG_PREFS_KADEMLIA");
+		case 0x1E01: return wxT("EC_TAG_KADEMLIA_UPDATE_URL");
+		default: return CFormat(wxT("unknown %d 0x%x")) % arg % arg;
+	}
+}
+
+wxString GetDebugNameEC_DETAIL_LEVEL(uint8 arg)
+{
+	switch (arg) {
+		case 0x00: return wxT("EC_DETAIL_CMD");
+		case 0x01: return wxT("EC_DETAIL_WEB");
+		case 0x02: return wxT("EC_DETAIL_FULL");
+		case 0x03: return wxT("EC_DETAIL_UPDATE");
+		case 0x04: return wxT("EC_DETAIL_INC_UPDATE");
+		default: return CFormat(wxT("unknown %d 0x%x")) % arg % arg;
+	}
+}
+
+wxString GetDebugNameEC_SEARCH_TYPE(uint8 arg)
+{
+	switch (arg) {
+		case 0x00: return wxT("EC_SEARCH_LOCAL");
+		case 0x01: return wxT("EC_SEARCH_GLOBAL");
+		case 0x02: return wxT("EC_SEARCH_KAD");
+		case 0x03: return wxT("EC_SEARCH_WEB");
+		default: return CFormat(wxT("unknown %d 0x%x")) % arg % arg;
+	}
+}
+
+wxString GetDebugNameEC_STATTREE_NODE_VALUE_TYPE(uint8 arg)
+{
+	switch (arg) {
+		case 0x00: return wxT("EC_VALUE_INTEGER");
+		case 0x01: return wxT("EC_VALUE_ISTRING");
+		case 0x02: return wxT("EC_VALUE_BYTES");
+		case 0x03: return wxT("EC_VALUE_ISHORT");
+		case 0x04: return wxT("EC_VALUE_TIME");
+		case 0x05: return wxT("EC_VALUE_SPEED");
+		case 0x06: return wxT("EC_VALUE_STRING");
+		case 0x07: return wxT("EC_VALUE_DOUBLE");
+		default: return CFormat(wxT("unknown %d 0x%x")) % arg % arg;
+	}
+}
+
+wxString GetDebugNameEcPrefs(uint32 arg)
+{
+	switch (arg) {
+		case 0x00000001: return wxT("EC_PREFS_CATEGORIES");
+		case 0x00000002: return wxT("EC_PREFS_GENERAL");
+		case 0x00000004: return wxT("EC_PREFS_CONNECTIONS");
+		case 0x00000008: return wxT("EC_PREFS_MESSAGEFILTER");
+		case 0x00000010: return wxT("EC_PREFS_REMOTECONTROLS");
+		case 0x00000020: return wxT("EC_PREFS_ONLINESIG");
+		case 0x00000040: return wxT("EC_PREFS_SERVERS");
+		case 0x00000080: return wxT("EC_PREFS_FILES");
+		case 0x00000100: return wxT("EC_PREFS_SRCDROP");
+		case 0x00000200: return wxT("EC_PREFS_DIRECTORIES");
+		case 0x00000400: return wxT("EC_PREFS_STATISTICS");
+		case 0x00000800: return wxT("EC_PREFS_SECURITY");
+		case 0x00001000: return wxT("EC_PREFS_CORETWEAKS");
+		case 0x00002000: return wxT("EC_PREFS_KADEMLIA");
+		default: return CFormat(wxT("unknown %d 0x%x")) % arg % arg;
+	}
+}
+
+#endif	// DEBUG_EC_IMPLEMENTATION
+
 #endif // __ECCODES_H__

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECFileConfig.h -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECFileConfig.h Changed

aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECID.h Added

@@ -0,0 +1,46 @@
+//
+// 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
+//
+
+#ifndef ECID_H
+#define ECID_H
+
+#include "../../../Types.h"	// Needed for uint32
+
+/*
+ * Class to create unique IDs for Objects transmitted through EC
+ * (Partfiles, Knownfiles, clients...)
+ */
+class CECID {
+	// the id
+	uint32 m_ID;
+	// counter to calculate unique ids (defined in ECTag.cpp)
+	static uint32 s_IDCounter;
+public:
+	CECID()				{ m_ID = ++s_IDCounter; }
+	CECID(uint32 id)	{ m_ID = id; }
+	uint32 ECID() const	{ return m_ID; }
+	void RenewECID()	{ m_ID = ++s_IDCounter; }
+};
+
+#endif

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECMuleSocket.cpp -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECMuleSocket.cpp Changed

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECMuleSocket.h -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECMuleSocket.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2004-2009 Angel Vidal Veiga ( kry@users.sourceforge.net )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@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
@@ -49,8 +49,8 @@
  
 	size_t InternalLastCount() { return wxSocketClient::LastCount(); };
 	bool InternalWaitOnConnect(long secs = -1, long msecs = 0) { return wxSocketClient::WaitOnConnect(secs,msecs); };
-	bool InternalWaitForWrite(long secs = -1, long msecs = 0) { return wxSocketClient::WaitForRead(secs,msecs); };
-	bool InternalWaitForRead(long secs = -1, long msecs = 0) { return wxSocketClient::WaitForWrite(secs,msecs); };
+	bool InternalWaitForWrite(long secs = -1, long msecs = 0) { return wxSocketClient::WaitForWrite(secs,msecs); };
+	bool InternalWaitForRead(long secs = -1, long msecs = 0) { return wxSocketClient::WaitForRead(secs,msecs); };
 	
 	bool InternalError() { return wxSocketClient::Error(); }
 	void InternalClose() { wxSocketClient::Close(); }

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECPacket.cpp -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECPacket.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-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
@@ -33,20 +33,8 @@
 
 bool CECPacket::ReadFromSocket(CECSocket& socket)
 {
-	if (m_state == bsName) {
-		if (!socket.ReadNumber(&m_opCode, sizeof(ec_opcode_t))) {
-			return false;
-		} else {
-			m_state = bsChildCnt;
-		}
-	}
-	if (m_state == bsChildCnt || m_state == bsChildren) {
-		if (!ReadChildren(socket)) {
-			return false;
-		}
-	}
-	m_state = bsFinished;
-	return true;
+	return socket.ReadNumber(&m_opCode, sizeof(ec_opcode_t))
+		&& ReadChildren(socket);
 }
 
 
@@ -57,6 +45,29 @@
 	return true;
 }
 
+#ifdef __DEBUG__
+#include <common/Format.h>  // Needed for CFormat
+void CECPacket::DebugPrint(bool incoming, uint32 trueSize) const
+{
+	wxString GetDebugNameECOpCodes(uint8 arg);
+
+	if (ECLogIsEnabled()) {
+		uint32 size = GetPacketLength() + sizeof(ec_opcode_t) + 2;	// full length incl. header
+
+		if (trueSize == 0 || size == trueSize) {
+			DoECLogLine(CFormat(wxT("%s %s %d")) % (incoming ? wxT("<") : wxT(">")) 
+				% GetDebugNameECOpCodes(m_opCode) % size);
+		} else {
+			DoECLogLine(CFormat(wxT("%s %s %d (compressed: %d)")) % (incoming ? wxT("<") : wxT(">")) 
+				% GetDebugNameECOpCodes(m_opCode) % size % trueSize);
+		}
+		CECTag::DebugPrint(1, false);
+	}
+}
+#else
+void CECPacket::DebugPrint(bool, uint32) const {}
+#endif
+
 /*!
  * \fn CECPacket::CECPacket(ec_opcode_t opCode, EC_DETAIL_LEVEL detail_level)
  *

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECPacket.h -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECPacket.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-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
@@ -36,7 +36,7 @@
 /**
  * High level EC packet handler class
  */
-class CECPacket : protected CECEmptyTag {
+class CECPacket : public CECEmptyTag {
 	friend class CECSocket;
 	public:
 		CECPacket(ec_opcode_t opCode, EC_DETAIL_LEVEL detail_level = EC_DETAIL_FULL)
@@ -48,13 +48,6 @@
 			}
 		}
 		
-		using CECTag::AddTag;
-		using CECTag::GetTagByIndex;
-		using CECTag::GetTagByIndexSafe;
-		using CECTag::GetTagByName;
-		using CECTag::GetTagByNameSafe;
-		using CECTag::GetTagCount;
-
 		ec_opcode_t	GetOpCode(void) const { return m_opCode; }
 		uint32_t		GetPacketLength(void) const { return CECTag::GetTagLen(); }
 		EC_DETAIL_LEVEL GetDetailLevel() const
@@ -62,16 +55,18 @@
 			const CECTag *tag = GetTagByName(EC_TAG_DETAIL_LEVEL);
 			return (tag) ? (EC_DETAIL_LEVEL)tag->GetInt() : EC_DETAIL_FULL;
 		}
+		void DebugPrint(bool incoming, uint32 trueSize = 0) const;
 		
 	private:
-		CECPacket(const CECSocket& socket)
-			: CECEmptyTag(socket)
-			{}
+		CECPacket()	: CECEmptyTag() {}
 
 		bool ReadFromSocket(CECSocket& socket);
 		bool WritePacket(CECSocket& socket) const;
 		ec_opcode_t	m_opCode;
 };
 
+bool ECLogIsEnabled();
+void DoECLogLine(const wxString &line);
+
 #endif /* ECPACKET_H */
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECSocket.cpp -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECSocket.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2004-2009 Angel Vidal Veiga ( kry@users.sourceforge.net )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@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
@@ -32,8 +32,10 @@
 using namespace std;
 
 #include "ECPacket.h"		// Needed for CECPacket
+#include "../../../Logger.h"
+#include <common/Format.h>	// Needed for CFormat
 
-#define EC_COMPRESSION_LEVEL	Z_BEST_COMPRESSION
+#define EC_COMPRESSION_LEVEL	Z_DEFAULT_COMPRESSION
 #define EC_MAX_UNCOMPRESSED	1024
 
 #ifndef __GNUC__
@@ -62,7 +64,7 @@
 	uint32_t  lval;
 };
 
-static struct utf8_table utf8_table[] =
+static const struct utf8_table utf8_table[] =
 {
     {0x80,  0x00,   0*6,    0x7F,           0,         /* 1 byte sequence */},
     {0xE0,  0xC0,   1*6,    0x7FF,          0x80,      /* 2 byte sequence */},
@@ -77,7 +79,7 @@
 {
 	uint32_t l;
 	int c0, c, nc;
-	struct utf8_table *t;
+	const struct utf8_table *t;
 
 	nc = 0;
 	c0 = *s;
@@ -106,7 +108,7 @@
 {
 	uint32_t l;
 	int c, nc;
-	struct utf8_table *t;
+	const struct utf8_table *t;
 
 	l = wc;
 	nc = 0;
@@ -199,6 +201,7 @@
 	do {
 		// Give socket a 10 sec chance to recv more data.
 		if ( !sock->WaitSocketRead(10, 0) ) {
+			AddDebugLogLineN(logEC, wxT("ReadFromSocketAll: socket is blocking"));
 			break;
 		}
 
@@ -207,8 +210,9 @@
 		m_wr_ptr += sock->GetLastCount();
 		read_rem -= sock->GetLastCount();
 
-		if (sock->SocketError() && !sock->WouldBlock()) {
-				break;
+		if (sock->SocketRealError()) {
+			AddDebugLogLineN(logEC, wxT("ReadFromSocketAll: socket error"));
+			break;
 		}
 	} while (read_rem);
 
@@ -255,17 +259,17 @@
 CECSocket::CECSocket(bool use_events)
 :
 m_use_events(use_events),
-m_output_queue(),
 m_in_ptr(EC_SOCKET_BUFFER_SIZE),
 m_out_ptr(EC_SOCKET_BUFFER_SIZE),
 m_curr_rx_data(new CQueuedData(EC_SOCKET_BUFFER_SIZE)),
 m_curr_tx_data(new CQueuedData(EC_SOCKET_BUFFER_SIZE)),
 m_rx_flags(0),
 m_tx_flags(0),
-m_my_flags(0x20 | EC_FLAG_ZLIB | EC_FLAG_UTF8_NUMBERS | EC_FLAG_ACCEPTS),
 // setup initial state: 4 flags + 4 length
-m_bytes_needed(8),
-m_in_header(true)
+m_bytes_needed(EC_HEADER_SIZE),
+m_in_header(true),
+m_my_flags(0x20),
+m_haveNotificationSupport(false)
 {
 	
 }
@@ -281,49 +285,32 @@
 
 bool CECSocket::ConnectSocket(uint32_t ip, uint16_t port)
 {
-	bool res;
-#if wxCHECK_VERSION(2, 8, 8)
-	res = InternalConnect(ip, port, !m_use_events);
-#else
-	res = InternalConnect(ip, port, false);
-	if ( !m_use_events ) {
-		res = WaitSocketConnect(10, 0) && InternalIsConnected();
-		if ( res ) {
-			OnConnect();
-		} else {
-			OnLost();
-		}
-	}
-#endif
+	bool res = InternalConnect(ip, port, !m_use_events);
 	return !SocketError() && res;
 }
 
 void CECSocket::SendPacket(const CECPacket *packet)
 {
-	WritePacket(packet);
+	uint32 len = WritePacket(packet);
+	packet->DebugPrint(false, len);
 	OnOutput();
 }
 
 const CECPacket *CECSocket::SendRecvPacket(const CECPacket *packet)
 {
 	SendPacket(packet);
-	m_curr_rx_data->ReadFromSocketAll(this, 2 * sizeof(uint32_t));
-	if (SocketError() && !WouldBlock()) {
+	
+	if (m_curr_rx_data->ReadFromSocketAll(this, EC_HEADER_SIZE) != EC_HEADER_SIZE
+		|| SocketError()		// This is a synchronous read, so WouldBlock is an error too.
+		|| !ReadHeader()) {
 		OnError();
+		AddDebugLogLineN(logEC, wxT("SendRecvPacket: error"));
 		return 0;
 	}
-
-	m_curr_rx_data->Read(&m_rx_flags, sizeof(m_rx_flags));
-	m_rx_flags = ENDIAN_NTOHL(m_rx_flags);
-	m_curr_rx_data->Read(&m_curr_packet_len, sizeof(m_curr_packet_len));
-	m_curr_packet_len = ENDIAN_NTOHL(m_curr_packet_len);
-	
-	if ( m_curr_rx_data->GetLength() < (m_curr_packet_len+2*sizeof(uint32_t)) ) {
-		m_curr_rx_data.reset(new CQueuedData(m_curr_packet_len));
-	}
-	m_curr_rx_data->ReadFromSocketAll(this, m_curr_packet_len);
-	if (SocketError() && !WouldBlock()) {
+	if (m_curr_rx_data->ReadFromSocketAll(this, m_curr_packet_len) != m_curr_packet_len
+		|| SocketError()) {
 		OnError();
+		AddDebugLogLineN(logEC, wxT("SendRecvPacket: error"));
 		return 0;
 	}
 	const CECPacket *reply = ReadPacket();
@@ -355,14 +342,22 @@
 			return "The timeout for this operation expired";
 		case EC_ERROR_MEMERR:
 			return "Memory exhausted";
-		case EC_ERROR_DUMMY:
-			return "Dummy code - should not happen";
 	}
 	ostringstream error_string;
 	error_string << "Error code " << code <<  " unknown.";
 	return error_string.str();
 }
 
+bool CECSocket::SocketRealError() 
+{ 
+	bool ret = false;
+	if (InternalError()) {
+		int lastError = InternalGetLastError();
+		ret = lastError != EC_ERROR_NOERROR && lastError != EC_ERROR_WOULDBLOCK;
+	}
+	return ret;
+}
+
 void CECSocket::OnError()
 {
 #ifdef __DEBUG__
@@ -385,63 +380,39 @@
 {
 	size_t bytes_rx = 0;
 	do {
-		if (m_curr_rx_data.get()) {
-			m_curr_rx_data->ReadFromSocket(this, m_bytes_needed);
-		} else {
-			return;
-		}
-		if (SocketError() && !WouldBlock()) {
+		m_curr_rx_data->ReadFromSocket(this, m_bytes_needed);
+		if (SocketRealError()) {
+			AddDebugLogLineN(logEC, wxT("OnInput: socket error"));
 			OnError();
 			// socket already disconnected in this point
-			m_curr_rx_data.reset(0);
 			return;
 		}
 		bytes_rx = GetLastCount();
 		m_bytes_needed -= bytes_rx;
-	} while (m_bytes_needed && bytes_rx);
 	
-	if (!m_bytes_needed) {
-		if (m_in_header) {
-			m_in_header = false;
-			m_curr_rx_data->Read(&m_rx_flags, sizeof(m_rx_flags));
-			m_rx_flags = ENDIAN_NTOHL(m_rx_flags);
-			if (m_rx_flags & EC_FLAG_ACCEPTS) {
-				// Client sends its capabilities, update the internal mask.
-				m_curr_rx_data->Read(&m_my_flags, sizeof(m_my_flags));
-				m_my_flags = ENDIAN_NTOHL(m_my_flags);
-				//printf("Reading accepts mask: %x\n", m_my_flags);
-				wxASSERT(m_my_flags & 0x20);
-				// There has to be 4 more bytes. THERE HAS TO BE, DAMN IT.
-				m_curr_rx_data->ReadFromSocketAll(this, sizeof(m_curr_packet_len));
-			}
-			m_curr_rx_data->Read(&m_curr_packet_len, sizeof(m_curr_packet_len));
-			m_curr_packet_len = ENDIAN_NTOHL(m_curr_packet_len);
-			m_bytes_needed = m_curr_packet_len;
-			// packet bigger that 16Mb looks more like broken request
-			if (m_bytes_needed > 16*1024*1024) {
-				CloseSocket();
-				return;
-			}
-			size_t needed_size = m_bytes_needed + ((m_rx_flags & EC_FLAG_ACCEPTS) ? 12 : 8);
-			if (!m_curr_rx_data.get() ||
-			    m_curr_rx_data->GetLength() < needed_size) {
-				m_curr_rx_data.reset(new CQueuedData(needed_size));
-			}
-			//#warning Kry TODO: Read packet?
-		} else {
-			//m_curr_rx_data->DumpMem();
-			std::auto_ptr<const CECPacket> packet(ReadPacket());
-			m_curr_rx_data->Rewind();
-			if (packet.get()) {
-				std::auto_ptr<const CECPacket> reply(OnPacketReceived(packet.get()));
-				if (reply.get()) {
-					SendPacket(reply.get());
+		if (m_bytes_needed == 0) {
+			if (m_in_header) {
+				m_in_header = false;
+				if (!ReadHeader()) {
+					AddDebugLogLineN(logEC, wxT("OnInput: header error"));
+					return;
 				}
+			} else {
+				std::auto_ptr<const CECPacket> packet(ReadPacket());
+				m_curr_rx_data->Rewind();
+				if (packet.get()) {
+					std::auto_ptr<const CECPacket> reply(OnPacketReceived(packet.get(), m_curr_packet_len));
+					if (reply.get()) {
+						SendPacket(reply.get());
+					}
+				} else {
+					AddDebugLogLineN(logEC, wxT("OnInput: no packet"));
+				}
+				m_bytes_needed = EC_HEADER_SIZE;
+				m_in_header = true;
 			}
-			m_bytes_needed = 8;
-			m_in_header = true;
 		}
-	}
+	} while (bytes_rx);
 }
 
 void CECSocket::OnOutput()
@@ -454,25 +425,43 @@
 			delete data;
 		}
 		if (SocketError()) {
-			if (WouldBlock()) {
-				if ( m_use_events ) {
-					return;
-				} else {
-					if ( !WaitSocketWrite(10, 0) ) {
-						if (WouldBlock()) {
-							continue;
-						} else {
-							OnError();
-							break;
-						}
-	                		}
-				}
-			} else {
+			if (!WouldBlock()) {
+				// real error, abort
+				AddDebugLogLineN(logEC, wxT("OnOutput: socket error"));
 				OnError();
 				return;
 			}
+			// Now it's just a blocked socket.
+			if ( m_use_events ) {
+				// Event driven logic: return, OnOutput() will be called again later
+				return;
+			}
+			// Syncronous call: wait (for max 10 secs)
+			if ( !WaitSocketWrite(10, 0) ) {
+				// Still not through ?
+				if (WouldBlock()) {
+					// WouldBlock() is only EAGAIN or EWOULD_BLOCK, 
+					// and those shouldn't create an infinite wait.
+					// So give it another chance.
+					continue;
+				} else {
+					AddDebugLogLineN(logEC, wxT("OnOutput: socket error in sync wait"));
+					OnError();
+					break;
+				}
+			}
 		}
 	}
+	//
+	// All outstanding data sent to socket
+	// (used for push clients)
+	//
+	WriteDoneAndQueueEmpty();
+}
+
+bool CECSocket::DataPending()
+{
+	return !m_output_queue.empty();
 }
 
 //
@@ -485,6 +474,8 @@
 
 	if (m_curr_rx_data->GetUnreadDataLength() < required_len) {
 		// need more data that we have. Looks like nothing will help here
+		AddDebugLogLineN(logEC, CFormat(wxT("ReadBufferFromSocket: not enough data (%d < %d)")) 
+			% m_curr_rx_data->GetUnreadDataLength() % required_len);
 		return 0;
 	}
 	m_curr_rx_data->Read(buffer, required_len);
@@ -533,6 +524,50 @@
 	printf("ZLib error message: %s\n", strm->msg);
 	printf("zstream state:\n\tnext_in=%p\n\tavail_in=%u\n\ttotal_in=%lu\n\tnext_out=%p\n\tavail_out=%u\n\ttotal_out=%lu\n",
 		strm->next_in, strm->avail_in, strm->total_in, strm->next_out, strm->avail_out, strm->total_out);
+	AddDebugLogLineN(logEC, wxT("ZLib error"));
+}
+
+
+bool CECSocket::ReadHeader()
+{
+	m_curr_rx_data->Read(&m_rx_flags, 4);
+	m_rx_flags = ENDIAN_NTOHL(m_rx_flags);
+	m_curr_rx_data->Read(&m_curr_packet_len, 4);
+	m_curr_packet_len = ENDIAN_NTOHL(m_curr_packet_len);
+	m_bytes_needed = m_curr_packet_len;
+	// packet bigger that 16Mb looks more like broken request
+	if (m_bytes_needed > 16*1024*1024) {
+		AddDebugLogLineN(logEC, CFormat(wxT("ReadHeader: packet too big: %d")) % m_bytes_needed);
+		CloseSocket();
+		return false;
+	}
+	m_curr_rx_data->Rewind();
+	size_t currLength = m_curr_rx_data->GetLength();
+	// resize input buffer if
+	// a) too small or
+	if (currLength < m_bytes_needed
+	// b) way too large (free data again after receiving huge packets)
+		|| m_bytes_needed + EC_SOCKET_BUFFER_SIZE * 10 < currLength) {
+		// Client socket: IsAuthorized() is always true
+		// Server socket: do not allow growing of internal buffers before succesfull login.
+		// Otherwise sending a simple header with bogus length of 16MB-1 will crash an embedded
+		// client with memory exhaustion.
+		if (!IsAuthorized()) {
+			AddDebugLogLineN(logEC, CFormat(wxT("ReadHeader: resize (%d -> %d) on non autorized socket")) % currLength % m_bytes_needed);
+			CloseSocket();
+			return false;
+		}
+		// Don't make buffer smaller than EC_SOCKET_BUFFER_SIZE
+		size_t bufSize = m_bytes_needed;
+		if (bufSize < EC_SOCKET_BUFFER_SIZE) {
+			bufSize = EC_SOCKET_BUFFER_SIZE;
+		}
+		m_curr_rx_data.reset(new CQueuedData(bufSize));
+	}
+	if (ECLogIsEnabled()) {
+		DoECLogLine(CFormat(wxT("< %d ...")) % m_bytes_needed);
+	}
+	return true;
 }
 
 
@@ -598,6 +633,7 @@
 		if ( !m_z.avail_in ) {
 			// no reason for this situation: all packet should be
 			// buffered by now
+			AddDebugLogLineN(logEC, wxT("ReadBuffer: ZLib error"));
 			return false;
 		}
 		m_z.avail_out = (uInt)len;
@@ -605,12 +641,19 @@
 		int zerror = inflate(&m_z, Z_SYNC_FLUSH);
 		if ((zerror != Z_OK) && (zerror != Z_STREAM_END)) {
 			ShowZError(zerror, &m_z);
+			AddDebugLogLineN(logEC, wxT("ReadBuffer: ZLib error"));
 			return false;
 		}
 		return true;
 	} else {
 		// using uncompressed buffered i/o
-		return ReadBufferFromSocket(buffer, len) == len;
+		size_t read = ReadBufferFromSocket(buffer, len);
+		if (read == len) {
+			return true;
+		} else {
+			AddDebugLogLineN(logEC, CFormat(wxT("ReadBuffer: %d < %d")) % read % len);
+			return false;
+		}
 	}
 }
 
@@ -636,6 +679,7 @@
 				    m_z.avail_out = EC_SOCKET_BUFFER_SIZE;
 					int zerror = deflate(&m_z, Z_NO_FLUSH);
 					if ( zerror != Z_OK ) {
+						AddDebugLogLineN(logEC, wxT("WriteBuffer: ZLib error"));
 						ShowZError(zerror, &m_z);
 						return false;
 					}
@@ -663,6 +707,7 @@
 		    m_z.avail_out = EC_SOCKET_BUFFER_SIZE;
 			int zerror = deflate(&m_z, Z_FINISH);
 			if ( zerror == Z_STREAM_ERROR ) {
+				AddDebugLogLineN(logEC, wxT("FlushBuffers: ZLib error"));
 				ShowZError(zerror, &m_z);
 				return false;
 			}
@@ -681,16 +726,23 @@
 // Packet I/O
 //
 
-void CECSocket::WritePacket(const CECPacket *packet)
+uint32 CECSocket::WritePacket(const CECPacket *packet)
 {
-	if (SocketError() && !WouldBlock()) {
+	if (SocketRealError()) {
 		OnError();
-		return;
+		return 0;
+	}
+	// Check if output queue is empty. If not, memorize the current end.
+	std::list<CQueuedData*>::iterator outputStart = m_output_queue.begin();
+	uint32 outputQueueSize = m_output_queue.size();
+	for (uint32 i = 1; i < outputQueueSize; i++) {
+		outputStart++;
 	}
 
 	uint32_t flags = 0x20;
 
-	if ( packet->GetPacketLength() > EC_MAX_UNCOMPRESSED ) {
+	if (packet->GetPacketLength() > EC_MAX_UNCOMPRESSED
+		&& ((m_my_flags & EC_FLAG_ZLIB) > 0)) {
 		flags |= EC_FLAG_ZLIB;
 	} else {
 		flags |= EC_FLAG_UTF8_NUMBERS;
@@ -713,43 +765,42 @@
 		}
 	}
 
-	uint32_t tmp_flags = ENDIAN_HTONL(flags/* | EC_FLAG_ACCEPTS*/);
+	uint32_t tmp_flags = ENDIAN_HTONL(flags);
 	WriteBufferToSocket(&tmp_flags, sizeof(uint32));
 	
-/*	uint32_t tmp_accepts_flags = ENDIAN_HTONL(m_my_flags);
-	WriteBufferToSocket(&tmp_accepts_flags, sizeof(uint32));*/
-
 	// preallocate 4 bytes in buffer for packet length
 	uint32_t packet_len = 0;
 	WriteBufferToSocket(&packet_len, sizeof(uint32));
 	
 	packet->WritePacket(*this);
 
+	// Finalize zlib compression and move current data to outout queue
 	FlushBuffers();
 
+	// find the beginning of our data in the output queue
+	if (outputQueueSize) {
+		outputStart++;
+	} else {
+		outputStart = m_output_queue.begin();
+	}
 	// now calculate actual size of data
-	wxASSERT(m_curr_tx_data->GetDataLength() < 0xFFFFFFFF);
-	packet_len = (uint32_t)m_curr_tx_data->GetDataLength();
-	for(std::deque<CQueuedData*>::iterator i = m_output_queue.begin(); i != m_output_queue.end(); i++) {
-		wxASSERT(( packet_len + m_curr_tx_data->GetDataLength()) < 0xFFFFFFFF);
-		packet_len += (uint32_t)(*i)->GetDataLength();
-	}
-	// 4 flags and 4 length are not counted
-	packet_len -= 8;
-	// now write actual length @ offset 4
-	packet_len = ENDIAN_HTONL(packet_len);
-	
-	CQueuedData *first_buff = m_output_queue.front();
-	if ( !first_buff ) first_buff = m_curr_tx_data.get();
-	first_buff->WriteAt(&packet_len, sizeof(uint32_t), sizeof(uint32_t));
+	for(std::list<CQueuedData*>::iterator it = outputStart; it != m_output_queue.end(); it++) {
+		packet_len += (uint32_t)(*it)->GetDataLength();
+	}
+	// header size is not counted
+	packet_len -= EC_HEADER_SIZE;
+	// now write actual length at offset 4
+	uint32 packet_len_E = ENDIAN_HTONL(packet_len);
+	(*outputStart)->WriteAt(&packet_len_E, 4, 4);
 	
 	if (flags & EC_FLAG_ZLIB) {
 		int zerror = deflateEnd(&m_z);
 		if ( zerror != Z_OK ) {
+			AddDebugLogLineN(logEC, wxT("WritePacket: ZLib error"));
 			ShowZError(zerror, &m_z);
-			return;
 		}
 	}
+	return packet_len;
 }
 
 
@@ -761,6 +812,7 @@
 	
 	if ( ((flags & 0x60) != 0x20) || (flags & EC_FLAG_UNKNOWN_MASK) ) {
 		// Protocol error - other end might use an older protocol
+		AddDebugLogLineN(logEC, wxT("ReadPacket: protocol error"));
 		cout << "ReadPacket: packet have invalid flags " << flags << endl;
 		CloseSocket();
 		return 0;
@@ -776,6 +828,7 @@
 	    
 		int zerror = inflateInit(&m_z);
 		if (zerror != Z_OK) {
+			AddDebugLogLineN(logEC, wxT("ReadPacket: zlib error"));
 			ShowZError(zerror, &m_z);
 			cout << "ReadPacket: failed zlib init" << endl;
 			CloseSocket();
@@ -784,11 +837,11 @@
 	}
 
 	m_curr_rx_data->ToZlib(m_z);
-	packet = new CECPacket(*this);
-	packet->ReadFromSocket(*this);
+	packet = new CECPacket();
 	
-	if (packet->m_error != 0) {
-		cout << "ReadPacket: error " << packet->m_error << "in packet read" << endl;
+	if (!packet->ReadFromSocket(*this)) {
+		AddDebugLogLineN(logEC, wxT("ReadPacket: error in packet read"));
+		cout << "ReadPacket: error in packet read" << endl;
 		delete packet;
 		packet = NULL;
 		CloseSocket();
@@ -797,6 +850,7 @@
 	if (flags & EC_FLAG_ZLIB) {
 		int zerror = inflateEnd(&m_z);
 		if ( zerror != Z_OK ) {
+			AddDebugLogLineN(logEC, wxT("ReadPacket: zlib error"));
 			ShowZError(zerror, &m_z);
 			cout << "ReadPacket: failed zlib free" << endl;
 			CloseSocket();
@@ -806,7 +860,7 @@
 	return packet;
 }
 
-const CECPacket *CECSocket::OnPacketReceived(const CECPacket *)
+const CECPacket *CECSocket::OnPacketReceived(const CECPacket *, uint32)
 {
 	return 0;
 }

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECSocket.h -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECSocket.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2004-2009 Angel Vidal Veiga ( kry@users.sourceforge.net )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Angel Vidal Veiga ( kry@users.sourceforge.net )
 //
 // Any parts of this program derived from the xMule, lMule or eMule project,
 // or contributed by third-party developers are copyrighted by their
@@ -49,7 +49,6 @@
 	EC_ERROR_WOULDBLOCK,
 	EC_ERROR_TIMEDOUT,
 	EC_ERROR_MEMERR,
-	EC_ERROR_DUMMY,
 	EC_ERROR_UNKNOWN
 };
 
@@ -69,10 +68,11 @@
 
 private:
 	static const unsigned int EC_SOCKET_BUFFER_SIZE = 2048;
+	static const unsigned int EC_HEADER_SIZE = 8;
 	const bool m_use_events;
 	
 	// Output related data
-	std::deque<CQueuedData *> m_output_queue;
+	std::list<CQueuedData *> m_output_queue;
 
 	// zlib (deflation) buffers
 	std::vector<unsigned char> m_in_ptr;
@@ -83,14 +83,16 @@
 	// This transfer only
 	uint32_t m_rx_flags;
 	uint32_t m_tx_flags;
-	uint32_t m_my_flags;
 	size_t m_bytes_needed;
 	bool m_in_header;
 	
 	
 	uint32_t m_curr_packet_len;
 	z_stream m_z;
-	
+
+protected:
+	uint32_t m_my_flags;
+	bool m_haveNotificationSupport;
 public:
 	CECSocket(bool use_events);
 	virtual ~CECSocket();
@@ -99,6 +101,8 @@
 
 	void CloseSocket() { InternalClose(); }
 
+	bool HaveNotificationSupport() const { return m_haveNotificationSupport; }
+		
 	/**
 	 * Sends an EC packet and returns immediately.
 	 *
@@ -149,7 +153,7 @@
 	 * @note This function won't be called for packets received via the
 	 * SendRecvPacket() function.
 	 */
-	virtual const CECPacket *OnPacketReceived(const CECPacket *packet);
+	virtual const CECPacket *OnPacketReceived(const CECPacket *packet, uint32 trueSize);
 
 	/**
 	 * Get a message describing the error.
@@ -184,9 +188,7 @@
 	/**
 	 * Event handler for connection events.
 	 *
-	 * This function is called when a connection attempt succeeds. When CECSocket
-	 * is compiled with ECSOCKET_USE_EVENTS == 0, WaitOnConnect() should be called
-	 * for this to work.
+	 * This function is called when a connection attempt succeeds.
 	 */
 	virtual void OnConnect();
 
@@ -199,6 +201,7 @@
 	void SocketRead(void* ptr, size_t len) { InternalRead(ptr,len); }
 	void SocketWrite(const void* ptr, size_t len) { InternalWrite(ptr,len); }
 	bool SocketError() { return InternalError() && GotError(); }
+	bool SocketRealError();
 
 	size_t GetLastCount() { return InternalLastCount(); }
 	bool WaitSocketConnect(long secs = -1, long msecs = 0) { return InternalWaitOnConnect(secs,msecs); }
@@ -209,13 +212,15 @@
 	
 	void DestroySocket() { return InternalDestroy(); }
 	
+	bool DataPending();
  private:
 	const CECPacket *ReadPacket();
-	void WritePacket(const CECPacket *packet);
+	uint32 WritePacket(const CECPacket *packet);
 
 	// These 4 methods are to be used by CECPacket & CECTag
 	bool	ReadNumber(void *buffer, size_t len);
 	bool	ReadBuffer(void *buffer, size_t len);
+	bool	ReadHeader();
 
 	bool	WriteNumber(const void *buffer, size_t len);
 	bool	WriteBuffer(const void *buffer, size_t len);
@@ -225,24 +230,29 @@
 
 	size_t	ReadBufferFromSocket(void *buffer, size_t len);
 	void	WriteBufferToSocket(const void *buffer, size_t len);
-
- 	/* virtuals */
-		virtual bool InternalConnect(uint32_t ip, uint16_t port, bool wait) = 0;
 	
-		virtual size_t InternalLastCount() = 0;
-		virtual bool InternalWaitOnConnect(long secs = -1, long msecs = 0) = 0;
-		virtual bool InternalWaitForWrite(long secs = -1, long msecs = 0) = 0;
-		virtual bool InternalWaitForRead(long secs = -1, long msecs = 0) = 0;
+ 	/* virtuals */
+	virtual void WriteDoneAndQueueEmpty() = 0;
 	
-		virtual int InternalGetLastError() = 0;
+	virtual bool InternalConnect(uint32_t ip, uint16_t port, bool wait) = 0;
+
+	virtual size_t InternalLastCount() = 0;
+	virtual bool InternalWaitOnConnect(long secs = -1, long msecs = 0) = 0;
+	virtual bool InternalWaitForWrite(long secs = -1, long msecs = 0) = 0;
+	virtual bool InternalWaitForRead(long secs = -1, long msecs = 0) = 0;
+
+	virtual int InternalGetLastError() = 0;
+
+	virtual void InternalClose() = 0;
+	virtual bool InternalError() = 0;
+	virtual void InternalRead(void* ptr, size_t len) = 0;
+	virtual void InternalWrite(const void* ptr, size_t len) = 0;
 	
-		virtual void InternalClose() = 0;
-		virtual bool InternalError() = 0;
-		virtual void InternalRead(void* ptr, size_t len) = 0;
-		virtual void InternalWrite(const void* ptr, size_t len) = 0;
-		
-		virtual bool InternalIsConnected() = 0;
-		virtual void InternalDestroy() = 0;
+	virtual bool InternalIsConnected() = 0;
+	virtual void InternalDestroy() = 0;
+
+	// Was login succesfull ?
+	virtual bool IsAuthorized() { return true; }
 };

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECSpecialTags.cpp -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECSpecialTags.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 Kry ( elkry@sourceforge.net / http://www.amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2003-2011 Angel Vidal ( kry@amule.org )
+// 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
@@ -29,9 +29,10 @@
 
 #include <common/Format.h>		// Needed for CFormat
 
-#include "../../../KnownFile.h"		// Needed for PS_*
+#include "../../../OtherFunctions.h"	// Needed for CastXtoY
+#include "../../../Constants.h"			// Needed for PS_*
 
-wxString CEC_PartFile_Tag::GetFileStatusString()
+wxString CEC_PartFile_Tag::GetFileStatusString() const
 {
 	uint8 nFileStatus = FileStatus();
 	
@@ -112,7 +113,7 @@
 			format = format % tag->GetInt();
 			break;
 		case EC_VALUE_ISTRING:
-			format = format % (wxString::Format(wxT("%") wxLongLongFmtSpec wxT("u"), tag->GetInt()) + extra);
+			format = format % (CFormat(wxT("%u")) % tag->GetInt() + extra);
 			break;
 		case EC_VALUE_BYTES:
 			format = format % (CastItoXBytes(tag->GetInt()) + extra);
@@ -133,7 +134,7 @@
 			format = format % tag->GetDoubleData();
 			break;
 		default:
-			wxASSERT(0);
+			wxFAIL;
 	}
 }
 
@@ -148,10 +149,9 @@
 		}
 	}
 	CFormat label(my_label);
-	for (size_t i = 0; i < GetTagCount(); ++i) {
-		const CECTag *tmp = GetTagByIndex(i);
-		if (tmp->GetTagName() == EC_TAG_STAT_NODE_VALUE) {
-			FormatValue(label, tmp);
+	for (const_iterator it = begin(); it != end(); it++) {
+		if (it->GetTagName() == EC_TAG_STAT_NODE_VALUE) {
+			FormatValue(label, &*it);
 		}
 	}
 	return label.GetString();

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECSpecialTags.h -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECSpecialTags.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-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
@@ -28,6 +28,7 @@
 //#warning Kry - Preferences packet derived from packet, and that's ok, but shouldn't be here because this is a tag file and forces a stupid include
 #include "ECPacket.h"					// Needed for CECPacket
 #include "../../../NetworkFunctions.h"	// Needed for IsLowID
+#include "../../../ClientCredits.h"		// Needed for EIdentState
 #include <common/Format.h>	// Needed for CFormat
 
 
@@ -48,6 +49,7 @@
 class CPartFile;
 class CSearchFile;
 class CUpDownClient;
+class CFriend;
 
 /*
  * EC tags encoder. Idea: if for an object <X>, client <Z> tag <Y> have value equal to previous
@@ -64,6 +66,7 @@
 		std::map<ec_tagname_t, uint64> m_map_uint64;
 		std::map<ec_tagname_t, CMD4Hash> m_map_md4;
 		std::map<ec_tagname_t, wxString> m_map_string;
+		std::map<ec_tagname_t, CECTag> m_map_tag;
 		
 		template <class T>
 		void CreateTagT(ec_tagname_t tagname, T value, std::map<ec_tagname_t, T> &map, CECTag *parent)
@@ -86,10 +89,7 @@
 			m_map_uint64 = valuemap.m_map_uint64;
 			m_map_md4 = valuemap.m_map_md4;
 			m_map_string = valuemap.m_map_string;
-		}
-		
-		~CValueMap()
-		{
+			m_map_tag = valuemap.m_map_tag;
 		}
 		
 		void CreateTag(ec_tagname_t tagname, uint8 value, CECTag *parent)
@@ -121,6 +121,23 @@
 		{
 			CreateTagT<wxString>(tagname, value, m_map_string, parent);
 		}
+		
+		bool AddTag(const CECTag &tag, CECTag *parent)
+		{
+			bool ret = false;
+			ec_tagname_t tagname = tag.GetTagName();
+			if (m_map_tag.count(tagname) == 0 || m_map_tag[tagname] != tag) {
+				m_map_tag[tagname] = tag;
+				parent->AddTag(tag);
+				ret = true;
+			}
+			return ret;
+		}
+
+		void ForgetTag(ec_tagname_t tagname)
+		{
+			m_map_tag.erase(tagname);
+		}
 };
 
 class CEC_Category_Tag : public CECTag {
@@ -130,14 +147,14 @@
  		CEC_Category_Tag(uint32 cat_index, wxString name, wxString path,
 			wxString comment, uint32 color, uint8 prio);
  		
- 		void Apply();
- 		void Create();
+ 		bool Apply();
+ 		bool Create();
  		
- 		wxString Name() { return GetTagByNameSafe(EC_TAG_CATEGORY_TITLE)->GetStringData(); }
- 		wxString Path() { return GetTagByNameSafe(EC_TAG_CATEGORY_PATH)->GetStringData(); }
- 		wxString Comment() { return GetTagByNameSafe(EC_TAG_CATEGORY_COMMENT)->GetStringData(); }
- 		uint8 Prio() { return GetTagByNameSafe(EC_TAG_CATEGORY_PRIO)->GetInt(); }
- 		uint32 Color() { return GetTagByNameSafe(EC_TAG_CATEGORY_COLOR)->GetInt(); }
+ 		wxString Name() const { return GetTagByNameSafe(EC_TAG_CATEGORY_TITLE)->GetStringData(); }
+ 		wxString Path() const { return GetTagByNameSafe(EC_TAG_CATEGORY_PATH)->GetStringData(); }
+ 		wxString Comment() const { return GetTagByNameSafe(EC_TAG_CATEGORY_COMMENT)->GetStringData(); }
+ 		uint8 Prio() const { return GetTagByNameSafe(EC_TAG_CATEGORY_PRIO)->GetInt(); }
+ 		uint32 Color() const { return GetTagByNameSafe(EC_TAG_CATEGORY_COLOR)->GetInt(); }
  		
 };
 
@@ -151,23 +168,23 @@
 class CEC_Server_Tag : public CECTag {
  	public:
  		CEC_Server_Tag(const CServer *, EC_DETAIL_LEVEL);
+ 		CEC_Server_Tag(const CServer *, CValueMap *valuemap);
  		
- 		wxString ServerName() { return GetTagByNameSafe(EC_TAG_SERVER_NAME)->GetStringData(); }
- 		wxString ServerDesc() { return GetTagByNameSafe(EC_TAG_SERVER_DESC)->GetStringData(); }
+ 		wxString ServerName(wxString * target = 0)	const { return AssignIfExist(EC_TAG_SERVER_NAME, target); }
+ 		wxString ServerDesc(wxString * target = 0)	const { return AssignIfExist(EC_TAG_SERVER_DESC, target); }
+ 		wxString ServerVersion(wxString * target = 0)	const { return AssignIfExist(EC_TAG_SERVER_VERSION, target); }
 
- 		uint8 GetPrio() { return GetTagByNameSafe(EC_TAG_SERVER_PRIO)->GetInt(); }
- 		bool GetStatic() { return (GetTagByNameSafe(EC_TAG_SERVER_STATIC)->GetInt() == 1); }
+ 		uint32 GetPrio(uint32 * target = 0)			const { return AssignIfExist(EC_TAG_SERVER_PRIO, target); }
+ 		bool GetStatic(bool * target = 0)			const { return AssignIfExist(EC_TAG_SERVER_STATIC, target); }
 
- 		uint32 GetPing() { return GetTagByNameSafe(EC_TAG_SERVER_PING)->GetInt(); }
- 		uint8 GetFailed() { return GetTagByNameSafe(EC_TAG_SERVER_FAILED)->GetInt(); }
+ 		uint32 GetPing(uint32 * target = 0)			const { return AssignIfExist(EC_TAG_SERVER_PING, target); }
+ 		uint32 GetFailed(uint32 * target = 0)		const { return AssignIfExist(EC_TAG_SERVER_FAILED, target); }
 
- 		uint32 GetFiles() { return GetTagByNameSafe(EC_TAG_SERVER_FILES)->GetInt(); }
- 		uint32 GetUsers() { return GetTagByNameSafe(EC_TAG_SERVER_USERS)->GetInt(); }
- 		uint32 GetMaxUsers() { return GetTagByNameSafe(EC_TAG_SERVER_USERS_MAX)->GetInt(); }
+ 		uint32 GetFiles(uint32 * target = 0)		const { return AssignIfExist(EC_TAG_SERVER_FILES, target); }
+ 		uint32 GetUsers(uint32 * target = 0)		const { return AssignIfExist(EC_TAG_SERVER_USERS, target); }
+ 		uint32 GetMaxUsers(uint32 * target = 0)		const { return AssignIfExist(EC_TAG_SERVER_USERS_MAX, target); }
  		
- 		// we're not using incremental update on server list,
- 		// but template code needs it
- 		uint32 ID() { return 0; }
+ 		uint32 ID() const { return GetInt(); }
 };
 
 
@@ -175,9 +192,9 @@
  	public:
  		CEC_ConnState_Tag(EC_DETAIL_LEVEL);
 
-		uint32	GetEd2kId()		{ return GetTagByNameSafe(EC_TAG_ED2K_ID)->GetInt(); }
-		uint32	GetClientId()		{ return GetTagByNameSafe(EC_TAG_CLIENT_ID)->GetInt(); }
- 		bool	HasLowID()		{ return GetEd2kId() < HIGHEST_LOWID_ED2K_KAD; }
+		uint32	GetEd2kId()			const { return GetTagByNameSafe(EC_TAG_ED2K_ID)->GetInt(); }
+		uint32	GetClientId()		const { return GetTagByNameSafe(EC_TAG_CLIENT_ID)->GetInt(); }
+ 		bool	HasLowID()			const { return GetEd2kId() < HIGHEST_LOWID_ED2K_KAD; }
  		bool	IsConnected()		const { return IsConnectedED2K() || IsConnectedKademlia(); }
  		bool	IsConnectedED2K()	const { return (GetInt() & 0x01) != 0; }
  		bool	IsConnectingED2K()	const { return (GetInt() & 0x02) != 0; }
@@ -186,166 +203,166 @@
 		bool	IsKadRunning()	const { return (GetInt() & 0x10) != 0; }
 };
 
-class CEC_PartFile_Tag : public CECTag {
- 	public:
- 		CEC_PartFile_Tag(CPartFile *file, EC_DETAIL_LEVEL detail_level, bool detail = false);
-		CEC_PartFile_Tag(CPartFile *file, CValueMap &valuemap);
-		void Detail_Tag(CPartFile *file);
- 		
-		// template needs it
-		CMD4Hash		ID()	{ return GetMD4Data(); }
-
- 		CMD4Hash	FileHash()	{ return GetMD4Data(); }
-		wxString	FileHashString() { return GetMD4Data().Encode(); }
-
- 		wxString	FileName()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_NAME)->GetStringData(); }
- 		uint64		SizeFull()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_SIZE_FULL)->GetInt(); }
- 		uint64		SizeXfer()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_SIZE_XFER)->GetInt(); }
-  		uint64		SizeDone()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_SIZE_DONE)->GetInt(); }
- 		wxString	FileEd2kLink()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_ED2K_LINK)->GetStringData(); }
- 		uint8		FileStatus()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_STATUS)->GetInt(); }
-  		uint16		SourceCount()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_SOURCE_COUNT)->GetInt(); }
-  		uint16		SourceNotCurrCount()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT)->GetInt(); }
-  		uint16		SourceXferCount()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_SOURCE_COUNT_XFER)->GetInt(); }
-  		uint16		SourceCountA4AF()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_SOURCE_COUNT_A4AF)->GetInt(); }
-  		uint32		Speed()		{ return GetTagByNameSafe(EC_TAG_PARTFILE_SPEED)->GetInt(); }
-  		uint8		Prio()		{ return GetTagByNameSafe(EC_TAG_PARTFILE_PRIO)->GetInt(); }
-
- 		uint8		FileCat()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_CAT)->GetInt(); }
-		time_t		LastSeenComplete() { return (time_t)GetTagByNameSafe(EC_TAG_PARTFILE_LAST_SEEN_COMP)->GetInt(); }
-
-		wxString	PartMetName()
-			{
-				CECTag* tmp = GetTagByName(EC_TAG_PARTFILE_PARTMETID);
-				if (tmp) {
-					return CFormat(wxT("%03u.part.met")) % tmp->GetInt();
-				} else {
-					return wxEmptyString;
-				}
-			}
-		
-		void SetSizeXfer(uint64 value) { AssignIfExist(EC_TAG_PARTFILE_SIZE_XFER, value); }
-		void SetSizeDone(uint64 value) { AssignIfExist(EC_TAG_PARTFILE_SIZE_DONE, value); }
-
-		void SetFileEd2kLink(uint32 value) { AssignIfExist(EC_TAG_PARTFILE_ED2K_LINK, value); }
-
-		void SetFileStatus(uint8 &value) { AssignIfExist(EC_TAG_PARTFILE_STATUS, value); }
-
-		void SetSourceCount(uint16 &value) { AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT, value); }
-		void SetSourceNotCurrCount(uint16 &value) { AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT, value); }
-		void SetSourceXferCount(uint16 &value) { AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT_XFER, value); }
-		void SetSourceCountA4AF(uint16 &value) { AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT_A4AF, value); }
-
-		void SetSpeed(uint32 &value) { AssignIfExist(EC_TAG_PARTFILE_SPEED, value); }
-		void SetPrio(uint8 &value) { AssignIfExist(EC_TAG_PARTFILE_PRIO, value); }
-		void SetFileCat(uint8 &value) { AssignIfExist(EC_TAG_PARTFILE_CAT, value); }
-		void SetLastSeenComplete(time_t &value)
-			{
-				CECTag *tag = GetTagByName(EC_TAG_PARTFILE_LAST_SEEN_COMP);
-				if ( tag ) {
-					value = tag->GetInt();
-				}
-			}
-		
-		wxString	GetFileStatusString();
-};
-
 class CEC_SharedFile_Tag : public CECTag {
 	public:
- 		CEC_SharedFile_Tag(const CKnownFile *file, EC_DETAIL_LEVEL detail_level);
-		CEC_SharedFile_Tag(const CKnownFile *file, CValueMap &valuemap);
+ 		CEC_SharedFile_Tag(const CKnownFile *file, EC_DETAIL_LEVEL detail_level, 
+							CValueMap *valuemap = NULL, ec_tagname_t name = EC_TAG_KNOWNFILE);
  		
 		// template needs it
- 		CMD4Hash	ID()		{ return GetMD4Data(); }
+ 		uint32		ID()		const { return GetInt(); }
 		
- 		CMD4Hash	FileHash()	{ return GetMD4Data(); }
-		wxString	FileHashString(){ return GetMD4Data().Encode(); }
+ 		CMD4Hash	FileHash()	const { return GetTagByNameSafe(EC_TAG_PARTFILE_HASH)->GetMD4Data(); }
+		wxString	FileHashString() const { return FileHash().Encode(); }
 
- 		wxString	FileName()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_NAME)->GetStringData(); }
- 		uint64		SizeFull()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_SIZE_FULL)->GetInt(); }
- 		wxString	FileEd2kLink()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_ED2K_LINK)->GetStringData(); }
+ 		wxString	FileName()	const { return GetTagByNameSafe(EC_TAG_PARTFILE_NAME)->GetStringData(); }
+ 		bool		FileName(wxString &target)	const { return AssignIfExist(EC_TAG_PARTFILE_NAME, target); }
+ 		wxString	FilePath()	const { return GetTagByNameSafe(EC_TAG_KNOWNFILE_FILENAME)->GetStringData(); }
+ 		bool		FilePath(wxString &target)	const { return AssignIfExist(EC_TAG_KNOWNFILE_FILENAME, target); }
+ 		uint64		SizeFull()	const { return GetTagByNameSafe(EC_TAG_PARTFILE_SIZE_FULL)->GetInt(); }
+ 		wxString	FileEd2kLink()	const { return GetTagByNameSafe(EC_TAG_PARTFILE_ED2K_LINK)->GetStringData(); }
 
-  		uint8		Prio()		{ return GetTagByNameSafe(EC_TAG_PARTFILE_PRIO)->GetInt(); }
- 		uint16		GetRequests()	{ return GetTagByNameSafe(EC_TAG_KNOWNFILE_REQ_COUNT)->GetInt(); }
- 		uint16		GetAllRequests()	{ return GetTagByNameSafe(EC_TAG_KNOWNFILE_REQ_COUNT_ALL)->GetInt(); }
+  		uint8		UpPrio(uint8 *target = 0)			const { return AssignIfExist(EC_TAG_KNOWNFILE_PRIO, target); }
+ 		uint16		GetRequests(uint16 *target = 0)		const { return AssignIfExist(EC_TAG_KNOWNFILE_REQ_COUNT, target); }
+ 		uint32		GetAllRequests(uint32 *target = 0)	const { return AssignIfExist(EC_TAG_KNOWNFILE_REQ_COUNT_ALL, target); }
 
- 		uint16		GetAccepts()	{ return GetTagByNameSafe(EC_TAG_KNOWNFILE_ACCEPT_COUNT)->GetInt(); }
- 		uint16		GetAllAccepts()	{ return GetTagByNameSafe(EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL)->GetInt(); }
+ 		uint16		GetAccepts(uint16 *target = 0)		const { return AssignIfExist(EC_TAG_KNOWNFILE_ACCEPT_COUNT, target); }
+ 		uint32		GetAllAccepts(uint32 *target = 0)	const { return AssignIfExist(EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL, target); }
 
- 		uint64		GetXferred()	{ return GetTagByNameSafe(EC_TAG_KNOWNFILE_XFERRED)->GetInt(); }
- 		uint64		GetAllXferred()	{ return GetTagByNameSafe(EC_TAG_KNOWNFILE_XFERRED_ALL)->GetInt(); }
+ 		uint64		GetXferred(uint64 *target = 0)		const { return AssignIfExist(EC_TAG_KNOWNFILE_XFERRED, target); }
+ 		uint64		GetAllXferred(uint64 *target = 0)	const { return AssignIfExist(EC_TAG_KNOWNFILE_XFERRED_ALL, target); }
 
-		wxString	GetAICHHash()	{ return GetTagByNameSafe(EC_TAG_KNOWNFILE_AICH_MASTERHASH)->GetStringData(); }
- 		
- 		void SetPrio(uint8 &val) { AssignIfExist(EC_TAG_PARTFILE_PRIO, val); }
- 		
- 		void SetRequests(uint16 &val) { AssignIfExist(EC_TAG_KNOWNFILE_REQ_COUNT, val); }
- 		void SetAllRequests(uint32 &val) { AssignIfExist(EC_TAG_KNOWNFILE_REQ_COUNT_ALL, val); }
- 		
- 		void SetAccepts(uint16 &val) { AssignIfExist(EC_TAG_KNOWNFILE_ACCEPT_COUNT, val); }
- 		void SetAllAccepts(uint32 &val) { AssignIfExist(EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL, val); }
+ 		uint16		GetCompleteSourcesLow(uint16 *target = 0)	const { return AssignIfExist(EC_TAG_KNOWNFILE_COMPLETE_SOURCES_LOW, target); }
+ 		uint16		GetCompleteSourcesHigh(uint16 *target = 0)	const { return AssignIfExist(EC_TAG_KNOWNFILE_COMPLETE_SOURCES_HIGH, target); }
+ 		uint16		GetCompleteSources(uint16 *target = 0)		const { return AssignIfExist(EC_TAG_KNOWNFILE_COMPLETE_SOURCES, target); }
+
+		uint16		GetOnQueue(uint16 *target = 0)		const { return AssignIfExist(EC_TAG_KNOWNFILE_ON_QUEUE, target); }
+
+		bool		GetComment(wxString &target)	const { return AssignIfExist(EC_TAG_KNOWNFILE_COMMENT, target); }
+		bool		GetRating(uint8 &target)		const { return AssignIfExist(EC_TAG_KNOWNFILE_RATING, target); }
+
+		bool		GetAICHHash(wxString &target)	const { return AssignIfExist(EC_TAG_KNOWNFILE_AICH_MASTERHASH, target); }
+	private:
+		CMD4Hash	GetMD4Data();	// Block it, because it doesn't work anymore! 
+};
+
+class CEC_PartFile_Tag : public CEC_SharedFile_Tag {
+ 	public:
+ 		CEC_PartFile_Tag(const CPartFile *file, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap = NULL);
  		
- 		void SetXferred(uint64 &val) { AssignIfExist(EC_TAG_KNOWNFILE_XFERRED, val); }
- 		void SetAllXferred(uint64 &val) { AssignIfExist(EC_TAG_KNOWNFILE_XFERRED_ALL, val); }
+		uint16		PartMetID()	const { return GetTagByNameSafe(EC_TAG_PARTFILE_PARTMETID)->GetInt(); }
+
+ 		uint64		SizeXfer(uint64 *target = 0)	const { return AssignIfExist(EC_TAG_PARTFILE_SIZE_XFER, target); }
+  		uint64		SizeDone(uint64 *target = 0)	const { return AssignIfExist(EC_TAG_PARTFILE_SIZE_DONE, target); }
+ 		uint8		FileStatus(uint8 *target = 0)	const { return AssignIfExist(EC_TAG_PARTFILE_STATUS, target); }
+ 		bool		Stopped(bool *target = 0)		const { return AssignIfExist(EC_TAG_PARTFILE_STOPPED, target); }
+  		uint16		SourceCount(uint16 *target = 0)	const { return AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT, target); }
+  		uint16		SourceNotCurrCount(uint16 *target = 0)	const { return AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT_NOT_CURRENT, target); }
+  		uint16		SourceXferCount(uint16 *target = 0)	const { return AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT_XFER, target); }
+  		uint16		SourceCountA4AF(uint16 *target = 0)	const { return AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT_A4AF, target); }
+  		uint32		Speed(uint32 *target = 0)		const { return AssignIfExist(EC_TAG_PARTFILE_SPEED, target); }
+  		uint8		DownPrio(uint8 *target = 0)		const { return AssignIfExist(EC_TAG_PARTFILE_PRIO, target); }
+ 		uint8		FileCat(uint8 *target = 0)		const { return AssignIfExist(EC_TAG_PARTFILE_CAT, target); }
+		time_t		LastSeenComplete(time_t *target = 0)const { return AssignIfExist(EC_TAG_PARTFILE_LAST_SEEN_COMP, target); }
+		time_t		LastDateChanged(time_t *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_LAST_RECV, target); }
+		uint32		DownloadActiveTime(uint32 *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_DOWNLOAD_ACTIVE, target); }
+		uint16		AvailablePartCount(uint16 *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_AVAILABLE_PARTS, target); }
+ 		bool		Shared(bool *target = 0)		const { return AssignIfExist(EC_TAG_PARTFILE_SHARED, target); }
+ 		bool		A4AFAuto(bool &target)			const { return AssignIfExist(EC_TAG_PARTFILE_A4AFAUTO, target); }
+
+		uint64		GetLostDueToCorruption(uint64 *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_LOST_CORRUPTION, target); }
+		uint64		GetGainDueToCompression(uint64 *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_GAINED_COMPRESSION, target); }
+		uint32		TotalPacketsSavedDueToICH(uint32 *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_SAVED_ICH, target); }
+
+		wxString	PartMetName() const
+		{
+			uint16 id = PartMetID();
+			return id ? (CFormat(wxT("%03u.part.met")) % id) : wxEmptyString;
+		}
+
+		wxString	GetFileStatusString() const;
 };
 
 class CEC_UpDownClient_Tag : public CECTag {
 	public:
-		CEC_UpDownClient_Tag(const CUpDownClient* client, EC_DETAIL_LEVEL detail_level);
-		CEC_UpDownClient_Tag(const CUpDownClient* client, CValueMap &valuemap);
+		CEC_UpDownClient_Tag(const CUpDownClient* client, EC_DETAIL_LEVEL detail_level, CValueMap* valuemap);
 
-		uint32 ID() { return GetInt(); }
+		uint32 ID() const { return GetInt(); }
 		
- 		CMD4Hash FileID() { return GetTagByNameSafe(EC_TAG_KNOWNFILE)->GetMD4Data(); }
- 		CMD4Hash UserID() { return GetTagByNameSafe(EC_TAG_CLIENT_HASH)->GetMD4Data(); }
+ 		CMD4Hash UserHash(CMD4Hash * target = 0) const { return AssignIfExist(EC_TAG_CLIENT_HASH, target); }
+ 		uint32 UserID(uint32 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_USER_ID, target); }
  		
- 		bool HaveFile() { return GetTagByName(EC_TAG_KNOWNFILE) != NULL; }
-
- 		wxString ClientName() { return GetTagByNameSafe(EC_TAG_CLIENT_NAME)->GetStringData(); }
- 		uint32 SpeedUp() { return GetTagByNameSafe(EC_TAG_CLIENT_UP_SPEED)->GetInt(); }
- 		uint32 SpeedDown() { return GetTagByNameSafe(EC_TAG_CLIENT_DOWN_SPEED)->GetInt(); }
+ 		wxString ClientName(wxString *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_NAME, target); }
+ 		uint32 SpeedUp(uint32 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_UP_SPEED, target); }
+ 		float SpeedDown(float *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_DOWN_SPEED, target); }
  		
- 		uint64 XferUp() { return GetTagByNameSafe(EC_TAG_CLIENT_UPLOAD_TOTAL)->GetInt(); };
- 		uint64 XferDown() { return GetTagByNameSafe(EC_TAG_CLIENT_DOWNLOAD_TOTAL)->GetInt(); }
- 		uint32 XferUpSession() { return GetTagByNameSafe(EC_TAG_CLIENT_UPLOAD_SESSION)->GetInt(); }
+ 		uint64 XferUp(uint64 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_UPLOAD_TOTAL, target); };
+ 		uint64 XferDown(uint64 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_DOWNLOAD_TOTAL, target); }
+ 		uint64 XferUpSession(uint64 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_UPLOAD_SESSION, target); }
+ 		uint64 XferDownSession(uint64 *target = 0) const { return AssignIfExist(EC_TAG_PARTFILE_SIZE_XFER, target); }
  		
- 		bool IsFriend() { return (GetTagByName(EC_TAG_CLIENT_FRIEND) != 0); }
+ 		bool FriendSlot(bool &target) const { return AssignIfExist(EC_TAG_CLIENT_FRIEND_SLOT, target); }
  		
- 		uint8 ClientSoftware() { return GetTagByNameSafe(EC_TAG_CLIENT_SOFTWARE)->GetInt(); }
+ 		bool ClientSoftware(uint8 &target) const { return AssignIfExist(EC_TAG_CLIENT_SOFTWARE, target); }
+		bool SoftVerStr(wxString &target) const { return AssignIfExist(EC_TAG_CLIENT_SOFT_VER_STR, target); }
  		
- 		uint8 ClientState() { return GetTagByNameSafe(EC_TAG_CLIENT_STATE)->GetInt(); }
+ 		bool ClientUploadState(uint8 &target) const { return AssignIfExist(EC_TAG_CLIENT_UPLOAD_STATE, target); }
+ 		bool ClientDownloadState(uint8 &target) const { return AssignIfExist(EC_TAG_CLIENT_DOWNLOAD_STATE, target); }
  		
- 		uint32 WaitTime() { return GetTagByNameSafe(EC_TAG_CLIENT_WAIT_TIME)->GetInt(); }
- 		uint32 XferTime() { return GetTagByNameSafe(EC_TAG_CLIENT_XFER_TIME)->GetInt(); }
- 		uint32 LastReqTime() { return GetTagByNameSafe(EC_TAG_CLIENT_LAST_TIME)->GetInt(); }
- 		uint32 QueueTime() { return GetTagByNameSafe(EC_TAG_CLIENT_QUEUE_TIME)->GetInt(); }
-		uint8 GetSourceFrom() { return GetTagByNameSafe(EC_TAG_CLIENT_FROM)->GetInt(); }
-		uint32 UserIP() { return GetTagByNameSafe(EC_TAG_CLIENT_USER_IP)->GetInt(); }
-		uint16 UserPort() { return GetTagByNameSafe(EC_TAG_CLIENT_USER_PORT)->GetInt(); }
-		uint32 ServerIP() { return GetTagByNameSafe(EC_TAG_CLIENT_SERVER_IP)->GetInt(); }
-		uint16 ServerPort() { return GetTagByNameSafe(EC_TAG_CLIENT_SERVER_PORT)->GetInt(); }
-		wxString ServerName() { return GetTagByNameSafe(EC_TAG_CLIENT_SERVER_NAME)->GetStringData(); }
-		wxString SoftVerStr() { return GetTagByNameSafe(EC_TAG_CLIENT_SOFT_VER_STR)->GetStringData(); }
-		uint32 Score() { return GetTagByNameSafe(EC_TAG_CLIENT_SCORE)->GetInt(); }
-		uint16 WaitingPosition() { return GetTagByNameSafe(EC_TAG_CLIENT_WAITING_POSITION)->GetInt(); }
+ 		//uint32 WaitTime(uint32 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_WAIT_TIME, target); }
+ 		//uint32 XferTime(uint32 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_XFER_TIME, target); }
+ 		//uint32 LastReqTime(uint32 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_LAST_TIME, target); }
+ 		//uint32 QueueTime(uint32 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_QUEUE_TIME, target); }
+		bool GetSourceFrom(uint8 &target) const { return AssignIfExist(EC_TAG_CLIENT_FROM, target); }
+
+		bool   UserIP(uint32 &target) const { return AssignIfExist(EC_TAG_CLIENT_USER_IP, target); }
+		uint16 UserPort(uint16 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_USER_PORT, target); }
+		uint32 ServerIP(uint32 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_SERVER_IP, target); }
+		uint16 ServerPort(uint16 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_SERVER_PORT, target); }
+		wxString ServerName(wxString *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_SERVER_NAME, target); }
+		bool KadPort(uint16 &target) const { return AssignIfExist(EC_TAG_CLIENT_KAD_PORT, target); }
+
+		uint32 Score(uint32 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_SCORE, target); }
+		uint16 WaitingPosition(uint16 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_WAITING_POSITION, target); }
+		uint16 RemoteQueueRank(uint16 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_REMOTE_QUEUE_RANK, target); }
+		uint16 OldRemoteQueueRank(uint16 *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_OLD_REMOTE_QUEUE_RANK, target); }
+
+		EIdentState GetCurrentIdentState(EIdentState * target = 0) const { return (EIdentState) AssignIfExist(EC_TAG_CLIENT_IDENT_STATE, (uint32 *) target); }
+		bool ObfuscationStatus(uint8 &target) const { return AssignIfExist(EC_TAG_CLIENT_OBFUSCATION_STATUS, target); }
+		bool HasExtendedProtocol(bool *target = 0) const { return AssignIfExist(EC_TAG_CLIENT_EXT_PROTOCOL, target); }
+		bool NextRequestedPart(uint16 &target) const { return AssignIfExist(EC_TAG_CLIENT_NEXT_REQUESTED_PART, target); }
+		bool LastDownloadingPart(uint16 &target) const { return AssignIfExist(EC_TAG_CLIENT_LAST_DOWNLOADING_PART, target); }
+
+		bool UploadFile(uint32 &target) const { return AssignIfExist(EC_TAG_CLIENT_UPLOAD_FILE, target); }
+		bool RequestFile(uint32 &target) const { return AssignIfExist(EC_TAG_CLIENT_REQUEST_FILE, target); }
+		bool RemoteFilename(wxString &target) const { return AssignIfExist(EC_TAG_CLIENT_REMOTE_FILENAME, target); }
+ 		bool DisableViewShared(bool &target) const { return AssignIfExist(EC_TAG_CLIENT_DISABLE_VIEW_SHARED, target); }
+ 		bool Version(uint32 &target) const { return AssignIfExist(EC_TAG_CLIENT_VERSION, target); }
+ 		bool ModVersion(wxString &target) const { return AssignIfExist(EC_TAG_CLIENT_MOD_VERSION, target); }
+ 		bool OSInfo(wxString &target) const { return AssignIfExist(EC_TAG_CLIENT_OS_INFO, target); }
+ 		bool AvailableParts(uint16 &target) const { return AssignIfExist(EC_TAG_CLIENT_AVAILABLE_PARTS, target); }
+	private:
+		CMD4Hash	GetMD4Data();	// Block it, because it doesn't work anymore! 
 };
 
 class CEC_SearchFile_Tag : public CECTag {
 	public:
-		CEC_SearchFile_Tag(CSearchFile *file, EC_DETAIL_LEVEL detail_level);
-		CEC_SearchFile_Tag(CSearchFile *file, CValueMap &valuemap);
+		CEC_SearchFile_Tag(CSearchFile *file, EC_DETAIL_LEVEL detail_level, CValueMap *valuemap = NULL);
 
 		// template needs it
- 		CMD4Hash	ID()	{ return GetMD4Data(); }
-
- 		CMD4Hash	FileHash()	{ return GetMD4Data(); }
-		wxString	FileHashString() { return GetMD4Data().Encode(); }
-
- 		wxString	FileName()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_NAME)->GetStringData(); }
- 		uint64		SizeFull()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_SIZE_FULL)->GetInt(); }
-  		uint32		SourceCount()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_SOURCE_COUNT)->GetInt(); }
-  		uint32		CompleteSourceCount()	{ return GetTagByNameSafe(EC_TAG_PARTFILE_SOURCE_COUNT_XFER)->GetInt(); }
-  		bool		AlreadyHave()	{ return GetTagByName(EC_TAG_KNOWNFILE) != 0; }
+ 		uint32		ID()	const { return GetInt(); }
+		uint32		ParentID()	const { return GetTagByNameSafe(EC_TAG_SEARCH_PARENT)->GetInt(); }
+
+ 		CMD4Hash	FileHash()	const { return GetTagByNameSafe(EC_TAG_PARTFILE_HASH)->GetMD4Data(); }
+		wxString	FileHashString() const { return FileHash().Encode(); }
+
+ 		wxString	FileName()	const { return GetTagByNameSafe(EC_TAG_PARTFILE_NAME)->GetStringData(); }
+ 		uint64		SizeFull()	const { return GetTagByNameSafe(EC_TAG_PARTFILE_SIZE_FULL)->GetInt(); }
+  		uint32		SourceCount(uint32 *target = 0)	const { return AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT, target); }
+  		uint32		CompleteSourceCount(uint32 *target = 0)	const { return AssignIfExist(EC_TAG_PARTFILE_SOURCE_COUNT_XFER, target); }
+		bool		AlreadyHave()	const { return GetTagByNameSafe(EC_TAG_PARTFILE_STATUS)->GetInt() != 0; /* == CSearchFile::NEW */ }
+		uint32		DownloadStatus(uint32 *target = 0)	const { return AssignIfExist(EC_TAG_PARTFILE_STATUS, target); }
+	private:
+		CMD4Hash	GetMD4Data();	// Block it, because it doesn't work anymore! 
 };
 
 class CEC_Search_Tag : public CECTag {
@@ -354,13 +371,13 @@
 		CEC_Search_Tag(const wxString &name, EC_SEARCH_TYPE search_type, const wxString &file_type,
 			const wxString &extension, uint32 avail, uint64 min_size, uint64 max_size);
 			
-		wxString SearchText() { return GetTagByNameSafe(EC_TAG_SEARCH_NAME)->GetStringData(); }
-		EC_SEARCH_TYPE SearchType() { return (EC_SEARCH_TYPE)GetInt(); }
-		uint64 MinSize() { return GetTagByNameSafe(EC_TAG_SEARCH_MIN_SIZE)->GetInt(); }
-		uint64 MaxSize() { return GetTagByNameSafe(EC_TAG_SEARCH_MAX_SIZE)->GetInt(); }
-		uint32 Avail() { return GetTagByNameSafe(EC_TAG_SEARCH_AVAILABILITY)->GetInt(); }
-		wxString SearchExt() { return GetTagByNameSafe(EC_TAG_SEARCH_EXTENSION)->GetStringData(); }
-		wxString SearchFileType() { return GetTagByNameSafe(EC_TAG_SEARCH_FILE_TYPE)->GetStringData(); }
+		wxString SearchText() const { return GetTagByNameSafe(EC_TAG_SEARCH_NAME)->GetStringData(); }
+		EC_SEARCH_TYPE SearchType() const { return (EC_SEARCH_TYPE)GetInt(); }
+		uint64 MinSize() const { return GetTagByNameSafe(EC_TAG_SEARCH_MIN_SIZE)->GetInt(); }
+		uint64 MaxSize() const { return GetTagByNameSafe(EC_TAG_SEARCH_MAX_SIZE)->GetInt(); }
+		uint32 Avail() const { return GetTagByNameSafe(EC_TAG_SEARCH_AVAILABILITY)->GetInt(); }
+		wxString SearchExt() const { return GetTagByNameSafe(EC_TAG_SEARCH_EXTENSION)->GetStringData(); }
+		wxString SearchFileType() const { return GetTagByNameSafe(EC_TAG_SEARCH_FILE_TYPE)->GetStringData(); }
 };
 
 class CEC_StatTree_Node_Tag : public CECTag {
@@ -369,5 +386,17 @@
 		wxString GetDisplayString() const;
 };
 
-#endif /* ECSPEACIALTAGS_H */
+class CEC_Friend_Tag : public CECTag {
+	public:
+		CEC_Friend_Tag(const CFriend* Friend, CValueMap* valuemap);
+
+ 		uint32		ID() const							{ return GetInt(); }
+		bool		Name(wxString &target) const		{ return AssignIfExist(EC_TAG_FRIEND_NAME, target); }
+		bool		UserHash(CMD4Hash &target) const	{ return AssignIfExist(EC_TAG_FRIEND_HASH, target); }
+		bool		IP(uint32 &target) const			{ return AssignIfExist(EC_TAG_FRIEND_IP, target); }
+		bool		Port(uint16 &target) const			{ return AssignIfExist(EC_TAG_FRIEND_PORT, target); }
+		bool		Client(uint32 &target) const		{ return AssignIfExist(EC_TAG_FRIEND_CLIENT, target); }
+};
+
+#endif /* ECSPECIALTAGS_H */
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECTag.cpp -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECTag.cpp Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-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
@@ -22,8 +22,16 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+#ifdef __DEBUG__
+#define DEBUG_EC_IMPLEMENTATION
+
+#include <common/Format.h>  // Needed for CFormat
+#endif
+
 #include "ECTag.h"	// Needed for ECTag
 #include "ECSocket.h"	// Needed for CECSocket
+#include "ECSpecialTags.h"	// Needed for CValueMap
+#include "ECID.h"	// Needed for CECID
 
 /**********************************************************
  *							  *
@@ -32,27 +40,19 @@
  **********************************************************/
 
 //! Defines the Null tag which may be returned by GetTagByNameSafe.
-const CECTag CECTag::s_theNullTag(static_cast<NullTagConstructorSelector*>(0));
-
-//! Defines the data for the Null tag.  Large enough (16 bytes) for GetMD4Data.
-const uint32 CECTag::s_theNullTagData[4] = { 0, 0, 0, 0 };
+const CECTag CECTag::s_theNullTag;
 
 /**
  * Creates a new null-valued CECTag instance
  *
  * @see s_theNullTag
- * @see s_theNullTagData
  * @see GetTagByNameSafe
  */
-CECTag::CECTag(const NullTagConstructorSelector*) :
-	m_error(0),
-	m_tagData(s_theNullTagData),
+CECTag::CECTag() :
 	m_tagName(0),
-	m_dataLen(0),
 	m_dataType(EC_TAGTYPE_UNKNOWN),
-	m_dynamic(false),
-	m_tagList(),
-	m_haschildren(false)
+	m_dataLen(0),
+	m_tagData(NULL)	// All access functions check m_dataType, so no need to allocate a dummy buffer.
 {
 }
 
@@ -62,25 +62,18 @@
  * @param name	 TAG name
  * @param length length of data buffer
  * @param data	 TAG data
- * @param copy	 whether to create a copy of the TAG data at \e *data, or should use the provided pointer.
  *
- * \note When you set \e copy to \b false, the provided data buffer must exist
- * in the whole lifetime of the packet.
  */
-CECTag::CECTag(ec_tagname_t name, unsigned int length, const void *data, bool copy) : m_tagName(name), m_dynamic(copy), m_haschildren( false )
+CECTag::CECTag(ec_tagname_t name, unsigned int length, const void *data) : m_tagName(name)
 {
-	m_error = 0;
-	m_dataLen = length;
-	if (copy && (data != NULL)) {
-		m_tagData = malloc(m_dataLen);
-		if (m_tagData != NULL) {
-			memcpy((void *)m_tagData, data, m_dataLen);
-		} else {
-			m_dataLen = 0;
-			m_error = 1;
-		}
+	if (data) {
+		m_dataLen = length;
+		NewData();
+		memcpy(m_tagData, data, m_dataLen);
 	} else {
-		m_tagData = data;
+		wxASSERT(length == 0);
+		m_dataLen = 0;
+		m_tagData = NULL;
 	}
 	m_dataType = EC_TAGTYPE_CUSTOM;
 }
@@ -90,20 +83,15 @@
  *
  * @param name	 	TAG name
  * @param length 	length of data buffer that will be alloc'ed
- * @param dataptr	pointer to internal TAG data buffer
+ * @param dataptr	pointer to a void pointer which will be assigned the internal TAG data buffer
  *
- * 
+ * \note TAG data buffer has to be filled with valid data after the ctor
  */
-CECTag::CECTag(ec_tagname_t name, unsigned int length, void **dataptr)  : m_tagName(name), m_dynamic(true), m_haschildren( false )
+CECTag::CECTag(ec_tagname_t name, unsigned int length, void **dataptr)  : m_tagName(name)
 {
-	m_error = 0;
 	m_dataLen = length;
-	m_tagData = malloc(m_dataLen);
-	if ( !m_tagData ) {
-		m_dataLen = 0;
-		m_error = 1;
-	}
-	*dataptr = (void *)m_tagData;
+	NewData();
+	*dataptr = m_tagData;
 	m_dataType = EC_TAGTYPE_CUSTOM;
 }
 
@@ -117,19 +105,14 @@
  *
  * @see GetIPv4Data()
  */
-CECTag::CECTag(ec_tagname_t name, const EC_IPv4_t& data) : m_tagName(name), m_dynamic(true), m_haschildren( false )
+CECTag::CECTag(ec_tagname_t name, const EC_IPv4_t& data) : m_tagName(name)
 {
 
 	m_dataLen = sizeof(EC_IPv4_t);
-	m_tagData = malloc(sizeof(EC_IPv4_t));
-	if (m_tagData != NULL) {
-		RawPokeUInt32( ((EC_IPv4_t *)m_tagData)->m_ip, RawPeekUInt32( data.m_ip ) );
-		((EC_IPv4_t *)m_tagData)->m_port = ENDIAN_HTONS(data.m_port);
-		m_error = 0;
-		m_dataType = EC_TAGTYPE_IPV4;
-	} else {
-		m_error = 1;
-	}
+	NewData();
+	RawPokeUInt32( ((EC_IPv4_t *)m_tagData)->m_ip, RawPeekUInt32( data.m_ip ) );
+	((EC_IPv4_t *)m_tagData)->m_port = ENDIAN_HTONS(data.m_port);
+	m_dataType = EC_TAGTYPE_IPV4;
 }
 
 /**
@@ -142,19 +125,13 @@
  *
  * @see GetMD4Data()
  */
-CECTag::CECTag(ec_tagname_t name, const CMD4Hash& data) : m_tagName(name), m_dynamic(true), m_haschildren( false )
+CECTag::CECTag(ec_tagname_t name, const CMD4Hash& data) : m_tagName(name)
 {
-
 	m_dataLen = 16;
-	m_tagData = malloc(16);
-	if (m_tagData != NULL) {
-		RawPokeUInt64( (char*)m_tagData,		RawPeekUInt64( data.GetHash() ) );
-		RawPokeUInt64( (char*)m_tagData + 8,	RawPeekUInt64( data.GetHash() + 8 ) );
-		m_error = 0;
-		m_dataType = EC_TAGTYPE_HASH16;
-	} else {
-		m_error = 1;
-	}
+	NewData();
+	RawPokeUInt64( m_tagData,		RawPeekUInt64( data.GetHash() ) );
+	RawPokeUInt64( m_tagData + 8,	RawPeekUInt64( data.GetHash() + 8 ) );
+	m_dataType = EC_TAGTYPE_HASH16;
 }
 
 /**
@@ -165,9 +142,9 @@
  *
  * @see GetStringDataSTL()
  */
-CECTag::CECTag(ec_tagname_t name, const std::string& data) : m_tagName(name), m_dynamic(true), m_haschildren( false )
+CECTag::CECTag(ec_tagname_t name, const std::string& data) : m_tagName(name)
 {
-	ConstructStringTag(name,data);
+	ConstructStringTag(name, data);
 }
 
 /**
@@ -178,7 +155,11 @@
  *
  * @see GetStringData()
  */
-CECTag::CECTag(ec_tagname_t name, const wxString& data) : m_tagName(name), m_dynamic(true), m_haschildren( false )
+CECTag::CECTag(ec_tagname_t name, const wxString& data)
+{
+	ConstructStringTag(name, (const char*)unicode2UTF8(data));
+}
+CECTag::CECTag(ec_tagname_t name, const wxChar* data)
 {
 	ConstructStringTag(name, (const char*)unicode2UTF8(data));
 }
@@ -186,38 +167,10 @@
 /**
  * Copy constructor
  */
-CECTag::CECTag(const CECTag& tag) : m_state( tag.m_state ), m_tagName( tag.m_tagName ), m_dynamic( tag.m_dynamic ), m_haschildren( tag.m_haschildren )
-{
-	m_error = 0;
-	m_dataLen = tag.m_dataLen;
-	m_dataType = tag.m_dataType;
-	if (m_dataLen != 0) {
-		if (m_dynamic) {
-			m_tagData = malloc(m_dataLen);
-			if (m_tagData != NULL) {
-				memcpy((void *)m_tagData, tag.m_tagData, m_dataLen);
-			} else {
-				m_dataLen = 0;
-				m_error = 1;
-				return;
-			}
-		} else {
-			m_tagData = tag.m_tagData;
-		}
-	} else m_tagData = NULL;
-	if (!tag.m_tagList.empty()) {
-		m_tagList.reserve(tag.m_tagList.size());
-		for (TagList::size_type i=0; i<tag.m_tagList.size(); i++) {
-			m_tagList.push_back(tag.m_tagList[i]);
-			if (m_tagList.back().m_error != 0) {
-				m_error = m_tagList.back().m_error;
-#ifndef KEEP_PARTIAL_PACKETS
-				m_tagList.pop_back();
-#endif
-				break;
-			}
-		}
-	}
+CECTag::CECTag(const CECTag& tag)
+{
+	m_tagData = NULL;
+	*this = tag;
 }
 
 /**
@@ -230,19 +183,23 @@
  *
  * @see GetInt()
  */
-CECTag::CECTag(ec_tagname_t name, uint8 data) : m_tagName(name), m_dynamic(true)
+CECTag::CECTag(ec_tagname_t name, bool data) : m_tagName(name)
 {
 	InitInt(data);
 }
-CECTag::CECTag(ec_tagname_t name, uint16 data) : m_tagName(name), m_dynamic(true)
+CECTag::CECTag(ec_tagname_t name, uint8 data) : m_tagName(name)
 {
 	InitInt(data);
 }
-CECTag::CECTag(ec_tagname_t name, uint32 data) : m_tagName(name), m_dynamic(true)
+CECTag::CECTag(ec_tagname_t name, uint16 data) : m_tagName(name)
 {
 	InitInt(data);
 }
-CECTag::CECTag(ec_tagname_t name, uint64 data) : m_tagName(name), m_dynamic(true)
+CECTag::CECTag(ec_tagname_t name, uint32 data) : m_tagName(name)
+{
+	InitInt(data);
+}
+CECTag::CECTag(ec_tagname_t name, uint64 data) : m_tagName(name)
 {
 	InitInt(data);
 }
@@ -263,32 +220,21 @@
 		m_dataLen = 8;
 	}	
 	
-	m_tagData = malloc(m_dataLen);
+	NewData();
 	
-	if (m_tagData != NULL) {
-		switch (m_dataType) {
-			case EC_TAGTYPE_UINT8:
-				PokeUInt8( (void*)m_tagData, (uint8) data );
-				break;
-			case EC_TAGTYPE_UINT16:
-				PokeUInt16( (void*)m_tagData, wxUINT16_SWAP_ALWAYS((uint16) data ));
-				break;
-			case EC_TAGTYPE_UINT32:
-				PokeUInt32( (void*)m_tagData, wxUINT32_SWAP_ALWAYS((uint32) data ));
-				break;
-			case EC_TAGTYPE_UINT64:
-				PokeUInt64( (void*)m_tagData, wxUINT64_SWAP_ALWAYS(data) );
-				break;
-			default:
-				/* WTF?*/
-				EC_ASSERT(0);
-				free((void*)m_tagData);
-				m_error = 1;
-				return;
-		}
-		m_error = 0;
-	} else {
-		m_error = 1;
+	switch (m_dataType) {
+		case EC_TAGTYPE_UINT8:
+			PokeUInt8( m_tagData, (uint8) data );
+			break;
+		case EC_TAGTYPE_UINT16:
+			PokeUInt16( m_tagData, wxUINT16_SWAP_ALWAYS((uint16) data ));
+			break;
+		case EC_TAGTYPE_UINT32:
+			PokeUInt32( m_tagData, wxUINT32_SWAP_ALWAYS((uint32) data ));
+			break;
+		case EC_TAGTYPE_UINT64:
+			PokeUInt64( m_tagData, wxUINT64_SWAP_ALWAYS(data) );
+			break;
 	}
 }
 
@@ -303,19 +249,16 @@
  *
  * @see GetDoubleData()
  */
-CECTag::CECTag(ec_tagname_t name, double data) : m_tagName(name), m_dynamic(true)
+CECTag::CECTag(ec_tagname_t name, double data) : m_tagName(name)
 {
 	std::ostringstream double_str;
 	double_str << data;
-	m_dataLen = (ec_taglen_t)strlen(double_str.str().c_str()) + 1;
-	m_tagData = malloc(m_dataLen);
-	if (m_tagData != NULL) {
-		memcpy((void *)m_tagData, double_str.str().c_str(), m_dataLen);
-		m_dataType = EC_TAGTYPE_DOUBLE;
-		m_error = 0;
-	} else {
-		m_error = 1;
-	}
+	std::string double_string = double_str.str();
+	const char * double_chr = double_string.c_str();
+	m_dataLen = (ec_taglen_t)strlen(double_chr) + 1;
+	NewData();
+	memcpy(m_tagData, double_chr, m_dataLen);
+	m_dataType = EC_TAGTYPE_DOUBLE;
 }
 
 /**
@@ -323,7 +266,7 @@
  */
 CECTag::~CECTag(void)
 {
-	if (m_dynamic) free((void *)m_tagData);
+	delete [] m_tagData;
 }
 
 /**
@@ -333,41 +276,53 @@
  * handle m_dynamic and m_tagData.  This wouldn't be necessary if m_tagData
  * was a smart pointer (Hi, Kry!).
  */
-CECTag& CECTag::operator=(const CECTag& rhs)
-{
-	if (&rhs != this)
-	{
-		// This is a trick to reuse the implementation of the copy constructor
-		// so we don't have to duplicate it here.  temp is constructed as a
-		// copy of rhs, which properly handles m_dynamic and m_tagData.  Then
-		// temp's members are swapped for this object's members.  So,
-		// effectively, this object has been made a copy of rhs, which is the
-		// point.  Then temp is destroyed as it goes out of scope, so its
-		// destructor cleans up whatever data used to belong to this object.
-		CECTag temp(rhs);
-		std::swap(m_error,	temp.m_error);
-		std::swap(m_tagData,	temp.m_tagData);
-		std::swap(m_tagName,	temp.m_tagName);
-		std::swap(m_dataLen,	temp.m_dataLen);
-		std::swap(m_dynamic,	temp.m_dynamic);
-		std::swap(m_tagList,	temp.m_tagList);
-		std::swap(m_state,	temp.m_state);
+CECTag& CECTag::operator=(const CECTag& tag)
+{
+	if (&tag != this) {
+		m_tagName = tag.m_tagName;
+		m_dataLen = tag.m_dataLen;
+		m_dataType = tag.m_dataType;
+		delete [] m_tagData;
+		if (m_dataLen != 0) {
+			NewData();
+			memcpy(m_tagData, tag.m_tagData, m_dataLen);
+		} else {
+			m_tagData = NULL;
+		}
+		m_tagList.clear();
+		for (const_iterator it = tag.begin(); it != tag.end(); it++) {
+			m_tagList.push_back(*it);
+		}
 	}
-
 	return *this;
 }
 
 /**
- * Add a child tag to this one.
+ * Compare operator.
  *
- * Be very careful that this creates a copy of \e tag. Thus, the following code won't work as expected:
+ */
+bool CECTag::operator==(const CECTag& tag) const
+{
+	return	m_dataType == tag.m_dataType
+			&& m_tagName == tag.m_tagName
+			&& m_dataLen == tag.m_dataLen
+			&&	(m_dataLen == 0
+				|| !memcmp(m_tagData, tag.m_tagData, m_dataLen))
+			&& m_tagList == tag.m_tagList;
+}
+
+/**
+ * Add a child tag to this one. The tag argument is reset to an empty tag.
+ *
+ * Be very careful that this method swallows the content of \e tag, leaving \e tag empty. 
+ * Thus, the following code won't work as expected:
  * \code
  * {
  *	CECPacket *p = new CECPacket(whatever);
  *	CECTag *t1 = new CECTag(whatever);
  *	CECTag *t2 = new CECTag(whatever);
- *	p.AddTag(*t1);
- *	t1.AddTag(*t2);	// t2 won't be part of p !!!
+ *	p->AddTag(*t1);
+ *	t1->AddTag(*t2);	// t2 won't be part of p !!!
  * }
  * \endcode
  *
@@ -378,10 +333,10 @@
  *	CECPacket *p = new CECPacket(whatever);
  *	CECTag *t1 = new CECTag(whatever);
  *	CECTag *t2 = new CECTag(whatever);
- *	t1.AddTag(*t2);
- *	delete t2;	// we can safely delete t2 here, because t1 holds a copy
- *	p.AddTag(*t1);
- *	delete t1;	// now p holds a copy of both t1 and t2
+ *	t1->AddTag(*t2);
+ *	delete t2;	// we can safely delete the now empty t2 here, because t1 holds its content
+ *	p->AddTag(*t1);
+ *	delete t1;	// now p holds the content of both t1 and t2
  * }
  * \endcode
  *
@@ -392,105 +347,101 @@
  *	CECPacket *p = new CECPacket(whatever);
  *	CECTag t1(whatever);
  *	t1.AddTag(CECTag(whatever));	// t2 is now created on-the-fly
- *	p.AddTag(t1);	// now p holds a copy of both t1 and t2
+ *	p->AddTag(t1);	// now p holds a copy of both t1 and t2
  * }
  * \endcode
  *
  * @param tag a CECTag class instance to add.
- * @return \b true on succcess, \b false when an error occured
+ * @return \b true if tag was really added, 
+ * \b false when it was omitted through valuemap.
  */
-bool CECTag::AddTag(const CECTag& tag)
+bool CECTag::AddTag(const CECTag& tag, CValueMap* valuemap)
 {
+	if (valuemap) {
+		return valuemap->AddTag(tag, this);
+	}
 	// cannot have more than 64k tags
 	wxASSERT(m_tagList.size() < 0xffff);
 
-	m_tagList.push_back(tag);
-	if (m_tagList.back().m_error == 0) {
-		return true;
+	// First add an empty tag.
+	m_tagList.push_back(CECEmptyTag());
+	// Then exchange the data. The original tag will be destroyed right after this call anyway.
+	// UGLY - GCC allows a reference to an in place constructed object only to be passed as const.
+	// So pass it the way it wants it and then cheat and cast it back to non-const. :-/
+	CECTag& wtag = const_cast<CECTag&>(tag);
+	wtag.swap(m_tagList.back());
+	return true;
+}
+
+void CECTag::AddTag(ec_tagname_t name, uint64_t data, CValueMap* valuemap)
+{
+	if (valuemap) {
+		valuemap->CreateTag(name, data, this);
 	} else {
-		m_error = m_tagList.back().m_error;
-#ifndef KEEP_PARTIAL_PACKETS
-		m_tagList.pop_back();
-#endif
-		return false;
+		AddTag(CECTag(name, data));
 	}
 }
 
-bool CECTag::ReadFromSocket(CECSocket& socket)
+void CECTag::AddTag(ec_tagname_t name, const wxString& data, CValueMap* valuemap)
 {
-	if (m_state == bsName) {
-		ec_tagname_t tmp_tagName;
-		if (!socket.ReadNumber(&tmp_tagName, sizeof(ec_tagname_t))) {
-			m_tagName = 0;
-			return false;
-		} else {
-			m_tagName = tmp_tagName >> 1;
-			m_haschildren = (tmp_tagName & 0x01) ? true : false;
-			m_state = bsType;
-		}
+	if (valuemap) {
+		valuemap->CreateTag(name, data, this);
+	} else {
+		AddTag(CECTag(name, data));
 	}
-	
-	if (m_state == bsType) {
-		ec_tagtype_t type;
-		if (!socket.ReadNumber(&type, sizeof(ec_tagtype_t))) {
-			m_dataType = EC_TAGTYPE_UNKNOWN;
-			return false;
-		} else {
-			m_dataType = type;
-			if (m_haschildren) {
-				m_state = bsLengthChld;
-			} else {
-				m_state = bsLength;
-			}
-		}
+}
+
+void CECTag::AddTag(ec_tagname_t name, const CMD4Hash& data, CValueMap* valuemap)
+{
+	if (valuemap) {
+		valuemap->CreateTag(name, data, this);
+	} else {
+		AddTag(CECTag(name, data));
 	}
-	
-	if (m_state == bsLength || m_state == bsLengthChld) {
-		ec_taglen_t tagLen;
-		if (!socket.ReadNumber(&tagLen, sizeof(ec_taglen_t))) {
-			return false;
-		} else {
-			m_dataLen = tagLen;
-			if (m_state == bsLength) {
-				m_state = bsData1;
-			} else {
-				m_state = bsChildCnt;
-			}
-		}
+}
+
+void CECTag::swap(CECTag& t2)
+{
+	std::swap(m_tagName, t2.m_tagName);
+	std::swap(m_dataType, t2.m_dataType);
+	std::swap(m_dataLen, t2.m_dataLen);
+	std::swap(m_tagData, t2.m_tagData);
+	std::swap(m_tagList, t2.m_tagList);
+}
+
+bool CECTag::ReadFromSocket(CECSocket& socket)
+{
+	ec_tagname_t tmp_tagName;
+	if (!socket.ReadNumber(&tmp_tagName, sizeof(ec_tagname_t))) {
+		return false;
 	}
+	m_tagName = tmp_tagName >> 1;
+	bool hasChildren = (tmp_tagName & 0x01) != 0;
 	
-	if (m_state == bsChildCnt || m_state == bsChildren) {
-		if (!ReadChildren(socket)) {
-			return false;
-		}
+	if (!socket.ReadNumber(&m_dataType, sizeof(ec_tagtype_t))) {
+		return false;
 	}
 	
-	if (m_state == bsData1) {
-		unsigned int tmp_len = m_dataLen;
-		m_dataLen = 0;
-		m_dataLen = tmp_len - GetTagLen();
-		if (m_dataLen > 0) {
-			m_tagData = malloc(m_dataLen);
-			m_state = bsData2;
-		} else {
-			m_tagData = NULL;
-			m_state = bsFinished;
-		}
+	if (!socket.ReadNumber(&m_dataLen, sizeof(ec_taglen_t))) {
+		return false;
+	}
+
+	if (hasChildren && !ReadChildren(socket)) {
+		return false;
 	}
 	
-	if (m_state == bsData2) {
-		if (m_tagData != NULL) {
-			if (!socket.ReadBuffer((void *)m_tagData, m_dataLen)) {
-				return false;
-			} else {
-				m_state = bsFinished;
-			}
-		} else {
-			m_error = 1;
+	unsigned int tmp_len = m_dataLen;
+	m_dataLen = 0;
+	m_dataLen = tmp_len - GetTagLen();
+	if (m_dataLen > 0) {
+		NewData();
+		if (!socket.ReadBuffer(m_tagData, m_dataLen)) {
 			return false;
 		}
+	} else {
+		m_tagData = NULL;
 	}
-	
+
 	return true;
 }
 
@@ -521,40 +472,18 @@
 
 bool CECTag::ReadChildren(CECSocket& socket)
 {
-	if (m_state == bsChildCnt) {
-		uint16 tmp_tagCount;
-		if (!socket.ReadNumber(&tmp_tagCount, sizeof(uint16))) {
-			return false;
-		} else {
-			m_tagList.clear();
-			if (tmp_tagCount > 0) {
-				m_tagList.reserve(tmp_tagCount);
-				for (int i=0; i<tmp_tagCount; i++) {
-					m_tagList.push_back(CECTag(socket));
-				}
-				m_haschildren = true;
-				m_state = bsChildren;
-			} else {
-				m_state = bsData1;
-			}
-		}
+	uint16 tmp_tagCount;
+	if (!socket.ReadNumber(&tmp_tagCount, sizeof(uint16))) {
+		return false;
 	}
-	
-	if (m_state == bsChildren) {
-		for (unsigned int i=0; i<m_tagList.size(); i++) {
-			CECTag& tag = m_tagList[i];
-			if (!tag.IsOk()) {
-				if (!tag.ReadFromSocket(socket)) {
-					if (tag.m_error != 0) {
-						m_error = tag.m_error;
-					}
-					return false;
-				}
-			}
+	m_tagList.clear();
+	for (int i = 0; i < tmp_tagCount; i++) {
+		m_tagList.push_back(CECTag());
+		CECTag& tag = m_tagList.back();
+		if (!tag.ReadFromSocket(socket)) {
+			return false;
 		}
-		m_state = bsData1;
 	}
-	
 	return true;
 }
 
@@ -563,10 +492,8 @@
 	wxASSERT(m_tagList.size() < 0xFFFF);
     uint16 tmp = (uint16)m_tagList.size();
 	if (!socket.WriteNumber(&tmp, sizeof(tmp))) return false;
-	if (!m_tagList.empty()) {
-		for (TagList::size_type i=0; i<m_tagList.size(); i++) {
-			if (!m_tagList[i].WriteTag(socket)) return false;
-		}
+	for (const_iterator it = begin(); it != end(); it++) {
+		if (!it->WriteTag(socket)) return false;
 	}
 	return true;
 }
@@ -579,8 +506,9 @@
  */
 const CECTag* CECTag::GetTagByName(ec_tagname_t name) const
 {
-	for (TagList::size_type i=0; i<m_tagList.size(); i++)
-		if (m_tagList[i].m_tagName == name) return &m_tagList[i];
+	for (const_iterator it = begin(); it != end(); it++) {
+		if (it->m_tagName == name) return & *it;
+	}
 	return NULL;
 }
 
@@ -592,8 +520,9 @@
  */
 CECTag* CECTag::GetTagByName(ec_tagname_t name)
 {
-	for (TagList::size_type i=0; i<m_tagList.size(); i++)
-		if (m_tagList[i].m_tagName == name) return &m_tagList[i];
+	for (TagList::iterator it = m_tagList.begin(); it != m_tagList.end(); it++) {
+		if (it->m_tagName == name) return & *it;
+	}
 	return NULL;
 }
 
@@ -622,9 +551,9 @@
 uint32 CECTag::GetTagLen(void) const
 {
 	uint32 length = m_dataLen;
-	for (TagList::size_type i=0; i<m_tagList.size(); i++) {
-		length += m_tagList[i].GetTagLen();
-		length += sizeof(ec_tagname_t) + sizeof(ec_tagtype_t) + sizeof(ec_taglen_t) + ((m_tagList[i].GetTagCount() > 0) ? 2 : 0);
+	for (const_iterator it = begin(); it != end(); it++) {
+		length += it->GetTagLen();
+		length += sizeof(ec_tagname_t) + sizeof(ec_tagtype_t) + sizeof(ec_taglen_t) + (it->HasChildTags() ? 2 : 0);
 	}
 	return length;
 }
@@ -667,7 +596,7 @@
 		return std::string();
 	}
 
-	return std::string((const char*)m_tagData);
+	return std::string(m_tagData);
 }
 
 
@@ -697,7 +626,7 @@
 /**
  * Returns an EC_IPv4_t class.
  *
- * This function takes care of the enadianness of the port number.
+ * This function takes care of the endianness of the port number.
  *
  * @return EC_IPv4_t class.
  *
@@ -707,9 +636,9 @@
 {
 	EC_IPv4_t p(0, 0);
 	
-	if (m_tagData == NULL) {
-		EC_ASSERT(false);
-	} else if (m_dataType != EC_TAGTYPE_IPV4) {
+	if (m_dataType != EC_TAGTYPE_IPV4) {
+		EC_ASSERT(m_dataType == EC_TAGTYPE_UNKNOWN);
+	} else if (m_tagData == NULL) {
 		EC_ASSERT(false);
 	} else {
 		RawPokeUInt32( p.m_ip, RawPeekUInt32( ((EC_IPv4_t *)m_tagData)->m_ip ) );
@@ -739,7 +668,7 @@
 		return 0;
 	}
 	
-	std::istringstream double_str((const char*)m_tagData);
+	std::istringstream double_str(m_tagData);
 	
 	double data;
 	double_str >> data;
@@ -747,19 +676,359 @@
 }
 
 
-void CECTag::ConstructStringTag(ec_tagname_t /*name*/, const std::string& data)
+void CECTag::ConstructStringTag(ec_tagname_t name, const std::string& data)
 {
+	m_tagName = name;
 	m_dataLen = (ec_taglen_t)strlen(data.c_str()) + 1;
-	m_tagData = malloc(m_dataLen);
-	if (m_tagData != NULL) {
-		memcpy((void *)m_tagData, data.c_str(), m_dataLen);
-		m_error = 0;
-		m_dataType = EC_TAGTYPE_STRING;
-	} else {
-		m_error = 1;
-	}	
+	NewData();
+	memcpy(m_tagData, data.c_str(), m_dataLen);
+	m_dataType = EC_TAGTYPE_STRING;
+}
+
+void CECTag::SetStringData(const wxString& s)
+{
+	if (IsString()) {
+		delete [] m_tagData;
+		ConstructStringTag(m_tagName, (const char*)unicode2UTF8(s));
+	}
 }
 
+
+bool CECTag::AssignIfExist(ec_tagname_t tagname, bool *target) const
+{
+	bool ret = false;
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		ret = tag->GetInt() > 0;
+		if (target) {
+			*target = ret;
+		}
+	}
+	return ret;
+}
+
+bool CECTag::AssignIfExist(ec_tagname_t tagname, bool &target) const
+{
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		target = tag->GetInt() > 0;
+		return true;
+	}
+	return false;
+}
+
+uint8_t CECTag::AssignIfExist(ec_tagname_t tagname, uint8_t *target) const
+{
+	uint8_t ret = 0;
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		EC_ASSERT((tag->GetType() == EC_TAGTYPE_UINT8) || (m_dataType == EC_TAGTYPE_UNKNOWN));
+		ret = tag->GetInt();
+		if (target) {
+			*target = ret;
+		}
+	}
+	return ret;
+}
+
+bool CECTag::AssignIfExist(ec_tagname_t tagname, uint8_t &target) const
+{
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		EC_ASSERT((tag->GetType() == EC_TAGTYPE_UINT8) || (m_dataType == EC_TAGTYPE_UNKNOWN));
+		target = tag->GetInt();
+		return true;
+	}
+	return false;
+}
+
+uint16_t CECTag::AssignIfExist(ec_tagname_t tagname, uint16_t *target) const
+{
+	uint16_t ret = 0;
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		EC_ASSERT(
+			(tag->GetType() == EC_TAGTYPE_UINT16)
+			|| (tag->GetType() == EC_TAGTYPE_UINT8)
+			|| (m_dataType == EC_TAGTYPE_UNKNOWN)
+		);
+		ret = tag->GetInt();
+		if (target) {
+			*target = ret;
+		}
+	}
+	return ret;
+}
+
+bool CECTag::AssignIfExist(ec_tagname_t tagname, uint16_t &target) const
+{
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		EC_ASSERT(
+			(tag->GetType() == EC_TAGTYPE_UINT16)
+			|| (tag->GetType() == EC_TAGTYPE_UINT8)
+			|| (m_dataType == EC_TAGTYPE_UNKNOWN)
+		);
+		target = tag->GetInt();
+		return true;
+	}
+	return false;
+}
+
+uint32_t CECTag::AssignIfExist(ec_tagname_t tagname, uint32_t *target) const
+{
+	uint32_t ret = 0;
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		EC_ASSERT(
+			(tag->GetType() == EC_TAGTYPE_UINT32)
+			|| (tag->GetType() == EC_TAGTYPE_UINT16)
+			|| (tag->GetType() == EC_TAGTYPE_UINT8)
+			|| (m_dataType == EC_TAGTYPE_UNKNOWN)
+		);
+		ret = tag->GetInt();
+		if (target) {
+			*target = ret;
+		}
+	}
+	return ret;
+}
+
+bool CECTag::AssignIfExist(ec_tagname_t tagname, uint32_t &target) const
+{
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		EC_ASSERT(
+			(tag->GetType() == EC_TAGTYPE_UINT32)
+			|| (tag->GetType() == EC_TAGTYPE_UINT16)
+			|| (tag->GetType() == EC_TAGTYPE_UINT8)
+			|| (m_dataType == EC_TAGTYPE_UNKNOWN)
+		);
+		target = tag->GetInt();
+		return true;
+	}
+	return false;
+}
+
+uint64_t CECTag::AssignIfExist(ec_tagname_t tagname, uint64_t *target) const
+{
+	uint64_t ret = 0;
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		ret = tag->GetInt();
+		if (target) {
+			*target = ret;
+		}
+	}
+	return ret;
+}
+
+bool CECTag::AssignIfExist(ec_tagname_t tagname, uint64_t &target) const
+{
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		target = tag->GetInt();
+		return true;
+	}
+	return false;
+}
+
+time_t CECTag::AssignIfExist(ec_tagname_t tagname, time_t *target) const
+{
+	time_t ret = 0;
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		ret = tag->GetInt();
+		if (target) {
+			*target = ret;
+		}
+	}
+	return ret;
+}
+
+bool CECTag::AssignIfExist(ec_tagname_t tagname, time_t &target) const
+{
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		target = tag->GetInt();
+		return true;
+	}
+	return false;
+}
+
+double CECTag::AssignIfExist(ec_tagname_t tagname, double *target) const
+{
+	double ret = 0.0;
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		ret = tag->GetDoubleData();
+		if (target) {
+			*target = ret;
+		}
+	}
+	return ret;
+}
+
+bool CECTag::AssignIfExist(ec_tagname_t tagname, double &target) const
+{
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		target = tag->GetDoubleData();
+		return true;
+	}
+	return false;
+}
+
+float CECTag::AssignIfExist(ec_tagname_t tagname, float *target) const
+{
+	float ret = 0.0;
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		ret = tag->GetDoubleData();
+		if (target) {
+			*target = ret;
+		}
+	}
+	return ret;
+}
+
+bool CECTag::AssignIfExist(ec_tagname_t tagname, float &target) const
+{
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		target = tag->GetDoubleData();
+		return true;
+	}
+	return false;
+}
+
+CMD4Hash CECTag::AssignIfExist(ec_tagname_t tagname, CMD4Hash *target) const
+{
+	CMD4Hash ret;
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		ret = tag->GetMD4Data();
+		if (target) {
+			*target = ret;
+		}
+	}
+	return ret;
+}
+
+bool CECTag::AssignIfExist(ec_tagname_t tagname, CMD4Hash &target) const
+{
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		target = tag->GetMD4Data();
+		return true;
+	}
+	return false;
+}
+
+std::string CECTag::AssignIfExist(ec_tagname_t tagname, std::string *target) const
+{
+	std::string ret;
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		ret = tag->GetStringDataSTL();
+		if (target) {
+			*target = ret;
+		}
+	}
+	return ret;
+}
+
+bool CECTag::AssignIfExist(ec_tagname_t tagname, std::string &target) const
+{
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		target = tag->GetStringDataSTL();
+		return true;
+	}
+	return false;
+}
+
+#ifdef USE_WX_EXTENSIONS
+wxString CECTag::AssignIfExist(ec_tagname_t tagname, wxString *target) const
+{
+	wxString ret;
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		ret = tag->GetStringData();
+		if (target) {
+			*target = ret;
+		}
+	}
+	return ret;
+}
+
+bool CECTag::AssignIfExist(ec_tagname_t tagname, wxString &target) const
+{
+	const CECTag *tag = GetTagByName(tagname);
+	if (tag) {
+		target = tag->GetStringData();
+		return true;
+	}
+	return false;
+}		
+#endif
+
+
+#ifdef	__DEBUG__
+void CECTag::DebugPrint(int level, bool print_empty) const
+{
+	if (m_dataLen || print_empty) {
+		wxString space;
+		for (int i = level; i--;) space += wxT("  ");
+		wxString s1 = CFormat(wxT("%s%s %d = ")) % space % GetDebugNameECTagNames(m_tagName) % m_dataLen;
+		wxString s2;
+		switch (m_tagName) {
+			case EC_TAG_DETAIL_LEVEL:
+				s2 = GetDebugNameEC_DETAIL_LEVEL(GetInt()); break;
+			case EC_TAG_SEARCH_TYPE:
+				s2 = GetDebugNameEC_SEARCH_TYPE(GetInt()); break;
+			case EC_TAG_STAT_VALUE_TYPE:
+				s2 = GetDebugNameEC_STATTREE_NODE_VALUE_TYPE(GetInt()); break;
+			default:
+				switch (m_dataType) {
+					case EC_TAGTYPE_UINT8:
+					case EC_TAGTYPE_UINT16:
+					case EC_TAGTYPE_UINT32:
+					case EC_TAGTYPE_UINT64:
+						s2 = CFormat(wxT("%d")) % GetInt(); break;
+					case EC_TAGTYPE_STRING:
+						s2 = GetStringData(); break;
+					case EC_TAGTYPE_DOUBLE:
+						s2 = CFormat(wxT("%.1f")) % GetDoubleData(); break;
+					case EC_TAGTYPE_HASH16:
+						s2 = GetMD4Data().Encode(); break;
+					case EC_TAGTYPE_CUSTOM:
+						if (m_dataLen == 0) {
+							s2 = wxT("empty");
+						} else {
+							// Make a hex dump (limited to maxOutput)
+							const uint32 maxOutput = 50;
+							for (uint32 i = 0; i < m_dataLen; i++) {
+								if (i == maxOutput) {
+									s2 += wxT("...");
+									break;
+								}
+								s2 += CFormat(wxT("%02X ")) % (unsigned char) m_tagData[i];
+							}
+						}
+						break;
+					default:
+						s2 = GetDebugNameECTagTypes(m_dataType);
+				}
+		}
+		DoECLogLine(s1 + s2);
+	}
+	for (TagList::const_iterator it = m_tagList.begin(); it != m_tagList.end(); ++it) {
+		it->DebugPrint(level + 1, true);
+	}
+}
+#endif
+
 /*!
  * \fn CMD4Hash CECTag::GetMD4Data(void) const
  *
@@ -888,4 +1157,7 @@
  *
  * \sa CECTag(ec_tagname_t, uint64)
  */
+
+uint32 CECID::s_IDCounter = 0;
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECTag.h -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECTag.h Changed

@@ -1,7 +1,7 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-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
@@ -47,6 +47,7 @@
 
 
 class CECSocket;
+class CValueMap;
 
 /**
  * Class to hold IPv4 address.
@@ -94,10 +95,11 @@
 
 class CECTag {
 	public:
-		CECTag(ec_tagname_t name, unsigned int length, const void *data, bool copy = true);
+		CECTag(ec_tagname_t name, unsigned int length, const void *data);
 		// tag for custom data: just init object, alloc buffer and return pointer
 		CECTag(ec_tagname_t name, unsigned int length, void **dataptr);
 		// Routines for special data types.
+		CECTag(ec_tagname_t name, bool data);
 		CECTag(ec_tagname_t name, uint8_t data);
 		CECTag(ec_tagname_t name, uint16_t data);
 		CECTag(ec_tagname_t name, uint32_t data);
@@ -108,26 +110,32 @@
 		CECTag(ec_tagname_t name, const CMD4Hash& data);
 		#ifdef USE_WX_EXTENSIONS
 		CECTag(ec_tagname_t name, const wxString& data);
-		CECTag(ec_tagname_t name, const char* data) { ConstructStringTag(name, data); }
+		CECTag(ec_tagname_t name, const wxChar* data);
 		#endif
+		CECTag(ec_tagname_t name, const char* data) { ConstructStringTag(name, data); }
+		CECTag();
 		CECTag(const CECTag& tag);
 		~CECTag(void);
 
 		CECTag&		operator=(const CECTag& rhs);
-		bool		AddTag(const CECTag& tag);
-		const CECTag*	GetTagByIndex(size_t index) const
-			{ return ((index >= m_tagList.size()) ? NULL : &m_tagList[index]); }
-		CECTag*		GetTagByIndex(size_t index)
-			{ return ((index >= m_tagList.size()) ? NULL : &m_tagList[index]); }
-		const CECTag*	GetTagByIndexSafe(size_t index) const
-			{ const CECTag* result = GetTagByIndex(index); return result ? result : &s_theNullTag; }
+		bool		operator==(const CECTag& tag) const;
+		bool		operator!=(const CECTag& tag) const	{ return !(*this == tag); }
+		bool		AddTag(const CECTag& tag, CValueMap* valuemap = NULL);
+		void		AddTag(ec_tagname_t name, uint64_t data, CValueMap* valuemap = NULL);
+		void		AddTag(ec_tagname_t name, const CMD4Hash& data, CValueMap* valuemap);
+		#ifdef USE_WX_EXTENSIONS
+		void		AddTag(ec_tagname_t name, const wxString& data, CValueMap* valuemap = NULL);
+		#endif
+
+		const CECTag*	GetFirstTagSafe() const { return m_tagList.empty() ? &s_theNullTag : & *m_tagList.begin(); }
 		
 		const CECTag*	GetTagByName(ec_tagname_t name) const;
 		CECTag*			GetTagByName(ec_tagname_t name);
 		const CECTag*	GetTagByNameSafe(ec_tagname_t name) const;
 		
-		size_t		GetTagCount(void) const { return m_tagList.size(); }
-		const void *	GetTagData(void) const { 
+		size_t			GetTagCount() const { return m_tagList.size(); }
+		bool			HasChildTags() const { return !m_tagList.empty(); }
+		const void *	GetTagData() const { 
 			EC_ASSERT(m_dataType == EC_TAGTYPE_CUSTOM);
 			return m_tagData; 
 		}
@@ -137,135 +145,87 @@
 		
 		// Retrieving special data types
 		uint64_t		GetInt() const;
+		bool			IsInt() const { return m_dataType >= EC_TAGTYPE_UINT8 && m_dataType <= EC_TAGTYPE_UINT64; }
 		double			GetDoubleData() const;
 		std::string		GetStringDataSTL() const;
+		bool			IsString() const { return m_dataType == EC_TAGTYPE_STRING; }
 		
 		#ifdef USE_WX_EXTENSIONS
 		wxString GetStringData() const;
+		void SetStringData(const wxString& s);
 		#endif 
 		
 		EC_IPv4_t 	GetIPv4Data() const;
 		CMD4Hash	GetMD4Data() const;
 
+		void		DebugPrint(int level, bool print_empty) const;
+		void		swap(CECTag & t);
 		
-		void AssignIfExist(ec_tagname_t tagname, uint8_t &target)
-		{
-			CECTag *tag = GetTagByName(tagname);
-			if ( tag ) {
-				EC_ASSERT((tag->GetType() == EC_TAGTYPE_UINT8) || (m_dataType == EC_TAGTYPE_UNKNOWN));
-				target = tag->GetInt();
-			}
-		}
-		void AssignIfExist(ec_tagname_t tagname, uint16_t &target)
-		{
-			CECTag *tag = GetTagByName(tagname);
-			if ( tag ) {
-				EC_ASSERT(
-					(tag->GetType() == EC_TAGTYPE_UINT16)
-					|| (tag->GetType() == EC_TAGTYPE_UINT8)
-					|| (m_dataType == EC_TAGTYPE_UNKNOWN)
-				);
-				target = tag->GetInt();
-			}
-		}
-		void AssignIfExist(ec_tagname_t tagname, uint32_t &target)
-		{
-			CECTag *tag = GetTagByName(tagname);
-			if ( tag ) {
-				EC_ASSERT(
-					(tag->GetType() == EC_TAGTYPE_UINT32)
-					|| (tag->GetType() == EC_TAGTYPE_UINT16)
-					|| (tag->GetType() == EC_TAGTYPE_UINT8)
-					|| (m_dataType == EC_TAGTYPE_UNKNOWN)
-				);
-				target = tag->GetInt();	
-			}
-		}
-		void AssignIfExist(ec_tagname_t tagname, uint64_t &target)
-		{
-			CECTag *tag = GetTagByName(tagname);
-			if ( tag ) target = tag->GetInt();
-		}
-		void AssignIfExist(ec_tagname_t tagname, double &target)
-		{
-			CECTag *tag = GetTagByName(tagname);
-			if ( tag ) target = tag->GetDoubleData();
-		}
-		void AssignIfExist(ec_tagname_t tagname, CMD4Hash &target)
-		{
-			CECTag *tag = GetTagByName(tagname);
-			if ( tag ) target = tag->GetMD4Data();
-		}
-		void AssignIfExist(ec_tagname_t tagname, std::string &target)
-		{
-			CECTag *tag = GetTagByName(tagname);
-			if ( tag ) target = tag->GetStringDataSTL();
-		}
-		
+		// If tag exists, return its value and store it in target (if target != NULL)
+		// Else return safe value and don't touch target
+		// Allows for one function for old and new style.
+		bool		AssignIfExist(ec_tagname_t tagname, bool *target) const;
+		uint8_t		AssignIfExist(ec_tagname_t tagname, uint8_t *target) const;
+		uint16_t	AssignIfExist(ec_tagname_t tagname, uint16_t *target) const;
+		uint32_t	AssignIfExist(ec_tagname_t tagname, uint32_t *target) const;
+		uint64_t	AssignIfExist(ec_tagname_t tagname, uint64_t *target) const;
+		time_t		AssignIfExist(ec_tagname_t tagname, time_t *target) const;
+		double		AssignIfExist(ec_tagname_t tagname, double *target) const;
+		float		AssignIfExist(ec_tagname_t tagname, float *target) const;
+		CMD4Hash	AssignIfExist(ec_tagname_t tagname, CMD4Hash *target) const;
+		std::string	AssignIfExist(ec_tagname_t tagname, std::string *target) const;
 		#ifdef USE_WX_EXTENSIONS
-		void AssignIfExist(ec_tagname_t tagname, wxString &target)
-		{
-			CECTag *tag = GetTagByName(tagname);
-			if ( tag ) target = tag->GetStringData();
-		}		
+		wxString	AssignIfExist(ec_tagname_t tagname, wxString *target) const;
 		#endif
-		
-	protected:
 
-		uint8_t GetType() const { return m_dataType; }
+		// If tag exists, return true and store it in target
+		// Else return false and don't touch target
+		bool		AssignIfExist(ec_tagname_t tagname, bool &target) const;
+		bool		AssignIfExist(ec_tagname_t tagname, uint8_t &target) const;
+		bool		AssignIfExist(ec_tagname_t tagname, uint16_t &target) const;
+		bool		AssignIfExist(ec_tagname_t tagname, uint32_t &target) const;
+		bool		AssignIfExist(ec_tagname_t tagname, uint64_t &target) const;
+		bool		AssignIfExist(ec_tagname_t tagname, time_t &target) const;
+		bool		AssignIfExist(ec_tagname_t tagname, double &target) const;
+		bool		AssignIfExist(ec_tagname_t tagname, float &target) const;
+		bool		AssignIfExist(ec_tagname_t tagname, CMD4Hash &target) const;
+		bool		AssignIfExist(ec_tagname_t tagname, std::string &target) const;
+		#ifdef USE_WX_EXTENSIONS
+		bool		AssignIfExist(ec_tagname_t tagname, wxString &target) const;
+		#endif
 
-		enum BuildState {
-			bsName,
-			bsType,
-			bsLength,
-			bsLengthChld,
-			bsChildCnt,
-			bsChildren,
-			bsData1,
-			bsData2,
-			bsFinished
-		};
+	protected:
 
-		CECTag(const CECSocket&)
-			: m_error(0), m_tagData(NULL), m_state(bsName), m_dataLen(0), m_dataType(EC_TAGTYPE_UNKNOWN), m_dynamic(true), m_haschildren(false)
-			{}
+		uint8_t GetType() const { return m_dataType; }
 
 		bool		ReadFromSocket(CECSocket& socket);
 		bool		WriteTag(CECSocket& socket) const;
 		bool		ReadChildren(CECSocket& socket);
 		bool		WriteChildren(CECSocket& socket) const;
-		int		m_error;
-		const void *	m_tagData;
-
-		BuildState	m_state;
-
-		bool		IsOk() const { return m_state == bsFinished; }
 
 	private:
-		// Special type used to invoke the Null tag constructor
-		struct NullTagConstructorSelector { };
-		
 		// To init. the automatic int data
 		void InitInt(uint64_t data);
 
-		// Special constructor to construct the Null tag.
-		explicit CECTag(const NullTagConstructorSelector*);
-
 		ec_tagname_t	m_tagName;
+		ec_tagtype_t	m_dataType;
 		ec_taglen_t		m_dataLen;
-		mutable ec_tagtype_t	m_dataType;
-		bool		m_dynamic;
+		char *			m_tagData;
+		void NewData()	{ m_tagData = new char[m_dataLen]; }
 
-		typedef std::vector<CECTag> TagList;
+		typedef std::list<CECTag> TagList;
 		TagList m_tagList;
 		
-		bool m_haschildren;
-
 		static const CECTag s_theNullTag;
-		static const uint32_t s_theNullTagData[4];
 		
 		// To be used by the string constructors.
 		void ConstructStringTag(ec_tagname_t name, const std::string& data);
+
+	public:
+		// Iteration through child tags
+		typedef TagList::const_iterator const_iterator;
+		const_iterator begin()	const { return m_tagList.begin(); }
+		const_iterator end()	const { return m_tagList.end(); }
 };
 
 
@@ -277,9 +237,20 @@
  */
 class CECEmptyTag : public CECTag {
 	public:
-		CECEmptyTag(ec_tagname_t name) : CECTag(name, 0, NULL, false) {}
-	protected:
-		CECEmptyTag(const CECSocket& socket) : CECTag(socket) {}
+		CECEmptyTag(ec_tagname_t name = 0) : CECTag(name, 0, (const void *) NULL) {}
+};
+
+/**
+ * An integer TAG
+ *
+ * This is just to easily overcome ctor ambiguity. It's prettier to write
+ *		CECIntTag(name, some_value)
+ * instead of
+ *		CECTag(name, (uint64)value)
+ */
+class CECIntTag : public CECTag {
+	public:
+		CECIntTag(ec_tagname_t name, uint64 data) : CECTag(name, data) {}
 };
 
 #endif /* ECTAG_H */

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/ECTagTypes.h -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/ECTagTypes.h Changed

@@ -1,7 +1,7 @@
 // 
 //  This file is part of the aMule Project.
 // 
-//  Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+//  Copyright (c) 2004-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
@@ -40,4 +40,25 @@
 	EC_TAGTYPE_HASH16 = 9
 };
 
+#ifdef DEBUG_EC_IMPLEMENTATION
+
+wxString GetDebugNameECTagTypes(uint8 arg)
+{
+	switch (arg) {
+		case 0: return wxT("EC_TAGTYPE_UNKNOWN");
+		case 1: return wxT("EC_TAGTYPE_CUSTOM");
+		case 2: return wxT("EC_TAGTYPE_UINT8");
+		case 3: return wxT("EC_TAGTYPE_UINT16");
+		case 4: return wxT("EC_TAGTYPE_UINT32");
+		case 5: return wxT("EC_TAGTYPE_UINT64");
+		case 6: return wxT("EC_TAGTYPE_STRING");
+		case 7: return wxT("EC_TAGTYPE_DOUBLE");
+		case 8: return wxT("EC_TAGTYPE_IPV4");
+		case 9: return wxT("EC_TAGTYPE_HASH16");
+		default: return CFormat(wxT("unknown %d 0x%x")) % arg % arg;
+	}
+}
+
+#endif	// DEBUG_EC_IMPLEMENTATION
+
 #endif // __ECTAGTYPES_H__

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/Makefile.am -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/Makefile.in -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +16,12 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -48,11 +46,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -62,22 +62,39 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 libec_a_AR = $(AR) $(ARFLAGS)
 libec_a_LIBADD =
 am_libec_a_OBJECTS = ECTag.$(OBJEXT) ECPacket.$(OBJEXT) \
 	ECSocket.$(OBJEXT) ECMuleSocket.$(OBJEXT) \
 	RemoteConnect.$(OBJEXT) ECSpecialTags.$(OBJEXT)
 libec_a_OBJECTS = $(am_libec_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libec_a_SOURCES)
 DIST_SOURCES = $(libec_a_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -85,24 +102,15 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -117,17 +125,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -139,44 +141,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -198,13 +200,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -212,44 +211,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -258,7 +253,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -266,25 +260,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -296,30 +284,41 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-AM_CPPFLAGS = $(MULECPPFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/libs -I$(top_srcdir)/src/include $(WX_CPPFLAGS) $(ZLIB_CPPFLAGS)
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+AM_CPPFLAGS = $(MULECPPFLAGS) -I$(top_srcdir)/src -I$(top_srcdir)/src/libs -I$(top_srcdir)/src/include $(WXBASE_CPPFLAGS) $(ZLIB_CPPFLAGS)
 AM_CXXFLAGS = $(MULECXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY)
 EXTRA_DIST = gen_ECVersion
 
@@ -344,6 +343,7 @@
 		ECSpecialTags.h \
 		ECCodes.h \
 		ECTagTypes.h \
+		ECID.h \
 		RemoteConnect.h
 
 MAINTAINERCLEANFILES = Makefile.in
@@ -358,14 +358,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/libs/ec/cpp/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/libs/ec/cpp/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/libs/ec/cpp/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/libs/ec/cpp/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -383,13 +383,14 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 libec.a: $(libec_a_OBJECTS) $(libec_a_DEPENDENCIES) 
-	-rm -f libec.a
-	$(libec_a_AR) libec.a $(libec_a_OBJECTS) $(libec_a_LIBADD)
-	$(RANLIB) libec.a
+	$(AM_V_at)-rm -f libec.a
+	$(AM_V_AR)$(libec_a_AR) libec.a $(libec_a_OBJECTS) $(libec_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libec.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -405,92 +406,100 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RemoteConnect.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -521,6 +530,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -543,18 +553,38 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -574,18 +604,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: all check install install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-noinstLIBRARIES ctags distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
+	uninstall-am
 
 
 mkFileSum$(BUILD_EXEEXT): $(top_srcdir)/src/utils/mkFileSum.c
@@ -600,6 +634,7 @@
 EC-timestamp: mkFileSum$(BUILD_EXEEXT) $(top_srcdir)/src/libs/ec/cpp/gen_ECVersion $(top_srcdir)/src/libs/ec/cpp/ECCodes.h
 	@echo "ECVersion.h timestamp file" > EC-timestamp
 	@$(top_srcdir)/src/libs/ec/cpp/gen_ECVersion $(top_srcdir)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/RemoteConnect.cpp -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/RemoteConnect.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2004-2009 Angel Vidal Veiga ( kry@users.sourceforge.net )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@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
@@ -25,30 +25,46 @@
 
 #include "RemoteConnect.h"
 
+#include <common/MD5Sum.h>
+#include <common/Format.h>
+
 #include <wx/intl.h>
 
 using std::auto_ptr;
 
 DEFINE_LOCAL_EVENT_TYPE(wxEVT_EC_CONNECTION)
 
-CECLoginPacket::CECLoginPacket(const wxString &pass,
-						const wxString& client, const wxString& version) : CECPacket(EC_OP_AUTH_REQ)
+CECLoginPacket::CECLoginPacket(const wxString& client, const wxString& version,
+							   bool canZLIB, bool canUTF8numbers, bool canNotify)
+:
+CECPacket(EC_OP_AUTH_REQ)
 {
 	AddTag(CECTag(EC_TAG_CLIENT_NAME, client));
 	AddTag(CECTag(EC_TAG_CLIENT_VERSION, version));
 	AddTag(CECTag(EC_TAG_PROTOCOL_VERSION, (uint64)EC_CURRENT_PROTOCOL_VERSION));
 
-	CMD4Hash passhash;
-	wxCHECK2(passhash.Decode(pass), /* Do nothing. */);
-	AddTag(CECTag(EC_TAG_PASSWD_HASH, passhash));
-	
-
 	#ifdef EC_VERSION_ID
 	CMD4Hash versionhash;
 	wxCHECK2(versionhash.Decode(wxT(EC_VERSION_ID)), /* Do nothing. */);
 	AddTag(CECTag(EC_TAG_VERSION_ID, versionhash));
 	#endif
 
+	// Send capabilities:
+	// support ZLIB compression
+	if (canZLIB)		AddTag(CECEmptyTag(EC_TAG_CAN_ZLIB));
+	// support encoding of integers as UTF-8
+	if (canUTF8numbers) AddTag(CECEmptyTag(EC_TAG_CAN_UTF8_NUMBERS));
+	// client accepts push messages
+	if (canNotify)		AddTag(CECEmptyTag(EC_TAG_CAN_NOTIFY));
+}
+
+CECAuthPacket::CECAuthPacket(const wxString& pass)
+:
+CECPacket(EC_OP_AUTH_PASSWD)
+{
+	CMD4Hash passhash;
+	wxCHECK2(passhash.Decode(pass), /* Do nothing. */);
+	AddTag(CECTag(EC_TAG_PASSWD_HASH, passhash));
 }
 
 /*!
@@ -68,10 +84,26 @@
 // This is not mean to be absolute limit, because we can't drop requests
 // out of calling context; it is just signal to application to slow down
 m_req_fifo_thr(20),
-m_notifier(evt_handler)
+m_notifier(evt_handler),
+m_canZLIB(false),
+m_canUTF8numbers(false),
+m_canNotify(false)
 {
 }
 
+void CRemoteConnect::SetCapabilities(bool canZLIB, bool canUTF8numbers, bool canNotify)
+{ 
+	m_canZLIB = canZLIB;
+	if (canZLIB) {
+		m_my_flags |= EC_FLAG_ZLIB;
+	}
+	m_canUTF8numbers = canUTF8numbers;
+	if (canUTF8numbers) {
+		m_my_flags |= EC_FLAG_UTF8_NUMBERS;
+	}
+	m_canNotify = canNotify;
+}
+
 bool CRemoteConnect::ConnectToCore(const wxString &host, int port,
 	const wxString &WXUNUSED(login), const wxString &pass, 
 	const wxString& client, const wxString& version)
@@ -102,9 +134,19 @@
 	addr.Service(port);
 
 	if (ConnectSocket(addr)) {
-		CECLoginPacket login_req(m_connectionPassword, m_client, m_version);
-		std::auto_ptr<const CECPacket> reply(SendRecvPacket(&login_req));
-		return ConnectionEstablished(reply.get());
+		CECLoginPacket login_req(m_client, m_version, m_canZLIB, m_canUTF8numbers, m_canNotify);
+
+		std::auto_ptr<const CECPacket> getSalt(SendRecvPacket(&login_req));
+		m_ec_state = EC_REQ_SENT;
+
+		ProcessAuthPacket(getSalt.get());
+
+		CECAuthPacket passwdPacket(m_connectionPassword);
+
+		std::auto_ptr<const CECPacket> reply(SendRecvPacket(&passwdPacket));
+		m_ec_state = EC_PASSWD_SENT;
+
+		return ProcessAuthPacket(reply.get());
 	} else if (m_notifier) {
 		m_ec_state = EC_CONNECT_SENT;
 	} else {
@@ -114,10 +156,20 @@
 	return true;
 }
 
+bool CRemoteConnect::IsConnectedToLocalHost()
+{
+	wxIPV4address addr;
+	return GetPeer(addr) ? addr.IsLocalHost() : false;
+}
+
+void CRemoteConnect::WriteDoneAndQueueEmpty()
+{
+}
+
 void CRemoteConnect::OnConnect() {
 	if (m_notifier) {
 		wxASSERT(m_ec_state == EC_CONNECT_SENT);
-		CECLoginPacket login_req(m_connectionPassword, m_client, m_version);
+		CECLoginPacket login_req(m_client, m_version, m_canZLIB, m_canUTF8numbers, m_canNotify);
 		CECSocket::SendPacket(&login_req);
 		
 		m_ec_state = EC_REQ_SENT;
@@ -134,18 +186,22 @@
 	}
 }
 
-const CECPacket *CRemoteConnect::OnPacketReceived(const CECPacket *packet)
+const CECPacket *CRemoteConnect::OnPacketReceived(const CECPacket *packet, uint32 trueSize)
 {
 	CECPacket *next_packet = 0;
 	m_req_count--;
+	packet->DebugPrint(true, trueSize);
 	switch(m_ec_state) {
 		case EC_REQ_SENT:
-			if ( ConnectionEstablished(packet) ) {
-				m_ec_state = EC_OK;
-			} else {
-				m_ec_state = EC_FAIL;
+			if (ProcessAuthPacket(packet)) {
+				CECAuthPacket passwdPacket(m_connectionPassword);
+				CECSocket::SendPacket(&passwdPacket);
+				m_ec_state = EC_PASSWD_SENT;
 			}
 			break;
+		case EC_PASSWD_SENT:
+			ProcessAuthPacket(packet);
+			break;
 		case EC_OK: 
 			if ( !m_req_fifo.empty() ) {
 				CECPacketHandlerBase *handler = m_req_fifo.front();
@@ -169,45 +225,56 @@
  * Our requests are served by core in FCFS order. And core always replies. So, even
  * if we're not interested in reply, we preserve place in request fifo.
  */
-void CRemoteConnect::SendRequest(CECPacketHandlerBase *handler, CECPacket *request)
+void CRemoteConnect::SendRequest(CECPacketHandlerBase *handler, const CECPacket *request)
 {
 	m_req_count++;
 	m_req_fifo.push_back(handler);
 	CECSocket::SendPacket(request);
 }
 
-void CRemoteConnect::SendPacket(CECPacket *request)
+void CRemoteConnect::SendPacket(const CECPacket *request)
 {
 	SendRequest(0, request);
 }
 
-bool CRemoteConnect::ConnectionEstablished(const CECPacket *reply) {
+bool CRemoteConnect::ProcessAuthPacket(const CECPacket *reply) {
 	bool result = false;
 	
 	if (!reply) {
 		m_server_reply = _("EC connection failed. Empty reply.");
 		CloseSocket();
 	} else {
-		if (reply->GetOpCode() == EC_OP_AUTH_FAIL) {
-			const CECTag *reason = reply->GetTagByName(EC_TAG_STRING);
-			if (reason != NULL) {
-				m_server_reply = wxString(_("External Connection: Access denied because: ")) +
-					wxGetTranslation(reason->GetStringData());
-			} else {
-				m_server_reply = _("External Connection: Access denied");
-			}
-			CloseSocket();
-		} else if (reply->GetOpCode() != EC_OP_AUTH_OK) {
-			m_server_reply = _("External Connection: Bad reply from server. Connection closed.");
-			CloseSocket();
-		} else {
+		if ((m_ec_state == EC_REQ_SENT) && (reply->GetOpCode() == EC_OP_AUTH_SALT)) {
+				const CECTag *passwordSalt = reply->GetTagByName(EC_TAG_PASSWD_SALT);
+				if ( NULL != passwordSalt) {
+					wxString saltHash = MD5Sum(CFormat(wxT("%lX")) % passwordSalt->GetInt()).GetHash();
+					m_connectionPassword = MD5Sum(m_connectionPassword.Lower() + saltHash).GetHash();
+					m_ec_state = EC_SALT_RECEIVED;
+					return true;
+				} else {
+					m_server_reply = _("External Connection: Bad reply, handshake failed. Connection closed.");
+					m_ec_state = EC_FAIL;
+					CloseSocket();
+				}
+		} else if ((m_ec_state == EC_PASSWD_SENT) && (reply->GetOpCode() == EC_OP_AUTH_OK)) {
+			m_ec_state = EC_OK;
+			result = true;
 			if (reply->GetTagByName(EC_TAG_SERVER_VERSION)) {
 				m_server_reply = _("Succeeded! Connection established to aMule ") +
 					reply->GetTagByName(EC_TAG_SERVER_VERSION)->GetStringData();
 			} else {
 				m_server_reply = _("Succeeded! Connection established.");
 			}
-			result = true;
+		}else {
+			m_ec_state = EC_FAIL;
+			const CECTag *reason = reply->GetTagByName(EC_TAG_STRING);
+			if (reason != NULL) {
+				m_server_reply = wxString(_("External Connection: Access denied because: ")) +
+					wxGetTranslation(reason->GetStringData());
+			} else {
+				m_server_reply = _("External Connection: Handshake failed.");
+			}
+			CloseSocket();	
 		}
 	}
 	if ( m_notifier ) {

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/RemoteConnect.h -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/RemoteConnect.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2004-2009 Angel Vidal Veiga ( kry@users.sourceforge.net )
+// Copyright (c) 2004-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@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
@@ -38,8 +38,13 @@
 
 class CECLoginPacket : public CECPacket {
 	public:
-		CECLoginPacket(const wxString &pass,
-						const wxString& client, const wxString& version);
+		CECLoginPacket(const wxString& client, const wxString& version,
+						bool canZLIB = true, bool canUTF8numbers = true, bool canNotify = false);
+};
+
+class CECAuthPacket : public CECPacket {
+	public:
+		CECAuthPacket(const wxString& pass);
 };
 
 //#warning Kry TODO - move to abstract layer.
@@ -50,10 +55,12 @@
 		EC_INIT,         // initial state
 		EC_CONNECT_SENT, // socket connect request sent
 		EC_REQ_SENT,     // sent auth request to core, waiting for reply
-		EC_OK,           // core replyed "ok"
-		EC_FAIL          // core replyed "bad"
+		EC_SALT_RECEIVED,// received salt from core
+		EC_PASSWD_SENT,  // sent password to core, waiting for OK
+		EC_OK,           // core replied "ok"
+		EC_FAIL          // core replied "bad"
 	} m_ec_state;
-	
+
 	// fifo of handlers for on-the-air requests. all EC concept is working in fcfs
 	// order, so it is ok to assume that order of replies is same as order of requests
 	std::list<CECPacketHandlerBase *> m_req_fifo;
@@ -66,11 +73,18 @@
 	wxString m_server_reply;
 	wxString m_client;
 	wxString m_version;
-	
+
+	bool m_canZLIB;
+	bool m_canUTF8numbers;
+	bool m_canNotify;
+
+	void WriteDoneAndQueueEmpty();	
 public:
 	// The event handler is used for notifying connect/close 
 	CRemoteConnect(wxEvtHandler* evt_handler);
 
+	void SetCapabilities(bool canZLIB, bool canUTF8numbers, bool canNotify);
+
 	bool ConnectToCore(
 		const wxString &host, int port,
 		const wxString& login, const wxString &pass,
@@ -86,8 +100,8 @@
 	virtual void OnConnect(); // To override connection events
 	virtual void OnLost(); // To override close events
 
-	void SendRequest(CECPacketHandlerBase *handler, CECPacket *request);
-	void SendPacket(CECPacket *request);
+	void SendRequest(CECPacketHandlerBase *handler, const CECPacket *request);
+	void SendPacket(const CECPacket *request);
 	
 	/********************* EC API ********************/
 	
@@ -375,9 +389,12 @@
 	// Retrieves the statistics tree
 	void GetStatsTree();
 
+	// Check if connection goes to local machine
+	bool IsConnectedToLocalHost();
+
 private:
-	virtual const CECPacket *OnPacketReceived(const CECPacket *packet);
-	bool ConnectionEstablished(const CECPacket *reply);
+	virtual const CECPacket *OnPacketReceived(const CECPacket *packet, uint32 trueSize);
+	bool ProcessAuthPacket(const CECPacket *reply);
 };
 
 DECLARE_LOCAL_EVENT_TYPE(wxEVT_EC_CONNECTION, wxEVT_USER_FIRST + 1000)

aMule-2.2.6.tar.bz2/src/libs/ec/cpp/gen_ECVersion -> aMule-2.3.1.tar.bz2/src/libs/ec/cpp/gen_ECVersion Changed

aMule-2.2.6.tar.bz2/src/libs/ec/file_generator.pl -> aMule-2.3.1.tar.bz2/src/libs/ec/file_generator.pl Changed

@@ -3,8 +3,8 @@
 
 ## This file is part of the aMule Project
 ##
-## Copyright (c) 2007-2009 Angel Vidal (Kry) ( kry@amule.org )
-## Copyright (c) 2007-2009 aMule Project     ( http://www.amule-project.net )
+## Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+## Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License
@@ -41,6 +41,8 @@
 
 my $folder = $ARGV[0] . "/";
 
+my @debugOut;
+
 my $numArgs = $#ARGV;
 print "Parsing $numArgs files\n";
 
@@ -53,6 +55,7 @@
 
 	my $folder = $_[0];
 	my $input_file = $_[1];
+	@debugOut = ();
 
 	open(INFO, $folder . $input_file) or die "Cannot open input file " . $input_file . " for reading: $!";		# Open the file
 
@@ -102,29 +105,24 @@
 	#Open language output files
 	open(JAVAFILE," > " . $folder . "java/$filename" . ".java");
 
-	open(CDASHFILE, ">${folder}/c#/${filename}.cs");
-
 	# Print license on top.
 	write_license_header($folder, *CPPFILE, "// ", "", $filecontent);
-	write_license_header($folder, *CDASHFILE, "// ", "", $filecontent);
 	write_license_header($folder, *JAVAFILE, "// ", "", $filecontent);
 	#Example for a language that needs start/end:
 	#write_license_header($folder, *CFILE, "/* ", " */", $filecontent);
 
 	#Add top guards for each language
 	write_cpp_top_guard(*CPPFILE, $filename);
-	write_cdash_top_guard(*CDASHFILE);
 	# JAVA doesn't need guards, but needs file type declaration
 	print JAVAFILE "public interface " . $filename . " {\n\n";
 	##Add other language guards
 
 
-	read_content(*INFO, *CPPFILE, *JAVAFILE, *CDASHFILE);
+	read_content(*INFO, *CPPFILE, *JAVAFILE);
 
 
 	#Add bottom guards for each language
 	write_cpp_bottom_guard(*CPPFILE, $filename);
-	write_cdash_bottom_guard(*CDASHFILE);
 	# JAVA doesn't need guards, but we have to close the interface
 	print JAVAFILE "}\n";
 	##Add other language guards
@@ -146,7 +144,6 @@
 	local (*INFO) = $_[0];
 	local (*CPPFILE) = $_[1];
 	local (*JAVAFILE) = $_[2];
-	local (*CDASHFILE) = $_[3];
 
 	my $stop = "";
 
@@ -161,7 +158,7 @@
 
 		if ($line =~ /^\[Section Content\]$/) {
 			print "Reading content section...\n";
-			read_content_section(*INFO, *CPPFILE, *JAVAFILE, *CDASHFILE);
+			read_content_section(*INFO, *CPPFILE, *JAVAFILE);
 			print CPPFILE "\n";
 			print JAVAFILE "\n";
 		} else {
@@ -176,7 +173,6 @@
 	local (*INFO) = $_[0];
 	local (*CPPOUTPUT) = $_[1];
 	local (*JAVAOUTPUT) = $_[2];
-	local (*CDASHFILE) = $_[3];
 	
 	my $line = <INFO>;
 	my $datatype = "";
@@ -188,11 +184,11 @@
 	}
 
 	if ($datatype eq "Define") {
-		read_define_content(*INFO, *CPPOUTPUT, *JAVAOUTPUT, *CDASHFILE);
+		read_define_content(*INFO, *CPPOUTPUT, *JAVAOUTPUT);
 	} elsif ($datatype eq "Enum") {
-		read_enum_content(*INFO, *CPPOUTPUT, *JAVAOUTPUT, *CDASHFILE);
+		read_enum_content(*INFO, *CPPOUTPUT, *JAVAOUTPUT);
 	} elsif ($datatype eq "TypeDef") {
-		read_typedef_content(*INFO, *CPPOUTPUT, *JAVAOUTPUT, *CDASHFILE);
+		read_typedef_content(*INFO, *CPPOUTPUT, *JAVAOUTPUT);
 	} else {
 		die "Unknown type on content section\n";
 	}
@@ -203,7 +199,6 @@
 	local (*INFO) = $_[0];
 	local (*CPPOUTPUT) = $_[1];
 	local (*JAVAOUTPUT) = $_[2];
-	local (*CDASHFILE) = $_[3];
 
 	my $line = <INFO>;
 	while (!(eof) && ($line !~ /^\[\/Section\]$/)) {
@@ -211,7 +206,6 @@
 			if ($line =~ /^(.+)\s+(.+)$/) {
 				write_cpp_define_line(*CPPOUTPUT, $1, $2);
 				write_java_define_line(*JAVAOUTPUT, $1, $2);
-				write_cdash_define_line(*CDASHFILE, $1, $2);
 			} else {
 				die "Malformed content section define line\n";
 			}
@@ -233,7 +227,6 @@
 				write_cpp_typedef_line(*CPPOUTPUT, $1, $2);
 				# Java doesn't support typedefs, ignore it.
 				#write_java_typedef_line(*JAVAOUTPUT, $1, $2);
-				# c# doesn't support typedefs either (AFAIK)
 			} else {
 				die "Malformed content section typedef line\n";
 			}
@@ -247,7 +240,6 @@
 	local (*INFO) = $_[0];
 	local (*CPPOUTPUT) = $_[1];
 	local (*JAVAOUTPUT) = $_[2];
-	local (*CDASHFILE) = $_[3];
 
 	my $line = <INFO>;
 	my $dataname = "";
@@ -276,13 +268,11 @@
 				my $secondoperand = $2;
 	
 				if ($first) {
-					write_cpp_enum_start(*CPPOUTPUT, $dataname);
-					write_cdash_enum_start(*CDASHFILE, $dataname);
+					write_cpp_enum_start(*CPPOUTPUT, $dataname, $datatype);
 				}
 
 				write_cpp_enum_line(*CPPOUTPUT, $firstoperand, $secondoperand, $first);
 				write_java_define_line(*JAVAOUTPUT, $firstoperand, $secondoperand, $datatype);
-				write_cdash_enum_line(*CDASHFILE, $firstoperand, $secondoperand, $first);
 	
 				if ($first) {
 					$first = "";
@@ -295,8 +285,6 @@
 	}
 
 	write_cpp_enum_end(*CPPOUTPUT);
-	write_cdash_enum_end(*CDASHFILE);
-
 }
 
 # Takes a file handle, and the comment start/end character for that language
@@ -320,52 +308,6 @@
 	close(LICENSE);
 }
 
-################ C# Specific Subroutines #####################
-
-sub write_cdash_top_guard {
-	local (*OUTPUT) = $_[0];
-	print OUTPUT "namespace amule.net\n{\n";
-}
-
-sub write_cdash_bottom_guard {
-	local (*OUTPUT) = $_[0];
-	print OUTPUT "}\n";
-}
-
-sub write_cdash_enum_start {
-
-	local (*OUTPUT) = $_[0];
-
-	print OUTPUT "public enum " . $_[1] . " {\n";
-}
-
-sub write_cdash_enum_end {
-
-	local (*OUTPUT) = $_[0];
-
-	print OUTPUT "\n};\n"
-}
-
-
-sub write_cdash_enum_line {
-	local (*OUTPUT) = $_[0];
-
-	if ($_[3] !~ "yes") {
-		print OUTPUT ",\n"
-	}
-
-	# looks like c# can't handle such values as enums
-	if ( not (POSIX::strtod($_[2]) & 0x8000000) ) { 
-		print OUTPUT "\t" . $_[1] . " = " . $_[2];
-	}
-}
-
-sub write_cdash_define_line {
-	local (*OUTPUT) = $_[0];
-
-	die "ERROR: c# have no 'define' directive $_[1] $_[2]"
-}
-
 ################ CPP Specific Subroutines #####################
 
 sub write_cpp_top_guard {
@@ -384,8 +326,9 @@
 
 	my $guardname = uc($_[1]);
 
-	print OUTPUT "#endif // __" . $guardname . "_H__\n";
+	print OUTPUT "#ifdef DEBUG_EC_IMPLEMENTATION\n\n" . join("\n", @debugOut) . "\n#endif\t// DEBUG_EC_IMPLEMENTATION\n\n";
 
+	print OUTPUT "#endif // __" . $guardname . "_H__\n";
 }
 
 sub write_cpp_enum_start {
@@ -393,13 +336,17 @@
 	local (*OUTPUT) = $_[0];
 
 	print OUTPUT "enum " . $_[1] . " {\n";
+	
+	push @debugOut, "wxString GetDebugName$_[1]($_[2] arg)\n{\n\tswitch (arg) {";
 }
 
 sub write_cpp_enum_end {
 
 	local (*OUTPUT) = $_[0];
 
-	print OUTPUT "\n};\n"
+	print OUTPUT "\n};\n";
+
+	push @debugOut, "\t\tdefault: return CFormat(wxT(\"unknown %d 0x%x\")) % arg % arg;\n\t}\n}\n";
 }
 
 
@@ -412,6 +359,11 @@
 	}
 
 	print OUTPUT "\t" . $_[1] . " = " . $_[2];
+
+	my $arg = $_[1];
+	$arg =~ s/\s//g;	# remove whitespace
+	push @debugOut, "\t\tcase $_[2]: return wxT(\"$arg\");";
+
 }
 
 sub write_cpp_define_line {

aMule-2.3.1.tar.bz2/src/libs/ec/generate.cmd Added

aMule-2.2.6.tar.bz2/src/libs/ec/java/ECCodes.java -> aMule-2.3.1.tar.bz2/src/libs/ec/java/ECCodes.java Changed

@@ -1,7 +1,7 @@
 // 
 //  This file is part of the aMule Project.
 // 
-//  Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+//  Copyright (c) 2004-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
@@ -27,12 +27,10 @@
 public interface ECCodes {
 
 
-public final static short EC_CURRENT_PROTOCOL_VERSION = 0x0200;
+public final static short EC_CURRENT_PROTOCOL_VERSION = 0x0204;
 
 public final static int EC_FLAG_ZLIB	 = 0x00000001;
 public final static int EC_FLAG_UTF8_NUMBERS = 0x00000002;
-public final static int EC_FLAG_HAS_ID	 = 0x00000004;
-public final static int EC_FLAG_ACCEPTS	 = 0x00000010;
 public final static int EC_FLAG_UNKNOWN_MASK = 0xff7f7f08;
 
 public final static byte EC_OP_NOOP                          = 0x01;
@@ -49,13 +47,12 @@
 public final static byte EC_OP_STATS                         = 0x0C;
 public final static byte EC_OP_GET_DLOAD_QUEUE               = 0x0D;
 public final static byte EC_OP_GET_ULOAD_QUEUE               = 0x0E;
-public final static byte EC_OP_GET_WAIT_QUEUE                = 0x0F;
 public final static byte EC_OP_GET_SHARED_FILES              = 0x10;
 public final static byte EC_OP_SHARED_SET_PRIO               = 0x11;
 public final static byte EC_OP_PARTFILE_REMOVE_NO_NEEDED     = 0x12;
 public final static byte EC_OP_PARTFILE_REMOVE_FULL_QUEUE    = 0x13;
 public final static byte EC_OP_PARTFILE_REMOVE_HIGH_QUEUE    = 0x14;
-public final static byte EC_OP_PARTFILE_CLEANUP_SOURCES      = 0x15;
+public final static byte EC_OP_PARTFILE_UNUSED               = 0x15;
 public final static byte EC_OP_PARTFILE_SWAP_A4AF_THIS       = 0x16;
 public final static byte EC_OP_PARTFILE_SWAP_A4AF_THIS_AUTO  = 0x17;
 public final static byte EC_OP_PARTFILE_SWAP_A4AF_OTHERS     = 0x18;
@@ -67,10 +64,8 @@
 public final static byte EC_OP_PARTFILE_SET_CAT              = 0x1E;
 public final static byte EC_OP_DLOAD_QUEUE                   = 0x1F;
 public final static byte EC_OP_ULOAD_QUEUE                   = 0x20;
-public final static byte EC_OP_WAIT_QUEUE                    = 0x21;
 public final static byte EC_OP_SHARED_FILES                  = 0x22;
 public final static byte EC_OP_SHAREDFILES_RELOAD            = 0x23;
-public final static byte EC_OP_SHAREDFILES_ADD_DIRECTORY     = 0x24;
 public final static byte EC_OP_RENAME_FILE                   = 0x25;
 public final static byte EC_OP_SEARCH_START                  = 0x26;
 public final static byte EC_OP_SEARCH_STOP                   = 0x27;
@@ -110,9 +105,17 @@
 public final static byte EC_OP_KAD_STOP                      = 0x49;
 public final static byte EC_OP_CONNECT                       = 0x4A;
 public final static byte EC_OP_DISCONNECT                    = 0x4B;
-public final static byte EC_OP_GET_DLOAD_QUEUE_DETAIL        = 0x4C;
 public final static byte EC_OP_KAD_UPDATE_FROM_URL           = 0x4D;
 public final static byte EC_OP_KAD_BOOTSTRAP_FROM_IP         = 0x4E;
+public final static byte EC_OP_AUTH_SALT                     = 0x4F;
+public final static byte EC_OP_AUTH_PASSWD                   = 0x50;
+public final static byte EC_OP_IPFILTER_UPDATE               = 0x51;
+public final static byte EC_OP_GET_UPDATE                    = 0x52;
+public final static byte EC_OP_CLEAR_COMPLETED               = 0x53;
+public final static byte EC_OP_CLIENT_SWAP_TO_ANOTHER_FILE   = 0x54;
+public final static byte EC_OP_SHARED_FILE_SET_COMMENT       = 0x55;
+public final static byte EC_OP_SERVER_SET_STATIC_PRIO        = 0x56;
+public final static byte EC_OP_FRIEND                        = 0x57;
 
 public final static short EC_TAG_STRING                             = 0x0000;
 public final static short EC_TAG_PASSWD_HASH                        = 0x0001;
@@ -125,6 +128,11 @@
 public final static short EC_TAG_BOOTSTRAP_IP                       = 0x0008;
 public final static short EC_TAG_BOOTSTRAP_PORT                     = 0x0009;
 public final static short EC_TAG_CLIENT_ID                          = 0x000A;
+public final static short EC_TAG_PASSWD_SALT                        = 0x000B;
+public final static short EC_TAG_CAN_ZLIB                           = 0x000C;
+public final static short EC_TAG_CAN_UTF8_NUMBERS                   = 0x000D;
+public final static short EC_TAG_CAN_NOTIFY                         = 0x000E;
+public final static short EC_TAG_ECID                               = 0x000F;
 public final static short EC_TAG_CLIENT_NAME                        = 0x0100;
 public final static short 	EC_TAG_CLIENT_VERSION                     = 0x0101;
 public final static short 	EC_TAG_CLIENT_MOD                         = 0x0102;
@@ -141,6 +149,20 @@
 public final static short 	EC_TAG_STATS_KAD_USERS                    = 0x020A;
 public final static short 	EC_TAG_STATS_ED2K_FILES                   = 0x020B;
 public final static short 	EC_TAG_STATS_KAD_FILES                    = 0x020C;
+public final static short 	EC_TAG_STATS_LOGGER_MESSAGE               = 0x020D;
+public final static short 	EC_TAG_STATS_KAD_FIREWALLED_UDP           = 0x020E;
+public final static short 	EC_TAG_STATS_KAD_INDEXED_SOURCES          = 0x020F;
+public final static short 	EC_TAG_STATS_KAD_INDEXED_KEYWORDS         = 0x0210;
+public final static short 	EC_TAG_STATS_KAD_INDEXED_NOTES            = 0x0211;
+public final static short 	EC_TAG_STATS_KAD_INDEXED_LOAD             = 0x0212;
+public final static short 	EC_TAG_STATS_KAD_IP_ADRESS                = 0x0213;
+public final static short 	EC_TAG_STATS_BUDDY_STATUS                 = 0x0214;
+public final static short 	EC_TAG_STATS_BUDDY_IP                     = 0x0215;
+public final static short 	EC_TAG_STATS_BUDDY_PORT                   = 0x0216;
+public final static short 	EC_TAG_STATS_KAD_IN_LAN_MODE              = 0x0217;
+public final static short 	EC_TAG_STATS_TOTAL_SENT_BYTES             = 0x0218;
+public final static short 	EC_TAG_STATS_TOTAL_RECEIVED_BYTES         = 0x0219;
+public final static short 	EC_TAG_STATS_SHARED_FILE_COUNT            = 0x021A;
 public final static short EC_TAG_PARTFILE                           = 0x0300;
 public final static short 	EC_TAG_PARTFILE_NAME                      = 0x0301;
 public final static short 	EC_TAG_PARTFILE_PARTMETID                 = 0x0302;
@@ -164,6 +186,18 @@
 public final static short 	EC_TAG_PARTFILE_REQ_STATUS                = 0x0314;
 public final static short 	EC_TAG_PARTFILE_SOURCE_NAMES              = 0x0315;
 public final static short 	EC_TAG_PARTFILE_COMMENTS                  = 0x0316;
+public final static short 	EC_TAG_PARTFILE_STOPPED                   = 0x0317;
+public final static short 	EC_TAG_PARTFILE_DOWNLOAD_ACTIVE           = 0x0318;
+public final static short 	EC_TAG_PARTFILE_LOST_CORRUPTION           = 0x0319;
+public final static short 	EC_TAG_PARTFILE_GAINED_COMPRESSION        = 0x031A;
+public final static short 	EC_TAG_PARTFILE_SAVED_ICH                 = 0x031B;
+public final static short 	EC_TAG_PARTFILE_SOURCE_NAMES_COUNTS       = 0x031C;
+public final static short 	EC_TAG_PARTFILE_AVAILABLE_PARTS           = 0x031D;
+public final static short 	EC_TAG_PARTFILE_HASH                      = 0x031E;
+public final static short 	EC_TAG_PARTFILE_SHARED                    = 0x031F;
+public final static short 	EC_TAG_PARTFILE_HASHED_PART_COUNT         = 0x0320;
+public final static short 	EC_TAG_PARTFILE_A4AFAUTO                  = 0x0321;
+public final static short 	EC_TAG_PARTFILE_A4AF_SOURCES              = 0x0322;
 public final static short EC_TAG_KNOWNFILE                          = 0x0400;
 public final static short 	EC_TAG_KNOWNFILE_XFERRED                  = 0x0401;
 public final static short 	EC_TAG_KNOWNFILE_XFERRED_ALL              = 0x0402;
@@ -172,6 +206,14 @@
 public final static short 	EC_TAG_KNOWNFILE_ACCEPT_COUNT             = 0x0405;
 public final static short 	EC_TAG_KNOWNFILE_ACCEPT_COUNT_ALL         = 0x0406;
 public final static short 	EC_TAG_KNOWNFILE_AICH_MASTERHASH          = 0x0407;
+public final static short 	EC_TAG_KNOWNFILE_FILENAME                 = 0x0408;
+public final static short 	EC_TAG_KNOWNFILE_COMPLETE_SOURCES_LOW     = 0x0409;
+public final static short 	EC_TAG_KNOWNFILE_COMPLETE_SOURCES_HIGH    = 0x040A;
+public final static short 	EC_TAG_KNOWNFILE_PRIO                     = 0x040B;
+public final static short 	EC_TAG_KNOWNFILE_ON_QUEUE                 = 0x040C;
+public final static short 	EC_TAG_KNOWNFILE_COMPLETE_SOURCES         = 0x040D;
+public final static short 	EC_TAG_KNOWNFILE_COMMENT                  = 0x040E;
+public final static short 	EC_TAG_KNOWNFILE_RATING                   = 0x040F;
 public final static short EC_TAG_SERVER                             = 0x0500;
 public final static short 	EC_TAG_SERVER_NAME                        = 0x0501;
 public final static short 	EC_TAG_SERVER_DESC                        = 0x0502;
@@ -179,16 +221,18 @@
 public final static short 	EC_TAG_SERVER_PING                        = 0x0504;
 public final static short 	EC_TAG_SERVER_USERS                       = 0x0505;
 public final static short 	EC_TAG_SERVER_USERS_MAX                   = 0x0506;
-public final static short 	EC_TAG_SERVER_FILES		          = 0x0507;
-public final static short 	EC_TAG_SERVER_PRIO	                  = 0x0508;
+public final static short 	EC_TAG_SERVER_FILES                       = 0x0507;
+public final static short 	EC_TAG_SERVER_PRIO                        = 0x0508;
 public final static short 	EC_TAG_SERVER_FAILED                      = 0x0509;
 public final static short 	EC_TAG_SERVER_STATIC                      = 0x050A;
 public final static short 	EC_TAG_SERVER_VERSION                     = 0x050B;
+public final static short 	EC_TAG_SERVER_IP                          = 0x050C;
+public final static short 	EC_TAG_SERVER_PORT                        = 0x050D;
 public final static short EC_TAG_CLIENT                             = 0x0600;
 public final static short 	EC_TAG_CLIENT_SOFTWARE                    = 0x0601;
 public final static short 	EC_TAG_CLIENT_SCORE                       = 0x0602;
 public final static short 	EC_TAG_CLIENT_HASH                        = 0x0603;
-public final static short 	EC_TAG_CLIENT_FRIEND                      = 0x0604;
+public final static short 	EC_TAG_CLIENT_FRIEND_SLOT                 = 0x0604;
 public final static short 	EC_TAG_CLIENT_WAIT_TIME                   = 0x0605;
 public final static short 	EC_TAG_CLIENT_XFER_TIME                   = 0x0606;
 public final static short 	EC_TAG_CLIENT_QUEUE_TIME                  = 0x0607;
@@ -196,7 +240,7 @@
 public final static short 	EC_TAG_CLIENT_UPLOAD_SESSION              = 0x0609;
 public final static short 	EC_TAG_CLIENT_UPLOAD_TOTAL                = 0x060A;
 public final static short 	EC_TAG_CLIENT_DOWNLOAD_TOTAL              = 0x060B;
-public final static short 	EC_TAG_CLIENT_STATE                       = 0x060C;
+public final static short 	EC_TAG_CLIENT_DOWNLOAD_STATE              = 0x060C;
 public final static short 	EC_TAG_CLIENT_UP_SPEED                    = 0x060D;
 public final static short 	EC_TAG_CLIENT_DOWN_SPEED                  = 0x060E;
 public final static short 	EC_TAG_CLIENT_FROM                        = 0x060F;
@@ -207,6 +251,27 @@
 public final static short 	EC_TAG_CLIENT_SERVER_NAME                 = 0x0614;
 public final static short 	EC_TAG_CLIENT_SOFT_VER_STR                = 0x0615;
 public final static short 	EC_TAG_CLIENT_WAITING_POSITION            = 0x0616;
+public final static short 	EC_TAG_CLIENT_IDENT_STATE                 = 0x0617;
+public final static short 	EC_TAG_CLIENT_OBFUSCATION_STATUS          = 0x0618;
+public final static short 	EC_TAG_CLIENT_CURRENTLYUNUSED1            = 0x0619;
+public final static short 	EC_TAG_CLIENT_REMOTE_QUEUE_RANK           = 0x061A;
+public final static short 	EC_TAG_CLIENT_DISABLE_VIEW_SHARED         = 0x061B;
+public final static short 	EC_TAG_CLIENT_UPLOAD_STATE                = 0x061C;
+public final static short 	EC_TAG_CLIENT_EXT_PROTOCOL                = 0x061D;
+public final static short 	EC_TAG_CLIENT_USER_ID                     = 0x061E;
+public final static short 	EC_TAG_CLIENT_UPLOAD_FILE                 = 0x061F;
+public final static short 	EC_TAG_CLIENT_REQUEST_FILE                = 0x0620;
+public final static short 	EC_TAG_CLIENT_A4AF_FILES                  = 0x0621;
+public final static short 	EC_TAG_CLIENT_OLD_REMOTE_QUEUE_RANK       = 0x0622;
+public final static short 	EC_TAG_CLIENT_KAD_PORT                    = 0x0623;
+public final static short 	EC_TAG_CLIENT_PART_STATUS                 = 0x0624;
+public final static short 	EC_TAG_CLIENT_NEXT_REQUESTED_PART         = 0x0625;
+public final static short 	EC_TAG_CLIENT_LAST_DOWNLOADING_PART       = 0x0626;
+public final static short 	EC_TAG_CLIENT_REMOTE_FILENAME             = 0x0627;
+public final static short 	EC_TAG_CLIENT_MOD_VERSION                 = 0x0628;
+public final static short 	EC_TAG_CLIENT_OS_INFO                     = 0x0629;
+public final static short 	EC_TAG_CLIENT_AVAILABLE_PARTS             = 0x062A;
+public final static short 	EC_TAG_CLIENT_UPLOAD_PART_STATUS          = 0x062B;
 public final static short EC_TAG_SEARCHFILE                         = 0x0700;
 public final static short 	EC_TAG_SEARCH_TYPE                        = 0x0701;
 public final static short 	EC_TAG_SEARCH_NAME                        = 0x0702;
@@ -216,6 +281,17 @@
 public final static short 	EC_TAG_SEARCH_EXTENSION                   = 0x0706;
 public final static short 	EC_TAG_SEARCH_AVAILABILITY                = 0x0707;
 public final static short 	EC_TAG_SEARCH_STATUS                      = 0x0708;
+public final static short 	EC_TAG_SEARCH_PARENT                      = 0x0709;
+public final static short EC_TAG_FRIEND                             = 0x0800;
+public final static short 	EC_TAG_FRIEND_NAME                        = 0x0801;
+public final static short 	EC_TAG_FRIEND_HASH                        = 0x0802;
+public final static short 	EC_TAG_FRIEND_IP                          = 0x0803;
+public final static short 	EC_TAG_FRIEND_PORT                        = 0x0804;
+public final static short 	EC_TAG_FRIEND_CLIENT                      = 0x0805;
+public final static short 	EC_TAG_FRIEND_ADD                         = 0x0806;
+public final static short 	EC_TAG_FRIEND_REMOVE                      = 0x0807;
+public final static short 	EC_TAG_FRIEND_FRIENDSLOT                  = 0x0808;
+public final static short 	EC_TAG_FRIEND_SHARED                      = 0x0809;
 public final static short EC_TAG_SELECT_PREFS                       = 0x1000;
 public final static short 	EC_TAG_PREFS_CATEGORIES                   = 0x1100;
 public final static short 		EC_TAG_CATEGORY                           = 0x1101;
@@ -228,20 +304,21 @@
 public final static short 		EC_TAG_USER_NICK                          = 0x1201;
 public final static short 		EC_TAG_USER_HASH                          = 0x1202;
 public final static short 		EC_TAG_USER_HOST                          = 0x1203;
+public final static short 		EC_TAG_GENERAL_CHECK_NEW_VERSION          = 0x1204;
 public final static short 	EC_TAG_PREFS_CONNECTIONS                  = 0x1300;
 public final static short 		EC_TAG_CONN_DL_CAP                        = 0x1301;
-public final static short 		EC_TAG_CONN_UL_CAP	                  = 0x1302;
-public final static short 		EC_TAG_CONN_MAX_DL	                  = 0x1303;
-public final static short 		EC_TAG_CONN_MAX_UL	                  = 0x1304;
+public final static short 		EC_TAG_CONN_UL_CAP                        = 0x1302;
+public final static short 		EC_TAG_CONN_MAX_DL                        = 0x1303;
+public final static short 		EC_TAG_CONN_MAX_UL                        = 0x1304;
 public final static short 		EC_TAG_CONN_SLOT_ALLOCATION               = 0x1305;
 public final static short 		EC_TAG_CONN_TCP_PORT                      = 0x1306;
 public final static short 		EC_TAG_CONN_UDP_PORT	                  = 0x1307;
 public final static short 		EC_TAG_CONN_UDP_DISABLE                   = 0x1308;
 public final static short 		EC_TAG_CONN_MAX_FILE_SOURCES              = 0x1309;
-public final static short 		EC_TAG_CONN_MAX_CONN	                  = 0x130A;
+public final static short 		EC_TAG_CONN_MAX_CONN                      = 0x130A;
 public final static short 		EC_TAG_CONN_AUTOCONNECT                   = 0x130B;
-public final static short 		EC_TAG_CONN_RECONNECT	                  = 0x130C;
-public final static short 		EC_TAG_NETWORK_ED2K		          = 0x130D;
+public final static short 		EC_TAG_CONN_RECONNECT                     = 0x130C;
+public final static short 		EC_TAG_NETWORK_ED2K                       = 0x130D;
 public final static short 		EC_TAG_NETWORK_KADEMLIA                   = 0x130E;
 public final static short 	EC_TAG_PREFS_MESSAGEFILTER                = 0x1400;
 public final static short 		EC_TAG_MSGFILTER_ENABLED                  = 0x1401;
@@ -286,7 +363,7 @@
 public final static short 		EC_TAG_FILES_EXTRACT_METADATA             = 0x180B;
 public final static short 		EC_TAG_FILES_ALLOC_FULL_SIZE              = 0x180C;
 public final static short 		EC_TAG_FILES_CHECK_FREE_SPACE             = 0x180D;
-public final static short 		EC_TAG_FILES_MIN_FREE_SPACE	          = 0x180E;
+public final static short 		EC_TAG_FILES_MIN_FREE_SPACE               = 0x180E;
 public final static short 	EC_TAG_PREFS_SRCDROP                      = 0x1900;
 public final static short 		EC_TAG_SRCDROP_NONEEDED                   = 0x1901;
 public final static short 		EC_TAG_SRCDROP_DROP_FQS                   = 0x1902;
@@ -294,6 +371,10 @@
 public final static short 		EC_TAG_SRCDROP_HQRS_VALUE                 = 0x1904;
 public final static short 		EC_TAG_SRCDROP_AUTODROP_TIMER             = 0x1905;
 public final static short 	EC_TAG_PREFS_DIRECTORIES                  = 0x1A00;
+public final static short 		EC_TAG_DIRECTORIES_INCOMING               = 0x1A01;
+public final static short 		EC_TAG_DIRECTORIES_TEMP                   = 0x1A02;
+public final static short 		EC_TAG_DIRECTORIES_SHARED                 = 0x1A03;
+public final static short 		EC_TAG_DIRECTORIES_SHARE_HIDDEN           = 0x1A04;
 public final static short 	EC_TAG_PREFS_STATISTICS                   = 0x1B00;
 public final static short 		EC_TAG_STATSGRAPH_WIDTH                   = 0x1B01;
 public final static short 		EC_TAG_STATSGRAPH_SCALE                   = 0x1B02;

aMule-2.2.6.tar.bz2/src/libs/ec/java/ECTagTypes.java -> aMule-2.3.1.tar.bz2/src/libs/ec/java/ECTagTypes.java Changed

aMule-2.2.6.tar.bz2/src/muuli.wdr -> aMule-2.3.1.tar.bz2/src/muuli.wdr Changed

aMule-2.2.6.tar.bz2/src/muuli_wdr.cpp -> aMule-2.3.1.tar.bz2/src/muuli_wdr.cpp Changed

@@ -35,6 +35,7 @@
 // Custom source
 #include "ServerListCtrl.h"
 #include "DownloadListCtrl.h"
+#include "SourceListCtrl.h"
 #include "SharedFilesCtrl.h"
 #include "OScopeCtrl.h"
 #include "ColorFrameCtrl.h"
@@ -43,8 +44,8 @@
 #include "MuleGifCtrl.h"
 #include "ChatSelector.h"
 #include "DirectoryTreeCtrl.h"	// Needed for CDirectoryTreeCtrl
-#include "ClientListCtrl.h"
 #include "KadDlg.h"
+#include "SharedFilePeersListCtrl.h"
 
 // Make source compatible to wx 2.8 without 2.6 backward compatibility
 #ifndef wxGA_PROGRESSBAR
@@ -67,7 +68,8 @@
 
     item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxBoxSizer *item2 = new wxBoxSizer( wxHORIZONTAL );
+    wxFlexGridSizer *item2 = new wxFlexGridSizer( 3, 0, 0 );
+    item2->AddGrowableCol( 1 );
     s_fed2klh = item2;
 
     wxStaticText *item3 = new wxStaticText( parent, -1, _("eD2k Link: "), wxDefaultPosition, wxDefaultSize, 0 );
@@ -75,7 +77,7 @@
 
     CMuleTextCtrl *item4 = new CMuleTextCtrl( parent, -1, wxT(""), wxDefaultPosition, wxSize(-1,20), wxTE_MULTILINE );
     item4->SetName( wxT("FastEd2kLinks") );
-    item2->Add( item4, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+    item2->Add( item4, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 0 );
 
     wxButton *item5 = new wxButton( parent, ID_BUTTON_FAST, _("Commit"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->SetToolTip( _("Click here to add the eD2k link in the text control to your download queue.") );
@@ -85,12 +87,11 @@
 
     wxBoxSizer *item6 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticBitmap *item7 = new wxStaticBitmap( parent, ID_STATICBITMAP, amuleDlgImages( 31 ), wxDefaultPosition, wxDefaultSize );
+    wxStaticBitmap *item7 = new wxStaticBitmap( parent, -1, amuleDlgImages( 31 ), wxDefaultPosition, wxDefaultSize );
     item7->SetToolTip( _("Events are displayed here. For a complete list of events, refer to the log in the Servers-tab.") );
-    item6->Add( item7, 0, wxALIGN_CENTER|wxRIGHT|wxTOP|wxBOTTOM, 5 );
+    item6->Add( item7, 0, wxALIGN_CENTER, 5 );
 
     wxStaticText *item8 = new wxStaticText( parent, -1, _("Loading ..."), wxDefaultPosition, wxSize(140,-1), wxST_NO_AUTORESIZE );
-    item8->SetToolTip( _("Events are displayed here. For a complete list of events, refer to the log in the Servers-tab.") );
     item8->SetName( wxT("infoLabel") );
     item6->Add( item8, 1, wxFIXED_MINSIZE|wxALIGN_CENTER|wxLEFT, 5 );
 
@@ -417,27 +418,24 @@
 
     wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticBitmap *item2 = new wxStaticBitmap( parent, -1, amuleDlgImages( 10 ), wxDefaultPosition, wxDefaultSize );
-    item1->Add( item2, 0, wxALIGN_CENTER|wxLEFT, 5 );
+    wxBitmapButton *item2 = new wxBitmapButton( parent, ID_BTNCLRCOMPL, amuleDlgImages( 17 ), wxDefaultPosition, wxSize(30,30) );
+    item2->SetToolTip( _("Clears completed downloads") );
+    item2->Enable( false );
+    item1->Add( item2, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
 
     wxStaticText *item3 = new wxStaticText( parent, -1, _("Downloads"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->SetName( wxT("downloadsLabel") );
     item1->Add( item3, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
 
-    wxBitmapButton *item4 = new wxBitmapButton( parent, ID_BTNCLRCOMPL, amuleDlgImages( 17 ), wxDefaultPosition, wxSize(30,30) );
-    item4->SetToolTip( _("Clears completed downloads") );
-    item4->Enable( false );
-    item1->Add( item4, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
-
-    CMuleNotebook *item5 = new CMuleNotebook( parent, ID_CATEGORIES, wxDefaultPosition, wxSize(15,30), 0 );
-    wxASSERT( item5 );
-    item1->Add( item5, 1, wxFIXED_MINSIZE|wxALIGN_CENTER, 5 );
+    CMuleNotebook *item4 = new CMuleNotebook( parent, ID_CATEGORIES, wxDefaultPosition, wxSize(15,MULE_NOTEBOOK_TAB_HEIGHT), 0 );
+    wxASSERT( item4 );
+    item1->Add( item4, 1, wxFIXED_MINSIZE|wxALIGN_CENTER, 5 );
 
     item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    CDownloadListCtrl *item6 = new CDownloadListCtrl( parent, ID_DLOADLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
-    item6->SetName( wxT("downloadList") );
-    item0->Add( item6, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    CDownloadListCtrl *item5 = new CDownloadListCtrl( parent, ID_DLOADLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
+    item5->SetName( wxT("downloadList") );
+    item0->Add( item5, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     if (set_sizer)
     {
@@ -452,35 +450,32 @@
 wxSizer *s_clientlistHeader;
 wxSizer *transferBottomPane( wxWindow *parent, bool call_fit, bool set_sizer )
 {
-    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+    wxFlexGridSizer *item0 = new wxFlexGridSizer( 2, 0, 0, 0 );
+    item0->AddGrowableCol( 0 );
+    item0->AddGrowableRow( 1 );
 
-    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
+    wxFlexGridSizer *item1 = new wxFlexGridSizer( 3, 0, 1 );
+    item1->AddGrowableCol( 1 );
     s_clientlistHeader = item1;
 
     wxBitmapButton *item2 = new wxBitmapButton( parent, ID_CLIENTTOGGLE, amuleDlgImages( 10 ), wxDefaultPosition, wxDefaultSize );
-    item1->Add( item2, 0, wxALIGN_CENTER|wxALL, 5 );
+    item1->Add( item2, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxBitmapButton *item3 = new wxBitmapButton( parent, ID_BTNSWITCHUP, amuleDlgImages( 19 ), wxDefaultPosition, wxDefaultSize );
-    item3->SetToolTip( _("Shows Upload / Up-queue") );
-    item1->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
-
-    wxStaticText *item4 = new wxStaticText( parent, -1, _("Uploads"), wxDefaultPosition, wxDefaultSize, 0 );
-    item4->SetName( wxT("uploadTitle") );
-    item1->Add( item4, 0, wxALIGN_CENTER|wxALL, 5 );
+    wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
 
-    item1->Add( 20, 20, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+    wxStaticText *item4 = new wxStaticText( parent, -1, _("File sources:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->Add( item4, 0, wxALIGN_CENTER, 5 );
 
-    wxStaticText *item5 = new wxStaticText( parent, -1, _("Clients on queue :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item5, 0, wxALIGN_CENTER, 5 );
+    wxStaticText *item5 = new wxStaticText( parent, ID_CLIENTCOUNT, wxT("0"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
+    item5->SetForegroundColour( *wxBLUE );
+    item3->Add( item5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
 
-    wxStaticText *item6 = new wxStaticText( parent, ID_CLIENTCOUNT, wxT("0"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
-    item6->SetForegroundColour( *wxBLUE );
-    item1->Add( item6, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
+    item1->Add( item3, 0, wxALIGN_CENTER, 5 );
 
     item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    CClientListCtrl *item7 = new CClientListCtrl( parent, ID_CLIENTLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
-    item0->Add( item7, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    CSourceListCtrl *item6 = new CSourceListCtrl( parent, ID_CLIENTLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
+    item0->Add( item6, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     if (set_sizer)
     {
@@ -494,62 +489,17 @@
 
 wxSizer *messagePage( wxWindow *parent, bool call_fit, bool set_sizer )
 {
-    wxBoxSizer *item0 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticBox *item2 = new wxStaticBox( parent, -1, wxT("") );
-    wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
-
-    wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticBitmap *item4 = new wxStaticBitmap( parent, -1, amuleDlgImages( 14 ), wxDefaultPosition, wxDefaultSize );
-    item3->Add( item4, 0, wxALIGN_CENTER, 5 );
-
-    wxStaticText *item5 = new wxStaticText( parent, -1, _("Friends"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->Add( item5, 0, wxALIGN_CENTER|wxLEFT|wxTOP|wxBOTTOM, 5 );
-
-    item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
-
-    CFriendListCtrl *item6 = new CFriendListCtrl( parent, ID_FRIENDLIST, wxDefaultPosition, wxSize(160,120), wxLC_REPORT|wxSUNKEN_BORDER );
-    item1->Add( item6, 1, wxFIXED_MINSIZE|wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM, 5 );
-
-    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
-
-    wxStaticBox *item8 = new wxStaticBox( parent, -1, wxT("") );
-    wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxVERTICAL );
-
-    wxBoxSizer *item9 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticBitmap *item10 = new wxStaticBitmap( parent, -1, amuleDlgImages( 15 ), wxDefaultPosition, wxDefaultSize );
-    item9->Add( item10, 0, wxALIGN_CENTER, 5 );
-
-    wxStaticText *item11 = new wxStaticText( parent, -1, _("Messages"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item11, 0, wxALIGN_CENTER|wxALL, 5 );
-
-    item7->Add( item9, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
-
-    CChatSelector *item12 = new CChatSelector(parent, IDC_CHATSELECTOR,wxDefaultPosition,wxSize(200,32),0L);
-    wxASSERT( item12 );
-    item7->Add( item12, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 0 );
-
-    wxBoxSizer *item13 = new wxBoxSizer( wxHORIZONTAL );
-
-    CMuleTextCtrl *item14 = new CMuleTextCtrl( parent, IDC_CMESSAGE, wxT(""), wxDefaultPosition, wxSize(80,-1), wxTE_PROCESS_ENTER );
-    item14->Enable( false );
-    item13->Add( item14, 1, wxALIGN_CENTER, 5 );
-
-    wxButton *item15 = new wxButton( parent, IDC_CSEND, _("Send"), wxDefaultPosition, wxDefaultSize, 0 );
-    item15->SetToolTip( _("Sends the specified message.") );
-    item15->Enable( false );
-    item13->Add( item15, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
-
-    wxButton *item16 = new wxButton( parent, IDC_CCLOSE, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
-    item16->SetToolTip( _("Close this chat-session.") );
-    item16->Enable( false );
-    item13->Add( item16, 0, wxALIGN_CENTER, 5 );
-
-    item7->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+    wxStaticBox *item1 = new wxStaticBox( parent, -1, wxT("") );
+    wxStaticBoxSizer *item0 = new wxStaticBoxSizer( item1, wxVERTICAL );
 
-    item0->Add( item7, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
+    wxSplitterWindow *item2 = new wxSplitterWindow( parent, ID_MESSAGESPLATTER, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE );
+    item2->SetMinimumPaneSize( 20 );
+    wxPanel *item3 = new wxPanel( item2, -1 );
+    messagePageFriends( item3, FALSE, TRUE );
+    wxPanel *item4 = new wxPanel( item2, -1 );
+    messagePageMessages( item4, FALSE, TRUE );
+    item2->SplitVertically( item3, item4 );
+    item0->Add( item2, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     if (set_sizer)
     {
@@ -565,7 +515,7 @@
 {
     wxFlexGridSizer *item0 = new wxFlexGridSizer( 1, 0, 0 );
     item0->AddGrowableCol( 0 );
-    item0->AddGrowableRow( 4 );
+    item0->AddGrowableRow( 3 );
 
     wxStaticBox *item2 = new wxStaticBox( parent, -1, _("General") );
     wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
@@ -573,7 +523,7 @@
     wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
 
     wxStaticText *item4 = new wxStaticText( parent, -1, _("Full Name :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    item3->Add( item4, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
     wxStaticText *item5 = new wxStaticText( parent, IDC_FNAME, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->SetForegroundColour( *wxBLUE );
@@ -584,7 +534,7 @@
     wxBoxSizer *item6 = new wxBoxSizer( wxHORIZONTAL );
 
     wxStaticText *item7 = new wxStaticText( parent, -1, _("met-File :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item6->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    item6->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     wxStaticText *item8 = new wxStaticText( parent, IDC_METFILE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item8->SetForegroundColour( *wxBLUE );
@@ -595,7 +545,7 @@
     wxBoxSizer *item9 = new wxBoxSizer( wxHORIZONTAL );
 
     wxStaticText *item10 = new wxStaticText( parent, -1, _("Hash :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item10, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    item9->Add( item10, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     wxStaticText *item11 = new wxStaticText( parent, IDC_FHASH, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item11->SetForegroundColour( *wxBLUE );
@@ -610,7 +560,7 @@
     wxBoxSizer *item13 = new wxBoxSizer( wxHORIZONTAL );
 
     wxStaticText *item14 = new wxStaticText( parent, -1, _("Filesize :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item13->Add( item14, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    item13->Add( item14, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     wxStaticText *item15 = new wxStaticText( parent, IDC_FSIZE, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item15->SetForegroundColour( *wxBLUE );
@@ -632,7 +582,7 @@
     wxBoxSizer *item19 = new wxBoxSizer( wxHORIZONTAL );
 
     wxStaticText *item20 = new wxStaticText( parent, -1, _("Last seen complete :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item19->Add( item20, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    item19->Add( item20, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     wxStaticText *item21 = new wxStaticText( parent, IDC_LASTSEENCOMPL, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item21->SetForegroundColour( *wxBLUE );
@@ -801,70 +751,60 @@
 
     item0->Add( item53, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
 
-    wxFlexGridSizer *item65 = new wxFlexGridSizer( 1, 0, 0, 0 );
-    item65->AddGrowableCol( 0 );
-    item65->AddGrowableCol( 2 );
+    wxStaticBox *item66 = new wxStaticBox( parent, -1, _("File Names") );
+    wxStaticBoxSizer *item65 = new wxStaticBoxSizer( item66, wxVERTICAL );
 
-    wxStaticLine *item66 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(20,-1), wxLI_HORIZONTAL );
-    item65->Add( item66, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    CFileDetailListCtrl *item67 = new CFileDetailListCtrl( parent, IDC_LISTCTRLFILENAMES, wxDefaultPosition, wxSize(-1,130), wxLC_REPORT|wxSUNKEN_BORDER );
+    wxASSERT( item67 );
+    item65->Add( item67, 1, wxFIXED_MINSIZE|wxGROW, 5 );
 
-    wxStaticText *item67 = new wxStaticText( parent, -1, _("File Names"), wxDefaultPosition, wxDefaultSize, 0 );
-    item65->Add( item67, 0, wxALIGN_CENTER|wxTOP|wxBOTTOM, 5 );
+    wxBoxSizer *item68 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticLine *item68 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(20,-1), wxLI_HORIZONTAL );
-    item65->Add( item68, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    wxButton *item69 = new wxButton( parent, IDC_TAKEOVER, _("Takeover"), wxDefaultPosition, wxDefaultSize, 0 );
+    item68->Add( item69, 0, wxALIGN_CENTER, 5 );
 
-    item0->Add( item65, 0, wxGROW, 5 );
+    item68->Add( 20, 20, 1, wxALIGN_CENTER|wxALL, 5 );
 
-    CFileDetailListCtrl *item69 = new CFileDetailListCtrl( parent, IDC_LISTCTRLFILENAMES, wxDefaultPosition, wxSize(-1,130), wxLC_REPORT|wxSUNKEN_BORDER );
-    wxASSERT( item69 );
-    item0->Add( item69, 1, wxFIXED_MINSIZE|wxGROW|wxALIGN_BOTTOM|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
+    wxButton *item70 = new wxButton( parent, IDC_CMTBT, _("Show all comments"), wxDefaultPosition, wxDefaultSize, 0 );
+    item68->Add( item70, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxBoxSizer *item70 = new wxBoxSizer( wxHORIZONTAL );
+    item68->Add( 20, 20, 1, wxALIGN_CENTER|wxALL, 5 );
 
-    wxButton *item71 = new wxButton( parent, IDC_TAKEOVER, _("Takeover"), wxDefaultPosition, wxDefaultSize, 0 );
-    item70->Add( item71, 0, wxALIGN_CENTER, 5 );
+    wxButton *item71 = new wxButton( parent, IDC_BUTTONSTRIP, _("Cleanup"), wxDefaultPosition, wxDefaultSize, 0 );
+    item68->Add( item71, 0, wxALIGN_CENTER, 5 );
 
-    item70->Add( 20, 20, 1, wxALIGN_CENTER|wxALL, 5 );
+    item65->Add( item68, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxButton *item72 = new wxButton( parent, IDC_CMTBT, _("Show all comments"), wxDefaultPosition, wxDefaultSize, 0 );
-    item70->Add( item72, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    CMuleTextCtrl *item72 = new CMuleTextCtrl( parent, IDC_FILENAME, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
+    item65->Add( item72, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    item70->Add( 20, 20, 1, wxALIGN_CENTER|wxALL, 5 );
+    item0->Add( item65, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
 
-    wxButton *item73 = new wxButton( parent, IDC_BUTTONSTRIP, _("Cleanup"), wxDefaultPosition, wxDefaultSize, 0 );
-    item70->Add( item73, 0, wxALIGN_CENTER, 5 );
+    wxBoxSizer *item73 = new wxBoxSizer( wxHORIZONTAL );
 
-    item0->Add( item70, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+    wxBitmapButton *item74 = new wxBitmapButton( parent, IDC_NEXTFILE, amuleDlgImages( 10 ), wxDefaultPosition, wxDefaultSize );
+    item73->Add( item74, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    CMuleTextCtrl *item74 = new CMuleTextCtrl( parent, IDC_FILENAME, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
-    item0->Add( item74, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxBitmapButton *item75 = new wxBitmapButton( parent, IDC_PREVFILE, amuleDlgImages( 11 ), wxDefaultPosition, wxDefaultSize );
+    item73->Add( item75, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    wxBoxSizer *item75 = new wxBoxSizer( wxVERTICAL );
+    item73->Add( 20, 20, 1, wxALIGN_CENTER|wxALL, 5 );
 
-    wxBoxSizer *item76 = new wxBoxSizer( wxHORIZONTAL );
+    wxButton *item76 = new wxButton( parent, IDC_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 );
+    item73->Add( item76, 0, wxALIGN_CENTER, 5 );
 
-    item76->Add( 20, 20, 1, wxALIGN_CENTER|wxALL, 5 );
+    item73->Add( 20, 20, 1, wxALIGN_CENTER|wxALL, 5 );
 
-    wxButton *item77 = new wxButton( parent, IDC_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 );
-    item76->Add( item77, 0, wxALIGN_CENTER, 5 );
+    wxButton *item77 = new wxButton( parent, IDC_APPLY_AND_CLOSE, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
+    item73->Add( item77, 0, wxALIGN_CENTER, 5 );
 
-    item76->Add( 20, 20, 1, wxALIGN_CENTER|wxALL, 5 );
+    item73->Add( 20, 20, 1, wxALIGN_CENTER|wxALL, 5 );
 
-    wxButton *item78 = new wxButton( parent, IDC_APPLY_AND_CLOSE, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
-    item76->Add( item78, 0, wxALIGN_CENTER, 5 );
+    wxButton *item78 = new wxButton( parent, ID_CLOSEWNDFD, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    item78->SetDefault();
+    item73->Add( item78, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    item76->Add( 20, 20, 1, wxALIGN_CENTER|wxALL, 5 );
-
-    wxButton *item79 = new wxButton( parent, ID_CLOSEWNDFD, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    item79->SetDefault();
-    item76->Add( item79, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    item76->Add( 20, 20, 1, wxALIGN_CENTER|wxALL, 5 );
-
-    item75->Add( item76, 0, wxALIGN_CENTER, 5 );
-
-    item0->Add( item75, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
+    item0->Add( item73, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     if (set_sizer)
     {
@@ -886,6 +826,7 @@
     wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
 
     CMuleTextCtrl *item4 = new CMuleTextCtrl( parent, IDC_CMT_TEXT, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
+    item4->SetToolTip( _("For a film you can say its length, its story, language ...\\n\\nand if it's a fake, you can tell that to other users of aMule.") );
     item3->Add( item4, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
     wxButton *item5 = new wxButton( parent, IDC_FC_CLEAR, _("Clear"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -893,19 +834,14 @@
 
     item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxStaticText *item6 = new wxStaticText( parent, -1, 
-        _("For a film you can say its length, its story, language ...\nand if it's a fake, you can tell that to other users of aMule."),
-        wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item6, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
     item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 5 );
 
-    wxBoxSizer *item7 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer *item6 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticBox *item9 = new wxStaticBox( parent, -1, _("File Quality") );
-    wxStaticBoxSizer *item8 = new wxStaticBoxSizer( item9, wxVERTICAL );
+    wxStaticBox *item8 = new wxStaticBox( parent, -1, _("File Quality") );
+    wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxVERTICAL );
 
-    wxString strs10[] = 
+    wxString strs9[] = 
     {
         _("Not rated"), 
         _("Invalid / Corrupt / Fake"), 
@@ -914,22 +850,20 @@
         _("Good"), 
         _("Excellent")
     };
-    wxChoice *item10 = new wxChoice( parent, IDC_RATELIST, wxDefaultPosition, wxDefaultSize, 6, strs10, 0 );
-    item8->Add( item10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    wxStaticText *item11 = new wxStaticText( parent, -1, _("Choose the file rating or advice users if the file is invalid ..."), wxDefaultPosition, wxDefaultSize, 0 );
-    item8->Add( item11, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+    wxChoice *item9 = new wxChoice( parent, IDC_RATELIST, wxDefaultPosition, wxDefaultSize, 6, strs9, 0 );
+    item9->SetToolTip( _("Choose the file rating or advice users if the file is invalid ...") );
+    item7->Add( item9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    item7->Add( item8, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 0 );
+    item6->Add( item7, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 0 );
 
-    wxButton *item12 = new wxButton( parent, IDCOK, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 );
-    item12->SetDefault();
-    item7->Add( item12, 0, wxALIGN_CENTER|wxALL, 5 );
+    wxButton *item10 = new wxButton( parent, IDCOK, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 );
+    item10->SetDefault();
+    item6->Add( item10, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    wxButton *item13 = new wxButton( parent, IDCCANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
-    item7->Add( item13, 0, wxALIGN_CENTER|wxALL, 5 );
+    wxButton *item11 = new wxButton( parent, IDCCANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
+    item6->Add( item11, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    item0->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+    item0->Add( item6, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
 
     if (set_sizer)
     {
@@ -1083,111 +1017,17 @@
 
 wxSizer *sharedfilesDlg( wxWindow *parent, bool call_fit, bool set_sizer )
 {
-    wxStaticBox *item1 = new wxStaticBox( parent, -1, wxT("") );
-    wxStaticBoxSizer *item0 = new wxStaticBoxSizer( item1, wxVERTICAL );
-
-    wxBoxSizer *item2 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticBitmap *item3 = new wxStaticBitmap( parent, -1, moreImages( 0 ), wxDefaultPosition, wxDefaultSize );
-    item2->Add( item3, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxLEFT|wxTOP|wxBOTTOM, 5 );
-
-    wxStaticText *item4 = new wxStaticText( parent, -1, _("Shared Files"), wxDefaultPosition, wxDefaultSize, 0 );
-    item4->SetName( wxT("sharedFilesLabel") );
-    item2->Add( item4, 0, wxALIGN_CENTER|wxLEFT, 5 );
-
-    wxBitmapButton *item5 = new wxBitmapButton( parent, ID_BTNRELSHARED, amuleDlgImages( 18 ), wxDefaultPosition, wxSize(32,32) );
-    item5->SetToolTip( _("Reload your shared files") );
-    item2->Add( item5, 0, wxALIGN_CENTER|wxLEFT, 5 );
-
-    item0->Add( item2, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
-
-    CSharedFilesCtrl *item6 = new CSharedFilesCtrl( parent, ID_SHFILELIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
-    item6->SetName( wxT("sharedFilesCt") );
-    item0->Add( item6, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxStaticBox *item8 = new wxStaticBox( parent, -1, _("Statistics") );
-    wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxVERTICAL );
-
-    wxFlexGridSizer *item9 = new wxFlexGridSizer( 6, 0, 0 );
-
-    wxStaticBitmap *item10 = new wxStaticBitmap( parent, -1, moreImages( 1 ), wxDefaultPosition, wxDefaultSize );
-    item9->Add( item10, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
-
-    wxStaticText *item11 = new wxStaticText( parent, -1, _("Current Session"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item11, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
-
-    item9->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
-
-    item9->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
-
-    wxStaticText *item12 = new wxStaticText( parent, -1, _("Total"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
-
-    item9->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
-
-    item9->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
-
-    wxStaticText *item13 = new wxStaticText( parent, -1, _("Requested :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item13, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    wxStaticText *item14 = new wxStaticText( parent, IDC_SREQUESTED, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item14->SetForegroundColour( *wxBLUE );
-    item9->Add( item14, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    wxGauge *item15 = new wxGauge( parent, -1, 100, wxDefaultPosition, wxSize(200,-1), 0 );
-    item15->SetName( wxT("popbar") );
-    item9->Add( item15, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
-
-    wxStaticText *item16 = new wxStaticText( parent, -1, _("Requested :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item16, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    wxStaticText *item17 = new wxStaticText( parent, IDC_SREQUESTED2, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item17->SetForegroundColour( *wxBLUE );
-    item9->Add( item17, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    item9->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
-
-    wxStaticText *item18 = new wxStaticText( parent, -1, _("Active Uploads :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item18, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    wxStaticText *item19 = new wxStaticText( parent, IDC_SACCEPTED, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item19->SetForegroundColour( *wxBLUE );
-    item9->Add( item19, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    wxGauge *item20 = new wxGauge( parent, -1, 100, wxDefaultPosition, wxSize(200,-1), 0 );
-    item20->SetName( wxT("popbarAccept") );
-    item9->Add( item20, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 5 );
-
-    wxStaticText *item21 = new wxStaticText( parent, -1, _("Active Uploads :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item21, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    wxStaticText *item22 = new wxStaticText( parent, IDC_SACCEPTED2, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item22->SetForegroundColour( *wxBLUE );
-    item9->Add( item22, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    item9->Add( 20, 20, 0, wxALIGN_CENTER, 5 );
-
-    wxStaticText *item23 = new wxStaticText( parent, -1, _("Transferred :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item23, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    wxStaticText *item24 = new wxStaticText( parent, IDC_STRANSFERRED, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item24->SetForegroundColour( *wxBLUE );
-    item9->Add( item24, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    wxGauge *item25 = new wxGauge( parent, -1, 100, wxDefaultPosition, wxSize(200,-1), 0 );
-    item25->SetName( wxT("popbarTrans") );
-    item9->Add( item25, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 5 );
-
-    wxStaticText *item26 = new wxStaticText( parent, -1, _("Transferred :"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item26, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    wxStaticText *item27 = new wxStaticText( parent, IDC_STRANSFERRED2, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
-    item27->SetForegroundColour( *wxBLUE );
-    item9->Add( item27, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
-
-    item7->Add( item9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    item0->Add( item7, 0, wxALIGN_CENTER|wxTOP, 5 );
+    wxSplitterWindow *item1 = new wxSplitterWindow( parent, ID_SHARESSPLATTER, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE );
+    item1->SetMinimumPaneSize( 20 );
+    wxPanel *item2 = new wxPanel( item1, -1 );
+    sharedfilesTopDlg( item2, FALSE, TRUE );
+    wxPanel *item3 = new wxPanel( item1, -1 );
+    sharedfilesBottomDlg( item3, FALSE, TRUE );
+    item1->SplitHorizontally( item2, item3 );
+    item1->SetName( wxT("sharedsplitterWnd") );
+    item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     if (set_sizer)
     {
@@ -1567,10 +1407,10 @@
     item51->SetForegroundColour( *wxBLUE );
     item47->Add( item51, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxStaticText *item52 = new wxStaticText( parent, -1, _("Rating (total):"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item52 = new wxStaticText( parent, -1, _("Queue rank:"), wxDefaultPosition, wxDefaultSize, 0 );
     item47->Add( item52, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
 
-    wxStaticText *item53 = new wxStaticText( parent, ID_DRATING, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item53 = new wxStaticText( parent, ID_QUEUERANK, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
     item53->SetForegroundColour( *wxBLUE );
     item47->Add( item53, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
 
@@ -1605,127 +1445,107 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxGridSizer *item1 = new wxGridSizer( 2, 0, 0 );
-
-    wxStaticBox *item3 = new wxStaticBox( parent, -1, _("Nick") );
-    wxStaticBoxSizer *item2 = new wxStaticBoxSizer( item3, wxVERTICAL );
-
-    CMuleTextCtrl *item4 = new CMuleTextCtrl( parent, IDC_NICK, _("http://www.aMule.org - the Linux Mule"), wxDefaultPosition, wxSize(90,-1), 0 );
-    item4->SetToolTip( _("This is the name that other users will see when connecting to you.") );
-    item2->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Nick") );
+    wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
 
-    item1->Add( item2, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
+    CMuleTextCtrl *item3 = new CMuleTextCtrl( parent, IDC_NICK, _("http://www.aMule.org - the multi-platform Mule"), wxDefaultPosition, wxSize(90,-1), 0 );
+    item3->SetToolTip( _("This is the name that other users will see when connecting to you.") );
+    item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxStaticBox *item6 = new wxStaticBox( parent, -1, _("Language") );
-    wxStaticBoxSizer *item5 = new wxStaticBoxSizer( item6, wxVERTICAL );
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL, 0 );
 
-    wxString *strs7 = (wxString*) NULL;
-    wxChoice *item7 = new wxChoice( parent, IDC_LANGUAGE, wxDefaultPosition, wxSize(100,30), 0, strs7, 0 );
-    item7->SetToolTip( _("This specifies the language used on controls.") );
-    item5->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxFlexGridSizer *item4 = new wxFlexGridSizer( 2, 0, 0 );
+    item4->AddGrowableCol( 1 );
 
-    item1->Add( item5, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
+    wxStaticText *item5 = new wxStaticText( parent, -1, _("Language: "), wxDefaultPosition, wxDefaultSize, 0 );
+    item5->SetToolTip( _("The delay before showing tool-tips.") );
+    item4->Add( item5, 1, wxALIGN_CENTER, 0 );
+
+    wxString *strs6 = (wxString*) NULL;
+    wxChoice *item6 = new wxChoice( parent, IDC_LANGUAGE, wxDefaultPosition, wxDefaultSize, 0, strs6, 0 );
+    item6->SetToolTip( _("This specifies the language used on controls.") );
+    item4->Add( item6, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
+
+    item0->Add( item4, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL, 0 );
+
+    wxCheckBox *item7 = new wxCheckBox( parent, IDC_NEWVERSION, _("Check for new version at startup"), wxDefaultPosition, wxDefaultSize, 0 );
+    item7->SetToolTip( _("Enabling this will make aMule check for new version at startup") );
+    item0->Add( item7, 0, wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxCheckBox *item8 = new wxCheckBox( parent, IDC_STARTMIN, _("Start minimized"), wxDefaultPosition, wxDefaultSize, 0 );
+    item8->SetToolTip( _("Enabling this makes aMule minimize itself upon start.") );
+    item0->Add( item8, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxCheckBox *item9 = new wxCheckBox( parent, IDC_EXIT, _("Prompt on exit"), wxDefaultPosition, wxDefaultSize, 0 );
+    item9->SetValue( TRUE );
+    item9->SetToolTip( _("Makes aMule prompt before exiting.") );
+    item0->Add( item9, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxStaticBox *item9 = new wxStaticBox( parent, -1, _("Misc Options") );
-    wxStaticBoxSizer *item8 = new wxStaticBoxSizer( item9, wxVERTICAL );
+    wxCheckBox *item10 = new wxCheckBox( parent, IDC_MACHIDEONCLOSE, _("Hide application window when close button is pressed"), wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( item10, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item10 = new wxCheckBox( parent, IDC_NEWVERSION, _("Check for new version at startup"), wxDefaultPosition, wxDefaultSize, 0 );
-    item10->SetToolTip( _("Enabling this will make aMule check for new version at startup") );
-    item8->Add( item10, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxCheckBox *item11 = new wxCheckBox( parent, IDC_STARTMIN, _("Start minimized"), wxDefaultPosition, wxDefaultSize, 0 );
-    item11->SetToolTip( _("Enabling this makes aMule minimize itself upon start.") );
-    item8->Add( item11, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item11 = new wxCheckBox( parent, IDC_ENABLETRAYICON, _("Enable Tray Icon"), wxDefaultPosition, wxDefaultSize, 0 );
+    item11->SetToolTip( _("This Enables/Disables the system tray (or taskbar) icon.") );
+    item0->Add( item11, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxCheckBox *item12 = new wxCheckBox( parent, IDC_MINTRAY, _("Minimize to Tray Icon"), wxDefaultPosition, wxDefaultSize, 0 );
+    item12->SetToolTip( _("Enabling this will make aMule minimize to the System Tray, rather than the taskbar.") );
+    item0->Add( item12, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxCheckBox *item12 = new wxCheckBox( parent, IDC_EXIT, _("Prompt on exit"), wxDefaultPosition, wxDefaultSize, 0 );
-    item12->SetValue( TRUE );
-    item12->SetToolTip( _("Makes aMule promt before exiting.") );
-    item8->Add( item12, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxBoxSizer *item13 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxCheckBox *item13 = new wxCheckBox( parent, IDC_ENABLETRAYICON, _("Enable Tray Icon"), wxDefaultPosition, wxDefaultSize, 0 );
-    item13->SetToolTip( _("This Enables/Disables the system tray (or taskbar) icon.") );
-    item8->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
-
-    wxCheckBox *item14 = new wxCheckBox( parent, IDC_MINTRAY, _("Minimize to Tray Icon"), wxDefaultPosition, wxDefaultSize, 0 );
-    item14->SetToolTip( _("Enabling this will make aMule minimize to the System Tray, rather than the taskbar.") );
-    item8->Add( item14, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxStaticText *item14 = new wxStaticText( parent, -1, _("Tooltip delay time: "), wxDefaultPosition, wxDefaultSize, 0 );
+    item14->SetToolTip( _("The delay before showing tool-tips.") );
+    item13->Add( item14, 1, wxALIGN_CENTER, 0 );
 
-    wxBoxSizer *item15 = new wxBoxSizer( wxHORIZONTAL );
+    wxSpinCtrl *item15 = new wxSpinCtrl( parent, IDC_TOOLTIPDELAY, wxT("1"), wxDefaultPosition, wxSize(40,-1), 0, 0, 9, 1 );
+    item15->SetToolTip( _("The delay before showing tool-tips.") );
+    item13->Add( item15, 0, wxALIGN_CENTER|wxLEFT, 5 );
 
-    wxStaticText *item16 = new wxStaticText( parent, -1, _("Tooltip Delay Time in secs"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxStaticText *item16 = new wxStaticText( parent, -1, _("seconds"), wxDefaultPosition, wxDefaultSize, 0 );
     item16->SetToolTip( _("The delay before showing tool-tips.") );
-    item15->Add( item16, 1, wxALIGN_CENTER|wxLEFT, 5 );
-
-    wxSpinCtrl *item17 = new wxSpinCtrl( parent, IDC_TOOLTIPDELAY, wxT("1"), wxDefaultPosition, wxSize(40,-1), 0, 0, 30, 1 );
-    item17->SetToolTip( _("The delay before showing tool-tips.") );
-    item15->Add( item17, 0, wxALIGN_CENTER|wxRIGHT, 5 );
-
-    item8->Add( item15, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
-
-    item0->Add( item8, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    wxStaticBox *item19 = new wxStaticBox( parent, -1, _("Browser Selection") );
-    wxStaticBoxSizer *item18 = new wxStaticBoxSizer( item19, wxVERTICAL );
+    item13->Add( item16, 1, wxALIGN_CENTER|wxLEFT, 5 );
 
-    wxString strs20[] = 
-    {
-        _("System Default"), 
-        _("Konqueror"), 
-        _("Mozilla"), 
-        _("Firefox"), 
-        _("Firebird"), 
-        _("Opera"), 
-        _("Netscape"), 
-        _("Galeon"), 
-        _("Epiphany"), 
-        _("User Defined")
-    };
-    wxChoice *item20 = new wxChoice( parent, IDC_BROWSER, wxDefaultPosition, wxSize(100,-1), 10, strs20, 0 );
-    item20->SetToolTip( _("Select your browser here") );
-    item18->Add( item20, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxFlexGridSizer *item21 = new wxFlexGridSizer( 3, 0, 0 );
-    item21->AddGrowableCol( 1 );
+    wxStaticBox *item18 = new wxStaticBox( parent, -1, _("Browser Selection") );
+    wxStaticBoxSizer *item17 = new wxStaticBoxSizer( item18, wxVERTICAL );
 
-    wxStaticText *item22 = new wxStaticText( parent, -1, _("Custom Browser:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item21->Add( item22, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxBoxSizer *item19 = new wxBoxSizer( wxHORIZONTAL );
 
-    CMuleTextCtrl *item23 = new CMuleTextCtrl( parent, IDC_BROWSERSELF, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
-    item23->SetToolTip( _("Enter your browser name here. To use the custom browser, select the Custom menu-item from the dropdown-menu above.") );
-    item23->Enable( false );
-    item21->Add( item23, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    CMuleTextCtrl *item20 = new CMuleTextCtrl( parent, IDC_BROWSERSELF, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
+    item20->SetToolTip( _("Enter your browser name here. Leave this field empty to use the system default browser.") );
+    item19->Add( item20, 1, wxGROW, 0 );
 
-    wxButton *item24 = new wxButton( parent, IDC_SELBROWSER, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    item21->Add( item24, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+    wxButton *item21 = new wxButton( parent, IDC_SELBROWSER, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    item19->Add( item21, 0, wxGROW, 0 );
 
-    item18->Add( item21, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    item17->Add( item19, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item25 = new wxCheckBox( parent, IDC_BROWSERTABS, _("Open in new tab if possible"), wxDefaultPosition, wxDefaultSize, 0 );
-    item25->SetValue( TRUE );
-    item25->SetToolTip( _("Open the web page in a new tab instead of in a new window when possible") );
-    item18->Add( item25, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item22 = new wxCheckBox( parent, IDC_BROWSERTABS, _("Open in new tab if possible"), wxDefaultPosition, wxDefaultSize, 0 );
+    item22->SetValue( TRUE );
+    item22->SetToolTip( _("Open the web page in a new tab instead of in a new window when possible") );
+    item17->Add( item22, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    item0->Add( item18, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item17, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxStaticBox *item27 = new wxStaticBox( parent, -1, _("Video Player") );
-    wxStaticBoxSizer *item26 = new wxStaticBoxSizer( item27, wxVERTICAL );
+    wxStaticBox *item24 = new wxStaticBox( parent, -1, _("Video Player") );
+    wxStaticBoxSizer *item23 = new wxStaticBoxSizer( item24, wxVERTICAL );
 
-    wxBoxSizer *item28 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer *item25 = new wxBoxSizer( wxHORIZONTAL );
 
-    CMuleTextCtrl *item29 = new CMuleTextCtrl( parent, IDC_VIDEOPLAYER, wxT("mplayer -idx"), wxDefaultPosition, wxSize(80,-1), 0 );
-    item28->Add( item29, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
+    CMuleTextCtrl *item26 = new CMuleTextCtrl( parent, IDC_VIDEOPLAYER, wxT("mplayer -idx"), wxDefaultPosition, wxSize(80,-1), 0 );
+    item25->Add( item26, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    wxButton *item30 = new wxButton( parent, IDC_BROWSEV, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    item28->Add( item30, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
+    wxButton *item27 = new wxButton( parent, IDC_BROWSEV, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    item25->Add( item27, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    item26->Add( item28, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    item23->Add( item25, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item31 = new wxCheckBox( parent, IDC_VIDEOBACKUP, _("Create Backup for preview"), wxDefaultPosition, wxDefaultSize, 0 );
-    item26->Add( item31, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxStaticText *item28 = new wxStaticText( parent, IDC_PREVIEW_NOTE, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
+    item23->Add( item28, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    item0->Add( item26, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item23, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
     if (set_sizer)
     {
@@ -1741,189 +1561,141 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxGridSizer *item1 = new wxGridSizer( 2, 0, 5 );
+    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Bandwidth limits") );
+    wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
 
-    wxStaticBox *item3 = new wxStaticBox( parent, -1, _("Bandwith limits") );
-    wxStaticBoxSizer *item2 = new wxStaticBoxSizer( item3, wxVERTICAL );
+    wxFlexGridSizer *item3 = new wxFlexGridSizer( 3, 0, 0 );
+    item3->AddGrowableCol( 0 );
 
     wxStaticText *item4 = new wxStaticText( parent, -1, _("Download"), wxDefaultPosition, wxDefaultSize, 0 );
-    item2->Add( item4, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer *item5 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxSpinCtrl *item6 = new wxSpinCtrl( parent, IDC_MAXDOWN, wxT("0"), wxDefaultPosition, wxSize(100,-1), 0, 0, 19375, 0 );
-    item5->Add( item6, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxStaticText *item7 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
-    item5->Add( item7, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    item2->Add( item5, 0, wxALIGN_CENTER, 5 );
-
-    wxStaticText *item8 = new wxStaticText( parent, -1, _("Upload"), wxDefaultPosition, wxDefaultSize, 0 );
-    item2->Add( item8, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer *item9 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxSpinCtrl *item10 = new wxSpinCtrl( parent, IDC_MAXUP, wxT("10"), wxDefaultPosition, wxSize(100,-1), 0, 0, 19375, 10 );
-    item9->Add( item10, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxStaticText *item11 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item11, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    item2->Add( item9, 0, wxALIGN_CENTER, 5 );
-
-    wxStaticText *item12 = new wxStaticText( parent, -1, _("Slot Allocation"), wxDefaultPosition, wxDefaultSize, 0 );
-    item2->Add( item12, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer *item13 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxSpinCtrl *item14 = new wxSpinCtrl( parent, IDC_SLOTALLOC, wxT("4"), wxDefaultPosition, wxSize(100,-1), 0, 1, 100, 4 );
-    item13->Add( item14, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxStaticText *item15 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
-    item13->Add( item15, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    item3->Add( item4, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    item2->Add( item13, 0, wxALIGN_CENTER, 5 );
+    wxSpinCtrl *item5 = new wxSpinCtrl( parent, IDC_MAXDOWN, wxT("0"), wxDefaultPosition, wxSize(100,-1), 0, 0, 19375, 0 );
+    item3->Add( item5, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    item1->Add( item2, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 0 );
+    wxStaticText *item6 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->Add( item6, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxBoxSizer *item16 = new wxBoxSizer( wxVERTICAL );
+    wxStaticText *item7 = new wxStaticText( parent, -1, _("Upload"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->Add( item7, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxStaticBox *item18 = new wxStaticBox( parent, -1, _("Standard client TCP Port:") );
-    wxStaticBoxSizer *item17 = new wxStaticBoxSizer( item18, wxVERTICAL );
-
-    wxSpinCtrl *item19 = new wxSpinCtrl( parent, IDC_PORT, wxT("4662"), wxDefaultPosition, wxSize(100,-1), 0, 0, 65531, 4662 );
-    item19->SetToolTip( _("This is the standard eD2k port and cannot be disabled.") );
-    item17->Add( item19, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    item16->Add( item17, 1, wxGROW, 5 );
-
-    wxStaticBox *item21 = new wxStaticBox( parent, -1, _("Extended client UDP Port:") );
-    wxStaticBoxSizer *item20 = new wxStaticBoxSizer( item21, wxHORIZONTAL );
-
-    wxSpinCtrl *item22 = new wxSpinCtrl( parent, IDC_UDPPORT, wxT("4672"), wxDefaultPosition, wxSize(100,-1), 0, 0, 65535, 4672 );
-    item22->SetToolTip( _("This UDP port is used for extended ed2k requests and Kad network") );
-    item20->Add( item22, 0, wxALIGN_CENTER, 5 );
+    wxSpinCtrl *item8 = new wxSpinCtrl( parent, IDC_MAXUP, wxT("10"), wxDefaultPosition, wxSize(100,-1), 0, 0, 19375, 10 );
+    item3->Add( item8, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item23 = new wxCheckBox( parent, IDC_UDPDISABLE, _("disable"), wxDefaultPosition, wxDefaultSize, 0 );
-    item20->Add( item23, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+    wxStaticText *item9 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->Add( item9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    item16->Add( item20, 1, wxGROW, 5 );
+    wxStaticText *item10 = new wxStaticText( parent, -1, _("Slot Allocation"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->Add( item10, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 
-    item1->Add( item16, 0, wxGROW|wxLEFT|wxRIGHT, 5 );
+    wxSpinCtrl *item11 = new wxSpinCtrl( parent, IDC_SLOTALLOC, wxT("4"), wxDefaultPosition, wxSize(100,-1), 0, 1, 100, 4 );
+    item3->Add( item11, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    item0->Add( item1, 0, wxGROW|wxALL, 5 );
+    wxStaticText *item12 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxStaticBox *item25 = new wxStaticBox( parent, -1, _("Bind Address") );
-    wxStaticBoxSizer *item24 = new wxStaticBoxSizer( item25, wxVERTICAL );
+    item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxTextCtrl *item26 = new wxTextCtrl( parent, IDC_ADDRESS, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
-    item24->Add( item26, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL, 0 );
 
-    item0->Add( item24, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
+    wxStaticBox *item14 = new wxStaticBox( parent, -1, _("Ports") );
+    wxStaticBoxSizer *item13 = new wxStaticBoxSizer( item14, wxVERTICAL );
 
-    wxStaticBox *item28 = new wxStaticBox( parent, -1, wxT("") );
-    wxStaticBoxSizer *item27 = new wxStaticBoxSizer( item28, wxVERTICAL );
+    wxFlexGridSizer *item15 = new wxFlexGridSizer( 2, 0, 0 );
+    item15->AddGrowableCol( 0 );
 
-    wxStaticText *item29 = new wxStaticText( parent, ID_TEXT_CLIENT_UDP_PORT, _("UDP port for extended server requests (TCP+3): 4665"), wxDefaultPosition, wxDefaultSize, 0 );
-    item27->Add( item29, 0, wxALIGN_CENTER, 5 );
+    wxStaticText *item16 = new wxStaticText( parent, -1, _("Standard TCP Port "), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Add( item16, 0, wxALIGN_CENTER_VERTICAL, 10 );
 
-    item0->Add( item27, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
+    wxSpinCtrl *item17 = new wxSpinCtrl( parent, IDC_PORT, wxT("4662"), wxDefaultPosition, wxSize(100,-1), 0, 0, 65531, 4662 );
+    item17->SetToolTip( _("This is the standard eD2k port and cannot be disabled.") );
+    item15->Add( item17, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxGridSizer *item30 = new wxGridSizer( 2, 0, 5 );
+    wxStaticText *item18 = new wxStaticText( parent, -1, _("UDP port for server requests (TCP+3):"), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Add( item18, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxStaticBox *item32 = new wxStaticBox( parent, -1, _("Max Sources per File") );
-    wxStaticBoxSizer *item31 = new wxStaticBoxSizer( item32, wxVERTICAL );
+    wxStaticText *item19 = new wxStaticText( parent, ID_TEXT_CLIENT_UDP_PORT, _("4665"), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Add( item19, 0, wxALIGN_CENTER_VERTICAL, 10 );
 
-    wxBoxSizer *item33 = new wxBoxSizer( wxVERTICAL );
+    wxCheckBox *item20 = new wxCheckBox( parent, IDC_UDPENABLE, _("Extended UDP port (Kad / global search) "), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Add( item20, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxStaticText *item34 = new wxStaticText( parent, -1, _("Hard limit"), wxDefaultPosition, wxDefaultSize, 0 );
-    item33->Add( item34, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxSpinCtrl *item21 = new wxSpinCtrl( parent, IDC_UDPPORT, wxT("4672"), wxDefaultPosition, wxSize(100,-1), 0, 0, 65535, 4672 );
+    item21->SetToolTip( _("This UDP port is used for extended eD2k requests and Kad network") );
+    item15->Add( item21, 0, wxALIGN_CENTER, 5 );
 
-    wxSpinCtrl *item35 = new wxSpinCtrl( parent, IDC_MAXSOURCEPERFILE, wxT("300"), wxDefaultPosition, wxSize(100,-1), 0, 40, 5000, 300 );
-    item33->Add( item35, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item22 = new wxCheckBox( parent, IDC_UPNP_ENABLED, _("Enable UPnP for router port forwarding"), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Add( item22, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    item31->Add( item33, 0, wxALIGN_CENTER, 0 );
+    item15->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    item30->Add( item31, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxStaticText *item23 = new wxStaticText( parent, IDC_UPNPTCPPORTTEXT, _("UPnP TCP Port (Optional):"), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Add( item23, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 
-    wxStaticBox *item37 = new wxStaticBox( parent, -1, _("Connection limits") );
-    wxStaticBoxSizer *item36 = new wxStaticBoxSizer( item37, wxVERTICAL );
+    wxSpinCtrl *item24 = new wxSpinCtrl( parent, IDC_UPNPTCPPORT, wxT("50000"), wxDefaultPosition, wxSize(100,-1), 0, 0, 65535, 50000 );
+    item15->Add( item24, 0, wxALIGN_CENTER, 5 );
 
-    wxBoxSizer *item38 = new wxBoxSizer( wxVERTICAL );
+    item13->Add( item15, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxStaticText *item39 = new wxStaticText( parent, -1, _("Max Connections"), wxDefaultPosition, wxDefaultSize, 0 );
-    item38->Add( item39, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxSpinCtrl *item40 = new wxSpinCtrl( parent, IDC_MAXCON, wxT("500"), wxDefaultPosition, wxSize(100,-1), 0, 5, 7500, 500 );
-    item38->Add( item40, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxFlexGridSizer *item25 = new wxFlexGridSizer( 2, 0, 0 );
+    item25->AddGrowableCol( 1 );
 
-    item36->Add( item38, 0, wxALIGN_CENTER, 5 );
+    wxStaticText *item26 = new wxStaticText( parent, -1, _("Bind local address to IP (empty for any):"), wxDefaultPosition, wxDefaultSize, 0 );
+    item25->Add( item26, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    item30->Add( item36, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxTextCtrl *item27 = new wxTextCtrl( parent, IDC_ADDRESS, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
+    item27->SetToolTip( _("Advanced users only: If you have multiple network interfaces, enter the address of the interface to which aMule should be bound.") );
+    item25->Add( item27, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL, 0 );
 
-    item0->Add( item30, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
+    item0->Add( item25, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 0 );
 
-    wxStaticBox *item42 = new wxStaticBox( parent, -1, _("Networks") );
-    wxStaticBoxSizer *item41 = new wxStaticBoxSizer( item42, wxVERTICAL );
+    wxFlexGridSizer *item28 = new wxFlexGridSizer( 2, 0, 0 );
+    item28->AddGrowableCol( 0 );
 
-    wxFlexGridSizer *item43 = new wxFlexGridSizer( 1, 0, 0, 0 );
-    item43->AddGrowableCol( 0 );
-    item43->AddGrowableCol( 1 );
-    item43->AddGrowableCol( 2 );
-    item43->AddGrowableCol( 3 );
-    item43->AddGrowableCol( 4 );
-    item43->AddGrowableCol( 5 );
-    item43->AddGrowableCol( 6 );
+    wxStaticText *item29 = new wxStaticText( parent, ID_TEXT, _("Max sources per downloading file:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item28->Add( item29, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxCheckBox *item44 = new wxCheckBox( parent, IDC_NETWORKED2K, _("ED2K"), wxDefaultPosition, wxDefaultSize, 0 );
-    item44->SetValue( TRUE );
-    item43->Add( item44, 0, wxALIGN_CENTER|wxLEFT, 40 );
+    wxSpinCtrl *item30 = new wxSpinCtrl( parent, IDC_MAXSOURCEPERFILE, wxT("300"), wxDefaultPosition, wxSize(100,-1), 0, 40, 5000, 300 );
+    item28->Add( item30, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxStaticLine *item45 = new wxStaticLine( parent, -1, wxDefaultPosition, wxSize(-1,20), wxLI_VERTICAL );
-    item43->Add( item45, 0, wxALIGN_CENTER, 5 );
+    wxStaticText *item31 = new wxStaticText( parent, ID_TEXT, _("Max simultaneous connections:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item28->Add( item31, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxCheckBox *item46 = new wxCheckBox( parent, IDC_NETWORKKAD, _("Kademlia"), wxDefaultPosition, wxDefaultSize, 0 );
-    item46->SetValue( TRUE );
-    item43->Add( item46, 0, wxALIGN_CENTER|wxRIGHT, 15 );
+    wxSpinCtrl *item32 = new wxSpinCtrl( parent, IDC_MAXCON, wxT("500"), wxDefaultPosition, wxSize(100,-1), 0, 5, 7500, 500 );
+    item28->Add( item32, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 0 );
 
-    item41->Add( item43, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( item28, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
 
-    item0->Add( item41, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
+    wxBoxSizer *item33 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer *item47 = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticBox *item35 = new wxStaticBox( parent, -1, _("Networks") );
+    wxStaticBoxSizer *item34 = new wxStaticBoxSizer( item35, wxHORIZONTAL );
 
-    wxStaticBox *item49 = new wxStaticBox( parent, -1, _("Universal Plug and Play") );
-    wxStaticBoxSizer *item48 = new wxStaticBoxSizer( item49, wxVERTICAL );
+    wxCheckBox *item36 = new wxCheckBox( parent, IDC_NETWORKKAD, _("Kademlia"), wxDefaultPosition, wxDefaultSize, 0 );
+    item36->SetValue( TRUE );
+    item34->Add( item36, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
 
-    wxCheckBox *item50 = new wxCheckBox( parent, IDC_UPNP_ENABLED, _("Enable UPnP"), wxDefaultPosition, wxDefaultSize, 0 );
-    item48->Add( item50, 0, wxALIGN_CENTER, 5 );
+    wxCheckBox *item37 = new wxCheckBox( parent, IDC_NETWORKED2K, _("ED2K"), wxDefaultPosition, wxDefaultSize, 0 );
+    item37->SetValue( TRUE );
+    item34->Add( item37, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
 
-    wxStaticText *item51 = new wxStaticText( parent, -1, _("UPnP TCP Port:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item48->Add( item51, 0, wxALIGN_CENTER, 5 );
+    item33->Add( item34, 1, wxGROW|wxLEFT|wxRIGHT, 0 );
 
-    wxSpinCtrl *item52 = new wxSpinCtrl( parent, IDC_UPNPTCPPORT, wxT("50000"), wxDefaultPosition, wxSize(100,-1), 0, 0, 65535, 50000 );
-    item48->Add( item52, 0, wxALIGN_CENTER, 5 );
+    wxStaticBox *item39 = new wxStaticBox( parent, -1, wxT("") );
+    wxStaticBoxSizer *item38 = new wxStaticBoxSizer( item39, wxVERTICAL );
 
-    item47->Add( item48, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
-
-    wxStaticBox *item54 = new wxStaticBox( parent, -1, wxT("") );
-    wxStaticBoxSizer *item53 = new wxStaticBoxSizer( item54, wxVERTICAL );
+    wxCheckBox *item40 = new wxCheckBox( parent, IDC_AUTOCONNECT, _("Autoconnect on startup"), wxDefaultPosition, wxDefaultSize, 0 );
+    item38->Add( item40, 0, wxALIGN_CENTER_VERTICAL, 10 );
 
-    wxCheckBox *item55 = new wxCheckBox( parent, IDC_AUTOCONNECT, _("Autoconnect on startup"), wxDefaultPosition, wxDefaultSize, 0 );
-    item53->Add( item55, 0, wxALIGN_CENTER_VERTICAL, 10 );
+    wxCheckBox *item41 = new wxCheckBox( parent, IDC_RECONN, _("Reconnect on loss"), wxDefaultPosition, wxDefaultSize, 0 );
+    item41->SetValue( TRUE );
+    item38->Add( item41, 0, wxALIGN_CENTER_VERTICAL, 10 );
 
-    wxCheckBox *item56 = new wxCheckBox( parent, IDC_RECONN, _("Reconnect on loss"), wxDefaultPosition, wxDefaultSize, 0 );
-    item56->SetValue( TRUE );
-    item53->Add( item56, 0, wxALIGN_CENTER_VERTICAL, 10 );
+    item33->Add( item38, 0, wxGROW|wxLEFT|wxRIGHT, 5 );
 
-    wxCheckBox *item57 = new wxCheckBox( parent, IDC_SHOWOVERHEAD, _("Show overhead bandwith"), wxDefaultPosition, wxDefaultSize, 0 );
-    item57->SetValue( TRUE );
-    item53->Add( item57, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    item47->Add( item53, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5 );
-
-    item0->Add( item47, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item33, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
     if (set_sizer)
     {
@@ -1939,58 +1711,53 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Server Options") );
-    wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
+    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer *item3 = new wxBoxSizer( wxHORIZONTAL );
+    wxCheckBox *item2 = new wxCheckBox( parent, IDC_REMOVEDEAD, _("Remove dead server after"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item2, 0, wxALIGN_CENTER|wxRIGHT, 5 );
 
-    wxCheckBox *item4 = new wxCheckBox( parent, IDC_REMOVEDEAD, _("Remove dead server after"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->Add( item4, 0, wxALIGN_CENTER|wxRIGHT, 5 );
+    wxSpinCtrl *item3 = new wxSpinCtrl( parent, IDC_SERVERRETRIES, wxT("2"), wxDefaultPosition, wxSize(40,-1), 0, 1, 10, 2 );
+    item1->Add( item3, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxSpinCtrl *item5 = new wxSpinCtrl( parent, IDC_SERVERRETRIES, wxT("2"), wxDefaultPosition, wxSize(40,-1), 0, 1, 10, 2 );
-    item3->Add( item5, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+    wxStaticText *item4 = new wxStaticText( parent, -1, _("retries"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxStaticText *item6 = new wxStaticText( parent, -1, _("retries"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->Add( item6, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
 
-    item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxBoxSizer *item5 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer *item7 = new wxBoxSizer( wxHORIZONTAL );
+    wxCheckBox *item6 = new wxCheckBox( parent, IDC_AUTOSERVER, _("Auto-update server list at startup"), wxDefaultPosition, wxDefaultSize, 0 );
+    item5->Add( item6, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item8 = new wxCheckBox( parent, IDC_AUTOSERVER, _("Auto-update server list at startup"), wxDefaultPosition, wxDefaultSize, 0 );
-    item7->Add( item8, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxButton *item7 = new wxButton( parent, IDC_EDITADR, _("List"), wxDefaultPosition, wxDefaultSize, 0 );
+    item5->Add( item7, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxButton *item9 = new wxButton( parent, IDC_EDITADR, _("List"), wxDefaultPosition, wxDefaultSize, 0 );
-    item7->Add( item9, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    item0->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    item1->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item8 = new wxCheckBox( parent, IDC_UPDATESERVERCONNECT, _("Update server list when connecting to a server"), wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( item8, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item10 = new wxCheckBox( parent, IDC_UPDATESERVERCONNECT, _("Update server list when connecting to a server"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item10, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item9 = new wxCheckBox( parent, IDC_UPDATESERVERCLIENT, _("Update server list when a client connects"), wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( item9, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item11 = new wxCheckBox( parent, IDC_UPDATESERVERCLIENT, _("Update server list when a client connects"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item11, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item10 = new wxCheckBox( parent, IDC_SCORE, _("Use priority system"), wxDefaultPosition, wxDefaultSize, 0 );
+    item10->SetValue( TRUE );
+    item0->Add( item10, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item12 = new wxCheckBox( parent, IDC_SCORE, _("Use priority system"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item11 = new wxCheckBox( parent, IDC_SMARTIDCHECK, _("Use smart LowID check on connect"), wxDefaultPosition, wxDefaultSize, 0 );
+    item11->SetValue( TRUE );
+    item0->Add( item11, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxCheckBox *item12 = new wxCheckBox( parent, IDC_SAFESERVERCONNECT, _("Safe connect"), wxDefaultPosition, wxDefaultSize, 0 );
     item12->SetValue( TRUE );
-    item1->Add( item12, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( item12, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item13 = new wxCheckBox( parent, IDC_SMARTIDCHECK, _("Use smart LowID check on connect"), wxDefaultPosition, wxDefaultSize, 0 );
-    item13->SetValue( TRUE );
-    item1->Add( item13, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item13 = new wxCheckBox( parent, IDC_AUTOCONNECTSTATICONLY, _("Autoconnect to servers in static list only"), wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( item13, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item14 = new wxCheckBox( parent, IDC_SAFESERVERCONNECT, _("Safe connect"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item14 = new wxCheckBox( parent, IDC_MANUALSERVERHIGHPRIO, _("Set manually added servers to High Priority"), wxDefaultPosition, wxDefaultSize, 0 );
     item14->SetValue( TRUE );
-    item1->Add( item14, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxCheckBox *item15 = new wxCheckBox( parent, IDC_AUTOCONNECTSTATICONLY, _("Autoconnect to servers in static list only"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item15, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxCheckBox *item16 = new wxCheckBox( parent, IDC_MANUALSERVERHIGHPRIO, _("Set manually added servers to High Priority"), wxDefaultPosition, wxDefaultSize, 0 );
-    item16->SetValue( TRUE );
-    item1->Add( item16, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    item0->Add( item1, 0, wxGROW|wxALL, 5 );
+    item0->Add( item14, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
     if (set_sizer)
     {
@@ -2006,79 +1773,74 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Intelligent Corruption Handling") );
+    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Intelligent Corruption Handling (I.C.H.)") );
     wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
 
-    wxCheckBox *item3 = new wxCheckBox( parent, IDC_ICH, _("I.C.H. active"), wxDefaultPosition, wxSize(160,-1), 0 );
+    wxCheckBox *item3 = new wxCheckBox( parent, IDC_ICH, _("Enable"), wxDefaultPosition, wxDefaultSize, 0 );
     item3->SetValue( TRUE );
-    item1->Add( item3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    item1->Add( item3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 0 );
 
-    wxCheckBox *item4 = new wxCheckBox( parent, IDC_AICHTRUST, _("AICH trusts every hash (not recomended)"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item4 = new wxCheckBox( parent, IDC_AICHTRUST, _("Advanced I.C.H. trusts every hash (not recommended)"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxStaticBox *item6 = new wxStaticBox( parent, -1, wxT("") );
+    wxStaticBox *item6 = new wxStaticBox( parent, -1, _("Downloads") );
     wxStaticBoxSizer *item5 = new wxStaticBoxSizer( item6, wxVERTICAL );
 
     wxCheckBox *item7 = new wxCheckBox( parent, IDC_ADDNEWFILESPAUSED, _("Add files to download in pause mode"), wxDefaultPosition, wxDefaultSize, 0 );
-    item5->Add( item7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    item5->Add( item7, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 0 );
 
     wxCheckBox *item8 = new wxCheckBox( parent, IDC_DAP, _("Add files to download with auto priority"), wxDefaultPosition, wxDefaultSize, 0 );
-    item5->Add( item8, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item5->Add( item8, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
     wxCheckBox *item9 = new wxCheckBox( parent, IDC_PREVIEWPRIO, _("Try to download first and last chunks first"), wxDefaultPosition, wxDefaultSize, 0 );
     item9->SetValue( TRUE );
-    item5->Add( item9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    item5->Add( item9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 0 );
 
-    wxCheckBox *item10 = new wxCheckBox( parent, IDC_UAP, _("Add new shared files with auto priority"), wxDefaultPosition, wxDefaultSize, 0 );
-    item5->Add( item10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    wxCheckBox *item10 = new wxCheckBox( parent, IDC_STARTNEXTFILE, _("Start next paused file when a file completes"), wxDefaultPosition, wxDefaultSize, 0 );
+    item10->SetValue( TRUE );
+    item5->Add( item10, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 0 );
 
-    wxCheckBox *item11 = new wxCheckBox( parent, IDC_FULLCHUNKTRANS, _("Try to transfer full chunks to all uploads"), wxDefaultPosition, wxDefaultSize, 0 );
-    item11->SetValue( TRUE );
-    item5->Add( item11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    wxCheckBox *item11 = new wxCheckBox( parent, IDC_STARTNEXTFILE_SAME, _("From the same category"), wxDefaultPosition, wxDefaultSize, 0 );
+    item5->Add( item11, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 
-    wxCheckBox *item12 = new wxCheckBox( parent, IDC_STARTNEXTFILE, _("Start next paused file when a file completed"), wxDefaultPosition, wxDefaultSize, 0 );
-    item12->SetValue( TRUE );
-    item5->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    wxCheckBox *item12 = new wxCheckBox( parent, IDC_STARTNEXTFILE_ALPHA, _("In alphabetic order"), wxDefaultPosition, wxDefaultSize, 0 );
+    item5->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 
-    wxCheckBox *item13 = new wxCheckBox( parent, IDC_STARTNEXTFILE_SAME, _("From the same category"), wxDefaultPosition, wxDefaultSize, 0 );
-    item5->Add( item13, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
+    wxCheckBox *item13 = new wxCheckBox( parent, IDC_ALLOCFULLFILE, _("Preallocate disk space for new files"), wxDefaultPosition, wxDefaultSize, 0 );
+    item13->SetToolTip( _("For new files preallocates disk space for the whole file, thus reduces fragmentation") );
+    item5->Add( item13, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 0 );
 
-    wxCheckBox *item14 = new wxCheckBox( parent, IDC_SRCSEEDS, _("Save 10 sources on rare files (< 20 sources)"), wxDefaultPosition, wxDefaultSize, 0 );
-    item14->SetValue( TRUE );
-    item5->Add( item14, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
-
-    item0->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxFlexGridSizer *item14 = new wxFlexGridSizer( 3, 0, 0 );
+    item14->AddGrowableCol( 0 );
 
-    wxStaticBox *item16 = new wxStaticBox( parent, -1, _("Disk space") );
-    wxStaticBoxSizer *item15 = new wxStaticBoxSizer( item16, wxVERTICAL );
+    wxCheckBox *item15 = new wxCheckBox( parent, IDC_CHECKDISKSPACE, _("Stop downloads when free disk space reaches "), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->SetToolTip( _("Select this if you want aMule to check your disk space") );
+    item14->Add( item15, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxCheckBox *item17 = new wxCheckBox( parent, IDC_CHECKDISKSPACE, _("Check disk space"), wxDefaultPosition, wxDefaultSize, 0 );
-    item17->SetToolTip( _("Select this if you want aMule to check your disk space") );
-    item15->Add( item17, 0, wxALIGN_CENTER_VERTICAL, 0 );
-
-    wxBoxSizer *item18 = new wxBoxSizer( wxHORIZONTAL );
+    wxSpinCtrl *item16 = new wxSpinCtrl( parent, IDC_MINDISKSPACE, wxT("1"), wxDefaultPosition, wxSize(100,-1), 0, 1, 1000000, 1 );
+    item16->SetToolTip( _("Enter here the min disk space desired.") );
+    item14->Add( item16, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    item18->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 0 );
+    wxStaticText *item17 = new wxStaticText( parent, -1, _("MB"), wxDefaultPosition, wxDefaultSize, 0 );
+    item14->Add( item17, 0, wxALIGN_CENTER|wxLEFT, 5 );
 
-    wxStaticText *item19 = new wxStaticText( parent, -1, _("Min disk space:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item18->Add( item19, 0, wxALIGN_CENTER|wxRIGHT, 5 );
+    item5->Add( item14, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxSpinCtrl *item20 = new wxSpinCtrl( parent, IDC_MINDISKSPACE, wxT("1"), wxDefaultPosition, wxSize(100,-1), 0, 1, 1000000, 1 );
-    item20->SetToolTip( _("Enter here the min disk space desired.") );
-    item18->Add( item20, 0, wxALIGN_CENTER_VERTICAL, 0 );
+    wxCheckBox *item18 = new wxCheckBox( parent, IDC_SRCSEEDS, _("Save 10 sources on rare files (< 20 sources)"), wxDefaultPosition, wxDefaultSize, 0 );
+    item18->SetValue( TRUE );
+    item5->Add( item18, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxStaticText *item21 = new wxStaticText( parent, -1, _("MB"), wxDefaultPosition, wxDefaultSize, 0 );
-    item18->Add( item21, 0, wxALIGN_CENTER|wxLEFT, 5 );
+    item0->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    item15->Add( item18, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
+    wxStaticBox *item20 = new wxStaticBox( parent, -1, _("Uploads") );
+    wxStaticBoxSizer *item19 = new wxStaticBoxSizer( item20, wxVERTICAL );
 
-    wxCheckBox *item22 = new wxCheckBox( parent, IDC_ALLOCFULLFILE, _("Preallocate disk space for new files"), wxDefaultPosition, wxDefaultSize, 0 );
-    item22->SetToolTip( _("For new files preallocates disk space for the whole file, thus reduces fragmentation") );
-    item15->Add( item22, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 10 );
+    wxCheckBox *item21 = new wxCheckBox( parent, IDC_UAP, _("Add new shared files with auto priority"), wxDefaultPosition, wxDefaultSize, 0 );
+    item19->Add( item21, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 0 );
 
-    item0->Add( item15, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item19, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 0 );
 
     if (set_sizer)
     {
@@ -2094,7 +1856,7 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Incoming") );
+    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Destination folder for downloads") );
     wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxHORIZONTAL );
 
     CMuleTextCtrl *item3 = new CMuleTextCtrl( parent, IDC_INCFILES, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
@@ -2103,9 +1865,9 @@
     wxButton *item4 = new wxButton( parent, IDC_SELINCDIR, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item4, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxStaticBox *item6 = new wxStaticBox( parent, -1, _("Temporary") );
+    wxStaticBox *item6 = new wxStaticBox( parent, -1, _("Folder for temporary download files") );
     wxStaticBoxSizer *item5 = new wxStaticBoxSizer( item6, wxHORIZONTAL );
 
     CMuleTextCtrl *item7 = new CMuleTextCtrl( parent, IDC_TEMPFILES, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
@@ -2114,23 +1876,23 @@
     wxButton *item8 = new wxButton( parent, IDC_SELTEMPDIR, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
     item5->Add( item8, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    item0->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxStaticBox *item10 = new wxStaticBox( parent, -1, _("Shared") );
+    wxStaticBox *item10 = new wxStaticBox( parent, -1, _("Shared folders") );
     wxStaticBoxSizer *item9 = new wxStaticBoxSizer( item10, wxVERTICAL );
 
     wxStaticText *item11 = new wxStaticText( parent, -1, _("(Right click on folder icon for recursive share)"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
-    item9->Add( item11, 0, wxALIGN_CENTER, 5 );
+    item9->Add( item11, 0, wxALIGN_CENTER, 0 );
 
-    CDirectoryTreeCtrl *item12 = new CDirectoryTreeCtrl(parent, IDC_SHARESELECTOR,wxPoint(0,0),  wxSize(100, 100), wxSUNKEN_BORDER|wxTR_DEFAULT_STYLE|wxTR_HIDE_ROOT);
+    CDirectoryTreeCtrl *item12 = new CDirectoryTreeCtrl(parent, IDC_SHARESELECTOR, wxPoint(0,0), wxSize(100,100), wxSUNKEN_BORDER|wxTR_DEFAULT_STYLE|wxTR_HIDE_ROOT );
     wxASSERT( item12 );
     item9->Add( item12, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     wxCheckBox *item13 = new wxCheckBox( parent, IDC_SHAREHIDDENFILES, _("Share hidden files"), wxDefaultPosition, wxDefaultSize, 0 );
     item13->SetValue( TRUE );
-    item9->Add( item13, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item9->Add( item13, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    item0->Add( item9, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item9, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
     if (set_sizer)
     {
@@ -2167,12 +1929,36 @@
     wxSlider *item8 = new wxSlider( parent, IDC_SLIDER4, 100, 2, 200, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
     item1->Add( item8, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxStaticText *item9 = new wxStaticText( parent, -1, _("Select Statistics Colors"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item9, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
+    wxFlexGridSizer *item9 = new wxFlexGridSizer( 3, 0, 0 );
+    item9->AddGrowableCol( 0 );
 
-    wxBoxSizer *item10 = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText *item10 = new wxStaticText( parent, -1, _("Download graph scale:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item9->Add( item10, 0, wxALIGN_CENTER_VERTICAL, 0 );
+
+    wxSpinCtrl *item11 = new wxSpinCtrl( parent, IDC_DOWNLOAD_CAP, wxT("3"), wxDefaultPosition, wxSize(100,-1), 0, 3, 19375, 3 );
+    item9->Add( item11, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxStaticText *item12 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
+    item9->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxString strs11[] = 
+    wxStaticText *item13 = new wxStaticText( parent, -1, _("Upload graph scale:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item9->Add( item13, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
+
+    wxSpinCtrl *item14 = new wxSpinCtrl( parent, IDC_UPLOAD_CAP, wxT("3"), wxDefaultPosition, wxSize(100,-1), 0, 3, 19375, 3 );
+    item9->Add( item14, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
+
+    wxStaticText *item15 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
+    item9->Add( item15, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP, 5 );
+
+    item1->Add( item9, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
+
+    wxFlexGridSizer *item16 = new wxFlexGridSizer( 3, 0, 0 );
+    item16->AddGrowableCol( 0 );
+
+    wxStaticText *item17 = new wxStaticText( parent, -1, _("Colours: "), wxDefaultPosition, wxDefaultSize, 0 );
+    item16->Add( item17, 0, wxALIGN_CENTER_VERTICAL|wxTOP, 5 );
+
+    wxString strs18[] = 
     {
         _("Background"), 
         _("Grid"), 
@@ -2190,66 +1976,36 @@
         _("Kad-nodes running"), 
         _("Kad-nodes session")
     };
-    wxChoice *item11 = new wxChoice( parent, IDC_COLORSELECTOR, wxDefaultPosition, wxDefaultSize, 15, strs11, 0 );
-    item10->Add( item11, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
-
-    wxButton *item12 = new wxButton( parent, IDC_COLOR_BUTTON, _("Select"), wxDefaultPosition, wxDefaultSize, 0 );
-    item10->Add( item12, 0, wxGROW|wxLEFT, 5 );
+    wxChoice *item18 = new wxChoice( parent, IDC_COLORSELECTOR, wxDefaultPosition, wxDefaultSize, 15, strs18, 0 );
+    item16->Add( item18, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxRIGHT, 5 );
 
-    item1->Add( item10, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
-
-    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    wxStaticBox *item14 = new wxStaticBox( parent, -1, _("Statistics Tree") );
-    wxStaticBoxSizer *item13 = new wxStaticBoxSizer( item14, wxVERTICAL );
-
-    wxStaticText *item15 = new wxStaticText( parent, IDC_SLIDERINFO2, _("Update delay : 5 secs"), wxDefaultPosition, wxDefaultSize, 0 );
-    item13->Add( item15, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxSlider *item16 = new wxSlider( parent, IDC_SLIDER2, 5, 5, 100, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
-    item13->Add( item16, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer *item17 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticText *item18 = new wxStaticText( parent, -1, _("Number of Client Versions shown (0=unlimited)"), wxDefaultPosition, wxDefaultSize, 0 );
-    item17->Add( item18, 0, wxALIGN_CENTER|wxALL, 5 );
+    wxButton *item19 = new wxButton( parent, IDC_COLOR_BUTTON, _("Select"), wxDefaultPosition, wxDefaultSize, 0 );
+    item16->Add( item19, 0, wxGROW|wxLEFT, 5 );
 
-    wxSpinCtrl *item19 = new wxSpinCtrl( parent, IDC_CLIENTVERSIONS, wxT("0"), wxDefaultPosition, wxDefaultSize, 0, 0, 255, 0 );
-    item17->Add( item19, 0, wxALIGN_CENTER|wxALL, 5 );
-
-    item13->Add( item17, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item1->Add( item16, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    item0->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxStaticBox *item21 = new wxStaticBox( parent, -1, _("Line Capacities") );
+    wxStaticBox *item21 = new wxStaticBox( parent, -1, _("Tree") );
     wxStaticBoxSizer *item20 = new wxStaticBoxSizer( item21, wxVERTICAL );
 
-    wxGridSizer *item22 = new wxGridSizer( 3, 0, 0 );
-
-    wxStaticText *item23 = new wxStaticText( parent, -1, _("Download"), wxDefaultPosition, wxDefaultSize, 0 );
-    item22->Add( item23, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxSpinCtrl *item24 = new wxSpinCtrl( parent, IDC_DOWNLOAD_CAP, wxT("3"), wxDefaultPosition, wxSize(100,-1), 0, 3, 19375, 3 );
-    item22->Add( item24, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxStaticText *item25 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
-    item22->Add( item25, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    wxStaticText *item22 = new wxStaticText( parent, IDC_SLIDERINFO2, _("Update delay : 5 secs"), wxDefaultPosition, wxDefaultSize, 0 );
+    item20->Add( item22, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxStaticText *item26 = new wxStaticText( parent, -1, _("Upload"), wxDefaultPosition, wxDefaultSize, 0 );
-    item22->Add( item26, 0, wxALIGN_CENTER_VERTICAL, 20 );
+    wxSlider *item23 = new wxSlider( parent, IDC_SLIDER2, 5, 5, 100, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
+    item20->Add( item23, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxSpinCtrl *item27 = new wxSpinCtrl( parent, IDC_UPLOAD_CAP, wxT("3"), wxDefaultPosition, wxSize(100,-1), 0, 3, 19375, 3 );
-    item22->Add( item27, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxBoxSizer *item24 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item28 = new wxStaticText( parent, -1, _("kB/s"), wxDefaultPosition, wxDefaultSize, 0 );
-    item22->Add( item28, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    wxStaticText *item25 = new wxStaticText( parent, -1, _("Number of Client Versions shown (0=unlimited)"), wxDefaultPosition, wxDefaultSize, 0 );
+    item24->Add( item25, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    item20->Add( item22, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxSpinCtrl *item26 = new wxSpinCtrl( parent, IDC_CLIENTVERSIONS, wxT("0"), wxDefaultPosition, wxDefaultSize, 0, 0, 255, 0 );
+    item24->Add( item26, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    wxStaticText *item29 = new wxStaticText( parent, -1, _("Note: These values are only used for statistics."), wxDefaultPosition, wxDefaultSize, 0 );
-    item20->Add( item29, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP, 5 );
+    item20->Add( item24, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    item0->Add( item20, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+    item0->Add( item20, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
     if (set_sizer)
     {
@@ -2274,15 +2030,13 @@
     item2->SetFont( wxFont( 24, wxROMAN, wxNORMAL, wxNORMAL ) );
     item1->Add( item2, 0, wxALIGN_CENTER, 5 );
 
-    wxStaticText *item3 = new wxStaticText( parent, -1, 
-        _("Do not change these setting unless you know\nwhat you are doing, otherwise you can easily\nmake things worse for yourself.\n\naMule will run fine without adjusting any of\nthese settings."),
-        wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
+    wxStaticText *item3 = new wxStaticText( parent, IDC_AMULE_TWEAKS_WARNING, wxT(""), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTRE );
     item3->SetForegroundColour( *wxRED );
     item1->Add( item3, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
 
     item0->Add( item1, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    wxStaticBox *item5 = new wxStaticBox( parent, -1, _("Advanced Settings") );
+    wxStaticBox *item5 = new wxStaticBox( parent, -1, wxT("") );
     wxStaticBoxSizer *item4 = new wxStaticBoxSizer( item5, wxVERTICAL );
 
     wxStaticText *item6 = new wxStaticText( parent, -1, _("Max new connections / 5 secs"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -2309,6 +2063,9 @@
     wxSlider *item13 = new wxSlider( parent, IDC_SERVERKEEPALIVE, 0, 0, 30, wxDefaultPosition, wxSize(100,-1), wxSL_HORIZONTAL );
     item4->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
+    wxCheckBox *item14 = new wxCheckBox( parent, IDC_PREVENT_SLEEP, _("Disable computer's timed standby mode"), wxDefaultPosition, wxDefaultSize, 0 );
+    item4->Add( item14, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
+
     item0->Add( item4, 0, wxGROW|wxALL, 5 );
 
     if (set_sizer)
@@ -2325,97 +2082,82 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Download Queue Files Progress") );
-    wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
-
-    wxCheckBox *item3 = new wxCheckBox( parent, IDC_PERCENT, _("Show percentage"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->SetValue( TRUE );
-    item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
-
-    wxCheckBox *item4 = new wxCheckBox( parent, IDC_PROGBAR, _("Show progressbar "), wxDefaultPosition, wxDefaultSize, 0 );
-    item4->SetValue( TRUE );
-    item1->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
-
-    wxFlexGridSizer *item5 = new wxFlexGridSizer( 2, 0, 0 );
-
-    wxStaticText *item6 = new wxStaticText( parent, -1, _("Progressbar Style"), wxDefaultPosition, wxDefaultSize, 0 );
-    item5->Add( item6, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
-
-    wxBoxSizer *item7 = new wxBoxSizer( wxVERTICAL );
-
-    wxSlider *item8 = new wxSlider( parent, IDC_3DDEPTH, 5, 0, 5, wxDefaultPosition, wxSize(200,-1), wxSL_HORIZONTAL );
-    item7->Add( item8, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxGridSizer *item9 = new wxGridSizer( 1, 0, 0, 0 );
+    wxStaticText *item2 = new wxStaticText( parent, -1, _("Skin to use: "), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item2, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxStaticText *item10 = new wxStaticText( parent, -1, _("Flat"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item10, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    wxString strs3[] = 
+    {
+        _("- default -")
+    };
+    wxChoice *item3 = new wxChoice( parent, IDC_SKIN, wxDefaultPosition, wxSize(200,-1), 1, strs3, 0 );
+    item1->Add( item3, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 0 );
 
-    wxStaticText *item11 = new wxStaticText( parent, -1, _("Round"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item11, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
-    item7->Add( item9, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item4 = new wxCheckBox( parent, IDC_FED2KLH, _("Show \"Fast eD2k Links Handler\" in every window."), wxDefaultPosition, wxDefaultSize, 0 );
+    item4->SetValue( TRUE );
+    item0->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
 
-    item5->Add( item7, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
+    wxCheckBox *item5 = new wxCheckBox( parent, IDC_EXTCATINFO, _("Show extended info on categories tabs"), wxDefaultPosition, wxDefaultSize, 0 );
+    item5->SetValue( TRUE );
+    item0->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
 
-    item1->Add( item5, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item6 = new wxCheckBox( parent, IDC_SHOWVERSIONONTITLE, _("Show application version on title"), wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( item6, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxCheckBox *item7 = new wxCheckBox( parent, IDC_SHOWRATEONTITLE, _("Show transfer rates on title"), wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxStaticBox *item13 = new wxStaticBox( parent, -1, _("Skin Support") );
-    wxStaticBoxSizer *item12 = new wxStaticBoxSizer( item13, wxVERTICAL );
+    wxRadioButton *item8 = new wxRadioButton( parent, IDC_RATESBEFORETITLE, _("Before application name"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+    item0->Add( item8, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 
-    wxCheckBox *item14 = new wxCheckBox( parent, IDC_USESKINFILES, _("Enable skin support "), wxDefaultPosition, wxDefaultSize, 0 );
-    item12->Add( item14, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxRadioButton *item9 = new wxRadioButton( parent, IDC_RATESAFTERTITLE, _("After application name"), wxDefaultPosition, wxDefaultSize, 0 );
+    item9->SetValue( TRUE );
+    item0->Add( item9, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 
-    wxBoxSizer *item15 = new wxBoxSizer( wxHORIZONTAL );
+    wxCheckBox *item10 = new wxCheckBox( parent, IDC_SHOWOVERHEAD, _("Show overhead bandwidth"), wxDefaultPosition, wxDefaultSize, 0 );
+    item10->SetValue( TRUE );
+    item0->Add( item10, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxStaticText *item16 = new wxStaticText( parent, -1, _("Skin:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item15->Add( item16, 0, wxALIGN_CENTER|wxALL, 5 );
+    wxCheckBox *item11 = new wxCheckBox( parent, IDC_VERTTOOLBAR, _("Vertical toolbar orientation"), wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( item11, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxString strs17[] = 
-    {
-        _("- no skins available -")
-    };
-    wxChoice *item17 = new wxChoice( parent, IDC_SKIN, wxDefaultPosition, wxSize(200,-1), 1, strs17, 0 );
-    item15->Add( item17, 0, wxALIGN_CENTER|wxALL, 5 );
+    wxCheckBox *item12 = new wxCheckBox( parent, IDC_SHOW_COUNTRY_FLAGS, _("Show country flags for clients"), wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( item12, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    item12->Add( item15, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
-
-    item0->Add( item12, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    wxStaticBox *item19 = new wxStaticBox( parent, -1, _("Column Sorting") );
-    wxStaticBoxSizer *item18 = new wxStaticBoxSizer( item19, wxVERTICAL );
+    wxStaticBox *item14 = new wxStaticBox( parent, -1, _("Download Queue Files") );
+    wxStaticBoxSizer *item13 = new wxStaticBoxSizer( item14, wxVERTICAL );
 
-    wxCheckBox *item20 = new wxCheckBox( parent, IDC_AUTOSORT, _("Auto-sort files in the download queue (high CPU)"), wxDefaultPosition, wxDefaultSize, 0 );
-    item20->SetValue( TRUE );
-    item20->SetToolTip( _("aMule will sort the columns in your download list automatically") );
-    item18->Add( item20, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item15 = new wxCheckBox( parent, IDC_PERCENT, _("Show progress percentage"), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->SetValue( TRUE );
+    item13->Add( item15, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
 
-    item0->Add( item18, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxFlexGridSizer *item16 = new wxFlexGridSizer( 4, 0, 0 );
+    item16->AddGrowableCol( 0 );
 
-    wxStaticBox *item22 = new wxStaticBox( parent, -1, _("Misc Gui Tweaks") );
-    wxStaticBoxSizer *item21 = new wxStaticBoxSizer( item22, wxVERTICAL );
+    wxCheckBox *item17 = new wxCheckBox( parent, IDC_PROGBAR, _("Show progress bar"), wxDefaultPosition, wxDefaultSize, 0 );
+    item17->SetValue( TRUE );
+    item16->Add( item17, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
 
-    wxCheckBox *item23 = new wxCheckBox( parent, IDC_FED2KLH, _("Show Fast eD2k Links Handler"), wxDefaultPosition, wxDefaultSize, 0 );
-    item23->SetValue( TRUE );
-    item21->Add( item23, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
+    wxStaticText *item18 = new wxStaticText( parent, -1, _("Flat"), wxDefaultPosition, wxDefaultSize, 0 );
+    item16->Add( item18, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxCheckBox *item24 = new wxCheckBox( parent, IDC_EXTCATINFO, _("Show extended info on categories tabs"), wxDefaultPosition, wxDefaultSize, 0 );
-    item24->SetValue( TRUE );
-    item21->Add( item24, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
+    wxSlider *item19 = new wxSlider( parent, IDC_3DDEPTH, 5, 0, 5, wxDefaultPosition, wxSize(200,-1), wxSL_HORIZONTAL );
+    item16->Add( item19, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item25 = new wxCheckBox( parent, IDC_SHOWRATEONTITLE, _("Show transfer rates on title"), wxDefaultPosition, wxDefaultSize, 0 );
-    item25->SetValue( TRUE );
-    item21->Add( item25, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxStaticText *item20 = new wxStaticText( parent, -1, _("Round"), wxDefaultPosition, wxDefaultSize, 0 );
+    item16->Add( item20, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxCheckBox *item26 = new wxCheckBox( parent, IDC_VERTTOOLBAR, _("Vertical toolbar orientation"), wxDefaultPosition, wxDefaultSize, 0 );
-    item21->Add( item26, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    item13->Add( item16, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item27 = new wxCheckBox( parent, IDC_SHOWPARTFILENUMBER, _("Show part file number before file name"), wxDefaultPosition, wxDefaultSize, 0 );
-    item21->Add( item27, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item21 = new wxCheckBox( parent, IDC_AUTOSORT, _("Auto-sort files (high CPU)"), wxDefaultPosition, wxDefaultSize, 0 );
+    item21->SetValue( TRUE );
+    item21->SetToolTip( _("aMule will sort the columns in your download list automatically") );
+    item13->Add( item21, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
 
-    item0->Add( item21, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
     if (set_sizer)
     {
@@ -2431,124 +2173,125 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Web server parameters") );
+    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("External Connection Parameters") );
     wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
 
-    wxCheckBox *item3 = new wxCheckBox( parent, IDC_ENABLE_WEB, _("Run amuleweb on startup"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item3 = new wxCheckBox( parent, IDC_EXT_CONN_ACCEPT, _("Accept external connections"), wxDefaultPosition, wxDefaultSize, 0 );
     item1->Add( item3, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxBoxSizer *item4 = new wxBoxSizer( wxHORIZONTAL );
+    wxFlexGridSizer *item4 = new wxFlexGridSizer( 2, 0, 0 );
+    item4->AddGrowableCol( 0 );
+    item4->AddGrowableCol( 1 );
 
-    wxStaticText *item5 = new wxStaticText( parent, -1, _("Web server port"), wxDefaultPosition, wxDefaultSize, 0 );
-    item4->Add( item5, 1, wxALIGN_CENTER_VERTICAL, 5 );
+    wxStaticText *item5 = new wxStaticText( parent, -1, _("IP of the listening interface:"), wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
+    item4->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxSpinCtrl *item6 = new wxSpinCtrl( parent, IDC_WEB_PORT, wxT("10000"), wxDefaultPosition, wxSize(100,-1), 0, 1025, 65535, 10000 );
-    item4->Add( item6, 0, wxALIGN_CENTER, 5 );
+    CMuleTextCtrl *item6 = new CMuleTextCtrl( parent, IDC_EXT_CONN_IP, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
+    item6->SetToolTip( _("Enter here a valid ip in the a.b.c.d format for the listening EC interface. An empty field or 0.0.0.0 will mean any interface.") );
+    item4->Add( item6, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
     item1->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item7 = new wxCheckBox( parent, IDC_UPNP_WEBSERVER_ENABLED, _("Enable UPnP port forwarding on the web server port"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item7, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxFlexGridSizer *item7 = new wxFlexGridSizer( 2, 0, 0 );
+    item7->AddGrowableCol( 0 );
 
-    wxBoxSizer *item8 = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText *item8 = new wxStaticText( parent, -1, _("TCP port:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item7->Add( item8, 1, wxALIGN_CENTER_VERTICAL|wxRIGHT, 0 );
 
-    wxStaticText *item9 = new wxStaticText( parent, -1, _("Web server UPnP TCP port"), wxDefaultPosition, wxDefaultSize, 0 );
-    item8->Add( item9, 1, wxALIGN_CENTER|wxRIGHT, 5 );
+    wxSpinCtrl *item9 = new wxSpinCtrl( parent, IDC_EXT_CONN_TCP_PORT, wxT("10000"), wxDefaultPosition, wxSize(100,-1), 0, 1025, 65535, 10000 );
+    item7->Add( item9, 0, wxALIGN_CENTER, 5 );
 
-    wxSpinCtrl *item10 = new wxSpinCtrl( parent, IDC_WEBUPNPTCPPORT, wxT("10000"), wxDefaultPosition, wxSize(100,-1), 0, 1025, 65535, 10000 );
-    item8->Add( item10, 0, wxALIGN_CENTER, 5 );
+    item1->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    item1->Add( item8, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item10 = new wxCheckBox( parent, IDC_UPNP_EC_ENABLED, _("Enable UPnP port forwarding on the EC port"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item10, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
     wxBoxSizer *item11 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item12 = new wxStaticText( parent, -1, _("Page Refresh Time (in secs)"), wxDefaultPosition, wxDefaultSize, 0 );
-    item11->Add( item12, 1, wxALIGN_CENTER, 5 );
+    wxStaticText *item12 = new wxStaticText( parent, -1, _("Password"), wxDefaultPosition, wxDefaultSize, 0 );
+    item11->Add( item12, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
 
-    wxSpinCtrl *item13 = new wxSpinCtrl( parent, IDC_WEB_REFRESH_TIMEOUT, wxT("120"), wxDefaultPosition, wxSize(100,-1), 0, 120, 600, 120 );
-    item11->Add( item13, 0, wxALIGN_CENTER, 5 );
+    CMuleTextCtrl *item13 = new CMuleTextCtrl( parent, IDC_EXT_CONN_PASSWD, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
+    item11->Add( item13, 1, wxALIGN_CENTER|wxLEFT, 5 );
 
     item1->Add( item11, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item14 = new wxCheckBox( parent, IDC_WEB_GZIP, _("Enable Gzip compression"), wxDefaultPosition, wxDefaultSize, 0 );
-    item14->SetValue( TRUE );
-    item1->Add( item14, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( item1, 0, wxGROW|wxALL, 0 );
 
-    wxCheckBox *item15 = new wxCheckBox( parent, IDC_ENABLE_WEB_LOW, _("Enable Low rights User"), wxDefaultPosition, wxDefaultSize, 0 );
-    item15->SetValue( TRUE );
-    item1->Add( item15, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    wxStaticBox *item15 = new wxStaticBox( parent, -1, _("Web server parameters") );
+    wxStaticBoxSizer *item14 = new wxStaticBoxSizer( item15, wxVERTICAL );
 
-    wxFlexGridSizer *item16 = new wxFlexGridSizer( 2, 0, 0 );
-    item16->AddGrowableCol( 1 );
+    wxCheckBox *item16 = new wxCheckBox( parent, IDC_ENABLE_WEB, _("Run webserver on startup"), wxDefaultPosition, wxDefaultSize, 0 );
+    item14->Add( item16, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxStaticText *item17 = new wxStaticText( parent, -1, _("Full rights password"), wxDefaultPosition, wxDefaultSize, 0 );
-    item16->Add( item17, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    wxFlexGridSizer *item17 = new wxFlexGridSizer( 2, 0, 0 );
+    item17->AddGrowableCol( 1 );
 
-    CMuleTextCtrl *item18 = new CMuleTextCtrl( parent, IDC_WEB_PASSWD, wxT(""), wxDefaultPosition, wxSize(80,-1), wxTE_PASSWORD );
-    item16->Add( item18, 1, wxGROW|wxALIGN_RIGHT, 5 );
+    wxStaticText *item18 = new wxStaticText( parent, -1, _("Web template"), wxDefaultPosition, wxDefaultSize, 0 );
+    item17->Add( item18, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxStaticText *item19 = new wxStaticText( parent, -1, _("Low rights password"), wxDefaultPosition, wxDefaultSize, 0 );
-    item16->Add( item19, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    wxString *strs19 = (wxString*) NULL;
+    wxChoice *item19 = new wxChoice( parent, IDC_WEBTEMPLATE, wxDefaultPosition, wxSize(200,-1), 0, strs19, 0 );
+    item17->Add( item19, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
 
-    CMuleTextCtrl *item20 = new CMuleTextCtrl( parent, IDC_WEB_PASSWD_LOW, wxT(""), wxDefaultPosition, wxSize(80,-1), wxTE_PASSWORD );
-    item16->Add( item20, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxStaticText *item20 = new wxStaticText( parent, -1, _("Full rights password"), wxDefaultPosition, wxDefaultSize, 0 );
+    item17->Add( item20, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
 
-    wxStaticText *item21 = new wxStaticText( parent, -1, _("Web template"), wxDefaultPosition, wxDefaultSize, 0 );
-    item16->Add( item21, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
+    CMuleTextCtrl *item21 = new CMuleTextCtrl( parent, IDC_WEB_PASSWD, wxT(""), wxDefaultPosition, wxSize(80,-1), wxTE_PASSWORD );
+    item17->Add( item21, 1, wxGROW|wxALIGN_RIGHT, 5 );
 
-    wxString *strs22 = (wxString*) NULL;
-    wxChoice *item22 = new wxChoice( parent, IDC_WEBTEMPLATE, wxDefaultPosition, wxSize(200,-1), 0, strs22, 0 );
-    item16->Add( item22, 0, wxALIGN_CENTER, 5 );
+    wxCheckBox *item22 = new wxCheckBox( parent, IDC_ENABLE_WEB_LOW, _("Enable Low rights User"), wxDefaultPosition, wxDefaultSize, 0 );
+    item22->SetValue( TRUE );
+    item17->Add( item22, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    item1->Add( item16, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    item17->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    item0->Add( item1, 0, wxGROW|wxALL, 5 );
+    wxStaticText *item23 = new wxStaticText( parent, -1, _("Low rights password"), wxDefaultPosition, wxDefaultSize, 0 );
+    item17->Add( item23, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 20 );
 
-    wxStaticBox *item24 = new wxStaticBox( parent, -1, _("External Connection Parameters") );
-    wxStaticBoxSizer *item23 = new wxStaticBoxSizer( item24, wxVERTICAL );
+    CMuleTextCtrl *item24 = new CMuleTextCtrl( parent, IDC_WEB_PASSWD_LOW, wxT(""), wxDefaultPosition, wxSize(80,-1), wxTE_PASSWORD );
+    item17->Add( item24, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item25 = new wxCheckBox( parent, IDC_EXT_CONN_ACCEPT, _("Accept external connections"), wxDefaultPosition, wxDefaultSize, 0 );
-    item23->Add( item25, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item14->Add( item17, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxBoxSizer *item26 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer *item25 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticText *item26 = new wxStaticText( parent, -1, _("TCP port:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item25->Add( item26, 1, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxStaticText *item27 = new wxStaticText( parent, -1, _("Password"), wxDefaultPosition, wxDefaultSize, 0 );
-    item26->Add( item27, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
+    wxSpinCtrl *item27 = new wxSpinCtrl( parent, IDC_WEB_PORT, wxT("10000"), wxDefaultPosition, wxSize(100,-1), 0, 1025, 65535, 10000 );
+    item25->Add( item27, 0, wxALIGN_CENTER, 5 );
 
-    CMuleTextCtrl *item28 = new CMuleTextCtrl( parent, IDC_EXT_CONN_PASSWD, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD );
-    item26->Add( item28, 1, wxALIGN_CENTER|wxLEFT, 5 );
+    item14->Add( item25, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    item23->Add( item26, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    wxCheckBox *item28 = new wxCheckBox( parent, IDC_UPNP_WEBSERVER_ENABLED, _("Enable UPnP port forwarding of the web server port"), wxDefaultPosition, wxDefaultSize, 0 );
+    item14->Add( item28, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxFlexGridSizer *item29 = new wxFlexGridSizer( 2, 0, 0 );
-    item29->AddGrowableCol( 0 );
-    item29->AddGrowableCol( 1 );
+    wxBoxSizer *item29 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item30 = new wxStaticText( parent, -1, 
-        _("IP of the listening interface\n(empty for any)"),
-        wxDefaultPosition, wxDefaultSize, wxST_NO_AUTORESIZE );
-    item29->Add( item30, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+    wxStaticText *item30 = new wxStaticText( parent, IDC_WEBUPNPTCPPORTTEXT, _("Web server UPnP TCP port (Optional)"), wxDefaultPosition, wxDefaultSize, 0 );
+    item29->Add( item30, 1, wxALIGN_CENTER|wxRIGHT, 5 );
 
-    CMuleTextCtrl *item31 = new CMuleTextCtrl( parent, IDC_EXT_CONN_IP, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
-    item31->SetToolTip( _("Enter here a valid ip in the a.b.c.d format for the listening EC interface. An empty field or 0.0.0.0 will mean any interface.") );
-    item29->Add( item31, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    wxSpinCtrl *item31 = new wxSpinCtrl( parent, IDC_WEBUPNPTCPPORT, wxT("10000"), wxDefaultPosition, wxSize(100,-1), 0, 1025, 65535, 10000 );
+    item29->Add( item31, 0, wxALIGN_CENTER, 5 );
 
-    item23->Add( item29, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    item14->Add( item29, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 
     wxBoxSizer *item32 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item33 = new wxStaticText( parent, -1, _("TCP port"), wxDefaultPosition, wxDefaultSize, 0 );
-    item32->Add( item33, 1, wxALIGN_CENTER|wxRIGHT, 5 );
+    wxStaticText *item33 = new wxStaticText( parent, -1, _("Page Refresh Time (in secs)"), wxDefaultPosition, wxDefaultSize, 0 );
+    item32->Add( item33, 1, wxALIGN_CENTER, 5 );
 
-    wxSpinCtrl *item34 = new wxSpinCtrl( parent, IDC_EXT_CONN_TCP_PORT, wxT("10000"), wxDefaultPosition, wxSize(100,-1), 0, 1025, 65535, 10000 );
+    wxSpinCtrl *item34 = new wxSpinCtrl( parent, IDC_WEB_REFRESH_TIMEOUT, wxT("120"), wxDefaultPosition, wxSize(100,-1), 0, 120, 600, 120 );
     item32->Add( item34, 0, wxALIGN_CENTER, 5 );
 
-    item23->Add( item32, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item14->Add( item32, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
-    wxCheckBox *item35 = new wxCheckBox( parent, IDC_UPNP_EC_ENABLED, _("Enable UPnP port forwarding on the EC port"), wxDefaultPosition, wxDefaultSize, 0 );
-    item23->Add( item35, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    wxCheckBox *item35 = new wxCheckBox( parent, IDC_WEB_GZIP, _("Enable Gzip compression"), wxDefaultPosition, wxDefaultSize, 0 );
+    item35->SetValue( TRUE );
+    item14->Add( item35, 0, wxALIGN_CENTER_VERTICAL, 5 );
 
-    item0->Add( item23, 0, wxGROW|wxALL, 5 );
+    item0->Add( item14, 0, wxGROW|wxALL, 0 );
 
     if (set_sizer)
     {
@@ -2634,7 +2377,7 @@
     CMuleTextCtrl *item11 = new CMuleTextCtrl( parent, IDC_INCOMING, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
     item9->Add( item11, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    wxButton *item12 = new wxButton( parent, IDC_BROWSE, _("..."), wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item12 = new wxButton( parent, IDC_BROWSE, wxT("..."), wxDefaultPosition, wxDefaultSize, 0 );
     item9->Add( item12, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
 
     item1->Add( item9, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
@@ -2646,7 +2389,7 @@
 
     wxString strs15[] = 
     {
-        _("Dont change"), 
+        _("Don't change"), 
         _("Low"), 
         _("Normal"), 
         _("High"), 
@@ -2705,7 +2448,7 @@
     wxStaticBox *item1 = new wxStaticBox( parent, -1, wxT("") );
     wxStaticBoxSizer *item0 = new wxStaticBoxSizer( item1, wxVERTICAL );
 
-    wxSplitterWindow *item2 = new wxSplitterWindow( parent, ID_SPLATTER, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE );
+    wxSplitterWindow *item2 = new wxSplitterWindow( parent, ID_DOWNLOADSSPLATTER, wxDefaultPosition, wxDefaultSize, wxSP_LIVE_UPDATE );
     item2->SetMinimumPaneSize( 20 );
     wxPanel *item3 = new wxPanel( item2, -1 );
     transferTopPane( item3, FALSE, TRUE );
@@ -2731,25 +2474,14 @@
 
     wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticBitmap *item2 = new wxStaticBitmap( parent, -1, amuleDlgImages( 2 ), wxDefaultPosition, wxDefaultSize );
-    item2->SetToolTip( _("Display server motd when connected ...") );
-    item1->Add( item2, 0, wxALIGN_CENTER|wxALL, 5 );
-
-    wxStaticText *item3 = new wxStaticText( parent, -1, _("Server Info"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
-
-    item0->Add( item1, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer *item4 = new wxBoxSizer( wxHORIZONTAL );
-
-    CMuleTextCtrl *item5 = new CMuleTextCtrl( parent, ID_SERVERINFO, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxVSCROLL );
-    item4->Add( item5, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
+    CMuleTextCtrl *item2 = new CMuleTextCtrl( parent, ID_SERVERINFO, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxVSCROLL );
+    item1->Add( item2, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    wxButton *item6 = new wxButton( parent, ID_BTN_RESET_SERVER, _("Reset"), wxDefaultPosition, wxDefaultSize, 0 );
-    item6->SetToolTip( _("Click this button to reset the log.") );
-    item4->Add( item6, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+    wxButton *item3 = new wxButton( parent, ID_BTN_RESET_SERVER, _("Reset"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->SetToolTip( _("Click this button to reset the log.") );
+    item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    item0->Add( item4, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     if (set_sizer)
     {
@@ -2767,24 +2499,14 @@
 
     wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticBitmap *item2 = new wxStaticBitmap( parent, -1, amuleDlgImages( 3 ), wxDefaultPosition, wxDefaultSize );
-    item1->Add( item2, 0, wxALIGN_CENTER|wxALL, 5 );
-
-    wxStaticText *item3 = new wxStaticText( parent, -1, _("aMule Log"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
-
-    item0->Add( item1, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxBoxSizer *item4 = new wxBoxSizer( wxHORIZONTAL );
-
-    CMuleTextCtrl *item5 = new CMuleTextCtrl( parent, ID_LOGVIEW, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxVSCROLL );
-    item4->Add( item5, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
+    CMuleTextCtrl *item2 = new CMuleTextCtrl( parent, ID_LOGVIEW, wxT(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY|wxVSCROLL|wxTE_RICH2 );
+    item1->Add( item2, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 5 );
 
-    wxButton *item6 = new wxButton( parent, ID_BTN_RESET, _("Reset"), wxDefaultPosition, wxDefaultSize, 0 );
-    item6->SetToolTip( _("Click this button to reset the log.") );
-    item4->Add( item6, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+    wxButton *item3 = new wxButton( parent, ID_BTN_RESET, _("Reset"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->SetToolTip( _("Click this button to reset the log.") );
+    item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    item0->Add( item4, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     if (set_sizer)
     {
@@ -3038,9 +2760,7 @@
 
     item20->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    wxButton *item37 = new wxButton( parent, ID_KNOWNNODECONNECT, 
-        _("Bootstrap from \nknown clients"),
-        wxDefaultPosition, wxDefaultSize, 0 );
+    wxButton *item37 = new wxButton( parent, ID_KNOWNNODECONNECT, _("Bootstrap from known clients"), wxDefaultPosition, wxDefaultSize, 0 );
     item20->Add( item37, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     item20->Add( 20, 20, 0, wxALIGN_CENTER|wxALL, 5 );
@@ -3066,18 +2786,8 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticBitmap *item2 = new wxStaticBitmap( parent, -1, amuleDlgImages( 28 ), wxDefaultPosition, wxDefaultSize );
-    item1->Add( item2, 0, wxALIGN_CENTER|wxALL, 5 );
-
-    wxStaticText *item3 = new wxStaticText( parent, -1, _("eD2k Info"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
-
-    item0->Add( item1, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxListCtrl *item4 = new wxListCtrl( parent, ID_ED2KINFO, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_NO_HEADER|wxSUNKEN_BORDER );
-    item0->Add( item4, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxListCtrl *item1 = new wxListCtrl( parent, ID_ED2KINFO, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_NO_HEADER|wxSUNKEN_BORDER );
+    item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
     if (set_sizer)
     {
@@ -3093,115 +2803,110 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Protocol Obfuscation") );
-    wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
+    wxCheckBox *item1 = new wxCheckBox( parent, IDC_SECIDENT, _("Use Secure User Identification"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->SetValue( TRUE );
+    item1->SetToolTip( _("It is recommended to enable this option. You will not receive credits if SUI is not enabled.") );
+    item0->Add( item1, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxCheckBox *item3 = new wxCheckBox( parent, IDC_SUPPORT_PO, _("Support Protocol Obfuscation"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->SetValue( TRUE );
-    item3->SetToolTip( _("This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients.") );
-    item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    wxStaticBox *item3 = new wxStaticBox( parent, -1, _("Protocol Obfuscation") );
+    wxStaticBoxSizer *item2 = new wxStaticBoxSizer( item3, wxVERTICAL );
 
-    wxCheckBox *item4 = new wxCheckBox( parent, IDC_ENABLE_PO_OUTGOING, _("Use obfuscation for outgoing connections"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item4 = new wxCheckBox( parent, IDC_SUPPORT_PO, _("Support Protocol Obfuscation"), wxDefaultPosition, wxDefaultSize, 0 );
     item4->SetValue( TRUE );
-    item4->SetToolTip( _("This option makes aMule use Protocol Obfuscation when connecting other clients/servers.") );
-    item1->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
+    item4->SetToolTip( _("This option enabled Protocol Obfuscation, and makes aMule accept obfuscated connections from other clients.") );
+    item2->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxCheckBox *item5 = new wxCheckBox( parent, IDC_ENFORCE_PO_INCOMING, _("Accept only obfuscated connections"), wxDefaultPosition, wxDefaultSize, 0 );
-    item5->SetToolTip( _("This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated") );
-    item1->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
+    wxCheckBox *item5 = new wxCheckBox( parent, IDC_ENABLE_PO_OUTGOING, _("Use obfuscation for outgoing connections"), wxDefaultPosition, wxDefaultSize, 0 );
+    item5->SetValue( TRUE );
+    item5->SetToolTip( _("This option makes aMule use Protocol Obfuscation when connecting other clients/servers.") );
+    item2->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
 
-    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxCheckBox *item6 = new wxCheckBox( parent, IDC_ENFORCE_PO_INCOMING, _("Accept only obfuscated connections"), wxDefaultPosition, wxDefaultSize, 0 );
+    item6->SetToolTip( _("This option makes aMule only accept obfuscated connections. You will have less sources, but all your traffic will be obfuscated") );
+    item2->Add( item6, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
 
-    wxStaticBox *item7 = new wxStaticBox( parent, -1, _("File Options") );
-    wxStaticBoxSizer *item6 = new wxStaticBoxSizer( item7, wxVERTICAL );
+    item0->Add( item2, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxTOP, 0 );
 
-    wxString strs8[] = 
+    wxString strs7[] = 
     {
         _("Everybody"), 
         _("Friends"), 
         _("No one")
     };
-    wxRadioBox *item8 = new wxRadioBox( parent, IDC_SEESHARES, _("Who can see shared files:"), wxDefaultPosition, wxDefaultSize, 3, strs8, 1, wxRA_SPECIFY_COLS );
-    item8->SetToolTip( _("Select who can request to view a list of your shared files.") );
-    item6->Add( item8, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxRadioBox *item7 = new wxRadioBox( parent, IDC_SEESHARES, _("Who can see my shared files:"), wxDefaultPosition, wxDefaultSize, 3, strs7, 1, wxRA_SPECIFY_COLS );
+    item7->SetToolTip( _("Select who can request to view a list of your shared files.") );
+    item0->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    item0->Add( item6, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxStaticBox *item9 = new wxStaticBox( parent, -1, _("IP-Filtering") );
+    wxStaticBoxSizer *item8 = new wxStaticBoxSizer( item9, wxVERTICAL );
 
-    wxStaticBox *item10 = new wxStaticBox( parent, -1, _("IP-Filtering") );
-    wxStaticBoxSizer *item9 = new wxStaticBoxSizer( item10, wxVERTICAL );
+    wxBoxSizer *item10 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer *item11 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer *item11 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer *item12 = new wxBoxSizer( wxVERTICAL );
+    wxCheckBox *item12 = new wxCheckBox( parent, IDC_IPFCLIENTS, _("Filter clients"), wxDefaultPosition, wxDefaultSize, 0 );
+    item12->SetValue( TRUE );
+    item12->SetToolTip( _("Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat.") );
+    item11->Add( item12, 0, wxGROW|wxALL, 0 );
 
-    wxCheckBox *item13 = new wxCheckBox( parent, IDC_IPFCLIENTS, _("Filter clients"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item13 = new wxCheckBox( parent, IDC_IPFSERVERS, _("Filter servers"), wxDefaultPosition, wxDefaultSize, 0 );
     item13->SetValue( TRUE );
-    item13->SetToolTip( _("Enable filtering of the client IPs defined in the file ~/.aMule/ipfilter.dat.") );
-    item12->Add( item13, 0, wxGROW|wxALL, 0 );
+    item13->SetToolTip( _("Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat.") );
+    item11->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxCheckBox *item14 = new wxCheckBox( parent, IDC_IPFSERVERS, _("Filter servers"), wxDefaultPosition, wxDefaultSize, 0 );
-    item14->SetValue( TRUE );
-    item14->SetToolTip( _("Enable filtering of the server IPs defined in the file ~/.aMule/ipfilter.dat.") );
-    item12->Add( item14, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
+    item10->Add( item11, 0, wxALIGN_CENTER|wxALL, 0 );
 
-    item11->Add( item12, 0, wxALIGN_CENTER|wxALL, 5 );
+    item10->Add( 10, 10, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 0 );
 
-    item11->Add( 10, 10, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL, 0 );
+    wxButton *item14 = new wxButton( parent, IDC_IPFRELOAD, _("Reload List"), wxDefaultPosition, wxDefaultSize, 0 );
+    item14->SetToolTip( _("Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat") );
+    item10->Add( item14, 0, wxALIGN_CENTER|wxRIGHT|wxTOP|wxBOTTOM, 5 );
 
-    wxButton *item15 = new wxButton( parent, IDC_IPFRELOAD, _("Reload List"), wxDefaultPosition, wxDefaultSize, 0 );
-    item15->SetToolTip( _("Reload the list of IPs to filter from the file ~/.aMule/ipfilter.dat") );
-    item11->Add( item15, 0, wxALIGN_CENTER|wxALL, 5 );
+    item8->Add( item10, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    item9->Add( item11, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    wxFlexGridSizer *item15 = new wxFlexGridSizer( 3, 0, 0 );
+    item15->AddGrowableCol( 1 );
 
-    wxFlexGridSizer *item16 = new wxFlexGridSizer( 3, 0, 0 );
-    item16->AddGrowableCol( 1 );
+    wxStaticText *item16 = new wxStaticText( parent, -1, _("URL:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Add( item16, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
 
-    wxStaticText *item17 = new wxStaticText( parent, -1, _("URL:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item16->Add( item17, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
+    wxTextCtrl *item17 = new wxTextCtrl( parent, IDC_IPFILTERURL, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
+    item15->Add( item17, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
 
-    wxTextCtrl *item18 = new wxTextCtrl( parent, IDC_IPFILTERURL, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
-    item16->Add( item18, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+    wxButton *item18 = new wxButton( parent, IDC_IPFILTERUPDATE, _("Update now"), wxDefaultPosition, wxDefaultSize, 0 );
+    item15->Add( item18, 0, wxALIGN_CENTER|wxLEFT, 5 );
 
-    wxButton *item19 = new wxButton( parent, IDC_IPFILTERUPDATE, _("Update now"), wxDefaultPosition, wxDefaultSize, 0 );
-    item16->Add( item19, 0, wxALIGN_CENTER|wxLEFT, 5 );
+    item8->Add( item15, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    item9->Add( item16, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxCheckBox *item19 = new wxCheckBox( parent, IDC_AUTOIPFILTER, _("Auto-update ipfilter at startup"), wxDefaultPosition, wxDefaultSize, 0 );
+    item8->Add( item19, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxCheckBox *item20 = new wxCheckBox( parent, IDC_AUTOIPFILTER, _("Auto-update ipfilter at startup"), wxDefaultPosition, wxDefaultSize, 0 );
-    item9->Add( item20, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    wxBoxSizer *item20 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxBoxSizer *item21 = new wxBoxSizer( wxHORIZONTAL );
+    wxStaticText *item21 = new wxStaticText( parent, -1, _("Filtering Level:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item20->Add( item21, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxStaticText *item22 = new wxStaticText( parent, -1, _("Filtering Level:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item21->Add( item22, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item20->Add( 10, 10, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
 
-    item21->Add( 10, 10, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+    wxSpinCtrl *item22 = new wxSpinCtrl( parent, ID_IPFILTERLEVEL, wxT("0"), wxDefaultPosition, wxDefaultSize, 0, 0, 255, 0 );
+    item20->Add( item22, 0, wxALIGN_CENTER|wxALL, 5 );
 
-    wxSpinCtrl *item23 = new wxSpinCtrl( parent, ID_IPFILTERLEVEL, wxT("0"), wxDefaultPosition, wxDefaultSize, 0, 0, 255, 0 );
-    item21->Add( item23, 0, wxALIGN_CENTER|wxALL, 5 );
+    item8->Add( item20, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 0 );
 
-    item9->Add( item21, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 0 );
+    wxCheckBox *item23 = new wxCheckBox( parent, IDC_FILTERLAN, _("Always filter LAN IPs"), wxDefaultPosition, wxDefaultSize, 0 );
+    item23->SetValue( TRUE );
+    item8->Add( item23, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxCheckBox *item24 = new wxCheckBox( parent, IDC_FILTERLAN, _("Always filter LAN IPs"), wxDefaultPosition, wxDefaultSize, 0 );
+    wxCheckBox *item24 = new wxCheckBox( parent, IDC_PARANOID, _("Paranoid handling of non-matching IPs"), wxDefaultPosition, wxDefaultSize, 0 );
     item24->SetValue( TRUE );
-    item9->Add( item24, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    item24->SetToolTip( _("Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution.") );
+    item8->Add( item24, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    wxCheckBox *item25 = new wxCheckBox( parent, IDC_PARANOID, _("Paranoid handling of non-matching IPs"), wxDefaultPosition, wxDefaultSize, 0 );
-    item25->SetValue( TRUE );
-    item25->SetToolTip( _("Rejects packet if the client ip is different from the ip where the packet is received from. Use with caution.") );
-    item9->Add( item25, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    wxCheckBox *item26 = new wxCheckBox( parent, IDC_IPFILTERSYS, _("Use system-wide ipfilter.dat if available"), wxDefaultPosition, wxDefaultSize, 0 );
-    item26->SetToolTip( _("If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter file.") );
-    item9->Add( item26, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
-
-    wxCheckBox *item27 = new wxCheckBox( parent, IDC_SECIDENT, _("Use Secure User Identification"), wxDefaultPosition, wxDefaultSize, 0 );
-    item27->SetValue( TRUE );
-    item27->SetToolTip( _("It is recommended to enable this option. You will not receive credits if SUI is not enabled.") );
-    item9->Add( item27, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+    wxCheckBox *item25 = new wxCheckBox( parent, IDC_IPFILTERSYS, _("Use system-wide ipfilter.dat if available"), wxDefaultPosition, wxDefaultSize, 0 );
+    item25->SetToolTip( _("If there's no local ipfilter.dat found, allow usage of a systemwide ipfilter file.") );
+    item8->Add( item25, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
 
-    item0->Add( item9, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item8, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
 
     if (set_sizer)
     {
@@ -3217,39 +2922,37 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticBox *item2 = new wxStaticBox( parent, -1, wxT("") );
-    wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
-
-    wxCheckBox *item3 = new wxCheckBox( parent, IDC_ONLINESIG, _("Enable Online-Signature"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->SetValue( TRUE );
-    item3->SetToolTip( _("Enables the writing of the OS file, which can be used by external apps to create signatures and the like.") );
-    item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxCheckBox *item1 = new wxCheckBox( parent, IDC_ONLINESIG, _("Enable Online-Signature"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->SetValue( TRUE );
+    item1->SetToolTip( _("Enables the writing of the OS file, which can be used by external apps to create signatures and the like.") );
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP, 0 );
 
-    wxBoxSizer *item4 = new wxBoxSizer( wxHORIZONTAL );
+    wxBoxSizer *item2 = new wxBoxSizer( wxHORIZONTAL );
 
-    wxStaticText *item5 = new wxStaticText( parent, -1, _("Update Frequency (Secs):"), wxDefaultPosition, wxDefaultSize, 0 );
-    item4->Add( item5, 0, wxALIGN_CENTER|wxALL, 5 );
+    wxStaticText *item3 = new wxStaticText( parent, -1, _("Update Frequency (Secs):"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item3, 0, wxALIGN_CENTER|wxALL, 0 );
 
-    wxSpinCtrl *item6 = new wxSpinCtrl( parent, IDC_OSUPDATE, wxT("5"), wxDefaultPosition, wxSize(60,-1), 0, 0, 600, 5 );
-    item6->SetToolTip( _("Change the frequency (in seconds) of Online Signature updates.") );
-    item6->Enable( false );
-    item4->Add( item6, 0, wxALIGN_CENTER|wxALL, 5 );
+    wxSpinCtrl *item4 = new wxSpinCtrl( parent, IDC_OSUPDATE, wxT("5"), wxDefaultPosition, wxSize(60,-1), 0, 0, 600, 5 );
+    item4->SetToolTip( _("Change the frequency (in seconds) of Online Signature updates.") );
+    item4->Enable( false );
+    item2->Add( item4, 0, wxALIGN_CENTER|wxALL, 0 );
 
-    item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL, 5 );
+    item0->Add( item2, 0, wxALIGN_CENTER_VERTICAL, 0 );
 
-    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxFlexGridSizer *item5 = new wxFlexGridSizer( 3, 0, 0 );
+    item5->AddGrowableCol( 1 );
 
-    wxStaticBox *item8 = new wxStaticBox( parent, -1, _("Online Signature Directory:") );
-    wxStaticBoxSizer *item7 = new wxStaticBoxSizer( item8, wxHORIZONTAL );
+    wxStaticText *item6 = new wxStaticText( parent, -1, _("Save online signature file in: "), wxDefaultPosition, wxDefaultSize, 0 );
+    item5->Add( item6, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    CMuleTextCtrl *item9 = new CMuleTextCtrl( parent, IDC_OSDIR, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
-    item7->Add( item9, 1, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+    CMuleTextCtrl *item7 = new CMuleTextCtrl( parent, IDC_OSDIR, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
+    item5->Add( item7, 0, wxALIGN_CENTER, 5 );
 
-    wxButton *item10 = new wxButton( parent, IDC_SELOSDIR, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
-    item10->SetToolTip( _("Click here to select the directory containing the the Online Signature files.") );
-    item7->Add( item10, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );
+    wxButton *item8 = new wxButton( parent, IDC_SELOSDIR, _("Browse"), wxDefaultPosition, wxDefaultSize, 0 );
+    item8->SetToolTip( _("Click here to select the directory containing the the Online Signature files.") );
+    item5->Add( item8, 0, wxGROW|wxALIGN_CENTER_HORIZONTAL|wxALL, 0 );
 
-    item0->Add( item7, 0, wxGROW|wxALL, 5 );
+    item0->Add( item5, 0, wxGROW|wxALL, 0 );
 
     if (set_sizer)
     {
@@ -3261,60 +2964,48 @@
     return item0;
 }
 
-wxSizer *PreferencesMessagesTab( wxWindow *parent, bool call_fit, bool set_sizer )
+wxSizer *PreferencesFilteringTab( wxWindow *parent, bool call_fit, bool set_sizer )
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Disable/Enable") );
+    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Messages") );
     wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
 
     wxCheckBox *item3 = new wxCheckBox( parent, IDC_MSGFILTER, _("Filter incoming messages (except current chat):"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item1->Add( item3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxStaticBox *item5 = new wxStaticBox( parent, -1, _("Filtering Options:") );
-    wxStaticBoxSizer *item4 = new wxStaticBoxSizer( item5, wxVERTICAL );
+    wxCheckBox *item4 = new wxCheckBox( parent, IDC_MSGFILTER_ALL, _("Filter all messages"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
 
-    wxCheckBox *item6 = new wxCheckBox( parent, IDC_MSGFILTER_ALL, _("Filter all messages"), wxDefaultPosition, wxDefaultSize, 0 );
-    item4->Add( item6, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
+    wxCheckBox *item5 = new wxCheckBox( parent, IDC_MSGFILTER_NONFRIENDS, _("Filter messages from people not on your friend list"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item5, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
 
-    wxCheckBox *item7 = new wxCheckBox( parent, IDC_MSGFILTER_NONFRIENDS, _("Filter messages from people not on your friend list"), wxDefaultPosition, wxDefaultSize, 0 );
-    item4->Add( item7, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
+    wxCheckBox *item6 = new wxCheckBox( parent, IDC_MSGFILTER_NONSECURE, _("Filter messages from unknown clients"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item6, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
 
-    wxCheckBox *item8 = new wxCheckBox( parent, IDC_MSGFILTER_NONSECURE, _("Filter messages from unknown clients"), wxDefaultPosition, wxDefaultSize, 0 );
-    item4->Add( item8, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
+    wxCheckBox *item7 = new wxCheckBox( parent, IDC_MSGFILTER_WORD, _("Filter messages containing (use ',' as separator):"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item7, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
 
-    wxCheckBox *item9 = new wxCheckBox( parent, IDC_MSGFILTER_WORD, _("Filter messages containing (use ',' as separator):"), wxDefaultPosition, wxDefaultSize, 0 );
-    item4->Add( item9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 25 );
+    wxTextCtrl *item8 = new wxTextCtrl( parent, IDC_MSGWORD, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
+    item8->SetToolTip( _("add here the words amule should filter and block messages including it") );
+    item1->Add( item8, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 50 );
 
-    wxTextCtrl *item10 = new wxTextCtrl( parent, IDC_MSGWORD, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
-    item10->SetToolTip( _("add here the words amule should filter and block messages including it") );
-    item4->Add( item10, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 50 );
+    wxCheckBox *item9 = new wxCheckBox( parent, IDC_MSGLOG, _("Show received messages in the log"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    item1->Add( item4, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxStaticBox *item11 = new wxStaticBox( parent, -1, _("Comments") );
+    wxStaticBoxSizer *item10 = new wxStaticBoxSizer( item11, wxVERTICAL );
 
-    wxBoxSizer *item11 = new wxBoxSizer( wxHORIZONTAL );
+    wxCheckBox *item12 = new wxCheckBox( parent, IDC_FILTERCOMMENTS, _("Filter comments containing (use ',' as separator):"), wxDefaultPosition, wxDefaultSize, 0 );
+    item10->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxStaticBitmap *item12 = new wxStaticBitmap( parent, -1, amuleSpecial( 23 ), wxDefaultPosition, wxDefaultSize );
-    item11->Add( item12, 0, wxALIGN_CENTER|wxALL, 5 );
+    wxTextCtrl *item13 = new wxTextCtrl( parent, IDC_COMMENTWORD, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
+    item13->SetToolTip( _("add here the words amule should filter and block messages including it") );
+    item10->Add( item13, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 50 );
 
-    wxStaticText *item13 = new wxStaticText( parent, -1, _("Comments"), wxDefaultPosition, wxDefaultSize, 0 );
-    item11->Add( item13, 0, wxALIGN_CENTER|wxALL, 5 );
-
-    item0->Add( item11, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxStaticBox *item15 = new wxStaticBox( parent, -1, _("Disable/Enable") );
-    wxStaticBoxSizer *item14 = new wxStaticBoxSizer( item15, wxVERTICAL );
-
-    wxCheckBox *item16 = new wxCheckBox( parent, IDC_FILTERCOMMENTS, _("Filter comments containing (use ',' as separator):"), wxDefaultPosition, wxDefaultSize, 0 );
-    item14->Add( item16, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    wxTextCtrl *item17 = new wxTextCtrl( parent, IDC_COMMENTWORD, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
-    item17->SetToolTip( _("add here the words amule should filter and block messages including it") );
-    item14->Add( item17, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 50 );
-
-    item0->Add( item14, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item10, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
     if (set_sizer)
     {
@@ -3330,80 +3021,66 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("General") );
-    wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
+    wxCheckBox *item1 = new wxCheckBox( parent, ID_PROXY_AUTO_SERVER_CONNECT_WITHOUT_PROXY, _("Automatic server connect without proxy"), wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( item1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxFlexGridSizer *item3 = new wxFlexGridSizer( 2, 0, 0 );
-    item3->AddGrowableCol( 1 );
+    wxFlexGridSizer *item2 = new wxFlexGridSizer( 2, 0, 0 );
+    item2->AddGrowableCol( 1 );
 
-    wxCheckBox *item4 = new wxCheckBox( parent, ID_PROXY_ENABLE_PROXY, _("Enable Proxy"), wxDefaultPosition, wxDefaultSize, 0 );
-    item4->SetToolTip( _("Enable/disable proxy support") );
-    item3->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxCheckBox *item3 = new wxCheckBox( parent, ID_PROXY_ENABLE_PASSWORD, _("Enable authentication"), wxDefaultPosition, wxDefaultSize, 0 );
+    item3->SetToolTip( _("Enable/disable username/password authentication") );
+    item2->Add( item3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    item3->Add( 20, 20, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item2->Add( 20, 20, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxStaticText *item5 = new wxStaticText( parent, -1, _("Proxy type:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->Add( item5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxStaticText *item4 = new wxStaticText( parent, -1, _("Username: "), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 
-    wxString strs6[] = 
-    {
-        _("SOCKS5"), 
-        _("SOCKS4"), 
-        _("HTTP"), 
-        _("SOCKS4a")
-    };
-    wxChoice *item6 = new wxChoice( parent, ID_PROXY_TYPE, wxDefaultPosition, wxSize(100,-1), 4, strs6, 0 );
-    item6->SetToolTip( _("The type of proxy you are connecting to") );
-    item3->Add( item6, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    wxStaticText *item7 = new wxStaticText( parent, -1, _("Proxy host:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->Add( item7, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    wxTextCtrl *item8 = new wxTextCtrl( parent, ID_PROXY_NAME, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
-    item8->SetToolTip( _("The proxy host name") );
-    item3->Add( item8, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    wxStaticText *item9 = new wxStaticText( parent, -1, _("Proxy port:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item3->Add( item9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    wxTextCtrl *item10 = new wxTextCtrl( parent, ID_PROXY_PORT, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
-    item10->SetToolTip( _("The proxy port") );
-    item3->Add( item10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxTextCtrl *item5 = new wxTextCtrl( parent, ID_PROXY_USER, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
+    item5->SetToolTip( _("The username to use to connect to the proxy") );
+    item2->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    item1->Add( item3, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxStaticText *item6 = new wxStaticText( parent, -1, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item6, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 
-    wxStaticBox *item12 = new wxStaticBox( parent, -1, _("Authentication") );
-    wxStaticBoxSizer *item11 = new wxStaticBoxSizer( item12, wxVERTICAL );
+    wxTextCtrl *item7 = new wxTextCtrl( parent, ID_PROXY_PASSWORD, wxT(""), wxDefaultPosition, wxSize(80,-1), wxTE_PASSWORD );
+    item7->SetToolTip( _("The password to use to connect to the proxy") );
+    item2->Add( item7, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxCheckBox *item13 = new wxCheckBox( parent, ID_PROXY_ENABLE_PASSWORD, _("Enable authentication"), wxDefaultPosition, wxDefaultSize, 0 );
-    item13->SetToolTip( _("Enable/disable username/password authentication") );
-    item11->Add( item13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxCheckBox *item8 = new wxCheckBox( parent, ID_PROXY_ENABLE_PROXY, _("Enable Proxy"), wxDefaultPosition, wxDefaultSize, 0 );
+    item8->SetToolTip( _("Enable/disable proxy support") );
+    item2->Add( item8, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    wxFlexGridSizer *item14 = new wxFlexGridSizer( 2, 0, 0 );
-    item14->AddGrowableCol( 1 );
+    item2->Add( 20, 20, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxStaticText *item15 = new wxStaticText( parent, -1, _("Username:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item14->Add( item15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxStaticText *item9 = new wxStaticText( parent, -1, _("Proxy type:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 
-    wxTextCtrl *item16 = new wxTextCtrl( parent, ID_PROXY_USER, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
-    item16->SetToolTip( _("The username to use to connect to the proxy") );
-    item14->Add( item16, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxString strs10[] = 
+    {
+        wxT("SOCKS5"), 
+        wxT("SOCKS4"), 
+        wxT("HTTP"), 
+        wxT("SOCKS4a")
+    };
+    wxChoice *item10 = new wxChoice( parent, ID_PROXY_TYPE, wxDefaultPosition, wxSize(100,-1), 4, strs10, 0 );
+    item2->Add( item10, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP, 5 );
 
-    wxStaticText *item17 = new wxStaticText( parent, -1, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 );
-    item14->Add( item17, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxStaticText *item11 = new wxStaticText( parent, -1, _("Proxy host:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item11, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 
-    wxTextCtrl *item18 = new wxTextCtrl( parent, ID_PROXY_PASSWORD, wxT(""), wxDefaultPosition, wxSize(80,-1), wxTE_PASSWORD );
-    item18->SetToolTip( _("The password to use to connect to the proxy") );
-    item14->Add( item18, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxTextCtrl *item12 = new wxTextCtrl( parent, ID_PROXY_NAME, wxT(""), wxDefaultPosition, wxDefaultSize, 0 );
+    item12->SetToolTip( _("The proxy host name") );
+    item2->Add( item12, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP, 5 );
 
-    item11->Add( item14, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxStaticText *item13 = new wxStaticText( parent, -1, _("Proxy port:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item13, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 20 );
 
-    item0->Add( item11, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxTextCtrl *item14 = new wxTextCtrl( parent, ID_PROXY_PORT, wxT(""), wxDefaultPosition, wxSize(80,-1), 0 );
+    item14->SetToolTip( _("The proxy port") );
+    item2->Add( item14, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxTOP, 5 );
 
-    wxCheckBox *item19 = new wxCheckBox( parent, ID_PROXY_AUTO_SERVER_CONNECT_WITHOUT_PROXY, _("Automatic server connect without proxy"), wxDefaultPosition, wxSize(350,-1), 0 );
-    item0->Add( item19, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item2, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
     if (set_sizer)
     {
@@ -3486,22 +3163,17 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Disable/Enable") );
-    wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
-
-    wxCheckBox *item3 = new wxCheckBox( parent, ID_VERBOSEDEBUG, _("Enable Verbose Debug-Logging."), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxCheckBox *item1 = new wxCheckBox( parent, ID_VERBOSEDEBUG, _("Enable Verbose Debug-Logging."), wxDefaultPosition, wxDefaultSize, 0 );
+    item0->Add( item1, 0, wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
-    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxStaticBox *item3 = new wxStaticBox( parent, -1, _("Message Categories:") );
+    wxStaticBoxSizer *item2 = new wxStaticBoxSizer( item3, wxVERTICAL );
 
-    wxStaticBox *item5 = new wxStaticBox( parent, -1, _("Message Categories:") );
-    wxStaticBoxSizer *item4 = new wxStaticBoxSizer( item5, wxVERTICAL );
+    wxWindow *item4 = new wxCheckListBox( parent, ID_DEBUGCATS );
+    wxASSERT( item4 );
+    item2->Add( item4, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
-    wxWindow *item6 = new wxCheckListBox( parent, ID_DEBUGCATS );
-    wxASSERT( item6 );
-    item4->Add( item6, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
-
-    item0->Add( item4, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    item0->Add( item2, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0 );
 
     if (set_sizer)
     {
@@ -3576,18 +3248,8 @@
 {
     wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
 
-    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
-
-    wxStaticBitmap *item2 = new wxStaticBitmap( parent, -1, amuleDlgImages( 28 ), wxDefaultPosition, wxDefaultSize );
-    item1->Add( item2, 0, wxALIGN_CENTER|wxALL, 5 );
-
-    wxStaticText *item3 = new wxStaticText( parent, -1, _("Kad Info"), wxDefaultPosition, wxDefaultSize, 0 );
-    item1->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
-
-    item0->Add( item1, 0, wxALIGN_CENTER_VERTICAL, 5 );
-
-    wxListCtrl *item4 = new wxListCtrl( parent, ID_KADINFO, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_NO_HEADER|wxSUNKEN_BORDER );
-    item0->Add( item4, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxListCtrl *item1 = new wxListCtrl( parent, ID_KADINFO, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_NO_HEADER|wxSUNKEN_BORDER );
+    item0->Add( item1, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
     if (set_sizer)
     {
@@ -3636,16 +3298,213 @@
 wxSizer *IDC_PREFS_EVENTS_PAGE;
 wxSizer *PreferencesEventsTab( wxWindow *parent, bool call_fit, bool set_sizer )
 {
-    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+    wxStaticBox *item1 = new wxStaticBox( parent, -1, _("Event Types") );
+    wxStaticBoxSizer *item0 = new wxStaticBoxSizer( item1, wxVERTICAL );
     IDC_PREFS_EVENTS_PAGE = item0;
 
-    wxStaticBox *item2 = new wxStaticBox( parent, -1, _("Event types") );
-    wxStaticBoxSizer *item1 = new wxStaticBoxSizer( item2, wxVERTICAL );
+    wxListCtrl *item2 = new wxListCtrl( parent, IDC_EVENTLIST, wxDefaultPosition, wxSize(160,120), wxLC_REPORT|wxLC_NO_HEADER|wxLC_SINGLE_SEL|wxSUNKEN_BORDER );
+    item0->Add( item2, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    if (set_sizer)
+    {
+        parent->SetSizer( item0 );
+        if (call_fit)
+            item0->SetSizeHints( parent );
+    }
+    
+    return item0;
+}
 
-    wxListCtrl *item3 = new wxListCtrl( parent, IDC_EVENTLIST, wxDefaultPosition, wxSize(160,120), wxLC_REPORT|wxLC_NO_HEADER|wxLC_SINGLE_SEL|wxSUNKEN_BORDER );
-    item1->Add( item3, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+wxSizer *s_sharedfilespeerHeader;
+wxSizer *sharedfilesBottomDlg( wxWindow *parent, bool call_fit, bool set_sizer )
+{
+    wxStaticBox *item1 = new wxStaticBox( parent, -1, _("Statistics and queued clients for selected file(s) : Session / All time") );
+    wxStaticBoxSizer *item0 = new wxStaticBoxSizer( item1, wxVERTICAL );
 
-    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+    wxFlexGridSizer *item2 = new wxFlexGridSizer( 4, 0, 0 );
+    item2->AddGrowableCol( 1 );
+    item2->AddGrowableCol( 2 );
+    item2->AddGrowableCol( 3 );
+    s_sharedfilespeerHeader = item2;
+
+    wxBitmapButton *item3 = new wxBitmapButton( parent, ID_SHAREDCLIENTTOGGLE, amuleDlgImages( 10 ), wxDefaultPosition, wxDefaultSize );
+    item2->Add( item3, 0, wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxFlexGridSizer *item4 = new wxFlexGridSizer( 3, 0, 0 );
+    item4->AddGrowableCol( 1 );
+    item4->AddGrowableCol( 2 );
+
+    wxStaticText *item5 = new wxStaticText( parent, -1, _("Requested"), wxDefaultPosition, wxDefaultSize, 0 );
+    item4->Add( item5, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
+
+    wxStaticText *item6 = new wxStaticText( parent, IDC_SREQUESTED, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    item6->SetForegroundColour( *wxBLUE );
+    item4->Add( item6, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+
+    item2->Add( item4, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    wxFlexGridSizer *item7 = new wxFlexGridSizer( 3, 0, 0 );
+
+    wxStaticText *item8 = new wxStaticText( parent, -1, _("Active Uploads"), wxDefaultPosition, wxDefaultSize, 0 );
+    item7->Add( item8, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
+
+    wxStaticText *item9 = new wxStaticText( parent, IDC_SACCEPTED, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    item9->SetForegroundColour( *wxBLUE );
+    item7->Add( item9, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+
+    item2->Add( item7, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    wxFlexGridSizer *item10 = new wxFlexGridSizer( 3, 0, 0 );
+
+    wxStaticText *item11 = new wxStaticText( parent, -1, _("Transferred"), wxDefaultPosition, wxDefaultSize, 0 );
+    item10->Add( item11, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
+
+    wxStaticText *item12 = new wxStaticText( parent, IDC_STRANSFERRED, _("N/A"), wxDefaultPosition, wxDefaultSize, 0 );
+    item12->SetForegroundColour( *wxBLUE );
+    item10->Add( item12, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
+
+    item2->Add( item10, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    wxStaticText *item13 = new wxStaticText( parent, -1, _("Percent of total files"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->Add( item13, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
+
+    wxGauge *item14 = new wxGauge( parent, -1, 100, wxDefaultPosition, wxSize(200,18), 0 );
+    item14->SetName( wxT("popbar") );
+    item2->Add( item14, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
+
+    wxGauge *item15 = new wxGauge( parent, -1, 100, wxDefaultPosition, wxSize(200,18), 0 );
+    item15->SetName( wxT("popbarAccept") );
+    item2->Add( item15, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
+
+    wxGauge *item16 = new wxGauge( parent, -1, 100, wxDefaultPosition, wxSize(200,18), 0 );
+    item16->SetName( wxT("popbarTrans") );
+    item2->Add( item16, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
+
+    item0->Add( item2, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+
+    wxStaticLine *item17 = new wxStaticLine( parent, ID_LINE, wxDefaultPosition, wxSize(20,-1), wxLI_HORIZONTAL );
+    item0->Add( item17, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+    CSharedFilePeersListCtrl *item18 = new CSharedFilePeersListCtrl( parent, ID_SHAREDCLIENTLIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
+    item18->SetName( wxT("sharedFilesSrcCt") );
+    item0->Add( item18, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+
+    if (set_sizer)
+    {
+        parent->SetSizer( item0 );
+        if (call_fit)
+            item0->SetSizeHints( parent );
+    }
+    
+    return item0;
+}
+
+wxSizer *sharedfilesTopDlg( wxWindow *parent, bool call_fit, bool set_sizer )
+{
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+
+    wxFlexGridSizer *item1 = new wxFlexGridSizer( 4, 0, 0 );
+    item1->AddGrowableCol( 1 );
+
+    wxStaticText *item2 = new wxStaticText( parent, -1, _("Shared files"), wxDefaultPosition, wxDefaultSize, 0 );
+    item2->SetName( wxT("sharedFilesLabel") );
+    item1->Add( item2, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    wxString strs3[] = 
+    {
+        _("All files"), 
+        _("Selected files"), 
+        _("Active uploads only")
+    };
+    wxRadioBox *item3 = new wxRadioBox( parent, ID_SHOW_CLIENTS_MODE, _("Show Clients for"), wxDefaultPosition, wxDefaultSize, 3, strs3, 1, wxNO_BORDER|wxRA_SPECIFY_ROWS );
+    item1->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    wxStaticText *item4 = new wxStaticText( parent, -1, _("Reload:"), wxDefaultPosition, wxDefaultSize, 0 );
+    item4->SetName( wxT("sharedFilesLabel") );
+    item1->Add( item4, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
+
+    wxBitmapButton *item5 = new wxBitmapButton( parent, ID_BTNRELSHARED, amuleDlgImages( 18 ), wxDefaultPosition, wxSize(32,32) );
+    item5->SetToolTip( _("Reload your shared files") );
+    item1->Add( item5, 0, wxALIGN_CENTER_VERTICAL, 0 );
+
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 0 );
+
+    CSharedFilesCtrl *item6 = new CSharedFilesCtrl( parent, ID_SHFILELIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxSUNKEN_BORDER );
+    item6->SetName( wxT("sharedFilesCt") );
+    item0->Add( item6, 1, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+
+    if (set_sizer)
+    {
+        parent->SetSizer( item0 );
+        if (call_fit)
+            item0->SetSizeHints( parent );
+    }
+    
+    return item0;
+}
+
+wxSizer *messagePageFriends( wxWindow *parent, bool call_fit, bool set_sizer )
+{
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticBitmap *item2 = new wxStaticBitmap( parent, -1, amuleDlgImages( 14 ), wxDefaultPosition, wxDefaultSize );
+    item1->Add( item2, 0, wxALIGN_CENTER, 5 );
+
+    wxStaticText *item3 = new wxStaticText( parent, -1, _("Friends"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item3, 0, wxALIGN_CENTER|wxLEFT|wxTOP|wxBOTTOM, 5 );
+
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+
+    CFriendListCtrl *item4 = new CFriendListCtrl( parent, ID_FRIENDLIST, wxDefaultPosition, wxSize(160,150), wxLC_REPORT|wxSUNKEN_BORDER );
+    item0->Add( item4, 1, wxFIXED_MINSIZE|wxGROW|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxBOTTOM, 5 );
+
+    if (set_sizer)
+    {
+        parent->SetSizer( item0 );
+        if (call_fit)
+            item0->SetSizeHints( parent );
+    }
+    
+    return item0;
+}
+
+wxSizer *messagePageMessages( wxWindow *parent, bool call_fit, bool set_sizer )
+{
+    wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL );
+
+    wxBoxSizer *item1 = new wxBoxSizer( wxHORIZONTAL );
+
+    wxStaticBitmap *item2 = new wxStaticBitmap( parent, -1, amuleDlgImages( 15 ), wxDefaultPosition, wxDefaultSize );
+    item1->Add( item2, 0, wxALIGN_CENTER, 5 );
+
+    wxStaticText *item3 = new wxStaticText( parent, -1, _("Messages"), wxDefaultPosition, wxDefaultSize, 0 );
+    item1->Add( item3, 0, wxALIGN_CENTER|wxALL, 5 );
+
+    item0->Add( item1, 0, wxGROW|wxALIGN_CENTER_VERTICAL, 5 );
+
+    CChatSelector *item4 = new CChatSelector(parent, IDC_CHATSELECTOR,wxDefaultPosition,wxSize(200,32),0L);
+    wxASSERT( item4 );
+    item0->Add( item4, 1, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT, 0 );
+
+    wxBoxSizer *item5 = new wxBoxSizer( wxHORIZONTAL );
+
+    CMuleTextCtrl *item6 = new CMuleTextCtrl( parent, IDC_CMESSAGE, wxT(""), wxDefaultPosition, wxSize(80,-1), wxTE_PROCESS_ENTER );
+    item6->Enable( false );
+    item5->Add( item6, 1, wxALIGN_CENTER, 5 );
+
+    wxButton *item7 = new wxButton( parent, IDC_CSEND, _("Send"), wxDefaultPosition, wxDefaultSize, 0 );
+    item7->SetToolTip( _("Sends the specified message.") );
+    item7->Enable( false );
+    item5->Add( item7, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, 5 );
+
+    wxButton *item8 = new wxButton( parent, IDC_CCLOSE, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
+    item8->SetToolTip( _("Close this chat-session.") );
+    item8->Enable( false );
+    item5->Add( item8, 0, wxALIGN_CENTER, 5 );
+
+    item0->Add( item5, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM, 5 );
 
     if (set_sizer)
     {
@@ -3669,8 +3528,8 @@
     parent->AddSeparator();
     parent->AddTool( ID_BUTTONNETWORKS, _("Networks"), amuleDlgImages( 20 ), wxNullBitmap, wxITEM_CHECK, _("Networks Window") );
     parent->AddTool( ID_BUTTONSEARCH, _("Searches"), amuleDlgImages( 22 ), wxNullBitmap, wxITEM_CHECK, _("Searches Window") );
-    parent->AddTool( ID_BUTTONTRANSFER, _("Transfers"), amuleDlgImages( 21 ), wxNullBitmap, wxITEM_CHECK, _("Files Transfers Window") );
-    parent->ToggleTool( ID_BUTTONTRANSFER, TRUE );
+    parent->AddTool( ID_BUTTONDOWNLOADS, _("Downloads"), amuleDlgImages( 21 ), wxNullBitmap, wxITEM_CHECK, _("Downloads Window") );
+    parent->ToggleTool( ID_BUTTONDOWNLOADS, TRUE );
     parent->AddTool( ID_BUTTONSHARED, _("Shared Files"), amuleDlgImages( 23 ), wxNullBitmap, wxITEM_CHECK, _("Shared Files Window") );
     parent->AddTool( ID_BUTTONMESSAGES, _("Messages"), amuleDlgImages( 24 ), wxNullBitmap, wxITEM_CHECK, _("Messages Window") );
     parent->AddTool( ID_BUTTONSTATISTICS, _("Statistics"), amuleDlgImages( 25 ), wxNullBitmap, wxITEM_CHECK, _("Statistics Graph Window") );
@@ -3690,40 +3549,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,0,0,0,
-            0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,0,0,0,0,0,0,233,250,233,246,255,246,246,255,246,233,250,
-            233,0,0,0,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,0,0,0,202,237,202,216,242,215,202,237,202,202,237,202,202,237,202,202,237,202,216,
-            242,215,208,239,208,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,0,0,0,
+            0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,0,0,0,0,0,0,233,250,233,246,255,246,246,255,246,233,250,
+            233,0,0,0,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,0,0,0,202,237,202,216,242,215,202,237,202,202,237,202,202,237,202,202,237,202,216,
+            242,215,208,239,208,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,
             0,114,201,112,159,224,158,146,223,144,148,226,146,148,226,146,148,226,146,148,226,146,148,226,146,
-            159,224,158,114,201,112,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,73,
+            159,224,158,114,201,112,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,73,
             193,70,98,212,95,0,0,0,0,0,0,93,217,90,93,217,90,0,0,0,0,0,0,98,212,
-            95,73,193,70,0,0,0,212,208,200,212,208,200,212,208,200,0,0,0,8,165,4,26,187,21,
+            95,73,193,70,0,0,0,240,240,240,240,240,240,240,240,240,0,0,0,8,165,4,26,187,21,
             50,206,46,0,0,0,0,0,0,52,220,46,49,213,45,0,0,0,0,0,0,50,206,46,26,
-            187,21,8,165,4,0,0,0,212,208,200,212,208,200,0,0,0,18,178,14,19,193,14,27,206,
+            187,21,8,165,4,0,0,0,240,240,240,240,240,240,0,0,0,18,178,14,19,193,14,27,206,
             22,27,216,22,27,216,22,27,216,22,27,216,22,27,216,22,27,216,22,27,206,22,19,193,14,
-            18,178,14,0,0,0,212,208,200,212,208,200,0,0,0,26,187,21,27,206,22,32,218,27,34,
+            18,178,14,0,0,0,240,240,240,240,240,240,0,0,0,26,187,21,27,206,22,32,218,27,34,
             226,29,34,226,29,34,226,29,34,226,29,34,226,29,34,226,29,32,218,27,27,206,22,26,187,
-            21,0,0,0,212,208,200,212,208,200,0,0,0,37,196,34,42,216,37,0,0,0,54,240,47,
+            21,0,0,0,240,240,240,240,240,240,0,0,0,37,196,34,42,216,37,0,0,0,54,240,47,
             57,243,49,57,243,49,57,243,49,57,243,49,54,240,47,0,0,0,42,216,37,37,196,34,0,
-            0,0,212,208,200,212,208,200,212,208,200,0,0,0,52,220,46,61,237,54,0,0,0,72,250,
-            64,72,250,64,72,250,64,72,250,64,0,0,0,61,237,54,49,213,45,0,0,0,212,208,200,
-            212,208,200,212,208,200,212,208,200,0,0,0,61,223,55,68,233,62,77,246,69,0,0,0,0,
-            0,0,0,0,0,0,0,0,77,246,69,61,223,55,53,205,48,0,0,0,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,0,0,0,68,233,62,79,243,74,88,252,82,88,252,82,
-            88,252,82,83,247,79,76,235,72,65,214,61,0,0,0,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,79,243,74,83,247,79,83,247,
-            79,76,235,72,0,0,0,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,0,0,0,0,
-            0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            0,0,240,240,240,240,240,240,240,240,240,0,0,0,52,220,46,61,237,54,0,0,0,72,250,
+            64,72,250,64,72,250,64,72,250,64,0,0,0,61,237,54,49,213,45,0,0,0,240,240,240,
+            240,240,240,240,240,240,240,240,240,0,0,0,61,223,55,68,233,62,77,246,69,0,0,0,0,
+            0,0,0,0,0,0,0,0,77,246,69,61,223,55,53,205,48,0,0,0,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,0,0,0,68,233,62,79,243,74,88,252,82,88,252,82,
+            88,252,82,83,247,79,76,235,72,65,214,61,0,0,0,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,79,243,74,83,247,79,83,247,
+            79,76,235,72,0,0,0,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,0,0,0,0,
+            0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -3731,40 +3590,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,0,0,0,
-            0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,0,0,0,0,0,0,247,233,233,255,248,248,255,248,248,248,237,
-            237,0,0,0,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,0,0,0,230,205,205,238,220,220,234,212,212,232,208,208,234,212,212,234,212,212,234,
-            212,212,234,212,212,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,0,0,0,
+            0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,0,0,0,0,0,0,247,233,233,255,248,248,255,248,248,248,237,
+            237,0,0,0,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,0,0,0,230,205,205,238,220,220,234,212,212,232,208,208,234,212,212,234,212,212,234,
+            212,212,234,212,212,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,
             0,181,116,116,212,166,166,211,156,156,211,156,156,212,156,156,212,156,156,212,156,156,212,166,166,
-            212,166,166,189,129,129,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,170,
+            212,166,166,189,129,129,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,170,
             82,82,191,110,110,0,0,0,0,0,0,197,106,106,197,106,106,0,0,0,0,0,0,191,110,
-            110,175,88,88,0,0,0,212,208,200,212,208,200,212,208,200,0,0,0,142,21,21,159,36,36,
+            110,175,88,88,0,0,0,240,240,240,240,240,240,240,240,240,0,0,0,142,21,21,159,36,36,
             181,61,61,0,0,0,0,0,0,189,62,62,189,62,62,0,0,0,0,0,0,187,62,62,163,
-            41,41,144,21,21,0,0,0,212,208,200,212,208,200,0,0,0,154,24,24,169,28,28,183,33,
+            41,41,144,21,21,0,0,0,240,240,240,240,240,240,0,0,0,154,24,24,169,28,28,183,33,
             33,193,37,37,193,37,37,193,37,37,193,37,37,193,37,37,193,37,37,185,31,31,169,28,28,
-            154,24,24,0,0,0,212,208,200,212,208,200,0,0,0,169,28,28,185,31,31,205,37,37,211,
+            154,24,24,0,0,0,240,240,240,240,240,240,0,0,0,169,28,28,185,31,31,205,37,37,211,
             39,39,211,39,39,211,39,39,211,39,39,211,39,39,211,39,39,205,37,37,185,31,31,169,28,
-            28,0,0,0,212,208,200,212,208,200,0,0,0,185,31,31,210,35,35,232,43,43,233,48,48,
+            28,0,0,0,240,240,240,240,240,240,0,0,0,185,31,31,210,35,35,232,43,43,233,48,48,
             237,50,50,237,50,50,237,50,50,237,50,50,233,48,48,221,42,42,205,37,37,180,30,30,0,
-            0,0,212,208,200,212,208,200,212,208,200,0,0,0,210,35,35,237,50,50,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,232,43,43,205,37,37,0,0,0,212,208,200,
-            212,208,200,212,208,200,212,208,200,0,0,0,210,35,35,236,41,41,245,50,50,253,50,50,253,
-            53,53,253,53,53,253,50,50,237,50,50,221,42,42,199,33,33,0,0,0,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,0,0,0,226,38,38,241,43,43,245,45,45,253,50,50,
-            253,50,50,241,43,43,232,43,43,210,35,35,0,0,0,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,241,43,43,241,43,43,245,45,
-            45,236,41,41,0,0,0,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,0,0,0,0,
-            0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            0,0,240,240,240,240,240,240,240,240,240,0,0,0,210,35,35,237,50,50,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,232,43,43,205,37,37,0,0,0,240,240,240,
+            240,240,240,240,240,240,240,240,240,0,0,0,210,35,35,236,41,41,245,50,50,253,50,50,253,
+            53,53,253,53,53,253,50,50,237,50,50,221,42,42,199,33,33,0,0,0,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,0,0,0,226,38,38,241,43,43,245,45,45,253,50,50,
+            253,50,50,241,43,43,232,43,43,210,35,35,0,0,0,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,241,43,43,241,43,43,245,45,
+            45,236,41,41,0,0,0,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,0,0,0,0,
+            0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -3772,40 +3631,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,0,0,0,
-            0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,0,0,0,0,0,0,254,247,233,255,254,246,255,254,246,254,247,
-            233,0,0,0,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,0,0,0,246,239,202,248,243,213,246,239,202,246,239,202,246,239,202,246,239,202,248,
-            243,213,248,243,213,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,0,0,0,
+            0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,0,0,0,0,0,0,254,247,233,255,254,246,255,254,246,254,247,
+            233,0,0,0,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,0,0,0,246,239,202,248,243,213,246,239,202,246,239,202,246,239,202,246,239,202,248,
+            243,213,248,243,213,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,
             0,221,204,105,240,229,157,242,228,144,246,232,146,246,232,146,246,232,146,246,232,146,242,228,144,
-            240,229,157,225,210,119,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,228,
+            240,229,157,225,210,119,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,228,
             200,70,241,221,94,0,0,0,0,0,0,252,229,90,252,229,90,0,0,0,0,0,0,241,221,
-            94,228,200,70,0,0,0,212,208,200,212,208,200,212,208,200,0,0,0,209,181,6,230,203,20,
+            94,228,200,70,0,0,0,240,240,240,240,240,240,240,240,240,0,0,0,209,181,6,230,203,20,
             244,218,47,0,0,0,0,0,0,253,227,46,253,227,46,0,0,0,0,0,0,244,218,47,230,
-            203,20,209,181,6,0,0,0,212,208,200,212,208,200,0,0,0,215,190,17,230,203,20,246,220,
+            203,20,209,181,6,0,0,0,240,240,240,240,240,240,0,0,0,215,190,17,230,203,20,246,220,
             23,254,229,26,254,229,26,254,229,26,254,229,26,254,229,26,254,229,26,246,220,23,230,203,20,
-            215,190,17,0,0,0,212,208,200,212,208,200,0,0,0,220,199,27,237,217,31,249,230,34,255,
+            215,190,17,0,0,0,240,240,240,240,240,240,0,0,0,220,199,27,237,217,31,249,230,34,255,
             238,37,255,238,37,255,238,37,255,238,37,255,238,37,255,238,37,249,230,34,237,217,31,220,199,
-            27,0,0,0,212,208,200,212,208,200,0,0,0,223,205,39,239,224,45,255,238,37,255,247,59,
+            27,0,0,0,240,240,240,240,240,240,0,0,0,223,205,39,239,224,45,255,238,37,255,247,59,
             255,247,59,255,247,59,255,247,59,255,247,59,255,247,59,255,238,37,239,224,45,223,205,39,0,
-            0,0,212,208,200,212,208,200,212,208,200,0,0,0,237,227,57,255,238,37,0,0,0,255,252,
-            80,255,252,80,255,252,80,255,252,80,0,0,0,246,220,23,232,218,57,0,0,0,212,208,200,
-            212,208,200,212,208,200,212,208,200,0,0,0,238,227,64,246,238,78,255,238,37,0,0,0,0,
-            0,0,0,0,0,0,0,0,255,238,37,241,231,72,232,218,57,0,0,0,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,0,0,0,246,238,78,251,243,91,254,252,98,254,252,98,
-            254,253,103,254,252,98,244,237,85,233,223,76,0,0,0,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,254,251,92,254,252,98,254,252,
-            98,251,243,91,0,0,0,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,0,0,0,0,
-            0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            0,0,240,240,240,240,240,240,240,240,240,0,0,0,237,227,57,255,238,37,0,0,0,255,252,
+            80,255,252,80,255,252,80,255,252,80,0,0,0,246,220,23,232,218,57,0,0,0,240,240,240,
+            240,240,240,240,240,240,240,240,240,0,0,0,238,227,64,246,238,78,255,238,37,0,0,0,0,
+            0,0,0,0,0,0,0,0,255,238,37,241,231,72,232,218,57,0,0,0,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,0,0,0,246,238,78,251,243,91,254,252,98,254,252,98,
+            254,253,103,254,252,98,244,237,85,233,223,76,0,0,0,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,254,251,92,254,252,98,254,252,
+            98,251,243,91,0,0,0,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,0,0,0,0,
+            0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -3813,40 +3672,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,0,0,0,
-            0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,0,0,0,0,0,0,232,232,232,244,243,244,244,243,244,232,232,
-            232,0,0,0,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,0,0,0,213,213,213,222,222,222,213,213,213,213,213,213,222,222,222,213,213,213,222,
-            222,222,222,222,222,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,0,0,0,
+            0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,0,0,0,0,0,0,232,232,232,244,243,244,244,243,244,232,232,
+            232,0,0,0,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,0,0,0,213,213,213,222,222,222,213,213,213,213,213,213,222,222,222,213,213,213,222,
+            222,222,222,222,222,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,
             0,141,141,141,185,184,185,178,177,178,178,177,178,185,184,185,178,177,178,178,177,178,178,177,178,
-            185,184,185,158,158,158,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,126,
+            185,184,185,158,158,158,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,126,
             126,126,145,145,145,0,0,0,0,0,0,145,145,145,145,145,145,0,0,0,0,0,0,145,145,
-            145,133,133,133,0,0,0,212,208,200,212,208,200,212,208,200,0,0,0,89,89,89,98,98,98,
+            145,133,133,133,0,0,0,240,240,240,240,240,240,240,240,240,0,0,0,89,89,89,98,98,98,
             126,126,126,0,0,0,0,0,0,126,126,126,126,126,126,0,0,0,0,0,0,126,126,126,105,
-            105,105,89,89,89,0,0,0,212,208,200,212,208,200,0,0,0,89,89,89,105,105,105,113,113,
+            105,105,89,89,89,0,0,0,240,240,240,240,240,240,0,0,0,89,89,89,105,105,105,113,113,
             113,113,113,113,126,126,126,113,113,113,126,126,126,113,113,113,121,121,121,113,113,113,102,102,102,
-            94,94,94,0,0,0,212,208,200,212,208,200,0,0,0,98,98,98,113,113,113,133,133,133,133,
+            94,94,94,0,0,0,240,240,240,240,240,240,0,0,0,98,98,98,113,113,113,133,133,133,133,
             133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,133,126,126,126,113,113,113,105,105,
-            105,0,0,0,212,208,200,212,208,200,0,0,0,113,113,113,133,133,133,141,141,141,145,145,145,
+            105,0,0,0,240,240,240,240,240,240,0,0,0,113,113,113,133,133,133,141,141,141,145,145,145,
             158,158,158,158,158,158,153,153,153,153,153,153,145,145,145,145,145,145,126,126,126,113,113,113,0,
-            0,0,212,208,200,212,208,200,212,208,200,0,0,0,133,133,133,158,158,158,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,145,145,145,133,133,133,0,0,0,212,208,200,
-            212,208,200,212,208,200,212,208,200,0,0,0,141,141,141,0,0,0,158,158,158,169,168,168,178,
-            177,178,178,177,178,166,166,166,158,158,158,0,0,0,126,126,126,0,0,0,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,0,0,0,145,145,145,165,164,163,169,168,168,178,177,178,
-            169,168,168,169,168,168,153,153,153,138,138,138,0,0,0,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,165,164,163,169,168,168,165,164,
-            163,158,158,158,0,0,0,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,0,0,0,0,
-            0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            0,0,240,240,240,240,240,240,240,240,240,0,0,0,133,133,133,158,158,158,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,145,145,145,133,133,133,0,0,0,240,240,240,
+            240,240,240,240,240,240,240,240,240,0,0,0,141,141,141,0,0,0,158,158,158,169,168,168,178,
+            177,178,178,177,178,166,166,166,158,158,158,0,0,0,126,126,126,0,0,0,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,0,0,0,145,145,145,165,164,163,169,168,168,178,177,178,
+            169,168,168,169,168,168,153,153,153,138,138,138,0,0,0,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,165,164,163,169,168,168,165,164,
+            163,158,158,158,0,0,0,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,0,0,0,0,
+            0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -3860,17 +3719,17 @@
         "a c Black",
         "b c #DDA670",
         "c c #C3C3C3",
-        "d c #E6E5E6",
-        "e c #E9E9E9",
-        "f c #D8D7D8",
-        "g c #CCCCCC",
-        "h c #BF7220",
-        "i c #D5D5D5",
-        "j c #F8F7F8",
-        "k c #ECECEC",
-        "l c #F1DECB",
-        "m c #C37A33",
-        "n c #DEDEDE",
+        "e c #E6E5E6",
+        "f c #E9E9E9",
+        "g c #D8D7D8",
+        "h c #CCCCCC",
+        "i c #BF7220",
+        "j c #D5D5D5",
+        "k c #F8F7F8",
+        "l c #ECECEC",
+        "m c #F1DECB",
+        "n c #C37A33",
+        "o c #DEDEDE",
         "p c #BE6A13",
         "q c #F2F1F2",
         "r c #DBB68F",
@@ -3884,15 +3743,15 @@
         "      aaaa      ",
         "    aavvvvaa    ",
         "   asssrrqssa   ",
-        "  agkrppppldfa  ",
-        "  ainhplrptdia  ",
-        " acidekqupudica ",
-        " agnkssupmsknia ",
-        " aidssvppvsqdia ",
-        " anksvvvvvvvkna ",
-        "  akvvvwbvvska  ",
-        "  aksvvpwvjqda  ",
-        "   asvvvvvska   ",
+        "  ahlrppppmega  ",
+        "  ajoipmrpteja  ",
+        " acjeflqupuejca ",
+        " aholssupnsloja ",
+        " ajessvppvsqeja ",
+        " aolsvvvvvvvloa ",
+        "  alvvvwbvvsla  ",
+        "  alsvvpwvkqea  ",
+        "   asvvvvvsla   ",
         "    aavvvvaa    ",
         "      aaaa      ",
         "                "
@@ -3905,22 +3764,20 @@
         /* XPM */
         static const char *xpm_data[] = {
         /* columns rows colors chars-per-pixel */
-        "16 16 6 1",
+        "16 16 4 1",
         "  c None",
         "a c Black",
-        "b c #101010",
-        "c c #74EC48",
-        "d c #222222",
-        "f c #0D0D0D",
+        "c c #222222",
+        "d c #FF0000",
         /* pixels */
-        "          aaaa  ",
-        "          acca  ",
-        "        aaaccaaa",
-        "        acccccca",
-        "        acccccca",
-        "        adaccaaa",
-        "          fccb  ",
-        "          aaaa  ",
+        "                ",
+        "                ",
+        "        aaaaaaaa",
+        "        adddddda",
+        "        adddddda",
+        "        acaaaaaa",
+        "                ",
+        "                ",
         "                ",
         "                ",
         "                ",
@@ -3940,7 +3797,7 @@
         /* columns rows colors chars-per-pixel */
         "16 16 3 1",
         "  c None",
-        "a c #FF0000",
+        "b c #FF0000",
         "c c #A52A2A",
         /* pixels */
         "                ",
@@ -3953,12 +3810,12 @@
         "                ",
         "                ",
         "                ",
-        "      a         ",
-        "     aa         ",
-        "a   aac         ",
-        "aa aac          ",
-        "caaac           ",
-        " cac            "
+        "      b         ",
+        "     bb         ",
+        "b   bbc         ",
+        "bb bbc          ",
+        "cbbbc           ",
+        " cbc            "
         };
         wxBitmap bitmap( xpm_data );
         return bitmap;
@@ -3970,25 +3827,25 @@
         /* columns rows colors chars-per-pixel */
         "16 16 3 1",
         "  c None",
-        "a c #CC3232",
-        "b c #FF0000",
+        "b c #CC3232",
+        "c c #FF0000",
         /* pixels */
         "                ",
-        "ba            ab",
-        " ba          ab ",
-        "  ba        ab  ",
-        "   ba      ab   ",
-        "    ba    ab    ",
-        "     ba  ab     ",
-        "      baab      ",
-        "       aa       ",
-        "      abba      ",
-        "     ab  ba     ",
-        "    ab    ba    ",
-        "   ab      ba   ",
-        "  ab        ba  ",
-        " ab          ba ",
-        "ab            ba"
+        "cb            bc",
+        " cb          bc ",
+        "  cb        bc  ",
+        "   cb      bc   ",
+        "    cb    bc    ",
+        "     cb  bc     ",
+        "      cbbc      ",
+        "       bb       ",
+        "      bccb      ",
+        "     bc  cb     ",
+        "    bc    cb    ",
+        "   bc      cb   ",
+        "  bc        cb  ",
+        " bc          cb ",
+        "bc            cb"
         };
         wxBitmap bitmap( xpm_data );
         return bitmap;
@@ -4002,25 +3859,25 @@
         "  c None",
         "a c Black",
         "b c #CACACA",
-        "c c #CBCBCB",
-        "d c #CCCCCC",
-        "e c #CDCDCC",
-        "f c #CDCDCD",
-        "g c #C6C6C4",
-        "h c #CECECE",
-        "i c #CFCFCF",
+        "d c #CBCBCB",
+        "e c #CCCCCC",
+        "f c #CDCDCC",
+        "g c #CDCDCD",
+        "h c #C6C6C4",
+        "i c #CECECE",
+        "j c #CFCFCF",
         "k c #C6C2C1",
         "l c #C9C9C8",
         "m c #C2C2C2",
         /* pixels */
         "           a    ",
-        "          aga   ",
-        "       aaadddaaa",
-        "       abbdiibma",
-        "        alcihfa ",
-        "         afffa  ",
-        "        aefahha ",
-        "        aha aka ",
+        "          aha   ",
+        "       aaaeeeaaa",
+        "       abbejjbma",
+        "        aldjiga ",
+        "         aggga  ",
+        "        afgaiia ",
+        "        aia aka ",
         "        aa   aa ",
         "                ",
         "                ",
@@ -4037,40 +3894,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,85,85,85,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,85,85,85,251,225,54,99,98,78,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,85,85,85,85,85,85,99,98,
-            78,253,244,13,255,248,7,252,235,31,85,85,85,85,85,85,85,85,85,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,85,85,85,238,222,51,255,241,41,253,
-            250,0,252,249,0,253,249,3,251,230,42,235,217,58,99,98,78,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,120,116,64,233,224,28,253,250,0,
-            253,250,0,251,242,12,227,216,37,120,118,66,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,121,120,65,255,248,8,251,239,
-            21,252,235,32,120,118,66,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,99,98,78,241,229,35,252,236,27,159,144,90,252,
-            236,31,233,214,64,97,96,79,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,80,84,80,203,194,47,98,97,78,212,208,200,85,85,85,
-            217,210,34,87,86,84,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,80,84,80,96,96,72,212,208,200,212,208,200,212,208,200,96,96,
-            72,85,85,85,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,85,85,85,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,85,85,85,251,225,54,99,98,78,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,85,85,85,85,85,85,99,98,
+            78,253,244,13,255,248,7,252,235,31,85,85,85,85,85,85,85,85,85,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,85,85,85,238,222,51,255,241,41,253,
+            250,0,252,249,0,253,249,3,251,230,42,235,217,58,99,98,78,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,120,116,64,233,224,28,253,250,0,
+            253,250,0,251,242,12,227,216,37,120,118,66,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,121,120,65,255,248,8,251,239,
+            21,252,235,32,120,118,66,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,99,98,78,241,229,35,252,236,27,159,144,90,252,
+            236,31,233,214,64,97,96,79,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,80,84,80,203,194,47,98,97,78,240,240,240,85,85,85,
+            217,210,34,87,86,84,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,80,84,80,96,96,72,240,240,240,240,240,240,240,240,240,96,96,
+            72,85,85,85,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -4081,17 +3938,17 @@
         /* columns rows colors chars-per-pixel */
         "16 16 3 1",
         "  c None",
-        "a c #FFFF00",
-        "b c #323834",
+        "b c #FFFF00",
+        "c c #323834",
         /* pixels */
-        "           b    ",
-        "          bab   ",
-        "         baaab  ",
-        "        baaaaab ",
-        "       baaaaaaab",
-        "       bbbaaabbb",
-        "         baaab  ",
-        "         bbbbb  ",
+        "           c    ",
+        "          cbc   ",
+        "         cbbbc  ",
+        "        cbbbbbc ",
+        "       cbbbbbbbc",
+        "       cccbbbccc",
+        "         cbbbc  ",
+        "         ccccc  ",
         "                ",
         "                ",
         "                ",
@@ -4108,40 +3965,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,9,84,125,8,73,108,7,65,97,7,
-            65,97,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,9,84,125,16,149,221,27,164,239,15,139,206,10,90,133,
-            6,52,77,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,9,84,125,16,149,221,255,255,255,130,205,246,67,180,242,14,132,196,10,94,
-            140,6,52,77,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,9,84,125,27,164,239,162,218,249,93,191,244,67,180,242,16,149,221,13,121,180,6,
-            52,77,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,7,65,97,15,139,206,67,180,242,67,180,242,33,167,240,16,149,221,13,121,180,6,52,77,
-            6,52,77,6,52,77,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,6,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,9,84,125,8,73,108,7,65,97,7,
+            65,97,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,9,84,125,16,149,221,27,164,239,15,139,206,10,90,133,
+            6,52,77,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,9,84,125,16,149,221,255,255,255,130,205,246,67,180,242,14,132,196,10,94,
+            140,6,52,77,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,9,84,125,27,164,239,162,218,249,93,191,244,67,180,242,16,149,221,13,121,180,6,
+            52,77,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,7,65,97,15,139,206,67,180,242,67,180,242,33,167,240,16,149,221,13,121,180,6,52,77,
+            6,52,77,6,52,77,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,6,
             52,77,10,94,140,15,139,206,16,149,221,16,149,221,13,126,187,10,90,133,6,52,77,8,73,
-            108,7,65,97,6,52,77,212,208,200,212,208,200,212,208,200,212,208,200,9,84,125,6,58,86,
+            108,7,65,97,6,52,77,240,240,240,240,240,240,240,240,240,240,240,240,9,84,125,6,58,86,
             6,52,77,9,84,125,12,116,172,12,116,172,10,90,133,6,52,77,9,78,116,10,90,133,9,
-            84,125,6,52,77,212,208,200,212,208,200,212,208,200,9,84,125,12,111,165,10,94,140,7,62,
+            84,125,6,52,77,240,240,240,240,240,240,240,240,240,9,84,125,12,111,165,10,94,140,7,62,
             92,6,52,77,6,52,77,6,52,77,6,52,77,121,0,0,121,0,0,9,84,125,121,0,0,
-            121,0,0,212,208,200,212,208,200,9,84,125,78,185,243,104,195,244,14,132,196,12,116,172,10,
+            121,0,0,240,240,240,240,240,240,9,84,125,78,185,243,104,195,244,14,132,196,12,116,172,10,
             94,140,10,94,140,10,94,140,121,0,0,242,84,90,237,28,36,121,0,0,237,28,36,237,28,
-            36,68,1,0,212,208,200,9,84,125,186,227,250,63,179,242,13,121,180,16,149,221,63,179,242,
+            36,68,1,0,240,240,240,9,84,125,186,227,250,63,179,242,13,121,180,16,149,221,63,179,242,
             27,164,239,121,0,0,242,84,90,251,199,201,245,122,126,239,49,56,245,117,122,243,100,105,237,
             28,36,68,1,0,9,84,125,104,195,244,27,164,239,10,94,140,33,167,240,231,245,253,113,198,
             245,121,0,0,245,130,134,254,241,241,248,170,173,244,109,113,248,167,170,245,117,122,226,26,34,
             68,1,0,9,84,125,78,185,243,16,149,221,7,62,92,33,167,240,231,245,253,113,198,245,121,
             0,0,242,84,90,251,199,201,247,156,160,246,145,149,245,122,126,242,89,95,195,21,27,68,1,
             0,9,84,125,44,171,240,16,149,221,6,52,77,33,167,240,207,236,252,93,191,244,67,180,242,
-            121,0,0,241,67,74,247,156,160,245,132,136,243,97,103,219,25,33,68,1,0,212,208,200,9,
+            121,0,0,241,67,74,247,156,160,245,132,136,243,97,103,219,25,33,68,1,0,240,240,240,9,
             84,125,16,149,221,16,149,221,6,52,77,33,167,240,138,209,247,72,182,242,44,171,240,44,171,
-            240,121,0,0,237,28,36,245,126,130,219,25,33,68,1,0,212,208,200,212,208,200,7,65,97,
+            240,121,0,0,237,28,36,245,126,130,219,25,33,68,1,0,240,240,240,240,240,240,7,65,97,
             16,149,221,16,149,221,6,52,77,16,149,221,85,187,243,54,175,241,15,144,215,6,52,77,6,
-            52,77,121,0,0,179,14,18,68,1,0,212,208,200,212,208,200,212,208,200,7,65,97,6,52,
-            77,6,52,77,212,208,200,6,52,77,6,52,77,6,52,77,6,52,77,212,208,200,212,208,200,
-            212,208,200,68,1,0,212,208,200,212,208,200,212,208,200,212,208,200
+            52,77,121,0,0,179,14,18,68,1,0,240,240,240,240,240,240,240,240,240,7,65,97,6,52,
+            77,6,52,77,240,240,240,6,52,77,6,52,77,6,52,77,6,52,77,240,240,240,240,240,240,
+            240,240,240,68,1,0,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -4149,40 +4006,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,100,41,9,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,100,41,9,100,41,9,129,63,18,212,208,200,100,41,9,100,41,9,100,41,9,100,41,
-            9,100,41,9,100,41,9,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,100,41,9,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,100,41,9,100,41,9,129,63,18,240,240,240,100,41,9,100,41,9,100,41,9,100,41,
+            9,100,41,9,100,41,9,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             100,41,9,191,111,45,129,63,18,100,41,9,242,220,175,233,195,143,223,170,110,206,130,64,174,
-            98,39,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,129,63,
+            98,39,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,129,63,
             18,167,93,36,100,41,9,242,220,175,223,170,110,213,147,84,191,111,45,100,41,9,100,41,9,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,142,74,26,206,
-            130,64,223,170,110,215,150,87,149,79,29,100,41,9,100,41,9,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,199,118,49,187,109,45,
-            166,94,38,134,69,27,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,100,41,9,100,41,9,185,108,46,187,109,45,93,45,
-            14,222,170,125,180,123,80,128,64,23,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,203,124,57,190,111,46,223,174,133,255,
-            255,255,0,0,0,147,106,72,167,96,42,50,55,62,50,55,62,50,55,62,212,208,200,212,208,
-            200,212,208,200,212,208,200,100,41,9,100,41,9,210,138,74,217,154,92,217,154,92,236,236,235,
-            65,64,65,194,119,57,204,145,78,230,210,186,255,255,255,196,196,192,50,55,62,212,208,200,212,
-            208,200,212,208,200,212,208,200,100,41,9,223,170,110,242,220,175,223,170,110,217,154,92,180,104,
-            44,191,119,50,193,140,87,107,108,111,23,22,20,255,255,255,50,55,62,212,208,200,212,208,200,
-            212,208,200,100,41,9,110,49,12,217,154,92,223,170,110,223,170,110,210,138,74,180,104,44,168,
-            94,37,193,160,128,198,198,194,160,160,159,235,235,233,50,55,62,212,208,200,212,208,200,212,208,
-            200,100,41,9,110,49,12,166,92,35,210,138,74,210,138,74,199,119,49,171,96,38,168,94,37,
-            197,179,159,228,228,225,228,228,225,231,231,229,50,55,62,212,208,200,212,208,200,212,208,200,100,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,142,74,26,206,
+            130,64,223,170,110,215,150,87,149,79,29,100,41,9,100,41,9,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,199,118,49,187,109,45,
+            166,94,38,134,69,27,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,100,41,9,100,41,9,185,108,46,187,109,45,93,45,
+            14,222,170,125,180,123,80,128,64,23,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,203,124,57,190,111,46,223,174,133,255,
+            255,255,0,0,0,147,106,72,167,96,42,50,55,62,50,55,62,50,55,62,240,240,240,240,240,
+            240,240,240,240,240,240,240,100,41,9,100,41,9,210,138,74,217,154,92,217,154,92,236,236,235,
+            65,64,65,194,119,57,204,145,78,230,210,186,255,255,255,196,196,192,50,55,62,240,240,240,240,
+            240,240,240,240,240,240,240,240,100,41,9,223,170,110,242,220,175,223,170,110,217,154,92,180,104,
+            44,191,119,50,193,140,87,107,108,111,23,22,20,255,255,255,50,55,62,240,240,240,240,240,240,
+            240,240,240,100,41,9,110,49,12,217,154,92,223,170,110,223,170,110,210,138,74,180,104,44,168,
+            94,37,193,160,128,198,198,194,160,160,159,235,235,233,50,55,62,240,240,240,240,240,240,240,240,
+            240,100,41,9,110,49,12,166,92,35,210,138,74,210,138,74,199,119,49,171,96,38,168,94,37,
+            197,179,159,228,228,225,228,228,225,231,231,229,50,55,62,240,240,240,240,240,240,240,240,240,100,
             41,9,128,63,19,100,41,9,100,41,9,100,41,9,100,41,9,100,41,9,114,116,118,160,160,
-            158,170,170,166,164,165,162,50,55,62,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,
-            141,73,25,172,101,39,163,91,33,127,62,19,100,41,9,212,208,200,50,55,62,50,55,62,50,
-            55,62,50,55,62,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,143,75,
-            26,193,116,45,193,116,45,154,83,30,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            158,170,170,166,164,165,162,50,55,62,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,
+            141,73,25,172,101,39,163,91,33,127,62,19,100,41,9,240,240,240,50,55,62,50,55,62,50,
+            55,62,50,55,62,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,143,75,
+            26,193,116,45,193,116,45,154,83,30,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -4190,18 +4047,18 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,174,174,174,165,165,165,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,120,
-            215,116,85,213,79,212,208,200,212,208,200,153,153,153,143,143,143,153,153,153,153,153,153,142,142,
-            142,151,151,151,190,190,190,212,208,200,81,211,75,139,216,134,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,174,174,174,165,165,165,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,120,
+            215,116,85,213,79,240,240,240,240,240,240,153,153,153,143,143,143,153,153,153,153,153,153,142,142,
+            142,151,151,151,190,190,190,240,240,240,81,211,75,139,216,134,240,240,240,240,240,240,240,240,240,
             94,191,89,92,211,85,168,173,168,193,193,193,211,211,211,179,179,179,179,179,179,211,211,211,196,
-            196,196,171,187,171,67,201,60,112,191,108,212,208,200,212,208,200,212,208,200,129,129,129,156,168,
+            196,196,171,187,171,67,201,60,112,191,108,240,240,240,240,240,240,240,240,240,129,129,129,156,168,
             155,63,197,55,136,206,132,202,204,203,190,206,188,135,209,131,135,209,131,187,206,185,202,204,203,
-            104,203,100,71,186,65,152,159,151,129,129,129,212,208,200,212,208,200,120,120,120,95,96,96,137,
+            104,203,100,71,186,65,152,159,151,129,129,129,240,240,240,240,240,240,120,120,120,95,96,96,137,
             171,133,66,194,55,102,209,93,75,192,66,82,187,74,93,188,87,71,189,62,92,208,78,68,194,
-            60,144,167,143,94,94,94,119,119,119,212,208,200,157,157,157,75,75,75,71,71,71,139,140,139,
+            60,144,167,143,94,94,94,119,119,119,240,240,240,157,157,157,75,75,75,71,71,71,139,140,139,
             108,179,102,73,197,63,133,154,132,139,140,139,139,140,139,138,152,137,76,196,65,98,180,91,146,
             146,146,82,82,82,75,75,75,157,157,157,63,63,63,14,14,14,101,101,101,190,190,190,134,148,
             133,81,194,68,131,153,128,193,193,193,198,198,198,139,156,137,84,227,66,124,158,121,190,190,190,
@@ -4213,17 +4070,17 @@
             89,98,135,90,108,124,104,116,217,100,90,126,81,206,206,207,215,215,215,123,123,123,101,101,101,
             147,147,147,174,174,174,129,129,129,123,123,123,171,171,171,211,211,211,165,165,165,87,130,79,88,
             161,74,79,125,69,102,176,87,126,126,126,206,206,207,179,178,179,126,126,126,130,130,130,174,174,
-            174,212,208,200,175,175,175,135,135,135,153,153,153,142,142,142,186,186,186,78,88,75,119,191,102,
-            108,194,89,76,108,68,157,157,157,145,144,145,151,151,151,137,137,137,174,174,174,212,208,200,212,
-            208,200,212,208,200,186,186,186,139,139,139,157,157,157,196,196,196,120,120,120,90,126,81,95,162,
-            82,80,87,80,193,193,193,151,151,151,134,134,134,186,186,186,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,193,193,193,151,151,151,179,179,179,193,193,193,94,94,94,88,90,88,159,
-            159,159,179,179,179,151,151,151,196,196,196,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,186,186,186,161,161,161,148,148,148,148,148,148,161,161,161,
-            186,186,186,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            174,240,240,240,175,175,175,135,135,135,153,153,153,142,142,142,186,186,186,78,88,75,119,191,102,
+            108,194,89,76,108,68,157,157,157,145,144,145,151,151,151,137,137,137,174,174,174,240,240,240,240,
+            240,240,240,240,240,186,186,186,139,139,139,157,157,157,196,196,196,120,120,120,90,126,81,95,162,
+            82,80,87,80,193,193,193,151,151,151,134,134,134,186,186,186,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,193,193,193,151,151,151,179,179,179,193,193,193,94,94,94,88,90,88,159,
+            159,159,179,179,179,151,151,151,196,196,196,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,186,186,186,161,161,161,148,148,148,148,148,148,161,161,161,
+            186,186,186,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -4231,40 +4088,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,176,176,176,168,168,168,172,172,172,168,168,168,166,166,
-            166,172,172,172,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,163,164,166,188,188,189,198,198,199,201,201,202,201,201,202,201,201,202,185,
-            186,188,162,163,165,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,142,142,143,166,166,166,175,176,178,182,183,185,185,186,188,187,188,190,182,183,185,181,182,183,
-            164,165,167,144,144,144,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,148,148,149,142,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,176,176,176,168,168,168,172,172,172,168,168,168,166,166,
+            166,172,172,172,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,163,164,166,188,188,189,198,198,199,201,201,202,201,201,202,201,201,202,185,
+            186,188,162,163,165,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,142,142,143,166,166,166,175,176,178,182,183,185,185,186,188,187,188,190,182,183,185,181,182,183,
+            164,165,167,144,144,144,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,148,148,149,142,
             142,143,163,164,166,168,169,171,170,171,173,170,171,173,170,171,173,170,171,173,170,171,173,163,164,
-            166,144,144,144,155,156,156,212,208,200,212,208,200,212,208,200,212,208,200,134,134,136,175,176,178,
+            166,144,144,144,155,156,156,240,240,240,240,240,240,240,240,240,240,240,240,134,134,136,175,176,178,
             189,190,192,189,190,192,189,190,192,189,190,192,189,190,192,187,188,190,187,188,190,187,188,190,176,
-            176,176,135,136,135,212,208,200,212,208,200,212,208,200,166,166,166,152,152,153,166,166,168,179,180,
+            176,176,135,136,135,240,240,240,240,240,240,240,240,240,166,166,166,152,152,153,166,166,168,179,180,
             182,182,183,185,175,176,178,182,183,185,179,180,182,172,172,172,182,183,185,180,181,183,169,170,170,
-            152,152,153,172,172,172,212,208,200,212,208,200,195,195,195,200,200,200,175,175,175,198,198,198,204,
+            152,152,153,172,172,172,240,240,240,240,240,240,195,195,195,200,200,200,175,175,175,198,198,198,204,
             204,204,172,172,172,201,201,202,199,199,199,172,172,172,204,204,204,198,198,198,175,175,175,201,201,
-            202,199,199,199,212,208,200,212,208,200,199,199,199,198,198,198,198,198,198,200,200,200,199,199,199,
+            202,199,199,199,240,240,240,240,240,240,199,199,199,198,198,198,198,198,198,200,200,200,199,199,199,
             198,198,198,198,198,198,196,196,196,196,196,196,199,199,199,199,199,199,193,193,193,193,193,193,199,
-            199,199,212,208,200,212,208,200,201,201,202,198,198,198,195,195,195,201,201,202,199,199,199,195,195,
+            199,199,240,240,240,240,240,240,201,201,202,198,198,198,195,195,195,201,201,202,199,199,199,195,195,
             195,198,198,198,196,196,196,187,188,190,191,191,191,198,198,198,193,193,193,193,193,193,199,199,199,
-            212,208,200,212,208,200,200,200,200,199,199,199,192,192,192,192,192,192,199,199,199,193,193,193,201,
-            201,202,199,199,199,191,191,191,213,213,213,199,199,199,188,188,189,184,184,184,199,199,199,212,208,
-            200,212,208,200,200,200,200,184,184,184,215,215,215,188,188,189,204,204,204,195,195,195,212,208,200,
-            188,188,189,192,192,192,195,195,195,207,207,207,188,188,188,212,208,200,201,201,202,212,208,200,212,
-            208,200,188,188,189,212,208,200,203,203,203,212,208,200,198,198,198,188,188,189,212,208,200,212,208,
-            200,188,188,189,207,207,207,198,198,198,204,204,204,212,208,200,184,184,184,212,208,200,188,188,189,
-            212,208,200,212,208,200,198,198,198,212,208,200,212,208,200,201,201,202,211,211,211,212,208,200,204,
-            204,204,204,204,204,212,208,200,213,213,213,198,198,198,213,213,213,188,188,189,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            240,240,240,240,240,240,200,200,200,199,199,199,192,192,192,192,192,192,199,199,199,193,193,193,201,
+            201,202,199,199,199,191,191,191,213,213,213,199,199,199,188,188,189,184,184,184,199,199,199,240,240,
+            240,240,240,240,200,200,200,184,184,184,215,215,215,188,188,189,204,204,204,195,195,195,240,240,240,
+            188,188,189,192,192,192,195,195,195,207,207,207,188,188,188,240,240,240,201,201,202,240,240,240,240,
+            240,240,188,188,189,240,240,240,203,203,203,240,240,240,198,198,198,188,188,189,240,240,240,240,240,
+            240,188,188,189,207,207,207,198,198,198,204,204,204,240,240,240,184,184,184,240,240,240,188,188,189,
+            240,240,240,240,240,240,198,198,198,240,240,240,240,240,240,201,201,202,211,211,211,240,240,240,204,
+            204,204,204,204,204,240,240,240,213,213,213,198,198,198,213,213,213,188,188,189,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -4272,40 +4129,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,140,128,115,212,208,200,212,208,200,212,208,200,212,208,200,142,125,108,176,159,142,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,162,149,136,212,174,136,212,208,200,212,208,200,130,130,130,255,217,178,183,157,132,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,64,100,144,212,208,200,212,208,200,212,208,200,212,
-            208,200,196,183,170,170,144,119,85,85,85,238,225,212,255,128,115,183,106,157,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,162,149,136,153,153,153,246,183,144,255,128,153,110,110,110,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,119,119,
-            119,230,231,230,238,238,238,212,174,162,142,91,125,212,208,200,212,208,200,136,136,136,85,85,85,
-            136,136,136,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,110,110,110,234,234,234,251,
+            240,240,240,140,128,115,240,240,240,240,240,240,240,240,240,240,240,240,142,125,108,176,159,142,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,162,149,136,212,174,136,240,240,240,240,240,240,130,130,130,255,217,178,183,157,132,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,64,100,144,240,240,240,240,240,240,240,240,240,240,
+            240,240,196,183,170,170,144,119,85,85,85,238,225,212,255,128,115,183,106,157,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,162,149,136,153,153,153,246,183,144,255,128,153,110,110,110,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,119,119,
+            119,230,231,230,238,238,238,212,174,162,142,91,125,240,240,240,240,240,240,136,136,136,85,85,85,
+            136,136,136,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,110,110,110,234,234,234,251,
             251,251,251,251,251,208,208,208,187,187,187,110,110,110,162,162,162,234,234,234,242,242,242,230,231,
-            230,170,170,170,110,110,110,212,208,200,212,208,200,212,208,200,174,174,174,255,255,255,255,255,255,
+            230,170,170,170,110,110,110,240,240,240,240,240,240,240,240,240,174,174,174,255,255,255,255,255,255,
             149,123,200,157,106,170,246,246,246,191,191,191,246,246,246,255,255,255,255,255,255,255,255,255,251,
-            251,251,238,238,238,147,147,147,212,208,200,110,110,110,212,212,212,225,212,200,238,238,238,208,170,
+            251,251,238,238,238,147,147,147,240,240,240,110,110,110,212,212,212,225,212,200,238,238,238,208,170,
             196,255,217,242,251,251,251,238,238,238,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-            255,255,255,196,196,196,212,208,200,212,208,200,174,162,149,178,166,153,234,234,234,255,255,255,234,
+            255,255,255,196,196,196,240,240,240,240,240,240,174,162,149,178,166,153,234,234,234,255,255,255,234,
             234,234,183,183,183,246,246,246,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-            255,230,231,230,85,85,85,212,208,200,85,85,85,128,128,128,140,140,140,132,132,132,174,174,174,
+            255,230,231,230,85,85,85,240,240,240,85,85,85,128,128,128,140,140,140,132,132,132,174,174,174,
             221,221,221,255,255,255,255,255,255,255,255,255,251,251,251,255,255,255,255,255,255,255,255,255,238,
-            238,238,170,170,170,212,208,200,85,85,85,191,191,191,178,178,178,200,200,200,242,242,242,255,255,
+            238,238,170,170,170,240,240,240,85,85,85,191,191,191,178,178,178,200,200,200,242,242,242,255,255,
             255,255,255,255,251,251,251,251,251,251,200,200,200,238,238,238,255,255,255,255,255,255,234,234,234,
-            144,144,144,212,208,200,136,136,136,221,221,221,221,221,221,242,242,242,255,255,255,255,255,255,246,
+            144,144,144,240,240,240,136,136,136,221,221,221,221,221,221,242,242,242,255,255,255,255,255,255,246,
             246,246,208,208,208,225,225,225,178,178,178,208,208,208,230,231,230,238,238,238,217,217,217,170,170,
-            170,212,208,200,212,208,200,130,130,130,183,183,183,234,234,234,251,251,251,242,242,242,225,225,225,
-            149,149,149,187,187,187,128,128,128,178,178,178,187,187,187,212,212,212,204,204,204,110,110,110,212,
-            208,200,85,85,85,200,200,200,204,204,204,170,170,170,208,208,208,242,242,242,204,204,204,106,106,
-            106,128,128,128,106,106,106,85,85,85,128,128,128,178,178,178,125,125,125,212,208,200,162,162,162,
+            170,240,240,240,240,240,240,130,130,130,183,183,183,234,234,234,251,251,251,242,242,242,225,225,225,
+            149,149,149,187,187,187,128,128,128,178,178,178,187,187,187,212,212,212,204,204,204,110,110,110,240,
+            240,240,85,85,85,200,200,200,204,204,204,170,170,170,208,208,208,242,242,242,204,204,204,106,106,
+            106,128,128,128,106,106,106,85,85,85,128,128,128,178,178,178,125,125,125,240,240,240,162,162,162,
             191,191,191,200,200,200,128,128,128,130,130,130,123,123,123,217,217,217,149,149,149,170,170,170,162,
-            162,162,85,85,85,174,174,174,238,238,238,162,162,162,212,208,200,212,208,200,212,208,200,85,85,
-            85,136,136,136,212,208,200,110,110,110,162,162,162,119,119,119,85,85,85,136,136,136,212,208,200,
-            212,208,200,119,119,119,130,130,130,212,208,200,212,208,200,212,208,200
+            162,162,85,85,85,174,174,174,238,238,238,162,162,162,240,240,240,240,240,240,240,240,240,85,85,
+            85,136,136,136,240,240,240,110,110,110,162,162,162,119,119,119,85,85,85,136,136,136,240,240,240,
+            240,240,240,119,119,119,130,130,130,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -4313,40 +4170,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,94,153,160,87,148,157,105,157,164,109,157,164,88,149,157,86,148,157,
-            86,148,156,89,150,157,64,100,144,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,93,153,157,90,150,156,90,150,156,89,150,156,91,152,160,91,152,160,93,152,160,91,152,
-            160,90,151,159,87,149,157,212,208,200,212,208,200,212,208,200,88,152,152,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,94,153,160,87,148,157,105,157,164,109,157,164,88,149,157,86,148,157,
+            86,148,156,89,150,157,64,100,144,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,93,153,157,90,150,156,90,150,156,89,150,156,91,152,160,91,152,160,93,152,160,91,152,
+            160,90,151,159,87,149,157,240,240,240,240,240,240,240,240,240,88,152,152,240,240,240,240,240,240,
             93,152,157,101,157,166,97,155,163,96,155,163,97,155,165,98,157,164,99,156,165,98,156,165,96,
-            154,163,92,152,160,86,148,156,212,208,200,212,208,200,56,132,144,212,208,200,75,121,124,36,54,
+            154,163,92,152,160,86,148,156,240,240,240,240,240,240,56,132,144,240,240,240,75,121,124,36,54,
             57,105,160,168,99,157,165,100,157,166,100,157,166,172,201,206,129,176,182,101,158,167,99,157,165,
-            95,154,162,87,149,157,71,137,148,58,132,144,56,132,144,212,208,200,140,184,187,176,204,208,32,
+            95,154,162,87,149,157,71,137,148,58,132,144,56,132,144,240,240,240,140,184,187,176,204,208,32,
             52,56,108,119,121,184,210,213,118,169,177,118,169,176,160,194,199,102,158,167,100,158,166,96,155,
-            163,86,148,157,71,138,147,58,132,144,212,208,200,212,208,200,107,161,169,106,161,169,110,163,172,
+            163,86,148,157,71,138,147,58,132,144,240,240,240,240,240,240,107,161,169,106,161,169,110,163,172,
             181,208,212,221,233,236,175,205,208,123,172,178,195,217,219,120,169,177,97,156,162,95,154,162,83,
-            147,155,67,136,146,72,138,147,212,208,200,97,156,161,104,159,167,99,157,165,97,156,163,99,157,
+            147,155,67,136,146,72,138,147,240,240,240,97,156,161,104,159,167,99,157,165,97,156,163,99,157,
             164,171,201,206,221,233,235,204,222,225,196,218,220,103,159,168,99,157,165,91,151,159,78,143,152,
-            60,132,142,59,130,140,212,208,200,92,153,158,63,136,146,99,156,160,115,168,173,112,165,173,120,
+            60,132,142,59,130,140,240,240,240,92,153,158,63,136,146,99,156,160,115,168,173,112,165,173,120,
             171,177,127,175,181,125,173,179,103,159,167,99,157,165,94,153,161,84,147,155,69,137,147,51,126,
-            137,68,135,144,212,208,200,92,153,158,77,142,152,160,182,184,132,167,172,80,145,154,93,153,162,
-            99,156,165,98,156,165,97,155,163,91,152,160,83,146,155,72,139,148,56,128,140,38,118,129,212,
-            208,200,212,208,200,212,208,200,68,138,150,56,132,144,212,208,200,109,157,163,91,151,159,93,153,
-            161,91,151,159,86,149,157,78,144,152,68,137,147,55,128,139,39,119,130,38,118,129,212,208,200,
-            212,208,200,212,208,200,88,152,152,88,152,152,212,208,200,130,167,172,97,152,160,81,145,154,73,
-            141,152,70,138,148,60,131,142,47,123,134,34,115,126,25,109,121,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,83,141,150,63,132,142,58,130,142,
-            51,126,137,40,119,130,28,112,123,19,104,116,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,51,121,132,24,107,119,16,103,
-            116,12,100,113,9,94,107,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,53,113,124,59,115,125,18,
-            80,92,44,92,102,15,71,81,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            137,68,135,144,240,240,240,92,153,158,77,142,152,160,182,184,132,167,172,80,145,154,93,153,162,
+            99,156,165,98,156,165,97,155,163,91,152,160,83,146,155,72,139,148,56,128,140,38,118,129,240,
+            240,240,240,240,240,240,240,240,68,138,150,56,132,144,240,240,240,109,157,163,91,151,159,93,153,
+            161,91,151,159,86,149,157,78,144,152,68,137,147,55,128,139,39,119,130,38,118,129,240,240,240,
+            240,240,240,240,240,240,88,152,152,88,152,152,240,240,240,130,167,172,97,152,160,81,145,154,73,
+            141,152,70,138,148,60,131,142,47,123,134,34,115,126,25,109,121,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,83,141,150,63,132,142,58,130,142,
+            51,126,137,40,119,130,28,112,123,19,104,116,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,51,121,132,24,107,119,16,103,
+            116,12,100,113,9,94,107,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,53,113,124,59,115,125,18,
+            80,92,44,92,102,15,71,81,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -4354,40 +4211,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,201,168,153,205,141,133,208,159,151,201,162,139,
-            200,147,130,192,142,138,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,201,161,156,209,150,131,245,181,158,227,114,101,236,154,138,244,216,196,248,230,
-            206,239,208,178,188,135,102,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,201,168,153,205,141,133,208,159,151,201,162,139,
+            200,147,130,192,142,138,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,201,161,156,209,150,131,245,181,158,227,114,101,236,154,138,244,216,196,248,230,
+            206,239,208,178,188,135,102,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             200,149,123,210,159,115,248,208,192,241,128,114,235,94,80,227,95,88,228,115,108,238,169,151,249,
-            218,193,245,218,170,208,135,90,184,127,95,212,208,200,212,208,200,212,208,200,212,208,200,207,138,
+            218,193,245,218,170,208,135,90,184,127,95,240,240,240,240,240,240,240,240,240,240,240,240,207,138,
             87,245,204,157,242,173,140,229,95,82,233,130,93,240,167,97,233,159,85,213,122,81,221,126,116,
-            237,193,158,244,197,140,194,122,63,212,208,200,212,208,200,212,208,200,188,128,82,236,167,87,251,
+            237,193,158,244,197,140,194,122,63,240,240,240,240,240,240,240,240,240,188,128,82,236,167,87,251,
             189,155,237,107,91,241,156,103,242,220,93,226,206,86,237,217,84,227,177,79,207,90,66,212,102,
-            89,236,136,100,233,144,72,173,106,65,212,208,200,212,208,200,204,127,61,238,171,85,243,131,104,
+            89,236,136,100,233,144,72,173,106,65,240,240,240,240,240,240,204,127,61,238,171,85,243,131,104,
             230,95,73,249,207,112,204,150,62,196,100,71,196,119,69,189,119,70,203,88,67,209,88,66,204,
-            86,56,204,88,36,190,99,44,212,208,200,207,179,155,227,148,71,233,131,62,235,83,59,224,85,
+            86,56,204,88,36,190,99,44,240,240,240,207,179,155,227,148,71,233,131,62,235,83,59,224,85,
             58,238,175,76,222,171,71,239,183,86,230,184,86,217,163,83,212,118,62,202,77,58,193,80,54,
             202,89,38,214,123,53,177,144,122,200,173,152,233,133,63,235,85,36,238,70,47,232,70,56,210,
             78,53,214,139,58,196,137,57,181,94,50,194,83,56,216,138,82,191,75,51,198,71,42,230,122,
             56,225,135,61,172,137,122,217,179,171,214,101,48,227,64,25,233,57,29,231,59,49,221,71,61,
             231,126,87,206,93,57,201,79,59,232,135,73,222,159,69,184,58,45,217,74,41,246,129,58,204,
-            110,50,180,148,138,212,208,200,191,102,57,240,92,55,229,54,22,227,35,38,215,60,32,235,148,
+            110,50,180,148,138,240,240,240,191,102,57,240,92,55,229,54,22,227,35,38,215,60,32,235,148,
             54,243,183,50,242,179,66,229,157,62,179,76,24,202,33,34,239,82,34,236,106,51,177,91,52,
-            212,208,200,212,208,200,183,127,90,223,93,59,244,75,38,225,43,25,225,19,27,207,35,18,199,
-            64,29,193,75,25,190,36,26,191,21,15,224,35,28,247,64,46,217,80,47,164,103,81,212,208,
-            200,212,208,200,212,208,200,184,84,69,224,62,40,244,40,33,242,25,38,224,15,35,206,15,29,
-            195,10,23,195,13,26,213,14,23,242,34,39,232,46,43,175,72,60,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,182,73,64,227,36,40,248,23,49,250,18,59,232,16,56,208,10,
-            42,209,7,34,232,22,50,214,36,51,178,58,60,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,180,101,97,182,44,59,211,20,57,224,17,68,216,21,62,201,
-            15,51,187,39,65,161,90,92,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,186,141,133,180,132,128,175,126,125,181,134,134,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            240,240,240,240,240,240,183,127,90,223,93,59,244,75,38,225,43,25,225,19,27,207,35,18,199,
+            64,29,193,75,25,190,36,26,191,21,15,224,35,28,247,64,46,217,80,47,164,103,81,240,240,
+            240,240,240,240,240,240,240,184,84,69,224,62,40,244,40,33,242,25,38,224,15,35,206,15,29,
+            195,10,23,195,13,26,213,14,23,242,34,39,232,46,43,175,72,60,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,182,73,64,227,36,40,248,23,49,250,18,59,232,16,56,208,10,
+            42,209,7,34,232,22,50,214,36,51,178,58,60,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,180,101,97,182,44,59,211,20,57,224,17,68,216,21,62,201,
+            15,51,187,39,65,161,90,92,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,186,141,133,180,132,128,175,126,125,181,134,134,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -4402,25 +4259,25 @@
         "b c #32373E",
         "c c #414041",
         "d c #303438",
-        "e c #808080",
-        "f c #ECECEB",
+        "f c #808080",
+        "g c #ECECEB",
         /* pixels */
-        "    e           ",
-        "   ed           ",
-        "  edd eddddde   ",
-        "  daadaaaaae    ",
-        " edaaaaadee     ",
-        " ddaaadde       ",
-        " daaade         ",
-        "edaadaaee       ",
-        "edaaaaaaabbb    ",
-        "edaaafcaaaaab   ",
-        "edaaaaaaaaaab   ",
-        "edaaaaaaaaaab   ",
-        "edaaaaaaaaaab   ",
-        "edaaaddaaaaa    ",
-        "edaaad bbbb     ",
-        "edaaae          "
+        "    f           ",
+        "   fd           ",
+        "  fdd fdddddf   ",
+        "  daadaaaaaf    ",
+        " fdaaaaadff     ",
+        " ddaaaddf       ",
+        " daaadf         ",
+        "fdaadaaff       ",
+        "fdaaaaaaabbb    ",
+        "fdaaagcaaaaab   ",
+        "fdaaaaaaaaaab   ",
+        "fdaaaaaaaaaab   ",
+        "fdaaaaaaaaaab   ",
+        "fdaaaddaaaaa    ",
+        "fdaaad bbbb     ",
+        "fdaaaf          "
         };
         wxBitmap bitmap( xpm_data );
         return bitmap;
@@ -4429,40 +4286,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,100,41,9,100,41,9,192,192,192,192,192,192,192,192,192,192,192,192,
-            192,192,192,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,100,41,9,100,41,9,192,192,192,0,0,0,8,3,0,1,0,0,13,5,1,54,22,
-            4,192,192,192,100,41,9,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,100,41,9,100,41,9,192,192,192,192,192,192,192,192,192,192,192,192,
+            192,192,192,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,100,41,9,100,41,9,192,192,192,0,0,0,8,3,0,1,0,0,13,5,1,54,22,
+            4,192,192,192,100,41,9,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             100,41,9,192,192,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,192,
-            192,192,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,129,63,
+            192,192,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,129,63,
             18,192,192,192,26,10,2,192,192,192,192,192,192,192,192,192,192,192,192,0,0,0,9,4,0,
-            192,192,192,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,142,74,26,192,
+            192,192,192,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,142,74,26,192,
             192,192,192,192,192,192,192,192,149,79,29,100,41,9,192,192,192,0,0,0,0,0,0,192,192,
-            192,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,199,118,49,187,109,45,
-            166,94,38,134,69,27,100,41,9,192,192,192,0,0,0,0,0,0,0,0,0,192,192,192,212,
-            208,200,212,208,200,212,208,200,212,208,200,100,41,9,100,41,9,185,108,46,187,109,45,93,45,
-            14,192,192,192,192,192,192,0,0,0,10,4,0,192,192,192,192,192,192,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,203,124,57,190,111,46,223,174,133,192,
-            192,192,0,0,0,14,10,7,192,192,192,192,192,192,50,55,62,50,55,62,212,208,200,212,208,
-            200,212,208,200,212,208,200,100,41,9,100,41,9,210,138,74,217,154,92,217,154,92,192,192,192,
-            15,14,15,0,0,0,192,192,192,230,210,186,255,255,255,196,196,192,50,55,62,212,208,200,212,
-            208,200,212,208,200,212,208,200,100,41,9,223,170,110,242,220,175,223,170,110,192,192,192,3,2,
-            0,0,0,0,192,192,192,107,108,111,23,22,20,255,255,255,50,55,62,212,208,200,212,208,200,
-            212,208,200,100,41,9,110,49,12,217,154,92,223,170,110,223,170,110,192,192,192,0,0,0,0,
-            0,0,192,192,192,198,198,194,160,160,159,235,235,233,50,55,62,212,208,200,212,208,200,212,208,
-            200,100,41,9,110,49,12,166,92,35,210,138,74,210,138,74,192,192,192,192,192,192,192,192,192,
-            197,179,159,228,228,225,228,228,225,231,231,229,50,55,62,212,208,200,212,208,200,212,208,200,100,
+            192,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,199,118,49,187,109,45,
+            166,94,38,134,69,27,100,41,9,192,192,192,0,0,0,0,0,0,0,0,0,192,192,192,240,
+            240,240,240,240,240,240,240,240,240,240,240,100,41,9,100,41,9,185,108,46,187,109,45,93,45,
+            14,192,192,192,192,192,192,0,0,0,10,4,0,192,192,192,192,192,192,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,203,124,57,190,111,46,223,174,133,192,
+            192,192,0,0,0,14,10,7,192,192,192,192,192,192,50,55,62,50,55,62,240,240,240,240,240,
+            240,240,240,240,240,240,240,100,41,9,100,41,9,210,138,74,217,154,92,217,154,92,192,192,192,
+            15,14,15,0,0,0,192,192,192,230,210,186,255,255,255,196,196,192,50,55,62,240,240,240,240,
+            240,240,240,240,240,240,240,240,100,41,9,223,170,110,242,220,175,223,170,110,192,192,192,3,2,
+            0,0,0,0,192,192,192,107,108,111,23,22,20,255,255,255,50,55,62,240,240,240,240,240,240,
+            240,240,240,100,41,9,110,49,12,217,154,92,223,170,110,223,170,110,192,192,192,0,0,0,0,
+            0,0,192,192,192,198,198,194,160,160,159,235,235,233,50,55,62,240,240,240,240,240,240,240,240,
+            240,100,41,9,110,49,12,166,92,35,210,138,74,210,138,74,192,192,192,192,192,192,192,192,192,
+            197,179,159,228,228,225,228,228,225,231,231,229,50,55,62,240,240,240,240,240,240,240,240,240,100,
             41,9,128,63,19,100,41,9,100,41,9,100,41,9,192,192,192,0,0,0,0,0,0,192,192,
-            192,170,170,166,164,165,162,50,55,62,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,
+            192,170,170,166,164,165,162,50,55,62,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,
             141,73,25,172,101,39,163,91,33,127,62,19,192,192,192,0,0,0,0,0,0,192,192,192,50,
-            55,62,50,55,62,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,143,75,
-            26,193,116,45,193,116,45,154,83,30,192,192,192,192,192,192,192,192,192,192,192,192,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            55,62,50,55,62,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,143,75,
+            26,193,116,45,193,116,45,154,83,30,192,192,192,192,192,192,192,192,192,192,192,192,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -4471,13 +4328,12 @@
         /* XPM */
         static const char *xpm_data[] = {
         /* columns rows colors chars-per-pixel */
-        "16 16 17 1",
+        "16 16 16 1",
         "  c None",
         "a c Black",
         "b c #0D1219",
         "c c #263247",
         "d c #080B0F",
-        "e c #FFFFFF",
         "f c #B20000",
         "g c #090C11",
         "h c #272728",
@@ -4486,25 +4342,25 @@
         "k c #E50000",
         "l c #1A2332",
         "m c #18202D",
-        "o c #323233",
-        "p c #1F293B",
-        "q c #2C2C2D",
+        "n c #323233",
+        "o c #1F293B",
+        "p c #2C2C2D",
         /* pixels */
         "                ",
-        " eeeeeeeeeeeeee ",
-        "eejaaieeeejaaiee",
-        "ejfkkfieejfkkfie",
-        "edfkkfieedfkkfie",
-        "egfkkfmeegfkkfme",
-        "egfkkfmeegfkkfme",
-        "egfkkfmeegfkkfme",
-        "egfkkfieegfkkfie",
-        "ebffffleebffffle",
-        "eeoqoheeeeoqohee",
-        "epffffceepffffce",
-        "ebkkkkpeebkkkkpe",
-        "eebggpeeeebggpee",
-        " eeeeeeeeeeeeee ",
+        "                ",
+        "  jaai    jaai  ",
+        " jfkkfi  jfkkfi ",
+        " dfkkfi  dfkkfi ",
+        " gfkkfm  gfkkfm ",
+        " gfkkfm  gfkkfm ",
+        " gfkkfm  gfkkfm ",
+        " gfkkfi  gfkkfi ",
+        " bffffl  bffffl ",
+        "  npnh    npnh  ",
+        " offffc  offffc ",
+        " bkkkko  bkkkko ",
+        "  bggo    bggo  ",
+        "                ",
         "                "
         };
         wxBitmap bitmap( xpm_data );
@@ -4515,13 +4371,12 @@
         /* XPM */
         static const char *xpm_data[] = {
         /* columns rows colors chars-per-pixel */
-        "16 16 17 1",
+        "16 16 16 1",
         "  c None",
         "a c Black",
         "b c #0D1219",
         "c c #263247",
         "d c #080B0F",
-        "e c #FFFFFF",
         "f c #B20000",
         "g c #090C11",
         "h c #272728",
@@ -4530,25 +4385,25 @@
         "k c #E50000",
         "l c #1A2332",
         "m c #18202D",
-        "o c #323233",
-        "p c #1F293B",
-        "q c #2C2C2D",
+        "n c #323233",
+        "o c #1F293B",
+        "p c #2C2C2D",
         /* pixels */
         "                ",
-        " eeeeeeee       ",
-        "eeejaaieee      ",
-        "eejfkkfiee      ",
-        "eedfkkfiee      ",
-        "eegfkkfmee      ",
-        "eegfkkfmee      ",
-        "eegfkkfmee      ",
-        "eegfkkfiee      ",
-        "eebfffflee      ",
-        "eeeoqoheee      ",
-        "eepffffcee      ",
-        "eebkkkkpee      ",
-        "eeebggpeee      ",
-        " eeeeeeee       ",
+        "                ",
+        "   jaai         ",
+        "  jfkkfi        ",
+        "  dfkkfi        ",
+        "  gfkkfm        ",
+        "  gfkkfm        ",
+        "  gfkkfm        ",
+        "  gfkkfi        ",
+        "  bffffl        ",
+        "   npnh         ",
+        "  offffc        ",
+        "  bkkkko        ",
+        "   bggo         ",
+        "                ",
         "                "
         };
         wxBitmap bitmap( xpm_data );
@@ -4559,12 +4414,11 @@
         /* XPM */
         static const char *xpm_data[] = {
         /* columns rows colors chars-per-pixel */
-        "16 16 17 1",
+        "16 16 16 1",
         "  c None",
         "a c #0D1219",
         "b c #263247",
         "c c #080B0F",
-        "d c #FFFFFF",
         "e c #090C11",
         "f c #272728",
         "g c #161E2A",
@@ -4574,25 +4428,25 @@
         "k c #18202D",
         "l c #D1761A",
         "m c #F0981B",
-        "o c #323233",
-        "p c #1F293B",
-        "q c #2C2C2D",
+        "n c #323233",
+        "o c #1F293B",
+        "p c #2C2C2D",
         /* pixels */
         "                ",
-        " dddddddd       ",
-        "dddjecpddd      ",
-        "ddjmmmmpdd      ",
-        "ddillllbdd      ",
-        "dddoqofddd      ",
-        "ddallllidd      ",
-        "ddelmmlgdd      ",
-        "ddelmmlkdd      ",
-        "ddelmmlkdd      ",
-        "ddelmmlgdd      ",
-        "ddclmmlgdd      ",
-        "ddhlmmlgdd      ",
-        "dddhhhgddd      ",
-        " dddddddd       ",
+        "                ",
+        "   jeco         ",
+        "  jmmmmo        ",
+        "  illllb        ",
+        "   npnf         ",
+        "  alllli        ",
+        "  elmmlg        ",
+        "  elmmlk        ",
+        "  elmmlk        ",
+        "  elmmlg        ",
+        "  clmmlg        ",
+        "  hlmmlg        ",
+        "   hhhg         ",
+        "                ",
         "                "
         };
         wxBitmap bitmap( xpm_data );
@@ -4603,12 +4457,11 @@
         /* XPM */
         static const char *xpm_data[] = {
         /* columns rows colors chars-per-pixel */
-        "16 16 17 1",
+        "16 16 16 1",
         "  c None",
         "a c #0D1219",
         "b c #263247",
         "c c #080B0F",
-        "d c #FFFFFF",
         "e c #090C11",
         "f c #272728",
         "g c #59B200",
@@ -4618,25 +4471,25 @@
         "k c #10151F",
         "l c #18202D",
         "m c #72E500",
-        "o c #323233",
-        "p c #1F293B",
-        "q c #2C2C2D",
+        "n c #323233",
+        "o c #1F293B",
+        "p c #2C2C2D",
         /* pixels */
         "                ",
-        " dddddddd       ",
-        "dddkecpddd      ",
-        "ddkmmmmpdd      ",
-        "ddjggggbdd      ",
-        "dddoqofddd      ",
-        "ddaggggjdd      ",
-        "ddegmmghdd      ",
-        "ddegmmgldd      ",
-        "ddegmmgldd      ",
-        "ddegmmghdd      ",
-        "ddcgmmghdd      ",
-        "ddigmmghdd      ",
-        "dddiiihddd      ",
-        " dddddddd       ",
+        "                ",
+        "   keco         ",
+        "  kmmmmo        ",
+        "  jggggb        ",
+        "   npnf         ",
+        "  aggggj        ",
+        "  egmmgh        ",
+        "  egmmgl        ",
+        "  egmmgl        ",
+        "  egmmgh        ",
+        "  cgmmgh        ",
+        "  igmmgh        ",
+        "   iiih         ",
+        "                ",
         "                "
         };
         wxBitmap bitmap( xpm_data );
@@ -4647,12 +4500,11 @@
         /* XPM */
         static const char *xpm_data[] = {
         /* columns rows colors chars-per-pixel */
-        "16 16 17 1",
+        "16 16 16 1",
         "  c None",
         "a c #0D1219",
         "b c #263247",
         "c c #080B0F",
-        "d c #FFFFFF",
         "e c #090C11",
         "f c #272728",
         "g c #59B200",
@@ -4662,25 +4514,25 @@
         "k c #10151F",
         "l c #18202D",
         "m c #72E500",
-        "o c #323233",
-        "p c #1F293B",
-        "q c #2C2C2D",
+        "n c #323233",
+        "o c #1F293B",
+        "p c #2C2C2D",
         /* pixels */
         "                ",
-        " dddddddddddddd ",
-        "ddkecpddddkecpdd",
-        "dkmmmmpddkmmmmpd",
-        "djggggbddjggggbd",
-        "ddoqofddddoqofdd",
-        "daggggjddaggggjd",
-        "degmmghddegmmghd",
-        "degmmglddegmmgld",
-        "degmmglddegmmgld",
-        "degmmghddegmmghd",
-        "dcgmmghddcgmmghd",
-        "digmmghddigmmghd",
-        "ddiiihddddiiihdd",
-        " dddddddddddddd ",
+        "                ",
+        "  keco    keco  ",
+        " kmmmmo  kmmmmo ",
+        " jggggb  jggggb ",
+        "  npnf    npnf  ",
+        " aggggj  aggggj ",
+        " egmmgh  egmmgh ",
+        " egmmgl  egmmgl ",
+        " egmmgl  egmmgl ",
+        " egmmgh  egmmgh ",
+        " cgmmgh  cgmmgh ",
+        " igmmgh  igmmgh ",
+        "  iiih    iiih  ",
+        "                ",
         "                "
         };
         wxBitmap bitmap( xpm_data );
@@ -4690,40 +4542,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,0,81,156,0,81,156,0,81,156,212,208,200,0,81,156,0,81,156,0,81,156,212,
-            208,200,0,71,139,0,71,139,0,71,139,212,208,200,0,71,139,0,64,125,0,53,107,212,208,
-            200,0,81,156,168,199,228,184,207,227,0,81,156,180,205,227,168,199,228,174,202,228,0,81,156,
-            168,199,228,168,199,228,160,196,228,0,71,139,160,196,228,168,199,228,0,53,107,212,208,200,0,
-            81,156,228,237,245,0,81,156,212,208,200,0,81,156,219,233,246,0,81,156,212,208,200,0,81,
-            156,206,227,246,0,71,139,212,208,200,0,71,139,191,220,247,0,53,107,212,208,200,0,81,156,
+            240,240,240,0,81,156,0,81,156,0,81,156,240,240,240,0,81,156,0,81,156,0,81,156,240,
+            240,240,0,71,139,0,71,139,0,71,139,240,240,240,0,71,139,0,64,125,0,53,107,240,240,
+            240,0,81,156,168,199,228,184,207,227,0,81,156,180,205,227,168,199,228,174,202,228,0,81,156,
+            168,199,228,168,199,228,160,196,228,0,71,139,160,196,228,168,199,228,0,53,107,240,240,240,0,
+            81,156,228,237,245,0,81,156,240,240,240,0,81,156,219,233,246,0,81,156,240,240,240,0,81,
+            156,206,227,246,0,71,139,240,240,240,0,71,139,191,220,247,0,53,107,240,240,240,0,81,156,
             228,237,245,152,188,220,0,81,156,149,187,220,236,244,252,149,187,220,0,81,156,143,184,221,220,
-            237,252,140,182,221,0,71,139,140,182,221,196,228,252,0,53,107,212,208,200,0,81,156,243,247,
+            237,252,140,182,221,0,71,139,140,182,221,196,228,252,0,53,107,240,240,240,0,81,156,243,247,
             251,243,247,251,189,214,236,236,244,252,236,244,252,230,242,252,180,210,237,220,237,252,220,237,252,
-            213,235,252,170,205,237,204,229,253,196,228,252,0,53,107,212,208,200,0,81,156,236,244,252,236,
+            213,235,252,170,205,237,204,229,253,196,228,252,0,53,107,240,240,240,0,81,156,236,244,252,236,
             244,252,236,244,252,236,244,252,230,242,252,230,242,252,220,237,252,220,237,252,213,235,252,209,231,
-            253,204,229,253,196,228,252,188,223,253,0,53,107,212,208,200,0,81,156,236,244,252,129,178,222,
+            253,204,229,253,196,228,252,188,223,253,0,53,107,240,240,240,0,81,156,236,244,252,129,178,222,
             44,125,199,124,178,226,91,154,212,44,125,199,44,125,199,44,125,199,84,151,212,112,171,221,132,
-            184,230,196,228,252,181,221,252,0,53,107,212,208,200,0,81,156,230,242,252,230,242,252,230,242,
+            184,230,196,228,252,181,221,252,0,53,107,240,240,240,0,81,156,230,242,252,230,242,252,230,242,
             252,230,242,252,220,237,252,220,237,252,213,235,252,213,235,252,204,229,253,196,228,252,196,228,252,
-            188,223,253,174,219,251,0,53,107,212,208,200,0,81,156,220,237,252,123,175,222,91,154,212,44,
+            188,223,253,174,219,251,0,53,107,240,240,240,0,81,156,220,237,252,123,175,222,91,154,212,44,
             125,199,44,125,199,44,125,199,84,151,212,153,198,236,196,228,252,189,226,250,188,223,253,181,221,
-            252,163,212,250,0,53,107,212,208,200,0,71,139,213,235,252,213,235,252,213,235,252,207,232,251,
+            252,163,212,250,0,53,107,240,240,240,0,71,139,213,235,252,213,235,252,213,235,252,207,232,251,
             204,229,253,204,229,253,196,228,252,196,228,252,189,226,250,181,221,252,181,221,252,171,215,252,155,
-            210,250,0,53,107,212,208,200,0,71,139,204,229,253,112,171,221,84,151,212,36,122,199,36,122,
+            210,250,0,53,107,240,240,240,0,71,139,204,229,253,112,171,221,84,151,212,36,122,199,36,122,
             199,76,148,212,36,122,199,36,122,199,70,146,212,96,163,222,139,195,239,163,212,250,146,206,250,
-            0,53,107,212,208,200,0,71,139,196,228,252,189,226,250,189,226,250,188,223,253,181,221,252,181,
+            0,53,107,240,240,240,0,71,139,196,228,252,189,226,250,189,226,250,188,223,253,181,221,252,181,
             221,252,174,219,251,174,219,251,163,212,250,163,212,250,163,212,250,155,210,250,137,202,250,0,53,
-            107,212,208,200,0,62,122,181,221,252,70,146,212,36,122,199,36,122,199,70,146,212,107,175,228,
-            64,143,212,31,120,199,30,119,199,61,141,212,81,158,221,93,167,228,124,195,248,0,53,107,212,
-            208,200,0,62,122,149,208,248,146,206,250,137,202,250,139,203,247,139,203,247,134,203,249,134,203,
-            249,134,203,249,130,199,249,130,199,249,124,195,248,117,191,246,100,179,243,0,53,107,212,208,200,
+            107,240,240,240,0,62,122,181,221,252,70,146,212,36,122,199,36,122,199,70,146,212,107,175,228,
+            64,143,212,31,120,199,30,119,199,61,141,212,81,158,221,93,167,228,124,195,248,0,53,107,240,
+            240,240,0,62,122,149,208,248,146,206,250,137,202,250,139,203,247,139,203,247,134,203,249,134,203,
+            249,134,203,249,130,199,249,130,199,249,124,195,248,117,191,246,100,179,243,0,53,107,240,240,240,
             0,62,122,109,185,242,109,185,242,109,185,242,104,181,239,104,181,239,109,185,242,109,185,242,109,
-            185,242,105,183,243,100,179,243,100,179,243,94,173,241,87,168,238,0,53,107,212,208,200,0,53,
+            185,242,105,183,243,100,179,243,100,179,243,94,173,241,87,168,238,0,53,107,240,240,240,0,53,
             107,0,53,107,0,53,107,0,53,107,0,53,107,0,53,107,0,53,107,0,53,107,0,53,107,
             0,53,107,0,53,107,0,53,107,0,53,107,0,53,107,0,53,107
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -4734,17 +4586,17 @@
         /* columns rows colors chars-per-pixel */
         "16 16 3 1",
         "  c None",
-        "a c #00FFFF",
-        "b c #0000FF",
+        "b c #00FFFF",
+        "c c #0000FF",
         /* pixels */
-        "  bbba          ",
-        "  bba           ",
-        "  ba            ",
-        "  ba            ",
-        " bbba           ",
-        "bbabba          ",
-        " bbba           ",
-        "  ba            ",
+        "  cccb          ",
+        "  ccb           ",
+        "  cb            ",
+        "  cb            ",
+        " cccb           ",
+        "ccbccb          ",
+        " cccb           ",
+        "  cb            ",
         "                ",
         "                ",
         "                ",
@@ -4774,33 +4626,33 @@
         "c c #6F4848",
         "d c #7F0000",
         "e c #220000",
-        "f c #444444",
-        "g c #888888",
-        "h c #8C0000",
-        "i c #4C4040",
-        "j c #C10000",
-        "k c #191919",
-        "l c #2A2A2A",
-        "m c #FF0000",
-        "n c #666666",
+        "g c #444444",
+        "h c #888888",
+        "i c #8C0000",
+        "j c #4C4040",
+        "k c #C10000",
+        "l c #191919",
+        "m c #2A2A2A",
+        "n c #FF0000",
+        "o c #666666",
         "p c #333333",
         /* pixels */
-        "          h     ",
-        "         dma    ",
-        "        dmjma   ",
-        "       dmjhjma  ",
-        "      amjhlhjma ",
-        "      aapanpaaa ",
-        "         aga    ",
-        "     kpk ana    ",
-        "     pnp ppa    ",
-        "     fgi        ",
-        "  bebanabeb     ",
-        "  cmjhphjmi     ",
-        "   cmjhjmi      ",
-        "    cmjmi       ",
-        "     cmi        ",
-        "      h         "
+        "          i     ",
+        "         dna    ",
+        "        dnkna   ",
+        "       dnkikna  ",
+        "      ankimikna ",
+        "      aapaopaaa ",
+        "         aha    ",
+        "     lpl aoa    ",
+        "     pop ppa    ",
+        "     ghj        ",
+        "  bebaoabeb     ",
+        "  cnkipiknj     ",
+        "   cnkiknj      ",
+        "    cnknj       ",
+        "     cnj        ",
+        "      i         "
         };
         wxBitmap bitmap( xpm_data );
         return bitmap;
@@ -4947,21 +4799,21 @@
         "b c #A81313",
         "c c #F05151",
         "d c #6A0C0C",
-        "e c #FFFFFF",
-        "f c #F7ADAD",
-        "g c #C11515",
-        "h c #C41616",
-        "i c #7A0D0D",
-        "j c #9C1010",
-        "k c #B21414",
-        "l c #FBD8D8",
-        "m c #680B0B",
-        "n c #E51A1A",
-        "o c #ED2222",
-        "p c #C91616",
-        "q c #EF4848",
-        "r c #560909",
-        "s c #DA1919",
+        "f c #FFFFFF",
+        "g c #F7ADAD",
+        "h c #C11515",
+        "i c #C41616",
+        "j c #7A0D0D",
+        "k c #9C1010",
+        "l c #B21414",
+        "m c #FBD8D8",
+        "n c #680B0B",
+        "o c #E51A1A",
+        "p c #ED2222",
+        "q c #C91616",
+        "r c #EF4848",
+        "s c #560909",
+        "t c #DA1919",
         "u c #F59191",
         "v c #F04C4C",
         "w c #7B0D0D",
@@ -4974,13 +4826,13 @@
         "                ",
         "                ",
         "                ",
-        " cfelc          ",
-        "  vuqn          ",
-        "  oqnp          ",
-        " ksgwb          ",
-        " dhi i          ",
-        " aj             ",
-        "  rm            ",
+        " cgfmc          ",
+        "  vuro          ",
+        "  proq          ",
+        " lthwb          ",
+        " dij j          ",
+        " ak             ",
+        "  sn            ",
         "                "
         };
         wxBitmap bitmap( xpm_data );
@@ -5204,22 +5056,22 @@
         /* columns rows colors chars-per-pixel */
         "16 16 9 1",
         "  c None",
-        "a c #25853C",
-        "b c #134943",
-        "c c #31A941",
-        "d c #2ACB2A",
+        "b c #25853C",
+        "c c #134943",
+        "d c #31A941",
+        "e c #2ACB2A",
         "f c #16632F",
         "g c #1F812F",
         "h c #43FC3F",
         "i c #0E5245",
         /* pixels */
         "                ",
-        "            ib  ",
-        "             hc ",
+        "            ic  ",
+        "             hd ",
         "          h hhh ",
-        "          hdhha ",
+        "          hehhb ",
         "          hhhh  ",
-        "          hhdg  ",
+        "          hheg  ",
         "          hhhhf ",
         "                ",
         "                ",
@@ -5242,40 +5094,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,128,67,11,128,67,11,
-            128,67,11,128,67,11,128,67,11,128,67,11,128,67,11,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,128,67,11,192,133,75,192,133,75,179,120,
-            61,166,107,50,166,107,50,128,67,11,128,67,11,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,128,67,11,128,67,11,128,67,11,128,67,11,128,67,11,128,
-            67,11,128,67,11,148,88,32,128,67,11,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,128,67,11,245,193,137,226,168,106,219,162,100,212,156,94,212,156,94,
-            128,67,11,148,88,32,128,67,11,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,128,67,11,226,168,106,219,162,100,212,156,94,212,156,94,212,156,94,128,67,
-            11,148,88,32,125,66,12,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,125,66,12,212,156,94,200,146,86,200,146,86,200,146,86,200,146,86,125,66,12,143,
-            85,31,125,66,12,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,114,58,6,183,131,75,183,131,75,183,131,75,183,131,75,183,131,75,114,58,6,135,80,29,
-            114,58,6,212,208,200,212,208,200,115,115,115,115,115,115,115,115,115,105,105,105,121,71,20,161,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,128,67,11,128,67,11,
+            128,67,11,128,67,11,128,67,11,128,67,11,128,67,11,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,128,67,11,192,133,75,192,133,75,179,120,
+            61,166,107,50,166,107,50,128,67,11,128,67,11,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,128,67,11,128,67,11,128,67,11,128,67,11,128,67,11,128,
+            67,11,128,67,11,148,88,32,128,67,11,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,128,67,11,245,193,137,226,168,106,219,162,100,212,156,94,212,156,94,
+            128,67,11,148,88,32,128,67,11,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,128,67,11,226,168,106,219,162,100,212,156,94,212,156,94,212,156,94,128,67,
+            11,148,88,32,125,66,12,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,125,66,12,212,156,94,200,146,86,200,146,86,200,146,86,200,146,86,125,66,12,143,
+            85,31,125,66,12,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,114,58,6,183,131,75,183,131,75,183,131,75,183,131,75,183,131,75,114,58,6,135,80,29,
+            114,58,6,240,240,240,240,240,240,115,115,115,115,115,115,115,115,115,105,105,105,121,71,20,161,
             106,39,161,106,39,161,106,39,161,106,39,161,106,39,161,106,39,128,67,11,109,52,0,152,93,
-            30,152,93,30,212,208,200,205,205,205,241,241,241,205,205,205,138,138,138,166,107,50,239,183,123,
+            30,152,93,30,240,240,240,205,205,205,241,241,241,205,205,205,138,138,138,166,107,50,239,183,123,
             253,198,137,255,223,189,255,234,211,255,241,226,252,212,168,161,106,39,161,106,39,226,168,106,254,
             209,159,109,52,0,115,115,115,115,115,115,115,115,115,105,105,105,166,107,50,221,164,105,232,175,
             115,201,143,84,157,95,36,143,80,22,125,66,12,198,139,80,254,221,183,254,209,159,109,52,0,
-            212,208,200,85,85,85,85,85,85,75,75,75,68,68,68,166,107,50,201,143,84,230,174,113,250,
-            203,150,254,221,183,254,230,201,254,230,201,254,221,183,214,164,112,109,52,0,212,208,200,212,208,
-            200,75,75,75,75,75,75,75,75,75,43,43,43,114,62,14,109,52,0,192,133,75,234,177,117,
-            248,193,132,232,175,115,192,133,75,109,52,0,109,52,0,212,208,200,212,208,200,212,208,200,43,
-            43,43,43,43,43,43,43,43,212,208,200,212,208,200,212,208,200,109,52,0,109,52,0,109,52,
-            0,109,52,0,109,52,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            240,240,240,85,85,85,85,85,85,75,75,75,68,68,68,166,107,50,201,143,84,230,174,113,250,
+            203,150,254,221,183,254,230,201,254,230,201,254,221,183,214,164,112,109,52,0,240,240,240,240,240,
+            240,75,75,75,75,75,75,75,75,75,43,43,43,114,62,14,109,52,0,192,133,75,234,177,117,
+            248,193,132,232,175,115,192,133,75,109,52,0,109,52,0,240,240,240,240,240,240,240,240,240,43,
+            43,43,43,43,43,43,43,43,240,240,240,240,240,240,240,240,240,109,52,0,109,52,0,109,52,
+            0,109,52,0,109,52,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5283,12 +5135,12 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,27,73,140,27,73,140,27,73,140,27,73,140,27,
-            73,140,27,73,140,27,73,140,27,73,140,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,27,73,140,27,73,140,59,107,179,77,129,205,95,146,225,95,146,225,95,146,225,
-            95,146,225,77,129,205,59,107,179,27,73,140,27,73,140,212,208,200,212,208,200,212,208,200,27,
+            240,240,240,240,240,240,240,240,240,240,240,240,27,73,140,27,73,140,27,73,140,27,73,140,27,
+            73,140,27,73,140,27,73,140,27,73,140,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,27,73,140,27,73,140,59,107,179,77,129,205,95,146,225,95,146,225,95,146,225,
+            95,146,225,77,129,205,59,107,179,27,73,140,27,73,140,240,240,240,240,240,240,240,240,240,27,
             73,140,49,97,168,81,133,210,95,146,225,101,153,233,101,153,233,73,120,188,101,153,233,101,153,
-            233,101,153,233,101,153,233,95,146,225,59,107,179,27,73,140,212,208,200,27,73,140,49,97,168,
+            233,101,153,233,101,153,233,95,146,225,59,107,179,27,73,140,240,240,240,27,73,140,49,97,168,
             95,146,225,101,153,233,101,153,233,101,153,233,77,125,195,82,65,0,82,132,206,101,153,233,101,
             153,233,111,162,243,111,162,243,111,162,243,77,125,195,27,73,140,24,65,124,70,121,196,101,153,
             233,101,153,233,101,153,233,77,125,195,88,71,0,178,167,63,79,92,86,95,143,218,111,162,243,
@@ -5304,19 +5156,19 @@
             245,232,66,255,244,75,255,244,75,215,207,69,49,52,37,15,39,74,21,56,107,27,73,140,27,
             73,140,15,39,74,18,47,90,67,81,82,145,121,0,159,135,0,119,99,0,92,74,0,92,74,
             0,92,74,0,92,74,0,82,65,0,49,52,37,21,56,107,24,65,124,27,73,140,24,65,124,
-            15,39,74,212,208,200,82,65,0,167,142,0,185,158,0,185,158,0,185,158,0,185,158,0,179,
-            153,0,172,146,0,135,114,0,82,65,0,21,56,107,24,65,124,21,56,107,15,39,74,212,208,
-            200,212,208,200,82,65,0,179,153,0,185,158,0,185,158,0,185,158,0,185,158,0,185,158,0,
-            185,158,0,185,158,0,82,65,0,18,47,90,15,39,74,15,39,74,212,208,200,212,208,200,212,
-            208,200,82,65,0,82,65,0,82,65,0,130,108,0,172,146,0,185,158,0,185,158,0,185,158,
-            0,185,158,0,82,65,0,15,39,74,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,82,65,0,82,65,0,82,65,0,82,65,0,82,65,0,82,
-            65,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            15,39,74,240,240,240,82,65,0,167,142,0,185,158,0,185,158,0,185,158,0,185,158,0,179,
+            153,0,172,146,0,135,114,0,82,65,0,21,56,107,24,65,124,21,56,107,15,39,74,240,240,
+            240,240,240,240,82,65,0,179,153,0,185,158,0,185,158,0,185,158,0,185,158,0,185,158,0,
+            185,158,0,185,158,0,82,65,0,18,47,90,15,39,74,15,39,74,240,240,240,240,240,240,240,
+            240,240,82,65,0,82,65,0,82,65,0,130,108,0,172,146,0,185,158,0,185,158,0,185,158,
+            0,185,158,0,82,65,0,15,39,74,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,82,65,0,82,65,0,82,65,0,82,65,0,82,65,0,82,
+            65,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5357,40 +5209,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            255,141,0,255,155,44,255,147,40,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,213,219,245,167,180,221,212,208,200,255,159,16,255,220,
-            149,239,211,89,245,145,4,189,84,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,194,198,216,255,255,255,255,255,255,230,238,255,234,172,96,214,187,56,225,
-            170,5,250,142,11,227,100,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,196,203,220,255,255,255,239,245,255,242,179,122,245,167,91,250,230,153,253,225,119,230,203,108,
-            245,132,36,252,110,0,130,51,0,212,208,200,212,208,200,212,208,200,212,208,200,200,205,219,255,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            255,141,0,255,155,44,255,147,40,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,213,219,245,167,180,221,240,240,240,255,159,16,255,220,
+            149,239,211,89,245,145,4,189,84,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,194,198,216,255,255,255,255,255,255,230,238,255,234,172,96,214,187,56,225,
+            170,5,250,142,11,227,100,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,196,203,220,255,255,255,239,245,255,242,179,122,245,167,91,250,230,153,253,225,119,230,203,108,
+            245,132,36,252,110,0,130,51,0,240,240,240,240,240,240,240,240,240,240,240,240,200,205,219,255,
             255,255,253,185,116,254,179,95,250,244,177,247,245,142,244,224,119,242,214,111,253,188,83,250,132,
-            38,255,104,0,189,84,0,212,208,200,212,208,200,212,208,200,203,206,211,255,255,255,255,150,34,
+            38,255,104,0,189,84,0,240,240,240,240,240,240,240,240,240,203,206,211,255,255,255,255,150,34,
             253,255,190,249,255,151,247,252,149,247,235,133,243,225,123,249,198,94,251,153,56,248,121,19,255,
-            101,0,233,100,0,212,208,200,212,208,200,240,240,240,255,255,255,255,255,255,254,179,95,253,255,
+            101,0,233,100,0,240,240,240,240,240,240,240,241,240,255,255,255,255,255,255,254,179,95,253,255,
             179,249,251,148,246,246,149,247,235,133,251,203,98,254,177,78,248,149,44,255,129,16,255,92,0,
-            255,116,0,156,66,16,212,208,200,231,235,238,205,219,234,238,252,255,255,242,232,251,205,129,249,
+            255,116,0,156,66,16,240,240,240,231,235,238,205,219,234,238,252,255,255,242,232,251,205,129,249,
             255,151,246,246,149,253,225,119,255,202,98,247,168,64,255,145,20,255,140,8,219,182,134,176,206,
-            253,179,98,50,212,208,200,212,208,200,255,145,7,224,155,85,190,200,229,236,166,101,255,255,173,
+            253,179,98,50,240,240,240,240,240,240,255,145,7,224,155,85,190,200,229,236,166,101,255,255,173,
             253,250,143,255,222,113,248,185,75,255,175,41,235,203,147,202,219,255,195,204,231,190,200,229,181,
-            156,152,130,44,0,212,208,200,255,186,58,255,228,152,255,240,45,237,160,33,237,219,156,249,244,
+            156,152,130,44,0,240,240,240,255,186,58,255,228,152,255,240,45,237,160,33,237,219,156,249,244,
             126,244,212,104,249,227,169,232,244,255,217,224,240,217,224,240,208,221,241,176,134,112,186,103,52,
-            68,15,0,212,208,200,212,208,200,255,134,20,253,199,136,255,230,42,231,160,70,255,255,198,255,
-            255,255,255,255,255,245,250,255,245,250,255,209,176,158,196,109,50,130,44,0,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,236,115,12,243,182,123,237,160,33,255,255,255,255,255,255,
-            255,255,255,247,228,215,213,127,62,167,70,10,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,211,95,0,226,149,83,233,186,137,255,255,255,226,149,
-            83,195,91,19,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,250,175,112,206,91,10,0,0,0,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            68,15,0,240,240,240,240,240,240,255,134,20,253,199,136,255,230,42,231,160,70,255,255,198,255,
+            255,255,255,255,255,245,250,255,245,250,255,209,176,158,196,109,50,130,44,0,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,236,115,12,243,182,123,237,160,33,255,255,255,255,255,255,
+            255,255,255,247,228,215,213,127,62,167,70,10,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,211,95,0,226,149,83,233,186,137,255,255,255,226,149,
+            83,195,91,19,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,250,175,112,206,91,10,0,0,0,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5398,40 +5250,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            255,79,1,252,57,48,252,49,44,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,250,204,254,228,137,251,212,208,200,252,85,20,251,153,
-            190,251,118,77,249,71,1,190,18,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,242,161,249,255,255,255,255,255,255,253,233,253,252,78,135,245,77,25,226,
-            98,4,254,66,8,228,32,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,243,166,250,255,255,255,253,241,253,253,111,181,253,83,135,252,152,171,252,145,120,249,89,112,
-            253,29,34,252,42,0,130,6,0,212,208,200,212,208,200,212,208,200,212,208,200,245,170,250,255,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            255,79,1,252,57,48,252,49,44,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,250,204,254,228,137,251,240,240,240,252,85,20,251,153,
+            190,251,118,77,249,71,1,190,18,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,242,161,249,255,255,255,255,255,255,253,233,253,252,78,135,245,77,25,226,
+            98,4,254,66,8,228,32,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,243,166,250,255,255,255,253,241,253,253,111,181,253,83,135,252,152,171,252,145,120,249,89,112,
+            253,29,34,252,42,0,130,6,0,240,240,240,240,240,240,240,240,240,240,240,240,245,170,250,255,
             255,255,253,117,171,253,97,137,250,178,178,251,205,139,252,135,112,252,105,102,253,83,91,253,35,
-            40,255,43,1,190,18,0,212,208,200,212,208,200,212,208,200,245,166,248,255,255,255,252,63,38,
+            40,255,43,1,190,18,0,240,240,240,240,240,240,240,240,240,245,166,248,255,255,255,252,63,38,
             249,253,193,250,254,152,251,238,151,252,166,128,252,134,114,253,91,99,253,55,69,254,31,14,255,
-            37,1,234,33,0,212,208,200,212,208,200,253,227,252,255,255,255,255,255,255,253,97,137,249,253,
+            37,1,234,33,0,240,240,240,240,240,240,253,227,252,255,255,255,255,255,255,253,97,137,249,253,
             181,251,233,149,251,207,145,252,166,128,252,98,98,253,79,95,253,39,39,252,53,20,255,31,1,
-            255,49,1,162,10,25,212,208,200,251,217,253,246,187,253,251,243,250,253,235,253,253,127,171,250,
+            255,49,1,162,10,25,240,240,240,251,217,253,246,187,253,251,243,250,253,235,253,253,127,171,250,
             254,152,251,207,145,252,145,120,251,103,106,253,59,68,252,67,24,253,68,11,249,105,190,235,176,
-            254,210,20,74,212,208,200,212,208,200,253,78,9,250,60,123,241,168,252,252,86,152,247,253,175,
+            254,210,20,74,240,240,240,240,240,240,253,78,9,250,60,123,241,168,252,252,86,152,247,253,175,
             251,230,145,251,143,117,253,75,71,252,93,44,252,130,199,247,205,253,244,174,252,241,168,252,235,
-            99,218,130,3,0,212,208,200,252,98,62,250,158,182,252,221,48,252,62,18,251,143,196,252,208,
+            99,218,130,3,0,240,240,240,252,98,62,250,158,182,252,221,48,252,62,18,251,143,196,252,208,
             124,252,107,96,252,166,211,253,235,253,250,205,253,250,205,253,247,197,253,230,58,171,220,18,75,
-            68,0,0,212,208,200,212,208,200,252,56,24,253,137,194,252,196,46,251,51,84,244,253,201,255,
-            255,255,255,255,255,254,246,253,254,246,253,247,121,222,232,14,65,130,3,0,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,246,25,2,253,113,182,252,62,18,255,255,255,255,255,255,
-            255,255,255,254,208,249,248,28,85,166,12,15,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,25,0,251,59,122,252,118,197,255,255,255,251,59,
-            122,202,12,21,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,254,108,173,208,18,8,0,0,0,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            68,0,0,240,240,240,240,240,240,252,56,24,253,137,194,252,196,46,251,51,84,244,253,201,255,
+            255,255,255,255,255,254,246,253,254,246,253,247,121,222,232,14,65,130,3,0,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,246,25,2,253,113,182,252,62,18,255,255,255,255,255,255,
+            255,255,255,254,208,249,248,28,85,166,12,15,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,212,25,0,251,59,122,252,118,197,255,255,255,251,59,
+            122,202,12,21,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,254,108,173,208,18,8,0,0,0,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5442,25 +5294,25 @@
         /* columns rows colors chars-per-pixel */
         "16 16 4 1",
         "  c None",
-        "a c #FFFFFF",
-        "b c #000080",
-        "c c #BFBFDF",
+        "b c #FFFFFF",
+        "c c #000080",
+        "d c #BFBFDF",
         /* pixels */
         "                ",
-        "  bbbbbbbbbbbb  ",
-        " baaaaaaaaaaaab ",
-        " baaaaaaaaaaaab ",
-        " baabbcaacbbaab ",
-        " baabbbccbbbaab ",
-        " baacbbbbbbcaab ",
-        " baaacbbbbcaaab ",
-        " baaacbbbbcaaab ",
-        " baacbbbbbbcaab ",
-        " baabbbccbbbaab ",
-        " baabbcaacbbaab ",
-        " baaaaaaaaaaaab ",
-        " baaaaaaaaaaaab ",
-        "  bbbbbbbbbbbb  ",
+        "  cccccccccccc  ",
+        " cbbbbbbbbbbbbc ",
+        " cbbbbbbbbbbbbc ",
+        " cbbccdbbdccbbc ",
+        " cbbcccddcccbbc ",
+        " cbbdccccccdbbc ",
+        " cbbbdccccdbbbc ",
+        " cbbbdccccdbbbc ",
+        " cbbdccccccdbbc ",
+        " cbbcccddcccbbc ",
+        " cbbccdbbdccbbc ",
+        " cbbbbbbbbbbbbc ",
+        " cbbbbbbbbbbbbc ",
+        "  cccccccccccc  ",
         "                "
         };
         wxBitmap bitmap( xpm_data );
@@ -5473,26 +5325,26 @@
         /* columns rows colors chars-per-pixel */
         "16 16 5 1",
         "  c None",
-        "a c #FFFFFF",
-        "b c #000080",
-        "c c #E2D704",
-        "d c #BFBFDF",
+        "b c #FFFFFF",
+        "c c #000080",
+        "d c #E2D704",
+        "e c #BFBFDF",
         /* pixels */
         "                ",
-        "  bbbbbbbbbbbb  ",
-        " bccccccccccccb ",
-        " bcaaaaaaaaaacb ",
-        " bcabbdaadbbacb ",
-        " bcabbbddbbbacb ",
-        " bcadbbbbbbdacb ",
-        " bcaadbbbbdaacb ",
-        " bcaadbbbbdaacb ",
-        " bcadbbbbbbdacb ",
-        " bcabbbddbbbacb ",
-        " bcabbdaadbbacb ",
-        " bcaaaaaaaaaacb ",
-        " bccccccccccccb ",
-        "  bbbbbbbbbbbb  ",
+        "  cccccccccccc  ",
+        " cddddddddddddc ",
+        " cdbbbbbbbbbbdc ",
+        " cdbccebbeccbdc ",
+        " cdbccceecccbdc ",
+        " cdbeccccccebdc ",
+        " cdbbeccccebbdc ",
+        " cdbbeccccebbdc ",
+        " cdbeccccccebdc ",
+        " cdbccceecccbdc ",
+        " cdbccebbeccbdc ",
+        " cdbbbbbbbbbbdc ",
+        " cddddddddddddc ",
+        "  cccccccccccc  ",
         "                "
         };
         wxBitmap bitmap( xpm_data );
@@ -5502,40 +5354,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,100,41,9,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,100,41,9,100,41,9,128,63,18,212,208,200,100,41,9,100,41,9,100,41,9,100,41,
-            9,100,41,9,100,41,9,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,100,41,9,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,100,41,9,100,41,9,128,63,18,240,240,240,100,41,9,100,41,9,100,41,9,100,41,
+            9,100,41,9,100,41,9,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             100,41,9,188,109,45,128,63,18,100,41,9,242,220,175,233,195,143,223,170,110,206,130,64,172,
-            98,38,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,127,62,
+            98,38,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,127,62,
             19,165,92,35,100,41,9,242,220,175,223,170,110,214,148,85,188,109,45,100,41,9,100,41,9,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,142,74,25,206,
-            130,64,223,170,110,214,148,85,149,79,29,100,41,9,100,41,9,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,199,118,49,188,109,45,
-            168,94,37,134,69,27,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,100,41,9,100,41,9,188,109,45,188,109,45,93,45,
-            14,222,170,125,180,123,80,128,64,23,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,203,124,57,188,109,45,223,174,133,255,
-            255,255,212,208,200,147,106,72,167,96,42,50,55,62,50,55,62,50,55,62,212,208,200,212,208,
-            200,212,208,200,212,208,200,100,41,9,100,41,9,210,138,74,217,154,92,217,154,92,235,235,234,
-            65,64,65,194,119,57,204,145,78,230,210,186,255,255,255,197,197,193,50,55,62,212,208,200,212,
-            208,200,212,208,200,212,208,200,100,41,9,223,170,110,242,220,175,223,170,110,217,154,92,180,104,
-            44,191,119,50,193,140,87,107,108,111,23,22,20,255,255,255,50,55,62,212,208,200,212,208,200,
-            212,208,200,100,41,9,110,49,12,217,154,92,223,170,110,223,170,110,210,138,74,180,104,44,168,
-            94,37,193,160,128,197,197,193,160,160,158,235,235,234,50,55,62,212,208,200,212,208,200,212,208,
-            200,100,41,9,110,49,12,168,94,37,210,138,74,210,138,74,199,118,49,172,98,38,168,94,37,
-            197,179,159,229,229,226,229,229,226,229,229,226,50,55,62,212,208,200,212,208,200,212,208,200,100,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,142,74,25,206,
+            130,64,223,170,110,214,148,85,149,79,29,100,41,9,100,41,9,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,199,118,49,188,109,45,
+            168,94,37,134,69,27,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,100,41,9,100,41,9,188,109,45,188,109,45,93,45,
+            14,222,170,125,180,123,80,128,64,23,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,203,124,57,188,109,45,223,174,133,255,
+            255,255,240,240,240,147,106,72,167,96,42,50,55,62,50,55,62,50,55,62,240,240,240,240,240,
+            240,240,240,240,240,240,240,100,41,9,100,41,9,210,138,74,217,154,92,217,154,92,235,235,234,
+            65,64,65,194,119,57,204,145,78,230,210,186,255,255,255,197,197,193,50,55,62,240,240,240,240,
+            240,240,240,240,240,240,240,240,100,41,9,223,170,110,242,220,175,223,170,110,217,154,92,180,104,
+            44,191,119,50,193,140,87,107,108,111,23,22,20,255,255,255,50,55,62,240,240,240,240,240,240,
+            240,240,240,100,41,9,110,49,12,217,154,92,223,170,110,223,170,110,210,138,74,180,104,44,168,
+            94,37,193,160,128,197,197,193,160,160,158,235,235,234,50,55,62,240,240,240,240,240,240,240,240,
+            240,100,41,9,110,49,12,168,94,37,210,138,74,210,138,74,199,118,49,172,98,38,168,94,37,
+            197,179,159,229,229,226,229,229,226,229,229,226,50,55,62,240,240,240,240,240,240,240,240,240,100,
             41,9,128,63,18,100,41,9,100,41,9,100,41,9,100,41,9,100,41,9,114,116,118,160,160,
-            158,170,170,166,164,165,162,50,55,62,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,
-            142,74,25,172,98,38,165,92,35,127,62,19,100,41,9,212,208,200,50,55,62,50,55,62,50,
-            55,62,50,55,62,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,142,74,
-            25,193,116,45,188,109,45,154,83,30,100,41,9,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            158,170,170,166,164,165,162,50,55,62,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,
+            142,74,25,172,98,38,165,92,35,127,62,19,100,41,9,240,240,240,50,55,62,50,55,62,50,
+            55,62,50,55,62,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,142,74,
+            25,193,116,45,188,109,45,154,83,30,100,41,9,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5543,40 +5395,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,59,59,59,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,59,59,59,59,59,59,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,59,59,59,59,59,59,82,82,82,212,208,200,59,59,59,59,59,59,59,59,59,59,59,
-            59,59,59,59,59,59,59,59,59,59,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,59,59,59,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,59,59,59,59,59,59,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,59,59,59,59,59,59,82,82,82,240,240,240,59,59,59,59,59,59,59,59,59,59,59,
+            59,59,59,59,59,59,59,59,59,59,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             59,59,59,131,131,131,82,82,82,59,59,59,223,223,223,201,201,201,180,180,180,148,148,148,115,
-            115,115,59,59,59,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,59,59,59,82,82,
+            115,115,59,59,59,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,59,59,59,82,82,
             82,109,109,109,59,59,59,223,223,223,180,180,180,164,164,164,131,131,131,59,59,59,59,59,59,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,59,59,59,93,93,93,148,
-            148,148,180,180,180,164,164,164,100,100,100,59,59,59,59,59,59,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,59,59,59,137,137,137,131,131,131,
-            109,109,109,93,93,93,59,59,59,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,59,59,59,59,59,59,131,131,131,131,131,131,59,59,
-            59,185,185,185,131,131,131,82,82,82,59,59,59,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,59,59,59,148,148,148,131,131,131,185,185,185,255,
-            255,255,212,208,200,115,115,115,115,115,115,54,54,54,54,54,54,54,54,54,212,208,200,212,208,
-            200,212,208,200,212,208,200,59,59,59,59,59,59,156,156,156,168,168,168,168,168,168,235,235,235,
-            66,66,66,137,137,137,164,164,164,213,213,213,255,255,255,196,196,196,54,54,54,212,208,200,212,
-            208,200,212,208,200,212,208,200,59,59,59,180,180,180,223,223,223,180,180,180,164,164,164,125,125,
-            125,137,137,137,148,148,148,109,109,109,23,23,23,255,255,255,54,54,54,212,208,200,212,208,200,
-            212,208,200,59,59,59,66,66,66,168,168,168,180,180,180,180,180,180,156,156,156,131,131,131,115,
-            115,115,164,164,164,196,196,196,164,164,164,235,235,235,54,54,54,212,208,200,212,208,200,212,208,
-            200,59,59,59,66,66,66,109,109,109,156,156,156,156,156,156,137,137,137,115,115,115,109,109,109,
-            180,180,180,228,228,228,223,223,223,235,235,235,59,59,59,212,208,200,212,208,200,212,208,200,59,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,59,59,59,93,93,93,148,
+            148,148,180,180,180,164,164,164,100,100,100,59,59,59,59,59,59,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,59,59,59,137,137,137,131,131,131,
+            109,109,109,93,93,93,59,59,59,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,59,59,59,59,59,59,131,131,131,131,131,131,59,59,
+            59,185,185,185,131,131,131,82,82,82,59,59,59,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,59,59,59,148,148,148,131,131,131,185,185,185,255,
+            255,255,240,240,240,115,115,115,115,115,115,54,54,54,54,54,54,54,54,54,240,240,240,240,240,
+            240,240,240,240,240,240,240,59,59,59,59,59,59,156,156,156,168,168,168,168,168,168,235,235,235,
+            66,66,66,137,137,137,164,164,164,213,213,213,255,255,255,196,196,196,54,54,54,240,240,240,240,
+            240,240,240,240,240,240,240,240,59,59,59,180,180,180,223,223,223,180,180,180,164,164,164,125,125,
+            125,137,137,137,148,148,148,109,109,109,23,23,23,255,255,255,54,54,54,240,240,240,240,240,240,
+            240,240,240,59,59,59,66,66,66,168,168,168,180,180,180,180,180,180,156,156,156,131,131,131,115,
+            115,115,164,164,164,196,196,196,164,164,164,235,235,235,54,54,54,240,240,240,240,240,240,240,240,
+            240,59,59,59,66,66,66,109,109,109,156,156,156,156,156,156,137,137,137,115,115,115,109,109,109,
+            180,180,180,228,228,228,223,223,223,235,235,235,59,59,59,240,240,240,240,240,240,240,240,240,59,
             59,59,82,82,82,59,59,59,59,59,59,59,59,59,59,59,59,59,59,59,115,115,115,164,164,
-            164,168,168,168,164,164,164,54,54,54,212,208,200,212,208,200,212,208,200,212,208,200,59,59,59,
-            93,93,93,115,115,115,109,109,109,82,82,82,59,59,59,212,208,200,54,54,54,54,54,54,54,
-            54,54,54,54,54,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,59,59,59,100,100,
-            100,137,137,137,137,137,137,100,100,100,59,59,59,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            164,168,168,168,164,164,164,54,54,54,240,240,240,240,240,240,240,240,240,240,240,240,59,59,59,
+            93,93,93,115,115,115,109,109,109,82,82,82,59,59,59,240,240,240,54,54,54,54,54,54,54,
+            54,54,54,54,54,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,59,59,59,100,100,
+            100,137,137,137,137,137,137,100,100,100,59,59,59,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5584,40 +5436,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,98,78,9,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,98,78,9,98,78,9,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,98,78,9,98,78,9,127,111,18,212,208,200,98,78,9,98,78,9,98,78,9,98,78,
-            9,98,78,9,98,78,9,98,78,9,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,98,78,9,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,98,78,9,98,78,9,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,98,78,9,98,78,9,127,111,18,240,240,240,98,78,9,98,78,9,98,78,9,98,78,
+            9,98,78,9,98,78,9,98,78,9,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             98,78,9,186,171,45,127,111,18,98,78,9,234,241,174,231,232,143,222,218,109,205,190,64,171,
-            157,38,98,78,9,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,98,78,9,126,107,
+            157,38,98,78,9,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,98,78,9,126,107,
             19,164,147,35,98,78,9,234,241,174,222,218,109,213,202,84,186,171,45,98,78,9,98,78,9,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,98,78,9,140,123,25,205,
-            190,64,222,218,109,213,202,84,148,130,29,98,78,9,98,78,9,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,98,78,9,198,183,49,186,171,45,
-            166,150,37,133,114,26,98,78,9,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,98,78,9,98,78,9,186,171,45,186,171,45,92,78,
-            13,221,211,124,179,166,80,127,108,22,98,78,9,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,98,78,9,202,187,57,186,171,45,222,213,133,255,
-            255,255,150,8,249,146,138,71,165,149,42,50,55,61,50,55,61,50,55,61,212,208,200,212,208,
-            200,212,208,200,212,208,200,98,78,9,98,78,9,209,198,74,216,208,91,216,208,91,234,234,233,
-            64,63,64,193,178,56,203,199,78,229,229,186,255,255,255,195,196,193,50,55,61,212,208,200,212,
-            208,200,212,208,200,212,208,200,98,78,9,222,218,109,234,241,174,222,218,109,216,208,91,179,162,
-            44,190,178,49,192,186,87,107,108,110,22,22,19,255,255,255,50,55,61,212,208,200,212,208,200,
-            212,208,200,98,78,9,109,92,12,216,208,91,222,218,109,222,218,109,209,198,74,179,162,44,166,
-            150,37,192,187,127,195,196,193,159,159,158,234,234,233,50,55,61,212,208,200,212,208,200,212,208,
-            200,98,78,9,109,92,12,166,150,37,209,198,74,209,198,74,198,183,49,171,157,38,166,150,37,
-            196,195,159,227,228,225,227,228,225,227,228,225,50,55,61,212,208,200,212,208,200,212,208,200,98,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,98,78,9,140,123,25,205,
+            190,64,222,218,109,213,202,84,148,130,29,98,78,9,98,78,9,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,98,78,9,198,183,49,186,171,45,
+            166,150,37,133,114,26,98,78,9,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,98,78,9,98,78,9,186,171,45,186,171,45,92,78,
+            13,221,211,124,179,166,80,127,108,22,98,78,9,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,98,78,9,202,187,57,186,171,45,222,213,133,255,
+            255,255,150,8,249,146,138,71,165,149,42,50,55,61,50,55,61,50,55,61,240,240,240,240,240,
+            240,240,240,240,240,240,240,98,78,9,98,78,9,209,198,74,216,208,91,216,208,91,234,234,233,
+            64,63,64,193,178,56,203,199,78,229,229,186,255,255,255,195,196,193,50,55,61,240,240,240,240,
+            240,240,240,240,240,240,240,240,98,78,9,222,218,109,234,241,174,222,218,109,216,208,91,179,162,
+            44,190,178,49,192,186,87,107,108,110,22,22,19,255,255,255,50,55,61,240,240,240,240,240,240,
+            240,240,240,98,78,9,109,92,12,216,208,91,222,218,109,222,218,109,209,198,74,179,162,44,166,
+            150,37,192,187,127,195,196,193,159,159,158,234,234,233,50,55,61,240,240,240,240,240,240,240,240,
+            240,98,78,9,109,92,12,166,150,37,209,198,74,209,198,74,198,183,49,171,157,38,166,150,37,
+            196,195,159,227,228,225,227,228,225,227,228,225,50,55,61,240,240,240,240,240,240,240,240,240,98,
             78,9,127,111,18,98,78,9,98,78,9,98,78,9,98,78,9,98,78,9,114,116,117,159,159,
-            158,168,169,166,163,164,161,50,55,61,212,208,200,212,208,200,212,208,200,212,208,200,98,78,9,
-            140,123,25,171,157,38,164,147,35,126,107,19,98,78,9,212,208,200,50,55,61,50,55,61,50,
-            55,61,50,55,61,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,98,78,9,140,123,
-            25,192,180,45,186,171,45,153,137,30,98,78,9,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            158,168,169,166,163,164,161,50,55,61,240,240,240,240,240,240,240,240,240,240,240,240,98,78,9,
+            140,123,25,171,157,38,164,147,35,126,107,19,98,78,9,240,240,240,50,55,61,50,55,61,50,
+            55,61,50,55,61,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,98,78,9,140,123,
+            25,192,180,45,186,171,45,153,137,30,98,78,9,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5628,16 +5480,16 @@
         /* columns rows colors chars-per-pixel */
         "13 7 3 1",
         "  c None",
-        "a c #FFFFFF",
-        "b c #808080",
+        "b c #FFFFFF",
+        "c c #808080",
         /* pixels */
-        "bbbbbbbbbbbba",
-        " b         a ",
-        "  b       a  ",
-        "   b     a   ",
-        "    b   a    ",
-        "     b a     ",
-        "      a      "
+        "ccccccccccccb",
+        " c         b ",
+        "  c       b  ",
+        "   c     b   ",
+        "    c   b    ",
+        "     c b     ",
+        "      b      "
         };
         wxBitmap bitmap( xpm_data );
         return bitmap;
@@ -5649,16 +5501,16 @@
         /* columns rows colors chars-per-pixel */
         "13 7 3 1",
         "  c None",
-        "a c #FFFFFF",
-        "b c #808080",
+        "b c #FFFFFF",
+        "c c #808080",
         /* pixels */
-        "      b      ",
-        "     b a     ",
-        "    b   a    ",
-        "   b     a   ",
-        "  b       a  ",
-        " b         a ",
-        "baaaaaaaaaaaa"
+        "      c      ",
+        "     c b     ",
+        "    c   b    ",
+        "   c     b   ",
+        "  c       b  ",
+        " c         b ",
+        "cbbbbbbbbbbbb"
         };
         wxBitmap bitmap( xpm_data );
         return bitmap;
@@ -5667,12 +5519,12 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,108,95,87,108,95,87,108,95,87,108,95,87,108,95,87,108,95,87,108,95,87,
-            108,95,87,108,95,87,108,95,87,108,95,87,108,95,87,212,208,200,212,208,200,212,208,200,108,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,108,95,87,108,95,87,108,95,87,108,95,87,108,95,87,108,95,87,108,95,87,
+            108,95,87,108,95,87,108,95,87,108,95,87,108,95,87,240,240,240,240,240,240,240,240,240,108,
             95,87,188,169,151,231,208,185,221,199,177,221,199,177,210,189,168,210,189,168,196,177,157,196,177,
-            157,183,165,146,183,165,146,183,165,146,158,142,126,81,72,72,212,208,200,108,95,87,188,169,151,
+            157,183,165,146,183,165,146,183,165,146,158,142,126,81,72,72,240,240,240,108,95,87,188,169,151,
             231,208,185,123,140,99,71,89,63,71,89,63,72,93,62,72,93,62,72,93,62,72,93,62,72,
             93,62,72,93,62,135,135,107,183,165,146,149,134,121,81,72,72,108,95,87,231,208,185,123,137,
             100,71,89,63,47,117,45,51,127,42,51,127,42,51,127,42,51,127,42,51,127,42,51,127,42,
@@ -5691,16 +5543,16 @@
             81,72,72,108,95,87,183,165,146,118,124,103,64,79,65,3,102,39,3,102,39,3,102,39,3,
             102,39,3,102,39,28,124,47,3,102,39,3,102,39,38,88,53,118,124,103,166,149,132,81,72,
             72,108,95,87,149,134,119,183,165,146,117,123,103,51,81,60,51,81,60,51,81,60,51,81,60,
-            51,81,60,51,81,60,51,81,60,51,81,60,117,123,103,166,149,132,137,123,113,81,72,72,212,
-            208,200,81,72,72,137,123,113,183,165,146,183,165,146,183,165,146,183,165,146,175,157,139,175,157,
-            139,175,157,139,166,149,132,166,149,132,166,149,132,137,123,113,81,72,72,212,208,200,212,208,200,
-            212,208,200,81,72,72,81,72,72,81,72,72,81,72,72,81,72,72,81,72,72,81,72,72,81,
-            72,72,81,72,72,81,72,72,81,72,72,81,72,72,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            51,81,60,51,81,60,51,81,60,51,81,60,117,123,103,166,149,132,137,123,113,81,72,72,240,
+            240,240,81,72,72,137,123,113,183,165,146,183,165,146,183,165,146,183,165,146,175,157,139,175,157,
+            139,175,157,139,166,149,132,166,149,132,166,149,132,137,123,113,81,72,72,240,240,240,240,240,240,
+            240,240,240,81,72,72,81,72,72,81,72,72,81,72,72,81,72,72,81,72,72,81,72,72,81,
+            72,72,81,72,72,81,72,72,81,72,72,81,72,72,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5708,18 +5560,18 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,53,136,37,53,136,37,51,
-            130,36,51,130,36,47,116,33,47,116,33,38,92,28,38,92,28,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,53,136,37,69,175,50,69,175,50,69,175,50,
-            69,175,50,69,175,50,69,175,50,69,175,50,38,92,28,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,53,136,37,106,194,89,106,194,89,106,194,89,106,194,89,106,194,
-            89,106,194,89,106,194,89,69,175,50,38,92,28,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,53,136,37,123,202,107,134,207,119,134,207,119,134,207,119,134,207,119,134,207,119,134,
-            207,119,92,187,75,59,157,42,38,92,28,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,53,136,37,202,235,194,202,235,194,202,235,194,202,235,194,202,235,194,202,235,194,119,200,104,
-            69,175,50,54,138,38,38,92,28,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,53,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,53,136,37,53,136,37,51,
+            130,36,51,130,36,47,116,33,47,116,33,38,92,28,38,92,28,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,53,136,37,69,175,50,69,175,50,69,175,50,
+            69,175,50,69,175,50,69,175,50,69,175,50,38,92,28,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,53,136,37,106,194,89,106,194,89,106,194,89,106,194,89,106,194,
+            89,106,194,89,106,194,89,69,175,50,38,92,28,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,53,136,37,123,202,107,134,207,119,134,207,119,134,207,119,134,207,119,134,207,119,134,
+            207,119,92,187,75,59,157,42,38,92,28,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,53,136,37,202,235,194,202,235,194,202,235,194,202,235,194,202,235,194,202,235,194,119,200,104,
+            69,175,50,54,138,38,38,92,28,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,53,
             136,37,202,235,194,255,255,255,255,255,255,212,239,207,202,235,194,202,235,194,119,200,104,54,138,
-            38,92,92,92,30,71,22,212,208,200,212,208,200,212,208,200,212,208,200,104,104,104,53,136,37,
+            38,92,92,92,30,71,22,240,240,240,240,240,240,240,240,240,240,240,240,104,104,104,53,136,37,
             202,235,194,255,255,255,158,217,146,255,255,255,212,239,207,202,235,194,119,200,104,54,138,38,181,
             181,181,104,104,104,104,104,104,104,104,104,104,104,104,104,104,104,220,220,220,51,130,36,202,235,
             194,232,247,229,51,133,37,158,217,146,233,247,231,210,238,203,119,200,104,54,138,38,181,181,181,
@@ -5728,20 +5580,20 @@
             158,174,174,174,186,186,186,177,177,177,158,158,158,181,181,181,51,130,36,181,227,171,191,231,182,
             38,92,28,38,92,28,51,133,37,175,224,163,119,200,104,54,138,38,133,133,133,61,61,61,61,
             61,61,61,61,61,61,61,61,61,61,61,158,158,158,47,116,33,175,224,165,181,227,171,28,63,
-            20,28,63,20,80,168,64,205,236,198,119,200,104,54,138,38,61,61,61,30,71,22,212,208,200,
-            212,208,200,212,208,200,212,208,200,61,61,61,47,116,33,171,223,160,171,223,160,28,63,20,64,
-            154,48,214,240,209,171,223,160,119,200,104,59,156,42,46,115,33,30,71,22,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,47,116,33,156,216,143,156,216,143,55,143,39,198,234,191,
-            171,223,160,156,216,143,119,200,104,67,173,49,54,138,38,30,71,22,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,38,92,28,156,216,143,156,216,143,171,223,160,164,220,152,156,216,
-            143,156,216,143,119,200,104,67,173,49,30,71,22,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,38,92,28,142,211,128,142,211,128,142,211,128,142,211,128,142,211,128,142,
-            211,128,106,194,89,30,71,22,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,38,92,28,38,92,28,38,92,28,30,71,22,30,71,22,30,71,22,30,71,22,
-            30,71,22,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            20,28,63,20,80,168,64,205,236,198,119,200,104,54,138,38,61,61,61,30,71,22,240,240,240,
+            240,240,240,240,240,240,240,240,240,61,61,61,47,116,33,171,223,160,171,223,160,28,63,20,64,
+            154,48,214,240,209,171,223,160,119,200,104,59,156,42,46,115,33,30,71,22,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,47,116,33,156,216,143,156,216,143,55,143,39,198,234,191,
+            171,223,160,156,216,143,119,200,104,67,173,49,54,138,38,30,71,22,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,38,92,28,156,216,143,156,216,143,171,223,160,164,220,152,156,216,
+            143,156,216,143,119,200,104,67,173,49,30,71,22,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,38,92,28,142,211,128,142,211,128,142,211,128,142,211,128,142,211,128,142,
+            211,128,106,194,89,30,71,22,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,38,92,28,38,92,28,38,92,28,30,71,22,30,71,22,30,71,22,30,71,22,
+            30,71,22,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5749,40 +5601,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,255,0,0,255,0,0,255,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,255,0,0,212,208,200,212,208,200,129,
-            0,0,255,0,0,255,0,0,254,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,255,0,0,121,0,0,212,208,200,212,208,200,212,208,200,
-            173,0,0,255,0,0,151,0,0,151,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,90,0,0,142,0,0,0,0,0,212,208,200,212,208,200,212,208,200,212,208,
-            200,189,0,0,236,0,0,253,0,0,207,0,0,212,208,200,212,208,200,212,208,200,212,208,200,
-            135,0,0,130,0,0,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,197,33,33,230,162,162,248,170,170,143,26,26,212,208,200,181,52,52,223,128,128,215,75,
-            75,85,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,140,27,27,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,255,0,0,255,0,0,255,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,255,0,0,240,240,240,240,240,240,129,
+            0,0,255,0,0,255,0,0,254,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,255,0,0,121,0,0,240,240,240,240,240,240,240,240,240,
+            173,0,0,255,0,0,151,0,0,151,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,90,0,0,142,0,0,0,0,0,240,240,240,240,240,240,240,240,240,240,240,
+            240,189,0,0,236,0,0,253,0,0,207,0,0,240,240,240,240,240,240,240,240,240,240,240,240,
+            135,0,0,130,0,0,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,197,33,33,230,162,162,248,170,170,143,26,26,240,240,240,181,52,52,223,128,128,215,75,
+            75,85,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,140,27,27,
             255,245,245,255,255,255,255,255,255,231,161,163,179,47,47,255,255,255,255,255,255,255,255,255,235,
-            159,160,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,230,149,150,255,255,
+            159,160,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,230,149,150,255,255,
             255,255,211,215,255,55,55,221,70,73,197,121,122,255,114,114,255,47,48,245,255,255,241,255,255,
-            162,65,69,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,222,171,177,228,255,255,225,
+            162,65,69,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,222,171,177,228,255,255,225,
             195,205,253,61,67,205,44,48,193,31,32,236,106,112,251,74,77,205,255,255,200,255,255,159,80,
-            87,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,139,51,55,190,232,242,189,247,255,
-            154,129,140,116,0,0,255,0,0,186,55,59,165,193,201,161,232,243,161,149,162,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,163,2,4,91,8,10,24,0,
-            0,212,208,200,142,0,0,255,0,0,208,0,0,193,0,0,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,217,0,0,30,0,0,0,0,0,212,208,200,212,
-            208,200,212,208,200,186,0,0,255,0,0,255,0,0,231,0,0,212,208,200,212,208,200,212,208,
-            200,212,208,200,148,0,0,231,0,0,36,0,0,0,0,0,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,230,0,0,255,0,0,255,0,0,230,0,0,212,208,200,212,208,200,247,
-            0,0,255,0,0,55,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,255,0,0,255,0,0,208,0,0,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            87,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,139,51,55,190,232,242,189,247,255,
+            154,129,140,116,0,0,255,0,0,186,55,59,165,193,201,161,232,243,161,149,162,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,163,2,4,91,8,10,24,0,
+            0,240,240,240,142,0,0,255,0,0,208,0,0,193,0,0,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,217,0,0,30,0,0,0,0,0,240,240,240,240,
+            240,240,240,240,240,186,0,0,255,0,0,255,0,0,231,0,0,240,240,240,240,240,240,240,240,
+            240,240,240,240,148,0,0,231,0,0,36,0,0,0,0,0,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,230,0,0,255,0,0,255,0,0,230,0,0,240,240,240,240,240,240,247,
+            0,0,255,0,0,55,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,255,0,0,255,0,0,208,0,0,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5790,40 +5642,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,45,45,82,69,69,132,212,
-            208,200,212,208,200,85,85,137,106,106,145,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,38,38,85,74,74,140,89,89,149,93,93,155,
-            105,105,166,126,126,179,152,152,200,94,94,129,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,57,57,107,47,47,104,65,65,132,99,99,154,114,114,166,126,126,177,135,135,
-            185,140,140,188,175,175,210,172,172,215,33,33,78,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,45,45,82,69,69,132,240,
+            240,240,240,240,240,85,85,137,106,106,145,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,38,38,85,74,74,140,89,89,149,93,93,155,
+            105,105,166,126,126,179,152,152,200,94,94,129,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,57,57,107,47,47,104,65,65,132,99,99,154,114,114,166,126,126,177,135,135,
+            185,140,140,188,175,175,210,172,172,215,33,33,78,240,240,240,240,240,240,240,240,240,240,240,240,
             46,46,98,63,63,132,80,80,139,158,158,197,196,196,223,192,192,220,169,169,207,149,149,194,154,
-            154,198,166,166,205,170,170,210,108,108,153,212,208,200,212,208,200,212,208,200,212,208,200,40,40,
+            154,198,166,166,205,170,170,210,108,108,153,240,240,240,240,240,240,240,240,240,240,240,240,40,40,
             93,85,85,145,184,184,213,190,190,219,137,137,187,104,104,164,80,80,139,139,139,182,174,174,210,
-            173,173,209,189,189,219,215,215,240,118,118,161,212,208,200,212,208,200,32,32,69,75,75,138,168,
-            168,204,187,187,218,120,120,177,70,70,129,41,41,90,212,208,200,56,56,90,173,173,215,188,188,
+            173,173,209,189,189,219,215,215,240,118,118,161,240,240,240,240,240,240,32,32,69,75,75,138,168,
+            168,204,187,187,218,120,120,177,70,70,129,41,41,90,240,240,240,56,56,90,173,173,215,188,188,
             219,197,197,223,221,221,238,168,168,211,26,26,54,47,47,84,85,85,150,114,114,167,198,198,224,
-            131,131,184,71,71,133,12,12,30,212,208,200,212,208,200,46,46,77,178,178,220,204,204,228,209,
+            131,131,184,71,71,133,12,12,30,240,240,240,240,240,240,46,46,77,178,178,220,204,204,228,209,
             209,231,195,195,222,171,171,209,82,82,142,85,85,151,106,106,163,145,145,190,181,181,215,86,86,
-            146,10,10,29,212,208,200,212,208,200,212,208,200,135,135,175,202,202,229,209,209,231,180,180,214,
-            139,139,187,113,113,170,66,66,125,70,70,118,113,113,170,142,142,188,166,166,205,69,69,130,212,
-            208,200,212,208,200,212,208,200,142,142,185,210,210,236,218,218,235,205,205,228,138,138,187,91,91,
-            153,58,58,118,212,208,200,212,208,200,113,113,172,152,152,197,160,160,202,87,87,143,212,208,200,
-            55,55,88,138,138,177,211,211,237,211,211,231,230,230,242,231,231,243,124,124,177,53,53,112,212,
-            208,200,212,208,200,212,208,200,129,129,182,159,159,201,169,169,207,166,166,203,120,120,162,187,187,
-            225,209,209,233,222,222,238,230,230,242,246,246,251,243,243,250,131,131,178,17,17,37,212,208,200,
-            212,208,200,108,108,142,161,161,207,183,183,216,181,181,214,188,188,218,200,200,229,213,213,233,215,
-            215,234,210,210,231,239,239,247,238,238,247,177,177,212,152,152,199,64,64,110,212,208,200,212,208,
-            200,212,208,200,91,91,127,174,174,217,181,181,216,207,207,232,212,212,232,216,216,234,178,178,212,
-            139,139,187,140,140,188,171,171,211,151,151,199,102,102,165,40,40,91,212,208,200,212,208,200,212,
-            208,200,212,208,200,49,49,96,87,87,143,187,187,214,238,238,251,195,195,222,138,138,187,91,91,
-            153,54,54,114,69,69,118,51,51,100,42,42,93,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,153,153,196,170,170,210,112,112,169,57,57,117,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,82,82,143,65,65,125,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            146,10,10,29,240,240,240,240,240,240,240,240,240,135,135,175,202,202,229,209,209,231,180,180,214,
+            139,139,187,113,113,170,66,66,125,70,70,118,113,113,170,142,142,188,166,166,205,69,69,130,240,
+            240,240,240,240,240,240,240,240,142,142,185,210,210,236,218,218,235,205,205,228,138,138,187,91,91,
+            153,58,58,118,240,240,240,240,240,240,113,113,172,152,152,197,160,160,202,87,87,143,240,240,240,
+            55,55,88,138,138,177,211,211,237,211,211,231,230,230,242,231,231,243,124,124,177,53,53,112,240,
+            240,240,240,240,240,240,240,240,129,129,182,159,159,201,169,169,207,166,166,203,120,120,162,187,187,
+            225,209,209,233,222,222,238,230,230,242,246,246,251,243,243,250,131,131,178,17,17,37,240,240,240,
+            240,240,240,108,108,142,161,161,207,183,183,216,181,181,214,188,188,218,200,200,229,213,213,233,215,
+            215,234,210,210,231,239,239,247,238,238,247,177,177,212,152,152,199,64,64,110,240,240,240,240,240,
+            240,240,240,240,91,91,127,174,174,217,181,181,216,207,207,232,212,212,232,216,216,234,178,178,212,
+            139,139,187,140,140,188,171,171,211,151,151,199,102,102,165,40,40,91,240,240,240,240,240,240,240,
+            240,240,240,240,240,49,49,96,87,87,143,187,187,214,238,238,251,195,195,222,138,138,187,91,91,
+            153,54,54,114,69,69,118,51,51,100,42,42,93,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,153,153,196,170,170,210,112,112,169,57,57,117,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,82,82,143,65,65,125,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5831,40 +5683,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,119,170,130,147,188,133,148,186,106,
-            124,167,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,126,143,187,229,232,243,249,250,253,254,253,254,255,255,255,253,253,255,
-            236,240,251,147,157,186,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,139,153,194,238,239,248,216,219,229,202,206,220,208,213,227,234,235,245,233,235,245,233,234,
-            245,242,244,255,161,172,206,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,73,90,148,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,119,170,130,147,188,133,148,186,106,
+            124,167,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,126,143,187,229,232,243,249,250,253,254,253,254,255,255,255,253,253,255,
+            236,240,251,147,157,186,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,139,153,194,238,239,248,216,219,229,202,206,220,208,213,227,234,235,245,233,235,245,233,234,
+            245,242,244,255,161,172,206,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,73,90,148,
             190,197,224,166,174,193,156,167,192,151,164,195,190,198,219,213,216,230,208,213,228,207,211,228,216,
-            220,236,218,221,243,87,102,153,212,208,200,212,208,200,212,208,200,212,208,200,78,100,169,121,135,
+            220,236,218,221,243,87,102,153,240,240,240,240,240,240,240,240,240,240,240,240,78,100,169,121,135,
             170,123,140,179,126,144,186,179,189,216,225,228,241,223,225,238,210,214,230,211,215,233,208,212,232,
-            202,207,231,137,150,205,212,208,200,212,208,200,212,208,200,39,56,106,63,86,154,66,88,143,89,
+            202,207,231,137,150,205,240,240,240,240,240,240,240,240,240,39,56,106,63,86,154,66,88,143,89,
             112,167,92,113,168,199,205,226,249,249,254,237,239,248,226,229,242,215,218,236,195,200,223,174,181,
-            213,137,149,204,48,62,108,212,208,200,212,208,200,65,82,137,146,156,205,139,150,194,80,99,150,
+            213,137,149,204,48,62,108,240,240,240,240,240,240,65,82,137,146,156,205,139,150,194,80,99,150,
             48,76,141,77,100,159,129,144,183,202,207,224,234,236,246,213,217,235,188,194,222,104,118,165,87,
-            105,168,45,64,120,212,208,200,212,208,200,68,84,136,149,158,208,173,181,219,144,152,186,21,48,
+            105,168,45,64,120,240,240,240,240,240,240,68,84,136,149,158,208,173,181,219,144,152,186,21,48,
             114,16,48,127,0,32,116,125,141,181,238,239,247,211,215,236,114,133,181,28,54,120,58,83,154,
-            4,29,91,212,208,200,212,208,200,48,61,103,147,157,211,154,162,203,69,88,143,5,38,116,12,
+            4,29,91,240,240,240,240,240,240,48,61,103,147,157,211,154,162,203,69,88,143,5,38,116,12,
             44,124,1,35,119,80,103,159,225,228,242,162,177,214,27,43,113,55,69,126,118,135,188,113,123,
-            146,212,208,200,212,208,200,212,208,200,122,136,194,56,75,130,6,38,116,14,46,126,18,49,127,
-            18,50,128,29,59,134,122,146,194,160,73,98,199,44,19,181,81,75,255,255,255,128,131,128,212,
-            208,200,212,208,200,212,208,200,49,66,115,51,77,148,25,54,128,33,62,136,43,70,141,49,75,
+            146,240,240,240,240,240,240,240,240,240,122,136,194,56,75,130,6,38,116,14,46,126,18,49,127,
+            18,50,128,29,59,134,122,146,194,160,73,98,199,44,19,181,81,75,255,255,255,128,131,128,240,
+            240,240,240,240,240,240,240,240,49,66,115,51,77,148,25,54,128,33,62,136,43,70,141,49,75,
             145,40,74,147,72,58,121,246,101,71,250,156,80,255,255,255,196,154,135,86,20,9,255,255,255,
-            212,208,200,212,208,200,212,208,200,35,58,118,62,89,160,75,99,160,81,103,162,85,106,165,73,
-            108,170,160,60,92,255,117,90,233,170,112,255,255,255,227,165,98,227,187,168,255,255,255,212,208,
-            200,212,208,200,212,208,200,212,208,200,44,60,103,98,116,173,126,143,196,128,148,199,121,144,196,
-            204,75,91,255,100,95,255,155,103,255,197,115,255,255,255,255,255,255,126,59,43,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,61,66,95,110,87,121,97,83,116,181,53,
-            60,255,55,47,255,108,96,255,165,115,232,193,139,238,201,139,204,99,68,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,156,20,15,255,
-            64,53,255,95,81,255,127,111,255,154,122,243,142,107,103,35,29,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            149,53,44,150,64,54,114,52,44,212,208,200,212,208,200,212,208,200
+            240,240,240,240,240,240,240,240,240,35,58,118,62,89,160,75,99,160,81,103,162,85,106,165,73,
+            108,170,160,60,92,255,117,90,233,170,112,255,255,255,227,165,98,227,187,168,255,255,255,240,240,
+            240,240,240,240,240,240,240,240,240,240,44,60,103,98,116,173,126,143,196,128,148,199,121,144,196,
+            204,75,91,255,100,95,255,155,103,255,197,115,255,255,255,255,255,255,126,59,43,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,61,66,95,110,87,121,97,83,116,181,53,
+            60,255,55,47,255,108,96,255,165,115,232,193,139,238,201,139,204,99,68,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,156,20,15,255,
+            64,53,255,95,81,255,127,111,255,154,122,243,142,107,103,35,29,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            149,53,44,150,64,54,114,52,44,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5872,40 +5724,40 @@
     {
         static const unsigned char data[] = 
         {
-            128,128,128,212,208,200,128,128,128,212,208,200,128,128,128,212,208,200,128,128,128,212,208,200,128,
-            128,128,212,208,200,128,128,128,212,208,200,128,128,128,212,208,200,128,128,128,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,166,177,207,243,244,251,250,250,253,248,249,252,254,253,255,
-            255,254,255,243,246,255,165,175,202,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,174,185,220,225,227,237,197,202,215,184,191,209,203,208,225,229,231,242,229,231,
-            243,226,229,241,237,239,251,172,183,217,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            128,128,128,240,240,240,128,128,128,240,240,240,128,128,128,240,240,240,128,128,128,240,240,240,128,
+            128,128,240,240,240,128,128,128,240,240,240,128,128,128,240,240,240,128,128,128,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,166,177,207,243,244,251,250,250,253,248,249,252,254,253,255,
+            255,254,255,243,246,255,165,175,202,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,174,185,220,225,227,237,197,202,215,184,191,209,203,208,225,229,231,242,229,231,
+            243,226,229,241,237,239,251,172,183,217,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             96,113,171,172,181,207,147,158,183,145,157,190,151,165,199,204,209,228,211,215,229,203,207,224,206,
-            211,228,213,216,235,213,217,240,93,108,160,212,208,200,212,208,200,212,208,200,212,208,200,59,84,
+            211,228,213,216,235,213,217,240,93,108,160,240,240,240,240,240,240,240,240,240,240,240,240,59,84,
             154,92,111,154,111,130,177,115,133,181,206,211,230,238,239,248,229,231,243,217,221,236,212,216,234,
-            202,207,229,193,198,226,133,146,202,212,208,200,212,208,200,212,208,200,50,70,126,102,118,176,90,
+            202,207,229,193,198,226,133,146,202,240,240,240,240,240,240,240,240,240,50,70,126,102,118,176,90,
             108,161,73,96,154,71,95,157,152,165,200,220,223,235,233,235,243,227,230,242,212,216,235,193,198,
-            223,135,145,185,111,127,188,37,51,92,212,208,200,212,208,200,68,84,139,155,164,212,169,176,214,
+            223,135,145,185,111,127,188,37,51,92,240,240,240,240,240,240,68,84,139,155,164,212,169,176,214,
             117,130,170,31,58,126,32,62,136,39,66,135,168,177,204,236,238,247,214,217,236,148,159,198,46,
-            68,127,68,92,160,21,38,87,212,208,200,212,208,200,57,71,121,148,158,209,170,177,216,103,117,
+            68,127,68,92,160,21,38,87,240,240,240,240,240,240,57,71,121,148,158,209,170,177,216,103,117,
             161,7,38,113,11,44,125,0,31,115,108,126,173,234,235,246,188,195,223,44,67,128,58,78,136,
-            75,99,169,7,25,68,212,208,200,212,208,200,212,208,200,136,148,204,84,100,150,17,47,121,11,
+            75,99,169,7,25,68,240,240,240,240,240,240,240,240,240,136,148,204,84,100,150,17,47,121,11,
             43,124,15,46,126,10,42,123,49,76,144,176,185,216,80,103,162,12,39,109,92,107,158,122,136,
-            194,212,208,200,212,208,200,212,208,200,212,208,200,70,87,142,42,68,137,16,47,122,26,56,133,
-            36,64,138,41,68,141,38,66,139,40,67,140,14,46,125,34,63,136,40,70,147,25,45,104,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,43,68,137,57,85,155,68,92,156,74,96,
-            158,78,99,160,76,98,159,68,91,155,64,88,154,49,77,152,16,43,112,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,51,69,117,102,121,178,124,140,194,120,
-            135,187,122,138,189,115,132,188,85,106,166,36,54,102,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,61,68,96,136,144,180,
-            109,117,153,48,56,85,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,128,128,128,131,131,
-            135,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,
-            128,128,128,128,128,128,128,128,128,128,128,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            194,240,240,240,240,240,240,240,240,240,240,240,240,70,87,142,42,68,137,16,47,122,26,56,133,
+            36,64,138,41,68,141,38,66,139,40,67,140,14,46,125,34,63,136,40,70,147,25,45,104,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,43,68,137,57,85,155,68,92,156,74,96,
+            158,78,99,160,76,98,159,68,91,155,64,88,154,49,77,152,16,43,112,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,51,69,117,102,121,178,124,140,194,120,
+            135,187,122,138,189,115,132,188,85,106,166,36,54,102,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,61,68,96,136,144,180,
+            109,117,153,48,56,85,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,128,128,128,131,131,
+            135,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,
+            128,128,128,128,128,128,128,128,128,128,128,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5913,40 +5765,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,27,
-            78,179,26,93,203,25,77,181,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,31,88,188,38,112,218,53,140,249,
-            65,150,254,53,141,251,24,80,189,19,50,153,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,35,91,185,35,100,200,52,127,226,73,155,251,82,162,254,80,161,254,78,160,
-            254,74,157,254,66,150,253,32,98,208,15,46,153,212,208,200,212,208,200,212,208,200,37,97,189,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,27,
+            78,179,26,93,203,25,77,181,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,31,88,188,38,112,218,53,140,249,
+            65,150,254,53,141,251,24,80,189,19,50,153,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,35,91,185,35,100,200,52,127,226,73,155,251,82,162,254,80,161,254,78,160,
+            254,74,157,254,66,150,253,32,98,208,15,46,153,240,240,240,240,240,240,240,240,240,37,97,189,
             40,112,210,62,140,237,84,164,252,94,171,254,97,173,254,98,173,254,96,172,254,93,170,254,87,
-            166,254,81,162,254,74,156,254,45,119,227,12,46,157,212,208,200,212,208,200,38,103,210,104,173,
+            166,254,81,162,254,74,156,254,45,119,227,12,46,157,240,240,240,240,240,240,38,103,210,104,173,
             253,97,173,254,105,178,254,110,182,254,114,185,255,115,186,255,113,184,255,108,181,254,102,176,254,
-            94,171,254,85,164,254,75,157,254,55,136,243,11,42,162,212,208,200,34,97,215,61,126,254,114,
+            94,171,254,85,164,254,75,157,254,55,136,243,11,42,162,240,240,240,34,97,215,61,126,254,114,
             174,254,120,189,255,127,194,255,132,198,255,133,198,255,130,196,255,124,192,255,116,186,255,106,179,
-            254,86,163,254,61,128,241,47,93,211,14,48,175,212,208,200,40,100,213,72,134,254,76,138,254,
+            254,86,163,254,61,128,241,47,93,211,14,48,175,240,240,240,40,100,213,72,134,254,76,138,254,
             119,174,254,150,209,255,150,210,255,152,211,255,148,209,255,139,203,255,113,180,255,71,132,232,104,
-            141,223,154,174,224,114,139,213,4,25,148,212,208,200,45,103,212,85,146,254,89,150,254,93,154,
+            141,223,154,174,224,114,139,213,4,25,148,240,240,240,45,103,212,85,146,254,89,150,254,93,154,
             254,113,170,254,166,218,255,167,221,255,136,196,255,90,145,231,130,163,223,170,196,237,126,164,229,
-            60,122,230,37,83,199,5,22,144,212,208,200,50,106,209,98,158,254,103,163,254,107,166,254,109,
+            60,122,230,37,83,199,5,22,144,240,240,240,50,106,209,98,158,254,103,163,254,107,166,254,109,
             169,254,120,176,255,118,170,243,171,199,237,179,211,243,123,177,235,50,103,194,20,43,148,65,121,
-            221,27,57,168,16,40,160,212,208,200,55,109,208,110,169,254,116,175,255,120,179,255,123,182,255,
+            221,27,57,168,16,40,160,240,240,240,55,109,208,110,169,254,116,175,255,120,179,255,123,182,255,
             125,183,255,104,162,237,193,221,246,133,189,236,108,167,227,67,113,197,55,90,181,121,135,196,122,
-            139,204,10,27,145,212,208,200,59,112,206,122,180,255,128,186,255,134,191,255,137,194,255,139,196,
+            139,204,10,27,145,240,240,240,59,112,206,122,180,255,128,186,255,134,191,255,137,194,255,139,196,
             255,113,167,234,210,226,244,105,143,205,89,125,196,144,167,216,171,200,245,79,135,233,36,83,200,
-            11,26,142,212,208,200,50,98,192,124,183,251,140,197,255,147,203,255,151,207,255,154,209,255,124,
+            11,26,142,240,240,240,50,98,192,124,183,251,140,197,255,147,203,255,151,207,255,154,209,255,124,
             179,236,136,163,214,170,197,233,158,198,242,74,129,212,21,46,151,67,127,228,35,72,184,16,35,
-            149,212,208,200,212,208,200,50,92,184,128,184,242,159,214,255,165,219,255,168,222,255,137,191,237,
-            202,227,248,127,187,237,101,161,226,64,113,197,56,96,189,38,67,171,23,44,154,0,0,114,212,
-            208,200,212,208,200,212,208,200,33,65,162,113,160,218,182,227,254,195,233,255,156,195,235,206,225,
-            245,134,175,223,94,141,207,35,57,154,28,46,149,0,0,114,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,12,32,138,93,117,187,214,235,250,189,211,238,142,161,210,51,
-            70,159,24,35,137,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,60,69,155,87,94,168,22,28,131,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            149,240,240,240,240,240,240,50,92,184,128,184,242,159,214,255,165,219,255,168,222,255,137,191,237,
+            202,227,248,127,187,237,101,161,226,64,113,197,56,96,189,38,67,171,23,44,154,0,0,114,240,
+            240,240,240,240,240,240,240,240,33,65,162,113,160,218,182,227,254,195,233,255,156,195,235,206,225,
+            245,134,175,223,94,141,207,35,57,154,28,46,149,0,0,114,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,12,32,138,93,117,187,214,235,250,189,211,238,142,161,210,51,
+            70,159,24,35,137,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,60,69,155,87,94,168,22,28,131,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5954,12 +5806,12 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,91,155,232,91,154,232,92,154,232,91,155,233,91,155,232,91,155,232,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,90,152,229,249,253,255,249,252,255,249,253,255,249,252,255,249,252,255,249,252,255,90,152,229,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,89,149,226,241,
+            240,240,240,240,240,240,91,155,232,91,154,232,92,154,232,91,155,233,91,155,232,91,155,232,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,90,152,229,249,253,255,249,252,255,249,253,255,249,252,255,249,252,255,249,252,255,90,152,229,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,89,149,226,241,
             249,255,241,249,255,241,249,255,241,250,255,241,249,255,242,249,255,241,249,255,136,163,203,90,149,
-            225,89,150,225,90,150,226,89,150,225,89,149,225,90,149,225,212,208,200,89,146,222,232,246,255,
+            225,89,150,225,90,150,226,89,150,225,89,149,225,90,149,225,240,240,240,89,146,222,232,246,255,
             232,246,255,232,246,255,232,246,255,232,246,255,231,245,255,232,246,255,232,245,255,232,245,255,231,
             245,255,232,246,255,232,245,255,232,246,255,231,246,255,89,146,222,87,143,218,221,241,255,221,241,
             255,221,241,255,221,241,255,221,241,255,221,241,255,221,241,255,221,242,255,75,136,225,75,136,225,
@@ -5980,14 +5832,14 @@
             149,79,122,189,139,207,255,44,85,192,255,255,255,255,255,255,255,255,255,207,207,207,216,216,216,
             255,255,255,243,243,243,217,217,217,193,193,193,169,169,169,149,149,149,131,131,138,44,85,192,78,
             119,187,121,200,255,37,75,185,200,200,218,200,200,218,200,200,218,200,200,218,223,223,229,238,238,
-            238,216,216,216,192,192,192,168,168,168,145,145,145,133,133,135,190,190,206,38,75,185,212,208,200,
+            238,216,216,216,192,192,192,168,168,168,145,145,145,133,133,135,190,190,206,38,75,185,240,240,240,
             77,117,183,32,65,179,32,65,179,31,65,179,32,66,179,101,103,133,213,212,173,255,229,133,254,
-            228,168,183,158,105,201,163,87,255,232,152,255,255,184,213,198,145,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,255,233,0,255,245,0,255,225,0,
-            212,208,200,212,208,200,255,238,0,255,246,0,255,225,0,212,208,200
+            228,168,183,158,105,201,163,87,255,232,152,255,255,184,213,198,145,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,255,233,0,255,245,0,255,225,0,
+            240,240,240,240,240,240,255,238,0,255,246,0,255,225,0,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -5995,40 +5847,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,74,67,198,106,102,218,128,120,218,106,83,198,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,75,94,222,97,110,228,113,123,228,
-            145,153,243,185,193,254,212,217,254,185,192,254,162,172,254,115,128,254,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,66,85,209,155,167,254,175,187,254,175,187,254,175,187,
-            254,162,174,254,110,123,254,99,112,254,99,112,254,99,112,254,82,51,189,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,120,136,254,129,146,254,128,144,254,118,133,254,102,
-            116,254,99,112,254,99,112,254,95,96,237,90,78,220,82,50,189,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,97,113,254,83,88,223,79,76,209,77,64,198,76,55,189,
-            70,31,162,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,96,107,248,77,71,203,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,87,92,229,77,67,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,86,90,227,77,62,197,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,77,78,218,73,56,194,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            71,62,203,70,51,191,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,79,98,193,143,148,213,144,139,207,90,67,172,72,66,
-            207,71,47,188,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,100,121,210,216,218,254,216,218,254,216,218,254,216,218,254,118,116,224,73,
-            45,185,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,53,78,195,158,164,254,158,164,254,158,164,254,153,161,254,130,148,254,100,125,254,75,46,186,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,52,
-            64,181,103,111,248,106,116,254,102,115,254,91,110,254,88,109,254,85,93,237,71,19,152,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            76,67,195,112,115,248,118,122,254,118,122,254,108,102,237,73,16,146,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,58,19,141,85,46,171,81,27,153,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,74,67,198,106,102,218,128,120,218,106,83,198,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,75,94,222,97,110,228,113,123,228,
+            145,153,243,185,193,254,212,217,254,185,192,254,162,172,254,115,128,254,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,66,85,209,155,167,254,175,187,254,175,187,254,175,187,
+            254,162,174,254,110,123,254,99,112,254,99,112,254,99,112,254,82,51,189,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,120,136,254,129,146,254,128,144,254,118,133,254,102,
+            116,254,99,112,254,99,112,254,95,96,237,90,78,220,82,50,189,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,97,113,254,83,88,223,79,76,209,77,64,198,76,55,189,
+            70,31,162,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,96,107,248,77,71,203,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,87,92,229,77,67,200,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,86,90,227,77,62,197,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,77,78,218,73,56,194,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            71,62,203,70,51,191,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,79,98,193,143,148,213,144,139,207,90,67,172,72,66,
+            207,71,47,188,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,100,121,210,216,218,254,216,218,254,216,218,254,216,218,254,118,116,224,73,
+            45,185,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,53,78,195,158,164,254,158,164,254,158,164,254,153,161,254,130,148,254,100,125,254,75,46,186,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,52,
+            64,181,103,111,248,106,116,254,102,115,254,91,110,254,88,109,254,85,93,237,71,19,152,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            76,67,195,112,115,248,118,122,254,118,122,254,108,102,237,73,16,146,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,58,19,141,85,46,171,81,27,153,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6036,16 +5888,16 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,128,128,128,128,
-            128,128,128,128,128,128,128,128,128,128,128,128,128,128,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,128,128,128,128,128,128,128,128,128,244,223,132,
-            255,239,153,207,210,204,195,206,241,128,128,128,128,128,128,128,128,128,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,128,128,128,190,182,77,172,212,111,154,215,146,179,206,112,232,222,
-            132,169,181,219,132,168,255,131,165,251,235,236,190,128,128,128,128,128,128,212,208,200,212,208,200,
-            212,208,200,128,128,128,128,128,128,118,186,62,61,187,75,82,191,87,140,191,93,249,226,132,143,
-            161,210,49,106,255,63,111,249,187,202,208,244,229,161,128,128,128,212,208,200,212,208,200,128,128,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,128,128,128,128,
+            128,128,128,128,128,128,128,128,128,128,128,128,128,128,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,128,128,128,128,128,128,128,128,128,244,223,132,
+            255,239,153,207,210,204,195,206,241,128,128,128,128,128,128,128,128,128,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,128,128,128,190,182,77,172,212,111,154,215,146,179,206,112,232,222,
+            132,169,181,219,132,168,255,131,165,251,235,236,190,128,128,128,128,128,128,240,240,240,240,240,240,
+            240,240,240,128,128,128,128,128,128,118,186,62,61,187,75,82,191,87,140,191,93,249,226,132,143,
+            161,210,49,106,255,63,111,249,187,202,208,244,229,161,128,128,128,240,240,240,240,240,240,128,128,
             128,128,128,128,255,212,85,176,188,63,0,156,1,0,155,0,137,185,67,255,232,142,158,167,194,
-            71,114,243,187,193,182,253,250,182,255,253,187,128,128,128,212,208,200,128,128,128,128,128,128,252,
+            71,114,243,187,193,182,253,250,182,255,253,187,128,128,128,240,240,240,128,128,128,128,128,128,252,
             157,113,255,144,83,197,170,61,156,183,61,168,188,71,160,189,77,255,226,134,255,236,142,232,219,
             159,244,237,166,255,255,182,255,253,186,128,128,128,128,128,128,128,128,128,255,77,44,255,69,78,
             250,58,61,244,162,72,255,215,103,255,216,113,255,221,123,255,224,130,255,231,142,255,240,152,255,
@@ -6057,19 +5909,19 @@
             255,202,86,255,207,98,255,214,109,255,220,121,255,226,132,255,231,144,255,243,160,251,227,145,128,
             128,128,128,128,128,128,128,128,255,181,37,255,180,37,255,187,50,225,165,58,213,168,78,255,203,
             88,255,206,94,255,216,107,255,221,119,255,224,128,255,233,143,255,245,156,128,128,128,128,128,128,
-            212,208,200,128,128,128,255,188,49,255,178,32,219,151,40,212,208,200,212,208,200,235,179,71,255,
-            212,95,244,200,101,247,211,116,255,232,132,255,228,130,128,128,128,128,128,128,212,208,200,212,208,
-            200,128,128,128,255,203,89,255,185,34,152,102,21,212,208,200,212,208,200,250,187,69,193,143,55,
-            128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,212,208,200,212,208,200,212,208,200,128,
-            128,128,128,128,128,255,224,106,211,156,49,212,208,200,225,160,49,250,188,68,128,128,128,128,128,
-            128,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            128,128,128,128,128,128,245,204,106,255,222,110,255,214,97,128,128,128,128,128,128,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            240,240,240,128,128,128,255,188,49,255,178,32,219,151,40,240,240,240,240,240,240,235,179,71,255,
+            212,95,244,200,101,247,211,116,255,232,132,255,228,130,128,128,128,128,128,128,240,240,240,240,240,
+            240,128,128,128,255,203,89,255,185,34,152,102,21,240,240,240,240,240,240,250,187,69,193,143,55,
+            128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,240,240,240,240,240,240,240,240,240,128,
+            128,128,128,128,128,255,224,106,211,156,49,240,240,240,225,160,49,250,188,68,128,128,128,128,128,
+            128,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            128,128,128,128,128,128,245,204,106,255,222,110,255,214,97,128,128,128,128,128,128,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6077,40 +5929,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            198,236,200,199,234,200,199,236,201,180,234,180,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,107,203,105,110,198,
-            103,110,199,100,109,198,100,114,201,111,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,94,143,201,155,188,226,155,186,225,95,128,167,212,208,200,43,180,9,66,189,23,72,
-            193,22,70,191,22,56,183,22,26,174,7,212,208,200,212,208,200,212,208,200,212,208,200,112,156,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            198,236,200,199,234,200,199,236,201,180,234,180,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,107,203,105,110,198,
+            103,110,199,100,109,198,100,114,201,111,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,94,143,201,155,188,226,155,186,225,95,128,167,240,240,240,43,180,9,66,189,23,72,
+            193,22,70,191,22,56,183,22,26,174,7,240,240,240,240,240,240,240,240,240,240,240,240,112,156,
             206,211,233,255,212,231,251,212,232,252,211,231,255,113,171,198,44,171,22,77,205,0,89,212,0,
-            83,208,0,65,198,0,45,178,2,212,208,200,212,208,200,212,208,200,212,208,200,134,191,250,155,
+            83,208,0,65,198,0,45,178,2,240,240,240,240,240,240,240,240,240,240,240,240,134,191,250,155,
             198,241,155,199,241,154,199,241,154,198,241,127,176,250,71,159,128,120,228,10,141,242,16,132,235,
-            17,98,214,14,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,115,183,246,130,189,239,
+            17,98,214,14,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,115,183,246,130,189,239,
             138,195,241,138,194,241,130,189,239,108,172,243,86,159,181,137,211,84,154,228,74,150,224,82,110,
-            197,78,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,133,198,253,152,207,246,161,215,
+            197,78,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,133,198,253,152,207,246,161,215,
             248,161,215,248,150,206,245,126,184,248,103,175,169,133,209,113,130,206,110,132,207,116,136,213,126,
-            70,178,50,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,182,229,255,207,244,255,206,
+            70,178,50,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,182,229,255,207,244,255,206,
             243,255,182,224,255,108,182,182,67,184,35,82,198,27,81,199,26,81,198,27,78,195,32,61,193,
-            24,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,165,206,247,194,223,247,194,223,248,
+            24,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,165,206,247,194,223,247,194,223,248,
             173,207,252,78,159,154,62,192,1,81,207,0,85,208,0,83,206,0,73,200,0,57,192,0,48,
-            179,2,212,208,200,212,208,200,212,208,200,142,197,249,178,213,246,166,205,242,166,205,242,176,211,
+            179,2,240,240,240,240,240,240,240,240,240,142,197,249,178,213,246,166,205,242,166,205,242,176,211,
             245,141,187,250,80,170,122,104,223,0,114,228,0,110,225,0,94,215,0,74,202,0,70,205,13,
-            212,208,200,212,208,200,94,160,223,139,196,245,144,198,242,146,200,242,146,200,242,143,197,241,136,
-            191,245,103,169,225,128,224,51,160,255,18,152,252,25,135,241,33,122,227,44,101,197,40,212,208,
-            200,212,208,200,130,195,251,141,200,244,152,207,245,158,212,246,158,211,246,151,207,245,139,198,243,
-            124,187,250,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,159,215,255,161,214,248,175,225,251,185,231,253,184,230,253,174,224,250,158,212,247,153,212,
-            255,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            155,202,238,191,235,255,209,250,255,223,255,255,222,255,255,209,251,255,192,237,255,161,208,248,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            240,240,240,240,240,240,94,160,223,139,196,245,144,198,242,146,200,242,146,200,242,143,197,241,136,
+            191,245,103,169,225,128,224,51,160,255,18,152,252,25,135,241,33,122,227,44,101,197,40,240,240,
+            240,240,240,240,130,195,251,141,200,244,152,207,245,158,212,246,158,211,246,151,207,245,139,198,243,
+            124,187,250,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,159,215,255,161,214,248,175,225,251,185,231,253,184,230,253,174,224,250,158,212,247,153,212,
+            255,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            155,202,238,191,235,255,209,250,255,223,255,255,222,255,255,209,251,255,192,237,255,161,208,248,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6118,40 +5970,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,245,234,222,230,191,152,222,209,199,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,219,192,165,189,100,13,171,140,110,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,167,136,113,148,108,74,110,63,27,102,65,31,123,85,51,141,
-            105,74,146,119,98,169,145,127,126,85,52,212,208,200,212,208,200,212,208,200,127,80,43,154,123,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,245,234,222,230,191,152,222,209,199,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,219,192,165,189,100,13,171,140,110,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,167,136,113,148,108,74,110,63,27,102,65,31,123,85,51,141,
+            105,74,146,119,98,169,145,127,126,85,52,240,240,240,240,240,240,240,240,240,127,80,43,154,123,
             97,165,141,123,181,161,147,198,185,172,214,204,197,228,224,221,246,243,247,253,252,251,254,254,253,
-            254,254,254,253,254,253,145,114,90,212,208,200,212,208,200,212,208,200,112,72,41,249,249,247,253,
+            254,254,254,253,254,253,145,114,90,240,240,240,240,240,240,240,240,240,112,72,41,249,249,247,253,
             254,254,254,254,254,254,254,254,254,254,254,253,253,254,253,253,254,254,254,254,254,254,254,254,254,
-            254,254,254,254,165,140,122,195,174,155,212,208,200,212,208,200,122,82,51,230,226,222,254,254,254,
+            254,254,254,254,165,140,122,195,174,155,240,240,240,240,240,240,122,82,51,230,226,222,254,254,254,
             254,254,254,253,253,254,254,254,254,253,253,254,252,252,254,254,254,254,254,254,254,254,254,254,254,
-            254,254,176,160,151,164,139,119,212,208,200,212,208,200,141,106,80,209,200,194,254,254,254,254,254,
+            254,254,176,160,151,164,139,119,240,240,240,240,240,240,141,106,80,209,200,194,254,254,254,254,254,
             254,254,254,254,254,254,254,254,254,254,254,254,254,254,253,254,254,254,254,254,254,254,254,254,254,
-            195,187,180,159,123,96,212,208,200,212,208,200,146,119,98,190,175,165,255,255,255,255,255,255,255,
+            195,187,180,159,123,96,240,240,240,240,240,240,146,119,98,190,175,165,255,255,255,255,255,255,255,
             255,255,255,255,255,255,255,255,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,217,213,
-            209,128,93,64,212,208,200,212,208,200,146,119,98,146,119,98,255,255,255,255,255,255,255,255,255,
+            209,128,93,64,240,240,240,240,240,240,146,119,98,146,119,98,255,255,255,255,255,255,255,255,255,
             255,255,255,255,255,255,220,211,207,205,191,181,196,176,158,179,154,133,156,130,108,140,107,81,158,
-            124,95,212,208,200,212,208,200,212,208,200,146,119,98,146,119,98,148,113,84,138,96,60,117,76,
-            42,117,73,35,109,76,49,155,129,104,146,119,98,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,192,175,160,139,
-            76,18,160,136,116,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,221,193,166,198,102,15,
-            171,141,114,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,231,200,170,192,99,17,170,140,
-            114,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,223,196,168,193,98,13,174,143,111,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,216,189,164,190,98,12,180,146,115,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            124,95,240,240,240,240,240,240,240,240,240,146,119,98,146,119,98,148,113,84,138,96,60,117,76,
+            42,117,73,35,109,76,49,155,129,104,146,119,98,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,192,175,160,139,
+            76,18,160,136,116,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,221,193,166,198,102,15,
+            171,141,114,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,231,200,170,192,99,17,170,140,
+            114,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,223,196,168,193,98,13,174,143,111,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,216,189,164,190,98,12,180,146,115,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6159,40 +6011,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,131,127,28,136,138,0,130,125,0,
-            141,127,18,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,129,145,29,198,194,165,8,0,46,10,0,2,131,132,
-            28,30,24,15,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,91,116,6,193,189,239,19,22,15,212,208,200,212,208,200,114,142,0,124,
-            134,9,6,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,118,146,0,14,14,14,212,208,200,212,208,200,212,208,200,212,208,200,125,140,0,
-            8,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,131,143,0,8,0,0,212,208,200,212,208,200,212,208,200,212,208,200,120,120,24,8,0,
-            35,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,131,127,28,136,138,0,130,125,0,
+            141,127,18,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,129,145,29,198,194,165,8,0,46,10,0,2,131,132,
+            28,30,24,15,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,91,116,6,193,189,239,19,22,15,240,240,240,240,240,240,114,142,0,124,
+            134,9,6,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,118,146,0,14,14,14,240,240,240,240,240,240,240,240,240,240,240,240,125,140,0,
+            8,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,131,143,0,8,0,0,240,240,240,240,240,240,240,240,240,240,240,240,120,120,24,8,0,
+            35,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             109,115,0,24,2,25,130,135,9,124,135,0,145,150,50,139,143,23,136,137,9,36,23,6,104,
-            112,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,141,144,51,140,143,
+            112,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,141,144,51,140,143,
             36,113,122,0,135,134,44,131,133,23,134,140,8,118,121,6,139,139,7,100,93,21,133,156,0,
-            15,10,6,212,208,200,212,208,200,212,208,200,212,208,200,114,136,0,252,249,232,255,248,255,255,
+            15,10,6,240,240,240,240,240,240,240,240,240,240,240,240,114,136,0,252,249,232,255,248,255,255,
             255,239,255,255,216,255,245,255,255,246,255,255,255,212,255,246,255,255,246,255,128,145,0,4,0,
-            34,212,208,200,212,208,200,212,208,200,212,208,200,114,132,0,255,247,255,245,254,17,251,251,7,
-            253,250,0,255,252,15,253,255,0,247,255,0,242,253,1,240,252,30,124,139,0,1,1,0,212,
-            208,200,212,208,200,212,208,200,212,208,200,135,153,9,244,222,255,146,148,0,144,135,0,146,136,
-            0,142,123,18,137,126,0,141,135,0,138,125,0,231,207,195,120,127,0,19,16,9,212,208,200,
-            212,208,200,212,208,200,212,208,200,115,134,0,255,255,234,212,229,1,248,255,15,247,255,0,242,
-            250,17,242,252,18,255,255,41,254,255,0,252,255,4,119,119,0,6,0,23,212,208,200,212,208,
-            200,212,208,200,212,208,200,129,132,25,255,240,246,151,145,33,145,132,28,132,122,0,146,134,16,
-            138,132,0,131,130,0,134,121,0,213,183,183,140,145,0,15,2,19,212,208,200,212,208,200,212,
-            208,200,212,208,200,128,126,7,255,255,175,240,245,41,255,255,19,238,246,0,246,254,0,248,255,
-            0,255,255,7,254,255,45,237,249,19,141,141,27,7,1,0,212,208,200,212,208,200,212,208,200,
-            212,208,200,116,121,0,154,153,26,109,106,0,131,126,9,143,135,24,148,140,33,128,118,3,127,
-            118,0,125,133,0,130,128,45,109,125,0,15,5,32,212,208,200,212,208,200,212,208,200,212,208,
-            200,9,0,22,10,2,0,6,1,0,8,5,0,6,1,0,6,0,0,7,0,2,19,6,24,
-            9,8,0,5,4,0,5,8,0,212,208,200,212,208,200,212,208,200
+            34,240,240,240,240,240,240,240,240,240,240,240,240,114,132,0,255,247,255,245,254,17,251,251,7,
+            253,250,0,255,252,15,253,255,0,247,255,0,242,253,1,240,252,30,124,139,0,1,1,0,240,
+            240,240,240,240,240,240,240,240,240,240,240,135,153,9,244,222,255,146,148,0,144,135,0,146,136,
+            0,142,123,18,137,126,0,141,135,0,138,125,0,231,207,195,120,127,0,19,16,9,240,240,240,
+            240,240,240,240,240,240,240,240,240,115,134,0,255,255,234,212,229,1,248,255,15,247,255,0,242,
+            250,17,242,252,18,255,255,41,254,255,0,252,255,4,119,119,0,6,0,23,240,240,240,240,240,
+            240,240,240,240,240,240,240,129,132,25,255,240,246,151,145,33,145,132,28,132,122,0,146,134,16,
+            138,132,0,131,130,0,134,121,0,213,183,183,140,145,0,15,2,19,240,240,240,240,240,240,240,
+            240,240,240,240,240,128,126,7,255,255,175,240,245,41,255,255,19,238,246,0,246,254,0,248,255,
+            0,255,255,7,254,255,45,237,249,19,141,141,27,7,1,0,240,240,240,240,240,240,240,240,240,
+            240,240,240,116,121,0,154,153,26,109,106,0,131,126,9,143,135,24,148,140,33,128,118,3,127,
+            118,0,125,133,0,130,128,45,109,125,0,15,5,32,240,240,240,240,240,240,240,240,240,240,240,
+            240,9,0,22,10,2,0,6,1,0,8,5,0,6,1,0,6,0,0,7,0,2,19,6,24,
+            9,8,0,5,4,0,5,8,0,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6200,40 +6052,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,100,157,253,189,217,255,193,218,255,172,208,255,139,187,255,109,169,255,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,144,177,236,139,158,193,82,97,127,146,180,239,111,164,254,99,155,250,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,102,159,
-            255,57,85,138,102,128,178,70,97,150,103,142,214,88,139,229,82,132,220,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,92,146,238,58,
-            93,160,67,103,173,36,62,114,77,119,198,74,120,204,73,117,201,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,78,125,210,76,121,204,
-            61,99,171,63,102,179,99,129,192,61,99,178,73,116,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,96,146,235,78,120,197,51,85,
-            156,70,99,160,108,139,202,42,73,143,76,122,207,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,92,145,237,98,146,231,81,128,216,88,129,206,117,
-            149,212,59,92,162,50,84,157,79,127,214,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,101,150,237,89,137,224,77,123,208,91,131,204,85,120,189,
-            31,56,121,67,109,190,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,113,161,243,101,148,231,80,127,215,75,119,201,90,131,207,29,54,117,53,89,
-            163,74,120,204,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,102,159,255,
-            123,170,251,116,161,240,86,134,221,76,122,207,82,129,215,36,65,131,42,74,143,74,120,203,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,108,168,255,145,191,255,144,186,255,131,173,
-            248,96,144,229,79,127,214,87,137,227,38,67,134,39,68,137,75,121,206,212,208,200,212,208,200,
-            212,208,200,212,208,200,146,192,255,123,152,210,112,139,194,54,71,122,112,154,229,101,150,237,87,
-            137,227,86,137,227,40,69,138,45,77,148,78,125,210,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,142,189,255,135,160,210,9,26,79,48,82,155,75,121,205,96,150,243,71,115,198,
-            36,65,132,59,98,175,82,132,219,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,108,168,255,105,164,255,101,159,255,90,144,235,71,115,198,45,78,150,57,94,171,79,127,
-            214,87,138,228,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            143,160,219,88,134,227,92,146,239,85,135,224,79,127,214,94,148,241,100,157,253,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,82,82,
-            139,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,100,157,253,189,217,255,193,218,255,172,208,255,139,187,255,109,169,255,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,144,177,236,139,158,193,82,97,127,146,180,239,111,164,254,99,155,250,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,102,159,
+            255,57,85,138,102,128,178,70,97,150,103,142,214,88,139,229,82,132,220,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,92,146,238,58,
+            93,160,67,103,173,36,62,114,77,119,198,74,120,204,73,117,201,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,78,125,210,76,121,204,
+            61,99,171,63,102,179,99,129,192,61,99,178,73,116,200,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,96,146,235,78,120,197,51,85,
+            156,70,99,160,108,139,202,42,73,143,76,122,207,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,92,145,237,98,146,231,81,128,216,88,129,206,117,
+            149,212,59,92,162,50,84,157,79,127,214,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,101,150,237,89,137,224,77,123,208,91,131,204,85,120,189,
+            31,56,121,67,109,190,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,113,161,243,101,148,231,80,127,215,75,119,201,90,131,207,29,54,117,53,89,
+            163,74,120,204,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,102,159,255,
+            123,170,251,116,161,240,86,134,221,76,122,207,82,129,215,36,65,131,42,74,143,74,120,203,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,108,168,255,145,191,255,144,186,255,131,173,
+            248,96,144,229,79,127,214,87,137,227,38,67,134,39,68,137,75,121,206,240,240,240,240,240,240,
+            240,240,240,240,240,240,146,192,255,123,152,210,112,139,194,54,71,122,112,154,229,101,150,237,87,
+            137,227,86,137,227,40,69,138,45,77,148,78,125,210,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,142,189,255,135,160,210,9,26,79,48,82,155,75,121,205,96,150,243,71,115,198,
+            36,65,132,59,98,175,82,132,219,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,108,168,255,105,164,255,101,159,255,90,144,235,71,115,198,45,78,150,57,94,171,79,127,
+            214,87,138,228,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            143,160,219,88,134,227,92,146,239,85,135,224,79,127,214,94,148,241,100,157,253,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,82,82,
+            139,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6241,40 +6093,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,160,89,
-            134,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,162,72,100,160,89,112,173,
-            119,145,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,154,154,154,212,208,200,162,81,120,142,87,114,216,166,192,
-            212,208,200,232,180,205,172,152,164,159,159,159,212,208,200,212,208,200,160,164,162,212,208,200,212,
-            208,200,212,208,200,163,149,154,212,159,185,172,121,149,195,131,162,100,31,100,207,142,175,244,191,
-            216,255,224,245,213,166,190,152,140,148,212,208,200,160,154,158,168,139,152,160,158,158,212,208,200,
-            152,150,152,205,162,184,255,226,246,221,160,190,222,168,194,212,208,200,166,82,123,244,191,216,255,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,160,89,
+            134,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,162,72,100,160,89,112,173,
+            119,145,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,154,154,154,240,240,240,162,81,120,142,87,114,216,166,192,
+            240,240,240,232,180,205,172,152,164,159,159,159,240,240,240,240,240,240,160,164,162,240,240,240,240,
+            240,240,240,240,240,163,149,154,212,159,185,172,121,149,195,131,162,100,31,100,207,142,175,244,191,
+            216,255,224,245,213,166,190,152,140,148,240,240,240,160,154,158,168,139,152,160,158,158,240,240,240,
+            152,150,152,205,162,184,255,226,246,221,160,190,222,168,194,240,240,240,166,82,123,244,191,216,255,
             224,245,219,158,188,197,134,166,185,130,158,190,125,158,251,123,186,178,128,152,180,139,159,184,129,
-            155,224,169,195,255,215,239,250,193,221,195,163,178,212,208,200,212,208,200,213,151,181,255,221,244,
+            155,224,169,195,255,215,239,250,193,221,195,163,178,240,240,240,240,240,240,213,151,181,255,221,244,
             255,206,233,255,209,237,248,136,191,225,118,170,255,144,205,214,112,161,250,150,199,255,207,235,244,
-            186,214,255,220,243,235,176,205,154,103,129,212,208,200,134,134,134,202,151,173,255,216,244,235,173,
+            186,214,255,220,243,235,176,205,154,103,129,240,240,240,134,134,134,202,151,173,255,216,244,235,173,
             205,181,98,140,214,107,159,255,148,201,255,149,202,255,143,200,214,111,160,213,140,176,255,213,240,
-            255,212,239,188,111,148,212,208,200,100,100,100,169,130,149,241,178,211,255,209,239,180,129,153,212,
-            208,200,162,104,134,243,143,192,255,162,215,221,129,173,148,89,112,152,97,124,229,164,197,255,201,
-            233,170,114,142,212,208,200,173,92,132,250,181,216,251,186,221,245,172,207,192,151,171,212,208,200,
-            212,208,200,220,138,178,255,162,213,173,133,153,212,208,200,212,208,200,227,163,194,255,209,241,202,
-            141,172,152,121,136,212,133,171,243,171,207,164,82,125,193,110,150,237,168,201,212,208,200,170,138,
-            153,251,160,205,255,172,220,186,133,160,212,208,200,179,144,162,245,170,207,225,151,188,255,194,229,
-            184,98,140,184,103,142,171,84,127,212,208,200,159,78,117,243,160,200,204,139,171,241,161,200,222,
+            255,212,239,188,111,148,240,240,240,100,100,100,169,130,149,241,178,211,255,209,239,180,129,153,240,
+            240,240,162,104,134,243,143,192,255,162,215,221,129,173,148,89,112,152,97,124,229,164,197,255,201,
+            233,170,114,142,240,240,240,173,92,132,250,181,216,251,186,221,245,172,207,192,151,171,240,240,240,
+            240,240,240,220,138,178,255,162,213,173,133,153,240,240,240,240,240,240,227,163,194,255,209,241,202,
+            141,172,152,121,136,212,133,171,243,171,207,164,82,125,193,110,150,237,168,201,240,240,240,170,138,
+            153,251,160,205,255,172,220,186,133,160,240,240,240,179,144,162,245,170,207,225,151,188,255,194,229,
+            184,98,140,184,103,142,171,84,127,240,240,240,159,78,117,243,160,200,204,139,171,241,161,200,222,
             134,178,211,124,166,248,164,205,171,127,149,235,160,197,204,119,160,158,73,114,234,153,193,231,148,
-            188,155,128,142,212,208,200,212,208,200,212,208,200,195,105,150,255,184,226,237,155,195,158,77,115,
-            159,76,115,241,161,200,252,168,212,239,142,190,159,77,119,212,208,200,172,81,128,214,123,168,212,
-            208,200,212,208,200,212,208,200,212,208,200,162,72,115,202,118,160,168,85,125,212,208,200,212,208,
-            200,175,95,134,244,158,201,180,91,134,212,208,200,212,208,200,100,100,100,166,97,131,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,154,76,110,212,208,200,212,208,200,212,208,200,139,
-            64,100,168,83,125,152,72,111,212,208,200,212,208,200,212,208,200,160,148,153,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            188,155,128,142,240,240,240,240,240,240,240,240,240,195,105,150,255,184,226,237,155,195,158,77,115,
+            159,76,115,241,161,200,252,168,212,239,142,190,159,77,119,240,240,240,172,81,128,214,123,168,240,
+            240,240,240,240,240,240,240,240,240,240,240,162,72,115,202,118,160,168,85,125,240,240,240,240,240,
+            240,175,95,134,244,158,201,180,91,134,240,240,240,240,240,240,100,100,100,166,97,131,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,154,76,110,240,240,240,240,240,240,240,240,240,139,
+            64,100,168,83,125,152,72,111,240,240,240,240,240,240,240,240,240,160,148,153,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6282,40 +6134,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,150,156,153,96,105,106,100,109,117,89,95,107,
-            130,136,146,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,115,120,123,105,110,119,152,159,175,153,159,181,98,102,126,49,53,
-            72,90,93,106,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,88,91,107,178,181,204,144,149,180,94,99,134,61,63,98,57,60,88,27,
-            30,47,154,157,166,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,103,102,105,212,208,
-            200,141,140,154,111,112,137,155,156,191,88,91,134,54,56,104,54,55,99,58,60,92,57,60,79,
-            62,65,72,212,208,200,157,157,157,164,164,164,212,208,200,212,208,200,109,107,110,212,208,200,125,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,150,156,153,96,105,106,100,109,117,89,95,107,
+            130,136,146,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,115,120,123,105,110,119,152,159,175,153,159,181,98,102,126,49,53,
+            72,90,93,106,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,88,91,107,178,181,204,144,149,180,94,99,134,61,63,98,57,60,88,27,
+            30,47,154,157,166,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,103,102,105,240,240,
+            240,141,140,154,111,112,137,155,156,191,88,91,134,54,56,104,54,55,99,58,60,92,57,60,79,
+            62,65,72,240,240,240,157,157,157,164,164,164,240,240,240,240,240,240,109,107,110,240,240,240,125,
             125,139,83,84,111,103,103,143,53,54,102,61,63,114,57,58,103,65,67,99,46,49,66,54,58,
-            61,212,208,200,115,115,114,212,208,200,212,208,200,212,208,200,140,140,136,133,134,135,169,169,180,
-            21,21,45,40,40,78,45,47,94,58,60,109,51,53,94,37,40,69,13,15,28,85,89,87,212,
-            208,200,100,101,100,212,208,200,212,208,200,212,208,200,212,208,200,88,90,86,73,73,80,10,12,
+            61,240,240,240,115,115,114,240,240,240,240,240,240,240,240,240,140,140,136,133,134,135,169,169,180,
+            21,21,45,40,40,78,45,47,94,58,60,109,51,53,94,37,40,69,13,15,28,85,89,87,240,
+            240,240,100,101,100,240,240,240,240,240,240,240,240,240,240,240,240,88,90,86,73,73,80,10,12,
             31,54,55,88,138,140,182,107,110,154,53,55,92,23,27,50,2,6,13,56,61,53,55,60,53,
-            156,156,154,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,177,178,178,74,78,90,84,
-            87,111,95,99,131,59,63,98,63,67,95,50,55,72,62,67,70,143,149,138,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,132,132,124,114,119,107,116,119,116,48,52,59,26,28,46,
+            156,156,154,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,177,178,178,74,78,90,84,
+            87,111,95,99,131,59,63,98,63,67,95,50,55,72,62,67,70,143,149,138,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,132,132,124,114,119,107,116,119,116,48,52,59,26,28,46,
             37,42,67,47,52,80,45,49,74,24,28,43,38,43,46,96,102,93,114,119,107,111,111,109,132,
-            132,132,212,208,200,212,208,200,212,208,200,178,180,175,91,93,91,77,82,87,29,31,44,43,47,
-            67,96,102,126,35,39,62,15,18,34,57,62,67,77,81,77,140,145,137,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,157,159,156,120,122,122,212,208,200,94,99,112,97,102,122,96,
-            102,126,49,54,78,50,55,72,212,208,200,151,155,155,92,96,92,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,191,191,191,95,96,97,212,208,200,134,138,144,61,66,78,47,51,67,
-            53,56,72,75,77,90,212,208,200,147,150,151,152,153,153,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,77,77,77,212,208,200,212,208,200,58,58,61,40,41,44,58,58,
-            61,212,208,200,212,208,200,104,105,105,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,129,129,129,112,112,112,198,198,198,212,208,200,162,162,162,212,208,200,212,
-            208,200,149,149,149,108,108,108,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            132,132,240,240,240,240,240,240,240,240,240,178,180,175,91,93,91,77,82,87,29,31,44,43,47,
+            67,96,102,126,35,39,62,15,18,34,57,62,67,77,81,77,140,145,137,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,157,159,156,120,122,122,240,240,240,94,99,112,97,102,122,96,
+            102,126,49,54,78,50,55,72,240,240,240,151,155,155,92,96,92,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,191,191,191,95,96,97,240,240,240,134,138,144,61,66,78,47,51,67,
+            53,56,72,75,77,90,240,240,240,147,150,151,152,153,153,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,77,77,77,240,240,240,240,240,240,58,58,61,40,41,44,58,58,
+            61,240,240,240,240,240,240,104,105,105,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,129,129,129,112,112,112,198,198,198,240,240,240,162,162,162,240,240,240,240,
+            240,240,149,149,149,108,108,108,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6328,132 +6180,132 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,229,232,241,240,242,247,240,241,247,233,236,245,233,236,245,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,204,210,228,249,249,252,255,255,255,251,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,229,232,241,240,242,247,240,241,247,233,236,245,233,236,245,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,204,210,228,249,249,252,255,255,255,251,
             251,253,245,246,249,244,246,250,246,246,250,250,250,252,250,250,252,255,255,255,255,255,255,228,233,
-            246,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,247,248,252,247,248,252,241,242,249,237,239,247,234,236,245,231,234,
+            246,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,247,248,252,247,248,252,241,242,249,237,239,247,234,236,245,231,234,
             242,232,234,243,239,241,248,240,241,248,240,241,248,238,240,247,239,240,247,243,244,250,252,252,255,
-            202,210,234,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,243,243,250,233,235,245,232,235,245,226,228,239,224,226,237,216,220,233,215,220,233,229,232,242,
+            202,210,234,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,243,243,250,233,235,245,232,235,245,226,228,239,224,226,237,216,220,233,215,220,233,229,232,242,
             235,237,246,233,236,245,233,236,245,232,234,245,231,233,244,230,232,243,230,232,243,239,240,248,214,
-            219,240,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,234,235,246,225,227,241,
+            219,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,234,235,246,225,227,241,
             213,217,231,199,204,218,189,194,208,184,190,204,183,189,207,182,189,208,208,212,227,231,234,244,230,
             233,243,230,233,243,228,230,242,227,230,242,226,229,241,223,226,239,221,224,238,229,231,243,189,196,
-            228,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,207,211,233,207,212,231,184,190,209,167,174,192,164,
+            228,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,207,211,233,207,212,231,184,190,209,167,174,192,164,
             171,189,166,174,194,167,177,200,167,177,203,167,177,203,205,211,227,227,230,241,223,226,239,223,226,
-            239,229,231,243,218,221,236,212,215,231,219,222,238,215,219,236,213,217,235,218,220,238,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,181,189,217,150,161,188,146,154,176,149,158,182,150,162,191,151,164,
+            239,229,231,243,218,221,236,212,215,231,219,222,238,215,219,236,213,217,235,218,220,238,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,181,189,217,150,161,188,146,154,176,149,158,182,150,162,191,151,164,
             198,150,164,199,145,159,196,167,179,209,225,229,241,197,202,219,183,188,206,183,188,206,191,196,214,
-            184,190,209,211,214,232,215,218,236,211,215,233,207,211,232,209,213,233,166,174,215,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,109,125,181,138,151,186,131,141,166,133,146,179,134,150,189,134,151,191,133,149,189,130,146,188,
+            184,190,209,211,214,232,215,218,236,211,215,233,207,211,232,209,213,233,166,174,215,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,109,125,181,138,151,186,131,141,166,133,146,179,134,150,189,134,151,191,133,149,189,130,146,188,
             166,178,208,217,221,236,227,230,242,223,225,238,222,225,238,222,225,238,189,195,213,210,214,231,215,
-            218,236,211,215,234,207,211,232,203,207,230,202,207,230,166,174,213,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,59,84,152,
+            218,236,211,215,234,207,211,232,203,207,230,202,207,230,166,174,213,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,59,84,152,
             105,122,159,118,131,167,118,136,182,118,136,181,116,135,180,119,136,182,182,190,217,227,230,242,230,
             232,243,228,230,242,229,231,242,228,230,242,228,230,242,225,228,242,218,222,238,213,217,235,207,211,
-            231,204,209,231,198,203,227,194,200,226,154,164,207,125,137,195,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,50,76,149,0,29,103,61,81,130,104,
+            231,204,209,231,198,203,227,194,200,226,154,164,207,125,137,195,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,50,76,149,0,29,103,61,81,130,104,
             123,170,100,121,172,100,120,171,97,118,170,105,125,174,217,220,236,232,234,244,230,232,243,232,234,
             243,232,234,243,230,232,243,230,232,243,222,225,239,217,220,237,212,216,235,199,203,225,192,198,223,
-            196,202,228,187,193,224,144,154,202,136,145,199,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,106,122,181,63,82,140,33,58,122,67,92,153,82,105,
+            196,202,228,187,193,224,144,154,202,136,145,199,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,106,122,181,63,82,140,33,58,122,67,92,153,82,105,
             163,83,106,163,82,105,162,78,101,160,138,153,193,234,236,245,242,242,250,243,244,251,241,242,249,
             234,236,245,234,236,245,223,226,240,217,220,237,211,215,234,200,205,228,165,173,201,183,190,219,133,
-            143,184,134,144,193,141,150,202,97,115,183,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,143,152,202,151,160,206,141,152,197,110,124,172,70,91,144,60,86,148,
+            143,184,134,144,193,141,150,202,97,115,183,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,143,152,202,151,160,206,141,152,197,110,124,172,70,91,144,60,86,148,
             65,91,154,64,90,152,58,85,149,134,149,190,211,215,228,205,208,221,217,220,231,241,243,249,241,
             243,249,223,226,240,216,219,236,208,212,233,202,207,230,179,185,214,167,175,210,82,97,146,100,115,
-            169,73,94,160,103,120,185,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,137,147,198,146,155,203,160,168,211,178,185,221,112,123,162,33,54,107,43,71,140,49,
+            169,73,94,160,103,120,185,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,137,147,198,146,155,203,160,168,211,178,185,221,112,123,162,33,54,107,43,71,140,49,
             76,144,47,74,143,44,72,141,52,78,140,42,68,133,115,132,173,246,247,251,246,247,251,223,226,
             240,215,218,236,205,210,231,196,201,227,186,193,224,107,124,177,83,100,152,44,68,131,57,82,151,
-            70,93,165,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,138,
+            70,93,165,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,138,
             148,198,146,156,203,156,165,208,167,175,213,183,190,223,146,155,189,26,47,102,22,52,126,28,59,
             134,29,59,133,27,58,133,22,54,131,53,78,140,228,230,240,228,230,240,220,223,239,211,215,234,
-            200,205,228,194,199,227,108,126,178,4,30,95,29,51,106,111,126,181,101,118,177,32,62,142,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,139,149,199,145,155,
+            200,205,228,194,199,227,108,126,178,4,30,95,29,51,106,111,126,181,101,118,177,32,62,142,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,139,149,199,145,155,
             202,155,164,207,166,174,212,180,188,221,122,133,170,17,42,101,10,43,122,14,46,125,15,46,125,
             15,47,126,13,45,125,19,50,124,192,197,216,192,197,216,216,219,237,206,210,231,204,208,231,168,
-            177,212,19,47,117,12,41,113,59,83,148,35,63,137,30,59,135,3,40,128,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,139,149,199,145,155,202,155,164,207,
+            177,212,19,47,117,12,41,113,59,83,148,35,63,137,30,59,135,3,40,128,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,139,149,199,145,155,202,155,164,207,
             166,174,212,180,188,221,122,133,170,17,42,101,10,43,122,14,46,125,15,46,125,15,47,126,13,
             45,125,19,50,124,192,197,216,192,197,216,216,219,237,206,210,231,204,208,231,168,177,212,19,47,
-            117,12,41,113,59,83,148,35,63,137,30,59,135,3,40,128,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,139,148,201,147,156,203,151,160,205,136,146,187,80,
+            117,12,41,113,59,83,148,35,63,137,30,59,135,3,40,128,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,139,148,201,147,156,203,151,160,205,136,146,187,80,
             99,154,8,38,110,14,46,125,14,46,125,14,46,125,14,46,125,14,46,125,14,46,125,5,38,
             120,112,129,178,112,129,178,207,211,233,189,197,225,111,140,191,16,53,132,4,34,104,0,28,80,
-            106,128,177,150,160,207,155,162,191,239,240,241,164,164,164,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,128,140,199,153,161,208,106,119,165,11,32,86,11,43,120,14,47,
+            106,128,177,150,160,207,155,162,191,239,240,241,164,164,164,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,128,140,199,153,161,208,106,119,165,11,32,86,11,43,120,14,47,
             128,14,46,125,14,46,125,14,46,125,14,46,125,15,46,126,15,47,126,11,43,124,29,57,130,
             29,57,130,207,213,236,123,139,185,120,48,87,161,4,29,174,11,25,134,9,30,134,78,114,157,
-            163,190,241,241,240,255,255,254,140,140,139,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,141,151,203,51,74,133,5,29,89,13,44,124,14,46,125,14,46,125,
+            163,190,241,241,240,255,255,254,140,140,139,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,141,151,203,51,74,133,5,29,89,13,44,124,14,46,125,14,46,125,
             17,49,127,21,52,130,24,55,131,26,56,133,27,57,133,26,56,132,23,53,130,23,53,130,79,
             110,171,117,49,89,248,9,0,255,69,9,255,99,23,255,73,8,207,84,71,230,232,233,238,244,
-            244,125,132,132,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,114,130,191,51,77,147,27,51,112,14,43,113,16,48,129,24,54,131,31,60,135,36,
+            244,125,132,132,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,114,130,191,51,77,147,27,51,112,14,43,113,16,48,129,24,54,131,31,60,135,36,
             64,137,40,68,139,42,69,141,43,70,141,43,70,141,41,69,140,41,69,140,47,60,125,236,98,
-            102,255,80,29,255,165,76,251,162,78,209,160,112,225,230,227,224,232,234,174,122,118,212,208,200,
-            212,208,200,212,208,200,205,205,205,182,182,182,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,85,105,171,36,65,137,40,67,137,36,64,138,37,65,138,43,70,142,50,76,145,54,80,
+            102,255,80,29,255,165,76,251,162,78,209,160,112,225,230,227,224,232,234,174,122,118,240,240,240,
+            240,240,240,240,240,240,205,205,205,182,182,182,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,85,105,171,36,65,137,40,67,137,36,64,138,37,65,138,43,70,142,50,76,145,54,80,
             148,57,81,149,58,82,150,57,82,149,55,81,148,55,81,148,141,60,91,255,118,114,255,114,55,
-            253,171,87,208,160,117,208,214,218,209,214,219,166,152,134,196,109,54,195,30,8,212,208,200,177,
-            184,184,255,255,255,219,219,219,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,32,62,138,55,80,148,64,88,153,64,88,153,64,88,153,66,89,154,69,92,156,72,94,157,
+            253,171,87,208,160,117,208,214,218,209,214,219,166,152,134,196,109,54,195,30,8,240,240,240,177,
+            184,184,255,255,255,219,219,219,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,32,62,138,55,80,148,64,88,153,64,88,153,64,88,153,66,89,154,69,92,156,72,94,157,
             72,94,158,72,94,157,68,93,158,68,93,158,207,27,37,255,118,119,255,108,60,251,174,90,194,
             168,144,183,192,202,164,148,131,204,148,88,233,175,102,225,139,78,207,160,157,253,255,255,211,212,
-            212,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            212,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             51,78,149,72,94,157,84,105,163,90,110,167,94,113,169,96,115,171,97,115,171,97,115,171,97,
             115,171,92,118,176,92,118,176,242,7,7,255,131,133,255,102,79,255,174,95,236,173,107,200,160,
-            117,235,175,108,255,194,117,236,181,114,201,193,176,240,248,251,197,195,197,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,86,106,166,100,119,173,108,126,178,114,130,179,118,134,181,120,134,182,119,134,182,111,138,
+            117,235,175,108,255,194,117,236,181,114,201,193,176,240,248,251,197,195,197,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,86,106,166,100,119,173,108,126,178,114,130,179,118,134,181,120,134,182,119,134,182,111,138,
             190,111,138,190,254,35,31,255,154,152,255,123,120,255,136,82,255,195,114,255,194,116,255,198,122,
-            236,186,121,195,183,169,225,229,235,189,194,191,168,83,71,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,127,140,194,129,142,193,133,145,193,132,146,192,134,147,194,123,150,202,123,150,202,
+            236,186,121,195,183,169,225,229,235,189,194,191,168,83,71,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,127,140,194,129,142,193,133,145,193,132,146,192,134,147,194,123,150,202,123,150,202,
             255,66,61,255,75,70,255,106,103,255,118,102,255,171,104,255,201,125,255,202,125,205,176,136,193,
-            200,211,175,176,178,172,155,117,221,116,72,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,125,138,193,125,140,196,125,140,197,116,143,202,116,143,202,255,61,54,255,
+            200,211,175,176,178,172,155,117,221,116,72,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,125,138,193,125,140,196,125,140,197,116,143,202,116,143,202,255,61,54,255,
             47,40,255,56,47,255,125,121,255,116,97,255,173,109,255,214,136,237,197,135,185,169,145,195,169,
-            128,238,203,133,254,174,118,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,152,44,62,100,44,63,212,208,200,212,208,200,253,50,45,255,53,44,255,58,
+            128,238,203,133,254,174,118,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,152,44,62,100,44,63,240,240,240,240,240,240,253,50,45,255,53,44,255,58,
             47,255,78,67,255,128,121,255,116,101,255,146,98,255,204,132,255,220,143,255,224,149,255,231,155,
-            255,151,107,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,107,0,0,197,0,0,212,208,200,212,208,200,240,42,37,255,60,50,255,69,58,255,77,64,
-            255,91,77,255,128,116,255,126,116,255,124,99,255,154,110,255,171,119,255,152,110,252,98,80,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            255,151,107,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,107,0,0,197,0,0,240,240,240,240,240,240,240,42,37,255,60,50,255,69,58,255,77,64,
+            255,91,77,255,128,116,255,126,116,255,124,99,255,154,110,255,171,119,255,152,110,252,98,80,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             101,4,4,166,19,15,166,19,15,161,22,18,255,59,50,255,80,67,255,88,74,255,99,82,255,
-            107,89,255,128,110,255,147,131,255,149,133,255,142,124,220,90,77,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,214,55,46,250,86,73,253,102,85,253,113,95,251,120,
-            100,233,109,90,185,80,67,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            107,89,255,128,110,255,147,131,255,149,133,255,142,124,220,90,77,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,214,55,46,250,86,73,253,102,85,253,113,95,251,120,
+            100,233,109,90,185,80,67,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6461,132 +6313,132 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,200,0,0,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,200,0,0,
             202,0,0,200,0,0,198,0,0,197,0,0,195,0,0,194,0,0,194,0,0,191,0,0,189,
-            0,0,187,0,0,186,0,0,184,0,0,177,0,0,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,200,0,0,202,0,0,224,0,0,231,
+            0,0,187,0,0,186,0,0,184,0,0,177,0,0,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,200,0,0,202,0,0,224,0,0,231,
             0,0,231,0,0,230,0,0,230,0,0,230,0,0,230,0,0,229,0,0,229,0,0,228,0,
-            0,228,0,0,216,0,0,181,0,0,164,0,0,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,200,0,0,201,0,0,229,45,45,254,228,228,255,244,244,255,244,
+            0,228,0,0,216,0,0,181,0,0,164,0,0,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,200,0,0,201,0,0,229,45,45,254,228,228,255,244,244,255,244,
             244,255,244,244,255,244,244,255,244,244,255,244,244,255,244,244,255,244,244,255,244,244,255,244,244,
-            254,228,228,221,45,45,178,0,0,161,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,200,0,0,201,0,0,229,43,43,254,216,216,255,231,231,255,231,231,255,231,231,255,231,231,
+            254,228,228,221,45,45,178,0,0,161,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,200,0,0,201,0,0,229,43,43,254,216,216,255,231,231,255,231,231,255,231,231,255,231,231,
             255,231,231,255,231,231,255,231,231,255,231,231,255,231,231,255,231,231,255,231,231,255,231,231,254,
-            216,216,220,43,43,175,0,0,157,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,200,0,0,201,0,0,
+            216,216,220,43,43,175,0,0,157,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,200,0,0,201,0,0,
             229,40,40,254,203,203,255,217,217,255,217,217,255,217,217,255,217,217,255,217,217,255,217,217,255,
             217,217,255,217,217,255,217,217,255,217,217,255,217,217,255,217,217,255,217,217,255,217,217,254,203,
-            203,219,40,40,172,0,0,155,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,200,0,0,201,0,0,229,37,37,254,189,189,255,
+            203,219,40,40,172,0,0,155,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,200,0,0,201,0,0,229,37,37,254,189,189,255,
             202,202,255,202,202,255,202,202,255,202,202,255,202,202,255,202,202,255,202,202,255,202,202,255,202,
             202,255,202,202,255,202,202,255,202,202,255,202,202,255,202,202,255,202,202,255,202,202,254,189,189,
-            218,37,37,169,0,0,152,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,200,0,0,201,0,0,229,34,34,254,174,174,255,186,186,255,186,186,255,186,
+            218,37,37,169,0,0,152,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,200,0,0,201,0,0,229,34,34,254,174,174,255,186,186,255,186,186,255,186,
             186,255,209,209,255,191,191,255,186,186,255,186,186,255,186,186,255,186,186,255,186,186,255,186,186,
             255,186,186,255,186,186,255,191,191,255,200,200,255,186,186,255,186,186,255,186,186,254,174,174,216,
-            34,34,166,0,0,149,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,200,0,
+            34,34,166,0,0,149,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,200,0,
             0,201,0,0,229,31,31,254,159,159,255,170,170,255,170,170,255,170,170,255,203,203,255,255,255,
             255,240,240,255,176,176,255,170,170,255,170,170,255,170,170,255,170,170,255,170,170,255,170,170,255,
             176,176,255,240,240,255,255,255,255,203,203,255,170,170,255,170,170,255,170,170,254,159,159,215,31,
-            31,163,0,0,146,0,0,212,208,200,212,208,200,212,208,200,200,0,0,201,0,0,229,28,28,
+            31,163,0,0,146,0,0,240,240,240,240,240,240,240,240,240,200,0,0,201,0,0,229,28,28,
             254,144,144,255,154,154,255,154,154,255,154,154,255,193,193,255,255,255,255,255,255,255,255,255,255,
             237,237,255,161,161,255,154,154,255,154,154,255,154,154,255,154,154,255,161,161,255,237,237,255,255,
             255,255,255,255,255,255,255,255,193,193,255,154,154,255,154,154,255,154,154,254,144,144,214,28,28,
-            160,0,0,144,0,0,212,208,200,212,208,200,201,0,0,224,0,0,254,128,128,255,137,137,255,
+            160,0,0,144,0,0,240,240,240,240,240,240,201,0,0,224,0,0,254,128,128,255,137,137,255,
             137,137,255,137,137,255,159,159,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,234,
             234,255,145,145,255,137,137,255,137,137,255,145,145,255,234,234,255,255,255,255,255,255,255,255,255,
             255,255,255,255,255,255,255,159,159,255,137,137,255,137,137,255,137,137,252,103,103,205,0,0,156,
-            0,0,212,208,200,212,208,200,199,0,0,231,0,0,255,120,120,255,120,120,255,120,120,255,120,
+            0,0,240,240,240,240,240,240,199,0,0,231,0,0,255,120,120,255,120,120,255,120,120,255,120,
             120,255,120,120,255,203,203,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,231,231,
             255,129,129,255,129,129,255,231,231,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-            203,203,253,106,106,249,69,69,245,32,32,242,0,0,242,0,0,220,0,0,155,0,0,212,208,
-            200,212,208,200,198,0,0,231,0,0,255,103,103,255,103,103,255,103,103,255,103,103,255,103,103,
+            203,203,253,106,106,249,69,69,245,32,32,242,0,0,242,0,0,220,0,0,155,0,0,240,240,
+            240,240,240,240,198,0,0,231,0,0,255,103,103,255,103,103,255,103,103,255,103,103,255,103,103,
             255,103,103,255,197,197,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,228,228,255,
             228,228,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,251,166,166,245,27,27,242,0,
-            0,242,0,0,242,0,0,242,0,0,242,0,0,220,0,0,153,0,0,212,208,200,212,208,200,
+            0,242,0,0,242,0,0,242,0,0,242,0,0,220,0,0,153,0,0,240,240,240,240,240,240,
             196,0,0,230,0,0,255,85,85,255,85,85,255,85,85,255,85,85,255,85,85,255,85,85,255,
             85,85,255,190,190,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
             255,255,255,255,255,255,255,255,255,255,250,159,159,242,0,0,242,0,0,242,0,0,242,0,0,
-            242,0,0,242,0,0,242,0,0,220,0,0,152,0,0,212,208,200,212,208,200,194,0,0,230,
+            242,0,0,242,0,0,242,0,0,220,0,0,152,0,0,240,240,240,240,240,240,194,0,0,230,
             0,0,255,68,68,255,68,68,255,68,68,255,68,68,255,68,68,255,68,68,255,68,68,255,68,
             68,255,183,183,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
             255,255,255,250,159,159,242,0,0,242,0,0,242,0,0,242,0,0,242,0,0,242,0,0,242,
-            0,0,242,0,0,219,0,0,150,0,0,212,208,200,212,208,200,193,0,0,230,0,0,255,50,
+            0,0,242,0,0,219,0,0,150,0,0,240,240,240,240,240,240,193,0,0,230,0,0,255,50,
             50,255,50,50,255,50,50,255,50,50,255,50,50,255,50,50,255,50,50,255,50,50,255,50,50,
             255,177,177,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,250,159,159,242,
             0,0,242,0,0,242,0,0,242,0,0,242,0,0,242,0,0,242,0,0,242,0,0,242,0,
-            0,219,0,0,149,0,0,212,208,200,212,208,200,193,0,0,230,0,0,255,50,50,255,50,50,
+            0,219,0,0,149,0,0,240,240,240,240,240,240,193,0,0,230,0,0,255,50,50,255,50,50,
             255,50,50,255,50,50,255,50,50,255,50,50,255,50,50,255,50,50,255,50,50,255,177,177,255,
             255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,250,159,159,242,0,0,242,0,
             0,242,0,0,242,0,0,242,0,0,242,0,0,242,0,0,242,0,0,242,0,0,219,0,0,
-            149,0,0,212,208,200,212,208,200,190,0,0,230,0,0,255,14,14,255,14,14,255,14,14,255,
+            149,0,0,240,240,240,240,240,240,190,0,0,230,0,0,255,14,14,255,14,14,255,14,14,255,
             14,14,255,14,14,255,14,14,255,14,14,255,29,29,255,211,211,255,255,255,255,255,255,255,255,
             255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,253,207,207,244,16,16,243,0,0,
-            243,0,0,243,0,0,243,0,0,243,0,0,243,0,0,243,0,0,219,0,0,145,0,0,212,
-            208,200,212,208,200,188,0,0,232,0,0,255,1,1,255,1,1,255,1,1,255,1,1,255,1,
+            243,0,0,243,0,0,243,0,0,243,0,0,243,0,0,243,0,0,219,0,0,145,0,0,240,
+            240,240,240,240,240,188,0,0,232,0,0,255,1,1,255,1,1,255,1,1,255,1,1,255,1,
             1,255,1,1,255,17,17,255,208,208,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
             255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,253,207,207,247,16,16,247,0,0,247,
-            0,0,247,0,0,247,0,0,247,0,0,247,0,0,221,0,0,144,0,0,212,208,200,212,208,
-            200,187,0,0,234,0,0,251,0,0,252,0,0,253,1,1,253,1,1,253,1,1,252,16,16,
+            0,0,247,0,0,247,0,0,247,0,0,247,0,0,221,0,0,144,0,0,240,240,240,240,240,
+            240,187,0,0,234,0,0,251,0,0,252,0,0,253,1,1,253,1,1,253,1,1,252,16,16,
             255,207,207,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,253,159,159,253,159,159,255,
             255,255,255,255,255,255,255,255,255,255,255,255,255,255,254,207,207,250,16,16,250,0,0,250,0,
-            0,250,0,0,250,0,0,250,0,0,223,0,0,142,0,0,212,208,200,212,208,200,185,0,0,
+            0,250,0,0,250,0,0,250,0,0,223,0,0,142,0,0,240,240,240,240,240,240,185,0,0,
             236,0,0,253,0,0,253,0,0,253,0,0,253,0,0,253,16,16,255,207,207,255,255,255,255,
             255,255,255,255,255,255,255,255,255,255,255,254,159,159,253,0,0,253,0,0,254,159,159,255,255,
             255,255,255,255,255,255,255,255,255,255,255,255,255,255,207,207,253,16,16,253,0,0,253,0,0,
-            253,0,0,253,0,0,225,0,0,141,0,0,212,208,200,212,208,200,183,0,0,223,2,2,255,
+            253,0,0,253,0,0,225,0,0,141,0,0,240,240,240,240,240,240,183,0,0,223,2,2,255,
             4,4,255,4,4,255,4,4,255,4,4,255,51,51,255,255,255,255,255,255,255,255,255,255,255,
             255,255,255,255,255,162,162,255,4,4,255,4,4,255,4,4,255,4,4,255,162,162,255,255,255,
             255,255,255,255,255,255,255,255,255,255,255,255,255,51,51,255,4,4,255,4,4,255,4,4,255,
-            4,4,205,2,2,139,0,0,212,208,200,212,208,200,176,0,0,180,0,0,226,9,9,255,15,
+            4,4,205,2,2,139,0,0,240,240,240,240,240,240,176,0,0,180,0,0,226,9,9,255,15,
             15,255,15,15,255,15,15,255,15,15,255,106,106,255,255,255,255,255,255,255,255,255,255,166,166,
             255,15,15,255,15,15,255,15,15,255,15,15,255,15,15,255,15,15,255,166,166,255,255,255,255,
             255,255,255,255,255,255,106,106,255,15,15,255,15,15,255,15,15,255,15,15,212,9,9,139,0,
-            0,117,0,0,212,208,200,212,208,200,212,208,200,164,0,0,177,0,0,225,16,16,255,27,27,
+            0,117,0,0,240,240,240,240,240,240,240,240,240,164,0,0,177,0,0,225,16,16,255,27,27,
             255,27,27,255,27,27,255,27,27,255,113,113,255,255,255,255,170,170,255,27,27,255,27,27,255,
             27,27,255,27,27,255,27,27,255,27,27,255,27,27,255,27,27,255,170,170,255,255,255,255,113,
-            113,255,27,27,255,27,27,255,27,27,255,27,27,212,16,16,139,0,0,117,0,0,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,160,0,0,174,0,0,224,23,23,255,38,38,255,
+            113,255,27,27,255,27,27,255,27,27,255,27,27,212,16,16,139,0,0,117,0,0,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,160,0,0,174,0,0,224,23,23,255,38,38,255,
             38,38,255,38,38,255,38,38,255,79,79,255,38,38,255,38,38,255,38,38,255,38,38,255,38,
             38,255,38,38,255,38,38,255,38,38,255,38,38,255,38,38,255,79,79,255,38,38,255,38,38,
-            255,38,38,255,38,38,212,23,23,139,0,0,117,0,0,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,157,0,0,171,0,0,223,30,30,255,49,49,255,49,
+            255,38,38,255,38,38,212,23,23,139,0,0,117,0,0,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,157,0,0,171,0,0,223,30,30,255,49,49,255,49,
             49,255,49,49,255,49,49,255,49,49,255,49,49,255,49,49,255,49,49,255,49,49,255,49,49,
             255,49,49,255,49,49,255,49,49,255,49,49,255,49,49,255,49,49,255,49,49,255,49,49,212,
-            30,30,139,0,0,117,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,154,0,0,168,0,0,222,37,37,255,60,60,255,60,60,
+            30,30,139,0,0,117,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,154,0,0,168,0,0,222,37,37,255,60,60,255,60,60,
             255,60,60,255,60,60,255,60,60,255,60,60,255,60,60,255,60,60,255,60,60,255,60,60,255,
             60,60,255,60,60,255,60,60,255,60,60,255,60,60,255,60,60,212,37,37,138,0,0,117,0,
-            0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,151,0,0,165,0,0,221,44,44,255,72,72,255,72,72,255,
+            0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,151,0,0,165,0,0,221,44,44,255,72,72,255,72,72,255,
             72,72,255,72,72,255,72,72,255,72,72,255,72,72,255,72,72,255,72,72,255,72,72,255,72,
-            72,255,72,72,255,72,72,255,72,72,212,44,44,138,0,0,117,0,0,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,148,0,0,162,0,0,219,51,51,255,83,83,255,83,83,255,83,
+            72,255,72,72,255,72,72,255,72,72,212,44,44,138,0,0,117,0,0,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,148,0,0,162,0,0,219,51,51,255,83,83,255,83,83,255,83,
             83,255,83,83,255,83,83,255,83,83,255,83,83,255,83,83,255,83,83,255,83,83,255,83,83,
-            255,83,83,212,51,51,138,0,0,117,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,146,0,0,159,0,0,212,52,52,230,69,69,230,69,69,229,69,69,
+            255,83,83,212,51,51,138,0,0,117,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,146,0,0,159,0,0,212,52,52,230,69,69,230,69,69,229,69,69,
             229,69,69,228,69,69,228,69,69,228,69,69,227,69,69,227,69,69,227,69,69,205,52,52,138,
-            0,0,117,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,143,0,0,155,0,0,154,0,0,152,0,0,151,0,0,149,0,0,148,
-            0,0,148,0,0,145,0,0,143,0,0,142,0,0,140,0,0,138,0,0,117,0,0,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            0,0,117,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,143,0,0,155,0,0,154,0,0,152,0,0,151,0,0,149,0,0,148,
+            0,0,148,0,0,145,0,0,143,0,0,142,0,0,140,0,0,138,0,0,117,0,0,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6597,42 +6449,42 @@
         /* columns rows colors chars-per-pixel */
         "32 32 4 1",
         "  c None",
-        "a c #FFFFFF",
-        "b c #808080",
-        "c c #C0C0C0",
+        "b c #FFFFFF",
+        "c c #808080",
+        "d c #C0C0C0",
         /* pixels */
         "                                ",
         "                                ",
-        "          bbbbbbbbbbbbbb        ",
-        "         bccccccccccccccb       ",
-        "        bccccccccccccccccb      ",
-        "       bccccccccccccccccccb     ",
-        "      bccccccccccccccccccccb    ",
-        "     bccccccccccccccccccccccb   ",
-        "    bccccccccccccccccccccccccb  ",
-        "   bcccccccaccccccccccacccccccb ",
-        "  bcccccccaaaccccccccaaacccccccb",
-        "  bccccccaaaaaccccccaaaaaccccccb",
-        "  bcccccccaaaaaccccaaaaacccccccb",
-        "  bccccccccaaaaaccaaaaaccccccccb",
-        "  bcccccccccaaaaaaaaaacccccccccb",
-        "  bccccccccccaaaaaaaaccccccccccb",
-        "  bcccccccccccaaaaaacccccccccccb",
-        "  bcccccccccccaaaaaacccccccccccb",
-        "  bccccccccccaaaaaaaaccccccccccb",
-        "  bcccccccccaaaaaaaaaacccccccccb",
-        "  bccccccccaaaaaccaaaaaccccccccb",
-        "  bcccccccaaaaaccccaaaaacccccccb",
-        "  bccccccaaaaaccccccaaaaaccccccb",
-        "  bcccccccaaaccccccccaaacccccccb",
-        "   bcccccccaccccccccccacccccccb ",
-        "    bccccccccccccccccccccccccb  ",
-        "     bccccccccccccccccccccccb   ",
-        "      bccccccccccccccccccccb    ",
-        "       bccccccccccccccccccb     ",
-        "        bccccccccccccccccb      ",
-        "         bccccccccccccccb       ",
-        "          bbbbbbbbbbbbbb        "
+        "          cccccccccccccc        ",
+        "         cddddddddddddddc       ",
+        "        cddddddddddddddddc      ",
+        "       cddddddddddddddddddc     ",
+        "      cddddddddddddddddddddc    ",
+        "     cddddddddddddddddddddddc   ",
+        "    cddddddddddddddddddddddddc  ",
+        "   cdddddddbddddddddddbdddddddc ",
+        "  cdddddddbbbddddddddbbbdddddddc",
+        "  cddddddbbbbbddddddbbbbbddddddc",
+        "  cdddddddbbbbbddddbbbbbdddddddc",
+        "  cddddddddbbbbbddbbbbbddddddddc",
+        "  cdddddddddbbbbbbbbbbdddddddddc",
+        "  cddddddddddbbbbbbbbddddddddddc",
+        "  cdddddddddddbbbbbbdddddddddddc",
+        "  cdddddddddddbbbbbbdddddddddddc",
+        "  cddddddddddbbbbbbbbddddddddddc",
+        "  cdddddddddbbbbbbbbbbdddddddddc",
+        "  cddddddddbbbbbddbbbbbddddddddc",
+        "  cdddddddbbbbbddddbbbbbdddddddc",
+        "  cddddddbbbbbddddddbbbbbddddddc",
+        "  cdddddddbbbddddddddbbbdddddddc",
+        "   cdddddddbddddddddddbdddddddc ",
+        "    cddddddddddddddddddddddddc  ",
+        "     cddddddddddddddddddddddc   ",
+        "      cddddddddddddddddddddc    ",
+        "       cddddddddddddddddddc     ",
+        "        cddddddddddddddddc      ",
+        "         cddddddddddddddc       ",
+        "          cccccccccccccc        "
         };
         wxBitmap bitmap( xpm_data );
         return bitmap;
@@ -6646,40 +6498,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,86,102,117,86,102,117,86,102,117,86,102,117,86,102,117,76,93,108,76,93,108,76,
-            93,108,76,93,108,67,79,91,67,79,91,67,79,91,57,68,78,48,57,65,212,208,200,212,208,
-            200,86,102,117,172,195,217,172,195,217,172,195,217,172,195,217,172,195,217,164,188,211,164,188,211,
-            164,188,211,164,188,211,164,188,211,158,183,209,150,179,207,48,57,65,212,208,200,212,208,200,86,
+            240,240,240,86,102,117,86,102,117,86,102,117,86,102,117,86,102,117,76,93,108,76,93,108,76,
+            93,108,76,93,108,67,79,91,67,79,91,67,79,91,57,68,78,48,57,65,240,240,240,240,240,
+            240,86,102,117,172,195,217,172,195,217,172,195,217,172,195,217,172,195,217,164,188,211,164,188,211,
+            164,188,211,164,188,211,164,188,211,158,183,209,150,179,207,48,57,65,240,240,240,240,240,240,86,
             102,117,172,195,217,245,248,250,200,215,229,181,201,220,181,201,220,181,201,220,172,195,217,164,188,
-            211,158,183,209,150,179,207,150,179,207,150,179,207,48,57,65,212,208,200,212,208,200,86,102,117,
+            211,158,183,209,150,179,207,150,179,207,150,179,207,48,57,65,240,240,240,240,240,240,86,102,117,
             172,194,215,213,224,235,65,255,65,207,255,207,91,227,76,115,135,155,172,194,215,164,188,211,155,
-            180,204,150,179,207,143,172,200,141,170,198,48,57,65,212,208,200,212,208,200,86,102,117,171,191,
+            180,204,150,179,207,143,172,200,141,170,198,48,57,65,240,240,240,240,240,240,86,102,117,171,191,
             211,198,212,226,93,227,93,93,227,93,103,217,102,106,126,146,172,194,215,164,188,211,155,180,204,
-            141,170,198,137,167,196,135,165,194,48,57,65,212,208,200,212,208,200,86,102,117,164,188,211,182,
+            141,170,198,137,167,196,135,165,194,48,57,65,240,240,240,240,240,240,86,102,117,164,188,211,182,
             197,211,76,93,108,76,93,108,76,93,108,87,105,123,171,191,211,155,180,204,150,179,207,135,165,
-            194,132,162,191,132,162,191,48,57,65,212,208,200,212,208,200,86,102,117,164,188,211,245,247,250,
+            194,132,162,191,132,162,191,48,57,65,240,240,240,240,240,240,86,102,117,164,188,211,245,247,250,
             194,209,223,172,194,215,171,191,211,171,191,211,164,188,211,155,180,204,146,171,195,129,158,188,126,
-            156,186,126,156,186,48,57,65,212,208,200,212,208,200,76,93,108,164,184,203,220,228,236,255,255,
+            156,186,126,156,186,48,57,65,240,240,240,240,240,240,76,93,108,164,184,203,220,228,236,255,255,
             0,255,255,191,211,221,70,106,126,146,155,180,204,150,179,207,137,167,196,124,153,181,116,149,179,
-            116,149,179,48,57,65,212,208,200,212,208,200,76,93,108,164,184,203,190,205,219,211,221,70,211,
+            116,149,179,48,57,65,240,240,240,240,240,240,76,93,108,164,184,203,190,205,219,211,221,70,211,
             221,70,193,207,93,93,113,133,155,180,204,137,167,196,129,158,188,116,149,179,116,149,179,101,133,
-            162,48,57,65,212,208,200,212,208,200,76,93,108,155,178,198,164,184,203,67,82,98,67,82,98,
+            162,48,57,65,240,240,240,240,240,240,76,93,108,155,178,198,164,184,203,67,82,98,67,82,98,
             67,82,98,67,82,98,146,171,195,137,163,189,124,153,181,109,140,169,97,128,157,78,97,116,48,
-            57,65,212,208,200,212,208,200,76,93,108,146,171,195,232,237,242,182,197,211,155,178,198,155,178,
+            57,65,240,240,240,240,240,240,76,93,108,146,171,195,232,237,242,182,197,211,155,178,198,155,178,
             198,146,171,195,146,171,195,86,102,117,86,102,117,67,79,91,57,68,78,48,57,65,48,57,65,
-            212,208,200,212,208,200,67,79,91,142,163,182,212,221,229,255,124,124,255,222,222,195,63,76,93,
-            113,133,129,158,188,86,102,117,181,201,220,164,184,203,106,132,156,68,86,104,68,86,104,212,208,
-            200,212,208,200,67,79,91,126,152,175,175,191,205,195,63,76,195,63,76,175,84,101,78,97,116,
-            124,153,181,67,79,91,164,184,203,116,140,163,87,115,143,48,57,65,212,208,200,212,208,200,212,
-            208,200,67,79,91,116,140,163,142,163,182,50,62,74,50,62,74,50,62,74,50,62,74,82,108,
-            138,57,68,78,106,132,156,87,115,143,48,57,65,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,67,79,91,142,163,182,212,221,229,255,124,124,255,222,222,195,63,76,93,
+            113,133,129,158,188,86,102,117,181,201,220,164,184,203,106,132,156,68,86,104,68,86,104,240,240,
+            240,240,240,240,67,79,91,126,152,175,175,191,205,195,63,76,195,63,76,175,84,101,78,97,116,
+            124,153,181,67,79,91,164,184,203,116,140,163,87,115,143,48,57,65,240,240,240,240,240,240,240,
+            240,240,67,79,91,116,140,163,142,163,182,50,62,74,50,62,74,50,62,74,50,62,74,82,108,
+            138,57,68,78,106,132,156,87,115,143,48,57,65,240,240,240,240,240,240,240,240,240,240,240,240,
             57,68,78,106,132,156,96,124,151,93,121,149,90,118,146,87,115,143,80,105,132,67,82,98,48,
-            57,65,68,86,104,48,57,65,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,48,57,
+            57,65,68,86,104,48,57,65,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,48,57,
             65,48,57,65,48,57,65,48,57,65,48,57,65,48,57,65,48,57,65,48,57,65,48,57,65,
-            68,86,104,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            68,86,104,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6688,39 +6540,39 @@
         static const unsigned char data[] = 
         {
             137,170,33,137,170,33,137,170,33,137,170,33,137,170,33,121,151,29,121,151,29,121,151,29,121,
-            151,29,107,133,26,107,133,26,107,133,26,91,113,22,75,93,22,212,208,200,212,208,200,137,170,
+            151,29,107,133,26,107,133,26,107,133,26,91,113,22,75,93,22,240,240,240,240,240,240,137,170,
             33,210,233,138,210,233,138,210,233,138,210,233,138,210,233,138,210,233,138,210,233,138,210,233,138,
-            208,232,133,208,232,133,207,231,131,204,230,123,75,93,22,212,208,200,212,208,200,137,170,33,208,
+            208,232,133,208,232,133,207,231,131,204,230,123,75,93,22,240,240,240,240,240,240,137,170,33,208,
             232,133,208,232,133,208,232,133,164,183,112,66,77,91,66,77,91,66,77,91,120,137,106,164,185,
-            117,204,230,123,204,230,123,202,229,118,75,93,22,212,208,200,212,208,200,137,170,33,207,231,131,
+            117,204,230,123,204,230,123,202,229,118,75,93,22,240,240,240,240,240,240,137,170,33,207,231,131,
             207,231,131,164,185,117,69,81,95,88,118,138,100,147,170,98,138,162,80,104,123,67,71,82,136,
-            152,92,197,226,117,200,228,111,75,93,22,212,208,200,212,208,200,137,170,33,207,231,131,204,230,
+            152,92,197,226,117,200,228,111,75,93,22,240,240,240,240,240,240,137,170,33,207,231,131,204,230,
             123,75,93,109,108,123,138,100,147,170,143,211,236,139,202,231,111,165,193,118,150,174,83,98,112,
-            136,152,92,191,220,102,75,93,22,212,208,200,212,208,200,137,170,33,204,230,123,204,230,123,83,
+            136,152,92,191,220,102,75,93,22,240,240,240,240,240,240,137,170,33,204,230,123,204,230,123,83,
             98,112,177,189,204,84,142,168,213,255,255,228,248,255,139,225,255,117,190,222,114,155,181,75,93,
-            109,169,198,93,75,93,22,212,208,200,212,208,200,137,170,33,202,229,118,202,229,118,83,98,112,
+            109,169,198,93,75,93,22,240,240,240,240,240,240,137,170,33,202,229,118,202,229,118,83,98,112,
             217,227,241,119,141,157,121,192,222,213,255,255,193,238,255,130,220,255,122,194,226,91,127,149,127,
-            150,91,75,93,22,212,208,200,212,208,200,121,151,29,202,229,118,202,229,118,83,98,112,200,207,
+            150,91,75,93,22,240,240,240,240,240,240,121,151,29,202,229,118,202,229,118,83,98,112,200,207,
             222,185,194,209,86,135,161,127,200,224,176,238,255,153,230,255,134,212,244,121,179,208,75,93,109,
-            75,92,29,212,208,200,212,208,200,121,151,29,198,227,108,198,227,108,155,182,100,128,140,154,225,
+            75,92,29,240,240,240,240,240,240,121,151,29,198,227,108,198,227,108,155,182,100,128,140,154,225,
             234,249,177,189,204,98,138,162,103,157,182,130,193,220,126,199,232,111,163,191,75,93,109,75,92,
-            29,212,208,200,212,208,200,121,151,29,198,227,108,192,224,94,190,223,89,140,166,96,135,149,164,
-            210,218,235,193,201,218,147,163,180,120,147,167,109,140,161,95,121,139,119,141,157,80,94,24,212,
-            208,200,212,208,200,121,151,29,188,222,84,188,222,84,186,221,76,186,221,76,142,170,86,106,116,
-            130,137,150,166,173,183,199,143,152,169,106,116,130,106,116,130,222,245,249,139,96,85,212,208,200,
-            212,208,200,107,133,26,186,221,76,186,221,76,182,219,67,182,219,67,180,218,60,161,196,63,129,
-            157,80,92,106,120,89,103,117,152,175,112,101,107,83,161,131,156,243,178,184,189,54,95,212,208,
-            200,107,133,26,182,219,67,180,218,60,178,217,55,178,217,55,170,212,41,170,212,41,164,204,42,
+            29,240,240,240,240,240,240,121,151,29,198,227,108,192,224,94,190,223,89,140,166,96,135,149,164,
+            210,218,235,193,201,218,147,163,180,120,147,167,109,140,161,95,121,139,119,141,157,80,94,24,240,
+            240,240,240,240,240,121,151,29,188,222,84,188,222,84,186,221,76,186,221,76,142,170,86,106,116,
+            130,137,150,166,173,183,199,143,152,169,106,116,130,106,116,130,222,245,249,139,96,85,240,240,240,
+            240,240,240,107,133,26,186,221,76,186,221,76,182,219,67,182,219,67,180,218,60,161,196,63,129,
+            157,80,92,106,120,89,103,117,152,175,112,101,107,83,161,131,156,243,178,184,189,54,95,240,240,
+            240,107,133,26,182,219,67,180,218,60,178,217,55,178,217,55,170,212,41,170,212,41,164,204,42,
             100,124,34,184,212,104,178,215,61,150,185,41,79,54,62,194,63,99,252,171,180,189,54,95,107,
             133,26,178,217,55,170,212,41,170,212,41,170,212,41,165,205,39,165,205,39,149,185,36,91,113,
-            22,170,212,41,155,193,37,75,93,22,212,208,200,102,24,56,185,42,83,245,151,164,91,113,22,
+            22,170,212,41,155,193,37,75,93,22,240,240,240,102,24,56,185,42,83,245,151,164,91,113,22,
             170,212,41,164,204,42,165,205,39,155,193,37,155,193,37,143,178,34,115,143,28,75,93,22,117,
-            145,28,75,93,22,212,208,200,212,208,200,212,208,200,110,26,58,185,42,83,75,93,22,75,93,
+            145,28,75,93,22,240,240,240,240,240,240,240,240,240,110,26,58,185,42,83,75,93,22,75,93,
             22,75,93,22,75,93,22,75,93,22,75,93,22,75,93,22,75,93,22,75,93,22,117,145,28,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,127,7,46
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,127,7,46
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6728,40 +6580,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,80,95,109,80,95,109,76,90,102,76,90,102,65,
-            77,88,65,77,88,65,77,88,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,86,102,117,86,102,117,86,102,117,102,117,130,102,117,130,95,110,122,95,110,122,95,110,122,
-            86,102,117,80,95,109,65,77,88,65,77,88,65,77,88,212,208,200,212,208,200,86,102,117,141,
+            240,240,240,240,240,240,240,240,240,240,240,240,80,95,109,80,95,109,76,90,102,76,90,102,65,
+            77,88,65,77,88,65,77,88,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,86,102,117,86,102,117,86,102,117,102,117,130,102,117,130,95,110,122,95,110,122,95,110,122,
+            86,102,117,80,95,109,65,77,88,65,77,88,65,77,88,240,240,240,240,240,240,86,102,117,141,
             153,164,125,139,150,109,121,132,109,121,132,109,121,132,102,117,130,102,117,130,102,117,130,101,113,
-            124,95,110,122,88,102,113,76,90,102,48,57,65,212,208,200,212,208,200,86,102,117,255,255,255,
+            124,95,110,122,88,102,113,76,90,102,48,57,65,240,240,240,240,240,240,86,102,117,255,255,255,
             204,212,219,180,190,198,141,153,164,118,133,147,109,121,132,109,121,132,109,121,132,102,117,130,90,
-            105,118,76,90,102,63,75,86,48,57,65,212,208,200,212,208,200,80,95,109,255,255,255,230,234,
+            105,118,76,90,102,63,75,86,48,57,65,240,240,240,240,240,240,80,95,109,255,255,255,230,234,
             237,196,204,211,181,190,200,161,173,185,125,139,150,101,113,124,126,141,154,118,130,143,76,90,102,
-            69,82,94,63,75,86,48,57,65,212,208,200,212,208,200,80,95,109,243,245,246,230,234,237,196,
+            69,82,94,63,75,86,48,57,65,240,240,240,240,240,240,80,95,109,243,245,246,230,234,237,196,
             204,211,181,190,200,161,173,185,125,139,150,90,105,118,161,172,182,118,130,143,76,90,102,69,82,
-            94,63,75,86,48,57,65,212,208,200,212,208,200,80,95,109,243,245,246,196,204,211,196,204,211,
+            94,63,75,86,48,57,65,240,240,240,240,240,240,80,95,109,243,245,246,196,204,211,196,204,211,
             181,190,200,161,173,185,125,139,150,78,93,106,212,219,225,126,141,154,76,90,102,69,82,94,63,
-            75,86,48,57,65,212,208,200,212,208,200,80,95,109,230,234,237,76,90,102,224,228,233,171,181,
+            75,86,48,57,65,240,240,240,240,240,240,80,95,109,230,234,237,76,90,102,224,228,233,171,181,
             189,161,173,185,125,139,150,76,90,102,212,219,225,118,130,143,76,90,102,69,82,94,63,75,86,
-            48,57,65,212,208,200,212,208,200,76,90,102,230,234,237,180,190,198,196,204,211,65,77,88,208,
+            48,57,65,240,240,240,240,240,240,76,90,102,230,234,237,180,190,198,196,204,211,65,77,88,208,
             214,220,76,146,96,21,198,29,175,228,185,109,121,132,27,20,100,27,20,100,27,20,100,22,16,
-            81,212,208,200,212,208,200,76,90,102,217,223,228,58,70,79,217,223,228,158,168,178,161,173,185,
+            81,240,240,240,240,240,240,76,90,102,217,223,228,58,70,79,217,223,228,158,168,178,161,173,185,
             63,167,81,65,255,65,148,204,165,27,20,100,73,120,255,97,138,255,73,120,255,14,43,177,20,
-            15,75,212,208,200,76,90,102,217,223,228,180,190,198,196,204,211,45,53,61,196,204,211,65,146,
+            15,75,240,240,240,76,90,102,217,223,228,180,190,198,196,204,211,45,53,61,196,204,211,65,146,
             87,48,143,65,27,20,100,73,120,255,97,138,255,255,255,255,255,255,255,49,102,255,14,43,177,
             20,15,75,76,90,102,217,223,228,45,53,61,212,219,225,158,168,178,161,173,185,114,105,105,202,
             79,85,27,20,100,97,138,255,97,138,255,97,138,255,97,138,255,73,120,255,0,66,255,20,15,
             75,76,90,102,171,181,189,204,212,219,196,204,211,45,53,61,187,196,204,126,88,99,255,0,10,
             27,20,100,49,102,255,97,138,255,255,255,255,255,255,255,49,102,255,0,66,255,20,15,75,76,
             90,102,76,90,102,109,121,132,141,153,164,161,173,185,161,173,185,114,105,105,138,84,93,22,16,
-            81,14,43,177,37,93,255,255,255,255,255,255,255,0,66,255,14,43,177,20,15,75,212,208,200,
-            212,208,200,65,77,88,65,77,88,65,77,88,101,113,124,118,130,143,76,90,102,118,133,147,20,
-            15,75,14,43,177,0,66,255,0,66,255,14,43,177,20,15,75,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,65,77,88,65,77,88,65,77,88,65,77,88,65,77,88,
-            25,21,67,20,15,75,20,15,75,20,15,75,212,208,200,212,208,200
+            81,14,43,177,37,93,255,255,255,255,255,255,255,0,66,255,14,43,177,20,15,75,240,240,240,
+            240,240,240,65,77,88,65,77,88,65,77,88,101,113,124,118,130,143,76,90,102,118,133,147,20,
+            15,75,14,43,177,0,66,255,0,66,255,14,43,177,20,15,75,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,65,77,88,65,77,88,65,77,88,65,77,88,65,77,88,
+            25,21,67,20,15,75,20,15,75,20,15,75,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6769,40 +6621,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,0,81,156,0,81,156,0,81,156,212,208,200,0,81,156,0,81,156,0,81,156,212,
-            208,200,0,71,139,0,71,139,0,71,139,212,208,200,0,71,139,0,64,125,0,53,107,212,208,
-            200,0,81,156,168,199,228,184,207,227,0,81,156,180,205,227,168,199,228,174,202,228,0,81,156,
-            168,199,228,168,199,228,160,196,228,0,71,139,160,196,228,168,199,228,0,53,107,212,208,200,0,
-            81,156,228,237,245,0,81,156,212,208,200,0,81,156,219,233,246,0,81,156,212,208,200,0,81,
-            156,206,227,246,0,71,139,212,208,200,0,71,139,191,220,247,0,53,107,212,208,200,0,81,156,
+            240,240,240,0,81,156,0,81,156,0,81,156,240,240,240,0,81,156,0,81,156,0,81,156,240,
+            240,240,0,71,139,0,71,139,0,71,139,240,240,240,0,71,139,0,64,125,0,53,107,240,240,
+            240,0,81,156,168,199,228,184,207,227,0,81,156,180,205,227,168,199,228,174,202,228,0,81,156,
+            168,199,228,168,199,228,160,196,228,0,71,139,160,196,228,168,199,228,0,53,107,240,240,240,0,
+            81,156,228,237,245,0,81,156,240,240,240,0,81,156,219,233,246,0,81,156,240,240,240,0,81,
+            156,206,227,246,0,71,139,240,240,240,0,71,139,191,220,247,0,53,107,240,240,240,0,81,156,
             228,237,245,152,188,220,0,81,156,149,187,220,236,244,252,149,187,220,0,81,156,143,184,221,220,
-            237,252,140,182,221,0,71,139,140,182,221,196,228,252,0,53,107,212,208,200,0,81,156,243,247,
+            237,252,140,182,221,0,71,139,140,182,221,196,228,252,0,53,107,240,240,240,0,81,156,243,247,
             251,243,247,251,189,214,236,236,244,252,236,244,252,230,242,252,180,210,237,220,237,252,220,237,252,
-            213,235,252,170,205,237,204,229,253,196,228,252,0,53,107,212,208,200,0,81,156,236,244,252,236,
+            213,235,252,170,205,237,204,229,253,196,228,252,0,53,107,240,240,240,0,81,156,236,244,252,236,
             244,252,236,244,252,236,244,252,230,242,252,230,242,252,220,237,252,220,237,252,213,235,252,209,231,
-            253,204,229,253,196,228,252,188,223,253,0,53,107,212,208,200,0,81,156,236,244,252,129,178,222,
+            253,204,229,253,196,228,252,188,223,253,0,53,107,240,240,240,0,81,156,236,244,252,129,178,222,
             44,125,199,124,178,226,91,154,212,44,125,199,44,125,199,44,125,199,84,151,212,112,171,221,132,
-            184,230,196,228,252,181,221,252,0,53,107,212,208,200,0,81,156,230,242,252,230,242,252,230,242,
+            184,230,196,228,252,181,221,252,0,53,107,240,240,240,0,81,156,230,242,252,230,242,252,230,242,
             252,230,242,252,220,237,252,220,237,252,213,235,252,213,235,252,204,229,253,196,228,252,196,228,252,
-            188,223,253,174,219,251,0,53,107,212,208,200,0,81,156,220,237,252,123,175,222,91,154,212,44,
+            188,223,253,174,219,251,0,53,107,240,240,240,0,81,156,220,237,252,123,175,222,91,154,212,44,
             125,199,44,125,199,44,125,199,84,151,212,153,198,236,196,228,252,189,226,250,188,223,253,181,221,
-            252,163,212,250,0,53,107,212,208,200,0,71,139,213,235,252,213,235,252,213,235,252,207,232,251,
+            252,163,212,250,0,53,107,240,240,240,0,71,139,213,235,252,213,235,252,213,235,252,207,232,251,
             204,229,253,204,229,253,196,228,252,196,228,252,189,226,250,181,221,252,181,221,252,171,215,252,155,
-            210,250,0,53,107,212,208,200,0,71,139,204,229,253,112,171,221,84,151,212,36,122,199,36,122,
+            210,250,0,53,107,240,240,240,0,71,139,204,229,253,112,171,221,84,151,212,36,122,199,36,122,
             199,76,148,212,36,122,199,36,122,199,70,146,212,96,163,222,139,195,239,163,212,250,146,206,250,
-            0,53,107,212,208,200,0,71,139,196,228,252,189,226,250,189,226,250,188,223,253,181,221,252,181,
+            0,53,107,240,240,240,0,71,139,196,228,252,189,226,250,189,226,250,188,223,253,181,221,252,181,
             221,252,174,219,251,174,219,251,163,212,250,163,212,250,163,212,250,155,210,250,137,202,250,0,53,
-            107,212,208,200,0,62,122,181,221,252,70,146,212,36,122,199,36,122,199,70,146,212,107,175,228,
-            64,143,212,31,120,199,30,119,199,61,141,212,81,158,221,93,167,228,124,195,248,0,53,107,212,
-            208,200,0,62,122,149,208,248,146,206,250,137,202,250,139,203,247,139,203,247,134,203,249,134,203,
-            249,134,203,249,130,199,249,130,199,249,124,195,248,117,191,246,100,179,243,0,53,107,212,208,200,
+            107,240,240,240,0,62,122,181,221,252,70,146,212,36,122,199,36,122,199,70,146,212,107,175,228,
+            64,143,212,31,120,199,30,119,199,61,141,212,81,158,221,93,167,228,124,195,248,0,53,107,240,
+            240,240,0,62,122,149,208,248,146,206,250,137,202,250,139,203,247,139,203,247,134,203,249,134,203,
+            249,134,203,249,130,199,249,130,199,249,124,195,248,117,191,246,100,179,243,0,53,107,240,240,240,
             0,62,122,109,185,242,109,185,242,109,185,242,104,181,239,104,181,239,109,185,242,109,185,242,109,
-            185,242,105,183,243,100,179,243,100,179,243,94,173,241,87,168,238,0,53,107,212,208,200,0,53,
+            185,242,105,183,243,100,179,243,100,179,243,94,173,241,87,168,238,0,53,107,240,240,240,0,53,
             107,0,53,107,0,53,107,0,53,107,0,53,107,0,53,107,0,53,107,0,53,107,0,53,107,
             0,53,107,0,53,107,0,53,107,0,53,107,0,53,107,0,53,107
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6810,40 +6662,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,36,93,43,34,83,40,32,
-            73,37,32,73,37,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,36,93,43,76,161,115,76,190,130,40,178,106,
-            0,114,54,28,54,31,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,36,93,43,76,161,115,255,255,255,161,215,181,109,199,126,0,166,
-            81,0,114,54,28,54,31,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,36,93,43,76,190,130,185,225,200,130,202,156,109,199,126,57,181,74,0,
-            166,81,28,54,31,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,24,81,41,40,178,106,109,199,126,109,199,126,83,190,101,57,181,74,0,166,81,
-            28,54,31,28,54,31,28,54,31,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,13,70,40,17,131,61,29,174,77,57,181,74,57,181,74,0,166,81,0,114,54,28,54,
-            31,7,92,47,18,80,43,28,54,31,212,208,200,212,208,200,212,208,200,212,208,200,36,93,43,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,36,93,43,34,83,40,32,
+            73,37,32,73,37,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,36,93,43,76,161,115,76,190,130,40,178,106,
+            0,114,54,28,54,31,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,36,93,43,76,161,115,255,255,255,161,215,181,109,199,126,0,166,
+            81,0,114,54,28,54,31,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,36,93,43,76,190,130,185,225,200,130,202,156,109,199,126,57,181,74,0,
+            166,81,28,54,31,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,24,81,41,40,178,106,109,199,126,109,199,126,83,190,101,57,181,74,0,166,81,
+            28,54,31,28,54,31,28,54,31,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,13,70,40,17,131,61,29,174,77,57,181,74,57,181,74,0,166,81,0,114,54,28,54,
+            31,7,92,47,18,80,43,28,54,31,240,240,240,240,240,240,240,240,240,240,240,240,36,93,43,
             9,83,44,28,54,31,4,127,62,0,166,81,0,166,81,0,114,54,28,54,31,2,108,52,4,
-            127,62,11,105,51,28,54,31,212,208,200,212,208,200,212,208,200,36,93,43,29,140,62,10,126,
+            127,62,11,105,51,28,54,31,240,240,240,240,240,240,240,240,240,36,93,43,29,140,62,10,126,
             57,5,95,48,28,54,31,28,54,31,28,54,31,28,54,31,2,108,52,29,140,62,11,105,51,
-            4,127,62,28,54,31,212,208,200,212,208,200,36,93,43,118,203,130,138,211,149,44,159,67,22,
+            4,127,62,28,54,31,240,240,240,240,240,240,36,93,43,118,203,130,138,211,149,44,159,67,22,
             139,61,0,114,54,0,114,54,0,114,54,22,139,61,44,159,67,29,140,62,15,88,46,4,127,
-            62,28,54,31,212,208,200,212,208,200,36,93,43,202,235,208,105,199,119,50,143,62,64,175,84,
+            62,28,54,31,240,240,240,240,240,240,36,93,43,202,235,208,105,199,119,50,143,62,64,175,84,
             119,186,135,92,176,111,68,168,89,78,181,96,57,181,74,29,140,62,18,80,43,4,127,62,28,
-            54,31,212,208,200,212,208,200,36,93,43,138,211,149,83,190,101,42,104,50,83,190,101,236,248,
+            54,31,240,240,240,240,240,240,36,93,43,138,211,149,83,190,101,42,104,50,83,190,101,236,248,
             239,146,213,159,109,199,126,88,193,103,57,181,74,29,140,62,28,54,31,4,127,62,28,54,31,
-            212,208,200,212,208,200,36,93,43,118,203,130,57,181,74,34,65,38,83,190,101,236,248,239,146,
-            213,159,109,199,126,88,193,103,57,181,74,29,140,62,28,54,31,28,54,31,28,54,31,212,208,
-            200,212,208,200,36,93,43,91,193,105,57,181,74,28,54,31,83,190,101,218,241,223,130,207,144,
-            109,199,126,88,193,103,57,181,74,29,140,62,28,54,31,212,208,200,212,208,200,212,208,200,212,
-            208,200,36,93,43,57,181,74,57,181,74,28,54,31,83,190,101,164,220,175,118,203,130,88,193,
-            103,88,193,103,53,162,68,28,54,31,28,54,31,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,36,93,43,118,203,130,57,181,74,34,65,38,83,190,101,236,248,239,146,
+            213,159,109,199,126,88,193,103,57,181,74,29,140,62,28,54,31,28,54,31,28,54,31,240,240,
+            240,240,240,240,36,93,43,91,193,105,57,181,74,28,54,31,83,190,101,218,241,223,130,207,144,
+            109,199,126,88,193,103,57,181,74,29,140,62,28,54,31,240,240,240,240,240,240,240,240,240,240,
+            240,240,36,93,43,57,181,74,57,181,74,28,54,31,83,190,101,164,220,175,118,203,130,88,193,
+            103,88,193,103,53,162,68,28,54,31,28,54,31,240,240,240,240,240,240,240,240,240,240,240,240,
             32,73,37,57,181,74,57,181,74,28,54,31,57,181,74,124,205,138,99,195,115,73,158,85,28,
-            54,31,28,54,31,28,54,31,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,32,73,
-            37,28,54,31,28,54,31,212,208,200,28,54,31,28,54,31,28,54,31,28,54,31,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            54,31,28,54,31,28,54,31,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,32,73,
+            37,28,54,31,28,54,31,240,240,240,28,54,31,28,54,31,28,54,31,28,54,31,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -6859,33 +6711,33 @@
         "c c #6F4848",
         "d c #7F0000",
         "e c #220000",
-        "f c #444444",
-        "g c #888888",
-        "h c #8C0000",
-        "i c #4C4040",
-        "j c #C10000",
-        "k c #191919",
-        "l c #2A2A2A",
-        "m c #FF0000",
-        "n c #666666",
+        "g c #444444",
+        "h c #888888",
+        "i c #8C0000",
+        "j c #4C4040",
+        "k c #C10000",
+        "l c #191919",
+        "m c #2A2A2A",
+        "n c #FF0000",
+        "o c #666666",
         "p c #333333",
         /* pixels */
-        "          h     ",
-        "         dma    ",
-        "        dmjma   ",
-        "       dmjhjma  ",
-        "      amjhlhjma ",
-        "      aapanpaaa ",
-        "         aga    ",
-        "     kpk ana    ",
-        "     pnp ppa    ",
-        "     fgi        ",
-        "  bebanabeb     ",
-        "  cmjhphjmi     ",
-        "   cmjhjmi      ",
-        "    cmjmi       ",
-        "     cmi        ",
-        "      h         "
+        "          i     ",
+        "         dna    ",
+        "        dnkna   ",
+        "       dnkikna  ",
+        "      ankimikna ",
+        "      aapaopaaa ",
+        "         aha    ",
+        "     lpl aoa    ",
+        "     pop ppa    ",
+        "     ghj        ",
+        "  bebaoabeb     ",
+        "  cnkipiknj     ",
+        "   cnkiknj      ",
+        "    cnknj       ",
+        "     cnj        ",
+        "      i         "
         };
         wxBitmap bitmap( xpm_data );
         return bitmap;
@@ -6897,39 +6749,39 @@
         /* columns rows colors chars-per-pixel */
         "16 16 17 1",
         "  c None",
-        "a c #444444",
-        "b c #114C11",
-        "c c #888888",
-        "d c #790000",
-        "e c #008000",
-        "f c #007700",
-        "g c #191919",
-        "h c #00B700",
-        "i c #B70000",
-        "j c #2A2A2A",
-        "k c #FF0000",
-        "l c #666666",
-        "m c #002A00",
+        "b c #444444",
+        "c c #114C11",
+        "d c #888888",
+        "e c #790000",
+        "f c #008000",
+        "g c #007700",
+        "h c #191919",
+        "i c #00B700",
+        "j c #B70000",
+        "k c #2A2A2A",
+        "l c #FF0000",
+        "m c #666666",
+        "n c #002A00",
         "o c #00FF00",
         "p c #333333",
         "q c #001500",
         /* pixels */
+        "          e     ",
+        "         ele    ",
+        "        eljle   ",
+        "       eljejle  ",
+        "      eljekejle ",
+        "          m     ",
         "          d     ",
-        "         dkd    ",
-        "        dkikd   ",
-        "       dkidikd  ",
-        "      dkidjdikd ",
-        "          l     ",
-        "          c     ",
-        "     gpg  l     ",
-        "     plp pp     ",
-        "     aca        ",
-        "  qmqlllqmq     ",
-        "  eohbpbhoe     ",
-        "   eohfhoe      ",
-        "    eohoe       ",
-        "     eoe        ",
-        "      e         "
+        "     hph  m     ",
+        "     pmp pp     ",
+        "     bdb        ",
+        "  qnqmmmqnq     ",
+        "  foicpciof     ",
+        "   foigiof      ",
+        "    foiof       ",
+        "     fof        ",
+        "      f         "
         };
         wxBitmap bitmap( xpm_data );
         return bitmap;
@@ -6944,35 +6796,35 @@
         "a c #110000",
         "b c #6F4848",
         "c c #220000",
-        "d c #444444",
-        "e c #888888",
-        "f c #008000",
-        "g c #770000",
-        "h c #191919",
-        "i c #BB0000",
-        "j c #00AE00",
-        "k c #2A2A2A",
-        "l c #FF0000",
-        "m c #666666",
+        "e c #444444",
+        "f c #888888",
+        "g c #008000",
+        "h c #770000",
+        "i c #191919",
+        "j c #BB0000",
+        "k c #00AE00",
+        "l c #2A2A2A",
+        "m c #FF0000",
+        "n c #666666",
         "o c #00FF00",
         "p c #333333",
         /* pixels */
+        "          g     ",
+        "         gog    ",
+        "        gokog   ",
+        "       gokgkog  ",
+        "      gokglgkog ",
+        "          np    ",
         "          f     ",
-        "         fof    ",
-        "        fojof   ",
-        "       fojfjof  ",
-        "      fojfkfjof ",
-        "          mp    ",
-        "          e     ",
-        "     hph  m     ",
-        "     pmp pp     ",
-        "     ded        ",
-        "  acammmaca     ",
-        "  bligpgilg     ",
-        "   bligilg      ",
-        "    glilg       ",
-        "     glg        ",
-        "      g         "
+        "     ipi  n     ",
+        "     pnp pp     ",
+        "     efe        ",
+        "  acannnaca     ",
+        "  bmjhphjmh     ",
+        "   bmjhjmh      ",
+        "    hmjmh       ",
+        "     hmh        ",
+        "      h         "
         };
         wxBitmap bitmap( xpm_data );
         return bitmap;
@@ -6985,12 +6837,12 @@
         "16 16 12 1",
         "  c None",
         "a c #006F00",
-        "b c #888888",
-        "c c #191919",
-        "d c #404F40",
-        "e c #00D400",
-        "f c #666666",
-        "g c #002A00",
+        "c c #888888",
+        "d c #191919",
+        "e c #404F40",
+        "f c #00D400",
+        "g c #666666",
+        "h c #002A00",
         "i c #00FF00",
         "j c #333333",
         "k c #001500",
@@ -7001,13 +6853,13 @@
         "        ailia   ",
         "       ailalia  ",
         "      aila alia ",
-        "          fj    ",
-        "          b     ",
-        "     cjc  f     ",
-        "     jfj jj     ",
-        "     dbd        ",
-        "  kgk f kgk     ",
-        "  aila aeia     ",
+        "          gj    ",
+        "          c     ",
+        "     djd  g     ",
+        "     jgj jj     ",
+        "     ece        ",
+        "  khk g khk     ",
+        "  aila afia     ",
         "   ailalia      ",
         "    ailia       ",
         "     aia        ",
@@ -7023,30 +6875,30 @@
         /* columns rows colors chars-per-pixel */
         "16 16 8 1",
         "  c None",
-        "a c #FFF0D4",
-        "b c #008000",
-        "c c #800000",
-        "d c #FFAA25",
-        "e c #C0C0C0",
+        "b c #FFF0D4",
+        "c c #008000",
+        "d c #800000",
+        "e c #FFAA25",
+        "f c #C0C0C0",
         "g c #808000",
         "h c #232375",
         /* pixels */
         "                ",
-        "  c          cc ",
-        " ccc  eeeee cccc",
-        " cccceaaebccccc ",
-        "  ccccbbbcccccd ",
-        "gggcccchccccbga ",
-        "  adccccccchgad ",
-        "   adcccccagadd ",
-        " gaddcccccdadd  ",
-        "gaddcccccccdd   ",
-        "gddcccchccccdd  ",
-        "gdcccc  hcccc   ",
-        "gdcccb hhhccc   ",
-        " cccc hhhhcccc  ",
-        "  cc       cccc ",
-        "             c  "
+        "  d          dd ",
+        " ddd  fffff dddd",
+        " ddddfbbfcddddd ",
+        "  ddddcccddddde ",
+        "gggddddhddddcgb ",
+        "  bedddddddhgbe ",
+        "   bedddddbgbee ",
+        " gbeedddddebee  ",
+        "gbeedddddddee   ",
+        "geeddddhddddee  ",
+        "gedddd  hdddd   ",
+        "gedddc hhhddd   ",
+        " dddd hhhhdddd  ",
+        "  dd       dddd ",
+        "             d  "
         };
         wxBitmap bitmap( xpm_data );
         return bitmap;
@@ -7055,40 +6907,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,55,101,59,55,101,59,55,101,59,55,101,59,55,101,59,55,101,59,
-            55,101,59,55,101,59,46,69,56,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,55,101,59,89,204,87,202,250,201,66,211,63,65,186,63,58,142,
-            60,46,69,56,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,55,101,59,98,205,96,67,235,63,58,142,60,46,69,56,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,55,101,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,55,101,59,55,101,59,55,101,59,55,101,59,55,101,59,55,101,59,
+            55,101,59,55,101,59,46,69,56,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,55,101,59,89,204,87,202,250,201,66,211,63,65,186,63,58,142,
+            60,46,69,56,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,55,101,59,98,205,96,67,235,63,58,142,60,46,69,56,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,55,101,
             59,55,101,59,55,101,59,51,87,58,55,101,59,63,173,62,46,69,56,51,87,58,55,101,59,
-            55,101,59,46,69,56,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,55,
+            55,101,59,46,69,56,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,55,
             101,59,63,173,62,157,245,155,77,164,79,46,69,56,58,142,60,65,186,63,64,159,62,46,69,
-            56,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            55,101,59,63,173,62,202,250,201,83,165,86,65,186,63,64,159,62,46,69,56,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,55,101,59,55,101,59,55,101,59,55,101,59,52,89,
+            56,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            55,101,59,63,173,62,202,250,201,83,165,86,65,186,63,64,159,62,46,69,56,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,55,101,59,55,101,59,55,101,59,55,101,59,52,89,
             58,55,101,59,63,173,62,134,242,132,64,159,62,46,69,56,52,89,58,55,101,59,55,101,59,
-            57,91,60,46,69,56,212,208,200,212,208,200,55,101,59,60,158,61,66,211,63,169,255,167,104,
+            57,91,60,46,69,56,240,240,240,240,240,240,55,101,59,60,158,61,66,211,63,169,255,167,104,
             184,107,55,101,59,63,173,62,46,69,56,58,142,60,65,186,63,65,186,63,64,133,62,46,69,
-            56,212,208,200,212,208,200,212,208,200,212,208,200,55,101,59,60,158,61,67,235,63,202,250,201,
-            120,184,122,46,69,56,58,142,60,65,186,63,65,186,63,64,133,62,46,69,56,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,55,101,59,60,158,61,67,235,63,247,255,
-            246,115,181,118,65,186,63,65,186,63,64,133,62,46,69,56,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,55,101,59,60,158,61,66,211,63,188,
-            249,186,65,186,63,64,133,62,46,69,56,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,55,101,59,60,158,61,66,204,63,
-            65,151,62,46,69,56,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,55,101,59,60,158,61,46,69,
-            56,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,46,69,56,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            56,240,240,240,240,240,240,240,240,240,240,240,240,55,101,59,60,158,61,67,235,63,202,250,201,
+            120,184,122,46,69,56,58,142,60,65,186,63,65,186,63,64,133,62,46,69,56,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,55,101,59,60,158,61,67,235,63,247,255,
+            246,115,181,118,65,186,63,65,186,63,64,133,62,46,69,56,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,55,101,59,60,158,61,66,211,63,188,
+            249,186,65,186,63,64,133,62,46,69,56,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,55,101,59,60,158,61,66,204,63,
+            65,151,62,46,69,56,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,55,101,59,60,158,61,46,69,
+            56,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,46,69,56,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -7096,40 +6948,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,46,69,56,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,46,69,56,60,158,61,55,101,
-            59,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,46,69,56,65,151,62,66,204,63,60,158,61,55,
-            101,59,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,46,69,56,64,133,62,65,186,63,188,249,186,66,211,63,60,158,61,
-            55,101,59,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,46,69,56,64,133,62,65,186,63,65,186,63,115,181,118,247,255,246,67,235,63,60,158,
-            61,55,101,59,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,46,69,56,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,46,69,56,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,46,69,56,60,158,61,55,101,
+            59,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,46,69,56,65,151,62,66,204,63,60,158,61,55,
+            101,59,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,46,69,56,64,133,62,65,186,63,188,249,186,66,211,63,60,158,61,
+            55,101,59,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,46,69,56,64,133,62,65,186,63,65,186,63,115,181,118,247,255,246,67,235,63,60,158,
+            61,55,101,59,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,46,69,56,
             64,133,62,65,186,63,65,186,63,58,142,60,46,69,56,120,184,122,202,250,201,67,235,63,60,
-            158,61,55,101,59,212,208,200,212,208,200,212,208,200,212,208,200,46,69,56,64,133,62,65,186,
+            158,61,55,101,59,240,240,240,240,240,240,240,240,240,240,240,240,46,69,56,64,133,62,65,186,
             63,65,186,63,58,142,60,46,69,56,63,173,62,55,101,59,104,184,107,169,255,167,66,211,63,
-            60,158,61,55,101,59,212,208,200,212,208,200,46,69,56,57,91,60,55,101,59,55,101,59,52,
+            60,158,61,55,101,59,240,240,240,240,240,240,46,69,56,57,91,60,55,101,59,55,101,59,52,
             89,58,46,69,56,64,159,62,134,242,132,63,173,62,55,101,59,52,89,58,55,101,59,55,101,
-            59,55,101,59,55,101,59,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,46,69,56,
-            64,159,62,65,186,63,83,165,86,202,250,201,63,173,62,55,101,59,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,46,69,56,64,159,62,65,186,
-            63,58,142,60,46,69,56,77,164,79,157,245,155,63,173,62,55,101,59,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,46,69,56,55,101,59,55,101,59,51,87,58,46,
-            69,56,63,173,62,55,101,59,51,87,58,55,101,59,55,101,59,55,101,59,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,46,69,56,58,142,60,
-            67,235,63,98,205,96,55,101,59,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,46,69,56,58,142,60,65,186,63,66,211,
-            63,202,250,201,89,204,87,55,101,59,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,46,69,56,55,101,59,55,101,59,55,101,59,55,101,59,55,
-            101,59,55,101,59,55,101,59,55,101,59,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            59,55,101,59,55,101,59,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,46,69,56,
+            64,159,62,65,186,63,83,165,86,202,250,201,63,173,62,55,101,59,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,46,69,56,64,159,62,65,186,
+            63,58,142,60,46,69,56,77,164,79,157,245,155,63,173,62,55,101,59,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,46,69,56,55,101,59,55,101,59,51,87,58,46,
+            69,56,63,173,62,55,101,59,51,87,58,55,101,59,55,101,59,55,101,59,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,46,69,56,58,142,60,
+            67,235,63,98,205,96,55,101,59,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,46,69,56,58,142,60,65,186,63,66,211,
+            63,202,250,201,89,204,87,55,101,59,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,46,69,56,55,101,59,55,101,59,55,101,59,55,101,59,55,
+            101,59,55,101,59,55,101,59,55,101,59,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -7137,41 +6989,41 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,0,60,131,0,60,131,0,60,131,0,60,131,0,60,131,0,57,124,0,57,124,
-            0,57,124,0,57,124,0,57,124,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,60,131,0,60,131,0,60,131,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,0,60,131,0,60,131,0,60,131,0,60,131,0,60,131,0,57,124,0,57,124,
+            0,57,124,0,57,124,0,57,124,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,60,131,0,60,131,0,60,131,
             21,88,167,59,149,219,84,175,237,116,194,250,126,198,251,131,201,251,126,198,251,117,184,238,113,
-            166,218,36,95,159,0,57,124,0,53,114,0,53,114,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,0,63,138,0,60,131,27,101,174,73,151,216,117,188,243,149,204,251,156,
+            166,218,36,95,159,0,57,124,0,53,114,0,53,114,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,0,63,138,0,60,131,27,101,174,73,151,216,117,188,243,149,204,251,156,
             209,251,190,225,253,190,225,253,190,225,253,190,225,253,190,225,253,190,225,253,180,217,247,175,213,
-            243,157,197,238,113,166,218,52,101,155,0,53,114,0,53,114,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,64,139,0,
+            243,157,197,238,113,166,218,52,101,155,0,53,114,0,53,114,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,64,139,0,
             63,138,39,116,196,73,151,216,142,195,253,181,220,251,212,235,254,231,244,255,253,255,255,253,255,
             255,253,255,255,253,255,255,253,255,255,253,255,255,253,255,255,253,255,255,253,255,255,234,246,255,
-            212,235,254,190,225,253,149,179,215,63,110,162,0,53,114,0,50,108,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,64,139,21,88,167,59,149,219,116,194,
+            212,235,254,190,225,253,149,179,215,63,110,162,0,53,114,0,50,108,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,64,139,21,88,167,59,149,219,116,194,
             250,181,220,251,212,235,254,253,255,255,253,255,255,253,255,255,253,255,255,253,255,255,253,255,255,
             253,255,255,253,255,255,253,255,255,253,255,255,253,255,255,253,255,255,253,255,255,253,255,255,238,
-            248,255,212,235,254,195,229,255,149,179,215,35,85,141,0,50,108,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,0,64,139,39,107,184,59,149,219,116,194,250,181,220,251,242,242,241,
+            248,255,212,235,254,195,229,255,149,179,215,35,85,141,0,50,108,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,0,64,139,39,107,184,59,149,219,116,194,250,181,220,251,242,242,241,
             227,229,234,222,224,230,212,220,230,202,218,234,202,218,234,202,218,234,198,214,230,198,214,230,198,
             214,230,198,214,230,202,218,234,202,218,234,202,218,234,212,220,230,212,220,230,222,224,230,227,229,
-            234,205,226,244,189,222,251,157,197,238,63,110,162,0,50,108,212,208,200,212,208,200,212,208,200,
+            234,205,226,244,189,222,251,157,197,238,63,110,162,0,50,108,240,240,240,240,240,240,240,240,240,
             0,63,138,27,101,174,59,149,219,126,198,251,190,225,253,242,242,241,123,151,186,0,63,138,0,
             63,138,0,63,138,0,63,138,100,133,174,0,63,138,0,63,138,0,63,138,0,63,138,0,63,
             138,0,63,138,100,133,174,0,63,138,0,63,138,0,63,138,0,63,138,0,63,138,123,151,186,
-            205,226,244,189,222,251,113,166,218,35,85,141,0,50,108,212,208,200,212,208,200,0,64,139,65,
+            205,226,244,189,222,251,113,166,218,35,85,141,0,50,108,240,240,240,240,240,240,0,64,139,65,
             130,199,116,194,250,189,222,251,253,255,255,202,218,234,0,63,138,255,128,128,255,128,128,255,128,
             128,217,0,0,0,63,138,255,128,128,255,128,128,255,128,128,255,128,128,255,128,128,217,0,0,
             0,63,138,255,255,224,255,255,224,255,255,224,255,255,224,217,217,0,0,63,138,227,229,234,212,
-            235,254,158,203,252,83,132,189,0,50,108,212,208,200,0,64,139,39,107,184,91,164,225,181,220,
+            235,254,158,203,252,83,132,189,0,50,108,240,240,240,0,64,139,39,107,184,91,164,225,181,220,
             251,234,246,255,238,248,255,183,207,230,0,63,138,255,128,128,253,255,255,255,5,4,181,0,1,
             0,63,138,255,128,128,253,255,255,255,5,4,255,5,4,255,5,4,188,0,3,0,63,138,255,
             255,0,255,255,0,255,255,0,255,255,0,178,178,0,0,63,138,212,220,230,238,248,255,181,220,
@@ -7198,71 +7050,71 @@
             210,254,181,220,251,189,222,251,165,198,230,0,63,138,255,128,128,255,5,4,255,5,4,181,0,
             1,0,63,138,255,128,128,255,5,4,255,5,4,181,0,1,0,63,138,255,255,224,255,255,0,
             255,255,0,255,255,0,255,255,0,255,255,0,178,178,0,0,63,138,165,198,230,166,210,254,108,
-            169,247,62,137,237,17,77,156,0,50,108,212,208,200,0,60,131,65,130,199,100,41,9,100,41,
+            169,247,62,137,237,17,77,156,0,50,108,240,240,240,0,60,131,65,130,199,100,41,9,100,41,
             9,100,41,9,163,197,234,0,63,138,100,41,9,100,41,9,100,41,9,100,41,9,100,41,9,
             100,41,9,100,41,9,181,0,1,181,0,1,0,63,138,255,255,168,160,165,11,165,170,11,165,
             170,11,165,170,11,165,170,11,169,172,11,0,63,138,163,197,234,138,191,251,91,157,244,47,118,
-            215,0,45,98,212,208,200,212,208,200,0,60,131,100,41,9,212,141,78,100,41,9,158,203,252,
+            215,0,45,98,240,240,240,240,240,240,0,60,131,100,41,9,212,141,78,100,41,9,158,203,252,
             100,41,9,100,41,9,218,161,108,212,141,78,206,130,64,206,130,64,174,99,39,100,41,9,0,
             63,138,0,63,138,0,63,138,77,121,175,0,63,138,0,63,138,0,63,138,0,63,138,0,63,
             138,0,63,138,0,63,138,83,132,189,141,187,240,91,157,244,62,137,237,17,77,156,0,45,98,
-            212,208,200,212,208,200,100,41,9,198,117,48,180,104,44,100,41,9,100,41,9,235,201,153,228,
+            240,240,240,240,240,240,100,41,9,198,117,48,180,104,44,100,41,9,100,41,9,235,201,153,228,
             184,134,211,142,82,206,130,64,155,85,34,100,41,9,100,41,9,157,197,238,150,190,230,150,190,
             230,157,197,238,157,197,238,163,197,234,165,198,230,165,198,230,165,198,230,165,198,230,158,194,230,
-            157,197,238,141,187,240,91,157,244,67,137,242,45,112,205,0,45,98,212,208,200,212,208,200,212,
-            208,200,100,41,9,180,104,44,120,57,16,206,130,64,224,174,125,214,149,87,212,141,78,134,70,
+            157,197,238,141,187,240,91,157,244,67,137,242,45,112,205,0,45,98,240,240,240,240,240,240,240,
+            240,240,100,41,9,180,104,44,120,57,16,206,130,64,224,174,125,214,149,87,212,141,78,134,70,
             26,100,41,9,133,133,136,158,203,252,166,210,254,166,210,254,166,210,254,166,210,254,166,210,254,
             166,210,254,166,210,254,181,220,251,189,222,251,189,222,251,189,222,251,172,214,254,149,198,252,78,
-            148,242,55,127,230,45,112,205,24,82,156,0,45,98,212,208,200,212,208,200,100,41,9,100,41,
+            148,242,55,127,230,45,112,205,24,82,156,0,45,98,240,240,240,240,240,240,100,41,9,100,41,
             9,142,75,27,206,130,64,212,141,78,206,130,64,174,99,39,100,41,9,103,91,99,129,146,175,
             123,180,249,142,195,253,142,195,253,142,195,253,142,195,253,142,195,253,142,195,253,142,195,253,149,
             198,252,160,206,253,181,220,251,181,220,251,181,220,251,127,189,249,91,157,244,66,137,236,39,107,
-            184,17,77,156,0,45,98,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,145,76,27,
+            184,17,77,156,0,45,98,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,145,76,27,
             186,108,44,174,99,39,174,99,39,120,57,16,155,85,34,100,41,9,39,116,196,62,137,237,99,
             164,246,103,169,248,109,170,248,108,169,247,109,170,248,109,170,248,109,170,248,123,180,249,138,191,
             251,158,203,252,172,214,254,131,187,249,78,148,242,66,137,236,24,87,177,10,64,131,0,50,108,
-            212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,100,41,9,165,92,37,186,108,44,198,
+            240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,100,41,9,165,92,37,186,108,44,198,
             117,48,90,45,18,224,174,125,238,210,174,182,112,56,100,41,9,0,53,114,13,81,165,20,98,
             210,33,113,232,47,130,240,54,132,241,54,132,241,68,144,242,99,164,246,119,178,249,149,198,252,
-            138,191,251,78,148,242,55,127,230,21,88,167,0,50,108,0,50,108,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,100,41,9,186,108,44,198,117,48,198,117,48,218,161,
-            108,253,255,255,221,219,215,212,208,200,142,75,27,100,41,9,69,49,42,50,55,62,50,55,62,
+            138,191,251,78,148,242,55,127,230,21,88,167,0,50,108,0,50,108,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,100,41,9,186,108,44,198,117,48,198,117,48,218,161,
+            108,253,255,255,221,219,215,240,240,240,142,75,27,100,41,9,69,49,42,50,55,62,50,55,62,
             0,53,114,0,50,108,0,50,108,1,68,153,6,87,198,99,164,246,131,187,249,99,164,246,33,
-            113,232,21,88,167,0,50,108,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,100,41,9,111,49,13,198,117,48,206,130,64,198,117,48,207,135,74,246,231,218,
-            154,151,148,72,73,76,167,96,42,209,178,139,229,220,210,242,242,241,189,189,182,50,55,62,212,
-            208,200,212,208,200,0,50,108,1,68,153,20,98,210,91,157,244,54,132,241,21,88,167,0,50,
-            108,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            113,232,21,88,167,0,50,108,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,100,41,9,111,49,13,198,117,48,206,130,64,198,117,48,207,135,74,246,231,218,
+            154,151,148,72,73,76,167,96,42,209,178,139,229,220,210,242,242,241,189,189,182,50,55,62,240,
+            240,240,240,240,240,0,50,108,1,68,153,20,98,210,91,157,244,54,132,241,21,88,167,0,50,
+            108,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             100,41,9,145,76,27,212,141,78,220,162,92,214,149,87,202,123,56,207,135,74,214,149,87,194,
-            119,57,198,131,56,209,178,139,104,106,109,23,22,20,242,242,241,180,180,177,50,55,62,212,208,
-            200,212,208,200,0,50,108,6,87,198,54,132,241,6,87,198,0,45,98,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,174,
+            119,57,198,131,56,209,178,139,104,106,109,23,22,20,242,242,241,180,180,177,50,55,62,240,240,
+            240,240,240,240,0,50,108,6,87,198,54,132,241,6,87,198,0,45,98,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,174,
             99,39,212,141,78,238,210,174,224,174,125,212,141,78,202,123,56,180,104,44,173,98,40,190,125,
-            63,180,180,177,170,170,167,160,160,158,242,242,241,227,227,224,50,55,62,212,208,200,212,208,200,
-            0,50,108,6,87,198,20,98,210,0,50,108,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,145,76,27,205,129,
+            63,180,180,177,170,170,167,160,160,158,242,242,241,227,227,224,50,55,62,240,240,240,240,240,240,
+            0,50,108,6,87,198,20,98,210,0,50,108,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,145,76,27,205,129,
             63,217,154,97,218,161,108,212,141,78,202,123,56,186,108,44,173,98,40,182,112,56,212,205,194,
-            232,232,230,242,242,241,253,255,255,239,239,237,50,55,62,212,208,200,212,208,200,0,50,108,5,
-            78,176,0,50,108,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,100,41,9,111,49,13,180,104,44,205,129,63,
+            232,232,230,242,242,241,253,255,255,239,239,237,50,55,62,240,240,240,240,240,240,0,50,108,5,
+            78,176,0,50,108,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,100,41,9,111,49,13,180,104,44,205,129,63,
             205,129,63,216,156,71,198,117,48,186,108,44,165,92,37,182,139,103,201,194,185,221,219,215,232,
-            232,230,239,239,237,232,232,230,50,55,62,212,208,200,212,208,200,0,45,98,0,50,108,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,100,41,9,120,57,16,100,41,9,165,92,37,165,92,37,165,
+            232,230,239,239,237,232,232,230,50,55,62,240,240,240,240,240,240,0,45,98,0,50,108,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,100,41,9,120,57,16,100,41,9,165,92,37,165,92,37,165,
             92,37,165,92,37,155,85,34,124,77,45,160,160,158,203,203,199,104,106,109,203,203,199,221,219,
-            215,133,133,136,50,55,62,212,208,200,212,208,200,0,50,108,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,111,49,13,142,75,27,151,81,30,131,63,20,104,43,9,100,41,9,90,45,
+            215,133,133,136,50,55,62,240,240,240,240,240,240,0,50,108,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,111,49,13,142,75,27,151,81,30,131,63,20,104,43,9,100,41,9,90,45,
             18,63,51,48,50,55,62,109,112,114,154,151,148,180,180,177,72,73,76,50,55,62,50,55,62,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,111,49,13,145,76,27,195,122,49,228,156,63,212,140,56,173,98,40,100,41,9,212,208,200,
-            212,208,200,50,55,62,50,55,62,50,55,62,50,55,62,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,111,49,13,145,76,27,195,122,49,228,156,63,212,140,56,173,98,40,100,41,9,240,240,240,
+            240,240,240,50,55,62,50,55,62,50,55,62,50,55,62,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -7270,14 +7122,14 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,58,111,0,55,110,0,51,101,0,
-            57,108,0,57,108,0,56,113,212,208,200,0,47,89,0,24,45,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,0,56,113,0,58,111,6,95,163,12,147,232,138,198,217,60,190,123,
-            13,140,211,4,87,148,0,47,89,99,11,11,99,11,11,0,24,45,212,208,200,212,208,200,212,
-            208,200,0,54,113,46,127,99,104,229,123,0,148,197,2,182,255,75,205,175,16,169,151,2,70,
-            127,0,64,130,47,124,71,0,47,89,156,16,16,122,13,13,0,24,45,212,208,200,0,54,113,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,58,111,0,55,110,0,51,101,0,
+            57,108,0,57,108,0,56,113,240,240,240,0,47,89,0,24,45,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,0,56,113,0,58,111,6,95,163,12,147,232,138,198,217,60,190,123,
+            13,140,211,4,87,148,0,47,89,99,11,11,99,11,11,0,24,45,240,240,240,240,240,240,240,
+            240,240,0,54,113,46,127,99,104,229,123,0,148,197,2,182,255,75,205,175,16,169,151,2,70,
+            127,0,64,130,47,124,71,0,47,89,156,16,16,122,13,13,0,24,45,240,240,240,0,54,113,
             61,116,106,242,255,221,20,210,175,0,161,222,14,201,241,88,214,97,0,106,188,2,70,127,243,
-            127,127,0,47,89,101,11,11,201,22,22,151,16,16,0,24,45,212,208,200,0,54,113,148,220,
+            127,127,0,47,89,101,11,11,201,22,22,151,16,16,0,24,45,240,240,240,0,54,113,148,220,
             148,28,207,135,0,164,210,0,211,252,0,219,242,0,142,186,20,132,186,0,64,130,252,222,222,
             241,96,96,236,27,27,237,34,34,168,19,19,0,24,45,0,58,111,0,100,144,60,218,133,0,
             159,216,14,201,241,90,236,255,0,211,252,2,182,255,35,169,223,0,64,130,255,255,255,246,163,
@@ -7292,18 +7144,18 @@
             60,115,0,30,49,0,46,93,0,64,130,237,34,34,239,72,72,229,26,26,201,22,22,0,24,
             45,138,198,217,237,247,201,77,189,66,38,150,157,20,126,206,0,90,204,0,87,166,0,63,111,
             0,34,65,0,64,130,178,20,20,218,25,25,193,21,21,123,13,13,168,19,19,0,24,45,160,
-            206,114,40,186,55,36,177,46,80,196,31,61,163,74,2,103,188,1,92,180,0,41,65,212,208,
-            200,0,64,130,106,12,12,196,22,22,122,13,13,0,24,45,122,13,13,0,24,45,69,171,44,
-            40,177,40,54,178,52,49,164,56,32,124,96,3,100,179,2,78,136,0,37,71,212,208,200,0,
+            206,114,40,186,55,36,177,46,80,196,31,61,163,74,2,103,188,1,92,180,0,41,65,240,240,
+            240,0,64,130,106,12,12,196,22,22,122,13,13,0,24,45,122,13,13,0,24,45,69,171,44,
+            40,177,40,54,178,52,49,164,56,32,124,96,3,100,179,2,78,136,0,37,71,240,240,240,0,
             64,130,108,12,12,156,16,16,0,24,45,0,73,146,0,24,45,0,24,45,53,150,114,49,157,
-            56,50,155,73,32,123,110,2,91,175,2,70,127,0,37,71,212,208,200,212,208,200,212,208,200,
+            56,50,155,73,32,123,110,2,91,175,2,70,127,0,37,71,240,240,240,240,240,240,240,240,240,
             0,24,45,86,9,9,104,11,11,0,24,45,0,58,111,0,87,178,0,87,178,9,93,143,7,
-            94,152,3,68,119,0,37,73,0,37,73,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,0,24,45,0,24,45,212,208,200,0,35,67,0,41,65,0,40,71,0,40,71,0,42,73,
-            0,37,73,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            94,152,3,68,119,0,37,73,0,37,73,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,0,24,45,0,24,45,240,240,240,0,35,67,0,41,65,0,40,71,0,40,71,0,42,73,
+            0,37,73,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -7311,40 +7163,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,9,84,125,8,73,108,7,65,97,7,
-            65,97,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,9,84,125,16,149,221,27,164,239,15,139,206,10,90,133,
-            6,52,77,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,9,84,125,16,149,221,255,255,255,130,205,246,67,180,242,14,132,196,10,94,
-            140,6,52,77,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,9,84,125,27,164,239,162,218,249,93,191,244,67,180,242,16,149,221,13,121,180,6,
-            52,77,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,7,65,97,15,139,206,67,180,242,67,180,242,33,167,240,16,149,221,13,121,180,6,52,77,
-            6,52,77,6,52,77,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,6,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,9,84,125,8,73,108,7,65,97,7,
+            65,97,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,9,84,125,16,149,221,27,164,239,15,139,206,10,90,133,
+            6,52,77,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,9,84,125,16,149,221,255,255,255,130,205,246,67,180,242,14,132,196,10,94,
+            140,6,52,77,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,9,84,125,27,164,239,162,218,249,93,191,244,67,180,242,16,149,221,13,121,180,6,
+            52,77,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,7,65,97,15,139,206,67,180,242,67,180,242,33,167,240,16,149,221,13,121,180,6,52,77,
+            6,52,77,6,52,77,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,6,
             52,77,10,94,140,15,139,206,16,149,221,16,149,221,13,126,187,10,90,133,6,52,77,8,73,
-            108,7,65,97,6,52,77,212,208,200,212,208,200,212,208,200,212,208,200,9,84,125,6,58,86,
+            108,7,65,97,6,52,77,240,240,240,240,240,240,240,240,240,240,240,240,9,84,125,6,58,86,
             6,52,77,9,84,125,12,116,172,12,116,172,10,90,133,6,52,77,9,78,116,10,90,133,9,
-            84,125,6,52,77,212,208,200,212,208,200,212,208,200,9,84,125,12,111,165,10,94,140,7,62,
+            84,125,6,52,77,240,240,240,240,240,240,240,240,240,9,84,125,12,111,165,10,94,140,7,62,
             92,6,52,77,6,52,77,6,52,77,6,52,77,121,0,0,121,0,0,9,84,125,121,0,0,
-            121,0,0,212,208,200,212,208,200,9,84,125,78,185,243,104,195,244,14,132,196,12,116,172,10,
+            121,0,0,240,240,240,240,240,240,9,84,125,78,185,243,104,195,244,14,132,196,12,116,172,10,
             94,140,10,94,140,10,94,140,121,0,0,242,84,90,237,28,36,121,0,0,237,28,36,237,28,
-            36,68,1,0,212,208,200,9,84,125,186,227,250,63,179,242,13,121,180,16,149,221,63,179,242,
+            36,68,1,0,240,240,240,9,84,125,186,227,250,63,179,242,13,121,180,16,149,221,63,179,242,
             27,164,239,121,0,0,242,84,90,251,199,201,245,122,126,239,49,56,245,117,122,243,100,105,237,
             28,36,68,1,0,9,84,125,104,195,244,27,164,239,10,94,140,33,167,240,231,245,253,113,198,
             245,121,0,0,245,130,134,254,241,241,248,170,173,244,109,113,248,167,170,245,117,122,226,26,34,
             68,1,0,9,84,125,78,185,243,16,149,221,7,62,92,33,167,240,231,245,253,113,198,245,121,
             0,0,242,84,90,251,199,201,247,156,160,246,145,149,245,122,126,242,89,95,195,21,27,68,1,
             0,9,84,125,44,171,240,16,149,221,6,52,77,33,167,240,207,236,252,93,191,244,67,180,242,
-            121,0,0,241,67,74,247,156,160,245,132,136,243,97,103,219,25,33,68,1,0,212,208,200,9,
+            121,0,0,241,67,74,247,156,160,245,132,136,243,97,103,219,25,33,68,1,0,240,240,240,9,
             84,125,16,149,221,16,149,221,6,52,77,33,167,240,138,209,247,72,182,242,44,171,240,44,171,
-            240,121,0,0,237,28,36,245,126,130,219,25,33,68,1,0,212,208,200,212,208,200,7,65,97,
+            240,121,0,0,237,28,36,245,126,130,219,25,33,68,1,0,240,240,240,240,240,240,7,65,97,
             16,149,221,16,149,221,6,52,77,16,149,221,85,187,243,54,175,241,15,144,215,6,52,77,6,
-            52,77,121,0,0,179,14,18,68,1,0,212,208,200,212,208,200,212,208,200,7,65,97,6,52,
-            77,6,52,77,212,208,200,6,52,77,6,52,77,6,52,77,6,52,77,212,208,200,212,208,200,
-            212,208,200,68,1,0,212,208,200,212,208,200,212,208,200,212,208,200
+            52,77,121,0,0,179,14,18,68,1,0,240,240,240,240,240,240,240,240,240,7,65,97,6,52,
+            77,6,52,77,240,240,240,6,52,77,6,52,77,6,52,77,6,52,77,240,240,240,240,240,240,
+            240,240,240,68,1,0,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -7352,10 +7204,10 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,165,121,54,165,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,165,121,54,165,
             121,54,165,121,54,165,121,54,165,121,54,165,121,54,165,121,54,165,121,54,165,121,54,165,121,
             54,165,121,54,165,121,54,165,121,54,165,121,54,165,121,54,152,106,46,165,121,54,255,255,255,
             255,255,255,254,251,221,254,246,188,254,244,172,254,243,155,254,243,155,253,238,121,253,238,121,253,
@@ -7376,16 +7228,16 @@
             138,90,37,165,121,54,253,238,121,253,238,121,253,238,121,253,238,121,253,238,121,253,238,121,249,
             232,117,245,227,114,245,227,114,245,227,114,253,238,121,253,238,121,253,238,121,239,218,109,138,90,
             37,152,106,46,138,90,37,138,90,37,138,90,37,138,90,37,138,90,37,138,90,37,138,90,37,
-            138,90,37,138,90,37,138,90,37,138,90,37,138,90,37,138,90,37,138,90,37,138,90,37,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            138,90,37,138,90,37,138,90,37,138,90,37,138,90,37,138,90,37,138,90,37,138,90,37,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -7393,68 +7245,68 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,
-            0,0,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,0,0,0,0,0,
-            0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,0,0,0,255,255,255,255,255,255,255,255,255,217,217,217,0,
-            0,0,0,0,0,217,217,217,252,252,252,249,249,249,244,244,244,217,217,217,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,
+            0,0,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,0,0,0,0,0,
+            0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,0,0,0,255,255,255,255,255,255,255,255,255,217,217,217,0,
+            0,0,0,0,0,217,217,217,252,252,252,249,249,249,244,244,244,217,217,217,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,
             217,217,217,255,255,255,255,255,255,253,253,253,251,251,251,0,0,0,0,0,0,247,247,247,246,
-            246,246,244,244,244,241,241,241,238,238,238,0,0,0,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,217,217,217,255,255,255,255,255,255,
+            246,246,244,244,244,241,241,241,238,238,238,0,0,0,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,217,217,217,255,255,255,255,255,255,
             253,253,253,251,251,251,0,0,0,0,0,0,247,247,247,246,246,246,244,244,244,241,241,241,238,
-            238,238,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,0,0,0,248,248,248,246,246,246,244,244,244,242,242,242,240,240,240,0,0,0,
-            0,0,0,236,236,236,235,235,235,233,233,233,231,231,231,229,229,229,0,0,0,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,0,0,240,240,
+            238,238,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,0,0,0,248,248,248,246,246,246,244,244,244,242,242,242,240,241,240,0,0,0,
+            0,0,0,236,236,236,235,235,235,233,233,233,231,231,231,229,229,229,0,0,0,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,0,0,240,241,
             240,0,0,0,217,217,217,235,235,235,233,233,233,0,0,0,0,0,0,229,229,229,0,0,0,
-            217,217,217,223,223,223,222,222,222,0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,0,0,0,217,217,217,0,0,0,0,0,0,228,228,
+            217,217,217,223,223,223,222,222,222,0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,0,0,0,217,217,217,0,0,0,0,0,0,228,228,
             228,225,225,225,0,0,0,0,0,0,221,222,221,0,0,0,0,0,0,216,216,216,214,214,214,
-            0,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,0,0,0,217,217,217,218,218,218,217,217,217,0,0,0,128,124,124,128,124,
-            124,0,0,0,209,209,209,207,207,207,205,205,205,0,0,0,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,
-            0,0,0,0,0,0,0,0,128,124,124,212,208,200,212,208,200,212,208,200,0,0,0,0,0,
-            0,0,0,0,128,124,124,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200
+            0,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,0,0,0,217,217,217,218,218,218,217,217,217,0,0,0,128,124,124,128,124,
+            124,0,0,0,209,209,209,207,207,207,205,205,205,0,0,0,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,
+            0,0,0,0,0,0,0,0,128,124,124,240,240,240,240,240,240,240,240,240,0,0,0,0,0,
+            0,0,0,0,128,124,124,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240
         };
         wxImage image( 22, 22, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -7465,32 +7317,32 @@
         /* columns rows colors chars-per-pixel */
         "18 19 8 1",
         "  c None",
-        "a c #00D200",
-        "b c #1DD71D",
-        "c c #55E155",
-        "d c #72E672",
+        "b c #00D200",
+        "c c #1DD71D",
+        "d c #55E155",
+        "e c #72E672",
         "f c #AAF0AA",
         "g c #C7F5C7",
         "h c #39DC39",
         /* pixels */
         "                  ",
-        "              haa ",
-        "             aaad ",
-        "            baac  ",
-        "           haab   ",
-        "           aaa    ",
-        "          aaaf    ",
-        "         baad     ",
-        "        caah      ",
-        "        aab       ",
-        "       baaf       ",
-        " caa  caac        ",
-        " aaa  aab         ",
-        " aaab aag         ",
-        " haaaaad          ",
-        "  aaaab           ",
-        "  aaaag           ",
-        "   aac            ",
+        "              hbb ",
+        "             bbbe ",
+        "            cbbd  ",
+        "           hbbc   ",
+        "           bbb    ",
+        "          bbbf    ",
+        "         cbbe     ",
+        "        dbbh      ",
+        "        bbc       ",
+        "       cbbf       ",
+        " dbb  dbbd        ",
+        " bbb  bbc         ",
+        " bbbc bbg         ",
+        " hbbbbbe          ",
+        "  bbbbc           ",
+        "  bbbbg           ",
+        "   bbd            ",
         "                  "
         };
         wxBitmap bitmap( xpm_data );
@@ -7500,62 +7352,62 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,7,97,49,73,156,107,106,193,130,91,200,108,53,
-            185,69,13,156,34,0,111,23,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,74,24,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,7,97,49,73,156,107,106,193,130,91,200,108,53,
+            185,69,13,156,34,0,111,23,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,74,24,
             80,159,117,202,247,209,187,255,185,130,239,127,76,221,75,37,213,36,20,221,18,9,233,9,0,
-            201,8,0,100,20,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,0,74,23,103,178,134,216,255,213,152,242,151,96,223,96,
-            52,215,50,24,216,23,13,223,14,5,241,4,0,255,0,0,255,0,0,248,0,0,101,17,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,2,100,38,0,86,
+            201,8,0,100,20,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,0,74,23,103,178,134,216,255,213,152,242,151,96,223,96,
+            52,215,50,24,216,23,13,223,14,5,241,4,0,255,0,0,255,0,0,248,0,0,101,17,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,2,100,38,0,86,
             26,50,140,86,190,252,188,126,232,126,74,218,74,36,213,34,11,183,22,0,123,20,0,105,20,
-            0,123,16,0,191,4,0,255,0,0,255,0,0,227,0,0,75,23,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,35,152,67,89,226,89,43,200,48,44,211,46,56,229,56,42,222,
-            42,23,218,22,4,161,22,0,69,23,212,208,200,212,208,200,212,208,200,0,57,26,0,106,17,
-            0,223,0,0,255,0,0,140,11,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,16,
+            0,123,16,0,191,4,0,255,0,0,255,0,0,227,0,0,75,23,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,35,152,67,89,226,89,43,200,48,44,211,46,56,229,56,42,222,
+            42,23,218,22,4,161,22,0,69,23,240,240,240,240,240,240,240,240,240,0,57,26,0,106,17,
+            0,223,0,0,255,0,0,140,11,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,16,
             134,46,56,218,54,27,209,26,12,222,11,0,238,0,0,255,0,0,255,0,0,201,0,0,105,
-            17,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,78,24,0,202,1,0,227,0,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,93,27,23,202,26,14,223,14,4,
-            239,4,0,255,0,0,255,0,0,255,0,0,255,0,0,244,0,0,74,22,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,0,71,22,0,175,4,0,95,17,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,2,174,18,4,247,3,0,255,0,0,255,0,0,255,0,0,
-            255,0,0,255,0,0,130,13,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,5,93,47,11,107,54,0,77,20,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            0,103,22,0,250,0,0,255,0,0,255,0,0,255,0,0,201,2,0,95,17,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,26,110,67,136,192,166,242,255,251,252,255,255,30,116,
-            71,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,141,12,0,241,0,
-            0,191,3,0,108,15,0,52,22,212,208,200,212,208,200,212,208,200,212,208,200,0,90,39,108,
-            180,138,231,255,234,242,255,240,216,255,216,205,255,201,120,207,137,0,74,23,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,7,100,53,0,79,23,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,2,99,39,118,215,134,166,250,162,136,236,136,116,229,116,100,
-            223,100,85,220,85,71,220,71,3,117,34,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,78,150,113,90,159,123,0,59,14,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            17,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,78,24,0,202,1,0,227,0,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,93,27,23,202,26,14,223,14,4,
+            239,4,0,255,0,0,255,0,0,255,0,0,255,0,0,244,0,0,74,22,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,0,71,22,0,175,4,0,95,17,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,2,174,18,4,247,3,0,255,0,0,255,0,0,255,0,0,
+            255,0,0,255,0,0,130,13,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,5,93,47,11,107,54,0,77,20,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            0,103,22,0,250,0,0,255,0,0,255,0,0,255,0,0,201,2,0,95,17,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,26,110,67,136,192,166,242,255,251,252,255,255,30,116,
+            71,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,141,12,0,241,0,
+            0,191,3,0,108,15,0,52,22,240,240,240,240,240,240,240,240,240,240,240,240,0,90,39,108,
+            180,138,231,255,234,242,255,240,216,255,216,205,255,201,120,207,137,0,74,23,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,7,100,53,0,79,23,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,2,99,39,118,215,134,166,250,162,136,236,136,116,229,116,100,
+            223,100,85,220,85,71,220,71,3,117,34,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,78,150,113,90,159,123,0,59,14,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             11,117,44,68,220,69,48,218,48,37,215,37,27,216,27,18,221,18,11,228,11,4,242,4,0,
-            193,9,0,116,32,212,208,200,212,208,200,212,208,200,212,208,200,19,109,59,200,253,202,63,158,
-            94,0,71,22,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,97,23,11,201,17,
-            2,247,1,0,255,0,0,255,0,0,255,0,0,255,0,0,255,0,0,192,8,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,81,190,101,135,244,131,55,179,76,0,97,33,0,65,
-            25,212,208,200,212,208,200,0,70,26,0,127,24,22,209,24,14,226,14,2,242,2,0,255,0,
-            0,226,0,0,239,0,0,228,0,0,88,22,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,0,100,34,55,209,59,53,219,50,34,202,36,7,168,25,0,140,20,0,147,17,0,197,
+            193,9,0,116,32,240,240,240,240,240,240,240,240,240,240,240,240,19,109,59,200,253,202,63,158,
+            94,0,71,22,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,97,23,11,201,17,
+            2,247,1,0,255,0,0,255,0,0,255,0,0,255,0,0,255,0,0,192,8,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,81,190,101,135,244,131,55,179,76,0,97,33,0,65,
+            25,240,240,240,240,240,240,0,70,26,0,127,24,22,209,24,14,226,14,2,242,2,0,255,0,
+            0,226,0,0,239,0,0,228,0,0,88,22,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,0,100,34,55,209,59,53,219,50,34,202,36,7,168,25,0,140,20,0,147,17,0,197,
             11,2,246,2,0,253,0,0,255,0,0,255,0,0,209,0,0,73,24,0,71,22,0,73,23,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,117,25,9,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,117,25,9,
             221,12,5,244,3,1,252,0,0,255,0,0,255,0,0,255,0,0,255,0,0,255,0,0,255,
-            0,0,228,0,0,88,22,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,0,110,17,0,222,0,0,255,0,0,
-            255,0,0,255,0,0,255,0,0,255,0,0,255,0,0,182,5,0,80,22,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,0,116,15,0,161,8,0,185,4,0,178,6,0,
-            144,12,0,93,19,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            0,0,228,0,0,88,22,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,0,110,17,0,222,0,0,255,0,0,
+            255,0,0,255,0,0,255,0,0,255,0,0,255,0,0,182,5,0,80,22,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,0,116,15,0,161,8,0,185,4,0,178,6,0,
+            144,12,0,93,19,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 22, 20, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -7563,40 +7415,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,70,73,124,73,77,145,73,77,125,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,130,130,161,45,48,129,55,56,116,212,208,200,212,208,200,212,208,200,
-            212,208,200,217,221,221,168,174,181,190,194,199,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,115,116,140,57,62,120,51,59,125,121,122,153,212,208,200,212,208,200,212,208,200,212,208,
-            200,170,177,180,146,158,174,141,158,182,152,164,175,212,208,200,212,208,200,212,208,200,158,157,179,
-            69,71,121,66,75,116,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,196,207,219,130,152,186,138,164,187,175,183,191,212,208,200,212,208,200,48,81,137,57,84,
-            131,212,208,200,212,208,200,212,208,200,116,127,150,111,144,184,120,153,196,124,131,155,212,208,200,
-            212,208,200,184,185,195,122,148,214,119,138,193,212,208,200,154,155,166,67,100,157,104,117,149,212,
-            208,200,212,208,200,56,74,119,95,124,179,102,139,182,108,147,184,91,119,186,84,102,155,212,208,
-            200,212,208,200,125,149,184,128,146,208,172,177,186,110,120,142,77,108,164,212,208,200,212,208,200,
-            102,122,145,91,137,196,75,115,182,63,102,164,107,150,194,53,106,169,36,77,179,89,100,138,212,
-            208,200,212,208,200,116,130,200,128,132,148,119,135,166,80,111,165,212,208,200,212,208,200,18,82,
-            148,82,150,210,60,110,184,73,109,202,111,154,215,54,130,164,46,104,206,44,72,156,212,208,200,
-            212,208,200,96,108,183,129,131,154,122,140,171,87,116,171,212,208,200,212,208,200,37,102,164,58,
-            134,187,100,156,222,115,159,225,131,178,219,85,161,188,114,172,246,87,113,193,212,208,200,212,208,
-            200,86,94,172,123,124,149,126,137,159,109,140,196,212,208,200,212,208,200,138,158,176,85,144,200,
-            136,189,229,133,183,214,142,194,212,115,176,217,127,169,243,127,138,168,212,208,200,212,208,200,84,
-            92,164,116,117,142,176,179,188,115,153,208,112,130,159,212,208,200,212,208,200,118,148,180,138,183,
-            220,171,225,239,159,215,216,142,184,226,136,157,194,212,208,200,212,208,200,90,105,143,80,87,151,
-            150,152,164,212,208,200,104,144,197,115,151,195,125,129,135,212,208,200,212,208,200,163,178,193,137,
-            182,219,148,199,212,159,173,187,212,208,200,212,208,200,212,208,200,62,74,141,61,68,125,212,208,
-            200,212,208,200,176,182,189,139,156,178,117,142,169,111,126,141,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,64,72,108,70,65,104,159,157,171,212,208,200,212,
-            208,200,212,208,200,150,158,168,147,165,185,139,160,184,166,164,170,212,208,200,212,208,200,212,208,
-            200,212,208,200,103,105,142,59,61,127,48,50,122,115,113,133,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,178,182,187,146,155,169,193,191,195,212,208,200,212,208,200,212,208,200,139,
-            140,151,52,51,111,49,47,122,127,127,166,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,123,123,135,
-            80,79,131,69,68,129,59,59,120,212,208,200,212,208,200,212,208,200
+            240,240,240,240,240,240,240,240,240,70,73,124,73,77,145,73,77,125,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,130,130,161,45,48,129,55,56,116,240,240,240,240,240,240,240,240,240,
+            240,240,240,217,221,221,168,174,181,190,194,199,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,115,116,140,57,62,120,51,59,125,121,122,153,240,240,240,240,240,240,240,240,240,240,240,
+            240,170,177,180,146,158,174,141,158,182,152,164,175,240,240,240,240,240,240,240,240,240,158,157,179,
+            69,71,121,66,75,116,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,196,207,219,130,152,186,138,164,187,175,183,191,240,240,240,240,240,240,48,81,137,57,84,
+            131,240,240,240,240,240,240,240,240,240,116,127,150,111,144,184,120,153,196,124,131,155,240,240,240,
+            240,240,240,184,185,195,122,148,214,119,138,193,240,240,240,154,155,166,67,100,157,104,117,149,240,
+            240,240,240,240,240,56,74,119,95,124,179,102,139,182,108,147,184,91,119,186,84,102,155,240,240,
+            240,240,240,240,125,149,184,128,146,208,172,177,186,110,120,142,77,108,164,240,240,240,240,240,240,
+            102,122,145,91,137,196,75,115,182,63,102,164,107,150,194,53,106,169,36,77,179,89,100,138,240,
+            240,240,240,240,240,116,130,200,128,132,148,119,135,166,80,111,165,240,240,240,240,240,240,18,82,
+            148,82,150,210,60,110,184,73,109,202,111,154,215,54,130,164,46,104,206,44,72,156,240,240,240,
+            240,240,240,96,108,183,129,131,154,122,140,171,87,116,171,240,240,240,240,240,240,37,102,164,58,
+            134,187,100,156,222,115,159,225,131,178,219,85,161,188,114,172,246,87,113,193,240,240,240,240,240,
+            240,86,94,172,123,124,149,126,137,159,109,140,196,240,240,240,240,240,240,138,158,176,85,144,200,
+            136,189,229,133,183,214,142,194,212,115,176,217,127,169,243,127,138,168,240,240,240,240,240,240,84,
+            92,164,116,117,142,176,179,188,115,153,208,112,130,159,240,240,240,240,240,240,118,148,180,138,183,
+            220,171,225,239,159,215,216,142,184,226,136,157,194,240,240,240,240,240,240,90,105,143,80,87,151,
+            150,152,164,240,240,240,104,144,197,115,151,195,125,129,135,240,240,240,240,240,240,163,178,193,137,
+            182,219,148,199,212,159,173,187,240,240,240,240,240,240,240,240,240,62,74,141,61,68,125,240,240,
+            240,240,240,240,176,182,189,139,156,178,117,142,169,111,126,141,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,64,72,108,70,65,104,159,157,171,240,240,240,240,
+            240,240,240,240,240,150,158,168,147,165,185,139,160,184,166,164,170,240,240,240,240,240,240,240,240,
+            240,240,240,240,103,105,142,59,61,127,48,50,122,115,113,133,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,178,182,187,146,155,169,193,191,195,240,240,240,240,240,240,240,240,240,139,
+            140,151,52,51,111,49,47,122,127,127,166,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,123,123,135,
+            80,79,131,69,68,129,59,59,120,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -7604,132 +7456,132 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,166,179,208,208,215,230,232,235,243,240,242,246,231,235,242,210,217,233,
-            172,184,215,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,158,171,206,236,238,246,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,166,179,208,208,215,230,232,235,243,240,242,246,231,235,242,210,217,233,
+            172,184,215,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,158,171,206,236,238,246,
             253,253,254,253,253,254,248,249,252,243,245,248,244,246,249,248,249,252,253,253,255,255,255,255,254,
-            254,255,240,243,253,167,181,215,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,214,219,236,251,250,255,241,243,249,239,241,249,235,
+            254,255,240,243,253,167,181,215,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,214,219,236,251,250,255,241,243,249,239,241,249,235,
             238,246,232,234,243,230,233,241,237,238,246,239,240,247,237,240,247,237,239,247,237,239,247,240,241,
-            248,249,249,255,221,226,245,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,218,222,239,238,239,248,230,232,244,223,225,237,212,216,227,212,216,228,205,211,
+            248,249,249,255,221,226,245,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,218,222,239,238,239,248,230,232,244,223,225,237,212,216,227,212,216,228,205,211,
             226,215,220,233,234,236,245,232,235,244,232,234,244,231,233,243,230,232,243,229,232,243,227,230,242,
-            234,236,246,222,227,244,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,188,195,
+            234,236,246,222,227,244,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,188,195,
             226,229,231,244,211,215,231,190,195,211,180,186,202,177,184,199,177,185,201,175,183,203,184,191,211,
             226,228,240,233,235,246,229,231,243,228,230,242,226,229,241,221,224,238,221,224,238,219,222,237,225,
-            227,241,192,198,229,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,201,207,230,176,185,208,
+            227,241,192,198,229,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,201,207,230,176,185,208,
             160,168,187,157,165,184,159,168,192,160,171,198,160,171,202,154,168,201,191,199,222,222,225,237,200,
             205,220,219,222,236,220,223,237,204,208,224,207,211,227,217,220,237,213,217,235,211,215,234,212,215,
-            235,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,132,145,195,155,167,198,136,147,172,139,151,179,141,
+            235,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,132,145,195,155,167,198,136,147,172,139,151,179,141,
             155,189,142,157,195,140,156,194,136,153,191,163,175,206,218,221,237,218,220,234,198,203,219,200,205,
-            221,179,185,205,189,194,213,214,217,235,214,217,235,209,213,232,204,209,231,202,206,229,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,84,105,166,118,132,168,123,135,168,124,142,185,124,142,186,122,140,
+            221,179,185,205,189,194,213,214,217,235,214,217,235,209,213,232,204,209,231,202,206,229,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,84,105,166,118,132,168,123,135,168,124,142,185,124,142,186,122,140,
             184,126,144,186,175,185,213,224,227,240,230,231,243,229,231,243,230,233,244,224,227,240,218,221,236,
-            220,223,240,214,218,236,209,214,233,205,209,231,200,204,228,194,199,226,151,160,205,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,10,41,115,82,99,143,108,126,172,105,125,175,105,125,174,100,120,171,139,154,193,
+            220,223,240,214,218,236,209,214,233,205,209,231,200,204,228,194,199,226,151,160,205,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,10,41,115,82,99,143,108,126,172,105,125,175,105,125,174,100,120,171,139,154,193,
             231,233,244,229,232,243,229,232,242,231,233,243,230,232,243,227,230,242,223,226,240,216,220,237,213,
-            216,235,203,208,229,198,203,227,197,202,228,184,191,222,140,150,199,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,92,111,175,
+            216,235,203,208,229,198,203,227,197,202,228,184,191,222,140,150,199,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,92,111,175,
             38,61,123,34,59,122,78,102,161,86,109,166,86,108,164,83,106,161,96,117,169,197,204,226,241,
             242,249,239,240,248,241,242,249,234,236,245,230,232,243,223,227,240,217,220,237,212,216,235,201,206,
-            228,173,180,207,186,192,220,141,151,192,140,150,199,135,146,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,143,152,202,146,155,202,124,
+            228,173,180,207,186,192,220,141,151,192,140,150,199,135,146,200,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,143,152,202,146,155,202,124,
             136,184,95,112,162,65,88,145,67,92,153,67,92,154,61,87,151,85,108,164,199,206,225,227,230,
             238,217,219,230,238,239,247,233,235,244,224,227,241,216,219,237,209,213,233,204,208,231,179,186,214,
-            161,169,205,88,102,149,100,116,172,99,117,178,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,138,148,199,147,157,203,164,172,213,172,179,
+            161,169,205,88,102,149,100,116,172,99,117,178,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,138,148,199,147,157,203,164,172,213,172,179,
             214,83,98,138,35,60,119,47,75,145,48,76,144,45,72,142,52,78,143,55,79,139,69,91,144,
             228,230,239,238,239,248,224,227,240,215,219,236,207,211,232,198,203,227,186,192,223,110,125,177,81,
-            98,149,42,66,133,73,96,163,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,139,149,199,146,156,203,157,165,208,171,178,215,186,192,223,
+            98,149,42,66,133,73,96,163,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,139,149,199,146,156,203,157,165,208,171,178,215,186,192,223,
             101,114,152,14,40,105,25,56,133,28,58,133,27,57,132,24,54,132,24,54,130,178,186,208,242,
             243,250,221,225,239,211,214,234,201,206,229,196,201,228,105,122,174,6,31,96,46,66,121,112,128,
-            183,77,99,165,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,140,150,202,145,155,202,156,164,207,171,178,215,168,176,208,64,81,126,8,
+            183,77,99,165,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,140,150,202,145,155,202,156,164,207,171,178,215,168,176,208,64,81,126,8,
             38,110,13,45,125,14,46,125,14,46,125,15,46,125,3,35,117,136,149,185,241,241,251,216,219,
             236,206,210,231,204,208,231,165,175,211,20,47,116,18,46,115,61,85,150,31,60,135,13,46,126,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,140,151,202,145,155,202,155,164,208,183,190,226,99,112,153,0,24,89,14,47,128,14,46,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,140,151,202,145,155,202,155,164,208,183,190,226,99,112,153,0,24,89,14,47,128,14,46,
             125,14,46,125,14,46,125,14,46,125,0,33,116,114,131,175,233,234,247,210,214,234,201,206,229,
-            161,172,208,70,94,159,2,30,100,24,42,93,115,129,178,115,130,184,68,91,161,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,134,146,
+            161,172,208,70,94,159,2,30,100,24,42,93,115,129,178,115,130,184,68,91,161,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,134,146,
             201,150,159,205,138,148,193,89,103,150,36,63,132,10,43,121,14,46,125,14,46,125,14,46,125,
             14,46,125,13,46,125,7,41,122,44,72,140,197,202,225,213,216,236,179,187,218,115,132,182,23,
-            54,128,8,35,103,13,31,80,128,138,184,157,165,211,109,126,189,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,109,126,189,151,161,209,
+            54,128,8,35,103,13,31,80,128,138,184,157,165,211,109,126,189,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,109,126,189,151,161,209,
             70,85,135,0,21,84,10,43,125,15,47,126,14,46,125,14,46,125,16,47,126,17,49,127,19,
             50,128,18,50,128,9,42,123,127,141,186,185,192,221,80,102,163,18,50,126,5,34,107,49,74,
-            142,30,54,116,111,125,176,149,158,207,64,87,158,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,126,139,197,40,65,132,14,
+            142,30,54,116,111,125,176,149,158,207,64,87,158,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,126,139,197,40,65,132,14,
             38,98,12,43,122,15,47,126,20,51,129,25,55,132,30,59,134,33,62,136,35,63,137,35,63,
             137,32,61,135,39,66,140,35,64,137,14,46,126,13,45,124,14,45,123,64,89,155,34,63,138,
-            40,68,140,57,83,156,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,87,108,176,70,93,161,32,59,126,25,55,
+            40,68,140,57,83,156,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,87,108,176,70,93,161,32,59,126,25,55,
             127,26,57,133,34,63,136,40,68,140,45,72,143,49,75,145,51,77,146,52,77,146,50,76,146,
             44,72,143,39,67,139,35,63,136,27,57,133,21,52,130,28,58,132,39,67,139,23,55,132,7,
-            40,120,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,63,88,162,36,66,139,55,81,148,55,81,148,
+            40,120,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,63,88,162,36,66,139,55,81,148,55,81,148,
             54,80,147,56,81,148,60,85,151,64,88,153,67,90,155,67,90,155,65,89,154,61,86,151,56,
-            82,149,52,77,145,49,76,145,51,77,145,48,75,144,30,60,136,14,48,132,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,39,69,148,58,83,150,76,98,159,83,104,163,86,
+            82,149,52,77,145,49,76,145,51,77,145,48,75,144,30,60,136,14,48,132,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,39,69,148,58,83,150,76,98,159,83,104,163,86,
             106,165,88,108,166,90,109,167,90,109,167,89,109,167,89,109,166,87,107,165,84,105,164,81,102,
-            162,77,99,160,69,92,155,48,76,146,26,58,139,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,61,86,157,77,100,164,92,112,168,102,120,174,109,126,
+            162,77,99,160,69,92,155,48,76,146,26,58,139,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,61,86,157,77,100,164,92,112,168,102,120,174,109,126,
             177,114,130,180,117,132,181,117,132,181,115,131,180,111,127,178,104,122,175,95,114,170,85,105,165,
-            68,92,160,45,72,144,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,68,85,138,103,121,182,127,140,198,126,139,193,131,143,193,
-            131,143,191,132,145,192,131,143,191,124,138,188,113,129,184,98,117,179,79,100,165,48,67,120,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,74,82,120,104,116,165,122,133,186,125,136,191,125,
-            137,191,124,136,191,116,129,183,91,103,151,50,61,96,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,30,34,46,155,159,176,168,172,188,78,81,
-            101,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,198,197,201,223,223,220,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,132,132,150,132,132,145,224,224,227,242,242,242,154,154,160,120,120,131,91,91,109,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,168,168,180,203,203,209,197,197,204,197,197,204,202,202,208,159,159,171,207,
+            68,92,160,45,72,144,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,68,85,138,103,121,182,127,140,198,126,139,193,131,143,193,
+            131,143,191,132,145,192,131,143,191,124,138,188,113,129,184,98,117,179,79,100,165,48,67,120,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,74,82,120,104,116,165,122,133,186,125,136,191,125,
+            137,191,124,136,191,116,129,183,91,103,151,50,61,96,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,30,34,46,155,159,176,168,172,188,78,81,
+            101,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,198,197,201,223,223,220,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,132,132,150,132,132,145,224,224,227,242,242,242,154,154,160,120,120,131,91,91,109,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,168,168,180,203,203,209,197,197,204,197,197,204,202,202,208,159,159,171,207,
             207,208,233,233,232,223,223,223,222,222,222,229,229,229,229,229,228,164,164,171,146,146,154,192,192,
-            199,198,198,205,197,197,204,206,206,211,140,140,152,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,177,177,182,216,216,214,210,210,209,210,210,209,215,215,213,168,168,174,179,179,181,196,196,
+            199,198,198,205,197,197,204,206,206,211,140,140,152,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,177,177,182,216,216,214,210,210,209,210,210,209,215,215,213,168,168,174,179,179,181,196,196,
             195,193,193,193,193,193,193,194,194,194,191,191,191,153,153,159,158,158,160,204,204,203,211,211,210,
-            210,210,209,220,220,218,148,148,155,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,85,85,
+            210,210,209,220,220,218,148,148,155,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,85,85,
             93,93,93,98,91,91,97,91,91,97,89,89,95,100,100,110,164,164,167,168,168,169,166,166,167,
             166,166,167,167,167,168,167,167,167,133,133,140,69,69,75,88,88,92,92,92,98,91,91,97,94,
-            94,100,73,73,81,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,51,51,56,49,49,54,50,50,55,50,50,55,50,
-            50,55,50,50,55,40,40,44,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            94,100,73,73,81,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,51,51,56,49,49,54,50,50,55,50,50,55,50,
+            50,55,50,50,55,40,40,44,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -7737,132 +7589,132 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,155,54,0,
-            177,84,11,171,76,8,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,158,59,0,180,93,20,219,162,92,250,214,154,176,
-            86,17,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,159,62,0,190,114,37,231,185,103,254,225,154,255,245,199,247,208,152,160,62,0,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,161,65,2,194,118,31,235,186,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,155,54,0,
+            177,84,11,171,76,8,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,158,59,0,180,93,20,219,162,92,250,214,154,176,
+            86,17,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,159,62,0,190,114,37,231,185,103,254,225,154,255,245,199,247,208,152,160,62,0,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,161,65,2,194,118,31,235,186,
             78,255,224,110,255,219,106,255,202,78,255,216,131,242,196,129,178,90,27,161,64,3,154,54,0,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,195,117,24,239,188,57,255,217,74,255,216,72,255,207,61,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,195,117,24,239,188,57,255,217,74,255,216,72,255,207,61,
             255,197,53,255,192,54,255,209,122,255,217,154,253,215,159,240,192,137,210,141,85,172,80,19,153,
-            54,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,187,104,19,249,202,61,255,215,65,255,207,62,255,205,62,255,198,59,255,
+            54,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,187,104,19,249,202,61,255,215,65,255,207,62,255,205,62,255,198,59,255,
             192,58,255,191,74,255,189,86,255,194,106,255,207,141,255,219,168,248,200,152,204,127,70,158,59,
-            0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,177,90,13,242,191,56,255,216,67,255,203,62,255,196,59,255,189,56,255,185,
+            0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,177,90,13,242,191,56,255,216,67,255,203,62,255,196,59,255,189,56,255,185,
             51,255,179,48,255,168,44,255,162,49,255,172,81,255,196,134,255,209,161,224,151,98,161,65,5,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,173,82,10,239,185,53,255,212,65,255,194,58,255,187,55,254,189,56,250,186,54,
-            255,185,53,255,176,49,255,153,36,255,147,46,255,174,103,255,199,148,226,148,92,159,61,1,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,167,75,6,234,177,50,255,206,62,255,187,55,252,188,55,179,92,12,184,95,16,222,
-            144,36,254,177,51,255,156,40,255,135,35,255,162,89,255,186,129,211,122,59,154,56,0,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,165,72,5,236,179,51,255,209,64,248,184,53,162,68,2,212,208,200,153,55,0,187,97,
-            16,249,172,49,255,154,40,255,130,36,255,163,92,254,168,102,178,80,15,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,172,82,10,232,174,48,242,181,52,161,64,0,212,208,200,212,208,200,151,54,0,186,95,15,
-            250,168,47,255,141,34,255,139,53,255,164,90,217,117,46,153,56,0,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,155,57,0,180,92,26,197,128,67,196,126,63,197,125,59,173,83,
-            15,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            163,68,2,192,110,21,159,64,0,212,208,200,212,208,200,212,208,200,152,53,0,195,104,19,255,
-            167,46,255,134,35,255,143,56,250,141,59,170,70,4,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,155,60,0,223,122,34,255,203,105,255,232,173,255,243,208,183,101,33,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,156,58,0,229,142,36,255,153,
-            41,255,128,32,255,137,43,199,92,17,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            158,62,0,229,121,26,255,169,35,255,203,111,252,227,187,170,79,14,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,193,101,17,255,164,46,255,130,31,
-            255,131,32,223,106,21,156,59,0,212,208,200,212,208,200,212,208,200,212,208,200,158,62,0,228,
-            124,28,255,167,39,255,201,113,251,218,169,170,78,12,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,170,75,6,252,162,45,255,135,34,255,129,31,238,
-            117,26,161,63,0,212,208,200,212,208,200,212,208,200,212,208,200,156,60,0,222,118,26,255,164,
-            39,255,193,103,254,216,160,180,90,18,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,161,66,1,244,156,42,255,140,37,255,127,31,247,123,29,164,65,
-            1,212,208,200,212,208,200,212,208,200,212,208,200,152,56,0,209,107,21,255,160,39,255,183,87,
-            255,215,151,201,117,42,151,52,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,161,65,1,240,153,40,255,142,37,255,127,31,250,124,29,164,65,1,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,188,88,12,255,152,39,255,170,65,255,206,136,233,
-            160,81,157,58,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,157,59,0,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            164,68,2,250,165,46,255,142,37,255,131,32,249,124,29,163,65,1,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,164,67,2,245,140,35,255,158,46,255,187,105,255,195,118,191,97,
-            21,151,53,0,212,208,200,212,208,200,212,208,200,212,208,200,166,69,2,158,59,0,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,167,72,5,226,
-            136,33,228,114,25,228,110,23,215,101,18,160,62,0,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,154,56,0,211,111,22,255,155,39,255,165,66,255,192,116,244,169,87,171,73,6,
-            212,208,200,212,208,200,212,208,200,153,54,0,206,126,53,216,143,70,157,56,0,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,158,61,0,157,60,0,157,60,
-            0,157,60,0,157,60,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,176,79,7,254,150,39,255,150,41,255,173,86,255,193,117,231,147,66,162,63,1,153,
-            54,0,212,208,200,153,52,0,216,148,86,255,246,211,218,145,73,157,56,0,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,154,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,173,82,10,239,185,53,255,212,65,255,194,58,255,187,55,254,189,56,250,186,54,
+            255,185,53,255,176,49,255,153,36,255,147,46,255,174,103,255,199,148,226,148,92,159,61,1,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,167,75,6,234,177,50,255,206,62,255,187,55,252,188,55,179,92,12,184,95,16,222,
+            144,36,254,177,51,255,156,40,255,135,35,255,162,89,255,186,129,211,122,59,154,56,0,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,165,72,5,236,179,51,255,209,64,248,184,53,162,68,2,240,240,240,153,55,0,187,97,
+            16,249,172,49,255,154,40,255,130,36,255,163,92,254,168,102,178,80,15,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,172,82,10,232,174,48,242,181,52,161,64,0,240,240,240,240,240,240,151,54,0,186,95,15,
+            250,168,47,255,141,34,255,139,53,255,164,90,217,117,46,153,56,0,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,155,57,0,180,92,26,197,128,67,196,126,63,197,125,59,173,83,
+            15,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            163,68,2,192,110,21,159,64,0,240,240,240,240,240,240,240,240,240,152,53,0,195,104,19,255,
+            167,46,255,134,35,255,143,56,250,141,59,170,70,4,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,155,60,0,223,122,34,255,203,105,255,232,173,255,243,208,183,101,33,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,156,58,0,229,142,36,255,153,
+            41,255,128,32,255,137,43,199,92,17,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            158,62,0,229,121,26,255,169,35,255,203,111,252,227,187,170,79,14,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,193,101,17,255,164,46,255,130,31,
+            255,131,32,223,106,21,156,59,0,240,240,240,240,240,240,240,240,240,240,240,240,158,62,0,228,
+            124,28,255,167,39,255,201,113,251,218,169,170,78,12,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,170,75,6,252,162,45,255,135,34,255,129,31,238,
+            117,26,161,63,0,240,240,240,240,240,240,240,240,240,240,240,240,156,60,0,222,118,26,255,164,
+            39,255,193,103,254,216,160,180,90,18,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,161,66,1,244,156,42,255,140,37,255,127,31,247,123,29,164,65,
+            1,240,240,240,240,240,240,240,240,240,240,240,240,152,56,0,209,107,21,255,160,39,255,183,87,
+            255,215,151,201,117,42,151,52,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,161,65,1,240,153,40,255,142,37,255,127,31,250,124,29,164,65,1,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,188,88,12,255,152,39,255,170,65,255,206,136,233,
+            160,81,157,58,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,157,59,0,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            164,68,2,250,165,46,255,142,37,255,131,32,249,124,29,163,65,1,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,164,67,2,245,140,35,255,158,46,255,187,105,255,195,118,191,97,
+            21,151,53,0,240,240,240,240,240,240,240,240,240,240,240,240,166,69,2,158,59,0,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,167,72,5,226,
+            136,33,228,114,25,228,110,23,215,101,18,160,62,0,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,154,56,0,211,111,22,255,155,39,255,165,66,255,192,116,244,169,87,171,73,6,
+            240,240,240,240,240,240,240,240,240,153,54,0,206,126,53,216,143,70,157,56,0,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,158,61,0,157,60,0,157,60,
+            0,157,60,0,157,60,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,176,79,7,254,150,39,255,150,41,255,173,86,255,193,117,231,147,66,162,63,1,153,
+            54,0,240,240,240,153,52,0,216,148,86,255,246,211,218,145,73,157,56,0,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,154,
             57,0,213,113,23,255,153,40,255,150,46,255,172,88,255,188,114,235,156,81,185,91,23,158,59,
-            0,153,49,0,227,159,95,255,241,216,255,243,219,220,156,96,159,57,0,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,161,64,
+            0,153,49,0,227,159,95,255,241,216,255,243,219,220,156,96,159,57,0,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,161,64,
             1,233,132,32,255,151,38,255,144,41,255,163,75,255,186,112,255,189,119,234,159,90,213,128,57,
-            247,188,129,255,203,143,255,189,113,255,238,208,225,169,118,161,61,0,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,167,68,3,
+            247,188,129,255,203,143,255,189,113,255,238,208,225,169,118,161,61,0,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,167,68,3,
             235,135,33,255,152,40,255,140,34,255,148,51,255,167,83,255,188,118,255,202,139,255,210,162,255,
-            179,100,255,142,22,255,168,72,255,227,185,230,180,134,164,66,5,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,165,66,2,223,
+            179,100,255,142,22,255,168,72,255,227,185,230,180,134,164,66,5,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,165,66,2,223,
             122,28,255,153,41,255,146,36,255,138,33,255,141,39,255,151,56,255,163,76,255,154,56,255,145,
-            36,255,145,32,255,153,45,255,207,146,234,187,142,170,77,18,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,156,59,0,191,90,
+            36,255,145,32,255,153,45,255,207,146,234,187,142,170,77,18,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,156,59,0,191,90,
             13,234,132,32,255,149,40,255,149,39,255,142,34,255,137,30,255,139,34,255,143,37,255,143,38,
-            255,144,35,255,146,33,255,189,110,222,159,106,158,61,3,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,159,61,0,
+            255,144,35,255,146,33,255,189,110,222,159,106,158,61,3,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,159,61,0,
             182,82,9,204,104,20,239,133,32,255,143,37,255,135,34,255,139,35,255,142,37,255,141,37,237,
-            123,28,196,90,8,165,71,9,158,60,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,150,
+            123,28,196,90,8,165,71,9,158,60,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,150,
             52,0,219,114,24,255,152,41,255,145,38,255,143,37,233,121,28,193,88,13,160,63,0,152,57,
-            0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,160,61,0,239,134,
-            33,253,152,41,221,114,24,187,83,10,159,62,0,153,57,0,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,163,65,1,211,103,19,178,77,7,
-            154,57,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,160,61,0,239,134,
+            33,253,152,41,221,114,24,187,83,10,159,62,0,153,57,0,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,163,65,1,211,103,19,178,77,7,
+            154,57,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -7870,132 +7722,132 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,140,181,226,140,195,243,135,197,
-            246,139,200,247,142,203,247,139,200,247,155,197,234,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,133,178,227,136,198,246,154,213,249,158,216,249,161,219,250,164,221,250,
-            167,224,250,169,226,251,171,227,251,161,219,250,153,205,241,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,140,181,226,140,195,243,135,197,
+            246,139,200,247,142,203,247,139,200,247,155,197,234,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,133,178,227,136,198,246,154,213,249,158,216,249,161,219,250,164,221,250,
+            167,224,250,169,226,251,171,227,251,161,219,250,153,205,241,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             122,182,241,151,210,248,159,217,249,165,222,250,170,226,251,172,228,251,174,229,251,162,220,250,170,
-            226,251,175,230,251,179,234,252,178,233,252,166,223,250,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,121,181,240,152,211,248,164,
+            226,251,175,230,251,179,234,252,178,233,252,166,223,250,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,121,181,240,152,211,248,164,
             222,250,175,230,251,182,237,252,187,240,253,184,238,253,186,240,253,181,236,252,160,218,249,163,220,
-            250,171,227,251,182,237,252,187,241,253,175,230,251,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,125,174,227,149,209,248,163,221,250,177,233,252,190,243,
+            250,171,227,251,182,237,252,187,241,253,175,230,251,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,125,174,227,149,209,248,163,221,250,177,233,252,190,243,
             253,199,251,254,204,253,255,204,253,255,172,228,251,197,249,254,184,238,253,173,229,251,176,232,252,
-            178,233,252,187,241,253,193,245,254,178,229,247,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,137,198,247,156,215,249,173,229,251,189,242,253,203,253,255,214,255,255,
+            178,233,252,187,241,253,193,245,254,178,229,247,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,137,198,247,156,215,249,173,229,251,189,242,253,203,253,255,214,255,255,
             220,255,255,220,255,255,181,233,252,187,239,253,205,252,255,183,238,252,187,240,253,189,242,253,190,
-            243,253,197,249,254,195,247,254,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            243,253,197,249,254,195,247,254,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             125,166,214,152,211,248,161,219,250,179,234,252,196,248,254,212,255,255,225,255,255,235,255,255,235,
             255,255,191,239,253,183,238,252,216,254,255,194,246,254,197,249,254,199,251,254,200,252,255,200,252,
-            255,205,255,255,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,137,192,240,155,
+            255,205,255,255,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,137,192,240,155,
             214,249,165,223,250,181,236,252,199,251,255,216,255,255,231,255,255,246,255,255,238,253,255,186,240,
             253,192,245,254,219,253,255,203,254,255,206,255,255,208,255,255,208,255,255,208,255,255,209,255,255,
-            206,255,255,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,136,198,247,158,216,249,168,225,
+            206,255,255,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,136,198,247,158,216,249,168,225,
             251,178,234,252,198,249,254,213,255,255,228,255,255,232,253,255,197,243,253,193,246,254,203,252,255,
-            229,255,255,210,255,255,212,255,255,214,255,255,215,255,255,215,255,255,214,255,255,213,255,255,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,144,204,247,160,218,249,169,226,251,174,230,251,
+            229,255,255,210,255,255,212,255,255,214,255,255,215,255,255,215,255,255,214,255,255,213,255,255,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,144,204,247,160,218,249,169,226,251,174,230,251,
             162,220,250,176,230,251,186,236,252,183,237,252,192,245,254,200,252,255,226,255,255,222,255,255,215,
-            255,255,219,255,255,221,255,255,222,255,255,222,255,255,220,255,255,219,255,255,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,139,200,247,162,220,250,170,226,251,179,234,252,182,236,252,171,
+            255,255,219,255,255,221,255,255,222,255,255,222,255,255,220,255,255,219,255,255,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,139,200,247,162,220,250,170,226,251,179,234,252,182,236,252,171,
             227,251,178,234,252,188,242,253,198,250,254,221,255,255,233,255,255,216,255,255,221,255,255,224,255,
-            255,227,255,255,228,255,255,228,255,255,226,255,255,224,255,255,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,135,193,239,164,221,250,171,227,251,157,215,249,180,235,252,200,251,254,203,250,
+            255,227,255,255,228,255,255,228,255,255,226,255,255,224,255,255,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,135,193,239,164,221,250,171,227,251,157,215,249,180,235,252,200,251,254,203,250,
             254,213,252,255,220,254,255,218,255,255,215,255,255,221,255,255,226,255,255,230,255,255,233,255,255,
-            235,255,255,235,255,255,232,255,255,228,255,255,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,126,165,208,165,222,250,172,228,251,164,221,250,164,221,250,174,230,251,185,239,253,195,248,254,
+            235,255,255,235,255,255,232,255,255,228,255,255,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,126,165,208,165,222,250,172,228,251,164,221,250,164,221,250,174,230,251,185,239,253,195,248,254,
             205,254,255,211,255,255,218,255,255,224,255,255,230,255,255,235,255,255,239,255,255,242,255,255,241,
-            255,255,238,255,255,224,245,247,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            255,255,238,255,255,224,245,247,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             157,216,249,173,229,251,174,230,251,166,223,250,176,232,252,187,240,253,197,249,254,206,255,255,213,
             255,255,219,255,255,226,255,255,232,255,255,238,255,255,244,255,255,248,255,255,247,255,255,242,255,
-            255,182,194,206,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,126,172,215,171,
+            255,182,194,206,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,126,172,215,171,
             227,251,180,235,252,171,228,251,177,232,252,187,241,253,198,250,254,207,255,255,213,255,255,220,255,
             255,227,255,255,233,255,255,240,255,255,246,255,255,252,255,255,250,255,255,234,244,247,105,107,137,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,151,206,241,179,234,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,151,206,241,179,234,
             252,185,239,253,179,234,252,187,240,253,197,249,254,206,255,255,213,255,255,219,255,255,226,255,255,
-            232,255,255,238,255,255,244,255,255,247,255,255,246,255,255,144,149,171,113,113,142,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,157,211,242,183,238,252,
+            232,255,255,238,255,255,244,255,255,247,255,255,246,255,255,144,149,171,113,113,142,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,157,211,242,183,238,252,
             191,244,253,188,242,253,195,247,254,204,254,255,211,255,255,217,255,255,224,255,255,229,255,255,234,
-            255,255,239,255,255,241,255,255,144,149,171,111,111,140,167,167,185,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,144,187,218,182,236,252,196,
+            255,255,239,255,255,241,255,255,144,149,171,111,111,140,167,167,185,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,144,187,218,182,236,252,196,
             248,254,199,251,255,204,254,255,209,255,255,215,255,255,220,255,255,225,255,255,230,255,255,214,234,
             238,132,138,162,114,114,143,183,183,198,154,154,175,167,167,185,189,189,202,198,139,58,199,133,42,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,150,187,211,191,241,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,150,187,211,191,241,
             250,199,250,254,208,255,255,212,255,255,216,255,255,193,219,226,144,155,176,94,96,128,100,100,132,
-            167,167,185,133,133,158,190,190,203,181,181,196,193,152,104,209,140,38,208,135,28,190,126,41,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,137,137,161,182,144,101,207,156,78,241,187,86,235,160,32,202,130,27,181,119,41,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,166,111,
-            50,204,159,87,252,241,191,247,215,140,241,188,86,235,161,33,196,126,28,171,111,41,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,163,105,40,220,168,67,
-            255,235,161,252,241,191,247,215,141,241,188,87,235,161,34,190,121,27,161,103,40,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,154,98,40,216,165,67,255,
-            234,160,252,241,191,247,215,142,241,188,88,236,161,34,184,116,27,152,96,40,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,144,90,39,212,162,65,255,234,
-            159,252,241,192,247,216,142,241,189,88,236,162,35,178,111,27,142,88,39,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,134,83,39,209,159,64,255,233,158,
-            253,241,192,247,216,143,241,189,89,236,162,36,171,107,27,132,81,39,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,125,75,38,205,156,63,255,233,157,253,
-            242,192,247,216,144,241,189,90,236,162,36,166,102,27,123,73,38,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,117,68,38,203,154,62,255,233,155,253,242,
-            193,247,217,144,241,190,90,213,145,37,118,73,46,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,116,68,38,194,146,61,255,232,154,253,242,193,
-            223,189,125,128,83,51,136,127,141,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,116,68,38,168,122,58,229,201,131,131,88,59,178,
-            169,174,106,106,137,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,116,68,38,114,69,43,132,123,138,101,101,133,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            167,167,185,133,133,158,190,190,203,181,181,196,193,152,104,209,140,38,208,135,28,190,126,41,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,137,137,161,182,144,101,207,156,78,241,187,86,235,160,32,202,130,27,181,119,41,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,166,111,
+            50,204,159,87,252,241,191,247,215,140,241,188,86,235,161,33,196,126,28,171,111,41,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,163,105,40,220,168,67,
+            255,235,161,252,241,191,247,215,141,241,188,87,235,161,34,190,121,27,161,103,40,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,154,98,40,216,165,67,255,
+            234,160,252,241,191,247,215,142,241,188,88,236,161,34,184,116,27,152,96,40,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,144,90,39,212,162,65,255,234,
+            159,252,241,192,247,216,142,241,189,88,236,162,35,178,111,27,142,88,39,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,134,83,39,209,159,64,255,233,158,
+            253,241,192,247,216,143,241,189,89,236,162,36,171,107,27,132,81,39,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,125,75,38,205,156,63,255,233,157,253,
+            242,192,247,216,144,241,189,90,236,162,36,166,102,27,123,73,38,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,117,68,38,203,154,62,255,233,155,253,242,
+            193,247,217,144,241,190,90,213,145,37,118,73,46,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,116,68,38,194,146,61,255,232,154,253,242,193,
+            223,189,125,128,83,51,136,127,141,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,116,68,38,168,122,58,229,201,131,131,88,59,178,
+            169,174,106,106,137,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,116,68,38,114,69,43,132,123,138,101,101,133,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -8003,132 +7855,132 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,28,72,
-            170,27,71,168,26,68,167,23,61,154,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,29,75,170,28,74,170,25,88,196,36,121,237,
-            39,120,233,23,66,167,22,58,152,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,31,79,173,29,80,178,31,97,202,46,129,238,60,147,253,62,148,254,61,147,254,51,
-            136,246,23,73,179,20,53,152,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,32,82,176,31,83,180,38,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,28,72,
+            170,27,71,168,26,68,167,23,61,154,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,29,75,170,28,74,170,25,88,196,36,121,237,
+            39,120,233,23,66,167,22,58,152,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,31,79,173,29,80,178,31,97,202,46,129,238,60,147,253,62,148,254,61,147,254,51,
+            136,246,23,73,179,20,53,152,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,32,82,176,31,83,180,38,
             106,209,55,139,244,71,155,254,71,154,254,70,154,254,68,153,254,67,151,254,65,150,254,60,146,
-            253,30,87,195,19,50,153,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,33,85,178,32,89,186,44,118,219,67,151,250,79,160,254,79,160,
+            253,30,87,195,19,50,153,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,33,85,178,32,89,186,44,118,219,67,151,250,79,160,254,79,160,
             254,78,160,254,78,159,254,76,159,254,75,157,254,73,156,254,71,154,254,68,153,254,66,151,254,
-            38,104,212,17,49,154,15,38,134,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,34,89,
+            38,104,212,17,49,154,15,38,134,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,34,89,
             182,34,97,196,53,125,222,75,157,251,85,165,254,86,165,254,86,166,254,87,166,254,86,165,254,
             85,165,254,84,163,254,82,162,254,80,161,254,77,159,254,75,157,254,71,155,254,68,153,254,50,
-            125,231,19,55,163,13,35,137,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,36,93,186,35,93,184,39,102,199,55,133,231,81,161,252,
+            125,231,19,55,163,13,35,137,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,36,93,186,35,93,184,39,102,199,55,133,231,81,161,252,
             89,167,254,91,169,254,93,170,254,94,171,254,94,171,254,95,171,254,94,171,254,93,170,254,91,
             169,254,89,168,254,87,166,254,84,164,254,81,162,254,78,159,254,74,157,254,70,154,254,57,139,
-            244,23,66,174,12,31,137,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            244,23,66,174,12,31,137,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             37,97,188,37,95,187,39,109,207,61,140,237,84,164,253,91,169,254,94,171,254,97,173,254,99,
             174,254,101,176,254,102,177,254,103,177,254,103,177,254,102,177,254,101,176,254,99,175,254,97,173,
             254,94,171,254,91,169,254,87,166,254,84,164,254,80,161,254,75,158,254,71,155,254,64,149,253,
-            32,84,193,10,27,135,8,21,117,212,208,200,212,208,200,212,208,200,212,208,200,37,96,188,113,
+            32,84,193,10,27,135,8,21,117,240,240,240,240,240,240,240,240,240,240,240,240,37,96,188,113,
             162,227,82,163,253,90,168,254,94,171,254,98,174,254,101,176,254,105,178,254,107,180,254,109,182,
             254,111,183,254,112,183,255,112,183,255,111,183,254,109,182,254,107,180,254,105,178,254,102,176,254,
             98,174,254,94,171,254,90,168,254,85,165,254,81,161,254,76,158,254,72,155,254,67,152,254,41,
-            105,213,9,27,137,8,18,122,212,208,200,212,208,200,212,208,200,36,94,186,86,137,237,186,213,
+            105,213,9,27,137,8,18,122,240,240,240,240,240,240,240,240,240,36,94,186,86,137,237,186,213,
             255,115,182,254,100,175,254,105,179,254,109,181,254,113,184,255,115,186,255,118,188,255,120,189,255,
             120,190,255,120,190,255,120,189,255,118,188,255,116,186,255,113,184,255,109,181,254,105,179,254,101,
             175,254,96,172,254,91,169,254,86,165,254,81,162,254,76,158,254,71,155,254,88,160,254,53,111,
-            234,7,17,127,212,208,200,212,208,200,212,208,200,35,91,185,49,111,236,68,128,254,172,200,255,
+            234,7,17,127,240,240,240,240,240,240,240,240,240,35,91,185,49,111,236,68,128,254,172,200,255,
             153,203,254,112,183,254,116,187,255,120,189,255,124,192,255,126,194,255,128,195,255,129,196,255,130,
             196,255,128,195,255,127,194,255,124,192,255,121,189,255,116,187,255,112,183,255,107,180,254,102,176,
             254,97,173,254,91,169,254,86,165,254,95,162,254,94,148,254,53,117,254,41,105,248,6,15,126,
-            212,208,200,212,208,200,212,208,200,34,89,183,53,114,236,62,125,254,64,127,254,137,177,254,175,
+            240,240,240,240,240,240,240,240,240,34,89,183,53,114,236,62,125,254,64,127,254,137,177,254,175,
             214,255,123,192,255,128,195,255,132,198,255,135,200,255,137,202,255,139,202,255,139,202,255,138,202,
             255,135,200,255,132,198,255,128,195,255,124,192,255,119,188,255,113,184,255,108,180,254,121,186,254,
-            104,166,254,87,143,254,52,110,240,31,70,190,48,75,179,32,87,224,5,13,124,212,208,200,212,
-            208,200,212,208,200,33,87,181,58,118,235,69,131,254,71,133,254,73,135,254,109,159,254,190,219,
+            104,166,254,87,143,254,52,110,240,31,70,190,48,75,179,32,87,224,5,13,124,240,240,240,240,
+            240,240,240,240,240,33,87,181,58,118,235,69,131,254,71,133,254,73,135,254,109,159,254,190,219,
             255,143,203,255,140,203,255,144,206,255,147,208,255,148,209,255,148,209,255,147,208,255,144,206,255,
             140,203,255,136,200,255,131,197,255,125,193,255,133,194,255,111,169,254,83,142,254,56,111,229,48,
-            88,194,108,125,191,188,202,237,93,109,187,29,80,215,4,10,122,212,208,200,212,208,200,212,208,
-            200,32,84,179,63,122,235,75,137,254,78,140,254,80,142,254,82,143,254,94,152,254,184,211,255,
+            88,194,108,125,191,188,202,237,93,109,187,29,80,215,4,10,122,240,240,240,240,240,240,240,240,
+            240,32,84,179,63,122,235,75,137,254,78,140,254,80,142,254,82,143,254,94,152,254,184,211,255,
             168,217,255,153,212,255,156,214,255,158,216,255,158,216,255,156,215,255,153,212,255,148,209,255,143,
             205,255,160,208,255,118,173,254,82,144,254,58,111,219,61,99,193,138,156,208,195,211,243,140,176,
-            241,56,115,231,21,56,175,32,81,214,3,8,120,212,208,200,212,208,200,212,208,200,31,82,177,
+            241,56,115,231,21,56,175,32,81,214,3,8,120,240,240,240,240,240,240,240,240,240,31,82,177,
             67,126,234,82,143,254,84,146,254,86,148,254,88,149,254,90,151,254,91,152,254,154,192,254,192,
             228,255,165,221,255,168,223,255,168,223,255,165,221,255,167,220,255,149,201,255,122,175,254,89,149,
             249,62,116,217,85,120,198,154,173,218,202,221,249,129,172,240,62,125,231,56,118,229,49,111,228,
-            23,54,171,35,83,212,2,5,118,212,208,200,212,208,200,212,208,200,31,80,176,72,130,234,88,
+            23,54,171,35,83,212,2,5,118,240,240,240,240,240,240,240,240,240,31,80,176,72,130,234,88,
             149,254,91,152,254,93,154,254,95,156,254,97,157,254,98,159,254,100,160,254,130,179,254,211,235,
             255,193,235,255,188,231,255,164,209,255,117,173,254,94,153,245,61,116,211,111,144,208,183,200,232,
             189,215,247,122,172,239,79,142,233,62,116,215,67,129,230,60,121,228,53,114,227,24,54,170,39,
-            86,212,1,3,116,212,208,200,212,208,200,212,208,200,30,77,174,76,133,234,95,155,254,97,158,
+            86,212,1,3,116,240,240,240,240,240,240,240,240,240,30,77,174,76,133,234,95,155,254,97,158,
             254,100,160,254,102,162,254,104,164,254,106,165,254,107,166,254,108,167,254,117,173,254,237,244,255,
             130,182,255,92,152,238,75,131,216,123,157,213,203,220,243,188,217,247,119,175,238,97,159,235,71,
             129,215,35,74,173,8,20,130,71,132,229,65,124,228,58,117,226,20,42,156,47,98,221,0,1,
-            115,212,208,200,212,208,200,212,208,200,29,75,172,81,137,233,101,161,254,103,163,254,106,166,254,
+            115,240,240,240,240,240,240,240,240,240,29,75,172,81,137,233,101,161,254,103,163,254,106,166,254,
             109,168,254,111,170,254,112,171,255,114,173,255,115,174,255,115,174,255,185,215,255,118,177,255,80,
             129,204,212,230,247,180,216,246,125,186,238,113,176,236,108,170,235,44,102,192,23,61,161,20,43,
-            147,52,90,187,71,126,221,42,79,185,31,55,165,44,79,189,62,121,239,0,0,114,212,208,200,
-            212,208,200,212,208,200,28,73,170,85,140,233,107,166,254,110,169,254,113,172,255,115,174,255,118,
+            147,52,90,187,71,126,221,42,79,185,31,55,165,44,79,189,62,121,239,0,0,114,240,240,240,
+            240,240,240,240,240,240,28,73,170,85,140,233,107,166,254,110,169,254,113,172,255,115,174,255,118,
             176,255,119,178,255,121,179,255,122,180,255,122,181,255,189,218,255,126,184,255,86,129,200,189,220,
             246,134,191,238,126,186,236,119,181,235,113,174,234,53,101,189,74,123,205,82,135,217,51,86,183,
-            39,66,170,33,63,168,93,109,182,90,102,177,51,100,215,0,0,114,212,208,200,212,208,200,212,
-            208,200,27,70,168,89,144,232,113,172,255,116,175,255,119,178,255,122,180,255,124,182,255,126,184,
+            39,66,170,33,63,168,93,109,182,90,102,177,51,100,215,0,0,114,240,240,240,240,240,240,240,
+            240,240,27,70,168,89,144,232,113,172,255,116,175,255,119,178,255,122,180,255,124,182,255,126,184,
             255,128,186,255,129,187,255,130,187,255,192,221,255,132,190,255,84,123,196,199,223,245,150,195,237,
             140,190,235,128,184,234,118,178,233,92,143,213,57,92,182,43,74,173,48,81,176,123,141,200,204,
-            216,244,135,171,241,45,74,179,54,102,214,0,0,114,212,208,200,212,208,200,212,208,200,26,68,
+            216,244,135,171,241,45,74,179,54,102,214,0,0,114,240,240,240,240,240,240,240,240,240,26,68,
             167,93,147,233,119,177,255,122,181,255,125,183,255,128,186,255,131,189,255,133,191,255,135,192,255,
             136,193,255,137,194,255,196,225,255,139,196,255,82,118,192,208,226,245,164,199,235,151,193,234,98,
             139,204,69,107,190,44,80,175,61,98,184,152,170,216,210,225,250,124,166,239,64,124,231,47,109,
-            229,22,55,173,57,103,213,0,0,114,212,208,200,212,208,200,212,208,200,25,66,165,97,150,232,
+            229,22,55,173,57,103,213,0,0,114,240,240,240,240,240,240,240,240,240,25,66,165,97,150,232,
             124,182,255,128,186,255,131,189,255,135,192,255,137,194,255,140,197,255,142,198,255,143,200,255,144,
             200,255,200,228,255,146,202,255,81,112,187,205,218,239,115,143,202,67,105,188,52,96,186,86,122,
             195,181,198,231,195,217,248,126,172,239,70,134,232,64,127,231,58,120,229,51,112,227,23,54,170,
-            59,105,212,0,0,114,212,208,200,212,208,200,212,208,200,24,63,163,97,151,230,130,187,255,134,
+            59,105,212,0,0,114,240,240,240,240,240,240,240,240,240,24,63,163,97,151,230,130,187,255,134,
             191,255,137,194,255,141,198,255,144,200,255,146,203,255,148,205,255,150,206,255,151,207,255,203,231,
             255,153,209,255,78,118,195,70,111,191,60,111,196,108,143,206,210,223,243,184,213,247,120,173,238,
             88,151,234,67,122,213,31,63,166,69,130,230,62,123,228,55,115,226,25,55,170,62,107,212,0,
-            0,114,212,208,200,212,208,200,212,208,200,23,60,158,44,89,184,113,171,243,139,196,255,143,200,
+            0,114,240,240,240,240,240,240,240,240,240,23,60,158,44,89,184,113,171,243,139,196,255,143,200,
             255,147,203,255,150,206,255,153,209,255,155,211,255,157,212,255,158,214,255,207,234,255,160,215,255,
             88,143,214,137,170,219,217,232,248,176,212,245,126,182,239,105,168,235,76,138,218,40,88,182,15,
-            40,145,13,25,135,73,133,229,66,125,227,37,74,184,31,53,161,65,114,217,0,0,114,212,208,
-            200,212,208,200,212,208,200,212,208,200,19,50,141,34,72,170,103,157,228,149,205,255,153,208,255,
+            40,145,13,25,135,73,133,229,66,125,227,37,74,184,31,53,161,65,114,217,0,0,114,240,240,
+            240,240,240,240,240,240,240,240,240,240,19,50,141,34,72,170,103,157,228,149,205,255,153,208,255,
             156,212,255,159,215,255,162,217,255,164,219,255,165,220,255,210,238,255,167,222,255,86,131,203,199,
             226,248,134,192,239,122,184,237,116,179,236,111,172,234,31,81,177,34,69,166,60,102,193,79,135,
-            222,39,69,172,52,81,179,65,105,202,26,48,158,0,0,111,0,0,85,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,24,55,154,82,129,206,155,211,254,162,217,255,166,
+            222,39,69,172,52,81,179,65,105,202,26,48,158,0,0,111,0,0,85,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,24,55,154,82,129,206,155,211,254,162,217,255,166,
             220,255,169,223,255,172,225,255,174,226,255,215,241,255,177,227,255,85,126,198,194,222,246,142,193,
             237,133,188,236,123,183,234,116,176,233,94,149,219,90,143,218,47,77,172,69,103,191,66,102,194,
-            19,33,142,0,0,109,0,0,86,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,15,41,142,56,93,179,152,205,245,173,225,255,180,228,
+            19,33,142,0,0,109,0,0,86,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,15,41,142,56,93,179,152,205,245,173,225,255,180,228,
             255,186,230,255,189,231,255,223,243,255,192,232,255,83,121,194,204,225,245,157,198,236,146,192,235,
-            133,186,233,93,142,208,60,93,179,84,123,200,75,110,193,11,18,128,0,0,109,0,0,74,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,13,35,132,35,63,158,140,182,228,193,233,255,200,235,255,
+            133,186,233,93,142,208,60,93,179,84,123,200,75,110,193,11,18,128,0,0,109,0,0,74,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,13,35,132,35,63,158,140,182,228,193,233,255,200,235,255,
             204,237,255,230,246,255,206,238,255,82,115,189,212,227,244,170,201,235,103,136,200,76,111,187,100,
-            142,208,67,94,178,6,10,121,0,0,102,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,20,40,143,119,147,204,209,237,254,219,242,255,238,
+            142,208,67,94,178,6,10,121,0,0,102,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,20,40,143,119,147,204,209,237,254,219,242,255,238,
             249,255,220,243,255,66,98,179,122,142,200,106,136,199,129,166,217,53,74,161,0,0,114,0,0,
-            94,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,10,25,131,80,97,173,215,230,246,245,252,255,234,247,
-            255,185,206,235,138,158,208,52,65,154,1,3,113,0,1,96,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,8,19,122,45,55,148,184,188,219,142,149,199,40,47,142,
-            2,6,116,1,3,88,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,5,13,110,5,12,123,4,9,115,2,5,78,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            94,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,10,25,131,80,97,173,215,230,246,245,252,255,234,247,
+            255,185,206,235,138,158,208,52,65,154,1,3,113,0,1,96,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,8,19,122,45,55,148,184,188,219,142,149,199,40,47,142,
+            2,6,116,1,3,88,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,5,13,110,5,12,123,4,9,115,2,5,78,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -8136,132 +7988,132 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,182,207,238,236,244,253,248,252,255,252,255,255,252,255,255,246,251,255,
-            228,239,252,158,196,239,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,182,207,238,236,244,253,248,252,255,252,255,255,252,255,255,246,251,255,
+            228,239,252,158,196,239,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             222,237,253,229,241,253,221,234,250,219,234,250,219,234,250,219,234,250,219,234,250,222,235,250,231,
-            243,254,207,228,252,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,202,226,251,198,222,247,195,
+            243,254,207,228,252,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,202,226,251,198,222,247,195,
             220,246,196,220,246,196,220,246,196,220,246,196,220,246,195,220,246,195,220,246,195,219,246,202,224,
-            248,185,216,250,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,143,190,242,180,212,244,174,207,243,175,208,243,175,208,
+            248,185,216,250,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,143,190,242,180,212,244,174,207,243,175,208,243,175,208,
             243,176,209,243,176,209,243,176,209,243,176,209,243,175,208,243,174,208,243,173,207,243,181,212,246,
-            113,173,238,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,143,191,241,156,197,240,155,197,240,159,199,241,160,201,241,161,202,242,
-            162,202,242,162,202,242,161,201,241,160,200,241,157,199,240,154,197,240,158,198,240,123,180,239,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            113,173,238,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,143,191,241,156,197,240,155,197,240,159,199,241,160,201,241,161,202,242,
+            162,202,242,162,202,242,161,201,241,160,200,241,157,199,240,154,197,240,158,198,240,123,180,239,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             73,151,232,122,179,237,141,189,238,143,191,238,146,194,240,149,195,240,150,197,240,150,197,240,150,
-            197,240,149,196,240,148,195,240,145,193,239,141,190,238,140,188,238,109,172,236,65,143,228,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,85,159,234,102,
+            197,240,149,196,240,148,195,240,145,193,239,141,190,238,140,188,238,109,172,236,65,143,228,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,85,159,234,102,
             168,233,127,184,237,132,188,238,137,190,239,139,193,240,142,194,240,142,194,240,142,194,240,141,194,
-            240,139,192,240,135,189,239,130,186,238,122,180,236,93,163,232,81,157,237,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,95,166,236,101,170,234,115,178,
+            240,139,192,240,135,189,239,130,186,238,122,180,236,93,163,232,81,157,237,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,95,166,236,101,170,234,115,178,
             236,125,185,238,130,189,239,134,192,240,137,193,241,137,195,241,137,194,241,136,193,241,132,191,240,
-            128,187,239,121,183,237,109,175,235,97,167,234,92,165,240,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,103,172,239,113,178,237,120,184,237,128,190,240,
+            128,187,239,121,183,237,109,175,235,97,167,234,92,165,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,103,172,239,113,178,237,120,184,237,128,190,240,
             135,194,241,140,198,243,143,200,243,144,201,243,144,201,243,142,199,243,138,196,242,132,192,241,124,
-            187,238,116,181,237,109,176,237,97,169,241,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,98,169,236,124,187,240,130,191,240,140,198,243,148,203,244,153,
+            187,238,116,181,237,109,176,237,97,169,241,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,98,169,236,124,187,240,130,191,240,140,198,243,148,203,244,153,
             208,246,157,211,247,158,211,247,158,211,247,156,209,246,151,206,245,144,201,244,136,195,242,127,188,
-            239,120,184,240,95,162,231,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,140,199,246,141,199,243,150,205,245,159,212,247,166,217,248,171,221,
+            239,120,184,240,95,162,231,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,140,199,246,141,199,243,150,205,245,159,212,247,166,217,248,171,221,
             250,173,222,250,172,222,250,169,219,249,163,215,248,155,210,247,145,202,244,136,195,242,132,194,247,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,132,193,246,165,214,248,162,214,247,169,220,250,178,226,251,184,231,253,186,232,253,
-            185,232,253,182,229,252,174,223,251,165,217,249,159,211,246,154,208,246,124,187,248,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,166,216,252,192,231,252,190,231,252,193,236,254,197,240,255,199,241,255,199,241,255,195,
-            238,255,190,233,253,187,229,252,182,226,250,155,211,255,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,164,212,246,211,245,255,221,249,255,225,249,255,229,249,255,227,249,255,221,248,255,215,246,
-            255,199,237,255,158,209,253,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,79,143,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,132,193,246,165,214,248,162,214,247,169,220,250,178,226,251,184,231,253,186,232,253,
+            185,232,253,182,229,252,174,223,251,165,217,249,159,211,246,154,208,246,124,187,248,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,166,216,252,192,231,252,190,231,252,193,236,254,197,240,255,199,241,255,199,241,255,195,
+            238,255,190,233,253,187,229,252,182,226,250,155,211,255,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,164,212,246,211,245,255,221,249,255,225,249,255,229,249,255,227,249,255,221,248,255,215,246,
+            255,199,237,255,158,209,253,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,79,143,
             218,138,188,233,181,221,247,217,240,253,228,245,253,225,245,254,209,239,254,178,220,250,149,194,243,
-            86,148,227,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,107,172,237,180,212,245,176,206,241,
+            86,148,227,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,107,172,237,180,212,245,176,206,241,
             147,189,236,143,187,237,148,191,239,148,191,239,146,189,238,157,193,239,185,211,242,177,211,244,96,
-            166,237,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,97,167,235,170,208,244,192,220,247,190,220,247,191,220,247,187,
+            166,237,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,97,167,235,170,208,244,192,220,247,190,220,247,191,220,247,187,
             217,246,185,216,246,184,215,245,187,216,245,191,219,247,189,219,247,191,220,246,166,206,244,88,161,
-            236,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,79,153,227,137,191,241,173,209,244,169,207,244,170,209,244,173,210,244,173,211,244,174,211,
+            236,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,79,153,227,137,191,241,173,209,244,169,207,244,170,209,244,173,210,244,173,211,244,174,211,
             244,174,211,245,173,211,245,172,209,244,170,208,244,169,207,243,172,209,243,131,187,240,76,148,227,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,111,178,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,111,178,
             239,145,195,240,155,200,242,156,202,242,158,203,242,160,205,243,161,205,243,161,205,243,161,205,243,
-            161,205,243,159,204,243,158,203,242,155,200,242,154,200,241,143,193,240,103,172,240,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,99,169,235,117,182,239,138,192,240,
+            161,205,243,159,204,243,158,203,242,155,200,242,154,200,241,143,193,240,103,172,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,99,169,235,117,182,239,138,192,240,
             142,196,241,145,198,241,148,200,242,149,200,242,147,200,242,145,200,242,145,199,242,147,199,242,148,
-            200,242,146,199,242,143,196,241,140,194,240,135,190,239,113,178,238,94,163,236,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,121,186,242,120,183,238,128,189,239,133,193,241,137,
+            200,242,146,199,242,143,196,241,140,194,240,135,190,239,113,178,238,94,163,236,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,121,186,242,120,183,238,128,189,239,133,193,241,137,
             195,241,140,198,242,140,198,242,140,198,242,140,198,242,140,198,242,140,198,242,139,197,242,139,196,
-            242,135,194,241,131,191,240,126,187,239,117,182,238,111,179,243,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,98,167,231,125,188,241,126,188,240,132,193,241,137,197,242,142,200,243,146,202,
+            242,135,194,241,131,191,240,126,187,239,117,182,238,111,179,243,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,98,167,231,125,188,241,126,188,240,132,193,241,137,197,242,142,200,243,146,202,
             243,148,204,244,151,206,245,151,207,245,151,206,245,149,205,244,148,204,244,144,201,243,140,198,242,
-            135,194,241,129,190,240,124,186,239,119,184,240,95,159,228,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,126,190,243,128,190,240,134,194,241,141,199,243,146,203,244,152,206,245,156,210,246,158,212,247,
+            135,194,241,129,190,240,124,186,239,119,184,240,95,159,228,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,126,190,243,128,190,240,134,194,241,141,199,243,146,203,244,152,206,245,156,210,246,158,212,247,
             161,213,247,161,214,247,161,214,247,160,212,247,157,211,247,154,208,246,149,205,245,143,201,243,137,
-            197,242,131,192,240,125,188,239,115,181,247,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,135,196,245,
+            197,242,131,192,240,125,188,239,115,181,247,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,135,196,245,
             134,194,241,141,199,242,148,204,245,155,209,246,160,213,247,165,216,249,168,219,249,170,220,250,171,
             221,250,171,221,250,169,220,249,166,217,249,162,215,248,157,211,247,151,207,245,144,202,244,137,196,
-            242,130,191,241,124,189,246,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,99,163,224,144,201,246,139,198,242,148,
+            242,130,191,241,124,189,246,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,99,163,224,144,201,246,139,198,242,148,
             204,244,155,209,246,162,214,248,168,219,249,173,223,250,177,225,251,180,228,252,181,228,252,181,228,
             252,179,227,252,175,224,251,171,221,250,165,217,248,158,212,247,151,207,245,144,200,243,136,195,242,
-            134,194,244,99,156,221,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,130,191,245,155,206,245,145,202,243,153,208,245,161,215,
+            134,194,244,99,156,221,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,130,191,245,155,206,245,145,202,243,153,208,245,161,215,
             248,169,220,249,176,225,251,182,229,252,186,233,253,190,235,254,190,235,254,190,235,254,188,234,254,
             184,231,253,178,227,251,172,222,249,164,217,248,156,211,247,147,204,244,146,202,243,151,204,245,116,
-            174,236,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,131,192,246,178,221,251,166,212,247,162,213,247,166,218,248,173,223,250,
+            174,236,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,131,192,246,178,221,251,166,212,247,162,213,247,166,218,248,173,223,250,
             181,230,252,189,234,254,195,238,255,198,241,255,199,241,255,199,241,255,197,240,255,192,237,255,185,
-            232,252,177,226,251,169,220,250,163,215,247,164,213,247,171,214,246,161,210,248,118,177,241,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,149,203,248,194,233,255,199,234,254,194,231,252,193,233,253,196,237,254,199,
+            232,252,177,226,251,169,220,250,163,215,247,164,213,247,171,214,246,161,210,248,118,177,241,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,149,203,248,194,233,255,199,234,254,194,231,252,193,233,253,196,237,254,199,
             241,255,203,242,255,208,243,255,211,244,255,210,244,255,206,243,255,201,241,255,197,238,254,193,234,
-            253,192,231,251,193,229,250,191,228,250,174,220,254,140,198,255,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,150,199,242,194,233,255,214,244,255,224,250,255,233,255,255,238,255,
+            253,192,231,251,193,229,250,191,228,250,174,220,254,140,198,255,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,150,199,242,194,233,255,214,244,255,224,250,255,233,255,255,238,255,
             255,242,255,255,245,255,255,243,255,255,237,255,255,231,254,255,224,252,255,217,247,255,207,242,255,
-            191,234,255,159,208,254,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,148,187,229,168,201,238,182,211,244,
-            184,214,245,183,215,246,180,214,248,169,208,246,157,200,242,140,182,228,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            191,234,255,159,208,254,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,148,187,229,168,201,238,182,211,244,
+            184,214,245,183,215,246,180,214,248,169,208,246,157,200,242,140,182,228,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -8269,132 +8121,132 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,176,176,192,174,174,190,171,171,189,169,169,187,166,166,185,164,164,
-            183,162,162,181,159,159,179,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,181,181,196,179,179,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,176,176,192,174,174,190,171,171,189,169,169,187,166,166,185,164,164,
+            183,162,162,181,159,159,179,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,181,181,196,179,179,
             194,186,186,200,209,209,219,228,228,234,232,232,237,252,252,253,251,251,252,228,228,233,221,221,228,
-            196,196,208,167,167,185,153,153,174,149,149,170,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,184,184,198,182,182,197,199,199,210,236,236,240,254,254,255,
+            196,196,208,167,167,185,153,153,174,149,149,170,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,184,184,198,182,182,197,199,199,210,236,236,240,254,254,255,
             254,254,254,239,239,242,232,232,237,216,216,224,209,209,218,227,227,233,231,231,236,245,245,247,243,
-            243,245,218,218,226,171,171,189,147,147,169,140,140,162,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,184,184,199,187,187,201,232,232,237,255,255,255,245,245,248,208,208,217,182,182,197,175,
+            243,245,218,218,226,171,171,189,147,147,169,140,140,162,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,184,184,199,187,187,201,232,232,237,255,255,255,245,245,248,208,208,217,182,182,197,175,
             180,202,166,181,214,154,175,215,151,173,214,164,178,207,161,168,192,162,162,181,187,187,201,228,228,
-            233,236,236,240,206,206,216,148,148,170,137,137,160,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,185,185,199,197,
+            233,236,236,240,206,206,216,148,148,170,137,137,160,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,185,185,199,197,
             197,209,246,246,248,251,251,252,215,215,223,184,185,199,184,200,226,223,237,250,246,252,255,250,254,
             255,186,190,231,181,188,231,235,249,255,229,247,255,194,223,247,173,190,213,153,155,176,185,185,199,
-            226,226,232,217,217,225,155,155,175,131,131,154,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,185,185,200,197,197,209,250,250,251,242,242,
+            226,226,232,217,217,225,155,155,175,131,131,154,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,185,185,200,197,197,209,250,250,251,242,242,
             245,193,193,206,175,192,220,223,242,251,231,248,255,237,250,255,241,251,255,244,252,255,121,125,207,
             119,125,207,233,249,255,227,247,255,221,245,255,215,243,255,193,227,248,137,161,201,152,152,173,209,
-            209,219,217,217,225,150,150,172,127,127,151,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,186,186,200,188,188,202,246,246,248,242,242,245,189,189,203,155,186,228,
+            209,219,217,217,225,150,150,172,127,127,151,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,186,186,200,188,188,202,246,246,248,242,242,245,189,189,203,155,186,228,
             217,244,255,222,245,255,228,247,255,232,248,255,236,249,255,237,250,255,206,218,243,204,217,243,229,
             247,255,224,246,255,218,244,255,212,242,255,206,241,255,198,235,254,131,165,214,142,142,165,204,204,
-            214,206,206,216,135,135,160,113,113,136,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,184,184,199,233,233,237,251,251,252,194,194,206,152,185,228,208,241,255,213,243,255,218,
+            214,206,206,216,135,135,160,113,113,136,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,184,184,199,233,233,237,251,251,252,194,194,206,152,185,228,208,241,255,213,243,255,218,
             244,255,223,246,255,227,247,255,229,247,255,230,248,255,230,248,255,228,247,255,224,246,255,220,245,
             255,215,243,255,209,242,255,203,239,255,194,233,254,185,226,253,124,160,212,142,142,165,208,208,218,
-            184,184,199,126,126,152,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,185,185,199,201,
+            184,184,199,126,126,152,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,185,185,199,201,
             201,212,255,255,255,216,216,224,146,173,217,196,234,254,204,239,255,209,241,255,214,243,255,218,244,
             255,221,245,255,223,246,255,224,246,255,224,246,255,222,245,255,219,244,255,215,243,255,210,242,255,
             129,150,159,12,15,16,154,186,206,181,223,252,172,216,251,111,139,192,163,163,182,206,206,216,144,
-            144,167,112,112,137,212,208,200,212,208,200,212,208,200,212,208,200,183,183,198,237,237,241,246,246,
+            144,167,112,112,137,240,240,240,240,240,240,240,240,240,240,240,240,183,183,198,237,237,241,246,246,
             248,175,179,201,154,200,245,190,229,253,197,235,254,204,240,255,209,241,255,212,242,255,215,243,255,
             217,244,255,217,244,255,217,244,255,215,243,255,213,243,255,210,242,255,129,150,159,0,0,0,0,
             0,0,69,85,96,171,213,244,168,212,250,133,183,240,118,123,156,193,193,205,180,180,195,120,120,
-            148,212,208,200,212,208,200,212,208,200,212,208,200,191,191,204,255,255,255,210,210,220,126,163,221,
+            148,240,240,240,240,240,240,240,240,240,240,240,240,191,191,204,255,255,255,210,210,220,126,163,221,
             176,219,252,183,224,252,190,230,253,197,234,254,202,239,255,206,241,255,209,241,255,210,242,255,211,
             242,255,210,242,255,209,242,255,207,241,255,128,150,159,0,0,0,0,0,0,58,71,80,153,190,
             216,166,209,244,162,209,250,154,202,249,93,132,199,149,149,171,195,195,207,127,127,154,92,92,115,
-            212,208,200,212,208,200,182,182,197,213,213,221,255,255,255,187,187,201,121,175,241,169,214,251,176,
+            240,240,240,240,240,240,182,182,197,213,213,221,255,255,255,187,187,201,121,175,241,169,214,251,176,
             219,252,183,224,252,189,229,253,194,232,254,198,236,254,201,238,255,203,239,255,204,239,255,203,239,
             255,202,238,255,125,149,159,0,0,0,0,0,0,58,71,80,153,190,216,167,209,244,164,210,250,
-            157,204,249,149,198,248,97,155,235,122,122,149,191,191,204,147,147,169,108,108,134,212,208,200,212,
-            208,200,180,180,195,231,231,236,241,241,244,157,171,203,131,185,246,162,209,250,169,214,251,175,218,
+            157,204,249,149,198,248,97,155,235,122,122,149,191,191,204,147,147,169,108,108,134,240,240,240,240,
+            240,240,180,180,195,231,231,236,241,241,244,157,171,203,131,185,246,162,209,250,169,214,251,175,218,
             251,180,222,252,185,226,253,189,229,253,192,231,254,194,232,254,194,233,254,194,232,254,121,145,159,
             0,0,0,0,0,0,57,71,80,152,189,216,166,209,244,164,210,250,157,205,249,150,199,248,133,
-            187,246,69,138,238,102,116,160,173,173,190,162,162,181,111,111,140,212,208,200,212,208,200,178,178,
+            187,246,69,138,238,102,116,160,173,173,190,162,162,181,111,111,140,240,240,240,240,240,240,178,178,
             194,235,235,239,235,235,239,136,162,210,148,198,248,155,203,249,161,208,250,167,212,250,172,216,251,
             176,219,252,180,222,252,182,223,252,150,183,205,59,71,79,47,57,63,0,0,0,0,0,0,56,
             70,80,149,186,216,163,207,244,163,209,250,157,204,249,144,195,247,110,169,243,73,141,239,63,134,
-            237,88,119,183,165,165,184,163,163,182,111,111,140,212,208,200,212,208,200,177,177,192,254,254,254,
+            237,88,119,183,165,165,184,163,163,182,111,111,140,240,240,240,240,240,240,177,177,192,254,254,254,
             216,216,224,125,159,215,105,144,225,73,98,203,134,176,237,158,206,249,163,209,250,162,208,250,154,
             202,249,147,197,248,19,25,31,80,80,80,112,112,112,0,0,0,27,34,40,108,136,160,119,152,
             181,121,156,187,125,170,216,124,179,245,101,163,242,81,137,231,41,74,199,54,105,219,87,122,188,
-            148,148,170,175,175,192,109,109,139,212,208,200,212,208,200,175,175,191,253,253,254,214,214,222,129,
+            148,148,170,175,175,192,109,109,139,240,240,240,240,240,240,175,175,191,253,253,254,214,214,222,129,
             162,215,99,140,224,69,95,203,127,171,237,144,194,248,136,188,246,134,187,246,140,192,247,145,196,
             248,0,0,0,175,175,175,239,239,239,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
             58,84,113,118,174,240,112,171,243,90,144,232,46,78,200,61,111,219,91,125,188,140,140,164,171,
-            171,188,107,107,138,212,208,200,212,208,200,173,173,190,232,232,237,232,232,237,137,165,212,119,176,
+            171,188,107,107,138,240,240,240,240,240,240,173,173,190,232,232,237,232,232,237,137,165,212,119,176,
             244,128,182,245,126,181,245,130,184,246,138,191,247,146,196,248,153,202,249,158,206,249,72,92,109,
             0,0,0,32,32,32,27,34,40,71,90,107,69,89,106,67,87,106,64,85,106,90,123,158,127,
             179,237,122,178,245,112,171,244,102,163,242,91,155,241,97,121,175,154,154,175,152,152,173,105,105,
-            136,212,208,200,212,208,200,171,171,188,226,226,232,236,236,240,156,168,197,110,169,243,119,176,244,
+            136,240,240,240,240,240,240,171,171,188,226,226,232,236,236,240,156,168,197,110,169,243,119,176,244,
             130,184,246,140,192,247,149,199,248,158,205,249,165,211,250,171,215,251,176,219,252,126,154,175,116,
             143,161,143,177,201,165,205,235,166,208,242,161,204,241,154,199,240,146,193,239,141,191,245,132,186,
-            246,122,178,245,111,170,243,100,161,242,101,113,154,155,155,176,145,145,168,103,103,132,212,208,200,
-            212,208,200,169,169,186,204,204,214,250,250,251,172,172,189,119,173,240,128,183,245,139,191,247,150,
+            246,122,178,245,111,170,243,100,161,242,101,113,154,155,155,176,145,145,168,103,103,132,240,240,240,
+            240,240,240,169,169,186,204,204,214,250,250,251,172,172,189,119,173,240,128,183,245,139,191,247,150,
             199,248,160,207,249,169,214,251,177,220,252,184,225,253,189,229,253,193,232,254,194,233,254,193,232,
             254,190,230,253,185,226,253,179,221,252,171,215,251,162,208,250,152,201,248,141,193,247,130,184,246,
-            119,176,244,107,163,236,105,105,136,163,163,182,128,128,154,96,96,125,212,208,200,212,208,200,212,
-            208,200,176,176,192,248,248,250,195,195,208,142,173,217,135,188,246,147,197,248,159,206,249,170,214,
+            119,176,244,107,163,236,105,105,136,163,163,182,128,128,154,96,96,125,240,240,240,240,240,240,240,
+            240,240,176,176,192,248,248,250,195,195,208,142,173,217,135,188,246,147,197,248,159,206,249,170,214,
             251,180,221,252,188,228,253,196,234,254,202,238,255,205,240,255,207,241,255,206,240,255,203,239,255,
             198,235,254,190,230,253,182,223,252,172,216,251,161,208,250,150,199,248,138,190,247,126,181,245,108,
-            137,188,123,123,150,159,159,179,109,109,139,80,80,105,212,208,200,212,208,200,212,208,200,163,163,
+            137,188,123,123,150,159,159,179,109,109,139,80,80,105,240,240,240,240,240,240,240,240,240,163,163,
             182,226,226,232,235,235,239,158,161,183,143,191,243,154,203,249,166,212,250,178,220,252,189,229,253,
             199,236,254,207,241,255,212,242,255,214,243,255,216,243,255,215,243,255,212,242,255,208,241,255,201,
             237,255,191,230,253,180,222,252,169,214,251,157,204,249,144,195,248,130,180,239,101,105,139,152,152,
-            173,142,142,165,100,100,132,212,208,200,212,208,200,212,208,200,212,208,200,159,159,178,181,181,196,
+            173,142,142,165,100,100,132,240,240,240,240,240,240,240,240,240,240,240,240,159,159,178,181,181,196,
             244,244,246,194,194,207,153,174,207,160,207,250,173,217,251,185,226,253,197,235,254,207,241,255,214,
             243,255,219,245,255,223,246,255,225,246,255,224,246,255,220,245,255,215,243,255,209,241,255,200,237,
             255,188,228,253,176,219,252,163,209,250,150,199,248,117,140,182,125,125,152,155,155,176,113,113,143,
-            91,91,120,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,157,157,177,215,215,223,235,
+            91,91,120,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,157,157,177,215,215,223,235,
             235,239,163,163,182,160,188,221,178,220,252,191,231,253,204,239,255,212,242,255,220,245,255,226,247,
             255,232,248,255,234,249,255,232,248,255,228,247,255,221,245,255,214,243,255,205,240,255,194,232,254,
-            181,223,252,168,213,250,135,165,205,106,106,137,152,152,174,136,136,160,99,99,131,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,151,151,171,158,158,178,227,227,233,219,219,
+            181,223,252,168,213,250,135,165,205,106,106,137,152,152,174,136,136,160,99,99,131,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,151,151,171,158,158,178,227,227,233,219,219,
             227,153,153,174,169,194,220,195,233,254,207,241,255,216,243,255,224,246,255,232,248,255,239,250,255,
             243,251,255,240,251,255,234,249,255,226,247,255,218,244,255,209,241,255,198,236,254,184,225,253,146,
-            173,207,103,103,134,146,146,168,146,146,168,103,103,134,85,85,113,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,147,147,169,165,165,184,228,228,233,214,214,223,
+            173,207,103,103,134,146,146,168,146,146,168,103,103,134,85,85,113,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,147,147,169,165,165,184,228,228,233,214,214,223,
             153,153,174,165,182,203,204,235,249,218,244,255,227,247,255,236,249,255,244,252,255,125,127,207,123,
             126,207,237,250,255,228,247,255,220,245,255,210,242,255,194,229,247,139,157,185,107,107,138,147,147,
-            169,150,150,172,109,109,139,93,93,124,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,142,142,163,161,161,180,218,218,225,220,220,227,174,
+            169,150,150,172,109,109,139,93,93,124,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,142,142,163,161,161,180,218,218,225,220,220,227,174,
             174,191,139,141,165,175,188,206,220,239,249,235,249,255,243,252,255,155,158,219,152,157,219,236,250,
             255,228,247,255,212,236,248,158,174,195,109,112,142,128,128,154,155,155,176,148,148,170,110,110,140,
-            94,94,125,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,138,138,160,146,146,168,196,196,208,219,219,227,205,205,
+            94,94,125,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,138,138,160,146,146,168,196,196,208,219,219,227,205,205,
             216,160,160,180,131,131,157,144,147,170,165,169,188,180,184,200,177,183,199,158,163,184,131,135,161,
-            111,111,141,129,129,155,158,158,178,160,160,180,139,139,163,104,104,135,94,94,125,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,123,123,144,136,136,161,155,155,175,192,192,205,209,209,218,
+            111,111,141,129,129,155,158,158,178,160,160,180,139,139,163,104,104,135,94,94,125,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,123,123,144,136,136,161,155,155,175,192,192,205,209,209,218,
             205,205,215,186,186,200,177,177,193,158,158,178,154,154,175,164,164,183,164,164,183,172,172,189,167,
-            167,185,148,148,170,117,117,146,102,102,133,87,87,114,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,122,122,145,130,130,156,138,138,162,159,159,178,174,
+            167,185,148,148,170,117,117,146,102,102,133,87,87,114,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,122,122,145,130,130,156,138,138,162,159,159,178,174,
             174,191,175,175,191,188,188,202,183,183,198,162,162,181,154,154,175,135,135,160,114,114,143,105,105,
-            135,95,95,123,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,100,100,122,116,116,142,120,120,147,119,119,
-            147,117,117,145,114,114,143,112,112,141,109,109,138,101,101,129,84,84,108,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            135,95,95,123,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,100,100,122,116,116,142,120,120,147,119,119,
+            147,117,117,145,114,114,143,112,112,141,109,109,138,101,101,129,84,84,108,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -8402,132 +8254,132 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,210,210,210,232,232,232,
-            187,187,187,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,225,225,225,248,248,248,235,235,235,78,78,78,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,192,192,
-            192,117,117,117,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,235,235,235,240,240,240,239,239,239,116,116,116,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,169,169,169,198,198,198,
-            183,183,183,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,234,234,234,240,240,240,169,169,169,212,208,200,212,208,200,212,208,200,212,208,200,242,242,242,
-            103,103,103,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,198,198,198,255,255,255,209,
-            209,209,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,240,240,240,230,231,230,
-            240,240,240,165,165,165,212,208,200,212,208,200,212,208,200,217,217,217,255,255,255,145,145,145,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,173,173,173,255,255,255,105,105,
-            105,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,237,237,237,230,231,230,232,232,232,238,
-            238,238,164,164,164,212,208,200,223,223,223,255,255,255,255,255,255,135,135,135,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,107,107,107,218,218,218,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,234,234,234,229,229,229,230,231,230,236,236,236,249,249,
-            249,253,253,253,255,255,255,255,255,255,251,251,251,91,91,91,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,92,92,92,215,215,215,90,90,90,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,238,238,238,228,228,228,228,228,228,233,233,233,240,240,240,247,247,247,
-            255,255,255,255,255,255,202,202,202,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,91,91,91,214,214,214,95,95,95,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,210,210,210,232,232,232,
+            187,187,187,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,225,225,225,248,248,248,235,235,235,78,78,78,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,192,192,
+            192,117,117,117,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,235,235,235,240,241,240,239,239,239,116,116,116,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,169,169,169,198,198,198,
+            183,183,183,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,234,234,234,240,241,240,169,169,169,240,240,240,240,240,240,240,240,240,240,240,240,242,242,242,
+            103,103,103,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,198,198,198,255,255,255,209,
+            209,209,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,241,240,230,231,230,
+            240,241,240,165,165,165,240,240,240,240,240,240,240,240,240,217,217,217,255,255,255,145,145,145,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,173,173,173,255,255,255,105,105,
+            105,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,237,237,237,230,231,230,232,232,232,238,
+            238,238,164,164,164,240,240,240,223,223,223,255,255,255,255,255,255,135,135,135,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,107,107,107,218,218,218,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,234,234,234,229,229,229,230,231,230,236,236,236,249,249,
+            249,253,253,253,255,255,255,255,255,255,251,251,251,91,91,91,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,92,92,92,215,215,215,90,90,90,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,238,238,238,228,228,228,228,228,228,233,233,233,240,241,240,247,247,247,
+            255,255,255,255,255,255,202,202,202,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,91,91,91,214,214,214,95,95,95,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             230,231,230,206,206,206,218,218,218,230,231,230,233,233,233,237,237,237,239,239,239,229,229,229,193,
-            193,193,71,71,71,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,82,82,82,209,209,209,100,100,100,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,235,235,235,203,203,203,165,
-            165,165,214,214,214,233,233,233,205,205,205,154,154,154,105,105,105,67,67,67,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,83,83,83,207,207,207,105,105,105,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,236,236,236,211,211,211,177,177,177,211,211,211,234,234,
-            234,175,175,175,63,63,63,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,82,82,82,203,203,203,110,110,110,212,208,200,212,208,
-            200,212,208,200,236,236,236,219,219,219,189,189,189,218,218,218,235,235,235,170,170,170,43,43,43,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,83,83,83,197,197,197,102,102,102,212,208,200,238,238,238,
-            228,228,228,203,203,203,225,225,225,236,236,236,166,166,166,41,41,41,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,68,68,68,183,183,183,187,187,187,226,226,226,220,220,220,231,
-            232,233,237,237,238,159,159,159,40,40,40,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,191,191,191,177,177,177,173,173,173,223,224,228,230,228,227,143,143,
-            142,29,31,32,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,230,231,230,243,243,243,198,198,198,164,166,171,201,183,159,232,202,151,148,119,71,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,212,212,255,255,255,
-            255,255,255,239,241,244,202,184,153,235,194,98,255,255,255,253,230,197,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,202,202,202,255,255,255,255,255,255,255,255,255,242,
-            246,253,223,185,103,255,203,3,249,230,141,255,232,158,170,117,2,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,204,204,204,255,255,255,255,255,255,255,255,255,248,248,248,154,156,163,110,85,
-            34,221,164,0,244,179,0,255,225,94,255,248,154,216,161,29,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,187,187,
-            187,255,255,255,255,255,255,255,255,255,249,249,249,159,159,159,38,38,38,212,208,200,212,208,200,
-            141,91,0,255,204,34,255,252,188,255,255,186,246,193,43,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,180,180,180,255,255,255,255,255,255,
-            255,255,255,250,250,250,155,155,155,36,36,36,212,208,200,212,208,200,212,208,200,212,208,200,194,
-            128,0,255,210,42,255,251,189,255,255,195,255,211,55,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            193,193,71,71,71,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,82,82,82,209,209,209,100,100,100,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,235,235,235,203,203,203,165,
+            165,165,214,214,214,233,233,233,205,205,205,154,154,154,105,105,105,67,67,67,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,83,83,83,207,207,207,105,105,105,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,236,236,236,211,211,211,177,177,177,211,211,211,234,234,
+            234,175,175,175,63,63,63,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,82,82,82,203,203,203,110,110,110,240,240,240,240,240,
+            240,240,240,240,236,236,236,219,219,219,189,189,189,218,218,218,235,235,235,170,170,170,43,43,43,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,83,83,83,197,197,197,102,102,102,240,240,240,238,238,238,
+            228,228,228,203,203,203,225,225,225,236,236,236,166,166,166,41,41,41,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,68,68,68,183,183,183,187,187,187,226,226,226,220,220,220,231,
+            232,233,237,237,238,159,159,159,40,40,40,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,191,191,191,177,177,177,173,173,173,223,224,228,230,228,227,143,143,
+            142,29,31,32,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,230,231,230,243,243,243,198,198,198,164,166,171,201,183,159,232,202,151,148,119,71,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,212,212,212,255,255,255,
+            255,255,255,239,241,244,202,184,153,235,194,98,255,255,255,253,230,197,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,202,202,202,255,255,255,255,255,255,255,255,255,242,
+            246,253,223,185,103,255,203,3,249,230,141,255,232,158,170,117,2,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,204,204,204,255,255,255,255,255,255,255,255,255,248,248,248,154,156,163,110,85,
+            34,221,164,0,244,179,0,255,225,94,255,248,154,216,161,29,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,187,187,
+            187,255,255,255,255,255,255,255,255,255,249,249,249,159,159,159,38,38,38,240,240,240,240,240,240,
+            141,91,0,255,204,34,255,252,188,255,255,186,246,193,43,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,180,180,180,255,255,255,255,255,255,
+            255,255,255,250,250,250,155,155,155,36,36,36,240,240,240,240,240,240,240,240,240,240,240,240,194,
+            128,0,255,210,42,255,251,189,255,255,195,255,211,55,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             135,135,135,142,142,142,171,171,171,222,222,222,255,255,255,255,255,255,255,255,255,247,247,247,151,
-            151,151,30,30,30,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,232,158,
-            0,255,209,42,255,250,184,255,255,188,237,179,27,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,114,114,114,226,226,226,237,237,237,242,
-            242,242,255,255,255,255,255,255,255,255,255,255,255,255,245,245,245,147,147,147,30,30,30,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,252,176,0,
-            255,203,27,255,226,107,255,245,155,240,192,62,179,125,10,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,215,215,215,240,240,240,243,243,243,250,250,250,248,248,
-            248,250,250,250,255,255,255,255,255,255,179,179,179,30,30,30,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,145,0,255,
-            182,0,255,239,147,255,255,221,255,218,58,244,183,16,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,93,93,93,236,236,236,237,237,237,215,215,215,201,201,201,246,246,246,252,252,252,
-            255,255,255,255,255,255,135,135,135,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,234,159,0,255,208,
-            49,255,234,123,255,229,100,255,254,177,240,204,76,212,208,200,212,208,200,212,208,200,212,208,200,
+            151,151,30,30,30,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,232,158,
+            0,255,209,42,255,250,184,255,255,188,237,179,27,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,114,114,114,226,226,226,237,237,237,242,
+            242,242,255,255,255,255,255,255,255,255,255,255,255,255,245,245,245,147,147,147,30,30,30,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,252,176,0,
+            255,203,27,255,226,107,255,245,155,240,192,62,179,125,10,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,215,215,215,240,241,240,243,243,243,250,250,250,248,248,
+            248,250,250,250,255,255,255,255,255,255,179,179,179,30,30,30,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,212,145,0,255,
+            182,0,255,239,147,255,255,221,255,218,58,244,183,16,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,93,93,93,236,236,236,237,237,237,215,215,215,201,201,201,246,246,246,252,252,252,
+            255,255,255,255,255,255,135,135,135,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,234,159,0,255,208,
+            49,255,234,123,255,229,100,255,254,177,240,204,76,240,240,240,240,240,240,240,240,240,240,240,240,
             126,126,126,244,244,244,205,205,205,79,79,79,25,25,25,116,116,116,246,246,246,255,255,255,255,
-            255,255,126,126,126,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,140,97,7,255,185,0,255,197,17,
-            255,250,174,255,255,226,255,255,195,213,172,52,212,208,200,212,208,200,212,208,200,125,125,125,230,
-            231,230,102,102,102,212,208,200,212,208,200,212,208,200,210,210,210,255,255,255,255,255,255,112,112,
-            112,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,223,154,5,255,193,5,255,226,91,255,
-            246,164,255,253,201,255,254,170,176,133,26,212,208,200,212,208,200,212,208,200,125,125,125,212,208,
-            200,212,208,200,212,208,200,91,91,91,236,236,236,255,255,255,217,217,217,57,57,57,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,211,148,6,255,192,0,255,212,38,255,234,
-            114,255,255,210,255,242,138,130,96,12,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,211,211,211,255,255,255,218,218,218,93,93,93,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,174,121,8,255,187,0,255,206,23,255,240,136,
-            255,254,167,242,190,35,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,144,144,144,220,
-            220,220,168,168,168,73,73,73,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,128,90,11,249,176,3,255,202,17,255,220,42,232,
-            172,17,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,37,37,37,15,15,
-            15,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,74,54,10,201,142,7,212,152,4,89,63,10,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            255,255,126,126,126,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,140,97,7,255,185,0,255,197,17,
+            255,250,174,255,255,226,255,255,195,213,172,52,240,240,240,240,240,240,240,240,240,125,125,125,230,
+            231,230,102,102,102,240,240,240,240,240,240,240,240,240,210,210,210,255,255,255,255,255,255,112,112,
+            112,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,223,154,5,255,193,5,255,226,91,255,
+            246,164,255,253,201,255,254,170,176,133,26,240,240,240,240,240,240,240,240,240,125,125,125,240,240,
+            240,240,240,240,240,240,240,91,91,91,236,236,236,255,255,255,217,217,217,57,57,57,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,211,148,6,255,192,0,255,212,38,255,234,
+            114,255,255,210,255,242,138,130,96,12,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,211,211,211,255,255,255,218,218,218,93,93,93,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,174,121,8,255,187,0,255,206,23,255,240,136,
+            255,254,167,242,190,35,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,144,144,144,220,
+            220,220,168,168,168,73,73,73,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,128,90,11,249,176,3,255,202,17,255,220,42,232,
+            172,17,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,37,37,37,15,15,
+            15,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,74,54,10,201,142,7,212,152,4,89,63,10,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -8535,132 +8387,132 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,126,127,155,126,127,155,126,127,155,126,127,155,126,127,155,126,127,155,126,127,
-            155,126,127,155,126,127,155,88,90,123,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,79,81,115,85,93,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,126,127,155,126,127,155,126,127,155,126,127,155,126,127,155,126,127,155,126,127,
+            155,126,127,155,126,127,155,88,90,123,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,79,81,115,85,93,
             136,173,178,201,228,228,234,238,241,245,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,
-            213,219,231,150,151,179,67,72,115,59,60,103,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,115,125,143,58,76,124,163,172,183,231,235,241,238,241,245,
+            213,219,231,150,151,179,67,72,115,59,60,103,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,115,125,143,58,76,124,163,172,183,231,235,241,238,241,245,
             219,225,235,219,225,235,238,241,245,231,235,241,228,228,234,228,228,234,213,219,231,254,254,254,254,
-            254,254,213,219,231,126,127,155,41,41,92,88,90,123,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,93,111,137,72,113,150,199,215,228,230,243,246,199,215,228,196,199,218,196,199,218,228,
+            254,254,213,219,231,126,127,155,41,41,92,88,90,123,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,93,111,137,72,113,150,199,215,228,230,243,246,199,215,228,196,199,218,196,199,218,228,
             228,234,228,228,234,196,199,218,196,199,218,196,199,218,196,199,218,196,199,218,228,228,234,238,241,
-            245,213,219,231,145,145,173,41,41,92,59,60,103,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,147,161,181,72,
+            245,213,219,231,145,145,173,41,41,92,59,60,103,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,147,161,181,72,
             113,150,199,215,228,238,241,245,219,225,235,199,215,228,179,199,224,181,197,217,231,235,241,179,184,
             211,168,171,206,179,184,211,196,199,218,238,241,245,213,219,231,179,184,211,228,228,234,213,219,231,
-            196,199,218,126,127,155,41,41,92,59,60,103,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,163,172,183,105,138,169,122,151,184,217,236,
+            196,199,218,126,127,155,41,41,92,59,60,103,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,163,172,183,105,138,169,122,151,184,217,236,
             243,228,228,234,228,228,234,199,215,228,154,179,206,213,219,231,179,199,224,159,164,202,168,171,206,
             168,171,206,179,184,211,228,228,234,196,199,218,150,155,196,150,155,196,213,219,231,213,219,231,169,
-            182,212,102,116,156,59,60,103,79,81,115,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,144,169,192,140,165,192,102,116,156,140,165,192,183,214,232,213,219,231,
+            182,212,102,116,156,59,60,103,79,81,115,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,144,169,192,140,165,192,102,116,156,140,165,192,183,214,232,213,219,231,
             213,219,231,164,194,220,164,194,220,213,219,231,149,161,202,135,148,193,132,144,190,132,144,190,130,
             137,189,132,144,190,150,155,196,130,137,189,119,135,184,132,144,190,199,215,228,181,197,217,119,135,
-            184,85,93,136,67,72,115,138,138,152,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,116,131,163,140,165,192,102,116,156,119,135,184,133,165,194,139,183,219,139,183,219,144,
+            184,85,93,136,67,72,115,138,138,152,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,116,131,163,140,165,192,102,116,156,119,135,184,133,165,194,139,183,219,139,183,219,144,
             170,208,183,214,232,169,182,212,105,119,180,105,119,180,105,119,180,105,119,180,105,119,180,105,119,
             180,119,135,184,119,135,184,105,119,180,119,135,184,144,170,208,217,236,243,154,194,220,73,122,168,
-            58,76,124,67,72,115,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,144,169,192,133,
+            58,76,124,67,72,115,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,144,169,192,133,
             165,194,140,169,194,97,115,168,88,105,171,97,115,168,119,135,184,132,144,190,107,138,188,179,199,
             224,119,135,184,88,105,171,88,105,171,97,115,168,86,119,183,88,105,171,88,105,171,97,115,168,
             105,119,180,98,111,173,107,138,188,139,183,219,201,233,244,223,243,247,123,178,203,72,113,150,41,
-            50,110,126,127,155,212,208,200,212,208,200,212,208,200,212,208,200,144,169,192,164,194,220,154,179,
+            50,110,126,127,155,240,240,240,240,240,240,240,240,240,240,240,240,144,169,192,164,194,220,154,179,
             206,97,115,168,72,85,156,98,111,173,105,119,180,88,105,171,86,119,183,179,199,224,86,119,183,
             88,105,171,88,105,171,84,108,176,84,108,176,88,105,171,88,105,171,71,100,172,105,119,180,88,
             105,171,98,147,203,154,194,220,196,199,218,230,243,246,168,215,233,78,130,169,58,76,124,67,72,
-            115,212,208,200,212,208,200,212,208,200,144,169,192,57,73,133,154,179,206,201,233,244,83,122,167,
+            115,240,240,240,240,240,240,240,240,240,144,169,192,57,73,133,154,179,206,201,233,244,83,122,167,
             88,105,171,84,108,176,59,84,163,59,84,163,105,119,180,154,179,206,71,100,172,84,108,176,86,
             119,183,89,132,187,89,132,187,86,119,183,71,105,178,67,92,168,88,105,171,71,100,172,87,137,
             198,123,177,220,179,199,224,202,227,239,183,214,232,73,122,168,58,76,124,41,50,110,144,169,192,
-            212,208,200,212,208,200,144,169,192,43,60,135,105,138,169,210,252,254,168,204,230,97,111,176,59,
+            240,240,240,240,240,240,144,169,192,43,60,135,105,138,169,210,252,254,168,204,230,97,111,176,59,
             84,163,67,92,168,59,84,163,113,142,196,139,183,219,72,115,182,87,145,199,97,169,211,102,182,
             218,102,182,218,99,165,206,89,132,187,72,115,182,84,108,176,71,100,172,71,105,178,89,132,187,
-            107,164,214,102,182,218,186,223,241,83,122,167,57,73,133,38,47,115,144,169,192,212,208,200,212,
-            208,200,144,169,192,43,60,135,87,145,199,235,253,254,242,254,254,99,165,206,72,115,182,71,105,
+            107,164,214,102,182,218,186,223,241,83,122,167,57,73,133,38,47,115,144,169,192,240,240,240,240,
+            240,240,144,169,192,43,60,135,87,145,199,235,253,254,242,254,254,99,165,206,72,115,182,71,105,
             178,67,92,168,124,155,204,139,183,219,87,145,199,102,182,218,131,220,236,174,240,248,194,234,246,
             131,220,236,102,182,218,87,137,198,97,111,176,71,105,178,67,92,168,72,115,182,72,120,197,71,
-            105,178,151,184,215,119,135,184,57,73,133,43,60,127,144,169,192,212,208,200,212,208,200,144,169,
+            105,178,151,184,215,119,135,184,57,73,133,43,60,127,144,169,192,240,240,240,240,240,240,144,169,
             192,44,66,148,83,122,167,153,215,235,210,252,254,188,231,244,133,200,232,92,167,211,72,115,182,
             134,172,212,139,183,219,92,167,211,131,220,236,227,254,254,254,254,254,254,254,254,217,253,254,117,
             212,233,99,165,206,89,132,187,86,119,183,67,92,168,67,92,168,67,92,168,67,92,168,107,138,
-            188,154,179,206,51,77,157,62,88,152,144,169,192,212,208,200,212,208,200,144,169,192,44,66,148,
+            188,154,179,206,51,77,157,62,88,152,144,169,192,240,240,240,240,240,240,144,169,192,44,66,148,
             88,105,171,100,156,209,167,220,240,210,252,254,235,253,254,183,242,248,115,179,221,122,187,226,150,
             196,228,102,182,218,174,240,248,254,254,254,235,253,254,235,253,254,242,254,254,150,229,242,102,182,
             218,87,137,198,86,119,183,71,100,172,71,105,178,67,92,168,67,92,168,86,119,183,154,194,220,
-            72,113,150,144,170,208,144,169,192,212,208,200,212,208,200,144,169,192,51,77,157,86,119,183,87,
+            72,113,150,144,170,208,144,169,192,240,240,240,240,240,240,144,169,192,51,77,157,86,119,183,87,
             145,199,150,229,242,242,254,254,227,254,254,235,253,254,174,240,248,203,250,252,183,242,248,117,212,
             233,150,229,242,242,254,254,235,253,254,242,254,254,254,254,254,150,229,242,102,182,218,254,254,254,
             254,254,254,254,254,254,71,105,178,71,105,178,254,254,254,254,254,254,254,254,254,254,254,254,254,
-            254,254,144,169,192,212,208,200,212,208,200,144,169,192,67,92,168,86,119,183,87,145,199,131,220,
+            254,254,144,169,192,240,240,240,240,240,240,144,169,192,67,92,168,86,119,183,87,145,199,131,220,
             236,227,254,254,235,253,254,194,245,250,131,220,236,194,245,250,217,253,254,174,240,248,174,240,248,
             210,252,254,235,253,254,227,254,254,174,240,248,108,207,232,254,254,254,166,125,99,114,69,40,158,
             120,100,254,254,254,254,254,254,232,230,226,189,164,146,189,164,146,180,157,144,189,164,146,182,153,
-            134,218,205,198,212,208,200,144,169,192,86,119,183,86,119,183,87,137,198,102,182,218,174,240,248,
+            134,218,205,198,240,240,240,144,169,192,86,119,183,86,119,183,87,137,198,102,182,218,174,240,248,
             204,241,252,117,212,233,92,167,211,122,187,226,168,231,243,122,187,226,153,215,235,181,237,246,203,
             250,252,203,250,252,174,240,248,254,254,254,161,118,92,177,108,51,131,59,8,182,153,134,212,195,
             186,159,109,78,170,105,56,168,92,34,182,103,39,182,103,39,167,85,21,124,55,9,212,195,186,
-            212,208,200,144,169,192,119,135,184,71,105,178,82,127,193,87,137,198,116,181,224,188,231,244,116,
+            240,240,240,144,169,192,119,135,184,71,105,178,82,127,193,87,137,198,116,181,224,188,231,244,116,
             181,224,87,145,199,98,147,203,168,215,233,98,147,203,97,169,211,110,184,229,115,201,228,126,202,
             230,254,254,254,212,195,186,148,77,23,193,113,46,135,70,25,135,70,25,184,128,80,214,157,101,
-            225,163,101,225,163,101,199,122,55,167,85,21,142,80,38,212,195,186,212,208,200,212,208,200,212,
-            208,200,144,169,192,72,120,197,72,120,197,87,137,198,87,137,198,138,189,226,180,219,243,87,137,
+            225,163,101,225,163,101,199,122,55,167,85,21,142,80,38,212,195,186,240,240,240,240,240,240,240,
+            240,240,144,169,192,72,120,197,72,120,197,87,137,198,87,137,198,138,189,226,180,219,243,87,137,
             198,87,137,198,180,219,243,123,177,220,98,147,203,101,162,211,101,162,211,101,162,211,254,254,254,
             173,142,125,148,77,23,168,92,34,135,70,25,214,157,101,229,188,140,214,157,101,199,122,55,167,
-            85,21,142,80,38,182,153,134,238,234,234,212,208,200,212,208,200,212,208,200,212,208,200,144,169,
+            85,21,142,80,38,182,153,134,238,234,234,240,240,240,240,240,240,240,240,240,240,240,240,144,169,
             192,82,127,193,72,120,197,98,147,203,87,145,199,100,156,209,180,219,243,150,196,228,87,145,199,
             150,196,228,168,204,230,93,155,210,101,162,211,101,162,211,107,164,214,254,254,254,180,157,144,131,
             59,8,135,70,25,215,144,78,215,144,78,191,117,55,148,77,23,166,125,99,182,153,134,238,234,
-            234,72,115,182,144,169,192,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,144,169,192,
+            234,72,115,182,144,169,192,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,144,169,192,
             72,120,197,87,145,199,100,156,209,100,156,209,108,170,218,201,233,244,133,200,232,114,173,219,188,
             231,244,114,173,219,107,164,214,107,164,214,254,254,254,218,205,198,132,85,55,124,55,9,193,113,
             46,191,117,55,172,97,38,135,70,25,113,47,6,172,145,130,123,177,220,150,202,246,119,135,184,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,144,169,192,107,138,188,80,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,144,169,192,107,138,188,80,
             140,213,100,156,209,107,164,214,108,170,218,130,188,226,201,233,244,122,187,226,167,220,240,168,215,
             233,107,164,214,114,173,219,254,254,254,224,213,206,90,31,3,135,70,25,199,122,55,182,103,39,
-            168,92,34,142,80,38,185,150,121,177,116,66,119,57,18,203,190,183,140,169,194,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,144,169,192,98,147,203,93,155,
+            168,92,34,142,80,38,185,150,121,177,116,66,119,57,18,203,190,183,140,169,194,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,144,169,192,98,147,203,93,155,
             210,107,164,214,114,173,219,115,179,221,142,203,232,201,233,244,153,215,235,194,234,246,133,200,232,
             115,179,221,254,254,254,228,224,218,132,85,55,157,83,27,182,103,39,182,103,39,175,121,74,242,
-            238,231,254,254,254,157,136,115,148,77,23,135,70,25,180,157,144,126,127,155,126,127,155,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,144,169,192,115,164,218,107,168,227,
+            238,231,254,254,254,157,136,115,148,77,23,135,70,25,180,157,144,126,127,155,126,127,155,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,144,169,192,115,164,218,107,168,227,
             114,173,219,116,181,224,116,181,224,142,203,232,194,236,251,194,234,246,183,229,244,124,193,228,254,
             254,254,224,213,208,143,100,76,182,103,39,199,122,55,193,113,46,211,145,84,254,254,254,183,183,
-            182,0,0,0,149,89,49,195,126,67,196,168,140,186,179,170,140,138,137,126,127,155,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,144,169,192,125,164,206,115,180,234,130,
+            182,0,0,0,149,89,49,195,126,67,196,168,140,186,179,170,140,138,137,126,127,155,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,144,169,192,125,164,206,115,180,234,130,
             188,226,140,194,228,133,200,232,142,203,232,194,236,251,235,253,254,204,241,252,254,254,254,218,205,
             198,135,70,25,199,122,55,211,145,84,211,145,84,199,122,55,214,157,101,185,150,121,132,85,55,
-            199,122,55,214,172,128,165,167,169,186,179,170,235,232,225,160,159,155,126,127,155,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,144,169,192,144,169,192,103,166,221,108,180,
+            199,122,55,214,172,128,165,167,169,186,179,170,235,232,225,160,159,155,126,127,155,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,144,169,192,144,169,192,103,166,221,108,180,
             234,122,187,235,130,188,226,133,200,232,167,220,240,235,253,254,254,254,254,203,190,183,135,70,25,
             210,138,72,224,190,150,224,190,150,215,144,78,193,113,46,192,111,42,182,103,39,199,122,55,185,
-            150,121,140,138,137,140,138,137,228,224,218,228,224,218,126,127,155,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,144,169,192,140,169,194,115,168,214,
+            150,121,140,138,137,140,138,137,228,224,218,228,224,218,126,127,155,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,144,169,192,140,169,194,115,168,214,
             115,180,234,118,188,240,122,198,240,122,198,240,254,254,254,173,142,125,135,70,25,199,122,55,219,
             161,104,222,171,119,211,145,84,199,122,55,193,113,46,182,103,39,170,105,56,189,164,146,200,201,
-            200,243,241,238,254,254,254,243,241,238,126,127,155,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,144,169,192,144,169,192,144,
+            200,243,241,238,254,254,254,243,241,238,126,127,155,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,144,169,192,144,169,192,144,
             169,192,144,169,192,144,169,192,144,169,192,172,145,130,107,47,18,168,92,34,199,122,55,215,144,
             78,211,145,84,199,122,55,193,113,46,168,92,34,177,116,66,199,184,166,224,213,208,235,232,225,
-            243,241,238,243,241,238,126,127,155,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,149,108,86,101,39,4,119,57,18,157,83,27,182,103,39,191,117,55,
+            243,241,238,243,241,238,126,127,155,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,149,108,86,101,39,4,119,57,18,157,83,27,182,103,39,191,117,55,
             182,103,39,172,97,38,135,70,25,165,135,109,203,190,183,179,175,169,183,183,182,235,232,225,228,
-            224,218,126,127,155,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,154,115,93,124,55,9,135,70,25,119,57,18,119,57,18,119,57,18,119,57,18,114,
+            224,218,126,127,155,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,154,115,93,124,55,9,135,70,25,119,57,18,119,57,18,119,57,18,119,57,18,114,
             69,40,89,73,63,98,96,95,154,153,151,154,153,151,131,129,125,131,129,125,140,138,137,126,127,
-            155,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,143,
-            100,76,149,89,49,187,120,67,211,145,84,199,136,80,170,105,56,142,80,38,180,157,144,212,208,
-            200,126,127,155,126,127,155,126,127,155,126,127,155,126,127,155,126,127,155,212,208,200
+            155,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,143,
+            100,76,149,89,49,187,120,67,211,145,84,199,136,80,170,105,56,142,80,38,180,157,144,240,240,
+            240,126,127,155,126,127,155,126,127,155,126,127,155,126,127,155,126,127,155,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -8668,40 +8520,40 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,207,207,207,210,210,210,210,210,210,210,210,210,210,210,210,210,
-            210,210,210,210,210,210,210,210,210,210,210,207,207,207,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
-            255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,212,208,200,212,208,200,212,208,200,223,
+            240,240,240,240,240,240,240,240,240,207,207,207,210,210,210,210,210,210,210,210,210,210,210,210,210,
+            210,210,210,210,210,210,210,210,210,210,210,207,207,207,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
+            255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,240,240,240,240,240,240,240,240,240,223,
             223,223,255,255,255,242,242,242,242,242,242,242,242,242,243,242,242,240,240,242,241,241,242,242,242,
-            242,242,242,242,242,242,242,242,242,242,254,254,254,232,232,232,212,208,200,212,208,200,233,233,233,
+            242,242,242,242,242,242,242,242,242,242,254,254,254,232,232,232,240,240,240,240,240,240,233,233,233,
             236,236,236,231,231,231,231,231,231,231,231,231,236,235,232,194,203,230,204,211,230,235,234,232,231,
-            231,231,231,231,231,231,231,231,235,235,235,237,237,237,212,208,200,212,208,200,226,226,226,226,226,
+            231,231,231,231,231,231,231,231,235,235,235,237,237,237,240,240,240,240,240,240,226,226,226,226,226,
             226,222,222,222,222,222,222,222,222,222,226,225,222,236,233,225,234,232,227,222,222,222,222,222,222,
-            222,222,222,222,222,222,225,225,225,230,231,230,212,208,200,212,208,200,224,224,224,216,216,216,214,
+            222,222,222,222,222,222,225,225,225,230,231,230,240,240,240,240,240,240,224,224,224,216,216,216,214,
             214,214,214,214,214,217,216,214,192,198,214,138,155,203,163,175,208,221,219,215,214,214,214,214,214,
-            214,214,214,214,216,216,216,227,227,227,212,208,200,212,208,200,224,224,224,211,211,211,209,209,209,
+            214,214,214,214,216,216,216,227,227,227,240,240,240,240,240,240,224,224,224,211,211,211,209,209,209,
             209,209,209,209,209,209,224,221,213,138,155,198,147,161,199,218,216,211,209,209,209,209,209,209,209,
-            209,209,211,211,211,225,225,225,212,208,200,212,208,200,222,222,222,207,207,207,206,206,206,206,206,
+            209,209,211,211,211,225,225,225,240,240,240,240,240,240,222,222,222,207,207,207,206,206,206,206,206,
             206,206,206,206,218,216,209,118,137,187,130,146,192,217,215,208,206,206,206,206,206,206,206,206,206,
-            207,207,207,223,223,223,212,208,200,212,208,200,227,227,227,207,207,207,206,206,206,206,206,206,206,
+            207,207,207,223,223,223,240,240,240,240,240,240,227,227,227,207,207,207,206,206,206,206,206,206,206,
             206,206,224,220,210,106,127,182,120,138,185,222,219,210,206,206,206,206,206,206,206,206,206,207,207,
-            207,226,226,226,212,208,200,212,208,200,239,239,239,212,212,212,210,210,210,210,210,210,214,213,211,
+            207,226,226,226,240,240,240,240,240,240,239,239,239,212,212,212,210,210,210,210,210,210,214,213,211,
             196,200,208,57,87,168,62,91,169,200,202,208,214,213,211,210,210,210,210,210,210,211,211,211,239,
-            239,239,212,208,200,212,208,200,212,208,200,237,237,237,218,218,218,217,217,217,220,219,218,202,205,
-            214,197,202,214,196,201,214,204,206,213,218,217,216,217,217,217,218,218,218,235,235,235,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,247,247,247,242,242,242,241,241,241,244,243,242,246,
-            245,242,247,246,243,231,231,229,231,231,231,243,243,243,247,247,247,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,166,166,166,199,199,199,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,233,233,233,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            239,239,240,240,240,240,240,240,240,240,240,237,237,237,218,218,218,217,217,217,220,219,218,202,205,
+            214,197,202,214,196,201,214,204,206,213,218,217,216,217,217,217,218,218,218,235,235,235,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,247,247,247,242,242,242,241,241,241,244,243,242,246,
+            245,242,247,246,243,231,231,229,231,231,231,243,243,243,247,247,247,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,166,166,166,199,199,199,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,233,233,233,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -8709,132 +8561,132 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,57,122,255,57,122,255,56,121,255,56,121,255,56,121,255,54,120,255,
-            52,118,255,50,118,255,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,59,124,255,59,124,255,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,57,122,255,57,122,255,56,121,255,56,121,255,56,121,255,54,120,255,
+            52,118,255,50,118,255,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,59,124,255,59,124,255,
             59,124,255,57,122,255,56,121,255,56,121,255,56,121,255,54,120,255,52,118,255,50,118,255,50,
-            118,255,50,118,255,48,117,255,47,115,255,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,59,124,255,59,124,255,59,124,255,61,125,255,70,
+            118,255,50,118,255,48,117,255,47,115,255,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,59,124,255,59,124,255,59,124,255,61,125,255,70,
             131,255,77,136,255,123,162,242,134,171,249,134,171,249,133,169,242,75,135,255,65,127,255,54,120,
-            255,47,115,255,47,115,255,45,114,255,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,61,125,255,59,124,255,59,124,255,63,126,255,75,135,255,149,182,250,197,215,252,246,249,
+            255,47,115,255,47,115,255,45,114,255,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,61,125,255,59,124,255,59,124,255,63,126,255,75,135,255,149,182,250,197,215,252,246,249,
             255,246,249,255,246,249,255,246,249,255,246,249,255,246,249,255,217,229,253,170,196,251,109,151,236,
-            50,118,255,45,114,255,43,113,255,43,113,255,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,61,125,255,59,124,
+            50,118,255,45,114,255,43,113,255,43,113,255,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,61,125,255,59,124,
             255,59,124,255,72,132,255,137,174,249,217,229,253,235,242,255,235,242,255,226,235,253,193,209,243,
             187,205,241,185,204,242,185,204,242,185,204,242,235,242,255,235,242,255,235,242,255,164,192,251,85,
-            137,243,43,113,255,41,111,255,39,110,255,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,61,125,255,59,124,255,59,124,255,93,144,246,
+            137,243,43,113,255,41,111,255,39,110,255,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,61,125,255,59,124,255,59,124,255,93,144,246,
             176,201,251,224,234,255,224,234,255,209,223,251,185,204,242,185,204,242,255,255,255,255,255,255,255,
             255,255,255,255,255,255,255,255,185,204,242,185,204,242,224,234,255,224,234,255,201,218,253,117,154,
-            232,39,110,255,39,110,255,38,109,255,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,59,124,255,59,124,255,75,135,255,192,212,253,215,229,255,215,
+            232,39,110,255,39,110,255,38,109,255,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,59,124,255,59,124,255,75,135,255,192,212,253,215,229,255,215,
             229,255,193,212,249,182,201,240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
             255,255,255,255,255,255,255,255,255,255,185,204,242,215,229,255,215,229,255,207,223,254,114,153,233,
-            38,109,255,38,109,255,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,59,124,255,59,124,255,72,132,255,162,191,251,203,220,255,203,220,255,198,216,253,182,201,
+            38,109,255,38,109,255,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,59,124,255,59,124,255,72,132,255,162,191,251,203,220,255,203,220,255,198,216,253,182,201,
             240,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,
             255,255,255,255,255,255,255,255,255,185,204,242,203,220,255,203,220,255,183,206,253,78,133,245,36,
-            108,255,36,108,255,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,59,124,255,59,124,
+            108,255,36,108,255,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,59,124,255,59,124,
             255,61,125,255,125,165,249,194,215,255,194,215,255,194,215,255,163,189,242,255,255,255,255,255,255,
             255,255,255,255,255,255,230,238,255,196,215,255,194,215,255,199,218,255,242,247,255,255,255,255,255,
             255,255,255,255,255,246,249,255,194,215,255,194,215,255,194,215,255,156,188,251,41,111,255,34,107,
-            255,34,107,255,212,208,200,212,208,200,212,208,200,212,208,200,59,124,255,59,124,255,75,135,255,
+            255,34,107,255,240,240,240,240,240,240,240,240,240,240,240,240,59,124,255,59,124,255,75,135,255,
             171,198,253,181,206,255,181,206,255,181,206,255,187,206,244,255,255,255,255,255,255,255,255,255,246,
             249,255,181,206,255,181,206,255,181,206,255,181,206,255,175,199,249,244,247,251,255,255,255,255,255,
             255,255,255,255,187,209,255,181,206,255,181,206,255,181,206,255,91,140,242,34,107,255,32,106,255,
-            212,208,200,212,208,200,212,208,200,212,208,200,59,124,255,61,125,255,124,165,250,171,198,255,171,
+            240,240,240,240,240,240,240,240,240,240,240,240,59,124,255,61,125,255,124,165,250,171,198,255,171,
             198,255,171,198,255,171,198,255,194,211,246,255,255,255,255,255,255,255,255,255,203,220,255,171,198,
             255,171,198,255,171,198,255,171,198,255,162,191,249,215,224,242,255,255,255,255,255,255,255,255,255,
-            192,213,255,171,198,255,148,182,252,128,169,251,104,152,248,38,109,255,30,104,255,212,208,200,212,
-            208,200,212,208,200,57,122,255,57,122,255,68,130,255,139,177,252,160,191,255,160,191,255,160,191,
+            192,213,255,171,198,255,148,182,252,128,169,251,104,152,248,38,109,255,30,104,255,240,240,240,240,
+            240,240,240,240,240,57,122,255,57,122,255,68,130,255,139,177,252,160,191,255,160,191,255,160,191,
             255,160,191,255,184,206,252,255,255,255,255,255,255,248,251,255,165,195,255,160,191,255,160,191,255,
             160,191,255,160,191,255,145,172,228,255,255,255,255,255,255,255,255,255,255,255,255,126,166,250,94,
-            145,251,84,141,255,84,141,255,84,141,255,56,121,255,30,104,255,30,104,255,212,208,200,212,208,
-            200,57,122,255,56,121,255,77,136,255,145,180,254,149,184,255,149,184,255,149,184,255,149,184,255,
+            145,251,84,141,255,84,141,255,84,141,255,56,121,255,30,104,255,30,104,255,240,240,240,240,240,
+            240,57,122,255,56,121,255,77,136,255,145,180,254,149,184,255,149,184,255,149,184,255,149,184,255,
             149,184,255,181,206,255,199,218,255,162,192,255,149,184,255,149,184,255,149,184,255,149,184,255,145,
             174,232,224,231,244,255,255,255,255,255,255,255,255,255,214,227,253,84,141,255,84,141,255,84,141,
-            255,84,141,255,84,141,255,68,130,255,30,104,255,29,103,255,212,208,200,212,208,200,56,121,255,
+            255,84,141,255,84,141,255,68,130,255,30,104,255,29,103,255,240,240,240,240,240,240,56,121,255,
             56,121,255,85,140,252,138,177,255,138,177,255,138,177,255,138,177,255,138,177,255,138,177,255,138,
             177,255,138,177,255,138,177,255,138,177,255,138,177,255,138,177,255,142,171,232,244,247,251,255,255,
             255,255,255,255,255,255,255,245,248,254,113,157,248,84,141,255,84,141,255,84,141,255,84,141,255,
-            84,141,255,75,135,255,29,103,255,27,102,255,212,208,200,212,208,200,56,121,255,54,120,255,101,
+            84,141,255,75,135,255,29,103,255,27,102,255,240,240,240,240,240,240,56,121,255,54,120,255,101,
             150,249,127,170,255,127,170,255,127,170,255,127,170,255,127,170,255,127,170,255,127,170,255,127,170,
             255,127,170,255,127,170,255,127,170,255,133,163,224,244,247,251,255,255,255,255,255,255,255,255,255,
             245,248,254,124,165,248,84,141,255,84,141,255,84,141,255,84,141,255,84,141,255,84,141,255,84,
-            141,255,27,102,255,26,101,254,212,208,200,212,208,200,54,120,255,54,120,255,99,148,250,115,161,
+            141,255,27,102,255,26,101,254,240,240,240,240,240,240,54,120,255,54,120,255,99,148,250,115,161,
             255,115,161,255,115,161,255,115,161,255,115,161,255,115,161,255,115,161,255,115,161,255,115,161,255,
             115,161,255,114,153,233,244,247,251,255,255,255,255,255,255,255,255,255,245,248,254,124,165,248,84,
             141,255,84,141,255,84,141,255,84,141,255,84,141,255,84,141,255,84,141,255,84,141,255,26,101,
-            254,26,101,254,212,208,200,212,208,200,52,118,255,52,118,255,82,138,254,102,153,255,102,153,255,
+            254,26,101,254,240,240,240,240,240,240,52,118,255,52,118,255,82,138,254,102,153,255,102,153,255,
             102,153,255,102,153,255,102,153,255,102,153,255,102,153,255,102,153,255,102,153,255,103,153,254,175,
             193,231,255,255,255,255,255,255,255,255,255,234,241,254,125,165,249,86,142,255,86,142,255,86,142,
             255,86,142,255,86,142,255,86,142,255,86,142,255,86,142,255,75,135,255,26,101,254,26,101,254,
-            212,208,200,212,208,200,52,118,255,50,118,255,77,136,255,95,148,255,95,148,255,95,148,255,95,
+            240,240,240,240,240,240,52,118,255,50,118,255,77,136,255,95,148,255,95,148,255,95,148,255,95,
             148,255,95,148,255,95,148,255,95,148,255,94,147,254,92,145,254,90,145,255,214,223,241,255,255,
             255,255,255,255,255,255,255,124,166,251,90,145,255,90,145,255,90,145,255,90,145,255,90,145,255,
-            90,145,255,90,145,255,90,145,255,90,145,255,68,130,255,26,100,252,26,100,252,212,208,200,212,
-            208,200,50,118,255,50,118,255,68,130,255,91,145,255,94,147,254,94,147,254,94,147,254,93,146,
+            90,145,255,90,145,255,90,145,255,90,145,255,68,130,255,26,100,252,26,100,252,240,240,240,240,
+            240,240,50,118,255,50,118,255,68,130,255,91,145,255,94,147,254,94,147,254,94,147,254,93,146,
             255,91,145,255,91,145,255,91,145,255,91,145,255,91,145,255,215,223,240,255,255,255,255,255,255,
             225,235,254,91,145,255,91,145,255,91,145,255,91,145,255,91,145,255,91,145,255,91,145,255,91,
-            145,255,91,145,255,91,145,255,52,118,255,26,100,251,26,100,251,212,208,200,212,208,200,212,208,
-            200,48,117,255,54,120,255,93,146,255,93,146,255,93,146,255,93,146,255,93,146,255,93,146,255,
+            145,255,91,145,255,91,145,255,52,118,255,26,100,251,26,100,251,240,240,240,240,240,240,240,240,
+            240,48,117,255,54,120,255,93,146,255,93,146,255,93,146,255,93,146,255,93,146,255,93,146,255,
             93,146,255,93,146,255,93,146,255,93,146,255,195,211,243,255,255,255,255,255,255,174,201,255,93,
             146,255,93,146,255,93,146,255,93,146,255,93,146,255,93,146,255,93,146,255,93,146,255,93,146,
-            255,93,146,255,30,104,255,26,100,251,212,208,200,212,208,200,212,208,200,212,208,200,47,115,255,
+            255,93,146,255,30,104,255,26,100,251,240,240,240,240,240,240,240,240,240,240,240,240,47,115,255,
             47,115,255,83,138,251,99,150,255,99,150,255,99,150,255,99,150,255,99,150,255,99,150,255,99,
             150,255,99,150,255,99,150,255,109,157,255,169,198,255,158,190,255,99,150,255,99,150,255,99,150,
             255,99,150,255,99,150,255,99,150,255,99,150,255,99,150,255,99,150,255,99,150,255,74,133,251,
-            26,100,251,26,100,251,212,208,200,212,208,200,212,208,200,212,208,200,47,115,255,47,115,255,54,
+            26,100,251,26,100,251,240,240,240,240,240,240,240,240,240,240,240,240,47,115,255,47,115,255,54,
             119,253,106,155,255,106,155,255,106,155,255,106,155,255,106,155,255,106,155,255,106,155,255,106,155,
             255,106,155,255,99,145,237,185,204,242,177,197,238,123,165,251,106,155,255,106,155,255,106,155,255,
             106,155,255,106,155,255,106,155,255,106,155,255,106,155,255,106,155,255,35,107,252,26,100,251,26,
-            100,251,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,45,114,255,43,113,255,89,140,
+            100,251,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,45,114,255,43,113,255,89,140,
             243,115,161,255,115,161,255,115,161,255,115,161,255,115,161,255,115,161,255,115,161,255,109,153,242,
             224,230,242,255,255,255,255,255,255,246,249,255,122,166,255,115,161,255,115,161,255,115,161,255,115,
-            161,255,115,161,255,115,161,255,115,161,255,82,135,242,26,100,251,26,100,249,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,43,113,255,43,113,255,107,150,238,
+            161,255,115,161,255,115,161,255,115,161,255,82,135,242,26,100,251,26,100,249,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,43,113,255,43,113,255,107,150,238,
             120,165,255,120,165,255,120,165,255,120,165,255,120,165,255,120,165,255,114,154,238,255,255,255,255,
             255,255,255,255,255,255,255,255,154,188,255,120,165,255,120,165,255,120,165,255,120,165,255,120,165,
-            255,120,165,255,101,145,236,26,100,251,26,100,249,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,43,113,255,41,111,255,39,110,255,114,153,234,127,
+            255,120,165,255,101,145,236,26,100,251,26,100,249,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,43,113,255,41,111,255,39,110,255,114,153,234,127,
             170,255,127,170,255,127,170,255,127,170,255,127,170,255,123,164,247,246,249,255,255,255,255,255,255,
             255,255,255,255,144,180,255,127,170,255,127,170,255,127,170,255,127,170,255,127,170,255,110,151,233,
-            26,100,251,26,100,249,26,100,249,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,39,110,255,38,109,255,38,109,255,107,148,233,136,176,
+            26,100,251,26,100,249,26,100,249,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,39,110,255,38,109,255,38,109,255,107,148,233,136,176,
             255,136,176,255,136,176,255,136,176,255,136,176,255,158,190,255,217,230,255,224,234,255,174,201,255,
             136,176,255,136,176,255,136,176,255,136,176,255,136,176,255,102,145,230,26,100,251,26,100,249,26,
-            100,249,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,38,109,255,36,108,255,36,108,255,56,118,245,125,161,233,
+            100,249,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,38,109,255,36,108,255,36,108,255,56,118,245,125,161,233,
             144,180,255,144,180,255,144,180,255,144,180,255,144,180,255,144,180,255,144,180,255,144,180,255,144,
-            180,255,144,180,255,124,158,228,47,112,243,26,100,251,26,100,249,26,100,249,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,34,107,255,34,107,255,32,106,255,59,119,242,110,
+            180,255,144,180,255,124,158,228,47,112,243,26,100,251,26,100,249,26,100,249,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,34,107,255,34,107,255,32,106,255,59,119,242,110,
             149,227,132,166,234,140,173,242,151,185,255,151,185,255,140,174,242,131,165,233,107,145,225,52,114,
-            241,26,100,251,26,100,251,26,100,249,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,32,106,255,32,106,255,30,104,255,30,104,255,29,103,
+            241,26,100,251,26,100,251,26,100,249,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,32,106,255,32,106,255,30,104,255,30,104,255,29,103,
             255,27,102,255,27,102,255,26,101,254,26,101,254,26,100,252,26,100,251,26,100,251,26,100,251,
-            26,100,249,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,29,103,255,29,103,255,27,102,255,
-            26,101,254,26,101,254,26,100,252,26,100,252,26,100,251,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            26,100,249,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,29,103,255,29,103,255,27,102,255,
+            26,101,254,26,101,254,26,100,252,26,100,252,26,100,251,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -8842,10 +8694,10 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,208,200,212,208,
-            200,212,208,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,208,200,0,0,0,0,
+            240,240,240,240,240,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,240,240,240,240,
+            240,240,240,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,240,240,0,0,0,0,
             0,0,47,47,47,238,238,238,237,237,237,237,237,237,237,237,237,237,237,237,237,237,237,237,237,
             237,237,237,237,237,237,237,237,237,237,234,234,234,74,74,74,0,0,0,0,0,0,0,0,0,
             225,225,225,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,254,
@@ -8863,19 +8715,19 @@
             46,167,255,46,167,255,46,167,255,46,167,255,71,176,253,177,215,243,238,238,238,238,238,238,206,
             206,206,0,0,0,0,0,0,0,0,0,208,208,208,242,242,242,163,206,242,31,154,255,31,154,
             255,31,154,255,41,158,254,137,196,245,228,232,236,235,235,235,235,235,235,235,235,235,204,204,204,
-            0,0,0,0,0,0,0,0,0,206,206,206,240,240,240,156,200,240,18,142,255,18,142,255,94,
+            0,0,0,0,0,0,0,0,0,206,206,206,240,241,240,156,200,240,18,142,255,18,142,255,94,
             174,247,212,224,234,232,232,232,232,232,232,232,232,232,232,232,232,232,232,232,201,201,201,0,0,
             0,0,0,0,0,0,0,204,204,204,239,239,239,152,196,239,55,154,250,183,209,235,230,231,230,
             230,231,230,230,231,230,230,231,230,230,231,230,230,231,230,230,231,230,199,199,199,0,0,0,0,
             0,0,0,0,0,197,197,197,223,223,223,214,221,229,227,227,227,227,227,227,227,227,227,227,227,
             227,227,227,227,227,227,227,227,227,227,227,227,227,221,222,221,194,194,194,0,0,0,0,0,0,
             0,0,0,39,39,39,196,196,196,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,195,
-            195,195,195,195,195,195,195,195,195,195,195,192,192,192,62,62,62,0,0,0,212,208,200,212,208,
-            200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,212,208,200
+            195,195,195,195,195,195,195,195,195,195,195,192,192,192,62,62,62,0,0,0,240,240,240,240,240,
+            240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+            0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,240,240,240
         };
         wxImage image( 16, 16, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -8913,132 +8765,132 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,173,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,177,0,0,178,0,0,
-            177,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,168,0,0,201,0,0,216,0,0,201,0,0,168,
-            0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,168,0,0,178,0,0,219,0,0,255,0,0,219,0,0,178,0,0,168,0,
-            0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,168,0,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,173,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,177,0,0,178,0,0,
+            177,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,168,0,0,201,0,0,216,0,0,201,0,0,168,
+            0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,168,0,0,178,0,0,219,0,0,255,0,0,219,0,0,178,0,0,168,0,
+            0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,168,0,
             0,194,0,0,214,0,0,239,34,34,255,71,71,242,38,38,219,0,0,200,0,0,177,0,0,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,168,0,0,178,0,0,214,0,0,
-            255,0,0,255,71,71,255,127,127,255,71,71,255,0,0,214,0,0,178,0,0,168,0,0,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,168,0,0,194,0,0,214,0,0,237,29,29,255,71,71,255,
-            81,82,255,71,71,246,35,29,232,0,0,216,0,0,198,0,0,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,168,0,0,178,0,0,214,0,0,255,0,0,255,71,71,255,127,127,255,71,71,255,0,
-            0,214,0,0,178,0,0,168,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,178,0,0,178,0,0,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,168,0,0,194,0,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,168,0,0,178,0,0,214,0,0,
+            255,0,0,255,71,71,255,127,127,255,71,71,255,0,0,214,0,0,178,0,0,168,0,0,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,168,0,0,194,0,0,214,0,0,237,29,29,255,71,71,255,
+            81,82,255,71,71,246,35,29,232,0,0,216,0,0,198,0,0,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,168,0,0,178,0,0,214,0,0,255,0,0,255,71,71,255,127,127,255,71,71,255,0,
+            0,214,0,0,178,0,0,168,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,178,0,0,178,0,0,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,168,0,0,194,0,
             0,214,0,0,237,29,29,255,71,71,255,82,82,255,71,71,245,30,24,214,0,0,148,0,38,
             86,0,94,45,1,135,0,0,200,0,0,200,14,0,172,9,0,168,4,0,168,4,0,168,4,
-            0,168,0,0,168,0,0,168,2,0,173,12,0,178,178,0,0,178,0,0,177,0,0,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,168,0,0,178,0,0,214,0,0,255,0,0,
+            0,168,0,0,168,0,0,168,2,0,173,12,0,178,178,0,0,178,0,0,177,0,0,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,168,0,0,178,0,0,214,0,0,255,0,0,
             255,71,71,255,127,127,255,71,71,255,0,0,227,0,0,178,0,0,90,0,89,12,0,178,2,
             0,189,12,0,178,12,0,178,12,0,178,12,0,178,12,0,178,12,0,178,12,0,178,12,0,
-            178,12,0,178,12,0,178,12,0,178,178,0,0,178,0,0,174,0,0,168,0,0,212,208,200,
-            212,208,200,212,208,200,168,0,0,194,0,0,214,0,0,237,29,29,255,71,71,255,82,82,255,
+            178,12,0,178,12,0,178,12,0,178,178,0,0,178,0,0,174,0,0,168,0,0,240,240,240,
+            240,240,240,240,240,240,168,0,0,194,0,0,214,0,0,237,29,29,255,71,71,255,82,82,255,
             71,71,237,29,29,214,0,0,203,0,0,168,0,0,70,1,104,0,0,199,0,0,190,12,0,
             178,7,31,190,6,69,205,26,87,211,47,94,214,47,91,215,47,87,215,72,101,217,89,104,214,
-            53,53,196,12,0,178,178,0,0,178,0,0,178,0,0,178,0,0,177,0,0,212,208,200,167,
+            53,53,196,12,0,178,178,0,0,178,0,0,178,0,0,178,0,0,177,0,0,240,240,240,167,
             0,0,178,0,0,214,0,0,255,0,0,255,71,71,255,127,127,255,71,71,255,0,0,214,0,
-            0,178,0,0,168,0,0,212,208,200,212,208,200,212,208,200,13,0,172,12,0,178,2,59,201,
+            0,178,0,0,168,0,0,240,240,240,240,240,240,240,240,240,13,0,172,12,0,178,2,59,201,
             0,131,229,37,163,245,76,178,254,75,179,255,76,178,254,130,210,255,164,216,254,94,110,216,12,
             0,178,176,0,0,178,0,0,199,0,0,214,0,0,199,0,0,168,0,0,192,0,0,214,0,
             0,237,29,29,255,71,71,255,82,82,255,71,71,237,29,29,214,0,0,194,0,0,168,0,0,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,12,0,177,5,47,188,6,74,202,23,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,12,0,177,5,47,188,6,74,202,23,
             80,232,42,92,255,39,132,255,42,174,245,93,210,255,130,210,255,76,108,219,12,0,178,173,0,
             0,178,0,0,221,0,0,255,0,0,216,0,0,178,0,0,212,0,0,255,0,0,255,71,71,
-            255,127,127,255,71,71,255,0,0,214,0,0,178,0,0,168,0,0,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,13,0,168,12,0,178,6,0,216,0,0,
+            255,127,127,255,71,71,255,0,0,214,0,0,178,0,0,168,0,0,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,13,0,168,12,0,178,6,0,216,0,0,
             255,0,63,245,0,131,229,42,174,245,76,178,254,49,92,218,12,0,178,173,0,0,178,0,0,
             222,36,36,255,64,64,238,26,26,214,0,0,233,26,26,255,71,71,255,82,82,255,71,71,237,
-            29,29,214,0,0,194,0,0,168,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,13,0,167,10,0,196,7,0,215,1,21,228,0,63,240,0,60,244,
+            29,29,214,0,0,194,0,0,168,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,13,0,167,10,0,196,7,0,215,1,21,228,0,63,240,0,60,244,
             0,63,245,39,132,255,75,179,255,49,97,217,12,0,178,173,0,0,178,0,0,216,71,71,255,
             127,127,255,64,64,255,0,0,255,64,64,255,127,127,255,71,71,255,0,0,214,0,0,178,0,
-            0,168,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            0,168,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             13,0,168,12,0,178,6,0,216,0,0,255,0,74,245,0,131,229,0,63,240,0,0,255,42,
             92,255,76,178,254,49,100,216,12,0,178,173,0,0,178,0,0,216,70,70,255,132,132,255,106,
-            106,255,64,64,255,64,64,255,64,64,233,26,26,212,0,0,192,0,0,166,0,0,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,13,0,168,9,0,196,6,
+            106,255,64,64,255,64,64,255,64,64,233,26,26,212,0,0,192,0,0,166,0,0,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,13,0,168,9,0,196,6,
             0,216,3,30,231,0,74,245,0,85,249,0,74,245,1,21,228,6,0,216,23,80,232,37,163,
             245,27,92,213,12,0,178,173,0,0,178,0,0,216,64,64,255,127,127,255,143,143,255,127,127,
-            255,64,64,255,0,0,214,0,0,178,0,0,168,0,0,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,13,0,168,12,0,178,6,0,216,0,0,255,0,74,
+            255,64,64,255,0,0,214,0,0,178,0,0,168,0,0,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,13,0,168,12,0,178,6,0,216,0,0,255,0,74,
             245,0,131,229,0,74,245,0,0,255,7,0,215,12,0,178,6,74,202,0,131,229,5,74,207,
             12,0,178,173,0,0,178,0,0,219,83,83,255,164,164,255,168,168,255,143,143,255,106,106,255,
-            64,64,238,26,26,216,0,0,199,0,0,177,0,0,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,13,0,168,9,0,196,6,0,216,3,30,231,0,74,245,0,85,249,0,74,245,
+            64,64,238,26,26,216,0,0,199,0,0,177,0,0,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,13,0,168,9,0,196,6,0,216,3,30,231,0,74,245,0,85,249,0,74,245,
             3,30,231,6,0,216,10,0,196,13,0,168,5,47,188,2,59,201,6,33,191,12,0,178,173,
             0,0,178,0,0,216,92,92,255,178,178,255,164,164,255,127,127,255,132,132,255,127,127,255,64,
-            64,255,0,0,214,0,0,178,0,0,168,0,0,212,208,200,212,208,200,212,208,200,13,0,168,
+            64,255,0,0,214,0,0,178,0,0,168,0,0,240,240,240,240,240,240,240,240,240,13,0,168,
             12,0,178,6,0,216,0,0,255,0,74,245,0,131,229,0,74,245,0,0,255,6,0,216,12,
-            0,178,13,0,167,212,208,200,12,0,177,12,0,178,12,0,178,12,0,178,176,0,0,178,0,
+            0,178,13,0,167,240,240,240,12,0,177,12,0,178,12,0,178,12,0,178,176,0,0,178,0,
             0,196,45,45,214,87,87,216,78,78,214,60,60,214,66,66,214,67,67,219,34,34,219,0,0,
             197,0,0,178,0,0,188,0,0,198,0,0,109,1,63,13,0,168,2,0,205,6,0,216,3,
-            30,231,0,74,245,0,85,249,0,74,245,3,30,231,6,0,216,9,0,196,13,0,168,212,208,
-            200,212,208,200,212,208,200,13,0,171,12,0,176,12,0,178,178,0,0,178,0,0,178,0,0,
+            30,231,0,74,245,0,85,249,0,74,245,3,30,231,6,0,216,9,0,196,13,0,168,240,240,
+            240,240,240,240,240,240,240,13,0,171,12,0,176,12,0,178,178,0,0,178,0,0,178,0,0,
             178,0,0,178,0,0,178,0,0,178,0,0,178,0,0,178,0,0,178,0,0,178,0,0,178,
             0,0,188,0,0,178,0,0,96,0,84,12,0,178,0,0,229,0,0,255,0,74,245,0,131,
-            229,0,74,245,0,0,255,6,0,216,12,0,178,13,0,168,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,12,0,177,12,0,178,179,1,1,178,0,0,173,0,0,168,0,0,168,
+            229,0,74,245,0,0,255,6,0,216,12,0,178,13,0,168,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,12,0,177,12,0,178,179,1,1,178,0,0,173,0,0,168,0,0,168,
             0,0,168,0,0,168,0,0,168,0,0,167,0,0,168,0,0,195,1,0,197,0,0,138,1,
             36,101,0,79,53,0,146,6,0,216,0,31,239,0,74,245,0,85,249,0,74,245,3,30,231,
-            6,0,216,9,0,196,13,0,168,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,12,0,178,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,13,0,168,12,0,178,
+            6,0,216,9,0,196,13,0,168,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,12,0,178,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,13,0,168,12,0,178,
             6,0,216,0,0,255,0,74,245,0,131,229,0,74,245,0,0,255,6,0,216,12,0,178,13,
-            0,168,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,0,0,191,0,0,213,0,0,229,0,31,238,0,
-            74,245,0,84,248,0,74,245,3,30,231,6,0,216,9,0,196,13,0,168,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,13,0,168,12,0,178,6,0,216,0,0,255,0,74,245,0,131,229,0,74,
-            245,0,0,255,6,0,216,12,0,178,13,0,168,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,12,0,
+            0,168,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,0,0,191,0,0,213,0,0,229,0,31,238,0,
+            74,245,0,84,248,0,74,245,3,30,231,6,0,216,9,0,196,13,0,168,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,13,0,168,12,0,178,6,0,216,0,0,255,0,74,245,0,131,229,0,74,
+            245,0,0,255,6,0,216,12,0,178,13,0,168,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,12,0,
             177,8,0,201,6,0,219,2,35,233,0,74,245,0,84,249,0,74,245,3,30,231,6,0,216,
-            9,0,196,13,0,168,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,14,0,168,12,0,178,6,0,216,
-            0,0,255,0,74,245,0,131,229,0,74,245,0,0,255,6,0,216,12,0,178,13,0,168,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,12,0,177,8,0,201,6,0,219,2,
-            40,234,0,74,245,2,35,233,6,0,216,9,0,196,13,0,168,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,13,0,168,12,0,178,6,0,219,0,0,
-            255,6,0,219,12,0,178,13,0,168,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,13,0,168,8,0,202,6,0,218,8,0,202,
-            13,0,168,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,12,0,177,12,0,178,12,0,177,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            9,0,196,13,0,168,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,14,0,168,12,0,178,6,0,216,
+            0,0,255,0,74,245,0,131,229,0,74,245,0,0,255,6,0,216,12,0,178,13,0,168,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,12,0,177,8,0,201,6,0,219,2,
+            40,234,0,74,245,2,35,233,6,0,216,9,0,196,13,0,168,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,13,0,168,12,0,178,6,0,219,0,0,
+            255,6,0,219,12,0,178,13,0,168,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,13,0,168,8,0,202,6,0,218,8,0,202,
+            13,0,168,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,12,0,177,12,0,178,12,0,177,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
@@ -9046,135 +8898,169 @@
     {
         static const unsigned char data[] = 
         {
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,215,37,37,252,227,227,255,252,252,255,254,254,255,254,254,255,250,250,
-            250,210,210,191,12,12,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,215,37,37,252,227,227,255,252,252,255,254,254,255,254,254,255,250,250,
+            250,210,210,191,12,12,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             248,191,191,251,214,214,247,183,183,246,174,174,246,174,174,246,174,174,246,174,174,247,183,183,252,
-            222,222,241,134,134,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,238,109,109,233,85,85,232,
+            222,222,241,134,134,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,238,109,109,233,85,85,232,
             82,82,232,82,82,232,82,82,232,82,82,232,82,82,232,82,82,232,82,82,232,82,82,236,101,
-            101,225,59,59,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,177,7,7,220,46,46,212,31,31,212,31,31,212,31,
+            101,225,59,59,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,177,7,7,220,46,46,212,31,31,212,31,31,212,31,
             31,214,36,36,214,36,36,214,36,36,214,36,36,212,31,31,212,31,31,210,30,30,221,48,48,
-            140,1,1,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,177,7,7,191,12,12,191,12,12,195,15,15,200,18,18,201,20,20,
-            201,20,20,201,20,20,200,18,18,200,18,18,195,15,15,191,12,12,194,14,14,155,2,2,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
+            140,1,1,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,177,7,7,191,12,12,191,12,12,195,15,15,200,18,18,201,20,20,
+            201,20,20,201,20,20,200,18,18,200,18,18,195,15,15,191,12,12,194,14,14,155,2,2,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
             65,0,0,153,2,2,176,6,6,177,7,7,184,9,9,188,10,10,191,12,12,191,12,12,191,
-            12,12,188,10,10,188,10,10,183,8,8,177,7,7,174,5,5,134,0,0,54,0,0,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,85,0,0,120,
+            12,12,188,10,10,188,10,10,183,8,8,177,7,7,174,5,5,134,0,0,54,0,0,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,85,0,0,120,
             0,0,163,3,3,169,4,4,176,6,6,177,7,7,183,8,8,183,8,8,183,8,8,183,8,
-            8,177,7,7,172,5,5,167,4,4,153,2,2,103,0,0,82,0,0,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,107,0,0,122,0,0,145,1,
+            8,177,7,7,172,5,5,167,4,4,153,2,2,103,0,0,82,0,0,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,107,0,0,122,0,0,145,1,
             1,163,3,3,169,4,4,176,6,6,177,7,7,183,8,8,179,7,7,176,6,6,172,5,5,
-            167,4,4,155,2,2,140,1,1,111,0,0,107,0,0,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,131,0,0,145,1,1,157,2,2,169,4,4,
+            167,4,4,155,2,2,140,1,1,111,0,0,107,0,0,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,131,0,0,145,1,1,157,2,2,169,4,4,
             177,7,7,184,9,9,188,10,10,191,12,12,191,12,12,188,10,10,183,8,8,174,5,5,163,
-            3,3,151,1,1,140,1,1,120,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,120,0,0,163,3,3,172,5,5,184,9,9,194,14,14,201,
+            3,3,151,1,1,140,1,1,120,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,120,0,0,163,3,3,172,5,5,184,9,9,194,14,14,201,
             20,20,208,26,26,208,26,26,208,26,26,205,24,24,200,18,18,191,12,12,179,7,7,167,4,
-            4,157,2,2,103,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,188,10,10,188,10,10,197,16,16,210,30,30,219,44,44,223,53,
+            4,157,2,2,103,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,188,10,10,188,10,10,197,16,16,210,30,30,219,44,44,223,53,
             53,223,53,53,223,53,53,221,48,48,214,36,36,205,24,24,191,12,12,179,7,7,177,7,7,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,176,6,6,215,37,37,214,36,36,221,48,48,231,75,75,236,101,101,236,101,101,
-            236,101,101,233,85,85,226,62,62,219,44,44,208,26,26,204,22,22,167,4,4,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,215,37,37,238,109,109,238,109,109,241,134,134,245,161,161,246,170,170,246,170,170,243,
-            147,147,239,118,118,236,101,101,232,82,82,208,26,26,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,214,36,36,249,201,201,252,227,227,252,227,227,253,232,232,253,232,232,252,227,227,251,214,
-            214,243,147,147,208,26,26,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,57,0,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,176,6,6,215,37,37,214,36,36,221,48,48,231,75,75,236,101,101,236,101,101,
+            236,101,101,233,85,85,226,62,62,219,44,44,208,26,26,204,22,22,167,4,4,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,215,37,37,238,109,109,238,109,109,241,134,134,245,161,161,246,170,170,246,170,170,243,
+            147,147,239,118,118,236,101,101,232,82,82,208,26,26,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,214,36,36,249,201,201,252,227,227,252,227,227,253,232,232,253,232,232,252,227,227,251,214,
+            214,243,147,147,208,26,26,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,57,0,
             0,169,4,4,228,68,68,249,194,194,252,222,222,251,216,216,246,174,174,225,59,59,184,9,9,
-            70,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,134,0,0,220,46,46,210,30,30,
+            70,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,134,0,0,220,46,46,210,30,30,
             177,7,7,174,5,5,183,8,8,183,8,8,177,7,7,188,10,10,220,46,46,215,37,37,111,
-            0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,111,0,0,210,30,30,231,75,75,231,75,75,231,75,75,228,
+            0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,111,0,0,210,30,30,231,75,75,231,75,75,231,75,75,228,
             68,68,225,59,59,221,48,48,225,59,59,231,75,75,228,68,68,231,75,75,205,24,24,89,0,
-            0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,70,0,0,176,6,6,212,31,31,208,26,26,212,31,31,212,31,31,214,36,36,215,37,
+            0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,70,0,0,176,6,6,212,31,31,208,26,26,212,31,31,212,31,31,214,36,36,215,37,
             37,215,37,37,214,36,36,212,31,31,210,30,30,208,26,26,212,31,31,169,4,4,65,0,0,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,145,1,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,145,1,
             1,184,9,9,195,15,15,197,16,16,200,18,18,201,20,20,201,20,20,201,20,20,201,20,20,
-            201,20,20,201,20,20,200,18,18,195,15,15,195,15,15,179,7,7,131,0,0,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,120,0,0,155,2,2,177,7,7,
+            201,20,20,201,20,20,200,18,18,195,15,15,195,15,15,179,7,7,131,0,0,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,120,0,0,155,2,2,177,7,7,
             184,9,9,188,10,10,191,12,12,191,12,12,191,12,12,191,12,12,188,10,10,191,12,12,191,
-            12,12,188,10,10,184,9,9,183,8,8,174,5,5,145,1,1,103,0,0,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,159,2,2,155,2,2,169,4,4,174,5,5,183,
+            12,12,188,10,10,184,9,9,183,8,8,174,5,5,145,1,1,103,0,0,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,159,2,2,155,2,2,169,4,4,174,5,5,183,
             8,8,184,9,9,184,9,9,184,9,9,184,9,9,184,9,9,184,9,9,184,9,9,183,8,
-            8,177,7,7,172,5,5,163,3,3,155,2,2,145,1,1,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,111,0,0,163,3,3,163,3,3,174,5,5,184,9,9,188,10,10,191,12,
+            8,177,7,7,172,5,5,163,3,3,155,2,2,145,1,1,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,111,0,0,163,3,3,163,3,3,174,5,5,184,9,9,188,10,10,191,12,
             12,195,15,15,200,18,18,201,20,20,200,18,18,195,15,15,195,15,15,191,12,12,184,9,9,
-            177,7,7,169,4,4,163,3,3,155,2,2,91,0,0,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,169,4,4,169,4,4,177,7,7,188,10,10,191,12,12,200,18,18,205,24,24,210,30,30,
+            177,7,7,169,4,4,163,3,3,155,2,2,91,0,0,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,169,4,4,169,4,4,177,7,7,188,10,10,191,12,12,200,18,18,205,24,24,210,30,30,
             212,31,31,214,36,36,214,36,36,212,31,31,208,26,26,204,22,22,195,15,15,188,10,10,184,
-            9,9,174,5,5,163,3,3,153,2,2,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,179,7,7,
+            9,9,174,5,5,163,3,3,153,2,2,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,179,7,7,
             177,7,7,188,10,10,195,15,15,205,24,24,212,31,31,215,37,37,221,48,48,221,48,48,223,
             53,53,223,53,53,221,48,48,219,44,44,214,36,36,208,26,26,201,20,20,191,12,12,183,8,
-            8,172,5,5,169,4,4,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,103,0,0,191,12,12,184,9,9,195,
+            8,172,5,5,169,4,4,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,103,0,0,191,12,12,184,9,9,195,
             15,15,205,24,24,214,36,36,221,48,48,225,59,59,228,68,68,232,82,82,232,82,82,232,82,
             82,231,75,75,228,68,68,223,53,53,219,44,44,210,30,30,201,20,20,191,12,12,179,7,7,
-            177,7,7,89,0,0,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,172,5,5,201,20,20,191,12,12,201,20,20,214,36,
+            177,7,7,89,0,0,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,172,5,5,201,20,20,191,12,12,201,20,20,214,36,
             36,221,48,48,228,68,68,233,85,85,236,101,101,240,122,122,240,122,122,240,122,122,239,118,118,
             236,101,101,231,75,75,223,53,53,219,44,44,208,26,26,195,15,15,191,12,12,197,16,16,140,
-            1,1,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,176,6,6,226,62,62,214,36,36,212,31,31,219,44,44,225,59,59,
+            1,1,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,176,6,6,226,62,62,214,36,36,212,31,31,219,44,44,225,59,59,
             233,85,85,239,118,118,243,147,147,246,170,170,246,170,170,246,170,170,245,161,161,242,138,138,236,
-            101,101,231,75,75,221,48,48,214,36,36,214,36,36,219,44,44,208,26,26,147,1,1,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,195,15,15,241,134,134,242,138,138,239,118,118,239,118,118,242,138,138,246,
+            101,101,231,75,75,221,48,48,214,36,36,214,36,36,219,44,44,208,26,26,147,1,1,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,195,15,15,241,134,134,242,138,138,239,118,118,239,118,118,242,138,138,246,
             170,170,246,174,174,249,194,194,249,197,197,249,197,197,248,191,191,246,174,174,243,147,147,240,122,
-            122,238,109,109,236,101,101,236,101,101,223,53,53,188,10,10,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,191,12,12,241,134,134,249,201,201,253,232,232,254,246,246,255,250,
+            122,238,109,109,236,101,101,236,101,101,223,53,53,188,10,10,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,191,12,12,241,134,134,249,201,201,253,232,232,254,246,246,255,250,
             250,255,252,252,255,253,253,255,252,252,255,250,250,254,245,245,253,236,236,251,216,216,248,191,191,
-            241,134,134,205,24,24,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,176,6,6,201,20,20,219,44,44,
-            221,48,48,221,48,48,221,48,48,210,30,30,197,16,16,167,4,4,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,
-            212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,
-            208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,
-            200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200,212,208,200
+            241,134,134,205,24,24,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,176,6,6,201,20,20,219,44,44,
+            221,48,48,221,48,48,221,48,48,210,30,30,197,16,16,167,4,4,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,
+            240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240
         };
         wxImage image( 32, 32, (unsigned char*)data, TRUE );
-        image.SetMaskColour( 212, 208, 200);
+        image.SetMaskColour( 240, 240, 240);
         wxBitmap bitmap( image );
         return bitmap;
     }
+    if (index == 34)
+    {
+        /* XPM */
+        static const char *xpm_data[] = {
+        /* columns rows colors chars-per-pixel */
+        "18 19 4 1",
+        "  c None",
+        "b c #91AC92",
+        "c c #668664",
+        "d c #C7F5C7",
+        /* pixels */
+        "                  ",
+        "              bcc ",
+        "             bccb ",
+        "            bbcb  ",
+        "           bbcc   ",
+        "           ccc    ",
+        "          bccb    ",
+        "         bccb     ",
+        "        bccb      ",
+        "        bcb       ",
+        "       bccb       ",
+        " bcc  bccb        ",
+        " bcc  bcc         ",
+        " cccb ccd         ",
+        " ccccccb          ",
+        "  ccccc           ",
+        "  bcccd           ",
+        "   ccb            ",
+        "                  "
+        };
+        wxBitmap bitmap( xpm_data );
+        return bitmap;
+    }
     return wxNullBitmap;
 }

aMule-2.2.6.tar.bz2/src/muuli_wdr.h -> aMule-2.3.1.tar.bz2/src/muuli_wdr.h Changed

@@ -34,433 +34,453 @@
 extern wxSizer *contentSizer;
 extern wxSizer *s_fed2klh;
 #define ID_BUTTON_FAST 10000
-#define ID_STATICBITMAP 10001
 wxSizer *muleDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_SRV_SPLITTER 10002
+#define ID_SRV_SPLITTER 10001
 wxSizer *serverListDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
 extern wxSizer *s_searchsizer;
-#define IDC_SEARCHNAME 10003
-#define ID_SEARCHTYPE 10004
-#define IDC_EXTENDEDSEARCHCHECK 10005
-#define IDC_FILTERCHECK 10006
+#define IDC_SEARCHNAME 10002
+#define ID_SEARCHTYPE 10003
+#define IDC_EXTENDEDSEARCHCHECK 10004
+#define IDC_FILTERCHECK 10005
 extern wxSizer *s_extendedsizer;
-#define IDC_TypeSearch 10007
-#define ID_AUTOCATASSIGN 10008
-#define IDC_EDITSEARCHEXTENSION 10009
-#define IDC_SPINSEARCHMIN 10010
-#define IDC_SEARCHMINSIZE 10011
-#define IDC_SPINSEARCHMAX 10012
-#define IDC_SEARCHMAXSIZE 10013
-#define IDC_SPINSEARCHAVAIBILITY 10014
+#define IDC_TypeSearch 10006
+#define ID_AUTOCATASSIGN 10007
+#define IDC_EDITSEARCHEXTENSION 10008
+#define IDC_SPINSEARCHMIN 10009
+#define IDC_SEARCHMINSIZE 10010
+#define IDC_SPINSEARCHMAX 10011
+#define IDC_SEARCHMAXSIZE 10012
+#define IDC_SPINSEARCHAVAIBILITY 10013
 extern wxSizer *s_filtersizer;
-#define ID_FILTER_TEXT 10015
-#define ID_FILTER 10016
-#define ID_FILTER_INVERT 10017
-#define ID_FILTER_KNOWN 10018
-#define IDC_STARTS 10019
-#define IDC_SEARCHMORE 10020
-#define IDC_CANCELS 10021
-#define IDC_SDOWNLOAD 10022
-#define IDC_SEARCH_RESET 10023
-#define IDC_CLEAR_RESULTS 10024
-#define ID_NOTEBOOK 10025
-#define ID_SEARCHPROGRESS 10026
+#define ID_FILTER_TEXT 10014
+#define ID_FILTER 10015
+#define ID_FILTER_INVERT 10016
+#define ID_FILTER_KNOWN 10017
+#define IDC_STARTS 10018
+#define IDC_SEARCHMORE 10019
+#define IDC_CANCELS 10020
+#define IDC_SDOWNLOAD 10021
+#define IDC_SEARCH_RESET 10022
+#define IDC_CLEAR_RESULTS 10023
+#define ID_NOTEBOOK 10024
+#define ID_SEARCHPROGRESS 10025
 wxSizer *searchDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_BTNCLRCOMPL 10027
-#define ID_CATEGORIES 10028
-#define ID_DLOADLIST 10029
+#define ID_BTNCLRCOMPL 10026
+#define ID_CATEGORIES 10027
+#define ID_DLOADLIST 10028
 wxSizer *transferTopPane( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
 extern wxSizer *s_clientlistHeader;
-#define ID_CLIENTTOGGLE 10030
-#define ID_BTNSWITCHUP 10031
-#define ID_CLIENTCOUNT 10032
-#define ID_CLIENTLIST 10033
+#define ID_CLIENTTOGGLE 10029
+#define ID_CLIENTCOUNT 10030
+#define ID_CLIENTLIST 10031
 wxSizer *transferBottomPane( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_FRIENDLIST 10034
-#define IDC_CHATSELECTOR 10035
-#define IDC_CMESSAGE 10036
-#define IDC_CSEND 10037
-#define IDC_CCLOSE 10038
+#define ID_MESSAGESPLATTER 10032
 wxSizer *messagePage( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_FNAME 10039
-#define IDC_METFILE 10040
-#define IDC_FHASH 10041
-#define IDC_FSIZE 10042
-#define IDC_PFSTATUS 10043
-#define IDC_LASTSEENCOMPL 10044
-#define IDC_SOURCECOUNT 10045
-#define IDC_SOURCECOUNT2 10046
-#define IDC_PARTCOUNT 10047
-#define IDC_PARTAVAILABLE 10048
-#define IDC_DATARATE 10049
-#define IDC_DLACTIVETIME 10050
-#define IDC_TRANSFERRED 10051
-#define IDC_COMPLSIZE 10052
-#define IDC_PROCCOMPL 10053
-#define IDC_FD_STATS1 10054
-#define IDC_FD_STATS2 10055
-#define IDC_FD_STATS3 10056
-#define IDC_LISTCTRLFILENAMES 10057
-#define IDC_TAKEOVER 10058
-#define IDC_CMTBT 10059
-#define IDC_BUTTONSTRIP 10060
-#define IDC_FILENAME 10061
-#define IDC_APPLY 10062
-#define IDC_APPLY_AND_CLOSE 10063
+#define IDC_FNAME 10033
+#define IDC_METFILE 10034
+#define IDC_FHASH 10035
+#define IDC_FSIZE 10036
+#define IDC_PFSTATUS 10037
+#define IDC_LASTSEENCOMPL 10038
+#define IDC_SOURCECOUNT 10039
+#define IDC_SOURCECOUNT2 10040
+#define IDC_PARTCOUNT 10041
+#define IDC_PARTAVAILABLE 10042
+#define IDC_DATARATE 10043
+#define IDC_DLACTIVETIME 10044
+#define IDC_TRANSFERRED 10045
+#define IDC_COMPLSIZE 10046
+#define IDC_PROCCOMPL 10047
+#define IDC_FD_STATS1 10048
+#define IDC_FD_STATS2 10049
+#define IDC_FD_STATS3 10050
+#define IDC_LISTCTRLFILENAMES 10051
+#define IDC_TAKEOVER 10052
+#define IDC_CMTBT 10053
+#define IDC_BUTTONSTRIP 10054
+#define IDC_FILENAME 10055
+#define IDC_NEXTFILE 10056
+#define IDC_PREVFILE 10057
+#define IDC_APPLY 10058
+#define IDC_APPLY_AND_CLOSE 10059
 #define ID_CLOSEWNDFD 5100
 wxSizer *fileDetails( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_CMT_TEXT 10064
-#define IDC_FC_CLEAR 10065
-#define IDC_RATELIST 10066
-#define IDCOK 10067
-#define IDCCANCEL 10068
+#define IDC_CMT_TEXT 10060
+#define IDC_FC_CLEAR 10061
+#define IDC_RATELIST 10062
+#define IDCOK 10063
+#define IDCCANCEL 10064
 wxSizer *commentDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_LST 10069
-#define IDC_CMSTATUS 10070
-#define IDCREF 10071
+#define IDC_LST 10065
+#define IDC_CMSTATUS 10066
+#define IDCREF 10067
 wxSizer *commentLstDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_ANIMATE 10072
-#define ID_HTTPDOWNLOADPROGRESS 10073
-#define IDC_DOWNLOADSIZE 10074
+#define ID_ANIMATE 10068
+#define ID_HTTPDOWNLOADPROGRESS 10069
+#define IDC_DOWNLOADSIZE 10070
 #define ID_HTTPCANCEL 5101
 wxSizer *downloadDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_IPADDRESS 10075
-#define ID_IPORT 10076
-#define ID_USERNAME 10077
-#define ID_USERHASH 10078
-#define ID_ADDFRIEND 10079
-#define ID_CLOSEDLG 10080
+#define ID_IPADDRESS 10071
+#define ID_IPORT 10072
+#define ID_USERNAME 10073
+#define ID_USERHASH 10074
+#define ID_ADDFRIEND 10075
+#define ID_CLOSEDLG 10076
 wxSizer *addFriendDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_BTNRELSHARED 10081
-#define ID_SHFILELIST 10082
-#define IDC_SREQUESTED 10083
-#define IDC_SREQUESTED2 10084
-#define IDC_SACCEPTED 10085
-#define IDC_SACCEPTED2 10086
-#define IDC_STRANSFERRED 10087
-#define IDC_STRANSFERRED2 10088
+#define ID_SHARESSPLATTER 10077
 wxSizer *sharedfilesDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_DLOADSCOPE 10089
-#define IDC_C0 10090
-#define IDC_C0_3 10091
-#define IDC_C0_2 10092
-#define ID_ULOADSCOPE 10093
-#define IDC_C1 10094
-#define IDC_C1_3 10095
-#define IDC_C1_2 10096
-#define ID_OTHERS 10097
-#define IDC_S3 10098
-#define IDC_S0 10099
-#define ID_ACTIVEC 10100
-#define IDC_S1 10101
+#define ID_DLOADSCOPE 10078
+#define IDC_C0 10079
+#define IDC_C0_3 10080
+#define IDC_C0_2 10081
+#define ID_ULOADSCOPE 10082
+#define IDC_C1 10083
+#define IDC_C1_3 10084
+#define IDC_C1_2 10085
+#define ID_OTHERS 10086
+#define IDC_S3 10087
+#define IDC_S0 10088
+#define ID_ACTIVEC 10089
+#define IDC_S1 10090
 wxSizer *statsDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_DNAME 10102
-#define ID_DHASH 10103
-#define ID_DSOFT 10104
-#define ID_DVERSION 10105
-#define ID_DIP 10106
-#define ID_DID 10107
-#define ID_DSIP 10108
-#define ID_DSNAME 10109
-#define IDT_OBFUSCATION 10110
-#define IDT_KAD 10111
-#define ID_DDOWNLOADING 10112
-#define ID_DAVDR 10113
-#define ID_DAVUR 10114
-#define ID_DDOWN 10115
-#define ID_DDUP 10116
-#define ID_DDOWNTOTAL 10117
-#define ID_DUPTOTAL 10118
-#define ID_DRATIO 10119
-#define IDC_CDIDENT 10120
-#define ID_DRATING 10121
-#define ID_DSCORE 10122
-#define ID_CLOSEWND 10123
+#define ID_DNAME 10091
+#define ID_DHASH 10092
+#define ID_DSOFT 10093
+#define ID_DVERSION 10094
+#define ID_DIP 10095
+#define ID_DID 10096
+#define ID_DSIP 10097
+#define ID_DSNAME 10098
+#define IDT_OBFUSCATION 10099
+#define IDT_KAD 10100
+#define ID_DDOWNLOADING 10101
+#define ID_DAVDR 10102
+#define ID_DAVUR 10103
+#define ID_DDOWN 10104
+#define ID_DDUP 10105
+#define ID_DDOWNTOTAL 10106
+#define ID_DUPTOTAL 10107
+#define ID_DRATIO 10108
+#define IDC_CDIDENT 10109
+#define ID_QUEUERANK 10110
+#define ID_DSCORE 10111
+#define ID_CLOSEWND 10112
 wxSizer *clientDetails( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_NICK 10124
-#define IDC_LANGUAGE 10125
-#define IDC_NEWVERSION 10126
-#define IDC_STARTMIN 10127
-#define IDC_EXIT 10128
-#define IDC_ENABLETRAYICON 10129
-#define IDC_MINTRAY 10130
-#define IDC_TOOLTIPDELAY 10131
-#define IDC_BROWSER 10132
-#define IDC_BROWSERSELF 10133
-#define IDC_SELBROWSER 10134
-#define IDC_BROWSERTABS 10135
-#define IDC_VIDEOPLAYER 10136
-#define IDC_BROWSEV 10137
-#define IDC_VIDEOBACKUP 10138
+#define IDC_NICK 10113
+#define IDC_LANGUAGE 10114
+#define IDC_NEWVERSION 10115
+#define IDC_STARTMIN 10116
+#define IDC_EXIT 10117
+#define IDC_MACHIDEONCLOSE 10118
+#define IDC_ENABLETRAYICON 10119
+#define IDC_MINTRAY 10120
+#define IDC_TOOLTIPDELAY 10121
+#define IDC_BROWSERSELF 10122
+#define IDC_SELBROWSER 10123
+#define IDC_BROWSERTABS 10124
+#define IDC_VIDEOPLAYER 10125
+#define IDC_BROWSEV 10126
+#define IDC_PREVIEW_NOTE 10127
 wxSizer *PreferencesGeneralTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_MAXDOWN 10139
-#define IDC_MAXUP 10140
-#define IDC_SLOTALLOC 10141
-#define IDC_PORT 10142
-#define IDC_UDPPORT 10143
-#define IDC_UDPDISABLE 10144
-#define IDC_ADDRESS 10145
-#define ID_TEXT_CLIENT_UDP_PORT 10146
-#define IDC_MAXSOURCEPERFILE 10147
-#define IDC_MAXCON 10148
-#define IDC_NETWORKED2K 10149
-#define IDC_NETWORKKAD 10150
-#define IDC_UPNP_ENABLED 10151
-#define IDC_UPNPTCPPORT 10152
-#define IDC_AUTOCONNECT 10153
-#define IDC_RECONN 10154
-#define IDC_SHOWOVERHEAD 10155
+#define IDC_MAXDOWN 10128
+#define IDC_MAXUP 10129
+#define IDC_SLOTALLOC 10130
+#define IDC_PORT 10131
+#define ID_TEXT_CLIENT_UDP_PORT 10132
+#define IDC_UDPENABLE 10133
+#define IDC_UDPPORT 10134
+#define IDC_UPNP_ENABLED 10135
+#define IDC_UPNPTCPPORTTEXT 10136
+#define IDC_UPNPTCPPORT 10137
+#define IDC_ADDRESS 10138
+#define ID_TEXT 10139
+#define IDC_MAXSOURCEPERFILE 10140
+#define IDC_MAXCON 10141
+#define IDC_NETWORKKAD 10142
+#define IDC_NETWORKED2K 10143
+#define IDC_AUTOCONNECT 10144
+#define IDC_RECONN 10145
 wxSizer *PreferencesConnectionTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_REMOVEDEAD 10156
-#define IDC_SERVERRETRIES 10157
-#define IDC_AUTOSERVER 10158
-#define IDC_EDITADR 10159
-#define IDC_UPDATESERVERCONNECT 10160
-#define IDC_UPDATESERVERCLIENT 10161
-#define IDC_SCORE 10162
-#define IDC_SMARTIDCHECK 10163
-#define IDC_SAFESERVERCONNECT 10164
-#define IDC_AUTOCONNECTSTATICONLY 10165
-#define IDC_MANUALSERVERHIGHPRIO 10166
+#define IDC_REMOVEDEAD 10146
+#define IDC_SERVERRETRIES 10147
+#define IDC_AUTOSERVER 10148
+#define IDC_EDITADR 10149
+#define IDC_UPDATESERVERCONNECT 10150
+#define IDC_UPDATESERVERCLIENT 10151
+#define IDC_SCORE 10152
+#define IDC_SMARTIDCHECK 10153
+#define IDC_SAFESERVERCONNECT 10154
+#define IDC_AUTOCONNECTSTATICONLY 10155
+#define IDC_MANUALSERVERHIGHPRIO 10156
 wxSizer *PreferencesServerTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_ICH 10167
-#define IDC_AICHTRUST 10168
-#define IDC_ADDNEWFILESPAUSED 10169
-#define IDC_DAP 10170
-#define IDC_PREVIEWPRIO 10171
-#define IDC_UAP 10172
-#define IDC_FULLCHUNKTRANS 10173
-#define IDC_STARTNEXTFILE 10174
-#define IDC_STARTNEXTFILE_SAME 10175
-#define IDC_SRCSEEDS 10176
-#define IDC_CHECKDISKSPACE 10177
-#define IDC_MINDISKSPACE 10178
-#define IDC_ALLOCFULLFILE 10179
+#define IDC_ICH 10157
+#define IDC_AICHTRUST 10158
+#define IDC_ADDNEWFILESPAUSED 10159
+#define IDC_DAP 10160
+#define IDC_PREVIEWPRIO 10161
+#define IDC_STARTNEXTFILE 10162
+#define IDC_STARTNEXTFILE_SAME 10163
+#define IDC_STARTNEXTFILE_ALPHA 10164
+#define IDC_ALLOCFULLFILE 10165
+#define IDC_CHECKDISKSPACE 10166
+#define IDC_MINDISKSPACE 10167
+#define IDC_SRCSEEDS 10168
+#define IDC_UAP 10169
 wxSizer *PreferencesFilesTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_INCFILES 10180
-#define IDC_SELINCDIR 10181
-#define IDC_TEMPFILES 10182
-#define IDC_SELTEMPDIR 10183
-#define IDC_SHARESELECTOR 10184
-#define IDC_SHAREHIDDENFILES 10185
+#define IDC_INCFILES 10170
+#define IDC_SELINCDIR 10171
+#define IDC_TEMPFILES 10172
+#define IDC_SELTEMPDIR 10173
+#define IDC_SHARESELECTOR 10174
+#define IDC_SHAREHIDDENFILES 10175
 wxSizer *PreferencesDirectoriesTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_SLIDERINFO 10186
-#define IDC_SLIDER 10187
-#define IDC_SLIDERINFO3 10188
-#define IDC_SLIDER3 10189
-#define IDC_SLIDERINFO4 10190
-#define IDC_SLIDER4 10191
-#define IDC_COLORSELECTOR 10192
-#define IDC_COLOR_BUTTON 10193
-#define IDC_SLIDERINFO2 10194
-#define IDC_SLIDER2 10195
-#define IDC_CLIENTVERSIONS 10196
-#define IDC_DOWNLOAD_CAP 10197
-#define IDC_UPLOAD_CAP 10198
+#define IDC_SLIDERINFO 10176
+#define IDC_SLIDER 10177
+#define IDC_SLIDERINFO3 10178
+#define IDC_SLIDER3 10179
+#define IDC_SLIDERINFO4 10180
+#define IDC_SLIDER4 10181
+#define IDC_DOWNLOAD_CAP 10182
+#define IDC_UPLOAD_CAP 10183
+#define IDC_COLORSELECTOR 10184
+#define IDC_COLOR_BUTTON 10185
+#define IDC_SLIDERINFO2 10186
+#define IDC_SLIDER2 10187
+#define IDC_CLIENTVERSIONS 10188
 wxSizer *PreferencesStatisticsTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_MAXCON5SEC 10199
-#define IDC_FILEBUFFERSIZE_STATIC 10200
-#define IDC_FILEBUFFERSIZE 10201
-#define IDC_QUEUESIZE_STATIC 10202
-#define IDC_QUEUESIZE 10203
-#define IDC_SERVERKEEPALIVE_LABEL 10204
-#define IDC_SERVERKEEPALIVE 10205
+#define IDC_AMULE_TWEAKS_WARNING 10189
+#define IDC_MAXCON5SEC 10190
+#define IDC_FILEBUFFERSIZE_STATIC 10191
+#define IDC_FILEBUFFERSIZE 10192
+#define IDC_QUEUESIZE_STATIC 10193
+#define IDC_QUEUESIZE 10194
+#define IDC_SERVERKEEPALIVE_LABEL 10195
+#define IDC_SERVERKEEPALIVE 10196
+#define IDC_PREVENT_SLEEP 10197
 wxSizer *PreferencesaMuleTweaksTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_PERCENT 10206
-#define IDC_PROGBAR 10207
-#define IDC_3DDEPTH 10208
-#define IDC_USESKINFILES 10209
-#define IDC_SKIN 10210
+#define IDC_SKIN 10198
+#define IDC_FED2KLH 10199
+#define IDC_EXTCATINFO 10200
+#define IDC_SHOWVERSIONONTITLE 10201
+#define IDC_SHOWRATEONTITLE 10202
+#define IDC_RATESBEFORETITLE 10203
+#define IDC_RATESAFTERTITLE 10204
+#define IDC_SHOWOVERHEAD 10205
+#define IDC_VERTTOOLBAR 10206
+#define IDC_SHOW_COUNTRY_FLAGS 10207
+#define IDC_PERCENT 10208
+#define IDC_PROGBAR 10209
+#define IDC_3DDEPTH 10210
 #define IDC_AUTOSORT 10211
-#define IDC_FED2KLH 10212
-#define IDC_EXTCATINFO 10213
-#define IDC_SHOWRATEONTITLE 10214
-#define IDC_VERTTOOLBAR 10215
-#define IDC_SHOWPARTFILENUMBER 10216
 wxSizer *PreferencesGuiTweaksTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
+#define IDC_EXT_CONN_ACCEPT 10212
+#define IDC_EXT_CONN_IP 10213
+#define IDC_EXT_CONN_TCP_PORT 10214
+#define IDC_UPNP_EC_ENABLED 10215
+#define IDC_EXT_CONN_PASSWD 10216
 #define IDC_ENABLE_WEB 10217
-#define IDC_WEB_PORT 10218
-#define IDC_UPNP_WEBSERVER_ENABLED 10219
-#define IDC_WEBUPNPTCPPORT 10220
-#define IDC_WEB_REFRESH_TIMEOUT 10221
-#define IDC_WEB_GZIP 10222
-#define IDC_ENABLE_WEB_LOW 10223
-#define IDC_WEB_PASSWD 10224
-#define IDC_WEB_PASSWD_LOW 10225
-#define IDC_WEBTEMPLATE 10226
-#define IDC_EXT_CONN_ACCEPT 10227
-#define IDC_EXT_CONN_PASSWD 10228
-#define IDC_EXT_CONN_IP 10229
-#define IDC_EXT_CONN_TCP_PORT 10230
-#define IDC_UPNP_EC_ENABLED 10231
+#define IDC_WEBTEMPLATE 10218
+#define IDC_WEB_PASSWD 10219
+#define IDC_ENABLE_WEB_LOW 10220
+#define IDC_WEB_PASSWD_LOW 10221
+#define IDC_WEB_PORT 10222
+#define IDC_UPNP_WEBSERVER_ENABLED 10223
+#define IDC_WEBUPNPTCPPORTTEXT 10224
+#define IDC_WEBUPNPTCPPORT 10225
+#define IDC_WEB_REFRESH_TIMEOUT 10226
+#define IDC_WEB_GZIP 10227
 wxSizer *PreferencesRemoteControlsTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
 extern wxSizer *prefs_sizer;
-#define ID_PREFSLISTCTRL 10232
-#define ID_PREFS_OK_TOP 10233
-#define ID_PREFS_CANCEL_TOP 10234
+#define ID_PREFSLISTCTRL 10228
+#define ID_PREFS_OK_TOP 10229
+#define ID_PREFS_CANCEL_TOP 10230
 wxSizer *preferencesDlgTop( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_TITLE 10235
-#define IDC_COMMENT 10236
-#define IDC_INCOMING 10237
-#define IDC_BROWSE 10238
-#define IDC_PRIOCOMBO 10239
-#define ID_BOX_CATCOLOR 10240
-#define IDC_CATCOLOR 10241
+#define IDC_TITLE 10231
+#define IDC_COMMENT 10232
+#define IDC_INCOMING 10233
+#define IDC_BROWSE 10234
+#define IDC_PRIOCOMBO 10235
+#define ID_BOX_CATCOLOR 10236
+#define IDC_CATCOLOR 10237
 wxSizer *CategoriesEditWindow( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_SPLATTER 10242
+#define ID_DOWNLOADSSPLATTER 10238
 wxSizer *transferDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_SERVERINFO 10243
-#define ID_BTN_RESET_SERVER 10244
+#define ID_SERVERINFO 10239
+#define ID_BTN_RESET_SERVER 10240
 wxSizer *ServerInfoLog( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_LOGVIEW 10245
-#define ID_BTN_RESET 10246
+#define ID_LOGVIEW 10241
+#define ID_BTN_RESET 10242
 wxSizer *aMuleLog( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_UPDATELIST 10247
-#define IDC_SERVERLISTURL 10248
-#define IDC_SERVERNAME 10249
-#define IDC_IPADDRESS 10250
-#define IDC_SPORT 10251
-#define ID_ADDTOLIST 10252
-#define IDC_ED2KDISCONNECT 10253
-#define ID_SERVERLIST 10254
+#define ID_UPDATELIST 10243
+#define IDC_SERVERLISTURL 10244
+#define IDC_SERVERNAME 10245
+#define IDC_IPADDRESS 10246
+#define IDC_SPORT 10247
+#define ID_ADDTOLIST 10248
+#define IDC_ED2KDISCONNECT 10249
+#define ID_SERVERLIST 10250
 wxSizer *serverListDlgUp( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_SRVLOG_NOTEBOOK 10255
+#define ID_SRVLOG_NOTEBOOK 10251
 wxSizer *serverListDlgDown( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_UPDATEKADLIST 10256
-#define IDC_NODESLISTURL 10257
-#define ID_KADSCOPE 10258
-#define ID_NODE_IP1 10259
-#define ID_NODE_IP2 10260
-#define ID_NODE_IP3 10261
-#define ID_NODE_IP4 10262
-#define ID_NODE_PORT 10263
-#define ID_NODECONNECT 10264
-#define ID_KNOWNNODECONNECT 10265
-#define ID_KADDISCONNECT 10266
+#define ID_UPDATEKADLIST 10252
+#define IDC_NODESLISTURL 10253
+#define ID_KADSCOPE 10254
+#define ID_NODE_IP1 10255
+#define ID_NODE_IP2 10256
+#define ID_NODE_IP3 10257
+#define ID_NODE_IP4 10258
+#define ID_NODE_PORT 10259
+#define ID_NODECONNECT 10260
+#define ID_KNOWNNODECONNECT 10261
+#define ID_KADDISCONNECT 10262
 wxSizer *KadDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_ED2KINFO 10267
+#define ID_ED2KINFO 10263
 wxSizer *ED2K_Info( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_SUPPORT_PO 10268
-#define IDC_ENABLE_PO_OUTGOING 10269
-#define IDC_ENFORCE_PO_INCOMING 10270
-#define IDC_SEESHARES 10271
-#define IDC_IPFCLIENTS 10272
-#define IDC_IPFSERVERS 10273
-#define IDC_IPFRELOAD 10274
-#define IDC_IPFILTERURL 10275
-#define IDC_IPFILTERUPDATE 10276
-#define IDC_AUTOIPFILTER 10277
-#define ID_IPFILTERLEVEL 10278
-#define IDC_FILTERLAN 10279
-#define IDC_PARANOID 10280
-#define IDC_IPFILTERSYS 10281
-#define IDC_SECIDENT 10282
+#define IDC_SECIDENT 10264
+#define IDC_SUPPORT_PO 10265
+#define IDC_ENABLE_PO_OUTGOING 10266
+#define IDC_ENFORCE_PO_INCOMING 10267
+#define IDC_SEESHARES 10268
+#define IDC_IPFCLIENTS 10269
+#define IDC_IPFSERVERS 10270
+#define IDC_IPFRELOAD 10271
+#define IDC_IPFILTERURL 10272
+#define IDC_IPFILTERUPDATE 10273
+#define IDC_AUTOIPFILTER 10274
+#define ID_IPFILTERLEVEL 10275
+#define IDC_FILTERLAN 10276
+#define IDC_PARANOID 10277
+#define IDC_IPFILTERSYS 10278
 wxSizer *PreferencesSecurityTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_ONLINESIG 10283
-#define IDC_OSUPDATE 10284
-#define IDC_OSDIR 10285
-#define IDC_SELOSDIR 10286
+#define IDC_ONLINESIG 10279
+#define IDC_OSUPDATE 10280
+#define IDC_OSDIR 10281
+#define IDC_SELOSDIR 10282
 wxSizer *PreferencesOnlineSigTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define IDC_MSGFILTER 10287
-#define IDC_MSGFILTER_ALL 10288
-#define IDC_MSGFILTER_NONFRIENDS 10289
-#define IDC_MSGFILTER_NONSECURE 10290
-#define IDC_MSGFILTER_WORD 10291
-#define IDC_MSGWORD 10292
-#define IDC_FILTERCOMMENTS 10293
-#define IDC_COMMENTWORD 10294
-wxSizer *PreferencesMessagesTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
-
-#define ID_PROXY_ENABLE_PROXY 10295
-#define ID_PROXY_TYPE 10296
-#define ID_PROXY_NAME 10297
-#define ID_PROXY_PORT 10298
-#define ID_PROXY_ENABLE_PASSWORD 10299
-#define ID_PROXY_USER 10300
-#define ID_PROXY_PASSWORD 10301
-#define ID_PROXY_AUTO_SERVER_CONNECT_WITHOUT_PROXY 10302
+#define IDC_MSGFILTER 10283
+#define IDC_MSGFILTER_ALL 10284
+#define IDC_MSGFILTER_NONFRIENDS 10285
+#define IDC_MSGFILTER_NONSECURE 10286
+#define IDC_MSGFILTER_WORD 10287
+#define IDC_MSGWORD 10288
+#define IDC_MSGLOG 10289
+#define IDC_FILTERCOMMENTS 10290
+#define IDC_COMMENTWORD 10291
+wxSizer *PreferencesFilteringTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+
+#define ID_PROXY_AUTO_SERVER_CONNECT_WITHOUT_PROXY 10292
+#define ID_PROXY_ENABLE_PASSWORD 10293
+#define ID_PROXY_USER 10294
+#define ID_PROXY_PASSWORD 10295
+#define ID_PROXY_ENABLE_PROXY 10296
+#define ID_PROXY_TYPE 10297
+#define ID_PROXY_NAME 10298
+#define ID_PROXY_PORT 10299
 wxSizer *PreferencesProxyTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_REMOTE_HOST 10303
-#define ID_REMOTE_PORT 10304
-#define ID_EC_LOGIN 10305
-#define ID_EC_PASSWD 10306
-#define ID_EC_SAVE 10307
+#define ID_REMOTE_HOST 10300
+#define ID_REMOTE_PORT 10301
+#define ID_EC_LOGIN 10302
+#define ID_EC_PASSWD 10303
+#define ID_EC_SAVE 10304
 wxSizer *CoreConnect( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_VERBOSEDEBUG 10308
-#define ID_DEBUGCATS 10309
+#define ID_VERBOSEDEBUG 10305
+#define ID_DEBUGCATS 10306
 wxSizer *PreferencesDebug( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
 extern wxSizer *IDC_CURJOB;
-#define IDC_CONV_PB_LABEL 10310
-#define IDC_CONV_PROZENT 10311
-#define IDC_CONV_PB_CURRENT 10312
-#define IDC_JOBLIST 10313
-#define IDC_ADDITEM 10314
-#define IDC_RETRY 10315
-#define IDC_CONVREMOVE 10316
+#define IDC_CONV_PB_LABEL 10307
+#define IDC_CONV_PROZENT 10308
+#define IDC_CONV_PB_CURRENT 10309
+#define IDC_JOBLIST 10310
+#define IDC_ADDITEM 10311
+#define IDC_RETRY 10312
+#define IDC_CONVREMOVE 10313
 wxSizer *convertDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
-#define ID_KADINFO 10317
+#define ID_KADINFO 10314
 wxSizer *Kad_Info( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
 extern wxSizer *m_networknotebooksizer;
-#define ID_NETNOTEBOOK 10318
+#define ID_NETNOTEBOOK 10315
 wxSizer *NetDialog( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
 extern wxSizer *IDC_PREFS_EVENTS_PAGE;
-#define IDC_EVENTLIST 10319
+#define IDC_EVENTLIST 10316
 wxSizer *PreferencesEventsTab( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
 
+extern wxSizer *s_sharedfilespeerHeader;
+#define ID_SHAREDCLIENTTOGGLE 10317
+#define IDC_SREQUESTED 10318
+#define IDC_SACCEPTED 10319
+#define IDC_STRANSFERRED 10320
+#define ID_LINE 10321
+#define ID_SHAREDCLIENTLIST 10322
+wxSizer *sharedfilesBottomDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+
+#define ID_SHOW_CLIENTS_MODE 10323
+#define ID_BTNRELSHARED 10324
+#define ID_SHFILELIST 10325
+wxSizer *sharedfilesTopDlg( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+
+#define ID_FRIENDLIST 10326
+wxSizer *messagePageFriends( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+
+#define IDC_CHATSELECTOR 10327
+#define IDC_CMESSAGE 10328
+#define IDC_CSEND 10329
+#define IDC_CCLOSE 10330
+wxSizer *messagePageMessages( wxWindow *parent, bool call_fit = TRUE, bool set_sizer = TRUE );
+
 // Declare menubar functions
 
 // Declare toolbar functions
 
-#define ID_BUTTONCONNECT 10320
-#define ID_BUTTONNETWORKS 10321
-#define ID_BUTTONSEARCH 10322
-#define ID_BUTTONTRANSFER 10323
-#define ID_BUTTONSHARED 10324
-#define ID_BUTTONMESSAGES 10325
-#define ID_BUTTONSTATISTICS 10326
-#define ID_BUTTONNEWPREFERENCES 10327
-#define ID_BUTTONIMPORT 10328
-#define ID_ABOUT 10329
+#define ID_BUTTONCONNECT 10331
+#define ID_BUTTONNETWORKS 10332
+#define ID_BUTTONSEARCH 10333
+#define ID_BUTTONDOWNLOADS 10334
+#define ID_BUTTONSHARED 10335
+#define ID_BUTTONMESSAGES 10336
+#define ID_BUTTONSTATISTICS 10337
+#define ID_BUTTONNEWPREFERENCES 10338
+#define ID_BUTTONIMPORT 10339
+#define ID_ABOUT 10340
 void muleToolbar( wxToolBar *parent );
 
 // Declare bitmap functions

aMule-2.2.6.tar.bz2/src/pixmaps/Makefile.am -> aMule-2.3.1.tar.bz2/src/pixmaps/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/pixmaps/Makefile.in -> aMule-2.3.1.tar.bz2/src/pixmaps/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,7 +33,6 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-@ENABLE_IP2COUNTRY_TRUE@am__append_1 = $(OPT_IP2COUNTRY)
 subdir = src/pixmaps
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -46,11 +43,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -60,37 +59,66 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = flags_xpm
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -105,17 +133,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -127,44 +149,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -186,13 +208,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -200,44 +219,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -246,7 +261,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -254,25 +268,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -284,31 +292,41 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = $(am__append_1)
-@ENABLE_IP2COUNTRY_TRUE@OPT_IP2COUNTRY = flags_xpm
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = flags_xpm
 EXTRA_DIST = chat.ico.xpm \
 	mule_TrayIcon.ico.xpm \
 	mule_Tr_grey.ico.xpm \
@@ -329,14 +347,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pixmaps/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/pixmaps/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pixmaps/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/pixmaps/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -354,7 +372,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -363,7 +381,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -380,16 +398,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -415,16 +432,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -432,14 +449,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -451,81 +468,101 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -555,6 +592,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -574,18 +612,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -604,21 +662,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/CountryFlags.h -> aMule-2.3.1.tar.bz2/src/pixmaps/flags_xpm/CountryFlags.h Changed

@@ -3,6 +3,7 @@
 #ifndef COUNTRY_FLAGS_H
 #define COUNTRY_FLAGS_H
 
+namespace flags {
 
 #include "ad.xpm"
 #include "ae.xpm"
@@ -39,7 +40,6 @@
 #include "bw.xpm"
 #include "by.xpm"
 #include "bz.xpm"
-#include "catalonia.xpm"
 #include "ca.xpm"
 #include "cc.xpm"
 #include "cd.xpm"
@@ -58,7 +58,6 @@
 #include "cx.xpm"
 #include "cy.xpm"
 #include "cz.xpm"
-#include "cs.xpm"
 #include "de.xpm"
 #include "dj.xpm"
 #include "dk.xpm"
@@ -69,12 +68,10 @@
 #include "ee.xpm"
 #include "eg.xpm"
 #include "eh.xpm"
-#include "england.xpm"
 #include "er.xpm"
 #include "es.xpm"
 #include "et.xpm"
-#include "europeanunion.xpm"
-#include "fam.xpm"
+#include "eu.xpm"
 #include "fi.xpm"
 #include "fj.xpm"
 #include "fk.xpm"
@@ -196,7 +193,6 @@
 #include "rw.xpm"
 #include "sa.xpm"
 #include "sb.xpm"
-#include "scotland.xpm"
 #include "sc.xpm"
 #include "sd.xpm"
 #include "se.xpm"
@@ -244,7 +240,6 @@
 #include "vi.xpm"
 #include "vn.xpm"
 #include "vu.xpm"
-#include "wales.xpm"
 #include "wf.xpm"
 #include "ws.xpm"
 #include "ye.xpm"
@@ -297,7 +292,6 @@
 	{bw, "bw"},
 	{by, "by"},
 	{bz, "bz"},
-	{catalonia, "catalonia"},
 	{ca, "ca"},
 	{cc, "cc"},
 	{cd, "cd"},
@@ -316,7 +310,6 @@
 	{cx, "cx"},
 	{cy, "cy"},
 	{cz, "cz"},
-	{cs, "cs"},
 	{de, "de"},
 	{dj, "dj"},
 	{dk, "dk"},
@@ -327,12 +320,10 @@
 	{ee, "ee"},
 	{eg, "eg"},
 	{eh, "eh"},
-	{england, "england"},
 	{er, "er"},
 	{es, "es"},
 	{et, "et"},
-	{europeanunion, "europeanunion"},
-	{fam, "fam"},
+	{eu, "eu"},
 	{fi, "fi"},
 	{fj, "fj"},
 	{fk, "fk"},
@@ -361,7 +352,7 @@
 	{hm, "hm"},
 	{hn, "hn"},
 	{hr, "hr"},
-	{ht_, "ht"},
+	{ht, "ht"},
 	{hu, "hu"},
 	{id, "id"},
 	{ie, "ie"},
@@ -371,7 +362,7 @@
 	{iq, "iq"},
 	{ir, "ir"},
 	{is, "is"},
-	{it_, "it"},
+	{it, "it"},
 	{jm, "jm"},
 	{jo, "jo"},
 	{jp, "jp"},
@@ -454,7 +445,6 @@
 	{rw, "rw"},
 	{sa, "sa"},
 	{sb, "sb"},
-	{scotland, "scotland"},
 	{sc, "sc"},
 	{sd, "sd"},
 	{se, "se"},
@@ -471,7 +461,7 @@
 	{st, "st"},
 	{sv, "sv"},
 	{sy, "sy"},
-	{sz_, "sz"},
+	{sz, "sz"},
 	{tc, "tc"},
 	{td, "td"},
 	{tf, "tf"},
@@ -502,7 +492,6 @@
 	{vi, "vi"},
 	{vn, "vn"},
 	{vu, "vu"},
-	{wales, "wales"},
 	{wf, "wf"},
 	{ws, "ws"},
 	{ye, "ye"},
@@ -516,4 +505,5 @@
 static const int FLAGS_XPM_SIZE = (sizeof flagXPMCodeVector) / (sizeof flagXPMCodeVector[0]);
 
 
+}	// namespace flags
 #endif // COUNTRY_FLAGS_H

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/Makefile.am -> aMule-2.3.1.tar.bz2/src/pixmaps/flags_xpm/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/Makefile.in -> aMule-2.3.1.tar.bz2/src/pixmaps/flags_xpm/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -45,11 +43,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -59,28 +59,26 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -95,17 +93,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -117,44 +109,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -176,13 +168,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -190,44 +179,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -236,7 +221,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -244,25 +228,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -274,29 +252,40 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 EXTRA_DIST = \
 	ad.xpm \
 	ae.xpm \
@@ -333,7 +322,6 @@
 	bw.xpm \
 	by.xpm \
 	bz.xpm \
-	catalonia.xpm \
 	ca.xpm \
 	cc.xpm \
 	cd.xpm \
@@ -352,7 +340,6 @@
 	cx.xpm \
 	cy.xpm \
 	cz.xpm \
-	cs.xpm \
 	de.xpm \
 	dj.xpm \
 	dk.xpm \
@@ -363,12 +350,10 @@
 	ee.xpm \
 	eg.xpm \
 	eh.xpm \
-	england.xpm \
 	er.xpm \
 	es.xpm \
 	et.xpm \
-	europeanunion.xpm \
-	fam.xpm \
+	eu.xpm \
 	fi.xpm \
 	fj.xpm \
 	fk.xpm \
@@ -490,7 +475,6 @@
 	rw.xpm \
 	sa.xpm \
 	sb.xpm \
-	scotland.xpm \
 	sc.xpm \
 	sd.xpm \
 	se.xpm \
@@ -538,7 +522,6 @@
 	vi.xpm \
 	vn.xpm \
 	vu.xpm \
-	wales.xpm \
 	wf.xpm \
 	ws.xpm \
 	ye.xpm \
@@ -555,14 +538,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/pixmaps/flags_xpm/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/pixmaps/flags_xpm/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/pixmaps/flags_xpm/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/pixmaps/flags_xpm/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -580,7 +563,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -589,29 +572,32 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -639,6 +625,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -657,18 +644,38 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -687,16 +694,20 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.3.1.tar.bz2/src/pixmaps/flags_xpm/eu.xpm Added

@@ -0,0 +1,153 @@
+/* XPM */
+static const char *eu[] = {
+/* columns rows colors chars-per-pixel */
+"16 11 136 2",
+"   c #333A66",
+".  c #333B67",
+"X  c #343B67",
+"o  c #343B68",
+"O  c #343C69",
+"+  c #353C6B",
+"@  c #353C6C",
+"#  c #353D6C",
+"$  c #363D6C",
+"%  c #363E6D",
+"&  c #373E6E",
+"*  c #383F6F",
+"=  c #394071",
+"-  c #394172",
+";  c #3A4173",
+":  c #3A4274",
+">  c #3B4275",
+",  c #3C4377",
+"<  c #3D4477",
+"1  c #3D4478",
+"2  c #3E4579",
+"3  c #3E457A",
+"4  c #3F467B",
+"5  c #41487F",
+"6  c #DBBC3F",
+"7  c #E2CD70",
+"8  c #E3CE74",
+"9  c #E4D078",
+"0  c #E4D07A",
+"q  c #3F4A86",
+"w  c #3F4B87",
+"e  c #424982",
+"r  c #444B85",
+"t  c #454C86",
+"y  c #404B89",
+"u  c #414C8A",
+"i  c #464D8A",
+"p  c #474D8A",
+"a  c #424D8D",
+"s  c #424E8E",
+"d  c #434E8E",
+"f  c #424E8F",
+"g  c #474F8D",
+"h  c #484F8D",
+"j  c #434F90",
+"k  c #444F91",
+"l  c #445091",
+"z  c #445191",
+"x  c #455293",
+"c  c #465396",
+"v  c #465397",
+"b  c #4A5190",
+"n  c #4B5293",
+"m  c #4C5394",
+"M  c #4D5495",
+"N  c #4E5596",
+"B  c #465398",
+"V  c #475399",
+"C  c #475499",
+"Z  c #49559B",
+"A  c #4F5598",
+"S  c #4F5599",
+"D  c #4F5699",
+"F  c #49559C",
+"G  c #49559D",
+"H  c #49569D",
+"J  c #50569B",
+"K  c #757788",
+"L  c #75788B",
+"P  c #75798B",
+"I  c #797C92",
+"U  c #7A7D95",
+"Y  c #4956A0",
+"T  c #4957A0",
+"R  c #4957A1",
+"E  c #4A56A1",
+"W  c #4B57A1",
+"Q  c #4B5AA0",
+"!  c #4B5AA1",
+"~  c #4B59A3",
+"^  c #4B5BA2",
+"/  c #4B5AA3",
+"(  c #4C5BA2",
+")  c #4C5BA3",
+"_  c #4C5BA5",
+"`  c #4D5BA6",
+"'  c #4D5BA7",
+"]  c #4E5DA5",
+"[  c #4C5CA7",
+"{  c #4D5CA7",
+"}  c #4E5EA6",
+"|  c #4D5CA8",
+" . c #4D5DA8",
+".. c #4D5CA9",
+"X. c #4E5DAA",
+"o. c #4E5DAB",
+"O. c #4F5FAC",
+"+. c #505FAF",
+"@. c #4F60A8",
+"#. c #5161AA",
+"$. c #5362AD",
+"%. c #5060AF",
+"&. c #5364AC",
+"*. c #5364AD",
+"=. c #5364AF",
+"-. c #5161B0",
+";. c #5262B2",
+":. c #5262B3",
+">. c #5666B1",
+",. c #5667B1",
+"<. c #5363B4",
+"1. c #5464B5",
+"2. c #5464B7",
+"3. c #5769B2",
+"4. c #5768B5",
+"5. c #5969B4",
+"6. c #596BB5",
+"7. c #5464B8",
+"8. c #5564BA",
+"9. c #5666BB",
+"0. c #5767BC",
+"q. c #5767BE",
+"w. c #5B6DB9",
+"e. c #5C6FB9",
+"r. c #5E71BC",
+"t. c #5E72BD",
+"y. c #6175C0",
+"u. c #6175C5",
+"i. c #6377C4",
+"p. c #6378C4",
+"a. c #647AC6",
+"s. c #657BC9",
+"d. c #677CCB",
+"f. c #677DCB",
+"g. c #7D809A",
+"h. c #7F84A1",
+/* pixels */
+"D J D M m b h p t e 5 4 < : = % ",
+"D u.s.s.a.p.y.r.r.3.1.*.@.} c * ",
+"M f.q.q.8.1.%.g.9 U H c l d ^ % ",
+"n d.8.8.1.<.0 o.[ H 0 c j d ( % ",
+"b a.8.1.1.h.%.o._ W H L j d ^ % ",
+"h p.1.-.-.0 o.o.~ H B 6 j d ^ + ",
+"p y.%.-.-.U o._ W G B K j w ^ + ",
+"r t.o.o.o.[ 8 W H B 8 j d q W . ",
+"e w._ _ } ( H I 7 K z d u q H % ",
+"e $.6.3.3.3.1.%.&.+.@.( ^ W z . ",
+"5 2 4 4 < 4 , , : : * % % X X . "
+};

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/ht.xpm -> aMule-2.3.1.tar.bz2/src/pixmaps/flags_xpm/ht.xpm Changed

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/it.xpm -> aMule-2.3.1.tar.bz2/src/pixmaps/flags_xpm/it.xpm Changed

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/makeflags.sh -> aMule-2.3.1.tar.bz2/src/pixmaps/flags_xpm/makeflags.sh Changed

@@ -12,6 +12,7 @@
 echo '#ifndef COUNTRY_FLAGS_H' >> CountryFlags.h
 echo '#define COUNTRY_FLAGS_H' >> CountryFlags.h
 echo >> CountryFlags.h
+echo 'namespace flags {' >> CountryFlags.h
 echo >> CountryFlags.h
 
 # Create include directives
@@ -31,19 +32,11 @@
 # "do" is a reserved word, we can't use it
 #sed -i -e 's/do\[\]/do_\[\]/' do.xpm
 
-# globally used names by wx
-#sed -i -e 's/ht\[\]/ht_\[\]/' ht.xpm
-#sed -i -e 's/it\[\]/it_\[\]/' it.xpm
-#sed -i -e 's/sz\[\]/sz_\[\]/' sz.xpm
-
 # Create the flag/Code vector
 echo 'static struct FlagXPMCode flagXPMCodeVector[] = {'>> CountryFlags.h
 ls *.xpm | sed -e 's/\.xpm$//;/\//s:.*/$[^/][^/]*$:\1:' | \
 	sed -e 's/[A-Za-z]*/	{&, "&"},/' | \
-	sed -e 's/do/do_/1' |
-	sed -e 's/ht/ht_/1' |
-	sed -e 's/it/it_/1' |
-	sed -e 's/sz/sz_/1' \
+	sed -e 's/do/do_/1' \
 	>> CountryFlags.h
 echo '};'>> CountryFlags.h
 echo >> CountryFlags.h
@@ -55,5 +48,6 @@
 echo >> CountryFlags.h
 
 # Finish
+echo '}	// namespace flags' >> CountryFlags.h
 echo '#endif // COUNTRY_FLAGS_H' >> CountryFlags.h

aMule-2.2.6.tar.bz2/src/pixmaps/flags_xpm/sz.xpm -> aMule-2.3.1.tar.bz2/src/pixmaps/flags_xpm/sz.xpm Changed

aMule-2.3.1.tar.bz2/src/skins/Mac_Gray.zip Added

aMule-2.2.6.tar.bz2/src/skins/Makefile.am -> aMule-2.3.1.tar.bz2/src/skins/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/skins/Makefile.in -> aMule-2.3.1.tar.bz2/src/skins/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +15,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -47,11 +45,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -61,6 +61,13 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -68,30 +75,35 @@
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(skindir)"
-dist_skinDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_skin_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -106,17 +118,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -128,44 +134,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -187,13 +193,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -201,44 +204,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -247,7 +246,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -255,25 +253,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -285,34 +277,47 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 dist_skin_DATA = \
 		gnome.zip \
 		kde4.zip \
 		tango.zip \
-		xfce.zip
+		xfce.zip \
+		Mac_Gray.zip \
+		priscilla.zip
 
 skindir = $(pkgdatadir)/skins
 MAINTAINERCLEANFILES = Makefile.in
@@ -323,14 +328,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/skins/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/skins/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/skins/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/skins/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -348,24 +353,27 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 install-dist_skinDATA: $(dist_skin_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(skindir)" || $(mkdir_p) "$(DESTDIR)$(skindir)"
-	@list='$(dist_skin_DATA)'; for p in $$list; do \
+	test -z "$(skindir)" || $(MKDIR_P) "$(DESTDIR)$(skindir)"
+	@list='$(dist_skin_DATA)'; test -n "$(skindir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_skinDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(skindir)/$$f'"; \
-	  $(dist_skinDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(skindir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(skindir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(skindir)" || exit $$?; \
 	done
 
 uninstall-dist_skinDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_skin_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(skindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(skindir)/$$f"; \
-	done
+	@list='$(dist_skin_DATA)'; test -n "$(skindir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(skindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(skindir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -374,29 +382,32 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -405,7 +416,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(skindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -427,6 +438,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -446,18 +458,38 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am: install-dist_skinDATA
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -476,17 +508,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-dist_skinDATA uninstall-info-am
+uninstall-am: uninstall-dist_skinDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_skinDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	install-dist_skinDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-dist_skinDATA \
-	uninstall-info-am
+	pdf-am ps ps-am uninstall uninstall-am uninstall-dist_skinDATA
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.3.1.tar.bz2/src/skins/priscilla.zip Added

aMule-2.2.6.tar.bz2/src/updownclient.h -> aMule-2.3.1.tar.bz2/src/updownclient.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -26,20 +26,22 @@
 #ifndef UPDOWNCLIENT_H
 #define UPDOWNCLIENT_H
 
+#include "Constants.h"		// Needed for ESourceFrom
 #include "GetTickCount.h"	// Needed for GetTickCount
 #include "MD4Hash.h"
 #include <common/StringFunctions.h>
 #include "NetworkFunctions.h"
 #include "OtherStructs.h"
+#include "ClientCredits.h"	// Needed for EIdentState
+#include <ec/cpp/ECID.h>	// Needed for CECID
+#include "BitVector.h"		// Needed for BitVector
+#include "ClientRef.h"		// Needed for debug defines
 
 #include <map>
 
 
-typedef std::vector<bool> BitVector;
-
 class CPartFile;
 class CClientTCPSocket;
-class CClientCredits;
 class CPacket;
 class CFriend;
 class CKnownFile;
@@ -47,71 +49,30 @@
 class CAICHHash;
 
 
-// uploadstate
-#define	US_UPLOADING		0
-#define	US_ONUPLOADQUEUE	1
-#define	US_WAITCALLBACK		2
-#define	US_CONNECTING		3
-#define	US_PENDING		4
-#define	US_LOWTOLOWIP		5
-#define US_BANNED		6
-#define US_ERROR		7
-#define US_NONE			8
-
-// downloadstate
-enum EDownloadState {
-	DS_DOWNLOADING = 0,
-	DS_ONQUEUE,
-	DS_CONNECTED,
-	DS_CONNECTING,
-	DS_WAITCALLBACK,
-	DS_WAITCALLBACKKAD,
-	DS_REQHASHSET,
-	DS_NONEEDEDPARTS,
-	DS_TOOMANYCONNS,
-	DS_TOOMANYCONNSKAD,
-	DS_LOWTOLOWIP,
-	DS_BANNED,
-	DS_ERROR,
-	DS_NONE,
-	DS_REMOTEQUEUEFULL  // not used yet, except in statistics
-};
-
-// m_byChatstate
-enum {
-	MS_NONE = 0,
-	MS_CHATTING,
-	MS_CONNECTING,
-	MS_UNABLETOCONNECT
-};
-
-enum ESourceFrom {
-	SF_NONE,
-	SF_LOCAL_SERVER,
-	SF_REMOTE_SERVER,
-	SF_KADEMLIA,
-	SF_SOURCE_EXCHANGE,
-	SF_PASSIVE,
-	SF_LINK,
-	SF_SOURCE_SEEDS,
-	SF_SEARCH_RESULT
+enum EChatCaptchaState {
+	CA_NONE				= 0,
+	CA_CHALLENGESENT,
+	CA_CAPTCHASOLVED,
+	CA_ACCEPTING,
+	CA_CAPTCHARECV,
+	CA_SOLUTIONSENT
 };
 
-enum ESecureIdentState{
+enum ESecureIdentState {
 	IS_UNAVAILABLE		= 0,
 	IS_ALLREQUESTSSEND	= 0,
 	IS_SIGNATURENEEDED	= 1,
 	IS_KEYANDSIGNEEDED	= 2
 };
 
-enum EInfoPacketState{
+enum EInfoPacketState {
 	IP_NONE			= 0,
 	IP_EDONKEYPROTPACK	= 1,
 	IP_EMULEPROTPACK	= 2,
 	IP_BOTH			= 3
 };
 
-enum EKadState{
+enum EKadState {
 	KS_NONE,
 	KS_QUEUED_FWCHECK,
 	KS_CONNECTING_FWCHECK,
@@ -139,10 +100,10 @@
 // This is fixed on ed2k v1, but can be any number on ED2Kv2
 #define STANDARD_BLOCKS_REQUEST 3
 
-class CUpDownClient
+class CUpDownClient : public CECID
 {
 	friend class CClientList;
-	friend class CUpDownClientListRem;
+	friend class CClientRef;
 private:
 	/**
 	 * Please note that only the ClientList is allowed to delete the clients.
@@ -150,29 +111,43 @@
 	 * funtion, which will safely remove dead clients once every second.
 	 */
 	~CUpDownClient();
-	
-public:
-#ifdef CLIENT_GUI
-	CUpDownClient(class CEC_UpDownClient_Tag *);
+
+	/**
+	 * Reference count which is increased whenever client is linked to a clientref.
+	 * Clients are to be stored only by ClientRefs, CUpDownClient * are for temporary 
+	 * use only.
+	 * Linking is done only by CClientRef which is friend, so methods are private.
+	 */
+	uint16 m_linked;
+#ifdef DEBUG_ZOMBIE_CLIENTS
+	bool	m_linkedDebug;
+	std::multiset<wxString> m_linkedFrom;
+	void	Link(const wxString& from)		{ m_linked++; m_linkedFrom.insert(from); }
+	void	Unlink(const wxString& from);
+	wxString GetLinkedFrom() {
+		wxString ret;
+		for (std::multiset<wxString>::iterator it = m_linkedFrom.begin(); it != m_linkedFrom.end(); it++) {
+			ret += *it + wxT(", ");
+		}
+		return ret;
+	}
 #else
+	void	Link()		{ m_linked++; }
+	void	Unlink();
+#endif
+
+public:
 	//base
 	CUpDownClient(CClientTCPSocket* sender = 0);
 	CUpDownClient(uint16 in_port, uint32 in_userid, uint32 in_serverup, uint16 in_serverport,CPartFile* in_reqfile, bool ed2kID, bool checkfriend);
-#endif
+
 	/**
-	 * This function should be called when the client object is to be deleted.
-	 * It'll close the socket of the client and add it to the deletion queue
-	 * owned by the CClientList class. However, if the CUpDownClient isn't on 
-	 * the normal clientlist, it will be deleted immediatly.
-	 * 
-	 * The purpose of this is to avoid clients suddenly being removed due to 
-	 * asyncronous events, such as socket errors, which can result in the 
-	 * problems, as each CUpDownClient object is often kept in multiple lists,
-	 * and instantly removing the client poses the risk of invalidating 
-	 * currently used iterators and/or creating dangling pointers.
-	 * 
-	 * @see CClientList::AddToDeleteQueue
-	 * @see CClientList::Process
+	 * This function is to be called when the client object is to be deleted.
+	 * It'll close the socket of the client and remove it from various lists
+	 * that can own it.
+	 *
+	 * The client will really be deleted only after thelast reference to it
+	 * is unlinked;
 	 */	
 	void		Safe_Delete();
 
@@ -194,13 +169,13 @@
 	void		SetIP( uint32 val );
 	uint32		GetIP() const 			{ return m_dwUserIP; }
 	bool		HasLowID() const 		{ return IsLowID(m_nUserIDHybrid); }
-	const wxString&	GetFullIP() const		{ return m_FullUserIP; }
+	wxString	GetFullIP() const		{ return Uint32toStringIP(m_FullUserIP); }
 	uint32		GetConnectIP() const		{ return m_nConnectIP; }
 	uint32		GetUserIDHybrid() const		{ return m_nUserIDHybrid; }
 	void		SetUserIDHybrid(uint32 val);
 	uint16_t	GetUserPort() const		{ return m_nUserPort; }
 	void		SetUserPort(uint16_t port)	{ m_nUserPort = port; }
-	uint32		GetTransferredDown() const	{ return m_nTransferredDown; }
+	uint64		GetTransferredDown() const	{ return m_nTransferredDown; }
 	uint32		GetServerIP() const		{ return m_dwServerIP; }
 	void		SetServerIP(uint32 nIP)		{ m_dwServerIP = nIP; }
 	uint16		GetServerPort()	const		{ return m_nServerPort; }
@@ -227,6 +202,8 @@
 	void		ClearDownloadBlockRequests();
 	void		RequestSharedFileList();
 	void		ProcessSharedFileList(const byte* pachPacket, uint32 nSize, wxString& pszDirectory);
+	void		SendSharedDirectories();
+	void		SendSharedFilesOfDirectory(const wxString& strReqDir);
 
 	wxString	GetUploadFileInfo();
 
@@ -251,8 +228,8 @@
 	bool		GetFriendSlot() const 		{ return m_bFriendSlot; }
 	void		SetFriendSlot(bool bNV)		{ m_bFriendSlot = bNV; }
 	void		SetCommentDirty(bool bDirty = true)	{ m_bCommentDirty = bDirty; }
-	uint8			GetSourceExchange1Version() const				{ return m_bySourceExchange1Ver; }
-	bool			SupportsSourceExchange2() const					{ return m_fSupportsSourceEx2; }
+	uint8		GetSourceExchange1Version() const	{ return m_bySourceExchange1Ver; }
+	bool		SupportsSourceExchange2() const		{ return m_fSupportsSourceEx2; }
 	
 	bool		SafeSendPacket(CPacket* packet);
 
@@ -274,49 +251,24 @@
 	//upload
 	uint8		GetUploadState() const		{ return m_nUploadState; }
 	void		SetUploadState(uint8 news);
-	uint32		GetTransferredUp() const	{ return m_nTransferredUp; }
-	uint32		GetSessionUp() const		{ return m_nTransferredUp - m_nCurSessionUp; }
-	void		ResetSessionUp() {
-						m_nCurSessionUp = m_nTransferredUp;
-						m_addedPayloadQueueSession = 0;
-						m_nCurQueueSessionPayloadUp = 0;
-					}
+	uint64		GetTransferredUp() const	{ return m_nTransferredUp; }
+	uint64		GetSessionUp() const		{ return m_nTransferredUp - m_nCurSessionUp; }
+	void		ResetSessionUp();
 	uint32		GetUploadDatarate() const	{ return m_nUpDatarate; }
 
-#ifndef CLIENT_GUI
-	uint32		GetWaitTime() const 		{ return m_dwUploadTime - GetWaitStartTime(); }
+	//uint32		GetWaitTime() const 		{ return m_dwUploadTime - GetWaitStartTime(); }
 	uint32		GetUpStartTimeDelay() const	{ return ::GetTickCount() - m_dwUploadTime; }
 	uint32		GetWaitStartTime() const;
-#else
-	uint32		m_WaitTime, m_UpStartTimeDelay, m_WaitStartTime;
-	uint32		GetWaitTime() const		{ return m_WaitTime; }
-	uint32		GetUpStartTimeDelay() const	{ return m_UpStartTimeDelay; }
-	uint32		GetWaitStartTime() const	{ return m_WaitStartTime; }
-#endif
 
 	bool		IsDownloading()	const 		{ return (m_nUploadState == US_UPLOADING); }
 
-#ifndef CLIENT_GUI
-	uint32		GetScore(
-				bool sysvalue,
-				bool isdownloading = false,
-				bool onlybasevalue = false) const;
-#else
-	uint32		m_score;
-	uint32		GetScore(
-				bool WXUNUSED(sysvalue),
-				bool WXUNUSED(isdownloading) = false,
-				bool WXUNUSED(onlybasevalue) = false) const
-	{
-		return m_score;
-	}
-	uint16		m_waitingPosition;
-	uint16		GetWaitingPosition() const { return m_waitingPosition; }
-#endif
-	double		GetRating() const
-	{
-		return (double)GetScore(false, IsDownloading(), true);
-	}
+	uint32		GetScore() const	{ return m_score; }
+	uint32		CalculateScore()	{ m_score = CalculateScoreInternal(); return m_score; }
+	void		ClearScore()		{ m_score = 0; }
+	uint16		GetUploadQueueWaitingPosition() const	{ return m_waitingPosition; }
+	void		SetUploadQueueWaitingPosition(uint16 pos)	{ m_waitingPosition = pos; }
+	uint8		GetObfuscationStatus() const;
+	uint16		GetNextRequestedPart() const;
 
 	void		AddReqBlock(Requested_Block_Struct* reqblock);
 	void		CreateNextBlockPackage();
@@ -342,7 +294,7 @@
 
 	const CMD4Hash&	GetUploadFileID() const		{ return m_requpfileid; }
 	void		SetUploadFileID(const CMD4Hash& new_id);
-	void		ClearUploadFileID()		{ m_requpfileid.Clear(); m_uploadingfile = NULL;};
+	void		ClearUploadFileID()		{ m_requpfileid.Clear(); m_uploadingfile = NULL;}
 	uint32		SendBlockData();
 	void		ClearUploadBlockRequests();
 	void		SendRankingInfo();
@@ -368,15 +320,16 @@
 	uint8		GetDownloadState() const	{ return m_nDownloadState; }
 	void		SetDownloadState(uint8 byNewState);
 	uint32		GetLastAskedTime() const	{ return m_dwLastAskedTime; }
+	void		ResetLastAskedTime()		{ m_dwLastAskedTime = 0; }
 
 	bool		IsPartAvailable(uint16 iPart) const
-					{ return ( iPart < m_downPartStatus.size() ) ? m_downPartStatus[iPart] : 0; }
+					{ return ( iPart < m_downPartStatus.size() ) ? m_downPartStatus.get(iPart) : 0; }
 	bool		IsUpPartAvailable(uint16 iPart) const 
-					{ return ( iPart < m_upPartStatus.size() ) ? m_upPartStatus[iPart] : 0;}
+					{ return ( iPart < m_upPartStatus.size() ) ? m_upPartStatus.get(iPart) : 0;}
 
 	const BitVector& GetPartStatus() const		{ return m_downPartStatus; }
 	const BitVector& GetUpPartStatus() const	{ return m_upPartStatus; }
-	float		GetKBpsDown() const		{ return kBpsDown; }
+	float		GetKBpsDown() const				{ return kBpsDown; }
 	float		CalculateKBpsDown();
 	uint16		GetRemoteQueueRank() const	{ return m_nRemoteQueueRank; }
 	uint16		GetOldRemoteQueueRank() const	{ return m_nOldRemoteQueueRank; }
@@ -392,13 +345,7 @@
 	void		DeleteAllFileRequests();
 	void		SendBlockRequests();
 	void		ProcessBlockPacket(const byte* packet, uint32 size, bool packed, bool largeblocks);
-
-#ifndef CLIENT_GUI
 	uint16		GetAvailablePartCount() const;
-#else
-	uint16		m_AvailPartCount;
-	uint16		GetAvailablePartCount() const	{ return m_AvailPartCount; }
-#endif
 
 	bool		SwapToAnotherFile(bool bIgnoreNoNeeded, bool ignoreSuspensions, bool bRemoveCompletely, CPartFile* toFile = NULL);
 	void		UDPReaskACK(uint16 nNewQR);
@@ -411,6 +358,18 @@
 	//chat
 	uint8		GetChatState()			{ return m_byChatstate; }
 	void		SetChatState(uint8 nNewS)	{ m_byChatstate = nNewS; }
+	EChatCaptchaState GetChatCaptchaState() const	{ return (EChatCaptchaState)m_nChatCaptchaState; }
+	void		ProcessCaptchaRequest(CMemFile* data);
+	void		ProcessCaptchaReqRes(uint8 nStatus);
+	void		ProcessChatMessage(wxString message);
+	// message filtering
+	uint8		GetMessagesReceived() const	{ return m_cMessagesReceived; }
+	void		IncMessagesReceived()		{ m_cMessagesReceived < 255 ? ++m_cMessagesReceived : 255; }
+	uint8		GetMessagesSent() const		{ return m_cMessagesSent; }
+	void		IncMessagesSent()		{ m_cMessagesSent < 255 ? ++m_cMessagesSent : 255; }
+	bool		IsSpammer() const		{ return m_fIsSpammer; }
+	void		SetSpammer(bool bVal);
+	bool		IsMessageFiltered(const wxString& message);
 
 	//File Comment
 	const wxString&	GetFileComment() const 		{ return m_strComment; }
@@ -418,12 +377,7 @@
 
 	const wxString&	GetSoftStr() const 		{ return m_clientSoftString; }
 	const wxString&	GetSoftVerStr() const		{ return m_clientVerString; }
-#ifndef CLIENT_GUI
 	const wxString GetServerName() const;
-#else
-	wxString m_ServerName;
-	const wxString&	GetServerName() const { return m_ServerName; }
-#endif
 	
 	uint16		GetKadPort() const		{ return m_nKadPort; }
 	void		SetKadPort(uint16 nPort)	{ m_nKadPort = nPort; }
@@ -442,20 +396,19 @@
 
 	// Barry - Process zip file as it arrives, don't need to wait until end of block
 	int 		unzip(Pending_Block_Struct *block, byte *zipped, uint32 lenZipped, byte **unzipped, uint32 *lenUnzipped, int iRecursion = 0);
-	// Barry - Sets string to show parts downloading, eg NNNYNNNNYYNYN
-	wxString	ShowDownloadingParts() const;
 	void 		UpdateDisplayedInfo(bool force = false);
 	int 		GetFileListRequested() const 	{ return m_iFileListRequested; }
 	void 		SetFileListRequested(int iFileListRequested) { m_iFileListRequested = iFileListRequested; }
 
 	void		ResetFileStatusInfo();
 
-	bool		CheckHandshakeFinished(uint32 protocol, uint32 opcode) const;
+	bool		CheckHandshakeFinished() const;
 
 	bool		GetSentCancelTransfer() const	{ return m_fSentCancelTransfer; }
 	void		SetSentCancelTransfer(bool bVal)	{ m_fSentCancelTransfer = bVal; }
 
 	wxString	GetClientFullInfo();
+	wxString	GetClientShortInfo();
 
 	const wxString& GetClientOSInfo() const		{ return m_sClientOSInfo; }
 
@@ -488,12 +441,7 @@
 	 *
 	 * @return True if the socket exists and is connected, false otherwise.
 	 */
-#ifndef CLIENT_GUI
 	bool		IsConnected() const;
-#else
-	bool		m_IsConnected;
-	bool		IsConnected() const		{ return m_IsConnected; }
-#endif
 
 	/**
 	 * Safe function for sending packets.
@@ -514,14 +462,12 @@
 	 *
 	 * @return True if sent, false if connecting
 	 */
-	bool	SendMessage(const wxString& message);
+	bool		SendChatMessage(const wxString& message);
 
-	uint32		GetPayloadInBuffer() const	{ return m_addedPayloadQueueSession - GetQueueSessionPayloadUp(); }
-	uint32		GetQueueSessionPayloadUp() const	{ return m_nCurQueueSessionPayloadUp; }
 	bool		HasBlocks() const		{ return !m_BlockRequests_queue.empty(); }
 
 	/* Source comes from? */
-	ESourceFrom		GetSourceFrom() const	{ return (ESourceFrom)m_nSourceFrom; }
+	ESourceFrom		GetSourceFrom() const	{ return m_nSourceFrom; }
 	void			SetSourceFrom(ESourceFrom val)	{ m_nSourceFrom = val; }
 
 	/* Kad buddy support */
@@ -545,7 +491,7 @@
 	uint8		GetKadVersion()			{ return m_byKadVersion; }
 	void		ProcessFirewallCheckUDPRequest(CMemFile *data);
 	// Kad added by me
-	bool			SendBuddyPing();
+	bool		SendBuddyPing();
 	
 	/* Returns the client hash type (SO_EMULE, mldonkey, etc) */
 	int		GetHashType() const;
@@ -577,7 +523,7 @@
 	/* Returns a pointer to the credits, only for hash purposes */
 	void*		GetCreditsHash() const { return (void*)credits; }
 	
-	uint32		GetLastBlockOffset() const { return m_nLastBlockOffset; }
+	uint16		GetLastDownloadingPart() const { return m_lastDownloadingPart; }
 	
 	bool		GetOSInfoSupport() const { return m_fOsInfoSupport; }
 	
@@ -610,11 +556,13 @@
 	uint32		GetCreationTime() const { return m_nCreationTime; }
 	
 	bool		SupportsLargeFiles() const { return m_fSupportsLargeFiles; }
+
+	EIdentState	GetCurrentIdentState() const { return credits ? credits->GetCurrentIdentState(GetIP()) : IS_NOTAVAILABLE; }
 	
-	#ifdef __DEBUG__
+#ifdef __DEBUG__
 	/* Kry - Debug. See connection_reason definition comment below */
 	void		SetConnectionReason(const wxString& reason) { connection_reason = reason; }
-	#endif
+#endif
 
 	// Encryption / Obfuscation / ConnectOptions
 	bool		SupportsCryptLayer() const			{ return m_fSupportsCryptLayer; }
@@ -638,9 +586,9 @@
 	CClientCredits	*credits;
 	CFriend 	*m_Friend;
 
-	uint32		m_nTransferredUp;
-	uint32		m_nCurQueueSessionPayloadUp;
-	uint32		m_addedPayloadQueueSession;
+	uint64		m_nTransferredUp;
+	sint64		m_nCurQueueSessionPayloadUp;
+	sint64		m_addedPayloadQueueSession;
 
 	struct TransferredData {
 		uint32	datalen;
@@ -692,6 +640,7 @@
 	void		SendHelloTypePacket(CMemFile* data);
 	void		SendFirewallCheckUDPRequest();
 	void		ClearHelloProperties(); // eMule 0.42
+
 	uint32		m_dwUserIP;
 	uint32		m_nConnectIP;		// holds the supposed IP or (after we had a connection) the real IP
 	uint32		m_dwServerIP;
@@ -704,7 +653,7 @@
 	uint8		m_byDataCompVer;
 	bool		m_bEmuleProtocol;
 	wxString	m_Username;
-	wxString	m_FullUserIP;
+	uint32		m_FullUserIP;
 	CMD4Hash	m_UserHash;
 	bool		m_HasValidHash;
 	uint16		m_nUDPPort;
@@ -740,8 +689,9 @@
 	uint32		m_lastRefreshedDLDisplay;
 
 	//upload
-	void CreateStandartPackets(const unsigned char* data,uint32 togo, Requested_Block_Struct* currentblock);
+	void CreateStandardPackets(const unsigned char* data,uint32 togo, Requested_Block_Struct* currentblock);
 	void CreatePackedPackets(const unsigned char* data,uint32 togo, Requested_Block_Struct* currentblock);
+	uint32 CalculateScoreInternal();
 
 	uint8		m_nUploadState;
 	uint32		m_dwUploadTime;
@@ -751,6 +701,8 @@
 	uint16		m_nUpPartCount;
 	CMD4Hash	m_requpfileid;
 	uint16		m_nUpCompleteSourcesCount;
+	uint32		m_score;
+	uint16		m_waitingPosition;
 
 	//! This vector contains the avilability of parts for the file that the user
 	//! is requesting. When changing it, be sure to call CKnownFile::UpdatePartsFrequency
@@ -768,8 +720,8 @@
 	uint16		m_nPartCount;
 	uint32		m_dwLastAskedTime;
 	wxString	m_clientFilename;
-	uint32		m_nTransferredDown;
-	uint32		m_nLastBlockOffset;   // Patch for show parts that you download [Cax2]
+	uint64		m_nTransferredDown;
+	uint16		m_lastDownloadingPart;   // last Part that was downloading
 	uint16		m_cShowDR;
 	uint32		m_dwLastBlockReceived;
 	uint16		m_nRemoteQueueRank;
@@ -787,9 +739,15 @@
 	uint32		msReceivedPrev;
 	uint32		bytesReceivedCycle;
 	// chat
-	uint8 		m_byChatstate;
 	wxString	m_strComment;
+	uint8 		m_byChatstate;
+	uint8		m_nChatCaptchaState;
+	uint8		m_cCaptchasSent;
 	int8		m_iRating;
+	uint8		m_cMessagesReceived;		// count of chatmessages he sent to me
+	uint8		m_cMessagesSent;			// count of chatmessages I sent to him
+	wxString	m_strCaptchaChallenge;
+	wxString	m_strCaptchaPendingMsg;
 
 	unsigned int
 		m_fHashsetRequesting : 1, // we have sent a hashset request to this client
@@ -797,6 +755,7 @@
 					  // if this flag is not set, we just know that we don't know 
 					  // for sure if it is enabled
 		m_fSupportsPreview   : 1,
+		m_fIsSpammer	     : 1,
 		m_fSentCancelTransfer: 1, // we have sent an OP_CANCELTRANSFER in the current connection
 		m_fSharedDirectories : 1, // client supports OP_ASKSHAREDIRS opcodes
 		m_fSupportsAICH      : 3,
@@ -808,6 +767,7 @@
 		m_fSupportsCryptLayer: 1,
 		m_fRequiresCryptLayer: 1,
 		m_fSupportsSourceEx2 : 1,
+		m_fSupportsCaptcha   : 1,
 		m_fDirectUDPCallback : 1;
 
 	unsigned int
@@ -865,22 +825,22 @@
 	wxString	m_lastOSInfo;
 	
 	/* For buddies timeout */
-	uint32 m_nCreationTime;
+	uint32		m_nCreationTime;
 	
 	/* Calculation of last average speed */
-	uint32 m_lastaverage;
-	uint32 m_last_block_start;
+	uint32		m_lastaverage;
+	uint32		m_last_block_start;
 	
 	/* Save the encryption status for display when disconnected */
-	bool m_hasbeenobfuscatinglately;
+	bool		m_hasbeenobfuscatinglately;
 	
 	/* Kry - Debug thing. Clients created just to check their data
 	   have this string set to the reason we want to check them. 
-	   Obviously, once checked, we disconect them. Take that, sucker.
+	   Obviously, once checked, we disconnect them. Take that, sucker.
 	   This debug code is just for me I'm afraid. */
-	  #ifdef __DEBUG__
-	  wxString connection_reason;
-	  #endif
+#ifdef __DEBUG__
+	wxString	connection_reason;
+#endif
 };

aMule-2.2.6.tar.bz2/src/utils/Makefile.am -> aMule-2.3.1.tar.bz2/src/utils/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/utils/Makefile.in -> aMule-2.3.1.tar.bz2/src/utils/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -46,11 +44,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -60,36 +60,65 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -104,17 +133,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -126,44 +149,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -185,13 +208,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -199,44 +219,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -245,7 +261,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -253,25 +268,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -283,35 +292,49 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 @CAS_TRUE@OPT_CAS = cas
 @WXCAS_TRUE@OPT_WXCAS = wxCas
 @ALCC_TRUE@OPT_ALC = aLinkCreator
 @ALC_TRUE@OPT_ALC = aLinkCreator
-SUBDIRS = xas $(OPT_CAS) $(OPT_WXCAS) $(OPT_ALC)
-DIST_SUBDIRS = fileview
+@XAS_TRUE@OPT_XAS = xas
+@PLASMAMULE_TRUE@OPT_PLASMAMULE = plasmamule
+@FILEVIEW_TRUE@OPT_FILEVIEW = fileview
+SUBDIRS = $(OPT_FILEVIEW) $(OPT_XAS) $(OPT_CAS) $(OPT_WXCAS) $(OPT_ALC) ${OPT_PLASMAMULE}
+DIST_SUBDIRS = fileview xas cas wxCas aLinkCreator plasmamule
 MAINTAINERCLEANFILES = Makefile.in
 EXTRA_DIST = mkFileSum.c
 EXTRA__DIST__SUBDIRS = amps scripts
@@ -323,14 +346,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/utils/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/utils/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -348,7 +371,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -357,7 +380,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -374,16 +397,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -409,16 +431,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -426,14 +448,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -445,82 +467,101 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../automake
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -553,6 +594,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -573,18 +615,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -603,21 +665,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	dist-hook distclean distclean-generic distclean-recursive \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive dist-hook distclean distclean-generic \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am
 
 dist-hook:
 	test -z "$(EXTRA__DIST__SUBDIRS)" || \
@@ -631,6 +695,7 @@
 			fi ; \
 		done ; \
 	done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/Makefile.in -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +15,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -47,11 +45,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -61,49 +61,91 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 am__dist_icon_DATA_DIST = alc.xpm
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(icondir)" "$(DESTDIR)$(utildir)"
-dist_iconDATA_INSTALL = $(INSTALL_DATA)
 am__dist_util_DATA_DIST = alc.desktop
-dist_utilDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_icon_DATA) $(dist_util_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -118,17 +160,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -140,44 +176,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -199,13 +235,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -213,44 +246,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -259,7 +288,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -267,25 +295,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -297,29 +319,40 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = src docs
 EXTRA_DIST = alc.rc alc.ico
 @ALC_TRUE@dist_icon_DATA = alc.xpm
@@ -334,14 +367,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/utils/aLinkCreator/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/utils/aLinkCreator/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/aLinkCreator/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/aLinkCreator/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -359,41 +392,47 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 install-dist_iconDATA: $(dist_icon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
-	@list='$(dist_icon_DATA)'; for p in $$list; do \
+	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
+	@list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
-	  $(dist_iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
 	done
 
 uninstall-dist_iconDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_icon_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(icondir)/$$f"; \
-	done
+	@list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(icondir)" && rm -f $$files
 install-dist_utilDATA: $(dist_util_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(utildir)" || $(mkdir_p) "$(DESTDIR)$(utildir)"
-	@list='$(dist_util_DATA)'; for p in $$list; do \
+	test -z "$(utildir)" || $(MKDIR_P) "$(DESTDIR)$(utildir)"
+	@list='$(dist_util_DATA)'; test -n "$(utildir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_utilDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(utildir)/$$f'"; \
-	  $(dist_utilDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(utildir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(utildir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(utildir)" || exit $$?; \
 	done
 
 uninstall-dist_utilDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_util_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(utildir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(utildir)/$$f"; \
-	done
+	@list='$(dist_util_DATA)'; test -n "$(utildir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(utildir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(utildir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -402,7 +441,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -419,16 +458,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -454,16 +492,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -471,14 +509,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -490,81 +528,101 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -575,7 +633,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(icondir)" "$(DESTDIR)$(utildir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -597,6 +655,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -616,18 +675,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-dist_iconDATA install-dist_utilDATA
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -646,24 +725,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-dist_iconDATA uninstall-dist_utilDATA \
-	uninstall-info-am
+uninstall-am: uninstall-dist_iconDATA uninstall-dist_utilDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
 	install-am install-data install-data-am install-dist_iconDATA \
-	install-dist_utilDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-dist_iconDATA \
-	uninstall-dist_utilDATA uninstall-info-am
+	install-dist_utilDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-dist_iconDATA uninstall-dist_utilDATA
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/alc.desktop -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/alc.desktop Changed

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/Makefile.am -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/Makefile.in -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -46,11 +44,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -60,28 +60,26 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -96,17 +94,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -118,44 +110,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -177,13 +169,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -191,44 +180,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -237,7 +222,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -245,25 +229,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -275,37 +253,50 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SELECTED_MANPAGES = $(ALC_MANPAGES) $(ALCC_MANPAGES)
 EXTRA_DIST = \
 	alc.1 alcc.1 \
 	alc.de.1 alcc.de.1 \
 	alc.es.1 alcc.es.1 \
-	alc.eu.1 alcc.eu.1 \
-	alcc.fr.1 \
-	alc.hu.1 alcc.hu.1
+	alc.fr.1 alcc.fr.1 \
+	alc.hu.1 alcc.hu.1 \
+	alc.it.1 alcc.it.1 \
+	alc.ru.1 alcc.ru.1 \
+	alc.tr.1 alcc.tr.1
 
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
@@ -315,14 +306,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/utils/aLinkCreator/docs/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/utils/aLinkCreator/docs/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/aLinkCreator/docs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/aLinkCreator/docs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -340,7 +331,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -349,30 +340,32 @@
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../../../automake
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -400,6 +393,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -419,6 +413,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -426,13 +422,30 @@
 install-data-am:
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
+install-dvi-am:
 
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -451,19 +464,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-hook install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-hook \
-	uninstall-info-am
+	pdf-am ps ps-am uninstall uninstall-am uninstall-hook
 
 install-data-hook:
 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
@@ -502,6 +517,7 @@
 			rm -f $(DESTDIR)$(mandir)/$$locale/man1/$$inst ; \
 		fi; \
 	done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/alc.1 -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alc.1 Changed

@@ -1,16 +1,19 @@
-.TH ALC 1 "September 2009" "aLinkCreator" "aMule utilities"
+.TH ALC 1 "November 2011" "aLinkCreator" "aMule utilities"
+.als B_untranslated B
 .SH NAME
-aLinkCreator \- the aMule ED2k link creator
+aLinkCreator \- the aMule eD2k link creator
 .SH SYNOPSIS
-.B alc
+.B_untranslated alc
 .SH DESCRIPTION
-\fBalc\fR is a graphical utility to create an ED2k link to any file on your computer.
+\fBalc\fR is a graphical utility to create an eD2k link to any file on your computer.
 
-This programm doesn't take any arguments.
+This app doesn't take any arguments.
 .SH REPORTING BUGS
 Please report bugs either on our forum (\fIhttp://forum.amule.org/\fR), or in our bugtracker (\fIhttp://bugs.amule.org/\fR).
 Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member.
 .SH COPYRIGHT
 aMule and all of its related utilities are distributed under the GNU General Public License.
 .SH SEE ALSO
-\fBalcc\fR(1), \fBamule\fR(1)
+.B_untranslated alcc\fR(1), \fBamule\fR(1)
+.SH AUTHOR
+This manpage was written by Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/alc.de.1 -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alc.de.1 Changed

@@ -1,14 +1,31 @@
-.TH ALC 1 "March 2005" "aLinkCreator" "aMule utilities"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALC 1 "November 2011" aLinkCreator "aMule Hilfsprogramme"
+.als B_untranslated B
 .SH NAME
-aLinkCreator \- the aMule ED2k link creator
-.SH SYNOPSIS
-.B alc
-.SH DESCRIPTION
-\fBalc\fR ist ein Grafisches Tool zum erstellen von ED2K Links für jede Datei auf dem Computer.
-.SH PROBLEME BERICHTEN
-Bitte berichte Fehler im Programm entweder im Forum (\fIhttp://forum.amule.org/\fR), oder in unserem Bugtracker (\fIhttp://bugs.amule.org/\fR).
-Bitte berichte keine Fehler per E-Mail, zu unserer Mailingliste oder direkt zu einem Teammitglied.
+ed2k \- aMule eD2k Verweis parser
+.SH SYNTAX
+.B_untranslated alc
+.SH BESCHREIBUNG
+\fBalc\fP ist ein graphisches Werkzeug zum erstellen von eD2k Links für Dateien
+auf deinem Computer.
+
+Dieses Programm hat keine Parameter.
+.SH "FEHLER MELDEN"
+Bitte meldet Fehler entweder in unserem Forum (\fIhttp://forum.amule.org/\fP),
+oder in unseren Bugtracker (\fIhttp://bugs.amule.org/\fP). Bitte meldet uns
+weder Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
+Teammitglieder.
 .SH COPYRIGHT
-aMule und alle seine Tools stehen unter der GNU General Public License.
-.SH SIEHE AUCH
-\fBalcc\fR(1), \fBamule\fR(1)
+aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU
+General Public License
+.SH "SIEHE AUCH"
+.B_untranslated alcc\fR(1), \fBamule\fR(1)
+.SH VERFASSER
+Diese manpage wurde geschrieben von Vollstrecker
+<amule@vollstreckernet.de>
+
+Diese manpage wurde übersetzt von Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/alc.es.1 -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alc.es.1 Changed

@@ -1,14 +1,29 @@
-.TH ALC 1 "Marzo 2005" "aLinkCreator" "Utilidades de aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALC 1 "November 2011" aLinkCreator "aMule utilidades"
+.als B_untranslated B
 .SH NOMBRE
-aLinkCreator \- Creador de enlaces eD2k de aMule
+aLinkCreator \- el creador de enlaces eD2k de aMule
 .SH SINOPSIS
-.B alc
-.SH DESCRIPCIÓN
-\fBalc\fR es una utilidad gráfica para crear enlaces eD2k de cualquier archivo.
-.SH BUGS
-Si descubre bugs, por favor comuníquelos en (\fIhttp://forum.amule.org/\fR), o en nuestro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Por favor, no comunique bugs por e-mail, ni a nuestro maillist ni directamente a ningún miembro del equipo de aMule.
+.B_untranslated alc
+.SH DESCRIPCIÃN
+\fBalc\fP is a graphical utility to create an eD2k link to any file on your
+computer.
+
+Esta apli no tiene ningÃºn argumento.
+.SH "INFORMANDO ERRORES"
+Por favor informa de fallos ya sea en nuestro foro
+(\fIhttp://forum.amule.org/\fP), o en nuestro bugtracker
+(\fIhttp://bugs.amule.org/\fP). Por favor no informe de fallos por correo, ni
+en nuestras listas, ni directamente al correo de algun miembro del equipo.
 .SH COPYRIGHT
-aMule, y todas las utilidades que con el vienen, se distribuyen bajo la licencia GPL.
-.SH VER
-\fBalcc\fR(1), \fBamule\fR(1)
+aMule y todas las demÃ¡s utilidades relacionadas son distribuidas bajo la GNU
+General Public License.
+.SH "VEASE TAMBIEN"
+.B_untranslated alcc\fR(1), \fBamule\fR(1)
+.SH AUTOR
+Esta pÃ¡gina de manualfue escrita por Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alc.fr.1 Added

@@ -0,0 +1,29 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALC 1 "Novembre 2011" aLinkCreator "Outils d'aMule"
+.als B_untranslated B
+.SH NOM
+aLinkCreator \- le créateur de liens eD2k d'aMule
+.SH SYNOPSIS
+.B_untranslated alc
+.SH DESCRIPTION
+\fBalc\fP est un utilitaire graphique pour créer un lien eD2k pour n'importe
+quel fichier sur votre ordinateur.
+
+Cette application ne prend pas d'arguments.
+.SH "RAPPORTER DES BOGUES"
+Veuillez rapporter les bogues sur notre forum (\fIhttp://forum.amule.org/\fP),
+ou sur notre bugtracker (\fIhttp://bugs.amule.org/\fP).  Veuillez ne pas
+rapporter les bogues par e\-mail, sur notre liste de diffusion ou directement
+à n'importe quel membre  de l'équipe.
+.SH COPYRIGHT
+aMule et tout ses outils sont distribués sous la licence GNU General Public
+License.
+.SH "VOIR AUSSI"
+.B_untranslated alcc\fR(1), \fBamule\fR(1)
+.SH AUTEUR
+Cette manpage a été écrite par Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/alc.hu.1 -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alc.hu.1 Changed

@@ -1,16 +1,29 @@
-.TH ALC 1 "2005 március" "aLinkCreator" "aMule segédprogramok"
-.SH NÉV
-aLinkCreator \- az aMule ED2k hivatkozás készítõ
-.SH ÁTTEKINTÉS
-.B alc
-.SH LEÍRÁS
-Az \fBalc\fR egy grafikus segédeszköz ED2k hivatkozások készítéséhez bármely fájlhoz a számítógépen.
-.SH HIBÁK JELENTÉSE
-A hibákat kérjük vagy a fórumon (\fIhttp://forum.amule.org/\fR), vagy a hibakövetõben (\fIhttp://bugs.amule.org/\fR) jelentsék.
-Hibákról kérjük ne írjanak levelet (e-mail-t) se a levelzési listára, se közvetlenül valamelyik fejlesztõnek.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALC 1 "2011. november" aLinkCreator "aMule segÃ©dprogramok"
+.als B_untranslated B
+.SH NÃV
+aLinkCreator \- az aMule eD2k hivatkozÃ¡s kÃ©szÃtÅ
+.SH ÃTTEKINTÃS
+.B_untranslated alc
+.SH LEÃRÃS
+Az \fBalc\fP egy grafikus segÃ©dprogram eD2k hivatkozÃ¡sok lÃ©trehozÃ¡sÃ¡hoz
+
+A program nem vÃ¡r semmilyen paramÃ©tert.
+.SH "HIBÃK JELENTÃSE"
+A hibÃ¡kat kÃ©rjÃ¼k vagy a fÃ³rumon (\fIhttp://forum.amule.org/\fP), vagy a
+hibakÃ¶vetÅben (\fIhttp://bugs.amule.org/\fP) jelentsÃ©k. HibÃ¡krÃ³l kÃ©rjÃ¼k ne
+Ãrjanak levelet (e\-mail\-t) se a levelezÃ©si listÃ¡ra, se kÃ¶zvetlenÃ¼l
+valamelyik fejlesztÅnek.
 .SH COPYRIGHT
-Az aMule és az összes hozzá tartozó segédprogram a GNU General Public Licence védelme alatt áll.
-.SH LÁSD MÉG
-\fBalcc\fR(1), \fBamule\fR(1)
-.SH MAGYAR FORDÍTÁS
-Dévai Tamás <gonosztopi@amule.org>
+Az aMule Ã©s az Ã¶sszes hozzÃ¡ tartozÃ³ segÃ©dprogram a GNU General Public
+License vÃ©delme alatt Ã¡ll.
+.SH "LÃSD MÃG"
+.B_untranslated alcc\fR(1), \fBamule\fR(1)
+.SH SZERZÅ
+Ezt a kÃ©zikÃ¶nyv lapot Vollstrecker <amule@vollstreckernet.de> Ãrta.
+.SH MAGYAR FORDÃTÃS
+DÃ©vai TamÃ¡s <gonosztopi@amule.org>

aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alc.it.1 Added

@@ -0,0 +1,31 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALC 1 "Novembre 2011" aLinkCreator "Utilità di aMule"
+.als B_untranslated B
+.SH NOME
+aLinkCreator \- generatore di collegamenti eD2k di aMule
+.SH SINTASSI
+.B_untranslated alc
+.SH DESCRIZIONE
+\fBalc\fP è una utilità grafica per creare un collegamento eD2k da ogni file
+sul vostro computer.
+
+Questa applicazione non accetta parametri.
+.SH "SEGNALARE I BUG"
+Per favore segnalare i bug nel nostro forum (\fIhttp://forum.amule.org/\fP) o
+nel nostro bugtracker (\fIhttp://bugs.amule.org/\fP). Per favore non segnalare
+i bug via posta elettronica, né nella nostra mailing list né direttamente a
+qualunque membro del gruppo.
+.SH COPYRIGHT
+aMule e tutti i programmi di utilità correlati sono distribuiti in accordo
+alla GNU General Public License.
+.SH "VEDI ANCHE"
+.B_untranslated alcc\fR(1), \fBamule\fR(1)
+.SH AUTORE
+Questa pagina del manuale è stata scritta da Vollstrecker
+<amule@vollstreckernet.de>
+.SH TRADUZIONE ITALIANA
+Stefano Corti <iz0bbz@libero.it>

aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alc.ru.1 Added

@@ -0,0 +1,29 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALC 1 "November 2011" aLinkCreator "утилиты aMule"
+.als B_untranslated B
+.SH ИМЯ
+aLinkCreator \- создатель eD2k\-ссылок aMule
+.SH ОБЗОР
+.B_untranslated alc
+.SH ОПИСАНИЕ
+\fBalc\fP \- графическая утилита, которая создает eD2k\-ссылку для любого файла
+на вашем компьютере.
+
+Утилита не принимает параметров.
+.SH "СООБЩЕНИЕ ОБ ОШИБКАХ"
+Пожалуйста, сообщайте об ошибках либо на нашем форуме
+(\fIhttp://forum.amule.org/\fP), либо в багтрекере
+(\fIhttp://bugs.amule.org/\fP). Пожалуйста, не сообщайте об ошбках по
+электронной почте, по нашим спискам рассылки, или напрямую участникам.
+.SH "АВТОРСКИЕ ПРАВА"
+aMule и все прилагающиеся инструменты распространаются под Открытым
+Лицензионным Соглашением GNU (GNU GPL).
+.SH "СМ. ТАКЖЕ"
+.B_untranslated alcc\fR(1), \fBamule\fR(1)
+.SH АВТОРЫ
+Автор страницы помощи: Vollstrecker <amule@vollstreckernet.de>,
+перевод: Radist Morse <radist.morse@gmail.com>

aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alc.tr.1 Added

@@ -0,0 +1,29 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALC 1 "Kasım 2011" aLinkCreator "aMule yardımcı araçları"
+.als B_untranslated B
+.SH İSİM
+aLinkCreator \- aMule eD2k bağlantı yaratıcısı
+.SH KULLANIM
+.B_untranslated alc
+.SH AÇIKLAMA
+\fBalc\fP bilgisayarınızdaki herhangi bir dosya için eD2k bağlantısı
+yaratabilen grafik arayüzlü bir araçtır.
+
+Bu uygulama hiçbir argüman almaz.
+.SH GERİBİLDİRİM
+Hataları bildirmek için forumumuzu (\fIhttp://forum.amule.org/\fP) ya da hata
+takipçimizi (\fIhttp://bugs.amule.org/\fP) kullanınız. Hataları bildirmek için
+e\-mail ve e\-mail listemizi kullanmamanızı ve geliştiricilerden birine
+doğrudan bildirmemenizi rica ederiz.
+.SH "TELİF HAKKI"
+aMule ve ilgili tüm yardımcı araçları GNU Genel Kamu Lisansı çerçevesinde
+dağıtılmaktadır.
+.SH "İLGİLİ BELGELER"
+.B_untranslated alcc\fR(1), \fBamule\fR(1)
+.SH YAZAN
+Bu kılavuz sayfası Vollstrecker <amule@vollstreckernet.de>
+tarafından yazılmıştır.

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/alcc.1 -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alcc.1 Changed

@@ -1,30 +1,34 @@
-.TH ALCC "1" "September 2009" "aMule ED2k links calculator" "aMule utilities"
+.TH ALCC "1" "November 2011" "aMule eD2k links calculator" "aMule utilities"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NAME
-alcc \- text based ED2K links calculator for aMule
+alcc \- text based eD2k links calculator for aMule
 .SH SYNOPSIS
-.B alcc
-.RB [ \-p ]
-.RB [ \-v ]
+.B_untranslated alcc
+.RB_untranslated [ \-p ]
+.RB_untranslated [ \-v ]
 .I <inputfiles_list>
-.PP
-.B alcc
-.RB [ \-h ]
+
+.B_untranslated alcc
+.RB_untranslated [ \-h ]
 .SH DESCRIPTION
-Compute the ED2K links of all the input files given in the \fI<inputfiles_list>\fR (There can be one or more files).
-.SS "Usage:"
+Compute the eD2k links of all the input files given in the \fI<inputfiles_list>\fR (There can be one or more files).
 .TP
-\fB\-h, \-\-help\fR
-Prints a short usage description.
+.B_untranslated [ \-p\fR, \fB\-\-parthashes ]\fR
+Compute and add part hashes to the computed eD2k links.
 .TP
-\fB\-v, \-\-verbose\fR
-Be verbose: print calculation steps.
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Prints a short usage description.
 .TP
-\fB\-p, \-\-parthashes\fR
-Compute and add part hashes to the computed ED2K links.
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Be verbose \-
+show also calculation steps.
 .SH REPORTING BUGS
 Please report bugs either on our forum (\fIhttp://forum.amule.org/\fR), or in our bugtracker (\fIhttp://bugs.amule.org/\fR).
 Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member.
 .SH COPYRIGHT
 aMule and all of its related utilities are distributed under the GNU General Public License.
 .SH SEE ALSO
-\fBalc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.B_untranslated alc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH AUTHOR
+This manpage was written by Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/alcc.de.1 -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alcc.de.1 Changed

@@ -1,27 +1,45 @@
-.TH ALCC 1 "March 2005" "aLinkCreator" "aMule utilities"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALCC 1 "November 2011" "aMule eD2k Verweis Ersteller" "aMule Hilfsprogramme"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NAME
-aLinkCreator \- the aMule ED2k link creator
-.SH SYNOPSIS
-.B alcc
-.RB [ \-h ]
-.RB [ \-v ]
-.RB [ \-p ]
-.I zu berechnende Dateien...
+alcc \- textbasierter eD2k Verweis Ersteller für aMule
+.SH SYNTAX
+.B_untranslated alcc
+.RB_untranslated [ \-p ]
+.RB_untranslated [ \-v ]
+\fI<eingabedatei_liste>\fP
+
+.B_untranslated alcc
+.RB_untranslated [ \-h ]
 .SH BESCHREIBUNG
-\fBalcc\fR ist ein Kommandozeilen Tool zum Erstellen von ED2K Links für jede Datei auf dem Computer.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Zeigt diese Hilfe.
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Gibt zusätliche Informationen.
-.TP
-\fB\-p\fR, \fB\-\-parthashes\fR
-Hängt Part-Hashes an den ED2K Link.
-.SH PROBLEME BERICHTEN
-Bitte berichte Fehler im Programm entweder im Forum (\fIhttp://forum.amule.org/\fR), oder in unserem Bugtracker (\fIhttp://bugs.amule.org/\fR).
-Bitte berichte keine Fehler per E-Mail, auch nicht an unsere Mailingliste oder direkt an ein Teammitglied.
+Berechne die eD2k Verweise aller Eingabedateien aus \fI<dateiliste>\fP
+(eine oder mehrere Dateien).
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-parthashes ]\fR
+Berechne Teilprüfsummen und füge sie dem berechneten eD2k Verweis hinzu.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Gibt eine kurze Nutzungsbeschreibung aus.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Sei gesprächig \- Zeige auch die Rechenschritte an.
+.SH "FEHLER MELDEN"
+Bitte meldet Fehler entweder in unserem Forum (\fIhttp://forum.amule.org/\fP),
+oder in unseren Bugtracker (\fIhttp://bugs.amule.org/\fP). Bitte meldet uns
+weder Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
+Teammitglieder.
 .SH COPYRIGHT
-aMule und alle seine Tools stehen unter der GNU General Public License.
-.SH SIEHE AUCH
-\fBalc\fR(1), \fBamule\fR(1)
+aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU
+General Public License
+.SH "SIEHE AUCH"
+.B_untranslated alc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH VERFASSER
+Diese manpage wurde geschrieben von Vollstrecker
+<amule@vollstreckernet.de>
+
+Diese manpage wurde übersetzt von Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/alcc.es.1 -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alcc.es.1 Changed

@@ -1,27 +1,43 @@
-.TH ALCC 1 "Marzo 2005" "aLinkCreator" "Utilidades de aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALCC 1 "November 2011" "Calculador de enlaces eD2k de aMule" "aMule utilidades"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOMBRE
-aLinkCreator \- Creador de enlaces eD2k de aMule
+alcc \- calculador de enlaces eD2k basado en texto para aMule
 .SH SINOPSIS
-.B alcc
-.RB [ \-h ]
-.RB [ \-v ]
-.RB [ \-p ]
-.I archivos...
-.SH DESCRIPCIÓN
-\fBalcc\fR es una utilidad en modo comando para crear enlaces eD2k de cualquier archivo.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Muestra ayuda del modo de uso.
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Mostrar información adicional.
-.TP
-\fB\-p\fR, \fB\-\-parthashes\fR
-Añadir part-hashes a los enlaces eD2k.
-.SH BUGS
-Si descubre bugs, por favor comuníquelos en (\fIhttp://forum.amule.org/\fR), o en nuestro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Por favor, no comunique bugs por e-mail, ni a nuestro maillist ni directamente a ningún miembro del equipo de aMule.
+.B_untranslated alcc
+.RB_untranslated [ \-p ]
+.RB_untranslated [ \-v ]
+\fI<inputfiles_list>\fP
+
+.B_untranslated alcc
+.RB_untranslated [ \-h ]
+.SH DESCRIPCIÃN
+Compute the eD2k links of all the input files given in the
+\fI<inputfiles_list>\fP (There can be one or more files).
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-parthashes ]\fR
+Compute and add part hashes to the computed eD2k links.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Imprime una breve descripciÃ³n de uso.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Modo Extendido \- muestra tambiÃ©n los pasos de cÃ¡lculo.
+.SH "INFORMANDO ERRORES"
+Por favor informa de fallos ya sea en nuestro foro
+(\fIhttp://forum.amule.org/\fP), o en nuestro bugtracker
+(\fIhttp://bugs.amule.org/\fP). Por favor no informe de fallos por correo, ni
+en nuestras listas, ni directamente al correo de algun miembro del equipo.
 .SH COPYRIGHT
-aMule, y todas las utilidades que con el vienen, se distribuyen bajo la licencia GPL.
-.SH VER
-\fBalc\fR(1), \fBamule\fR(1)
+aMule y todas las demÃ¡s utilidades relacionadas son distribuidas bajo la GNU
+General Public License.
+.SH "VEASE TAMBIEN"
+.B_untranslated alc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH AUTOR
+Esta pÃ¡gina de manualfue escrita por Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/alcc.fr.1 -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alcc.fr.1 Changed

@@ -1,32 +1,44 @@
-.TH ALCC "1" "Mars 2005" "Calculatrice de liens ED2K pour aMule" "Outil pour aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALCC 1 "Novembre 2011" "aMule eD2k links calculator" "Outils d'aMule"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOM
-alcc \- calculatrice en ligne de commande de liens ED2K pour aMule
+alcc \- calculateur de lien eD2k pour aMule
 .SH SYNOPSIS
-.B alcc
-.RB [ \-p ]
-.RB [ \-v ]
-.I <liste_de_fichiers>
-.PP
-.B alcc
-.RB [ \-h ]
+.B_untranslated alcc
+.RB_untranslated [ \-p ]
+.RB_untranslated [ \-v ]
+\fI<liste de fichier d'entrÃ©>\fP
+
+.B_untranslated alcc
+.RB_untranslated [ \-h ]
 .SH DESCRIPTION
-Calcule les liens ED2K de tous les fichiers de la liste \fI<liste_de_fichiers>\fR (La liste peut contenir un ou plusieurs fichiers séparés par des espaces).
-.SS "Usage:"
-.TP
-\fB\-h, \-\-help\fR
-Afficher l'aide d'utilisation et quitter.
-.TP
-\fB\-v, \-\-verbose\fR
-Mode bavard: afficher les étapes des calculs.
-.TP
-\fB\-p, \-\-parthashes\fR
-Calculer et ajouter les hashes partiels aux liens ED2K calculés.
-.SH SIGNALEMENT DES BUGS
-Reportez les bugs sur notre forum (\fIhttp://forum.amule.org/\fR), ou dans notre bugtracker (\fIhttp://bugs.amule.org/\fR).
-N'utilisez ni un e-mail, ni notre liste de diffusion ni ne reportez directement un bug à un membre de notre equipe.
+Calcule les liens eD2k de tous les fichiers d'entrÃ©e prÃ©cisÃ© dans la
+\fI<liste des fichiers d'entrÃ©s>\fP (Il peut y un seul fichier ou
+plusieurs).
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-parthashes ]\fR
+Calcule et ajoute les parties de hachages aux liens eD2k calculÃ©s.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Afficher une court description d'utilisation.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Mode bavard \- affiche aussi les Ã©tapes de calculs.
+.SH "RAPPORTER DES BOGUES"
+Veuillez rapporter les bogues sur notre forum (\fIhttp://forum.amule.org/\fP),
+ou sur notre bugtracker (\fIhttp://bugs.amule.org/\fP).  Veuillez ne pas
+rapporter les bogues par e\-mail, sur notre liste de diffusion ou directement
+Ã  n'importe quel membre  de l'Ã©quipe.
 .SH COPYRIGHT
-aMule et tous les utilitaires associés sont distribués sous licence GNU General Public License.
-.SH VOIR AUSSI
-\fBalc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
-.SH TRADUCTION
-ThePolish, 2005
+aMule et tout ses outils sont distribuÃ©s sous la licence GNU General Public
+License.
+.SH "VOIR AUSSI"
+.B_untranslated alc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH AUTEUR
+Cette manpage a Ã©tÃ© Ã©crite par Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/docs/alcc.hu.1 -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alcc.hu.1 Changed

@@ -1,32 +1,44 @@
-.TH ALCC "1" "2005 március" "aMule ED2k hivatkozás készítõ" "aMule segédeszközök"
-.SH NÉV
-alcc \- szöveges ED2K hivatkozás készítõ az aMule-hoz
-.SH ÁTTEKINTÉS
-.B alcc
-.RB [ \-p ]
-.RB [ \-v ]
-.I <fájl_lista>
-.PP
-.B alcc
-.RB [ \-h ]
-.SH LEÍRÁS
-Kiszámítja az ED2K hivatkozásokat minden megadott fájlra a \fI<fájl_lista>\fR-ban (egy vagy több fájl lehetséges).
-.SS "Használat:"
-.TP
-\fB\-h, \-\-help\fR
-Kiírja ezt a súgót.
-.TP
-\fB\-v, \-\-verbose\fR
-Bõbeszédû: a számítási lépéseket is kiírja.
-.TP
-\fB\-p, \-\-parthashes\fR
-Rész-hash-ek számítása és hozzáadása a készített ED2K hivatkozáshoz.
-.SH HIBÁK JELENTÉSE
-A hibákat kérjük vagy a fórumon (\fIhttp://forum.amule.org/\fR), vagy a hibakövetõben (\fIhttp://bugs.amule.org/\fR) jelentsék.
-Hibákról kérjük ne írjanak levelet (e-mail-t) se a levelzési listára, se közvetlenül valamelyik fejlesztõnek.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALCC 1 "2011. november" "aMule eD2k hivatkozÃ¡s kÃ©szÃtÅ" "aMule segÃ©dprogramok"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH NÃV
+alcc \- szÃ¶veges eD2k hivatkozÃ¡s kÃ©szÃtÅ az aMule\-hez
+.SH ÃTTEKINTÃS
+.B_untranslated alcc
+.RB_untranslated [ \-p ]
+.RB_untranslated [ \-v ]
+\fI<fÃ¡jl(ok)...>\fP
+
+.B_untranslated alcc
+.RB_untranslated [ \-h ]
+.SH LEÃRÃS
+A parancssorban megadott fÃ¡jl(ok)hoz szÃ¡mÃtja ki az eD2k
+hivatkozÃ¡s(oka)t. Egyszerre tÃ¶bb fÃ¡jl is megadhatÃ³.
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-parthashes ]\fR
+RÃ©sz\-hash\-ek szÃ¡mÃtÃ¡sa Ã©s hozzÃ¡adÃ¡sa a kÃ©szÃtett eD2k hivatkozÃ¡shoz.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Egy rÃ¶vid hasznÃ¡lati leÃrÃ¡st jelenÃt meg.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+BÅbeszÃ©dÅ± mÃ³d \- a szÃ¡mÃtÃ¡si lÃ©pÃ©seket is megjelenÃti.
+.SH "HIBÃK JELENTÃSE"
+A hibÃ¡kat kÃ©rjÃ¼k vagy a fÃ³rumon (\fIhttp://forum.amule.org/\fP), vagy a
+hibakÃ¶vetÅben (\fIhttp://bugs.amule.org/\fP) jelentsÃ©k. HibÃ¡krÃ³l kÃ©rjÃ¼k ne
+Ãrjanak levelet (e\-mail\-t) se a levelezÃ©si listÃ¡ra, se kÃ¶zvetlenÃ¼l
+valamelyik fejlesztÅnek.
 .SH COPYRIGHT
-Az aMule és az összes hozzá tartozó segédprogram a GNU General Public Licence védelme alatt áll.
-.SH LÁSD MÉG
-\fBalc\fR(1), \fBamule\fR(1)
-.SH MAGYAR FORDÍTÁS
-Dévai Tamás <gonosztopi@amule.org>
+Az aMule Ã©s az Ã¶sszes hozzÃ¡ tartozÃ³ segÃ©dprogram a GNU General Public
+License vÃ©delme alatt Ã¡ll.
+.SH "LÃSD MÃG"
+.B_untranslated alc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH SZERZÅ
+Ezt a kÃ©zikÃ¶nyv lapot Vollstrecker <amule@vollstreckernet.de> Ãrta.
+.SH MAGYAR FORDÃTÃS
+DÃ©vai TamÃ¡s <gonosztopi@amule.org>

aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alcc.it.1 Added

@@ -0,0 +1,45 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALCC 1 "Novembre 2011" "Calcolatore di collegamenti eD2k di aMule" "Utilità di aMule"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH NOME
+alcc \- Generatore di collegamenti eD2k in formato testo per aMule
+.SH SINTASSI
+.B_untranslated alcc
+.RB_untranslated [ \-p ]
+.RB_untranslated [ \-v ]
+\fI<elenco_di_file>\fP
+
+.B_untranslated alcc
+.RB_untranslated [ \-h ]
+.SH DESCRIZIONE
+Genera i collegamenti eD2k di tutti i file in ingresso forniti in
+\fI<elenco_di_file>\fP (Ci possono essere uno o più file).
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-parthashes ]\fR
+Genera e include gli hash delle singole parti al collegamento eD2k.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Visualizza una breve descrizione dell'utilizzo.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Dettagliato \- mostra anche i passaggi di calcolo.
+.SH "SEGNALARE I BUG"
+Per favore segnalare i bug nel nostro forum (\fIhttp://forum.amule.org/\fP) o
+nel nostro bugtracker (\fIhttp://bugs.amule.org/\fP). Per favore non segnalare
+i bug via posta elettronica, né nella nostra mailing list né direttamente a
+qualunque membro del gruppo.
+.SH COPYRIGHT
+aMule e tutti i programmi di utilità correlati sono distribuiti in accordo
+alla GNU General Public License.
+.SH "VEDI ANCHE"
+.B_untranslated alc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH AUTORE
+Questa pagina del manuale è stata scritta da Vollstrecker
+<amule@vollstreckernet.de>
+.SH TRADUZIONE ITALIANA
+Stefano Corti <iz0bbz@libero.it>

aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alcc.ru.1 Added

@@ -0,0 +1,43 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALCC 1 "November 2011" "aMule калькулятор eD2k\-ссылок" "утилиты aMule"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH ИМЯ
+alcc \- текстовый калькулятор eD2k\-ссылок для aMule
+.SH ОБЗОР
+.B_untranslated alcc
+.RB_untranslated [ \-p ]
+.RB_untranslated [ \-v ]
+\fI<список_файлов>\fP
+
+.B_untranslated alcc
+.RB_untranslated [ \-h ]
+.SH ОПИСАНИЕ
+Вычисляет eD2k\-ссылки для всех файлов указанных в \fI<списке_файлов>\fP
+(Может быть один или более файлов).
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-parthashes ]\fR
+Вычисляет и добавляет частичные хэши к вычисленным eD2k\-ссылкам.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Выводит короткую помощь по использованию.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Показать подробности \- показывает также шаги вычислений.
+.SH "СООБЩЕНИЕ ОБ ОШИБКАХ"
+Пожалуйста, сообщайте об ошибках либо на нашем форуме
+(\fIhttp://forum.amule.org/\fP), либо в багтрекере
+(\fIhttp://bugs.amule.org/\fP). Пожалуйста, не сообщайте об ошбках по
+электронной почте, по нашим спискам рассылки, или напрямую участникам.
+.SH "АВТОРСКИЕ ПРАВА"
+aMule и все прилагающиеся инструменты распространаются под Открытым
+Лицензионным Соглашением GNU (GNU GPL).
+.SH "СМ. ТАКЖЕ"
+.B_untranslated alc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH АВТОРЫ
+Автор страницы помощи: Vollstrecker <amule@vollstreckernet.de>,
+перевод: Radist Morse <radist.morse@gmail.com>

aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/docs/alcc.tr.1 Added

@@ -0,0 +1,43 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH ALCC 1 "Kasım 2011" "aMule eD2k bağlantı hesaplayıcısı" "aMule yardımcı araçları"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH İSİM
+alcc \- aMule için metin temelli eD2k bağlantı hesaplayıcısı
+.SH KULLANIM
+.B_untranslated alcc
+.RB_untranslated [ \-p ]
+.RB_untranslated [ \-v ]
+\fI<girdidosya_listesi>\fP
+
+.B_untranslated alcc
+.RB_untranslated [ \-h ]
+.SH AÇIKLAMA
+\fI<girdidosya_listesi>\fPnde girilen tüm dosyaların eD2k
+bağlantılarını hesaplar (bir ya da birden fazla dosya olabilir)
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-parthashes ]\fR
+Bölümler için hash değerlerini hesaplar ve eD2k bağlantılarına ekler.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Kısa bir kullanım açıklaması görüntüler.
+.TP 
+.B_untranslated [ \-v\fR, \fB\-\-verbose ]\fR
+Geveze olur \- hesap adımlarını da gösterir.
+.SH GERİBİLDİRİM
+Hataları bildirmek için forumumuzu (\fIhttp://forum.amule.org/\fP) ya da hata
+takipçimizi (\fIhttp://bugs.amule.org/\fP) kullanınız. Hataları bildirmek için
+e\-mail ve e\-mail listemizi kullanmamanızı ve geliştiricilerden birine
+doğrudan bildirmemenizi rica ederiz.
+.SH "TELİF HAKKI"
+aMule ve ilgili tüm yardımcı araçları GNU Genel Kamu Lisansı çerçevesinde
+dağıtılmaktadır.
+.SH "İLGİLİ BELGELER"
+.B_untranslated alc\fR(1), \fBamuled\fR(1), \fBamulecmd\fR(1), \fBamuleweb\fR(1), \fBcas\fR(1), \fBed2k\fR(1), \fBwxcas\fR(1), \fBxas\fR(1)
+.SH YAZAN
+Bu kılavuz sayfası Vollstrecker <amule@vollstreckernet.de>
+tarafından yazılmıştır.

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/Makefile.in -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +16,12 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -52,11 +50,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -66,30 +66,49 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 @ALC_TRUE@am__EXEEXT_1 = alc$(EXEEXT)
 @ALCC_TRUE@am__EXEEXT_2 = alcc$(EXEEXT)
 am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_alc_OBJECTS = alc-alc.$(OBJEXT) alc-alcframe.$(OBJEXT) \
 	alc-ed2khash.$(OBJEXT) alc-alcpix.$(OBJEXT) alc-md4.$(OBJEXT)
 alc_OBJECTS = $(am_alc_OBJECTS)
 am__DEPENDENCIES_1 =
-@NEED_RC_TRUE@am__DEPENDENCIES_2 = alcrc.$(OBJEXT)
-alc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+alc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__append_3)
+alc_LINK = $(CXXLD) $(alc_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am_alcc_OBJECTS = alcc-alcc.$(OBJEXT) alcc-ed2khash.$(OBJEXT) \
 	alcc-md4.$(OBJEXT)
 @NEED_RC_TRUE@nodist_alcc_OBJECTS = alcc-version.$(OBJEXT)
 alcc_OBJECTS = $(am_alcc_OBJECTS) $(nodist_alcc_OBJECTS)
 alcc_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+alcc_LINK = $(CXXLD) $(alcc_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(alc_SOURCES) $(alcc_SOURCES) $(nodist_alcc_SOURCES)
 DIST_SOURCES = $(alc_SOURCES) $(alcc_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -97,24 +116,15 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -129,17 +139,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -151,44 +155,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -210,13 +214,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -224,44 +225,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -270,7 +267,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -278,25 +274,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -308,29 +298,40 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_LDFLAGS = $(MULELDFLAGS)
 alc_SOURCES = alc.cpp \
 		alcframe.cpp \
@@ -370,14 +371,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/utils/aLinkCreator/src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/utils/aLinkCreator/src/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/aLinkCreator/src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/aLinkCreator/src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -395,35 +396,50 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 alc$(EXEEXT): $(alc_OBJECTS) $(alc_DEPENDENCIES) 
 	@rm -f alc$(EXEEXT)
-	$(CXXLINK) $(alc_LDFLAGS) $(alc_OBJECTS) $(alc_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(alc_LINK) $(alc_OBJECTS) $(alc_LDADD) $(LIBS)
 alcc$(EXEEXT): $(alcc_OBJECTS) $(alcc_DEPENDENCIES) 
 	@rm -f alcc$(EXEEXT)
-	$(CXXLINK) $(alcc_LDFLAGS) $(alcc_OBJECTS) $(alcc_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(alcc_LINK) $(alcc_OBJECTS) $(alcc_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -441,204 +457,228 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/alcc-md4.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 alc-alc.o: alc.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-alc.o -MD -MP -MF "$(DEPDIR)/alc-alc.Tpo" -c -o alc-alc.o `test -f 'alc.cpp' || echo '$(srcdir)/'`alc.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alc-alc.Tpo" "$(DEPDIR)/alc-alc.Po"; else rm -f "$(DEPDIR)/alc-alc.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-alc.o -MD -MP -MF $(DEPDIR)/alc-alc.Tpo -c -o alc-alc.o `test -f 'alc.cpp' || echo '$(srcdir)/'`alc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alc-alc.Tpo $(DEPDIR)/alc-alc.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='alc.cpp' object='alc-alc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -c -o alc-alc.o `test -f 'alc.cpp' || echo '$(srcdir)/'`alc.cpp
 
 alc-alc.obj: alc.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-alc.obj -MD -MP -MF "$(DEPDIR)/alc-alc.Tpo" -c -o alc-alc.obj `if test -f 'alc.cpp'; then $(CYGPATH_W) 'alc.cpp'; else $(CYGPATH_W) '$(srcdir)/alc.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alc-alc.Tpo" "$(DEPDIR)/alc-alc.Po"; else rm -f "$(DEPDIR)/alc-alc.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-alc.obj -MD -MP -MF $(DEPDIR)/alc-alc.Tpo -c -o alc-alc.obj `if test -f 'alc.cpp'; then $(CYGPATH_W) 'alc.cpp'; else $(CYGPATH_W) '$(srcdir)/alc.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alc-alc.Tpo $(DEPDIR)/alc-alc.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='alc.cpp' object='alc-alc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -c -o alc-alc.obj `if test -f 'alc.cpp'; then $(CYGPATH_W) 'alc.cpp'; else $(CYGPATH_W) '$(srcdir)/alc.cpp'; fi`
 
 alc-alcframe.o: alcframe.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-alcframe.o -MD -MP -MF "$(DEPDIR)/alc-alcframe.Tpo" -c -o alc-alcframe.o `test -f 'alcframe.cpp' || echo '$(srcdir)/'`alcframe.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alc-alcframe.Tpo" "$(DEPDIR)/alc-alcframe.Po"; else rm -f "$(DEPDIR)/alc-alcframe.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-alcframe.o -MD -MP -MF $(DEPDIR)/alc-alcframe.Tpo -c -o alc-alcframe.o `test -f 'alcframe.cpp' || echo '$(srcdir)/'`alcframe.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alc-alcframe.Tpo $(DEPDIR)/alc-alcframe.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='alcframe.cpp' object='alc-alcframe.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -c -o alc-alcframe.o `test -f 'alcframe.cpp' || echo '$(srcdir)/'`alcframe.cpp
 
 alc-alcframe.obj: alcframe.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-alcframe.obj -MD -MP -MF "$(DEPDIR)/alc-alcframe.Tpo" -c -o alc-alcframe.obj `if test -f 'alcframe.cpp'; then $(CYGPATH_W) 'alcframe.cpp'; else $(CYGPATH_W) '$(srcdir)/alcframe.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alc-alcframe.Tpo" "$(DEPDIR)/alc-alcframe.Po"; else rm -f "$(DEPDIR)/alc-alcframe.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-alcframe.obj -MD -MP -MF $(DEPDIR)/alc-alcframe.Tpo -c -o alc-alcframe.obj `if test -f 'alcframe.cpp'; then $(CYGPATH_W) 'alcframe.cpp'; else $(CYGPATH_W) '$(srcdir)/alcframe.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alc-alcframe.Tpo $(DEPDIR)/alc-alcframe.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='alcframe.cpp' object='alc-alcframe.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -c -o alc-alcframe.obj `if test -f 'alcframe.cpp'; then $(CYGPATH_W) 'alcframe.cpp'; else $(CYGPATH_W) '$(srcdir)/alcframe.cpp'; fi`
 
 alc-ed2khash.o: ed2khash.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-ed2khash.o -MD -MP -MF "$(DEPDIR)/alc-ed2khash.Tpo" -c -o alc-ed2khash.o `test -f 'ed2khash.cpp' || echo '$(srcdir)/'`ed2khash.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alc-ed2khash.Tpo" "$(DEPDIR)/alc-ed2khash.Po"; else rm -f "$(DEPDIR)/alc-ed2khash.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-ed2khash.o -MD -MP -MF $(DEPDIR)/alc-ed2khash.Tpo -c -o alc-ed2khash.o `test -f 'ed2khash.cpp' || echo '$(srcdir)/'`ed2khash.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alc-ed2khash.Tpo $(DEPDIR)/alc-ed2khash.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ed2khash.cpp' object='alc-ed2khash.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -c -o alc-ed2khash.o `test -f 'ed2khash.cpp' || echo '$(srcdir)/'`ed2khash.cpp
 
 alc-ed2khash.obj: ed2khash.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-ed2khash.obj -MD -MP -MF "$(DEPDIR)/alc-ed2khash.Tpo" -c -o alc-ed2khash.obj `if test -f 'ed2khash.cpp'; then $(CYGPATH_W) 'ed2khash.cpp'; else $(CYGPATH_W) '$(srcdir)/ed2khash.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alc-ed2khash.Tpo" "$(DEPDIR)/alc-ed2khash.Po"; else rm -f "$(DEPDIR)/alc-ed2khash.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-ed2khash.obj -MD -MP -MF $(DEPDIR)/alc-ed2khash.Tpo -c -o alc-ed2khash.obj `if test -f 'ed2khash.cpp'; then $(CYGPATH_W) 'ed2khash.cpp'; else $(CYGPATH_W) '$(srcdir)/ed2khash.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alc-ed2khash.Tpo $(DEPDIR)/alc-ed2khash.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ed2khash.cpp' object='alc-ed2khash.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -c -o alc-ed2khash.obj `if test -f 'ed2khash.cpp'; then $(CYGPATH_W) 'ed2khash.cpp'; else $(CYGPATH_W) '$(srcdir)/ed2khash.cpp'; fi`
 
 alc-alcpix.o: alcpix.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-alcpix.o -MD -MP -MF "$(DEPDIR)/alc-alcpix.Tpo" -c -o alc-alcpix.o `test -f 'alcpix.cpp' || echo '$(srcdir)/'`alcpix.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alc-alcpix.Tpo" "$(DEPDIR)/alc-alcpix.Po"; else rm -f "$(DEPDIR)/alc-alcpix.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-alcpix.o -MD -MP -MF $(DEPDIR)/alc-alcpix.Tpo -c -o alc-alcpix.o `test -f 'alcpix.cpp' || echo '$(srcdir)/'`alcpix.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alc-alcpix.Tpo $(DEPDIR)/alc-alcpix.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='alcpix.cpp' object='alc-alcpix.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -c -o alc-alcpix.o `test -f 'alcpix.cpp' || echo '$(srcdir)/'`alcpix.cpp
 
 alc-alcpix.obj: alcpix.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-alcpix.obj -MD -MP -MF "$(DEPDIR)/alc-alcpix.Tpo" -c -o alc-alcpix.obj `if test -f 'alcpix.cpp'; then $(CYGPATH_W) 'alcpix.cpp'; else $(CYGPATH_W) '$(srcdir)/alcpix.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alc-alcpix.Tpo" "$(DEPDIR)/alc-alcpix.Po"; else rm -f "$(DEPDIR)/alc-alcpix.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-alcpix.obj -MD -MP -MF $(DEPDIR)/alc-alcpix.Tpo -c -o alc-alcpix.obj `if test -f 'alcpix.cpp'; then $(CYGPATH_W) 'alcpix.cpp'; else $(CYGPATH_W) '$(srcdir)/alcpix.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alc-alcpix.Tpo $(DEPDIR)/alc-alcpix.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='alcpix.cpp' object='alc-alcpix.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -c -o alc-alcpix.obj `if test -f 'alcpix.cpp'; then $(CYGPATH_W) 'alcpix.cpp'; else $(CYGPATH_W) '$(srcdir)/alcpix.cpp'; fi`
 
 alc-md4.o: md4.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-md4.o -MD -MP -MF "$(DEPDIR)/alc-md4.Tpo" -c -o alc-md4.o `test -f 'md4.cpp' || echo '$(srcdir)/'`md4.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alc-md4.Tpo" "$(DEPDIR)/alc-md4.Po"; else rm -f "$(DEPDIR)/alc-md4.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-md4.o -MD -MP -MF $(DEPDIR)/alc-md4.Tpo -c -o alc-md4.o `test -f 'md4.cpp' || echo '$(srcdir)/'`md4.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alc-md4.Tpo $(DEPDIR)/alc-md4.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='md4.cpp' object='alc-md4.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -c -o alc-md4.o `test -f 'md4.cpp' || echo '$(srcdir)/'`md4.cpp
 
 alc-md4.obj: md4.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-md4.obj -MD -MP -MF "$(DEPDIR)/alc-md4.Tpo" -c -o alc-md4.obj `if test -f 'md4.cpp'; then $(CYGPATH_W) 'md4.cpp'; else $(CYGPATH_W) '$(srcdir)/md4.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alc-md4.Tpo" "$(DEPDIR)/alc-md4.Po"; else rm -f "$(DEPDIR)/alc-md4.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -MT alc-md4.obj -MD -MP -MF $(DEPDIR)/alc-md4.Tpo -c -o alc-md4.obj `if test -f 'md4.cpp'; then $(CYGPATH_W) 'md4.cpp'; else $(CYGPATH_W) '$(srcdir)/md4.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alc-md4.Tpo $(DEPDIR)/alc-md4.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='md4.cpp' object='alc-md4.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alc_CPPFLAGS) $(CPPFLAGS) $(alc_CXXFLAGS) $(CXXFLAGS) -c -o alc-md4.obj `if test -f 'md4.cpp'; then $(CYGPATH_W) 'md4.cpp'; else $(CYGPATH_W) '$(srcdir)/md4.cpp'; fi`
 
 alcc-alcc.o: alcc.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -MT alcc-alcc.o -MD -MP -MF "$(DEPDIR)/alcc-alcc.Tpo" -c -o alcc-alcc.o `test -f 'alcc.cpp' || echo '$(srcdir)/'`alcc.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alcc-alcc.Tpo" "$(DEPDIR)/alcc-alcc.Po"; else rm -f "$(DEPDIR)/alcc-alcc.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -MT alcc-alcc.o -MD -MP -MF $(DEPDIR)/alcc-alcc.Tpo -c -o alcc-alcc.o `test -f 'alcc.cpp' || echo '$(srcdir)/'`alcc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alcc-alcc.Tpo $(DEPDIR)/alcc-alcc.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='alcc.cpp' object='alcc-alcc.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -c -o alcc-alcc.o `test -f 'alcc.cpp' || echo '$(srcdir)/'`alcc.cpp
 
 alcc-alcc.obj: alcc.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -MT alcc-alcc.obj -MD -MP -MF "$(DEPDIR)/alcc-alcc.Tpo" -c -o alcc-alcc.obj `if test -f 'alcc.cpp'; then $(CYGPATH_W) 'alcc.cpp'; else $(CYGPATH_W) '$(srcdir)/alcc.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alcc-alcc.Tpo" "$(DEPDIR)/alcc-alcc.Po"; else rm -f "$(DEPDIR)/alcc-alcc.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -MT alcc-alcc.obj -MD -MP -MF $(DEPDIR)/alcc-alcc.Tpo -c -o alcc-alcc.obj `if test -f 'alcc.cpp'; then $(CYGPATH_W) 'alcc.cpp'; else $(CYGPATH_W) '$(srcdir)/alcc.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alcc-alcc.Tpo $(DEPDIR)/alcc-alcc.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='alcc.cpp' object='alcc-alcc.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -c -o alcc-alcc.obj `if test -f 'alcc.cpp'; then $(CYGPATH_W) 'alcc.cpp'; else $(CYGPATH_W) '$(srcdir)/alcc.cpp'; fi`
 
 alcc-ed2khash.o: ed2khash.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -MT alcc-ed2khash.o -MD -MP -MF "$(DEPDIR)/alcc-ed2khash.Tpo" -c -o alcc-ed2khash.o `test -f 'ed2khash.cpp' || echo '$(srcdir)/'`ed2khash.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alcc-ed2khash.Tpo" "$(DEPDIR)/alcc-ed2khash.Po"; else rm -f "$(DEPDIR)/alcc-ed2khash.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -MT alcc-ed2khash.o -MD -MP -MF $(DEPDIR)/alcc-ed2khash.Tpo -c -o alcc-ed2khash.o `test -f 'ed2khash.cpp' || echo '$(srcdir)/'`ed2khash.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alcc-ed2khash.Tpo $(DEPDIR)/alcc-ed2khash.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ed2khash.cpp' object='alcc-ed2khash.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -c -o alcc-ed2khash.o `test -f 'ed2khash.cpp' || echo '$(srcdir)/'`ed2khash.cpp
 
 alcc-ed2khash.obj: ed2khash.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -MT alcc-ed2khash.obj -MD -MP -MF "$(DEPDIR)/alcc-ed2khash.Tpo" -c -o alcc-ed2khash.obj `if test -f 'ed2khash.cpp'; then $(CYGPATH_W) 'ed2khash.cpp'; else $(CYGPATH_W) '$(srcdir)/ed2khash.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alcc-ed2khash.Tpo" "$(DEPDIR)/alcc-ed2khash.Po"; else rm -f "$(DEPDIR)/alcc-ed2khash.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -MT alcc-ed2khash.obj -MD -MP -MF $(DEPDIR)/alcc-ed2khash.Tpo -c -o alcc-ed2khash.obj `if test -f 'ed2khash.cpp'; then $(CYGPATH_W) 'ed2khash.cpp'; else $(CYGPATH_W) '$(srcdir)/ed2khash.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alcc-ed2khash.Tpo $(DEPDIR)/alcc-ed2khash.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='ed2khash.cpp' object='alcc-ed2khash.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -c -o alcc-ed2khash.obj `if test -f 'ed2khash.cpp'; then $(CYGPATH_W) 'ed2khash.cpp'; else $(CYGPATH_W) '$(srcdir)/ed2khash.cpp'; fi`
 
 alcc-md4.o: md4.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -MT alcc-md4.o -MD -MP -MF "$(DEPDIR)/alcc-md4.Tpo" -c -o alcc-md4.o `test -f 'md4.cpp' || echo '$(srcdir)/'`md4.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alcc-md4.Tpo" "$(DEPDIR)/alcc-md4.Po"; else rm -f "$(DEPDIR)/alcc-md4.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -MT alcc-md4.o -MD -MP -MF $(DEPDIR)/alcc-md4.Tpo -c -o alcc-md4.o `test -f 'md4.cpp' || echo '$(srcdir)/'`md4.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alcc-md4.Tpo $(DEPDIR)/alcc-md4.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='md4.cpp' object='alcc-md4.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -c -o alcc-md4.o `test -f 'md4.cpp' || echo '$(srcdir)/'`md4.cpp
 
 alcc-md4.obj: md4.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -MT alcc-md4.obj -MD -MP -MF "$(DEPDIR)/alcc-md4.Tpo" -c -o alcc-md4.obj `if test -f 'md4.cpp'; then $(CYGPATH_W) 'md4.cpp'; else $(CYGPATH_W) '$(srcdir)/md4.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/alcc-md4.Tpo" "$(DEPDIR)/alcc-md4.Po"; else rm -f "$(DEPDIR)/alcc-md4.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -MT alcc-md4.obj -MD -MP -MF $(DEPDIR)/alcc-md4.Tpo -c -o alcc-md4.obj `if test -f 'md4.cpp'; then $(CYGPATH_W) 'md4.cpp'; else $(CYGPATH_W) '$(srcdir)/md4.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/alcc-md4.Tpo $(DEPDIR)/alcc-md4.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='md4.cpp' object='alcc-md4.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(alcc_CPPFLAGS) $(CPPFLAGS) $(alcc_CXXFLAGS) $(CXXFLAGS) -c -o alcc-md4.obj `if test -f 'md4.cpp'; then $(CYGPATH_W) 'md4.cpp'; else $(CYGPATH_W) '$(srcdir)/md4.cpp'; fi`
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -647,7 +687,7 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -670,6 +710,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -691,18 +732,38 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -722,18 +783,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic ctags distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-info-am
+	uninstall-am uninstall-binPROGRAMS
 
 
 @NEED_RC_TRUE@.rc.$(OBJEXT):
@@ -757,6 +822,7 @@
 @NEED_RC_TRUE@	@sed -e 's/VER_FILEDESCRIPTION_STR/"aMule Link Creator, Console"/' \
 @NEED_RC_TRUE@	     -e 's/VER_INTERNALNAME_STR/"alcc"/' \
 @NEED_RC_TRUE@	     -e 's/VER_ORIGINALFILENAME_STR/"alcc$(EXEEXT)"/' "$<" > "$@"
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/alc.cpp -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/alc.cpp Changed

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/alc.h -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/alc.h Changed

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/alcc.cpp -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/alcc.cpp Changed

@@ -5,7 +5,7 @@
 ///
 /// Author:       ThePolish <thepolish@vipmail.ru>
 ///
-/// Copyright (C) 2004 by ThePolish
+/// Copyright (c) 2004-2011 ThePolish ( thepolish@vipmail.ru )
 ///
 /// 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
@@ -35,6 +35,8 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"             // Needed for PACKAGE
+#else
+#define PACKAGE "amule"
 #endif
 
 
@@ -52,8 +54,14 @@
   m_locale.AddCatalog(wxT(PACKAGE));
 
   wxLog::DontCreateOnDemand();
-  delete wxLog::SetActiveTarget(new wxLogStderr); // Replace printf by Log on Stderr
+  wxLogStderr * stderrLog = new wxLogStderr;
+  wxLogStderr * stdoutLog = new wxLogStderr(stdout);
+  delete wxLog::SetActiveTarget(stderrLog); // Log on Stderr
+#if wxCHECK_VERSION(2, 9, 0)  
+  wxLog::SetTimestamp("");   // Disable timestamp on messages
+#else
   wxLog::SetTimestamp(NULL); // Disable timestamp on messages
+#endif
 
   Ed2kHash hash;
   size_t i;
@@ -73,12 +81,16 @@
 
           if (hash.SetED2KHashFromFile(m_filesToHash[i], NULL))
             {
-            	wxLogMessage(wxT("%s"), hash.GetED2KLink(m_flagPartHashes).c_str());
-	    }
+				// Print the link to stdout
+				wxLog::SetActiveTarget(stdoutLog);
+                wxLogMessage(wxT("%s"), hash.GetED2KLink(m_flagPartHashes).c_str());
+				// Everything else goes to stderr
+				wxLog::SetActiveTarget(stderrLog);
+            }
         }
       else
         {
-		 if (m_flagVerbose)
+            if (m_flagVerbose)
                 {
                     wxLogMessage(_("%s ---> Non existant file !\n"),m_filesToHash[i].c_str());
                 }
@@ -98,7 +110,10 @@
 /// Parse command line
 void alcc::OnInitCmdLine(wxCmdLineParser& cmdline)
 {
-  cmdline.SetDesc(cmdLineDesc);
+	cmdline.AddSwitch(wxT("h"), wxT("help"), wxT("show this help message"), wxCMD_LINE_OPTION_HELP);
+	cmdline.AddSwitch(wxT("v"), wxT("verbose"), wxT("be verbose"));
+	cmdline.AddSwitch(wxT("p"), wxT("parthashes"), wxT("add part-hashes to ed2k link"));
+	cmdline.AddParam(wxT("input files"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE);
 }
 
 /// Command line preocessing

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/alcc.h -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/alcc.h Changed

@@ -5,7 +5,7 @@
 ///
 /// Author:       ThePolish <thepolish@vipmail.ru>
 ///
-/// Copyright (C) 2004 by ThePolish
+/// Copyright (c) 2004-2011 ThePolish ( thepolish@vipmail.ru )
 ///
 /// 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
@@ -51,22 +51,6 @@
 #endif
 //-----------------------------------------------------------------------------
 
-/// Command line parameters
-static const wxCmdLineEntryDesc cmdLineDesc[] =
-  {
-    {
-      wxCMD_LINE_SWITCH, wxT("h"), wxT("help"), wxT("show this help message"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP
-    },
-    { wxCMD_LINE_SWITCH, wxT("v"), wxT("verbose"), wxT("be verbose"), wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL},
-
-    { wxCMD_LINE_SWITCH, wxT("p"), wxT("parthashes"), wxT("add part-hashes to ed2k link"), wxCMD_LINE_VAL_NONE,wxCMD_LINE_PARAM_OPTIONAL },
-
-    { wxCMD_LINE_PARAM,  NULL, NULL, wxT("input files"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE },
-
-    { wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, 0 }
-  };
-
-
 // Application
 class alcc : public wxAppConsole
 {

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/alcframe.cpp -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/alcframe.cpp Changed

@@ -5,9 +5,9 @@
 ///
 /// Author:       ThePolish <thepolish@vipmail.ru>
 ///
-/// Copyright (C) 2004 by ThePolish
+/// Copyright (c) 2004-2011 ThePolish ( thepolish@vipmail.ru )
 ///
-/// Copyright (C) 2004 by Phoenix
+/// Copyright (c) 2004-2011 Marcelo Roberto Jimenez ( phoenix@amule.org )
 ///
 /// Pixmaps from:
 /// 	http://jimmac.musichall.cz/ikony.php3 
@@ -56,7 +56,11 @@
 	#include <shlobj.h>
 #elif defined(__WXMAC__)
 	#include <CoreServices/CoreServices.h>
-	#include <wx/mac/corefoundation/cfstring.h>
+	#if wxCHECK_VERSION(2, 9, 0)
+		#include <wx/osx/core/cfstring.h>  // Do_not_auto_remove
+	#else
+		#include <wx/mac/corefoundation/cfstring.h>
+	#endif
 	#include <wx/intl.h>
 #endif
 
@@ -352,7 +356,11 @@
 		CFURLRef	urlRef		= CFURLCreateFromFSRef(NULL, &fsRef);
 		CFStringRef	cfString	= CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle);
 		CFRelease(urlRef) ;
-		browseroot = wxMacCFStringHolder(cfString).AsString(wxLocale::GetSystemEncoding());
+		#if wxCHECK_VERSION(2, 9, 0)
+			browseroot = wxCFStringRef(cfString).AsString(wxLocale::GetSystemEncoding());
+		#else
+			browseroot = wxMacCFStringHolder(cfString).AsString(wxLocale::GetSystemEncoding());
+		#endif
 	} else {
 		browseroot = wxFileName::GetHomeDir();
 	}

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/alcframe.h -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/alcframe.h Changed

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/alcpix.cpp -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/alcpix.cpp Changed

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/alcpix.h -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/alcpix.h Changed

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/bithelp.h -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/bithelp.h Changed

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/ed2khash.cpp -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/ed2khash.cpp Changed

@@ -5,9 +5,9 @@
 ///
 /// Author:       ThePolish <thepolish@vipmail.ru>
 ///
-/// Copyright (C) 2004 by ThePolish
+/// Copyright (c) 2004-2011 ThePolish ( thepolish@vipmail.ru )
 ///
-/// Copyright (C) 2004 by Phoenix
+/// Copyright (c) 2004-2011 Marcelo Roberto Jimenez ( phoenix@amule.org )
 ///
 /// 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
@@ -47,7 +47,7 @@
 // alcc.c and here. And remove this stupid comment :)
 //-----------------------------------------------------------------------------
 // efe, this can be put in a separete include file, if you want to reuse
-static wxCSConv aMuleConv(wxT("iso8859-1"));
+static wxCSConv aMuleConv(wxS("iso8859-1"));
 #ifdef wxUSE_UNICODE
         #define unicode2char(x) (const char*) aMuleConv.cWX2MB(x)
         #define char2unicode(x) aMuleConv.cMB2WX(x)
@@ -211,12 +211,18 @@
   return SetED2KHashFromFile(wxFileName(filename), hook);
 }
 
+#if wxCHECK_VERSION(2, 9, 0)
+#define WXLONGLONGFMTSPEC wxT(wxLongLongFmtSpec)
+#else
+#define WXLONGLONGFMTSPEC wxLongLongFmtSpec
+#endif
+
 /// Get Ed2k link
 wxString Ed2kHash::GetED2KLink(const bool addPartHashes, const wxArrayString* arrayOfUrls)
 {
   // Constructing ed2k basic link
   wxString ed2kLink = wxT("ed2k://|file|") + CleanFilename(m_filename)
-                      + wxString::Format(wxT("|%") wxLongLongFmtSpec wxT("u|"), m_fileSize)
+                      + wxString::Format(wxT("|%") WXLONGLONGFMTSPEC wxT("u|"), m_fileSize)
                       + m_ed2kArrayOfHashes.Last() + wxT("|");

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/ed2khash.h -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/ed2khash.h Changed

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/md4.cpp -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/md4.cpp Changed

@@ -5,13 +5,13 @@
 ///
 /// Last modified by: ThePolish <thepolish@vipmail.ru>
 ///
-/// Copyright (C) 2004 by ThePolish
+/// Copyright (c) 2004-2011 ThePolish ( thepolish@vipmail.ru )
 ///
-/// Copyright (C) 2004 by Phoenix
+/// Copyright (c) 2004-2011 Marcelo Roberto Jimenez ( phoenix@amule.org )
 ///
-/// Copyright (C) 2004 by Madcat
+/// Copyright (c) 2004-2011 Alo Sarv ( madcat_@users.sourceforge.net )
 ///
-/// Copyright (C) 2002, 2003, 2004 by Michael Buesch
+/// Copyright (c) 2002-2011 Michael Buesch
 /// Email: mbuesch@freenet.de
 ///
 /// The algorithm is due to Ron Rivest.  This code is based on code
@@ -324,7 +324,7 @@
 
   // Open file and let wxFFile destructor close the file
   // Closing it explicitly may crash on Win32 ...
-  wxFFile file(filename, wxT("rbS"));
+  wxFFile file(filename, wxS("rbS"));
   if (! file.IsOpened())
     {
       return wxEmptyString;
@@ -376,7 +376,7 @@
 
   for (i = 0; i < len; ++i)
     {
-      hexString += wxString::Format(wxT("%02x"), 0xFF & *(buf + i));
+      hexString += wxString::Format(wxS("%02x"), 0xFF & *(buf + i));
     }
 
   // Reduce memory usage

aMule-2.2.6.tar.bz2/src/utils/aLinkCreator/src/md4.h -> aMule-2.3.1.tar.bz2/src/utils/aLinkCreator/src/md4.h Changed

aMule-2.2.6.tar.bz2/src/utils/amps/README -> aMule-2.3.1.tar.bz2/src/utils/amps/README Changed

aMule-2.2.6.tar.bz2/src/utils/cas/Makefile.in -> aMule-2.3.1.tar.bz2/src/utils/cas/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,15 +17,12 @@
 
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -51,11 +49,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -65,8 +65,8 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(casdir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_cas_OBJECTS = cas-cas.$(OBJEXT) cas-configfile.$(OBJEXT) \
 	cas-functions.$(OBJEXT) cas-graphics.$(OBJEXT) \
@@ -75,53 +75,107 @@
 cas_OBJECTS = $(am_cas_OBJECTS) $(nodist_cas_OBJECTS)
 am__DEPENDENCIES_1 =
 cas_DEPENDENCIES = $(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+cas_LINK = $(CCLD) $(cas_CFLAGS) $(CFLAGS) $(cas_LDFLAGS) $(LDFLAGS) \
+	-o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(cas_SOURCES) $(nodist_cas_SOURCES)
 DIST_SOURCES = $(cas_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-dist_casDATA_INSTALL = $(INSTALL_DATA)
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 DATA = $(dist_cas_DATA)
 HEADERS = $(noinst_HEADERS)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -136,17 +190,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -158,44 +206,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -217,13 +265,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -231,44 +276,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -277,7 +318,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -285,25 +325,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -315,29 +349,40 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 EXTRA_DIST = README
 SUBDIRS = docs
 dist_cas_DATA = tmp.html stat.png
@@ -374,14 +419,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/utils/cas/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/utils/cas/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/cas/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/cas/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -399,32 +444,47 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 cas$(EXEEXT): $(cas_OBJECTS) $(cas_DEPENDENCIES) 
 	@rm -f cas$(EXEEXT)
-	$(LINK) $(cas_LDFLAGS) $(cas_OBJECTS) $(cas_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(cas_LINK) $(cas_OBJECTS) $(cas_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -440,120 +500,136 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cas-lines.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 cas-cas.o: cas.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-cas.o -MD -MP -MF "$(DEPDIR)/cas-cas.Tpo" -c -o cas-cas.o `test -f 'cas.c' || echo '$(srcdir)/'`cas.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cas-cas.Tpo" "$(DEPDIR)/cas-cas.Po"; else rm -f "$(DEPDIR)/cas-cas.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-cas.o -MD -MP -MF $(DEPDIR)/cas-cas.Tpo -c -o cas-cas.o `test -f 'cas.c' || echo '$(srcdir)/'`cas.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cas-cas.Tpo $(DEPDIR)/cas-cas.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cas.c' object='cas-cas.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -c -o cas-cas.o `test -f 'cas.c' || echo '$(srcdir)/'`cas.c
 
 cas-cas.obj: cas.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-cas.obj -MD -MP -MF "$(DEPDIR)/cas-cas.Tpo" -c -o cas-cas.obj `if test -f 'cas.c'; then $(CYGPATH_W) 'cas.c'; else $(CYGPATH_W) '$(srcdir)/cas.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cas-cas.Tpo" "$(DEPDIR)/cas-cas.Po"; else rm -f "$(DEPDIR)/cas-cas.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-cas.obj -MD -MP -MF $(DEPDIR)/cas-cas.Tpo -c -o cas-cas.obj `if test -f 'cas.c'; then $(CYGPATH_W) 'cas.c'; else $(CYGPATH_W) '$(srcdir)/cas.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cas-cas.Tpo $(DEPDIR)/cas-cas.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='cas.c' object='cas-cas.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -c -o cas-cas.obj `if test -f 'cas.c'; then $(CYGPATH_W) 'cas.c'; else $(CYGPATH_W) '$(srcdir)/cas.c'; fi`
 
 cas-configfile.o: configfile.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-configfile.o -MD -MP -MF "$(DEPDIR)/cas-configfile.Tpo" -c -o cas-configfile.o `test -f 'configfile.c' || echo '$(srcdir)/'`configfile.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cas-configfile.Tpo" "$(DEPDIR)/cas-configfile.Po"; else rm -f "$(DEPDIR)/cas-configfile.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-configfile.o -MD -MP -MF $(DEPDIR)/cas-configfile.Tpo -c -o cas-configfile.o `test -f 'configfile.c' || echo '$(srcdir)/'`configfile.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cas-configfile.Tpo $(DEPDIR)/cas-configfile.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='configfile.c' object='cas-configfile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -c -o cas-configfile.o `test -f 'configfile.c' || echo '$(srcdir)/'`configfile.c
 
 cas-configfile.obj: configfile.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-configfile.obj -MD -MP -MF "$(DEPDIR)/cas-configfile.Tpo" -c -o cas-configfile.obj `if test -f 'configfile.c'; then $(CYGPATH_W) 'configfile.c'; else $(CYGPATH_W) '$(srcdir)/configfile.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cas-configfile.Tpo" "$(DEPDIR)/cas-configfile.Po"; else rm -f "$(DEPDIR)/cas-configfile.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-configfile.obj -MD -MP -MF $(DEPDIR)/cas-configfile.Tpo -c -o cas-configfile.obj `if test -f 'configfile.c'; then $(CYGPATH_W) 'configfile.c'; else $(CYGPATH_W) '$(srcdir)/configfile.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cas-configfile.Tpo $(DEPDIR)/cas-configfile.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='configfile.c' object='cas-configfile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -c -o cas-configfile.obj `if test -f 'configfile.c'; then $(CYGPATH_W) 'configfile.c'; else $(CYGPATH_W) '$(srcdir)/configfile.c'; fi`
 
 cas-functions.o: functions.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-functions.o -MD -MP -MF "$(DEPDIR)/cas-functions.Tpo" -c -o cas-functions.o `test -f 'functions.c' || echo '$(srcdir)/'`functions.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cas-functions.Tpo" "$(DEPDIR)/cas-functions.Po"; else rm -f "$(DEPDIR)/cas-functions.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-functions.o -MD -MP -MF $(DEPDIR)/cas-functions.Tpo -c -o cas-functions.o `test -f 'functions.c' || echo '$(srcdir)/'`functions.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cas-functions.Tpo $(DEPDIR)/cas-functions.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='functions.c' object='cas-functions.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -c -o cas-functions.o `test -f 'functions.c' || echo '$(srcdir)/'`functions.c
 
 cas-functions.obj: functions.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-functions.obj -MD -MP -MF "$(DEPDIR)/cas-functions.Tpo" -c -o cas-functions.obj `if test -f 'functions.c'; then $(CYGPATH_W) 'functions.c'; else $(CYGPATH_W) '$(srcdir)/functions.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cas-functions.Tpo" "$(DEPDIR)/cas-functions.Po"; else rm -f "$(DEPDIR)/cas-functions.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-functions.obj -MD -MP -MF $(DEPDIR)/cas-functions.Tpo -c -o cas-functions.obj `if test -f 'functions.c'; then $(CYGPATH_W) 'functions.c'; else $(CYGPATH_W) '$(srcdir)/functions.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cas-functions.Tpo $(DEPDIR)/cas-functions.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='functions.c' object='cas-functions.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -c -o cas-functions.obj `if test -f 'functions.c'; then $(CYGPATH_W) 'functions.c'; else $(CYGPATH_W) '$(srcdir)/functions.c'; fi`
 
 cas-graphics.o: graphics.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-graphics.o -MD -MP -MF "$(DEPDIR)/cas-graphics.Tpo" -c -o cas-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cas-graphics.Tpo" "$(DEPDIR)/cas-graphics.Po"; else rm -f "$(DEPDIR)/cas-graphics.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-graphics.o -MD -MP -MF $(DEPDIR)/cas-graphics.Tpo -c -o cas-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cas-graphics.Tpo $(DEPDIR)/cas-graphics.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='cas-graphics.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -c -o cas-graphics.o `test -f 'graphics.c' || echo '$(srcdir)/'`graphics.c
 
 cas-graphics.obj: graphics.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-graphics.obj -MD -MP -MF "$(DEPDIR)/cas-graphics.Tpo" -c -o cas-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cas-graphics.Tpo" "$(DEPDIR)/cas-graphics.Po"; else rm -f "$(DEPDIR)/cas-graphics.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-graphics.obj -MD -MP -MF $(DEPDIR)/cas-graphics.Tpo -c -o cas-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cas-graphics.Tpo $(DEPDIR)/cas-graphics.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='graphics.c' object='cas-graphics.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -c -o cas-graphics.obj `if test -f 'graphics.c'; then $(CYGPATH_W) 'graphics.c'; else $(CYGPATH_W) '$(srcdir)/graphics.c'; fi`
 
 cas-html.o: html.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-html.o -MD -MP -MF "$(DEPDIR)/cas-html.Tpo" -c -o cas-html.o `test -f 'html.c' || echo '$(srcdir)/'`html.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cas-html.Tpo" "$(DEPDIR)/cas-html.Po"; else rm -f "$(DEPDIR)/cas-html.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-html.o -MD -MP -MF $(DEPDIR)/cas-html.Tpo -c -o cas-html.o `test -f 'html.c' || echo '$(srcdir)/'`html.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cas-html.Tpo $(DEPDIR)/cas-html.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='html.c' object='cas-html.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -c -o cas-html.o `test -f 'html.c' || echo '$(srcdir)/'`html.c
 
 cas-html.obj: html.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-html.obj -MD -MP -MF "$(DEPDIR)/cas-html.Tpo" -c -o cas-html.obj `if test -f 'html.c'; then $(CYGPATH_W) 'html.c'; else $(CYGPATH_W) '$(srcdir)/html.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cas-html.Tpo" "$(DEPDIR)/cas-html.Po"; else rm -f "$(DEPDIR)/cas-html.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-html.obj -MD -MP -MF $(DEPDIR)/cas-html.Tpo -c -o cas-html.obj `if test -f 'html.c'; then $(CYGPATH_W) 'html.c'; else $(CYGPATH_W) '$(srcdir)/html.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cas-html.Tpo $(DEPDIR)/cas-html.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='html.c' object='cas-html.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -c -o cas-html.obj `if test -f 'html.c'; then $(CYGPATH_W) 'html.c'; else $(CYGPATH_W) '$(srcdir)/html.c'; fi`
 
 cas-lines.o: lines.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-lines.o -MD -MP -MF "$(DEPDIR)/cas-lines.Tpo" -c -o cas-lines.o `test -f 'lines.c' || echo '$(srcdir)/'`lines.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cas-lines.Tpo" "$(DEPDIR)/cas-lines.Po"; else rm -f "$(DEPDIR)/cas-lines.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-lines.o -MD -MP -MF $(DEPDIR)/cas-lines.Tpo -c -o cas-lines.o `test -f 'lines.c' || echo '$(srcdir)/'`lines.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cas-lines.Tpo $(DEPDIR)/cas-lines.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lines.c' object='cas-lines.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -c -o cas-lines.o `test -f 'lines.c' || echo '$(srcdir)/'`lines.c
 
 cas-lines.obj: lines.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-lines.obj -MD -MP -MF "$(DEPDIR)/cas-lines.Tpo" -c -o cas-lines.obj `if test -f 'lines.c'; then $(CYGPATH_W) 'lines.c'; else $(CYGPATH_W) '$(srcdir)/lines.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/cas-lines.Tpo" "$(DEPDIR)/cas-lines.Po"; else rm -f "$(DEPDIR)/cas-lines.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -MT cas-lines.obj -MD -MP -MF $(DEPDIR)/cas-lines.Tpo -c -o cas-lines.obj `if test -f 'lines.c'; then $(CYGPATH_W) 'lines.c'; else $(CYGPATH_W) '$(srcdir)/lines.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/cas-lines.Tpo $(DEPDIR)/cas-lines.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lines.c' object='cas-lines.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(cas_CPPFLAGS) $(CPPFLAGS) $(cas_CFLAGS) $(CFLAGS) -c -o cas-lines.obj `if test -f 'lines.c'; then $(CYGPATH_W) 'lines.c'; else $(CYGPATH_W) '$(srcdir)/lines.c'; fi`
-uninstall-info-am:
 install-dist_casDATA: $(dist_cas_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(casdir)" || $(mkdir_p) "$(DESTDIR)$(casdir)"
-	@list='$(dist_cas_DATA)'; for p in $$list; do \
+	test -z "$(casdir)" || $(MKDIR_P) "$(DESTDIR)$(casdir)"
+	@list='$(dist_cas_DATA)'; test -n "$(casdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_casDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(casdir)/$$f'"; \
-	  $(dist_casDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(casdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(casdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(casdir)" || exit $$?; \
 	done
 
 uninstall-dist_casDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_cas_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(casdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(casdir)/$$f"; \
-	done
+	@list='$(dist_cas_DATA)'; test -n "$(casdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(casdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(casdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -562,7 +638,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -579,16 +655,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -614,16 +689,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -631,14 +706,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -650,81 +725,101 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -735,7 +830,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(casdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -758,6 +853,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -779,18 +875,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-dist_casDATA
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -810,24 +926,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-dist_casDATA \
-	uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_casDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-binPROGRAMS clean-generic clean-recursive ctags \
-	ctags-recursive distclean distclean-compile distclean-generic \
-	distclean-recursive distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dist_casDATA install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-recursive pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-dist_casDATA uninstall-info-am
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic ctags ctags-recursive distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am \
+	install-dist_casDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
+	uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-dist_casDATA
 
 
 @NEED_RC_TRUE@.rc.$(OBJEXT):
@@ -837,6 +955,7 @@
 @NEED_RC_TRUE@	@sed -e 's/VER_FILEDESCRIPTION_STR/"C aMule Statistics"/' \
 @NEED_RC_TRUE@	     -e 's/VER_INTERNALNAME_STR/"cas"/' \
 @NEED_RC_TRUE@	     -e 's/VER_ORIGINALFILENAME_STR/"cas$(EXEEXT)"/' "$<" > "$@"
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/src/utils/cas/cas.c -> aMule-2.3.1.tar.bz2/src/utils/cas/cas.c Changed

@@ -5,7 +5,7 @@
  *
  *  Author:       Pedro de Oliveira <falso@rdk.homeip.net>
  *
- *  Copyright (C) 2004 by Pedro de Oliveira
+ *  Copyright (c) 2004-2011 Pedro de Oliveira ( falso@rdk.homeip-net )
  * 
  *  This file is part of aMule.
  *
@@ -46,7 +46,7 @@
 
 #ifndef HAVE_GETOPT_LONG
 /* Code from getopt_long.h - getopt_long() for systems that lack it
-  Copyright (C) 2001, 2002, 2008 Arthur de Jong, GPL 2 and later */
+  Copyright (c) 2001-2011 Arthur de Jong, GPL 2 and later */
 # define no_argument 0
 # define required_argument 1
 # define optional_argument 2
@@ -106,7 +106,7 @@
 #ifndef HAVE_GETOPT_LONG
 
 /* Code from getopt_long.c - getopt_long() for systems that lack it
-  Copyright (C) 2001, 2002, 2008 Arthur de Jong, GPL 2 and later
+  Copyright (c) 2001-2011 Arthur de Jong, GPL 2 and later
   Slightly edited for the sake of clarity by Gaznevada */
 
 int getopt_long(int argc,
@@ -257,7 +257,7 @@
 		perror("Could not create buffer\n");
 		exit (2);
 	}
-	fread (buffer,1,lSize,amulesig);
+	if (fread(buffer,1,lSize,amulesig)){}	// // prevent GCC warning
 	fclose(amulesig);
 
 	stats[0] = strtok (buffer,"\n");

aMule-2.2.6.tar.bz2/src/utils/cas/configfile.c -> aMule-2.3.1.tar.bz2/src/utils/cas/configfile.c Changed

aMule-2.2.6.tar.bz2/src/utils/cas/configfile.h -> aMule-2.3.1.tar.bz2/src/utils/cas/configfile.h Changed

aMule-2.2.6.tar.bz2/src/utils/cas/docs/Makefile.am -> aMule-2.3.1.tar.bz2/src/utils/cas/docs/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/utils/cas/docs/Makefile.in -> aMule-2.3.1.tar.bz2/src/utils/cas/docs/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -46,11 +44,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -60,28 +60,26 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -96,17 +94,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -118,44 +110,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -177,13 +169,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -191,44 +180,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -237,7 +222,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -245,25 +229,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -275,31 +253,42 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SELECTED_MANPAGES = $(CAS_MANPAGES)
-EXTRA_DIST = cas.1 cas.de.1 cas.es.1 cas.eu.1 cas.hu.1
+EXTRA_DIST = cas.1 cas.de.1 cas.es.1 cas.fr.1 cas.hu.1 cas.it.1 cas.ru.1 cas.tr.1
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
@@ -308,14 +297,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/utils/cas/docs/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/utils/cas/docs/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/cas/docs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/cas/docs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -333,7 +322,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -342,30 +331,32 @@
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../../../automake
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -393,6 +384,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -412,6 +404,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -419,13 +413,30 @@
 install-data-am:
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
+install-dvi-am:
 
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -444,19 +455,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-hook install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-hook \
-	uninstall-info-am
+	pdf-am ps ps-am uninstall uninstall-am uninstall-hook
 
 install-data-hook:
 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
@@ -495,6 +508,7 @@
 			rm -f $(DESTDIR)$(mandir)/$$locale/man1/$$inst ; \
 		fi; \
 	done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/src/utils/cas/docs/cas.1 -> aMule-2.3.1.tar.bz2/src/utils/cas/docs/cas.1 Changed

@@ -1,47 +1,50 @@
-.TH CAS 1 "September 2009" "cas v0.8" "aMule utilities"
+.TH CAS 1 "November 2011" "cas v0.8" "aMule utilities"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NAME
 cas \- c aMule statistics
 .SH SYNOPSIS
-.B cas
-.TH CAS "1" "January 2007" "aMule ED2k links calculator" "aMule utilities"
+.B_untranslated cas
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-p ]
+.RB [ \-c " " \fI<path> ]
+
+.B_untranslated cas
+.RB_untranslated [ \-h ]
 .SH DESCRIPTION
-.PP
-    ___    _ _   ___    c aMule statistics
-  /'___) /'_` )/',__)   by Pedro de Oliveira
- ( (___ ( (_| |\\\__, \\   <falso@rdk.homeip.net>
- `\\____)`\\__,_)(____/   Version 0.5
-.P
 \fBcas\fR is a program for displaying the contents of your aMule online
-signature file to console (in a human readable form).
-.SS OPTIONS:
+signature file to console (in a human readable form). For this to work, you
+must enable the "Online Signature" option in aMule's preferences.
 .TP
-\fB\-o\fR, \fB\-\-picture\fR, \fB\-P\fR
+.B_untranslated [ \-o\fR, \fB\-\-picture\fR, \fB\-P ]\fR
 Writes the online signature picture.
-You can optionally append \fI\=\<PATH\>\fR to this option, to specify where the picture should be written
+You can optionally append \fI=<PATH>\fR to this option, to specify the location it should be written to.
 .TP
-\fB\-p\fR, \fB\-\-html\fR, \fB\-H\fR
+.B_untranslated [ \-p\fR, \fB\-\-html\fR, \fB\-H ]\fR
 HTML page with stats and picture.
-You can optionally append \fI\=\<PATH\>\fR to this option, to specify where the page should be written
+You can optionally append \fI=<PATH>\fR to this option, to specify the location it should be written to.
 .TP
-\fB\-c\fR, \fB\-\-config\-dir\fR
-Specifies a config-dir different from home
+\fB[ \-c\fR \fI<path>\fR, \fB\-\-config\-dir\fR=\fI<path>\fR \fB]\fR
+Read config from \fI<path>\fR instead of home
 .TP
-\fB\-h\fR, \fB\-\-help\fR
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
 Prints a short usage description.
 .P
-Without any options, prints online signature data to stdout.
+Without any options, it prints online signature data to stdout.
+
+\fBcas\fR was written by Pedro de Oliveira <falso@rdk.homeip.net>
 .SH FILES
 ~/.aMule/casrc
 .br
 stat.png
 .br
 tmp.html
-.SH AUTHOR
-\fBcas\fR was written by Pedro de Oliveira <falso@rdk.homeip.net>
 .SH REPORTING BUGS
 Please report bugs either on our forum (\fIhttp://forum.amule.org/\fR), or in our bugtracker (\fIhttp://bugs.amule.org/\fR).
 Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member.
 .SH COPYRIGHT
 aMule and all of its related utilities are distributed under the GNU General Public License.
 .SH SEE ALSO
-\fBamule\fR(1), \fBwxcas\fR(1)
+.B_untranslated amule\fR(1), \fBwxcas\fR(1)
+.SH AUTHOR
+This manpage was written by Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/cas/docs/cas.de.1 -> aMule-2.3.1.tar.bz2/src/utils/cas/docs/cas.de.1 Changed

@@ -3,61 +3,61 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH CAS 1 "Januar 2007" "cas v0.8" "aMule Hilfsprogramme"
+.TH CAS 1 "November 2011" "cas v0.8" "aMule Hilfsprogramme"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NAME
 cas \- c aMule statistics
 .SH SYNTAX
-\fBcas\fP
-.\"*******************************************************************
-.\"
-.\" This file was generated with po4a. Translate the source file.
-.\"
-.\"*******************************************************************
-.TH CAS 1 "Januar 2007" "aMule ED2k links Ersteller" "aMule Hilfsprogramme"
+.B_untranslated cas
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-p ]
+[\fB\-c\fP \fI<Pfad>\fP]
+
+.B_untranslated cas
+.RB_untranslated [ \-h ]
 .SH BESCHREIBUNG
-.PP
-    ___    _ _   ___    c aMule statistics
-  /'___) /'_` )/',__)   von Pedro de Oliveira
- ( (___ ( (_| |\e\__, \e   <falso@rdk.homeip.net>
- `\e____)`\e__,_)(____/   Version 0.5
-.P
-\fBcas\fP ist ein Program das den Inhalt deiner aMule Onlinesignaturedatei in
-menschenlesbarer Form auf der Konsole ausgibt.
-.SS OPTIONEN:
+\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.
 .TP 
-\fB\-o\fP, \fB\-\-picture\fP, \fB\-P\fP
-Erstellt ein Bild deiner Onlinesignatur. Optional kannst du
-\fI\=\<Pfad\>\fP dieser Option übergeben, um anzugeben wohin das Bild
+.B_untranslated [ \-o\fR, \fB\-\-picture\fR, \fB\-P ]\fR
+Erstellt das Bild der Online Signatur.  Optional kannst du
+\fI=<PFAD>\fP an diese Option anhängen, um anzugeben wohin es
 geschrieben werden soll.
 .TP 
-\fB\-p\fP, \fB\-\-html\fP, \fB\-H\fP
-HTML Seite mit Statistik und Bild. Optional kannst du \fI\=\<Pfad\>\fP
-dieser Option übergeben, um anzugeben wohin die Seite geschrieben werden
-soll.
+.B_untranslated [ \-p\fR, \fB\-\-html\fR, \fB\-H ]\fR
+HTML Seite mit Statistiken und Bild.  Optional kannst du \fI=<PFAD>\fP
+an diese Option anhängen, um anzugeben wohin es geschrieben werden soll.
 .TP 
-\fB\-c\fP, \fB\-\-config\-dir\fP
-Gibt ein Konfigurationsverzeichnis abweichend des Home an
+\fB[ \-c\fP \fI<Pfad>\fP, \fB\-\-config\-dir\fP=\fI<Pfad>\fP \fB]\fP
+Liest die Konfiguration <Pfad> anstelle des Home.
 .TP 
-\fB\-h\fP, \fB\-\-help\fP
-Gibt eine kurze Beschreibung aus.
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Gibt eine kurze Nutzungsbeschreibung aus.
 .P
-Ohne Optionen wird die Onlinesignatur nach stdout geschrieben.
+Ohne Optionen schreibt es die Online Signatur auf die Standardausgabe.
+
+\fBcas\fP wurde geschrieben von Pedro de Oliveira
+<falso@rdk.homeip.net>
 .SH DATEIEN
 ~/.aMule/casrc
 .br
 stat.png
 .br
 tmp.html
-.SH VERFASSER
-\fBcas\fP wurde geschrieben von Pedro de Oliveira
-<falso@rdk.homeip.net>
 .SH "FEHLER MELDEN"
 Bitte meldet Fehler entweder in unserem Forum (\fIhttp://forum.amule.org/\fP),
 oder in unseren Bugtracker (\fIhttp://bugs.amule.org/\fP). Bitte meldet uns
-keine Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
+weder Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
 Teammitglieder.
 .SH COPYRIGHT
 aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU
 General Public License
 .SH "SIEHE AUCH"
-\fBamule\fP(1), \fBwxcas\fP(1)
+.B_untranslated amule\fR(1), \fBwxcas\fR(1)
+.SH VERFASSER
+Diese manpage wurde geschrieben von Vollstrecker
+<amule@vollstreckernet.de>
+
+Diese manpage wurde übersetzt von Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/cas/docs/cas.es.1 -> aMule-2.3.1.tar.bz2/src/utils/cas/docs/cas.es.1 Changed

@@ -1,41 +1,61 @@
-.TH CAS 1 "Marzo 2005" "cas v0.5" "Utilidades de aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH CAS 1 "November 2011" "cas v0.8" "aMule utilidades"
+.als B_untranslated B
+.als RB_untranslated RB
 .SH NOMBRE
-cas \- Estadísticas de aMule
+cas \- c estadisticas de aMule
 .SH SINOPSIS
-.B cas
-.RI [ OPCIONES ]
-.SH DESCRIPCIÓN
-.PP
-    ___    _ _   ___    Estadístics de aMule
-  /'___) /'_` )/',__)   por Pedro de Oliveira
- ( (___ ( (_| |\\\__, \\   <falso@rdk.homeip.net>
- `\\____)`\\__,_)(____/   Versión 0.5
+.B_untranslated cas
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-p ]
+[\fB\-c\fP \fI<path>\fP]
+
+.B_untranslated cas
+.RB_untranslated [ \-h ]
+.SH DESCRIPCIÃN
+\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.
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-picture\fR, \fB\-P ]\fR
+Writes the online signature picture.  You can optionally append
+\fI=<PATH>\fP to this option, to specify the location it should be
+written to.
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-html\fR, \fB\-H ]\fR
+HTML page with stats and picture.  You can optionally append
+\fI=<PATH>\fP to this option, to specify the location it should be
+written to.
+.TP 
+\fB[ \-c\fP \fI<path>\fP, \fB\-\-config\-dir\fP=\fI<path>\fP \fB]\fP
+Leer configuraciÃ³n desde \fI<path>\fP en lugar de home
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Imprime una breve descripciÃ³n de uso.
 .P
-\fBcas\fR es un programa que permite ver el contenido de la firma de aMule en tu consola de manera sencilla.
-.SS OPCIONES:
-.TP
-\fB\-o\fR
-Crea una imágen de la firma.
-.TP
-\fB\-p\fR
-Crea una página HTML con las estadísticas y la imágen de la firma.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Printra una breve ayuda.
-.P
-Sin opciones, muestra en consola las estadísticas de la firma.
+Without any options, it prints online signature data to stdout.
+
+\fBcas\fP was written by Pedro de Oliveira <falso@rdk.homeip.net>
 .SH ARCHIVOS
 ~/.aMule/casrc
 .br
 stat.png
 .br
 tmp.html
-.SH AUTOR
-\fBcas\fR ha sido escrito por Pedro de Oliveira <falso@rdk.homeip.net>
-.SH BUGS
-Si descubre bugs, por favor comuníquelos en (\fIhttp://forum.amule.org/\fR), o en nuestro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Por favor, no comunique bugs por e-mail, ni a nuestro maillist ni directamente a ningún miembro del equipo de aMule.
+.SH "INFORMANDO ERRORES"
+Por favor informa de fallos ya sea en nuestro foro
+(\fIhttp://forum.amule.org/\fP), o en nuestro bugtracker
+(\fIhttp://bugs.amule.org/\fP). Por favor no informe de fallos por correo, ni
+en nuestras listas, ni directamente al correo de algun miembro del equipo.
 .SH COPYRIGHT
-aMule, y todas las utilidades que con el vienen, se distribuyen bajo la licencia GPL.
-.SH VER
-\fBamule\fR(1), \fBwxcas\fR(1)
+aMule y todas las demÃ¡s utilidades relacionadas son distribuidas bajo la GNU
+General Public License.
+.SH "VEASE TAMBIEN"
+.B_untranslated amule\fR(1), \fBwxcas\fR(1)
+.SH AUTOR
+Esta pÃ¡gina de manualfue escrita por Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.3.1.tar.bz2/src/utils/cas/docs/cas.fr.1 Added

@@ -0,0 +1,64 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH CAS 1 "Novembre 2011" "cas v0.8" "Outils d'aMule"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH NOM
+cas \- c aMule statistics
+.SH SYNOPSIS
+.B_untranslated cas
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-p ]
+[\fB\-c\fP \fI<chemin>\fP]
+
+.B_untranslated cas
+.RB_untranslated [ \-h ]
+.SH DESCRIPTION
+\fBcas\fP est un programme pour afficher le contenu de votre fichier de
+signature aMule en ligne sur la console (sous une forme lisible par
+l'homme). Pour que cela fonctionne, vous devez activer l'option "Online
+Signature" dans les préférences d'aMule.
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-picture\fR, \fB\-P ]\fR
+Écrit l'image de la signature en ligne. Vous pouvez éventuellement ajouter
+\fI=<PATH>\fP à cette option, pour spécifier l'emplacement où elle doit
+être écrite.
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-html\fR, \fB\-H ]\fR
+Page HTML avec des statistiques et l'image. Vous pouvez éventuellement
+ajouter \fI=<PATH>\fP à cette option, pour spécifier l'emplacement où
+elle doit être écrite.
+.TP 
+\fB[ \-c\fP \fI<chemin>\fP, \fB\-\-config\-dir\fP=\fI<chemin>\fP \fB]\fP
+Utiliser le fichier de config \fI<chemin>\fP à la place de celui par
+défaut
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Afficher une court description d'utilisation.
+.P
+Sans aucune option, elle affiche des données de signature en ligne sur la
+sortie standard.
+
+\fBcas\fP a été écrit par Pedro de Oliveira <falso@rdk.homeip.net>
+.SH FICHIERS
+~/.aMule/casrc
+.br
+stat.png
+.br
+tmp.html
+.SH "RAPPORTER DES BOGUES"
+Veuillez rapporter les bogues sur notre forum (\fIhttp://forum.amule.org/\fP),
+ou sur notre bugtracker (\fIhttp://bugs.amule.org/\fP).  Veuillez ne pas
+rapporter les bogues par e\-mail, sur notre liste de diffusion ou directement
+à n'importe quel membre  de l'équipe.
+.SH COPYRIGHT
+aMule et tout ses outils sont distribués sous la licence GNU General Public
+License.
+.SH "VOIR AUSSI"
+.B_untranslated amule\fR(1), \fBwxcas\fR(1)
+.SH AUTEUR
+Cette manpage a été écrite par Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/cas/docs/cas.hu.1 -> aMule-2.3.1.tar.bz2/src/utils/cas/docs/cas.hu.1 Changed

@@ -1,43 +1,61 @@
-.TH CAS 1 "2005 március" "cas v0.5" "aMule segédprogramok"
-.SH NÉV
-cas \- c aMule statisztikák
-.SH ÁTTEKINTÉS
-.B cas
-.RI [ OPCIÓK ]
-.SH LEÍRÁS
-.PP
-    ___    _ _   ___    c aMule statisztikák
-  /'___) /'_` )/',__)   írta Pedro de Oliveira
- ( (___ ( (_| |\\\__, \\   <falso@rdk.homeip.net>
- `\\____)`\\__,_)(____/   Verzió: 0.5
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH CAS 1 "2011. november" "cas v0.8" "aMule segÃ©dprogramok"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH NÃV
+cas \- c aMule statisztikÃ¡k
+.SH ÃTTEKINTÃS
+.B_untranslated cas
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-p ]
+[\fB\-c\fP \fI<Ãºtvonal>\fP]
+
+.B_untranslated cas
+.RB_untranslated [ \-h ]
+.SH LEÃRÃS
+A \fBcas\fP program az aMule online\-alÃ¡ÃrÃ¡s fÃ¡jljÃ¡nak tartalmÃ¡t jelenÃti meg a
+kÃ©pernyÅn. Ahhoz, hogy ez mÅ±kÃ¶djÃ¶n, engedÃ©lyezni kell az \(BqOnline
+alÃ¡ÃrÃ¡s\(rq opciÃ³t az aMule beÃ¡llÃtÃ¡saiban.
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-picture\fR, \fB\-P ]\fR
+Az online\-alÃ¡ÃrÃ¡s kÃ©pet generÃ¡lja. LehetsÃ©ges \fI=<fÃ¡jl>\fP
+hozzÃ¡csatolÃ¡sÃ¡val megmondani, hovÃ¡ Ãrja.
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-html\fR, \fB\-H ]\fR
+Egy HTML oldalt generÃ¡l, statisztikÃ¡val Ã©s kÃ©ppel. LehetsÃ©ges
+\fI=<fÃ¡jl>\fP hozzÃ¡csatolÃ¡sÃ¡val megmondani, hovÃ¡ Ãrja.
+.TP 
+\fB[ \-c\fP \fI<Ãºtvonal>\fP, \fB\-\-config\-dir\fP=\fI<Ãºtvonal>\fP \fB]\fP
+A beÃ¡llÃtÃ¡sokat az \fI<Ãºtvonal>\fP\-bÃ³l olvassa az alapÃ©rtelmezett
+helyett.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Egy rÃ¶vid hasznÃ¡lati leÃrÃ¡st jelenÃt meg.
 .P
-A \fBcas\fR egy program az aMule online-aláírás fájl tartamlának megjelenítésére a képernyõn.
-.SS OPCIÓK:
-.TP
-\fB\-o\fR
-Online-aláírás képet készít.
-.TP
-\fB\-p\fR
-HTML oldal a statisztikákkal és képpel.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Rövid használati útmutató.
-.P
-Opciók nélkül kiírja az online-aláírás fájl tartalmát az stdout-ra.
-.SH FÁJLOK
+ParamÃ©terek nÃ©lkÃ¼l az online\-alÃ¡ÃrÃ¡s adatokat a szabvÃ¡ny kimenetre Ãrja.
+
+A \fBcas\fP\-t Pedro de Oliveira <falso@rdk.homeip.net> Ãrta.
+.SH FÃJLOK
 ~/.aMule/casrc
 .br
 stat.png
 .br
 tmp.html
-.SH ÍRÓ
-A \fBcas\fR-t Pedro de Oliveira <falso@rdk.homeip.net> készítette.
-.SH HIBÁK JELENTÉSE
-A hibákat kérjük vagy a fórumon (\fIhttp://forum.amule.org/\fR), vagy a hibakövetõben (\fIhttp://bugs.amule.org/\fR) jelentsék.
-Hibákról kérjük ne írjanak levelet (e-mail-t) se a levelzési listára, se közvetlenül valamelyik fejlesztõnek.
+.SH "HIBÃK JELENTÃSE"
+A hibÃ¡kat kÃ©rjÃ¼k vagy a fÃ³rumon (\fIhttp://forum.amule.org/\fP), vagy a
+hibakÃ¶vetÅben (\fIhttp://bugs.amule.org/\fP) jelentsÃ©k. HibÃ¡krÃ³l kÃ©rjÃ¼k ne
+Ãrjanak levelet (e\-mail\-t) se a levelezÃ©si listÃ¡ra, se kÃ¶zvetlenÃ¼l
+valamelyik fejlesztÅnek.
 .SH COPYRIGHT
-Az aMule és az összes hozzá tartozó segédprogram a GNU General Public Licence védelme alatt áll.
-.SH LÁSD MÉG
-\fBamule\fR(1), \fBwxcas\fR(1)
-.SH MAGYAR FORDÍTÁS
-Dévai Tamás <gonosztopi@amule.org>
+Az aMule Ã©s az Ã¶sszes hozzÃ¡ tartozÃ³ segÃ©dprogram a GNU General Public
+License vÃ©delme alatt Ã¡ll.
+.SH "LÃSD MÃG"
+.B_untranslated amule\fR(1), \fBwxcas\fR(1)
+.SH SZERZÅ
+Ezt a kÃ©zikÃ¶nyv lapot Vollstrecker <amule@vollstreckernet.de> Ãrta.
+.SH MAGYAR FORDÃTÃS
+DÃ©vai TamÃ¡s <gonosztopi@amule.org>

aMule-2.3.1.tar.bz2/src/utils/cas/docs/cas.it.1 Added

@@ -0,0 +1,65 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH CAS 1 "Novembre 2011" "cas v0.8" "Utilità di aMule"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH NOME
+cas \- statistiche c di aMule
+.SH SINTASSI
+.B_untranslated cas
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-p ]
+[\fB\-c\fP \fI<percorso>\fP]
+
+.B_untranslated cas
+.RB_untranslated [ \-h ]
+.SH DESCRIZIONE
+\fBcas\fP è un programma per visualizzare i contenuti del file di firma
+generato da aMule in console (in forma leggibile dalle persone). Per il
+funzionamento, devi abilitare l'opzione "firma online" nelle preferenze di
+aMule.
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-picture\fR, \fB\-P ]\fR
+Genera il disegno per la firma. Si può anche aggiungere
+\fI=<percorso>\fP a questa opzione per specificare il luogo dove deve
+essere scritta.
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-html\fR, \fB\-H ]\fR
+Pagina HTML con le statistiche e il disegno. Si può anche aggiungere
+\fI=<percorso>\fP a questa opzione per specificare il luogo dove deve
+essere scritta.
+.TP 
+\fB[ \-c\fP \fI<percorso>\fP, \fB\-\-config\-dir\fP=\fI<percorso>\fP \fB]\fP
+Legge la configurazione dal \fI<percorso>\fP invece che dalla directory
+dell'utente.
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Visualizza una breve descrizione dell'utilizzo.
+.P
+Senza opzioni, scrive i dati della firma nello stdout.
+
+\fBcas\fP è stato scritto da Pedro de Oliveira <falso@rdk.homeip.net>
+.SH FILE
+~/.aMule/casrc
+.br
+stat.png
+.br
+tmp.html
+.SH "SEGNALARE I BUG"
+Per favore segnalare i bug nel nostro forum (\fIhttp://forum.amule.org/\fP) o
+nel nostro bugtracker (\fIhttp://bugs.amule.org/\fP). Per favore non segnalare
+i bug via posta elettronica, né nella nostra mailing list né direttamente a
+qualunque membro del gruppo.
+.SH COPYRIGHT
+aMule e tutti i programmi di utilità correlati sono distribuiti in accordo
+alla GNU General Public License.
+.SH "VEDI ANCHE"
+.B_untranslated amule\fR(1), \fBwxcas\fR(1)
+.SH AUTORE
+Questa pagina del manuale è stata scritta da Vollstrecker
+<amule@vollstreckernet.de>
+.SH TRADUZIONE ITALIANA
+Stefano Corti <iz0bbz@libero.it>

aMule-2.3.1.tar.bz2/src/utils/cas/docs/cas.ru.1 Added

@@ -0,0 +1,60 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH CAS 1 "November 2011" "cas v0.8" "утилиты aMule"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH ИМЯ
+cas \- c\-статистика aMule
+.SH ОБЗОР
+.B_untranslated cas
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-p ]
+[\fB\-c\fP \fI<путь>\fP]
+
+.B_untranslated cas
+.RB_untranslated [ \-h ]
+.SH ОПИСАНИЕ
+\fBcas\fP \- программа для отображения содержимого файла вашей онлайн\-подписи
+aMule на консоль (в читаемой форме). Чтобы это работало, вы должны включить
+опцию "Онлайн подпись" в настройках aMule.
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-picture\fR, \fB\-P ]\fR
+Записывает картинку с онлайн\-подписью. Вы можете дополнительно указать
+\fI=<ПУТЬ>\fP, куда она будет сохранена.
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-html\fR, \fB\-H ]\fR
+HTML страница со статистикой и картинкой. Вы можете дополнительно указать
+\fI=<ПУТЬ>\fP, куда она будет сохранена.
+.TP 
+\fB[ \-c\fP \fI<путь>\fP, \fB\-\-config\-dir\fP=\fI<путь>\fP \fB]\fP
+Прочитать конфигурацию из места, указанного в \fI<пути>\fP, вместо
+домашнего каталога
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Выводит короткую помощь по использованию.
+.P
+Без опций программа выведет данные о подписи в стандартный вывод.
+
+\fBcas\fP был написан Pedro de Oliveira <falso@rdk.homeip.net>
+.SH ФАЙЛЫ
+~/.aMule/casrc
+.br
+stat.png
+.br
+tmp.html
+.SH "СООБЩЕНИЕ ОБ ОШИБКАХ"
+Пожалуйста, сообщайте об ошибках либо на нашем форуме
+(\fIhttp://forum.amule.org/\fP), либо в багтрекере
+(\fIhttp://bugs.amule.org/\fP). Пожалуйста, не сообщайте об ошбках по
+электронной почте, по нашим спискам рассылки, или напрямую участникам.
+.SH "АВТОРСКИЕ ПРАВА"
+aMule и все прилагающиеся инструменты распространаются под Открытым
+Лицензионным Соглашением GNU (GNU GPL).
+.SH "СМ. ТАКЖЕ"
+.B_untranslated amule\fR(1), \fBwxcas\fR(1)
+.SH АВТОРЫ
+Автор страницы помощи: Vollstrecker <amule@vollstreckernet.de>,
+перевод: Radist Morse <radist.morse@gmail.com>

aMule-2.3.1.tar.bz2/src/utils/cas/docs/cas.tr.1 Added

@@ -0,0 +1,61 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH CAS 1 "Kasım 2011" "cas v0.8" "aMule yardımcı araçları"
+.als B_untranslated B
+.als RB_untranslated RB
+.SH İSİM
+cas \- c aMule istatistikleri
+.SH KULLANIM
+.B_untranslated cas
+.RB_untranslated [ \-o ]
+.RB_untranslated [ \-p ]
+[\fB\-c\fP \fI<yol>\fP]
+
+.B_untranslated cas
+.RB_untranslated [ \-h ]
+.SH AÇIKLAMA
+\fBcas\fP çevrimiçi aMule imza dosyanızı konsolda (insanların okuyabileceği bir
+şekilde) görüntülemeye yarayan bir programdır. Bunun çalışması için aMule'ün
+ayarlarında "Çevrim İçi İmza" seçeneğini etkinleştirmeniz gerekmektedir.
+.TP 
+.B_untranslated [ \-o\fR, \fB\-\-picture\fR, \fB\-P ]\fR
+Çevrimiçi imza resmini yazar. Yazılacağı konumu belirtmek için İsteğinize
+bağlı olarak bu seçeneğe \fI=<YOL>\fP ekleyebilirsiniz.
+.TP 
+.B_untranslated [ \-p\fR, \fB\-\-html\fR, \fB\-H ]\fR
+Resim ve istatistikleri bir HTML sayfasına yazar. Yazılacağı konumu
+belirtmek için İsteğinize bağlı olarak bu seçeneğe \fI=<YOL>\fP
+ekleyebilirsiniz.
+.TP 
+\fB[ \-c\fP \fI<yol>\fP, \fB\-\-config\-dir\fP=\fI<yol>\fP \fB]\fP
+Yapılandırmayı home yerine \fI<yol>\fPdan oku
+.TP 
+.B_untranslated [ \-h\fR, \fB\-\-help ]\fR
+Kısa bir kullanım açıklaması görüntüler.
+.P
+Hiçbir seçenek belirtilmediği zaman çevrimiçi imzayı standart çıktıda yazar.
+
+\fBcas\fP Pedro de Oliveira <falso@rdk.homeip.net> tarafından
+yazılmıştır
+.SH DOSYALAR
+~/.aMule/casrc
+.br
+stat.png
+.br
+tmp.html
+.SH GERİBİLDİRİM
+Hataları bildirmek için forumumuzu (\fIhttp://forum.amule.org/\fP) ya da hata
+takipçimizi (\fIhttp://bugs.amule.org/\fP) kullanınız. Hataları bildirmek için
+e\-mail ve e\-mail listemizi kullanmamanızı ve geliştiricilerden birine
+doğrudan bildirmemenizi rica ederiz.
+.SH "TELİF HAKKI"
+aMule ve ilgili tüm yardımcı araçları GNU Genel Kamu Lisansı çerçevesinde
+dağıtılmaktadır.
+.SH "İLGİLİ BELGELER"
+.B_untranslated amule\fR(1), \fBwxcas\fR(1)
+.SH YAZAN
+Bu kılavuz sayfası Vollstrecker <amule@vollstreckernet.de>
+tarafından yazılmıştır.

aMule-2.2.6.tar.bz2/src/utils/cas/functions.c -> aMule-2.3.1.tar.bz2/src/utils/cas/functions.c Changed

aMule-2.2.6.tar.bz2/src/utils/cas/functions.h -> aMule-2.3.1.tar.bz2/src/utils/cas/functions.h Changed

aMule-2.2.6.tar.bz2/src/utils/cas/graphics.c -> aMule-2.3.1.tar.bz2/src/utils/cas/graphics.c Changed

aMule-2.2.6.tar.bz2/src/utils/cas/graphics.h -> aMule-2.3.1.tar.bz2/src/utils/cas/graphics.h Changed

aMule-2.2.6.tar.bz2/src/utils/cas/html.c -> aMule-2.3.1.tar.bz2/src/utils/cas/html.c Changed

aMule-2.2.6.tar.bz2/src/utils/cas/html.h -> aMule-2.3.1.tar.bz2/src/utils/cas/html.h Changed

aMule-2.2.6.tar.bz2/src/utils/cas/version.h -> aMule-2.3.1.tar.bz2/src/utils/cas/version.h Changed

aMule-2.2.6.tar.bz2/src/utils/fileview/FileView.cpp -> aMule-2.3.1.tar.bz2/src/utils/fileview/FileView.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 Dévai Tamás ( gonosztopi@amule.org )
-// Copyright (c) 2008-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2008-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
@@ -17,7 +17,7 @@
 // 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
@@ -26,12 +26,13 @@
 #include <wx/app.h>
 #include <wx/cmdline.h>
 #include <list>
+#include "eD2kFiles.h"
 #include "KadFiles.h"
 #include "Print.h"
 #include "../../CFile.h"
 
 #define VERSION_MAJOR	0
-#define VERSION_MINOR	1
+#define VERSION_MINOR	10
 #define VERSION_MICRO	0
 
 class CFileView : public wxApp
@@ -50,25 +51,19 @@
 // Logging facility from aMule
 enum DebugType {};
 
-namespace CLogger {
-
-	bool IsEnabled(DebugType)
-	{
-		return true;
-	}
-
-	void AddLogLine(const wxString& /*file*/, int /*line*/, bool /*critical*/, const wxString& str)
-	{
-		DoPrint(wxT("Log: ") + str + wxT("\n"));
-	}
-
-	void AddLogLine(const wxString& /*file*/, int /*line*/, bool /*critical*/, DebugType /*type*/, const wxString& str)
-	{
-		DoPrint(wxT("DebugLog: ") + str + wxT("\n"));
-	}
+class CLogger
+{
+      public:
+	void AddLogLine(const wxString& /*file*/, int /*line*/, bool /*critical*/, DebugType /*type*/, const wxString& str, bool /*toStdout*/, bool /*toGUI*/);
+};
 
+void CLogger::AddLogLine(const wxString& /*file*/, int /*line*/, bool /*critical*/, DebugType /*type*/, const wxString& str, bool /*toStdout*/, bool /*toGUI*/)
+{
+	cout << "DebugLog: " << str << "\n";
 }
 
+CLogger theLogger;
+
 
 IMPLEMENT_APP(CFileView);
 
@@ -76,15 +71,34 @@
 {
 	parser.AddSwitch(wxT("h"), wxT("help"), wxT("Show help"), wxCMD_LINE_OPTION_HELP);
 	parser.AddSwitch(wxT("v"), wxT("version"), wxT("Show program version"), wxCMD_LINE_PARAM_OPTIONAL);
+	parser.AddOption(wxT("s"), wxT("strings"), wxT("String decoding mode: display (default), safe, utf8, none"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
 	parser.AddParam(wxT("input file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL | wxCMD_LINE_PARAM_MULTIPLE);
 }
 
 bool CFileView::OnCmdLineParsed(wxCmdLineParser& parser)
 {
 	if (parser.Found(wxT("version"))) {
-		DoPrint(wxString::Format(wxT("MuleFileView version %u.%u.%u\nCopyright (c) 2008-2009 aMule Team\n"), VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO));
+		cout << wxString::Format(wxT("MuleFileView version %u.%u.%u\nCopyright (c) 2008-2011 aMule Team\n"), VERSION_MAJOR, VERSION_MINOR, VERSION_MICRO);
 		return false;
 	} else {
+		wxString strDecode;
+		if (parser.Found(wxT("strings"), &strDecode)) {
+			if (strDecode == wxT("display")) {
+				SetStringsMode(SD_DISPLAY);
+			} else if (strDecode == wxT("safe")) {
+				SetStringsMode(SD_SAFE);
+			} else if (strDecode == wxT("utf8")) {
+				SetStringsMode(SD_UTF8);
+			} else if (strDecode == wxT("none")) {
+				SetStringsMode(SD_NONE);
+			} else {
+				parser.SetLogo(wxT("Error: Invalid argument to --strings option: \"") + strDecode + wxT("\""));
+				parser.Usage();
+				return false;
+			}
+		} else {
+			SetStringsMode(SD_DISPLAY);
+		}
 		for (size_t n = 0; n < parser.GetParamCount(); n++) {
 			m_files.push_back(parser.GetParam(n));
 		}
@@ -105,9 +119,9 @@
 			CFile file(*it);
 			if (file.IsOpened()) {
 				if (it != m_files.begin()) {
-					DoPrint(wxT("\n"));
+					cout << endl;
 				}
-				DoPrint(wxT("Decoding file: ") + (*it) + wxT("\n"));
+				cout << "Decoding file: " << *it << endl;
 				if (basename == wxT("preferencesKad.dat")) {
 					DecodePreferencesKadDat(file);
 				} else if (basename == wxT("load_index.dat")) {
@@ -118,24 +132,38 @@
 					DecodeSourceIndexDat(file);
 				} else if (basename == wxT("nodes.dat")) {
 					DecodeNodesDat(file);
+				} else if (basename == wxT("preferences.dat")) {
+					DecodePreferencesDat(file);
+				} else if (basename == wxT("emfriends.met")) {
+					DecodeFriendList(file);
+				} else if (basename == wxT("server.met")) {
+					DecodeServerMet(file);
+				} else if (basename == wxT("clients.met")) {
+					DecodeClientsMet(file);
+				} else if (basename == wxT("known.met")) {
+					DecodeKnownMet(file);
+				} else if (basename == wxT("statistics.dat")) {
+					DecodeStatisticsDat(file);
+				} else if (basename.Find(wxT(".part.met")) != wxNOT_FOUND) {
+					DecodePartMetFile(file);
 				} else {
-					DoPrint(wxT("ERROR: Don't know how to decode ") + (*it) + wxT("\n"));
+					cerr << "ERROR: Don't know how to decode " << *it << endl;
 				}
 			}
 		} catch (const CEOFException& e) {
-			DoPrint(wxT("ERROR: A CEOFException has been raised while decoding ") + (*it) + wxT(": ") + e.what() + wxT("\n"));
+			cerr << "ERROR: A CEOFException has been raised while decoding " << *it << ": " << e.what() << endl;
 			return 1;
 		} catch (const CIOFailureException& e) {
-			DoPrint(wxT("ERROR: A CIOFailureException has been raised while decoding ") + (*it) + wxT(": ") + e.what() + wxT("\n"));
+			cerr << "ERROR: A CIOFailureException has been raised while decoding " << *it << ": " << e.what() << endl;
 			return 1;
 		} catch (const CSafeIOException& e) {
-			DoPrint(wxT("ERROR: A CSafeIOException has been raised while decoding ") + (*it) + wxT(": ") + e.what() + wxT("\n"));
+			cerr << "ERROR: A CSafeIOException has been raised while decoding " << *it << ": " << e.what() << endl;
 			return 1;
 		} catch (const CMuleException& e) {
-			DoPrint(wxT("ERROR: A CMuleException has been raised while decoding ") + (*it) + wxT(": ") + e.what() + wxT("\n"));
+			cerr << "ERROR: A CMuleException has been raised while decoding " << *it << ": " << e.what() << endl;
 			return 1;
 		} catch (const wxString& e) {
-			DoPrint(wxT("ERROR: An exception of type wxString has been raised while decoding ") + (*it) + wxT(": ") + e + wxT("\n"));
+			cerr << "ERROR: An exception of type wxString has been raised while decoding " << *it << ": " << e << endl;
 			return 1;
 		}
 	}

aMule-2.2.6.tar.bz2/src/utils/fileview/KadFiles.cpp -> aMule-2.3.1.tar.bz2/src/utils/fileview/KadFiles.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 Dévai Tamás ( gonosztopi@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2004-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
@@ -17,7 +17,7 @@
 // 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
@@ -26,25 +26,67 @@
 #include "KadFiles.h"
 #include "Print.h"
 #include "../../SafeFile.h"
+#include "../../kademlia/kademlia/SearchManager.h"	// for CSearchManager::GetInvalidKeywordChars()
+#include <wx/tokenzr.h>
 
 void DecodePreferencesKadDat(const CFileDataIO& file)
 {
-	DoPrint(wxT("IP      : ")); Print(CKadIP(file.ReadUInt32())); DoPrint(wxT("\n"));
-	DoPrint(wxT("(unused): ")); Print(file.ReadUInt16()); DoPrint(wxT("\n"));
-	DoPrint(wxT("ClientID: ")); Print(file.ReadUInt128()); DoPrint(wxT("\n"));
+	cout << "IP      : " << CKadIP(file.ReadUInt32()) << '\n';
+	cout << "(unused): " << file.ReadUInt16() << '\n';
+	cout << "ClientID: " << file.ReadUInt128() << '\n';
 }
 
 void DecodeLoadIndexDat(const CFileDataIO& file)
 {
-	DoPrint(wxT("Version   : ")); Print(file.ReadUInt32()); DoPrint(wxT("\n"));
-	DoPrint(wxT("(savetime): ")); Print((time_t)file.ReadUInt32()); DoPrint(wxT("\n"));
+	cout << "Version   : " << file.ReadUInt32();
+	cout << "\n(savetime): " << CTimeT(file.ReadUInt32());
 	uint32_t numLoad = file.ReadUInt32();
-	DoPrint(wxT("numLoad   : ")); Print(numLoad); DoPrint(wxT("\n"));
+	cout << "\nnumLoad   : " << numLoad << '\n';
 	for (uint32_t i = 0; i < numLoad; i++) {
-		DoPrint(wxString::Format(wxT("\t: { "), i)); Print(file.ReadUInt128()); DoPrint(wxT(", ")); Print((time_t)file.ReadUInt32()); DoPrint(wxT(" }\n"));
+		cout << "\t{ " << file.ReadUInt128();
+		cout << ", " << CTimeT(file.ReadUInt32()) << " }\n";
 	}
 }
 
+// from Kademlia.cpp
+#include "../../CryptoPP_Inc.h"
+void KadGetKeywordHash(const wxString& rstrKeyword, Kademlia::CUInt128* pKadID)
+{
+	byte Output[16];
+#ifdef CRYPTOPP_ENABLE_NAMESPACE_WEAK
+	CryptoPP::Weak::MD4 md4_hasher;
+#else
+	CryptoPP::MD4 md4_hasher;
+#endif
+
+	// This should be safe - we assume rstrKeyword is ANSI anyway.
+	Unicode2CharBuf ansi_buffer(unicode2UTF8(rstrKeyword));
+	
+	md4_hasher.CalculateDigest(Output, (const byte *) (const char *) ansi_buffer, strlen(ansi_buffer));
+	
+	pKadID->SetValueBE(Output);
+}
+
+// code from CSearchManager::GetWords(const wxString& str, WordList *words)
+bool IdentifyKeyword(const Kademlia::CUInt128& keyID, const wxString& str, wxString& keyword)
+{
+	wxStringTokenizer tkz(str, Kademlia::CSearchManager::GetInvalidKeywordChars());
+	while (tkz.HasMoreTokens()) {
+		wxString current_word = tkz.GetNextToken();
+		
+		if (current_word.Length() > 2) {
+			current_word.MakeLower();
+			Kademlia::CUInt128 currentID;
+			KadGetKeywordHash(current_word, &currentID);
+			if (currentID == keyID) {
+				keyword = current_word;
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
 void DecodeKeyIndexDat(const CFileDataIO& file)
 {
 	uint32_t version;
@@ -53,39 +95,44 @@
 	uint32_t numName;
 	uint8_t tagCount;
 
-	DoPrint(wxT("Version : ")); Print(version = file.ReadUInt32()); DoPrint(wxT("\n"));
-	DoPrint(wxT("SaveTime: ")); Print((time_t)file.ReadUInt32()); DoPrint(wxT("\n"));
-	DoPrint(wxT("ID      : ")); Print(file.ReadUInt128()); DoPrint(wxT("\n"));
-	DoPrint(wxT("numKeys : ")); Print(numKeys = file.ReadUInt32()); DoPrint(wxT("\n"));
+	cout << "Version : " << (version = file.ReadUInt32());
+	cout << "\nSaveTime: " << CTimeT(file.ReadUInt32());
+	cout << "\nID      : " << file.ReadUInt128();
+	cout << "\nnumKeys : " << (numKeys = file.ReadUInt32()) << '\n';
 	for (uint32_t ik = 0; ik < numKeys; ik++) {
-		DoPrint(wxT("\tKeyID    : ")); Print(file.ReadUInt128()); DoPrint(wxT("\n"));
-		DoPrint(wxT("\tnumSource: ")); Print(numSource = file.ReadUInt32()); DoPrint(wxT("\n"));
+		Kademlia::CUInt128 keyID = file.ReadUInt128();
+		bool identified = false;
+		cout << "\tKeyID    : " << keyID;
+		cout << "\n\tnumSource: " << (numSource = file.ReadUInt32()) << '\n';
 		for (uint32_t is = 0; is < numSource; is++) {
-			DoPrint(wxT("\t\tSourceID: ")); Print(file.ReadUInt128()); DoPrint(wxT("\n"));
-			DoPrint(wxT("\t\tnumName : ")); Print(numName = file.ReadUInt32()); DoPrint(wxT("\n"));
+			cout << "\t\tSourceID: " << file.ReadUInt128();
+			cout << "\n\t\tnumName : " << (numName = file.ReadUInt32()) << '\n';
 			for (uint32_t iN = 0; iN < numName; iN++) {
-				DoPrint(wxT("\t\t\tLifeTime : ")); Print((time_t)file.ReadUInt32()); DoPrint(wxT("\n"));
+				cout << "\t\t\tLifeTime : " <<  CTimeT(file.ReadUInt32()) << '\n';
 				if (version >= 3) {
 					uint32_t count;
-					DoPrint(wxT("\t\t\tnameCount: ")); Print(count = file.ReadUInt32()); DoPrint(wxT("\n"));
+					cout << "\t\t\tnameCount: " << (count = file.ReadUInt32()) << '\n';
 					for (uint32_t i = 0; i < count; i++) {
-						DoPrint(wxT("\t\t\t\t{ ")); Print(file.ReadString(true, 2)); DoPrint(wxT(", "));
-						Print(file.ReadUInt32()); DoPrint(wxT(" }\n"));
+						wxString name = file.ReadString(true, 2);
+						cout << "\t\t\t\t{ " << MakePrintableString(name);
+						cout << ", " << file.ReadUInt32() << " }\n";
+						wxString keyword;
+						if (!identified && IdentifyKeyword(keyID, name, keyword)) {
+							cout << "\tKeyword: " << MakePrintableString(keyword) << '\n';
+							identified = true;
+						}
 					}
-					DoPrint(wxT("\t\t\tipCount : ")); Print(count = file.ReadUInt32()); DoPrint(wxT("\n"));
+					cout << "\t\t\tipCount  : " << (count = file.ReadUInt32()) << '\n';
 					for (uint32_t i = 0; i < count; i++) {
-						DoPrint(wxT("\t\t\t\t{ ")); Print(CKadIP(file.ReadUInt32())); DoPrint(wxT(", "));
-						Print((time_t)file.ReadUInt32());
-						DoPrint(wxT(" }\n"));
+						cout << "\t\t\t\t{ " << CKadIP(file.ReadUInt32());
+						cout << ", " << CTimeT(file.ReadUInt32()) << " }\n";
 					}
 				}
-				DoPrint(wxT("\t\t\ttagCount: ")); Print(tagCount = file.ReadUInt8()); DoPrint(wxT("\n"));
+				cout << "\t\t\ttagCount : " << (uint32)(tagCount = file.ReadUInt8()) << '\n';
 				for (uint32_t it = 0; it < tagCount; it++) {
-					DoPrint(wxT("\t\t\t\t"));
 					CTag *tag = file.ReadTag();
-					Print(*tag);
+					cout << "\t\t\t\t" << *tag << '\n';
 					delete tag;
-					DoPrint(wxT("\n"));
 				}
 			}
 		}
@@ -99,24 +146,22 @@
 	uint32_t numName;
 	uint8_t tagCount;
 
-	DoPrint(wxT("Version : ")); Print(file.ReadUInt32()); DoPrint(wxT("\n"));
-	DoPrint(wxT("SaveTime: ")); Print((time_t)file.ReadUInt32()); DoPrint(wxT("\n"));
-	DoPrint(wxT("numKeys : ")); Print(numKeys = file.ReadUInt32()); DoPrint(wxT("\n"));
+	cout << "Version : " << file.ReadUInt32();
+	cout << "\nSaveTime: " << CTimeT(file.ReadUInt32());
+	cout << "\nnumKeys : " << (numKeys = file.ReadUInt32()) << '\n';
 	for (uint32_t ik = 0; ik < numKeys; ik++) {
-		DoPrint(wxT("\tKeyID    : ")); Print(file.ReadUInt128()); DoPrint(wxT("\n"));
-		DoPrint(wxT("\tnumSource: ")); Print(numSource = file.ReadUInt32()); DoPrint(wxT("\n"));
+		cout << "\tKeyID    : " << file.ReadUInt128();
+		cout << "\n\tnumSource: " << (numSource = file.ReadUInt32()) << '\n';
 		for (uint32_t is = 0; is < numSource; is++) {
-			DoPrint(wxT("\t\tSourceID: ")); Print(file.ReadUInt128()); DoPrint(wxT("\n"));
-			DoPrint(wxT("\t\tnumName : ")); Print(numName = file.ReadUInt32()); DoPrint(wxT("\n"));
+			cout << "\t\tSourceID: " << file.ReadUInt128();
+			cout << "\n\t\tnumName : " << (numName = file.ReadUInt32()) << '\n';
 			for (uint32_t iN = 0; iN < numName; iN++) {
-				DoPrint(wxT("\t\t\tLifeTime: ")); Print((time_t)file.ReadUInt32()); DoPrint(wxT("\n"));
-				DoPrint(wxT("\t\t\ttagCount: ")); Print(tagCount = file.ReadUInt8()); DoPrint(wxT("\n"));
+				cout << "\t\t\tLifeTime: " << CTimeT(file.ReadUInt32());
+				cout << "\n\t\t\ttagCount: " << (tagCount = file.ReadUInt8()) << '\n';
 				for (uint32_t it = 0; it < tagCount; it++) {
-					DoPrint(wxT("\t\t\t\t"));
 					CTag *tag = file.ReadTag();
-					Print(*tag);
+					cout << "\t\t\t\t" << *tag << '\n';
 					delete tag;
-					DoPrint(wxT("\n"));
 				}
 			}
 		}
@@ -128,28 +173,32 @@
 	uint32_t numContacts = file.ReadUInt32();
 	uint32_t fileVersion = 0;
 
-	DoPrint(wxT("NumContacts #1: ")); Print(numContacts); DoPrint(wxT("\n"));
+	cout << "NumContacts #1  : " << numContacts << '\n';
 	if (numContacts == 0) {
-		DoPrint(wxT("FileVersion   : ")); Print(fileVersion = file.ReadUInt32()); DoPrint(wxT("\n"));
-		if (fileVersion >= 1) {
-			DoPrint(wxT("NumContacts #2: ")); Print(numContacts = file.ReadUInt32()); DoPrint(wxT("\n"));
+		cout << "FileVersion     : " << (fileVersion = file.ReadUInt32()) << '\n';
+		if (fileVersion == 3) {
+			cout << "BootstrapEdition: " << file.ReadUInt32() << '\n';
+		}
+		if (fileVersion >= 1 && fileVersion <= 3) {
+			cout << "NumContacts #2  : " << (numContacts = file.ReadUInt32()) << '\n';
 		}
 	}
 	for (uint32_t i = 0; i < numContacts; i++) {
-		DoPrint(wxT("\t{ "));
-		Print(file.ReadUInt128()); DoPrint(wxT(", "));
-		Print(CKadIP(file.ReadUInt32())); DoPrint(wxT(", "));
-		Print(file.ReadUInt16()); DoPrint(wxT(", "));
-		Print(file.ReadUInt16()); DoPrint(wxT(", "));
-		Print(file.ReadUInt8());
+		cout << wxString::Format(wxT("#%u\tID       : "), i) << file.ReadUInt128();
+		cout << "\n\tIP       : " << CKadIP(file.ReadUInt32());
+		cout << "\n\tUDP Port : " << file.ReadUInt16();
+		cout << "\n\tTCP Port : " << file.ReadUInt16();
+		if (fileVersion >= 1) {
+			cout << "\n\tVersion  : ";
+		} else {
+			cout << "\n\tType     : ";
+		}
+		cout << (unsigned)file.ReadUInt8();
 		if (fileVersion >= 2) {
-			DoPrint(wxT(", { "));
-			PrintHex(file.ReadUInt32());
-			DoPrint(wxT(", "));
-			Print(CKadIP(file.ReadUInt32()));
-			DoPrint(wxT(" }, "));
-			Print(file.ReadUInt8() != 0);
+			cout << "\n\tUDP Key  : { " << hex(file.ReadUInt32());
+			cout << ", " << CKadIP(file.ReadUInt32());
+			cout << " }\n\tVerified : " << (file.ReadUInt8() != 0 ? "true" : "false");
 		}
-		DoPrint(wxT(" }\n"));
+		cout << '\n';
 	}
 }

aMule-2.2.6.tar.bz2/src/utils/fileview/KadFiles.h -> aMule-2.3.1.tar.bz2/src/utils/fileview/KadFiles.h Changed

aMule-2.2.6.tar.bz2/src/utils/fileview/Makefile.am -> aMule-2.3.1.tar.bz2/src/utils/fileview/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/utils/fileview/Makefile.in -> aMule-2.3.1.tar.bz2/src/utils/fileview/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +15,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -47,11 +45,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -61,49 +61,68 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am_mulefileview_OBJECTS = mulefileview-CFile.$(OBJEXT) \
-	mulefileview-SafeFile.$(OBJEXT) mulefileview-Tag.$(OBJEXT) \
-	mulefileview-UInt128.$(OBJEXT) mulefileview-FileView.$(OBJEXT) \
+	mulefileview-SafeFile.$(OBJEXT) \
+	mulefileview-OtherFunctions.$(OBJEXT) \
+	mulefileview-Tag.$(OBJEXT) mulefileview-UInt128.$(OBJEXT) \
+	mulefileview-eD2kFiles.$(OBJEXT) \
+	mulefileview-FileView.$(OBJEXT) \
 	mulefileview-KadFiles.$(OBJEXT) mulefileview-Print.$(OBJEXT)
 mulefileview_OBJECTS = $(am_mulefileview_OBJECTS)
 am__DEPENDENCIES_1 =
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+mulefileview_LINK = $(CXXLD) $(mulefileview_CXXFLAGS) $(CXXFLAGS) \
+	$(mulefileview_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(mulefileview_SOURCES)
 DIST_SOURCES = $(mulefileview_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -118,17 +137,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -140,44 +153,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -199,13 +212,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -213,44 +223,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -259,7 +265,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -267,25 +272,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -297,34 +296,49 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 mulefileview_SOURCES = \
 	../../CFile.cpp \
 	../../SafeFile.cpp \
+	../../OtherFunctions.cpp \
 	../../Tag.cpp \
 	../../kademlia/utils/UInt128.cpp \
+	../../kademlia/kademlia/SearchManager.h \
+	eD2kFiles.h \
+	eD2kFiles.cpp \
 	FileView.cpp \
 	KadFiles.h \
 	KadFiles.cpp \
@@ -344,14 +358,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/utils/fileview/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/utils/fileview/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/fileview/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/fileview/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -369,12 +383,13 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstPROGRAMS:
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
 mulefileview$(EXEEXT): $(mulefileview_OBJECTS) $(mulefileview_DEPENDENCIES) 
 	@rm -f mulefileview$(EXEEXT)
-	$(CXXLINK) $(mulefileview_LDFLAGS) $(mulefileview_OBJECTS) $(mulefileview_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(mulefileview_LINK) $(mulefileview_OBJECTS) $(mulefileview_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -385,196 +400,252 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mulefileview-CFile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mulefileview-FileView.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mulefileview-KadFiles.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mulefileview-OtherFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mulefileview-Print.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mulefileview-SafeFile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mulefileview-Tag.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mulefileview-UInt128.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mulefileview-eD2kFiles.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 mulefileview-CFile.o: ../../CFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-CFile.o -MD -MP -MF "$(DEPDIR)/mulefileview-CFile.Tpo" -c -o mulefileview-CFile.o `test -f '../../CFile.cpp' || echo '$(srcdir)/'`../../CFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-CFile.Tpo" "$(DEPDIR)/mulefileview-CFile.Po"; else rm -f "$(DEPDIR)/mulefileview-CFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-CFile.o -MD -MP -MF $(DEPDIR)/mulefileview-CFile.Tpo -c -o mulefileview-CFile.o `test -f '../../CFile.cpp' || echo '$(srcdir)/'`../../CFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-CFile.Tpo $(DEPDIR)/mulefileview-CFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../../CFile.cpp' object='mulefileview-CFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-CFile.o `test -f '../../CFile.cpp' || echo '$(srcdir)/'`../../CFile.cpp
 
 mulefileview-CFile.obj: ../../CFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-CFile.obj -MD -MP -MF "$(DEPDIR)/mulefileview-CFile.Tpo" -c -o mulefileview-CFile.obj `if test -f '../../CFile.cpp'; then $(CYGPATH_W) '../../CFile.cpp'; else $(CYGPATH_W) '$(srcdir)/../../CFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-CFile.Tpo" "$(DEPDIR)/mulefileview-CFile.Po"; else rm -f "$(DEPDIR)/mulefileview-CFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-CFile.obj -MD -MP -MF $(DEPDIR)/mulefileview-CFile.Tpo -c -o mulefileview-CFile.obj `if test -f '../../CFile.cpp'; then $(CYGPATH_W) '../../CFile.cpp'; else $(CYGPATH_W) '$(srcdir)/../../CFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-CFile.Tpo $(DEPDIR)/mulefileview-CFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../../CFile.cpp' object='mulefileview-CFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-CFile.obj `if test -f '../../CFile.cpp'; then $(CYGPATH_W) '../../CFile.cpp'; else $(CYGPATH_W) '$(srcdir)/../../CFile.cpp'; fi`
 
 mulefileview-SafeFile.o: ../../SafeFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-SafeFile.o -MD -MP -MF "$(DEPDIR)/mulefileview-SafeFile.Tpo" -c -o mulefileview-SafeFile.o `test -f '../../SafeFile.cpp' || echo '$(srcdir)/'`../../SafeFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-SafeFile.Tpo" "$(DEPDIR)/mulefileview-SafeFile.Po"; else rm -f "$(DEPDIR)/mulefileview-SafeFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-SafeFile.o -MD -MP -MF $(DEPDIR)/mulefileview-SafeFile.Tpo -c -o mulefileview-SafeFile.o `test -f '../../SafeFile.cpp' || echo '$(srcdir)/'`../../SafeFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-SafeFile.Tpo $(DEPDIR)/mulefileview-SafeFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../../SafeFile.cpp' object='mulefileview-SafeFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-SafeFile.o `test -f '../../SafeFile.cpp' || echo '$(srcdir)/'`../../SafeFile.cpp
 
 mulefileview-SafeFile.obj: ../../SafeFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-SafeFile.obj -MD -MP -MF "$(DEPDIR)/mulefileview-SafeFile.Tpo" -c -o mulefileview-SafeFile.obj `if test -f '../../SafeFile.cpp'; then $(CYGPATH_W) '../../SafeFile.cpp'; else $(CYGPATH_W) '$(srcdir)/../../SafeFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-SafeFile.Tpo" "$(DEPDIR)/mulefileview-SafeFile.Po"; else rm -f "$(DEPDIR)/mulefileview-SafeFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-SafeFile.obj -MD -MP -MF $(DEPDIR)/mulefileview-SafeFile.Tpo -c -o mulefileview-SafeFile.obj `if test -f '../../SafeFile.cpp'; then $(CYGPATH_W) '../../SafeFile.cpp'; else $(CYGPATH_W) '$(srcdir)/../../SafeFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-SafeFile.Tpo $(DEPDIR)/mulefileview-SafeFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../../SafeFile.cpp' object='mulefileview-SafeFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-SafeFile.obj `if test -f '../../SafeFile.cpp'; then $(CYGPATH_W) '../../SafeFile.cpp'; else $(CYGPATH_W) '$(srcdir)/../../SafeFile.cpp'; fi`
 
+mulefileview-OtherFunctions.o: ../../OtherFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-OtherFunctions.o -MD -MP -MF $(DEPDIR)/mulefileview-OtherFunctions.Tpo -c -o mulefileview-OtherFunctions.o `test -f '../../OtherFunctions.cpp' || echo '$(srcdir)/'`../../OtherFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-OtherFunctions.Tpo $(DEPDIR)/mulefileview-OtherFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../../OtherFunctions.cpp' object='mulefileview-OtherFunctions.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-OtherFunctions.o `test -f '../../OtherFunctions.cpp' || echo '$(srcdir)/'`../../OtherFunctions.cpp
+
+mulefileview-OtherFunctions.obj: ../../OtherFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-OtherFunctions.obj -MD -MP -MF $(DEPDIR)/mulefileview-OtherFunctions.Tpo -c -o mulefileview-OtherFunctions.obj `if test -f '../../OtherFunctions.cpp'; then $(CYGPATH_W) '../../OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/../../OtherFunctions.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-OtherFunctions.Tpo $(DEPDIR)/mulefileview-OtherFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../../OtherFunctions.cpp' object='mulefileview-OtherFunctions.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-OtherFunctions.obj `if test -f '../../OtherFunctions.cpp'; then $(CYGPATH_W) '../../OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/../../OtherFunctions.cpp'; fi`
+
 mulefileview-Tag.o: ../../Tag.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-Tag.o -MD -MP -MF "$(DEPDIR)/mulefileview-Tag.Tpo" -c -o mulefileview-Tag.o `test -f '../../Tag.cpp' || echo '$(srcdir)/'`../../Tag.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-Tag.Tpo" "$(DEPDIR)/mulefileview-Tag.Po"; else rm -f "$(DEPDIR)/mulefileview-Tag.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-Tag.o -MD -MP -MF $(DEPDIR)/mulefileview-Tag.Tpo -c -o mulefileview-Tag.o `test -f '../../Tag.cpp' || echo '$(srcdir)/'`../../Tag.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-Tag.Tpo $(DEPDIR)/mulefileview-Tag.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../../Tag.cpp' object='mulefileview-Tag.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-Tag.o `test -f '../../Tag.cpp' || echo '$(srcdir)/'`../../Tag.cpp
 
 mulefileview-Tag.obj: ../../Tag.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-Tag.obj -MD -MP -MF "$(DEPDIR)/mulefileview-Tag.Tpo" -c -o mulefileview-Tag.obj `if test -f '../../Tag.cpp'; then $(CYGPATH_W) '../../Tag.cpp'; else $(CYGPATH_W) '$(srcdir)/../../Tag.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-Tag.Tpo" "$(DEPDIR)/mulefileview-Tag.Po"; else rm -f "$(DEPDIR)/mulefileview-Tag.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-Tag.obj -MD -MP -MF $(DEPDIR)/mulefileview-Tag.Tpo -c -o mulefileview-Tag.obj `if test -f '../../Tag.cpp'; then $(CYGPATH_W) '../../Tag.cpp'; else $(CYGPATH_W) '$(srcdir)/../../Tag.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-Tag.Tpo $(DEPDIR)/mulefileview-Tag.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../../Tag.cpp' object='mulefileview-Tag.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-Tag.obj `if test -f '../../Tag.cpp'; then $(CYGPATH_W) '../../Tag.cpp'; else $(CYGPATH_W) '$(srcdir)/../../Tag.cpp'; fi`
 
 mulefileview-UInt128.o: ../../kademlia/utils/UInt128.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-UInt128.o -MD -MP -MF "$(DEPDIR)/mulefileview-UInt128.Tpo" -c -o mulefileview-UInt128.o `test -f '../../kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`../../kademlia/utils/UInt128.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-UInt128.Tpo" "$(DEPDIR)/mulefileview-UInt128.Po"; else rm -f "$(DEPDIR)/mulefileview-UInt128.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-UInt128.o -MD -MP -MF $(DEPDIR)/mulefileview-UInt128.Tpo -c -o mulefileview-UInt128.o `test -f '../../kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`../../kademlia/utils/UInt128.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-UInt128.Tpo $(DEPDIR)/mulefileview-UInt128.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../../kademlia/utils/UInt128.cpp' object='mulefileview-UInt128.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-UInt128.o `test -f '../../kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`../../kademlia/utils/UInt128.cpp
 
 mulefileview-UInt128.obj: ../../kademlia/utils/UInt128.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-UInt128.obj -MD -MP -MF "$(DEPDIR)/mulefileview-UInt128.Tpo" -c -o mulefileview-UInt128.obj `if test -f '../../kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) '../../kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/../../kademlia/utils/UInt128.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-UInt128.Tpo" "$(DEPDIR)/mulefileview-UInt128.Po"; else rm -f "$(DEPDIR)/mulefileview-UInt128.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-UInt128.obj -MD -MP -MF $(DEPDIR)/mulefileview-UInt128.Tpo -c -o mulefileview-UInt128.obj `if test -f '../../kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) '../../kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/../../kademlia/utils/UInt128.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-UInt128.Tpo $(DEPDIR)/mulefileview-UInt128.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../../kademlia/utils/UInt128.cpp' object='mulefileview-UInt128.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-UInt128.obj `if test -f '../../kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) '../../kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/../../kademlia/utils/UInt128.cpp'; fi`
 
+mulefileview-eD2kFiles.o: eD2kFiles.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-eD2kFiles.o -MD -MP -MF $(DEPDIR)/mulefileview-eD2kFiles.Tpo -c -o mulefileview-eD2kFiles.o `test -f 'eD2kFiles.cpp' || echo '$(srcdir)/'`eD2kFiles.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-eD2kFiles.Tpo $(DEPDIR)/mulefileview-eD2kFiles.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='eD2kFiles.cpp' object='mulefileview-eD2kFiles.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-eD2kFiles.o `test -f 'eD2kFiles.cpp' || echo '$(srcdir)/'`eD2kFiles.cpp
+
+mulefileview-eD2kFiles.obj: eD2kFiles.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-eD2kFiles.obj -MD -MP -MF $(DEPDIR)/mulefileview-eD2kFiles.Tpo -c -o mulefileview-eD2kFiles.obj `if test -f 'eD2kFiles.cpp'; then $(CYGPATH_W) 'eD2kFiles.cpp'; else $(CYGPATH_W) '$(srcdir)/eD2kFiles.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-eD2kFiles.Tpo $(DEPDIR)/mulefileview-eD2kFiles.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='eD2kFiles.cpp' object='mulefileview-eD2kFiles.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-eD2kFiles.obj `if test -f 'eD2kFiles.cpp'; then $(CYGPATH_W) 'eD2kFiles.cpp'; else $(CYGPATH_W) '$(srcdir)/eD2kFiles.cpp'; fi`
+
 mulefileview-FileView.o: FileView.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-FileView.o -MD -MP -MF "$(DEPDIR)/mulefileview-FileView.Tpo" -c -o mulefileview-FileView.o `test -f 'FileView.cpp' || echo '$(srcdir)/'`FileView.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-FileView.Tpo" "$(DEPDIR)/mulefileview-FileView.Po"; else rm -f "$(DEPDIR)/mulefileview-FileView.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-FileView.o -MD -MP -MF $(DEPDIR)/mulefileview-FileView.Tpo -c -o mulefileview-FileView.o `test -f 'FileView.cpp' || echo '$(srcdir)/'`FileView.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-FileView.Tpo $(DEPDIR)/mulefileview-FileView.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileView.cpp' object='mulefileview-FileView.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-FileView.o `test -f 'FileView.cpp' || echo '$(srcdir)/'`FileView.cpp
 
 mulefileview-FileView.obj: FileView.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-FileView.obj -MD -MP -MF "$(DEPDIR)/mulefileview-FileView.Tpo" -c -o mulefileview-FileView.obj `if test -f 'FileView.cpp'; then $(CYGPATH_W) 'FileView.cpp'; else $(CYGPATH_W) '$(srcdir)/FileView.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-FileView.Tpo" "$(DEPDIR)/mulefileview-FileView.Po"; else rm -f "$(DEPDIR)/mulefileview-FileView.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-FileView.obj -MD -MP -MF $(DEPDIR)/mulefileview-FileView.Tpo -c -o mulefileview-FileView.obj `if test -f 'FileView.cpp'; then $(CYGPATH_W) 'FileView.cpp'; else $(CYGPATH_W) '$(srcdir)/FileView.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-FileView.Tpo $(DEPDIR)/mulefileview-FileView.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileView.cpp' object='mulefileview-FileView.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-FileView.obj `if test -f 'FileView.cpp'; then $(CYGPATH_W) 'FileView.cpp'; else $(CYGPATH_W) '$(srcdir)/FileView.cpp'; fi`
 
 mulefileview-KadFiles.o: KadFiles.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-KadFiles.o -MD -MP -MF "$(DEPDIR)/mulefileview-KadFiles.Tpo" -c -o mulefileview-KadFiles.o `test -f 'KadFiles.cpp' || echo '$(srcdir)/'`KadFiles.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-KadFiles.Tpo" "$(DEPDIR)/mulefileview-KadFiles.Po"; else rm -f "$(DEPDIR)/mulefileview-KadFiles.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-KadFiles.o -MD -MP -MF $(DEPDIR)/mulefileview-KadFiles.Tpo -c -o mulefileview-KadFiles.o `test -f 'KadFiles.cpp' || echo '$(srcdir)/'`KadFiles.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-KadFiles.Tpo $(DEPDIR)/mulefileview-KadFiles.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KadFiles.cpp' object='mulefileview-KadFiles.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-KadFiles.o `test -f 'KadFiles.cpp' || echo '$(srcdir)/'`KadFiles.cpp
 
 mulefileview-KadFiles.obj: KadFiles.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-KadFiles.obj -MD -MP -MF "$(DEPDIR)/mulefileview-KadFiles.Tpo" -c -o mulefileview-KadFiles.obj `if test -f 'KadFiles.cpp'; then $(CYGPATH_W) 'KadFiles.cpp'; else $(CYGPATH_W) '$(srcdir)/KadFiles.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-KadFiles.Tpo" "$(DEPDIR)/mulefileview-KadFiles.Po"; else rm -f "$(DEPDIR)/mulefileview-KadFiles.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-KadFiles.obj -MD -MP -MF $(DEPDIR)/mulefileview-KadFiles.Tpo -c -o mulefileview-KadFiles.obj `if test -f 'KadFiles.cpp'; then $(CYGPATH_W) 'KadFiles.cpp'; else $(CYGPATH_W) '$(srcdir)/KadFiles.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-KadFiles.Tpo $(DEPDIR)/mulefileview-KadFiles.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='KadFiles.cpp' object='mulefileview-KadFiles.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-KadFiles.obj `if test -f 'KadFiles.cpp'; then $(CYGPATH_W) 'KadFiles.cpp'; else $(CYGPATH_W) '$(srcdir)/KadFiles.cpp'; fi`
 
 mulefileview-Print.o: Print.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-Print.o -MD -MP -MF "$(DEPDIR)/mulefileview-Print.Tpo" -c -o mulefileview-Print.o `test -f 'Print.cpp' || echo '$(srcdir)/'`Print.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-Print.Tpo" "$(DEPDIR)/mulefileview-Print.Po"; else rm -f "$(DEPDIR)/mulefileview-Print.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-Print.o -MD -MP -MF $(DEPDIR)/mulefileview-Print.Tpo -c -o mulefileview-Print.o `test -f 'Print.cpp' || echo '$(srcdir)/'`Print.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-Print.Tpo $(DEPDIR)/mulefileview-Print.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Print.cpp' object='mulefileview-Print.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-Print.o `test -f 'Print.cpp' || echo '$(srcdir)/'`Print.cpp
 
 mulefileview-Print.obj: Print.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-Print.obj -MD -MP -MF "$(DEPDIR)/mulefileview-Print.Tpo" -c -o mulefileview-Print.obj `if test -f 'Print.cpp'; then $(CYGPATH_W) 'Print.cpp'; else $(CYGPATH_W) '$(srcdir)/Print.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mulefileview-Print.Tpo" "$(DEPDIR)/mulefileview-Print.Po"; else rm -f "$(DEPDIR)/mulefileview-Print.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -MT mulefileview-Print.obj -MD -MP -MF $(DEPDIR)/mulefileview-Print.Tpo -c -o mulefileview-Print.obj `if test -f 'Print.cpp'; then $(CYGPATH_W) 'Print.cpp'; else $(CYGPATH_W) '$(srcdir)/Print.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mulefileview-Print.Tpo $(DEPDIR)/mulefileview-Print.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='Print.cpp' object='mulefileview-Print.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mulefileview_CPPFLAGS) $(CPPFLAGS) $(mulefileview_CXXFLAGS) $(CXXFLAGS) -c -o mulefileview-Print.obj `if test -f 'Print.cpp'; then $(CYGPATH_W) 'Print.cpp'; else $(CYGPATH_W) '$(srcdir)/Print.cpp'; fi`
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -602,6 +673,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -622,18 +694,38 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -653,18 +745,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-noinstPROGRAMS ctags distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
+	uninstall-am
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.2.6.tar.bz2/src/utils/fileview/Print.cpp -> aMule-2.3.1.tar.bz2/src/utils/fileview/Print.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 Dévai Tamás ( gonosztopi@amule.org )
-// Copyright (c) 2008-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2008-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
@@ -17,7 +17,7 @@
 // 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
@@ -26,241 +26,465 @@
 #include "Print.h"
 #include <wx/datetime.h>
 #include <tags/FileTags.h>
+#include <tags/ServerTags.h>
 #include <tags/TagTypes.h>
-#include "../../Tag.h"
+#include <protocol/ed2k/Client2Server/UDP.h>
+#include "../../OtherFunctions.h"
+#include "../../Friend.h"			// Needed for FF_NAME
+#include "../../KnownFile.h"		// Needed for PR_*
+#include "../../NetworkFunctions.h"	// Needed for Uint32toStringIP
 
 #include <cctype>
+#include <map>
+#include <iostream>
 
+SDMODE g_stringDecodeMode;
 
-wxString MakePrintableString(const wxString& str)
+wxString MakePrintableString(const wxString& s)
 {
+	wxString str = s;
+	unsigned c = 0;
+	for (unsigned i = 0; i < str.length(); i++) {
+		c |= (wxChar) str[i];
+	}
+
+	if (c <= 0xff && GetStringsMode() != SD_NONE) {
+		wxCharBuffer buf = str.To8BitData();
+		wxString test = UTF82unicode(buf.data());
+		if (!test.empty()) {
+			str = test;
+			c = 0;
+			for (unsigned i = 0; i < str.length(); i++) {
+				c |= (wxChar) str[i];
+			}
+		}
+	}
+
 	wxString retval = wxT("\"");
-	for (unsigned i = 0; i < str.Length(); i++) {
-		if (std::isprint(str[i])) {
-			retval += str[i];
-		} else {
-			retval += wxString::Format(wxT("\\x%02x"), str[i]);
+
+	if (GetStringsMode() == SD_DISPLAY) {
+		retval += str;
+	} else if (GetStringsMode() == SD_UTF8) {
+		str = wxString::From8BitData((const char *)str.utf8_str());
+		c = 0xff;
+	}
+
+	if (GetStringsMode() != SD_DISPLAY) {
+		for (unsigned i = 0; i < str.length(); i++) {
+			if (GetStringsMode() == SD_NONE ? ((unsigned)str[i] >= ' ' && (unsigned)str[i] <= 0x7f) : std::isprint(str[i])) {
+				retval += str[i];
+			} else if (c <= 0xff) {
+				retval += wxString::Format(wxT("\\x%02x"), str[i]);
+			} else {
+				retval += wxString::Format(wxT("\\u%04x"), str[i]);
+			}
 		}
 	}
+
 	retval += wxT("\"");
 	return retval;
 }
 
-template<> void Print<time_t>(const time_t& time)
+std::ostream& operator<<(std::ostream& x, const CTimeT& y)
 {
-	Print((uint32_t)time);
-	DoPrint(wxT(" ("));
-	wxDateTime dt(time);
-	DoPrint(dt.Format(wxDefaultDateTimeFormat, wxDateTime::UTC));
-	DoPrint(wxT(" UTC)"));
+	if ((time_t)y != 0) {
+		wxDateTime dt((time_t)y);
+		return x << (time_t)y << " (" << dt.Format(wxDefaultDateTimeFormat, wxDateTime::UTC) << " UTC)";
+	} else {
+		return x << "0 (Never)";
+	}
 }
 
-template<> void Print<CKadIP>(const CKadIP& ip)
+std::ostream& operator<<(std::ostream& x, const CKadIP& ip)
 {
-	PrintHex((uint32_t)ip);
-	DoPrint(wxT(" (") + Uint32toStringIP(wxUINT32_SWAP_ALWAYS((uint32_t)ip)) + wxT(")"));
+	return x << hex(ip) << " (" << Uint32toStringIP(wxUINT32_SWAP_ALWAYS(ip)) << ')';
 }
 
-wxString DecodeTagNameID(uint8_t id)
+std::ostream& operator<<(std::ostream& x, const CeD2kIP& ip)
 {
-#define TEST_NAMEID(TAGNAME)	if (id == TAGNAME) return wxT(#TAGNAME); else
+	return x << hex(ip) << " (" << Uint32toStringIP(ip) << ')';
+}
 
-	TEST_NAMEID(FT_FILENAME)
-	TEST_NAMEID(FT_FILESIZE)
-	TEST_NAMEID(FT_FILESIZE_HI)
-	TEST_NAMEID(FT_FILETYPE)
-	TEST_NAMEID(FT_FILEFORMAT)
-	TEST_NAMEID(FT_LASTSEENCOMPLETE)
-	TEST_NAMEID(FT_TRANSFERRED)
-	TEST_NAMEID(FT_GAPSTART)
-	TEST_NAMEID(FT_GAPEND)
-	TEST_NAMEID(FT_PARTFILENAME)
-	TEST_NAMEID(FT_OLDDLPRIORITY)
-	TEST_NAMEID(FT_STATUS)
-	TEST_NAMEID(FT_SOURCES)
-	TEST_NAMEID(FT_PERMISSIONS)
-	TEST_NAMEID(FT_OLDULPRIORITY)
-	TEST_NAMEID(FT_DLPRIORITY)
-	TEST_NAMEID(FT_ULPRIORITY)
-	TEST_NAMEID(FT_KADLASTPUBLISHKEY)
-	TEST_NAMEID(FT_KADLASTPUBLISHSRC)
-	TEST_NAMEID(FT_FLAGS)
-	TEST_NAMEID(FT_DL_ACTIVE_TIME)
-	TEST_NAMEID(FT_CORRUPTEDPARTS)
-	TEST_NAMEID(FT_DL_PREVIEW)
-	TEST_NAMEID(FT_KADLASTPUBLISHNOTES)
-	TEST_NAMEID(FT_AICH_HASH)
-	TEST_NAMEID(FT_COMPLETE_SOURCES)
-	TEST_NAMEID(FT_PUBLISHINFO)
-	TEST_NAMEID(FT_ATTRANSFERRED)
-	TEST_NAMEID(FT_ATREQUESTED)
-	TEST_NAMEID(FT_ATACCEPTED)
-	TEST_NAMEID(FT_CATEGORY)
-	TEST_NAMEID(FT_ATTRANSFERREDHI)
-	TEST_NAMEID(FT_MEDIA_ARTIST)
-	TEST_NAMEID(FT_MEDIA_ALBUM)
-	TEST_NAMEID(FT_MEDIA_TITLE)
-	TEST_NAMEID(FT_MEDIA_LENGTH)
-	TEST_NAMEID(FT_MEDIA_BITRATE)
-	TEST_NAMEID(FT_MEDIA_CODEC)
-	TEST_NAMEID(FT_FILERATING)
-	return wxString::Format(wxT("0x%02x"), id);
+static inline wxString TagNameString(const wxString& name)
+{
+	if (name.length() == 1) {
+		return wxString::Format(wxT("\"\\x%02x\""), name[0]);
+	} else if (name.length() > 1) {
+		if (name[0] == FT_GAPSTART || name[0] == FT_GAPEND) {
+			return wxString::Format(wxT("\"\\x%02x"), name[0]) + name.substr(1) + wxT("\"");
+		}
+	}
+	return wxT("\"") + name + wxT("\"");
+}
+
+#define TEST_VALUE(VALUE)	if (value == VALUE) return #VALUE; else
 
-#undef TEST_NAMEID
+const char* DecodeTagNameID(uint8_t value)
+{
+	TEST_VALUE(FT_FILENAME)
+	TEST_VALUE(FT_FILESIZE)
+	TEST_VALUE(FT_FILESIZE_HI)
+	TEST_VALUE(FT_FILETYPE)
+	TEST_VALUE(FT_FILEFORMAT)
+	TEST_VALUE(FT_LASTSEENCOMPLETE)
+	TEST_VALUE(FT_TRANSFERRED)
+	TEST_VALUE(FT_GAPSTART)
+	TEST_VALUE(FT_GAPEND)
+	TEST_VALUE(FT_PARTFILENAME)
+	TEST_VALUE(FT_OLDDLPRIORITY)
+	TEST_VALUE(FT_STATUS)
+	TEST_VALUE(FT_SOURCES)
+	TEST_VALUE(FT_PERMISSIONS)
+	TEST_VALUE(FT_OLDULPRIORITY)
+	TEST_VALUE(FT_DLPRIORITY)
+	TEST_VALUE(FT_ULPRIORITY)
+	TEST_VALUE(FT_KADLASTPUBLISHKEY)
+	TEST_VALUE(FT_KADLASTPUBLISHSRC)
+	TEST_VALUE(FT_FLAGS)
+	TEST_VALUE(FT_DL_ACTIVE_TIME)
+	TEST_VALUE(FT_CORRUPTEDPARTS)
+	TEST_VALUE(FT_DL_PREVIEW)
+	TEST_VALUE(FT_KADLASTPUBLISHNOTES)
+	TEST_VALUE(FT_AICH_HASH)
+	TEST_VALUE(FT_COMPLETE_SOURCES)
+	TEST_VALUE(FT_PUBLISHINFO)
+	TEST_VALUE(FT_ATTRANSFERRED)
+	TEST_VALUE(FT_ATREQUESTED)
+	TEST_VALUE(FT_ATACCEPTED)
+	TEST_VALUE(FT_CATEGORY)
+	TEST_VALUE(FT_ATTRANSFERREDHI)
+	TEST_VALUE(FT_MEDIA_ARTIST)
+	TEST_VALUE(FT_MEDIA_ALBUM)
+	TEST_VALUE(FT_MEDIA_TITLE)
+	TEST_VALUE(FT_MEDIA_LENGTH)
+	TEST_VALUE(FT_MEDIA_BITRATE)
+	TEST_VALUE(FT_MEDIA_CODEC)
+	TEST_VALUE(FT_FILERATING)
+	return "??";
 }
 
-wxString DecodeTagName(const wxString& name)
+const char* DecodeTagName(const wxString& value)
 {
-#define TEST_TAG(TAGNAME)	if (name == TAGNAME) return wxT(#TAGNAME); else
+	TEST_VALUE(TAG_FILENAME)
+	TEST_VALUE(TAG_FILESIZE)
+	TEST_VALUE(TAG_FILESIZE_HI)
+	TEST_VALUE(TAG_FILETYPE)
+	TEST_VALUE(TAG_FILEFORMAT)
+	TEST_VALUE(TAG_COLLECTION)
+	TEST_VALUE(TAG_PART_PATH)
+	TEST_VALUE(TAG_PART_HASH)
+	TEST_VALUE(TAG_COPIED)
+	TEST_VALUE(TAG_GAP_START)
+	TEST_VALUE(TAG_GAP_END)
+	TEST_VALUE(TAG_DESCRIPTION)
+	TEST_VALUE(TAG_PING)
+	TEST_VALUE(TAG_FAIL)
+	TEST_VALUE(TAG_PREFERENCE)
+	TEST_VALUE(TAG_PORT)
+	TEST_VALUE(TAG_IP_ADDRESS)
+	TEST_VALUE(TAG_VERSION)
+	TEST_VALUE(TAG_TEMPFILE)
+	TEST_VALUE(TAG_PRIORITY)
+	TEST_VALUE(TAG_STATUS)
+	TEST_VALUE(TAG_SOURCES)
+	TEST_VALUE(TAG_AVAILABILITY)
+	TEST_VALUE(TAG_PERMISSIONS)
+	TEST_VALUE(TAG_QTIME)
+	TEST_VALUE(TAG_PARTS)
+	TEST_VALUE(TAG_PUBLISHINFO)
+	TEST_VALUE(TAG_MEDIA_ARTIST)
+	TEST_VALUE(TAG_MEDIA_ALBUM)
+	TEST_VALUE(TAG_MEDIA_TITLE)
+	TEST_VALUE(TAG_MEDIA_LENGTH)
+	TEST_VALUE(TAG_MEDIA_BITRATE)
+	TEST_VALUE(TAG_MEDIA_CODEC)
+	TEST_VALUE(TAG_ENCRYPTION)
+	TEST_VALUE(TAG_FILERATING)
+	TEST_VALUE(TAG_BUDDYHASH)
+	TEST_VALUE(TAG_CLIENTLOWID)
+	TEST_VALUE(TAG_SERVERPORT)
+	TEST_VALUE(TAG_SERVERIP)
+	TEST_VALUE(TAG_SOURCEUPORT)
+	TEST_VALUE(TAG_SOURCEPORT)
+	TEST_VALUE(TAG_SOURCEIP)
+	TEST_VALUE(TAG_SOURCETYPE)
+	return "??";
+}
 
-	TEST_TAG(TAG_FILENAME)
-	TEST_TAG(TAG_FILESIZE)
-	TEST_TAG(TAG_FILESIZE_HI)
-	TEST_TAG(TAG_FILETYPE)
-	TEST_TAG(TAG_FILEFORMAT)
-	TEST_TAG(TAG_COLLECTION)
-	TEST_TAG(TAG_PART_PATH)
-	TEST_TAG(TAG_PART_HASH)
-	TEST_TAG(TAG_COPIED)
-	TEST_TAG(TAG_GAP_START)
-	TEST_TAG(TAG_GAP_END)
-	TEST_TAG(TAG_DESCRIPTION)
-	TEST_TAG(TAG_PING)
-	TEST_TAG(TAG_FAIL)
-	TEST_TAG(TAG_PREFERENCE)
-	TEST_TAG(TAG_PORT)
-	TEST_TAG(TAG_IP_ADDRESS)
-	TEST_TAG(TAG_VERSION)
-	TEST_TAG(TAG_TEMPFILE)
-	TEST_TAG(TAG_PRIORITY)
-	TEST_TAG(TAG_STATUS)
-	TEST_TAG(TAG_SOURCES)
-	TEST_TAG(TAG_AVAILABILITY)
-	TEST_TAG(TAG_PERMISSIONS)
-	TEST_TAG(TAG_QTIME)
-	TEST_TAG(TAG_PARTS)
-	TEST_TAG(TAG_PUBLISHINFO)
-	TEST_TAG(TAG_MEDIA_ARTIST)
-	TEST_TAG(TAG_MEDIA_ALBUM)
-	TEST_TAG(TAG_MEDIA_TITLE)
-	TEST_TAG(TAG_MEDIA_LENGTH)
-	TEST_TAG(TAG_MEDIA_BITRATE)
-	TEST_TAG(TAG_MEDIA_CODEC)
-	TEST_TAG(TAG_ENCRYPTION)
-	TEST_TAG(TAG_FILERATING)
-	TEST_TAG(TAG_BUDDYHASH)
-	TEST_TAG(TAG_CLIENTLOWID)
-	TEST_TAG(TAG_SERVERPORT)
-	TEST_TAG(TAG_SERVERIP)
-	TEST_TAG(TAG_SOURCEUPORT)
-	TEST_TAG(TAG_SOURCEPORT)
-	TEST_TAG(TAG_SOURCEIP)
-	TEST_TAG(TAG_SOURCETYPE)
-	return MakePrintableString(name);
+const char* DecodeTagType(uint8_t value)
+{
+	TEST_VALUE(TAGTYPE_HASH16)
+	TEST_VALUE(TAGTYPE_STRING)
+	TEST_VALUE(TAGTYPE_UINT32)
+	TEST_VALUE(TAGTYPE_FLOAT32)
+	TEST_VALUE(TAGTYPE_BOOL)
+	TEST_VALUE(TAGTYPE_BOOLARRAY)
+	TEST_VALUE(TAGTYPE_BLOB)
+	TEST_VALUE(TAGTYPE_UINT16)
+	TEST_VALUE(TAGTYPE_UINT8)
+	TEST_VALUE(TAGTYPE_BSOB)
+	TEST_VALUE(TAGTYPE_UINT64)
+	TEST_VALUE(TAGTYPE_STR1)
+	TEST_VALUE(TAGTYPE_STR2)
+	TEST_VALUE(TAGTYPE_STR3)
+	TEST_VALUE(TAGTYPE_STR4)
+	TEST_VALUE(TAGTYPE_STR5)
+	TEST_VALUE(TAGTYPE_STR6)
+	TEST_VALUE(TAGTYPE_STR7)
+	TEST_VALUE(TAGTYPE_STR8)
+	TEST_VALUE(TAGTYPE_STR9)
+	TEST_VALUE(TAGTYPE_STR10)
+	TEST_VALUE(TAGTYPE_STR11)
+	TEST_VALUE(TAGTYPE_STR12)
+	TEST_VALUE(TAGTYPE_STR13)
+	TEST_VALUE(TAGTYPE_STR14)
+	TEST_VALUE(TAGTYPE_STR15)
+	TEST_VALUE(TAGTYPE_STR16)
+	TEST_VALUE(TAGTYPE_STR17)
+	TEST_VALUE(TAGTYPE_STR18)
+	TEST_VALUE(TAGTYPE_STR19)
+	TEST_VALUE(TAGTYPE_STR20)
+	TEST_VALUE(TAGTYPE_STR21)
+	TEST_VALUE(TAGTYPE_STR22)
+	return "??";
+}
 
-#undef TEST_TAG
+const char* DecodeServerTagNameID(uint8_t value)
+{
+	TEST_VALUE(ST_SERVERNAME)
+	TEST_VALUE(ST_DESCRIPTION)
+	TEST_VALUE(ST_PING)
+	TEST_VALUE(ST_FAIL)
+	TEST_VALUE(ST_PREFERENCE)
+	TEST_VALUE(ST_DYNIP)
+	TEST_VALUE(ST_LASTPING_DEPRECATED)
+	TEST_VALUE(ST_MAXUSERS)
+	TEST_VALUE(ST_SOFTFILES)
+	TEST_VALUE(ST_HARDFILES)
+	TEST_VALUE(ST_LASTPING)
+	TEST_VALUE(ST_VERSION)
+	TEST_VALUE(ST_UDPFLAGS)
+	TEST_VALUE(ST_AUXPORTSLIST)
+	TEST_VALUE(ST_LOWIDUSERS)
+	TEST_VALUE(ST_UDPKEY)
+	TEST_VALUE(ST_UDPKEYIP)
+	TEST_VALUE(ST_TCPPORTOBFUSCATION)
+	TEST_VALUE(ST_UDPPORTOBFUSCATION)
+	return "??";
 }
 
-wxString DecodeTagType(uint8_t type)
+const char* DecodeFriendTagNameID(uint8_t value)
 {
-#define TEST_TYPE(TAGTYPE)	if (type == TAGTYPE) return wxT(#TAGTYPE); else
+	TEST_VALUE(FF_NAME)
+	return "??";
+}
 
-	TEST_TYPE(TAGTYPE_HASH16)
-	TEST_TYPE(TAGTYPE_STRING)
-	TEST_TYPE(TAGTYPE_UINT32)
-	TEST_TYPE(TAGTYPE_FLOAT32)
-	TEST_TYPE(TAGTYPE_BOOL)
-	TEST_TYPE(TAGTYPE_BOOLARRAY)
-	TEST_TYPE(TAGTYPE_BLOB)
-	TEST_TYPE(TAGTYPE_UINT16)
-	TEST_TYPE(TAGTYPE_UINT8)
-	TEST_TYPE(TAGTYPE_BSOB)
-	TEST_TYPE(TAGTYPE_UINT64)
-	TEST_TYPE(TAGTYPE_STR1)
-	TEST_TYPE(TAGTYPE_STR2)
-	TEST_TYPE(TAGTYPE_STR3)
-	TEST_TYPE(TAGTYPE_STR4)
-	TEST_TYPE(TAGTYPE_STR5)
-	TEST_TYPE(TAGTYPE_STR6)
-	TEST_TYPE(TAGTYPE_STR7)
-	TEST_TYPE(TAGTYPE_STR8)
-	TEST_TYPE(TAGTYPE_STR9)
-	TEST_TYPE(TAGTYPE_STR10)
-	TEST_TYPE(TAGTYPE_STR11)
-	TEST_TYPE(TAGTYPE_STR12)
-	TEST_TYPE(TAGTYPE_STR13)
-	TEST_TYPE(TAGTYPE_STR14)
-	TEST_TYPE(TAGTYPE_STR15)
-	TEST_TYPE(TAGTYPE_STR16)
-	TEST_TYPE(TAGTYPE_STR17)
-	TEST_TYPE(TAGTYPE_STR18)
-	TEST_TYPE(TAGTYPE_STR19)
-	TEST_TYPE(TAGTYPE_STR20)
-	TEST_TYPE(TAGTYPE_STR21)
-	TEST_TYPE(TAGTYPE_STR22)
-	return wxString::Format(wxT("0x%02x"), type);
+typedef std::map<uint32_t, const char*> FlagMap;
 
-#undef TEST_TYPE
-}
+class CFlagDecoder
+{
+      public:
+	void AddFlag(uint32_t bit, const char* name)
+	{
+		m_flags[bit] = name;
+	}
+
+	wxString DecodeFlags(uint32_t flags)
+	{
+		uint32_t cur_flag = 1;
+		wxString result;
+		while (flags) {
+			if (flags & 1) {
+				if (!result.empty()) {
+					result += wxT(" | ");
+				}
+				FlagMap::const_iterator it = m_flags.find(cur_flag);
+				if (it != m_flags.end()) {
+					result += wxString::FromAscii(it->second);
+				} else {
+					result += wxString::Format(wxT("%#x"), cur_flag);
+				}
+			}
+			cur_flag <<= 1;
+			flags >>= 1;
+		}
+		return result;
+	}
+
+      private:
+	FlagMap	m_flags;
+};
 
+#define ADD_DECODER_FLAG(decoder, FLAG)	decoder.AddFlag(FLAG, #FLAG)
 
-template<> void Print<CTag>(const CTag& tag)
+std::ostream& operator<<(std::ostream& out, const CTag& tag)
 {
-	DoPrint(wxT("{ "));
-	if (tag.GetName().IsEmpty()) {
-		DoPrint(DecodeTagNameID(tag.GetNameID()));
+	out << "{ ";
+	if (tag.GetName().empty()) {
+		out << hex(tag.GetNameID()) << ' ' << DecodeTagNameID(tag.GetNameID());
 	} else {
-		DoPrint(DecodeTagName(tag.GetName()));
+		out << TagNameString(tag.GetName()) << ' ';
+		bool name_decoded = false;
+		if (tag.IsInt() && tag.GetName().length() > 1) {
+			wxCharBuffer ascii_name = tag.GetName().ToAscii();
+			char gap_mark = ascii_name ? ascii_name[(size_t)0] : 0;
+			if (gap_mark == FT_GAPSTART || gap_mark == FT_GAPEND) {
+				unsigned long gapkey;
+				if (tag.GetName().Mid(1).ToULong(&gapkey)) {
+					out << DecodeTagNameID(gap_mark) << wxString::Format(wxT("[%lu]"), gapkey);
+					name_decoded = true;
+				}
+			}
+		}
+		if (!name_decoded) {
+			out << DecodeTagName(tag.GetName());
+		}
 	}
-	DoPrint(wxT(", "));
-	DoPrint(DecodeTagType(tag.GetType()));
-	DoPrint(wxT(", "));
+	out << ", " << (unsigned)tag.GetType() << ' ' << DecodeTagType(tag.GetType()) << ", ";
 	if (tag.IsInt()) {
-		if (tag.GetName() == TAG_SOURCEIP || tag.GetName() == TAG_SERVERIP) {
-			Print(CKadIP(tag.GetInt()));
+		if (tag.GetName() == TAG_SOURCEIP) {
+			out << CKadIP(tag.GetInt());
+		} else if (tag.GetName() == TAG_SERVERIP) {
+			out << CeD2kIP(tag.GetInt());
 		} else if (tag.GetName() == TAG_ENCRYPTION) {
 			uint8_t enc = tag.GetInt();
-			PrintHex(enc);
-			wxString encStr;
-			if (enc & 0x01) {
-				encStr += wxT("CryptSupported");
+			out << hex(enc);
+			if (enc) {
+				CFlagDecoder decoder;
+				decoder.AddFlag(0x01, "CryptSupported");
+				decoder.AddFlag(0x02, "CryptRequested");
+				decoder.AddFlag(0x04, "CryptRequired");
+				decoder.AddFlag(0x08, "SupportsDirectCallback");
+				out << " (" << decoder.DecodeFlags(enc) << ')';
 			}
-			if (enc & 0x02) {
-				if (!encStr.IsEmpty()) {
-					encStr += wxT(" | ");
-				}
-				encStr += wxT("CryptRequested");
+		} else if (tag.GetNameID() == FT_LASTSEENCOMPLETE
+			   || tag.GetNameID() == FT_KADLASTPUBLISHSRC
+			   || tag.GetNameID() == FT_KADLASTPUBLISHNOTES
+			   || tag.GetNameID() == FT_KADLASTPUBLISHKEY
+			   ) {
+			out << CTimeT(tag.GetInt());
+		} else if (tag.GetName() == TAG_FILESIZE
+			   || tag.GetNameID() == FT_FILESIZE
+			   || tag.GetNameID() == FT_TRANSFERRED
+			   || tag.GetNameID() == FT_ATTRANSFERRED
+			   ) {
+			out << tag.GetInt() << " (" << CastItoXBytes(tag.GetInt()) << ')';
+		} else if (tag.GetNameID() == FT_ULPRIORITY
+			   || tag.GetNameID() == FT_DLPRIORITY
+			   || tag.GetNameID() == FT_OLDULPRIORITY
+			   || tag.GetNameID() == FT_OLDDLPRIORITY
+			   ) {
+			out << tag.GetInt() << ' ';
+			switch (tag.GetInt()) {
+				case PR_VERYLOW:	out << "PR_VERYLOW"; break;
+				case PR_LOW:		out << "PR_LOW"; break;
+				case PR_NORMAL:		out << "PR_NORMAL"; break;
+				case PR_HIGH:		out << "PR_HIGH"; break;
+				case PR_VERYHIGH:	out << "PR_VERYHIGH"; break;
+				case PR_AUTO:		out << "PR_AUTO"; break;
+				case PR_POWERSHARE:	out << "PR_POWERSHARE"; break;
 			}
-			if (enc & 0x04) {
-				if (!encStr.IsEmpty()) {
-					encStr += wxT(" | ");
-				}
-				encStr += wxT("CryptRequired");
-			}
-			if (enc & 0x08) {
-				if (!encStr.IsEmpty()) {
-					encStr += wxT(" | ");
-				}
-				encStr += wxT("DirectCallback");
+		} else {
+			out << tag.GetInt();
+		}
+	} else if (tag.IsStr()) {
+		out << MakePrintableString(tag.GetStr());
+	} else if (tag.IsFloat()) {
+		out << tag.GetFloat();
+	} else if (tag.IsHash()) {
+		out << tag.GetHash();
+	} else if (tag.IsBlob()) {
+		out << wxString::Format(wxT("(size = %u)"), tag.GetBlobSize());
+	} else if (tag.IsBsob()) {
+		out << wxString::Format(wxT("(size = %u)"), tag.GetBsobSize());
+	} else {
+		out << "(...)";
+	}
+	out << " }";
+	return out;
+}
+
+std::ostream& operator<<(std::ostream& out, const CServerTag& tag)
+{
+	out << "{ ";
+	if (tag.GetName().empty()) {
+		out << hex(tag.GetNameID()) << ' ' << DecodeServerTagNameID(tag.GetNameID());
+	} else {
+		out << TagNameString(tag.GetName());
+	}
+	out << ", " << (unsigned)tag.GetType() << ' ' << DecodeTagType(tag.GetType()) << ", ";
+	if (tag.IsInt()) {
+		if (tag.GetNameID() == ST_DYNIP || tag.GetNameID() == ST_UDPKEYIP) {
+			out << CeD2kIP(tag.GetInt());
+		} else if (tag.GetNameID() == ST_UDPKEY) {
+			out << hex((uint32_t)tag.GetInt());
+		} else if (tag.GetNameID() == ST_UDPFLAGS) {
+			uint32_t flags = tag.GetInt();
+			out << hex(flags);
+			if (flags) {
+				CFlagDecoder decoder;
+				ADD_DECODER_FLAG(decoder, SRV_UDPFLG_EXT_GETSOURCES);
+				ADD_DECODER_FLAG(decoder, SRV_UDPFLG_EXT_GETFILES);
+				ADD_DECODER_FLAG(decoder, SRV_UDPFLG_NEWTAGS);
+				ADD_DECODER_FLAG(decoder, SRV_UDPFLG_UNICODE);
+				ADD_DECODER_FLAG(decoder, SRV_UDPFLG_EXT_GETSOURCES2);
+				ADD_DECODER_FLAG(decoder, SRV_UDPFLG_LARGEFILES);
+				ADD_DECODER_FLAG(decoder, SRV_UDPFLG_UDPOBFUSCATION);
+				ADD_DECODER_FLAG(decoder, SRV_UDPFLG_TCPOBFUSCATION);
+				out << " (" << decoder.DecodeFlags(flags) << ')';
 			}
-			if (!encStr.IsEmpty()) {
-				DoPrint(wxT(" (") + encStr + wxT(")"));
+		} else if (tag.GetNameID() == ST_PREFERENCE) {
+			out << tag.GetInt() << ' ';
+			switch (tag.GetInt()) {
+				case 0: out << "SRV_PR_NORMAL"; break;
+				case 1: out << "SRV_PR_HIGH"; break;
+				case 2: out << "SRV_PR_LOW"; break;
+				default: out << "??";
 			}
 		} else {
-			Print(tag.GetInt());
+			out << tag.GetInt();
 		}
 	} else if (tag.IsStr()) {
-		Print(tag.GetStr());
+		out << MakePrintableString(tag.GetStr());
+	} else if (tag.IsFloat()) {
+		out << tag.GetFloat();
+	} else if (tag.IsHash()) {
+		out << tag.GetHash();
+	} else if (tag.IsBlob()) {
+		out << wxString::Format(wxT("(size = %u)"), tag.GetBlobSize());
+	} else if (tag.IsBsob()) {
+		out << wxString::Format(wxT("(size = %u)"), tag.GetBsobSize());
+	} else {
+		out << "(...)";
+	}
+	out << " }";
+	return out;
+}
+
+std::ostream& operator<<(std::ostream& out, const CFriendTag& tag)
+{
+	out << "{ ";
+	if (tag.GetName().empty()) {
+		out << hex(tag.GetNameID()) << ' ' << DecodeFriendTagNameID(tag.GetNameID());
+	} else {
+		out << TagNameString(tag.GetName());
+	}
+	out << ", " << (unsigned)tag.GetType() << ' ' << DecodeTagType(tag.GetType()) << ", ";
+	if (tag.IsInt()) {
+		out << tag.GetInt();
+	} else if (tag.IsStr()) {
+		out << MakePrintableString(tag.GetStr());
 	} else if (tag.IsFloat()) {
-		Print(tag.GetFloat());
+		out << tag.GetFloat();
 	} else if (tag.IsHash()) {
-		Print(tag.GetHash());
+		out << tag.GetHash();
 	} else if (tag.IsBlob()) {
-		DoPrint(wxString::Format(wxT("(size = %u)"), tag.GetBlobSize()));
+		out << wxString::Format(wxT("(size = %u)"), tag.GetBlobSize());
 	} else if (tag.IsBsob()) {
-		DoPrint(wxString::Format(wxT("(size = %u)"), tag.GetBsobSize()));
+		out << wxString::Format(wxT("(size = %u)"), tag.GetBsobSize());
 	} else {
-		DoPrint(wxT("(...)"));
+		out << "(...)";
 	}
-	DoPrint(wxT(" }"));
+	out << " }";
+	return out;
 }

aMule-2.2.6.tar.bz2/src/utils/fileview/Print.h -> aMule-2.3.1.tar.bz2/src/utils/fileview/Print.h Changed

@@ -1,8 +1,8 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 Dévai Tamás ( gonosztopi@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2004-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
@@ -17,7 +17,7 @@
 // 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
@@ -26,64 +26,114 @@
 #ifndef FILEVIEW_PRINT_H
 #define FILEVIEW_PRINT_H
 
+#include <common/DataFileVersion.h>
 #include <common/StringFunctions.h>
 #include "../../kademlia/utils/UInt128.h"
 #include "../../MD4Hash.h"
+#include "../../Tag.h"
 
 #include <cstdio>
 #include <time.h>
+#include <iostream>
+
+#if defined __GNUC__ && defined __GNUC_MINOR__
+#	if __GNUC__ > 3 || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 2))
+#		define __attribute_always_inline__	__attribute__((__always_inline__))
+#	else
+#		define __attrbiute_always_inline__
+#	endif
+#else
+#	define __attribute_always_inline__
+#endif
+
+using std::cout;
+using std::cerr;
+using std::endl;
+
+enum SDMODE {
+	SD_DISPLAY,
+	SD_SAFE,
+	SD_UTF8,
+	SD_NONE
+};
 
-class CTag;
+extern SDMODE g_stringDecodeMode;
 
+inline void SetStringsMode(SDMODE mode)	{ g_stringDecodeMode = mode; }
+inline SDMODE GetStringsMode()	{ return g_stringDecodeMode; }
 
 wxString MakePrintableString(const wxString& str);
 
+#if !wxCHECK_VERSION(2, 9, 0)
+inline __attribute_always_inline__ std::ostream& operator<<(std::ostream& x, const wxString& y)		{ return x << (const char *)unicode2char(y); }
+#endif
+inline std::ostream& operator<<(std::ostream& x, const Kademlia::CUInt128& y)	{ return x << y.ToHexString(); }
+inline std::ostream& operator<<(std::ostream& x, const CMD4Hash& y)		{ return x << y.Encode(); }
 
-template<typename _Tp> void Print(const _Tp& value);
-template<typename _Tp> void PrintHex(_Tp value);
+inline wxString hex(uint8_t value)	{ return wxString::Format(wxT("0x%02x"), value); }
+inline wxString hex(uint16_t value)	{ return wxString::Format(wxT("0x%04x"), value); }
+inline wxString hex(uint32_t value)	{ return wxString::Format(wxT("0x%08x"), value); }
 
-void inline DoPrint(const wxString& str)	{ std::printf("%s", (const char *)unicode2char(str)); }
+inline void PrintByteArray(const void *buf, unsigned int size)
+{
+// #if wxCHECK_VERSION(2, 8, 4)
+// 	cout << MakePrintableString(wxString::From8BitData(static_cast<const char *>(buf), size));
+// #else
+	for (unsigned int i = 0; i < size; i++) {
+		cout << wxString::Format(wxT("%02X "), static_cast<const unsigned char *>(buf)[i]);
+	}
+// #endif
+}
 
-template<> inline void PrintHex<uint8_t>(uint8_t value)		{ DoPrint(wxString::Format(wxT("0x%02x"), value)); }
-template<> inline void PrintHex<uint16_t>(uint16_t value)	{ DoPrint(wxString::Format(wxT("0x%04x"), value)); }
-template<> inline void PrintHex<uint32_t>(uint32_t value)	{ DoPrint(wxString::Format(wxT("0x%08x"), value)); }
 
-template<> inline void Print<bool>(const bool& value)					{ DoPrint(value ? wxT("true") : wxT("false")); }
-template<> inline void Print<uint8_t>(const uint8_t& value)				{ DoPrint(wxString::Format(wxT("%u"), value)); }
-template<> inline void Print<uint16_t>(const uint16_t& value)				{ DoPrint(wxString::Format(wxT("%u"), value)); }
-template<> inline void Print<uint32_t>(const uint32_t& value)				{ DoPrint(wxString::Format(wxT("%u"), value)); }
-template<> inline void Print<uint64_t>(const uint64_t& value)				{ DoPrint(wxString::Format(wxT("%") wxLongLongFmtSpec wxT("u"), value)); }
-template<> inline void Print<float>(const float& value)					{ DoPrint(wxString::Format(wxT("%g"), value)); }
-template<> inline void Print<double>(const double& value)				{ DoPrint(wxString::Format(wxT("%g"), value)); }
-template<> inline void Print<wxString>(const wxString& value)				{ DoPrint(MakePrintableString(value)); }
-template<> inline void Print<Kademlia::CUInt128>(const Kademlia::CUInt128& value)	{ DoPrint(value.ToHexString()); }
-template<> inline void Print<CMD4Hash>(const CMD4Hash& value)				{ DoPrint(value.Encode()); }
+class CTimeT
+{
+      public:
+	explicit CTimeT(time_t t) { m_time = t; }
+	operator time_t() const { return m_time; }
+      private:
+	time_t m_time;
+};
 
-// Transparent class for Kad IPs
 class CKadIP
 {
       public:
-	CKadIP(uint32_t ip) { m_ip = ip; }
+	explicit CKadIP(uint32_t ip) { m_ip = ip; }
 	operator uint32_t() const { return m_ip; }
       private:
 	uint32_t m_ip;
 };
 
-template<> void Print<time_t>(const time_t& time);
-template<> void Print<CKadIP>(const CKadIP& ip);
-template<> void Print<CTag>(const CTag& tag);
-
-
-// Some formatting functions
+class CeD2kIP
+{
+      public:
+	explicit CeD2kIP(uint32_t ip) { m_ip = ip; }
+	operator uint32_t() const { return m_ip; }
+      private:
+	uint32_t m_ip;
+};
 
-inline wxString Uint32toStringIP(uint32_t ip)
+class CServerTag : public CTag
 {
-	return wxString::Format(wxT("%u.%u.%u.%u"), (uint8_t)ip, (uint8_t)(ip>>8), (uint8_t)(ip>>16), (uint8_t)(ip>>24));	
-}
+      public:
+	CServerTag(const CTag& tag)
+		: CTag(tag)
+	{}
+};
 
-inline wxString Uint32_16toStringIP_Port(uint32_t ip, uint16_t port)
+class CFriendTag : public CTag
 {
-	return wxString::Format(wxT("%u.%u.%u.%u:%u"), (uint8_t)ip, (uint8_t)(ip>>8), (uint8_t)(ip>>16), (uint8_t)(ip>>24), port);	
-}
+      public:
+	CFriendTag(const CTag& tag)
+		: CTag(tag)
+	{}
+};
+
+std::ostream& operator<<(std::ostream& x, const CTimeT& y);
+std::ostream& operator<<(std::ostream& x, const CKadIP& ip);
+std::ostream& operator<<(std::ostream& x, const CeD2kIP& ip);
+std::ostream& operator<<(std::ostream& x, const CTag& tag);
+std::ostream& operator<<(std::ostream& x, const CServerTag& tag);
+std::ostream& operator<<(std::ostream& x, const CFriendTag& tag);
 
 #endif /* FILEVIEW_PRINT_H */

aMule-2.3.1.tar.bz2/src/utils/fileview/eD2kFiles.cpp Added

@@ -0,0 +1,270 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2004-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
+//
+
+#include "eD2kFiles.h"
+#include "Print.h"
+#include "../../SafeFile.h"
+#include "../../ClientCredits.h"	// Needed for MAXPUBKEYSIZE
+#include "../../OtherFunctions.h"	// Needed for CastItoXBytes
+#include <protocol/ed2k/Constants.h>
+#include <tags/FileTags.h>
+
+enum VersionType {
+	PrefFile,
+	PartMetFile,
+	CreditFile,
+	KnownFileList
+};
+
+static wxString VersionInfo(uint8_t version, uint8_t type)
+{
+	wxString verStr = wxT("??");
+	if (type == PrefFile) {
+		if (version == PREFFILE_VERSION) {
+			verStr = wxT("PREFFILE_VERSION");
+		}
+	} else if (type == PartMetFile) {
+		if (version == PARTFILE_VERSION) {
+			verStr = wxT("PARTFILE_VERSION");
+		} else if (version == PARTFILE_SPLITTEDVERSION) {
+			verStr = wxT("PARTFILE_SPLITTEDVERSION");
+		} else if (version == PARTFILE_VERSION_LARGEFILE) {
+			verStr = wxT("PARTFILE_VERSION_LARGEFILE");
+		}
+	} else if (type == CreditFile) {
+		if (version == CREDITFILE_VERSION) {
+			verStr = wxT("CREDITFILE_VERSION");
+		}
+	} else if (type == KnownFileList) {
+		if (version == MET_HEADER) {
+			verStr = wxT("MET_HEADER");
+		} else if (version == MET_HEADER_WITH_LARGEFILES) {
+			verStr = wxT("MET_HEADER_WITH_LARGEFILES");
+		}
+	}
+	return hex(version) + wxT(' ') + verStr;
+};
+
+void DecodePreferencesDat(const CFileDataIO& file)
+{
+	cout << "(Version): " << VersionInfo(file.ReadUInt8(), PrefFile);
+	cout << "\nUserHash : " << file.ReadHash() << '\n';
+}
+
+void DecodeFriendList(const CFileDataIO& file)
+{
+	uint8_t version = file.ReadUInt8();
+	cout << "Version : " << VersionInfo(version, KnownFileList) << endl;
+	if (version != MET_HEADER) {
+		cerr << "File seems to be corrupt, invalid version!" << endl;
+		return;
+	}
+	uint32_t records = file.ReadUInt32();
+	cout << "Records : " << records << '\n';
+	for (uint32_t i = 0; i < records; i++) {
+		cout << "\tUserHash   : " << file.ReadHash();
+		cout << "\n\tLasUsedIP  : " << CeD2kIP(file.ReadUInt32());
+		cout << "\n\tLasUsedPort: " << file.ReadUInt16();
+		cout << "\n\tLastSeen   : " << CTimeT(file.ReadUInt32());
+		cout << "\n\tLastChatted: " << CTimeT(file.ReadUInt32());
+		uint32_t tagCount = file.ReadUInt32();
+		cout << "\n\ttagCount   : " << tagCount << '\n';
+		for (; tagCount > 0; --tagCount) {
+			CTag tag(file, true);
+			cout << "\t\t" << CFriendTag(tag) << '\n';
+		}
+	}
+}
+
+void DecodeServerMet(const CFileDataIO& file)
+{
+	uint8_t version = file.ReadUInt8();
+	cout << "Version : " << VersionInfo(version, KnownFileList)  << endl;
+	if (version != 0xE0 && version != MET_HEADER) {
+		cerr << "File seems to be corrupt, invalid version!" << endl;
+		return;
+	}
+	uint32_t ServerCount = file.ReadUInt32();
+	cout << "Count   : " << ServerCount << '\n';
+	for (; ServerCount > 0; --ServerCount) {
+		cout << "\tIP       : " << CeD2kIP(file.ReadUInt32()) << '\n';
+		cout << "\tPort     : " << file.ReadUInt16() << '\n';
+		uint32_t tagCount = file.ReadUInt32();
+		cout << "\ttagCount : " << tagCount << '\n';
+		for (; tagCount > 0; --tagCount) {
+			CTag tag(file, true);
+			cout << "\t\t" << CServerTag(tag) << '\n';
+		}
+	}
+}
+
+void DecodeClientsMet(const CFileDataIO& file)
+{
+	uint8_t version = file.ReadUInt8();
+	cout << "Version : " << VersionInfo(version, CreditFile) << endl;
+	if (version != CREDITFILE_VERSION) {
+		cerr << "File seems to be corrupt, invalid version!" << endl;
+		return;
+	}
+	uint32_t count = file.ReadUInt32();
+	cout << "Count  : " << count << '\n';
+	for (uint32_t i = 0; i < count; i++) {
+		cout << wxString::Format(wxT("#%u\tKey          : "), i) << file.ReadHash();
+		uint32_t uploaded = file.ReadUInt32();
+		uint32_t downloaded = file.ReadUInt32();
+		cout << "\n\tUploaded     : " << uploaded;
+		cout << "\n\tDownloaded   : " << downloaded;
+		cout << "\n\tLast Seen    : " << CTimeT(file.ReadUInt32());
+		uint32_t uphi = file.ReadUInt32();
+		uint32_t downhi = file.ReadUInt32();
+		uint64_t totalup = (static_cast<uint64_t>(uphi) << 32) + uploaded;
+		uint64_t totaldown = (static_cast<uint64_t>(downhi) << 32) + downloaded;
+		cout << "\n\tUploadedHI   : " << uphi << "   Total : " << totalup << " (" << CastItoXBytes(totalup) << ')';
+		cout << "\n\tDownloadedHI : " << downhi << "   Total : " << totaldown << " (" << CastItoXBytes(totaldown) << ')';
+		cout << "\n\t(Reserved)   : " << file.ReadUInt16();
+		uint8_t keysize = file.ReadUInt8();
+		cout << "\n\tKeySize      : " << (unsigned)keysize;
+		cout << "\n\tKey Data     : ";
+		char buf[MAXPUBKEYSIZE];
+		file.Read(buf, MAXPUBKEYSIZE);
+		PrintByteArray(buf, MAXPUBKEYSIZE);
+		cout << endl;
+		if (keysize > MAXPUBKEYSIZE) {
+			cerr << "\n*** Corruption found while reading credit file! ***\n" << endl;
+			break;
+		}
+	}
+}
+
+static inline void PrintDateFromFile(const CFileDataIO& file, const wxString& prefix = wxEmptyString)
+{
+	cout << prefix << "LastChanged : " << CTimeT(file.ReadUInt32()) << '\n';
+}
+
+static void PrintHashsetFromFile(const CFileDataIO& file, const wxString& prefix = wxEmptyString)
+{
+	cout << prefix << "FileHash    : " << file.ReadHash() << '\n';
+
+	uint16_t parts = file.ReadUInt16();
+	cout << prefix << "Parts       : " << parts << '\n';
+
+	cout << prefix << "HashSet     : ";
+	for (uint16_t i = 0; i < parts; i++)
+	{
+		if (i) {
+			cout << ", ";
+		}
+		cout << file.ReadHash();
+	}
+	cout << '\n';
+}
+
+void DecodeKnownMet(const CFileDataIO& file)
+{
+	uint8_t version = file.ReadUInt8();
+	cout << "Version : " << VersionInfo(version, KnownFileList) << endl;
+	if (version != MET_HEADER && version != MET_HEADER_WITH_LARGEFILES) {
+		cerr << "File seems to be corrupt, invalid version!" << endl;
+		return;
+	}
+	uint32_t records = file.ReadUInt32();
+	cout << "Records : " << records << '\n';
+	for (uint32_t i = 0; i < records; i++) {
+		PrintDateFromFile(file, wxString::Format(wxT("#%u\t"), i));
+		PrintHashsetFromFile(file, wxT("\t"));
+		uint32_t tagCount = file.ReadUInt32();
+		cout << "\tTagCount    : " << tagCount << '\n';
+		for (; tagCount > 0; tagCount--) {
+			CTag tag(file, true);
+			cout << "\t\t" << tag << '\n';
+		}
+	}
+}
+
+void DecodePartMetFile(const CFileDataIO& file)
+{
+	uint16_t PartCount = 0;
+	uint8_t version = file.ReadUInt8();
+	cout << "Version     : " << VersionInfo(version, PartMetFile) << endl;
+	if (version != PARTFILE_VERSION && version != PARTFILE_SPLITTEDVERSION && version != PARTFILE_VERSION_LARGEFILE) {
+		cerr << "File seems to be corrupt, invalid version!" << endl;
+		return;
+	}
+	bool isnewstyle = (version == PARTFILE_SPLITTEDVERSION);
+	if (!isnewstyle) {
+		uint8_t test[4];
+		file.Seek(24, wxFromStart);
+		file.Read(test, 4);
+		file.Seek(1, wxFromStart);
+		if (test[0] == 0 && test[1] == 0 && test[2] == 2 && test[3] == 1) {
+			isnewstyle = true;
+		}
+	}
+	if (isnewstyle) {
+		uint32_t temp = file.ReadUInt32();
+		if (temp == 0) {
+			PrintHashsetFromFile(file);
+		} else {
+			file.Seek(2, wxFromStart);
+			PrintDateFromFile(file);
+			cout << "FileHash    : " << file.ReadHash() << '\n';
+		}
+	} else {
+		PrintDateFromFile(file);
+		PrintHashsetFromFile(file);
+	}
+	uint32_t tagCount = file.ReadUInt32();
+	cout << "TagCount    : " << tagCount << '\n';
+	for (; tagCount > 0; tagCount--) {
+		CTag tag(file, true);
+		if (tag.GetNameID() == FT_FILESIZE) {
+			PartCount = (tag.GetInt() + (PARTSIZE - 1)) / PARTSIZE;
+		}
+		cout << '\t' << tag << '\n';
+	}
+	if (isnewstyle && (file.GetPosition() < file.GetLength())) {
+		file.Seek(1, wxFromCurrent);
+		cout << "HashSet     : ";
+		for (uint16_t i = 0; i < PartCount && (file.GetPosition() + 16 < file.GetLength()); i++) {
+			if (i) {
+				cout << ", ";
+			}
+			cout << file.ReadHash();
+		}
+	}
+	cout << '\n';
+}
+
+void DecodeStatisticsDat(const CFileDataIO& file)
+{
+	uint8_t version = file.ReadUInt8();
+	cout << "Version : " << (unsigned)version << '\n';
+	if (version == 0) {
+		uint64_t tmp = file.ReadUInt64();
+		cout << "Total sent bytes     : " << tmp << " (" << CastItoXBytes(tmp) << ")\n";
+		tmp = file.ReadUInt64();
+		cout << "Total received bytes : " << tmp << " (" << CastItoXBytes(tmp) << ")\n";
+	}
+}

aMule-2.3.1.tar.bz2/src/utils/fileview/eD2kFiles.h Added

@@ -0,0 +1,41 @@
+//								-*- C++ -*-
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2004-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
+//
+
+#ifndef FILEVIEW_ED2KFILES_H
+#define FILEVIEW_ED2KFILES_H
+
+class CFileDataIO;
+
+void DecodePreferencesDat(const CFileDataIO& file);
+void DecodeFriendList(const CFileDataIO& file);
+void DecodeServerMet(const CFileDataIO& file);
+void DecodeClientsMet(const CFileDataIO& file);
+void DecodeKnownMet(const CFileDataIO& file);
+void DecodePartMetFile(const CFileDataIO& file);
+
+/* Not really eD2k related... */
+void DecodeStatisticsDat(const CFileDataIO& file);
+
+#endif /* FILEVIEW_ED2KFILES_H */

aMule-2.2.6.tar.bz2/src/utils/mkFileSum.c -> aMule-2.3.1.tar.bz2/src/utils/mkFileSum.c Changed

aMule-2.3.1.tar.bz2/src/utils/patches Added

aMule-2.3.1.tar.bz2/src/utils/patches/cryptopp Added

aMule-2.3.1.tar.bz2/src/utils/patches/cryptopp/mac_build.patch Added

aMule-2.3.1.tar.bz2/src/utils/patches/wxWidgets Added

aMule-2.3.1.tar.bz2/src/utils/plasmamule Added

aMule-2.3.1.tar.bz2/src/utils/plasmamule/Makefile.am Added

@@ -0,0 +1,43 @@
+if PLASMAMULE
+modulesdir = ${KDE_MODULE_PATH}
+modules_PROGRAMS = plasma-engine-plasmamule.so plasma-applet-plasmamule.so
+
+EXTRA_DIST = plasma-engine-plasmamule.dektop plasma-applet-plasmamule.desktop application-x-emulecollection.svg ed2k.protocol magnet.protocol plasmamule-engine-feeder.desktop
+BUILT_SOURCES = plasma-engine-plasmamule.moc plasma-applet-plasmamule.moc
+
+servicedir = ${KDE_SERVICE_PATH}
+dist_service_DATA = plasma-engine-plasmamule.desktop plasma-applet-plasmamule.desktop ed2k.protocol magnet.protocol
+
+icondir = ${KDE_ICON_PATH}
+dist_icon_DATA = application-x-emulecollection.svg
+
+mimedir = ${KDE_MIME_PATH}
+dist_mime_DATA = amule.xml
+
+appsdir = ${KDE_APPLNK_PATH}
+dist_apps_DATA = plasmamule-engine-feeder.desktop
+
+bin_PROGRAMS = plasmamule-engine-feeder
+endif
+
+plasma_engine_plasmamule_so_SOURCES = plasma-engine-plasmamule.cpp qt-emc.cpp
+plasma_applet_plasmamule_so_SOURCES = plasma-applet-plasmamule.cpp plasmamule-dbus.cpp
+plasmamule_engine_feeder_SOURCES = plasmamule-engine-feeder.cpp plasmamule-dbus.cpp
+
+nodist_plasma_engine_plasmamule_so_SOURCES  = plasma-engine-plasmamule.moc
+nodist_plasma_applet_plasmamule_so_SOURCES = plasma-applet-plasmamule.moc
+
+plasma_engine_plasmamule_so_CXXFLAGS = -shared -I${KDE_HEADER_DIR} ${QT_CORE_CXXFLAGS} -DPIC -fPIC ${DEBUGFLAG}
+plasma_applet_plasmamule_so_CXXFLAGS = -shared -D__IMG_PATH__=\"${KDE_ICON_PATH}\" -I${KDE_HEADER_DIR} ${QT_GUI_CXXFLAGS} -DPIC -fPIC ${DEBUGFLAG}
+plasmamule_engine_feeder_CXXFLAGS = -I${KDE_HEADER_DIR} ${QT_GUI_CXXFLAGS} ${DEBUGFLAG}
+
+plasmamule_engine_feeder_LDFLAGS = ${QT_GUI_LIBS} -lkdecore -lplasma ${QT_DBUS_LDFLAGS}
+
+noinst_HEADERS = plasma-engine-plasmamule.h plasma-applet-plasmamule.h plasmamule-dbus.h qt-emc.h
+
+%.moc : %.h
+	${QT_MOC} -o $@ $<
+
+CLEANFILES = *.moc
+
+MAINTAINERCLEANFILES = Makefile.in

aMule-2.3.1.tar.bz2/src/utils/plasmamule/Makefile.in Added

@@ -0,0 +1,952 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+@PLASMAMULE_TRUE@modules_PROGRAMS =  \
+@PLASMAMULE_TRUE@	plasma-engine-plasmamule.so$(EXEEXT) \
+@PLASMAMULE_TRUE@	plasma-applet-plasmamule.so$(EXEEXT)
+@PLASMAMULE_TRUE@bin_PROGRAMS = plasmamule-engine-feeder$(EXEEXT)
+subdir = src/utils/plasmamule
+DIST_COMMON = $(am__dist_apps_DATA_DIST) $(am__dist_icon_DATA_DIST) \
+	$(am__dist_mime_DATA_DIST) $(am__dist_service_DATA_DIST) \
+	$(noinst_HEADERS) $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/GeoIP.m4 \
+	$(top_srcdir)/m4/build-tools.m4 $(top_srcdir)/m4/codeset.m4 \
+	$(top_srcdir)/m4/cryptopp.m4 $(top_srcdir)/m4/fallocate.m4 \
+	$(top_srcdir)/m4/gdlib.m4 $(top_srcdir)/m4/gettext.m4 \
+	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
+	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
+	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
+	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
+	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
+	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
+	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
+	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(modulesdir)" \
+	"$(DESTDIR)$(appsdir)" "$(DESTDIR)$(icondir)" \
+	"$(DESTDIR)$(mimedir)" "$(DESTDIR)$(servicedir)"
+PROGRAMS = $(bin_PROGRAMS) $(modules_PROGRAMS)
+am_plasma_applet_plasmamule_so_OBJECTS = plasma_applet_plasmamule_so-plasma-applet-plasmamule.$(OBJEXT) \
+	plasma_applet_plasmamule_so-plasmamule-dbus.$(OBJEXT)
+nodist_plasma_applet_plasmamule_so_OBJECTS =
+plasma_applet_plasmamule_so_OBJECTS =  \
+	$(am_plasma_applet_plasmamule_so_OBJECTS) \
+	$(nodist_plasma_applet_plasmamule_so_OBJECTS)
+plasma_applet_plasmamule_so_LDADD = $(LDADD)
+plasma_applet_plasmamule_so_LINK = $(CXXLD) \
+	$(plasma_applet_plasmamule_so_CXXFLAGS) $(CXXFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_plasma_engine_plasmamule_so_OBJECTS = plasma_engine_plasmamule_so-plasma-engine-plasmamule.$(OBJEXT) \
+	plasma_engine_plasmamule_so-qt-emc.$(OBJEXT)
+nodist_plasma_engine_plasmamule_so_OBJECTS =
+plasma_engine_plasmamule_so_OBJECTS =  \
+	$(am_plasma_engine_plasmamule_so_OBJECTS) \
+	$(nodist_plasma_engine_plasmamule_so_OBJECTS)
+plasma_engine_plasmamule_so_LDADD = $(LDADD)
+plasma_engine_plasmamule_so_LINK = $(CXXLD) \
+	$(plasma_engine_plasmamule_so_CXXFLAGS) $(CXXFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+am_plasmamule_engine_feeder_OBJECTS =  \
+	plasmamule_engine_feeder-plasmamule-engine-feeder.$(OBJEXT) \
+	plasmamule_engine_feeder-plasmamule-dbus.$(OBJEXT)
+plasmamule_engine_feeder_OBJECTS =  \
+	$(am_plasmamule_engine_feeder_OBJECTS)
+plasmamule_engine_feeder_LDADD = $(LDADD)
+plasmamule_engine_feeder_LINK = $(CXXLD) \
+	$(plasmamule_engine_feeder_CXXFLAGS) $(CXXFLAGS) \
+	$(plasmamule_engine_feeder_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CXXLD = $(CXX)
+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	-o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(plasma_applet_plasmamule_so_SOURCES) \
+	$(nodist_plasma_applet_plasmamule_so_SOURCES) \
+	$(plasma_engine_plasmamule_so_SOURCES) \
+	$(nodist_plasma_engine_plasmamule_so_SOURCES) \
+	$(plasmamule_engine_feeder_SOURCES)
+DIST_SOURCES = $(plasma_applet_plasmamule_so_SOURCES) \
+	$(plasma_engine_plasmamule_so_SOURCES) \
+	$(plasmamule_engine_feeder_SOURCES)
+am__dist_apps_DATA_DIST = plasmamule-engine-feeder.desktop
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__dist_icon_DATA_DIST = application-x-emulecollection.svg
+am__dist_mime_DATA_DIST = amule.xml
+am__dist_service_DATA_DIST = plasma-engine-plasmamule.desktop \
+	plasma-applet-plasmamule.desktop ed2k.protocol magnet.protocol
+DATA = $(dist_apps_DATA) $(dist_icon_DATA) $(dist_mime_DATA) \
+	$(dist_service_DATA)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ALCC_MANPAGES = @ALCC_MANPAGES@
+ALC_MANPAGES = @ALC_MANPAGES@
+ALLOCA = @ALLOCA@
+AMTAR = @AMTAR@
+AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
+AMULEWEB_DEFS = @AMULEWEB_DEFS@
+AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
+AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BFD_CPPFLAGS = @BFD_CPPFLAGS@
+BFD_LIBS = @BFD_LIBS@
+BUILD_CC = @BUILD_CC@
+BUILD_CFLAGS = @BUILD_CFLAGS@
+BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
+BUILD_EXEEXT = @BUILD_EXEEXT@
+BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
+BUILD_LDFLAGS = @BUILD_LDFLAGS@
+CAS_DEFS = @CAS_DEFS@
+CAS_MANPAGES = @CAS_MANPAGES@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
+CRYPTOPP_LDFLAGS = @CRYPTOPP_LDFLAGS@
+CRYPTOPP_LIBS = @CRYPTOPP_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+ED2K_MANPAGES = @ED2K_MANPAGES@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GDLIB_CFLAGS = @GDLIB_CFLAGS@
+GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
+GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
+GDLIB_LIBS = @GDLIB_LIBS@
+GENCAT = @GENCAT@
+GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
+GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
+GEOIP_LIBS = @GEOIP_LIBS@
+GLIBC21 = @GLIBC21@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+INCINTL = @INCINTL@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLBISON = @INTLBISON@
+INTLLIBS = @INTLLIBS@
+INTLOBJS = @INTLOBJS@
+INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBICONV = @LIBICONV@
+LIBINTL = @LIBINTL@
+LIBOBJS = @LIBOBJS@
+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
+LIBPNG_CONFIG_PATH = @LIBPNG_CONFIG_PATH@
+LIBPNG_LDFLAGS = @LIBPNG_LDFLAGS@
+LIBPNG_LIBS = @LIBPNG_LIBS@
+LIBS = @LIBS@
+LIBUPNP_CFLAGS = @LIBUPNP_CFLAGS@
+LIBUPNP_CPPFLAGS = @LIBUPNP_CPPFLAGS@
+LIBUPNP_LDFLAGS = @LIBUPNP_LDFLAGS@
+LIBUPNP_LIBS = @LIBUPNP_LIBS@
+LTLIBICONV = @LTLIBICONV@
+LTLIBINTL = @LTLIBINTL@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
+MSGFMT = @MSGFMT@
+MSGMERGE = @MSGMERGE@
+MULECFLAGS = @MULECFLAGS@
+MULECPPFLAGS = @MULECPPFLAGS@
+MULECXXFLAGS = @MULECXXFLAGS@
+MULELDFLAGS = @MULELDFLAGS@
+MULERCFLAGS = @MULERCFLAGS@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POSUB = @POSUB@
+POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
+RANLIB = @RANLIB@
+RC = @RC@
+RCFLAGS = @RCFLAGS@
+READLINE_LIBS = @READLINE_LIBS@
+RESOLV_LIB = @RESOLV_LIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+SVNDATE = @SVNDATE@
+USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
+WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
+WXBASE_LIBS = @WXBASE_LIBS@
+WXCAS_MANPAGES = @WXCAS_MANPAGES@
+WX_CFLAGS = @WX_CFLAGS@
+WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
+WX_CONFIG_PATH = @WX_CONFIG_PATH@
+WX_CPPFLAGS = @WX_CPPFLAGS@
+WX_CXXFLAGS = @WX_CXXFLAGS@
+WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
+WX_DEBUG = @WX_DEBUG@
+WX_LIBS = @WX_LIBS@
+WX_PORT = @WX_PORT@
+WX_RESCOMP = @WX_RESCOMP@
+WX_SHARED = @WX_SHARED@
+WX_UNICODE = @WX_UNICODE@
+WX_VERSION_FULL = @WX_VERSION_FULL@
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
+XGETTEXT = @XGETTEXT@
+YACC = @YACC@
+YFLAGS = @YFLAGS@
+ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
+ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
+ZLIB_LIBS = @ZLIB_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+@PLASMAMULE_TRUE@modulesdir = ${KDE_MODULE_PATH}
+@PLASMAMULE_TRUE@EXTRA_DIST = plasma-engine-plasmamule.dektop plasma-applet-plasmamule.desktop application-x-emulecollection.svg ed2k.protocol magnet.protocol plasmamule-engine-feeder.desktop
+@PLASMAMULE_TRUE@BUILT_SOURCES = plasma-engine-plasmamule.moc plasma-applet-plasmamule.moc
+@PLASMAMULE_TRUE@servicedir = ${KDE_SERVICE_PATH}
+@PLASMAMULE_TRUE@dist_service_DATA = plasma-engine-plasmamule.desktop plasma-applet-plasmamule.desktop ed2k.protocol magnet.protocol
+@PLASMAMULE_TRUE@icondir = ${KDE_ICON_PATH}
+@PLASMAMULE_TRUE@dist_icon_DATA = application-x-emulecollection.svg
+@PLASMAMULE_TRUE@mimedir = ${KDE_MIME_PATH}
+@PLASMAMULE_TRUE@dist_mime_DATA = amule.xml
+@PLASMAMULE_TRUE@appsdir = ${KDE_APPLNK_PATH}
+@PLASMAMULE_TRUE@dist_apps_DATA = plasmamule-engine-feeder.desktop
+plasma_engine_plasmamule_so_SOURCES = plasma-engine-plasmamule.cpp qt-emc.cpp
+plasma_applet_plasmamule_so_SOURCES = plasma-applet-plasmamule.cpp plasmamule-dbus.cpp
+plasmamule_engine_feeder_SOURCES = plasmamule-engine-feeder.cpp plasmamule-dbus.cpp
+nodist_plasma_engine_plasmamule_so_SOURCES = plasma-engine-plasmamule.moc
+nodist_plasma_applet_plasmamule_so_SOURCES = plasma-applet-plasmamule.moc
+plasma_engine_plasmamule_so_CXXFLAGS = -shared -I${KDE_HEADER_DIR} ${QT_CORE_CXXFLAGS} -DPIC -fPIC ${DEBUGFLAG}
+plasma_applet_plasmamule_so_CXXFLAGS = -shared -D__IMG_PATH__=\"${KDE_ICON_PATH}\" -I${KDE_HEADER_DIR} ${QT_GUI_CXXFLAGS} -DPIC -fPIC ${DEBUGFLAG}
+plasmamule_engine_feeder_CXXFLAGS = -I${KDE_HEADER_DIR} ${QT_GUI_CXXFLAGS} ${DEBUGFLAG}
+plasmamule_engine_feeder_LDFLAGS = ${QT_GUI_LIBS} -lkdecore -lplasma ${QT_DBUS_LDFLAGS}
+noinst_HEADERS = plasma-engine-plasmamule.h plasma-applet-plasmamule.h plasmamule-dbus.h qt-emc.h
+CLEANFILES = *.moc
+MAINTAINERCLEANFILES = Makefile.in
+all: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) all-am
+
+.SUFFIXES:
+.SUFFIXES: .cpp .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/plasmamule/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/plasmamule/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+install-modulesPROGRAMS: $(modules_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	test -z "$(modulesdir)" || $(MKDIR_P) "$(DESTDIR)$(modulesdir)"
+	@list='$(modules_PROGRAMS)'; test -n "$(modulesdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(modulesdir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(modulesdir)$$dir" || exit $$?; \
+	    } \
+	; done
+
+uninstall-modulesPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(modules_PROGRAMS)'; test -n "$(modulesdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(modulesdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(modulesdir)" && rm -f $$files
+
+clean-modulesPROGRAMS:
+	-test -z "$(modules_PROGRAMS)" || rm -f $(modules_PROGRAMS)
+plasma-applet-plasmamule.so$(EXEEXT): $(plasma_applet_plasmamule_so_OBJECTS) $(plasma_applet_plasmamule_so_DEPENDENCIES) 
+	@rm -f plasma-applet-plasmamule.so$(EXEEXT)
+	$(AM_V_CXXLD)$(plasma_applet_plasmamule_so_LINK) $(plasma_applet_plasmamule_so_OBJECTS) $(plasma_applet_plasmamule_so_LDADD) $(LIBS)
+plasma-engine-plasmamule.so$(EXEEXT): $(plasma_engine_plasmamule_so_OBJECTS) $(plasma_engine_plasmamule_so_DEPENDENCIES) 
+	@rm -f plasma-engine-plasmamule.so$(EXEEXT)
+	$(AM_V_CXXLD)$(plasma_engine_plasmamule_so_LINK) $(plasma_engine_plasmamule_so_OBJECTS) $(plasma_engine_plasmamule_so_LDADD) $(LIBS)
+plasmamule-engine-feeder$(EXEEXT): $(plasmamule_engine_feeder_OBJECTS) $(plasmamule_engine_feeder_DEPENDENCIES) 
+	@rm -f plasmamule-engine-feeder$(EXEEXT)
+	$(AM_V_CXXLD)$(plasmamule_engine_feeder_LINK) $(plasmamule_engine_feeder_OBJECTS) $(plasmamule_engine_feeder_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plasma_applet_plasmamule_so-plasma-applet-plasmamule.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plasma_applet_plasmamule_so-plasmamule-dbus.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plasma_engine_plasmamule_so-plasma-engine-plasmamule.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plasma_engine_plasmamule_so-qt-emc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plasmamule_engine_feeder-plasmamule-dbus.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plasmamule_engine_feeder-plasmamule-engine-feeder.Po@am__quote@
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+plasma_applet_plasmamule_so-plasma-applet-plasmamule.o: plasma-applet-plasmamule.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_applet_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -MT plasma_applet_plasmamule_so-plasma-applet-plasmamule.o -MD -MP -MF $(DEPDIR)/plasma_applet_plasmamule_so-plasma-applet-plasmamule.Tpo -c -o plasma_applet_plasmamule_so-plasma-applet-plasmamule.o `test -f 'plasma-applet-plasmamule.cpp' || echo '$(srcdir)/'`plasma-applet-plasmamule.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/plasma_applet_plasmamule_so-plasma-applet-plasmamule.Tpo $(DEPDIR)/plasma_applet_plasmamule_so-plasma-applet-plasmamule.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='plasma-applet-plasmamule.cpp' object='plasma_applet_plasmamule_so-plasma-applet-plasmamule.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_applet_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -c -o plasma_applet_plasmamule_so-plasma-applet-plasmamule.o `test -f 'plasma-applet-plasmamule.cpp' || echo '$(srcdir)/'`plasma-applet-plasmamule.cpp
+
+plasma_applet_plasmamule_so-plasma-applet-plasmamule.obj: plasma-applet-plasmamule.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_applet_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -MT plasma_applet_plasmamule_so-plasma-applet-plasmamule.obj -MD -MP -MF $(DEPDIR)/plasma_applet_plasmamule_so-plasma-applet-plasmamule.Tpo -c -o plasma_applet_plasmamule_so-plasma-applet-plasmamule.obj `if test -f 'plasma-applet-plasmamule.cpp'; then $(CYGPATH_W) 'plasma-applet-plasmamule.cpp'; else $(CYGPATH_W) '$(srcdir)/plasma-applet-plasmamule.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/plasma_applet_plasmamule_so-plasma-applet-plasmamule.Tpo $(DEPDIR)/plasma_applet_plasmamule_so-plasma-applet-plasmamule.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='plasma-applet-plasmamule.cpp' object='plasma_applet_plasmamule_so-plasma-applet-plasmamule.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_applet_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -c -o plasma_applet_plasmamule_so-plasma-applet-plasmamule.obj `if test -f 'plasma-applet-plasmamule.cpp'; then $(CYGPATH_W) 'plasma-applet-plasmamule.cpp'; else $(CYGPATH_W) '$(srcdir)/plasma-applet-plasmamule.cpp'; fi`
+
+plasma_applet_plasmamule_so-plasmamule-dbus.o: plasmamule-dbus.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_applet_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -MT plasma_applet_plasmamule_so-plasmamule-dbus.o -MD -MP -MF $(DEPDIR)/plasma_applet_plasmamule_so-plasmamule-dbus.Tpo -c -o plasma_applet_plasmamule_so-plasmamule-dbus.o `test -f 'plasmamule-dbus.cpp' || echo '$(srcdir)/'`plasmamule-dbus.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/plasma_applet_plasmamule_so-plasmamule-dbus.Tpo $(DEPDIR)/plasma_applet_plasmamule_so-plasmamule-dbus.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='plasmamule-dbus.cpp' object='plasma_applet_plasmamule_so-plasmamule-dbus.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_applet_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -c -o plasma_applet_plasmamule_so-plasmamule-dbus.o `test -f 'plasmamule-dbus.cpp' || echo '$(srcdir)/'`plasmamule-dbus.cpp
+
+plasma_applet_plasmamule_so-plasmamule-dbus.obj: plasmamule-dbus.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_applet_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -MT plasma_applet_plasmamule_so-plasmamule-dbus.obj -MD -MP -MF $(DEPDIR)/plasma_applet_plasmamule_so-plasmamule-dbus.Tpo -c -o plasma_applet_plasmamule_so-plasmamule-dbus.obj `if test -f 'plasmamule-dbus.cpp'; then $(CYGPATH_W) 'plasmamule-dbus.cpp'; else $(CYGPATH_W) '$(srcdir)/plasmamule-dbus.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/plasma_applet_plasmamule_so-plasmamule-dbus.Tpo $(DEPDIR)/plasma_applet_plasmamule_so-plasmamule-dbus.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='plasmamule-dbus.cpp' object='plasma_applet_plasmamule_so-plasmamule-dbus.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_applet_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -c -o plasma_applet_plasmamule_so-plasmamule-dbus.obj `if test -f 'plasmamule-dbus.cpp'; then $(CYGPATH_W) 'plasmamule-dbus.cpp'; else $(CYGPATH_W) '$(srcdir)/plasmamule-dbus.cpp'; fi`
+
+plasma_engine_plasmamule_so-plasma-engine-plasmamule.o: plasma-engine-plasmamule.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_engine_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -MT plasma_engine_plasmamule_so-plasma-engine-plasmamule.o -MD -MP -MF $(DEPDIR)/plasma_engine_plasmamule_so-plasma-engine-plasmamule.Tpo -c -o plasma_engine_plasmamule_so-plasma-engine-plasmamule.o `test -f 'plasma-engine-plasmamule.cpp' || echo '$(srcdir)/'`plasma-engine-plasmamule.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/plasma_engine_plasmamule_so-plasma-engine-plasmamule.Tpo $(DEPDIR)/plasma_engine_plasmamule_so-plasma-engine-plasmamule.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='plasma-engine-plasmamule.cpp' object='plasma_engine_plasmamule_so-plasma-engine-plasmamule.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_engine_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -c -o plasma_engine_plasmamule_so-plasma-engine-plasmamule.o `test -f 'plasma-engine-plasmamule.cpp' || echo '$(srcdir)/'`plasma-engine-plasmamule.cpp
+
+plasma_engine_plasmamule_so-plasma-engine-plasmamule.obj: plasma-engine-plasmamule.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_engine_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -MT plasma_engine_plasmamule_so-plasma-engine-plasmamule.obj -MD -MP -MF $(DEPDIR)/plasma_engine_plasmamule_so-plasma-engine-plasmamule.Tpo -c -o plasma_engine_plasmamule_so-plasma-engine-plasmamule.obj `if test -f 'plasma-engine-plasmamule.cpp'; then $(CYGPATH_W) 'plasma-engine-plasmamule.cpp'; else $(CYGPATH_W) '$(srcdir)/plasma-engine-plasmamule.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/plasma_engine_plasmamule_so-plasma-engine-plasmamule.Tpo $(DEPDIR)/plasma_engine_plasmamule_so-plasma-engine-plasmamule.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='plasma-engine-plasmamule.cpp' object='plasma_engine_plasmamule_so-plasma-engine-plasmamule.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_engine_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -c -o plasma_engine_plasmamule_so-plasma-engine-plasmamule.obj `if test -f 'plasma-engine-plasmamule.cpp'; then $(CYGPATH_W) 'plasma-engine-plasmamule.cpp'; else $(CYGPATH_W) '$(srcdir)/plasma-engine-plasmamule.cpp'; fi`
+
+plasma_engine_plasmamule_so-qt-emc.o: qt-emc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_engine_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -MT plasma_engine_plasmamule_so-qt-emc.o -MD -MP -MF $(DEPDIR)/plasma_engine_plasmamule_so-qt-emc.Tpo -c -o plasma_engine_plasmamule_so-qt-emc.o `test -f 'qt-emc.cpp' || echo '$(srcdir)/'`qt-emc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/plasma_engine_plasmamule_so-qt-emc.Tpo $(DEPDIR)/plasma_engine_plasmamule_so-qt-emc.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='qt-emc.cpp' object='plasma_engine_plasmamule_so-qt-emc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_engine_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -c -o plasma_engine_plasmamule_so-qt-emc.o `test -f 'qt-emc.cpp' || echo '$(srcdir)/'`qt-emc.cpp
+
+plasma_engine_plasmamule_so-qt-emc.obj: qt-emc.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_engine_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -MT plasma_engine_plasmamule_so-qt-emc.obj -MD -MP -MF $(DEPDIR)/plasma_engine_plasmamule_so-qt-emc.Tpo -c -o plasma_engine_plasmamule_so-qt-emc.obj `if test -f 'qt-emc.cpp'; then $(CYGPATH_W) 'qt-emc.cpp'; else $(CYGPATH_W) '$(srcdir)/qt-emc.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/plasma_engine_plasmamule_so-qt-emc.Tpo $(DEPDIR)/plasma_engine_plasmamule_so-qt-emc.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='qt-emc.cpp' object='plasma_engine_plasmamule_so-qt-emc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasma_engine_plasmamule_so_CXXFLAGS) $(CXXFLAGS) -c -o plasma_engine_plasmamule_so-qt-emc.obj `if test -f 'qt-emc.cpp'; then $(CYGPATH_W) 'qt-emc.cpp'; else $(CYGPATH_W) '$(srcdir)/qt-emc.cpp'; fi`
+
+plasmamule_engine_feeder-plasmamule-engine-feeder.o: plasmamule-engine-feeder.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasmamule_engine_feeder_CXXFLAGS) $(CXXFLAGS) -MT plasmamule_engine_feeder-plasmamule-engine-feeder.o -MD -MP -MF $(DEPDIR)/plasmamule_engine_feeder-plasmamule-engine-feeder.Tpo -c -o plasmamule_engine_feeder-plasmamule-engine-feeder.o `test -f 'plasmamule-engine-feeder.cpp' || echo '$(srcdir)/'`plasmamule-engine-feeder.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/plasmamule_engine_feeder-plasmamule-engine-feeder.Tpo $(DEPDIR)/plasmamule_engine_feeder-plasmamule-engine-feeder.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='plasmamule-engine-feeder.cpp' object='plasmamule_engine_feeder-plasmamule-engine-feeder.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasmamule_engine_feeder_CXXFLAGS) $(CXXFLAGS) -c -o plasmamule_engine_feeder-plasmamule-engine-feeder.o `test -f 'plasmamule-engine-feeder.cpp' || echo '$(srcdir)/'`plasmamule-engine-feeder.cpp
+
+plasmamule_engine_feeder-plasmamule-engine-feeder.obj: plasmamule-engine-feeder.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasmamule_engine_feeder_CXXFLAGS) $(CXXFLAGS) -MT plasmamule_engine_feeder-plasmamule-engine-feeder.obj -MD -MP -MF $(DEPDIR)/plasmamule_engine_feeder-plasmamule-engine-feeder.Tpo -c -o plasmamule_engine_feeder-plasmamule-engine-feeder.obj `if test -f 'plasmamule-engine-feeder.cpp'; then $(CYGPATH_W) 'plasmamule-engine-feeder.cpp'; else $(CYGPATH_W) '$(srcdir)/plasmamule-engine-feeder.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/plasmamule_engine_feeder-plasmamule-engine-feeder.Tpo $(DEPDIR)/plasmamule_engine_feeder-plasmamule-engine-feeder.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='plasmamule-engine-feeder.cpp' object='plasmamule_engine_feeder-plasmamule-engine-feeder.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasmamule_engine_feeder_CXXFLAGS) $(CXXFLAGS) -c -o plasmamule_engine_feeder-plasmamule-engine-feeder.obj `if test -f 'plasmamule-engine-feeder.cpp'; then $(CYGPATH_W) 'plasmamule-engine-feeder.cpp'; else $(CYGPATH_W) '$(srcdir)/plasmamule-engine-feeder.cpp'; fi`
+
+plasmamule_engine_feeder-plasmamule-dbus.o: plasmamule-dbus.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasmamule_engine_feeder_CXXFLAGS) $(CXXFLAGS) -MT plasmamule_engine_feeder-plasmamule-dbus.o -MD -MP -MF $(DEPDIR)/plasmamule_engine_feeder-plasmamule-dbus.Tpo -c -o plasmamule_engine_feeder-plasmamule-dbus.o `test -f 'plasmamule-dbus.cpp' || echo '$(srcdir)/'`plasmamule-dbus.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/plasmamule_engine_feeder-plasmamule-dbus.Tpo $(DEPDIR)/plasmamule_engine_feeder-plasmamule-dbus.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='plasmamule-dbus.cpp' object='plasmamule_engine_feeder-plasmamule-dbus.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasmamule_engine_feeder_CXXFLAGS) $(CXXFLAGS) -c -o plasmamule_engine_feeder-plasmamule-dbus.o `test -f 'plasmamule-dbus.cpp' || echo '$(srcdir)/'`plasmamule-dbus.cpp
+
+plasmamule_engine_feeder-plasmamule-dbus.obj: plasmamule-dbus.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasmamule_engine_feeder_CXXFLAGS) $(CXXFLAGS) -MT plasmamule_engine_feeder-plasmamule-dbus.obj -MD -MP -MF $(DEPDIR)/plasmamule_engine_feeder-plasmamule-dbus.Tpo -c -o plasmamule_engine_feeder-plasmamule-dbus.obj `if test -f 'plasmamule-dbus.cpp'; then $(CYGPATH_W) 'plasmamule-dbus.cpp'; else $(CYGPATH_W) '$(srcdir)/plasmamule-dbus.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/plasmamule_engine_feeder-plasmamule-dbus.Tpo $(DEPDIR)/plasmamule_engine_feeder-plasmamule-dbus.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='plasmamule-dbus.cpp' object='plasmamule_engine_feeder-plasmamule-dbus.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(plasmamule_engine_feeder_CXXFLAGS) $(CXXFLAGS) -c -o plasmamule_engine_feeder-plasmamule-dbus.obj `if test -f 'plasmamule-dbus.cpp'; then $(CYGPATH_W) 'plasmamule-dbus.cpp'; else $(CYGPATH_W) '$(srcdir)/plasmamule-dbus.cpp'; fi`
+install-dist_appsDATA: $(dist_apps_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(appsdir)" || $(MKDIR_P) "$(DESTDIR)$(appsdir)"
+	@list='$(dist_apps_DATA)'; test -n "$(appsdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(appsdir)" || exit $$?; \
+	done
+
+uninstall-dist_appsDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_apps_DATA)'; test -n "$(appsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(appsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(appsdir)" && rm -f $$files
+install-dist_iconDATA: $(dist_icon_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
+	@list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
+	done
+
+uninstall-dist_iconDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(icondir)" && rm -f $$files
+install-dist_mimeDATA: $(dist_mime_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)"
+	@list='$(dist_mime_DATA)'; test -n "$(mimedir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(mimedir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(mimedir)" || exit $$?; \
+	done
+
+uninstall-dist_mimeDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_mime_DATA)'; test -n "$(mimedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(mimedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(mimedir)" && rm -f $$files
+install-dist_serviceDATA: $(dist_service_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
+	@list='$(dist_service_DATA)'; test -n "$(servicedir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(servicedir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(servicedir)" || exit $$?; \
+	done
+
+uninstall-dist_serviceDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_service_DATA)'; test -n "$(servicedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(servicedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(servicedir)" && rm -f $$files
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	mkid -fID $$unique
+tags: TAGS
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	set x; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) check-am
+all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS)
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(modulesdir)" "$(DESTDIR)$(appsdir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(mimedir)" "$(DESTDIR)$(servicedir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic clean-modulesPROGRAMS \
+	mostlyclean-am
+
+distclean: distclean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_appsDATA install-dist_iconDATA \
+	install-dist_mimeDATA install-dist_serviceDATA \
+	install-modulesPROGRAMS
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS uninstall-dist_appsDATA \
+	uninstall-dist_iconDATA uninstall-dist_mimeDATA \
+	uninstall-dist_serviceDATA uninstall-modulesPROGRAMS
+
+.MAKE: all check install install-am install-strip
+
+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic clean-modulesPROGRAMS ctags distclean \
+	distclean-compile distclean-generic distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-binPROGRAMS install-data install-data-am \
+	install-dist_appsDATA install-dist_iconDATA \
+	install-dist_mimeDATA install-dist_serviceDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-modulesPROGRAMS install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
+	ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-dist_appsDATA uninstall-dist_iconDATA \
+	uninstall-dist_mimeDATA uninstall-dist_serviceDATA \
+	uninstall-modulesPROGRAMS
+
+
+%.moc : %.h
+	${QT_MOC} -o $@ $<
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

aMule-2.3.1.tar.bz2/src/utils/plasmamule/amule.xml Added

aMule-2.3.1.tar.bz2/src/utils/plasmamule/amule_applet.svg Added

@@ -0,0 +1,1398 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="128"
+   height="128"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5499">
+      <stop
+         id="stop5501"
+         style="stop-color:#414041;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5503"
+         style="stop-color:#414041;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="217.46033"
+       cy="1267.6486"
+       r="51.293652"
+       fx="217.46033"
+       fy="1267.6486"
+       id="radialGradient5485"
+       xlink:href="#linearGradient5499"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.7231807,0,-916.73904)" />
+  </defs>
+  <g
+     id="layer2"
+     style="display:inline">
+    <path
+       d="M 39.340653,6.101704 L 49.585554,6.101704 L 49.585554,21.033173 L 39.340653,21.033173 L 39.340653,6.101704 z"
+       id="rect3606"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.97238445;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 31.157195,13.930587 L 40.319663,13.930587 L 40.319663,28.407229 L 31.157195,28.407229 L 31.157195,13.930587 z"
+       id="rect3608"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.9949488;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 22.935572,20.962037 L 31.335333,20.962037 L 31.335333,36.615875 L 22.935572,36.615875 L 22.935572,20.962037 z"
+       id="rect3610"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.98637319;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 13.926738,36.046062 L 22.651414,36.046062 L 22.651414,87.736033 L 13.926738,87.736033 L 13.926738,36.046062 z"
+       id="rect3612"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 3.9349289,58.026734 L 14.136332,58.026734 L 14.136332,65.321003 L 3.9349289,65.321003 L 3.9349289,58.026734 z"
+       id="rect3614"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.01180661;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 5.2020639,72.75029 L 15.930324,72.75029 L 15.930324,80.351753 L 5.2020639,80.351753 L 5.2020639,72.75029 z"
+       id="rect3616"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 4.3420179,87.518853 L 13.926736,87.518853 L 13.926736,124.65744 L 4.3420179,124.65744 L 4.3420179,87.518853 z"
+       id="rect3618"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 23.180182,102.50459 L 67.596712,102.50459 L 67.596712,109.88887 L 23.180182,109.88887 L 23.180182,102.50459 z"
+       id="rect3620"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 49.35421,109.6717 L 59.136423,109.6717 L 59.136423,124.65745 L 49.35421,124.65745 L 49.35421,109.6717 z"
+       id="rect3622"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 40.629533,57.981725 L 49.882979,57.981725 L 49.882979,65.800377 L 40.629533,65.800377 L 40.629533,57.981725 z"
+       id="rect3624"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 59.136423,50.814627 L 68.125482,50.814627 L 68.125482,58.198909 L 59.136423,58.198909 L 59.136423,50.814627 z"
+       id="rect3626"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 76.850162,58.198909 L 86.367982,58.198909 L 86.367982,64.931639 L 76.850162,64.931639 L 76.850162,58.198909 z"
+       id="rect3628"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 68.125482,43.21316 L 85.839222,43.21316 L 85.839222,51.031811 L 68.125482,51.031811 L 68.125482,43.21316 z"
+       id="rect3630"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 86.103602,36.046062 L 103.55295,36.046062 L 103.55295,43.430344 L 86.103602,43.430344 L 86.103602,36.046062 z"
+       id="rect3632"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 102.88048,28.252166 L 113.04064,28.252166 L 113.04064,36.23849 L 102.88048,36.23849 L 102.88048,28.252166 z"
+       id="rect3634"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.96712023;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 62.593752,21.060315 L 118.86689,21.060315 C 120.78226,21.060315 122.32423,22.327003 122.32423,23.900423 L 122.32423,25.604488 C 122.32423,27.177906 120.78226,28.444596 118.86689,28.444596 L 62.593752,28.444596 C 60.678393,28.444596 59.136423,27.177906 59.136423,25.604488 L 59.136423,23.900423 C 59.136423,22.327003 60.678393,21.060315 62.593752,21.060315 z"
+       id="rect3636"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 49.35421,28.661781 L 58.34327,28.661781 L 58.34327,35.394509 L 49.35421,35.394509 L 49.35421,28.661781 z"
+       id="rect5277"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 41.158301,36.480431 L 50.147361,36.480431 L 50.147361,42.995976 L 41.158301,42.995976 L 41.158301,36.480431 z"
+       id="rect5279"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 39.215793,5.939705 C 38.715223,9.330421 36.588834,12.195726 31.264256,14.027471 C 30.314454,17.008113 28.936283,19.808787 23.591719,20.943099 C 21.24108,26.303546 21.981111,32.80014 14.245173,36.180923"
+       id="path5394"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.08055982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 32.240586,13.806817 C 32.240586,13.743663 32.501332,13.582713 32.820026,13.449153 C 35.443975,12.349496 37.451683,10.628408 38.451783,8.621384 C 38.716785,8.089573 39.00076,7.636067 39.08284,7.613591 C 39.18425,7.585822 39.232075,8.59004 39.232075,10.747186 L 39.232075,13.921648 L 35.736331,13.921648 C 33.549304,13.921648 32.240586,13.878655 32.240586,13.806817 z"
+       id="path5396"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.44840074;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 25.249095,20.647913 C 25.249095,20.588997 25.668955,20.34791 26.182118,20.112165 C 28.087776,19.236715 29.689218,17.666857 30.45964,15.918998 C 31.026416,14.633163 31.099119,14.862044 31.099119,17.93221 L 31.099119,20.755038 L 28.174106,20.755038 C 26.502853,20.755038 25.249095,20.709122 25.249095,20.647915 L 25.249095,20.647913 z"
+       id="path5398"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.44840074;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 14.690515,35.894974 C 14.690515,35.841365 14.995502,35.634543 15.368263,35.435369 C 15.741024,35.236193 16.434957,34.765793 16.91034,34.390033 C 19.142521,32.625632 20.280821,30.70527 21.514754,26.622187 C 21.815628,25.626596 22.136862,24.791471 22.228609,24.766347 C 22.354366,24.731914 22.395425,26.10787 22.395425,30.356558 L 22.395425,35.992445 L 18.542971,35.992445 C 16.424121,35.992445 14.690515,35.948583 14.690515,35.894974 L 14.690515,35.894974 z"
+       id="path5400"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.44840074;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 30.786969,14.032631 C 29.888352,15.098906 29.383947,17.892502 29.383947,17.892502 L 24.696345,20.430284 C 28.746586,18.151073 21.755507,21.213217 22.300034,21.742622 L 20.402955,27.566126"
+       id="path5402"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 23.518191,21.403041 C 23.518191,21.377518 23.561591,21.290021 23.614635,21.208601 C 23.707567,21.065954 23.738905,21.066012 24.475263,21.210127 C 24.895567,21.292385 25.264031,21.379885 25.294078,21.404567 C 25.324123,21.429248 24.936841,21.449443 24.433448,21.449443 C 23.930058,21.449443 23.518191,21.428562 23.518191,21.403038 L 23.518191,21.403041 z"
+       id="path5404"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.01355422;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 22.281231,23.559817 C 22.22932,23.448688 22.190453,23.442742 22.066825,23.52703 C 21.983775,23.583648 17.702616,34.061396 17.674025,34.03791 C 17.566511,33.949593 22.383089,21.784558 22.551131,21.707306 C 22.677071,21.649408 22.71942,21.661927 22.71942,21.757047 C 22.71942,21.826955 22.76435,21.884154 22.819267,21.884154 C 22.971338,21.884154 22.928404,22.433727 22.726627,23.069912 C 22.543681,23.646732 22.397133,23.807929 22.281231,23.559819 L 22.281231,23.559817 z"
+       id="path5406"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.01355422;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 3.8865129,58.026209 L 13.417082,36.229233"
+       id="path5408"
+       style="fill:none;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 4.2432109,58.01539 C 6.0023709,53.959739 13.749314,36.350054 13.777925,36.323778 C 13.800676,36.302879 13.551363,36.433894 13.673351,36.450824 L 13.895146,36.481609 L 13.895146,47.242734 L 13.895146,58.003862 L 8.9345419,58.003862 C 4.9892949,58.003862 3.9788699,57.992482 3.9980529,57.948259 L 4.2432109,58.01539 z"
+       id="path5410"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.5496943;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 3.9948139,65.232557 C 17.815786,69.93296 -1.6730071,70.712716 5.2944389,80.312513 C 17.882508,85.190263 4.6756049,87.017783 4.9695319,87.518853"
+       id="path5412"
+       style="fill:none;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 5.4475989,72.707309 C 5.4475989,72.63919 6.1996769,71.917446 7.0975699,71.123879 C 8.4418519,69.935795 8.8689969,69.45839 9.0530499,68.938297 C 9.4358499,67.856598 8.4672979,66.939089 5.7860419,65.843439 C 5.2425019,65.621329 4.7977859,65.422426 4.7977859,65.401427 C 4.7977859,65.380433 6.8446919,65.363253 9.3464679,65.363253 L 13.895146,65.363253 L 13.895146,69.055394 L 13.895146,72.747536 L 9.6713719,72.747536 C 7.1895439,72.747536 5.4475989,72.730944 5.4475989,72.707305 L 5.4475989,72.707309 z"
+       id="path5414"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.5496943;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 4.9222249,79.623243 C 4.2438179,78.553773 3.8931479,77.554243 3.8385399,76.534383 C 3.7911589,75.649463 3.9740649,74.882093 4.4229169,74.082633 C 4.6757749,73.632263 5.0597369,73.095273 5.1289049,73.095273 C 5.1563029,73.095273 5.1768429,74.543943 5.1768429,76.476023 C 5.1768429,78.661593 5.1580209,79.856783 5.1236049,79.856783 C 5.0943249,79.856783 5.0037019,79.751683 4.9222229,79.623243 L 4.9222249,79.623243 z"
+       id="path5416"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.5496943;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 5.1902089,87.452783 C 5.2025249,87.422423 5.7711109,87.216513 6.4537339,86.995183 C 8.5168459,86.326253 9.5029579,85.874823 10.158427,85.299213 C 10.621074,84.892933 10.780652,84.603983 10.781113,84.171693 C 10.781711,83.609253 10.505878,83.164493 9.7919699,82.576753 C 9.0910579,81.999733 8.2131769,81.504303 6.7066059,80.835563 C 6.2524159,80.633953 5.8808049,80.451363 5.8808049,80.429793 C 5.8808049,80.407523 7.6121159,80.390583 9.8879759,80.390583 L 13.895146,80.390583 L 13.895146,83.949273 L 13.895146,87.507973 L 9.5314839,87.507973 C 6.0823689,87.507973 5.1725119,87.496393 5.1902109,87.452783 L 5.1902089,87.452783 z"
+       id="path5418"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.5496943;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 103.84118,117.37931 C 106.90063,117.46172 111.28174,115.03097 114.69114,110.76294 C 121.73297,105.18527 120.26144,105.10684 122.47916,103.32636 L 123.41106,100.0455 C 125.17559,94.607773 125.16257,90.099283 125.0086,85.664463 C 124.30407,80.940603 124.42065,73.807723 122.61228,72.322348 C 119.26626,69.620488 114.29713,64.156705 113.16017,65.213846"
+       id="path5420"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 104.09881,113.70195 L 104.09881,110.08404 L 108.92101,110.08404 L 113.74321,110.08404 L 113.74321,106.72014 L 113.74321,103.35623 L 117.87652,103.35623 C 120.14985,103.35623 122.00984,103.3714 122.00984,103.38994 C 122.00984,103.40849 121.84786,103.5695 121.6499,103.74778 C 121.45193,103.92605 121.03172,104.39701 120.71612,104.79436 C 120.4005,105.19169 119.98138,105.70139 119.78474,105.92702 C 118.9688,106.86323 117.10725,108.57377 115.49818,109.86582 C 114.82644,110.40522 114.446,110.76659 114.00864,111.28067 C 112.12513,113.49463 110.14112,115.11955 107.97836,116.21953 C 106.86363,116.78649 105.49533,117.21165 104.54959,117.28492 L 104.09881,117.31986 L 104.09881,113.70195 z"
+       id="path5422"
+       style="opacity:1;fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.67093682;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 122.60629,87.332123 C 122.60629,75.538783 122.62307,72.563528 122.68949,72.580671 C 122.83029,72.617008 123.18859,73.229963 123.37059,73.745833 C 123.83201,75.053703 124.0652,76.646863 124.4708,81.262553 C 124.58311,82.540713 124.73356,84.047843 124.80512,84.611713 C 124.98036,85.992613 125.04506,88.963083 124.94239,90.913713 C 124.8154,93.326083 124.56138,95.232103 124.10432,97.202003 C 123.78141,98.593733 122.77124,102.05988 122.68138,102.08449 C 122.62576,102.09971 122.60629,98.274943 122.60629,87.332123 z"
+       id="path5424"
+       style="opacity:1;fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.67570281;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 113.37002,68.729453 C 113.38968,64.636295 113.3168,64.995766 114.06556,65.298576 C 114.96226,65.661208 116.18831,66.638662 119.17395,69.371208 C 120.15974,70.273441 121.27871,71.274101 121.66053,71.594901 C 122.04621,71.918956 122.33492,72.204494 122.31017,72.237398 C 122.2789,72.278966 120.93649,72.29663 117.80925,72.29663 L 113.3529,72.29663 L 113.37002,68.729453 z"
+       id="path5426"
+       style="opacity:1;fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.67570281;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 103.65401,38.976483 L 103.65401,36.245307 L 107.68062,36.245307 C 109.89525,36.245307 111.9355,35.820016 111.87115,35.864294 C 111.80681,35.908568 111.25162,36.465668 110.98071,36.538209 C 110.0245,36.79425 108.00086,37.675422 107.1564,38.203454 C 106.06111,38.888346 105.04135,39.88627 104.39683,40.90394 C 104.11687,41.34598 103.83521,41.707651 103.77092,41.707651 C 103.70002,41.707651 103.65401,40.632735 103.65401,38.976483 z"
+       id="path5438"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.24998963;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 49.598255,6.19708 C 52.270524,19.619097 55.844786,22.297105 59.739759,21.154985"
+       id="path5440"
+       style="fill:none;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.94117647;display:inline" />
+    <path
+       d="M 50.439308,24.306414 C 50.439308,21.066587 50.389369,20.519603 50.093576,20.519603 C 49.794461,20.519603 49.74784,19.802562 49.74784,15.20229 C 49.74784,11.139896 49.813358,9.902915 50.025448,9.96099 C 50.178128,10.0028 50.62914,11.096239 51.027689,12.390862 C 52.206237,16.219183 53.864202,19.547084 54.536177,19.433168 C 54.682379,19.408383 54.751206,19.496844 54.689123,19.62975 C 54.531933,19.966244 55.859049,20.977488 56.21841,20.795044 C 56.401732,20.701969 56.444534,20.728466 56.338511,20.869384 C 56.129562,21.147113 57.111962,21.466307 58.175681,21.466307 L 58.967392,21.466307 L 58.967392,24.779767 L 58.967392,28.093226 L 54.703348,28.093226 L 50.439308,28.093226 L 50.439308,24.306414 z"
+       id="path5443"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:2.3397243;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:0.94117647" />
+  </g>
+  <g
+     id="layer3"
+     style="display:inline">
+    <path
+       d="M 40.696336,21.009229 L 49.97224,21.009229 L 49.97224,36.002295 L 40.696336,36.002295 L 40.696336,21.009229 z"
+       id="rect3643"
+       style="fill:#803f12;fill-opacity:1;fill-rule:evenodd;stroke:#803f12;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 13.688344,102.0789 L 23.651196,102.0789 L 23.651196,109.86101 L 13.688344,109.86101 L 13.688344,102.0789 z"
+       id="rect3645"
+       style="fill:#803f12;fill-opacity:1;fill-rule:evenodd;stroke:#803f12;stroke-width:0.95839912;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer4"
+     style="display:inline">
+    <path
+       d="M 31.685473,28.397117 L 40.696341,28.397117 L 40.696341,36.002295 L 31.685473,36.002295 L 31.685473,28.397117 z"
+       id="rect5178"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#bc6d2d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 31.950489,50.343494 L 40.43131,50.343494 L 40.43131,73.376323 L 31.950489,73.376323 L 31.950489,50.343494 z"
+       id="rect5182"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#bc6d2d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 22.409577,57.731383 L 31.950496,57.731383 L 31.950496,65.336559 L 22.409577,65.336559 L 22.409577,57.731383 z"
+       id="rect5184"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#bc6d2d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 76.474792,35.567712 L 85.750692,35.567712 L 85.750692,43.390179 L 76.474792,43.390179 L 76.474792,35.567712 z"
+       id="rect5186"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#bc6d2d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 33.010597,117.1604 L 41.491415,117.1604 L 41.491415,124.331 L 33.010597,124.331 L 33.010597,117.1604 z"
+       id="rect5205"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#c1742d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1;display:inline" />
+  </g>
+  <g
+     id="layer5"
+     style="display:inline">
+    <path
+       d="M 22.939624,36.002295 L 31.685469,36.002295 L 31.685469,43.390183 L 22.939624,43.390183 L 22.939624,36.002295 z"
+       id="rect5189"
+       style="fill:#7f3e13;fill-opacity:1;fill-rule:evenodd;stroke:#7f3e13;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 40.961365,109.88119 L 49.177155,109.88119 L 49.177155,116.8345 L 40.961365,116.8345 L 40.961365,109.88119 z"
+       id="rect5191"
+       style="fill:#7f3e13;fill-opacity:1;fill-rule:evenodd;stroke:#7f3e13;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer6"
+     style="display:inline">
+    <path
+       d="M 13.928757,110.31576 L 22.674601,110.31576 L 22.674601,124.43965 L 13.928757,124.43965 L 13.928757,110.31576 z"
+       id="rect5194"
+       style="fill:#8e4a19;fill-opacity:1;fill-rule:evenodd;stroke:#8e4a19;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 21.879517,43.172896 L 31.950486,43.172896 L 31.950486,50.995364 L 21.879517,50.995364 L 21.879517,43.172896 z"
+       id="rect5196"
+       style="fill:#8e4a19;fill-opacity:1;fill-rule:evenodd;stroke:#8e4a19;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer7"
+     style="display:inline">
+    <path
+       d="M 13.398704,87.282923 L 22.674605,87.282923 L 22.674605,101.40683 L 13.398704,101.40683 L 13.398704,87.282923 z"
+       id="rect5199"
+       style="fill:#6e310c;fill-opacity:1;fill-rule:evenodd;stroke:#6e310c;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer8"
+     style="display:inline">
+    <path
+       d="M 22.688423,116.84582 L 32.508785,116.84582 L 32.508785,124.42832 L 22.688423,124.42832 L 22.688423,116.84582 z"
+       id="rect5202"
+       style="fill:#c1742d;fill-opacity:1;fill-rule:evenodd;stroke:#c1742d;stroke-width:0.93885654;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer9"
+     style="display:inline">
+    <path
+       d="M 41.491413,117.48635 L 48.912128,117.48635 L 48.912128,124.22237 L 41.491413,124.22237 L 41.491413,117.48635 z"
+       id="rect5210"
+       style="fill:#9a531f;fill-opacity:0.94117647;fill-rule:evenodd;stroke:#9a531f;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:0.94117647" />
+  </g>
+  <g
+     id="layer10"
+     style="display:inline">
+    <path
+       d="M 22.97182,109.69029 L 32.713376,109.69029 L 32.713376,116.37351 L 22.97182,116.37351 L 22.97182,109.69029 z"
+       id="rect5213"
+       style="fill:#ac6226;fill-opacity:1;fill-rule:evenodd;stroke:#ac6226;stroke-width:0.97212332;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 59.054206,94.729113 L 69.618192,94.729113 L 69.618192,103.17309 L 59.054206,103.17309 L 59.054206,94.729113 z"
+       id="rect5215"
+       style="fill:#ac6226;fill-opacity:1;fill-rule:evenodd;stroke:#ac6226;stroke-width:1.04258394;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 94.761552,28.397117 L 103.77242,28.397117 L 103.77242,35.785005 L 94.761552,35.785005 L 94.761552,28.397117 z"
+       id="rect5217"
+       style="fill:#ac6226;fill-opacity:1;fill-rule:evenodd;stroke:#ac6226;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer11"
+     style="display:inline">
+    <path
+       d="M 33.010597,109.66389 L 40.961365,109.66389 L 40.961365,117.05178 L 33.010597,117.05178 L 33.010597,109.66389 z"
+       id="rect5220"
+       style="fill:#a55c23;fill-opacity:1;fill-rule:evenodd;stroke:#a55c23;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 31.155416,36.436876 L 40.696335,36.436876 L 40.696335,43.172893 L 31.155416,43.172893 L 31.155416,36.436876 z"
+       id="rect5222"
+       style="fill:#a55c23;fill-opacity:1;fill-rule:evenodd;stroke:#a55c23;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer12"
+     style="display:inline">
+    <path
+       d="M 22.409577,50.995367 L 31.685479,50.995367 L 31.685479,57.514092 L 22.409577,57.514092 L 22.409577,50.995367 z"
+       id="rect5225"
+       style="fill:#c77631;fill-opacity:1;fill-rule:evenodd;stroke:#c77631;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.707207,94.888123 L 58.718075,94.888123 L 58.718075,102.4933 L 49.707207,102.4933 L 49.707207,94.888123 z"
+       id="rect5227"
+       style="fill:#c77631;fill-opacity:1;fill-rule:evenodd;stroke:#c77631;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer13"
+     style="display:inline">
+    <path
+       d="M 22.939624,65.771144 L 31.155416,65.771144 L 31.155416,72.724451 L 22.939624,72.724451 L 22.939624,65.771144 z"
+       id="rect5230"
+       style="fill:#cb7c39;fill-opacity:1;fill-rule:evenodd;stroke:#cb7c39;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer14"
+     style="display:inline">
+    <path
+       d="M 22.674594,73.376313 L 31.950496,73.376313 L 31.950496,80.112333 L 22.674594,80.112333 L 22.674594,73.376313 z"
+       id="rect5233"
+       style="fill:#d28a4a;fill-opacity:1;fill-rule:evenodd;stroke:#d28a4a;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 31.950489,95.105403 L 48.912128,95.105403 L 48.912128,102.4933 L 31.950489,102.4933 L 31.950489,95.105403 z"
+       id="rect5235"
+       style="fill:#d28a4a;fill-opacity:1;fill-rule:evenodd;stroke:#d28a4a;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.972231,87.500203 L 58.9831,87.500203 L 58.9831,94.670803 L 49.972231,94.670803 L 49.972231,87.500203 z"
+       id="rect5237"
+       style="fill:#d28a4a;fill-opacity:1;fill-rule:evenodd;stroke:#d28a4a;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer15"
+     style="display:inline">
+    <path
+       d="M 23.204653,80.764203 L 32.215523,80.764203 L 32.215523,87.717513 L 23.204653,87.717513 L 23.204653,80.764203 z"
+       id="rect5240"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 41.491413,80.546903 L 49.442181,80.546903 L 49.442181,87.282913 L 41.491413,87.282913 L 41.491413,80.546903 z"
+       id="rect5242"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 32.215518,87.717493 L 49.177158,87.717493 L 49.177158,94.670803 L 32.215518,94.670803 L 32.215518,87.717493 z"
+       id="rect5244"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 41.226389,42.955605 L 49.972231,42.955605 L 49.972231,50.343494 L 41.226389,50.343494 L 41.226389,42.955605 z"
+       id="rect5246"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 76.474792,28.397117 L 86.280742,28.397117 L 86.280742,35.785005 L 76.474792,35.785005 L 76.474792,28.397117 z"
+       id="rect5248"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 58.453055,35.567712 L 68.259002,35.567712 L 68.259002,43.390179 L 58.453055,43.390179 L 58.453055,35.567712 z"
+       id="rect5250"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer16"
+     style="display:inline">
+    <path
+       d="M 22.939624,87.934783 L 31.685469,87.934783 L 31.685469,94.670803 L 22.939624,94.670803 L 22.939624,87.934783 z"
+       id="rect5254"
+       style="fill:#d99a5c;fill-opacity:1;fill-rule:evenodd;stroke:#d99a5c;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 32.122164,73.734353 L 49.535515,73.734353 L 49.535515,79.971563 L 32.122164,79.971563 L 32.122164,73.734353 z"
+       id="rect5256"
+       style="fill:#d99a5c;fill-opacity:1;fill-rule:evenodd;stroke:#d99a5c;stroke-width:1.22472548;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.442181,80.546903 L 58.453051,80.546903 L 58.453051,87.065623 L 49.442181,87.065623 L 49.442181,80.546903 z"
+       id="rect5258"
+       style="fill:#d99a5c;fill-opacity:1;fill-rule:evenodd;stroke:#d99a5c;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer17"
+     style="display:inline">
+    <path
+       d="M 22.409577,95.105403 L 31.420445,95.105403 L 31.420445,102.27599 L 22.409577,102.27599 L 22.409577,95.105403 z"
+       id="rect5260"
+       style="fill:#a85e25;fill-opacity:1;fill-rule:evenodd;stroke:#a85e25;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 68.719622,88.095163 L 76.544212,88.095163 L 76.544212,102.55018 L 68.719622,102.55018 L 68.719622,88.095163 z"
+       id="rect5262"
+       style="fill:#a85e25;fill-opacity:1;fill-rule:evenodd;stroke:#a85e25;stroke-width:1.26805162;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 40.696336,50.995367 L 49.97224,50.995367 L 49.97224,57.948673 L 40.696336,57.948673 L 40.696336,50.995367 z"
+       id="rect5264"
+       style="fill:#a85e25;fill-opacity:1;fill-rule:evenodd;stroke:#a85e25;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer18"
+     style="display:inline">
+    <path
+       d="M 32.215518,43.607475 L 40.96136,43.607475 L 40.96136,50.1262 L 32.215518,50.1262 L 32.215518,43.607475 z"
+       id="rect5267"
+       style="fill:#ce8240;fill-opacity:1;fill-rule:evenodd;stroke:#ce8240;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer19"
+     style="display:inline">
+    <path
+       d="M 32.215518,80.764203 L 40.96136,80.764203 L 40.96136,87.717513 L 32.215518,87.717513 L 32.215518,80.764203 z"
+       id="rect5270"
+       style="fill:#f2dcaf;fill-opacity:1;fill-rule:evenodd;stroke:#f2dcaf;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 50.237258,35.785003 L 58.453051,35.785003 L 58.453051,43.172893 L 50.237258,43.172893 L 50.237258,35.785003 z"
+       id="rect5272"
+       style="fill:#f2dcaf;fill-opacity:1;fill-rule:evenodd;stroke:#f2dcaf;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 58.718079,28.614406 L 67.993972,28.614406 L 67.993972,34.91584 L 58.718079,34.91584 L 58.718079,28.614406 z"
+       id="rect5274"
+       style="fill:#f2dcaf;fill-opacity:1;fill-rule:evenodd;stroke:#f2dcaf;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer20"
+     style="display:inline">
+    <path
+       d="M 67.728952,28.614406 L 77.534902,28.614406 L 77.534902,35.785003 L 67.728952,35.785003 L 67.728952,28.614406 z"
+       id="rect5281"
+       style="fill:#e9c38f;fill-opacity:1;fill-rule:evenodd;stroke:#e9c38f;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer21"
+     style="display:inline">
+    <path
+       d="M 86.545762,28.179826 L 95.026582,28.179826 L 95.026582,36.002295 L 86.545762,36.002295 L 86.545762,28.179826 z"
+       id="rect5284"
+       style="fill:#ce8240;fill-opacity:1;fill-rule:evenodd;stroke:#ce8240;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer22"
+     style="display:inline">
+    <path
+       d="M 67.728952,36.436876 L 76.739822,36.436876 L 76.739822,43.607475 L 67.728952,43.607475 L 67.728952,36.436876 z"
+       id="rect5287"
+       style="fill:#d69455;fill-opacity:1;fill-rule:evenodd;stroke:#d69455;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.972231,43.824766 L 58.9831,43.824766 L 58.9831,50.1262 L 49.972231,50.1262 L 49.972231,43.824766 z"
+       id="rect5289"
+       style="fill:#d69455;fill-opacity:1;fill-rule:evenodd;stroke:#d69455;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer23"
+     style="display:inline">
+    <path
+       d="M 60.043202,44.042064 L 67.728942,44.042064 L 67.728942,50.343494 L 60.043202,50.343494 L 60.043202,44.042064 z"
+       id="rect5292"
+       style="fill:#954f1d;fill-opacity:1;fill-rule:evenodd;stroke:#954f1d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer24"
+     style="display:inline">
+    <path
+       d="M 49.972231,50.778076 L 58.9831,50.778076 L 58.9831,57.94867 L 49.972231,57.94867 L 49.972231,50.778076 z"
+       id="rect5295"
+       style="fill:#86451b;fill-opacity:1;fill-rule:evenodd;stroke:#86451b;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer25"
+     style="display:inline">
+    <path
+       d="M 40.696336,65.771144 L 49.707204,65.771144 L 49.707204,73.159033 L 40.696336,73.159033 L 40.696336,65.771144 z"
+       id="rect5298"
+       style="fill:#dfae85;fill-opacity:1;fill-rule:evenodd;stroke:#dfae85;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.972231,58.817833 L 58.718075,58.817833 L 58.718075,65.119268 L 49.972231,65.119268 L 49.972231,58.817833 z"
+       id="rect5300"
+       style="fill:#dfae85;fill-opacity:1;fill-rule:evenodd;stroke:#dfae85;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer26"
+     style="display:inline">
+    <path
+       d="M 50.008357,72.754054 L 58.946983,72.754054 L 58.946983,80.300003 L 50.008357,80.300003 L 50.008357,72.754054 z"
+       id="rect5303"
+       style="fill:#ebebea;fill-opacity:1;fill-rule:evenodd;stroke:#ebebea;stroke-width:0.97923964;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 85.750692,94.670823 L 113.04832,94.670823 L 113.04832,101.84141 L 85.750692,101.84141 L 85.750692,94.670823 z"
+       id="rect5305"
+       style="fill:#ebebea;fill-opacity:1;fill-rule:evenodd;stroke:#ebebea;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 104.03746,87.500203 L 113.04832,87.500203 L 113.04832,95.105383 L 104.03746,95.105383 L 104.03746,87.500203 z"
+       id="rect5307"
+       style="fill:#ebebea;fill-opacity:1;fill-rule:evenodd;stroke:#ebebea;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer27"
+     style="display:inline">
+    <path
+       d="M 59.248129,58.383248 L 67.728952,58.383248 L 67.728952,65.336555 L 59.248129,65.336555 L 59.248129,58.383248 z"
+       id="rect5310"
+       style="fill:#b47b50;fill-opacity:1;fill-rule:evenodd;stroke:#b47b50;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer28"
+     style="display:inline">
+    <path
+       d="M 58.983104,80.329623 L 67.728952,80.329623 L 67.728952,94.888103 L 58.983104,94.888103 L 58.983104,80.329623 z"
+       id="rect5313"
+       style="fill:#b4682c;fill-opacity:1;fill-rule:evenodd;stroke:#b4682c;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer29"
+     style="display:inline">
+    <path
+       d="M 59.400806,73.401843 L 67.596712,73.401843 L 67.596712,79.917383 L 59.400806,79.917383 L 59.400806,73.401843 z"
+       id="rect5316"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 85.848322,65.317265 L 112.79729,65.317265 L 112.79729,72.525629 L 85.848322,72.525629 L 85.848322,65.317265 z"
+       id="rect5320"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.92899066;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 113.86393,72.75029 L 122.05984,72.75029 L 122.05984,102.93898 L 113.86393,102.93898 L 113.86393,72.75029 z"
+       id="rect5322"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 103.28857,102.07023 L 113.33517,102.07023 L 113.33517,109.6717 L 103.28857,109.6717 L 103.28857,102.07023 z"
+       id="rect5324"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 68.661572,110.11208 L 103.54563,110.11208 L 103.54563,117.26868 L 68.661572,117.26868 L 68.661572,110.11208 z"
+       id="rect5326"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.9257676;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 122.01276,28.343441 C 117.73153,29.46205 114.05228,31.272979 113.0237,36.132341 C 107.78173,37.141793 104.39383,39.439991 103.41895,43.415471 C 97.116922,45.301608 88.007482,43.23424 85.810242,50.900906 C 66.245092,52.87002 74.473492,57.824466 86.302792,58.184036"
+       id="path5428"
+       style="fill:none;fill-rule:evenodd;stroke:#242909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 67.955262,58.184036 L 76.944322,58.285188"
+       id="path5430"
+       style="fill:none;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 68.713662,58.09143 L 68.190322,58.052712 L 68.190322,54.568696 L 68.190322,51.084679 L 75.356952,51.084679 C 79.298592,51.084679 84.545322,51.691054 84.480982,51.737924 C 84.416642,51.784799 81.652362,51.360209 80.873512,51.488644 C 79.166072,51.770216 76.894972,52.360562 75.846322,52.795411 C 74.468042,53.366959 73.800602,54.132484 74.028942,54.879863 C 74.378402,56.02365 77.566652,57.274397 81.589612,57.84591 C 82.355962,57.954781 83.016282,58.071225 83.057002,58.104677 C 83.135832,58.169424 69.598852,58.156927 68.713662,58.091433 L 68.713662,58.09143 z"
+       id="path5432"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.24998963;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 85.922152,46.487205 L 85.922142,43.376702 L 94.314342,43.403393 C 98.930062,43.418071 101.27156,43.685846 101.23436,43.716412 C 101.01538,43.896296 100.21572,43.998509 96.327312,44.439092 C 95.311432,44.554195 93.909222,44.76027 93.211302,44.897029 C 89.791782,45.567113 87.696962,46.8534 86.503142,49.016069 C 86.326552,49.335971 86.123592,49.597708 86.052122,49.597708 C 85.963762,49.597708 85.922172,48.602138 85.922152,46.487205 L 85.922152,46.487205 z"
+       id="path5434"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.24998963;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 113.13562,31.491043 L 113.13562,28.456405 L 117.09656,28.456405 C 119.27507,28.456405 120.56622,28.62735 120.538,28.648257 C 120.50978,28.669164 120.48387,28.701243 119.9082,28.907569 C 116.98937,29.953715 115.18887,31.290601 114.02377,33.276828 C 113.75766,33.730476 113.50957,34.197053 113.47245,34.313662 C 113.43533,34.430272 113.34435,34.52568 113.27029,34.52568 C 113.17581,34.52568 113.13562,33.619885 113.13562,31.491043 z"
+       id="path5436"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.24998963;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 68.322722,117.40761 C 62.020252,117.99182 60.361175,121.21677 58.905614,124.55747"
+       id="path5505"
+       style="fill:#523526;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 59.246954,116.48617 L 59.246954,109.98097 L 63.170752,109.98097 C 66.563452,109.98097 67.094542,110.00476 67.094542,110.15678 C 67.094542,110.27958 67.245162,110.3326 67.593942,110.3326 L 68.093332,110.3326 L 68.093332,113.83367 L 68.093332,117.33475 L 67.201562,117.4709 C 63.938792,117.96903 61.691228,119.3823 60.146439,121.90717 C 59.781599,122.50348 59.429963,122.99137 59.365024,122.99137 C 59.300093,122.99137 59.246954,120.06403 59.246954,116.48617 z"
+       id="path5507"
+       style="opacity:1;fill:#523526;fill-opacity:1;fill-rule:evenodd;stroke:#523526;stroke-width:1.44840074;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer30"
+     style="display:inline">
+    <path
+       d="M 68.259002,57.94867 L 77.269872,57.94867 L 77.269872,65.553849 L 68.259002,65.553849 L 68.259002,57.94867 z"
+       id="rect5329"
+       style="fill:#804017;fill-opacity:1;fill-rule:evenodd;stroke:#804017;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer31"
+     style="display:inline">
+    <path
+       d="M 67.463912,65.771144 L 77.004832,65.771144 L 77.004832,73.159033 L 67.463912,73.159033 L 67.463912,65.771144 z"
+       id="rect5332"
+       style="fill:#936a48;fill-opacity:1;fill-rule:evenodd;stroke:#936a48;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer32"
+     style="display:inline">
+    <path
+       d="M 67.993972,73.810883 L 77.534902,73.810883 L 77.534902,87.717503 L 67.993972,87.717503 L 67.993972,73.810883 z"
+       id="rect5341"
+       style="fill:#c27739;fill-opacity:1;fill-rule:evenodd;stroke:#c27739;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer33"
+     style="display:inline">
+    <path
+       d="M 67.728952,103.36245 L 76.474792,103.36245 L 76.474792,109.88117 L 67.728952,109.88117 L 67.728952,103.36245 z"
+       id="rect5344"
+       style="fill:#727476;fill-opacity:1;fill-rule:evenodd;stroke:#727476;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 86.015712,80.764203 L 95.026582,80.764203 L 95.026582,87.500223 L 86.015712,87.500223 L 86.015712,80.764203 z"
+       id="rect5346"
+       style="fill:#727476;fill-opacity:1;fill-rule:evenodd;stroke:#727476;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer34"
+     style="display:inline">
+    <path
+       d="M 77.562952,64.924974 L 85.457612,64.924974 L 85.457612,72.484149 L 77.562952,72.484149 L 77.562952,64.924974 z"
+       id="rect5349"
+       style="fill:#a7602a;fill-opacity:1;fill-rule:evenodd;stroke:#a7602a;stroke-width:0.96462673;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer35"
+     style="display:inline">
+    <path
+       d="M 77.004842,72.941727 L 85.750682,72.941727 L 85.750682,80.329613 L 77.004842,80.329613 L 77.004842,72.941727 z"
+       id="rect5352"
+       style="fill:#cc914e;fill-opacity:1;fill-rule:evenodd;stroke:#cc914e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer36"
+     style="display:inline">
+    <path
+       d="M 77.534902,80.329623 L 85.750692,80.329623 L 85.750692,88.152083 L 77.534902,88.152083 L 77.534902,80.329623 z"
+       id="rect5355"
+       style="fill:#c18c57;fill-opacity:1;fill-rule:evenodd;stroke:#c18c57;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer37"
+     style="display:inline">
+    <path
+       d="M 77.004842,88.803973 L 85.485652,88.803973 L 85.485652,94.888103 L 77.004842,94.888103 L 77.004842,88.803973 z"
+       id="rect5358"
+       style="fill:#c1a080;fill-opacity:1;fill-rule:evenodd;stroke:#c1a080;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer38"
+     style="display:inline">
+    <path
+       d="M 85.750692,88.152083 L 95.291612,88.152083 L 95.291612,95.105383 L 85.750692,95.105383 L 85.750692,88.152083 z"
+       id="rect5361"
+       style="fill:#c5c5c1;fill-opacity:1;fill-rule:evenodd;stroke:#c5c5c1;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 104.56752,72.941727 L 113.04833,72.941727 L 113.04833,80.329613 L 104.56752,80.329613 L 104.56752,72.941727 z"
+       id="rect5363"
+       style="fill:#c5c5c1;fill-opacity:1;fill-rule:evenodd;stroke:#c5c5c1;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer39"
+     style="display:inline">
+    <path
+       d="M 85.750692,73.159023 L 94.761552,73.159023 L 94.761552,80.329623 L 85.750692,80.329623 L 85.750692,73.159023 z"
+       id="rect5366"
+       style="fill:#e6d2ba;fill-opacity:1;fill-rule:evenodd;stroke:#e6d2ba;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer40"
+     style="display:inline">
+    <path
+       d="M 77.004842,95.539983 L 85.750682,95.539983 L 85.750682,102.71057 L 77.004842,102.71057 L 77.004842,95.539983 z"
+       id="rect5369"
+       style="fill:#c5b39f;fill-opacity:1;fill-rule:evenodd;stroke:#c5b39f;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer41"
+     style="display:inline">
+    <path
+       d="M 77.004842,103.57975 L 85.750682,103.57975 L 85.750682,109.66389 L 77.004842,109.66389 L 77.004842,103.57975 z"
+       id="rect5374"
+       style="fill:#a0a09e;fill-opacity:1;fill-rule:evenodd;stroke:#a0a09e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer42"
+     style="display:inline">
+    <path
+       d="M 86.280742,102.49327 L 94.761572,102.49327 L 94.761572,109.44659 L 86.280742,109.44659 L 86.280742,102.49327 z"
+       id="rect5377"
+       style="fill:#aaaaa6;fill-opacity:1;fill-rule:evenodd;stroke:#aaaaa6;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer43"
+     style="display:inline">
+    <path
+       d="M 94.292382,102.54319 L 102.38643,102.54319 L 102.38643,110.04856 L 94.292382,110.04856 L 94.292382,102.54319 z"
+       id="rect5380"
+       style="fill:#a4a5a2;fill-opacity:1;fill-rule:evenodd;stroke:#a4a5a2;stroke-width:1.02406108;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer44"
+     style="display:inline">
+    <path
+       d="M 95.556632,80.546903 L 104.03745,80.546903 L 104.03745,87.717503 L 95.556632,87.717503 L 95.556632,80.546903 z"
+       id="rect5383"
+       style="fill:#171614;fill-opacity:1;fill-rule:evenodd;stroke:#171614;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer45"
+     style="display:inline">
+    <path
+       d="M 95.556632,88.152083 L 103.24237,88.152083 L 103.24237,94.453513 L 95.556632,94.453513 L 95.556632,88.152083 z"
+       id="rect5386"
+       style="fill:#a0a09e;fill-opacity:1;fill-rule:evenodd;stroke:#a0a09e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="128"
+   height="128"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5499">
+      <stop
+         id="stop5501"
+         style="stop-color:#414041;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5503"
+         style="stop-color:#414041;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="217.46033"
+       cy="1267.6486"
+       r="51.293652"
+       fx="217.46033"
+       fy="1267.6486"
+       id="radialGradient5485"
+       xlink:href="#linearGradient5499"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.7231807,0,-916.73904)" />
+  </defs>
+  <g
+     id="layer2"
+     style="display:inline">
+    <path
+       d="M 39.340653,6.101704 L 49.585554,6.101704 L 49.585554,21.033173 L 39.340653,21.033173 L 39.340653,6.101704 z"
+       id="rect3606"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.97238445;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 31.157195,13.930587 L 40.319663,13.930587 L 40.319663,28.407229 L 31.157195,28.407229 L 31.157195,13.930587 z"
+       id="rect3608"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.9949488;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 22.935572,20.962037 L 31.335333,20.962037 L 31.335333,36.615875 L 22.935572,36.615875 L 22.935572,20.962037 z"
+       id="rect3610"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.98637319;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 13.926738,36.046062 L 22.651414,36.046062 L 22.651414,87.736033 L 13.926738,87.736033 L 13.926738,36.046062 z"
+       id="rect3612"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 3.9349289,58.026734 L 14.136332,58.026734 L 14.136332,65.321003 L 3.9349289,65.321003 L 3.9349289,58.026734 z"
+       id="rect3614"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.01180661;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 5.2020639,72.75029 L 15.930324,72.75029 L 15.930324,80.351753 L 5.2020639,80.351753 L 5.2020639,72.75029 z"
+       id="rect3616"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 4.3420179,87.518853 L 13.926736,87.518853 L 13.926736,124.65744 L 4.3420179,124.65744 L 4.3420179,87.518853 z"
+       id="rect3618"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 23.180182,102.50459 L 67.596712,102.50459 L 67.596712,109.88887 L 23.180182,109.88887 L 23.180182,102.50459 z"
+       id="rect3620"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 49.35421,109.6717 L 59.136423,109.6717 L 59.136423,124.65745 L 49.35421,124.65745 L 49.35421,109.6717 z"
+       id="rect3622"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 40.629533,57.981725 L 49.882979,57.981725 L 49.882979,65.800377 L 40.629533,65.800377 L 40.629533,57.981725 z"
+       id="rect3624"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 59.136423,50.814627 L 68.125482,50.814627 L 68.125482,58.198909 L 59.136423,58.198909 L 59.136423,50.814627 z"
+       id="rect3626"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 76.850162,58.198909 L 86.367982,58.198909 L 86.367982,64.931639 L 76.850162,64.931639 L 76.850162,58.198909 z"
+       id="rect3628"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 68.125482,43.21316 L 85.839222,43.21316 L 85.839222,51.031811 L 68.125482,51.031811 L 68.125482,43.21316 z"
+       id="rect3630"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 86.103602,36.046062 L 103.55295,36.046062 L 103.55295,43.430344 L 86.103602,43.430344 L 86.103602,36.046062 z"
+       id="rect3632"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 102.88048,28.252166 L 113.04064,28.252166 L 113.04064,36.23849 L 102.88048,36.23849 L 102.88048,28.252166 z"
+       id="rect3634"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.96712023;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 62.593752,21.060315 L 118.86689,21.060315 C 120.78226,21.060315 122.32423,22.327003 122.32423,23.900423 L 122.32423,25.604488 C 122.32423,27.177906 120.78226,28.444596 118.86689,28.444596 L 62.593752,28.444596 C 60.678393,28.444596 59.136423,27.177906 59.136423,25.604488 L 59.136423,23.900423 C 59.136423,22.327003 60.678393,21.060315 62.593752,21.060315 z"
+       id="rect3636"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 49.35421,28.661781 L 58.34327,28.661781 L 58.34327,35.394509 L 49.35421,35.394509 L 49.35421,28.661781 z"
+       id="rect5277"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 41.158301,36.480431 L 50.147361,36.480431 L 50.147361,42.995976 L 41.158301,42.995976 L 41.158301,36.480431 z"
+       id="rect5279"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 39.215793,5.939705 C 38.715223,9.330421 36.588834,12.195726 31.264256,14.027471 C 30.314454,17.008113 28.936283,19.808787 23.591719,20.943099 C 21.24108,26.303546 21.981111,32.80014 14.245173,36.180923"
+       id="path5394"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.08055982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 32.240586,13.806817 C 32.240586,13.743663 32.501332,13.582713 32.820026,13.449153 C 35.443975,12.349496 37.451683,10.628408 38.451783,8.621384 C 38.716785,8.089573 39.00076,7.636067 39.08284,7.613591 C 39.18425,7.585822 39.232075,8.59004 39.232075,10.747186 L 39.232075,13.921648 L 35.736331,13.921648 C 33.549304,13.921648 32.240586,13.878655 32.240586,13.806817 z"
+       id="path5396"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.44840074;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 25.249095,20.647913 C 25.249095,20.588997 25.668955,20.34791 26.182118,20.112165 C 28.087776,19.236715 29.689218,17.666857 30.45964,15.918998 C 31.026416,14.633163 31.099119,14.862044 31.099119,17.93221 L 31.099119,20.755038 L 28.174106,20.755038 C 26.502853,20.755038 25.249095,20.709122 25.249095,20.647915 L 25.249095,20.647913 z"
+       id="path5398"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.44840074;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 14.690515,35.894974 C 14.690515,35.841365 14.995502,35.634543 15.368263,35.435369 C 15.741024,35.236193 16.434957,34.765793 16.91034,34.390033 C 19.142521,32.625632 20.280821,30.70527 21.514754,26.622187 C 21.815628,25.626596 22.136862,24.791471 22.228609,24.766347 C 22.354366,24.731914 22.395425,26.10787 22.395425,30.356558 L 22.395425,35.992445 L 18.542971,35.992445 C 16.424121,35.992445 14.690515,35.948583 14.690515,35.894974 L 14.690515,35.894974 z"
+       id="path5400"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.44840074;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 30.786969,14.032631 C 29.888352,15.098906 29.383947,17.892502 29.383947,17.892502 L 24.696345,20.430284 C 28.746586,18.151073 21.755507,21.213217 22.300034,21.742622 L 20.402955,27.566126"
+       id="path5402"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 23.518191,21.403041 C 23.518191,21.377518 23.561591,21.290021 23.614635,21.208601 C 23.707567,21.065954 23.738905,21.066012 24.475263,21.210127 C 24.895567,21.292385 25.264031,21.379885 25.294078,21.404567 C 25.324123,21.429248 24.936841,21.449443 24.433448,21.449443 C 23.930058,21.449443 23.518191,21.428562 23.518191,21.403038 L 23.518191,21.403041 z"
+       id="path5404"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.01355422;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 22.281231,23.559817 C 22.22932,23.448688 22.190453,23.442742 22.066825,23.52703 C 21.983775,23.583648 17.702616,34.061396 17.674025,34.03791 C 17.566511,33.949593 22.383089,21.784558 22.551131,21.707306 C 22.677071,21.649408 22.71942,21.661927 22.71942,21.757047 C 22.71942,21.826955 22.76435,21.884154 22.819267,21.884154 C 22.971338,21.884154 22.928404,22.433727 22.726627,23.069912 C 22.543681,23.646732 22.397133,23.807929 22.281231,23.559819 L 22.281231,23.559817 z"
+       id="path5406"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.01355422;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 3.8865129,58.026209 L 13.417082,36.229233"
+       id="path5408"
+       style="fill:none;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 4.2432109,58.01539 C 6.0023709,53.959739 13.749314,36.350054 13.777925,36.323778 C 13.800676,36.302879 13.551363,36.433894 13.673351,36.450824 L 13.895146,36.481609 L 13.895146,47.242734 L 13.895146,58.003862 L 8.9345419,58.003862 C 4.9892949,58.003862 3.9788699,57.992482 3.9980529,57.948259 L 4.2432109,58.01539 z"
+       id="path5410"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.5496943;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 3.9948139,65.232557 C 17.815786,69.93296 -1.6730071,70.712716 5.2944389,80.312513 C 17.882508,85.190263 4.6756049,87.017783 4.9695319,87.518853"
+       id="path5412"
+       style="fill:none;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 5.4475989,72.707309 C 5.4475989,72.63919 6.1996769,71.917446 7.0975699,71.123879 C 8.4418519,69.935795 8.8689969,69.45839 9.0530499,68.938297 C 9.4358499,67.856598 8.4672979,66.939089 5.7860419,65.843439 C 5.2425019,65.621329 4.7977859,65.422426 4.7977859,65.401427 C 4.7977859,65.380433 6.8446919,65.363253 9.3464679,65.363253 L 13.895146,65.363253 L 13.895146,69.055394 L 13.895146,72.747536 L 9.6713719,72.747536 C 7.1895439,72.747536 5.4475989,72.730944 5.4475989,72.707305 L 5.4475989,72.707309 z"
+       id="path5414"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.5496943;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 4.9222249,79.623243 C 4.2438179,78.553773 3.8931479,77.554243 3.8385399,76.534383 C 3.7911589,75.649463 3.9740649,74.882093 4.4229169,74.082633 C 4.6757749,73.632263 5.0597369,73.095273 5.1289049,73.095273 C 5.1563029,73.095273 5.1768429,74.543943 5.1768429,76.476023 C 5.1768429,78.661593 5.1580209,79.856783 5.1236049,79.856783 C 5.0943249,79.856783 5.0037019,79.751683 4.9222229,79.623243 L 4.9222249,79.623243 z"
+       id="path5416"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.5496943;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 5.1902089,87.452783 C 5.2025249,87.422423 5.7711109,87.216513 6.4537339,86.995183 C 8.5168459,86.326253 9.5029579,85.874823 10.158427,85.299213 C 10.621074,84.892933 10.780652,84.603983 10.781113,84.171693 C 10.781711,83.609253 10.505878,83.164493 9.7919699,82.576753 C 9.0910579,81.999733 8.2131769,81.504303 6.7066059,80.835563 C 6.2524159,80.633953 5.8808049,80.451363 5.8808049,80.429793 C 5.8808049,80.407523 7.6121159,80.390583 9.8879759,80.390583 L 13.895146,80.390583 L 13.895146,83.949273 L 13.895146,87.507973 L 9.5314839,87.507973 C 6.0823689,87.507973 5.1725119,87.496393 5.1902109,87.452783 L 5.1902089,87.452783 z"
+       id="path5418"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.5496943;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 103.84118,117.37931 C 106.90063,117.46172 111.28174,115.03097 114.69114,110.76294 C 121.73297,105.18527 120.26144,105.10684 122.47916,103.32636 L 123.41106,100.0455 C 125.17559,94.607773 125.16257,90.099283 125.0086,85.664463 C 124.30407,80.940603 124.42065,73.807723 122.61228,72.322348 C 119.26626,69.620488 114.29713,64.156705 113.16017,65.213846"
+       id="path5420"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 104.09881,113.70195 L 104.09881,110.08404 L 108.92101,110.08404 L 113.74321,110.08404 L 113.74321,106.72014 L 113.74321,103.35623 L 117.87652,103.35623 C 120.14985,103.35623 122.00984,103.3714 122.00984,103.38994 C 122.00984,103.40849 121.84786,103.5695 121.6499,103.74778 C 121.45193,103.92605 121.03172,104.39701 120.71612,104.79436 C 120.4005,105.19169 119.98138,105.70139 119.78474,105.92702 C 118.9688,106.86323 117.10725,108.57377 115.49818,109.86582 C 114.82644,110.40522 114.446,110.76659 114.00864,111.28067 C 112.12513,113.49463 110.14112,115.11955 107.97836,116.21953 C 106.86363,116.78649 105.49533,117.21165 104.54959,117.28492 L 104.09881,117.31986 L 104.09881,113.70195 z"
+       id="path5422"
+       style="opacity:1;fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.67093682;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 122.60629,87.332123 C 122.60629,75.538783 122.62307,72.563528 122.68949,72.580671 C 122.83029,72.617008 123.18859,73.229963 123.37059,73.745833 C 123.83201,75.053703 124.0652,76.646863 124.4708,81.262553 C 124.58311,82.540713 124.73356,84.047843 124.80512,84.611713 C 124.98036,85.992613 125.04506,88.963083 124.94239,90.913713 C 124.8154,93.326083 124.56138,95.232103 124.10432,97.202003 C 123.78141,98.593733 122.77124,102.05988 122.68138,102.08449 C 122.62576,102.09971 122.60629,98.274943 122.60629,87.332123 z"
+       id="path5424"
+       style="opacity:1;fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.67570281;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 113.37002,68.729453 C 113.38968,64.636295 113.3168,64.995766 114.06556,65.298576 C 114.96226,65.661208 116.18831,66.638662 119.17395,69.371208 C 120.15974,70.273441 121.27871,71.274101 121.66053,71.594901 C 122.04621,71.918956 122.33492,72.204494 122.31017,72.237398 C 122.2789,72.278966 120.93649,72.29663 117.80925,72.29663 L 113.3529,72.29663 L 113.37002,68.729453 z"
+       id="path5426"
+       style="opacity:1;fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.67570281;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 103.65401,38.976483 L 103.65401,36.245307 L 107.68062,36.245307 C 109.89525,36.245307 111.9355,35.820016 111.87115,35.864294 C 111.80681,35.908568 111.25162,36.465668 110.98071,36.538209 C 110.0245,36.79425 108.00086,37.675422 107.1564,38.203454 C 106.06111,38.888346 105.04135,39.88627 104.39683,40.90394 C 104.11687,41.34598 103.83521,41.707651 103.77092,41.707651 C 103.70002,41.707651 103.65401,40.632735 103.65401,38.976483 z"
+       id="path5438"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.24998963;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 49.598255,6.19708 C 52.270524,19.619097 55.844786,22.297105 59.739759,21.154985"
+       id="path5440"
+       style="fill:none;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.94117647;display:inline" />
+    <path
+       d="M 50.439308,24.306414 C 50.439308,21.066587 50.389369,20.519603 50.093576,20.519603 C 49.794461,20.519603 49.74784,19.802562 49.74784,15.20229 C 49.74784,11.139896 49.813358,9.902915 50.025448,9.96099 C 50.178128,10.0028 50.62914,11.096239 51.027689,12.390862 C 52.206237,16.219183 53.864202,19.547084 54.536177,19.433168 C 54.682379,19.408383 54.751206,19.496844 54.689123,19.62975 C 54.531933,19.966244 55.859049,20.977488 56.21841,20.795044 C 56.401732,20.701969 56.444534,20.728466 56.338511,20.869384 C 56.129562,21.147113 57.111962,21.466307 58.175681,21.466307 L 58.967392,21.466307 L 58.967392,24.779767 L 58.967392,28.093226 L 54.703348,28.093226 L 50.439308,28.093226 L 50.439308,24.306414 z"
+       id="path5443"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:2.3397243;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:0.94117647" />
+  </g>
+  <g
+     id="layer3"
+     style="display:inline">
+    <path
+       d="M 40.696336,21.009229 L 49.97224,21.009229 L 49.97224,36.002295 L 40.696336,36.002295 L 40.696336,21.009229 z"
+       id="rect3643"
+       style="fill:#803f12;fill-opacity:1;fill-rule:evenodd;stroke:#803f12;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 13.688344,102.0789 L 23.651196,102.0789 L 23.651196,109.86101 L 13.688344,109.86101 L 13.688344,102.0789 z"
+       id="rect3645"
+       style="fill:#803f12;fill-opacity:1;fill-rule:evenodd;stroke:#803f12;stroke-width:0.95839912;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer4"
+     style="display:inline">
+    <path
+       d="M 31.685473,28.397117 L 40.696341,28.397117 L 40.696341,36.002295 L 31.685473,36.002295 L 31.685473,28.397117 z"
+       id="rect5178"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#bc6d2d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 31.950489,50.343494 L 40.43131,50.343494 L 40.43131,73.376323 L 31.950489,73.376323 L 31.950489,50.343494 z"
+       id="rect5182"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#bc6d2d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 22.409577,57.731383 L 31.950496,57.731383 L 31.950496,65.336559 L 22.409577,65.336559 L 22.409577,57.731383 z"
+       id="rect5184"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#bc6d2d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 76.474792,35.567712 L 85.750692,35.567712 L 85.750692,43.390179 L 76.474792,43.390179 L 76.474792,35.567712 z"
+       id="rect5186"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#bc6d2d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 33.010597,117.1604 L 41.491415,117.1604 L 41.491415,124.331 L 33.010597,124.331 L 33.010597,117.1604 z"
+       id="rect5205"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#c1742d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1;display:inline" />
+  </g>
+  <g
+     id="layer5"
+     style="display:inline">
+    <path
+       d="M 22.939624,36.002295 L 31.685469,36.002295 L 31.685469,43.390183 L 22.939624,43.390183 L 22.939624,36.002295 z"
+       id="rect5189"
+       style="fill:#7f3e13;fill-opacity:1;fill-rule:evenodd;stroke:#7f3e13;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 40.961365,109.88119 L 49.177155,109.88119 L 49.177155,116.8345 L 40.961365,116.8345 L 40.961365,109.88119 z"
+       id="rect5191"
+       style="fill:#7f3e13;fill-opacity:1;fill-rule:evenodd;stroke:#7f3e13;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer6"
+     style="display:inline">
+    <path
+       d="M 13.928757,110.31576 L 22.674601,110.31576 L 22.674601,124.43965 L 13.928757,124.43965 L 13.928757,110.31576 z"
+       id="rect5194"
+       style="fill:#8e4a19;fill-opacity:1;fill-rule:evenodd;stroke:#8e4a19;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 21.879517,43.172896 L 31.950486,43.172896 L 31.950486,50.995364 L 21.879517,50.995364 L 21.879517,43.172896 z"
+       id="rect5196"
+       style="fill:#8e4a19;fill-opacity:1;fill-rule:evenodd;stroke:#8e4a19;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer7"
+     style="display:inline">
+    <path
+       d="M 13.398704,87.282923 L 22.674605,87.282923 L 22.674605,101.40683 L 13.398704,101.40683 L 13.398704,87.282923 z"
+       id="rect5199"
+       style="fill:#6e310c;fill-opacity:1;fill-rule:evenodd;stroke:#6e310c;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer8"
+     style="display:inline">
+    <path
+       d="M 22.688423,116.84582 L 32.508785,116.84582 L 32.508785,124.42832 L 22.688423,124.42832 L 22.688423,116.84582 z"
+       id="rect5202"
+       style="fill:#c1742d;fill-opacity:1;fill-rule:evenodd;stroke:#c1742d;stroke-width:0.93885654;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer9"
+     style="display:inline">
+    <path
+       d="M 41.491413,117.48635 L 48.912128,117.48635 L 48.912128,124.22237 L 41.491413,124.22237 L 41.491413,117.48635 z"
+       id="rect5210"
+       style="fill:#9a531f;fill-opacity:0.94117647;fill-rule:evenodd;stroke:#9a531f;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:0.94117647" />
+  </g>
+  <g
+     id="layer10"
+     style="display:inline">
+    <path
+       d="M 22.97182,109.69029 L 32.713376,109.69029 L 32.713376,116.37351 L 22.97182,116.37351 L 22.97182,109.69029 z"
+       id="rect5213"
+       style="fill:#ac6226;fill-opacity:1;fill-rule:evenodd;stroke:#ac6226;stroke-width:0.97212332;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 59.054206,94.729113 L 69.618192,94.729113 L 69.618192,103.17309 L 59.054206,103.17309 L 59.054206,94.729113 z"
+       id="rect5215"
+       style="fill:#ac6226;fill-opacity:1;fill-rule:evenodd;stroke:#ac6226;stroke-width:1.04258394;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 94.761552,28.397117 L 103.77242,28.397117 L 103.77242,35.785005 L 94.761552,35.785005 L 94.761552,28.397117 z"
+       id="rect5217"
+       style="fill:#ac6226;fill-opacity:1;fill-rule:evenodd;stroke:#ac6226;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer11"
+     style="display:inline">
+    <path
+       d="M 33.010597,109.66389 L 40.961365,109.66389 L 40.961365,117.05178 L 33.010597,117.05178 L 33.010597,109.66389 z"
+       id="rect5220"
+       style="fill:#a55c23;fill-opacity:1;fill-rule:evenodd;stroke:#a55c23;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 31.155416,36.436876 L 40.696335,36.436876 L 40.696335,43.172893 L 31.155416,43.172893 L 31.155416,36.436876 z"
+       id="rect5222"
+       style="fill:#a55c23;fill-opacity:1;fill-rule:evenodd;stroke:#a55c23;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer12"
+     style="display:inline">
+    <path
+       d="M 22.409577,50.995367 L 31.685479,50.995367 L 31.685479,57.514092 L 22.409577,57.514092 L 22.409577,50.995367 z"
+       id="rect5225"
+       style="fill:#c77631;fill-opacity:1;fill-rule:evenodd;stroke:#c77631;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.707207,94.888123 L 58.718075,94.888123 L 58.718075,102.4933 L 49.707207,102.4933 L 49.707207,94.888123 z"
+       id="rect5227"
+       style="fill:#c77631;fill-opacity:1;fill-rule:evenodd;stroke:#c77631;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer13"
+     style="display:inline">
+    <path
+       d="M 22.939624,65.771144 L 31.155416,65.771144 L 31.155416,72.724451 L 22.939624,72.724451 L 22.939624,65.771144 z"
+       id="rect5230"
+       style="fill:#cb7c39;fill-opacity:1;fill-rule:evenodd;stroke:#cb7c39;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer14"
+     style="display:inline">
+    <path
+       d="M 22.674594,73.376313 L 31.950496,73.376313 L 31.950496,80.112333 L 22.674594,80.112333 L 22.674594,73.376313 z"
+       id="rect5233"
+       style="fill:#d28a4a;fill-opacity:1;fill-rule:evenodd;stroke:#d28a4a;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 31.950489,95.105403 L 48.912128,95.105403 L 48.912128,102.4933 L 31.950489,102.4933 L 31.950489,95.105403 z"
+       id="rect5235"
+       style="fill:#d28a4a;fill-opacity:1;fill-rule:evenodd;stroke:#d28a4a;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.972231,87.500203 L 58.9831,87.500203 L 58.9831,94.670803 L 49.972231,94.670803 L 49.972231,87.500203 z"
+       id="rect5237"
+       style="fill:#d28a4a;fill-opacity:1;fill-rule:evenodd;stroke:#d28a4a;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer15"
+     style="display:inline">
+    <path
+       d="M 23.204653,80.764203 L 32.215523,80.764203 L 32.215523,87.717513 L 23.204653,87.717513 L 23.204653,80.764203 z"
+       id="rect5240"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 41.491413,80.546903 L 49.442181,80.546903 L 49.442181,87.282913 L 41.491413,87.282913 L 41.491413,80.546903 z"
+       id="rect5242"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 32.215518,87.717493 L 49.177158,87.717493 L 49.177158,94.670803 L 32.215518,94.670803 L 32.215518,87.717493 z"
+       id="rect5244"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 41.226389,42.955605 L 49.972231,42.955605 L 49.972231,50.343494 L 41.226389,50.343494 L 41.226389,42.955605 z"
+       id="rect5246"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 76.474792,28.397117 L 86.280742,28.397117 L 86.280742,35.785005 L 76.474792,35.785005 L 76.474792,28.397117 z"
+       id="rect5248"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 58.453055,35.567712 L 68.259002,35.567712 L 68.259002,43.390179 L 58.453055,43.390179 L 58.453055,35.567712 z"
+       id="rect5250"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer16"
+     style="display:inline">
+    <path
+       d="M 22.939624,87.934783 L 31.685469,87.934783 L 31.685469,94.670803 L 22.939624,94.670803 L 22.939624,87.934783 z"
+       id="rect5254"
+       style="fill:#d99a5c;fill-opacity:1;fill-rule:evenodd;stroke:#d99a5c;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 32.122164,73.734353 L 49.535515,73.734353 L 49.535515,79.971563 L 32.122164,79.971563 L 32.122164,73.734353 z"
+       id="rect5256"
+       style="fill:#d99a5c;fill-opacity:1;fill-rule:evenodd;stroke:#d99a5c;stroke-width:1.22472548;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.442181,80.546903 L 58.453051,80.546903 L 58.453051,87.065623 L 49.442181,87.065623 L 49.442181,80.546903 z"
+       id="rect5258"
+       style="fill:#d99a5c;fill-opacity:1;fill-rule:evenodd;stroke:#d99a5c;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer17"
+     style="display:inline">
+    <path
+       d="M 22.409577,95.105403 L 31.420445,95.105403 L 31.420445,102.27599 L 22.409577,102.27599 L 22.409577,95.105403 z"
+       id="rect5260"
+       style="fill:#a85e25;fill-opacity:1;fill-rule:evenodd;stroke:#a85e25;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 68.719622,88.095163 L 76.544212,88.095163 L 76.544212,102.55018 L 68.719622,102.55018 L 68.719622,88.095163 z"
+       id="rect5262"
+       style="fill:#a85e25;fill-opacity:1;fill-rule:evenodd;stroke:#a85e25;stroke-width:1.26805162;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 40.696336,50.995367 L 49.97224,50.995367 L 49.97224,57.948673 L 40.696336,57.948673 L 40.696336,50.995367 z"
+       id="rect5264"
+       style="fill:#a85e25;fill-opacity:1;fill-rule:evenodd;stroke:#a85e25;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer18"
+     style="display:inline">
+    <path
+       d="M 32.215518,43.607475 L 40.96136,43.607475 L 40.96136,50.1262 L 32.215518,50.1262 L 32.215518,43.607475 z"
+       id="rect5267"
+       style="fill:#ce8240;fill-opacity:1;fill-rule:evenodd;stroke:#ce8240;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer19"
+     style="display:inline">
+    <path
+       d="M 32.215518,80.764203 L 40.96136,80.764203 L 40.96136,87.717513 L 32.215518,87.717513 L 32.215518,80.764203 z"
+       id="rect5270"
+       style="fill:#f2dcaf;fill-opacity:1;fill-rule:evenodd;stroke:#f2dcaf;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 50.237258,35.785003 L 58.453051,35.785003 L 58.453051,43.172893 L 50.237258,43.172893 L 50.237258,35.785003 z"
+       id="rect5272"
+       style="fill:#f2dcaf;fill-opacity:1;fill-rule:evenodd;stroke:#f2dcaf;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 58.718079,28.614406 L 67.993972,28.614406 L 67.993972,34.91584 L 58.718079,34.91584 L 58.718079,28.614406 z"
+       id="rect5274"
+       style="fill:#f2dcaf;fill-opacity:1;fill-rule:evenodd;stroke:#f2dcaf;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer20"
+     style="display:inline">
+    <path
+       d="M 67.728952,28.614406 L 77.534902,28.614406 L 77.534902,35.785003 L 67.728952,35.785003 L 67.728952,28.614406 z"
+       id="rect5281"
+       style="fill:#e9c38f;fill-opacity:1;fill-rule:evenodd;stroke:#e9c38f;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer21"
+     style="display:inline">
+    <path
+       d="M 86.545762,28.179826 L 95.026582,28.179826 L 95.026582,36.002295 L 86.545762,36.002295 L 86.545762,28.179826 z"
+       id="rect5284"
+       style="fill:#ce8240;fill-opacity:1;fill-rule:evenodd;stroke:#ce8240;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer22"
+     style="display:inline">
+    <path
+       d="M 67.728952,36.436876 L 76.739822,36.436876 L 76.739822,43.607475 L 67.728952,43.607475 L 67.728952,36.436876 z"
+       id="rect5287"
+       style="fill:#d69455;fill-opacity:1;fill-rule:evenodd;stroke:#d69455;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.972231,43.824766 L 58.9831,43.824766 L 58.9831,50.1262 L 49.972231,50.1262 L 49.972231,43.824766 z"
+       id="rect5289"
+       style="fill:#d69455;fill-opacity:1;fill-rule:evenodd;stroke:#d69455;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer23"
+     style="display:inline">
+    <path
+       d="M 60.043202,44.042064 L 67.728942,44.042064 L 67.728942,50.343494 L 60.043202,50.343494 L 60.043202,44.042064 z"
+       id="rect5292"
+       style="fill:#954f1d;fill-opacity:1;fill-rule:evenodd;stroke:#954f1d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer24"
+     style="display:inline">
+    <path
+       d="M 49.972231,50.778076 L 58.9831,50.778076 L 58.9831,57.94867 L 49.972231,57.94867 L 49.972231,50.778076 z"
+       id="rect5295"
+       style="fill:#86451b;fill-opacity:1;fill-rule:evenodd;stroke:#86451b;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer25"
+     style="display:inline">
+    <path
+       d="M 40.696336,65.771144 L 49.707204,65.771144 L 49.707204,73.159033 L 40.696336,73.159033 L 40.696336,65.771144 z"
+       id="rect5298"
+       style="fill:#dfae85;fill-opacity:1;fill-rule:evenodd;stroke:#dfae85;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.972231,58.817833 L 58.718075,58.817833 L 58.718075,65.119268 L 49.972231,65.119268 L 49.972231,58.817833 z"
+       id="rect5300"
+       style="fill:#dfae85;fill-opacity:1;fill-rule:evenodd;stroke:#dfae85;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer26"
+     style="display:inline">
+    <path
+       d="M 50.008357,72.754054 L 58.946983,72.754054 L 58.946983,80.300003 L 50.008357,80.300003 L 50.008357,72.754054 z"
+       id="rect5303"
+       style="fill:#ebebea;fill-opacity:1;fill-rule:evenodd;stroke:#ebebea;stroke-width:0.97923964;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 85.750692,94.670823 L 113.04832,94.670823 L 113.04832,101.84141 L 85.750692,101.84141 L 85.750692,94.670823 z"
+       id="rect5305"
+       style="fill:#ebebea;fill-opacity:1;fill-rule:evenodd;stroke:#ebebea;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 104.03746,87.500203 L 113.04832,87.500203 L 113.04832,95.105383 L 104.03746,95.105383 L 104.03746,87.500203 z"
+       id="rect5307"
+       style="fill:#ebebea;fill-opacity:1;fill-rule:evenodd;stroke:#ebebea;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer27"
+     style="display:inline">
+    <path
+       d="M 59.248129,58.383248 L 67.728952,58.383248 L 67.728952,65.336555 L 59.248129,65.336555 L 59.248129,58.383248 z"
+       id="rect5310"
+       style="fill:#b47b50;fill-opacity:1;fill-rule:evenodd;stroke:#b47b50;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer28"
+     style="display:inline">
+    <path
+       d="M 58.983104,80.329623 L 67.728952,80.329623 L 67.728952,94.888103 L 58.983104,94.888103 L 58.983104,80.329623 z"
+       id="rect5313"
+       style="fill:#b4682c;fill-opacity:1;fill-rule:evenodd;stroke:#b4682c;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer29"
+     style="display:inline">
+    <path
+       d="M 59.400806,73.401843 L 67.596712,73.401843 L 67.596712,79.917383 L 59.400806,79.917383 L 59.400806,73.401843 z"
+       id="rect5316"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 85.848322,65.317265 L 112.79729,65.317265 L 112.79729,72.525629 L 85.848322,72.525629 L 85.848322,65.317265 z"
+       id="rect5320"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.92899066;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 113.86393,72.75029 L 122.05984,72.75029 L 122.05984,102.93898 L 113.86393,102.93898 L 113.86393,72.75029 z"
+       id="rect5322"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 103.28857,102.07023 L 113.33517,102.07023 L 113.33517,109.6717 L 103.28857,109.6717 L 103.28857,102.07023 z"
+       id="rect5324"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 68.661572,110.11208 L 103.54563,110.11208 L 103.54563,117.26868 L 68.661572,117.26868 L 68.661572,110.11208 z"
+       id="rect5326"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.9257676;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 122.01276,28.343441 C 117.73153,29.46205 114.05228,31.272979 113.0237,36.132341 C 107.78173,37.141793 104.39383,39.439991 103.41895,43.415471 C 97.116922,45.301608 88.007482,43.23424 85.810242,50.900906 C 66.245092,52.87002 74.473492,57.824466 86.302792,58.184036"
+       id="path5428"
+       style="fill:none;fill-rule:evenodd;stroke:#242909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 67.955262,58.184036 L 76.944322,58.285188"
+       id="path5430"
+       style="fill:none;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 68.713662,58.09143 L 68.190322,58.052712 L 68.190322,54.568696 L 68.190322,51.084679 L 75.356952,51.084679 C 79.298592,51.084679 84.545322,51.691054 84.480982,51.737924 C 84.416642,51.784799 81.652362,51.360209 80.873512,51.488644 C 79.166072,51.770216 76.894972,52.360562 75.846322,52.795411 C 74.468042,53.366959 73.800602,54.132484 74.028942,54.879863 C 74.378402,56.02365 77.566652,57.274397 81.589612,57.84591 C 82.355962,57.954781 83.016282,58.071225 83.057002,58.104677 C 83.135832,58.169424 69.598852,58.156927 68.713662,58.091433 L 68.713662,58.09143 z"
+       id="path5432"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.24998963;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 85.922152,46.487205 L 85.922142,43.376702 L 94.314342,43.403393 C 98.930062,43.418071 101.27156,43.685846 101.23436,43.716412 C 101.01538,43.896296 100.21572,43.998509 96.327312,44.439092 C 95.311432,44.554195 93.909222,44.76027 93.211302,44.897029 C 89.791782,45.567113 87.696962,46.8534 86.503142,49.016069 C 86.326552,49.335971 86.123592,49.597708 86.052122,49.597708 C 85.963762,49.597708 85.922172,48.602138 85.922152,46.487205 L 85.922152,46.487205 z"
+       id="path5434"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.24998963;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 113.13562,31.491043 L 113.13562,28.456405 L 117.09656,28.456405 C 119.27507,28.456405 120.56622,28.62735 120.538,28.648257 C 120.50978,28.669164 120.48387,28.701243 119.9082,28.907569 C 116.98937,29.953715 115.18887,31.290601 114.02377,33.276828 C 113.75766,33.730476 113.50957,34.197053 113.47245,34.313662 C 113.43533,34.430272 113.34435,34.52568 113.27029,34.52568 C 113.17581,34.52568 113.13562,33.619885 113.13562,31.491043 z"
+       id="path5436"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.24998963;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 68.322722,117.40761 C 62.020252,117.99182 60.361175,121.21677 58.905614,124.55747"
+       id="path5505"
+       style="fill:#523526;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 59.246954,116.48617 L 59.246954,109.98097 L 63.170752,109.98097 C 66.563452,109.98097 67.094542,110.00476 67.094542,110.15678 C 67.094542,110.27958 67.245162,110.3326 67.593942,110.3326 L 68.093332,110.3326 L 68.093332,113.83367 L 68.093332,117.33475 L 67.201562,117.4709 C 63.938792,117.96903 61.691228,119.3823 60.146439,121.90717 C 59.781599,122.50348 59.429963,122.99137 59.365024,122.99137 C 59.300093,122.99137 59.246954,120.06403 59.246954,116.48617 z"
+       id="path5507"
+       style="opacity:1;fill:#523526;fill-opacity:1;fill-rule:evenodd;stroke:#523526;stroke-width:1.44840074;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer30"
+     style="display:inline">
+    <path
+       d="M 68.259002,57.94867 L 77.269872,57.94867 L 77.269872,65.553849 L 68.259002,65.553849 L 68.259002,57.94867 z"
+       id="rect5329"
+       style="fill:#804017;fill-opacity:1;fill-rule:evenodd;stroke:#804017;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer31"
+     style="display:inline">
+    <path
+       d="M 67.463912,65.771144 L 77.004832,65.771144 L 77.004832,73.159033 L 67.463912,73.159033 L 67.463912,65.771144 z"
+       id="rect5332"
+       style="fill:#936a48;fill-opacity:1;fill-rule:evenodd;stroke:#936a48;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer32"
+     style="display:inline">
+    <path
+       d="M 67.993972,73.810883 L 77.534902,73.810883 L 77.534902,87.717503 L 67.993972,87.717503 L 67.993972,73.810883 z"
+       id="rect5341"
+       style="fill:#c27739;fill-opacity:1;fill-rule:evenodd;stroke:#c27739;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer33"
+     style="display:inline">
+    <path
+       d="M 67.728952,103.36245 L 76.474792,103.36245 L 76.474792,109.88117 L 67.728952,109.88117 L 67.728952,103.36245 z"
+       id="rect5344"
+       style="fill:#727476;fill-opacity:1;fill-rule:evenodd;stroke:#727476;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 86.015712,80.764203 L 95.026582,80.764203 L 95.026582,87.500223 L 86.015712,87.500223 L 86.015712,80.764203 z"
+       id="rect5346"
+       style="fill:#727476;fill-opacity:1;fill-rule:evenodd;stroke:#727476;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer34"
+     style="display:inline">
+    <path
+       d="M 77.562952,64.924974 L 85.457612,64.924974 L 85.457612,72.484149 L 77.562952,72.484149 L 77.562952,64.924974 z"
+       id="rect5349"
+       style="fill:#a7602a;fill-opacity:1;fill-rule:evenodd;stroke:#a7602a;stroke-width:0.96462673;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer35"
+     style="display:inline">
+    <path
+       d="M 77.004842,72.941727 L 85.750682,72.941727 L 85.750682,80.329613 L 77.004842,80.329613 L 77.004842,72.941727 z"
+       id="rect5352"
+       style="fill:#cc914e;fill-opacity:1;fill-rule:evenodd;stroke:#cc914e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer36"
+     style="display:inline">
+    <path
+       d="M 77.534902,80.329623 L 85.750692,80.329623 L 85.750692,88.152083 L 77.534902,88.152083 L 77.534902,80.329623 z"
+       id="rect5355"
+       style="fill:#c18c57;fill-opacity:1;fill-rule:evenodd;stroke:#c18c57;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer37"
+     style="display:inline">
+    <path
+       d="M 77.004842,88.803973 L 85.485652,88.803973 L 85.485652,94.888103 L 77.004842,94.888103 L 77.004842,88.803973 z"
+       id="rect5358"
+       style="fill:#c1a080;fill-opacity:1;fill-rule:evenodd;stroke:#c1a080;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer38"
+     style="display:inline">
+    <path
+       d="M 85.750692,88.152083 L 95.291612,88.152083 L 95.291612,95.105383 L 85.750692,95.105383 L 85.750692,88.152083 z"
+       id="rect5361"
+       style="fill:#c5c5c1;fill-opacity:1;fill-rule:evenodd;stroke:#c5c5c1;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 104.56752,72.941727 L 113.04833,72.941727 L 113.04833,80.329613 L 104.56752,80.329613 L 104.56752,72.941727 z"
+       id="rect5363"
+       style="fill:#c5c5c1;fill-opacity:1;fill-rule:evenodd;stroke:#c5c5c1;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer39"
+     style="display:inline">
+    <path
+       d="M 85.750692,73.159023 L 94.761552,73.159023 L 94.761552,80.329623 L 85.750692,80.329623 L 85.750692,73.159023 z"
+       id="rect5366"
+       style="fill:#e6d2ba;fill-opacity:1;fill-rule:evenodd;stroke:#e6d2ba;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer40"
+     style="display:inline">
+    <path
+       d="M 77.004842,95.539983 L 85.750682,95.539983 L 85.750682,102.71057 L 77.004842,102.71057 L 77.004842,95.539983 z"
+       id="rect5369"
+       style="fill:#c5b39f;fill-opacity:1;fill-rule:evenodd;stroke:#c5b39f;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer41"
+     style="display:inline">
+    <path
+       d="M 77.004842,103.57975 L 85.750682,103.57975 L 85.750682,109.66389 L 77.004842,109.66389 L 77.004842,103.57975 z"
+       id="rect5374"
+       style="fill:#a0a09e;fill-opacity:1;fill-rule:evenodd;stroke:#a0a09e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer42"
+     style="display:inline">
+    <path
+       d="M 86.280742,102.49327 L 94.761572,102.49327 L 94.761572,109.44659 L 86.280742,109.44659 L 86.280742,102.49327 z"
+       id="rect5377"
+       style="fill:#aaaaa6;fill-opacity:1;fill-rule:evenodd;stroke:#aaaaa6;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer43"
+     style="display:inline">
+    <path
+       d="M 94.292382,102.54319 L 102.38643,102.54319 L 102.38643,110.04856 L 94.292382,110.04856 L 94.292382,102.54319 z"
+       id="rect5380"
+       style="fill:#a4a5a2;fill-opacity:1;fill-rule:evenodd;stroke:#a4a5a2;stroke-width:1.02406108;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer44"
+     style="display:inline">
+    <path
+       d="M 95.556632,80.546903 L 104.03745,80.546903 L 104.03745,87.717503 L 95.556632,87.717503 L 95.556632,80.546903 z"
+       id="rect5383"
+       style="fill:#171614;fill-opacity:1;fill-rule:evenodd;stroke:#171614;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer45"
+     style="display:inline">
+    <path
+       d="M 95.556632,88.152083 L 103.24237,88.152083 L 103.24237,94.453513 L 95.556632,94.453513 L 95.556632,88.152083 z"
+       id="rect5386"
+       style="fill:#a0a09e;fill-opacity:1;fill-rule:evenodd;stroke:#a0a09e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+</svg>

aMule-2.3.1.tar.bz2/src/utils/plasmamule/application-x-emulecollection.svg Added

@@ -0,0 +1,699 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   version="1.0"
+   width="128"
+   height="128"
+   id="svg2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient5499">
+      <stop
+         id="stop5501"
+         style="stop-color:#414041;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop5503"
+         style="stop-color:#414041;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="217.46033"
+       cy="1267.6486"
+       r="51.293652"
+       fx="217.46033"
+       fy="1267.6486"
+       id="radialGradient5485"
+       xlink:href="#linearGradient5499"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.7231807,0,-916.73904)" />
+  </defs>
+  <g
+     id="layer2"
+     style="display:inline">
+    <path
+       d="M 39.340653,6.101704 L 49.585554,6.101704 L 49.585554,21.033173 L 39.340653,21.033173 L 39.340653,6.101704 z"
+       id="rect3606"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.97238445;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 31.157195,13.930587 L 40.319663,13.930587 L 40.319663,28.407229 L 31.157195,28.407229 L 31.157195,13.930587 z"
+       id="rect3608"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.9949488;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 22.935572,20.962037 L 31.335333,20.962037 L 31.335333,36.615875 L 22.935572,36.615875 L 22.935572,20.962037 z"
+       id="rect3610"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.98637319;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 13.926738,36.046062 L 22.651414,36.046062 L 22.651414,87.736033 L 13.926738,87.736033 L 13.926738,36.046062 z"
+       id="rect3612"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 3.9349289,58.026734 L 14.136332,58.026734 L 14.136332,65.321003 L 3.9349289,65.321003 L 3.9349289,58.026734 z"
+       id="rect3614"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.01180661;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 5.2020639,72.75029 L 15.930324,72.75029 L 15.930324,80.351753 L 5.2020639,80.351753 L 5.2020639,72.75029 z"
+       id="rect3616"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 4.3420179,87.518853 L 13.926736,87.518853 L 13.926736,124.65744 L 4.3420179,124.65744 L 4.3420179,87.518853 z"
+       id="rect3618"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 23.180182,102.50459 L 67.596712,102.50459 L 67.596712,109.88887 L 23.180182,109.88887 L 23.180182,102.50459 z"
+       id="rect3620"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 49.35421,109.6717 L 59.136423,109.6717 L 59.136423,124.65745 L 49.35421,124.65745 L 49.35421,109.6717 z"
+       id="rect3622"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 40.629533,57.981725 L 49.882979,57.981725 L 49.882979,65.800377 L 40.629533,65.800377 L 40.629533,57.981725 z"
+       id="rect3624"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 59.136423,50.814627 L 68.125482,50.814627 L 68.125482,58.198909 L 59.136423,58.198909 L 59.136423,50.814627 z"
+       id="rect3626"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 76.850162,58.198909 L 86.367982,58.198909 L 86.367982,64.931639 L 76.850162,64.931639 L 76.850162,58.198909 z"
+       id="rect3628"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 68.125482,43.21316 L 85.839222,43.21316 L 85.839222,51.031811 L 68.125482,51.031811 L 68.125482,43.21316 z"
+       id="rect3630"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 86.103602,36.046062 L 103.55295,36.046062 L 103.55295,43.430344 L 86.103602,43.430344 L 86.103602,36.046062 z"
+       id="rect3632"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 102.88048,28.252166 L 113.04064,28.252166 L 113.04064,36.23849 L 102.88048,36.23849 L 102.88048,28.252166 z"
+       id="rect3634"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.96712023;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 62.593752,21.060315 L 118.86689,21.060315 C 120.78226,21.060315 122.32423,22.327003 122.32423,23.900423 L 122.32423,25.604488 C 122.32423,27.177906 120.78226,28.444596 118.86689,28.444596 L 62.593752,28.444596 C 60.678393,28.444596 59.136423,27.177906 59.136423,25.604488 L 59.136423,23.900423 C 59.136423,22.327003 60.678393,21.060315 62.593752,21.060315 z"
+       id="rect3636"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:0" />
+    <path
+       d="M 49.35421,28.661781 L 58.34327,28.661781 L 58.34327,35.394509 L 49.35421,35.394509 L 49.35421,28.661781 z"
+       id="rect5277"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 41.158301,36.480431 L 50.147361,36.480431 L 50.147361,42.995976 L 41.158301,42.995976 L 41.158301,36.480431 z"
+       id="rect5279"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 39.215793,5.939705 C 38.715223,9.330421 36.588834,12.195726 31.264256,14.027471 C 30.314454,17.008113 28.936283,19.808787 23.591719,20.943099 C 21.24108,26.303546 21.981111,32.80014 14.245173,36.180923"
+       id="path5394"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.08055982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 32.240586,13.806817 C 32.240586,13.743663 32.501332,13.582713 32.820026,13.449153 C 35.443975,12.349496 37.451683,10.628408 38.451783,8.621384 C 38.716785,8.089573 39.00076,7.636067 39.08284,7.613591 C 39.18425,7.585822 39.232075,8.59004 39.232075,10.747186 L 39.232075,13.921648 L 35.736331,13.921648 C 33.549304,13.921648 32.240586,13.878655 32.240586,13.806817 z"
+       id="path5396"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.44840074;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 25.249095,20.647913 C 25.249095,20.588997 25.668955,20.34791 26.182118,20.112165 C 28.087776,19.236715 29.689218,17.666857 30.45964,15.918998 C 31.026416,14.633163 31.099119,14.862044 31.099119,17.93221 L 31.099119,20.755038 L 28.174106,20.755038 C 26.502853,20.755038 25.249095,20.709122 25.249095,20.647915 L 25.249095,20.647913 z"
+       id="path5398"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.44840074;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 14.690515,35.894974 C 14.690515,35.841365 14.995502,35.634543 15.368263,35.435369 C 15.741024,35.236193 16.434957,34.765793 16.91034,34.390033 C 19.142521,32.625632 20.280821,30.70527 21.514754,26.622187 C 21.815628,25.626596 22.136862,24.791471 22.228609,24.766347 C 22.354366,24.731914 22.395425,26.10787 22.395425,30.356558 L 22.395425,35.992445 L 18.542971,35.992445 C 16.424121,35.992445 14.690515,35.948583 14.690515,35.894974 L 14.690515,35.894974 z"
+       id="path5400"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.44840074;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 30.786969,14.032631 C 29.888352,15.098906 29.383947,17.892502 29.383947,17.892502 L 24.696345,20.430284 C 28.746586,18.151073 21.755507,21.213217 22.300034,21.742622 L 20.402955,27.566126"
+       id="path5402"
+       style="fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 23.518191,21.403041 C 23.518191,21.377518 23.561591,21.290021 23.614635,21.208601 C 23.707567,21.065954 23.738905,21.066012 24.475263,21.210127 C 24.895567,21.292385 25.264031,21.379885 25.294078,21.404567 C 25.324123,21.429248 24.936841,21.449443 24.433448,21.449443 C 23.930058,21.449443 23.518191,21.428562 23.518191,21.403038 L 23.518191,21.403041 z"
+       id="path5404"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.01355422;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 22.281231,23.559817 C 22.22932,23.448688 22.190453,23.442742 22.066825,23.52703 C 21.983775,23.583648 17.702616,34.061396 17.674025,34.03791 C 17.566511,33.949593 22.383089,21.784558 22.551131,21.707306 C 22.677071,21.649408 22.71942,21.661927 22.71942,21.757047 C 22.71942,21.826955 22.76435,21.884154 22.819267,21.884154 C 22.971338,21.884154 22.928404,22.433727 22.726627,23.069912 C 22.543681,23.646732 22.397133,23.807929 22.281231,23.559819 L 22.281231,23.559817 z"
+       id="path5406"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.01355422;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 3.8865129,58.026209 L 13.417082,36.229233"
+       id="path5408"
+       style="fill:none;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 4.2432109,58.01539 C 6.0023709,53.959739 13.749314,36.350054 13.777925,36.323778 C 13.800676,36.302879 13.551363,36.433894 13.673351,36.450824 L 13.895146,36.481609 L 13.895146,47.242734 L 13.895146,58.003862 L 8.9345419,58.003862 C 4.9892949,58.003862 3.9788699,57.992482 3.9980529,57.948259 L 4.2432109,58.01539 z"
+       id="path5410"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.5496943;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 3.9948139,65.232557 C 17.815786,69.93296 -1.6730071,70.712716 5.2944389,80.312513 C 17.882508,85.190263 4.6756049,87.017783 4.9695319,87.518853"
+       id="path5412"
+       style="fill:none;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 5.4475989,72.707309 C 5.4475989,72.63919 6.1996769,71.917446 7.0975699,71.123879 C 8.4418519,69.935795 8.8689969,69.45839 9.0530499,68.938297 C 9.4358499,67.856598 8.4672979,66.939089 5.7860419,65.843439 C 5.2425019,65.621329 4.7977859,65.422426 4.7977859,65.401427 C 4.7977859,65.380433 6.8446919,65.363253 9.3464679,65.363253 L 13.895146,65.363253 L 13.895146,69.055394 L 13.895146,72.747536 L 9.6713719,72.747536 C 7.1895439,72.747536 5.4475989,72.730944 5.4475989,72.707305 L 5.4475989,72.707309 z"
+       id="path5414"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.5496943;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 4.9222249,79.623243 C 4.2438179,78.553773 3.8931479,77.554243 3.8385399,76.534383 C 3.7911589,75.649463 3.9740649,74.882093 4.4229169,74.082633 C 4.6757749,73.632263 5.0597369,73.095273 5.1289049,73.095273 C 5.1563029,73.095273 5.1768429,74.543943 5.1768429,76.476023 C 5.1768429,78.661593 5.1580209,79.856783 5.1236049,79.856783 C 5.0943249,79.856783 5.0037019,79.751683 4.9222229,79.623243 L 4.9222249,79.623243 z"
+       id="path5416"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.5496943;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 5.1902089,87.452783 C 5.2025249,87.422423 5.7711109,87.216513 6.4537339,86.995183 C 8.5168459,86.326253 9.5029579,85.874823 10.158427,85.299213 C 10.621074,84.892933 10.780652,84.603983 10.781113,84.171693 C 10.781711,83.609253 10.505878,83.164493 9.7919699,82.576753 C 9.0910579,81.999733 8.2131769,81.504303 6.7066059,80.835563 C 6.2524159,80.633953 5.8808049,80.451363 5.8808049,80.429793 C 5.8808049,80.407523 7.6121159,80.390583 9.8879759,80.390583 L 13.895146,80.390583 L 13.895146,83.949273 L 13.895146,87.507973 L 9.5314839,87.507973 C 6.0823689,87.507973 5.1725119,87.496393 5.1902109,87.452783 L 5.1902089,87.452783 z"
+       id="path5418"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:0.5496943;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 103.84118,117.37931 C 106.90063,117.46172 111.28174,115.03097 114.69114,110.76294 C 121.73297,105.18527 120.26144,105.10684 122.47916,103.32636 L 123.41106,100.0455 C 125.17559,94.607773 125.16257,90.099283 125.0086,85.664463 C 124.30407,80.940603 124.42065,73.807723 122.61228,72.322348 C 119.26626,69.620488 114.29713,64.156705 113.16017,65.213846"
+       id="path5420"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 104.09881,113.70195 L 104.09881,110.08404 L 108.92101,110.08404 L 113.74321,110.08404 L 113.74321,106.72014 L 113.74321,103.35623 L 117.87652,103.35623 C 120.14985,103.35623 122.00984,103.3714 122.00984,103.38994 C 122.00984,103.40849 121.84786,103.5695 121.6499,103.74778 C 121.45193,103.92605 121.03172,104.39701 120.71612,104.79436 C 120.4005,105.19169 119.98138,105.70139 119.78474,105.92702 C 118.9688,106.86323 117.10725,108.57377 115.49818,109.86582 C 114.82644,110.40522 114.446,110.76659 114.00864,111.28067 C 112.12513,113.49463 110.14112,115.11955 107.97836,116.21953 C 106.86363,116.78649 105.49533,117.21165 104.54959,117.28492 L 104.09881,117.31986 L 104.09881,113.70195 z"
+       id="path5422"
+       style="opacity:1;fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.67093682;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 122.60629,87.332123 C 122.60629,75.538783 122.62307,72.563528 122.68949,72.580671 C 122.83029,72.617008 123.18859,73.229963 123.37059,73.745833 C 123.83201,75.053703 124.0652,76.646863 124.4708,81.262553 C 124.58311,82.540713 124.73356,84.047843 124.80512,84.611713 C 124.98036,85.992613 125.04506,88.963083 124.94239,90.913713 C 124.8154,93.326083 124.56138,95.232103 124.10432,97.202003 C 123.78141,98.593733 122.77124,102.05988 122.68138,102.08449 C 122.62576,102.09971 122.60629,98.274943 122.60629,87.332123 z"
+       id="path5424"
+       style="opacity:1;fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.67570281;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 113.37002,68.729453 C 113.38968,64.636295 113.3168,64.995766 114.06556,65.298576 C 114.96226,65.661208 116.18831,66.638662 119.17395,69.371208 C 120.15974,70.273441 121.27871,71.274101 121.66053,71.594901 C 122.04621,71.918956 122.33492,72.204494 122.31017,72.237398 C 122.2789,72.278966 120.93649,72.29663 117.80925,72.29663 L 113.3529,72.29663 L 113.37002,68.729453 z"
+       id="path5426"
+       style="opacity:1;fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.67570281;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 103.65401,38.976483 L 103.65401,36.245307 L 107.68062,36.245307 C 109.89525,36.245307 111.9355,35.820016 111.87115,35.864294 C 111.80681,35.908568 111.25162,36.465668 110.98071,36.538209 C 110.0245,36.79425 108.00086,37.675422 107.1564,38.203454 C 106.06111,38.888346 105.04135,39.88627 104.39683,40.90394 C 104.11687,41.34598 103.83521,41.707651 103.77092,41.707651 C 103.70002,41.707651 103.65401,40.632735 103.65401,38.976483 z"
+       id="path5438"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.24998963;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 49.598255,6.19708 C 52.270524,19.619097 55.844786,22.297105 59.739759,21.154985"
+       id="path5440"
+       style="fill:none;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.94117647;display:inline" />
+    <path
+       d="M 50.439308,24.306414 C 50.439308,21.066587 50.389369,20.519603 50.093576,20.519603 C 49.794461,20.519603 49.74784,19.802562 49.74784,15.20229 C 49.74784,11.139896 49.813358,9.902915 50.025448,9.96099 C 50.178128,10.0028 50.62914,11.096239 51.027689,12.390862 C 52.206237,16.219183 53.864202,19.547084 54.536177,19.433168 C 54.682379,19.408383 54.751206,19.496844 54.689123,19.62975 C 54.531933,19.966244 55.859049,20.977488 56.21841,20.795044 C 56.401732,20.701969 56.444534,20.728466 56.338511,20.869384 C 56.129562,21.147113 57.111962,21.466307 58.175681,21.466307 L 58.967392,21.466307 L 58.967392,24.779767 L 58.967392,28.093226 L 54.703348,28.093226 L 50.439308,28.093226 L 50.439308,24.306414 z"
+       id="path5443"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:2.3397243;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:0.94117647" />
+  </g>
+  <g
+     id="layer3"
+     style="display:inline">
+    <path
+       d="M 40.696336,21.009229 L 49.97224,21.009229 L 49.97224,36.002295 L 40.696336,36.002295 L 40.696336,21.009229 z"
+       id="rect3643"
+       style="fill:#803f12;fill-opacity:1;fill-rule:evenodd;stroke:#803f12;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 13.688344,102.0789 L 23.651196,102.0789 L 23.651196,109.86101 L 13.688344,109.86101 L 13.688344,102.0789 z"
+       id="rect3645"
+       style="fill:#803f12;fill-opacity:1;fill-rule:evenodd;stroke:#803f12;stroke-width:0.95839912;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer4"
+     style="display:inline">
+    <path
+       d="M 31.685473,28.397117 L 40.696341,28.397117 L 40.696341,36.002295 L 31.685473,36.002295 L 31.685473,28.397117 z"
+       id="rect5178"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#bc6d2d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 31.950489,50.343494 L 40.43131,50.343494 L 40.43131,73.376323 L 31.950489,73.376323 L 31.950489,50.343494 z"
+       id="rect5182"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#bc6d2d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 22.409577,57.731383 L 31.950496,57.731383 L 31.950496,65.336559 L 22.409577,65.336559 L 22.409577,57.731383 z"
+       id="rect5184"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#bc6d2d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 76.474792,35.567712 L 85.750692,35.567712 L 85.750692,43.390179 L 76.474792,43.390179 L 76.474792,35.567712 z"
+       id="rect5186"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#bc6d2d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 33.010597,117.1604 L 41.491415,117.1604 L 41.491415,124.331 L 33.010597,124.331 L 33.010597,117.1604 z"
+       id="rect5205"
+       style="fill:#bc6d2d;fill-opacity:1;fill-rule:evenodd;stroke:#c1742d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1;display:inline" />
+  </g>
+  <g
+     id="layer5"
+     style="display:inline">
+    <path
+       d="M 22.939624,36.002295 L 31.685469,36.002295 L 31.685469,43.390183 L 22.939624,43.390183 L 22.939624,36.002295 z"
+       id="rect5189"
+       style="fill:#7f3e13;fill-opacity:1;fill-rule:evenodd;stroke:#7f3e13;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 40.961365,109.88119 L 49.177155,109.88119 L 49.177155,116.8345 L 40.961365,116.8345 L 40.961365,109.88119 z"
+       id="rect5191"
+       style="fill:#7f3e13;fill-opacity:1;fill-rule:evenodd;stroke:#7f3e13;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer6"
+     style="display:inline">
+    <path
+       d="M 13.928757,110.31576 L 22.674601,110.31576 L 22.674601,124.43965 L 13.928757,124.43965 L 13.928757,110.31576 z"
+       id="rect5194"
+       style="fill:#8e4a19;fill-opacity:1;fill-rule:evenodd;stroke:#8e4a19;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 21.879517,43.172896 L 31.950486,43.172896 L 31.950486,50.995364 L 21.879517,50.995364 L 21.879517,43.172896 z"
+       id="rect5196"
+       style="fill:#8e4a19;fill-opacity:1;fill-rule:evenodd;stroke:#8e4a19;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer7"
+     style="display:inline">
+    <path
+       d="M 13.398704,87.282923 L 22.674605,87.282923 L 22.674605,101.40683 L 13.398704,101.40683 L 13.398704,87.282923 z"
+       id="rect5199"
+       style="fill:#6e310c;fill-opacity:1;fill-rule:evenodd;stroke:#6e310c;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer8"
+     style="display:inline">
+    <path
+       d="M 22.688423,116.84582 L 32.508785,116.84582 L 32.508785,124.42832 L 22.688423,124.42832 L 22.688423,116.84582 z"
+       id="rect5202"
+       style="fill:#c1742d;fill-opacity:1;fill-rule:evenodd;stroke:#c1742d;stroke-width:0.93885654;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer9"
+     style="display:inline">
+    <path
+       d="M 41.491413,117.48635 L 48.912128,117.48635 L 48.912128,124.22237 L 41.491413,124.22237 L 41.491413,117.48635 z"
+       id="rect5210"
+       style="fill:#9a531f;fill-opacity:0.94117647;fill-rule:evenodd;stroke:#9a531f;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:0.94117647" />
+  </g>
+  <g
+     id="layer10"
+     style="display:inline">
+    <path
+       d="M 22.97182,109.69029 L 32.713376,109.69029 L 32.713376,116.37351 L 22.97182,116.37351 L 22.97182,109.69029 z"
+       id="rect5213"
+       style="fill:#ac6226;fill-opacity:1;fill-rule:evenodd;stroke:#ac6226;stroke-width:0.97212332;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 59.054206,94.729113 L 69.618192,94.729113 L 69.618192,103.17309 L 59.054206,103.17309 L 59.054206,94.729113 z"
+       id="rect5215"
+       style="fill:#ac6226;fill-opacity:1;fill-rule:evenodd;stroke:#ac6226;stroke-width:1.04258394;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 94.761552,28.397117 L 103.77242,28.397117 L 103.77242,35.785005 L 94.761552,35.785005 L 94.761552,28.397117 z"
+       id="rect5217"
+       style="fill:#ac6226;fill-opacity:1;fill-rule:evenodd;stroke:#ac6226;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer11"
+     style="display:inline">
+    <path
+       d="M 33.010597,109.66389 L 40.961365,109.66389 L 40.961365,117.05178 L 33.010597,117.05178 L 33.010597,109.66389 z"
+       id="rect5220"
+       style="fill:#a55c23;fill-opacity:1;fill-rule:evenodd;stroke:#a55c23;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 31.155416,36.436876 L 40.696335,36.436876 L 40.696335,43.172893 L 31.155416,43.172893 L 31.155416,36.436876 z"
+       id="rect5222"
+       style="fill:#a55c23;fill-opacity:1;fill-rule:evenodd;stroke:#a55c23;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer12"
+     style="display:inline">
+    <path
+       d="M 22.409577,50.995367 L 31.685479,50.995367 L 31.685479,57.514092 L 22.409577,57.514092 L 22.409577,50.995367 z"
+       id="rect5225"
+       style="fill:#c77631;fill-opacity:1;fill-rule:evenodd;stroke:#c77631;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.707207,94.888123 L 58.718075,94.888123 L 58.718075,102.4933 L 49.707207,102.4933 L 49.707207,94.888123 z"
+       id="rect5227"
+       style="fill:#c77631;fill-opacity:1;fill-rule:evenodd;stroke:#c77631;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer13"
+     style="display:inline">
+    <path
+       d="M 22.939624,65.771144 L 31.155416,65.771144 L 31.155416,72.724451 L 22.939624,72.724451 L 22.939624,65.771144 z"
+       id="rect5230"
+       style="fill:#cb7c39;fill-opacity:1;fill-rule:evenodd;stroke:#cb7c39;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer14"
+     style="display:inline">
+    <path
+       d="M 22.674594,73.376313 L 31.950496,73.376313 L 31.950496,80.112333 L 22.674594,80.112333 L 22.674594,73.376313 z"
+       id="rect5233"
+       style="fill:#d28a4a;fill-opacity:1;fill-rule:evenodd;stroke:#d28a4a;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 31.950489,95.105403 L 48.912128,95.105403 L 48.912128,102.4933 L 31.950489,102.4933 L 31.950489,95.105403 z"
+       id="rect5235"
+       style="fill:#d28a4a;fill-opacity:1;fill-rule:evenodd;stroke:#d28a4a;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.972231,87.500203 L 58.9831,87.500203 L 58.9831,94.670803 L 49.972231,94.670803 L 49.972231,87.500203 z"
+       id="rect5237"
+       style="fill:#d28a4a;fill-opacity:1;fill-rule:evenodd;stroke:#d28a4a;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer15"
+     style="display:inline">
+    <path
+       d="M 23.204653,80.764203 L 32.215523,80.764203 L 32.215523,87.717513 L 23.204653,87.717513 L 23.204653,80.764203 z"
+       id="rect5240"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 41.491413,80.546903 L 49.442181,80.546903 L 49.442181,87.282913 L 41.491413,87.282913 L 41.491413,80.546903 z"
+       id="rect5242"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 32.215518,87.717493 L 49.177158,87.717493 L 49.177158,94.670803 L 32.215518,94.670803 L 32.215518,87.717493 z"
+       id="rect5244"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 41.226389,42.955605 L 49.972231,42.955605 L 49.972231,50.343494 L 41.226389,50.343494 L 41.226389,42.955605 z"
+       id="rect5246"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 76.474792,28.397117 L 86.280742,28.397117 L 86.280742,35.785005 L 76.474792,35.785005 L 76.474792,28.397117 z"
+       id="rect5248"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 58.453055,35.567712 L 68.259002,35.567712 L 68.259002,43.390179 L 58.453055,43.390179 L 58.453055,35.567712 z"
+       id="rect5250"
+       style="fill:#dfaa6e;fill-opacity:1;fill-rule:evenodd;stroke:#dfaa6e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer16"
+     style="display:inline">
+    <path
+       d="M 22.939624,87.934783 L 31.685469,87.934783 L 31.685469,94.670803 L 22.939624,94.670803 L 22.939624,87.934783 z"
+       id="rect5254"
+       style="fill:#d99a5c;fill-opacity:1;fill-rule:evenodd;stroke:#d99a5c;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 32.122164,73.734353 L 49.535515,73.734353 L 49.535515,79.971563 L 32.122164,79.971563 L 32.122164,73.734353 z"
+       id="rect5256"
+       style="fill:#d99a5c;fill-opacity:1;fill-rule:evenodd;stroke:#d99a5c;stroke-width:1.22472548;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.442181,80.546903 L 58.453051,80.546903 L 58.453051,87.065623 L 49.442181,87.065623 L 49.442181,80.546903 z"
+       id="rect5258"
+       style="fill:#d99a5c;fill-opacity:1;fill-rule:evenodd;stroke:#d99a5c;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer17"
+     style="display:inline">
+    <path
+       d="M 22.409577,95.105403 L 31.420445,95.105403 L 31.420445,102.27599 L 22.409577,102.27599 L 22.409577,95.105403 z"
+       id="rect5260"
+       style="fill:#a85e25;fill-opacity:1;fill-rule:evenodd;stroke:#a85e25;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 68.719622,88.095163 L 76.544212,88.095163 L 76.544212,102.55018 L 68.719622,102.55018 L 68.719622,88.095163 z"
+       id="rect5262"
+       style="fill:#a85e25;fill-opacity:1;fill-rule:evenodd;stroke:#a85e25;stroke-width:1.26805162;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 40.696336,50.995367 L 49.97224,50.995367 L 49.97224,57.948673 L 40.696336,57.948673 L 40.696336,50.995367 z"
+       id="rect5264"
+       style="fill:#a85e25;fill-opacity:1;fill-rule:evenodd;stroke:#a85e25;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer18"
+     style="display:inline">
+    <path
+       d="M 32.215518,43.607475 L 40.96136,43.607475 L 40.96136,50.1262 L 32.215518,50.1262 L 32.215518,43.607475 z"
+       id="rect5267"
+       style="fill:#ce8240;fill-opacity:1;fill-rule:evenodd;stroke:#ce8240;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer19"
+     style="display:inline">
+    <path
+       d="M 32.215518,80.764203 L 40.96136,80.764203 L 40.96136,87.717513 L 32.215518,87.717513 L 32.215518,80.764203 z"
+       id="rect5270"
+       style="fill:#f2dcaf;fill-opacity:1;fill-rule:evenodd;stroke:#f2dcaf;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 50.237258,35.785003 L 58.453051,35.785003 L 58.453051,43.172893 L 50.237258,43.172893 L 50.237258,35.785003 z"
+       id="rect5272"
+       style="fill:#f2dcaf;fill-opacity:1;fill-rule:evenodd;stroke:#f2dcaf;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 58.718079,28.614406 L 67.993972,28.614406 L 67.993972,34.91584 L 58.718079,34.91584 L 58.718079,28.614406 z"
+       id="rect5274"
+       style="fill:#f2dcaf;fill-opacity:1;fill-rule:evenodd;stroke:#f2dcaf;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer20"
+     style="display:inline">
+    <path
+       d="M 67.728952,28.614406 L 77.534902,28.614406 L 77.534902,35.785003 L 67.728952,35.785003 L 67.728952,28.614406 z"
+       id="rect5281"
+       style="fill:#e9c38f;fill-opacity:1;fill-rule:evenodd;stroke:#e9c38f;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer21"
+     style="display:inline">
+    <path
+       d="M 86.545762,28.179826 L 95.026582,28.179826 L 95.026582,36.002295 L 86.545762,36.002295 L 86.545762,28.179826 z"
+       id="rect5284"
+       style="fill:#ce8240;fill-opacity:1;fill-rule:evenodd;stroke:#ce8240;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer22"
+     style="display:inline">
+    <path
+       d="M 67.728952,36.436876 L 76.739822,36.436876 L 76.739822,43.607475 L 67.728952,43.607475 L 67.728952,36.436876 z"
+       id="rect5287"
+       style="fill:#d69455;fill-opacity:1;fill-rule:evenodd;stroke:#d69455;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.972231,43.824766 L 58.9831,43.824766 L 58.9831,50.1262 L 49.972231,50.1262 L 49.972231,43.824766 z"
+       id="rect5289"
+       style="fill:#d69455;fill-opacity:1;fill-rule:evenodd;stroke:#d69455;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer23"
+     style="display:inline">
+    <path
+       d="M 60.043202,44.042064 L 67.728942,44.042064 L 67.728942,50.343494 L 60.043202,50.343494 L 60.043202,44.042064 z"
+       id="rect5292"
+       style="fill:#954f1d;fill-opacity:1;fill-rule:evenodd;stroke:#954f1d;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer24"
+     style="display:inline">
+    <path
+       d="M 49.972231,50.778076 L 58.9831,50.778076 L 58.9831,57.94867 L 49.972231,57.94867 L 49.972231,50.778076 z"
+       id="rect5295"
+       style="fill:#86451b;fill-opacity:1;fill-rule:evenodd;stroke:#86451b;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer25"
+     style="display:inline">
+    <path
+       d="M 40.696336,65.771144 L 49.707204,65.771144 L 49.707204,73.159033 L 40.696336,73.159033 L 40.696336,65.771144 z"
+       id="rect5298"
+       style="fill:#dfae85;fill-opacity:1;fill-rule:evenodd;stroke:#dfae85;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 49.972231,58.817833 L 58.718075,58.817833 L 58.718075,65.119268 L 49.972231,65.119268 L 49.972231,58.817833 z"
+       id="rect5300"
+       style="fill:#dfae85;fill-opacity:1;fill-rule:evenodd;stroke:#dfae85;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer26"
+     style="display:inline">
+    <path
+       d="M 50.008357,72.754054 L 58.946983,72.754054 L 58.946983,80.300003 L 50.008357,80.300003 L 50.008357,72.754054 z"
+       id="rect5303"
+       style="fill:#ebebea;fill-opacity:1;fill-rule:evenodd;stroke:#ebebea;stroke-width:0.97923964;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 85.750692,94.670823 L 113.04832,94.670823 L 113.04832,101.84141 L 85.750692,101.84141 L 85.750692,94.670823 z"
+       id="rect5305"
+       style="fill:#ebebea;fill-opacity:1;fill-rule:evenodd;stroke:#ebebea;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 104.03746,87.500203 L 113.04832,87.500203 L 113.04832,95.105383 L 104.03746,95.105383 L 104.03746,87.500203 z"
+       id="rect5307"
+       style="fill:#ebebea;fill-opacity:1;fill-rule:evenodd;stroke:#ebebea;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer27"
+     style="display:inline">
+    <path
+       d="M 59.248129,58.383248 L 67.728952,58.383248 L 67.728952,65.336555 L 59.248129,65.336555 L 59.248129,58.383248 z"
+       id="rect5310"
+       style="fill:#b47b50;fill-opacity:1;fill-rule:evenodd;stroke:#b47b50;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer28"
+     style="display:inline">
+    <path
+       d="M 58.983104,80.329623 L 67.728952,80.329623 L 67.728952,94.888103 L 58.983104,94.888103 L 58.983104,80.329623 z"
+       id="rect5313"
+       style="fill:#b4682c;fill-opacity:1;fill-rule:evenodd;stroke:#b4682c;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer29"
+     style="display:inline">
+    <path
+       d="M 59.400806,73.401843 L 67.596712,73.401843 L 67.596712,79.917383 L 59.400806,79.917383 L 59.400806,73.401843 z"
+       id="rect5316"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 85.848322,65.317265 L 112.79729,65.317265 L 112.79729,72.525629 L 85.848322,72.525629 L 85.848322,65.317265 z"
+       id="rect5320"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.92899066;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 113.86393,72.75029 L 122.05984,72.75029 L 122.05984,102.93898 L 113.86393,102.93898 L 113.86393,72.75029 z"
+       id="rect5322"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 103.28857,102.07023 L 113.33517,102.07023 L 113.33517,109.6717 L 103.28857,109.6717 L 103.28857,102.07023 z"
+       id="rect5324"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.91249251;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 68.661572,110.11208 L 103.54563,110.11208 L 103.54563,117.26868 L 68.661572,117.26868 L 68.661572,110.11208 z"
+       id="rect5326"
+       style="fill:#414041;fill-opacity:1;fill-rule:evenodd;stroke:#414041;stroke-width:0.9257676;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 122.01276,28.343441 C 117.73153,29.46205 114.05228,31.272979 113.0237,36.132341 C 107.78173,37.141793 104.39383,39.439991 103.41895,43.415471 C 97.116922,45.301608 88.007482,43.23424 85.810242,50.900906 C 66.245092,52.87002 74.473492,57.824466 86.302792,58.184036"
+       id="path5428"
+       style="fill:none;fill-rule:evenodd;stroke:#242909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 67.955262,58.184036 L 76.944322,58.285188"
+       id="path5430"
+       style="fill:none;fill-rule:evenodd;stroke:#642909;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 68.713662,58.09143 L 68.190322,58.052712 L 68.190322,54.568696 L 68.190322,51.084679 L 75.356952,51.084679 C 79.298592,51.084679 84.545322,51.691054 84.480982,51.737924 C 84.416642,51.784799 81.652362,51.360209 80.873512,51.488644 C 79.166072,51.770216 76.894972,52.360562 75.846322,52.795411 C 74.468042,53.366959 73.800602,54.132484 74.028942,54.879863 C 74.378402,56.02365 77.566652,57.274397 81.589612,57.84591 C 82.355962,57.954781 83.016282,58.071225 83.057002,58.104677 C 83.135832,58.169424 69.598852,58.156927 68.713662,58.091433 L 68.713662,58.09143 z"
+       id="path5432"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.24998963;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 85.922152,46.487205 L 85.922142,43.376702 L 94.314342,43.403393 C 98.930062,43.418071 101.27156,43.685846 101.23436,43.716412 C 101.01538,43.896296 100.21572,43.998509 96.327312,44.439092 C 95.311432,44.554195 93.909222,44.76027 93.211302,44.897029 C 89.791782,45.567113 87.696962,46.8534 86.503142,49.016069 C 86.326552,49.335971 86.123592,49.597708 86.052122,49.597708 C 85.963762,49.597708 85.922172,48.602138 85.922152,46.487205 L 85.922152,46.487205 z"
+       id="path5434"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.24998963;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 113.13562,31.491043 L 113.13562,28.456405 L 117.09656,28.456405 C 119.27507,28.456405 120.56622,28.62735 120.538,28.648257 C 120.50978,28.669164 120.48387,28.701243 119.9082,28.907569 C 116.98937,29.953715 115.18887,31.290601 114.02377,33.276828 C 113.75766,33.730476 113.50957,34.197053 113.47245,34.313662 C 113.43533,34.430272 113.34435,34.52568 113.27029,34.52568 C 113.17581,34.52568 113.13562,33.619885 113.13562,31.491043 z"
+       id="path5436"
+       style="opacity:1;fill:#642909;fill-opacity:1;fill-rule:evenodd;stroke:#642909;stroke-width:1.24998963;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       d="M 68.322722,117.40761 C 62.020252,117.99182 60.361175,121.21677 58.905614,124.55747"
+       id="path5505"
+       style="fill:#523526;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.08147255px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       d="M 59.246954,116.48617 L 59.246954,109.98097 L 63.170752,109.98097 C 66.563452,109.98097 67.094542,110.00476 67.094542,110.15678 C 67.094542,110.27958 67.245162,110.3326 67.593942,110.3326 L 68.093332,110.3326 L 68.093332,113.83367 L 68.093332,117.33475 L 67.201562,117.4709 C 63.938792,117.96903 61.691228,119.3823 60.146439,121.90717 C 59.781599,122.50348 59.429963,122.99137 59.365024,122.99137 C 59.300093,122.99137 59.246954,120.06403 59.246954,116.48617 z"
+       id="path5507"
+       style="opacity:1;fill:#523526;fill-opacity:1;fill-rule:evenodd;stroke:#523526;stroke-width:1.44840074;stroke-miterlimit:8.69999981;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer30"
+     style="display:inline">
+    <path
+       d="M 68.259002,57.94867 L 77.269872,57.94867 L 77.269872,65.553849 L 68.259002,65.553849 L 68.259002,57.94867 z"
+       id="rect5329"
+       style="fill:#804017;fill-opacity:1;fill-rule:evenodd;stroke:#804017;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer31"
+     style="display:inline">
+    <path
+       d="M 67.463912,65.771144 L 77.004832,65.771144 L 77.004832,73.159033 L 67.463912,73.159033 L 67.463912,65.771144 z"
+       id="rect5332"
+       style="fill:#936a48;fill-opacity:1;fill-rule:evenodd;stroke:#936a48;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer32"
+     style="display:inline">
+    <path
+       d="M 67.993972,73.810883 L 77.534902,73.810883 L 77.534902,87.717503 L 67.993972,87.717503 L 67.993972,73.810883 z"
+       id="rect5341"
+       style="fill:#c27739;fill-opacity:1;fill-rule:evenodd;stroke:#c27739;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer33"
+     style="display:inline">
+    <path
+       d="M 67.728952,103.36245 L 76.474792,103.36245 L 76.474792,109.88117 L 67.728952,109.88117 L 67.728952,103.36245 z"
+       id="rect5344"
+       style="fill:#727476;fill-opacity:1;fill-rule:evenodd;stroke:#727476;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 86.015712,80.764203 L 95.026582,80.764203 L 95.026582,87.500223 L 86.015712,87.500223 L 86.015712,80.764203 z"
+       id="rect5346"
+       style="fill:#727476;fill-opacity:1;fill-rule:evenodd;stroke:#727476;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer34"
+     style="display:inline">
+    <path
+       d="M 77.562952,64.924974 L 85.457612,64.924974 L 85.457612,72.484149 L 77.562952,72.484149 L 77.562952,64.924974 z"
+       id="rect5349"
+       style="fill:#a7602a;fill-opacity:1;fill-rule:evenodd;stroke:#a7602a;stroke-width:0.96462673;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer35"
+     style="display:inline">
+    <path
+       d="M 77.004842,72.941727 L 85.750682,72.941727 L 85.750682,80.329613 L 77.004842,80.329613 L 77.004842,72.941727 z"
+       id="rect5352"
+       style="fill:#cc914e;fill-opacity:1;fill-rule:evenodd;stroke:#cc914e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer36"
+     style="display:inline">
+    <path
+       d="M 77.534902,80.329623 L 85.750692,80.329623 L 85.750692,88.152083 L 77.534902,88.152083 L 77.534902,80.329623 z"
+       id="rect5355"
+       style="fill:#c18c57;fill-opacity:1;fill-rule:evenodd;stroke:#c18c57;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer37"
+     style="display:inline">
+    <path
+       d="M 77.004842,88.803973 L 85.485652,88.803973 L 85.485652,94.888103 L 77.004842,94.888103 L 77.004842,88.803973 z"
+       id="rect5358"
+       style="fill:#c1a080;fill-opacity:1;fill-rule:evenodd;stroke:#c1a080;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer38"
+     style="display:inline">
+    <path
+       d="M 85.750692,88.152083 L 95.291612,88.152083 L 95.291612,95.105383 L 85.750692,95.105383 L 85.750692,88.152083 z"
+       id="rect5361"
+       style="fill:#c5c5c1;fill-opacity:1;fill-rule:evenodd;stroke:#c5c5c1;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+    <path
+       d="M 104.56752,72.941727 L 113.04833,72.941727 L 113.04833,80.329613 L 104.56752,80.329613 L 104.56752,72.941727 z"
+       id="rect5363"
+       style="fill:#c5c5c1;fill-opacity:1;fill-rule:evenodd;stroke:#c5c5c1;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer39"
+     style="display:inline">
+    <path
+       d="M 85.750692,73.159023 L 94.761552,73.159023 L 94.761552,80.329623 L 85.750692,80.329623 L 85.750692,73.159023 z"
+       id="rect5366"
+       style="fill:#e6d2ba;fill-opacity:1;fill-rule:evenodd;stroke:#e6d2ba;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer40"
+     style="display:inline">
+    <path
+       d="M 77.004842,95.539983 L 85.750682,95.539983 L 85.750682,102.71057 L 77.004842,102.71057 L 77.004842,95.539983 z"
+       id="rect5369"
+       style="fill:#c5b39f;fill-opacity:1;fill-rule:evenodd;stroke:#c5b39f;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer41"
+     style="display:inline">
+    <path
+       d="M 77.004842,103.57975 L 85.750682,103.57975 L 85.750682,109.66389 L 77.004842,109.66389 L 77.004842,103.57975 z"
+       id="rect5374"
+       style="fill:#a0a09e;fill-opacity:1;fill-rule:evenodd;stroke:#a0a09e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer42"
+     style="display:inline">
+    <path
+       d="M 86.280742,102.49327 L 94.761572,102.49327 L 94.761572,109.44659 L 86.280742,109.44659 L 86.280742,102.49327 z"
+       id="rect5377"
+       style="fill:#aaaaa6;fill-opacity:1;fill-rule:evenodd;stroke:#aaaaa6;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer43"
+     style="display:inline">
+    <path
+       d="M 94.292382,102.54319 L 102.38643,102.54319 L 102.38643,110.04856 L 94.292382,110.04856 L 94.292382,102.54319 z"
+       id="rect5380"
+       style="fill:#a4a5a2;fill-opacity:1;fill-rule:evenodd;stroke:#a4a5a2;stroke-width:1.02406108;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer44"
+     style="display:inline">
+    <path
+       d="M 95.556632,80.546903 L 104.03745,80.546903 L 104.03745,87.717503 L 95.556632,87.717503 L 95.556632,80.546903 z"
+       id="rect5383"
+       style="fill:#171614;fill-opacity:1;fill-rule:evenodd;stroke:#171614;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer45"
+     style="display:inline">
+    <path
+       d="M 95.556632,88.152083 L 103.24237,88.152083 L 103.24237,94.453513 L 95.556632,94.453513 L 95.556632,88.152083 z"
+       id="rect5386"
+       style="fill:#a0a09e;fill-opacity:1;fill-rule:evenodd;stroke:#a0a09e;stroke-width:0.91382182;stroke-miterlimit:8.69999981;stroke-opacity:1" />
+  </g>
+</svg>

aMule-2.3.1.tar.bz2/src/utils/plasmamule/ed2k.protocol Added

aMule-2.3.1.tar.bz2/src/utils/plasmamule/magnet.protocol Added

aMule-2.3.1.tar.bz2/src/utils/plasmamule/plasma-applet-plasmamule.cpp Added

@@ -0,0 +1,520 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2010-2011 Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>
+//
+// Any parts of this program 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 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, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+//
+#include "plasma-applet-plasmamule.h"
+#include "plasmamule-dbus.h"
+
+#include <kaboutapplicationdialog.h>
+#include <kaboutdata.h>
+#include <kdebug.h>
+#include <kicon.h>
+#include <kplugininfo.h>
+#include <krun.h>
+#include <kservice.h>
+
+#include <plasma/svg.h>
+#include <plasma/theme.h>
+#include <plasma/version.h>
+
+#include <QApplication>
+#include <QClipboard>
+#include <QFontMetrics>
+#include <QMenu>
+#include <QPainter>
+#include <QSizeF>
+#include <QStringList>
+
+K_EXPORT_PLASMA_APPLET(plasma-applet-plasmamule, PlasmaMuleApplet)
+
+PlasmaMuleApplet::PlasmaMuleApplet(QObject *parent, const QVariantList &args)
+	: Plasma::Applet(parent, args),
+	m_svg(this)
+{
+	QString path = __IMG_PATH__;
+	path.append( "application-x-emulecollection.svg");
+	m_svg.setImagePath(path);
+	setBackgroundHints(TranslucentBackground);
+	setMinimumSize(200, 200);
+	setMaximumSize(300, 300);
+	setAcceptDrops(TRUE);
+	setHasConfigurationInterface(FALSE);
+}
+
+PlasmaMuleApplet::~PlasmaMuleApplet()
+{
+}
+ 
+void PlasmaMuleApplet::init()
+{
+	m_debugChannel = KDebug::registerArea ("plasmamule-applet", 
+#ifdef __DEBUG__
+	true
+#else
+	false
+#endif
+	);
+	connectToEngine();
+}
+
+void PlasmaMuleApplet::paintInterface(QPainter *painter,
+	const QStyleOptionGraphicsItem *option, const QRect &contentsRect)
+{
+	painter->setRenderHint(QPainter::SmoothPixmapTransform);
+	painter->setRenderHint(QPainter::Antialiasing);
+	QPixmap pixmap;
+	pixmap = m_svg.pixmap();
+	QPixmap temp(pixmap.size());
+	temp.fill(Qt::transparent);
+	QPainter p(&temp);
+	p.setCompositionMode(QPainter::CompositionMode_Source);
+	p.drawPixmap(0, 0, pixmap);
+	p.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+	p.fillRect(temp.rect(), QColor(0, 0, 0, 200));
+	p.end();
+	pixmap = temp;
+	painter->drawPixmap(contentsRect, pixmap);
+	painter->save();
+	painter->setPen(Qt::red);
+	QFont font = painter->font();
+	font.setBold(true);
+	painter->setFont(font);
+	if (!m_config_found)
+	{	
+		painter->drawText(contentsRect, Qt::AlignCenter,
+		"aMule not configured or installed");
+	}
+	else if (!m_os_active)
+	{	
+		painter->drawText(contentsRect, Qt::AlignCenter,
+		"Online Signature disabled");
+	} else if (m_uptime == 0)
+	{
+		painter->drawText(contentsRect, Qt::AlignCenter,
+		"aMule is not running\n");
+	} else {
+		QString message;
+		painter->setPen(Qt::black);
+		int time, days, hours, minutes;
+		QString runtime;
+		days = m_uptime/86400;
+		time = m_uptime%86400;
+		hours=time/3600;
+		time=time%3600;
+		minutes=time/60;
+		time=time%60;
+
+		runtime = QString("%1:%2:%3").arg(hours, 2, 10, QLatin1Char('0')).arg(minutes, 2, 10, QLatin1Char('0')).arg(time, 2, 10, QLatin1Char('0'));
+
+		if (days)
+		{
+			if (days = 1)
+			{
+				runtime.prepend(QString("%1 day ").arg(days));
+			} else {
+				runtime.prepend(QString("%1 days ").arg(days));
+			}
+		}
+		message = QString("%1 has been running for %2 \n\n").arg(m_version).arg(runtime);
+		if (m_ed2k_state == 0 && m_kad_status == 0)
+		{
+			message.append(QString("%1 is not connected ").arg(m_nickname));
+			message.append("but running\n\n");
+		}
+		else if (m_ed2k_state == 0 && m_kad_status != 0)
+		{
+			message.append(QString("%1 is connected to ").arg(m_nickname));
+			if (m_kad_status == 1)
+			{
+				message.append("Kad: firewalled \n\n");
+			} else {
+				message.append("Kad: ok \n\n");
+			}
+		} else {
+			message.append(QString("%1 is connected to %2 [%3:%4] with ").arg(m_nickname).arg(m_ed2k_server_name).arg(m_ed2k_server_ip).arg(m_ed2k_server_port));
+			if (m_kad_status == 1)
+			{
+				if (m_ed2k_id_high_low == "H")
+				{
+					message.append("HighID | Kad: firewalled \n\n");
+				} else {
+					message.append("LowID | Kad: firewalled \n\n");
+				}
+			} else if (m_kad_status == 2)
+			{
+				if (m_ed2k_id_high_low == "H")
+				{
+					message.append("HighID | Kad: ok \n\n");
+				} else {
+					message.append("LowID | Kad: ok \n\n");
+				}
+			} else {
+				if (m_ed2k_id_high_low == "H")
+				{
+					message.append("HighID | Kad: off \n\n");
+				} else {
+					message.append("LowID | Kad: off \n\n");
+				}
+			}
+		}
+		message.append(QString("Total Download: %1, Upload: %2\n\n").arg(calcSize(m_total_bytes_downloaded)).arg(calcSize(m_total_bytes_uploaded)));
+		message.append(QString("Session Download: %1, Upload: %2\n\n").arg(calcSize(m_session_bytes_downloaded)).arg(calcSize(m_session_bytes_uploaded)));
+		message.append(QString("Download: %L1 kB/s, Upload: %L2 kB/s\n\n").arg(m_down_speed, 0 , 'f', 1).arg(m_up_speed,0 ,'f', 1));
+		QString files_unit;
+		if (m_shared_files_count == 1)
+		{
+			files_unit = "file";
+		} else {
+			files_unit = "files";
+		}
+		message.append(QString("Sharing: %1 %2, Clients on queue: %3").arg(m_shared_files_count).arg(files_unit).arg(m_clients_in_up_queue));
+		painter->drawText(contentsRect, Qt::TextDontClip | Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap, message);
+
+		if (painter->boundingRect(contentsRect, Qt::TextDontClip | Qt::AlignTop | Qt::AlignLeft | Qt::TextWordWrap,
+			 message).height() > contentsRect.height())
+		{
+			kDebug(m_debugChannel) << "Resizing";
+			resize(painter->boundingRect(contentsRect, message).height()+(contentsRect.topLeft().y()*2),
+				painter->boundingRect(contentsRect, message).height()+(contentsRect.topLeft().y()*2));
+		}
+	}
+	painter->restore();
+}
+
+QString PlasmaMuleApplet::calcSize (qlonglong in_size)
+{
+	int unit=0;
+	double size;
+	QStringList units;
+	units << "Bytes" << "kBs" << "MBs" << "GBs" << "TBs" << "PBs" << "BBs" << "ZBs" << "YBs";
+
+	while (in_size >1023)
+	{
+		in_size /= 1024;
+		unit++;
+	}
+
+	size = (in_size * 1024) / 1024;
+	return QString("%L1 %2").arg(size, 0, 'f', 2).arg(units.at(unit));
+}
+
+void PlasmaMuleApplet::connectToEngine()
+{
+	m_aMuleEngine = dataEngine("plasmamule");
+	m_aMuleEngine->connectAllSources(this, 0);
+	connect(m_aMuleEngine, SIGNAL(sourceAdded(const QString&)), this, SLOT(onSourceAdded(const QString&)));
+	connect(m_aMuleEngine, SIGNAL(sourceRemoved(const QString&)), this, SLOT(onSourceRemoved(const QString&)));
+}
+
+void PlasmaMuleApplet::onSourceAdded(const QString& source)
+{
+	kDebug(m_debugChannel) << "New Source: " << source << " added";
+	m_aMuleEngine->connectSource(source, this, 0);
+}
+
+void PlasmaMuleApplet::onSourceRemoved(const QString& source)
+{
+	kDebug(m_debugChannel) << "Source: " << source << " removed";
+	update();
+}
+
+void PlasmaMuleApplet::dataUpdated(const QString& source, const Plasma::DataEngine::Data &data)
+{
+	if (data.isEmpty())
+	{
+		return;
+	}
+
+	bool needs_update = FALSE;
+	kDebug(m_debugChannel) << "Updating data" << data;
+	if (data["cat_dirs"].toStringList() != m_catDirs && data.contains("cat_dirs"))
+	{
+		m_catDirs = data["cat_dirs"].toStringList();
+	}
+	if (data["cat_names"].toStringList() != m_catNames && data.contains("cat_names"))
+	{
+		m_catNames = data["cat_names"].toStringList();
+	}
+	if (data["os_active"].toBool() != m_os_active && data.contains("os_active"))
+	{
+		m_os_active = data["os_active"].toBool();
+		needs_update = TRUE;
+	}
+	if (data["config_found"].toBool() != m_config_found && data.contains("config_found"))
+	{
+		m_config_found = data["config_found"].toBool();
+		needs_update = TRUE;
+	}
+	if (data["ed2k_state"].toInt() != m_ed2k_state && data.contains("ed2k_state"))
+	{
+		m_ed2k_state = data["ed2k_state"].toInt();
+		needs_update = TRUE;
+	}
+	if (data["ed2k_server_name"] != m_ed2k_server_name && data.contains("ed2k_server_name"))
+	{
+		m_ed2k_server_name = data["ed2k_server_name"].toString();
+		needs_update = TRUE;
+	}
+	if (data["ed2k_server_ip"] != m_ed2k_server_ip && data.contains("ed2k_server_ip"))
+	{
+		m_ed2k_server_ip = data["ed2k_server_ip"].toString();
+		needs_update = TRUE;
+	}
+	if (data["ed2k_server_port"].toInt() != m_ed2k_server_port && data.contains("ed2k_server_port"))
+	{
+		m_ed2k_server_port = data["ed2k_server_port"].toInt();
+		needs_update = TRUE;
+	}
+	if (data["ed2k_id_high_low"] != m_ed2k_id_high_low && data.contains("ed2k_id_high_low"))
+	{
+		m_ed2k_id_high_low = data["ed2k_id_high_low"].toString();
+		needs_update = TRUE;
+	}
+	if (data["kad_status"].toInt() != m_kad_status && data.contains("kad_status"))
+	{
+		m_kad_status = data["kad_status"].toInt();
+		needs_update = TRUE;
+	}
+	if (data["down_speed"].toInt() != m_down_speed && data.contains("down_speed"))
+	{
+		m_down_speed = data["down_speed"].toDouble();
+		needs_update = TRUE;
+	}
+	if (data["up_speed"].toDouble() != m_up_speed && data.contains("up_speed"))
+	{
+		m_up_speed = data["up_speed"].toDouble();
+		needs_update = TRUE;
+	}
+	if (data["clients_in_up_queue"].toInt() != m_clients_in_up_queue && data.contains("clients_in_up_queue"))
+	{
+		m_clients_in_up_queue = data["clients_in_up_queue"].toInt();
+		needs_update = TRUE;
+	}
+	if (data["shared_files_count"].toInt() != m_shared_files_count && data.contains("shared_files_count"))
+	{
+		m_shared_files_count = data["shared_files_count"].toInt();
+		needs_update = TRUE;
+	}
+	if (data["nickname"] != m_nickname && data.contains("nickname"))
+	{
+		m_nickname = data["nickname"].toString();
+		needs_update = TRUE;
+	}
+	if (data["total_bytes_downloaded"].toLongLong() != m_total_bytes_downloaded && data.contains("total_bytes_downloaded"))
+	{
+		m_total_bytes_downloaded = data["total_bytes_downloaded"].toLongLong();
+		needs_update = TRUE;
+	}
+	if (data["total_bytes_uploaded"].toLongLong() != m_total_bytes_uploaded && data.contains("total_bytes_uploaded"))
+	{
+		m_total_bytes_uploaded = data["total_bytes_uploaded"].toLongLong();
+		needs_update = TRUE;
+	}
+	if (data["version"] != m_version && data.contains("version"))
+	{
+		m_version = data["version"].toString();
+		needs_update = TRUE;
+	}
+	if (data["session_bytes_downloaded"].toLongLong() != m_session_bytes_downloaded && data.contains("session_bytes_downloaded"))
+	{
+		m_session_bytes_downloaded = data["session_bytes_downloaded"].toLongLong();
+		needs_update = TRUE;
+	}
+	if (data["session_bytes_uploaded"].toLongLong() != m_session_bytes_uploaded && data.contains("session_bytes_uploaded"))
+	{
+		m_session_bytes_uploaded = data["session_bytes_uploaded"].toLongLong();
+		needs_update = TRUE;
+	}
+	if (data["uptime"].toInt() != m_uptime && data.contains("uptime"))
+	{
+		m_uptime = data["uptime"].toInt();
+		needs_update = TRUE;
+	}
+
+	if (needs_update)
+	{
+		kDebug(m_debugChannel) << "Updating view";
+		update();
+	}
+}
+
+void PlasmaMuleApplet::dragEnterEvent(QGraphicsSceneDragDropEvent * event)
+{
+	kDebug(m_debugChannel) << "Dragged Data detected " << event;
+	if (event->mimeData()->hasUrls())
+	{
+		event->acceptProposedAction();
+	}
+}
+
+void PlasmaMuleApplet::dropEvent(QGraphicsSceneDragDropEvent * event)
+{
+	QStringList::const_iterator constIterator;
+
+	event->acceptProposedAction();
+
+	QMenu *menu = new QMenu;
+
+	if (m_catNames.count() == 1)
+	{
+		sendLinkToEngine (event->mimeData()->text(), 0, this, m_debugChannel);
+	} else {
+		for (constIterator = m_catNames.constBegin(); constIterator != m_catNames.constEnd(); constIterator++)
+		{
+			menu->addAction(*constIterator);
+			if (constIterator != m_catNames.constEnd())
+			{
+				menu->addSeparator();
+			}
+		}
+
+		QAction *cat_selection = menu->exec(QCursor::pos());
+		if (cat_selection)
+		{
+				sendLinkToEngine (event->mimeData()->text(), m_catNames.indexOf(cat_selection->text()), this, m_debugChannel);
+		}
+	}
+
+	delete menu;
+}
+
+void PlasmaMuleApplet::contextMenuEvent(QGraphicsSceneContextMenuEvent * event)
+{
+	QStringList::const_iterator constIterator;
+	QMenu menu;
+
+	if (m_catDirs.count() == 1)
+	{
+		menu.addAction (KIcon("folder"), QString("Default"));
+	} else {
+		QMenu *open_sub_menu = menu.addMenu("Open Incoming");
+		for (constIterator = m_catNames.constBegin(); constIterator != m_catNames.constEnd(); constIterator++)
+		{
+			open_sub_menu->addAction(KIcon("folder"), "Folder for " + *constIterator);
+			if (constIterator != m_catNames.constEnd())
+			{
+				open_sub_menu->addSeparator();
+			}
+		}
+		menu.addSeparator();
+	}
+
+	QClipboard* clipboard = QApplication::clipboard();
+
+	if (!clipboard->text(QClipboard::Clipboard).isEmpty() || !clipboard->text(QClipboard::Selection).isEmpty())
+	{
+		if (m_catDirs.count() == 1)
+		{
+			if (!clipboard->text(QClipboard::Clipboard).isEmpty())
+			{
+				menu.addAction(KIcon("arrow-down-double"), "Download Link from Clipboard");
+
+				if (!clipboard->text(QClipboard::Selection).isEmpty())
+				{
+					menu.addSeparator();
+				}
+			}
+
+			if (!clipboard->text(QClipboard::Selection).isEmpty())
+			{
+				menu.addAction(KIcon("arrow-down-double"), "Download Link from Selection");
+			}
+		} else 	{
+			QMenu *download_sub_menu = menu.addMenu("Download Link");
+
+			for (constIterator = m_catNames.constBegin(); constIterator != m_catNames.constEnd(); constIterator++)
+			{
+				if (!clipboard->text(QClipboard::Clipboard).isEmpty())
+				{
+					download_sub_menu->addAction(KIcon("arrow-down-double"), "Clipboard->" + *constIterator);
+
+					if (!clipboard->text(QClipboard::Selection).isEmpty())
+					{
+						download_sub_menu->addSeparator();
+					}
+				}
+
+				if (!clipboard->text(QClipboard::Selection).isEmpty())
+				{
+					download_sub_menu->addAction(KIcon("arrow-down-double"), "Selection->" + *constIterator);
+				}
+
+				if (constIterator != m_catNames.constEnd())
+				{
+				download_sub_menu->addSeparator();
+				}
+			}
+		}
+	}
+
+	menu.addSeparator();
+	menu.addAction(KIcon("documentinfo"), "About");
+
+	QAction* selectedItem = menu.exec(QCursor::pos());
+	if (selectedItem)
+	{
+		if (selectedItem->text() == "About")
+		{
+			KPluginInfo* service = new KPluginInfo (KService::serviceByDesktopName ("plasma-applet-plasmamule"));
+			KAboutData* aboutData = new KAboutData (service->name().toUtf8(),
+				service->name().toUtf8(),
+				ki18n(service->pluginName().toUtf8()),
+				service->version().toUtf8(),
+				ki18n(service->comment().toUtf8()),
+				KAboutData::License_GPL_V3,
+				ki18n(QByteArray()),
+				ki18n(QByteArray()),
+				service->website().toLatin1(),
+				service->email().toLatin1());
+			aboutData->addAuthor (ki18n(service->author().toUtf8()),
+				ki18n(QByteArray()),
+				service->email().toLatin1(),
+				service->website().toLatin1());
+			aboutData->setTranslator(ki18nc ("NAME OF TRANSLATORS", "Your names"),
+				ki18nc("EMAIL OF TRANSLATORS", "Your emails"));
+			aboutData->setProgramIconName (service->icon());
+
+			KAboutApplicationDialog* about = new KAboutApplicationDialog(aboutData, KAboutApplicationDialog::HideTranslators);
+			about->exec();
+		} else if (selectedItem->text().startsWith("Folder for"))
+		{
+			kDebug(m_debugChannel) << "Opening Folder " << m_catDirs.at(m_catNames.indexOf(selectedItem->text().remove("Folder for ")));
+			KUrl url(m_catDirs.at(m_catNames.indexOf(selectedItem->text().remove("Folder for "))) + "/");
+                	(void) new KRun( url, 0, true );
+		} else if (selectedItem->text().startsWith("Download"))
+		{
+			if (selectedItem->text().remove("Download Link from ") == "Clipboard")
+			{
+				sendLinkToEngine (clipboard->text(QClipboard::Clipboard), 0, this, m_debugChannel);
+			} else {
+				sendLinkToEngine (clipboard->text(QClipboard::Selection), 0, this, m_debugChannel);
+			}
+		} else if (selectedItem->text().startsWith("Clipboard->"))
+		{
+			sendLinkToEngine (clipboard->text(QClipboard::Clipboard), m_catNames.indexOf(selectedItem->text().remove("Clipboard->")), this, m_debugChannel);
+		} else if (selectedItem->text().startsWith("Selection->"))
+		{
+			sendLinkToEngine (clipboard->text(QClipboard::Selection), m_catNames.indexOf(selectedItem->text().remove("Selection->")), this, m_debugChannel);
+		}
+	}
+}
+
+#include "plasma-applet-plasmamule.moc"

aMule-2.3.1.tar.bz2/src/utils/plasmamule/plasma-applet-plasmamule.desktop Added

aMule-2.3.1.tar.bz2/src/utils/plasmamule/plasma-applet-plasmamule.h Added

@@ -0,0 +1,70 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2010-2011 Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>
+//
+// Any parts of this program 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 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, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+//
+
+#ifndef plasmamule_applet_h
+#define plasmamule_applet_h
+
+#include <plasma/applet.h>
+#include <plasma/dataengine.h>
+
+#include <QGraphicsSceneDragDropEvent>
+
+
+class PlasmaMuleApplet : public Plasma::Applet
+{
+	Q_OBJECT
+	public:
+		PlasmaMuleApplet(QObject *parent, const QVariantList &args);
+		~PlasmaMuleApplet();
+
+		void paintInterface(QPainter *painter, const QStyleOptionGraphicsItem *option, const QRect& contentsRect);
+		void init();
+		
+	public Q_SLOTS:
+		void onSourceAdded(const QString&);
+		void onSourceRemoved(const QString&);
+		void dataUpdated(const QString&, const Plasma::DataEngine::Data&);
+
+	protected:
+		void dragEnterEvent(QGraphicsSceneDragDropEvent *event);
+		void dropEvent(QGraphicsSceneDragDropEvent *event);
+		void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
+
+	private:
+		void connectToEngine();
+
+		QString calcSize (qlonglong);
+		QStringList m_catDirs, m_catNames;
+		int m_ed2k_state, m_ed2k_server_port, m_kad_status, m_clients_in_up_queue, m_shared_files_count, m_uptime, m_debugChannel;
+		QString  m_ed2k_id_high_low, m_ed2k_server_name, m_ed2k_server_ip, m_nickname, m_version;
+		double m_down_speed, m_up_speed;
+		qlonglong m_total_bytes_downloaded, m_total_bytes_uploaded, m_session_bytes_downloaded, m_session_bytes_uploaded;
+		bool m_os_active, m_config_found;
+		Plasma::Svg m_svg;
+		Plasma::DataEngine* m_aMuleEngine;
+
+	signals:
+		void engine_add_link(QString, int);
+};
+ 
+#endif

aMule-2.3.1.tar.bz2/src/utils/plasmamule/plasma-engine-plasmamule.cpp Added

@@ -0,0 +1,369 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2010-2011 Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>
+//
+// Any parts of this program 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 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, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+//
+
+#include "plasma-engine-plasmamule.h"
+#include "qt-emc.h"
+
+#include <kdebug.h>
+#include <knotification.h>
+
+#include <kio/scheduler.h>
+
+#include <plasma/datacontainer.h>
+
+#include <QDir>
+#include <QTimer>
+
+#include <QtDBus/QDBusInterface>
+
+PlasmaMuleEngine::PlasmaMuleEngine (QObject* parent, const QVariantList& args)
+	: Plasma::DataEngine (parent, args)
+{
+	Q_UNUSED (args)
+	setMinimumPollingInterval (0);
+}
+
+bool PlasmaMuleEngine::sourceRequestEvent (const QString &name)
+{
+	return updateSourceEvent (name);
+}
+
+QStringList PlasmaMuleEngine::sources() const
+{
+	return QStringList() << "cat_dirs"
+		<< "cat_names"
+		<< "clients_in_up_queue"
+		<< "config_found"
+		<< "down_speed"
+		<< "ed2k_state"
+		<< "ed2k_server_name"
+		<< "ed2k_server_ip"
+		<< "ed2k_server_port"
+		<< "ed2k_id_high_low"
+		<< "kad_status"
+		<< "nickname"
+		<< "os_active"
+		<< "session_bytes_downloaded"
+		<< "session_bytes_uploaded"
+		<< "shared_files_count"
+		<< "total_bytes_downloaded"
+		<< "total_bytes_uploaded"
+		<< "up_speed"
+		<< "uptime"
+		<< "version";
+}
+
+void PlasmaMuleEngine::init ()
+{
+	Home = QDir::homePath();
+
+	QTimer *timer = new QTimer(this);
+	connect(timer, SIGNAL(timeout()), this, SLOT(timeout()));
+	timer->start(60000);
+	m_timer = TRUE;
+	setData(I18N_NOOP("uptime"), 0);
+
+	if (!Home.endsWith("/"))
+	{
+		Home += "/";
+	}
+
+	m_debugChannel = KDebug::registerArea ("plasmamule-engine", 
+#ifdef __DEBUG__
+	true
+#else
+	false
+#endif
+	);
+  
+	regDbus();
+	initVals();
+}
+
+void PlasmaMuleEngine::regDbus ()
+{
+	new EngineAdaptor(this);
+	QDBusConnection dbus = QDBusConnection::sessionBus();
+	dbus.registerObject("/Link", this);
+	kDebug(m_debugChannel) << "Registerred dbus: " << dbus.registerService("org.amule.engine");
+}
+
+void PlasmaMuleEngine::downloadFinished (KIO::Job* job,const QByteArray& data)
+{
+
+	if (data.length() == 0)
+	{
+		KNotification::event(KNotification::Notification, QString("Download of %1 failed.").arg(job->queryMetaData("Name")));
+		return;
+	}
+
+	kDebug(m_debugChannel) << QString("Finished download of %1").arg(job->queryMetaData("Name"));
+
+	QString downloadFileName(QString("/tmp/plasmamule-download-%1.emulecollection").arg(qrand()));
+
+	QFile downloadFile(downloadFileName);
+
+	if (!downloadFile.open (QIODevice::WriteOnly | QIODevice::Append))
+	{
+		KNotification::event(KNotification::Notification, QString("%1 can't be written to temp-file.").arg(job->queryMetaData("Name")));
+		return;
+	}
+
+	QDataStream out(&downloadFile);
+	out.writeRawData(data, data.length());
+	downloadFile.close();
+
+	engine_add_link (downloadFileName, job->queryMetaData("Category").toInt(), job->queryMetaData("Name"));
+
+	downloadFile.remove();
+}
+
+void PlasmaMuleEngine::engine_add_link (const QString &link, const int &category, const QString &printname)
+{
+	kDebug(m_debugChannel) << "Received Link " << link << " with cat " << category;
+
+	QString link_to_write;
+
+	
+	if (link.startsWith("ed2k:") || link.startsWith("magnet:"))
+	{
+		link_to_write = link;
+
+		if (category > 0)
+		{
+			link_to_write.append(QString(":%1").arg(category));
+		}
+
+		link_to_write.append("\n");
+	} else if (link.contains(".emulecollection") && KUrl(link).isLocalFile())
+	{
+		qtEmc* collection = new qtEmc(link);
+		if (collection->isValid())
+		{
+			QStringList links = collection->getLinks();
+			for (QStringList::const_iterator constIterator = links.constBegin(); constIterator != links.constEnd(); constIterator++)
+			{
+				link_to_write.append(*constIterator);
+
+				if (category > 0)
+				{
+					link_to_write.append(QString(":%1").arg(category));
+				}
+
+				link_to_write.append("\n");
+			}
+		} else {
+			KNotification::event(KNotification::Notification, collection->getErrorMessage());
+		}
+
+		delete collection;
+	} else {
+		KIO::TransferJob *job = KIO::get(KUrl(link));
+		job->addMetaData("Name", link);
+		job->addMetaData("Category", QString(category));
+		connect (job, SIGNAL(data(KIO::Job *, const QByteArray&)), this,
+			SLOT(downloadFinished(KIO::Job *,const QByteArray&)));
+		kDebug(m_debugChannel) << QString("Starting download of %1").arg(printname);
+		return;
+	}
+
+	QFile link_file (Home + ".aMule/ED2KLinks");
+
+	if (!link_file.open (QIODevice::WriteOnly | QIODevice::Append))
+	{
+		KNotification::event(KNotification::Notification, QString("Problem opening %1 for writing").arg(link_file.fileName()));
+		return;
+	}
+
+	QTextStream out (&link_file);
+	out << link_to_write;
+	out.flush();
+	link_file.close();
+
+	KNotification::event(KNotification::Notification, QString("Downloading %1").arg(printname));
+
+}
+
+void PlasmaMuleEngine::initVals ()
+{
+	QStringList catDir;
+	QStringList catName;
+	QStringList tempIncomingDirs;
+	QStringList cleanedIncomingDirs;
+	QStringList::const_iterator constIterator;
+
+	QFile config_file (Home + ".aMule/amule.conf");
+
+	catName.append("Default");
+	if (!config_file.open (QIODevice::ReadOnly | QIODevice::Text))
+	{
+		setData(I18N_NOOP ("config_found"), FALSE);
+		return;
+	}
+
+	QTextStream in (&config_file);
+	while (!in.atEnd())
+	{
+		QString line = in.readLine();
+		if (line.startsWith ("OnlineSignature="))
+		{
+			if (line.remove (0,line.indexOf ("=")+1) == "1")
+			{
+				m_OSActive = TRUE;
+			} else {
+				m_OSActive = FALSE;
+			}
+
+			setData(I18N_NOOP ("os_active"), m_OSActive);
+		} else if (line.contains ("OSDirectory"))
+		{
+			m_OSFile.setFileName(line.remove (0,line.indexOf ("=")+1) + "amulesig.dat");
+
+		} else if (line.contains ("Incoming"))
+		{
+			if (!tempIncomingDirs.contains(line.remove (0,line.indexOf ("=")+1)))
+			{
+				tempIncomingDirs.append(line.remove (0,line.indexOf ("=")+1));
+			}
+
+			catDir.append(line.remove (0,line.indexOf ("=")+1));
+		} else if (line.startsWith ("Title"))
+		{
+			catName.append(line.remove (0,line.indexOf ("=")+1));
+		}
+        }
+
+	setData(I18N_NOOP ("cat_names"), catName);
+	setData(I18N_NOOP ("cat_dirs"), catDir);
+
+	if (m_OSActive && !m_dirwatcher.contains(m_OSFile.fileName()))
+	{
+		kDebug(m_debugChannel) << "Registering: " << m_OSFile.fileName() << " for monitoring";
+		m_dirwatcher.addFile (m_OSFile.fileName());
+		connect (&m_dirwatcher, SIGNAL (dirty (const QString &)), SLOT (file_changed (const QString&)));
+		connect (&m_dirwatcher, SIGNAL (created (const QString &)), SLOT (new_file (const QString&)));
+	}
+
+	for (constIterator = tempIncomingDirs.constBegin(); constIterator != tempIncomingDirs.constEnd(); constIterator++)
+	{
+		if (!m_dirwatcher.contains(*constIterator))
+		{
+			kDebug(m_debugChannel) << "Registering: " << *constIterator << " for monitoring";
+			cleanedIncomingDirs.append (*constIterator);
+			m_dirwatcher.addDir (*constIterator, KDirWatch::WatchFiles);
+		} else {
+			cleanedIncomingDirs.append (*constIterator);
+		}
+	}
+
+	for (constIterator = m_incoming_dirs.constBegin(); constIterator != m_incoming_dirs.constEnd(); constIterator++)
+	{
+		if (!cleanedIncomingDirs.contains (*constIterator))
+		{
+			kDebug(m_debugChannel) << "Removing " << *constIterator << " from monitored dirs";
+			m_dirwatcher.removeDir (*constIterator);
+		}
+	}
+
+	m_incoming_dirs = cleanedIncomingDirs;
+	config_file.close ();
+	setName("plasmamule");
+	setData(I18N_NOOP ("config_found"), TRUE);
+	scheduleSourcesUpdated();
+}
+
+void PlasmaMuleEngine::file_changed (const QString &path)
+{
+	if (path == m_OSFile.fileName())
+	{
+		kDebug(m_debugChannel) << "Rereading " << path;
+		updateSourceEvent ("dummy");
+	}
+}
+
+void PlasmaMuleEngine::new_file (const QString &path)
+{
+	if (path != m_OSFile.fileName())
+	{
+		kDebug(m_debugChannel) << "File " << path << "was created";
+		KNotification::event(KNotification::Notification, QString("Finished Download of %1").arg(path));
+	} else {
+		kDebug(m_debugChannel) << "Rereading " << path;
+		updateSourceEvent ("dummy");
+	}
+}
+
+void PlasmaMuleEngine::timeout()
+{
+	initVals();
+}
+
+bool PlasmaMuleEngine::updateSourceEvent(const QString &name)
+{
+	Q_UNUSED (name)
+
+	if (m_OSFile.open (QIODevice::ReadOnly | QIODevice::Text) && m_OSActive)
+	{
+		QTextStream in (&m_OSFile);
+		setData(I18N_NOOP("ed2k_state"), in.readLine().toInt());
+		setData(I18N_NOOP("ed2k_server_name"), in.readLine());
+		setData(I18N_NOOP("ed2k_server_ip"), in.readLine());
+		setData(I18N_NOOP("ed2k_server_port"), in.readLine().toInt());
+		setData(I18N_NOOP("ed2k_id_high_low"), in.readLine());
+		setData(I18N_NOOP("kad_status"), in.readLine().toInt());
+		setData(I18N_NOOP("down_speed"), in.readLine().toDouble());
+		setData(I18N_NOOP("up_speed"), in.readLine().toDouble());
+		setData(I18N_NOOP("clients_in_up_queue"), in.readLine().toInt());
+		setData(I18N_NOOP("shared_files_count"), in.readLine().toInt());
+		setData(I18N_NOOP("nickname"), in.readLine());
+		setData(I18N_NOOP("total_bytes_downloaded"), in.readLine().toLongLong());
+		setData(I18N_NOOP("total_bytes_uploaded"), in.readLine().toLongLong());
+		setData(I18N_NOOP("version"), in.readLine());
+		setData(I18N_NOOP("session_bytes_downloaded"), in.readLine().toLongLong());
+		setData(I18N_NOOP("session_bytes_uploaded"), in.readLine().toLongLong());
+		setData(I18N_NOOP("uptime"), in.readLine().toInt());
+		m_OSFile.close();
+		scheduleSourcesUpdated();
+		return true;
+	} else {
+		return false;
+	}
+}
+
+K_EXPORT_PLASMA_DATAENGINE(plasmamule, PlasmaMuleEngine)
+
+EngineAdaptor::EngineAdaptor(QObject *parent): QDBusAbstractAdaptor(parent)
+{
+	setAutoRelaySignals(true);
+}
+
+EngineAdaptor::~EngineAdaptor()
+{
+}
+
+void EngineAdaptor::engine_add_link(const QString &link, const int &category)
+{
+	QMetaObject::invokeMethod(parent(), "engine_add_link", Q_ARG(QString, link), Q_ARG(int, category), Q_ARG(QString, link));
+}
+
+#include "plasma-engine-plasmamule.moc"

aMule-2.3.1.tar.bz2/src/utils/plasmamule/plasma-engine-plasmamule.desktop Added

aMule-2.3.1.tar.bz2/src/utils/plasmamule/plasma-engine-plasmamule.h Added

@@ -0,0 +1,94 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2010-2011 Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>
+//
+// Any parts of this program 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 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, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+//
+
+#ifndef PLASMAMULENGINE_H
+#define PLASMAMULENGINE_H
+
+#include <kdirwatch.h>
+
+#include <kio/jobclasses.h>
+
+#include <plasma/dataengine.h>
+
+#include <QtDBus/QtDBus>
+#include <QFile>
+#include <QStringList>
+
+class PlasmaMuleEngine : public Plasma::DataEngine
+{
+
+	Q_OBJECT
+
+	public:
+		PlasmaMuleEngine(QObject* parent, const QVariantList& args);
+		QStringList sources() const;
+		void init ();
+
+	public Q_SLOTS:
+		Q_SCRIPTABLE void engine_add_link (const QString &link, const int &category, const QString &printname);
+
+	protected:
+		bool sourceRequestEvent(const QString& name);
+		bool updateSourceEvent(const QString& name);
+
+	protected Q_SLOTS:
+		void downloadFinished (KIO::Job *,const QByteArray&);
+		void file_changed (const QString &path);
+		void new_file (const QString &path);
+		void timeout ();
+
+	private:
+		void initVals ();
+		void regDbus ();
+
+		bool m_OSActive, m_timer;
+
+		int m_debugChannel;
+		KDirWatch m_dirwatcher;
+		QFile m_OSFile;
+		QStringList m_incoming_dirs, downloadsNames;
+		QString Home;
+};
+
+class EngineAdaptor: public QDBusAbstractAdaptor
+{
+	Q_OBJECT
+	Q_CLASSINFO("D-Bus Interface", "org.amule.engine")
+	Q_CLASSINFO("D-Bus Introspection", ""
+	"  <interface name=\"org.amule.engine\" >\n"
+	"    <method name=\"engine_add_link\" >\n"
+	"      <arg direction=\"in\" type=\"as\" name=\"link\" />\n"
+	"      <arg direction=\"in\" type=\"i\" name=\"category\" />\n"
+	"    </method>\n"
+	"  </interface>\n"
+        "")
+
+	public:
+		EngineAdaptor(QObject *parent);
+		virtual ~EngineAdaptor();
+
+	public Q_SLOTS:
+		void engine_add_link(const QString &link, const int &category);
+};
+
+#endif // PLASMAMULENGINE_H

aMule-2.3.1.tar.bz2/src/utils/plasmamule/plasmamule-dbus.cpp Added

@@ -0,0 +1,37 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2010-2011 Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>
+//
+// Any parts of this program 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 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, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+//
+
+#include "plasmamule-dbus.h"
+
+#include <kdebug.h>
+
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusInterface>
+
+void sendLinkToEngine (QString link, int cat, QObject* obj, int debugChannel)
+{
+	QDBusConnection bus = QDBusConnection::sessionBus();
+	QDBusInterface *interface = new QDBusInterface("org.amule.engine", "/Link", "org.amule.engine", bus, obj);
+	interface->call("engine_add_link", link, cat);
+	kDebug(debugChannel) << "Sent Link " << link << "with cat " << cat;
+}

aMule-2.3.1.tar.bz2/src/utils/plasmamule/plasmamule-dbus.h Added

@@ -0,0 +1,32 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2010-2011 Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>
+//
+// Any parts of this program 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 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, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+//
+
+#ifndef plasmamule_dbus_h
+#define plasmamule_dbus_h
+
+#include <QString>
+#include <QObject>
+
+void sendLinkToEngine (QString link, int cat, QObject* obj, int);
+
+#endif

aMule-2.3.1.tar.bz2/src/utils/plasmamule/plasmamule-engine-feeder.cpp Added

@@ -0,0 +1,61 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2010-2011 Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>
+//
+// Any parts of this program 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 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, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+//
+#include "plasmamule-dbus.h"
+
+#include <plasma/dataengine.h>
+#include <plasma/applet.h>
+
+#include <QApplication>
+#include <QMenu>
+#include <QStringList>
+
+int main(int argc, char *argv[])
+{
+	QApplication app(argc, argv);
+
+	Plasma::Applet* aMuleEngine = new Plasma::Applet;
+	Plasma::DataEngine::Data data = aMuleEngine->dataEngine("plasmamule")->query(QString("cat_names"));
+
+	QStringList cat_names = data["cat_names"].toStringList();
+	QMenu *menu = new QMenu;
+ 
+	for (QStringList::const_iterator constIterator = cat_names.constBegin(); constIterator != cat_names.constEnd(); constIterator++)
+	{
+		menu->addAction(*constIterator);
+		if (constIterator != cat_names.constEnd())
+		{
+			menu->addSeparator();
+		}
+	}
+
+	QAction *cat_selection = menu->exec(QCursor::pos());
+	if (cat_selection)
+	{
+		for (int i = 1; i < argc; i++)
+		{
+			sendLinkToEngine (argv[i], cat_names.indexOf(cat_selection->text()), 0, 0);
+		}
+	}
+
+	QCoreApplication::exit(0);
+}

aMule-2.3.1.tar.bz2/src/utils/plasmamule/plasmamule-engine-feeder.desktop Added

aMule-2.3.1.tar.bz2/src/utils/plasmamule/qt-emc.cpp Added

@@ -0,0 +1,551 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2010-2011 Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>
+//
+// Any parts of this program 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 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, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+//
+
+#include "qt-emc.h"
+
+qtEmc::qtEmc(const QString &filename)
+{
+
+	QStringList files = filename.split("file://");
+
+	for (QStringList::const_iterator constFilesIterator = files.constBegin(); constFilesIterator != files.constEnd(); constFilesIterator++)
+	{
+		if (!QString(*constFilesIterator).remove("\n").trimmed().isEmpty())
+		{
+			QFile collection(QString(*constFilesIterator).trimmed());
+
+			if (collection.open (QIODevice::ReadOnly))
+			{
+				valid = readBinary(collection);
+			} else {
+				valid = FALSE;
+				errorCode = BadFileFormat;
+			}
+	
+			collection.close();
+		}
+	}
+}
+
+const int qtEmc::getError()
+{
+	return errorCode;
+}
+
+const QString qtEmc::getErrorMessage()
+{
+
+	switch (errorCode)
+	{
+		case BadFileFormat:
+		{
+			return QString("File format wasn't recognised");
+		}
+
+		case BadTagFormat:
+		{
+			return QString("Tag format -%1- not recognized.").arg(lastTag);
+		}
+
+		case UnknownTag:
+		{
+			return QString("An unknown Tag (%1 in type %2) was read from collection file").arg(lastTag).arg(lastTagType);
+		}
+
+		case UnknownTagType:
+		{
+			return QString("An unknown type of tag (%1) was read from file").arg(lastTagType);
+		}
+
+		case WrongTagCount:
+		{
+			return QString("Tag count claims to be %1").arg(lastTag);
+		}
+
+		case CorruptFile:
+		{
+			return QString("Your collection file was corrupted and ends to Early");
+		}
+	}
+}
+
+const QStringList qtEmc::getLinks()
+{
+	return list;
+}
+
+const bool qtEmc::isValid()
+{
+	return valid;
+}
+
+bool qtEmc::readBinary(QFile &collection)
+{
+	int fileSize;
+	QString fileHash, fileName;
+	quint8 rating, sFileSize, tag, tagType;
+	quint16 length, mFileSize;
+	quint32 lFileSize, llength, tagCount;
+	quint64 xlFileSize;
+
+	QDataStream in(&collection);
+	in.setByteOrder(QDataStream::LittleEndian);
+
+	in >> emcVersion >> headerTagCount;
+
+	if (in.atEnd())
+	{
+		errorCode = CorruptFile;
+		return FALSE;
+	} else if (emcVersion > 0x02)
+	{
+		return readText(collection);
+	}
+
+	for (int i=1; i<=headerTagCount; i++)
+	{
+		in >> tagType >> tagFormat;
+
+		if (in.atEnd())
+		{
+			errorCode = CorruptFile;
+			return FALSE;
+		}
+
+		if (tagFormat != 1)
+		{
+			lastTag = tag;
+			errorCode = BadTagFormat;
+			return FALSE;
+		}
+
+		in >> tag;
+
+		if (in.atEnd())
+		{
+			errorCode = CorruptFile;
+			return FALSE;
+		}
+
+		switch (tag)
+		{
+			case 0x01: //FT_FILENAME
+			{
+				in >> length;
+
+				if (in.atEnd())
+				{
+					errorCode = CorruptFile;
+					return FALSE;
+				}
+
+				char* buffer = new char[length];
+				in.readRawData(buffer, length);
+
+				name = QString(buffer);
+
+				delete [] buffer;
+				break;
+			}
+
+			case 0x31: //FT_COLLECTIONAUTHOR
+			{
+				in >> length;
+
+				if (in.atEnd())
+				{
+					errorCode = CorruptFile;
+					return FALSE;
+				}
+
+				char* buffer = new char[length];
+				in.readRawData(buffer, length);
+
+				author = QString(buffer);
+
+				delete [] buffer;
+				break;
+			}
+
+			case 0x32: //FT_COLLECTIONAUTHORKEY
+			{
+				in >> llength;
+
+				if (in.atEnd())
+				{
+					errorCode = CorruptFile;
+					return FALSE;
+				}
+
+				char* buffer = new char[llength];
+				in.readRawData(buffer, llength);
+				authorKey = QString(buffer);
+
+				delete [] buffer;
+				break;
+			}
+
+			default:
+			{
+				lastTag = tag;
+				errorCode = UnknownTag;
+				return FALSE;
+			}
+
+			break;
+		}
+	}
+
+	in >> fileCount;
+
+	if (in.atEnd())
+	{
+		errorCode = CorruptFile;
+		return FALSE;
+	}
+
+	for (int i=1; i<=fileCount; i++)
+	{
+		fileHash.clear();
+		fileName.clear();
+
+		in >> tagCount;
+
+		if (in.atEnd())
+		{
+			errorCode = CorruptFile;
+			return FALSE;
+		}
+
+		if (tagCount > 5)
+		{
+			lastTag = tagCount;
+			errorCode = WrongTagCount;
+			return FALSE;
+		}
+
+		for (int j=1; j<=tagCount; j++)
+		{
+			in >> tag;
+
+			if (in.atEnd())
+			{
+				errorCode = CorruptFile;
+				return FALSE;
+			}
+
+			in >> tagType;
+
+			if (in.atEnd())
+			{
+				errorCode = CorruptFile;
+				return FALSE;
+			}
+
+			switch (tagType)
+			{
+				case 0x01: // FT_FILENAME
+				{
+					switch (tag)
+					{
+						case 0x82:
+						{
+							in >> length;
+
+							if (in.atEnd())
+							{
+								errorCode = CorruptFile;
+								return FALSE;
+							}
+
+							char* buffer = new char[length];
+							in.readRawData(buffer, length);
+							fileName = QString().fromLocal8Bit(buffer, length).trimmed();
+
+							if (fileName.length() > length)
+							{
+								fileName.chop(fileName.length() - length);
+							} else if (fileName.length() == length)
+							{
+								int pos=0;
+
+								for (int k=0; k<length; k++)
+								{
+									if (fileName.at(k) != buffer[k+pos])
+									{
+										pos++;
+									}
+								}
+
+								fileName.chop(pos);
+							}
+
+							delete [] buffer;
+
+							if (in.atEnd() && (j != tagCount) && (i =! fileCount))
+							{
+								errorCode = CorruptFile;
+								return FALSE;
+							}
+
+							break;
+						}
+
+						default:
+						{
+							if (((tag^0x80) >= 0x11) && ((tag^0x80) <= 0x20))
+							{
+
+								length = (tag^0x80) - 0x10;
+
+								char* buffer = new char[length];
+								in.readRawData(buffer, length);
+								fileName = QString().fromLocal8Bit(buffer, length).trimmed();
+
+								if (fileName.length() > length)
+								{
+									fileName.chop(fileName.length() - length);
+								} else if (fileName.length() == length)
+								{
+									int pos=0;
+	
+									for (int k=0; k<length; k++)
+									{
+										if (fileName.at(k) != buffer[k+pos])
+										{
+											pos++;
+										}
+									}
+
+									fileName.chop(pos);
+								}
+	
+								delete [] buffer;
+	
+								if (in.atEnd() && (j != tagCount) && (i =! fileCount))
+								{
+									errorCode = CorruptFile;
+									return FALSE;
+								}
+							} else {
+								lastTag = tag;
+								lastTagType = tagType;
+								errorCode = UnknownTag;
+								return FALSE;
+							}
+						}
+					}
+
+					break;
+				}
+
+				case 0x02: //FT_FILESIZE
+				{
+					switch (tag)
+					{
+						case 0x83:
+						{
+							in >> lFileSize;
+							fileSize = lFileSize;
+
+							if (in.atEnd() && (j != tagCount) && (i =! fileCount))
+							{
+								errorCode = CorruptFile;
+								return FALSE;
+							}
+
+							break;
+						}
+
+						case 0x88:
+						{
+							in >> mFileSize;
+							fileSize = mFileSize;
+
+							if (in.atEnd() && (j != tagCount) && (i =! fileCount))
+							{
+								errorCode = CorruptFile;
+								return FALSE;
+							}
+
+							break;
+						}
+
+						case 0x89:
+						{
+							in >> sFileSize;
+							fileSize = sFileSize;
+
+							if (in.atEnd() && (j != tagCount) && (i =! fileCount))
+							{
+								errorCode = CorruptFile;
+								return FALSE;
+							}
+
+							break;
+						}
+
+						case 0x8b:
+						{
+							in >> xlFileSize;
+							fileSize = xlFileSize;
+
+							if (in.atEnd() && (j != tagCount) && (i =! fileCount))
+							{
+								errorCode = CorruptFile;
+								return FALSE;
+							}
+
+							break;
+						}
+
+						default:
+						{
+							lastTag = tag;
+							lastTagType = tagType;
+							errorCode = UnknownTag;
+							return FALSE;
+						}
+					}
+
+					break;
+				}
+
+				case 0x28: //FT_FILEHASH
+				{
+					switch (tag)
+					{
+						case 0x81: //FT_FILEHASH
+						{
+							char* buffer = new char[16];
+							in.readRawData(buffer, 16);
+
+							if (in.atEnd() && (j != tagCount) && (i =! fileCount))
+							{
+								errorCode = CorruptFile;
+								return FALSE;
+							}
+
+							for (int pos = 0; pos < 16; pos++)
+							{
+								fileHash.append(QString().setNum(((buffer[pos] >> 4) & 0xF), 16));
+								fileHash.append(QString().setNum((buffer[pos] & 0x0F), 16));
+							}
+
+							delete [] buffer;
+							break;
+						}
+
+						default:
+						{
+							lastTag = tag;
+							lastTagType = tagType;
+							errorCode = UnknownTag;
+							return FALSE;
+						}
+					}
+
+					break;
+				}
+// The comment is read correctly. It will be stored when I know what to do with it.
+				case 0xf6: //FT_FILECOMMENT
+				{
+					if ((tag^0x80) == 0x02)
+					{
+						in >> length;
+
+						if (in.atEnd())
+						{
+							errorCode = CorruptFile;
+							return FALSE;
+						}
+					} else {
+						length = ((tag^0x80)-0x10);
+					}
+
+					char* buffer = new char[length];
+					in.readRawData(buffer, length);
+
+					delete [] buffer;
+					break;
+				}
+// The file-rating is read correctly. It will be stored when I know what to do with it.
+				case 0xf7: //FT_FILERATING
+				{
+					in >> rating;
+
+					break;
+				}
+
+				default:
+				{
+					lastTagType = tagType;
+					errorCode = UnknownTagType;
+					return FALSE;
+				}
+			}
+		}
+
+		list.append(QString("ed2k://|file|%1|%2|%3|/").arg(fileName).arg(fileSize).arg(fileHash));
+	}
+
+	return TRUE;
+}
+
+bool qtEmc::readText(QFile &collection)
+{
+	quint8 character;
+	QString tmp;
+
+	collection.seek(0);
+	QDataStream in(&collection);
+	in.setByteOrder(QDataStream::LittleEndian);
+
+	for (int i=0; i<=6; i++)
+	{
+		in >> character;
+		tmp.append(character);
+	}
+
+	if (tmp == "ed2k://")
+	{
+		while (!in.atEnd())
+		{
+			in >> character;
+
+			if (character == 0x0d)
+			{
+				list.append(tmp);
+				tmp.clear();
+			} else if (character != 0x0a)
+			{
+				tmp.append(character);
+			}
+		}
+	} else {
+			errorCode = BadFileFormat;
+			return FALSE;
+	}
+
+	return TRUE;
+}

aMule-2.3.1.tar.bz2/src/utils/plasmamule/qt-emc.h Added

@@ -0,0 +1,64 @@
+//
+// This file is part of the aMule Project.
+//
+// Copyright (c) 2010-2011 Werner Mahr (Vollstrecker) <amule@vollstreckernet.de>
+//
+// Any parts of this program 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 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, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+//
+
+#ifndef QTEMC_H
+#define QTEMC_H
+
+#include <QFile>
+#include <QStringList>
+
+class qtEmc
+{
+	public:
+		enum emcError
+		{
+			BadFileFormat,
+			BadTagFormat,
+			UnknownTag,
+			UnknownTagType,
+			WrongTagCount,
+			CorruptFile
+		};
+
+	private:
+		bool valid;
+		int errorCode;
+		QString author, authorKey, name;
+		QStringList list;
+		quint8 lastTag, lastTagType;
+		quint16 tagFormat;
+		quint32 emcVersion, fileCount, headerTagCount;
+
+	public:
+		qtEmc(const QString &filename);
+		const int getError();
+		const QString getErrorMessage();
+		const QStringList getLinks();
+		const bool isValid();
+
+	private:
+		bool readBinary(QFile &collection);
+		bool readText(QFile &collection);
+};
+
+#endif // QT_EMC_H

aMule-2.3.1.tar.bz2/src/utils/scripts/MacOSX Added

aMule-2.3.1.tar.bz2/src/utils/scripts/MacOSX/application_packager.sh Added

@@ -0,0 +1,104 @@
+#!/bin/bash
+##################################################
+#             aMule.app bundle creator.          #
+##################################################
+
+## This file is part of the aMule Project
+##
+## Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+## Copyright (c) 2003-2011 aMule Team     ( http://www.amule-project.net )
+##
+## 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
+
+SRC_FOLDER=$1
+
+
+if [ -z $SRC_FOLDER ]; then
+	SRC_FOLDER="./"
+fi
+
+echo ""
+echo -n "Step 1: Cleaning bundle... "
+rm aMule.app/Contents/Frameworks/libwx_* aMule.app/Contents/MacOS/* 1> /dev/null 2> /dev/null
+rm -r aMule.app/Contents/Resources/webserver 1> /dev/null 2> /dev/null
+rm -r aMule.app/Contents/SharedSupport 1> /dev/null 2> /dev/null
+echo "Done"
+echo ""
+echo -n "Step 2: Copying aMule to app bundle... " 
+cp ${SRC_FOLDER}/src/amule aMule.app/Contents/MacOS/
+cp ${SRC_FOLDER}/src/webserver/src/amuleweb aMule.app/Contents/MacOS/
+cp ${SRC_FOLDER}/src/ed2k aMule.app/Contents/MacOS/
+cp ${SRC_FOLDER}/src/amulecmd aMule.app/Contents/MacOS/
+cp ${SRC_FOLDER}/platforms/MacOSX/aMule-Xcode/amule.icns aMule.app/Contents/Resources/
+cp -R ${SRC_FOLDER}/src/webserver aMule.app/Contents/Resources
+find aMule.app/Contents/Resources/webserver $ -name .svn -o -name "Makefile*" -o -name src $ -print0 | xargs -0 rm -rf
+echo "Done"
+echo ""
+echo -n "Step 3: Installing translations to app bundle... "
+orig_dir=`pwd`
+pushd ${SRC_FOLDER}/po
+make install datadir=$orig_dir/aMule.app/Contents/SharedSupport 1> /dev/null 2> /dev/null
+popd
+echo "Done"
+echo ""
+echo "Step 4: Copying libs to Framework"
+echo "    wxWidgets..."
+# wxWidgets libs to frameworks
+for i in $( otool -L	aMule.app/Contents/MacOS/amule \
+						aMule.app/Contents/MacOS/amuleweb \
+						aMule.app/Contents/MacOS/ed2k \
+						aMule.app/Contents/MacOS/amulecmd \
+			| sort -u | grep libwx_ | cut -d " " -f 1 ); do 
+	cp $i aMule.app/Contents/Frameworks; 
+done
+echo "Libs copy done."
+echo ""
+echo "Step 5: Update libs info"
+#then install_name_tool on them to fix the path on the shared lib
+pushd aMule.app/Contents/
+for i in $( ls Frameworks | grep -v CVS); do
+	echo "    Updating $i"
+	#update library id
+	install_name_tool -id @executable_path/../Frameworks/$i Frameworks/$i
+	#update library links
+	for j in $( otool -L Frameworks/$i | grep libwx_ | cut -d " " -f 1 ); do
+	        install_name_tool -change \
+                $j @executable_path/../Frameworks/`echo $j | rev | cut -d "/" -f 1 | rev` \
+		Frameworks/$i 1> /dev/null 2> /dev/null
+
+	done
+	echo "    Updating aMule lib info for $i"
+	#update amule executable
+	install_name_tool -change \
+		`otool -L MacOS/amule | grep $i | cut -d " " -f 1` \
+		@executable_path/../Frameworks/$i MacOS/amule 1> /dev/null 2> /dev/null
+	install_name_tool -change \
+		`otool -L MacOS/amuleweb | grep $i | cut -d " " -f 1` \
+		@executable_path/../Frameworks/$i MacOS/amuleweb 1> /dev/null 2> /dev/null
+	install_name_tool -change \
+		`otool -L MacOS/ed2k | grep $i | cut -d " " -f 1` \
+		@executable_path/../Frameworks/$i MacOS/ed2k 1> /dev/null 2> /dev/null
+	install_name_tool -change \
+		`otool -L MacOS/amulecmd | grep $i | cut -d " " -f 1` \
+		@executable_path/../Frameworks/$i MacOS/amulecmd 1> /dev/null 2> /dev/null
+done
+echo "Libs info updated, aMule.app is ready to package."
+echo ""
+popd
+echo -n "Creating aMule.zip... "
+zip -9 -r aMule.zip aMule.app/ > /dev/null
+zip -9 -j ${SRC_FOLDER}/docs/README.Mac.txt ${SRC_FOLDER}/docs/COPYING > /dev/null
+echo "Done"
+echo ""

aMule-2.3.1.tar.bz2/src/utils/scripts/MacOSX/defs-functions.sh Added

aMule-2.3.1.tar.bz2/src/utils/scripts/MacOSX/defs-global.sh Added

@@ -0,0 +1,106 @@
+# Global definitions for MacOSX builds
+# (c) 2011 Angel Vidal ( kry@amule.org )
+# Public domain. Use at your own risk.
+
+. defs-functions.sh
+
+# Wouldn't I love to have bash4 on MacOSX (case fallthrough)
+
+pn "-- Begin global def section --"
+
+SVN_REPOSITORY=$1
+
+if [ -z $SVN_REPOSITORY ]; then
+        AMULE_FOLDER=`cd ${SCRIPTDIR}/../../../../; pwd`
+	if [ -f "${AMULE_FOLDER}/src/amule.cpp" ]; then
+		pc $GREEN "\tSVN repository has not been specified, using detected local sources at \"${AMULE_FOLDER}\""
+	else
+		pc $RED "\tSVN repository has not been specified, and no local sources found at \"${AMULE_FOLDER}\".\n\tPlease specify your aMule source folder by setting the AMULE_FOLDER variable, or call the script with the SVN repository of your choice as a first parameter, or \"public\" to download from our public SVN repository."
+		exit
+	fi
+fi
+
+if [ -z "$BUILD_FOLDER" ]; then
+	if [ -z $SVN_REPOSITORY ]; then
+		BUILD_FOLDER="$AMULE_FOLDER/build/"
+		mkdir $BUILD_FOLDER 2>/dev/null
+	else
+		BUILD_FOLDER=`pwd`
+	fi
+
+	pc $BLUE "\tAutomatically setting build folder to ${BUILD_FOLDER} - set BUILD_FOLDER to your preferred folder to change this setting."
+else
+	pc $GREEN "\tSetting build folder to $BUILD_FOLDER"
+fi
+
+ROOT_FOLDER=`cd $BUILD_FOLDER; pwd`
+
+if [ -z $AMULE_FOLDER ]; then
+        AMULE_FOLDER="${ROOT_FOLDER}/amule-dev"
+fi
+
+pc $GREEN "\tBuild root absolute path is $ROOT_FOLDER"
+
+if [ "$SDKNUMBER" == "" ]; then
+	pc $BLUE "\tAutomatically setting SDK to 10.4u (tiger with i386 and ppc, gcc 4.0) - set SDKNUMBER to your preferred SDK if you want to target it (10.5, 10.6, 10.7) or \"default\" for the default SDK."
+	SDKNUMBER=10.4
+fi
+
+case "$SDKNUMBER" in
+"10.4")
+	SDKRELEASE=10.4u
+	CCVERSION="-4.0"
+	;;
+"10.5"|"10.6"|"10.7")
+	SDKRELEASE=$SDKNUMBER
+	;;
+default)
+	;;
+*)
+	pc $RED "Valid SDKNUMBER values are 10.4, 10.5, 10.6, 10.7 and default."
+	exit
+	;;
+esac
+
+pc $GREEN "\tUsing $SDKNUMBER SDK"
+
+if [ "$SDKNUMBER" != "default" ]; then
+	SDK="-isysroot /Developer/SDKs/MacOSX${SDKRELEASE}.sdk -mmacosx-version-min=$SDKNUMBER"
+else
+	SDKNUMBER=""
+fi
+
+if [ "$UNIVERSAL" == "" ]; then
+	pc $BLUE "\tAutomatically enabling universal (i386, ppc) build. Set UNIVERSAL=NO to build just for the current architecture."
+	UNIVERSAL="YES"
+fi
+
+case "$UNIVERSAL" in
+"NO"|"no")
+	pc $GREEN "\tDisabling universal build"
+	ARCHCPPFLAGS="$BUILDARCHS"
+	ARCHCONFIGFLAGS=""
+	;;
+"YES"|"yes")
+	pc $GREEN "\tUsing universal build (i386, pcc)" 
+	ARCHCPPFLAGS="-arch i386 -arch ppc"
+	ARCHCONFIGFLAGS="--enable-universal_binary"
+	CCVERSION="-4.0"
+	;;
+*)
+	pc $RED "Only the values \"NO\" and \"YES\" are valid for UNIVERSAL"
+	exit
+	;;
+esac
+
+if [ "$STDOUT_FILE" == "" ]; then
+	STDOUT_FILE=${ROOT_FOLDER}/build_output
+fi
+
+if [ "$ERROR_FILE" == "" ]; then
+	ERROR_FILE=${ROOT_FOLDER}/error_output
+fi
+
+pc $GREEN "\tErrors will be redirected to $ERROR_FILE, normal build output to $STDOUT_FILE"
+
+pn "-- End global def section --"

aMule-2.3.1.tar.bz2/src/utils/scripts/MacOSX/defs-wx.sh Added

@@ -0,0 +1,107 @@
+# Definitions for MacOSX compilation of wxWidgets. 
+# (c) 2011 Angel Vidal ( kry@amule.org )
+# Public domain. Use at your own risk.
+
+. defs-functions.sh
+
+pn "-- Begin wxWidgets def section --"
+
+if [ "$WXVERSION" == "" ]; then
+	pc $BLUE "\tAutomatically setting wxWidgets version to 2.8.x - set WXVERSION to your desired version (accepted values are 2.8 and svn right now) if you want to use a different one."
+	WXVERSION=2.8
+fi
+
+case "$WXVERSION" in
+"2.8")
+	WXSVNROOT="branches/WX_2_8_BRANCH"
+	WXFOLDER="wxWidgets-2.8"
+	AUTOPORT=carbon
+	;;
+"svn"|"SVN")
+	WXSVNROOT="trunk/"
+	WXFOLDER="wxWidgets"
+	AUTOPORT=cocoa
+	;;
+*)
+	pc $RED "Valid WXVERSION values are 2.8 and svn."
+	exit
+	;;
+esac
+
+pc $GREEN "\tUsing wxWidgets $WXVERSION"
+
+if [ "$WXPORT" = "" ]; then
+	pc $BLUE "\tAutomatically selecting the $AUTOPORT port for wxWidgets $WXVERSION - set WXPORT to your desired port (accepted values are carbon and cocoa right now) if you want to use a different one."
+	WXPORT=$AUTOPORT
+fi
+
+case "$WXPORT" in
+COCOA|cocoa)
+	if [ "$WXVERSION" == "2.8" ]; then
+		pc $RED "The $WXWIDGETS port on wxWidgets $WXVERSION is unusable for this application. Please select a different port, or a different wxWidgets version."
+ 		exit
+	fi
+	PORTFLAGS="--with-cocoa"
+	;;
+CARBON|carbon)
+	PORTFLAGS="--with-carbon"
+	;;
+*)
+	pc $RED "Valid WXPORT values are cocoa and carbon."
+	exit
+	;;
+esac	
+
+pc $GREEN "\tUsing wxWidgets $WXPORT port."
+
+
+if [ "$SLIMWX" == "" ]; then
+	pc $BLUE  "\tAutomatically selecting full wx compilation. Set SLIMWX to YES to compile only parts used by the application, which can result in a smaller binary (but can fail if the script hasn't been updated after adding new class usage)"
+	SLIMWX=NO
+fi
+
+case "$SLIMWX" in
+YES|yes)
+	pc $GREEN "\tUsing minimal wxWidgets compilation."
+	SLIM_WX_FLAGS="--without-odbc --without-expat --without-libtiff --without-libjpg \
+	--without-libmspack --without-sdl --without-gnomeprint --without-gnomevfs --without-opengl \
+	--without-dmalloc --without-themes --disable-sdltest --disable-gtktest \
+	--disable-pnm --disable-iff --disable-tga --disable-pcx \
+	--disable-dragimage --disable-metafiles --disable-joystick \
+	--disable-splines --disable-miniframe --disable-wizarddlg \
+	--disable-tipdlg --disable-numberdlg --disable-finddlg --disable-choicedlg \
+	--disable-popupwin --disable-tipwindow --disable-toolbook \
+	--disable-treebook --disable-tabdialog--disable-searchctrl \
+	--disable-odcombobox --disable-listbook --disable-hyperlink \
+	--disable-dataviewctrl --disable-grid  --enable-fontpicker \
+	--disable-display --disable-datepick --disable-collpane --disable-choicebook \
+	--disable-caret --disable-calendar --disable-bmpcombobox --disable-animatectrl \
+	--disable-metafile --disable-postscript --disable-graphics_ctx --disable-richtext \
+	--disable-webkit --disable-mdidoc --disable-mdi --disable-aui \
+	--disable-htmlhelp --disable-html --disable-mshtmlhelp --disable-help --disable-variant \
+	--disable-printfposparam --disable-gstreamer8 --disable-mediactrl \
+	--disable-tarstream --disable-mslu  --disable-ole \
+	--disable-dynamicloader --disable-dynlib --disable-dialupman --disable-apple_ieee \
+	--disable-palette --disable-compat26 --disable-docview --disable-aboutdlg"
+	;;
+NO|no)
+	pc $GREEN "\tUsing full wxWidgets compilation."
+	SLIM_WX_FLAGS=""
+	;;
+*)
+	pc $RED "Valid SLIMWX values are YES and NO."
+	exit
+	;;
+esac
+
+EXTRA_WXFLAGS="$PORTFLAGS $SLIMWXFLAGS --with-libpng --with-regex --enable-gif --enable-accesibility --enable-progressdlg \
+	--enable-textdlg --enable-busyinfo --enable-fontdlg --enable-filedlg --enable-coldlg \
+	--enable-treectrl  --enable-slider --enable-listbox --enable-gauge --enable-filepicker \
+	--enable-dirpicker --enable-colourpicker --enable-checklst --enable-printarch \
+	--enable-protocol --enable-protocol-http --enable-protocol-ftp --enable-protocol-file \
+	--enable-sound --enable-unicode --enable-stopwatch --enable-snglinst --enable-ipc \
+	--enable-sockets --enable-protocols --enable-ftp --enable-config --with-zlib --enable-textfile \
+	--enable-textbuf --enable-url --enable-datetime --enable-http --enable-fileproto"
+
+
+pn "-- End wxWidgets def section --"

aMule-2.3.1.tar.bz2/src/utils/scripts/MacOSX/full_build.sh Added

@@ -0,0 +1,387 @@
+#!/bin/bash
+##################################################
+#             aMule.app bundle creator.          #
+##################################################
+
+## This file is part of the aMule Project
+##
+## Copyright (c) 2011 Angel Vidal ( kry@amule.org )
+##
+## 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
+
+SCRIPTDIR=`dirname "$0"`
+SCRIPTNAME=`basename "$0"`
+
+## Get full path
+SCRIPTDIR=`cd $SCRIPTDIR; pwd`
+
+PATH="$SCRIPTDIR:$PATH"
+
+. defs-global.sh $1
+. defs-wx.sh
+. defs-functions.sh
+
+echo "Start" > $STDOUT_FILE
+echo "Start" > $ERROR_FILE
+
+REPEATSCRIPT=${ROOT_FOLDER}/repeat.sh
+if [ -f $REPEATSCRIPT ]; then
+	chmod 600 $REPEATSCRIPT
+fi
+echo "Save configuration commandline to ${REPEATSCRIPT} - execute that script to repeat this compilation with the same options."
+echo "#!/bin/bash" > $REPEATSCRIPT
+echo "echo \"Starting repeat, moving away current repeat.sh\"" >> $REPEATSCRIPT
+echo "rm -rf \${0}.old 2>/dev/null; mv \$0 \${0}.old" >> $REPEATSCRIPT
+if [ x"$SDKNUMBER" == x"" ]; then
+	SDKSTRING="default"
+else
+	SDKSTRING=$SDKNUMBER
+fi
+
+echo "BUILDARCHS=\"${BUILDARCHS}\" SDKNUMBER=\"${SDKSTRING}\" UNIVERSAL=\"${UNIVERSAL}\" WXVERSION=\"${WXVERSION}\" WXPORT=\"${WXPORT}\" SLIMWX=\"${SLIMWX}\" BUILD_FOLDER=\"${BUILD_FOLDER}\" $0" >> $REPEATSCRIPT
+echo "echo \"Repeat finished\"" >> $REPEATSCRIPT
+chmod 500 $REPEATSCRIPT
+
+echo "Starting build..."
+
+echo -e "\tGetting aMule sources..."
+
+#Get aMule first, because it may contain patches
+if [ -d $AMULE_FOLDER/ ]; then
+	if [ -d ${AMULE_FOLDER}/.svn/ ]; then
+		echo -e "\t\tSources already exist, updating."
+	        pushd $AMULE_FOLDER/ >> $STDOUT_FILE
+	        svn up >> $STDOUT_FILE
+	        popd >> $STDOUT_FILE
+	else
+		echo -e "\t\taMule sources at \"" $AMULE_FOLDER "\" are not from SVN checkout, so not updating."
+	fi
+else
+	echo -e "\tFirst checkout."
+	if [ "$SVN_REPOSITORY" == "public" ]; then
+		SVN_REPOSITORY=http://amule.googlecode.com/svn/trunk/
+		echo -e "\tUsing public SVN repository at ${SVN_REPOSITORY}."
+	else
+		echo -e "\tUsing provided SVN repository at ${SVN_REPOSITORY}."
+	fi
+
+	svn co $SVN_REPOSITORY $AMULE_FOLDER >> $STDOUT_FILE
+	if [ ! -d $AMULE_FOLDER/ ]; then
+		echo "ERROR: aMule sources could not be retrieved. Review your settings."
+		exit
+	fi
+fi
+
+pushd $ROOT_FOLDER >> $STDOUT_FILE
+
+echo -e "\tDone"
+
+echo -e "\tGetting wxWidgets sources..."
+
+if [ -d ${WXFOLDER} ]; then
+	pushd ${WXFOLDER} >> $STDOUT_FILE
+	svn up >> $STDOUT_FILE 2>> $ERROR_FILE
+	popd >> $STDOUT_FILE
+else
+	echo -e "\tFirst checkout."
+	svn checkout http://svn.wxwidgets.org/svn/wx/wxWidgets/${WXSVNROOT} ${WXFOLDER} >> $STDOUT_FILE 2>> $ERROR_FILE
+	pushd ${WXFOLDER} >> $STDOUT_FILE
+	echo -e "\tApplying patches."
+	for i in $AMULE_FOLDER/src/utils/patches/wxWidgets/*.patch; do 
+		echo -e "\t\tAppying \"$i\""
+		patch -p0 < $i >> $STDOUT_FILE 2>> $ERROR_FILE
+	done
+	popd >> $STDOUT_FILE
+fi	
+echo -e "\tDone"
+
+echo -e "\tConfiguring wxWidgets..."
+
+pushd ${WXFOLDER} > $STDOUT_FILE
+
+if [ "$SDKNUMBER" == "" ]; then
+	WX_SDK_FLAGS=""	
+else
+	WX_SDK_FLAGS="--with-macosx-sdk=/Developer/SDKs/MacOSX${SDKRELEASE}.sdk \
+	--with-macosx-version-min=$SDKNUMBER"
+fi
+
+if [ -e amulewxcompilation ]; then
+	echo -e "\t\twxWidgets is already configured"
+else
+	make clean >> $STDOUT_FILE 2>/dev/null
+	./configure CC=gcc$CCVERSION CXX=g++$CCVERSION CPP=cpp$CCVERSION LD=g++$CCVERSION \
+	CFLAGS="$CFLAGS $ARCHCPPFLAGS" CXXFLAGS="$CXXFLAGS $ARCHCPPFLAGS" CPPFLAGS="$CPPFLAGS $ARCHCPPFLAGS" \
+	LDFLAGS="$LDFLAGS $ARCHCPPFLAGS" \
+	OBJCFLAGS="$OBJCFLAGS $ARCHCPPFLAGS" OBJCXXFLAGS="$OBJCXXFLAGS $ARCHCPPFLAGS" \
+	--enable-debug --disable-shared \
+	$EXTRA_WXFLAGS \
+	$ARCHCONFIGFLAGS \
+	$WX_SDK_FLAGS >> $STDOUT_FILE 2>> $ERROR_FILE
+	touch amulewxcompilation >> $STDOUT_FILE
+	echo -e "\t\tConfigured."
+fi
+
+echo -e "\t\tDone"
+
+echo -e "\tCompiling wxWidgets..."
+
+make >> $STDOUT_FILE 2>> $ERROR_FILE
+
+echo -e "\tDone"
+
+popd >> $STDOUT_FILE
+
+CRYPTOPP_FOLDER="cryptopp-source"
+CRYPTOPP_FOLDER_INST="cryptopp"
+CRYPTOPP_URL=`curl -sS http://www.cryptopp.com/ | grep -oE "http://.*/cryptopp/cryptopp[0-9]+\.zip" | sort -r | head -1`
+
+echo -e "\tGetting cryptopp sources..."
+
+if [ -d $CRYPTOPP_FOLDER_INST ]; then
+	echo -e "\t\t$CRYPTOPP_FOLDER_INST already exists, skipping (delete and rerun script to get new sources)"	
+else
+	mkdir $CRYPTOPP_FOLDER
+	mkdir $CRYPTOPP_FOLDER_INST
+	curl -L -o cryptopp.zip $CRYPTOPP_URL >> $STDOUT_FILE 2>> $ERROR_FILE
+	unzip cryptopp.zip -d $CRYPTOPP_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+	pushd $CRYPTOPP_FOLDER >> $STDOUT_FILE 
+	#./configure 
+	for i in $AMULE_FOLDER/src/utils/patches/cryptopp/*.patch; do 
+		echo -e "\t\tAppying \"$i\"" 
+		patch -p0 < $i >> $STDOUT_FILE 2>> $ERROR_FILE
+	done
+	#cp ../GNUMakefile .
+	echo -e "\t\tCompiling cryptopp..."
+	CC=gcc$CCVERSION CXX=g++$CCVERSION CPP=cpp$CCVERSION LD=g++$CCVERSION \
+		CXXFLAGS="-pthread $ARCHCPPFLAGS $SDK" CFLAGS="-pthread $ARCHCPPFLAGS $SDK" LDFLAGS="-pthread $SDK" make > $STDOUT_FILE 2> $ERROR_FILE
+	PREFIX=${ROOT_FOLDER}/$CRYPTOPP_FOLDER_INST make install >> $STDOUT_FILE 2>> $ERROR_FILE
+	popd >> $STDOUT_FILE 
+	rm cryptopp.zip >> $STDOUT_FILE 2>> $ERROR_FILE
+	rm -rf $CRYPTOPP_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+fi
+
+echo -e "\tDone"
+
+# Gettext
+
+echo -e "\tGetting gettext sources..."
+
+GETTEXT_FOLDER="gettext-source"
+GETTEXT_FOLDER_INST="gettext-inst"
+GETTEXT_URL=`curl -sS http://www.gnu.org/software/gettext/ | grep -m 1 -oE "http://[^\"]+/gettext-([0-9]+\.)+tar.gz" | head -1`
+
+if [ -d $GETTEXT_FOLDER_INST ]; then
+	echo -e "\t\t$GETTEXT_FOLDER_INST already exists, skipping"
+else
+	mkdir $GETTEXT_FOLDER
+	mkdir $GETTEXT_FOLDER_INST
+	curl -L -o gettext.tar.gz $GETTEXT_URL >> $STDOUT_FILE 2>> $ERROR_FILE
+	pushd $GETTEXT_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+	echo -e "\t\tCompiling gettext..."
+	tar --strip-components 1 -zxf ../gettext.tar.gz >> $STDOUT_FILE 2>> $ERROR_FILE
+	./configure CC=gcc$CCVERSION CXX=g++$CCVERSION CPP=cpp$CCVERSION LD=g++$CCVERSION CXXFLAGS="-pthread $ARCHCPPFLAGS $SDK" \
+		CFLAGS="-pthread $ARCHCPPFLAGS $SDK" LDFLAGS="-pthread $SDK" \
+		--disable-debug --disable-shared --prefix=${ROOT_FOLDER}/$GETTEXT_FOLDER_INST >> $STDOUT_FILE 2>> $ERROR_FILE
+	make >> $STDOUT_FILE 2>> $ERROR_FILE
+	make install >> $STDOUT_FILE 2>> $ERROR_FILE
+	popd >> $STDOUT_FILE 2>> $ERROR_FILE
+	rm gettext.tar.gz >> $STDOUT_FILE 2>> $ERROR_FILE
+	rm -rf $GETTEXT_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+fi
+
+echo -e "\tDone."
+
+#libupnp
+
+echo -e "\tGetting libupnp sources..."
+
+LIBUPNP_FOLDER="libupnp-source"
+LIBUPNP_FOLDER_INST="libupnp-inst"
+LIBUPNP_URL=`curl -sS http://sourceforge.net/projects/pupnp/files/ | grep -m 1 -ioE "http://sourceforge.net/[^\"]+/libupnp-([0-9]+\.)+tar.bz2/download" | head -1`
+
+if [ -d $LIBUPNP_FOLDER_INST ]; then
+	echo -e "\t\t$LIBUPNP_FOLDER_INST already exists, skipping"	
+else
+	mkdir $LIBUPNP_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+	mkdir $LIBUPNP_FOLDER_INST >> $STDOUT_FILE 2>> $ERROR_FILE
+	curl -L -o libupnp.tar.bz2 $LIBUPNP_URL  >> $STDOUT_FILE 2>> $ERROR_FILE
+	pushd $LIBUPNP_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+	echo -e "\t\tCompiling libupnp..."	
+	tar --strip-components 1 -jxf ../libupnp.tar.bz2 >> $STDOUT_FILE 2>> $ERROR_FILE
+	./configure CC=gcc$CCVERSION CXX=g++$CCVERSION CPP=cpp$CCVERSION LD=g++$CCVERSION CXXFLAGS="-pthread $ARCHCPPFLAGS $SDK" \
+		CFLAGS="-pthread $ARCHCPPFLAGS $SDK" LDFLAGS="-pthread $SDK" --disable-dependency-tracking \
+		--disable-debug --disable-shared --prefix=${ROOT_FOLDER}/$LIBUPNP_FOLDER_INST >> $STDOUT_FILE 2>> $ERROR_FILE
+	make >> $STDOUT_FILE 2>> $ERROR_FILE
+	make install >> $STDOUT_FILE 2>> $ERROR_FILE
+	popd >> $STDOUT_FILE 2>> $ERROR_FILE
+	rm libupnp.tar.bz2 >> $STDOUT_FILE 2>> $ERROR_FILE
+	rm -rf $LIBUPNP_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+fi
+
+echo -e "\tDone."
+
+#geoip
+
+echo -e "\tGetting GeoIP sources..."
+
+LIBGEOIP_FOLDER="libgeoip-source"
+LIBGEOIP_FOLDER_INST="libgeoip-inst"
+LIBGEOIP_URL="http://geolite.maxmind.com/download/geoip/api/c/GeoIP.tar.gz"
+
+if [ -d $LIBGEOIP_FOLDER_INST ]; then
+	echo -e "\t\t$LIBGEOIP_FOLDER_INST already exists, skipping"	
+else
+	mkdir $LIBGEOIP_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+	mkdir $LIBGEOIP_FOLDER_INST >> $STDOUT_FILE 2>> $ERROR_FILE
+	curl -L -o libgeoip.tar.gz $LIBGEOIP_URL >> $STDOUT_FILE 2>> $ERROR_FILE
+	pushd $LIBGEOIP_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+	echo -e "\t\tCompiling GeoIP..." 
+	tar --strip-components 2 -zxf ../libgeoip.tar.gz >> $STDOUT_FILE 2>> $ERROR_FILE
+	./configure CC=gcc$CCVERSION CXX=g++$CCVERSION CPP=cpp$CCVERSION LD=g++$CCVERSION CXXFLAGS="-pthread $ARCHCPPFLAGS $SDK" \
+		CFLAGS="-pthread $ARCHCPPFLAGS $SDK" LDFLAGS="-pthread $SDK" --disable-dependency-tracking \
+		--disable-debug --disable-shared --prefix=${ROOT_FOLDER}/$LIBGEOIP_FOLDER_INST >> $STDOUT_FILE 2>> $ERROR_FILE
+	make >> $STDOUT_FILE 2>> $ERROR_FILE
+	make install >> $STDOUT_FILE 2>> $ERROR_FILE
+	popd >> $STDOUT_FILE 2>> $ERROR_FILE
+	rm libgeoip.tar.gz >> $STDOUT_FILE 2>> $ERROR_FILE
+	rm -rf $LIBGEOIP_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+fi
+
+echo -e "\tDone."
+
+#pkg-config
+
+echo -e "\tGetting pkg-config sources..."
+
+PKGCFG_FOLDER="pkgcfg-source"
+PKGCFG_FOLDER_INST="pkgcfg-inst"
+# pkgconfig introduced a dependency on glib to build on 0.26, and I refuse to build the whole glib for this. 
+# On top of it, glib uses pkgconfig to configure itself... 
+#PKGCFG_FILE=`curl -sS http://pkgconfig.freedesktop.org/releases/ | grep -ioE "pkg-config-([0-9]+\.)+tar.gz" | uniq | sort -r | head -1`
+#PKGCFG_URL="http://pkgconfig.freedesktop.org/releases/${PKGCFG_FILE}"
+PKGCFG_URL="http://pkgconfig.freedesktop.org/releases/pkg-config-0.25.tar.gz"
+
+if [ -f $PKGCFG_FOLDER_INST/bin/pkg-config ]; then
+	echo -e "\t\t$PKGCFG_FOLDER_INST already exists, skipping"	
+else
+	mkdir $PKGCFG_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+	mkdir $PKGCFG_FOLDER_INST >> $STDOUT_FILE 2>> $ERROR_FILE
+	curl -L -o pkgcfg.tar.gz $PKGCFG_URL >> $STDOUT_FILE 2>> $ERROR_FILE
+	pushd $PKGCFG_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+	echo -e "\t\tCompiling pkg-config..."	
+	tar --strip-components 1 -zxf ../pkgcfg.tar.gz >> $STDOUT_FILE 2>> $ERROR_FILE
+	./configure CC=gcc$CCVERSION CXX=g++$CCVERSION CPP=cpp$CCVERSION LD=g++$CCVERSION CXXFLAGS="-pthread $ARCHCPPFLAGS $SDK" \
+		CFLAGS="-pthread $ARCHCPPFLAGS $SDK" LDFLAGS="-pthread $SDK" --disable-dependency-tracking \
+		--disable-debug --disable-shared --prefix=${ROOT_FOLDER}/$PKGCFG_FOLDER_INST >> $STDOUT_FILE 2>> $ERROR_FILE
+	make >> $STDOUT_FILE 2>> $ERROR_FILE
+	make install >> $STDOUT_FILE 2>> $ERROR_FILE
+	popd >> $STDOUT_FILE 2>> $ERROR_FILE
+	if [ -f $PKGCFG_FOLDER_INST/bin/pkg-config ]; then
+		rm -f pkgcfg.tar.gz >> $STDOUT_FILE 2>> $ERROR_FILE
+		rm -rf $PKGCFG_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+	else
+		echo -e " ERROR: check output $STDOUT_FILE and $ERROR_FILE for details. "
+	fi
+fi
+
+
+echo -e "\tDone."
+
+# aMule
+
+echo -e "\tFINALLY compiling aMule..."
+
+pushd $AMULE_FOLDER >> $STDOUT_FILE 2>> $ERROR_FILE
+
+if [ -f configure ]; then
+	echo -e "\t\tConfigure already exists"
+else
+	PATH="${PATH}:${ROOT_FOLDER}/${GETTEXT_FOLDER_INST}/bin" ./autogen.sh >> $STDOUT_FILE 2>> $ERROR_FILE
+fi
+
+if [ -d intl/ ]; then
+	echo -e "\t\tGood: intl folder already exists."
+else
+	mkdir intl >> $STDOUT_FILE 2>> $ERROR_FILE
+	touch intl/Makefile.in >> $STDOUT_FILE 2>> $ERROR_FILE
+	echo "all:" > intl/Makefile >> $STDOUT_FILE 2>> $ERROR_FILE
+	echo "clean:" >> intl/Makefile >> $STDOUT_FILE 2>> $ERROR_FILE
+	echo "" >> intl/Makefile >> $STDOUT_FILE 2>> $ERROR_FILE
+fi
+
+if [ ! -f src/amule ]; then
+	MULECLEAN=YES
+fi
+
+rm -rf ${ROOT_FOLDER}/amule-inst/
+mkdir -p ${ROOT_FOLDER}/amule-inst/
+
+if [ "$MULECLEAN" == "YES" ]; then
+	echo -e "\t\tRunning configure"
+
+	PATH="${PATH}:${ROOT_FOLDER}/${GETTEXT_FOLDER_INST}/bin/:${ROOT_FOLDER}/${PKGCFG_FOLDER_INST}/bin/" \
+	 ./configure CC=gcc$CCVERSION CXX=g++$CCVERSION CPP=cpp$CCVERSION LD=g++$CCVERSION \
+	CXXFLAGS="-pthread $ARCHCPPFLAGS $SDK" CFLAGS="-pthread $ARCHCPPFLAGS $SDK" LDFLAGS="-pthread $SDK" \
+	--enable-nls --disable-dependency-tracking --enable-ccache \
+	--with-wxdir=${ROOT_FOLDER}/${WXFOLDER}/ \
+	--with-crypto-prefix=${ROOT_FOLDER}/$CRYPTOPP_FOLDER_INST \
+	--with-libintl-prefix=${ROOT_FOLDER}/${GETTEXT_FOLDER_INST} \
+	--with-libupnp-prefix=${ROOT_FOLDER}/${LIBUPNP_FOLDER_INST} \
+	--with-geoip-static --with-geoip-headers=${ROOT_FOLDER}/${LIBGEOIP_FOLDER_INST}/include --with-geoip-lib=${ROOT_FOLDER}/${LIBGEOIP_FOLDER_INST}/lib/ \
+	--disable-cas --disable-webserver --disable-amulecmd --disable-amule-gui --disable-wxcas --disable-alc --disable-alcc --disable-amule-daemon \
+	--prefix=${ROOT_FOLDER}/amule-inst/ >> $STDOUT_FILE 2>> $ERROR_FILE
+
+	echo -e "\t\tCleaning compilation"
+
+	make clean >> $STDOUT_FILE 2>> $ERROR_FILE
+fi
+
+echo -e "\t\tCompiling aMule"
+
+make >> $STDOUT_FILE 2>> $ERROR_FILE
+
+echo -e "\tDone."
+
+echo -e "\t\tFaking install"
+
+make install >> $STDOUT_FILE 2>> $ERROR_FILE
+
+echo -e "\tDone."
+
+popd >> $STDOUT_FILE 2>> $ERROR_FILE
+
+echo -e "Getting application bundle and packaging"
+
+rm -rf aMule.app aMule.zip >> $STDOUT_FILE 2>> $ERROR_FILE
+
+cp -R ${AMULE_FOLDER}/aMule.app . >> $STDOUT_FILE 2>> $ERROR_FILE
+
+find aMule.app $ -name .svn -o -name "Makefile*" -o -name src $ -print0 | xargs -0 rm -rf >> $STDOUT_FILE 2>> $ERROR_FILE
+
+echo -e "Copying i18n files..."
+cp -r amule-inst/share/locale aMule.app/Contents/SharedSupport/
+echo -e "Done."
+
+. application_packager.sh ${AMULE_FOLDER}/ >> $STDOUT_FILE 2>> $ERROR_FILE
+
+if [ ! -f aMule.zip ]; then
+	echo "ERROR: aMule.zip was not created. Please review the output files"
+else
+	echo "All Done"
+fi
+
+# Pop root folder.
+popd >> $STDOUT_FILE

aMule-2.3.1.tar.bz2/src/utils/scripts/check_defines.pl Added

@@ -0,0 +1,97 @@
+#!/usr/bin/perl
+#
+
+## This file is part of the aMule Project
+##
+## Copyright (c) 2004-2011 Stu Redman ( sturedman@amule.org )
+## Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+##
+## 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
+
+#
+# To speed up compilation we compile some files used in amule, amuled, amulegui
+# into libs which we link to the apps.
+# This concept can only work if the files (or their includes) don't use 
+# preprocessor macros used to tell these projects apart.
+#
+# This script checks for usage of these macros.
+# It has to be run from the src dir after running configure to build the deps.
+#
+
+use warnings; 
+use strict;
+use Cwd;
+
+die 'run from src dir after making dependencies' unless -f '.deps/amule-amule.Po';
+
+my %checkedFiles;	# key: path  value: 0: ok  1: has AMULE_DAEMON  2: has CLIENT_GUI
+
+sub checkDeps($$);
+
+my @deps;
+# libmuleappcommon
+@deps = glob('.deps/libmuleappcommon*.Po');
+checkDeps(1,1);
+# libmuleappcore (ignore CLIENT_GUI usage)
+@deps = glob('.deps/libmuleappcore*.Po');
+checkDeps(1,0);
+# libmuleappgui (ignore AMULE_DAEMON usage)
+@deps = glob('.deps/libmuleappgui*.Po');
+checkDeps(0,1);
+# libcommon
+chdir 'libs/common';
+@deps = glob('.deps/*.Po');
+checkDeps(1,1);
+# libec
+chdir '../ec/cpp';
+@deps = glob('.deps/*.Po');
+checkDeps(1,1);
+
+sub checkDeps($$)
+{
+	my $checkAMULE_DAEMON = shift;
+	my $checkCLIENT_GUI = shift;
+	printf("check %d dependencies in %s\n", scalar @deps, getcwd());
+	foreach (@deps) {
+		open(DEP, $_) or die "can't open $_ : $!";
+		my @lines = <DEP>;
+		close DEP;
+		my $line = join(' ', @lines);
+		$line =~ tr/:\\/  /;
+		my @files = split(/\s+/, $line);
+		my $obj = shift @files;
+		my %currentFiles;
+		foreach my $file (@files) {
+			next if $file =~ m-^/usr/-;		# skip system and wx includes
+			next if $file =~ m-/wx/-;
+			next if $currentFiles{$file};
+			$currentFiles{$file} = 1;
+			my $status = $checkedFiles{$file};
+			unless (defined $status) {
+				$status = 0;
+				open(SRC, $file) or die "can't open $file : $!";
+				while (<SRC>) {
+					$status |= 1 if /^\s*\#.+AMULE_DAEMON/;
+					$status |= 2 if /^\s*\#.+CLIENT_GUI/;
+				}
+				close SRC;
+				$checkedFiles{$file} = $status;
+			}
+			print "$obj: AMULE_DAEMON used in $file\n" if $checkAMULE_DAEMON && ($status & 1);
+			print "$obj: CLIENT_GUI used in $file\n"   if $checkCLIENT_GUI   && ($status & 2);
+		}
+	}
+}
+

aMule-2.2.6.tar.bz2/src/utils/scripts/denoiser.rules -> aMule-2.3.1.tar.bz2/src/utils/scripts/denoiser.rules Changed

@@ -1,7 +1,7 @@
 # This file is part of the aMule project.
 #
-# Copyright (c) 2003-2009 aMule Project ( admin@amule.org / http://www.amule.org )
-# Copyright (c) 2006-2009 Dévai Tamás aka GonoszTopi
+# Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+# Copyright (c) 2006-2011 DÃ©vai TamÃ¡s ( gonosztopi@amule.org )
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -83,14 +83,18 @@
 
 
 # delete comments
-/^#/ {
-	d
-}
+/^#/ d
 
 # delete empty lines
-/^[ 	]*$/ {
-	d
-}
+/^[ 	]*$/ d
+
+
+# take precedence over automake's silent rules feature
+#if levels 2,3,4
+/^AM_V_[A-Za-z]\+[ 	]*=/ d
+/^am__v_[A-Za-z]\+_0\?[ 	]*=/ d
+/^AM_DEFAULT_VERBOSITY[ 	]*=/ d
+#endif
 
 
 # rewrite compiler flags
@@ -113,10 +117,10 @@
 	s/ -%l,/ -Wl,/g
 	s/ -%a,/ -Wa,/g
 	s/ -%p,/ -Wp,/g
-	
-       # insert -w flag into MULECFLAGS and MULECXXFLAGS if it isn't already in
-       /^MULEC$XX$\?FLAGS/! b 9
-       / -w/! s/=/= -w/
+
+	# insert -w flag into MULECFLAGS and MULECXXFLAGS if it isn't already in
+	/^MULEC$XX$\?FLAGS/! b 9
+	/ -w/! s/=/= -w/
 	:9
 }
 #endif
@@ -158,11 +162,14 @@
 	/^$/ b 0
 	/^[^	]/ b 0
 
+	# get rid of the last pieces of automake's silent rules feature
+	s/^	$(AM_V_[A-Za-z]\+)/	/
+
 	x
 	/^\n/ b 5
 
 	# skipping install-strip target, since it will trigger the echo-denoiser,
-	# and would silence the whole installation, which is abolutely not wanted
+	# and would silence the whole installation, which is absolutely not wanted
 	/^install-strip$/ {
 		s/.*//
 		x
@@ -200,6 +207,11 @@
 	echo "Generating $(@F)"
 		b 4
 	}
+	/\.moc$/ {
+		i\
+	echo "Compiling meta objects $(@)"
+		b 4
+	}
 	/\.$(OBJEXT)$/ {
 		i\
 	echo "Compiling $(<F)"
@@ -253,6 +265,18 @@
 	/^[ 	]*@*echo/ {
 		x
 		/maintainer-clean-generic/ b 6a
+		/uninstall/ b 6c
+		# Install targets may contain echo commands that must not be redirected,
+		# so skip this echo unless it contains installation code
+		/install/ {
+			x
+			/$(INSTALL/ b 6d
+			/installing/ b 6d
+			b 6
+			:6d
+			x
+		}
+		:6c
 #if level 3
 		/maintainer/ b 6a
 		/$(RECURSIVE_TARGETS)/ b 6a
@@ -342,6 +366,7 @@
 			H
 			g
 			s/.*$(DESTDIR)$[^;" ][^;" ]*$.*/	echo "Installing \1"; \\/
+			s/$(modulesdir)$$dir/$(modulesdir)/
 			P
 			g
 			s/[^\n]*//

aMule-2.2.6.tar.bz2/src/utils/scripts/id2ip -> aMule-2.3.1.tar.bz2/src/utils/scripts/id2ip Changed

aMule-2.2.6.tar.bz2/src/utils/scripts/kadnodescreate.pl -> aMule-2.3.1.tar.bz2/src/utils/scripts/kadnodescreate.pl Changed

aMule-2.2.6.tar.bz2/src/utils/scripts/linkcvs -> aMule-2.3.1.tar.bz2/src/utils/scripts/linkcvs Changed

aMule-2.2.6.tar.bz2/src/utils/scripts/logfilter -> aMule-2.3.1.tar.bz2/src/utils/scripts/logfilter Changed

aMule-2.2.6.tar.bz2/src/utils/scripts/mldonkey_importer.pl -> aMule-2.3.1.tar.bz2/src/utils/scripts/mldonkey_importer.pl Changed

aMule-2.2.6.tar.bz2/src/utils/scripts/sanity -> aMule-2.3.1.tar.bz2/src/utils/scripts/sanity Changed

@@ -2,18 +2,18 @@
 
 # This file is part of the aMule project.
 #
-# Copyright (c) 2003-2009 aMule Project ( admin@amule.org / http://www.amule.org )
+# Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
 #
 # 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
@@ -21,7 +21,7 @@
 
 
 # This function returns true if a file is filtered
-# and shound't be included in the sainity testing.
+# and shound't be included in the sanity testing.
 def IsFiltered(filename)
 	(["./config.h", "./configWIN32.h"].index(filename) != nil) or
 	(filename =~ /^.\/intl\//) or
@@ -55,7 +55,7 @@
 	def file_name
 		@file.slice( /[^\/]+$/ )
 	end
-	
+
 	def file_path
 		@file.slice( /^.*\// )
 	end
@@ -67,11 +67,11 @@
 
 
 
-# Base class for Sainity Checkers
+# Base class for Sanity Checkers
 #
-# This class represents the basic sainity-check, which returns all
+# This class represents the basic sanity-check, which returns all
 # files as positive results, regardless of the contents.
-class SainityCheck
+class SanityCheck
 	def initialize
 		@name = "None"
 		@title = nil
@@ -97,18 +97,18 @@
 		@results
 	end
 
-	# This function will be called for each file, with the argument "file" as the 
+	# This function will be called for each file, with the argument "file" as the
 	# name of the file and the argument "lines" being an array of Line objects for
 	# each line of the file.
 	#
-	def parse_file(file, lines) 
+	def parse_file(file, lines)
 		raise "Missing parse_file() implementation for Filter: #{@name}"
 	end
 
 
 	private
-	
-	def add_results( file, lines = [nil] ) 
+
+	def add_results( file, lines = [nil] )
 		lines.each do |line|
 			@results << Result.new( self, file, line )
 		end
@@ -119,10 +119,10 @@
 
 
 
-class CompareAgainstEmptyString < SainityCheck
+class CompareAgainstEmptyString < SanityCheck
 	def initialize
 		super
-		
+
 		@name  = "CmpEmptyString"
 		@title = "Comparing With Empty String"
 		@type  = "Good Practice"
@@ -132,8 +132,8 @@
 		@desc += "of wxString."
 	end
 
-	def parse_file(file, lines) 
-		results = lines.select do |line| 
+	def parse_file(file, lines)
+		results = lines.select do |line|
 			line.text =~ /[!=]=\s*(wxEmptyString|wxT$""$|_$""$)/ or
 			line.text =~ /(wxEmptyString|wxT$""$|_$""$)\s*[!=]=/
 		end
@@ -144,12 +144,12 @@
 
 
 
-class AssignmentToEmptyString < SainityCheck
+class AssignmentToEmptyString < SanityCheck
 	def initialize
 		super
-	
+
 		@name  = "EmptyStringAssignment"
-		@title = "Assignment To Empty String"
+		@title = "Assigning The Empty String"
 		@type  = "Good Practice"
 		@desc  = "Assigning an empty string such as wxT(\"\"), wxEmptyString and _(\"\") "
 		@desc += "to a wxString should be avoided, since it forces the creation of a "
@@ -157,10 +157,10 @@
 		@desc += "clear a string is to use the Clear() member-function of wxString."
 	end
 
-	def parse_file(file, lines) 
+	def parse_file(file, lines)
 		if file =~ /\.cpp$/
-			results = lines.select do |line| 
-				line.text =~ /[^=!]=\s*(wxEmptyString|wxT$""$|_$""$)/ 
+			results = lines.select do |line|
+				line.text =~ /[^=!]=\s*(wxEmptyString|wxT$""$|_$""$)/
 			end
 
 			add_results( file, results )
@@ -170,14 +170,14 @@
 
 
 
-class NoIfNDef < SainityCheck
+class NoIfNDef < SanityCheck
 	def initialize
 		super
-	
+
 		@name  = "NoIfNDef"
 		@title = "No #ifndef in headerfile"
 		@type  = "Good Practice"
-		@desc  = "All header files should contain a #ifndef __<FILENAME>__. The purpuse is to ensure "
+		@desc  = "All header files should contain a #ifndef __<FILENAME>__. The purpose is to ensure "
 		@desc += "that the header can't be included twice, which would introduce a number of problems."
 	end
 
@@ -192,77 +192,104 @@
 
 
 
-class ThisDeference < SainityCheck
+class ThisDeference < SanityCheck
 	def initialize
 		super
-	
+
 		@name  = "ThisDeference"
 		@title = "Dereference of \"this\""
 		@type  = "Good Practice"
-		@desc  = "In all but the case of templates, using \"this->\" is unnescesarry and "
+		@desc  = "In all but the case of templates, using \"this->\" is unnecessary and "
 		@desc += "only decreases the readability of the code."
 	end
 
-	def parse_file(file, lines) 
+	def parse_file(file, lines)
 		results = lines.select do |line|
 			line.text =~ /\bthis->/
 		end
-		
+
 		add_results( file, results )
 	end
 end
 
 
 
-class Assert < SainityCheck
+class Assert < SanityCheck
 	def initialize
 		super
-	
+
 		@name  = "Assert"
-		@type  = "Consistancy"
+		@type  = "Consistency"
 		@desc  = "wxASSERT()s should be used rather than normal assert()s "
-		@desc += "for the sake of consistancy."
+		@desc += "for the sake of consistency."
 	end
 
-	def parse_file(file, lines) 
+	def parse_file(file, lines)
 		results = lines.select do |line|
 			line.text =~ /assert\s*$/
 		end
-		
+
+		add_results( file, results )
+	end
+end
+
+
+
+class WxFailUsage < SanityCheck
+	def initialize
+		super
+
+		@name  = "WxFailUsagesy"
+		@title = "Always failing wxASSERT()"
+		@type  = "Good Practice"
+		@desc  = "Use wxFAIL instead of an always failing wxASSERT()."
+	end
+
+	def parse_file(file, lines)
+		results = lines.select do |line|
+			line.text =~ /\bwxASSERT\s*\(\s*(0|false)\s*$/ or
+			line.text =~ /\bwxASSERT_MSG\s*\(\s*(0|false)\s*,/
+		end
+
 		add_results( file, results )
 	end
 end
 
 
 
-class PassByValue < SainityCheck
+class PassByValue < SanityCheck
 	def initialize
 		super
-	
+
 		@name  = "PassByValue"
 		@title = "Pass By Value"
 		@type  = "Good Practice"
 		@desc  = "Passing objects by value means an extra overhead for large datatypes. "
-		@desc += "Therefore should these always be passed by const reference when possible."
+		@desc += "Therefore these should always be passed by const reference when possible. "
 		@desc += "Non-const references should only be used for functions where the function is "
 		@desc += "supposed to change the actual value of the argument and return another or no value."
 	end
 
 	def parse_file(file, lines)
 		results = Array.new
-	
+
 		# Only handle header files
 		if file =~ /\.h$/
-			# Items that should be passed by const-ref
-			items = [ "wxString", "wxRect", "wxPoint", "CMD4Hash" ]
+			# Items that should not be passed by value
+			items = [ "wxString", "wxRect", "wxPoint", "CMD4Hash", "CPath" ]
 
 			lines.each do |line|
 				# Try to identify function definitions
 				if line.text =~ /^\s*(virtual|static|inline|)\s*\w+\s+\w+\s*$.*$/
 					# Split by arguments
-					line.text.match(/$.*$/)[0].split(",").each do |str|
+					if line.text =~ /$.*$\s*\{/
+						args = line.text.match(/$.*$\s*\{/)[0]
+					else
+						args = line.text.match(/$.*$/)[0]
+					end
+					args.split(",").each do |str|
 						items.each do |item|
-							if str =~ /#{item}\s*[^\s\*]/ and not str =~ /const/
+							if str =~ /#{item}\s*[^\s\&\*$]/
 								results.push( line )
 							end
 						end
@@ -277,10 +304,10 @@
 
 
 
-class CStr < SainityCheck
+class CStr < SanityCheck
 	def initialize
 		super
-	
+
 		@name  = "CStr"
 		@title = "C_Str or GetData"
 		@type  = "Unicoding"
@@ -290,9 +317,9 @@
 		@desc += "classes have GetData members, so it does some crude filtering."
 	end
 
-	def parse_file(file, lines) 
-		results = lines.select do |line| 
-			if line.text =~ /c_str\($/ 
+	def parse_file(file, lines)
+		results = lines.select do |line|
+			if line.text =~ /c_str/ and line.text !~ /char2unicode$/
 				true
 			else
 				line.text =~ /GetData\($/ and line.text =~ /(wxT$|wxString|_\()/
@@ -305,17 +332,17 @@
 
 
 
-class IfNotDefined < SainityCheck
+class IfNotDefined < SanityCheck
 	def initialize
 		super
-	
+
 		@name  = "IfDefined"
 		@title = "#if (!)defined"
-		@type  = "Consistancy"
+		@type  = "Consistency"
 		@desc  = "Use #ifndef or #ifdef instead for reasons of simplicity."
 	end
 
-	def parse_file(file, lines) 
+	def parse_file(file, lines)
 		results = lines.select do |line|
 			if line.text =~ /^#if.*[\!]?defined\(/
 				not line.text =~ /(\&\&|\|\|)/
@@ -328,7 +355,7 @@
 
 
 
-class GPLLicense < SainityCheck
+class GPLLicense < SanityCheck
 	def initialize
 		super
 
@@ -349,10 +376,10 @@
 
 
 
-class Copyright < SainityCheck
+class Copyright < SanityCheck
 	def initialize
 		super
-		
+
 		@name  = "MissingCopyright"
 		@title = "Missing Copyright Notice"
 		@type  = "License"
@@ -364,7 +391,7 @@
 			found = lines.select do |line|
 				line.text =~ /Copyright\s*\([cC]$\s*[-\d,]+ aMule (Project|Team)/
 			end
-			
+
 			if found.empty? then
 				add_results( file )
 			end
@@ -374,10 +401,10 @@
 
 
 
-class PartOfAmule < SainityCheck
+class PartOfAmule < SanityCheck
 	def initialize
 		super
-	
+
 		@name  = "aMuleNotice"
 		@title = "Missing aMule notice"
 		@type  = "License"
@@ -390,7 +417,7 @@
 				line.text =~ /This file is part of the aMule Project/ or
 				line.text =~ /This file is part of aMule/
 			end
-			
+
 			if found.empty? then
 				add_results( file )
 			end
@@ -400,25 +427,25 @@
 
 
 
-class MissingBody < SainityCheck
+class MissingBody < SanityCheck
 	def initialize
 		super
-		
+
 		@name  = "MissingBody"
 		@title = "Missing Body in Loop"
 		@type  = "Garbage"
-		@desc  = "This checks looks for loops without any body. For example \"while(true);\" "
+		@desc  = "This check looks for loops without any body. For example \"while(true);\" "
 		@desc += "In most cases this is a sign of either useless code or bugs. Only in a few "
 		@desc += "cases is it valid code, and in those it can often be represented clearer "
 		@desc += "in other ways."
 	end
 
-	def parse_file(file, lines) 
+	def parse_file(file, lines)
 		results = lines.select do |line|
 			if line.text =~ /^[^}]*while\s*$.*$\s*;/ or
 			   line.text =~ /^\s*for\s*$.*$\s*;[^\)]*$/
 				# Avoid returning "for" spanning multiple lines
-				# TODO A better way to count instances 
+				# TODO A better way to count instances
 				line.text.split("(").size == line.text.split(")").size
 			else
 				false
@@ -431,25 +458,25 @@
 
 
 
-class Translation < SainityCheck
+class Translation < SanityCheck
 	def initialize
 		super
-	
+
 		@name  = "Translation"
-		@type  = "Consistancy"
-		@desc  = "Calls to AddLogLineM should translate the message, whereas "
+		@type  = "Consistency"
+		@desc  = "Calls to AddLogLine should translate the message, whereas "
 		@desc += "calls to AddDebugLogLine shouldn't. This is because the user "
 		@desc += "is meant to see normal log lines, whereas the the debug-lines "
-		@desc += "are only meant for the developers and I dont know about you, but "
-		@desc += "I dont plan on learning every language we choose to translate "
+		@desc += "are only meant for the developers and I don't know about you, but "
+		@desc += "I don't plan on learning every language we choose to translate "
 		@desc += "aMule to. :P"
 	end
 
-	def parse_file(file, lines) 
+	def parse_file(file, lines)
 		results = lines.select do |line|
 			if line.text =~ /\"/
-				line.text =~ /AddLogLine(M|)\(.*wxT\(/ or
-				line.text =~ /AddDebugLogLine(M|)\(.*_\(/
+				line.text =~ /AddLogLine.?.?\(.*wxT\(/ or
+				line.text =~ /AddDebugLogLine.?\(.*_\(/
 			else
 				false
 			end
@@ -461,10 +488,10 @@
 
 
 
-class IfZero < SainityCheck
+class IfZero < SanityCheck
 	def initialize
 		super
-	
+
 		@name  = "PreIfConstant"
 		@title = "#if 0-9"
 		@type  = "Garbage"
@@ -473,7 +500,7 @@
 		@desc += "should be left, but the #ifs removed unless there is a pressing need for them."
 	end
 
-	def parse_file(file, lines) 
+	def parse_file(file, lines)
 		results = lines.select do |line|
 			line.text =~ /#if\s+[0-9]/
 		end
@@ -484,19 +511,19 @@
 
 
 
-class InlinedIfTrue < SainityCheck
+class InlinedIfTrue < SanityCheck
 	def initialize
 		super
-	
-		@name = "InlinedIf"
-		@name = "Inlined If true/false"
-		@type = "Garbage"
-		@desc = "Using variations of (x ? true : false) or (x ? false : true) is just plain stupid."
+
+		@name  = "InlinedIf"
+		@title = "Inlined If true/false"
+		@type  = "Garbage"
+		@desc  = "Using variations of (x ? true : false) or (x ? false : true) is just plain stupid."
 	end
 
-	def parse_file(file, lines) 
+	def parse_file(file, lines)
 		results = lines.select do |line|
-			line.text =~ /\?\s*(true|false)\s*:\s*(true|false)/i			
+			line.text =~ /\?\s*(true|false)\s*:\s*(true|false)/i
 		end
 
 		add_results( file, results )
@@ -505,10 +532,10 @@
 
 
 
-class LoopOnConstant < SainityCheck
+class LoopOnConstant < SanityCheck
 	def initialize
 		super
-	
+
 		@name  = "LoopingOnConstant"
 		@title = "Looping On Constant"
 		@type  = "Garbage"
@@ -518,7 +545,7 @@
 		@desc += "or replaced with more elegant code."
 	end
 
-	def parse_file(file, lines) 
+	def parse_file(file, lines)
 		results = lines.select do |line|
 			line.text =~ /while\s*$\s*([0-9]+|true|false)\s*$/i or
 			line.text =~ /for\s*$[^;]*;\s*;[^;]*$/
@@ -530,7 +557,7 @@
 
 
 
-class MissingImplementation < SainityCheck
+class MissingImplementation < SanityCheck
 	def initialize
 		super
 
@@ -540,7 +567,7 @@
 		@desc  = "Forgetting to remove a function-definition after having removed it "
 		@desc += "from the .cpp file only leads to cluttered header files. The only "
 		@desc += "case where non-implemented functions should be used is when it is "
-		@desc += "necesarry to prevent usage of for instance assignment between "
+		@desc += "necessary to prevent usage of for instance assignment between "
 		@desc += "instances of a class."
 
 		@declarations = Array.new
@@ -553,8 +580,8 @@
 				pair.first == definition
 			end
 		end
-		
-		
+
+
 		return @declarations.map do |pair|
 			Result.new( self, pair.last.first, pair.last.last )
 		end
@@ -564,36 +591,36 @@
 		if file =~ /\.h$/ then
 			level = 0
 			tree = Array.new
-			
+
 			lines.each do |line|
 				level += line.text.count( "{" ) - line.text.count( "}" )
-			
-				tree.delete_if do |struct| 
+
+				tree.delete_if do |struct|
 					struct.first > level
 				end
 
-				
+
 				if line.text !~ /^\s*\/\// and line.text !~ /^\s*#/ and line.text !~ /typedef/ then
 					if line.text =~ /^\s*(class|struct)\s+/ and line.text.count( ";" ) == 0 then
 						cur_level = level;
-						
+
 						if line.text.count( "{" ) == 0 then
 							cur_level += 1
 						end
-						
+
 						name = line.text.scan( /^\s*(class|struct)\s+([^\:{;]+)/ )
 						if name != [] then
 							name = name.first.last.strip
 						else
 							name = "Unknown at line " + line.number.to_s + " in " + file
 						end
-						
+
 						tree << [ cur_level, name ]
 					elsif line.text =~ /;\s*$/ and line.text.count( "{" ) == 0 then
 						# No pure virtual functions and no return(blah) calls (which otherwise can fit the requirements)
 						if line.text !~ /=\s*0\s*;\s*$/ and line.text !~ /return/ then
 							re = /^\s*(virtual\s+|static\s+|inline\s+|)\w+(\s+[\*\&]?|[\*\&]\s+)(\w+)\(/.match( line.text )
-	
+
 							if re and level > 0 and tree.last then
 								@declarations << [ tree.last.last + "::" + re[ re.length - 1 ], [ file, line ] ]
 							end
@@ -606,7 +633,7 @@
 				if line.text =~ /\b\w+::\w+\s*\([^;]+$/
 					@definitions << line.text.scan( /\b(\w+::\w+)\s*\([^;]+$/ ).first.first
 				end
-			end	
+			end
 		end
 	end
 end
@@ -636,6 +663,7 @@
 filterList.push InlinedIfTrue.new
 filterList.push LoopOnConstant.new
 filterList.push MissingImplementation.new
+filterList.push WxFailUsage.new
 
 
 # Sort enabled filters by type and name. The reason why this is done here is
@@ -643,7 +671,7 @@
 # or change the name or type of an existing filter.
 filterList.sort! do |x,y|
 	cmp = x.type <=> y.type
-	
+
 	if cmp == 0 then
 		x.title <=> y.title
 	else
@@ -659,7 +687,7 @@
 	require "find"
 
 	Find.find( path ) do |filename|
-		if filename =~ /\.(cpp|h)$/ and not IsFiltered(filename) then 
+		if filename =~ /\.(cpp|h)$/ and not IsFiltered(filename) then
 			File.open(filename, "r") do |aFile|
 				# Read lines and add line-numbers
 				lines = Array.new
@@ -694,7 +722,7 @@
 	if not list.last or list.last.first != key then
 		list << [ key, Array.new ]
 	end
-	
+
 	list.last.last
 end
 
@@ -703,7 +731,7 @@
 def create_result_tree( path, filters )
 	# Gather the results
 	results = parse_files( path, filters )
-	
+
 	# Sort the results by the following sequence of variables: Path -> File -> Filter -> Line
 	results.sort! do |a, b|
 		if (a.file_path <=> b.file_path) == 0 then
@@ -751,7 +779,7 @@
 def PadNum( number )
 	num = number.to_s
 
-	if ( num.size < 5 ) 
+	if ( num.size < 5 )
 		( "0" * ( 5 - num.size ) ) + num
 	else
 		num
@@ -761,7 +789,7 @@
 
 
 # Helper-function that escapes some chars to HTML codes
-def HTMLEsc( str ) 
+def HTMLEsc( str )
 	str.gsub!( /\&/, "&amp;"  )
 	str.gsub!( /\"/, "&quot;" )
 	str.gsub!( /</,  "&lt;"   )
@@ -777,7 +805,7 @@
 # TODO Enable use of templates.
 # TODO Abandon hope.
 def OutputHTML( filters, results )
-	text  = 
+	text  =
 "<html>
 	<head>
 		<STYLE TYPE=\"text/css\">
@@ -797,7 +825,7 @@
 				padding-left: 10pt;
 				padding-right: 10pt;
 				padding-top: 5pt;
-			}	
+			}
 		-->
 		</STYLE>
 	</head>
@@ -808,13 +836,13 @@
 "
 	# List the filters
 	filters.each do |filterType|
-		text += 
+		text +=
 "			<dt><b>#{filterType.first}</b></dt>
 			<dd>
 				<dl>
 "
 		filterType.last.each do |filter|
-			text += 
+			text +=
 "					<dt id=\"#{filter.name}\"><i>#{filter.title}</i></dt>
 					<dd>
 						#{HTMLEsc(filter.desc)}<p>
@@ -828,11 +856,11 @@
 "
 	end
 
-	text += 
+	text +=
 "		</dl>
-	
+
 		<p>
-	
+
 		<h1>Directories</h1>
 		<ul>
 "
@@ -846,40 +874,40 @@
 "
 	end
 
-	text += 
+	text +=
 "		</ul>
 
 		<p>
-	
+
 		<h1>Results</h1>
 "
 
 	results.each do |dir|
-		text += 
+		text +=
 "		<div class=\"dir\">
 			<h2 id=\"#{dir.first}\">#{dir.first}</h2>
 "
 
 		dir.last.each do |file|
-			text += 
+			text +=
 "			<div class=\"file\">
 				<h3>#{file.first}</h3>
 
 				<ul>
 "
-			
+
 			file.last.each do |filter|
-				text += 
+				text +=
 "					<li>
 						<div class=\"filter\">
 							<b><a href=\"\##{filter.first.name}\">#{filter.first.title}</a></b>
 
 							<ul>
 "
-			
+
 				filter.last.each do |result|
 					if result.line then
-						text += 
+						text +=
 "								<li><b>#{PadNum(result.line.number)}:</b> #{HTMLEsc(result.line.text.strip)}</li>
 "
 					end
@@ -891,20 +919,20 @@
 					</li>
 "
 			end
-			text += 
+			text +=
 "				</ul>
 			</div>
 "
 		end
-		
-		text += 
+
+		text +=
 "		</div>
 
 		<p>
 "
 	end
 
-	text += 
+	text +=
 "	</body>
 </html>"
 
@@ -923,15 +951,15 @@
 
 # Fugly output code also goes here, this is a bit more sparse than the HTML stuff
 def OutputTEXT( filters, results )
-	
+
 	# List the filters
 	text = "Filters\n"
 	filters.each do |filterType|
 		text += "\t* #{filterType.first}\n"
-		
+
 		filterType.last.each do |filter|
 			text += "\t\t- #{filter.title}\n"
-		
+
 			text += Columnize( filter.desc, 80, "\t\t\t" ) + "\n\n"
 		end
 	end
@@ -971,10 +999,9 @@
 #TODO Improved parameter-handling, add =<file> for the outputing to a file
 ARGV.each do |param|
 	case param
-		when "--text" then 
+		when "--text" then
 			puts OutputTEXT( create_filter_tree( filterList ), create_result_tree( ".", filterList ) )
-		when "--html" then 
+		when "--html" then
 			puts OutputHTML( create_filter_tree( filterList ), create_result_tree( ".", filterList ) )
 	end
 end
-

aMule-2.2.6.tar.bz2/src/utils/scripts/stats.pl -> aMule-2.3.1.tar.bz2/src/utils/scripts/stats.pl Changed

@@ -22,7 +22,8 @@
 use POSIX qw(strftime);
 
 
-my $PACKAGE="amule";
+my $PACKAGE="aMule";
+my $DOMAIN="amule";
 
 
 use Locale::Language;
@@ -54,7 +55,7 @@
 
 system("intltool-update --pot > /dev/null");
 
-$_ = `msgfmt --statistics $PACKAGE.pot -o /dev/null 2>&1`;
+$_ = `msgfmt --statistics $DOMAIN.pot -o /dev/null 2>&1`;
 
 die "unable to get total: $!" unless (/(\d+) untranslated messages/);
 
@@ -65,13 +66,13 @@
 
 print "<?xml version='1.0'?>\n";
 print "<?xml-stylesheet type='text/xsl' href='l10n.xsl'?>\n";
-print "<project version='1.0' xmlns:l10n='http://faceprint.com/code/l10n' name='$PACKAGE' pofile='$PACKAGE.pot' strings='$total' generated='$generated' stats_generated='$stats_generated'>\n";
+print "<project version='1.0' xmlns:l10n='http://faceprint.com/code/l10n' name='$PACKAGE' pofile='$DOMAIN.pot' strings='$total' generated='$generated' stats_generated='$stats_generated'>\n";
 
 foreach $index (0 .. $#pos) {
 	$trans = $fuzz = $untrans = 0;
 	$po = $pos[$index];
 	print STDERR "$po..." if($ARGV[0] eq '-v');
-	system("msgmerge $po.po $PACKAGE.pot -o $po.new 2>$po.po.warnings");
+	system("msgmerge $po.po $DOMAIN.pot -o $po.new 2>$po.po.warnings");
 	$_ = `msgfmt --statistics $po.new -o /dev/null 2>&1`;
 	chomp;
 	if(/(\d+) translated message/) { $trans = $1; }

aMule-2.2.6.tar.bz2/src/utils/scripts/version_bumper -> aMule-2.3.1.tar.bz2/src/utils/scripts/version_bumper Changed

aMule-2.2.6.tar.bz2/src/utils/scripts/wikify_latest_changelog -> aMule-2.3.1.tar.bz2/src/utils/scripts/wikify_latest_changelog Changed

aMule-2.3.1.tar.bz2/src/utils/scripts/year_bumper Added

@@ -0,0 +1,67 @@
+#!/bin/sh -eu
+
+## This file is part of the aMule Project
+##
+## Copyright (c) 2011 Dévai Tamás ( gonosztopi@amule.org )
+## Copyright (c) 2011 aMule Team ( admin@amule.org / http://www.amule.org )
+##
+## 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
+
+# Usage:
+#	year_bumper [oldyear [newyear]]
+#
+#	oldyear defaults to the year found in configure.in
+#	newyear defaults to the current year
+
+if [ ! -f ./configure.in ]; then
+	echo "This script must be run from the source root directory!"
+	exit 1
+fi
+
+if [ $# -ge 1 ]; then
+	oldyear="$1"
+else
+	oldyear=`sed -e 's/# Copyright (c) 2003-$[0-9]\{4\}$.*/\1/;t;d' ./configure.in`
+fi
+
+if [ $# -ge 2 ]; then
+	newyear="$2"
+else
+	newyear=`date "+%Y"`
+fi
+
+echo "Bumping from ${oldyear} to ${newyear}..."
+
+if [ "$newyear" = "$oldyear" ]; then
+	echo "Nothing to do."
+	exit
+fi
+
+find '.' \
+	'(' \
+		-name '.svn' -o	\
+		-name '.hg' -o	\
+		-name '.git' -o	\
+		-name '*.wdr'	\
+	')' -prune -o \
+	-type f -print | \
+while read f; do
+	if file "$f" | grep -q text ; then
+		if grep -q "$oldyear" "$f" ; then
+			echo $f
+			sed -i -e "/Copyright/{s/-${oldyear}/-${newyear}/g;s/${oldyear}/${oldyear}-${newyear}/g;}" "$f"
+		fi
+	fi
+done

aMule-2.2.6.tar.bz2/src/utils/wxCas/Makefile.in -> aMule-2.3.1.tar.bz2/src/utils/wxCas/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +15,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -47,11 +45,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -61,47 +61,89 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(icondir)" "$(DESTDIR)$(utildir)"
-dist_iconDATA_INSTALL = $(INSTALL_DATA)
-dist_utilDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_icon_DATA) $(dist_util_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -116,17 +158,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -138,44 +174,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -197,13 +233,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -211,44 +244,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -257,7 +286,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -265,25 +293,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -295,29 +317,40 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = src docs
 EXTRA_DIST = wxcas.rc wxcas.ico
 dist_icon_DATA = wxcas.xpm
@@ -332,14 +365,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/utils/wxCas/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/utils/wxCas/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/wxCas/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/wxCas/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -357,41 +390,47 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 install-dist_iconDATA: $(dist_icon_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
-	@list='$(dist_icon_DATA)'; for p in $$list; do \
+	test -z "$(icondir)" || $(MKDIR_P) "$(DESTDIR)$(icondir)"
+	@list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
-	  $(dist_iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icondir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(icondir)" || exit $$?; \
 	done
 
 uninstall-dist_iconDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_icon_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(icondir)/$$f"; \
-	done
+	@list='$(dist_icon_DATA)'; test -n "$(icondir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(icondir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(icondir)" && rm -f $$files
 install-dist_utilDATA: $(dist_util_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(utildir)" || $(mkdir_p) "$(DESTDIR)$(utildir)"
-	@list='$(dist_util_DATA)'; for p in $$list; do \
+	test -z "$(utildir)" || $(MKDIR_P) "$(DESTDIR)$(utildir)"
+	@list='$(dist_util_DATA)'; test -n "$(utildir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_utilDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(utildir)/$$f'"; \
-	  $(dist_utilDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(utildir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(utildir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(utildir)" || exit $$?; \
 	done
 
 uninstall-dist_utilDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_util_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(utildir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(utildir)/$$f"; \
-	done
+	@list='$(dist_util_DATA)'; test -n "$(utildir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(utildir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(utildir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -400,7 +439,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -417,16 +456,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -452,16 +490,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -469,14 +507,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -488,81 +526,101 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -573,7 +631,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(icondir)" "$(DESTDIR)$(utildir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -595,6 +653,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -614,18 +673,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-dist_iconDATA install-dist_utilDATA
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -644,24 +723,25 @@
 
 ps-am:
 
-uninstall-am: uninstall-dist_iconDATA uninstall-dist_utilDATA \
-	uninstall-info-am
+uninstall-am: uninstall-dist_iconDATA uninstall-dist_utilDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
 	install-am install-data install-data-am install-dist_iconDATA \
-	install-dist_utilDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-dist_iconDATA \
-	uninstall-dist_utilDATA uninstall-info-am
+	install-dist_utilDATA install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-dist_iconDATA uninstall-dist_utilDATA
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.2.6.tar.bz2/src/utils/wxCas/docs/Makefile.am -> aMule-2.3.1.tar.bz2/src/utils/wxCas/docs/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/docs/Makefile.in -> aMule-2.3.1.tar.bz2/src/utils/wxCas/docs/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -46,11 +44,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -60,28 +60,26 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -96,17 +94,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -118,44 +110,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -177,13 +169,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -191,44 +180,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -237,7 +222,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -245,25 +229,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -275,31 +253,42 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SELECTED_MANPAGES = $(WXCAS_MANPAGES)
-EXTRA_DIST = wxcas.1 wxcas.de.1 wxcas.es.1 wxcas.eu.1 wxcas.hu.1
+EXTRA_DIST = wxcas.1 wxcas.de.1 wxcas.es.1 wxcas.fr.1 wxcas.hu.1 wxcas.it.1 wxcas.ru.1 wxcas.tr.1
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
@@ -308,14 +297,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/utils/wxCas/docs/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/utils/wxCas/docs/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/wxCas/docs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/wxCas/docs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -333,7 +322,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 tags: TAGS
 TAGS:
 
@@ -342,30 +331,32 @@
 
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../../../../automake
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -393,6 +384,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -412,6 +404,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -419,13 +413,30 @@
 install-data-am:
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
+install-dvi-am:
 
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -444,19 +455,21 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-hook install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-hook \
-	uninstall-info-am
+	pdf-am ps ps-am uninstall uninstall-am uninstall-hook
 
 install-data-hook:
 	@test -z "`echo $(SELECTED_MANPAGES)`" || \
@@ -495,6 +508,7 @@
 			rm -f $(DESTDIR)$(mandir)/$$locale/man1/$$inst ; \
 		fi; \
 	done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/src/utils/wxCas/docs/wxcas.1 -> aMule-2.3.1.tar.bz2/src/utils/wxCas/docs/wxcas.1 Changed

@@ -1,23 +1,24 @@
-.TH WXCAS 1 "September 2009" "wxCas" "aMule utilities"
+.TH WXCAS 1 "November 2011" "wxCas" "aMule utilities"
+.als B_untranslated B
 .SH NAME
 wxcas \- wx c aMule statistics
 .SH SYNOPSIS
-.B wxcas
+.B_untranslated wxcas
 .SH DESCRIPTION
-.B wxcas
-is a program for displaying the contents of your 
+\fBwxcas\fR is a program for displaying the contents of your 
 online signature file in a nice wx Window on your Desktop.
-Based on Pedro de Oliveira's \fBcas\fR(1).
+For this to work, you must enable the "Online Signature" option in aMule's preferences.
 
-This program doesn't take any arguments.
-.PP
-The full documentation of wxcas can be downloaded from \fIhttp://download.berlios.de/amule/wxcas_user_manual.pdf\fR.
-.SH AUTHOR
+Based on Pedro de Oliveira's \fBcas\fR(1).
 \fBwxcas\fR was written by ThePolish <thepolish@vipmail.ru>
+
+This app doesn't take any arguments.
 .SH REPORTING BUGS
 Please report bugs either on our forum (\fIhttp://forum.amule.org/\fR), or in our bugtracker (\fIhttp://bugs.amule.org/\fR).
 Please do not report bugs in e-mail, neither to our mailing list nor directly to any team member.
 .SH COPYRIGHT
 aMule and all of its related utilities are distributed under the GNU General Public License.
 .SH SEE ALSO
-\fBamule\fR(1), \fBcas\fR(1)
+.B_untranslated amule\fR(1), \fBcas\fR(1)
+.SH AUTHOR
+This manpage was written by Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/wxCas/docs/wxcas.de.1 -> aMule-2.3.1.tar.bz2/src/utils/wxCas/docs/wxcas.de.1 Changed

@@ -3,29 +3,33 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH WXCAS 1 "Januar 2007" wxCas "aMule Hilfsprogramme"
+.TH WXCAS 1 "November 2011" wxCas "aMule Hilfsprogramme"
+.als B_untranslated B
 .SH NAME
 wxcas \- wx c aMule statistics
 .SH SYNTAX
-\fBwxcas\fP
+.B_untranslated wxcas
 .SH BESCHREIBUNG
-\fBwxcas\fP ist ein Program das den Inhalt deiner aMule Onlinesignaturedatei in
-menschenlesbarer Form in einem wx\-Fenster auf deinem Desktop
-ausgibt. Basierend auf Pedro de Oliveira's \fBcas\fP(1).
+\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.
 
-Dieses Programm hat keine Parameter
-.PP
-Die komplette Dokumentation zu wxcas kannst du herunter laden von: 
-\fIhttp://download.berlios.de/amule/wxcas_user_manual.pdf\fP.
-.SH VERFASSER
-\fBwxcas\fP wurde geschrieben von ThePolish <thepolish@vipmail.ru>
+Based on Pedro de Oliveira's \fBcas\fP(1).  \fBwxcas\fP was written by ThePolish
+<thepolish@vipmail.ru>
+
+Dieses Programm hat keine Parameter.
 .SH "FEHLER MELDEN"
 Bitte meldet Fehler entweder in unserem Forum (\fIhttp://forum.amule.org/\fP),
 oder in unseren Bugtracker (\fIhttp://bugs.amule.org/\fP). Bitte meldet uns
-keine Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
+weder Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
 Teammitglieder.
 .SH COPYRIGHT
 aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU
 General Public License
 .SH "SIEHE AUCH"
-\fBamule\fP(1), \fBcas\fP(1)
+.B_untranslated amule\fR(1), \fBcas\fR(1)
+.SH VERFASSER
+Diese manpage wurde geschrieben von Vollstrecker
+<amule@vollstreckernet.de>
+
+Diese manpage wurde übersetzt von Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/wxCas/docs/wxcas.es.1 -> aMule-2.3.1.tar.bz2/src/utils/wxCas/docs/wxcas.es.1 Changed

@@ -1,20 +1,33 @@
-.TH WXCAS 1 "Marzo 2005" "wxCas" "Utilidades de aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH WXCAS 1 "November 2011" wxCas "aMule utilidades"
+.als B_untranslated B
 .SH NOMBRE
-wxcas \- Estadísticas de aMule con interfáz gráfica
+wxcas \- wx c estadÃsticas de aMule
 .SH SINOPSIS
-.B wxcas
-.SH DESCRIPCIÓN
-.B wxcas
-es un programa para leer el contenido de la firma de tu cliente aMule en una amigable ventana.
-Basado en el programa \fBcas\fR(1) de Pedro de Oliveira.
-.PP
-La documentación completa de wxcas se puede descargar de \fIhttp://download.berlios.de/amule/wxcas_user_manual.pdf\fR.
-.SH AUTOR
-\fBwxcas\fR ha sido escrito por ThePolish <thepolish@vipmail.ru>
-.SH BUGS
-Si descubre bugs, por favor comuníquelos en (\fIhttp://forum.amule.org/\fR), o en nuestro bugtracker (\fIhttp://bugs.amule.org/\fR).
-Por favor, no comunique bugs por e-mail, ni a nuestro maillist ni directamente a ningún miembro del equipo de aMule.
+.B_untranslated wxcas
+.SH DESCRIPCIÃN
+\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.
+
+Based on Pedro de Oliveira's \fBcas\fP(1).  \fBwxcas\fP was written by ThePolish
+<thepolish@vipmail.ru>
+
+Esta apli no tiene ningÃºn argumento.
+.SH "INFORMANDO ERRORES"
+Por favor informa de fallos ya sea en nuestro foro
+(\fIhttp://forum.amule.org/\fP), o en nuestro bugtracker
+(\fIhttp://bugs.amule.org/\fP). Por favor no informe de fallos por correo, ni
+en nuestras listas, ni directamente al correo de algun miembro del equipo.
 .SH COPYRIGHT
-aMule, y todas las utilidades que con el vienen, se distribuyen bajo la licencia GPL.
-.SH VER
-\fBamule\fR(1), \fBcas\fR(1)
+aMule y todas las demÃ¡s utilidades relacionadas son distribuidas bajo la GNU
+General Public License.
+.SH "VEASE TAMBIEN"
+.B_untranslated amule\fR(1), \fBcas\fR(1)
+.SH AUTOR
+Esta pÃ¡gina de manualfue escrita por Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.3.1.tar.bz2/src/utils/wxCas/docs/wxcas.fr.1 Added

@@ -0,0 +1,34 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH WXCAS 1 "Novembre 2011" wxCas "Outils d'aMule"
+.als B_untranslated B
+.SH NOM
+wxcas \- wx c aMule statistics
+.SH SYNOPSIS
+.B_untranslated wxcas
+.SH DESCRIPTION
+\fBwxcas\fP est un programme permettant d'afficher le contenu de votre fichier
+de signature en ligne dans une belle fenêtre wx sur votre bureau.  Pour que
+cela fonctionne, vous devez activer l'option "Online Signature" dans les
+préférences d'aMule.
+
+Basé sur \fBcas\fP(1) de Pedro de Oliveira. \fBwxcas\fP a été écrit par ThePolish
+<thepolish@vipmail.ru>
+
+Cette application ne prend pas d'arguments.
+.SH "RAPPORTER DES BOGUES"
+Veuillez rapporter les bogues sur notre forum (\fIhttp://forum.amule.org/\fP),
+ou sur notre bugtracker (\fIhttp://bugs.amule.org/\fP).  Veuillez ne pas
+rapporter les bogues par e\-mail, sur notre liste de diffusion ou directement
+à n'importe quel membre  de l'équipe.
+.SH COPYRIGHT
+aMule et tout ses outils sont distribués sous la licence GNU General Public
+License.
+.SH "VOIR AUSSI"
+.B_untranslated amule\fR(1), \fBcas\fR(1)
+.SH AUTEUR
+Cette manpage a été écrite par Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/wxCas/docs/wxcas.hu.1 -> aMule-2.3.1.tar.bz2/src/utils/wxCas/docs/wxcas.hu.1 Changed

@@ -1,21 +1,34 @@
-.TH WXCAS 1 "2005 március" "wxCas" "aMule segédprogramok"
-.SH NÉV
-wxcas \- wx c aMule statisztikák
-.SH ÁTTEKINTÉS
-.B wxcas
-.SH LEÍRÁS
-A \fBwxcas\fR az aMule online-aláírás fájljának tartalmát jeleníti meg egy szép ablakban.
-Készült a Pedro de Oliveira által készített \fBcas\fR(1) program alapján.
-.PP
-A \fBwxcas\fR teljes dokumentációja letölthetõ a \fIhttp://download.berlios.de/amule/wxcas_user_manual.pdf\fR címrõl.
-.SH ÍRÓ
-A \fBwxcas\fR-t ThePolish <thepolish@vipmail.ru> írta.
-.SH HIBÁK JELENTÉSE
-A hibákat kérjük vagy a fórumon (\fIhttp://forum.amule.org/\fR), vagy a hibakövetõben (\fIhttp://bugs.amule.org/\fR) jelentsék.
-Hibákról kérjük ne írjanak levelet (e-mail-t) se a levelzési listára, se közvetlenül valamelyik fejlesztõnek.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH WXCAS 1 "2011. november" wxCas "aMule segÃ©dprogramok"
+.als B_untranslated B
+.SH NÃV
+wxcas \- wx c aMule statisztikÃ¡k
+.SH ÃTTEKINTÃS
+.B_untranslated wxcas
+.SH LEÃRÃS
+A \fBwxcas\fP az aMule online\-alÃ¡ÃrÃ¡s fÃ¡jljÃ¡nak tartalmÃ¡t jelenÃti meg
+grafikusan. Ahhoz, hogy ez mÅ±kÃ¶djÃ¶n, engedÃ©lyezni kell az \(BqOnline
+alÃ¡ÃrÃ¡s\(rq opciÃ³t az aMule beÃ¡llÃtÃ¡saiban.
+
+KÃ©szÃ¼lt a Pedro de Oliveira Ãrta \fBcas\fP(1) alapjÃ¡n.  A \fBwxcas\fP\-t ThePolish
+<thepolish@vipmail.ru> Ãrta.
+
+A program nem vÃ¡r semmilyen paramÃ©tert.
+.SH "HIBÃK JELENTÃSE"
+A hibÃ¡kat kÃ©rjÃ¼k vagy a fÃ³rumon (\fIhttp://forum.amule.org/\fP), vagy a
+hibakÃ¶vetÅben (\fIhttp://bugs.amule.org/\fP) jelentsÃ©k. HibÃ¡krÃ³l kÃ©rjÃ¼k ne
+Ãrjanak levelet (e\-mail\-t) se a levelezÃ©si listÃ¡ra, se kÃ¶zvetlenÃ¼l
+valamelyik fejlesztÅnek.
 .SH COPYRIGHT
-Az aMule és az összes hozzá tartozó segédprogram a GNU General Public Licence védelme alatt áll.
-.SH LÁSD MÉG
-\fBamule\fR(1), \fBcas\fR(1)
-.SH MAGYAR FORDÍTÁS
-Dévai Tamás <gonosztopi@amule.org>
+Az aMule Ã©s az Ã¶sszes hozzÃ¡ tartozÃ³ segÃ©dprogram a GNU General Public
+License vÃ©delme alatt Ã¡ll.
+.SH "LÃSD MÃG"
+.B_untranslated amule\fR(1), \fBcas\fR(1)
+.SH SZERZÅ
+Ezt a kÃ©zikÃ¶nyv lapot Vollstrecker <amule@vollstreckernet.de> Ãrta.
+.SH MAGYAR FORDÃTÃS
+DÃ©vai TamÃ¡s <gonosztopi@amule.org>

aMule-2.3.1.tar.bz2/src/utils/wxCas/docs/wxcas.it.1 Added

@@ -0,0 +1,35 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH WXCAS 1 "Novembre 2011" wxCas "Utilità di aMule"
+.als B_untranslated B
+.SH NOME
+wxcas \- statistiche wx c di aMule
+.SH SINTASSI
+.B_untranslated wxcas
+.SH DESCRIZIONE
+\fBwxcas\fP è un programma per visualizzare i contenuti del file di firma
+online in una bella finestra wx sul tuo schermo. Per il funzionamento, devi
+abilitare l'opzione "firma online" nelle preferenze di aMule.
+
+Basato su \fBcas\fP(1) di Pedro de Oliveira.  \fBwxcas\fP è stato scritto da
+ThePolish <thepolish@vipmail.ru>
+
+Questa applicazione non accetta parametri.
+.SH "SEGNALARE I BUG"
+Per favore segnalare i bug nel nostro forum (\fIhttp://forum.amule.org/\fP) o
+nel nostro bugtracker (\fIhttp://bugs.amule.org/\fP). Per favore non segnalare
+i bug via posta elettronica, né nella nostra mailing list né direttamente a
+qualunque membro del gruppo.
+.SH COPYRIGHT
+aMule e tutti i programmi di utilità correlati sono distribuiti in accordo
+alla GNU General Public License.
+.SH "VEDI ANCHE"
+.B_untranslated amule\fR(1), \fBcas\fR(1)
+.SH AUTORE
+Questa pagina del manuale è stata scritta da Vollstrecker
+<amule@vollstreckernet.de>
+.SH TRADUZIONE ITALIANA
+Stefano Corti <iz0bbz@libero.it>

aMule-2.3.1.tar.bz2/src/utils/wxCas/docs/wxcas.ru.1 Added

@@ -0,0 +1,33 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH WXCAS 1 "November 2011" wxCas "утилиты aMule"
+.als B_untranslated B
+.SH ИМЯ
+wxcas \- wx c\-статистика aMule
+.SH ОБЗОР
+.B_untranslated wxcas
+.SH ОПИСАНИЕ
+\fBwxcas\fP \- программа для отображения содержимого файла вашей онлайн\-подписи
+aMule в приятном wx Window окне на вашем рабочем столе. Чтобы это работало,
+вы должны включить опцию "Онлайн подпись" в настройках aMule.
+
+Основана на программе \fBcas\fP(1) написанной Pedro de Oliveira. \fBwxcas\fP была
+написана ThePolish <thepolish@vipmail.ru>
+
+Утилита не принимает параметров.
+.SH "СООБЩЕНИЕ ОБ ОШИБКАХ"
+Пожалуйста, сообщайте об ошибках либо на нашем форуме
+(\fIhttp://forum.amule.org/\fP), либо в багтрекере
+(\fIhttp://bugs.amule.org/\fP). Пожалуйста, не сообщайте об ошбках по
+электронной почте, по нашим спискам рассылки, или напрямую участникам.
+.SH "АВТОРСКИЕ ПРАВА"
+aMule и все прилагающиеся инструменты распространаются под Открытым
+Лицензионным Соглашением GNU (GNU GPL).
+.SH "СМ. ТАКЖЕ"
+.B_untranslated amule\fR(1), \fBcas\fR(1)
+.SH АВТОРЫ
+Автор страницы помощи: Vollstrecker <amule@vollstreckernet.de>,
+перевод: Radist Morse <radist.morse@gmail.com>

aMule-2.3.1.tar.bz2/src/utils/wxCas/docs/wxcas.tr.1 Added

@@ -0,0 +1,33 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH WXCAS 1 "Kasım 2011" wxCas "aMule yardımcı araçları"
+.als B_untranslated B
+.SH İSİM
+wxcas \- wx c aMule istatistikleri
+.SH KULLANIM
+.B_untranslated wxcas
+.SH AÇIKLAMA
+\fBwxcas\fP çevrimiçi imzanızın içeriklerini güzel bir wx penceresinde
+görüntüler. Bunun çalışması için aMule'ün ayarlarında "Çevrim İçi İmza"
+seçeneğini etkinleştirmeniz gerekmektedir.
+
+Pedro de Oliveira'nın \fBcas\fP(1) programına dayalıdır. \fBwxcas\fP ThePolish
+<thepolish@vipmail.ru> tarafından yazılmıştır
+
+Bu uygulama hiçbir argüman almaz.
+.SH GERİBİLDİRİM
+Hataları bildirmek için forumumuzu (\fIhttp://forum.amule.org/\fP) ya da hata
+takipçimizi (\fIhttp://bugs.amule.org/\fP) kullanınız. Hataları bildirmek için
+e\-mail ve e\-mail listemizi kullanmamanızı ve geliştiricilerden birine
+doğrudan bildirmemenizi rica ederiz.
+.SH "TELİF HAKKI"
+aMule ve ilgili tüm yardımcı araçları GNU Genel Kamu Lisansı çerçevesinde
+dağıtılmaktadır.
+.SH "İLGİLİ BELGELER"
+.B_untranslated amule\fR(1), \fBcas\fR(1)
+.SH YAZAN
+Bu kılavuz sayfası Vollstrecker <amule@vollstreckernet.de>
+tarafından yazılmıştır.

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/Makefile.in -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +16,12 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -50,11 +48,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -64,24 +64,36 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_wxcas_OBJECTS = onlinesig.$(OBJEXT) linuxmon.$(OBJEXT) \
 	wxcas.$(OBJEXT) wxcasprint.$(OBJEXT) wxcasframe.$(OBJEXT) \
 	wxcasprefs.$(OBJEXT) wxcascte.$(OBJEXT) wxcaspix.$(OBJEXT)
 wxcas_OBJECTS = $(am_wxcas_OBJECTS)
 am__DEPENDENCIES_1 =
-@NEED_RC_TRUE@am__DEPENDENCIES_2 = wxcasrc.$(OBJEXT)
-wxcas_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+wxcas_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__append_1)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(wxcas_SOURCES)
 DIST_SOURCES = $(wxcas_SOURCES)
 HEADERS = $(noinst_HEADERS)
@@ -89,24 +101,15 @@
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -121,17 +124,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -143,44 +140,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -202,13 +199,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -216,44 +210,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -262,7 +252,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -270,25 +259,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -300,29 +283,40 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 AM_CPPFLAGS = $(MULECPPFLAGS) $(WX_CPPFLAGS)
 AM_CXXFLAGS = $(MULECXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY)
 AM_LDFLAGS = $(MULELDFLAGS)
@@ -358,14 +352,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/utils/wxCas/src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/utils/wxCas/src/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/wxCas/src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/wxCas/src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -383,32 +377,47 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 wxcas$(EXEEXT): $(wxcas_OBJECTS) $(wxcas_DEPENDENCIES) 
 	@rm -f wxcas$(EXEEXT)
-	$(CXXLINK) $(wxcas_LDFLAGS) $(wxcas_OBJECTS) $(wxcas_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(wxcas_OBJECTS) $(wxcas_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -426,92 +435,100 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wxcasprint.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -520,7 +537,7 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -543,6 +560,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -564,18 +582,38 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -595,18 +633,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic ctags distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-info-am
+	uninstall-am uninstall-binPROGRAMS
 
 
 @NEED_RC_TRUE@wxcasrc.$(OBJEXT): $(srcdir)/../wxcas.rc wxcas-version.rc
@@ -622,6 +664,7 @@
 @NEED_RC_TRUE@	@sed -e 's/VER_FILEDESCRIPTION_STR/"Graphical aMule Statistics"/' \
 @NEED_RC_TRUE@	     -e 's/VER_INTERNALNAME_STR/"wxcas"/' \
 @NEED_RC_TRUE@	     -e 's/VER_ORIGINALFILENAME_STR/"wxcas$(EXEEXT)"/' "$<" > "$@"
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/linuxmon.cpp -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/linuxmon.cpp Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/linuxmon.h -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/linuxmon.h Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/onlinesig.cpp -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/onlinesig.cpp Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/onlinesig.h -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/onlinesig.h Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/wxcas.cpp -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/wxcas.cpp Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/wxcas.h -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/wxcas.h Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/wxcascte.cpp -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/wxcascte.cpp Changed

@@ -5,11 +5,11 @@
 ///
 /// Author:       ThePolish <thepolish@vipmail.ru>
 ///
-/// Copyright (C) 2004 by ThePolish
+/// Copyright (c) 2004-2011 ThePolish ( thepolish@vipmail.ru )
 ///
 /// Derived from CAS by Pedro de Oliveira <falso@rdk.homeip.net>
 ///
-/// Pixmats from aMule http://www.amule.org
+/// Pixmaps from aMule http://www.amule.org
 ///
 /// 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
@@ -37,11 +37,16 @@
 
 #ifdef __WXMAC__
 	#include <CoreServices/CoreServices.h> // Do_not_auto_remove
-	#include <wx/mac/corefoundation/cfstring.h> // Do_not_auto_remove
+	#if wxCHECK_VERSION(2, 9, 0)
+		#include <wx/osx/core/cfstring.h>  // Do_not_auto_remove
+	#else
+		#include <wx/mac/corefoundation/cfstring.h>  // Do_not_auto_remove
+	#endif
 	#include <wx/intl.h> // Do_not_auto_remove
 #elif defined(__WXMSW__)
 	#include <winerror.h> // Do_not_auto_remove
 	#include <shlobj.h> // Do_not_auto_remove
+	#include <wx/msw/winundef.h>
 #endif
 
 #include "wxcascte.h"
@@ -133,8 +138,13 @@
 		CFURLRef	urlRef		= CFURLCreateFromFSRef(NULL, &fsRef);
 		CFStringRef	cfString	= CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle);
 		CFRelease(urlRef) ;
-		strDir = wxMacCFStringHolder(cfString).AsString(wxLocale::GetSystemEncoding())
+		#if wxCHECK_VERSION(2, 9, 0)
+			strDir = wxCFStringRef(cfString).AsString(wxLocale::GetSystemEncoding())
 			+ wxFileName::GetPathSeparator() + wxT("aMule");
+		#else
+			strDir = wxMacCFStringHolder(cfString).AsString(wxLocale::GetSystemEncoding())
+			+ wxFileName::GetPathSeparator() + wxT("aMule");
+		#endif
 	}
 
 #elif defined(__WXMSW__)

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/wxcascte.h -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/wxcascte.h Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/wxcasframe.cpp -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/wxcasframe.cpp Changed

@@ -5,11 +5,11 @@
 ///
 /// Author:       ThePolish <thepolish@vipmail.ru>
 ///
-/// Copyright (C) 2004 by ThePolish
+/// Copyright (c) 2004-2011 ThePolish ( thepolish@vipmail.ru )
 ///
 /// Derived from CAS by Pedro de Oliveira <falso@rdk.homeip.net>
 ///
-/// Pixmats from aMule http://www.amule.org
+/// Pixmaps from aMule http://www.amule.org
 ///
 /// 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
@@ -285,11 +285,11 @@
 #ifdef __WXMSW__
 
 	memdc.
-	SetFont ( wxFont::wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
+	SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
 #else
 
 	memdc.
-	SetFont ( wxFont::wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
+	SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
 #endif
 
 	memdc.
@@ -353,7 +353,7 @@
 		_( "Save Statistics Image" ),
 		wxFileName::GetHomeDir (),
 		WxCasCte::AMULESIG_IMG_NAME,
-		wxT("PNG (*.png)|*.png|JPEG (*.jpg)|*.jpg|BMP (*.bmp)|*.bmp|"),
+		wxT("PNG (*.png)|*.png|JPEG (*.jpg)|*.jpg|BMP (*.bmp)|*.bmp"),
 		wxFD_SAVE);
 
 	selectSaveFile.ShowModal();
@@ -411,10 +411,7 @@
 WxCasFrame::OnBarAbout ( wxCommandEvent& WXUNUSED( event ) )
 {
 	wxMessageBox ( _
-	               ( "wxCas, aMule OnLine Signature Statistics\n\n"
-	                 "(c) 2004 ThePolish <thepolish@vipmail.ru>\n\n"
-	                 "Based on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n\n"
-	                 "Distributed under GPL" ),
+	               ( "wxCas, aMule OnLine Signature Statistics\n\n(c) 2004 ThePolish <thepolish@vipmail.ru>\n\nBased on CAS by Pedro de Oliveira <falso@rdk.homeip.net>\n\nDistributed under GPL" ),
 	               _( "About wxCas" ), wxOK | wxCENTRE | wxICON_INFORMATION );
 }
 
@@ -428,10 +425,8 @@
 	UpdateAll ();
 
 	// Generate stat image if asked in config
-	if ( ( bool )
-	        ( prefs->
-	          Read ( WxCasCte::ENABLE_AUTOSTATIMG_KEY,
-	                 WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED ) ) ) {
+	if (prefs->Read( WxCasCte::ENABLE_AUTOSTATIMG_KEY,
+	                 WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED ) ) {
 		wxImage * statImage = GetStatImage ();
 
 		wxFileName fileName ( prefs->
@@ -458,10 +453,10 @@
 	wxConfigBase * prefs = wxConfigBase::Get();
 
 	// Image must be autogenerated to be uploaded
-	if ( ( bool ) ( prefs->Read ( WxCasCte::ENABLE_AUTOSTATIMG_KEY,
-	                              WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED ) ) &&
-	        ( bool ) ( prefs->Read ( WxCasCte::ENABLE_FTP_UPDATE_KEY,
-	                                 WxCasCte::DEFAULT_FTP_UPDATE_ISENABLED ) ) ) {
+	if ( prefs->Read ( WxCasCte::ENABLE_AUTOSTATIMG_KEY,
+	                   WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED )
+		 && prefs->Read ( WxCasCte::ENABLE_FTP_UPDATE_KEY,
+	                      WxCasCte::DEFAULT_FTP_UPDATE_ISENABLED ) ) {
 		// Get image file
 		wxFileName fileName ( prefs->
 		                      Read ( WxCasCte::AUTOSTATIMG_DIR_KEY,

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/wxcasframe.h -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/wxcasframe.h Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/wxcaspix.cpp -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/wxcaspix.cpp Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/wxcaspix.h -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/wxcaspix.h Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/wxcasprefs.cpp -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/wxcasprefs.cpp Changed

@@ -5,11 +5,11 @@
 ///
 /// Author:       ThePolish <thepolish@vipmail.ru>
 ///
-/// Copyright (C) 2004 by ThePolish
+/// Copyright (c) 2004-2011 ThePolish ( thepolish@vipmail.ru )
 ///
 /// Derived from CAS by Pedro de Oliveira <falso@rdk.homeip.net>
 ///
-/// Pixmats from aMule http://www.amule.org
+/// Pixmaps from aMule http://www.amule.org
 ///
 /// 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
@@ -262,10 +262,8 @@
 	                  5 );
 
 	// Mask auto stat img disabled controls
-	if ( ( bool )
-	        ( prefs->
-	          Read ( WxCasCte::ENABLE_AUTOSTATIMG_KEY,
-	                 WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED ) ) ) {
+	if (prefs->Read( WxCasCte::ENABLE_AUTOSTATIMG_KEY,
+	                 WxCasCte::DEFAULT_AUTOSTATIMG_ISENABLED ) ) {
 		m_autoStatImgCheck->SetValue( TRUE );
 	} else {
 		m_autoStatImgCheck->SetValue ( FALSE );
@@ -276,10 +274,8 @@
 	}
 
 	// Mask Ftp update disabled controls
-	if ( ( bool )
-	        ( prefs->
-	          Read ( WxCasCte::ENABLE_FTP_UPDATE_KEY,
-	                 WxCasCte::DEFAULT_FTP_UPDATE_ISENABLED ) ) ) {
+	if (prefs->Read( WxCasCte::ENABLE_FTP_UPDATE_KEY,
+	                 WxCasCte::DEFAULT_FTP_UPDATE_ISENABLED ) ) {
 		m_ftpUpdateCheck->SetValue( TRUE );
 	} else {
 		m_ftpUpdateCheck->SetValue ( FALSE );

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/wxcasprefs.h -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/wxcasprefs.h Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/wxcasprint.cpp -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/wxcasprint.cpp Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/src/wxcasprint.h -> aMule-2.3.1.tar.bz2/src/utils/wxCas/src/wxcasprint.h Changed

aMule-2.2.6.tar.bz2/src/utils/wxCas/wxcas.desktop -> aMule-2.3.1.tar.bz2/src/utils/wxCas/wxcas.desktop Changed

aMule-2.2.6.tar.bz2/src/utils/xas/Makefile.am -> aMule-2.3.1.tar.bz2/src/utils/xas/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/utils/xas/Makefile.in -> aMule-2.3.1.tar.bz2/src/utils/xas/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +16,12 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -48,11 +46,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -62,48 +62,90 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = autostart-xas
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pluginsdir)"
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
 SCRIPTS = $(bin_SCRIPTS)
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-dist_pluginsDATA_INSTALL = $(INSTALL_DATA)
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
 DATA = $(dist_plugins_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -118,17 +160,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -140,44 +176,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -199,13 +235,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -213,44 +246,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -259,7 +288,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -267,25 +295,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -297,34 +319,44 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = docs
 dist_plugins_DATA = xas.pl
 pluginsdir = $(libdir)/xchat/plugins
 bin_SCRIPTS = autostart-xas
-DISTCLEANFILES = autostart-xas
 EXTRA_DIST = autostart-xas.in
 MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
@@ -334,14 +366,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/utils/xas/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/utils/xas/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/xas/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/xas/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -359,45 +391,63 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 autostart-xas: $(top_builddir)/config.status $(srcdir)/autostart-xas.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binSCRIPTS: $(bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-	  else :; fi; \
-	done
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	     } \
+	; done
 
 uninstall-binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-uninstall-info-am:
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 install-dist_pluginsDATA: $(dist_plugins_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pluginsdir)" || $(mkdir_p) "$(DESTDIR)$(pluginsdir)"
-	@list='$(dist_plugins_DATA)'; for p in $$list; do \
+	test -z "$(pluginsdir)" || $(MKDIR_P) "$(DESTDIR)$(pluginsdir)"
+	@list='$(dist_plugins_DATA)'; test -n "$(pluginsdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_pluginsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pluginsdir)/$$f'"; \
-	  $(dist_pluginsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pluginsdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pluginsdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pluginsdir)" || exit $$?; \
 	done
 
 uninstall-dist_pluginsDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_plugins_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pluginsdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pluginsdir)/$$f"; \
-	done
+	@list='$(dist_plugins_DATA)'; test -n "$(pluginsdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pluginsdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pluginsdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -406,7 +456,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -423,16 +473,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -458,16 +507,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -475,14 +524,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -494,81 +543,101 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -579,7 +648,7 @@
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pluginsdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
 install-exec: install-exec-recursive
@@ -601,7 +670,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -621,18 +690,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am: install-dist_pluginsDATA
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am: install-binSCRIPTS
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -651,24 +740,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-binSCRIPTS uninstall-dist_pluginsDATA \
-	uninstall-info-am
+uninstall-am: uninstall-binSCRIPTS uninstall-dist_pluginsDATA
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
 	install-am install-binSCRIPTS install-data install-data-am \
-	install-dist_pluginsDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-dist_pluginsDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-binSCRIPTS \
-	uninstall-dist_pluginsDATA uninstall-info-am
+	uninstall-dist_pluginsDATA
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.2.6.tar.bz2/src/utils/xas/autostart-xas.in -> aMule-2.3.1.tar.bz2/src/utils/xas/autostart-xas.in Changed

aMule-2.2.6.tar.bz2/src/utils/xas/docs/Makefile.am -> aMule-2.3.1.tar.bz2/src/utils/xas/docs/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/utils/xas/docs/Makefile.in -> aMule-2.3.1.tar.bz2/src/utils/xas/docs/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -46,11 +44,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -60,32 +60,51 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)"
 NROFF = nroff
 MANS = $(dist_man_MANS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -100,17 +119,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -122,44 +135,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -181,13 +194,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -195,44 +205,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -241,7 +247,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -249,25 +254,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -279,32 +278,43 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 dist_man_MANS = xas.1
-man_langs = de es eu hu
-EXTRA_DIST = xas.de.1 xas.es.1 xas.eu.1 xas.hu.1
+man_langs = de es fr hu it ru tr
+EXTRA_DIST = xas.de.1 xas.es.1 xas.fr.1 xas.hu.1 xas.it.1 xas.ru.1 xas.tr.1
 MAINTAINERCLEANFILES = Makefile.in
 all: all-am
 
@@ -313,14 +323,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/utils/xas/docs/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/utils/xas/docs/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/utils/xas/docs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/utils/xas/docs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -338,52 +348,45 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-install-man1: $(man1_MANS) $(man_MANS)
+$(am__aclocal_m4_deps):
+install-man1: $(dist_man_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
 	done; \
-	for i in $$list; do \
-	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-	  else file=$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
 tags: TAGS
 TAGS:
 
@@ -392,29 +395,45 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -423,7 +442,7 @@
 all-am: Makefile $(MANS)
 installdirs:
 	for dir in "$(DESTDIR)$(man1dir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -445,6 +464,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -464,6 +484,8 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -471,13 +493,30 @@
 install-data-am: install-man
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
+install-dvi-am:
 
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man: install-man1
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -496,21 +535,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-man
+uninstall-am: uninstall-man
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-
 uninstall-man: uninstall-man1
 
+.MAKE: install-am install-data-am install-strip uninstall-am
+
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-data-hook install-exec install-exec-am install-info \
-	install-info-am install-man install-man1 install-strip \
+	install-data-hook install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-man1 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am uninstall-hook \
-	uninstall-info-am uninstall-man uninstall-man1
+	uninstall-man uninstall-man1
 
 
 install-data-hook:
@@ -537,6 +579,7 @@
 			rm -f $(DESTDIR)$(mandir)/$$lang/man1/$$inst ; \
 		done ; \
 	done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/src/utils/xas/docs/xas.1 -> aMule-2.3.1.tar.bz2/src/utils/xas/docs/xas.1 Changed

@@ -1,17 +1,17 @@
-.TH XAS 1 "September 2009" "xas v1.9" "aMule utilities"
+.TH XAS 1 "November 2011" "xas v1.9" "aMule utilities"
+.als B_untranslated B
 .SH NAME
 xas \- X\-Chat aMule Statistics
 .SH SYNOPSIS
 .B none
 .SH DESCRIPTION
-.B xas
-is a plugin for xchat. For loading see your xchat documentation. After loading 
+\fBxas\fR 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.
+For this to work, you must enable the "Online Signature" option in aMule's preferences.
+
+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).
 
-To enable it on every startup of xchat you can just run the script in /usr/bin/autstart-xas.
-.SH AUTHOR
 \fBxas\fR was originally written by niet
 .SH REPORTING BUGS
 Please report bugs either on our forum (\fIhttp://forum.amule.org/\fR), or in our bugtracker (\fIhttp://bugs.amule.org/\fR).
@@ -19,4 +19,6 @@
 .SH COPYRIGHT
 aMule and all of its related utilities are distributed under the GNU General Public License.
 .SH SEE ALSO
-\fBamule\fR(1)
+.B_untranslated amule\fR(1)
+.SH AUTHOR
+This manpage was written by Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/xas/docs/xas.de.1 -> aMule-2.3.1.tar.bz2/src/utils/xas/docs/xas.de.1 Changed

@@ -3,29 +3,35 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH XAS 1 "Januar 2007" "xas v1.9" "aMule Hilfsprogramme"
+.TH XAS 1 "November 2011" "xas v1.9" "aMule Hilfsprogramme"
+.als B_untranslated B
 .SH NAME
 xas \- X\-Chat aMule Statistics
 .SH SYNTAX
 \fBKeine\fP
 .SH BESCHREIBUNG
-\fBxas\fP ist ein Plugin f<FC>r XChat. Wie man es l<E4>dt ist dessen Doku zu
-entnehmen.Nach dem Laden tippe einfach /xas, und es werden Statistiken
-<FC>ber deinaMule an den Channel in dem du dich befindest gesendet. Diese
-werdenaus deiner Online\-Signatur\-Datei gelesen.Damit das funktioniert, muss
-in aMule die Option "Online Signatur" angeschaltet sein!
+\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.
 
-Um es bei jedem Start von xchat zu aktivieren kannst du das Script
-/usr/bin/autostart\-xas verwenden.
-.SH VERFASSER
-\fBxas\fP wurde im Original geschrieben von niet
+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).
+
+\fBxas\fP wurde ursprünglich von niet geschrieben
 .SH "FEHLER MELDEN"
 Bitte meldet Fehler entweder in unserem Forum (\fIhttp://forum.amule.org/\fP),
 oder in unseren Bugtracker (\fIhttp://bugs.amule.org/\fP). Bitte meldet uns
-keine Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
+weder Fehler per E\-Mail, noch auf unsere Mailingliste oder direkt an unsere
 Teammitglieder.
 .SH COPYRIGHT
 aMule und alle seine zugehörigen Anwendungen werden verteilt unter der GNU
 General Public License
 .SH "SIEHE AUCH"
-\fBamule\fP(1)
+.B_untranslated amule\fR(1)
+.SH VERFASSER
+Diese manpage wurde geschrieben von Vollstrecker
+<amule@vollstreckernet.de>
+
+Diese manpage wurde übersetzt von Vollstrecker <amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/xas/docs/xas.es.1 -> aMule-2.3.1.tar.bz2/src/utils/xas/docs/xas.es.1 Changed

@@ -1,14 +1,35 @@
-.TH XAS 1 "Marzo 2005" "xas" "Utilidades de aMule"
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH XAS 1 "November 2011" "xas v1.9" "aMule utilidades"
+.als B_untranslated B
 .SH NOMBRE
-xas \- Estadísticas de aMule para X\-Chat
+xas \- EstadÃsticas aMule para X\-Chat
 .SH SINOPSIS
-.B nada
-.SH DESCRIPCIÓN
-.B xas
-es un plug-in para X\-Chat. Para cargarlo, lea la documentación de X\-Chat.
-Para ejecutarlo, escriba /xas y mostrará sus estadísticas en el canal que este visualizando en ese momento.
-Estas estadísticas se botiene de la firma de aMule.
+\fBnone\fP
+.SH DESCRIPCIÃN
+\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.
+
+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).
+
+\fBxas\fP fuÃ© escrito originalmente por niet
+.SH "INFORMANDO ERRORES"
+Por favor informa de fallos ya sea en nuestro foro
+(\fIhttp://forum.amule.org/\fP), o en nuestro bugtracker
+(\fIhttp://bugs.amule.org/\fP). Por favor no informe de fallos por correo, ni
+en nuestras listas, ni directamente al correo de algun miembro del equipo.
+.SH COPYRIGHT
+aMule y todas las demÃ¡s utilidades relacionadas son distribuidas bajo la GNU
+General Public License.
+.SH "VEASE TAMBIEN"
+.B_untranslated amule\fR(1)
 .SH AUTOR
-\fBxas\fR fué escrito originalmente por niet
-.SH SEE ALSO
-\fBamule\fR(1)
+Esta pÃ¡gina de manualfue escrita por Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.3.1.tar.bz2/src/utils/xas/docs/xas.fr.1 Added

@@ -0,0 +1,36 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH XAS 1 "Novembre 2011" "xas v1.9" "Outils d'aMule"
+.als B_untranslated B
+.SH NOM
+xas \- X\-Chat aMule Statistics
+.SH SYNOPSIS
+\fBaucun\fP
+.SH DESCRIPTION
+\fBxas\fP est une extension pour xchat. Pour le chargement voir la
+documentation de votre xchat. Après le chargement tapez /xas et il enverra
+des statistiques sur la canal où vous êtes. Elles sont prises à partir de
+votre fichier de signature en ligne. Pour que cela fonctionne, vous devez
+activer l'option "Online Signature" dans les préférences d'aMule.
+
+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).
+
+\fBxas\fP a été initialement écrit par niet
+.SH "RAPPORTER DES BOGUES"
+Veuillez rapporter les bogues sur notre forum (\fIhttp://forum.amule.org/\fP),
+ou sur notre bugtracker (\fIhttp://bugs.amule.org/\fP).  Veuillez ne pas
+rapporter les bogues par e\-mail, sur notre liste de diffusion ou directement
+à n'importe quel membre  de l'équipe.
+.SH COPYRIGHT
+aMule et tout ses outils sont distribués sous la licence GNU General Public
+License.
+.SH "VOIR AUSSI"
+.B_untranslated amule\fR(1)
+.SH AUTEUR
+Cette manpage a été écrite par Vollstrecker
+<amule@vollstreckernet.de>

aMule-2.2.6.tar.bz2/src/utils/xas/docs/xas.hu.1 -> aMule-2.3.1.tar.bz2/src/utils/xas/docs/xas.hu.1 Changed

@@ -1,24 +1,36 @@
-.TH XAS 1 "2005 március" "xas" "aMule segédprogramok"
-.SH NÉV
-xas \- X\-Chat aMule Statisztikák
-.SH ÁTTEKINTÉS
-.B nincs
-.SH LEÍRÁS
-A \fBxas\fR egy xchat plugin.
-.
-A betöltéséhez olvasd el az xchat dokumentációját.
-.
-Betöltés után a /xas parancs az aMule statisztikáit kiírja az aktuális csatornára.
-.
-Ezek az Online Aláírás fájlból kerülnek kiolvasásra.
-.SH ÍRÓ
-A \fBxas\fR-t eredetileg niet írta.
-.SH HIBÁK JELENTÉSE
-A hibákat kérjük vagy a fórumon (\fIhttp://forum.amule.org/\fR), vagy a hibakövetõben (\fIhttp://bugs.amule.org/\fR) jelentsék.
-Hibákról kérjük ne írjanak levelet (e-mail-t) se a levelzési listára, se közvetlenül valamelyik fejlesztõnek.
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH XAS 1 "2011. november" "xas v1.9" "aMule segÃ©dprogramok"
+.als B_untranslated B
+.SH NÃV
+xas \- X\-Chat aMule StatisztikÃ¡k
+.SH ÃTTEKINTÃS
+\fBnincs\fP
+.SH LEÃRÃS
+A \fBxas\fP egy xchat plugin. A betÃ¶ltÃ©shez olvasd el az xchat
+dokumentÃ¡ciÃ³jÃ¡t. BetÃ¶ltÃ©s utÃ¡n a /xas parancs kiÃrja az aktuÃ¡lis csatornÃ¡ra
+az aMule statisztikÃ¡it. Ezek az Online AlÃ¡ÃrÃ¡s fÃ¡jlbÃ³l kerÃ¼lnek
+kiolvasÃ¡sra. Ahhoz, hogy ez mÅ±kÃ¶djÃ¶n, engedÃ©lyezni kell az \(BqOnline
+alÃ¡ÃrÃ¡s\(rq opciÃ³t az aMule beÃ¡llÃtÃ¡saiban.
+
+Ha az xchat minden indÃtÃ¡sakor szeretnÃ©d automatikusan betÃ¶lteni, futtasd az
+autostart\-xas programot.
+
+A \fBxas\fP\-t eredetileg niet Ãrta.
+.SH "HIBÃK JELENTÃSE"
+A hibÃ¡kat kÃ©rjÃ¼k vagy a fÃ³rumon (\fIhttp://forum.amule.org/\fP), vagy a
+hibakÃ¶vetÅben (\fIhttp://bugs.amule.org/\fP) jelentsÃ©k. HibÃ¡krÃ³l kÃ©rjÃ¼k ne
+Ãrjanak levelet (e\-mail\-t) se a levelezÃ©si listÃ¡ra, se kÃ¶zvetlenÃ¼l
+valamelyik fejlesztÅnek.
 .SH COPYRIGHT
-Az aMule és az összes hozzá tartozó segédprogram a GNU General Public Licence védelme alatt áll.
-.SH LÁSD MÉG
-\fBamule\fR(1)
-.SH MAGYAR FORDÍTÁS
-Dévai Tamás <gonosztopi@amule.org>
+Az aMule Ã©s az Ã¶sszes hozzÃ¡ tartozÃ³ segÃ©dprogram a GNU General Public
+License vÃ©delme alatt Ã¡ll.
+.SH "LÃSD MÃG"
+.B_untranslated amule\fR(1)
+.SH SZERZÅ
+Ezt a kÃ©zikÃ¶nyv lapot Vollstrecker <amule@vollstreckernet.de> Ãrta.
+.SH MAGYAR FORDÃTÃS
+DÃ©vai TamÃ¡s <gonosztopi@amule.org>

aMule-2.3.1.tar.bz2/src/utils/xas/docs/xas.it.1 Added

@@ -0,0 +1,37 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH XAS 1 "Novembre 2011" "xas v1.9" "Utilità di aMule"
+.als B_untranslated B
+.SH NOME
+xas \- Statistiche di aMule per X\-Chat
+.SH SINTASSI
+\fBnessuna\fP
+.SH DESCRIZIONE
+\fBxas\fP è un plugin per xchat. Per il caricamento vedere la documentazione di
+xchat. Dopo il caricamento digitare /xas e le statistiche verranno inviate
+sul canale a cui siete collegati. Queste sono prese dal file di firma
+online. Per il funzionamento, dovete abilitare l'opzione della "firma
+online" nelle preferenze di aMule.
+
+Per abilitarlo ad ogni avvio di xchat dovete eseguire lo script
+autostart\-xas (presente in /usr/bin se avete installato con \-\-prefix=/usr)
+
+\fBxas\fP è stato originalmente scritto da niet
+.SH "SEGNALARE I BUG"
+Per favore segnalare i bug nel nostro forum (\fIhttp://forum.amule.org/\fP) o
+nel nostro bugtracker (\fIhttp://bugs.amule.org/\fP). Per favore non segnalare
+i bug via posta elettronica, né nella nostra mailing list né direttamente a
+qualunque membro del gruppo.
+.SH COPYRIGHT
+aMule e tutti i programmi di utilità correlati sono distribuiti in accordo
+alla GNU General Public License.
+.SH "VEDI ANCHE"
+.B_untranslated amule\fR(1)
+.SH AUTORE
+Questa pagina del manuale è stata scritta da Vollstrecker
+<amule@vollstreckernet.de>
+.SH TRADUZIONE ITALIANA
+Stefano Corti <iz0bbz@libero.it>

aMule-2.3.1.tar.bz2/src/utils/xas/docs/xas.ru.1 Added

@@ -0,0 +1,34 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH XAS 1 "November 2011" "xas v1.9" "утилиты aMule"
+.als B_untranslated B
+.SH ИМЯ
+xas \- X\-Chat статистика aMule
+.SH ОБЗОР
+\fBнет\fP
+.SH ОПИСАНИЕ
+\fBxas\fP \- это плагин для xchat. Для установки смотрите вашу документацию по
+xchat. После загрузки наберите /xas и он пошлет вашу статистику в канал на
+котором вы находитесь. Статистика берется из файла онлайн\-подписи. Чтобы это
+работало, вы должны включить опцию "Онлайн подпись" в настройках aMule.
+
+Чтобы включать его при каждом запуске xchat вы можете просто выполнить
+скрипт autstart\-xas (в папке /usr/bin если вы установили с \-\-prefix=/usr).
+
+\fBxas\fP изначально был написан niet
+.SH "СООБЩЕНИЕ ОБ ОШИБКАХ"
+Пожалуйста, сообщайте об ошибках либо на нашем форуме
+(\fIhttp://forum.amule.org/\fP), либо в багтрекере
+(\fIhttp://bugs.amule.org/\fP). Пожалуйста, не сообщайте об ошбках по
+электронной почте, по нашим спискам рассылки, или напрямую участникам.
+.SH "АВТОРСКИЕ ПРАВА"
+aMule и все прилагающиеся инструменты распространаются под Открытым
+Лицензионным Соглашением GNU (GNU GPL).
+.SH "СМ. ТАКЖЕ"
+.B_untranslated amule\fR(1)
+.SH АВТОРЫ
+Автор страницы помощи: Vollstrecker <amule@vollstreckernet.de>,
+перевод: Radist Morse <radist.morse@gmail.com>

aMule-2.3.1.tar.bz2/src/utils/xas/docs/xas.tr.1 Added

@@ -0,0 +1,36 @@
+.\"*******************************************************************
+.\"
+.\" This file was generated with po4a. Translate the source file.
+.\"
+.\"*******************************************************************
+.TH XAS 1 "Kasım 2011" "xas v1.9" "aMule yardımcı araçları"
+.als B_untranslated B
+.SH İSİM
+xas \- X\-Chat aMule İstatistikleri
+.SH KULLANIM
+\fBboş\fP
+.SH AÇIKLAMA
+\fBxas\fP xchat için bir eklentidir. Yüklemek için xchat yardım belgelerine
+bakınız. Yüklendikten sonra /xas yazdığınızda istatistikleri bulunduğunuz
+kanala yollar. Bu bilgiler Çevrimiçi İmza dosyanızdan okunur. Bunun
+çalışması için aMule'ün ayarlarında "Çevrim İçi İmza" seçeneğini
+etkinleştirmeniz gerekmektedir.
+
+xchat programının her başlayışında yüklenmesi için autstart\-xas scriptini
+çalıştırmanız yeterli olacaktır (\-\-prefix=/usr ile kurduysanız /usr/bin
+dizininde bulunur).
+
+\fBxas\fP başlangıçta niet tarafından yazılmıştır
+.SH GERİBİLDİRİM
+Hataları bildirmek için forumumuzu (\fIhttp://forum.amule.org/\fP) ya da hata
+takipçimizi (\fIhttp://bugs.amule.org/\fP) kullanınız. Hataları bildirmek için
+e\-mail ve e\-mail listemizi kullanmamanızı ve geliştiricilerden birine
+doğrudan bildirmemenizi rica ederiz.
+.SH "TELİF HAKKI"
+aMule ve ilgili tüm yardımcı araçları GNU Genel Kamu Lisansı çerçevesinde
+dağıtılmaktadır.
+.SH "İLGİLİ BELGELER"
+.B_untranslated amule\fR(1)
+.SH YAZAN
+Bu kılavuz sayfası Vollstrecker <amule@vollstreckernet.de>
+tarafından yazılmıştır.

aMule-2.2.6.tar.bz2/src/webserver/Makefile.am -> aMule-2.3.1.tar.bz2/src/webserver/Makefile.am Changed

aMule-2.2.6.tar.bz2/src/webserver/Makefile.in -> aMule-2.3.1.tar.bz2/src/webserver/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -45,11 +43,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -59,37 +59,66 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -104,17 +133,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -126,44 +149,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -185,13 +208,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -199,44 +219,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -245,7 +261,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -253,25 +268,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -283,30 +292,41 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = default php-default chicane litoral src
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = default src
 MAINTAINERCLEANFILES = Makefile.in
 all: all-recursive
 
@@ -315,14 +335,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/webserver/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/webserver/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/webserver/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/webserver/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -340,7 +360,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -349,7 +369,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -366,16 +386,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -401,16 +420,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -418,14 +437,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -437,81 +456,101 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -541,6 +580,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -560,18 +600,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -590,21 +650,24 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.2.6.tar.bz2/src/webserver/default/Makefile.am -> aMule-2.3.1.tar.bz2/src/webserver/default/Makefile.am Changed

@@ -1,54 +1,72 @@
 dist_webserver_DATA = \
-	aMule.tmpl \
-	add_server.gif \
-	arrow_down.gif \
-	arrow_right.gif \
-	arrow_up.gif \
-	back.gif \
+	amuleweb-main-dload.php \
+	amuleweb-main-kad.php \
+	amuleweb-main-log.php \
+	amuleweb-main-prefs.php \
+	amuleweb-main-search.php \
+	amuleweb-main-servers.php \
+	amuleweb-main-shared.php \
+	amuleweb-main-stats.php \
 	black.gif \
+	blank1x1.gif \
 	blue1.gif \
 	blue2.gif \
 	blue3.gif \
 	blue4.gif \
 	blue5.gif \
 	blue6.gif \
-	cp_download.gif \
-	cp_kad.gif \
-	cp_search.gif \
-	cp_servers.gif \
-	cp_settings.gif \
-	cp_shared.gif \
-	cp_stats.gif \
-	emule.gif \
-	green.gif \
-	greenpercent.gif \
-	l_cancel.gif \
-	l_connect.gif \
-	l_down.gif \
-	l_ed2klink.gif \
-	l_info.gif \
-	l_pause.gif \
-	l_resume.gif \
-	l_up.gif \
-	log.gif \
-	logo.jpg \
+	cancel.gif \
+	close.png \
+	col.png \
+	connect.gif \
+	down.png \
+	edkserv_0.png \
+	edkserv_1.png \
+	favicon.ico \
+	filter.png \
+	fond.gif \
+	fond_haut.png \
+	footer.php \
+	index.html \
+	loginfond.gif \
+	loginfond_haut.png \
+	loginlogo.jpg \
+	loginlogo.png \
+	login.php \
+	logo.png \
+	log.php \
+	maquette.dwt \
+	ok.png \
+	pause.png \
+	play.png \
 	red.gif \
-	transparent.gif \
-	yellow.gif \
-	phpamule.png \
+	refresh.png \
+	search_0.png \
+	search_1.png \
+	shared_0.png \
+	shared_1.png \
+	sheserv_0.png \
+	sheserv_1.png \
+	stats_0.png \
+	stats_1.png \
+	stats.php \
+	stats_tree.php \
+	style.css \
+	tab_bottom_left.png \
+	tab_bottom.png \
+	tab_bottom_right.png \
+	tab_left.png \
+	tab_right.png \
+	tab_top_left.png \
+	tab_top.png \
+	tab_top_right.png \
+	transf_0.png \
+	transf_1.png \
+	tree-closed.gif \
 	tree-leaf.gif \
 	tree-open.gif \
-	tree-closed.gif \
-	favicon.ico \
-	downloads.php \
-	preferences.php \
-	search.php \
-	servers.php \
-	shared.php \
-	stat_graphs.php \
-	stat_tree.php \
-	login.php \
-	index.php
+	up.png \
+	yellow.gif
 
 webserverdir = $(pkgdatadir)/webserver/default

aMule-2.2.6.tar.bz2/src/webserver/default/Makefile.in -> aMule-2.3.1.tar.bz2/src/webserver/default/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +15,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -47,11 +45,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -61,6 +61,13 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -68,30 +75,35 @@
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,$ .*$/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(webserverdir)"
-dist_webserverDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(dist_webserver_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -106,17 +118,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -128,44 +134,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -187,13 +193,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -201,44 +204,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -247,7 +246,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -255,25 +253,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -285,80 +277,109 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 dist_webserver_DATA = \
-	aMule.tmpl \
-	add_server.gif \
-	arrow_down.gif \
-	arrow_right.gif \
-	arrow_up.gif \
-	back.gif \
+	amuleweb-main-dload.php \
+	amuleweb-main-kad.php \
+	amuleweb-main-log.php \
+	amuleweb-main-prefs.php \
+	amuleweb-main-search.php \
+	amuleweb-main-servers.php \
+	amuleweb-main-shared.php \
+	amuleweb-main-stats.php \
 	black.gif \
+	blank1x1.gif \
 	blue1.gif \
 	blue2.gif \
 	blue3.gif \
 	blue4.gif \
 	blue5.gif \
 	blue6.gif \
-	cp_download.gif \
-	cp_kad.gif \
-	cp_search.gif \
-	cp_servers.gif \
-	cp_settings.gif \
-	cp_shared.gif \
-	cp_stats.gif \
-	emule.gif \
-	green.gif \
-	greenpercent.gif \
-	l_cancel.gif \
-	l_connect.gif \
-	l_down.gif \
-	l_ed2klink.gif \
-	l_info.gif \
-	l_pause.gif \
-	l_resume.gif \
-	l_up.gif \
-	log.gif \
-	logo.jpg \
+	cancel.gif \
+	close.png \
+	col.png \
+	connect.gif \
+	down.png \
+	edkserv_0.png \
+	edkserv_1.png \
+	favicon.ico \
+	filter.png \
+	fond.gif \
+	fond_haut.png \
+	footer.php \
+	index.html \
+	loginfond.gif \
+	loginfond_haut.png \
+	loginlogo.jpg \
+	loginlogo.png \
+	login.php \
+	logo.png \
+	log.php \
+	maquette.dwt \
+	ok.png \
+	pause.png \
+	play.png \
 	red.gif \
-	transparent.gif \
-	yellow.gif \
-	phpamule.png \
+	refresh.png \
+	search_0.png \
+	search_1.png \
+	shared_0.png \
+	shared_1.png \
+	sheserv_0.png \
+	sheserv_1.png \
+	stats_0.png \
+	stats_1.png \
+	stats.php \
+	stats_tree.php \
+	style.css \
+	tab_bottom_left.png \
+	tab_bottom.png \
+	tab_bottom_right.png \
+	tab_left.png \
+	tab_right.png \
+	tab_top_left.png \
+	tab_top.png \
+	tab_top_right.png \
+	transf_0.png \
+	transf_1.png \
+	tree-closed.gif \
 	tree-leaf.gif \
 	tree-open.gif \
-	tree-closed.gif \
-	favicon.ico \
-	downloads.php \
-	preferences.php \
-	search.php \
-	servers.php \
-	shared.php \
-	stat_graphs.php \
-	stat_tree.php \
-	login.php \
-	index.php
+	up.png \
+	yellow.gif
 
 webserverdir = $(pkgdatadir)/webserver/default
 MAINTAINERCLEANFILES = Makefile.in
@@ -369,14 +390,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/webserver/default/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/webserver/default/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/webserver/default/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/webserver/default/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -394,24 +415,27 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 install-dist_webserverDATA: $(dist_webserver_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(webserverdir)" || $(mkdir_p) "$(DESTDIR)$(webserverdir)"
-	@list='$(dist_webserver_DATA)'; for p in $$list; do \
+	test -z "$(webserverdir)" || $(MKDIR_P) "$(DESTDIR)$(webserverdir)"
+	@list='$(dist_webserver_DATA)'; test -n "$(webserverdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_webserverDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(webserverdir)/$$f'"; \
-	  $(dist_webserverDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(webserverdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(webserverdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webserverdir)" || exit $$?; \
 	done
 
 uninstall-dist_webserverDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_webserver_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(webserverdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(webserverdir)/$$f"; \
-	done
+	@list='$(dist_webserver_DATA)'; test -n "$(webserverdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(webserverdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(webserverdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -420,29 +444,32 @@
 
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -451,7 +478,7 @@
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(webserverdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -473,6 +500,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -492,18 +520,38 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am: install-dist_webserverDATA
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -522,17 +570,22 @@
 
 ps-am:
 
-uninstall-am: uninstall-dist_webserverDATA uninstall-info-am
+uninstall-am: uninstall-dist_webserverDATA
+
+.MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
 	distclean-generic distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
-	install-dist_webserverDATA install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-dist_webserverDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
 	pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-dist_webserverDATA uninstall-info-am
+	uninstall-dist_webserverDATA
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.3.1.tar.bz2/src/webserver/default/amuleweb-main-dload.php Added

@@ -0,0 +1,518 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>aMule control panel</title>
+<?php
+	if ( $_SESSION["auto_refresh"] > 0 ) {
+		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
+	}
+?><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+<script language="JavaScript" type="text/JavaScript">
+
+</script>
+
+<link href="style.css" rel="stylesheet" type="text/css">
+<style type="text/css">
+
+</style>
+</head><script language="JavaScript" type="text/JavaScript">
+function formCommandSubmit(command)
+{
+	if ( command == "cancel" ) {
+		var res = confirm("Delete selected files ?")
+		if ( res == false ) {
+			return;
+		}
+	}
+	if ( command != "filter" ) {
+		<?php
+			if ($_SESSION["guest_login"] != 0) {
+					echo 'alert("You logged in as guest - commands are disabled");';
+					echo "return;";
+			}
+		?>
+	}
+	var frm=document.forms.mainform
+	frm.command.value=command
+	frm.submit()
+}
+
+</script>
+<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png')">
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr valign="top"> 
+    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
+    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
+        <tr> 
+          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
+          <td><img src="images/col.png"></td>
+          <td width="10"></td>
+          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br>
+            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a>
+            </td>
+          <td width="10"></td>
+        </tr>
+      </table></td>
+  </tr>
+  <tr align="center" valign="top"> 
+    <td colspan="2"><form action="amuleweb-main-dload.php" method="post" name="mainform">
+        <table width="100%" border="0" cellpadding="0" cellspacing="0">
+          <tr>
+      <td align="center"><table border="0" cellpadding="0" cellspacing="0">
+          <tr> 
+            <td><input type="hidden" name="command"></td>
+            <td><a href="javascript:formCommandSubmit('pause');" onClick="MM_nbGroup('down','group1','pause','',1)" onMouseOver="MM_nbGroup('over','pause','','',1)" onMouseOut="MM_nbGroup('out')"><img name="pause" src="images/pause.png" alt="pause" border="0" onLoad=""></a></td>
+            <td><a href="javascript:formCommandSubmit('resume');" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img img name="resume" src="images/play.png" alt="resume" border="0" onLoad=""></a></td>
+        		<td><a href="javascript:formCommandSubmit('prioup');" onClick="MM_nbGroup('down','group1','up','',1)" onMouseOver="MM_nbGroup('over','up','','',1)" onMouseOut="MM_nbGroup('out')"><img img name="prioup" src="images/up.png" alt="prioup" border="0" onLoad=""></a></td>
+        		<td><a href="javascript:formCommandSubmit('priodown');" onClick="MM_nbGroup('down','group1','down','',1)" onMouseOver="MM_nbGroup('over','down','','',1)" onMouseOut="MM_nbGroup('out')"><img img name="priodown" src="images/down.png" alt="priodown" border="0" onLoad=""></a></td>
+        		<td><a href="javascript:formCommandSubmit('cancel');" onClick="MM_nbGroup('down','group1','cancel','',1)" onMouseOver="MM_nbGroup('over','delete','','',1)" onMouseOut="MM_nbGroup('out')"><img img name="cancel" src="images/close.png" alt="cancel" border="0" onLoad=""></a></td>
+      <td><table border="0" cellpadding="0" cellspacing="0">
+                <tr> 
+                  <td> 
+                    <?php
+        	$all_status = array("all", "Waiting", "Paused", "Downloading");	
+ 			if ( $HTTP_GET_VARS["command"] == "filter") {
+ 				$_SESSION["filter_status"] = $HTTP_GET_VARS["status"];
+ 				$_SESSION["filter_cat"] = $HTTP_GET_VARS["category"];
+ 			}
+        	if ( $_SESSION["filter_status"] == '') $_SESSION["filter_status"] = 'all';
+        	if ( $_SESSION["filter_cat"] == '') $_SESSION["filter_cat"] = 'all';
+
+        	echo '<select name="status"> ';
+        	foreach ($all_status as $s) {
+        		echo (($s == $_SESSION["filter_status"]) ? '<option selected>' : '<option>'), $s, '</option>';
+        	}
+        	echo '</select>';
+        	//var_dump($_SESSION["filter_cat"]);
+        	echo '<select name="category" id="category">';
+			$cats = amule_get_categories();
+			foreach($cats as $c) {
+				echo (($c == $_SESSION["filter_cat"]) ? '<option selected>' : '<option>'), $c, '</option>';
+			}
+			echo '</select>';
+        ?>
+                  </td>
+                  			<td><a href="javascript:formCommandSubmit('filter');" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/filter.png" border="0" alt="Apply" name="resume" border="0" onload=""></a></td>
+                  <td>&nbsp;</td>
+                  <td>&nbsp;</td>
+                  <td> 
+                    <?php
+		 	if ($_SESSION["guest_login"] != 0) {
+				echo "<b>&nbsp;You logged in as guest - commands are disabled</b>";
+			}
+		 ?>
+                  </td>
+                </tr>
+              </table></td>
+          </tr>
+        </table></td>
+    </tr>
+    <tr> 
+      <td height="10" align="center"> </td>
+    </tr>
+    <tr> 
+      <td colspan="2"><table width="100%" border="0" cellspacing="0" cellpadding="0"> <caption>
+          DOWNLOAD 
+          </caption>
+  <tr>
+    <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
+    <td background="images/tab_top.png">&nbsp;</td>
+    <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
+  </tr>
+  <tr>
+    <td width="24" background="images/tab_left.png">&nbsp;</td>
+    <td bgcolor="#FFFFFF"><table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
+                     
+          <tr> 
+                  <th>&nbsp;</th>
+                  <th><a href="amuleweb-main-dload.php?sort=name">File name</a></th>
+                  <th><a href="amuleweb-main-dload.php?sort=size">Size</a></th>
+                  <th><a href="amuleweb-main-dload.php?sort=size_done">Completed</a></th>
+                  <th><a href="amuleweb-main-dload.php?sort=speed">Download speed</a></th>
+                  <th><a href="amuleweb-main-dload.php?sort=progress">Progress</a></th>
+                  <th><a href="amuleweb-main-dload.php?sort=srccount">Sources</a></th>
+                  <th><a href="amuleweb-main-dload.php?sort=status">Status</a></th>
+                  <th><a href="amuleweb-main-dload.php?sort=prio">Priority</a></th>
+          </tr><tr><td colspan="9" height="1" bgcolor="#000000"></td></tr>
+          <?php
+		function CastToXBytes($size)
+		{
+			if ( $size < 1024 ) {
+				$result = $size . " b";
+			} elseif ( $size < 1048576 ) {
+				$result = ($size / 1024.0) . " kb";
+			} elseif ( $size < 1073741824 ) {
+				$result = ($size / 1048576.0) . " mb";
+			} else {
+				$result = ($size / 1073741824.0) . " gb";
+			}
+			return $result;
+		}
+
+		function StatusString($file)
+		{
+			if ( $file->status == 7 ) {
+				return "Paused";
+			} elseif ( $file->src_count_xfer > 0 ) {
+				return "Downloading";
+			} else {
+				return "Waiting";
+			}
+		}
+
+		function PrioString($file)
+		{
+			$prionames = array(0 => "Low", 1 => "Normal", 2 => "High",
+				3 => "Very high", 4 => "Very low", 5=> "Auto", 6 => "Release");
+			$result = $prionames[$file->prio];
+			if ( $file->prio_auto == 1) {
+				$result = $result . "(auto)";
+			}
+			return $result;
+		}
+		
+		//
+		// declare it here, before any function reffered it in "global"
+		//
+		$sort_order;$sort_reverse;
+
+		function my_cmp($a, $b)
+		{
+			global $sort_order, $sort_reverse;
+			
+			switch ( $sort_order) {
+				case "size": $result = $a->size > $b->size; break;
+				case "size_done": $result = $a->size_done > $b->size_done; break;
+				case "progress": $result = (((float)$a->size_done)/((float)$a->size)) > (((float)$b->size_done)/((float)$b->size)); break;
+				case "name": $result = $a->name > $b->name; break;
+				case "speed": $result = $a->speed > $b->speed; break;
+				case "scrcount": $result = $a->src_count > $b->src_count; break;
+				case "status": $result = StatusString($a) > StatusString($b); break;
+				case "prio": $result = $a->prio < $b->prio; break;
+			}
+
+			if ( $sort_reverse ) {
+				$result = !$result;
+			}
+			//var_dump($sort_reverse);
+			return $result;
+		}
+
+		//
+		// perform command before processing content
+
+		if ( ($HTTP_GET_VARS["command"] != "") && ($_SESSION["guest_login"] == 0) ) {
+			foreach ( $HTTP_GET_VARS as $name => $val) {
+				// this is file checkboxes
+				if ( (strlen($name) == 32) and ($val == "on") ) {
+					//var_dump($name);
+					amule_do_download_cmd($name, $HTTP_GET_VARS["command"]);
+				}
+			}
+			//
+			// check "filter-by-status" settings
+			//
+			if ( $HTTP_GET_VARS["command"] == "filter") {
+				//var_dump($_SESSION);
+				$_SESSION["filter_status"] = $HTTP_GET_VARS["status"];
+				$_SESSION["filter_cat"] = $HTTP_GET_VARS["category"];
+			}
+		}
+		if ( $_SESSION["filter_status"] == "") $_SESSION["filter_status"] = "all";
+		if ( $_SESSION["filter_cat"] == "") $_SESSION["filter_cat"] = "all";
+		
+		$downloads = amule_load_vars("downloads");
+
+		$sort_order = $HTTP_GET_VARS["sort"];
+
+		if ( $sort_order == "" ) {
+			$sort_order = $_SESSION["download_sort"];
+		} else {
+			if ( $_SESSION["download_sort_reverse"] == "" ) {
+				$_SESSION["download_sort_reverse"] = 0;
+			} else {
+				if ( $HTTP_GET_VARS["sort"] != '') {
+					$_SESSION["download_sort_reverse"] = !$_SESSION["download_sort_reverse"];
+				}
+			}
+		}
+		//var_dump($_SESSION);
+		$sort_reverse = $_SESSION["download_sort_reverse"];
+		if ( $sort_order != "" ) {
+			$_SESSION["download_sort"] = $sort_order;
+			usort(&$downloads, "my_cmp");
+		}
+
+		//
+		// Prepare categories index array
+		$cats = amule_get_categories();
+		foreach($cats as $i => $c) {
+			$cat_idx[$c] = $i;
+		}
+
+		foreach ($downloads as $file) {
+			$filter_status_result = ($_SESSION["filter_status"] == "all") or
+				($_SESSION["filter_status"] == StatusString($file));
+				
+			$filter_cat_result = ($_SESSION["filter_cat"] == "all") or
+				($cat_idx[ $_SESSION["filter_cat"] ] == $file->category);
+
+			if ( $filter_status_result and $filter_cat_result) {
+				print "<tr>";
+	
+				echo "<td class='texte' height='22'>", '<input type="checkbox" name="', $file->hash, '" >', "</td>";
+	
+				echo "<td class='texte' height='22'>", $file->short_name, "</td>";
+				
+				echo "<td class='texte' height='22' align='center'>", CastToXBytes($file->size), "</td>";
+
+				echo "<td class='texte' height='22' align='center'>", CastToXBytes($file->size_done), "&nbsp;(",
+					((float)$file->size_done*100)/((float)$file->size), "%)</td>";
+
+				echo "<td class='texte' height='22' align='center'>", ($file->speed > 0) ? (CastToXBytes($file->speed) . "/s") : "-", "</td>";
+
+				echo "<td class='texte' height='22' align='center' align='center'>", $file->progress, "</td>";
+	
+				echo "<td class='texte' height='22' align='center'>";
+				if ( $file->src_count_not_curr != 0 ) {
+					echo $file->src_count - $file->src_count_not_curr, " / ";
+				}
+				echo $file->src_count, " ( ", $file->src_count_xfer, " ) ";
+				if ( $file->src_count_a4af != 0 ) {
+					echo "+ ", $file->src_count_a4af;
+				}
+				echo "</td>";
+	
+				echo "<td class='texte' height='22' align='center'>", StatusString($file), "</td>";
+				
+				echo "<td class='texte' height='22' align='center'>", PrioString($file), "</td>";
+				
+				print "</tr><tr><td colspan='9' height='1' bgcolor='#c0c0c0'></td></tr>";
+			}
+		}
+	  ?>
+        </table></td>
+    <td width="24" background="images/tab_right.png">&nbsp;</td>
+  </tr>
+  <tr>
+    <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
+    <td background="images/tab_bottom.png">&nbsp;</td>
+    <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
+  </tr>
+</table></td>
+    </tr>
+  </table>
+</form>
+      <table width="100%" border="0" cellspacing="0" cellpadding="0"><caption>
+        UPLOAD 
+        </caption>
+        <tr> 
+          <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
+          <td background="images/tab_top.png">&nbsp;</td>
+          <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
+        </tr>
+        <tr> 
+          <td width="24" background="images/tab_left.png">&nbsp;</td>
+          <td bgcolor="#FFFFFF"><table width="100%" border="0" align="center" cellpadding="0" cellspacing="0" class="doad-table">
+              
+        <tr> 
+                <td>&nbsp;</td>
+                <th>File Name</th>
+                <th>Username</th>
+                <th>Up</th>
+                <th>Down</th>
+                <th>&nbsp;</th>
+                <th>&nbsp;</th>
+                <th>Speed</th>
+                <td>&nbsp;</td>
+        </tr><tr><td colspan="9" height="1" bgcolor="#000000"></td></tr>
+        <?php
+			function CastToXBytes($size)
+			{
+				if ( $size < 1024 ) {
+					$result = $size . " b";
+				} elseif ( $size < 1048576 ) {
+					$result = ($size / 1024.0) . " kb";
+				} elseif ( $size < 1073741824 ) {
+					$result = ($size / 1048576.0) . " mb";
+				} else {
+					$result = ($size / 1073741824.0) . " gb";
+				}
+				return $result;
+			}
+			$uploads = amule_load_vars("uploads");
+			foreach ($uploads as $file) {
+				echo "<tr>";
+	
+				echo "<td class='texte' height='22' align='center'>", "</td>";
+				
+				echo "<td class='texte' height='22'>", $file->short_name, "</td>";
+
+				echo "<td class='texte' height='22' align='center'>", $file->user_name, "</td>";
+	
+				echo "<td class='texte' height='22' align='center'>", CastToXBytes($file->xfer_up), "</td>";
+				echo "<td class='texte' height='22' align='center'>", CastToXBytes($file->xfer_down), "</td>";
+				echo "<td class='texte' height='22' align='center'>", "</td>";
+				echo "<td class='texte' height='22' align='center'>", "</td>";
+				echo "<td class='texte' height='22' align='center'>", ($file->xfer_speed > 0) ? (CastToXBytes($file->xfer_speed) . "/s") : "-", "</td>";
+				echo "<td class='texte' height='22' align='center'>", "</td>";
+				echo "</tr><tr><td colspan='9' height='1' bgcolor='#c0c0c0'></td></tr>";
+			}
+		?>
+      </table></td>
+          <td width="24" background="images/tab_right.png">&nbsp;</td>
+        </tr>
+        <tr> 
+          <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
+          <td background="images/tab_bottom.png">&nbsp;</td>
+          <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
+        </tr>
+      </table>
+      
+    </td>
+  </tr>
+  <tr valign="bottom"> 
+    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
+        <tr align="center" valign="middle"> 
+          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">ed2klink</iframe> 
+          </td>
+          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
+          </td>
+        </tr>
+      </table></td>
+  </tr>
+</table>
+</body>
+</html>

aMule-2.3.1.tar.bz2/src/webserver/default/amuleweb-main-kad.php Added

@@ -0,0 +1,214 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>aMule control panel</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<?php
+	if ( $_SESSION["auto_refresh"] > 0 ) {
+		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
+	}
+
+	amule_load_vars("stats_graph");
+?>
+<script language="JavaScript" type="text/JavaScript">
+
+</script>
+<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
+
+</style>
+</head><script language="JavaScript" type="text/JavaScript">
+function formCommandSubmit(command)
+{
+	if ( command == "cancel" ) {
+		var res = confirm("Delete selected files ?")
+		if ( res == false ) {
+			return;
+		}
+	}
+	if ( command != "filter" ) {
+		<?php
+			if ($_SESSION["guest_login"] != 0) {
+					echo 'alert("You logged in as guest - commands are disabled");';
+					echo "return;";
+			}
+		?>
+	}
+	var frm=document.forms.mainform
+	frm.command.value=command
+	frm.submit()
+}
+
+</script>
+<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png')">
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr valign="top"> 
+    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
+    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
+        <tr> 
+          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
+          <td><img src="images/col.png"></td>
+          <td width="10"></td>
+          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
+            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
+          <td width="10"></td>
+        </tr>
+      </table></td>
+  </tr>
+  <tr align="center" valign="top"> 
+    <td colspan="2"><form name="mainform" action="amuleweb-main-kad.php" method="post">
+        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+          <caption>
+          KADEMLIA 
+          </caption>
+          <tr> 
+            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
+            <td background="images/tab_top.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
+          </tr>
+          <tr> 
+            <td width="24" background="images/tab_left.png">&nbsp;</td>
+            <td bgcolor="#FFFFFF"><table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
+                
+                <tr valign="top"> 
+                  <td height="200"><img src="amule_stats_kad.png" width="500" height="200" border="0" alt="" title="" /></td>
+                  <td valign="top"> <table  border="0" align="center" cellpadding="0" cellspacing="6" class="kadnewnode">
+                      <tr> 
+                        <th colspan="2">Bootstrap from node</th>
+                      </tr>
+                      <tr> 
+                        <td align="right">IP :</td><td align="left"><input name="ip3" type="text" id="ip32" size="3" maxlength="3"> 
+                          &nbsp; <input name="ip2" type="text" id="ip23" size="3" maxlength="3"> 
+                          &nbsp; <input name="ip1" type="text" id="ip13" size="3" maxlength="3"> 
+                          &nbsp; <input name="ip0" type="text" id="ip03" size="3" maxlength="3"></td>
+                      </tr>
+                      <tr> 
+                        <td align="right">Port :</td><td align="left"><input name="port" type="text" id="port3" size="4" maxlength="5"> 
+                          &nbsp; <input type="submit" name="Submit" value="Connect"></td>
+                      </tr>
+                    </table></td>
+                </tr>
+                <tr valign="top"> 
+                  <td height="20" width="500" align="center">Number of nodes</td>
+                  <td></td>
+                </tr>
+              </table></td>
+            <td width="24" background="images/tab_right.png">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
+            <td background="images/tab_bottom.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
+          </tr>
+        </table>
+        </form></td>
+  </tr>
+  <tr valign="bottom"> 
+    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
+        <tr align="center" valign="middle"> 
+          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
+          </td>
+          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
+          </td>
+        </tr>
+      </table></td>
+  </tr>
+</table>
+</body>
+</html>

aMule-2.3.1.tar.bz2/src/webserver/default/amuleweb-main-log.php Added

@@ -0,0 +1,270 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>aMule control panel</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+<script language="JavaScript" type="text/JavaScript">
+
+</script>
+<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
+
+</style>
+</head><script language="JavaScript" type="text/JavaScript">
+function formCommandSubmit(command)
+{
+	var frm=document.forms.mainform
+	frm.command.value=command
+	frm.submit()
+}
+
+var initvals = new Object;
+
+<?php
+	// apply new options before proceeding
+	//var_dump($HTTP_GET_VARS);
+	if ( ($HTTP_GET_VARS["Submit"] == "Apply") && ($_SESSION["guest_login"] == 0) ) {
+		$file_opts = array("check_free_space", "extract_metadata", 
+			"ich_en","aich_trust", "preview_prio","save_sources", "resume_same_cat",
+			"min_free_space", "new_files_paused", "alloc_full", "alloc_full_chunks",
+			"new_files_auto_dl_prio", "new_files_auto_ul_prio"
+		);
+		$conn_opts = array("max_line_up_cap","max_up_limit",
+			"max_line_down_cap","max_down_limit", "slot_alloc", 
+			"tcp_port","udp_dis","max_file_src","max_conn_total","autoconn_en");
+		$webserver_opts = array("use_gzip", "autorefresh_time");
+		
+		$all_opts;
+		foreach ($conn_opts as $i) {
+			$curr_value = $HTTP_GET_VARS[$i];
+			if ( $curr_value == "on") $curr_value = 1;
+			if ( $curr_value == "") $curr_value = 0;
+			
+			$all_opts["connection"][$i] = $curr_value;
+		}
+		foreach ($file_opts as $i) {
+			$curr_value = $HTTP_GET_VARS[$i];
+			if ( $curr_value == "on") $curr_value = 1;
+			if ( $curr_value == "") $curr_value = 0;
+			
+			$all_opts["files"][$i] = $curr_value;
+		}
+		foreach ($webserver_opts as $i) {
+			$curr_value = $HTTP_GET_VARS[$i];
+			if ( $curr_value == "on") $curr_value = 1;
+			if ( $curr_value == "") $curr_value = 0;
+			
+			$all_opts["webserver"][$i] = $curr_value;
+		}
+		//var_dump($all_opts);
+		amule_set_options($all_opts);
+	}
+	$opts = amule_get_options();
+	//var_dump($opts);
+	$opt_groups = array("connection", "files", "webserver");
+	//var_dump($opt_groups);
+	foreach ($opt_groups as $group) {
+		$curr_opts = $opts[$group];
+		//var_dump($curr_opts);
+		foreach ($curr_opts as $opt_name => $opt_val) {
+			echo 'initvals["', $opt_name, '"] = "', $opt_val, '";';
+		}
+	}
+?>
+
+
+function init_data()
+{
+	var frm = document.forms.mainform
+
+	var str_param_names = new Array(
+		"max_line_down_cap", "max_line_up_cap",
+		"max_up_limit", "max_down_limit", "max_file_src",
+		"slot_alloc", "max_conn_total",
+		"tcp_port", "udp_port",
+		"min_free_space",
+		"autorefresh_time"
+		)
+	for(i = 0; i < str_param_names.length; i++) {
+		frm[str_param_names[i]].value = initvals[str_param_names[i]];
+	}
+	var check_param_names = new Array(
+		"autoconn_en", "reconn_en", "udp_dis", "new_files_paused",
+		"aich_trust", "alloc_full", "alloc_full_chunks",
+		"check_free_space", "extract_metadata", "ich_en",
+		"new_files_auto_dl_prio", "new_files_auto_ul_prio",
+		"use_gzip"
+		)
+	for(i = 0; i < check_param_names.length; i++) {
+		frm[check_param_names[i]].checked = initvals[check_param_names[i]] == "1" ? true : false;
+	}
+}
+
+</script>
+<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png');init_data();">
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr valign="top"> 
+    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
+    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
+        <tr> 
+          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
+          <td><img src="images/col.png"></td>
+          <td width="10"></td>
+          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
+            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
+          <td width="10"></td>
+        </tr>
+      </table></td>
+  </tr>
+  <tr align="center" valign="top"> 
+    <td colspan="2">        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+          <caption>
+          AMULE LOG 
+          </caption>
+          <tr> 
+            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
+            <td background="images/tab_top.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
+          </tr>
+          <tr> 
+            <td width="24" background="images/tab_left.png">&nbsp;</td>
+            <td bgcolor="#FFFFFF">
+
+            <table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
+                
+                <tr valign="top"> 
+                  <td>
+		<h1 style="display:inline;">aMule log</h1>
+		<a href="log.php?rstlog=1" target="logframe" onclick="return confirm('Do you really want to reset aMule log?')">(Reset log)</a><br>
+	<iframe width="100%" height="400" name="logframe" src="log.php"></iframe>
+                  </td>
+                  </tr><tr>
+                  <td>
+		<h1 style="display:inline;">Serverinfo</h1>
+		<a href="log.php?rstsrv=1" target="srvframe" onclick="return confirm('Do you really want to reset Serverinfo?')">(Reset Serverinfo)</a>
+<iframe width="100%" height="200" name="srvframe" src="log.php?show=srv"></iframe>
+                  </td>
+                  </tr>
+                </tr>
+              </table>
+              </td>
+            <td width="24" background="images/tab_right.png">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
+            <td background="images/tab_bottom.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
+          </tr>
+        </table>
+</td>
+  </tr>
+  <tr valign="bottom"> 
+    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
+        <tr align="center" valign="middle"> 
+          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
+          </td>
+          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
+          </td>
+        </tr>
+      </table></td>
+  </tr>
+</table>
+</body>
+</html>

aMule-2.3.1.tar.bz2/src/webserver/default/amuleweb-main-prefs.php Added

@@ -0,0 +1,464 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>aMule control panel</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+<script language="JavaScript" type="text/JavaScript">
+
+</script>
+<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
+
+</style>
+</head><script language="JavaScript" type="text/JavaScript">
+function formCommandSubmit(command)
+{
+	var frm=document.forms.mainform
+	frm.command.value=command
+	frm.submit()
+}
+
+var initvals = new Object;
+
+<?php
+	// apply new options before proceeding
+	//var_dump($HTTP_GET_VARS);
+	if ( ($HTTP_GET_VARS["Submit"] == "Apply") && ($_SESSION["guest_login"] == 0) ) {
+		$file_opts = array("check_free_space", "extract_metadata", 
+			"ich_en","aich_trust", "preview_prio","save_sources", "resume_same_cat",
+			"min_free_space", "new_files_paused", "alloc_full", "alloc_full_chunks",
+			"new_files_auto_dl_prio", "new_files_auto_ul_prio"
+		);
+		$conn_opts = array("max_line_up_cap","max_up_limit",
+			"max_line_down_cap","max_down_limit", "slot_alloc", 
+			"tcp_port","udp_dis","max_file_src","max_conn_total","autoconn_en");
+		$webserver_opts = array("use_gzip", "autorefresh_time");
+		
+		$all_opts;
+		foreach ($conn_opts as $i) {
+			$curr_value = $HTTP_GET_VARS[$i];
+			if ( $curr_value == "on") $curr_value = 1;
+			if ( $curr_value == "") $curr_value = 0;
+			
+			$all_opts["connection"][$i] = $curr_value;
+		}
+		foreach ($file_opts as $i) {
+			$curr_value = $HTTP_GET_VARS[$i];
+			if ( $curr_value == "on") $curr_value = 1;
+			if ( $curr_value == "") $curr_value = 0;
+			
+			$all_opts["files"][$i] = $curr_value;
+		}
+		foreach ($webserver_opts as $i) {
+			$curr_value = $HTTP_GET_VARS[$i];
+			if ( $curr_value == "on") $curr_value = 1;
+			if ( $curr_value == "") $curr_value = 0;
+			
+			$all_opts["webserver"][$i] = $curr_value;
+		}
+		//var_dump($all_opts);
+		amule_set_options($all_opts);
+	}
+	$opts = amule_get_options();
+	//var_dump($opts);
+	$opt_groups = array("connection", "files", "webserver");
+	//var_dump($opt_groups);
+	foreach ($opt_groups as $group) {
+		$curr_opts = $opts[$group];
+		//var_dump($curr_opts);
+		foreach ($curr_opts as $opt_name => $opt_val) {
+			echo 'initvals["', $opt_name, '"] = "', $opt_val, '";';
+		}
+	}
+?>
+
+
+function init_data()
+{
+	var frm = document.forms.mainform
+
+	var str_param_names = new Array(
+		"max_line_down_cap", "max_line_up_cap",
+		"max_up_limit", "max_down_limit", "max_file_src",
+		"slot_alloc", "max_conn_total",
+		"tcp_port", "udp_port",
+		"min_free_space",
+		"autorefresh_time"
+		)
+	for(i = 0; i < str_param_names.length; i++) {
+		frm[str_param_names[i]].value = initvals[str_param_names[i]];
+	}
+	var check_param_names = new Array(
+		"autoconn_en", "reconn_en", "udp_dis", "new_files_paused",
+		"aich_trust", "alloc_full", "alloc_full_chunks",
+		"check_free_space", "extract_metadata", "ich_en",
+		"new_files_auto_dl_prio", "new_files_auto_ul_prio",
+		"use_gzip"
+		)
+	for(i = 0; i < check_param_names.length; i++) {
+		frm[check_param_names[i]].checked = initvals[check_param_names[i]] == "1" ? true : false;
+	}
+}
+
+</script>
+<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png');init_data();">
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr valign="top"> 
+    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
+    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
+        <tr> 
+          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
+          <td><img src="images/col.png"></td>
+          <td width="10"></td>
+          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
+            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
+          <td width="10"></td>
+        </tr>
+      </table></td>
+  </tr>
+  <tr align="center" valign="top"> 
+    <td colspan="2">
+        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+          <caption>PREFERENCES</caption>
+          <tr> 
+            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
+            <td background="images/tab_top.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
+          </tr>
+          <tr> 
+            <td width="24" background="images/tab_left.png">&nbsp;</td>
+            
+      <td bgcolor="#FFFFFF"><form name="mainform" action="amuleweb-main-prefs.php" method="post">
+              <table border="0" align="center" cellpadding="0" cellspacing="6">
+               
+    <tr align="center" valign="top"> 
+      <td> 
+        <table width="350" border="0" align="center" cellpadding="0" cellspacing="0" >
+          <tr> 
+            <td width="22">&nbsp;</td>
+            <th>Webserver</th>
+            <td width="63">&nbsp;</td>
+          </tr>
+            <td width="22" height="25">&nbsp;</td>
+            <td height="25">Page refresh interval </td>
+            <td width="63" height="25">
+<input name="autorefresh_time" type="text" id="autorefresh_time7" size="4"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">
+<input name="use_gzip" type="checkbox" id="use_gzip5"></td>
+            <td height="25"> Use gzip compression </td>
+            <td width="63" height="25">&nbsp;</td>
+          </tr>
+        </table></td>
+      <td width="50%"> 
+        <table width="350" border="0" align="center" cellpadding="0" cellspacing="0" >
+          <tr> 
+            <td width="22">&nbsp;</td>
+            <th>Line capacity (for statistics only)</th>
+            <td width="63">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">&nbsp;</td>
+            <td height="25">Max download rate </td>
+            <td width="63" height="25">
+<input name="max_line_down_cap" type="text" id="max_line_down_cap6" size="4"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">&nbsp;</td>
+            <td height="25">Max upload rate </td>
+            <td width="63" height="25">
+<input name="max_line_up_cap" type="text" id="max_line_up_cap7" size="4"></td>
+          </tr>
+        </table></td>
+    </tr>
+    <tr align="center" valign="top"> 
+      <td> 
+        <table width="350" border="0" align="center" cellpadding="0" cellspacing="0" >
+          <tr> 
+            <td width="22" height="19">&nbsp;</td>
+            <th>Bandwidth limits</th>
+            <td width="63">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">&nbsp;</td>
+            <td height="25">Max download rate </td>
+            <td width="63" height="25">
+<input name="max_down_limit" type="text" id="max_down_limit6" size="4"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">&nbsp;</td>
+            <td height="25">Max upload rate </td>
+            <td width="63" height="25">
+<input name="max_up_limit" type="text" id="max_up_limit6" size="4"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">&nbsp;</td>
+            <td height="25">Slot allocation </td>
+            <td width="63" height="25">
+<input name="slot_alloc" type="text" id="slot_alloc6" size="4"></td>
+          </tr>
+        </table></td>
+      <td width="50%" rowspan="3"> 
+        <table width="350" border="0" align="center" cellpadding="0" cellspacing="0" >
+          <tr> 
+            <td width="22">&nbsp;</td>
+            <th> File settings </th>
+            <td width="63">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">&nbsp;</td>
+            <td height="25">&nbsp; </td>
+            <td width="63" height="25"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25"> 
+              <input name="check_free_space" type="checkbox" id="check_free_space5"></td>
+            <td height="25"> Check free space =&gt; Minimum free space (Mb) </td>
+            <td width="63" height="25"> 
+              <input name="min_free_space" type="text" id="min_free_space4" size="4"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25"> 
+              <input name="new_files_auto_dl_prio" type="checkbox" id="new_files_auto_dl_prio4"></td>
+            <td height="25"> Added download files have auto priority</td>
+            <td width="63" height="25"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25"> 
+              <input name="new_files_auto_ul_prio" type="checkbox" id="new_files_auto_ul_prio4"></td>
+            <td height="25"> New shared files have auto priority</td>
+            <td width="63" height="25"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25"> 
+              <input name="ich_en" type="checkbox" id="ich_en5"></td>
+            <td height="25"> I.C.H. active</td>
+            <td width="63" height="25"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25"> 
+              <input name="aich_trust" type="checkbox" id="aich_trust4"></td>
+            <td height="25"> AICH trusts every hash (not recommended)</td>
+            <td width="63" height="25"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25"> 
+              <input name="alloc_full_chunks" type="checkbox" id="alloc_full_chunks4"></td>
+            <td height="25"> Alloc full chunks of .part files</td>
+            <td width="63" height="25"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25"> 
+              <input name="alloc_full" type="checkbox" id="alloc_full4"></td>
+            <td height="25"> Alloc full disk space for .part files</td>
+            <td width="63" height="25"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25"> 
+              <input name="new_files_paused" type="checkbox" id="new_files_paused4"></td>
+            <td height="25"> Add files to download queue in pause mode</td>
+            <td width="63" height="25"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25"> 
+              <input name="extract_metadata" type="checkbox" id="extract_metadata4"></td>
+            <td height="25"> Extract metadata tags </td>
+            <td width="63" height="25"></td>
+          </tr>
+        </table></td>
+    </tr>
+    <tr align="center" valign="top"> 
+      <td> 
+        <table width="350" border="0" align="center" cellpadding="0" cellspacing="0" >
+          <tr> 
+            <td width="22">&nbsp;</td>
+            <th>Connection settings</th>
+            <td width="63">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">&nbsp;</td>
+            <td height="25">Max total connections (total) </td>
+            <td width="63" height="25">
+<input name="max_conn_total" type="text" id="max_conn_total8" size="4"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">&nbsp;</td>
+            <td height="25">Max sources per file </td>
+            <td width="63" height="25">
+<input name="max_file_src" type="text" id="max_file_src7" size="4"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">
+<input name="autoconn_en" type="checkbox" id="autoconn_en6"></td>
+            <td height="25"> Autoconnect at startup </td>
+            <td width="63" height="25">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">
+<input name="reconn_en" type="checkbox" id="reconn_en6"></td>
+            <td height="25"> Reconnect when connection lost </td>
+            <td width="63" height="25">&nbsp;</td>
+          </tr>
+        </table></td>
+    </tr>
+    <tr align="center" valign="top"> 
+      <td> 
+        <table width="350" border="0" align="center" cellpadding="0" cellspacing="0" >
+          <tr> 
+            <td width="22">&nbsp;</td>
+            <th>Network settings</th>
+            <td width="63">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">&nbsp;</td>
+            <td height="25">TCP port </td>
+            <td width="63" height="25">
+<input name="tcp_port" type="text" id="tcp_port6" size="4"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">&nbsp;</td>
+            <td height="25">UDP port </td>
+            <td width="63" height="25">
+<input name="udp_port" type="text" id="udp_port6" size="4"></td>
+          </tr>
+          <tr> 
+            <td width="22" height="25">
+<input name="udp_dis" type="checkbox" id="udp_dis5"></td>
+            <td height="25"> Disable UDP connections </td>
+            <td width="63" height="25">&nbsp;</td>
+          </tr>
+        </table></td>
+    </tr>
+    <tr align="center"> 
+      <td colspan="2"> 
+        <?php
+			if ($_SESSION["guest_login"] == 0) {
+				echo '<input type="submit" name="Submit" value="Apply">';
+			} else {
+				echo "<b>&nbsp;You can not change options - logged in as guest</b>";
+			}
+		?>
+        <input name="command" type="hidden" id="command"> </td>
+    </tr>
+  </table>
+  </form></td>
+            <td width="24" background="images/tab_right.png">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
+            <td background="images/tab_bottom.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
+          </tr>
+        </table></td>
+  </tr>
+  <tr valign="bottom"> 
+    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
+        <tr align="center" valign="middle"> 
+          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
+          </td>
+          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
+          </td>
+        </tr>
+      </table></td>
+  </tr>
+</table>
+</body>
+</html>

aMule-2.3.1.tar.bz2/src/webserver/default/amuleweb-main-search.php Added

@@ -0,0 +1,358 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>aMule control panel</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+<script language="JavaScript" type="text/JavaScript">
+
+</script>
+<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
+
+</style>
+</head><script language="JavaScript" type="text/JavaScript">
+function formCommandSubmit(command)
+{
+	<?php
+		if ($_SESSION["guest_login"] != 0) {
+				echo 'alert("You logged in as guest - commands are disabled");';
+				echo "return;";
+		}
+	?>
+	var frm=document.forms.mainform
+	frm.command.value=command
+	frm.submit()
+}
+
+</script>
+<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png');">
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr valign="top"> 
+    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
+    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
+        <tr> 
+          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
+          <td><img src="images/col.png"></td>
+          <td width="10"></td>
+          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
+            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
+          <td width="10"></td>
+        </tr>
+      </table></td>
+  </tr>
+  <tr align="center" valign="top"> 
+    <td colspan="2">
+        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+          <caption>
+        SEARCH
+        </caption>
+          <tr> 
+            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
+            <td background="images/tab_top.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
+          </tr>
+          <tr> 
+            <td width="24" background="images/tab_left.png">&nbsp;</td>
+            
+      <td bgcolor="#FFFFFF"><form name="mainform" action="amuleweb-main-search.php" method="post">
+              <table width="100%" border="0" align="center" cellpadding="4" cellspacing="0">
+                <tr align="center"> 
+                  <td align="center">
+<input type="hidden" name="command" value=""> 
+                    <input name="searchval" type="text" id="searchval4" size="60"> 
+                    <input name="Search" type="submit" id="Search4" value="Search" onClick="javascript:formCommandSubmit('search');"></td>
+                  <td align="right">Availability :</td>
+                  <td align="left"> 
+                    <input name="avail" type="text" id="avail13" size="6"></td>
+                  <td align="left">Min Size : </td>
+                  <td align="left">
+<input name="minsize" type="text" id="minsize2" size="5"> 
+                    <select name="minsizeu" id="select8">
+                      <option>Byte</option>
+                      <option>KByte</option>
+                      <option selected>MByte</option>
+                      <option>GByte</option>
+                    </select></td>
+                </tr>
+                <tr> 
+                  <td align="center"><a href="amuleweb-main-search.php?search_sort=<?php echo($HTTP_GET_VARS["sort"]);?>">Click here to update the search results</a> </td>
+                  <td align="right">Search type :</td>
+                  <td> 
+                    <select name="searchtype" id="select">
+                      <option selected>Local</option>
+                      <option>Global</option>
+                      <option>Kad</option>
+                    </select></td>
+                  <td>Max Size : </td>
+                  <td>
+<input name="maxsize" type="text" id="maxsize4" size="5"> 
+                    <select name="maxsizeu" id="select10">
+                      <option>Byte</option>
+                      <option>KByte</option>
+                      <option selected>MByte</option>
+                      <option>GByte</option>
+                    </select></td>
+                </tr>
+              </table>
+              <table width="100%"  border="0" align="center" cellpadding="0" cellspacing="0">
+                  <th>&nbsp;</th>
+                  <th><a href="amuleweb-main-search.php?sort=name">File Name</a></th>
+                  <th><a href="amuleweb-main-search.php?sort=size">Size</a></th>
+                  <th><a href="amuleweb-main-search.php?sort=sources">Sources</a></th>
+    </tr><tr><td colspan="9" height="1" bgcolor="#000000"></td></tr>
+    <?php
+		function CastToXBytes($size)
+		{
+			if ( $size < 1024 ) {
+				$result = $size . " b";
+			} elseif ( $size < 1048576 ) {
+				$result = ($size / 1024.0) . "kb";
+			} elseif ( $size < 1073741824 ) {
+				$result = ($size / 1048576.0) . "mb";
+			} else {
+				$result = ($size / 1073741824.0) . "gb";
+			}
+			return $result;
+		}
+
+		//
+		// declare it here, before any function reffered it in "global"
+		//
+		$sort_order;$sort_reverse;
+
+		function my_cmp($a, $b)
+		{
+			global $sort_order, $sort_reverse;
+			
+			switch ( $sort_order) {
+				case "size": $result = $a->size > $b->size; break;
+				case "name": $result = $a->name > $b->name; break;
+				case "sources": $result = $a->sources > $b->sources; break;
+			}
+
+			if ( $sort_reverse ) {
+				$result = !$result;
+			}
+
+			return $result;
+		}
+
+		function str2mult($str)
+		{
+			$result = 1;
+			switch($str) {
+				case "Byte":	$result = 1; break;
+				case "KByte":	$result = 1024; break;		
+				case "MByte":	$result = 1012*1024; break;
+				case "GByte":	$result = 1012*1024*1024; break;
+			}
+			return $result;
+		}
+
+		function cat2idx($cat)
+		{
+                	$cats = amule_get_categories();
+                	$result = 0;
+                	foreach($cats as $i => $c) {
+                		if ( $cat == $c) $result = $i;
+                	}
+            		return $result;
+		}
+
+		if ($_SESSION["guest_login"] == 0) {
+			if ( $HTTP_GET_VARS["command"] == "search") {
+				$search_type = -1;
+				switch($HTTP_GET_VARS["searchtype"]) {
+					case "Local": $search_type = 0; break;
+					case "Global": $search_type = 1; break;
+					case "Kad": $search_type = 2; break;
+				}
+				$min_size = $HTTP_GET_VARS["minsize"] == "" ? 0 : $HTTP_GET_VARS["minsize"];
+				$max_size = $HTTP_GET_VARS["maxsize"] == "" ? 0 : $HTTP_GET_VARS["maxsize"];
+	
+				$min_size *= str2mult($HTTP_GET_VARS["minsizeu"]);
+				$max_size *= str2mult($HTTP_GET_VARS["maxsizeu"]);
+				
+				amule_do_search_start_cmd($HTTP_GET_VARS["searchval"],
+					//$HTTP_GET_VARS["ext"], $HTTP_GET_VARS["filetype"],
+					"", "",
+					$search_type, $HTTP_GET_VARS["avail"], $min_size, $max_size);
+			} elseif ( $HTTP_GET_VARS["command"] == "download") {
+				foreach ( $HTTP_GET_VARS as $name => $val) {
+					// this is file checkboxes
+					if ( (strlen($name) == 32) and ($val == "on") ) {
+						$cat = $HTTP_GET_VARS["targetcat"];
+						$cat_idx = cat2idx($cat);
+						amule_do_search_download_cmd($name, $cat_idx);
+					}
+				}
+			} else {
+			}
+		}		
+		$search = amule_load_vars("searchresult");
+
+		$sort_order = $HTTP_GET_VARS["sort"];
+
+		if ( $sort_order == "" ) {
+			$sort_order = $_SESSION["search_sort"];
+		} else {
+			if ( $_SESSION["search_sort_reverse"] == "" ) {
+				$_SESSION["search_sort_reverse"] = 0;
+			} else {
+				$_SESSION["search_sort_reverse"] = !$_SESSION["search_sort_reverse"];
+			}
+		}
+
+		$sort_reverse = $_SESSION["search_sort_reverse"];
+		if ( $sort_order != "" ) {
+			$_SESSION["search_sort"] = $sort_order;
+			usort(&$search, "my_cmp");
+		}
+
+		foreach ($search as $file) {
+			print "<tr>";
+
+			echo "<td class='texte'>", '<input type="checkbox" name="', $file->hash, '" >', "</td>";
+
+			echo "<td class='texte'>", $file->short_name, "</td>";
+			
+			echo "<td class='texte' align='center'>", CastToXBytes($file->size), "</td>";
+
+			echo "<td class='texte' align='center'>", $file->sources, "</td>";
+
+			print "</tr></tr><tr><td colspan='9' height='1' bgcolor='#c0c0c0'></td></tr>";
+		}
+
+	  ?>
+    <tr align="right"> 
+      <td colspan="4" scope="col">
+        <input name="Download" type="submit" id="Download6" value="Download" onClick="javascript:formCommandSubmit('download');" >
+        <select name="targetcat" id="select32">
+          <?php
+                	$cats = amule_get_categories();
+                	foreach($cats as $c) {
+                		echo "<option>", $c, "</option>";
+                	}
+                ?>
+        </select></td>
+  </table>
+</form></td>
+            <td width="24" background="images/tab_right.png">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
+            <td background="images/tab_bottom.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
+          </tr>
+        </table></td>
+  </tr>
+  <tr valign="bottom"> 
+    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
+        <tr align="center" valign="middle"> 
+          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
+          </td>
+          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
+          </td>
+        </tr>
+      </table></td>
+  </tr>
+</table>
+</body>
+</html>

aMule-2.3.1.tar.bz2/src/webserver/default/amuleweb-main-servers.php Added

@@ -0,0 +1,248 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>aMule control panel</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+<script language="JavaScript" type="text/JavaScript">
+
+</script>
+<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
+
+</style>
+</head>
+<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png');">
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr valign="top"> 
+    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
+    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
+        <tr> 
+          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
+          <td><img src="images/col.png"></td>
+          <td width="10"></td>
+          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
+            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
+          <td width="10"></td>
+        </tr>
+      </table></td>
+  </tr>
+  <tr align="center" valign="top"> 
+    <td colspan="2">
+        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+          <caption>
+        SERVERS 
+        </caption>
+          <tr> 
+            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
+            <td background="images/tab_top.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
+          </tr>
+          <tr> 
+            <td width="24" background="images/tab_left.png">&nbsp;</td>
+            
+      <td bgcolor="#FFFFFF"><table width="100%"  border="0" align="center" cellpadding="0" cellspacing="0">
+              <tr> 
+                <th width="3%"></th>
+                <th width="22%" ><a href="amuleweb-main-servers.php?sort=name">Server Name</a></th>
+                <th width="42%" ><a href="amuleweb-main-servers.php?sort=desc">Description</a></th>
+                <th width="19%">Address</th>
+                <th width="7%"><a href="amuleweb-main-servers.php?sort=users">Users</a></th>
+                <th width="7%"><a href="amuleweb-main-servers.php?sort=files">Files</a></th>
+		</tr><tr><td colspan="8" height="1" bgcolor="#000000"></td></tr>
+              <?php
+
+
+		//
+		// declare it here, before any function reffered it in "global"
+		//
+		$sort_order;$sort_reverse;
+
+		function my_cmp($a, $b)
+		{
+			global $sort_order, $sort_reverse;
+			switch ( $sort_order) {
+				case "name": $result = $a->name > $b->name; break;
+				case "desc": $result = $a->desc > $b->desc; break;
+				case "users": $result = $a->users > $b->users; break;
+				case "files":$result = $a->files > $b->files; break;
+			}
+
+			if ( $sort_reverse ) {
+				$result = !$result;
+			}
+			return $result;
+		}
+
+		$servers = amule_load_vars("servers");
+
+		$sort_order = $HTTP_GET_VARS["sort"];
+
+		//
+		// perform command before processing content
+		//
+		if ( ($HTTP_GET_VARS["cmd"] != "") and ($HTTP_GET_VARS["ip"] != "") and ($HTTP_GET_VARS["port"] != "")) {
+			if ($_SESSION["guest_login"] == 0) {
+				amule_do_server_cmd($HTTP_GET_VARS["ip"], $HTTP_GET_VARS["port"], $HTTP_GET_VARS["cmd"]);
+			}
+		}
+		
+		if ( $sort_order == "" ) {
+			$sort_order = $_SESSION["servers_sort"];
+		} else {
+			if ( $_SESSION["sort_reverse"] == "" ) {
+				$_SESSION["sort_reverse"] = 0;
+			} else {
+				$_SESSION["sort_reverse"] = !$_SESSION["sort_reverse"];
+			}
+		}
+
+		$sort_reverse = $_SESSION["sort_reverse"];
+		if ( $sort_order != "" ) {
+			$_SESSION["servers_sort"] = $sort_order;
+			usort(&$servers, "my_cmp");
+		}
+		foreach ($servers as $srv) {
+			echo "<tr>";
+			
+			if ($_SESSION["guest_login"] != 0) {
+				echo "<td class='texte' align='center'></td>";
+			} else {
+				echo "<td class='texte' align='center'>",
+					'<a href="amuleweb-main-servers.php?cmd=connect&ip=', $srv->ip,
+					'&port=', $srv->port, '">',
+					'<img src="images/connect.gif" width="16" height="16" border="0">','</a>',
+					'<a href="amuleweb-main-servers.php?cmd=remove&ip=', $srv->ip,
+					'&port=', $srv->port, '">',
+					'<img src="images/cancel.gif" width="16" height="16" border="0">','</a>',
+					"</td>";
+			}
+
+			echo "<td class='texte'>", $srv->name, "</td>";
+			echo "<td class='texte'>", $srv->desc, "</td>";
+			echo "<td class='texte' align='center'>", $srv->addr, "</td>";
+			echo "<td class='texte' align='center'>", $srv->users, "</td>";
+			echo "<td class='texte' align='center'>", $srv->files, "</td>";
+
+			echo "</tr><tr><td colspan='9' height='1' bgcolor='#c0c0c0'></td></tr>";
+		}
+	  ?>
+            </table></td>
+            <td width="24" background="images/tab_right.png">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
+            <td background="images/tab_bottom.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
+          </tr>
+        </table></td>
+  </tr>
+  <tr valign="bottom"> 
+    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
+        <tr align="center" valign="middle"> 
+          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
+          </td>
+          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
+          </td>
+        </tr>
+      </table></td>
+  </tr>
+</table>
+</body>
+</html>

aMule-2.3.1.tar.bz2/src/webserver/default/amuleweb-main-shared.php Added

@@ -0,0 +1,378 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>aMule control panel</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+<script language="JavaScript" type="text/JavaScript">
+
+</script>
+<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
+
+</style>
+</head><script language="JavaScript" type="text/JavaScript">
+function formCommandSubmit(command)
+{
+	<?php
+		if ($_SESSION["guest_login"] != 0) {
+				echo 'alert("You logged in as guest - commands are disabled");';
+				echo "return;";
+		}
+	?>
+	var frm=document.forms.mainform
+	frm.command.value=command
+	frm.submit()
+}
+
+</script>
+<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png');">
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr valign="top"> 
+    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
+    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
+        <tr> 
+          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
+          <td><img src="images/col.png"></td>
+          <td width="10"></td>
+          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
+            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
+          <td width="10"></td>
+        </tr>
+      </table></td>
+  </tr>
+  <tr align="center" valign="top"> 
+    <td colspan="2"><form name="mainform" action="amuleweb-main-shared.php" method="post">
+              <table border="0" align="center" cellpadding="0" cellspacing="0">
+                <tr>
+                  <td><input type="hidden" name="command"></td>
+                  
+            <td><a href="javascript:formCommandSubmit('reload');" onClick="MM_nbGroup('down','group1','reload','',1)" onMouseOver="MM_nbGroup('over','reload','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/refresh.png" alt="Ricarica Files Condivisi" name="reload" border="0" onload=""></a></td>
+				  <td><a href="javascript:formCommandSubmit('prioup');" onClick="MM_nbGroup('down','group1','up','',1)" onMouseOver="MM_nbGroup('over','up','','',1)" onMouseOut="MM_nbGroup('out')"><img name="up" src="images/up.png" border="0" alt="Alza Priorità" onLoad=""></a></td>
+                  
+            <td><a href="javascript:formCommandSubmit('priodown');" onClick="MM_nbGroup('down','group1','down','',1)" onMouseOver="MM_nbGroup('over','down','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/down.png" alt="Abbassa Priorità" name="down" border="0" onload=""></a></td>
+                  <td><select name="select">
+                      <option selected>Select prio</option>
+                      <option>Low</option>
+                      <option>Normal</option>
+                      <option>High</option>
+                    </select> </td>
+                  
+            <td><a href="javascript:formCommandSubmit('setprio');" onClick="MM_nbGroup('down','group1','resume','',1)" onMouseOver="MM_nbGroup('over','resume','','',1)" onMouseOut="MM_nbGroup('out')"><img src="images/ok.png" alt="Imposta Priorità" name="resume" border="0" onload=""></a></td>
+              
+                  <td> 
+                    <?php
+		 	if ($_SESSION["guest_login"] != 0) {
+				echo "<b>&nbsp;You logged in as guest - commands are disabled</b>";
+			}
+		 ?>
+                  </td>
+                </tr>
+              </table>
+        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+          <caption>
+        SHARED FILES 
+        </caption>
+          <tr> 
+            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
+            <td background="images/tab_top.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
+          </tr>
+          <tr> 
+            <td width="24" background="images/tab_left.png">&nbsp;</td>
+            
+          <td bgcolor="#FFFFFF">
+              <table width="100%"  border="0" align="center" cellpadding="0" cellspacing="0">
+                <tr> 
+                  <th></th>
+                  <th><a href="amuleweb-main-shared.php?sort=name">File Name</a></th>
+                  <th><a href="amuleweb-main-shared.php?sort=xfer">Transferred</a> 
+                    (<a href="amuleweb-main-shared.php?sort=xfer_all">Total</a>)</th>
+                  <th><a href="amuleweb-main-shared.php?sort=req">Requested</a> 
+                    (<a href="amuleweb-main-shared.php?sort=req_all">Total</a>)</th>
+                  <th><a href="amuleweb-main-shared.php?sort=acc">Accepted requests</a> 
+                    (<a href="amuleweb-main-shared.php?sort=acc_all">Total</a>)</th>
+                  <th><a href="amuleweb-main-shared.php?sort=size">Size</a></th>
+                  <th><a href="amuleweb-main-shared.php?sort=prio">Priority</a></th>
+                </tr><tr><td colspan="9" height="1" bgcolor="#000000"></td></tr>
+                <?php
+		function CastToXBytes($size)
+		{
+			if ( $size < 1024 ) {
+				$result = $size . " bytes";
+			} elseif ( $size < 1048576 ) {
+				$result = ($size / 1024.0) . "KB";
+			} elseif ( $size < 1073741824 ) {
+				$result = ($size / 1048576.0) . "MB";
+			} else {
+				$result = ($size / 1073741824.0) . "GB";
+			}
+			return $result;
+		}
+
+		function StatusString($file)
+		{
+			if ( $file->status == 7 ) {
+				return "Paused";
+			} elseif ( $file->src_count_xfer > 0 ) {
+				return "Downloading";
+			} else {
+				return "Waiting";
+			}
+		}
+
+		function PrioString($file)
+		{
+			$prionames = array(0 => "Low", 1 => "Normal", 2 => "High",
+				3 => "Very high", 4 => "Very low", 5=> "Auto", 6 => "Release");
+			$result = $prionames[$file->prio];
+			if ( $file->prio_auto == 1) {
+				$result = $result . "(auto)";
+			}
+			return $result;
+		}
+
+		function PrioSort($file) {
+		// Very low (4) has a too high number
+			if (4 == $file->prio) {
+				return 0;
+			}
+			return $file->prio+1;
+		}
+
+		//
+		// declare it here, before any function reffered it in "global"
+		//
+		$sort_order;$sort_reverse;
+
+		function my_cmp($a, $b)
+		{
+			global $sort_order, $sort_reverse;
+			
+			switch ( $sort_order) {
+				case "size": $result = $a->size > $b->size; break;
+				case "name": $result = $a->name > $b->name; break;
+				case "xfer": $result = $a->xfer > $b->xfer; break;
+				case "xfer_all": $result = $a->xfer_all > $b->xfer_all; break;
+				case "acc": $result = $a->accept > $b->accept; break;
+				case "acc_all": $result = $a->accept_all > $b->accept_all; break;
+				case "req": $result = $a->req > $b->req; break;
+				case "req_all": $result = $a->req_all > $b->req_all; break;
+				case "prio": $result = PrioSort($a) < PrioSort($b); break;
+			}
+
+			if ( $sort_reverse ) {
+				$result = !$result;
+			}
+			//var_dump($sort_reverse);
+			return $result;
+		}
+
+		//
+		// perform command before processing content
+		//
+		//var_dump($HTTP_GET_VARS);
+		if (($HTTP_GET_VARS["command"] != "") && ($_SESSION["guest_login"] == 0)) {
+			//amule_do_download_cmd($HTTP_GET_VARS["command"]);
+			foreach ( $HTTP_GET_VARS as $name => $val) {
+				// this is file checkboxes
+				if ( (strlen($name) == 32) and ($val == "on") ) {
+					//var_dump($name);var_dump($val);
+					amule_do_shared_cmd($name, $HTTP_GET_VARS["command"]);
+				}
+			}
+			if ($HTTP_GET_VARS["command"] == "reload") {
+				amule_do_reload_shared_cmd();
+			}
+		}
+		$shared = amule_load_vars("shared");
+
+		$sort_order = $HTTP_GET_VARS["sort"];
+
+		if ( $sort_order == "" ) {
+			$sort_order = $_SESSION["shared_sort"];
+		} else {
+			if ( $_SESSION["sort_reverse"] == "" ) {
+				$_SESSION["sort_reverse"] = 0;
+			} else {
+				$_SESSION["sort_reverse"] = !$_SESSION["sort_reverse"];
+			}
+		}
+		//var_dump($_SESSION);
+		$sort_reverse = $_SESSION["sort_reverse"];
+		if ( $sort_order != "" ) {
+			$_SESSION["shared_sort"] = $sort_order;
+			usort(&$shared, "my_cmp");
+		}
+
+		foreach ($shared as $file) {
+			print "<tr>";
+
+			echo "<td class='texte'>", '<input type="checkbox" name="', $file->hash, '" >', "</td>";
+
+			echo "<td class='texte'>", $file->short_name, "</td>";
+			echo "<td class='texte' align='center'>", CastToXBytes($file->xfer), " (", CastToXBytes($file->xfer_all),")</td>";
+
+			echo "<td class='texte' align='center'>", $file->req, " (", $file->req_all, ")</td>";
+			echo "<td class='texte' align='center'>", $file->accept, " (", $file->accept_all, ")</td>";
+			
+			echo "<td class='texte' align='center'>", CastToXBytes($file->size), "</td>";
+
+			echo "<td class='texte' align='center'>", PrioString($file), "</td>";;
+
+			print "</tr><tr><td colspan='9' height='1' bgcolor='#c0c0c0'></td></tr>";
+		}
+	  ?>
+              </table></td>
+            <td width="24" background="images/tab_right.png">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
+            <td background="images/tab_bottom.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
+          </tr>
+        </table></form></td>
+  </tr>
+  <tr valign="bottom"> 
+    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
+        <tr align="center" valign="middle"> 
+          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
+          </td>
+          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
+          </td>
+        </tr>
+      </table></td>
+  </tr>
+</table>
+</body>
+</html>

aMule-2.3.1.tar.bz2/src/webserver/default/amuleweb-main-stats.php Added

@@ -0,0 +1,215 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>aMule control panel</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<?php
+	if ( $_SESSION["auto_refresh"] > 0 ) {
+		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
+	}
+
+	amule_load_vars("stats_graph");
+
+?>
+<script language="JavaScript" type="text/JavaScript">
+
+</script>
+<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
+
+</style>
+</head><script language="JavaScript" type="text/JavaScript">
+var openImg = new Image();
+openImg.src = "tree-open.gif";
+var closedImg = new Image();
+closedImg.src = "tree-closed.gif";
+
+function showBranch(branch){
+	var objBranch = document.getElementById(branch).style;
+	if(objBranch.display=="block")
+		objBranch.display="none";
+	else
+		objBranch.display="block";
+}
+
+function swapFolder(img){
+	objImg = document.getElementById(img);
+	if(objImg.src.indexOf('tree-closed.gif')>-1)
+		objImg.src = openImg.src;
+	else
+		objImg.src = closedImg.src;
+}
+
+</script>
+<body background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('images/transf_1.png','images/shared_1.png','images/search_1.png','images/edkserv_1.png','images/sheserv_1.png','images/stats_1.png');">
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr valign="top"> 
+    <td width="143" height="64"><img src="images/logo.png" width="143" height="64"></td>
+    <td width="100%" height="64" align="right" background="images/fond_haut.png"> <table border="0" cellspacing="0" cellpadding="0">
+        <tr> 
+          <td><a href="amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','images/transf_1.png',1)"><img src="images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','images/shared_1.png',1)"><img src="images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','images/search_1.png',1)"><img src="images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','images/edkserv_1.png',1)"><img src="images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','images/sheserv_1.png',1)"><img src="images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
+          <td><a href="amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','images/stats_1.png',1)"><img src="images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
+          <td><img src="images/col.png"></td>
+          <td width="10"></td>
+          <td width="190" align="right" class="texteinv"><a href="login.php">exit</a><br> 
+            <a href="amuleweb-main-log.php">log &bull;</a> <a href="amuleweb-main-prefs.php">configuration</a></td>
+          <td width="10"></td>
+        </tr>
+      </table></td>
+  </tr>
+  <tr align="center" valign="top"> 
+    <td colspan="2">
+        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+          <caption>
+        STATISTICS 
+        </caption>
+          <tr> 
+            <td width="24"><img src="images/tab_top_left.png" width="24" height="24"></td>
+            <td background="images/tab_top.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_top_right.png" width="24" height="24"></td>
+          </tr>
+          <tr> 
+            <td width="24" background="images/tab_left.png">&nbsp;</td>
+            
+          <td bgcolor="#FFFFFF"><table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
+              <tr valign="top"> 
+                <td rowspan="7">
+<iframe name="stats" src="stats_tree.php" width="100%" height="630" frameborder="0">liste</iframe></td>
+                <td width="500" align="right"><img src="amule_stats_download.png" width="500" height="200" border="0"></td>
+              </tr>
+              <tr valign="top"> 
+                <td width="500" height="15"> 
+                  <div align="center">Download-Speed</div></td>
+              </tr>
+              <tr valign="top"> 
+                <td width="500" align="right"><img src="amule_stats_upload.png" width="500" height="200" border="0" alt="" title="" /></td>
+              </tr>
+              <tr valign="top"> 
+                <td width="500" height="15"> 
+                  <div align="center">Upload-Speed</div></td>
+               </tr>
+              <tr valign="top"> 
+                <td width="500" align="right"><img src="amule_stats_conncount.png" width="500" height="200" border="0" alt="" title="" /></td>
+              </tr>
+              <tr valign="top"> 
+                <td width="500" height="15"> 
+                  <div align="center">Connections</div></td>
+              </tr>
+            </table></td>
+            <td width="24" background="images/tab_right.png">&nbsp;</td>
+          </tr>
+          <tr> 
+            <td width="24"><img src="images/tab_bottom_left.png" width="24" height="24"></td>
+            <td background="images/tab_bottom.png">&nbsp;</td>
+            <td width="24"><img src="images/tab_bottom_right.png" width="24" height="24"></td>
+          </tr>
+        </table></td>
+  </tr>
+  <tr valign="bottom"> 
+    <td height="25" colspan="2"> <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
+        <tr align="center" valign="middle"> 
+          <td width="50%"> <iframe name="stats" src="footer.php" height="35" width="100%" scrolling="no" frameborder="0">edklink</iframe> 
+          </td>
+          <td width="50%"> <iframe name="stats" src="stats.php" height="35" width="100%" scrolling="no" frameborder="0">connection</iframe> 
+          </td>
+        </tr>
+      </table></td>
+  </tr>
+</table>
+</body>
+</html>

aMule-2.2.6.tar.bz2/src/webserver/default/black.gif -> aMule-2.3.1.tar.bz2/src/webserver/default/black.gif Changed

aMule-2.3.1.tar.bz2/src/webserver/default/blank1x1.gif Changed

aMule-2.2.6.tar.bz2/src/webserver/default/blue1.gif -> aMule-2.3.1.tar.bz2/src/webserver/default/blue1.gif Changed

aMule-2.2.6.tar.bz2/src/webserver/default/blue2.gif -> aMule-2.3.1.tar.bz2/src/webserver/default/blue2.gif Changed

aMule-2.2.6.tar.bz2/src/webserver/default/blue3.gif -> aMule-2.3.1.tar.bz2/src/webserver/default/blue3.gif Changed

aMule-2.2.6.tar.bz2/src/webserver/default/blue4.gif -> aMule-2.3.1.tar.bz2/src/webserver/default/blue4.gif Changed

aMule-2.2.6.tar.bz2/src/webserver/default/blue5.gif -> aMule-2.3.1.tar.bz2/src/webserver/default/blue5.gif Changed

aMule-2.2.6.tar.bz2/src/webserver/default/blue6.gif -> aMule-2.3.1.tar.bz2/src/webserver/default/blue6.gif Changed

aMule-2.3.1.tar.bz2/src/webserver/default/cancel.gif Changed

aMule-2.3.1.tar.bz2/src/webserver/default/close.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/col.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/connect.gif Changed

aMule-2.3.1.tar.bz2/src/webserver/default/down.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/edkserv_0.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/edkserv_1.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/filter.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/fond.gif Changed

aMule-2.3.1.tar.bz2/src/webserver/default/fond_haut.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/footer.php Added

@@ -0,0 +1,126 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>amule-frame-bottom</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
+
+</style>
+</head>
+<script language="JavaScript" type="text/JavaScript">
+
+function refreshFrames()
+{
+	location = "amuleweb-main-dload.php"
+	location.reload();
+}
+
+</script>
+
+<body>
+
+<table width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
+  <tr>
+    <td width="50%" align="center" valign="bottom"> 
+      <form name="formlink" method="post" action="footer.php">
+        <input name="ed2klink" type="text" id="ed2klink" size="50">
+        <select name="selectcat" id="selectcat">
+        <?php
+		$cats = amule_get_categories();
+		if ( $HTTP_GET_VARS["Submit"] != "" ) {
+			$link = $HTTP_GET_VARS["ed2klink"];
+			$target_cat = $HTTP_GET_VARS["selectcat"];
+			$target_cat_idx = 0;
+
+			foreach($cats as $i => $c) {
+				if ( $target_cat == $c) $target_cat_idx = $i;
+			}
+
+			if ( strlen($link) > 0 ) {
+				$links = split("ed2k://", $link);
+				foreach($links as $linkn) {
+				    amule_do_ed2k_download_cmd("ed2k://" . $linkn, $target_cat_idx);
+				}
+			}
+		}
+
+		foreach($cats as $c) {
+			echo  '<option>', $c, '</option>';
+		}
+	?>
+        </select>
+        <input type="submit" name="Submit" value="Download link" onClick="refreshFrames()">
+      </form></td>
+</table>
+</body>
+</html>

aMule-2.3.1.tar.bz2/src/webserver/default/index.html Changed

aMule-2.3.1.tar.bz2/src/webserver/default/log.php Added

aMule-2.2.6.tar.bz2/src/webserver/default/login.php -> aMule-2.3.1.tar.bz2/src/webserver/default/login.php Changed

@@ -1,6 +1,7 @@
-<html><head><meta http-equiv="content-type" content="text/html; charset=UTF-8"><title>aMule CVS - Web Control Panel</title>
-
-<script language="JavaScript" type="text/javascript">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<title>aMule control panel</title><script language="JavaScript" type="text/javascript">
 
 function breakout_of_frame()
 {
@@ -19,49 +20,103 @@
 }
 
 </script>
-
-<style type="text/css">
-.ibutton
-{
-cursor:hand;
-position:relative;
-top:5;
-font-weight: bold;
-font-family: Tahoma, Verdana, Arial;
-font-size: 11px;
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link href="style.css" rel="stylesheet" type="text/css"><style type="text/css">
+
+</style>
+</head>
 
-<body onload="login_init();" alink="white" bgcolor="#cccccc" link="white" text="white" vlink="white">
-<table align="center" border="0" cellpadding="4" cellspacing="0" height="100%" width="100%">
-<tbody><tr><td align="center" valign="middle">
-<table align="center" border="0" cellpadding="4" cellspacing="0">
-<tbody><tr>
-<td align="center" bgcolor="#0066cc">
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://www.amule.org/" target="_blank"><img src="phpamule.png"></a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<p><font style="font-size: 10pt;" face="Tahoma"><b>Web Control Panel</b><br>Login</font></p>
-</td>
-</tr>
-<tr>
-<td align="center" bgcolor="#3399ff" valign="top">
-<form action="" method="post" name="login">
-<font style="font-size: 10pt;" face="Tahoma">&nbsp;<br>Enter your password here<br><br>
-<input name="pass" size="37" style="border: 1px none black;" value="" type="password">
-<br><br><input value="Login Now" type="submit"></font>
-</form>
-<br>
-<?php
-	if ($_SESSION["login_error"] != "") {
-		echo "<font color=blue size=+2>";
-		echo $_SESSION["login_error"];
-		echo "</font>";
-	}
-?>
-</td>
-</tr>
-</tbody></table>
-</td>
-</tr>
-</tbody></table>
-</body></html>
+<body  onload="login_init();" background="images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" valign="middle">
+<table width="100%" height="180" border="0" cellpadding="0" cellspacing="0" valign="middle">
+  <tr>
+    <td align="center" valign="middle"> 
+      <table width="70%" height="90%" border="0" align="center" cellpadding="0" cellspacing="1" bgcolor="#000000">
+        <tr> 
+          <td><table width="100%" height="100%" border="0" align="center" cellpadding="0" cellspacing="0" bgcolor="#FFFFFF">
+              <tr valign="top"> 
+               <th width="366" height="180"><img src="images/loginlogo.jpg" width="366" height="180" border="0"></a></th>
+                <th width="100% "height="180" align="right" valign="middle" background="images/loginfond_haut.png"> 
+                  <form action="" method="post" name="login">
+                    Enter password : 
+                    <input name="pass" size="20" value="" type="password">
+                    &nbsp; 
+                    <input name="submit" type="submit" value="Submit">
+                    &nbsp;&nbsp; </form></th>
+              </tr>
+            </table></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+</table>
+</body>
+</html>

aMule-2.3.1.tar.bz2/src/webserver/default/loginfond.gif Added

aMule-2.3.1.tar.bz2/src/webserver/default/loginfond_haut.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/loginlogo.jpg Changed

aMule-2.3.1.tar.bz2/src/webserver/default/loginlogo.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/logo.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/maquette.dwt Added

@@ -0,0 +1,78 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+
+<title>aMule control panel</title>
+ 
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<script language="JavaScript" type="text/JavaScript">
+
+</script>
+<link href="../style.css" rel="stylesheet" type="text/css">
+
+</head>
+
+<body background="../images/fond.gif" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="MM_preloadImages('../images/transf_1.png','../images/shared_1.png','../images/search_1.png','../images/edkserv_1.png','../images/sheserv_1.png','../images/stats_1.png')">
+<table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+  <tr valign="top"> 
+    <td width="143" height="64"><img src="../images/logo.png" width="143" height="64"></td>
+    <td height="64" align="right" background="../images/fond_haut.png"> 
+      <table border="0" cellspacing="0" cellpadding="0">
+        <tr> 
+          <td><a href="../amuleweb-main-dload.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('transfert','','../images/transf_1.png',1)"><img src="../images/transf_0.png" alt="transfert" name="transfert" width="52" height="50" border="0"></a></td>
+          <td><a href="../amuleweb-main-shared.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('shared','','../images/shared_1.png',1)"><img src="../images/shared_0.png" alt="shared" name="shared" width="52" height="50" border="0"></a></td>
+          <td><a href="../amuleweb-main-search.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('search','','../images/search_1.png',1)"><img src="../images/search_0.png" alt="search" name="search" width="52" height="50" border="0"></a></td>
+          <td><a href="../amuleweb-main-servers.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('edkserver','','../images/edkserv_1.png',1)"><img src="../images/edkserv_0.png" alt="edkserver" name="edkserver" width="52" height="50" border="0"></a></td>
+          <td><a href="../amuleweb-main-kad.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('sheserv','','../images/sheserv_1.png',1)"><img src="../images/sheserv_0.png" alt="sheserv" name="sheserv" width="52" height="50" border="0"></a></td>
+          <td><a href="../amuleweb-main-stats.php" onMouseOut="MM_swapImgRestore()" onMouseOver="MM_swapImage('statistiques','','../images/stats_1.png',1)"><img src="../images/stats_0.png" alt="statistiques" name="statistiques" width="52" height="50" border="0"></a></td>
+          <td><img src="../images/col.png"></td>
+          <td width="100"></td>
+          <td width="100" align="right" class="texteinv"><a href="../login.html">logout</a><br>
+            <a href="../amuleweb-main-prefs.php">configuration</a></td>
+          <td width="10"></td>
+        </tr>
+      </table>
+    </td>
+  </tr>
+  <tr align="center" valign="top"> 
+    <td colspan="2"></td>
+  </tr>
+  <tr valign="bottom"> 
+    <td height="25" colspan="2"> 
+      <table width="100%" height="40" border="0" cellpadding="0" cellspacing="0">
+        <tr align="center" valign="middle"> 
+          <td width="50%"> 
+            <iframe name="stats" src="footer.php" height="35" width="600" scrolling="no" frameborder="0">edklink</iframe>
+      </td>
+          <td width="50%"> 
+            <iframe name="stats" src="stats.php" height="35" width="600" scrolling="no" frameborder="0">connection</iframe>
+      </td>
+        </tr>
+      </table></td>
+  </tr>
+</table>
+</body>
+</html>

aMule-2.3.1.tar.bz2/src/webserver/default/ok.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/pause.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/play.png Changed

aMule-2.2.6.tar.bz2/src/webserver/default/red.gif -> aMule-2.3.1.tar.bz2/src/webserver/default/red.gif Changed

aMule-2.3.1.tar.bz2/src/webserver/default/refresh.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/search_0.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/search_1.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/shared_0.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/shared_1.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/sheserv_0.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/sheserv_1.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/stats.php Added

@@ -0,0 +1,118 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>amule control page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="pragmas" content="no-cache">
+<?php
+	if ( $_SESSION["auto_refresh"] > 0 ) {
+		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
+	}
+?>
+<style type="text/css">
+
+</style>
+</head>
+<table width="100%" height="30" border="0" align="center" cellpadding="0" cellspacing="0">
+  <tr valign="top"> 
+    <td width="65%"><strong>Ed2k : </strong> 
+      <?php
+    	$stats = amule_get_stats();
+    	if ( $stats["id"] == 0 ) {
+    		echo "Not connected";
+    	} elseif ( $stats["id"] == 0xffffffff ) {
+    		echo "Connecting ...";
+    	} else {
+    		echo "Connected with ", (($stats["id"] < 16777216) ? "low" : "high"), " ID to ",
+    			$stats["serv_name"], "  ", $stats["serv_addr"];
+    	}
+    ?>
+    </td>
+    <td><strong>Kad :</strong> 
+      <?php
+    	$stats = amule_get_stats();
+    	if ( $stats["kad_connected"] == 1 ) {
+    		echo "Connected";
+			if ( $stats["kad_firewalled"] == 1 ) {
+				echo "(Firewalled)";
+			} else {
+				echo "(OK)";
+			}
+    	} else {
+    		echo "Disconnected";
+    	}
+    ?>
+    </td>
+  </tr>
+</table>
+</html>

aMule-2.3.1.tar.bz2/src/webserver/default/stats_0.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/stats_1.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/stats_tree.php Added

@@ -0,0 +1,114 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<title>amule preferences page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="pragmas" content="no-cache">
+<?php
+	if ( $_SESSION["auto_refresh"] > 0 ) {
+		echo "<meta http-equiv=\"refresh\" content=\"", $_SESSION["auto_refresh"], '">';
+	}
+?>
+<style type="text/css">
+.trigger{
+	cursor: pointer;
+	cursor: hand;
+	font-family: Tahoma;
+	font-size: small;
+}
+.branch{
+	display: block;
+	margin-left: 16px;
+	font-family: Tahoma;
+	font-size: small;
+}
+
+</style>
+</head>
+<script language="JavaScript" type="text/JavaScript">
+var openImg = new Image();
+openImg.src = "tree-open.gif";
+var closedImg = new Image();
+closedImg.src = "tree-closed.gif";
+
+function showBranch(branch){
+	var objBranch = document.getElementById(branch).style;
+	if(objBranch.display!="none")
+		objBranch.display="none";
+	else
+		objBranch.display="block";
+}
+
+function swapFolder(img){
+	objImg = document.getElementById(img);
+	if(objImg.src.indexOf('tree-closed.gif')>-1)
+		objImg.src = openImg.src;
+	else
+		objImg.src = closedImg.src;
+}
+
+</script>
+<body onLoad="showBranch('br_Stats');swapFolder('fl_Stats')">
+<?php
+
+function print_ident($i)
+{
+	while($i != 0) {
+		echo "\t";
+		$i--;
+	}
+}
+
+function print_item($it, $ident)
+{
+	print_ident($ident);
+	echo "<img src=\"tree-leaf.gif\">", $it, "<br>\n";
+}
+
+function print_folder($key, &$arr, $ident)
+{
+	print_ident($ident);
+	echo "<span class=\"trigger\" onClick=\"showBranch('br_",
+		$key, "');swapFolder('fl_", $key, "')\">\n";
+	print_ident($ident+1);
+	echo "<img src=\"tree-open.gif\" border=\"0\" id=\"fl_", $key, "\">\n";
+	print_ident($ident+1);
+	echo $key, "<br>\n";
+	print_ident($ident);
+	echo "</span>\n";
+	print_ident($ident);
+	echo "<span class=\"branch\" id=\"br_", $key, "\">\n";
+
+	foreach ($arr as $k => $v) {
+		if ( count(&$v) ) {
+			print_folder($k, $v, $ident+1);
+		} else {
+			print_item($k, $ident+1);
+		}
+	}
+
+	print_ident($ident);
+	echo "</span>\n";
+}
+
+	$stattree = amule_load_vars("stats_tree");
+
+	foreach ($stattree as $k => $v) {
+		if ( count(&$v) ) {
+			print_folder($k, $v, $ident+1);
+		} else {
+			print_item($k, $ident+1);
+		}
+	}
+?>
+</body>
+</html>

aMule-2.3.1.tar.bz2/src/webserver/default/style.css Changed

aMule-2.3.1.tar.bz2/src/webserver/default/tab_bottom.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/tab_bottom_left.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/tab_bottom_right.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/tab_left.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/tab_right.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/tab_top.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/tab_top_left.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/tab_top_right.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/transf_0.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/transf_1.png Changed

aMule-2.3.1.tar.bz2/src/webserver/default/up.png Changed

aMule-2.2.6.tar.bz2/src/webserver/default/yellow.gif -> aMule-2.3.1.tar.bz2/src/webserver/default/yellow.gif Changed

aMule-2.2.6.tar.bz2/src/webserver/src/Makefile.am -> aMule-2.3.1.tar.bz2/src/webserver/src/Makefile.am Changed

@@ -8,35 +8,31 @@
 	$(top_srcdir)/src/OtherFunctions.cpp \
 	$(top_srcdir)/src/RLE.cpp \
 	$(top_srcdir)/src/NetworkFunctions.cpp \
+	$(top_srcdir)/src/LoggerConsole.cpp \
+	$(top_srcdir)/src/UPnPBase.cpp \
 	php_parser.c \
 	php_lexer.c \
 	php_syntree.cpp \
 	php_amule_lib.cpp \
 	php_core_lib.cpp
 
-if ENABLE_UPNP
-amuleweb_SOURCES +=  \
-	$(top_srcdir)/src/UPnPBase.cpp \
-	UPnPCompatibility.cpp
-endif
-
 php_parser.c: php_parser.y
-	bison --debug -t -d -v -o $@ $<
+	bison --debug -t -d -v -p php -o $@ $<
 
 php_lexer.c: php_lexer.l
-	$(LEX) -o$@ $<
+	$(LEX) -P php -o$@ $<
 
 amuleweb_DEPENDENCIES = ../../libs/common/libmulecommon.a ../../libs/ec/cpp/libec.a
 amuleweb_CPPFLAGS = -I../.. -I$(top_srcdir)/src -I$(top_srcdir)/src/libs -I$(top_srcdir)/src/include \
 	$(MULECPPFLAGS) $(AMULEWEB_DEFS) $(BFD_CPPFLAGS) $(WXBASE_CPPFLAGS) \
-	-DEC_REMOTE -DWEBSERVERDIR="\"$(pkgdatadir)/webserver\"" -DECSOCKET_USE_EVENTS=0 \
+	-DWEBSERVERDIR="\"$(pkgdatadir)/webserver\"" \
 	$(INCINTL) $(ZLIB_CPPFLAGS) $(LIBUPNP_CPPFLAGS)
 amuleweb_CFLAGS = $(MULECFLAGS) $(WX_CFLAGS_ONLY) $(LIBPNG_CFLAGS) $(LIBUPNP_CFLAGS)
 amuleweb_CXXFLAGS = $(MULECXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY) $(LIBPNG_CFLAGS) $(LIBUPNP_CFLAGS)
 
 amuleweb_LDFLAGS = $(MULELDFLAGS) -L../../libs/common -L../../libs/ec/cpp $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(LIBUPNP_LDFLAGS)
 amuleweb_LDADD = -lec -lmulecommon $(WXBASE_LIBS) $(BFD_LIBS) $(ZLIB_LIBS) \
-	$(READLINE_LIBS) $(LIBPNG_LIBS) $(RESOLV_LIB) $(REGEX_LIBS) $(LIBINTL) $(LIBUPNP_LIBS)
+	$(READLINE_LIBS) $(LIBPNG_LIBS) $(RESOLV_LIB) $(LIBINTL) $(LIBUPNP_LIBS)
 
 noinst_HEADERS = \
 		 WebInterface.h \

aMule-2.2.6.tar.bz2/src/webserver/src/Makefile.in -> aMule-2.3.1.tar.bz2/src/webserver/src/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,15 +16,12 @@
 @SET_MAKE@
 
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -38,10 +36,6 @@
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = amuleweb$(EXEEXT)
-@ENABLE_UPNP_TRUE@am__append_1 = \
-@ENABLE_UPNP_TRUE@	$(top_srcdir)/src/UPnPBase.cpp \
-@ENABLE_UPNP_TRUE@	UPnPCompatibility.cpp
-
 subdir = src/webserver/src
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -53,11 +47,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -67,66 +63,74 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am__amuleweb_SOURCES_DIST = WebServer.cpp WebInterface.cpp \
-	WebSocket.cpp $(top_srcdir)/src/ExternalConnector.cpp \
-	$(top_srcdir)/src/OtherFunctions.cpp $(top_srcdir)/src/RLE.cpp \
-	$(top_srcdir)/src/NetworkFunctions.cpp php_parser.c \
-	php_lexer.c php_syntree.cpp php_amule_lib.cpp php_core_lib.cpp \
-	$(top_srcdir)/src/UPnPBase.cpp UPnPCompatibility.cpp
-@ENABLE_UPNP_TRUE@am__objects_1 = amuleweb-UPnPBase.$(OBJEXT) \
-@ENABLE_UPNP_TRUE@	amuleweb-UPnPCompatibility.$(OBJEXT)
 am_amuleweb_OBJECTS = amuleweb-WebServer.$(OBJEXT) \
 	amuleweb-WebInterface.$(OBJEXT) amuleweb-WebSocket.$(OBJEXT) \
 	amuleweb-ExternalConnector.$(OBJEXT) \
 	amuleweb-OtherFunctions.$(OBJEXT) amuleweb-RLE.$(OBJEXT) \
 	amuleweb-NetworkFunctions.$(OBJEXT) \
+	amuleweb-LoggerConsole.$(OBJEXT) amuleweb-UPnPBase.$(OBJEXT) \
 	amuleweb-php_parser.$(OBJEXT) amuleweb-php_lexer.$(OBJEXT) \
 	amuleweb-php_syntree.$(OBJEXT) \
 	amuleweb-php_amule_lib.$(OBJEXT) \
-	amuleweb-php_core_lib.$(OBJEXT) $(am__objects_1)
+	amuleweb-php_core_lib.$(OBJEXT)
 @NEED_RC_TRUE@nodist_amuleweb_OBJECTS = amuleweb-version.$(OBJEXT)
 amuleweb_OBJECTS = $(am_amuleweb_OBJECTS) $(nodist_amuleweb_OBJECTS)
 am__DEPENDENCIES_1 =
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+amuleweb_LINK = $(CXXLD) $(amuleweb_CXXFLAGS) $(CXXFLAGS) \
+	$(amuleweb_LDFLAGS) $(LDFLAGS) -o $@
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(amuleweb_SOURCES) $(nodist_amuleweb_SOURCES)
-DIST_SOURCES = $(am__amuleweb_SOURCES_DIST)
+DIST_SOURCES = $(amuleweb_SOURCES)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -141,17 +145,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -163,44 +161,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -222,13 +220,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -236,44 +231,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -282,7 +273,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -290,25 +280,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -320,46 +304,67 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-amuleweb_SOURCES = WebServer.cpp WebInterface.cpp WebSocket.cpp \
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+amuleweb_SOURCES = \
+	WebServer.cpp \
+	WebInterface.cpp \
+	WebSocket.cpp \
 	$(top_srcdir)/src/ExternalConnector.cpp \
-	$(top_srcdir)/src/OtherFunctions.cpp $(top_srcdir)/src/RLE.cpp \
-	$(top_srcdir)/src/NetworkFunctions.cpp php_parser.c \
-	php_lexer.c php_syntree.cpp php_amule_lib.cpp php_core_lib.cpp \
-	$(am__append_1)
+	$(top_srcdir)/src/OtherFunctions.cpp \
+	$(top_srcdir)/src/RLE.cpp \
+	$(top_srcdir)/src/NetworkFunctions.cpp \
+	$(top_srcdir)/src/LoggerConsole.cpp \
+	$(top_srcdir)/src/UPnPBase.cpp \
+	php_parser.c \
+	php_lexer.c \
+	php_syntree.cpp \
+	php_amule_lib.cpp \
+	php_core_lib.cpp
+
 amuleweb_DEPENDENCIES = ../../libs/common/libmulecommon.a ../../libs/ec/cpp/libec.a
 amuleweb_CPPFLAGS = -I../.. -I$(top_srcdir)/src -I$(top_srcdir)/src/libs -I$(top_srcdir)/src/include \
 	$(MULECPPFLAGS) $(AMULEWEB_DEFS) $(BFD_CPPFLAGS) $(WXBASE_CPPFLAGS) \
-	-DEC_REMOTE -DWEBSERVERDIR="\"$(pkgdatadir)/webserver\"" -DECSOCKET_USE_EVENTS=0 \
+	-DWEBSERVERDIR="\"$(pkgdatadir)/webserver\"" \
 	$(INCINTL) $(ZLIB_CPPFLAGS) $(LIBUPNP_CPPFLAGS)
 
 amuleweb_CFLAGS = $(MULECFLAGS) $(WX_CFLAGS_ONLY) $(LIBPNG_CFLAGS) $(LIBUPNP_CFLAGS)
 amuleweb_CXXFLAGS = $(MULECXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY) $(LIBPNG_CFLAGS) $(LIBUPNP_CFLAGS)
 amuleweb_LDFLAGS = $(MULELDFLAGS) -L../../libs/common -L../../libs/ec/cpp $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(LIBUPNP_LDFLAGS)
 amuleweb_LDADD = -lec -lmulecommon $(WXBASE_LIBS) $(BFD_LIBS) $(ZLIB_LIBS) \
-	$(READLINE_LIBS) $(LIBPNG_LIBS) $(RESOLV_LIB) $(REGEX_LIBS) $(LIBINTL) $(LIBUPNP_LIBS)
+	$(READLINE_LIBS) $(LIBPNG_LIBS) $(RESOLV_LIB) $(LIBINTL) $(LIBUPNP_LIBS)
 
 noinst_HEADERS = \
 		 WebInterface.h \
@@ -388,14 +393,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/webserver/src/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  src/webserver/src/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/webserver/src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/webserver/src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -413,32 +418,47 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 amuleweb$(EXEEXT): $(amuleweb_OBJECTS) $(amuleweb_DEPENDENCIES) 
 	@rm -f amuleweb$(EXEEXT)
-	$(CXXLINK) $(amuleweb_LDFLAGS) $(amuleweb_OBJECTS) $(amuleweb_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(amuleweb_LINK) $(amuleweb_OBJECTS) $(amuleweb_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -447,11 +467,11 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuleweb-ExternalConnector.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuleweb-LoggerConsole.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuleweb-NetworkFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuleweb-OtherFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuleweb-RLE.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuleweb-UPnPBase.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuleweb-UPnPCompatibility.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuleweb-WebInterface.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuleweb-WebServer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuleweb-WebSocket.Po@am__quote@
@@ -462,302 +482,340 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/amuleweb-php_syntree.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 amuleweb-php_parser.o: php_parser.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CFLAGS) $(CFLAGS) -MT amuleweb-php_parser.o -MD -MP -MF "$(DEPDIR)/amuleweb-php_parser.Tpo" -c -o amuleweb-php_parser.o `test -f 'php_parser.c' || echo '$(srcdir)/'`php_parser.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/amuleweb-php_parser.Tpo" "$(DEPDIR)/amuleweb-php_parser.Po"; else rm -f "$(DEPDIR)/amuleweb-php_parser.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CFLAGS) $(CFLAGS) -MT amuleweb-php_parser.o -MD -MP -MF $(DEPDIR)/amuleweb-php_parser.Tpo -c -o amuleweb-php_parser.o `test -f 'php_parser.c' || echo '$(srcdir)/'`php_parser.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-php_parser.Tpo $(DEPDIR)/amuleweb-php_parser.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='php_parser.c' object='amuleweb-php_parser.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CFLAGS) $(CFLAGS) -c -o amuleweb-php_parser.o `test -f 'php_parser.c' || echo '$(srcdir)/'`php_parser.c
 
 amuleweb-php_parser.obj: php_parser.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CFLAGS) $(CFLAGS) -MT amuleweb-php_parser.obj -MD -MP -MF "$(DEPDIR)/amuleweb-php_parser.Tpo" -c -o amuleweb-php_parser.obj `if test -f 'php_parser.c'; then $(CYGPATH_W) 'php_parser.c'; else $(CYGPATH_W) '$(srcdir)/php_parser.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/amuleweb-php_parser.Tpo" "$(DEPDIR)/amuleweb-php_parser.Po"; else rm -f "$(DEPDIR)/amuleweb-php_parser.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CFLAGS) $(CFLAGS) -MT amuleweb-php_parser.obj -MD -MP -MF $(DEPDIR)/amuleweb-php_parser.Tpo -c -o amuleweb-php_parser.obj `if test -f 'php_parser.c'; then $(CYGPATH_W) 'php_parser.c'; else $(CYGPATH_W) '$(srcdir)/php_parser.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-php_parser.Tpo $(DEPDIR)/amuleweb-php_parser.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='php_parser.c' object='amuleweb-php_parser.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CFLAGS) $(CFLAGS) -c -o amuleweb-php_parser.obj `if test -f 'php_parser.c'; then $(CYGPATH_W) 'php_parser.c'; else $(CYGPATH_W) '$(srcdir)/php_parser.c'; fi`
 
 amuleweb-php_lexer.o: php_lexer.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CFLAGS) $(CFLAGS) -MT amuleweb-php_lexer.o -MD -MP -MF "$(DEPDIR)/amuleweb-php_lexer.Tpo" -c -o amuleweb-php_lexer.o `test -f 'php_lexer.c' || echo '$(srcdir)/'`php_lexer.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/amuleweb-php_lexer.Tpo" "$(DEPDIR)/amuleweb-php_lexer.Po"; else rm -f "$(DEPDIR)/amuleweb-php_lexer.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CFLAGS) $(CFLAGS) -MT amuleweb-php_lexer.o -MD -MP -MF $(DEPDIR)/amuleweb-php_lexer.Tpo -c -o amuleweb-php_lexer.o `test -f 'php_lexer.c' || echo '$(srcdir)/'`php_lexer.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-php_lexer.Tpo $(DEPDIR)/amuleweb-php_lexer.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='php_lexer.c' object='amuleweb-php_lexer.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CFLAGS) $(CFLAGS) -c -o amuleweb-php_lexer.o `test -f 'php_lexer.c' || echo '$(srcdir)/'`php_lexer.c
 
 amuleweb-php_lexer.obj: php_lexer.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CFLAGS) $(CFLAGS) -MT amuleweb-php_lexer.obj -MD -MP -MF "$(DEPDIR)/amuleweb-php_lexer.Tpo" -c -o amuleweb-php_lexer.obj `if test -f 'php_lexer.c'; then $(CYGPATH_W) 'php_lexer.c'; else $(CYGPATH_W) '$(srcdir)/php_lexer.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/amuleweb-php_lexer.Tpo" "$(DEPDIR)/amuleweb-php_lexer.Po"; else rm -f "$(DEPDIR)/amuleweb-php_lexer.Tpo"; exit 1; fi
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CFLAGS) $(CFLAGS) -MT amuleweb-php_lexer.obj -MD -MP -MF $(DEPDIR)/amuleweb-php_lexer.Tpo -c -o amuleweb-php_lexer.obj `if test -f 'php_lexer.c'; then $(CYGPATH_W) 'php_lexer.c'; else $(CYGPATH_W) '$(srcdir)/php_lexer.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-php_lexer.Tpo $(DEPDIR)/amuleweb-php_lexer.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='php_lexer.c' object='amuleweb-php_lexer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CFLAGS) $(CFLAGS) -c -o amuleweb-php_lexer.obj `if test -f 'php_lexer.c'; then $(CYGPATH_W) 'php_lexer.c'; else $(CYGPATH_W) '$(srcdir)/php_lexer.c'; fi`
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 amuleweb-WebServer.o: WebServer.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-WebServer.o -MD -MP -MF "$(DEPDIR)/amuleweb-WebServer.Tpo" -c -o amuleweb-WebServer.o `test -f 'WebServer.cpp' || echo '$(srcdir)/'`WebServer.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-WebServer.Tpo" "$(DEPDIR)/amuleweb-WebServer.Po"; else rm -f "$(DEPDIR)/amuleweb-WebServer.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-WebServer.o -MD -MP -MF $(DEPDIR)/amuleweb-WebServer.Tpo -c -o amuleweb-WebServer.o `test -f 'WebServer.cpp' || echo '$(srcdir)/'`WebServer.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-WebServer.Tpo $(DEPDIR)/amuleweb-WebServer.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='WebServer.cpp' object='amuleweb-WebServer.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-WebServer.o `test -f 'WebServer.cpp' || echo '$(srcdir)/'`WebServer.cpp
 
 amuleweb-WebServer.obj: WebServer.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-WebServer.obj -MD -MP -MF "$(DEPDIR)/amuleweb-WebServer.Tpo" -c -o amuleweb-WebServer.obj `if test -f 'WebServer.cpp'; then $(CYGPATH_W) 'WebServer.cpp'; else $(CYGPATH_W) '$(srcdir)/WebServer.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-WebServer.Tpo" "$(DEPDIR)/amuleweb-WebServer.Po"; else rm -f "$(DEPDIR)/amuleweb-WebServer.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-WebServer.obj -MD -MP -MF $(DEPDIR)/amuleweb-WebServer.Tpo -c -o amuleweb-WebServer.obj `if test -f 'WebServer.cpp'; then $(CYGPATH_W) 'WebServer.cpp'; else $(CYGPATH_W) '$(srcdir)/WebServer.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-WebServer.Tpo $(DEPDIR)/amuleweb-WebServer.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='WebServer.cpp' object='amuleweb-WebServer.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-WebServer.obj `if test -f 'WebServer.cpp'; then $(CYGPATH_W) 'WebServer.cpp'; else $(CYGPATH_W) '$(srcdir)/WebServer.cpp'; fi`
 
 amuleweb-WebInterface.o: WebInterface.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-WebInterface.o -MD -MP -MF "$(DEPDIR)/amuleweb-WebInterface.Tpo" -c -o amuleweb-WebInterface.o `test -f 'WebInterface.cpp' || echo '$(srcdir)/'`WebInterface.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-WebInterface.Tpo" "$(DEPDIR)/amuleweb-WebInterface.Po"; else rm -f "$(DEPDIR)/amuleweb-WebInterface.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-WebInterface.o -MD -MP -MF $(DEPDIR)/amuleweb-WebInterface.Tpo -c -o amuleweb-WebInterface.o `test -f 'WebInterface.cpp' || echo '$(srcdir)/'`WebInterface.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-WebInterface.Tpo $(DEPDIR)/amuleweb-WebInterface.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='WebInterface.cpp' object='amuleweb-WebInterface.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-WebInterface.o `test -f 'WebInterface.cpp' || echo '$(srcdir)/'`WebInterface.cpp
 
 amuleweb-WebInterface.obj: WebInterface.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-WebInterface.obj -MD -MP -MF "$(DEPDIR)/amuleweb-WebInterface.Tpo" -c -o amuleweb-WebInterface.obj `if test -f 'WebInterface.cpp'; then $(CYGPATH_W) 'WebInterface.cpp'; else $(CYGPATH_W) '$(srcdir)/WebInterface.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-WebInterface.Tpo" "$(DEPDIR)/amuleweb-WebInterface.Po"; else rm -f "$(DEPDIR)/amuleweb-WebInterface.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-WebInterface.obj -MD -MP -MF $(DEPDIR)/amuleweb-WebInterface.Tpo -c -o amuleweb-WebInterface.obj `if test -f 'WebInterface.cpp'; then $(CYGPATH_W) 'WebInterface.cpp'; else $(CYGPATH_W) '$(srcdir)/WebInterface.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-WebInterface.Tpo $(DEPDIR)/amuleweb-WebInterface.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='WebInterface.cpp' object='amuleweb-WebInterface.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-WebInterface.obj `if test -f 'WebInterface.cpp'; then $(CYGPATH_W) 'WebInterface.cpp'; else $(CYGPATH_W) '$(srcdir)/WebInterface.cpp'; fi`
 
 amuleweb-WebSocket.o: WebSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-WebSocket.o -MD -MP -MF "$(DEPDIR)/amuleweb-WebSocket.Tpo" -c -o amuleweb-WebSocket.o `test -f 'WebSocket.cpp' || echo '$(srcdir)/'`WebSocket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-WebSocket.Tpo" "$(DEPDIR)/amuleweb-WebSocket.Po"; else rm -f "$(DEPDIR)/amuleweb-WebSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-WebSocket.o -MD -MP -MF $(DEPDIR)/amuleweb-WebSocket.Tpo -c -o amuleweb-WebSocket.o `test -f 'WebSocket.cpp' || echo '$(srcdir)/'`WebSocket.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-WebSocket.Tpo $(DEPDIR)/amuleweb-WebSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='WebSocket.cpp' object='amuleweb-WebSocket.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-WebSocket.o `test -f 'WebSocket.cpp' || echo '$(srcdir)/'`WebSocket.cpp
 
 amuleweb-WebSocket.obj: WebSocket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-WebSocket.obj -MD -MP -MF "$(DEPDIR)/amuleweb-WebSocket.Tpo" -c -o amuleweb-WebSocket.obj `if test -f 'WebSocket.cpp'; then $(CYGPATH_W) 'WebSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/WebSocket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-WebSocket.Tpo" "$(DEPDIR)/amuleweb-WebSocket.Po"; else rm -f "$(DEPDIR)/amuleweb-WebSocket.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-WebSocket.obj -MD -MP -MF $(DEPDIR)/amuleweb-WebSocket.Tpo -c -o amuleweb-WebSocket.obj `if test -f 'WebSocket.cpp'; then $(CYGPATH_W) 'WebSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/WebSocket.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-WebSocket.Tpo $(DEPDIR)/amuleweb-WebSocket.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='WebSocket.cpp' object='amuleweb-WebSocket.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-WebSocket.obj `if test -f 'WebSocket.cpp'; then $(CYGPATH_W) 'WebSocket.cpp'; else $(CYGPATH_W) '$(srcdir)/WebSocket.cpp'; fi`
 
 amuleweb-ExternalConnector.o: $(top_srcdir)/src/ExternalConnector.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-ExternalConnector.o -MD -MP -MF "$(DEPDIR)/amuleweb-ExternalConnector.Tpo" -c -o amuleweb-ExternalConnector.o `test -f '$(top_srcdir)/src/ExternalConnector.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/ExternalConnector.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-ExternalConnector.Tpo" "$(DEPDIR)/amuleweb-ExternalConnector.Po"; else rm -f "$(DEPDIR)/amuleweb-ExternalConnector.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-ExternalConnector.o -MD -MP -MF $(DEPDIR)/amuleweb-ExternalConnector.Tpo -c -o amuleweb-ExternalConnector.o `test -f '$(top_srcdir)/src/ExternalConnector.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/ExternalConnector.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-ExternalConnector.Tpo $(DEPDIR)/amuleweb-ExternalConnector.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/ExternalConnector.cpp' object='amuleweb-ExternalConnector.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-ExternalConnector.o `test -f '$(top_srcdir)/src/ExternalConnector.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/ExternalConnector.cpp
 
 amuleweb-ExternalConnector.obj: $(top_srcdir)/src/ExternalConnector.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-ExternalConnector.obj -MD -MP -MF "$(DEPDIR)/amuleweb-ExternalConnector.Tpo" -c -o amuleweb-ExternalConnector.obj `if test -f '$(top_srcdir)/src/ExternalConnector.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/ExternalConnector.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ExternalConnector.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-ExternalConnector.Tpo" "$(DEPDIR)/amuleweb-ExternalConnector.Po"; else rm -f "$(DEPDIR)/amuleweb-ExternalConnector.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-ExternalConnector.obj -MD -MP -MF $(DEPDIR)/amuleweb-ExternalConnector.Tpo -c -o amuleweb-ExternalConnector.obj `if test -f '$(top_srcdir)/src/ExternalConnector.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/ExternalConnector.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ExternalConnector.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-ExternalConnector.Tpo $(DEPDIR)/amuleweb-ExternalConnector.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/ExternalConnector.cpp' object='amuleweb-ExternalConnector.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-ExternalConnector.obj `if test -f '$(top_srcdir)/src/ExternalConnector.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/ExternalConnector.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/ExternalConnector.cpp'; fi`
 
 amuleweb-OtherFunctions.o: $(top_srcdir)/src/OtherFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-OtherFunctions.o -MD -MP -MF "$(DEPDIR)/amuleweb-OtherFunctions.Tpo" -c -o amuleweb-OtherFunctions.o `test -f '$(top_srcdir)/src/OtherFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/OtherFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-OtherFunctions.Tpo" "$(DEPDIR)/amuleweb-OtherFunctions.Po"; else rm -f "$(DEPDIR)/amuleweb-OtherFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-OtherFunctions.o -MD -MP -MF $(DEPDIR)/amuleweb-OtherFunctions.Tpo -c -o amuleweb-OtherFunctions.o `test -f '$(top_srcdir)/src/OtherFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/OtherFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-OtherFunctions.Tpo $(DEPDIR)/amuleweb-OtherFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/OtherFunctions.cpp' object='amuleweb-OtherFunctions.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-OtherFunctions.o `test -f '$(top_srcdir)/src/OtherFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/OtherFunctions.cpp
 
 amuleweb-OtherFunctions.obj: $(top_srcdir)/src/OtherFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-OtherFunctions.obj -MD -MP -MF "$(DEPDIR)/amuleweb-OtherFunctions.Tpo" -c -o amuleweb-OtherFunctions.obj `if test -f '$(top_srcdir)/src/OtherFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/OtherFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-OtherFunctions.Tpo" "$(DEPDIR)/amuleweb-OtherFunctions.Po"; else rm -f "$(DEPDIR)/amuleweb-OtherFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-OtherFunctions.obj -MD -MP -MF $(DEPDIR)/amuleweb-OtherFunctions.Tpo -c -o amuleweb-OtherFunctions.obj `if test -f '$(top_srcdir)/src/OtherFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/OtherFunctions.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-OtherFunctions.Tpo $(DEPDIR)/amuleweb-OtherFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/OtherFunctions.cpp' object='amuleweb-OtherFunctions.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-OtherFunctions.obj `if test -f '$(top_srcdir)/src/OtherFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/OtherFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/OtherFunctions.cpp'; fi`
 
 amuleweb-RLE.o: $(top_srcdir)/src/RLE.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-RLE.o -MD -MP -MF "$(DEPDIR)/amuleweb-RLE.Tpo" -c -o amuleweb-RLE.o `test -f '$(top_srcdir)/src/RLE.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/RLE.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-RLE.Tpo" "$(DEPDIR)/amuleweb-RLE.Po"; else rm -f "$(DEPDIR)/amuleweb-RLE.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-RLE.o -MD -MP -MF $(DEPDIR)/amuleweb-RLE.Tpo -c -o amuleweb-RLE.o `test -f '$(top_srcdir)/src/RLE.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/RLE.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-RLE.Tpo $(DEPDIR)/amuleweb-RLE.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/RLE.cpp' object='amuleweb-RLE.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-RLE.o `test -f '$(top_srcdir)/src/RLE.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/RLE.cpp
 
 amuleweb-RLE.obj: $(top_srcdir)/src/RLE.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-RLE.obj -MD -MP -MF "$(DEPDIR)/amuleweb-RLE.Tpo" -c -o amuleweb-RLE.obj `if test -f '$(top_srcdir)/src/RLE.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/RLE.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/RLE.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-RLE.Tpo" "$(DEPDIR)/amuleweb-RLE.Po"; else rm -f "$(DEPDIR)/amuleweb-RLE.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-RLE.obj -MD -MP -MF $(DEPDIR)/amuleweb-RLE.Tpo -c -o amuleweb-RLE.obj `if test -f '$(top_srcdir)/src/RLE.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/RLE.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/RLE.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-RLE.Tpo $(DEPDIR)/amuleweb-RLE.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/RLE.cpp' object='amuleweb-RLE.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-RLE.obj `if test -f '$(top_srcdir)/src/RLE.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/RLE.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/RLE.cpp'; fi`
 
 amuleweb-NetworkFunctions.o: $(top_srcdir)/src/NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-NetworkFunctions.o -MD -MP -MF "$(DEPDIR)/amuleweb-NetworkFunctions.Tpo" -c -o amuleweb-NetworkFunctions.o `test -f '$(top_srcdir)/src/NetworkFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/NetworkFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-NetworkFunctions.Tpo" "$(DEPDIR)/amuleweb-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/amuleweb-NetworkFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-NetworkFunctions.o -MD -MP -MF $(DEPDIR)/amuleweb-NetworkFunctions.Tpo -c -o amuleweb-NetworkFunctions.o `test -f '$(top_srcdir)/src/NetworkFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/NetworkFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-NetworkFunctions.Tpo $(DEPDIR)/amuleweb-NetworkFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/NetworkFunctions.cpp' object='amuleweb-NetworkFunctions.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-NetworkFunctions.o `test -f '$(top_srcdir)/src/NetworkFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/NetworkFunctions.cpp
 
 amuleweb-NetworkFunctions.obj: $(top_srcdir)/src/NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-NetworkFunctions.obj -MD -MP -MF "$(DEPDIR)/amuleweb-NetworkFunctions.Tpo" -c -o amuleweb-NetworkFunctions.obj `if test -f '$(top_srcdir)/src/NetworkFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/NetworkFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-NetworkFunctions.Tpo" "$(DEPDIR)/amuleweb-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/amuleweb-NetworkFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-NetworkFunctions.obj -MD -MP -MF $(DEPDIR)/amuleweb-NetworkFunctions.Tpo -c -o amuleweb-NetworkFunctions.obj `if test -f '$(top_srcdir)/src/NetworkFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/NetworkFunctions.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-NetworkFunctions.Tpo $(DEPDIR)/amuleweb-NetworkFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/NetworkFunctions.cpp' object='amuleweb-NetworkFunctions.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-NetworkFunctions.obj `if test -f '$(top_srcdir)/src/NetworkFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/NetworkFunctions.cpp'; fi`
 
+amuleweb-LoggerConsole.o: $(top_srcdir)/src/LoggerConsole.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-LoggerConsole.o -MD -MP -MF $(DEPDIR)/amuleweb-LoggerConsole.Tpo -c -o amuleweb-LoggerConsole.o `test -f '$(top_srcdir)/src/LoggerConsole.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/LoggerConsole.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-LoggerConsole.Tpo $(DEPDIR)/amuleweb-LoggerConsole.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/LoggerConsole.cpp' object='amuleweb-LoggerConsole.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-LoggerConsole.o `test -f '$(top_srcdir)/src/LoggerConsole.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/LoggerConsole.cpp
+
+amuleweb-LoggerConsole.obj: $(top_srcdir)/src/LoggerConsole.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-LoggerConsole.obj -MD -MP -MF $(DEPDIR)/amuleweb-LoggerConsole.Tpo -c -o amuleweb-LoggerConsole.obj `if test -f '$(top_srcdir)/src/LoggerConsole.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/LoggerConsole.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/LoggerConsole.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-LoggerConsole.Tpo $(DEPDIR)/amuleweb-LoggerConsole.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/LoggerConsole.cpp' object='amuleweb-LoggerConsole.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-LoggerConsole.obj `if test -f '$(top_srcdir)/src/LoggerConsole.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/LoggerConsole.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/LoggerConsole.cpp'; fi`
+
+amuleweb-UPnPBase.o: $(top_srcdir)/src/UPnPBase.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-UPnPBase.o -MD -MP -MF $(DEPDIR)/amuleweb-UPnPBase.Tpo -c -o amuleweb-UPnPBase.o `test -f '$(top_srcdir)/src/UPnPBase.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/UPnPBase.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-UPnPBase.Tpo $(DEPDIR)/amuleweb-UPnPBase.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/UPnPBase.cpp' object='amuleweb-UPnPBase.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-UPnPBase.o `test -f '$(top_srcdir)/src/UPnPBase.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/UPnPBase.cpp
+
+amuleweb-UPnPBase.obj: $(top_srcdir)/src/UPnPBase.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-UPnPBase.obj -MD -MP -MF $(DEPDIR)/amuleweb-UPnPBase.Tpo -c -o amuleweb-UPnPBase.obj `if test -f '$(top_srcdir)/src/UPnPBase.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/UPnPBase.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/UPnPBase.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-UPnPBase.Tpo $(DEPDIR)/amuleweb-UPnPBase.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/UPnPBase.cpp' object='amuleweb-UPnPBase.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-UPnPBase.obj `if test -f '$(top_srcdir)/src/UPnPBase.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/UPnPBase.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/UPnPBase.cpp'; fi`
+
 amuleweb-php_syntree.o: php_syntree.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-php_syntree.o -MD -MP -MF "$(DEPDIR)/amuleweb-php_syntree.Tpo" -c -o amuleweb-php_syntree.o `test -f 'php_syntree.cpp' || echo '$(srcdir)/'`php_syntree.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-php_syntree.Tpo" "$(DEPDIR)/amuleweb-php_syntree.Po"; else rm -f "$(DEPDIR)/amuleweb-php_syntree.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-php_syntree.o -MD -MP -MF $(DEPDIR)/amuleweb-php_syntree.Tpo -c -o amuleweb-php_syntree.o `test -f 'php_syntree.cpp' || echo '$(srcdir)/'`php_syntree.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-php_syntree.Tpo $(DEPDIR)/amuleweb-php_syntree.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='php_syntree.cpp' object='amuleweb-php_syntree.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-php_syntree.o `test -f 'php_syntree.cpp' || echo '$(srcdir)/'`php_syntree.cpp
 
 amuleweb-php_syntree.obj: php_syntree.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-php_syntree.obj -MD -MP -MF "$(DEPDIR)/amuleweb-php_syntree.Tpo" -c -o amuleweb-php_syntree.obj `if test -f 'php_syntree.cpp'; then $(CYGPATH_W) 'php_syntree.cpp'; else $(CYGPATH_W) '$(srcdir)/php_syntree.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-php_syntree.Tpo" "$(DEPDIR)/amuleweb-php_syntree.Po"; else rm -f "$(DEPDIR)/amuleweb-php_syntree.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-php_syntree.obj -MD -MP -MF $(DEPDIR)/amuleweb-php_syntree.Tpo -c -o amuleweb-php_syntree.obj `if test -f 'php_syntree.cpp'; then $(CYGPATH_W) 'php_syntree.cpp'; else $(CYGPATH_W) '$(srcdir)/php_syntree.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-php_syntree.Tpo $(DEPDIR)/amuleweb-php_syntree.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='php_syntree.cpp' object='amuleweb-php_syntree.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-php_syntree.obj `if test -f 'php_syntree.cpp'; then $(CYGPATH_W) 'php_syntree.cpp'; else $(CYGPATH_W) '$(srcdir)/php_syntree.cpp'; fi`
 
 amuleweb-php_amule_lib.o: php_amule_lib.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-php_amule_lib.o -MD -MP -MF "$(DEPDIR)/amuleweb-php_amule_lib.Tpo" -c -o amuleweb-php_amule_lib.o `test -f 'php_amule_lib.cpp' || echo '$(srcdir)/'`php_amule_lib.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-php_amule_lib.Tpo" "$(DEPDIR)/amuleweb-php_amule_lib.Po"; else rm -f "$(DEPDIR)/amuleweb-php_amule_lib.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-php_amule_lib.o -MD -MP -MF $(DEPDIR)/amuleweb-php_amule_lib.Tpo -c -o amuleweb-php_amule_lib.o `test -f 'php_amule_lib.cpp' || echo '$(srcdir)/'`php_amule_lib.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-php_amule_lib.Tpo $(DEPDIR)/amuleweb-php_amule_lib.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='php_amule_lib.cpp' object='amuleweb-php_amule_lib.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-php_amule_lib.o `test -f 'php_amule_lib.cpp' || echo '$(srcdir)/'`php_amule_lib.cpp
 
 amuleweb-php_amule_lib.obj: php_amule_lib.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-php_amule_lib.obj -MD -MP -MF "$(DEPDIR)/amuleweb-php_amule_lib.Tpo" -c -o amuleweb-php_amule_lib.obj `if test -f 'php_amule_lib.cpp'; then $(CYGPATH_W) 'php_amule_lib.cpp'; else $(CYGPATH_W) '$(srcdir)/php_amule_lib.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-php_amule_lib.Tpo" "$(DEPDIR)/amuleweb-php_amule_lib.Po"; else rm -f "$(DEPDIR)/amuleweb-php_amule_lib.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-php_amule_lib.obj -MD -MP -MF $(DEPDIR)/amuleweb-php_amule_lib.Tpo -c -o amuleweb-php_amule_lib.obj `if test -f 'php_amule_lib.cpp'; then $(CYGPATH_W) 'php_amule_lib.cpp'; else $(CYGPATH_W) '$(srcdir)/php_amule_lib.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-php_amule_lib.Tpo $(DEPDIR)/amuleweb-php_amule_lib.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='php_amule_lib.cpp' object='amuleweb-php_amule_lib.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-php_amule_lib.obj `if test -f 'php_amule_lib.cpp'; then $(CYGPATH_W) 'php_amule_lib.cpp'; else $(CYGPATH_W) '$(srcdir)/php_amule_lib.cpp'; fi`
 
 amuleweb-php_core_lib.o: php_core_lib.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-php_core_lib.o -MD -MP -MF "$(DEPDIR)/amuleweb-php_core_lib.Tpo" -c -o amuleweb-php_core_lib.o `test -f 'php_core_lib.cpp' || echo '$(srcdir)/'`php_core_lib.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-php_core_lib.Tpo" "$(DEPDIR)/amuleweb-php_core_lib.Po"; else rm -f "$(DEPDIR)/amuleweb-php_core_lib.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-php_core_lib.o -MD -MP -MF $(DEPDIR)/amuleweb-php_core_lib.Tpo -c -o amuleweb-php_core_lib.o `test -f 'php_core_lib.cpp' || echo '$(srcdir)/'`php_core_lib.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-php_core_lib.Tpo $(DEPDIR)/amuleweb-php_core_lib.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='php_core_lib.cpp' object='amuleweb-php_core_lib.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-php_core_lib.o `test -f 'php_core_lib.cpp' || echo '$(srcdir)/'`php_core_lib.cpp
 
 amuleweb-php_core_lib.obj: php_core_lib.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-php_core_lib.obj -MD -MP -MF "$(DEPDIR)/amuleweb-php_core_lib.Tpo" -c -o amuleweb-php_core_lib.obj `if test -f 'php_core_lib.cpp'; then $(CYGPATH_W) 'php_core_lib.cpp'; else $(CYGPATH_W) '$(srcdir)/php_core_lib.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-php_core_lib.Tpo" "$(DEPDIR)/amuleweb-php_core_lib.Po"; else rm -f "$(DEPDIR)/amuleweb-php_core_lib.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-php_core_lib.obj -MD -MP -MF $(DEPDIR)/amuleweb-php_core_lib.Tpo -c -o amuleweb-php_core_lib.obj `if test -f 'php_core_lib.cpp'; then $(CYGPATH_W) 'php_core_lib.cpp'; else $(CYGPATH_W) '$(srcdir)/php_core_lib.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/amuleweb-php_core_lib.Tpo $(DEPDIR)/amuleweb-php_core_lib.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='php_core_lib.cpp' object='amuleweb-php_core_lib.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-php_core_lib.obj `if test -f 'php_core_lib.cpp'; then $(CYGPATH_W) 'php_core_lib.cpp'; else $(CYGPATH_W) '$(srcdir)/php_core_lib.cpp'; fi`
 
-amuleweb-UPnPBase.o: $(top_srcdir)/src/UPnPBase.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-UPnPBase.o -MD -MP -MF "$(DEPDIR)/amuleweb-UPnPBase.Tpo" -c -o amuleweb-UPnPBase.o `test -f '$(top_srcdir)/src/UPnPBase.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/UPnPBase.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-UPnPBase.Tpo" "$(DEPDIR)/amuleweb-UPnPBase.Po"; else rm -f "$(DEPDIR)/amuleweb-UPnPBase.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/UPnPBase.cpp' object='amuleweb-UPnPBase.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-UPnPBase.o `test -f '$(top_srcdir)/src/UPnPBase.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/UPnPBase.cpp
-
-amuleweb-UPnPBase.obj: $(top_srcdir)/src/UPnPBase.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-UPnPBase.obj -MD -MP -MF "$(DEPDIR)/amuleweb-UPnPBase.Tpo" -c -o amuleweb-UPnPBase.obj `if test -f '$(top_srcdir)/src/UPnPBase.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/UPnPBase.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/UPnPBase.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-UPnPBase.Tpo" "$(DEPDIR)/amuleweb-UPnPBase.Po"; else rm -f "$(DEPDIR)/amuleweb-UPnPBase.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/UPnPBase.cpp' object='amuleweb-UPnPBase.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-UPnPBase.obj `if test -f '$(top_srcdir)/src/UPnPBase.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/UPnPBase.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/UPnPBase.cpp'; fi`
-
-amuleweb-UPnPCompatibility.o: UPnPCompatibility.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-UPnPCompatibility.o -MD -MP -MF "$(DEPDIR)/amuleweb-UPnPCompatibility.Tpo" -c -o amuleweb-UPnPCompatibility.o `test -f 'UPnPCompatibility.cpp' || echo '$(srcdir)/'`UPnPCompatibility.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-UPnPCompatibility.Tpo" "$(DEPDIR)/amuleweb-UPnPCompatibility.Po"; else rm -f "$(DEPDIR)/amuleweb-UPnPCompatibility.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UPnPCompatibility.cpp' object='amuleweb-UPnPCompatibility.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-UPnPCompatibility.o `test -f 'UPnPCompatibility.cpp' || echo '$(srcdir)/'`UPnPCompatibility.cpp
-
-amuleweb-UPnPCompatibility.obj: UPnPCompatibility.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -MT amuleweb-UPnPCompatibility.obj -MD -MP -MF "$(DEPDIR)/amuleweb-UPnPCompatibility.Tpo" -c -o amuleweb-UPnPCompatibility.obj `if test -f 'UPnPCompatibility.cpp'; then $(CYGPATH_W) 'UPnPCompatibility.cpp'; else $(CYGPATH_W) '$(srcdir)/UPnPCompatibility.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/amuleweb-UPnPCompatibility.Tpo" "$(DEPDIR)/amuleweb-UPnPCompatibility.Po"; else rm -f "$(DEPDIR)/amuleweb-UPnPCompatibility.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='UPnPCompatibility.cpp' object='amuleweb-UPnPCompatibility.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(amuleweb_CPPFLAGS) $(CPPFLAGS) $(amuleweb_CXXFLAGS) $(CXXFLAGS) -c -o amuleweb-UPnPCompatibility.obj `if test -f 'UPnPCompatibility.cpp'; then $(CYGPATH_W) 'UPnPCompatibility.cpp'; else $(CYGPATH_W) '$(srcdir)/UPnPCompatibility.cpp'; fi`
-uninstall-info-am:
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -766,7 +824,7 @@
 all-am: Makefile $(PROGRAMS) $(HEADERS)
 installdirs:
 	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -789,6 +847,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -810,18 +869,38 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -841,25 +920,29 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
 	clean-generic ctags distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-info-am
+	uninstall-am uninstall-binPROGRAMS
 
 
 php_parser.c: php_parser.y
-	bison --debug -t -d -v -o $@ $<
+	bison --debug -t -d -v -p php -o $@ $<
 
 php_lexer.c: php_lexer.l
-	$(LEX) -o$@ $<
+	$(LEX) -P php -o$@ $<
 
 @NEED_RC_TRUE@.rc.$(OBJEXT):
 @NEED_RC_TRUE@	$(RC) $(MULERCFLAGS) -I$(top_srcdir) $(RCFLAGS) -O COFF -i "$<" -o "$@"
@@ -868,6 +951,7 @@
 @NEED_RC_TRUE@	@sed -e 's/VER_FILEDESCRIPTION_STR/"aMule Web Server"/' \
 @NEED_RC_TRUE@	     -e 's/VER_INTERNALNAME_STR/"amuleweb"/' \
 @NEED_RC_TRUE@	     -e 's/VER_ORIGINALFILENAME_STR/"amuleweb$(EXEEXT)"/' "$<" > "$@"
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/src/webserver/src/WebInterface.cpp -> aMule-2.3.1.tar.bz2/src/webserver/src/WebInterface.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //  
-// Copyright (c) 2004-2009 shakraw ( shakraw@users.sourceforge.net )
-// Copyright (c) 2003-2009 Kry ( elkry@sourceforge.net / http://www.amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 shakraw ( shakraw@users.sourceforge.net )
+// Copyright (c) 2003-2011 Angel Vidal ( kry@amule.org )
+// 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
@@ -24,6 +24,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 //
 
+
 #ifdef HAVE_CONFIG_H
 	#include "config.h"	// For VERSION and ENABLE_NLS
 #endif
@@ -35,332 +36,371 @@
 #ifdef __WXMAC__
 	#include <CoreFoundation/CFBundle.h> // Do_not_auto_remove
 	#include <ApplicationServices/ApplicationServices.h> // Do_not_auto_remove
-	#include <wx/mac/corefoundation/cfstring.h> // Do_not_auto_remove
+	#if wxCHECK_VERSION(2, 9, 0)
+		#include <wx/osx/core/cfstring.h>  // Do_not_auto_remove
+	#else
+		#include <wx/mac/corefoundation/cfstring.h>  // Do_not_auto_remove
+	#endif
 #endif
 
+
 #include <ec/cpp/ECFileConfig.h>	// Needed for CECFileConfig
 #include <common/MD5Sum.h>
 
+
 #include "WebServer.h"
 
+
 #include <wx/apptrait.h>
 #include <wx/socket.h>
 
+
 #ifdef ENABLE_NLS
 #	include <libintl.h>
 #endif
 
-
+#ifdef AMULEWEB28
 /*
  * Socket handling in wxBase (same as amuled)
  * 
  */
-class CSocketSet {
-		int m_count;
-		int m_fds[FD_SETSIZE], m_fd_idx[FD_SETSIZE];
-		GSocket *m_gsocks[FD_SETSIZE];
-		
-		fd_set m_set;
-    public:
-        CSocketSet();
-        void AddSocket(GSocket *);
-        void RemoveSocket(GSocket *);
-        void FillSet(int &max_fd);
-        
-        void Detected(void (GSocket::*func)());
-        
-        fd_set *Set() { return &m_set; }
+class CSocketSet
+{
+	int m_count;
+	int m_fds[FD_SETSIZE], m_fd_idx[FD_SETSIZE];
+	GSocket *m_gsocks[FD_SETSIZE];
+	fd_set m_set;
+
+public:
+	CSocketSet();
+	void AddSocket(GSocket *);
+	void RemoveSocket(GSocket *);
+	void FillSet(int &max_fd);
+	void Detected(void (GSocket::*func)());
+	fd_set *Set() { return &m_set; }
 };
 
+
 CSocketSet::CSocketSet()
 {
-    m_count = 0;
-    for(int i = 0; i < FD_SETSIZE; i++) {
-        m_fds[i] = 0;
-        m_fd_idx[i] = 0xffff;
-        m_gsocks[i] = 0;
-    }
+	m_count = 0;
+	for(int i = 0; i < FD_SETSIZE; i++) {
+		m_fds[i] = 0;
+		m_fd_idx[i] = 0xffff;
+		m_gsocks[i] = 0;
+	}
 }
 
+
 void CSocketSet::AddSocket(GSocket *socket)
 {
-    wxASSERT(socket);
-    
-    int fd = socket->m_fd;
+	wxASSERT(socket);
+
+	int fd = socket->m_fd;
+
+	if (fd == -1) {
+		return;
+	}
 
-    if ( fd == -1 ) {
-        return;
-    }
+	wxASSERT(fd >= 0 && fd < FD_SETSIZE);
 
-    wxASSERT( (fd >= 0) && (fd < FD_SETSIZE) );
-    
-    if ( m_gsocks[fd] ) {
-        return;
-    }
-    m_fds[m_count] = fd;
-    m_fd_idx[fd] = m_count;
-    m_gsocks[fd] = socket;
-    m_count++;
+	if (m_gsocks[fd]) {
+		return;
+	}
+	m_fds[m_count] = fd;
+	m_fd_idx[fd] = m_count;
+	m_gsocks[fd] = socket;
+	m_count++;
 }
 
+
 void CSocketSet::RemoveSocket(GSocket *socket)
 {
-    wxASSERT(socket);
-    
-    int fd = socket->m_fd;
-
-    if ( fd == -1 ) {
-        return;
-    }
-    
-    wxASSERT( (fd >= 0) && (fd < FD_SETSIZE) );
-    
-    int i = m_fd_idx[fd];
-    if ( i == 0xffff ) {
-        return;
-    }
-    wxASSERT(m_fds[i] == fd);
-    m_fds[i] = m_fds[m_count-1];
-    m_gsocks[fd] = 0;
-    m_fds[m_count-1] = 0;
-    m_fd_idx[fd] = 0xffff;
-    m_fd_idx[m_fds[i]] = i;
-    m_count--;
+	wxASSERT(socket);
+
+	int fd = socket->m_fd;
+
+	if (fd == -1) {
+		return;
+	}
+
+	wxASSERT(fd >= 0 && fd < FD_SETSIZE);
+
+	int i = m_fd_idx[fd];
+	if (i == 0xffff) {
+		return;
+	}
+	wxASSERT(m_fds[i] == fd);
+	m_fds[i] = m_fds[m_count-1];
+	m_gsocks[fd] = 0;
+	m_fds[m_count-1] = 0;
+	m_fd_idx[fd] = 0xffff;
+	m_fd_idx[m_fds[i]] = i;
+	m_count--;
 }
 
+
 void CSocketSet::FillSet(int &max_fd)
 {
-    FD_ZERO(&m_set);
-
-    for(int i = 0; i < m_count; i++) {
-	    FD_SET(m_fds[i], &m_set);
-	    if ( m_fds[i] > max_fd ) {
-	        max_fd = m_fds[i];
-	    }
-    }
+	FD_ZERO(&m_set);
+	for(int i = 0; i < m_count; i++) {
+		FD_SET(m_fds[i], &m_set);
+		if (m_fds[i] > max_fd) {
+			max_fd = m_fds[i];
+		}
+	}
 }
 
+
 void CSocketSet::Detected(void (GSocket::*func)())
 {
-    for (int i = 0; i < m_count; i++) {
-        int fd = m_fds[i];
-        if ( FD_ISSET(fd, &m_set) ) {
-            GSocket *socket = m_gsocks[fd];
-            (*socket.*func)();
-        }
-    }
+	for (int i = 0; i < m_count; i++) {
+		int fd = m_fds[i];
+		if (FD_ISSET(fd, &m_set)) {
+			GSocket *socket = m_gsocks[fd];
+			(*socket.*func)();
+		}
+	}
 }
 
+
 class CWebserverGSocketFuncTable : public GSocketGUIFunctionsTable
 {
-	private:
-        CSocketSet *m_in_set, *m_out_set;
-
-        wxMutex m_lock;
-	public:
-	    CWebserverGSocketFuncTable();
-	
-	    void AddSocket(GSocket *socket, GSocketEvent event);
-	    void RemoveSocket(GSocket *socket, GSocketEvent event);
-	    void RunSelect();
-	
-	    virtual bool OnInit();
-	    virtual void OnExit();
-	    virtual bool CanUseEventLoop();
-	    virtual bool Init_Socket(GSocket *socket);
-	    virtual void Destroy_Socket(GSocket *socket);
-	    virtual void Install_Callback(GSocket *socket, GSocketEvent event);
-	    virtual void Uninstall_Callback(GSocket *socket, GSocketEvent event);
-	    virtual void Enable_Events(GSocket *socket);
-	    virtual void Disable_Events(GSocket *socket);
+private:
+	CSocketSet *m_in_set;
+	CSocketSet *m_out_set;
+	wxMutex m_lock;
+
+public:
+	CWebserverGSocketFuncTable();
+
+	void AddSocket(GSocket *socket, GSocketEvent event);
+	void RemoveSocket(GSocket *socket, GSocketEvent event);
+	void RunSelect();
+
+	virtual bool OnInit();
+	virtual void OnExit();
+	virtual bool CanUseEventLoop();
+	virtual bool Init_Socket(GSocket *socket);
+	virtual void Destroy_Socket(GSocket *socket);
+	virtual void Install_Callback(GSocket *socket, GSocketEvent event);
+	virtual void Uninstall_Callback(GSocket *socket, GSocketEvent event);
+	virtual void Enable_Events(GSocket *socket);
+	virtual void Disable_Events(GSocket *socket);
 };
 
+
 CWebserverGSocketFuncTable::CWebserverGSocketFuncTable() : m_lock(wxMUTEX_RECURSIVE)
 {
-    m_in_set = new CSocketSet;
-    m_out_set = new CSocketSet;
-    
-    m_lock.Unlock();
+	m_in_set = new CSocketSet;
+	m_out_set = new CSocketSet;
+	m_lock.Unlock();
 }
 
 void CWebserverGSocketFuncTable::AddSocket(GSocket *socket, GSocketEvent event)
 {
-    wxMutexLocker lock(m_lock);
-
-    if ( event == GSOCK_INPUT ) {
-        m_in_set->AddSocket(socket);
-    } else {
-        m_out_set->AddSocket(socket);
-    }
+	wxMutexLocker lock(m_lock);
+	if (event == GSOCK_INPUT) {
+		m_in_set->AddSocket(socket);
+	} else {
+		m_out_set->AddSocket(socket);
+	}
 }
 
 void CWebserverGSocketFuncTable::RemoveSocket(GSocket *socket, GSocketEvent event)
 {
-    wxMutexLocker lock(m_lock);
-
-    if ( event == GSOCK_INPUT ) {
-        m_in_set->RemoveSocket(socket);
-    } else {
-        m_out_set->RemoveSocket(socket);
-    }
+	wxMutexLocker lock(m_lock);
+	if (event == GSOCK_INPUT) {
+		m_in_set->RemoveSocket(socket);
+	} else {
+		m_out_set->RemoveSocket(socket);
+	}
 }
 
 void CWebserverGSocketFuncTable::RunSelect()
 {
-    wxMutexLocker lock(m_lock);
+	wxMutexLocker lock(m_lock);
+
+	int max_fd = -1;
+	m_in_set->FillSet(max_fd);
+	m_out_set->FillSet(max_fd);
 
-    int max_fd = -1;
-    m_in_set->FillSet(max_fd);
-    m_out_set->FillSet(max_fd);
+	struct timeval tv;
+	tv.tv_sec = 0;
+	tv.tv_usec = 10000; // 10ms
 
-    struct timeval tv;
-    tv.tv_sec = 0;
-    tv.tv_usec = 10000; // 10ms
-    
-    int result = select(max_fd + 1, m_in_set->Set(), m_out_set->Set(), 0, &tv);
-    if ( result > 0 ) {
-        m_in_set->Detected(&GSocket::Detected_Read);
-        m_out_set->Detected(&GSocket::Detected_Write);
-    }
-    
+	int result = select(max_fd + 1, m_in_set->Set(), m_out_set->Set(), 0, &tv);
+	if (result > 0) {
+		m_in_set->Detected(&GSocket::Detected_Read);
+		m_out_set->Detected(&GSocket::Detected_Write);
+	}
 }
 
+
 bool CWebserverGSocketFuncTable::OnInit()
 {
-    return true;
+	return true;
 }
 
+
 void CWebserverGSocketFuncTable::OnExit()
 {
 }
 
+
 bool CWebserverGSocketFuncTable::CanUseEventLoop()
 {
-    return false;
+	return false;
 }
 
+
 bool CWebserverGSocketFuncTable::Init_Socket(GSocket *)
 {
-    return true;
+	return true;
 }
 
+
 void CWebserverGSocketFuncTable::Destroy_Socket(GSocket *)
 {
 }
 
+
 void CWebserverGSocketFuncTable::Install_Callback(GSocket *sock, GSocketEvent e)
 {
-    AddSocket(sock, e);
+	AddSocket(sock, e);
 }
 
+
 void CWebserverGSocketFuncTable::Uninstall_Callback(GSocket *sock, GSocketEvent e)
 {
-    RemoveSocket(sock, e);
+	RemoveSocket(sock, e);
 }
 
+
 void CWebserverGSocketFuncTable::Enable_Events(GSocket *socket)
 {
-    Install_Callback(socket, GSOCK_INPUT);
-    Install_Callback(socket, GSOCK_OUTPUT);
+	Install_Callback(socket, GSOCK_INPUT);
+	Install_Callback(socket, GSOCK_OUTPUT);
 }
 
+
 void CWebserverGSocketFuncTable::Disable_Events(GSocket *socket)
 {
-    Uninstall_Callback(socket, GSOCK_INPUT);
-    Uninstall_Callback(socket, GSOCK_OUTPUT);
+	Uninstall_Callback(socket, GSOCK_INPUT);
+	Uninstall_Callback(socket, GSOCK_OUTPUT);
 }
 
+
 class CWebserverAppTraits : public wxConsoleAppTraits
 {
-	private:
-	    CWebserverGSocketFuncTable *m_table;
-	    wxMutex m_lock;
-	    std::list<wxObject *> m_sched_delete;
-	public:
-	    CWebserverAppTraits(CWebserverGSocketFuncTable *table);
-	    virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
-	    virtual void ScheduleForDestroy(wxObject *object);
-	    virtual void RemoveFromPendingDelete(wxObject *object);
-	
-	    void DeletePending();
+private:
+	CWebserverGSocketFuncTable *m_table;
+	wxMutex m_lock;
+	std::list<wxObject *> m_sched_delete;
+
+public:
+	CWebserverAppTraits(CWebserverGSocketFuncTable *table);
+	virtual GSocketGUIFunctionsTable* GetSocketGUIFunctionsTable();
+	virtual void ScheduleForDestroy(wxObject *object);
+	virtual void RemoveFromPendingDelete(wxObject *object);
+	void DeletePending();
 };
 
+
 CWebserverAppTraits::CWebserverAppTraits(CWebserverGSocketFuncTable *table)
-: wxConsoleAppTraits(), m_table(table),m_lock(wxMUTEX_RECURSIVE), m_sched_delete()
+:
+wxConsoleAppTraits(),
+m_table(table),m_lock(wxMUTEX_RECURSIVE),
+m_sched_delete()
 {
-    m_lock.Unlock();
+	m_lock.Unlock();
 }
 
+
 GSocketGUIFunctionsTable *CWebserverAppTraits::GetSocketGUIFunctionsTable()
 {
-    return m_table;
+	return m_table;
 }
 
+
 void CWebserverAppTraits::ScheduleForDestroy(wxObject *object)
 {
-        wxMutexLocker lock(m_lock);
-
-        m_sched_delete.push_back(object);
+	wxMutexLocker lock(m_lock);
+	m_sched_delete.push_back(object);
 }
 
+
 void CWebserverAppTraits::RemoveFromPendingDelete(wxObject *object)
 {
-    wxMutexLocker lock(m_lock);
+	wxMutexLocker lock(m_lock);
 
-    for(std::list<wxObject *>::iterator i = m_sched_delete.begin();
-    i != m_sched_delete.end(); i++) {
-        if ( *i == object ) {
-                m_sched_delete.erase(i);
-                return;
-        }
-    }
+	for(std::list<wxObject *>::iterator i = m_sched_delete.begin();
+	    i != m_sched_delete.end(); i++) {
+		if (*i == object) {
+			m_sched_delete.erase(i);
+			return;
+		}
+	}
 }
 
+
 void CWebserverAppTraits::DeletePending()
 {
-    wxMutexLocker lock(m_lock);
+	wxMutexLocker lock(m_lock);
 
-    while ( !m_sched_delete.empty() ) {
-        std::list<wxObject *>::iterator i = m_sched_delete.begin();
-        wxObject *object = *i;
-        delete object;
-    }
+	while (!m_sched_delete.empty()) {
+		std::list<wxObject *>::iterator i = m_sched_delete.begin();
+		wxObject *object = *i;
+		delete object;
+	}
 }
 
 
-
-//-------------------------------------------------------------------
-IMPLEMENT_APP(CamulewebApp)
-//-------------------------------------------------------------------
-
-BEGIN_EVENT_TABLE(CamulewebApp, CaMuleExternalConnector)
-END_EVENT_TABLE()
-
 CamulewebApp::CamulewebApp() : m_table(new CWebserverGSocketFuncTable)
 {
 	wxPendingEventsLocker = new wxCriticalSection;
 }
 
+
 wxAppTraits *CamulewebApp::CreateTraits()
 {
 	return new CWebserverAppTraits(m_table);
 }
 
-void CamulewebApp::Post_Shell() {
+#endif
+
+//-------------------------------------------------------------------
+IMPLEMENT_APP(CamulewebApp)
+//-------------------------------------------------------------------
+
+
+BEGIN_EVENT_TABLE(CamulewebApp, CaMuleExternalConnector)
+END_EVENT_TABLE()
+
+void CamulewebApp::Post_Shell()
+{
 	m_webserver->StopServer();
 	delete m_webserver;
 	m_webserver = 0;
 }
 
-bool CamulewebApp::OnInit() {
+
+bool CamulewebApp::OnInit()
+{
 	return CaMuleExternalConnector::OnInit();
 }
 
-int CamulewebApp::OnRun() {
+#ifndef VERSION
+#include <common/ClientVersion.h>
+#endif
+
+int CamulewebApp::OnRun()
+{
 	ConnectAndRun(wxT("aMuleweb"), wxT(VERSION));
 	return 0;
 }
 
+
 bool CamulewebApp::CheckDirForTemplate(wxString& dir, const wxString& tmpl)
 {
 	DebugShow(wxT("checking for directory '") + dir + wxT("'..."));
@@ -370,9 +410,7 @@
 		DebugShow(wxT("checking for directory '") + dir + wxT("'..."));
 		if (wxFileName::DirExists(dir)) {
 			DebugShow(wxT(" yes\n"));
-
 			wxString tmplPath = JoinPaths(dir, wxT("login.php"));
-
 			DebugShow(wxT("checking for file '") + tmplPath + wxT("'..."));
 			if (wxFileName::FileExists(tmplPath)) {
 				DebugShow(wxT(" yes\n"));
@@ -387,6 +425,7 @@
 	} else {
 		DebugShow(wxT(" no\n"));
 	}
+
 	return false;
 }
 
@@ -404,21 +443,15 @@
 		kLSUnknownCreator,
 		// This magic string is the bundle identifier in aMule.app's Info.plist
 		CFSTR("org.amule.aMule"),
-		NULL,
-		NULL,
-		&amuleBundleUrl
-		);
+		NULL, NULL, &amuleBundleUrl);
 	if (status == noErr && amuleBundleUrl) {
 		CFBundleRef amuleBundle = CFBundleCreate(NULL, amuleBundleUrl);
 		CFRelease(amuleBundleUrl);
-		
 		if (amuleBundle) {
 			CFURLRef webserverDirUrl = CFBundleCopyResourceURL(
 				amuleBundle,
 				CFSTR("webserver"),
-				NULL,
-				NULL
-				);
+				NULL, NULL);
 			CFRelease(amuleBundle);
 			if (webserverDirUrl) {
 				CFURLRef absoluteURL =
@@ -430,8 +463,13 @@
 							absoluteURL,
 							kCFURLPOSIXPathStyle);
 					CFRelease(absoluteURL);
-					dir = wxMacCFStringHolder(pathString).
+					#if wxCHECK_VERSION(2, 9, 0)
+						dir = wxCFStringRef(pathString).
+						AsString(wxLocale::GetSystemEncoding());
+					#else
+						dir = wxMacCFStringHolder(pathString).
 						AsString(wxLocale::GetSystemEncoding());
+					#endif
 					if (CheckDirForTemplate(dir, templateName)) {
 						templateDir = dir;
 						return true;
@@ -442,32 +480,33 @@
 	}
 #endif
 
-	dir = GetConfigDir() + wxT("webserver");
+	dir = GetConfigDir(wxT("remote.conf")) + wxT("webserver");
 	if (CheckDirForTemplate(dir, templateName)) {
 		templateDir = dir;
 		m_localTemplate = true;
 		return true;
 	}
+#ifdef WEBSERVERDIR
 	dir = wxT(WEBSERVERDIR);
 	if (CheckDirForTemplate(dir, templateName)) {
 		templateDir = dir;
 		return true;
 	}
+#endif
 	
-#ifdef __WXGTK__
-	// Returns 'aMule' when we use 'amule' elsewhere
-	dir = wxStandardPaths::Get().GetDataDir();
+	dir = wxStandardPaths::Get().GetResourcesDir();	// Returns 'aMule' when we use 'amule' elsewhere
+#if !defined(__WXMSW__) && !defined(__WXMAC__)
 	dir = dir.BeforeLast(wxFileName::GetPathSeparator());
-	dir = JoinPaths(dir, JoinPaths(wxT("amule"), wxT("webserver")));
+	dir = JoinPaths(dir, wxT("amule"));
+#endif
+	dir = JoinPaths(dir, wxT("webserver"));
 	if (CheckDirForTemplate(dir, templateName)) {
 		templateDir = dir;
 		return true;
 	}
-#endif
-
 	
 	// template not found. reverting to default
-	const wxChar* const defaultTemplateName = wxT("php-default");
+	const wxChar* const defaultTemplateName = wxT("default");
 
 	if ( templateName == defaultTemplateName ) {
 		return false;
@@ -476,9 +515,10 @@
 	return GetTemplateDir(defaultTemplateName, templateDir);
 }
 
+
 void CamulewebApp::OnInitCmdLine(wxCmdLineParser& amuleweb_parser)
 {
-	CaMuleExternalConnector::OnInitCmdLine(amuleweb_parser);
+	CaMuleExternalConnector::OnInitCmdLine(amuleweb_parser, "amuleweb");
 	amuleweb_parser.AddOption(wxT("t"), wxT("template"), 
 		_("Loads template <str>"), 
 		wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
@@ -542,9 +582,9 @@
 	amuleweb_parser.AddSwitch(wxT("N"), wxT("no-script-cache"), 
 		_("Recompile PHP pages on each request"),
 		wxCMD_LINE_PARAM_OPTIONAL);
-
 }
 
+
 bool CamulewebApp::OnCmdLineParsed(wxCmdLineParser& parser)
 {
 	wxString aMuleConfigFile;
@@ -559,30 +599,32 @@
 		LoadAmuleConfig(cfg);
 		// do not process any other command-line parameters, use defaults instead
 
-		if (!(m_TemplateOk = GetTemplateDir(m_TemplateName, m_TemplateDir))) {
-			// no reason to run webserver without a template
-			fprintf(stderr, "FATAL ERROR: Cannot find template: %s\n", (const char *)unicode2char(m_TemplateName));
-			return true;
-		}
 		m_Verbose = false;
 		m_KeepQuiet = true;
 		m_LoadSettingsFromAmule = true;
+
+		if (!(m_TemplateOk = GetTemplateDir(m_TemplateName, m_TemplateDir))) {
+			// no reason to run webserver without a template
+			fprintf(stderr, "FATAL ERROR: Cannot find template: %s\n",
+				(const char *)unicode2char(m_TemplateName));
+			return false;
+		}
 		return true;
 	}
 
 	if (CaMuleExternalConnector::OnCmdLineParsed(parser)) {
-
 		if ( parser.Found(wxT("no-php")) ) {
 			fprintf(stderr, "WARNING: --no-php switch have no effect. Long live PHP\n");
 		}
 
 		parser.Found(wxT("template"), &m_TemplateName);
 		if (m_TemplateName.IsEmpty()) {
-			m_TemplateName = wxT("php-default");
+			m_TemplateName = wxT("default");
 		}
 		if (!(m_TemplateOk = GetTemplateDir(m_TemplateName, m_TemplateDir))) {
 			// no reason to run webserver without a template
-			fprintf(stderr, "FATAL ERROR: Cannot find template: %s\n", (const char *)unicode2char(m_TemplateName));
+			fprintf(stderr, "FATAL ERROR: Cannot find template: %s\n",
+				(const char *)unicode2char(m_TemplateName));
 			return true;
 		}
 
@@ -633,14 +675,17 @@
 	}
 }
 
+
 const wxString CamulewebApp::GetGreetingTitle()
 {
 	return _("aMule Web Server");
 }
 
-void CamulewebApp::Pre_Shell() {
-	//Creating the web server
-	if ( m_TemplateOk ) {
+
+void CamulewebApp::Pre_Shell()
+{
+	// Creating the web server
+	if (m_TemplateOk) {
 		m_webserver = new CScriptWebServer(this, m_TemplateDir);
 	} else {
 		m_webserver = new CNoTemplateWebServer(this);
@@ -648,15 +693,25 @@
 	m_webserver->StartServer();
 }
 
+
 void CamulewebApp::TextShell(const wxString &)
 {
-	while ( true ) {
+#ifdef AMULEWEB28
+	while (true) {
 		m_table->RunSelect();
 		ProcessPendingEvents();
 		((CWebserverAppTraits *)GetTraits())->DeletePending();
 	}
+#else
+
+#ifndef AMULEWEB_DUMMY
+	wxApp::OnRun();
+#endif
+
+#endif
 }
 
+
 void CamulewebApp::LoadAmuleConfig(CECFileConfig& cfg)
 {
 	CaMuleExternalConnector::LoadAmuleConfig(cfg);
@@ -672,6 +727,7 @@
 	m_TemplateName = cfg.Read(wxT("/WebServer/Template"), wxT("default"));
 }
 
+
 void CamulewebApp::LoadConfigFile()
 {
 	CaMuleExternalConnector::LoadConfigFile();
@@ -690,6 +746,7 @@
 	}
 }
 
+
 void CamulewebApp::SaveConfigFile()
 {
 	CaMuleExternalConnector::SaveConfigFile();
@@ -706,12 +763,14 @@
 	}
 }
 
+
 #ifdef ENABLE_NLS
 static inline bool CheckDirForMessageCatalog(const wxString& dir, const wxString& lang, const wxString& domain)
 {
 	return wxFileName::FileExists(JoinPaths(dir, JoinPaths(lang, JoinPaths(wxT("LC_MESSAGES"), domain + wxT(".mo")))));
 }
 
+
 static inline bool DirHasMessageCatalog(const wxString& dir, const wxString& lang, const wxString& domain)
 {
 	if (!CheckDirForMessageCatalog(dir, lang, domain)) {
@@ -733,6 +792,7 @@
 }
 #endif
 
+
 wxString CamulewebApp::SetLocale(const wxString& language)
 {
 	wxString lang = CaMuleExternalConnector::SetLocale(language); // will call setlocale() for us
@@ -741,10 +801,8 @@
 	// no locale change was requested, or, in the worst case, if the last locale change didn't succeed.
 	if (!lang.IsEmpty()) {
 		DebugShow(wxT("*** Language set to: ") + lang + wxT(" ***\n"));
-
 #ifdef ENABLE_NLS
 		wxString domain = wxT("amuleweb-") + m_TemplateName;
-
 		Unicode2CharBuf domainBuf = unicode2char(domain);
 		const char *c_domain = (const char *)domainBuf;
 
@@ -775,17 +833,14 @@
 		} else {
 			DebugShow(wxT("yes\n"));
 		}
-
 		// If we found something, then use it otherwise it may still be present at the system default location
 		if (!dir.IsEmpty()) {
 			Unicode2CharBuf buffer = unicode2char(dir);
 			const char *c_dir = (const char *)buffer;
 			bindtextdomain(c_domain, c_dir);
 		}
-
 		// We need to have the returned messages in UTF-8
 		bind_textdomain_codeset(c_domain, "UTF-8");
-
 		// And finally select the message catalog
 		textdomain(c_domain);
 #endif /* ENABLE_NLS */
@@ -793,4 +848,5 @@
 
 	return lang;
 }
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/webserver/src/WebInterface.h -> aMule-2.3.1.tar.bz2/src/webserver/src/WebInterface.h Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //  
-// Copyright (c) 2004-2009 shakraw ( shakraw@users.sourceforge.net )
-// Copyright (c) 2003-2009 Kry ( elkry@sourceforge.net )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 shakraw ( shakraw@users.sourceforge.net )
+// Copyright (c) 2004-2011 Angel Vidal ( kry@amule.org )
+// 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
@@ -29,16 +29,31 @@
 
 #include "ExternalConnector.h"
 
+
+#if !wxCHECK_VERSION(2, 9, 0)
+	#ifdef __WXMSW__
+		// MSW: can't run amuled with 2.8 anyway, just get it compiled
+		#define AMULEWEB_DUMMY
+	#else
+		#define AMULEWEB28
+	#endif
+#endif
+
+
 class CamulewebApp
 :
 public CaMuleExternalConnector
 {
-    class CWebserverGSocketFuncTable *m_table;
 	class CWebServerBase *m_webserver;
 
+#ifdef AMULEWEB28
+	class CWebserverGSocketFuncTable *m_table;
 public:
+	wxAppTraits *CreateTraits();
 	CamulewebApp();
-	
+#endif
+
+public:
 	const wxString GetGreetingTitle();
 	void Pre_Shell();
 	void LoadConfigFile();
@@ -69,8 +84,6 @@
 public:
 	virtual void Post_Shell();
 
-	wxAppTraits *CreateTraits();
-
 	void TextShell(const wxString &prompt);
 
 	virtual wxString SetLocale(const wxString& language);

aMule-2.2.6.tar.bz2/src/webserver/src/WebServer.cpp -> aMule-2.3.1.tar.bz2/src/webserver/src/WebServer.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 Kry ( elkry@sourceforge.net / http://www.amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -25,8 +25,9 @@
 //
 
 
-#include <cmath> // Needed for cos, M_PI
-#include <string> // Do_not_auto_remove (g++-4.0.1)
+#include <cctype>	// Needed for std::toupper()
+#include <wx/math.h>	// Needed for cos, M_PI
+#include <string>	// Do_not_auto_remove (g++-4.0.1)
 
 #include <wx/datetime.h>
 
@@ -43,12 +44,21 @@
 //-------------------------------------------------------------------
 
 #include "WebSocket.h"		// Needed for StopSockets()
-#include "Color.h"		// Needed for COLORREF and RGB()
 
 #include "php_syntree.h"
 #include "php_core_lib.h"
 
 //-------------------------------------------------------------------
+typedef uint32_t COLORTYPE;
+
+#ifdef RGB
+#undef RGB
+#endif
+
+inline unsigned long RGB(int r, int g, int b)
+{
+	return ((b & 0xff) << 16) | ((g & 0xff) << 8) | (r & 0xff);
+}
 
 inline void set_rgb_color_val(unsigned char *start, uint32 val, unsigned char mod)
 {
@@ -134,48 +144,35 @@
 }
 
 /*
- * Url string decoder and parser
+ * Url string decoder
  */
-CUrlDecodeTable::CUrlDecodeTable()
-{
-	for (int i = 0 ; i < 256 ; i++) {
-		char fromReplace[4];		// decode URL
-		snprintf(fromReplace, sizeof(fromReplace), "%%%02x", i);
-		m_enc_l_str[i] = char2unicode(fromReplace);
-
-		snprintf(fromReplace, sizeof(fromReplace), "%%%02X", i);
-		m_enc_u_str[i] = char2unicode(fromReplace);
-
-		m_dec_str[i] = wxString::Format(wxT("%c"), i);
-	}
-}
-
-void CUrlDecodeTable::DecodeString(wxString &str)
+wxString CURLDecoder::Decode(const wxString& url)
 {
-	str.Replace(wxT("+"), wxT(" "));
-	for (int i = 0 ; i < 256 ; ++i) {
-		str.Replace(m_enc_l_str[i], m_dec_str[i]);
-		str.Replace(m_enc_u_str[i], m_dec_str[i]);
-	}
-	size_t n = str.Len();
+	size_t n = url.length();
 	std::vector<char> buffer(n + 1);
-	for (size_t i = 0; i < n; ++i) {
-		buffer[i] = str[i];
+	size_t i, j;
+
+	for (i = 0, j = 0; i < n; i++, j++) {
+		if (url[i] == wxT('+')) {
+			buffer[j] = ' ';
+		} else if (url[i] == wxT('%') && i < n - 2) {
+			char ch1 = std::toupper(url[i+1]);
+			char ch2 = std::toupper(url[i+2]);
+			if (((ch1 >= '0' && ch1 <= '9') || (ch1 >= 'A' && ch1 <= 'F')) &&
+			    ((ch2 >= '0' && ch2 <= '9') || (ch2 >= 'A' && ch2 <= 'F'))) {
+				i += 2;
+				buffer[j] = ((ch1 > '9' ? ch1 - 'A' + 10 : ch1 - '0') << 4) | (ch2 > '9' ? ch2 - 'A' + 10 : ch2 - '0');
+			} else {
+				// Invalid %-escape sequence
+				buffer[j] = url[i];
+			}
+		} else {
+			buffer[j] = url[i];
+		}
 	}
-	buffer[n] = 0; // Mark the end of the string
-	str = UTF82unicode(&buffer[0]);
-}
-
-CUrlDecodeTable*	CUrlDecodeTable::ms_instance;
-wxCriticalSection	CUrlDecodeTable::ms_instance_guard;
+	buffer[j] = '\0';
 
-CUrlDecodeTable* CUrlDecodeTable::GetInstance()
-{
-	wxCriticalSectionLocker lock(ms_instance_guard);
-	if (ms_instance == NULL) {
-		ms_instance = new CUrlDecodeTable();
-	}
-	return ms_instance;
+	return UTF82unicode(&buffer[0]);
 }
 
 CParsedUrl::CParsedUrl(const wxString &url)
@@ -192,15 +189,15 @@
 		
 		wxStringTokenizer tkz(params, wxT("&"));
 		while ( tkz.HasMoreTokens() ) {
-	    	wxString param_val = tkz.GetNextToken();
-	    	wxString key = param_val.BeforeFirst('=');
-	    	wxString val = param_val.AfterFirst('=');
-	    	CUrlDecodeTable::GetInstance()->DecodeString(val);
-	    	if ( m_params.count(key) ) {
-	    		m_params[key] = m_params[key] + wxT("|") + val;
-	    	} else {
-	    		m_params[key] = val;
-	    	}
+			wxString param_val = tkz.GetNextToken();
+			wxString key = param_val.BeforeFirst('=');
+			wxString val = param_val.AfterFirst('=');
+			val = CURLDecoder::Decode(val);
+			if ( m_params.count(key) ) {
+				m_params[key] = m_params[key] + wxT("|") + val;
+			} else {
+				m_params[key] = val;
+			}
 		}
     }
 }
@@ -215,7 +212,7 @@
 
 BEGIN_EVENT_TABLE(CWebServerBase, wxEvtHandler)
 	EVT_SOCKET(ID_WEBLISTENSOCKET_EVENT, CWebServerBase::OnWebSocketServerEvent)
-	EVT_SOCKET(ID_WEBCLIENTSOCKET_ENENT, CWebServerBase::OnWebSocketEvent)
+	EVT_SOCKET(ID_WEBCLIENTSOCKET_EVENT, CWebServerBase::OnWebSocketEvent)
 END_EVENT_TABLE()
 
 CWebServerBase::CWebServerBase(CamulewebApp *webApp, const wxString& templateDir) :
@@ -301,7 +298,7 @@
     	webInterface->Show(_("web client connection accepted\n"));
     } else {
     	delete client;
-    	webInterface->Show(_("ERROR: can not accept web client connection\n"));
+    	webInterface->Show(_("ERROR: cannot accept web client connection\n"));
     }
 }
 
@@ -331,12 +328,11 @@
 void CScriptWebServer::ProcessImgFileReq(ThreadData Data)
 {
 	webInterface->DebugShow(wxT("**** imgrequest: ") + Data.sURL + wxT("\n"));
-	wxMutexLocker lock(m_mutexChildren);
 
 	const CSession* session = CheckLoggedin(Data);
 
 	// To prevent access to non-template images, we disallow use of paths in filenames.
-	wxString imgName = wxFileName::GetPathSeparator() + wxFileName(Data.parsedURL.File()).GetFullName();
+	wxString imgName = wxT("/") + wxFileName(Data.parsedURL.File()).GetFullName();
 	CAnyImage *img = m_ImageLib.GetImage(imgName);
 	
 	// Only static images are available to visitors, in order to prevent
@@ -346,7 +342,7 @@
 		unsigned char* img_data = img->RequestData(img_size);
 		// This unicode2char is ok.
 		Data.pSocket->SendContent(unicode2char(img->GetHTTP()), img_data, img_size);
-	} else if (not session->m_loggedin) {
+	} else if (!session->m_loggedin) {
 		webInterface->DebugShow(wxT("**** imgrequest: failed, not logged in\n"));
 		ProcessURL(Data);
 	} else {
@@ -361,15 +357,15 @@
 	const CECTag *tag = NULL;
 	if (reply) {
 		if ( reply->GetOpCode() == EC_OP_STRINGS ) {
-			for(int i = 0; i < reply->GetTagCount(); ++i) {
-				if (	(tag = reply->GetTagByIndex(i)) &&
-					(tag->GetTagName() == EC_TAG_STRING)) {
+			for (CECPacket::const_iterator it = reply->begin(); it != reply->end(); it++) {
+				tag = & *it;
+				if (tag->GetTagName() == EC_TAG_STRING) {
 					webInterface->Show(tag->GetStringData());
 				}
 			}
 		} else if (reply->GetOpCode() == EC_OP_FAILED) {
-			if (	reply->GetTagCount() &&
-				(tag = reply->GetTagByIndex(0)) ) {
+			tag = reply->GetFirstTagSafe();
+			if (tag->IsString()) {
 				webInterface->Show(
 					CFormat(_("Request failed with the following error: %s.")) %
 					wxString(wxGetTranslation(tag->GetStringData())));
@@ -395,14 +391,14 @@
 		ec_cmd = new CECPacket(EC_OP_SHARED_SET_PRIO);
 		hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)opt_arg));
 	} else if ( cmd == wxT("prioup") ) {
-		SharedFile *file = m_SharedFileInfo.GetByID(fileHash);
+		SharedFile *file = m_SharedFileInfo.GetByHash(fileHash);
 		if ( file ) {
 			ec_cmd = new CECPacket(EC_OP_SHARED_SET_PRIO);
 			hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO,
 				GetHigherPrioShared(file->nFilePriority, file->bFileAutoPriority)));
 		}
 	} else if ( cmd == wxT("priodown") ) {
-		SharedFile *file = m_SharedFileInfo.GetByID(fileHash);
+		SharedFile *file = m_SharedFileInfo.GetByHash(fileHash);
 		if ( file ) {
 			ec_cmd = new CECPacket(EC_OP_SHARED_SET_PRIO);
 			hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO,
@@ -440,14 +436,14 @@
 		ec_cmd = new CECPacket(EC_OP_PARTFILE_PRIO_SET);
 		hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO, (uint8)opt_arg));
 	} else if (cmd == wxT("prioup")) {
-		DownloadFile *file = m_DownloadFileInfo.GetByID(fileHash);
+		DownloadFile *file = m_DownloadFileInfo.GetByHash(fileHash);
 		if ( file ) {
 			ec_cmd = new CECPacket(EC_OP_PARTFILE_PRIO_SET);
 			hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO,
 				GetHigherPrio(file->lFilePrio, file->bFileAutoPriority)));
 		}
 	} else if (cmd == wxT("priodown")) {
-		DownloadFile *file = m_DownloadFileInfo.GetByID(fileHash);
+		DownloadFile *file = m_DownloadFileInfo.GetByHash(fileHash);
 		if ( file ) {
 			ec_cmd = new CECPacket(EC_OP_PARTFILE_PRIO_SET);
 			hashtag.AddTag(CECTag(EC_TAG_PARTFILE_PRIO,
@@ -479,14 +475,8 @@
 {
 	CECPacket ec_cmd(EC_OP_SERVER_ADD);
 
-	addr.Trim();
-	port.Trim();
-	
-	CECTag srv_tag(EC_TAG_SERVER, addr + wxT(":") + port);
-	srv_tag.AddTag(CECTag(EC_TAG_SERVER_ADDRESS, addr + wxT(":") + port));
-	srv_tag.AddTag(CECTag(EC_TAG_SERVER_NAME, name));
-	
-	ec_cmd.AddTag(srv_tag);
+	ec_cmd.AddTag(CECTag(EC_TAG_SERVER_ADDRESS, addr.Trim() + wxT(":") + port.Trim()));
+	ec_cmd.AddTag(CECTag(EC_TAG_SERVER_NAME, name));
 	
 	Send_Discard_V2_Request(&ec_cmd);
 }
@@ -597,7 +587,7 @@
 	
 }
 
-bool ServersInfo::ServersInfo::ReQuery()
+bool ServersInfo::ReQuery()
 {
 	CECPacket srv_req(EC_OP_GET_SERVER_LIST);
 	const CECPacket *srv_reply = m_webApp->SendRecvMsg_v2(&srv_req);
@@ -607,8 +597,8 @@
 	//
 	// query succeded - flush existing values and refill
 	EraseAll();
-	for (int i = 0; i < srv_reply->GetTagCount(); ++i) {
-		const CECTag *tag = srv_reply->GetTagByIndex(i);
+	for (CECPacket::const_iterator it = srv_reply->begin(); it != srv_reply->end(); it++) {
+		const CECTag *tag = & *it;
 		
 		ServerEntry Entry;
 		Entry.sServerName =
@@ -632,12 +622,12 @@
 }
 
 
-SharedFile::SharedFile(CEC_SharedFile_Tag *tag)
+SharedFile::SharedFile(CEC_SharedFile_Tag *tag) : CECID(tag->ID())
 {
 		sFileName = _SpecialChars(tag->FileName());
 		lFileSize = tag->SizeFull();
 		sED2kLink = _SpecialChars(tag->FileEd2kLink());
-		nHash = tag->ID();
+		nHash = tag->FileHash();
 		
 		ProcessUpdate(tag);
 }
@@ -651,7 +641,7 @@
 	nFileAccepts = tag->GetAccepts();
 	nFileAllTimeAccepts = tag->GetAllAccepts();
 	sFileHash = nHash.Encode();
-	nFilePriority = tag->Prio();
+	nFilePriority = tag->UpPrio();
 	if ( nFilePriority >= 10 ) {
 		bFileAutoPriority = true;
 		nFilePriority -= 10;
@@ -668,7 +658,7 @@
 SharedFileInfo *SharedFileInfo::m_This = 0;
 
 SharedFileInfo::SharedFileInfo(CamulewebApp *webApp) :
-	UpdatableItemsContainer<SharedFile, CEC_SharedFile_Tag, CMD4Hash>(webApp)
+	UpdatableItemsContainer<SharedFile, CEC_SharedFile_Tag, uint32>(webApp)
 {
 	m_This = this;
 }
@@ -682,9 +672,9 @@
 }
 
 
-DownloadFile::DownloadFile(CEC_PartFile_Tag *tag)
+DownloadFile::DownloadFile(CEC_PartFile_Tag *tag) : CECID(tag->ID())
 {
-	nHash = tag->ID();
+	nHash = tag->FileHash();
 	sFileName = _SpecialChars(tag->FileName());
 	lFileSize = tag->SizeFull();
 	sFileHash = nHash.Encode();
@@ -695,8 +685,6 @@
 	fCompleted = (100.0*lFileCompleted) / lFileSize;
 	wxtLastSeenComplete = wxDateTime( tag->LastSeenComplete() );
 	
-	m_Encoder = PartFileEncoderData( (lFileSize + (PARTSIZE - 1)) / PARTSIZE, 10);
-
 	ProcessUpdate(tag);							
 }
 
@@ -706,7 +694,7 @@
 		return;
 	}
 	
-	lFilePrio = tag->Prio();
+	lFilePrio = tag->DownPrio();
 	if ( lFilePrio >= 10 ) {
 		lFilePrio -= 10;
 		bFileAutoPriority = true;
@@ -731,17 +719,21 @@
 	CECTag *gaptag = tag->GetTagByName(EC_TAG_PARTFILE_GAP_STATUS);
 	CECTag *parttag = tag->GetTagByName(EC_TAG_PARTFILE_PART_STATUS);
 	CECTag *reqtag = tag->GetTagByName(EC_TAG_PARTFILE_REQ_STATUS);
-	if (gaptag && parttag && reqtag) {
-		m_Encoder.Decode(
-			(unsigned char *)gaptag->GetTagData(), gaptag->GetTagDataLen(),
-			(unsigned char *)parttag->GetTagData(), parttag->GetTagDataLen());
 
-		const Gap_Struct *reqparts = (const Gap_Struct *)reqtag->GetTagData();
-		int reqcount = reqtag->GetTagDataLen() / sizeof(Gap_Struct);
+	if (gaptag) {
+		m_Encoder.DecodeGaps(gaptag, m_Gaps);
+	}
+	if (parttag) {
+		m_Encoder.DecodeParts(parttag, m_PartInfo);
+	}
+	if (reqtag) {
+		ArrayOfUInts64 reqs;
+		m_Encoder.DecodeReqs(reqtag, reqs);
+		int reqcount = reqs.size() / 2;
 		m_ReqParts.resize(reqcount);
 		for (int i = 0; i < reqcount;i++) {
-			m_ReqParts[i].start = ENDIAN_NTOHLL(reqparts[i].start);
-			m_ReqParts[i].end   = ENDIAN_NTOHLL(reqparts[i].end);
+			m_ReqParts[i].start = reqs[2*i];
+			m_ReqParts[i].end   = reqs[2*i+1];
 		}
 	}
 }
@@ -754,7 +746,7 @@
 DownloadFileInfo *DownloadFileInfo::m_This = 0;
 
 DownloadFileInfo::DownloadFileInfo(CamulewebApp *webApp, CImageLib *imlib) :
-	UpdatableItemsContainer<DownloadFile, CEC_PartFile_Tag, CMD4Hash>(webApp)
+	UpdatableItemsContainer<DownloadFile, CEC_PartFile_Tag, uint32>(webApp)
 {
 	m_This = this;
 	m_ImageLib = imlib;
@@ -780,8 +772,9 @@
 {
 #ifdef WITH_LIBPNG
 	m_ImageLib->RemoveImage(wxT("/") + item->m_Image->Name());
-#endif
+#else
 	delete item->m_Image;
+#endif
 }
 
 bool DownloadFileInfo::ReQuery()
@@ -792,13 +785,14 @@
 }
 
 
-UploadFile::UploadFile(CEC_UpDownClient_Tag *tag)
+UploadFile::UploadFile(CEC_UpDownClient_Tag *tag) : CECID(tag->ID())
 {
-	nHash = tag->FileID();
 	sUserName = _SpecialChars(tag->ClientName());
 	nSpeed = tag->SpeedUp();
 	nTransferredUp = tag->XferUp();
 	nTransferredDown = tag->XferDown();
+	nUploadFile = 0;
+	tag->UploadFile(nUploadFile);
 }
 
 UploadsInfo *UploadFile::GetContainerInstance()
@@ -823,9 +817,9 @@
 	//
 	// query succeded - flush existing values and refill
 	EraseAll();
-	for(int i = 0; i < up_reply->GetTagCount(); i ++) {
+	for (CECPacket::const_iterator it = up_reply->begin(); it != up_reply->end(); it++) {
 		
-		UploadFile curr((CEC_UpDownClient_Tag *)up_reply->GetTagByIndex(i));
+		UploadFile curr((CEC_UpDownClient_Tag *) & *it);
 		
 		AddItem(curr);
 	}
@@ -857,7 +851,7 @@
 SearchInfo *SearchInfo::m_This = 0;
 
 SearchInfo::SearchInfo(CamulewebApp *webApp) :
-	UpdatableItemsContainer<SearchFile, CEC_SearchFile_Tag, CMD4Hash>(webApp)
+	UpdatableItemsContainer<SearchFile, CEC_SearchFile_Tag, uint32>(webApp)
 {
 	m_This = this;
 }
@@ -944,7 +938,11 @@
 {
 	m_size = 0;
 	m_name = name;
+#ifdef __WXMSW__
+	wxFFile fis(m_name, wxT("rb"));
+#else
 	wxFFile fis(m_name);
+#endif
 	// FIXME: proper logging is needed
 	if ( fis.IsOpened() ) {
 		size_t file_size = fis.Length();
@@ -990,79 +988,42 @@
 		CAnyImage(width, height), m_template(tmpl)
 {
 	m_file = file;
-
-	m_gap_buf_size = m_gap_alloc_size = m_file->m_Encoder.m_gap_status.Size() / (2 * sizeof(uint64));
-	m_gap_buf = new Gap_Struct[m_gap_alloc_size];
-	
 	m_ColorLine = new uint32[m_width];
 }
 
 CProgressImage::~CProgressImage()
 {
-	delete [] m_gap_buf;
 	delete [] m_ColorLine;
 }
 
-void CProgressImage::ReallocGapBuffer()
-{
-	int size = m_file->m_Encoder.m_gap_status.Size() / (2 * sizeof(uint64));
-	if ( size == m_gap_alloc_size ) {
-		return;
-	}
-	if ( (size > m_gap_alloc_size) || (size < m_gap_alloc_size/2) ) {
-		m_gap_buf_size = m_gap_alloc_size = size;
-		delete [] m_gap_buf;
-		m_gap_buf = new Gap_Struct[m_gap_alloc_size];
-	} else {
-		m_gap_buf_size = size;
-	}
-}
-
-void CProgressImage::InitSortedGaps()
-{
-	ReallocGapBuffer();
-
-	const uint64 *gap_info = (const uint64 *)m_file->m_Encoder.m_gap_status.Buffer();
-	m_gap_buf_size = m_file->m_Encoder.m_gap_status.Size() / (2 * sizeof(uint64));
-	
-	//memcpy(m_gap_buf, gap_info, m_gap_buf_size*2*sizeof(uint32));
-	for (int j = 0; j < m_gap_buf_size;j++) {
-		uint64 gap_start = ENDIAN_NTOHLL(gap_info[2*j]);
-		uint64 gap_end = ENDIAN_NTOHLL(gap_info[2*j+1]);
-		m_gap_buf[j].start = gap_start;
-		m_gap_buf[j].end = gap_end;
-	}
-	qsort(m_gap_buf, m_gap_buf_size, 2*sizeof(uint64), compare_gaps);
-}
-
 void CProgressImage::CreateSpan()
 {
-	// Step 1: sort gaps list in accending order
-	InitSortedGaps();
+	// Step 1: get gap list
+	const Gap_Struct * gap_list = (const Gap_Struct *) &(m_file->m_Gaps[0]);
+	int gap_list_size = m_file->m_Gaps.size() / 2;
 	
 	// allocate for worst case !
-	int color_gaps_alloc = 2 * (2*m_gap_buf_size + m_file->lFileSize / PARTSIZE + 1);
+	int color_gaps_alloc = 2 * (2 * gap_list_size + m_file->lFileSize / PARTSIZE + 1);
 	Color_Gap_Struct *colored_gaps = new Color_Gap_Struct[color_gaps_alloc];
 	
 	// Step 2: combine gap and part status information
-	const unsigned char *part_info = m_file->m_Encoder.m_part_status.Buffer();
 	
 	// Init first item to dummy info, so we will always have "previous" item
 	int colored_gaps_size = 0;
 	colored_gaps[0].start = 0;
 	colored_gaps[0].end = 0;
 	colored_gaps[0].color = 0xffffffff;
-	for (int j = 0; j < m_gap_buf_size;j++) {
-		uint64 gap_start = m_gap_buf[j].start;
-		uint64 gap_end = m_gap_buf[j].end;
+	for (int j = 0; j < gap_list_size;j++) {
+		uint64 gap_start = gap_list[j].start;
+		uint64 gap_end = gap_list[j].end;
 
 		uint32 start = gap_start / PARTSIZE;
 		uint32 end = (gap_end / PARTSIZE) + 1;
 
 		for (uint32 i = start; i < end; i++) {
-			COLORREF color = RGB(255, 0, 0);
-			if ( part_info[i] ) {
-				int blue = 210 - ( 22 * ( part_info[i] - 1 ) );
+			COLORTYPE color = RGB(255, 0, 0);
+			if (m_file->m_PartInfo.size() > i && m_file->m_PartInfo[i]) {
+				int blue = 210 - ( 22 * ( m_file->m_PartInfo[i] - 1 ) );
 				color = RGB( 0, ( blue < 0 ? 0 : blue ), 255 );
 			}
 
@@ -1122,11 +1083,6 @@
 	delete [] colored_gaps;
 }
 
-int CProgressImage::compare_gaps(const void *g1, const void *g2)
-{
-	return ((const Gap_Struct *)g1)->start - ((const Gap_Struct *)g2)->start;
-}
-
 #ifdef WITH_LIBPNG
 
 CDynPngImage::CDynPngImage(int w, int h) : CAnyImage(w, h)
@@ -1193,8 +1149,8 @@
 
 wxString CDynProgressImage::GetHTML()
 {
-	// template contain %s (name) %d (width)
-	return (CFormat(m_template) % m_name % m_width).GetString();
+	// template contain %s (name) %d (width) %s (alt)
+	return (CFormat(m_template) % m_name % m_width % wxT("Progress bar")).GetString();
 }
 	
 void CDynProgressImage::DrawImage()
@@ -1267,7 +1223,7 @@
 				}
 			}
 			str += (CFormat(m_template) % progresscolor[color_idx]
-				   		% (i - lastindex)).GetString();
+				   		% (i - lastindex) % wxString(progresscolor[color_idx]).BeforeLast(wxT('.'))).GetString();
 			lastindex = i;
 			lastcolor = m_ColorLine[i];
 		}
@@ -1378,7 +1334,7 @@
 	m_scale1024 = scale1024;
 	
 	// actual name doesn't matter, just make it unique
-	m_name = wxString::Format(wxT("dyn_%ld_stat.png"), (unsigned long int) data);
+	m_name = CFormat(wxT("dyn_%p_stat.png")) % data;
 	
 	m_num_font_w_size = 8;
 	m_num_font_h_size = 16;
@@ -1402,7 +1358,7 @@
 	//
 	// Prepare background
 	//
-	static const COLORREF bg_color = RGB(0x00, 0x00, 0x40);
+	static const COLORTYPE bg_color = RGB(0x00, 0x00, 0x40);
 	for(int i = 0; i < m_height; i++) {
 		png_bytep u_row = m_row_bg_ptrs[i];
 		for(int j = 0; j < m_width; j++) {
@@ -1412,7 +1368,7 @@
 	//
 	// draw axis
 	//
-	static const COLORREF axis_color = RGB(0xff, 0xff, 0xff);
+	static const COLORTYPE axis_color = RGB(0xff, 0xff, 0xff);
 	// Y
 	for(int i = m_bottom_margin; i < m_y_axis_size; i++) {
 		png_bytep u_row = m_row_bg_ptrs[i];
@@ -1461,7 +1417,7 @@
 	//
 	// Now graph itself
 	//
-	static const COLORREF graph_color = RGB(0xff, 0x00, 0x00);
+	static const COLORTYPE graph_color = RGB(0xff, 0x00, 0x00);
 	int maxval = m_data->Max();
 	
 	if ( m_scale1024 ) {
@@ -1672,7 +1628,7 @@
 			DrawHorzLine(2);
 			break;
 		default:
-			wxASSERT(0);
+			wxFAIL;
 			break;
 	}
 }
@@ -1689,26 +1645,29 @@
 
 void CImageLib::AddImage(CAnyImage *img, const wxString &name)
 {
-	CAnyImage *prev = m_image_map[name];
-	if ( prev ) {
-		delete prev;
+	ImageMap::iterator it = m_image_map.find(name);
+	if (it == m_image_map.end()) {
+		m_image_map[name] = img;
+	} else {
+		delete it->second;
+		it->second = img;
 	}
-	m_image_map[name] = img;
 }
 
 void CImageLib::RemoveImage(const wxString &name)
 {
-	CAnyImage *prev = m_image_map[name];
-	if ( prev ) {
-		m_image_map.erase(name);
+	ImageMap::iterator it = m_image_map.find(name);
+	if (it != m_image_map.end()) {
+		delete it->second;
+		m_image_map.erase(it);
 	}
 }
 
-CAnyImage *CImageLib::GetImage(wxString &name)
+CAnyImage *CImageLib::GetImage(const wxString &name)
 {
-	CAnyImage *img = m_image_map[name];
-	if ( img ) {
-		return img;
+	ImageMap::iterator it = m_image_map.find(name);
+	if (it != m_image_map.end()) {
+		return it->second;
 	}
 	wxFileName filename(m_image_dir + name);
 	CFileImage *fimg = new CFileImage(filename.GetFullPath());
@@ -1727,7 +1686,7 @@
 CScriptWebServer::CScriptWebServer(CamulewebApp *webApp, const wxString& templateDir)
 	: CWebServerBase(webApp, templateDir), m_wwwroot(templateDir)
 {
-	wxString img_tmpl(wxT("<img src=%s height=20 width=%d>"));
+	wxString img_tmpl(wxT("<img src=\"%s\" height=\"20\" width=\"%d\" alt=\"%s\">"));
 	m_DownloadFileInfo.LoadImageParams(img_tmpl, 200, 20);
 
 	if ( ::wxFileExists(wxFileName(m_wwwroot, wxT("index.html")).GetFullPath()) ) {
@@ -1778,7 +1737,8 @@
 	size = ftell(f);
 	char *buf = new char [size+1];
 	rewind(f);
-	fread(buf, 1, size, f);
+	// fread may actually read less if it is a CR-LF-file in Windows
+	size = fread(buf, 1, size, f);
 	buf[size] = 0;
 	fclose(f);
 	
@@ -1842,8 +1802,6 @@
 
 void CScriptWebServer::ProcessURL(ThreadData Data)
 {
-	wxMutexLocker lock(m_mutexChildren);
-
 	long httpOutLen;
 	char *httpOut = 0;
 	
@@ -1863,14 +1821,15 @@
 		filename = wxT("login.php");
 		
 		wxString PwStr(Data.parsedURL.Param(wxT("pass")));
-		if (webInterface->m_AdminPass.IsEmpty() and webInterface->m_GuestPass.IsEmpty()) {
+		if (webInterface->m_AdminPass.IsEmpty() && webInterface->m_GuestPass.IsEmpty()) {
 			session->m_vars["login_error"] = "No password specified, login will not be allowed.";
+			Print(_("No password specified, login will not be allowed."));
 		} else if ( PwStr.Length() ) {
 			Print(_("Checking password\n"));
 			session->m_loggedin = false;
 			
 			CMD4Hash PwHash;
-			if (not PwHash.Decode(MD5Sum(PwStr).GetHash())) {
+			if (!PwHash.Decode(MD5Sum(PwStr).GetHash())) {
 				Print(_("Password hash invalid\n"));
 				session->m_vars["login_error"] = "Invalid password hash, please report on http://forum.amule.org";
 			} else if ( PwHash == webInterface->m_AdminPass ) {
@@ -1907,20 +1866,25 @@
 	Print(_("Processing request [redirected]: ") + filename + wxT("\n"));
 	
 	session->m_vars["auto_refresh"] = (const char *)unicode2char(
-		wxString::Format(wxT("%d"), webInterface->m_PageRefresh));
+		wxString(CFormat(wxT("%d")) % webInterface->m_PageRefresh));
 	session->m_vars["content_type"] = "text/html";
 	
 	wxString req_file(wxFileName(m_wwwroot, filename).GetFullPath());
-	if ( req_file.Find(wxT(".html")) != -1 ) {
+	if (req_file.EndsWith(wxT(".html"))) {
 		httpOut = ProcessHtmlRequest(unicode2char(req_file), httpOutLen);
-	} else if ( req_file.Find(wxT(".php")) != -1 ) {
+	} else if (req_file.EndsWith(wxT(".php"))) {
 		httpOut = ProcessPhpRequest(unicode2char(req_file), session, httpOutLen);
-	} else if ( req_file.Find(wxT(".css")) != -1 ) {
+	} else if (req_file.EndsWith(wxT(".css"))) {
 		session->m_vars["content_type"] = "text/css";
 		httpOut = ProcessHtmlRequest(unicode2char(req_file), httpOutLen);
-	} else if ( req_file.Find(wxT(".js")) != -1 ) {
+	} else if (req_file.EndsWith(wxT(".js"))) {
 		session->m_vars["content_type"] = "text/javascript";
 		httpOut = ProcessHtmlRequest(unicode2char(req_file), httpOutLen);
+	} else if (	req_file.EndsWith(wxT(".dtd"))
+				|| req_file.EndsWith(wxT(".xsd"))
+				|| req_file.EndsWith(wxT(".xsl"))) {
+		session->m_vars["content_type"] = "text/xml";
+		httpOut = ProcessHtmlRequest(unicode2char(req_file), httpOutLen);
 	} else {
 		httpOut = GetErrorPage("aMuleweb doesn't handle the requested file type ", httpOutLen);
 	}
@@ -1990,4 +1954,16 @@
 	Data.pSocket->SendHttpHeaders("text/html", false, httpOutLen, 0);
 	Data.pSocket->SendData(httpOut, httpOutLen);
 }
+
+// Dummy functions for EC logging
+bool ECLogIsEnabled()
+{
+	return false;
+}
+
+void DoECLogLine(const wxString &)
+{
+}
+
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/webserver/src/WebServer.h -> aMule-2.3.1.tar.bz2/src/webserver/src/WebServer.h Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 Kry ( elkry@users.sourceforge.net / http://www.amule.org )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2003-2011 Angel Vidal ( kry@amule.org )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -35,6 +35,7 @@
 #include "KnownFile.h"
 #include "RLE.h"
 #include "OtherStructs.h"
+#include <ec/cpp/ECID.h>	// Needed for CECID
 
 #ifdef ENABLE_UPNP
 #	include "UPnPBase.h"
@@ -42,19 +43,19 @@
 
 #include <wx/datetime.h>  // For DownloadFile::wxtLastSeenComplete
 
-//class TransferredData;
-class CWSThread;
+#ifdef _MSC_VER
+#define strncasecmp _strnicmp
+#define snprintf sprintf_s
+#define atoll _atoi64
+#define strdup _strdup
+#endif
+
 class CWebSocket;
 class CMD4Hash;
 
 #define SESSION_TIMEOUT_SECS	300	// 5 minutes session expiration
 #define SHORT_FILENAME_LENGTH	40	// Max size of file name.
 
-//
-//uint8 GetHigherPrio(uint32 prio, bool autoprio);
-//uint8 GetHigherPrioShared(uint32 prio, bool autoprio);
-//uint8 GetLowerPrio(uint32 prio, bool autoprio);
-//uint8 GetLowerPrioShared(uint32 prio, bool autoprio);
 wxString _SpecialChars(wxString str);
 
 class CEC_PartFile_Tag;
@@ -64,7 +65,13 @@
 class CProgressImage;
 class CEC_KadNode_Tag;
 
-class DownloadFile {
+class CURLDecoder
+{
+      public:
+	static wxString	Decode(const wxString& url);
+};
+
+class DownloadFile : public CECID {
 	public:
 		wxString	sFileName;
 		uint8		nFileStatus;
@@ -88,16 +95,18 @@
 		
 		CProgressImage *m_Image;
 		PartFileEncoderData m_Encoder;
+		ArrayOfUInts16 m_PartInfo;
 		std::vector<Gap_Struct> m_ReqParts;
+		ArrayOfUInts64	m_Gaps;
 
 		// container require this		
 		static class DownloadFileInfo *GetContainerInstance();
 		DownloadFile(CEC_PartFile_Tag *);
 		void ProcessUpdate(CEC_PartFile_Tag *);
-		CMD4Hash ID() { return nHash; }
+		uint32 ID() { return ECID(); }
 };
 
-class SharedFile {
+class SharedFile : public CECID {
 	public:
 		wxString	sFileName;
 		uint64		lFileSize;
@@ -117,7 +126,7 @@
 		static class SharedFileInfo *GetContainerInstance();
 		SharedFile(CEC_SharedFile_Tag *);
 		void ProcessUpdate(CEC_SharedFile_Tag *);
-		CMD4Hash ID() { return nHash; }
+		uint32 ID() { return ECID(); }
 };
 
 class ServerEntry {
@@ -135,26 +144,25 @@
 		uint32 ID() { return nServerIP; }
 };
 
-class UploadFile {
+// This is a client we are uploading to, not a file
+class UploadFile : public CECID {
 	public:
 		wxString  sUserName;
 		uint32 nTransferredUp;
 		uint32 nTransferredDown;
 		uint32 nSpeed;
-		//
-		// Don't need filename - sharedfiles already have it
-		CMD4Hash  nHash;
+		uint32 nUploadFile;		// ECID of shared file uploading to client
 
 		UploadFile(CEC_UpDownClient_Tag *tag);
 		
 		static class UploadsInfo *GetContainerInstance();
-		CMD4Hash ID() { return nHash; }
+		uint32 ID() { return ECID(); }
 };
 
-class SearchFile {
+class SearchFile : public CECID {
 	public:
 		wxString sFileName;
-		unsigned long lFileSize;
+		uint64 lFileSize;
 		CMD4Hash  nHash;
 		wxString  sHash;
 		long lSourceCount;
@@ -164,7 +172,7 @@
 		
 		void ProcessUpdate(CEC_SearchFile_Tag *);
 		static class SearchInfo *GetContainerInstance();
-		CMD4Hash ID() { return nHash; }
+		uint32 ID() { return ECID(); }
 };
 
 
@@ -248,6 +256,19 @@
 			// avoid creating nodes
 			return m_items_hash.count(id) ? m_items_hash[id] : NULL;
 		}
+
+		T * GetByHash(const CMD4Hash &fileHash)
+		{
+			T * ret = 0;
+			for (typename std::map<I, T *>::iterator it = m_items_hash.begin(); it != m_items_hash.end(); it++) {
+				if (it->second->nHash == fileHash) {
+					ret = it->second;
+					break;
+				}
+			}
+			return ret;
+		}
+
 		/*!
 		 * Process answer of update request, create list of new items for
 		 * full request later. Also remove items that no longer exist in core
@@ -255,8 +276,8 @@
 		void ProcessUpdate(const CECPacket *reply, CECPacket *full_req, int req_type)
 		{
 			std::set<I> core_files;
-			for (int i = 0;i < reply->GetTagCount();i++) {
-				G *tag = (G *)reply->GetTagByIndex(i);
+			for (CECPacket::const_iterator it = reply->begin(); it != reply->end(); it++) {
+				G *tag = (G *) & *it;
 		
 				core_files.insert(tag->ID());
 				if ( m_items_hash.count(tag->ID()) ) {
@@ -291,8 +312,8 @@
 		
 		void ProcessFull(const CECPacket *reply)
 		{
-			for (int i = 0;i < reply->GetTagCount();i++) {
-				G *tag = (G *)reply->GetTagByIndex(i);
+			for (CECPacket::const_iterator it = reply->begin(); it != reply->end(); it++) {
+				G *tag = (G *) & *it;
 				// initialize item data from EC tag
 				T item(tag);
 				T *real_ptr = AddItem(item);
@@ -321,7 +342,7 @@
 			delete reply;
 		
 			// Phase 3: request full info about files we don't have yet
-			if ( req_full.GetTagCount() ) {
+			if ( req_full.HasChildTags() ) {
 				reply = this->m_webApp->SendRecvMsg_v2(&req_full);
 				if ( !reply ) {
 					return false;
@@ -358,7 +379,7 @@
 };
 
 
-class SharedFileInfo : public UpdatableItemsContainer<SharedFile, CEC_SharedFile_Tag, CMD4Hash> {
+class SharedFileInfo : public UpdatableItemsContainer<SharedFile, CEC_SharedFile_Tag, uint32> {
 	public:
 		// can be only one instance.
 		static SharedFileInfo *m_This;
@@ -369,7 +390,7 @@
 
 };
 
-class SearchInfo : public UpdatableItemsContainer<SearchFile, CEC_SearchFile_Tag, CMD4Hash> {
+class SearchInfo : public UpdatableItemsContainer<SearchFile, CEC_SearchFile_Tag, uint32> {
 	public:
 		static SearchInfo *m_This;
 		
@@ -381,7 +402,7 @@
 
 
 class CImageLib;
-class DownloadFileInfo : public UpdatableItemsContainer<DownloadFile, CEC_PartFile_Tag, CMD4Hash> {
+class DownloadFileInfo : public UpdatableItemsContainer<DownloadFile, CEC_PartFile_Tag, uint32> {
 		CImageLib *m_ImageLib;
 		
 		// parameters of progress images
@@ -452,16 +473,6 @@
 		wxString m_template;
 		
 		//
-		// sorted list of gaps
-		int m_gap_buf_size, m_gap_alloc_size;
-		Gap_Struct *m_gap_buf;
-		
-		void ReallocGapBuffer();
-		void InitSortedGaps();
-		// for qsort
-		static int compare_gaps(const void *, const void *);
-		
-		//
 		// Turn list of gaps, partstatus into array of color strips
 		typedef struct Color_Gap_Struct : public Gap_Struct {
 			uint32 color;
@@ -628,31 +639,18 @@
 #endif
 
 class CImageLib {
-		std::map<wxString, CAnyImage *> m_image_map;
+		typedef std::map<wxString, CAnyImage *> ImageMap;
+		ImageMap m_image_map;
 		wxString m_image_dir;
 	public:
 		CImageLib(wxString image_dir);
 		~CImageLib();
 		
-		CAnyImage *GetImage(wxString &name);
+		CAnyImage *GetImage(const wxString &name);
 		void AddImage(CAnyImage *img, const wxString &name);
 		void RemoveImage(const wxString &name);
 };
 
-class CUrlDecodeTable {
-		static CUrlDecodeTable*		ms_instance;
-		static wxCriticalSection	ms_instance_guard;
-
-		wxString m_enc_u_str[256], m_enc_l_str[256], m_dec_str[256];
-
-		CUrlDecodeTable();
-		
-	public:
-		static CUrlDecodeTable* GetInstance();
-
-		void DecodeString(wxString &str);
-};
-
 class CParsedUrl {
 		wxString m_path, m_file;
 		std::map<wxString, wxString> m_params;
@@ -681,7 +679,7 @@
 enum {
     // Socket handlers
     ID_WEBLISTENSOCKET_EVENT = wxID_HIGHEST+123,  // random safe ID
-    ID_WEBCLIENTSOCKET_ENENT,
+    ID_WEBCLIENTSOCKET_EVENT,
 };
 
 #ifdef ENABLE_UPNP
@@ -691,11 +689,8 @@
 
 class CWebServerBase : public wxEvtHandler {
 	protected:
-		//CWSThread *wsThread;
 		wxSocketServer *m_webserver_socket;
 		
-		wxMutex m_mutexChildren;
-
 		ServersInfo m_ServersInfo;
 		SharedFileInfo m_SharedFileInfo;
 		DownloadFileInfo m_DownloadFileInfo;

aMule-2.2.6.tar.bz2/src/webserver/src/WebSocket.cpp -> aMule-2.3.1.tar.bz2/src/webserver/src/WebSocket.cpp Changed

@@ -1,9 +1,9 @@
 //
 // This file is part of the aMule Project.
 //  
-// Copyright (c) 2004-2009 shakraw ( shakraw@users.sourceforge.net )
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (c) 2002 Merkur ( devs@emule-project.net / http://www.emule-project.net )
+// Copyright (c) 2004-2011 shakraw ( shakraw@users.sourceforge.net )
+// Copyright (c) 2003-2011 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,
 // or contributed by third-party developers are copyrighted by their
@@ -47,7 +47,7 @@
 	
 	m_pParent = parent;
 	
-	SetEventHandler(*parent, ID_WEBCLIENTSOCKET_ENENT);
+	SetEventHandler(*parent, ID_WEBCLIENTSOCKET_EVENT);
 	SetNotify(wxSOCKET_INPUT_FLAG | wxSOCKET_OUTPUT_FLAG | wxSOCKET_LOST_FLAG);
 	Notify(true);
 	
@@ -265,15 +265,16 @@
 
 void CWebSocket::SendData(const void* pData, uint32 dwDataSize) 
 {
+	const char * data = (const char*) pData;
 	if (!m_pHead) {
 		// try to send it directly
-		Write((const char*) pData, dwDataSize);
+		Write(data, dwDataSize);
 		uint32 nRes = LastCount();
 		if ((nRes < dwDataSize) && 
 			Error() && (LastError() != wxSOCKET_WOULDBLOCK)) {
 			Close();
 		} else {
-			((const char*&) pData) += nRes;
+			data += nRes;
 			dwDataSize -= nRes;
 		}
 	}
@@ -283,7 +284,7 @@
 		pChunk->m_pNext = NULL;
 		pChunk->m_dwSize = dwDataSize;
 		pChunk->m_pData = new char[dwDataSize];
-		memcpy(pChunk->m_pData, pData, dwDataSize);
+		memcpy(pChunk->m_pData, data, dwDataSize);
 		// push it to the end of our queue
 		pChunk->m_pToSend = pChunk->m_pData;
 		if (m_pTail) {

aMule-2.2.6.tar.bz2/src/webserver/src/WebSocket.h -> aMule-2.3.1.tar.bz2/src/webserver/src/WebSocket.h Changed

aMule-2.2.6.tar.bz2/src/webserver/src/php_amule_lib.cpp -> aMule-2.3.1.tar.bz2/src/webserver/src/php_amule_lib.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2005-2009 Froenchenko Leonid ( lfroen@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-2011 Froenchenko Leonid ( lfroen@gmail.com / 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
@@ -27,9 +27,11 @@
 #include <string> // Do_not_auto_remove (g++-4.0.1)
 
 #include <sys/types.h>
-#include <regex.h>
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
 #include "WebServer.h"
 #include <ec/cpp/ECSpecialTags.h>
 
@@ -132,8 +134,9 @@
 	cast_value_dnum(&si->var->value);
 	unsigned int ipport = si->var->value.int_val;
 
-	CECPacket req(EC_OP_KAD_START);
-	req.AddTag(CECTag(EC_TAG_SERVER_ADDRESS, EC_IPv4_t(ipaddr, ipport)));
+	CECPacket req(EC_OP_KAD_BOOTSTRAP_FROM_IP);
+	req.AddTag(CECTag(EC_TAG_BOOTSTRAP_IP, ipaddr));
+	req.AddTag(CECTag(EC_TAG_BOOTSTRAP_PORT, ipport));
 	CPhPLibContext::g_curr_context->WebServer()->Send_Discard_V2_Request(&req);
 }
 
@@ -295,12 +298,12 @@
 	if ( !reply ) {
 		return ;
 	}
-	const CECTag *cats_tag = reply->GetTagCount() ? reply->GetTagByIndex(0) : 0;
-	if ( cats_tag && cats_tag->GetTagCount() ) {
-		for (int i = 0; i < cats_tag->GetTagCount(); i++) {
-			const CECTag *tag = cats_tag->GetTagByIndex(i);
-			const CECTag *categoryTitle = tag->GetTagByName(EC_TAG_CATEGORY_TITLE);
-			PHP_VAR_NODE *cat = array_get_by_int_key(result, i);
+	const CECTag *cats_tag = reply->GetFirstTagSafe();
+	if (cats_tag->HasChildTags()) {
+		int i = 0;
+		for (CECTag::const_iterator it = cats_tag->begin(); it != cats_tag->end(); it++) {
+			const CECTag *categoryTitle = it->GetTagByName(EC_TAG_CATEGORY_TITLE);
+			PHP_VAR_NODE *cat = array_get_by_int_key(result, i++);
 			value_value_free(&cat->value);
 			cat->value.type = PHP_VAL_STRING;
 			cat->value.str_val = strdup(unicode2UTF8(categoryTitle->GetStringData()));
@@ -400,12 +403,10 @@
 	CECPacket req(EC_OP_GET_PREFERENCES);
 	req.AddTag(CECTag(EC_TAG_SELECT_PREFS, (uint32)0xffffffff));
 	const CECPacket *reply = CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&req);
-	if ( !reply || !reply->GetTagCount()) {
+	if ( !reply || !reply->HasChildTags()) {
 		return ;
 	}
 	const CECTag *cattag = 0;
-	PHP_VALUE_NODE intval;
-	intval.type = PHP_VAL_INT;
     if ((cattag = reply->GetTagByName(EC_TAG_PREFS_GENERAL)) != 0) {
 		PHP_VAR_NODE *key = array_get_by_str_key(result, "nick");
 		value_value_free(&key->value);
@@ -616,7 +617,7 @@
 	CECPacket req(EC_OP_GET_LOG);
 	const CECPacket *response = CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&req);
 	if (response) {
-		wxString serverInfoString(_SpecialChars(response->GetTagByIndexSafe(0)->GetStringData()));
+		wxString serverInfoString(_SpecialChars(response->GetFirstTagSafe()->GetStringData()));
 		delete response;
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(serverInfoString));
@@ -646,7 +647,7 @@
 	CECPacket req(EC_OP_GET_SERVERINFO);
 	const CECPacket *response = CPhPLibContext::g_curr_context->WebServer()->webInterface->SendRecvMsg_v2(&req);
 	if (response) {
-		wxString serverInfoString(_SpecialChars(response->GetTagByIndexSafe(0)->GetStringData()));
+		wxString serverInfoString(_SpecialChars(response->GetFirstTagSafe()->GetStringData()));
 		delete response;
 		result->type = PHP_VAL_STRING;
 		result->str_val = strdup((const char *)unicode2UTF8(serverInfoString));
@@ -751,8 +752,8 @@
 	cast_value_array(result);
 	std::string key(unicode2UTF8(root->GetDisplayString()));
 	PHP_VAR_NODE *v_key = array_get_by_str_key(result, key);
-	for (int i = 0; i < root->GetTagCount(); i++) {
-		CEC_StatTree_Node_Tag *tag = (CEC_StatTree_Node_Tag*)root->GetTagByIndex(i);
+	for (CECTag::const_iterator it = root->begin(); it != root->end(); it++) {
+		CEC_StatTree_Node_Tag *tag = (CEC_StatTree_Node_Tag*) & *it;
 		if (tag->GetTagName() == EC_TAG_STATTREE_NODE) {
 			ecstats2php(tag, &v_key->value);
 		}
@@ -780,8 +781,8 @@
 	}
 	CEC_StatTree_Node_Tag *stats_root = (CEC_StatTree_Node_Tag *)response->GetTagByName(EC_TAG_STATTREE_NODE);
 	//ecstats2php(stats_root, result);
-	for (int i = 0; i < stats_root->GetTagCount(); i++) {
-		CEC_StatTree_Node_Tag *tag = (CEC_StatTree_Node_Tag*)stats_root->GetTagByIndex(i);
+	for (CECTag::const_iterator it = stats_root->begin(); it != stats_root->end(); it++) {
+		CEC_StatTree_Node_Tag *tag = (CEC_StatTree_Node_Tag*) & *it;
 		if (tag->GetTagName() == EC_TAG_STATTREE_NODE) {
 			ecstats2php(tag, result);
 		}
@@ -892,21 +893,26 @@
 	result->type = PHP_VAL_INT;
 	if ( strcmp(prop_name, "name") == 0 ) {
 		result->type = PHP_VAL_STRING;
-		SharedFile *sharedfile = SharedFile::GetContainerInstance()->GetByID(obj->nHash);
-		 // uploading file we don't share ?! We are either out of sync with core or a shared file has been removed while uploading it
+		SharedFile *sharedfile = SharedFile::GetContainerInstance()->GetByID(obj->nUploadFile);
+		// uploading file we don't share ?! We are either out of sync with core or a shared file has been removed while uploading it
 		if ( !sharedfile ) {
 			SharedFile::GetContainerInstance()->ReQuery();
-			sharedfile = SharedFile::GetContainerInstance()->GetByID(obj->nHash);
+			sharedfile = SharedFile::GetContainerInstance()->GetByID(obj->nUploadFile);
 		}
-	 result->str_val = strdup(sharedfile ? (const char *)unicode2UTF8(sharedfile->sFileName) : "???");
+		result->str_val = strdup(sharedfile ? (const char *)unicode2UTF8(sharedfile->sFileName) : "???");
 	} else if ( strcmp(prop_name, "short_name") == 0 ) {
 		result->type = PHP_VAL_STRING;
-		SharedFile *sharedfile = SharedFile::GetContainerInstance()->GetByID(obj->nHash);
+		SharedFile *sharedfile = SharedFile::GetContainerInstance()->GetByID(obj->nUploadFile);
 		if ( !sharedfile ) {
 			SharedFile::GetContainerInstance()->ReQuery();
-			sharedfile = SharedFile::GetContainerInstance()->GetByID(obj->nHash);
+			sharedfile = SharedFile::GetContainerInstance()->GetByID(obj->nUploadFile);
+		}
+		wxString short_name;
+		if (sharedfile) {
+			short_name = sharedfile->sFileName.Length() > 60 ? (sharedfile->sFileName.Left(60) + (wxT(" ..."))) : sharedfile->sFileName;
+		} else {
+			short_name = wxT("???");
 		}
-		wxString short_name(sharedfile->sFileName.Length() > 60 ? (sharedfile->sFileName.Left(60) + (wxT(" ..."))) : sharedfile->sFileName);
 		result->str_val = strdup((const char *)unicode2UTF8(short_name));
 	} else if ( strcmp(prop_name, "user_name") == 0 ) {
 		result->type = PHP_VAL_STRING;
@@ -1041,6 +1047,11 @@
 	}
 }
 
+#ifndef PACKAGE_VERSION
+#include <common/ClientVersion.h>
+#define PACKAGE_VERSION (PACKAGE " " VERSION)
+#endif
+
 void amule_version(PHP_VALUE_NODE *val)
 {
 	if ( !val ) {

aMule-2.2.6.tar.bz2/src/webserver/src/php_amule_lib_standalone.cpp -> aMule-2.3.1.tar.bz2/src/webserver/src/php_amule_lib_standalone.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2005-2009 Froenchenko Leonid ( lfroen@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-2011 Froenchenko Leonid ( lfroen@gmail.com / 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
@@ -28,6 +28,7 @@
 // in separate build
 //
 #include <string> // Do_not_auto_remove (g++-4.0.1)
+#include <map>
 
 #include <sys/types.h>
 #include <regex.h>
@@ -41,8 +42,6 @@
 #include "php_syntree.h"
 #include "php_core_lib.h"
 
-#include <wx/datetime.h>
-
 
 void php_native_shared_file_cmd(PHP_VALUE_NODE *)
 {
@@ -588,7 +587,7 @@
 void php_init_amule_lib()
 {
 	// load function definitions
-	PHP_BLTIN_FUNC_DEF *curr_def = core_lib_funcs;
+	PHP_BLTIN_FUNC_DEF *curr_def = amule_lib_funcs;
 	while ( curr_def->name ) {
 		php_add_native_func(curr_def);
 		curr_def++;
@@ -601,4 +600,23 @@
 	php_add_native_class("AmuleSearchFile", amule_search_file_prop_get);
 }
 
+int main(int argc, char *argv[])
+{
+	const char *filename = ( argc == 2 ) ? argv[1] : "test.php";
+
+	CWriteStrBuffer buffer;
+	
+	//phpdebug = 0;
+
+	CPhpFilter php_filter((CWebServerBase*)0, (CSession *)0,filename, &buffer);
+	
+	int size = buffer.Length();
+	char *buf = new char [size+1];
+	buffer.CopyAll(buf);
+	printf("%s", buf);
+	delete [] buf;
+	
+	return 0;
+}
+
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/webserver/src/php_core_lib.cpp -> aMule-2.3.1.tar.bz2/src/webserver/src/php_core_lib.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2005-2009 Froenchenko Leonid ( lfroen@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-2011 Froenchenko Leonid ( lfroen@gmail.com / 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
@@ -24,23 +24,30 @@
 //
 
 #ifdef HAVE_CONFIG_H
-#      include "config.h"
+#	include "config.h"
 #endif
 
 #include <string> // Do_not_auto_remove (g++-4.0.1)
 
 #ifdef HAVE_SYS_TYPES_H
-#      include <sys/types.h>
+#	include <sys/types.h>
 #endif
-#include <regex.h>
 
-#include "WebServer.h"
-#include <ec/cpp/ECSpecialTags.h>
+#ifdef PHP_STANDALONE_EN
+#	include <map>
+#	include <string>
+#	include <list>
+#	include <regex.h>
+#else
+#	include "WebServer.h"
+#	include <ec/cpp/ECSpecialTags.h>
+#	include <wx/regex.h>
+#	include <wx/datetime.h>
+#endif
 
 #include "php_syntree.h"
 #include "php_core_lib.h"
-
-#include <wx/datetime.h>
+#include <stdarg.h>
 
 #ifdef ENABLE_NLS
 #include <libintl.h>
@@ -66,7 +73,7 @@
 		case PHP_VAL_BOOL: printf("bool(%s)\n", node->int_val ? "true" : "false"); break;
 		case PHP_VAL_INT: printf("int(%"PRIu64")\n", node->int_val); break;
 		case PHP_VAL_FLOAT: printf("float(%f)\n", node->float_val); break;
-		case PHP_VAL_STRING: printf("string(%d) \"%s\"\n", strlen(node->str_val), node->str_val); break;
+		case PHP_VAL_STRING: printf("string(%d) \"%s\"\n", (int)strlen(node->str_val), node->str_val); break;
 		case PHP_VAL_OBJECT: printf("Object(%s)\n", node->obj_val.class_name); break;
 		case PHP_VAL_ARRAY: {
 			int arr_size = array_get_size(node);
@@ -140,7 +147,7 @@
 	value_value_free(&SortElem::callback->params[0].si_var->var->value);
 	value_value_free(&SortElem::callback->params[1].si_var->var->value);
 	
-	return result.int_val;
+	return result.int_val != 0;
 }
 
 void php_native_usort(PHP_VALUE_NODE *)
@@ -306,56 +313,84 @@
 		php_report_error(PHP_ERROR, "Invalid or missing argument: string");
 		return;		
 	}
+#ifdef PHP_STANDALONE_EN
 	regex_t preg;
 	char error_buff[256];
 	int reg_result = regcomp(&preg, pattern->str_val, REG_EXTENDED);
 	if ( reg_result ) {
 		regerror(reg_result, &preg, error_buff, sizeof(error_buff));
 		php_report_error(PHP_ERROR, "Failed in regcomp: %s", error_buff);
+#else
+	wxRegEx preg;
+	if (!preg.Compile(wxString(char2unicode(pattern->str_val)), wxRE_EXTENDED)) {
+		php_report_error(PHP_ERROR, "Failed in Compile of: %s", pattern->str_val);
+#endif
 		return;
 	}
+
+#ifdef PHP_STANDALONE_EN
 	size_t nmatch = strlen(string_to_split->str_val);
 	regmatch_t *pmatch = new regmatch_t[nmatch];
-	
+#endif
 	char *str_2_match = string_to_split->str_val;
 	char *tmp_buff = new char[strlen(string_to_split->str_val)+1];
 	
 	while ( 1 ) {
 //		printf("matching: %s\n", str_2_match);
+#ifdef PHP_STANDALONE_EN
 		reg_result = regexec(&preg, str_2_match, nmatch, pmatch, 0);
 		if ( reg_result ) {
+#else
+		if (!preg.Matches(wxString(char2unicode(str_2_match)))) {
+#endif
 			// no match
 			break;
 		}
-//		for(int i = 0; pmatch[i].rm_so >= 0; i++) {
-//			printf("match [%d] %d - %d\n", i, pmatch[i].rm_so, pmatch[i].rm_eo);
-//		}
-	
+#ifndef PHP_STANDALONE_EN
+		// get matching position
+		size_t start, len;
+		if (!preg.GetMatch(&start, &len)) {
+			break;	// shouldn't happen
+		}
+#endif	
 		/*
 		 * I will use only first match, since I don't see any sense to have more
 		 * then 1 match in split() call
 		 */
+#ifdef PHP_STANDALONE_EN
 		for(int i = 0; i < pmatch[0].rm_so; i++) {
+#else
+		for(size_t i = 0; i < start; i++) {
+#endif
 			tmp_buff[i] = str_2_match[i];
 		}
+#ifdef PHP_STANDALONE_EN
 		tmp_buff[pmatch[0].rm_so] = 0;
+#else
+		tmp_buff[start] = 0;
+#endif
 //		printf("Match added [%s]\n", tmp_buff);
 		
 		PHP_VAR_NODE *match_val = array_push_back(result);
 		match_val->value.type = PHP_VAL_STRING;
 		match_val->value.str_val = strdup(tmp_buff);
 
+#ifdef PHP_STANDALONE_EN
 		str_2_match += pmatch[0].rm_eo;
+#else
+		str_2_match += start + len;
+#endif
 	}
 
 	PHP_VAR_NODE *match_val = array_push_back(result);
 	match_val->value.type = PHP_VAL_STRING;
 	match_val->value.str_val = strdup(str_2_match);
 	
-	delete [] pmatch;
 	delete [] tmp_buff;
-	
+#ifdef PHP_STANDALONE_EN
+	delete [] pmatch;
 	regfree(&preg);
+#endif
 }
 
 #ifdef ENABLE_NLS
@@ -500,12 +535,12 @@
 	m_server = server;
 
 	php_engine_init();
-	yyin = fopen(file, "r");
-	if ( !yyin ) {
+	phpin = fopen(file, "r");
+	if ( !phpin ) {
 		return;
 	}
 
-	yyparse();
+	phpparse();
 	
 	m_syn_tree_top = g_syn_tree_top;
 	m_global_scope = g_global_scope;
@@ -522,7 +557,7 @@
 	m_global_scope = g_global_scope;
 
 	php_set_input_buffer(php_buf, len);
-	yyparse();
+	phpparse();
 	
 	m_syn_tree_top = g_syn_tree_top;
 }
@@ -580,20 +615,24 @@
 	}
 }
 
+
 CPhpFilter::CPhpFilter(CWebServerBase *server, CSession *sess,
 			const char *file, CWriteStrBuffer *buff)
 {
 	FILE *f = fopen(file, "r");
 	if ( !f ) {
+		printf("ERROR: php can not open source file [%s]\n", file);
 		return;
 	}
 	if ( fseek(f, 0, SEEK_END) != 0 ) {
+		printf("ERROR: fseek failed on php source file [%s]\n", file); 
 		return;
 	}
 	int size = ftell(f);
 	char *buf = new char [size+1];
 	rewind(f);
-	fread(buf, 1, size, f);
+	// fread may actually read less if it is a CR-LF-file in Windows
+	size = fread(buf, 1, size, f);
 	buf[size] = 0;
 	fclose(f);
 	char *scan_ptr = buf;
@@ -617,24 +656,30 @@
 
 		CPhPLibContext *context = new CPhPLibContext(server, scan_ptr, len);
 
-
+#ifndef PHP_STANDALONE_EN
 		load_session_vars("HTTP_GET_VARS", sess->m_get_vars);
 		load_session_vars("_SESSION", sess->m_vars);
+#endif
 
 		context->Execute(buff);
 
+#ifndef PHP_STANDALONE_EN
 		save_session_vars(sess->m_vars);
+#endif
 
 		delete context;
 		
 		scan_ptr = curr_code_end;
 	}
 
+#ifndef PHP_STANDALONE_EN
 	sess->m_get_vars.clear();
+#endif
 
 	delete [] buf;
 }
 
+
 /*
  * String buffer: almost same as regular 'string' class, but,
  * without reallocation when full. Instead, new buffer is

aMule-2.2.6.tar.bz2/src/webserver/src/php_core_lib.h -> aMule-2.3.1.tar.bz2/src/webserver/src/php_core_lib.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2005-2009 Froenchenko Leonid ( lfroen@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-2011 Froenchenko Leonid ( lfroen@gmail.com / 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
@@ -46,7 +46,7 @@
 		
 		void Write(const char *s, int len = -1);
 		void CopyAll(char *dst_buffer);
-		const int Length() { return m_total_length; }
+		int Length() { return m_total_length; }
 };
 
 class CWebServerBase;
@@ -57,9 +57,8 @@
 		PHP_SCOPE_TABLE m_global_scope;
 		
 		CWriteStrBuffer *m_curr_str_buffer;
-#ifndef PHP_STANDALONE_EN
+
 		CWebServerBase *m_server;
-#endif		
 	public:
 		// parse file and take a "snapshot" of global vars
 		CPhPLibContext(CWebServerBase *server, const char *file);
@@ -70,7 +69,7 @@
 		void SetContext();
 		void Execute(CWriteStrBuffer *);
 		
-#if defined(__GNUC__)
+#ifdef __GNUC__
 		static void Printf(const char *str, ...)  __attribute__ ((__format__ (__printf__, 1, 2)));
 #else
 		static void Printf(const char *str, ...);

aMule-2.2.6.tar.bz2/src/webserver/src/php_lexer.c -> aMule-2.3.1.tar.bz2/src/webserver/src/php_lexer.c Changed

@@ -1,32 +1,93 @@
 #line 2 "php_lexer.c"
-/* A lexical scanner generated by flex*/
 
-/* Scanner skeleton version:
- * $Header: /home/daffy/u0/vern/flex/RCS/flex.skl,v 2.91 96/09/10 16:58:48 vern Exp $
- */
+#line 4 "php_lexer.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 33
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
 
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
 #include <stdio.h>
-#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
+/* end standard C headers. */
 
-/* cfront 1.2 defines "c_plusplus" instead of "__cplusplus" */
-#ifdef c_plusplus
-#ifndef __cplusplus
-#define __cplusplus
-#endif
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if __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. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
 #endif
 
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+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 short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
 
-#ifdef __cplusplus
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
 
-#include <stdlib.h>
+#endif /* ! FLEXINT_H */
 
-/* Use prototypes in function declarations. */
-#define YY_USE_PROTOS
+#ifdef __cplusplus
 
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
@@ -35,34 +96,17 @@
 
 #if __STDC__
 
-#define YY_USE_PROTOS
 #define YY_USE_CONST
 
 #endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 
-#ifdef __TURBOC__
- #pragma warn -rch
- #pragma warn -use
-#include <io.h>
-#include <stdlib.h>
-#define YY_USE_CONST
-#define YY_USE_PROTOS
-#endif
-
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yyconst
 #endif
 
-
-#ifdef YY_USE_PROTOS
-#define YY_PROTO(proto) proto
-#else
-#define YY_PROTO(proto) ()
-#endif
-
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
@@ -77,80 +121,88 @@
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
-#define BEGIN yy_start = 1 + 2 *
+#define BEGIN (yy_start) = 1 + 2 *
 
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
-#define YY_START ((yy_start - 1) / 2)
+#define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
 
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
 
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE yyrestart( yyin )
+#define YY_NEW_FILE phprestart(phpin  )
 
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
 #define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
 
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+extern int phpleng;
 
-extern int yyleng;
-extern FILE *yyin, *yyout;
+extern FILE *phpin, *phpout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
 
-/* The funky do-while in the following #define is used to turn the definition
- * int a single C statement (which needs a semi-colon terminator).  This
- * avoids problems with code like:
- *
- * 	if ( condition_holds )
- *		yyless( 5 );
- *	else
- *		do_something_else();
- *
- * Prior to using the do-while the compiler would get upset at the
- * "else" because it interpreted the "if" statement as being all
- * done when it reached the ';' after the yyless() call.
- */
-
-/* Return all but the first 'n' matched characters back to the input stream. */
-
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE phplex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-phplineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < phpleng; ++yyl )\
+                    if ( phptext[yyl] == '\n' )\
+                        --phplineno;\
+            }while(0)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up yytext. */ \
-		*yy_cp = yy_hold_char; \
+		/* Undo effects of setting up phptext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
-		yy_c_buf_p = yy_cp = yy_bp + n - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+		YY_DO_BEFORE_ACTION; /* set up phptext again */ \
 		} \
 	while ( 0 )
 
-#define unput(c) yyunput( c, yytext_ptr )
-
-/* Some routines like yy_flex_realloc() are emitted as static but are
-   not called by all lexers. This generates warnings in some compilers,
-   notably GCC. Arrange to suppress these. */
-#ifdef __GNUC__
-#define YY_MAY_BE_UNUSED __attribute__((unused))
-#else
-#define YY_MAY_BE_UNUSED
-#endif
+#define unput(c) yyunput( c, (yytext_ptr)  )
 
 /* The following is because we cannot portably get our hands on size_t
  * (without autoconf's help, which isn't available because we want
  * flex-generated scanners to compile on their own).
  */
-typedef unsigned int yy_size_t;
 
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
 
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 	{
 	FILE *yy_input_file;
@@ -187,12 +239,16 @@
 	 */
 	int yy_at_bol;
 
+    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.
 	 */
 	int yy_fill_buffer;
 
 	int yy_buffer_status;
+
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 	/* When an EOF's been seen but there's still some text to process
@@ -202,177 +258,168 @@
 	 * possible backing-up.
 	 *
 	 * When we actually see the EOF, we change the status to "new"
-	 * (via yyrestart()), so that the user can continue scanning by
-	 * just pointing yyin at a new input file.
+	 * (via phprestart()), so that the user can continue scanning by
+	 * just pointing phpin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
+
 	};
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-static YY_BUFFER_STATE yy_current_buffer = 0;
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
  * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
  */
-#define YY_CURRENT_BUFFER yy_current_buffer
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
 
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when yytext is formed. */
+/* yy_hold_char holds the character lost when phptext is formed. */
 static char yy_hold_char;
-
 static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-
-
-int yyleng;
+int phpleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
-static int yy_init = 1;		/* whether we need to initialize */
+static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow yywrap()'s to do buffer switches
- * instead of setting up a fresh yyin.  A bit of a hack ...
+/* Flag which is used to allow phpwrap()'s to do buffer switches
+ * instead of setting up a fresh phpin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void yyrestart YY_PROTO(( FILE *input_file ));
+void phprestart (FILE *input_file  );
+void php_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE php_create_buffer (FILE *file,int size  );
+void php_delete_buffer (YY_BUFFER_STATE b  );
+void php_flush_buffer (YY_BUFFER_STATE b  );
+void phppush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void phppop_buffer_state (void );
 
-void yy_switch_to_buffer YY_PROTO(( YY_BUFFER_STATE new_buffer ));
-void yy_load_buffer_state YY_PROTO(( void ));
-YY_BUFFER_STATE yy_create_buffer YY_PROTO(( FILE *file, int size ));
-void yy_delete_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-void yy_init_buffer YY_PROTO(( YY_BUFFER_STATE b, FILE *file ));
-void yy_flush_buffer YY_PROTO(( YY_BUFFER_STATE b ));
-#define YY_FLUSH_BUFFER yy_flush_buffer( yy_current_buffer )
+static void phpensure_buffer_stack (void );
+static void php_load_buffer_state (void );
+static void php_init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
-YY_BUFFER_STATE yy_scan_buffer YY_PROTO(( char *base, yy_size_t size ));
-YY_BUFFER_STATE yy_scan_string YY_PROTO(( yyconst char *yy_str ));
-YY_BUFFER_STATE yy_scan_bytes YY_PROTO(( yyconst char *bytes, int len ));
+#define YY_FLUSH_BUFFER php_flush_buffer(YY_CURRENT_BUFFER )
 
-static void *yy_flex_alloc YY_PROTO(( yy_size_t ));
-static void *yy_flex_realloc YY_PROTO(( void *, yy_size_t )) YY_MAY_BE_UNUSED;
-static void yy_flex_free YY_PROTO(( void * ));
+YY_BUFFER_STATE php_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE php_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE php_scan_bytes (yyconst char *bytes,int len  );
 
-#define yy_new_buffer yy_create_buffer
+void *phpalloc (yy_size_t  );
+void *phprealloc (void *,yy_size_t  );
+void phpfree (void *  );
+
+#define yy_new_buffer php_create_buffer
 
 #define yy_set_interactive(is_interactive) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_is_interactive = is_interactive; \
+	if ( ! YY_CURRENT_BUFFER ){ \
+        phpensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            php_create_buffer(phpin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
 
 #define yy_set_bol(at_bol) \
 	{ \
-	if ( ! yy_current_buffer ) \
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE ); \
-	yy_current_buffer->yy_at_bol = at_bol; \
+	if ( ! YY_CURRENT_BUFFER ){\
+        phpensure_buffer_stack (); \
+		YY_CURRENT_BUFFER_LVALUE =    \
+            php_create_buffer(phpin,YY_BUF_SIZE ); \
+	} \
+	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
 
-#define YY_AT_BOL() (yy_current_buffer->yy_at_bol)
-
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
-#define YY_USES_REJECT
 typedef unsigned char YY_CHAR;
-FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
+FILE *phpin = (FILE *) 0, *phpout = (FILE *) 0;
+
 typedef int yy_state_type;
-extern int yylineno;
-int yylineno = 1;
-extern char *yytext;
-#define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state YY_PROTO(( void ));
-static yy_state_type yy_try_NUL_trans YY_PROTO(( yy_state_type current_state ));
-static int yy_get_next_buffer YY_PROTO(( void ));
-static void yy_fatal_error YY_PROTO(( yyconst char msg[] ));
+extern int phplineno;
+
+int phplineno = 1;
+
+extern char *phptext;
+#define yytext_ptr phptext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up yytext.
+ * corresponding action - sets up phptext.
  */
 #define YY_DO_BEFORE_ACTION \
-	yytext_ptr = yy_bp; \
-	yytext_ptr -= yy_more_len; \
-	yyleng = (int) (yy_cp - yytext_ptr); \
-	yy_hold_char = *yy_cp; \
+	(yytext_ptr) = yy_bp; \
+	(yytext_ptr) -= (yy_more_len); \
+	phpleng = (size_t) (yy_cp - (yytext_ptr)); \
+	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
-	yy_c_buf_p = yy_cp;
+	(yy_c_buf_p) = yy_cp;
 
 #define YY_NUM_RULES 79
 #define YY_END_OF_BUFFER 80
-static yyconst short int yy_acclist[317] =
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+	{
+	flex_int32_t yy_verify;
+	flex_int32_t yy_nxt;
+	};
+static yyconst flex_int16_t yy_accept[276] =
     {   0,
-       59,   59,   80,   78,   79,   77,   78,   79,   77,   79,
-       78,   79,   78,   79,   65,   78,   79,   78,   79,   78,
-       79,   78,   79,   78,   79,   78,   79,   78,   79,   78,
-       79,   78,   79,   78,   79,   78,   79,   73,   78,   79,
-       73,   78,   79,   78,   79,   78,   79,   78,   79,   78,
-       79,   71,   78,   79,   78,   79,   71,   78,   79,   71,
-       78,   79,   71,   78,   79,   71,   78,   79,   71,   78,
-       79,   71,   78,   79,   71,   78,   79,   71,   78,   79,
-       71,   78,   79,   71,   78,   79,   71,   78,   79,   71,
-       78,   79,   71,   78,   79,   71,   78,   79,   71,   78,
-
-       79,   71,   78,   79,   78,   79,   79,   79,   66,   79,
-       67,   79,   67,   79,   59,   79,   79,   53,   75,   70,
-       44,   38,   45,   76,   41,   31,   39,   32,   40,   28,
-       74,   43,   68,   65,   42,   74,   73,   54,   52,   33,
-       55,    2,   71,   47,   71,   71,   17,   71,   71,   71,
-       71,   71,   71,   13,   71,   71,   71,   71,   71,   71,
-       71,   71,    7,   71,   71,   71,   71,   34,   71,   71,
-       71,   71,   71,   71,   71,   46,   37,   69,   66,   67,
-       59,   70,   74,   72,   48,   50,   49,   36,   71,   71,
-       71,   71,   71,   71,    3,   71,   71,   71,   71,   71,
-
-       14,   71,   71,   71,   71,   71,   27,   71,   71,   71,
-       71,   71,   71,   35,   71,   60,   51,   71,   71,   21,
-       71,   71,   71,   71,   25,   71,    8,   71,   71,   71,
+        0,    0,    0,    0,    0,    0,   59,   59,   80,   78,
+       77,   77,   78,   78,   65,   78,   78,   78,   78,   78,
+       78,   78,   78,   78,   78,   73,   73,   78,   78,   78,
+       78,   71,   78,   71,   71,   71,   71,   71,   71,   71,
+       71,   71,   71,   71,   71,   71,   71,   71,   71,   78,
+       79,   79,   66,   67,   67,   59,   79,   53,    0,   75,
+        0,   70,   44,   38,   45,    0,   76,    0,    0,    0,
+        0,    0,    0,    0,    0,   41,   31,   39,   32,   40,
+       28,   74,   43,   68,   65,   42,   74,   73,    0,    0,
+       54,    0,   52,   33,   55,    0,    2,   71,   47,   71,
+
+       71,   17,   71,   71,   71,   71,   71,   13,   71,   71,
+       71,   71,   71,   71,   71,    7,   71,   71,   71,   34,
+       71,   71,   71,   71,   71,   71,   46,   37,   69,   66,
+       67,   59,    0,    0,   70,    0,    0,    0,    0,    0,
+        0,   74,   72,   48,    0,   50,   49,   36,   71,   71,
+       71,   71,   71,    3,   71,   71,   71,   71,   14,   71,
+       71,   71,   71,   27,   71,   71,   71,   71,   71,   35,
+       60,    0,   51,    0,    0,    0,    0,    0,    0,    0,
+       71,   71,   21,   71,   71,   71,   25,    8,   71,   71,
        71,   71,   71,   71,   71,   71,   29,   71,   71,   71,
-       71,   71,   71,   61,    1,   30,   71,   23,   71,    5,
-       71,   71,   71,   71,   71,   10,   71,   71,   71,   71,
-       71,   71,   71,   26,   71,   71,   71,   71,   11,   71,
-       64,   62,   71,   71,    9,   71,   15,   71,   71,   71,
-       71,   71,   56,   71,   71,    6,   71,   57,   71,   19,
-       71,   71,   22,   71,   71,   71,   71,   16,   71,   71,
-
-       58,   71,   63,   24,   71,   71,   71,   12,   71,    4,
-       71,   71,   20,   71,   18,   71
-    } ;
 
-static yyconst short int yy_accept[277] =
-    {   0,
-        1,    1,    1,    1,    1,    1,    1,    2,    3,    4,
-        6,    9,   11,   13,   15,   18,   20,   22,   24,   26,
-       28,   30,   32,   34,   36,   38,   41,   44,   46,   48,
-       50,   52,   55,   57,   60,   63,   66,   69,   72,   75,
-       78,   81,   84,   87,   90,   93,   96,   99,  102,  105,
-      107,  108,  109,  111,  113,  115,  117,  118,  119,  119,
-      120,  120,  121,  122,  123,  124,  124,  125,  125,  125,
-      125,  125,  125,  125,  125,  125,  126,  127,  128,  129,
-      130,  131,  132,  133,  134,  135,  136,  137,  138,  138,
-      138,  139,  139,  140,  141,  142,  142,  143,  144,  145,
-
-      146,  147,  149,  150,  151,  152,  153,  154,  156,  157,
-      158,  159,  160,  161,  162,  163,  165,  166,  167,  168,
-      170,  171,  172,  173,  174,  175,  176,  177,  178,  179,
-      180,  181,  182,  182,  182,  183,  183,  183,  183,  183,
-      183,  183,  184,  185,  186,  186,  187,  188,  190,  191,
-      192,  193,  194,  195,  197,  198,  199,  200,  201,  203,
-      204,  205,  206,  207,  209,  210,  211,  212,  213,  214,
-      216,  217,  217,  218,  218,  218,  218,  218,  218,  218,
-      218,  219,  220,  222,  223,  224,  225,  227,  229,  230,
-      231,  232,  233,  234,  235,  236,  237,  239,  240,  241,
-
-      242,  243,  244,  244,  244,  244,  244,  245,  245,  245,
-      245,  246,  248,  250,  252,  253,  254,  255,  256,  258,
-      259,  260,  261,  262,  263,  264,  266,  267,  268,  269,
-      271,  271,  272,  272,  272,  272,  272,  273,  273,  274,
-      275,  277,  279,  280,  281,  282,  283,  285,  286,  288,
-      290,  292,  292,  292,  292,  293,  295,  296,  297,  298,
-      300,  301,  303,  303,  303,  303,  304,  306,  307,  308,
-      310,  312,  313,  315,  317,  317
+       71,   71,    0,    0,    0,    0,   61,    0,    0,    0,
+        1,   30,   23,    5,   71,   71,   71,   71,   10,   71,
+       71,   71,   71,   71,   71,   26,   71,   71,   71,   11,
+        0,   64,    0,    0,    0,    0,   62,    0,   71,   71,
+        9,   15,   71,   71,   71,   71,   56,   71,    6,   57,
+       19,    0,    0,    0,   71,   22,   71,   71,   71,   16,
+       71,   58,    0,    0,    0,   63,   24,   71,   71,   12,
+        4,   71,   20,   18,    0
     } ;
 
-static yyconst int yy_ec[256] =
+static yyconst flex_int32_t yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         4,    4,    5,    1,    1,    1,    1,    1,    1,    1,
@@ -404,17 +451,17 @@
         1,    1,    1,    1,    1
     } ;
 
-static yyconst int yy_meta[52] =
+static yyconst flex_int32_t yy_meta[52] =
     {   0,
         1,    1,    2,    1,    2,    1,    1,    1,    1,    1,
-        1,    3,    1,    1,    1,    1,    1,    3,    1,    4,
+        1,    3,    1,    1,    1,    1,    3,    3,    1,    4,
         4,    1,    1,    1,    1,    5,    6,    1,    1,    5,
         5,    5,    5,    5,    5,    6,    6,    6,    6,    6,
         6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
         1
     } ;
 
-static yyconst short int yy_base[287] =
+static yyconst flex_int16_t yy_base[287] =
     {   0,
         0,    0,  343,  342,   49,   50,   54,   55,  356,  359,
       359,  359,  332,   51,  359,    0,  331,   48,   48,   59,
@@ -449,7 +496,7 @@
       199,  205,  207,  210,  213,  216
     } ;
 
-static yyconst short int yy_def[287] =
+static yyconst flex_int16_t yy_def[287] =
     {   0,
       275,    1,  276,  276,  277,  277,  276,  276,  275,  275,
       275,  275,  275,  278,  275,  279,  275,  275,  280,  275,
@@ -484,7 +531,7 @@
       275,  275,  275,  275,  275,  275
     } ;
 
-static yyconst short int yy_nxt[411] =
+static yyconst flex_int16_t yy_nxt[411] =
     {   0,
        10,   11,   12,   11,   11,   13,   14,   15,   16,   17,
        18,   19,   20,   10,   21,   22,   23,   24,   25,   26,
@@ -533,7 +580,7 @@
       275,  275,  275,  275,  275,  275,  275,  275,  275,  275
     } ;
 
-static yyconst short int yy_chk[411] =
+static yyconst flex_int16_t yy_chk[411] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -582,30 +629,38 @@
       275,  275,  275,  275,  275,  275,  275,  275,  275,  275
     } ;
 
-static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
-static char *yy_full_match;
-static int yy_lp;
-#define REJECT \
-{ \
-*yy_cp = yy_hold_char; /* undo effects of setting up yytext */ \
-yy_cp = yy_full_match; /* restore poss. backed-over text */ \
-++yy_lp; \
-goto find_rule; \
-}
+/* Table of booleans, true if rule could match eol. */
+static yyconst flex_int32_t yy_rule_can_match_eol[80] =
+    {   0,
+0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
+    0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 
+        };
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int php_flex_debug;
+int php_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
 static int yy_more_flag = 0;
 static int yy_more_len = 0;
-#define yymore() (yy_more_flag = 1)
-#define YY_MORE_ADJ yy_more_len
+#define yymore() ((yy_more_flag) = 1)
+#define YY_MORE_ADJ (yy_more_len)
 #define YY_RESTORE_YY_MORE_OFFSET
-char *yytext;
+char *phptext;
 #line 1 "php_lexer.l"
-#define INITIAL 0
 #line 2 "php_lexer.l"
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2006 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2005-2006 Froenchenko Leonid ( lfroen@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-2011 Froenchenko Leonid ( lfroen@gmail.com / 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
@@ -633,36 +688,51 @@
 
 void php_set_input_buffer(char *buf, int len)
 {
-	yy_delete_buffer(YY_CURRENT_BUFFER);
-	yy_scan_bytes(buf, len);
+	php_delete_buffer(YY_CURRENT_BUFFER);
+	php_scan_bytes(buf,len);
 }
 
-int yywrap();
+int phpwrap();
 
 
 #define MAX_INCLUDE_DEPTH 10
 YY_BUFFER_STATE php_include_stack[MAX_INCLUDE_DEPTH];
 int php_include_stack_ptr = 0;
 
-int yywrap()
+int phpwrap()
 {
 	if ( --php_include_stack_ptr < 0 ) {
 		return 1;
 	} else {
-		yy_delete_buffer( YY_CURRENT_BUFFER );
-		yy_switch_to_buffer(php_include_stack[php_include_stack_ptr] );
+		php_delete_buffer(YY_CURRENT_BUFFER );
+		php_switch_to_buffer(php_include_stack[php_include_stack_ptr] );
 	}
 	return 0;
 }
 
-#define BLOCK_COMMENT 1
 
-#define LINE_COMMENT 2
 
+
+#line 717 "php_lexer.c"
+
+#define INITIAL 0
+#define BLOCK_COMMENT 1
+#define LINE_COMMENT 2
 #define INCLUDE 3
 
-#define YY_STACK_USED 1
-#line 666 "php_lexer.c"
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -670,79 +740,53 @@
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int yywrap YY_PROTO(( void ));
+extern "C" int phpwrap (void );
 #else
-extern int yywrap YY_PROTO(( void ));
+extern int phpwrap (void );
 #endif
 #endif
 
-#ifndef YY_NO_UNPUT
-static void yyunput YY_PROTO(( int c, char *buf_ptr ));
-#endif
-
+    static void yyunput (int c,char *buf_ptr  );
+    
 #ifndef yytext_ptr
-static void yy_flex_strncpy YY_PROTO(( char *, yyconst char *, int ));
+static void yy_flex_strncpy (char *,yyconst char *,int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen YY_PROTO(( yyconst char * ));
+static int yy_flex_strlen (yyconst char * );
 #endif
 
 #ifndef YY_NO_INPUT
-#ifdef __cplusplus
-static int yyinput YY_PROTO(( void ));
-#else
-static int input YY_PROTO(( void ));
-#endif
-#endif
-
-#if YY_STACK_USED
-static int yy_start_stack_ptr = 0;
-static int yy_start_stack_depth = 0;
-static int *yy_start_stack = 0;
-#ifndef YY_NO_PUSH_STATE
-static void yy_push_state YY_PROTO(( int new_state ));
-#endif
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state YY_PROTO(( void ));
-#endif
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state YY_PROTO(( void ));
-#endif
 
+#ifdef __cplusplus
+static int yyinput (void );
 #else
-#define YY_NO_PUSH_STATE 1
-#define YY_NO_POP_STATE 1
-#define YY_NO_TOP_STATE 1
+static int input (void );
 #endif
 
-#ifdef YY_MALLOC_DECL
-YY_MALLOC_DECL
-#else
-#if __STDC__
-#ifndef __cplusplus
-#include <stdlib.h>
-#endif
-#else
-/* Just try to get by without declaring the routines.  This will fail
- * miserably on non-ANSI systems for which sizeof(size_t) != sizeof(int)
- * or sizeof(void*) != sizeof(int).
- */
-#endif
 #endif
 
+        static int yy_start_stack_ptr = 0;
+        static int yy_start_stack_depth = 0;
+        static int *yy_start_stack = NULL;
+    
+    static void yy_push_state (int new_state );
+    
+    static void yy_pop_state (void );
+    
+    static int yy_top_state (void );
+    
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
 #define YY_READ_BUF_SIZE 8192
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
-
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#define ECHO (void) fwrite( phptext, phpleng, 1, phpout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -750,21 +794,35 @@
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
-	if ( yy_current_buffer->yy_is_interactive ) \
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
-		int c = '*', n; \
+		int c = '*'; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
-			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+			     (c = getc( phpin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( yyin ) ) \
+		if ( c == EOF && ferror( phpin ) ) \
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
-	else if ( ((result = fread( buf, 1, max_size, yyin )) == 0) \
-		  && ferror( yyin ) ) \
-		YY_FATAL_ERROR( "input in flex scanner failed" );
+	else \
+		{ \
+		errno=0; \
+		while ( (result = fread(buf, 1, max_size, phpin))==0 && ferror(phpin)) \
+			{ \
+			if( errno != EINTR) \
+				{ \
+				YY_FATAL_ERROR( "input in flex scanner failed" ); \
+				break; \
+				} \
+			errno=0; \
+			clearerr(phpin); \
+			} \
+		}\
+\
+
 #endif
 
 /* No semi-colon after return; correct usage is to write "yyterminate();" -
@@ -785,14 +843,20 @@
 #define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
 #endif
 
+/* end tables serialization structures and prototypes */
+
 /* Default declaration of generated scanner - a define so the user can
  * easily add parameters.
  */
 #ifndef YY_DECL
-#define YY_DECL int yylex YY_PROTO(( void ))
-#endif
+#define YY_DECL_IS_OURS 1
+
+extern int phplex (void);
+
+#define YY_DECL int phplex (void)
+#endif /* !YY_DECL */
 
-/* Code executed at the beginning of each rule, after yytext and yyleng
+/* Code executed at the beginning of each rule, after phptext and phpleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -807,66 +871,73 @@
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
+/** The main scanner function which does all the work.
+ */
 YY_DECL
-	{
+{
 	register yy_state_type yy_current_state;
-	register char *yy_cp = NULL, *yy_bp = NULL;
+	register char *yy_cp, *yy_bp;
 	register int yy_act;
-
+    
 #line 73 "php_lexer.l"
 
 
-#line 820 "php_lexer.c"
+#line 886 "php_lexer.c"
 
-	if ( yy_init )
+	if ( !(yy_init) )
 		{
-		yy_init = 0;
+		(yy_init) = 1;
 
 #ifdef YY_USER_INIT
 		YY_USER_INIT;
 #endif
 
-		if ( ! yy_start )
-			yy_start = 1;	/* first start state */
+		if ( ! (yy_start) )
+			(yy_start) = 1;	/* first start state */
 
-		if ( ! yyin )
-			yyin = stdin;
+		if ( ! phpin )
+			phpin = stdin;
 
-		if ( ! yyout )
-			yyout = stdout;
+		if ( ! phpout )
+			phpout = stdout;
 
-		if ( ! yy_current_buffer )
-			yy_current_buffer =
-				yy_create_buffer( yyin, YY_BUF_SIZE );
+		if ( ! YY_CURRENT_BUFFER ) {
+			phpensure_buffer_stack ();
+			YY_CURRENT_BUFFER_LVALUE =
+				php_create_buffer(phpin,YY_BUF_SIZE );
+		}
 
-		yy_load_buffer_state();
+		php_load_buffer_state( );
 		}
 
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
-		yy_more_len = 0;
-		if ( yy_more_flag )
+		(yy_more_len) = 0;
+		if ( (yy_more_flag) )
 			{
-			yy_more_len = yy_c_buf_p - yytext_ptr;
-			yy_more_flag = 0;
+			(yy_more_len) = (yy_c_buf_p) - (yytext_ptr);
+			(yy_more_flag) = 0;
 			}
-		yy_cp = yy_c_buf_p;
+		yy_cp = (yy_c_buf_p);
 
-		/* Support of yytext. */
-		*yy_cp = yy_hold_char;
+		/* Support of phptext. */
+		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
 		 * the current run.
 		 */
 		yy_bp = yy_cp;
 
-		yy_current_state = yy_start;
-		yy_state_ptr = yy_state_buf;
-		*yy_state_ptr++ = yy_current_state;
+		yy_current_state = (yy_start);
 yy_match:
 		do
 			{
 			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			if ( yy_accept[yy_current_state] )
+				{
+				(yy_last_accepting_state) = yy_current_state;
+				(yy_last_accepting_cpos) = yy_cp;
+				}
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
@@ -874,45 +945,42 @@
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-			*yy_state_ptr++ = yy_current_state;
 			++yy_cp;
 			}
 		while ( yy_base[yy_current_state] != 359 );
 
 yy_find_action:
-		yy_current_state = *--yy_state_ptr;
-		yy_lp = yy_accept[yy_current_state];
-find_rule: /* we branch to this label when backing up */
-		for ( ; ; ) /* until we find what rule we matched */
-			{
-			if ( yy_lp && yy_lp < yy_accept[yy_current_state + 1] )
-				{
-				yy_act = yy_acclist[yy_lp];
-					{
-					yy_full_match = yy_cp;
-					break;
-					}
-				}
-			--yy_cp;
-			yy_current_state = *--yy_state_ptr;
-			yy_lp = yy_accept[yy_current_state];
+		yy_act = yy_accept[yy_current_state];
+		if ( yy_act == 0 )
+			{ /* have to back up */
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			yy_act = yy_accept[yy_current_state];
 			}
 
 		YY_DO_BEFORE_ACTION;
 
-		if ( yy_act != YY_END_OF_BUFFER )
+		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
 			{
 			int yyl;
-			for ( yyl = 0; yyl < yyleng; ++yyl )
-				if ( yytext[yyl] == '\n' )
-					++yylineno;
+			for ( yyl = (yy_more_len); yyl < phpleng; ++yyl )
+				if ( phptext[yyl] == '\n' )
+					   
+    phplineno++;
+;
 			}
 
 do_action:	/* This label is used only to access EOF actions. */
 
-
 		switch ( yy_act )
 	{ /* beginning of action switch */
+			case 0: /* must back up */
+			/* undo the effects of YY_DO_BEFORE_ACTION */
+			*yy_cp = (yy_hold_char);
+			yy_cp = (yy_last_accepting_cpos);
+			yy_current_state = (yy_last_accepting_state);
+			goto yy_find_action;
+
 case 1:
 YY_RULE_SETUP
 #line 75 "php_lexer.l"
@@ -1212,16 +1280,16 @@
 YY_RULE_SETUP
 #line 153 "php_lexer.l"
 {
-	yytext[strlen(yytext)-1] = 0;
+	phptext[strlen(phptext)-1] = 0;
 	if ( php_include_stack_ptr >= MAX_INCLUDE_DEPTH ) {
 		fprintf( stderr, "WARNING: maximum include depth (which is %d) exceed", MAX_INCLUDE_DEPTH);
 	} else {
 		php_include_stack[php_include_stack_ptr++] = YY_CURRENT_BUFFER;
-		yyin = fopen(yytext+1, "r");
-		if ( !yyin ) {
-			printf("WARNING: include file [%s] can not be opened\n", yytext+1);
+		phpin = fopen(phptext+1, "r");
+		if ( !phpin ) {
+			printf("WARNING: include file [%s] can not be opened\n", phptext+1);
 		} else {
-			yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE ));
+			php_switch_to_buffer(php_create_buffer(phpin,YY_BUF_SIZE ));
 		}
 	}
         BEGIN(INITIAL);
@@ -1271,6 +1339,7 @@
 	}
 	YY_BREAK
 case 67:
+/* rule 67 can match eol */
 YY_RULE_SETUP
 #line 194 "php_lexer.l"
 {
@@ -1296,7 +1365,7 @@
 YY_RULE_SETUP
 #line 207 "php_lexer.l"
 {
-        yylval.exp_node = get_var_node(yytext+1);
+        phplval.exp_node = get_var_node(phptext+1);
         return VARIABLE;
 	}
 	YY_BREAK
@@ -1304,7 +1373,7 @@
 YY_RULE_SETUP
 #line 212 "php_lexer.l"
 {
-        strcpy(yylval.str_val, yytext);
+        strcpy(phplval.str_val, phptext);
         return IDENT;
 	}
 	YY_BREAK
@@ -1313,8 +1382,8 @@
 #line 217 "php_lexer.l"
 {
 	int val;
-	sscanf(yytext, "0x%x", &val);
-	yylval.exp_node = make_const_exp_dnum(val);
+	sscanf(phptext, "0x%x", &val);
+	phplval.exp_node = make_const_exp_dnum(val);
 	return DNUMBER;
 	}
 	YY_BREAK
@@ -1322,7 +1391,7 @@
 YY_RULE_SETUP
 #line 224 "php_lexer.l"
 {
-	yylval.exp_node = make_const_exp_dnum(atoi(yytext));
+	phplval.exp_node = make_const_exp_dnum(atoi(phptext));
 	return DNUMBER;
 	}
 	YY_BREAK
@@ -1330,29 +1399,32 @@
 YY_RULE_SETUP
 #line 229 "php_lexer.l"
 {
-	yylval.exp_node = make_const_exp_fnum(atof(yytext));
+	phplval.exp_node = make_const_exp_fnum(atof(phptext));
 	return FNUMBER;
 	}
 	YY_BREAK
 case 75:
+/* rule 75 can match eol */
 YY_RULE_SETUP
 #line 234 "php_lexer.l"
 {
-		yytext[strlen(yytext)-1] = 0;
-		yylval.exp_node = make_const_exp_str(yytext+1, 1);
+		phptext[strlen(phptext)-1] = 0;
+		phplval.exp_node = make_const_exp_str(phptext+1, 1);
 		return STRING;
 }
 	YY_BREAK
 case 76:
+/* rule 76 can match eol */
 YY_RULE_SETUP
 #line 240 "php_lexer.l"
 {
-		yytext[strlen(yytext)-1] = 0;
-		yylval.exp_node = make_const_exp_str(yytext+1, 0);
+		phptext[strlen(phptext)-1] = 0;
+		phplval.exp_node = make_const_exp_str(phptext+1, 0);
 		return STRING;
 }
 	YY_BREAK
 case 77:
+/* rule 77 can match eol */
 YY_RULE_SETUP
 #line 246 "php_lexer.l"
 {  }
@@ -1361,7 +1433,7 @@
 YY_RULE_SETUP
 #line 248 "php_lexer.l"
 {
-		return yytext[0];
+		return phptext[0];
 }
 	YY_BREAK
 case 79:
@@ -1369,36 +1441,36 @@
 #line 251 "php_lexer.l"
 ECHO;
 	YY_BREAK
-#line 1373 "php_lexer.c"
-			case YY_STATE_EOF(INITIAL):
-			case YY_STATE_EOF(BLOCK_COMMENT):
-			case YY_STATE_EOF(LINE_COMMENT):
-			case YY_STATE_EOF(INCLUDE):
-				yyterminate();
+#line 1445 "php_lexer.c"
+case YY_STATE_EOF(INITIAL):
+case YY_STATE_EOF(BLOCK_COMMENT):
+case YY_STATE_EOF(LINE_COMMENT):
+case YY_STATE_EOF(INCLUDE):
+	yyterminate();
 
 	case YY_END_OF_BUFFER:
 		{
 		/* Amount of text matched not including the EOB char. */
-		int yy_amount_of_matched_text = (int) (yy_cp - yytext_ptr) - 1;
+		int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
 
 		/* Undo the effects of YY_DO_BEFORE_ACTION. */
-		*yy_cp = yy_hold_char;
+		*yy_cp = (yy_hold_char);
 		YY_RESTORE_YY_MORE_OFFSET
 
-		if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_NEW )
+		if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
-			 * just pointed yyin at a new source and called
-			 * yylex().  If so, then we have to assure
-			 * consistency between yy_current_buffer and our
+			 * just pointed phpin at a new source and called
+			 * phplex().  If so, then we have to assure
+			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
-			yy_n_chars = yy_current_buffer->yy_n_chars;
-			yy_current_buffer->yy_input_file = yyin;
-			yy_current_buffer->yy_buffer_status = YY_BUFFER_NORMAL;
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = phpin;
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
 		/* Note that here we test for yy_c_buf_p "<=" to the position
@@ -1408,13 +1480,13 @@
 		 * end-of-buffer state).  Contrast this with the test
 		 * in input().
 		 */
-		if ( yy_c_buf_p <= &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			{ /* This was really a NUL. */
 			yy_state_type yy_next_state;
 
-			yy_c_buf_p = yytext_ptr + yy_amount_of_matched_text;
+			(yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
 
-			yy_current_state = yy_get_previous_state();
+			yy_current_state = yy_get_previous_state(  );
 
 			/* Okay, we're now positioned to make the NUL
 			 * transition.  We couldn't have
@@ -1427,41 +1499,41 @@
 
 			yy_next_state = yy_try_NUL_trans( yy_current_state );
 
-			yy_bp = yytext_ptr + YY_MORE_ADJ;
+			yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 
 			if ( yy_next_state )
 				{
 				/* Consume the NUL. */
-				yy_cp = ++yy_c_buf_p;
+				yy_cp = ++(yy_c_buf_p);
 				yy_current_state = yy_next_state;
 				goto yy_match;
 				}
 
 			else
 				{
-				yy_cp = yy_c_buf_p;
+				yy_cp = (yy_c_buf_p);
 				goto yy_find_action;
 				}
 			}
 
-		else switch ( yy_get_next_buffer() )
+		else switch ( yy_get_next_buffer(  ) )
 			{
 			case EOB_ACT_END_OF_FILE:
 				{
-				yy_did_buffer_switch_on_eof = 0;
+				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( yywrap() )
+				if ( phpwrap( ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
-					 * yytext, we can now set up
+					 * phptext, we can now set up
 					 * yy_c_buf_p so that if some total
 					 * hoser (like flex itself) wants to
 					 * call the scanner after we return the
 					 * YY_NULL, it'll still work - another
 					 * YY_NULL will get returned.
 					 */
-					yy_c_buf_p = yytext_ptr + YY_MORE_ADJ;
+					(yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
 
 					yy_act = YY_STATE_EOF(YY_START);
 					goto do_action;
@@ -1469,30 +1541,30 @@
 
 				else
 					{
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 					}
 				break;
 				}
 
 			case EOB_ACT_CONTINUE_SCAN:
-				yy_c_buf_p =
-					yytext_ptr + yy_amount_of_matched_text;
+				(yy_c_buf_p) =
+					(yytext_ptr) + yy_amount_of_matched_text;
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_match;
 
 			case EOB_ACT_LAST_MATCH:
-				yy_c_buf_p =
-				&yy_current_buffer->yy_ch_buf[yy_n_chars];
+				(yy_c_buf_p) =
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
 
-				yy_current_state = yy_get_previous_state();
+				yy_current_state = yy_get_previous_state(  );
 
-				yy_cp = yy_c_buf_p;
-				yy_bp = yytext_ptr + YY_MORE_ADJ;
+				yy_cp = (yy_c_buf_p);
+				yy_bp = (yytext_ptr) + YY_MORE_ADJ;
 				goto yy_find_action;
 			}
 		break;
@@ -1503,8 +1575,7 @@
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
-	} /* end of yylex */
-
+} /* end of phplex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -1513,21 +1584,20 @@
  *	EOB_ACT_CONTINUE_SCAN - continue scanning from current position
  *	EOB_ACT_END_OF_FILE - end of file
  */
-
-static int yy_get_next_buffer()
-	{
-	register char *dest = yy_current_buffer->yy_ch_buf;
-	register char *source = yytext_ptr;
+static int yy_get_next_buffer (void)
+{
+    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	register char *source = (yytext_ptr);
 	register int number_to_move, i;
 	int ret_val;
 
-	if ( yy_c_buf_p > &yy_current_buffer->yy_ch_buf[yy_n_chars + 1] )
+	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
 		YY_FATAL_ERROR(
 		"fatal flex scanner internal error--end of buffer missed" );
 
-	if ( yy_current_buffer->yy_fill_buffer == 0 )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
 		{ /* Don't try to fill the buffer, so this is an EOF. */
-		if ( yy_c_buf_p - yytext_ptr - YY_MORE_ADJ == 1 )
+		if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
 			{
 			/* We matched a single character, the EOB, so
 			 * treat this as a final EOF.
@@ -1547,34 +1617,30 @@
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (int) (yy_c_buf_p - yytext_ptr) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
 
-	if ( yy_current_buffer->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+	if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
 		/* don't do the read, it's not guaranteed to return an EOF,
 		 * just force an EOF
 		 */
-		yy_current_buffer->yy_n_chars = yy_n_chars = 0;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
 
 	else
 		{
-		int num_to_read =
-			yy_current_buffer->yy_buf_size - number_to_move - 1;
+			int num_to_read =
+			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
-#ifdef YY_USES_REJECT
-			YY_FATAL_ERROR(
-"input buffer overflow, can't enlarge buffer because scanner uses REJECT" );
-#else
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = yy_current_buffer;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
 
 			int yy_c_buf_p_offset =
-				(int) (yy_c_buf_p - b->yy_ch_buf);
+				(int) ((yy_c_buf_p) - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
@@ -1587,8 +1653,7 @@
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					yy_flex_realloc( (void *) b->yy_ch_buf,
-							 b->yy_buf_size + 2 );
+					phprealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
@@ -1598,35 +1663,35 @@
 				YY_FATAL_ERROR(
 				"fatal error - scanner input buffer overflow" );
 
-			yy_c_buf_p = &b->yy_ch_buf[yy_c_buf_p_offset];
+			(yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
 
-			num_to_read = yy_current_buffer->yy_buf_size -
+			num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
 						number_to_move - 1;
-#endif
+
 			}
 
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 
 		/* Read in more data. */
-		YY_INPUT( (&yy_current_buffer->yy_ch_buf[number_to_move]),
-			yy_n_chars, num_to_read );
+		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+			(yy_n_chars), num_to_read );
 
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	if ( yy_n_chars == 0 )
+	if ( (yy_n_chars) == 0 )
 		{
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			yyrestart( yyin );
+			phprestart(phpin  );
 			}
 
 		else
 			{
 			ret_val = EOB_ACT_LAST_MATCH;
-			yy_current_buffer->yy_buffer_status =
+			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
 				YY_BUFFER_EOF_PENDING;
 			}
 		}
@@ -1634,30 +1699,32 @@
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	yy_n_chars += number_to_move;
-	yy_current_buffer->yy_ch_buf[yy_n_chars] = YY_END_OF_BUFFER_CHAR;
-	yy_current_buffer->yy_ch_buf[yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
+	(yy_n_chars) += number_to_move;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
 
-	yytext_ptr = &yy_current_buffer->yy_ch_buf[0];
+	(yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
 
 	return ret_val;
-	}
-
+}
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
-static yy_state_type yy_get_previous_state()
-	{
+    static yy_state_type yy_get_previous_state (void)
+{
 	register yy_state_type yy_current_state;
 	register char *yy_cp;
+    
+	yy_current_state = (yy_start);
 
-	yy_current_state = yy_start;
-	yy_state_ptr = yy_state_buf;
-	*yy_state_ptr++ = yy_current_state;
-
-	for ( yy_cp = yytext_ptr + YY_MORE_ADJ; yy_cp < yy_c_buf_p; ++yy_cp )
+	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
 		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		if ( yy_accept[yy_current_state] )
+			{
+			(yy_last_accepting_state) = yy_current_state;
+			(yy_last_accepting_cpos) = yy_cp;
+			}
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
@@ -1665,29 +1732,27 @@
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-		*yy_state_ptr++ = yy_current_state;
 		}
 
 	return yy_current_state;
-	}
-
+}
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
  *	next_state = yy_try_NUL_trans( current_state );
  */
-
-#ifdef YY_USE_PROTOS
-static yy_state_type yy_try_NUL_trans( yy_state_type yy_current_state )
-#else
-static yy_state_type yy_try_NUL_trans( yy_current_state )
-yy_state_type yy_current_state;
-#endif
-	{
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
 	register int yy_is_jam;
+    	register char *yy_cp = (yy_c_buf_p);
 
 	register YY_CHAR yy_c = 1;
+	if ( yy_accept[yy_current_state] )
+		{
+		(yy_last_accepting_state) = yy_current_state;
+		(yy_last_accepting_cpos) = yy_cp;
+		}
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
@@ -1696,87 +1761,79 @@
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 275);
-	if ( ! yy_is_jam )
-		*yy_state_ptr++ = yy_current_state;
 
 	return yy_is_jam ? 0 : yy_current_state;
-	}
-
+}
 
-#ifndef YY_NO_UNPUT
-#ifdef YY_USE_PROTOS
-static void yyunput( int c, register char *yy_bp )
-#else
-static void yyunput( c, yy_bp )
-int c;
-register char *yy_bp;
-#endif
-	{
-	register char *yy_cp = yy_c_buf_p;
+    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 */
-	*yy_cp = yy_hold_char;
+	/* undo effects of setting up phptext */
+	*yy_cp = (yy_hold_char);
 
-	if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = yy_n_chars + 2;
-		register char *dest = &yy_current_buffer->yy_ch_buf[
-					yy_current_buffer->yy_buf_size + 2];
+		register int number_to_move = (yy_n_chars) + 2;
+		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
+					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		register char *source =
-				&yy_current_buffer->yy_ch_buf[number_to_move];
+				&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
-		while ( source > yy_current_buffer->yy_ch_buf )
+		while ( source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			*--dest = *--source;
 
 		yy_cp += (int) (dest - source);
 		yy_bp += (int) (dest - source);
-		yy_current_buffer->yy_n_chars =
-			yy_n_chars = yy_current_buffer->yy_buf_size;
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars =
+			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_buf_size;
 
-		if ( yy_cp < yy_current_buffer->yy_ch_buf + 2 )
+		if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 			YY_FATAL_ERROR( "flex scanner push-back overflow" );
 		}
 
 	*--yy_cp = (char) c;
 
-	if ( c == '\n' )
-		--yylineno;
-
-	yytext_ptr = yy_bp;
-	yy_hold_char = *yy_cp;
-	yy_c_buf_p = yy_cp;
-	}
-#endif	/* ifndef YY_NO_UNPUT */
+    if ( c == '\n' ){
+        --phplineno;
+    }
 
+	(yytext_ptr) = yy_bp;
+	(yy_hold_char) = *yy_cp;
+	(yy_c_buf_p) = yy_cp;
+}
 
 #ifndef YY_NO_INPUT
 #ifdef __cplusplus
-static int yyinput()
+    static int yyinput (void)
 #else
-static int input()
+    static int input  (void)
 #endif
-	{
-	int c;
 
-	*yy_c_buf_p = yy_hold_char;
+{
+	int c;
+    
+	*(yy_c_buf_p) = (yy_hold_char);
 
-	if ( *yy_c_buf_p == YY_END_OF_BUFFER_CHAR )
+	if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
 		{
 		/* yy_c_buf_p now points to the character we want to return.
 		 * If this occurs *before* the EOB characters, then it's a
 		 * valid NUL; if not, then we've hit the end of the buffer.
 		 */
-		if ( yy_c_buf_p < &yy_current_buffer->yy_ch_buf[yy_n_chars] )
+		if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
 			/* This was really a NUL. */
-			*yy_c_buf_p = '\0';
+			*(yy_c_buf_p) = '\0';
 
 		else
 			{ /* need more input */
-			int offset = yy_c_buf_p - yytext_ptr;
-			++yy_c_buf_p;
+			int offset = (yy_c_buf_p) - (yytext_ptr);
+			++(yy_c_buf_p);
 
-			switch ( yy_get_next_buffer() )
+			switch ( yy_get_next_buffer(  ) )
 				{
 				case EOB_ACT_LAST_MATCH:
 					/* This happens because yy_g_n_b()
@@ -1790,16 +1847,16 @@
 					 */
 
 					/* Reset buffer status. */
-					yyrestart( yyin );
+					phprestart(phpin );
 
-					/* fall through */
+					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( yywrap() )
-						return EOF;
+					if ( phpwrap( ) )
+						return 0;
 
-					if ( ! yy_did_buffer_switch_on_eof )
+					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
 #ifdef __cplusplus
 					return yyinput();
@@ -1809,169 +1866,174 @@
 					}
 
 				case EOB_ACT_CONTINUE_SCAN:
-					yy_c_buf_p = yytext_ptr + offset;
+					(yy_c_buf_p) = (yytext_ptr) + offset;
 					break;
 				}
 			}
 		}
 
-	c = *(unsigned char *) yy_c_buf_p;	/* cast for 8-bit char's */
-	*yy_c_buf_p = '\0';	/* preserve yytext */
-	yy_hold_char = *++yy_c_buf_p;
+	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
+	*(yy_c_buf_p) = '\0';	/* preserve phptext */
+	(yy_hold_char) = *++(yy_c_buf_p);
 
 	if ( c == '\n' )
-		++yylineno;
+		   
+    phplineno++;
+;
 
 	return c;
-	}
-#endif /* YY_NO_INPUT */
-
-#ifdef YY_USE_PROTOS
-void yyrestart( FILE *input_file )
-#else
-void yyrestart( input_file )
-FILE *input_file;
-#endif
-	{
-	if ( ! yy_current_buffer )
-		yy_current_buffer = yy_create_buffer( yyin, YY_BUF_SIZE );
+}
+#endif	/* ifndef YY_NO_INPUT */
 
-	yy_init_buffer( yy_current_buffer, input_file );
-	yy_load_buffer_state();
+/** 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 phprestart  (FILE * input_file )
+{
+    
+	if ( ! YY_CURRENT_BUFFER ){
+        phpensure_buffer_stack ();
+		YY_CURRENT_BUFFER_LVALUE =
+            php_create_buffer(phpin,YY_BUF_SIZE );
 	}
 
+	php_init_buffer(YY_CURRENT_BUFFER,input_file );
+	php_load_buffer_state( );
+}
 
-#ifdef YY_USE_PROTOS
-void yy_switch_to_buffer( YY_BUFFER_STATE new_buffer )
-#else
-void yy_switch_to_buffer( new_buffer )
-YY_BUFFER_STATE new_buffer;
-#endif
-	{
-	if ( yy_current_buffer == new_buffer )
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void php_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+	/* TODO. We should be able to replace this entire function body
+	 * with
+	 *		phppop_buffer_state();
+	 *		phppush_buffer_state(new_buffer);
+     */
+	phpensure_buffer_stack ();
+	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
-	if ( yy_current_buffer )
+	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
-		*yy_c_buf_p = yy_hold_char;
-		yy_current_buffer->yy_buf_pos = yy_c_buf_p;
-		yy_current_buffer->yy_n_chars = yy_n_chars;
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
 
-	yy_current_buffer = new_buffer;
-	yy_load_buffer_state();
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+	php_load_buffer_state( );
 
 	/* We don't actually know whether we did this switch during
-	 * EOF (yywrap()) processing, but the only time this flag
-	 * is looked at is after yywrap() is called, so it's safe
+	 * EOF (phpwrap()) processing, but the only time this flag
+	 * is looked at is after phpwrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
-	yy_did_buffer_switch_on_eof = 1;
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_load_buffer_state( void )
-#else
-void yy_load_buffer_state()
-#endif
-	{
-	yy_n_chars = yy_current_buffer->yy_n_chars;
-	yytext_ptr = yy_c_buf_p = yy_current_buffer->yy_buf_pos;
-	yyin = yy_current_buffer->yy_input_file;
-	yy_hold_char = *yy_c_buf_p;
-	}
+	(yy_did_buffer_switch_on_eof) = 1;
+}
 
+static void php_load_buffer_state  (void)
+{
+    	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+	phpin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	(yy_hold_char) = *(yy_c_buf_p);
+}
 
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_create_buffer( FILE *file, int size )
-#else
-YY_BUFFER_STATE yy_create_buffer( file, size )
-FILE *file;
-int size;
-#endif
-	{
+/** 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 php_create_buffer  (FILE * file, int  size )
+{
 	YY_BUFFER_STATE b;
-
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+    
+	b = (YY_BUFFER_STATE) phpalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in php_create_buffer()" );
 
 	b->yy_buf_size = size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) yy_flex_alloc( b->yy_buf_size + 2 );
+	b->yy_ch_buf = (char *) phpalloc(b->yy_buf_size + 2  );
 	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in php_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	yy_init_buffer( b, file );
+	php_init_buffer(b,file );
 
 	return b;
-	}
-
+}
 
-#ifdef YY_USE_PROTOS
-void yy_delete_buffer( YY_BUFFER_STATE b )
-#else
-void yy_delete_buffer( b )
-YY_BUFFER_STATE b;
-#endif
-	{
+/** Destroy the buffer.
+ * @param b a buffer created with php_create_buffer()
+ * 
+ */
+    void php_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
 	if ( ! b )
 		return;
 
-	if ( b == yy_current_buffer )
-		yy_current_buffer = (YY_BUFFER_STATE) 0;
+	if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		yy_flex_free( (void *) b->yy_ch_buf );
-
-	yy_flex_free( (void *) b );
-	}
+		phpfree((void *) b->yy_ch_buf  );
 
+	phpfree((void *) b  );
+}
 
+#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 phprestart() or at EOF.
+ */
+    static void php_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
-#ifdef YY_USE_PROTOS
-void yy_init_buffer( YY_BUFFER_STATE b, FILE *file )
-#else
-void yy_init_buffer( b, file )
-YY_BUFFER_STATE b;
-FILE *file;
-#endif
-
-
-	{
-	yy_flush_buffer( b );
+{
+	int oerrno = errno;
+    
+	php_flush_buffer(b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-#if YY_ALWAYS_INTERACTIVE
-	b->yy_is_interactive = 1;
-#else
-#if YY_NEVER_INTERACTIVE
-	b->yy_is_interactive = 0;
-#else
-	b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
-#endif
-#endif
-	}
-
-
-#ifdef YY_USE_PROTOS
-void yy_flush_buffer( YY_BUFFER_STATE b )
-#else
-void yy_flush_buffer( b )
-YY_BUFFER_STATE b;
-#endif
+    /* If b is the current buffer, then php_init_buffer was _probably_
+     * called from phprestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+	errno = oerrno;
+}
 
-	{
-	if ( ! b )
+/** 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 php_flush_buffer (YY_BUFFER_STATE  b )
+{
+    	if ( ! b )
 		return;
 
 	b->yy_n_chars = 0;
@@ -1988,31 +2050,123 @@
 	b->yy_at_bol = 1;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	if ( b == yy_current_buffer )
-		yy_load_buffer_state();
+	if ( b == YY_CURRENT_BUFFER )
+		php_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void phppush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+    	if (new_buffer == NULL)
+		return;
+
+	phpensure_buffer_stack();
+
+	/* This block is copied from php_switch_to_buffer. */
+	if ( YY_CURRENT_BUFFER )
+		{
+		/* Flush out information for old buffer. */
+		*(yy_c_buf_p) = (yy_hold_char);
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+		}
+
+	/* Only push if top exists. Otherwise, replace top. */
+	if (YY_CURRENT_BUFFER)
+		(yy_buffer_stack_top)++;
+	YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+	/* copied from php_switch_to_buffer. */
+	php_load_buffer_state( );
+	(yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void phppop_buffer_state (void)
+{
+    	if (!YY_CURRENT_BUFFER)
+		return;
+
+	php_delete_buffer(YY_CURRENT_BUFFER );
+	YY_CURRENT_BUFFER_LVALUE = NULL;
+	if ((yy_buffer_stack_top) > 0)
+		--(yy_buffer_stack_top);
+
+	if (YY_CURRENT_BUFFER) {
+		php_load_buffer_state( );
+		(yy_did_buffer_switch_on_eof) = 1;
 	}
+}
 
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void phpensure_buffer_stack (void)
+{
+	int num_to_alloc;
+    
+	if (!(yy_buffer_stack)) {
+
+		/* First allocation is just for 2 elements, since we don't know if this
+		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+		 * immediate realloc on the next call.
+         */
+		num_to_alloc = 1;
+		(yy_buffer_stack) = (struct yy_buffer_state**)phpalloc
+								(num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+		
+		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+				
+		(yy_buffer_stack_max) = num_to_alloc;
+		(yy_buffer_stack_top) = 0;
+		return;
+	}
 
-#ifndef YY_NO_SCAN_BUFFER
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_buffer( char *base, yy_size_t size )
-#else
-YY_BUFFER_STATE yy_scan_buffer( base, size )
-char *base;
-yy_size_t size;
-#endif
-	{
-	YY_BUFFER_STATE b;
+	if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
 
+		/* Increase the buffer to prepare for a possible push. */
+		int grow_size = 8 /* arbitrary grow size */;
+
+		num_to_alloc = (yy_buffer_stack_max) + grow_size;
+		(yy_buffer_stack) = (struct yy_buffer_state**)phprealloc
+								((yy_buffer_stack),
+								num_to_alloc * sizeof(struct yy_buffer_state*)
+								);
+
+		/* zero only the new slots.*/
+		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+		(yy_buffer_stack_max) = num_to_alloc;
+	}
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE php_scan_buffer  (char * base, yy_size_t  size )
+{
+	YY_BUFFER_STATE b;
+    
 	if ( size < 2 ||
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
 		return 0;
 
-	b = (YY_BUFFER_STATE) yy_flex_alloc( sizeof( struct yy_buffer_state ) );
+	b = (YY_BUFFER_STATE) phpalloc(sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in php_scan_buffer()" );
 
 	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
@@ -2024,58 +2178,53 @@
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	yy_switch_to_buffer( b );
+	php_switch_to_buffer(b  );
 
 	return b;
-	}
-#endif
-
-
-#ifndef YY_NO_SCAN_STRING
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_string( yyconst char *yy_str )
-#else
-YY_BUFFER_STATE yy_scan_string( yy_str )
-yyconst char *yy_str;
-#endif
-	{
-	int len;
-	for ( len = 0; yy_str[len]; ++len )
-		;
-
-	return yy_scan_bytes( yy_str, len );
-	}
-#endif
+}
 
+/** Setup the input buffer state to scan a string. The next call to phplex() will
+ * scan from a @e copy of @a str.
+ * @param str a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       php_scan_bytes() instead.
+ */
+YY_BUFFER_STATE php_scan_string (yyconst char * yystr )
+{
+    
+	return php_scan_bytes(yystr,strlen(yystr) );
+}
 
-#ifndef YY_NO_SCAN_BYTES
-#ifdef YY_USE_PROTOS
-YY_BUFFER_STATE yy_scan_bytes( yyconst char *bytes, int len )
-#else
-YY_BUFFER_STATE yy_scan_bytes( bytes, len )
-yyconst char *bytes;
-int len;
-#endif
-	{
+/** Setup the input buffer state to scan the given bytes. The next call to phplex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE php_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+{
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
 	int i;
-
+    
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = len + 2;
-	buf = (char *) yy_flex_alloc( n );
+	n = _yybytes_len + 2;
+	buf = (char *) phpalloc(n  );
 	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+		YY_FATAL_ERROR( "out of dynamic memory in php_scan_bytes()" );
 
-	for ( i = 0; i < len; ++i )
-		buf[i] = bytes[i];
+	for ( i = 0; i < _yybytes_len; ++i )
+		buf[i] = yybytes[i];
 
-	buf[len] = buf[len+1] = YY_END_OF_BUFFER_CHAR;
+	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = yy_scan_buffer( buf, n );
+	b = php_scan_buffer(buf,n );
 	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+		YY_FATAL_ERROR( "bad buffer in php_scan_bytes()" );
 
 	/* It's okay to grow etc. this buffer, and we should throw it
 	 * away when we're done.
@@ -2083,78 +2232,55 @@
 	b->yy_is_our_buffer = 1;
 
 	return b;
-	}
-#endif
-
+}
 
-#ifndef YY_NO_PUSH_STATE
-#ifdef YY_USE_PROTOS
-static void yy_push_state( int new_state )
-#else
-static void yy_push_state( new_state )
-int new_state;
-#endif
-	{
-	if ( yy_start_stack_ptr >= yy_start_stack_depth )
+    static void yy_push_state (int  new_state )
+{
+    	if ( (yy_start_stack_ptr) >= (yy_start_stack_depth) )
 		{
 		yy_size_t new_size;
 
-		yy_start_stack_depth += YY_START_STACK_INCR;
-		new_size = yy_start_stack_depth * sizeof( int );
+		(yy_start_stack_depth) += YY_START_STACK_INCR;
+		new_size = (yy_start_stack_depth) * sizeof( int );
 
-		if ( ! yy_start_stack )
-			yy_start_stack = (int *) yy_flex_alloc( new_size );
+		if ( ! (yy_start_stack) )
+			(yy_start_stack) = (int *) phpalloc(new_size  );
 
 		else
-			yy_start_stack = (int *) yy_flex_realloc(
-					(void *) yy_start_stack, new_size );
+			(yy_start_stack) = (int *) phprealloc((void *) (yy_start_stack),new_size  );
 
-		if ( ! yy_start_stack )
+		if ( ! (yy_start_stack) )
 			YY_FATAL_ERROR(
 			"out of memory expanding start-condition stack" );
 		}
 
-	yy_start_stack[yy_start_stack_ptr++] = YY_START;
+	(yy_start_stack)[(yy_start_stack_ptr)++] = YY_START;
 
 	BEGIN(new_state);
-	}
-#endif
-
+}
 
-#ifndef YY_NO_POP_STATE
-static void yy_pop_state()
-	{
-	if ( --yy_start_stack_ptr < 0 )
+    static void yy_pop_state  (void)
+{
+    	if ( --(yy_start_stack_ptr) < 0 )
 		YY_FATAL_ERROR( "start-condition stack underflow" );
 
-	BEGIN(yy_start_stack[yy_start_stack_ptr]);
-	}
-#endif
-
+	BEGIN((yy_start_stack)[(yy_start_stack_ptr)]);
+}
 
-#ifndef YY_NO_TOP_STATE
-static int yy_top_state()
-	{
-	return yy_start_stack[yy_start_stack_ptr - 1];
-	}
-#endif
+    static int yy_top_state  (void)
+{
+    	return (yy_start_stack)[(yy_start_stack_ptr) - 1];
+}
 
 #ifndef YY_EXIT_FAILURE
 #define YY_EXIT_FAILURE 2
 #endif
 
-#ifdef YY_USE_PROTOS
-static void yy_fatal_error( yyconst char msg[] )
-#else
-static void yy_fatal_error( msg )
-char msg[];
-#endif
-	{
-	(void) fprintf( stderr, "%s\n", msg );
+static void yy_fatal_error (yyconst char* msg )
+{
+    	(void) fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
-	}
-
-
+}
 
 /* Redefine yyless() so it works in section 3 code. */
 
@@ -2162,69 +2288,189 @@
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up yytext. */ \
-		yytext[yyleng] = yy_hold_char; \
-		yy_c_buf_p = yytext + n; \
-		yy_hold_char = *yy_c_buf_p; \
-		*yy_c_buf_p = '\0'; \
-		yyleng = n; \
+		/* Undo effects of setting up phptext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+		phptext[phpleng] = (yy_hold_char); \
+		(yy_c_buf_p) = phptext + yyless_macro_arg; \
+		(yy_hold_char) = *(yy_c_buf_p); \
+		*(yy_c_buf_p) = '\0'; \
+		phpleng = yyless_macro_arg; \
 		} \
 	while ( 0 )
 
+/* Accessor  methods (get/set functions) to struct members. */
 
-/* Internal utility routines. */
+/** Get the current line number.
+ * 
+ */
+int phpget_lineno  (void)
+{
+        
+    return phplineno;
+}
 
-#ifndef yytext_ptr
-#ifdef YY_USE_PROTOS
-static void yy_flex_strncpy( char *s1, yyconst char *s2, int n )
+/** Get the input stream.
+ * 
+ */
+FILE *phpget_in  (void)
+{
+        return phpin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *phpget_out  (void)
+{
+        return phpout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+int phpget_leng  (void)
+{
+        return phpleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *phpget_text  (void)
+{
+        return phptext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void phpset_lineno (int  line_number )
+{
+    
+    phplineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see php_switch_to_buffer
+ */
+void phpset_in (FILE *  in_str )
+{
+        phpin = in_str ;
+}
+
+void phpset_out (FILE *  out_str )
+{
+        phpout = out_str ;
+}
+
+int phpget_debug  (void)
+{
+        return php_flex_debug;
+}
+
+void phpset_debug (int  bdebug )
+{
+        php_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from phplex_destroy(), so don't allocate here.
+     */
+
+    /* We do not touch phplineno unless the option is enabled. */
+    phplineno =  1;
+    
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+    (yy_start_stack_ptr) = 0;
+    (yy_start_stack_depth) = 0;
+    (yy_start_stack) =  NULL;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    phpin = stdin;
+    phpout = stdout;
 #else
-static void yy_flex_strncpy( s1, s2, n )
-char *s1;
-yyconst char *s2;
-int n;
+    phpin = (FILE *) 0;
+    phpout = (FILE *) 0;
 #endif
-	{
+
+    /* For future reference: Set errno on error, since we are called by
+     * phplex_init()
+     */
+    return 0;
+}
+
+/* phplex_destroy is for both reentrant and non-reentrant scanners. */
+int phplex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+	while(YY_CURRENT_BUFFER){
+		php_delete_buffer(YY_CURRENT_BUFFER  );
+		YY_CURRENT_BUFFER_LVALUE = NULL;
+		phppop_buffer_state();
+	}
+
+	/* Destroy the stack itself. */
+	phpfree((yy_buffer_stack) );
+	(yy_buffer_stack) = NULL;
+
+    /* Destroy the start condition stack. */
+        phpfree((yy_start_stack)  );
+        (yy_start_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * phplex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
 	register int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
-	}
+}
 #endif
 
 #ifdef YY_NEED_STRLEN
-#ifdef YY_USE_PROTOS
-static int yy_flex_strlen( yyconst char *s )
-#else
-static int yy_flex_strlen( s )
-yyconst char *s;
-#endif
-	{
+static int yy_flex_strlen (yyconst char * s )
+{
 	register int n;
 	for ( n = 0; s[n]; ++n )
 		;
 
 	return n;
-	}
+}
 #endif
 
-
-#ifdef YY_USE_PROTOS
-static void *yy_flex_alloc( yy_size_t size )
-#else
-static void *yy_flex_alloc( size )
-yy_size_t size;
-#endif
-	{
+void *phpalloc (yy_size_t  size )
+{
 	return (void *) malloc( size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void *yy_flex_realloc( void *ptr, yy_size_t size )
-#else
-static void *yy_flex_realloc( ptr, size )
-void *ptr;
-yy_size_t size;
-#endif
-	{
+void *phprealloc  (void * ptr, yy_size_t  size )
+{
 	/* The cast to (char *) in the following accommodates both
 	 * implementations that use char* generic pointers, and those
 	 * that use void* generic pointers.  It works with the latter
@@ -2233,23 +2479,13 @@
 	 * as though doing an assignment.
 	 */
 	return (void *) realloc( (char *) ptr, size );
-	}
+}
 
-#ifdef YY_USE_PROTOS
-static void yy_flex_free( void *ptr )
-#else
-static void yy_flex_free( ptr )
-void *ptr;
-#endif
-	{
-	free( ptr );
-	}
+void phpfree (void * ptr )
+{
+	free( (char *) ptr );	/* see phprealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
 
-#if YY_MAIN
-int main()
-	{
-	yylex();
-	return 0;
-	}
-#endif
 #line 251 "php_lexer.l"

aMule-2.2.6.tar.bz2/src/webserver/src/php_lexer.l -> aMule-2.3.1.tar.bz2/src/webserver/src/php_lexer.l Changed

@@ -2,8 +2,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2006 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2005-2006 Froenchenko Leonid ( lfroen@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-2011 Froenchenko Leonid ( lfroen@gmail.com / 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
@@ -150,7 +150,7 @@
 
 "include" BEGIN(INCLUDE);
 <INCLUDE>[ \t]*
-<INCLUDE>\'[a-zA-Z_][a-zA-Z0-9_\.]*\' {
+<INCLUDE>\'[a-zA-Z_][a-zA-Z0-9_\.\-]*\' {
 	yytext[strlen(yytext)-1] = 0;
 	if ( php_include_stack_ptr >= MAX_INCLUDE_DEPTH ) {
 		fprintf( stderr, "WARNING: maximum include depth (which is %d) exceed", MAX_INCLUDE_DEPTH);
@@ -205,41 +205,41 @@
 	}
 
 "$"{IDENT} {
-        yylval.exp_node = get_var_node(yytext+1);
+        phplval.exp_node = get_var_node(yytext+1);
         return VARIABLE;
 	}
 
 {IDENT} {
-        strcpy(yylval.str_val, yytext);
+        strcpy(phplval.str_val, yytext);
         return IDENT;
 	}
 
 {HEX_NUM} {
 	int val;
 	sscanf(yytext, "0x%x", &val);
-	yylval.exp_node = make_const_exp_dnum(val);
+	phplval.exp_node = make_const_exp_dnum(val);
 	return DNUMBER;
 	}
 
 {DEC_NUM} {
-	yylval.exp_node = make_const_exp_dnum(atoi(yytext));
+	phplval.exp_node = make_const_exp_dnum(atoi(yytext));
 	return DNUMBER;
 	}
 
 {FLOANUM} {
-	yylval.exp_node = make_const_exp_fnum(atof(yytext));
+	phplval.exp_node = make_const_exp_fnum(atof(yytext));
 	return FNUMBER;
 	}
 
 \"(\\.|[^\\"])*\" {
 		yytext[strlen(yytext)-1] = 0;
-		yylval.exp_node = make_const_exp_str(yytext+1, 1);
+		phplval.exp_node = make_const_exp_str(yytext+1, 1);
 		return STRING;
 }
 
 \'(\\.|[^\\'])*\' {
 		yytext[strlen(yytext)-1] = 0;
-		yylval.exp_node = make_const_exp_str(yytext+1, 0);
+		phplval.exp_node = make_const_exp_str(yytext+1, 0);
 		return STRING;
 }

aMule-2.2.6.tar.bz2/src/webserver/src/php_parser.c -> aMule-2.3.1.tar.bz2/src/webserver/src/php_parser.c Changed

@@ -1,7 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.0.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   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
@@ -15,16 +16,24 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   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.
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
-/* Written by Richard Stallman by simplifying the original so called
-   ``semantic'' parser.  */
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
 
 /* All symbols defined below should begin with yy or YY, to avoid
    infringing on user name space.  This should be done even for local
@@ -36,6 +45,9 @@
 /* Identify Bison output.  */
 #define YYBISON 1
 
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
 
@@ -45,6 +57,14 @@
 /* Using locations.  */
 #define YYLSP_NEEDED 0
 
+/* Substitute the variable and function names.  */
+#define yyparse phpparse
+#define yylex   phplex
+#define yyerror phperror
+#define yylval  phplval
+#define yychar  phpchar
+#define yydebug phpdebug
+#define yynerrs phpnerrs
 
 
 /* Tokens.  */
@@ -143,6 +163,7 @@
      END_SCRIPT = 345
    };
 #endif
+/* Tokens.  */
 #define FNUMBER 258
 #define DNUMBER 259
 #define STRING 260
@@ -241,8 +262,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2006 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2005-2006Froenchenko Leonid ( lfroen@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-2011 Froenchenko Leonid ( lfroen@gmail.com / 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
@@ -268,7 +289,7 @@
 
 #include "php_syntree.h"
 
-int yylex();
+int phplex();
 
 // add item to syntree list
 PHP_SYN_NODE *add_statement_2_list(PHP_SYN_NODE *list, PHP_SYN_NODE *st)
@@ -316,16 +337,23 @@
 # define YYERROR_VERBOSE 0
 #endif
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
 #line 67 "php_parser.y"
-typedef union YYSTYPE {
+{
 	PHP_SYN_NODE *syn_node;
 	PHP_EXP_NODE *exp_node;
 
 	char str_val[256];
-} YYSTYPE;
-/* Line 190 of yacc.c.  */
-#line 329 "php_parser.c"
+}
+/* Line 193 of yacc.c.  */
+#line 357 "php_parser.c"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -336,17 +364,94 @@
 /* Copy the second part of user declarations.  */
 
 
-/* Line 213 of yacc.c.  */
-#line 341 "php_parser.c"
+/* Line 216 of yacc.c.  */
+#line 370 "php_parser.c"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
 
-#if ! defined (yyoverflow) || YYERROR_VERBOSE
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
-# ifndef YYFREE
-#  define YYFREE free
+#ifndef YY_
+# if defined YYENABLE_NLS && YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
 # endif
-# ifndef YYMALLOC
-#  define YYMALLOC malloc
+# ifndef YY_
+#  define YY_(msgid) msgid
 # endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
 
@@ -354,34 +459,76 @@
 #  if YYSTACK_USE_ALLOCA
 #   ifdef __GNUC__
 #    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
 #   endif
 #  endif
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning. */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-# else
-#  if defined (__STDC__) || defined (__cplusplus)
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   define YYSIZE_T size_t
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
 #  endif
+# else
 #  define YYSTACK_ALLOC YYMALLOC
 #  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+	     && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
 # endif
-#endif /* ! defined (yyoverflow) || YYERROR_VERBOSE */
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
 
 
-#if (! defined (yyoverflow) \
-     && (! defined (__cplusplus) \
-	 || (defined (YYSTYPE_IS_TRIVIAL) && YYSTYPE_IS_TRIVIAL)))
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  short int yyss;
+  yytype_int16 yyss;
   YYSTYPE yyvs;
   };
 
@@ -391,24 +538,24 @@
 /* The size of an array large to enough to hold all stacks, each with
    N elements.  */
 # define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (short int) + sizeof (YYSTYPE))			\
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
 /* Copy COUNT objects from FROM to TO.  The source and destination do
    not overlap.  */
 # ifndef YYCOPY
-#  if defined (__GNUC__) && 1 < __GNUC__
+#  if defined __GNUC__ && 1 < __GNUC__
 #   define YYCOPY(To, From, Count) \
       __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
 #  else
 #   define YYCOPY(To, From, Count)		\
       do					\
 	{					\
-	  register YYSIZE_T yyi;		\
+	  YYSIZE_T yyi;				\
 	  for (yyi = 0; yyi < (Count); yyi++)	\
 	    (To)[yyi] = (From)[yyi];		\
 	}					\
-      while (0)
+      while (YYID (0))
 #  endif
 # endif
 
@@ -426,39 +573,33 @@
 	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
 	yyptr += yynewbytes / sizeof (*yyptr);				\
       }									\
-    while (0)
+    while (YYID (0))
 
 #endif
 
-#if defined (__STDC__) || defined (__cplusplus)
-   typedef signed char yysigned_char;
-#else
-   typedef short int yysigned_char;
-#endif
-
-/* YYFINAL -- State number of the termination state. */
+/* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
 #define YYLAST   3075
 
-/* YYNTOKENS -- Number of terminals. */
+/* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  117
-/* YYNNTS -- Number of nonterminals. */
+/* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  37
-/* YYNRULES -- Number of rules. */
+/* YYNRULES -- Number of rules.  */
 #define YYNRULES  169
-/* YYNRULES -- Number of states. */
+/* YYNRULES -- Number of states.  */
 #define YYNSTATES  385
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   345
 
-#define YYTRANSLATE(YYX) 						\
+#define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
 /* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const unsigned char yytranslate[] =
+static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -500,7 +641,7 @@
 #if YYDEBUG
 /* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
    YYRHS.  */
-static const unsigned short int yyprhs[] =
+static const yytype_uint16 yyprhs[] =
 {
        0,     0,     3,     7,    10,    11,    13,    17,    19,    23,
       26,    30,    34,    42,    48,    56,    66,    72,    75,    79,
@@ -521,8 +662,8 @@
      612,   616,   618,   623,   624,   626,   630,   632,   636,   641
 };
 
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const short int yyrhs[] =
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int16 yyrhs[] =
 {
      118,     0,    -1,   108,   119,   109,    -1,   119,   120,    -1,
       -1,   121,    -1,   108,   119,   109,    -1,   129,    -1,   110,
@@ -592,7 +733,7 @@
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const unsigned short int yyrline[] =
+static const yytype_uint16 yyrline[] =
 {
        0,   142,   142,   146,   147,   152,   153,   154,   159,   160,
      161,   162,   163,   164,   165,   166,   167,   168,   169,   170,
@@ -614,9 +755,9 @@
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE
-/* YYTNME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals. */
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
 {
   "$end", "error", "$undefined", "FNUMBER", "DNUMBER", "STRING", "IDENT",
@@ -652,7 +793,7 @@
 # ifdef YYPRINT
 /* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
    token YYLEX-NUM.  */
-static const unsigned short int yytoknum[] =
+static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
@@ -670,7 +811,7 @@
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const unsigned char yyr1[] =
+static const yytype_uint8 yyr1[] =
 {
        0,   117,   118,   119,   119,   120,   120,   120,   121,   121,
      121,   121,   121,   121,   121,   121,   121,   121,   121,   121,
@@ -692,7 +833,7 @@
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const unsigned char yyr2[] =
+static const yytype_uint8 yyr2[] =
 {
        0,     2,     3,     2,     0,     1,     3,     1,     3,     2,
        3,     3,     7,     5,     7,     9,     5,     2,     3,     2,
@@ -716,7 +857,7 @@
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
    STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
-static const unsigned char yydefact[] =
+static const yytype_uint8 yydefact[] =
 {
        0,     4,     0,     0,     1,    76,    77,    78,    79,    83,
        0,   158,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -759,8 +900,8 @@
       27,    57,    60,     0,    55
 };
 
-/* YYDEFGOTO[NTERM-NUM]. */
-static const short int yydefgoto[] =
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
 {
       -1,     2,     3,    47,    48,   163,   159,   166,    68,    69,
       98,    99,    49,   171,   289,   290,   369,   334,   160,   302,
@@ -771,7 +912,7 @@
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
 #define YYPACT_NINF -309
-static const short int yypact[] =
+static const yytype_int16 yypact[] =
 {
      -75,  -309,    36,   371,  -309,  -309,  -309,  -309,   -30,  -309,
     2593,   -59,    58,  1967,    59,    69,    71,    98,    66,   113,
@@ -815,7 +956,7 @@
 };
 
 /* YYPGOTO[NTERM-NUM].  */
-static const short int yypgoto[] =
+static const yytype_int16 yypgoto[] =
 {
     -309,  -309,   -40,  -309,   -13,  -309,   304,  -309,  -309,   154,
     -309,   131,  -309,  -309,    68,     7,  -309,  -308,  -209,  -309,
@@ -828,7 +969,7 @@
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -53
-static const short int yytable[] =
+static const yytype_int16 yytable[] =
 {
       62,   100,   306,   101,    58,   339,   340,   339,   340,   118,
      182,   316,    55,   119,    76,    73,    75,   285,    79,   261,
@@ -1140,7 +1281,7 @@
      141,   142,   143,   144,   145,   146
 };
 
-static const short int yycheck[] =
+static const yytype_int16 yycheck[] =
 {
       13,    41,    39,    43,    10,    28,    29,    28,    29,    38,
       38,     7,    42,    42,     6,    21,    22,    58,    24,   183,
@@ -1454,7 +1595,7 @@
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const unsigned char yystos[] =
+static const yytype_uint8 yystos[] =
 {
        0,   108,   118,   119,     0,     3,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    14,    16,    18,    22,    23,
@@ -1497,22 +1638,6 @@
      134,   112,   121,    15,   112
 };
 
-#if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
-# define YYSIZE_T __SIZE_TYPE__
-#endif
-#if ! defined (YYSIZE_T) && defined (size_t)
-# define YYSIZE_T size_t
-#endif
-#if ! defined (YYSIZE_T)
-# if defined (__STDC__) || defined (__cplusplus)
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# endif
-#endif
-#if ! defined (YYSIZE_T)
-# define YYSIZE_T unsigned int
-#endif
-
 #define yyerrok		(yyerrstatus = 0)
 #define yyclearin	(yychar = YYEMPTY)
 #define YYEMPTY		(-2)
@@ -1538,15 +1663,15 @@
       yychar = (Token);						\
       yylval = (Value);						\
       yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
+      YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
   else								\
-    { 								\
-      yyerror ("syntax error: cannot back up");\
+    {								\
+      yyerror (YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
-while (0)
+while (YYID (0))
 
 
 #define YYTERROR	1
@@ -1561,7 +1686,7 @@
 #ifndef YYLLOC_DEFAULT
 # define YYLLOC_DEFAULT(Current, Rhs, N)				\
     do									\
-      if (N)								\
+      if (YYID (N))                                                    \
 	{								\
 	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
 	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
@@ -1575,7 +1700,7 @@
 	  (Current).first_column = (Current).last_column =		\
 	    YYRHSLOC (Rhs, 0).last_column;				\
 	}								\
-    while (0)
+    while (YYID (0))
 #endif
 
 
@@ -1584,11 +1709,11 @@
    we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
+# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
 #  define YY_LOCATION_PRINT(File, Loc)			\
      fprintf (File, "%d.%d-%d.%d",			\
-              (Loc).first_line, (Loc).first_column,	\
-              (Loc).last_line,  (Loc).last_column)
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
 # else
 #  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
 # endif
@@ -1615,36 +1740,96 @@
 do {						\
   if (yydebug)					\
     YYFPRINTF Args;				\
-} while (0)
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
+do {									  \
+  if (yydebug)								  \
+    {									  \
+      YYFPRINTF (stderr, "%s ", Title);					  \
+      yy_symbol_print (stderr,						  \
+		  Type, Value); \
+      YYFPRINTF (stderr, "\n");						  \
+    }									  \
+} while (YYID (0))
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)		\
-do {								\
-  if (yydebug)							\
-    {								\
-      YYFPRINTF (stderr, "%s ", Title);				\
-      yysymprint (stderr, 					\
-                  Type, Value);	\
-      YYFPRINTF (stderr, "\n");					\
-    }								\
-} while (0)
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (!yyvaluep)
+    return;
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+	break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  YYFPRINTF (yyoutput, ")");
+}
 
 /*------------------------------------------------------------------.
 | yy_stack_print -- Print the state stack from its BOTTOM up to its |
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (short int *bottom, short int *top)
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
 #else
 static void
 yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+    yytype_int16 *bottom;
+    yytype_int16 *top;
 #endif
 {
   YYFPRINTF (stderr, "Stack now");
-  for (/* Nothing. */; bottom <= top; ++bottom)
+  for (; bottom <= top; ++bottom)
     YYFPRINTF (stderr, " %d", *bottom);
   YYFPRINTF (stderr, "\n");
 }
@@ -1653,37 +1838,45 @@
 do {								\
   if (yydebug)							\
     yy_stack_print ((Bottom), (Top));				\
-} while (0)
+} while (YYID (0))
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
 #else
 static void
-yy_reduce_print (yyrule)
+yy_reduce_print (yyvsp, yyrule)
+    YYSTYPE *yyvsp;
     int yyrule;
 #endif
 {
+  int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned int yylno = yyrline[yyrule];
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %u), ",
-             yyrule - 1, yylno);
-  /* Print the symbols being reduced, and their result.  */
-  for (yyi = yyprhs[yyrule]; 0 <= yyrhs[yyi]; yyi++)
-    YYFPRINTF (stderr, "%s ", yytname [yyrhs[yyi]]);
-  YYFPRINTF (stderr, "-> %s\n", yytname [yyr1[yyrule]]);
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+	     yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+		       &(yyvsp[(yyi + 1) - (yynrhs)])
+		       		       );
+      fprintf (stderr, "\n");
+    }
 }
 
 # define YY_REDUCE_PRINT(Rule)		\
 do {					\
   if (yydebug)				\
-    yy_reduce_print (Rule);		\
-} while (0)
+    yy_reduce_print (yyvsp, Rule); \
+} while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -1705,7 +1898,7 @@
    if the built-in stack extension method is used).
 
    Do not make this value too large; the results are undefined if
-   SIZE_MAX < YYSTACK_BYTES (YYMAXDEPTH)
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
    evaluated with infinite-precision integer arithmetic.  */
 
 #ifndef YYMAXDEPTH
@@ -1717,45 +1910,47 @@
 #if YYERROR_VERBOSE
 
 # ifndef yystrlen
-#  if defined (__GLIBC__) && defined (_STRING_H)
+#  if defined __GLIBC__ && defined _STRING_H
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
-#   if defined (__STDC__) || defined (__cplusplus)
 yystrlen (const char *yystr)
-#   else
+#else
+static YYSIZE_T
 yystrlen (yystr)
-     const char *yystr;
-#   endif
+    const char *yystr;
+#endif
 {
-  register const char *yys = yystr;
-
-  while (*yys++ != '\0')
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
     continue;
-
-  return yys - yystr - 1;
+  return yylen;
 }
 #  endif
 # endif
 
 # ifndef yystpcpy
-#  if defined (__GLIBC__) && defined (_STRING_H) && defined (_GNU_SOURCE)
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
 #   define yystpcpy stpcpy
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static char *
-#   if defined (__STDC__) || defined (__cplusplus)
 yystpcpy (char *yydest, const char *yysrc)
-#   else
+#else
+static char *
 yystpcpy (yydest, yysrc)
-     char *yydest;
-     const char *yysrc;
-#   endif
+    char *yydest;
+    const char *yysrc;
+#endif
 {
-  register char *yyd = yydest;
-  register const char *yys = yysrc;
+  char *yyd = yydest;
+  const char *yys = yysrc;
 
   while ((*yyd++ = *yys++) != '\0')
     continue;
@@ -1765,53 +1960,171 @@
 #  endif
 # endif
 
-#endif /* !YYERROR_VERBOSE */
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
 
-&#xc;
+      for (;;)
+	switch (*++yyp)
+	  {
+	  case '\'':
+	  case ',':
+	    goto do_not_strip_quotes;
+
+	  case '\\':
+	    if (*++yyp != '\\')
+	      goto do_not_strip_quotes;
+	    /* Fall through.  */
+	  default:
+	    if (yyres)
+	      yyres[yyn] = *yyp;
+	    yyn++;
+	    break;
+
+	  case '"':
+	    if (yyres)
+	      yyres[yyn] = '\0';
+	    return yyn;
+	  }
+    do_not_strip_quotes: ;
+    }
 
-#if YYDEBUG
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+  if (! yyres)
+    return yystrlen (yystr);
 
-#if defined (__STDC__) || defined (__cplusplus)
-static void
-yysymprint (FILE *yyoutput, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yysymprint (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  int yyn = yypact[yystate];
 
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
   else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
 
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
 
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-  switch (yytype)
-    {
-      default:
-        break;
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
     }
-  YYFPRINTF (yyoutput, ")");
 }
+#endif /* YYERROR_VERBOSE */
+&#xc;
 
-#endif /* ! YYDEBUG */
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-#if defined (__STDC__) || defined (__cplusplus)
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
 #else
@@ -1822,8 +2135,7 @@
     YYSTYPE *yyvaluep;
 #endif
 {
-  /* Pacify ``unused variable'' warnings.  */
-  (void) yyvaluep;
+  YYUSE (yyvaluep);
 
   if (!yymsg)
     yymsg = "Deleting";
@@ -1833,7 +2145,7 @@
     {
 
       default:
-        break;
+	break;
     }
 }
 &#xc;
@@ -1841,13 +2153,13 @@
 /* Prevent warnings from -Wmissing-prototypes.  */
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void *YYPARSE_PARAM);
-# else
+#else
 int yyparse ();
-# endif
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if defined __STDC__ || defined __cplusplus
 int yyparse (void);
 #else
 int yyparse ();
@@ -1872,14 +2184,18 @@
 `----------*/
 
 #ifdef YYPARSE_PARAM
-# if defined (__STDC__) || defined (__cplusplus)
-int yyparse (void *YYPARSE_PARAM)
-# else
-int yyparse (YYPARSE_PARAM)
-  void *YYPARSE_PARAM;
-# endif
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
 #else /* ! YYPARSE_PARAM */
-#if defined (__STDC__) || defined (__cplusplus)
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
 #else
@@ -1890,13 +2206,19 @@
 #endif
 {
   
-  register int yystate;
-  register int yyn;
+  int yystate;
+  int yyn;
   int yyresult;
   /* Number of tokens to shift before error messages enabled.  */
   int yyerrstatus;
   /* Look-ahead token as an internal (translated) token number.  */
   int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
 
   /* Three stacks and their tools:
      `yyss': related to states,
@@ -1907,18 +2229,18 @@
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short int yyssa[YYINITDEPTH];
-  short int *yyss = yyssa;
-  register short int *yyssp;
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
 
   /* The semantic value stack.  */
   YYSTYPE yyvsa[YYINITDEPTH];
   YYSTYPE *yyvs = yyvsa;
-  register YYSTYPE *yyvsp;
+  YYSTYPE *yyvsp;
 
 
 
-#define YYPOPSTACK   (yyvsp--, yyssp--)
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
   YYSIZE_T yystacksize = YYINITDEPTH;
 
@@ -1927,9 +2249,9 @@
   YYSTYPE yyval;
 
 
-  /* When reducing, the number of symbols on the RHS of the reduced
-     rule.  */
-  int yylen;
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
 
@@ -1946,9 +2268,6 @@
   yyssp = yyss;
   yyvsp = yyvs;
 
-
-  yyvsp[0] = yylval;
-
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1956,8 +2275,7 @@
 `------------------------------------------------------------*/
  yynewstate:
   /* In all cases, when you get here, the value and location stacks
-     have just been pushed. so pushing a state here evens the stacks.
-     */
+     have just been pushed.  So pushing a state here evens the stacks.  */
   yyssp++;
 
  yysetstate:
@@ -1970,18 +2288,18 @@
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack. Use copies of
+	/* Give user a chance to reallocate the stack.  Use copies of
 	   these so that the &'s don't force the real ones into
 	   memory.  */
 	YYSTYPE *yyvs1 = yyvs;
-	short int *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 
 
 	/* Each stack pointer address is followed by the size of the
 	   data in use in that stack, in bytes.  This used to be a
 	   conditional around just the two extra args, but that might
 	   be undefined if yyoverflow is a macro.  */
-	yyoverflow ("parser stack overflow",
+	yyoverflow (YY_("memory exhausted"),
 		    &yyss1, yysize * sizeof (*yyssp),
 		    &yyvs1, yysize * sizeof (*yyvsp),
 
@@ -1992,21 +2310,21 @@
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
-      goto yyoverflowlab;
+      goto yyexhaustedlab;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyoverflowlab;
+	goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
 	yystacksize = YYMAXDEPTH;
 
       {
-	short int *yyss1 = yyss;
+	yytype_int16 *yyss1 = yyss;
 	union yyalloc *yyptr =
 	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
 	if (! yyptr)
-	  goto yyoverflowlab;
+	  goto yyexhaustedlab;
 	YYSTACK_RELOCATE (yyss);
 	YYSTACK_RELOCATE (yyvs);
 
@@ -2037,12 +2355,10 @@
 `-----------*/
 yybackup:
 
-/* Do appropriate processing given the current state.  */
-/* Read a look-ahead token if we need one and don't already have one.  */
-/* yyresume: */
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
 
   /* First try to decide what to do without reference to look-ahead token.  */
-
   yyn = yypact[yystate];
   if (yyn == YYPACT_NINF)
     goto yydefault;
@@ -2084,22 +2400,21 @@
   if (yyn == YYFINAL)
     YYACCEPT;
 
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
   /* Shift the look-ahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the token being shifted unless it is eof.  */
+  /* Discard the shifted token unless it is eof.  */
   if (yychar != YYEOF)
     yychar = YYEMPTY;
 
+  yystate = yyn;
   *++yyvsp = yylval;
 
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  yystate = yyn;
   goto yynewstate;
 
 
@@ -2136,12 +2451,12 @@
     {
         case 2:
 #line 142 "php_parser.y"
-    { g_syn_tree_top = (yyvsp[-1].syn_node); ;}
+    { g_syn_tree_top = (yyvsp[(2) - (3)].syn_node); ;}
     break;
 
   case 3:
 #line 146 "php_parser.y"
-    { (yyval.syn_node) = add_statement_2_list((yyvsp[-1].syn_node), (yyvsp[0].syn_node)); ;}
+    { (yyval.syn_node) = add_statement_2_list((yyvsp[(1) - (2)].syn_node), (yyvsp[(2) - (2)].syn_node)); ;}
     break;
 
   case 4:
@@ -2151,17 +2466,17 @@
 
   case 6:
 #line 153 "php_parser.y"
-    { (yyval.syn_node) = (yyvsp[-1].syn_node); ;}
+    { (yyval.syn_node) = (yyvsp[(2) - (3)].syn_node); ;}
     break;
 
   case 8:
 #line 159 "php_parser.y"
-    { (yyval.syn_node) = (yyvsp[-1].syn_node); ;}
+    { (yyval.syn_node) = (yyvsp[(2) - (3)].syn_node); ;}
     break;
 
   case 9:
 #line 160 "php_parser.y"
-    { (yyval.syn_node) = make_expr_syn_node(PHP_ST_EXPR, (yyvsp[-1].exp_node)); ;}
+    { (yyval.syn_node) = make_expr_syn_node(PHP_ST_EXPR, (yyvsp[(1) - (2)].exp_node)); ;}
     break;
 
   case 10:
@@ -2171,32 +2486,32 @@
 
   case 11:
 #line 162 "php_parser.y"
-    { (yyval.syn_node) = (yyvsp[-1].syn_node); ;}
+    { (yyval.syn_node) = (yyvsp[(2) - (3)].syn_node); ;}
     break;
 
   case 12:
 #line 163 "php_parser.y"
-    { (yyval.syn_node) = make_ifelse_syn_node((yyvsp[-4].exp_node), (yyvsp[-2].syn_node), (yyvsp[-1].syn_node), (yyvsp[0].syn_node)); ;}
+    { (yyval.syn_node) = make_ifelse_syn_node((yyvsp[(3) - (7)].exp_node), (yyvsp[(5) - (7)].syn_node), (yyvsp[(6) - (7)].syn_node), (yyvsp[(7) - (7)].syn_node)); ;}
     break;
 
   case 13:
 #line 164 "php_parser.y"
-    { (yyval.syn_node) = make_while_loop_syn_node((yyvsp[-2].exp_node), (yyvsp[0].syn_node), 1); ;}
+    { (yyval.syn_node) = make_while_loop_syn_node((yyvsp[(3) - (5)].exp_node), (yyvsp[(5) - (5)].syn_node), 1); ;}
     break;
 
   case 14:
 #line 165 "php_parser.y"
-    { (yyval.syn_node) = make_while_loop_syn_node((yyvsp[-2].exp_node), (yyvsp[-5].syn_node), 0); ;}
+    { (yyval.syn_node) = make_while_loop_syn_node((yyvsp[(5) - (7)].exp_node), (yyvsp[(2) - (7)].syn_node), 0); ;}
     break;
 
   case 15:
 #line 166 "php_parser.y"
-    { (yyval.syn_node) = make_for_syn_node((yyvsp[-6].exp_node), (yyvsp[-4].exp_node), (yyvsp[-2].exp_node), (yyvsp[0].syn_node)); ;}
+    { (yyval.syn_node) = make_for_syn_node((yyvsp[(3) - (9)].exp_node), (yyvsp[(5) - (9)].exp_node), (yyvsp[(7) - (9)].exp_node), (yyvsp[(9) - (9)].syn_node)); ;}
     break;
 
   case 16:
 #line 167 "php_parser.y"
-    { (yyval.syn_node) = make_switch_syn_node((yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.syn_node) = make_switch_syn_node((yyvsp[(3) - (5)].exp_node), (yyvsp[(5) - (5)].exp_node)); ;}
     break;
 
   case 17:
@@ -2206,7 +2521,7 @@
 
   case 18:
 #line 169 "php_parser.y"
-    { (yyval.syn_node) = make_expr_syn_node(PHP_ST_CONTINUE, (yyvsp[-1].exp_node)); ;}
+    { (yyval.syn_node) = make_expr_syn_node(PHP_ST_CONTINUE, (yyvsp[(2) - (3)].exp_node)); ;}
     break;
 
   case 19:
@@ -2216,7 +2531,7 @@
 
   case 20:
 #line 171 "php_parser.y"
-    { (yyval.syn_node) = make_expr_syn_node(PHP_ST_BREAK, (yyvsp[-1].exp_node)); ;}
+    { (yyval.syn_node) = make_expr_syn_node(PHP_ST_BREAK, (yyvsp[(2) - (3)].exp_node)); ;}
     break;
 
   case 21:
@@ -2226,12 +2541,12 @@
 
   case 22:
 #line 173 "php_parser.y"
-    { (yyval.syn_node) = make_expr_syn_node(PHP_ST_RET, (yyvsp[-1].exp_node)); ;}
+    { (yyval.syn_node) = make_expr_syn_node(PHP_ST_RET, (yyvsp[(2) - (3)].exp_node)); ;}
     break;
 
   case 23:
 #line 174 "php_parser.y"
-    { (yyval.syn_node) = make_expr_syn_node(PHP_ST_ECHO, (yyvsp[-1].exp_node)); ;}
+    { (yyval.syn_node) = make_expr_syn_node(PHP_ST_ECHO, (yyvsp[(2) - (3)].exp_node)); ;}
     break;
 
   case 24:
@@ -2242,21 +2557,21 @@
   case 25:
 #line 176 "php_parser.y"
     {
-				(yyval.syn_node) = make_foreach_loop_syn_node((yyvsp[-4].exp_node), 0, (yyvsp[-2].exp_node), (yyvsp[0].syn_node), 0);
+				(yyval.syn_node) = make_foreach_loop_syn_node((yyvsp[(3) - (7)].exp_node), 0, (yyvsp[(5) - (7)].exp_node), (yyvsp[(7) - (7)].syn_node), 0);
 			;}
     break;
 
   case 26:
 #line 179 "php_parser.y"
     {
-				(yyval.syn_node) = make_foreach_loop_syn_node((yyvsp[-6].exp_node), (yyvsp[-4].exp_node), (yyvsp[-2].exp_node), (yyvsp[0].syn_node), 0);
+				(yyval.syn_node) = make_foreach_loop_syn_node((yyvsp[(3) - (9)].exp_node), (yyvsp[(5) - (9)].exp_node), (yyvsp[(7) - (9)].exp_node), (yyvsp[(9) - (9)].syn_node), 0);
 			;}
     break;
 
   case 27:
 #line 182 "php_parser.y"
     {
-				(yyval.syn_node) = make_foreach_loop_syn_node((yyvsp[-7].exp_node), (yyvsp[-5].exp_node), (yyvsp[-2].exp_node), (yyvsp[0].syn_node), 1);
+				(yyval.syn_node) = make_foreach_loop_syn_node((yyvsp[(3) - (10)].exp_node), (yyvsp[(5) - (10)].exp_node), (yyvsp[(8) - (10)].exp_node), (yyvsp[(10) - (10)].syn_node), 1);
 			;}
     break;
 
@@ -2287,17 +2602,17 @@
 
   case 33:
 #line 194 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_LIST, 0); (yyval.exp_node)->exp_node = (yyvsp[0].exp_node); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_LIST, 0); (yyval.exp_node)->exp_node = (yyvsp[(1) - (1)].exp_node); ;}
     break;
 
   case 34:
 #line 195 "php_parser.y"
     {
-				PHP_EXP_NODE *last = (yyvsp[-2].exp_node);
+				PHP_EXP_NODE *last = (yyvsp[(1) - (3)].exp_node);
 				while ( last->next) last = last->next;
 				last->next = make_exp_1(PHP_OP_LIST, 0);
-				last->next->exp_node = (yyvsp[0].exp_node);
-				(yyval.exp_node) = (yyvsp[-2].exp_node);
+				last->next->exp_node = (yyvsp[(3) - (3)].exp_node);
+				(yyval.exp_node) = (yyvsp[(1) - (3)].exp_node);
 			;}
     break;
 
@@ -2314,12 +2629,12 @@
   case 39:
 #line 216 "php_parser.y"
     {
-		const char *varname = get_scope_var_name(g_current_scope, (yyvsp[0].exp_node)->var_si_node->var);
+		const char *varname = get_scope_var_name(g_current_scope, (yyvsp[(1) - (1)].exp_node)->var_si_node->var);
 		PHP_SCOPE_ITEM *si = get_scope_item(g_current_scope, varname);
 		PHP_SCOPE_ITEM *gsi = get_scope_item(g_global_scope, varname);
 		if ( gsi && (gsi->type == PHP_SCOPE_VAR) ) {
 			free_var_node(si->var);
-			php_exp_tree_free((yyvsp[0].exp_node));
+			php_exp_tree_free((yyvsp[(1) - (1)].exp_node));
 			gsi->var->ref_count++;
 			si->var = gsi->var;
 		} else {
@@ -2340,14 +2655,14 @@
 
   case 42:
 #line 235 "php_parser.y"
-    { (yyvsp[0].exp_node)->var_node->flags |= PHP_VARFLAG_STATIC; (yyval.exp_node) = (yyvsp[0].exp_node); ;}
+    { (yyvsp[(1) - (1)].exp_node)->var_node->flags |= PHP_VARFLAG_STATIC; (yyval.exp_node) = (yyvsp[(1) - (1)].exp_node); ;}
     break;
 
   case 43:
 #line 236 "php_parser.y"
     {
-			(yyvsp[-2].exp_node)->var_node->flags |= PHP_VARFLAG_STATIC; (yyval.exp_node) = (yyvsp[-2].exp_node);
-			value_value_assign(&(yyvsp[-2].exp_node)->var_node->value, &(yyvsp[0].exp_node)->val_node);
+			(yyvsp[(1) - (3)].exp_node)->var_node->flags |= PHP_VARFLAG_STATIC; (yyval.exp_node) = (yyvsp[(1) - (3)].exp_node);
+			value_value_assign(&(yyvsp[(1) - (3)].exp_node)->var_node->value, &(yyvsp[(3) - (3)].exp_node)->val_node);
 		;}
     break;
 
@@ -2361,10 +2676,10 @@
   case 45:
 #line 246 "php_parser.y"
     {
-				(yyval.syn_node) = make_func_decl_syn_node((yyvsp[-7].str_val), (yyvsp[-4].exp_node));
+				(yyval.syn_node) = make_func_decl_syn_node((yyvsp[(2) - (9)].str_val), (yyvsp[(5) - (9)].exp_node));
 				(yyval.syn_node)->func_decl->scope = g_current_scope;
 				(yyval.syn_node)->func_decl->is_native = 0;
-				(yyval.syn_node)->func_decl->code = (yyvsp[-1].syn_node);
+				(yyval.syn_node)->func_decl->code = (yyvsp[(8) - (9)].syn_node);
 				switch_pop_scope_table(0);
 				add_func_2_scope(g_current_scope, (yyval.syn_node));
 				(yyval.syn_node) = 0;
@@ -2378,22 +2693,22 @@
 
   case 47:
 #line 259 "php_parser.y"
-    { (yyval.exp_node) = make_func_param(0, (yyvsp[0].exp_node), (yyvsp[-1].str_val), 0); ;}
+    { (yyval.exp_node) = make_func_param(0, (yyvsp[(2) - (2)].exp_node), (yyvsp[(1) - (2)].str_val), 0); ;}
     break;
 
   case 48:
 #line 260 "php_parser.y"
-    { (yyval.exp_node) = make_func_param(0, (yyvsp[0].exp_node), (yyvsp[-2].str_val), 1); ;}
+    { (yyval.exp_node) = make_func_param(0, (yyvsp[(3) - (3)].exp_node), (yyvsp[(1) - (3)].str_val), 1); ;}
     break;
 
   case 49:
 #line 261 "php_parser.y"
-    { (yyval.exp_node) = make_func_param((yyvsp[-3].exp_node), (yyvsp[0].exp_node), (yyvsp[-1].str_val), 0); ;}
+    { (yyval.exp_node) = make_func_param((yyvsp[(1) - (4)].exp_node), (yyvsp[(4) - (4)].exp_node), (yyvsp[(3) - (4)].str_val), 0); ;}
     break;
 
   case 50:
 #line 262 "php_parser.y"
-    { (yyval.exp_node) = make_func_param((yyvsp[-4].exp_node), (yyvsp[0].exp_node), (yyvsp[-2].str_val), 1); ;}
+    { (yyval.exp_node) = make_func_param((yyvsp[(1) - (5)].exp_node), (yyvsp[(5) - (5)].exp_node), (yyvsp[(3) - (5)].str_val), 1); ;}
     break;
 
   case 51:
@@ -2408,12 +2723,12 @@
 
   case 55:
 #line 273 "php_parser.y"
-    { (yyval.syn_node) = (yyvsp[-2].syn_node); ;}
+    { (yyval.syn_node) = (yyvsp[(2) - (4)].syn_node); ;}
     break;
 
   case 57:
 #line 278 "php_parser.y"
-    { (yyval.syn_node) = (yyvsp[-2].syn_node); ;}
+    { (yyval.syn_node) = (yyvsp[(2) - (4)].syn_node); ;}
     break;
 
   case 59:
@@ -2423,7 +2738,7 @@
 
   case 60:
 #line 286 "php_parser.y"
-    { (yyval.syn_node) = add_branch_2_elseif((yyvsp[-5].syn_node), make_ifelse_syn_node((yyvsp[-2].exp_node), (yyvsp[0].syn_node), 0, 0)); ;}
+    { (yyval.syn_node) = add_branch_2_elseif((yyvsp[(1) - (6)].syn_node), make_ifelse_syn_node((yyvsp[(4) - (6)].exp_node), (yyvsp[(6) - (6)].syn_node), 0, 0)); ;}
     break;
 
   case 61:
@@ -2438,32 +2753,32 @@
 
   case 63:
 #line 292 "php_parser.y"
-    { (yyval.syn_node) = (yyvsp[0].syn_node); ;}
+    { (yyval.syn_node) = (yyvsp[(2) - (2)].syn_node); ;}
     break;
 
   case 65:
 #line 296 "php_parser.y"
-    { (yyval.syn_node) = (yyvsp[-2].syn_node); ;}
+    { (yyval.syn_node) = (yyvsp[(2) - (4)].syn_node); ;}
     break;
 
   case 66:
 #line 300 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[-1].exp_node); ;}
+    { (yyval.exp_node) = (yyvsp[(2) - (3)].exp_node); ;}
     break;
 
   case 67:
 #line 301 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[-1].exp_node); ;}
+    { (yyval.exp_node) = (yyvsp[(3) - (4)].exp_node); ;}
     break;
 
   case 68:
 #line 302 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[-2].exp_node); ;}
+    { (yyval.exp_node) = (yyvsp[(2) - (4)].exp_node); ;}
     break;
 
   case 69:
 #line 303 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[-2].exp_node); ;}
+    { (yyval.exp_node) = (yyvsp[(3) - (5)].exp_node); ;}
     break;
 
   case 70:
@@ -2474,23 +2789,23 @@
   case 71:
 #line 308 "php_parser.y"
     {
-			(yyvsp[-2].exp_node)->tree_node.syn_right = (yyvsp[0].syn_node);
-			if ( (yyvsp[-3].exp_node) ) {
-				PHP_EXP_NODE *last = (yyvsp[-3].exp_node);
+			(yyvsp[(2) - (4)].exp_node)->tree_node.syn_right = (yyvsp[(4) - (4)].syn_node);
+			if ( (yyvsp[(1) - (4)].exp_node) ) {
+				PHP_EXP_NODE *last = (yyvsp[(1) - (4)].exp_node);
 				while ( last->next) last = last->next;
 				last->next = make_exp_1(PHP_OP_LIST, 0);
-				last->next->exp_node = (yyvsp[-2].exp_node);
-				(yyval.exp_node) = (yyvsp[-3].exp_node);
+				last->next->exp_node = (yyvsp[(2) - (4)].exp_node);
+				(yyval.exp_node) = (yyvsp[(1) - (4)].exp_node);
 			} else {
 				(yyval.exp_node) = make_exp_1(PHP_OP_LIST, 0);
-				(yyval.exp_node)->exp_node = (yyvsp[-2].exp_node);
+				(yyval.exp_node)->exp_node = (yyvsp[(2) - (4)].exp_node);
 			}
 		;}
     break;
 
   case 72:
 #line 323 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_LIST, (yyvsp[0].exp_node), 0); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_LIST, (yyvsp[(2) - (2)].exp_node), 0); ;}
     break;
 
   case 73:
@@ -2500,42 +2815,42 @@
 
   case 79:
 #line 335 "php_parser.y"
-    { (yyval.exp_node) = make_known_const((yyvsp[0].str_val)); ;}
+    { (yyval.exp_node) = make_known_const((yyvsp[(1) - (1)].str_val)); ;}
     break;
 
   case 81:
 #line 339 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_CLASS_DEREF, make_const_exp_str((yyvsp[-2].str_val), 0), make_const_exp_str((yyvsp[0].str_val), 0)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_CLASS_DEREF, make_const_exp_str((yyvsp[(1) - (3)].str_val), 0), make_const_exp_str((yyvsp[(3) - (3)].str_val), 0)); ;}
     break;
 
   case 82:
 #line 340 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_OBJECT_DEREF, (yyvsp[-2].exp_node), make_const_exp_str((yyvsp[0].str_val), 0)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_OBJECT_DEREF, (yyvsp[(1) - (3)].exp_node), make_const_exp_str((yyvsp[(3) - (3)].str_val), 0)); ;}
     break;
 
   case 84:
 #line 345 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_ARRAY_BY_KEY, (yyvsp[-2].exp_node), 0); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_ARRAY_BY_KEY, (yyvsp[(1) - (3)].exp_node), 0); ;}
     break;
 
   case 85:
 #line 346 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_ARRAY_BY_KEY, (yyvsp[-3].exp_node), (yyvsp[-1].exp_node));;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_ARRAY_BY_KEY, (yyvsp[(1) - (4)].exp_node), (yyvsp[(3) - (4)].exp_node));;}
     break;
 
   case 86:
 #line 347 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_ARRAY_BY_KEY, (yyvsp[-3].exp_node), (yyvsp[-1].exp_node));;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_ARRAY_BY_KEY, (yyvsp[(1) - (4)].exp_node), (yyvsp[(3) - (4)].exp_node));;}
     break;
 
   case 87:
 #line 348 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_VAR_BY_EXP, (yyvsp[-1].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_VAR_BY_EXP, (yyvsp[(3) - (4)].exp_node)); ;}
     break;
 
   case 88:
 #line 352 "php_parser.y"
-    { (yyval.exp_node) = make_func_call_exp((yyvsp[-3].str_val), (yyvsp[-1].exp_node)); ;}
+    { (yyval.exp_node) = make_func_call_exp((yyvsp[(1) - (4)].str_val), (yyvsp[(3) - (4)].exp_node)); ;}
     break;
 
   case 89:
@@ -2550,22 +2865,22 @@
 
   case 91:
 #line 357 "php_parser.y"
-    { (yyval.exp_node) = make_func_call_param_list(); func_call_add_expr((yyval.exp_node)->var_node, (yyvsp[0].exp_node), 0); ;}
+    { (yyval.exp_node) = make_func_call_param_list(); func_call_add_expr((yyval.exp_node)->var_node, (yyvsp[(1) - (1)].exp_node), 0); ;}
     break;
 
   case 92:
 #line 358 "php_parser.y"
-    { (yyval.exp_node) = make_func_call_param_list(); func_call_add_expr((yyval.exp_node)->var_node, (yyvsp[0].exp_node), 1); ;}
+    { (yyval.exp_node) = make_func_call_param_list(); func_call_add_expr((yyval.exp_node)->var_node, (yyvsp[(2) - (2)].exp_node), 1); ;}
     break;
 
   case 93:
 #line 359 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[-2].exp_node); func_call_add_expr((yyval.exp_node)->var_node, (yyvsp[0].exp_node), 0); ;}
+    { (yyval.exp_node) = (yyvsp[(1) - (3)].exp_node); func_call_add_expr((yyval.exp_node)->var_node, (yyvsp[(3) - (3)].exp_node), 0); ;}
     break;
 
   case 94:
 #line 360 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[-3].exp_node); func_call_add_expr((yyval.exp_node)->var_node, (yyvsp[0].exp_node), 1); ;}
+    { (yyval.exp_node) = (yyvsp[(1) - (4)].exp_node); func_call_add_expr((yyval.exp_node)->var_node, (yyvsp[(4) - (4)].exp_node), 1); ;}
     break;
 
   case 95:
@@ -2580,262 +2895,262 @@
 
   case 98:
 #line 368 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_ASS, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_ASS, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 99:
 #line 369 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[0].exp_node); ;}
+    { (yyval.exp_node) = (yyvsp[(1) - (1)].exp_node); ;}
     break;
 
   case 100:
 #line 370 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_MAKE_REF, (yyvsp[-3].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_MAKE_REF, (yyvsp[(1) - (4)].exp_node), (yyvsp[(4) - (4)].exp_node)); ;}
     break;
 
   case 101:
 #line 375 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-2].exp_node), make_exp_2(PHP_OP_ADD, (yyvsp[-2].exp_node), (yyvsp[0].exp_node))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (3)].exp_node), make_exp_2(PHP_OP_ADD, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node))); ;}
     break;
 
   case 102:
 #line 376 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-2].exp_node), make_exp_2(PHP_OP_SUB, (yyvsp[-2].exp_node), (yyvsp[0].exp_node))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (3)].exp_node), make_exp_2(PHP_OP_SUB, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node))); ;}
     break;
 
   case 103:
 #line 377 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-2].exp_node), make_exp_2(PHP_OP_MUL, (yyvsp[-2].exp_node), (yyvsp[0].exp_node))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (3)].exp_node), make_exp_2(PHP_OP_MUL, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node))); ;}
     break;
 
   case 104:
 #line 378 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-2].exp_node), make_exp_2(PHP_OP_DIV, (yyvsp[-2].exp_node), (yyvsp[0].exp_node))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (3)].exp_node), make_exp_2(PHP_OP_DIV, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node))); ;}
     break;
 
   case 105:
 #line 379 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-2].exp_node), make_exp_2(PHP_OP_CAT, (yyvsp[-2].exp_node), (yyvsp[0].exp_node))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (3)].exp_node), make_exp_2(PHP_OP_CAT, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node))); ;}
     break;
 
   case 106:
 #line 380 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-2].exp_node), make_exp_2(PHP_OP_REM, (yyvsp[-2].exp_node), (yyvsp[0].exp_node))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (3)].exp_node), make_exp_2(PHP_OP_REM, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node))); ;}
     break;
 
   case 107:
 #line 381 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-2].exp_node), make_exp_2(PHP_OP_AND, (yyvsp[-2].exp_node), (yyvsp[0].exp_node))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (3)].exp_node), make_exp_2(PHP_OP_AND, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node))); ;}
     break;
 
   case 108:
 #line 382 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-2].exp_node), make_exp_2(PHP_OP_OR, (yyvsp[-2].exp_node), (yyvsp[0].exp_node))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (3)].exp_node), make_exp_2(PHP_OP_OR, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node))); ;}
     break;
 
   case 109:
 #line 383 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-2].exp_node), make_exp_2(PHP_OP_XOR, (yyvsp[-2].exp_node), (yyvsp[0].exp_node))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (3)].exp_node), make_exp_2(PHP_OP_XOR, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node))); ;}
     break;
 
   case 110:
 #line 384 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-2].exp_node), make_exp_2(PHP_OP_SHL, (yyvsp[-2].exp_node), (yyvsp[0].exp_node))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (3)].exp_node), make_exp_2(PHP_OP_SHL, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node))); ;}
     break;
 
   case 111:
 #line 385 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-2].exp_node), make_exp_2(PHP_OP_SHR, (yyvsp[-2].exp_node), (yyvsp[0].exp_node))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (3)].exp_node), make_exp_2(PHP_OP_SHR, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node))); ;}
     break;
 
   case 112:
 #line 387 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-1].exp_node), make_exp_2(PHP_OP_ADD, (yyvsp[-1].exp_node), make_const_exp_dnum(1))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (2)].exp_node), make_exp_2(PHP_OP_ADD, (yyvsp[(1) - (2)].exp_node), make_const_exp_dnum(1))); ;}
     break;
 
   case 113:
 #line 388 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[0].exp_node), make_exp_2(PHP_OP_ADD, (yyvsp[0].exp_node), make_const_exp_dnum(1))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(2) - (2)].exp_node), make_exp_2(PHP_OP_ADD, (yyvsp[(2) - (2)].exp_node), make_const_exp_dnum(1))); ;}
     break;
 
   case 114:
 #line 389 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[-1].exp_node), make_exp_2(PHP_OP_SUB, (yyvsp[-1].exp_node), make_const_exp_dnum(1))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(1) - (2)].exp_node), make_exp_2(PHP_OP_SUB, (yyvsp[(1) - (2)].exp_node), make_const_exp_dnum(1))); ;}
     break;
 
   case 115:
 #line 390 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[0].exp_node), make_exp_2(PHP_OP_SUB, (yyvsp[0].exp_node), make_const_exp_dnum(1))); ;}
+    { (yyval.exp_node) = make_exp_2_self(PHP_OP_ASS, (yyvsp[(2) - (2)].exp_node), make_exp_2(PHP_OP_SUB, (yyvsp[(2) - (2)].exp_node), make_const_exp_dnum(1))); ;}
     break;
 
   case 116:
 #line 392 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_LOG_OR, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_LOG_OR, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 117:
 #line 393 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_LOG_AND, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_LOG_AND, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 118:
 #line 394 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_LOG_OR, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_LOG_OR, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 119:
 #line 395 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_LOG_AND, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_LOG_AND, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 120:
 #line 396 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_LOG_XOR, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_LOG_XOR, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 121:
 #line 397 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_OR, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_OR, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 122:
 #line 398 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_AND, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_AND, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 123:
 #line 399 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_XOR, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_XOR, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 124:
 #line 400 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_CAT, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_CAT, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 125:
 #line 401 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_ADD, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_ADD, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 126:
 #line 402 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_SUB, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_SUB, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 127:
 #line 403 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_MUL, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_MUL, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 128:
 #line 404 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_DIV, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_DIV, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 129:
 #line 405 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_REM, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_REM, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 130:
 #line 406 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_SHL, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_SHL, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 131:
 #line 407 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_SHR, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_SHR, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 132:
 #line 408 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[0].exp_node); ;}
+    { (yyval.exp_node) = (yyvsp[(2) - (2)].exp_node); ;}
     break;
 
   case 133:
 #line 409 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_SUB, make_const_exp_dnum(0), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_SUB, make_const_exp_dnum(0), (yyvsp[(2) - (2)].exp_node)); ;}
     break;
 
   case 134:
 #line 410 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_LOG_NOT, (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_LOG_NOT, (yyvsp[(2) - (2)].exp_node)); ;}
     break;
 
   case 135:
 #line 411 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_NOT, (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_NOT, (yyvsp[(2) - (2)].exp_node)); ;}
     break;
 
   case 136:
 #line 412 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_SAME, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_SAME, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 137:
 #line 413 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_NOT_SAME, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_NOT_SAME, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 138:
 #line 414 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_EQ, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_EQ, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 139:
 #line 415 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_NEQ, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_NEQ, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 140:
 #line 416 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_LWR, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_LWR, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 141:
 #line 417 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_LWR_EQ, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_LWR_EQ, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 142:
 #line 418 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_GRT, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_GRT, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 143:
 #line 419 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_GRT_EQ, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_GRT_EQ, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 144:
 #line 420 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[-1].exp_node); ;}
+    { (yyval.exp_node) = (yyvsp[(2) - (3)].exp_node); ;}
     break;
 
   case 145:
 #line 421 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_MUX, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); (yyval.exp_node)->exp_node = (yyvsp[-4].exp_node); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_MUX, (yyvsp[(3) - (5)].exp_node), (yyvsp[(5) - (5)].exp_node)); (yyval.exp_node)->exp_node = (yyvsp[(1) - (5)].exp_node); ;}
     break;
 
   case 146:
 #line 422 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_CAST_INT, (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_CAST_INT, (yyvsp[(2) - (2)].exp_node)); ;}
     break;
 
   case 147:
 #line 423 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_CAST_FLOAT, (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_CAST_FLOAT, (yyvsp[(2) - (2)].exp_node)); ;}
     break;
 
   case 148:
 #line 424 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_CAST_STR, (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_CAST_STR, (yyvsp[(2) - (2)].exp_node)); ;}
     break;
 
   case 149:
 #line 425 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_CAST_BOOL, (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_CAST_BOOL, (yyvsp[(2) - (2)].exp_node)); ;}
     break;
 
   case 150:
@@ -2850,27 +3165,27 @@
 
   case 152:
 #line 430 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[0].exp_node); ;}
+    { (yyval.exp_node) = (yyvsp[(2) - (2)].exp_node); ;}
     break;
 
   case 153:
 #line 432 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[0].exp_node); ;}
+    { (yyval.exp_node) = (yyvsp[(1) - (1)].exp_node); ;}
     break;
 
   case 154:
 #line 433 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_ARRAY, (yyvsp[-1].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_ARRAY, (yyvsp[(3) - (4)].exp_node)); ;}
     break;
 
   case 155:
 #line 434 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_PRINT, (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_PRINT, (yyvsp[(2) - (2)].exp_node)); ;}
     break;
 
   case 156:
 #line 437 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[-1].exp_node); ;}
+    { (yyval.exp_node) = (yyvsp[(2) - (3)].exp_node); ;}
     break;
 
   case 157:
@@ -2890,7 +3205,7 @@
 
   case 162:
 #line 448 "php_parser.y"
-    { (yyval.exp_node) = (yyvsp[-1].exp_node); ;}
+    { (yyval.exp_node) = (yyvsp[(3) - (4)].exp_node); ;}
     break;
 
   case 163:
@@ -2900,50 +3215,49 @@
 
   case 164:
 #line 452 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_LIST, 0); (yyval.exp_node)->exp_node = (yyvsp[0].exp_node); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_LIST, 0); (yyval.exp_node)->exp_node = (yyvsp[(1) - (1)].exp_node); ;}
     break;
 
   case 165:
 #line 453 "php_parser.y"
     {
-				PHP_EXP_NODE *last = (yyvsp[-2].exp_node);
+				PHP_EXP_NODE *last = (yyvsp[(1) - (3)].exp_node);
 				while ( last->next) last = last->next;
 				last->next = make_exp_1(PHP_OP_LIST, 0);
-				last->next->exp_node = (yyvsp[0].exp_node);
-				(yyval.exp_node) = (yyvsp[-2].exp_node);
+				last->next->exp_node = (yyvsp[(3) - (3)].exp_node);
+				(yyval.exp_node) = (yyvsp[(1) - (3)].exp_node);
 			;}
     break;
 
   case 166:
 #line 462 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_ARRAY_PAIR, (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_ARRAY_PAIR, (yyvsp[(1) - (1)].exp_node)); ;}
     break;
 
   case 167:
 #line 463 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_ARRAY_PAIR, (yyvsp[-2].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_ARRAY_PAIR, (yyvsp[(1) - (3)].exp_node), (yyvsp[(3) - (3)].exp_node)); ;}
     break;
 
   case 168:
 #line 464 "php_parser.y"
-    { (yyval.exp_node) = make_exp_2(PHP_OP_ARRAY_REF_PAIR, (yyvsp[-3].exp_node), (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_2(PHP_OP_ARRAY_REF_PAIR, (yyvsp[(1) - (4)].exp_node), (yyvsp[(4) - (4)].exp_node)); ;}
     break;
 
   case 169:
 #line 465 "php_parser.y"
-    { (yyval.exp_node) = make_exp_1(PHP_OP_ARRAY_REF_PAIR, (yyvsp[0].exp_node)); ;}
+    { (yyval.exp_node) = make_exp_1(PHP_OP_ARRAY_REF_PAIR, (yyvsp[(2) - (2)].exp_node)); ;}
     break;
 
 
+/* Line 1267 of yacc.c.  */
+#line 3256 "php_parser.c"
+      default: break;
     }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
-/* Line 1037 of yacc.c.  */
-#line 2942 "php_parser.c"
-&#xc;
-  yyvsp -= yylen;
-  yyssp -= yylen;
-
-
+  YYPOPSTACK (yylen);
+  yylen = 0;
   YY_STACK_PRINT (yyss, yyssp);
 
   *++yyvsp = yyval;
@@ -2972,66 +3286,41 @@
   if (!yyerrstatus)
     {
       ++yynerrs;
-#if YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (YYPACT_NINF < yyn && yyn < YYLAST)
-	{
-	  YYSIZE_T yysize = 0;
-	  int yytype = YYTRANSLATE (yychar);
-	  const char* yyprefix;
-	  char *yymsg;
-	  int yyx;
-
-	  /* Start YYX at -YYN if negative to avoid negative indexes in
-	     YYCHECK.  */
-	  int yyxbegin = yyn < 0 ? -yyn : 0;
-
-	  /* Stay within bounds of both yycheck and yytname.  */
-	  int yychecklim = YYLAST - yyn;
-	  int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-	  int yycount = 0;
-
-	  yyprefix = ", expecting ";
-	  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
 	      {
-		yysize += yystrlen (yyprefix) + yystrlen (yytname [yyx]);
-		yycount += 1;
-		if (yycount == 5)
-		  {
-		    yysize = 0;
-		    break;
-		  }
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
 	      }
-	  yysize += (sizeof ("syntax error, unexpected ")
-		     + yystrlen (yytname[yytype]));
-	  yymsg = (char *) YYSTACK_ALLOC (yysize);
-	  if (yymsg != 0)
-	    {
-	      char *yyp = yystpcpy (yymsg, "syntax error, unexpected ");
-	      yyp = yystpcpy (yyp, yytname[yytype]);
+	  }
 
-	      if (yycount < 5)
-		{
-		  yyprefix = ", expecting ";
-		  for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-		    if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-		      {
-			yyp = yystpcpy (yyp, yyprefix);
-			yyp = yystpcpy (yyp, yytname[yyx]);
-			yyprefix = " or ";
-		      }
-		}
-	      yyerror (yymsg);
-	      YYSTACK_FREE (yymsg);
-	    }
-	  else
-	    yyerror ("syntax error; also virtual memory exhausted");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror ("syntax error");
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
+      }
+#endif
     }
 
 
@@ -3042,23 +3331,15 @@
 	 error, discard it.  */
 
       if (yychar <= YYEOF)
-        {
-          /* If at end of input, pop the error token,
-	     then the rest of the stack, then return failure.  */
+	{
+	  /* Return failure if at end of input.  */
 	  if (yychar == YYEOF)
-	     for (;;)
-	       {
-
-		 YYPOPSTACK;
-		 if (yyssp == yyss)
-		   YYABORT;
-		 yydestruct ("Error: popping",
-                             yystos[*yyssp], yyvsp);
-	       }
-        }
+	    YYABORT;
+	}
       else
 	{
-	  yydestruct ("Error: discarding", yytoken, &yylval);
+	  yydestruct ("Error: discarding",
+		      yytoken, &yylval);
 	  yychar = YYEMPTY;
 	}
     }
@@ -3073,15 +3354,17 @@
 `---------------------------------------------------*/
 yyerrorlab:
 
-#ifdef __GNUC__
-  /* Pacify GCC when the user code never invokes YYERROR and the label
-     yyerrorlab therefore never appears in user code.  */
-  if (0)
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
-#endif
 
-yyvsp -= yylen;
-  yyssp -= yylen;
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
   yystate = *yyssp;
   goto yyerrlab1;
 
@@ -3111,8 +3394,9 @@
 	YYABORT;
 
 
-      yydestruct ("Error: popping", yystos[yystate], yyvsp);
-      YYPOPSTACK;
+      yydestruct ("Error: popping",
+		  yystos[yystate], yyvsp);
+      YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
@@ -3123,7 +3407,7 @@
   *++yyvsp = yylval;
 
 
-  /* Shift the error token. */
+  /* Shift the error token.  */
   YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
 
   yystate = yyn;
@@ -3141,28 +3425,43 @@
 | yyabortlab -- YYABORT comes here.  |
 `-----------------------------------*/
 yyabortlab:
-  yydestruct ("Error: discarding lookahead",
-              yytoken, &yylval);
-  yychar = YYEMPTY;
   yyresult = 1;
   goto yyreturn;
 
 #ifndef yyoverflow
-/*----------------------------------------------.
-| yyoverflowlab -- parser overflow comes here.  |
-`----------------------------------------------*/
-yyoverflowlab:
-  yyerror ("parser stack overflow");
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
 
 yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+		  yystos[*yyssp], yyvsp);
+      YYPOPSTACK (1);
+    }
 #ifndef yyoverflow
   if (yyss != yyssa)
     YYSTACK_FREE (yyss);
 #endif
-  return yyresult;
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
 }

aMule-2.2.6.tar.bz2/src/webserver/src/php_parser.h -> aMule-2.3.1.tar.bz2/src/webserver/src/php_parser.h Changed

@@ -1,7 +1,8 @@
-/* A Bison parser, made by GNU Bison 2.0.  */
+/* A Bison parser, made by GNU Bison 2.3.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (c) 1984-2008 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
@@ -15,13 +16,21 @@
 
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   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.
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
 /* Tokens.  */
 #ifndef YYTOKENTYPE
@@ -119,6 +128,7 @@
      END_SCRIPT = 345
    };
 #endif
+/* Tokens.  */
 #define FNUMBER 258
 #define DNUMBER 259
 #define STRING 260
@@ -211,23 +221,22 @@
 
 
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
 #line 67 "php_parser.y"
-typedef union YYSTYPE {
+{
 	PHP_SYN_NODE *syn_node;
 	PHP_EXP_NODE *exp_node;
 
 	char str_val[256];
-} YYSTYPE;
-/* Line 1318 of yacc.c.  */
-#line 224 "php_parser.h"
+}
+/* Line 1529 of yacc.c.  */
+#line 236 "php_parser.h"
+	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 
-extern YYSTYPE yylval;
-
-
+extern YYSTYPE phplval;
 
-// File_checked_for_headers

aMule-2.2.6.tar.bz2/src/webserver/src/php_parser.y -> aMule-2.3.1.tar.bz2/src/webserver/src/php_parser.y Changed

aMule-2.3.1.tar.bz2/src/webserver/src/php_standalone_makefile Added

aMule-2.2.6.tar.bz2/src/webserver/src/php_syntree.cpp -> aMule-2.3.1.tar.bz2/src/webserver/src/php_syntree.cpp Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2005-2009 Froenchenko Leonid ( lfroen@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-2011 Froenchenko Leonid ( lfroen@gmail.com / 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
@@ -1831,14 +1831,16 @@
 			case PHP_ST_CONTINUE:
 			case PHP_ST_BREAK:
 				if (  node->node_expr ) {
+					// 'break' or 'continue' used with an argument
 					php_expr_eval(node->node_expr, &cond_result);
 				} else {
+					// without an argument break or continue just 1 loop
 					cond_result.type = PHP_VAL_INT;
 					cond_result.int_val = 1;
 				}
 				cast_value_dnum(&cond_result);
 				if ( node->type == PHP_ST_BREAK ) {
-					curr_exec_result = -cond_result.int_val;
+					curr_exec_result = -(int)(cond_result.int_val);
 				} else {
 					curr_exec_result = cond_result.int_val;
 				}
@@ -1853,12 +1855,29 @@
 					cond_result.int_val = 1;
 				}
 				while ( cond_result.int_val ) {
+					// evaluate code within while loop
 					curr_exec_result = php_execute(node->node_while.code, 0);
+					// if 'break' was used
 					if ( curr_exec_result < 0 ) {
+						// decrease number of loops to break
+						curr_exec_result++;
+						// and break current loop
+						break;
+					}
+					// normal execution of loop or continue
+					if ( curr_exec_result == 0 || curr_exec_result == 1 ) {
+						curr_exec_result = 0;
+						// evaluate 'while' loop conditions
+						php_expr_eval(node->node_while.cond, &cond_result);
+						cast_value_bool(&cond_result);
+					}
+					// if 'continue' was used with an argument > 1
+					if ( curr_exec_result > 1 ) {
+						// decrease number of loops to skip
+						curr_exec_result--;
+						// and break current loop
 						break;
 					}
-					php_expr_eval(node->node_while.cond, &cond_result);
-					cast_value_bool(&cond_result);
 				}
 				break;
 			case PHP_ST_FOR:
@@ -1867,12 +1886,22 @@
 				cast_value_bool(&cond_result);
 				while ( cond_result.int_val ) {
 					curr_exec_result = php_execute(node->node_for.code, 0);
+					// handle 'break' and 'continue' 
 					if ( curr_exec_result < 0 ) {
+						curr_exec_result++;
+						break;
+					}
+					if ( curr_exec_result == 0 || curr_exec_result == 1 ) {
+						curr_exec_result = 0;
+						// evaluate 'for' loop conditions
+						php_expr_eval(node->node_for.do_next, &cond_result);
+						php_expr_eval(node->node_for.cond, &cond_result);
+						cast_value_bool(&cond_result);
+					}
+					if ( curr_exec_result > 1 ) {
+						curr_exec_result--;
 						break;
 					}
-					php_expr_eval(node->node_for.do_next, &cond_result);
-					php_expr_eval(node->node_for.cond, &cond_result);
-					cast_value_bool(&cond_result);
 				}
 				break;
 			case PHP_ST_FOREACH: {
@@ -1899,6 +1928,7 @@
 						PHP_VALUE_NODE *curr_value = &array->array[*array->current]->value;
 						value_value_assign(&i_val->var->value, curr_value);
 						curr_exec_result = php_execute(node->node_foreach.code, 0);
+						// clean up
 						if ( i_key ) {
 							value_value_free(&i_key->var->value);
 						}
@@ -1906,31 +1936,50 @@
 							value_value_assign(curr_value, &i_val->var->value);
 						}
 						value_value_free(&i_val->var->value);
+						// handle 'break' and 'continue' 
 						if ( curr_exec_result < 0 ) {
+							curr_exec_result++;
+							break;
+						}
+						if ( curr_exec_result == 0 || curr_exec_result == 1 ) {
+							curr_exec_result = 0;
+							// next element
+							array->current++;
+						}
+						if ( curr_exec_result > 1 ) {
+							curr_exec_result--;
 							break;
 						}
-						array->current++;
 					}
 				}
 				break;
 			case PHP_ST_SWITCH: {
 					PHP_SYN_NODE *cur_exec = 0;
+					// evaluate switch argument
 					php_expr_eval(node->node_switch.cond, &cond_result);
+					// loop through list of case statements
 					PHP_EXP_NODE *curr = node->node_switch.case_list;
 					while (curr) {
 						PHP_VALUE_NODE cur_value, cmp_result;
 						cur_value.type = cmp_result.type = PHP_VAL_NONE;
+						// TODO make amuleweb not crash when 'default' is used
 						php_expr_eval(curr->exp_node->tree_node.left, &cur_value);
 
+						// switch argument equal to case argument?
 						php_eval_compare(PHP_OP_EQ, &cur_value, &cond_result, &cmp_result);
 						if ( cmp_result.int_val ) {
+							// execute code and rest of case statements
 							cur_exec = (PHP_SYN_NODE *)curr->exp_node->tree_node.syn_right;
 							break;
 						}
 						curr = curr->next;
 					}
 					if ( cur_exec ) {
-						php_execute(cur_exec, result);
+						curr_exec_result = php_execute(cur_exec, result);
+						// break
+						if (curr_exec_result < 0) curr_exec_result++;
+						// continue
+						if (curr_exec_result > 0) curr_exec_result--;
 					}
 				}
 				break;
@@ -1986,32 +2035,10 @@
 }
 
 
-int yyerror(char *s)
+int phperror(char *s)
 {
-	printf("ERROR in grammar %s after [%s] near line %d\n", s, yytext, yylineno);
+	printf("ERROR in grammar %s after [%s] near line %d\n", s, phptext, phplineno);
 	return 0;
 }
 
-#ifdef PHP_STANDALONE_EN
-
-int main(int argc, char *argv[])
-{
-	const char *filename = ( argc == 2 ) ? argv[1] : "test.php";
-
-	CWriteStrBuffer buffer;
-	
-	yydebug = 0;
-
-	CPhpFilter php_filter((CWebServerBase*)0, (CSession *)0,filename, &buffer);
-	
-	int size = buffer.Length();
-	char *buf = new char [size+1];
-	buffer.CopyAll(buf);
-	printf("%s", buf);
-	delete [] buf;
-	
-	return 0;
-}
-
-#endif
 // File_checked_for_headers

aMule-2.2.6.tar.bz2/src/webserver/src/php_syntree.h -> aMule-2.3.1.tar.bz2/src/webserver/src/php_syntree.h Changed

@@ -1,8 +1,8 @@
 //
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2003-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2005-2009 Froenchenko Leonid ( lfroen@amule.org )
+// Copyright (c) 2003-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2005-2011 Froenchenko Leonid ( lfroen@gmail.com / 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
@@ -33,7 +33,13 @@
 #ifndef __STDC_FORMAT_MACROS
 	#define __STDC_FORMAT_MACROS
 #endif
+
+#ifdef _MSC_VER
+typedef unsigned __int64 uint64_t;
+#define YY_NO_UNISTD_H
+#else
 #include <inttypes.h>
+#endif
 
 #if !defined PRIu64
 # if defined(__alpha__) || defined(__ia64__) || defined(__ppc64__) || defined(__x86_64__) \
@@ -342,13 +348,13 @@
 /*
  * lex/yacc stuff
  */
-	int yyerror(char *err);
-	int yyparse();
+	int phperror(char *err);
+	int phpparse();
 	
-	extern int yydebug;
-	extern FILE *yyin;
-	extern char *yytext;
-	extern int yylineno;
+	extern int pphdebug;
+	extern FILE *phpin;
+	extern char *phptext;
+	extern int phplineno;
 
 /* 
  * Syntax tree interface to parser
@@ -504,7 +510,7 @@
 	// left = VAR(func_name), right=ARRAY(args)
 	void php_run_func_call(PHP_EXP_NODE *node, PHP_VALUE_NODE *result);
 
-#if defined(__GNUC__)
+#ifdef __GNUC__
 	void php_report_error(PHP_MSG_TYPE mtype, const char *msg, ...)  __attribute__ ((__format__ (__printf__, 2, 3)));
 #else
 	void php_report_error(PHP_MSG_TYPE mtype, const char *msg, ...);

aMule-2.2.6.tar.bz2/unittests/Makefile.in -> aMule-2.3.1.tar.bz2/unittests/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -45,11 +43,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -59,36 +59,65 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
+	install-dvi-recursive install-exec-recursive \
+	install-html-recursive install-info-recursive \
+	install-pdf-recursive install-ps-recursive install-recursive \
+	installcheck-recursive installdirs-recursive pdf-recursive \
+	ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^$[^/]*$/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/$[^/]*$$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -103,17 +132,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -125,44 +148,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -184,13 +207,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -198,44 +218,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -244,7 +260,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -252,25 +267,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -282,29 +291,40 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 SUBDIRS = 
 MAINTAINERCLEANFILES = Makefile.in
 DIST_SUBDIRS = muleunit tests
@@ -318,14 +338,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  unittests/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  unittests/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign unittests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign unittests/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -343,7 +363,7 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
+$(am__aclocal_m4_deps):
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -352,7 +372,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -369,16 +389,15 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
+$(RECURSIVE_CLEAN_TARGETS):
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -404,16 +423,16 @@
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -421,14 +440,14 @@
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -440,81 +459,101 @@
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -544,6 +583,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -563,18 +603,38 @@
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-recursive
+
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -593,23 +653,26 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
 
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-	clean clean-generic clean-recursive ctags ctags-recursive \
-	distclean distclean-generic distclean-recursive distclean-tags \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+	all all-am check check-am clean clean-generic ctags \
+	ctags-recursive distclean distclean-generic distclean-tags \
 	distdir dvi dvi-am html html-am info info-am install \
-	install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
 	install-strip installcheck installcheck-am installdirs \
 	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+	tags-recursive uninstall uninstall-am
 
 $(TARGETS): SUBDIRS = $(DIST_SUBDIRS)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

aMule-2.2.6.tar.bz2/unittests/muleunit/Makefile.am -> aMule-2.3.1.tar.bz2/unittests/muleunit/Makefile.am Changed

aMule-2.2.6.tar.bz2/unittests/muleunit/Makefile.in -> aMule-2.3.1.tar.bz2/unittests/muleunit/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +15,12 @@
 
 @SET_MAKE@
 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -46,11 +44,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -60,51 +60,69 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 libmuleunit_a_AR = $(AR) $(ARFLAGS)
 libmuleunit_a_LIBADD =
 am_libmuleunit_a_OBJECTS = libmuleunit_a-test.$(OBJEXT) \
 	libmuleunit_a-main.$(OBJEXT) libmuleunit_a-testcase.$(OBJEXT) \
 	libmuleunit_a-testregistry.$(OBJEXT) \
-	libmuleunit_a-MuleDebug.$(OBJEXT)
+	libmuleunit_a-MuleDebug.$(OBJEXT) \
+	libmuleunit_a-StringFunctions.$(OBJEXT)
 libmuleunit_a_OBJECTS = $(am_libmuleunit_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libmuleunit_a_SOURCES)
 DIST_SOURCES = $(libmuleunit_a_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -119,17 +137,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -141,44 +153,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -200,13 +212,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -214,44 +223,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -260,7 +265,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -268,25 +272,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -298,29 +296,40 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 noinst_LIBRARIES = libmuleunit.a
 libmuleunit_a_SOURCES = \
 	test.cpp \
@@ -330,7 +339,8 @@
 	testcase.h \
 	testregistry.cpp \
 	testregistry.h \
-	$(top_srcdir)/src/libs/common/MuleDebug.cpp
+	$(top_srcdir)/src/libs/common/MuleDebug.cpp \
+	$(top_srcdir)/src/libs/common/StringFunctions.cpp
 
 libmuleunit_a_CPPFLAGS = $(MULECPPFLAGS) $(WXBASE_CPPFLAGS) -I$(top_srcdir)/src/libs -DMULEUNIT 
 libmuleunit_a_CXXFLAGS = $(MULECXXFLAGS) $(WX_CFLAGS_ONLY) $(WX_CXXFLAGS_ONLY)
@@ -344,14 +354,14 @@
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  unittests/muleunit/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  unittests/muleunit/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign unittests/muleunit/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign unittests/muleunit/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -369,13 +379,14 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 libmuleunit.a: $(libmuleunit_a_OBJECTS) $(libmuleunit_a_DEPENDENCIES) 
-	-rm -f libmuleunit.a
-	$(libmuleunit_a_AR) libmuleunit.a $(libmuleunit_a_OBJECTS) $(libmuleunit_a_LIBADD)
-	$(RANLIB) libmuleunit.a
+	$(AM_V_at)-rm -f libmuleunit.a
+	$(AM_V_AR)$(libmuleunit_a_AR) libmuleunit.a $(libmuleunit_a_OBJECTS) $(libmuleunit_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libmuleunit.a
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -384,168 +395,203 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleunit_a-MuleDebug.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleunit_a-StringFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleunit_a-main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleunit_a-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleunit_a-testcase.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmuleunit_a-testregistry.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 libmuleunit_a-test.o: test.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-test.o -MD -MP -MF "$(DEPDIR)/libmuleunit_a-test.Tpo" -c -o libmuleunit_a-test.o `test -f 'test.cpp' || echo '$(srcdir)/'`test.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleunit_a-test.Tpo" "$(DEPDIR)/libmuleunit_a-test.Po"; else rm -f "$(DEPDIR)/libmuleunit_a-test.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-test.o -MD -MP -MF $(DEPDIR)/libmuleunit_a-test.Tpo -c -o libmuleunit_a-test.o `test -f 'test.cpp' || echo '$(srcdir)/'`test.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleunit_a-test.Tpo $(DEPDIR)/libmuleunit_a-test.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='test.cpp' object='libmuleunit_a-test.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -c -o libmuleunit_a-test.o `test -f 'test.cpp' || echo '$(srcdir)/'`test.cpp
 
 libmuleunit_a-test.obj: test.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-test.obj -MD -MP -MF "$(DEPDIR)/libmuleunit_a-test.Tpo" -c -o libmuleunit_a-test.obj `if test -f 'test.cpp'; then $(CYGPATH_W) 'test.cpp'; else $(CYGPATH_W) '$(srcdir)/test.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleunit_a-test.Tpo" "$(DEPDIR)/libmuleunit_a-test.Po"; else rm -f "$(DEPDIR)/libmuleunit_a-test.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-test.obj -MD -MP -MF $(DEPDIR)/libmuleunit_a-test.Tpo -c -o libmuleunit_a-test.obj `if test -f 'test.cpp'; then $(CYGPATH_W) 'test.cpp'; else $(CYGPATH_W) '$(srcdir)/test.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleunit_a-test.Tpo $(DEPDIR)/libmuleunit_a-test.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='test.cpp' object='libmuleunit_a-test.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -c -o libmuleunit_a-test.obj `if test -f 'test.cpp'; then $(CYGPATH_W) 'test.cpp'; else $(CYGPATH_W) '$(srcdir)/test.cpp'; fi`
 
 libmuleunit_a-main.o: main.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-main.o -MD -MP -MF "$(DEPDIR)/libmuleunit_a-main.Tpo" -c -o libmuleunit_a-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleunit_a-main.Tpo" "$(DEPDIR)/libmuleunit_a-main.Po"; else rm -f "$(DEPDIR)/libmuleunit_a-main.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-main.o -MD -MP -MF $(DEPDIR)/libmuleunit_a-main.Tpo -c -o libmuleunit_a-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleunit_a-main.Tpo $(DEPDIR)/libmuleunit_a-main.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='main.cpp' object='libmuleunit_a-main.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -c -o libmuleunit_a-main.o `test -f 'main.cpp' || echo '$(srcdir)/'`main.cpp
 
 libmuleunit_a-main.obj: main.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-main.obj -MD -MP -MF "$(DEPDIR)/libmuleunit_a-main.Tpo" -c -o libmuleunit_a-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleunit_a-main.Tpo" "$(DEPDIR)/libmuleunit_a-main.Po"; else rm -f "$(DEPDIR)/libmuleunit_a-main.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-main.obj -MD -MP -MF $(DEPDIR)/libmuleunit_a-main.Tpo -c -o libmuleunit_a-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleunit_a-main.Tpo $(DEPDIR)/libmuleunit_a-main.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='main.cpp' object='libmuleunit_a-main.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -c -o libmuleunit_a-main.obj `if test -f 'main.cpp'; then $(CYGPATH_W) 'main.cpp'; else $(CYGPATH_W) '$(srcdir)/main.cpp'; fi`
 
 libmuleunit_a-testcase.o: testcase.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-testcase.o -MD -MP -MF "$(DEPDIR)/libmuleunit_a-testcase.Tpo" -c -o libmuleunit_a-testcase.o `test -f 'testcase.cpp' || echo '$(srcdir)/'`testcase.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleunit_a-testcase.Tpo" "$(DEPDIR)/libmuleunit_a-testcase.Po"; else rm -f "$(DEPDIR)/libmuleunit_a-testcase.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-testcase.o -MD -MP -MF $(DEPDIR)/libmuleunit_a-testcase.Tpo -c -o libmuleunit_a-testcase.o `test -f 'testcase.cpp' || echo '$(srcdir)/'`testcase.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleunit_a-testcase.Tpo $(DEPDIR)/libmuleunit_a-testcase.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='testcase.cpp' object='libmuleunit_a-testcase.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -c -o libmuleunit_a-testcase.o `test -f 'testcase.cpp' || echo '$(srcdir)/'`testcase.cpp
 
 libmuleunit_a-testcase.obj: testcase.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-testcase.obj -MD -MP -MF "$(DEPDIR)/libmuleunit_a-testcase.Tpo" -c -o libmuleunit_a-testcase.obj `if test -f 'testcase.cpp'; then $(CYGPATH_W) 'testcase.cpp'; else $(CYGPATH_W) '$(srcdir)/testcase.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleunit_a-testcase.Tpo" "$(DEPDIR)/libmuleunit_a-testcase.Po"; else rm -f "$(DEPDIR)/libmuleunit_a-testcase.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-testcase.obj -MD -MP -MF $(DEPDIR)/libmuleunit_a-testcase.Tpo -c -o libmuleunit_a-testcase.obj `if test -f 'testcase.cpp'; then $(CYGPATH_W) 'testcase.cpp'; else $(CYGPATH_W) '$(srcdir)/testcase.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleunit_a-testcase.Tpo $(DEPDIR)/libmuleunit_a-testcase.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='testcase.cpp' object='libmuleunit_a-testcase.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -c -o libmuleunit_a-testcase.obj `if test -f 'testcase.cpp'; then $(CYGPATH_W) 'testcase.cpp'; else $(CYGPATH_W) '$(srcdir)/testcase.cpp'; fi`
 
 libmuleunit_a-testregistry.o: testregistry.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-testregistry.o -MD -MP -MF "$(DEPDIR)/libmuleunit_a-testregistry.Tpo" -c -o libmuleunit_a-testregistry.o `test -f 'testregistry.cpp' || echo '$(srcdir)/'`testregistry.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleunit_a-testregistry.Tpo" "$(DEPDIR)/libmuleunit_a-testregistry.Po"; else rm -f "$(DEPDIR)/libmuleunit_a-testregistry.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-testregistry.o -MD -MP -MF $(DEPDIR)/libmuleunit_a-testregistry.Tpo -c -o libmuleunit_a-testregistry.o `test -f 'testregistry.cpp' || echo '$(srcdir)/'`testregistry.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleunit_a-testregistry.Tpo $(DEPDIR)/libmuleunit_a-testregistry.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='testregistry.cpp' object='libmuleunit_a-testregistry.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -c -o libmuleunit_a-testregistry.o `test -f 'testregistry.cpp' || echo '$(srcdir)/'`testregistry.cpp
 
 libmuleunit_a-testregistry.obj: testregistry.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-testregistry.obj -MD -MP -MF "$(DEPDIR)/libmuleunit_a-testregistry.Tpo" -c -o libmuleunit_a-testregistry.obj `if test -f 'testregistry.cpp'; then $(CYGPATH_W) 'testregistry.cpp'; else $(CYGPATH_W) '$(srcdir)/testregistry.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleunit_a-testregistry.Tpo" "$(DEPDIR)/libmuleunit_a-testregistry.Po"; else rm -f "$(DEPDIR)/libmuleunit_a-testregistry.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-testregistry.obj -MD -MP -MF $(DEPDIR)/libmuleunit_a-testregistry.Tpo -c -o libmuleunit_a-testregistry.obj `if test -f 'testregistry.cpp'; then $(CYGPATH_W) 'testregistry.cpp'; else $(CYGPATH_W) '$(srcdir)/testregistry.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleunit_a-testregistry.Tpo $(DEPDIR)/libmuleunit_a-testregistry.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='testregistry.cpp' object='libmuleunit_a-testregistry.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -c -o libmuleunit_a-testregistry.obj `if test -f 'testregistry.cpp'; then $(CYGPATH_W) 'testregistry.cpp'; else $(CYGPATH_W) '$(srcdir)/testregistry.cpp'; fi`
 
 libmuleunit_a-MuleDebug.o: $(top_srcdir)/src/libs/common/MuleDebug.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-MuleDebug.o -MD -MP -MF "$(DEPDIR)/libmuleunit_a-MuleDebug.Tpo" -c -o libmuleunit_a-MuleDebug.o `test -f '$(top_srcdir)/src/libs/common/MuleDebug.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/MuleDebug.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleunit_a-MuleDebug.Tpo" "$(DEPDIR)/libmuleunit_a-MuleDebug.Po"; else rm -f "$(DEPDIR)/libmuleunit_a-MuleDebug.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-MuleDebug.o -MD -MP -MF $(DEPDIR)/libmuleunit_a-MuleDebug.Tpo -c -o libmuleunit_a-MuleDebug.o `test -f '$(top_srcdir)/src/libs/common/MuleDebug.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/MuleDebug.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleunit_a-MuleDebug.Tpo $(DEPDIR)/libmuleunit_a-MuleDebug.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/MuleDebug.cpp' object='libmuleunit_a-MuleDebug.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -c -o libmuleunit_a-MuleDebug.o `test -f '$(top_srcdir)/src/libs/common/MuleDebug.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/MuleDebug.cpp
 
 libmuleunit_a-MuleDebug.obj: $(top_srcdir)/src/libs/common/MuleDebug.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-MuleDebug.obj -MD -MP -MF "$(DEPDIR)/libmuleunit_a-MuleDebug.Tpo" -c -o libmuleunit_a-MuleDebug.obj `if test -f '$(top_srcdir)/src/libs/common/MuleDebug.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/MuleDebug.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/MuleDebug.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/libmuleunit_a-MuleDebug.Tpo" "$(DEPDIR)/libmuleunit_a-MuleDebug.Po"; else rm -f "$(DEPDIR)/libmuleunit_a-MuleDebug.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-MuleDebug.obj -MD -MP -MF $(DEPDIR)/libmuleunit_a-MuleDebug.Tpo -c -o libmuleunit_a-MuleDebug.obj `if test -f '$(top_srcdir)/src/libs/common/MuleDebug.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/MuleDebug.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/MuleDebug.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleunit_a-MuleDebug.Tpo $(DEPDIR)/libmuleunit_a-MuleDebug.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/MuleDebug.cpp' object='libmuleunit_a-MuleDebug.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -c -o libmuleunit_a-MuleDebug.obj `if test -f '$(top_srcdir)/src/libs/common/MuleDebug.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/MuleDebug.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/MuleDebug.cpp'; fi`
-uninstall-info-am:
+
+libmuleunit_a-StringFunctions.o: $(top_srcdir)/src/libs/common/StringFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-StringFunctions.o -MD -MP -MF $(DEPDIR)/libmuleunit_a-StringFunctions.Tpo -c -o libmuleunit_a-StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleunit_a-StringFunctions.Tpo $(DEPDIR)/libmuleunit_a-StringFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/StringFunctions.cpp' object='libmuleunit_a-StringFunctions.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -c -o libmuleunit_a-StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp
+
+libmuleunit_a-StringFunctions.obj: $(top_srcdir)/src/libs/common/StringFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -MT libmuleunit_a-StringFunctions.obj -MD -MP -MF $(DEPDIR)/libmuleunit_a-StringFunctions.Tpo -c -o libmuleunit_a-StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libmuleunit_a-StringFunctions.Tpo $(DEPDIR)/libmuleunit_a-StringFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/StringFunctions.cpp' object='libmuleunit_a-StringFunctions.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmuleunit_a_CPPFLAGS) $(CPPFLAGS) $(libmuleunit_a_CXXFLAGS) $(CXXFLAGS) -c -o libmuleunit_a-StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -573,6 +619,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -594,18 +641,38 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -625,18 +692,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
 	clean-noinstLIBRARIES ctags distclean distclean-compile \
 	distclean-generic distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
+	uninstall-am
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.2.6.tar.bz2/unittests/muleunit/main.cpp -> aMule-2.3.1.tar.bz2/unittests/muleunit/main.cpp Changed

aMule-2.2.6.tar.bz2/unittests/muleunit/test.cpp -> aMule-2.3.1.tar.bz2/unittests/muleunit/test.cpp Changed

@@ -1,8 +1,8 @@
 //
 // MuleUnit: A minimalistic C++ Unit testing framework based on EasyUnit.
 //
-// Copyright (c) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2004 Barthelemy Dagenais (barthelemy@prologique.com)
+// Copyright (c) 2005-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Barthelemy Dagenais ( barthelemy@prologique.com )
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -58,8 +58,7 @@
 
 
 CTestFailureException::CTestFailureException(const wxString& msg, const wxChar* file, long lineNumber)
-	: m_message(msg.ToAscii())
-	, m_bt(new BTList(g_backtrace))
+	: m_bt(new BTList(g_backtrace)), m_message(msg.ToAscii())
 {
 	m_bt->snapshot.push_back(BTEntry(file, lineNumber, msg));
 }
@@ -78,11 +77,7 @@
 	for (; it != m_bt->snapshot.end(); ++it) {
 		indent += ' ';
 
-		Printf(wxT("%s%s:%i -- %s"), 
-			wxString(indent.c_str(), wxConvLocal).c_str(),
-			it->file.c_str(),
-			it->line,
-			it->msg.c_str());
+		Print(indent + it->file + wxString::Format(wxT(":%i -- "), it->line) + it->msg);
 	}
 }

aMule-2.2.6.tar.bz2/unittests/muleunit/test.h -> aMule-2.3.1.tar.bz2/unittests/muleunit/test.h Changed

@@ -1,8 +1,8 @@
 //
 // MuleUnit: A minimalistic C++ Unit testing framework based on EasyUnit.
 //
-// Copyright (c) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2004 Barthelemy Dagenais (barthelemy@prologique.com)
+// Copyright (c) 2005-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Barthelemy Dagenais ( barthelemy@prologique.com )
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -26,7 +26,7 @@
 
 #include <wx/string.h>
 #include <list>
-
+#include <string>
 
 
 /**
@@ -48,15 +48,10 @@
 }
 
 
-/** Printf for wide-char strings. */
-inline void Printf(const wxChar *pszFormat, ...)
+/** Print wide-char strings. */
+inline void Print(const wxString& str)
 {
-	va_list argptr;
-	va_start(argptr, pszFormat);
-
-	wxPuts(wxString::FormatV(pszFormat, argptr).c_str());
-
-	va_end(argptr);
+	wxPuts(str.c_str());
 }
 
 
@@ -301,7 +296,7 @@
 
 
 /**
- * Requires that an assertion of a certain type is raised.
+ * Requires that an exception of a certain type is raised.
  */
 #define ASSERT_RAISES_M(type, call, message) \
 	try { \

aMule-2.2.6.tar.bz2/unittests/muleunit/testcase.cpp -> aMule-2.3.1.tar.bz2/unittests/muleunit/testcase.cpp Changed

@@ -1,8 +1,8 @@
 //
 // MuleUnit: A minimalistic C++ Unit testing framework based on EasyUnit.
 //
-// Copyright (c) 2005-2009 aMule Team ( admin@amule.org / http://www.amule.org )
-// Copyright (C) 2004 Barthelemy Dagenais (barthelemy@prologique.com)
+// Copyright (c) 2005-2011 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2004-2011 Barthelemy Dagenais ( barthelemy@prologique.com )
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -60,8 +60,7 @@
 
 bool TestCase::run()
 {
-	Printf(wxT("\nRunning test-collection \"%s\" with %u test-cases:"),
-		m_name.c_str(), m_tests.size());
+	Print(wxT("\nRunning test-collection \"") + m_name + wxString::Format(wxT("\" with %u test-cases:"), m_tests.size()));
 
 	bool failures = false;
 	
@@ -69,7 +68,7 @@
 	for (; it != m_tests.end(); ++it) {
 		Test* test = *it;
 		
-		Printf(wxT("\tTest \"%s\" "), test->getTestName().c_str());
+		Print(wxT("\tTest \"") + test->getTestName() + wxT("\" "));
 
 		bool wasSetup = false;
 		try {
@@ -77,7 +76,7 @@
 			wasSetup = true;
 		} catch (const CTestFailureException& e) {
 			failures = true;
-			Printf(wxT("\t\tFailure in setUp:\n"));
+			Print(wxT("\t\tFailure in setUp:\n"));
 			e.PrintBT();
 		}
 
@@ -88,7 +87,7 @@
 				test->run();
 			} catch (const CTestFailureException& e) {
 				failures = true;
-				Printf(wxT("\t\tFailure running:"));
+				Print(wxT("\t\tFailure running:"));
 				e.PrintBT();
 			}
 		}
@@ -97,7 +96,7 @@
 			test->tearDown();
 		} catch (const CTestFailureException& e) {
 			failures = true;
-			Printf(wxT("\t\tFailure in tearDown:"));
+			Print(wxT("\t\tFailure in tearDown:"));
 			e.PrintBT();
 		}
 	}

aMule-2.2.6.tar.bz2/unittests/muleunit/testcase.h -> aMule-2.3.1.tar.bz2/unittests/muleunit/testcase.h Changed

aMule-2.2.6.tar.bz2/unittests/muleunit/testregistry.cpp -> aMule-2.3.1.tar.bz2/unittests/muleunit/testregistry.cpp Changed

aMule-2.2.6.tar.bz2/unittests/muleunit/testregistry.h -> aMule-2.3.1.tar.bz2/unittests/muleunit/testregistry.h Changed

aMule-2.3.1.tar.bz2/unittests/tests/CTagTest.cpp Added

@@ -0,0 +1,714 @@
+#include <muleunit/test.h>
+
+#include <wx/filename.h>
+#include <MemFile.h>
+#include <tags/FileTags.h>
+#include <math.h>
+
+#include "MD4Hash.h"
+#include "amule.h"
+#include "Packet.h"
+#include <vector>
+
+using namespace muleunit;
+
+DECLARE_SIMPLE(CTag)
+
+void test_taglist_serialization(TagPtrList & taglist, byte* packet, uint64 packet_len);
+
+template <class T1, class T2>
+void AssertEquals(const T1& a, const T2& b)
+{
+	ASSERT_EQUALS(a, b);
+}
+
+struct BLOBValue : std::vector<byte>
+{
+	BLOBValue(uint32 _length, const byte* _ptr)
+		: std::vector<byte > (_ptr, _ptr + _length)
+	{}
+};
+
+struct BSOBValue : std::vector<byte>
+{
+	BSOBValue(uint8 _length, const byte* _ptr)
+		: std::vector<byte > (_ptr, _ptr + _length)
+	{}
+};
+
+BLOBValue valid_tag_value(const BLOBValue& x)	{ return x; }
+BSOBValue valid_tag_value(const BSOBValue& x)	{ return x; }
+CMD4Hash valid_tag_value(const CMD4Hash& x)	{ return x; }
+float valid_tag_value(float x)			{ return x; }
+wxString valid_tag_value(const wxString& x)	{ return x; }
+uint64 valid_tag_value(int x)			{ return x; }
+uint64 valid_tag_value(long long x)		{ return x; }
+uint64 valid_tag_value(uint64 x)		{ return x; }
+
+template<class T>
+wxString toString(const T& value)
+{
+	wxString buf;
+
+	return buf << value;
+}
+
+template<class T>
+wxString toString(T& value)
+{
+	wxString buf;
+
+	return buf << value;
+}
+
+template<>
+wxString toString(const CMD4Hash& value)
+{
+	return value.Encode();
+}
+
+template<>
+wxString toString(CMemFile& buf)
+{
+	uint64 curpos = buf.GetPosition();
+	wxString result;
+	buf.Seek(0, wxFromStart);
+	for (uint64 i = 0; i < buf.GetLength(); i++) {
+		result += wxString::Format(wxT("0x%02x,"), buf.ReadUInt8());
+	}
+	buf.Seek(curpos, wxFromStart);
+
+	return result;
+}
+
+template<>
+wxString toString(const BSOBValue& buf)
+{
+	wxString result;
+	for (uint64 i = 0; i < buf.size(); i++) {
+		result += wxString::Format(wxT("0x%02x,"), buf[i]);
+	}
+	return result;
+}
+
+template<>
+wxString toString(const BLOBValue& buf)
+{
+	wxString result;
+	for (uint64 i = 0; i < buf.size(); i++) {
+		result += wxString::Format(wxT("0x%02x,"), buf[i]);
+	}
+	return result;
+}
+
+template<>
+void AssertEquals(const CMD4Hash& a, const CMD4Hash& b)
+{
+	CONTEXT(wxT("Compare CMD4Hashes"));
+	ASSERT_EQUALS(a.Encode(), b.Encode());
+}
+
+template<>
+void AssertEquals(const BSOBValue& a, const BSOBValue& b)
+{
+	CONTEXT(wxT("Compare BSOBValue"));
+	ASSERT_EQUALS(toString(a), toString(b));
+}
+
+template<>
+void AssertEquals(const BLOBValue& a, const BLOBValue& b)
+{
+	CONTEXT(wxT("Compare BLOBValue"));
+	ASSERT_EQUALS(toString(a), toString(b));
+}
+
+void CheckTagName(const wxString& tagName, CTag* tag)
+{
+	CONTEXT(wxT("Checking string tagname"));
+	ASSERT_EQUALS(tagName, tag->GetName());
+}
+
+void CheckTagName(uint8 tagName, CTag* tag)
+{
+	CONTEXT(wxT("Checking int tagname"));
+	ASSERT_EQUALS(tagName, tag->GetNameID());
+}
+
+
+typedef bool (CTag::*CTagTypeChecker)() const;
+
+template<class T>
+struct CTagAccess {};
+
+template<>
+struct CTagAccess<wxString>
+{
+	static bool IsRightType(CTag* tag)
+	{
+		return tag->IsStr();
+	}
+
+	static const wxString & GetValue(CTag* tag)
+	{
+		return tag->GetStr();
+	}
+};
+
+template<>
+struct CTagAccess<CMD4Hash>
+{
+	static bool IsRightType(CTag* tag)
+	{
+		return tag->IsHash();
+	}
+
+	static const CMD4Hash & GetValue(CTag* tag)
+	{
+		return tag->GetHash();
+	}
+};
+
+template<>
+struct CTagAccess<float>
+{
+	static bool IsRightType(CTag* tag)
+	{
+		return tag->IsFloat();
+	}
+
+	static float GetValue(CTag* tag)
+	{
+		return tag->GetFloat();
+	}
+};
+
+template<>
+struct CTagAccess<uint64>
+{
+	static bool IsRightType(CTag* tag)
+	{
+		return tag->IsInt();
+	}
+
+	static uint64 GetValue(CTag* tag)
+	{
+		return tag->GetInt();
+	}
+};
+
+template<>
+struct CTagAccess<BLOBValue>
+{
+	static bool IsRightType(CTag* tag)
+	{
+		return tag->IsBlob();
+	}
+
+	static BLOBValue GetValue(CTag* tag)
+	{
+		return BLOBValue(tag->GetBlobSize(), tag->GetBlob());
+	}
+};
+
+template<>
+struct CTagAccess<BSOBValue>
+{
+	static bool IsRightType(CTag* tag)
+	{
+		return tag->IsBsob();
+	}
+
+	static BSOBValue GetValue(CTag* tag) {
+		return BSOBValue(tag->GetBsobSize(), tag->GetBsob());
+	}
+};
+
+template<class V>
+void CheckTagValue(V tagValue, CTag* tag)
+{
+	CONTEXT(wxT("Check tag value"));
+
+	AssertEquals(tagValue, CTagAccess< V >::GetValue(tag));
+}
+
+template<class V>
+void CheckTagType(V, CTag* tag)
+{
+	CONTEXT(wxT("Check tag type"));
+	ASSERT_EQUALS(true, CTagAccess<V>::IsRightType(tag));
+}
+
+template<class V, class TName>
+void CheckTagData(CTag* tag, TName tagName, const V& tagValue)
+{
+	CONTEXT(wxT("Expected tag value:") + toString(tagValue));
+	CONTEXT(wxT("Parsed tag info:") + tag->GetFullInfo());
+
+	CheckTagType(tagValue, tag);
+	CheckTagName(tagName, tag);
+	CheckTagValue(valid_tag_value(tagValue), tag);
+}
+
+void test_taglist_serialization(TagPtrList& taglist, byte* packet, uint64 packet_len)
+{
+	CMemFile fout;
+
+	{
+		CONTEXT(wxT("Writing taglist to CMemFile"));
+
+		fout.WriteTagPtrList(taglist);
+	}
+
+	// Rewind file
+	fout.Seek(0, wxFromStart);
+
+	{
+		CONTEXT(wxT("Check taglist serialization length"));
+		ASSERT_EQUALS(packet_len, fout.GetLength());
+	}
+
+	std::vector<byte> buf(packet_len);
+
+	{
+		CONTEXT(wxT("Reading back serialized taglist bytes from CMemFile"));
+		fout.Read(&buf[0], packet_len);
+	}
+
+	for (uint64 i = 0; i < packet_len; i++) {
+		CONTEXT(wxString::Format(wxT("Comparing serialized byte #%d"), i));
+
+		ASSERT_EQUALS(packet[i], buf[i]);
+	}
+}
+
+void ReadTagPtrList(TagPtrList& taglist, byte* packet, uint64 packet_len)
+{
+
+	CONTEXT(wxT("Reading taglist from buffer"));
+	CMemFile fin(packet, packet_len);
+	fin.ReadTagPtrList(&taglist, true);
+
+	{
+		CONTEXT(wxT("Verify position is at end of packet"));
+		ASSERT_EQUALS(packet_len, fin.GetPosition());
+	}
+}
+
+TEST_M(CTag, ReadTagList1, wxT("Kad: Parse taglist from Kad packet with UTF8 string #1"))
+{
+	byte packet[] = {
+		0x07,
+		/*Tag1*/ 0x02, 0x01, 0x00, 0x01, 0x22, 0x00, 0x47, 0x65, 0x6d, 0x20, 0x42, 0x6f, 0x79, 0x20, 0x2d,
+		0x20, 0x53, 0x61, 0x72, 0xc3, 0xa0, 0x20, 0x70, 0x65, 0x72, 0x63, 0x68, 0xc3, 0xa8, 0x20, 0x74,
+		0x69, 0x20, 0x61, 0x6d, 0x6f, 0x2e, 0x6d, 0x70, 0x33,
+		/*Tag2*/ 0x03, 0x01, 0x00, 0x02, 0x1d, 0x6f, 0x1f, 0x00,
+		/*Tag3*/ 0x09, 0x01, 0x00, 0x15, 0x01,
+		/*Tag4*/ 0x02, 0x01, 0x00, 0x03, 0x05, 0x00, 0x41, 0x75, 0x64, 0x69, 0x6f,
+		/*Tag5*/ 0x09, 0x01, 0x00, 0xd3, 0x6b,
+		/*Tag6*/ 0x09, 0x01, 0x00, 0xd4, 0x9a,
+		/*Tag7*/ 0x03, 0x01, 0x00, 0x33, 0x2f, 0x00, 0x01, 0x01
+	};
+
+	TagPtrList taglist;
+	ReadTagPtrList(taglist, packet, sizeof (packet));
+	TagPtrList::iterator it = taglist.begin();
+
+	CheckTagData(*it++, TAG_FILENAME, valid_tag_value(wxT("Gem Boy - Sarà perchè ti amo.mp3")));
+	CheckTagData(*it++, TAG_FILESIZE, valid_tag_value(2060061));
+	CheckTagData(*it++, TAG_SOURCES, valid_tag_value(1));
+	CheckTagData(*it++, TAG_FILETYPE, valid_tag_value(ED2KFTSTR_AUDIO));
+	CheckTagData(*it++, TAG_MEDIA_LENGTH, valid_tag_value(107));
+	CheckTagData(*it++, TAG_MEDIA_BITRATE, valid_tag_value(154));
+	CheckTagData(*it++, TAG_PUBLISHINFO, valid_tag_value(16842799));
+
+	ASSERT_TRUE(it == taglist.end());
+	test_taglist_serialization(taglist, packet, sizeof (packet));
+	deleteTagPtrListEntries(&taglist);
+}
+
+TEST_M(CTag, ReadTagList2, wxT("Kad: Parse taglist from Kad packet with UTF8 string #2"))
+{
+	byte packet[] = {
+		0x05,
+		/*Tag1*/0x02, 0x01, 0x00, 0x01, 0x33, 0x00, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x69, 0x7a, 0x61,
+		0x74, 0x69, 0x6f, 0x6e, 0x20, 0x54, 0x65, 0x73, 0x74, 0x20, 0x46, 0x69, 0x6c, 0x65, 0x20, 0x31,
+		0x38, 0x39, 0x33, 0x2d, 0xe2, 0x82, 0xac, 0xe2, 0x82, 0xac, 0xc3, 0xa8, 0xc3, 0xa9, 0xc3, 0xa7,
+		0xc3, 0xa0, 0xc3, 0xb9, 0xc2, 0xa7, 0x2e, 0x74, 0x78, 0x74,
+		/*Tag2*/0x09, 0x01, 0x00, 0x02, 0x0d,
+		/*Tag3*/0x09, 0x01, 0x00, 0x15, 0x00,
+		/*Tag4*/0x02, 0x01, 0x00, 0x03, 0x03, 0x00, 0x44, 0x6f, 0x63, 0x03, 0x01, 0x00,
+		0x33, 0xe8, 0x03, 0x01, 0x01
+	};
+
+	TagPtrList taglist;
+	ReadTagPtrList(taglist, packet, sizeof (packet));
+	TagPtrList::iterator it = taglist.begin();
+
+	CheckTagData(*it++, TAG_FILENAME, valid_tag_value(wxT("Serialization Test File 1893-€€èéçàù§.txt")));
+	CheckTagData(*it++, TAG_FILESIZE, valid_tag_value(13));
+	CheckTagData(*it++, TAG_SOURCES, valid_tag_value(0));
+	CheckTagData(*it++, TAG_FILETYPE, valid_tag_value(ED2KFTSTR_DOCUMENT));
+	CheckTagData(*it++, TAG_PUBLISHINFO, valid_tag_value(16843752));
+
+	ASSERT_TRUE(it == taglist.end());
+	test_taglist_serialization(taglist, packet, sizeof (packet));
+	deleteTagPtrListEntries(&taglist);
+
+}
+
+TEST_M(CTag, Float, wxT("Kad: Read/Write floats"))
+{
+	byte packet[] = {
+		0x02,
+		/*Tag1*/0x04, 0x01, 0x00, 0xFF, 0x79, 0xe9, 0xf6, 0x42,
+		/*Tag2*/0x04, 0x01, 0x00, 0xFF, 0x79, 0xd9, 0xd6, 0x42,
+	};
+
+	TagPtrList taglist;
+	ReadTagPtrList(taglist, packet, sizeof (packet));
+	TagPtrList::iterator it = taglist.begin();
+
+	CheckTagData(*it++, TAG_SOURCETYPE, valid_tag_value((float) 123.456));
+	CheckTagData(*it++, TAG_SOURCETYPE, valid_tag_value((float) 107.424751));
+
+	ASSERT_TRUE(it == taglist.end());
+	test_taglist_serialization(taglist, packet, sizeof (packet));
+	deleteTagPtrListEntries(&taglist);
+}
+
+TEST_M(CTag, CMD4Hash, wxT("Kad: Read/Write CMD4Hash"))
+{
+	byte packet[] = {
+		0x01,
+		/*Tag1*/0x01,
+		0x01, 0x00, 0xFF,
+		0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+		0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
+	};
+
+	TagPtrList taglist;
+	ReadTagPtrList(taglist, packet, sizeof (packet));
+	TagPtrList::iterator it = taglist.begin();
+
+	CMD4Hash hash;
+	ASSERT_TRUE(hash.Decode("000102030405060708090A0B0C0D0E0F"));
+
+	CheckTagData(*it++, TAG_SOURCETYPE, valid_tag_value(hash));
+
+	ASSERT_TRUE(it == taglist.end());
+	test_taglist_serialization(taglist, packet, sizeof (packet));
+	deleteTagPtrListEntries(&taglist);
+}
+
+template<class T, class V>
+void check_single_kad_tag(byte* packet, size_t packet_len, T tagName, V tagValue)
+{
+	CMemFile buf(packet, packet_len);
+	CONTEXT(wxT("Starting buffer: ") + toString(buf));
+	CTag* tag = buf.ReadTag(true);
+
+	CheckTagData(tag, tagName, valid_tag_value(tagValue));
+	{
+		CONTEXT(wxT("Check end of buffer"));
+		ASSERT_EQUALS(packet_len, buf.GetPosition());
+	}
+
+	{
+		CMemFile newbuf;
+		newbuf.WriteTag(*tag);
+
+		CONTEXT(wxT("Serialized    : ") + toString(newbuf));
+
+		newbuf.Seek(0, wxFromStart);
+		for (size_t i = 0; i < packet_len; i++) {
+			CONTEXT(wxString::Format(wxT("Comparing byte #%d"), i));
+
+			ASSERT_EQUALS(packet[i], newbuf.ReadUInt8());
+		}
+
+		ASSERT_EQUALS(packet_len, buf.GetPosition());
+	}
+	delete tag;
+}
+
+TEST_M(CTag, KadBsob, wxT("Kad: Read/Write BSOB"))
+{
+	byte packet[] = {
+		/*Tag1*/ 0x0A, 0x01, 0x00, 0x02, 0x04, 0x01, 0x02, 0x03, 0x04,
+	};
+	byte raw_data[] = {0x01, 0x02, 0x03, 0x04};
+	{
+		CONTEXT(wxT("Create BSOBValue"));
+		BSOBValue bsob(sizeof (raw_data), raw_data);
+
+		CONTEXT(wxT("check_single_kad_tag BSOBValue"));
+		check_single_kad_tag(packet, sizeof (packet), TAG_FILESIZE, bsob);
+	}
+}
+
+TEST_M(CTag, KadInt64, wxT("Kad: Read/Write integer 64bit"))
+{
+	byte packet[] = {
+		/*Tag1*/ 0x0b, 0x01, 0x00, 0x02, 0x10, 0x11, 0x12, 0x13, 0x20, 0x21, 0x22, 0x23, // 64 bit int
+	};
+	check_single_kad_tag(packet, sizeof (packet), TAG_FILESIZE, 0x2322212013121110LL);
+}
+
+TEST_M(CTag, KadInt32, wxT("Kad: Read/Write integer 32bit"))
+{
+	byte packet[] = {
+		/*Tag1*/ 0x03, 0x01, 0x00, 0x02, 0x12, 0x34, 0x56, 0x78, // 32 bit int
+	};
+	check_single_kad_tag(packet, sizeof (packet), TAG_FILESIZE, 0x78563412);
+}
+
+TEST_M(CTag, KadInt16, wxT("Kad: Read/Write integer 16bit"))
+{
+	byte packet[] = {
+		/*Tag1*/ 0x08, 0x01, 0x00, 0x02, 0x12, 0x34, // 16 bit int
+	};
+	check_single_kad_tag(packet, sizeof (packet), TAG_FILESIZE, 0x3412);
+}
+
+TEST_M(CTag, KadInt8, wxT("Kad: Read/Write integer  8bit"))
+{
+	byte packet[] = {
+		/*Tag1*/ 0x09, 0x01, 0x00, 0x02, 0x12, //  8 bit int
+	};
+	check_single_kad_tag(packet, sizeof (packet), TAG_FILESIZE, 0x12);
+}
+
+TEST_M(CTag, ReadIntegers, wxT("Kad: Read/Write multiple integers"))
+{
+	byte packet[] = {
+		0x08,
+		/*Tag1*/ 0x03, 0x01, 0x00, 0x02, 0x12, 0x34, 0x56, 0x78, // 32 bit int
+		/*Tag2*/ 0x08, 0x01, 0x00, 0x02, 0x12, 0x34, // 16 bit int
+		/*Tag3*/ 0x09, 0x01, 0x00, 0x02, 0x12, //  8 bit int
+		/*Tag4*/ 0x0b, 0x01, 0x00, 0x02, 0x10, 0x11, 0x12, 0x13, 0x20, 0x21, 0x22, 0x23, // 64 bit int
+
+		/*Tag5*/ 0x03, 0x01, 0x00, 0x02, 0x12, 0x34, 0x56, 0x78, // 32 bit int
+		/*Tag6*/ 0x08, 0x01, 0x00, 0x02, 0x12, 0x34, // 16 bit int
+		/*Tag7*/ 0x09, 0x01, 0x00, 0x02, 0x12, //  8 bit int
+		/*Tag8*/ 0x0b, 0x01, 0x00, 0x02, 0x10, 0x11, 0x12, 0x13, 0x20, 0x21, 0x22, 0x23, // 64 bit int
+	};
+
+	TagPtrList taglist;
+	ReadTagPtrList(taglist, packet, sizeof (packet));
+	TagPtrList::iterator it = taglist.begin();
+
+	CheckTagData(*it++, TAG_FILESIZE, valid_tag_value(0x78563412));
+	CheckTagData(*it++, TAG_FILESIZE, valid_tag_value(0x3412));
+	CheckTagData(*it++, TAG_FILESIZE, valid_tag_value(0x12));
+	CheckTagData(*it++, TAG_FILESIZE, valid_tag_value(0x2322212013121110LL));
+
+	CheckTagData(*it++, TAG_FILESIZE, valid_tag_value(0x78563412));
+	CheckTagData(*it++, TAG_FILESIZE, valid_tag_value(0x3412));
+	CheckTagData(*it++, TAG_FILESIZE, valid_tag_value(0x12));
+	CheckTagData(*it++, TAG_FILESIZE, valid_tag_value(0x2322212013121110LL));
+
+	ASSERT_TRUE(it == taglist.end());
+	test_taglist_serialization(taglist, packet, sizeof (packet));
+	deleteTagPtrListEntries(&taglist);
+}
+
+
+#include <map>
+
+typedef std::map<wxString, wxString> TagNamesByString;
+
+TEST_M(CTag, KadTagNames, wxT("Kad: Test Kad tags (name=string) - write/read every valid tag name"))
+{
+	TagNamesByString tagNames;
+
+	tagNames[TAG_FILENAME] = wxT("TAG_FILENAME");
+	tagNames[TAG_FILESIZE] = wxT("TAG_FILESIZE");
+	tagNames[TAG_FILESIZE_HI] = wxT("TAG_FILESIZE_HI");
+	tagNames[TAG_FILETYPE] = wxT("TAG_FILETYPE");
+	tagNames[TAG_FILEFORMAT] = wxT("TAG_FILEFORMAT");
+	tagNames[TAG_COLLECTION] = wxT("TAG_COLLECTION");
+	tagNames[TAG_PART_PATH] = wxT("TAG_PART_PATH");
+	tagNames[TAG_PART_HASH] = wxT("TAG_PART_HASH");
+	tagNames[TAG_COPIED] = wxT("TAG_COPIED");
+	tagNames[TAG_GAP_START] = wxT("TAG_GAP_START");
+	tagNames[TAG_GAP_END] = wxT("TAG_GAP_END");
+	tagNames[TAG_DESCRIPTION] = wxT("TAG_DESCRIPTION");
+	tagNames[TAG_PING] = wxT("TAG_PING");
+	tagNames[TAG_FAIL] = wxT("TAG_FAIL");
+	tagNames[TAG_PREFERENCE] = wxT("TAG_PREFERENCE");
+	tagNames[TAG_PORT] = wxT("TAG_PORT");
+	tagNames[TAG_IP_ADDRESS] = wxT("TAG_IP_ADDRESS");
+	tagNames[TAG_VERSION] = wxT("TAG_VERSION");
+	tagNames[TAG_TEMPFILE] = wxT("TAG_TEMPFILE");
+	tagNames[TAG_PRIORITY] = wxT("TAG_PRIORITY");
+	tagNames[TAG_STATUS] = wxT("TAG_STATUS");
+	tagNames[TAG_SOURCES] = wxT("TAG_SOURCES");
+	tagNames[TAG_AVAILABILITY] = wxT("TAG_AVAILABILITY");
+	tagNames[TAG_PERMISSIONS] = wxT("TAG_PERMISSIONS");
+	tagNames[TAG_QTIME] = wxT("TAG_QTIME");
+	tagNames[TAG_PARTS] = wxT("TAG_PARTS");
+	tagNames[TAG_PUBLISHINFO] = wxT("TAG_PUBLISHINFO");
+	tagNames[TAG_MEDIA_ARTIST] = wxT("TAG_MEDIA_ARTIST");
+	tagNames[TAG_MEDIA_ALBUM] = wxT("TAG_MEDIA_ALBUM");
+	tagNames[TAG_MEDIA_TITLE] = wxT("TAG_MEDIA_TITLE");
+	tagNames[TAG_MEDIA_LENGTH] = wxT("TAG_MEDIA_LENGTH");
+	tagNames[TAG_MEDIA_BITRATE] = wxT("TAG_MEDIA_BITRATE");
+	tagNames[TAG_MEDIA_CODEC] = wxT("TAG_MEDIA_CODEC");
+	tagNames[TAG_KADMISCOPTIONS] = wxT("TAG_KADMISCOPTIONS");
+	tagNames[TAG_ENCRYPTION] = wxT("TAG_ENCRYPTION");
+	tagNames[TAG_FILERATING] = wxT("TAG_FILERATING");
+	tagNames[TAG_BUDDYHASH] = wxT("TAG_BUDDYHASH");
+	tagNames[TAG_CLIENTLOWID] = wxT("TAG_CLIENTLOWID");
+	tagNames[TAG_SERVERPORT] = wxT("TAG_SERVERPORT");
+	tagNames[TAG_SERVERIP] = wxT("TAG_SERVERIP");
+	tagNames[TAG_SOURCEUPORT] = wxT("TAG_SOURCEUPORT");
+	tagNames[TAG_SOURCEPORT] = wxT("TAG_SOURCEPORT");
+	tagNames[TAG_SOURCEIP] = wxT("TAG_SOURCEIP");
+	tagNames[TAG_SOURCETYPE] = wxT("TAG_SOURCETYPE");
+
+	CMemFile buf;
+	buf.WriteUInt8(tagNames.size());
+	int counter = 0;
+	// For each tagNames entry write an 8bit int tag (type:0x9)
+	for (TagNamesByString::iterator it_name = tagNames.begin(); it_name != tagNames.end(); it_name++) {
+		buf.WriteUInt8(0x09); // 8 bit int tag type
+
+		buf.WriteUInt8(0x01); // single char string
+		buf.WriteUInt8(0x00); //
+
+		buf.WriteUInt8(it_name->first.GetChar(0)); // Write string first char
+		buf.WriteUInt8(counter++); // write tag value
+	}
+
+	TagPtrList taglist;
+	buf.Seek(0, wxFromStart);
+	size_t packet_len = buf.GetLength();
+	std::vector<byte> packet(packet_len);
+	buf.Read(&packet[0], packet_len);
+
+	ReadTagPtrList(taglist, &packet[0], packet_len);
+
+	TagPtrList::iterator it = taglist.begin();
+
+	counter = 0;
+	for (TagNamesByString::iterator it_name = tagNames.begin(); it_name != tagNames.end(); it_name++) {
+		CONTEXT(wxT("Testing tag name: ") + it_name->second);
+		CheckTagData(*it++, it_name->first, valid_tag_value(counter++));
+	}
+
+	ASSERT_TRUE(it == taglist.end());
+	test_taglist_serialization(taglist, &packet[0], packet_len);
+	deleteTagPtrListEntries(&taglist);
+}
+
+typedef std::map<int, wxString> TagNamesByInt;
+
+TEST_M(CTag, ED2kTagNames, wxT("Ed2k: Test ed2k tags (name=id) - write/read every valid tag name"))
+{
+	TagNamesByInt tagNames;
+
+	tagNames[FT_FILENAME] = wxT("FT_FILENAME");
+	tagNames[FT_FILESIZE] = wxT("FT_FILESIZE");
+	tagNames[FT_FILESIZE_HI] = wxT("FT_FILESIZE_HI");
+	tagNames[FT_FILETYPE] = wxT("FT_FILETYPE");
+	tagNames[FT_FILEFORMAT] = wxT("FT_FILEFORMAT");
+	tagNames[FT_LASTSEENCOMPLETE] = wxT("FT_LASTSEENCOMPLETE");
+	tagNames[FT_TRANSFERRED] = wxT("FT_TRANSFERRED");
+	tagNames[FT_GAPSTART] = wxT("FT_GAPSTART");
+	tagNames[FT_GAPEND] = wxT("FT_GAPEND");
+	tagNames[FT_PARTFILENAME] = wxT("FT_PARTFILENAME");
+	tagNames[FT_OLDDLPRIORITY] = wxT("FT_OLDDLPRIORITY");
+	tagNames[FT_STATUS] = wxT("FT_STATUS");
+	tagNames[FT_SOURCES] = wxT("FT_SOURCES");
+	tagNames[FT_PERMISSIONS] = wxT("FT_PERMISSIONS");
+	tagNames[FT_OLDULPRIORITY] = wxT("FT_OLDULPRIORITY");
+	tagNames[FT_DLPRIORITY] = wxT("FT_DLPRIORITY");
+	tagNames[FT_ULPRIORITY] = wxT("FT_ULPRIORITY");
+	tagNames[FT_KADLASTPUBLISHKEY] = wxT("FT_KADLASTPUBLISHKEY");
+	tagNames[FT_KADLASTPUBLISHSRC] = wxT("FT_KADLASTPUBLISHSRC");
+	tagNames[FT_FLAGS] = wxT("FT_FLAGS");
+	tagNames[FT_DL_ACTIVE_TIME] = wxT("FT_DL_ACTIVE_TIME");
+	tagNames[FT_CORRUPTEDPARTS] = wxT("FT_CORRUPTEDPARTS");
+	tagNames[FT_DL_PREVIEW] = wxT("FT_DL_PREVIEW");
+	tagNames[FT_KADLASTPUBLISHNOTES] = wxT("FT_KADLASTPUBLISHNOTES");
+	tagNames[FT_AICH_HASH] = wxT("FT_AICH_HASH");
+	tagNames[FT_COMPLETE_SOURCES] = wxT("FT_COMPLETE_SOURCES");
+	tagNames[FT_PUBLISHINFO] = wxT("FT_PUBLISHINFO");
+	tagNames[FT_ATTRANSFERRED] = wxT("FT_ATTRANSFERRED");
+	tagNames[FT_ATREQUESTED] = wxT("FT_ATREQUESTED");
+	tagNames[FT_ATACCEPTED] = wxT("FT_ATACCEPTED");
+	tagNames[FT_CATEGORY] = wxT("FT_CATEGORY");
+	tagNames[FT_ATTRANSFERREDHI] = wxT("FT_ATTRANSFERREDHI");
+	tagNames[FT_MEDIA_ARTIST] = wxT("FT_MEDIA_ARTIST");
+	tagNames[FT_MEDIA_ALBUM] = wxT("FT_MEDIA_ALBUM");
+	tagNames[FT_MEDIA_TITLE] = wxT("FT_MEDIA_TITLE");
+	tagNames[FT_MEDIA_LENGTH] = wxT("FT_MEDIA_LENGTH");
+	tagNames[FT_MEDIA_BITRATE] = wxT("FT_MEDIA_BITRATE");
+	tagNames[FT_MEDIA_CODEC] = wxT("FT_MEDIA_CODEC");
+	tagNames[FT_FILERATING] = wxT("FT_FILERATING");
+
+
+	CMemFile buf;
+
+	uint64 counter = 0;
+	for (TagNamesByInt::iterator it_name = tagNames.begin(); it_name != tagNames.end(); it_name++) {
+		// m_uType
+		buf.WriteUInt8(0x09 + 0x80);
+		// m_uName
+		buf.WriteUInt8(it_name->first);
+		// 8 bit
+		buf.WriteUInt8(counter++);
+	}
+
+	buf.Seek(0, wxFromStart);
+
+	counter = 0;
+	for (TagNamesByInt::iterator it_name = tagNames.begin(); it_name != tagNames.end(); it_name++) {
+		CONTEXT(wxString::Format(wxT("Reading tag#%d"), counter));
+		CTag* newtag = new CTag(buf, true);
+		CheckTagName(it_name->first, newtag);
+		CheckTagValue( valid_tag_value( counter ), newtag);
+		delete newtag;
+		counter++;
+	}
+}
+
+TEST_M(CTag, Ed2kBlob1, wxT("Ed2k: Read/Write BLOB - numeric tagname"))
+{
+	byte packet[] = {
+		/*Tag1*/ 0x87, 0xFF, 0x04, 0x00, 0x00, 0x00,
+		0x01, 0x02, 0x03, 0x04,
+	};
+
+	CMemFile buf(packet, sizeof (packet));
+	buf.Seek(0, wxFromStart);
+	byte raw_data[] = {0x01, 0x02, 0x03, 0x04};
+	{
+		CONTEXT(wxT("Create BLOBValue"));
+		BLOBValue blob(sizeof (raw_data), raw_data);
+
+		CTag tag(buf, true);
+		CheckTagName(0xFF, &tag);
+		CheckTagValue( valid_tag_value( blob ), &tag);
+	}
+}
+
+TEST_M(CTag, Ed2kBlob2, wxT("Ed2k: Read/Write BLOB - string tagname"))
+{
+	byte packet[] = {
+		/*Tag1*/ 0x07, 0x02, 0x00, 'A', 'A', 0x04, 0x00, 0x00, 0x00,
+		0x01, 0x02, 0x03, 0x04,
+	};
+
+	CMemFile buf(packet, sizeof (packet));
+	buf.Seek(0, wxFromStart);
+	byte raw_data[] = {0x01, 0x02, 0x03, 0x04};
+	{
+		CONTEXT(wxT("Create BLOBValue"));
+		BLOBValue blob(sizeof (raw_data), raw_data);
+
+		CTag tag(buf, true);
+		CheckTagName(wxT("AA"), &tag);
+		CheckTagValue( valid_tag_value( blob ), &tag);
+	}
+}

aMule-2.2.6.tar.bz2/unittests/tests/CUInt128Test.cpp -> aMule-2.3.1.tar.bz2/unittests/tests/CUInt128Test.cpp Changed

@@ -1,8 +1,8 @@
 //								-*- C++ -*-
 // This file is part of the aMule Project.
 //
-// Copyright (c) 2008-2009 Dévai Tamás (GonoszTopi) ( gonosztopi@amule.org )
-// Copyright (c) 2004-2009 aMule Team ( admin@amule.org / http://www.amule.org )
+// Copyright (c) 2008-2011 Dévai Tamás ( gonosztopi@amule.org )
+// Copyright (c) 2008-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
@@ -57,6 +57,7 @@
 	static uint8_t one[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
 	static uint8_t minusOne[16] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 	static uint8_t uintValue[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x12, 0x34, 0x56, 0x78 };
+	static uint8_t randomValue[16] = { 0xef, 0xac, 0xd6, 0x21, 0x99, 0x1b, 0x05, 0xbe, 0xfb, 0x97, 0xdf, 0xdd, 0xab, 0x4b, 0x88, 0xe3 };
 }
 
 DECLARE_SIMPLE(CUInt128);
@@ -110,9 +111,7 @@
 	ASSERT_EQUALS(0x04050607u, test.Get32BitChunk(1));
 	ASSERT_EQUALS(0x08090a0bu, test.Get32BitChunk(2));
 	ASSERT_EQUALS(0x0c0d0e0fu, test.Get32BitChunk(3));
-#if wxCHECK_VERSION(2, 8, 8)
-	ASSERT_RAISES(CAssertFailureException, test.Get32BitChunk(4));
-#endif
+	ASSERT_EQUALS(0u, test.Get32BitChunk(4));
 }
 
 TEST_M(CUInt128, OperatorEqualsCUInt128, wxT("operator==(const CUInt128&)"))
@@ -208,10 +207,14 @@
 	test.Set32BitChunk(2, 0x08090a0bu);
 	test.Set32BitChunk(3, 0x0c0d0e0fu);
 	ASSERT_EQUALS(CUInt128((uint8_t *)&TestData::sequence), test);
-#if wxCHECK_VERSION(2, 8, 8)
+#ifdef __WXDEBUG__
 	ASSERT_RAISES(CAssertFailureException, test.Set32BitChunk(4, 0));
 	ASSERT_EQUALS(CUInt128((uint8_t *)&TestData::sequence), test);
 #endif
+
+	CAssertOff null;
+	test.Set32BitChunk(4, 0);
+	ASSERT_EQUALS(CUInt128((uint8_t *)&TestData::sequence), test);
 }
 
 TEST_M(CUInt128, SetValueCUInt128, wxT("SetValue(const CUInt128&)"))
@@ -232,23 +235,12 @@
 	ASSERT_EQUALS(a, b);
 }
 
-TEST(CUInt128, SetValueRandom)
-{
-	CUInt128 a;
-	CUInt128 b;
-
-	a.SetValueRandom();
-	b.SetValueRandom();
-	ASSERT_FALSE(a == b);
-}
-
 TEST(CUInt128, SetValueBE)
 {
-	CUInt128 a;
+	CUInt128 a((uint8_t *)&TestData::sequence);
 	CUInt128 b;
 	uint8_t buffer[16];
 
-	a.SetValueRandom();
 	a.ToByteArray((uint8_t *)&buffer);
 	b.SetValueBE((uint8_t *)&buffer);
 	ASSERT_EQUALS(a, b);
@@ -521,6 +513,9 @@
 	test <<= 127;
 	ASSERT_TRUE(test.GetBitNumber(0) == 1);
 	ASSERT_TRUE(test.GetBitNumber(127) == 0);
+
+	CUInt128 test2(true);
+	ASSERT_EQUALS(0u, test2.GetBitNumber(128));
 }
 
 TEST(CUInt128, SetBitNumber)
@@ -535,9 +530,14 @@
 	ASSERT_EQUALS(2, test);
 	test.SetBitNumber(0, 1);
 	ASSERT_EQUALS(0x80000000u, test.Get32BitChunk(0));
-#if wxCHECK_VERSION(2, 8, 8)
+#ifdef __WXDEBUG__
 	ASSERT_RAISES(CAssertFailureException, test.SetBitNumber(128, 0));
 #endif
+
+	CAssertOff null;
+	test.SetValueBE((uint8_t *)&TestData::sequence);
+	test.SetBitNumber(128, 1);
+	ASSERT_EQUALS(CUInt128((uint8_t *)&TestData::sequence), test);
 }
 
 TEST_M(CUInt128, OperatorNotEqualCUInt128, wxT("operator!=(const CUInt128&)"))
@@ -713,8 +713,7 @@
 
 TEST_M(CUInt128, OperatorAddCUInt128, wxT("operator+(const CUInt128&)"))
 {
-	CUInt128 a;
-	a.SetValueRandom();
+	CUInt128 a((uint8_t *)&TestData::sequence);
 
 	CUInt128 ref(a);
 	CUInt128 check(a);
@@ -734,10 +733,8 @@
 
 TEST_M(CUInt128, OperatorSubtractCUInt128, wxT("operator-(const CUInt128&)"))
 {
-	CUInt128 a;
-	CUInt128 b;
-	a.SetValueRandom();
-	b.SetValueRandom();
+	CUInt128 a((uint8_t *)&TestData::randomValue);
+	CUInt128 b((uint8_t *)&TestData::sequence);
 
 	CUInt128 refa(a);
 	CUInt128 refb(b);
@@ -757,10 +754,8 @@
 
 TEST_M(CUInt128, OperatorXorCUInt128, wxT("operator^(const CUInt128&)"))
 {
-	CUInt128 a;
-	CUInt128 b;
-	a.SetValueRandom();
-	b.SetValueRandom();
+	CUInt128 a((uint8_t *)&TestData::randomValue);
+	CUInt128 b((uint8_t *)&TestData::sequence);
 
 	CUInt128 refa(a);
 	CUInt128 refb(b);
@@ -776,8 +771,7 @@
 
 TEST_M(CUInt128, OperatorAddUint32, wxT("operator+(uint32_t)"))
 {
-	CUInt128 a;
-	a.SetValueRandom();
+	CUInt128 a((uint8_t *)&TestData::randomValue);
 	uint32_t b = a.Get32BitChunk(0);
 
 	CUInt128 ref(a);
@@ -799,8 +793,7 @@
 
 TEST_M(CUInt128, OperatorSubtractUint32, wxT("operator-(uint32_t)"))
 {
-	CUInt128 a;
-	a.SetValueRandom();
+	CUInt128 a((uint8_t *)&TestData::randomValue);
 	uint32_t b = a.Get32BitChunk(0);
 
 	CUInt128 ref(a);
@@ -819,8 +812,7 @@
 
 TEST_M(CUInt128, OperatorXorUint32, wxT("operator^(uint32_t)"))
 {
-	CUInt128 a;
-	a.SetValueRandom();
+	CUInt128 a((uint8_t *)&TestData::randomValue);
 	uint32_t b = a.Get32BitChunk(0);
 
 	CUInt128 ref(a);
@@ -835,8 +827,7 @@
 
 TEST_M(CUInt128, OperatorAddUint32CUInt128, wxT("operator+(uint32_t, const CUInt128&)"))
 {
-	CUInt128 a;
-	a.SetValueRandom();
+	CUInt128 a((uint8_t *)&TestData::randomValue);
 	uint32_t b = a.Get32BitChunk(0);
 
 	CUInt128 ref(a);
@@ -858,8 +849,7 @@
 
 TEST_M(CUInt128, OperatorSubtractUint32CUInt128, wxT("operator-(uint32_t, const CUInt128&)"))
 {
-	CUInt128 a;
-	a.SetValueRandom();
+	CUInt128 a((uint8_t *)&TestData::randomValue);
 	uint32_t b = a.Get32BitChunk(0);
 
 	CUInt128 ref(a);
@@ -873,8 +863,7 @@
 
 TEST_M(CUInt128, OperatorXorUint32CUInt128, wxT("operator^(uint32_t, const CUInt128&)"))
 {
-	CUInt128 a;
-	a.SetValueRandom();
+	CUInt128 a((uint8_t *)&TestData::randomValue);
 	uint32_t b = a.Get32BitChunk(0);
 
 	CUInt128 ref(a);

aMule-2.2.6.tar.bz2/unittests/tests/FileDataIOTest.cpp -> aMule-2.3.1.tar.bz2/unittests/tests/FileDataIOTest.cpp Changed

aMule-2.2.6.tar.bz2/unittests/tests/FormatTest.cpp -> aMule-2.3.1.tar.bz2/unittests/tests/FormatTest.cpp Changed

@@ -1,6 +1,6 @@
 #include <muleunit/test.h>
 #include <common/Format.h>
-#include <limits.h>
+#include <limits>
 
 #include <Types.h>
 
@@ -8,13 +8,12 @@
 
 // Note: These tests have been written in accordance with the 
 //       capabilities of printf found in printf(3).
+// Note to the above: Except where otherwise stated.
 
 #define ELEMENTS(x) (sizeof(x)/sizeof(x[0]))
 #define MIN(x) std::numeric_limits<x>::min()
 #define MAX(x) std::numeric_limits<x>::max()
 
-// Needs reentrant wxOnAssert, which is missing in pre-2.8.8.
-#if wxCHECK_VERSION(2, 8, 8)
 
 DECLARE(Format)
 	// Less is valid for the string type, so we need a cut
@@ -22,20 +21,20 @@
 	void testFormat(const wxString& str, const wxChar* value) {
 		for (int p = -1; p < 5; ++p) {
 			wxString format;
-				
+
 			format += wxT("%");
-			
+
 			if (p == -1) {
 				format += wxT(".");
 			} else {
 				format += wxString::Format(wxT(".%d"), p);
 			}
-				
+
 			format += str;
 
 			wxString reference = wxString::Format(format, value);
 			wxString actual = CFormat(format) % value;
-		
+
 			ASSERT_EQUALS_M(reference, actual, format + wxT(": '") + reference + wxT("' != '") + actual + wxT("'"));
 		}
 	}
@@ -47,31 +46,24 @@
 	{
 		// Null should be valid
 		CFormat fmt1(NULL);
-		ASSERT_TRUE(fmt1.IsReady());
 		ASSERT_EQUALS(wxT(""), fmt1.GetString());
 	}
 
 	{
 		// Empty string should be valid
 		CFormat fmt2(wxT(""));
-		ASSERT_TRUE(fmt2.IsReady());
 		ASSERT_EQUALS(wxT(""), fmt2.GetString());
 	}
 
 	{
 		// Simple string with no format fields
 		CFormat fmt3(wxT("a b c"));
-		ASSERT_TRUE(fmt3.IsReady());
 		ASSERT_EQUALS(wxT("a b c"), fmt3.GetString());
 	}
 
 	{
 		// Simple string with one format field
 		CFormat fmt4(wxT("a %i c"));
-		ASSERT_FALSE(fmt4.IsReady());
-		ASSERT_RAISES(CAssertFailureException, fmt4.GetString());
-
-		CAssertOff null;
 		ASSERT_EQUALS(wxT("a %i c"), fmt4.GetString());
 	}
 }
@@ -80,25 +72,18 @@
 TEST(Format, SetStringAndGetString)
 {
 	CFormat format(NULL);
-	ASSERT_TRUE(format.IsReady());
 	ASSERT_EQUALS(wxT(""), format.GetString());
 
 	// Empty string should be valid
 	format = CFormat(wxT(""));
-	ASSERT_TRUE(format.IsReady());
 	ASSERT_EQUALS(wxT(""), format.GetString());
 
 	// Simple string with no format fields
 	format = CFormat(wxT("a b c"));
-	ASSERT_TRUE(format.IsReady());
 	ASSERT_EQUALS(wxT("a b c"), format.GetString());
 
 	// Simple string with one format field
 	format = CFormat(wxT("a %i c"));
-	ASSERT_FALSE(format.IsReady());
-	ASSERT_RAISES(CAssertFailureException, format.GetString());
-
-	CAssertOff null;
 	ASSERT_EQUALS(wxT("a %i c"), format.GetString());
 }
 
@@ -112,18 +97,22 @@
  		ASSERT_EQUALS_M(reference, actual, wxString(wxT("%")) << wxformat \
 				<< wxT(" vs. %") << cformat << wxT(": '") + reference + wxT("' != '") + actual + wxT("'")); \
 	}
-	
 
 
-//! Test the two boundries and a middle value of the specificed format
+
+//! Test the two boundaries and a middle value of the specificed format
 #define STANDARD_TYPE_TESTS(cformat, wxformat, type) \
 	STANDARD_TEST(cformat, wxformat, MIN(type)); \
 	STANDARD_TEST(cformat, wxformat, (type)(MAX(type) / 2)); \
 	STANDARD_TEST(cformat, wxformat, MAX(type)); \
 
+// In wx >= 2.9 wxChar represents a Unicode code point, thus its maximum value
+// is 1114111 (0x10ffff).
 TEST(Format, InjectwxChar)
 {
-	STANDARD_TYPE_TESTS(wxT("c"), wxT("c"), wxChar);
+	STANDARD_TEST(wxT("c"), wxT("c"), MIN(wxChar));
+	STANDARD_TEST(wxT("c"), wxT("c"), (wxChar)(std::min<wxChar>(MAX(wxChar), 0x10ffff) / 2));
+	STANDARD_TEST(wxT("c"), wxT("c"), (std::min<wxChar>(MAX(wxChar), 0x10ffff)));
 }
 
 
@@ -160,37 +149,37 @@
 TEST(Format, InjectInteger)
 {
 	const wxChar** sint_entry = sint_types;
-	
+
 	while (*sint_entry) {
 		const wxChar** len_entry = int_lengths;
-		
+
 		while (*len_entry) {
 			wxString entry = wxString() << *len_entry << *sint_entry;
-			
+
 			STANDARD_TYPE_TESTS(entry, wxString() << wxT("h") << *sint_entry,	signed short);
 			STANDARD_TYPE_TESTS(entry, wxString() << wxT("") << *sint_entry,	signed int);
 			STANDARD_TYPE_TESTS(entry, wxString() << wxT("l") << *sint_entry,	signed long);
-			STANDARD_TYPE_TESTS(entry, wxString() << wxLongLongFmtSpec << *sint_entry,	signed long long);
-			
+			STANDARD_TYPE_TESTS(entry, wxString() << WXLONGLONGFMTSPEC << *sint_entry,	signed long long);
+
 			++len_entry;
 		}
 
 		++sint_entry;
 	}
 
-	
+
 	const wxChar** uint_entry = uint_types;
 	while (*uint_entry) {
 		const wxChar** len_entry = int_lengths;
 
 		while (*len_entry) {
 			wxString entry = wxString() << *len_entry << *uint_entry;
-			
+
 			STANDARD_TYPE_TESTS(entry, wxString() << wxT("h") << *uint_entry,	unsigned short);
 			STANDARD_TYPE_TESTS(entry, wxString() << wxT("") << *uint_entry,	unsigned int);
 			STANDARD_TYPE_TESTS(entry, wxString() << wxT("l") << *uint_entry,	unsigned long);
-			STANDARD_TYPE_TESTS(entry, wxString() << wxLongLongFmtSpec << *uint_entry,	unsigned long long);
-			
+			STANDARD_TYPE_TESTS(entry, wxString() << WXLONGLONGFMTSPEC << *uint_entry,	unsigned long long);
+
 			++len_entry;
 		}
 
@@ -207,7 +196,7 @@
 	STANDARD_TYPE_TESTS(wxT("F"), wxT("F"), float);
 	STANDARD_TYPE_TESTS(wxT("g"), wxT("g"), float);
 	STANDARD_TYPE_TESTS(wxT("G"), wxT("G"), float);
-	
+
 	STANDARD_TYPE_TESTS(wxT("e"), wxT("e"), double);
 	STANDARD_TYPE_TESTS(wxT("E"), wxT("E"), double);
 	STANDARD_TYPE_TESTS(wxT("f"), wxT("f"), double);
@@ -228,17 +217,17 @@
 {
 	for (int p = -1; p < 5; ++p) {
 		wxString format = wxT("%");
-			
+
 		if (p == -1) {
 			format += wxT(".");
 		} else {
 			format += wxString::Format(wxT(".%d"), p);
 		}
-				
+
 		format += wxT("s");
-		
+
 		wxString actual = CFormat(format) % (const wxChar*)NULL;
-		
+
 		ASSERT_TRUE_M(actual.IsEmpty(), wxT("Expected empty string, got '") + actual + wxT("'"));
 	}
 }
@@ -249,22 +238,17 @@
 	{
 		CFormat fmt1(wxT("%d _ %u _ %i"));
 		fmt1 % -1 % 2u % -4;
-		ASSERT_TRUE(fmt1.IsReady());
 		ASSERT_EQUALS(wxT("-1 _ 2 _ -4"), fmt1.GetString());
 	}
-		
+
 	{	
 		CFormat fmt2(wxT("%d _ %u _ %i"));
-		ASSERT_FALSE(fmt2.IsReady());
 		fmt2 % -1;
-		ASSERT_FALSE(fmt2.IsReady());
 		fmt2 %  2u;
-		ASSERT_FALSE(fmt2.IsReady());
 		fmt2 % -4;
-		ASSERT_TRUE(fmt2.IsReady());
 		ASSERT_EQUALS(wxT("-1 _ 2 _ -4"), fmt2.GetString());
 	}
-	
+
 	{
 		// Test grouped fields
 		CFormat fmt3(wxT("%d%u%i"));
@@ -285,11 +269,10 @@
 		CFormat fmt2(wxT("-- %% --"));
 		ASSERT_EQUALS(wxT("-- % --"), fmt2.GetString());
 	}
-	
+
 	{
 		CFormat fmt3(wxT("%d _ %% _ %i"));
 		fmt3 % 1 % 2;
-		ASSERT_TRUE(fmt3.IsReady());
 		ASSERT_EQUALS(wxT("1 _ % _ 2"), fmt3.GetString());
 	}
 
@@ -305,91 +288,72 @@
 
 TEST(Format, MalformedFields)
 {
+#ifdef __WXDEBUG__
 	{
 		// Incomplete format string
 		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%")));
 		ASSERT_RAISES(CAssertFailureException, CFormat(wxT(" -- %")));
 
 		// Non-existing type
-		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%q")) % 1);
-		ASSERT_RAISES(CAssertFailureException, CFormat(wxT(" -- %q")) % 1.0f );
-		ASSERT_RAISES(CAssertFailureException, CFormat(wxT(" -- %q -- ")) % wxT("1"));
+		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%q")));
+		ASSERT_RAISES(CAssertFailureException, CFormat(wxT(" -- %q")));
+		ASSERT_RAISES(CAssertFailureException, CFormat(wxT(" -- %q -- ")));
 
-		// Invalid string length
-		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%.qs")) % wxT(""));
-		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%.-10s")) % wxT(""));
+		// Partially valid format strings
+		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%i%q")));
+		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%q%i")));
 	}
+#endif
 
 	{
 		CAssertOff null;
-		
+
 		ASSERT_EQUALS(wxT("%"), CFormat(wxT("%")));
 		ASSERT_EQUALS(wxT(" -- %"), CFormat(wxT(" -- %")));
 
 		// Non-existing type
 		ASSERT_EQUALS(wxT("%q"), CFormat(wxT("%q")) % 1);
-		ASSERT_EQUALS(wxT(" -- %q"), CFormat(wxT(" -- %q")) % 1.0f );
+		ASSERT_EQUALS(wxT(" -- %q"), CFormat(wxT(" -- %q")) % 1.0f);
 		ASSERT_EQUALS(wxT(" -- %q -- "), CFormat(wxT(" -- %q -- ")) % wxT("1"));
 
-		// Invalid string length
-		ASSERT_EQUALS(wxT("%.qs"), CFormat(wxT("%.qs")) % wxT(""));
-		ASSERT_EQUALS(wxT("%.-10s"), CFormat(wxT("%.-10s")) % wxT(""));
+		// Partially valid format strings
+		ASSERT_EQUALS(wxT("1%q"), CFormat(wxT("%i%q")) % 1);
+		ASSERT_EQUALS(wxT("%q1"), CFormat(wxT("%q%i")) % 1);
 
 		// Wrong and right arguments 
-		ASSERT_EQUALS(wxT("%s -- 17"), CFormat(wxT("%s -- %i")) % 1 % 17);
-	}	
+		ASSERT_EQUALS(wxT("%i -- 17"), CFormat(wxT("%i -- %i")) % 1.0 % 17);
+	}
 }
 
 
 TEST(Format, NotReady)
 {
 	CFormat fmt(wxT("-- %s - %d"));
-	ASSERT_FALSE(fmt.IsReady());
-	ASSERT_RAISES(CAssertFailureException, fmt.GetString());
-
-	{
-		CAssertOff null;
-		ASSERT_EQUALS(wxT("-- %s - %d"), fmt);
-	}
+	ASSERT_EQUALS(wxT("-- %s - %d"), fmt.GetString());
 
 	fmt % wxT("foo");
-
-	ASSERT_FALSE(fmt.IsReady());
-	ASSERT_RAISES(CAssertFailureException, fmt.GetString());
-
-	{
-		CAssertOff null;
-		ASSERT_EQUALS(wxT("-- foo - %d"), fmt);
-	}
+	ASSERT_EQUALS(wxT("-- foo - %d"), fmt.GetString());
 
 	fmt % 42;
-
-	ASSERT_TRUE(fmt.IsReady());
 	ASSERT_EQUALS(wxT("-- foo - 42"), fmt.GetString());
 }
 
 
 TEST(Format, WrongTypes)
 {
+#ifdef __WXDEBUG__
 	{
-		// Entirely wrong types:
-		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%s")) % 1);
-		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%s")) % 1.0f);
-		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%s")) % wxT('1'));
-		
-		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%f")) % 1);
-		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%f")) % wxT('1'));
+		// Entirely wrong types
+		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%c")) % wxT("1"));
 		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%f")) % wxT("1"));
-
 		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%d")) % 1.0f);
 		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%d")) % wxT("1"));
 	}
+#endif
 
 	{
 		CAssertOff null;
 
-		ASSERT_EQUALS(wxT("-- %s -- 42 --"), CFormat(wxT("-- %s -- %u --")) % 1 % 42);
-		ASSERT_EQUALS(wxT("-- %f -- 42 --"), CFormat(wxT("-- %f -- %u --")) % 1 % 42);
 		ASSERT_EQUALS(wxT("-- %d -- 42 --"), CFormat(wxT("-- %d -- %u --")) % 1.0f % 42);
 	}
 }
@@ -397,19 +361,19 @@
 
 TEST(Format, NotSupported)
 {
+#ifdef __WXDEBUG__
 	{
 		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%*d")) % 1);
 		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%*s")) % wxT(""));
-		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%p")) % wxT(""));
 		ASSERT_RAISES(CAssertFailureException, CFormat(wxT("%n")) % wxT(""));
 	}
+#endif
 
 	{		
 		CAssertOff null;
 
 		ASSERT_EQUALS(wxT("%*d"), CFormat(wxT("%*d")) % 1);
 		ASSERT_EQUALS(wxT("%*s"), CFormat(wxT("%*s")) % wxT(""));
-		ASSERT_EQUALS(wxT("%p"), CFormat(wxT("%p")) % wxT(""));
 		ASSERT_EQUALS(wxT("%n"), CFormat(wxT("%n")) % wxT(""));
 	}
 }
@@ -418,21 +382,16 @@
 TEST(Format, Overfeeding)
 {
 	CFormat fmt(wxT("%d - %d"));
-	ASSERT_FALSE(fmt.IsReady());
 	fmt % 1 % 2;
-	ASSERT_TRUE(fmt.IsReady());
 	ASSERT_EQUALS(wxT("1 - 2"), fmt.GetString());
-		
-	ASSERT_RAISES(CAssertFailureException, fmt % 1);
-	ASSERT_TRUE(fmt.IsReady());
+
+	fmt % 1;
 	ASSERT_EQUALS(wxT("1 - 2"), fmt.GetString());
 
-	ASSERT_RAISES(CAssertFailureException, fmt % 1.0f);
-	ASSERT_TRUE(fmt.IsReady());
+	fmt % 1.0;
 	ASSERT_EQUALS(wxT("1 - 2"), fmt.GetString());
 
-	ASSERT_RAISES(CAssertFailureException, fmt % wxT("1"));
-	ASSERT_TRUE(fmt.IsReady());
+	fmt % wxT("x");
 	ASSERT_EQUALS(wxT("1 - 2"), fmt.GetString());
 }
 
@@ -453,15 +412,14 @@
 }
 
 
-class CTestPrintable : public CPrintable
+class CTestPrintable
 {
 public:
 	CTestPrintable(int value)
 		: m_value(value)
-	{
-	}
+	{}
 
-	virtual wxString GetPrintableString() const
+	wxString GetPrintableString() const
 	{
 		return wxString::Format(wxT("%i"), m_value);
 	}
@@ -470,7 +428,13 @@
 	int m_value;
 };
 
-TEST(Format, Printable)
+template<>
+inline CFormat& CFormat::operator%(CTestPrintable value)
+{
+	return this->operator%<const wxString&>(value.GetPrintableString());
+}
+
+TEST(Format, UserDefined)
 {
 	{
 		CFormat fmt(wxT("%s"));
@@ -485,4 +449,59 @@
 	}
 }
 
-#endif
+TEST(Format, ReorderedArguments)
+{
+	// Swapping two arguments of the same type
+	{
+		CFormat fmt(wxT("%2$i,%1$i"));
+		fmt % 1 % 2;
+		ASSERT_EQUALS(wxT("2,1"), fmt.GetString());
+	}
+
+	// Swapping arguments of different type
+	{
+		CFormat fmt(wxT("%2$i,%1$c"));
+		fmt % wxT('a') % 2;
+		ASSERT_EQUALS(wxT("2,a"), fmt.GetString());
+	}
+
+	// Using the same argument multiple times
+	{
+		CFormat fmt(wxT("%1$i,%1$i"));
+		fmt % 3;
+		ASSERT_EQUALS(wxT("3,3"), fmt.GetString());
+	}
+
+	// Leaving gaps (printf doesn't allow this!)
+	{
+		CFormat fmt(wxT("%1$i,%3$i"));
+		fmt % 1 % 2 % 3;
+		ASSERT_EQUALS(wxT("1,3"), fmt.GetString());
+	}
+
+	// Mixing positional and indexed arguments (printf doesn't allow this!)
+	{
+		CFormat fmt(wxT("%3$i,%i,%1$i"));
+		fmt % 1 % 2 % 3;
+		ASSERT_EQUALS(wxT("3,2,1"), fmt.GetString());
+	}
+}
+
+// Tests for non-standard functionality.
+// These are extensions to the standard printf functionality.
+TEST(Format, DifferentArguments)
+{
+	// Tests for default conversion with the 's' conversion type
+	ASSERT_EQUALS(wxT("a"), CFormat(wxT("%s")) % wxT('a'));
+	ASSERT_EQUALS(wxT("1"), CFormat(wxT("%s")) % 1u);
+	ASSERT_EQUALS(wxT("-1"), CFormat(wxT("%s")) % -1);
+	ASSERT_EQUALS(wxString::Format(wxT("%g"), 1.2), CFormat(wxT("%s")) % 1.2);
+
+	// Test for changing the conversion type based on the argument type
+	ASSERT_EQUALS(wxT("-1"), CFormat(wxT("%u")) % -1);
+
+	// Tests for accepting mismatching argument type
+	ASSERT_EQUALS(wxT("C"), CFormat(wxT("%c")) % 67);
+	ASSERT_EQUALS(wxT("69"), CFormat(wxT("%i")) % wxT('E'));
+	ASSERT_EQUALS(wxT("1e+00"), CFormat(wxT("%.e")) % 1u);
+}

aMule-2.2.6.tar.bz2/unittests/tests/Makefile.am -> aMule-2.3.1.tar.bz2/unittests/tests/Makefile.am Changed

@@ -11,21 +11,18 @@
 LDADD = $(WXBASE_LIBS) ../muleunit/libmuleunit.a
 
 MAINTAINERCLEANFILES = Makefile.in
-TESTS = CUInt128Test RangeMapTest FormatTest StringFunctionsTest NetworkFunctionsTest FileDataIOTest PathTest TextFileTest
+TESTS = CUInt128Test RangeMapTest FormatTest StringFunctionsTest NetworkFunctionsTest FileDataIOTest PathTest TextFileTest CTagTest
 check_PROGRAMS = $(TESTS)
 
 
 # Tests for the CUInt128 class
-CUInt128Test_SOURCES = CUInt128Test.cpp $(top_srcdir)/src/kademlia/utils/UInt128.cpp
-CUInt128Test_CPPFLAGS = $(AM_CPPFLAGS) $(CRYPTOPP_CPPFLAGS)
-CUInt128Test_LDFLAGS = $(AM_LDFLAGS) $(CRYPTOPP_LDFLAGS)
-CUInt128Test_LDADD = $(LDADD) $(CRYPTOPP_LIBS)
+CUInt128Test_SOURCES = CUInt128Test.cpp $(top_srcdir)/src/kademlia/utils/UInt128.cpp $(top_srcdir)/src/libs/common/Format.cpp $(top_srcdir)/src/libs/common/strerror_r.c
 
 # Tests for the CRangeMap class
 RangeMapTest_SOURCES = RangeMapTest.cpp
 
 # Tests for the CFormat class
-FormatTest_SOURCES = FormatTest.cpp $(top_srcdir)/src/libs/common/Format.cpp
+FormatTest_SOURCES = FormatTest.cpp $(top_srcdir)/src/libs/common/Format.cpp $(top_srcdir)/src/libs/common/strerror_r.c
 
 # Tests for the various string functions.
 StringFunctionsTest_SOURCES = StringFunctionsTest.cpp $(top_srcdir)/src/libs/common/StringFunctions.cpp $(top_srcdir)/src/libs/common/Path.cpp
@@ -38,20 +35,15 @@
 NetworkFunctionsTest_CPPFLAGS = $(AM_CPPFLAGS) -DEC_REMOTE # Needed to avoid compiling the http-thread
 
 # 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
-FileDataIOTest_CPPFLAGS = $(AM_CPPFLAGS) $(CRYPTOPP_CPPFLAGS)
-FileDataIOTest_LDFLAGS = $(AM_LDFLAGS) $(CRYPTOPP_LDFLAGS)
-FileDataIOTest_LDADD = $(LDADD) $(CRYPTOPP_LIBS)
+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
 
 # Tests for the CPath class
 PathTest_SOURCES = PathTest.cpp $(top_srcdir)/src/libs/common/Path.cpp $(top_srcdir)/src/libs/common/StringFunctions.cpp
-PathTest_CPPFLAGS = $(AM_CPPFLAGS) $(CRYPTOPP_CPPFLAGS)
-PathTest_LDFLAGS = $(AM_LDFLAGS) $(CRYPTOPP_LDFLAGS)
-PathTest_LDADD = $(LDADD) $(CRYPTOPP_LIBS)
 
 # Tests for the CTextFile class
 TextFileTest_SOURCES = TextFileTest.cpp $(top_srcdir)/src/libs/common/Path.cpp $(top_srcdir)/src/libs/common/StringFunctions.cpp $(top_srcdir)/src/libs/common/TextFile.cpp
-TextFileTest_CPPFLAGS = $(AM_CPPFLAGS) $(CRYPTOPP_CPPFLAGS) -DSRCDIR="$(srcdir)"
-TextFileTest_LDFLAGS = $(AM_LDFLAGS) $(CRYPTOPP_LDFLAGS)
-TextFileTest_LDADD = $(LDADD) $(CRYPTOPP_LIBS)
+TextFileTest_CPPFLAGS = $(AM_CPPFLAGS) -DSRCDIR="$(srcdir)" 
 EXTRA_DIST += TextFileTest_dos.txt TextFileTest_unix.txt
+
+# Tests for the CTag class
+CTagTest_SOURCES = CTagTest.cpp  $(top_srcdir)/src/SafeFile.cpp  $(top_srcdir)/src/MemFile.cpp $(top_srcdir)/src/Tag.cpp $(top_srcdir)/src/libs/common/Format.cpp $(top_srcdir)/src/libs/common/strerror_r.c

aMule-2.2.6.tar.bz2/unittests/tests/Makefile.in -> aMule-2.3.1.tar.bz2/unittests/tests/Makefile.in Changed

@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,15 +14,12 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ../..
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -35,6 +33,10 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+TESTS = CUInt128Test$(EXEEXT) RangeMapTest$(EXEEXT) \
+	FormatTest$(EXEEXT) StringFunctionsTest$(EXEEXT) \
+	NetworkFunctionsTest$(EXEEXT) FileDataIOTest$(EXEEXT) \
+	PathTest$(EXEEXT) TextFileTest$(EXEEXT) CTagTest$(EXEEXT)
 check_PROGRAMS = $(am__EXEEXT_1)
 subdir = unittests/tests
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -46,11 +48,13 @@
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/iconv.m4 \
 	$(top_srcdir)/m4/intdiv0.m4 $(top_srcdir)/m4/inttypes-pri.m4 \
 	$(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \
+	$(top_srcdir)/m4/isc-posix.m4 $(top_srcdir)/m4/kde.m4 \
 	$(top_srcdir)/m4/lcmessage.m4 $(top_srcdir)/m4/lib-ld.m4 \
 	$(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \
 	$(top_srcdir)/m4/libpng.m4 $(top_srcdir)/m4/libupnp.m4 \
 	$(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/readline.m4 \
+	$(top_srcdir)/m4/plasmamule.m4 $(top_srcdir)/m4/progtest.m4 \
+	$(top_srcdir)/m4/qt.m4 $(top_srcdir)/m4/readline.m4 \
 	$(top_srcdir)/m4/stdint_h.m4 $(top_srcdir)/m4/uintmax_t.m4 \
 	$(top_srcdir)/m4/ulonglong.m4 $(top_srcdir)/m4/wxwin.m4 \
 	$(top_srcdir)/m4/zlib.m4 $(top_srcdir)/acinclude.m4 \
@@ -60,28 +64,35 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__EXEEXT_1 = CUInt128Test$(EXEEXT) RangeMapTest$(EXEEXT) \
 	FormatTest$(EXEEXT) StringFunctionsTest$(EXEEXT) \
 	NetworkFunctionsTest$(EXEEXT) FileDataIOTest$(EXEEXT) \
-	PathTest$(EXEEXT) TextFileTest$(EXEEXT)
-am_CUInt128Test_OBJECTS = CUInt128Test-CUInt128Test.$(OBJEXT) \
-	CUInt128Test-UInt128.$(OBJEXT)
-CUInt128Test_OBJECTS = $(am_CUInt128Test_OBJECTS)
+	PathTest$(EXEEXT) TextFileTest$(EXEEXT) CTagTest$(EXEEXT)
+am_CTagTest_OBJECTS = CTagTest.$(OBJEXT) SafeFile.$(OBJEXT) \
+	MemFile.$(OBJEXT) Tag.$(OBJEXT) Format.$(OBJEXT) \
+	strerror_r.$(OBJEXT)
+CTagTest_OBJECTS = $(am_CTagTest_OBJECTS)
+CTagTest_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) ../muleunit/libmuleunit.a
-CUInt128Test_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1)
-am_FileDataIOTest_OBJECTS = FileDataIOTest-FileDataIOTest.$(OBJEXT) \
-	FileDataIOTest-SafeFile.$(OBJEXT) \
-	FileDataIOTest-CFile.$(OBJEXT) \
-	FileDataIOTest-MemFile.$(OBJEXT) \
-	FileDataIOTest-UInt128.$(OBJEXT) \
-	FileDataIOTest-StringFunctions.$(OBJEXT) \
-	FileDataIOTest-Tag.$(OBJEXT) FileDataIOTest-Path.$(OBJEXT)
+CTagTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	../muleunit/libmuleunit.a
+am_CUInt128Test_OBJECTS = CUInt128Test.$(OBJEXT) UInt128.$(OBJEXT) \
+	Format.$(OBJEXT) strerror_r.$(OBJEXT)
+CUInt128Test_OBJECTS = $(am_CUInt128Test_OBJECTS)
+CUInt128Test_LDADD = $(LDADD)
+CUInt128Test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	../muleunit/libmuleunit.a
+am_FileDataIOTest_OBJECTS = FileDataIOTest.$(OBJEXT) \
+	SafeFile.$(OBJEXT) CFile.$(OBJEXT) MemFile.$(OBJEXT) \
+	UInt128.$(OBJEXT) StringFunctions.$(OBJEXT) Tag.$(OBJEXT) \
+	Path.$(OBJEXT) Format.$(OBJEXT) strerror_r.$(OBJEXT)
 FileDataIOTest_OBJECTS = $(am_FileDataIOTest_OBJECTS)
-FileDataIOTest_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1)
-am_FormatTest_OBJECTS = FormatTest.$(OBJEXT) Format.$(OBJEXT)
+FileDataIOTest_LDADD = $(LDADD)
+FileDataIOTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	../muleunit/libmuleunit.a
+am_FormatTest_OBJECTS = FormatTest.$(OBJEXT) Format.$(OBJEXT) \
+	strerror_r.$(OBJEXT)
 FormatTest_OBJECTS = $(am_FormatTest_OBJECTS)
 FormatTest_LDADD = $(LDADD)
 FormatTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -93,10 +104,12 @@
 NetworkFunctionsTest_LDADD = $(LDADD)
 NetworkFunctionsTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../muleunit/libmuleunit.a
-am_PathTest_OBJECTS = PathTest-PathTest.$(OBJEXT) \
-	PathTest-Path.$(OBJEXT) PathTest-StringFunctions.$(OBJEXT)
+am_PathTest_OBJECTS = PathTest.$(OBJEXT) Path.$(OBJEXT) \
+	StringFunctions.$(OBJEXT)
 PathTest_OBJECTS = $(am_PathTest_OBJECTS)
-PathTest_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
+PathTest_LDADD = $(LDADD)
+PathTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	../muleunit/libmuleunit.a
 am_RangeMapTest_OBJECTS = RangeMapTest.$(OBJEXT)
 RangeMapTest_OBJECTS = $(am_RangeMapTest_OBJECTS)
 RangeMapTest_LDADD = $(LDADD)
@@ -113,46 +126,68 @@
 	TextFileTest-StringFunctions.$(OBJEXT) \
 	TextFileTest-TextFile.$(OBJEXT)
 TextFileTest_OBJECTS = $(am_TextFileTest_OBJECTS)
-TextFileTest_DEPENDENCIES = $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+TextFileTest_LDADD = $(LDADD)
+TextFileTest_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+	../muleunit/libmuleunit.a
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_$(V))
+am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+am__v_CXX_0 = @echo "  CXX   " $@;
 CXXLD = $(CXX)
 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 	-o $@
-SOURCES = $(CUInt128Test_SOURCES) $(FileDataIOTest_SOURCES) \
-	$(FormatTest_SOURCES) $(NetworkFunctionsTest_SOURCES) \
-	$(PathTest_SOURCES) $(RangeMapTest_SOURCES) \
-	$(StringFunctionsTest_SOURCES) $(TextFileTest_SOURCES)
-DIST_SOURCES = $(CUInt128Test_SOURCES) $(FileDataIOTest_SOURCES) \
-	$(FormatTest_SOURCES) $(NetworkFunctionsTest_SOURCES) \
-	$(PathTest_SOURCES) $(RangeMapTest_SOURCES) \
-	$(StringFunctionsTest_SOURCES) $(TextFileTest_SOURCES)
+AM_V_CXXLD = $(am__v_CXXLD_$(V))
+am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CXXLD_0 = @echo "  CXXLD " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
+SOURCES = $(CTagTest_SOURCES) $(CUInt128Test_SOURCES) \
+	$(FileDataIOTest_SOURCES) $(FormatTest_SOURCES) \
+	$(NetworkFunctionsTest_SOURCES) $(PathTest_SOURCES) \
+	$(RangeMapTest_SOURCES) $(StringFunctionsTest_SOURCES) \
+	$(TextFileTest_SOURCES)
+DIST_SOURCES = $(CTagTest_SOURCES) $(CUInt128Test_SOURCES) \
+	$(FileDataIOTest_SOURCES) $(FormatTest_SOURCES) \
+	$(NetworkFunctionsTest_SOURCES) $(PathTest_SOURCES) \
+	$(RangeMapTest_SOURCES) $(StringFunctionsTest_SOURCES) \
+	$(TextFileTest_SOURCES)
 ETAGS = etags
 CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALCC_FALSE = @ALCC_FALSE@
 ALCC_MANPAGES = @ALCC_MANPAGES@
-ALCC_TRUE = @ALCC_TRUE@
-ALC_FALSE = @ALC_FALSE@
 ALC_MANPAGES = @ALC_MANPAGES@
-ALC_TRUE = @ALC_TRUE@
 ALLOCA = @ALLOCA@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AMULECMD_MANPAGES = @AMULECMD_MANPAGES@
 AMULEWEB_DEFS = @AMULEWEB_DEFS@
-AMULE_DAEMON_FALSE = @AMULE_DAEMON_FALSE@
 AMULE_DAEMON_MANPAGES = @AMULE_DAEMON_MANPAGES@
-AMULE_DAEMON_TRUE = @AMULE_DAEMON_TRUE@
-AMULE_GUI_FALSE = @AMULE_GUI_FALSE@
 AMULE_GUI_MANPAGES = @AMULE_GUI_MANPAGES@
-AMULE_GUI_TRUE = @AMULE_GUI_TRUE@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -167,17 +202,11 @@
 BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 CAS_DEFS = @CAS_DEFS@
-CAS_FALSE = @CAS_FALSE@
 CAS_MANPAGES = @CAS_MANPAGES@
-CAS_TRUE = @CAS_TRUE@
 CATOBJEXT = @CATOBJEXT@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-COMPILE_CMD_FALSE = @COMPILE_CMD_FALSE@
-COMPILE_CMD_TRUE = @COMPILE_CMD_TRUE@
-COMPILE_NLS_FALSE = @COMPILE_NLS_FALSE@
-COMPILE_NLS_TRUE = @COMPILE_NLS_TRUE@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CRYPTOPP_CPPFLAGS = @CRYPTOPP_CPPFLAGS@
@@ -189,44 +218,44 @@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DEBUGFLAG = @DEBUGFLAG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
-ED2K_FALSE = @ED2K_FALSE@
 ED2K_MANPAGES = @ED2K_MANPAGES@
-ED2K_TRUE = @ED2K_TRUE@
 EGREP = @EGREP@
-ENABLE_IP2COUNTRY_FALSE = @ENABLE_IP2COUNTRY_FALSE@
-ENABLE_IP2COUNTRY_TRUE = @ENABLE_IP2COUNTRY_TRUE@
-ENABLE_UPNP_FALSE = @ENABLE_UPNP_FALSE@
-ENABLE_UPNP_TRUE = @ENABLE_UPNP_TRUE@
 EXEEXT = @EXEEXT@
 GDLIB_CFLAGS = @GDLIB_CFLAGS@
 GDLIB_CONFIG_PATH = @GDLIB_CONFIG_PATH@
 GDLIB_LDFLAGS = @GDLIB_LDFLAGS@
 GDLIB_LIBS = @GDLIB_LIBS@
 GENCAT = @GENCAT@
-GENERATE_FLEX_HEADER_FALSE = @GENERATE_FLEX_HEADER_FALSE@
-GENERATE_FLEX_HEADER_TRUE = @GENERATE_FLEX_HEADER_TRUE@
 GEOIP_CPPFLAGS = @GEOIP_CPPFLAGS@
 GEOIP_LDFLAGS = @GEOIP_LDFLAGS@
 GEOIP_LIBS = @GEOIP_LIBS@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
+GREP = @GREP@
 INCINTL = @INCINTL@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_SKINS_FALSE = @INSTALL_SKINS_FALSE@
-INSTALL_SKINS_TRUE = @INSTALL_SKINS_TRUE@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTOBJEXT = @INSTOBJEXT@
 INTLBISON = @INTLBISON@
 INTLLIBS = @INTLLIBS@
 INTLOBJS = @INTLOBJS@
 INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
+KDE4_CONFIG = @KDE4_CONFIG@
+KDE_APPLNK_PATH = @KDE_APPLNK_PATH@
+KDE_HEADER_DIR = @KDE_HEADER_DIR@
+KDE_ICON_PATH = @KDE_ICON_PATH@
+KDE_MIME_PATH = @KDE_MIME_PATH@
+KDE_MODULE_PATH = @KDE_MODULE_PATH@
+KDE_SERVICE_PATH = @KDE_SERVICE_PATH@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LEX = @LEX@
@@ -248,13 +277,10 @@
 LTLIBINTL = @LTLIBINTL@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
-MONOLITHIC_FALSE = @MONOLITHIC_FALSE@
 MONOLITHIC_MANPAGES = @MONOLITHIC_MANPAGES@
-MONOLITHIC_TRUE = @MONOLITHIC_TRUE@
 MSGFMT = @MSGFMT@
 MSGMERGE = @MSGMERGE@
 MULECFLAGS = @MULECFLAGS@
@@ -262,44 +288,40 @@
 MULECXXFLAGS = @MULECXXFLAGS@
 MULELDFLAGS = @MULELDFLAGS@
 MULERCFLAGS = @MULERCFLAGS@
-NEED_CORESERVICES_FALSE = @NEED_CORESERVICES_FALSE@
-NEED_CORESERVICES_TRUE = @NEED_CORESERVICES_TRUE@
-NEED_RC_FALSE = @NEED_RC_FALSE@
-NEED_RC_TRUE = @NEED_RC_TRUE@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
 POSUB = @POSUB@
 POW_LIB = @POW_LIB@
+QT_CORE_CXXFLAGS = @QT_CORE_CXXFLAGS@
+QT_CORE_LIBS = @QT_CORE_LIBS@
+QT_DBUS_LDFLAGS = @QT_DBUS_LDFLAGS@
+QT_GUI_CXXFLAGS = @QT_GUI_CXXFLAGS@
+QT_GUI_LIBS = @QT_GUI_LIBS@
+QT_MOC = @QT_MOC@
 RANLIB = @RANLIB@
 RC = @RC@
 RCFLAGS = @RCFLAGS@
 READLINE_LIBS = @READLINE_LIBS@
-REGEX_LIBS = @REGEX_LIBS@
 RESOLV_LIB = @RESOLV_LIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 SVNDATE = @SVNDATE@
-SYS_WIN32_FALSE = @SYS_WIN32_FALSE@
-SYS_WIN32_TRUE = @SYS_WIN32_TRUE@
 USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
-WEB_FALSE = @WEB_FALSE@
-WEB_MANPAGES = @WEB_MANPAGES@
-WEB_TRUE = @WEB_TRUE@
+WEBSERVER_MANPAGES = @WEBSERVER_MANPAGES@
 WXBASE_CPPFLAGS = @WXBASE_CPPFLAGS@
 WXBASE_LIBS = @WXBASE_LIBS@
-WXCAS_FALSE = @WXCAS_FALSE@
 WXCAS_MANPAGES = @WXCAS_MANPAGES@
-WXCAS_TRUE = @WXCAS_TRUE@
 WX_CFLAGS = @WX_CFLAGS@
 WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
 WX_CONFIG_PATH = @WX_CONFIG_PATH@
@@ -308,7 +330,6 @@
 WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
 WX_DEBUG = @WX_DEBUG@
 WX_LIBS = @WX_LIBS@
-WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_PORT = @WX_PORT@
 WX_RESCOMP = @WX_RESCOMP@
 WX_SHARED = @WX_SHARED@
@@ -316,25 +337,19 @@
 WX_VERSION_FULL = @WX_VERSION_FULL@
 WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
 WX_VERSION_MINOR = @WX_VERSION_MINOR@
-X11LIBS = @X11LIBS@
 XGETTEXT = @XGETTEXT@
 YACC = @YACC@
+YFLAGS = @YFLAGS@
 ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
 ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
-ac_ct_AR = @ac_ct_AR@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
 ac_ct_BUILD_CC = @ac_ct_BUILD_CC@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-ac_ct_LD = @ac_ct_LD@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_RC = @ac_ct_RC@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -346,29 +361,40 @@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
 
 # If any tests uses more than a cpp/h fileset, then 
 # make a seperate subfolder for it to reduce clutter.
@@ -382,19 +408,15 @@
 AM_LDFLAGS = $(MULELDFLAGS)
 LDADD = $(WXBASE_LIBS) ../muleunit/libmuleunit.a
 MAINTAINERCLEANFILES = Makefile.in
-TESTS = CUInt128Test RangeMapTest FormatTest StringFunctionsTest NetworkFunctionsTest FileDataIOTest PathTest TextFileTest
 
 # Tests for the CUInt128 class
-CUInt128Test_SOURCES = CUInt128Test.cpp $(top_srcdir)/src/kademlia/utils/UInt128.cpp
-CUInt128Test_CPPFLAGS = $(AM_CPPFLAGS) $(CRYPTOPP_CPPFLAGS)
-CUInt128Test_LDFLAGS = $(AM_LDFLAGS) $(CRYPTOPP_LDFLAGS)
-CUInt128Test_LDADD = $(LDADD) $(CRYPTOPP_LIBS)
+CUInt128Test_SOURCES = CUInt128Test.cpp $(top_srcdir)/src/kademlia/utils/UInt128.cpp $(top_srcdir)/src/libs/common/Format.cpp $(top_srcdir)/src/libs/common/strerror_r.c
 
 # Tests for the CRangeMap class
 RangeMapTest_SOURCES = RangeMapTest.cpp
 
 # Tests for the CFormat class
-FormatTest_SOURCES = FormatTest.cpp $(top_srcdir)/src/libs/common/Format.cpp
+FormatTest_SOURCES = FormatTest.cpp $(top_srcdir)/src/libs/common/Format.cpp $(top_srcdir)/src/libs/common/strerror_r.c
 
 # Tests for the various string functions.
 StringFunctionsTest_SOURCES = StringFunctionsTest.cpp $(top_srcdir)/src/libs/common/StringFunctions.cpp $(top_srcdir)/src/libs/common/Path.cpp
@@ -407,38 +429,33 @@
 NetworkFunctionsTest_CPPFLAGS = $(AM_CPPFLAGS) -DEC_REMOTE # Needed to avoid compiling the http-thread
 
 # 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
-FileDataIOTest_CPPFLAGS = $(AM_CPPFLAGS) $(CRYPTOPP_CPPFLAGS)
-FileDataIOTest_LDFLAGS = $(AM_LDFLAGS) $(CRYPTOPP_LDFLAGS)
-FileDataIOTest_LDADD = $(LDADD) $(CRYPTOPP_LIBS)
+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
 
 # Tests for the CPath class
 PathTest_SOURCES = PathTest.cpp $(top_srcdir)/src/libs/common/Path.cpp $(top_srcdir)/src/libs/common/StringFunctions.cpp
-PathTest_CPPFLAGS = $(AM_CPPFLAGS) $(CRYPTOPP_CPPFLAGS)
-PathTest_LDFLAGS = $(AM_LDFLAGS) $(CRYPTOPP_LDFLAGS)
-PathTest_LDADD = $(LDADD) $(CRYPTOPP_LIBS)
 
 # Tests for the CTextFile class
 TextFileTest_SOURCES = TextFileTest.cpp $(top_srcdir)/src/libs/common/Path.cpp $(top_srcdir)/src/libs/common/StringFunctions.cpp $(top_srcdir)/src/libs/common/TextFile.cpp
-TextFileTest_CPPFLAGS = $(AM_CPPFLAGS) $(CRYPTOPP_CPPFLAGS) -DSRCDIR="$(srcdir)"
-TextFileTest_LDFLAGS = $(AM_LDFLAGS) $(CRYPTOPP_LDFLAGS)
-TextFileTest_LDADD = $(LDADD) $(CRYPTOPP_LIBS)
+TextFileTest_CPPFLAGS = $(AM_CPPFLAGS) -DSRCDIR="$(srcdir)" 
+
+# Tests for the CTag class
+CTagTest_SOURCES = CTagTest.cpp  $(top_srcdir)/src/SafeFile.cpp  $(top_srcdir)/src/MemFile.cpp $(top_srcdir)/src/Tag.cpp $(top_srcdir)/src/libs/common/Format.cpp $(top_srcdir)/src/libs/common/strerror_r.c
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .cpp .o .obj
+.SUFFIXES: .c .cpp .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  unittests/tests/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  unittests/tests/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign unittests/tests/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign unittests/tests/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -456,33 +473,37 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-checkPROGRAMS:
 	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+CTagTest$(EXEEXT): $(CTagTest_OBJECTS) $(CTagTest_DEPENDENCIES) 
+	@rm -f CTagTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(CTagTest_OBJECTS) $(CTagTest_LDADD) $(LIBS)
 CUInt128Test$(EXEEXT): $(CUInt128Test_OBJECTS) $(CUInt128Test_DEPENDENCIES) 
 	@rm -f CUInt128Test$(EXEEXT)
-	$(CXXLINK) $(CUInt128Test_LDFLAGS) $(CUInt128Test_OBJECTS) $(CUInt128Test_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(CUInt128Test_OBJECTS) $(CUInt128Test_LDADD) $(LIBS)
 FileDataIOTest$(EXEEXT): $(FileDataIOTest_OBJECTS) $(FileDataIOTest_DEPENDENCIES) 
 	@rm -f FileDataIOTest$(EXEEXT)
-	$(CXXLINK) $(FileDataIOTest_LDFLAGS) $(FileDataIOTest_OBJECTS) $(FileDataIOTest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(FileDataIOTest_OBJECTS) $(FileDataIOTest_LDADD) $(LIBS)
 FormatTest$(EXEEXT): $(FormatTest_OBJECTS) $(FormatTest_DEPENDENCIES) 
 	@rm -f FormatTest$(EXEEXT)
-	$(CXXLINK) $(FormatTest_LDFLAGS) $(FormatTest_OBJECTS) $(FormatTest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(FormatTest_OBJECTS) $(FormatTest_LDADD) $(LIBS)
 NetworkFunctionsTest$(EXEEXT): $(NetworkFunctionsTest_OBJECTS) $(NetworkFunctionsTest_DEPENDENCIES) 
 	@rm -f NetworkFunctionsTest$(EXEEXT)
-	$(CXXLINK) $(NetworkFunctionsTest_LDFLAGS) $(NetworkFunctionsTest_OBJECTS) $(NetworkFunctionsTest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(NetworkFunctionsTest_OBJECTS) $(NetworkFunctionsTest_LDADD) $(LIBS)
 PathTest$(EXEEXT): $(PathTest_OBJECTS) $(PathTest_DEPENDENCIES) 
 	@rm -f PathTest$(EXEEXT)
-	$(CXXLINK) $(PathTest_LDFLAGS) $(PathTest_OBJECTS) $(PathTest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(PathTest_OBJECTS) $(PathTest_LDADD) $(LIBS)
 RangeMapTest$(EXEEXT): $(RangeMapTest_OBJECTS) $(RangeMapTest_DEPENDENCIES) 
 	@rm -f RangeMapTest$(EXEEXT)
-	$(CXXLINK) $(RangeMapTest_LDFLAGS) $(RangeMapTest_OBJECTS) $(RangeMapTest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(RangeMapTest_OBJECTS) $(RangeMapTest_LDADD) $(LIBS)
 StringFunctionsTest$(EXEEXT): $(StringFunctionsTest_OBJECTS) $(StringFunctionsTest_DEPENDENCIES) 
 	@rm -f StringFunctionsTest$(EXEEXT)
-	$(CXXLINK) $(StringFunctionsTest_LDFLAGS) $(StringFunctionsTest_OBJECTS) $(StringFunctionsTest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(StringFunctionsTest_OBJECTS) $(StringFunctionsTest_LDADD) $(LIBS)
 TextFileTest$(EXEEXT): $(TextFileTest_OBJECTS) $(TextFileTest_DEPENDENCIES) 
 	@rm -f TextFileTest$(EXEEXT)
-	$(CXXLINK) $(TextFileTest_LDFLAGS) $(TextFileTest_OBJECTS) $(TextFileTest_LDADD) $(LIBS)
+	$(AM_V_CXXLD)$(CXXLINK) $(TextFileTest_OBJECTS) $(TextFileTest_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -490,399 +511,349 @@
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CUInt128Test-CUInt128Test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CUInt128Test-UInt128.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileDataIOTest-CFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileDataIOTest-FileDataIOTest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileDataIOTest-MemFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileDataIOTest-Path.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileDataIOTest-SafeFile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileDataIOTest-StringFunctions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileDataIOTest-Tag.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileDataIOTest-UInt128.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CFile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CTagTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CUInt128Test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FileDataIOTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Format.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/FormatTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MemFile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Path.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PathTest-Path.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PathTest-PathTest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PathTest-StringFunctions.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PathTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RangeMapTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SafeFile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StringFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StringFunctionsTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Tag.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextFileTest-Path.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextFileTest-StringFunctions.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextFileTest-TextFile.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextFileTest-TextFileTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UInt128.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror_r.Po@am__quote@
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+strerror_r.o: $(top_srcdir)/src/libs/common/strerror_r.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strerror_r.o -MD -MP -MF $(DEPDIR)/strerror_r.Tpo -c -o strerror_r.o `test -f '$(top_srcdir)/src/libs/common/strerror_r.c' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/strerror_r.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/strerror_r.Tpo $(DEPDIR)/strerror_r.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/libs/common/strerror_r.c' object='strerror_r.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strerror_r.o `test -f '$(top_srcdir)/src/libs/common/strerror_r.c' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/strerror_r.c
+
+strerror_r.obj: $(top_srcdir)/src/libs/common/strerror_r.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT strerror_r.obj -MD -MP -MF $(DEPDIR)/strerror_r.Tpo -c -o strerror_r.obj `if test -f '$(top_srcdir)/src/libs/common/strerror_r.c'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/strerror_r.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/strerror_r.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/strerror_r.Tpo $(DEPDIR)/strerror_r.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(top_srcdir)/src/libs/common/strerror_r.c' object='strerror_r.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strerror_r.obj `if test -f '$(top_srcdir)/src/libs/common/strerror_r.c'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/strerror_r.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/strerror_r.c'; fi`
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-CUInt128Test-CUInt128Test.o: CUInt128Test.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CUInt128Test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CUInt128Test-CUInt128Test.o -MD -MP -MF "$(DEPDIR)/CUInt128Test-CUInt128Test.Tpo" -c -o CUInt128Test-CUInt128Test.o `test -f 'CUInt128Test.cpp' || echo '$(srcdir)/'`CUInt128Test.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/CUInt128Test-CUInt128Test.Tpo" "$(DEPDIR)/CUInt128Test-CUInt128Test.Po"; else rm -f "$(DEPDIR)/CUInt128Test-CUInt128Test.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CUInt128Test.cpp' object='CUInt128Test-CUInt128Test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CUInt128Test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CUInt128Test-CUInt128Test.o `test -f 'CUInt128Test.cpp' || echo '$(srcdir)/'`CUInt128Test.cpp
-
-CUInt128Test-CUInt128Test.obj: CUInt128Test.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CUInt128Test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CUInt128Test-CUInt128Test.obj -MD -MP -MF "$(DEPDIR)/CUInt128Test-CUInt128Test.Tpo" -c -o CUInt128Test-CUInt128Test.obj `if test -f 'CUInt128Test.cpp'; then $(CYGPATH_W) 'CUInt128Test.cpp'; else $(CYGPATH_W) '$(srcdir)/CUInt128Test.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/CUInt128Test-CUInt128Test.Tpo" "$(DEPDIR)/CUInt128Test-CUInt128Test.Po"; else rm -f "$(DEPDIR)/CUInt128Test-CUInt128Test.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='CUInt128Test.cpp' object='CUInt128Test-CUInt128Test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CUInt128Test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CUInt128Test-CUInt128Test.obj `if test -f 'CUInt128Test.cpp'; then $(CYGPATH_W) 'CUInt128Test.cpp'; else $(CYGPATH_W) '$(srcdir)/CUInt128Test.cpp'; fi`
-
-CUInt128Test-UInt128.o: $(top_srcdir)/src/kademlia/utils/UInt128.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CUInt128Test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CUInt128Test-UInt128.o -MD -MP -MF "$(DEPDIR)/CUInt128Test-UInt128.Tpo" -c -o CUInt128Test-UInt128.o `test -f '$(top_srcdir)/src/kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/kademlia/utils/UInt128.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/CUInt128Test-UInt128.Tpo" "$(DEPDIR)/CUInt128Test-UInt128.Po"; else rm -f "$(DEPDIR)/CUInt128Test-UInt128.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/kademlia/utils/UInt128.cpp' object='CUInt128Test-UInt128.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CUInt128Test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CUInt128Test-UInt128.o `test -f '$(top_srcdir)/src/kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/kademlia/utils/UInt128.cpp
-
-CUInt128Test-UInt128.obj: $(top_srcdir)/src/kademlia/utils/UInt128.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CUInt128Test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CUInt128Test-UInt128.obj -MD -MP -MF "$(DEPDIR)/CUInt128Test-UInt128.Tpo" -c -o CUInt128Test-UInt128.obj `if test -f '$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/CUInt128Test-UInt128.Tpo" "$(DEPDIR)/CUInt128Test-UInt128.Po"; else rm -f "$(DEPDIR)/CUInt128Test-UInt128.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/kademlia/utils/UInt128.cpp' object='CUInt128Test-UInt128.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CUInt128Test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CUInt128Test-UInt128.obj `if test -f '$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; fi`
-
-FileDataIOTest-FileDataIOTest.o: FileDataIOTest.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-FileDataIOTest.o -MD -MP -MF "$(DEPDIR)/FileDataIOTest-FileDataIOTest.Tpo" -c -o FileDataIOTest-FileDataIOTest.o `test -f 'FileDataIOTest.cpp' || echo '$(srcdir)/'`FileDataIOTest.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-FileDataIOTest.Tpo" "$(DEPDIR)/FileDataIOTest-FileDataIOTest.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-FileDataIOTest.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileDataIOTest.cpp' object='FileDataIOTest-FileDataIOTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-FileDataIOTest.o `test -f 'FileDataIOTest.cpp' || echo '$(srcdir)/'`FileDataIOTest.cpp
-
-FileDataIOTest-FileDataIOTest.obj: FileDataIOTest.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-FileDataIOTest.obj -MD -MP -MF "$(DEPDIR)/FileDataIOTest-FileDataIOTest.Tpo" -c -o FileDataIOTest-FileDataIOTest.obj `if test -f 'FileDataIOTest.cpp'; then $(CYGPATH_W) 'FileDataIOTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FileDataIOTest.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-FileDataIOTest.Tpo" "$(DEPDIR)/FileDataIOTest-FileDataIOTest.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-FileDataIOTest.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='FileDataIOTest.cpp' object='FileDataIOTest-FileDataIOTest.obj' libtool=no @AMDEPBACKSLASH@
+SafeFile.o: $(top_srcdir)/src/SafeFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SafeFile.o -MD -MP -MF $(DEPDIR)/SafeFile.Tpo -c -o SafeFile.o `test -f '$(top_srcdir)/src/SafeFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/SafeFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SafeFile.Tpo $(DEPDIR)/SafeFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/SafeFile.cpp' object='SafeFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-FileDataIOTest.obj `if test -f 'FileDataIOTest.cpp'; then $(CYGPATH_W) 'FileDataIOTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FileDataIOTest.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SafeFile.o `test -f '$(top_srcdir)/src/SafeFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/SafeFile.cpp
 
-FileDataIOTest-SafeFile.o: $(top_srcdir)/src/SafeFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-SafeFile.o -MD -MP -MF "$(DEPDIR)/FileDataIOTest-SafeFile.Tpo" -c -o FileDataIOTest-SafeFile.o `test -f '$(top_srcdir)/src/SafeFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/SafeFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-SafeFile.Tpo" "$(DEPDIR)/FileDataIOTest-SafeFile.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-SafeFile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/SafeFile.cpp' object='FileDataIOTest-SafeFile.o' libtool=no @AMDEPBACKSLASH@
+SafeFile.obj: $(top_srcdir)/src/SafeFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SafeFile.obj -MD -MP -MF $(DEPDIR)/SafeFile.Tpo -c -o SafeFile.obj `if test -f '$(top_srcdir)/src/SafeFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/SafeFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/SafeFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SafeFile.Tpo $(DEPDIR)/SafeFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/SafeFile.cpp' object='SafeFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-SafeFile.o `test -f '$(top_srcdir)/src/SafeFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/SafeFile.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SafeFile.obj `if test -f '$(top_srcdir)/src/SafeFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/SafeFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/SafeFile.cpp'; fi`
 
-FileDataIOTest-SafeFile.obj: $(top_srcdir)/src/SafeFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-SafeFile.obj -MD -MP -MF "$(DEPDIR)/FileDataIOTest-SafeFile.Tpo" -c -o FileDataIOTest-SafeFile.obj `if test -f '$(top_srcdir)/src/SafeFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/SafeFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/SafeFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-SafeFile.Tpo" "$(DEPDIR)/FileDataIOTest-SafeFile.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-SafeFile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/SafeFile.cpp' object='FileDataIOTest-SafeFile.obj' libtool=no @AMDEPBACKSLASH@
+MemFile.o: $(top_srcdir)/src/MemFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MemFile.o -MD -MP -MF $(DEPDIR)/MemFile.Tpo -c -o MemFile.o `test -f '$(top_srcdir)/src/MemFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/MemFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/MemFile.Tpo $(DEPDIR)/MemFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/MemFile.cpp' object='MemFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-SafeFile.obj `if test -f '$(top_srcdir)/src/SafeFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/SafeFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/SafeFile.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MemFile.o `test -f '$(top_srcdir)/src/MemFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/MemFile.cpp
 
-FileDataIOTest-CFile.o: $(top_srcdir)/src/CFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-CFile.o -MD -MP -MF "$(DEPDIR)/FileDataIOTest-CFile.Tpo" -c -o FileDataIOTest-CFile.o `test -f '$(top_srcdir)/src/CFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/CFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-CFile.Tpo" "$(DEPDIR)/FileDataIOTest-CFile.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-CFile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/CFile.cpp' object='FileDataIOTest-CFile.o' libtool=no @AMDEPBACKSLASH@
+MemFile.obj: $(top_srcdir)/src/MemFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MemFile.obj -MD -MP -MF $(DEPDIR)/MemFile.Tpo -c -o MemFile.obj `if test -f '$(top_srcdir)/src/MemFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/MemFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/MemFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/MemFile.Tpo $(DEPDIR)/MemFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/MemFile.cpp' object='MemFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-CFile.o `test -f '$(top_srcdir)/src/CFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/CFile.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MemFile.obj `if test -f '$(top_srcdir)/src/MemFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/MemFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/MemFile.cpp'; fi`
 
-FileDataIOTest-CFile.obj: $(top_srcdir)/src/CFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-CFile.obj -MD -MP -MF "$(DEPDIR)/FileDataIOTest-CFile.Tpo" -c -o FileDataIOTest-CFile.obj `if test -f '$(top_srcdir)/src/CFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/CFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/CFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-CFile.Tpo" "$(DEPDIR)/FileDataIOTest-CFile.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-CFile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/CFile.cpp' object='FileDataIOTest-CFile.obj' libtool=no @AMDEPBACKSLASH@
+Tag.o: $(top_srcdir)/src/Tag.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Tag.o -MD -MP -MF $(DEPDIR)/Tag.Tpo -c -o Tag.o `test -f '$(top_srcdir)/src/Tag.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/Tag.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Tag.Tpo $(DEPDIR)/Tag.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/Tag.cpp' object='Tag.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-CFile.obj `if test -f '$(top_srcdir)/src/CFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/CFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/CFile.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Tag.o `test -f '$(top_srcdir)/src/Tag.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/Tag.cpp
 
-FileDataIOTest-MemFile.o: $(top_srcdir)/src/MemFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-MemFile.o -MD -MP -MF "$(DEPDIR)/FileDataIOTest-MemFile.Tpo" -c -o FileDataIOTest-MemFile.o `test -f '$(top_srcdir)/src/MemFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/MemFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-MemFile.Tpo" "$(DEPDIR)/FileDataIOTest-MemFile.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-MemFile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/MemFile.cpp' object='FileDataIOTest-MemFile.o' libtool=no @AMDEPBACKSLASH@
+Tag.obj: $(top_srcdir)/src/Tag.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Tag.obj -MD -MP -MF $(DEPDIR)/Tag.Tpo -c -o Tag.obj `if test -f '$(top_srcdir)/src/Tag.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/Tag.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/Tag.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Tag.Tpo $(DEPDIR)/Tag.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/Tag.cpp' object='Tag.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-MemFile.o `test -f '$(top_srcdir)/src/MemFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/MemFile.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Tag.obj `if test -f '$(top_srcdir)/src/Tag.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/Tag.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/Tag.cpp'; fi`
 
-FileDataIOTest-MemFile.obj: $(top_srcdir)/src/MemFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-MemFile.obj -MD -MP -MF "$(DEPDIR)/FileDataIOTest-MemFile.Tpo" -c -o FileDataIOTest-MemFile.obj `if test -f '$(top_srcdir)/src/MemFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/MemFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/MemFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-MemFile.Tpo" "$(DEPDIR)/FileDataIOTest-MemFile.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-MemFile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/MemFile.cpp' object='FileDataIOTest-MemFile.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-MemFile.obj `if test -f '$(top_srcdir)/src/MemFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/MemFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/MemFile.cpp'; fi`
-
-FileDataIOTest-UInt128.o: $(top_srcdir)/src/kademlia/utils/UInt128.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-UInt128.o -MD -MP -MF "$(DEPDIR)/FileDataIOTest-UInt128.Tpo" -c -o FileDataIOTest-UInt128.o `test -f '$(top_srcdir)/src/kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/kademlia/utils/UInt128.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-UInt128.Tpo" "$(DEPDIR)/FileDataIOTest-UInt128.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-UInt128.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/kademlia/utils/UInt128.cpp' object='FileDataIOTest-UInt128.o' libtool=no @AMDEPBACKSLASH@
+Format.o: $(top_srcdir)/src/libs/common/Format.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Format.o -MD -MP -MF $(DEPDIR)/Format.Tpo -c -o Format.o `test -f '$(top_srcdir)/src/libs/common/Format.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Format.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Format.Tpo $(DEPDIR)/Format.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Format.cpp' object='Format.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-UInt128.o `test -f '$(top_srcdir)/src/kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/kademlia/utils/UInt128.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Format.o `test -f '$(top_srcdir)/src/libs/common/Format.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Format.cpp
 
-FileDataIOTest-UInt128.obj: $(top_srcdir)/src/kademlia/utils/UInt128.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-UInt128.obj -MD -MP -MF "$(DEPDIR)/FileDataIOTest-UInt128.Tpo" -c -o FileDataIOTest-UInt128.obj `if test -f '$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-UInt128.Tpo" "$(DEPDIR)/FileDataIOTest-UInt128.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-UInt128.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/kademlia/utils/UInt128.cpp' object='FileDataIOTest-UInt128.obj' libtool=no @AMDEPBACKSLASH@
+Format.obj: $(top_srcdir)/src/libs/common/Format.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Format.obj -MD -MP -MF $(DEPDIR)/Format.Tpo -c -o Format.obj `if test -f '$(top_srcdir)/src/libs/common/Format.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Format.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Format.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Format.Tpo $(DEPDIR)/Format.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Format.cpp' object='Format.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-UInt128.obj `if test -f '$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Format.obj `if test -f '$(top_srcdir)/src/libs/common/Format.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Format.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Format.cpp'; fi`
 
-FileDataIOTest-StringFunctions.o: $(top_srcdir)/src/libs/common/StringFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-StringFunctions.o -MD -MP -MF "$(DEPDIR)/FileDataIOTest-StringFunctions.Tpo" -c -o FileDataIOTest-StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-StringFunctions.Tpo" "$(DEPDIR)/FileDataIOTest-StringFunctions.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-StringFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/StringFunctions.cpp' object='FileDataIOTest-StringFunctions.o' libtool=no @AMDEPBACKSLASH@
+UInt128.o: $(top_srcdir)/src/kademlia/utils/UInt128.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UInt128.o -MD -MP -MF $(DEPDIR)/UInt128.Tpo -c -o UInt128.o `test -f '$(top_srcdir)/src/kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/kademlia/utils/UInt128.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/UInt128.Tpo $(DEPDIR)/UInt128.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/kademlia/utils/UInt128.cpp' object='UInt128.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UInt128.o `test -f '$(top_srcdir)/src/kademlia/utils/UInt128.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/kademlia/utils/UInt128.cpp
 
-FileDataIOTest-StringFunctions.obj: $(top_srcdir)/src/libs/common/StringFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-StringFunctions.obj -MD -MP -MF "$(DEPDIR)/FileDataIOTest-StringFunctions.Tpo" -c -o FileDataIOTest-StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-StringFunctions.Tpo" "$(DEPDIR)/FileDataIOTest-StringFunctions.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-StringFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/StringFunctions.cpp' object='FileDataIOTest-StringFunctions.obj' libtool=no @AMDEPBACKSLASH@
+UInt128.obj: $(top_srcdir)/src/kademlia/utils/UInt128.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UInt128.obj -MD -MP -MF $(DEPDIR)/UInt128.Tpo -c -o UInt128.obj `if test -f '$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/UInt128.Tpo $(DEPDIR)/UInt128.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/kademlia/utils/UInt128.cpp' object='UInt128.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UInt128.obj `if test -f '$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/kademlia/utils/UInt128.cpp'; fi`
 
-FileDataIOTest-Tag.o: $(top_srcdir)/src/Tag.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-Tag.o -MD -MP -MF "$(DEPDIR)/FileDataIOTest-Tag.Tpo" -c -o FileDataIOTest-Tag.o `test -f '$(top_srcdir)/src/Tag.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/Tag.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-Tag.Tpo" "$(DEPDIR)/FileDataIOTest-Tag.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-Tag.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/Tag.cpp' object='FileDataIOTest-Tag.o' libtool=no @AMDEPBACKSLASH@
+CFile.o: $(top_srcdir)/src/CFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CFile.o -MD -MP -MF $(DEPDIR)/CFile.Tpo -c -o CFile.o `test -f '$(top_srcdir)/src/CFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/CFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CFile.Tpo $(DEPDIR)/CFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/CFile.cpp' object='CFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-Tag.o `test -f '$(top_srcdir)/src/Tag.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/Tag.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CFile.o `test -f '$(top_srcdir)/src/CFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/CFile.cpp
 
-FileDataIOTest-Tag.obj: $(top_srcdir)/src/Tag.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-Tag.obj -MD -MP -MF "$(DEPDIR)/FileDataIOTest-Tag.Tpo" -c -o FileDataIOTest-Tag.obj `if test -f '$(top_srcdir)/src/Tag.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/Tag.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/Tag.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-Tag.Tpo" "$(DEPDIR)/FileDataIOTest-Tag.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-Tag.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/Tag.cpp' object='FileDataIOTest-Tag.obj' libtool=no @AMDEPBACKSLASH@
+CFile.obj: $(top_srcdir)/src/CFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CFile.obj -MD -MP -MF $(DEPDIR)/CFile.Tpo -c -o CFile.obj `if test -f '$(top_srcdir)/src/CFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/CFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/CFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CFile.Tpo $(DEPDIR)/CFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/CFile.cpp' object='CFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-Tag.obj `if test -f '$(top_srcdir)/src/Tag.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/Tag.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/Tag.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CFile.obj `if test -f '$(top_srcdir)/src/CFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/CFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/CFile.cpp'; fi`
 
-FileDataIOTest-Path.o: $(top_srcdir)/src/libs/common/Path.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-Path.o -MD -MP -MF "$(DEPDIR)/FileDataIOTest-Path.Tpo" -c -o FileDataIOTest-Path.o `test -f '$(top_srcdir)/src/libs/common/Path.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Path.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-Path.Tpo" "$(DEPDIR)/FileDataIOTest-Path.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-Path.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Path.cpp' object='FileDataIOTest-Path.o' libtool=no @AMDEPBACKSLASH@
+StringFunctions.o: $(top_srcdir)/src/libs/common/StringFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StringFunctions.o -MD -MP -MF $(DEPDIR)/StringFunctions.Tpo -c -o StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/StringFunctions.Tpo $(DEPDIR)/StringFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/StringFunctions.cpp' object='StringFunctions.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-Path.o `test -f '$(top_srcdir)/src/libs/common/Path.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Path.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp
 
-FileDataIOTest-Path.obj: $(top_srcdir)/src/libs/common/Path.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileDataIOTest-Path.obj -MD -MP -MF "$(DEPDIR)/FileDataIOTest-Path.Tpo" -c -o FileDataIOTest-Path.obj `if test -f '$(top_srcdir)/src/libs/common/Path.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Path.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Path.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/FileDataIOTest-Path.Tpo" "$(DEPDIR)/FileDataIOTest-Path.Po"; else rm -f "$(DEPDIR)/FileDataIOTest-Path.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Path.cpp' object='FileDataIOTest-Path.obj' libtool=no @AMDEPBACKSLASH@
+StringFunctions.obj: $(top_srcdir)/src/libs/common/StringFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StringFunctions.obj -MD -MP -MF $(DEPDIR)/StringFunctions.Tpo -c -o StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/StringFunctions.Tpo $(DEPDIR)/StringFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/StringFunctions.cpp' object='StringFunctions.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileDataIOTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileDataIOTest-Path.obj `if test -f '$(top_srcdir)/src/libs/common/Path.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Path.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Path.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`
 
-Format.o: $(top_srcdir)/src/libs/common/Format.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Format.o -MD -MP -MF "$(DEPDIR)/Format.Tpo" -c -o Format.o `test -f '$(top_srcdir)/src/libs/common/Format.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Format.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/Format.Tpo" "$(DEPDIR)/Format.Po"; else rm -f "$(DEPDIR)/Format.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Format.cpp' object='Format.o' libtool=no @AMDEPBACKSLASH@
+Path.o: $(top_srcdir)/src/libs/common/Path.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Path.o -MD -MP -MF $(DEPDIR)/Path.Tpo -c -o Path.o `test -f '$(top_srcdir)/src/libs/common/Path.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Path.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Path.Tpo $(DEPDIR)/Path.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Path.cpp' object='Path.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Format.o `test -f '$(top_srcdir)/src/libs/common/Format.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Format.cpp
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Path.o `test -f '$(top_srcdir)/src/libs/common/Path.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Path.cpp
 
-Format.obj: $(top_srcdir)/src/libs/common/Format.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Format.obj -MD -MP -MF "$(DEPDIR)/Format.Tpo" -c -o Format.obj `if test -f '$(top_srcdir)/src/libs/common/Format.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Format.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Format.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/Format.Tpo" "$(DEPDIR)/Format.Po"; else rm -f "$(DEPDIR)/Format.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Format.cpp' object='Format.obj' libtool=no @AMDEPBACKSLASH@
+Path.obj: $(top_srcdir)/src/libs/common/Path.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Path.obj -MD -MP -MF $(DEPDIR)/Path.Tpo -c -o Path.obj `if test -f '$(top_srcdir)/src/libs/common/Path.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Path.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Path.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/Path.Tpo $(DEPDIR)/Path.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Path.cpp' object='Path.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Format.obj `if test -f '$(top_srcdir)/src/libs/common/Format.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Format.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Format.cpp'; fi`
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Path.obj `if test -f '$(top_srcdir)/src/libs/common/Path.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Path.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Path.cpp'; fi`
 
 NetworkFunctionsTest-NetworkFunctionsTest.o: NetworkFunctionsTest.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkFunctionsTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT NetworkFunctionsTest-NetworkFunctionsTest.o -MD -MP -MF "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Tpo" -c -o NetworkFunctionsTest-NetworkFunctionsTest.o `test -f 'NetworkFunctionsTest.cpp' || echo '$(srcdir)/'`NetworkFunctionsTest.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Tpo" "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Po"; else rm -f "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkFunctionsTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT NetworkFunctionsTest-NetworkFunctionsTest.o -MD -MP -MF $(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Tpo -c -o NetworkFunctionsTest-NetworkFunctionsTest.o `test -f 'NetworkFunctionsTest.cpp' || echo '$(srcdir)/'`NetworkFunctionsTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Tpo $(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NetworkFunctionsTest.cpp' object='NetworkFunctionsTest-NetworkFunctionsTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkFunctionsTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o NetworkFunctionsTest-NetworkFunctionsTest.o `test -f 'NetworkFunctionsTest.cpp' || echo '$(srcdir)/'`NetworkFunctionsTest.cpp
 
 NetworkFunctionsTest-NetworkFunctionsTest.obj: NetworkFunctionsTest.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkFunctionsTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT NetworkFunctionsTest-NetworkFunctionsTest.obj -MD -MP -MF "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Tpo" -c -o NetworkFunctionsTest-NetworkFunctionsTest.obj `if test -f 'NetworkFunctionsTest.cpp'; then $(CYGPATH_W) 'NetworkFunctionsTest.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctionsTest.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Tpo" "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Po"; else rm -f "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkFunctionsTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT NetworkFunctionsTest-NetworkFunctionsTest.obj -MD -MP -MF $(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Tpo -c -o NetworkFunctionsTest-NetworkFunctionsTest.obj `if test -f 'NetworkFunctionsTest.cpp'; then $(CYGPATH_W) 'NetworkFunctionsTest.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctionsTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Tpo $(DEPDIR)/NetworkFunctionsTest-NetworkFunctionsTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='NetworkFunctionsTest.cpp' object='NetworkFunctionsTest-NetworkFunctionsTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkFunctionsTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o NetworkFunctionsTest-NetworkFunctionsTest.obj `if test -f 'NetworkFunctionsTest.cpp'; then $(CYGPATH_W) 'NetworkFunctionsTest.cpp'; else $(CYGPATH_W) '$(srcdir)/NetworkFunctionsTest.cpp'; fi`
 
 NetworkFunctionsTest-NetworkFunctions.o: $(top_srcdir)/src/NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkFunctionsTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT NetworkFunctionsTest-NetworkFunctions.o -MD -MP -MF "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Tpo" -c -o NetworkFunctionsTest-NetworkFunctions.o `test -f '$(top_srcdir)/src/NetworkFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/NetworkFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Tpo" "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkFunctionsTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT NetworkFunctionsTest-NetworkFunctions.o -MD -MP -MF $(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Tpo -c -o NetworkFunctionsTest-NetworkFunctions.o `test -f '$(top_srcdir)/src/NetworkFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/NetworkFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Tpo $(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/NetworkFunctions.cpp' object='NetworkFunctionsTest-NetworkFunctions.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkFunctionsTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o NetworkFunctionsTest-NetworkFunctions.o `test -f '$(top_srcdir)/src/NetworkFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/NetworkFunctions.cpp
 
 NetworkFunctionsTest-NetworkFunctions.obj: $(top_srcdir)/src/NetworkFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkFunctionsTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT NetworkFunctionsTest-NetworkFunctions.obj -MD -MP -MF "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Tpo" -c -o NetworkFunctionsTest-NetworkFunctions.obj `if test -f '$(top_srcdir)/src/NetworkFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/NetworkFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Tpo" "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Po"; else rm -f "$(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkFunctionsTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT NetworkFunctionsTest-NetworkFunctions.obj -MD -MP -MF $(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Tpo -c -o NetworkFunctionsTest-NetworkFunctions.obj `if test -f '$(top_srcdir)/src/NetworkFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/NetworkFunctions.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Tpo $(DEPDIR)/NetworkFunctionsTest-NetworkFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/NetworkFunctions.cpp' object='NetworkFunctionsTest-NetworkFunctions.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(NetworkFunctionsTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o NetworkFunctionsTest-NetworkFunctions.obj `if test -f '$(top_srcdir)/src/NetworkFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/NetworkFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/NetworkFunctions.cpp'; fi`
 
-PathTest-PathTest.o: PathTest.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PathTest-PathTest.o -MD -MP -MF "$(DEPDIR)/PathTest-PathTest.Tpo" -c -o PathTest-PathTest.o `test -f 'PathTest.cpp' || echo '$(srcdir)/'`PathTest.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/PathTest-PathTest.Tpo" "$(DEPDIR)/PathTest-PathTest.Po"; else rm -f "$(DEPDIR)/PathTest-PathTest.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PathTest.cpp' object='PathTest-PathTest.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PathTest-PathTest.o `test -f 'PathTest.cpp' || echo '$(srcdir)/'`PathTest.cpp
-
-PathTest-PathTest.obj: PathTest.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PathTest-PathTest.obj -MD -MP -MF "$(DEPDIR)/PathTest-PathTest.Tpo" -c -o PathTest-PathTest.obj `if test -f 'PathTest.cpp'; then $(CYGPATH_W) 'PathTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PathTest.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/PathTest-PathTest.Tpo" "$(DEPDIR)/PathTest-PathTest.Po"; else rm -f "$(DEPDIR)/PathTest-PathTest.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='PathTest.cpp' object='PathTest-PathTest.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PathTest-PathTest.obj `if test -f 'PathTest.cpp'; then $(CYGPATH_W) 'PathTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PathTest.cpp'; fi`
-
-PathTest-Path.o: $(top_srcdir)/src/libs/common/Path.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PathTest-Path.o -MD -MP -MF "$(DEPDIR)/PathTest-Path.Tpo" -c -o PathTest-Path.o `test -f '$(top_srcdir)/src/libs/common/Path.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Path.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/PathTest-Path.Tpo" "$(DEPDIR)/PathTest-Path.Po"; else rm -f "$(DEPDIR)/PathTest-Path.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Path.cpp' object='PathTest-Path.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PathTest-Path.o `test -f '$(top_srcdir)/src/libs/common/Path.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Path.cpp
-
-PathTest-Path.obj: $(top_srcdir)/src/libs/common/Path.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PathTest-Path.obj -MD -MP -MF "$(DEPDIR)/PathTest-Path.Tpo" -c -o PathTest-Path.obj `if test -f '$(top_srcdir)/src/libs/common/Path.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Path.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Path.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/PathTest-Path.Tpo" "$(DEPDIR)/PathTest-Path.Po"; else rm -f "$(DEPDIR)/PathTest-Path.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Path.cpp' object='PathTest-Path.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PathTest-Path.obj `if test -f '$(top_srcdir)/src/libs/common/Path.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Path.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Path.cpp'; fi`
-
-PathTest-StringFunctions.o: $(top_srcdir)/src/libs/common/StringFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PathTest-StringFunctions.o -MD -MP -MF "$(DEPDIR)/PathTest-StringFunctions.Tpo" -c -o PathTest-StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/PathTest-StringFunctions.Tpo" "$(DEPDIR)/PathTest-StringFunctions.Po"; else rm -f "$(DEPDIR)/PathTest-StringFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/StringFunctions.cpp' object='PathTest-StringFunctions.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PathTest-StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp
-
-PathTest-StringFunctions.obj: $(top_srcdir)/src/libs/common/StringFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PathTest-StringFunctions.obj -MD -MP -MF "$(DEPDIR)/PathTest-StringFunctions.Tpo" -c -o PathTest-StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/PathTest-StringFunctions.Tpo" "$(DEPDIR)/PathTest-StringFunctions.Po"; else rm -f "$(DEPDIR)/PathTest-StringFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/StringFunctions.cpp' object='PathTest-StringFunctions.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PathTest-StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`
-
-StringFunctions.o: $(top_srcdir)/src/libs/common/StringFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StringFunctions.o -MD -MP -MF "$(DEPDIR)/StringFunctions.Tpo" -c -o StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/StringFunctions.Tpo" "$(DEPDIR)/StringFunctions.Po"; else rm -f "$(DEPDIR)/StringFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/StringFunctions.cpp' object='StringFunctions.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp
-
-StringFunctions.obj: $(top_srcdir)/src/libs/common/StringFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StringFunctions.obj -MD -MP -MF "$(DEPDIR)/StringFunctions.Tpo" -c -o StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/StringFunctions.Tpo" "$(DEPDIR)/StringFunctions.Po"; else rm -f "$(DEPDIR)/StringFunctions.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/StringFunctions.cpp' object='StringFunctions.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`
-
-Path.o: $(top_srcdir)/src/libs/common/Path.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Path.o -MD -MP -MF "$(DEPDIR)/Path.Tpo" -c -o Path.o `test -f '$(top_srcdir)/src/libs/common/Path.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Path.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/Path.Tpo" "$(DEPDIR)/Path.Po"; else rm -f "$(DEPDIR)/Path.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Path.cpp' object='Path.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Path.o `test -f '$(top_srcdir)/src/libs/common/Path.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Path.cpp
-
-Path.obj: $(top_srcdir)/src/libs/common/Path.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Path.obj -MD -MP -MF "$(DEPDIR)/Path.Tpo" -c -o Path.obj `if test -f '$(top_srcdir)/src/libs/common/Path.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Path.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Path.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/Path.Tpo" "$(DEPDIR)/Path.Po"; else rm -f "$(DEPDIR)/Path.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Path.cpp' object='Path.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Path.obj `if test -f '$(top_srcdir)/src/libs/common/Path.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Path.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Path.cpp'; fi`
-
 TextFileTest-TextFileTest.o: TextFileTest.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-TextFileTest.o -MD -MP -MF "$(DEPDIR)/TextFileTest-TextFileTest.Tpo" -c -o TextFileTest-TextFileTest.o `test -f 'TextFileTest.cpp' || echo '$(srcdir)/'`TextFileTest.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/TextFileTest-TextFileTest.Tpo" "$(DEPDIR)/TextFileTest-TextFileTest.Po"; else rm -f "$(DEPDIR)/TextFileTest-TextFileTest.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-TextFileTest.o -MD -MP -MF $(DEPDIR)/TextFileTest-TextFileTest.Tpo -c -o TextFileTest-TextFileTest.o `test -f 'TextFileTest.cpp' || echo '$(srcdir)/'`TextFileTest.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TextFileTest-TextFileTest.Tpo $(DEPDIR)/TextFileTest-TextFileTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TextFileTest.cpp' object='TextFileTest-TextFileTest.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TextFileTest-TextFileTest.o `test -f 'TextFileTest.cpp' || echo '$(srcdir)/'`TextFileTest.cpp
 
 TextFileTest-TextFileTest.obj: TextFileTest.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-TextFileTest.obj -MD -MP -MF "$(DEPDIR)/TextFileTest-TextFileTest.Tpo" -c -o TextFileTest-TextFileTest.obj `if test -f 'TextFileTest.cpp'; then $(CYGPATH_W) 'TextFileTest.cpp'; else $(CYGPATH_W) '$(srcdir)/TextFileTest.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/TextFileTest-TextFileTest.Tpo" "$(DEPDIR)/TextFileTest-TextFileTest.Po"; else rm -f "$(DEPDIR)/TextFileTest-TextFileTest.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-TextFileTest.obj -MD -MP -MF $(DEPDIR)/TextFileTest-TextFileTest.Tpo -c -o TextFileTest-TextFileTest.obj `if test -f 'TextFileTest.cpp'; then $(CYGPATH_W) 'TextFileTest.cpp'; else $(CYGPATH_W) '$(srcdir)/TextFileTest.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TextFileTest-TextFileTest.Tpo $(DEPDIR)/TextFileTest-TextFileTest.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='TextFileTest.cpp' object='TextFileTest-TextFileTest.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TextFileTest-TextFileTest.obj `if test -f 'TextFileTest.cpp'; then $(CYGPATH_W) 'TextFileTest.cpp'; else $(CYGPATH_W) '$(srcdir)/TextFileTest.cpp'; fi`
 
 TextFileTest-Path.o: $(top_srcdir)/src/libs/common/Path.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-Path.o -MD -MP -MF "$(DEPDIR)/TextFileTest-Path.Tpo" -c -o TextFileTest-Path.o `test -f '$(top_srcdir)/src/libs/common/Path.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Path.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/TextFileTest-Path.Tpo" "$(DEPDIR)/TextFileTest-Path.Po"; else rm -f "$(DEPDIR)/TextFileTest-Path.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-Path.o -MD -MP -MF $(DEPDIR)/TextFileTest-Path.Tpo -c -o TextFileTest-Path.o `test -f '$(top_srcdir)/src/libs/common/Path.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Path.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TextFileTest-Path.Tpo $(DEPDIR)/TextFileTest-Path.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Path.cpp' object='TextFileTest-Path.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TextFileTest-Path.o `test -f '$(top_srcdir)/src/libs/common/Path.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/Path.cpp
 
 TextFileTest-Path.obj: $(top_srcdir)/src/libs/common/Path.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-Path.obj -MD -MP -MF "$(DEPDIR)/TextFileTest-Path.Tpo" -c -o TextFileTest-Path.obj `if test -f '$(top_srcdir)/src/libs/common/Path.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Path.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Path.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/TextFileTest-Path.Tpo" "$(DEPDIR)/TextFileTest-Path.Po"; else rm -f "$(DEPDIR)/TextFileTest-Path.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-Path.obj -MD -MP -MF $(DEPDIR)/TextFileTest-Path.Tpo -c -o TextFileTest-Path.obj `if test -f '$(top_srcdir)/src/libs/common/Path.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Path.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Path.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TextFileTest-Path.Tpo $(DEPDIR)/TextFileTest-Path.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/Path.cpp' object='TextFileTest-Path.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TextFileTest-Path.obj `if test -f '$(top_srcdir)/src/libs/common/Path.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/Path.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/Path.cpp'; fi`
 
 TextFileTest-StringFunctions.o: $(top_srcdir)/src/libs/common/StringFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-StringFunctions.o -MD -MP -MF "$(DEPDIR)/TextFileTest-StringFunctions.Tpo" -c -o TextFileTest-StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/TextFileTest-StringFunctions.Tpo" "$(DEPDIR)/TextFileTest-StringFunctions.Po"; else rm -f "$(DEPDIR)/TextFileTest-StringFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-StringFunctions.o -MD -MP -MF $(DEPDIR)/TextFileTest-StringFunctions.Tpo -c -o TextFileTest-StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TextFileTest-StringFunctions.Tpo $(DEPDIR)/TextFileTest-StringFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/StringFunctions.cpp' object='TextFileTest-StringFunctions.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TextFileTest-StringFunctions.o `test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/StringFunctions.cpp
 
 TextFileTest-StringFunctions.obj: $(top_srcdir)/src/libs/common/StringFunctions.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-StringFunctions.obj -MD -MP -MF "$(DEPDIR)/TextFileTest-StringFunctions.Tpo" -c -o TextFileTest-StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/TextFileTest-StringFunctions.Tpo" "$(DEPDIR)/TextFileTest-StringFunctions.Po"; else rm -f "$(DEPDIR)/TextFileTest-StringFunctions.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-StringFunctions.obj -MD -MP -MF $(DEPDIR)/TextFileTest-StringFunctions.Tpo -c -o TextFileTest-StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TextFileTest-StringFunctions.Tpo $(DEPDIR)/TextFileTest-StringFunctions.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/StringFunctions.cpp' object='TextFileTest-StringFunctions.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TextFileTest-StringFunctions.obj `if test -f '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/StringFunctions.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/StringFunctions.cpp'; fi`
 
 TextFileTest-TextFile.o: $(top_srcdir)/src/libs/common/TextFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-TextFile.o -MD -MP -MF "$(DEPDIR)/TextFileTest-TextFile.Tpo" -c -o TextFileTest-TextFile.o `test -f '$(top_srcdir)/src/libs/common/TextFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/TextFile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/TextFileTest-TextFile.Tpo" "$(DEPDIR)/TextFileTest-TextFile.Po"; else rm -f "$(DEPDIR)/TextFileTest-TextFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-TextFile.o -MD -MP -MF $(DEPDIR)/TextFileTest-TextFile.Tpo -c -o TextFileTest-TextFile.o `test -f '$(top_srcdir)/src/libs/common/TextFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/TextFile.cpp
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TextFileTest-TextFile.Tpo $(DEPDIR)/TextFileTest-TextFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/TextFile.cpp' object='TextFileTest-TextFile.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TextFileTest-TextFile.o `test -f '$(top_srcdir)/src/libs/common/TextFile.cpp' || echo '$(srcdir)/'`$(top_srcdir)/src/libs/common/TextFile.cpp
 
 TextFileTest-TextFile.obj: $(top_srcdir)/src/libs/common/TextFile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-TextFile.obj -MD -MP -MF "$(DEPDIR)/TextFileTest-TextFile.Tpo" -c -o TextFileTest-TextFile.obj `if test -f '$(top_srcdir)/src/libs/common/TextFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/TextFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/TextFile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/TextFileTest-TextFile.Tpo" "$(DEPDIR)/TextFileTest-TextFile.Po"; else rm -f "$(DEPDIR)/TextFileTest-TextFile.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TextFileTest-TextFile.obj -MD -MP -MF $(DEPDIR)/TextFileTest-TextFile.Tpo -c -o TextFileTest-TextFile.obj `if test -f '$(top_srcdir)/src/libs/common/TextFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/TextFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/TextFile.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TextFileTest-TextFile.Tpo $(DEPDIR)/TextFileTest-TextFile.Po
+@am__fastdepCXX_FALSE@	$(AM_V_CXX) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/libs/common/TextFile.cpp' object='TextFileTest-TextFile.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TextFileTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TextFileTest-TextFile.obj `if test -f '$(top_srcdir)/src/libs/common/TextFile.cpp'; then $(CYGPATH_W) '$(top_srcdir)/src/libs/common/TextFile.cpp'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/libs/common/TextFile.cpp'; fi`
-uninstall-info-am:
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -890,7 +861,8 @@
 check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
-	list='$(TESTS)'; \
+	list=' $(TESTS) '; \
+	$(am__tty_colors); \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -899,49 +871,63 @@
 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
-		echo "XPASS: $$tst"; \
+		col=$$red; res=XPASS; \
 	      ;; \
 	      *) \
-		echo "PASS: $$tst"; \
+		col=$$grn; res=PASS; \
 	      ;; \
 	      esac; \
 	    elif test $$? -ne 77; then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
-	      *" $$tst "*) \
+	      *[\ \	]$$tst[\ \	]*) \
 		xfail=`expr $$xfail + 1`; \
-		echo "XFAIL: $$tst"; \
+		col=$$lgn; res=XFAIL; \
 	      ;; \
 	      *) \
 		failed=`expr $$failed + 1`; \
-		echo "FAIL: $$tst"; \
+		col=$$red; res=FAIL; \
 	      ;; \
 	      esac; \
 	    else \
 	      skip=`expr $$skip + 1`; \
-	      echo "SKIP: $$tst"; \
+	      col=$$blu; res=SKIP; \
 	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
 	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
 	  if test "$$failed" -eq 0; then \
 	    if test "$$xfail" -eq 0; then \
-	      banner="All $$all tests passed"; \
+	      banner="$$All$$all $$tests passed"; \
 	    else \
-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
 	    fi; \
 	  else \
 	    if test "$$xpass" -eq 0; then \
-	      banner="$$failed of $$all tests failed"; \
+	      banner="$$failed of $$all $$tests failed"; \
 	    else \
-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
 	    fi; \
 	  fi; \
 	  dashes="$$banner"; \
 	  skipped=""; \
 	  if test "$$skip" -ne 0; then \
-	    skipped="($$skip tests were not run)"; \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
 	      dashes="$$skipped"; \
 	  fi; \
@@ -952,38 +938,45 @@
 	      dashes="$$report"; \
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  echo "$$dashes"; \
+	  if test "$$failed" -eq 0; then \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
 	  echo "$$banner"; \
 	  test -z "$$skipped" || echo "$$skipped"; \
 	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes"; \
+	  echo "$$dashes$$std"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -1013,6 +1006,7 @@
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1034,18 +1028,38 @@
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
 
 install-data-am:
 
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
 install-exec-am:
 
+install-html: install-html-am
+
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1065,18 +1079,23 @@
 
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am:
+
+.MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-checkPROGRAMS clean-generic ctags distclean \
 	distclean-compile distclean-generic distclean-tags distdir dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am
+	uninstall-am
+
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

aMule-2.2.6.tar.bz2/unittests/tests/NetworkFunctionsTest.cpp -> aMule-2.3.1.tar.bz2/unittests/tests/NetworkFunctionsTest.cpp Changed

aMule-2.2.6.tar.bz2/unittests/tests/PathTest.cpp -> aMule-2.3.1.tar.bz2/unittests/tests/PathTest.cpp Changed

@@ -60,7 +60,28 @@
 
 wxString StringFrom(const CPath& prt)
 {
-	return prt.GetPrintableString();
+	return prt.GetPrintable();
+}
+
+
+DECLARE_SIMPLE(GenericPathFunctions)
+
+TEST(GenericPathFunctions, JoinPaths)
+{
+	const wxString seps = wxFileName::GetPathSeparators();
+	const wxString sep = wxFileName::GetPathSeparator();
+
+	for (size_t i = 0; i < seps.Length(); ++i) {
+		const wxString cur_sep = seps.Mid(i, 1);
+
+		ASSERT_EQUALS(wxT("a") + sep + wxT("b"), JoinPaths(wxT("a"), wxT("b")));
+		ASSERT_EQUALS(wxT("a") + sep + wxT("b"), JoinPaths(wxT("a") + cur_sep, wxT("b")));
+		ASSERT_EQUALS(wxT("a") + sep + wxT("b"), JoinPaths(wxT("a"), cur_sep + wxT("b")));
+		ASSERT_EQUALS(wxT("a") + sep + wxT("b"), JoinPaths(wxT("a") + cur_sep, cur_sep + wxT("b")));
+		ASSERT_EQUALS(wxT("a"), JoinPaths(wxT("a"), wxEmptyString));
+		ASSERT_EQUALS(wxT("b"), JoinPaths(wxEmptyString, wxT("b")));
+		ASSERT_EQUALS(wxEmptyString, JoinPaths(wxEmptyString, wxEmptyString));
+	}
 }
 
 
@@ -80,8 +101,6 @@
 	ASSERT_EQUALS(wxEmptyString, tmp.GetPrintable());
 	ASSERT_EQUALS(CPath(), tmp.GetPath());
 	ASSERT_EQUALS(CPath(), tmp.GetFullName());
-
-	ASSERT_EQUALS(wxEmptyString, tmp.GetPrintableString());
 }
 
 
@@ -240,7 +259,7 @@
 	const CPath expected1 = Norm(wxT("/home/amule/"));
 	const CPath expected2 = Norm(wxT("/home/amule"));
 
-	// Note: Just a few checks, as ::JoinPaths is tested in StringFunctionTests.cpp
+	// Note: Just a few checks, as ::JoinPaths is tested above
 	ASSERT_EQUALS(expected1, Norm(wxT("/home")).JoinPaths(Norm(wxT("amule/"))));
 	ASSERT_EQUALS(expected1, Norm(wxT("/home")).JoinPaths(Norm(wxT("/amule/"))));
 	ASSERT_EQUALS(expected1, Norm(wxT("/home/")).JoinPaths(Norm(wxT("/amule/"))));
@@ -373,3 +392,27 @@
 	ASSERT_EQUALS(Norm(wxT("/home/amule.zod")), initial.RemoveAllExt().AppendExt(wxT(".zod")));
 }
 
+TEST(CPath, TruncatePath)
+{
+	const CPath testPath = Norm(wxT("/home/amule/truncate"));
+
+	ASSERT_EQUALS(Norm(wxT("/home/amule/truncate")).GetPrintable(), testPath.TruncatePath(21));
+	ASSERT_EQUALS(Norm(wxT("/home/amule/truncate")).GetPrintable(), testPath.TruncatePath(20));
+	ASSERT_EQUALS(Norm(wxT("/home/amule/tr[...]")).GetPrintable(), testPath.TruncatePath(19));
+	ASSERT_EQUALS(Norm(wxT("/h[...]")).GetPrintable(), testPath.TruncatePath(7));
+	ASSERT_EQUALS(Norm(wxT("/[...]")).GetPrintable(), testPath.TruncatePath(6));
+	ASSERT_EQUALS(wxEmptyString, testPath.TruncatePath(5));
+	ASSERT_EQUALS(wxEmptyString, testPath.TruncatePath(4));
+
+	ASSERT_EQUALS(Norm(wxT("/home/amule/truncate")).GetPrintable(), testPath.TruncatePath(21, true));
+	ASSERT_EQUALS(Norm(wxT("/home/amule/truncate")).GetPrintable(), testPath.TruncatePath(20, true));
+	ASSERT_EQUALS(Norm(wxT("[...]amule/truncate")).GetPrintable(), testPath.TruncatePath(19, true));
+	ASSERT_EQUALS(Norm(wxT("[...]e/truncate")).GetPrintable(), testPath.TruncatePath(15, true));
+	ASSERT_EQUALS(wxT("truncate"), testPath.TruncatePath(14, true));
+	ASSERT_EQUALS(wxT("truncate"), testPath.TruncatePath(13, true));
+	ASSERT_EQUALS(wxT("truncate"), testPath.TruncatePath(9, true));
+	ASSERT_EQUALS(wxT("truncate"), testPath.TruncatePath(8, true));
+	ASSERT_EQUALS(wxT("tr[...]"), testPath.TruncatePath(7, true));
+	ASSERT_EQUALS(wxT("t[...]"), testPath.TruncatePath(6, true));
+	ASSERT_EQUALS(wxEmptyString, testPath.TruncatePath(5, true));
+}

aMule-2.2.6.tar.bz2/unittests/tests/StringFunctionsTest.cpp -> aMule-2.3.1.tar.bz2/unittests/tests/StringFunctionsTest.cpp Changed

@@ -1,36 +1,12 @@
 #include <muleunit/test.h>
 #include <common/StringFunctions.h>
 
-#include <wx/filename.h>
-
 using namespace muleunit;
 
 DECLARE_SIMPLE(StringFunctions)
 
 
 ///////////////////////////////////////////////////////////
-// Tests for the JoinPaths function
-
-TEST(StringFunctions, JoinPaths)
-{
-	const wxString seps = wxFileName::GetPathSeparators();
-	const wxString sep = wxFileName::GetPathSeparator();
-
-	for (size_t i = 0; i < seps.Length(); ++i) {
-		const wxString cur_sep = seps.Mid(i, 1);
-		
-		ASSERT_EQUALS(wxT("a") + sep + wxT("b"), JoinPaths(wxT("a"), wxT("b")));
-		ASSERT_EQUALS(wxT("a") + sep + wxT("b"), JoinPaths(wxT("a") + cur_sep, wxT("b")));
-		ASSERT_EQUALS(wxT("a") + sep + wxT("b"), JoinPaths(wxT("a"), cur_sep + wxT("b")));
-		ASSERT_EQUALS(wxT("a") + sep + wxT("b"), JoinPaths(wxT("a") + cur_sep, cur_sep + wxT("b")));
-		ASSERT_EQUALS(wxT("a"), JoinPaths(wxT("a"), wxEmptyString));
-		ASSERT_EQUALS(wxT("b"), JoinPaths(wxEmptyString, wxT("b")));
-		ASSERT_EQUALS(wxEmptyString, JoinPaths(wxEmptyString, wxEmptyString));
-	}
-}
-
-
-///////////////////////////////////////////////////////////
 // Tests for the FuzzyStrCmp function
 
 //! Returns the number of items in an array.

Changes of Revision 8